From 582ecf47711c60c28d554b42f60af2711578c76b Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Thu, 21 May 2015 15:43:02 +0200
Subject: [PATCH 0001/2016] inkscape with boxmaker plugin

---
 .../graphics/inkscape/default.nix             | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 41531ed0de8..409fd0a767c 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -2,9 +2,20 @@
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
 , gsl, python, pyxml, lxml, poppler, imagemagick, libwpg, librevenge
-, libvisio, libcdr, libexif
+, libvisio, libcdr, libexif, unzip
+, boxMakerPlugin ? false # boxmaker plugin
 }:
 
+let 
+
+boxmaker = fetchurl {
+  # http://www.inkscapeforum.com/viewtopic.php?f=11&t=10403
+  url = "http://www.keppel.demon.co.uk/111000/files/BoxMaker0.91.zip";
+  sha256 = "5c5697f43dc3a95468f61f479cb50b7e2b93379a1729abf19e4040ac9f43a1a8";
+};
+
+in
+
 stdenv.mkDerivation rec {
   name = "inkscape-0.91";
 
@@ -34,12 +45,23 @@ stdenv.mkDerivation rec {
     libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext
     makeWrapper intltool gsl poppler imagemagick libwpg librevenge
     libvisio libcdr libexif
-  ];
+  ] ++ stdenv.lib.optional boxMakerPlugin unzip;
 
   enableParallelBuilding = true;
   doCheck = true;
 
   postInstall = ''
+    ${if boxMakerPlugin then "
+      mkdir -p $out/share/inkscape/extensions/
+      # boxmaker packaged version 0.91 in a directory called 0.85 ?!??
+      unzip ${boxmaker};
+      cp boxmake-upd-0.85/* $out/share/inkscape/extensions/
+      rm -Rf boxmake-upd-0.85
+      "
+    else 
+      ""
+    }
+
     # Make sure PyXML modules can be found at run-time.
     for i in "$out/bin/"*
     do

From 70db57f48838801ce3752f8d6957623d16dca2f0 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 7 Jul 2015 11:52:23 +0200
Subject: [PATCH 0002/2016] driftnet: init at 8d47fd5

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

diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
new file mode 100644
index 00000000000..432411c1460
--- /dev/null
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libpcap, libjpeg, libungif, libpng, giflib, glib, gtk2, cairo, pango, gdk_pixbuf, atk, pkgconfig }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "driftnet-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "8d47fd563a06122d4a6f9b9b9d27ba3d635148c0";
+
+  buildInputs = [ autoconf automake pkgconfig libpcap libjpeg libungif libpng giflib glib gtk2 glib cairo pango gdk_pixbuf atk ];
+
+  preConfigure = "autoreconf -fi";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "deiv";
+    repo = "driftnet";
+    sha256 = "1i9fqbsfrhvr36r17v3ydr1bqsszns8gyjbvlfqbdd4l5l5n6amg";
+  };
+
+  meta = {
+    description = "Driftnet watches network traffic, and picks out and displays JPEG and GIF images for display.";
+    homepage = https://github.com/deiv/driftnet;
+    maintainers = with maintainers; [ offline ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e90ff4984b8..708c842a0d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1314,6 +1314,8 @@ let
 
   drive = callPackage ../applications/networking/drive { };
 
+  driftnet = callPackage ../tools/networking/driftnet {};
+
   dropbear = callPackage ../tools/networking/dropbear { };
 
   dtach = callPackage ../tools/misc/dtach { };

From ef5d158e83e1dc4e1be8735f9de1d24f1fd55136 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 8 Jul 2015 14:21:51 +0200
Subject: [PATCH 0003/2016] language-support python: propagatedBuildInputs

Explain difference between buildInputs and propagatedBuildInputs.
Shamefully steal wording from Perl.
---
 doc/language-support.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/language-support.xml b/doc/language-support.xml
index def0de1d91f..798988274ec 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -341,7 +341,16 @@ twisted = buildPythonPackage {
   <para>By default <varname>doCheck = true</varname> is set and tests are run with
   <literal>${python.interpreter} setup.py test</literal> command in <varname>checkPhase</varname>.</para>
 
-  <para><varname>propagatedBuildInputs</varname> packages are propagated to user environment.</para>
+  <para><varname>propagatedBuildInputs</varname> packages are propagated to the user environment.</para>
+
+  <para>
+    As in Perl, dependencies on other Python packages can be specified in the
+    <varname>buildInputs</varname> and
+    <varname>propagatedBuildInputs</varname> attributes.  If something is
+    exclusively a build-time dependency, use
+    <varname>buildInputs</varname>; if it’s (also) a runtime dependency,
+    use <varname>propagatedBuildInputs</varname>.
+  </para>
 
   <para>
     By default <varname>meta.platforms</varname> is set to the same value

From 092e6e23b374929ce4bc8d7a8bd6c92beba09560 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Thu, 9 Jul 2015 17:54:47 -0700
Subject: [PATCH 0004/2016] junegunn.go-runewidth: init at travisish

patch by @magnetophon
---
 pkgs/top-level/go-packages.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index bab63e87b30..bd0b95073c5 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1366,6 +1366,18 @@ let
     };
   };
 
+  junegunn.go-runewidth = buildGoPackage rec {
+    rev = "travisish";
+    name = "go-runewidth-${rev}";
+    goPackagePath = "github.com/junegunn/go-runewidth";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "junegunn";
+      repo = "go-runewidth";
+      sha256 = "07d612val59sibqly5d6znfkp4h4gjd77783jxvmiq6h2fwb964k";
+    };
+  };
+
   go-runit = buildGoPackage rec {
     rev = "a9148323a615e2e1c93b7a9893914a360b4945c8";
     name = "go-runit-${stdenv.lib.strings.substring 0 7 rev}";

From 2d006f090e2a516018ebd8f217870194aa76dc48 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Thu, 9 Jul 2015 18:02:25 -0700
Subject: [PATCH 0005/2016] go-shellwords: init at
 35d512af75e283aae4ca1fc3d44b159ed66189a4

patch by @magnetophon
---
 pkgs/top-level/go-packages.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index bd0b95073c5..77d96053e94 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1378,6 +1378,18 @@ let
     };
   };
 
+  go-shellwords = buildGoPackage rec {
+    rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4";
+    name = "go-shellwords-${rev}";
+    goPackagePath = "github.com/junegunn/go-shellwords";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "junegunn";
+      repo = "go-shellwords";
+      sha256 = "c792abe5fda48d0dfbdc32a84edb86d884a0ccbd9ed49ad48a30cda5ba028a22";
+    };
+  };
+
   go-runit = buildGoPackage rec {
     rev = "a9148323a615e2e1c93b7a9893914a360b4945c8";
     name = "go-runit-${stdenv.lib.strings.substring 0 7 rev}";

From fb371c06427b779213488808119216671cba5a26 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Thu, 9 Jul 2015 18:03:22 -0700
Subject: [PATCH 0006/2016] fzf: init at 0.9.13

patch by @magnetophon
---
 pkgs/tools/misc/fzf/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/misc/fzf/default.nix

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
new file mode 100644
index 00000000000..58c2871ae85
--- /dev/null
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, goPackages, syncthing, ncurses }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "fzf-${version}";
+  version = "0.9.13";
+  goPackagePath = "github.com/junegunn/fzf";
+  src = fetchFromGitHub {
+    owner = "junegunn";
+    repo = "fzf";
+    rev = "${version}";
+    sha256 = "1m9zbf02d6i47c33jys9lr0krqfjk2dr8jzpfhnrb266qcdb27xi";
+  };
+
+  buildInputs = with goPackages; [ crypto ginkgo gomega junegunn.go-runewidth go-shellwords ncurses syncthing text ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/junegunn/fzf;
+    description = "A command-line fuzzy finder written in Go";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6ad3607854..2b9e6d6610a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -878,6 +878,8 @@ let
 
   filter_audio = callPackage ../development/libraries/filter_audio { };
 
+  fzf = callPackage ../tools/misc/fzf { };
+
   gist = callPackage ../tools/text/gist { };
 
   mcrl = callPackage ../tools/misc/mcrl { };

From 9e2da99cc7f58d020673b05f72a5249579cb1cd1 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Fri, 10 Jul 2015 10:52:23 -0700
Subject: [PATCH 0007/2016] fzf: whitespace

---
 pkgs/tools/misc/fzf/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 58c2871ae85..938a72b74a7 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -13,7 +13,16 @@ buildGoPackage rec {
     sha256 = "1m9zbf02d6i47c33jys9lr0krqfjk2dr8jzpfhnrb266qcdb27xi";
   };
 
-  buildInputs = with goPackages; [ crypto ginkgo gomega junegunn.go-runewidth go-shellwords ncurses syncthing text ];
+  buildInputs = with goPackages; [
+    crypto
+    ginkgo
+    gomega
+    junegunn.go-runewidth
+    go-shellwords
+    ncurses
+    syncthing
+    text
+  ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/junegunn/fzf;

From ec6e64a371f41887c45c23a9a693cfe586e0616f Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Sat, 11 Jul 2015 10:30:51 -0700
Subject: [PATCH 0008/2016] fzf: add magnetophon as a maintainer

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

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 938a72b74a7..6b703a3e902 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -28,5 +28,6 @@ buildGoPackage rec {
     homepage = https://github.com/junegunn/fzf;
     description = "A command-line fuzzy finder written in Go";
     license = licenses.mit;
+    maintainers = [ maintainers.magnetophon ];
   };
 }

From b30cab15ea64ae7f701626524bcf522a21fcc284 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 12 Jul 2015 13:07:39 +0200
Subject: [PATCH 0009/2016] language support python docs wrong statement

Remove wrong line about propagatedBuildInputs.
---
 doc/language-support.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/language-support.xml b/doc/language-support.xml
index 798988274ec..9117af864ad 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -1,3 +1,4 @@
+
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-language-support">
@@ -341,8 +342,6 @@ twisted = buildPythonPackage {
   <para>By default <varname>doCheck = true</varname> is set and tests are run with
   <literal>${python.interpreter} setup.py test</literal> command in <varname>checkPhase</varname>.</para>
 
-  <para><varname>propagatedBuildInputs</varname> packages are propagated to the user environment.</para>
-
   <para>
     As in Perl, dependencies on other Python packages can be specified in the
     <varname>buildInputs</varname> and

From b825befbdb8cf3ec2fdd3c9ddf471b8946868245 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 14 Jul 2015 00:57:06 +0200
Subject: [PATCH 0010/2016] quake3: add botlib patch for amd64

botlib abuses strcpy (source and dest overlap), and the strcpy function for 64
bit intel CPU's in the latest glibc, does not like this causing the bots to not
load.
---
 pkgs/games/quake3/game/botlib.patch | 51 +++++++++++++++++++++++++++++
 pkgs/games/quake3/game/default.nix  |  3 ++
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/games/quake3/game/botlib.patch

diff --git a/pkgs/games/quake3/game/botlib.patch b/pkgs/games/quake3/game/botlib.patch
new file mode 100644
index 00000000000..82e2c781101
--- /dev/null
+++ b/pkgs/games/quake3/game/botlib.patch
@@ -0,0 +1,51 @@
+Retrieved from https://bugzilla.icculus.org/show_bug.cgi?id=4331,
+removed path prefix.
+
+  -- nckx <tobias.geerinckx.rice@gmail.com>
+
+PATCH: Bots don't work on 64 bit Intel CPU's
+
+botlib abuses strcpy (source and dest overlap), and the strcpy function for 64
+bit intel CPU's in the latest glibc, does not like this causing the bots to not
+load.
+
+The attached patch fixes this.
+
+Note this patch should be credited to: Andreas Bierfert (andreas.bierfert at
+lowlatency.de)
+
+See: http://bugzilla.redhat.com/show_bug.cgi?id=526338
+
+diff -up quake3-1.36/code/botlib/l_precomp.c~ quake3-1.36/code/botlib/l_precomp.c
+--- code/botlib/l_precomp.c~	2009-04-27 08:42:37.000000000 +0200
++++ code/botlib/l_precomp.c	2009-11-03 21:03:08.000000000 +0100
+@@ -948,7 +948,7 @@ void PC_ConvertPath(char *path)
+ 		if ((*ptr == '\\' || *ptr == '/') &&
+ 				(*(ptr+1) == '\\' || *(ptr+1) == '/'))
+ 		{
+-			strcpy(ptr, ptr+1);
++			memmove(ptr, ptr+1, strlen(ptr));
+ 		} //end if
+ 		else
+ 		{
+diff -up quake3-1.36/code/botlib/l_script.c~ quake3-1.36/code/botlib/l_script.c
+--- code/botlib/l_script.c~	2009-04-27 08:42:37.000000000 +0200
++++ code/botlib/l_script.c	2009-11-03 21:06:11.000000000 +0100
+@@ -1118,7 +1118,7 @@ void StripDoubleQuotes(char *string)
+ {
+ 	if (*string == '\"')
+ 	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string));
+ 	} //end if
+ 	if (string[strlen(string)-1] == '\"')
+ 	{
+@@ -1135,7 +1135,7 @@ void StripSingleQuotes(char *string)
+ {
+ 	if (*string == '\'')
+ 	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string));
+ 	} //end if
+ 	if (string[strlen(string)-1] == '\'')
+ 	{
diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix
index cbcc8c290f8..ed447004345 100644
--- a/pkgs/games/quake3/game/default.nix
+++ b/pkgs/games/quake3/game/default.nix
@@ -20,6 +20,9 @@ stdenv.mkDerivation {
     # Do an exit() instead of _exit().  This is nice for gcov.
     # Upstream also seems to do this.
     ./exit.patch
+
+    # No bots on amd64 without this patch.
+    ./botlib.patch
   ];
 
   buildInputs = [ x11 SDL mesa openal gcc46 ];

From d6cee31b04d038785139360fee8988c422baeb53 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 13 Jul 2015 06:56:53 -0700
Subject: [PATCH 0011/2016] heyefi service: init

---
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/networking/heyefi.nix | 87 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 3 files changed, 90 insertions(+)
 create mode 100644 nixos/modules/services/networking/heyefi.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f74b16f678f..a03cd732c17 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -286,6 +286,7 @@
   ./services/networking/gogoclient.nix
   ./services/networking/gvpe.nix
   ./services/networking/haproxy.nix
+  ./services/networking/heyefi.nix
   ./services/networking/hostapd.nix
   ./services/networking/i2pd.nix
   ./services/networking/i2p.nix
diff --git a/nixos/modules/services/networking/heyefi.nix b/nixos/modules/services/networking/heyefi.nix
new file mode 100644
index 00000000000..741851a8ff4
--- /dev/null
+++ b/nixos/modules/services/networking/heyefi.nix
@@ -0,0 +1,87 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.heyefi;
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.heyefi = {
+
+      cardMacaddress = mkOption {
+        default = "";
+        description = ''
+          An Eye-Fi card MAC address.
+          '';
+      };
+
+      uploadKey = mkOption {
+        default = "";
+        description = ''
+          An Eye-Fi card's upload key.
+          '';
+      };
+
+      uploadDir = mkOption {
+        example = /home/ryantm/picture;
+        description = ''
+          The directory to upload the files to.
+          '';
+      };
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Enable heyefi, an Eye-Fi upload server.
+        '';
+      };
+
+      user = mkOption {
+        default = "root";
+        description = ''
+          heyefi will be run under this user (user must exist,
+          this can be your user name).
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.heyefi =
+      {
+        description = "heyefi service";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          User = "${cfg.user}";
+          Restart = "always";
+          ExecStart = "${pkgs.heyefi}/bin/heyefi";
+        };
+
+      };
+
+    environment.etc."heyefi/heyefi.config".text =
+      ''
+        # /etc/heyefi/heyefi.conf: DO NOT EDIT -- this file has been generated automatically.
+        cards = [["${config.services.heyefi.cardMacaddress}","${config.services.heyefi.uploadKey}"]]
+        upload_dir = "${toString config.services.heyefi.uploadDir}"
+      '';
+
+    environment.systemPackages = [ pkgs.heyefi ];
+
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6ad3607854..8bf28b89b5b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6523,6 +6523,8 @@ let
 
   herqq = callPackage ../development/libraries/herqq { };
 
+  heyefi = haskellPackages.heyefi;
+
   hidapi = callPackage ../development/libraries/hidapi {
     libusb = libusb1;
   };

From d11edff86088569e82d3947227cae96790438494 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 14 Jul 2015 06:54:51 -0700
Subject: [PATCH 0012/2016] heyefi service: use mkEnableOption

---
 nixos/modules/services/networking/heyefi.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/networking/heyefi.nix b/nixos/modules/services/networking/heyefi.nix
index 741851a8ff4..0f55c1a5b8f 100644
--- a/nixos/modules/services/networking/heyefi.nix
+++ b/nixos/modules/services/networking/heyefi.nix
@@ -15,6 +15,8 @@ in
 
     services.heyefi = {
 
+      enable = mkEnableOption "heyefi";
+
       cardMacaddress = mkOption {
         default = "";
         description = ''
@@ -36,13 +38,6 @@ in
           '';
       };
 
-      enable = mkOption {
-        default = false;
-        description = ''
-          Enable heyefi, an Eye-Fi upload server.
-        '';
-      };
-
       user = mkOption {
         default = "root";
         description = ''

From 9d485d9433e98a7cde0be4867d844c42ac373ad5 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 14 Jul 2015 06:56:30 -0700
Subject: [PATCH 0013/2016] heyefi service: make uploadDir path more generic
 and a string

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

diff --git a/nixos/modules/services/networking/heyefi.nix b/nixos/modules/services/networking/heyefi.nix
index 0f55c1a5b8f..fc2b5a84857 100644
--- a/nixos/modules/services/networking/heyefi.nix
+++ b/nixos/modules/services/networking/heyefi.nix
@@ -32,7 +32,7 @@ in
       };
 
       uploadDir = mkOption {
-        example = /home/ryantm/picture;
+        example = "/home/username/pictures";
         description = ''
           The directory to upload the files to.
           '';

From 2ff91293374111a7a07345b912b5b4316d562a44 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 15 Jul 2015 12:19:38 +0200
Subject: [PATCH 0014/2016] xen: fixes (authored by michalpalka)

Xen required a few changes in order to be usable:
* Include xenfs module in initrd as loading it in the activation
  script was failing.
* Include /etc/default/xendomains, which is needed by
  xen-domains service.
* Create /var/log/xen and /var/lib/xen directories in
  the xen-store service, which are needed by the xl command.
  The directories could be created by any other script as long as
  they are guaranteed to exist before xl is called.
* Fix a reference to /bin/ls in the xendomains script.
---
 nixos/modules/virtualisation/xen-dom0.nix        | 10 +++++++++-
 pkgs/applications/virtualization/xen/generic.nix |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index c750286a397..a0b2d5363eb 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -121,6 +121,10 @@ in
         "xenfs"
       ];
 
+    # The xenfs module is needed in system.activationScripts.xen, but
+    # the modprobe command there fails silently. Include xenfs in the
+    # initrd as a work around.
+    boot.initrd.kernelModules = [ "xenfs" ];
 
     # The radeonfb kernel module causes the screen to go black as soon
     # as it's loaded, so don't load it.
@@ -182,6 +186,9 @@ in
         { source = "${pkgs.xen}/etc/xen/scripts";
           target = "xen/scripts";
         }
+        { source = "${pkgs.xen}/etc/default/xendomains";
+          target = "default/xendomains";
+        }
       ];
 
     # Xen provides udev rules.
@@ -199,7 +206,8 @@ in
         rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null
 
         mkdir -p /var/run
-        ${optionalString cfg.trace "mkdir -p /var/log/xen"}
+        mkdir -p /var/log/xen # Running xl requires /var/log/xen and /var/lib/xen,
+        mkdir -p /var/lib/xen # so we create them here unconditionally.
         grep -q control_d /proc/xen/capabilities
         '';
       serviceConfig.ExecStart = ''
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 2c92a983474..32e38563525 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -147,6 +147,9 @@ stdenv.mkDerivation {
         --replace /etc/xen/scripts/hotplugpath.sh $out/etc/xen/scripts/hotplugpath.sh \
         --replace /bin/ls ls
 
+      substituteInPlace tools/hotplug/Linux/xendomains \
+        --replace /bin/ls ls
+
       # Xen's tools and firmares need various git repositories that it
       # usually checks out at time using git.  We can't have that.
       ${flip concatMapStrings xenConfig.toolsGits (x: let src = fetchgit x.git; in ''

From 2e0933787bff6772a698a3e8e8f3c93cb2bb7370 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 18 Apr 2015 23:15:35 +0200
Subject: [PATCH 0015/2016] nixos: add AppArmor PAM support

Enables attaching AppArmor profiles at the user/group level.

This is not intended to be used directly, but as part of a
role-based access control scheme. For now, profile attachment
is 'session optional', but should be changed to 'required' once
a more comprehensive solution is in place.
---
 nixos/modules/security/apparmor.nix |  8 --------
 nixos/modules/security/pam.nix      | 12 ++++++++++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index 4fef62cbffd..202639f9870 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -37,13 +37,5 @@ in
          ) cfg.profiles;
        };
      };
-
-     security.pam.services.apparmor.text = ''
-       ## AppArmor changes hats according to `order`: first try user, then
-       ## group, and finally fall back to a hat called "DEFAULT"
-       ##
-       ## For now, enable debugging as this is an experimental feature.
-       session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug
-     '';
    };
 }
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 02520fb88cd..15533fbdc3d 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -192,6 +192,16 @@ let
         description = "Whether to log authentication failures in <filename>/var/log/faillog</filename>.";
       };
 
+      enableAppArmor = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable support for attaching AppArmor profiles at the
+          user/group level, e.g., as part of a role based access
+          control scheme.
+        '';
+      };
+
       text = mkOption {
         type = types.nullOr types.lines;
         description = "Contents of the PAM service file.";
@@ -294,6 +304,8 @@ let
               "session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd}"}
           ${optionalString cfg.pamMount
               "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
+          ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable)
+              "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
         '';
     };
 

From bcb314853a6f6124ac5f86b8cc56c04a0849c4ff Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 2 Jul 2015 01:47:15 +0200
Subject: [PATCH 0016/2016] unrtf: init at 0.21.9

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

diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix
new file mode 100644
index 00000000000..6b177b8b37b
--- /dev/null
+++ b/pkgs/tools/text/unrtf/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+  name = "unrtf-${version}";
+  version = "0.21.9";
+
+  src = fetchurl {
+    url = "https://www.gnu.org/software/unrtf/${name}.tar.gz";
+    sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2";
+  };
+
+  buildInputs = [ autoconf automake ];
+
+  preConfigure = "./bootstrap";
+
+  meta = with stdenv.lib; {
+    description = "A converter from Rich Text Format to other formats";
+    longDescription = ''
+      UnRTF converts documents in Rich Text Format to other
+      formats, including HTML, LaTeX, and RTF itself.
+    '';
+    homepage = https://www.gnu.org/software/unrtf/;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ joachifm ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3e7849dd1a..9eb8e045398 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3170,6 +3170,8 @@ let
 
   unoconv = callPackage ../tools/text/unoconv { };
 
+  unrtf = callPackage ../tools/text/unrtf { };
+
   upx = callPackage ../tools/compression/upx { };
 
   urlview = callPackage ../applications/misc/urlview {};

From 4bd52ddb88dd5bb9aed7bd674d3754391d3ddc94 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 2 Jul 2015 02:02:36 +0200
Subject: [PATCH 0017/2016] untex: init at 1.2

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

diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix
new file mode 100644
index 00000000000..e2f6142a2a0
--- /dev/null
+++ b/pkgs/tools/text/untex/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "untex-${version}";
+  version = "1.2";
+
+  src = fetchurl {
+    url = "https://www.ctan.org/tex-archive/support/untex/${name}.tar.gz";
+    sha256 = "07p836jydd5yjy905m5ylnnac1h4cc4jsr41panqb808mlsiwmmy";
+  };
+
+  unpackPhase = "tar xf $src";
+  installTargets = "install install.man";
+  installFlags = "BINDIR=$(out)/bin MANDIR=$(out)/share/man/man1";
+  preBuild = ''
+    sed -i '1i#include <stdlib.h>\n#include <string.h>' untex.c
+    mkdir -p $out/bin $out/share/man/man1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A utility which removes LaTeX commands from input";
+    homepage = https://www.ctan.org/pkg/untex;
+    license = licenses.gpl1;
+    maintainers = with maintainers; [ joachifm ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9eb8e045398..129af9c5deb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3172,6 +3172,8 @@ let
 
   unrtf = callPackage ../tools/text/unrtf { };
 
+  untex = callPackage ../tools/text/untex { };
+
   upx = callPackage ../tools/compression/upx { };
 
   urlview = callPackage ../applications/misc/urlview {};

From ba03068c210ada1b5c3dee56cb90708af3057e48 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 2 Jul 2015 02:17:50 +0200
Subject: [PATCH 0018/2016] libwpd: add meta.{description,license,homepage}

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

diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index df5917fb05c..01ae59efdf4 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -11,4 +11,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ glib libgsf libxml2 zlib librevenge ];
 
   nativeBuildInputs = [ pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "A library for importing and exporting WordPerfect documents";
+    homepage = http://libwpd.sourceforge.net/;
+    license = licenses.lgpl21;
+  };
 }

From ef772328ebd98b2d570de54e2f61a46b0aecf9b9 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 2 Jul 2015 02:19:03 +0200
Subject: [PATCH 0019/2016] recoll: make use of unrtf, untex, and Word Perfect
 filters

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

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 0eb4632a4c0..3182f4a5c66 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl
 , qt4, xapian, file, python
 , djvulibre, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx
+, libwpd, unrtf, untex
 , ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv }:
 
 assert stdenv.system != "powerpc-linux";
@@ -40,12 +41,11 @@ stdenv.mkDerivation rec {
       substituteInPlace  $f --replace unzip         ${unzip}/bin/unzip
       substituteInPlace  $f --replace xls2csv       ${catdoc}/bin/xls2csv
       substituteInPlace  $f --replace xsltproc      ${libxslt}/bin/xsltproc
+      substituteInPlace  $f --replace unrtf         ${unrtf}/bin/unrtf
+      substituteInPlace  $f --replace untex         ${untex}/bin/untex
+      substituteInPlace  $f --replace wpd2html      ${libwpd}/bin/wpd2html
     done
   '';
-    # TODO:
-    #substituteInPlace  $f --replace unrtf         ${unrtf}/bin/unrtf 
-    #substituteInPlace  $f --replace untex         ${untex}/bin/untex
-    #substituteInPlace  $f --replace wpd2html      ${wpd2html}/bin/wpd2html
 
   meta = with stdenv.lib; {
     description = "A full-text search tool";

From 475527adb7b7cf1f0063f54f299b71a0ee720b70 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 15 Jul 2015 19:14:18 +0200
Subject: [PATCH 0020/2016] compcert: 2.4 -> 2.5

Also installs the Coq library as a separate output.
---
 .../compilers/compcert/default.nix            | 24 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  6 ++++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 00a0e7b9c2b..3b1ebca1796 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -1,23 +1,37 @@
-{ stdenv, fetchurl, coq, ocaml, ocamlPackages }:
+{ stdenv, fetchurl, coq, ocamlPackages
+, tools ? stdenv.cc
+}:
 
 stdenv.mkDerivation rec {
   name    = "compcert-${version}";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchurl {
     url    = "http://compcert.inria.fr/release/${name}.tgz";
-    sha256 = "1qrb1cplx3v5wxn1c46kx67v1j52yznvjm2hkrsdybphhki2pyia";
+    sha256 = "15gxarl2a8mz33fdn8pycj0ccazgmllbg2940n7aqdjlz807p11n";
   };
 
-  buildInputs = [ coq ocaml ocamlPackages.menhir ];
+  buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml menhir ]);
 
   enableParallelBuilding = true;
 
   configurePhase = ''
     substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
-    ./configure -prefix $out -toolprefix ${stdenv.cc}/bin/ '' +
+    ./configure -prefix $out -toolprefix ${tools}/bin/ '' +
     (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");
 
+  installTargets = "documentation install";
+
+  postInstall = ''
+    mkdir -p $lib/share/doc/compcert
+    mv doc/html $lib/share/doc/compcert/
+    mkdir -p $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
+    mv backend cfrontend common cparser driver flocq ia32 lib \
+      $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
+  '';
+
+  outputs = [ "out" "lib" ];
+
   meta = with stdenv.lib; {
     description = "Formally verified C compiler";
     homepage    = "http://compcert.inria.fr";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f39c4dc040..7380f2d6cf1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3646,7 +3646,11 @@ let
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
-  compcert = callPackage ../development/compilers/compcert {};
+  compcert = callPackage ../development/compilers/compcert (
+    if system == "x86_64-linux"
+    then { tools = pkgsi686Linux.stdenv.cc; }
+    else {}
+  );
 
   cryptol = haskellPackages.cryptol;
 

From a475f993045a48ea1ca3ee81d6786863bdbb4a3d Mon Sep 17 00:00:00 2001
From: Alexander Flatter <flatter@fastmail.fm>
Date: Tue, 7 Jul 2015 15:30:41 +0200
Subject: [PATCH 0021/2016] Add phantomjs2

This builds PhantomJS 2 from source in contrast to PhantomJS 1, for
which static binary builds are available.
---
 pkgs/development/tools/phantomjs2/default.nix | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/tools/phantomjs2/default.nix

diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
new file mode 100644
index 00000000000..8ef68f93a2f
--- /dev/null
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl,
+  bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg, libpng, perl, python, ruby, sqlite
+}:
+
+stdenv.mkDerivation rec {
+  name = "phantomjs-${version}";
+  version = "2.0.0-20150528";
+
+  src = fetchurl {
+    url = "https://github.com/bprodoehl/phantomjs/archive/v2.0.0-20150528.tar.gz";
+    sha256 = "18h37bxxg25lacry9k3vb5yim057bqcxmsifw97jrjp7gzfx56v5";
+  };
+
+  buildInputs = [ bison2 flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite ];
+
+  patchPhase = ''
+    patchShebangs .
+    sed -i -e 's|/bin/pwd|pwd|' src/qt/qtbase/configure 
+  '';
+
+  buildPhase = "./build.sh --confirm";
+
+  installPhase = ''
+    mkdir -p $out/share/doc/phantomjs
+    cp -a bin $out
+    cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs
+  '';
+
+  meta = {
+    description = "Headless WebKit with JavaScript API";
+    longDescription = ''
+      PhantomJS2 is a headless WebKit with JavaScript API.
+      It has fast and native support for various web standards:
+      DOM handling, CSS selector, JSON, Canvas, and SVG.
+
+      PhantomJS is an optimal solution for:
+      - Headless Website Testing
+      - Screen Capture
+      - Page Automation
+      - Network Monitoring
+    '';
+
+    homepage = http://phantomjs.org/;
+    license = stdenv.lib.licenses.bsd3;
+
+    maintainers = [ stdenv.lib.maintainers.aflatter ];
+    platforms = with stdenv.lib.platforms; darwin ++ linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd8ac1e3640..a22f260f816 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5629,6 +5629,8 @@ let
 
   phantomjs = callPackage ../development/tools/phantomjs { };
 
+  phantomjs2 = callPackage ../development/tools/phantomjs2 { };
+
   pmccabe = callPackage ../development/tools/misc/pmccabe { };
 
   /* Make pkgconfig always return a nativeDrv, never a proper crossDrv,

From 17c1428bfb9a5cb7cefeb378fb5fb4cb8301a5d8 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Wed, 15 Jul 2015 19:59:20 -0700
Subject: [PATCH 0022/2016] fzf: 0.9.13 -> 0.10.0

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

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 6b703a3e902..5692fc25a32 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -4,13 +4,13 @@ with goPackages;
 
 buildGoPackage rec {
   name = "fzf-${version}";
-  version = "0.9.13";
+  version = "0.10.0";
   goPackagePath = "github.com/junegunn/fzf";
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf";
     rev = "${version}";
-    sha256 = "1m9zbf02d6i47c33jys9lr0krqfjk2dr8jzpfhnrb266qcdb27xi";
+    sha256 = "0dx9qwmcrnh31m2n75qmpj1dxm6rr6xsbazy4nwa3bzrb8y6svh2";
   };
 
   buildInputs = with goPackages; [

From c1a9be394f193b41a07d7447d249c73bb25aa5d6 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 16 Jul 2015 08:57:17 +0000
Subject: [PATCH 0023/2016] pythonPackages.sqlalchemy: 0.9.8 -> 0.9.9

---
 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 45de46ef679..0b8987d1758 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12772,13 +12772,13 @@ let
   };
 
   sqlalchemy9 = buildPythonPackage rec {
-    name = "SQLAlchemy-0.9.8";
+    name = "SQLAlchemy-0.9.9";
 
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
-      md5 = "470ca4da4a0081efc830f0d90dd91682";
+      sha256 = "14az6hhrz4bgnicz4q373z119zmaf7j5zxl1jfbfl5lix5m1z9bj";
     };
 
     buildInputs = with self; [ nose mock ]

From f27b17e54c6a86784f295d57d7ded5136c39b645 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 16 Jul 2015 09:00:33 +0000
Subject: [PATCH 0024/2016] pythonPackages.sqlalchemy_1_0: init at 1.0.6

sqlalchemy-0.9.9 is maintained as the reference version (it is still in maintenance
state upstream).
---
 pkgs/top-level/python-packages.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0b8987d1758..f5904190852 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12799,6 +12799,14 @@ let
     };
   };
 
+  sqlalchemy_1_0 = self.sqlalchemy9.override rec {
+    name = "SQLAlchemy-1.0.6";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
+      sha256 = "1wv5kjf142m8g1dnbvgpbqxb8v8rm9lzgsafql2gg229xi5sba4r";
+    };
+  };
 
   sqlalchemy_imageattach = buildPythonPackage rec {
     name = "SQLAlchemy-ImageAttach-${version}";

From bb6459dd0bb99c0db291d744cde6f466d7379d7e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 19 Jul 2015 13:38:36 -0500
Subject: [PATCH 0025/2016] qt5.base: use pkgconfig unconditionally

---
 pkgs/development/libraries/qt-5/5.4/qtbase.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index 7ef39a40860..ac38339c1f8 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -104,6 +104,7 @@ stdenv.mkDerivation {
     -strip
     -reduce-relocations
     -system-proxies
+    -pkg-config
 
     -gui
     -widgets

From 3f3da5ccbde10176a4e634888384bb48c024b337 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 19 Jul 2015 13:38:51 -0500
Subject: [PATCH 0026/2016] qt5.base: install setupHook correctly

---
 pkgs/development/libraries/qt-5/5.4/qtbase.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index ac38339c1f8..cf960c39b40 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -172,12 +172,11 @@ stdenv.mkDerivation {
 
       # Don't retain build-time dependencies like gdb and ruby.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
-
-      mkdir -p "$out/nix-support"
-      substitute ${./setup-hook.sh} "$out/nix-support/setup-hook" \
-        --subst-var out --subst-var-by lndir "${lndir}"
     '';
 
+  inherit lndir;
+  setupHook = ./setup-hook.sh;
+
   enableParallelBuilding = true; # often fails on Hydra, as well as qt4
 
   meta = {

From f6bc130bc83c62e626d11414e876143f98d49437 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Jul 2015 16:59:48 -0700
Subject: [PATCH 0027/2016] libssh: 0.7.0 -> 0.7.1

---
 ...troduce-ssh_forward_listen-Fixes-194.patch | 28 -------------------
 pkgs/development/libraries/libssh/default.nix |  8 ++----
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch

diff --git a/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch b/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch
deleted file mode 100644
index 030983d5c55..00000000000
--- a/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3c8fe6e2c595ee019408249c364b3019b6c31a8a Mon Sep 17 00:00:00 2001
-From: Mike DePaulo <mikedep333@gmail.com>
-Date: Fri, 15 May 2015 22:22:13 -0400
-Subject: [PATCH] Reintroduce ssh_forward_listen() (Fixes: #194)
-
----
- src/channels.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/channels.c b/src/channels.c
-index 7a4e71f..db5f83a 100644
---- a/src/channels.c
-+++ b/src/channels.c
-@@ -2206,6 +2206,11 @@ error:
- }
- 
- /* DEPRECATED */
-+int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port) {
-+  return ssh_channel_listen_forward(session, address, port, bound_port);
-+}
-+
-+/* DEPRECATED */
- ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) {
-   return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL);
- }
--- 
-2.1.4
-
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index ef4540db2b2..1766a685aaa 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "libssh-0.7.0";
+  name = "libssh-0.7.1";
 
   src = fetchurl {
-    url = "https://git.libssh.org/projects/libssh.git/snapshot/${name}.tar.gz";
-    sha256 = "1wfrdqhv97f4ycd9bcpgb6gw47kr7b2iq8cz5knk8a6n9c6870k0";
+    url = "https://red.libssh.org/attachments/download/154/libssh-0.7.1.tar.xz";
+    sha256 = "0v84zm957z31yyrj47n62hby38nrjk5ih0ajmgccnqrjdpwwrirg";
   };
 
-  patches = [ ./0001-Reintroduce-ssh_forward_listen-Fixes-194.patch ];
-
   postPatch = ''
     # Fix headers to use libsodium instead of NaCl
     sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c

From 6eab1065f124701a85f2f747589db24ee004c68b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Jul 2015 19:44:37 -0700
Subject: [PATCH 0028/2016] ceph: Fix wrapper path

---
 pkgs/tools/filesystems/ceph/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index b899192aa3c..bece841d5f5 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -101,7 +101,7 @@ let
   wrapArgs = "--set PYTHONPATH \"$(toPythonPath $lib)\""
     + " --prefix PYTHONPATH : \"$(toPythonPath ${python.modules.readline})\""
     + " --prefix PYTHONPATH : \"$(toPythonPath ${pythonPackages.flask})\""
-    + " --set PATH : \"$out/bin\"";
+    + " --set PATH \"$out/bin\"";
 in
 stdenv.mkDerivation {
   name="ceph-${version}";

From d2fe3405d36d41e80da7c0cfcb4f6bee2db2c9d3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 20 Jul 2015 09:01:20 +0300
Subject: [PATCH 0029/2016] edk2, OVMF: Fix build on GCC 4.9

The toolchain must be correctly specified in the OVMF build or it fails
with 'Unsupported section alignment':

http://hydra.nixos.org/build/23859056
---
 pkgs/development/compilers/edk2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index ebbac8ec355..f68681e6023 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -46,7 +46,7 @@ edk2 = stdenv.mkDerivation {
       configurePhase = ''
         mkdir -v Conf
         sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \
-          's|MYTOOLS|GCC48|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
+          's|MYTOOLS|GCC49|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
           < ${edk2}/BaseTools/Conf/target.template > Conf/target.txt
         sed -e 's|DEFINE GCC48_IA32_PREFIX       = /usr/bin/|DEFINE GCC48_IA32_PREFIX       = ""|' \
           -e 's|DEFINE GCC48_X64_PREFIX        = /usr/bin/|DEFINE GCC48_X64_PREFIX        = ""|' \

From 17d9f9139599862884eb6c86a8fa8c66a26ec3d9 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Mon, 20 Jul 2015 09:16:17 +0200
Subject: [PATCH 0030/2016] pycharm: update 4.5.2 to 4.5.3

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 5d13cf6a4ce..e394ae4d6a3 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.2";
-    build = "141.1580";
+    version = "4.5.3";
+    build = "141.1899";
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "09v1ni06h381y7d5cglifwsz81kln2y4ld7hgpz1sn56fwbi8ld9";
+      sha256 = "13f3mp7gcl27fikxjlwk7n1gyxa46q0wfgniang4knb596wlfli0";
     };
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "4.5.2";
-    build = "141.1580";
+    version = "4.5.3";
+    build = "141.1899";
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1dgpzn7wgaxicgw48z83fp462g5mxsr7iwkgp11ffypz93ba2dm7";
+      sha256 = "00b66fy841vjm54n2fby5wf7y8ihihqgydr6329iv9p5s0mgzh2s";
     };
   };
 

From 1fee4ce381f2bb7eda196bb6a1725fe03824e788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Jul 2015 09:56:02 +0200
Subject: [PATCH 0031/2016] nzbget: fix URLs, fixes #8860

/cc maintainer @pSub.
---
 pkgs/tools/networking/nzbget/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix
index 8d47ab1e167..3497fd8efaf 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/pkgs/tools/networking/nzbget/default.nix
@@ -1,11 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libxml2, ncurses, libsigcxx, libpar2
 , gnutls, libgcrypt, zlib }:
 
+let
+  version = "15.0";
+in
 stdenv.mkDerivation rec {
-  name = "nzbget-15.0";
+  name = "nzbget-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/nzbget/${name}.tar.gz";
+    url = "http://github.com/nzbget/nzbget/releases/download/v${version}/${name}-src.tar.gz";
     sha256 = "02nclq97gqr4zwww4j1l9sds2rwrwwvwvh2gkjhwvr0pb4z3zw9y";
   };
 
@@ -15,7 +18,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://nzbget.sourceforge.net/;
+    homepage = http://nzbget.net;
     license = licenses.gpl2Plus;
     description = "A command line tool for downloading files from news servers";
     maintainers = with maintainers; [ pSub ];

From 617c5fcaf012b3f8278c1bf8642c40396cf916fa Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 12 Jul 2015 17:46:44 -0400
Subject: [PATCH 0032/2016] rainbowstream: purify (close #8791)

This obviates the need for `cc` to be available at run time.
---
 .../python-modules/rainbowstream/image.patch   | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             | 12 ++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/rainbowstream/image.patch

diff --git a/pkgs/development/python-modules/rainbowstream/image.patch b/pkgs/development/python-modules/rainbowstream/image.patch
new file mode 100644
index 00000000000..215152ae4fb
--- /dev/null
+++ b/pkgs/development/python-modules/rainbowstream/image.patch
@@ -0,0 +1,18 @@
+diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
+index f050150..a0fb77d 100644
+--- a/rainbowstream/c_image.py
++++ b/rainbowstream/c_image.py
+@@ -12,11 +12,7 @@ def call_c():
+     """
+     Call the C program for converting RGB to Ansi colors
+     """
+-    library = expanduser('~/.image.so')
+-    sauce = join(dirname(__file__), 'image.c')
+-    if not exists(library) or getmtime(sauce) > getmtime(library):
+-        build = "cc -fPIC -shared -o %s %s" % (library, sauce)
+-        os.system(build + " >/dev/null 2>&1")
++    library = '@CLIB@'
+     image_c = ctypes.cdll.LoadLibrary(library)
+     image_c.init()
+     return image_c.rgb_to_ansi
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 08c0cfee510..222b9150511 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7505,11 +7505,23 @@ let
 
     doCheck = false;
 
+    patches = [
+      ../development/python-modules/rainbowstream/image.patch
+    ];
+
+    postPatch = ''
+      clib=$out/${python.sitePackages}/rainbowstream/image.so
+      substituteInPlace rainbowstream/c_image.py \
+        --replace @CLIB@ $clib
+    '';
+
     preBuild = ''
       export LC_ALL="en_US.UTF-8"
     '';
 
     postInstall = ''
+      mkdir -p $out/lib
+      cc -fPIC -shared -o $clib rainbowstream/image.c
       for prog in "$out/bin/"*; do
         wrapProgram "$prog" \
           --prefix PYTHONPATH : "$PYTHONPATH"

From 004a23f47758ac2593e7a177ee9a45ec1d9a28a4 Mon Sep 17 00:00:00 2001
From: Michael Kuryshev <me@mk9.name>
Date: Sun, 19 Jul 2015 18:52:01 +0300
Subject: [PATCH 0033/2016] mpc: enable on darwin

---
 pkgs/applications/audio/mpc/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index 2f798fff7b9..f37585d3dec 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -13,15 +13,15 @@ stdenv.mkDerivation rec {
 
   preConfigure =
     ''
-      export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion}
+      export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.${if stdenv.isDarwin then mpd_clientlib.majorVersion + ".dylib" else "so." + mpd_clientlib.majorVersion + ".0." + mpd_clientlib.minorVersion}
       export LIBMPDCLIENT_CFLAGS=${mpd_clientlib}
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A minimalist command line interface to MPD";
     homepage = http://www.musicpd.org/clients/mpc/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.algorith ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.algorith ];
+    platforms = with platforms; linux ++ darwin;
   };
 }

From 941f0ff978c1c6235988fbff817812b5b7eaf193 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Mon, 13 Jul 2015 15:01:43 +0200
Subject: [PATCH 0034/2016] litecoin: 0.9.3-preview5 -> 0.10.2.2

---
 pkgs/applications/altcoins/litecoin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index f2235abaaae..4e0198b972d 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.9.3-preview5";
+  version = "0.10.2.2";
 
   src = fetchurl {
     url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz";
-    sha256 = "0nnfz4s2g28jb5fqy6cabsryp3h2amzlyslr6g6k8r1vmzvx5ym6";
+    sha256 = "1p1h2654b7f2lyrmihcjmpmx6sjpkgsifcm2ixxb2g9jh6qq8b4m";
   };
 
   buildInputs = [ pkgconfig autoreconfHook openssl

From 37dcb18a5e1a3adfa5a8276f8835a0ad28aa8f97 Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Sun, 12 Jul 2015 23:05:18 +0200
Subject: [PATCH 0035/2016] steam: add `which` to the environment

Close #8788, fixes #8766.

Some games use it in their starting scripts (notably FTL does that).
---
 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 96f409faef8..ff4b104059d 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -14,6 +14,7 @@ buildFHSUserEnv {
       pkgs.gnome2.zenity
       pkgs.xdg_utils
       pkgs.xlibs.xrandr
+      pkgs.which
     ]
     ++ lib.optional (config.steam.java or false) pkgs.jdk
     ++ lib.optional (config.steam.primus or false) pkgs.primus

From 4f928f3550df3025106d1c7231b703aad28d1510 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 20 Jul 2015 12:19:56 +0300
Subject: [PATCH 0036/2016] nfs-utils: 1.2.5 -> 1.3.2, potentially fixes
 CVE-2013-1923

---
 pkgs/os-specific/linux/nfs-utils/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 6b30104b083..75f25e26804 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,18 +1,18 @@
 { fetchurl, stdenv, tcp_wrappers, utillinux, libcap, libtirpc, libevent, libnfsidmap
-, lvm2, e2fsprogs, python
+, lvm2, e2fsprogs, python, sqlite
 }:
 
 stdenv.mkDerivation rec {
-  name = "nfs-utils-1.2.5";
+  name = "nfs-utils-1.3.2"; # NOTE: when updating, remove the HACK BUG FIX below
 
   src = fetchurl {
     url = "mirror://sourceforge/nfs/${name}.tar.bz2";
-    sha256 = "16ssfkj36ljifyaskgwpd3ys8ylhi5gasq88aha3bhg5dr7yv59m";
+    sha256 = "1xwilpdr1vizq2yhpzxpwqqr9f8kn0dy2wcpc626mf30ybp7572v";
   };
 
   buildInputs =
     [ tcp_wrappers utillinux libcap libtirpc libevent libnfsidmap
-      lvm2 e2fsprogs python
+      lvm2 e2fsprogs python sqlite
     ];
 
   # FIXME: Add the dependencies needed for NFSv4 and TI-RPC.
@@ -32,14 +32,15 @@ stdenv.mkDerivation rec {
       done
       sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c
 
-      # https://bugzilla.redhat.com/show_bug.cgi?id=749195
-      sed -i s,PAGE_SIZE,getpagesize\(\), utils/blkmapd/device-process.c
+      # HACK BUG FIX: needed for 1.3.2
+      # http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=17a3e5bffb7110d46de1bf42b64b90713ff5ea50
+      sed -e 's,daemon_init(!,daemon_init(,' -i utils/statd/statd.c
     '';
 
   preBuild =
     ''
       makeFlags="sbindir=$out/sbin"
-      installFlags="statedir=$TMPDIR" # hack to make `make install' work
+      installFlags="statedir=$TMPDIR statdpath=$TMPDIR" # hack to make `make install' work
     '';
 
   # One test fails on mips.

From 5c31245047a4bd0966059d0d5cd4e701745ee6c4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 20 Jul 2015 12:20:02 +0300
Subject: [PATCH 0037/2016] rpcbind: 0.2.3 -> 1.0.7

---
 pkgs/servers/rpcbind/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index 6eb8a57cab4..6eb58d45838 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -1,16 +1,19 @@
 { fetchurl, stdenv, pkgconfig, libtirpc
 , useSystemd ? true, systemd }:
 
-let version = "0.2.3";
+let version = "1.0.7";
 in stdenv.mkDerivation rec {
   name = "rpcbind-${version}";
   
   src = fetchurl {
     url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2";
-    sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq";
+    sha256 = "14vl0kmavc1fay630f4w8l1hjfzhmcqm8d0akzahhgymh5fw1f7r";
   };
 
   patches = [ ./sunrpc.patch ];
+  postPatch = ''
+    sed -e 's|/usr/include/tirpc|${libtirpc}/include/tirpc|' -i src/Makefile.am -i src/Makefile.in
+  '';
 
   buildInputs = [ libtirpc ]
              ++ stdenv.lib.optional useSystemd systemd;

From 8d507823ca1d2f57d2840bb43c52637bf00315f1 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 20 Jul 2015 11:23:34 +0200
Subject: [PATCH 0038/2016] dwarf-therapist: 30.2.0pre -> 31.0.0.

---
 pkgs/games/dwarf-therapist/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix
index 6d7eaf30736..4e676bf5f9d 100644
--- a/pkgs/games/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-therapist/default.nix
@@ -1,7 +1,7 @@
 { stdenv, coreutils, fetchgit, qt4, dwarf_fortress, bash, makeWrapper }:
 
 let
-  version = "30.2.0pre";
+  version = "31.0.0";
   df = dwarf_fortress;
 in
 stdenv.mkDerivation rec {
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://github.com/splintermind/Dwarf-Therapist.git";
-    rev = "65bb15a29d616d788c20a3344058b7277e4fadba";
-    sha256 = "1q1n9sm0lgmn52m4aigb22cdfbh2s569y1mn5cmimgj600i6c2f2";
+    rev = "refs/tags/v${version}";
+    sha256 = "02d6k8c3vm401v04ln9q405njarx869jpfyf42lwskijrzjygk9x";
   };
 
   # Needed for hashing

From e4fcddf1774785f00ff07e759086a4b8ce9e06d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Jul 2015 12:04:43 +0200
Subject: [PATCH 0039/2016] statifier: fix meta.platforms syntax

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

diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix
index 0e1ecdd6d7d..dd62d6d9d07 100644
--- a/pkgs/os-specific/linux/statifier/default.nix
+++ b/pkgs/os-specific/linux/statifier/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation {
     sed -e s@/usr/@"$out/"@g -i */Makefile src/statifier
     sed -e s@/bin/bash@"${stdenv.shell}"@g -i src/*.sh
   '';
-      
+
   meta = with stdenv.lib; {
     description = "Tool for creating static Linux binaries";
-    platforms = with platforms; [ linux ];
+    platforms = with platforms; linux;
   };
 }

From 855b3c48ab8d8129cddbcf250d6dfa586dbd16b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Jul 2015 12:05:06 +0200
Subject: [PATCH 0040/2016] gcc: fix multilib build

Fixes #8706, thanks to @cpages a lot.
Also ported to gcc5, without testing that one yet.
---
 pkgs/development/compilers/gcc/4.9/default.nix | 2 +-
 pkgs/development/compilers/gcc/5/default.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 14641faa5fe..9069387762f 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -320,7 +320,7 @@ stdenv.mkDerivation ({
       " --with-gnu-as --without-gnu-ld "
       else ""}
     --enable-lto
-    ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
+    ${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"}
     ${if enableShared then "" else "--disable-shared"}
     ${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
     ${optionalString (isl != null) "--with-isl=${isl}"}
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 5e6acea35df..46864c0bb02 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -318,7 +318,7 @@ stdenv.mkDerivation ({
       " --with-gnu-as --without-gnu-ld "
       else ""}
     --enable-lto
-    ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
+    ${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"}
     ${if enableShared then "" else "--disable-shared"}
     ${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
     ${optionalString (isl != null) "--with-isl=${isl}"}

From ce50f2b398e7e095e3106e5c3e20f540fb0ee5aa Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 20 Jul 2015 10:58:49 +0000
Subject: [PATCH 0041/2016] pythonPackages.netcdf4: init at 1.1.8

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 222b9150511..5b565d1242b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3965,6 +3965,41 @@ let
     };
   };
 
+  netcdf4 = buildPythonPackage rec {
+    name = "netCDF4-${version}";
+    version = "1.1.8";
+
+    disabled = isPyPy;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/n/netCDF4/${name}.tar.gz";
+      sha256 = "0y6s8g82rbij0brh9hz3aapyyq6apj8fpmhhlyibz1354as7rjq1";
+    };
+
+    propagatedBuildInputs = with self ; [
+      numpy
+      pkgs.zlib
+      pkgs.netcdf
+      pkgs.hdf5
+      pkgs.curl
+      pkgs.libjpeg
+    ];
+
+    patchPhase = ''
+      export USE_NCCONFIG=0
+      export HDF5_DIR="${pkgs.hdf5}"
+      export NETCDF4_DIR="${pkgs.netcdf}"
+      export CURL_DIR="${pkgs.curl}"
+      export JPEG_DIR="${pkgs.libjpeg}"
+    '';
+
+    meta = {
+      description = "interface to netCDF library (versions 3 and 4)";
+      homepage = https://pypi.python.org/pypi/netCDF4;
+      license = licenses.free;  # Mix of license (all MIT* like)
+    };
+  };
+
   odfpy = buildPythonPackage rec {
     version = "0.9.6";
     name = "odfpy-${version}";

From 615f64dcbe6de193a9c3b0e03591fe623fecaeb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Jul 2015 13:42:30 +0200
Subject: [PATCH 0042/2016] gcc_multi: disable the hook moving lib64 to lib

This was preventing wine from build, and we typically don't want it
anyway in multilib builds. /cc #8706.
---
 pkgs/build-support/cc-wrapper/default.nix |  5 +++--
 pkgs/top-level/all-packages.nix           | 14 +++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index ec024c72481..57607ba25b9 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -7,7 +7,7 @@
 
 { name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? ""
 , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
-, zlib ? null, extraPackages ? []
+, zlib ? null, extraPackages ? [], extraBuildCommands ? ""
 , dyld ? null # TODO: should this be a setup-hook on dyld?
 , isGNU ? false, isClang ? false
 }:
@@ -232,7 +232,8 @@ stdenv.mkDerivation {
 
       substituteAll ${./add-flags} $out/nix-support/add-flags.sh
       cp -p ${./utils.sh} $out/nix-support/utils.sh
-    '';
+    ''
+    + extraBuildCommands;
 
   # The dynamic linker has different names on different Linux platforms.
   dynamicLinker =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32dda557f1d..ea85bd3547b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3687,8 +3687,12 @@ let
 
   gcc_multi =
     if system == "x86_64-linux" then lowPrio (
-      wrapCCWith (import ../build-support/cc-wrapper) glibc_multi (gcc.cc.override {
-        stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi gcc.cc);
+      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);
         profiledCompiler = false;
         enableMultilib = true;
       }))
@@ -4741,7 +4745,7 @@ let
 
   win32hello = callPackage ../development/compilers/visual-c++/test { };
 
-  wrapCCWith = ccWrapper: libc: baseCC: ccWrapper {
+  wrapCCWith = ccWrapper: libc: extraBuildCommands: baseCC: ccWrapper {
     nativeTools = stdenv.cc.nativeTools or false;
     nativeLibc = stdenv.cc.nativeLibc or false;
     nativePrefix = stdenv.cc.nativePrefix or "";
@@ -4750,10 +4754,10 @@ let
     dyld = if stdenv.isDarwin then darwin.dyld else null;
     isGNU = baseCC.isGNU or false;
     isClang = baseCC.isClang or false;
-    inherit stdenv binutils coreutils zlib;
+    inherit stdenv binutils coreutils zlib extraBuildCommands;
   };
 
-  wrapCC = wrapCCWith (makeOverridable (import ../build-support/cc-wrapper)) stdenv.cc.libc;
+  wrapCC = wrapCCWith (makeOverridable (import ../build-support/cc-wrapper)) stdenv.cc.libc "";
   # legacy version, used for gnat bootstrapping
   wrapGCC-old = baseGCC: (makeOverridable (import ../build-support/gcc-wrapper-old)) {
     nativeTools = stdenv.cc.nativeTools or false;

From 745690717e24179d48e556ae487af77260eee49a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 20 Jul 2015 09:19:12 -0400
Subject: [PATCH 0043/2016] build-maven: Add handling for snapshot version
 resolution

---
 pkgs/build-support/build-maven.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index a1faf8060be..ff91828eeca 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -15,15 +15,27 @@ infoFile: let
 
   script = writeText "build-maven-repository.sh" ''
     ${lib.concatStrings (map (dep: let
-      inherit (dep) url sha1 groupId artifactId version authenticated;
+      inherit (dep)
+        url sha1 groupId artifactId version
+        authenticated metadata extension repository-id;
+
+      versionDir = dep.unresolved-version or version;
 
       fetch = (if authenticated then requireFile else fetchurl) {
         inherit url sha1;
       };
+
+      fetchMetadata = (if authenticated then requireFile else fetchurl) {
+        inherit (metadata) url sha1;
+      };
     in ''
-      dir=$out/$(echo ${groupId} | sed 's|\.|/|g')/${artifactId}/${version}
+      dir=$out/$(echo ${groupId} | sed 's|\.|/|g')/${artifactId}/${versionDir}
       mkdir -p $dir
       ln -sv ${fetch} $dir/${fetch.name}
+      ${lib.optionalString (dep ? metadata) ''
+        ln -svf ${fetchMetadata} $dir/maven-metadata-${repository-id}.xml
+        ln -sv ${fetch} $dir/$(echo ${fetch.name} | sed 's|${version}|${dep.unresolved-version}|')
+      ''}
     '') info.dependencies)}
   '';
 

From 23187c343109f5420f56f52107dce29b65bcf48f Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Mon, 20 Jul 2015 14:28:49 +0100
Subject: [PATCH 0044/2016] docker: allow the user to override postStart

My use-case: passing -H SOM.EIP.ADD.RES:PORT doesn't result in a .sock
file so the service would never go up.
---
 nixos/modules/virtualisation/docker.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index ef9cc2280db..2339cf7c649 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -54,6 +54,21 @@ in
           '';
       };
 
+    postStart =
+      mkOption {
+        type = types.string;
+        default = ''
+          while ! [ -e /var/run/docker.sock ]; do
+            sleep 0.1
+          done
+        '';
+        description = ''
+          The postStart phase of the systemd service. You may need to
+          override this if you are passing in flags to docker which
+          don't cause the socket file to be created.
+        '';
+      };
+
 
   };
 
@@ -106,11 +121,7 @@ in
         path = [ pkgs.kmod ];
         environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
 
-        postStart = ''
-          while ! [ -e /var/run/docker.sock ]; do
-            sleep 0.1
-          done
-        '';
+        postStart = cfg.postStart;
 
         # Presumably some containers are running we don't want to interrupt
         restartIfChanged = false;

From 17a65c4bf043aaa35b6224a27a3d0a9df546ca85 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 20 Jul 2015 08:41:57 -0500
Subject: [PATCH 0045/2016] qt5.base: override postgresql autodetection

---
 pkgs/development/libraries/qt-5/5.4/qtbase.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index cf960c39b40..441dbdd5c66 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -143,6 +143,11 @@ stdenv.mkDerivation {
     -${optionalString (buildTests == false) "no"}make tests
   '';
 
+  # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
+  # if dependency paths contain the string "pq", which can occur in the hash.
+  # To prevent these failures, we need to override PostgreSQL detection.
+  PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
+
   propagatedBuildInputs = [
     xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
     fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre

From 965f330c654553400611aa51d6898a9dd14e40dd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 20 Jul 2015 08:46:20 -0500
Subject: [PATCH 0046/2016] qt5.base: disable unsupported SIMD instruction sets

If not explicitly disabled, Qt tries to detect support for the various
instruction sets. As a result, binaries built on Hydra may use
instruction sets unsupported by clients.
---
 pkgs/development/libraries/qt-5/5.4/qtbase.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index 441dbdd5c66..ecefa891332 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -25,6 +25,8 @@
 
 with stdenv.lib;
 
+let system-x86_64 = elem stdenv.system platforms.x86_64; in
+
 stdenv.mkDerivation {
 
   name = "qtbase-${version}";
@@ -125,6 +127,16 @@ stdenv.mkDerivation {
     -no-linuxfb
     -no-kms
 
+    ${optionalString (!system-x86_64) "-no-sse2"}
+    -no-sse3
+    -no-ssse3
+    -no-sse4.1
+    -no-sse4.2
+    -no-avx
+    -no-avx2
+    -no-mips_dsp
+    -no-mips_dspr2
+
     -system-zlib
     -system-libpng
     -system-libjpeg

From 07fd9384f57530c8e7b2a0669a11da2b7fa1a024 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jul 2015 16:39:39 +0200
Subject: [PATCH 0047/2016] texlive: flip the default for the assertion so that
 normal users can build it

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

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index fe8809e8263..3acfffafde2 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -1,7 +1,7 @@
 args : with args;
 
 rec {
-  src = assert config.allowTexliveBuilds or false; fetchurl {
+  src = assert config.allowTexliveBuilds or true; fetchurl {
     url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140926.35254.orig.tar.xz;
     sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3";
   };

From 46516fc19e1bac21b31b9b3a44f71bcf0a52ed9b Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 20 Jul 2015 16:52:45 +0200
Subject: [PATCH 0048/2016] connmanui: update to latest (e4a8ddcca08 ->
 fce0af94e12)

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

diff --git a/pkgs/tools/networking/connmanui/default.nix b/pkgs/tools/networking/connmanui/default.nix
index 280d3d9f9fc..32ae736494f 100644
--- a/pkgs/tools/networking/connmanui/default.nix
+++ b/pkgs/tools/networking/connmanui/default.nix
@@ -2,17 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "connmanui-${version}";
-  version = "e4a8ddcca0870eb2ece5a7e3ea0296de9c86e5b2";
+  rev = "fce0af94e121bde77c7fa2ebd6a319f0180c5516";
+  version = "22062015-${rev}";
 
   src = fetchgit {
+    inherit rev;
     url = "git://github.com/tbursztyka/connman-ui.git";
-    rev = version;
-    sha256 = "0rml52v81s7hr0g6qbj5bamli08kn66hay84qicx8sy8679wg443";
+    sha256 = "2072b337379b849cc55a19a3bb40834941e3f82b3924ef5d9b29e887fd19055e";
   };
 
   buildInputs = [ autoconf automake libtool glib gtk3 dbus pkgconfig file intltool connman ];
 
   preConfigure = ''
+    rm m4/intltool.m4
+    ln -s ${intltool}/share/aclocal/intltool.m4 m4/
     set -e
     ./autogen.sh
     sed -i "s/\/usr\/bin\/file/file/g" ./configure

From eb9475d110f6cb1d37fa31f5272a44ba039036e7 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Mon, 20 Jul 2015 17:09:33 +0200
Subject: [PATCH 0049/2016] nox: updated to 0.0.2

---
 pkgs/tools/package-management/nox/default.nix |  6 +--
 .../package-management/nox/show-trace.patch   | 41 -------------------
 2 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nox/show-trace.patch

diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix
index bbb576400f0..2930e6fdce2 100644
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/pkgs/tools/package-management/nox/default.nix
@@ -2,16 +2,14 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "nox-${version}";
-  version = "0.0.1";
+  version = "0.0.2";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/n/nix-nox/nix-nox-${version}.tar.gz";
-    sha256 = "1s1jhickdhym70qrb5h4qxq1mvkpwgdppqpfb2jnpfaf1az6c207";
+    sha256 = "1wpxh5fhj8nx4yx4cvmc087cnf4iqwxf7zd7rdh2ln3pgxrjfral";
   };
 
-  patches = [ ./show-trace.patch ];
-
   buildInputs = [ pythonPackages.pbr ];
 
   pythonPath = with pythonPackages; [
diff --git a/pkgs/tools/package-management/nox/show-trace.patch b/pkgs/tools/package-management/nox/show-trace.patch
deleted file mode 100644
index 6b464d3a4b2..00000000000
--- a/pkgs/tools/package-management/nox/show-trace.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
-Date: Tue, 2 Jun 2015 13:04:19 +0200
-Subject: [PATCH] Run `nix-env` & `nix-shell` with `--show-trace`
-
-Evaluation is broken often enough that this seems wise.
-Debugging such errors without a backtrace is most unpleasant.
-
-diff -Naur nix-nox-0.0.1/nox/nixpkgs_repo.py nix-nox-0.0.1b/nox/nixpkgs_repo.py
---- nox/nox/nixpkgs_repo.py	2014-10-26 21:50:33.000000000 +0100
-+++ nox/nox/nixpkgs_repo.py	2015-07-03 04:46:08.114975479 +0200
-@@ -75,7 +75,7 @@
- 
- def packages(path):
-     """List all nix packages in the repo, as a set"""
--    output = subprocess.check_output(['nix-env', '-f', path, '-qaP', '--drv-path'],
-+    output = subprocess.check_output(['nix-env', '-f', path, '-qaP', '--drv-path', '--show-trace'],
-                                      universal_newlines=True)
-     return set(output.split('\n'))
- 
-diff -Naur nix-nox-0.0.1/nox/search.py nix-nox-0.0.1b/nox/search.py
---- nox/nox/search.py	2014-09-20 14:55:33.000000000 +0200
-+++ nox/nox/search.py	2015-07-03 04:46:54.264813143 +0200
-@@ -10,7 +10,7 @@
- 
- def nix_packages_json():
-     click.echo('Refreshing cache')
--    output = subprocess.check_output(['nix-env', '-qa', '--json'],
-+    output = subprocess.check_output(['nix-env', '-qa', '--json', '--show-trace'],
-                                      universal_newlines=True)
-     return json.loads(output)
- 
-@@ -70,7 +70,7 @@
-                                         value_proc=parse_input)
-         attributes = [p.attribute for p in packages]
-         if action == 'install':
--            subprocess.check_call(['nix-env', '-iA'] + attributes)
-+            subprocess.check_call(['nix-env', '-iA', '--show-trace'] + attributes)
-         elif action == 'shell':
-             attributes = [a[len('nixpkgs.'):] for a in attributes]
--            subprocess.check_call(['nix-shell', '-p'] + attributes)
-+            subprocess.check_call(['nix-shell', '-p', '--show-trace'] + attributes)

From cbf14b9d8f86fc19c6a04767893a07ae9bb20c9f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:26:53 -0500
Subject: [PATCH 0050/2016] nixpkgs: dd-agent 5.2.3 -> 5.4.3

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

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 8c340460b75..5838d5407be 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -2,14 +2,14 @@
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "5.2.3";
+  version = "5.4.3";
   name = "dd-agent-${version}";
 
   src = fetchFromGitHub {
-    owner = "DataDog";
-    repo = "dd-agent";
-    rev = version;
-    sha256 = "05flcbzpnmhf6qskkccbfk957sl9hhydlp4p5vqhs62hkpwmqwan";
+    owner  = "datadog";
+    repo   = "dd-agent";
+    rev    = version;
+    sha256 = "07cign0ydxf1h6xsyi3iviywlm9x6d6rcaz46f3wipby6mv1s5dc";
   };
 
   buildInputs = [

From 6dac59b09622a10234605cea1841ffb04cc318d8 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:28:49 -0500
Subject: [PATCH 0051/2016] nixpkgs: libseccomp 2.2.1 -> 2.2.3

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

diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 61f22701111..af9f017ac73 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name    = "libseccomp-${version}";
-  version = "2.2.1";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "seccomp";
     repo = "libseccomp";
     rev = "v${version}";
-    sha256 = "153k3jflcgij19nxghmwlvqlngl84vkld514d31490c6sfkr5fy2";
+    sha256 = "0pl827qjls5b6kjj8qxxdwcn6rviqbm5xjqf0hgx6b04c836mswx";
   };
 
   buildInputs = [ autoreconfHook getopt ];

From 71d4b4baae379e0a6e1bea5db1ae5eba31daad0f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:31:02 -0500
Subject: [PATCH 0052/2016] nixpkgs: lockdep 3.19.1 -> 4.1.2

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

diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix
index 612291e62e4..7765f5f8b9c 100644
--- a/pkgs/os-specific/linux/lockdep/default.nix
+++ b/pkgs/os-specific/linux/lockdep/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name    = "lockdep-${version}";
-  version = "3.19.1";
-  fullver = "3.19.1";
+  version = "4.1.2";
+  fullver = "4.1.2";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0qx7vxmlcwr4nvzf4wq0da7xwzqw4b67h9a5rfpxgg9mayk3czvi";
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "1mdyjhnzhh254cblahqmpsk226z006z6sm9dmwvg6jlhpsw4cjhy";
   };
 
   preConfigure = "cd tools/lib/lockdep";

From 131e41191bf564323977e71a5f2361af0c64be81 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:44:35 -0500
Subject: [PATCH 0053/2016] nixpkgs: nginxUnstable 1.9.2 -> 1.9.3

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

diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index 907fe98d681..990d3d52d30 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -10,10 +10,10 @@
 with stdenv.lib;
 
 let
-  version = "1.9.2";
+  version = "1.9.3";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "0y7d87v9rvc4xvxaz8cag6zhdg7lfp3z65ain665q02aw5dl5dl0";
+    sha256 = "1svkyrh31g9hzfmj0xwc167sz0b1fn4i62mwipdjy9ia3cscb622";
   };
 
   rtmp-ext = fetchFromGitHub {

From 8d7dd4cf53ed04d6ffb21448b789bf090f60048e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:48:50 -0500
Subject: [PATCH 0054/2016] nixpkgs: re2c 0.14.2 -> 0.14.3

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

diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index ce9941b2362..d4b3e56ebe3 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "re2c-${version}";
-  version = "0.14.2";
+  version = "0.14.3";
 
   src = fetchurl {
     url    = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz";
-    sha256 = "0c0w5w1dp9v9d0a6smjbnk6zvfs77fx1xd7damap3x3sjxiyn0m7";
+    sha256 = "113yj5h38isfsjigqvb2j3ammfmxckgwyxmm0h4fyflzb7ghcs0w";
   };
 
   meta = {

From f07d5a244fac2b34a4ee683af102d01cd5ac2c65 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:49:03 -0500
Subject: [PATCH 0055/2016] nixpkgs: ninja 1.5.3 -> 1.6.0

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

diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index 5ba5d86ac77..c1ef980e82d 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "ninja-${version}";
-  version = "1.5.3";
+  version = "1.6.0";
 
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/martine/ninja/archive/v${version}.tar.gz";
-    sha256 = "1h3yfwcfl61v493vna6jia2fizh8rpig7qw2504cvkr6gid3p5bw";
+    sha256 = "1ryd1686bd31gfdjxnqm6k1ybnjmjz8v97px7lmdkr4g0vxqhgml";
   };
 
   buildInputs = [ python asciidoc re2c ];

From b81c21428c4abb9a2c7789ca0fdd1494e640111e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:50:37 -0500
Subject: [PATCH 0056/2016] nixpkgs: pax-utils 1.0.3 -> 1.0.4

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

diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 266fee9e493..d698fcf1b7e 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pax-utils-${version}";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchurl {
     url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz";
-    sha256 = "0w2nddgany3s0znyj6zizlvn8y5vba9x49jm5nliv13p3x7ajdc5";
+    sha256 = "1wymfsir2s22zqjdwnwv7bn075vzzlhssgwxnkz33i2d5pr6rqgp";
   };
 
   makeFlags = [

From c2f1ac98855c6ed7eddc6f616aaa590758d89f53 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:52:06 -0500
Subject: [PATCH 0057/2016] nixpkgs: ssdeep 2.12 -> 2.13

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

diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix
index 7ec4934805b..a17fc36b013 100644
--- a/pkgs/tools/security/ssdeep/default.nix
+++ b/pkgs/tools/security/ssdeep/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "ssdeep-${version}";
-  version = "2.12";
+  version = "2.13";
 
   src = fetchurl {
     url    = "mirror://sourceforge/ssdeep/${name}.tar.gz";
-    sha256 = "1pjb3qpcn6slfqjv23jf7i8zf7950b7h27b0v0dva5pxmn3rw149";
+    sha256 = "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f";
   };
 
   # For some reason (probably a build system bug), the binary isn't

From f32f52c208cb97246034190158dd6512915e5316 Mon Sep 17 00:00:00 2001
From: James Felix Black <james_black@apple.com>
Date: Mon, 20 Jul 2015 11:52:18 -0400
Subject: [PATCH 0058/2016] gxmessage: init at 3.4.3

A dropin replacement for xmessage, built against GTK+3.
---
 pkgs/applications/misc/gxmessage/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/misc/gxmessage/default.nix

diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix
new file mode 100644
index 00000000000..ce8109717d4
--- /dev/null
+++ b/pkgs/applications/misc/gxmessage/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo}:
+
+stdenv.mkDerivation rec {
+  name = "gxmessage-${version}";
+  version = "3.4.3";
+
+  src = fetchurl {
+    url = "http://homepages.ihug.co.nz/~trmusson/stuff/${name}.tar.gz";
+    sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05";
+  };
+
+  buildInputs = [ intltool gnome3.gtk pkgconfig texinfo ];
+  meta = {
+    description = "a GTK enabled dropin replacement for xmessage";
+    homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [jfb];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea85bd3547b..b984482a453 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11607,6 +11607,8 @@ let
 
   guvcview = callPackage ../os-specific/linux/guvcview { };
 
+  gxmessage = callPackage ../applications/misc/gxmessage { };
+
   hackrf = callPackage ../applications/misc/hackrf { };
 
   hello = callPackage ../applications/misc/hello/ex-2 { };

From f6f5b34977f28278af9971a527b12663791a324c Mon Sep 17 00:00:00 2001
From: Rehno Lindeque <errantkid@gmail.com>
Date: Mon, 20 Jul 2015 19:58:56 +0000
Subject: [PATCH 0059/2016] vimPlugins: add vim-multiple-cursors

---
 pkgs/misc/vim-plugins/default.nix      | 12 ++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index bc568f73945..ba7fda90a70 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -59,6 +59,7 @@ rec {
   hoogle              = Hoogle;
   ipython             = vim-ipython;
   latex-live-preview  = vim-latex-live-preview;
+  multiple-cursors    = vim-multiple-cursors;
   necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
   neocomplete         = neocomplete-vim;
   neosnippet          = neosnippet-vim;
@@ -451,6 +452,17 @@ rec {
 
   };
 
+  vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-multiple-cursors-2015-05-29";
+    src = fetchgit {
+      url = "git://github.com/terryma/vim-multiple-cursors";
+      rev = "3199d34f57e1e20d2dd807b31a5a72d7f7d42e96";
+      sha256 = "26b43c921b416cc19482d03435516d42a209ab104bac9979b073d0db61e95186";
+    };
+    dependencies = [];
+
+  };
+
   vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-nerdtree-tabs-2014-09-25";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index f7b01d8af7f..be9914ef8cf 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -96,6 +96,7 @@
 "vim-gitgutter"
 "vim-iced-coffee-script"
 "vim-latex-live-preview"
+"vim-multiple-cursors"
 "vim-signature"
 "vim-snippets"
 "vim2hs"

From 4d36b10f90a7fcf794bf3172ed6ffa7e0df147db Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 20 Jul 2015 15:03:52 -0500
Subject: [PATCH 0060/2016] qt53: override postgresql autodetection

---
 pkgs/development/libraries/qt-5/5.3/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
index 693f62a63eb..0e606d03db2 100644
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@@ -144,6 +144,11 @@ stdenv.mkDerivation rec {
     -${optionalString (buildTests == false) "no"}make tests
   '';
 
+  # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
+  # if dependency paths contain the string "pq", which can occur in the hash.
+  # To prevent these failures, we need to override PostgreSQL detection.
+  PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
+
   propagatedBuildInputs = [
     xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
     fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre

From 6a10139bbaf7ba744f543217a33880c728e2dba0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 20 Jul 2015 15:04:44 -0500
Subject: [PATCH 0061/2016] qt53: disable unsupported SIMD instruction sets

---
 pkgs/development/libraries/qt-5/5.3/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
index 0e606d03db2..14675af48fb 100644
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@@ -22,6 +22,8 @@ let
   ver = "${v_maj}.${v_min}";
 in
 
+let system-x86_64 = elem stdenv.system platforms.x86_64; in
+
 stdenv.mkDerivation rec {
   name = "qt-${ver}";
 
@@ -126,6 +128,16 @@ stdenv.mkDerivation rec {
     -no-linuxfb
     -no-kms
 
+    ${optionalString (!system-x86_64) "-no-sse2"}
+    -no-sse3
+    -no-ssse3
+    -no-sse4.1
+    -no-sse4.2
+    -no-avx
+    -no-avx2
+    -no-mips_dsp
+    -no-mips_dspr2
+
     -system-zlib
     -system-libpng
     -system-libjpeg

From 60c6a9921e192fda713ce156155364cd27a8cc3f Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 20 Jul 2015 14:22:43 -0700
Subject: [PATCH 0062/2016] emacs: Update Mac Port Emacs to 24.5-mac-5.9

---
 pkgs/applications/editors/emacs-24/macport-24.5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index a9f3e53fb59..6ea9fbfdbb6 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   emacsName = "emacs-24.5";
-  name = "${emacsName}-mac-5.8";
+  name = "${emacsName}-mac-5.9";
 
   #builder = ./builder.sh;
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
-    sha256 = "0ljhrag5lag8i72xfsmgk9lndqv0b3sahyyd48svj6jlg4jachir";
+    sha256 = "1xjskagjlnni1nqshszbvk8h8vhwq9sk09l25vb6fijn4g9akwqr";
   };
 
   buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];

From 17d045c74b9211f485b6dd72fe637c52774ac918 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 20 Jul 2015 18:07:06 -0700
Subject: [PATCH 0063/2016] ceph-git: 2015-07-15 -> 2015-07-20

---
 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 341c24c04a3..f65b7ea7846 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, git, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-07-15";
+  version = "2015-07-20";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "66dcbaed3c3c8e4b5367ba1cd2859271e692e7e0";
-    sha256 = "05jba4zjrkksrra6rz4kby8vv4ja8fa73wvwcw3yn3mn1x9kyz2g";
+    rev = "ce534e1e0addfe93194a553cec98799ea97affe4";
+    sha256 = "19i9fp06fdyhx5x6ryw5q81id0354601yxnywvir3i9hy51p9xaz";
   };
 
   patches = [ ./fix-pythonpath.patch ];

From 35f8386e782e31315419454fdfebdf26ef445397 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 20 Jul 2015 18:08:29 -0700
Subject: [PATCH 0064/2016] chromium-dev: 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 5410293a792..3e2f256eec8 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,10 +1,10 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "45.0.2454.6";
-    sha256 = "09bhbq3hvsfiac7w6ajd6n1lcdzf2isg1s9sqabrnx9blyds7msh";
-    sha256bin32 = "1f38rfd9v91inhd9m2sfcj4bpvq5f03zn8ypvacr9mpwc47rylx3";
-    sha256bin64 = "1bfjpjisa0hqiy8kmmgh2mr6zyifpmhr7k5ai44h5szf36768bn6";
+    version = "45.0.2454.7";
+    sha256 = "19xjdp0zxr96r2fx9wf30wldalrh393p2dhqwp2n1m751vizbj5s";
+    sha256bin32 = "1id1z3m0pc2lxh4lp9r6babh098gfyz4dda931yjkxhzb9rw1v0d";
+    sha256bin64 = "1sksf651z1sqgh9pwdm5dksqnb0lzhwabxj3myg4w5kxi8s4pi8l";
   };
   beta = {
     version = "44.0.2403.89";

From 337bd6a190ec7add783886092c239876bfd56c90 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 21:44:08 -0500
Subject: [PATCH 0065/2016] nixpkgs: verilator 3.872 -> 3.874

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

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 635e89dadc8..825f342b443 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "verilator-${version}";
-  version = "3.872";
+  version = "3.874";
 
   src = fetchurl {
     url    = "http://www.veripool.org/ftp/${name}.tgz";
-    sha256 = "113ha7vy6lsi9zygiy3rnsd3dhi5y8lkfsfrh0nwzady7147l2yh";
+    sha256 = "070binwp0jnashi6w45km26vrn6200b8hdg4179lcqyzdxi8c06j";
   };
 
   enableParallelBuilding = true;

From 4a6b7fc5638372729f64f90514d4cfa1983fd680 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 21:46:30 -0500
Subject: [PATCH 0066/2016] nixpkgs: stunnel 5.16 -> 5.20

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

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index ef9c56deacb..31acb8dd9ec 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.16";
+  version = "5.20";
 
   src = fetchurl {
     url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "13b0ad7smz4949hchdgsx3yjr5i3z8flwiy8w6xalvk2n8zykdxn";
+    sha256 = "0ar940mw5sjxkh98d6wnrd366jfkqirbyf2b5kcdk1vjk9ra6dja";
   };
 
   buildInputs = [ openssl ];

From 3793ff52903dd5d9fb493c0022c06ea5ef018cb3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 21:50:05 -0500
Subject: [PATCH 0067/2016] nixpkgs: torsocks 2.0.0 -> 2.1.0

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

diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
index d4a725fa04a..d7b0139df70 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "torsocks-${version}";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchgit {
     url    = meta.repositories.git;
     rev    = "refs/tags/v${version}";
-    sha256 = "e3868ae8baadce1854cc9e604a5fcfa0433a15e4eb1223cc9da5b3c586db0048";
+    sha256 = "1q7rbf0j54jh17qs76b6k9hzv4sh4044qfzidjrp6gx576ysrvsf";
   };
 
   buildInputs = [ autoreconfHook ];

From 055ad0e4e967897e8c531c84a8ff8ec0b3ca6185 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 20 Jul 2015 20:03:42 -0700
Subject: [PATCH 0068/2016] remove obsolete patch application from haskell HEAD
 packages

---
 .../haskell-modules/configuration-ghc-head.nix         | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 37cb69160b0..0eff5705805 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -53,16 +53,6 @@ self: super: {
   # https://github.com/haskell-suite/haskell-src-exts/issues/224
   haskell-src-exts = dontCheck super.haskell-src-exts;
 
-  mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
-    url = "https://github.com/snoyberg/mono-traversable/pull/77.patch";
-    sha256 = "1qrvrh3cqfkymi5yb9y9z88rq4n7ag0ac2k00mcnqh4dz1vh4fg1";
-  });
-  yesod-auth = appendPatch super.yesod-auth (pkgs.fetchpatch {
-    url = "https://github.com/yesodweb/yesod/pull/1006.patch";
-    sha256 = "0l6wjj8cfz6jy6j92kywsccafyffhlm5240q82bzirb278adqvar";
-    stripLen = 1;
-  });
-
   # Setup: At least the following dependencies are missing: base <4.8
   hspec-expectations = overrideCabal super.hspec-expectations (drv: {
     patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";

From f7d962cd423418cecedf48335cdf692fa7b04c52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 21 Jul 2015 10:47:28 +0200
Subject: [PATCH 0069/2016] aiccu: patch gnutls api change

---
 pkgs/tools/networking/aiccu/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/networking/aiccu/default.nix b/pkgs/tools/networking/aiccu/default.nix
index dd53234906d..81d19646a95 100644
--- a/pkgs/tools/networking/aiccu/default.nix
+++ b/pkgs/tools/networking/aiccu/default.nix
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gnutls iproute makeWrapper ];
 
+  patches = [
+    (fetchurl {
+      url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/gnutls-3.4.0.patch?h=packages/aiccu&id=cc6decc4e734420e4c5d0cd28652077f6bd88d84";
+      sha256 = "1ni3lhwy3r54js124p7fhm1my82a703chvh07vrhslb4v4b71g5s";
+      name = "gnutls-3.4.0.patch";
+    })
+  ];
+
   configureFlags = "--prefix=$out";
   installPhase = ''
     install -D -m 755 unix-console/aiccu $out/bin/aiccu

From 768daf76912385bf6bb106d802bdb3345211de69 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 10:51:02 +0200
Subject: [PATCH 0070/2016] anki: fix build (ZHF)

---
 pkgs/games/anki/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index af90c826705..8c5ad4ab0d8 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     buildInputs = [ python py.wrapPython lame mplayer libpulseaudio ];
 
     preConfigure = ''
-      substituteInPlace anki \
+      substituteInPlace anki/anki \
         --replace /usr/share/ $out/share/
 
       substituteInPlace Makefile \

From 69afeeba322743e512370863d5531bd0a4e72f43 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 11:03:11 +0200
Subject: [PATCH 0071/2016] mechanize: 0.1.11 -> 0.2.5 (ZHF). Old mechanize
 failed to build due to setuptools bump.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aabd4eebd90..2537011f98f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7351,16 +7351,18 @@ let
 
 
   mechanize = buildPythonPackage (rec {
-    name = "mechanize-0.1.11";
+    name = "mechanize-0.2.5";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
-      url = "http://wwwsearch.sourceforge.net/mechanize/src/${name}.tar.gz";
-      sha256 = "1h62mwy4iz09jqz17nrb9j8y0djd500zdfqwrz9xmdwqzqwixkj2";
+      url = "https://pypi.python.org/packages/source/m/mechanize/${name}.tar.gz";
+      sha256 = "0rj7r166i1dyrq0ihm5rijfmvhs8a04im28lv05c0c3v206v4rrf";
     };
 
     propagatedBuildInputs = with self; [ clientform ];
 
+    doCheck = false;
+
     meta = {
       description = "Stateful programmatic web browsing in Python";
 

From 0907d28da4a49e5474ebca279d8e0beecaa50163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 21 Jul 2015 11:11:48 +0200
Subject: [PATCH 0072/2016] opencascade: fix the build, really now

---
 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 ea85bd3547b..32452c5e78a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7650,6 +7650,7 @@ let
 
   opencascade = callPackage ../development/libraries/opencascade {
     tcl = tcl-8_5;
+    tk = tk-8_5;
   };
 
   opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix {

From 8050aa1c806aa9845c7bf4556fa4e097e697c060 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 19 Jul 2015 22:05:32 +0200
Subject: [PATCH 0073/2016] scsh: 0.6.7 -> 0.7 pre-release

The scsh HEAD is buildable, whereas 0.6.7 segfaults during image creation.
---
 .../development/interpreters/scsh/default.nix | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix
index 98b4f55f79b..ad2bf945f96 100644
--- a/pkgs/development/interpreters/scsh/default.nix
+++ b/pkgs/development/interpreters/scsh/default.nix
@@ -1,26 +1,22 @@
-{stdenv, fetchurl}:
-
-let
-  pname = "scsh";
-  version = "0.6.7";
-  name = "${pname}-${version}";
-in
+{ stdenv, fetchgit, autoconf, automake, autoreconfHook, scheme48 }:
 
 stdenv.mkDerivation {
-  inherit name;
+  name = "scsh-0.7pre";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "c4a9f7df2a0bb7a7aa3dafc918aa9e9a566d4ad33a55f0192889de172d1ddb7f";
+  src = fetchgit {
+    url = "git://github.com/scheme/scsh.git";
+    rev = "f99b8c5293628cfeaeb792019072e3a96841104f";
+    fetchSubmodules = true;
+    sha256 = "0fz1r0bmiii9ld91r84dqkqwhnqk0h6drdycq93zcy5ndyn12fqp";
   };
 
-  meta = {
+  buildInputs = [ autoconf automake autoreconfHook scheme48 ];
+  configureFlags = ''--with-scheme48=${scheme48}'';
+
+  meta = with stdenv.lib; {
     description = "A Scheme shell";
-    longDescription = ''
-      SCSH is an implementation of the Scheme shell.  It is implemented as
-      a heap image which is interpreted by the Scheme 48 virtual machine.
-    '';
     homepage = http://www.scsh.net/;
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ joachifm ];
   };
 }

From b9f4c3b981828827806e31716e689268d4d40fc0 Mon Sep 17 00:00:00 2001
From: Sean Leather <sean.leather@gmail.com>
Date: Tue, 21 Jul 2015 11:37:31 +0200
Subject: [PATCH 0074/2016] closure-compiler: 20150315 -> 20150609

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

diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 2135e75a07a..9d9eb42b064 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "closure-compiler-${version}";
-  version = "20150315";
+  version = "20150609";
 
   src = fetchurl {
     url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "1vzwyhpqbrndg7mri81f1b2yi8cshw5pghvdda9vdxgq465sa52f";
+    sha256 = "0347j50kg41agrvpb29vp69ra912ljhp206z9kbrk84lxpmx19rp";
   };
 
   phases = [ "installPhase" ];

From 5317cf9ff413d18700f441a0967f82d3d3a16d7d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 11:40:04 +0200
Subject: [PATCH 0075/2016] go: 1.0 and 1.2 not supported on i686 (ZHF)

---
 pkgs/development/compilers/go/1.2.nix     | 2 +-
 pkgs/development/compilers/go/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index bbedea812b8..7aaedcb365d 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -87,6 +87,6 @@ stdenv.mkDerivation {
     description = "The Go Programming language";
     license = licenses.bsd3;
     maintainers = with maintainers; [ pierron viric ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix
index b35159c10e7..b16ce93a3c5 100644
--- a/pkgs/development/compilers/go/default.nix
+++ b/pkgs/development/compilers/go/default.nix
@@ -90,6 +90,6 @@ stdenv.mkDerivation {
     description = "The Go Programming language";
     license = "BSD";
     maintainers = with stdenv.lib.maintainers; [ pierron viric ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }

From 02b1c2727bc7b0cab3085b4c20c9e1615d0af2b7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 11:41:01 +0200
Subject: [PATCH 0076/2016] go: rename default.nix to 1.0.nix

---
 pkgs/development/compilers/go/{default.nix => 1.0.nix} | 0
 pkgs/top-level/all-packages.nix                        | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/compilers/go/{default.nix => 1.0.nix} (100%)

diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/1.0.nix
similarity index 100%
rename from pkgs/development/compilers/go/default.nix
rename to pkgs/development/compilers/go/1.0.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32452c5e78a..1e55145c312 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3970,7 +3970,7 @@ let
 
   dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { inherit stdenv fetchNuGet; });
 
-  go_1_0 = callPackage ../development/compilers/go { };
+  go_1_0 = callPackage ../development/compilers/go/1.0.nix { };
 
   go_1_1 =
     if stdenv.isDarwin then

From a3552280f82127f998c150be2d5582890a3bf016 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 11 May 2015 18:47:56 -0400
Subject: [PATCH 0077/2016] riak-2.1.1: new package

---
 pkgs/servers/nosql/riak/2.1.1.nix | 94 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  1 +
 2 files changed, 95 insertions(+)
 create mode 100644 pkgs/servers/nosql/riak/2.1.1.nix

diff --git a/pkgs/servers/nosql/riak/2.1.1.nix b/pkgs/servers/nosql/riak/2.1.1.nix
new file mode 100644
index 00000000000..ce160312dbb
--- /dev/null
+++ b/pkgs/servers/nosql/riak/2.1.1.nix
@@ -0,0 +1,94 @@
+{ stdenv, lib, fetchurl, unzip, erlangR16, which, pam, coreutils }:
+
+let
+  solrName = "solr-4.7.0-yz-1.tgz";
+  yokozunaJarName = "yokozuna-2.jar";
+  yzMonitorJarName = "yz_monitor-1.jar";
+
+  srcs = {
+    riak = fetchurl {
+      url = "http://s3.amazonaws.com/downloads.basho.com/riak/2.1/2.1.1/riak-2.1.1.tar.gz";
+      sha256 = "1bm5j3zknz82mkyh5zgaap73awflh4mkibdvdz164235mdxlwhdm";
+    };
+    solr = fetchurl {
+      url = "http://s3.amazonaws.com/files.basho.com/solr/${solrName}";
+      sha256 = "0brml3lb3xk26rmi05rrzpxrw92alfi9gi7p7537ny9lqg3808qp";
+    };
+    yokozunaJar = fetchurl {
+      url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yokozunaJarName}";
+      sha256 = "0xzfy181qxv27pc4f5xd0szn8vls5743273awr5rwv3608gkspj2";
+    };
+    yzMonitorJar = fetchurl {
+      url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yzMonitorJarName}";
+      sha256 = "0kb97d1a43vw759j1h5qwbhx455pidn2pi7sfxijqic37h81ri1m";
+    };
+  };
+in
+
+stdenv.mkDerivation rec {
+  name = "riak-2.1.1";
+
+  buildInputs = [
+    which unzip erlangR16 pam
+  ];
+
+  src = srcs.riak;
+
+  postPatch = ''
+    sed -i deps/node_package/priv/base/env.sh \
+      -e 's@{{platform_data_dir}}@$RIAK_DATA_DIR@' \
+      -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \
+      -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \
+      -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=$RIAK_ETC_DIR@' \
+      -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=$RIAK_LOG_DIR@'
+  '';
+
+  preBuild = ''
+    mkdir solr-pkg
+    cp ${srcs.solr} solr-pkg/${solrName}
+    export SOLR_PKG_DIR=$(readlink -f solr-pkg)
+
+    mkdir -p deps/yokozuna/priv/java_lib
+    cp ${srcs.yokozunaJar} deps/yokozuna/priv/java_lib/${yokozunaJarName}
+
+    mkdir -p deps/yokozuna/priv/solr/lib/ext
+    cp ${srcs.yzMonitorJar} deps/yokozuna/priv/solr/lib/ext/${yzMonitorJarName}
+
+    patchShebangs .
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    make locked-deps
+    make rel
+
+    runHook postBuild
+  '';
+
+  doCheck = false;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir $out
+    mv rel/riak/etc rel/riak/riak-etc
+    mkdir -p rel/riak/etc
+    mv rel/riak/riak-etc rel/riak/etc/riak
+    mv rel/riak/* $out
+
+    for prog in $out/bin/*; do
+      substituteInPlace $prog \
+        --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \
+                  ". $out/lib/env.sh"
+    done
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    maintainers = with maintainers; [ cstrahan ];
+    description = "Dynamo inspired NoSQL DB by Basho";
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e55145c312..fbb6b48df35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9011,6 +9011,7 @@ let
   };
 
   riak = callPackage ../servers/nosql/riak/1.3.1.nix { };
+  riak2 = callPackage ../servers/nosql/riak/2.1.1.nix { };
 
   influxdb = callPackage ../servers/nosql/influxdb { };
 

From cbf935f90ee368652d8bc28fc5bb0abb6d1509a6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 13:20:22 +0200
Subject: [PATCH 0078/2016] ekiga: fid build failure, use adwaita-icon-theme
 instead of gnome-icon-theme (ZHF)

---
 .../applications/networking/instant-messengers/ekiga/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 7ce47d53d14..b7b92315911 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
 
   preAutoreconf = ''
     substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 ""
+    substituteInPlace configure.ac --replace gnome-icon-theme adwaita-icon-theme
   '';
 
   configureFlags = [

From fdbd928fcea1da6466723826c1de73aaf675570e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 21 Jul 2015 11:47:38 +0200
Subject: [PATCH 0079/2016] qtcreator: fix build by using qt5Full

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e55145c312..aeb39893d2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7898,7 +7898,8 @@ let
   };
 
   qtcreator = callPackage ../development/qtcreator {
-    qtLib = qt48.override { developerBuild = true; };
+    qtLib = qt5Full; # 3.4 only supports qt5; TODO: use modularized qt>=5.4
+    withDocumentation = false; # FIXME: fails to setup some paths
   };
 
   qtkeychain = callPackage ../development/libraries/qtkeychain { };

From b454ff7cbbc5925e4018ee1fc3f2f03939192f4e Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Tue, 21 Jul 2015 14:03:29 +0200
Subject: [PATCH 0080/2016] Add sitePackages to pypy's passthru

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

diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index 143bab57534..a4eb7439b0d 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -114,6 +114,7 @@ let
       isPypy = true;
       buildEnv = callPackage ../python/wrapper.nix { python = self; };
       interpreter = "${self}/bin/${executable}";
+      sitePackages = "lib/${libPrefix}/site-packages";
     };
 
     enableParallelBuilding = true;  # almost no parallelization without STM

From 0bb1b47cc2b5c5f834592fb9ea5e1bf65887e7f4 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 21 Jul 2015 13:35:54 +0200
Subject: [PATCH 0081/2016] mozplugger: 1.12.0 -> 2.1.6

The source url for 1.12.0 returns 404, so this update fixes the build
as well.
---
 .../mozilla-plugins/mozplugger/default.nix    | 42 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
index 37d5cbe039f..17012850a31 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
@@ -1,36 +1,30 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, firefox, libX11, xproto }:
+
+stdenv.mkDerivation rec {
+  name = "mozplugger-${version}";
+  version = "2.1.6";
 
-  version = a.lib.attrByPath ["version"] "1.12.0" a; 
-  buildInputs = with a; [
-    firefox libX11 xproto
-  ];
-in
-rec {
   src = fetchurl {
     url = "http://mozplugger.mozdev.org/files/mozplugger-${version}.tar.gz";
-    sha256 = "1vpggfmbv4h3srk80rgidd020i03hrkpb7cfxkwagkcd0zcal4hk";
+    sha256 = "1vszkq4kdbaxsrqr2xn9rq6ipza9fngdri79gvjqk3bvsdmg0k19";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
-  makeFlags = ["linux" "prefix=" "root=$out"];
+  buildInputs = [ firefox libX11 xproto ];
 
-  preBuild = a.fullDepEntry(''
-    sed -e s@/usr/@"$out/"@g -i mozplugger.c
-  '') ["doUnpack" "minInit"];
+  installPhase = ''
+    mkdir -p "$out/etc" "$out/bin" "$out/lib/mozilla/plugins" "$out/share/man/man7"
+    cp mozpluggerrc "$out/etc"
+    cp mozplugger-{helper,controller,linker,update} "$out/bin"
+    cp mozplugger.so "$out/lib/mozilla/plugins"
+    cp mozplugger.7 "$out/share/man/man7"
 
-  postInstall = a.fullDepEntry(''
-    mkdir -p $out/share/${name}/plugin
-    ln -s $out/lib/mozilla/plugins/mozplugger.so $out/share/${name}/plugin
-  '') ["doMakeInstall" "minInit" "defEnsureDir"];
+    mkdir -p "$out/share/${name}/plugin"
+    ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${name}/plugin"
+  '';
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["preBuild" "doMakeInstall" "postInstall"];
-      
-  name = "mozplugger-" + version;
   meta = {
     description = "Mozilla plugin for launching external program for handling in-page objects";
+    homepage = http://mozplugger.mozdev.org/;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3e7849dd1a..87b7f03fc36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12019,8 +12019,7 @@ let
 
   mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { };
 
-  mozplugger = builderDefsPackage (import ../applications/networking/browsers/mozilla-plugins/mozplugger) {
-    inherit firefox;
+  mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {
     inherit (xlibs) libX11 xproto;
   };
 

From 51a76a71d7702671243a19f9af53dfe2271fa63f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 15:12:51 +0200
Subject: [PATCH 0082/2016] cogl: disable gles on darwin (ZHF). Untested on
 darwin.

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

diff --git a/pkgs/development/libraries/cogl/1.20.nix b/pkgs/development/libraries/cogl/1.20.nix
index 1489f48c9b4..5eb12fe2998 100644
--- a/pkgs/development/libraries/cogl/1.20.nix
+++ b/pkgs/development/libraries/cogl/1.20.nix
@@ -18,10 +18,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--enable-introspection"
-    "--enable-gles1"
-    "--enable-gles2"
     "--enable-kms-egl-platform"
-  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
+  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
 
   propagatedBuildInputs = with xorg; [
       glib gdk_pixbuf gobjectIntrospection

From 4579e57604ac96bc1e0d182aa9ca988ca740ae4a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 15:20:59 +0200
Subject: [PATCH 0083/2016] go tools: add package alias to fix other packages
 (ZHF)

---
 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 bab63e87b30..7b2ed01c196 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -136,6 +136,7 @@ let
     rev = "7d75e8b219c3efda2d08ae38acd6b42f8da4f5f9";
     name = "tools-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "golang.org/x/tools";
+    goPackageAliases = [ "code.google.com/p/go.tools" ];
 
     preConfigure = ''
       # Make the builtin tools available here

From 840fcacdb93da204154b33132248d62c70274a89 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 15:24:38 +0200
Subject: [PATCH 0084/2016] go go-etcd: disable on go 1.3 (ZHF)

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 7b2ed01c196..a365388597d 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1149,6 +1149,8 @@ let
     rev = "4734e7aca379f0d7fcdf04fbb2101696a4b45ce8";
     name = "go-etcd-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/coreos/go-etcd";
+    disabled = isGo13;
+
     src = fetchFromGitHub {
       inherit rev;
       owner = "coreos";

From bbc7e18ed7ccea7ba85713f461e5017a1f27fcef Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 15:24:45 +0200
Subject: [PATCH 0085/2016] go go-systemd: disable on go 1.3 (ZHF)

---
 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 a365388597d..b20443674c0 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1423,6 +1423,7 @@ let
     rev = "2688e91251d9d8e404e86dd8f096e23b2f086958";
     name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/coreos/go-systemd";
+    disabled = isGo13;
 
     excludedPackages = "examples";
 

From babb744b71819c4c3a412168e633958657805a2a Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 21 Jul 2015 06:16:18 -0400
Subject: [PATCH 0086/2016] riak: new nixos service

---
 nixos/modules/misc/ids.nix                |   2 +
 nixos/modules/module-list.nix             |   1 +
 nixos/modules/services/databases/riak.nix | 148 ++++++++++++++++++++++
 nixos/tests/riak.nix                      |  21 +++
 4 files changed, 172 insertions(+)
 create mode 100644 nixos/modules/services/databases/riak.nix
 create mode 100644 nixos/tests/riak.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index fd75db1abe7..b53b9c47b01 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -226,6 +226,7 @@
       gitit = 202;
       riemanntools = 203;
       subsonic = 204;
+      riak = 205;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -430,6 +431,7 @@
       gitit = 202;
       riemanntools = 203;
       subsonic = 204;
+      riak = 205;
 
       # 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 f771bced5ef..7e2c42f2b8c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -131,6 +131,7 @@
   ./services/databases/opentsdb.nix
   ./services/databases/postgresql.nix
   ./services/databases/redis.nix
+  ./services/databases/riak.nix
   ./services/databases/virtuoso.nix
   ./services/desktops/accountsservice.nix
   ./services/desktops/geoclue2.nix
diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix
new file mode 100644
index 00000000000..bee768fa42a
--- /dev/null
+++ b/nixos/modules/services/databases/riak.nix
@@ -0,0 +1,148 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.riak;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.riak = {
+
+      enable = mkEnableOption "riak";
+
+      package = mkOption {
+        type = types.package;
+        example = literalExample "pkgs.riak2";
+        description = ''
+          Riak package to use.
+        '';
+      };
+
+      nodeName = mkOption {
+        type = types.string;
+        default = "riak@127.0.0.1";
+        description = ''
+          Name of the Erlang node.
+        '';
+      };
+
+      distributedCookie = mkOption {
+        type = types.string;
+        default = "riak";
+        description = ''
+          Cookie for distributed node communication.  All nodes in the
+          same cluster should use the same cookie or they will not be able to
+          communicate.
+        '';
+      };
+
+      dataDir = mkOption {
+        type = types.path;
+        default = "/var/db/riak";
+        description = ''
+          Data directory for Riak.
+        '';
+      };
+
+      logDir = mkOption {
+        type = types.path;
+        default = "/var/log/riak";
+        description = ''
+          Log directory for Riak.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Additional text to be appended to <filename>riak.conf</filename>.
+        '';
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ cfg.package ];
+    environment.etc."riak/riak.conf".text = ''
+      nodename = ${cfg.nodeName}
+      distributed_cookie = ${cfg.distributedCookie}
+
+      platform_log_dir = ${cfg.logDir}
+      platform_etc_dir = /etc/riak
+      platform_data_dir = ${cfg.dataDir}
+
+      ${cfg.extraConfig}
+    '';
+
+    users.extraUsers.riak = {
+      name = "riak";
+      uid = config.ids.uids.riak;
+      group = "riak";
+      description = "Riak server user";
+    };
+
+    users.extraGroups.riak.gid = config.ids.gids.riak;
+
+    systemd.services.riak = {
+      description = "Riak Server";
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      path = [
+        pkgs.utillinux # for `logger`
+        pkgs.bash
+      ];
+
+      environment.RIAK_DATA_DIR = "${cfg.dataDir}";
+      environment.RIAK_LOG_DIR = "${cfg.logDir}";
+      environment.RIAK_ETC_DIR = "/etc/riak";
+
+      preStart = ''
+        if ! test -e ${cfg.logDir}; then
+          mkdir -m 0755 -p ${cfg.logDir}
+          chown -R riak ${cfg.logDir}
+        fi
+
+        if ! test -e ${cfg.dataDir}; then
+          mkdir -m 0700 -p ${cfg.dataDir}
+          chown -R riak ${cfg.dataDir}
+        fi
+      '';
+
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/riak console";
+        ExecStop = "${cfg.package}/bin/riak stop";
+        StandardInput = "tty";
+        User = "riak";
+        Group = "riak";
+        PermissionsStartOnly = true;
+        # Give Riak a decent amount of time to clean up.
+        TimeoutStopSec = 120;
+        LimitNOFILE = 65536;
+      };
+
+      unitConfig.RequiresMountsFor = [
+        "${cfg.dataDir}"
+        "${cfg.logDir}"
+        "/etc/riak"
+      ];
+    };
+
+  };
+
+}
diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix
new file mode 100644
index 00000000000..a56f51c4e50
--- /dev/null
+++ b/nixos/tests/riak.nix
@@ -0,0 +1,21 @@
+import ./make-test.nix {
+  name = "riak";
+
+  nodes = {
+    master =
+      { pkgs, config, ... }:
+
+      {
+        services.riak.enable = true;
+        services.riak.package = pkgs.riak2;
+      };
+  };
+
+  testScript = ''
+    startAll;
+
+    $master->waitForUnit("riak");
+    $master->sleep(20); # Hopefully this is long enough!!
+    $master->succeed("RIAK_DATA_DIR='/var/db/riak' RIAK_LOG_DIR='/var/log/riak' RIAK_ETC_DIR='/etc/riak' riak ping 2>&1");
+  '';
+}

From 1173278f3462673dccd20b8be95cb1281a64f815 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 10 Jul 2015 00:17:38 +0200
Subject: [PATCH 0087/2016] ProofGeneral: 4.3pre131011 -> 4.3pre150313

---
 .../editors/emacs-modes/proofgeneral/4.3pre.nix             | 6 +++---
 pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix
index 96d7619d387..815863ac6da 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:
 
 stdenv.mkDerivation (rec {
-  name = "ProofGeneral-4.3pre131011";
+  name = "ProofGeneral-4.3pre150313";
 
   src = fetchurl {
-    url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.3pre131011.tgz;
-    sha256 = "0104iy2xik5npkdg9p2ir6zqyrmdc93azrgm3ayvg0z76vmnb816";
+    url = "http://proofgeneral.inf.ed.ac.uk/releases/${name}.tgz";
+    sha256 = "1jq5ykkk14xr5qcn4kyxmi5ls0fibr0y47gfygzm1mzrfvz9aw3f";
   };
 
   sourceRoot = name;
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
index c733911118d..704e4b6c8c7 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
@@ -7,7 +7,7 @@ diff -r c7d8bfff4c0a bin/proofgeneral
  if [ -z "$PGHOME" ] || [ ! -d "$PGHOME" ]; then
 -    # default relative to this script, otherwise PGHOMEDEFAULT
 -    MYDIR="`readlink --canonicalize "$0" | sed -ne 's,/bin/proofgeneral$,,p'`"
--    if [ -d "$MYDIR" ]; then
+-    if [ -d "$MYDIR/generic" ]; then
 -	PGHOME="$MYDIR"
 -    elif [ -d "$PGHOMEDEFAULT" ]; then
 +    if [ -d "$PGHOMEDEFAULT" ]; then

From ee0db7648c02606f6c81892abdfc0051c96ff949 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 15:50:31 +0200
Subject: [PATCH 0088/2016] signon: update to fix build (ZHF). cc @ttuegel

---
 pkgs/development/libraries/signon/default.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/signon/default.nix b/pkgs/development/libraries/signon/default.nix
index 0bafb42e2c5..7b3defb8a58 100644
--- a/pkgs/development/libraries/signon/default.nix
+++ b/pkgs/development/libraries/signon/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, doxygen, qt5 }:
+{ stdenv, fetchzip, doxygen, qt5 }:
 
 stdenv.mkDerivation rec {
-  name = "signon-8.56";
-  src = fetchurl {
-    url = "https://accounts-sso.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "00kwysm7bga0bycclkcyslsa6aahcn98drm125l6brzhigc7qxa8";
+  name = "signon-${version}";
+  version = "8.57";
+  src = fetchzip {
+    url = "http://signond.accounts-sso.googlecode.com/archive/${version}.zip";
+    sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a";
   };
 
   buildInputs = [ qt5.base ];
@@ -14,11 +15,4 @@ stdenv.mkDerivation rec {
     qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5
   '';
 
-  postInstall = ''
-    mv $out/lib/cmake/SignOnQt5/SignOnQtConfig.cmake \
-      $out/lib/cmake/SignOnQt5/SignOnQt5Config.cmake
-    mv $out/lib/cmake/SignOnQt5/SignOnQtConfigVersion.cmake \
-      $out/lib/cmake/SignOnQt5/SignOnQt5ConfigVersion.cmake
-  '';
-
 }

From bfa5df6a5e96ff06cecea38b4f685996e4e68558 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 16:01:20 +0200
Subject: [PATCH 0089/2016] pahole: fix build (ZHF)

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

diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix
index 739cc7e5143..38de21872b9 100644
--- a/pkgs/development/tools/misc/pahole/default.nix
+++ b/pkgs/development/tools/misc/pahole/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
 
   postInstall = ''
     for p in $out/bin/*; do
-      rpath=`patchelf --print-rpath $p`:$out
-      patchelf --set-rpath $rpath $p
+      rpath=`patchelf --print-rpath $p || true`:$out
+      patchelf --set-rpath "$rpath" $p || true
     done
   '';
 

From 5c485cfff5e6b4b0066bd0daae538d408abf733b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 16:05:11 +0200
Subject: [PATCH 0090/2016] perlPackages.MHonArc: fix installation (ZHF)

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 97b98605cc2..8aaf05d8bc0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5660,6 +5660,9 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1xmf26dfwr8achprc3n1pxgl0mkiyr6pf25wq3dqgzqkghrrsxa2";
     };
     propagatedBuildInputs = [ ];
+
+    installTargets = "install";
+
     meta = with stdenv.lib; {
       homepage    = http://dcssrv1.oit.uci.edu/indiv/ehood/mhonarch.html;
       description = "A mail-to-HTML converter";

From 5a4d349ce70ac8f220ee8f56e98a881e4f2cc5d0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 16:18:21 +0200
Subject: [PATCH 0091/2016] processing: fix build (ZHF)

---
 pkgs/applications/graphics/processing/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix                   |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
index ecce0e260bb..69e5ccb85ec 100644
--- a/pkgs/applications/graphics/processing/default.nix
+++ b/pkgs/applications/graphics/processing/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ant, jre, makeWrapper, libXxf86vm, which }:
+{ fetchurl, stdenv, ant, jdk, makeWrapper, libXxf86vm, which }:
 
 stdenv.mkDerivation rec {
   name = "processing-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   # Stop it trying to download its own version of java
   patches = [ ./use-nixpkgs-jre.patch ];
 
-  buildInputs = [ ant jre makeWrapper libXxf86vm which ];
+  buildInputs = [ ant jdk makeWrapper libXxf86vm which ];
 
   buildPhase = "cd build && ant build";
 
@@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
    cp -r linux/work/* $out/${name}/
    makeWrapper $out/${name}/processing $out/bin/processing \
-     --prefix PATH : "${jre}/bin:${which}/bin" \
+     --prefix PATH : "${jdk}/bin:${which}/bin" \
      --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
    makeWrapper $out/${name}/processing-java $out/bin/processing-java \
-     --prefix PATH : "${jre}/bin:${which}/bin" \
+     --prefix PATH : "${jdk}/bin:${which}/bin" \
      --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
-   ln -s ${jre} $out/${name}/java
+   ln -s ${jdk} $out/${name}/java
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d4bd57fa67..d66ebf21e1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12365,7 +12365,10 @@ let
 
   qiv = callPackage ../applications/graphics/qiv { };
 
-  processing = callPackage ../applications/graphics/processing { inherit (xorg) libXxf86vm; };
+  processing = callPackage ../applications/graphics/processing {
+    inherit (xorg) libXxf86vm;
+    jdk = jdk7;
+  };
 
   # perhaps there are better apps for this task? It's how I had configured my preivous system.
   # And I don't want to rewrite all rules

From 9f4936942cb3a9c9e3448ebcdbbf4986be5c0539 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 15 Jul 2015 02:41:11 +0200
Subject: [PATCH 0092/2016] dropbox: 3.6.7 -> 3.6.9

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 33df71c62c3..5a37a8eb76a 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -19,11 +19,11 @@
 
 let
   # NOTE: When updating, please also update in current stable, as older versions stop working
-  version = "3.6.7";
+  version = "3.6.9";
   sha256 =
     {
-      "x86_64-linux" = "1jwzrpw382amx0jap9m411a3yvkc9iwnw6n35kwq3infmbwjs6q8";
-      "i686-linux" = "0rjd908bhfk00qh6gvizf2fyfb3cccd78spyvh435z377x2pmxzy";
+      "x86_64-linux" = "1i260mi40siwcx9b2sj4zwszxmj1l88mpmyqncsfa72k02jz22j3";
+      "i686-linux" = "0qqc8qbfaighbhjq9y22ka6n6apl8b6cr80a9rkpk2qsk99k8h1z";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From 63eccd2b2d630e68405598d09be88ba50c1684e5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 16:26:47 +0200
Subject: [PATCH 0093/2016] pyutil: 1.7.9 -> 2.0.0. Fixes build failure (ZHF)

---
 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 2537011f98f..aa0ea9282f1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11134,11 +11134,11 @@ let
 
 
   pyutil = buildPythonPackage (rec {
-    name = "pyutil-1.7.9";
+    name = "pyutil-2.0.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyutil/${name}.tar.gz";
-      sha256 = "c303bb779f96073820e2eb7c9692fe15a57df491eb356839f3cb3377ed03b844";
+      sha256 = "1fsg9yz5mi2sb0h6c1vvcqchx56i89nbvdb5gfgv1ia3b2w5ra8c";
     };
 
     buildInputs = with self; [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []);

From e4239cc8ad6fe313166497ffd30a6bf00811427f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 16:51:53 +0200
Subject: [PATCH 0094/2016] qpid-cpp: 0.26 -> 0.34. Fixes build (ZHF)

---
 pkgs/servers/amqp/qpid-cpp/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index 69c0a3dff41..410bd23eb30 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchurl, cmake, python, boost, libuuid, ruby }:
 
 stdenv.mkDerivation rec {
-  name = "${project}-cpp-${version}";
+  name = "qpid-cpp-${version}";
 
-  project = "qpid";
-  version = "0.26";
+  version = "0.34";
 
   src = fetchurl {
-    url = "mirror://apache/${project}/${version}/${name}.tar.gz";
-    sha256 = "1c03yi19d5h5h78h37add9csmy0mzvvmvn7zkcalwszabdhsb5yk";
+    url = "mirror://apache/qpid/cpp/${version}/${name}.tar.gz";
+    sha256 = "07ibwvw5lm7xabv32zai5x03r7l9mxm0zk7h9lbfkzmav0f41w0w";
   };
 
   buildInputs = [ cmake python boost libuuid ruby ];

From eee8823c37c8d505a5448c7a414a17794039ded5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 17:22:01 +0200
Subject: [PATCH 0095/2016] Revert "samba: 4.2.1 -> 4.2.3"

This reverts commit be0f468926ff805b9fae4bba87a0fc8b628cbc1a.
---
 pkgs/servers/samba/4.x.nix      | 4 ++--
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 1cdf7ad2ed0..a31846c54aa 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -19,11 +19,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "samba-4.2.3";
+  name = "samba-4.2.1";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "0z2c17d2id0m59mfdxdljhizp97l29clmw6g5zp93n0q92pabpxn";
+    sha256 = "1hsakc8h6rs48xr6i55m90pd53hpxcqjjnlwq8i2rp0nq4ws5sip";
   };
 
   patches =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d66ebf21e1a..16f19bdc7d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9153,6 +9153,7 @@ let
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
     kerberos = null;  # Bundle kerberos because samba uses internal, non-stable functions
+    gnutls = gnutls33;
     # enableLDAP
   };
 

From c6b1625a53677729280e2caa2058e5d2e936c0e2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 17:32:44 +0200
Subject: [PATCH 0096/2016] sipwitch: 1.6.1 -> 1.9.8. Fixes build (ZHF)

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

diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 14cd91ee141..8eecfa1e276 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "sipwitch-1.6.1";
+  name = "sipwitch-1.9.8";
 
   src = fetchurl {
     url = "mirror://gnu/sipwitch/${name}.tar.gz";
-    sha256 = "1sa4fbv8filzcxqx2viyixsq4pwgvkidn6l6g3k62gl8bvdfk7p9";
+    sha256 = "0117c5iid1vrwl7sl3pys2jlinpmx2vfp8wcdwk93m7cc6k9793b";
   };
 
   buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];

From dc5b74ab788e6156a29ec5ef83521826a7104a33 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 17:34:52 +0200
Subject: [PATCH 0097/2016] spamassassin: fix rules installation (ZHF)

---
 pkgs/servers/mail/spamassassin/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix
index ea69d036f95..e46a76a9b0c 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@@ -32,6 +32,7 @@ buildPerlPackage rec {
   doCheck = false;
 
   postInstall = ''
+    mkdir -p $out/share/spamassassin
     mv "rules/"* $out/share/spamassassin/
 
     for n in "$out/bin/"*; do

From 14502c6446b5f516c6fa79a473d1880ff41e56f9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 17:37:08 +0200
Subject: [PATCH 0098/2016] Revert "Revert "samba: 4.2.1 -> 4.2.3""

This reverts commit eee8823c37c8d505a5448c7a414a17794039ded5.

Wrong revert. Sorry.
---
 pkgs/servers/samba/4.x.nix      | 4 ++--
 pkgs/top-level/all-packages.nix | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index a31846c54aa..1cdf7ad2ed0 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -19,11 +19,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "samba-4.2.1";
+  name = "samba-4.2.3";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "1hsakc8h6rs48xr6i55m90pd53hpxcqjjnlwq8i2rp0nq4ws5sip";
+    sha256 = "0z2c17d2id0m59mfdxdljhizp97l29clmw6g5zp93n0q92pabpxn";
   };
 
   patches =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16f19bdc7d9..d66ebf21e1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9153,7 +9153,6 @@ let
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
     kerberos = null;  # Bundle kerberos because samba uses internal, non-stable functions
-    gnutls = gnutls33;
     # enableLDAP
   };
 

From 148dcf4d1ce54079ed1c8746812975892ff6b611 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Tue, 21 Jul 2015 19:08:15 +0300
Subject: [PATCH 0099/2016] Vagrant: 1.7.3 -> 1.7.4 (ZHF)

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

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 97136aa255e..085807e1bfa 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -4,7 +4,7 @@
 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
 
 let
-  version = "1.7.3";
+  version = "1.7.4";
   rake = buildRubyGem {
     inherit ruby;
     name = "rake-10.3.2";
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb";
-        sha256 = "0zg2sdxgrmwqvzqw4z8d6ji8d0cby33nggv0n9ncjxp0wjiv8nkm";
+        sha256 = "0dl3cskpz7d8mmv0ah86426vlx0lj1wkjdlb5gc868dfsysw5lnw";
       }
     else
       fetchurl {
         url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb";
-        sha256 = "0r23w49jwl3c3g4nns5xnrsrqyfkqsgln91cj30hxkw50d0ldpvs";
+        sha256 = "0sns9q48c6b2sabp6bwkppx8ffp774jhv69jrv225qrnifx12105";
       };
 
   meta = with stdenv.lib; {
@@ -93,12 +93,12 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     # 'hide' the template file from shebang-patching
-    chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
+    chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.5/lib/bundler/templates/Executable
     chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
   '';
 
   postFixup = ''
-    chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
+    chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.5/lib/bundler/templates/Executable
     chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
   '';
 }

From 53c2254aab7cac1519689b70e0bb67cd87b82d78 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 31 May 2015 18:33:12 +0200
Subject: [PATCH 0100/2016] links2: 2.8 -> 2.10

Also enable svg support, as well as libev support
---
 .../networking/browsers/links2/default.nix             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 9b9d9ab6db1..dcc61d4061d 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
-, gpm, openssl, pkgconfig # Misc.
-, libpng, libjpeg, libtiff # graphic formats
+, gpm, openssl, pkgconfig, libev # Misc.
+, libpng, libjpeg, libtiff, librsvg # graphic formats
 , bzip2, zlib, xz # Transfer encodings
 , enableFB ? true
 , enableDirectFB ? false, directfb
@@ -8,16 +8,16 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.8";
+  version = "2.10";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "15h07498z52jfdahzgvkphg1f7qvxnpbyfn2xmsls0d2dwwdll3r";
+    sha256 = "0lqxg55sp1kphl7ykm2km0s2vsn92a0gmlgypmkqb984r060n3l4";
   };
 
   buildInputs =
-    [ libpng libjpeg libtiff gpm openssl xz bzip2 zlib ]
+    [ libev librsvg libpng libjpeg libtiff gpm openssl xz bzip2 zlib ]
     ++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ]
     ++ stdenv.lib.optional enableDirectFB [ directfb ];
 

From f8f0c7196e4494d31d8be29af67a014d7ecb86fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 21 Jul 2015 18:50:13 +0200
Subject: [PATCH 0101/2016] gnome-control-center: disable parallel building

It fails on Hydra sometimes. Reported upstream.
---
 .../gnome-3/3.16/core/gnome-control-center/default.nix         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index 0c676c38efa..0a688115f14 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
 
-  enableParallelBuilding = true;
+  # https://bugzilla.gnome.org/show_bug.cgi?id=752596
+  enableParallelBuilding = false;
 
   buildInputs = with gnome3;
     [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas

From 04356dc250dbd642dbebdc800da39566caff8644 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 18:53:55 +0200
Subject: [PATCH 0102/2016] samba: drop heimdal compat patch to fix the build
 (ZHF)

---
 pkgs/servers/samba/4.x-heimdal-compat.patch | 16 ----------------
 pkgs/servers/samba/4.x.nix                  |  2 +-
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 pkgs/servers/samba/4.x-heimdal-compat.patch

diff --git a/pkgs/servers/samba/4.x-heimdal-compat.patch b/pkgs/servers/samba/4.x-heimdal-compat.patch
deleted file mode 100644
index 35f01e4001e..00000000000
--- a/pkgs/servers/samba/4.x-heimdal-compat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
-index bb476e1..0a407a4 100644
---- a/source4/kdc/kdc.c
-+++ b/source4/kdc/kdc.c
-@@ -967,9 +967,9 @@ static void kdc_task_init(struct task_server *task)
- 	 * The old behavior in the _kdc_get_preferred_key()
- 	 * function is use_strongest_server_key=TRUE.
- 	 */
--	kdc->config->as_use_strongest_session_key = false;
-+	kdc->config->tgt_use_strongest_session_key = false;
-+	kdc->config->svc_use_strongest_session_key = false;
- 	kdc->config->preauth_use_strongest_session_key = false;
--	kdc->config->tgs_use_strongest_session_key = false;
- 	kdc->config->use_strongest_server_key = true;
- 
- 	/* Register hdb-samba4 hooks for use as a keytab */
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 1cdf7ad2ed0..6b8347177a0 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   patches =
     [ ./4.x-no-persistent-install.patch
       ./4.x-fix-ctdb-deps.patch
-    ] ++ stdenv.lib.optional enableKerberos ./4.x-heimdal-compat.patch;
+    ];
 
   buildInputs =
     [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*

From ecb38b5fb6f12b19862fedbb6774fb886dbd84c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 21 Jul 2015 18:54:10 +0200
Subject: [PATCH 0103/2016] gnome-control-center: meta fixes

Description was wrong, and add meta. Taken from Debian.
/cc maintainer @lethalman, also for the grandparent commit.
---
 .../gnome-3/3.16/core/gnome-control-center/default.nix         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index 0a688115f14..5d6e504951f 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -53,7 +53,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Single sign-on framework for GNOME";
+    description = "Utilities to configure the GNOME desktop";
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ lethalman ];
     platforms = platforms.linux;
   };

From 0015a47229b681a0beeddf1e340d32aaf4831cbe Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 21 Jul 2015 18:59:40 +0200
Subject: [PATCH 0104/2016] khal: Change source to pypi.python.org

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

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 2652af9bed9..db7af2df052 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -5,8 +5,8 @@ pythonPackages.buildPythonPackage rec {
   name = "khal-${version}";
 
   src = fetchurl {
-    url = "https://github.com/geier/khal/archive/v${version}.tar.gz";
-    sha256 = "1rjs5s8ky4n628rs6l5ggaj2abb4kq2avvxmimjjgxz3zh9xlz6s";
+    url = "https://pypi.python.org/packages/source/k/khal/khal-${version}.tar.gz";
+    sha256 = "1042vnc0vsaf0yr44hb0bh227d4rn81smvxksrzwdwja3wwxk4m9";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 8de63957a5bfca69708eaced1a925eeba7a578a3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 21 Jul 2015 19:59:41 +0300
Subject: [PATCH 0105/2016] memtester: init at 4.3.0

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

diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix
new file mode 100644
index 00000000000..2663f3b852a
--- /dev/null
+++ b/pkgs/tools/system/memtester/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "memtester-${version}";
+  version = "4.3.0";
+
+  src = fetchurl {
+    url = "http://pyropus.ca/software/memtester/old-versions/memtester-${version}.tar.gz";
+    sha256 = "127xymmyzb9r6dxqrwd69v7gf8csv8kv7fjvagbglf3wfgyy5pzr";
+  };
+
+  installFlags = [ "INSTALLPATH=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "A userspace utility for testing the memory subsystem for faults";
+    homepage = http://pyropus.ca/software/memtester/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e55145c312..ed6d668ad8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1996,6 +1996,8 @@ let
 
   makebootfat = callPackage ../tools/misc/makebootfat { };
 
+  memtester = callPackage ../tools/system/memtester { };
+
   minidlna = callPackage ../tools/networking/minidlna { };
 
   mmv = callPackage ../tools/misc/mmv { };

From d15d02c824a5998b6815ae9c2ca0a70de2d35d2a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 21 Jul 2015 19:00:03 +0200
Subject: [PATCH 0106/2016] khal: 0.5.0 -> 0.6.0

---
 pkgs/applications/misc/khal/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index db7af2df052..cbc728bc1f5 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.5.0";
+  version = "0.6.0";
   name = "khal-${version}";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/k/khal/khal-${version}.tar.gz";
-    sha256 = "1042vnc0vsaf0yr44hb0bh227d4rn81smvxksrzwdwja3wwxk4m9";
+    sha256 = "16nsib70rczln0hrh93bas58lr8crvq8yipj7qnfs4hbs9b8sbhs";
   };
 
   propagatedBuildInputs = with pythonPackages; [
@@ -23,6 +23,7 @@ pythonPackages.buildPythonPackage rec {
     tzlocal
     urwid
     python.modules.sqlite3
+    pkginfo
   ];
 
   meta = with stdenv.lib; {

From 1bcf33a7fa32672de20020da587465b4d5830f33 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Tue, 21 Jul 2015 19:18:07 +0100
Subject: [PATCH 0107/2016] tibia: update to 10.80

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

diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 4d759c5f889..03729cfae3b 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 assert stdenv.isi686;
 stdenv.mkDerivation {
-  name = "tibia-10.79";
+  name = "tibia-10.80";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1079.tgz;
-    sha256 = "04wpg5hdfhcp12kk2va3jdijr2p9jfmfivgqrn3cnbblxi83k2sn";
+    url = http://static.tibia.com/download/tibia1080.tgz;
+    sha256 = "0ng7gi64lsda8k3674nc2gwnr8si648nmwgghrjrcwyybgsyzfvl";
   };
 
   shell = stdenv.shell;

From b655b1c49dd9df2ecca1b7f6faa39fae10eef18b Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Tue, 21 Jul 2015 20:41:13 +0200
Subject: [PATCH 0108/2016] Add borg backup software (fork of attic)

Borg is a fork of attic backup software. It is more actively developed,
with more features.
---
 pkgs/tools/backup/borg/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/backup/borg/default.nix

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
new file mode 100644
index 00000000000..f9a949f4d3f
--- /dev/null
+++ b/pkgs/tools/backup/borg/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchzip, python3Packages, openssl, acl }:
+
+python3Packages.buildPythonPackage rec {
+  name = "borg-${version}";
+  version = "0.23.0";
+  namePrefix = "";
+
+  src = fetchzip {
+    name = "${name}-src";
+    url = "https://github.com/borgbackup/borg/archive/${version}.tar.gz";
+    sha256 = "1ns00bhrh4zm1s70mm32gnahj7yh4jdpkb8ziarhvcnknz7aga67";
+  };
+
+  propagatedBuildInputs = with python3Packages;
+    [ cython msgpack openssl acl llfuse tox detox ];
+
+  preConfigure = ''
+    export BORG_OPENSSL_PREFIX="${openssl}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A deduplicating backup program (attic fork)";
+    homepage = https://borgbackup.github.io/;
+    license = licenses.bsd3;
+    platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d66ebf21e1a..d9b21deca55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -755,6 +755,8 @@ let
 
   bochs = callPackage ../applications/virtualization/bochs { };
 
+  borg = callPackage ../tools/backup/borg { };
+
   boomerang = callPackage ../development/tools/boomerang { };
 
   boost-build = callPackage ../development/tools/boost-build { };

From 2b5a60700e5d58a2aff1de03e41cdaeae5c23dc9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 21 Jul 2015 20:55:48 +0200
Subject: [PATCH 0109/2016] perl-URI: 1.60 -> 1.68

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8aaf05d8bc0..0f4a3cce4fe 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10380,14 +10380,15 @@ let self = _self // overrides; _self = with self; {
   };
 
   URI = buildPerlPackage {
-    name = "URI-1.60";
+    name = "URI-1.68";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/URI-1.60.tar.gz;
-      sha256 = "0xr31mf7lfrwhyvlx4pzp6p7alls5gi4bj8pk5g89f5cckfd74hz";
+      url = mirror://cpan/authors/id/E/ET/ETHER/URI-1.68.tar.gz;
+      sha256 = "c840d30f7657bfd4b2acbb311bd764232911cd3dc97e92415fbd0a242185c358";
     };
     meta = {
       description = "Uniform Resource Identifiers (absolute and relative)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 

From 04bf08c70704a045a41bdb9ab00f731d25802c96 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 21 Jul 2015 20:56:33 +0200
Subject: [PATCH 0110/2016] perl-Encode-Locale: 1.03 -> 1.05

---
 pkgs/top-level/perl-packages.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0f4a3cce4fe..d9f02d47074 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3401,16 +3401,21 @@ let self = _self // overrides; _self = with self; {
   };
 
   EncodeLocale = buildPerlPackage rec {
-    name = "Encode-Locale-1.03";
+    name = "Encode-Locale-1.05";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/Encode/${name}.tar.gz";
-      sha256 = "0m9d1vdphlyzybgmdanipwd9ndfvyjgk3hzw250r299jjgh3fqzp";
+      sha256 = "176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1";
     };
     preCheck = if stdenv.isCygwin then ''
       sed -i"" -e "s@plan tests => 13@plan tests => 10@" t/env.t
       sed -i"" -e "s@ok(env(\"\\\x@#ok(env(\"\\\x@" t/env.t
       sed -i"" -e "s@ok(\$ENV{\"\\\x@#ok(\$ENV{\"\\\x@" t/env.t
     '' else null;
+    meta = {
+      description = "Determine the locale encoding";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
+    };
   };
 
   EnvPath = buildPerlPackage {

From 75193c15067548747c81f319d420cf7a5085c5e6 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 21 Jul 2015 20:56:55 +0200
Subject: [PATCH 0111/2016] perl-IO-HTML: 0.04 -> 1.001

---
 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 d9f02d47074..2fa62404fbf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4738,15 +4738,15 @@ let self = _self // overrides; _self = with self; {
   };
 
   IOHTML = buildPerlPackage {
-    name = "IO-HTML-0.04";
+    name = "IO-HTML-1.001";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-0.04.tar.gz;
-      sha256 = "0c4hc76c1gypdwfasnibr2qlf9x3bnhyw357lhqlrczbm6vn8hw5";
+      url = mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz;
+      sha256 = "ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0";
     };
     meta = {
-      homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
       description = "Open an HTML file with automatic charset detection";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 

From 174613a95e0aa74015f0d4203153f06a162611f7 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 21 Jul 2015 20:57:20 +0200
Subject: [PATCH 0112/2016] perl-Net-HTTP: 6.06 -> 6.09

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2fa62404fbf..72b033db620 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6994,14 +6994,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   NetHTTP = buildPerlPackage {
-    name = "Net-HTTP-6.06";
+    name = "Net-HTTP-6.09";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/Net-HTTP-6.06.tar.gz;
-      sha256 = "1m1rvniffadq99gsy25298ia3lixwymr6kan64jd3ylyi7nkqkhx";
+      url = mirror://cpan/authors/id/E/ET/ETHER/Net-HTTP-6.09.tar.gz;
+      sha256 = "52762b939d84806908ba544581c5708375f7938c3c0e496c128ca3fbc425e58d";
     };
+    propagatedBuildInputs = [ URI ];
     meta = {
       description = "Low-level HTTP connection (client)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 

From 9147dee57fe1e1deb52398fc6ddd8dac9dab87e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 21 Jul 2015 20:53:55 +0200
Subject: [PATCH 0113/2016] cups-filters: update, including security fixes

- NEWS claims to fix CVE-2015-{3258,3279}
- shell path is now directly configurable

/cc maintainer @ttuegel.
---
 .../development/libraries/poppler/default.nix |  2 +-
 pkgs/misc/cups/filters.nix                    | 31 +++++++++----------
 pkgs/misc/cups/longer-shell-path.patch        | 13 --------
 3 files changed, 15 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/misc/cups/longer-shell-path.patch

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index c79cdfd4466..373fe630d11 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -4,7 +4,7 @@
 , utils ? false, suffix ? "glib"
 }:
 
-let
+let # beware: updates often break cups_filters build
   version = "0.32.0"; # even major numbers are stable
   sha256 = "162vfbvbz0frvqyk00ldsbl49h4bj8i8wn0ngfl30xg1lldy6qs9";
 in
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 8043cbb1506..a860273e9eb 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -1,35 +1,32 @@
-{ stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig
+{ stdenv, fetchurl, fetchpatch, pkgconfig, cups, poppler, poppler_utils, fontconfig
 , libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi }:
 
 stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.0.61";
+  version = "1.0.71";
 
   src = fetchurl {
     url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "1bq48nnrarlbf6qc93bz1n5wlh6j420gppbck3r45sinwhz5wa7m";
+    sha256 = "07wwlqcykfjfqcwj1bxk60ggahyaw7wcx32n5s104d1qkhham01i";
   };
 
-  patches = [
-    (substituteAll {
-      src = ./longer-shell-path.patch;
-      bash = "${bash}/bin/bash";
-    })
-
-    # Fix build with poppler-0.31.0
-    (fetchurl {
-      url = "https://bugs.linuxfoundation.org/attachment.cgi?id=476";
-      name = "cups-filters-poppler-0.31.0.patch";
-      sha256 = "016pzksz4nl1sv3p5ahlnbmb7c899yrvlzq8jxic0gvdrzwd5bl4";
-    })
-  ];
+  patches = [(fetchpatch { # drop on update
+    name = "poppler-0.34.patch";
+    url = "https://bugs.linuxfoundation.org/attachment.cgi?id=493";
+    sha256 = "18za83q0b0n4hpvvw76jsv0hm89zmijvps2z5kg1srickqlxj891";
+  })];
 
   buildInputs = [
     pkgconfig cups poppler poppler_utils fontconfig libjpeg libpng perl
     ijs qpdf dbus avahi
   ];
 
-  configureFlags = "--with-pdftops=pdftops --enable-imagefilters --with-rcdir=no";
+  configureFlags = [
+    "--with-pdftops=pdftops"
+    "--enable-imagefilters"
+    "--with-rcdir=no"
+    "--with-shell=${stdenv.shell}"
+  ];
 
   makeFlags = "CUPS_SERVERBIN=$(out)/lib/cups CUPS_DATADIR=$(out)/share/cups CUPS_SERVERROOT=$(out)/etc/cups";
 
diff --git a/pkgs/misc/cups/longer-shell-path.patch b/pkgs/misc/cups/longer-shell-path.patch
deleted file mode 100644
index a15fd483225..00000000000
--- a/pkgs/misc/cups/longer-shell-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/filter/foomatic-rip/foomaticrip.c b/filter/foomatic-rip/foomaticrip.c
-index 1c019aa..431d2f9 100644
---- a/filter/foomatic-rip/foomaticrip.c
-+++ b/filter/foomatic-rip/foomaticrip.c
-@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/filter:"
-                                 "/opt/cups/filter:"
-                                 "/usr/lib/cups/filter";
- 
--char modern_shell[64] = "/bin/bash";
-+char modern_shell[128] = "@bash@";
- 
- void config_set_option(const char *key, const char *value)
- {

From 8c7857d65ea686d74d5729d863a688d959c175ca Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 21 Jul 2015 20:58:10 +0200
Subject: [PATCH 0114/2016] perl-LWP: enable tests

The added patch allows LWP to run its tests.
---
 .../lwp-test-with-localhost.patch             | 75 +++++++++++++++++++
 pkgs/top-level/perl-packages.nix              |  4 +-
 2 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/perl-modules/lwp-test-with-localhost.patch

diff --git a/pkgs/development/perl-modules/lwp-test-with-localhost.patch b/pkgs/development/perl-modules/lwp-test-with-localhost.patch
new file mode 100644
index 00000000000..25b96796d23
--- /dev/null
+++ b/pkgs/development/perl-modules/lwp-test-with-localhost.patch
@@ -0,0 +1,75 @@
+From 2d7a479b39bb20a0d61f067ba6c2df92117fcb8c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Wed, 23 Apr 2014 12:45:38 +0200
+Subject: [PATCH] Connect to localhost instead of hostname
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The hostname does not have to be resolvable nor reachable. It's just
+a machine name.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ t/local/http.t   | 2 +-
+ t/robot/ua-get.t | 2 +-
+ t/robot/ua.t     | 2 +-
+ talk-to-ourself  | 3 +--
+ 4 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/t/local/http.t b/t/local/http.t
+index 779cc21..534b4c8 100644
+--- a/t/local/http.t
++++ b/t/local/http.t
+@@ -20,7 +20,7 @@ if ($D eq 'daemon') {
+ 
+     require HTTP::Daemon;
+ 
+-    my $d = HTTP::Daemon->new(Timeout => 10);
++    my $d = HTTP::Daemon->new(Timeout => 10, LocalAddr => 'localhost');
+ 
+     print "Please to meet you at: <URL:", $d->url, ">\n";
+     open(STDOUT, $^O eq 'VMS'? ">nl: " : ">/dev/null");
+diff --git a/t/robot/ua-get.t b/t/robot/ua-get.t
+index 5754c4b..bf24589 100644
+--- a/t/robot/ua-get.t
++++ b/t/robot/ua-get.t
+@@ -19,7 +19,7 @@ if ($D eq 'daemon') {
+ 
+     require HTTP::Daemon;
+ 
+-    my $d = new HTTP::Daemon Timeout => 10;
++    my $d = new HTTP::Daemon Timeout => 10, LocalAddr => 'localhost';
+ 
+     print "Please to meet you at: <URL:", $d->url, ">\n";
+     open(STDOUT, $^O eq 'MSWin32' ?  ">nul" : $^O eq 'VMS' ? ">NL:"  : ">/dev/null");
+diff --git a/t/robot/ua.t b/t/robot/ua.t
+index 21ad5c8..11fafa8 100644
+--- a/t/robot/ua.t
++++ b/t/robot/ua.t
+@@ -19,7 +19,7 @@ if ($D eq 'daemon') {
+ 
+     require HTTP::Daemon;
+ 
+-    my $d = new HTTP::Daemon Timeout => 10;
++    my $d = new HTTP::Daemon Timeout => 10, LocalAddr => 'localhost';
+ 
+     print "Please to meet you at: <URL:", $d->url, ">\n";
+     open(STDOUT, $^O eq 'MSWin32' ?  ">nul" : $^O eq 'VMS' ? ">NL:"  : ">/dev/null");
+diff --git a/talk-to-ourself b/talk-to-ourself
+index 6c0257a..b4acda2 100644
+--- a/talk-to-ourself
++++ b/talk-to-ourself
+@@ -9,8 +9,7 @@ require IO::Socket;
+ 
+ if (@ARGV >= 2 && $ARGV[0] eq "--port") {
+     my $port = $ARGV[1];
+-    require Sys::Hostname;
+-    my $host = Sys::Hostname::hostname();
++    my $host = 'localhost';
+     if (my $socket = IO::Socket::INET->new(PeerAddr => "$host:$port", Timeout => 5)) {
+ 	require IO::Select;
+ 	if (IO::Select->new($socket)->can_read(1)) {
+-- 
+1.9.0
+
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 72b033db620..ef265115618 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5384,8 +5384,8 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
       sha256 = "1cpqjl59viw50bnbdyn8xzrwzg7g54b2rszw0fifacqrppp17gaz";
     };
-    propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ];
-    doCheck = false; # tries to start a daemon
+    patches = [ ../development/perl-modules/lwp-test-with-localhost.patch ];
+    propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP URI WWWRobotRules ];
     meta = {
       description = "The World-Wide Web library for Perl";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From 205a6b894d91310ac144474334da2ec90e710489 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 21 Jul 2015 21:07:04 +0200
Subject: [PATCH 0115/2016] cargo: workaround frequent hash mismatches due to
 #8567

For now, let's remove `leaveDotGit`. The only visible effect I could see
was that `cargo --version` won't report the git commit anymore, but
that's only a minor issue compared to the build breaking often.

Fixes #8566 and closes #8862.
---
 pkgs/development/tools/build-managers/cargo/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index d849ad5de94..9ffc9b0cbb9 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -11,8 +11,7 @@ buildRustPackage rec {
   src = fetchgit {
     url = "https://github.com/rust-lang/cargo.git";
     rev = "refs/tags/0.3.0";
-    sha256 = "1ckb2xd7nm8357imw6b1ci2ar8grnihzan94kvmjrijq6sz8yv9i";
-    leaveDotGit = true;
+    sha256 = "0p7p7yivydjkpqb53a8i7pjl719z3gxa6czi0255ccwsh6n9z793";
   };
 
   depsSha256 = "1sgdr2akd9xrfmf5g0lbf842b2pdj1ymxk37my0cf2x349rjsf0w";

From f7915e45f36612708e1ebcd88b546b2a5790d744 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 21 Jul 2015 21:40:19 +0200
Subject: [PATCH 0116/2016] perl-Font-TTF: add description and license

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8aaf05d8bc0..de2ad38a33e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4033,6 +4033,10 @@ let self = _self // overrides; _self = with self; {
       sha256 = "0l7vxag0v3hf7w1kjyjv02zqrjzhg6xczcv60z00l3z0fr78xi16";
     };
     propagatedBuildInputs = [ IOString ];
+    meta = {
+      description = "TTF font support for Perl";
+      license = stdenv.lib.licenses.artistic2;
+    };
   };
 
   ForksSuper = buildPerlPackage {

From 3eaa7ba417d92389d802a90efa34d4f7a15b6ba7 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 16 Jul 2015 18:00:45 +0200
Subject: [PATCH 0117/2016] gmic: 1.5.7.2 -> 1.6.5.0

---
 .../graphics/gimp/plugins/default.nix         | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 8ece9ba2453..ea638de7925 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -159,24 +159,25 @@ rec {
   };
 
   gmic =
-  let
-    imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough?
-  in pluginDerivation rec {
-      name = "gmic-1.5.7.2";
-      buildInputs = [imagemagick pkgconfig pkgs.fftw gimp] ++ gimp.nativeBuildInputs;
+    pluginDerivation rec {
+      name = "gmic-1.6.5.0";
+
+      buildInputs = [pkgconfig pkgs.fftw pkgs.opencv gimp] ++ gimp.nativeBuildInputs;
+
       src = fetchurl {
-        url = mirror://sourceforge/gmic/gmic_1.5.7.2.tar.gz;
-        sha256 = "1cpbxb3p2c8bcv2cbr150whapzjc7w09i3jza0z9x3xj8c0vdyv1";
+        url = http://gmic.eu/files/source/gmic_1.6.5.0.tar.gz;
+        sha256 = "1vb6zm5zpqfnzxjvb9yfvczaqacm55rf010ib0yk9f28b17qrjgb";
       };
-      preConfigure = ''
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${imagemagick}/include/ImageMagick"
-      '';
+
       sourceRoot = "${name}/src";
-      buildPhase = "make gimp";
+
+      buildFlags = "gimp";
+
       installPhase = "installPlugins gmic_gimp";
+
       meta = {
         description = "script language for image processing which comes with its open-source interpreter";
-        homepage = http://gmic.sourceforge.net/repository.shtml;
+        homepage = http://gmic.eu/gimp.shtml;
         license = stdenv.lib.licenses.cecill20;
         /*
         The purpose of this Free Software license agreement is to grant users

From a855efe7dbce4962729f767177a08f9f4e7ab837 Mon Sep 17 00:00:00 2001
From: Oliver Hunt <oliver.huntuk@gmail.com>
Date: Tue, 21 Jul 2015 21:37:29 +0000
Subject: [PATCH 0118/2016] ksuperkey: init

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

diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix
new file mode 100644
index 00000000000..233296e58ac
--- /dev/null
+++ b/pkgs/tools/X11/ksuperkey/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, libX11, libXtst, pkgconfig, inputproto, libXi, xproto, xextproto }:
+
+stdenv.mkDerivation rec {
+  name = "ksuperkey-git-2015-07-21";
+
+  buildInputs = [
+    libX11 libXtst pkgconfig inputproto libXi xproto xextproto
+  ];
+
+  src = fetchgit {
+    url = "https://github.com/hanschen/ksuperkey";
+    rev = "e75a31a0e3e80b14341e92799a7ce3232ac37639";
+    sha256 = "00be6b93daf78bae0223f002e782e30a650dded3c5a83b1adfe9439e20e398fb";
+  };
+
+  preConfigure = ''
+    makeFlags="$makeFlags PREFIX=$out"
+  '';
+
+  meta = {
+    description = "A tool to be able to bind the super key as a key rather than a modifier";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.vozz ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea85bd3547b..84cbdc23b83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11811,6 +11811,8 @@ let
 
   koji = callPackage ../tools/package-management/koji { };
 
+  ksuperkey = callPackage ../tools/X11/ksuperkey { };
+
   kubernetes = callPackage ../applications/networking/cluster/kubernetes { };
 
   lame = callPackage ../development/libraries/lame { };

From a5e1b8db8f29561cd4a5b4744af2a918d4eb0904 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 21 Jul 2015 16:42:01 -0500
Subject: [PATCH 0119/2016] nixpkgs: pax-utils 1.0.4 -> 1.0.5

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

diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index d698fcf1b7e..13d144c54b0 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pax-utils-${version}";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchurl {
     url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz";
-    sha256 = "1wymfsir2s22zqjdwnwv7bn075vzzlhssgwxnkz33i2d5pr6rqgp";
+    sha256 = "0vwhmnwai24h654d1zchm5qkbr030ay98l2qdp914ydgwhw9k6pn";
   };
 
   makeFlags = [

From 2a3a761639f8e5a0c393e8c2cb093ae89de76659 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 21 Jul 2015 17:00:10 -0500
Subject: [PATCH 0120/2016] nixpkgs: capstone 2.1.2 -> 3.0.4

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

diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index d61c82bb7d3..31971b5d52a 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -1,21 +1,16 @@
-{ stdenv, fetchurl, bash }:
+{ stdenv, fetchurl, bash, cmake }:
 
 stdenv.mkDerivation rec {
   name    = "capstone-${version}";
-  version = "2.1.2";
+  version = "3.0.4";
 
   src = fetchurl {
-    url    = "http://www.capstone-engine.org/download/${version}/${name}.tgz";
-    sha256 = "1k6px3vdcsfby3lakss5sazs875kbzkzqk7cj79xrm2y5ik1vr29";
+    url    = "hhttps://github.com/aquynh/capstone/archive/${version}.tar.gz";
+    sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax";
   };
 
-  buildPhase = false;
-
-  patchPhase = ''
-    substituteInPlace make.sh --replace "/usr/bin/env bash" "${bash}/bin/bash"
-  '';
-
-  installPhase = "PREFIX=$out ./make.sh install";
+  buildInputs = [ cmake ];
+  enableParallelBuild = true;
 
   meta = {
     description = "advanced disassembly library";

From d2986a93987972d7a1f46864cf2b209d168c8f9a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 21 Jul 2015 18:27:19 -0500
Subject: [PATCH 0121/2016] nixpkgs: remove linuxPackages.ktap

It's been broken on the latest 3 major kernels, and it seems development
has stalled unfortunately, so this should be pulled.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/ktap/default.nix | 34 -------------------------
 pkgs/top-level/all-packages.nix         |  2 --
 2 files changed, 36 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/ktap/default.nix

diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix
deleted file mode 100644
index 2cb4f60f75b..00000000000
--- a/pkgs/os-specific/linux/ktap/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, kernel, useFFI ? false }:
-
-assert builtins.substring 0 4 kernel.version != "3.18";
-
-let
-  ffiArgs = stdenv.lib.optionalString useFFI "FFI=1";
-in
-stdenv.mkDerivation rec {
-  name = "ktap-${version}";
-  version = "0.5-e7a38ef0";
-  src = fetchgit {
-    url    = "https://github.com/ktap/ktap.git";
-    rev    = "e7a38ef06bec9a651c9e8bdb3ad66a104210d475";
-    sha256 = "07acf20e1926d3afd89b13855154b8cc792c57261e7d3cae2da70cb08844f9c8";
-  };
-
-  buildPhase = ''
-    make ${ffiArgs} KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
-  '';
-
-  installPhase = ''
-    mkdir -p $out/sbin
-    cp ktap $out/sbin
-    make modules_install KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build INSTALL_MOD_PATH=$out
-  '';
-
-  meta = {
-    description = "A lightweight script-based dynamic tracing tool for Linux";
-    homepage    = "http://www.ktap.org";
-    license     = stdenv.lib.licenses.gpl2;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 864f22f86a0..c9eab53a346 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9772,8 +9772,6 @@ let
 
     fusionio-vsl = callPackage ../os-specific/linux/fusionio/vsl.nix { };
 
-    ktap = callPackage ../os-specific/linux/ktap { };
-
     lttng-modules = callPackage ../os-specific/linux/lttng-modules { };
 
     broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };

From a594118f3dcd72f108f8612fd9e735ef8870059f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 21 Jul 2015 18:50:23 -0500
Subject: [PATCH 0122/2016] nixpkgs: mono 4.0.1 -> 4.0.2.5

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

diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index 66939ff1a02..3082a53137b 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -6,13 +6,15 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mono-${version}";
-  version = "4.0.1";
+  version = "4.0.2.5";
   src = fetchurl {
     url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
-    sha256 = "1kjv1zhcmd2qfr89vkaas6541n5jfzisn3y030l6lg6lp3ria7zz";
+    sha256 = "0lfndz7l3j593wilyczb5w6kvrdbf2fsd1i46qlszfjvx975hx5h";
   };
 
-  buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib];
+  buildInputs =
+    [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib
+    ];
   propagatedBuildInputs = [glib];
 
   NIX_LDFLAGS = "-lgcc_s" ;

From 0ca8ddc16eff7349d2d0cafe3ddf67bd802fee03 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 21 Jul 2015 18:51:56 -0500
Subject: [PATCH 0123/2016] nixpkgs: fsharp 3.1.1.32 -> 3.1.2.5

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

diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 92d80deb532..11bae06fc74 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "fsharp-${version}";
-  version = "3.1.1.32";
+  version = "3.1.2.5";
 
   src = fetchurl {
     url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";
-    sha256 = "16kqgdx0y0lmxv59mc4g7l5ll60nixg5b8bg07vxfnqrf7i6dffd";
+    sha256 = "1j6lnzvhj8fj1csb9am9xcrmmph6v3jyangkq8n1yp3dr6yxqzh1";
   };
 
   buildInputs = [ mono pkgconfig dotnetbuildhelpers autoconf automake which ];

From a8c7abdb8df092855a8a7b16bfd3c312baede4b2 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 22 Jul 2015 01:26:40 +0000
Subject: [PATCH 0124/2016] knockknock: init

A simple but secure port knocking daemon and associated tool (NixOS modules upcoming)
---
 pkgs/tools/security/knockknock/default.nix | 29 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/security/knockknock/default.nix

diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix
new file mode 100644
index 00000000000..2813149c4df
--- /dev/null
+++ b/pkgs/tools/security/knockknock/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage, python, pycrypto, hping }:
+
+buildPythonPackage  rec {
+  rev  = "bf14bbff";
+  name = "knockknock-r${rev}";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "moxie0";
+    repo   = "knockknock";
+    sha256 = "1chpfs3w2vkjrgay69pbdr116z1jldv53fi768a1i05fdqhy1px4";
+  };
+
+  propagatedBuildInputs = [ pycrypto ];
+
+  patchPhase = ''
+    substituteInPlace setup.py --replace "/etc" "$out/etc"
+    substituteInPlace knockknock.py --replace 'existsInPath("hping3")' '"${hping}/bin/hping3"'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple, secure port knocking daemon and client written in Python";
+    homepage    = "http://www.thoughtcrime.org/software/knockknock/";
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ copumpkin ];
+    platforms   = with platforms; linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9eab53a346..5f338c0fb41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1966,6 +1966,8 @@ let
 
   kismet = callPackage ../applications/networking/sniffers/kismet { };
 
+  knockknock = callPackage ../tools/security/knockknock { inherit (pythonPackages) pycrypto; };
+
   kpcli = callPackage ../tools/security/kpcli { };
 
   kst = callPackage ../tools/graphics/kst { };

From 75a7f96b4426970697736e912ab12494dcf1d96d Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 22 Jul 2015 01:32:09 +0000
Subject: [PATCH 0125/2016] knockknock: minor cleanup

---
 pkgs/tools/security/knockknock/default.nix | 2 +-
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix
index 2813149c4df..2341d2110bf 100644
--- a/pkgs/tools/security/knockknock/default.nix
+++ b/pkgs/tools/security/knockknock/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildPythonPackage, python, pycrypto, hping }:
 
-buildPythonPackage  rec {
+buildPythonPackage rec {
   rev  = "bf14bbff";
   name = "knockknock-r${rev}";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f338c0fb41..3cf462adeb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1966,7 +1966,7 @@ let
 
   kismet = callPackage ../applications/networking/sniffers/kismet { };
 
-  knockknock = callPackage ../tools/security/knockknock { inherit (pythonPackages) pycrypto; };
+  knockknock = callPackage ../tools/security/knockknock { };
 
   kpcli = callPackage ../tools/security/kpcli { };
 

From 551a26dad196ae1370b5ea84783784c9f0fce62f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 21 Jul 2015 21:59:18 -0700
Subject: [PATCH 0126/2016] chromium: Update stable 43 -> 44

---
 .../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 3e2f256eec8..6b2f542f34f 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -13,9 +13,9 @@
     sha256bin64 = "0kvrpqy3fpfzchly65nrh8z2z2i49xpa3pm2k7k18sn0x4bycji0";
   };
   stable = {
-    version = "43.0.2357.134";
-    sha256 = "0nbn25pl3rgyqmy4p5dqr0v08xzkm08lpzsaxzszqpa4w7ivp8fk";
-    sha256bin32 = "1xmybw4vs8x2rrg43f7x7yn763wfzr5f8d1jpq49r42qr365q6vs";
-    sha256bin64 = "1y79135pmkhvv4cdhdy93jhm0jdx132a6spqqyyhbcr2sn26cq62";
+    version = "44.0.2403.89";
+    sha256 = "161shml5w2i0crl57hkfnizgmii6d70lxxg4rjxmays8g6lrmpds";
+    sha256bin32 = "09a1k0xxmp6v1nfnngfkhv9vilnwvqlbgfsisbhwdnkk86pnv7r4";
+    sha256bin64 = "1i7ylif5vd0yj0gddl2kv87gh3vgzvzmz91rrrs9za2bkf2gkf0p";
   };
 }

From 85002177154829c69124de6aed022ca437ec0a04 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 21 Jul 2015 11:15:26 +0200
Subject: [PATCH 0127/2016] vimus: disable on 32 bit linux

A port of https://github.com/NixOS/nixpkgs/commit/57c5b8f5e179a758d9e9eb7f856e5f5bdb2fc5a3
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 837fa79859d..0ec01cebf49 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -891,4 +891,6 @@ self: super: {
   # Hydra no longer allows building texlive packages.
   lhs2tex = dontDistribute super.lhs2tex;
 
+  # https://ghc.haskell.org/trac/ghc/ticket/9825
+  vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
 }

From 419b15a21538f7e53e394cf44181bbd4d0881116 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 09:56:46 +0200
Subject: [PATCH 0128/2016] capstone: fix hhttps typo (ZHF)

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

diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 31971b5d52a..a72532ee35b 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.0.4";
 
   src = fetchurl {
-    url    = "hhttps://github.com/aquynh/capstone/archive/${version}.tar.gz";
+    url    = "https://github.com/aquynh/capstone/archive/${version}.tar.gz";
     sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax";
   };
 

From fe7114035fc4c818ed363041394439e5473ca7e5 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 22 Jul 2015 06:26:08 +0200
Subject: [PATCH 0129/2016] coreclr: disable i686 build

The hydra build [1] fails with

  error: Detected non x86_64 target processor.  Not supported!

[1]: https://hydra.nixos.org/build/23871656
---
 pkgs/development/compilers/coreclr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
index 094df5b5b63..629d981893d 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://dotnet.github.io/core/;
     description = ".NET is a general purpose development platform.";
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = [ "x86_64-linux" ];
     maintainers = with stdenv.lib.maintainers; [ obadz ];
     license = stdenv.lib.licenses.mit;
   };

From f50e3275108bfddc6f56f3362552d74bd843c5b0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 10:04:00 +0200
Subject: [PATCH 0130/2016] gradm: fix download (ZHF)

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

diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
index d34a028220c..97f4c1e93fa 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name    = "gradm-${version}";
-  version = "3.1-201503211320";
+  version = "3.1-201507191652";
 
   src  = fetchurl {
     url    = "http://grsecurity.net/stable/${name}.tar.gz";
-    sha256 = "17yd307jqva8jqib2xr3i9kmp58f2cb4jd7an5rbk5zr1k48ap9j";
+    sha256 = "0l3s56wvk5kpd2qppl328x4alh327xnbf271lh1fan84pxbw651g";
   };
 
   buildInputs = [ gcc coreutils findutils binutils pam flex bison bash ];

From 04e782f380964f447448d91bce0e99e9ddb23570 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 10:10:03 +0200
Subject: [PATCH 0131/2016] hbase: 0.98.8 -> 0.98.13. Fixes download (ZHF)

---
 pkgs/servers/hbase/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix
index de5be18713e..408022f650f 100644
--- a/pkgs/servers/hbase/default.nix
+++ b/pkgs/servers/hbase/default.nix
@@ -1,10 +1,13 @@
 { stdenv, fetchurl, jre, makeWrapper }:
-stdenv.mkDerivation {
-  name = "hbase-0.98.8";
+stdenv.mkDerivation rec {
+  name = "hbase-${version}";
+  version = "0.98.13";
+
   src = fetchurl {
-    url = http://mirror.gopotato.co.uk/apache/hbase/stable/hbase-0.98.8-hadoop2-bin.tar.gz;
-    sha256 = "0nvxaqpw8v2hg6mn2p2zxj3y6r4dj4xzxmp8rfmv6m6algn5apv6";
+    url = "mirror://apache/hbase/${version}/hbase-${version}-hadoop2-bin.tar.gz";
+    sha256 = "1av81nnnwivxf5ha6x9qrr2afl5sbyskl07prv0rdac954xmgg8n";
   };
+
   buildInputs = [ makeWrapper ];
   installPhase = ''
     mkdir -p $out

From 62092ef4e7c161e6043d0dc7ab2c98d7cc2ea291 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 10:23:34 +0200
Subject: [PATCH 0132/2016] kicad: fix download urls (ZHF)

---
 pkgs/applications/science/electronics/kicad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 1fc97abef92..0762002b8a8 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
   name = "kicad-20131025";
 
   src = fetchbzr {
-    url = "https://code.launchpad.net/~kicad-stable-committers/kicad/stable";
+    url = "https://code.launchpad.net/kicad/stable";
     rev = 4024;
     sha256 = "1sv1l2zpbn6439ccz50p05hvqg6j551aqra551wck9h3929ghly5";
   };
 
   srcLibrary = fetchbzr {
-    url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library";
+    url = "http://bazaar.launchpad.net/~kicad-product-committers/kicad/library";
     rev = 293;
     sha256 = "1wn9a4nhqyjzzfkq6xm7ag8n5n10xy7gkq6i7yry7wxini7pzv1i";
   };

From 6f5aa25e89209f29457bc6fd09643bee1370152b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 10:29:34 +0200
Subject: [PATCH 0133/2016] Revert "zfs_git: 2015-06-22 -> 2015-07-01"

This reverts commit 54022375eb3ae3375385717690ef133c819c9bf1.

Revert "zfs_git: 2015-05-13 -> 2015-06-22"

This reverts commit 59faa759dade5c629409d683e72523548c40f554.

Closes #8941
---
 pkgs/os-specific/linux/zfs/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index 0df47e612e2..130a02c86e8 100644
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -1,12 +1,12 @@
 { callPackage, stdenv, fetchgit, spl_git, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-07-01";
+  version = "2015-05-13";
 
   src = fetchgit {
     url = git://github.com/zfsonlinux/zfs.git;
-    rev = "a7b10a931911d3a98a90965795daad031c6d33a2";
-    sha256 = "0llqbc37f4szx7mwi6j3xmxxz03g3ib7cwypmpcyi0nwkssav5xi";
+    rev = "7fec46b9d8967109ad289d208e8cf36a0c16e40c";
+    sha256 = "0gvzw6vn7wyq2g9psv0fdars7ssidqc5l85x4yym5niccy1xl437";
   };
 
   patches = [ ./nix-build.patch ];

From 604dfd33f4312786485c2ff9b5f2304ba9e23ea7 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 22 Jul 2015 02:33:35 +0200
Subject: [PATCH 0134/2016] i2p: 0.9.19 -> 0.9.20

---
 pkgs/tools/networking/i2p/default.nix | 15 ++++++-----
 pkgs/tools/networking/i2p/i2p.patch   | 39 +++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/tools/networking/i2p/i2p.patch

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index b5ef06c34ea..1ef159131af 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,12 +1,13 @@
 { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
 
 stdenv.mkDerivation rec {
-  name = "i2p-0.9.19";
+  name = "i2p-0.9.20";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "1q9sda1a708laxf452qnzbfv7bwfwyam5n1giw2n3z3ar602i936";
+    sha256 = "10rynkl9dbnfl67ck3d7wdwz52h7354r7nbwcypsjnng4f1dmj5s";
   };
   buildInputs = [ jdk ant gettext which ];
+  patches = [ ./i2p.patch ];
   buildPhase = ''
     export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
     ant preppkg-linux-only
@@ -17,15 +18,15 @@ stdenv.mkDerivation rec {
     cp -r pkg-temp/* $out
     cp installer/lib/wrapper/linux64/* $out
     sed -i $out/i2prouter -i $out/runplain.sh \
-      -e "s#%INSTALL_PATH#$out#" \
+      -e "s#uname#${coreutils}/bin/uname#" \
+      -e "s#which#${which}/bin/which#" \
+      -e "s#%gettext%#${gettext}/bin/gettext#" \
       -e "s#/usr/ucb/ps#${procps}/bin/ps#" \
       -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \
+      -e "s#%INSTALL_PATH#$out#" \
       -e 's#%USER_HOME#$HOME#' \
       -e "s#%SYSTEM_java_io_tmpdir#/tmp#" \
-      -e 's#JAVA=java#JAVA=${jre}/bin/java#'
-    sed -i $out/runplain.sh \
-      -e "s#nohup \(.*Launch\) .*#\1#" \
-      -e "s#echo \$\! .*##"
+      -e "s#%JAVA%#${jre}/bin/java#"
     mv $out/runplain.sh $out/bin/i2prouter-plain
     mv $out/man $out/share/
     chmod +x $out/bin/* $out/i2psvc
diff --git a/pkgs/tools/networking/i2p/i2p.patch b/pkgs/tools/networking/i2p/i2p.patch
new file mode 100644
index 00000000000..2ae6446ed28
--- /dev/null
+++ b/pkgs/tools/networking/i2p/i2p.patch
@@ -0,0 +1,39 @@
+--- a/installer/resources/runplain.sh
++++ b/installer/resources/runplain.sh
+@@ -21,7 +21,7 @@
+ 
+ # Try using the Java binary that I2P was installed with.
+ # If it's not found, try looking in the system PATH.
+-JAVA=$(which %JAVA_HOME/bin/java || which java)
++JAVA=%JAVA%
+ 
+ if [ -z $JAVA ] || [ ! -x $JAVA ]; then
+     echo "Error: Cannot find java." >&2
+@@ -40,15 +40,4 @@
+     export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
+ fi
+ JAVAOPTS="-Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
+-(
+-    nohup ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1
+-) &
+-PID=$!
+-
+-if [ ! -z $PID ] && kill -0 $PID > /dev/null 2>&1 ; then
+-    echo "I2P started [$PID]" >&2
+-    echo $PID > "${I2PTEMP}/router.pid"
+-else
+-    echo "I2P failed to start." >&2
+-    exit 1
+-fi
++${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch
+--- a/installer/resources/i2prouter
++++ b/installer/resources/i2prouter
+@@ -49,7 +49,7 @@
+ 
+ # gettext - we look for it in the path
+ # fallback to echo is below, we can't set it to echo here.
+-GETTEXT=$(which gettext > /dev/null 2>&1)
++GETTEXT=%gettext%
+ 
+ # Where to install the systemd service
+ SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service"

From 6151349d07325cbf24c5877fa929f816fbfc37e6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 10:58:21 +0200
Subject: [PATCH 0135/2016] partclone: fix download (ZHF)

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

diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix
index fe2b9e00aaa..928c0494a1c 100644
--- a/pkgs/tools/backup/partclone/default.nix
+++ b/pkgs/tools/backup/partclone/default.nix
@@ -8,8 +8,8 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = https://codeload.github.com/Thomas-Tsai/partclone/legacy.tar.gz/stable;
-    sha256 = "0vvk6c26gf2wv5y0mxnz90bivgp84pi82qk5q5xkcz6nz3swals7";
-    name = "Thomas-Tsai-partclone-stable-0-gab3bd53.tar.gz";
+    sha256 = "12bnhljc4n4951p5c05gc7z5qwdsjpx867ad1npmgsm8d9w941sn";
+    name = "Thomas-Tsai-partclone-stable-20150722.tar.gz";
   };
 
   buildInputs = [e2fsprogs pkgconfig libuuid];

From 14d36053b1051685fc98412d056a6be1469e280e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 11:23:17 +0200
Subject: [PATCH 0136/2016] weston: use version 1.8.0 instead of wayland
 version (ZHF)

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

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 9b88400ef53..d270d3a2b1d 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -6,11 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "weston-${wayland.version}";
+  name = "weston-${version}";
+  version = "1.8.0";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1kb6a494j56sh7iy43xwkjlr3bh0nnkq4bkimwj6qirzbya12i8w";
+    sha256 = "04nkbbdglh0pqznxkdqvak3pc53jmz24d0658bn5r0cf6agycqw9";
   };
 
   buildInputs = [

From bb823e900a4b78252dda8a7cf9c940b93fb4c81c Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 22 Jul 2015 09:23:53 +0000
Subject: [PATCH 0137/2016] kde4.digikam: 4.10.0 -> 4.11.0

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

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index f86d3056db9..cfc15ed87bf 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-4.10.0";
+  name = "digikam-4.11.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
-    sha256 = "4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725";
+    sha256 = "1nak3w0717fpbpmklzd3xkkbp2mwi44yxnc789wzmi9d8z9n3jwh";
   };
 
   nativeBuildInputs = [ cmake automoc4 pkgconfig ];

From 0abe34e4543125f62ef3335fb3bc065e2df996db Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 11:34:18 +0200
Subject: [PATCH 0138/2016] OVMF: build with gcc 4.8, I'm no idea what I'm
 doing (ZHF)

---
 pkgs/applications/virtualization/OVMF/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                   | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 479d625c7de..715073351f1 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }:
+{ stdenv, edk2, nasm, iasl, seabios, openssl, gcc, secureBoot ? false }:
 
 let
 
@@ -15,7 +15,8 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
   name = "OVMF-2014-12-10";
 
   # TODO: properly include openssl for secureBoot
-  buildInputs = [nasm iasl] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ];
+  # Doesn't build with gcc 4.9
+  buildInputs = [nasm iasl gcc] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ];
 
   unpackPhase = ''
     for file in \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cf462adeb3..d412cbbce8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9059,8 +9059,8 @@ let
 
   qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
 
-  OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; };
-  OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; };
+  OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; gcc = gcc48; };
+  OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; gcc = gcc48; };
   #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; };
 
   seabios = callPackage ../applications/virtualization/seabios { };

From befef13d3734595c201d4e81a6ab2266c400a48b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 11:37:38 +0200
Subject: [PATCH 0139/2016] chaps: not supported on i686 (ZHF)

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

diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix
index 9a2ae0b5114..1d3f530dd9f 100644
--- a/pkgs/tools/security/chaps/default.nix
+++ b/pkgs/tools/security/chaps/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     description = "PKCS #11 implementation based on trusted platform module (TPM)";
     homepage = "https://www.chromium.org/developers/design-documents/chaps-technical-design";
     maintainers = [ maintainers.tstrobel ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
     license = licenses.bsd3;
   };
 }

From 58430f3259d59c902d916a3fbf85fb17ed28725e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 11:58:02 +0200
Subject: [PATCH 0140/2016] Revert "OVMF: build with gcc 4.8, I'm no idea what
 I'm doing (ZHF)"

This reverts commit 0abe34e4543125f62ef3335fb3bc065e2df996db.
---
 pkgs/applications/virtualization/OVMF/default.nix | 5 ++---
 pkgs/top-level/all-packages.nix                   | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 715073351f1..479d625c7de 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, edk2, nasm, iasl, seabios, openssl, gcc, secureBoot ? false }:
+{ stdenv, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }:
 
 let
 
@@ -15,8 +15,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
   name = "OVMF-2014-12-10";
 
   # TODO: properly include openssl for secureBoot
-  # Doesn't build with gcc 4.9
-  buildInputs = [nasm iasl gcc] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ];
+  buildInputs = [nasm iasl] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ];
 
   unpackPhase = ''
     for file in \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d412cbbce8f..3cf462adeb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9059,8 +9059,8 @@ let
 
   qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
 
-  OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; gcc = gcc48; };
-  OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; gcc = gcc48; };
+  OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; };
+  OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; };
   #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; };
 
   seabios = callPackage ../applications/virtualization/seabios { };

From 65700b435c8a495e5ff7071e41db34bf49b9ef89 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 15:48:45 +0200
Subject: [PATCH 0141/2016] Use ConditionVirtualization to disable some
 services in containers

(cherry picked from commit c52a98380673093037a3116025d0aa92cd46a214)
---
 nixos/modules/system/boot/systemd.nix             | 4 ++++
 nixos/modules/virtualisation/container-config.nix | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 2ad12c51b21..d001feb063b 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -749,6 +749,10 @@ in
     systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;
     systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
 
+    # Don't bother with certain units in containers.
+    systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";
+    systemd.services.systemd-random-seed.unitConfig.ConditionVirtualization = "!container";
+
   };
 
 }
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 67047541102..c210c8d5f25 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -19,10 +19,6 @@ with lib;
     # Shut up warnings about not having a boot loader.
     system.build.installBootLoader = "${pkgs.coreutils}/bin/true";
 
-    systemd.services.systemd-remount-fs.enable = false;
-
-    systemd.services.systemd-random-seed.enable = false;
-
   };
 
 }

From 6bd4e0b8cd8a5f043492846d7ee4531349962102 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 15:54:16 +0200
Subject: [PATCH 0142/2016] Create systemd-{network,resolve} user/group
 unconditionally

This shuts up this error from dbus:

May 11 13:52:16 machine dbus-daemon[259]: Unknown username "systemd-network" in message bus configuration file
May 11 13:52:16 machine dbus-daemon[259]: Unknown username "systemd-resolve" in message bus configuration file

which happens because the D-Bus config for networkd/resolved is
enabled unconditionally, and we don't have an easy way to turn it off.

(cherry picked from commit f19b58fb6a5cc55af6d8d8ca7979f8e64255d2d0)
---
 nixos/modules/system/boot/networkd.nix | 3 ---
 nixos/modules/system/boot/resolved.nix | 3 ---
 nixos/modules/system/boot/systemd.nix  | 5 +++++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index b183c0f3236..34eea9af83b 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -641,9 +641,6 @@ in
     environment.etc."systemd/network".source =
       generateUnits "network" cfg.units [] [];
 
-    users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
-    users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network;
-
     systemd.services.systemd-networkd = {
       wantedBy = [ "multi-user.target" ];
       before = [ "network-interfaces.target" ];
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index ecd547322d3..5a98b9b6d48 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -30,9 +30,6 @@ with lib;
       DNS=${concatStringsSep " " config.networking.nameservers}
     '';
 
-    users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve;
-    users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve;
-
   };
 
 }
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index d001feb063b..557dc204fca 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -648,6 +648,11 @@ in
         ${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
       '';
 
+    users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
+    users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network;
+    users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve;
+    users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve;
+
     # Target for ‘charon send-keys’ to hook into.
     users.extraGroups.keys.gid = config.ids.gids.keys;
 

From 9647609e3eb687079d2120b57bdf095d8643671f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 15:59:11 +0200
Subject: [PATCH 0143/2016] stage-1: Don't mount /dev/shm if it's already
 mounted

(cherry picked from commit c8ef5989452e191a1d345cd006f54305cb989af6)
---
 nixos/modules/system/boot/stage-2-init.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 173453a17f7..330e2f97c5b 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -85,8 +85,10 @@ done
 
 
 # More special file systems, initialise required directories.
-mkdir -m 0755 /dev/shm
-mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
+if ! mountpoint -q /dev/shm; then
+    mkdir -m 0755 /dev/shm
+    mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
+fi
 mkdir -m 0755 -p /dev/pts
 [ -e /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb # UML doesn't have USB by default
 mkdir -m 01777 -p /tmp

From ec82157ac5b36560c7edae4acfe47edb57133991 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 16:22:49 +0200
Subject: [PATCH 0144/2016] stage-2: Don't run hwclock in containers

(cherry picked from commit b978df019a2b1281f7a70445eaa71b45049f4cfd)
---
 nixos/modules/system/boot/stage-2-init.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 330e2f97c5b..a73070ab332 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -164,7 +164,9 @@ $systemConfig/activate
 # Restore the system time from the hardware clock.  We do this after
 # running the activation script to be sure that /etc/localtime points
 # at the current time zone.
-hwclock --hctosys
+if [ -e /dev/rtc ]; then
+    hwclock --hctosys
+fi
 
 
 # Record the boot configuration.

From 0ab320a884f93fb98939a3f0ccc5ce8bd9d25da9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 17:32:53 +0200
Subject: [PATCH 0145/2016] stage-1: Shut up warnings about swap devices that
 don't exist yet

(cherry picked from commit 388dac478d21b743946362294043b83da4852721)
---
 nixos/modules/system/boot/stage-1-init.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index e8d276920a8..26cf7f06c9e 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -182,9 +182,9 @@ if test -e /sys/power/resume -a -e /sys/power/disk; then
         for sd in @resumeDevices@; do
             # Try to detect resume device. According to Ubuntu bug:
             # https://bugs.launchpad.net/ubuntu/+source/pm-utils/+bug/923326/comments/1
-            # When there are multiple swap devices, we can't know where will hibernate
-            # image reside. We can check all of them for swsuspend blkid.
-            resumeInfo="$(udevadm info -q property "$sd" )"
+            # when there are multiple swap devices, we can't know where the hibernate
+            # image will reside. We can check all of them for swsuspend blkid.
+            resumeInfo="$(test -e "$d" && udevadm info -q property "$sd")"
             if [ "$(echo "$resumeInfo" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then
                 resumeDev="$sd"
                 break

From 2c48ab43903adc1e0437f651dad35c7dd91a10e4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 16:37:03 +0200
Subject: [PATCH 0146/2016] Remove ancient version of udev

(cherry picked from commit ab91aaaeb85b78623bfdb91d87f5d94d378c1e74)
---
 pkgs/os-specific/linux/udev/145.nix | 53 -----------------------------
 pkgs/top-level/all-packages.nix     |  1 -
 2 files changed, 54 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/udev/145.nix

diff --git a/pkgs/os-specific/linux/udev/145.nix b/pkgs/os-specific/linux/udev/145.nix
deleted file mode 100644
index fd1cb8a2d8d..00000000000
--- a/pkgs/os-specific/linux/udev/145.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, gperf, pkgconfig, glib, acl, libusb, usbutils, pciutils }:
-
-assert stdenv ? glibc;
-
-stdenv.mkDerivation rec {
-  name = "udev-145";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
-    sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv";
-  };
-
-  buildInputs = [gperf pkgconfig glib acl libusb usbutils];
-
-  configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids";
-
-  preConfigure =
-    ''
-      substituteInPlace extras/keymap/Makefile.in \
-        --replace /usr/include ${stdenv.glibc}/include
-    '';
-
-  postInstall =
-    ''
-      # Install some rules that really should be installed by default.
-      for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do
-        cp rules/packages/$i $out/libexec/rules.d/
-      done
-
-      # The path to rule_generator.functions in write_cd_rules and
-      # write_net_rules is broken.  Also, don't store the mutable
-      # persistant rules in /etc/udev/rules.d but in
-      # /var/lib/udev/rules.d.
-      for i in $out/libexec/write_cd_rules $out/libexec/write_net_rules; do
-        substituteInPlace $i \
-          --replace /lib/udev $out/libexec \
-          --replace /etc/udev/rules.d /var/lib/udev/rules.d
-      done
-
-      # Don't set PATH to /bin:/sbin; won't work in NixOS.
-      substituteInPlace $out/libexec/rule_generator.functions \
-        --replace 'PATH=' '#PATH='
-
-      # Don't hardcore the FIRMWARE_DIRS variable; obtain it from the
-      # environment of the caller.
-      sed '3,4d' -i $out/libexec/firmware.sh
-    '';
-
-  meta = {
-    homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
-    description = "Udev manages the /dev filesystem";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cf462adeb3..eb8f55a248a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10207,7 +10207,6 @@ let
     cross = assert crossSystem != null; crossSystem;
   });
 
-  udev145 = callPackage ../os-specific/linux/udev/145.nix { };
   udev = pkgs.systemd;
   eudev = callPackage ../os-specific/linux/eudev {};
 

From 925e1f91c5a13649df193a47f37a6906b13e6a83 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 18:19:34 +0200
Subject: [PATCH 0147/2016] Set up /etc/machine-id before starting systemd

Otherwise, systemd will try to populate /etc, which we don't want.

(cherry picked from commit c8501a421806c6526a12b2f6537ab38754e9d4ff)
---
 nixos/modules/system/boot/systemd.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 557dc204fca..f6113188b03 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -646,6 +646,10 @@ in
         # groups, in addition to those in the systemd-journal group.
         # Users can always read their own journals.
         ${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
+
+        if ! [ -e /etc/machine-id ]; then
+          ${systemd}/bin/systemd-machine-id-setup
+        fi
       '';
 
     users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;

From bb5647ea0f48b666a65b9018f1bf775623293a77 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 00:56:38 +0200
Subject: [PATCH 0148/2016] Remove unused file

(cherry picked from commit 58ef0eea0c2d79fbe41f0cb09d93aaec8251fe61)
---
 .../linux/kernel-headers/2.6.32.nix           | 62 -------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel-headers/2.6.32.nix

diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
deleted file mode 100644
index 100dd0c611b..00000000000
--- a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{stdenv, fetchurl, perl, cross ? null}:
-
-assert cross == null -> stdenv.isLinux;
-
-let
-  version = "2.6.32.16";
-  kernelHeadersBaseConfig = if cross == null then
-      stdenv.platform.kernelHeadersBaseConfig
-    else
-      cross.platform.kernelHeadersBaseConfig;
-in
-
-stdenv.mkDerivation {
-  name = "linux-headers-${version}";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-    sha256 = "1ndvqvfaxachsklzzr5db1bzvfhnzz8diddrm1zlv7171fzmn13j";
-  };
-
-  targetConfig = if cross != null then cross.config else null;
-
-  platform =
-    if cross != null then cross.platform.kernelArch else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.isArm then "arm" else
-    if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
-    abort "don't know what the kernel include directory is called for this platform";
-
-  buildInputs = [perl];
-
-  extraIncludeDirs =
-    if cross != null then
-	(if cross.arch == "powerpc" then ["ppc"] else [])
-    else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
-
-  buildPhase = ''
-    if test -n "$targetConfig"; then
-       export ARCH=$platform
-    fi
-    make ${kernelHeadersBaseConfig}
-    make mrproper headers_check
-  '';
-
-  installPhase = ''
-    make INSTALL_HDR_PATH=$out headers_install
-
-    # Some builds (e.g. KVM) want a kernel.release.
-    mkdir -p $out/include/config
-    echo "${version}-default" > $out/include/config/kernel.release
-  '';
-
-  # !!! hacky
-  fixupPhase = ''
-    ln -s asm $out/include/asm-$platform
-    if test "$platform" = "i386" -o "$platform" = "x86_64"; then
-      ln -s asm $out/include/asm-x86
-    fi
-  '';
-}

From 069b4a8a57f50488c5c03b137d886626821d80f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 01:01:16 +0200
Subject: [PATCH 0149/2016] Remove Linux 3.2 and 3.4

These are not supported by systemd so no reason to keep them around.

(cherry picked from commit ee10e165dcc23f7b1855072f5a1f208dcdeead93)

Conflicts:
	pkgs/os-specific/linux/kernel/linux-3.4.nix
---
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 27 ---------------------
 pkgs/os-specific/linux/kernel/linux-3.4.nix | 27 ---------------------
 pkgs/top-level/all-packages.nix             | 16 ------------
 3 files changed, 70 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.2.nix
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.4.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
deleted file mode 100644
index 2fc240f6196..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "3.2.69";
-  extraMeta.branch = "3.2";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0fs7aj3vn51dlx7yfgkx05qpki2msh6j2irwajd9bw0l26cbycd3";
-  };
-
-  # We don't provide these patches if grsecurity is enabled, because
-  # the grsec 3.2 -stable patchset already includes them.
-  kernelPatches = args.kernelPatches ++ (
-    stdenv.lib.optionals (!(args.features.grsecurity or false))
-      [ { name = "0001-AppArmor-compatibility-patch-for-v5-network-controll";
-          patch = ./apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch;
-        }
-        { name = "0002-AppArmor-compatibility-patch-for-v5-interface";
-          patch = ./apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch;
-        }
-        { name = "0003-AppArmor-Allow-dfa-backward-compatibility-with-broke";
-          patch = ./apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch;
-        }]);
-
-  features.iwlwifi  = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
deleted file mode 100644
index a0ba7f46c68..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "3.4.108";
-  extraMeta.branch = "3.4";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0xdycfbn2j398n1763zkhiv08xsya52acic1zign4s315b45pijm";
-  };
-
-  kernelPatches = args.kernelPatches ++
-    [ { name = "0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file";
-        patch = ./apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch;
-      }
-      { name = "0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules";
-        patch = ./apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch;
-      }
-      { name = "0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou";
-        patch = ./apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch;
-      }];
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb8f55a248a..a73bb0b2ae0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9608,20 +9608,6 @@ let
 
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
 
-  linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
-    inherit fetchurl stdenv perl buildLinux;
-    kernelPatches = [ kernelPatches.bridge_stp_helper ];
-  };
-
-  linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
-    inherit fetchurl stdenv perl buildLinux;
-    kernelPatches = [ kernelPatches.bridge_stp_helper ]
-     ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-      ];
-  };
-
   linux_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi.nix) {
     inherit fetchurl stdenv perl buildLinux;
     kernelPatches = [ kernelPatches.bridge_stp_helper ];
@@ -9866,8 +9852,6 @@ let
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
-  linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
-  linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
   linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi linuxPackages_rpi;
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
   linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;

From eedda353f30b1e4317096b4367e15fedd79c29f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 01:03:34 +0200
Subject: [PATCH 0150/2016] Remove Linux 3.19

It's already EOL so we shouldn't keep it around in our new stable
branch.

(cherry picked from commit cdbb5483b7ef1dcdb628e802aab25362c01ea41c)
---
 pkgs/top-level/all-packages.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a73bb0b2ae0..9c14725cce1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9653,16 +9653,6 @@ let
       ];
   };
 
-  linux_3_19 = makeOverridable (import ../os-specific/linux/kernel/linux-3.19.nix) {
-    inherit fetchurl stdenv perl buildLinux;
-    kernelPatches = [ kernelPatches.bridge_stp_helper ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   linux_4_0 = makeOverridable (import ../os-specific/linux/kernel/linux-4.0.nix) {
     inherit fetchurl stdenv perl buildLinux;
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
@@ -9858,7 +9848,6 @@ let
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
   linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
   linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18);
-  linuxPackages_3_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_19 linuxPackages_3_19);
   linuxPackages_4_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_0 linuxPackages_4_0);
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1);
   linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);

From 5d02c02a9bfd6912e4e0f700b1b35e76d1d6bd3f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 31 May 2015 19:55:33 +0300
Subject: [PATCH 0151/2016] systemd: Use upstream tmpfiles.d rules

This fixes a failing assert in systemd-timesyncd (issue #5913) as it
expects the directory /run/systemd/netif/links/ to exist, and nothing in
NixOS currently creates it.

Also we get a net reduction in our code as rules for /run/utmp and
/var/log/journal are also provided by the same upstream file.

(cherry picked from commit a278a9224a3c1c5db399d53c86b36a25133b5cda)
---
 .../modules/system/activation/activation-script.nix  |  4 ----
 nixos/modules/system/boot/systemd.nix                | 12 +-----------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 2e5a70b3aa5..02b3e25a313 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -114,10 +114,6 @@ in
       ''
         # Various log/runtime directories.
 
-        touch /run/utmp # must exist
-        chgrp ${toString config.ids.gids.utmp} /run/utmp
-        chmod 664 /run/utmp
-
         mkdir -m 0755 -p /run/nix/current-load # for distributed builds
         mkdir -m 0700 -p /run/nix/remote-stores
 
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index f6113188b03..1314b727772 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -639,13 +639,6 @@ in
     system.activationScripts.systemd = stringAfter [ "groups" ]
       ''
         mkdir -m 0755 -p /var/lib/udev
-        mkdir -p /var/log/journal
-        chmod 0755 /var/log/journal
-
-        # Make all journals readable to users in the wheel and adm
-        # groups, in addition to those in the systemd-journal group.
-        # Users can always read their own journals.
-        ${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
 
         if ! [ -e /etc/machine-id ]; then
           ${systemd}/bin/systemd-machine-id-setup
@@ -731,6 +724,7 @@ in
         startSession = true;
       };
 
+    environment.etc."tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf";
     environment.etc."tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf";
 
     environment.etc."tmpfiles.d/nixos.conf".text =
@@ -738,10 +732,6 @@ in
         # This file is created automatically and should not be modified.
         # Please change the option ‘systemd.tmpfiles.rules’ instead.
 
-        z /var/log/journal 2755 root systemd-journal - -
-        z /var/log/journal/%m 2755 root systemd-journal - -
-        z /var/log/journal/%m/* 0640 root systemd-journal - -
-
         ${concatStringsSep "\n" cfg.tmpfiles.rules}
       '';
 

From 4232f5d219527fddee96f69ff94af0a8bde703ba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2015 14:18:27 +0200
Subject: [PATCH 0152/2016] Disable system_tarball_pc and fix eval

It refers to a kernel version that no longer exists.

(cherry picked from commit e4b9624ca89617005cb082e2a8301695759e1b19)
---
 nixos/release.nix                | 2 ++
 pkgs/top-level/release-cross.nix | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index cf0a00dd254..05023868fa1 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -176,10 +176,12 @@ in rec {
   # boot that system from uboot (like for the sheevaplug).
   # The pc variant helps preparing the expression for the system tarball
   # in a machine faster than the sheevpalug
+  /*
   system_tarball_pc = forAllSystems (system: makeSystemTarball {
     module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
     inherit system;
   });
+  */
 
   # Provide container tarball for lxc, libvirt-lxc, docker-lxc, ...
   containerTarball = forAllSystems (system: makeSystemTarball {
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index cef3d2dffbd..ced90c0489c 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -16,7 +16,6 @@ let
       #xorgserver.crossDrv = nativePlatforms;
     };
     nixUnstable.crossDrv = nativePlatforms;
-    linuxPackages_3_4.kernel.crossDrv = linux;
   };
 
   /* Basic list of packages to be natively built,

From 9a75bafcdaeda8dc5a1e33613a6dd80dda4661d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 1 Jul 2015 11:19:03 +0200
Subject: [PATCH 0153/2016] systemd-timesyncd: Use NTP servers from our own
 ntp.org pool

(cherry picked from commit 01dc343c2c613c263a2180d1850847f33653f94f)

Conflicts:
	pkgs/os-specific/linux/systemd/default.nix
---
 pkgs/os-specific/linux/systemd/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index bde6686ff0a..b98f6e69282 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -82,6 +82,8 @@ stdenv.mkDerivation rec {
 
       substituteInPlace src/journal/catalog.c \
         --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
+
+      configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
     '';
 
   # This is needed because systemd uses the gold linker, which doesn't

From fab309069328e238a4050cd52c176e6349b06d44 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 12:51:21 +0200
Subject: [PATCH 0154/2016] Don't include wireless tools in containers

---
 nixos/modules/tasks/network-interfaces.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 6361ed2cc43..a967fc77e68 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -708,11 +708,14 @@ in
         pkgs.iproute
         pkgs.iputils
         pkgs.nettools
-        pkgs.wirelesstools
+        pkgs.openresolv
+      ]
+      ++ optionals (!config.boot.isContainer) [
+        pkgs.wirelesstools # FIXME: obsolete?
         pkgs.iw
         pkgs.rfkill
-        pkgs.openresolv
-      ] ++ bridgeStp;
+      ]
+      ++ bridgeStp;
 
     systemd.targets."network-interfaces" =
       { description = "All Network Interfaces";

From eae4712f52b5dc87fbcfeb61be0a5cb343d2f11e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 13:52:29 +0200
Subject: [PATCH 0155/2016] glib-tested: disable appinfo test, cannot reproduce
 hydra failure

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

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 5c76bc3186b..fb9c361c530 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -93,6 +93,8 @@ stdenv.mkDerivation rec {
        sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c
        # All gschemas fail to pass the test, upstream bug?
        sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c
+       # Cannot reproduce the failing test_associations on hydra
+       sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c
        # Needed because of libtool wrappers
        sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c
     '';

From 0d9d941d65f91393e845063e8929764bf4dd6b16 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Wed, 22 Jul 2015 11:56:33 +0200
Subject: [PATCH 0156/2016] python-packages: update elasticsearch-dsl 0.0.3 to
 0.0.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 08c0cfee510..f86b63c254f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3142,23 +3142,22 @@ let
 
 
   elasticsearchdsl = buildPythonPackage (rec {
-    name = "elasticsearch-dsl-0.0.3";
+    name = "elasticsearch-dsl-0.0.4";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/e/elasticsearch-dsl/${name}.tar.gz";
-      md5 = "6cbc9ed7aefb3ef804be4e3b318b2570";
+      sha256 = "0bz8p10qk7rz10glq9dm2nq9m1x6czzlqk518107x39gx18lm1a2";
     };
 
-    buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov unittest2 urllib3 ];
+    buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov unittest2 urllib3 pytz ];
 
     # ImportError: No module named test_elasticsearch_dsl
+    # Tests require a local instance of elasticsearch
     doCheck = false;
 
     meta = {
       description = "Python client for Elasticsearch";
-
       homepage = https://github.com/elasticsearch/elasticsearch-dsl-py;
-
       license = licenses.asl20;
     };
   });

From e908c0c9da67854b91c9c93f1e0d100e50a29aa0 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Wed, 22 Jul 2015 11:26:28 +0200
Subject: [PATCH 0157/2016] python-packages: update elasticsearch-1.4.0 to
 elasticsearch-1.6.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 08c0cfee510..ed5ae77066f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3120,11 +3120,11 @@ let
 
 
   elasticsearch = buildPythonPackage (rec {
-    name = "elasticsearch-1.4.0";
+    name = "elasticsearch-1.6.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/e/elasticsearch/${name}.tar.gz";
-      md5 = "14a758debd2296d923cb6c958db98eba";
+      sha256 = "1b0b5d1qp77r83r130kb2ikhd6am0d1389rdcllr1xsajrp5kj4h";
     };
 
     # Check is disabled because running them destroy the content of the local cluster!
@@ -3133,9 +3133,7 @@ let
 
     meta = {
       description = "Official low-level client for Elasticsearch";
-
       homepage = https://github.com/elasticsearch/elasticsearch-py;
-
       license = licenses.asl20;
     };
   });

From ec43c69b5da74ead8c94ecdf0c66b762c604df2e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 18 Jun 2015 00:49:08 +0300
Subject: [PATCH 0158/2016] linux-rpi: Fix modDirVersion

This causes build breakage on staging due to #7524.
---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 67a51dc767d..02b29708131 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -7,7 +7,7 @@ let
 in import ./generic.nix (args // rec {
   version = "3.18.y-${rev}";
 
-  modDirVersion = "3.18.7-v7";
+  modDirVersion = "3.18.7";
 
   src = fetchurl {
     url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}";

From 82d0acaf371d1ea3f497afbe58854198bb3ce6dd Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 1 Jul 2015 12:36:55 +0300
Subject: [PATCH 0159/2016] kernel-config: Explicitly enable NAMESPACES

Namespace support is required by the `unshare` tool used in
`nixos-install`. It's enabled by the x86 defconfig, but not by
e.g. multi_v7_defconfig. So enable it here so that `nixos-install`
can work on ARM.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index cb7423f293a..7063017b3a8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -338,6 +338,7 @@ with stdenv.lib;
   X86_MCE y
 
   # Linux containers.
+  NAMESPACES? y #  Required by 'unshare' used by 'nixos-install'
   RT_GROUP_SCHED? y
   CGROUP_DEVICE? y
   ${if versionAtLeast version "3.6" then ''

From 1947179036c7473b735f378ea91916a67e73753d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 17 Jun 2015 16:39:12 +0300
Subject: [PATCH 0160/2016] nixos/rogue: Set WorkingDirectory to /tmp

Otherwise we can get an ugly /rogue.scr in the root of the filesystem
hierarchy.
---
 nixos/modules/services/misc/rogue.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/rogue.nix b/nixos/modules/services/misc/rogue.nix
index ed8da8a518f..aae02e384c9 100644
--- a/nixos/modules/services/misc/rogue.nix
+++ b/nixos/modules/services/misc/rogue.nix
@@ -52,6 +52,7 @@ in
             TTYPath = "/dev/${cfg.tty}";
             TTYReset = true;
             TTYVTDisallocate = true;
+            WorkingDirectory = "/tmp";
             Restart = "always";
           };
       };

From 6147909f8e80d7fbf15e73f556ee1f6ab4c93289 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 6 Jun 2015 14:15:24 +0300
Subject: [PATCH 0161/2016] extlinux-conf-builder: Properly copy kernels for
 the default entry

When calling addEntry inside a subshell, the filesCopied array would
be updated only in the subshell's environment. This would only cause an
issue if no -g flag was passed to the script, causing no kernels
to be copied.
---
 .../generic-extlinux-compatible/extlinux-conf-builder.sh       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
index 8f2a496de8b..9f32dbcce1a 100644
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
@@ -106,9 +106,10 @@ cat > $tmpFile <<EOF
 DEFAULT nixos-default
 
 TIMEOUT $timeout
-$(addEntry $default default)
 EOF
 
+addEntry $default default >> $tmpFile
+
 # Add up to $numGenerations generations of the system profile to the menu,
 # in reverse (most recent to least recent) order.
 for generation in $(

From 8496f71e9219e1a5ea01898c1c306ab58cf6773a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 18 Jun 2015 00:45:46 +0300
Subject: [PATCH 0162/2016] extlinux-conf-builder: Make it work on non-DTB
 systems

With this, boot.loader.generic-extlinux-compatible can be used with
linuxPackages_rpi on the Raspberry Pi.
---
 .../extlinux-conf-builder.nix                          |  3 ++-
 .../extlinux-conf-builder.sh                           | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix
index 261192c6d24..c5c250c14ce 100644
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix
@@ -3,6 +3,7 @@
 pkgs.substituteAll {
   src = ./extlinux-conf-builder.sh;
   isExecutable = true;
-  inherit (pkgs) bash;
   path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
+  inherit (pkgs) bash;
+  kernelDTB = pkgs.stdenv.platform.kernelDTB or false;
 }
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
index 9f32dbcce1a..642bdf4673b 100644
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
@@ -75,8 +75,10 @@ addEntry() {
 
     copyToKernelsDir "$path/kernel"; kernel=$result
     copyToKernelsDir "$path/initrd"; initrd=$result
-    # XXX UGLY: maybe the system config should have a top-level "dtbs" entry?
-    copyToKernelsDir $(readlink -m "$path/kernel/../dtbs"); dtbs=$result
+    if [ -n "@kernelDTB@" ]; then
+        # XXX UGLY: maybe the system config should have a top-level "dtbs" entry?
+        copyToKernelsDir $(readlink -m "$path/kernel/../dtbs"); dtbs=$result
+    fi
 
     timestampEpoch=$(stat -L -c '%Z' $path)
 
@@ -93,7 +95,9 @@ addEntry() {
     fi
     echo "  LINUX ../nixos/$(basename $kernel)"
     echo "  INITRD ../nixos/$(basename $initrd)"
-    echo "  FDTDIR ../nixos/$(basename $dtbs)"
+    if [ -n "@kernelDTB@" ]; then
+        echo "  FDTDIR ../nixos/$(basename $dtbs)"
+    fi
     echo "  APPEND systemConfig=$path init=$path/init $extraParams"
 }
 

From a6c95a3f7d2215965e098f404a9ad544a8fdd99c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 19 Jun 2015 03:36:07 +0300
Subject: [PATCH 0163/2016] extlinux-conf-builder: Set menu title to force
 prompt display

Without a menu title, U-Boot's distro scripts just autoboot the first
entry by default.

When I initially wrote this, my board wasn't apparently running stock
U-Boot but had some local hacks saved in the U-Boot's environment
which made it always display the prompt.
---
 .../loader/generic-extlinux-compatible/extlinux-conf-builder.sh  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
index 642bdf4673b..7da9c488f69 100644
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
@@ -109,6 +109,7 @@ cat > $tmpFile <<EOF
 # Change this to e.g. nixos-42 to temporarily boot to an older configuration.
 DEFAULT nixos-default
 
+MENU TITLE ------------------------------------------------------------
 TIMEOUT $timeout
 EOF
 

From 201f9beddbf5786262bcff11482f0aa30914bb34 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 15:02:07 +0200
Subject: [PATCH 0164/2016] Don't enable cron by default

The rationale for disabling this is: 1) systemd timers are better; 2)
it gets rid of one usually unnecessary process, which makes containers
more light-weight.

Note that cron is still enabled if services.cron.systemCronJobs is
non-empty, so this only matters if you have no declarative cron jobs
but do have user cron jobs.
---
 .../doc/manual/release-notes/rl-unstable.xml  |  8 ++-
 nixos/modules/services/scheduling/cron.nix    | 60 ++++++++++---------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 0b7750b0591..5fb07a8ed69 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -36,7 +36,7 @@
 
 </para>
 
-<para>Following new services were added since the last release:
+<para>The following new services were added since the last release:
 
 <itemizedlist>
 <listitem><para><literal>brltty</literal></para></listitem>
@@ -50,6 +50,12 @@ following incompatible changes:
 
 <itemizedlist>
 
+<listitem><para><command>cron</command> is no longer enabled by
+default, unless you have a non-empty
+<option>services.cron.systemCronJobs</option>. To force
+<command>cron</command> to be enabled, set
+<option>services.cron.enable = true</option>.</para></listitem>
+
 <listitem><para>Steam now doesn't need root rights to work. Instead of using
 <literal>*-steam-chrootenv</literal>, you should now just run <literal>steam</literal>.
 <literal>steamChrootEnv</literal> package was renamed to <literal>steam</literal>,
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 1f42086dc1e..c81d2bdefa7 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -4,8 +4,6 @@ with lib;
 
 let
 
-  inherit (config.services) jobsTags;
-
   # Put all the system cronjobs together.
   systemCronJobsFile = pkgs.writeText "system-crontab"
     ''
@@ -25,9 +23,9 @@ let
     sendmailPath = "/var/setuid-wrappers/sendmail";
   };
 
-  allFiles = map (f: "\"${f}\"") (
-    [ "${systemCronJobsFile}" ] ++ config.services.cron.cronFiles
-  );
+  allFiles =
+    optional (config.services.cron.systemCronJobs != []) systemCronJobsFile
+    ++ config.services.cron.cronFiles;
 
 in
 
@@ -91,36 +89,44 @@ in
 
   ###### implementation
 
-  config = mkIf (config.services.cron.enable && allFiles != []) {
+  config = mkMerge [
 
-    security.setuidPrograms = [ "crontab" ];
+    { services.cron.enable = mkDefault (allFiles != []);
 
-    environment.systemPackages = [ cronNixosPkg ];
+    }
 
-    systemd.services.cron =
-      { description = "Cron Daemon";
+    (mkIf (config.services.cron.enable && allFiles != []) {
 
-        wantedBy = [ "multi-user.target" ];
+      security.setuidPrograms = [ "crontab" ];
 
-        preStart =
-          ''
-            rm -f /etc/crontab
-            cat ${toString allFiles} > /etc/crontab
-            chmod 0600 /etc/crontab
+      environment.systemPackages = [ cronNixosPkg ];
 
-            mkdir -m 710 -p /var/cron
+      systemd.services.cron =
+        { description = "Cron Daemon";
 
-            # By default, allow all users to create a crontab.  This
-            # is denoted by the existence of an empty cron.deny file.
-            if ! test -e /var/cron/cron.allow -o -e /var/cron/cron.deny; then
-                touch /var/cron/cron.deny
-            fi
-          '';
+          wantedBy = [ "multi-user.target" ];
 
-        restartTriggers = [ config.environment.etc.localtime.source ];
-        serviceConfig.ExecStart = "${cronNixosPkg}/bin/cron -n";
-      };
+          preStart =
+            ''
+              rm -f /etc/crontab
+              cat ${concatMapStrings (f: "\"${f}\" ") allFiles} > /etc/crontab
+              chmod 0600 /etc/crontab
 
-  };
+              mkdir -m 710 -p /var/cron
+
+              # By default, allow all users to create a crontab.  This
+              # is denoted by the existence of an empty cron.deny file.
+              if ! test -e /var/cron/cron.allow -o -e /var/cron/cron.deny; then
+                  touch /var/cron/cron.deny
+              fi
+            '';
+
+          restartTriggers = [ config.environment.etc.localtime.source ];
+          serviceConfig.ExecStart = "${cronNixosPkg}/bin/cron -n";
+        };
+
+    })
+
+  ];
 
 }

From e2b25f94347da698994a00120e79ed67f40b8f38 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 15:12:47 +0200
Subject: [PATCH 0165/2016] Use environment.etc to manage /etc/crontab

Otherwise, /etc/crontab won't be deleted when cron is disabled.
---
 nixos/modules/services/scheduling/cron.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index c81d2bdefa7..a92e8b65d2a 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -91,9 +91,7 @@ in
 
   config = mkMerge [
 
-    { services.cron.enable = mkDefault (allFiles != []);
-
-    }
+    { services.cron.enable = mkDefault (allFiles != []); }
 
     (mkIf (config.services.cron.enable && allFiles != []) {
 
@@ -101,6 +99,17 @@ in
 
       environment.systemPackages = [ cronNixosPkg ];
 
+      environment.etc.crontab =
+        { source = pkgs.runCommand "crontabs" { inherit allFiles; }
+            ''
+              touch $out
+              for i in $allFiles; do
+                cat "$i" >> $out
+              done
+            '';
+          mode = "0600"; # Cron requires this.
+        };
+
       systemd.services.cron =
         { description = "Cron Daemon";
 
@@ -108,10 +117,6 @@ in
 
           preStart =
             ''
-              rm -f /etc/crontab
-              cat ${concatMapStrings (f: "\"${f}\" ") allFiles} > /etc/crontab
-              chmod 0600 /etc/crontab
-
               mkdir -m 710 -p /var/cron
 
               # By default, allow all users to create a crontab.  This

From 57e48df19e87bca6a995e48ffaa571ca5720cb42 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 15:17:01 +0200
Subject: [PATCH 0166/2016] Remove non-incompatible changes from the list of
 incompatible changes

---
 .../doc/manual/release-notes/rl-unstable.xml  | 27 ++-----------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 5fb07a8ed69..fc4fcd4219e 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -41,7 +41,7 @@
 <itemizedlist>
 <listitem><para><literal>brltty</literal></para></listitem>
 <listitem><para><literal>marathon</literal></para></listitem>
-<listitem><para><literal>Tvheadend</literal></para></listitem>
+<listitem><para><literal>tvheadend</literal></para></listitem>
 </itemizedlist>
 </para>
 
@@ -70,20 +70,6 @@ was accordingly renamed to <literal>bomi</literal>
 was accordingly renamed to <literal>electron</literal>
 </para></listitem>
 
-<listitem>
-    <para>
-        The default <literal>NIX_PATH</literal> for NixOS now includes
-        <literal>/nix/var/nix/profiles/per-user/root/channels</literal>, so it's
-        easy to add custom channels.
-    </para>
-    <para>
-        Moreover, whenever a <command>nixos-rebuild &lt;action&gt;
-        --upgrade</command> is issued, every channel that includes a file
-        called <filename>.update-on-nixos-rebuild</filename> will be upgraded
-        alongside of the <literal>nixos</literal> channel.
-    </para>
-</listitem>
-
 <listitem>
   <para>
 	The CUPS printing service has been updated to version <literal>2.0.2</literal>.
@@ -96,15 +82,6 @@ was accordingly renamed to <literal>electron</literal>
   </para>
 </listitem>
 
-<listitem>
-  <para>
-    HPLIP (printer, scanner, and fax drivers for HP devices) has
-    been updated to version <literal>3.15.4</literal>. This release
-    adds support for the <literal>arm6l-linux</literal> and
-    <literal>arm7l-linux</literal> platforms.
-  </para>
-</listitem>
-
 <listitem>
   <para>
     Haskell packages can no longer be found by name, i.e. the commands
@@ -130,7 +107,7 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
 
 <listitem>
   <para>
-    Previous versions of NixOS come with a feature called
+    Previous versions of NixOS came with a feature called
     <literal>ghc-wrapper</literal>, a small wrapper script that allows
     GHC to transparently pick up on libraries installed in the user's
     profile. This feature has been deprecated;

From 606d34e45aeedc843f0ddb375e1fb1aa9be429fd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 15:20:40 +0200
Subject: [PATCH 0167/2016] Revert "Revert "Drop tests.installer.grub1 as
 release critical""

This reverts commit cd28c5517c224c0c969f6bccb1f85dcc280ed7f2. Still broken:

http://hydra.nixos.org/build/23928152
---
 nixos/release-combined.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 52a1dcf9932..be8df4f4a2c 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -52,7 +52,6 @@ in rec {
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         (all nixos.tests.gnome3)
-        (all nixos.tests.installer.grub1)
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.luksroot)
         (all nixos.tests.installer.separateBoot)

From 323fed4284407b72087fde94134e2892e3c5e31f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 22 Jul 2015 15:27:14 +0200
Subject: [PATCH 0168/2016] kodi: 14.2 -> 15.0

---
 pkgs/applications/video/kodi/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index cd24f2bfc2a..30eac05c234 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -37,18 +37,18 @@ assert cecSupport   -> libcec != null;
 assert rtmpSupport  -> rtmpdump != null;
 
 let
-  rel = "Helix";
-  ffmpeg_2_4_6 = fetchurl {
-    url = "https://github.com/xbmc/FFmpeg/archive/2.4.6-${rel}.tar.gz";
-    sha256 = "1kxp2z2zgcbplm5398zrfgwcfacfzvbg9y9wwrmm8vgwfmj32wh8";
+  rel = "Isengard";
+  ffmpeg_2_6_3 = fetchurl {
+    url = "https://github.com/xbmc/FFmpeg/archive/2.6.3-${rel}.tar.gz";
+    sha256 = "129nwrj9i758vz9xakpp68sm1l7z4in0krq6ayyqnpsnm54r9xlc";
   };
 in stdenv.mkDerivation rec {
     name = "kodi-" + version;
-    version = "14.2";
+    version = "15.0";
 
     src = fetchurl {
       url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
-      sha256 = "1x37l8db6xrvdw933p804lnwvkcm4vdb9gm5i6vmz4ha8f88bjyr";
+      sha256 = "1zqdmqffjfr5219cvpbvq9v1z5p5pzi2m9xs9lzk4jz7rxrs3nr7";
     };
 
     buildInputs = [
@@ -86,7 +86,7 @@ in stdenv.mkDerivation rec {
         --replace 'usr/share/zoneinfo' 'etc/zoneinfo'
       substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
         --replace "/bin/bash" "${bash}/bin/bash -ex"
-      cp ${ffmpeg_2_4_6} tools/depends/target/ffmpeg/ffmpeg-2.4.6-${rel}.tar.gz
+      cp ${ffmpeg_2_6_3} tools/depends/target/ffmpeg/ffmpeg-2.6.3-${rel}.tar.gz
     '';
 
     preConfigure = ''

From 48a25dc899d3ff413f19bb1a6afa021d400001f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 16:09:00 +0200
Subject: [PATCH 0169/2016] Manual: Reduce chunking

Fixes #7607.
---
 nixos/doc/manual/default.nix | 15 +++++++++++++--
 nixos/doc/manual/manual.xml  |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index fdfeb5ca07c..797675e5df1 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -61,6 +61,16 @@ let
       echo "${version}" > version
     '';
 
+  toc = builtins.toFile "toc.xml"
+    ''
+      <toc role="chunk-toc">
+        <d:tocentry xmlns:d="http://docbook.org/ns/docbook" linkend="book-nixos-manual"><?dbhtml filename="index.html"?>
+          <d:tocentry linkend="ch-options"><?dbhtml filename="options.html"?>
+          </d:tocentry>
+        </d:tocentry>
+      </toc>
+    '';
+
 in rec {
 
   # The NixOS options in JSON format.
@@ -113,9 +123,10 @@ in rec {
         --param chunk.section.depth 0 \
         --param chunk.first.sections 1 \
         --param use.id.as.filename 1 \
-        --stringparam generate.toc "book toc chapter toc appendix toc" \
+        --stringparam generate.toc "book toc appendix toc" \
+        --stringparam chunk.toc ${toc} \
         --nonet --xinclude --output $dst/ \
-        ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunkfast.xsl ./manual.xml
+        ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl ./manual.xml
 
       mkdir -p $dst/images/callouts
       cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index f6aedfd6b66..eac96f92599 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -2,7 +2,7 @@
       xmlns:xlink="http://www.w3.org/1999/xlink"
       xmlns:xi="http://www.w3.org/2001/XInclude"
       version="5.0"
-      xml:id="NixOSManual">
+      xml:id="book-nixos-manual">
   
   <info>
     <title>NixOS Manual</title>

From 1a03de173bac85b8feded80734de25388831d3eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 16:17:06 +0200
Subject: [PATCH 0170/2016] Move release notes to an appendix and a separate
 chunk

---
 nixos/doc/manual/default.nix                     |  4 ++--
 nixos/doc/manual/manual.xml                      |  3 ++-
 nixos/doc/manual/release-notes/release-notes.xml | 14 ++++++--------
 nixos/doc/manual/release-notes/rl-1310.xml       | 12 ++++++------
 nixos/doc/manual/release-notes/rl-1404.xml       | 12 ++++++------
 nixos/doc/manual/release-notes/rl-1412.xml       | 12 ++++++------
 nixos/doc/manual/release-notes/rl-unstable.xml   | 14 +++++++-------
 7 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 797675e5df1..419df915e6a 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -65,8 +65,8 @@ let
     ''
       <toc role="chunk-toc">
         <d:tocentry xmlns:d="http://docbook.org/ns/docbook" linkend="book-nixos-manual"><?dbhtml filename="index.html"?>
-          <d:tocentry linkend="ch-options"><?dbhtml filename="options.html"?>
-          </d:tocentry>
+          <d:tocentry linkend="ch-options"><?dbhtml filename="options.html"?></d:tocentry>
+          <d:tocentry linkend="ch-release-notes"><?dbhtml filename="release-notes.html"?></d:tocentry>
         </d:tocentry>
       </toc>
     '';
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index eac96f92599..736d1d4eff7 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -33,11 +33,12 @@
   <xi:include href="administration/running.xml" />
   <!-- <xi:include href="userconfiguration.xml" /> -->
   <xi:include href="development/development.xml" />
-  <xi:include href="release-notes/release-notes.xml" />
 
   <appendix xml:id="ch-options">
     <title>Configuration Options</title>
     <xi:include href="options-db.xml" />
   </appendix>
 
+  <xi:include href="release-notes/release-notes.xml" />
+
 </book>
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index a988a5b0199..70cd2d6070b 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -1,19 +1,17 @@
-<part   xmlns="http://docbook.org/ns/docbook"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        version="5.0"
-        xml:id="ch-release-notes">
+<appendix xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:xi="http://www.w3.org/2001/XInclude"
+          version="5.0"
+          xml:id="ch-release-notes">
 
 <title>Release Notes</title>
 
-<partintro>
 <para>This section lists the release notes for each stable version of NixOS
 and current unstable revision.</para>
-</partintro>
 
 <xi:include href="rl-unstable.xml" />
 <xi:include href="rl-1412.xml" />
 <xi:include href="rl-1404.xml" />
 <xi:include href="rl-1310.xml" />
 
-</part>
+</appendix>
diff --git a/nixos/doc/manual/release-notes/rl-1310.xml b/nixos/doc/manual/release-notes/rl-1310.xml
index 234fb5a643f..583912d7073 100644
--- a/nixos/doc/manual/release-notes/rl-1310.xml
+++ b/nixos/doc/manual/release-notes/rl-1310.xml
@@ -1,11 +1,11 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        version="5.0"
-        xml:id="sec-release-13.10">
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-13.10">
 
 <title>Release 13.10 (“Aardvark”, 2013/10/31)</title>
 
 <para>This is the first stable release branch of NixOS.</para>
 
-</chapter>
\ No newline at end of file
+</section>
diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml
index 74af1ed1274..36f67ed88b0 100644
--- a/nixos/doc/manual/release-notes/rl-1404.xml
+++ b/nixos/doc/manual/release-notes/rl-1404.xml
@@ -1,8 +1,8 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        version="5.0"
-        xml:id="sec-release-14.04">
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-14.04">
 
 <title>Release 14.04 (“Baboon”, 2014/04/30)</title>
 
@@ -157,4 +157,4 @@ networking.firewall.enable = false;
 
 </para>
 
-</chapter>
\ No newline at end of file
+</section>
diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml
index 36ae48af759..42b51cd4a8e 100644
--- a/nixos/doc/manual/release-notes/rl-1412.xml
+++ b/nixos/doc/manual/release-notes/rl-1412.xml
@@ -1,8 +1,8 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        version="5.0"
-        xml:id="sec-release-14.12">
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-14.12">
 
 <title>Release 14.12 (“Caterpillar”, 2014/12/30)</title>
 
@@ -174,4 +174,4 @@ now.</para></listitem>
 
 </para>
 
-</chapter>
+</section>
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index fc4fcd4219e..ecde80f2a01 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -1,10 +1,10 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        version="5.0"
-        xml:id="sec-release-unstable">
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-unstable">
 
-<title>Unstable revision</title>
+<title>Release 15.07 (“Dingo”, 2015/07/??)</title>
 
 <para>In addition to numerous new and upgraded packages, this release has the following highlights:
 
@@ -164,4 +164,4 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
 </itemizedlist>
 </para>
 
-</chapter>
+</section>

From b1e58a7720b0baec3ba7c9c053d54a8ee06bb7cf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 16:38:33 +0200
Subject: [PATCH 0171/2016] simple-scan: 3.17.3 -> 3.17.4

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

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 744f789e55c..954b2e02136 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, intltool, itstool, libxml2
 , makeWrapper, pkgconfig, saneBackends, systemd, vala }:
 
-let version = "3.17.3"; in
+let version = "3.17.4"; in
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
 
   src = fetchurl {
-    sha256 = "1kb2xk4vr2nab3hfjfnfyapv2z65h99c3g7mfkmanzrng5xwrj8q";
+    sha256 = "1pslbv45g01g039zj2b01k08f763kkhzqw8wwz7yh27m7bjllnx6";
     url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz";
   };
 

From fc23e58260dc791762c75fa8abc92296b359a976 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Wed, 22 Jul 2015 11:37:14 +0300
Subject: [PATCH 0172/2016] zc_buildout_nix: 2.2.1 -> 2.4.0

---
 .../python-modules/buildout-nix/default.nix   |  6 +--
 .../python-modules/buildout-nix/nix.patch     | 47 +++++--------------
 2 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index 43e8a45c0cf..e96429e4033 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, buildPythonPackage }:
 
 buildPythonPackage {
-  name = "zc.buildout-nix-2.2.1";
+  name = "zc.buildout-nix-2.4.0";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.2.1.tar.gz";
-    md5 = "476a06eed08506925c700109119b6e41";
+    url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.4.0.tar.gz";
+    md5 = "b8323b1ad285544de0c3dc14ee76ddd3";
   };
 
   patches = [ ./nix.patch ];
diff --git a/pkgs/development/python-modules/buildout-nix/nix.patch b/pkgs/development/python-modules/buildout-nix/nix.patch
index dd3b8e12aa8..f358544d36a 100644
--- a/pkgs/development/python-modules/buildout-nix/nix.patch
+++ b/pkgs/development/python-modules/buildout-nix/nix.patch
@@ -1,38 +1,15 @@
 --- a/src/zc/buildout/easy_install.py	2013-08-27 22:28:40.233718116 +0200
 +++ b/src/zc/buildout/easy_install.py   2013-10-07 00:29:31.077413935 +0200
-@@ -508,16 +508,31 @@
-                         self._dest, os.path.basename(dist.location))
+@@ -227,6 +227,12 @@
  
-                     if os.path.isdir(dist.location):
--                        # we got a directory. It must have been
--                        # obtained locally.  Just copy it.
--                        shutil.copytree(dist.location, newloc)
-+                        # Replace links to garbage collected eggs in
-+                        # /nix/store
-+                        if os.path.islink(newloc):
-+                            # It seems necessary to jump through these
-+                            # hoops, otherwise we end up in an
-+                            # infinite loop because
-+                            # self._env.best_match fails to find the dist
-+                            os.remove(newloc)
-+                            dist = self._fetch(avail, tmp, self._download_cache)
-+                            os.symlink(dist.location, newloc)
-+                            newdist = pkg_resources.Distribution.from_filename(
-+                                newloc)
-+                            self._env.add(newdist)
-+                            logger.info("Updated link to %s" %dist.location)
-+                        # Symlink to the egg in /nix/store
-+                        elif not os.path.exists(newloc):
-+                            os.symlink(dist.location, newloc)
-+                            logger.info("Created link to %s" %dist.location)
-                     else:
- 
- 
-                         setuptools.archive_util.unpack_archive(
-                             dist.location, newloc)
- 
--                    redo_pyc(newloc)
-+                        redo_pyc(newloc)
- 
-                     # Getting the dist from the environment causes the
-                     # distribution meta data to be read.  Cloning isn't
+     def _satisfied(self, req, source=None):
+         dists = [dist for dist in self._env[req.project_name] if dist in req]
++        try:
++            dists = ([dist for dist in dists
++                     if dist.precedence == pkg_resources.DEVELOP_DIST]
++                     + [pkg_resources.get_distribution(req.project_name)])
++        except pkg_resources.DistributionNotFound:
++            pass
+         if not dists:
+             logger.debug('We have no distributions for %s that satisfies %r.',
+                          req.project_name, str(req))

From 3064b6a0cc4dc047fae97bdffa0725bc7fd38f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Jul 2015 16:25:00 +0200
Subject: [PATCH 0173/2016] remove gcc49 overrides from various places

An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.

/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.
---
 pkgs/development/libraries/bobcat/default.nix      | 4 ++--
 pkgs/development/tools/parsing/flexc++/default.nix | 4 ++--
 pkgs/os-specific/linux/jfbview/default.nix         | 5 ++---
 pkgs/top-level/all-packages.nix                    | 9 ++-------
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 38dfce7583a..2a9ee1c9c5b 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gcc49, icmake, libmilter, libX11, openssl, readline
+{ stdenv, fetchurl, icmake, libmilter, libX11, openssl, readline
 , utillinux, yodl }:
 
 let version = "3.25.02"; in
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ gcc49 libmilter libX11 openssl readline utillinux ];
+  buildInputs = [ libmilter libX11 openssl readline utillinux ];
   nativeBuildInputs = [ icmake yodl ];
 
   postPatch = ''
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index 515fb9d251f..d723cc0382b 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bobcat, gcc49, icmake, yodl }:
+{ stdenv, fetchurl, bobcat, icmake, yodl }:
 
 let version = "2.02.00"; in
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ bobcat gcc49 ];
+  buildInputs = [ bobcat ];
   nativeBuildInputs = [ icmake yodl ];
 
   postPatch = ''
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index 4b371097ee6..34bf136ece7 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -1,5 +1,4 @@
-# FIXME: remove gcc49 when the default gcc supports C++1y
-{ stdenv, fetchFromGitHub, freetype, gcc49, imlib2, jbig2dec, libjpeg, libX11
+{ stdenv, fetchFromGitHub, freetype, imlib2, jbig2dec, libjpeg, libX11
 , mujs, mupdf, ncurses, openjpeg, openssl }:
 
 let
@@ -16,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "jichu4n";
   };
 
-  buildInputs = [ freetype gcc49 imlib2 jbig2dec libjpeg libX11 mujs mupdf
+  buildInputs = [ freetype imlib2 jbig2dec libjpeg libX11 mujs mupdf
     ncurses openjpeg openssl ];
 
   buildFlags = binaries;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c14725cce1..3d7dd44d6a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3132,9 +3132,7 @@ let
 
   torbutton = callPackage ../tools/security/torbutton { };
 
-  torbrowser = callPackage ../tools/security/tor/torbrowser.nix {
-    stdenv = overrideCC stdenv gcc49;
-  };
+  torbrowser = callPackage ../tools/security/tor/torbrowser.nix { };
 
   touchegg = callPackage ../tools/inputmethods/touchegg { };
 
@@ -10829,7 +10827,6 @@ let
   clipit = callPackage ../applications/misc/clipit { };
 
   bomi = callPackage ../applications/video/bomi {
-    stdenv = overrideCC stdenv gcc49;
     pulseSupport = config.pulseaudio or true;
   };
 
@@ -13390,8 +13387,7 @@ let
   zathuraCollection = recurseIntoAttrs
     (let callPackage = newScope pkgs.zathuraCollection; in
       import ../applications/misc/zathura {
-        inherit callPackage pkgs fetchurl lib;
-        stdenv = overrideCC stdenv gcc49;
+        inherit stdenv callPackage pkgs fetchurl lib;
         useMupdf = config.zathura.useMupdf or false;
       });
 
@@ -13405,7 +13401,6 @@ let
 
   girara = callPackage ../applications/misc/girara {
     gtk = gtk3;
-    stdenv = overrideCC stdenv gcc49;
   };
 
   girara-light = callPackage ../applications/misc/girara {

From 784025c7475610fb2fe8e28044d9d50bec1d93d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jul 2015 19:41:00 +0200
Subject: [PATCH 0174/2016] gfortran: update to 4.9.x

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c14725cce1..094005f6e5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3839,7 +3839,7 @@ let
     isl = isl_0_14;
   }));
 
-  gfortran = if !stdenv.isDarwin then gfortran48
+  gfortran = if !stdenv.isDarwin then gfortran49
              else callPackage ../development/compilers/gcc/gfortran-darwin.nix {};
 
   gfortran48 = wrapCC (gcc48.cc.override {
@@ -3850,6 +3850,14 @@ let
     profiledCompiler = false;
   });
 
+  gfortran49 = wrapCC (gcc49.cc.override {
+    name = "gfortran";
+    langFortran = true;
+    langCC = false;
+    langC = false;
+    profiledCompiler = false;
+  });
+
   gcj = gcj48;
 
   gcj48 = wrapCC (gcc48.cc.override {

From b8275838317403a92a36eebcc7d67b90ecd876e5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 11:26:59 -0700
Subject: [PATCH 0175/2016] sudo: 1.8.14p1 -> 1.8.14p3

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

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 69ef5328868..8c9d3533346 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.14p1";
+  name = "sudo-1.8.14p3";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "1806kxnkjibky8y04s4f9mpj0403v4b6sqdnmyaa98mnq3qwsb5i";
+    sha256 = "0dqj1bq2jr4jxqfrd5yg0i42a6268scd0l28jic9118kn75rg9m8";
   };
 
   configureFlags = [

From 92150ef3acb79e3278f01d76b7f0a3f5234394a8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 22 Jul 2015 20:27:39 +0200
Subject: [PATCH 0176/2016] zerotierone: doesn't build on i686 (ZHF)

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

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index 78c72967880..b08edaa0fc6 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.zerotier.com;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.sjmackenzie ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = with stdenv.lib; platforms.allBut [ "i686-linux" ];
   };
 }

From e770d66a231472b3231859e664a6e0ca2a7a3e24 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 22 Jul 2015 21:07:16 +0200
Subject: [PATCH 0177/2016] swell-loop: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  6 ++++
 .../gnome-3/3.16/games/swell-foop/default.nix | 31 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index cc825f0cc6c..bcabd9140a8 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -32,6 +32,8 @@ let
     nautilus-sendto dconf-editor vinagre
   ];
 
+  gamesPackages = with gnome3; [ swell-foop ];
+
   inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
   inherit (pkgs.gnome2) ORBit2;
   orbit = ORBit2;
@@ -279,6 +281,10 @@ let
 
   gdl = callPackage ./devtools/gdl { };
 
+#### Games
+
+  swell-foop = callPackage ./games/swell-foop { };
+
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
   california = callPackage ./misc/california { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
new file mode 100644
index 00000000000..4afe66ee545
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper
+, clutter, clutter_gtk, intltool, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "swell-foop-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/swell-foop/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0bhjmjcjsqdb89shs0ygi6ps5hb3lk8nhrbjnsjk4clfqbw0jzwf";
+  };
+
+  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+                  makeWrapper itstool intltool clutter clutter_gtk libxml2 ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/swell-foop" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
+      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://wiki.gnome.org/Apps/Swell%20Foop";
+    description = "Puzzle game, previously known as Same GNOME";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From 7098832c6057cce376dc5d02532642d32a189d37 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 22 Jul 2015 21:20:44 +0200
Subject: [PATCH 0178/2016] lightsoff: init at 3.16.1.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++-
 .../gnome-3/3.16/games/lightsoff/default.nix  | 31 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index bcabd9140a8..641a43b8417 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -32,7 +32,7 @@ let
     nautilus-sendto dconf-editor vinagre
   ];
 
-  gamesPackages = with gnome3; [ swell-foop ];
+  gamesPackages = with gnome3; [ swell-foop lightsoff ];
 
   inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
   inherit (pkgs.gnome2) ORBit2;
@@ -285,6 +285,8 @@ let
 
   swell-foop = callPackage ./games/swell-foop { };
 
+  lightsoff = callPackage ./games/lightsoff { };
+
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
   california = callPackage ./misc/california { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
new file mode 100644
index 00000000000..e24f90812c0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper
+, intltool, itstool, clutter, clutter_gtk, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "lightsoff-${gnome3.version}.1.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/lightsoff/${gnome3.version}/${name}.tar.xz";
+    sha256 = "00a2jv7wr6fxrzk7avwa0wspz429ad7ri7v95jv31nqn5q73y4c0";
+  };
+
+  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+                  libxml2 clutter clutter_gtk makeWrapper itstool intltool ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/lightsoff" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
+      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Lightsoff;
+    description = "Puzzle game, where the objective is to turn off all of the tiles on the board";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From b6cd7e754bcedfc9b0331ec9a5101764841ce6b4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 12:20:58 -0700
Subject: [PATCH 0179/2016] spl_git: 2015-06-29 -> 2015-07-21

---
 pkgs/os-specific/linux/spl/git.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix
index b2a2f9ffebc..9faba199a5d 100644
--- a/pkgs/os-specific/linux/spl/git.nix
+++ b/pkgs/os-specific/linux/spl/git.nix
@@ -1,12 +1,13 @@
-{ callPackage, fetchgit, ... } @ args:
+{ callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-06-29";
+  version = "2015-07-21";
 
-  src = fetchgit {
-    url = git://github.com/zfsonlinux/spl.git;
-    rev = "77ab5dd33a99bdf7fb062f0ea327582236a225b3";
-    sha256 = "1hbn8hi305cn15nlcm9x99nczjqjkhdc38hzww11xn78py8d90w9";
+  src = fetchFromGitHub {
+    owner = "zfsonlinux";
+    repo = "spl";
+    rev = "9eb361aaa537724c9a90ab6a9f33521bfd80bad9";
+    sha256 = "18sv4mw85fbm8i1s8k4y5dc43l6ll2f6hgfrawvzgvwni5i4h7n8";
   };
 
   patches = [ ./const.patch ./install_prefix.patch ];

From c034e966bfee7195a9620b729d55d9bd6d6634f2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 12:21:25 -0700
Subject: [PATCH 0180/2016] zfs_git: 2015-05-13 -> 2015-07-21

---
 pkgs/os-specific/linux/zfs/generic.nix |  6 ++++++
 pkgs/os-specific/linux/zfs/git.nix     | 13 +++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index 1613dcb311a..e2e574ee591 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
     "--with-udevdir=$(out)/lib/udev"
     "--with-systemdunitdir=$(out)/etc/systemd/system"
     "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
+    "--with-mounthelperdir=$(out)/bin"
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--enable-systemd"
@@ -69,6 +70,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+    "DEFAULT_INITCONF_DIR=\${out}/default"
+  ];
+
   postInstall = ''
     # Prevent kernel modules from depending on the Linux -dev output.
     nuke-refs $(find $out -name "*.ko")
diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index 130a02c86e8..26c48076c4e 100644
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -1,12 +1,13 @@
-{ callPackage, stdenv, fetchgit, spl_git, ... } @ args:
+{ callPackage, stdenv, fetchFromGitHub, spl_git, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-05-13";
+  version = "2015-07-21";
 
-  src = fetchgit {
-    url = git://github.com/zfsonlinux/zfs.git;
-    rev = "7fec46b9d8967109ad289d208e8cf36a0c16e40c";
-    sha256 = "0gvzw6vn7wyq2g9psv0fdars7ssidqc5l85x4yym5niccy1xl437";
+  src = fetchFromGitHub {
+    owner = "zfsonlinux";
+    repo = "zfs";
+    rev = "3b79cef21294f3ec46c4f71cc5a68a75a4d0ebc7";
+    sha256 = "01l4cg62wgn3wzasskx2nh3a4c74vq8qcwz090x8x1r4c2r4v943";
   };
 
   patches = [ ./nix-build.patch ];

From 2a36f709d3590e80999b311649c37f8758fd7d94 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 22 Jul 2015 21:25:46 +0200
Subject: [PATCH 0181/2016] iagno: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  6 ++--
 .../gnome-3/3.16/games/iagno/default.nix      | 31 +++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/iagno/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 641a43b8417..38c18a6a265 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -32,7 +32,7 @@ let
     nautilus-sendto dconf-editor vinagre
   ];
 
-  gamesPackages = with gnome3; [ swell-foop lightsoff ];
+  gamesPackages = with gnome3; [ swell-foop lightsoff iagno ];
 
   inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
   inherit (pkgs.gnome2) ORBit2;
@@ -283,10 +283,12 @@ let
 
 #### Games
 
-  swell-foop = callPackage ./games/swell-foop { };
+  iagno = callPackage ./games/iagno { };
 
   lightsoff = callPackage ./games/lightsoff { };
 
+  swell-foop = callPackage ./games/swell-foop { };
+
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
   california = callPackage ./misc/california { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
new file mode 100644
index 00000000000..90d31eaa5cf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper
+, intltool, itstool, libcanberra_gtk3, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "iagno-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/iagno/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0pg4sx277idfab3qxxn8c7r6gpdsdw5br0x7fxhxqascvvx8my1k";
+  };
+
+  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+                  libxml2 libcanberra_gtk3 makeWrapper itstool intltool ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/iagno" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
+      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Iagno;
+    description = "Computer version of the game Reversi, more popularly called Othello";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From 17b924bb9f2bf6f559619e5c02397b3d494e2cf7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 12:33:27 -0700
Subject: [PATCH 0182/2016] linux-firmware: 2015-07-12 -> 2015-07-23

---
 .../firmware-linux-nonfree/default.nix        | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 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 bbe35fe9699..259c5acdf87 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -1,13 +1,21 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2015-07-12";
+  version = "2015-07-23";
 
-  src = fetchgit {
-    url = "http://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git";
-    rev = "5e6d7a9d70b562c60471e234f78137020d65ccbf";
-    sha256 = "06gvjdqpbayfv696hxn9xjkbzddj1hy6z9aahi156lvj96qb9z49";
+  # This repo is built by merging the latest versions of
+  # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
+  # and
+  # http://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/
+  # for any given date. This gives us up to date iwlwifi firmware as well as
+  # the usual set of firmware. firmware/linux-firmware usually lags kernel releases
+  # so iwlwifi cards will fail to load on newly released kernels.
+  src = fetchFromGitHub {
+    owner = "wkennington";
+    repo = "linux-firmware";
+    rev = "854b7f33e839ceea41034b45d6f755ea70c85486";
+    sha256 = "1hhqvb96adk64ljf6hp5qss8fhpic28y985gbggh5p2w9bsgs5zq";
   };
 
   preInstall = ''

From d8991a7b3be89fce647299beb144eb77b302898e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 13:12:25 -0700
Subject: [PATCH 0183/2016] xf86-video-intel: 2.99.917 -> 2015-07-22

---
 pkgs/servers/x11/xorg/default.nix             |  6 +-
 pkgs/servers/x11/xorg/overrides.nix           |  2 +-
 ...tel-2.99.917-libdrm-kernel-4_0-crash.patch | 65 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 5 insertions(+), 70 deletions(-)
 delete mode 100644 pkgs/servers/x11/xorg/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f0fdb67f30e..d270b11d5c3 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1615,11 +1615,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videointel = (mkDerivation "xf86videointel" {
-    name = "xf86-video-intel-2.99.917";
+    name = "xf86-video-intel-2015-07-22";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2;
-      sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0";
+      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/a29e765ec0c1d73ee7ef2dad3aa148214ec04335.tar.gz;
+      sha256 = "094qa8x0f7vgyirjbj9qdyak71nwxnmmsxml4zk49z59blq4l874";
     };
     buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ];
   }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;};
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0fc70fb6e17..11a79bd6586 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -420,7 +420,7 @@ in
 
   xf86videointel = attrs: attrs // {
     buildInputs = attrs.buildInputs ++ [xorg.libXfixes];
-    patches = [ ./xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch ];
+    nativeBuildInputs = [args.autoreconfHook xorg.utilmacros];
   };
 
   xwd = attrs: attrs // {
diff --git a/pkgs/servers/x11/xorg/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch b/pkgs/servers/x11/xorg/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
deleted file mode 100644
index ea3aa30ed13..00000000000
--- a/pkgs/servers/x11/xorg/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 7fe2b2948652443ff43d907855bd7a051d54d309 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Thu, 19 Mar 2015 23:14:17 +0000
-Subject: sna: Protect against ABI breakage in recent versions of libdrm
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
-diff --git a/src/sna/kgem.c b/src/sna/kgem.c
-index 11f0828..6f16cba 100644
---- a/src/sna/kgem.c
-+++ b/src/sna/kgem.c
-@@ -182,6 +182,15 @@ struct local_i915_gem_caching {
- #define LOCAL_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_SET_CACHING, struct local_i915_gem_caching)
- #define LOCAL_IOCTL_I915_GEM_GET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_GET_CACHING, struct local_i915_gem_caching)
- 
-+struct local_i915_gem_mmap {
-+	uint32_t handle;
-+	uint32_t pad;
-+	uint64_t offset;
-+	uint64_t size;
-+	uint64_t addr_ptr;
-+};
-+#define LOCAL_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct local_i915_gem_mmap)
-+
- struct local_i915_gem_mmap2 {
- 	uint32_t handle;
- 	uint32_t pad;
-@@ -514,15 +523,15 @@ retry_wc:
- 
- static void *__kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo)
- {
--	struct drm_i915_gem_mmap mmap_arg;
-+	struct local_i915_gem_mmap arg;
- 	int err;
- 
- retry:
--	VG_CLEAR(mmap_arg);
--	mmap_arg.handle = bo->handle;
--	mmap_arg.offset = 0;
--	mmap_arg.size = bytes(bo);
--	if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg))) {
-+	VG_CLEAR(arg);
-+	arg.handle = bo->handle;
-+	arg.offset = 0;
-+	arg.size = bytes(bo);
-+	if ((err = do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_MMAP, &arg))) {
- 		assert(err != EINVAL);
- 
- 		if (__kgem_throttle_retire(kgem, 0))
-@@ -536,10 +545,10 @@ retry:
- 		return NULL;
- 	}
- 
--	VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo)));
-+	VG(VALGRIND_MAKE_MEM_DEFINED(arg.addr_ptr, bytes(bo)));
- 
- 	DBG(("%s: caching CPU vma for %d\n", __FUNCTION__, bo->handle));
--	return bo->map__cpu = (void *)(uintptr_t)mmap_arg.addr_ptr;
-+	return bo->map__cpu = (void *)(uintptr_t)arg.addr_ptr;
- }
- 
- static int gem_write(int fd, uint32_t handle,
--- 
-cgit v0.10.2
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 094005f6e5a..8e7ca4dcd6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9266,7 +9266,7 @@ let
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
     inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
       libxslt expat libpng zlib perl mesa_drivers spice_protocol
-      dbus libuuid openssl gperf m4 libevdev tradcpp libinput makeWrapper
+      dbus libuuid openssl gperf m4 libevdev tradcpp libinput makeWrapper autoreconfHook
       autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
     bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
     mesa = mesa_noglu;

From 612d19e8b42007c489c04c71ce3efa018c98014a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 13:13:43 -0700
Subject: [PATCH 0184/2016] kernel: 3.18.18 -> 3.18.19

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index b0b4c6ed5bd..527ded2db94 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.18";
+  version = "3.18.19";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1fcd4xfnywwb3grdvcnf39njwzb40v10rnzagxqmancsaqy253jv";
+    sha256 = "1jdp4mixggzjy1v806v5q7qqimkm6pbjav3gwbcl2cccv6wd701x";
   };
 
   features.iwlwifi = true;

From 24c13dfa81d59a14760ffc763d4c1a51a98f4f0a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 13:14:03 -0700
Subject: [PATCH 0185/2016] kernel: 4.1.2 -> 4.1.3

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index 5405ae9956d..031b0d549d9 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1.2";
+  version = "4.1.3";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1mdyjhnzhh254cblahqmpsk226z006z6sm9dmwvg6jlhpsw4cjhy";
+    sha256 = "02z3palvki31qimmycz4y4wl4lb46n662qql46iah224k0q2rpcn";
   };
 
   features.iwlwifi = true;

From dfc53b1bac1930acb0d823c774187999539200b9 Mon Sep 17 00:00:00 2001
From: Yochai <yochai@titat.info>
Date: Wed, 22 Jul 2015 11:53:07 +0300
Subject: [PATCH 0186/2016] Steam: removed flashplayer

---
 pkgs/games/steam/chrootenv.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index ff4b104059d..d1aa125169e 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -60,8 +60,6 @@ buildFHSUserEnv {
       pkgs.openal
       pkgs.libpulseaudio
 
-      pkgs.flashplayer
-
       pkgs.gst_all_1.gst-plugins-ugly # "Audiosurf 2" needs this
     ];
 

From 6d257267ae485d4ba0476f12f358ffbfdd5ca990 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 18 Jul 2015 17:00:24 +0200
Subject: [PATCH 0187/2016] mutt-kz: 1.5.23.1-rc1 -> 1.5.23.1

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

diff --git a/pkgs/applications/networking/mailreaders/mutt-kz/default.nix b/pkgs/applications/networking/mailreaders/mutt-kz/default.nix
index a162df9f33b..5cd0ef9f7a4 100644
--- a/pkgs/applications/networking/mailreaders/mutt-kz/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt-kz/default.nix
@@ -16,14 +16,14 @@ assert saslSupport -> cyrus_sasl != null;
 assert gpgmeSupport -> gpgme != null;
 
 let
-  version = "1.5.23.1-rc1";
+  version = "1.5.23.1";
 in
 stdenv.mkDerivation rec {
   name = "mutt-kz-${version}";
 
   src = fetchurl {
     url = "https://github.com/karelzak/mutt-kz/archive/v${version}.tar.gz";
-    sha256 = "1m4bnn8psyrx2wy8ribannmp5qf75lv1gz116plji2z37z015zny";
+    sha256 = "01k4hrf8x2100pcqnrm61mm1x0pqi2kr3rx22k5hwvbs1wh8zyhz";
   };
 
   buildInputs = with stdenv.lib;

From 2054eea48ae1b2e229b06d0dcd903eec0f923e40 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 14:32:34 -0700
Subject: [PATCH 0188/2016] libva: 1.5.1 -> 1.6.0

---
 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 44001496988..c9af48d1c59 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.5.1";
+  name = "libva-1.6.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
-    sha256 = "01d01mm9fgpwzqycmjjcj3in3vvzcibi3f64icsw2sksmmgb4495";
+    sha256 = "0n1l2mlhsvmsbs3qcphl4p6w13jnbv6s3hil8b6fj43a3afdrn9s";
   };
 
   buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa ];

From b2e598c31afca21b74d203ffadd128002497446a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 14:32:42 -0700
Subject: [PATCH 0189/2016] vaapiIntel: 1.5.1 -> 1.6.0

---
 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 d873d801bac..61f88cea7e1 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.5.1";
+  name = "libva-intel-driver-1.6.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
-    sha256 = "1p7aw0wmb6z3rbbm3bqlp6rxw41kii23csbjmcvbbk037lq6rnqb";
+    sha256 = "1m08z9md113rv455i78k6784vkjza5k84d59bgpah08cc7jayxlq";
   };
 
   patchPhase = ''

From ac36ed18eb9583df48c244e2301d013c827f78e7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 14:33:06 -0700
Subject: [PATCH 0190/2016] dhcpcd: 6.9.0 -> 6.9.1

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

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index a89d1e3e888..d4ec7f7f0ad 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, udev }:
 
 stdenv.mkDerivation rec {
-  name = "dhcpcd-6.9.0";
+  name = "dhcpcd-6.9.1";
 
   src = fetchurl {
-    url = "mirror://roy/dhcpcd/${name}.tar.bz2";
-    sha256 = "0s0a29ml9x108lxv5yz55f3l5kvlx4hcbxigfq3hr245yy7aarhm";
+    url = "mirror://roy/dhcpcd/${name}.tar.xz";
+    sha256 = "0vq6gjgn2sjq2rwvd23gvf55k2v9l6970z8fmii0p2g23w77afy0";
   };
 
   buildInputs = [ pkgconfig udev ];

From 6079babed8c537759448c8276f0158e66e57299d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 23 Jul 2015 01:17:12 +0200
Subject: [PATCH 0191/2016] horst: init at git-2015-07-22

---
 pkgs/tools/networking/horst/default.nix | 32 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/networking/horst/default.nix

diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix
new file mode 100644
index 00000000000..0f18534d200
--- /dev/null
+++ b/pkgs/tools/networking/horst/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchFromGitHub, pkgconfig, ncurses, libnl }:
+
+stdenv.mkDerivation rec {
+  name = "horst-${version}";
+  version = "git-2015-07-22";
+
+  src = fetchFromGitHub {
+    owner = "br101";
+    repo = "horst";
+    rev = "b62fc20b98690061522a431cb278d989e21141d8";
+    sha256 = "176yma8v2bsab2ypgmgzvjg0bsbnk9sga3xpwkx33mwm6q79kd6g";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ncurses libnl ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv horst $out/bin
+
+    mkdir -p $out/man/man1
+    cp horst.1 $out/man/man1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Small and lightweight IEEE802.11 wireless LAN analyzer with a text interface";
+    homepage = http://br1.einfach.org/tech/horst/;
+    maintainers = [ maintainers.fpletz ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e7ca4dcd6e..00a9fb73385 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1836,6 +1836,8 @@ let
 
   honcho = callPackage ../tools/system/honcho { };
 
+  horst = callPackage ../tools/networking/horst { };
+
   host = callPackage ../tools/networking/host { };
 
   hping = callPackage ../tools/networking/hping { };

From c805663bf41244d2f5608ae385a2426d798909c0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 17:56:43 +0200
Subject: [PATCH 0192/2016] stress-ng: 0.04.10 -> 0.04.11

Changes: https://launchpad.net/ubuntu/+source/stress-ng/+changelog
---
 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 4093eb7879d..5336a54e190 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr }:
 
-let version = "0.04.10"; in
+let version = "0.04.11"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "1y0jmcgwn8np22r3ajg7giai8dvfg0r5ddpgbiqs48cx2gz7iyhf";
+    sha256 = "0hh1cqszviza4hvaj0hkhg8r42zjikcj6rc3l6fviwmr7f247ls5";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From 0c00290fbb0306c2e9704dce3fe47a70627ad45f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 18:14:48 +0200
Subject: [PATCH 0193/2016] ipv6calc: 0.98.0 -> 0.99.0

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

diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index 102d0688234..f3dadbd7243 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
 stdenv.mkDerivation rec {
-  version = "0.98.0";
   name = "ipv6calc-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz";
-    sha256 = "02r0r4lgz10ivbmgdzivj7dvry1aad75ik9vyy6irjvngjkzg5r3";
+    sha256 = "1dgx6gji9dyz77jssk2ax5r0ycq4jcsks71bhvcpb79k02wkaxgw";
   };
 
   buildInputs = [ geoip geolite-legacy getopt openssl ];
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Calculate/manipulate (not only) IPv6 addresses";
     longDescription = ''
       ipv6calc is a small utility to manipulate (not only) IPv6 addresses and
@@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.deepspace6.net/projects/ipv6calc.html;
     license = licenses.gpl2;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }

From 72fd2a609c52bc39119bc239ed039f744dd20dcc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 18:15:16 +0200
Subject: [PATCH 0194/2016] ipv6calc: make geoip and geolite-legacy "optional"

---
 pkgs/tools/networking/ipv6calc/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index f3dadbd7243..a4725e8140f 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -21,14 +21,16 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  configureFlags = ''
-    --disable-bundled-getopt
-    --disable-bundled-md5
-    --disable-dynamic-load
-    --enable-shared
-    --enable-geoip
-    --with-geoip-db=${geolite-legacy}/share/GeoIP
-  '';
+  configureFlags = [
+    "--disable-bundled-getopt"
+    "--disable-bundled-md5"
+    "--disable-dynamic-load"
+    "--enable-shared"
+  ] ++ stdenv.lib.optional (geoip != null ) [
+    "--enable-geoip"
+  ] ++ stdenv.lib.optional (geolite-legacy != null) [
+    "--with-geoip-db=${geolite-legacy}/share/GeoIP"
+  ];
 
   enableParallelBuilding = true;
 

From 3e79e3a264da7f1617259fe7675c588b0fc50487 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 19:12:14 +0200
Subject: [PATCH 0195/2016] remotebox: 1.9 -> 2.0

Changes:
- RemoteBox now requires VirtualBox 5.0.x
- Added guest support for USB 3.0
- Added OS icons for Windows 10, OS/2 1.x, Yosemite, El Capitan
- Added command line options for automatic login. See manual
- Added option to set the virtual VGA card of a guest to either
  VirtualBox VGA or VMware SVGA-II
- Allow snapshots to be taken while the guest is paused
- Added support for adding USB storage controller to a guest
- Added support for adding transient shared folders
- Added support for setting IPv6 Port Forwarding rules on NAT networks
- Added option to convert disk images to VDI when importing an
  appliance
- Changed the way guest details are displayed and added an option
  to show extended (slower) or reduced (faster) guest details
- Added support for selecting built-in presets for the RDP clients.
  These are currently FreeRDP (New Syntax), FreeRDP (Old Syntax),
  Rdesktop, Windows Remote Desktop Client
- Added support for selecting the paravirtualization interface for
  a guest
- Added keyboard toolbutton for quick access to common keyboard
  sequences. The full keyboard menu is still available
- Fixed a problem with trailing slashes in a URL preventing the
  remote display to a guest from opening.
- Fixed a problem with UTF8 strings affecting the listing of storage
  attached to controllers
- Fixed an issue where stuck guests couldn't be stopped from the GUI
- Various GUI tweaks
---
 .../virtualization/remotebox/default.nix      | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix
index 14adddf8d1b..e07f8d5b92c 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/pkgs/applications/virtualization/remotebox/default.nix
@@ -1,40 +1,44 @@
-{ stdenv, fetchurl, perl, perlPackages }:
+{ stdenv, fetchurl, makeWrapper, perl, perlPackages }:
 
-stdenv.mkDerivation rec {
-  version = "1.9";
+let version = "2.0"; in
+stdenv.mkDerivation {
   name = "remotebox-${version}";
 
   src = fetchurl {
-    url = "${meta.homepage}/downloads/RemoteBox-${version}.tar.bz2";
-    sha256 = "0vsfz2qmha9nz60fyksgqqyrw4lz9z2d5isnwqc6afn8z3i1qmkp";
+    url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2";
+    sha256 = "0c73i53wdjd2m2sdgq3r3xp30irxh5z5rak2rk79yb686s6bv759";
   };
 
-  buildInputs = [ perl perlPackages.Gtk2 perlPackages.SOAPLite ];
+  buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ];
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp -a docs/ share/ $out
+    mkdir -pv $out/bin
 
     substituteInPlace remotebox --replace "\$Bin/" "\$Bin/../"
-    install -t $out/bin remotebox
+    install -v -t $out/bin remotebox
+    wrapProgram $out/bin/remotebox --prefix PERL5LIB : $PERL5LIB
 
-    mkdir -p $out/share/applications
-    cp -p packagers-readme/*.desktop $out/share/applications
+    cp -av docs/ share/ $out
+
+    mkdir -pv $out/share/applications
+    cp -pv packagers-readme/*.desktop $out/share/applications
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "VirtualBox client with remote management";
     homepage = http://remotebox.knobgoblin.org.uk/;
     license = licenses.gpl2Plus;
     longDescription = ''
       VirtualBox is traditionally considered to be a virtualization solution
-      aimed at the desktop.  While it is certainly possible to install
+      aimed at the desktop. While it is certainly possible to install
       VirtualBox on a server, it offers few remote management features beyond
       using the vboxmanage command line.
       RemoteBox aims to fill this gap by providing a graphical VirtualBox
       client which is able to manage a VirtualBox server installation.
     '';
     maintainers = with maintainers; [ nckx ];
-    platforms = with platforms; all;
+    platforms = platforms.all;
   };
 }

From 72f6a797fa1bb97a8af6a03c6a31a911f5e27bcb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 20:21:32 +0200
Subject: [PATCH 0196/2016] hplip: fix (Python) tools again

Something changed in the generic fixupPhase magic exposing a bug
in the previous fix (wrapPythonPrograms where I should have used
wrapPythonProgramsIn).

Also move buildInputs and friends to a more conventional spot.
---
 pkgs/misc/drivers/hplip/default.nix | 79 +++++++++++++++--------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index ba64b729393..c069f6bbb9f 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -39,6 +39,28 @@ in
 stdenv.mkDerivation {
   inherit name src;
 
+  buildInputs = [
+    libjpeg
+    cups
+    libusb1
+    pythonPackages.python
+    pythonPackages.wrapPython
+    saneBackends
+    dbus
+    net_snmp
+  ] ++ stdenv.lib.optional qtSupport qt4;
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  pythonPath = with pythonPackages; [
+    dbus
+    pillow
+    pygobject
+    recursivePthLoader
+    reportlab
+  ] ++ stdenv.lib.optional qtSupport pyqt4;
+
   prePatch = ''
     # HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
     find . -type f -exec sed -i \
@@ -73,24 +95,7 @@ stdenv.mkDerivation {
   '';
 
   postInstall =
-    ''
-      # Wrap the user-facing Python scripts in /bin without turning the ones
-      # in /share into shell scripts (they need to be importable).
-      # Complicated by the fact that /bin contains just symlinks to /share.
-      for bin in $out/bin/*; do
-        py=`readlink -m $bin`
-        rm $bin
-        cp $py $bin
-        wrapPythonProgramsIn $bin "$out $pythonPath"
-        sed -i "s@$(dirname $bin)/[^ ]*@$py@g" $bin
-      done
-
-      # Remove originals. Knows a little too much about wrapPythonProgramsIn.
-      rm -f $out/bin/.*-wrapped
-
-      wrapPythonPrograms $out/lib "$out $pythonPath"
-    ''
-    + (stdenv.lib.optionalString withPlugin
+    (stdenv.lib.optionalString withPlugin
     (let hplip_arch =
           if stdenv.system == "i686-linux" then "x86_32"
           else if stdenv.system == "x86_64-linux" then "x86_64"
@@ -129,29 +134,25 @@ stdenv.mkDerivation {
     mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf
 
     rm $out/etc/udev/rules.d/56-hpmud.rules
-    ''));
+  ''));
 
-  buildInputs = [
-      libjpeg
-      cups
-      libusb1
-      pythonPackages.python
-      pythonPackages.wrapPython
-      saneBackends
-      dbus
-      net_snmp
-    ] ++ stdenv.lib.optional qtSupport qt4;
-  nativeBuildInputs = [
-    pkgconfig
-  ];
+  fixupPhase = ''
+    # Wrap the user-facing Python scripts in /bin without turning the ones
+    # in /share into shell scripts (they need to be importable).
+    # Complicated by the fact that /bin contains just symlinks to /share.
+    for bin in $out/bin/*; do
+      py=`readlink -m $bin`
+      rm $bin
+      cp $py $bin
+      wrapPythonProgramsIn $bin "$out $pythonPath"
+      sed -i "s@$(dirname $bin)/[^ ]*@$py@g" $bin
+    done
 
-  pythonPath = with pythonPackages; [
-      dbus
-      pillow
-      pygobject
-      recursivePthLoader
-      reportlab
-    ] ++ stdenv.lib.optional qtSupport pyqt4;
+    # Remove originals. Knows a little too much about wrapPythonProgramsIn.
+    rm -f $out/bin/.*-wrapped
+
+    wrapPythonProgramsIn $out/lib "$out $pythonPath"
+  '';
 
   meta = with stdenv.lib; {
     description = "Print, scan and fax HP drivers for Linux";

From 1bad2fa6115da55d6054e389744803758f9fe202 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 20:54:57 +0200
Subject: [PATCH 0197/2016] hplip: fix scanning for USB devices

---
 pkgs/misc/drivers/hplip/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index c069f6bbb9f..b77ec099819 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, automake, pkgconfig
-, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus
+, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus, usbutils
 , polkit, qtSupport ? true, qt4, pyqt4, net_snmp
 , withPlugin ? false, substituteAll, makeWrapper
 }:
@@ -59,6 +59,7 @@ stdenv.mkDerivation {
     pygobject
     recursivePthLoader
     reportlab
+    usbutils
   ] ++ stdenv.lib.optional qtSupport pyqt4;
 
   prePatch = ''

From 603b146979af8fdd696b11ea0ff81c36700751c5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 20:58:08 +0200
Subject: [PATCH 0198/2016] hplip: 3.15.6 -> 3.15.7

---
 pkgs/misc/drivers/hplip/default.nix | 60 +++++++++++++++--------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index b77ec099819..a96e71a3af0 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -6,19 +6,25 @@
 
 let
 
-  name = "hplip-3.15.6";
+  version = "3.15.7";
+
+  name = "hplip-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "1jbnjw7vrn1qawrjfdv8j58w69q8ki1qkzvlh0nk8nxacpp17i9h";
+    sha256 = "17flpl89lgwlbsy9mka910g530nnvlwqqnif8a9hyq7k90q9046k";
+  };
+
+  plugin = fetchurl {
+    url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
+    sha256 = "0fblh5m43jnws4vkwks0b4m9k3jg9kspaj1l8bic0r5swy97s41m";
   };
 
   hplip_state =
     substituteAll
       {
+        inherit version;
         src = ./hplip.state;
-        # evaluated this way, version is always up-to-date
-        version = (builtins.parseDrvName name).version;
       };
 
   hplip_arch =
@@ -29,11 +35,6 @@ let
       "arm7l-linux" = "arm32";
     }."${stdenv.system}" or (abort "Unsupported platform ${stdenv.system}");
 
-  plugin = fetchurl {
-    url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "1rymxahz12s1s37rri5qyvka6q0yi0yai08kgspg24176ry3a3fx";
-  };
-
 in
 
 stdenv.mkDerivation {
@@ -74,33 +75,33 @@ stdenv.mkDerivation {
       {} +
   '';
 
-  preConfigure = ''
-    export configureFlags="$configureFlags
-      --with-cupsfilterdir=$out/lib/cups/filter
-      --with-cupsbackenddir=$out/lib/cups/backend
-      --with-icondir=$out/share/applications
-      --with-systraydir=$out/xdg/autostart
-      --with-mimedir=$out/etc/cups
-      --enable-policykit
-    "
-
-    export makeFlags="
-      halpredir=$out/share/hal/fdi/preprobe/10osvendor
-      rulesdir=$out/etc/udev/rules.d
-      policykit_dir=$out/share/polkit-1/actions
-      policykit_dbus_etcdir=$out/etc/dbus-1/system.d
-      policykit_dbus_sharedir=$out/share/dbus-1/system-services
-      hplip_confdir=$out/etc/hp
-      hplip_statedir=$out/var/lib/hp
-    ";
+  configureFlags = ''
+    --with-cupsfilterdir=$(out)/lib/cups/filter
+    --with-cupsbackenddir=$(out)/lib/cups/backend
+    --with-icondir=$(out)/share/applications
+    --with-systraydir=$(out)/xdg/autostart
+    --with-mimedir=$(out)/etc/cups
+    --enable-policykit
   '';
 
+  makeFlags = ''
+    halpredir=$(out)/share/hal/fdi/preprobe/10osvendor
+    rulesdir=$(out)/etc/udev/rules.d
+    policykit_dir=$(out)/share/polkit-1/actions
+    policykit_dbus_etcdir=$(out)/etc/dbus-1/system.d
+    policykit_dbus_sharedir=$(out)/share/dbus-1/system-services
+    hplip_confdir=$(out)/etc/hp
+    hplip_statedir=$(out)/var/lib/hp
+  '';
+
+  enableParallelBuilding = true;
+
   postInstall =
     (stdenv.lib.optionalString withPlugin
     (let hplip_arch =
           if stdenv.system == "i686-linux" then "x86_32"
           else if stdenv.system == "x86_64-linux" then "x86_64"
-          else abort "Platform must be i686-linux or x86_64-linux!";
+          else abort "Plugin platform must be i686-linux or x86_64-linux!";
     in
     ''
     sh ${plugin} --noexec --keep
@@ -156,6 +157,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Print, scan and fax HP drivers for Linux";
     homepage = http://hplipopensource.com/;
     license = if withPlugin

From aebb3ec0f4edcd5f7f51b6c794e7a20da3f9bd3b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 23:17:08 +0200
Subject: [PATCH 0199/2016] hplip: patch shebangs in $out/share

A full wrap isn't needed as these scripts are only run from within
hplip's own environment, and unwanted because they are imported
as Python modules.

Also fix a reference to /etc in $out/etc/hp/hplip.conf, though I've no
idea whether it is actually used.
---
 pkgs/misc/drivers/hplip/default.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index a96e71a3af0..d173b0ac406 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -139,9 +139,9 @@ stdenv.mkDerivation {
   ''));
 
   fixupPhase = ''
-    # Wrap the user-facing Python scripts in /bin without turning the ones
-    # in /share into shell scripts (they need to be importable).
-    # Complicated by the fact that /bin contains just symlinks to /share.
+    # Wrap the user-facing Python scripts in $out/bin without turning the
+    # ones in $out /share into shell scripts (they need to be importable).
+    # Note that $out/bin contains only symlinks to $out/share.
     for bin in $out/bin/*; do
       py=`readlink -m $bin`
       rm $bin
@@ -153,7 +153,18 @@ stdenv.mkDerivation {
     # Remove originals. Knows a little too much about wrapPythonProgramsIn.
     rm -f $out/bin/.*-wrapped
 
+    # Merely patching shebangs in $out/share does not cause trouble.
+    for i in $out/share/hplip{,/*}/*.py; do
+      substituteInPlace $i \
+        --replace /usr/bin/python \
+        ${pythonPackages.python}/bin/${pythonPackages.python.executable} \
+        --replace "/usr/bin/env python" \
+        ${pythonPackages.python}/bin/${pythonPackages.python.executable}
+    done
+
     wrapPythonProgramsIn $out/lib "$out $pythonPath"
+
+    substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out
   '';
 
   meta = with stdenv.lib; {

From ec15244f1ae6a3040077f65f49b360dca58815ce Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 23 Jul 2015 00:05:56 +0200
Subject: [PATCH 0200/2016] apitrace: 6.1 -> 7.0

- Many bug fixes
- Switch to Qt 5
---
 pkgs/applications/graphics/apitrace/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index 8e546652f85..cd107a6d279 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, cmake, python, libX11, qt4 }:
+{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, qt5 }:
 
-let version = "6.1"; in
+let version = "7.0"; in
 stdenv.mkDerivation {
   name = "apitrace-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1v38111ljd35v5sahshs3inhk6nsv7rxh4r0ck8k0njkwzlx2yqk";
+    sha256 = "0nn3z7i6cd4zkmms6jpp1v2q194gclbs06v0f5hyiwcsqaxzsg5b";
     rev = version;
     repo = "apitrace";
     owner = "apitrace";
   };
 
-  buildInputs = [ python libX11 qt4 ];
+  buildInputs = [ libX11 procps python qt5.base ];
   nativeBuildInputs = [ cmake ];
 
   buildPhase = ''
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     homepage = https://apitrace.github.io;
     description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs";
     license = licenses.mit;

From 1266e5880ef7100ec0cc9a008521fabdc15767b0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 23 Jul 2015 00:47:46 +0200
Subject: [PATCH 0201/2016] perl-packages: Glib 1.310 -> 1.312

---
 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 de2ad38a33e..5b5c2c097b9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4128,10 +4128,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Glib = buildPerlPackage rec {
-    name = "Glib-1.310";
+    name = "Glib-1.312";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
-      sha256 = "1iv8q7d0817m3byh2yn7bxxk5qp8bgapaflbglhkw467i31slign";
+      sha256 = "1aqww3ncaxiclfiqvl81hx7k3w4pri3k52rrar0hpzcasics5zr3";
     };
     buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.glib ];
     meta = {

From dfeaaa89098bc89f79d1686faf05b1a55d36fa54 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 23 Jul 2015 04:05:00 +0200
Subject: [PATCH 0202/2016] geolite-legacy: use correct local naming scheme

Following http://dev.maxmind.com/geoip/legacy/install/city/:

  "Then rename the *.dat file to GeoIP.dat, GeoIPRegion.dat, or
   GeoIPCity.dat, for the GeoIP Country, Region or City databases,
   respectively."

Using the default "GeoLiteCity*.dat" name caused ipv6calc to miss it
(verified using `ipv6calc -vv`).
---
 pkgs/data/misc/geolite-legacy/default.nix     | 24 ++++++++++++-------
 pkgs/tools/networking/netsniff-ng/default.nix |  4 ++--
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index ae7b344ff0e..138a9c40c79 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
 
 let
-  fetchDB = name: sha256: fetchurl {
-    inherit sha256;
-    url = "https://geolite.maxmind.com/download/geoip/database/${name}";
+  fetchDB = src: name: sha256: fetchurl {
+    inherit name sha256;
+    url = "https://geolite.maxmind.com/download/geoip/database/${src}";
   };
 
   # Annoyingly, these files are updated without a change in URL. This means that
@@ -13,17 +13,23 @@ in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
-  srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz"
+  srcGeoIP = fetchDB
+    "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
     "0c6jcmlgkybsqiwqwa21igjazf95dj38mn516cqqqfdg7ciaj1d5";
-  srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz"
+  srcGeoIPv6 = fetchDB
+    "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
     "1vi82p41vas18yp17yk236pn1xamsi9662aav79fa0hm43i3ydx3";
-  srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz"
+  srcGeoLiteCity = fetchDB
+    "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
     "0x5ihg7qikzc195nix9r0izvbdnj4hy4rznvaxk56rf8yqcigdyv";
-  srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
+  srcGeoLiteCityv6 = fetchDB
+    "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
     "0xjzg76vdsayxyy1yyw64w781vad4c9nbhw61slh2qmazdr360g9";
-  srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"
+  srcGeoIPASNum = fetchDB
+    "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
     "18kxswr0b5klimfpj1zhxipvyvrljvcywic4jc1ggcr44lf4hj9w";
-  srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz"
+  srcGeoIPASNumv6 = fetchDB
+    "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
     "0asnmmirridiy57zm0kccb7g8h7ndliswfv3yfk7zm7dk98njnxs";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 51d25ac16a4..9df8045a2e9 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation {
   postInstall = ''
     ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat		$out/etc/netsniff-ng/country4.dat
     ln -sv ${geolite-legacy}/share/GeoIP/GeoIPv6.dat		$out/etc/netsniff-ng/country6.dat
-    ln -sv ${geolite-legacy}/share/GeoIP/GeoLiteCity.dat	$out/etc/netsniff-ng/city4.dat
-    ln -sv ${geolite-legacy}/share/GeoIP/GeoLiteCityv6.dat	$out/etc/netsniff-ng/city6.dat
+    ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCity.dat		$out/etc/netsniff-ng/city4.dat
+    ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCityv6.dat	$out/etc/netsniff-ng/city6.dat
     ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNum.dat		$out/etc/netsniff-ng/asname4.dat
     ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNumv6.dat	$out/etc/netsniff-ng/asname6.dat
     rm -v $out/etc/netsniff-ng/geoip.conf # updating databases after installation is impossible

From 4859513ba4effe093bc00dafbed54fa898c61151 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Wed, 15 Jul 2015 14:17:16 +0200
Subject: [PATCH 0203/2016] qgis: 2.8.2 -> 2.10.0

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

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 08e804b7ae9..343f0343e19 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -2,7 +2,7 @@
   pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.8.2";
+  name = "qgis-2.10.0";
 
   buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla
     fcgi libspatialindex libspatialite postgresql ] ++
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "fd3c01e48224f611c3bb279b0af9cc1dff3844cdc93f7b45e4f37cf8f350bc4b";
+    sha256 = "07f9b73bc95e8ec5c69249842c2680634deb57515389268b42dccc6b2f6fd0d7";
   };
 
   postInstall = ''

From a9dc7166315357fcdcbcdfd77646ef32d4edb7ca Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Thu, 23 Jul 2015 08:03:00 +0200
Subject: [PATCH 0204/2016] qgis: 2.10.0 -> 2.10.1

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

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 343f0343e19..bda364cb26f 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -2,7 +2,7 @@
   pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.10.0";
+  name = "qgis-2.10.1";
 
   buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla
     fcgi libspatialindex libspatialite postgresql ] ++
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "07f9b73bc95e8ec5c69249842c2680634deb57515389268b42dccc6b2f6fd0d7";
+    sha256 = "79119b54642edaffe3cda513531eb7b81913e013954a49c6d3b21c8b00143307";
   };
 
   postInstall = ''

From 5955f815efb1eb5111be2346287ef81d79d220f8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 22 Jul 2015 23:07:31 +0200
Subject: [PATCH 0205/2016] dfu-util: init at 0.8

Since the website and Sourceforge are currently down, the source tarball
is fetched from Debian mirrors.
---
 .../tools/misc/dfu-util/default.nix           | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/tools/misc/dfu-util/default.nix

diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix
new file mode 100644
index 00000000000..f3a986e6432
--- /dev/null
+++ b/pkgs/development/tools/misc/dfu-util/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, libusb1 }:
+
+stdenv.mkDerivation rec {
+  name="dfu-util-${version}";
+  version = "0.8";
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libusb1 ];
+
+  src = fetchurl {
+    url = "mirror://debian/pool/main/d/dfu-util/dfu-util_0.8.orig.tar.gz";
+    sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Device firmware update (DFU) USB programmer";
+    longDescription = ''
+      dfu-util is a program that implements the host (PC) side of the USB
+      DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol.
+
+      DFU is intended to download and upload firmware to devices connected over
+      USB. It ranges from small devices like micro-controller boards up to mobile
+      phones. With dfu-util you are able to download firmware to your device or
+      upload firmware from it.
+    '';
+    homepage = http://dfu-util.gnumonks.org/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00a9fb73385..261158a6e0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5423,6 +5423,8 @@ let
 
   dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { };
 
+  dfu-util = callPackage ../development/tools/misc/dfu-util { };
+
   ddd = callPackage ../development/tools/misc/ddd { };
 
   distcc = callPackage ../development/tools/misc/distcc { };

From d2f923341aef2317774ff55b23c46dffada86a24 Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Wed, 22 Jul 2015 12:55:23 -0500
Subject: [PATCH 0206/2016] g-wrap: 1.9.13 -> 1.9.15

---
 pkgs/development/tools/guile/g-wrap/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix
index e62ce13ebf7..ed492a0b82d 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/pkgs/development/tools/guile/g-wrap/default.nix
@@ -1,11 +1,10 @@
-{ fetchurl, stdenv, guile, libffi, pkgconfig, glib
-, guile_lib }:
+{ fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile_lib }:
 
 stdenv.mkDerivation rec {
-  name = "g-wrap-1.9.13";
+  name = "g-wrap-1.9.15";
   src = fetchurl {
     url = "mirror://savannah/g-wrap/${name}.tar.gz";
-    sha256 = "0fc874zlwzjahyliqnva1zfsv0chlx4cvfhwchij9n2d3kmsss9v";
+    sha256 = "140fcvp24pqmfmiibhjxl3s75hj26ln7pkl2wxas84lnchbj9m4d";
   };
 
   # Note: Glib support is optional, but it's quite useful (e.g., it's
@@ -26,6 +25,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.nongnu.org/g-wrap/;
     license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ ];
+    maintainers = [ stdenv.lib.maintainers.taktoa ];
   };
 }

From 45e3892386e5bf93872e69781b7b065c6749403b Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Wed, 22 Jul 2015 12:56:03 -0500
Subject: [PATCH 0207/2016] guile-gnome-platform: 2.16.1 -> 2015/01/23 git

---
 .../guile-modules/guile-gnome/default.nix     | 44 +++++++++++++------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index e2392773de7..24928fc067f 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -1,21 +1,39 @@
-{ fetchurl, stdenv, guile, guile_lib, gwrap
+{ fetchgit, stdenv, guile, guile_lib, gwrap
 , pkgconfig, gconf, glib, gnome_vfs, gtk
-, libglade, libgnome, libgnomecanvas, libgnomeui, pango, guileCairo }:
+, libglade, libgnome, libgnomecanvas, libgnomeui
+, pango, guileCairo, autoconf, automake, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "guile-gnome-platform-2.16.1";
+  name = "guile-gnome-platform-20150123";
 
-  src = fetchurl {
-    url = "mirror://gnu/guile-gnome/guile-gnome-platform/${name}.tar.gz";
-    sha256 = "0yy5f4c78jlakxi2bwgh3knc2szw26hg68xikyaza2iim39mc22c";
+  src = fetchgit {
+    url = "git://git.sv.gnu.org/guile-gnome.git";
+    rev = "0fcbe69797b9501b8f1283a78eb92bf43b08d080";
+    sha256 = "1vqlzb356ggmp8jh833gksg59c53vbmmhycbcf52qj0fdz09mpb5";
   };
 
-  buildInputs =
-    [ guile gwrap
-      pkgconfig gconf glib gnome_vfs gtk libglade libgnome libgnomecanvas
-      libgnomeui pango guileCairo
-    ]
-    ++ stdenv.lib.optional doCheck guile_lib;
+  buildInputs = [
+    autoconf
+    automake
+    texinfo
+    guile
+    gwrap
+    pkgconfig
+    gconf
+    glib
+    gnome_vfs
+    gtk
+    libglade
+    libgnome
+    libgnomecanvas
+    libgnomeui
+    pango
+    guileCairo
+  ] ++ stdenv.lib.optional doCheck guile_lib;
+
+  preConfigure = ''
+      ./autogen.sh
+  '';
 
   # The test suite tries to open an X display, which fails.
   doCheck = false;
@@ -35,6 +53,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    maintainers = [ ];
+    maintainers = [ stdenv.lib.maintainers.taktoa ];
   };
 }

From af2ab0b911a153813789107b19f8066ee4414944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Jul 2015 16:25:00 +0200
Subject: [PATCH 0208/2016] remove gcc49 overrides from various places

An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.

/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.

(cherry picked from commit 3064b6a0cc4dc047fae97bdffa0725bc7fd38f2e)
---
 pkgs/development/libraries/bobcat/default.nix      | 4 ++--
 pkgs/development/tools/parsing/flexc++/default.nix | 4 ++--
 pkgs/os-specific/linux/jfbview/default.nix         | 5 ++---
 pkgs/top-level/all-packages.nix                    | 9 ++-------
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 38dfce7583a..2a9ee1c9c5b 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gcc49, icmake, libmilter, libX11, openssl, readline
+{ stdenv, fetchurl, icmake, libmilter, libX11, openssl, readline
 , utillinux, yodl }:
 
 let version = "3.25.02"; in
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ gcc49 libmilter libX11 openssl readline utillinux ];
+  buildInputs = [ libmilter libX11 openssl readline utillinux ];
   nativeBuildInputs = [ icmake yodl ];
 
   postPatch = ''
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index 515fb9d251f..d723cc0382b 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bobcat, gcc49, icmake, yodl }:
+{ stdenv, fetchurl, bobcat, icmake, yodl }:
 
 let version = "2.02.00"; in
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ bobcat gcc49 ];
+  buildInputs = [ bobcat ];
   nativeBuildInputs = [ icmake yodl ];
 
   postPatch = ''
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index 4b371097ee6..34bf136ece7 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -1,5 +1,4 @@
-# FIXME: remove gcc49 when the default gcc supports C++1y
-{ stdenv, fetchFromGitHub, freetype, gcc49, imlib2, jbig2dec, libjpeg, libX11
+{ stdenv, fetchFromGitHub, freetype, imlib2, jbig2dec, libjpeg, libX11
 , mujs, mupdf, ncurses, openjpeg, openssl }:
 
 let
@@ -16,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "jichu4n";
   };
 
-  buildInputs = [ freetype gcc49 imlib2 jbig2dec libjpeg libX11 mujs mupdf
+  buildInputs = [ freetype imlib2 jbig2dec libjpeg libX11 mujs mupdf
     ncurses openjpeg openssl ];
 
   buildFlags = binaries;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 261158a6e0e..d4711d8e67b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3134,9 +3134,7 @@ let
 
   torbutton = callPackage ../tools/security/torbutton { };
 
-  torbrowser = callPackage ../tools/security/tor/torbrowser.nix {
-    stdenv = overrideCC stdenv gcc49;
-  };
+  torbrowser = callPackage ../tools/security/tor/torbrowser.nix { };
 
   touchegg = callPackage ../tools/inputmethods/touchegg { };
 
@@ -10841,7 +10839,6 @@ let
   clipit = callPackage ../applications/misc/clipit { };
 
   bomi = callPackage ../applications/video/bomi {
-    stdenv = overrideCC stdenv gcc49;
     pulseSupport = config.pulseaudio or true;
   };
 
@@ -13402,8 +13399,7 @@ let
   zathuraCollection = recurseIntoAttrs
     (let callPackage = newScope pkgs.zathuraCollection; in
       import ../applications/misc/zathura {
-        inherit callPackage pkgs fetchurl lib;
-        stdenv = overrideCC stdenv gcc49;
+        inherit stdenv callPackage pkgs fetchurl lib;
         useMupdf = config.zathura.useMupdf or false;
       });
 
@@ -13417,7 +13413,6 @@ let
 
   girara = callPackage ../applications/misc/girara {
     gtk = gtk3;
-    stdenv = overrideCC stdenv gcc49;
   };
 
   girara-light = callPackage ../applications/misc/girara {

From 6018bf71700c331821b16652dafe0290c7d110a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 23 Jul 2015 13:42:08 +0200
Subject: [PATCH 0209/2016] boost: pin packages to 157 where it fixes building

According to Hydra, this seems to cover all the breakages created by
defaulting to 158 now.
---
 pkgs/top-level/all-packages.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e231815b41c..19ce101a236 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5754,7 +5754,9 @@ let
 
   texi2html = callPackage ../development/tools/misc/texi2html { };
 
-  uhd = callPackage ../development/tools/misc/uhd { };
+  uhd = callPackage ../development/tools/misc/uhd {
+    boost = boost157;
+  };
 
   uisp = callPackage ../development/tools/misc/uisp { };
 
@@ -8513,7 +8515,9 @@ let
 
   lucene = callPackage ../development/libraries/java/lucene { };
 
-  lucenepp = callPackage ../development/libraries/lucene++ { };
+  lucenepp = callPackage ../development/libraries/lucene++ {
+    boost = boost157;
+  };
 
   mockobjects = callPackage ../development/libraries/java/mockobjects { };
 
@@ -10659,7 +10663,9 @@ let
 
   schismtracker = callPackage ../applications/audio/schismtracker { };
 
-  altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } );
+  altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins {
+    callPackage = newScope { boost = boost157; };
+  } );
   bitcoin = altcoins.bitcoin;
 
   aumix = callPackage ../applications/audio/aumix {
@@ -11396,7 +11402,9 @@ let
     cmake = cmake-2_8;
   };
 
-  freicoin = callPackage ../applications/misc/freicoin { };
+  freicoin = callPackage ../applications/misc/freicoin {
+    boost = boost157;
+  };
 
   fuze = callPackage ../applications/networking/instant-messengers/fuze {};
 
@@ -11862,7 +11870,9 @@ let
   links = callPackage ../applications/networking/browsers/links { };
 
   ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { };
-  ledger3 = callPackage ../applications/office/ledger { };
+  ledger3 = callPackage ../applications/office/ledger {
+    boost = boost157;
+  };
   ledger = ledger3;
 
   lighttable = callPackage ../applications/editors/lighttable {};

From 2b2e7c27307e8b78d1b211ff0fdba86d558b37eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 21 Jul 2015 23:34:52 +0200
Subject: [PATCH 0210/2016] ppl: 1.0 -> 1.1, add patch to fix current ptrdiff_t
 build error

I'm updating to 1.1 because that's the version that the patch from
Fedora, which fixes ptrdiff_t build error, applies to.

Removing old patch that doesn't apply anymore. (The patch seems to be
fixing a build error that no longer exist, see
https://bugs.gentoo.org/show_bug.cgi?id=447928.)
---
 pkgs/development/libraries/ppl/default.nix    |   6 +-
 .../libraries/ppl/ppl-cstddef.patch           | 238 ++++++++++++++++++
 .../libraries/ppl/upstream-based.patch        |  42 ----
 3 files changed, 241 insertions(+), 45 deletions(-)
 create mode 100644 pkgs/development/libraries/ppl/ppl-cstddef.patch
 delete mode 100644 pkgs/development/libraries/ppl/upstream-based.patch

diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index 9edef767481..96388c3a35a 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, gmpxx, perl, gnum4 }:
 
-let version = "1.0"; in
+let version = "1.1"; in
 
 stdenv.mkDerivation rec {
   name = "ppl-${version}";
 
   src = fetchurl {
     url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2";
-    sha256 = "0m0b6dzablci8mlavpsmn5w1v3r46li0wpjwvsybgxx0p1ifjsf1";
+    sha256 = "1vrqhbpyca6sf984cfcwlp8wdnfzj1g7ph9958qdky9978i1nlny";
   };
 
   nativeBuildInputs = [ perl gnum4 ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips"
     ];
 
-  patches = [ ./upstream-based.patch ];
+  patches = [ ./ppl-cstddef.patch /* from Fedora */ ];
 
   # Beware!  It took ~6 hours to compile PPL and run its tests on a 1.2 GHz
   # x86_64 box.  Nevertheless, being a dependency of GCC, it probably ought
diff --git a/pkgs/development/libraries/ppl/ppl-cstddef.patch b/pkgs/development/libraries/ppl/ppl-cstddef.patch
new file mode 100644
index 00000000000..8c43b26bef7
--- /dev/null
+++ b/pkgs/development/libraries/ppl/ppl-cstddef.patch
@@ -0,0 +1,238 @@
+diff -up ppl-1.1/src/Dense_Row_defs.hh.orig ppl-1.1/src/Dense_Row_defs.hh
+--- ppl-1.1/src/Dense_Row_defs.hh.orig	2014-04-29 13:08:10.516682937 -0300
++++ ppl-1.1/src/Dense_Row_defs.hh	2014-04-29 13:08:50.447684466 -0300
+@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include <memory>
+ #include <vector>
+ #include <limits>
++#include <cstddef>
+ 
+ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
+ //! A finite sequence of coefficients.
+@@ -433,7 +434,7 @@ public:
+ 
+   typedef std::bidirectional_iterator_tag iterator_category;
+   typedef Coefficient value_type;
+-  typedef ptrdiff_t difference_type;
++  typedef std::ptrdiff_t difference_type;
+   typedef value_type* pointer;
+   typedef value_type& reference;
+ 
+@@ -474,7 +475,7 @@ class Parma_Polyhedra_Library::Dense_Row
+ public:
+ 
+   typedef const Coefficient value_type;
+-  typedef ptrdiff_t difference_type;
++  typedef std::ptrdiff_t difference_type;
+   typedef value_type* pointer;
+   typedef Coefficient_traits::const_reference reference;
+ 
+diff -up ppl-1.1/src/Linear_Expression_Interface_defs.hh.orig ppl-1.1/src/Linear_Expression_Interface_defs.hh
+--- ppl-1.1/src/Linear_Expression_Interface_defs.hh.orig	2014-04-29 13:08:17.337683198 -0300
++++ ppl-1.1/src/Linear_Expression_Interface_defs.hh	2014-04-29 13:08:40.999684104 -0300
+@@ -32,6 +32,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "Sparse_Row_types.hh"
+ #include <vector>
+ #include <set>
++#include <cstddef>
+ 
+ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
+ //! A linear expression.
+@@ -65,7 +66,7 @@ public:
+   public:
+     typedef std::bidirectional_iterator_tag iterator_category;
+     typedef const Coefficient value_type;
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+     typedef value_type* pointer;
+     typedef Coefficient_traits::const_reference reference;
+ 
+diff -up ppl-1.1/src/CO_Tree_defs.hh.orig ppl-1.1/src/CO_Tree_defs.hh
+--- ppl-1.1/src/CO_Tree_defs.hh.orig	2014-04-29 13:11:33.725690719 -0300
++++ ppl-1.1/src/CO_Tree_defs.hh	2014-04-29 13:11:55.943691569 -0300
+@@ -28,6 +28,7 @@ site: http://bugseng.com/products/ppl/ .
+ 
+ #include "Coefficient_defs.hh"
+ #include <memory>
++#include <cstddef>
+ 
+ #ifndef PPL_CO_TREE_EXTRA_DEBUG
+ #ifdef PPL_ABI_BREAKING_EXTRA_DEBUG
+@@ -159,7 +160,7 @@ public:
+ 
+     typedef std::bidirectional_iterator_tag iterator_category;
+     typedef const data_type value_type;
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+     typedef value_type* pointer;
+     typedef data_type_const_reference reference;
+ 
+@@ -314,7 +315,7 @@ public:
+ 
+     typedef std::bidirectional_iterator_tag iterator_category;
+     typedef data_type value_type;
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+     typedef value_type* pointer;
+     typedef value_type& reference;
+ 
+diff -up ppl-1.1/src/CO_Tree_inlines.hh.orig ppl-1.1/src/CO_Tree_inlines.hh
+--- ppl-1.1/src/CO_Tree_inlines.hh.orig	2014-04-29 13:14:12.738696808 -0300
++++ ppl-1.1/src/CO_Tree_inlines.hh	2014-04-29 13:14:48.887698192 -0300
+@@ -24,6 +24,8 @@ site: http://bugseng.com/products/ppl/ .
+ #ifndef PPL_CO_Tree_inlines_hh
+ #define PPL_CO_Tree_inlines_hh 1
+ 
++#include <cstddef>
++
+ namespace Parma_Polyhedra_Library {
+ 
+ inline dimension_type
+@@ -31,7 +33,7 @@ CO_Tree::dfs_index(const_iterator itr) c
+   PPL_ASSERT(itr.current_index != 0);
+   PPL_ASSERT(itr.current_index >= indexes + 1);
+   PPL_ASSERT(itr.current_index <= indexes + reserved_size);
+-  const ptrdiff_t index = itr.current_index - indexes;
++  const std::ptrdiff_t index = itr.current_index - indexes;
+   return static_cast<dimension_type>(index);
+ }
+ 
+@@ -40,7 +42,7 @@ CO_Tree::dfs_index(iterator itr) const {
+   PPL_ASSERT(itr.current_index != 0);
+   PPL_ASSERT(itr.current_index >= indexes + 1);
+   PPL_ASSERT(itr.current_index <= indexes + reserved_size);
+-  const ptrdiff_t index = itr.current_index - indexes;
++  const std::ptrdiff_t index = itr.current_index - indexes;
+   return static_cast<dimension_type>(index);
+ }
+ 
+@@ -772,7 +774,7 @@ CO_Tree::tree_iterator::follow_left_chil
+   p -= (offset - 1);
+   while (*p == unused_index)
+     ++p;
+-  const ptrdiff_t distance = p - tree.indexes;
++  const std::ptrdiff_t distance = p - tree.indexes;
+   PPL_ASSERT(distance >= 0);
+   i = static_cast<dimension_type>(distance);
+   offset = least_significant_one_mask(i);
+@@ -787,7 +789,7 @@ CO_Tree::tree_iterator::follow_right_chi
+   p += (offset - 1);
+   while (*p == unused_index)
+     --p;
+-  const ptrdiff_t distance = p - tree.indexes;
++  const std::ptrdiff_t distance = p - tree.indexes;
+   PPL_ASSERT(distance >= 0);
+   i = static_cast<dimension_type>(distance);
+   offset = least_significant_one_mask(i);
+diff -up ppl-1.1/src/Linear_Expression_defs.hh.orig ppl-1.1/src/Linear_Expression_defs.hh
+--- ppl-1.1/src/Linear_Expression_defs.hh.orig	2014-04-29 13:15:39.793700141 -0300
++++ ppl-1.1/src/Linear_Expression_defs.hh	2014-04-29 13:16:07.464701201 -0300
+@@ -51,6 +51,7 @@ site: http://bugseng.com/products/ppl/ .
+ 
+ #include "Linear_Expression_Interface_defs.hh"
+ #include "Variable_defs.hh"
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -381,7 +382,7 @@ public:
+   public:
+     typedef std::bidirectional_iterator_tag iterator_category;
+     typedef const Coefficient value_type;
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+     typedef value_type* pointer;
+     typedef Coefficient_traits::const_reference reference;
+ 
+diff -up ppl-1.1/src/CO_Tree.cc.orig ppl-1.1/src/CO_Tree.cc
+--- ppl-1.1/src/CO_Tree.cc.orig	2014-04-29 13:19:37.192709232 -0300
++++ ppl-1.1/src/CO_Tree.cc	2014-04-29 13:19:58.000710029 -0300
+@@ -954,7 +954,7 @@ PPL::CO_Tree
+     --subtree_size;
+   }
+ 
+-  const ptrdiff_t distance = first_unused_index - indexes;
++  const std::ptrdiff_t distance = first_unused_index - indexes;
+   PPL_ASSERT(distance >= 0);
+   return static_cast<dimension_type>(distance);
+ }
+diff -up ppl-1.1/src/Constraint_System_defs.hh.orig ppl-1.1/src/Constraint_System_defs.hh
+--- ppl-1.1/src/Constraint_System_defs.hh.orig	2014-04-29 13:30:05.530733294 -0300
++++ ppl-1.1/src/Constraint_System_defs.hh	2014-04-29 13:30:27.167734122 -0300
+@@ -37,6 +37,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "termination_types.hh"
+ #include <iterator>
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -609,7 +610,7 @@ for (Constraint_System::const_iterator i
+ class Parma_Polyhedra_Library::Constraint_System_const_iterator
+   : public std::iterator<std::forward_iterator_tag,
+                          Constraint,
+-                         ptrdiff_t,
++                         std::ptrdiff_t,
+                          const Constraint*,
+                          const Constraint&> {
+ public:
+diff -up ppl-1.1/src/Congruence_System_defs.hh.orig ppl-1.1/src/Congruence_System_defs.hh
+--- ppl-1.1/src/Congruence_System_defs.hh.orig	2014-04-29 13:33:56.927742155 -0300
++++ ppl-1.1/src/Congruence_System_defs.hh	2014-04-29 13:34:15.535742867 -0300
+@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "Congruence_defs.hh"
+ #include "Constraint_System_types.hh"
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -249,7 +250,7 @@ public:
+   class const_iterator
+     : public std::iterator<std::forward_iterator_tag,
+                            Congruence,
+-                           ptrdiff_t,
++                           std::ptrdiff_t,
+                            const Congruence*,
+                            const Congruence&> {
+   public:
+diff -up ppl-1.1/src/Generator_System_defs.hh.orig ppl-1.1/src/Generator_System_defs.hh
+--- ppl-1.1/src/Generator_System_defs.hh.orig	2014-04-29 13:44:30.122766402 -0300
++++ ppl-1.1/src/Generator_System_defs.hh	2014-04-29 13:44:48.167767093 -0300
+@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "Poly_Con_Relation_defs.hh"
+ #include "Polyhedron_types.hh"
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -679,7 +680,7 @@ copy(gs.begin(), gs.end(), ostream_itera
+ class Parma_Polyhedra_Library::Generator_System_const_iterator
+   : public std::iterator<std::forward_iterator_tag,
+         Generator,
+-        ptrdiff_t,
++        std::ptrdiff_t,
+         const Generator*,
+         const Generator&> {
+ public:
+diff -up ppl-1.1/src/Grid_Generator_System_defs.hh.orig ppl-1.1/src/Grid_Generator_System_defs.hh
+--- ppl-1.1/src/Grid_Generator_System_defs.hh.orig	2014-04-29 13:45:26.073768544 -0300
++++ ppl-1.1/src/Grid_Generator_System_defs.hh	2014-04-29 13:45:42.535769175 -0300
+@@ -31,6 +31,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "Variables_Set_types.hh"
+ #include "Polyhedron_types.hh"
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -277,7 +278,7 @@ public:
+   class const_iterator
+     : public std::iterator<std::forward_iterator_tag,
+                            Grid_Generator,
+-                           ptrdiff_t,
++                           std::ptrdiff_t,
+                            const Grid_Generator*,
+                            const Grid_Generator&> {
+   public:
diff --git a/pkgs/development/libraries/ppl/upstream-based.patch b/pkgs/development/libraries/ppl/upstream-based.patch
deleted file mode 100644
index 551050f67bf..00000000000
--- a/pkgs/development/libraries/ppl/upstream-based.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=447928
---- ppl-1.0/src/p_std_bits.cc.org	2012-12-30 00:37:03.033948083 +0100
-+++ ppl-1.0/src/mp_std_bits.cc	2012-12-30 00:44:12.893019313 +0100
-@@ -25,6 +25,9 @@
- #include "ppl-config.h"
- #include "mp_std_bits.defs.hh"
- 
-+#if __GNU_MP_VERSION < 5 \
-+  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- const bool std::numeric_limits<mpz_class>::is_specialized;
- const int std::numeric_limits<mpz_class>::digits;
- const int std::numeric_limits<mpz_class>::digits10;
-@@ -70,3 +73,6 @@
- const bool std::numeric_limits<mpq_class>::traps;
- const bool std::numeric_limits<mpq_class>::tininess_before;
- const std::float_round_style std::numeric_limits<mpq_class>::round_style;
-+
-+#endif // __GNU_MP_VERSION < 5
-+       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
---- ppl-1.0/src/mp_std_bits.defs.hh.org	2012-12-30 00:37:03.037948187 +0100
-+++ ppl-1.0/src/mp_std_bits.defs.hh	2012-12-30 00:42:32.002424189 +0100
-@@ -38,6 +38,9 @@
- #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
- void swap(mpq_class& x, mpq_class& y);
- 
-+#if __GNU_MP_VERSION < 5 \
-+  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- namespace std {
- 
- #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
-@@ -164,6 +167,9 @@
- 
- } // namespace std
- 
-+#endif // __GNU_MP_VERSION < 5
-+       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- #include "mp_std_bits.inlines.hh"
- 
- #endif // !defined(PPL_mp_std_bits_defs_hh)

From 1ff829deebffdff4992f827173fcb673730191ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 23 Jul 2015 14:42:47 +0200
Subject: [PATCH 0211/2016] dbus: maintenance update

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

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index d114cf17c4e..4a0f98d262a 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -7,8 +7,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.8.18";
-  sha256 = "1wn4k142m68d8yqd4i6dmx1ac0798yhkdnkk4mb72g3sfyffpwin";
+  version = "1.8.20";
+  sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw";
 
   inherit (stdenv) lib;
 

From 85383d8b24e8d0ca69a022e9761e387e79fdcbd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 23 Jul 2015 14:42:59 +0200
Subject: [PATCH 0212/2016] gtk3: maintenance update

---
 pkgs/development/libraries/gtk+/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index f8398618727..5fb70ac05ea 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -10,7 +10,7 @@ assert cupsSupport -> cups != null;
 
 let
   ver_maj = "3.16";
-  ver_min = "5";
+  ver_min = "6";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "0cdwykh4086f7fl4dkybgpyxyb1jcmxbfin2az42z5pb4z8rjz5q";
+    sha256 = "1gpzlnfrifc17yfk0zki6b2vmsfpf5cmrbh232s6iaan11np44jd";
   };
 
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];

From 748da7e541dddae21a2658cdad1c3ace4e3937b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 23 Jul 2015 14:43:10 +0200
Subject: [PATCH 0213/2016] gdk-pixbuf: maintenance update

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

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index fafff05a032..1322bc4eeab 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,14 +3,14 @@
 
 let
   ver_maj = "2.31";
-  ver_min = "4";
+  ver_min = "5";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "05bslhk33qpssg66n2wys9khyzwkr4am0b23dym8n67qjds9gng5";
+    sha256 = "19ppbycbr87rai93vf2ff8k3ksjqq64s8qysq0mfy9fdjw2ffxha";
   };
 
   setupHook = ./setup-hook.sh;

From 3cd5fd8bb3fc4b824e89cb800716989a332f20f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 16:12:25 +0200
Subject: [PATCH 0214/2016] More efficient version of filterAttrs

---
 lib/attrsets.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index cb4091b916c..d81d69b1402 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -76,7 +76,7 @@ rec {
        => { foo = 1; }
   */
   filterAttrs = pred: set:
-    listToAttrs (fold (n: ys: let v = set.${n}; in if pred n v then [(nameValuePair n v)] ++ ys else ys) [] (attrNames set));
+    listToAttrs (concatMap (name: let v = set.${name}; in if pred name v then [(nameValuePair name v)] else []) (attrNames set));
 
 
   /* foldAttrs: apply fold functions to values grouped by key. Eg accumulate values as list:

From f14dab05d635711daef90639f84ef3170abb216c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 16:32:52 +0200
Subject: [PATCH 0215/2016] optionAttrSetToDocList: O(n^2) -> O(n)

This shaves about 10% off memory consumption of NixOS evaluation.
---
 lib/options.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/options.nix b/lib/options.nix
index bfc5b5fa2ae..bb72ad6d125 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -83,7 +83,7 @@ rec {
   optionAttrSetToDocList = optionAttrSetToDocList' [];
 
   optionAttrSetToDocList' = prefix: options:
-    fold (opt: rest:
+    concatMap (opt:
       let
         docOption = rec {
           name = showOption opt.loc;
@@ -101,8 +101,7 @@ rec {
           let ss = opt.type.getSubOptions opt.loc;
           in if ss != {} then optionAttrSetToDocList' opt.loc ss else [];
       in
-        # FIXME: expensive, O(n^2)
-        [ docOption ] ++ subOptions ++ rest) [] (collect isOption options);
+        [ docOption ] ++ subOptions) (collect isOption options);
 
 
   /* This function recursively removes all derivation attributes from

From 554cbe9c4bf03b012f1afcc962bc335785ac9af0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 21 Jul 2015 12:42:41 +0200
Subject: [PATCH 0216/2016] scikitlearn: really use 0.16.1 version as noted in
 the name

---
 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 29e2919a380..3d05fddc035 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11985,12 +11985,12 @@ let
   };
 
 
-  scikitlearn = buildPythonPackage {
+  scikitlearn = buildPythonPackage rec {
     name = "scikit-learn-0.16.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/scikit-learn/scikit-learn-0.15.2.tar.gz";
-      sha256 = "19jzmbi3j4ix8418i80ayl595dwyi4gy474kb2nc1v8kdwgqi2hs";
+      url = "https://pypi.python.org/packages/source/s/scikit-learn/${name}.tar.gz";
+      sha256 = "1r761qmsq2mnl8sapplbx0ipj6i7ppr2cmz009q5rjana0liwwn0";
     };
 
     buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];

From d82946b2bf4cf2b2520d9e925f07c57e25521dfd Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Thu, 23 Jul 2015 10:58:17 +0200
Subject: [PATCH 0217/2016] sic: init at 1.2

---
 .../networking/irc/sic/default.nix             | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/applications/networking/irc/sic/default.nix

diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix
new file mode 100644
index 00000000000..fef2b6c4cac
--- /dev/null
+++ b/pkgs/applications/networking/irc/sic/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "sic-${version}";
+  version = "1.2";
+
+  makeFlags = "PREFIX=$out";
+  src = fetchurl {
+    url = "http://dl.suckless.org/tools/sic-${version}.tar.gz";
+    sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185";
+  };
+
+  meta = {
+    description = "Simple IRC client";
+    homepage = http://tools.suckless.org/sic/;
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c14725cce1..432b113edf3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2925,6 +2925,8 @@ let
 
   shellinabox = callPackage ../servers/shellinabox { };
 
+  sic = callPackage ../applications/networking/irc/sic { };
+
   siege = callPackage ../tools/networking/siege {};
 
   sigil = callPackage ../applications/editors/sigil { };

From 637e35deb99c5efbb8bd760a3ad08d3899534ead Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 17:19:21 +0200
Subject: [PATCH 0218/2016] Use foldl' instead of fold in some places

---
 lib/lists.nix   |  8 ++++++--
 lib/modules.nix | 14 +++++++-------
 lib/options.nix |  6 +++---
 lib/strings.nix |  2 +-
 lib/types.nix   |  2 +-
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index fa8cbddfd94..9cb164aaade 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -38,6 +38,10 @@ rec {
     in foldl' (length list - 1);
 
 
+  # Strict version of foldl.
+  foldl' = builtins.foldl' or foldl;
+
+
   # map with index: `imap (i: v: "${v}-${toString i}") ["a" "b"] ==
   # ["a-1" "b-2"]'
   imap = f: list:
@@ -59,7 +63,7 @@ rec {
   # == [1 2 3 4 5]' and `flatten 1 == [1]'.
   flatten = x:
     if isList x
-    then fold (x: y: (flatten x) ++ y) [] x
+    then foldl' (x: y: x ++ (flatten y)) [] x
     else [x];
 
 
@@ -96,7 +100,7 @@ rec {
 
   # Count how many times function `pred' returns true for the elements
   # of `list'.
-  count = pred: fold (x: c: if pred x then c + 1 else c) 0;
+  count = pred: foldl' (c: x: if pred x then c + 1 else c) 0;
 
 
   # Return a singleton list or an empty list, depending on a boolean
diff --git a/lib/modules.nix b/lib/modules.nix
index ea600127617..22e8b200f76 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -76,8 +76,8 @@ rec {
           else yieldConfig (prefix ++ [n]) v) set) ["_definedNames"];
         in
         if options._module.check.value && set ? _definedNames then
-          fold (m: res:
-            fold (name: res:
+          foldl' (res: m:
+            foldl' (res: name:
               if set ? ${name} then res else throw "The option `${showOption (prefix ++ [name])}' defined in `${m.file}' does not exist.")
               res m.names)
             res set._definedNames
@@ -225,7 +225,7 @@ rec {
      'opts' is a list of modules.  Each module has an options attribute which
      correspond to the definition of 'loc' in 'opt.file'. */
   mergeOptionDecls = loc: opts:
-    fold (opt: res:
+    foldl' (res: opt:
       if opt.options ? default && res ? default ||
          opt.options ? example && res ? example ||
          opt.options ? description && res ? description ||
@@ -251,7 +251,7 @@ rec {
             else if opt.options ? options then map (coerceOption opt.file) options' ++ res.options
             else res.options;
         in opt.options // res //
-          { declarations = [opt.file] ++ res.declarations;
+          { declarations = res.declarations ++ [opt.file];
             options = submodules;
           }
     ) { inherit loc; declarations = []; options = []; } opts;
@@ -302,8 +302,8 @@ rec {
         in
           processOrder (processOverride (processIfAndMerge defs));
 
-        # Type-check the remaining definitions, and merge them
-        mergedValue = fold (def: res:
+        # Type-check the remaining definitions, and merge them.
+        mergedValue = foldl' (res: def:
           if type.check def.value then res
           else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.")
           (type.merge loc defsFinal) defsFinal;
@@ -384,7 +384,7 @@ rec {
       defaultPrio = 100;
       getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPrio;
       min = x: y: if x < y then x else y;
-      highestPrio = fold (def: prio: min (getPrio def) prio) 9999 defs;
+      highestPrio = foldl' (prio: def: min (getPrio def) prio) 9999 defs;
       strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def;
     in concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs;
 
diff --git a/lib/options.nix b/lib/options.nix
index bb72ad6d125..6e8e9ce0006 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -53,8 +53,8 @@ rec {
     if length list == 1 then head list
     else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list)
     else if all isList list then concatLists list
-    else if all isAttrs list then fold lib.mergeAttrs {} list
-    else if all isBool list then fold lib.or false list
+    else if all isAttrs list then foldl' lib.mergeAttrs {} list
+    else if all isBool list then foldl' lib.or false list
     else if all isString list then lib.concatStrings list
     else if all isInt list && all (x: x == head list) list then head list
     else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}.";
@@ -68,7 +68,7 @@ rec {
   /* "Merge" option definitions by checking that they all have the same value. */
   mergeEqualOption = loc: defs:
     if defs == [] then abort "This case should never happen."
-    else fold (def: val:
+    else foldl' (val: def:
       if def.value != val then
         throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}."
       else
diff --git a/lib/strings.nix b/lib/strings.nix
index d9f7f6c2db8..f0ecb15ab2d 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -12,7 +12,7 @@ rec {
 
 
   # Concatenate a list of strings.
-  concatStrings = lib.fold (x: y: x + y) "";
+  concatStrings = lib.foldl' (x: y: x + y) "";
 
 
   # Map a function over a list and concatenate the resulting strings.
diff --git a/lib/types.nix b/lib/types.nix
index 0a54a5598f1..49f24b022de 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -88,7 +88,7 @@ rec {
     attrs = mkOptionType {
       name = "attribute set";
       check = isAttrs;
-      merge = loc: fold (def: mergeAttrs def.value) {};
+      merge = loc: foldl' (res: def: mergeAttrs res def.value) {};
     };
 
     # derivation is a reserved keyword.

From 0ae8b365b35fa1c3cac700ce34b37012f96d7deb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 17:41:35 +0200
Subject: [PATCH 0219/2016] Rename misc.nix -> deprecated.nix

---
 lib/attrsets.nix                 | 3 +--
 lib/default.nix                  | 2 +-
 lib/{misc.nix => deprecated.nix} | 2 --
 lib/options.nix                  | 1 -
 lib/strings.nix                  | 2 ++
 lib/trivial.nix                  | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)
 rename lib/{misc.nix => deprecated.nix} (99%)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index d81d69b1402..20be2002402 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -6,7 +6,6 @@ with {
   inherit (import ./default.nix) fold;
   inherit (import ./strings.nix) concatStringsSep;
   inherit (import ./lists.nix) concatMap concatLists all deepSeqList;
-  inherit (import ./misc.nix) maybeAttr;
 };
 
 rec {
@@ -86,7 +85,7 @@ rec {
   foldAttrs = op: nul: list_of_attrs:
     fold (n: a:
         fold (name: o:
-          o // (listToAttrs [{inherit name; value = op n.${name} (maybeAttr name nul a); }])
+          o // (listToAttrs [{inherit name; value = op n.${name} (a.${name} or nul); }])
         ) a (attrNames n)
     ) {} list_of_attrs;
 
diff --git a/lib/default.nix b/lib/default.nix
index 4b6027c437b..cd0d8161c8c 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -11,7 +11,7 @@ let
   types = import ./types.nix;
   meta = import ./meta.nix;
   debug = import ./debug.nix;
-  misc = import ./misc.nix;
+  misc = import ./deprecated.nix;
   maintainers = import ./maintainers.nix;
   platforms = import ./platforms.nix;
   systems = import ./systems.nix;
diff --git a/lib/misc.nix b/lib/deprecated.nix
similarity index 99%
rename from lib/misc.nix
rename to lib/deprecated.nix
index fd20ce25010..54c253f2c34 100644
--- a/lib/misc.nix
+++ b/lib/deprecated.nix
@@ -203,8 +203,6 @@ rec {
     in
       work startSet [] [];
 
-  genericClosure = builtins.genericClosure or lazyGenericClosure;
-
   innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else 
         innerModifySumArgs f x (a // b);
   modifySumArgs = f: x: innerModifySumArgs f x {};
diff --git a/lib/options.nix b/lib/options.nix
index 6e8e9ce0006..5c543f56bcf 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -4,7 +4,6 @@ let lib = import ./default.nix; in
 
 with import ./trivial.nix;
 with import ./lists.nix;
-with import ./misc.nix;
 with import ./attrsets.nix;
 with import ./strings.nix;
 
diff --git a/lib/strings.nix b/lib/strings.nix
index f0ecb15ab2d..895b230744f 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -210,6 +210,7 @@ rec {
   # standard GNU Autoconf scripts.
   enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}";
 
+
   # Create a fixed width string with additional prefix to match required width
   fixedWidthString = width: filler: str:
     let
@@ -219,6 +220,7 @@ rec {
       assert strw <= width;
       if strw == width then str else filler + fixedWidthString reqWidth filler str;
 
+
   # Format a number adding leading zeroes up to fixed width
   fixedWidthNumber = width: n: fixedWidthString width "0" (toString n);
 }
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 8addde1b86c..9fd5a7e1c57 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -22,7 +22,7 @@ rec {
   inherit (builtins)
     pathExists readFile isBool isFunction
     isInt add sub lessThan
-    seq deepSeq;
+    seq deepSeq genericClosure;
 
   # Return the Nixpkgs version number.
   nixpkgsVersion =

From 4cc6c83477cd63fe220b08d8106d1aa7aa283dbf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 18:31:17 +0200
Subject: [PATCH 0220/2016] concatLists (map ...) -> concatMap

---
 lib/modules.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 22e8b200f76..80268e51e11 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -182,18 +182,18 @@ rec {
         let
           loc = prefix ++ [name];
           # Get all submodules that declare ‘name’.
-          decls = concatLists (map (m:
+          decls = concatMap (m:
             if m.options ? ${name}
               then [ { inherit (m) file; options = m.options.${name}; } ]
               else []
-            ) options);
+            ) options;
           # Get all submodules that define ‘name’.
-          defns = concatLists (map (m:
+          defns = concatMap (m:
             if m.config ? ${name}
               then map (config: { inherit (m) file; inherit config; })
                 (pushDownProperties m.config.${name})
               else []
-            ) configs);
+            ) configs;
           nrOptions = count (m: isOption m.options) decls;
           # Extract the definitions for this loc
           defns' = map (m: { inherit (m) file; value = m.config.${name}; })

From e7c209e5a3ecc748e76ee2d87503294cdd13b400 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 18:31:39 +0200
Subject: [PATCH 0221/2016] gdb: Update to 7.9.1

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

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 16ab1f8e5dc..d50822d4949 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -8,7 +8,7 @@
 
 let
 
-  basename = "gdb-7.9";
+  basename = "gdb-7.9.1";
 
   # Whether (cross-)building for GNU/Hurd.  This is an approximation since
   # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -27,11 +27,9 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.xz";
-    sha256 = "14l3hhsy7fmpn2dk7ivc67gnbjdhkxlq90kxijpzfa35l58mcccv";
+    sha256 = "0h5sfg4ndhb8q4fxbq0hdxfjp35n6ih96f6x8yvb418s84x5976d";
   };
 
-  # patches = [ ./edit-signals.patch ];
-
   # I think python is not a native input, but I leave it
   # here while I will not need it cross building
   nativeBuildInputs = [ texinfo python perl ]

From d004ac6857d4ef3f6670264c93834084a758123d Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Tue, 21 Jul 2015 17:49:29 -0300
Subject: [PATCH 0222/2016] Oroborus: init at 2.0.20

Oroborus (named after the self-eating snake) is a minimalistic window manager.
---
 .../services/x11/window-managers/oroborus.nix | 25 +++++++++++++++++
 .../window-managers/oroborus/default.nix      | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 3 files changed, 56 insertions(+)
 create mode 100644 nixos/modules/services/x11/window-managers/oroborus.nix
 create mode 100644 pkgs/applications/window-managers/oroborus/default.nix

diff --git a/nixos/modules/services/x11/window-managers/oroborus.nix b/nixos/modules/services/x11/window-managers/oroborus.nix
new file mode 100644
index 00000000000..bd7e3396864
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/oroborus.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.oroborus;
+in
+{
+  ###### interface
+  options = {
+    services.xserver.windowManager.oroborus.enable = mkEnableOption "oroborus";
+  };
+
+  ###### implementation
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
+      name = "oroborus";
+      start = ''
+        ${pkgs.oroborus}/bin/oroborus &
+        waitPID=$!
+      '';
+    };
+    environment.systemPackages = [ pkgs.oroborus ];
+  };
+}
diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix
new file mode 100644
index 00000000000..226b33be060
--- /dev/null
+++ b/pkgs/applications/window-managers/oroborus/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig
+, freetype, fribidi
+, libSM, libICE, libXt, libXaw, libXmu
+, libXext, libXft, libXpm, libXrandr
+, libXrender, xextproto, libXinerama }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+  name = "oroborus-${version}";
+  version = "2.0.20";
+
+  buildInputs = [ pkgconfig freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama ];
+
+  src = fetchurl {
+    url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz";
+    sha256 = "12bvk8x8rfnymbfbwmdcrd9g8m1zxbcq7rgvfdkjr0gnpi0aa82j";
+  };
+
+  meta = {
+    description = "A really minimalistic X window manager";
+    homepage = http://www.oroborus.org/;
+    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 acfc7525f5e..3e0c117617e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12127,6 +12127,10 @@ 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;
+  };
+
   panamax_api = callPackage ../applications/networking/cluster/panamax/api {
     ruby = ruby_2_1;
   };

From 08750f988aef531922f02017366425ffa868294c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Jul 2015 19:21:57 +0200
Subject: [PATCH 0223/2016] ecm: 6.2.3 -> 6.4.4

---
 pkgs/applications/science/math/ecm/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix
index 5d378a48dd9..53b289983a4 100644
--- a/pkgs/applications/science/math/ecm/default.nix
+++ b/pkgs/applications/science/math/ecm/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl, gmp}:
+{ stdenv, fetchurl, gmp, m4 }:
 
 let
   pname = "ecm";
-  version = "6.2.3";
+  version = "6.4.4";
   name = "${pname}-${version}";
 in
 
@@ -10,11 +10,11 @@ stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-      url = https://gforge.inria.fr/frs/download.php/22124/ecm-6.2.3.tar.gz;
-      sha256 = "1iwwhbz5vwl7j6dyh292hahc8yy16pq9mmm7mxy49zhxd81vy08p";
+      url = http://gforge.inria.fr/frs/download.php/file/32159/ecm-6.4.4.tar.gz;
+      sha256 = "0v5h2nicz9yx78c2d72plbhi30iq4nxbvphja1s9501db4aah4y8";
     };
 
-  buildInputs = [ gmp ];
+  buildInputs = [ m4 gmp ];
 
   doCheck = true;
 
@@ -23,5 +23,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://ecm.gforge.inria.fr/;
     maintainers = [ stdenv.lib.maintainers.roconnor ];
+    platforms = stdenv.lib.platforms.all;
   };
 }

From 89cda4c95a2447973ca4d5be251fc7e1d83fa2a9 Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Thu, 23 Jul 2015 06:25:15 +0200
Subject: [PATCH 0224/2016] iojs (2.3.4 -> 2.4.0)

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

diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index 1f7db61090e..d5f9baa0528 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
 
 let
-  version = "2.3.4";
+  version = "2.4.0";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
     url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = "1h9cjrs93c8rdycc0ahhc27wv826211aljvfmxfg8jdmg6nvibhq";
+    sha256 = "0g81bn8q4zgm8skkbxbzwa22dnpbing4b5wjqacvpxq3ygz4c98y";
   };
 
   prePatch = ''

From ab4291249896e8996e4ae523f5e33a6da2f6e4b3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Jul 2015 19:29:35 +0200
Subject: [PATCH 0225/2016] ocaml-macaque: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix
index f2d13ad1f13..99c2a292fe8 100644
--- a/pkgs/development/ocaml-modules/macaque/default.nix
+++ b/pkgs/development/ocaml-modules/macaque/default.nix
@@ -1,10 +1,10 @@
-{stdenv, fetchurl, ocaml, findlib, pgocaml, camlp4}:
+{ stdenv, fetchzip, ocaml, findlib, pgocaml, camlp4 }:
 
 stdenv.mkDerivation {
-  name = "ocaml-macaque-0.7.1";
-  src = fetchurl {
-    url = https://github.com/ocsigen/macaque/archive/0.7.1.tar.gz;
-    sha256 = "0wnq3pgpcrfpivr8j7p827rhag6hdx0yr0bdvma0hw1g30vwf9qa";
+  name = "ocaml-macaque-0.7.2";
+  src = fetchzip {
+    url = https://github.com/ocsigen/macaque/archive/0.7.2.tar.gz;
+    sha256 = "14i0a8cndzndjmlkyhf31r451q99cnkndgxcj0id4qjqhdl4bmjv";
   };
 
   buildInputs = [ ocaml findlib camlp4 ];

From aa8bb63248da7d21dc7a6eec364f6c8962a0aadc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Jul 2015 19:32:21 +0200
Subject: [PATCH 0226/2016] ocaml-fileutils: 0.4.5 -> 0.5.0

---
 .../ocaml-modules/fileutils/default.nix            | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix
index 2fbbabfd36b..7a8a80a446c 100644
--- a/pkgs/development/ocaml-modules/fileutils/default.nix
+++ b/pkgs/development/ocaml-modules/fileutils/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, fetchurl, ocaml, findlib }:
+{ stdenv, fetchurl, ocaml, findlib, ounit }:
 
 stdenv.mkDerivation {
-  name = "ocaml-fileutils-0.4.5";
+  name = "ocaml-fileutils-0.5.0";
 
   src = fetchurl {
-    url = https://forge.ocamlcore.org/frs/download.php/1194/ocaml-fileutils-0.4.5.tar.gz;
-    sha256 = "0rlqmcgjrfjihjgw5cfmack169cag8054gh5yrqph15av3lx5cra";
+    url = https://forge.ocamlcore.org/frs/download.php/1531/ocaml-fileutils-0.5.0.tar.gz;
+    sha256 = "0xs96nlrrm335mcsgsxnqzspiqyfn26b0jjxm72br7c7ax534n47";
   };
 
-  buildInputs = [ ocaml findlib ];
+  buildInputs = [ ocaml findlib ounit ];
+
+  configureFlags = "--enable-tests";
+  doCheck = true;
+  checkTarget = "test";
 
   createFindlibDestdir = true;
 

From a74f3a62701e64cabd47e02bd8f79ba51d4c3fb8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Jul 2015 19:36:24 +0200
Subject: [PATCH 0227/2016] ocaml-csv: 1.4 -> 1.4.1

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

diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix
index 16f755f17b3..30f96a801d8 100644
--- a/pkgs/development/ocaml-modules/csv/default.nix
+++ b/pkgs/development/ocaml-modules/csv/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation {
 
-  name = "ocaml-csv-1.4";
+  name = "ocaml-csv-1.4.1";
 
   src = fetchzip {
-    url = https://github.com/Chris00/ocaml-csv/releases/download/1.4/csv-1.4.tar.gz;
-    sha256 = "0si0v79rxzyzmgyhd6lidpzxdlcpprlhg0pgrsf688g83xsclkwa";
+    url = https://github.com/Chris00/ocaml-csv/releases/download/1.4.1/csv-1.4.1.tar.gz;
+    sha256 = "1z38qy92lq8qh91bs70vsv868szainif53a2y6rf47ijdila25j4";
   };
 
   buildInputs = [ ocaml findlib ];

From 5fcdd7c0dc0e864653a0e4ac440eff77e51458d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jul 2015 19:47:16 +0200
Subject: [PATCH 0228/2016] nixopsUnstable: disable broken documentation build

---
 pkgs/tools/package-management/nixops/unstable.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index 6f10989f3c7..2ad826b928b 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -26,7 +26,7 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "01n2ykszrnqr3kqqdg1n2l8wm38yhri7r3d7b0abklsslz9dlvmy";
   };
 
-  buildInputs = [ pythonPackages.nose pythonPackages.coverage ];
+  buildInputs = [ /* libxslt */ pythonPackages.nose pythonPackages.coverage ];
 
   propagatedBuildInputs =
     [ pythonPackages.prettytable
@@ -43,16 +43,17 @@ pythonPackages.buildPythonPackage rec {
       # Backward compatibility symlink.
       ln -s nixops $out/bin/charon
 
-      make -C doc/manual install \
+      # Documentation build is currently broken. Re-try with newer version.
+      : make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \
         docdir=$out/share/doc/nixops mandir=$out/share/man
 
       mkdir -p $out/share/nix/nixops
-      cp -av nix/* $out/share/nix/nixops
+      cp -av "nix/"* $out/share/nix/nixops
 
       # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
       # the version of openssh is causing errors when have big networks (40+)
       wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin"
-    ''; # */
+    '';
 
   meta = {
     homepage = https://github.com/NixOS/nixops;

From dc5084b4d1899db2ccc8dffe396a6b4912c226e0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jul 2015 19:47:43 +0200
Subject: [PATCH 0229/2016] nixops: fix Emacs syntax highlighting

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

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index b85591b0695..374026b7597 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -29,7 +29,7 @@ pythonPackages.buildPythonPackage rec {
         docdir=$out/share/doc/nixops mandir=$out/share/man
 
       mkdir -p $out/share/nix/nixops
-      cp -av nix/* $out/share/nix/nixops
+      cp -av "nix/"* $out/share/nix/nixops
 
       # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
       # the version of openssh is causing errors when have big networks (40+)

From 55ad2d21508333ec21171ceb9e7a16ac3baa6f32 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Sat, 18 Jul 2015 11:06:59 +0200
Subject: [PATCH 0230/2016] Fix wyrd to compile with ocaml 4.02

camlp4 is now a separate package instead of shipping within the ocaml package
---
 pkgs/tools/misc/wyrd/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix
index d76e393aaaa..d02ce41b6aa 100644
--- a/pkgs/tools/misc/wyrd/default.nix
+++ b/pkgs/tools/misc/wyrd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, ncurses, remind }:
+{ stdenv, fetchurl, ocaml, ncurses, remind, camlp4 }:
 
 stdenv.mkDerivation rec {
   version = "1.4.6";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj";
   };
 
-  buildInputs = [ ocaml ncurses remind ];
+  buildInputs = [ ocaml ncurses remind camlp4 ];
 
   preferLocalBuild = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 647013167f5..85035583af9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3440,7 +3440,9 @@ let
 
   wv2 = callPackage ../tools/misc/wv2 { };
 
-  wyrd = callPackage ../tools/misc/wyrd { };
+  wyrd = callPackage ../tools/misc/wyrd {
+    inherit (ocamlPackages) camlp4;
+  };
 
   x86info = callPackage ../os-specific/linux/x86info { };
 

From 5342e2a598e58a658296de883331048e2329d08a Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Mon, 20 Jul 2015 09:15:35 +0200
Subject: [PATCH 0231/2016] Make ocaml's mysql propagate mysql.lib

There was a typo preventing other packages from properly building
---
 pkgs/development/ocaml-modules/mysql/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index fc26d8b989c..3131d8212e4 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/pkgs/development/ocaml-modules/mysql/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  propagatedbuildInputs = [ mysql.lib ];
+  propagatedBuildInputs = [ mysql.lib ];
 
   preConfigure = ''
     export LDFLAGS="-L${mysql.lib}/lib/mysql"

From d1e6f055fe01e3e13a6ba603dd815da2a4d991c8 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Tue, 21 Jul 2015 17:14:28 +0200
Subject: [PATCH 0232/2016] Fix haxe to compile with ocaml 4.02

camlp4 is now a separate package
---
 pkgs/development/compilers/haxe/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index d9c9f91df6a..41c7a476b27 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchgit, ocaml, zlib, neko }:
+{ stdenv, fetchgit, ocaml, zlib, neko, camlp4 }:
 
 stdenv.mkDerivation {
   name = "haxe-3.1.3";
 
-  buildInputs = [ocaml zlib neko];
+  buildInputs = [ocaml zlib neko camlp4];
 
   src = fetchgit {
     url = "https://github.com/HaxeFoundation/haxe.git";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85035583af9..81700f14669 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3972,7 +3972,9 @@ let
     overrides = config.haskellPackageOverrides or (self: super: {});
   };
 
-  haxe = callPackage ../development/compilers/haxe { };
+  haxe = callPackage ../development/compilers/haxe {
+    inherit (ocamlPackages) camlp4;
+  };
   hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { };
 
   hhvm = callPackage ../development/compilers/hhvm { };

From b6f581a84863a98f0314b80b9809a2eb0e278c05 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jul 2015 11:58:47 +0200
Subject: [PATCH 0233/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/2a867ffd9fe07e45bda9d4bb5b6ed6973c0d5318
 with hackage2nix revision 3606ad40536a2dae452307184b9bd70a2eff8c89

---
 .../haskell-modules/hackage-packages.nix      | 1046 +++++++++++------
 1 file changed, 689 insertions(+), 357 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3d5a00e2d8c..f15a27cec91 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10851,18 +10851,19 @@ self: {
 
   "Network-NineP" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, convertible
-     , monad-loops, mstate, mtl, network, NineP, regex-posix, stateref
-     , transformers
+     , exceptions, monad-loops, monad-peel, mstate, mtl, network, NineP
+     , regex-posix, stateref, transformers
      }:
      mkDerivation {
        pname = "Network-NineP";
-       version = "0.3.0";
-       sha256 = "02igsbmhkpkaxdpdhkl6vb7kzryhg7p5bb59irykz0dkg095wr89";
+       version = "0.4.0";
+       sha256 = "1h6p1p16wvsi6pjpz2xdvbljd394bzpqqfiah7aq9d7f7zh7hzid";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base binary bytestring containers convertible monad-loops mstate
-         mtl network NineP regex-posix stateref transformers
+         base binary bytestring containers convertible exceptions
+         monad-loops monad-peel mstate mtl network NineP regex-posix
+         stateref transformers
        ];
        description = "High-level abstraction over 9P protocol";
        license = "unknown";
@@ -17236,15 +17237,14 @@ self: {
      }:
      mkDerivation {
        pname = "active";
-       version = "0.2.0.3";
-       sha256 = "18z6gki5bjr4847r90aw89j8gkfs0w9dv1w2na4msd36i3jym3sc";
+       version = "0.2.0.4";
+       sha256 = "1xm2y8knqhd883c41194h323vchv4hx57wl32l9f64kf7gdglag0";
        buildDepends = [
          base lens linear semigroupoids semigroups vector
        ];
        testDepends = [
          base lens linear QuickCheck semigroupoids semigroups vector
        ];
-       jailbreak = true;
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18116,8 +18116,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
        pname = "aivika";
-       version = "4.2";
-       sha256 = "0pg1wqssqqdjd0cafimsy8ibmxfyjk16w10ibkj13a6ggzfn75j1";
+       version = "4.3";
+       sha256 = "01vcjc6i040lp92xhxma6sp3iffam9d7nxqch6i64pajvd8cq97j";
        buildDepends = [ array base containers mtl random vector ];
        homepage = "http://github.com/dsorokin/aivika";
        description = "A multi-paradigm simulation library";
@@ -18164,8 +18164,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-chart";
-       version = "4.2";
-       sha256 = "15aqq8mmjybi7kkrfsmablf7ymi328p9y6nsr8pc7sv144fadaf0";
+       version = "4.3";
+       sha256 = "01wfjk4li0l2m7lqs9r6gxsv77wg94vdvipa05qynnsd9ldjnsfd";
        buildDepends = [
          aivika aivika-experiment array base Chart colour containers
          data-default-class filepath lens mtl split
@@ -19452,23 +19452,24 @@ self: {
   "amqp" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, connection
      , containers, data-binary-ieee754, hspec, hspec-expectations
-     , monad-control, network, network-uri, split, text, vector, xml
+     , monad-control, network, network-uri, split, stm, text, vector
+     , xml
      }:
      mkDerivation {
        pname = "amqp";
-       version = "0.12.3";
-       sha256 = "17kvhn6s3grv5ygswkk0x8qclr8j4nxgv04z9q6wac9vydjsaz8m";
+       version = "0.13.0";
+       sha256 = "1qnknyk8xizq5i94s9zv7prqqcpccigc92c6jqqh82y2yqz5xnjj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base binary bytestring clock connection containers
-         data-binary-ieee754 monad-control network network-uri split text
-         vector xml
+         data-binary-ieee754 monad-control network network-uri split stm
+         text vector xml
        ];
        testDepends = [
          base binary bytestring clock connection containers
          data-binary-ieee754 hspec hspec-expectations network network-uri
-         split text vector
+         split stm text vector
        ];
        homepage = "https://github.com/hreinhardt/amqp";
        description = "Client library for AMQP servers (currently only RabbitMQ)";
@@ -19972,15 +19973,15 @@ self: {
 
   "api-builder" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
-     , Cabal, containers, either, hspec, HTTP, http-client, http-conduit
+     , Cabal, containers, hspec, HTTP, http-client, http-conduit
      , http-types, text, transformers
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.7.4.0";
-       sha256 = "0af0ld0rlrpvbl4iw3g5n5bjij5z5jq2sbd9fqila5891qkvb30d";
+       version = "0.9.1.0";
+       sha256 = "1s9qxlinkg80idjcm246kgjg1k43pb4vvs0vd601pgz7im59qb1a";
        buildDepends = [
-         aeson attoparsec base bifunctors bytestring either HTTP http-client
+         aeson attoparsec base bifunctors bytestring HTTP http-client
          http-conduit http-types text transformers
        ];
        testDepends = [
@@ -22116,15 +22117,15 @@ self: {
 
   "aur" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, filepath, lens
-     , lens-aeson, mtl, text, vector, wreq-sb
+     , lens-aeson, mtl, text, vector, wreq
      }:
      mkDerivation {
        pname = "aur";
-       version = "2.0.4";
-       sha256 = "1f6j85nz1mb9cn4l4pqv6jcx42m6rp8fj1g4xrfp8k2y9yyx7hjn";
+       version = "3.0.0";
+       sha256 = "1sf76lysp8xchym78ha4glrw11hxic5g684mm8h6w0n05x1ywxcn";
        buildDepends = [
          aeson aeson-pretty base filepath lens lens-aeson mtl text vector
-         wreq-sb
+         wreq
        ];
        homepage = "https://github.com/fosskers/haskell-aur";
        description = "Access metadata from the Arch Linux User Repository";
@@ -23125,8 +23126,8 @@ self: {
      }:
      mkDerivation {
        pname = "bake";
-       version = "0.3";
-       sha256 = "0h0byqv9m0jp5awbjcad0gggbgp66qqws6qvyfxwzk5jgwdifa0k";
+       version = "0.4";
+       sha256 = "1xxv78i2q9hiw30vkbcx09nabqv88g3a6k872ckm9wk8isrnw2zz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -25750,8 +25751,8 @@ self: {
      }:
      mkDerivation {
        pname = "biostockholm";
-       version = "0.3.2";
-       sha256 = "13rzlb2s3y8vp969s8z1gxmiccvpgrv4yxpim4bjbyc2yblbbnk7";
+       version = "0.3.4";
+       sha256 = "04k7cl8fjsi2mv60p2qg2nmy86z2adw9gzjnkxffqsc1q85y4lz7";
        buildDepends = [
          attoparsec attoparsec-conduit base biocore blaze-builder
          blaze-builder-conduit bytestring conduit containers deepseq
@@ -30868,8 +30869,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.4.16";
-       sha256 = "0mvd80gn6z8iyy8y43drjzmq479zh2zsz3swmlmgvmbvsb1kchlb";
+       version = "6.4.20";
+       sha256 = "1p0nm6gb7hvxvfkgrync1a66zl58s041pgnkly2vx91cpm6yavcm";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -34587,8 +34588,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.2.4.2";
-       sha256 = "1shx58xg4lqf0dj50m2svh132xlzasgg6j175hxk8zf8k1v9b1zl";
+       version = "1.2.4.3";
+       sha256 = "101kbmymsjlpsd9a717fn94y2fjgnxwl9j3cmfrah43g28r45sc8";
        buildDepends = [
          base exceptions lifted-base mmorph mtl resourcet transformers
          transformers-base
@@ -34685,8 +34686,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-combinators";
-       version = "1.0.1";
-       sha256 = "014n3qhn9flwj43zjp62vagp5df9ll6nkjk1x9qpagni1vf9cbqq";
+       version = "1.0.1.1";
+       sha256 = "02x0n4yar1s3x73pbaxs6ghd5kihl3wz3svrvvm24xnmwv5j9aaz";
        buildDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
          conduit conduit-extra filepath monad-control mono-traversable
@@ -34732,8 +34733,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-extra";
-       version = "1.1.9";
-       sha256 = "1bs28gs0xfsqywhm8bchap9zr10wxfrlpdphflhzkm8am2bgz55i";
+       version = "1.1.9.1";
+       sha256 = "18x01yll1jfv1p9kb7529k8gdh0lav4pbqcqkam2qr9jxxdy26rz";
        buildDepends = [
          attoparsec base blaze-builder bytestring conduit directory filepath
          monad-control network primitive process resourcet stm
@@ -34821,12 +34822,17 @@ self: {
      }) {};
 
   "conf" = callPackage
-    ({ mkDerivation, base, haskell-src }:
+    ({ mkDerivation, base, haskell-src, HUnit, test-framework
+     , test-framework-hunit, test-framework-th
+     }:
      mkDerivation {
        pname = "conf";
-       version = "0.1.0.0";
-       sha256 = "15zd72l2izdiw79hldf34pymxc4d9r06db91x6p2mfv2i31wy2n2";
+       version = "0.1.1.0";
+       sha256 = "1mxrr14188ikizyxb06764qq1iwhnh19g150mz310q8yw6cypbfw";
        buildDepends = [ base haskell-src ];
+       testDepends = [
+         base HUnit test-framework test-framework-hunit test-framework-th
+       ];
        jailbreak = true;
        description = "Parser for Haskell-based configuration files";
        license = stdenv.lib.licenses.bsd3;
@@ -38611,8 +38617,8 @@ self: {
      }:
      mkDerivation {
        pname = "dash-haskell";
-       version = "1.1.0.1";
-       sha256 = "1m82zpr37jdqr06ynqz4bbnvy1s81756frcgfiyk4wvlmmcl2fyk";
+       version = "1.1.0.2";
+       sha256 = "1h22ay2cl5j2ngm2xi2hyvvprnmz48qcpzxiq9ldkzx8gg3gs36j";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -39212,12 +39218,11 @@ self: {
      }:
      mkDerivation {
        pname = "data-lens";
-       version = "2.10.6";
-       sha256 = "0pnn84m6xvqvxmqpddsi4db1w65788yrwdkpfm9z1vkkajqixaxj";
+       version = "2.10.7";
+       sha256 = "0l70jzys2qb31cyq3nci97i01ncadkhizxvc9c3psxcd2n28l69v";
        buildDepends = [
          base comonad containers semigroupoids transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/roconnor/data-lens/";
        description = "Used to be Haskell 98 Lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -39266,10 +39271,9 @@ self: {
     ({ mkDerivation, base, data-lens, template-haskell }:
      mkDerivation {
        pname = "data-lens-template";
-       version = "2.1.8";
-       sha256 = "0w8x5zn3d98z0q74bqfgkb9s0ca9hd1xc53gjl759s77wm4iwa0q";
+       version = "2.1.9";
+       sha256 = "0dpj3a1dj5l5jll2f0flj3wss9h2jbsljihrwh68zbb92pcgb56g";
        buildDepends = [ base data-lens template-haskell ];
-       jailbreak = true;
        homepage = "http://github.com/roconnor/data-lens-template/";
        description = "Utilities for Data.Lens";
        license = stdenv.lib.licenses.bsd3;
@@ -39877,14 +39881,21 @@ self: {
      }) {};
 
   "datetime" = callPackage
-    ({ mkDerivation, base, old-locale, old-time, QuickCheck, time }:
+    ({ mkDerivation, base, HUnit, old-locale, old-time, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , time
+     }:
      mkDerivation {
        pname = "datetime";
-       version = "0.2.1";
-       sha256 = "1yfg3wvi13r725dhfsmcdw4ns3cgl2ayrb5jck0q8b4crk2dlrzg";
-       buildDepends = [ base old-locale old-time QuickCheck time ];
-       homepage = "http://github.com/esessoms/datetime";
-       description = "Utilities to make Data.Time.* easier to use.";
+       version = "0.3.1";
+       sha256 = "0jmxxmv5s9rch84ivfjhqxdqnvqqzvabjs152wyv47h5qmvpag1k";
+       buildDepends = [ base old-locale old-time time ];
+       testDepends = [
+         base HUnit old-locale old-time QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 time
+       ];
+       homepage = "http://github.com/stackbuilders/datetime";
+       description = "Utilities to make Data.Time.* easier to use";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -40475,8 +40486,8 @@ self: {
      }:
      mkDerivation {
        pname = "debian-build";
-       version = "0.7.1.1";
-       sha256 = "0r2f14h0bpbq861jfa0rgp0y87nq142f80dyjzyzzrdwc8szj120";
+       version = "0.7.2.1";
+       sha256 = "1x3jvrz5y85m9mnp5b8b85f4magbxa4r0yhkw30vgcljph6v7mfm";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -40937,18 +40948,19 @@ self: {
      }) {};
 
   "delta" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, sodium
-     , time
+    ({ mkDerivation, base, containers, directory, filepath
+     , optparse-applicative, process, sodium, time
      }:
      mkDerivation {
        pname = "delta";
-       version = "0.1.2.0";
-       revision = "1";
-       sha256 = "1yk4cb21n4kq0wvsw6lw8s8sc69gnmzfdn9f5zgwsknza0vayi39";
-       editedCabalFile = "5f7c4ae62f0d0758b892ac7002bc31eebfc4e4dcbe1ff141f0135daf5788e6e9";
+       version = "0.2.1.1";
+       sha256 = "06msfi733jmqqgxyx5p4mifjgxrgh0x8ls4j0fkcan5377sydjcv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers directory filepath sodium time ];
+       buildDepends = [
+         base containers directory filepath optparse-applicative process
+         sodium time
+       ];
        homepage = "https://github.com/kryoxide/delta";
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.gpl3;
@@ -41491,8 +41503,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-builder";
-       version = "0.7.1";
-       sha256 = "1cfmklds0l2jyn7p2hldq0riq4m01dxfg9cran6sx65a7d82x96d";
+       version = "0.7.1.1";
+       sha256 = "1klmmh144bdwrg3zs45l6yy1li64r60jygqspxzyzlm8pfgzvgah";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -41502,7 +41514,6 @@ self: {
          lucid-svg mtl split transformers
        ];
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41517,15 +41528,14 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-cairo";
-       version = "1.3.0.2";
-       sha256 = "1ja089hnq24fx5sd5r3r2z76pmwk5w6j93b7hha7m4jylcdjcnpp";
+       version = "1.3.0.3";
+       sha256 = "0962kz1b45hycjij90yxq88wa5qsdll82h16agzf0pm16j8r4v5s";
        buildDepends = [
          base bytestring cairo colour containers data-default-class
          diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
          optparse-applicative pango split statestack transformers unix
          vector
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41538,14 +41548,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-canvas";
-       version = "1.3.0.1";
-       sha256 = "0ik2kfgs5fi1a51hn9g5sii0n4j9lb0xd9paydz342b7zizy0w70";
+       version = "1.3.0.2";
+       sha256 = "1jklgvkmdhg5ari577jh5y7vr54wjdwyz2hql1n1icbfba5d6p0c";
        buildDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
          optparse-applicative statestack text
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41562,8 +41571,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-contrib";
-       version = "1.3.0.3";
-       sha256 = "0sl99ikghfmiwa51iyacgrma844dqn44iw7c9ahx70r4l8j8is2q";
+       version = "1.3.0.4";
+       sha256 = "0mr4m4kl028jxrjldn38kq7zsph6vqwzdjhxd0rznzbwpsnvsnkf";
        buildDepends = [
          base circle-packing colour containers data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -41574,7 +41583,6 @@ 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;
@@ -41587,13 +41595,12 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-core";
-       version = "1.3.0.1";
-       sha256 = "1whig632hx03ysiqidaxf29r67xl2skw0pkx454s036gdwl7sqj2";
+       version = "1.3.0.2";
+       sha256 = "0lrzphpia24dk1mxv33c9f5iy18r5d0lfsw92422nhbs36dslyzm";
        buildDepends = [
          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;
@@ -41621,8 +41628,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-haddock";
-       version = "0.3.0.5";
-       sha256 = "00118bnxkgfg4s4h825bl9v1mdb8cfv27l6licmx8z0dch3all9k";
+       version = "0.3.0.6";
+       sha256 = "0pa83kd1b1fnj9plwmz8gsi2nm35ghdsxdxi4w4f7shsgc64nhrj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -41635,7 +41642,6 @@ 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;
@@ -41667,14 +41673,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-html5";
-       version = "1.3.0.1";
-       sha256 = "1b6qrhqangdd2j3hzgslkq2sgk9wgk9ll9znfcmxpzc9k04aanqc";
+       version = "1.3.0.2";
+       sha256 = "18ifqv5xkk9cd86d3mir1qka2jy35vj4hqycq44z96hhp50yl29j";
        buildDepends = [
          base cmdargs containers data-default-class diagrams-core
          diagrams-lib lens mtl NumInstances optparse-applicative split
          statestack static-canvas text
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41691,8 +41696,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-lib";
-       version = "1.3.0.1";
-       sha256 = "04s21ms9w521fhm7hralq155lwisjv1pszz4cvpl3hc1jm1vwfa3";
+       version = "1.3.0.2";
+       sha256 = "1gvvyzpzzdwzvrh452l6r2709qpbdzx1fi1ysvzalywi3gib69ds";
        buildDepends = [
          active adjunctions array base colour containers data-default-class
          diagrams-core diagrams-solve directory distributive dual-tree
@@ -41701,7 +41706,6 @@ self: {
          process semigroups system-filepath 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;
@@ -41755,14 +41759,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-postscript";
-       version = "1.3.0.1";
-       sha256 = "0w6ck71hjjx0rl930v2wapznjvrg5jq538gnyidp2yshik8xh2rp";
+       version = "1.3.0.2";
+       sha256 = "0cdhs5ia6jm89h1bxgqm1w9gkjqnw6g0nw13vjasj0fh08nayk7s";
        buildDepends = [
          base containers data-default-class diagrams-core diagrams-lib dlist
          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;
@@ -41791,14 +41794,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-rasterific";
-       version = "1.3.1.2";
-       sha256 = "1shkwhi7yv8cmv8697z7qqax0z7brcmjqlc17hldfflzwniiyk81";
+       version = "1.3.1.3";
+       sha256 = "1gkapj3n2xyy13a819zbckslvv8k5jkdlz7x2dzhcganra9gkcki";
        buildDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
          optparse-applicative Rasterific split unix
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
@@ -41837,15 +41839,14 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.3.1.3";
-       sha256 = "0migb5vjlslbxlmbqxl0qdrpsi0ghbiq86rjna57g804r149n7ni";
+       version = "1.3.1.4";
+       sha256 = "009xn6q9qwgi3l4v0rm79309i91m1s0jbng34bbli29s6vzwgjmz";
        buildDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
          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;
@@ -44109,6 +44110,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "draw-poker" = callPackage
+    ({ mkDerivation, base, random-shuffle, safe }:
+     mkDerivation {
+       pname = "draw-poker";
+       version = "0.1.0.1";
+       revision = "1";
+       sha256 = "16b17qfj3bah468hqsksk2rhyl33m2vyqw0rrs1wyaz75yq35257";
+       editedCabalFile = "62a11039e0b634f0b372c28d87f6fe84f40a33981211c9f2bc077135abcef629";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base random-shuffle safe ];
+       testDepends = [ base ];
+       homepage = "http://tune.hateblo.jp/entry/2015/05/12/023112";
+       description = "playing draw poker";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "drawille" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck }:
      mkDerivation {
@@ -44403,17 +44421,16 @@ self: {
      }) {};
 
   "dtw" = callPackage
-    ({ mkDerivation, base, containers, MemoTrie, QuickCheck
-     , test-framework, test-framework-quickcheck2, thyme, vector
-     , vector-space
+    ({ mkDerivation, base, containers, QuickCheck, test-framework
+     , test-framework-quickcheck2, thyme, vector, vector-space
      }:
      mkDerivation {
        pname = "dtw";
-       version = "1.0.0.0";
-       sha256 = "0kcb773sly86lkvnb3ihsswrz432phi3ccizwbf1phzf72kdflzr";
-       buildDepends = [ base containers MemoTrie vector vector-space ];
+       version = "1.0.1.0";
+       sha256 = "15qk8r958pssgwqhxffw45vm5bpvv9wfarv9spaplrnb3sm5bzhk";
+       buildDepends = [ base containers vector vector-space ];
        testDepends = [
-         base containers MemoTrie QuickCheck test-framework
+         base containers QuickCheck test-framework
          test-framework-quickcheck2 thyme vector vector-space
        ];
        jailbreak = true;
@@ -44433,6 +44450,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dump" = callPackage
+    ({ mkDerivation, base, haskell-src-meta, hspec
+     , interpolatedstring-perl6, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "dump";
+       version = "0.2.6";
+       sha256 = "0rhjx4g83pbm0zfqgz8ykfccaq8wa7wspjc6k1n4d1bgcwkc617y";
+       buildDepends = [
+         base haskell-src-meta interpolatedstring-perl6 template-haskell
+         text
+       ];
+       testDepends = [
+         base haskell-src-meta hspec interpolatedstring-perl6
+         template-haskell text
+       ];
+       homepage = "https://github.com/Wizek/dump";
+       description = "Dumps the names and values of expressions to ease debugging";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "duplo" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
      , base64-bytestring, bytestring, containers, directory
@@ -44740,8 +44778,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamic-pp";
-       version = "0.1.0";
-       sha256 = "1i01k8c75yxdmxz3db4kajpqbgl8lcbfsp9rb9q2kzbk44fc2zpc";
+       version = "0.2.0";
+       sha256 = "03y9sl3xcnp1ixi4y0i1a7frd2bgfvnb0r4pqjs38bvjkz96bbdd";
        buildDepends = [
          ansi-terminal base blaze-builder bytestring Cabal hashable
          unordered-containers utf8-string
@@ -45475,16 +45513,21 @@ self: {
      }) { eibclient = null;};
 
   "eigen" = callPackage
-    ({ mkDerivation, base, bytestring, primitive, vector }:
+    ({ mkDerivation, base, binary, bytestring, mtl, primitive
+     , transformers, vector
+     }:
      mkDerivation {
        pname = "eigen";
-       version = "2.1.0";
-       sha256 = "14amg4g7gxsi529hz5ilhv8b8nzs8p2ypmxh21hq5x4sfnsl4n07";
-       buildDepends = [ base bytestring primitive vector ];
-       testDepends = [ base primitive vector ];
-       jailbreak = true;
+       version = "2.1.6";
+       sha256 = "0287j907pasjb7w7bwr6snb4qic7j14msxhps445yjfkqa2arzfz";
+       buildDepends = [
+         base binary bytestring primitive transformers vector
+       ];
+       testDepends = [
+         base binary bytestring mtl primitive transformers vector
+       ];
        homepage = "https://github.com/osidorkin/haskell-eigen";
-       description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)";
+       description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -45848,17 +45891,17 @@ self: {
 
   "elm-init" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , directory, file-embed, filepath, text
+     , directory, file-embed, filepath, text, time
      }:
      mkDerivation {
        pname = "elm-init";
-       version = "0.1.2.1";
-       sha256 = "0x5p5jwxz07m515421xpcw777lgc3bx40mnl0y9fdw2gz4f3svs2";
+       version = "1.0.1.0";
+       sha256 = "0jvdln18dhsxly33ysy1vv1740ri1576x44jn10gjva432rp8rwx";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          aeson aeson-pretty base bytestring containers directory file-embed
-         filepath text
+         filepath text time
        ];
        description = "Set up basic structure for an elm project";
        license = stdenv.lib.licenses.mit;
@@ -46323,6 +46366,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "engine-io-wai" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, engine-io
+     , http-types, mtl, text, transformers, unordered-containers, wai
+     , wai-websockets, websockets
+     }:
+     mkDerivation {
+       pname = "engine-io-wai";
+       version = "1.0.0";
+       sha256 = "0g9h0r2i1lldmdkpnzlqjhxr7jd0v2s2w4gmsw83k1ahr6ia0dg7";
+       buildDepends = [
+         attoparsec base bytestring engine-io http-types mtl text
+         transformers unordered-containers wai wai-websockets websockets
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "engine-io-yesod" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , engine-io, http-types, text, unordered-containers, wai
@@ -46615,11 +46674,10 @@ self: {
     ({ mkDerivation, base, exceptions, mtl }:
      mkDerivation {
        pname = "eprocess";
-       version = "1.7.0";
-       sha256 = "1h4ajq1rraiz7qw7350128n26jnqhzk9iyjzqc3lnbyx87q8j73v";
+       version = "1.7.2";
+       sha256 = "190qgsqj41dbkphjrgljif7q0zjm9ddp8wawc9wx8qklb897jrvj";
        buildDepends = [ base exceptions mtl ];
-       jailbreak = true;
-       description = "*Very* basic Erlang-like process support for Haskell";
+       description = "Basic Erlang-like process support for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -48094,8 +48152,8 @@ self: {
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.3";
-       sha256 = "12n67ibj6zk7r8hzk0vn6ijfr926h0g6jkwn5krkp79xzdq82apr";
+       version = "1.3.1";
+       sha256 = "1yhd4f4p8f4nfj24rka8rfhr8s86mjpj019f3lbqkr9hnl1crj4l";
        buildDepends = [ base directory filepath process time unix ];
        testDepends = [ base directory filepath QuickCheck time unix ];
        homepage = "https://github.com/ndmitchell/extra#readme";
@@ -48513,8 +48571,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.23.1.7";
-       sha256 = "1yjpbbxxjz8hrqb3arcn74i9s936kr44zg2v27kxmhrin4lnrw4b";
+       version = "0.23.1.8";
+       sha256 = "1772gdqka5hcgs2bq76bba9pca5xx32q3fg9vvkjqd5249rk5gv6";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -50607,8 +50665,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.1.0";
-       sha256 = "184arkpffi2z7dayplc47nvyabzr5sig4zs8hc4lilcklv4q9zn6";
+       version = "1.1.1";
+       sha256 = "01zqlb3hh5jsq49ax08nkwvysqq4fgkxpz4sdcman9y9fnxgwjgg";
        buildDepends = [
          base bytestring containers mwc-random primitive profunctors text
          transformers vector
@@ -50786,10 +50844,9 @@ self: {
      }:
      mkDerivation {
        pname = "force-layout";
-       version = "0.4.0.1";
-       sha256 = "1qchmhn6hp91gzds6yqjn4kssp7n3g7vqhl919wf8d3nn4ykz3av";
+       version = "0.4.0.2";
+       sha256 = "0lncciqizp55if5ivlcbv5lqj21hlp2vfi40iagjswf2apxi0w0g";
        buildDepends = [ base containers data-default-class lens linear ];
-       jailbreak = true;
        description = "Simple force-directed layout";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52222,13 +52279,15 @@ self: {
      }:
      mkDerivation {
        pname = "fwgl";
-       version = "0.1.1.0";
-       sha256 = "07ml9f8x4rw7wg6wib63nayh8mpszrkx0zal9zz0cpjh2f85n10a";
+       version = "0.1.2.0";
+       revision = "1";
+       sha256 = "1b18xzxbbrnmmvjgmzhy5r4ww7rvbli76m7vh3li30fb95k1sznr";
+       editedCabalFile = "d97edefc7ee59578d181dfc36d85b1a82a6e0c9ed1bb602918655a3439a5eb51";
        buildDepends = [
          base hashable transformers unordered-containers vector Yampa
        ];
        jailbreak = true;
-       homepage = "https://github.com/ZioCrocifisso/FWGL";
+       homepage = "https://github.com/ziocroc/FWGL";
        description = "FRP 2D/3D game engine";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52239,16 +52298,16 @@ self: {
      }:
      mkDerivation {
        pname = "fwgl-glfw";
-       version = "0.1.0.3";
+       version = "0.1.0.4";
        revision = "1";
-       sha256 = "1zmvw7945lkghavik72w096rqh8ivjyb9h6j98yjvlj6xf85bsq0";
-       editedCabalFile = "f2a35fcd71bbea225624cf3b6d1f78647e103a1ee1edcc0a7eb9e27b0c4642d8";
+       sha256 = "1pph1arlmi905rkcjcn3yf5ypdmk82363vgdmwg26dbrb2sb4cs8";
+       editedCabalFile = "26e4026f5ac7fe57292c5df79d35894b736728c31cad845f11641d833f789fb8";
        buildDepends = [
          base fwgl gl GLFW-b hashable JuicyPixels transformers
          unordered-containers vector Yampa
        ];
        jailbreak = true;
-       homepage = "https://github.com/ZioCrocifisso/FWGL";
+       homepage = "https://github.com/ziocroc/FWGL";
        description = "FWGL GLFW backend";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52259,13 +52318,13 @@ self: {
      }:
      mkDerivation {
        pname = "fwgl-javascript";
-       version = "0.1.0.2";
-       sha256 = "1vgc3dqm0pqac8l17w0fi4xv2rx2bik6n405qzarjnjlyp7czqcm";
+       version = "0.1.0.4";
+       sha256 = "1bwg6dzp2kgny5s6zygdi120pcrdclql22rgp43vhwim5aqkp9d7";
        buildDepends = [
          base fwgl ghcjs-base hashable unordered-containers Yampa
        ];
        jailbreak = true;
-       homepage = "https://github.com/ZioCrocifisso/FWGL";
+       homepage = "https://github.com/ziocroc/FWGL";
        description = "FWGL GHCJS backend";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
@@ -56765,8 +56824,8 @@ self: {
     ({ mkDerivation, base, hierarchical-clustering }:
      mkDerivation {
        pname = "gsc-weighting";
-       version = "0.2";
-       sha256 = "1mdm0n96gy00wf7lv6c0qxk9bi1ahf58vzrgnh3jfiwhzjivcvlj";
+       version = "0.2.2";
+       sha256 = "0y80j5qk601c965assl8d91k9bpvzijn2z0w64n2ksij9lm6b8p5";
        buildDepends = [ base hierarchical-clustering ];
        description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting";
        license = stdenv.lib.licenses.bsd3;
@@ -56931,20 +56990,20 @@ self: {
 
   "gtk-mac-integration" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk
-     , gtk-mac-integration, gtk2hs-buildtools, mtl
+     , gtk-mac-integration-gtk2, gtk2hs-buildtools, mtl
      }:
      mkDerivation {
        pname = "gtk-mac-integration";
-       version = "0.3.0.2";
-       sha256 = "05pihi7fc413j8iwwrdb7p1ckxsjzd8cvayk76hhwnqcyykvjlr5";
+       version = "0.3.1.1";
+       sha256 = "02s5ksr8fkqlbwlq468v93w0is1xa73wswgxahyyvhh51wnqp3ax";
        buildDepends = [ array base containers glib gtk mtl ];
        buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtk-mac-integration ];
+       pkgconfigDepends = [ gtk-mac-integration-gtk2 ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gtk-mac-integration = null;};
+     }) { gtk-mac-integration-gtk2 = null;};
 
   "gtk-serialized-event" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk, haskell98, mtl
@@ -57189,8 +57248,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3-mac-integration";
-       version = "0.3.0.3";
-       sha256 = "1jzkx10mmmxxv1ys9ywr2sfpy0pxvy8276pbkh0xnypxsyd2sfdn";
+       version = "0.3.1.1";
+       sha256 = "0j6fpzk1gq1y15cjpkq3k1azkn7xvlqiidn3m0g9czz5iy303adv";
        buildDepends = [ array base containers glib gtk3 mtl ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ gtk-mac-integration-gtk3 ];
@@ -58798,8 +58857,8 @@ self: {
      }:
      mkDerivation {
        pname = "hailgun";
-       version = "0.4.0.1";
-       sha256 = "1jwk8rip8d96ivkv2k3dzmppid8dyvkrhgkjrxawgvwjzavfwwfn";
+       version = "0.4.0.3";
+       sha256 = "1c4fd116xhkw0hknzfyxyw7v62wjixcdbdidx804rs8g8f3c5p1c";
        buildDepends = [
          aeson base bytestring email-validate exceptions filepath
          http-client http-client-tls http-types tagsoup text time
@@ -61064,10 +61123,9 @@ self: {
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "haskell-coffee";
-       version = "0.1.0.1";
-       sha256 = "0g95vhqga7hq6w6x993d29wpphcqidmm0vzni93blqka7yfc7ybb";
+       version = "0.1.0.2";
+       sha256 = "1iz94kyq1xn3v89aay282qglv2sh41b04p8vaygwm22v1g4b4kk7";
        buildDepends = [ base process ];
-       jailbreak = true;
        description = "Simple CoffeeScript API";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -61286,8 +61344,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-neo4j-client";
-       version = "0.3.1.2";
-       sha256 = "1qb2m6bxpw24ll1r0hyicmddn9plm55ipdgbykd6yrw1cfrm9qz7";
+       version = "0.3.1.3";
+       sha256 = "0ws1mlf97b4xbysgvm4b3h15kfvk1mjdcxmcchl09c04wadaz86s";
        buildDepends = [
          aeson base bytestring containers data-default hashable HTTP
          http-conduit http-types lifted-base mtl network-uri resourcet
@@ -63060,8 +63118,8 @@ self: {
      }:
      mkDerivation {
        pname = "haxr";
-       version = "3000.11.1";
-       sha256 = "07rz03n0v9nflzid0vx5qh5hc7fmlq9c9kkk35slljv7lwmxw0qh";
+       version = "3000.11.1.1";
+       sha256 = "0a4ad0h45a6jv1x19ss0p6krhq040164cvvaivf0zba5q4ifmffh";
        buildDepends = [
          array base base-compat base64-bytestring blaze-builder bytestring
          HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat
@@ -63947,8 +64005,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.6.8";
-       sha256 = "0n6x7dbdbfrxn3y6q9vp7x6vqgdc9nb3w85xjmim7agdf088zzh6";
+       version = "0.6.9";
+       sha256 = "0yciwxsnqc8d09356fisfb44nbzsnvi01aad86gbx4vhrdnw7n7a";
        buildDepends = [
          attoparsec base BoundedChan bytestring bytestring-lexing mtl
          network resource-pool time vector
@@ -64100,14 +64158,15 @@ self: {
      mkDerivation {
        pname = "heist";
        version = "0.14.1.1";
+       revision = "1";
        sha256 = "0hwf8d20lw4gn5mal8iqd62npr2859541h3md451hjlbwpjyqd19";
+       editedCabalFile = "51f2aa86d7582ba504e26ead511da54db5350cf4bed7f13252c678c0cf19d400";
        buildDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist either filepath hashable
          map-syntax MonadCatchIO-transformers mtl process random text time
          transformers unordered-containers vector xmlhtml
        ];
-       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "An Haskell template system supporting both HTML5 and XML";
        license = stdenv.lib.licenses.bsd3;
@@ -65411,8 +65470,8 @@ self: {
      }:
      mkDerivation {
        pname = "hierarchical-clustering";
-       version = "0.4.4";
-       sha256 = "1hm47fccji8dn70477ww7s6846mxrmgr5n056c11dh9azz5jl5x2";
+       version = "0.4.6";
+       sha256 = "1cfcrnxqczqzqgpyipsw9dwfw1j75zd11vpd12i533f3p44pzwbm";
        buildDepends = [ array base containers ];
        testDepends = [ base hspec HUnit QuickCheck ];
        description = "Fast algorithms for single, average/UPGMA and complete linkage clustering";
@@ -65426,8 +65485,8 @@ self: {
      }:
      mkDerivation {
        pname = "hierarchical-clustering-diagrams";
-       version = "0.3";
-       sha256 = "0yq3sh6xn3p1jzp3w33zv1sx7yhv9v2ddcqd27cl3rm6lhph81jc";
+       version = "0.3.2";
+       sha256 = "06ncyzhql74ni746a9hzma1v0grw99vas4xglmyvgd6yhdwl08sr";
        buildDepends = [ base diagrams-lib hierarchical-clustering ];
        testDepends = [
          base diagrams-cairo diagrams-lib hierarchical-clustering hspec
@@ -65518,6 +65577,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "highjson" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, hashable
+     , hspec, hvect, scientific, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "highjson";
+       version = "0.1.0.0";
+       sha256 = "1j0gcbgawimzr8vvglikmdr8q58zvvak68k8221ljydppanc30k0";
+       buildDepends = [
+         attoparsec base bytestring containers hashable hvect scientific
+         text unordered-containers vector
+       ];
+       testDepends = [ base hspec text ];
+       homepage = "https://github.com/agrafix/highjson";
+       description = "Very fast JSON parsing";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "highlight-versions" = callPackage
     ({ mkDerivation, ansi-terminal, base, Cabal, containers, hackage-db
      }:
@@ -65850,10 +65927,9 @@ self: {
      }:
      mkDerivation {
        pname = "hint-server";
-       version = "1.4.0";
-       sha256 = "0iirk76n9j4iwll44gs4spnssv2kkxrw4ypp228gap5h4pyimvx5";
+       version = "1.4.1";
+       sha256 = "1b7dzij1c4940m00kbpnmymh6grd54d2xsgsi1d10x22bl7naq7m";
        buildDepends = [ base eprocess exceptions hint monad-loops mtl ];
-       jailbreak = true;
        description = "A server process that runs hint";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67233,10 +67309,8 @@ self: {
      }:
      mkDerivation {
        pname = "hnix";
-       version = "0.2.0";
-       revision = "1";
-       sha256 = "02aygnc0hhg3gsj9z323pq6i6v9ijjj5r6i8g1zx1cnwd51dw1aj";
-       editedCabalFile = "8267f50b3b3fc9736bb1e942fbe425a1a4ef2b96a6b906dff18496ce1e0578d6";
+       version = "0.2.1";
+       sha256 = "1y10w6ylgrdgy271a372f14rqdkvzlmpkjl08d5zg3r84jxhy6ia";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -70219,26 +70293,31 @@ self: {
 
   "hsdev" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base
-     , bytestring, Cabal, containers, deepseq, directory, exceptions
-     , filepath, ghc, ghc-mod, ghc-paths, haddock-api, haskell-src-exts
-     , hdocs, HTTP, lens, monad-loops, mtl, network, process
-     , regex-pcre-builtin, scientific, template-haskell, text, time
-     , transformers, uniplate, unix, unordered-containers, vector
+     , bin-package-db, bytestring, Cabal, containers, deepseq, directory
+     , exceptions, filepath, fsnotify, ghc, ghc-mod, ghc-paths
+     , haddock-api, haskell-src-exts, hdocs, hlint, HTTP, lens
+     , monad-loops, MonadCatchIO-transformers, mtl, network, process
+     , regex-pcre-builtin, scientific, simple-log, system-filepath
+     , template-haskell, text, time, transformers, uniplate, unix
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.3.4";
-       sha256 = "1m21wwl93sba113qr733a9qpxc0ljrn6mpd17760gzxpa5vhfjqd";
+       version = "0.1.4.0";
+       sha256 = "1m7pfrzi23wq7b3bwp4fc885di96gkg453q8xmlwdip37mh2swgz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson aeson-pretty array attoparsec base bytestring Cabal
-         containers deepseq directory exceptions filepath ghc ghc-mod
-         ghc-paths haddock-api haskell-src-exts hdocs HTTP lens monad-loops
-         mtl network process regex-pcre-builtin scientific template-haskell
-         text time transformers uniplate unix unordered-containers vector
+         aeson aeson-pretty array attoparsec base bin-package-db bytestring
+         Cabal containers deepseq directory exceptions filepath fsnotify ghc
+         ghc-mod ghc-paths haddock-api haskell-src-exts hdocs hlint HTTP
+         lens monad-loops MonadCatchIO-transformers mtl network process
+         regex-pcre-builtin scientific simple-log system-filepath
+         template-haskell text time transformers uniplate unix
+         unordered-containers vector
        ];
        testDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc";
        license = stdenv.lib.licenses.bsd3;
@@ -72471,8 +72550,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.16";
-       sha256 = "1ghz498h3c0n1wfkxgkh9zd8l6yik650505hihnayp4wcykc1p82";
+       version = "0.4.18";
+       sha256 = "0skla9kvlak482fsk21gz57jcwc568x3q62nkanxjn1pgxc1jili";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -72646,8 +72725,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit";
-       version = "2.1.5.1";
-       sha256 = "1rpp830319hqqazf1gh28jh239a67qksmx2ki3p91h9nsa8lh6w2";
+       version = "2.1.7";
+       sha256 = "1qdxd9dbzav7nky8s9ml6ik6i38mxzzg7dwj0pv1sp5prclk0jh1";
        buildDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -73557,12 +73636,12 @@ self: {
     ({ mkDerivation, base, HTF }:
      mkDerivation {
        pname = "hvect";
-       version = "0.1.0.0";
-       sha256 = "12zwrzz0bk83i42q3iv5cs2dma2a80s8zkjyill0ysxyrjni25wy";
+       version = "0.2.0.0";
+       sha256 = "01iarjnwm5syhmf6552g3p9dc05nqc74r4nfmagajgv7fnlsf3ri";
        buildDepends = [ base ];
        testDepends = [ base HTF ];
        homepage = "https://github.com/agrafix/hvect";
-       description = "Simple heterogeneous lists";
+       description = "Simple strict heterogeneous lists";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -74613,7 +74692,9 @@ self: {
      mkDerivation {
        pname = "ib-api";
        version = "0.1.0.0";
+       revision = "1";
        sha256 = "1030bj90myx5x3y297qmlmnzppfnh5d3cmwglqj1s7i6nyrh86k5";
+       editedCabalFile = "7cb1fe96767e6253ef55d4997404eb3f4048f1b9bfccfb9e6cca627a734c3bcd";
        buildDepends = [ attoparsec base bytestring network ];
        jailbreak = true;
        homepage = "https://github.com/rbermani/ib-api";
@@ -75937,8 +76018,8 @@ self: {
      }:
      mkDerivation {
        pname = "inflections";
-       version = "0.1.0.10";
-       sha256 = "0v9iz9q4f5cx2hr0afvbzy5ax71kx1klbjrla14bqdfh55hzdhrp";
+       version = "0.2.0.0";
+       sha256 = "16s2sj2417qmhdlzn7j51yf7fh50f5msgb50fsavw80845602x43";
        buildDepends = [ base containers parsec ];
        testDepends = [
          base containers HUnit parsec QuickCheck test-framework
@@ -76026,6 +76107,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "inilist" = callPackage
+    ({ mkDerivation, base, bifunctors, containers, deepseq, HUnit, safe
+     , tasty, tasty-hunit, testpack, trifecta
+     }:
+     mkDerivation {
+       pname = "inilist";
+       version = "0.1.0.0";
+       sha256 = "18f93kvc5x0y1wqcicrh510r3skldf52jn0n6cxyn7fk2271cc1b";
+       buildDepends = [ base bifunctors containers safe trifecta ];
+       testDepends = [
+         base bifunctors containers deepseq HUnit safe tasty tasty-hunit
+         testpack trifecta
+       ];
+       homepage = "https://chiselapp.com/user/mwm/repository/inilist";
+       description = "Processing for .ini files with duplicate sections and options";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "inject" = callPackage
     ({ mkDerivation, attoparsec, base, hspec, hspec-expectations
      , process, text
@@ -76162,13 +76261,12 @@ self: {
      }:
      mkDerivation {
        pname = "instant-aeson";
-       version = "0.1";
-       sha256 = "1idxwd0wxy6xziwlwnjwgbv9canpvwbnigrcjn3kvl0j7nld6wvj";
+       version = "0.1.0.1";
+       sha256 = "18zxvd4sw13j4gn2f7r2xdy6p0xayjv3ks8j97j7vi6cdw9aqw2z";
        buildDepends = [ aeson base instant-generics ];
        testDepends = [
          aeson base instant-generics tasty tasty-quickcheck
        ];
-       jailbreak = true;
        description = "Generic Aeson instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76179,13 +76277,12 @@ self: {
      }:
      mkDerivation {
        pname = "instant-bytes";
-       version = "0.1";
-       sha256 = "0gjj7ix1dxlbk1im2ww3qpfx4m40vg0hl7n9ribnlx2krw53mmm1";
+       version = "0.1.0.1";
+       sha256 = "1g99yakjychx12amls2b6cfma0fzh0n9w4m2k03wqibk1aagl940";
        buildDepends = [ base bytes instant-generics ];
        testDepends = [
          base bytes instant-generics tasty tasty-quickcheck
        ];
-       jailbreak = true;
        description = "Generic Serial instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76194,10 +76291,9 @@ self: {
     ({ mkDerivation, base, deepseq, instant-generics }:
      mkDerivation {
        pname = "instant-deepseq";
-       version = "0.1";
-       sha256 = "13w4ilnjm6m9idqkxzp0l91f156n097zlhmpny1lamy5brvzpls0";
+       version = "0.1.0.1";
+       sha256 = "1yv5zqv2fqj8b7qzx2004sa287mrvrswmghl13vsbj2whmdh0kjz";
        buildDepends = [ base deepseq instant-generics ];
-       jailbreak = true;
        description = "Generic NFData instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76219,10 +76315,9 @@ self: {
     ({ mkDerivation, base, hashable, instant-generics }:
      mkDerivation {
        pname = "instant-hashable";
-       version = "0.1";
-       sha256 = "0bqn9na0pxkkffmwwz6p4rgv11fq2mn724sk4l7nxv44k7vrirz2";
+       version = "0.1.0.1";
+       sha256 = "1yaf24r68zh5vsp73747hbv2fdk9y9vgswj6lv22s52s8h6f1agj";
        buildDepends = [ base hashable instant-generics ];
-       jailbreak = true;
        description = "Generic Hashable instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76477,13 +76572,13 @@ self: {
      }:
      mkDerivation {
        pname = "interpolatedstring-perl6";
-       version = "0.9.0";
-       sha256 = "15hzmni3wfdgjl0vyk5mcld61ba99wdax87s7wkz2s8bsyxkbq9n";
+       version = "1.0.0";
+       sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35";
        buildDepends = [
          base bytestring haskell-src-meta template-haskell text
        ];
        description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "interpolatedstring-qq" = callPackage
@@ -77115,6 +77210,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "irc-fun-color" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "irc-fun-color";
+       version = "0.1.0.0";
+       sha256 = "1zb3d3m17049g7cfnpnl8c1ldyhhwvxh99dbfx1xzyadg841i08a";
+       buildDepends = [ base ];
+       testDepends = [ base ];
+       homepage = "http://rel4tion.org/projects/irc-fun-color/";
+       description = "Add color and style decorations to IRC messages";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "ircbot" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , irc, mtl, network, parsec, random, SafeSemaphore, stm, time, unix
@@ -78432,18 +78540,21 @@ self: {
      }) {};
 
   "jsaddle" = callPackage
-    ({ mkDerivation, base, hslogger, lens, template-haskell, text
-     , transformers
+    ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell
+     , text, transformers, webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.2.0.5";
-       sha256 = "0avl5gvq3sv2fk524hazfk1xgb9rlyqqqrvnxb63psjds7s6rxp1";
-       buildDepends = [ base lens template-haskell text transformers ];
+       version = "0.2.0.6";
+       sha256 = "1ggnhv9lgsd330p1k6zvg20dbqb1ysh282nalxramqvn2yhmqsx4";
+       buildDepends = [
+         base lens template-haskell text transformers webkitgtk3
+         webkitgtk3-javascriptcore
+       ];
        testDepends = [
-         base hslogger lens template-haskell text transformers
+         base glib gtk3 hslogger lens template-haskell text transformers
+         webkitgtk3 webkitgtk3-javascriptcore
        ];
-       jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -78747,8 +78858,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-server";
-       version = "0.2.0.0";
-       sha256 = "08v2bvswn0a0jhd0gd83f2lxr0n0nirl9xav7zj3y3bjdkxwlkys";
+       version = "0.2.1.0";
+       sha256 = "1rbm8anj3lg3x7gky5nazxcsdwd5c48b1axphgcqzzy5hn8hsg2r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -80820,15 +80931,14 @@ self: {
      }:
      mkDerivation {
        pname = "lambdacms-core";
-       version = "0.1.0.0";
-       sha256 = "0f34158j493ga5zrl1fxqyxvxfj3gzx77vs3p9rb7syn7c1zxa53";
+       version = "0.3.0.0";
+       sha256 = "069mj7p3996bkl0vyj1bpphb6gs85r234svls9rzg2lgpxfp4gga";
        buildDepends = [
          base blaze-html bytestring containers data-default esqueleto
          file-embed friendly-time gravatar lists mime-mail old-locale
          persistent shakespeare template-haskell text time uuid wai yesod
          yesod-auth yesod-core yesod-form
        ];
-       jailbreak = true;
        homepage = "http://lambdacms.org";
        description = "LambdaCms Core subsite for Yesod apps";
        license = stdenv.lib.licenses.mit;
@@ -80841,8 +80951,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdacms-media";
-       version = "0.2.0";
-       sha256 = "08c2qdpqv8bw0qkpjk5fcyyqdgpxgp6xivfimai6bh3lxz2yk0gz";
+       version = "0.3.0.1";
+       sha256 = "074bghfbi3m4ffla34z0yq2qgbw3ps81fq2cm8ibqry3bps511xp";
        buildDepends = [
          base directory filepath lambdacms-core persistent shakespeare text
          time yesod yesod-form
@@ -82216,8 +82326,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.15.1.0";
-       sha256 = "0skvn5n69ir63q91jaj5qdhk8cxvic61g9ar5wck0gwpzdjcfl6w";
+       version = "0.15.1.1";
+       sha256 = "0gjgaigkd34gzfvqhlxqqxcydh12064prnn0x653kb5ks8bq4qml";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -82251,8 +82361,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.15.0.4";
-       sha256 = "0zjdzsv9vwhsabkkyf47gfsca4b1yqjgd2vlvb0qm7ca9gymd0ic";
+       version = "0.15.0.6";
+       sha256 = "1pcf42hipc5q3n61pbd2sdgvhshl2ri261i94myb3fc13kbi90hb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -82535,8 +82645,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "0.1.2.6";
-       sha256 = "0pn4x75l04qs95h9ca5chvxbivnb29h4d8415n4r2b1gmx4apn0w";
+       version = "0.1.2.7";
+       sha256 = "1g3if2y41li6wyg7ffvpybqvbywiq8bf5b5fb6pz499hinzahb9d";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -83290,14 +83400,13 @@ self: {
      }:
      mkDerivation {
        pname = "libsystemd-journal";
-       version = "1.3.1";
-       sha256 = "1i66w6dhycvi3d0vnws91mc0k9v46qr0zpc35yliv1paipm1s51a";
+       version = "1.3.3";
+       sha256 = "02d1zpmimmisjngkx9l23af51v18pdbc5mh7yljyw81lm39yzvfn";
        buildDepends = [
          base bytestring hashable hsyslog pipes pipes-safe text transformers
          uniplate unix-bytestring unordered-containers uuid vector
        ];
        pkgconfigDepends = [ systemd ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
@@ -83570,8 +83679,8 @@ self: {
      }:
      mkDerivation {
        pname = "limp";
-       version = "0.3.2.0";
-       sha256 = "0shc69jlzmn8b2pxdfav9lk9cbhxpd1cmsr36rwgyvyn5shiijy1";
+       version = "0.3.2.1";
+       sha256 = "0fx8q7ll47qc06laagiap0z4b5mbp958r3b9mc6qm1h9rhksimjk";
        buildDepends = [ base containers ];
        testDepends = [
          base containers QuickCheck tasty tasty-quickcheck tasty-th
@@ -83587,8 +83696,8 @@ self: {
     ({ mkDerivation, base, c2hs, containers, limp, vector }:
      mkDerivation {
        pname = "limp-cbc";
-       version = "0.3.2.0";
-       sha256 = "10cm2vwbjyzqpq2ras8viza0vy0r0hgrm84landlcgkbhfj71l79";
+       version = "0.3.2.1";
+       sha256 = "0q4az96nbwvm7jhrwvbjp87vzkb5nlp739jhkya6z0iq340cjxjy";
        buildDepends = [ base containers limp vector ];
        testDepends = [ base limp ];
        buildTools = [ c2hs ];
@@ -83905,13 +84014,12 @@ self: {
      }:
      mkDerivation {
        pname = "linklater";
-       version = "3.1.0.0";
-       sha256 = "0mvmlq1nl428syc013hif07rssvya7wxkr44rs58rjn2zsxhhlqq";
+       version = "3.2.0.0";
+       sha256 = "15c6p63yd1g5if2nz9pig6kc0rvqpjixjs6zr2j9m16q0h6kgrfr";
        buildDepends = [
          aeson base base-prelude bytestring containers http-types text wai
          wreq
        ];
-       jailbreak = true;
        homepage = "https://github.com/hlian/linklater";
        description = "The fast and fun way to write Slack.com bots";
        license = stdenv.lib.licenses.bsd3;
@@ -85698,8 +85806,8 @@ self: {
      }:
      mkDerivation {
        pname = "ltk";
-       version = "0.15.0.1";
-       sha256 = "0qw689ip8kibczjvar6bicns6g8a0zwlb6vdcmpicxxmpr1p7g16";
+       version = "0.15.0.2";
+       sha256 = "19wnkl9acibs6kcnm0m02jhjxrn19sanf5z2w0kqwjbqlfcrcc4a";
        buildDepends = [
          base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text
          transformers
@@ -90584,8 +90692,8 @@ self: {
      }:
      mkDerivation {
        pname = "monoid-subclasses";
-       version = "0.4.1.1";
-       sha256 = "0r2ypb85qz88jz70pr4rgygwsdslaw781s0d3svd6s7xfibi9hww";
+       version = "0.4.1.2";
+       sha256 = "0j9an1zq3dg02jz8skqkch01kg2ha59zja2729v8lpwxsd4sbi9x";
        buildDepends = [ base bytestring containers primes text vector ];
        testDepends = [
          base bytestring containers primes QuickCheck quickcheck-instances
@@ -91035,6 +91143,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ms" = callPackage
+    ({ mkDerivation, base, contravariant, doctest, edit-distance, lens
+     , profunctors, semigroupoids, semigroups, tasty, tasty-quickcheck
+     , vector
+     }:
+     mkDerivation {
+       pname = "ms";
+       version = "0.2.1";
+       sha256 = "0h70dkgzybbjm48ay9xqbvydf13a6q1zy99ln8kx4qlfdi4gsrnp";
+       buildDepends = [
+         base contravariant edit-distance lens profunctors semigroupoids
+         semigroups vector
+       ];
+       testDepends = [
+         base doctest profunctors tasty tasty-quickcheck vector
+       ];
+       homepage = "https://github.com/relrod/ms";
+       description = "metric spaces";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "msgpack" = callPackage
     ({ mkDerivation, base, binary, blaze-builder, bytestring
      , containers, data-binary-ieee754, deepseq, hashable, mtl
@@ -93479,10 +93608,9 @@ self: {
     ({ mkDerivation, base, netwire }:
      mkDerivation {
        pname = "netwire-input";
-       version = "0.0.3";
-       sha256 = "0c6wi1gfr0pxm8hav6ziic444a83cns3yf07kdylxbymgzgq7n7z";
+       version = "0.0.4";
+       sha256 = "1f0dczgnc1fibq5ypdzi1hgsahmbfmv783bliwh5x4j4vm81k0h6";
        buildDepends = [ base netwire ];
-       jailbreak = true;
        homepage = "https://www.github.com/Mokosha/netwire-input";
        description = "Input handling abstractions for netwire";
        license = stdenv.lib.licenses.mit;
@@ -93493,12 +93621,11 @@ self: {
      }:
      mkDerivation {
        pname = "netwire-input-glfw";
-       version = "0.0.3";
-       sha256 = "04flihwgs4wibhppyjw7x23s2629rbywafbv9dmdcda6bv6d8qm3";
+       version = "0.0.4";
+       sha256 = "163jd8bb0msy9r51s8qb6ypk25lax46kkbzq9wh2s4kvzribmdlg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base containers GLFW-b mtl netwire-input stm ];
-       jailbreak = true;
        homepage = "https://www.github.com/Mokosha/netwire-input-glfw";
        description = "GLFW instance of netwire-input";
        license = stdenv.lib.licenses.mit;
@@ -94182,6 +94309,7 @@ self: {
          amqp base network-transport network-transport-tests tasty
          tasty-hunit
        ];
+       jailbreak = true;
        description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94880,24 +95008,25 @@ self: {
     ({ mkDerivation, base, primitive, vector }:
      mkDerivation {
        pname = "nonlinear-optimization";
-       version = "0.3.7";
-       sha256 = "147dbq19n18ixfz6bhx9yi9ppr9j3wnc5dfz8kx5gwihy64b8l1b";
+       version = "0.3.10";
+       sha256 = "11dq7fvysdb0szkg58f2wmx2vg6sa9qfj9kfv7wv6fl3386dnp7f";
        buildDepends = [ base primitive vector ];
-       jailbreak = true;
        description = "Various iterative algorithms for optimization of nonlinear functions";
        license = "GPL";
      }) {};
 
   "nonlinear-optimization-ad" = callPackage
-    ({ mkDerivation, ad, base, nonlinear-optimization, primitive
+    ({ mkDerivation, ad, base, csv, nonlinear-optimization, primitive
      , reflection, vector
      }:
      mkDerivation {
        pname = "nonlinear-optimization-ad";
-       version = "0.2.0";
-       sha256 = "1aglqfmvjb7wmxlnlkakkp27lbyq62pjy48k18sqppj6q0qp062m";
+       version = "0.2.1";
+       sha256 = "0k3iynppdvmm9asy1wddp8n3gmskh40dmcngqv8pgy5qx0bnx8jd";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [
-         ad base nonlinear-optimization primitive reflection vector
+         ad base csv nonlinear-optimization primitive reflection vector
        ];
        homepage = "https://github.com/msakai/nonlinear-optimization-ad";
        description = "Wrapper of nonlinear-optimization package for using with AD package";
@@ -94938,8 +95067,8 @@ self: {
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.4.0";
-       sha256 = "11ikk8yia52qbaajcnwc7gq1jwwid12j8vzgn2v18j5d272lzwyc";
+       version = "0.7.5.0";
+       sha256 = "1r0mycb3ilz2k89vab08c1diz18mp03b5sds4ixmxfb0zqaz68lb";
        buildDepends = [
          base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
          spatial-math time vector vector-binary-instances
@@ -95426,6 +95555,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nvim-hs" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
+     , conduit-extra, containers, data-default, directory, dyre
+     , filepath, hslogger, hspec, hspec-discover, HUnit, lifted-base
+     , messagepack, monad-control, mtl, network, optparse-applicative
+     , parsec, process, QuickCheck, resourcet, stm, streaming-commons
+     , template-haskell, text, time, transformers, transformers-base
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "nvim-hs";
+       version = "0.0.1";
+       sha256 = "1zma19lb4kzzfiabkx55ffgvdqrycijpm2yz3jszm1m6m58khif5";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring cereal cereal-conduit conduit conduit-extra
+         containers data-default directory dyre filepath hslogger
+         lifted-base messagepack monad-control mtl network
+         optparse-applicative parsec process resourcet stm streaming-commons
+         template-haskell text time transformers transformers-base
+         utf8-string
+       ];
+       testDepends = [
+         base bytestring cereal cereal-conduit conduit conduit-extra
+         containers data-default directory dyre filepath hslogger hspec
+         hspec-discover HUnit lifted-base messagepack mtl network
+         optparse-applicative parsec process QuickCheck resourcet stm
+         streaming-commons template-haskell text time transformers
+         utf8-string
+       ];
+       homepage = "https://github.com/saep/nvim-hs";
+       description = "Haskell plugin backend for neovim";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "nyan" = callPackage
     ({ mkDerivation, base, bytestring, mtl, ncurses, text }:
      mkDerivation {
@@ -99227,6 +99392,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persist2er" = callPackage
+    ({ mkDerivation, base, optparse-applicative, persistent, text }:
+     mkDerivation {
+       pname = "persist2er";
+       version = "0.1.0.1";
+       sha256 = "096gjkmw06crywwwydyr67447xmp8x967dwh1gavlr0061skb72p";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base optparse-applicative persistent text ];
+       jailbreak = true;
+       description = "Transforms persist's quasi-quoted syntax into ER format";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "persistable-record" = callPackage
     ({ mkDerivation, array, base, containers, dlist, names-th
      , template-haskell, transformers
@@ -100339,6 +100518,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-cereal" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, mtl, pipes
+     , pipes-bytestring, pipes-parse
+     }:
+     mkDerivation {
+       pname = "pipes-cereal";
+       version = "0.1.0.0";
+       sha256 = "04f538gyzvwxhqscsj9sywi6hz5k1fabjaga0vf861hlmv9agaa8";
+       buildDepends = [
+         base bytestring cereal mtl pipes pipes-bytestring pipes-parse
+       ];
+       description = "Encode and decode binary streams using the pipes and cereal libraries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-cereal-plus" = callPackage
     ({ mkDerivation, base, bytestring, cereal-plus, errors, mtl, pipes
      , pipes-bytestring, text
@@ -104715,6 +104909,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pusher-haskell" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, HTTP, MissingH
+     , mtl, SHA, time
+     }:
+     mkDerivation {
+       pname = "pusher-haskell";
+       version = "0.1.0.0";
+       sha256 = "0ymj27a3kmaddydd5zshj108fmzhlxasn9i4igzjaj308f1ygki6";
+       buildDepends = [
+         aeson base bytestring HTTP MissingH mtl SHA time
+       ];
+       testDepends = [ base hspec ];
+       jailbreak = true;
+       homepage = "http://www.github.com/sidraval/pusher-haskell";
+       description = "A Pusher.com client written in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pushme" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , hslogger, io-storage, lens, old-locale, optparse-applicative
@@ -106051,16 +106263,16 @@ self: {
      }) {};
 
   "range" = callPackage
-    ({ mkDerivation, base, Cabal, parsec, QuickCheck, random
+    ({ mkDerivation, base, Cabal, free, parsec, QuickCheck, random
      , test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "range";
-       version = "0.1.1.1";
-       sha256 = "05xcy4r97yyqr72cqpr5rq514zygbwa2hfnhilvgzrh3cmk61n0p";
-       buildDepends = [ base parsec ];
+       version = "0.1.2.0";
+       sha256 = "028bigaq4vk5ykzf04f5hi3g37gxzzp6q24bjcb3gjfzcgy7z6ab";
+       buildDepends = [ base free parsec ];
        testDepends = [
-         base Cabal QuickCheck random test-framework
+         base Cabal free QuickCheck random test-framework
          test-framework-quickcheck2
        ];
        homepage = "https://bitbucket.org/robertmassaioli/range";
@@ -106333,8 +106545,8 @@ self: {
      }:
      mkDerivation {
        pname = "rdf4h";
-       version = "1.3.1";
-       sha256 = "0mcswyjlvhnv4rvapanfmxf2brsp5b9r1ps22n3rlhpa3mfw72rc";
+       version = "1.3.2";
+       sha256 = "09ya3d1svg6fj7jdm408gisv0cnn0c2i2c3pn07xggnn882s93bw";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -106343,9 +106555,9 @@ self: {
          unordered-containers
        ];
        testDepends = [
-         base bytestring containers deepseq fgl hashable HTTP HUnit hxt knob
-         network network-uri parsec QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 text
+         base binary bytestring containers deepseq fgl hashable HTTP HUnit
+         hxt knob network network-uri parsec QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 text text-binary
          unordered-containers
        ];
        homepage = "https://github.com/robstewart57/rdf4h";
@@ -106411,15 +106623,16 @@ self: {
      }) {};
 
   "react-haskell" = callPackage
-    ({ mkDerivation, base, deepseq, haste-compiler, lens-family
-     , monads-tf, transformers, void
+    ({ mkDerivation, aeson, base, deepseq, lens-family, monads-tf, text
+     , transformers, unordered-containers, void
      }:
      mkDerivation {
        pname = "react-haskell";
-       version = "1.3.0.0";
-       sha256 = "1jq96fiq133ng6ayknzxwcz59f2gxa5f5hhj9n46pixwdp6bf2aa";
+       version = "2.0.0";
+       sha256 = "016bpbci89b6grkwnq1yqjm5y50di1hmjlf2mkxjc0wyi82c7say";
        buildDepends = [
-         base deepseq haste-compiler lens-family monads-tf transformers void
+         aeson base deepseq lens-family monads-tf text transformers
+         unordered-containers void
        ];
        homepage = "https://github.com/joelburget/react-haskell";
        description = "Haskell React bindings";
@@ -106955,6 +107168,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "reddit" = callPackage
+    ({ mkDerivation, aeson, api-builder, base, bytestring, Cabal
+     , data-default, hspec, http-conduit, http-types, network, stm, text
+     , time, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "reddit";
+       version = "0.1.0.0";
+       revision = "1";
+       sha256 = "1g18lfl9hvz13f3i5h819pfh724i5lhgqfvyy2r06ni7hjfylzj4";
+       editedCabalFile = "84c6e65809dcd5c4fed83d64c71c6465a6ee1fe6e913c637dc2db608c6cc5870";
+       buildDepends = [
+         aeson api-builder base bytestring data-default http-conduit
+         http-types network stm text time transformers unordered-containers
+         vector
+       ];
+       testDepends = [
+         api-builder base bytestring Cabal hspec http-conduit text time
+         transformers
+       ];
+       homepage = "https://github.com/intolerable/reddit";
+       description = "Library for interfacing with Reddit's API";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "redis" = callPackage
     ({ mkDerivation, base, bytestring, concurrent-extra, containers
      , exceptions, mtl, network, old-time, utf8-string
@@ -107150,6 +107388,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "refact" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "refact";
+       version = "0.2.0.0";
+       sha256 = "1ixbji328bxdz4rblb0s7hp6vbckj4yj03a8a8sa756igj988v8f";
+       buildDepends = [ base ];
+       description = "Specify refactorings to perform with apply-refact";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "refcount" = callPackage
     ({ mkDerivation, base, Cabal, hashable, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -111341,15 +111590,16 @@ self: {
 
   "satchmo" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
-     , directory, minisat, mtl, process
+     , deepseq, directory, hashable, lens, memoize, minisat, mtl
+     , process, transformers
      }:
      mkDerivation {
        pname = "satchmo";
-       version = "2.9.7.3";
-       sha256 = "1gkb3whi0sv51jxb3x4dpam532fv3wbn1dyp9sc2c7mdjnv24kn8";
+       version = "2.9.9";
+       sha256 = "134i2xd7fvdhx43a51486mb3szi6c604pqc6w3cxsic1ngm30jbw";
        buildDepends = [
-         array async base bytestring containers directory minisat mtl
-         process
+         array async base bytestring containers deepseq directory hashable
+         lens memoize minisat mtl process transformers
        ];
        testDepends = [ array base ];
        homepage = "https://github.com/jwaldmann/satchmo";
@@ -114358,8 +114608,8 @@ self: {
      }:
      mkDerivation {
        pname = "shared-fields";
-       version = "0.1.0.0";
-       sha256 = "178jpksnxmyc07nc49wdalyh63bxwshddif9fb48p1fzcy2z5aph";
+       version = "0.2.0.0";
+       sha256 = "107n6w4dn0n4iv7qmfm1d9y04rgj3ab3qc8kyqqddnbnfa44y157";
        buildDepends = [ base template-haskell ];
        testDepends = [ base Cabal hspec lens text ];
        homepage = "http://github.com/intolerable/shared-fields";
@@ -114531,8 +114781,8 @@ self: {
      }:
      mkDerivation {
        pname = "shelly";
-       version = "1.6.2.5";
-       sha256 = "1dvaf1w1b5y717n24b9c3ri1qnpqppk5syh834h4iqcwfwlkjcvy";
+       version = "1.6.3";
+       sha256 = "1j9sv0dzhxkqml9v3r9nbwkpnjz1jhn09mlxlrjfakjmf3i9b9vp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -114857,14 +115107,14 @@ self: {
      }) {};
 
   "silently" = callPackage
-    ({ mkDerivation, base, deepseq, directory, nanospec }:
+    ({ mkDerivation, base, deepseq, directory, nanospec, temporary }:
      mkDerivation {
        pname = "silently";
-       version = "1.2.4.1";
-       sha256 = "035dw3zg680ykyz5rqkkrjn51wkznbc4jb45a8l2gh3vgqzgbf52";
+       version = "1.2.5";
+       sha256 = "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf";
        buildDepends = [ base deepseq directory ];
-       testDepends = [ base deepseq directory nanospec ];
-       homepage = "https://github.com/trystan/silently";
+       testDepends = [ base deepseq directory nanospec temporary ];
+       homepage = "https://github.com/hspec/silently";
        description = "Prevent or capture writing to stdout and other handles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116450,7 +116700,7 @@ self: {
   "snap" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
      , clientsession, comonad, configurator, containers, directory
-     , directory-tree, dlist, errors, filepath, hashable, heist, lens
+     , directory-tree, dlist, either, filepath, hashable, heist, lens
      , logict, MonadCatchIO-transformers, mtl, mwc-random, old-time
      , pwstore-fast, regex-posix, snap-core, snap-server, stm
      , template-haskell, text, time, transformers, unordered-containers
@@ -116458,19 +116708,18 @@ self: {
      }:
      mkDerivation {
        pname = "snap";
-       version = "0.14.0.5";
-       sha256 = "0wifww6mry2lxj572j9gwjxpjz4z7z9hd9jzhfyfwv2c67b39iyr";
+       version = "0.14.0.6";
+       sha256 = "05xnil6kfxwrnbvg7sigzh7hl8jsfr8cvbjd41z9ywn6ymxzr7zs";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson attoparsec base bytestring cereal clientsession comonad
-         configurator containers directory directory-tree dlist errors
+         configurator containers directory directory-tree dlist either
          filepath hashable heist lens logict MonadCatchIO-transformers mtl
          mwc-random old-time pwstore-fast regex-posix snap-core snap-server
          stm template-haskell text time transformers unordered-containers
          vector vector-algorithms xmlhtml
        ];
-       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "Top-level package for the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -116572,7 +116821,9 @@ self: {
      mkDerivation {
        pname = "snap-core";
        version = "0.9.7.2";
+       revision = "1";
        sha256 = "0lgnflwcjyiinrm75dy1flr37bvjn3yljx53cvlsb3ccfnxqwsjj";
+       editedCabalFile = "d39520edcc970d9d1f683af9631ccbcad39536b9f88040b93efb66cbe7aefc55";
        buildDepends = [
          attoparsec attoparsec-enumerator base blaze-builder
          blaze-builder-enumerator bytestring bytestring-mmap
@@ -118275,6 +118526,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "spanout" = callPackage
+    ({ mkDerivation, base, containers, gloss, lens, linear, MonadRandom
+     , mtl, netwire
+     }:
+     mkDerivation {
+       pname = "spanout";
+       version = "0.1";
+       sha256 = "0qi1pm46fyrn4vv1b5kcwhd8im59nz5qil6z33r8wq16vv151qb4";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base containers gloss lens linear MonadRandom mtl netwire
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/vtan/spanout";
+       description = "A breakout clone written in netwire and gloss";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sparse" = callPackage
     ({ mkDerivation, base, bytestring, containers, contravariant
      , deepseq, directory, doctest, filepath, hlint, hybrid-vectors
@@ -118376,12 +118646,14 @@ self: {
      }) {};
 
   "spatial-math" = callPackage
-    ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, linear }:
+    ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, lens
+     , linear
+     }:
      mkDerivation {
        pname = "spatial-math";
-       version = "0.2.3.0";
-       sha256 = "0170v4wjdpwf5s1bil9jj6magaa3fv05zz8b6zd4s6ca8cgw4lc4";
-       buildDepends = [ base binary cereal ghc-prim linear ];
+       version = "0.2.4.0";
+       sha256 = "0aysc8r9ry7ii76d6522ja4pjwrfl3m212mbrimbdrh20ykirjvv";
+       buildDepends = [ base binary cereal ghc-prim lens linear ];
        testDepends = [ base doctest ];
        description = "3d math including quaternions/euler angles/dcms and utility functions";
        license = stdenv.lib.licenses.bsd3;
@@ -119606,8 +119878,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-curator";
-       version = "0.9.0";
-       sha256 = "1mp05hv45nfysc43mdcjlhgpwkks4h533m5xf9h86xc1pmc563xf";
+       version = "0.10.0";
+       sha256 = "0dlsgm9bbib45591m7kj9vai48r4n0zvkwm4vd4c78rj54qhnq9n";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -119728,8 +120000,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-types";
-       version = "1.0.1.1";
-       sha256 = "0zffk8rc611nm5zl53fynz8ly4mzrqx9cjyfwrw07j9mdwi21dsz";
+       version = "1.1.0";
+       sha256 = "0ynfnkpzvgd54x294w4ga8nyg8lrmcwg3bhlwdlxs2fcffaazi81";
        buildDepends = [
          aeson base Cabal containers exceptions hashable safe semigroups
          text time unordered-containers vector
@@ -120075,12 +120347,11 @@ self: {
      }:
      mkDerivation {
        pname = "statistics-dirichlet";
-       version = "0.6.1";
-       sha256 = "1kd9s7m2a8awqiqbsj0z3w585bq236fmj5s5sadsdd698irkkib1";
+       version = "0.6.3";
+       sha256 = "1sx7hxv5gvzr270h4lb76dihcqcqwgdm6mq2394s407iipb2clbw";
        buildDepends = [
          base deepseq hmatrix-special nonlinear-optimization vector
        ];
-       jailbreak = true;
        description = "Functions for working with Dirichlet densities and mixtures on vectors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120337,8 +120608,8 @@ self: {
      }:
      mkDerivation {
        pname = "stitch";
-       version = "0.3.0.0";
-       sha256 = "0h0n6xyi4fi7jcy2j0yzspfla65zmv3c54d88xynv6sw305rd1kz";
+       version = "0.3.2.0";
+       sha256 = "1h8n7ry8wmzvz4bjfg6vsd7ssy17y54h2pzgjdlfam8yfcly2bb7";
        buildDepends = [ base containers text transformers ];
        testDepends = [ base Cabal hspec text ];
        description = "lightweight CSS DSL";
@@ -120646,8 +120917,8 @@ self: {
      }:
      mkDerivation {
        pname = "stomp-queue";
-       version = "0.2.0";
-       sha256 = "0xd9sdyjasp8ncb5qyzkx77a3wrybcajxdpvndx0viykma6bfmqr";
+       version = "0.2.2";
+       sha256 = "1kymwwj7yjdsyykqdqcnvgphbb1ypx7hi5a2wvx1wzv53lrspa9c";
        buildDepends = [
          attoparsec base bytestring conduit conduit-extra mime mtl
          network-conduit-tls split stompl time utf8-string
@@ -124105,6 +124376,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "telegram" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default
+     , http-conduit, url, utf8-string
+     }:
+     mkDerivation {
+       pname = "telegram";
+       version = "0.1.0.0";
+       sha256 = "1ci6606fx5cisb9yrjh0mkd549w2j3h1vzj3zm2zsl9gr7agvh4n";
+       buildDepends = [
+         aeson base bytestring data-default http-conduit url utf8-string
+       ];
+       description = "Telegram API client";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "tellbot" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, containers, errors
      , http-conduit, mtl, network, regex-posix, split, tagsoup, text
@@ -125485,8 +125771,8 @@ self: {
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "text-zipper";
-       version = "0.1.1";
-       sha256 = "0g8w7kyvqmjx4psj0cicv4bxn1ngx0giqyz8fyfhdr6v8wd9r410";
+       version = "0.2.1";
+       sha256 = "1a4kzn2s0ah1sizbdj6fks8zb4wmsx8cqjml4id9xj94zp4akq2r";
        buildDepends = [ base text ];
        description = "A text editor zipper library";
        license = stdenv.lib.licenses.bsd3;
@@ -127647,13 +127933,12 @@ self: {
      }) {};
 
   "total" = callPackage
-    ({ mkDerivation, base, ghc-prim, void }:
+    ({ mkDerivation, base, void }:
      mkDerivation {
        pname = "total";
-       version = "1.0.3";
-       sha256 = "1aqpjpxg4incb03zryp6j66fn9wq1jd7nr5kjvrad8awk7349ggn";
-       buildDepends = [ base ghc-prim void ];
-       jailbreak = true;
+       version = "1.0.4";
+       sha256 = "0zl02pznpgg719d2639491cy4df2amj7rmwfdy9dz9cksm029pga";
+       buildDepends = [ base void ];
        description = "Exhaustive pattern matching using lenses, traversals, and prisms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128470,8 +128755,8 @@ self: {
      }:
      mkDerivation {
        pname = "tttool";
-       version = "1.4.0.2";
-       sha256 = "0avn7011868nqibmdz07s27d8g46v9hwps5h04dg57vk9305j70g";
+       version = "1.4.0.3";
+       sha256 = "0mypgqgqaf2c74vka1pmqzrvz1kwl8pjm1llh4bflizfzrxq3s9d";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -128651,6 +128936,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turkish-deasciifier" = callPackage
+    ({ mkDerivation, base, containers, HUnit, vector }:
+     mkDerivation {
+       pname = "turkish-deasciifier";
+       version = "0.1.0.0";
+       sha256 = "0dk63dknwxi7v67jn9b747mkyiz2af4b76a9q1ynn16xva2qsh93";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base containers vector ];
+       testDepends = [ base HUnit ];
+       homepage = "http://github.com/joom/turkish-deasciifier.hs";
+       description = "Haskell port of Deniz Yuret's Turkish deasciifier";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "turni" = callPackage
     ({ mkDerivation, base, containers, MonadRandom, random }:
      mkDerivation {
@@ -129017,10 +129317,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-conduit";
-       version = "0.1.0";
-       revision = "2";
-       sha256 = "1cymgp3wlswxn5qfdr442cqq2ak48b5w1zcsr67n2g5p1izadwji";
-       editedCabalFile = "e70397da5f43d657c6c3bef7419810f61675e78aa0b0da688b1f5939d1e11bf8";
+       version = "0.1.1";
+       sha256 = "0rair336wjgg5pd0vh3g3nlc64f5sw2sg60jj2sjaxv296jvr3xx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -129037,7 +129335,6 @@ self: {
          template-haskell text time transformers transformers-base
          twitter-types twitter-types-lens
        ];
-       jailbreak = true;
        homepage = "https://github.com/himura/twitter-conduit";
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
@@ -129072,8 +129369,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-feed";
-       version = "0.1.1.5";
-       sha256 = "1205s5a7x8vnv09717x6a2dv7y8rvzcxmmh6hm4cyph6b5p485vz";
+       version = "0.2.0.1";
+       sha256 = "19j10mbvmmdni136b0sdyr0isdhslxcvgabvdqrd3if6cizpmndn";
        buildDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
@@ -133646,8 +133943,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-app-static";
-       version = "3.1.0.1";
-       sha256 = "1z542ivy5x4qj9kizkbbvhz5pn54rcxrs6cc52199khxkfc07gdm";
+       version = "3.1.1";
+       sha256 = "0aiywk7a25fpk9fwm6fmibi4zvg5kynnjs6syfxyzfw4hl1dazjv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -133759,8 +134056,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.8.2";
-       sha256 = "0j6yvwzw1mpamx0phplgang4gcjv25dhqvngfmzmh5fk76npmxr9";
+       version = "3.0.9";
+       sha256 = "19rnkqg4x6n2w2313naxbkcp2hyj4bj6d6kx3rwakk8wmdy70r04";
        buildDepends = [
          ansi-terminal base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -136213,8 +136510,8 @@ self: {
      }:
      mkDerivation {
        pname = "wordpass";
-       version = "1.0.0.3";
-       sha256 = "1nbgzrc3g3kcc8462sqskdywk0n1m54810r0jsw8ip2xllvkxx9b";
+       version = "1.0.0.4";
+       sha256 = "0plyggai2mq38bmmgc92gd0n3q4dlsywh44yflradg50aslqw0vv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -136938,8 +137235,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.3.2";
-       sha256 = "0njsflaxz2l01vbwndsmqmq37i6nl4cfczy776jdpnv7043b1ynv";
+       version = "0.3.4";
+       sha256 = "03z31c5gnybpfvh3idqimnz90pzbijhrqa8hlikryab148gp1gzn";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -138532,15 +138829,15 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, bytestring
-     , conduit, containers, directory, enclosed-exceptions, filepath
-     , hspec, hspec-expectations, HUnit, resourcet, scientific, text
+    ({ 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
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.8.11";
-       sha256 = "18ara96wca3gnk436i8rarb5smv80aa3ww4lnlrd5w01rp0p171v";
+       version = "0.8.12";
+       sha256 = "0nmpc1n80sv2bjqhzq5jdhd0zxzz9vka31y7k54fmdwr2jbg879i";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -138549,9 +138846,8 @@ self: {
          unordered-containers vector
        ];
        testDepends = [
-         aeson aeson-qq base bytestring conduit directory hspec
-         hspec-expectations HUnit resourcet text transformers
-         unordered-containers vector
+         aeson aeson-qq base base-compat bytestring conduit hspec HUnit
+         mockery resourcet text transformers unordered-containers vector
        ];
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
@@ -139274,8 +139570,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.11";
-       sha256 = "0n9ssbg7iggrgmxn3hb8niqic2rf453a4fqp0g9xx1rz6p323dv2";
+       version = "1.4.12";
+       sha256 = "12rvzds8ww2szq7r6pyc9kf287v2i5q8n318wy4x4jr3xhw0szy7";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -139717,6 +140013,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-media-simple" = callPackage
+    ({ mkDerivation, base, bytestring, diagrams-cairo, diagrams-core
+     , diagrams-lib, directory, JuicyPixels, vector, yesod
+     }:
+     mkDerivation {
+       pname = "yesod-media-simple";
+       version = "0.1.0.1";
+       sha256 = "1ajlrqsq7x83vc67xqb4r3328akwjp0a0vwf7nvqj3bsjqg5af76";
+       buildDepends = [
+         base bytestring diagrams-cairo diagrams-core diagrams-lib directory
+         JuicyPixels vector yesod
+       ];
+       homepage = "https://github.com/mgsloan/yesod-media-simple";
+       description = "Simple display of media types, served by yesod";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-newsfeed" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , containers, shakespeare, text, time, xml-conduit, yesod-core
@@ -139998,6 +140311,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-routes-flow" = callPackage
+    ({ mkDerivation, attoparsec, base, classy-prelude, system-fileio
+     , text, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-routes-flow";
+       version = "1.0";
+       sha256 = "1bb0w1910mnzci4mi6r2zxhjy4wsridi5h2g97nqhd65qncq4km0";
+       buildDepends = [
+         attoparsec base classy-prelude system-fileio text yesod-core
+       ];
+       homepage = "https://github.com/frontrowed/yesod-routes-flow";
+       description = "Generate Flow routes for Yesod";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-routes-typescript" = callPackage
     ({ mkDerivation, attoparsec, base, classy-prelude, system-fileio
      , text, yesod-core, yesod-routes
@@ -140276,21 +140605,23 @@ self: {
      }) {};
 
   "yesod-transloadit" = callPackage
-    ({ mkDerivation, aeson, base, byteable, bytestring, cryptohash
-     , hspec, lens, lens-aeson, old-locale, shakespeare, text, time
-     , transformers, yesod, yesod-core, yesod-form, yesod-test
+    ({ mkDerivation, aeson, base, byteable, bytestring, containers
+     , cryptohash, hspec, lens, lens-aeson, old-locale, shakespeare
+     , text, time, transformers, unordered-containers, yesod, yesod-core
+     , yesod-form, yesod-test
      }:
      mkDerivation {
        pname = "yesod-transloadit";
-       version = "0.2.1.0";
-       sha256 = "1x4sbjzlx5kxwcsywb90milk5s7shgggsqjsq7zrys28w079y00k";
+       version = "0.3.0.0";
+       sha256 = "0p2npza0clflh1vswyjr4gxx5fxggzv1x61x7c7d79jadq88bi4m";
        buildDepends = [
          aeson base byteable bytestring cryptohash lens lens-aeson
-         old-locale shakespeare text time transformers yesod yesod-core
-         yesod-form
+         old-locale shakespeare text time transformers unordered-containers
+         yesod yesod-core yesod-form
        ];
        testDepends = [
-         base hspec old-locale text time yesod yesod-form yesod-test
+         aeson base containers hspec lens old-locale text time yesod
+         yesod-form yesod-test
        ];
        description = "Transloadit support for Yesod";
        license = stdenv.lib.licenses.mit;
@@ -140318,16 +140649,17 @@ self: {
      }) {};
 
   "yesod-websockets" = callPackage
-    ({ mkDerivation, async, base, conduit, monad-control, transformers
-     , wai, wai-websockets, websockets, yesod-core
+    ({ mkDerivation, async, base, conduit, enclosed-exceptions
+     , monad-control, transformers, wai, wai-websockets, websockets
+     , yesod-core
      }:
      mkDerivation {
        pname = "yesod-websockets";
-       version = "0.2.1.1";
-       sha256 = "0ksmyag5h5i78jb7bdvsvq0wkyb82k8i4y5d2m6czvhf3i1zw6da";
+       version = "0.2.2";
+       sha256 = "1qs7rxf9maa6mgyhqqkbbcg1ab55xkixpyn3216bhbbwq730kfp5";
        buildDepends = [
-         async base conduit monad-control transformers wai wai-websockets
-         websockets yesod-core
+         async base conduit enclosed-exceptions monad-control transformers
+         wai wai-websockets websockets yesod-core
        ];
        homepage = "https://github.com/yesodweb/yesod";
        description = "WebSockets support for Yesod";
@@ -140902,8 +141234,8 @@ self: {
      }:
      mkDerivation {
        pname = "z3";
-       version = "4.0.0";
-       sha256 = "1axn3kzy6hsrnq5mcgf2n1sv63q3pqkhznvvhlj13k6jc3h2jzhl";
+       version = "4.1.0";
+       sha256 = "1vpmwizxcab1mlz7vp3hp72ddla7805jn0lq60fmkjgmj95ryvq9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base containers mtl ];

From 44513ae0252961f637219e650c41f5f7b3b54374 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jul 2015 15:11:04 +0200
Subject: [PATCH 0234/2016] haskell-inilist: test suite cannot be built because
 it depends on broken testpack

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0ec01cebf49..131ee6a793c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -825,6 +825,7 @@ self: super: {
 
   # Won't compile with recent versions of QuickCheck.
   testpack = markBroken super.testpack;
+  inilist = dontCheck super.inilist;
   MissingH = dontCheck super.MissingH;
 
   # Obsolete for GHC versions after GHC 6.10.x.

From 74bc5a2240ace50145ca6433b5d623ed56038843 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jul 2015 19:43:01 +0200
Subject: [PATCH 0235/2016] haskell-shelly: disable test suite to fix the build

---
 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 131ee6a793c..72faf888486 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -894,4 +894,8 @@ self: super: {
 
   # https://ghc.haskell.org/trac/ghc/ticket/9825
   vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
+
+  # https://github.com/yesodweb/Shelly.hs/issues/105
+  shelly = dontCheck super.shelly;
+
 }

From 9944d92dffef9e0d193d91260a44e6e39b99b411 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sat, 20 Jun 2015 16:23:50 +0300
Subject: [PATCH 0236/2016] omniorb: add the expression

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

diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
new file mode 100644
index 00000000000..180e714b81e
--- /dev/null
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, python }:
+stdenv.mkDerivation rec {
+
+  name = "omniorb-${version}";
+
+  version = "4.2.0";
+
+  src = fetchurl rec {
+    url = "http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
+    sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl";
+  };
+
+  buildInputs = [ python ];
+
+  meta = with stdenv.lib; {
+    description = "omniORB is a robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant.";
+    homepage    = "http://omniorb.sourceforge.net/";
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ smironov ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81700f14669..6680cf8233b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5630,6 +5630,8 @@ let
   omake = callPackage ../development/tools/ocaml/omake { };
   omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
 
+  omniorb = callPackage ../development/tools/omniorb { };
+
   opengrok = callPackage ../development/tools/misc/opengrok { };
 
   openocd = callPackage ../development/tools/misc/openocd { };

From dcdd7a37f67d3018d5704e5d10fa4f5e083474f2 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sat, 20 Jun 2015 16:30:03 +0300
Subject: [PATCH 0237/2016] lp_solve: add the expression

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

diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
new file mode 100644
index 00000000000..09af2d708c9
--- /dev/null
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+
+  name = "lp_solve-${version}";
+  version = "5.5.2.0";
+
+  src = fetchurl {
+    url = "http://sourceforge.net/projects/lpsolve/files/lpsolve/${version}/lp_solve_${version}_source.tar.gz";
+    sha256 = "176c7f023mb6b8bfmv4rfqnrlw88lsg422ca74zjh19i2h5s69sq";
+  };
+
+  buildCommand = ''
+    . $stdenv/setup
+    tar xvfz $src
+    (
+    cd lp_solve*/lpsolve55
+    bash ccc
+    mkdir -pv $out/lib
+    cp -v bin/*/* $out/lib
+    )
+    (
+    cd lp_solve*/lp_solve
+    bash ccc
+    mkdir -pv $out/bin
+    cp -v bin/*/* $out/bin
+    )
+    (
+    mkdir -pv $out/include
+    cp -v lp_solve*/*.h $out/include
+    )
+  '';
+
+  meta = with stdenv.lib; {
+    description = "lp_solve is a Mixed Integer Linear Programming (MILP) solver.";
+    homepage    = "http://lpsolve.sourceforge.net";
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ smironov ];
+    platforms   = platforms.unix;
+  };
+
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6680cf8233b..0aad3947f0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1497,6 +1497,8 @@ let
 
   libbladeRF = callPackage ../development/libraries/libbladeRF { };
 
+  lp_solve = callPackage ../applications/science/math/lp_solve { };
+
   lprof = callPackage ../tools/graphics/lprof { };
 
   fdk_aac = callPackage ../development/libraries/fdk-aac { };

From 9bb0fee487f639671768bbaa2412cd9c8956c493 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sat, 20 Jun 2015 21:45:37 +0300
Subject: [PATCH 0238/2016] openmodelica: add expression

openmodelica.nix: add git to the list of dependencies

openmodelica: generate library sourcelist with hashes

openmodelica: generate library sources (part 2)

openmodelica: fix fakegit

openmodelica: fix libraries issues

openmodelica: add GTK

openmodelica: successful build
---
 .../science/misc/openmodelica/default.nix     | 42 ++++++++++
 .../science/misc/openmodelica/fakegit.nix     | 81 +++++++++++++++++++
 .../misc/openmodelica/src-libs-git.nix        | 71 ++++++++++++++++
 .../misc/openmodelica/src-libs-svn.nix        |  5 ++
 .../science/misc/openmodelica/src-main.nix    |  6 ++
 .../misc/openmodelica/update-src-libs-git.sh  | 64 +++++++++++++++
 .../misc/openmodelica/update-src-libs-svn.sh  | 50 ++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 8 files changed, 321 insertions(+)
 create mode 100644 pkgs/applications/science/misc/openmodelica/default.nix
 create mode 100644 pkgs/applications/science/misc/openmodelica/fakegit.nix
 create mode 100644 pkgs/applications/science/misc/openmodelica/src-libs-git.nix
 create mode 100644 pkgs/applications/science/misc/openmodelica/src-libs-svn.nix
 create mode 100644 pkgs/applications/science/misc/openmodelica/src-main.nix
 create mode 100755 pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh
 create mode 100755 pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh

diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix
new file mode 100644
index 00000000000..8420d445e09
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/default.nix
@@ -0,0 +1,42 @@
+{stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake,
+hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which,
+lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison,
+doxygen, boost, openscenegraph, gnome, pangox_compat, xlibs, git, bash, gtk }:
+
+let
+
+  fakegit = import ./fakegit.nix {inherit stdenv fetchgit fetchsvn bash;} ;
+
+in
+
+stdenv.mkDerivation {
+  name = "openmodelica";
+
+  src = fetchgit (import ./src-main.nix);
+
+  buildInputs = [autoconf cmake automake libtool gfortran clang gnumake
+    hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which
+    lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison
+    doxygen boost openscenegraph gnome.gtkglext pangox_compat xlibs.libXmu
+    git gtk];
+
+  patchPhase = ''
+    cp -fv ${fakegit}/bin/checkout-git.sh libraries/checkout-git.sh
+    cp -fv ${fakegit}/bin/checkout-svn.sh libraries/checkout-svn.sh
+  '';
+
+  configurePhase = ''
+    autoconf
+    ./configure CC=${clang}/bin/clang CXX=${clang}/bin/clang++ --prefix=$out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "OpenModelica is an open-source Modelica-based modeling and simulation environment";
+    homepage    = "https://openmodelica.org";
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ smironov ];
+    platforms   = platforms.linux;
+  };
+}
+
+
diff --git a/pkgs/applications/science/misc/openmodelica/fakegit.nix b/pkgs/applications/science/misc/openmodelica/fakegit.nix
new file mode 100644
index 00000000000..de69626cd3e
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/fakegit.nix
@@ -0,0 +1,81 @@
+{stdenv, fetchgit, fetchsvn, bash } :
+
+let
+  mkscript = path : text : ''
+    mkdir -pv `dirname ${path}`
+    cat > ${path} <<"EOF"
+    #!${bash}/bin/bash
+    ME=`basename ${path}`
+    ${text}
+    EOF
+    sed -i "s@%out@$out@g" ${path}
+    chmod +x ${path}
+  '';
+  
+  hashname = r: let
+    rpl = stdenv.lib.replaceChars [":" "/"] ["_" "_"];
+  in
+    (rpl r.url) + "-" + (rpl r.rev);
+
+in
+
+stdenv.mkDerivation {
+  name = "fakegit";
+
+  buildCommand = ''
+    mkdir -pv $out/repos
+    ${stdenv.lib.concatMapStrings
+       (r : ''
+        cp -r ${fetchgit r} $out/repos/${hashname r}
+       ''
+       ) (import ./src-libs-git.nix)
+    }
+
+    ${mkscript "$out/bin/checkout-git.sh" ''
+      if test "$#" -ne 4; then
+        echo "Usage: $0 DESTINATION URL GITBRANCH HASH"
+        exit 1
+      fi
+      DEST=$1
+      URL=`echo $2 | tr :/ __`
+      GITBRANCH=$3
+      REVISION=$4
+
+      L=`echo $REVISION | wc -c`
+      if expr $L '<' 10 >/dev/null; then
+        REVISION=refs/tags/$REVISION
+      fi
+
+      REVISION=`echo $REVISION | tr :/ __`
+
+      rm -rf $DEST
+      mkdir -pv $DEST
+      echo "FAKEGIT cp -r %out/repos/$URL-$REVISION $DEST" >&2
+      cp -r %out/repos/$URL-$REVISION/* $DEST
+      chmod u+w -R $DEST
+    ''}
+
+    ${stdenv.lib.concatMapStrings
+       (r : ''
+        cp -r ${fetchsvn r} $out/repos/${hashname r}
+       ''
+       ) (import ./src-libs-svn.nix)
+    }
+
+    ${mkscript "$out/bin/checkout-svn.sh" ''
+      if test "$#" -ne 3; then
+        echo "Usage: $0 DESTINATION URL REVISION"
+        exit 1
+      fi
+      DEST=$1
+      URL=`echo $2 | tr :/ __`
+      REVISION=`echo $4 | tr :/ __`
+
+      rm -rf $DEST
+      mkdir -pv $DEST
+      echo "FAKE COPY %out/repos/$URL-$REVISION $DEST"
+      cp -r %out/repos/$URL-$REVISION/* $DEST
+      chmod u+w -R $DEST
+    ''}
+  '';
+}
diff --git a/pkgs/applications/science/misc/openmodelica/src-libs-git.nix b/pkgs/applications/science/misc/openmodelica/src-libs-git.nix
new file mode 100644
index 00000000000..aae5ab321fb
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/src-libs-git.nix
@@ -0,0 +1,71 @@
+[
+{ url = "https://github.com/modelica-3rdparty/ADGenKinetics.git"; rev = "42428db6e84bcde28543a3bba9bccee581309bb1"; sha256="14l005jwj1wz35gq8xlbzfz0bpsx99rs4q3dxkfh76yhnv1jh9h3"; }
+{ url = "https://github.com/modelica-3rdparty/ADMSL.git"; rev = "ed0305603f86b46d9af03e7d37dcb8b6704915b4"; sha256="15b0nqxyh8444az56ydjn594jikdl1ina5wamabk3nzm1yx218cl"; }
+{ url = "https://github.com/iea-annex60/modelica-annex60.git"; rev = "8015a01591bb24d219f57e7b69cdfcde66e39b47"; sha256="05k4pa007a6p628fq1xac0cfv8g8dnpy2bgy8h99rqpmlaa072z7"; }
+{ url = "https://github.com/OpenModelica/BioChem.git"; rev = "b5f3cb999f3cfad2bbb6fb429b496f61ecf2f628"; sha256="1l52dg888vwx4668spn59hqvfkpl9g06g8n2cdxiap7lvsyh6w9x"; }
+{ url = "https://github.com/modelica-3rdparty/BondGraph.git"; rev = "20c23e60d12989bd4668ccac47659d82d39d29cc"; sha256="1i9cmiy1ya04h2ld0gy0x2gvdrfksl66fmcrgdm1vpsnbb6pviv9"; }
+{ url = "https://github.com/modelica-3rdparty/BondLib.git"; rev = "df7a40fe612617da22e27d39edfa4b27d65f23d0"; sha256="005djwxd568zyk3ndss9hv165dci9x0dgjmcdjhnqmsap3w83hlz"; }
+{ url = "https://github.com/modelica-3rdparty/BrineProp.git"; rev = "fed013cdeec0fb9552964376b575a8e3635539ab"; sha256="020hm2q65d5iv3h8b3lhgl6j930vi2pbh4lvxv3b3k7i9z02q43a"; }
+{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "ef89361cc8673b077b9221efbf78aa63b4d7babd"; sha256="04gclknhl2f5z7w9fsbhwawisd0ibmvwpplx0siqwzvjx7nsmdg4"; }
+{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "444aa231f423b8d04225bf8672e3212d089fbfe4"; sha256="0q754mlkwqj0jcqsmxksvcz4ak2i86f9s41fhffh5jvra27cvq01"; }
+{ url = "https://github.com/modelica-3rdparty/Chemical.git"; rev = "aa2642608e587ddb6897e8c3ffabb3aa099510bd"; sha256="0y46spcb6rw0jpj4v20nlw8xlvi5kypij46f1msvwgr7dfgy4gl4"; }
+{ url = "https://github.com/modelica-3rdparty/ComplexLib.git"; rev = "0b78942ee4fa95ae71347a0d552dd869fdf4c708"; sha256="18llf5ccrq3b0f4cjznfycskwf78pik8370xv45w9gb51gamszrn"; }
+{ url = "https://github.com/lochel/ConPNlib.git"; rev = "bbf6e9711665d55e5a8cf2f7235fa013c2315104"; sha256="0g3ll44sn2ff14qxwdyakw9h5b8b7vzabxp8cb8km16wcdqzgcxx"; }
+{ url = "https://github.com/modelica-3rdparty/DESLib.git"; rev = "7a473d8d16b118c3ea05761c6f43b17fd9838e4e"; sha256="19f2121n8rdc9svcjk8irivsd9wqcb9ai9jx72s2r85fkbvm8jc3"; }
+{ url = "https://github.com/modelica-3rdparty/ExtendedPetriNets.git"; rev = "2f4eac0651c1ab0ed56b75ec61424e0ef15181d3"; sha256="0wwj756pg33qwb90ycbfkrk5xsiwsbrqvq3i16i4pisi21vl6jk9"; }
+{ url = "https://github.com/modelica-3rdparty/ExternData.git"; rev = "396164fa708cc7c7e64da55ac0b3cba23939f790"; sha256="09052qmv91a9wawsl93b5b3q47awrxhnsbb9mrv39kpnwygfh7dq"; }
+{ url = "https://github.com/modelica/ExternalMedia.git"; rev = "1b77869b31dc3509defeccb1236db4b05d2f6f5b"; sha256="05sszn4bn8r78syydyjq8csn9xv4az56mm9lrarqykqdh78pvlqp"; }
+{ url = "https://github.com/kdavies4/FCSys.git"; rev = "cb4b17f34313b9d8f2d4223d5365684b4dc1ab65"; sha256="114p7ja6b3fwlkvkkjhbx78fxc7v4af2sbs783hkdga86m1v4ib6"; }
+{ url = "https://github.com/modelica-3rdparty/FastBuildings.git"; rev = "1f5cfebc2f42c13e272bff639ffa3449d5740bf7"; sha256="0sry1n2pliddz0pjv8dp899fx98f16n1arc8zvq36k5grvi52fby"; }
+{ url = "https://github.com/modelica-3rdparty/FaultTriggering.git"; rev = "10c226b7e5b2af901b356ac437c90d6616a6e9a4"; sha256="0a9j18qjwigq11nghl97syxa9bscs1aj6vwpkldh50csnj5h6g2s"; }
+{ url = "https://github.com/modelica-3rdparty/FuzzyControl.git"; rev = "19ff67ff129a440482cc85f216f287b05ea6ec0d"; sha256="0ijcqns7pijsavijn4wlrdsz64k5ks626sly7r28wvrk9af2m2cx"; }
+{ url = "https://github.com/modelica-3rdparty/HelmholtzMedia.git"; rev = "e54fcd0e436d65c85de6c6b935983e363cdc9f6c"; sha256="05afh0379fx4mjjn7jb8j5p4am6qi62hjxvasb38b6fcp9rnysn4"; }
+{ url = "https://github.com/modelica-3rdparty/IdealizedContact.git"; rev = "8ebac550d913f6d2b3af4d1aea5044e72c7eb6b0"; sha256="03gh2a7hf44clshwkiyz786w847hmyr3bicdqd9969fbirgcqn6m"; }
+{ url = "https://github.com/modelica-3rdparty/IndustrialControlSystems.git"; rev = "6a2414307d5998c6d081efe803c2b575a532b3ba"; sha256="09la9h07x8bkh7zhrwykgj1467qdryjvxhvnnm8qvsim0dl9inc4"; }
+{ url = "https://github.com/modelica-3rdparty/LinearMPC.git"; rev = "1e91a5dcaa662cd30c5b09a9d0267289703f933b"; sha256="12094fqmwi65h0mc65b96krbj6b8dgn6jiww3fnv6khglb21kwvd"; }
+{ url = "https://github.com/modelica/Modelica.git"; rev = "refs/tags/v1.6"; sha256="106w83ylgbxf63wr7p9z5q8vqz2qcsaw0zwaad7d3saq6rdbj30c"; }
+{ url = "https://github.com/modelica/Modelica.git"; rev = "d442bcd461b8db9873e33b6141bdbd37bcff9de8"; sha256="1icnd0fxix5khnsvdhy7kmzn6lnqkggbvfrbln98a2h5zqd6s32w"; }
+{ url = "https://github.com/modelica/Modelica.git"; rev = "af2a3e1597d648d6826665c89cf9eaf5c2a632bc"; sha256="0ryk0iwakdazhsjqvan41w6f9bvgl329zkqchcdg6nkidiigziwh"; }
+{ url = "https://github.com/modelica/Modelica.git"; rev = "48943d87db45a6c312b5a5789d384acde44a934b"; sha256="1hi2vkpmx734baa9m1lqzallcykhh3snd68r387gndiv96f6zx3n"; }
+{ url = "https://github.com/modelica/Modelica.git"; rev = "164af873cc5955c50f9592a7d2f3c155f703849c"; sha256="071svqwd72sy85sngbg5r22ab693c0gw2xx29gk1sqrk2nchmvia"; }
+{ url = "https://github.com/OpenModelica/modelica3d.git"; rev = "daf5669b03ad33fc6999671d1c0e7521134a282b"; sha256="1scs6v2cp2r4jz4diszwbqf9kvzf49pid50dmpsz0gfhx06j9y2v"; }
+{ url = "https://github.com/modelica-deprecated/ModelicaAdditions.git"; rev = "568db43766186826b880f9d4bfafeff25cc2c4ab"; sha256="1py5i3afxdvz1dmxxwb2mqj8kyzdhg4jnnqwl8h50akizg4i49pl"; }
+{ url = "https://github.com/xogeny/ModelicaBook.git"; rev = "0e670cfae4db653bd34ea777d6b56423e9be2c9f"; sha256="0lxh08w6nii4p5yk7c0xmfi5y4xkjkzz4hirr3kqdhdfybcwq824"; }
+{ url = "https://github.com/modelica-compliance/compliance.git"; rev = "ca5092c14bb7af4507a10700ee49181a3a3ee199"; sha256="12ja6dhwlbq412kxjdviypgchipxpsg8l0sf6r17g6lbsi19i2b6"; }
+{ url = "https://github.com/modelica-3rdparty/ModelicaDEVS.git"; rev = "a987aa9552fbbe71b2ee2e8c28958f9d213087ae"; sha256="0qcw7vw28xadim0h8kr2km09d8vdj05ibdpzcnpny9n43pm9s5hx"; }
+{ url = "https://github.com/modelica/Modelica_DeviceDrivers.git"; rev = "db912ba7e1317b8f6a776ccf9a19f69c77a9c477"; sha256="052h2lr7xgfag5fks19wbldqmb985kxlc5fzysl7c9w3fnijp0ml"; }
+{ url = "https://github.com/modelica/Modelica_EnergyStorages.git"; rev = "9f057365232364e31a31a8e525f96284b98c7de3"; sha256="195m5b3z8qgg9kih9zsdx1h8zgrm37q63890r59akka05a97j48h"; }
+{ url = "https://github.com/modelica/Modelica_LinearSystems2.git"; rev = "18916fdc485285baab12481701b53d4eb606a3f1"; sha256="0fhvdwcgk8q3z1a98l2bxv8a6dysrs4ll6xfyzpni7yq8gp4mg4q"; }
+{ url = "https://github.com/modelica/Modelica_Synchronous.git"; rev = "d0f5ee57bc7b639738e88026674a87343b33dbe1"; sha256="0l75v4d0fgf07ify0h3skh4y9pfw9gxh9hbj1lbsdgglmzlrcvbg"; }
+{ url = "https://github.com/modelica-3rdparty/MotorcycleDynamics.git"; rev = "2be2667f9936d88ffb9b8a8246c5af9ccb0b307f"; sha256="0jazwmpqpyhhgs9qdn9drmplgp2yjs0ky7wll5x9929dkgy80m6x"; }
+{ url = "https://github.com/modelica-3rdparty/NCLib.git"; rev = "ed3d72f176ac6b7031ce73be9d80101141e74a69"; sha256="1pbpv8w1lsa9vdwp7qbih8iim91ms22b01wz376b548d0x2r95la"; }
+{ url = "https://github.com/modelica-3rdparty/NeuralNetwork.git"; rev = "c44e4d1fe97fd4f86dafcd05ad3713692e3f1806"; sha256="0s1v8k71zq1s9gjlvi3zr23nwfknp4x17cxm64a0y3vsi3kahj2s"; }
+{ url = "https://github.com/DLR-SR/Noise.git"; rev = "9b57476845539e56769cf76ea0fe7bf3c7eb5d11"; sha256="0icrb63f6dm4gww2nyby9i7s7qxvhvialp36xzcgmi7nlq7crjr2"; }
+{ url = "https://github.com/modelica-3rdparty/ObjectStab.git"; rev = "2a723e0b223af50f4ffdd62f8ac901e0f87b9323"; sha256="1b6zi27slzzfbkmbcqxygsn5i5w0zkq0hfrfb72vf7mbgz07j19j"; }
+{ url = "https://github.com/cparedis/OpenHydraulics.git"; rev = "d3173d1f06f7d14c9d7c41769f143617ff03a3ad"; sha256="1hn5rcnmzcbiaqdnxfn02wddmrpj9bcdi9p680f31hbh3vb0i3r6"; }
+{ url = "https://github.com/lochel/PNlib.git"; rev = "44c7d277980b7a88b449b72edec0a56416b40fa9"; sha256="026wdhbxnzarmj8gw0as70vj8f1gwc51z38hjqpswxkl0xd6mfvp"; }
+{ url = "https://github.com/MarekMatejak/Physiolibrary.git"; rev = "49d59060f6e5b4cb68560c6d7467e84ea4318056"; sha256="0klqs2axjm3s780sq4plq4wmbf9mszz2jmq9fprgxy9pw7iszbhc"; }
+{ url = "https://github.com/dzimmer/PlanarMechanics.git"; rev = "d998a1b27355e83d2ff4849d71281a919a3234aa"; sha256="0vyq6mninn38wy2d60rk753xbkfqim2y6y31py7kq2mm170jfqf4"; }
+{ url = "https://github.com/modelica/PowerSystems.git"; rev = "7b551888089277a0dd979db636d47aba0279e8f0"; sha256="0y13f1nllc7riksnly25wmmp6mc30c1b48dbq2lr1nag6yg3blwm"; }
+{ url = "https://github.com/modelica/PowerSystems.git"; rev = "3abd48aa53bbcd3f3e2ddfa2371680febf8baf48"; sha256="1nr2nbpaxywk8cpwnk9rr2zr87mm2gb9b4plqipjdlrrkjlk9fka"; }
+{ url = "https://github.com/modelica-3rdparty/PraxisSimulationstechnik.git"; rev = "f7db177786f84033f3a50b7474988b190a1dfb46"; sha256="08bdm7k7w35kg9gkrvcn382zkwf5h3iwkkx60d5fj64j5d5klray"; }
+{ url = "https://github.com/modelica-3rdparty/QCalc.git"; rev = "af6c34dda691a9bdf7ca1de10650974b2d5cecf5"; sha256="0p0zhl27cnr492byrzib0dyn7zp5yb7wcr0spv10ngm6j90cij6y"; }
+{ url = "https://github.com/modelica-3rdparty/QSSFluidFlow.git"; rev = "d84a2c107132f2cd47ea3c3751238d69e4b1f64b"; sha256="02cdvv33pi0qlmg8n401s4cxf59l9b4ff4ixf7gwn4w4n1y9bw0g"; }
+{ url = "https://github.com/modelica-3rdparty/RealTimeCoordinationLibrary.git"; rev = "655ac1a22aa6deb04ea8e3869dd0aa9fb9540754"; sha256="19crf8pl9vpqq3pq1rhcbl49kkmnm4jrzpwrpqp8qc6dj8096za4"; }
+{ url = "https://github.com/modelica-3rdparty/ScalableTestSuite.git"; rev = "c6319908d45ac97ffb10e96cd42654bce36ffb97"; sha256="1g79d88bfmzcqvaghyyj86ajs38v0qnmjxbj8d53yp6nmgnaasx5"; }
+{ url = "https://github.com/modelica-3rdparty/Servomechanisms.git"; rev = "22e1874ef9ad46156617817c67a4fb1238621bf5"; sha256="0nwb7apayk7ba9iv27yv67wi4b934dy57kkvn0acxy393jhd8jqd"; }
+{ url = "https://openmodelica.org/git/SiemensPower.git"; rev = "73a3bfc6d2ddd72165bb0f3e7e9df48b643a5ed0"; sha256="0mvrkpkmr0bx2cvsb23syg7cs8k6a15vjf4n1hivdcigq4x8g2nc"; }
+{ url = "https://openmodelica.org/git/SiemensPower.git"; rev = "5ef2e38b64ff481801c0db19d52f0bef21f85f77"; sha256="1llnpl2x1g28gari1rk34hdnnwf7a4fwwxlf7i18d8bl1vsrfaja"; }
+{ url = "https://openmodelica.org/git/SiemensPower.git"; rev = "2bd9e367baaa8d44946897c3c3a32a4050ad2a2a"; sha256="1shm9blpn9m87ci6wwkinpmihr1fik9j0a0pj2nxy0cjrr2jzbn4"; }
+{ url = "https://github.com/modelica-3rdparty/Spot.git"; rev = "2f74417f1681570900a1ed373dcbe4b42634ec7b"; sha256="0k5h2k6x98zvvsafpw7y16xs9d6lxz0csa0mlm4wwggaywadn255"; }
+{ url = "https://github.com/modelica-3rdparty/SystemDynamics.git"; rev = "c58a26dc3e62a50e64fd336dc4aa499b2d5ad314"; sha256="0ra3a2vgqmry92kmm060gfa41mrpkgbs4swzl78ih3icawfzjz8q"; }
+{ url = "https://github.com/modelica-3rdparty/ThermoPower.git"; rev = "e012268625dd1645fe5570cf31d64129d83a8192"; sha256="1rlkli48kc9hnkplgb0bjkb6ajn7agiw4yh9l5sfvlv7k7k2gc8l"; }
+{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "d4f9c3ed35f7520f82439eb6e9f4057ae0f82b73"; sha256="0hxbn26g479qkr6rrglx9ljdxnpzd5ll1sf2v08skghrdjjb8jcx"; }
+{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "51e7ea2d2e121ee640e7897335c294923f8eaeb0"; sha256="0l11mzjkaxndsqrnnr0z7qvk08svv229119qkm81yb53ich9wnyw"; }
+{ url = "https://github.com/modelica/VehicleInterfaces.git"; rev = "ad956a35643d53e207ee126d67ea1f3f38337a39"; sha256="0g90cqwjpi06gn7vca5kqnz56im76s2hrdqjhsj2bl43rza8mhr0"; }
+{ url = "https://github.com/modelica-3rdparty/WasteWater.git"; rev = "90ff44ac791ba5ed98444c8597efbd2a2af01cad"; sha256="1icrn0y389rhxmf6i0mnsfgw9v9j5innpkz3q069rfm2ji268b12"; }
+{ url = "https://github.com/xogeny/XogenyTest.git"; rev = "9b98981e8ff0f440dd319d1a806e1fd2f0ab3436"; sha256="18glaxrlxfml26w7ljlf0yj3ah1fnhpbg01py28nplsgnrfwfwqj"; }
+{ url = "https://github.com/modelica-3rdparty/msgpack-modelica.git"; rev = "6ce2ca600c4902038c0f20b43ed442f1ee204310"; sha256="01x5a9y11yf62sc0j2y49yxwm24imj2lfl3z5mwvi9038gwn0lkx"; }
+{ url = "https://github.com/modelica-3rdparty/netCDF-DataReader.git"; rev = "3d2cc8272abfbc4b667d8868f851bf3e11c6f00e"; sha256="194810a4rn0flxgirrlnxsbxarnm97309dkp1w7nva9zv1q3wj7h"; }
+{ url = "https://github.com/joewa/open-bldc-modelica.git"; rev = "7817cd703b88fc1f433269d32c31e75eb50a21c6"; sha256="1plkxkx51f9yi99ysarmx2ymldizvyr0m66k996y5lj5h81jv8a8"; }
+]
diff --git a/pkgs/applications/science/misc/openmodelica/src-libs-svn.nix b/pkgs/applications/science/misc/openmodelica/src-libs-svn.nix
new file mode 100644
index 00000000000..244da64fb4e
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/src-libs-svn.nix
@@ -0,0 +1,5 @@
+[
+{ url = "https://svn.modelica.org/projects/Modelica_ElectricalSystems/InstantaneousSymmetricalComponents"; rev = "7978"; sha256="0f100c7bz4ai3ryhpkbbszw8z6mykvg40p03ic92n2qq58wjk37z"; }
+{ url = "https://svn.modelica.org/projects/Modelica_EmbeddedSystems/trunk/Modelica_StateGraph2"; rev = "8121"; sha256="1cys57nc1yzkr5admc139qs5pa48rj3g69pb3j3s9xcmpd483hzp"; }
+{ url = "https://svn.modelica.org/projects/Modelica_ElectricalSystems/Modelica_PowerFlow/trunk"; rev = "3174"; sha256="0yviw1b8psn8vfyl4q1naylak3lcqi2q1bqplqg3gg9iw4aiymxl"; }
+]
diff --git a/pkgs/applications/science/misc/openmodelica/src-main.nix b/pkgs/applications/science/misc/openmodelica/src-main.nix
new file mode 100644
index 00000000000..16910675a05
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/src-main.nix
@@ -0,0 +1,6 @@
+{
+  url = "https://openmodelica.org/git-readonly/OpenModelica.git";
+  fetchSubmodules = true;
+  rev = "8c5d48eb31a638d5220621b20377bfe6f9e9535e";
+  sha256 = "15r0qpvnsb9a7nw3bh5n9r770ngd7p5py0ld2jy5mc4llaslkpa5";
+}
diff --git a/pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh b/pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh
new file mode 100755
index 00000000000..481a8979641
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+CWD=`pwd`
+
+chko() { (
+T=`mktemp -d`
+trap "rm -rf $T" EXIT INT PIPE
+cd $T
+cat >check.nix <<EOF
+with import <nixpkgs> {};
+fetchgit `cat $CWD/src-main.nix`
+EOF
+nix-build check.nix
+cat result/libraries/Makefile.libs
+) }
+
+getsha256() { (
+T=`mktemp -d`
+trap "rm -rf $T" EXIT INT PIPE
+cd $T
+
+L=`echo $2 | wc -c`
+if expr $L '<' 10 >/dev/null; then
+T=`echo $2 | sed 's@"\(.*\)"@"refs/tags/\1"@'`
+cat >check.nix <<EOF
+with import <nixpkgs> {};
+fetchgit {
+  url = $1;
+  rev = $T;
+  sha256 = "0000000000000000000000000000000000000000000000000000";
+}
+EOF
+SHA=`nix-build check.nix 2>&1 | sed -n 's/.*instead has ‘\(.*\)’.*/\1/g p'`
+echo "{ url = $1; rev = $T; sha256=\"$SHA\"; }"
+else
+cat >check.nix <<EOF
+with import <nixpkgs> {};
+fetchgit {
+  url = $1;
+  rev = $2;
+  sha256 = "0000000000000000000000000000000000000000000000000000";
+}
+EOF
+SHA=`nix-build check.nix 2>&1 | sed -n 's/.*instead has ‘\(.*\)’.*/\1/g p'`
+echo "{ url = $1; rev = $2; sha256=\"$SHA\"; }"
+fi
+
+# nix-build check.nix
+) }
+
+OUT=src-libs-git.nix
+
+echo '[' > $OUT
+
+chko |
+grep checkout-git.sh |
+tr \' \" |
+while read NM TGT URL BR REV ; do
+  echo Trying $TGT $URL $REV >&2
+  getsha256 $URL $REV >> $OUT || exit 1
+done
+
+echo ']' >> $OUT
+
diff --git a/pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh b/pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh
new file mode 100755
index 00000000000..972bc7d61f1
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+CWD=`pwd`
+
+chko() { (
+T=`mktemp -d`
+trap "rm -rf $T" EXIT INT PIPE
+cd $T
+cat >check.nix <<EOF
+with import <nixpkgs> {};
+fetchgit `cat $CWD/src-main.nix`
+EOF
+nix-build check.nix
+cat result/libraries/Makefile.libs
+) }
+
+getsha256() { (
+T=`mktemp -d`
+trap "rm -rf $T" EXIT INT PIPE
+cd $T
+
+L=`echo $2 | wc -c`
+cat >check.nix <<EOF
+with import <nixpkgs> {};
+fetchsvn {
+  url = $1;
+  rev = $2;
+  sha256 = "0000000000000000000000000000000000000000000000000000";
+}
+EOF
+SHA=`nix-build check.nix 2>&1 | sed -n 's/.*instead has ‘\(.*\)’.*/\1/g p'`
+echo "{ url = $1; rev = $2; sha256=\"$SHA\"; }"
+
+# nix-build check.nix
+) }
+
+OUT=src-libs-svn.nix
+
+echo '[' > $OUT
+
+chko |
+grep checkout-svn.sh |
+tr \' \" |
+while read NM TGT URL REV ; do
+  echo Trying $TGT $URL $REV >&2
+  getsha256 $URL $REV >> $OUT || exit 1
+done
+
+echo ']' >> $OUT
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0aad3947f0f..6d4af1c6a01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2735,6 +2735,8 @@ let
 
   openmpi = callPackage ../development/libraries/openmpi { };
 
+  openmodelica = callPackage ../applications/science/misc/openmodelica { };
+
   qarte = callPackage ../applications/video/qarte {
     sip = pythonPackages.sip_4_16;
   };

From 80d6b708ac4d6573c361eedf64ebbe87ec3ce53e Mon Sep 17 00:00:00 2001
From: Sergey Mironov <Sergey.Mironov@kaspersky.com>
Date: Wed, 22 Jul 2015 16:43:01 +0300
Subject: [PATCH 0239/2016] openmodelica: Fix runtime PATHs using wrapProgram,
 fixes #8949

---
 .../science/misc/openmodelica/default.nix            | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix
index 8420d445e09..3741187067d 100644
--- a/pkgs/applications/science/misc/openmodelica/default.nix
+++ b/pkgs/applications/science/misc/openmodelica/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake,
 hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which,
 lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison,
-doxygen, boost, openscenegraph, gnome, pangox_compat, xlibs, git, bash, gtk }:
+doxygen, boost, openscenegraph, gnome, pangox_compat, xlibs, git, bash, gtk, makeWrapper }:
 
 let
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which
     lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison
     doxygen boost openscenegraph gnome.gtkglext pangox_compat xlibs.libXmu
-    git gtk];
+    git gtk makeWrapper];
 
   patchPhase = ''
     cp -fv ${fakegit}/bin/checkout-git.sh libraries/checkout-git.sh
@@ -30,6 +30,14 @@ stdenv.mkDerivation {
     ./configure CC=${clang}/bin/clang CXX=${clang}/bin/clang++ --prefix=$out
   '';
 
+  postFixup = ''
+    for e in $(cd $out/bin && ls); do
+      wrapProgram $out/bin/$e \
+        --prefix PATH : "${gnumake}/bin" \
+        --prefix LIBRARY_PATH : "${liblapack}/lib:${blas}/lib"
+    done
+  '';
+
   meta = with stdenv.lib; {
     description = "OpenModelica is an open-source Modelica-based modeling and simulation environment";
     homepage    = "https://openmodelica.org";

From 8897299e8f375555d9c9819612fede3d5c86ccc9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Jul 2015 21:45:14 +0200
Subject: [PATCH 0240/2016] mezzo: fix build with OCaml-4.02

---
 pkgs/development/compilers/mezzo/default.nix | 22 ++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix
index 183640f5985..a0fe441b153 100644
--- a/pkgs/development/compilers/mezzo/default.nix
+++ b/pkgs/development/compilers/mezzo/default.nix
@@ -1,16 +1,30 @@
-{stdenv, fetchurl, ocaml, findlib, menhir, yojson, ulex, pprint, fix, functory}:
+{ stdenv, fetchFromGitHub, ocaml, findlib, menhir, yojson, ulex, pprint, fix, functory }:
+
+let
+  check-ocaml-version = with stdenv.lib; versionAtLeast (getVersion ocaml);
+in
+
+assert check-ocaml-version "4";
 
 stdenv.mkDerivation {
 
   name = "mezzo-0.0.m8";
 
-  src = fetchurl {
-    url = https://github.com/protz/mezzo/archive/m8.tar.gz;
-    sha256 = "17mfapgqp8ssa5x9blv72zg9l561zbiwv3ikwi6nl9dd36lwkkc6";
+  src = fetchFromGitHub {
+    owner = "protz";
+    repo = "mezzo";
+    rev = "m8";
+    sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6";
   };
 
   buildInputs = [ ocaml findlib yojson menhir ulex pprint fix functory ];
 
+  # Sets warning 3 as non-fatal
+  prePatch = stdenv.lib.optionalString (check-ocaml-version "4.02") ''
+    substituteInPlace myocamlbuild.pre.ml \
+    --replace '@1..3' '@1..2+3'
+  '';
+
   createFindlibDestdir = true;
 
   postInstall = ''

From 6d30af58a0340a654d94ef85ce6d9561bfeb00c2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 23 Jul 2015 15:14:50 -0700
Subject: [PATCH 0241/2016] ceph: Fix detection of git versioning

---
 pkgs/tools/filesystems/ceph/0.80.nix    | 3 ++-
 pkgs/tools/filesystems/ceph/0.94.nix    | 3 ++-
 pkgs/tools/filesystems/ceph/dev.nix     | 3 ++-
 pkgs/tools/filesystems/ceph/generic.nix | 7 +++----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/0.80.nix b/pkgs/tools/filesystems/ceph/0.80.nix
index 302a65f626b..c987e0bd641 100644
--- a/pkgs/tools/filesystems/ceph/0.80.nix
+++ b/pkgs/tools/filesystems/ceph/0.80.nix
@@ -6,7 +6,8 @@ callPackage ./generic.nix (args // rec {
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1arajccczjdqp7igs17569xlq5cj4azcm5wwixg6ryypjr2grcbl";
+    leaveDotGit = true;
+    sha256 = "0s81j6yj8y27hlx1hid9maz0l7bhjjskjxzxlhsikzmdc1j27m4r";
   };
 
   patches = [
diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
index 9b9455b9061..75045cb1344 100644
--- a/pkgs/tools/filesystems/ceph/0.94.nix
+++ b/pkgs/tools/filesystems/ceph/0.94.nix
@@ -6,7 +6,8 @@ callPackage ./generic.nix (args // rec {
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l";
+    leaveDotGit = true;
+    sha256 = "094f9knxgx8vb9fb1yzld9ib4m0wpqwqgqjl3xqf0dzm48nxqd73";
   };
 
   patches = [ ./fix-pgrefdebugging.patch ];
diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
index 5cc183d1053..c57bc200f24 100644
--- a/pkgs/tools/filesystems/ceph/dev.nix
+++ b/pkgs/tools/filesystems/ceph/dev.nix
@@ -6,7 +6,8 @@ callPackage ./generic.nix (args // rec {
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0kydjyvb1566mh33p6dlljfx1r4cfdj8ic4i19h5r9vavkc46nf0";
+    leaveDotGit = true;
+    sha256 = "13iyv53kq2ka5py759cdiw0wmzpsycskvhmyr74qkpxmw9g6177y";
   };
 
   patches = [ ./fix-pythonpath.patch ];
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index bece841d5f5..61659ef26fd 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -1,5 +1,5 @@
-{ stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which
-, boost, python, pythonPackages, libxml2, git, zlib
+{ stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which, git
+, boost, python, pythonPackages, libxml2, zlib
 
 # Optional Dependencies
 , snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null
@@ -112,14 +112,13 @@ stdenv.mkDerivation {
     ./0001-Makefile-env-Don-t-force-sbin.patch
   ];
 
-  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]
+  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which git ]
     ++ optionals (versionAtLeast version "9.0.2") [
       pythonPackages.setuptools pythonPackages.argparse
     ];
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
     boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib
   ] ++ optional (versionAtLeast version "9.0.0") [
-    git                   # Used for the gitversion string
     pythonPackages.sphinx # Used for docs
   ] ++ optional stdenv.isLinux [
     linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs

From 0e1d8f0d7d3e670499f5483d8d181fa05d500d75 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 23 Jul 2015 15:15:02 -0700
Subject: [PATCH 0242/2016] ceph-git: 2015-07-20 -> 2015-07-23

---
 pkgs/tools/filesystems/ceph/git.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index f65b7ea7846..916e8ad9d5e 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,12 +1,13 @@
-{ callPackage, fetchgit, git, ... } @ args:
+{ callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-07-20";
+  version = "2015-07-23";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "ce534e1e0addfe93194a553cec98799ea97affe4";
-    sha256 = "19i9fp06fdyhx5x6ryw5q81id0354601yxnywvir3i9hy51p9xaz";
+    rev = "f7bda9567d2a1acf015ab891eb5bb9ca0cdc8396";
+    leaveDotGit = true;
+    sha256 = "0z3i4aadyyklafm3lia8dg8l0wr3cvy53v3h7b533nm61lq07maf";
   };
 
   patches = [ ./fix-pythonpath.patch ];

From af71fbc6f1ee86dfe40d8a92eb4fd4a21414e3e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Fri, 24 Jul 2015 00:26:48 +0200
Subject: [PATCH 0243/2016] minecraft: fix wrapper

Adding jre lib path seems no longer needed, and so does padsp.
---
 pkgs/games/minecraft/default.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 9a19366a074..218a84d591d 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
-, mesa, openal, alsaOss, pulseaudioSupport ? false, libpulseaudio }:
+, mesa, openal
+, useAlsa ? false, alsaOss ? null }:
 
-assert jre ? architecture;
+assert useAlsa -> alsaOss != null;
 
 stdenv.mkDerivation {
-  name = "minecraft-2013.07.01";
+  name = "minecraft-2015.07.24";
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar";
@@ -22,8 +23,8 @@ stdenv.mkDerivation {
     #!${stdenv.shell}
 
     # wrapper for minecraft
-    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
-    ${if pulseaudioSupport then "${libpulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \
+    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
+    ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \
       ${jre}/bin/java -jar $out/minecraft.jar
     EOF
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1924857bc5..0b5d933c96d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2203,7 +2203,7 @@ let
   mfoc = callPackage ../tools/security/mfoc { };
 
   minecraft = callPackage ../games/minecraft {
-    pulseaudioSupport = config.pulseaudio or true;
+    useAlsa = config.minecraft.alsa or false;
   };
 
   minecraft-server = callPackage ../games/minecraft-server { };

From 4fab7321bf17b23572c57f05aedbf2271e304074 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 23 Jul 2015 15:47:16 -0700
Subject: [PATCH 0244/2016] make changes needed to build mongodb

---
 pkgs/development/libraries/gperftools/default.nix   |  6 ++++++
 pkgs/development/libraries/kyotocabinet/default.nix | 12 ++++++++++++
 pkgs/development/libraries/libpcap/default.nix      |  4 ++++
 pkgs/development/libraries/snappy/default.nix       |  3 ++-
 pkgs/development/libraries/wiredtiger/default.nix   |  6 ++++++
 pkgs/servers/nosql/mongodb/default.nix              | 11 +++++++++++
 6 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index 8c2feccebb7..5fa14e64a22 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isLinux libunwind;
 
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace Makefile.am --replace stdc++ c++
+    substituteInPlace Makefile.in --replace stdc++ c++
+    substituteInPlace libtool --replace stdc++ c++
+  '';
+
   # some packages want to link to the static tcmalloc_minimal
   # to drop the runtime dependency on gperftools
   dontDisableStatic = true;
diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix
index 6c4575b4e9d..6617816b642 100644
--- a/pkgs/development/libraries/kyotocabinet/default.nix
+++ b/pkgs/development/libraries/kyotocabinet/default.nix
@@ -8,6 +8,18 @@ stdenv.mkDerivation rec {
     sha256 = "0g6js20x7vnpq4p8ghbw3mh9wpqksya9vwhzdx6dnlf354zjsal1";
   };
 
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace kccommon.h \
+      --replace tr1/unordered_map unordered_map \
+      --replace tr1/unordered_set unordered_set \
+      --replace tr1::hash std::hash \
+      --replace tr1::unordered_map std::unordered_map \
+      --replace tr1::unordered_set std::unordered_set
+
+    substituteInPlace lab/kcdict/Makefile --replace stdc++ c++
+    substituteInPlace configure --replace stdc++ c++
+  '';
+
   buildInputs = [ zlib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 9ed1aab4034..213dbe50aaf 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
     else if stdenv.isDarwin then [ "--with-pcap=bpf" ]
     else [];
 
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure --replace " -arch i386" ""
+  '';
+
   preInstall = ''mkdir -p $out/bin'';
   
   crossAttrs = {
diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index 90469508d0e..5ae8f5e6252 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
   # -DNDEBUG for speed
   configureFlags = [ "CXXFLAGS=-DNDEBUG" ];
 
-  doCheck = true;
+  # SIGILL on darwin
+  doCheck = !stdenv.isDarwin;
 
   meta = with stdenv.lib; {
     homepage = http://code.google.com/p/snappy/;
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index 5fe75248e35..347686014d1 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -58,6 +58,12 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace api/leveldb/leveldb_wt.h --replace \
+      '#include "wiredtiger.h"' \
+      ''$'#include "wiredtiger.h"\n#include "pthread.h"'
+  '';
+
   meta = {
     homepage = http://wiredtiger.com/;
     description = "";
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 81205c92d4c..318bda2fe44 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -21,6 +21,10 @@ let version = "3.0.4";
     ] ++ optional stdenv.is64bit wiredtiger;
 
     other-args = concatStringsSep " " ([
+      # these are opt-in, lol
+      "--cc-use-shell-environment"
+      "--cxx-use-shell-environment"
+
       "--c++11=on"
       "--ssl"
       #"--rocksdb" # Don't have this packaged yet
@@ -47,6 +51,13 @@ in stdenv.mkDerivation rec {
     # fix environment variable reading
     substituteInPlace SConstruct \
         --replace "env = Environment(" "env = Environment(ENV = os.environ,"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+
+    substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder
+    substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder
+    substituteInPlace src/third_party/s2/s2cap.cc --replace drem remainder
+    substituteInPlace src/third_party/s2/s2latlng.cc --replace drem remainder
+    substituteInPlace src/third_party/s2/s2latlngrect.cc --replace drem remainder
   '';
 
   buildPhase = ''

From 26d5a1fc62866812bb142cd228752c33bbbab214 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Fri, 24 Jul 2015 01:41:32 +0000
Subject: [PATCH 0245/2016] postgresql: add reload command

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

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 97927055ce3..4cff2818f3b 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -207,6 +207,7 @@ in
 
         serviceConfig =
           { ExecStart = "@${postgresql}/bin/postgres postgres ${toString flags}";
+            ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
             User = "postgres";
             Group = "postgres";
             PermissionsStartOnly = true;

From c8629266ef5adc0cec96bfed89fa6cb8fdcc220e Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Thu, 23 Jul 2015 23:05:19 -0300
Subject: [PATCH 0246/2016] Dillo: 3.0.4.1 -> 3.0.5

---
 pkgs/applications/networking/browsers/dillo/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix
index 6760e123ccb..a54e5e0c370 100644
--- a/pkgs/applications/networking/browsers/dillo/default.nix
+++ b/pkgs/applications/networking/browsers/dillo/default.nix
@@ -6,18 +6,16 @@
 , libXcursor, libXi, libXinerama }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.4.1";
+  version = "3.0.5";
   name = "dillo-${version}";
 
   src = fetchurl {
     url = "http://www.dillo.org/download/${name}.tar.bz2";
-    sha256 = "0iw617nnrz3541jkw5blfdlk4x8jxb382pshi8nfc7xd560c95zd";
+    sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv";
   };
 
   buildInputs = with stdenv.lib;
-    [ fltk openssl libjpeg libpng libXcursor libXi libXinerama ];
-
-  nativeBuildInputs = [ perl ];
+  [ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ];
 
   configureFlags =  "--enable-ssl";
 

From aae3bdab0358f53949f134ac8afbc350c7982e80 Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Fri, 24 Jul 2015 13:03:02 +1000
Subject: [PATCH 0247/2016] teamspeak_client: create .desktop file

---
 .../instant-messengers/teamspeak/client.nix   | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 51707d2dca6..13798061b71 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg
-, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null
-, libredirect, quazip, less, which
+{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype
+, xorg, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null
+, libredirect, quazip, less, which, unzip
 }:
 
 let
@@ -15,6 +15,16 @@ let
       xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio
     ];
 
+  desktopItem = makeDesktopItem {
+    name = "teamspeak";
+    exec = "ts3client";
+    icon = "teamspeak";
+    comment = "The TeamSpeak voice communication tool";
+    desktopName = "TeamSpeak";
+    genericName = "TeamSpeak";
+    categories = "Network";
+  };
+
 in
 
 stdenv.mkDerivation rec {
@@ -33,7 +43,13 @@ stdenv.mkDerivation rec {
                 else "1b3nbvfpd8lx3dig8z5yk6zjkbmsy6y938dhj1f562wc8adixciz";
   };
 
-  buildInputs = [ makeWrapper less which ];
+  # grab the plugin sdk for the desktop icon
+  pluginsdk = fetchurl {
+    url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.0.16.zip";
+    sha256 = "1qpqpj3r21wff3ly9ail4l6b57pcqycsh2hca926j14sdlvpv7kl";
+  };
+
+  buildInputs = [ makeWrapper less which unzip ];
 
   unpackPhase =
     ''
@@ -62,6 +78,12 @@ stdenv.mkDerivation rec {
       mkdir -p $out/lib/teamspeak
       mv * $out/lib/teamspeak/
 
+      # Make a desktop item
+      mkdir -p $out/share/applications/ $out/share/icons/
+      unzip ${pluginsdk}
+      cp pluginsdk/docs/client_html/images/logo.png $out/share/icons/teamspeak.png
+      cp ${desktopItem}/share/applications/* $out/share/applications/
+
       # Make a symlink to the binary from bin.
       mkdir -p $out/bin/
       ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client

From 61e0e5683980912bf8c5924689c6b14cc7762041 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 23 Jul 2015 23:31:16 -0500
Subject: [PATCH 0248/2016] nixpkgs: perf-tools 20150704 -> 20150723

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

diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix
index 7c9b319d255..d0776ce546a 100644
--- a/pkgs/os-specific/linux/perf-tools/default.nix
+++ b/pkgs/os-specific/linux/perf-tools/default.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation {
-  name = "perf-tools-20150704";
+  name = "perf-tools-20150723";
 
   src = fetchFromGitHub {
     owner = "brendangregg";
     repo = "perf-tools";
-    rev = "30ff4758915a98fd43020c1b45a63341208fd8b9";
-    sha256 = "0x59xm96jmpfgik6f9d6q6v85dip3kvi4ncijpghhg59ayyd5i6a";
+    rev = "80e25785e16acfbc0f048cae86a69006fa45148d";
+    sha256 = "13g98vqwy50yf2h0w6iav80kzwfz29mvnjw8akbjv4v36r9hcb69";
   };
 
   buildInputs = [ perl ];

From 3d9a4d79cf1838feb6e7200168e6e8f04fe81a17 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 24 Jul 2015 11:50:46 +0200
Subject: [PATCH 0249/2016] gnome3: Include gnome-shell-extensions in session
 path

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 +-
 pkgs/desktops/gnome-3/3.16/default.nix                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index cf6d2cab349..01ab086b092 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -40,7 +40,7 @@ in {
       example = literalExample "[ pkgs.gnome3.gpaste ]";
       description = "Additional list of packages to be added to the session search path.
                      Useful for gnome shell extensions or gsettings-conditionated autostart.";
-      apply = list: list ++ [ gnome3.gnome_shell ]; 
+      apply = list: list ++ [ gnome3.gnome_shell gnome3.gnome-shell-extensions ];
     };
 
     environment.gnome3.packageSet = mkOption {
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 38c18a6a265..da5ae3f02a1 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -20,13 +20,13 @@ let
     gtk3 # for gtk-update-icon-cache
     glib_networking gvfs dconf gnome-backgrounds gnome_control_center
     gnome-menus gnome_settings_daemon gnome_shell
-    gnome_themes_standard defaultIconTheme
+    gnome_themes_standard defaultIconTheme gnome-shell-extensions
   ];
 
   optionalPackages = with gnome3; [ baobab empathy eog epiphany evince
     gucharmap nautilus totem vino yelp gnome-bluetooth
     gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
-    gnome-shell-extensions gnome-system-log gnome-system-monitor
+    gnome-system-log gnome-system-monitor
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre

From e998ecd351a73b4fd445cb0314171c6eb4331da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 24 Jul 2015 14:32:52 +0200
Subject: [PATCH 0250/2016] virtualbox: hack-fix the build, issue #8962

For now, until a better resolution is found.
---
 pkgs/applications/virtualization/virtualbox/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 3250dc419d1..9112337d0a4 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -98,7 +98,10 @@ in stdenv.mkDerivation {
       src/apps/adpctl/VBoxNetAdpCtl.cpp
   '';
 
+  # first line: ugly hack, and it isn't yet clear why it's a problem
   configurePhase = ''
+    NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${stdenv.cc.libc}/include,,g')
+
     cat >> LocalConfig.kmk <<LOCAL_CONFIG
     VBOX_WITH_TESTCASES            :=
     VBOX_WITH_TESTSUITE            :=

From a0ab047fdbf1fe3c2d2c745e569d6b29bb305d56 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Jul 2015 10:04:31 -0300
Subject: [PATCH 0251/2016] Cherrytree: 0.35.8 -> 0.35.9

Also, adding myself to maintainers list.
---
 pkgs/applications/misc/cherrytree/default.nix | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index eb73f48559a..97b67a3ae33 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -1,18 +1,24 @@
 { stdenv, fetchurl, python, pythonPackages, gettext, pygtksourceview, sqlite }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "cherrytree-0.35.8";
+
+  name = "cherrytree-${version}";
+  version = "0.35.9";
 
   src = fetchurl {
     url = "http://www.giuspen.com/software/${name}.tar.xz";
-    sha256 = "0vqc1idzd73f4q5f4zwwypj4jiivwnb4y0r3041h2pm08y1wgsd8";
+    sha256 = "14yahp0y13z3xkpwvprm7q9x3rj6jbzi0bryqlsn3bbafdq7wnac";
   };
 
-  propagatedBuildInputs = [ pythonPackages.sqlite3 ];
+  propagatedBuildInputs = with pythonPackages;
+  [ sqlite3 ];
 
-  buildInputs = with pythonPackages; [ python gettext wrapPython pygtk dbus pygtksourceview ];
+  buildInputs = with pythonPackages;
+  [ python gettext wrapPython pygtk dbus pygtksourceview ];
 
-  pythonPath = with pythonPackages; [ pygtk dbus pygtksourceview ];
+  pythonPath = with pythonPackages;
+  [ pygtk dbus pygtksourceview ];
 
   patches = [ ./subprocess.patch ];
 
@@ -27,10 +33,21 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  meta = {
-    description = "A hierarchical note taking application, featuring rich text and syntax highlighting, storing data in a single xml or sqlite file";
+  meta = { 
+    description = "An hierarchical note taking application";
+    longDescription = ''
+      Cherrytree is an hierarchical note taking application,
+      featuring rich text, syntax highlighting and powerful search
+      capabilities. It organizes all information in units called
+      "nodes", as in a tree, and can be very useful to store any piece
+      of information, from tables and links to pictures and even entire
+      documents. All those little bits of information you have scattered
+      around your hard drive can be conveniently placed into a
+      Cherrytree document where you can easily find it.
+    ''; 
     homepage = http://www.giuspen.com/cherrytree;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = with stdenv.lib.platforms; linux;
-  };
+    license = licenses.gpl3;
+    platforms = platforms.linux; 
+    maintainers = [ maintainers.AndersonTorres ]; 
+  }; 
 }

From 447afef153bf6ebcf385028845c1e8947d61aaac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 19:25:58 +0200
Subject: [PATCH 0252/2016] Use builtin all and any functions

---
 lib/lists.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 9cb164aaade..fde6f5d42fc 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -90,12 +90,12 @@ rec {
 
   # Return true iff function `pred' returns true for at least element
   # of `list'.
-  any = pred: fold (x: y: if pred x then true else y) false;
+  any = builtins.any or (pred: fold (x: y: if pred x then true else y) false);
 
 
   # Return true iff function `pred' returns true for all elements of
   # `list'.
-  all = pred: fold (x: y: if pred x then y else false) true;
+  all = builtins.all or (pred: fold (x: y: if pred x then y else false) true);
 
 
   # Count how many times function `pred' returns true for the elements

From 6f6f66ac98218ed3061c75375784d12c5fceb687 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Jul 2015 02:38:46 +0200
Subject: [PATCH 0253/2016] Use concatStringSep primop

---
 lib/strings.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 895b230744f..d67052bbf13 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -12,7 +12,11 @@ rec {
 
 
   # Concatenate a list of strings.
-  concatStrings = lib.foldl' (x: y: x + y) "";
+  concatStrings =
+    if builtins ? concatStringsSep then
+      builtins.concatStringsSep ""
+    else
+      lib.foldl' (x: y: x + y) "";
 
 
   # Map a function over a list and concatenate the resulting strings.
@@ -31,8 +35,8 @@ rec {
 
   # Concatenate a list of strings with a separator between each element, e.g.
   # concatStringsSep " " ["foo" "bar" "xyzzy"] == "foo bar xyzzy"
-  concatStringsSep = separator: list:
-    concatStrings (intersperse separator list);
+  concatStringsSep = builtins.concatStringsSep or (separator: list:
+    concatStrings (intersperse separator list));
 
   concatMapStringsSep = sep: f: list: concatStringsSep sep (map f list);
   concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap f list);

From 9cfd128a4219ba9d1d143852fdf25be0710f97f3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Jul 2015 15:45:41 +0200
Subject: [PATCH 0254/2016] Use replaceStrings primop

---
 lib/strings.nix | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index d67052bbf13..6eb2652280c 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -8,7 +8,7 @@ in
 
 rec {
 
-  inherit (builtins) stringLength substring head tail isString;
+  inherit (builtins) stringLength substring head tail isString replaceStrings;
 
 
   # Concatenate a list of strings.
@@ -80,28 +80,25 @@ rec {
   # will likely be horribly inefficient; Nix is not a general purpose
   # programming language.  Complex string manipulations should, if
   # appropriate, be done in a derivation.
-  stringToCharacters = s: let l = stringLength s; in
-    if l == 0
-    then []
-    else map (p: substring p 1 s) (lib.range 0 (l - 1));
+  stringToCharacters = s:
+    map (p: substring p 1 s) (lib.range 0 (stringLength s - 1));
 
 
-  # Manipulate a string charcater by character and replace them by strings
-  # before concatenating the results.
+  # Manipulate a string charactter by character and replace them by
+  # strings before concatenating the results.
   stringAsChars = f: s:
     concatStrings (
       map f (stringToCharacters s)
     );
 
 
-  # same as vim escape function.
-  # Each character contained in list is prefixed by "\"
-  escape = list : string :
-    stringAsChars (c: if lib.elem c list then "\\${c}" else c) string;
+  # Escape occurrence of the elements of ‘list’ in ‘string’ by
+  # prefixing it with a backslash. For example, ‘escape ["(" ")"]
+  # "(foo)"’ returns the string ‘\(foo\)’.
+  escape = list: replaceChars list (map (c: "\\${c}") list);
 
 
-  # still ugly slow. But more correct now
-  # [] for zsh
+  # Escape all characters that have special meaning in the Bourne shell.
   escapeShellArg = lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]");
 
 
@@ -109,7 +106,8 @@ rec {
   # the `tr' command except that one character can be replace by multiple
   # ones.  e.g.,
   # replaceChars ["<" ">"] ["&lt;" "&gt;"] "<foo>" returns "&lt;foo&gt;".
-  replaceChars = del: new: s:
+  replaceChars = builtins.replaceStrings or (
+    del: new: s:
     let
       substList = lib.zipLists del new;
       subst = c:
@@ -119,20 +117,22 @@ rec {
         else
           found.snd;
     in
-      stringAsChars subst s;
+      stringAsChars subst s);
 
 
-  # Case conversion utilities
+  # Case conversion utilities.
   lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz";
   upperChars = stringToCharacters "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
   toLower = replaceChars upperChars lowerChars;
   toUpper = replaceChars lowerChars upperChars;
 
-  # Appends string context from another string
+
+  # Appends string context from another string.
   addContextFrom = a: b: substring 0 0 a + b;
 
+
   # Compares strings not requiring context equality
-  # Obviously, a workaround but works on all Nix versions
+  # Obviously, a workaround but works on all Nix versions.
   eqStrings = a: b: addContextFrom b a == addContextFrom a b;
 
 

From 2d9885db9e8b790ba2f8fc69b50a073260822a4f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Jul 2015 15:48:29 +0200
Subject: [PATCH 0255/2016] Remove eqStrings

It's no longer needed. Also clean up some comments.
---
 lib/strings.nix | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 6eb2652280c..c5af703e4e1 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -65,13 +65,13 @@ rec {
 
   # Determine whether a string has given prefix/suffix.
   hasPrefix = pref: str:
-    eqStrings (substring 0 (stringLength pref) str) pref;
+    substring 0 (stringLength pref) str == pref;
   hasSuffix = suff: str:
     let
       lenStr = stringLength str;
       lenSuff = stringLength suff;
     in lenStr >= lenSuff &&
-       eqStrings (substring (lenStr - lenSuff) lenStr str) suff;
+       substring (lenStr - lenSuff) lenStr str == suff;
 
 
   # Convert a string to a list of characters (i.e. singleton strings).
@@ -102,10 +102,7 @@ rec {
   escapeShellArg = lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]");
 
 
-  # replace characters by their substitutes.  This function is equivalent to
-  # the `tr' command except that one character can be replace by multiple
-  # ones.  e.g.,
-  # replaceChars ["<" ">"] ["&lt;" "&gt;"] "<foo>" returns "&lt;foo&gt;".
+  # Obsolete - use replaceStrings instead.
   replaceChars = builtins.replaceStrings or (
     del: new: s:
     let
@@ -131,11 +128,6 @@ rec {
   addContextFrom = a: b: substring 0 0 a + b;
 
 
-  # Compares strings not requiring context equality
-  # Obviously, a workaround but works on all Nix versions.
-  eqStrings = a: b: addContextFrom b a == addContextFrom a b;
-
-
   # Cut a string with a separator and produces a list of strings which were
   # separated by this separator. e.g.,
   # `splitString "." "foo.bar.baz"' returns ["foo" "bar" "baz"].
@@ -181,7 +173,7 @@ rec {
       sufLen = stringLength suf;
       sLen = stringLength s;
     in
-      if sufLen <= sLen && eqStrings suf (substring (sLen - sufLen) sufLen s) then
+      if sufLen <= sLen && suf == substring (sLen - sufLen) sufLen s then
         substring 0 (sLen - sufLen) s
       else
         s;
@@ -200,14 +192,13 @@ rec {
 
 
   # Extract name with version from URL. Ask for separator which is
-  # supposed to start extension
-  nameFromURL = url: sep: let
-    components = splitString "/" url;
-    filename = lib.last components;
-    name = builtins.head (splitString sep filename);
-  in
-  assert ! eqStrings name filename;
-  name;
+  # supposed to start extension.
+  nameFromURL = url: sep:
+    let
+      components = splitString "/" url;
+      filename = lib.last components;
+      name = builtins.head (splitString sep filename);
+    in assert name !=  filename; name;
 
 
   # Create an --{enable,disable}-<feat> string that can be passed to
@@ -215,7 +206,8 @@ rec {
   enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}";
 
 
-  # Create a fixed width string with additional prefix to match required width
+  # Create a fixed width string with additional prefix to match
+  # required width.
   fixedWidthString = width: filler: str:
     let
       strw = lib.stringLength str;
@@ -225,6 +217,6 @@ rec {
       if strw == width then str else filler + fixedWidthString reqWidth filler str;
 
 
-  # Format a number adding leading zeroes up to fixed width
+  # Format a number adding leading zeroes up to fixed width.
   fixedWidthNumber = width: n: fixedWidthString width "0" (toString n);
 }

From c399f94bb3bfad7fab7760d4842b38c9642541b5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Jul 2015 15:55:39 +0200
Subject: [PATCH 0256/2016] intersperse: Fix quadratic performance

---
 lib/strings.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index c5af703e4e1..bac03c9d7ad 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -29,8 +29,7 @@ rec {
   intersperse = separator: list:
     if list == [] || length list == 1
     then list
-    else [(head list) separator]
-         ++ (intersperse separator (tail list));
+    else tail (lib.concatMap (x: [separator x]) list);
 
 
   # Concatenate a list of strings with a separator between each element, e.g.
@@ -128,9 +127,9 @@ rec {
   addContextFrom = a: b: substring 0 0 a + b;
 
 
-  # Cut a string with a separator and produces a list of strings which were
-  # separated by this separator. e.g.,
-  # `splitString "." "foo.bar.baz"' returns ["foo" "bar" "baz"].
+  # Cut a string with a separator and produces a list of strings which
+  # were separated by this separator; e.g., `splitString "."
+  # "foo.bar.baz"' returns ["foo" "bar" "baz"].
   splitString = _sep: _s:
     let
       sep = addContextFrom _s _sep;

From 3d6bd6a1facff3993d1b581dfcf9ee2b6a751642 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Jul 2015 16:56:46 +0200
Subject: [PATCH 0257/2016] gfortran: disable parallel building to avoid weird
 build failures

More details are at https://github.com/NixOS/nixpkgs/commit/784025c7475610fb2fe8e28044d9d50bec1d93d1#commitcomment-12328357.
---
 pkgs/development/compilers/gcc/4.9/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 9069387762f..cf67d880a2c 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -61,7 +61,10 @@ let version = "4.9.3";
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
 
-    enableParallelBuilding = true;
+    # Builds of gfortran have failed with strange errors that we cannot reproduce
+    # (http://hydra.nixos.org/build/23951123). Our best guess is that the build
+    # system has bugs that are exposed by compiling with multiple threads.
+    enableParallelBuilding = !langFortran;
 
     patches = [ ]
       ++ optional enableParallelBuilding ../parallel-bconfig.patch

From e3c374fac4fa76ad92275fd7a109e5098e086969 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 24 Jul 2015 12:15:37 -0400
Subject: [PATCH 0258/2016] cron: Actually enable the service if enabled

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

diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index a92e8b65d2a..02d80a77da5 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -93,7 +93,7 @@ in
 
     { services.cron.enable = mkDefault (allFiles != []); }
 
-    (mkIf (config.services.cron.enable && allFiles != []) {
+    (mkIf (config.services.cron.enable) {
 
       security.setuidPrograms = [ "crontab" ];
 

From a0249ed425d7c7a357716736d489e6c187997566 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 24 Jul 2015 20:46:14 +0200
Subject: [PATCH 0259/2016] buildRustPackage: Fix rust builds due to #7524

Fixes #8966
---
 pkgs/build-support/rust/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index cd19782e611..c23581d9601 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -44,7 +44,7 @@ in stdenv.mkDerivation (args // {
     export CARGO_HOME="$(realpath deps)"
 
     # Let's find out which $indexHash cargo uses for file:///dev/null
-    (cd $sourceRoot && cargo fetch &>/dev/null)
+    (cd $sourceRoot && cargo fetch &>/dev/null) || true
     cd deps
     indexHash="$(basename $(echo registry/index/*))"
 

From 6b0452768cc5eb87e929d19d3b7d80d785b8c01b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 24 Jul 2015 21:40:25 +0200
Subject: [PATCH 0260/2016] geolite-legacy: 2015-07-08 -> 2015-07-24

---
 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 138a9c40c79..49db550c503 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,17 +8,17 @@ 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-07-08";
+  version = "2015-07-24";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
-    "0c6jcmlgkybsqiwqwa21igjazf95dj38mn516cqqqfdg7ciaj1d5";
+    "1yacbh8qcakmnpipscdh99vmsm0874g2gkq8gp8hjgkgi0zvcsnz";
   srcGeoIPv6 = fetchDB
     "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
-    "1vi82p41vas18yp17yk236pn1xamsi9662aav79fa0hm43i3ydx3";
+    "038ll8142svhyffxxrg0isrr16rjbz0cnkhd14mck77f1v8z01y5";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
     "0x5ihg7qikzc195nix9r0izvbdnj4hy4rznvaxk56rf8yqcigdyv";

From df6381afecee4aebc559ea94f72acaa7dbd6c6ed Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 24 Jul 2015 22:03:32 +0200
Subject: [PATCH 0261/2016] stress-ng: 0.04.11 -> 0.04.12

Fixes/features:
  * Fix segfault in metrics because MMAPFORK macro not defined correctly
  * Add --cpu-load-slice option for CPU stressor time slice tweaks
---
 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 5336a54e190..a2cff62e2c8 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr }:
 
-let version = "0.04.11"; in
+let version = "0.04.12"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "0hh1cqszviza4hvaj0hkhg8r42zjikcj6rc3l6fviwmr7f247ls5";
+    sha256 = "0gc5mai1dzhb7n8wsy2kzx0q85zbsa2ilvc2fpa30ilcwmg28kgm";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From 9651f06a2d5dd2098f349326487e7f3d291727f1 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Tue, 21 Jul 2015 18:39:46 -0400
Subject: [PATCH 0262/2016] smlnj: build on darwin

---
 pkgs/development/compilers/smlnj/default.nix | 14 +++++++++++---
 pkgs/top-level/all-packages.nix              |  4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index a2b8d4f63b9..e4d4dc1ae10 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, darwin }:
 let
   version = "110.78";
   baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}";
@@ -34,7 +34,15 @@ in stdenv.mkDerivation {
   patchPhase = ''
     sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh
     echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl
-  '';
+  '' + stdenv.lib.optionalString stdenv.isDarwin (with darwin; ''
+    sed -i '/^[[:space:]]*\*x86-darwin\*)$/,/^[[:space:]]*\*) ;;/ c\
+\  \*x86-darwin\*)\
+\    INCLFILE=${osx_sdk}/Developer/SDKs/${osx_sdk.name}/usr/include/unistd.h\
+\    ;;\
+\  \*) ;;
+' base/runtime/config/gen-posix-names.sh
+    sed -i 's|^AS =\([[:space:]]*\)/usr/bin/as|AS =\1as|' base/runtime/objs/mk.x86-darwin
+  '');
 
   unpackPhase = ''
     for s in $sources; do
@@ -64,7 +72,7 @@ in stdenv.mkDerivation {
     description = "Standard ML of New Jersey, a compiler";
     homepage    = http://smlnj.org;
     license     = licenses.bsd3;
-    platforms   = [ "i686-linux" ];
+    platforms   = [ "i686-linux" ] ++ platforms.darwin;
     maintainers = with maintainers; [ thoughtpolice ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b350b63af70..94d8e6f6cdc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4717,7 +4717,9 @@ let
   sdcc = callPackage ../development/compilers/sdcc { };
 
   smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
-  smlnj = callPackage_i686 ../development/compilers/smlnj { };
+  smlnj = if stdenv.isDarwin
+            then callPackage ../development/compilers/smlnj { }
+            else callPackage_i686 ../development/compilers/smlnj { };
 
   sqldeveloper = callPackage ../development/tools/database/sqldeveloper { };
 

From 7a21c5c27e0513e647f801ef6cf6649cbdc42ad9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 25 Jul 2015 02:27:57 +0200
Subject: [PATCH 0263/2016] font-awesome-ttf: update sha256 hash changed
 upstream

cc maintainer @baldo.
---
 pkgs/data/fonts/font-awesome-ttf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix
index 7e07ec8a37c..ed91713d03a 100644
--- a/pkgs/data/fonts/font-awesome-ttf/default.nix
+++ b/pkgs/data/fonts/font-awesome-ttf/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip";
-    sha256 = "018syfvkj01jym60mpys93xv84ky9l2x90gprnm9npzwkw5169jc";
+    sha256 = "0wg9q6mq026jjw1bsyj9b5dgba7bb4h7i9xiwgsfckd412xpsbzd";
   };
 
   buildCommand = ''

From 1edef466c098eb0a94494223b7beeacf2f28507e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 16 Jul 2015 21:44:31 +0200
Subject: [PATCH 0264/2016] python-packages: prompt_toolkit 0.42 -> 0.43

New features:
- Added eventloop and patch_stdout parameters to get_input.
- Inputhook support added.
- Added ShowLeadingWhiteSpaceProcessor and ShowTrailingWhiteSpaceProcessor
  processors.
- Accept Filter as multiline parameter in 'shortcuts'.
- MultiColumnCompletionsMenu + display_completions_in_columns parameter
  in shortcuts.

Backwards incompatible changes (not used in nixpkgs):
- Layout.width was renamed to preferred_width and now receives a
  max_available_width parameter.
---
 pkgs/top-level/python-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 19f8695c8f8..dd91cd41c38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9161,6 +9161,10 @@ let
       click configobj prompt_toolkit psycopg2 pygments sqlparse
     ];
 
+    postPatch = ''
+      substituteInPlace setup.py --replace "==" ">="
+    '';
+
     meta = {
       inherit version;
       description = "Command-line interface for PostgreSQL";
@@ -9460,10 +9464,10 @@ let
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.42";
+    version = "0.43";
 
     src = pkgs.fetchurl {
-      sha256 = "04nywwyxzkl3qgah29i959irsbqi8viiadxfkxycqh7hq2yq8h86";
+      sha256 = "1z5fap8c7q27p0s82jn11i6fwg0g9zm2zy5na8is53kgbhl10fdr";
       url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
     };
 

From 161c0e7876aea932b5344a578b65e412490c3822 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 25 Jul 2015 03:03:35 +0200
Subject: [PATCH 0265/2016] pecita: 1.1 -> 5.0

The upstream source file has no version component and is updated in
place.

cc maintainer @rycee.
---
 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 d83d9afcdfd..a64512af845 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 = "1.1";
+  version = "5.0";
 
   src = fetchurl {
     url = "http://pecita.eu/b/Pecita.otf";
-    sha256 = "07krzpbmc5yhfbf3aklv1f150i2g1spaan9girmg3189jsn6qw6p";
+    sha256 = "1smf1mqciwavf29lwgzjam3xb37bwxp6wf6na4c9xv6islidsrd9";
   };
 
   phases = ["installPhase"];

From 6bff6eec672c36357fe5bff528dcf934a24518e0 Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Sat, 25 Jul 2015 11:58:54 +1000
Subject: [PATCH 0266/2016] v4l2loopback: update 0.8.0 -> 0.9.1

---
 .../linux/v4l2loopback/default.nix            |  6 ++--
 .../linux/v4l2loopback/kernel-3.18-fix.patch  | 31 -------------------
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch

diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index 127341412ab..13617360d2d 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "v4l2loopback-${version}-${kernel.version}";
-  version = "0.8.0";
+  version = "0.9.1";
 
   src = fetchurl {
     url = "https://github.com/umlaeute/v4l2loopback/archive/v${version}.tar.gz";
-    sha256 = "1rhsgc4prrj8s6njixic7fs5m3gs94v9hhf3am6lnfh5yv6yab9h";
+    sha256 = "1crkhxlnskqrfj3f7jmiiyi5m75zmj7n0s26xz07wcwdzdf2p568";
   };
   
   preBuild = ''
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
     export PATH=${kmod}/sbin:$PATH
   '';
 
-  patches = [ ./kernel-3.18-fix.patch ];
-  
   buildInputs = [ kmod ];
   
   makeFlags = [
diff --git a/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch b/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch
deleted file mode 100644
index 9f6dc57f322..00000000000
--- a/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 21195cd6d1ff767a271359dfa7d201078f766611 Mon Sep 17 00:00:00 2001
-From: tatokis <tasos@tasossah.com>
-Date: Mon, 24 Nov 2014 16:28:33 +0200
-Subject: [PATCH] Updated v4l2loopback.c to compile on >= 3.18 kernel
-
----
- v4l2loopback.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/v4l2loopback.c b/v4l2loopback.c
-index bb228bb..67f6ed4 100644
---- a/v4l2loopback.c
-+++ b/v4l2loopback.c
-@@ -498,10 +498,15 @@ static ssize_t attr_store_maxopeners(struct device *cd,
- {
- 	struct v4l2_loopback_device *dev = NULL;
- 	unsigned long curr = 0;
--
-+	
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
-+	if (kstrtoul(buf, 0, &curr))
-+		return -EINVAL;
-+	#else
- 	if (strict_strtoul(buf, 0, &curr))
- 		return -EINVAL;
--
-+	#endif
-+	
- 	dev = v4l2loopback_cd2dev(cd);
- 
- 	if (dev->max_openers == curr)

From 078ee4ac557d101af656eae2ef3a681f406b89b0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 25 Jul 2015 04:29:27 +0200
Subject: [PATCH 0267/2016] copy-com: 1.47.0410 -> 3.2.01.0481 + several fixes

The graphical UI (the largest part of this package) never worked; fixed.

Added myself as a maintainer.
---
 .../modules/services/networking/copy-com.nix  | 106 +++++++++---------
 .../networking/copy-com/default.nix           |  44 +++++---
 2 files changed, 80 insertions(+), 70 deletions(-)

diff --git a/nixos/modules/services/networking/copy-com.nix b/nixos/modules/services/networking/copy-com.nix
index 36bd29109b8..69a41ab9796 100644
--- a/nixos/modules/services/networking/copy-com.nix
+++ b/nixos/modules/services/networking/copy-com.nix
@@ -1,53 +1,53 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  
-  cfg = config.services.copy-com;
-
-in 
-
-{
-  options = {
-
-    services.copy-com = {
-	  
-	  enable = mkOption {
-          default = false;
-          description = "
-            Enable the copy.com client.
-
-            The first time copy.com is run, it needs to be configured. Before enabling run 
-            copy_console manually.
-          ";
-      };
-
-      user = mkOption {
-        description = "The user for which copy should run.";
-      };
-
-      debug = mkOption {
-        default = false;
-        description = "Output more.";
-      };
-	  };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.postfix ];
-
-    systemd.services."copy-com-${cfg.user}" = {
-      description = "Copy.com Client";
-      after = [ "network.target" "local-fs.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.copy-com}/bin/copy_console ${if cfg.debug then "-consoleOutput -debugToConsole=dirwatch,path-watch,csm_path,csm -debug -console" else ""}";
-        User = "${cfg.user}";
-      };
-
-    };
-  };
-
-}
-
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.copy-com;
+
+in
+
+{
+  options = {
+
+    services.copy-com = {
+
+	  enable = mkOption {
+          default = false;
+          description = "
+            Enable the Copy.com client.
+            NOTE: before enabling the client for the first time, it must be
+            configured by first running CopyConsole (command line) or CopyAgent
+            (graphical) as the appropriate user.
+          ";
+      };
+
+      user = mkOption {
+        description = "The user for which the Copy.com client should be run.";
+      };
+
+      debug = mkOption {
+        default = false;
+        description = "Output more (debugging) messages to the console.";
+      };
+	  };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.postfix ];
+
+    systemd.services."copy-com-${cfg.user}" = {
+      description = "Copy.com client";
+      after = [ "network.target" "local-fs.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.copy-com}/bin/CopyConsole ${if cfg.debug then "-consoleOutput -debugToConsole=dirwatch,path-watch,csm_path,csm -debug -console" else ""}";
+        User = "${cfg.user}";
+      };
+
+    };
+  };
+
+}
+
diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix
index 9ef8caafa98..3a3cf4df284 100644
--- a/pkgs/applications/networking/copy-com/default.nix
+++ b/pkgs/applications/networking/copy-com/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, coreutils, fetchurl, patchelf, gcc }:
+{ stdenv, fetchurl, patchelf, fontconfig, freetype
+, gcc, glib, libICE, libSM, libX11, libXext, libXrender }:
 
 let
   arch = if stdenv.system == "x86_64-linux" then "x86_64"
@@ -13,45 +14,54 @@ let
 
   appdir = "opt/copy";
   
+  libPackages = [ fontconfig freetype gcc.cc glib libICE libSM libX11 libXext
+    libXrender ];
+  libPaths = stdenv.lib.concatStringsSep ":"
+    (map (path: "${path}/lib") libPackages);
+
 in stdenv.mkDerivation {
   
-  name = "copy-com-1.47.0410";
+  name = "copy-com-3.2.01.0481";
 
   src = fetchurl {
     # Note: copy.com doesn't version this file. Annoying.
     url = "https://copy.com/install/linux/Copy.tgz";
-    sha256 = "a48c69f6798f888617cfeef5359829e619057ae0e6edf3940b4ea6c81131012a";
+    sha256 = "0bpphm71mqpaiygs57kwa23nli0qm64fvgl1qh7fkxyqqabh4g7k";
   };
 
-  buildInputs = [ coreutils patchelf ];
+  nativeBuildInputs = [ patchelf ];
 
   phases = "unpackPhase installPhase";
 
   installPhase = ''
     mkdir -p $out/opt
     cp -r ${arch} "$out/${appdir}"
-    ensureDir "$out/bin"
-    ln -s "$out/${appdir}/CopyConsole" "$out/bin/copy_console"
-    ln -s "$out/${appdir}/CopyAgent" "$out/bin/copy_agent"
-    ln -s "$out/${appdir}/CopyCmd" "$out/bin/copy_cmd"
-    patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
-      "$out/${appdir}/CopyConsole"
 
-    RPATH=${gcc.cc}/lib:$out/${appdir}
-    echo "updating rpaths to: $RPATH"
+    mkdir -p "$out/bin"
+    for binary in Copy{Agent,Console,Cmd}; do
+      binary="$out/${appdir}/$binary"
+      ln -sv "$binary" "$out/bin"
+      patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} "$binary"
+    done
+
+    # Older versions of this package happily installed broken copies of
+    # anything other than CopyConsole - which was then also mangled to
+    # copy_console for some reason. Keep backwards compatibility (only
+    # for CopyConsole) for now; the NixOS service is already fixed.
+    ln -sv "$out/bin"/{CopyConsole,copy_console}
+
+    RPATH=${libPaths}:$out/${appdir}
+    echo "Updating rpaths to $RPATH in:"
     find "$out/${appdir}" -type f -a -perm +0100 \
       -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
-
-
-
   '';
 
   meta = {
     homepage = http://copy.com;
-    description = "Copy.com Client";
+    description = "Copy.com graphical & command-line clients";
     # Closed Source unfortunately.
     license = stdenv.lib.licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [ nathan-gs ];
+    maintainers = with stdenv.lib.maintainers; [ nathan-gs nckx ];
     # NOTE: Copy.com itself only works on linux, so this is ok.
     platforms = stdenv.lib.platforms.linux;
   };

From 61b3816ff260de7c5348f18e773e2de8f25a9f49 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 25 Jul 2015 05:21:20 +0200
Subject: [PATCH 0268/2016] geolite-legacy: 2015-07-24 -> 2015-07-25

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

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 49db550c503..df9458903d3 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-07-24";
+  version = "2015-07-25";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     "0x5ihg7qikzc195nix9r0izvbdnj4hy4rznvaxk56rf8yqcigdyv";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
-    "0xjzg76vdsayxyy1yyw64w781vad4c9nbhw61slh2qmazdr360g9";
+    "0j5dq06pjrh6d94wczsg6qdys4v164nvp2a7qqrg8w4knh94qp6n";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
     "18kxswr0b5klimfpj1zhxipvyvrljvcywic4jc1ggcr44lf4hj9w";

From 99457b40ac3a1404287c671f82d1a2ebbcbcbcc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 25 Jul 2015 08:43:53 +0200
Subject: [PATCH 0269/2016] compiz: fix build by dontMoveLib64 = true;

---
 pkgs/applications/window-managers/compiz/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index 6b9a579a08b..977409d0ef1 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -50,6 +50,9 @@ stdenv.mkDerivation rec {
       --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
   '';
 
+  # automatic moving fails, perhaps due to having two $out/lib*/pkgconfig
+  dontMoveLib64 = true;
+
   meta = {
     description = "Compoziting window manager";
     homepage = "http://launchpad.net/compiz/";

From 389c90aa868f16165610b1efe34f344a02105ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 25 Jul 2015 09:13:52 +0200
Subject: [PATCH 0270/2016] llvmPackages*: refactor to use callPackage, etc.

Also use recurseIntoAttrs only on the default version (instead of only on 3.4).

The "self" variants (stil) don't build and they're inconsistent
versions. /cc @shlevy (fea2266290d6).
---
 .../compilers/llvm/3.6/default.nix            |  2 +-
 pkgs/top-level/all-packages.nix               | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix
index 65d81711f9e..c99070ba383 100644
--- a/pkgs/development/compilers/llvm/3.6/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
+{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
 let
   callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b350b63af70..7889e5c334d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4143,24 +4143,21 @@ let
   llvm_36 = llvmPackages_36.llvm;
   llvm_35 = llvmPackages_35.llvm;
   llvm_34 = llvmPackages_34.llvm;
-  llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;
+  llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix { };
 
-  llvm_v = path: callPackage path { };
+  llvmPackages = recurseIntoAttrs llvmPackages_36;
 
-  llvmPackages = llvmPackages_36;
-
-  llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
-    inherit stdenv newScope fetchurl;
-    isl = isl_0_12;
-  });
-  llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };
-
-  llvmPackages_35 = import ../development/compilers/llvm/3.5 {
-    inherit pkgs stdenv newScope fetchurl isl;
+  llvmPackagesSelf = llvmPackages_34.override {
+    stdenv = libcxxStdenv;
   };
 
-  llvmPackages_36 = import ../development/compilers/llvm/3.6 {
-    inherit pkgs stdenv newScope fetchurl isl wrapCC;
+  llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 {
+    isl = isl_0_12;
+  };
+
+  llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 { };
+
+  llvmPackages_36 = callPackage ../development/compilers/llvm/3.6 {
     inherit (stdenvAdapters) overrideCC;
   };
 

From 9d5508d85c33b8fb22d79dde6176792eac2c2696 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 24 Jul 2015 19:03:11 +0200
Subject: [PATCH 0271/2016] meld: 3.12.3 -> 3.14.0 (close #8982)

---
 .../version-management/meld/default.nix          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 2a69d140669..2f7c4af0024 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, makeWrapper
 , libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo
-, hicolor_icon_theme
 }:
 
 
 let
-  minor = "3.12";
-  version = "${minor}.3";
+  minor = "3.14";
+  version = "${minor}.0";
 in
 
 buildPythonPackage rec {
@@ -15,13 +14,13 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
-    sha256 = "1zg6qhm53j0vxmjj3pcj2hwi8c12dxzmlh98zks0jnwhqv2p4dfv";
+    sha256 = "0g0h9wdr6nqdalqkz4r037569apw253cklwr17x0zjc7nwv2j3j3";
   };
 
   buildInputs = [
     python27 intltool makeWrapper itstool libxml2
     gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
   propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];
 
@@ -41,18 +40,19 @@ buildPythonPackage rec {
   preFixup = ''
     wrapProgram $out/bin/meld \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
+      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
   '';
 
   patchPhase = ''
-    sed -e 's,#!.*,#!${python27}/bin/python27,' -i bin/meld
+    patchShebangs bin/meld
   '';
 
   pythonPath = [ gtk3 ];
 
   meta = with stdenv.lib; {
     description = "Visual diff and merge tool";
-    homepage = http://meld.sourceforge.net;
+    homepage = http://meldmerge.org/;
     license = stdenv.lib.licenses.gpl2;
     platforms = platforms.linux ++ stdenv.lib.platforms.darwin;
   };

From 6ccd69872a1b7349aec68e244ede8c331874c5ba Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 25 Jul 2015 10:49:53 -0300
Subject: [PATCH 0272/2016] Stella: 4.6 -> 4.6.1

---
 pkgs/misc/emulators/stella/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index a2338f376a7..04976a2bb83 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -4,15 +4,14 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "stella-${version}";
-  version = "4.6";
+  version = "4.6.1";
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/project/stella/stella/${version}/${name}-src.tar.gz";
-    sha256 = "03vg8cxr0hn99vrr2dcwhv610xi9vhlw08ypazpm0nny522a9j4d";
+    sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1";
   };
 
-  buildInputs = with stdenv.lib;
-  [ pkgconfig SDL2 ];
+  buildInputs = [ pkgconfig SDL2 ];
 
   meta = {
     description = "An open-source Atari 2600 VCS emulator";

From 1dca2fba7f814a7803dbb40e17a80f8ec4e522cb Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 25 Jul 2015 15:40:29 +0100
Subject: [PATCH 0273/2016] apache-httpd: update minor versions of both 2.2 and
 2.4 for security-related fixes

---
 pkgs/servers/http/apache-httpd/2.2.nix | 4 ++--
 pkgs/servers/http/apache-httpd/2.4.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index 2af7b761c24..99d6fe12aa1 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert mpm == "prefork" || mpm == "worker" || mpm == "event";
 
 stdenv.mkDerivation rec {
-  version = "2.2.29";
+  version = "2.2.31";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "1d6a8fbc1391d358cc6fe430edc16222b97258d5";
+    sha256 = "1b165zi7jrrlz5wmyy3b34lcs3dl4g0dymfb0qxwdnimylcrsbzk";
   };
 
   buildInputs = [perl apr aprutil pcre] ++
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index cb550652b78..29f8a9621c9 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
 assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.12";
+  version = "2.4.16";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "1r7a63ka41vlswrqbb21vall6sc7svwgd497kb6dh8a6zvnkjvdd";
+    sha256 = "0hrpy6gjwma0kba7p7m61vwh82qcnkf08123lrwpg257m93hnrmc";
   };
 
   buildInputs = [perl] ++

From 174dd0eae73ad95b7bf8e364095f33e5163a448b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Jul 2015 18:04:27 +0200
Subject: [PATCH 0274/2016] Fix description of boot.consoleLogLevel

---
 nixos/modules/installer/cd-dvd/iso-image.nix | 4 ++++
 nixos/modules/system/boot/kernel.nix         | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index c9abff2ecfc..3712d3723d0 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -218,6 +218,8 @@ in
     system.boot.loader.kernelFile = "bzImage";
     environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
 
+    boot.consoleLogLevel = 7;
+
     # In stage 1 of the boot, mount the CD as the root FS by label so
     # that we don't need to know its device.  We pass the label of the
     # root filesystem on the kernel command line, rather than in
@@ -229,6 +231,8 @@ in
     boot.kernelParams =
       [ "root=LABEL=${config.isoImage.volumeID}"
         "boot.shell_on_fail"
+        "nomodeset"
+        "systemd.log_level=debug"
       ];
 
     fileSystems."/" =
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 63a095be631..ae868219aa4 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -49,9 +49,8 @@ in
       type = types.int;
       default = 4;
       description = ''
-        The kernel console log level.  Only log messages with a
-        priority numerically less than this will appear on the
-        console.
+        The kernel console log level.  Log messages with a priority
+        numerically less than this will not appear on the console.
       '';
     };
 

From c49b24c94004807f3de5eef9535d2d50d184dbd6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Jul 2015 18:54:26 +0200
Subject: [PATCH 0275/2016] Fix capitalisation

---
 .../modules/system/boot/loader/grub/grub.nix  | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index c7cf712e3c2..0b349749244 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -10,7 +10,7 @@ let
 
   realGrub = if cfg.version == 1 then pkgs.grub
     else if cfg.zfsSupport then pkgs.grub2.override { zfsSupport = true; }
-    else if cfg.enableTrustedboot then pkgs.trustedGrub
+    else if cfg.enableTrustedBoot then pkgs.trustedGrub
            else pkgs.grub2;
 
   grub =
@@ -112,7 +112,7 @@ in
         description = ''
           The devices on which the boot loader, GRUB, will be
           installed. Can be used instead of <literal>device</literal> to
-          install grub into multiple devices (e.g., if as softraid arrays holding /boot).
+          install GRUB onto multiple devices.
         '';
       };
 
@@ -135,8 +135,8 @@ in
             example = "/boot1";
             type = types.str;
             description = ''
-              The path to the boot directory where grub will be written. Generally
-              this boot parth should double as an efi path.
+              The path to the boot directory where GRUB will be written. Generally
+              this boot path should double as an EFI path.
             '';
           };
 
@@ -166,7 +166,7 @@ in
             example = [ "/dev/sda" "/dev/sdb" ];
             type = types.listOf types.str;
             description = ''
-              The path to the devices which will have the grub mbr written.
+              The path to the devices which will have the GRUB MBR written.
               Note these are typically device paths and not paths to partitions.
             '';
           };
@@ -197,7 +197,7 @@ in
         type = types.lines;
         description = ''
           Additional bash commands to be run at the script that
-          prepares the grub menu entries.
+          prepares the GRUB menu entries.
         '';
       };
 
@@ -276,7 +276,7 @@ in
         example = "1024x768";
         type = types.str;
         description = ''
-          The gfxmode to pass to grub when loading a graphical boot interface under efi.
+          The gfxmode to pass to GRUB when loading a graphical boot interface under EFI.
         '';
       };
 
@@ -285,7 +285,7 @@ in
         example = "auto";
         type = types.str;
         description = ''
-          The gfxmode to pass to grub when loading a graphical boot interface under bios.
+          The gfxmode to pass to GRUB when loading a graphical boot interface under BIOS.
         '';
       };
 
@@ -330,10 +330,10 @@ in
         type = types.addCheck types.str
           (type: type == "uuid" || type == "label" || type == "provided");
         description = ''
-          Determines how grub will identify devices when generating the
+          Determines how GRUB will identify devices when generating the
           configuration file. A value of uuid / label signifies that grub
           will always resolve the uuid or label of the device before using
-          it in the configuration. A value of provided means that grub will
+          it in the configuration. A value of provided means that GRUB will
           use the device name as show in <command>df</command> or
           <command>mount</command>. Note, zfs zpools / datasets are ignored
           and will always be mounted using their labels.
@@ -344,7 +344,7 @@ in
         default = false;
         type = types.bool;
         description = ''
-          Whether grub should be build against libzfs.
+          Whether GRUB should be build against libzfs.
           ZFS support is only available for GRUB v2.
           This option is ignored for GRUB v1.
         '';
@@ -354,7 +354,7 @@ in
         default = false;
         type = types.bool;
         description = ''
-          Whether grub should be build with EFI support.
+          Whether GRUB should be build with EFI support.
           EFI support is only available for GRUB v2.
           This option is ignored for GRUB v1.
         '';
@@ -364,16 +364,16 @@ in
         default = false;
         type = types.bool;
         description = ''
-          Enable support for encrypted partitions. Grub should automatically
+          Enable support for encrypted partitions. GRUB should automatically
           unlock the correct encrypted partition and look for filesystems.
         '';
       };
 
-      enableTrustedboot = mkOption {
+      enableTrustedBoot = mkOption {
         default = false;
         type = types.bool;
         description = ''
-          Enable trusted boot. Grub will measure all critical components during
+          Enable trusted boot. GRUB will measure all critical components during
           the boot process to offer TCG (TPM) support.
         '';
       };
@@ -429,7 +429,7 @@ in
       assertions = [
         {
           assertion = !cfg.zfsSupport || cfg.version == 2;
-          message = "Only grub version 2 provides zfs support";
+          message = "Only GRUB version 2 provides ZFS support";
         }
         {
           assertion = cfg.mirroredBoots != [ ];
@@ -441,19 +441,19 @@ in
           message = "You cannot have duplicated devices in mirroredBoots";
         }
         {
-          assertion = !cfg.enableTrustedboot || cfg.version == 2;
+          assertion = !cfg.enableTrustedBoot || cfg.version == 2;
           message = "Trusted GRUB is only available for GRUB 2";
         }
         {
-          assertion = !cfg.efiSupport || !cfg.enableTrustedboot;
+          assertion = !cfg.efiSupport || !cfg.enableTrustedBoot;
           message = "Trusted GRUB does not have EFI support";
         }
         {
-          assertion = !cfg.zfsSupport || !cfg.enableTrustedboot;
+          assertion = !cfg.zfsSupport || !cfg.enableTrustedBoot;
           message = "Trusted GRUB does not have ZFS support";
         }
         {
-          assertion = !cfg.enableTrustedboot;
+          assertion = !cfg.enableTrustedBoot;
           message = "Trusted GRUB can break your system. Remove assertion if you want to test trustedGRUB nevertheless.";
         }
       ] ++ flip concatMap cfg.mirroredBoots (args: [
@@ -471,7 +471,7 @@ in
         }
       ] ++ flip map args.devices (device: {
         assertion = device == "nodev" || hasPrefix "/" device;
-        message = "Grub devices must be absolute paths, not ${dev} in ${args.path}";
+        message = "GRUB devices must be absolute paths, not ${dev} in ${args.path}";
       }));
     })
 

From 6948c3ab80797770bc584e521b5c5a8ca02b495e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Jul 2015 19:03:52 +0200
Subject: [PATCH 0276/2016] Installer: Add nomodeset and blacklist the nouveau
 driver

I observed a hang at the moment the nouveau driver gets loaded on a
GTX 970.
---
 nixos/doc/manual/installation/installing-usb.xml |  4 ++--
 nixos/modules/installer/cd-dvd/iso-image.nix     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index 97e3d2eaa1c..5def6e8753f 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -6,8 +6,8 @@
 
 <title>Booting from a USB Drive</title>
 
-<para>For systems without CD drive, the NixOS livecd can be booted from
-a usb stick. For non-UEFI installations,
+<para>For systems without CD drive, the NixOS live CD can be booted from
+a USB stick. For non-UEFI installations,
 <link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>
 will work. For UEFI installations, you should mount the ISO, copy its contents
 verbatim to your drive, then either:
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 3712d3723d0..1dec7bd0f43 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -30,8 +30,7 @@ let
   #   * COM32 entries (chainload, reboot, poweroff) are not recognized. They
   #     result in incorrect boot entries.
 
-  baseIsolinuxCfg =
-    ''
+  baseIsolinuxCfg = ''
     SERIAL 0 38400
     TIMEOUT ${builtins.toString syslinuxTimeout}
     UI vesamenu.c32
@@ -44,7 +43,7 @@ let
     LINUX /boot/bzImage
     APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
     INITRD /boot/initrd
-    '';
+  '';
 
   isolinuxMemtest86Entry = ''
     LABEL memtest
@@ -55,12 +54,12 @@ let
 
   isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry);
 
-  # The efi boot image
+  # The EFI boot image.
   efiDir = pkgs.runCommand "efi-directory" {} ''
     mkdir -p $out/EFI/boot
     cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/EFI/boot/boot${targetArch}.efi
     mkdir -p $out/loader/entries
-    echo "title NixOS LiveCD" > $out/loader/entries/nixos-livecd.conf
+    echo "title NixOS Live CD" > $out/loader/entries/nixos-livecd.conf
     echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd.conf
     echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd.conf
     echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> $out/loader/entries/nixos-livecd.conf
@@ -232,7 +231,6 @@ in
       [ "root=LABEL=${config.isoImage.volumeID}"
         "boot.shell_on_fail"
         "nomodeset"
-        "systemd.log_level=debug"
       ];
 
     fileSystems."/" =
@@ -272,6 +270,8 @@ in
 
     boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" ];
 
+    boot.blacklistedKernelModules = [ "nouveau" ];
+
     boot.initrd.kernelModules = [ "loop" ];
 
     # Closures to be copied to the Nix store on the CD, namely the init

From 4139c6c8098fc6ef84da283797615cffa8def731 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jul 2015 19:55:06 +0200
Subject: [PATCH 0277/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/0a07c4217de2cf899e648a14c9743c263b15fb98
 with hackage2nix revision e5e4464893b2b964424077e4fe7ef1a76e6d1173

---
 .../haskell-modules/hackage-packages.nix      | 488 ++++++++++++------
 1 file changed, 317 insertions(+), 171 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f15a27cec91..ba7bc517aa7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7354,6 +7354,7 @@ self: {
          http-types httpd-shed HUnit mtl network network-uri pureMD5 split
          test-framework test-framework-hunit wai warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/haskell/HTTP";
        description = "A library for client-side HTTP";
        license = stdenv.lib.licenses.bsd3;
@@ -8143,10 +8144,9 @@ self: {
     ({ mkDerivation, array, base, containers, StateVar, transformers }:
      mkDerivation {
        pname = "Hipmunk";
-       version = "5.2.0.16";
-       sha256 = "0jnidzky0004xh1yzkcg41df21vbvqhk075d183jv6iwjiljsh3s";
+       version = "5.2.0.17";
+       sha256 = "1yxs1v9pzb35g3zlvycsx762dk8swrbry7ajr50zlq667j20n4a8";
        buildDepends = [ array base containers StateVar transformers ];
-       jailbreak = true;
        homepage = "https://github.com/meteficha/Hipmunk";
        description = "A Haskell binding for Chipmunk";
        license = "unknown";
@@ -13969,6 +13969,24 @@ self: {
        license = "GPL";
      }) {};
 
+  "Southpaw" = callPackage
+    ({ mkDerivation, ALUT, base, bytestring, cairo, containers
+     , filepath, GLFW-b, gtk3, JuicyPixels, OpenAL, OpenGL, vector
+     , Win32
+     }:
+     mkDerivation {
+       pname = "Southpaw";
+       version = "0.1.0.2";
+       sha256 = "1zijb1b6ryrmq2230i1fr7iqz8iax9f2rwpy75fkggiknrd4xnpq";
+       buildDepends = [
+         ALUT base bytestring cairo containers filepath GLFW-b gtk3
+         JuicyPixels OpenAL OpenGL vector Win32
+       ];
+       jailbreak = true;
+       description = "Assorted utility modules";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "SpaceInvaders" = callPackage
     ({ mkDerivation, array, base, HGL, random, Yampa }:
      mkDerivation {
@@ -18147,8 +18165,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-cairo";
-       version = "3.1";
-       sha256 = "0b4nwzrkpxhiwph93zvyk8bi9770bsdnhxkzhbri3l0zsm9250kz";
+       version = "4.3.1";
+       sha256 = "0p54ssbl0ack51gwlj962x45954v4h22mqq6zqa5r8xrbcig2pdb";
        buildDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-cairo
        ];
@@ -18164,8 +18182,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-chart";
-       version = "4.3";
-       sha256 = "01wfjk4li0l2m7lqs9r6gxsv77wg94vdvipa05qynnsd9ldjnsfd";
+       version = "4.3.1";
+       sha256 = "18fagq4ddvqzi6r0c850yassgncicqy0plasfn262fmhgwflpa8n";
        buildDepends = [
          aivika aivika-experiment array base Chart colour containers
          data-default-class filepath lens mtl split
@@ -18181,8 +18199,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-diagrams";
-       version = "3.1";
-       sha256 = "1vjis6184cvw7jzg8a3nvs0d0sv30d6qx598phcq9ncs3bmh9h3f";
+       version = "4.3.1";
+       sha256 = "1plb44bcjnawg3fsb9crmlyzwzyiz802ldsk559ni9sb590ywr7n";
        buildDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-diagrams
          containers filepath
@@ -19972,23 +19990,22 @@ self: {
      }) {};
 
   "api-builder" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
-     , Cabal, containers, hspec, HTTP, http-client, http-conduit
-     , http-types, text, transformers
+    ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
+     , containers, hspec, HTTP, http-client, http-client-tls
+     , http-conduit, http-types, text, transformers
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.9.1.0";
-       sha256 = "1s9qxlinkg80idjcm246kgjg1k43pb4vvs0vd601pgz7im59qb1a";
+       version = "0.10.0.0";
+       sha256 = "0pzbp0grmnrc48h1cbsxsxzyjgnxzmf4d6cfi53ccq0v3yfybw9v";
        buildDepends = [
-         aeson attoparsec base bifunctors bytestring HTTP http-client
-         http-conduit http-types text transformers
+         aeson base bifunctors bytestring HTTP http-client http-client-tls
+         http-types text transformers
        ];
        testDepends = [
          aeson base bytestring Cabal containers hspec http-conduit text
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/intolerable/api-builder";
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -23440,12 +23457,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base_4_8_0_0" = callPackage
+  "base_4_8_1_0" = callPackage
     ({ mkDerivation, ghc-prim, rts }:
      mkDerivation {
        pname = "base";
-       version = "4.8.0.0";
-       sha256 = "1mf5s7niw0zmm1db7sr6kdpln8drcy77fn44h6sspima8flwcp44";
+       version = "4.8.1.0";
+       sha256 = "0rwya445hvnnzj3x5gsrmr72kr3yspd6w9mypxkrxxg19zfazjaj";
        buildDepends = [ ghc-prim rts ];
        description = "Basic libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -26384,7 +26401,9 @@ self: {
      mkDerivation {
        pname = "blank-canvas";
        version = "0.5";
+       revision = "1";
        sha256 = "05kfyjp9vncyzsvq018ilb8vh7fyzbc06nlx35jk3dzj6i6x5bgs";
+       editedCabalFile = "a9d9c32056144a2e5b84e96dfb3a5334aa89dc616c759e523c538a6b950d5084";
        buildDepends = [
          aeson base base64-bytestring bytestring colour containers
          data-default-class http-types kansas-comet scotty stm text
@@ -31087,8 +31106,8 @@ self: {
      }:
      mkDerivation {
        pname = "chatter";
-       version = "0.5.1.0";
-       sha256 = "014palhzpphwq3q1c211xajl30afr4ac6mjcpvyzqwxdr9ia74c8";
+       version = "0.5.2.0";
+       sha256 = "01594wp13kigqvr27112fmsrgz4cny4vlprqvyygp90k8mavxw8s";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -34588,8 +34607,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.2.4.3";
-       sha256 = "101kbmymsjlpsd9a717fn94y2fjgnxwl9j3cmfrah43g28r45sc8";
+       version = "1.2.5";
+       sha256 = "0iia5hc3rx813aayp839ixr377ajnrhfvpbjach266bk52scs05i";
        buildDepends = [
          base exceptions lifted-base mmorph mtl resourcet transformers
          transformers-base
@@ -36695,8 +36714,8 @@ self: {
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.6";
-       sha256 = "0lxmsd59sa37j8bc7y6v29s8wlscqa4xz15p60jiy5ks7am61wa5";
+       version = "5.9.7";
+       sha256 = "1617whwg9f0l6ji3jmd7fcs3n650mz0jpvrw4hf97r7mqzlyfkjp";
        buildDepends = [
          array base bytestring cereal cond directory filepath gray-extended
          hdaemonize hsyslog MonadRandom mtl old-locale process random split
@@ -46373,12 +46392,13 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io-wai";
-       version = "1.0.0";
-       sha256 = "0g9h0r2i1lldmdkpnzlqjhxr7jd0v2s2w4gmsw83k1ahr6ia0dg7";
+       version = "1.0.1";
+       sha256 = "0cr53x8bxfmrx97v7jsb7gw3hqb94zp9xvvnl16080zmqm0gi2rh";
        buildDepends = [
          attoparsec base bytestring engine-io http-types mtl text
          transformers unordered-containers wai wai-websockets websockets
        ];
+       homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -47645,15 +47665,13 @@ self: {
      }) {};
 
   "exceptional" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, exceptions }:
      mkDerivation {
        pname = "exceptional";
-       version = "0.1.5.1";
-       revision = "1";
-       sha256 = "1fkz90d776z8fj8p3123ssqwxy9nmz4bgh9gn4nvg0xnvwzc069c";
-       editedCabalFile = "a79514b512d8776f9ae66a80aeb3f604ac9ae1d4c5c98fdd9ea2acc8c312adda";
-       buildDepends = [ base ];
-       homepage = "https://github.com/pharpend/exceptional";
+       version = "0.3.0.0";
+       sha256 = "01lzx4ihdvyivjnkvn78hcdsk83dvm6iy9v5q1f28kd1iv96x1ns";
+       buildDepends = [ base exceptions ];
+       homepage = "https://github.com/";
        description = "Essentially the Maybe type with error messages";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -48152,8 +48170,8 @@ self: {
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.3.1";
-       sha256 = "1yhd4f4p8f4nfj24rka8rfhr8s86mjpj019f3lbqkr9hnl1crj4l";
+       version = "1.4";
+       sha256 = "1cp9vsqgjc46v1i8w8lhakdk1qj6q2bd0y365qj0madpjj7q1qi8";
        buildDepends = [ base directory filepath process time unix ];
        testDepends = [ base directory filepath QuickCheck time unix ];
        homepage = "https://github.com/ndmitchell/extra#readme";
@@ -48387,6 +48405,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fast-builder" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, process, QuickCheck
+     , stm
+     }:
+     mkDerivation {
+       pname = "fast-builder";
+       version = "0.0.0.0";
+       sha256 = "1ga28vxsv4hk8491jv51jd8xqvafss56kkm97x2ma4naqx4v6snw";
+       buildDepends = [ base bytestring ghc-prim ];
+       testDepends = [ base bytestring process QuickCheck stm ];
+       homepage = "http://github.com/takano-akio/fast-builder";
+       description = "Fast ByteString Builder";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "fast-logger" = callPackage
     ({ mkDerivation, array, auto-update, base, bytestring
      , bytestring-builder, directory, filepath, hspec, text
@@ -49239,12 +49272,15 @@ self: {
      }) { inherit (pkgs) fftw;};
 
   "fgl" = callPackage
-    ({ mkDerivation, array, base, containers, mtl }:
+    ({ mkDerivation, array, base, containers, deepseq, hspec
+     , QuickCheck, transformers
+     }:
      mkDerivation {
        pname = "fgl";
-       version = "5.5.1.0";
-       sha256 = "0rcmz0xlyr1wj490ffja29z1jgl51gz19ka609da6bx39bwx7nga";
-       buildDepends = [ array base containers mtl ];
+       version = "5.5.2.0";
+       sha256 = "1r9vkv5v32nyqghr4fq3ijrdl2sr9bncfpj3zix53h5m2zyn7kg3";
+       buildDepends = [ array base containers deepseq transformers ];
+       testDepends = [ base containers hspec QuickCheck ];
        description = "Martin Erwig's Functional Graph Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49253,9 +49289,9 @@ self: {
     ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }:
      mkDerivation {
        pname = "fgl-arbitrary";
-       version = "0.1.0.0";
-       sha256 = "0npgwg2lgi8rr3wm40q4a9srpnih3mzy1add2aazc4ahr32dfzm1";
-       buildDepends = [ base containers fgl QuickCheck ];
+       version = "0.2.0.0";
+       sha256 = "1116c4r1ick3xjhwwq9b6i1082njmxj2aymgkqppabj3d0hv43c4";
+       buildDepends = [ base fgl QuickCheck ];
        testDepends = [ base containers fgl hspec QuickCheck ];
        description = "QuickCheck support for fgl";
        license = stdenv.lib.licenses.bsd3;
@@ -52757,8 +52793,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-accessors";
-       version = "0.4.0";
-       sha256 = "0wpv9i80lai771fws5yg5ri05iskbq2vgar66f72xqwvz3nm44i7";
+       version = "0.4.1";
+       sha256 = "1qhik496296v42pjmlxxlimnw4z9p451ndc2fjvrid4g0knfzvg0";
        buildDepends = [ base linear spatial-math ];
        testDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -53495,20 +53531,21 @@ self: {
      }) {};
 
   "ghc-exactprint" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, free, ghc
-     , ghc-paths, ghc-syb-utils, HUnit, mtl, random, stm, syb
+    ({ mkDerivation, base, containers, directory, filemanip, filepath
+     , free, ghc, ghc-paths, HUnit, mtl, random, silently, syb
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.2";
-       sha256 = "1sqk6y6b1scn51kjbvdnazw34bkwmfii5dhb1fzwzx4cb4iqg3ik";
+       version = "0.3";
+       sha256 = "0wgqlll95fbxnni1dzlyiyb4d7lqp3hrfw9xh5hqsnqm45smi7j1";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [
-         base containers directory filepath free ghc ghc-paths ghc-syb-utils
-         mtl syb
+         base containers directory filepath free ghc ghc-paths mtl syb
        ];
        testDepends = [
-         base containers directory filepath ghc ghc-paths ghc-syb-utils
-         HUnit mtl random stm syb
+         base containers directory filemanip filepath ghc ghc-paths HUnit
+         mtl random silently syb
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -54190,6 +54227,7 @@ self: {
          gitlib gitlib-libgit2 scientific shake split tagged text
          unordered-containers vector yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
@@ -58612,8 +58650,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddock";
-       version = "2.16.0";
-       sha256 = "1afb96w1vv3gmvha2f1h3p8zywpdk8dfk6bgnsa307ydzsmsc3qa";
+       version = "2.16.1";
+       sha256 = "1mnnvc5jqp6n6rj7xw8wdm0z2xp9fndkz11c8p3vbljsrcqd3v26";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base haddock-api ];
@@ -58650,8 +58688,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddock-api";
-       version = "2.16.0";
-       sha256 = "0hk42w6fbr6xp8xcpjv00bhi9r75iig5kp34vxbxdd7k5fqxr1hj";
+       version = "2.16.1";
+       sha256 = "1spd5axg1pdjv4dkdb5gcwjsc8gg37qi4mr2k2db6ayywdkis1p2";
        buildDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
@@ -58688,10 +58726,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddock-library";
-       version = "1.2.0";
-       revision = "1";
-       sha256 = "0kf8qihkxv86phaznb3liq6qhjs53g3iq0zkvz5wkvliqas4ha56";
-       editedCabalFile = "39bebb4a575c547378a245ee6028135602cbb73e5adbb4f7743449e5717517da";
+       version = "1.2.1";
+       sha256 = "0mhh2ppfhrvvi9485ipwbkv2fbgj35jvz3la02y3jlvg5ffs1c8g";
        buildDepends = [ base bytestring deepseq transformers ];
        testDepends = [
          base base-compat bytestring deepseq hspec QuickCheck transformers
@@ -59101,8 +59137,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-agda";
-       version = "0.1.9";
-       sha256 = "1fh0901r140p3lvw54q8d6x17zhbvpik5bsx2hifa8q2g5bnxnxd";
+       version = "0.1.10";
+       sha256 = "1621l7pw2rcyalp17dcjp1bk650rs8w1i3swnwrzr9wwi6nrx7qb";
        buildDepends = [
          Agda base containers directory filepath hakyll mtl pandoc
          transformers xhtml
@@ -59315,8 +59351,8 @@ self: {
      }:
      mkDerivation {
        pname = "halma";
-       version = "0.2.0.0";
-       sha256 = "053r1npyq7f07d29bryrr0vwx4kpm3m1bdjkwr77znimshcvy9b3";
+       version = "0.2.0.1";
+       sha256 = "04b0djijhmgwr79hkprikqxdzfxabavrvkwmb1pv9qybsa82j6sc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -59327,7 +59363,6 @@ self: {
          base containers grid HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/timjb/halma";
        description = "Library implementing Halma rules";
        license = stdenv.lib.licenses.mit;
@@ -60432,10 +60467,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "harp";
-       version = "0.4";
-       sha256 = "0fk3prqai1ynm5wdfsn9f700i9r499jc2z9fbsgy81k1rci2mrxh";
+       version = "0.4.1";
+       sha256 = "0q9q3rw9yqkryjf5vvm41ckycqjfaxnsrmc1p0kmdrlb4f4dgclz";
        buildDepends = [ base ];
-       homepage = "http://www.cs.chalmers.se/~d00nibro/harp/";
+       homepage = "https://github.com/seereason/harp";
        description = "HaRP allows pattern-matching with regular expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61344,8 +61379,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-neo4j-client";
-       version = "0.3.1.3";
-       sha256 = "0ws1mlf97b4xbysgvm4b3h15kfvk1mjdcxmcchl09c04wadaz86s";
+       version = "0.3.1.4";
+       sha256 = "171ar3vfhgijy79p0a4wqm0b8bisgqf8iqzm17yb5pwirlfm5hi6";
        buildDepends = [
          aeson base bytestring containers data-default hashable HTTP
          http-conduit http-types lifted-base mtl network-uri resourcet
@@ -61359,7 +61394,6 @@ self: {
          test-framework-quickcheck2 test-framework-th text transformers
          transformers-base transformers-compat unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client";
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
@@ -64979,29 +65013,29 @@ self: {
     ({ mkDerivation, base, bytestring, case-insensitive, configurator
      , containers, directory, errors, exceptions, filemanip, filepath
      , HandsomeSoup, hspec, HTTP, http-types, hxt, iso8601-time
-     , MissingH, mtl, multipart, old-locale, random, silently, stm, tar
-     , temporary, text, time, transformers, unix, unordered-containers
-     , utf8-string, wai, warp
+     , MissingH, mtl, multipart, old-locale, optparse-applicative
+     , random, silently, stm, tar, temporary, text, time, transformers
+     , unix, unordered-containers, utf8-string, wai, warp
      }:
      mkDerivation {
        pname = "heyefi";
-       version = "0.1.0.2";
-       sha256 = "0zjhdhigkfh3wrhwynpcqimasifs3qxkv8x2w7bl1ly8amlz7hf4";
+       version = "0.1.1.0";
+       sha256 = "13m66ix0kmvqwgvqh56mjdwgwpjjqi67hyr6giwhs63fr3wxw3f3";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base bytestring case-insensitive configurator directory errors
          exceptions filemanip filepath HandsomeSoup HTTP http-types hxt
-         iso8601-time MissingH mtl multipart old-locale random stm tar
-         temporary text time transformers unix unordered-containers
-         utf8-string wai warp
+         iso8601-time MissingH mtl multipart old-locale optparse-applicative
+         random stm tar temporary text time transformers unix
+         unordered-containers utf8-string wai warp
        ];
        testDepends = [
          base bytestring case-insensitive configurator containers directory
          errors exceptions filemanip filepath HandsomeSoup hspec HTTP
          http-types hxt iso8601-time MissingH mtl multipart old-locale
-         random silently stm tar temporary text time transformers unix
-         unordered-containers utf8-string wai warp
+         optparse-applicative random silently stm tar temporary text time
+         transformers unix unordered-containers utf8-string wai warp
        ];
        homepage = "https://github.com/ryantm/heyefi";
        description = "A server for Eye-Fi SD cards";
@@ -65927,8 +65961,8 @@ self: {
      }:
      mkDerivation {
        pname = "hint-server";
-       version = "1.4.1";
-       sha256 = "1b7dzij1c4940m00kbpnmymh6grd54d2xsgsi1d10x22bl7naq7m";
+       version = "1.4.2";
+       sha256 = "1rv6b0vlqs855m3bv047pvdkycmx2mv049cnp9iw8b97d0fsfyf5";
        buildDepends = [ base eprocess exceptions hint monad-loops mtl ];
        description = "A server process that runs hint";
        license = stdenv.lib.licenses.bsd3;
@@ -69136,8 +69170,8 @@ self: {
     ({ mkDerivation, base, deepseq, HUnit, mtl, parallel, random }:
      mkDerivation {
        pname = "hs-carbon";
-       version = "0.1.0.0";
-       sha256 = "0i6jzqqlayxi1aqkrsdlb9kbj6ysj2qxr0rbmdw66zr5hinm345v";
+       version = "0.1.1.0";
+       sha256 = "0frip4q5vxvdkc4f8bigpp066i53f4786cj2znyq21h65zndaq53";
        buildDepends = [ base deepseq mtl parallel random ];
        testDepends = [ base HUnit ];
        description = "A Haskell framework for parallel monte carlo simulations";
@@ -72329,8 +72363,8 @@ self: {
      }:
      mkDerivation {
        pname = "html-tokenizer";
-       version = "0.3.0.2";
-       sha256 = "1cd332xv2acx626hkiaakng1fwwkg9m2mg7p6jj1zzb981r6xh6y";
+       version = "0.3.0.3";
+       sha256 = "0xdjjmpp1wh17cb4lnziglwhv7frr0y5v216s5ycy9lkby9r9fyv";
        buildDepends = [
          attoparsec base-prelude case-insensitive conversion
          conversion-case-insensitive conversion-text text
@@ -72725,8 +72759,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit";
-       version = "2.1.7";
-       sha256 = "1qdxd9dbzav7nky8s9ml6ik6i38mxzzg7dwj0pv1sp5prclk0jh1";
+       version = "2.1.7.1";
+       sha256 = "15caswd172i8hzwmxsd3rynnfz96v5iqg9avv1ybydikvvgbqx56";
        buildDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -78833,8 +78867,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-client";
-       version = "0.2.0.0";
-       sha256 = "13mc23dpyn9zsv1gfb913g8w8csjgnk5xrbbyhxgmam9kslpbxjj";
+       version = "0.2.1.0";
+       sha256 = "1ma5vahbcfarbvc0m8n88i0hn9szbvanmfd81jmvwkamkqxxgmis";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -80923,24 +80957,27 @@ self: {
      }) {};
 
   "lambdacms-core" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, containers
-     , data-default, esqueleto, file-embed, friendly-time, gravatar
-     , lists, mime-mail, old-locale, persistent, shakespeare
-     , template-haskell, text, time, uuid, wai, yesod, yesod-auth
-     , yesod-core, yesod-form
+    ({ mkDerivation, base, blaze-html, bytestring, classy-prelude
+     , classy-prelude-yesod, containers, data-default, esqueleto
+     , file-embed, friendly-time, gravatar, hspec, lists, mime-mail
+     , old-locale, persistent, shakespeare, template-haskell, text, time
+     , uuid, wai, yesod, yesod-auth, yesod-core, yesod-form
      }:
      mkDerivation {
        pname = "lambdacms-core";
-       version = "0.3.0.0";
-       sha256 = "069mj7p3996bkl0vyj1bpphb6gs85r234svls9rzg2lgpxfp4gga";
+       version = "0.3.0.2";
+       sha256 = "0m8piymzcciy4dqhxqxslpm1rbzasm1diasr8ab05r9lcrs1dn76";
        buildDepends = [
          base blaze-html bytestring containers data-default esqueleto
          file-embed friendly-time gravatar lists mime-mail old-locale
          persistent shakespeare template-haskell text time uuid wai yesod
          yesod-auth yesod-core yesod-form
        ];
+       testDepends = [
+         base classy-prelude classy-prelude-yesod hspec yesod yesod-core
+       ];
        homepage = "http://lambdacms.org";
-       description = "LambdaCms Core subsite for Yesod apps";
+       description = "LambdaCms 'core' subsite for Yesod apps";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -87076,8 +87113,8 @@ self: {
      }:
      mkDerivation {
        pname = "mangopay";
-       version = "1.11.3";
-       sha256 = "1w9p0na0am2hl8f32qgkdym00kjjnavv1wxp6f4vh9msa6cfw6yl";
+       version = "1.11.4";
+       sha256 = "0yb6i97ihcywbgzqkrad72q33m7fgx903rqizlhb4nz4bkl8793d";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -96161,24 +96198,23 @@ self: {
 
   "opaleye" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
-     , case-insensitive, contravariant, postgresql-simple, pretty
-     , product-profunctors, profunctors, semigroups, text, time
-     , time-locale-compat, transformers, uuid
+     , case-insensitive, containers, contravariant, postgresql-simple
+     , pretty, product-profunctors, profunctors, QuickCheck, semigroups
+     , text, time, time-locale-compat, transformers, uuid, void
      }:
      mkDerivation {
        pname = "opaleye";
-       version = "0.3.1.2";
-       revision = "3";
-       sha256 = "01ldghza5l1qgcpvsphajfkq7g09fw0dm4vnya9wbs0hla307av9";
-       editedCabalFile = "9ee83219b8bc26fe01cca7484513bc3373d2868855ba8757fd210482f0605852";
+       version = "0.4.0.0";
+       sha256 = "1dzfxy5r2phqcnijvq74ardjg9p2mlkpidg95dd3v9qiz1ls71rk";
        buildDepends = [
          attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
          profunctors semigroups text time time-locale-compat transformers
-         uuid
+         uuid void
        ];
        testDepends = [
-         base postgresql-simple product-profunctors profunctors time
+         base containers contravariant postgresql-simple product-profunctors
+         profunctors QuickCheck semigroups time
        ];
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
@@ -97689,8 +97725,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.2.2";
-       sha256 = "1ynxg9d3ssq9bby073j40913z11xap6gpf8hkjl0h0ll3mx89vb9";
+       version = "0.1.2.4";
+       sha256 = "1ay54zkxxa22nz5sr40d6k4bam81hxh19583kffwqdcp0af23d7l";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -99497,6 +99533,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persistent-instances-iproute" = callPackage
+    ({ mkDerivation, base, bytestring, iproute, persistent }:
+     mkDerivation {
+       pname = "persistent-instances-iproute";
+       version = "0.1.0.1";
+       sha256 = "0nmk138kv020aa0pw29l177rb6rji4rnmw4ndnkn1xvp8gh3w0yn";
+       buildDepends = [ base bytestring iproute persistent ];
+       description = "Persistent instances for types in iproute";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "persistent-map" = callPackage
     ({ mkDerivation, base, binary, containers, directory, EdisonAPI
      , EdisonCore, filepath, LRU, mtl, stm-io-hooks
@@ -107583,6 +107630,19 @@ self: {
        broken = true;
      }) { ghcjs-base = null;};
 
+  "reflex-gloss" = callPackage
+    ({ mkDerivation, base, dependent-sum, gloss, reflex, transformers
+     }:
+     mkDerivation {
+       pname = "reflex-gloss";
+       version = "0.1.0.2";
+       sha256 = "18sbqryf6kxadgbvr6nh0f07897fq9fjj0h2w07xcdpp1ygg1nfg";
+       buildDepends = [ base dependent-sum gloss reflex transformers ];
+       homepage = "https://github.com/reflex-frp/reflex-gloss";
+       description = "An reflex interface for gloss";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "reform" = callPackage
     ({ mkDerivation, base, containers, mtl, text }:
      mkDerivation {
@@ -108235,6 +108295,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rei" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , directory, regex-posix, split
+     }:
+     mkDerivation {
+       pname = "rei";
+       version = "0.1.0.1";
+       sha256 = "15xq2aj77y7l4frxkariw1z0c3y324iz697im8ynlzm88z2iixs6";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         attoparsec base bytestring containers directory regex-posix split
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/kerkomen/rei";
+       description = "Process lists easily";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "reified-records" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -112253,7 +112332,9 @@ self: {
      mkDerivation {
        pname = "scotty";
        version = "0.10.2";
+       revision = "1";
        sha256 = "0jlw82brnvc4cbpws0dq3qxn4rnb3z6rx6cfiarqwas14x4k3kl6";
+       editedCabalFile = "e0ab23342583c37af1a5422fad9a64926e54cad208dbcac75c70b3db40bf9e99";
        buildDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class http-types monad-control mtl nats network
@@ -112384,8 +112465,8 @@ self: {
     ({ mkDerivation, base, scotty, transformers, wai, warp, warp-tls }:
      mkDerivation {
        pname = "scotty-tls";
-       version = "0.3.0.0";
-       sha256 = "11zpbqrfmjyl8kck1za0pvf1b1gn0ih3an8vq85si22414bs5j23";
+       version = "0.4.0";
+       sha256 = "1axr54s8zi9jw5y6yl2izjx4xvd25y18nh4fw7asq9fz0nwjb45a";
        buildDepends = [ base scotty transformers wai warp warp-tls ];
        homepage = "https://github.com/dmjio/scotty-tls.git";
        description = "TLS for Scotty";
@@ -112754,27 +112835,29 @@ self: {
 
   "second-transfer" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, binary
-     , bytestring, conduit, containers, cpphs, exceptions, hashable
-     , hashtables, hslogger, http2, HUnit, lens, network, network-uri
-     , openssl, text, time, transformers
+     , bytestring, clock, conduit, containers, cpphs, deepseq
+     , exceptions, hashable, hashtables, hslogger, http2, HUnit, lens
+     , network, network-uri, openssl, pqueue, SafeSemaphore, stm, text
+     , time, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.5.5.1";
-       sha256 = "06ldrfzp96w7q99nhhhjhay6g0gsvg16x64hwjih1nswcj9rpl6x";
+       version = "0.6.0.0";
+       sha256 = "1w726qfbz86sicpg5apx5n767av61l3kn8fra7ban8f67amg3z7w";
        buildDepends = [
-         attoparsec base base16-bytestring binary bytestring conduit
-         containers exceptions hashable hashtables hslogger http2 lens
-         network network-uri text time transformers
+         attoparsec base base16-bytestring binary bytestring clock conduit
+         containers deepseq exceptions hashable hashtables hslogger http2
+         lens network network-uri pqueue SafeSemaphore stm text time
+         transformers
        ];
        testDepends = [
-         attoparsec base base16-bytestring binary bytestring conduit
-         containers cpphs exceptions hashable hashtables hslogger http2
-         HUnit lens network network-uri text time transformers
+         attoparsec base base16-bytestring binary bytestring clock conduit
+         containers cpphs deepseq exceptions hashable hashtables hslogger
+         http2 HUnit lens network network-uri pqueue SafeSemaphore stm text
+         time transformers unordered-containers
        ];
        buildTools = [ cpphs ];
        extraLibraries = [ openssl ];
-       jailbreak = true;
        homepage = "https://www.httptwo.com/second-transfer/";
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
@@ -113753,6 +113836,7 @@ self: {
          network parsec QuickCheck servant string-conversions temporary text
          transformers wai wai-extra warp
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
@@ -114781,8 +114865,8 @@ self: {
      }:
      mkDerivation {
        pname = "shelly";
-       version = "1.6.3";
-       sha256 = "1j9sv0dzhxkqml9v3r9nbwkpnjz1jhn09mlxlrjfakjmf3i9b9vp";
+       version = "1.6.3.1";
+       sha256 = "1yd54i4ac1h23b4l4mz9ixpkhj0zxnb8gamk5jdhzgsd809cqy9q";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -114803,15 +114887,17 @@ self: {
      }) {};
 
   "shelly-extra" = callPackage
-    ({ mkDerivation, async, base, HUnit, mtl, SafeSemaphore, shelly
-     , text
+    ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore
+     , shelly, text
      }:
      mkDerivation {
        pname = "shelly-extra";
-       version = "0.3";
-       sha256 = "0rin1rqpzrjh4gs9235wy9w8rj4ac9yh83ap78a6nj0zi9w9vlwd";
+       version = "0.3.0.1";
+       sha256 = "1mc55m10s89mp2fz267sqhayaj0igj27kwyx7hnk5h23w0nhc0h5";
        buildDepends = [ async base mtl SafeSemaphore shelly ];
-       testDepends = [ base HUnit SafeSemaphore shelly text ];
+       testDepends = [
+         async base hspec HUnit mtl SafeSemaphore shelly text
+       ];
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shelly features that require extra dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -116557,8 +116643,8 @@ self: {
     ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
        pname = "smoothie";
-       version = "0.4";
-       sha256 = "0j8nwc44q9l7wf4m3z7r32b7if7is21k3xgmi2206r4i1yxc869j";
+       version = "0.4.0.1";
+       sha256 = "1h501mcgfwak586gakqsjhmrdkq2mmfi8gwalb7wbsp57bchfg67";
        buildDepends = [ aeson base linear text vector ];
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
@@ -126241,8 +126327,8 @@ self: {
      }:
      mkDerivation {
        pname = "themoviedb";
-       version = "1.1.0.0";
-       sha256 = "0yvpijr2dk01g1ks65nalyz547l9aq97a9v1bx3lp47allihrp8k";
+       version = "1.1.1.0";
+       sha256 = "1859hbhznmp7x8kbqzrpyhndfy69jg01qrp1vh67557mznari6d8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -126251,7 +126337,6 @@ self: {
          transformers
        ];
        testDepends = [ 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;
@@ -126736,8 +126821,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal";
-       version = "0.4.33";
-       sha256 = "0xx02wbclq6hh50gz6vj3wmq7d5y7l4d6h48yxg3nwv4kwf44gf6";
+       version = "0.5.2";
+       sha256 = "0ll65q5fi8qfi50q9lqxdq9nsr7gizbh2xrsxgvj09nacdnwfwv0";
        buildDepends = [
          base binary bytestring colour containers hashable hmt hosc
          mersenne-random-pure64 mtl parsec process text time transformers
@@ -133418,6 +133503,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "vimeta" = callPackage
+    ({ mkDerivation, aeson, base, byline, bytestring, containers
+     , directory, either, filepath, http-client, http-client-tls
+     , http-types, mtl, old-locale, optparse-applicative, parsec
+     , process, temporary, text, themoviedb, time, time-locale-compat
+     , transformers, xdg-basedir, yaml
+     }:
+     mkDerivation {
+       pname = "vimeta";
+       version = "0.2.0.0";
+       sha256 = "14xzqhykw963ja6wsnrbq8dh9wbk63aramzj4n210srwxy6yqc05";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base byline bytestring containers directory either filepath
+         http-client http-client-tls http-types mtl old-locale
+         optparse-applicative parsec process temporary text themoviedb time
+         time-locale-compat transformers xdg-basedir yaml
+       ];
+       homepage = "http://github.com/pjones/vimeta";
+       description = "Frontend for video metadata tagging tools";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "vimus" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, containers, data-default
      , deepseq, directory, filepath, hspec, hspec-expectations, libmpd
@@ -134195,6 +134304,7 @@ self: {
        sha256 = "1fm985jq1sa8v3vj850cpcjl6kcyq2kgq6xwpb1rmzi8zmb80kpc";
        buildDepends = [ base wai warp ];
        pkgconfigDepends = [ QtWebKit ];
+       jailbreak = true;
        homepage = "https://github.com/yesodweb/wai/tree/master/wai-handler-webkit";
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
        license = stdenv.lib.licenses.mit;
@@ -134989,26 +135099,29 @@ self: {
 
   "warp" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
-     , bytestring, case-insensitive, doctest, ghc-prim, hashable, hspec
-     , HTTP, http-date, http-types, HUnit, iproute, lifted-base, network
-     , old-locale, QuickCheck, simple-sendfile, streaming-commons, text
-     , time, transformers, unix, unix-compat, vault, wai
+     , bytestring, case-insensitive, containers, directory, doctest
+     , ghc-prim, hashable, hspec, HTTP, http-date, http-types, http2
+     , HUnit, iproute, lifted-base, network, old-locale, process
+     , QuickCheck, simple-sendfile, stm, streaming-commons, text, time
+     , transformers, unix, unix-compat, vault, wai, word8
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.0.13.1";
-       sha256 = "17vik5xf2amyi4pwq7wfia2a6f1pksa4ll155hbhkndhbwszvrkc";
+       version = "3.1.0";
+       sha256 = "1lx1fbcf8bkr5g6j0flk6mplnvs289lkyds5hv31naa450wbca62";
        buildDepends = [
          array auto-update base blaze-builder bytestring case-insensitive
-         ghc-prim hashable http-date http-types iproute network
-         simple-sendfile streaming-commons text unix unix-compat vault wai
+         containers ghc-prim hashable http-date http-types http2 iproute
+         network simple-sendfile stm streaming-commons text unix unix-compat
+         vault wai word8
        ];
        testDepends = [
          array async auto-update base blaze-builder bytestring
-         case-insensitive doctest ghc-prim hashable hspec HTTP http-date
-         http-types HUnit iproute lifted-base network old-locale QuickCheck
-         simple-sendfile streaming-commons text time transformers unix
-         unix-compat vault wai
+         case-insensitive containers directory doctest ghc-prim hashable
+         hspec HTTP http-date http-types http2 HUnit iproute lifted-base
+         network old-locale process QuickCheck simple-sendfile stm
+         streaming-commons text time transformers unix unix-compat vault wai
+         word8
        ];
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
@@ -135057,14 +135170,14 @@ self: {
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.0.4.2";
-       sha256 = "070bq28mg29yw5w7n92j73b74amqxn0yb5cx9z28p8ilmx3y03v1";
+       version = "3.1.0";
+       sha256 = "1790hl3a327fv01w2shdslylmhp5zv0bh7ljhymipr5vpjwjknrz";
        buildDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
        ];
        homepage = "http://github.com/yesodweb/wai";
-       description = "HTTP over SSL/TLS support for Warp via the TLS package";
+       description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -138977,6 +139090,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yamlkeysdiff" = callPackage
+    ({ mkDerivation, base, containers, parsec, text
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "yamlkeysdiff";
+       version = "0.5.1";
+       sha256 = "13s5qiydxcwpp0j8xap556yrlmqs7bsi62ql2c9clr4hpbw8may7";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base containers parsec text unordered-containers yaml
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/acatton/yamlkeysdiff";
+       description = "Compares the keys from two yaml files";
+       license = "unknown";
+     }) {};
+
   "yampa-canvas" = callPackage
     ({ mkDerivation, base, blank-canvas, stm, text, time, Yampa }:
      mkDerivation {
@@ -139395,8 +139527,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-fb";
-       version = "1.6.6";
-       sha256 = "00pk5vridic77laydkfhrixfv50ps7f15dxvcd44cn0z8s2d3y74";
+       version = "1.7";
+       sha256 = "1kp4vka9sjij8zyp15vj1jkaqwgy483q2gjb5wmhlqwcyp843h02";
        buildDepends = [
          aeson base bytestring conduit fb http-conduit lifted-base
          shakespeare text time transformers wai yesod-auth yesod-core
@@ -139465,6 +139597,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-auth-ldap-mediocre" = callPackage
+    ({ mkDerivation, aeson, base, LDAP, text, yesod-auth, yesod-core
+     , yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-auth-ldap-mediocre";
+       version = "0.1.0.0";
+       sha256 = "03pij218i9lk79n02c2pfrxsxyqi6lzjn5bzg7zgk5a87b6b57jh";
+       buildDepends = [
+         aeson base LDAP text yesod-auth yesod-core yesod-form
+       ];
+       jailbreak = true;
+       description = "Very simlple LDAP auth for yesod";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-auth-oauth" = callPackage
     ({ mkDerivation, authenticate-oauth, base, bytestring, lifted-base
      , text, transformers, yesod-auth, yesod-core, yesod-form
@@ -139570,8 +139718,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.12";
-       sha256 = "12rvzds8ww2szq7r6pyc9kf287v2i5q8n318wy4x4jr3xhw0szy7";
+       version = "1.4.13";
+       sha256 = "0rqwmvl2pl05fp7xyfcpmpjkki8ww47rhifcclasaxvj109hvj1k";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -139974,8 +140122,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-mangopay";
-       version = "1.11.2";
-       sha256 = "1jyn38q0q4s4lrnw93yzvnn49js4jf6zhq8wb7whyxks1jbkjxbv";
+       version = "1.11.4";
+       sha256 = "0syg5a0xihrdbclsrbgqgf6llhji7zdn1g50fbvlklfpw4dkb1f7";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -140446,10 +140594,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-static";
-       version = "1.5.0";
-       revision = "1";
-       sha256 = "1i95c43hlks1wclhwal9yr1pasmz78ddi7wzjhg9k5w21hrkcp92";
-       editedCabalFile = "d01c0a6fcb4ae005dea0c4898fd1ad452cde5e1989c90e62309c481cd0ff36c3";
+       version = "1.5.0.1";
+       sha256 = "1yda1m7dafcmq9s2gv0cdq3kphl5gg1279crqjgf3x57dyrypjpl";
        buildDepends = [
          async attoparsec base base64-bytestring blaze-builder byteable
          bytestring conduit conduit-extra containers cryptohash
@@ -140504,8 +140650,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-table";
-       version = "1.0.1";
-       sha256 = "0ixypahxrm23pahjq972r8kc4h2a14fidf1cx3wiip8wxfhc9jsi";
+       version = "1.0.2";
+       sha256 = "0rrc9cfjl1g8if0ncs2xzpb1hnaa4hi3w62q16gwir0l79vfj7b9";
        buildDepends = [ base containers contravariant text yesod-core ];
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";
@@ -140655,8 +140801,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-websockets";
-       version = "0.2.2";
-       sha256 = "1qs7rxf9maa6mgyhqqkbbcg1ab55xkixpyn3216bhbbwq730kfp5";
+       version = "0.2.3";
+       sha256 = "15kklk4wkxclrmsvwzjcy8ggal14c6nrckfn0kqcrfp0hbxzj09m";
        buildDepends = [
          async base conduit enclosed-exceptions monad-control transformers
          wai wai-websockets websockets yesod-core

From b49b2d9bbabad1a2e0b08cee178258a84db83ee7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jul 2015 20:12:31 +0200
Subject: [PATCH 0278/2016] haskell-shelly: test suite has been fixed upstream

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 72faf888486..6a4680d4906 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -895,7 +895,4 @@ self: super: {
   # https://ghc.haskell.org/trac/ghc/ticket/9825
   vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
 
-  # https://github.com/yesodweb/Shelly.hs/issues/105
-  shelly = dontCheck super.shelly;
-
 }

From 867eda32ca28b1dca1cea3e6fa6af868d5e39029 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jul 2015 20:33:26 +0200
Subject: [PATCH 0279/2016] haskell-Southpaw cannot be built on Unix.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6a4680d4906..491bf5cf200 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -870,6 +870,7 @@ self: super: {
   # This package can't be built on non-Windows systems.
   Win32 = overrideCabal super.Win32 (drv: { broken = !pkgs.stdenv.isCygwin; });
   inline-c-win32 = dontDistribute super.inline-c-win32;
+  Southpaw = dontDistribute super.Southpaw;
 
   # Doesn't work with recent versions of mtl.
   cron-compat = markBroken super.cron-compat;

From 54d86f86fdbfe4efbf83f015bbf6cbdde3a2c158 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jul 2015 20:34:23 +0200
Subject: [PATCH 0280/2016] haskell-base: update override for new version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 491bf5cf200..5260d508ab1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -221,7 +221,7 @@ self: super: {
       });
 
   # Does not compile: "fatal error: ieee-flpt.h: No such file or directory"
-  base_4_8_0_0 = markBroken super.base_4_8_0_0;
+  base_4_8_1_0 = markBroken super.base_4_8_1_0;
 
   # Obsolete: https://github.com/massysett/prednote/issues/1.
   prednote-test = markBrokenVersion "0.26.0.4" super.prednote-test;

From 9bedb70520f87e6b8f2beacbf2a09ac457da56c8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 25 Jul 2015 13:34:34 +0200
Subject: [PATCH 0281/2016] man-pages: 4.00 -> 4.01

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

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 14cd41adbec..71fca096c58 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
-let version = "4.00"; in
+let version = "4.01"; in
 stdenv.mkDerivation rec {
   name = "man-pages-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "18zb1g12s15sanffh0sykmmyx0j176pp7q1xxs0gk0imgvmn8hj4";
+    sha256 = "116jp2rnsdlnb3cwnbfp0g053frcmchndwyrj714swl1lgabb56i";
   };
 
   makeFlags = "MANDIR=$(out)/share/man";

From 8665b0d8b10dc612b9b3dd5174837278026739e4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 25 Jul 2015 23:57:55 +0300
Subject: [PATCH 0282/2016] extlinux-conf-builder: Fix warning when building in
 chroot

When using extlinux-conf-builder in a nix build using chroots, the
following error message could be seen:

/nix/store/XXX-extlinux-conf-builder.sh: line 121: cd: /nix/var/nix/profiles: No such file or directory

To avoid this, just skip the code path parsing /nix/var/nix/profiles
when $numGenerations (passed from the command line) is 0 (which is the
only legal value of $numGenerations in a nix build context).
---
 .../extlinux-conf-builder.sh                  | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
index 7da9c488f69..b9a42b2a196 100644
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
@@ -115,16 +115,18 @@ EOF
 
 addEntry $default default >> $tmpFile
 
-# Add up to $numGenerations generations of the system profile to the menu,
-# in reverse (most recent to least recent) order.
-for generation in $(
-        (cd /nix/var/nix/profiles && ls -d system-*-link) \
-        | sed 's/system-\([0-9]\+\)-link/\1/' \
-        | sort -n -r \
-        | head -n $numGenerations); do
-    link=/nix/var/nix/profiles/system-$generation-link
-    addEntry $link $generation
-done >> $tmpFile
+if [ "$numGenerations" -gt 0 ]; then
+    # Add up to $numGenerations generations of the system profile to the menu,
+    # in reverse (most recent to least recent) order.
+    for generation in $(
+            (cd /nix/var/nix/profiles && ls -d system-*-link) \
+            | sed 's/system-\([0-9]\+\)-link/\1/' \
+            | sort -n -r \
+            | head -n $numGenerations); do
+        link=/nix/var/nix/profiles/system-$generation-link
+        addEntry $link $generation
+    done >> $tmpFile
+fi
 
 mv -f $tmpFile $target/extlinux/extlinux.conf
 

From df86813d9727aa3a9e3dcc45347f97b71bd01599 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 5 May 2015 06:23:28 +0300
Subject: [PATCH 0283/2016] nixos: Add derivations for SD card installation
 images on ARM

The resulting image can be copied to a SD card with `dd` and is directly
bootable by a suitably configured U-Boot. Though depending on the board, some
extra steps are required for copying U-Boot itself to the SD card.

Inside the image is a partition table, with a FAT32 /boot and a normal
writable EXT4 rootfs. It's possible to directly reuse the SD image's
partition layout and "install" NixOS on the same SD card by replacing
the default configuration.nix and nixos-rebuild, and actually is the
preferred way to use these images. To assist in this installation
method, the boot scripts on the image automatically resize the rootfs
partition to fit the SD card on the first boot.

The SD images come in two flavors; one for the ARMv6 Raspberry Pi,
and one multiplatform image for all the boards supported by the
mainline kernel's multi_v7_defconfig config target. At the moment, these
have been tested on:
    - Raspberry Pi Model B (512MB model)
    - NVIDIA Jetson TK1
    - Linksprite pcDuino3 Nano

To build, run:

nix-build '<nixpkgs/nixos>' -A config.system.build.sdImage \
    -I nixos-config='<nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix>'
---
 nixos/lib/make-ext4-fs.nix                    |  88 ++++++++++++
 .../cd-dvd/sd-image-armv7l-multiplatform.nix  |  40 ++++++
 .../installer/cd-dvd/sd-image-raspberrypi.nix |  46 +++++++
 nixos/modules/installer/cd-dvd/sd-image.nix   | 127 ++++++++++++++++++
 4 files changed, 301 insertions(+)
 create mode 100644 nixos/lib/make-ext4-fs.nix
 create mode 100644 nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
 create mode 100644 nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
 create mode 100644 nixos/modules/installer/cd-dvd/sd-image.nix

diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
new file mode 100644
index 00000000000..23839ea487d
--- /dev/null
+++ b/nixos/lib/make-ext4-fs.nix
@@ -0,0 +1,88 @@
+# Builds an ext4 image containing a populated /nix/store with the closure
+# of store paths passed in the storePaths parameter. The generated image
+# is sized to only fit its contents, with the expectation that a script
+# resizes the filesystem at boot time.
+{ pkgs
+, storePaths
+, volumeLabel
+}:
+
+pkgs.stdenv.mkDerivation {
+  name = "ext4-fs.img";
+
+  buildInputs = with pkgs; [e2fsprogs libfaketime perl];
+
+  # For obtaining the closure of `storePaths'.
+  exportReferencesGraph =
+    map (x: [("closure-" + baseNameOf x) x]) storePaths;
+
+  buildCommand =
+    ''
+      # Add the closures of the top-level store objects.
+      storePaths=$(perl ${pkgs.pathsFromGraph} closure-*)
+
+      # Also include a manifest of the closures in a format suitable
+      # for nix-store --load-db.
+      printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > nix-path-registration
+
+      # Make a crude approximation of the size of the target image.
+      # If the script starts failing, increase the fudge factors here.
+      numInodes=$(find $storePaths | wc -l)
+      numDataBlocks=$(du -c -B 4096 --apparent-size $storePaths | awk '$2 == "total" { print int($1 * 1.03) }')
+      bytes=$((2 * 4096 * $numInodes + 4096 * $numDataBlocks))
+      echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)"
+
+      truncate -s $bytes $out
+      faketime "1970-01-01 00:00:00" mkfs.ext4 -L ${volumeLabel} -U 44444444-4444-4444-8888-888888888888 $out
+
+      # Populate the image contents by piping a bunch of commands to the `debugfs` tool from e2fsprogs.
+      # For example, to copy /nix/store/abcd...efg-coreutils-8.23/bin/sleep:
+      #   cd /nix/store/abcd...efg-coreutils-8.23/bin
+      #   write /nix/store/abcd...efg-coreutils-8.23/bin/sleep sleep
+      #   sif sleep mode 040555
+      #   sif sleep gid 30000
+      # In particular, debugfs doesn't handle absolute target paths; you have to 'cd' in the virtual
+      # filesystem first. Likewise the intermediate directories must already exist (using `find`
+      # handles that for us). And when setting the file's permissions, the inode type flags (__S_IFDIR,
+      # __S_IFREG) need to be set as well.
+      (
+        echo write nix-path-registration nix-path-registration
+        echo mkdir nix
+        echo cd /nix
+        echo mkdir store
+
+        # XXX: This explodes in exciting ways if anything in /nix/store has a space in it.
+        find $storePaths -printf '%y %f %h %m\n'| while read -r type file dir perms; do
+          # echo "TYPE=$type DIR=$dir FILE=$file PERMS=$perms" >&2
+
+          echo "cd $dir"
+          case $type in
+            d)
+              echo "mkdir $file"
+              echo sif $file mode $((040000 | 0$perms)) # magic constant is __S_IFDIR
+              ;;
+            f)
+              echo "write $dir/$file $file"
+              echo sif $file mode $((0100000 | 0$perms)) # magic constant is __S_IFREG
+              ;;
+            l)
+              echo "symlink $file $(readlink "$dir/$file")"
+              ;;
+            *)
+              echo "Unknown entry: $type $dir $file $perms" >&2
+              exit 1
+              ;;
+          esac
+
+          echo sif $file gid 30000 # chgrp to nixbld
+        done
+      ) | faketime "1970-01-01 00:00:00" debugfs -w $out -f /dev/stdin > errorlog 2>&1
+
+      # The debugfs tool doesn't terminate on error nor exit with a non-zero status. Check manually.
+      if egrep -q 'Could not allocate|File not found' errorlog; then
+        cat errorlog
+        echo "--- Failed to create EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---"
+        return 1
+      fi
+    '';
+}
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
new file mode 100644
index 00000000000..0ca57a4635f
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs, ... }:
+
+let
+  extlinux-conf-builder =
+    import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
+      inherit pkgs;
+    };
+in
+{
+  imports = [
+    ../../profiles/minimal.nix
+    ../../profiles/installation-device.nix
+    ./sd-image.nix
+  ];
+
+  assertions = lib.singleton {
+    assertion = pkgs.stdenv.system == "armv7l-linux";
+    message = "sd-image-armv7l-multiplatform.nix can be only built natively on ARMv7; " +
+      "it cannot be cross compiled";
+  };
+
+  boot.loader.grub.enable = false;
+  boot.loader.generic-extlinux-compatible.enable = true;
+
+  # FIXME: change this to linuxPackages_latest once v4.2 is out
+  boot.kernelPackages = pkgs.linuxPackages_testing;
+  boot.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"];
+
+  # FIXME: fix manual evaluation on ARM
+  services.nixosManual.enable = lib.mkOverride 0 false;
+
+  # FIXME: this probably should be in installation-device.nix
+  users.extraUsers.root.initialHashedPassword = "";
+
+  sdImage = {
+    populateBootCommands = ''
+        ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot
+    '';
+  };
+}
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
new file mode 100644
index 00000000000..199a252ad2b
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -0,0 +1,46 @@
+{ config, lib, pkgs, ... }:
+
+let
+  extlinux-conf-builder =
+    import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
+      inherit pkgs;
+    };
+in
+{
+  imports = [
+    ../../profiles/minimal.nix
+    ../../profiles/installation-device.nix
+    ./sd-image.nix
+  ];
+
+  assertions = lib.singleton {
+    assertion = pkgs.stdenv.system == "armv6l-linux";
+    message = "sd-image-raspberrypi.nix can be only built natively on ARMv6; " +
+      "it cannot be cross compiled";
+  };
+
+  # Needed by RPi firmware
+  nixpkgs.config.allowUnfree = true;
+
+  boot.loader.grub.enable = false;
+  boot.loader.generic-extlinux-compatible.enable = true;
+
+  boot.kernelPackages = pkgs.linuxPackages_rpi;
+
+  # FIXME: fix manual evaluation on ARM
+  services.nixosManual.enable = lib.mkOverride 0 false;
+
+  # FIXME: this probably should be in installation-device.nix
+  users.extraUsers.root.initialHashedPassword = "";
+
+  sdImage = {
+    populateBootCommands = ''
+      for f in bootcode.bin fixup.dat start.elf; do
+        cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/
+      done
+      cp ${pkgs.ubootRaspberryPi}/u-boot.bin boot/u-boot-rpi.bin
+      echo 'kernel u-boot-rpi.bin' > boot/config.txt
+      ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot
+    '';
+  };
+}
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
new file mode 100644
index 00000000000..12b4f304561
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -0,0 +1,127 @@
+# This module creates a bootable SD card image containing the given NixOS
+# configuration. The generated image is MBR partitioned, with a FAT /boot
+# partition, and ext4 root partition. The generated image is sized to fit
+# its contents, and a boot script automatically resizes the root partition
+# to fit the device on the first boot.
+#
+# The derivation for the SD image will be placed in
+# config.system.build.sdImage
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  rootfsImage = import ../../../lib/make-ext4-fs.nix {
+    inherit pkgs;
+    inherit (config.sdImage) storePaths;
+    volumeLabel = "NIXOS_SD";
+  };
+in
+{
+  options.sdImage = {
+    storePaths = mkOption {
+      type = with types; listOf package;
+      example = literalExample "[ pkgs.stdenv ]";
+      description = ''
+        Derivations to be included in the Nix store in the generated SD image.
+      '';
+    };
+
+    bootSize = mkOption {
+      type = types.int;
+      default = 128;
+      description = ''
+        Size of the /boot partition, in megabytes.
+      '';
+    };
+
+    populateBootCommands = mkOption {
+      example = literalExample "'' cp \${pkgs.myBootLoader}/u-boot.bin boot/ ''";
+      description = ''
+        Shell commands to populate the ./boot directory.
+        All files in that directory are copied to the
+        /boot partition on the SD image.
+      '';
+    };
+  };
+
+  config = {
+    fileSystems = {
+      "/boot" = {
+        device = "/dev/disk/by-label/NIXOS_BOOT";
+        fsType = "vfat";
+      };
+      "/" = {
+        device = "/dev/disk/by-label/NIXOS_SD";
+        fsType = "ext4";
+      };
+    };
+
+    sdImage.storePaths = [ config.system.build.toplevel ];
+
+    system.build.sdImage = pkgs.stdenv.mkDerivation {
+      name = "sd-image-${pkgs.stdenv.system}.img";
+
+      buildInputs = with pkgs; [ dosfstools e2fsprogs mtools libfaketime utillinux ];
+
+      buildCommand = ''
+        # Create the image file sized to fit /boot and /, plus 4M of slack
+        rootSizeBlocks=$(du -B 512 --apparent-size ${rootfsImage} | awk '{ print $1 }')
+        bootSizeBlocks=$((${toString config.sdImage.bootSize} * 1024 * 1024 / 512))
+        imageSize=$((rootSizeBlocks * 512 + bootSizeBlocks * 512 + 4096 * 1024))
+        truncate -s $imageSize $out
+
+        # type=b is 'W95 FAT32', type=83 is 'Linux'.
+        sfdisk $out <<EOF
+            label: dos
+            label-id: 0x2178694e
+
+            start=1M, size=$bootSizeBlocks, type=b, bootable
+            type=83
+        EOF
+
+        # Copy the rootfs into the SD image
+        eval $(partx $out -o START,SECTORS --nr 2 --pairs)
+        dd conv=notrunc if=${rootfsImage} of=$out seek=$START count=$SECTORS
+
+        # Create a FAT32 /boot partition of suitable size into bootpart.img
+        eval $(partx $out -o START,SECTORS --nr 1 --pairs)
+        truncate -s $((SECTORS * 512)) bootpart.img
+        faketime "1970-01-01 00:00:00" mkfs.vfat -i 0x2178694e -n NIXOS_BOOT bootpart.img
+
+        # Populate the files intended for /boot
+        mkdir boot
+        ${config.sdImage.populateBootCommands}
+
+        # Copy the populated /boot into the SD image
+        (cd boot; mcopy -bpsvm -i ../bootpart.img ./* ::)
+        dd conv=notrunc if=bootpart.img of=$out seek=$START count=$SECTORS
+      '';
+    };
+
+    boot.postBootCommands = ''
+      # On the first boot do some maintenance tasks
+      if [ -f /nix-path-registration ]; then
+        # Figure out device names for the boot device and root filesystem.
+        rootPart=$(readlink -f /dev/disk/by-label/NIXOS_SD)
+        bootDevice=$(lsblk -npo PKNAME $rootPart)
+
+        # Resize the root partition and the filesystem to fit the disk
+        echo ",+," | sfdisk -N2 --no-reread $bootDevice
+        ${pkgs.parted}/bin/partprobe
+        ${pkgs.e2fsprogs}/bin/resize2fs $rootPart
+
+        # Register the contents of the initial Nix store
+        ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration
+
+        # nixos-rebuild also requires a "system" profile and an /etc/NIXOS tag.
+        touch /etc/NIXOS
+        ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
+
+        # Prevents this from running on later boots.
+        rm -f /nix-path-registration
+      fi
+    '';
+  };
+}

From 80533a50431e555369fa9574ce222b2a912bda5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 26 Jul 2015 00:13:27 +0200
Subject: [PATCH 0284/2016] iproute: 4.0.0 -> 4.1.1

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

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 53812a71286..15e25861f27 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, flex, bison, db, iptables, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "iproute2-4.0.0";
+  name = "iproute2-4.1.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
-    sha256 = "0616cg6liyysfddf6d8i4vyndd9b0hjmfw35icq8p18b0nqnxl2w";
+    sha256 = "0vz6m2k6hdrjlg4x0r3cd75lg9ysmndbsp35pm8494zvksc7l1vk";
   };
 
   patch = [ ./vpnc.patch ];

From 1edd09964ced48a2f19bdcc55df434eecd00a21e Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 25 Jul 2015 13:30:43 -0300
Subject: [PATCH 0285/2016] Bochs: 2.6.7 -> 2.6.8

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

diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index 914114467e6..b876403d632 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -4,7 +4,7 @@
 , docbook_xml_dtd_45, docbook_xsl
 , sdlSupport ? true, SDL2 ? null
 , termSupport ? true , ncurses ? null
-, wxSupport ? false, wxGTK ? null # Warning! Broken
+, wxSupport ? true, wxGTK ? null
 # Optional, undocumented dependencies
 , wgetSupport ? false, wget ? null
 , curlSupport ? false, curl ? null
@@ -19,11 +19,11 @@ assert curlSupport -> (curl != null);
 stdenv.mkDerivation rec {
 
   name = "bochs-${version}";
-  version = "2.6.7";
+  version = "2.6.8";
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz";
-    sha256 = "10l2pgzwnmng0rd44kqv7y46nwpcc18j53h3kf3dlqlnd7mlwdd4";
+    sha256 = "1kl5cmbz6qgg33j5vv9898nzdppp1rqgy24r5pv762aaj7q0ww3r";
   };
 
   # The huge list of configurable options

From bdd20cedc1e573df9357aeddb64e8bb26b43e7ad Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 26 Jul 2015 01:08:05 -0300
Subject: [PATCH 0286/2016] IceWM: 1.3.8 -> 1.3.10

A complete rewrite in comparision to previous expression.
---
 .../services/x11/window-managers/icewm.nix    | 17 +------
 .../window-managers/icewm/default.nix         | 44 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  5 ++-
 3 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/icewm.nix b/nixos/modules/services/x11/window-managers/icewm.nix
index 36028da453a..9a3e8022189 100644
--- a/nixos/modules/services/x11/window-managers/icewm.nix
+++ b/nixos/modules/services/x11/window-managers/icewm.nix
@@ -3,29 +3,16 @@
 with lib;
 
 let
-
   cfg = config.services.xserver.windowManager.icewm;
-
 in
-
 {
-
   ###### interface
-
   options = {
-
-    services.xserver.windowManager.icewm.enable = mkOption {
-      default = false;
-      description = "Enable the IceWM window manager.";
-    };
-
+    services.xserver.windowManager.icewm.enable = mkEnableOption "oroborus";
   };
 
-
   ###### implementation
-
   config = mkIf cfg.enable {
-
     services.xserver.windowManager.session = singleton
       { name = "icewm";
         start =
@@ -36,7 +23,5 @@ in
       };
 
     environment.systemPackages = [ pkgs.icewm ];
-
   };
-
 }
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index f3d88c55c58..b1b63df574a 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -1,35 +1,39 @@
-{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, freetype
-, fontconfig, xlibs, automake, pkgconfig, gdk_pixbuf }:
+{ stdenv, fetchurl, cmake, gettext
+, libjpeg, libtiff, libungif, libpng, imlib, expat
+, freetype, fontconfig, pkgconfig, gdk_pixbuf
+, mkfontdir, libX11, libXft, libXext, libXinerama
+, libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb
+, libpthreadstubs }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "icewm-1.3.8";
+  name = "icewm-${version}";
+  version = "1.3.10";
 
   buildInputs =
-    [ gettext libjpeg libtiff libungif libpng
-      xlibs.libX11 xlibs.libXft xlibs.libXext xlibs.libXinerama xlibs.libXrandr
-      xlibs.libICE xlibs.libSM freetype fontconfig
-      pkgconfig gdk_pixbuf
-    ];
+  [ cmake gettext libjpeg libtiff libungif libpng imlib expat
+    freetype fontconfig pkgconfig gdk_pixbuf mkfontdir libX11
+    libXft libXext libXinerama libXrandr libICE libSM libXpm
+    libXdmcp libxcb libpthreadstubs ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/icewm/${name}.tar.gz";
-    sha256 = "066d1mw0vm9ygxnyxksfi6k4vzclvnlkvj04pj3kbcmv1fg8sn0p";
+    url = "https://github.com/bbidulock/icewm/archive/${version}.tar.gz";
+    sha256 = "01i7a21gf810spmzjx32dxsmx4527qivs744rhvhaw4gr00amrns";
   };
 
-  NIX_LDFLAGS = "-lfontconfig";
-
-  # The fuloong2f is not supported by 1.3.6 still
-  #
-  # Don't know whether 1.3.7 supports fuloong2f and don't know how to test it
-  # on x86_64 hardware. So I left this 'cp' -- urkud
-
   preConfigure = ''
-    cp -v ${automake}/share/automake*/config.{sub,guess} .
+    export cmakeFlags="-DPREFIX=$out"
   '';
 
   meta = {
-    description = "A window manager for the X Window System";
+    description = "A simple, lightweight X window manager";
+    longDescription = ''
+      IceWM is a window manager for the X Window System. The goal of
+      IceWM is speed, simplicity, and not getting in the user's way.
+    '';
     homepage = http://www.icewm.org/;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.AndersonTorres ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3e7849dd1a..3a26c7510cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11646,7 +11646,10 @@ let
 
   i810switch = callPackage ../os-specific/linux/i810switch { };
 
-  icewm = callPackage ../applications/window-managers/icewm { };
+  icewm = callPackage ../applications/window-managers/icewm {
+    inherit (xlibs) libX11 libXft libXext libXinerama
+      libXrandr libICE libSM;
+  };
 
   id3v2 = callPackage ../applications/audio/id3v2 { };
 

From 4de0d7def5805433261f5d171480c90824d9f9e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jul 2015 09:36:13 +0200
Subject: [PATCH 0287/2016] libdmtx: remove imagemagick dependency, /cc #8990

I found no reason for the dependency at all, and it was even propagated.
Neither Debian nor Arch have any kind of it.
---
 pkgs/development/libraries/libdmtx/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix
index 8d7049dc29a..26cf2c023eb 100644
--- a/pkgs/development/libraries/libdmtx/default.nix
+++ b/pkgs/development/libraries/libdmtx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, imagemagick }:
+{ stdenv, fetchurl, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "libdmtx-0.7.4";
@@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  propagatedBuildInputs = [ imagemagick ];
-
   meta = {
     description = "An open source software for reading and writing Data Matrix barcodes";
     homepage = http://libdmtx.org;

From 06510fab8c8bf0b597908b5fb800ba91f2480868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jul 2015 11:44:55 +0200
Subject: [PATCH 0288/2016] mesa: get rid of llvm dependency in $out, /cc #8990

- libXvMC* should be found fine in $drivers
- for d3d state tracker, I don't know how it works,
  but it's a non-critical thing and maybe no nixers use it yet
---
 pkgs/development/libraries/mesa/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9d7fa4ae406..c30ef49268f 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -4,7 +4,6 @@
 , libvdpau, libelf, libva
 , grsecEnabled
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
-, enableExtraFeatures ? false # not maintained
 }:
 
 if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
@@ -123,10 +122,8 @@ stdenv.mkDerivation {
   # ToDo: probably not all .la files are completely fixed, but it shouldn't matter
   postInstall = with stdenv.lib; ''
     mv -t "$drivers/lib/" \
-  '' + optionalString enableExtraFeatures ''
-      `#$out/lib/libXvMC*` \
-      $out/lib/gbm $out/lib/libgbm* \
-  '' + ''
+      $out/lib/libXvMC* \
+      $out/lib/d3d \
       $out/lib/vdpau \
       $out/lib/libxatracker*
 

From 761fc1a45722898e05be5a960eb19432a506b639 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 11:53:43 +0200
Subject: [PATCH 0289/2016] Remove tabs

---
 pkgs/applications/editors/emacs-24/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 5d6d576af8e..487fccfa90d 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -7,8 +7,8 @@
 , withGTK2 ? true, gtk2
 }:
 
-assert (libXft != null) -> libpng != null;	# probably a bug
-assert stdenv.isDarwin -> libXaw != null;	# fails to link otherwise
+assert (libXft != null) -> libpng != null;      # probably a bug
+assert stdenv.isDarwin -> libXaw != null;       # fails to link otherwise
 assert withGTK2 -> withX || stdenv.isDarwin;
 assert withGTK3 -> withX || stdenv.isDarwin;
 assert withGTK2 -> !withGTK3 && gtk2 != null;

From d7e97e07a32a24af5d104757fa563e46c370cbfe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 11:54:16 +0200
Subject: [PATCH 0290/2016] librsvg: Disable GTK+ 3 dependency

GTK+ 2 is still our default, so packages should generally not depend
on GTK+ 3. For instance, this causes Emacs to depend on both GTK+ 2
and 3, which is obviously a bad thing.

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

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 4c22c988c79..ea1910733e7 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
+{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
 , bzip2, libcroco, libintlOrEmpty
-, gtk3 ? null
+, withGTK ? false, gtk3 ? null
 , gobjectIntrospection ? null, enableIntrospection ? false }:
 
 # no introspection by default, it's too big
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ]
     ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ];
 
-  propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk3 ];
+  propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
 
   nativeBuildInputs = [ pkgconfig ];
 

From 1a4bb0ef9b4abc14325541ce2f145c364838de12 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 11:58:51 +0200
Subject: [PATCH 0291/2016] libbluray: Don't depend on the JDK by default

Depending on the JDK increases the closure size by a few hundred MB.

Issue #8990.
---
 pkgs/development/libraries/libbluray/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index de0fa1a56d3..a7a8e7cea63 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook
-, withJava ? true, jdk ? null, ant ? null
+, withJava ? false, jdk ? null, ant ? null
 , withAACS ? false, libaacs ? null
 , withBDplus ? false, libbdplus ? null
 , withMetadata ? true, libxml2 ? null

From 9ca034f277209aad437e169ae3a555f6372328a4 Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Sun, 26 Jul 2015 10:29:56 +0300
Subject: [PATCH 0292/2016] purple-vk-plugin: init at 40ddb6d (close #8996)

@vcunat simplified preConfigure.
---
 .../purple-vk-plugin/default.nix              | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
new file mode 100644
index 00000000000..0a96d8749ae
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchhg, pidgin, cmake, libxml2 } :
+
+let
+  version = "40ddb6d";
+in
+stdenv.mkDerivation rec {
+  name = "purple-vk-plugin-${version}";
+
+  src = fetchhg {
+    url = "https://bitbucket.org/olegoandreev/purple-vk-plugin";
+    rev = "${version}";
+    sha256 = "02p57fgx8ml00cbrb4f280ak2802svz80836dzk9f1zwm1bcr2qc";
+  };
+
+  buildInputs = [ pidgin cmake libxml2 ];
+
+  preConfigure = ''
+    sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION lib/purple-2|' CMakeLists.txt
+  '';
+
+  cmakeFlags = "-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=1";
+
+  meta = {
+    homepage = https://bitbucket.org/olegoandreev/purple-vk-plugin;
+    description = "Vk (russian social network) plugin for Pidgin / libpurple";
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7889e5c334d..4eb2e469afa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12344,6 +12344,8 @@ let
 
   purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { };
 
+  purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { };
+
   toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { };
 
   pithos = callPackage ../applications/audio/pithos {

From 2d9c63633eb533ee0539717b1ce92d9063d36340 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 13:35:49 +0200
Subject: [PATCH 0293/2016] move-docs.sh: Handle share/gtk-doc

---
 pkgs/build-support/setup-hooks/move-docs.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh
index c819ee12a9c..57b71c15691 100644
--- a/pkgs/build-support/setup-hooks/move-docs.sh
+++ b/pkgs/build-support/setup-hooks/move-docs.sh
@@ -42,6 +42,7 @@ _moveDocs() {
     _moveToOutput share/man "$man"
     _moveToOutput share/info "$info"
     _moveToOutput share/doc "$doc"
+    _moveToOutput share/gtk-doc "$doc"
 
     # Remove empty share directory.
     if [ -d "$out/share" ]; then

From e93975760908c3f0ba905103ce9bb643c7aa05ff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 13:36:22 +0200
Subject: [PATCH 0294/2016] libxml2: Move docs to separate output

This reduces the size of "out" from 8.6 to 2.4 MB.
---
 pkgs/development/libraries/libxml2/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 153096ee45c..2fdc198aa11 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -16,11 +16,13 @@ stdenv.mkDerivation (rec {
     sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = stdenv.lib.optional pythonSupport python
     # Libxml2 has an optional dependency on liblzma.  However, on impure
     # platforms, it may end up using that from /usr/lib, and thus lack a
     # RUNPATH for that, leading to undefined references for its users.
-    ++ (stdenv.lib.optional stdenv.isFreeBSD xz);
+    ++ stdenv.lib.optional stdenv.isFreeBSD xz;
 
   propagatedBuildInputs = [ zlib findXMLCatalogs ];
 

From a951f11021c547421691a52bc01da4e6d35efa62 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 13:43:49 +0200
Subject: [PATCH 0295/2016] Move some more gtk-docs to the doc output

---
 pkgs/desktops/gnome-2/platform/GConf/default.nix      | 4 +++-
 pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix  | 2 ++
 pkgs/development/compilers/orc/default.nix            | 2 ++
 pkgs/development/libraries/at-spi2-core/default.nix   | 2 ++
 pkgs/development/libraries/dbus-glib/default.nix      | 2 ++
 pkgs/development/libraries/harfbuzz/default.nix       | 2 ++
 pkgs/development/libraries/libsoup/default.nix        | 2 ++
 pkgs/development/libraries/poppler/default.nix        | 2 ++
 pkgs/development/python-modules/pygobject/default.nix | 2 ++
 pkgs/os-specific/linux/udisks/2-default.nix           | 2 ++
 10 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index d4a8e1ff846..db51a5f8962 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -4,13 +4,15 @@
 assert withGtk -> (gtk != null);
 
 stdenv.mkDerivation {
-  name = "GConf-2.32.4";
+  name = "gconf-2.32.4";
 
   src = fetchurl {
     url = mirror://gnome/sources/GConf/2.32/GConf-2.32.4.tar.xz;
     sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ]
     # polkit requires pam, which requires shadow.h, which is not available on
     # darwin
diff --git a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
index 1875c1491f9..e8ddf7096e6 100644
--- a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
   };
 
+  outputs = [ "out" "doc" ];
+
   configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
 
   buildInputs = [ pkgconfig libxml2 glib ];
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 1c1b5d53cee..3b8916c67e9 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1ryz1gfgrxcj806cakcblxf0bcwq8p2mw8k86fs3f5wlwayawzkn";
   };
 
+  outputs = [ "out" "doc" ];
+
   # building memcpy_speed.log
   # ../test-driver: line 107:  4495 Segmentation fault      "$@" > $log_file 2>&1
   # FAIL: memcpy_speed
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index a3632bc13fd..0fc28185501 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "1l3l39mw23zyjlcqidvkyqlr4gwbhplzw2hcv3qvn6p8ikxpf2qw";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [
     python pkgconfig popt  intltool dbus_glib
     libX11 xextproto libSM libICE libXtst libXi
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 00b302bde8d..480dc61897b 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz";
   };
 
+  outputs = [ "out" "doc" ];
+
   nativeBuildInputs = [ pkgconfig gettext ];
 
   buildInputs = [ expat libiconv ];
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 216bad19790..bac9edd5c2e 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "0z05vj3va43adzxn026fpdvdd533q5zrs5dcxaz3gd021hysa6nq";
   };
 
+  outputs = [ "out" "doc" ];
+
   configureFlags = [
     ( "--with-graphite2=" + (if withGraphite2 then "yes" else "no") ) # not auto-detected by default
     ( "--with-icu=" +       (if withIcu       then "yes" else "no") )
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 82629ca3c6f..8ad158aafb7 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation {
     sha256 = "ea34dd64fe44343445daf6dd690d0691e9d973468de44878da97371c16d89784";
   };
 
+  outputs = [ "out" "doc" ];
+
   patchPhase = ''
     patchShebangs libsoup/
     patch -p1 < ${./bad-symbol.patch}
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index f54f12031b4..ce63f5c9716 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
+  outputs = [ "out" "doc" ];
+
   patches = [ ./datadir_env.patch ];
 
   propagatedBuildInputs = with stdenv.lib;
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 9393b0a2f94..6f713933040 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
   };
 
+  outputs = [ "out" "doc" ];
+
   configureFlags = "--disable-introspection";
 
   buildInputs = [ python pkgconfig glib ];
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 9b7a7501629..76d6caa767c 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify";
   };
 
+  outputs = [ "out" "doc" ];
+
   patches = [ ./force-path.patch ];
 
   # FIXME remove /var/run/current-system/sw/* references

From 5b527968bd227f59554c07b2f4ae70dfbe9b9b08 Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Sun, 26 Jul 2015 10:19:44 +0300
Subject: [PATCH 0296/2016] pidgin-mra: init at 54b2992 (close #8996)

@vcunat made pkgconfig dependency explicit.
---
 .../pidgin-plugins/pidgin-mra/default.nix     | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
new file mode 100644
index 00000000000..ba7396db9d6
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, pkgconfig, pidgin } :
+
+let
+  version = "54b2992";
+in
+stdenv.mkDerivation rec {
+  name = "pidgin-mra-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/dreadatour/pidgin-mra";
+    rev = "${version}";
+    sha256 = "1nhfx9gi5lhh2xjr9rw600bb53ly2nwiqq422vc0f297qkm1q9y0";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ pidgin ];
+
+  preConfigure = ''
+    sed -i 's|-I/usr/include/libpurple|$(shell pkg-config --cflags purple)|' Makefile
+    export DESTDIR=$out
+    export LIBDIR=/lib
+    export DATADIR=/share
+  '';
+
+  meta = {
+    homepage = https://github.com/dreadatour/pidgin-mra;
+    description = "Mail.ru Agent plugin for Pidgin / libpurple";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4eb2e469afa..35e643963f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12336,6 +12336,8 @@ let
 
   pidginmsnpecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { };
 
+  pidgin-mra = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-mra { };
+
   pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { };
 
   pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { };

From 2c1e52a960d2c12abe76d67362eb4cbf40ed8880 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 26 Jul 2015 15:37:50 +0200
Subject: [PATCH 0297/2016] electrum: 2.3.2 -> 2.4

---
 pkgs/applications/misc/electrum/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index b910b1796a3..7aff57a6af9 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   name = "electrum-${version}";
-  version = "2.3.2";
+  version = "2.4";
 
   src = fetchurl {
     url = "https://download.electrum.org/Electrum-${version}.tar.gz";
-    sha256 = "0idqm77d5rbwpw14wqg4ysvbjyqjw7zlqfcdxniy74i2qwz163bi";
+    sha256 = "0z5ksr1wlywl4bpvxjmmqnsk7jh1jfjdz9lsjkhf2j391jx0wz9q";
   };
 
   propagatedBuildInputs = with pythonPackages; [
@@ -16,6 +16,7 @@ buildPythonPackage rec {
     protobuf
     pyasn1
     pyasn1-modules
+    pycrypto
     pyqt4
     qrcode
     requests

From cdc58d410bafec1ff85acf0115cbdaab8210fd35 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Mon, 27 Apr 2015 22:44:35 -0400
Subject: [PATCH 0298/2016] peru: init at 0.2.3

A project dependencies version management system
built on top of multiple version management systems.
---
 .../version-management/peru/default.nix       | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/version-management/peru/default.nix

diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix
new file mode 100644
index 00000000000..d97aee23388
--- /dev/null
+++ b/pkgs/applications/version-management/peru/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, python3Packages }:
+
+let 
+  version = "0.2.3"; 
+in
+
+python3Packages.buildPythonPackage rec {
+  
+  # Do not prefix name with python specific version identifier.
+  namePrefix = "";
+
+  name = "peru-${version}";
+
+  src = fetchFromGitHub {
+    owner = "buildinspace";
+    repo = "peru";
+    rev = "${version}";
+    sha256 = "04bnaly50qmzkj0shdag94n8vr3ggarlqdny5zdb8nh31fqgln8b";
+  };
+
+  pythonPath = with python3Packages; [ pyyaml docopt ];
+
+  meta = {
+    homepage = https://github.com/buildinspace/peru;
+    description = "A tool for including other people's code in your projects";
+    license = stdenv.lib.licenses.mit;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de31d5da692..aa1fdbbae26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12381,6 +12381,8 @@ let
 
   cura = callPackage ../applications/misc/cura { };
 
+  peru = callPackage ../applications/version-management/peru {};
+
   printrun = callPackage ../applications/misc/printrun { };
 
   sddm = callPackage ../applications/display-managers/sddm { };

From 3465ffa8b0543d5c845c9f3a49689c41eca0ddc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jul 2015 15:50:59 +0200
Subject: [PATCH 0299/2016] ghostscript: reduce size significantly, /cc #8990

- Don't use static bin/gs.
- Split docs into a separate output.
- Split fonts into another derivation, so they're not reinstalled when
  something changes.
- Drop --disable-sse2
  https://github.com/NixOS/nixpkgs/commit/e723c512c#commitcomment-12361078
- Some cleanups.
---
 pkgs/misc/ghostscript/default.nix | 85 ++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 36 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index c521e156f8e..fe86577bb7b 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -7,26 +7,43 @@
 
 assert x11Support -> x11 != null;
 assert cupsSupport -> cups != null;
+let
+  version = "9.15";
+  sha256 = "0p1isp6ssfay141klirn7n9s8b546vcz6paksfmksbwy0ljsypg6";
 
+  fonts = stdenv.mkDerivation {
+    name = "ghostscript-fonts";
+
+    srcs = [
+      (fetchurl {
+        url = "mirror://sourceforge/gs-fonts/ghostscript-fonts-std-8.11.tar.gz";
+        sha256 = "00f4l10xd826kak51wsmaz69szzm2wp8a41jasr4jblz25bg7dhf";
+      })
+      (fetchurl {
+        url = "mirror://gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz";
+        sha256 = "1cxaah3r52qq152bbkiyj2f7dx1rf38vsihlhjmrvzlr8v6cqil1";
+      })
+      # ... add other fonts here
+    ];
+
+    installPhase = ''
+      mkdir "$out"
+      mv -v * "$out/"
+    '';
+  };
+
+in
 stdenv.mkDerivation rec {
-  name = "ghostscript-9.15";
+  name = "ghostscript-${version}";
 
   src = fetchurl {
     url = "http://downloads.ghostscript.com/public/${name}.tar.bz2";
-    sha256 = "0p1isp6ssfay141klirn7n9s8b546vcz6paksfmksbwy0ljsypg6";
+    inherit sha256;
   };
 
-  fonts = [
-    (fetchurl {
-      url = "mirror://sourceforge/gs-fonts/ghostscript-fonts-std-8.11.tar.gz";
-      sha256 = "00f4l10xd826kak51wsmaz69szzm2wp8a41jasr4jblz25bg7dhf";
-    })
-    (fetchurl {
-      url = "mirror://gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz";
-      sha256 = "1cxaah3r52qq152bbkiyj2f7dx1rf38vsihlhjmrvzlr8v6cqil1";
-    })
-    # ... add other fonts here
-  ];
+  patches = [ ./urw-font-files.patch ];
+
+  outputs = [ "out" "doc" ];
 
   enableParallelBuilding = true;
 
@@ -40,38 +57,34 @@ stdenv.mkDerivation rec {
     # [] # maybe sometimes jpeg2000 support
     ;
 
-  patches = [ ./urw-font-files.patch ];
-
   makeFlags = [ "cups_serverroot=$(out)" "cups_serverbin=$(out)/lib/cups" ];
 
-  configureFlags =
-    [ "--with-system-libtiff" "--disable-sse2"
-      "--enable-dynamic"
-      (if x11Support then "--with-x" else "--without-x")
-      (if cupsSupport then "--enable-cups" else "--disable-cups")
-    ];
-
-  doCheck = true;
-
-  installTargets="install soinstall";
-
-  #CFLAGS = "-fPIC";
-  #NIX_LDFLAGS =
-  #  "-lz -rpath${ if stdenv.isDarwin then " " else "="}${freetype}/lib";
-
   preConfigure = ''
     rm -rf jpeg libpng zlib jasper expat tiff lcms{,2} jbig2dec openjpeg freetype cups/libs
 
     sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@; s@INCLUDE=/usr/include@INCLUDE=/no-such-path@" -i base/unix-aux.mak
   '';
 
-  postInstall = ''
-    # ToDo: web says the fonts should be already included
-    for i in $fonts; do
-      (cd $out/share/ghostscript && tar xvfz $i)
-    done
+  configureFlags =
+    [ "--with-system-libtiff"
+      "--enable-dynamic"
+      (if x11Support then "--with-x" else "--without-x")
+      (if cupsSupport then "--enable-cups" else "--disable-cups")
+    ];
 
-    rm -rf $out/lib/cups/filter/{gstopxl,gstoraster}
+  doCheck = true;
+
+  # don't build/install statically linked bin/gs
+  buildFlags = "so";
+  installTargets="soinstall";
+
+  postInstall = ''
+    ln -s gsc "$out"/bin/gs
+
+    mkdir -p "$doc/share/ghostscript/${version}"
+    mv "$out/share/ghostscript/${version}"/{doc,examples} "$doc/share/ghostscript/${version}/"
+
+    ln -s "${fonts}" "$out/share/ghostscript/fonts"
   '';
 
   meta = {

From 61f1594378103cd334267d382d941b59730f6871 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sun, 26 Jul 2015 16:05:50 +0200
Subject: [PATCH 0300/2016] libraw: fix version number (0.16.1 -> 0.16.0)

The last commit that touched this library updated the version number but
not the hash. I opted into fixing the version number rather than the
hash because actually updating libraw into version 0.16.1 or later
causes a build failure in libkdcraw and therefore breaks gwenview (which
is one of the main KDE apps).
---
 pkgs/development/libraries/libraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 3e0d2348a50..d272ad18492 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.16.1";
+  version = "0.16.0";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = { 
+  meta = {
     description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
     homepage = http://www.libraw.org/;
     license = stdenv.lib.licenses.gpl2Plus;

From 3322c96a361c296fab2366b41e086a924f4baa81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jul 2015 17:47:04 +0200
Subject: [PATCH 0301/2016] dejavu-fonts: don't install the fonts twice :-S

---
 pkgs/data/fonts/dejavu-fonts/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index 21028ee0b32..728cb444539 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -30,13 +30,11 @@ stdenv.mkDerivation rec {
     ln -s ${unicodeData} resources/UnicodeData.txt
     ln -s ${blocks} resources/Blocks.txt
   '';
-  installPhase = '' 
+  installPhase = ''
     mkdir -p $out/share/fonts/truetype
-    for i in $(find build -name '*.ttf'); do 
-        cp $i $out/share/fonts/truetype; 
+    for i in $(find build -name '*.ttf'); do
+        cp $i $out/share/fonts/truetype;
     done;
-    mkdir -p $out/share/dejavu-fonts
-    cp -r build/* $out/share/dejavu-fonts
   '';
 }
-  
+

From e972f65f3c02b4b00db4f1e999946a3f0fbc8f2e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 25 Jul 2015 00:00:49 +0200
Subject: [PATCH 0302/2016] theme-vertex: init at 20150718

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

diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
new file mode 100644
index 00000000000..d1c81e0af48
--- /dev/null
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "theme-vertex-${version}";
+  version = "20150718";
+
+  src = fetchFromGitHub {
+    owner = "horst3180";
+    repo = "Vertex-theme";
+    rev = version;
+    sha256 = "19mmybfkx3mrbm9vr78c7xiyazmyzji1n6669466svjr3jy87546";
+  };
+
+  buildInputs = [ autoreconfHook gtk3 pkgconfig ];
+
+  configureFlags = "--disable-unity";
+
+  postInstall = ''
+    mkdir -p $out/share/doc/theme-vertex
+    cp AUTHORS COPYING README.md $out/share/doc/theme-vertex/
+
+    mkdir -p $out/share/doc/theme-vertex/extra
+    cp -r extra/{Chrome,Firefox} $out/share/doc/theme-vertex/extra
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon";
+    license = licenses.gpl3;
+    maintainer = [ maintainers.rycee ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d4af1c6a01..85c4685f300 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14110,6 +14110,8 @@ let
 
   kde5 = kf5_stable // plasma5_stable // kdeApps_stable;
 
+  theme-vertex = callPackage ../misc/themes/vertex { };
+
   xfce = xfce4-12;
   xfce4-12 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; });
 

From 6cb708c3b3f03c54a98f9c543907411039303989 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 26 Jul 2015 12:38:34 -0700
Subject: [PATCH 0303/2016] chromium: Bump

---
 .../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 6b2f542f34f..f6d663fcd14 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,10 +1,10 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "45.0.2454.7";
-    sha256 = "19xjdp0zxr96r2fx9wf30wldalrh393p2dhqwp2n1m751vizbj5s";
-    sha256bin32 = "1id1z3m0pc2lxh4lp9r6babh098gfyz4dda931yjkxhzb9rw1v0d";
-    sha256bin64 = "1sksf651z1sqgh9pwdm5dksqnb0lzhwabxj3myg4w5kxi8s4pi8l";
+    version = "45.0.2454.15";
+    sha256 = "1zg562cpn9ddai92jdjg3frhmvbhbkf71ysprwqa3rgbg6w8ipzj";
+    sha256bin32 = "1fcwzwb6zq7ld7fs0iws0d9jmxhjhdax4y744dx4d7bc77357x3m";
+    sha256bin64 = "0273dy5b1r9s9g8ixrafnxm8jnn4ha36r3b3ckdabm9y4pqwx54s";
   };
   beta = {
     version = "44.0.2403.89";
@@ -13,9 +13,9 @@
     sha256bin64 = "0kvrpqy3fpfzchly65nrh8z2z2i49xpa3pm2k7k18sn0x4bycji0";
   };
   stable = {
-    version = "44.0.2403.89";
-    sha256 = "161shml5w2i0crl57hkfnizgmii6d70lxxg4rjxmays8g6lrmpds";
-    sha256bin32 = "09a1k0xxmp6v1nfnngfkhv9vilnwvqlbgfsisbhwdnkk86pnv7r4";
-    sha256bin64 = "1i7ylif5vd0yj0gddl2kv87gh3vgzvzmz91rrrs9za2bkf2gkf0p";
+    version = "44.0.2403.107";
+    sha256 = "0w9xk2jrpp98fgszswr5jc0g5ggpm8rfxqzxa8402n7iwkxlyqyh";
+    sha256bin32 = "0x4j5ggb2dh56lz5fg2h79lvp92rgsk59gi5h3ml678vcghzyfvn";
+    sha256bin64 = "0nhm9783b314dmicqky3424ak4z6xhb6rjia12pq2ajddz9qj9rj";
   };
 }

From 19f371d8d9000a7098b6dcfcbc8f45a8ec8e1e80 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sun, 28 Jun 2015 20:58:31 +0200
Subject: [PATCH 0304/2016] Fix libcxxStdenv on Linux

This corrects linkage failures arising from missing -lc++abi and
resolves "unused argument" warnings arising due to -stdlib=libc++
serving no purpose when search paths are being supplied explicitly.
---
 pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh | 6 ++----
 pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh | 6 ++----
 pkgs/top-level/all-packages.nix                          | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
index 8a45be7e85a..62ab46ac310 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
@@ -1,4 +1,2 @@
-export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1"
-
-export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++"
-export NIX_CXXSTDLIB_LINK=" -stdlib=libc++"
+export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"
diff --git a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
index 8a45be7e85a..62ab46ac310 100644
--- a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
@@ -1,4 +1,2 @@
-export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1"
-
-export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++"
-export NIX_CXXSTDLIB_LINK=" -stdlib=libc++"
+export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35e643963f3..e8f37de6240 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3667,7 +3667,7 @@ let
     libc = glibc;
     binutils = binutils;
     inherit coreutils zlib;
-    extraPackages = [ libcxx ];
+    extraPackages = [ libcxx libcxxabi ];
     nativeTools = false;
     nativeLibc = false;
   };

From 8a6c9f16bf957c8dbe0dcd8d31fc66367f54b705 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Jul 2015 18:48:01 +0200
Subject: [PATCH 0305/2016] julia: 0.3.9 -> 0.3.10

---
 pkgs/development/compilers/julia/0.3.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 4566752340f..1a496f457af 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "julia";
-  version = "0.3.9";
+  version = "0.3.10";
   name = "${pname}-${version}";
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
     rev = "refs/tags/v${version}";
-    sha256 = "ad0820affefd04eb6fba7deb2603756974711846a251900a9202b8d2665a37cf";
+    sha256 = "0px1zd7qmz6rrjf58k4kq55s7h8mny1w6xvcsrny2wbgckxzhqsg";
     name = "julia-git-v${version}";
   };
 
@@ -132,7 +132,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  # Test fail on i686 (julia version 0.3.10)
+  doCheck = !stdenv.isi686;
   checkTarget = "testall";
 
   meta = {

From 165406e1af81e156ed1c852d6031cd8fe646501e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 12:11:17 +0200
Subject: [PATCH 0306/2016] nvidia-x11: Remove runtime dependency on linux.dev

---
 pkgs/os-specific/linux/nvidia-x11/builder.sh  | 6 ++++--
 pkgs/os-specific/linux/nvidia-x11/default.nix | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 5edadeda81b..47ca3d120a5 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -47,8 +47,10 @@ installPhase() {
 
         # Install the kernel module.
         mkdir -p $out/lib/modules/$kernelVersion/misc
-        cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
-        cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc
+        for i in kernel/nvidia.ko kernel/uvm/nvidia-uvm.ko; do
+            nuke-refs $i
+            cp $i $out/lib/modules/$kernelVersion/misc/
+        done
     fi
 
     # All libs except GUI-only are in $out now, so fixup them.
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index a1278af8084..66b1a81d2e4 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
-, gtk, atk, pango, glib, gdk_pixbuf, cairo
+, gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences
 , # Whether to build the libraries only (i.e. not the kernel module or
   # nvidia-settings).  Used to support 32-bit binaries on 64-bit
   # Linux.
@@ -52,7 +52,9 @@ stdenv.mkDerivation {
     [ gtk atk pango glib gdk_pixbuf cairo ] );
   programPath = makeLibraryPath [ xlibs.libXv ];
 
-  buildInputs = [ perl ];
+  buildInputs = [ perl nukeReferences ];
+
+  disallowedReferences = if libsOnly then [] else [ kernel.dev ];
 
   meta = with stdenv.lib.meta; {
     homepage = http://www.nvidia.com/object/unix.html;

From 43f331a8740a5a45184ff05caaaeb0c34ba67fe9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 12:13:45 +0200
Subject: [PATCH 0307/2016] mpv: Don't enable JACK support by default

Packages should not depend on JACK by default to reduce dependency
bloat.

Issue #8990.
---
 pkgs/applications/video/mpv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 1be0f5b9e0a..5ac70413d16 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -12,7 +12,7 @@
 , bluraySupport ? true, libbluray ? null
 , speexSupport ? true, speex ? null
 , theoraSupport ? true, libtheora ? null
-, jackaudioSupport ? true, libjack2 ? null
+, jackaudioSupport ? false, libjack2 ? null
 , pulseSupport ? true, libpulseaudio ? null
 , bs2bSupport ? true, libbs2b ? null
 # For screenshots

From f64589b2ef750fc43c989dc35fbf196bfdafa4ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 12:16:35 +0200
Subject: [PATCH 0308/2016] firewall: Don't depend on ipset

NixOS doesn't use it, so no reason to include it.
---
 nixos/modules/services/networking/firewall.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 40681f5b957..21f8ae243a7 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -443,7 +443,7 @@ in
 
     networking.firewall.trustedInterfaces = [ "lo" ];
 
-    environment.systemPackages = [ pkgs.iptables pkgs.ipset ];
+    environment.systemPackages = [ pkgs.iptables ];
 
     boot.kernelModules = map (x: "nf_conntrack_${x}") cfg.connectionTrackingModules;
     boot.extraModprobeConfig = optionalString (!cfg.autoLoadConntrackHelpers) ''
@@ -462,7 +462,7 @@ in
       before = [ "network-pre.target" ];
       after = [ "systemd-modules-load.service" ];
 
-      path = [ pkgs.iptables pkgs.ipset ];
+      path = [ pkgs.iptables ];
 
       # FIXME: this module may also try to load kernel modules, but
       # containers don't have CAP_SYS_MODULE. So the host system had

From ecae014ddbcac09c204e2076a8dd69c9f7bc7487 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 12:37:57 +0200
Subject: [PATCH 0309/2016] gnutls: Don't depend on trousers by default

Let's keep the base system free of "trusted" computing crap...
---
 pkgs/development/libraries/gnutls/generic.nix | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 07760933935..436f6beb54e 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -1,5 +1,6 @@
-{ fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
-, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound, trousers
+{ lib, fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound
+, tpmSupport ? false, trousers
 
 # Version dependent args
 , version, src, patches ? []
@@ -7,9 +8,6 @@
 
 assert guileBindings -> guile != null;
 
-let
-  inherit (stdenv.lib) optional optionals optionalString;
-in
 stdenv.mkDerivation rec {
   name = "gnutls-${version}";
 
@@ -17,11 +15,11 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     # FIXME: perhaps use $SSL_CERT_FILE instead
-    optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
+    lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
   ++ [
     "--disable-dependency-tracking"
     "--enable-fast-install"
-  ] ++ optionals guileBindings
+  ] ++ lib.optional guileBindings
     [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
 
   # Build of the Guile bindings is not parallel-safe.  See
@@ -30,9 +28,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = !guileBindings;
 
   buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp ]
-    ++ optional stdenv.isLinux trousers
+    ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
     ++ [ unbound ]
-    ++ optional guileBindings guile;
+    ++ lib.optional guileBindings guile;
 
   nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
 
@@ -41,14 +39,14 @@ stdenv.mkDerivation rec {
   doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
 
   # Fixup broken libtool and pkgconfig files
-  preFixup = optionalString (!stdenv.isDarwin) ''
-    sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \
+  preFixup = lib.optionalString (!stdenv.isDarwin) ''
+    sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \
         -e 's,-lz,-L${zlib}/lib -lz,' \
         -e 's,-lgmp,-L${gmp}/lib -lgmp,' \
         -i $out/lib/libgnutls.la $out/lib/pkgconfig/gnutls.pc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The GNU Transport Layer Security Library";
 
     longDescription = ''

From 689897088ce3e9a80edfff10866a8c05459e0c1d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 12:44:26 +0200
Subject: [PATCH 0310/2016] cups: Don't depend on OpenSSL

Afaict, it doesn't use OpenSSL, just GNU/TLS.
---
 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 0018a2762e7..bcd27d68ce0 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
+{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam
 , dbus, acl, gmp, xdg_utils
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
     ++ optionals stdenv.isLinux [ pam dbus.libs acl xdg_utils ] ;
 
-  propagatedBuildInputs = [ openssl gmp ];
+  propagatedBuildInputs = [ gmp ];
 
   configureFlags = [
     "--localstatedir=/var"

From 4f6b1565c734b4966e6467ee8ad07341c3199d72 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 12:48:16 +0200
Subject: [PATCH 0311/2016] gnutls: Fix double application of callPackage

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 710a532113b..02a78deeb8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6408,11 +6408,13 @@ let
 
   gnutls = gnutls34;
 
-  gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix {
+  gnutls33 = import ../development/libraries/gnutls/3.3.nix {
+    inherit callPackage fetchurl;
     guileBindings = config.gnutls.guile or false;
   };
 
-  gnutls34 = callPackage ../development/libraries/gnutls/3.4.nix {
+  gnutls34 = import ../development/libraries/gnutls/3.4.nix {
+    inherit callPackage fetchurl;
     guileBindings = config.gnutls.guile or false;
   };
 

From fc4c20aefed34001cb9cdcb10f82d01aa9b04f16 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 12:48:51 +0200
Subject: [PATCH 0312/2016] Remove unused gnutls variants

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02a78deeb8f..7a62c52fd09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6418,10 +6418,6 @@ let
     guileBindings = config.gnutls.guile or false;
   };
 
-  gnutls33_with_guile = lowPrio (gnutls33.override { guileBindings = true; });
-
-  gnutls34_with_guile = lowPrio (gnutls34.override { guileBindings = true; });
-
   gpac = callPackage ../applications/video/gpac { };
 
   gpgme = callPackage ../development/libraries/gpgme {

From fc1077c9fbb526403aac00e24a6b641df6143ba5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 12:56:34 +0200
Subject: [PATCH 0313/2016] libsoup: Don't enable GNOME support by default

This bloats packages (like GStreamer) that depend on libsoup.
---
 pkgs/development/libraries/libsoup/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 82629ca3c6f..2be8ce3e3d1 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, glib, libxml2, pkgconfig
-, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
+, gnomeSupport ? false, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
 , libintlOrEmpty
 , intltool, python }:
 let

From 48efe637acac8558a9401a15ff0ed14eef3f6750 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 13:01:11 +0200
Subject: [PATCH 0314/2016] xdg-utils: Don't depend on "which"

---
 pkgs/tools/X11/xdg-utils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 6f306a86891..c010884abdd 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       substituteInPlace $item --replace "sed " "${gnused}/bin/sed "
       substituteInPlace $item --replace "egrep " "${gnugrep}/bin/egrep "
       sed -i $item -re "s#([^e])grep #\1${gnugrep}/bin/grep #g" # Don't replace 'egrep'
-      substituteInPlace $item --replace "which " "${which}/bin/which "
+      substituteInPlace $item --replace "which " "type -P "
       substituteInPlace $item --replace "/usr/bin/file" "${file}/bin/file"
     done
   '';

From b07de4bf8b3dcef46ccf154cf6e08b0a22ec55ff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 13:05:49 +0200
Subject: [PATCH 0315/2016] libsoup: Don't install docs

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

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 2be8ce3e3d1..12bb589cd9f 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation {
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
+  postInstall = "rm -rf $out/share/gtk-doc";
+
   meta = {
     inherit (glib.meta) maintainers platforms;
   };

From 8799287a8474d1fb45e50087da48cde8adf95d70 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 13:21:05 +0200
Subject: [PATCH 0316/2016] Bump the default version of PostgreSQL to 9.4

---
 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 7a62c52fd09..c8347021bbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9102,7 +9102,7 @@ let
     libmemcached = null; # Detection is broken upstream
   };
 
-  postgresql = postgresql92;
+  postgresql = postgresql94;
 
   postgresql90 = callPackage ../servers/sql/postgresql/9.0.x.nix { };
 

From c4a399f1065b04de2e196ec409173a0b7d224af1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 13:24:32 +0200
Subject: [PATCH 0317/2016] mariadb: Don't install static libraries

Issue #8990.
---
 pkgs/servers/sql/mariadb/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 27383721ceb..c8e9831f703 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -104,6 +104,9 @@ stdenv.mkDerivation rec {
     # Make sure to propagate lib for compatability
     mkdir -p $out/nix-support
     echo "$lib" > $out/nix-support/propagated-native-build-inputs
+
+    # Don't install static libraries.
+    rm $lib/lib/libmysqlclient.a $lib/lib/libmysqld.a
   '';
 
   passthru.mysqlVersion = "5.6";

From f7e13ad70c08011a6bb915858e3c3e34febae9fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 13:27:03 +0200
Subject: [PATCH 0318/2016] postgresql: Move docs to separate output

This cuts almost 15 MB.
---
 pkgs/servers/sql/postgresql/9.0.x.nix | 2 ++
 pkgs/servers/sql/postgresql/9.1.x.nix | 2 ++
 pkgs/servers/sql/postgresql/9.2.x.nix | 2 ++
 pkgs/servers/sql/postgresql/9.3.x.nix | 2 ++
 pkgs/servers/sql/postgresql/9.4.x.nix | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index ef7e5d3797f..4249b40c5c4 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "19gq6axjhvlr5zlrzwnll1fbrvai4xh0nb1jki6gmmschl6v5m4l";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ zlib readline openssl ];
 
   LC_ALL = "C";
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 7616f92ca62..09f468b50bb 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1a44hmcvfaa8j169ladsibmvjakw6maaxqkzz1ab8139cqkda9i7";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ zlib readline openssl ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 51a265da785..6b0792f50cd 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0i3avdr8mnvn6ldkx0hc4jmclhisb2338hzs0j2m03wck8hddjsx";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ zlib readline openssl ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index 3e0b7d4a76e..d45cdadf1e9 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "0j85j69rf54cwz5yhrhk4ca22b82990j5sqb8cr1fl9843nd0fzp";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ zlib readline openssl ]
                 ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
 
diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix
index cdb689fc110..d09a6528222 100644
--- a/pkgs/servers/sql/postgresql/9.4.x.nix
+++ b/pkgs/servers/sql/postgresql/9.4.x.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "04q07g209y99xzjh88y52qpvz225rxwifv8nzp3bxzfni2bdk3jk";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ zlib readline openssl ]
                 ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
 

From d24a5a49ea34c1690c4a142bfce6e9724ba87c44 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 13:54:53 +0200
Subject: [PATCH 0319/2016] kde-workspace: Disable gpsd dependency

This dependency causes substantial system bloat: gpsd depends on
pythonFull, which in turn depends on tcl/tk, etc.
---
 pkgs/desktops/kde-4.14/kde-workspace.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.14/kde-workspace.nix b/pkgs/desktops/kde-4.14/kde-workspace.nix
index c3af4f71442..75863e1fe99 100644
--- a/pkgs/desktops/kde-4.14/kde-workspace.nix
+++ b/pkgs/desktops/kde-4.14/kde-workspace.nix
@@ -13,7 +13,7 @@ kde {
       xorg.libxkbfile xorg.libXcomposite  xorg.libXtst
       xorg.libXdamage xorg.libXft
 
-      python boost qjson lm_sensors gpsd libraw1394 pciutils udev
+      python boost qjson lm_sensors /* gpsd */ libraw1394 pciutils udev
       akonadi pam libusb1 libqalculate kdepimlibs  prison
       kactivities
     ];

From 6a91bf20c814a1ce9abc03f1de10b894289ebaf6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 13:58:19 +0200
Subject: [PATCH 0320/2016] groff: Move docs to separate output

This cuts the size of the package by ~10 MB.
---
 pkgs/tools/text/groff/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index b0421a8ed0d..039bff8c655 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s";
   };
 
+  outputs = [ "out" "doc" ];
+
   enableParallelBuilding = false;
 
   buildInputs = [ ghostscript ];

From a2ddbc422f067c09505b6e78245bea7e7058eb82 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 14:04:54 +0200
Subject: [PATCH 0321/2016] xapian: Move docs to separate output

This reduces xapian's "out" from 9.1 to 3.3 MB.
---
 pkgs/development/libraries/xapian/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index a9334f31ecd..89f97292d39 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "0grd2s6gf8yzqwdaa50g57j9d81mxkrrpkyldm2shgyizdc8gx33";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ libuuid zlib ];
 
-  meta = { 
+  meta = {
     description = "Search engine library";
     homepage = http://xapian.org/;
     license = stdenv.lib.licenses.gpl2Plus;

From f98c7f2976e9a65da5548c3cad7173e88da9e0e6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 14:11:20 +0200
Subject: [PATCH 0322/2016] More docs in separate outputs

---
 pkgs/development/libraries/libqalculate/default.nix | 2 ++
 pkgs/development/libraries/openexr/default.nix      | 2 ++
 pkgs/tools/package-management/nix/default.nix       | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index bf1a1e232bb..3d9a288b5bb 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ intltool pkgconfig ];
   propagatedBuildInputs = [ cln libxml2 glib ];
 
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 71420ba425c..738e7d87af6 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n";
   };
 
+  outputs = [ "out" "doc" ];
+
   preConfigure = ''
     ./bootstrap
   '';
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index d64e194e93e..588aaf8b612 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1";
   };
 
+  outputs = [ "out" "doc" ];
+
   nativeBuildInputs = [ perl pkgconfig ];
 
   buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium;

From 0c91c169c0489bae5aed18992458a7f8767686ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 14:52:34 +0200
Subject: [PATCH 0323/2016] ghostscript: Get rid of docs/examples

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

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index c521e156f8e..11f816dbb97 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -72,6 +72,8 @@ stdenv.mkDerivation rec {
     done
 
     rm -rf $out/lib/cups/filter/{gstopxl,gstoraster}
+
+    rm -rf $out/share/ghostscript/*/{doc,examples}
   '';
 
   meta = {

From a68de0cc168f443ce65367bd8ce5e8d77b2e236a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 17:44:27 +0200
Subject: [PATCH 0324/2016] Revert "geeqie: update from 1.1 to 1.2"

This reverts commit 82e07fb1e88c176b5e0711a8afa68867d643896f. See
fee59b1235e658954b207ff6679264654c4708d2.
---
 pkgs/applications/graphics/geeqie/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index e1eb7bb5a7b..e2cc0ec5c01 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk, libpng, exiv2
-, lcms, intltool, gettext, fbida
+{ stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2
+, lcms, intltool, gettext, libchamplain, fbida
 }:
 
 stdenv.mkDerivation rec {
   name = "geeqie-${version}";
-  version = "1.2";
+  version = "1.1"; # Don't upgrade to 1.2; see fee59b1235e658954b207ff6679264654c4708d2.
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/g/geeqie/geeqie_${version}.orig.tar.gz";
-    sha256 = "0wkcpyh3f6ig36x1q6h9iqgq225w37visip48m72j8rpghmv1rn3";
+    url = "mirror://sourceforge/geeqie/${name}.tar.gz";
+    sha256 = "1kzy39z9505xkayyx7rjj2wda76xy3ch1s5z35zn8yli54ffhi2m";
   };
 
-  preConfigure = "./autogen.sh";
-
   configureFlags = [ "--enable-gps" ];
 
   buildInputs = [
-    pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext
+    pkgconfig gtk libpng exiv2 lcms intltool gettext
+    #libchamplain
   ];
 
   postInstall = ''

From 7f0a596473227a4cda01cb427a06e10332ec86ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 23:33:49 +0200
Subject: [PATCH 0325/2016] imagemagick: Reduce dependency bloat

The closure size of imagemagick has recently gone up from 530 MB
(already bad) to 846 MB, which is a bit excessive. So revert most of
the recent changes.
---
 .../graphics/ImageMagick/default.nix          | 84 ++++---------------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 18 insertions(+), 69 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 7ae24b38c01..e18686d989a 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,11 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, libtool
-, libcl ? null, perl ? null, jemalloc ? null, bzip2 ? null, zlib ? null
-, libX11 ? null, libXext ? null, libXt ? null, dejavu_fonts ? null, fftw ? null
-, libfpx ? null, djvulibre ? null, fontconfig ? null, freetype ? null
-, ghostscript ? null, graphviz ? null, jbigkit ? null, libjpeg ? null
-, lcms2 ? null, openjpeg ? null, liblqr1 ? null, xz ? null, openexr ? null
-, pango ? null, libpng ? null, librsvg ? null, libtiff ? null, libwebp ? null
-, libxml2 ? null
+{ lib, stdenv, fetchurl, pkgconfig, libtool
+, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
+, lcms2, openexr, libpng, librsvg, libtiff, libxml2
 }:
 
 let
@@ -17,15 +12,8 @@ let
     else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
     else throw "ImageMagick is not supported on this platform.";
 
-  mkFlag = trueStr: falseStr: cond: val: "--${if cond then trueStr else falseStr}-${val}";
-  mkWith = mkFlag "with" "without";
-  mkEnable = mkFlag "enable" "disable";
-
-  hasX11 = libX11 != null && libXext != null && libXt != null;
-
 in
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "imagemagick-${version}";
 
@@ -36,60 +24,22 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags = [
-    (mkEnable (libcl != null)        "opencl")
-    (mkWith   true                   "modules")
-    (mkWith   true                   "gcc-arch=${arch}")
-    #(mkEnable true                   "hdri") This breaks some dependencies
-    (mkWith   (perl != null)         "perl")
-    (mkWith   (jemalloc != null)     "jemalloc")
-    (mkWith   true                   "frozenpaths")
-    (mkWith   (bzip2 != null)        "bzlib")
-    (mkWith   hasX11                 "x")
-    (mkWith   (zlib != null)         "zlib")
-    (mkWith   false                  "dps")
-    (mkWith   (fftw != null)         "fftw")
-    (mkWith   (libfpx != null)       "fpx")
-    (mkWith   (djvulibre != null)    "djvu")
-    (mkWith   (fontconfig != null)   "fontconfig")
-    (mkWith   (freetype != null)     "freetype")
-    (mkWith   (ghostscript != null)  "gslib")
-    (mkWith   (graphviz != null)     "gvc")
-    (mkWith   (jbigkit != null)      "jbig")
-    (mkWith   (libjpeg != null)      "jpeg")
-    (mkWith   (lcms2 != null)        "lcms2")
-    (mkWith   false                  "lcms")
-    (mkWith   (openjpeg != null)     "openjp2")
-    (mkWith   (liblqr1 != null)      "lqr")
-    (mkWith   (xz != null)           "lzma")
-    (mkWith   (openexr != null)      "openexr")
-    (mkWith   (pango != null)        "pango")
-    (mkWith   (libpng != null)       "png")
-    (mkWith   (librsvg != null)      "rsvg")
-    (mkWith   (libtiff != null)      "tiff")
-    (mkWith   (libwebp != null)      "webp")
-    (mkWith   (libxml2 != null)      "xml")
-  ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/"
-    ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/";
+  configureFlags =
+    [ "--with-frozenpaths" ]
+    ++ [ "--with-gcc-arch=${arch}" ]
+    ++ lib.optional (librsvg != null) "--with-rsvg"
+    ++ lib.optionals (ghostscript != null)
+      [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
+        "--with-gslib"
+      ];
 
-  buildInputs = [
-    pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw
-    libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg
-    lcms2 openjpeg liblqr1 xz openexr pango libpng librsvg libtiff libwebp
-    libxml2
-  ];
+  buildInputs =
+    [ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg
+      openexr libpng librsvg libtiff libxml2
+    ];
 
-  propagatedBuildInputs = []
-    ++ (stdenv.lib.optional (lcms2 != null) lcms2)
-    ++ (stdenv.lib.optional (liblqr1 != null) liblqr1)
-    ++ (stdenv.lib.optional (fftw != null) fftw)
-    ++ (stdenv.lib.optional (libtool != null) libtool)
-    ++ (stdenv.lib.optional (jemalloc != null) jemalloc)
-    ++ (stdenv.lib.optional (libXext != null) libXext)
-    ++ (stdenv.lib.optional (libX11 != null) libX11)
-    ++ (stdenv.lib.optional (libXt != null) libXt)
-    ++ (stdenv.lib.optional (bzip2 != null) bzip2)
-    ;
+  propagatedBuildInputs =
+    [ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ];
 
   postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)'';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8347021bbc..561f68440e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11719,8 +11719,7 @@ let
   };
 
   imagemagick = callPackage ../applications/graphics/ImageMagick {
-    ghostscript = if stdenv.isDarwin then null else ghostscript;
-    perl = null; # Currently Broken
+    ghostscript = null;
   };
 
   imagemagickBig = imagemagick;

From 7e8165b27714f66f553b54481c69760f592329c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 23:39:24 +0200
Subject: [PATCH 0326/2016] imagemagick: Move docs to separate output

This reduces the size of out from 21 MB to 8.7 MB.
---
 pkgs/applications/graphics/ImageMagick/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index e18686d989a..683e2721d87 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "03lvj6rxv16xk0dpsbzvm2gq5bggkwff9wqbpkq0znihzijpax1j";
   };
 
+  outputs = [ "out" "doc" ];
+
   enableParallelBuilding = true;
 
   configureFlags =

From af6ebe817b5522e863b3384fbf34faa1e987525f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 23:27:15 +0200
Subject: [PATCH 0327/2016] Remove unused gettext versions

---
 pkgs/development/libraries/gettext/0.17.nix | 53 ---------------------
 pkgs/development/libraries/gettext/0.18.nix | 11 -----
 pkgs/top-level/all-packages.nix             | 12 ++---
 3 files changed, 3 insertions(+), 73 deletions(-)
 delete mode 100644 pkgs/development/libraries/gettext/0.17.nix
 delete mode 100644 pkgs/development/libraries/gettext/0.18.nix

diff --git a/pkgs/development/libraries/gettext/0.17.nix b/pkgs/development/libraries/gettext/0.17.nix
deleted file mode 100644
index 3ea70bea80b..00000000000
--- a/pkgs/development/libraries/gettext/0.17.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, libiconv }:
-
-stdenv.mkDerivation rec {
-  name = "gettext-0.17";
-
-  src = fetchurl {
-    url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "1fipjpaxxwifdw6cbr7mkxp1yvy643i38nhlh7124bqnisxki5i0";
-  };
-
-  configureFlags = "--disable-csharp";
-
-  # On cross building, gettext supposes that the wchar.h from libc
-  # does not fulfill gettext needs, so it tries to work with its
-  # own wchar.h file, which does not cope well with the system's
-  # wchar.h and stddef.h (gcc-4.3 - glibc-2.9)
-  preConfigure = ''
-    if test -n "$crossConfig"; then
-      echo gl_cv_func_wcwidth_works=yes > cachefile
-      configureFlags="$configureFlags --cache-file=`pwd`/cachefile"
-    fi
-  '';
-
-  buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
-
-  meta = {
-    description = "GNU gettext, a well integrated set of translation tools and documentation";
-
-    longDescription = ''
-      Usually, programs are written and documented in English, and use
-      English at execution time for interacting with users.  Using a common
-      language is quite handy for communication between developers,
-      maintainers and users from all countries.  On the other hand, most
-      people are less comfortable with English than with their own native
-      language, and would rather be using their mother tongue for day to
-      day's work, as far as possible.  Many would simply love seeing their
-      computer screen showing a lot less of English, and far more of their
-      own language.
-
-      GNU `gettext' is an important step for the GNU Translation Project, as
-      it is an asset on which we may build many other steps. This package
-      offers to programmers, translators, and even users, a well integrated
-      set of tools and documentation. Specifically, the GNU `gettext'
-      utilities are a set of tools that provides a framework to help other
-      GNU packages produce multi-lingual messages.
-    '';
-
-    homepage = http://www.gnu.org/software/gettext/;
-
-    maintainers = [ ];
-    branch = "0.17";
-  };
-}
\ No newline at end of file
diff --git a/pkgs/development/libraries/gettext/0.18.nix b/pkgs/development/libraries/gettext/0.18.nix
deleted file mode 100644
index bb1a0519e7b..00000000000
--- a/pkgs/development/libraries/gettext/0.18.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, fetchurl, gettext }:
-
-stdenv.lib.overrideDerivation gettext (attrs: rec {
-  name = "gettext-0.18.2";
-
-  src = fetchurl {
-    url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c";
-  };
-
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8f37de6240..97dfe27bb7d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6253,15 +6253,9 @@ let
 
   getdata = callPackage ../development/libraries/getdata { };
 
-  gettext = gettext_0_19;
+  gettext = callPackage ../development/libraries/gettext { };
 
-  gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { };
-  gettext_0_18 = callPackage ../development/libraries/gettext/0.18.nix { };
-  gettext_0_19 = callPackage ../development/libraries/gettext { };
-
-  gettextWithExpat = gettext: callPackage ../development/libraries/gettext/expat.nix {
-    inherit gettext;
-  };
+  gettextWithExpat = callPackage ../development/libraries/gettext/expat.nix { };
 
   gd = callPackage ../development/libraries/gd { };
 
@@ -6482,7 +6476,7 @@ let
   };
 
   gtk3 = callPackage ../development/libraries/gtk+/3.x.nix {
-    gettext = gettextWithExpat gettext_0_19;
+    gettext = gettextWithExpat;
   };
 
   gtk = pkgs.gtk2;

From f41201ef97f7fa78d7e9783d121583c53fd104f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jul 2015 00:20:36 +0200
Subject: [PATCH 0328/2016] heimdal: Fix description

---
 pkgs/development/libraries/kerberos/heimdal.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 159b53b7650..98907da3e42 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden";
+    description = "An implementation of Kerberos 5 (and some more stuff)";
     license = licenses.bsd3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];

From e1f78bf677e10c6870b416148eef1b2755498097 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jul 2015 00:25:53 +0200
Subject: [PATCH 0329/2016] More docs/manpages in separate outputs

---
 pkgs/applications/audio/flac/default.nix        |  2 ++
 .../interpreters/perl/5.20/default.nix          |  2 ++
 .../interpreters/perl/5.22/default.nix          |  2 ++
 pkgs/development/libraries/SDL/default.nix      |  2 ++
 pkgs/development/libraries/gettext/default.nix  |  2 ++
 pkgs/development/libraries/gnutls/generic.nix   |  2 ++
 pkgs/development/libraries/libogg/default.nix   |  2 ++
 pkgs/development/libraries/libtiff/default.nix  |  2 ++
 .../development/libraries/libvorbis/default.nix |  2 ++
 pkgs/development/libraries/libxslt/default.nix  |  2 ++
 pkgs/development/libraries/openldap/default.nix |  2 ++
 pkgs/development/libraries/openssl/default.nix  |  2 ++
 pkgs/development/libraries/pcre/default.nix     |  2 ++
 pkgs/servers/x11/xorg/overrides.nix             | 17 ++++++++++++++++-
 pkgs/shells/bash/default.nix                    |  2 ++
 15 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 5dd70673521..18fb48a17ba 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ libogg ];
 
   #doCheck = true; # takes lots of time
diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index e8eb3a70e37..141484814ea 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
     sha256 = "17cvplgpxbm1hshxlkra2fldn4da1iap1lsnb04hdm8ply93k95i";
   };
 
+  outputs = [ "out" "man" ];
+
   patches =
     [ # Do not look in /usr etc. for dependencies.
       ./no-sys-dirs.patch
diff --git a/pkgs/development/interpreters/perl/5.22/default.nix b/pkgs/development/interpreters/perl/5.22/default.nix
index f9068de1c2c..e0be8610fb7 100644
--- a/pkgs/development/interpreters/perl/5.22/default.nix
+++ b/pkgs/development/interpreters/perl/5.22/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
     sha256 = "0g5bl8sdpzx9gx2g5jq3py4bj07z2ylk7s1qn0fvsss2yl3hhs8c";
   };
 
+  outputs = [ "out" "man" ];
+
   patches =
     [ # Do not look in /usr etc. for dependencies.
       ./no-sys-dirs.patch
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index a62fc837dd0..1fae5d42ab7 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
     sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
   };
 
+  outputs = [ "out" "man" ];
+
   nativeBuildInputs = [ pkgconfig ];
 
   # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 4b6fd2008e8..a56795a4c15 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation (rec {
     sha256 = "0cbp498ckjwj7qr8b9pmkry8hkhldgkvg5yix8hi9c8z1hxxb651";
   };
 
+  outputs = [ "out" "doc" ];
+
   LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";
 
   configureFlags = [ "--disable-csharp" "--with-xz" ]
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 07760933935..afe77bf6e39 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
   inherit src patches;
 
+  outputs = [ "out" "man" ];
+
   configureFlags =
     # FIXME: perhaps use $SSL_CERT_FILE instead
     optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index 57b8b2fc66e..4e017840472 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z";
   };
 
+  outputs = [ "out" "doc" ];
+
   meta = with stdenv.lib; {
     homepage = http://xiph.org/ogg/;
     license = licenses.bsd3;
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 739148cb9a6..25f6cf5b6b7 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa";
   };
 
+  outputs = [ "out" "doc" "man" ];
+
   nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index cff6cbe8616..d58607ea298 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal";
   };
 
+  outputs = [ "out" "doc" ];
+
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ libogg ];
 
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index fda24776480..3579e99ec7a 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ libxml2 ];
 
   propagatedBuildInputs = [ findXMLCatalogs ];
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index e5b7ce10719..6bc9b977363 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0vkzfd1pmin6xsv8lb1nabfxma8n1q00khr6nfifqkxlm2s6p197";
   };
 
+  outputs = [ "out" "man" ];
+
   nativeBuildInputs = [ autoconf ];
   buildInputs = [ openssl cyrus_sasl db groff ];
 
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index b9224dad110..ca3e7999f9b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     sha1 = "9d1977cc89242cd11471269ece2ed4650947c046";
   };
 
+  outputs = [ "out" "man" ];
+
   patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch
     ++ optional (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")) ./darwin-arch.patch;
 
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 71f0df40ec2..a34f3e5e132 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "17bqykp604p7376wj3q2nmjdhrb6v1ny8q08zdwi7qvc02l9wrsi";
   };
 
+  outputs = [ "out" "doc" "man" ];
+
   configureFlags = ''
     --enable-jit
     ${if unicodeSupport then "--enable-unicode-properties" else ""}
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 336ae652628..afd864eafac 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -73,6 +73,7 @@ in
   libxcb = attrs : attrs // {
     nativeBuildInputs = [ args.python ];
     configureFlags = "--enable-xkb";
+    outputs = [ "out" "doc" "man" ];
   };
 
   xcbproto = attrs : attrs // {
@@ -97,6 +98,7 @@ in
         rm -rf $out/share/doc
       '';
     CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
+    outputs = [ "out" "man" ];
   };
 
   libXfont = attrs: attrs // {
@@ -107,7 +109,6 @@ in
     ];
   };
 
-
   libXxf86vm = attrs: attrs // {
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
@@ -126,6 +127,7 @@ in
     '';
     propagatedBuildInputs = [ xorg.libSM ];
     CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
+    outputs = [ "out" "doc" "man" ];
   };
 
   # See https://bugs.freedesktop.org/show_bug.cgi?id=47792
@@ -420,4 +422,17 @@ in
   xwd = attrs: attrs // {
     buildInputs = with xorg; attrs.buildInputs ++ [libXt libxkbfile];
   };
+
+  kbproto = attrs: attrs // {
+    outputs = [ "out" "doc" ];
+  };
+
+  xextproto = attrs: attrs // {
+    outputs = [ "out" "doc" ];
+  };
+
+  xproto = attrs: attrs // {
+    outputs = [ "out" "doc" ];
+  };
+
 }
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 014a3ad4a2c..ea65e1f63c8 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
+  outputs = [ "out" "doc" ];
+
   NIX_CFLAGS_COMPILE = ''
     -DSYS_BASHRC="/etc/bashrc"
     -DSYS_BASH_LOGOUT="/etc/bash_logout"

From f07b2121f9dc23f6a69bbc815e7991c7f52fe551 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jul 2015 01:07:13 +0200
Subject: [PATCH 0330/2016] Fix grub-reboot

---
 .../modules/system/boot/loader/grub/install-grub.pl | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 34bff727b73..af39e50ff72 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -237,6 +237,7 @@ else {
         $conf .= "
             " . $grubStore->search;
     }
+    # FIXME: should use grub-mkconfig.
     $conf .= "
         " . $grubBoot->search . "
         if [ -s \$prefix/grubenv ]; then
@@ -245,14 +246,12 @@ else {
 
         # ‘grub-reboot’ sets a one-time saved entry, which we process here and
         # then delete.
-        if [ \"\${saved_entry}\" ]; then
-          # The next line *has* to look exactly like this, otherwise KDM's
-          # reboot feature won't work properly with GRUB 2.
+        if [ \"\${next_entry}\" ]; then
+          # FIXME: KDM expects the next line to be present.
           set default=\"\${saved_entry}\"
-          set saved_entry=
-          set prev_saved_entry=
-          save_env saved_entry
-          save_env prev_saved_entry
+          set default=\"\${next_entry}\"
+          set next_entry=
+          save_env next_entry
           set timeout=1
         else
           set default=$defaultEntry

From abc7c1b013ac2dc9a86e3161c6913062550cca13 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 26 Jul 2015 16:32:59 -0700
Subject: [PATCH 0331/2016] nixos/firewall: Add the ability to specify
 additional packages for extraCommands

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

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 21f8ae243a7..a61f0250ef8 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -420,6 +420,16 @@ in
         '';
     };
 
+    networking.firewall.extraPackages = mkOption {
+      default = [ ];
+      example = [ pkgs.ipset ];
+      description =
+        ''
+          Additional packages to be included in the environment of the system
+          as well as the path of networking.firewall.extraCommands.
+        '';
+    };
+
     networking.firewall.extraStopCommands = mkOption {
       type = types.lines;
       default = "";
@@ -443,7 +453,7 @@ in
 
     networking.firewall.trustedInterfaces = [ "lo" ];
 
-    environment.systemPackages = [ pkgs.iptables ];
+    environment.systemPackages = [ pkgs.iptables ] ++ cfg.extraPackages;
 
     boot.kernelModules = map (x: "nf_conntrack_${x}") cfg.connectionTrackingModules;
     boot.extraModprobeConfig = optionalString (!cfg.autoLoadConntrackHelpers) ''
@@ -462,7 +472,7 @@ in
       before = [ "network-pre.target" ];
       after = [ "systemd-modules-load.service" ];
 
-      path = [ pkgs.iptables ];
+      path = [ pkgs.iptables ] ++ cfg.extraPackages;
 
       # FIXME: this module may also try to load kernel modules, but
       # containers don't have CAP_SYS_MODULE. So the host system had

From 10f419dae4d01eda1e80ed2197d08721ef7f80cb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 26 Jul 2015 23:22:12 +0200
Subject: [PATCH 0332/2016] redshift: fix dependencies, make configurable

---
 pkgs/applications/misc/redshift/default.nix | 39 +++++++++++++++------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 244464130be..dc799bd6ff5 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -1,7 +1,16 @@
-{ fetchurl, stdenv, gettext, geoclue, intltool, makeWrapper
-, pkgconfig , python, pygobject3, pyxdg }:
+{ fetchurl, stdenv, gettext, intltool, pkgconfig, makeWrapper
+, geoclue, python, pygobject3, pyxdg
+, libdrm, libX11, libxcb, libXxf86vm
+, guiSupport ? true
+, drmSupport ? true
+, randrSupport ? true
+, vidModeSupport ? true
+}:
 
-let version = "1.10"; in
+let
+  version = "1.10";
+  mkFlag = flag: name: if flag then "--enable-${name}" else "--disable-${name}";
+in
 stdenv.mkDerivation {
   name = "redshift-${version}";
   src = fetchurl {
@@ -9,19 +18,29 @@ stdenv.mkDerivation {
     url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz";
   };
 
-  buildInputs = [
-    gettext intltool makeWrapper pkgconfig python pygobject3 pyxdg
+  buildInputs = [ geoclue ]
+    ++ stdenv.lib.optional guiSupport [ python pygobject3 pyxdg ]
+    ++ stdenv.lib.optional drmSupport [ libdrm ]
+    ++ stdenv.lib.optional randrSupport [ libxcb ]
+    ++ stdenv.lib.optional vidModeSupport [ libX11 libXxf86vm ];
+  nativeBuildInputs = [ gettext intltool makeWrapper pkgconfig ];
+
+  configureFlags = [
+    (mkFlag guiSupport "gui")
+    (mkFlag drmSupport "drm")
+    (mkFlag randrSupport "randr")
+    (mkFlag vidModeSupport "vidmode")
   ];
 
-  preInstall = ''
+  preInstall = stdenv.lib.optionalString guiSupport ''
     substituteInPlace src/redshift-gtk/redshift-gtk python \
       --replace "/usr/bin/env python3" "${python}/bin/${python.executable}"
   '';
-/*
-  postInstall = ''
-    wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : $PYTHONPATH
+
+  postInstall = stdenv.lib.optionalString guiSupport ''
+    wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : "$PYTHONPATH"
   '';
-*/
+
   meta = with stdenv.lib; {
     inherit version;
     description = "Gradually change screen color temperature";

From 77d33f77d7cffa9e53c780398ae0fadc8dd0eda5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 26 Jul 2015 23:32:43 +0200
Subject: [PATCH 0333/2016] nixos: redshift service: add extraOptions

---
 nixos/modules/services/x11/redshift.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 99d19f6ab15..f164b47fc86 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -47,6 +47,13 @@ in {
         type = types.str;
       };
     };
+
+    services.redshift.extraOptions = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "-v" "-m randr" ];
+      description = "Additional command-line arguments to pass to the redshift(1) command";
+    };
   };
 
   config = mkIf cfg.enable {
@@ -59,7 +66,8 @@ in {
         ${pkgs.redshift}/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}
+          -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \
+          ${cfg.extraOptions}
       '';
       environment = { DISPLAY = ":0"; };
       serviceConfig.Restart = "always";

From 08f866d88701e4ca7769ab59d5402416ef59ee70 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 27 Jul 2015 01:16:57 +0200
Subject: [PATCH 0334/2016] xdelta: 3.0.9 -> 3.0.10

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

diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index 68c4ea809be..bf02d8c3a0a 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
-let version = "3.0.9"; in
+let version = "3.0.10"; in
 stdenv.mkDerivation rec {
   name = "xdelta-${version}";
   
   src = fetchFromGitHub {
-    sha256 = "1pd7dyq44dbggmwkrr8251anqsf2an67zbvrk4vfnc92jkmjp17i";
+    sha256 = "0wwxdr01var3f90iwi1lgjpsa4y549g850hyyix5cm0qk67ck4rg";
     rev = "v${version}";
     repo = "xdelta-devel";
     owner = "jmacd";

From e8596c189f3a0e47feae828b665b1a0f9549cac1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 27 Jul 2015 01:37:17 +0200
Subject: [PATCH 0335/2016] colordiff: 1.0.13 -> 1.0.15

Changes:
- Big improvements to side-by-side diff detection
- Additional colordiffrc example colour scheme file to match 'git diff'
- Misc fixes
---
 pkgs/tools/text/colordiff/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix
index 34221d80366..18eae754f4f 100644
--- a/pkgs/tools/text/colordiff/default.nix
+++ b/pkgs/tools/text/colordiff/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl /*, xmlto */}:
 
 stdenv.mkDerivation {
-  name = "colordiff-1.0.13";
+  name = "colordiff-1.0.15";
 
   src = fetchurl {
-    url = http://www.colordiff.org/colordiff-1.0.13.tar.gz;
-    sha256 = "0akcz1p3klsjnhwcqdfq4grs6paljc5c0jzr3mqla5f862hhaa6f";
+    url = http://www.colordiff.org/colordiff-1.0.15.tar.gz;
+    sha256 = "0icx4v2h1gy08vhh3qqi2qfyfjp37vgj27hq1fnjz83bg7ly8pjr";
   };
 
   buildInputs = [ perl /* xmlto */ ];
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
     homepage = http://www.colordiff.org/;
     license = licenses.gpl3;
     platforms = platforms.linux;
+    maintainer = with maintainers; [ nckx ];
   };
 }

From 4d20fb5f4428ab9998cea626eb33658a115b5486 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 27 Jul 2015 01:52:24 +0200
Subject: [PATCH 0336/2016] putty: 0.64 -> 0.65

---
 pkgs/applications/networking/remote/putty/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix
index fe89ce61604..dda847fde07 100644
--- a/pkgs/applications/networking/remote/putty/default.nix
+++ b/pkgs/applications/networking/remote/putty/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut, libtool }:
 
 stdenv.mkDerivation rec {
-  version = "0.64";
+  version = "0.65";
   name = "putty-${version}";
 
   src = fetchurl {
     url = "http://the.earth.li/~sgtatham/putty/latest/${name}.tar.gz";
-    sha256 = "089qbzd7w51sc9grm2x3lcbj61jdqsnakb4j4gnf6i2131xcjiia";
+    sha256 = "180ccrsyh775hdmxqdnbclfbvsfdp2zk3gsadpa53sj497yw2hym";
   };
 
   preConfigure = ''
     perl mkfiles.pl
     ( cd doc ; make );
-    sed '/AM_PATH_GTK(/d' -i unix/configure.ac
-    sed '/AC_OUTPUT/iAM_PROG_CC_C_O' -i unix/configure.ac
-    sed '/AC_OUTPUT/iAM_PROG_AR' -i unix/configure.ac
+    sed -e '/AM_PATH_GTK(/d' \
+        -e '/AC_OUTPUT/iAM_PROG_CC_C_O' \
+        -e '/AC_OUTPUT/iAM_PROG_AR' -i configure.ac
     ./mkauto.sh
     cd unix
   '';

From 4d3434da9496dfd04f6df6c706e5d9c62554e1c0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 27 Jul 2015 02:03:54 +0200
Subject: [PATCH 0337/2016] all-packages: remove orphaned ImageMagick arguments

Quick fix: evaluation was broken by fallout from 7f0a596.
---
 pkgs/top-level/all-packages.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 561f68440e4..e7f93aedfc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11687,34 +11687,20 @@ let
   };
 
   imagemagick_light = imagemagick.override {
-    libcl = null;
-    perl = null;
-    jemalloc = null;
     bzip2 = null;
     zlib = null;
     libX11 = null;
     libXext = null;
     libXt = null;
-    dejavu_fonts = null;
-    fftw = null;
-    libfpx = null;
-    djvulibre = null;
     fontconfig = null;
     freetype = null;
     ghostscript = null;
-    graphviz = null;
-    jbigkit = null;
     libjpeg = null;
     lcms2 = null;
-    openjpeg = null;
-    liblqr1 = null;
-    xz = null;
     openexr = null;
-    pango = null;
     libpng = null;
     librsvg = null;
     libtiff = null;
-    libwebp = null;
     libxml2 = null;
   };
 

From f7b283896b2ecd5761a05b0fb9fccb4e2538853b Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Tue, 21 Jul 2015 09:22:32 +0200
Subject: [PATCH 0338/2016] python-packages: falcon 0.2.0 -> 0.3.0

---
 lib/maintainers.nix                |  1 +
 pkgs/top-level/python-packages.nix | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0c76df9c044..e1d85034f12 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -70,6 +70,7 @@
   davidrusu = "David Rusu <davidrusu.me@gmail.com>";
   dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>";
   DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";
+  desiderius = "Didier J. Devroye <didier@devroye.name>";
   devhell = "devhell <\"^\"@regexmail.net>";
   dezgeg = "Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>";
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 08c0cfee510..92c4f36a128 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5721,21 +5721,32 @@ let
   });
 
   falcon = buildPythonPackage (rec {
-    name = "falcon-0.2";
+    name = "falcon-0.3.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/f/falcon/${name}.tar.gz";
-      md5 = "bf9e8bdd20700f1ff7ce6397cd441fbd";
+      sha256 = "10ivzk88m8nn3bqbg6xgv6yfy2dgp6yzbcvr645y93pzlash4xpj";
     };
 
     propagatedBuildInputs = with self; [ coverage ddt nose pyyaml requests2 six testtools python_mimeparse ];
 
+    # The travis build fails since the migration from multiprocessing to threading for hosting the API under test.
+    # OSError: [Errno 98] Address already in use
+    doCheck = false;
+
+    # This patch is required if the tests are enabled
+    # See https://github.com/falconry/falcon/issues/572
+    #patches = singleton (pkgs.fetchurl {
+    #  name = "falcon-572.patch";
+    #  url = "https://github.com/desiderius/falcon/commit/088bd3f2204eb6368acb3a1bf6c6b54c415225c2.patch";
+    #  sha256 = "19102dlzc4890skmam2v20va2vk5xr56fi4nzibzfvl7vyq68060";
+    #});
+
     meta = {
       description = "An unladen web framework for building APIs and app backends";
-
       homepage = http://falconframework.org;
-
       license = licenses.asl20;
+      maintainers = with maintainers; [ desiderius ];
     };
   });
 

From 322358db03dea08bcd8ba5efb641d8e55eb6fddf Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Mon, 27 Jul 2015 11:49:52 +0200
Subject: [PATCH 0339/2016] flow: 0.1.0 -> 0.13.1

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 0777b5a5f9a..893ac521307 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, ocaml, libelf }:
 
 stdenv.mkDerivation rec {
-  version = "0.1.0";
+  version = "0.13.1";
   name = "flow-${version}";
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "1f33zmajd6agb36gp8bwj0yqihjhxnkpig9x3a4ggn369x6ixhn3";
+    sha256 = "1p7rzhvmz9y7ii2z05mfdb49i45f82kx8c9ywciwqma06zycvd80";
   };
 
   installPhase = ''

From 709470f2c0bd83395f14fc7445a8a9793c0ceaa5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jul 2015 12:47:21 +0200
Subject: [PATCH 0340/2016] Fix tests

---
 nixos/modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 1dec7bd0f43..fa9cc6fa20b 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -217,7 +217,7 @@ in
     system.boot.loader.kernelFile = "bzImage";
     environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
 
-    boot.consoleLogLevel = 7;
+    boot.consoleLogLevel = mkDefault 7;
 
     # In stage 1 of the boot, mount the CD as the root FS by label so
     # that we don't need to know its device.  We pass the label of the

From 8129a404f4935626c40360158b9014346d8c3450 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 27 Jul 2015 16:47:15 +0200
Subject: [PATCH 0341/2016] gnome3: override libsoup with gnomeSupport = true

Fix Gnome 3 packages broken by fc1077c.
---
 pkgs/desktops/gnome-3/3.16/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index da5ae3f02a1..67236ae202b 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -34,8 +34,9 @@ let
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno ];
 
-  inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
+  inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
   inherit (pkgs.gnome2) ORBit2;
+  libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   orbit = ORBit2;
   gnome3 = self // { recurseForDerivations = false; };
   clutter = pkgs.clutter_1_22;

From 923dda992bcf629e8301beec7f04dfbbd40bb0e9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 26 Jul 2015 23:34:06 +0200
Subject: [PATCH 0342/2016] ecj: require jdk7 instead of jdk

The ecj build fails in Java 8 due to backwards incompatible changes in
the `javax.lang.model` namespace so with this change we specifically ask
for a JDK for Java 7.
---
 pkgs/development/eclipse/ecj/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix
index 19ec3a3a2fb..b6bee8aead0 100644
--- a/pkgs/development/eclipse/ecj/default.nix
+++ b/pkgs/development/eclipse/ecj/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, ant, jdk, makeWrapper }:
+{ stdenv, fetchurl, unzip, ant, jdk7, makeWrapper }:
 
 let
   version = "3.7.2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm";
   };
 
-  buildInputs = [ unzip ant jdk makeWrapper ];
+  buildInputs = [ unzip ant jdk7 makeWrapper ];
 
   unpackPhase = ''
     mkdir "${name}"
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     cp -v *.jar $out/share/java
 
     mkdir -pv $out/bin
-    makeWrapper ${jdk.jre}/bin/java $out/bin/ecj \
+    makeWrapper ${jdk7.jre}/bin/java $out/bin/ecj \
       --add-flags "-cp $out/share/java/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main"
 
     # Add a setup hook that causes Ant to use the ECJ.

From 4984bfe807e1ccce807cf1fce24ba232260d27df Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Mon, 27 Jul 2015 16:46:25 +0100
Subject: [PATCH 0343/2016] redshift: fix evaluation

Broken by 77d33f77d7cffa9e53c780398ae0fadc8dd0eda5 , cc @nckx
---
 nixos/modules/services/x11/redshift.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index f164b47fc86..4f39e05f0f8 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -67,7 +67,7 @@ in {
           -l ${cfg.latitude}:${cfg.longitude} \
           -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
           -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \
-          ${cfg.extraOptions}
+          ${lib.strings.concatStringsSep " " cfg.extraOptions}
       '';
       environment = { DISPLAY = ":0"; };
       serviceConfig.Restart = "always";

From 494be35e403f1eeb5ebd67f0a7ba0318cc179da8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 09:11:23 -0700
Subject: [PATCH 0344/2016] ghostscript: Fix after merge from master

---
 pkgs/misc/ghostscript/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 81c70504d80..fe86577bb7b 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -85,8 +85,6 @@ stdenv.mkDerivation rec {
     mv "$out/share/ghostscript/${version}"/{doc,examples} "$doc/share/ghostscript/${version}/"
 
     ln -s "${fonts}" "$out/share/ghostscript/fonts"
-
-    rm -r $out/lib/cups/filter/{gstopxl,gstoraster}
   '';
 
   meta = {

From 38c071cdcc8cd1333a7529bbb88e67c64a703e60 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 09:22:59 -0700
Subject: [PATCH 0345/2016] harfbuzz: 0.9.41 -> 1.0.1

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

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index bac9edd5c2e..e1564661b42 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,11 +8,11 @@
 # (icu is a ~30 MB dependency, the rest is very small in comparison)
 
 stdenv.mkDerivation rec {
-  name = "harfbuzz-0.9.41";
+  name = "harfbuzz-1.0.1";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "0z05vj3va43adzxn026fpdvdd533q5zrs5dcxaz3gd021hysa6nq";
+    sha256 = "1a0fxw4sb6p82lz407d2wy31wln08v839ln1lpxjqbsab2nsg89j";
   };
 
   outputs = [ "out" "doc" ];

From fa0b84c446a75b3cc9e95323bd9fc7b0cd324794 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 09:24:33 -0700
Subject: [PATCH 0346/2016] iproute: Fix reference to /etc instead of /etc at
 runtime

---
 pkgs/os-specific/linux/iproute/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 15e25861f27..be928fa16e1 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -19,11 +19,18 @@ stdenv.mkDerivation rec {
     "DESTDIR="
     "LIBDIR=$(out)/lib"
     "SBINDIR=$(out)/sbin"
-    "CONFDIR=$(out)/etc"
     "DOCDIR=$(out)/share/doc/${name}"
     "MANDIR=$(out)/share/man"
   ];
 
+  buildFlags = [
+    "CONFDIR=/etc"
+  ];
+
+  installFlags = [
+    "CONFDIR=$(out)/etc"
+  ];
+
   buildInputs = [ db iptables ];
   nativeBuildInputs = [ bison flex pkgconfig ];
 

From 5792b1345a64aea6c359ab06fee996fbdcc194fa Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 09:24:49 -0700
Subject: [PATCH 0347/2016] iproute: Actually don't install docs

---
 pkgs/os-specific/linux/iproute/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index be928fa16e1..09e5f1bc5ce 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
     "DESTDIR="
     "LIBDIR=$(out)/lib"
     "SBINDIR=$(out)/sbin"
-    "DOCDIR=$(out)/share/doc/${name}"
     "MANDIR=$(out)/share/man"
+    "DOCDIR=$(TMPDIR)/share/doc/${name}" # Don't install docs
   ];
 
   buildFlags = [
@@ -36,9 +36,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # Get rid of useless TeX/SGML docs.
-  postInstall = "rm -rf $out/share/doc";
-
   meta = with stdenv.lib; {
     homepage = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2;
     description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux";

From 6f1b2e7de2e631cddeb446736dd72771246629ef Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 27 Jul 2015 13:28:34 -0300
Subject: [PATCH 0348/2016] Lightning: 2.0.5 -> 2.1.0

---
 pkgs/development/libraries/lightning/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 036d9c61d07..3805e8c1ce8 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -1,14 +1,17 @@
-{ fetchurl, stdenv, binutils }:
+{ stdenv, fetchurl, binutils }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lightning-2.0.5";
+
+  name = "lightning-${version}";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "mirror://gnu/lightning/${name}.tar.gz";
-    sha256 = "0jm9a8ddxc1v9hyzyv4ybg37fjac2yjqv1hkd262wxzqms36mdk5";
+    sha256 = "19j9nwl88k660045s40cbz5zrl1wpd2mcxnnc8qqnnaj311a58qz";
   };
 
-  # Needs libopcodes.so  from binutils for 'make check'
+  # Needs libopcodes.so from binutils for 'make check'
   buildInputs = [ binutils ];
 
   doCheck = true;
@@ -16,7 +19,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.gnu.org/software/lightning/;
     description = "Run-time code generation library";
-
     longDescription = ''
       GNU lightning is a library that generates assembly language code
       at run-time; it is very fast, making it ideal for Just-In-Time
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
       to the clients a standardized RISC instruction set inspired by
       the MIPS and SPARC chips.
     '';
-
-    license = stdenv.lib.licenses.lgpl3Plus;
+    maintainers = [ maintainers.AndersonTorres ];
+    license = licenses.lgpl3Plus;
   };
 }

From 2cbfdb8ff41119050c7c1ceef106f381454c03c2 Mon Sep 17 00:00:00 2001
From: Greg Pfeil <greg@technomadic.org>
Date: Fri, 24 Jul 2015 22:44:17 -0600
Subject: [PATCH 0349/2016] gnugpg: Add libiconv dependency.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tested using the pure-darwin alternate stdenv on Yosemite.

I need this change for gnupg to build. Otherwise, I get this error:

```
configure:
***
*** The system does not provide a working iconv function.  Please
*** install a suitable library; for example GNU Libiconv which is
*** available at:
***   http://ftp.gnu.org/gnu/libiconv/
***
configure: error:
***
*** Required libraries not found. Please consult the above messages
*** and install them before running configure again.
***
builder for ‘/nix/store/pvzqmfzc05ifmvi0vglyl2xlkcdgh6c2-gnupg-2.1.6.drv’ failed with exit code 1
```

cc: @wkennington
---
 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 8ef96d4d14e..2bbd73763dc 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth
+{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libiconv, npth
 , autoreconfHook, gettext, texinfo, pcsclite
 
 # Each of the dependencies below are optional.
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    pkgconfig libgcrypt libassuan libksba npth
+    pkgconfig libgcrypt libassuan libksba libiconv npth
     autoreconfHook gettext texinfo
     readline libusb gnutls adns openldap zlib bzip2
   ];

From a7bfe5643b0a53aab2bc578d4b527a59f01cc280 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 27 Jul 2015 20:15:34 +0200
Subject: [PATCH 0350/2016] cups: Fix test by using different groff output

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

diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index b1c2e74136c..0db9a529644 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -60,8 +60,8 @@ import ./make-test.nix ({pkgs, ... }: {
       $client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die;
 
       # Test printing various file types.
-      foreach my $file ("${pkgs.groff}/share/doc/*/examples/mom/penguin.pdf",
-                        "${pkgs.groff}/share/doc/*/meref.ps",
+      foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
+                        "${pkgs.groff.doc}/share/doc/*/meref.ps",
                         "${pkgs.cups}/share/doc/cups/images/cups.png",
                         "${pkgs.pcre}/share/doc/pcre/pcre.txt")
       {

From e3a5bca4ae3737dbe0ff2675d1fd77fdf72db609 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jul 2015 19:28:41 +0200
Subject: [PATCH 0351/2016] Require signed binary caches by default

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 5 +++++
 nixos/modules/services/misc/nix-daemon.nix     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index ecde80f2a01..6ae8cd83d3f 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -56,6 +56,11 @@ default, unless you have a non-empty
 <command>cron</command> to be enabled, set
 <option>services.cron.enable = true</option>.</para></listitem>
 
+<listitem><para>Nix now requires binary caches to be cryptographically
+signed. If you have unsigned binary caches that you want to continue
+to use, you should set <option>nix.requireSignedBinaryCaches =
+false</option>.</para></listitem>
+
 <listitem><para>Steam now doesn't need root rights to work. Instead of using
 <literal>*-steam-chrootenv</literal>, you should now just run <literal>steam</literal>.
 <literal>steamChrootEnv</literal> package was renamed to <literal>steam</literal>,
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index b5a8a7df9fc..49286f512bb 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -254,7 +254,7 @@ in
 
       requireSignedBinaryCaches = mkOption {
         type = types.bool;
-        default = false;
+        default = true;
         description = ''
           If enabled, Nix will only download binaries from binary
           caches if they are cryptographically signed with any of the

From d166c854b6ecfd9ada520439b06f7eb9e3e4be7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jul 2015 19:46:36 +0200
Subject: [PATCH 0352/2016] Add option system.stateVersion

This option requests compatibility with older NixOS releases with
respect to stateful data, in cases where new releases have defaults
that might be incompatible with system state of existing NixOS
deployments. For instance, if we change the default version of
PostgreSQL, existing deployments will break if the new version can't
read databases created by the old version.

So for example, setting

  system.stateVersion = "15.07";

requests that options like services.postgresql.package use defaults
corresponding to the 15.07 release branch. Note that
nixos-generate-config emits this option. (In the future, NixOps may
set system.stateVersion to the NixOS release in use when the machine
was created.)

See also #7939 for another motivating example.
---
 .../installer/tools/nixos-generate-config.pl  |  3 +++
 nixos/modules/installer/tools/tools.nix       |  1 +
 nixos/modules/misc/version.nix                | 26 +++++++++++++++++--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 187ea7635eb..9010478662c 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -544,6 +544,9 @@ $bootLoaderConfig
   #   uid = 1000;
   # };
 
+  # The NixOS release to be compatible with for stateful data such as databases.
+  system.stateVersion = "@nixosRelease@";
+
 }
 EOF
     } else {
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 99a74b6d59e..61744c39d60 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -40,6 +40,7 @@ let
     src = ./nixos-generate-config.pl;
     path = [ pkgs.btrfsProgs ];
     perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
+    inherit (config.system) nixosRelease;
   };
 
   nixos-option = makeProg {
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 5afdcf214f2..8a52df42dd8 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -6,12 +6,35 @@ with lib;
 
   options = {
 
+    system.stateVersion = mkOption {
+      type = types.str;
+      default = config.system.nixosRelease;
+      description = ''
+        Every once in a while, a new NixOS release may change
+        configuration defaults in a way incompatible with stateful
+        data. For instance, if the default version of PostgreSQL
+        changes, the new version will probably be unable to read your
+        existing databases. To prevent such breakage, you can set the
+        value of this option to the NixOS release with which you want
+        to be compatible. The effect is that NixOS will option
+        defaults corresponding to the specified release (such as using
+        an older version of PostgreSQL).
+      '';
+    };
+
     system.nixosVersion = mkOption {
       internal = true;
       type = types.str;
       description = "NixOS version.";
     };
 
+    system.nixosRelease = mkOption {
+      internal = true;
+      type = types.str;
+      default = readFile "${toString pkgs.path}/.version";
+      description = "NixOS release.";
+    };
+
     system.nixosVersionSuffix = mkOption {
       internal = true;
       type = types.str;
@@ -41,8 +64,7 @@ with lib;
 
   config = {
 
-    system.nixosVersion =
-      mkDefault (readFile "${toString pkgs.path}/.version" + config.system.nixosVersionSuffix);
+    system.nixosVersion = mkDefault (config.system.nixosRelease + config.system.nixosVersionSuffix);
 
     system.nixosVersionSuffix =
       let suffixFile = "${toString pkgs.path}/.version-suffix"; in

From a5b83c357319c4442c94979cb3679d41d9b352bc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jul 2015 20:13:08 +0200
Subject: [PATCH 0353/2016] sshd: Use RSA and ED25519 host keys

Closes #7939.
---
 nixos/doc/manual/release-notes/rl-unstable.xml | 13 +++++++++++++
 nixos/modules/services/networking/ssh/sshd.nix | 15 +++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 6ae8cd83d3f..abfd417c53a 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -50,6 +50,19 @@ following incompatible changes:
 
 <itemizedlist>
 
+<listitem><para><command>sshd</command> no longer supports DSA and ECDSA
+host keys by default. If you have existing systems with such host keys
+and want to continue to use them, please set
+
+<programlisting>
+system.stateVersion = "14.12";
+</programlisting>
+
+(The new option <option>system.stateVersion</option> ensures that
+certain configuration changes that could break existing systems (such
+as the <command>sshd</command> host key setting) will maintain
+compatibility with the specified NixOS release.)</para></listitem>
+
 <listitem><para><command>cron</command> is no longer enabled by
 default, unless you have a non-empty
 <option>services.cron.systemCronJobs</option>. To force
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 4be2b5fe0c0..1c428ceddfd 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -184,16 +184,11 @@ in
       hostKeys = mkOption {
         type = types.listOf types.attrs;
         default =
-          [ { path = "/etc/ssh/ssh_host_dsa_key";
-              type = "dsa";
-            }
-            { path = "/etc/ssh/ssh_host_ecdsa_key";
-              type = "ecdsa";
-              bits = 521;
-            }
-            { path = "/etc/ssh/ssh_host_ed25519_key";
-              type = "ed25519";
-            }
+          [ { type = "rsa"; bits = 4096; path = "/etc/ssh/ssh_host_rsa_key"; }
+            { type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }
+          ] ++ optionals (!versionAtLeast config.system.stateVersion "15.07")
+          [ { type = "dsa"; path = "/etc/ssh/ssh_host_dsa_key"; }
+            { type = "ecdsa"; bits = 521; path = "/etc/ssh/ssh_host_ecdsa_key"; }
           ];
         description = ''
           NixOS can automatically generate SSH host keys.  This option

From ace332eb36fd537c9a2674d591fd5e723f8fcb62 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jul 2015 20:26:19 +0200
Subject: [PATCH 0354/2016] Set a default value for services.postgresql.package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is finally possible now that we have ‘system.stateVersion’
(allowing the default package to change over time).
---
 nixos/modules/services/databases/postgresql.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 4cff2818f3b..bae088c6610 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -154,6 +154,12 @@ in
 
   config = mkIf config.services.postgresql.enable {
 
+    services.postgresql.package =
+      # Note: when changing the default, make it conditional on
+      # ‘system.stateVersion’ to maintain compatibility with existing
+      # systems!
+      mkDefault pkgs.postgresql94;
+
     services.postgresql.authentication = mkAfter
       ''
         # Generated file; do not edit!

From 8e7ecd6de6b21c273cc406a02c4c45848cb8f931 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 13:04:39 -0700
Subject: [PATCH 0355/2016] rethinkdb: 2.0.3 -> 2.0.4

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

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 2f47d542d00..cbf0d5bf183 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "rethinkdb-${version}";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchurl {
     url = "http://download.rethinkdb.com/dist/${name}.tgz";
-    sha256 = "1580h5clkw8kprdb9waaf8al3wa2vj5d2l2m394r91fq45ss23sd";
+    sha256 = "19qhia4lfa8a0rzp2v6lnlxp2lf4z4vqhgfxnicfdnx07q4r847i";
   };
 
   preConfigure = ''

From 6e2103068d6a8de3780b5e9ca275b0d6d548e979 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 13:04:20 -0700
Subject: [PATCH 0356/2016] exempi: Use default boost

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

diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index e941f0f6547..e7a3bd49513 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf";
   };
 
-  configureFlags = [ "--with-boost=${boost.dev}" ];
+  configureFlags = [
+    "--with-boost=${boost.dev}"
+  ];
 
   buildInputs = [ expat zlib boost ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7f93aedfc2..8f6b88cbef5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1415,7 +1415,7 @@ let
 
   evtest = callPackage ../applications/misc/evtest { };
 
-  exempi = callPackage ../development/libraries/exempi { boost = boost155; };
+  exempi = callPackage ../development/libraries/exempi { };
 
   execline = callPackage ../tools/misc/execline { };
 

From 5b0a676d5b29ed1586a18cb35ed508ec48600a8f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 13:06:00 -0700
Subject: [PATCH 0357/2016] rethinkdb: Remove pin on boost 1.55 and remove
 gperf dependency

---
 pkgs/servers/nosql/rethinkdb/default.nix | 14 ++++++++++----
 pkgs/top-level/all-packages.nix          |  4 +---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index cbf0d5bf183..789aa95b157 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, which, protobuf, gperftools
-, boost, zlib, curl, python, m4, icu, jemalloc }:
+{ stdenv, fetchurl, which, m4, python
+, protobuf, boost, zlib, curl, openssl, icu, jemalloc
+}:
 
 stdenv.mkDerivation rec {
   name = "rethinkdb-${version}";
@@ -15,12 +16,17 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  configureFlags = "--lib-path ${gperftools}/lib --lib-path ${jemalloc}/lib";
+  configureFlags = [
+    "--with-jemalloc"
+    "--lib-path=${jemalloc}/lib"
+  ];
 
-  buildInputs = [ protobuf boost zlib curl icu jemalloc ];
+  buildInputs = [ protobuf boost zlib curl openssl icu jemalloc ];
 
   nativeBuildInputs = [ which m4 python ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "An open-source distributed database built with love";
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f6b88cbef5..5fecb610f96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9161,9 +9161,7 @@ let
 
   restund = callPackage ../servers/restund {};
 
-  rethinkdb = callPackage ../servers/nosql/rethinkdb {
-    boost = boost155;
-  };
+  rethinkdb = callPackage ../servers/nosql/rethinkdb { };
 
   rippled = callPackage ../servers/rippled {
     boost = boost157;

From cb78f09038660ca98a3107b530cbd8c90a088735 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 13:12:06 -0700
Subject: [PATCH 0358/2016] libreoffice: Remove uneeded commented reference to
 boost155

---
 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 5fecb610f96..db608b65420 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11857,7 +11857,6 @@ let
     inherit (perlPackages) ArchiveZip CompressZlib;
     inherit (gnome) GConf ORBit2 gnome_vfs;
     zip = zip.override { enableNLS = false; };
-    #boost = boost155;
     #glm = glm_0954;
     bluez5 = bluez5_28;
     fontsConf = makeFontsConf {

From fa6c8445c768a64c908fcd4d2955843622ba2550 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 27 Jul 2015 14:25:34 -0700
Subject: [PATCH 0359/2016] make libcxxStdenv work on both darwin and linux

---
 pkgs/development/compilers/llvm/3.5/libc++/default.nix   | 2 ++
 pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh | 3 ++-
 pkgs/development/compilers/llvm/3.6/libc++/default.nix   | 2 ++
 pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh | 3 ++-
 pkgs/stdenv/pure-darwin/default.nix                      | 3 ++-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
index a23daf4f14a..75a5761a19e 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  linkCxxAbi = stdenv.isLinux;
+
   setupHook = ./setup-hook.sh;
 
   meta = {
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
index 62ab46ac310..9022fced6ec 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
@@ -1,2 +1,3 @@
+linkCxxAbi="@linkCxxAbi@"
 export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"
+export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/3.6/libc++/default.nix b/pkgs/development/compilers/llvm/3.6/libc++/default.nix
index 81c1d96afc8..c02c75ac02d 100644
--- a/pkgs/development/compilers/llvm/3.6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/libc++/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  linkCxxAbi = stdenv.isLinux;
+
   setupHook = ./setup-hook.sh;
 
   meta = {
diff --git a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
index 62ab46ac310..9022fced6ec 100644
--- a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
@@ -1,2 +1,3 @@
+linkCxxAbi="@linkCxxAbi@"
 export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"
+export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/stdenv/pure-darwin/default.nix b/pkgs/stdenv/pure-darwin/default.nix
index 92c6f321d36..b40fbd8d446 100644
--- a/pkgs/stdenv/pure-darwin/default.nix
+++ b/pkgs/stdenv/pure-darwin/default.nix
@@ -134,7 +134,8 @@ in rec {
           ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib
           ln -s ${bootstrapTools}/include/c++      $out/include/c++
         '';
-        setupHook = ../../development/compilers/llvm/3.5/libc++/setup-hook.sh;
+        linkCxxAbi = false;
+        setupHook = ../../development/compilers/llvm/3.6/libc++/setup-hook.sh;
       };
 
       libcxxabi = stdenv.mkDerivation {

From 67c186a7eafcb356b0ef72c66005643842f78cd7 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Sun, 26 Jul 2015 20:00:34 -0400
Subject: [PATCH 0360/2016] Add current alpha of protobuf 3

---
 pkgs/development/libraries/protobuf/3.0.nix | 12 ++++++++++++
 pkgs/top-level/all-packages.nix             |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/development/libraries/protobuf/3.0.nix

diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix
new file mode 100644
index 00000000000..900c9dc5a51
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.0.nix
@@ -0,0 +1,12 @@
+{ callPackage, fetchFromGitHub, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "3.0.0-alpha-3.1";
+  # make sure you test also -A pythonPackages.protobuf
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "protobuf";
+    rev = "v${version}";
+    sha256 = "0vzw20ymjmjrrmg84f822qslclsb2q0wf0qdj2da198gmkkbrw45";
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7889e5c334d..ec914ad8070 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7847,6 +7847,7 @@ let
   postgis = callPackage ../development/libraries/postgis { };
 
   protobuf = protobuf2_6;
+  protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { });
   protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { };
   protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
 

From 32105552233dc068e0af29568e6b934722e385b3 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 25 Jul 2015 00:40:35 +0200
Subject: [PATCH 0361/2016] Chirp: New package.

---
 pkgs/applications/misc/chirp/default.nix | 41 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 +++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/misc/chirp/default.nix

diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
new file mode 100644
index 00000000000..2b92dc8d19e
--- /dev/null
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, libxml2Python, libxslt, makeWrapper
+, python, pyserial, pygtk
+}:
+let
+  version = "0.4.1";
+in
+stdenv.mkDerivation rec {
+  name = "chirp-${version}";
+  inherit version;
+
+  src = fetchurl {
+    url = "http://chirp.danplanet.com/download/0.4.1/chirp-${version}.tar.gz";
+    sha256 = "17iihghqjprn2hld193qw0yl1kkrf6m0fp57l7ibkflxr0nnb7cc";
+  };
+
+  buildInputs = [
+    makeWrapper
+    pyserial pygtk libxml2Python libxslt pyserial
+  ];
+
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/chirp
+    cp -r . $out/share/chirp/
+    ln -s $out/share/chirp/chirpw $out/bin/chirpw
+
+    for file in "$out"/bin/*; do
+      wrapProgram "$file" \
+        --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out")
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A free, open-source tool for programming your amateur radio.";
+    homepage = http://chirp.danplanet.com/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.the-kenny ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c317e18251..265343cd490 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10829,6 +10829,10 @@ let
 
   chatzilla = callPackage ../applications/networking/irc/chatzilla { };
 
+  chirp = callPackage ../applications/misc/chirp {
+    inherit (pythonPackages) pyserial pygtk;
+  };
+
   chromium = callPackage ../applications/networking/browsers/chromium {
     channel = "stable";
     pulseSupport = config.pulseaudio or true;

From 92c17a71297b6d4f629e735b92f974daa23df72b Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 27 Jul 2015 13:00:39 +0200
Subject: [PATCH 0362/2016] hackrf: 2014.08.1 -> 2015.07.2.

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

diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix
index 806392f717f..b815884a29c 100644
--- a/pkgs/applications/misc/hackrf/default.nix
+++ b/pkgs/applications/misc/hackrf/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "hackrf-${version}";
-  version = "2014.08.1";
+  version = "2015.07.2";
 
   src = fetchgit {
     url = "git://github.com/mossmann/hackrf";
     rev = "refs/tags/v${version}";
-    sha256 = "1f3mmzyn6qqbl02h6dkz0zybppihqgpdxjgqmkb1pn3i0d98ydb3";
+    sha256 = "0wa4m0kdq8q2ib724w8ry8shmmm1liaaawhjygrjx6zxz9jxr3vm";
   };
 
   buildInputs = [
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = http://greatscottgadgets.com/hackrf/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.sjmackenzie ];
+    maintainers = with maintainers; [ sjmackenzie the-kenny ];
   };
 }

From 2f861a3d0782f15efb7b49a38f26c4abbd374d7f Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 27 Jul 2015 13:01:48 +0200
Subject: [PATCH 0363/2016] gqrx: Add support for hackrf.

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

diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index 440d2b790c2..7d320cc938a 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, qt4, gnuradio, boost, gnuradio-osmosdr
 # drivers (optional):
-, rtl-sdr
+, rtl-sdr, hackrf
 , pulseaudioSupport ? true, libpulseaudio
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    qt4 gnuradio boost gnuradio-osmosdr rtl-sdr
+    qt4 gnuradio boost gnuradio-osmosdr rtl-sdr hackrf
   ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ];
 
   configurePhase = ''qmake PREFIX="$out"'';

From 0391b7b0a8d5cff0311ec7dd238e5d679b5290da Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 27 Jul 2015 13:02:12 +0200
Subject: [PATCH 0364/2016] gnuradio-osmosdr & gqrx: Add myself as maintainer.

---
 pkgs/applications/misc/gnuradio-osmosdr/default.nix | 2 +-
 pkgs/applications/misc/gqrx/default.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
index 360d98537cc..5fc6eb2c274 100644
--- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix
+++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     homepage = http://sdr.osmocom.org/trac/wiki/GrOsmoSDR;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor the-kenny ];
   };
 }
diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index 7d320cc938a..d3e61da4fab 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     # it's currently unknown which version of the BSD license that is.
     license = licenses.gpl3Plus;
     platforms = platforms.linux;  # should work on Darwin / OS X too
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor the-kenny ];
   };
 }

From 51c82551eeba1aefb25a469139e1a3becc40ee67 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 27 Jul 2015 13:12:29 +0200
Subject: [PATCH 0365/2016] multimon-ng: New package.

A digital baseband audio protocol decoder.
---
 .../applications/misc/multimon-ng/default.nix | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/misc/multimon-ng/default.nix

diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix
new file mode 100644
index 00000000000..794746653f7
--- /dev/null
+++ b/pkgs/applications/misc/multimon-ng/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, qt4, libpulseaudio }:
+let
+  version = "1.0.0";
+in
+stdenv.mkDerivation {
+  name = "multimon-ng-${version}";
+
+  src = fetchFromGitHub {
+    owner = "EliasOenal";
+    repo = "multimon-ng";
+    rev = "4cc984f35f859539c94aa56d3fc6218a6de51148";
+    sha256 = "12z6f0ra2k0qh56pcvnwvlxd3msvr6yr97jvs7w5kf42jqbxdsga";
+  };
+
+  buildInputs = [ qt4 libpulseaudio ];
+
+  preBuild = "qmake multimon-ng.pro";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp multimon-ng $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Multimon is a digital baseband audio protocol decoder.";
+    longDescription = ''
+      multimon-ng a fork of multimon, a digital baseband audio
+      protocol decoder for common signaling modes in commercial and
+      amateur radio data services. It decodes the following digital
+      transmission modes:
+
+      POCSAG512 POCSAG1200 POCSAG2400 EAS UFSK1200 CLIPFSK AFSK1200
+      AFSK2400 AFSK2400_2 AFSK2400_3 HAPN4800 FSK9600 DTMF ZVEI1 ZVEI2
+      ZVEI3 DZVEI PZVEI EEA EIA CCIR MORSE CW
+    '';
+    homepage = "https://github.com/EliasOenal/multimon-ng";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ the-kenny ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 265343cd490..d9475648ff5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12093,6 +12093,8 @@ let
     inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3;
   };
 
+  multimon-ng = callPackage ../applications/misc/multimon-ng { };
+
   multisync = callPackage ../applications/misc/multisync {
     inherit (gnome) ORBit2 libbonobo libgnomeui GConf;
   };

From 0411a4c376de8b3d9ab2a03c84c8b310f59b6380 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 27 Jul 2015 16:52:50 +0200
Subject: [PATCH 0366/2016] direwolf: New package.

---
 pkgs/applications/misc/direwolf/default.nix | 36 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/misc/direwolf/default.nix

diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
new file mode 100644
index 00000000000..fc8d0ec36c8
--- /dev/null
+++ b/pkgs/applications/misc/direwolf/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, unzip, alsaLib }:
+let
+  version = "1.2";
+in
+stdenv.mkDerivation rec {
+  name = "direwolf-${version}";
+  inherit version;
+
+  src = fetchurl {
+    url = "http://home.comcast.net/~wb2osz/Version%201.2/direwolf-${version}-src.zip";
+    sha256 = "0csl6harx7gmjmamxy0ylzhbamppphffisk8j33dc6g08k6rc77f";
+  };
+
+  buildInputs = [
+    unzip alsaLib
+  ];
+
+  patchPhase = ''
+    substituteInPlace Makefile.linux \
+      --replace "/usr/local" "$out" \
+      --replace "/usr/share" "$out/share"
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway.";
+    # On the page: This page will be disappearing on October 8, 2015.
+    homepage = https://home.comcast.net/~wb2osz/site/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.the-kenny ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9475648ff5..3e15e7b65c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10948,6 +10948,8 @@ let
 
   diffuse = callPackage ../applications/version-management/diffuse { };
 
+  direwolf = callPackage ../applications/misc/direwolf { };
+
   dirt = callPackage ../applications/audio/dirt {};
 
   distrho = callPackage ../applications/audio/distrho {};

From 058f36aae7053dcbf4e2f06303b599e208863f3d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 27 Jul 2015 13:50:39 -0500
Subject: [PATCH 0367/2016] quassel: add optional KF5 features

Also fixes conditional dependencies so that TLS is enabled.
---
 .../networking/irc/quassel/default.nix        | 55 +++++++++++--------
 pkgs/top-level/all-packages.nix               | 18 ++++++
 2 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index a8bd2e801b9..c1944cf6d0d 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -1,20 +1,27 @@
 { monolithic ? true # build monolithic Quassel
 , daemon ? false # build Quassel daemon
 , client ? false # build Quassel client
-, withKDE ? stdenv.isLinux # enable KDE integration
 , previews ? false # enable webpage previews on hovering over URLs
 , tag ? "" # tag added to the package name
-, kdelibs ? null # optional
-, useQt5 ? false
-, phonon_qt5, libdbusmenu_qt5
-, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2, qca-qt5 }:
+, useQt5 ? false, phonon_qt5, libdbusmenu_qt5, qca-qt5
+, withKDE ? stdenv.isLinux # enable KDE integration
+, kf5 ? null, kdelibs ? null
 
+, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2 }:
+
+let useKF5 = useQt5 && withKDE;
+    useKDE4 = withKDE && !useQt5;
+    buildClient = monolithic || client;
+    buildCore = monolithic || daemon;
+in
 
 assert stdenv.isLinux;
 
 assert monolithic -> !client && !daemon;
 assert client || daemon -> !monolithic;
-assert withKDE -> kdelibs != null;
+assert useKDE4 -> kdelibs != null;
+assert useKF5 -> kf5 != null;
+assert !buildClient -> !withKDE; # KDE is used by the client only
 
 let
   edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
@@ -31,15 +38,21 @@ in with stdenv; mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake makeWrapper ]
-    ++ (if useQt5 then [ qt.base qca-qt5 ] else [ qt qca2 ])
-    ++ (if useQt5 && (monolithic || daemon) then [ qt.script ] else [])
-    ++ (if useQt5 && previews then [ qt.webkit qt.webkitwidgets ] else [])
-    ++ lib.optional withKDE kdelibs
-    ++ lib.optional withKDE automoc4
-    ++ lib.optional withKDE phonon
-    ++ lib.optional useQt5 phonon_qt5
-    ++ lib.optional useQt5 libdbusmenu_qt5;
+  buildInputs =
+       [ cmake makeWrapper ]
+    ++ [(if useQt5 then qt.base else qt)]
+    ++ lib.optionals buildCore (if useQt5 then [qt.script qca-qt5] else [qca2])
+    ++ lib.optionals buildClient
+       (   lib.optionals (previews && useQt5) [qt.webkit qt.webkitwidgets]
+        ++ lib.optionals useQt5 [libdbusmenu_qt5 phonon_qt5]
+        ++ lib.optionals useKDE4 [automoc4 kdelibs phonon]
+        ++ lib.optionals useKF5
+           (with kf5; [
+             extra-cmake-modules kconfigwidgets kcoreaddons
+             knotifications knotifyconfig ktextwidgets kwidgetsaddons
+             kxmlgui
+           ])
+       );
 
   cmakeFlags = [
     "-DEMBED_DATA=OFF"
@@ -52,24 +65,20 @@ in with stdenv; mkDerivation rec {
     ++ edf useQt5 "USE_QT5";
 
   preFixup =
-    lib.optionalString client ''
-        wrapProgram "$out/bin/quasselclient" \
-          --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
-    '' +
-    lib.optionalString monolithic ''
-        wrapProgram "$out/bin/quassel" \
+    lib.optionalString buildClient ''
+        wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \
           --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
     '';
 
   meta = with stdenv.lib; {
     homepage = http://quassel-irc.org/;
-    description = "Qt4/KDE4/Qt5 distributed IRC client suppporting a remote daemon";
+    description = "Qt/KDE distributed IRC client suppporting a remote daemon";
     longDescription = ''
       Quassel IRC is a cross-platform, distributed IRC client,
       meaning that one (or multiple) client(s) can attach to
       and detach from a central core -- much like the popular
       combination of screen and a text-based IRC client such
-      as WeeChat, but graphical (based on Qt4/KDE4 or Qt5).
+      as WeeChat, but graphical (based on Qt4/KDE4 or Qt5/KF5).
     '';
     license = stdenv.lib.licenses.gpl3;
     maintainers = with maintainers; [ phreedom ttuegel ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e15e7b65c3..f1cb181fca8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12453,6 +12453,24 @@ let
     tag = "-daemon-qt5";
   };
 
+  quassel_kf5 = callPackage ../applications/networking/irc/quassel {
+    monolithic = true;
+    daemon = false;
+    client = false;
+    withKDE = true;
+    useQt5 = true;
+    qt = qt5;
+    kf5 = kf510;
+    dconf = gnome3.dconf;
+    tag = "-kf5";
+  };
+
+  quasselClient_kf5 = quassel_kf5.override {
+    monolithic = false;
+    client = true;
+    tag = "-client-kf5";
+  };
+
   quirc = callPackage ../tools/graphics/quirc {};
 
   quodlibet = callPackage ../applications/audio/quodlibet {

From 103613f7664eaf5b8ed3be77ef61c294fdfad519 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Tue, 28 Jul 2015 02:02:33 +0300
Subject: [PATCH 0368/2016] ghcNokinds: 20150703 -> 20150718

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

diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix
index 1adb4207f05..98e18706a16 100644
--- a/pkgs/development/compilers/ghc/nokinds.nix
+++ b/pkgs/development/compilers/ghc/nokinds.nix
@@ -27,14 +27,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "7.11.20150703";
+  version = "7.11.20150718";
   name = "ghc-nokinds-${version}";
-  rev = "887170ac254aaacc2d5e29f2565ac61522fd8f61";
+  rev = "4cb79c85a4976c509a65a8638899391a60cd0962";
 
   src = fetchgit {
     url = "https://github.com/goldfirere/ghc.git";
     inherit rev;
-    sha256 = "010x9ckig76sz97s2ss1j1sf70czqx1cn39nj4xbh49m8n2zvsqf";
+    sha256 = "1pyz459hs189bw2jaz7k2j2r53nc1vfa4q3zd3zz1zm0h14lsmlv";
   };
 
   postUnpack = ''

From 242c0d3e185b5343f8e3f2e3ffe09a4b4e454604 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 28 Jul 2015 01:52:53 +0900
Subject: [PATCH 0369/2016] ponymix: init at 4

---
 pkgs/applications/audio/ponymix/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/audio/ponymix/default.nix

diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix
new file mode 100644
index 00000000000..0b5947e16f4
--- /dev/null
+++ b/pkgs/applications/audio/ponymix/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, libpulseaudio, libnotify, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "ponymix-${version}";
+  version = "4";
+  src = fetchurl {
+    url = "http://code.falconindy.com/archive/ponymix/${name}.tar.xz";
+    sha256 = "008pk3sqc8955k2f502z1syzv43a4q0yk5ws69lgpqfsy1mzki2d";
+  };
+
+  buildInputs = [ libpulseaudio libnotify ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  postPatch = ''substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out"'';
+
+  meta = {
+    description = "CLI PulseAudio Volume Control";
+    homepage = "http://github.com/falconindy/ponymix";
+    license = "mit";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7f93aedfc2..821d2d003be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12362,6 +12362,8 @@ let
 
   pond = callPackage ../applications/networking/pond { goPackages = go14Packages; };
 
+  ponymix = callPackage ../applications/audio/ponymix { };
+
   potrace = callPackage ../applications/graphics/potrace {};
 
   posterazor = callPackage ../applications/misc/posterazor { };

From 5960a652f1502260348ad7375ace20959b80abe4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 17:35:05 -0700
Subject: [PATCH 0370/2016] rethinkdb: Force dynamic linking and allow
 dependency substitution

---
 pkgs/servers/nosql/rethinkdb/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 789aa95b157..5d0b68bba2b 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -11,12 +11,21 @@ stdenv.mkDerivation rec {
     sha256 = "19qhia4lfa8a0rzp2v6lnlxp2lf4z4vqhgfxnicfdnx07q4r847i";
   };
 
+  postPatch = ''
+    # Remove the dependence on bundled libraries
+    sed -i '/must_fetch_list/ s/ v8//' configure
+
+    # Don't use the default command line args
+    rm configure.default
+  '';
+
   preConfigure = ''
     export ALLOW_WARNINGS=1
     patchShebangs .
   '';
 
   configureFlags = [
+    "--dynamic=all"
     "--with-jemalloc"
     "--lib-path=${jemalloc}/lib"
   ];

From 459c3ff560eba8e30ab3e18a58b636860c51d1e2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 17:45:22 -0700
Subject: [PATCH 0371/2016] libsoup: 2.48 -> 2.50

Also remove doc output as this package generate no documentation.
---
 pkgs/development/libraries/libsoup/bad-symbol.patch | 10 ----------
 pkgs/development/libraries/libsoup/default.nix      |  7 ++-----
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/development/libraries/libsoup/bad-symbol.patch

diff --git a/pkgs/development/libraries/libsoup/bad-symbol.patch b/pkgs/development/libraries/libsoup/bad-symbol.patch
deleted file mode 100644
index df1b0af0c69..00000000000
--- a/pkgs/development/libraries/libsoup/bad-symbol.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libsoup/libsoup-2.4.sym 2014-10-29 22:37:54 -0700
-+++ b/libsoup/libsoup-2.4.sym 2014-06-18 07:42:51 -0700
-@@ -348,7 +348,6 @@
- soup_server_get_async_context
- soup_server_get_listener
- soup_server_get_listeners
--soup_server_get_gsocket
- soup_server_get_port
- soup_server_get_type
- soup_server_get_uris
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 73a437b0291..f71cc77321a 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -3,7 +3,7 @@
 , libintlOrEmpty
 , intltool, python }:
 let
-  majorVersion = "2.48";
+  majorVersion = "2.50";
   version = "${majorVersion}.0";
 in
 stdenv.mkDerivation {
@@ -11,14 +11,11 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
-    sha256 = "ea34dd64fe44343445daf6dd690d0691e9d973468de44878da97371c16d89784";
+    sha256 = "1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b";
   };
 
-  outputs = [ "out" "doc" ];
-
   patchPhase = ''
     patchShebangs libsoup/
-    patch -p1 < ${./bad-symbol.patch}
   '';
 
   buildInputs = libintlOrEmpty ++ [ intltool python sqlite ];

From 208bd8242d5dab6929d8651810a38f970412b010 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 28 Jul 2015 02:55:55 +0200
Subject: [PATCH 0372/2016] apktool: set sourceRoot

Otherwise installation fails with the message that unpacking produced
no directories (which is true).
---
 pkgs/development/tools/apktool/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index 23941653575..71e8dcc4953 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper ];
 
+  sourceRoot = ".";
+
   installPhase = ''
     install -D apktool.jar "$out/libexec/apktool/apktool.jar"
     mkdir -p "$out/bin"

From fba4a950685023bc792422665b2dbe9934ebc9c6 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Mon, 27 Jul 2015 22:36:15 -0700
Subject: [PATCH 0373/2016] expat: patch for CVE-2015-1283 from Mozilla

---
 .../libraries/expat/CVE-2015-1283.patch       | 77 +++++++++++++++++++
 pkgs/development/libraries/expat/default.nix  |  2 +
 2 files changed, 79 insertions(+)
 create mode 100644 pkgs/development/libraries/expat/CVE-2015-1283.patch

diff --git a/pkgs/development/libraries/expat/CVE-2015-1283.patch b/pkgs/development/libraries/expat/CVE-2015-1283.patch
new file mode 100644
index 00000000000..33b975912d4
--- /dev/null
+++ b/pkgs/development/libraries/expat/CVE-2015-1283.patch
@@ -0,0 +1,77 @@
+Found at https://hg.mozilla.org/releases/mozilla-esr31/rev/2f3e78643f5c on 2015-07-27.  Modified: replaced path parser/expat/lib/xmlparse.c with lib/xmlparse.c.
+diff --git a/lib/xmlparse.c b/lib/xmlparse.c
+--- a/lib/xmlparse.c
++++ b/lib/xmlparse.c
+@@ -1646,29 +1646,40 @@ XML_ParseBuffer(XML_Parser parser, int l
+   XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
+   positionPtr = bufferPtr;
+   return result;
+ }
+ 
+ void * XMLCALL
+ XML_GetBuffer(XML_Parser parser, int len)
+ {
++/* BEGIN MOZILLA CHANGE (sanity check len) */
++  if (len < 0) {
++    errorCode = XML_ERROR_NO_MEMORY;
++    return NULL;
++  }
++/* END MOZILLA CHANGE */
+   switch (ps_parsing) {
+   case XML_SUSPENDED:
+     errorCode = XML_ERROR_SUSPENDED;
+     return NULL;
+   case XML_FINISHED:
+     errorCode = XML_ERROR_FINISHED;
+     return NULL;
+   default: ;
+   }
+ 
+   if (len > bufferLim - bufferEnd) {
+-    /* FIXME avoid integer overflow */
+     int neededSize = len + (int)(bufferEnd - bufferPtr);
++/* BEGIN MOZILLA CHANGE (sanity check neededSize) */
++    if (neededSize < 0) {
++      errorCode = XML_ERROR_NO_MEMORY;
++      return NULL;
++    }
++/* END MOZILLA CHANGE */
+ #ifdef XML_CONTEXT_BYTES
+     int keep = (int)(bufferPtr - buffer);
+ 
+     if (keep > XML_CONTEXT_BYTES)
+       keep = XML_CONTEXT_BYTES;
+     neededSize += keep;
+ #endif  /* defined XML_CONTEXT_BYTES */
+     if (neededSize  <= bufferLim - buffer) {
+@@ -1687,17 +1698,25 @@ XML_GetBuffer(XML_Parser parser, int len
+     }
+     else {
+       char *newBuf;
+       int bufferSize = (int)(bufferLim - bufferPtr);
+       if (bufferSize == 0)
+         bufferSize = INIT_BUFFER_SIZE;
+       do {
+         bufferSize *= 2;
+-      } while (bufferSize < neededSize);
++/* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */
++      } while (bufferSize < neededSize && bufferSize > 0);
++/* END MOZILLA CHANGE */
++/* BEGIN MOZILLA CHANGE (sanity check bufferSize) */
++      if (bufferSize <= 0) {
++        errorCode = XML_ERROR_NO_MEMORY;
++        return NULL;
++      }
++/* END MOZILLA CHANGE */
+       newBuf = (char *)MALLOC(bufferSize);
+       if (newBuf == 0) {
+         errorCode = XML_ERROR_NO_MEMORY;
+         return NULL;
+       }
+       bufferLim = newBuf + bufferSize;
+ #ifdef XML_CONTEXT_BYTES
+       if (bufferPtr) {
+
+
+
+
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 9a49225d172..05cfeaee423 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2";
   };
 
+  patches = [ ./CVE-2015-1283.patch ];
+
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;
     description = "A stream-oriented XML parser library written in C";

From 8de7d148c81659e73278eb958e97b0ce0d989423 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 28 Jul 2015 01:05:13 -0700
Subject: [PATCH 0374/2016] awscli: Make bash and zsh completions work

---
 pkgs/tools/admin/awscli/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index c846de70852..055abd6fbf0 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -21,6 +21,14 @@ pythonPackages.buildPythonPackage rec {
     groff
   ];
 
+  postInstall = ''
+    mkdir -p $out/etc/bash_completion.d
+    echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli
+    mkdir -p $out/share/zsh/site-functions
+    mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions
+    rm $out/bin/aws.cmd
+  '';
+
   meta = {
     homepage = https://aws.amazon.com/cli/;
     description = "Unified tool to manage your AWS services";

From 99750d89dd962cc7011b02e487ed1a38c7842524 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jul 2015 10:25:31 +0200
Subject: [PATCH 0375/2016] Don't evaluate haskellPackages when gitit is
 disabled

This cuts evaluation time of my NixOS configuration from 1.76s to
1.36s, and RSS from 443 MiB to 368 MiB.

Issue #8152.
---
 nixos/modules/services/misc/gitit.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index 56e735d7356..72b706ddc5a 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -40,7 +40,6 @@ let
       };
 
       haskellPackages = mkOption {
-        default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
         description = "haskellPackages used to build gitit and plugins.";
@@ -143,7 +142,6 @@ let
 
       staticDir = mkOption {
         type = types.path;
-        default = gititShared + "/data/static";
         description = ''
           Specifies the path of the static directory (containing javascript,
           css, and images).  If it does not exist, gitit will create it and
@@ -214,7 +212,6 @@ let
 
       templatesDir = mkOption {
         type = types.path;
-        default = gititShared + "/data/templates";
         description = ''
           Specifies the path of the directory containing page templates.  If it
           does not exist, gitit will create it with default templates.  Users
@@ -296,7 +293,6 @@ let
 
       plugins = mkOption {
         type = types.path;
-        default = gititShared + "/plugins/Dot.hs";
         description = ''
           Specifies a list of plugins to load.  Plugins may be specified either
           by their path or by their module name.  If the plugin name starts
@@ -608,6 +604,13 @@ in
 
   config = mkIf cfg.enable {
 
+    services.gitit = {
+      haskellPackages = mkDefault pkgs.haskellPackages;
+      staticDir = gititShared + "/data/static";
+      templatesDir = gititShared + "/data/templates";
+      plugins = gititShared + "/plugins/Dot.hs";
+    };
+
     users.extraUsers.gitit = {
       group = config.users.extraGroups.gitit.name;
       description = "Gitit user";

From 6e049800ed40d073785b01cc8ea2ffc8606afb3d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 29 Jun 2015 14:19:12 +0300
Subject: [PATCH 0376/2016] nethack: update, adopt

---
 pkgs/games/nethack/default.nix  | 86 ++++++++++++++++++++-------------
 pkgs/top-level/all-packages.nix |  4 +-
 2 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index d817cf64323..e5057c27e99 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -1,57 +1,75 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, writeScript, ncurses, gzip, flex, bison }:
+
+stdenv.mkDerivation rec {
+  name = "nethack-3.4.3";
 
-  version = a.lib.attrByPath ["version"] "3.4.3" a; 
-  buildInputs = with a; [
-    ncurses flex bison
-  ];
-in
-rec {
   src = fetchurl {
     url = "mirror://sourceforge/nethack/nethack-343-src.tgz";
     sha256 = "1r3ghqj82j0bar62z3b0lx9hhx33pj7p1ppxr2hg8bgfm79c6fdv";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [ ncurses ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["preBuild" "doMakeInstall" "postInstall"];
-     
-  preBuild = a.fullDepEntry (''
+  nativeBuildInputs = [ flex bison ];
+
+  preBuild = ''
     ( cd sys/unix ; sh setup.sh )
-    sed -e 's@.*define HACKDIR.*@\#define HACKDIR "/tmp/nethack"@' -i include/config.h
+
     sed -e '/define COMPRESS/d' -i include/config.h
-    sed -e '1i\#define COMPRESS "/usr/local/bin/gzip"' -i include/config.h
+    sed -e '1i\#define COMPRESS "${gzip}/bin/gzip"' -i include/config.h
     sed -e '1i\#define COMPRESS_EXTENSION ".gz"' -i include/config.h
+    sed -e '/define CHDIR/d' -i include/config.h
 
     sed -e '/extern char [*]tparm/d' -i win/tty/*.c
+
     sed -e 's/-ltermlib/-lncurses/' -i src/Makefile
     sed -e 's/^YACC *=.*/YACC = bison -y/' -i util/Makefile
     sed -e 's/^LEX *=.*/LEX = flex/' -i util/Makefile
 
-    sed -e 's@GAMEDIR = @GAMEDIR = /tmp/nethack@' -i Makefile
     sed -re 's@^(CH...).*@\1 = true@' -i Makefile
-  '') ["minInit" "doUnpack"];
 
-  postInstall = a.fullDepEntry (''
+    sed -e '/^ *cd /d' -i sys/unix/nethack.sh
+  '';
+
+  postInstall = ''
+    for i in logfile perm record save; do
+      rm -rf $out/games/lib/nethackdir/$i
+    done
+
     mkdir -p $out/bin
-    ln -s $out/games/nethack $out/bin/nethack
-    sed -i $out/bin/nethack -e '5aNEWHACKDIR="$HOME/.nethack"'
-    sed -i $out/bin/nethack -e '6amkdir -p "$NEWHACKDIR/save"'
-    sed -i $out/bin/nethack -e '7afor i in $(find "$NEWHACKDIR" -type l); do if ! test -e $(readlink "$i"); then rm "$i"; fi; done;'
-    sed -i $out/bin/nethack -e '8aln -s "$HACKDIR"/* "$NEWHACKDIR" &>/dev/null'
-    sed -i $out/bin/nethack -e '9atest -L "$NEWHACKDIR/record" && rm "$NEWHACKDIR"/record'
-    sed -i $out/bin/nethack -e '10aexport HACKDIR="$NEWHACKDIR"'
-  '') ["minInit" "defEnsureDir"];
+    cat <<EOF >$out/bin/nethack
+      #! ${stdenv.shell} -e
+      if [ ! -d ~/.nethack ]; then
+        mkdir -p ~/.nethack/save
+        for i in logfile perm record; do
+          [ ! -e ~/.nethack/\$i ] && touch ~/.nethack/\$i
+        done
+      fi
 
-  makeFlags = [
-      "PREFIX=$out"
-    ];
+      cd ~/.nethack
 
-  name = "nethack-" + version;
-  meta = {
-    description = "rogue-like game";
+      cleanup() {
+        for i in $out/games/lib/nethackdir/*; do
+          rm -rf \$(basename \$i)
+        done
+      }
+      trap cleanup EXIT
+
+      for i in $out/games/lib/nethackdir/*; do
+        ln -s \$i \$(basename \$i)
+      done
+      $out/games/nethack
+    EOF
+    chmod +x $out/bin/nethack
+  '';
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Rogue-like game";
+    homepage = "http://nethack.org/";
+    license = "nethack";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e15e7b65c3..3e8b7250b59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7624,9 +7624,7 @@ let
     sslSupport = true;
   };
 
-  nethack = builderDefsPackage (import ../games/nethack) {
-    inherit ncurses flex bison;
-  };
+  nethack = callPackage ../games/nethack { };
 
   nettle27 = callPackage ../development/libraries/nettle/27.nix { };
   nettle = callPackage ../development/libraries/nettle { };

From 97a289b111477db5a02fff40806e776fcc28edb1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 29 Jun 2015 14:19:23 +0300
Subject: [PATCH 0377/2016] unnethack: add new package

---
 pkgs/games/unnethack/default.nix | 53 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/games/unnethack/default.nix

diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix
new file mode 100644
index 00000000000..0ba542fe63c
--- /dev/null
+++ b/pkgs/games/unnethack/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchgit, utillinux, ncurses, flex, bison }:
+
+stdenv.mkDerivation rec {
+  name = "unnethack-5.3.1";
+
+  src = fetchgit {
+    url = "https://github.com/UnNetHack/UnNetHack";
+    rev = "63677eb256b5a75430f190cfb0f76bdd9bd0b9dd";
+    sha256 = "48a80ef83308b91d4aa86598e30e5b5ce9a5b2da2a763fe921698990c3243969";
+  };
+
+  buildInputs = [ ncurses ];
+
+  nativeBuildInputs = [ utillinux flex bison ];
+
+  configureFlags = [ "--enable-curses-graphics"
+                     "--disable-tty-graphics"
+                     "--with-owner=no"
+                     "--with-group=no"
+                     "--with-gamesdir=/tmp/unnethack"
+                   ];
+
+  postInstall = ''
+    cp -r /tmp/unnethack $out/share/unnethack/profile
+    mv $out/bin/unnethack $out/bin/.wrapped_unnethack
+    cat <<EOF >$out/bin/unnethack
+      #! ${stdenv.shell} -e
+      if [ ! -d ~/.unnethack ]; then
+        mkdir -p ~/.unnethack
+        cp -r $out/share/unnethack/profile/* ~/.unnethack
+        chmod -R +w ~/.unnethack
+      fi
+
+      ln -s ~/.unnethack /tmp/unnethack
+
+      cleanup() {
+        rm -rf /tmp/unnethack
+      }
+      trap cleanup EXIT
+
+      $out/bin/.wrapped_unnethack
+    EOF
+    chmod +x $out/bin/unnethack
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Fork of NetHack";
+    homepage = "http://unnethack.wordpress.com/";
+    license = "nethack";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ abbradar ];
+  }; 
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e8b7250b59..c095e3ad06f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8268,6 +8268,8 @@ let
     gnutls = gnutls;
   });
 
+  unnethack = callPackage ../games/unnethack { };
+
   v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
     inherit (pythonPackages) gyp;
     stdenv = overrideCC stdenv gcc48;

From 3a2275dd841544bd64717c5ff99c62fa38904b12 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 1 Jul 2015 23:54:45 +0300
Subject: [PATCH 0378/2016] imgurbash: add package

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

diff --git a/pkgs/tools/graphics/imgurbash/default.nix b/pkgs/tools/graphics/imgurbash/default.nix
new file mode 100644
index 00000000000..66f85af8793
--- /dev/null
+++ b/pkgs/tools/graphics/imgurbash/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, bash, curl, xsel }:
+
+stdenv.mkDerivation {
+  name = "imgurbash-4";
+
+  src = fetchurl {
+    url = "https://imgur.com/tools/imgurbash.sh";
+    sha256 = "16m7dn5vqzx1q4pzssnwiwajfzrbhrz0niyhf5abxi1lwr3h0ca1";
+  };
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    cat <<EOF >$out/bin/imgurbash
+    #!${bash}/bin/bash
+    PATH=${stdenv.lib.makeSearchPath "bin" [curl xsel]}:\$PATH
+    EOF
+    cat $src >>$out/bin/imgurbash
+    chmod +x $out/bin/imgurbash
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple bash script to upload an image to imgur from the commandline";
+    license = licenses.publicDomain;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c095e3ad06f..80adf6dfd48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1892,6 +1892,8 @@ let
     inherit (perlPackages) MailIMAPClient;
   };
 
+  imgurbash = callPackage ../tools/graphics/imgurbash { };
+
   inadyn = callPackage ../tools/networking/inadyn { };
 
   inetutils = callPackage ../tools/networking/inetutils { };

From dea8ebcfc531b8f2b4892652ef053da7e270801b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 3 Jul 2015 00:26:49 +0300
Subject: [PATCH 0379/2016] dovecot: add lmtp support

---
 nixos/modules/services/mail/dovecot.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 50ff1b38db1..fca0d2a7f61 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -10,7 +10,7 @@ let
     ''
       base_dir = /var/run/dovecot2/
 
-      protocols = ${optionalString cfg.enableImap "imap"} ${optionalString cfg.enablePop3 "pop3"}
+      protocols = ${optionalString cfg.enableImap "imap"} ${optionalString cfg.enablePop3 "pop3"} ${optionalString cfg.enableLmtp "lmtp"}
     ''
     + (if cfg.sslServerCert!="" then
     ''
@@ -70,6 +70,11 @@ in
         description = "Start the IMAP listener (when Dovecot is enabled).";
       };
 
+      enableLmtp = mkOption {
+        default = false;
+        description = "Start the LMTP listener (when Dovecot is enabled).";
+      };
+
       user = mkOption {
         default = "dovecot2";
         description = "Dovecot user name.";

From e3461ce2590d709e36758866f4f471c26712a513 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 22 Jul 2015 14:42:23 +0300
Subject: [PATCH 0380/2016] rPackages.stringi: add ICU data tables

---
 pkgs/development/r-modules/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index ab50d9d0c3c..d04ce8664fc 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1502,6 +1502,20 @@ let
   ];
 
   otherOverrides = old: new: {
+    stringi = old.stringi.overrideDerivation (attrs: {
+      postInstall = let
+        icuName = "icudt52l";
+        icuSrc = pkgs.fetchzip {
+          url = "http://static.rexamine.com/packages/${icuName}.zip";
+          sha256 = "0hvazpizziq5ibc9017i1bb45yryfl26wzfsv05vk9mc1575r6xj";
+          stripRoot = false;
+        };
+        in ''
+          ${attrs.postInstall or ""}
+          cp ${icuSrc}/${icuName}.dat $out/library/stringi/libs
+        '';
+    });
+
     xml2 = old.xml2.overrideDerivation (attrs: {
       preConfigure = "export LIBXML_INCDIR=${pkgs.libxml2}/include/libxml2";
     });

From f5b41dbf42850aae42cbb26864a3729c9ca76172 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 25 Jul 2015 01:46:11 +0300
Subject: [PATCH 0381/2016] haskellPackages.gnuplot: remove reduntant patch

---
 .../configuration-ghc-7.10.x.nix              |  3 -
 .../gnuplot-fix-new-time.patch                | 60 -------------------
 2 files changed, 63 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/gnuplot-fix-new-time.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 ca7c0f56bc1..b223eeb134b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -117,9 +117,6 @@ self: super: {
     sha256 = "1vn3xm38v2f4lzyzkadvq322f3s2yf8c88v56wpdpzfxmvlzaqr8";
   });
 
-  # Already applied in darcs repository.
-  gnuplot = appendPatch super.gnuplot ./gnuplot-fix-new-time.patch;
-
   ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation {
     pname = "ghcjs-prim";
     version = "0.1.0.0";
diff --git a/pkgs/development/haskell-modules/gnuplot-fix-new-time.patch b/pkgs/development/haskell-modules/gnuplot-fix-new-time.patch
deleted file mode 100644
index 1b4a60e5941..00000000000
--- a/pkgs/development/haskell-modules/gnuplot-fix-new-time.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ru3 gnuplot-0.5.3.1-old/gnuplot.cabal gnuplot-0.5.3.1/gnuplot.cabal
---- gnuplot-0.5.3.1-old/gnuplot.cabal	2015-04-17 22:25:06.561715968 +0300
-+++ gnuplot-0.5.3.1/gnuplot.cabal	2015-04-17 22:27:07.610913755 +0300
-@@ -75,7 +75,7 @@
- 
- Library
-   Build-Depends:
--    filepath >=1.1 && <1.4,
-+    filepath >=1.1 && <1.5,
-     temporary >=1.1 && <1.3,
-     array >=0.1 && <0.6,
-     containers >=0.1 && <0.6,
-@@ -83,12 +83,11 @@
-     data-accessor-transformers >=0.2.1 && <0.3,
-     data-accessor >=0.2.2 && <0.3,
-     transformers >=0.3 && <0.5,
--    deepseq >=1.0 && <1.4
-+    deepseq >=1.0 && <1.5
-   If flag(splitBase)
-     Build-Depends:
--      process >=1.0,
--      time >=1.1,
--      old-locale >=1.0,
-+      process >=1.0 && <1.3,
-+      time >=1.1 && <1.6,
-       base >=2 && <5
-   Else
-     Build-Depends:
-diff -ru3 gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Time.hs gnuplot-0.5.3.1/src/Graphics/Gnuplot/Time.hs
---- gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Time.hs	2015-04-17 22:25:06.560715975 +0300
-+++ gnuplot-0.5.3.1/src/Graphics/Gnuplot/Time.hs	2015-04-17 22:27:49.872542430 +0300
-@@ -1,7 +1,6 @@
- module Graphics.Gnuplot.Time where
- 
--import System.Locale (defaultTimeLocale, )
--import Data.Time.Format (FormatTime, formatTime, )
-+import Data.Time.Format (FormatTime, formatTime, defaultTimeLocale, )
- import Data.Tuple.HT (mapFst, )
- 
- {- |
-diff -ru3 gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Value/Tuple.hs gnuplot-0.5.3.1/src/Graphics/Gnuplot/Value/Tuple.hs
---- gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Value/Tuple.hs	2015-04-17 22:25:06.560715975 +0300
-+++ gnuplot-0.5.3.1/src/Graphics/Gnuplot/Value/Tuple.hs	2015-04-17 22:28:24.426238829 +0300
-@@ -9,7 +9,6 @@
-    ColumnCount(ColumnCount),
-    ) where
- 
--import System.Locale (defaultTimeLocale, )
- import qualified Data.Time as Time
- 
- import Data.Word (Word8, Word16, Word32, Word64, )
-@@ -82,7 +81,7 @@
- instance C Time.Day where
-    text d = text $ Time.UTCTime d 0
- instance C Time.UTCTime where
--   text = singleton . showString . Time.formatTime defaultTimeLocale "%s"
-+   text = singleton . showString . Time.formatTime Time.defaultTimeLocale "%s"
- 
- 
- instance (C a, C b) => C (a,b) where

From 533657332925dbc84e93b2aec04557be253009fa Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 00:31:49 +0300
Subject: [PATCH 0382/2016] steam: libstdc++/mesa incompatibility workaround

closes #9003
---
 pkgs/games/steam/chrootenv.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index d1aa125169e..9eca9c127df 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -70,7 +70,9 @@ buildFHSUserEnv {
 
   profile = ''
     # Ugly workaround for https://github.com/ValveSoftware/steam-for-linux/issues/3504
-    export LD_PRELOAD=/lib32/libpulse.so:/lib64/libpulse.so:/lib32/libasound.so:/lib64/libasound.so
+    export LD_PRELOAD=/lib32/libpulse.so:/lib64/libpulse.so:/lib32/libasound.so:/lib64/libasound.so:$LD_PRELOAD
+    # Another one for https://github.com/ValveSoftware/steam-for-linux/issues/3801
+    export LD_PRELOAD=/lib32/libstdc++.so:/lib64/libstdc++.so:$LD_PRELOAD
   '';
 
   runScript = "steam";

From f2692a96a28bd06b725e4e832c1d09d473f98c43 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 11:57:29 +0300
Subject: [PATCH 0383/2016] fix homepages

---
 pkgs/applications/audio/paprefs/default.nix         | 2 +-
 pkgs/applications/display-managers/sddm/default.nix | 2 +-
 pkgs/development/libraries/xlslib/default.nix       | 2 +-
 pkgs/games/crawl/default.nix                        | 1 +
 pkgs/games/the-powder-toy/default.nix               | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix
index 06b4b44b596..b026d8b9e6a 100644
--- a/pkgs/applications/audio/paprefs/default.nix
+++ b/pkgs/applications/audio/paprefs/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       dialog for the PulseAudio sound server.
     '';
 
-    homepage = http://freedesktop.org/software/pulseaudio/paprefs/ ;
+    homepage = http://freedesktop.org/software/pulseaudio/paprefs/;
 
     license = licenses.gpl2Plus;
 
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 73a188af0cf..ad2c885e496 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "QML based X11 display manager";
-    homepage = http://launchpad.net/lightdm;
+    homepage = https://github.com/sddm/sddm;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix
index 2492063be27..e68415951c7 100644
--- a/pkgs/development/libraries/xlslib/default.nix
+++ b/pkgs/development/libraries/xlslib/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C++/C library to construct Excel .xls files in code";
-    homepage = http://sourceforge.net/projects/xlslib/files/;
+    homepage = http://sourceforge.net/projects/xlslib/;
     license = licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index e99df5e6c74..43dc3409591 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Open-source, single-player, role-playing roguelike game";
+    homepage = http://crawl.develz.org/;
     longDescription = ''
       Open-source, single-player, role-playing roguelike game of exploration and
       treasure-hunting in dungeons filled with dangerous and unfriendly monsters
diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix
index 43d453f71d7..f79d31c7c5c 100644
--- a/pkgs/games/the-powder-toy/default.nix
+++ b/pkgs/games/the-powder-toy/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free 2D physics sandbox game";
+    homepage = http://powdertoy.co.uk/;
     platforms = platforms.unix;
     license = licenses.gpl3;
     maintainers = with maintainers; [ abbradar ];

From a5ef14bb74843a3a089febd38396559a5b720299 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 11:16:48 +0300
Subject: [PATCH 0384/2016] bomi: update package

---
 pkgs/applications/video/bomi/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index 2f0c3070921..da07458f4f6 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -26,28 +26,23 @@ assert pulseSupport -> libpulseaudio != null;
 assert cddaSupport -> libcdda != null;
 assert youtubeSupport -> youtube-dl != null;
 
-let
-  waf = fetchurl {
-    url = http://ftp.waf.io/pub/release/waf-1.8.4;
-    sha256 = "1a7skwgpl91adhcwlmdr76xzdpidh91hvcmj34zz6548bpx3a87h";
-  };
-
+let qtPath = makeSearchPath "lib/qt5/qml" [ qt5.declarative qt5.quickcontrols ];
 in
 
 stdenv.mkDerivation rec {
   name = "bomi-${version}";
-  version = "0.9.10";
+  version = "0.9.11";
 
   src = fetchFromGitHub {
     owner = "xylosper";
     repo = "bomi";
     rev = "v${version}";
-    sha256 = "1c7497gks7yxzfy6jx77vn9zs2pdq7y6l9w61miwnkdm91093n17";
+    sha256 = "0a7n46gn3n5098lxxvl3s29s8jlkzss6by9074jx94ncn9cayf2h";
   };
 
   buildInputs = with stdenv.lib;
                 [ libX11 libxcb mesa
-                  qt5.base qt5.x11extras qt5.declarative qt5.quickcontrols
+                  qt5.base qt5.x11extras
                   ffmpeg
                   libchardet
                   mpg123
@@ -72,13 +67,13 @@ stdenv.mkDerivation rec {
   '';
 
   preBuild = ''
-    install -m755 ${waf} src/mpv/waf
     patchShebangs src/mpv/waf
     patchShebangs build-mpv
   '';
 
   postInstall = ''
     wrapProgram $out/bin/bomi \
+      --set QML2_IMPORT_PATH ${qtPath} \
       ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"}
   '';
 

From 5656c8cb8e4da938688b95e9f039a29afdc2b243 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 11:25:33 +0300
Subject: [PATCH 0385/2016] libaacs: update package

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

diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index 631c7c778ae..119a46bfc31 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -8,7 +8,7 @@
 # https://wiki.archlinux.org/index.php/BluRay
 
 let baseName = "libaacs";
-    version  = "0.8.0";
+    version  = "0.8.1";
 in
 
 stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
-    sha256 = "155sah8z4vbp6j3sq9b17mcn6rj1938ijszz97m8pd2cgif58i2y";
+    sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm";
   };
 
   buildInputs = [ libgcrypt libgpgerror ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ yacc flex ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.videolan.org/developers/libbluray.html;
+    homepage = https://www.videolan.org/developers/libaacs.html;
     description = "Library to access AACS protected Blu-Ray disks";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ abbradar ];

From 41281e46a56132b513c0cf83adfb860fade25b3a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 11:35:52 +0300
Subject: [PATCH 0386/2016] libbluray: update package

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

diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index a7a8e7cea63..d8571254967 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -19,12 +19,12 @@ assert withFonts -> freetype != null;
 
 stdenv.mkDerivation rec {
   baseName = "libbluray";
-  version  = "0.8.0";
+  version  = "0.8.1";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2";
-    sha256 = "027xbdbsjyp1spfiva2331pzixrzw6vm97xlvgz16hzm5a5j103v";
+    sha256 = "13zvkrwy2fr877gkifgwnqfsb3krbz7hklfcwqfjbhmvqn0cdgnd";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ]

From 3ed3503bf7ae694d8cdb50af7271019651258c34 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 11:36:21 +0300
Subject: [PATCH 0387/2016] libchardet: update upstream URL

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

diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix
index f7834c56b63..6fc17256a39 100644
--- a/pkgs/development/libraries/libchardet/default.nix
+++ b/pkgs/development/libraries/libchardet/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libchardet-1.0.4";
   
   src = fetchurl {
-    url = "ftp://ftp.oops.org/pub/oops/libchardet/${name}.tar.bz2";
+    url = "http://yupmin.net/wp-content/uploads/2014/03/libchardet-1.0.4.tar.bz2";
     sha256 = "0cvwba4la25qw70ap8jd5r743a9jshqd26nnbh5ph68zj1imlgzl";
   };
 

From b639dcf9e09899527448c6e961caa2b8563c1b25 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 11:41:53 +0300
Subject: [PATCH 0388/2016] libtirpc: update package

---
 pkgs/development/libraries/ti-rpc/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index eb795d6b28e..26eb8f526c8 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,19 +1,16 @@
 { fetchurl, stdenv, libkrb5 }:
 
 stdenv.mkDerivation rec {
-  name = "libtirpc-0.3.0";
+  name = "libtirpc-0.3.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
-    sha256 = "07d1wlfzf3ia09mjn3f3ay8isk7yx4a6ckfkzx5khnqlc7amkzna";
+    sha256 = "1z1z8xnlqgqznxzmyc6sypjc6b220xkv0s55hxd5sb3zydws6210";
   };
 
   propagatedBuildInputs = [ libkrb5 ];
 
-  # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf
   preConfigure = ''
-    echo "" > src/des_crypt.c
-
     sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h
   '';
 

From 81d1367b79df96232408f7a9e6241f7ec45ac603 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 11:44:45 +0300
Subject: [PATCH 0389/2016] cppzmq: update package

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

diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index 481c80994e8..282ad7bfcd7 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "cppzmq-2015-03-05";
+  name = "cppzmq-2015-07-06";
 
   src = fetchgit {
-    url = "git://github.com/zeromq/cppzmq";
-    rev = "ac705f604701e2ca1643fa31bae240f9da8b9b9a";
-    sha256 = "1bcd5553601a6cdc926aa7a7c89fe54d3b14693cfce85dea97af25cf5a144398";
+    url = "https://github.com/zeromq/cppzmq";
+    rev = "a88bf3e0b0bc6ed5f5b25a58f8997a1dae374c8b";
+    sha256 = "75a6630b870c1f0d5b9d6a0ba03e83ceee47aaa2a253894e75a8a93a6d65d3aa";
   };
 
   installPhase = ''

From ce5a813acbc347f03fcadb8fb36d55103822c4f2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 11:46:16 +0300
Subject: [PATCH 0390/2016] double-conversion: update package

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

diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index 7de7cb4d102..049a799c44f 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.5";
+  version = "2.0.1";
   name = "double-conversion-${version}";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "double-conversion";
     rev = "v${version}";
-    sha256 = "1a264wpnvxmnq5pdlnp417ld1ybrng83lnbg38bv4ahz7a29ap4z";
+    sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b";
   };
 
   nativeBuildInputs = [ cmake ];

From 4b9d22db08230c549529db313e308e3e1bc42c39 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 11:50:13 +0300
Subject: [PATCH 0391/2016] folly: update package

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

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 79584a99f63..0cea9413bae 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -2,14 +2,14 @@
 , google-gflags, python, libiberty, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "0.38.0";
+  version = "0.52.0";
   name = "folly-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "0b273iwizy08r8lap367q79lai4l4aib2bvd827lkkdax5jpqf6b";
+    sha256 = "16g3hpy1gy56zqnhwzkvzzpm6dgm01qa9yaigmrqr9b59c3k6cqf";
   };
 
   buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ];

From 83e6095f9fd0285e80beb23b386749fd3378826f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 11:53:09 +0300
Subject: [PATCH 0392/2016] libiberty: update package

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

diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix
index eddc4eed55c..6a68b5610da 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/pkgs/development/libraries/libiberty/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "4.8.4";
+  version = "4.9.3";
   name = "libiberty-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "15c6gwm6dzsaagamxkak5smdkf1rdfbqqjs9jdbrp3lbg4ism02a";
+    sha256 = "0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/libiberty";

From 5fc747f23b80c65438b6861a29c606e4755b985b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 11:53:14 +0300
Subject: [PATCH 0393/2016] qpdf: update package

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

diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 93935175092..340f4558f81 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pcre, zlib, perl }:
 
-let version = "5.1.2";
+let version = "5.1.3";
 in
 stdenv.mkDerivation rec {
   name = "qpdf-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
-    sha256 = "1zbvhrp0zjzbi6q2bnbxbg6399r47pq5gw3kspzph81j19fqvpg9";
+    sha256 = "1lq1v7xghvl6p4hgrwbps3a13ad6lh4ib3myimb83hxgsgd4n5nm";
   };
 
   nativeBuildInputs = [ perl ];

From c40e9abc9386c74113e58ac7b283ee6922e2a27d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 11:59:43 +0300
Subject: [PATCH 0394/2016] android-udev-rules: update package

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

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index 7f0e345a2b0..61e4291ecc5 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "android-udev-rules-2015-02-28";
+  name = "android-udev-rules-20150301";
 
   src = fetchgit {
-    url = "git://github.com/M0Rf30/android-udev-rules";
+    url = "https://github.com/M0Rf30/android-udev-rules";
     rev = "2cc51a456ccfbca338c4e6b76211645aaac631e9";
     sha256 = "dbf1614cebb466d1adbcc5f17cefc0c37f148f9e3b46443b3e82f6cd19a1514f";
   };

From 89fa3513ca9961383c6739e56e14323234ce3511 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 12:17:39 +0300
Subject: [PATCH 0395/2016] uwsgi: update package

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

diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index bf168611f38..e7e7502665f 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -24,11 +24,11 @@ in
 assert builtins.filter (x: lib.all (y: y.name != x) available) plugins == [];
 
 stdenv.mkDerivation rec {
-  name = "uwsgi-2.0.10";
+  name = "uwsgi-2.0.11.1";
 
   src = fetchurl {
     url = "http://projects.unbit.it/downloads/${name}.tar.gz";
-    sha256 = "12q2sn35vf1ils5043svq8da0czy54k63ziybvl33a9dqbb83cy0";
+    sha256 = "11v2j9n204hlvi1p1wp4r3nn22fqyd1qlbqcfqddi77sih9x79vm";
   };
 
   nativeBuildInputs = [ python3 pkgconfig ];

From b2d5326e3a671c5a52569bcb504f4a458ca897d4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 12:20:09 +0300
Subject: [PATCH 0396/2016] sdl-jstest: update package

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

diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix
index 3da62874c13..cf62039fc03 100644
--- a/pkgs/tools/misc/sdl-jstest/default.nix
+++ b/pkgs/tools/misc/sdl-jstest/default.nix
@@ -1,11 +1,11 @@
 { fetchgit, stdenv, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl }:
 
 stdenv.mkDerivation rec {
-  name = "sdl-jstest-20150611";
+  name = "sdl-jstest-20150625";
   src = fetchgit {
     url = "https://github.com/Grumbel/sdl-jstest";
-    rev = "684d168e5526da16760dcfc6d40da0103ab284cc";
-    sha256 = "fc110a858edc2defc5cd8b176a5ce74666d3957d0268b861d0f9669362a1bd03";
+    rev = "3f54b86ebe0d2f95e9c1d034bc4ed02d6d2b6409";
+    sha256 = "d33e0a2c66b551ecf333590f1a6e1730093af31cee1be8757748624d42e14df1";
   };
 
   buildInputs = [ SDL SDL2 ncurses ];

From 9d815b266d02ee159f47987d66dac633aa82799b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 12:22:59 +0300
Subject: [PATCH 0397/2016] thermald: update package

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

diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index 85bc40caa27..9fe9adaedad 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.2";
+  version = "1.4.3";
   name = "thermald-${version}";
   src = fetchFromGitHub {
     owner = "01org";
     repo = "thermal_daemon";
     rev = "v${version}";
-    sha256 = "051119wb0n31rn15pnx56d1r58a2d1fmj030q991mcv7pcy6c8mg";
+    sha256 = "1wrbydmw1jc5dcjawhhsa52hilzajl9n849i09d2nfilv3qcqqi9";
   };
 
   buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ];

From e6bdca625a972999a20c8270c9beabe8ec07bde7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 28 Jul 2015 11:44:18 +0200
Subject: [PATCH 0398/2016] iproute: prefix CONFDIR so that all files are not
 directly under /etc

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

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 09e5f1bc5ce..f7ca0481a31 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildFlags = [
-    "CONFDIR=/etc"
+    "CONFDIR=/etc/iproute2"
   ];
 
   installFlags = [
-    "CONFDIR=$(out)/etc"
+    "CONFDIR=$(out)/etc/iproute2"
   ];
 
   buildInputs = [ db iptables ];

From c60ce5fa9b5a7cc6363aa9b3bbce53cd74b14b4b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 12:46:01 +0300
Subject: [PATCH 0399/2016] Revert "rpcbind: 0.2.3 -> 1.0.7"

This reverts commit 5c31245047a4bd0966059d0d5cd4e701745ee6c4. See #8902.
---
 pkgs/servers/rpcbind/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index 6eb58d45838..6eb8a57cab4 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -1,19 +1,16 @@
 { fetchurl, stdenv, pkgconfig, libtirpc
 , useSystemd ? true, systemd }:
 
-let version = "1.0.7";
+let version = "0.2.3";
 in stdenv.mkDerivation rec {
   name = "rpcbind-${version}";
   
   src = fetchurl {
     url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2";
-    sha256 = "14vl0kmavc1fay630f4w8l1hjfzhmcqm8d0akzahhgymh5fw1f7r";
+    sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq";
   };
 
   patches = [ ./sunrpc.patch ];
-  postPatch = ''
-    sed -e 's|/usr/include/tirpc|${libtirpc}/include/tirpc|' -i src/Makefile.am -i src/Makefile.in
-  '';
 
   buildInputs = [ libtirpc ]
              ++ stdenv.lib.optional useSystemd systemd;

From 30facde98c9e1b7a5d27a11d7eb0c87cbc8cbd1a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 10 Jul 2015 13:42:39 +0300
Subject: [PATCH 0400/2016] zsnes: use Debian patches, fix segfault on saving
 state

---
 pkgs/misc/emulators/zsnes/default.nix         | 31 +++++--
 .../emulators/zsnes/zsnes-1.51-libpng15.patch | 12 ---
 pkgs/misc/emulators/zsnes/zsnes.patch         | 80 -------------------
 3 files changed, 23 insertions(+), 100 deletions(-)
 delete mode 100644 pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch
 delete mode 100644 pkgs/misc/emulators/zsnes/zsnes.patch

diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
index bca81a4b6b3..23930ac624c 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa}:
+{stdenv, fetchurl, fetchpatch, nasm, SDL, zlib, libpng, ncurses, mesa}:
 
 stdenv.mkDerivation {
   name = "zsnes-1.51";
@@ -8,12 +8,27 @@ stdenv.mkDerivation {
     sha256 = "08s64qsxziv538vmfv38fg1rfrz5k95dss5zdkbfxsbjlbdxwmi8";
   };
 
-  # copied from arch linux, fixes gcc-4.8 compatibility
-  patches = [ ./zsnes.patch ];
-
-  postPatch = ''
-    patch -p0 < ${./zsnes-1.51-libpng15.patch}
-  '';
+  patches = [ (fetchpatch {
+                url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/0003-gcc-4.3-ftbfs.patch";
+                sha256 = "1rlqjxnx21iz03414bamqrpysaxbvmfacfnk111233yxjd4vhq89";
+              })
+              (fetchpatch {
+                url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/0009-hat-events.patch";
+                sha256 = "1az5vxjff22hqlsv0nmliax3ziwcr9kc75na805v9f66s8fmj5rf";
+              })
+              (fetchpatch {
+                url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/0010-Fix-build-with-libpng-1.5.patch";
+                sha256 = "1vjfraxjw6f496j3w8r581m3lbn16s0nx3hskzj14hl9ycfskhnr";
+              })
+              (fetchpatch {
+                url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/0012-Fix-build-with-gcc-4.7.patch";
+                sha256 = "1d8m0vxi8wf9z4wfjx2cc48p1wy2qadgvcm88dg1jncg334jwfrg";
+              })
+              (fetchpatch {
+                url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/zsnes-linux-resume-freeze-fix.patch";
+                sha256 = "0gvf6gsqxxfah1s80ya2l5yils2kv9xa6faajdyby7xipzkc6qc7";
+              })
+            ];
 
   buildInputs = [ nasm SDL zlib libpng ncurses mesa ];
 
@@ -22,7 +37,7 @@ stdenv.mkDerivation {
     sed -i "/^STRIP/d" configure
   '';
 
-  configureFlags = "--enable-release";
+  configureFlags = [ "--enable-release" ];
 
   meta = {
     description = "A Super Nintendo Entertainment System Emulator";
diff --git a/pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch b/pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch
deleted file mode 100644
index b32c3096754..00000000000
--- a/pkgs/misc/emulators/zsnes/zsnes-1.51-libpng15.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Use existing png_set_IHDR() and stop accessing PNG structure members directly
-
---- src/zip/zpng.c
-+++ src/zip/zpng.c
-@@ -129,7 +129,6 @@
-         png_set_IHDR(png_ptr, info_ptr, width, height, 8,
-                      PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
-                      PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
--        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
- 
-         //Allocate an array of scanline pointers
-         row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));
diff --git a/pkgs/misc/emulators/zsnes/zsnes.patch b/pkgs/misc/emulators/zsnes/zsnes.patch
deleted file mode 100644
index d5d681ae67a..00000000000
--- a/pkgs/misc/emulators/zsnes/zsnes.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -aur zsnes_1_51//src/Makefile.in zsnes_1_51_new//src/Makefile.in
---- zsnes_1_51//src/Makefile.in	2007-01-24 21:54:12.000000000 +0100
-+++ zsnes_1_51_new//src/Makefile.in	2010-09-06 00:03:04.715810431 +0200
-@@ -95,7 +95,7 @@
- %.o: %.cpp
- 	@CXX@ @CXXFLAGS@ -o $@ -c $<
- %.o %.h: %.psr $(PSR)
--	./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
-+	./$(PSR) @PSRFLAGS@ -gcc "@CC@" -compile -flags "@CFLAGS@ -O1 -D_FORTIFY_SOURCE=0" -cheader $*.h -fname $* $*.o $<
- 
- default: main
- all: main tools
-@@ -133,7 +133,7 @@
- 
- include makefile.dep
- makefile.dep: $(TOOL_D)/depbuild Makefile
--	$(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
-+	$(TOOL_D)/depbuild "@CC@" "@CFLAGS@" "@NASMPATH@" "@NFLAGS@" $(Z_OBJS) > makefile.dep
- 
- Makefile: Makefile.in config.status
- 	./config.status
-diff -aur zsnes_1_51//src/parsegen.cpp zsnes_1_51_new//src/parsegen.cpp
---- zsnes_1_51//src/parsegen.cpp	2007-10-31 05:30:26.000000000 +0100
-+++ zsnes_1_51_new//src/parsegen.cpp	2010-09-05 15:48:36.903333444 +0200
-@@ -19,6 +19,9 @@
- Config file handler creator by Nach (C) 2005-2007
- */
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #if !defined(__GNUC__) && !defined(_MSC_VER)
- #error You are using an unsupported compiler
- #endif
-@@ -1822,7 +1825,7 @@
-   }
- }
- 
--int main(size_t argc, const char *const *const argv)
-+int main(int argc, const char *const *const argv)
- {
-   const char *cheader_file = 0;
-   bool compile = false;
-diff -aur zsnes_1_51//src/tools/depbuild.cpp zsnes_1_51_new//src/tools/depbuild.cpp
---- zsnes_1_51//src/tools/depbuild.cpp	2006-12-27 12:04:05.000000000 +0100
-+++ zsnes_1_51_new//src/tools/depbuild.cpp	2010-09-05 15:48:36.903333444 +0200
-@@ -183,7 +183,7 @@
-   }
- }
- 
--int main(size_t argc, const char *const *const argv)
-+int main(int argc, const char *const *const argv)
- {
-   if (argc < 5)
-   {
-diff -aur zsnes_1_51//src/tools/strutil.h zsnes_1_51_new//src/tools/strutil.h
---- zsnes_1_51//src/tools/strutil.h	2006-12-27 12:04:05.000000000 +0100
-+++ zsnes_1_51_new//src/tools/strutil.h	2010-09-05 15:48:36.903333444 +0200
-@@ -15,6 +15,9 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- /*
- This is part of a toolkit used to assist in ZSNES development
- */
-diff -u -r zsnes_1_51/src/tools/depbuild.cpp zsnes_1_51-fix/src/tools/depbuild.cpp
---- zsnes_1_51/src/tools/depbuild.cpp	2006-12-27 12:04:05.000000000 +0100
-+++ zsnes_1_51-fix/src/tools/depbuild.cpp	2012-07-14 16:20:17.759886250 +0200
-@@ -26,6 +26,8 @@
- #include <cstdio>
- using namespace std;
- 
-+#include <unistd.h>
-+
- #include "fileutil.h"
- #include "strutil.h"
- 

From f055ffa372fc75341784f4a5d019f9ca06320e06 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 13 Jul 2015 22:22:55 +0300
Subject: [PATCH 0401/2016] adom: use another mirror

---
 pkgs/games/adom/default.nix | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix
index d44da3d41b7..4c62ac4ee34 100644
--- a/pkgs/games/adom/default.nix
+++ b/pkgs/games/adom/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio
-, xlibs, plowshare }:
-
-assert stdenv.isLinux;
+{ stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio
+, xlibs }:
 
+assert stdenv.system == "x86_64-linux";
 let
 
   inherit (xlibs) libXext libX11;
@@ -11,21 +10,13 @@ let
       zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio];
 
 in
-assert stdenv.is64bit;
 stdenv.mkDerivation rec {
+  name = "adom-${version}-noteye";
+  version = "1.2.0_pre23";
 
-  name = "adom-1.2.0-noteye";
-
-  # couldn't make fetchurl appear non-robot, even with --user-agent
-  src = stdenv.mkDerivation {
-    name = "adom-1.2.0-noteye.tar.gz";
-    buildCommand = ''
-      ${plowshare}/bin/plowdown "http://www30.zippyshare.com/v/39200582/file.html"
-      F=`ls *tar.gz`
-      mv $F $out
-    '';
-    outputHashAlgo = "sha256";
-    outputHash = "1f825845d5007e676a4d1a3ccd887904b959bdddbcb9f241c42c2dac34037669";
+  src = fetchurl {
+    url = "http://ancardia.uk.to/download/adom_noteye_linux_ubuntu_64_${version}.tar.gz";
+    sha256 = "0sbn0csaqb9cqi0z5fdwvnymkf84g64csg0s9mm6fzh0sm2mi0hz";
   };
 
   buildCommand = ''

From 269c52e896c9f2f3efc9fea38a57874f55f99dea Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 19 Jul 2015 21:59:35 +0300
Subject: [PATCH 0402/2016] adom: get rid of unneeded process

---
 pkgs/games/adom/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix
index 4c62ac4ee34..74fe5232fa1 100644
--- a/pkgs/games/adom/default.nix
+++ b/pkgs/games/adom/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     mkdir $out/bin
     cat >$out/bin/adom <<EOF
     #! ${stdenv.shell}
-    (cd $out; $out/adom ; )
+    (cd $out; exec $out/adom ; )
     EOF
     chmod +x $out/bin/adom
   '';

From ff219393cae6b90d7c6df6fa74db6bfd5fbb7ea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Jul 2015 12:40:14 +0200
Subject: [PATCH 0403/2016] nvidia_x11_beta: fix build by syncing with default

/cc author @wkennington.
---
 pkgs/os-specific/linux/nvidia-x11/beta.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/beta.nix b/pkgs/os-specific/linux/nvidia-x11/beta.nix
index fb57e194c80..dc6af818837 100644
--- a/pkgs/os-specific/linux/nvidia-x11/beta.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/beta.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
-, gtk, atk, pango, glib, gdk_pixbuf, cairo
+, gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences
 , # Whether to build the libraries only (i.e. not the kernel module or
   # nvidia-settings).  Used to support 32-bit binaries on 64-bit
   # Linux.
@@ -52,7 +52,9 @@ stdenv.mkDerivation {
     [ gtk atk pango glib gdk_pixbuf cairo ] );
   programPath = makeLibraryPath [ xlibs.libXv ];
 
-  buildInputs = [ perl ];
+  buildInputs = [ perl nukeReferences ];
+
+  disallowedReferences = if libsOnly then [] else [ kernel.dev ];
 
   meta = with stdenv.lib.meta; {
     homepage = http://www.nvidia.com/object/unix.html;

From ebe67d3c85d861e9cb61067e325b3ef7850cc2cf Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Tue, 28 Jul 2015 00:54:09 -0500
Subject: [PATCH 0404/2016] nvidia-x11: add a symlink for libGLESv2.so.2 (close
 #9024)

nvidia's EGL stack looks for libGLESv2.so.2 at runtime (confirmed by
watching strace), however builder.sh only provides a libGLESv2.so.1
symlink.

@vcunat ported to legacy_340; older ones don't produce GLES.
---
 pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh | 6 ++++++
 pkgs/os-specific/linux/nvidia-x11/builder.sh           | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh
index 5d6647d1ee0..07cc1a85de0 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh
@@ -93,6 +93,12 @@ installPhase() {
       patchelf --set-rpath "$out/lib:$allLibPath" "$libname"
 
       libname_short=`echo -n "$libname" | sed 's/so\..*/so/'`
+
+      # nvidia's EGL stack seems to expect libGLESv2.so.2 to be available
+      if [ $(basename "$libname_short") == "libGLESv2.so" ]; then
+          ln -srnf "$libname" "$libname_short.2"
+      fi
+
       ln -srnf "$libname" "$libname_short"
       ln -srnf "$libname" "$libname_short.1"
     done
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 47ca3d120a5..d34c4f355a3 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -61,6 +61,12 @@ installPhase() {
       patchelf --set-rpath "$out/lib:$allLibPath" "$libname"
 
       libname_short=`echo -n "$libname" | sed 's/so\..*/so/'`
+
+      # nvidia's EGL stack seems to expect libGLESv2.so.2 to be available
+      if [ $(basename "$libname_short") == "libGLESv2.so" ]; then
+          ln -srnf "$libname" "$libname_short.2"
+      fi
+
       ln -srnf "$libname" "$libname_short"
       ln -srnf "$libname" "$libname_short.1"
     done

From cca7cdb631afab76187f84377ae012f92c6044be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jul 2015 13:08:42 +0200
Subject: [PATCH 0405/2016] php: Update to 5.4.43, 5.5.27, 5.6.11

CVE-2015-3152
---
 pkgs/development/interpreters/php/5.4.nix | 4 ++--
 pkgs/development/interpreters/php/5.5.nix | 4 ++--
 pkgs/development/interpreters/php/5.6.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index c1ba35a9134..c9391a4e24f 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -1,6 +1,6 @@
 { callPackage, apacheHttpd }:
 callPackage ./generic.nix {
-  phpVersion = "5.4.42";
-  sha = "1yg03b6a88i7hg593m9zmmcm4kr59wdrhz9xk1frx9ps9gkb51b2";
+  phpVersion = "5.4.43";
+  sha = "0sydirpwg150wxsjrpp3m38564832wviglmsylhbbl8an17p5mr5";
   apacheHttpd = apacheHttpd;
 }
diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix
index 0d66e64693a..18dfde4ae67 100644
--- a/pkgs/development/interpreters/php/5.5.nix
+++ b/pkgs/development/interpreters/php/5.5.nix
@@ -1,6 +1,6 @@
 { callPackage, apacheHttpd  }:
 callPackage ./generic.nix {
-  phpVersion = "5.5.25";
-  sha = "0qrc4qll07hfs5a3l4ajrj7969w10d0n146zq1smdl6x4pkkgpv8";
+  phpVersion = "5.5.27";
+  sha = "0w0zgqria3i3mrp03p9m0613xlaj3vsw9girmslngjn06jjwdd64";
   apacheHttpd = apacheHttpd;
 }
diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix
index e05f1ae10bd..51ba06b2922 100644
--- a/pkgs/development/interpreters/php/5.6.nix
+++ b/pkgs/development/interpreters/php/5.6.nix
@@ -1,6 +1,6 @@
 { callPackage, apacheHttpd  }:
 callPackage ./generic.nix {
-  phpVersion = "5.6.10";
-  sha = "0iccgibmbc659z6dh6c58l1b7vnqly7al37fbs0l3si4qy0rqmqa";
+  phpVersion = "5.6.11";
+  sha = "0riq0c8s8anb1nxvn3ljs7wdn811903sv7kl8ir2ck3n2q42csxx";
   apacheHttpd = apacheHttpd;
 }

From 0c3e31a662c772210e4c341d45685adc1123e71b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 28 Jul 2015 13:11:25 +0200
Subject: [PATCH 0406/2016] vsftpd: 3.0.2 -> 3.0.3

Does not fix CVE-2015-1419; keep patch.
---
 pkgs/servers/ftp/vsftpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index f1ddf87e8c6..17c41a9a4d4 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, sslEnable ? false, libcap, pam }:
 
 stdenv.mkDerivation rec {
-  name = "vsftpd-3.0.2";
+  name = "vsftpd-3.0.3";
 
   src = fetchurl {
     url = "https://security.appspot.com/downloads/${name}.tar.gz";
-    sha256 = "0mjy345wszskz1vnk83360c1y37arwgap3gwz8hy13sjqpig0imy";
+    sha256 = "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx";
   };
 
   patches = [ ./CVE-2015-1419.patch ];

From f5ca543c465a39add8b7ab05773fbb3bdabf8295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Jul 2015 13:32:27 +0200
Subject: [PATCH 0407/2016] mariadb: disable parallel building

Discussed on:
    https://github.com/NixOS/nixpkgs/commit/01e37fe92dedabd
---
 pkgs/servers/sql/mariadb/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index c8e9831f703..e407ba92222 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
     "-DWITHOUT_TOKUDB=1"
   ];
 
-  enableParallelBuilding = true;
+  # fails to find lex_token.h sometimes
+  enableParallelBuilding = false;
 
   outputs = [ "out" "lib" ];
 

From 78309d98254990371e1c940d198a1afab90420c0 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Mon, 27 Jul 2015 11:31:47 +0800
Subject: [PATCH 0408/2016] facter: init at 3.0.2

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

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
new file mode 100644
index 00000000000..5a37262f818
--- /dev/null
+++ b/pkgs/tools/system/facter/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, boost, cmake, curl, libyamlcpp, openssl, utillinux }:
+
+stdenv.mkDerivation rec {
+  name = "facter-${version}";
+  version = "3.0.2";
+  src = fetchurl {
+    url = "https://downloads.puppetlabs.com/facter/${name}.tar.gz";
+    sha256 = "1myf1r827bh3n0snkzwj2jnc0sax9bq6z1vv9gr90rqr73lixvig";
+  };
+
+  libyamlcpp_ = libyamlcpp.override { makePIC = true; };
+
+  buildInputs = [ boost cmake curl libyamlcpp_ openssl utillinux ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/puppetlabs/facter;
+    description = "A system inventory tool";
+    license = licenses.asl20;
+    maintainers = [ maintainers.womfoo ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7f0f84fc38..11cbe70a8f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15143,4 +15143,6 @@ let
 
   udevil = callPackage ../applications/misc/udevil {};
 
+  facter = callPackage ../tools/system/facter {};
+
 }; in self; in pkgs

From c60e4016e725736c7499d35edac11d7a2df5d9b5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 15:23:08 +0300
Subject: [PATCH 0409/2016] libtirpc: fix missing symbols

---
 pkgs/development/libraries/ti-rpc/default.nix |  6 +-
 .../fix_missing_rpc_get_default_domain.patch  | 88 +++++++++++++++++++
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 26eb8f526c8..a4d210547fd 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libkrb5 }:
+{ fetchurl, stdenv, autoreconfHook, libkrb5 }:
 
 stdenv.mkDerivation rec {
   name = "libtirpc-0.3.2";
@@ -8,8 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "1z1z8xnlqgqznxzmyc6sypjc6b220xkv0s55hxd5sb3zydws6210";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
   propagatedBuildInputs = [ libkrb5 ];
 
+  # http://sourceforge.net/p/libtirpc/mailman/libtirpc-devel/thread/5581CB06.5020604%40email.com/#msg34216933
+  patches = [ ./fix_missing_rpc_get_default_domain.patch ];
+
   preConfigure = ''
     sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h
   '';
diff --git a/pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch b/pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch
new file mode 100644
index 00000000000..c905d3c0de8
--- /dev/null
+++ b/pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch
@@ -0,0 +1,88 @@
+diff -rNu3 libtirpc-0.3.2-old/src/Makefile.am libtirpc-0.3.2/src/Makefile.am
+--- libtirpc-0.3.2-old/src/Makefile.am	2015-07-28 15:17:49.248168000 +0300
++++ libtirpc-0.3.2/src/Makefile.am	2015-07-28 15:18:04.870144456 +0300
+@@ -69,7 +69,7 @@
+ endif
+ 
+ libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c
+-libtirpc_la_SOURCES += netname.c netnamer.c rtime.c
++libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c
+ 
+ CLEANFILES	       = cscope.* *~
+ DISTCLEANFILES	       = Makefile.in
+diff -rNu3 libtirpc-0.3.2-old/src/rpcdname.c libtirpc-0.3.2/src/rpcdname.c
+--- libtirpc-0.3.2-old/src/rpcdname.c	1970-01-01 03:00:00.000000000 +0300
++++ libtirpc-0.3.2/src/rpcdname.c	2015-07-28 15:18:04.870144456 +0300
+@@ -0,0 +1,72 @@
++/*
++ * Copyright (c) 2009, Sun Microsystems, Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ * - Redistributions of source code must retain the above copyright notice,
++ *   this list of conditions and the following disclaimer.
++ * - Redistributions in binary form must reproduce the above copyright notice,
++ *   this list of conditions and the following disclaimer in the documentation
++ *   and/or other materials provided with the distribution.
++ * - Neither the name of Sun Microsystems, Inc. nor the names of its
++ *   contributors may be used to endorse or promote products derived
++ *   from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGE.
++ */
++
++/*
++ * rpcdname.c
++ * Gets the default domain name
++ */
++
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++
++static char *default_domain = 0;
++
++static char *
++get_default_domain()
++{
++	char temp[256];
++
++	if (default_domain)
++		return (default_domain);
++	if (getdomainname(temp, sizeof(temp)) < 0)
++		return (0);
++	if ((int) strlen(temp) > 0) {
++		default_domain = (char *)malloc((strlen(temp)+(unsigned)1));
++		if (default_domain == 0)
++			return (0);
++		(void) strcpy(default_domain, temp);
++		return (default_domain);
++	}
++	return (0);
++}
++
++/*
++ * This is a wrapper for the system call getdomainname which returns a
++ * ypclnt.h error code in the failure case.  It also checks to see that
++ * the domain name is non-null, knowing that the null string is going to
++ * get rejected elsewhere in the NIS client package.
++ */
++int
++__rpc_get_default_domain(domain)
++	char **domain;
++{
++	if ((*domain = get_default_domain()) != 0)
++		return (0);
++	return (-1);
++}

From 0ca10a445a76e9e88818a986a0691b30b20aaada Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jul 2015 14:29:29 +0200
Subject: [PATCH 0410/2016] Fix indentation

---
 lib/modules.nix | 57 +++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 80268e51e11..959abf5e51e 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -281,38 +281,39 @@ rec {
         inherit isDefined files;
       };
 
-    # Merge definitions of a value of a given type
-    mergeDefinitions = loc: type: defs: rec {
-      defsFinal =
-        let
-          # Process mkMerge and mkIf properties
-          processIfAndMerge = defs: concatMap (m:
-            map (value: { inherit (m) file; inherit value; }) (dischargeProperties m.value)
-          ) defs;
+  # Merge definitions of a value of a given type.
+  mergeDefinitions = loc: type: defs: rec {
+    defsFinal =
+      let
+        # Process mkMerge and mkIf properties
+        processIfAndMerge = defs: concatMap (m:
+          map (value: { inherit (m) file; inherit value; }) (dischargeProperties m.value)
+        ) defs;
 
-          # Process mkOverride properties
-          processOverride = defs: filterOverrides defs;
+        # Process mkOverride properties
+        processOverride = defs: filterOverrides defs;
 
-          # Sort mkOrder properties
-          processOrder = defs:
-            # Avoid sorting if we don't have to.
-            if any (def: def.value._type or "" == "order") defs
-            then sortProperties defs
-            else defs;
-        in
-          processOrder (processOverride (processIfAndMerge defs));
+        # Sort mkOrder properties
+        processOrder = defs:
+          # Avoid sorting if we don't have to.
+          if any (def: def.value._type or "" == "order") defs
+          then sortProperties defs
+          else defs;
+      in
+        processOrder (processOverride (processIfAndMerge defs));
 
-        # Type-check the remaining definitions, and merge them.
-        mergedValue = foldl' (res: def:
-          if type.check def.value then res
-          else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.")
-          (type.merge loc defsFinal) defsFinal;
+    # Type-check the remaining definitions, and merge them.
+    mergedValue = foldl' (res: def:
+      if type.check def.value then res
+      else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.")
+      (type.merge loc defsFinal) defsFinal;
 
-        isDefined = defsFinal != [];
-        optionalValue =
-          if isDefined then { value = mergedValue; }
-          else {};
-    };
+    isDefined = defsFinal != [];
+
+    optionalValue =
+      if isDefined then { value = mergedValue; }
+      else {};
+  };
 
   /* Given a config set, expand mkMerge properties, and push down the
      other properties into the children.  The result is a list of

From 67b1a20f126fb61c43c3a37c2d908ef0302c6c58 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jul 2015 14:41:36 +0200
Subject: [PATCH 0411/2016] Minor module system evaluation speedups

This gives about a 5% speedup.

Issue #8152.
---
 lib/modules.nix | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 959abf5e51e..f64adaf1b19 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -264,43 +264,46 @@ rec {
       defs' = (optional (opt ? default)
         { file = head opt.declarations; value = mkOptionDefault opt.default; }) ++ defs;
 
-      # Handle properties, check types, and merge everything together
-      inherit (mergeDefinitions loc opt.type defs') isDefined defsFinal mergedValue;
-      files = map (def: def.file) defsFinal;
-      merged =
-        if isDefined then mergedValue
-        else throw "The option `${showOption loc}' is used but not defined.";
+      # Handle properties, check types, and merge everything together.
+      res = mergeDefinitions loc opt.type defs';
+
+      # Check whether the option is defined, and apply the ‘apply’
+      # function to the merged value.  This allows options to yield a
+      # value computed from the definitions.
+      value =
+        if !res.isDefined then
+          throw "The option `${showOption loc}' is used but not defined."
+        else if opt ? apply then
+          opt.apply res.mergedValue
+        else
+          res.mergedValue;
 
-      # Finally, apply the ‘apply’ function to the merged
-      # value.  This allows options to yield a value computed
-      # from the definitions.
-      value = (opt.apply or id) merged;
     in opt //
       { value = addErrorContext "while evaluating the option `${showOption loc}':" value;
         definitions = map (def: def.value) defsFinal;
-        inherit isDefined files;
+        files = map (def: def.file) res.defsFinal;
+        inherit (res) isDefined;
       };
 
   # Merge definitions of a value of a given type.
   mergeDefinitions = loc: type: defs: rec {
     defsFinal =
       let
-        # Process mkMerge and mkIf properties
-        processIfAndMerge = defs: concatMap (m:
+        # Process mkMerge and mkIf properties.
+        defs' = concatMap (m:
           map (value: { inherit (m) file; inherit value; }) (dischargeProperties m.value)
         ) defs;
 
-        # Process mkOverride properties
-        processOverride = defs: filterOverrides defs;
+        # Process mkOverride properties.
+        defs'' = filterOverrides defs';
 
-        # Sort mkOrder properties
-        processOrder = defs:
+        # Sort mkOrder properties.
+        defs''' =
           # Avoid sorting if we don't have to.
-          if any (def: def.value._type or "" == "order") defs
-          then sortProperties defs
-          else defs;
-      in
-        processOrder (processOverride (processIfAndMerge defs));
+          if any (def: def.value._type or "" == "order") defs''
+          then sortProperties defs''
+          else defs'';
+      in defs''';
 
     # Type-check the remaining definitions, and merge them.
     mergedValue = foldl' (res: def:

From 7c30ce95627d63efeca85c4c65aaaee1856b7887 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jul 2015 14:56:27 +0200
Subject: [PATCH 0412/2016] Remove zipTwoLists

This function is redundant (we also have zipLists).
---
 lib/lists.nix           | 14 --------------
 nixos/lib/build-vms.nix | 18 +++++++++---------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index fde6f5d42fc..7fc1924066b 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -209,20 +209,6 @@ rec {
   init = list: assert list != []; take (length list - 1) list;
 
 
-  # Zip two lists together.
-  zipTwoLists = xs: ys:
-    let
-      len1 = length xs;
-      len2 = length ys;
-      len = if len1 < len2 then len1 else len2;
-      zipTwoLists' = n:
-        if n != len then
-          [ { first = elemAt xs n; second = elemAt ys n; } ]
-          ++ zipTwoLists' (n + 1)
-        else [];
-    in zipTwoLists' 0;
-
-
   deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y;
 
   crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f];
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index d0c9e7c6d23..01d6b21bba9 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -41,22 +41,22 @@ rec {
 
       machines = attrNames nodes;
 
-      machinesNumbered = zipTwoLists machines (range 1 254);
+      machinesNumbered = zipLists machines (range 1 254);
 
-      nodes_ = flip map machinesNumbered (m: nameValuePair m.first
+      nodes_ = flip map machinesNumbered (m: nameValuePair m.fst
         [ ( { config, pkgs, nodes, ... }:
             let
-              interfacesNumbered = zipTwoLists config.virtualisation.vlans (range 1 255);
-              interfaces = flip map interfacesNumbered ({ first, second }:
-                nameValuePair "eth${toString second}" { ip4 =
-                  [ { address = "192.168.${toString first}.${toString m.second}";
+              interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255);
+              interfaces = flip map interfacesNumbered ({ fst, snd }:
+                nameValuePair "eth${toString snd}" { ip4 =
+                  [ { address = "192.168.${toString fst}.${toString m.snd}";
                       prefixLength = 24;
                   } ];
                 });
             in
             { key = "ip-address";
               config =
-                { networking.hostName = m.first;
+                { networking.hostName = m.fst;
 
                   networking.interfaces = listToAttrs interfaces;
 
@@ -76,11 +76,11 @@ rec {
 
                   virtualisation.qemu.options =
                     flip map interfacesNumbered
-                      ({ first, second }: qemuNICFlags second first m.second);
+                      ({ fst, snd }: qemuNICFlags snd fst m.snd);
                 };
             }
           )
-          (getAttr m.first nodes)
+          (getAttr m.fst nodes)
         ] );
 
     in listToAttrs nodes_;

From 9e0dcf3bd9fcfeed576132b9101b866aa3cb76ff Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 28 Jul 2015 15:22:40 +0200
Subject: [PATCH 0413/2016] libarchive: fix .la file

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

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 60777614881..2a3e740b2e7 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
     echo "#include <windows.h>" >> config.h
   '' else null;
 
+  preFixup = ''
+    sed 's|-lcrypto|-L${openssl}/lib -lcrypto|' -i $out/lib/libarchive.la
+  '';
+
   meta = {
     description = "Multi-format archive and compression library";
     longDescription = ''

From f3c1ad6baf23053f94dc9884a49c20703f7a38c9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 25 Jul 2015 19:38:45 +0200
Subject: [PATCH 0414/2016] texmacs: 1.0.7.11 -> 1.99.2

---
 pkgs/applications/editors/texmacs/default.nix | 16 +++++++++++-----
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index a258b634105..e415239d76f 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, guile, libX11, libXext, xmodmap, which, makeWrapper, freetype,
+{stdenv, fetchurl, guile_1_8, qt4, zlib, xmodmap, which, makeWrapper, freetype,
  tex ? null,
  aspell ? null,
  ghostscriptX ? null,
@@ -9,7 +9,7 @@
 
 let 
   pname = "TeXmacs";
-  version = "1.0.7.11";
+  version = "1.99.2";
   extraFontsSrc = fetchurl {
     url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";
     sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7";
@@ -39,11 +39,11 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "ftp://ftp.texmacs.org/pub/${pname}/targz/${name}-src.tar.gz";
-    sha256 = "0x1r9417dzbrxf785faq1vjszqdj94ig2lzwm8sd92bxcxr6knfa";
+    url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
+    sha256 = "0l48g9746igiaxw657shm8g3xxk565vzsviajlrxqyljbh6py0fs";
   };
 
-  buildInputs = [ guile libX11 libXext makeWrapper ghostscriptX freetype ];
+  buildInputs = [ guile_1_8 qt4 makeWrapper ghostscriptX freetype ];
 
   patchPhase = (if tex == null then ''
     gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -)
@@ -66,6 +66,12 @@ stdenv.mkDerivation rec {
         (if tex == null then "" else "${tex}/bin:") +
         "${xmodmap}/bin:${which}/bin";
 
+  postFixup = ''
+    bin="$out/libexec/TeXmacs/bin/texmacs.bin"
+    rpath=$(patchelf --print-rpath "$bin")
+    patchelf --set-rpath "$rpath:${zlib}/lib" "$bin"
+  '';
+
   meta = {
     description = "WYSIWYW editing platform with special features for scientists";
     longDescription =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7f0f84fc38..4ee9b73e546 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3109,7 +3109,6 @@ let
   texmacs = callPackage ../applications/editors/texmacs {
     tex = texLive; /* tetex is also an option */
     extraFonts = true;
-    guile = guile_1_8;
   };
 
   texmaker = callPackage ../applications/editors/texmaker { };

From 7c36b4611d54453c5cdae3baffbe87d85a858aec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Jul 2015 16:39:36 +0200
Subject: [PATCH 0415/2016] gnome3.adwaita-icon-theme: remove empty dir tree

Also similar for old gnome2 icon theme.
/cc maintainer @lethalman.
---
 pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix   | 3 +++
 .../gnome-3/3.16/core/adwaita-icon-theme/default.nix         | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
index 315f6ff9c5a..dd7e269f94e 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
 
+  # remove a tree of dirs with no files within
+  postInstall = '' rm -r "$out/share/locale" '';
+
   meta = {
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
index a445ff73608..eb210f1bb5b 100644
--- a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
@@ -13,9 +13,12 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ hicolor_icon_theme ];
 
   buildInputs = [ gdk_pixbuf librsvg ];
-  
+
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
 
+  # remove a tree of dirs with no files within
+  postInstall = '' rm -r "$out/locale" '';
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = [ maintainers.lethalman ];

From dbe12b643fd32b4c9a0ca96bbd652d515c9b2df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Jul 2015 17:04:34 +0200
Subject: [PATCH 0416/2016] nixos/xfce: replace old gnome2 icons by gnome3

---
 nixos/modules/services/x11/desktop-managers/xfce.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index fce5bf11f05..88eefa13de3 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -62,7 +62,7 @@ in
         pkgs.xfce.xfwm4
         # This supplies some "abstract" icons such as
         # "utilities-terminal" and "accessories-text-editor".
-        pkgs.gnome.gnomeicontheme
+        pkgs.gnome3.defaultIconTheme
         pkgs.desktop_file_utils
         pkgs.xfce.libxfce4ui
         pkgs.xfce.garcon

From 679a941f2633bdf3f98a3deb9f1120906f5e2df7 Mon Sep 17 00:00:00 2001
From: Matthias Herrmann <matthias.mh.herrmann@gmail.com>
Date: Sat, 18 Jul 2015 14:48:09 +0200
Subject: [PATCH 0417/2016] synapse: init at 0.2.99.1

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0c76df9c044..864859be7b2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -147,6 +147,7 @@
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
   magnetophon = "Bart Brouns <bart@magnetophon.nl>";
+  mahe = "Matthias Herrmann <matthias.mh.herrmann@gmail.com>";
   malyn = "Michael Alyn Miller <malyn@strangeGizmo.com>";
   manveru = "Michael Fellinger <m.fellinger@gmail.com>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
new file mode 100644
index 00000000000..8086e8ca56d
--- /dev/null
+++ b/pkgs/applications/misc/synapse/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee
+, keybinder3, json_glib, zeitgeist, vala
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "synapse-0.2.99.1";
+
+  src = fetchurl {
+    url = "https://launchpad.net/synapse-project/0.3/0.2.99.1/+download/${name}.tar.xz";
+    sha256 = "846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220";
+  };
+
+  buildInputs = [
+    intltool pkgconfig glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist 
+    vala
+  ];
+
+  meta = { 
+      longDescription = ''
+        Semantic launcher written in Vala that you can use to start applications 
+        as well as find and access relevant documents and files by making use of 
+        the Zeitgeist engine
+      '';
+      description = ''
+        Semantic launcher to start applications and find relevant files
+      '';
+      homepage = https://launchpad.net/synapse-project;
+      license = stdenv.lib.licenses.gpl3;
+      maintainers = with stdenv.lib.maintainers; mahe;
+      platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa4a59e54f7..10d57472b63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12161,6 +12161,10 @@ let
     ruby = ruby_1_9_3.override { cursesSupport = true; };
   };
 
+  synapse = callPackage ../applications/misc/synapse {
+    inherit (gnome3) libgee;
+  };
+
   synfigstudio = callPackage ../applications/graphics/synfigstudio {
     fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
   };

From 4f320818e245801d57efb53c3df0d122c5b9fb7a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 28 Jul 2015 17:57:02 +0200
Subject: [PATCH 0418/2016] dmtx-utils: depend on imagemagick (ZHF)

---
 pkgs/tools/graphics/dmtx-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix
index 0fe473f5d63..3e4e3e9312e 100644
--- a/pkgs/tools/graphics/dmtx-utils/default.nix
+++ b/pkgs/tools/graphics/dmtx-utils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libdmtx, pkgconfig}:
+{stdenv, fetchurl, libdmtx, pkgconfig, imagemagick}:
 let
   s = # Generated upstream information
   rec {
@@ -10,7 +10,7 @@ let
     sha256="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417";
   };
   buildInputs = [
-    libdmtx pkgconfig
+    libdmtx pkgconfig imagemagick
   ];
 in
 stdenv.mkDerivation {

From 5b9554a4e65acc8f64f1ae0786274fd048319075 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 28 Jul 2015 17:59:56 +0200
Subject: [PATCH 0419/2016] riak2: does not build on i686 (ZHF)

---
 pkgs/servers/nosql/riak/2.1.1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/nosql/riak/2.1.1.nix b/pkgs/servers/nosql/riak/2.1.1.nix
index ce160312dbb..74cf03a1ca8 100644
--- a/pkgs/servers/nosql/riak/2.1.1.nix
+++ b/pkgs/servers/nosql/riak/2.1.1.nix
@@ -89,6 +89,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     maintainers = with maintainers; [ cstrahan ];
     description = "Dynamo inspired NoSQL DB by Basho";
-    platforms   = platforms.linux;
+    platforms   = [ "x86_64-linux" ];
   };
 }

From 6525b63870be6b5ec35f2ee5aaabc15470dadda8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 28 Jul 2015 18:10:59 +0200
Subject: [PATCH 0420/2016] postgresql90: create doc directory (ZHF)

---
 pkgs/servers/sql/postgresql/9.0.x.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index 4249b40c5c4..7b4d7a2e617 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./less-is-more.patch ];
 
+  postInstall = ''mkdir -p $doc'';
+
   passthru = {
     inherit readline;
     psqlSchema = "9.0";

From 13a1d3bb22929a524972a2881b87f3e5405872f1 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 28 Jul 2015 18:11:05 +0200
Subject: [PATCH 0421/2016] postgresql91: create doc directory (ZHF)

---
 pkgs/servers/sql/postgresql/9.1.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 09f468b50bb..df691c9152a 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
     ''
       mkdir -p $out/share/man
       cp -rvd doc/src/sgml/man1 $out/share/man
+      mkdir -p $doc
     '';
 
   passthru = {

From 273d9ffd6a6a6f64255eadafef8e91216c1193b8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jul 2015 15:35:45 +0200
Subject: [PATCH 0422/2016] Remove superfluous copy of "min"

---
 lib/modules.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index f64adaf1b19..d7037abfbef 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -387,7 +387,6 @@ rec {
     let
       defaultPrio = 100;
       getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPrio;
-      min = x: y: if x < y then x else y;
       highestPrio = foldl' (prio: def: min (getPrio def) prio) 9999 defs;
       strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def;
     in concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs;

From 5976d393fb92b0151fb1b56f6bc76490bc7ea4bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jul 2015 17:31:43 +0200
Subject: [PATCH 0423/2016] Use builtins.genList

This fixes the quadratic complexity of functions like imap.
---
 lib/lists.nix | 139 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 90 insertions(+), 49 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 7fc1924066b..76e03ce46db 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -4,7 +4,7 @@ with import ./trivial.nix;
 
 rec {
 
-  inherit (builtins) head tail length isList elemAt concatLists filter elem;
+  inherit (builtins) head tail length isList elemAt concatLists filter elem genList;
 
 
   # Create a list consisting of a single element.  `singleton x' is
@@ -42,16 +42,20 @@ rec {
   foldl' = builtins.foldl' or foldl;
 
 
-  # map with index: `imap (i: v: "${v}-${toString i}") ["a" "b"] ==
-  # ["a-1" "b-2"]'
-  imap = f: list:
-    let
-      len = length list;
-      imap' = n:
-        if n == len
-          then []
-          else [ (f (n + 1) (elemAt list n)) ] ++ imap' (n + 1);
-    in imap' 0;
+  # Map with index: `imap (i: v: "${v}-${toString i}") ["a" "b"] ==
+  # ["a-1" "b-2"]'. FIXME: why does this start to count at 1?
+  imap =
+    if builtins ? genList then
+      f: list: genList (n: f (n + 1) (elemAt list n)) (length list)
+    else
+      f: list:
+      let
+        len = length list;
+        imap' = n:
+          if n == len
+            then []
+            else [ (f (n + 1) (elemAt list n)) ] ++ imap' (n + 1);
+      in imap' 0;
 
 
   # Map and concatenate the result.
@@ -120,10 +124,17 @@ rec {
 
 
   # Return a list of integers from `first' up to and including `last'.
-  range = first: last:
-    if last < first
-    then []
-    else [first] ++ range (first + 1) last;
+  range =
+    if builtins ? genList then
+      first: last:
+        if first > last
+        then []
+        else genList (n: first + n) (last - first + 1)
+    else
+      first: last:
+        if last < first
+        then []
+        else [first] ++ range (first + 1) last;
 
 
   # Partition the elements of a list in two lists, `right' and
@@ -136,23 +147,29 @@ rec {
     ) { right = []; wrong = []; };
 
 
-  zipListsWith = f: fst: snd:
-    let
-      len1 = length fst;
-      len2 = length snd;
-      len = if len1 < len2 then len1 else len2;
-      zipListsWith' = n:
-        if n != len then
-          [ (f (elemAt fst n) (elemAt snd n)) ]
-          ++ zipListsWith' (n + 1)
-        else [];
-    in zipListsWith' 0;
+  zipListsWith =
+    if builtins ? genList then
+      f: fst: snd: genList (n: f (elemAt fst n) (elemAt snd n)) (min (length fst) (length snd))
+    else
+      f: fst: snd:
+      let
+        len = min (length fst) (length snd);
+        zipListsWith' = n:
+          if n != len then
+            [ (f (elemAt fst n) (elemAt snd n)) ]
+            ++ zipListsWith' (n + 1)
+          else [];
+      in zipListsWith' 0;
 
   zipLists = zipListsWith (fst: snd: { inherit fst snd; });
 
 
-  # Reverse the order of the elements of a list.  FIXME: O(n^2)!
-  reverseList = fold (e: acc: acc ++ [ e ]) [];
+  # Reverse the order of the elements of a list.
+  reverseList =
+    if builtins ? genList then
+      xs: let l = length xs; in genList (n: elemAt xs (l - n - 1)) l
+    else
+      fold (e: acc: acc ++ [ e ]) [];
 
 
   # Sort a list based on a comparator function which compares two
@@ -177,27 +194,46 @@ rec {
 
 
   # Return the first (at most) N elements of a list.
-  take = count: list:
-    let
-      len = length list;
-      take' = n:
-        if n == len || n == count
-          then []
-        else
-          [ (elemAt list n) ] ++ take' (n + 1);
-    in take' 0;
+  take =
+    if builtins ? genList then
+      count: sublist 0 count
+    else
+      count: list:
+        let
+          len = length list;
+          take' = n:
+            if n == len || n == count
+              then []
+            else
+              [ (elemAt list n) ] ++ take' (n + 1);
+        in take' 0;
 
 
   # Remove the first (at most) N elements of a list.
-  drop = count: list:
-    let
-      len = length list;
-      drop' = n:
-        if n == -1 || n < count
-          then []
-        else
-          drop' (n - 1) ++ [ (elemAt list n) ];
-    in drop' (len - 1);
+  drop =
+    if builtins ? genList then
+      count: list: sublist count (length list) list
+    else
+      count: list:
+        let
+          len = length list;
+          drop' = n:
+            if n == -1 || n < count
+              then []
+            else
+              drop' (n - 1) ++ [ (elemAt list n) ];
+        in drop' (len - 1);
+
+
+  # Return a list consisting of at most ‘count’ elements of ‘list’,
+  # starting at index ‘start’.
+  sublist = start: count: list:
+    let len = length list; in
+    genList
+      (n: elemAt list (n + start))
+      (if start >= len then 0
+       else if start + count > len then len - start
+       else count);
 
 
   # Return the last element of a list.
@@ -211,9 +247,11 @@ rec {
 
   deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y;
 
+
   crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f];
 
-  # Remove duplicate elements from the list
+
+  # Remove duplicate elements from the list. O(n^2) complexity.
   unique = list:
     if list == [] then
       []
@@ -223,9 +261,12 @@ rec {
         xs = unique (drop 1 list);
       in [x] ++ remove x xs;
 
-  # Intersects list 'e' and another list
+
+  # Intersects list 'e' and another list. O(nm) complexity.
   intersectLists = e: filter (x: elem x e);
 
-  # Subtracts list 'e' from another list
+
+  # Subtracts list 'e' from another list. O(nm) complexity.
   subtractLists = e: filter (x: !(elem x e));
+
 }

From 395fdaef6c9efb7141ddd87ac1be02e6650e3a10 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jul 2015 18:42:04 +0200
Subject: [PATCH 0424/2016] Use builtins.sort

---
 lib/lists.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 76e03ce46db..3bcf366f0c2 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -176,7 +176,8 @@ rec {
   # elements and returns true if the first argument is strictly below
   # the second argument.  The returned list is sorted in an increasing
   # order.  The implementation does a quick-sort.
-  sort = strictLess: list:
+  sort = builtins.sort or (
+    strictLess: list:
     let
       len = length list;
       first = head list;
@@ -190,7 +191,7 @@ rec {
       pivot = pivot' 1 { left = []; right = []; };
     in
       if len < 2 then list
-      else (sort strictLess pivot.left) ++  [ first ] ++  (sort strictLess pivot.right);
+      else (sort strictLess pivot.left) ++  [ first ] ++  (sort strictLess pivot.right));
 
 
   # Return the first (at most) N elements of a list.

From 2600e00ca92d31201124cdc105feae4535f167f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Jul 2015 19:13:50 +0200
Subject: [PATCH 0425/2016] xorg.xproto: maintenance update

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 12aeb67d416..f9ea1fb4a29 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2115,11 +2115,11 @@ let
   }) // {inherit libX11 xproto ;};
 
   xproto = (mkDerivation "xproto" {
-    name = "xproto-7.0.27";
+    name = "xproto-7.0.28";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/xproto-7.0.27.tar.bz2;
-      sha256 = "030ix881p0crnd4bc01nz6cs0afmfv6ivsyyhf0h1j1mnak26vr4";
+      url = mirror://xorg/individual/proto/xproto-7.0.28.tar.bz2;
+      sha256 = "1jpnvm33vi2dar5y5zgz7jjh0m8fpkcxm0f0lbwfx37ns5l5bs19";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 7522743310a..3ab0a599ec3 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -183,7 +183,7 @@ mirror://xorg/individual/xserver/xorg-server-1.17.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2
-mirror://xorg/individual/proto/xproto-7.0.27.tar.bz2
+mirror://xorg/individual/proto/xproto-7.0.28.tar.bz2
 mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2
 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2
 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2

From cf5f43162b5a17734fb8d9ba5e0da05222a7513c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Jul 2015 19:16:19 +0200
Subject: [PATCH 0426/2016] mesa: maintenance update

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index c30ef49268f..a457807aa9f 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -22,7 +22,7 @@ else
 */
 
 let
-  version = "10.6.2";
+  version = "10.6.3";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "05753d3db4212900927b9894221a1669a10f56786e86a7e818b6e18a0817dca9";
+    sha256 = "58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d";
   };
 
   prePatch = "patchShebangs .";

From 24868463bad2197781367db08d486efe612d0854 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Tue, 28 Jul 2015 12:44:59 -0500
Subject: [PATCH 0427/2016] pandas: 0.16.1 -> 0.16.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25e6a22aa61..1cd9eafec5b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8734,11 +8734,11 @@ let
   };
 
   pandas = buildPythonPackage rec {
-    name = "pandas-0.16.1";
+    name = "pandas-0.16.2";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz";
-      sha256 = "1dpq5p4iym7y13wkrm0hma87rvvv5rfj5fb10iwbys5hihzj83ap";
+      sha256 = "10agmrkps8bi5948vwpipfxds5kj1d076m9i0nhaxwqiw7gm6670";
     };
 
     buildInputs = [ self.nose ];

From 3c6c6c19f22092d3fbe7d871964abdd95522968f Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Mon, 27 Jul 2015 11:42:41 -0500
Subject: [PATCH 0428/2016] freetds: fix broken url (close #9031)

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

diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index 11d10e73cdd..695abcfbba2 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -4,11 +4,11 @@
 assert odbcSupport -> unixODBC != null;
 
 stdenv.mkDerivation rec {
-  name = "freetds-0.91.112";
+  name = "freetds-0.91";
 
   src = fetchurl {
-    url = "ftp://ftp.astron.com/pub/freetds/stable/${name}.tar.gz";
-    sha256 = "be4f04ee57328c32e7e7cd7e2e1483e535071cec6101e46b9dd15b857c5078ed";
+    url = "http://mirrors.ibiblio.org/freetds/stable/${name}.tar.gz";
+    sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba";
   };
 
   buildInputs = stdenv.lib.optional odbcSupport [ unixODBC ];
@@ -30,4 +30,3 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.all;
   };
 }
-

From 3715c2e08906192c2d515a7180a5206f5a6bf090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 28 Jul 2015 20:52:36 +0200
Subject: [PATCH 0429/2016] eclipses: add eclipse-cpp-4.5 (Mars release)

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

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index d2e6116fec7..8b940bbd984 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -225,6 +225,22 @@ in {
         };
   };
 
+  eclipse_cpp_45 = buildEclipse {
+    name = "eclipse-cpp-4.5";
+    description = "Eclipse IDE for C/C++ Developers, Mars release";
+    src =
+      if stdenv.system == "x86_64-linux" then
+        fetchurl {
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/R/eclipse-cpp-mars-R-linux-gtk-x86_64.tar.gz;
+          sha1 = "11f9583e23ae68eb675107e6c9acc48e0a2520ae";
+        }
+      else if stdenv.system == "i686-linux" then
+        fetchurl {
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/R/eclipse-cpp-mars-R-linux-gtk.tar.gz;
+          sha1 = "45dddb8c8f2ec79b7e25cc13d93785863ffe4791";
+        }
+      else throw "Unsupported system: ${stdenv.system}";
+  };
 
   eclipse_sdk_421 = buildEclipse {
     name = "eclipse-sdk-4.2.1";

From a20470ee33723caa5984e6fe120a3587c81794ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 29 Jan 2015 21:05:57 +0100
Subject: [PATCH 0430/2016] hamster-time-tracker: init at 1.04

https://projecthamster.wordpress.com/

Note that because it is invoked via dbus, you have to properly install
it and logout/login for the thing to work (you cannot run it directly
from the nix store).
---
 .../misc/hamster-time-tracker/default.nix     | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/misc/hamster-time-tracker/default.nix

diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
new file mode 100644
index 00000000000..3a94456e6cc
--- /dev/null
+++ b/pkgs/applications/misc/hamster-time-tracker/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchzip, buildPythonPackage, docbook2x, libxslt, gnome_doc_utils
+, intltool, dbus_glib, pygobject, pygtk, pyxdg, gnome_python, dbus, sqlite3
+}:
+
+# TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes
+# this message:
+#
+#   WARNING:root:Could not import wnck - workspace tracking will be disabled
+
+buildPythonPackage rec {
+  name = "hamster-time-tracker-1.04";
+  namePrefix = "";
+
+  src = fetchzip {
+    name = "${name}-src";
+    url = "https://github.com/projecthamster/hamster/archive/${name}.tar.gz";
+    sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g";
+  };
+
+  buildInputs = [ docbook2x libxslt gnome_doc_utils intltool dbus_glib ];
+
+  propagatedBuildInputs = [ pygobject pygtk pyxdg gnome_python dbus sqlite3 ];
+
+  configurePhase = ''
+    python waf configure --prefix="$out"
+  '';
+  
+  buildPhase = ''
+    python waf build
+  '';
+
+  installPhase = ''
+    python waf install
+  '';
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Time tracking application";
+    homepage = https://projecthamster.wordpress.com/;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e2de40501c..b8a389aa70f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11624,6 +11624,11 @@ let
 
   hackrf = callPackage ../applications/misc/hackrf { };
 
+  hamster-time-tracker = callPackage ../applications/misc/hamster-time-tracker {
+    inherit (pythonPackages) pyxdg pygtk dbus sqlite3;
+    inherit (gnome) gnome_python;
+  };
+
   hello = callPackage ../applications/misc/hello/ex-2 { };
 
   helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };

From 78e6b78bc63d49cb4b8e9a55ad6edec836d5a63a Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 28 Jul 2015 12:24:07 -0700
Subject: [PATCH 0431/2016] fix source hashes for cabal2nix and bundler

---
 pkgs/development/interpreters/ruby/bundler-head.nix  | 2 +-
 pkgs/development/tools/haskell/cabal2nix/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
index 2087485e3ef..0595e9348c7 100644
--- a/pkgs/development/interpreters/ruby/bundler-head.nix
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -5,7 +5,7 @@ buildRubyGem {
   src = fetchgit {
     url = "https://github.com/bundler/bundler.git";
     rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
-    sha256 = "1vzm21fc37w89psxfk2fzi64zyb3gyhzr9smd6jk2r2kvgp6d38b";
+    sha256 = "1mvyy6ic41m4f56n1026pz9igbryq11mkj3b4hyr0v1siv4r95c4";
     leaveDotGit = true;
   };
   dontPatchShebangs = true;
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 3da457bdf76..378e250eb2f 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
     rev = "513a5fce6cfabe0b062424f6deb191a12f7e2187";
-    sha256 = "1j4x85cqj823d9swi473b4i9rz9wlm9m7c1il73h02dq5i67wida";
+    sha256 = "1rsnzgfzw6zrjwwr3a4qbhw4l07pqi9ddm2p9l3sw3agzwmc7z49";
     deepClone = true;
   };
   isExecutable = true;

From 76dd430cd87c1fe9d859843c5d228abbdc7923bb Mon Sep 17 00:00:00 2001
From: Philip Potter <philip.g.potter@gmail.com>
Date: Sun, 26 Jul 2015 21:45:32 +0100
Subject: [PATCH 0432/2016] bazel: fix build, make compatible with openjdk

Bazel 981b7bc1 depends on protobuf-2.5 and won't work with 2.6 (and in
bbe84fe3d upgraded straight to protobuf 3.0.0-alpha3); this commit fixes
the dependency to depend on protobuf2_5 specifically.

The bazel compile.sh needs `which` on the PATH; so this commit adds that
as a dependency.

Setting JAVA_HOME to ${jdk} broke bazel when used with openjdk, with the
message:

    Problem with java installation: couldn't find/access rt.jar in /nix/store/z9vc0vzyzhnpl5l5inmqdnvdnbxmmmg7-openjdk-8u60b24

This is because if you set JAVA_HOME, bazel will look for rt.jar in
$JAVA_HOME/lib and $JAVA_HOME/jre/lib, but the nixpkgs openjdk
distribution puts rt.jar in ${jdk}/lib/openjdk/jre/lib for some reason.

To fix this, this commit uses the ${jdk.home} passthru value to use the
appropriate JAVA_HOME for the given jdk.

As bazel now works with openjdk, and openjdk is free while oraclejdk is
not, this commit changes the default jdk for bazel to openjdk.

Since this package didn't have a listed maintainer, I'm claiming it.
---
 pkgs/development/tools/build-managers/bazel/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index e9ddc17bb02..ff23390d79c 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf, pkgconfig, libarchive, unzip, makeWrapper }:
+{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf2_5, pkgconfig, libarchive, unzip, which, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "bazel-20150326.981b7bc1";
@@ -10,19 +10,20 @@ stdenv.mkDerivation rec {
     sha256 = "0i9gxgqhfmix7hmkb15s7h9f8ssln08pixqm26pd1d20g0kfyxj7";
   };
 
-  buildInputs = [ pkgconfig protobuf zlib zip jdk libarchive unzip makeWrapper ];
+  buildInputs = [ pkgconfig protobuf2_5 zlib zip jdk libarchive unzip which makeWrapper ];
 
   installPhase = ''
     PROTOC=protoc bash compile.sh
     mkdir -p $out/bin $out/share
     cp -R output $out/share/bazel
     ln -s $out/share/bazel/bazel $out/bin/bazel
-    wrapProgram $out/bin/bazel --set JAVA_HOME "${jdk}"
+    wrapProgram $out/bin/bazel --set JAVA_HOME "${jdk.home}"
   '';
 
   meta = {
     homepage = http://github.com/google/bazel/;
     description = "Build tool that builds code quickly and reliably";
     license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.philandstuff ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8a389aa70f..13d0e4dddbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5283,7 +5283,7 @@ let
 
   bam = callPackage ../development/tools/build-managers/bam {};
 
-  bazel = callPackage ../development/tools/build-managers/bazel { jdk = oraclejdk8; };
+  bazel = callPackage ../development/tools/build-managers/bazel { jdk = openjdk8; };
 
   bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { };
 

From 2bc305c1c64bea1def647bad27c00391539f11ba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jul 2015 20:29:36 +0200
Subject: [PATCH 0433/2016] postgresql: Prevent runtime dependency on
 gcc-wrapper

---
 pkgs/servers/sql/postgresql/9.4.x.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix
index d09a6528222..0309b9b5435 100644
--- a/pkgs/servers/sql/postgresql/9.4.x.nix
+++ b/pkgs/servers/sql/postgresql/9.4.x.nix
@@ -31,6 +31,14 @@ stdenv.mkDerivation rec {
 
   LC_ALL = "C";
 
+  postInstall =
+    ''
+      # Prevent a retained dependency on gcc-wrapper.
+      substituteInPlace $out/lib/pgxs/src/Makefile.global --replace ${stdenv.cc}/bin/ld ld
+    '';
+
+  disallowedReferences = [ stdenv.cc ];
+
   passthru = {
     inherit readline;
     psqlSchema = "9.4";

From 314e8e49ecbfd4136463eff782190035d1b07365 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jul 2015 21:23:24 +0200
Subject: [PATCH 0434/2016] Remove deepOverride
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's unused, and also a bad idea: because it recursively recomputes
every function argument and there is no sharing, you can get an
exponential (?) blowup in evaluation time. For example, evaluating
‘linuxPackages.kernel’ takes 0.09s and ~13 MiB, but evaluating
‘linuxPackages.kernel.deepOverride {}’ takes 3.6s and ~305 MiB.
---
 lib/customisation.nix | 12 ------------
 lib/deprecated.nix    |  1 -
 2 files changed, 13 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 91a25055df2..b3c73c39be4 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -49,10 +49,6 @@ rec {
        else { }));
 
 
-  # usage: (you can use override multiple times)
-  # let d = makeOverridable stdenv.mkDerivation { name = ..; buildInputs; }
-  #     noBuildInputs = d.override { buildInputs = []; }
-  #     additionalBuildInputs = d.override ( args : args // { buildInputs = args.buildInputs ++ [ additional ]; } )
   makeOverridable = f: origArgs:
     let
       ff = f origArgs;
@@ -60,24 +56,16 @@ rec {
     in
       if builtins.isAttrs ff then (ff //
         { override = newArgs: makeOverridable f (overrideWith newArgs);
-          deepOverride = newArgs:
-            makeOverridable f (lib.overrideExisting (lib.mapAttrs (deepOverrider newArgs) origArgs) newArgs);
           overrideDerivation = fdrv:
             makeOverridable (args: overrideDerivation (f args) fdrv) origArgs;
         })
       else if builtins.isFunction ff then
         { override = newArgs: makeOverridable f (overrideWith newArgs);
           __functor = self: ff;
-          deepOverride = throw "deepOverride not yet supported for functors";
           overrideDerivation = throw "overrideDerivation not yet supported for functors";
         }
       else ff;
 
-  deepOverrider = newArgs: name: x: if builtins.isAttrs x then (
-    if x ? deepOverride then (x.deepOverride newArgs) else
-    if x ? override then (x.override newArgs) else
-    x) else x;
-
 
   /* Call the package function in the file `fn' with the required
     arguments automatically.  The function is called with the
diff --git a/lib/deprecated.nix b/lib/deprecated.nix
index 54c253f2c34..3646f9e032a 100644
--- a/lib/deprecated.nix
+++ b/lib/deprecated.nix
@@ -29,7 +29,6 @@ rec {
                           } ));
 	withStdOverrides = base // {
 	   override = base.passthru.function;
-	   deepOverride = a : (base.passthru.function ((lib.mapAttrs (lib.deepOverrider a) base.passthru.args) // a));
 	   } ;
         in
 	withStdOverrides;

From b89b6b2a7b397a087149f01a9fd27876edfc6986 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jul 2015 21:35:17 +0200
Subject: [PATCH 0435/2016] Add function callPackagesWith

This is like callPackageWith, except that it expects the supplied
function to return a *set* of packages. It will then make the
individual packages overridable.
---
 lib/customisation.nix           | 22 ++++++++++++++++++++--
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index b3c73c39be4..eaec46276b2 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -1,6 +1,8 @@
 let
+
   lib = import ./default.nix;
   inherit (builtins) attrNames isFunction;
+
 in
 
 rec {
@@ -90,12 +92,28 @@ rec {
   */
   callPackageWith = autoArgs: fn: args:
     let
-      f    = if builtins.isFunction fn then fn else import fn;
+      f = if builtins.isFunction fn then fn else import fn;
       auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs;
     in makeOverridable f (auto // args);
 
 
-  /* Add attributes to each output of a derivation without changing the derivation itself */
+  /* Like callPackage, but for a function that returns an attribute
+     set of derivations. The override function is added to the
+     individual attributes. */
+  callPackagesWith = autoArgs: fn: args:
+    let
+      f = if builtins.isFunction fn then fn else import fn;
+      auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs;
+      finalArgs = auto // args;
+      pkgs = f finalArgs;
+      mkAttrOverridable = name: pkg: pkg // {
+        override = newArgs: mkAttrOverridable name (f (finalArgs // newArgs)).${name};
+      };
+    in lib.mapAttrs mkAttrOverridable pkgs;
+
+
+  /* Add attributes to each output of a derivation without changing
+     the derivation itself. */
   addPassthru = drv: passthru:
     let
       outputs = drv.outputs or [ "out" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8a389aa70f..db99800a8da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -141,6 +141,8 @@ let
   # below).
   callPackage = newScope {};
 
+  callPackages = lib.callPackagesWith defaultScope;
+
   newScope = extra: lib.callPackageWith (defaultScope // extra);
 
   # Easily override this package set.

From 0770a49d8ca9f4639a394eb2bfd302b4d5ee981e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jul 2015 21:37:27 +0200
Subject: [PATCH 0436/2016] Unify the PostgreSQL expressions again

---
 pkgs/servers/sql/postgresql/9.0.x.nix   | 38 -----------
 pkgs/servers/sql/postgresql/9.1.x.nix   | 45 ------------
 pkgs/servers/sql/postgresql/9.2.x.nix   | 42 ------------
 pkgs/servers/sql/postgresql/9.3.x.nix   | 46 -------------
 pkgs/servers/sql/postgresql/9.4.x.nix   | 55 ---------------
 pkgs/servers/sql/postgresql/default.nix | 91 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         | 15 ++--
 7 files changed, 97 insertions(+), 235 deletions(-)
 delete mode 100644 pkgs/servers/sql/postgresql/9.0.x.nix
 delete mode 100644 pkgs/servers/sql/postgresql/9.1.x.nix
 delete mode 100644 pkgs/servers/sql/postgresql/9.2.x.nix
 delete mode 100644 pkgs/servers/sql/postgresql/9.3.x.nix
 delete mode 100644 pkgs/servers/sql/postgresql/9.4.x.nix
 create mode 100644 pkgs/servers/sql/postgresql/default.nix

diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
deleted file mode 100644
index 7b4d7a2e617..00000000000
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, zlib, readline, openssl }:
-
-let version = "9.0.22"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
-
-  src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "19gq6axjhvlr5zlrzwnll1fbrvai4xh0nb1jki6gmmschl6v5m4l";
-  };
-
-  outputs = [ "out" "doc" ];
-
-  buildInputs = [ zlib readline openssl ];
-
-  LC_ALL = "C";
-
-  configureFlags = [ "--with-openssl" ];
-
-  patches = [ ./less-is-more.patch ];
-
-  postInstall = ''mkdir -p $doc'';
-
-  passthru = {
-    inherit readline;
-    psqlSchema = "9.0";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = http://www.postgresql.org/;
-    description = "A powerful, open source object-relational database system";
-    license = licenses.postgresql;
-    maintainers = [ maintainers.ocharles ];
-    platforms = platforms.unix;
-    hydraPlatforms = platforms.linux;
-  };
-}
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
deleted file mode 100644
index df691c9152a..00000000000
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, zlib, readline, openssl }:
-
-let version = "9.1.18"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
-
-  src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "1a44hmcvfaa8j169ladsibmvjakw6maaxqkzz1ab8139cqkda9i7";
-  };
-
-  outputs = [ "out" "doc" ];
-
-  buildInputs = [ zlib readline openssl ];
-
-  enableParallelBuilding = true;
-
-  LC_ALL = "C";
-
-  configureFlags = [ "--with-openssl" ];
-
-  patches = [ ./less-is-more.patch ];
-
-  postInstall =
-    ''
-      mkdir -p $out/share/man
-      cp -rvd doc/src/sgml/man1 $out/share/man
-      mkdir -p $doc
-    '';
-
-  passthru = {
-    inherit readline;
-    psqlSchema = "9.1";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = http://www.postgresql.org/;
-    description = "A powerful, open source object-relational database system";
-    license = licenses.postgresql;
-    maintainers = [ maintainers.ocharles ];
-    platforms = platforms.unix;
-    hydraPlatforms = platforms.linux;
-  };
-}
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
deleted file mode 100644
index 6b0792f50cd..00000000000
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, zlib, readline, openssl }:
-
-let version = "9.2.13"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
-
-  src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0i3avdr8mnvn6ldkx0hc4jmclhisb2338hzs0j2m03wck8hddjsx";
-  };
-
-  outputs = [ "out" "doc" ];
-
-  buildInputs = [ zlib readline openssl ];
-
-  enableParallelBuilding = true;
-
-  makeFlags = [ "world" ];
-
-  configureFlags = stdenv.lib.optionals (!stdenv.isCygwin) [ "--with-openssl" ];
-
-  patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
-
-  installTargets = [ "install-world" ];
-
-  LC_ALL = "C";
-
-  passthru = {
-    inherit readline;
-    psqlSchema = "9.2";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = http://www.postgresql.org/;
-    description = "A powerful, open source object-relational database system";
-    license = licenses.postgresql;
-    maintainers = [ maintainers.ocharles ];
-    platforms = platforms.unix;
-    hydraPlatforms = platforms.linux;
-  };
-}
diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
deleted file mode 100644
index d45cdadf1e9..00000000000
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl}:
-
-with stdenv.lib;
-
-let version = "9.3.9"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
-
-  src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0j85j69rf54cwz5yhrhk4ca22b82990j5sqb8cr1fl9843nd0fzp";
-  };
-
-  outputs = [ "out" "doc" ];
-
-  buildInputs = [ zlib readline openssl ]
-                ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
-
-  enableParallelBuilding = true;
-
-  makeFlags = [ "world" ];
-
-  configureFlags = [ "--with-openssl" ]
-                   ++ optional (!stdenv.isDarwin) "--with-ossp-uuid";
-
-  patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
-
-  installTargets = [ "install-world" ];
-
-  LC_ALL = "C";
-
-  passthru = {
-    inherit readline;
-    psqlSchema = "9.3";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = http://www.postgresql.org/;
-    description = "A powerful, open source object-relational database system";
-    license = licenses.postgresql;
-    maintainers = [ maintainers.ocharles ];
-    platforms = platforms.unix;
-    hydraPlatforms = platforms.linux;
-  };
-}
diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix
deleted file mode 100644
index 0309b9b5435..00000000000
--- a/pkgs/servers/sql/postgresql/9.4.x.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }:
-
-with stdenv.lib;
-
-let version = "9.4.4"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
-
-  src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "04q07g209y99xzjh88y52qpvz225rxwifv8nzp3bxzfni2bdk3jk";
-  };
-
-  outputs = [ "out" "doc" ];
-
-  buildInputs = [ zlib readline openssl ]
-                ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
-
-  enableParallelBuilding = true;
-
-  makeFlags = [ "world" ];
-
-  configureFlags = [ "--with-openssl" ]
-                   ++ optional (stdenv.isDarwin)  "--with-uuid=e2fs"
-                   ++ optional (!stdenv.isDarwin) "--with-ossp-uuid";
-
-  patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ];
-
-  installTargets = [ "install-world" ];
-
-  LC_ALL = "C";
-
-  postInstall =
-    ''
-      # Prevent a retained dependency on gcc-wrapper.
-      substituteInPlace $out/lib/pgxs/src/Makefile.global --replace ${stdenv.cc}/bin/ld ld
-    '';
-
-  disallowedReferences = [ stdenv.cc ];
-
-  passthru = {
-    inherit readline;
-    psqlSchema = "9.4";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = http://www.postgresql.org/;
-    description = "A powerful, open source object-relational database system";
-    license = licenses.postgresql;
-    maintainers = [ maintainers.ocharles ];
-    platforms = platforms.unix;
-    hydraPlatforms = platforms.linux;
-  };
-}
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
new file mode 100644
index 00000000000..cf4519a8232
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -0,0 +1,91 @@
+{ lib, stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }:
+
+let
+
+  common = { version, sha256, psqlSchema } @ args: stdenv.mkDerivation (rec {
+    name = "postgresql-${version}";
+
+    src = fetchurl {
+      url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+      inherit sha256;
+    };
+
+    outputs = [ "out" "doc" ];
+
+    buildInputs =
+      [ zlib readline openssl ]
+      ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];
+
+    enableParallelBuilding = true;
+
+    makeFlags = [ "world" ];
+
+    configureFlags =
+      [ "--with-openssl" ]
+      ++ lib.optional (stdenv.isDarwin)  "--with-uuid=e2fs"
+      ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid";
+
+    patches =
+      [ (if lib.versionAtLeast version "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch)
+        ./less-is-more.patch
+      ];
+
+    installTargets = [ "install-world" ];
+
+    LC_ALL = "C";
+
+    postInstall =
+      ''
+        # Prevent a retained dependency on gcc-wrapper.
+        substituteInPlace $out/lib/pgxs/src/Makefile.global --replace ${stdenv.cc}/bin/ld ld
+      '';
+
+    disallowedReferences = [ stdenv.cc ];
+
+    passthru = {
+      inherit readline psqlSchema;
+    };
+
+    meta = with lib; {
+      homepage = http://www.postgresql.org/;
+      description = "A powerful, open source object-relational database system";
+      license = licenses.postgresql;
+      maintainers = [ maintainers.ocharles ];
+      platforms = platforms.unix;
+      hydraPlatforms = platforms.linux;
+    };
+  });
+
+in {
+
+  postgresql90 = common {
+    version = "9.0.22";
+    psqlSchema = "9.0";
+    sha256 = "19gq6axjhvlr5zlrzwnll1fbrvai4xh0nb1jki6gmmschl6v5m4l";
+  };
+
+  postgresql91 = common {
+    version = "9.1.18";
+    psqlSchema = "9.1";
+    sha256 = "1a44hmcvfaa8j169ladsibmvjakw6maaxqkzz1ab8139cqkda9i7";
+  };
+
+  postgresql92 = common {
+    version = "9.2.13";
+    psqlSchema = "9.2";
+    sha256 = "0i3avdr8mnvn6ldkx0hc4jmclhisb2338hzs0j2m03wck8hddjsx";
+  };
+
+  postgresql93 = common {
+    version = "9.3.9";
+    psqlSchema = "9.3";
+    sha256 = "0j85j69rf54cwz5yhrhk4ca22b82990j5sqb8cr1fl9843nd0fzp";
+  };
+
+  postgresql94 = common {
+    version = "9.4.4";
+    psqlSchema = "9.4";
+    sha256 = "04q07g209y99xzjh88y52qpvz225rxwifv8nzp3bxzfni2bdk3jk";
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db99800a8da..1072b6f3b30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9109,15 +9109,12 @@ let
 
   postgresql = postgresql94;
 
-  postgresql90 = callPackage ../servers/sql/postgresql/9.0.x.nix { };
-
-  postgresql91 = callPackage ../servers/sql/postgresql/9.1.x.nix { };
-
-  postgresql92 = callPackage ../servers/sql/postgresql/9.2.x.nix { };
-
-  postgresql93 = callPackage ../servers/sql/postgresql/9.3.x.nix { };
-
-  postgresql94 = callPackage ../servers/sql/postgresql/9.4.x.nix { };
+  inherit (callPackages ../servers/sql/postgresql { })
+    postgresql90
+    postgresql91
+    postgresql92
+    postgresql93
+    postgresql94;
 
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 

From 67757f52b18c70d84b871669633c7b204bce2e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 25 Jul 2015 14:12:27 +0200
Subject: [PATCH 0437/2016] asciidoc-full-with-plugins: new top-level attribute

Previously you had to write the override yourself, now it is
conveniently available in all-packages.nix for use in "nix-env" etc.

The list of plugins are currently hardcoded:
  ditaa, mscgen, qrcode, matplotlib, aafigure, deckjs, odf
---
 pkgs/top-level/all-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1072b6f3b30..54cedb67699 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -964,6 +964,12 @@ let
     enableStandardFeatures = true;
   });
 
+  asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override {
+    inherit (pythonPackages) pygments;
+    enableStandardFeatures = true;
+    enableExtraPlugins = true;
+  });
+
   autossh = callPackage ../tools/networking/autossh { };
 
   asynk = callPackage ../tools/networking/asynk { };

From 9dbde02381fb9f44b9e4b290519fb92731e414a1 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Tue, 28 Jul 2015 21:05:14 +0100
Subject: [PATCH 0438/2016] canto-{curses,daemon}: {0.9.4,0.9.3} ->
 {0.9.6,0.9.5}

Built and tested locally. The changelog can be found here:
http://codezen.org/canto-ng/news/
---
 .../networking/feedreaders/canto-curses/default.nix           | 4 ++--
 .../networking/feedreaders/canto-daemon/default.nix           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
index a73cf63e76b..8db1dac3b4b 100644
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }:
 
 python34Packages.buildPythonPackage rec {
-  version = "0.9.4";
+  version = "0.9.6";
   name = "canto-curses-${version}";
 
   src = fetchFromGitHub {
     owner = "themoken";
     repo = "canto-curses";
     rev = "v${version}";
-    sha256 = "0g1ckcb9xcfb0af17zssiqcrfry87agx578vd40nb6gbw90ql4fn";
+    sha256 = "0hxzpx314cflxq68gswjf2vrqf1z1ci9mxhxgwrk7sa6di86ygy0";
   };
 
   buildInputs = [ readline ncurses canto-daemon ];
diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
index 63fefae9dfe..0de38c259a3 100644
--- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python34Packages, }:
 
 python34Packages.buildPythonPackage rec {
-  version = "0.9.3";
+  version = "0.9.5";
   name = "canto-daemon-${version}";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ python34Packages.buildPythonPackage rec {
     owner = "themoken";
     repo = "canto-next";
     rev = "v${version}";
-    sha256 = "1x875qdyhab89nwwa2bzbfvcrkx34zwyy8dlbxm8wg3vz9b78l61";
+    sha256 = "1ycwrg5n2il833mdxgzz07r0vb4rxz89rk5c6l9g5x33ifinykdq";
   };
 
   propagatedBuildInputs = with python34Packages; [ feedparser ];

From e610f27c43cce143db7e42e4dc0591b4a5636f19 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Tue, 28 Jul 2015 22:52:03 +0200
Subject: [PATCH 0439/2016] qtile: init at 0.10.1

---
 lib/maintainers.nix                           |  1 +
 .../window-managers/qtile/default.nix         | 47 +++++++++++++++++++
 .../qtile/restart_executable.patch            | 12 +++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            | 28 +++++++++--
 5 files changed, 85 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/window-managers/qtile/default.nix
 create mode 100644 pkgs/applications/window-managers/qtile/restart_executable.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 313bd8f9bb4..7aca12522d1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -130,6 +130,7 @@
   jwiegley = "John Wiegley <johnw@newartisans.com>";
   jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
   jzellner = "Jeff Zellner <jeffz@eml.cc>";
+  kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   koral = "Koral <koral@mailoo.org>";
   kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
new file mode 100644
index 00000000000..39d942362be
--- /dev/null
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage, python27Packages, pkgs }:
+
+buildPythonPackage rec {
+  name = "qtile-${version}";
+  version = "0.10.1";
+
+  src = fetchFromGitHub {
+    owner = "qtile";
+    repo = "qtile";
+    rev = "v${version}";
+    sha256 = "1g02lvk2cqy6w6y6nw6dnsmy4i9k4fyawyibpkf0a7a1nfrd6a99";
+  };
+
+  patches = [ ./restart_executable.patch ];
+
+  postPatch = ''
+    substituteInPlace libqtile/manager.py --subst-var-by out $out
+  '';
+
+  buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xlibs.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ];
+
+  cairocffi-xcffib = python27Packages.cairocffi.override {
+    LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib";
+    pythonPath = [ python27Packages.xcffib ];
+  };
+
+  pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ];
+
+  LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib";
+
+  postInstall = ''
+    wrapProgram $out/bin/qtile \
+      --prefix LD_LIBRARY_PATH : ${pkgs.xlibs.libxcb}/lib \
+      --prefix LD_LIBRARY_PATH : ${pkgs.glib}/lib \
+      --prefix LD_LIBRARY_PATH : ${pkgs.cairo}/lib \
+      --prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.qtile.org/;
+    license = licenses.mit;
+    description = "A small, flexible, scriptable tiling window manager written in Python";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ kamilchm ];
+  };
+}
+
diff --git a/pkgs/applications/window-managers/qtile/restart_executable.patch b/pkgs/applications/window-managers/qtile/restart_executable.patch
new file mode 100644
index 00000000000..a1e74a575d9
--- /dev/null
+++ b/pkgs/applications/window-managers/qtile/restart_executable.patch
@@ -0,0 +1,12 @@
+diff -ruP a/libqtile/manager.py b/libqtile/manager.py
+--- a/libqtile/manager.py	2015-07-26 21:26:16.947976520 +0200
++++ b/libqtile/manager.py	2015-07-26 21:37:45.581316712 +0200
+@@ -1262,7 +1262,7 @@
+         argv = [s for s in argv if not s.startswith('--with-state')]
+         argv.append('--with-state=' + buf.getvalue().decode())
+ 
+-        self.cmd_execute(sys.executable, argv)
++        self.cmd_execute("@out@/bin/qtile", argv[1:])
+ 
+     def cmd_spawn(self, cmd):
+         """
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54cedb67699..841dbe17872 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12986,6 +12986,8 @@ let
 
   qpdfview = callPackage ../applications/misc/qpdfview {};
 
+  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;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25e6a22aa61..0bf0979ac6a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1681,11 +1681,11 @@ let
 
 
   cairocffi = buildPythonPackage rec {
-    name = "cairocffi-0.5.4";
+    name = "cairocffi-0.7.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/cairocffi/${name}.tar.gz";
-      md5 = "e3fa4002583bfaa88b156e1af9c75bde";
+      md5 = "e26d06a8d8b16c7210414ce15d453636";
     };
 
     propagatedBuildInputs = with self; [ cffi ];
@@ -2363,11 +2363,11 @@ let
   };
 
   cffi = buildPythonPackage rec {
-    name = "cffi-0.8.6";
+    name = "cffi-1.1.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz";
-      sha256 = "0406j3sgndmx88idv5zxkkrwfqxmjl18pj8gf47nsg4ymzixjci5";
+      url = "https://pypi.python.org/packages/source/c/cffi/${name}.tar.gz";
+      md5 = "ca6e6c45b45caa87aee9adc7c796eaea";
     };
 
     propagatedBuildInputs = with self; [ pkgs.libffi pycparser ];
@@ -16770,4 +16770,22 @@ let
     };
   };
 
+  xcffib = buildPythonPackage rec {
+    version = "0.3.2";
+    name = "xcffib-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/x/xcffib/${name}.tar.gz";
+      md5 = "fa13f3fee67c83016a1242982a7c8bda";
+    };
+
+    propagatedBuildInputs = [ self.cffi self.six ];
+
+    meta = {
+      description = "A drop in replacement for xpyb, an XCB python binding";
+      homepage = "https://github.com/tych0/xcffib";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ kamilchm ];
+    };
+  };
 }; in pythonPackages

From 8d41ccf6f9019e85214f7ee8c1c7c42457ced732 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Mon, 20 Jul 2015 18:25:41 +0100
Subject: [PATCH 0440/2016] boinc: 7.4.14 -> 7.4.42

As it turns out BOINC moved their git repository to Github sometime
shortly after the first update to this derivation. Their wiki change
makes this quite clear:
https://boinc.berkeley.edu/trac/wiki/SourceCodeGit?action=diff&version=54

Slight refactor and the changelog for this release can be found here:
https://boinc.berkeley.edu/trac/wiki/VersionHistory

Build and run were successful.
---
 pkgs/applications/science/misc/boinc/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 0898b458593..d45f4a2b210 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -1,14 +1,16 @@
-{ fetchgit, stdenv, autoconf, automake, pkgconfig, m4, curl,
+{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl,
 mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
 sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
 
 stdenv.mkDerivation rec {
-  name = "boinc-7.4.14";
+  version = "7.4.42";
+  name = "boinc-${version}";
 
-  src = fetchgit {
-    url = "git://boinc.berkeley.edu/boinc-v2.git";
-    rev = "fb31ab18f94f3b5141bea03e8537d76c606cd276";
-    sha256 = "1465zl8l87fm1ps5f2may6mcc3pp40mpd6wphpxnwwk1lmv48x96";
+  src = fetchFromGitHub {
+    owner = "BOINC";
+    repo = "boinc";
+    rev = "561fbdae0cac3be996136319828f43cbc62c9";
+    sha256 = "1rlh463yyz88p2g5pc6avndn3x1162vcksgbqich0i3qb90jms29";
   };
 
   buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi

From 4838367a5eead1e6c7aea8b4bb5f3e1e36199dfb Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Tue, 28 Jul 2015 22:13:35 +0100
Subject: [PATCH 0441/2016] profile-cleaner: 2.34 -> 2.35

Built and tested locally. Unfortunately there is no clear changelog
available.
---
 pkgs/tools/misc/profile-cleaner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix
index 903c8617128..55c44770c3e 100644
--- a/pkgs/tools/misc/profile-cleaner/default.nix
+++ b/pkgs/tools/misc/profile-cleaner/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite }:
 
 stdenv.mkDerivation rec {
-  version = "2.34";
+  version = "2.35";
   name = "profile-cleaner-${version}";
 
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = "profile-cleaner";
     rev = "v${version}";
-    sha256 = "17z73xyn31668f7vmbj7xs659fcrm0m0mnzja7hz6lipfaviqxrs";
+    sha256 = "0gashrzhpgcy98zsyc6b3awfp15j1x0nq82h60kvfjbs6xxzvszh";
   };
 
   buildInputs = [ makeWrapper ];

From 64f3fb96d8950e4a63f8478c84dd51c126e38ae5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 28 Jul 2015 15:23:40 +0200
Subject: [PATCH 0442/2016] gnome3: file-roller: add openssl dependency

Build fails otherwise with `ld: cannot find -lcrypto`.
---
 pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
index d36162e13c2..926464ff7be 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
-, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }:
+{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2
+, libarchive, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf
+, hicolor_icon_theme, openssl }:
 
 stdenv.mkDerivation rec {
   name = "file-roller-${version}";
@@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
   # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
 
   buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  hicolor_icon_theme gnome3.adwaita-icon-theme openssl
                   attr bzip2 acl gdk_pixbuf librsvg makeWrapper ];
 
   preFixup = ''

From c71d93c51972fa9e02221ee8773c08a02fddd951 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 28 Jul 2015 23:09:38 +0200
Subject: [PATCH 0443/2016] mcelog: 121 -> 122

Enable IMC status bank for Haswell-E, as described in Intel SDM Vol.3C
Table 35-27.
---
 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 31c360051bb..f2b03e1be92 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 = "121"; in
+let version = "122"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1psdcbr3ssavl35svjzgsy5xl0f2s57s740anvyqy8ziy4k5fjyv";
+    sha256 = "0g3bp6wfgpjh345n988r2bxzdkbac8mls9v7fsylmfxf78y7n92d";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From 68976a15e82d763bbacd69d8760c7a10684c0aca Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Tue, 28 Jul 2015 23:39:57 +0200
Subject: [PATCH 0444/2016]  xserver: qtile as desktopManager

---
 .../services/x11/desktop-managers/default.nix |  2 +-
 .../services/x11/desktop-managers/qtile.nix   | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/x11/desktop-managers/qtile.nix

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 998bcd354c5..d4453e6755b 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -19,7 +19,7 @@ in
   # E.g., if KDE is enabled, it supersedes xterm.
   imports = [
     ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix
-    ./e19.nix ./gnome3.nix ./kodi.nix
+    ./e19.nix ./gnome3.nix ./kodi.nix ./qtile.nix
   ];
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/qtile.nix b/nixos/modules/services/x11/desktop-managers/qtile.nix
new file mode 100644
index 00000000000..a26512dbd75
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/qtile.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.desktopManager.qtile;
+in
+
+{
+  options = {
+    services.xserver.windowManager.qtile.enable = mkEnableOption "qtile";
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.desktopManager.session = [{
+      name = "qtile";
+      start = ''
+        ${pkgs.qtile}/bin/qtile
+        waitPID=$!
+      '';
+    }];
+    
+    environment.systemPackages = [ pkgs.qtile ];
+  };
+}

From 936b8dc2c7cb354a59de18eddafe5f0ae241dfff Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 29 Jul 2015 00:19:17 +0200
Subject: [PATCH 0445/2016] x2goclient: 4.0.4.0 -> 4.0.5.0

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

diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 30e40a965f7..eaa1c5e318a 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }:
 
-let version = "4.0.4.0"; in
+let version = "4.0.5.0"; in
 stdenv.mkDerivation rec {
   name = "x2goclient-${version}";
 
   src = fetchurl {
     url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
-    sha256 = "0mqn4nvq2w7qja5i4vx9fg2spwzl01p0hmfwbjb0mzir03hmrl46";
+    sha256 = "18a2pszh0nq2ir64a1ah1mlzddn4qcd12b339bv30n0y1ir92bi4";
   };
 
   meta = with stdenv.lib; {

From 5c896e5511608592b94960c5c419f70dadc5b527 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 20 Jul 2015 14:22:43 -0700
Subject: [PATCH 0446/2016] emacs: Update Mac Port Emacs to 24.5-mac-5.9

---
 .../haskell-modules/configuration-common.nix           |  2 ++
 pkgs/development/haskell-modules/hackage-packages.nix  |  2 +-
 pkgs/servers/x11/xorg/overrides.nix                    | 10 +++++-----
 3 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 5260d508ab1..30c5912a5a8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -21,6 +21,8 @@ self: super: {
   options = dontCheck super.options;
   statistics = dontCheck super.statistics;
   text = dontCheck super.text;
+  c2hs = dontCheck super.c2hs;
+  mockery = dontCheck super.mockery;
 
   # The package doesn't compile with ruby 1.9, which is our default at the moment.
   hruby = super.hruby.override { ruby = pkgs.ruby_2_1; };
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ba7bc517aa7..622ebfa7473 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -54313,7 +54313,7 @@ self: {
          yesod-static
        ];
        buildTools = [
-         bup curl git gnupg lsof openssh perl rsync wget which
+         curl git gnupg openssh perl rsync wget which
        ];
        configureFlags = [ "-fassistant" "-fproduction" ];
        preConfigure = "export HOME=$TEMPDIR";
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 336ae652628..a43fb6d7706 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -79,9 +79,9 @@ in
     nativeBuildInputs = [ args.python ];
   };
 
-  libxkbfile = attrs: attrs // {
-    patches = lib.optional stdenv.cc.isClang ./libxkbfile-clang36.patch;
-  };
+  # libxkbfile = attrs: attrs // {
+  #   patches = lib.optional stdenv.cc.isClang ./libxkbfile-clang36.patch;
+  # };
 
   libpciaccess = attrs : attrs // {
     patches = [ ./libpciaccess-apple.patch ];
@@ -285,9 +285,9 @@ in
         dmxproto /*libdmx not used*/ xf86vidmodeproto
         recordproto libXext pixman libXfont
         damageproto xcmiscproto  bigreqsproto
-        libpciaccess inputproto xextproto randrproto renderproto presentproto
+        inputproto xextproto randrproto renderproto presentproto
         dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
-      ];
+      ] ++ lib.optional (!isDarwin) libpciaccess;
       commonPatches = [ ./xorgserver-xkbcomp-path.patch ]
                    ++ lib.optional isDarwin ./fix-clang.patch;
       # XQuartz requires two compilations: the first to get X / XQuartz,

From ac7a6e04c20bcf576e02eaa5d230dc2f04d5b9f7 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 29 Jul 2015 04:55:57 +0000
Subject: [PATCH 0447/2016] go-packages: start factoring out repetitive
 patterns

---
 pkgs/top-level/go-packages.nix | 42 +++++++++++++++-------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index cf9971c7407..956e0c2fedb 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -6,38 +6,34 @@
 let
   isGo13 = go.meta.branch == "1.3";
   isGo14 = go.meta.branch == "1.4";
+
+  buildFromGitHub = { rev, owner, repo, sha256, name ? repo, goPackagePath ? "github.com/${owner}/${repo}", ... }@args: buildGoPackage (args // {
+    inherit goPackagePath;
+    name = "${name}-${stdenv.lib.strings.substring 0 7 rev}";
+    src  = fetchFromGitHub { inherit rev owner repo sha256; };
+  });
+
   self = _self // overrides; _self = with self; {
 
   inherit go buildGoPackage;
 
   ## OFFICIAL GO PACKAGES
 
-  crypto = buildGoPackage rec {
-    rev = "4d48e5fa3d62b5e6e71260571bf76c767198ca02";
-    name = "crypto-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "golang.org/x/crypto";
-    goPackageAliases = [ "code.google.com/p/go.crypto" ];
+  crypto = buildFromGitHub {
+    rev      = "4d48e5fa3d62b5e6e71260571bf76c767198ca02";
     disabled = isGo13;
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "golang";
-      repo   = "crypto";
-      sha256 = "0plvjv56afb02p7l3c2zfwffnhscmc3f0ckj1gls9ay6vj85y7l8";
-    };
+    owner    = "golang";
+    repo     = "crypto";
+    sha256   = "0plvjv56afb02p7l3c2zfwffnhscmc3f0ckj1gls9ay6vj85y7l8";
+    goPackagePath    = "golang.org/x/crypto";
+    goPackageAliases = [ "code.google.com/p/go.crypto" ];
   };
 
-  glog = buildGoPackage rec {
-    rev = "44145f04b68cf362d9c4df2182967c2275eaefed";
-    name = "glog-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/golang/glog";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "golang";
-      repo = "glog";
-      sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq";
-    };
+  glog = buildFromGitHub {
+    rev    = "44145f04b68cf362d9c4df2182967c2275eaefed";
+    owner  = "golang";
+    repo   = "glog";
+    sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq";
   };
 
   image = buildGoPackage rec {

From 5523ab88075664db0c82e185b0693825c43dcd5e Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkingod@gmail.com>
Date: Wed, 29 Jul 2015 01:11:27 -0400
Subject: [PATCH 0448/2016] go-packages: further simplification

This change is the result of replacing:

    buildGoPackage rec \{\s+rev\s+=\s+"(.*)";\s+name\s+=\s+"(.*)-\$\{stdenv.lib.strings.substring 0 7 rev\}";\s+goPackagePath\s+=\s+"github.com/(.*)/\2";\s+src\s+=\s+fetchFromGitHub\s+\{\s+inherit rev;\s+owner\s+=\s+"\3";\s+repo\s+=\s+"\2";\s+sha256\s+=\s"(.*)";\s+\};\s+\};

with:

    buildFromGitHub {\n    rev    = "$1";\n    owner  = "$3";\n    repo   = "$2";\n    sha256 = "$4";\n  };

in pkgs/top-level/go-packages.nix.

I also inherited `rev` in `buildFromGitHub` to prevent a mass rebuild of Go packages, even though it's unused.
---
 pkgs/top-level/go-packages.nix | 1123 ++++++++++----------------------
 1 file changed, 361 insertions(+), 762 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 956e0c2fedb..448c94e0602 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -8,7 +8,7 @@ let
   isGo14 = go.meta.branch == "1.4";
 
   buildFromGitHub = { rev, owner, repo, sha256, name ? repo, goPackagePath ? "github.com/${owner}/${repo}", ... }@args: buildGoPackage (args // {
-    inherit goPackagePath;
+    inherit rev goPackagePath;
     name = "${name}-${stdenv.lib.strings.substring 0 7 rev}";
     src  = fetchFromGitHub { inherit rev owner repo sha256; };
   });
@@ -158,30 +158,18 @@ let
 
   ## THIRD PARTY
 
-  airbrake-go = buildGoPackage rec {
-    rev = "5b5e269e1bc398d43f67e43dafff3414a59cd5a2";
-    name = "airbrake-go-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/tobi/airbrake-go";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "tobi";
-      repo   = "airbrake-go";
-      sha256 = "1bps4y3vpphpj63mshjg2aplh579cvqac0hz7qzvac0d1fqcgkdz";
-    };
+  airbrake-go = buildFromGitHub {
+    rev    = "5b5e269e1bc398d43f67e43dafff3414a59cd5a2";
+    owner  = "tobi";
+    repo   = "airbrake-go";
+    sha256 = "1bps4y3vpphpj63mshjg2aplh579cvqac0hz7qzvac0d1fqcgkdz";
   };
 
-  ansicolor = buildGoPackage rec {
-    rev = "8368d3b31cf6f2c2464c7a91675342c9a0ac6658";
-    name = "ansicolor-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/shiena/ansicolor";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "shiena";
-      repo   = "ansicolor";
-      sha256 = "1fyn06vxm44s0ph8pr7r9gkab1f4x851zlyy3p6jbbwsa6an8g9w";
-    };
+  ansicolor = buildFromGitHub {
+    rev    = "8368d3b31cf6f2c2464c7a91675342c9a0ac6658";
+    owner  = "shiena";
+    repo   = "ansicolor";
+    sha256 = "1fyn06vxm44s0ph8pr7r9gkab1f4x851zlyy3p6jbbwsa6an8g9w";
   };
 
   asn1-ber = buildGoPackage rec {
@@ -248,42 +236,25 @@ let
     buildInputs = [ go-ini net sandblast ];
   };
 
-  binarydist = buildGoPackage rec {
-    rev = "9955b0ab8708602d411341e55fffd7e0700f86bd";
-    name = "binarydist-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/kr/binarydist";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "kr";
-      repo = "binarydist";
-      sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3";
-    };
+  binarydist = buildFromGitHub {
+    rev    = "9955b0ab8708602d411341e55fffd7e0700f86bd";
+    owner  = "kr";
+    repo   = "binarydist";
+    sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3";
   };
 
-  bolt = buildGoPackage rec {
-    rev = "957d850b5158a4eebf915476058e720f43459584";
-    name = "bolt-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/boltdb/bolt";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "boltdb";
-      repo = "bolt";
-      sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf";
-    };
+  bolt = buildFromGitHub {
+    rev    = "957d850b5158a4eebf915476058e720f43459584";
+    owner  = "boltdb";
+    repo   = "bolt";
+    sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf";
   };
 
-  bufio = buildGoPackage rec {
-    rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66";
-    name = "bufio-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/vmihailenco/bufio";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "vmihailenco";
-      repo = "bufio";
-      sha256 = "0x46qnf2f15v7m0j2dcb16raxjamk5rdc7hqwgyxfr1sqmmw3983";
-    };
+  bufio = buildFromGitHub {
+    rev    = "24e7e48f60fc2d9e99e43c07485d9fff42051e66";
+    owner  = "vmihailenco";
+    repo   = "bufio";
+    sha256 = "0x46qnf2f15v7m0j2dcb16raxjamk5rdc7hqwgyxfr1sqmmw3983";
   };
 
   bugsnag-go = buildGoPackage rec {
@@ -329,17 +300,11 @@ let
     };
   };
 
-  circbuf = buildGoPackage rec {
-    rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf";
-    name = "circbuf-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/armon/circbuf";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "armon";
-      repo = "circbuf";
-      sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s";
-    };
+  circbuf = buildFromGitHub {
+    rev    = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf";
+    owner  = "armon";
+    repo   = "circbuf";
+    sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s";
   };
 
   cli = buildGoPackage rec {
@@ -357,16 +322,11 @@ let
     propagatedBuildInputs = [ crypto ];
   };
 
-  cli-spinner = buildGoPackage rec {
-    rev = "610063bb4aeef25f7645b3e6080456655ec0fb33";
-    name = "cli-spinner-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/odeke-em/cli-spinner";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "odeke-em";
-      repo = "cli-spinner";
-      sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c";
-    };
+  cli-spinner = buildFromGitHub {
+    rev    = "610063bb4aeef25f7645b3e6080456655ec0fb33";
+    owner  = "odeke-em";
+    repo   = "cli-spinner";
+    sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c";
   };
 
   cobra = buildGoPackage rec {
@@ -382,29 +342,18 @@ let
     propagatedBuildInputs = [ pflag ];
   };
 
-  columnize = buildGoPackage rec {
-    rev = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a";
-    name = "columnize-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/ryanuber/columnize";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "ryanuber";
-      repo = "columnize";
-      sha256 = "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9";
-    };
+  columnize = buildFromGitHub {
+    rev    = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a";
+    owner  = "ryanuber";
+    repo   = "columnize";
+    sha256 = "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9";
   };
 
-  command = buildGoPackage rec {
-    rev = "076a2ad5f3a7ec92179f2d57208728432280ec4e";
-    name = "command-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/odeke-em/command";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "odeke-em";
-      repo = "command";
-      sha256 = "093as4kxlabk3hrsd52kr9fhl6qafr4ghg89cjyglsva0mk0n7sb";
-    };
+  command = buildFromGitHub {
+    rev    = "076a2ad5f3a7ec92179f2d57208728432280ec4e";
+    owner  = "odeke-em";
+    repo   = "command";
+    sha256 = "093as4kxlabk3hrsd52kr9fhl6qafr4ghg89cjyglsva0mk0n7sb";
   };
 
   copystructure = buildGoPackage rec {
@@ -436,17 +385,11 @@ let
     subPackages = [ "./" ];
   };
 
-  config = buildGoPackage rec {
-    rev = "0f78529c8c7e3e9a25f15876532ecbc07c7d99e6";
-    name = "config-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/robfig/config";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "robfig";
-      repo = "config";
-      sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0";
-    };
+  config = buildFromGitHub {
+    rev    = "0f78529c8c7e3e9a25f15876532ecbc07c7d99e6";
+    owner  = "robfig";
+    repo   = "config";
+    sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0";
   };
 
   consul = buildGoPackage rec {
@@ -594,42 +537,25 @@ let
     };
   };
 
-  dns = buildGoPackage rec {
-    rev = "bb1103f648f811d2018d4bedcb2d4b2bce34a0f1";
-    name = "dns-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/miekg/dns";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "miekg";
-      repo = "dns";
-      sha256 = "1c1gasvzlcmgwyqhksm656p03nc76kxjxllbcw9bwfy5v7p9w7qq";
-    };
+  dns = buildFromGitHub {
+    rev    = "bb1103f648f811d2018d4bedcb2d4b2bce34a0f1";
+    owner  = "miekg";
+    repo   = "dns";
+    sha256 = "1c1gasvzlcmgwyqhksm656p03nc76kxjxllbcw9bwfy5v7p9w7qq";
   };
 
-  docopt-go = buildGoPackage rec {
-    rev = "854c423c810880e30b9fecdabb12d54f4a92f9bb";
-    name = "docopt-go-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/docopt/docopt-go";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "docopt";
-      repo = "docopt-go";
-      sha256 = "1sddkxgl1pwlipfvmv14h8vg9b9wq1km427j1gjarhb5yfqhh3l1";
-    };
+  docopt-go = buildFromGitHub {
+    rev    = "854c423c810880e30b9fecdabb12d54f4a92f9bb";
+    owner  = "docopt";
+    repo   = "docopt-go";
+    sha256 = "1sddkxgl1pwlipfvmv14h8vg9b9wq1km427j1gjarhb5yfqhh3l1";
   };
 
-  dts = buildGoPackage rec {
-    rev = "ec2daabf2f9078e887405f7bcddb3d79cb65502d";
-    name = "dts-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/odeke-em/dts";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "odeke-em";
-      repo = "dts";
-      sha256 = "0vq3cz4ab9vdsz9s0jjlp7z27w218jjabjzsh607ps4i8m5d441s";
-    };
+  dts = buildFromGitHub {
+    rev    = "ec2daabf2f9078e887405f7bcddb3d79cb65502d";
+    owner  = "odeke-em";
+    repo   = "dts";
+    sha256 = "0vq3cz4ab9vdsz9s0jjlp7z27w218jjabjzsh607ps4i8m5d441s";
   };
 
   ed25519 = buildGoPackage rec {
@@ -643,17 +569,11 @@ let
     };
   };
 
-  errwrap = buildGoPackage rec {
-    rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55";
-    name = "errwrap-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/errwrap";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "errwrap";
-      sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
-    };
+  errwrap = buildFromGitHub {
+    rev    = "7554cd9344cec97297fa6649b055a8c98c2a1e55";
+    owner  = "hashicorp";
+    repo   = "errwrap";
+    sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
   };
 
   fsnotify.v0 = buildGoPackage rec {
@@ -683,16 +603,11 @@ let
     };
   };
 
-  g2s = buildGoPackage rec {
-    rev = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc";
-    name = "g2s-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/peterbourgon/g2s";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "peterbourgon";
-      repo   = "g2s";
-      sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj";
-    };
+  g2s = buildFromGitHub {
+    rev    = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc";
+    owner  = "peterbourgon";
+    repo   = "g2s";
+    sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj";
   };
 
   gcloud-golang = buildGoPackage rec {
@@ -729,16 +644,11 @@ let
     subPackages = [ "./" ];  # don't try to build test fixtures
   };
 
-  gls = buildGoPackage rec {
-    rev = "9a4a02dbe491bef4bab3c24fd9f3087d6c4c6690";
-    name = "gls-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/jtolds/gls";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "jtolds";
-      repo = "gls";
-      sha256 = "1gvgkx7llklz6plapb95fcql7d34i6j7anlvksqhdirpja465jnm";
-    };
+  gls = buildFromGitHub {
+    rev    = "9a4a02dbe491bef4bab3c24fd9f3087d6c4c6690";
+    owner  = "jtolds";
+    repo   = "gls";
+    sha256 = "1gvgkx7llklz6plapb95fcql7d34i6j7anlvksqhdirpja465jnm";
   };
 
   ugorji.go = buildGoPackage rec {
@@ -783,18 +693,11 @@ let
     };
   };
 
-  dgnorton.goback = buildGoPackage rec {
-    rev = "a49ca3c0a18f50ae0b8a247e012db4385e516cf4";
-    name = "goback-${stdenv.lib.strings.substring 0 7 rev}";
-
-    goPackagePath = "github.com/dgnorton/goback";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "dgnorton";
-      repo = "goback";
-      sha256 = "1nyg6sckwd0iafs9vcmgbga2k3hid2q0avhwj29qbdhj3l78xi47";
-    };
+  dgnorton.goback = buildFromGitHub {
+    rev    = "a49ca3c0a18f50ae0b8a247e012db4385e516cf4";
+    owner  = "dgnorton";
+    repo   = "goback";
+    sha256 = "1nyg6sckwd0iafs9vcmgbga2k3hid2q0avhwj29qbdhj3l78xi47";
   };
 
   gocheck = buildGoPackage rec {
@@ -834,30 +737,18 @@ let
     doCheck = false; # please check again
   };
 
-  gomdb = buildGoPackage rec {
-    rev = "151f2e08ef45cb0e57d694b2562f351955dff572";
-    name = "gomdb-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/armon/gomdb";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "armon";
-      repo = "gomdb";
-      sha256 = "02wdhgfarmmwfbc75snd1dh6p9k9c1y2135apdm6mkr062qlxx61";
-    };
+  gomdb = buildFromGitHub {
+    rev    = "151f2e08ef45cb0e57d694b2562f351955dff572";
+    owner  = "armon";
+    repo   = "gomdb";
+    sha256 = "02wdhgfarmmwfbc75snd1dh6p9k9c1y2135apdm6mkr062qlxx61";
   };
 
-  influx.gomdb = buildGoPackage rec {
-    rev = "29fe330c5ab33c4e48470bd4b980bf522471190a";
-    name = "gomdb-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/influxdb/gomdb";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "influxdb";
-      repo = "gomdb";
-      sha256 = "0yg1jpr7lcaqh6i8n9wbs9r128kk541qjv06r9a6fp9vj56rqr3m";
-    };
+  influx.gomdb = buildFromGitHub {
+    rev    = "29fe330c5ab33c4e48470bd4b980bf522471190a";
+    owner  = "influxdb";
+    repo   = "gomdb";
+    sha256 = "0yg1jpr7lcaqh6i8n9wbs9r128kk541qjv06r9a6fp9vj56rqr3m";
   };
 
   govers = buildGoPackage rec {
@@ -873,17 +764,11 @@ let
     };
   };
 
-  golang-lru = buildGoPackage rec {
-    rev = "995efda3e073b6946b175ed93901d729ad47466a";
-    name = "golang-lru-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/golang-lru";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "golang-lru";
-      sha256 = "0ilnzg9qq2pfa8qb9yd25s5afi0fvsm78kqzqy39kgg8zsx70xyj";
-    };
+  golang-lru = buildFromGitHub {
+    rev    = "995efda3e073b6946b175ed93901d729ad47466a";
+    owner  = "hashicorp";
+    repo   = "golang-lru";
+    sha256 = "0ilnzg9qq2pfa8qb9yd25s5afi0fvsm78kqzqy39kgg8zsx70xyj";
   };
 
   golang_protobuf_extensions = buildGoPackage rec {
@@ -914,42 +799,25 @@ let
     propagatedBuildInputs = [ ginkgo gomega gosnappy ];
   };
 
-  gollectd = buildGoPackage rec {
-    rev = "cf6dec97343244b5d8a5485463675d42f574aa2d";
-    name = "gollectd-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/kimor79/gollectd";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "kimor79";
-      repo = "gollectd";
-      sha256 = "1f3ml406cprzjc192csyr2af4wcadkc74kg8n4c0zdzglxxfsqxa";
-    };
+  gollectd = buildFromGitHub {
+    rev    = "cf6dec97343244b5d8a5485463675d42f574aa2d";
+    owner  = "kimor79";
+    repo   = "gollectd";
+    sha256 = "1f3ml406cprzjc192csyr2af4wcadkc74kg8n4c0zdzglxxfsqxa";
   };
 
-  gomega = buildGoPackage rec {
-    rev = "8adf9e1730c55cdc590de7d49766cb2acc88d8f2";
-    name = "gomega-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/onsi/gomega";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "onsi";
-      repo = "gomega";
-      sha256 = "1rf6cxn50d1pji3pv4q372s395r5nxwcgp405z2r2mfdkri4v3w4";
-    };
+  gomega = buildFromGitHub {
+    rev    = "8adf9e1730c55cdc590de7d49766cb2acc88d8f2";
+    owner  = "onsi";
+    repo   = "gomega";
+    sha256 = "1rf6cxn50d1pji3pv4q372s395r5nxwcgp405z2r2mfdkri4v3w4";
   };
 
-  gomemcache = buildGoPackage rec {
-    rev = "72a68649ba712ee7c4b5b4a943a626bcd7d90eb8";
-    name = "gomemcache-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/bradfitz/gomemcache";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "bradfitz";
-      repo = "gomemcache";
-      sha256 = "1r8fpzwhakq8fsppc33n4iivq1pz47xhs0h6bv4x5qiip5mswwvg";
-    };
+  gomemcache = buildFromGitHub {
+    rev    = "72a68649ba712ee7c4b5b4a943a626bcd7d90eb8";
+    owner  = "bradfitz";
+    repo   = "gomemcache";
+    sha256 = "1r8fpzwhakq8fsppc33n4iivq1pz47xhs0h6bv4x5qiip5mswwvg";
   };
 
   google-api-go-client = buildGoPackage rec {
@@ -1001,29 +869,18 @@ let
     buildInputs = [ crypto ];
   };
 
-  gopherduty = buildGoPackage rec {
-    rev = "f4906ce7e59b33a50bfbcba93e2cf58778c11fb9";
-    name = "gopherduty-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/darkcrux/gopherduty";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "darkcrux";
-      repo = "gopherduty";
-      sha256 = "11w1yqc16fxj5q1y5ha5m99j18fg4p9lyqi542x2xbrmjqqialcf";
-    };
+  gopherduty = buildFromGitHub {
+    rev    = "f4906ce7e59b33a50bfbcba93e2cf58778c11fb9";
+    owner  = "darkcrux";
+    repo   = "gopherduty";
+    sha256 = "11w1yqc16fxj5q1y5ha5m99j18fg4p9lyqi542x2xbrmjqqialcf";
   };
 
-  gosnappy = buildGoPackage rec {
-    rev = "ce8acff4829e0c2458a67ead32390ac0a381c862";
-    name = "gosnappy-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/syndtr/gosnappy";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "syndtr";
-      repo = "gosnappy";
-      sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7";
-    };
+  gosnappy = buildFromGitHub {
+    rev    = "ce8acff4829e0c2458a67ead32390ac0a381c862";
+    owner  = "syndtr";
+    repo   = "gosnappy";
+    sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7";
   };
 
   gox = buildGoPackage rec {
@@ -1102,43 +959,25 @@ let
     };
   };
 
-  robfig.go-cache = buildGoPackage rec {
-    rev = "9fc39e0dbf62c034ec4e45e6120fc69433a3ec51";
-    name = "go-cache-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/robfig/go-cache";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "robfig";
-      repo = "go-cache";
-      sha256 = "032nh3y43bpzpcm7bdkxfh55aydvzc2jzhigvy5gd9f648m4j9ha";
-    };
+  robfig.go-cache = buildFromGitHub {
+    rev    = "9fc39e0dbf62c034ec4e45e6120fc69433a3ec51";
+    owner  = "robfig";
+    repo   = "go-cache";
+    sha256 = "032nh3y43bpzpcm7bdkxfh55aydvzc2jzhigvy5gd9f648m4j9ha";
   };
 
-  go-checkpoint = buildGoPackage rec {
-    rev = "88326f6851319068e7b34981032128c0b1a6524d";
-    name = "go-checkpoint-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/go-checkpoint";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "go-checkpoint";
-      sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4";
-    };
+  go-checkpoint = buildFromGitHub {
+    rev    = "88326f6851319068e7b34981032128c0b1a6524d";
+    owner  = "hashicorp";
+    repo   = "go-checkpoint";
+    sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4";
   };
 
-  go-colortext = buildGoPackage rec {
-    rev = "13eaeb896f5985a1ab74ddea58707a73d875ba57";
-    name = "go-colortext-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/daviddengcn/go-colortext";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "daviddengcn";
-      repo = "go-colortext";
-      sha256 = "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x";
-    };
+  go-colortext = buildFromGitHub {
+    rev    = "13eaeb896f5985a1ab74ddea58707a73d875ba57";
+    owner  = "daviddengcn";
+    repo   = "go-colortext";
+    sha256 = "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x";
   };
 
   go-etcd = buildGoPackage rec {
@@ -1156,16 +995,11 @@ let
     buildInputs = [ pkgs.etcd ];
   };
 
-  go-flags = buildGoPackage rec {
-    rev = "5e118789801496c93ba210d34ef1f2ce5a9173bd";
-    name = "go-flags-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/jessevdk/go-flags";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "jessevdk";
-      repo = "go-flags";
-      sha256 = "1davr5h936fhc8zy7digp5yqxr216d1mshksr7iiad5xb3r8r9ja";
-    };
+  go-flags = buildFromGitHub {
+    rev    = "5e118789801496c93ba210d34ef1f2ce5a9173bd";
+    owner  = "jessevdk";
+    repo   = "go-flags";
+    sha256 = "1davr5h936fhc8zy7digp5yqxr216d1mshksr7iiad5xb3r8r9ja";
   };
 
   go-fuse = buildGoPackage rec {
@@ -1196,52 +1030,32 @@ let
     buildInputs = [ go-querystring oauth2 ];
   };
 
-  go-homedir = buildGoPackage rec {
-    rev = "7d2d8c8a4e078ce3c58736ab521a40b37a504c52";
-    name = "go-homedir-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/mitchellh/go-homedir";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "mitchellh";
-      repo   = "go-homedir";
-      sha256 = "1ixhwxnvq1qx53asq47yhg3l88ndwrnyw4fkkidcjg759dc86d0i";
-    };
+  go-homedir = buildFromGitHub {
+    rev    = "7d2d8c8a4e078ce3c58736ab521a40b37a504c52";
+    owner  = "mitchellh";
+    repo   = "go-homedir";
+    sha256 = "1ixhwxnvq1qx53asq47yhg3l88ndwrnyw4fkkidcjg759dc86d0i";
   };
 
-  go-hostpool = buildGoPackage rec {
-    rev = "fed86fae5cacdc77e7399937e2f8836563620a2e";
-    name = "go-hostpool-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/bitly/go-hostpool";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "bitly";
-      repo = "go-hostpool";
-      sha256 = "0nbssfp5ksj4hhc0d8lfq54afd9nqv6qzk3vi6rinxr3fgplrj44";
-    };
+  go-hostpool = buildFromGitHub {
+    rev    = "fed86fae5cacdc77e7399937e2f8836563620a2e";
+    owner  = "bitly";
+    repo   = "go-hostpool";
+    sha256 = "0nbssfp5ksj4hhc0d8lfq54afd9nqv6qzk3vi6rinxr3fgplrj44";
   };
 
-  go-ini = buildGoPackage rec {
-    rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
-    name = "go-ini-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/vaughan0/go-ini";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "vaughan0";
-      repo   = "go-ini";
-      sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
-    };
+  go-ini = buildFromGitHub {
+    rev    = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
+    owner  = "vaughan0";
+    repo   = "go-ini";
+    sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
   };
 
-  go-isatty = buildGoPackage rec {
-    rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449";
-    name = "go-isatty-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/mattn/go-isatty";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "mattn";
-      repo = "go-isatty";
-      sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj";
-    };
+  go-isatty = buildFromGitHub {
+    rev    = "ae0b1f8f8004be68d791a576e3d8e7648ab41449";
+    owner  = "mattn";
+    repo   = "go-isatty";
+    sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj";
   };
 
   go-log = buildGoPackage rec {
@@ -1301,17 +1115,11 @@ let
     propagatedBuildInputs = [ prometheus.client_golang ];
   };
 
-  go-multierror = buildGoPackage rec {
-    rev = "fcdddc395df1ddf4247c69bd436e84cfa0733f7e";
-    name = "go-multierror-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/go-multierror";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "go-multierror";
-      sha256 = "1gvrm2bqi425mfg55m01z9gppfd7v4ljz1z8bykmh2sc82fj25jz";
-    };
+  go-multierror = buildFromGitHub {
+    rev    = "fcdddc395df1ddf4247c69bd436e84cfa0733f7e";
+    owner  = "hashicorp";
+    repo   = "go-multierror";
+    sha256 = "1gvrm2bqi425mfg55m01z9gppfd7v4ljz1z8bykmh2sc82fj25jz";
   };
 
   go-nsq = buildGoPackage rec {
@@ -1327,42 +1135,25 @@ let
     propagatedBuildInputs = [ go-simplejson go-snappystream ];
   };
 
-  go-options = buildGoPackage rec {
-    rev = "896a539cd709f4f39d787562d1583c016ce7517e";
-    name = "go-options-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/mreiferson/go-options";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "mreiferson";
-      repo = "go-options";
-      sha256 = "0hg0n5grcjcj5719rqchz0plp39wfk3znqxw8y354k4jwsqwmn17";
-    };
+  go-options = buildFromGitHub {
+    rev    = "896a539cd709f4f39d787562d1583c016ce7517e";
+    owner  = "mreiferson";
+    repo   = "go-options";
+    sha256 = "0hg0n5grcjcj5719rqchz0plp39wfk3znqxw8y354k4jwsqwmn17";
   };
 
-  go-querystring = buildGoPackage rec {
-    rev = "547ef5ac979778feb2f760cdb5f4eae1a2207b86";
-    name = "go-querystring-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/google/go-querystring";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "google";
-      repo = "go-querystring";
-      sha256 = "00ani7fhydcmlsm3n93nmj1hcqp2wmzvihnb1gdzynif1hw0530y";
-    };
+  go-querystring = buildFromGitHub {
+    rev    = "547ef5ac979778feb2f760cdb5f4eae1a2207b86";
+    owner  = "google";
+    repo   = "go-querystring";
+    sha256 = "00ani7fhydcmlsm3n93nmj1hcqp2wmzvihnb1gdzynif1hw0530y";
   };
 
-  go-radix = buildGoPackage rec {
-    rev = "0bab926c3433cfd6490c6d3c504a7b471362390c";
-    name = "go-radix-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/armon/go-radix";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "armon";
-      repo = "go-radix";
-      sha256 = "0llq96lxh7p9426hjii8k42kq0cp1hflawh1kjwhbmi5g0jrq04d";
-    };
+  go-radix = buildFromGitHub {
+    rev    = "0bab926c3433cfd6490c6d3c504a7b471362390c";
+    owner  = "armon";
+    repo   = "go-radix";
+    sha256 = "0llq96lxh7p9426hjii8k42kq0cp1hflawh1kjwhbmi5g0jrq04d";
   };
 
   junegunn.go-runewidth = buildGoPackage rec {
@@ -1389,28 +1180,18 @@ let
     };
   };
 
-  go-runit = buildGoPackage rec {
-    rev = "a9148323a615e2e1c93b7a9893914a360b4945c8";
-    name = "go-runit-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/soundcloud/go-runit";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "soundcloud";
-      repo = "go-runit";
-      sha256 = "00f2rfhsaqj2wjanh5qp73phx7x12a5pwd7lc0rjfv68l6sgpg2v";
-    };
+  go-runit = buildFromGitHub {
+    rev    = "a9148323a615e2e1c93b7a9893914a360b4945c8";
+    owner  = "soundcloud";
+    repo   = "go-runit";
+    sha256 = "00f2rfhsaqj2wjanh5qp73phx7x12a5pwd7lc0rjfv68l6sgpg2v";
   };
 
-  go-simplejson = buildGoPackage rec {
-    rev = "1cfceb0e12f47ec02665ef480212d7b531d6f4c5";
-    name = "go-simplejson-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/bitly/go-simplejson";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "bitly";
-      repo = "go-simplejson";
-      sha256 = "1d8x0himl58qn87lv418djy6mbs66p9ai3zpqq13nhkfl67fj3bi";
-    };
+  go-simplejson = buildFromGitHub {
+    rev    = "1cfceb0e12f47ec02665ef480212d7b531d6f4c5";
+    owner  = "bitly";
+    repo   = "go-simplejson";
+    sha256 = "1d8x0himl58qn87lv418djy6mbs66p9ai3zpqq13nhkfl67fj3bi";
   };
 
   go-snappystream = buildGoPackage rec {
@@ -1426,17 +1207,11 @@ let
     propagatedBuildInputs = [ snappy-go ];
   };
 
-  go-syslog = buildGoPackage rec {
-    rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba";
-    name = "go-syslog-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/go-syslog";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "go-syslog";
-      sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3";
-    };
+  go-syslog = buildFromGitHub {
+    rev    = "42a2b573b664dbf281bd48c3cc12c086b17a39ba";
+    owner  = "hashicorp";
+    repo   = "go-syslog";
+    sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3";
   };
 
   go-systemd = buildGoPackage rec {
@@ -1472,29 +1247,18 @@ let
     };
   };
 
-  go-vhost = buildGoPackage rec {
-    rev = "c4c28117502e4bf00960c8282b2d1c51c865fe2c";
-    name = "go-vhost-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/inconshreveable/go-vhost";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "inconshreveable";
-      repo = "go-vhost";
-      sha256 = "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32";
-    };
+  go-vhost = buildFromGitHub {
+    rev    = "c4c28117502e4bf00960c8282b2d1c51c865fe2c";
+    owner  = "inconshreveable";
+    repo   = "go-vhost";
+    sha256 = "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32";
   };
 
-  go-zookeeper = buildGoPackage rec {
-    rev = "d0e0d8e11f318e000a8cc434616d69e329edc374";
-    name = "go-zookeeper-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/samuel/go-zookeeper";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "samuel";
-      repo = "go-zookeeper";
-      sha256 = "0v6g14ygnjl1l2fykyfjyvnab82a70jy0zzmsn5swlyy45b9gq2d";
-    };
+  go-zookeeper = buildFromGitHub {
+    rev    = "d0e0d8e11f318e000a8cc434616d69e329edc374";
+    owner  = "samuel";
+    repo   = "go-zookeeper";
+    sha256 = "0v6g14ygnjl1l2fykyfjyvnab82a70jy0zzmsn5swlyy45b9gq2d";
   };
 
   goquery = buildGoPackage rec {
@@ -1617,16 +1381,11 @@ let
     buildInputs = [ crypto ];
   };
 
-  httprouter = buildGoPackage rec {
-    rev = "bde5c16eb82ff15a1734a3818d9b9547065f65b1";
-    name = "httprouter-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/julienschmidt/httprouter";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "julienschmidt";
-      repo = "httprouter";
-      sha256 = "1l74pvqqhhval4vfnhca9d6i1ij69qs3ljf41w3m1l2id42rq7r9";
-    };
+  httprouter = buildFromGitHub {
+    rev    = "bde5c16eb82ff15a1734a3818d9b9547065f65b1";
+    owner  = "julienschmidt";
+    repo   = "httprouter";
+    sha256 = "1l74pvqqhhval4vfnhca9d6i1ij69qs3ljf41w3m1l2id42rq7r9";
   };
 
   influxdb = buildGoPackage rec {
@@ -1676,28 +1435,18 @@ let
     };
   };
 
-  flagfile = buildGoPackage rec {
-    rev = "871ce569c29360f95d7596f90aa54d5ecef75738";
-    name = "flagfile-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/spacemonkeygo/flagfile";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "spacemonkeygo";
-      repo = "flagfile";
-      sha256 = "1y6wf1s51c90qc1aki8qikkw1wqapzjzr690xrmnrngsfpdyvkrc";
-    };
+  flagfile = buildFromGitHub {
+    rev    = "871ce569c29360f95d7596f90aa54d5ecef75738";
+    owner  = "spacemonkeygo";
+    repo   = "flagfile";
+    sha256 = "1y6wf1s51c90qc1aki8qikkw1wqapzjzr690xrmnrngsfpdyvkrc";
   };
 
-  iochan = buildGoPackage rec {
-    rev = "b584a329b193e206025682ae6c10cdbe03b0cd77";
-    name = "iochan-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/mitchellh/iochan";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "mitchellh";
-      repo = "iochan";
-      sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b";
-    };
+  iochan = buildFromGitHub {
+    rev    = "b584a329b193e206025682ae6c10cdbe03b0cd77";
+    owner  = "mitchellh";
+    repo   = "iochan";
+    sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b";
   };
 
   ipfs = buildGoPackage rec {
@@ -1748,29 +1497,18 @@ let
     buildInputs = [ pkgs.leveldb ];
   };
 
-  liner = buildGoPackage rec {
-    rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced";
-    name = "liner-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/peterh/liner";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "peterh";
-      repo   = "liner";
-      sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48";
-    };
+  liner = buildFromGitHub {
+    rev    = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced";
+    owner  = "peterh";
+    repo   = "liner";
+    sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48";
   };
 
-  odeke-em.log = buildGoPackage rec {
-    rev = "cad53c4565a0b0304577bd13f3862350bdc5f907";
-    name = "log-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/odeke-em/log";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "odeke-em";
-      repo = "log";
-      sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w";
-    };
+  odeke-em.log = buildFromGitHub {
+    rev    = "cad53c4565a0b0304577bd13f3862350bdc5f907";
+    owner  = "odeke-em";
+    repo   = "log";
+    sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w";
   };
 
   log4go = buildGoPackage rec {
@@ -1811,30 +1549,18 @@ let
     propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ];
   };
 
-  logutils = buildGoPackage rec {
-    rev = "367a65d59043b4f846d179341d138f01f988c186";
-    name = "logutils-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/logutils";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "logutils";
-      sha256 = "0rjag8c6fn3f51nysrq62r46ma6gzyvijxba47q7cdfjq35mydb8";
-    };
+  logutils = buildFromGitHub {
+    rev    = "367a65d59043b4f846d179341d138f01f988c186";
+    owner  = "hashicorp";
+    repo   = "logutils";
+    sha256 = "0rjag8c6fn3f51nysrq62r46ma6gzyvijxba47q7cdfjq35mydb8";
   };
 
-  mapstructure = buildGoPackage rec {
-    rev = "f7d28d5aeab42b9b95d2e6d6b956f73a290077fc";
-    name = "mapstructure-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/mitchellh/mapstructure";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "mitchellh";
-      repo = "mapstructure";
-      sha256 = "1l9bxx0lrxdb75bxgy3jq2f6sgin2xd5ll70z5797vi96mlz8ydb";
-    };
+  mapstructure = buildFromGitHub {
+    rev    = "f7d28d5aeab42b9b95d2e6d6b956f73a290077fc";
+    owner  = "mitchellh";
+    repo   = "mapstructure";
+    sha256 = "1l9bxx0lrxdb75bxgy3jq2f6sgin2xd5ll70z5797vi96mlz8ydb";
   };
 
   mdns = buildGoPackage rec {
@@ -1893,16 +1619,11 @@ let
     buildInputs = [ pkgs.cyrus_sasl ];
   };
 
-  mousetrap = buildGoPackage rec {
-    rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa";
-    name = "mousetrap-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/inconshreveable/mousetrap";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "inconshreveable";
-      repo = "mousetrap";
-      sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b";
-    };
+  mousetrap = buildFromGitHub {
+    rev    = "9dbb96d2c3a964935b0870b5abaea13c98b483aa";
+    owner  = "inconshreveable";
+    repo   = "mousetrap";
+    sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b";
   };
 
   msgpack = buildGoPackage rec {
@@ -1933,30 +1654,18 @@ let
     buildInputs = [ context ];
   };
 
-  muxado = buildGoPackage rec {
-    rev = "f693c7e88ba316d1a0ae3e205e22a01aa3ec2848";
-    name = "muxado-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/inconshreveable/muxado";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "inconshreveable";
-      repo = "muxado";
-      sha256 = "1vgiwwxhgx9c899f6ikvrs0w6vfsnypzalcqyr0mqm2w816r9hhs";
-    };
+  muxado = buildFromGitHub {
+    rev    = "f693c7e88ba316d1a0ae3e205e22a01aa3ec2848";
+    owner  = "inconshreveable";
+    repo   = "muxado";
+    sha256 = "1vgiwwxhgx9c899f6ikvrs0w6vfsnypzalcqyr0mqm2w816r9hhs";
   };
 
-  mysql = buildGoPackage rec {
-    rev = "0cc29e9fe8e25c2c58cf47bcab566e029bbaa88b";
-    name = "mysql-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/go-sql-driver/mysql";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "go-sql-driver";
-      repo = "mysql";
-      sha256 = "0ydvd0mk53793sj3hgycsx926zvzxipxvppld1i175g3pn4d41xp";
-    };
+  mysql = buildFromGitHub {
+    rev    = "0cc29e9fe8e25c2c58cf47bcab566e029bbaa88b";
+    owner  = "go-sql-driver";
+    repo   = "mysql";
+    sha256 = "0ydvd0mk53793sj3hgycsx926zvzxipxvppld1i175g3pn4d41xp";
   };
 
   net-rpc-msgpackrpc = buildGoPackage rec {
@@ -1974,29 +1683,18 @@ let
     propagatedBuildInputs = [ ugorji.go ];
   };
 
-  ntp = buildGoPackage rec {
-    rev = "0a5264e2563429030eb922f258229ae3fee5b5dc";
-    name = "ntp-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/beevik/ntp";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "beevik";
-      repo = "ntp";
-      sha256 = "03fvgbjf2aprjj1s6wdc35wwa7k1w5phkixzvp5n1j21sf6w4h24";
-    };
+  ntp = buildFromGitHub {
+    rev    = "0a5264e2563429030eb922f258229ae3fee5b5dc";
+    owner  = "beevik";
+    repo   = "ntp";
+    sha256 = "03fvgbjf2aprjj1s6wdc35wwa7k1w5phkixzvp5n1j21sf6w4h24";
   };
 
-  objx = buildGoPackage rec {
-    rev = "cbeaeb16a013161a98496fad62933b1d21786672";
-    name = "objx-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/stretchr/objx";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "stretchr";
-      repo = "objx";
-      sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1";
-    };
+  objx = buildFromGitHub {
+    rev    = "cbeaeb16a013161a98496fad62933b1d21786672";
+    owner  = "stretchr";
+    repo   = "objx";
+    sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1";
   };
 
   oglematchers = buildGoPackage rec {
@@ -2069,30 +1767,18 @@ let
     };
   };
 
-  pat = buildGoPackage rec {
-    rev = "b8a35001b773c267eb260a691f4e5499a3531600";
-    name = "pat-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/bmizerany/pat";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "bmizerany";
-      repo = "pat";
-      sha256 = "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz";
-    };
+  pat = buildFromGitHub {
+    rev    = "b8a35001b773c267eb260a691f4e5499a3531600";
+    owner  = "bmizerany";
+    repo   = "pat";
+    sha256 = "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz";
   };
 
-  pathtree = buildGoPackage rec {
-    rev = "41257a1839e945fce74afd070e02bab2ea2c776a";
-    name = "pathtree-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/robfig/pathtree";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "robfig";
-      repo = "pathtree";
-      sha256 = "087hvskjx1zw815h1617i135vwsn5288v579mz6yral91wbn0kvi";
-    };
+  pathtree = buildFromGitHub {
+    rev    = "41257a1839e945fce74afd070e02bab2ea2c776a";
+    owner  = "robfig";
+    repo   = "pathtree";
+    sha256 = "087hvskjx1zw815h1617i135vwsn5288v579mz6yral91wbn0kvi";
   };
 
   panicwrap = buildGoPackage rec {
@@ -2110,28 +1796,18 @@ let
     propagatedBuildInputs = [ osext ];
   };
 
-  perks = buildGoPackage rec {
-    rev = "aac9e2eab5a334037057336897fd10b0289a5ae8";
-    name = "perks-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/bmizerany/perks";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "bmizerany";
-      repo = "perks";
-      sha256 = "1d027jgc327qz5xmal0hrpqvsj45i9yqmm9pxk3xp3hancvz3l3k";
-    };
+  perks = buildFromGitHub {
+    rev    = "aac9e2eab5a334037057336897fd10b0289a5ae8";
+    owner  = "bmizerany";
+    repo   = "perks";
+    sha256 = "1d027jgc327qz5xmal0hrpqvsj45i9yqmm9pxk3xp3hancvz3l3k";
   };
 
-  pb = buildGoPackage rec {
-    rev = "e648e12b78cedf14ebb2fc1855033f07b034cfbb";
-    name = "pb-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/cheggaaa/pb";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "cheggaaa";
-      repo = "pb";
-      sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam";
-    };
+  pb = buildFromGitHub {
+    rev    = "e648e12b78cedf14ebb2fc1855033f07b034cfbb";
+    owner  = "cheggaaa";
+    repo   = "pb";
+    sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam";
   };
 
   beorn7.perks = buildGoPackage rec {
@@ -2173,17 +1849,11 @@ let
     };
   };
 
-  pq = buildGoPackage rec {
-    rev = "93e9980741c9e593411b94e07d5bad8cfb4809db";
-    name = "pq-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/lib/pq";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "lib";
-      repo = "pq";
-      sha256 = "1q0zlizsk3xn7jn0skbvbhcxsfhq7z3dva96cm72n2r5vs5ld783";
-    };
+  pq = buildFromGitHub {
+    rev    = "93e9980741c9e593411b94e07d5bad8cfb4809db";
+    owner  = "lib";
+    repo   = "pq";
+    sha256 = "1q0zlizsk3xn7jn0skbvbhcxsfhq7z3dva96cm72n2r5vs5ld783";
   };
 
   pretty = buildGoPackage rec {
@@ -2260,28 +1930,18 @@ let
     };
   };
 
-  pty = buildGoPackage rec {
-    rev = "67e2db24c831afa6c64fc17b4a143390674365ef";
-    name = "pty-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/kr/pty";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "kr";
-      repo = "pty";
-      sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d";
-    };
+  pty = buildFromGitHub {
+    rev    = "67e2db24c831afa6c64fc17b4a143390674365ef";
+    owner  = "kr";
+    repo   = "pty";
+    sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d";
   };
 
-  pushover = buildGoPackage rec {
-    rev = "a8420a1935479cc266bda685cee558e86dad4b9f";
-    name = "pushover-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/thorduri/pushover";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "thorduri";
-      repo = "pushover";
-      sha256 = "0j4k43ppka20hmixlwhhz5mhv92p6wxbkvdabs4cf7k8jpk5argq";
-    };
+  pushover = buildFromGitHub {
+    rev    = "a8420a1935479cc266bda685cee558e86dad4b9f";
+    owner  = "thorduri";
+    repo   = "pushover";
+    sha256 = "0j4k43ppka20hmixlwhhz5mhv92p6wxbkvdabs4cf7k8jpk5argq";
   };
 
   raft = buildGoPackage rec {
@@ -2329,55 +1989,32 @@ let
     propagatedBuildInputs = [ gomdb ugorji.go raft ];
   };
 
-  raw = buildGoPackage rec {
-    rev = "724aedf6e1a5d8971aafec384b6bde3d5608fba4";
-    name = "raw-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/feyeleanor/raw";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "feyeleanor";
-      repo   = "raw";
-      sha256 = "0z4dcnadgk0fbxxd14dqa1wzzr0v3ksqlzd0swzs2mipim5wjgsz";
-    };
+  raw = buildFromGitHub {
+    rev    = "724aedf6e1a5d8971aafec384b6bde3d5608fba4";
+    owner  = "feyeleanor";
+    repo   = "raw";
+    sha256 = "0z4dcnadgk0fbxxd14dqa1wzzr0v3ksqlzd0swzs2mipim5wjgsz";
   };
 
-  raven-go = buildGoPackage rec {
-    rev = "c8f8fb7c415203f52ca882e2661d21bc6dcb54d7";
-    name = "raven-go-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/getsentry/raven-go";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "getsentry";
-      repo   = "raven-go";
-      sha256 = "052avpl8xsqlcmjmi3v00nm23lhs95af6vpaw2sh5xckln0lfbxh";
-    };
+  raven-go = buildFromGitHub {
+    rev    = "c8f8fb7c415203f52ca882e2661d21bc6dcb54d7";
+    owner  = "getsentry";
+    repo   = "raven-go";
+    sha256 = "052avpl8xsqlcmjmi3v00nm23lhs95af6vpaw2sh5xckln0lfbxh";
   };
 
-  redigo = buildGoPackage rec {
-    rev = "535138d7bcd717d6531c701ef5933d98b1866257";
-    name = "redigo-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/garyburd/redigo";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "garyburd";
-      repo   = "redigo";
-      sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v";
-    };
+  redigo = buildFromGitHub {
+    rev    = "535138d7bcd717d6531c701ef5933d98b1866257";
+    owner  = "garyburd";
+    repo   = "redigo";
+    sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v";
   };
 
-  reflectwalk = buildGoPackage rec {
-    rev = "242be0c275dedfba00a616563e6db75ab8f279ec";
-    name = "reflectwalk-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/mitchellh/reflectwalk";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "mitchellh";
-      repo   = "reflectwalk";
-      sha256 = "0xjyjs7ci7yaslk0rcgdw99ys2kq0p14cx6c90pmdzl0m9pcc9v4";
-    };
+  reflectwalk = buildFromGitHub {
+    rev    = "242be0c275dedfba00a616563e6db75ab8f279ec";
+    owner  = "mitchellh";
+    repo   = "reflectwalk";
+    sha256 = "0xjyjs7ci7yaslk0rcgdw99ys2kq0p14cx6c90pmdzl0m9pcc9v4";
   };
 
   revel = buildGoPackage rec {
@@ -2399,28 +2036,18 @@ let
     ];
   };
 
-  rgbterm = buildGoPackage rec {
-    rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283";
-    name = "rgbterm-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/aybabtme/rgbterm";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "aybabtme";
-      repo   = "rgbterm";
-      sha256 = "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam";
-    };
+  rgbterm = buildFromGitHub {
+    rev    = "c07e2f009ed2311e9c35bca12ec00b38ccd48283";
+    owner  = "aybabtme";
+    repo   = "rgbterm";
+    sha256 = "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam";
   };
 
-  ripper = buildGoPackage rec {
-    rev = "bd1a682568fcb8a480b977bb5851452fc04f9ccb";
-    name = "ripper-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/odeke-em/ripper";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "odeke-em";
-      repo = "ripper";
-      sha256 = "010jsclnmkaywdlyfqdmq372q7kh3qbz2zra0c4wn91qnkmkrnw1";
-    };
+  ripper = buildFromGitHub {
+    rev    = "bd1a682568fcb8a480b977bb5851452fc04f9ccb";
+    owner  = "odeke-em";
+    repo   = "ripper";
+    sha256 = "010jsclnmkaywdlyfqdmq372q7kh3qbz2zra0c4wn91qnkmkrnw1";
   };
 
   sandblast = buildGoPackage rec {
@@ -2533,16 +2160,11 @@ let
     };
   };
 
-  statos = buildGoPackage rec {
-    rev = "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6";
-    name = "statos-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/odeke-em/statos";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "odeke-em";
-      repo = "statos";
-      sha256 = "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs";
-    };
+  statos = buildFromGitHub {
+    rev    = "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6";
+    owner  = "odeke-em";
+    repo   = "statos";
+    sha256 = "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs";
   };
 
   statik = buildGoPackage rec {
@@ -2614,17 +2236,11 @@ let
     };
   };
 
-  toml = buildGoPackage rec {
-    rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
-    name = "toml-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/BurntSushi/toml";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "BurntSushi";
-      repo = "toml";
-      sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
-    };
+  toml = buildFromGitHub {
+    rev    = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
+    owner  = "BurntSushi";
+    repo   = "toml";
+    sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
   };
 
   usb = buildGoPackage rec {
@@ -2679,17 +2295,11 @@ let
     subPackages = [ "./" ];
   };
 
-  websocket = buildGoPackage rec {
-    rev = "f4076986b69612ecb8bc7ce06d742eda6286200d";
-    name = "websocket-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/gorilla/websocket";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "gorilla";
-      repo = "websocket";
-      sha256 = "09arvwlxw15maf4z8pcgjc25hd00mckqpdi0byafqfgm3nvvacvq";
-    };
+  websocket = buildFromGitHub {
+    rev    = "f4076986b69612ecb8bc7ce06d742eda6286200d";
+    owner  = "gorilla";
+    repo   = "websocket";
+    sha256 = "09arvwlxw15maf4z8pcgjc25hd00mckqpdi0byafqfgm3nvvacvq";
   };
 
   yaml-v1 = buildGoPackage rec {
@@ -2716,29 +2326,18 @@ let
     };
   };
 
-  yamux = buildGoPackage rec {
-    rev = "b2e55852ddaf823a85c67f798080eb7d08acd71d";
-    name = "yamux-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/yamux";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "yamux";
-      sha256 = "0mr87my5m8lgc0byjcddlclxg34d07cpi9p78ps3rhzq7p37g533";
-    };
+  yamux = buildFromGitHub {
+    rev    = "b2e55852ddaf823a85c67f798080eb7d08acd71d";
+    owner  = "hashicorp";
+    repo   = "yamux";
+    sha256 = "0mr87my5m8lgc0byjcddlclxg34d07cpi9p78ps3rhzq7p37g533";
   };
 
-  xon = buildGoPackage rec {
-    rev = "d580be739d723da4f6378083128f93017b8ab295";
-    name = "xon-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/odeke-em/xon";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "odeke-em";
-      repo = "xon";
-      sha256 = "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc";
-    };
+  xon = buildFromGitHub {
+    rev    = "d580be739d723da4f6378083128f93017b8ab295";
+    owner  = "odeke-em";
+    repo   = "xon";
+    sha256 = "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc";
   };
 
 }; in self

From 94302941148d606a5f3956adcca6ed70064eb6c8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 29 Jul 2015 09:08:51 +0000
Subject: [PATCH 0449/2016] Update awscli to 1.7.41

---
 pkgs/tools/admin/awscli/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix  | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 055abd6fbf0..f544b81e78d 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -2,12 +2,12 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "awscli-${version}";
-  version = "1.7.29";
+  version = "1.7.41";
   namePrefix = "";
 
   src = fetchzip {
     url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz";
-    sha256 = "0r0w5qldimdp2d2ykw7pmppn8chbhh6cm48famhldqnyrh3vrf02";
+    sha256 = "1xfvpqyxi5qaqcvm56q616k9zjidbc9l2vk1v3ld6lnlzri3a1ra";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25e6a22aa61..f04dc0bb5a6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1433,12 +1433,12 @@ let
   };
 
   botocore = buildPythonPackage rec {
-    version = "1.0.0a1";
+    version = "1.1.4";
     name = "botocore-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz";
-      sha256 = "0fybr48l0fvpc57n71khynpb4j0ibzn35bzybw6g1q9063xfwnxm";
+      sha256 = "1wbbaj0y6bfzsh61hgnnssn5j8m93r6r2m5r1jmlf6iz3l9gqkkp";
     };
 
     propagatedBuildInputs =
@@ -1447,6 +1447,8 @@ let
         self.jmespath
       ];
 
+    buildInputs = [ self.docutils ];
+
     meta = {
       homepage = https://github.com/boto/botocore;
 

From f936b3f6d98603fc881e8000243e2026e63b8520 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 29 Jul 2015 09:52:05 +0000
Subject: [PATCH 0450/2016] motuclient: Change homepage

---
 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 8780b576336..6a431d69fb6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3873,12 +3873,12 @@ let
     disabled = !isPy27;
 
     src = pkgs.fetchurl {
-      url = "https://gitlab.com/lsix/motu-client/repository/archive.tar.gz?ref=${name}";
-      sha256 = "1d2hbws085hxf5hb1wsdlacy8skwn2sswr1b2xv18fbw5ckbqi8i";
+      url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${name}.tar.gz";
+      sha256 = "1naqmav312agn72iad9kyxwscn2lz4v1cfcqqi1qcgvc82vnwkw2";
     };
 
     meta = {
-      homepage = https://gitlab.com/lsix/motu-client;
+      homepage = https://github.com/quiet-oceans/motuclient-setuptools;
       description = "CLI to query oceanographic data to Motu servers";
       longDescription = ''
         Access data from (motu)[http://sourceforge.net/projects/cls-motu/] servers.

From 203dad10fec6b9285bc063f2aa66fc97c17849c3 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 29 Jul 2015 12:30:01 +0200
Subject: [PATCH 0451/2016] Revert "Merge pull request #9034 from
 kamilchm/qtile-wm"

This reverts commit 27c73e252a042e88b3fae35f538d7e719d8ba9ea, reversing
changes made to 94302941148d606a5f3956adcca6ed70064eb6c8.
---
 .../services/x11/desktop-managers/default.nix |  2 +-
 .../services/x11/desktop-managers/qtile.nix   | 25 -------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 nixos/modules/services/x11/desktop-managers/qtile.nix

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index d4453e6755b..998bcd354c5 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -19,7 +19,7 @@ in
   # E.g., if KDE is enabled, it supersedes xterm.
   imports = [
     ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix
-    ./e19.nix ./gnome3.nix ./kodi.nix ./qtile.nix
+    ./e19.nix ./gnome3.nix ./kodi.nix
   ];
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/qtile.nix b/nixos/modules/services/x11/desktop-managers/qtile.nix
deleted file mode 100644
index a26512dbd75..00000000000
--- a/nixos/modules/services/x11/desktop-managers/qtile.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.xserver.desktopManager.qtile;
-in
-
-{
-  options = {
-    services.xserver.windowManager.qtile.enable = mkEnableOption "qtile";
-  };
-
-  config = mkIf cfg.enable {
-    services.xserver.desktopManager.session = [{
-      name = "qtile";
-      start = ''
-        ${pkgs.qtile}/bin/qtile
-        waitPID=$!
-      '';
-    }];
-    
-    environment.systemPackages = [ pkgs.qtile ];
-  };
-}

From e3d359a507cd24ba761829b6563f7efd6ab9bda9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Jul 2015 21:31:17 +0300
Subject: [PATCH 0452/2016] haskellPackages.misfortune: remove redundant patch

---
 .../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 -----
 1 file changed, 5 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 b223eeb134b..e9f2219f07e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -144,11 +144,6 @@ self: super: {
     prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal";
   });
 
-  misfortune = appendPatch super.misfortune (pkgs.fetchpatch {
-    url = "https://github.com/mokus0/misfortune/commit/9e0a38cf8d59a0de9ae1156034653f32099610e4.patch";
-    sha256 = "01m1l199ihq85j9pyc3n0wqv1z4my453hhhcvg3yz3gpz3lf224r";
-  });
-
   timezone-series = doJailbreak super.timezone-series;
   timezone-olson = doJailbreak super.timezone-olson;
   libmpd = dontCheck super.libmpd;

From 763fda70f081707bda58676123b702caae0d9db9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 29 Jul 2015 11:14:50 +0000
Subject: [PATCH 0453/2016] wrapGAppsHook: build hook for wrapping GTK/GNOME
 apps

---
 .../setup-hooks/wrap-gapps-hook.sh            | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh

diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
new file mode 100644
index 00000000000..4b1a9527b11
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -0,0 +1,33 @@
+gappsWrapperArgs=()
+
+wrapGAppsHook() {
+  if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then
+    gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")
+  fi
+
+  if [ -n "$XDG_ICON_DIRS" ]; then
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS")
+  fi
+
+  if [ -n "$GSETTINGS_SCHEMAS_PATH" ]; then
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH")
+  fi
+
+  if [ -d "$prefix/share" ]; then
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$out/share")
+  fi
+
+  for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
+    eval local dummy="\$$v"
+    gappsWrapperArgs+=(--prefix $v : "$dummy")
+  done
+
+  if [ -z "$dontWrapGApps" ]; then
+    for i in $prefix/bin/* $prefix/libexec/*; do
+      echo "Wrapping app $i"
+      wrapProgram "$i" "${gappsWrapperArgs[@]}"
+    done
+  fi
+}
+
+fixupOutputHooks+=(wrapGAppsHook)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cf462adeb3..c77fbf47c54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -512,6 +512,10 @@ let
 
   findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh;
 
+  wrapGAppsHook = makeSetupHook {
+    deps = [ makeWrapper ];
+  } ../build-support/setup-hooks/wrap-gapps-hook.sh;
+
 
   ### TOOLS
 

From ed3c294e7561873ee6fd41050ff40fd13c4f59ab Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 29 Jul 2015 11:15:35 +0000
Subject: [PATCH 0454/2016] grilo: add setup hook for grilo plugins

---
 pkgs/desktops/gnome-3/3.16/core/grilo/default.nix   | 2 ++
 pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh | 7 +++++++
 2 files changed, 9 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh

diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
index a9be29f2b0e..18551aae8b9 100644
--- a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "11bvc7rsrjjwz8hp67p3fn8zmywrpawrcbi3vgw8b0dwa0sndd2m";
   };
 
+  setupHook = ./setup-hook.sh;
+
   configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
 
   preConfigure = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh
new file mode 100644
index 00000000000..bc93dddec38
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh
@@ -0,0 +1,7 @@
+make_grilo_find_plugins() {
+    if [ -d "$1"/lib/grilo-0.2 ]; then
+        addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.2"
+    fi
+}
+
+envHooks+=(make_grilo_find_plugins)

From 0db56d47cc6911b5928d9baa4de8ba6f7024bbe7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 29 Jul 2015 11:16:33 +0000
Subject: [PATCH 0455/2016] gnome-photos: use wrapGAppsHook

---
 .../gnome-3/3.16/apps/gnome-photos/default.nix    | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
index fba1a541812..6d9598ee369 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
@@ -1,7 +1,7 @@
 { stdenv, intltool, fetchurl, exempi, libxml2
 , pkgconfig, gtk3, glib, hicolor_icon_theme
 , makeWrapper, itstool, gegl, babl, lcms2
-, desktop_file_utils, gmp, libmediaart
+, desktop_file_utils, gmp, libmediaart, wrapGAppsHook
 , gnome3, librsvg, gdk_pixbuf, libexif }:
 
 stdenv.mkDerivation rec {
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
 
   # doCheck = true;
 
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata
@@ -24,16 +22,7 @@ stdenv.mkDerivation rec {
                   gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
                   gnome3.gnome_online_accounts gnome3.gnome_desktop
                   lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
-                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
+                  wrapGAppsHook ];
 
   enableParallelBuilding = true;
 

From 7ef2102b672bc4ce299f7c417ef612be3db28ed0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 29 Jul 2015 11:16:45 +0000
Subject: [PATCH 0456/2016] gnome-music: use wrapGAppsHook

---
 .../gnome-3/3.16/apps/gnome-music/default.nix  | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
index 31ee8a7230c..4cb466fa482 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, gdk_pixbuf, tracker
-, python3, libxml2, python3Packages, libnotify
+, python3, libxml2, python3Packages, libnotify, wrapGAppsHook
 , pkgconfig, gtk3, glib, hicolor_icon_theme, cairo
 , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
 
@@ -15,24 +15,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
                   gdk_pixbuf gnome3.adwaita-icon-theme librsvg python3
-                  gnome3.grilo libxml2 python3Packages.pygobject3 libnotify
+                  gnome3.grilo gnome3.grilo-plugins libxml2 python3Packages.pygobject3 libnotify
                   python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  hicolor_icon_theme gnome3.adwaita-icon-theme wrapGAppsHook
                   gnome3.gsettings_desktop_schemas makeWrapper tracker ];
 
-  enableParallelBuilding = true;
+  wrapPrefixVariables = [ "PYTHONPATH" ];
 
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-music" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
-      --prefix PYTHONPATH : "$PYTHONPATH"
-  '';
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Music;

From 95c2935061e6929b84248f7645f97d28c8dd8c9f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 29 Jul 2015 11:16:55 +0000
Subject: [PATCH 0457/2016] gnome-documents: use wrapGAppsHook

---
 .../gnome-3/3.16/apps/gnome-documents/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
index 50fff0cd1d2..7ca61f92d8a 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
@@ -3,7 +3,7 @@
 , makeWrapper, itstool, libxslt, webkitgtk
 , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
 , gobjectIntrospection, json_glib
-, gmp, desktop_file_utils }:
+, gmp, desktop_file_utils, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "gnome-documents-${gnome3.version}.0";
@@ -24,21 +24,14 @@ stdenv.mkDerivation rec {
                   libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
                   gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
                   gnome3.gnome_desktop gnome3.libzapojit json_glib
-                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+                  wrapGAppsHook ];
 
   enableParallelBuilding = true;
 
-  preFixup =
-    ''
+  preFixup = ''
     substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
 
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-        --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi"
-    done
+    gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi')
   '';
 
   meta = with stdenv.lib; {

From d74c41488724bce64d72e981becd41abfec24634 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 29 Jul 2015 11:17:04 +0000
Subject: [PATCH 0458/2016] gnome-clocks: use wrapGAppsHook

---
 .../gnome-3/3.16/apps/gnome-clocks/default.nix       | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
index 8bdfcfd9f88..b1a57b9e68d 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
@@ -1,7 +1,7 @@
 { stdenv, intltool, fetchurl, libgweather, libnotify
 , pkgconfig, gtk3, glib, hicolor_icon_theme, gsound
 , makeWrapper, itstool, libcanberra_gtk3, libtool
-, gnome3, librsvg, gdk_pixbuf, geoclue2 }:
+, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "gnome-clocks-${gnome3.version}.1";
@@ -13,23 +13,15 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
                   gnome3.gsettings_desktop_schemas makeWrapper
                   gdk_pixbuf gnome3.adwaita-icon-theme librsvg
                   gnome3.gnome_desktop gnome3.geocode_glib geoclue2
                   libgweather libnotify libtool gsound
-                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+                  hicolor_icon_theme wrapGAppsHook ];
 
   enableParallelBuilding = true;
 
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-clocks" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Clocks;
     description = "Clock application designed for GNOME 3";

From 8d51c46f306afa2ad7a1dfc485b6b7b3c3ae2007 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Wed, 29 Jul 2015 13:04:42 +0200
Subject: [PATCH 0459/2016] gnome3: Add missing hicolor_icon_theme dependency
 to several packages

---
 .../gnome-3/3.16/core/gnome-online-accounts/default.nix     | 4 ++--
 pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix   | 4 ++--
 .../gnome-3/3.16/core/gnome-themes-standard/default.nix     | 6 ++++--
 pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix         | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
index 8e0c1709642..0040b03b36a 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper
 , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
 , telepathy_glib, intltool, dbus_libs, icu, autoreconfHook
-, libsoup, docbook_xsl_ns, docbook_xsl, gnome3
+, libsoup, docbook_xsl_ns, docbook_xsl, gnome3, hicolor_icon_theme
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper
                   libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook
-                  docbook_xsl_ns docbook_xsl ];
+                  docbook_xsl_ns docbook_xsl hicolor_icon_theme ];
 
   preFixup = ''
     for f in "$out/libexec/"*; do
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
index 63fea43baed..7bb769df2e9 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg }:
+, libxslt, intltool, makeWrapper, systemd, xorg, hicolor_icon_theme }:
 
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt 
-      gnome3.gnome_settings_daemon xorg.xtrans
+      gnome3.gnome_settings_daemon xorg.xtrans hicolor_icon_theme
       gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
index 6e98b9817c1..48ea2809bcf 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }:
+{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2
+, gdk_pixbuf, hicolor_icon_theme }:
 
 stdenv.mkDerivation rec {
   name = "gnome-themes-standard-${gnome3.version}.0";
@@ -7,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0kyrbfrgl6g6wm6zpllldz36fclvl8vwmn1snwk18kf7f6ncpsac";
   };
   
-  buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];
+  buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf
+                  hicolor_icon_theme ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
index e59d81f3c1d..2b5b5f308ab 100644
--- a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool
-, glib, gtk3, gobjectIntrospection, python, pygobject3
+, glib, gtk3, gobjectIntrospection, python, pygobject3, hicolor_icon_theme
 }:
 
 let
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =  [
    intltool pkgconfig
-   glib gtk3 gobjectIntrospection python pygobject3
+   glib gtk3 gobjectIntrospection python pygobject3 hicolor_icon_theme
   ];
 
   src = fetchurl {

From 1ce5c9683656f4aabe316f59cdafa74a7ce1b123 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Wed, 29 Jul 2015 13:19:42 +0200
Subject: [PATCH 0460/2016] gnome3: Add hicolor_icon_theme to core packages

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

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 67236ae202b..ee56b6211c8 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -21,6 +21,7 @@ let
     glib_networking gvfs dconf gnome-backgrounds gnome_control_center
     gnome-menus gnome_settings_daemon gnome_shell
     gnome_themes_standard defaultIconTheme gnome-shell-extensions
+    pkgs.hicolor_icon_theme
   ];
 
   optionalPackages = with gnome3; [ baobab empathy eog epiphany evince

From f5954509122160ed8209a3158e49ae054c12fcf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 29 Jul 2015 00:30:58 +0200
Subject: [PATCH 0461/2016] eclipse: switch to officially mirrored download
 URLs

That is, replace all mirror specific URLs with the generic form:

  http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/path/to/file

* r=1 auto-redirects to best mirror
* nf=1 returns HTTP 404 if there is no file, instead of HTML data

It's documented here:

  http://wiki.eclipse.org/IT_Infrastructure_Doc#Use_mirror_sites.2Fsee_which_mirrors_are_mirroring_my_files.3F

All URLs are tested (they work).
---
 pkgs/applications/editors/eclipse/default.nix | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 8b940bbd984..3ec49897321 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -70,12 +70,12 @@ in {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk-x86_64.tar.gz;
           md5 = "54e2ce0660b2b1b0eb4267acf70ea66d";
         }
       else
         fetchurl {
-          url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz;
           md5 = "bde55a2354dc224cf5f26e5320e72dac";
         };
   };
@@ -88,12 +88,12 @@ in {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk-x86_64.tar.gz;
           sha256 = "0dfcfadcd6337c897fbfd5b292de481931dfce12d43289ecb93691fd27dd47f4";
         }
       else
         fetchurl {
-          url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk.tar.gz;
           sha256 = "1bh8ykliqr8wbciv13vpiy50rvm7yszk7y8dslr796dbwhi5b1cj";
         };
   };
@@ -120,12 +120,12 @@ in {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://eclipse.ialto.com/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz;
           sha1 = "6f914e11fa15a900c46825e4aa8299afd76e7e65";
         }
       else
         fetchurl {
-          url = http://eclipse.ialto.com/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk.tar.gz;
           sha1 = "1156e4bc0253ae3a3a4e54839e4944dc64d3108f";
         };
   };
@@ -136,12 +136,12 @@ in {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk-x86_64.tar.gz;
           sha1 = "e96f5f006298f68476f4a15a2be8589158d5cc61";
         }
       else
         fetchurl {
-          url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk.tar.gz;
           sha1 = "696377895bb26445de39d82a916b7e69edb1d939";
         };
   };
@@ -151,11 +151,11 @@ in {
     description = "Eclipse Classic";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk-x86_64.tar.gz;
           sha256 = "0nf4nv7awhp1k8b1hjb7chpjyjrqnyszsjbc4dlk9phpjv3j4wg5";
         };
       "i686-linux" = fetchurl {
-          url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk.tar.gz;
           sha256 = "1isn7i45l9kyn2yx6vm88jl1gnxph8ynank0aaa218cg8kdygk7j";
         };
     };
@@ -167,12 +167,12 @@ in {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://eclipse.ialto.com/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk-x86_64.tar.gz;
           sha256 = "14ppc9g9igzvj1pq7jl01vwhzb66nmzbl9wsdl1sf3xnwa9wnqk3";
         }
       else
         fetchurl {
-          url = http://eclipse.ialto.com/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk.tar.gz;
           sha256 = "1cvg1vgyazrkinwzlvlf0dpl197p4784752srqybqylyj5psdi3b";
         };
   };
@@ -183,12 +183,12 @@ in {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://eclipse.ialto.com/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk-x86_64.tar.gz;
           sha256 = "1qq04926pf7v9sf3s0z53zvlbl1j0rmmjmbmhqi49473fnjikh7y";
         }
       else
         fetchurl {
-          url = http://eclipse.ialto.com/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk.tar.gz;
           sha256 = "1a4s9qlhfpfpdhvffyglnfdr3dq5r2ywcxqywhqi95yhq5nmsgyk";
         };
   };
@@ -199,12 +199,12 @@ in {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/kepler/SR2/eclipse-cpp-kepler-SR2-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/kepler/SR2/eclipse-cpp-kepler-SR2-linux-gtk-x86_64.tar.gz;
           sha256 = "16zhjm6bx78263b1clg75kfiliahkhwg0k116vp9fj039nlpc30l";
         }
       else
         fetchurl {
-          url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/kepler/SR2/eclipse-cpp-kepler-SR2-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/kepler/SR2/eclipse-cpp-kepler-SR2-linux-gtk.tar.gz;
           sha256 = "0d6jlj7hwz8blx6csrlyi2h2prql0wckbh7ihwjmgclwpcpj84g6";
         };
   };
@@ -215,12 +215,12 @@ in {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk-x86_64.tar.gz;
           md5 = "b0a6ee33e8108a7ff4682ab911271b04";
         }
       else
         fetchurl {
-          url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk.tar.gz;
           md5 = "5000f93cecf6ef9af112f0df6e8c87f3";
         };
   };
@@ -248,12 +248,12 @@ in {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk-x86_64.tar.gz;
           sha256 = "1mlyy90lk08lb2971ynglgi3nqvqfq1k70md2kb39jk160wd1xrk";
         }
       else
         fetchurl {
-          url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk.tar.gz;
           sha256 = "1av6qm9wkbyk123qqf38f0jq4jv2bj9wp6fmpnl55zg6qr463c1w";
         };
     };
@@ -263,11 +263,11 @@ in {
     description = "Eclipse Classic";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops4/R-4.2.2-201302041200/eclipse-SDK-4.2.2-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.2.2-201302041200/eclipse-SDK-4.2.2-linux-gtk-x86_64.tar.gz;
           sha256 = "0ysa6ymk4h3k1vn59dc909iy197kmx132671kbzfwbim87jmgnqb";
         };
       "i686-linux" = fetchurl {
-          url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops4/R-4.2.2-201302041200/eclipse-SDK-4.2.2-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.2.2-201302041200/eclipse-SDK-4.2.2-linux-gtk.tar.gz;
           sha256 = "038yibbrcia38wi72qrdl03g7l35mpvl5nxdfdnvpqxrkfffb826";
         };
     };
@@ -278,11 +278,11 @@ in {
     description = "Eclipse Classic";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk-x86_64.tar.gz;
           sha256 = "0ncm56ylwxw9z8rk8ccgva68c2yr9yrf1kcr1zkgw6p87xh1yczd";
         };
       "i686-linux" = fetchurl {
-          url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk.tar.gz;
           sha256 = "1zxsh838khny7mvl01h28xna6xdh01yi4mvls28zj22v0340lgsg";
         };
     };
@@ -293,11 +293,11 @@ in {
     description = "Eclipse Classic";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk-x86_64.tar.gz;
           sha256 = "14hdkijsjq0hhzi9ijpwjjkhz7wm0pry86l3dniy5snlh3l5bsb2";
         };
       "i686-linux" = fetchurl {
-          url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk.tar.gz;
           sha256 = "0hjc4zrsmik6vff851p0a4ydnx99840j2xrx8348kk6h0af8vx6z";
         };
     };
@@ -308,12 +308,12 @@ in {
     description = "Eclipse Classic";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk-x86_64.tar.gz;
           sha256 = "0g00alsixfaakmn4khr0m9fxvkrbhbg6qqfa27xr6a9np6gzg98l";
 
         };
       "i686-linux" = fetchurl {
-          url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz;
           sha256 = "1hacyjjwhhxi7r3xyhpqgjqpd5r0irw9bfkalz5s5l6shb0lq4i7";
         };
     };
@@ -324,12 +324,12 @@ in {
     description = "Eclipse Mars Classic";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk-x86_64.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk-x86_64.tar.gz;
           sha256 = "0vfql4gh263ms8bg7sgn05gnjajplx304cn3nr03jlacgr3pkarf";
 
         };
       "i686-linux" = fetchurl {
-          url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk.tar.gz;
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk.tar.gz;
           sha256 = "0xv66l6hdlvxpswcqrsh398wg6xhy30f833dr7jvvz45s5437hm3";
         };
     };

From 6fd8428edff4e3c44a01bd181ee555dfb4bac73a Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Wed, 29 Jul 2015 14:36:21 +0200
Subject: [PATCH 0462/2016] iojs: 2.4.0 -> 2.5.0

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

diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index d5f9baa0528..e8658e09183 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
 
 let
-  version = "2.4.0";
+  version = "2.5.0";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
     url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = "0g81bn8q4zgm8skkbxbzwa22dnpbing4b5wjqacvpxq3ygz4c98y";
+    sha256 = "0jj0xqwpq7s45bycs406ml12xyknxgad4vyw9k84al3551m5y2wd";
   };
 
   prePatch = ''

From 490979c7ce96e52e44268599014362df23717312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 29 Jul 2015 15:01:04 +0200
Subject: [PATCH 0463/2016] evolution: add missing openssl dependency

Fixes recently introduced "ld: cannot find -lcrypto" build error.
---
 .../gnome-3/3.16/core/evolution-data-server/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 82397b385d5..883a17661e9 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
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, python
-, intltool, libsoup, libxml2, libsecret, icu, sqlite
+, intltool, libsoup, libxml2, libsecret, icu, sqlite, openssl
 , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
 
 
@@ -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 openssl ]
     ++ stdenv.lib.optional valaSupport vala;
 
   propagatedBuildInputs = [ libsecret nss nspr libical db ];

From e897cd502df74374356199c0c9158f4d03bfea3b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 29 Jul 2015 13:35:57 +0000
Subject: [PATCH 0464/2016] Revert "gnome3: file-roller: add openssl
 dependency"

This reverts commit 64f3fb96d8950e4a63f8478c84dd51c126e38ae5.

This is not the right fix. It's probably a broken .la file.
---
 pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
index 926464ff7be..d36162e13c2 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2
-, libarchive, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf
-, hicolor_icon_theme, openssl }:
+{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
+, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }:
 
 stdenv.mkDerivation rec {
   name = "file-roller-${version}";
@@ -17,7 +16,7 @@ stdenv.mkDerivation rec {
   # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
 
   buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
-                  hicolor_icon_theme gnome3.adwaita-icon-theme openssl
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
                   attr bzip2 acl gdk_pixbuf librsvg makeWrapper ];
 
   preFixup = ''

From 11643f47c35eebe3c44fb1f02b6bd982ada02ab9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 29 Jul 2015 13:36:23 +0000
Subject: [PATCH 0465/2016] Revert "evolution: add missing openssl dependency"

This reverts commit 490979c7ce96e52e44268599014362df23717312.

This is not the right fix. It's probably a broken .la file.
---
 .../gnome-3/3.16/core/evolution-data-server/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 883a17661e9..82397b385d5 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
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, python
-, intltool, libsoup, libxml2, libsecret, icu, sqlite, openssl
+, intltool, libsoup, libxml2, libsecret, icu, sqlite
 , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
 
 
@@ -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 openssl ]
+      gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite ]
     ++ stdenv.lib.optional valaSupport vala;
 
   propagatedBuildInputs = [ libsecret nss nspr libical db ];

From f64a24da5cd294d37bd9ba789ee462e29997757e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 29 Jul 2015 15:38:19 +0200
Subject: [PATCH 0466/2016] docbook_xml_dtd: add version 4.4

We already have 4.3 and 4.5, but for the latest "moreutils" package
update we need version 4.4.
---
 pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix                    |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix

diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
new file mode 100644
index 00000000000..98a1853e494
--- /dev/null
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, unzip}:
+
+import ./generic.nix {
+  inherit stdenv fetchurl unzip;
+  name = "docbook-xml-4.4";
+  src = fetchurl {
+    url = http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip;
+    sha256 = "141h4zsyc71sfi2zzd89v4bb4qqq9ca1ri9ix2als9f4i3mmkw82";
+  };
+  meta = {
+    branch = "4.4";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b2824df5dc..14f98fd8dd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10412,6 +10412,8 @@ let
 
   docbook_xml_dtd_43 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix { };
 
+  docbook_xml_dtd_44 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix { };
+
   docbook_xml_dtd_45 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix { };
 
   docbook_xml_ebnf_dtd = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf { };

From 72d7e4048c62574fb4c3d9d15556b531ab5a65da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 29 Jul 2015 15:39:51 +0200
Subject: [PATCH 0467/2016] moreutils: 0.55 -> 0.57

(Implicitly fixes build, since 0.55 source has disappeared.)

Also add needed "docbook_xml_dtd_44" dependency for the new version.
---
 pkgs/tools/misc/moreutils/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index 843672fa26c..feb5710282f 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchurl, libxml2, libxslt, docbook-xsl, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }:
+{ stdenv, fetchurl, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "moreutils-${version}";
-  version = "0.55";
+  version = "0.57";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz";
-    sha256 = "1dcah2jx8dbznn8966xl7sf1jrld2qfh6l6xcmx9dsnf8p8mr7fs";
+    sha256 = "078dpkwwwrv8hxnylbc901kib2d1rr3hsja37j6dlpjfcfq58z9s";
   };
 
   preBuild = ''
     substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook
   '';
 
-  buildInputs = [ libxml2 libxslt docbook-xsl makeWrapper ];
+  buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ];
 
   propagatedBuildInputs = [ perl IPCRun TimeDate TimeDuration ];
 

From d202f0c62527f5c11d58bbe172b54e58cbca6f39 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 29 Jul 2015 13:33:47 +0000
Subject: [PATCH 0468/2016] gnome-documents: add getting started pdf

---
 pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
index 7ca61f92d8a..9059b677900 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gtk3, glib, hicolor_icon_theme
 , makeWrapper, itstool, libxslt, webkitgtk
 , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
-, gobjectIntrospection, json_glib
+, gobjectIntrospection, json_glib, inkscape, poppler_utils
 , gmp, desktop_file_utils, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  configureFlags = [ "--enable-getting-started" ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
-                  docbook_xsl desktop_file_utils
+                  docbook_xsl desktop_file_utils inkscape poppler_utils
                   gnome3.gsettings_desktop_schemas makeWrapper gmp
                   gdk_pixbuf gnome3.adwaita-icon-theme librsvg evince
                   libsoup webkitgtk gjs gobjectIntrospection gnome3.rest

From 21579ef5d0f2341c9a6f9eab4d3f1f1a205445e7 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 29 Jul 2015 13:21:38 +0200
Subject: [PATCH 0469/2016] rustcMaster: 2015-07-01 -> 2015-07-28

---
 pkgs/development/compilers/rustc/head.nix     | 20 +++++++++----------
 .../compilers/rustc/patches/head.patch        |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 2e890f2fb76..9d415eed0b4 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -1,16 +1,16 @@
 { stdenv, callPackage }:
 callPackage ./generic.nix {
-  shortVersion = "2015-07-01";
+  shortVersion = "2015-07-28";
   isRelease = false;
-  # src rev for master on 2015-07-01
-  srcRev = "bf3c979ec";
-  srcSha = "1xp2fjffz5bwxfs37w80bdhy9lv091ps7xbnsvxid2i91rbxfrkk";
-  snapshotHashLinux686 = "a6f22e481eabf098cc65bda97bf7e434a1fcc20b";
-  snapshotHashLinux64 = "5fd8698fdfe953e6c4d86cf4fa1d5f3a0053248c";
-  snapshotHashDarwin686 = "9a273324a6b63a40f67a553029c0a9fb692ffd1f";
-  snapshotHashDarwin64 = "e5b12cb7c179fc98fa905a3c84803645d946a6ae";
-  snapshotDate = "2015-05-24";
-  snapshotRev = "ba0e1cd";
+  # src rev for 2015-07-28's nightly channel
+  srcRev = "8b835572b";
+  srcSha = "1qrw0vszr1zipsbp7gcm8kik73d2bfxwv6mniv81ygn9i7v76wfz";
+  snapshotHashLinux686 = "93f6216a35d3bed3cedf244c9aff4cd716336bd9";
+  snapshotHashLinux64 = "d8f4967fc71a153c925faecf95a7feadf7e463a4";
+  snapshotHashDarwin686 = "29852c4d4b5a851f16d627856a279cae5bf9bd01";
+  snapshotHashDarwin64 = "1a20259899321062a0325edb1d22990f05d18708";
+  snapshotDate = "2015-07-17";
+  snapshotRev = "d4432b3";
   patches = [
     ./patches/head.patch
   ] ++ 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 d7bede68682..ace22c825f9 100644
--- a/pkgs/development/compilers/rustc/patches/head.patch
+++ b/pkgs/development/compilers/rustc/patches/head.patch
@@ -1,11 +1,11 @@
 diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
-index a42f861..bda4bde 100644
+index 39e4291..b352bd1 100644
 --- a/src/librustc_back/target/mod.rs
 +++ b/src/librustc_back/target/mod.rs
-@@ -172,8 +172,8 @@ impl Default for TargetOptions {
-     /// incomplete, and if used for compilation, will certainly not work.
+@@ -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

From 4ce9e121422f6a5564918be61b6ce0fd13e736ae Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 29 Jul 2015 15:14:55 +0000
Subject: [PATCH 0470/2016] quadrapassel: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  6 ++++-
 .../3.16/games/quadrapassel/default.nix       | 26 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index ee56b6211c8..98219d88c5f 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -33,7 +33,9 @@ let
     nautilus-sendto dconf-editor vinagre
   ];
 
-  gamesPackages = with gnome3; [ swell-foop lightsoff iagno ];
+  gamesPackages = with gnome3; [ swell-foop lightsoff iagno
+    quadrapassel
+  ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
   inherit (pkgs.gnome2) ORBit2;
@@ -291,6 +293,8 @@ let
 
   swell-foop = callPackage ./games/swell-foop { };
 
+  quadrapassel = callPackage ./games/quadrapassel { };
+
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
   california = callPackage ./misc/california { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix
new file mode 100644
index 00000000000..ba3de4ff9ae
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
+, librsvg, libcanberra_gtk3
+, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "quadrapassel-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/quadrapassel/${gnome3.version}/${name}.tar.xz";
+    sha256 = "17c6ddjgmakj615ahnrmrzayjxc2ylr8dddfzi9py875q5vk7grx";
+  };
+
+  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+                  libcanberra_gtk3 itstool intltool clutter
+                  libxml2 clutter_gtk wrapGAppsHook ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Quadrapassel;
+    description = "Classic falling-block game, Tetris";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From da6193ad4b4b91396ce8fbeab6595af23f75f42a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 29 Jul 2015 15:24:41 +0000
Subject: [PATCH 0471/2016] tali: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 +++-
 .../gnome-3/3.16/games/tali/default.nix       | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/tali/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 98219d88c5f..8a3fc5e1836 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -34,7 +34,7 @@ let
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
-    quadrapassel
+    tali quadrapassel
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -293,6 +293,8 @@ let
 
   swell-foop = callPackage ./games/swell-foop { };
 
+  tali = callPackage ./games/tali { };
+
   quadrapassel = callPackage ./games/quadrapassel { };
 
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
diff --git a/pkgs/desktops/gnome-3/3.16/games/tali/default.nix b/pkgs/desktops/gnome-3/3.16/games/tali/default.nix
new file mode 100644
index 00000000000..c89cc7bfe59
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/tali/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
+, librsvg, intltool, itstool, libxml2, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "tali-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/tali/${gnome3.version}/${name}.tar.xz";
+    sha256 = "10cfgxiqg38z5ngkiznglxjgm1552mjvfw4bjhjic0yi5cvdr6dg";
+  };
+
+  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+                  libxml2 itstool intltool wrapGAppsHook ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Tali;
+    description = "Sort of poker with dice and less money";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From b9dd9bb7e6be3c2433aaab1b0e03c93cda3e1b4b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 29 Jul 2015 15:38:42 +0000
Subject: [PATCH 0472/2016] gnome3: add maintainers list

---
 pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix             | 2 +-
 pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix           | 2 +-
 pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix               | 2 +-
 pkgs/desktops/gnome-3/3.16/apps/glade/default.nix               | 2 +-
 pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix        | 2 +-
 pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix     | 2 +-
 pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix         | 2 +-
 pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix        | 2 +-
 pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix     | 2 +-
 pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix            | 2 +-
 pkgs/desktops/gnome-3/3.16/core/baobab/default.nix              | 2 +-
 pkgs/desktops/gnome-3/3.16/core/empathy/default.nix             | 2 +-
 pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix            | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix     | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix    | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix      | 2 +-
 .../desktops/gnome-3/3.16/core/gnome-control-center/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix    | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix  | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix   | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix    | 2 +-
 .../gnome-3/3.16/core/gnome-shell-extensions/default.nix        | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix    | 2 +-
 .../desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix     | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix    | 2 +-
 pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix       | 2 +-
 pkgs/desktops/gnome-3/3.16/core/grilo/default.nix               | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gsound/default.nix              | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix           | 2 +-
 pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix         | 2 +-
 pkgs/desktops/gnome-3/3.16/core/sushi/default.nix               | 2 +-
 pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix     | 2 +-
 pkgs/desktops/gnome-3/3.16/core/totem/default.nix               | 2 +-
 pkgs/desktops/gnome-3/3.16/core/tracker/default.nix             | 2 +-
 pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix            | 2 +-
 pkgs/desktops/gnome-3/3.16/core/yelp/default.nix                | 2 +-
 pkgs/desktops/gnome-3/3.16/default.nix                          | 1 +
 pkgs/desktops/gnome-3/3.16/games/iagno/default.nix              | 2 +-
 pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix          | 2 +-
 pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix       | 2 +-
 pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix         | 2 +-
 pkgs/desktops/gnome-3/3.16/games/tali/default.nix               | 2 +-
 pkgs/desktops/gnome-3/3.16/misc/geary/default.nix               | 2 +-
 pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix            | 2 +-
 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix    | 2 +-
 pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix         | 2 +-
 48 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
index 3bce034507a..5eb922994ee 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Bijiben;
     description = "Note editor designed to remain simple to use";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl3;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
index b4240a35a68..a77fe574709 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
@@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Evolution;
     description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.lgpl2Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
index 172c817f6f9..9263fd42476 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Gedit;
     description = "Official text editor of the GNOME desktop environment";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
index 22b896c3337..24d7688e4de 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Glade;
     description = "User interface designer for GTK+ applications";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.lgpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
index b1a57b9e68d..469581deef4 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Clocks;
     description = "Clock application designed for GNOME 3";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
index 9059b677900..98059d3ed13 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Documents;
     description = "Document manager application designed to work with GNOME 3";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
index 4cb466fa482..0193f00da4f 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Music;
     description = "Music player and management application for the GNOME desktop environment";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
index 6d9598ee369..83a732a01d5 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Photos;
     description = "Photos is an application to access, organize and share your photos with GNOME 3";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix
index 5a85e00e4e4..093900dcb7a 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Integrates Evolution and Pidgin into the Nautilus file manager";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
index 7d610c79b49..3e7b7237313 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Seahorse;
     description = "Application for managing encryption keys and passwords in the GnomeKeyring";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
index 87c21e3eb01..eb93458ece5 100644
--- a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Baobab;
     description = "Graphical application to analyse disk usage in any Gnome environment";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
index ef344c5bf55..10e52fe9265 100644
--- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Empathy;
     description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     # TODO: license = [ licenses.gpl2 licenses.lgpl2 ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
index b03fbd4e9c1..72663122a54 100644
--- a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Epiphany;
     description = "WebKit based web browser for GNOME";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
index 5b7d7c19d29..e511cea941c 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
     description = "Application that let you manage Bluetooth in the GNOME destkop";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
index c2eb745a7e5..5ec87f1f879 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
     description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
index 0983fd26635..ea5a4243389 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Contacts;
     description = "Contacts is GNOME's integrated address book";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index 5d6e504951f..84bdb7492bb 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Utilities to configure the GNOME desktop";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     platforms = platforms.linux;
   };
 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
index a99ddbc9eb4..9917fd4d15c 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Dictionary;
     description = "Dictionary is the GNOME application to look up definitions";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
index 54034798a49..b5261c214ad 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
     description = "A udisks graphical front-end";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
index 60492c52164..1523cf14d2e 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Program that can preview fonts and create thumbnails for fonts";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix
index a44d31e9ccb..4c879b75098 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
     description = "A set of crawlers that go through your online content and index them locally in Tracker";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
index d571c90f898..559d084add1 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot;
     description = "Utility used in the GNOME desktop environment for taking screenshots";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
index abb7b882a2b..1b17d1f1f53 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;
     description = "Modify and extend GNOME Shell functionality and behavior";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
index f0f2f829a33..44af987dfe4 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://help.gnome.org/users/gnome-system-log/3.9/;
     description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
index e1f4944f86c..94c7af904dd 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/;
     description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix
index 969459aad31..17ebc84ced8 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}";
     description = "User and system administration help for the GNOME desktop";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.cc-by-30;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
index 2d563e1f7b5..3d2011c01c6 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://help.gnome.org/users/gnome-user-share/3.8;
     description = "Service that exports the contents of the Public folder in your home directory on the local network";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix
index 9076d5c5839..a236238c257 100644
--- a/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
     description = "A collection of plugins for the Grilo framework";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.lgpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
index 18551aae8b9..16dfb638a24 100644
--- a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
     description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.lgpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
index a9dbbb61316..2b1f3e55c86 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GSound;
     description = "Small library for playing system sounds";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix
index 454196df7a6..71a8dbf0ff8 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Gucharmap;
     description = "GNOME Character Map, based on the Unicode Character Database";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl3;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
index 1156474e5a7..ee1960c3eaf 100644
--- a/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Keyboard management library";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
index 9105dd8e736..8f7c5675cc2 100644
--- a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "http://en.wikipedia.org/wiki/Sushi_(software)";
     description = "A quick previewer for Nautilus";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
index f1b3bfe53c1..c6e5e27d3ff 100644
--- a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Videos;
     description = "Simple GObject-based library to parse and save a host of playlist formats";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.lgpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
index 511a37e09a0..d99a24bbfa2 100644
--- a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Videos;
     description = "Movie player for the GNOME desktop based on GStreamer";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
index 2b11c22c5f3..4265d70a4f9 100644
--- a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/Tracker;
     description = "Desktop-neutral user information store, search tool and indexer";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix
index 3ade5f355d4..a76a2e3073f 100644
--- a/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Yelp;
     description = "Yelp's universal stylesheets for Mallard and DocBook";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = [licenses.gpl2 licenses.lgpl2];
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
index 413042d752c..11aaae1e6cb 100644
--- a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Yelp;
     description = "The help viewer in Gnome";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 8a3fc5e1836..4d30520df11 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -53,6 +53,7 @@ let
   gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
 
   version = "3.16";
+  maintainers = with pkgs.lib.maintainers; [ lethalman ];
 
 # Simplify the nixos module and gnome packages
   defaultIconTheme = adwaita-icon-theme;
diff --git a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
index 90d31eaa5cf..945ae7d0fda 100644
--- a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Iagno;
     description = "Computer version of the game Reversi, more popularly called Othello";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
index e24f90812c0..37b8337200d 100644
--- a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Lightsoff;
     description = "Puzzle game, where the objective is to turn off all of the tiles on the board";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix
index ba3de4ff9ae..98cfd55a31e 100644
--- a/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Quadrapassel;
     description = "Classic falling-block game, Tetris";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
index 4afe66ee545..ff3c37c15e6 100644
--- a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "https://wiki.gnome.org/Apps/Swell%20Foop";
     description = "Puzzle game, previously known as Same GNOME";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/games/tali/default.nix b/pkgs/desktops/gnome-3/3.16/games/tali/default.nix
index c89cc7bfe59..a38d8845bef 100644
--- a/pkgs/desktops/gnome-3/3.16/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/tali/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Tali;
     description = "Sort of poker with dice and less money";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
index b9a62642c1d..1cf656fe7dc 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Geary;
     description = "Mail client for GNOME 3";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.lgpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix
index d36534f0d32..e85b087fa41 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "GLib/GObject wrapper for the Facebook Graph API";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.lgpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
index 2af75a7ffac..2777dc5ca09 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
     description = "A tool to customize advanced GNOME 3 options";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl3;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
index 5ac6b50198b..c7ed5021857 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library tasked with managing, extracting and handling media art caches";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };

From 8a8eb5414826accee5a5ca2b9250807f0885f4cf Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 29 Jul 2015 15:44:55 +0000
Subject: [PATCH 0473/2016] gnome3: add default maintainers list

---
 pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix       | 2 +-
 pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix           | 2 +-
 .../desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.16/core/caribou/default.nix           | 2 +-
 pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix      | 2 +-
 pkgs/desktops/gnome-3/3.16/core/dconf/default.nix             | 2 +-
 pkgs/desktops/gnome-3/3.16/core/eog/default.nix               | 2 +-
 .../gnome-3/3.16/core/evolution-data-server/default.nix       | 2 +-
 pkgs/desktops/gnome-3/3.16/core/folks/default.nix             | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gcr/default.nix               | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix      | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gdm/default.nix               | 2 +-
 pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix      | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix      | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix     | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix     | 2 +-
 .../gnome-3/3.16/core/gnome-online-accounts/default.nix       | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix     | 2 +-
 .../gnome-3/3.16/core/gnome-settings-daemon/default.nix       | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix       | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix    | 2 +-
 .../gnome-3/3.16/core/gnome-themes-standard/default.nix       | 2 +-
 .../gnome-3/3.16/core/gsettings-desktop-schemas/default.nix   | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gsound/default.nix            | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix     | 2 +-
 pkgs/desktops/gnome-3/3.16/core/libgee/default.nix            | 4 ++--
 pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix       | 2 +-
 pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix       | 2 +-
 pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix           | 4 ++--
 pkgs/desktops/gnome-3/3.16/core/mutter/default.nix            | 2 +-
 pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix          | 2 +-
 pkgs/desktops/gnome-3/3.16/core/rest/default.nix              | 4 ++--
 pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix   | 2 +-
 pkgs/desktops/gnome-3/3.16/core/zenity/default.nix            | 2 +-
 pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix           | 2 +-
 pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix            | 4 ++--
 pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix            | 2 +-
 pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix           | 2 +-
 pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix       | 2 +-
 40 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
index d36162e13c2..122449eb4f5 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     homepage = https://wiki.gnome.org/Apps/FileRoller;
     description = "Archive manager for the GNOME desktop environment";
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
index b2cf8277641..1debc3646bc 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     homepage = https://wiki.gnome.org/Apps/Vinagre;
     description = "Remote desktop viewer for GNOME";
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
index eb210f1bb5b..6a594aa6a1e 100644
--- a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix
index b75b055fc3f..c2cb6a661ab 100644
--- a/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-	maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
index e69bcd39032..94be115e95c 100644
--- a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
index 3f71165e713..990e2007a23 100644
--- a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/eog/default.nix b/pkgs/desktops/gnome-3/3.16/core/eog/default.nix
index 093bab63fe4..fa1d41ef153 100644
--- a/pkgs/desktops/gnome-3/3.16/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/eog/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage = https://wiki.gnome.org/Apps/EyeOfGnome; 
     platforms = platforms.linux;
     description = "GNOME image viewer";
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
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 82397b385d5..2126aa9ee4d 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
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
index 5f3954f14f3..6e200bdb318 100644
--- a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.lgpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ lethalman ];
+    maintainers = gnome3.maintainers;
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
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 f9d87298fff..a4a26bca192 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-	maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
index 450914ce745..83642f1afe6 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = https://wiki.gnome.org/Projects/GDM;
     description = "A program that manages graphical display servers and handles graphical user logins";
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
index 17245bd9d2a..d4ef3e13eea 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     homepage = https://wiki.gnome.org/Projects/GDM;
     description = "A program that manages graphical display servers and handles graphical user logins";
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix
index 8c546394bd2..97c5ce2a71f 100644
--- a/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-	maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix
index d48e2341722..12b4561e631 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix
@@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-	maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
index b5c99849afe..98b7a1f8b63 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
@@ -18,6 +18,6 @@ in stdenv.mkDerivation rec {
   propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
 
   meta = with stdenv.lib; {
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
index fc721f93648..c62cbfe7256 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
index 4ed0f6c521b..a6621aebe43 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
@@ -36,6 +36,6 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
index 0040b03b36a..a8e877039b2 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
index 7bb769df2e9..174210393d4 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
index 76c770e51d6..2477bb7bc1f 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
index c49a4503d63..4d4656a8502 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
index ccc56cfdb31..c7432a760cf 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
index 48ea2809bcf..ff12622d28f 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
index a13b17fe5e0..4030ecd5cde 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool ];
 
   meta = with stdenv.lib; {
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
index 2b1f3e55c86..5f255743313 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool }:
+{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }:
 
 let
   majVer = "1.0";
diff --git a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix
index 0de89bc5dd6..3aacdef9455 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix
index 82536735b39..4ff13295031 100644
--- a/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
+{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }:
 let
   ver_maj = "0.16";
   ver_min = "1";
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
index ee1960c3eaf..4939a4ff728 100644
--- a/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "libgnomekbd-3.6.0";
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix
index 571fc73e039..8ba578bad2b 100644
--- a/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
index 2b5b5f308ab..1787734939d 100644
--- a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3
 , glib, gtk3, gobjectIntrospection, python, pygobject3, hicolor_icon_theme
 }:
 
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
index 9b91cd98777..a60db8f93f2 100644
--- a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
index 6d004ceb2a3..a4e94db0b74 100644
--- a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
index ee22cd97f6e..354f1715dc1 100644
--- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, cacert }:
+{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, cacert, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "rest-0.7.92";
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
index c6e5e27d3ff..63f36004bcd 100644
--- a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup }:
+{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "totem-pl-parser-3.10.2";
diff --git a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
index aca42f1dbc2..9ce2726e704 100644
--- a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-	maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
index e12f41c9b7f..aa7aa8b469d 100644
--- a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Gnome docking library";
     homepage = https://developer.gnome.org/gdl/;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
index 1508338f6ca..7cea9cd8d15 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4 }:
+{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }:
 
 let
   majorVersion = "0.10";
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = https://wiki.gnome.org/Projects/gexiv2;
     description = "GObject wrapper around the Exiv2 photo metadata library";
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
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 3975b84a05a..f3c751f458d 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     description = "Clipboard management system with GNOME3 integration";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix
index 49d888a866b..d86e234e80f 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = gnome3.maintainers;
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
index c7ed5021857..b8648012573 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }:
 
 let
   majorVersion = "1.9";

From af3261f7a266d38f03e3d5d8a117d5f3458bcb85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 29 Jul 2015 17:46:05 +0200
Subject: [PATCH 0474/2016] lsof: use a pair of URLs to work when upstream
 updates

Fixes #9043 for future bumps.
---
 pkgs/development/tools/misc/lsof/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 53bbcf22842..f7feeca5d9d 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -5,7 +5,11 @@ stdenv.mkDerivation rec {
   version = "4.89";
 
   src = fetchurl {
-    url = "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/lsof_${version}.tar.bz2";
+    urls = map (
+      # the tarball is moved after new version is released
+      isOld: "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/"
+      + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2"
+    ) [ false true ];
     sha256 = "061p18v0mhzq517791xkjs8a5dfynq1418a1mwxpji69zp2jzb41";
   };
 

From 3932ba7a549284ee2851db120153cf47d35ea9a6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 10:36:45 -0700
Subject: [PATCH 0475/2016] bind: 9.10.2-P2 -> 9.10.2-P3

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

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 92050beae8a..8a5b7f2af53 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
 
-let version = "9.10.2-P2"; in
+let version = "9.10.2-P3"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0pvcnwd4rzfk3l35ys72p14ly9k857wbn1lxzd4ayjk3i2pz1rmi";
+    sha256 = "0jhxbsdb8q5q0vn5aga53ixz2iy9zz8p5vwkzvngymd4vmk9l1vq";
   };
 
   patchPhase = ''

From 202c5be5c6cfb0e30f0b4872e05a9195c5ed1d25 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 10:42:50 -0700
Subject: [PATCH 0476/2016] gcc5: Sync outputs changes with gcc4.9

---
 pkgs/development/compilers/gcc/5/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 46864c0bb02..6decc4c8cc3 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -208,6 +208,8 @@ stdenv.mkDerivation ({
 
   builder = ../builder.sh;
 
+  outputs = [ "out" "info" ];
+
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
     sha256 = "1bccp8a106xwz3wkixn65ngxif112vn90qf95m6lzpgpnl25p0sz";

From 2152fd7f1e8b0528b574436bf95d711454e16d05 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 29 Jul 2015 19:43:50 +0200
Subject: [PATCH 0477/2016] mupdf: 1.7 -> 1.7a

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

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 9b39f1c3c38..c988d171327 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -2,12 +2,12 @@
 , libX11, libXext }:
 
 stdenv.mkDerivation rec {
-  version = "1.7";
+  version = "1.7a";
   name = "mupdf-${version}";
 
   src = fetchurl {
     url = "http://mupdf.com/download/archive/${name}-source.tar.gz";
-    sha256 = "0hjn1ywxhblqgj63qkp8x7qqjnwsgid3viw8az5i2i26dijmrgfh";
+    sha256 = "073xq6kczq331awycvznpc49b22idqzdlw4g9254zi0z07x5y0wc";
   };
 
   buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];

From 300f2e2bdf058bd2d4af340b63f00a50da58969d Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 29 Jul 2015 21:58:17 +0300
Subject: [PATCH 0478/2016] vimPlugins: 2015-07-29

---
 pkgs/misc/vim-plugins/default.nix      | 255 +++++++++++++------------
 pkgs/misc/vim-plugins/vim-plugin-names |   2 +-
 2 files changed, 129 insertions(+), 128 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index ba7fda90a70..53233dee418 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -84,6 +84,7 @@ rec {
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
 
+
   CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "CSApprox-2013-07-26";
     src = fetchgit {
@@ -96,11 +97,11 @@ rec {
   };
 
   Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Gist-2015-06-24";
+    name = "Gist-2015-07-04";
     src = fetchgit {
       url = "git://github.com/mattn/gist-vim";
-      rev = "297c4b90511b6daf7b35c219652a56ac2f0209ee";
-      sha256 = "f7da15fd5c4dbd0e7fb5a66b7212f11db1f05ccbe53ccc06c9d3b1d4bd205923";
+      rev = "52e2d54a038baf548de01c9413a6ebc8860fa111";
+      sha256 = "32b9c0ccc51b846651ac49d496060b842a57ca342bdc1038b16c59c1b34b0ca0";
     };
     dependencies = [];
 
@@ -151,11 +152,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2015-06-26";
+    name = "Syntastic-2015-07-29";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "8e672780e76c0a774b7fe834eed9652ccd684c24";
-      sha256 = "10b113c456387ebe2b08f81f6464408382a525d9b37e4e6b3fd54808dd25c1a4";
+      rev = "a01107ffa66fdd38d3ea0fcc769f3582349c5a3f";
+      sha256 = "66b2ef4ad41f30ed409c77e05e637b9c122e62a4acda98d2f89c9205227eba64";
     };
     dependencies = [];
 
@@ -184,33 +185,33 @@ rec {
   };
 
   The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2014-07-08";
+    name = "The_NERD_Commenter-2015-07-26";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6";
-      sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e";
+      rev = "5cc672a4f2adb734ac671499476034f0cd1d3d72";
+      sha256 = "a8ab1f90044bf96e9c105c4a3ff6bbd9aaa20bddbaca1d82d7ca15d2cc3c2654";
     };
     dependencies = [];
 
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2015-06-17";
+    name = "The_NERD_tree-2015-07-13";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "96c07746b46c12d0aca7a5276cc5bd0a260b82fe";
-      sha256 = "0a3854121674fed598b21154f749a5eadd590a2e5632dd6fc8a9307bdb4cf4d8";
+      rev = "86e2e40af161e65a3ad671214f16f23af360a5a7";
+      sha256 = "de4f35757f6e14644e59a7ba3e5d0a10ffe04aea9d192f2f81bba24d14c7595c";
     };
     dependencies = [];
 
   };
 
   UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2015-06-11";
+    name = "UltiSnips-2015-07-27";
     src = fetchgit {
       url = "git://github.com/sirver/ultisnips";
-      rev = "c3a0924b777dbba2f8612950bd8f8a00df18d1bf";
-      sha256 = "7ad0e5dc8e8713db38ef2875e5d512e6cf8ef3dd7885ce12aff22052da780593";
+      rev = "67fbdb2ad8c965378bdd60c892d3a43049caf3f1";
+      sha256 = "487fd113adc9a2c66ae6c12cbbd21e283e1a9c024a65910398ecf26322772c07";
     };
     dependencies = [];
 
@@ -241,9 +242,9 @@ rec {
   YankRing = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "YankRing";
     src = fetchurl {
-      url = "http://www.vim.org/scripts/download_script.php?src_id=20842";
-      name = "yankring_180.zip";
-      sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la";
+      url = "http://www.vim.org/scripts/download_script.php?src_id=23487";
+      name = "yankring_190.zip";
+      sha256 = "0nnxpsfjp2p9jvs3y5ynnd5s56snz9927zdp9bgmay2jgxfmp0si";
     };
     buildInputs = [ unzip ];
     dependencies = [];
@@ -255,11 +256,11 @@ rec {
   };
 
   commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "commentary-2014-11-10";
+    name = "commentary-2015-07-27";
     src = fetchgit {
       url = "git://github.com/tpope/vim-commentary";
-      rev = "9c685131a5facfa0d643feca3a61b41c007d8170";
-      sha256 = "2a9f394d0669429469c2f1ddaf9a722c2773f35da08ea9496d3b4b4e85b6038d";
+      rev = "7fb632aab475b1d2560fe18a329742ba3b4725c6";
+      sha256 = "29f8f8a354a749b30b98940c32c09355cd29aa456a9bf83c2d5dc7cc8bc7c8fe";
     };
     dependencies = [];
 
@@ -288,22 +289,22 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2015-06-14";
+    name = "fugitive-2015-07-20";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "1c844375fa2762e3b7c16294fa36afee6fef28b1";
-      sha256 = "fa02d055243a386fe3fdb5069f36d3f035ace3594c1b1dd4a4bbc61df232fb97";
+      rev = "03cc95cc198ea94a6a003a92cd0e58af4416ec25";
+      sha256 = "cab17591d0eeb0fff4520855347467d85baf56b444dd60b797323d164e92a9de";
     };
     dependencies = [];
 
   };
 
   ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ghcmod-2015-03-17";
+    name = "ghcmod-2015-07-26";
     src = fetchgit {
       url = "git://github.com/eagletmt/ghcmod-vim";
-      rev = "7e5f6102aa709244f5d4cedec807eac4b901c4cb";
-      sha256 = "47c5f5c4bf73dca653550b460306fa3808d864a685903bdb95ba07a6e1cd2899";
+      rev = "caf086cd84fe0b26f24f0f93233d4c0c98bce524";
+      sha256 = "04fa2558baab2b9d93c49f3d984f0ed8196513875095ab7117f39b02087bfeeb";
     };
     dependencies = [];
 
@@ -354,11 +355,11 @@ rec {
   };
 
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-ghc-2015-04-07";
+    name = "neco-ghc-2015-07-05";
     src = fetchgit {
       url = "git://github.com/eagletmt/neco-ghc";
-      rev = "a45f4f98ee3f25eaa64a39328c253d4f78cd5fda";
-      sha256 = "50bd8530b435c3ba0e0f01b230d7717074002ec229ddcc0cb20ee59ef2a28d59";
+      rev = "2ad708360c8f64732a0827618cddfd23e89a8664";
+      sha256 = "ff18dcb7e5b076f88acc51dd508729635a76c619e592db010af6e877ff7afa92";
     };
     dependencies = [];
 
@@ -376,22 +377,22 @@ rec {
   };
 
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "idris-vim-2015-06-23";
+    name = "idris-vim-2015-07-19";
     src = fetchgit {
       url = "git://github.com/idris-hackers/idris-vim";
-      rev = "4c1723c34a434aad2455c7c2f2a30d97ed691191";
-      sha256 = "db09ad5a7c75d9ac2ccb1be2b85d6ed9cd507ec0fc736e994d8d315c5916170d";
+      rev = "91b695a9120268a9b9828a0665e89b3c39a1f070";
+      sha256 = "df16f45fd6c79f44c7da179c6cfc06e1d43aa801832249b12d8134c476db7ff9";
     };
     dependencies = [];
 
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2015-05-21";
+    name = "calendar-vim-2015-06-28";
     src = fetchgit {
       url = "git://github.com/itchyny/calendar.vim";
-      rev = "394c789d2235a7a056ba527daf722e9119cac1c8";
-      sha256 = "dfefb8d479096baa755185546624fffdd9c843da9c4fdbf17f213cdba599c08e";
+      rev = "9cf5b7a01d439c5093bac92364d06e29ed15f2f0";
+      sha256 = "7e3f98b72270447b471aae0f178d2b06292d3449007b41350c6145436d1da114";
     };
     dependencies = [];
 
@@ -431,11 +432,11 @@ rec {
   };
 
   vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-buffergator-2015-03-31";
+    name = "vim-buffergator-2015-07-12";
     src = fetchgit {
       url = "git://github.com/jeetsukumaran/vim-buffergator";
-      rev = "77cfdd127fcf026ea2d5e8f5aaf85502286b16b7";
-      sha256 = "2d3ce83b5ea7d0502cea3e91bf1e2a0b27a046879c1b5ff1854df47028dd4d48";
+      rev = "28f818ea0aea6771c153efb91a35fc0ab9a16700";
+      sha256 = "d19710b41d24b2e5611e5c2977dc7fac47f3d9899b80c44da2f5d08b3538551a";
     };
     dependencies = [];
 
@@ -452,17 +453,6 @@ rec {
 
   };
 
-  vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2015-05-29";
-    src = fetchgit {
-      url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "3199d34f57e1e20d2dd807b31a5a72d7f7d42e96";
-      sha256 = "26b43c921b416cc19482d03435516d42a209ab104bac9979b073d0db61e95186";
-    };
-    dependencies = [];
-
-  };
-
   vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-nerdtree-tabs-2014-09-25";
     src = fetchgit {
@@ -530,22 +520,22 @@ rec {
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2015-06-22";
+    name = "vim-easymotion-2015-07-25";
     src = fetchgit {
       url = "git://github.com/lokaltog/vim-easymotion";
-      rev = "ef0cb2b0a0feee865e70c42fdaf03a4f8e621f38";
-      sha256 = "13f0d18f0c822dc7ba99f2365539de1e2c63817b89a6d0d2e9c2e8689ee85cb7";
+      rev = "eab003a0991608464b58c90c56be5d9c6b64d840";
+      sha256 = "6f5d4942481c41c1a88c45066ea51019ee4ecd4235e0f54c549cb7df2b8b59e6";
     };
     dependencies = [];
 
   };
 
   vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-xkbswitch-2015-05-19";
+    name = "vim-xkbswitch-2015-07-26";
     src = fetchgit {
       url = "git://github.com/lyokha/vim-xkbswitch";
-      rev = "0854ac6a810daae4a5c99bcae61613266ce75c26";
-      sha256 = "886a173d48340ad0ddeb3c852e4f2bdfc7b513a9d5a954115d081a3e276fa655";
+      rev = "eba2979fa3d11dc09d4ef9ef3854926f28b783a4";
+      sha256 = "f51ff00ad6e40ba9f31be18fee5e6f80cf48c51872392a0dafe08477749b74bd";
     };
     dependencies = [];
     patchPhase = ''
@@ -578,22 +568,22 @@ rec {
   };
 
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-watchdogs-2015-06-15";
+    name = "vim-watchdogs-2015-07-29";
     src = fetchgit {
       url = "git://github.com/osyo-manga/vim-watchdogs";
-      rev = "7dd19b1344e6bb89ecd469b085ad945435905eb9";
-      sha256 = "8481b5e0efffec520f66920aaf3f2da843c01c70688a4c71f7b31ead8d4049d1";
+      rev = "e1fce3b4bbe07d55bd7340d25ca0dc900747ad6f";
+      sha256 = "72ec214364c674ee1ccd29a6dae925e6cbcaf90e57fef133385a96319108dd2c";
     };
     dependencies = [];
 
   };
 
   racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "racer-2015-06-24";
+    name = "racer-2015-07-29";
     src = fetchgit {
       url = "git://github.com/phildawes/racer";
-      rev = "8f9d14b381a1624389df78ed8d3a38bc1c85d0f4";
-      sha256 = "34db058ca1d5dd979db1208b5f90716145eb416c931445213a8dfac3d8b0bcdb";
+      rev = "25150ce32e5936b38933d66324830fedb95a8c7c";
+      sha256 = "40a3d9c22f50f69e45e8f551a655c2ca327fd07b8872059f2938983387e07707";
     };
     dependencies = [];
     buildPhase = ''
@@ -603,44 +593,44 @@ rec {
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2015-06-23";
+    name = "neocomplete-vim-2015-07-25";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "72bf34c349078ae0e4691f7e00dd2a7ab5714a69";
-      sha256 = "72dff487613de3e18c561b45658ec2eda66a686e1d73159c03bee1313d6d74ff";
+      rev = "aaa1f08b06bfcc2a329dba12a37ce8e1578636bd";
+      sha256 = "56c2dc4431858432763bcf134ebbc74272d6f3cdd2db5f9a8b21f2e4a8b028c8";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2015-06-26";
+    name = "neosnippet-snippets-2015-07-27";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet-snippets";
-      rev = "81c7c9840352126d1fa3748c014d00188b5a1afa";
-      sha256 = "977ef9fd855a03ba16c01b990bfd4121eb3a4516e7446bcb8806c41490515ec3";
+      rev = "a34e67d4b3f91bf2320cd7ce1e85bbd300c6095e";
+      sha256 = "773170fddb95bc5df1b26abc52e29338f3d5515a5afd99719aa23d9569c5389d";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2015-06-23";
+    name = "neosnippet-vim-2015-07-23";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "f1980468b0a397d36318a409d3677bc13d307392";
-      sha256 = "b28bf490a809e4dee474480436e0aa1c64612e4788c4f9a0afe856cf2432cfaf";
+      rev = "e619d43571a675057461f29f2c039dab64728f32";
+      sha256 = "8682bba6039962c01ffa0f9946a1f2a8e8a37ffda2d32862d72c5ee3d87241c5";
     };
     dependencies = [];
 
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2015-05-14";
+    name = "vimproc-vim-2015-07-22";
     src = fetchgit {
       url = "git://github.com/shougo/vimproc.vim";
-      rev = "c286dcbdfca9e0ee1a4cb90f09c3f03638112f5a";
-      sha256 = "884753f4f188cee5fb11e4dfb5aaf8b80d4809e637ab91068af1a5787acdcb19";
+      rev = "0555aecded8737435747e903efc4b6f3241cc62c";
+      sha256 = "0a9445214c6733d21d56ebe278f2e0bc1027b08eb7763df95b8d0ebd34850a60";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -652,12 +642,13 @@ rec {
   };
 
   vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimshell-vim-2015-06-21";
+    name = "vimshell-vim-2015-07-25";
     src = fetchgit {
       url = "git://github.com/shougo/vimshell.vim";
-      rev = "ce5ce77133dd16bd33a57b0776de0cbaead45722";
-      sha256 = "7c44556f28a06083ba9485af74fcc2e510e3e1830cfce6670c899329c2c85012";
+      rev = "adb2a0d95e9b0009d152c35c930eb04875562d87";
+      sha256 = "fe52fef67c242756c67ec134634b380077e16729d59b1dcd8f50e41512010723";
     };
+    dependencies = [];
     dependencies = [ "vimproc-vim" ];
   };
 
@@ -673,11 +664,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2015-05-15";
+    name = "vim-quickrun-2015-07-27";
     src = fetchgit {
       url = "git://github.com/thinca/vim-quickrun";
-      rev = "c7800ea3d01209da678708e4d3b5175009551807";
-      sha256 = "375668b6fd7cf64a26f752afcdd976f79a9dc12b045eed8afafce6486740f143";
+      rev = "c22f2f50614a68d8f60ae334cc4545dbc57051a9";
+      sha256 = "fef4f13c3d1946040cb4e4ceba6a89759fc77c1f72f2f7f038df644620a41398";
     };
     dependencies = [];
 
@@ -706,11 +697,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2015-06-23";
+    name = "youcompleteme-2015-07-08";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "66dcc9581c7d237f4d839389bee055df6788fbc9";
-      sha256 = "91971f0640d462622a31ea64c5c41df7649a6c6e6e4d93220554a7d910a11fdf";
+      rev = "b9dd9096a34c1d720878f0058dc3e68f9e9c87ea";
+      sha256 = "88a3ff421300f53756359ec8e6c901fe96de492091587cf9a5e40b299698f077";
     };
     dependencies = [];
     buildInputs = [
@@ -795,6 +786,17 @@ rec {
 
   };
 
+  random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "random-vim-2010-10-17";
+    src = fetchgit {
+      url = "git://github.com/vim-scripts/random.vim";
+      rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989";
+      sha256 = "571f4ed0a2d8c66d1c15029fb812a84b55228d07cd2e4bbbc73a33493013fed3";
+    };
+    dependencies = [];
+
+  };
+
   tabmerge = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "tabmerge-2010-10-17";
     src = fetchgit {
@@ -806,12 +808,23 @@ rec {
 
   };
 
+  wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "wombat256-vim-2010-10-17";
+    src = fetchgit {
+      url = "git://github.com/vim-scripts/wombat256.vim";
+      rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
+      sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05";
+    };
+    dependencies = [];
+
+  };
+
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2015-06-23";
+    name = "vim-wakatime-2015-07-03";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "2ee2b4ea56ae1b56ce77a1b9e5d2c51fc6768842";
-      sha256 = "440b6027921fce801255eedd29d24b43975038e78dfe465a381ae76e443480c2";
+      rev = "28044b7b5f5be812fd34c757632d1d814578ec9b";
+      sha256 = "74fa0eac0a546c7012b4a6fe5f6cd66eaa2ed40887bc61d468be148dcd538692";
     };
     dependencies = [];
     buildInputs = [ python ];
@@ -889,17 +902,6 @@ rec {
 
   };
 
-  random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "random-vim-2010-10-17";
-    src = fetchgit {
-      url = "git://github.com/vim-scripts/random.vim";
-      rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989";
-      sha256 = "571f4ed0a2d8c66d1c15029fb812a84b55228d07cd2e4bbbc73a33493013fed3";
-    };
-    dependencies = [];
-
-  };
-
   rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rust-2015-01-29";
     src = fetchgit {
@@ -934,11 +936,11 @@ rec {
   };
 
   snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "snipmate-2015-04-04";
+    name = "snipmate-2015-07-23";
     src = fetchgit {
       url = "git://github.com/garbas/vim-snipmate";
-      rev = "2d3e8ddc4424088d8e19c33764fff077f3116f55";
-      sha256 = "fe23f38cf074b12082879256a5c4c16e6f55233e0af0735867b4d5c21b72ff09";
+      rev = "c86c64508a5b0309040429460c3a13fb90ac708e";
+      sha256 = "7cd7dfd4230fd9bb75744a376c0e789c6d734e08158ca055a2ada1298b71360e";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -1230,11 +1232,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2015-06-26";
+    name = "vim-airline-2015-07-08";
     src = fetchgit {
       url = "git://github.com/bling/vim-airline";
-      rev = "9afda181dddd0a0ae34aa10e7faad4a66e94676b";
-      sha256 = "1e3b540353b4e047de7c26d8e02de5e68c02a5a1fccc946faa494bcad44bc6b1";
+      rev = "cdc6d98a09db60d3dda58815616f78338cbdaa9d";
+      sha256 = "bbbe04c92842d4110971396011f41ad1175b6c3b0f1d516c286cc7aca4c7052a";
     };
     dependencies = [];
 
@@ -1252,11 +1254,11 @@ rec {
   };
 
   vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easy-align-2014-12-14";
+    name = "vim-easy-align-2015-07-20";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-easy-align";
-      rev = "c62d124be614de65922b15d468c4049d1eee9353";
-      sha256 = "868bd5a0405a7611e020fe7692a078ca72562674b6d9a404d2d83f665af96aee";
+      rev = "1206c65dcb87488900b5ac193965268f0ce2c574";
+      sha256 = "60de7c9c5b916e6cd9bc9e5bef0a7d2a831a7ab6cf2231b7f7b29017559bc33a";
     };
     dependencies = [];
 
@@ -1274,11 +1276,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2015-05-08";
+    name = "vim-gitgutter-2015-07-28";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "339f8ba079ed7d465ca442c9032b36bc56c21f61";
-      sha256 = "f306cc7bac8560fe2864161be675545c1023486b950900da8d8c74f98d568e15";
+      rev = "fe10e6474d70c382edcda84dc6bcd6fcd575a6c5";
+      sha256 = "0266775153760c86e51a83106813936c661717a1c72d4103215739aff9ad1b76";
     };
     dependencies = [];
 
@@ -1306,23 +1308,34 @@ rec {
 
   };
 
+  vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-multiple-cursors-2015-05-29";
+    src = fetchgit {
+      url = "git://github.com/terryma/vim-multiple-cursors";
+      rev = "3199d34f57e1e20d2dd807b31a5a72d7f7d42e96";
+      sha256 = "26b43c921b416cc19482d03435516d42a209ab104bac9979b073d0db61e95186";
+    };
+    dependencies = [];
+
+  };
+
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2015-05-19";
+    name = "vim-signature-2015-07-08";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
-      rev = "7ab61e2a5101ec139a54735b432a6e95a22770d8";
-      sha256 = "041b906cd27bcb922732e324b671adbf6ea0106105230ea43111ca9f844b64c3";
+      rev = "0a31fb0c4c62705b4b894e150330857170080b96";
+      sha256 = "945cc02d15bf7e71a87d6b1ec0ae24e6f145bff0f76586f6d8f6bba38a303a4a";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2015-06-08";
+    name = "vim-snippets-2015-07-29";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "69c918175c77c0a0516c3ab587509a3eca38b3ae";
-      sha256 = "1fe9c6d5f80513bc35c309723b57d73d42296fbe73d44c0df1de4244b2596bf0";
+      rev = "814896e4d29f2b796d076935d7d079c64c351f4f";
+      sha256 = "173d2f52c0715dd78692b5f1d3368920ed976a05a87887b056526abfd530ffa3";
     };
     dependencies = [];
 
@@ -1349,16 +1362,4 @@ rec {
     dependencies = [];
 
   };
-
-  wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "wombat256-vim-2010-10-17";
-    src = fetchgit {
-      url = "git://github.com/vim-scripts/wombat256.vim";
-      rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
-      sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05";
-    };
-    dependencies = [];
-
-  };
-
 }
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index be9914ef8cf..fb5f2fc6f97 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -56,7 +56,7 @@
 "github:vim-scripts/Colour-Sampler-Pack"
 "github:vim-scripts/a.vim"
 "github:vim-scripts/align"
-"github:vim-scripts/changeColorSchemes.vim"
+"github:vim-scripts/changeColorScheme.vim"
 "github:vim-scripts/random.vim"
 "github:vim-scripts/tabmerge"
 "github:vim-scripts/wombat256.vim"

From ef082f9cc09a9b01196d52b2fa602945eac4e860 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 29 Jul 2015 22:03:23 +0300
Subject: [PATCH 0479/2016] vimPlugins: fix evaluation

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 53233dee418..7ce997acb68 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -648,7 +648,6 @@ rec {
       rev = "adb2a0d95e9b0009d152c35c930eb04875562d87";
       sha256 = "fe52fef67c242756c67ec134634b380077e16729d59b1dcd8f50e41512010723";
     };
-    dependencies = [];
     dependencies = [ "vimproc-vim" ];
   };
 

From 3df27bec747faf9bd80e959a36a29613be948562 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 29 Jul 2015 22:36:55 +0200
Subject: [PATCH 0480/2016] bmon: update from 3.7 to 3.8

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

diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix
index 308232ac2fe..1bbabcf5523 100644
--- a/pkgs/tools/misc/bmon/default.nix
+++ b/pkgs/tools/misc/bmon/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "bmon-${version}";
-  version = "3.7";
+  version = "3.8";
 
   src = fetchFromGitHub {
     owner = "tgraf";
     repo = "bmon";
     rev = "v${version}";
-    sha256 = "0rh0r8gabcsqq3d659yqk8nz6y4smsi7p1vwa2v584m2l2d0rqd6";
+    sha256 = "19jv14r9j9n54bqhidw3z11z3wys1v2cagqpsxn0kjga1gkg87xs";
   };
 
   buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ];

From 290fc1d04477e56cbb8fd876cea75b2053f835cf Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 29 Jul 2015 22:38:07 +0200
Subject: [PATCH 0481/2016] parallel: update from 20150622 to 20150722

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index cfbe32e579c..1f616d8d9af 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20150622";
+  name = "parallel-20150722";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0j7gg88zk2r4jv3mvmrl4bhwcv9k8rxanygp6lssbx685ab9qfln";
+    sha256 = "0jpklc4awr5z6slgn7xjhrcpk6i8jp9mwhkkaczikvbaqzbyabkx";
   };
 
   patchPhase =

From ba9a6e2d095a5895e82f791ec8f1b92f05259454 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 14 Jul 2015 22:49:05 +0200
Subject: [PATCH 0482/2016] python-packages: click 3.3 -> 4.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bce96d02aa3..e760380132f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1884,11 +1884,11 @@ let
   };
 
   click = buildPythonPackage rec {
-    name = "click-3.3";
+    name = "click-4.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
-      sha256 = "1rfn8ml80rw3hkgpm1an5p3vdyhh7hzx4zynr8dhfl7bsw28r77p";
+      sha256 = "1n4fvxpgbna83g6daarscljwpbarr45qfalh9hqla8ayy84ysfg3";
     };
 
     meta = {

From 219debbedd1609b6365bac1e381fdf55606cbbf6 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 29 Jul 2015 18:36:02 -0300
Subject: [PATCH 0483/2016] cmatrix: init at 1.2a

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

diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix
new file mode 100644
index 00000000000..c7a76ef00a6
--- /dev/null
+++ b/pkgs/applications/misc/cmatrix/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, ncurses }:
+
+let
+  version = "1.2a";
+in with stdenv.lib;
+stdenv.mkDerivation rec {
+
+  name = "cmatrix-${version}";
+
+  src = fetchurl{
+    url = "http://www.asty.org/cmatrix/dist/${name}.tar.gz";
+    sha256 = "0k06fw2n8nzp1pcdynhajp5prba03gfgsbj91bknyjr5xb5fd9hz";
+  };
+
+  buildInputs = [ pkgconfig ncurses ];
+
+  meta = {
+    description = "Simulates the falling characters theme from The Matrix movie";
+    longDescription = ''
+      CMatrix simulates the display from "The Matrix" and is based
+      on the screensaver from the movie's website.  
+    '';
+    homepage = http://www.asty.org/cmatrix/;
+    platforms = ncurses.meta.platforms;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ada3e3bd1f7..506c36d78a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10723,6 +10723,8 @@ let
 
   clipit = callPackage ../applications/misc/clipit { };
 
+  cmatrix = callPackage ../applications/misc/cmatrix { };
+
   bomi = callPackage ../applications/video/bomi {
     stdenv = overrideCC stdenv gcc49;
     pulseSupport = config.pulseaudio or true;

From d27b0bc596d2a546be27d9b05a836c50c5920e83 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Wed, 29 Jul 2015 21:51:52 +0200
Subject: [PATCH 0484/2016] gsettings_desktop_schemas: Fix path to background
 images

This fixes the "blue screen" desktop background caused by gnome being
unable to find the image.
---
 .../3.16/core/gsettings-desktop-schemas/default.nix        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
index 4030ecd5cde..53522c13073 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
@@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
     sha256 = "0q9l9fr90pcb3s6crbxkj3wiwn7wp9zfpv7bdxkadj0hspd9zzkl";
   };
 
+  postPatch = ''
+    for file in "background" "screensaver"; do
+      substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \
+        --replace "@datadir@" "${gnome3.gnome-backgrounds}/share/"
+    done
+  '';
+
   buildInputs = [ glib gobjectIntrospection ];
 
   nativeBuildInputs = [ pkgconfig intltool ];

From 0e947e00a0a83ea7dd968a337d606067b9b346a0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 18:13:05 -0700
Subject: [PATCH 0485/2016] git: 2.4.6 -> 2.5.0

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

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 9702a95133c..dde5b7cc603 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.4.6";
+  version = "2.5.0";
   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 = "1djkjjv491nk6g8rzrb4n75yqdfp3xpiv569nqblaiq33ibl9ndx";
+    sha256 = "0p747j94kynrx71qaamc9i0dkq5vqpv66a47b68pmin1qsxb2nfc";
   };
 
   patches = [

From a7abfaff2a665279c6143cd64541f336a9ce17f1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 18:13:26 -0700
Subject: [PATCH 0486/2016] accelio: 1.4 -> 2015-07-28

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

diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix
index 7a96e5923b6..68a4386bba5 100644
--- a/pkgs/development/libraries/accelio/default.nix
+++ b/pkgs/development/libraries/accelio/default.nix
@@ -6,18 +6,18 @@
 
 stdenv.mkDerivation rec {
   name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}";
-  version = "1.4";
+  version = "2015-07-28";
 
   src = fetchFromGitHub {
     owner = "accelio";
     repo = "accelio";
-    rev = "v${version}";
-    sha256 = "0cxiwn63481m88zisd0pqs6g0h5k1amz2kidwyxkdbl6xgf70cwd";
+    rev = "0c4b6d535831650112ba9409a5c7d6e1bc436d61";
+    sha256 = "044m92pnvdl64irvy7bdqr51gz0qr5f14xnsig4gkc3vb0afbb4j";
   };
 
   postPatch = ''
     # Don't build broken examples
-    sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\)\/kernel/d' configure.ac
+    sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\).*\/kernel/d' configure.ac
 
     # Allow the installation of xio kernel headers
     sed -i 's,/opt/xio,''${out},g' src/kernel/xio/Makefile.in

From fdc076c9865b3ab41a994be6860ef67e047974bc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 18:14:00 -0700
Subject: [PATCH 0487/2016] ceph: Enable accelio only on 10+

---
 pkgs/tools/filesystems/ceph/generic.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 61659ef26fd..51e304bec21 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -75,10 +75,9 @@ let
   hasOsd = hasServer;
   hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
 
-  /*hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
-    versionAtLeast version "9.0.0" &&
-    optAccelio != null && optLibibverbs != null && optLibrdmacm != null;*/
-  hasXio = false;  # Broken with xio 1.4
+  hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
+    versionAtLeast version "10.0.0" &&
+    optAccelio != null && optLibibverbs != null && optLibrdmacm != null;
 
   hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null;
 

From 49caeecdaaf3303ebccc2dd742c1064b9e2288bf Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 18:14:25 -0700
Subject: [PATCH 0488/2016] ceph-git: 2015-07-23 -> 2015-07-29

---
 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 916e8ad9d5e..8534c2fdba3 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,13 +1,13 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-07-23";
+  version = "2015-07-29";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "f7bda9567d2a1acf015ab891eb5bb9ca0cdc8396";
+    rev = "338ead0f498238fd1b5b7f18d86ad407de6f347b";
     leaveDotGit = true;
-    sha256 = "0z3i4aadyyklafm3lia8dg8l0wr3cvy53v3h7b533nm61lq07maf";
+    sha256 = "0ip62l4qkcmszbczwdnqhn93glnpgy0fhymf627x0vf49dgv3a6i";
   };
 
   patches = [ ./fix-pythonpath.patch ];

From c6bb486641a0784b0230fc6e076df2cd40f6e3e1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 18:16:35 -0700
Subject: [PATCH 0489/2016] go: govers is a native input

---
 pkgs/development/go-modules/generic/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 1d259da1415..d7b4b1f3b4c 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -28,7 +28,8 @@ go.stdenv.mkDerivation (
   (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
 
   name = "go${go.meta.branch}-${name}";
-  buildInputs = [ go ] ++ buildInputs ++ (lib.optional (!dontRenameImports) govers) ;
+  nativeBuildInputs = [ go ] ++ (lib.optional (!dontRenameImports) govers);
+  buildInputs = [ go ] ++ buildInputs;
 
   configurePhase = args.configurePhase or ''
     runHook preConfigure

From a4707aed5524e54e54ea41c44607630977364efc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 18:16:56 -0700
Subject: [PATCH 0490/2016] go: Run builds in parallel

---
 .../go-modules/generic/default.nix            | 43 ++++++++++++++-----
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index d7b4b1f3b4c..72b6ad7fdf9 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -66,13 +66,16 @@ go.stdenv.mkDerivation (
 
     runHook renameImports
 
+    PIDS=()
     if [ -n "$subPackages" ] ; then
         for p in $subPackages ; do
-            go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p
+            go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p &
+            PIDS+=("$!")
         done
     else
-        (cd go/src
-        find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq | while read d; do
+        pushd go/src
+        while read d; do
+          {
             echo "$d" | grep -q "/_" && continue
             [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && continue
             local OUT
@@ -85,26 +88,43 @@ go.stdenv.mkDerivation (
             if [ -n "$OUT" ]; then
               echo "$OUT" >&2
             fi
-        done)
+          } &
+          PIDS+=("$!")
+        done < <(find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq)
+        popd
     fi
 
+    # Exit on error from the parallel process
+    for PID in "''${PIDS[@]}"; do
+        wait $PID || exit 1
+    done
+
     runHook postBuild
   '';
 
   checkPhase = args.checkPhase or ''
     runHook preCheck
 
+    PIDS=()
     if [ -n "$subPackages" ] ; then
         for p in $subPackages ; do
-            go test -p $NIX_BUILD_CORES -v $goPackagePath/$p
+            go test -p $NIX_BUILD_CORES -v $goPackagePath/$p &
         done
+        PIDS+=("$!")
     else
-        (cd go/src
-        find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq | while read d; do
+        pushd go/src
+        while read d; do
             go test -p $NIX_BUILD_CORES -v $d
-        done)
+        done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq)
+        popd
+        PIDS+=("$!")
     fi
 
+    # Exit on error from the parallel process
+    for PID in "''${PIDS[@]}"; do
+        wait $PID || exit 1
+    done
+
     runHook postCheck
   '';
 
@@ -114,12 +134,13 @@ go.stdenv.mkDerivation (
     mkdir -p $out
 
     if [ -z "$dontInstallSrc" ]; then
-        (cd "$NIX_BUILD_TOP/go"
-        find . -type f | while read f; do
+        pushd "$NIX_BUILD_TOP/go"
+        while read f; do
           echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue
           mkdir -p "$(dirname "$out/share/go/$f")"
           cp $NIX_BUILD_TOP/go/$f $out/share/go/$f
-        done)
+        done < <(find . -type f)
+        popd
     fi
 
     dir="$NIX_BUILD_TOP/go/bin"

From 884e3cd7724ab0b97f6658f4f52d798faacf00a2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 18:17:27 -0700
Subject: [PATCH 0491/2016] vault: Use the gopackage version

---
 pkgs/servers/vault/default.nix  | 48 ---------------------------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 pkgs/servers/vault/default.nix

diff --git a/pkgs/servers/vault/default.nix b/pkgs/servers/vault/default.nix
deleted file mode 100644
index ddaaca8083b..00000000000
--- a/pkgs/servers/vault/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchgit, go, gox }:
-
-let
-  name = "vault";
-  version = "0.1.2";
-  namespace = "github.com/hashicorp/vault";
-in
-stdenv.mkDerivation rec {
-  name = "vault-${version}";
-  rev = "v${version}";
-
-  src = fetchgit {
-    url = "https://github.com/hashicorp/vault";
-    sha256 = "a4267105dab56c6d0571f69ea0abc167c5debd3b6c0795b8b69e15a285e12f01";
-    rev = "refs/tags/${rev}";
-  };
-
-  buildInputs = [ go gox ];
-
-  buildPhase = ''
-    mkdir -p "$(dirname Godeps/_workspace/src/${namespace})"
-    ln -sf $src "Godeps/_workspace/src/${namespace}"
-    export GOPATH=$PWD/Godeps/_workspace
-    XC_OS=$(go env GOOS)
-    XC_ARCH=$(go env GOARCH)
-    mkdir -p bin/
-    gox \
-      -os "$XC_OS" \
-      -arch "$XC_ARCH" \
-      -ldflags "-X github.com/hashicorp/vault/cli.GitCommit ${rev}" \
-      -output $PWD/bin/vault \
-      -verbose \
-      .
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/vault $out/bin/vault
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "https://www.vaultproject.io";
-    description = "A tool for securely accessing secrets";
-    maintainers = with maintainers; [ avnik ];
-    license     = licenses.mit ;
-    platforms   = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d8139ecd7f..8cbedb66485 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14980,7 +14980,7 @@ let
 
   utf8proc = callPackage ../development/libraries/utf8proc { };
 
-  vault = callPackage ../servers/vault {};
+  vault = goPackages.vault;
 
   vbam = callPackage ../misc/emulators/vbam {
     inherit (xlibs) libpthreadstubs;

From fd9e9201d698c2cb9d254df17ce79d7382fc5a83 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 18:18:07 -0700
Subject: [PATCH 0492/2016] goPackages: Updates

---
 pkgs/top-level/go-packages.nix | 493 +++++++++++++++------------------
 1 file changed, 219 insertions(+), 274 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 448c94e0602..d7597d2a110 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -20,13 +20,16 @@ let
   ## OFFICIAL GO PACKAGES
 
   crypto = buildFromGitHub {
-    rev      = "4d48e5fa3d62b5e6e71260571bf76c767198ca02";
+    rev      = "e7913d6af127b363879a06a5ae7c5e93c089aedd";
     disabled = isGo13;
     owner    = "golang";
     repo     = "crypto";
-    sha256   = "0plvjv56afb02p7l3c2zfwffnhscmc3f0ckj1gls9ay6vj85y7l8";
-    goPackagePath    = "golang.org/x/crypto";
-    goPackageAliases = [ "code.google.com/p/go.crypto" ];
+    sha256   = "0g2gm2wmanprsirmclxi8qxjkw93nih60ff8jwrfb4wyn7hxbds7";
+    goPackagePath = "golang.org/x/crypto";
+    goPackageAliases = [
+      "code.google.com/p/go.crypto"
+      "github.com/golang/crypto"
+    ];
   };
 
   glog = buildFromGitHub {
@@ -49,53 +52,38 @@ let
     };
   };
 
-  net = buildGoPackage rec {
-    rev = "d1d694760b7a3a9fa32e4d1c49e08b2d672221d8";
-    name = "net-${stdenv.lib.strings.substring 0 7 rev}";
+  net = buildFromGitHub {
+    rev = "3a29182c25eeabbaaf94daaeecbc7823d86261e7";
+    owner = "golang";
+    repo = "net";
+    sha256 = "0g4w411l0v9yg8aib05kzjm9j6dwsd6nk6ayk8j0dkmqildqrx5v";
     goPackagePath = "golang.org/x/net";
     goPackageAliases = [
       "code.google.com/p/go.net"
       "github.com/hashicorp/go.net"
+      "github.com/golang/net"
     ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "golang";
-      repo = "net";
-      sha256 = "1fk62vjxsyca8hmlpca9rkgy8wqg9zw920d56ib442sjn9ys3zic";
-    };
-
     propagatedBuildInputs = [ text ];
   };
 
-  oauth2 = buildGoPackage rec {
+  oauth2 = buildFromGitHub {
     rev = "f98d0160877ab4712b906626425ed8b0b320907c";
-    name = "oauth2-${stdenv.lib.strings.substring 0 7 rev}";
+    owner = "golang";
+    repo = "oauth2";
+    sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i";
     goPackagePath = "golang.org/x/oauth2";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "golang";
-      repo = "oauth2";
-      sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i";
-    };
-
+    goPackageAliases = [ "github.com/golang/oauth2" ];
     propagatedBuildInputs = [ net gcloud-golang-compute-metadata ];
   };
 
 
-  protobuf = buildGoPackage rec {
-    rev = "39e27fc0f226450c58e11eda145b542bc5dff3fe";
-    name = "protobuf-${stdenv.lib.strings.substring 0 7 rev}";
+  protobuf = buildFromGitHub {
+    rev = "68c687dc49948540b356a6b47931c9be4fcd0245";
+    owner = "golang";
+    repo = "protobuf";
+    sha256 = "0va2x13mygmkvr7ajkg0fj4i1ha0jbxgghya20qgsh0vlp7k5maf";
     goPackagePath = "github.com/golang/protobuf";
     goPackageAliases = [ "code.google.com/p/goprotobuf" ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "golang";
-      repo = "protobuf";
-      sha256 = "12l036ix0dc8hg35xrqmdcr3bpwncrdkgqkhp3s90w6a3qpva3gs";
-    };
   };
 
   gogo.protobuf = buildGoPackage rec {
@@ -114,19 +102,22 @@ let
     subPackages = [ "proto" ];
   };
 
-  text = buildGoPackage rec {
-    rev = "c93e7c9fff19fb9139b5ab04ce041833add0134e";
-    name = "text-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "golang.org/x/text";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "golang";
-      repo = "text";
-      sha256 = "1yvmllriqjm0k97vnxycz9q0likvh18a68xbyg1k6ddkvn9sy03y";
-    };
+  snappy = buildFromGitHub {
+    rev    = "0c7f8a7704bfec561913f4df52c832f094ef56f0";
+    owner  = "golang";
+    repo   = "snappy";
+    sha256 = "17j421ra8jm2da8gc0sk71g3n1nizqsfx1mapn255nvs887lqm0y";
+    goPackageAliases = [ "code.google.com/p/snappy-go/snappy" ];
   };
 
+  text = buildFromGitHub {
+    rev = "3eb7007b740b66a77f3c85f2660a0240b284115a";
+    owner = "golang";
+    repo = "text";
+    sha256 = "1pxrqbs760azmjaigf63qd6rwmz51hi6i8fq0vwcf5svxgxz2szp";
+    goPackagePath = "golang.org/x/text";
+    goPackageAliases = [ "github.com/golang/text" ];
+  };
 
   tools = buildGoPackage rec {
     rev = "7d75e8b219c3efda2d08ae38acd6b42f8da4f5f9";
@@ -166,25 +157,27 @@ let
   };
 
   ansicolor = buildFromGitHub {
-    rev    = "8368d3b31cf6f2c2464c7a91675342c9a0ac6658";
+    rev    = "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b";
     owner  = "shiena";
     repo   = "ansicolor";
-    sha256 = "1fyn06vxm44s0ph8pr7r9gkab1f4x851zlyy3p6jbbwsa6an8g9w";
+    sha256 = "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p";
   };
 
   asn1-ber = buildGoPackage rec {
-    rev = "295c7b21db5d9525ad959e3382610f3aff029663";
+    rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72";
     name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/vanackere/asn1-ber";
+    goPackagePath = "github.com/go-asn1-ber/asn1-ber";
     goPackageAliases = [
       "github.com/nmcclain/asn1-ber"
+      "github.com/vanackere/asn1-ber"
+      "gopkg.in/asn1-ber.v1"
     ];
 
     src = fetchFromGitHub {
       inherit rev;
-      owner  = "vanackere";
+      owner  = "go-asn1-ber";
       repo   = "asn1-ber";
-      sha256 = "1zamvcbk2xk3vznvckgqmdag32nlv7ip0fr1cc0z9ggai22ddh8n";
+      sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9";
     };
   };
 
@@ -199,41 +192,41 @@ let
     };
     buildInputs = [ oglematchers ];
     propagatedBuildInputs = [ goconvey ];
-    # subPackages = [];
     doCheck = false;
   };
 
-  aws-sdk-go = buildGoPackage rec {
-    rev = "5e038f730cbb99b144eeb1dbf92cd06c2d00b503";
-    name = "aws-sdk-go-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/awslabs/aws-sdk-go";
+  aws-sdk-go = buildFromGitHub {
+    #rev    = "a28ecdc9741b7905b5198059c94aed20868ffc08";
+    rev    = "127313c1b41e534a0456a68b6b3a16712dacb35d";
+    owner  = "aws";
+    repo   = "aws-sdk-go";
+    #sha256 = "1kgnp5f5c5phmihh8krar9rbkfg0lk73imjhjvkhxirhw04g3n5j";
+    sha256 = "0gd4nzv5jl02qi7g0y8lv6jadk0p52bpbl1r7pfgy8mn1vfxs37m";
     goPackageAliases = [
-      "github.com/hashicorp/aws-sdk-go"
+      "github.com/awslabs/aws-sdk-go"
     ];
+    buildInputs = [ gucumber testify ];
+    propagatedBuildInputs = [ go-ini ];
 
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "awslabs";
-      repo   = "aws-sdk-go";
-      sha256 = "1725y3aic53l8ms0583gdn0s915y1b783hs339qll0mmx7v09in5";
-    };
-
-    buildInputs = [ go-ini gucumber testify ];
+    preBuild = ''
+      pushd go/src/$goPackagePath
+      make generate
+      popd
+    '';
   };
 
-  hashicorp.aws-sdk-go = buildGoPackage rec {
-    rev = "e6ea0192eee4640f32ec73c0cbb71f63e4f2b65a";
-    name = "aws-sdk-go-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/aws-sdk-go";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "hashicorp";
-      repo   = "aws-sdk-go";
-      sha256 = "1qrc2jl38marbarnl31sag7s0h18j2wx1cxkcqin5m1pqg62p4cn";
-    };
-
-    buildInputs = [ go-ini net sandblast ];
+  hashicorp.aws-sdk-go = buildFromGitHub {
+    rev    = "e6ea0192eee4640f32ec73c0cbb71f63e4f2b65a";
+    owner  = "hashicorp";
+    repo   = "aws-sdk-go";
+    sha256 = "1qrc2jl38marbarnl31sag7s0h18j2wx1cxkcqin5m1pqg62p4cn";
+    propagatedBuildInputs = [ go-ini ];
+    subPackages = [
+      "./aws"
+      "./gen/ec2"
+      "./gen/endpoints"
+      "./gen/iam"
+    ];
   };
 
   binarydist = buildFromGitHub {
@@ -307,18 +300,11 @@ let
     sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s";
   };
 
-  cli = buildGoPackage rec {
-    rev = "6cc8bc522243675a2882b81662b0b0d2e04b99c9";
-    name = "cli-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/mitchellh/cli";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "mitchellh";
-      repo = "cli";
-      sha256 = "05w9ypliva9lyn3h4rahznj04mh0fws7vaqlwhxfs5nnd5g03dma";
-    };
-
+  cli = buildFromGitHub {
+    rev = "8102d0ed5ea2709ade1243798785888175f6e415";
+    owner = "mitchellh";
+    repo = "cli";
+    sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2";
     propagatedBuildInputs = [ crypto ];
   };
 
@@ -356,18 +342,11 @@ let
     sha256 = "093as4kxlabk3hrsd52kr9fhl6qafr4ghg89cjyglsva0mk0n7sb";
   };
 
-  copystructure = buildGoPackage rec {
+  copystructure = buildFromGitHub {
     rev = "6fc66267e9da7d155a9d3bd489e00dad02666dc6";
-    name = "copystructure-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/mitchellh/copystructure";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "mitchellh";
-      repo = "copystructure";
-      sha256 = "193s5vhw68d8npjyf5yvc5j24crazvy7d5dk316hl7590qrmbxrd";
-    };
-
+    owner = "mitchellh";
+    repo = "copystructure";
+    sha256 = "193s5vhw68d8npjyf5yvc5j24crazvy7d5dk316hl7590qrmbxrd";
     buildInputs = [ reflectwalk ];
   };
 
@@ -610,19 +589,14 @@ let
     sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj";
   };
 
-  gcloud-golang = buildGoPackage rec {
-    rev = "de1c38e5af44da22abe7c3b14a1edcf6264dae55";
-    name = "gcloud-golang-${stdenv.lib.strings.substring 0 7 rev}";
+  gcloud-golang = buildFromGitHub {
+    rev = "6335269abf9002cf5a84613c13cda6010842b834";
+    owner = "GoogleCloudPlatform";
+    repo = "gcloud-golang";
+    sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf";
     goPackagePath = "google.golang.org/cloud";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "GoogleCloudPlatform";
-      repo = "gcloud-golang";
-      sha256 = "0n6sh1zblixwyc9ykbsknmadsx2dmn3b5rsyrs30id1f96pgh4l0";
-    };
-
     buildInputs = [ net oauth2 protobuf google-api-go-client grpc ];
+    excludedPackages = "oauth2";
   };
 
   gcloud-golang-compute-metadata = buildGoPackage rec {
@@ -652,7 +626,7 @@ let
   };
 
   ugorji.go = buildGoPackage rec {
-    rev = "821cda7e48749cacf7cad2c6ed01e96457ca7e9d";
+    rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6";
     name = "ugorji-go-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/ugorji/go";
     goPackageAliases = [ "github.com/hashicorp/go-msgpack" ];
@@ -661,7 +635,7 @@ let
       inherit rev;
       owner = "ugorji";
       repo = "go";
-      sha256 = "1ay1l6gijxjgc7j0093drp5mjm93fmrp7r20qbqz4k05l43mqb3j";
+      sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v";
     };
   };
 
@@ -711,6 +685,14 @@ let
     };
   };
 
+  gocql = buildFromGitHub {
+    rev    = "53ea371a152ac188443fd3479f822ffecb0e9363";
+    owner  = "gocql";
+    repo   = "gocql";
+    sha256 = "0rqykhqgx7lrggcjyh053c3qddf130sgvsm27gndjv29rjrm874f";
+    propagatedBuildInputs = [ inf snappy groupcache ];
+  };
+
   gocolorize = buildGoPackage rec {
     rev = "v1.0.0";
     name = "gocolorize-${rev}";
@@ -751,24 +733,19 @@ let
     sha256 = "0yg1jpr7lcaqh6i8n9wbs9r128kk541qjv06r9a6fp9vj56rqr3m";
   };
 
-  govers = buildGoPackage rec {
+  govers = buildFromGitHub {
     rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
-    name = "govers-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/rogpeppe/govers";
+    owner = "rogpeppe";
+    repo = "govers";
+    sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc";
     dontRenameImports = true;
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "rogpeppe";
-      repo = "govers";
-      sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc";
-    };
   };
 
   golang-lru = buildFromGitHub {
-    rev    = "995efda3e073b6946b175ed93901d729ad47466a";
+    rev    = "7f9ef20a0256f494e24126014135cf893ab71e9e";
     owner  = "hashicorp";
     repo   = "golang-lru";
-    sha256 = "0ilnzg9qq2pfa8qb9yd25s5afi0fvsm78kqzqy39kgg8zsx70xyj";
+    sha256 = "165x0p8plr3fwn4r1d11m3pxa3r8dhyk98z7x6ah35lf63jm2cwv";
   };
 
   golang_protobuf_extensions = buildGoPackage rec {
@@ -820,22 +797,14 @@ let
     sha256 = "1r8fpzwhakq8fsppc33n4iivq1pz47xhs0h6bv4x5qiip5mswwvg";
   };
 
-  google-api-go-client = buildGoPackage rec {
-    rev = "34c5554e6406f7f715ede3616b39034247545ce0";
-    name = "google-api-go-client-${stdenv.lib.strings.substring 0 7 rev}";
+  google-api-go-client = buildFromGitHub {
+    rev = "ca0499560ea76ac6561548f36ffe841364fe2348";
+    owner = "google";
+    repo = "google-api-go-client";
+    sha256 = "1w6bjhd8p6fxvm002jqk3r9vk50hlaqnxc9g6msb2wswy3nxcw57";
     goPackagePath = "google.golang.org/api";
-
-    preBuild = ''
-      rm -rf go/src/${goPackagePath}/examples
-    '';
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "google";
-      repo = "google-api-go-client";
-      sha256 = "1496h0xc7vjklr4m4j7vy1764k1qk2grpcwz5zssgplpfs9s9wfz";
-    };
-
+    goPackageAliases = [ "github.com/google/google-api-client" ];
+    excludedPackages = "examples";
     buildInputs = [ net ];
   };
 
@@ -981,7 +950,7 @@ let
   };
 
   go-etcd = buildGoPackage rec {
-    rev = "4734e7aca379f0d7fcdf04fbb2101696a4b45ce8";
+    rev = "9847b93751a5fbaf227b893d172cee0104ac6427";
     name = "go-etcd-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/coreos/go-etcd";
     disabled = isGo13;
@@ -990,9 +959,10 @@ let
       inherit rev;
       owner = "coreos";
       repo = "go-etcd";
-      sha256 = "0zqr7mzd5kq0rnxj3zx5x5wwbmjkg365farwv72hzrsvq6g8zczr";
+      sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4";
     };
-    buildInputs = [ pkgs.etcd ];
+
+    propagatedBuildInputs = [ ugorji.go ];
   };
 
   go-flags = buildFromGitHub {
@@ -1015,26 +985,21 @@ let
     subPackages = [ "fuse" "fuse/nodefs" "fuse/pathfs" ];
   };
 
-  go-github = buildGoPackage rec {
-    rev = "9eb187bac4eba6fff5a54f80550b2df73b651523";
-    name = "go-github-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/google/go-github";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "google";
-      repo = "go-github";
-      sha256 = "123ck9nf5ggdrndg2gs1bhr4ysh4z0izph9sp7ciisxpgjkaycxq";
-    };
-
-    buildInputs = [ go-querystring oauth2 ];
+  go-github = buildFromGitHub {
+    rev = "34fb8ee07214d23c3035c95691fe9069705814d6";
+    owner = "google";
+    repo = "go-github";
+    sha256 = "0ygh0f6p679r095l4bym8q4l45w2l3d8r3hx9xrnnppxq59i2395";
+    buildInputs = [ oauth2 ];
+    propagatedBuildInputs = [ go-querystring ];
+    excludedPackages = "examples";
   };
 
   go-homedir = buildFromGitHub {
-    rev    = "7d2d8c8a4e078ce3c58736ab521a40b37a504c52";
+    rev    = "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4";
     owner  = "mitchellh";
     repo   = "go-homedir";
-    sha256 = "1ixhwxnvq1qx53asq47yhg3l88ndwrnyw4fkkidcjg759dc86d0i";
+    sha256 = "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9";
   };
 
   go-hostpool = buildFromGitHub {
@@ -1101,7 +1066,7 @@ let
   };
 
   armon.go-metrics = buildGoPackage rec {
-    rev = "a54701ebec11868993bc198c3f315353e9de2ed6";
+    rev = "b2d95e5291cdbc26997d1301a5e467ecbb240e25";
     name = "armon.go-metrics-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/armon/go-metrics";
 
@@ -1109,17 +1074,17 @@ let
       inherit rev;
       owner = "armon";
       repo = "go-metrics";
-      sha256 = "0ia9i96nac7vnmf5qb98rs74npf3vg55kdsvmql8cwgfpmqqcfdh";
+      sha256 = "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck";
     };
 
     propagatedBuildInputs = [ prometheus.client_golang ];
   };
 
   go-multierror = buildFromGitHub {
-    rev    = "fcdddc395df1ddf4247c69bd436e84cfa0733f7e";
+    rev    = "56912fb08d85084aa318edcf2bba735b97cf35c5";
     owner  = "hashicorp";
     repo   = "go-multierror";
-    sha256 = "1gvrm2bqi425mfg55m01z9gppfd7v4ljz1z8bykmh2sc82fj25jz";
+    sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r";
   };
 
   go-nsq = buildGoPackage rec {
@@ -1150,10 +1115,10 @@ let
   };
 
   go-radix = buildFromGitHub {
-    rev    = "0bab926c3433cfd6490c6d3c504a7b471362390c";
+    rev    = "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93";
     owner  = "armon";
     repo   = "go-radix";
-    sha256 = "0llq96lxh7p9426hjii8k42kq0cp1hflawh1kjwhbmi5g0jrq04d";
+    sha256 = "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c";
   };
 
   junegunn.go-runewidth = buildGoPackage rec {
@@ -1195,16 +1160,15 @@ let
   };
 
   go-snappystream = buildGoPackage rec {
-    rev = "97c96e6648e99c2ce4fe7d169aa3f7368204e04d";
+    rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504";
     name = "go-snappystream-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/mreiferson/go-snappystream";
     src = fetchFromGitHub {
       inherit rev;
       owner = "mreiferson";
       repo = "go-snappystream";
-      sha256 = "08ylvx9r6b1fi76v6cqjvny4yqsvcqjfsg93jdrgs7hi4mxvxynn";
+      sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6";
     };
-    propagatedBuildInputs = [ snappy-go ];
   };
 
   go-syslog = buildFromGitHub {
@@ -1255,10 +1219,10 @@ let
   };
 
   go-zookeeper = buildFromGitHub {
-    rev    = "d0e0d8e11f318e000a8cc434616d69e329edc374";
+    rev    = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4";
     owner  = "samuel";
     repo   = "go-zookeeper";
-    sha256 = "0v6g14ygnjl1l2fykyfjyvnab82a70jy0zzmsn5swlyy45b9gq2d";
+    sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z";
   };
 
   goquery = buildGoPackage rec {
@@ -1290,24 +1254,27 @@ let
     subPackages = [ "./" ];
   };
 
-  grpc = buildGoPackage rec {
-    rev = "f5ebd86be717593ab029545492c93ddf8914832b";
-    name = "grpc-${stdenv.lib.strings.substring 0 7 rev}";
+  groupcache = buildFromGitHub {
+    rev    = "604ed5785183e59ae2789449d89e73f3a2a77987";
+    owner  = "golang";
+    repo   = "groupcache";
+    sha256 = "1jh862mmgss71wls4yxv633agr7dk7y6h36npwqxbmhbz5c2q28l";
+    buildInputs = [ protobuf ];
+  };
+
+  grpc = buildFromGitHub {
+    rev = "7d81e8054fb2d57468136397b9b681e4ba4a7f8e";
+    owner = "grpc";
+    repo = "grpc-go";
+    sha256 = "0hknsqyzpnvjc2jvm741b16qi4jayijyhpxinskkm0nj0iy59h27";
     goPackagePath = "google.golang.org/grpc";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "grpc";
-      repo = "grpc-go";
-      sha256 = "07dfpwwk68rrhxmqj69gq2ncsf3kfmn0zhlwscda0gc5gb57n5x1";
-    };
-
-    buildInputs = [ gcloud-golang-compute-metadata ];
-    propagatedBuildInputs = [ http2 glog net protobuf oauth2 ];
+    goPackageAliases = [ "github.com/grpc/grpc-go" ];
+    propagatedBuildInputs = [ http2 net protobuf oauth2 glog ];
+    excludedPackages = "\\(examples\\|benchmark\\)";
   };
 
   gucumber = buildGoPackage rec {
-    rev = "fba94dc5a9077fa81eb85199fa9dfdaa8af82ab5";
+    rev = "e8116c9c66e641e9f81fc0a79fac923dfc646378";
     name = "gucumber-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/lsegal/gucumber";
 
@@ -1315,25 +1282,18 @@ let
       inherit rev;
       owner = "lsegal";
       repo = "gucumber";
-      sha256 = "028wczwpicwmggk3221pz8ffzh30l47x8217gvdzcqq6h9iiaczr";
+      sha256 = "1ic1lsv05da6qv8xmf94lpbmaisxi8mwbv7bh2k1y78lh43yncah";
     };
 
     buildInputs = [ testify ];
     propagatedBuildInputs = [ ansicolor ];
   };
 
-  hcl = buildGoPackage rec {
-    rev  = "513e04c400ee2e81e97f5e011c08fb42c6f69b84";
-    name = "hcl-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/hcl";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "hashicorp";
-      repo   = "hcl";
-      sha256 = "041js0k8bj7qsgr79p207m6r3nkpw7839gq31747618sap6w3g8c";
-    };
-
+  hcl = buildFromGitHub {
+    rev  = "54864211433d45cb780682431585b3e573b49e4a";
+    owner  = "hashicorp";
+    repo   = "hcl";
+    sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950";
     buildInputs = [ go-multierror ];
   };
 
@@ -1363,21 +1323,14 @@ let
       repo   = "hologram";
       sha256 = "1ra6rdniqh3pi84fm29zam4irzv52a1dd2sppaqngk07f7rkkhi4";
     };
-    buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir vanackere.ldap g2s gox ];
+    buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox ];
   };
 
-  http2 = buildGoPackage rec {
+  http2 = buildFromGitHub rec {
     rev = "f8202bc903bda493ebba4aa54922d78430c2c42f";
-    name = "http2-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/bradfitz/http2";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "bradfitz";
-      repo = "http2";
-      sha256 = "0cza2126jbji5vijwk4dxs05hifnff04xcr0vhxvafs6hz3sacvr";
-    };
-
+    owner = "bradfitz";
+    repo = "http2";
+    sha256 = "0cza2126jbji5vijwk4dxs05hifnff04xcr0vhxvafs6hz3sacvr";
     buildInputs = [ crypto ];
   };
 
@@ -1388,6 +1341,15 @@ let
     sha256 = "1l74pvqqhhval4vfnhca9d6i1ij69qs3ljf41w3m1l2id42rq7r9";
   };
 
+  inf = buildFromGitHub {
+    rev    = "c85f1217d51339c0fa3a498cc8b2075de695dae6";
+    owner  = "go-inf";
+    repo   = "inf";
+    sha256 = "1ykdk410vca8i35db2fp6qqcfx0bmx95k0xqd15wzsl0xjmyjk3y";
+    goPackagePath = "gopkg.in/inf.v0";
+    goPackageAliases = [ "github.com/go-inf/inf" ];
+  };
+
   influxdb = buildGoPackage rec {
     rev = "50a2b9ba0f189213fc399f59247787e71b872b2d";
     name = "influxdb-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1462,19 +1424,20 @@ let
     };
   };
 
-  vanackere.ldap = buildGoPackage rec {
-    rev = "e29b797d1abde6567ccb4ab56236e033cabf845a";
+  ldap = buildGoPackage rec {
+    rev = "83e65426fd1c06626e88aa8a085e5bfed0208e29";
     name = "ldap-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/vanackere/ldap";
+    goPackagePath = "github.com/go-ldap/ldap";
     goPackageAliases = [
       "github.com/nmcclain/ldap"
+      "github.com/vanackere/ldap"
     ];
 
     src = fetchFromGitHub {
       inherit rev;
-      owner  = "vanackere";
+      owner  = "go-ldap";
       repo   = "ldap";
-      sha256 = "069n242wszl04z0cyrwfzpdf64ziw5c3ps4czrsdsx7h4msmvr1x";
+      sha256 = "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz";
     };
 
     propagatedBuildInputs = [ asn1-ber ];
@@ -1550,17 +1513,17 @@ let
   };
 
   logutils = buildFromGitHub {
-    rev    = "367a65d59043b4f846d179341d138f01f988c186";
+    rev    = "0dc08b1671f34c4250ce212759ebd880f743d883";
     owner  = "hashicorp";
     repo   = "logutils";
-    sha256 = "0rjag8c6fn3f51nysrq62r46ma6gzyvijxba47q7cdfjq35mydb8";
+    sha256 = "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r";
   };
 
   mapstructure = buildFromGitHub {
-    rev    = "f7d28d5aeab42b9b95d2e6d6b956f73a290077fc";
+    rev    = "281073eb9eb092240d33ef253c404f1cca550309";
     owner  = "mitchellh";
     repo   = "mapstructure";
-    sha256 = "1l9bxx0lrxdb75bxgy3jq2f6sgin2xd5ll70z5797vi96mlz8ydb";
+    sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
   };
 
   mdns = buildGoPackage rec {
@@ -1662,10 +1625,10 @@ let
   };
 
   mysql = buildFromGitHub {
-    rev    = "0cc29e9fe8e25c2c58cf47bcab566e029bbaa88b";
+    rev    = "fb7299726d2e68745a8805b14f2ff44b5c2cfa84";
     owner  = "go-sql-driver";
     repo   = "mysql";
-    sha256 = "0ydvd0mk53793sj3hgycsx926zvzxipxvppld1i175g3pn4d41xp";
+    sha256 = "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w";
   };
 
   net-rpc-msgpackrpc = buildGoPackage rec {
@@ -1750,21 +1713,15 @@ let
     buildInputs = [ spacelog pkgconfig pkgs.openssl ];
   };
 
-  osext = buildGoPackage rec {
-    rev = "8fef92e41e22a70e700a96b29f066cda30ea24ef";
-    name = "osext-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/kardianos/osext";
+  osext = buildFromGitHub {
+    rev = "6e7f843663477789fac7c02def0d0909e969b4e5";
+    owner = "kardianos";
+    repo = "osext";
+    sha256 = "1sn1kk60azqbll687fndiskkfvp0ppca8rmakv8wgsn7a64sm39f";
     goPackageAliases = [
       "github.com/bugsnag/osext"
       "bitbucket.org/kardianos/osext"
     ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "kardianos";
-      repo = "osext";
-      sha256 = "1md9c0qlmfhwcwgqg92vfykcy95snci4n815plb15mgj5cf8dm7d";
-    };
   };
 
   pat = buildFromGitHub {
@@ -1850,10 +1807,10 @@ let
   };
 
   pq = buildFromGitHub {
-    rev    = "93e9980741c9e593411b94e07d5bad8cfb4809db";
+    rev    = "0dad96c0b94f8dee039aa40467f767467392a0af";
     owner  = "lib";
     repo   = "pq";
-    sha256 = "1q0zlizsk3xn7jn0skbvbhcxsfhq7z3dva96cm72n2r5vs5ld783";
+    sha256 = "06c38iy37251mh8jy9s8n97b01pjnqpq8ii77nnmqh1dsph37jz4";
   };
 
   pretty = buildGoPackage rec {
@@ -1869,18 +1826,11 @@ let
     propagatedBuildInputs = [ kr.text ];
   };
 
-  prometheus.client_golang = buildGoPackage rec {
-    name = "prometheus-client-${version}";
-    version = "0.5.0";
-    goPackagePath = "github.com/prometheus/client_golang";
-
-    src = fetchFromGitHub {
-      owner = "prometheus";
-      repo = "client_golang";
-      rev = "${version}";
-      sha256 = "0aaf20iv797dj2vr5lnqk006aw7n0cclmxlpk8xy6c6nrn6fm3nv";
-    };
-
+  prometheus.client_golang = buildFromGitHub {
+    rev = "3a499bf7fc46bc58337ce612d0cbb29c550b8118";
+    owner = "prometheus";
+    repo = "client_golang";
+    sha256 = "1hf79m83kr3b6nxxwz8qw1c5nls58j1xfaz7q6k6bb9kwabpc3gi";
     propagatedBuildInputs = [
       goautoneg
       protobuf
@@ -1889,6 +1839,7 @@ let
       prometheus.procfs
       beorn7.perks
     ];
+    excludedPackages = "examples";
   };
 
   prometheus.client_model = buildGoPackage rec {
@@ -2011,10 +1962,10 @@ let
   };
 
   reflectwalk = buildFromGitHub {
-    rev    = "242be0c275dedfba00a616563e6db75ab8f279ec";
+    rev    = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6";
     owner  = "mitchellh";
     repo   = "reflectwalk";
-    sha256 = "0xjyjs7ci7yaslk0rcgdw99ys2kq0p14cx6c90pmdzl0m9pcc9v4";
+    sha256 = "1nm2ig7gwlmf04w7dbqd8d7p64z2030fnnfbgnd56nmd7dz8gpxq";
   };
 
   revel = buildGoPackage rec {
@@ -2124,17 +2075,6 @@ let
     propagatedBuildInputs = [ raw ];
   };
 
-  snappy-go = buildGoPackage rec {
-    rev = "14";
-    name = "snappy-go-${rev}";
-    goPackagePath = "code.google.com/p/snappy-go";
-    src = fetchhg {
-      inherit rev;
-      url = "http://code.google.com/p/snappy-go";
-      sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7";
-    };
-  };
-
   spacelog = buildGoPackage rec {
     rev = "ae95ccc1eb0c8ce2496c43177430efd61930f7e4";
     name = "spacelog-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2182,6 +2122,13 @@ let
     };
   };
 
+  structs = buildFromGitHub {
+    rev    = "a9f7daa9c2729e97450c2da2feda19130a367d8f";
+    owner  = "fatih";
+    repo   = "structs";
+    sha256 = "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50";
+  };
+
   termbox-go = buildGoPackage rec {
     rev = "9aecf65084a5754f12d27508fa2e6ed56851953b";
     name = "termbox-go-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2197,7 +2144,7 @@ let
   };
 
   testify = buildGoPackage rec {
-    rev = "dab07ac62d4905d3e48d17dc549c684ac3b7c15a";
+    rev = "089c7181b8c728499929ff09b62d3fdd8df8adff";
     name = "testify-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/stretchr/testify";
 
@@ -2205,7 +2152,7 @@ let
       inherit rev;
       owner = "stretchr";
       repo = "testify";
-      sha256 = "0r24v9ly3g68ywqyri14fn8smvkw8zvrzbivxw3ndd6jxcvi84b7";
+      sha256 = "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p";
     };
 
     buildInputs = [ objx ];
@@ -2256,17 +2203,15 @@ let
     buildInputs = [ pkgconfig libusb ];
   };
 
-  vault = buildGoPackage rec {
-    rev = "v0.1.2";
-    name = "vault-${rev}";
-    goPackagePath = "github.com/hashicorp/vault";
+  vault = buildFromGitHub {
+    rev = "v0.2.0";
+    owner = "hashicorp";
+    repo = "vault";
+    sha256 = "133fwhzk8z3xb6mf6scmn5rbl6g4vqg4g4n6zw620fsn9wy1b9ni";
 
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "vault";
-      sha256 = "0q6wlw0s9dig11mzcfg25fh2wz7g70zxkqm7c5f58fncxdby2nqj";
-    };
+    #postPatch = ''
+    #  grep -r '/gen/' | awk -F: '{print $1}' | xargs sed -i 's,/gen/,/apis/,g'
+    #'';
 
     # We just want the consul api not all of consul
     extraSrcs = [
@@ -2274,10 +2219,10 @@ let
     ];
 
     buildInputs = [
-      armon.go-metrics go-radix mysql go-querystring hashicorp.aws-sdk-go
-      errwrap go-multierror go-syslog golang-lru hcl logutils pq cli
-      copystructure go-homedir mapstructure reflectwalk columnize go-zookeeper
-      asn1-ber vanackere.ldap go-ini crypto net oauth2 osext go-github
+      armon.go-metrics go-radix aws-sdk-go go-etcd structs ldap mysql gocql
+      golang-lru go-github hashicorp.aws-sdk-go errwrap go-multierror go-syslog
+      hcl logutils osext pq cli copystructure go-homedir mapstructure
+      reflectwalk columnize go-zookeeper crypto net oauth2
     ];
   };
 

From 6ffe4beca47071c123fb8e2ca2c65c828d0d32fa Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 18:28:05 -0700
Subject: [PATCH 0493/2016] etcd: Init at 2.1.1

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 448c94e0602..f6b8bfccfe8 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -576,6 +576,14 @@ let
     sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
   };
 
+  etcd = buildFromGitHub {
+    rev    = "v2.1.1";
+    owner  = "coreos";
+    repo   = "etcd";
+    sha256 = "0jd97091jwwdvx50vbdi1py9v5w9fk86cw85p0zinb0ww6bs4y0s";
+    excludedPackages = "Godeps";
+  };
+
   fsnotify.v0 = buildGoPackage rec {
     rev = "v0.9.3";
     name = "fsnotify.v0-${rev}";

From 58e3c658ce816708efd45eea6e9764be2021a2a8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 18:23:52 -0700
Subject: [PATCH 0494/2016] etcd: Use goPackages version

---
 pkgs/servers/etcd/default.nix   | 25 -------------------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/servers/etcd/default.nix

diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
deleted file mode 100644
index 89ea70d46c5..00000000000
--- a/pkgs/servers/etcd/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  version = "2.0.0";
-  name = "etcd-${version}";
-  goPackagePath = "github.com/coreos/etcd";
-  src = fetchFromGitHub {
-    owner = "coreos";
-    repo = "etcd";
-    rev = "v${version}";
-    sha256 = "1s3jilzlqyh2i81pv79cgap6dfj7qrfrwcv4w9lic5ivznz413vc";
-  };
-
-  subPackages = [ "./" ];
-
-  meta = with lib; {
-    description = "A highly-available key value store for shared configuration and service discovery";
-    homepage = http://coreos.com/using-coreos/etcd/;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ cstrahan ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14f98fd8dd0..bb4b3365dde 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8885,7 +8885,7 @@ let
 
   dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
 
-  etcd = callPackage ../servers/etcd { };
+  etcd = goPackages.etcd;
 
   ejabberd = callPackage ../servers/xmpp/ejabberd {
     erlang = erlangR16;

From af6d8b5182f5482738eb88f6c6849e37cc1c7ec3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 29 Jul 2015 18:31:06 -0700
Subject: [PATCH 0495/2016] etcdctl: Use goPackages version of etcd

cc @cstrahan
---
 pkgs/development/tools/etcdctl/default.nix | 25 ----------------------
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/development/tools/etcdctl/default.nix

diff --git a/pkgs/development/tools/etcdctl/default.nix b/pkgs/development/tools/etcdctl/default.nix
deleted file mode 100644
index ae2c06d5a22..00000000000
--- a/pkgs/development/tools/etcdctl/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  version = "0.4.5";
-  name = "etcdctl-${version}";
-  goPackagePath = "github.com/coreos/etcdctl";
-  src = fetchFromGitHub {
-    owner = "coreos";
-    repo = "etcdctl";
-    rev = "v${version}";
-    sha256 = "1kbri59ppil52v7s992q8r6i1zk9lac0s2w00z2lsgc9w1z59qs0";
-  };
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "A simple command line client for etcd";
-    homepage = http://coreos.com/using-coreos/etcd/;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ cstrahan ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb4b3365dde..a47de56f0f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8902,7 +8902,7 @@ let
     v8 = v8_3_24_10;
   };
 
-  etcdctl = callPackage ../development/tools/etcdctl { };
+  etcdctl = goPackages.etcd;
 
   exim = callPackage ../servers/mail/exim { };
 

From 2cf8d9b0ef7943a0dd9bc565b2390610f4f2afc3 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 30 Jul 2015 07:31:53 +0200
Subject: [PATCH 0496/2016] xserver: qtile as windowManager

---
 .../services/x11/window-managers/default.nix  |  1 +
 .../services/x11/window-managers/qtile.nix    | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 nixos/modules/services/x11/window-managers/qtile.nix

diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index a8b1044ad36..4751de07a15 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -25,6 +25,7 @@ in
     ./windowmaker.nix
     ./wmii.nix
     ./xmonad.nix
+    ./qtile.nix
     ./none.nix ];
 
   options = {
diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix
new file mode 100644
index 00000000000..37f84f0903c
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/qtile.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.qtile;
+in
+
+{
+  options = {
+    services.xserver.windowManager.qtile.enable = mkEnableOption "qtile";
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = [{
+      name = "qtile";
+      start = ''
+        ${pkgs.qtile}/bin/qtile
+        waitPID=$!
+      '';
+    }];
+    
+    environment.systemPackages = [ pkgs.qtile ];
+  };
+}

From 862900e42e00dbc83215def6df1091f5129a8930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jul 2015 10:30:17 +0200
Subject: [PATCH 0497/2016] mass-replace deprecated usage of find -perm (Fixes
 #9044)

sed 's|-perm +0|-perm /0|g'
It's a mass-rebuild due to usage in stdenv's default setup hooks.
---
 pkgs/applications/networking/copy-com/default.nix   | 2 +-
 pkgs/applications/networking/dropbox/default.nix    | 4 ++--
 pkgs/build-support/builder-defs/builder-defs.nix    | 2 +-
 pkgs/build-support/setup-hooks/patch-shebangs.sh    | 2 +-
 pkgs/development/interpreters/ruby/bundler-head.nix | 2 +-
 pkgs/development/interpreters/ruby/bundler.nix      | 2 +-
 pkgs/development/python-modules/generic/wrap.sh     | 2 +-
 pkgs/development/tools/misc/patchelf/setup-hook.sh  | 2 +-
 pkgs/servers/plex/default.nix                       | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix
index 3a3cf4df284..7dd2702325b 100644
--- a/pkgs/applications/networking/copy-com/default.nix
+++ b/pkgs/applications/networking/copy-com/default.nix
@@ -52,7 +52,7 @@ in stdenv.mkDerivation {
 
     RPATH=${libPaths}:$out/${appdir}
     echo "Updating rpaths to $RPATH in:"
-    find "$out/${appdir}" -type f -a -perm +0100 \
+    find "$out/${appdir}" -type f -a -perm /0100 \
       -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
   '';
 
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 5a37a8eb76a..d40693b5059 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -101,12 +101,12 @@ in stdenv.mkDerivation {
     rm "$out/${appdir}/qt.conf"
     rm -fr "$out/${appdir}/plugins"
 
-    find "$out/${appdir}" -type f -a -perm +0100 \
+    find "$out/${appdir}" -type f -a -perm /0100 \
       -print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \;
 
     RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir}
     echo "updating rpaths to: $RPATH"
-    find "$out/${appdir}" -type f -a -perm +0100 \
+    find "$out/${appdir}" -type f -a -perm /0100 \
       -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
 
     mkdir -p "$out/share/applications"
diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index 42d8f35b076..e7c64501614 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -569,7 +569,7 @@ let inherit (builtins) head tail trace; in
      # Interpreters that are already in the store are left untouched.
          echo "patching script interpreter paths"
          local f
-         for f in $(find "${dir}" -xtype f -perm +0100); do
+         for f in $(find "${dir}" -xtype f -perm /0100); do
              local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f")
              if test -n "$oldPath" -a "''${oldPath:0:''${#NIX_STORE}}" != "$NIX_STORE"; then
                  local newPath=$(type -P $(basename $oldPath) || true)
diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh
index 5a7f23b2d81..44ebad0d593 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -18,7 +18,7 @@ patchShebangs() {
     local oldInterpreterLine
     local newInterpreterLine
 
-    find "$dir" -type f -perm +0100 | while read f; do
+    find "$dir" -type f -perm /0100 | while read f; do
         if [ "$(head -1 "$f" | head -c +2)" != '#!' ]; then
             # missing shebang => not a script
             continue
diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
index 0595e9348c7..c8e981a4735 100644
--- a/pkgs/development/interpreters/ruby/bundler-head.nix
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -10,7 +10,7 @@ buildRubyGem {
   };
   dontPatchShebangs = true;
   postInstall = ''
-    find $out -type f -perm +0100 | while read f; do
+    find $out -type f -perm /0100 | while read f; do
       substituteInPlace $f \
          --replace "/usr/bin/env" "${coreutils}/bin/env"
     done
diff --git a/pkgs/development/interpreters/ruby/bundler.nix b/pkgs/development/interpreters/ruby/bundler.nix
index d5278bed885..6dc01f9929c 100644
--- a/pkgs/development/interpreters/ruby/bundler.nix
+++ b/pkgs/development/interpreters/ruby/bundler.nix
@@ -6,7 +6,7 @@ buildRubyGem {
   sha256 = "1zkxw6699bbmsamrij2lirscbh0j58p1p3bql22jsxvx34j6w5nc";
   dontPatchShebangs = true;
   postInstall = ''
-    find $out -type f -perm +0100 | while read f; do
+    find $out -type f -perm /0100 | while read f; do
       substituteInPlace $f \
          --replace "/usr/bin/env" "${coreutils}/bin/env"
     done
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index b6d2a66afff..6ad603e0138 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -26,7 +26,7 @@ wrapPythonProgramsIn() {
     done
 
     # Find all regular files in the output directory that are executable.
-    for f in $(find "$dir" -type f -perm +0100); do
+    for f in $(find "$dir" -type f -perm /0100); do
         # Rewrite "#! .../env python" to "#! /nix/store/.../python".
         if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then
             sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^"
diff --git a/pkgs/development/tools/misc/patchelf/setup-hook.sh b/pkgs/development/tools/misc/patchelf/setup-hook.sh
index b0d37b73e2b..944b418d1b4 100644
--- a/pkgs/development/tools/misc/patchelf/setup-hook.sh
+++ b/pkgs/development/tools/misc/patchelf/setup-hook.sh
@@ -9,7 +9,7 @@ patchELF() {
     if [ -e "$prefix" ]; then
         find "$prefix" \( \
             \( -type f -a -name "*.so*" \) -o \
-            \( -type f -a -perm +0100 \) \
+            \( -type f -a -perm /0100 \) \
             \) -print -exec patchelf --shrink-rpath '{}' \;
     fi
     stopNest
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 62334de1b56..1c7ff5c49df 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin"
     done
 
-    find $out/usr/lib/plexmediaserver/Resources -type f -a -perm +0100 \
+    find $out/usr/lib/plexmediaserver/Resources -type f -a -perm /0100 \
         -print -exec patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" '{}' \;
 
 

From f2131c7aea7c5bc8bfcff301e9a4afcf7fcca36c Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 30 Jul 2015 10:39:53 +0200
Subject: [PATCH 0498/2016] ncmpcpp: 0.6.4 -> 0.6.5

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

diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index 5069795cafe..afd411089cd 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ncmpcpp-${version}";
-  version = "0.6.4";
+  version = "0.6.5";
 
   src = fetchurl {
     url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
-    sha256 = "1w85r23s0b30vh03xybnjikslqcf02gsciib9v10jw71nw32wzkm";
+    sha256 = "1zfidkskmiqx1wfykinmr639lhd90s7b0rks6vaci4n56ml8y4ji";
   };
 
   configureFlags = [ "BOOST_LIB_SUFFIX=" ]

From 3a96d1ebb4c9f490f164afd88265e7d39724b9df Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 19 Jul 2015 23:19:20 +0200
Subject: [PATCH 0499/2016] luasec: 0.5 -> 0.6pre-2015-04-17 (close #8958)

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index c1b04afba38..383f03934a2 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -8,6 +8,7 @@
 { fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool
 , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo
 , perl, gtk, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
+, fetchFromGitHub
 }:
 
 let
@@ -145,11 +146,12 @@ let
   };
 
   luasec = buildLuaPackage rec {
-    version = "0.5";
-    name = "sec-${version}";
-    src = fetchzip {
-      url = "https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz";
-      sha256 = "1zl6wwcyd4dfcw01qan7dkcw0rgzm69w819qbaddcr2ik147ccmq";
+    name = "sec-0.6pre-2015-04-17";
+    src = fetchFromGitHub {
+      owner = "brunoos";
+      repo = "luasec";
+      rev = "12e1b1f1d9724974ecc6ca273a0661496d96b3e7";
+      sha256 = "0m917qgi54p6n2ak33m67q8sxcw3cdni99bm216phjjka9rg7qwd";
     };
 
     buildInputs = [ openssl ];

From 5e01537a9b83c9c529adf6258a800136b62cd8ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jul 2015 11:28:07 +0200
Subject: [PATCH 0500/2016] gccgo: use 4.9 by default, /cc #8735

It seems fine on Hydra.
---
 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 a47de56f0f4..79ee4ba3c60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3922,7 +3922,7 @@ let
     emacsSupport = config.emacsSupport or false;
   };
 
-  gccgo = gccgo48;
+  gccgo = gccgo49;
 
   gccgo48 = wrapCC (gcc48.cc.override {
     name = "gccgo";

From 0743aaf87859756f1d8bbe165b78d09307093fee Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 30 Jul 2015 12:01:30 +0200
Subject: [PATCH 0501/2016] libgda: add required openssl dependency, previously
 implicit

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

diff --git a/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix
index 3944644a453..1fcb411d120 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3 }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }:
 
 let
   major = "5.2";
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ];
+  buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ];
 
   meta = with stdenv.lib; {
     description = "Database access library";

From 8a5000cc78f85201cf1b8dfd95116b85d63048d4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 30 Jul 2015 12:01:40 +0200
Subject: [PATCH 0502/2016] nixUnstable: Update to 1.10pre4200_76cc8e9

Also unify the nixStable and nixUnstable expressions.
---
 nixos/lib/make-channel.nix                    |   2 +-
 pkgs/tools/package-management/nix/default.nix | 135 ++++++++++--------
 .../tools/package-management/nix/unstable.nix |  76 ----------
 pkgs/top-level/all-packages.nix               |  21 +--
 4 files changed, 85 insertions(+), 149 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix/unstable.nix

diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix
index 7764527ffa7..1c6bf0897f4 100644
--- a/nixos/lib/make-channel.nix
+++ b/nixos/lib/make-channel.nix
@@ -8,7 +8,7 @@ pkgs.releaseTools.makeSourceTarball {
   officialRelease = false; # FIXME: fix this in makeSourceTarball
   inherit version versionSuffix;
 
-  buildInputs = [ pkgs.nixUnstable ];
+  buildInputs = [ pkgs.nix ];
 
   expr = builtins.readFile ./channel-expr.nix;
 
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 588aaf8b612..f2099e1d76f 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -4,82 +4,101 @@
 , stateDir ? "/nix/var"
 }:
 
-stdenv.mkDerivation rec {
-  name = "nix-1.9";
+let
 
-  src = fetchurl {
-    url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-    sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1";
-  };
+  common = { name, src }: stdenv.mkDerivation rec {
+    inherit name src;
 
-  outputs = [ "out" "doc" ];
+    outputs = [ "out" "doc" ];
 
-  nativeBuildInputs = [ perl pkgconfig ];
+    nativeBuildInputs = [ perl pkgconfig ];
 
-  buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium;
+    buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium;
 
-  propagatedBuildInputs = [ boehmgc ];
+    propagatedBuildInputs = [ boehmgc ];
 
-  # Note: bzip2 is not passed as a build input, because the unpack phase
-  # would end up using the wrong bzip2 when cross-compiling.
-  # XXX: The right thing would be to reinstate `--with-bzip2' in Nix.
-  postUnpack =
-    '' export CPATH="${bzip2}/include"
-       export LIBRARY_PATH="${bzip2}/lib"
-       export CXXFLAGS="-Wno-error=reserved-user-defined-literal"
-    '';
-
-  configureFlags =
-    ''
-      --with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc
-      --with-dbi=${perlPackages.DBI}/${perl.libPrefix}
-      --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
-      --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
-      --disable-init-state
-      --enable-gc
-    '';
-
-  makeFlags = "profiledir=$(out)/etc/profile.d";
-
-  installFlags = "sysconfdir=$(out)/etc";
-
-  doInstallCheck = true;
-
-  crossAttrs = {
+    # Note: bzip2 is not passed as a build input, because the unpack phase
+    # would end up using the wrong bzip2 when cross-compiling.
+    # XXX: The right thing would be to reinstate `--with-bzip2' in Nix.
     postUnpack =
-      '' export CPATH="${bzip2.crossDrv}/include"
-         export NIX_CROSS_LDFLAGS="-L${bzip2.crossDrv}/lib -rpath-link ${bzip2.crossDrv}/lib $NIX_CROSS_LDFLAGS"
+      '' export CPATH="${bzip2}/include"
+         export LIBRARY_PATH="${bzip2}/lib"
+         export CXXFLAGS="-Wno-error=reserved-user-defined-literal"
       '';
 
     configureFlags =
       ''
-        --with-store-dir=${storeDir} --localstatedir=${stateDir}
+        --with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc
         --with-dbi=${perlPackages.DBI}/${perl.libPrefix}
         --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
         --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
         --disable-init-state
         --enable-gc
-      '' + stdenv.lib.optionalString (
-          stdenv.cross ? nix && stdenv.cross.nix ? system
-      ) ''--with-system=${stdenv.cross.nix.system}'';
+      '';
 
-    doInstallCheck = false;
+    makeFlags = "profiledir=$(out)/etc/profile.d";
+
+    installFlags = "sysconfdir=$(out)/etc";
+
+    doInstallCheck = true;
+
+    crossAttrs = {
+      postUnpack =
+        '' export CPATH="${bzip2.crossDrv}/include"
+           export NIX_CROSS_LDFLAGS="-L${bzip2.crossDrv}/lib -rpath-link ${bzip2.crossDrv}/lib $NIX_CROSS_LDFLAGS"
+        '';
+
+      configureFlags =
+        ''
+          --with-store-dir=${storeDir} --localstatedir=${stateDir}
+          --with-dbi=${perlPackages.DBI}/${perl.libPrefix}
+          --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
+          --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
+          --disable-init-state
+          --enable-gc
+        '' + stdenv.lib.optionalString (
+            stdenv.cross ? nix && stdenv.cross.nix ? system
+        ) ''--with-system=${stdenv.cross.nix.system}'';
+
+      doInstallCheck = false;
+    };
+
+    enableParallelBuilding = true;
+
+    meta = {
+      description = "Powerful package manager that makes package management reliable and reproducible";
+      longDescription = ''
+        Nix is a powerful package manager for Linux and other Unix systems that
+        makes package management reliable and reproducible. It provides atomic
+        upgrades and rollbacks, side-by-side installation of multiple versions of
+        a package, multi-user package management and easy setup of build
+        environments.
+      '';
+      homepage = http://nixos.org/;
+      license = stdenv.lib.licenses.lgpl2Plus;
+      maintainers = [ stdenv.lib.maintainers.eelco ];
+      platforms = stdenv.lib.platforms.all;
+    };
   };
 
-  enableParallelBuilding = true;
+in rec {
+
+   nix = nixStable;
+
+   nixStable = common rec {
+     name = "nix-1.9";
+      src = fetchurl {
+        url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
+        sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1";
+      };
+   };
+
+   nixUnstable = lib.lowPrio (common rec {
+     name = "nix-1.10pre4200_76cc8e9";
+      src = fetchurl {
+        url = "http://hydra.nixos.org/build/24195844/download/4/${name}.tar.xz";
+        sha256 = "87e21fe00d93cf64674ddfae25b7be402b10a9e8449eae1fbb1203123624fd0f";
+      };
+   });
 
-  meta = {
-    description = "Powerful package manager that makes package management reliable and reproducible";
-    longDescription = ''
-      Nix is a powerful package manager for Linux and other Unix systems that
-      makes package management reliable and reproducible. It provides atomic
-      upgrades and rollbacks, side-by-side installation of multiple versions of
-      a package, multi-user package management and easy setup of build
-      environments.
-    '';
-    homepage = http://nixos.org/;
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.all;
-  };
 }
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
deleted file mode 100644
index f8d4c1fd119..00000000000
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
-, pkgconfig, boehmgc, perlPackages, libsodium
-, storeDir ? "/nix/store"
-, stateDir ? "/nix/var"
-}:
-
-stdenv.mkDerivation rec {
-  name = "nix-1.9pre4153_b64988b";
-
-  src = fetchurl {
-    url = "http://hydra.nixos.org/build/22838666/download/4/${name}.tar.xz";
-    sha256 = "51b4870305724aa7b26c92b43cb22a0e9b6798ac2534db493079bfc383244e31";
-  };
-
-  nativeBuildInputs = [ perl pkgconfig ];
-
-  buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium;
-
-  propagatedBuildInputs = [ boehmgc ];
-
-  # Note: bzip2 is not passed as a build input, because the unpack phase
-  # would end up using the wrong bzip2 when cross-compiling.
-  # XXX: The right thing would be to reinstate `--with-bzip2' in Nix.
-  postUnpack =
-    '' export CPATH="${bzip2}/include"
-       export LIBRARY_PATH="${bzip2}/lib"
-       export CXXFLAGS="-Wno-error=reserved-user-defined-literal"
-    '';
-
-  configureFlags =
-    ''
-      --with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc
-      --with-dbi=${perlPackages.DBI}/${perl.libPrefix}
-      --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
-      --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
-      --disable-init-state
-      --enable-gc
-    '';
-
-  makeFlags = "profiledir=$(out)/etc/profile.d";
-
-  installFlags = "sysconfdir=$(out)/etc";
-
-  doInstallCheck = true;
-
-  crossAttrs = {
-    postUnpack =
-      '' export CPATH="${bzip2.crossDrv}/include"
-         export NIX_CROSS_LDFLAGS="-L${bzip2.crossDrv}/lib -rpath-link ${bzip2.crossDrv}/lib $NIX_CROSS_LDFLAGS"
-      '';
-
-    configureFlags =
-      ''
-        --with-store-dir=${storeDir} --localstatedir=${stateDir}
-        --with-dbi=${perlPackages.DBI}/${perl.libPrefix}
-        --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
-        --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
-        --disable-init-state
-        --enable-gc
-      '' + stdenv.lib.optionalString (
-          stdenv.cross ? nix && stdenv.cross.nix ? system
-      ) ''--with-system=${stdenv.cross.nix.system}'';
-
-    doInstallCheck = false;
-  };
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "The Nix Deployment System";
-    homepage = http://nixos.org/;
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79ee4ba3c60..94d5e5e1457 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14736,20 +14736,13 @@ let
 
   mupen64plus1_5 = callPackage ../misc/emulators/mupen64plus/1.5.nix { };
 
-  nix = nixStable;
-
-  nixStable = callPackage ../tools/package-management/nix {
-    storeDir = config.nix.storeDir or "/nix/store";
-    stateDir = config.nix.stateDir or "/nix/var";
-  };
-
-  nixUnstable = nixStable;
-  /*
-  nixUnstable = lowPrio (callPackage ../tools/package-management/nix/unstable.nix {
-    storeDir = config.nix.storeDir or "/nix/store";
-    stateDir = config.nix.stateDir or "/nix/var";
-  });
-  */
+  inherit (callPackages ../tools/package-management/nix {
+      storeDir = config.nix.storeDir or "/nix/store";
+      stateDir = config.nix.stateDir or "/nix/var";
+      })
+    nix
+    nixStable
+    nixUnstable;
 
   nixops = callPackage ../tools/package-management/nixops { };
 

From 61a858783cac113da61011d1e2d39c2da50d68fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 30 Jul 2015 12:07:13 +0200
Subject: [PATCH 0503/2016] nix-repl: Bump

---
 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 feba569d398..9e8649537fd 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 = "45c6405a30bd1b2cb8ad6a94b23be8b10cf52069"; in
+let rev = "57aeef0b6a3d3c9506e35f57f5b6db33019967e5"; 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 = "0c6sifpz8j898xznvy9dvm44w4nysqprrhs553in19jwwkf7kryp";
+    sha256 = "1p92zwkpy3iaglq23aydggbl6dbnw97f0v5gy2w74y8pi9d5mgh5";
   };
 
   buildInputs = [ nix readline ];

From 59c9f2396918acebf4d5c59f6097e9fc678ad515 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 30 Jul 2015 12:10:11 +0200
Subject: [PATCH 0504/2016] libosinfo: fix build by using libsoup with GNOME
 support

---
 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 94d5e5e1457..a31b1c4fef1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7212,7 +7212,9 @@ let
 
   libopus = callPackage ../development/libraries/libopus { };
 
-  libosinfo = callPackage ../development/libraries/libosinfo {};
+  libosinfo = callPackage ../development/libraries/libosinfo {
+    inherit (gnome3) libsoup;
+  };
 
   libosip = callPackage ../development/libraries/osip {};
 

From e4d21e59dee6d6bd24bbf1ad0b50d964000fd307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jul 2015 12:13:50 +0200
Subject: [PATCH 0505/2016] gcj: switch to 4.9, /cc #8735

Builds fine, including the only reference pdftk.
/cc its maintainers: @viric, @7c6f434c.
---
 pkgs/top-level/all-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a31b1c4fef1..02c37c059d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3883,9 +3883,8 @@ let
     profiledCompiler = false;
   });
 
-  gcj = gcj48;
-
-  gcj48 = wrapCC (gcc48.cc.override {
+  gcj = gcj49;
+  gcj49 = wrapCC (gcc49.cc.override {
     name = "gcj";
     langJava = true;
     langFortran = false;

From a8f608670866607e432805f90ae6673f1fbb03c8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 30 Jul 2015 10:33:52 +0000
Subject: [PATCH 0506/2016] wrapGAppsHook: populate GIO_EXTRA_MODULES

---
 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index 4b1a9527b11..e9fc7f7062d 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -1,5 +1,13 @@
 gappsWrapperArgs=()
 
+find_gio_modules() {
+    if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
+        gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$1/lib/gio/modules")
+    fi
+}
+
+envHooks+=(find_gio_modules)
+
 wrapGAppsHook() {
   if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then
     gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")

From 13d2056cbf18248730f238475b5f55f62066d78c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 30 Jul 2015 10:34:02 +0000
Subject: [PATCH 0507/2016] iagno: use wrapGAppsHook

---
 pkgs/desktops/gnome-3/3.16/games/iagno/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
index 945ae7d0fda..b5fab4a0e6f 100644
--- a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper
-, intltool, itstool, libcanberra_gtk3, libxml2 }:
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
+, intltool, itstool, libcanberra_gtk3, libxml2, dconf }:
 
 stdenv.mkDerivation rec {
   name = "iagno-${gnome3.version}.1";
@@ -10,17 +10,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  libxml2 libcanberra_gtk3 makeWrapper itstool intltool ];
+                  dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ];
 
   enableParallelBuilding = true;
 
-  preFixup = ''
-    wrapProgram "$out/bin/iagno" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
-      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
-  '';
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Iagno;
     description = "Computer version of the game Reversi, more popularly called Othello";

From ac0daa6dd913bcb146b4829aada5a4dbee4e6a54 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 30 Jul 2015 10:36:07 +0000
Subject: [PATCH 0508/2016] lightsoff: use wrapGAppsHook

---
 .../gnome-3/3.16/games/lightsoff/default.nix      | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
index 37b8337200d..313614f1744 100644
--- a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper
-, intltool, itstool, clutter, clutter_gtk, libxml2 }:
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
+, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }:
 
 stdenv.mkDerivation rec {
   name = "lightsoff-${gnome3.version}.1.1";
@@ -9,18 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "00a2jv7wr6fxrzk7avwa0wspz429ad7ri7v95jv31nqn5q73y4c0";
   };
 
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  libxml2 clutter clutter_gtk makeWrapper itstool intltool ];
+  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf
+                  libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ];
 
   enableParallelBuilding = true;
 
-  preFixup = ''
-    wrapProgram "$out/bin/lightsoff" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
-      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
-  '';
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Lightsoff;
     description = "Puzzle game, where the objective is to turn off all of the tiles on the board";

From 7f65b99998d6b5ae0e001048c216c444706d8a16 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 30 Jul 2015 10:37:44 +0000
Subject: [PATCH 0509/2016] swell-foop: use wrapGAppsHook

---
 .../gnome-3/3.16/games/swell-foop/default.nix       | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
index ff3c37c15e6..510e6d6d1a8 100644
--- a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper
-, clutter, clutter_gtk, intltool, itstool, libxml2 }:
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf
+, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "swell-foop-${gnome3.version}.1";
@@ -10,17 +10,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  makeWrapper itstool intltool clutter clutter_gtk libxml2 ];
+                  dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ];
 
   enableParallelBuilding = true;
 
-  preFixup = ''
-    wrapProgram "$out/bin/swell-foop" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
-      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
-  '';
-
   meta = with stdenv.lib; {
     homepage = "https://wiki.gnome.org/Apps/Swell%20Foop";
     description = "Puzzle game, previously known as Same GNOME";

From 8dbc328ad66089d51736ad55aeb3edb4377fa948 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 30 Jul 2015 13:00:37 +0200
Subject: [PATCH 0510/2016] shotwell: use gnome3.rest to fix build

---
 .../graphics/shotwell/default.nix             | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 94131cbf4ff..2b25f8d41f6 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,23 +1,11 @@
-{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x
-, pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils
-, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme, cacert }:
+{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
+, webkitgtk24x, pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib
+, gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, makeWrapper
+, gnome_doc_utils, hicolor_icon_theme, cacert }:
 
 # for dependencies see http://www.yorba.org/projects/shotwell/install/
 
-let
-  rest = stdenv.mkDerivation rec {
-    name = "rest-0.7.12";
-
-    src = fetchurl {
-      url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
-      sha256 = "0fmg7fq5fx0jg3ryk71kwdkspsvj42acxy9imk7vznkqj29a9zqn";
-    };
-    
-    configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt";
-    
-    buildInputs = [ pkgconfig glib libsoup ];
-  };
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   version = "0.20.2";
   name = "shotwell-${version}";
 
@@ -47,10 +35,11 @@ in stdenv.mkDerivation rec {
   '';
 
 
-  buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x pkgconfig
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2
-                  libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
-                  makeWrapper gnome_doc_utils
+  buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x
+                  pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
+                  which udev gnome3.gexiv2 hicolor_icon_theme
+                  libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
+                  makeWrapper gnome_doc_utils gnome3.rest
                   gnome3.defaultIconTheme ];
 
   meta = with stdenv.lib; {

From 863d426a3b8a4a56e34af3f687d18f42dad2ac44 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 30 Jul 2015 13:09:58 +0200
Subject: [PATCH 0511/2016] supercollider: build with gcc48 (ZHF)

---
 pkgs/development/interpreters/supercollider/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index a20d5b1dfd1..f44347c61b7 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig
-, libjack2, libsndfile, fftw, curl
+, libjack2, libsndfile, fftw, curl, gcc
 , libXt, qt, readline
 , useSCEL ? false, emacs
 }:
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [ 
-    libjack2 libsndfile fftw curl libXt qt readline ]
+    gcc libjack2 libsndfile fftw curl libXt qt readline ]
     ++ optional useSCEL emacs;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02c37c059d3..46eacf48a1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5150,6 +5150,7 @@ let
   spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { };
 
   supercollider = callPackage ../development/interpreters/supercollider {
+    gcc = gcc48; # doesn't build with gcc49
     qt = qt4;
     fftw = fftwSinglePrec;
   };

From d61e1b24e6d280ab596abca0da2b33293eaaeef6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 30 Jul 2015 13:27:09 +0200
Subject: [PATCH 0512/2016] Fix indentation

---
 nixos/doc/manual/options-to-docbook.xsl | 94 ++++++++++++-------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index af9eb0e48fb..f588a019e63 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -25,61 +25,61 @@
               <option>
                 <xsl:value-of select="attr[@name = 'name']/string/@value" />
               </option>
-             </term>
+            </term>
 
-             <listitem>
+            <listitem>
 
-               <para>
-                 <xsl:value-of disable-output-escaping="yes"
-                               select="attr[@name = 'description']/string/@value" />
-               </para>
+              <para>
+                <xsl:value-of disable-output-escaping="yes"
+                              select="attr[@name = 'description']/string/@value" />
+              </para>
 
-               <xsl:if test="attr[@name = 'type']">
-                 <para>
-                   <emphasis>Type:</emphasis>
-                   <xsl:text> </xsl:text>
-                   <xsl:apply-templates select="attr[@name = 'type']" mode="top" />
-                 </para>
-               </xsl:if>
+              <xsl:if test="attr[@name = 'type']">
+                <para>
+                  <emphasis>Type:</emphasis>
+                  <xsl:text> </xsl:text>
+                  <xsl:apply-templates select="attr[@name = 'type']" mode="top" />
+                </para>
+              </xsl:if>
 
-               <xsl:if test="attr[@name = 'default']">
-                 <para>
-                   <emphasis>Default:</emphasis>
-                   <xsl:text> </xsl:text>
-                   <xsl:apply-templates select="attr[@name = 'default']" mode="top" />
-                 </para>
-               </xsl:if>
+              <xsl:if test="attr[@name = 'default']">
+                <para>
+                  <emphasis>Default:</emphasis>
+                  <xsl:text> </xsl:text>
+                  <xsl:apply-templates select="attr[@name = 'default']" mode="top" />
+                </para>
+              </xsl:if>
 
-               <xsl:if test="attr[@name = 'example']">
-                 <para>
-                   <emphasis>Example:</emphasis>
-                   <xsl:text> </xsl:text>
-                   <xsl:choose>
-                     <xsl:when test="attr[@name = 'example']/attrs[attr[@name = '_type' and string[@value = 'literalExample']]]">
-                       <programlisting><xsl:value-of select="attr[@name = 'example']/attrs/attr[@name = 'text']/string/@value" /></programlisting>
-                     </xsl:when>
-                     <xsl:otherwise>
-                       <xsl:apply-templates select="attr[@name = 'example']" mode="top" />
-                     </xsl:otherwise>
-                   </xsl:choose>
-                 </para>
-               </xsl:if>
+              <xsl:if test="attr[@name = 'example']">
+                <para>
+                  <emphasis>Example:</emphasis>
+                  <xsl:text> </xsl:text>
+                  <xsl:choose>
+                    <xsl:when test="attr[@name = 'example']/attrs[attr[@name = '_type' and string[@value = 'literalExample']]]">
+                      <programlisting><xsl:value-of select="attr[@name = 'example']/attrs/attr[@name = 'text']/string/@value" /></programlisting>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <xsl:apply-templates select="attr[@name = 'example']" mode="top" />
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </para>
+              </xsl:if>
 
-               <xsl:if test="count(attr[@name = 'declarations']/list/*) != 0">
-                 <para>
-                   <emphasis>Declared by:</emphasis>
-                 </para>
-                 <xsl:apply-templates select="attr[@name = 'declarations']" />
-               </xsl:if>
+              <xsl:if test="count(attr[@name = 'declarations']/list/*) != 0">
+                <para>
+                  <emphasis>Declared by:</emphasis>
+                </para>
+                <xsl:apply-templates select="attr[@name = 'declarations']" />
+              </xsl:if>
 
-               <xsl:if test="count(attr[@name = 'definitions']/list/*) != 0">
-                 <para>
-                   <emphasis>Defined by:</emphasis>
-                 </para>
-                 <xsl:apply-templates select="attr[@name = 'definitions']" />
-               </xsl:if>
+              <xsl:if test="count(attr[@name = 'definitions']/list/*) != 0">
+                <para>
+                  <emphasis>Defined by:</emphasis>
+                </para>
+                <xsl:apply-templates select="attr[@name = 'definitions']" />
+              </xsl:if>
 
-             </listitem>
+            </listitem>
 
           </varlistentry>
 

From f463d2490322a7a7e41634bbf23fc9cbdbdb9fae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 30 Jul 2015 13:36:57 +0200
Subject: [PATCH 0513/2016] Add read-only options

These are options that can have only one definition, regardless of
priority.
---
 lib/modules.nix                         | 11 ++++++++---
 lib/options.nix                         |  2 ++
 nixos/doc/manual/options-to-docbook.xsl |  4 ++++
 nixos/modules/misc/version.nix          |  4 ++--
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index d7037abfbef..50827e18f10 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -261,11 +261,16 @@ rec {
   evalOptionValue = loc: opt: defs:
     let
       # Add in the default value for this option, if any.
-      defs' = (optional (opt ? default)
-        { file = head opt.declarations; value = mkOptionDefault opt.default; }) ++ defs;
+      defs' =
+          (optional (opt ? default)
+            { file = head opt.declarations; value = mkOptionDefault opt.default; }) ++ defs;
 
       # Handle properties, check types, and merge everything together.
-      res = mergeDefinitions loc opt.type defs';
+      res =
+        if opt.readOnly or false && length defs' > 1 then
+          throw "The option `${showOption loc}' is read-only, but it's set multiple times."
+        else
+          mergeDefinitions loc opt.type defs';
 
       # Check whether the option is defined, and apply the ‘apply’
       # function to the merged value.  This allows options to yield a
diff --git a/lib/options.nix b/lib/options.nix
index 5c543f56bcf..444ec37e6ea 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -19,6 +19,7 @@ rec {
     , apply ? null # Function that converts the option value to something else.
     , internal ? null # Whether the option is for NixOS developers only.
     , visible ? null # Whether the option shows up in the manual.
+    , readOnly ? null # Whether the option can be set only once
     , options ? null # Obsolete, used by types.optionSet.
     } @ attrs:
     attrs // { _type = "option"; };
@@ -90,6 +91,7 @@ rec {
           declarations = filter (x: x != unknownModule) opt.declarations;
           internal = opt.internal or false;
           visible = opt.visible or true;
+          readOnly = opt.readOnly or false;
           type = opt.type.name or null;
         }
         // (if opt ? example then { example = scrubOptionValue opt.example; } else {})
diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index f588a019e63..3d6ea942701 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -39,6 +39,10 @@
                   <emphasis>Type:</emphasis>
                   <xsl:text> </xsl:text>
                   <xsl:apply-templates select="attr[@name = 'type']" mode="top" />
+                  <xsl:if test="attr[@name = 'readOnly']/bool/@value = 'true'">
+                    <xsl:text> </xsl:text>
+                    <emphasis>(read only)</emphasis>
+                  </xsl:if>
                 </para>
               </xsl:if>
 
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 8a52df42dd8..dc8eb4e8832 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -29,7 +29,7 @@ with lib;
     };
 
     system.nixosRelease = mkOption {
-      internal = true;
+      readOnly = true;
       type = types.str;
       default = readFile "${toString pkgs.path}/.version";
       description = "NixOS release.";
@@ -48,7 +48,7 @@ with lib;
     };
 
     system.nixosCodeName = mkOption {
-      internal = true;
+      readOnly = true;
       type = types.str;
       description = "NixOS release code name.";
     };

From bb9aff2f0c0f8a9d4726c33ca1db88aa5322dc62 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 30 Jul 2015 13:44:08 +0200
Subject: [PATCH 0514/2016] Manual: Don't render types as strings

---
 nixos/doc/manual/options-to-docbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index 3d6ea942701..cd30ae36ae5 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -38,7 +38,7 @@
                 <para>
                   <emphasis>Type:</emphasis>
                   <xsl:text> </xsl:text>
-                  <xsl:apply-templates select="attr[@name = 'type']" mode="top" />
+                  <xsl:value-of select="attr[@name = 'type']/string/@value"/>
                   <xsl:if test="attr[@name = 'readOnly']/bool/@value = 'true'">
                     <xsl:text> </xsl:text>
                     <emphasis>(read only)</emphasis>

From 148f7e662416fdbc5e5769a3c0ceae1c9e7af723 Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Fri, 24 Jul 2015 12:55:39 +1000
Subject: [PATCH 0515/2016] winetricks: update 20150416 -> 20150706

---
 pkgs/misc/emulators/wine/versions.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index cdb62d4ada7..3e3c185a152 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -27,7 +27,7 @@
     sha256 = "0nkqqrzx9hprwjzg7ffzirnldxpqa6wn9c1rcyd34k77ym1v44pa";
   };
   winetricks = {
-    version = "20150416";
-    sha256 = "0467cn5hqry6fscjskpvxw0y00lr059jmldv1csicbav4l0dxx8k";
+    version = "20150706";
+    sha256 = "1n9xbav4q0dpfdmmjcahi4izyhvy2f7ddrq7gyhrm6pxs2zli888";
   };
 }

From 196fcdf80f653ebc20a2904567cd39e0b2642278 Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Tue, 21 Jul 2015 12:42:05 +1000
Subject: [PATCH 0516/2016] wine: unstable and staging update: 1.7.46 -> 1.7.47

Close #8913.
---
 pkgs/misc/emulators/wine/versions.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index 3e3c185a152..4714834fbcb 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -1,7 +1,7 @@
 {
   unstable = {
-    wineVersion = "1.7.46";
-    wineSha256  = "02rmhz64ianls3z9r6nxf97k49bvfmyhwmpjz5a31pknqrn09d4s";
+    wineVersion = "1.7.47";
+    wineSha256  = "0bmvgcag0kv0671dj6fbfdz86ij91rb2kp2dssqw83a0xidgfx5s";
     geckoVersion = "2.36";
     geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g";
     gecko64Version = "2.36";
@@ -23,8 +23,8 @@
     #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
   };
   staging = {
-    version = "1.7.46";
-    sha256 = "0nkqqrzx9hprwjzg7ffzirnldxpqa6wn9c1rcyd34k77ym1v44pa";
+    version = "1.7.47";
+    sha256 = "0m47v4jbc70b7qxj0lqnc7an1xlcb81b6k7dwzjyk3pv3ixp2snp";
   };
   winetricks = {
     version = "20150706";

From e942b5892de949b7748fd0ce4f857ee56ba3d888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jul 2015 13:36:00 +0200
Subject: [PATCH 0517/2016] libpng15: remove unused version

---
 pkgs/development/libraries/libpng/15.nix | 26 ------------------------
 pkgs/top-level/all-packages.nix          |  1 -
 2 files changed, 27 deletions(-)
 delete mode 100644 pkgs/development/libraries/libpng/15.nix

diff --git a/pkgs/development/libraries/libpng/15.nix b/pkgs/development/libraries/libpng/15.nix
deleted file mode 100644
index 177c534ffaf..00000000000
--- a/pkgs/development/libraries/libpng/15.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, zlib }:
-
-assert zlib != null;
-
-stdenv.mkDerivation rec {
-  name = "libpng-1.5.19";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "1s990cdsdlbb78aq4sj2vq2849p2nbbbnbk5p8f9w45rn0v5q98y";
-  };
-
-  propagatedBuildInputs = [ zlib ];
-
-  doCheck = true;
-
-  passthru = { inherit zlib; };
-
-  meta = {
-    description = "The official reference implementation for the PNG file format";
-    homepage = http://www.libpng.org/pub/png/libpng.html;
-    license = stdenv.lib.licenses.libpng;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    branch = "1.5";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46eacf48a1f..788e0709fae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7239,7 +7239,6 @@ let
   libpng = callPackage ../development/libraries/libpng { };
   libpng_apng = libpng.override { apngSupport = true; };
   libpng12 = callPackage ../development/libraries/libpng/12.nix { };
-  libpng15 = callPackage ../development/libraries/libpng/15.nix { };
 
   libpaper = callPackage ../development/libraries/libpaper { };
 

From e72b4051048227cdfd9416660f0c7e64fab0f847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jul 2015 13:47:50 +0200
Subject: [PATCH 0518/2016] libpng-1.2: maintenance update

Also drop xz input, as it isn't needed (stdenv unpacks xz by itself).
---
 pkgs/development/libraries/libpng/12.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index fae6f9ba556..2a523793559 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchurl, zlib, xz }:
+{ stdenv, fetchurl, zlib }:
 
 assert !(stdenv ? cross) -> zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.51";
+  name = "libpng-1.2.52";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "0jkdlmnvn72jwm94dp98pznm9fy7alvcr2zpfh2dgbr2n09vimy7";
+    sha256 = "1h0fa67x4bh7gcdh7qx87m4xpkdfqa7ihd4h678dcyh52jzhzyyl";
   };
 
   propagatedBuildInputs = [ zlib ];
 
-  nativeBuildInputs = [ xz ];
-
   passthru = { inherit zlib; };
 
   crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {

From 374210aecec648f65c276a4ef423c6fd08b5555b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jul 2015 14:07:45 +0200
Subject: [PATCH 0519/2016] nvidia-x11: maintenance update

Strange as it is, nvidia seems to drop UVM kernel module on 32-bit.
Basic driver usage shows no problems for me.
---
 pkgs/os-specific/linux/nvidia-x11/builder.sh  | 14 ++++++++++----
 pkgs/os-specific/linux/nvidia-x11/default.nix |  7 ++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index d34c4f355a3..1198208c9da 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -20,9 +20,15 @@ buildPhase() {
         sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
         unset src # used by the nv makefile
         make SYSSRC=$sysSrc SYSOUT=$sysOut module
-        cd uvm
-        make SYSSRC=$sysSrc SYSOUT=$sysOut module
-        cd ..
+
+        # nvidia no longer provides uvm kernel module for 32-bit archs
+        # http://www.nvidia.com/download/driverResults.aspx/79722/en-us
+        if [[ "$system" = "x86_64-linux" ]]; then
+            cd uvm
+            make SYSSRC=$sysSrc SYSOUT=$sysOut module
+            cd ..
+        fi
+
         cd ..
     fi
 }
@@ -47,7 +53,7 @@ installPhase() {
 
         # Install the kernel module.
         mkdir -p $out/lib/modules/$kernelVersion/misc
-        for i in kernel/nvidia.ko kernel/uvm/nvidia-uvm.ko; do
+        for i in $(find ./kernel -name '*.ko'); do
             nuke-refs $i
             cp $i $out/lib/modules/$kernelVersion/misc/
         done
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 66b1a81d2e4..ab564c10e2e 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
 
 let
 
-  versionNumber = "352.21";
+  versionNumber = "352.30";
 
   # Policy: use the highest stable version as the default (on our master).
   inherit (stdenv.lib) makeLibraryPath;
@@ -28,16 +28,17 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "1l206091frcpql8ql82i5jkf955wdr56ikh9aprwhqkyyjjq4qv1";
+        sha256 = "1qrjvf41zk50hw7gjiwg9jxwgpaarlwm019py4wfqgjgb1cbhgjn";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "1sv495i5s1fd7j4k4yr53xbgc9jind0y74mqivv36p5z6m8z5k6g";
+        sha256 = "1h7ghmykhdyy3n853s8yjzc0qbh50qb2kc0khz672b1rna4wqyhg";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
   inherit versionNumber libsOnly;
+  inherit (stdenv) system;
 
   kernel = if libsOnly then null else kernel.dev;
 

From a9e2cf0af3b885a703d176761b06eb72ae8d5bad Mon Sep 17 00:00:00 2001
From: Susan Potter <me@susanpotter.net>
Date: Wed, 8 Jul 2015 00:33:00 -0500
Subject: [PATCH 0520/2016] jwhois: fix path to lynx in $lynx/etc/jwhois.conf

Close #8696.
Fixes issues found when jwhois attempts to launch terminal browser
(lynx) for HTTP whois queries, for example:

    $ whois blah.io
    [Querying http://www.io.io/cgi-bin/whois]
    [HTTP: Unable to run web browser: /usr/bin/lynx: No such file or directory]

Tested via:

    grep lynx \
      /nix/store/bymgmn2vvw1n7nbb1isy87xg94s8f2ml-jwhois-4.0/etc/jwhois.conf \
      | cut -f2 -d'"' \
      | xargs stat -t
---
 pkgs/tools/networking/jwhois/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix
index 67b93a1fa90..2a2e444f5b2 100644
--- a/pkgs/tools/networking/jwhois/default.nix
+++ b/pkgs/tools/networking/jwhois/default.nix
@@ -1,14 +1,17 @@
-{stdenv, fetchurl}:
+{stdenv, lynx, fetchurl}:
 
 stdenv.mkDerivation {
   name = "jwhois-4.0";
-  
+
   src = fetchurl {
     url = mirror://gnu/jwhois/jwhois-4.0.tar.gz;
     sha256 = "0knn7iaj5v0n6jpmldyv2yk4bcy9dn3kywmv63bwc5drh9kvi6zs";
   };
 
-  postInstall = "ln -s jwhois $out/bin/whois";
+  postInstall = ''
+    ln -s jwhois $out/bin/whois
+    sed -i -e "s|/usr/bin/lynx|${lynx}/bin/lynx|g" $out/etc/jwhois.conf
+  '';
 
   patches = [ ./connect.patch ];
 

From ca54849eb904897b6efd952e13d5e7e7f3db6ec2 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lancelot@lancelotsix.com>
Date: Wed, 22 Jul 2015 21:15:25 +0200
Subject: [PATCH 0521/2016] torbrowser: 4.5.2 -> 4.5.3 (close #8953)

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

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 34803f03cd1..aa85793be18 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -20,13 +20,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "4.5.2";
+  version = "4.5.3";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
     sha256 = if bits == "64" then
-      "139c85096ee85a65222753fbbee7c04e8cc494021f9afaf5c1a0f520dd7869b9" else
-      "960277aea38a3958f3ac573535302e61b3b0137169e5d7b9687cee648a5d5bec";
+      "24c517d2aeb15ba5eeda1eb87f483ed4fb0c22b07a95ca26af9f692e0d4d9b7c" else
+      "154d659583048e91870c40921561f0519babf6d3c9ac439f6fb74ed66824463f";
   };
 
   patchPhase = ''

From 9294f368f9f296f373ba814ef57471a27d003100 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 30 Jul 2015 00:03:29 +0200
Subject: [PATCH 0522/2016] eid-mw: 4.1.2 -> 4.1.4

---
 pkgs/tools/security/eid-mw/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index e02c58d3825..e14bc6b9cc4 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite
 , pkgconfig }:
 
-let version = "4.1.2"; in
+let version = "4.1.4"; in
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "034ar1v2qamdyq71nklh1nvqbmw6ryz63jdwnnc873f639mf5w94";
+    sha256 = "0v0p0kdjscvf4bn14dyny399k1bfsz8v7n8v16lv0q0xs5nwqnky";
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ gtk2 pcsclite ];
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
+  postPatch = ''
+    sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac
+  '';
+
   enableParallelBuilding = true;
 
   doCheck = true;
@@ -24,8 +28,8 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/eid-nssdb \
       --replace "modutil" "${nssTools}/bin/modutil"
 
-    # Only provides a useless "about-eid-mw.desktop" that doesn't even work:
-    rm -rf $out/share/applications
+    # Only provides a useless "about-eid-mw.desktop" that segfaults:
+    rm -rf $out/share/applications $out/bin/about-eid-mw
   '';
 
   meta = with stdenv.lib; {

From f628a70f9e1b267dfb9c6db28f4fef9e02be8795 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 30 Jul 2015 16:18:56 +0200
Subject: [PATCH 0523/2016] geolite-legacy: 2015-07-25 -> 2015-07-30

---
 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 df9458903d3..fd940fd3b4f 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-07-25";
+  version = "2015-07-30";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
     "0j5dq06pjrh6d94wczsg6qdys4v164nvp2a7qqrg8w4knh94qp6n";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "18kxswr0b5klimfpj1zhxipvyvrljvcywic4jc1ggcr44lf4hj9w";
+    "16lfazhyhwmh8fyd7pxzwxp5sxszbqw4xdx3avv78hglhyb2ijkw";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "0asnmmirridiy57zm0kccb7g8h7ndliswfv3yfk7zm7dk98njnxs";
+    "16jd6f2pwy8616jb78x8j6zda7h0p1bp786y86rq3ipgcw6g0jgn";
 
   meta = with stdenv.lib; {
     inherit version;

From 0c71406dd3ad5aa6c7cf1068f88023d68e5af636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 30 Jul 2015 16:25:04 +0200
Subject: [PATCH 0524/2016] asciidoc: fix old copy/paste error

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

diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 81a457d0d2d..b26582a6cc7 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -212,7 +212,7 @@ stdenv.mkDerivation rec {
   '' + optionalString enableStandardFeatures ''
     sed -e "s|dot|${graphviz}/bin/dot|g" \
         -e "s|neato|${graphviz}/bin/neato|g" \
-        -e "s|twopi|${graphviz}/bin/circo|g" \
+        -e "s|twopi|${graphviz}/bin/twopi|g" \
         -e "s|circo|${graphviz}/bin/circo|g" \
         -e "s|fdp|${graphviz}/bin/fdp|g" \
         -i "filters/graphviz/graphviz2png.py"

From ed7865ee0095300189338332c2b7d2e912b02c60 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 30 Jul 2015 16:08:10 +0200
Subject: [PATCH 0525/2016] DBIx-Class-Schema-Loader: Update to 0.07043

---
 pkgs/top-level/perl-packages.nix | 93 +++++++++++++++++++++++++-------
 1 file changed, 75 insertions(+), 18 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0217a0c33be..51bc30ad1c8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2658,16 +2658,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   DBIxClassSchemaLoader = buildPerlPackage {
-    name = "DBIx-Class-Schema-Loader-0.07033";
+    name = "DBIx-Class-Schema-Loader-0.07043";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RK/RKITOVER/DBIx-Class-Schema-Loader-0.07033.tar.gz;
-      sha256 = "1vrcxxlbvdch5r9v5i6vrb4fqqfbpxybpdqndmlnc2jzlqjwjahi";
+      url = mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-Schema-Loader-0.07043.tar.gz;
+      sha256 = "01944d429a420fcb961aa4ab002f884f3d54529b3346816502c27d31c956194d";
     };
-    buildInputs = [ ConfigAny ConfigGeneral DBDSQLite DBI DBIxClassIntrospectableM2M Moose MooseXMarkAsMethods MooseXNonMoose namespaceautoclean TestException TestPod TestWarn ];
-    propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DataDump DBIxClass HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger ListMoreUtils MROCompat namespaceclean ScopeGuard StringCamelCase StringToIdentifierEN SubName TaskWeaken TryTiny ];
+    buildInputs = [ ConfigAny ConfigGeneral DBDSQLite DBIxClassIntrospectableM2M Moose MooseXMarkAsMethods MooseXNonMoose TestDeep TestDifferences TestException TestPod TestWarn namespaceautoclean ];
+    propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DBIxClass DataDump HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger MROCompat ScalarListUtils ScopeGuard StringCamelCase StringToIdentifierEN TryTiny namespaceclean ];
     meta = {
       description = "Create a DBIx::Class::Schema based on a database";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      license = "perl";
     };
   };
 
@@ -5106,6 +5106,20 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [XMLParser];
   };
 
+  LinguaENFindNumber = buildPerlPackage {
+    name = "Lingua-EN-FindNumber-1.31";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-FindNumber-1.31.tar.gz;
+      sha256 = "f67f4d4983bd29da5cbbff3cb18dd70788692b35e2dabcd4c65bef1cd2bf658f";
+    };
+    propagatedBuildInputs = [ LinguaENWords2Nums ];
+    meta = {
+      homepage = https://github.com/neilbowers/Lingua-EN-FindNumber;
+      description = "Locate (written) numbers in English text";
+      license = "perl";
+    };
+  };
+
   LinguaENInflect = buildPerlPackage {
     name = "Lingua-EN-Inflect-1.895";
     src = fetchurl {
@@ -5126,15 +5140,34 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ LinguaENInflect ];
   };
 
-  LinguaENInflectPhrase = buildPerlPackage rec {
-    name = "Lingua-EN-Inflect-Phrase-0.10";
+  LinguaENInflectPhrase = buildPerlPackage {
+    name = "Lingua-EN-Inflect-Phrase-0.18";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RK/RKITOVER/${name}.tar.gz";
-      sha256 = "1l7sjnibnvgb7a73cjhysmrg4j2bfcn0x5yrqmh0v23laj9fsbbm";
+      url = mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Inflect-Phrase-0.18.tar.gz;
+      sha256 = "290a5b8fc2be28d6d479517655027a90e944476cb3552f10cbf6db37af79f9a6";
+    };
+    buildInputs = [ TestNoWarnings ];
+    propagatedBuildInputs = [ LinguaENFindNumber LinguaENInflect LinguaENInflectNumber LinguaENNumberIsOrdinal LinguaENTagger ];
+    meta = {
+      homepage = http://metacpan.org/release/Lingua-EN-Inflect-Phrase;
+      description = "Inflect short English Phrases";
+      license = "perl";
+    };
+  };
+
+  LinguaENNumberIsOrdinal = buildPerlPackage {
+    name = "Lingua-EN-Number-IsOrdinal-0.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Number-IsOrdinal-0.05.tar.gz;
+      sha256 = "28d5695400c0f4e2bd209793cb74f6da2b9257356aacb2947c603425e09618d6";
+    };
+    buildInputs = [ TestFatal TryTiny ];
+    propagatedBuildInputs = [ LinguaENFindNumber ];
+    meta = {
+      homepage = http://metacpan.org/release/Lingua-EN-Number-IsOrdinal;
+      description = "Detect if English number is ordinal or cardinal";
+      license = "perl";
     };
-    buildInputs = [ TestMore ];
-    propagatedBuildInputs =
-      [ LinguaENInflect LinguaENInflectNumber LinguaENTagger ];
   };
 
   LinguaENTagger = buildPerlPackage {
@@ -5150,6 +5183,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  LinguaENWords2Nums = buildPerlPackage {
+    name = "Lingua-EN-Words2Nums-0.18";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JO/JOEY/Lingua-EN-Words2Nums-0.18.tar.gz;
+      sha256 = "686556797cd2a4eaa066f19bbf03ab25c06278292c9ead2f187dfd9031ea1d85";
+    };
+    meta = {
+      description = "Convert English text to numbers";
+      license = "unknown";
+    };
+  };
+
   LinguaStem = buildPerlPackage rec {
     name = "Lingua-Stem-0.84";
     src = fetchurl {
@@ -8086,6 +8131,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ScalarListUtils = buildPerlPackage {
+    name = "Scalar-List-Utils-1.42";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.42.tar.gz;
+      sha256 = "3507f72541f66a2dce850b9b56771e5fccda3d215c52f74946c6e370c0f4a4da";
+    };
+    meta = {
+      description = "Common Scalar and List utility subroutines";
+      license = "perl";
+    };
+  };
+
   ScalarString = buildPerlPackage rec {
     name = "Scalar-String-0.002";
     src = fetchurl {
@@ -9178,15 +9235,15 @@ let self = _self // overrides; _self = with self; {
   };
 
   TestDifferences = buildPerlPackage {
-    name = "Test-Differences-0.4801";
+    name = "Test-Differences-0.63";
     src = fetchurl {
-      url = mirror://cpan/authors/id/O/OV/OVID/Test-Differences-0.4801.tar.gz;
-      sha256 = "1p5bqyq3gxfb1q4wajd28498fsbqk7f2y7pk9c3rnh0x36cqbvyw";
+      url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.63.tar.gz;
+      sha256 = "7c657a178c32f48de3b469f6d4f67b75f018a3a19c1e6d0d8892188b0d261a66";
     };
-    propagatedBuildInputs = [ TextDiff ];
+    propagatedBuildInputs = [ CaptureTiny TextDiff ];
     meta = {
       description = "Test strings and data structures and show differences if not ok";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      license = "unknown";
     };
   };
 

From 97dd0dae7489cda16d8897aa289c3a9cd4f7ac56 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Wed, 29 Jul 2015 16:27:09 +0200
Subject: [PATCH 0526/2016] gnome3: Set nixos desktop background and
 screensaver

---
 .../services/x11/desktop-managers/gnome3.nix  | 22 +++++++++++++++++++
 .../3.16/core/gnome-session/default.nix       |  2 +-
 .../gnome-3/3.16/core/gnome-shell/default.nix |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 01ab086b092..9449a899715 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -25,6 +25,25 @@ let
     '';
   };
 
+  nixos-gsettings-desktop-schemas = pkgs.stdenv.mkDerivation {
+    name = "nixos-gsettings-desktop-schemas";
+    buildInputs = [ pkgs.nixos-artwork ];
+    buildCommand = ''
+     mkdir -p $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas
+     cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0 $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/
+     chmod -R a+w $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas
+     cat - > $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/org.gnome.desktop.background.nixos.gschema.override <<- EOF
+       [org.gnome.desktop.background]
+       picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'
+     EOF
+     cat - > $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/org.gnome.desktop.screensaver.nixos.gschema.override <<- EOF
+       [org.gnome.desktop.screensaver]
+       picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'
+     EOF
+     ${pkgs.glib}/bin/glib-compile-schemas $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/
+    '';
+  };
+
 in {
 
   options = {
@@ -109,6 +128,9 @@ in {
           # Override default mimeapps
           export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share
 
+          # Override gsettings-desktop-schema
+          export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
+
           # Let nautilus find extensions
           export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/
 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
index 174210393d4..be1b4c0d2cd 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/gnome-session" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
+      --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
index 4d4656a8502..ca50cf8218d 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       --prefix PATH : "${unzip}/bin" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --suffix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
 
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"

From 5dfb469faf199838b8c09e82b8778925e7fe307e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 30 Jul 2015 17:56:16 +0200
Subject: [PATCH 0527/2016] doc: document .overrideDerivation

---
 doc/functions.xml | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/doc/functions.xml b/doc/functions.xml
index 2aae3cfb2ae..aec8a57c21a 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -85,6 +85,44 @@ in ...</programlisting>
 
 </section>
 
+<section xml:id="sec-pkg-overrideDerivation">
+  <title>&lt;pkg&gt;.overrideDerivation</title>
+
+  <para>
+    The function <varname>overrideDerivation</varname> is usually available for all the
+    derivations in the nixpkgs expression (<varname>pkgs</varname>).
+  </para> 
+  <para>
+    It is used to create a new derivation by overriding the attributes of
+    the original derivation according to the given function.
+  </para>
+
+  <para>
+    Example usage:
+
+    <programlisting>mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
+  name = "sed-4.2.2-pre";
+  src = fetchurl {
+    url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2;
+    sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k";
+  };
+  patches = [];
+});</programlisting>
+  </para>
+
+  <para>
+    In the above example, the name, src and patches of the derivation
+    will be overridden, while all other attributes will be retained from the
+    original derivation.
+  </para>
+
+  <para>
+    The argument <varname>oldAttrs</varname> is used to refer to the attribute set of
+    the original derivation.
+  </para>
+
+</section>
+
 <section xml:id="sec-lib-makeOverridable">
   <title>lib.makeOverridable</title>
 

From 2c9a97ee14b93e1394f41cd44cde8a5a2c4b0e62 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 30 Jul 2015 18:05:14 +0200
Subject: [PATCH 0528/2016] gnome3: Refactor default screensaver setting

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 9449a899715..fdee5fbc6c5 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -32,11 +32,10 @@ let
      mkdir -p $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas
      cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0 $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/
      chmod -R a+w $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas
-     cat - > $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/org.gnome.desktop.background.nixos.gschema.override <<- EOF
+     cat - > $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
        [org.gnome.desktop.background]
        picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'
-     EOF
-     cat - > $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/org.gnome.desktop.screensaver.nixos.gschema.override <<- EOF
+
        [org.gnome.desktop.screensaver]
        picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'
      EOF

From 068f8abaa5954ec79a72343b9102d8bad2632eb1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 30 Jul 2015 17:29:19 +0200
Subject: [PATCH 0529/2016] releaseTools.coverageAnalysis: Emit hydra-metrics

---
 .../setup-hooks/make-coverage-analysis-report.sh      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh b/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh
index 4b8abb61ace..9108b4c5035 100644
--- a/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh
+++ b/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh
@@ -10,9 +10,16 @@ coverageReportPhase() {
     mkdir -p $out/coverage
     genhtml app.info $lcovExtraTraceFiles -o $out/coverage > log
 
-    # Grab the overall coverage percentage for use in release overviews.
+    # Grab the overall coverage percentage so that Hydra can plot it over time.
     mkdir -p $out/nix-support
-    grep "Overall coverage rate" log | sed 's/^.*(\(.*\)%).*$/\1/' > $out/nix-support/coverage-rate
+    lineCoverage="$(sed 's/.*lines\.*: \([0-9\.]\+\)%.*/\1/; t ; d' log)"
+    functionCoverage="$(sed 's/.*functions\.*: \([0-9\.]\+\)%.*/\1/; t ; d' log)"
+    if [ -z "$lineCoverage" -o -z "$functionCoverage" ]; then
+        echo "failed to get coverage statistics"
+        exit 1
+    fi
+    echo "lineCoverage $lineCoverage %" >> $out/nix-support/hydra-metrics
+    echo "functionCoverage $functionCoverage %" >> $out/nix-support/hydra-metrics
 
     echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
 }

From 752bbdbfbc5af9f3ed4dedf136a3bf7b411f3e51 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 29 Jul 2015 09:51:15 -0300
Subject: [PATCH 0530/2016] PPSSPP: 0.9.9.1 -> 1.1.0

Changing SDL to version 2.
---
 pkgs/misc/emulators/ppsspp/default.nix | 18 +++++++++++-------
 pkgs/top-level/all-packages.nix        |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index 732500be0fc..439566de0ca 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -2,17 +2,21 @@
 , withGamepads ? true, SDL # SDL is used for gamepad functionality
 }:
 
+assert withGamepads -> (SDL != null);
+
 let
-  version = "0.9.9.1";
+  version = "1.1.0";
   fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF");
-in stdenv.mkDerivation {
+in
+with stdenv.lib;
+stdenv.mkDerivation rec{
   name = "PPSSPP-${version}";
 
   src = fetchgit {
     url = "https://github.com/hrydgard/ppsspp.git";
-    sha256 = "0fdbda0b4dfbecacd01850f1767e980281fed4cc34a21df26ab3259242d8c352";
-    rev = "bf709790c4fed9cd211f755acaa650ace0f7555a";
+    rev = "8c8e5de89d52b8bcb968227d96cbf049d04d1241";
     fetchSubmodules = true;
+    sha256 = "71dfa0be045f31969b1d6ab4f1adf6a208f9ef4834d708bc7bf6d9195efb5f80";
   };
 
   buildInputs = [ zlib libpng pkgconfig qt4 ]
@@ -21,11 +25,11 @@ in stdenv.mkDerivation {
   configurePhase = "cd Qt && qmake PPSSPPQt.pro";
   installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin";
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "http://www.ppsspp.org/";
     description = "A PSP emulator, the Qt4 version";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.fuuzetsu ];
+    maintainers = [ maintainers.fuuzetsu maintainers.AndersonTorres ];
     platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ada3e3bd1f7..856b845dd57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14616,7 +14616,7 @@ let
 
   polytable = callPackage ../tools/typesetting/tex/polytable { };
 
-  PPSSPP = callPackage ../misc/emulators/ppsspp { };
+  PPSSPP = callPackage ../misc/emulators/ppsspp { SDL = SDL2; };
 
   uae = callPackage ../misc/emulators/uae { };
 

From 19c6cf7756415c7f620f0385aba3c9d65c17b5a3 Mon Sep 17 00:00:00 2001
From: Linus Arver <linusarver@gmail.com>
Date: Mon, 20 Jul 2015 06:46:14 -0700
Subject: [PATCH 0531/2016] source-code-pro: update to 2.010 (close #8906)

The font includes a separate versioning scheme for the italic fonts, so
we encode that as well.

/cc maintainer @relrod.
---
 pkgs/data/fonts/source-code-pro/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix
index b3761bc0b5b..a0b31b89c91 100644
--- a/pkgs/data/fonts/source-code-pro/default.nix
+++ b/pkgs/data/fonts/source-code-pro/default.nix
@@ -2,11 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "source-code-pro-${version}";
-  version = "1.017";
+  version = "2.010";
+  version_italic = "1.030";
 
   src = fetchurl {
-    url="https://github.com/adobe-fonts/source-code-pro/archive/${version}R.tar.gz";
-    sha256="03q4a0f142c6zlngv6kjaik52y0yzwq5z5qj3j0fvvcbfy9sanjr";
+    url="https://github.com/adobe-fonts/source-code-pro/archive/${version}R-ro/${version_italic}R-it.tar.gz";
+    sha256="12wijgxrdzqxpw2q420nsq9aj454vhg3rq6n81jbqvgzxhxjpf7w";
   };
 
   phases = "unpackPhase installPhase";

From c78fd07460c50ae3cd7c500eecd11e397d4f3036 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 30 Jul 2015 18:57:52 +0200
Subject: [PATCH 0532/2016] nixos: nix-daemon: update maxJobs description

I bought an X2 in 2006. It was awesome.
Use a more contemporary and model-agnostic example.
---
 nixos/modules/services/misc/nix-daemon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 49286f512bb..4088f9ff055 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -78,8 +78,8 @@ in
         description = ''
           This option defines the maximum number of jobs that Nix will try
           to build in parallel.  The default is 1.  You should generally
-          set it to the number of CPUs in your system (e.g., 2 on an Athlon
-          64 X2).
+          set it to the total number of logical cores in your system (e.g., 16
+          for two CPUs with 4 cores each and hyper-threading).
         '';
       };
 

From 7c291e2e596654ded5a8c775c98b4b02364c28c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jul 2015 19:13:56 +0200
Subject: [PATCH 0533/2016] super-user-spark: init at 0.1.0.0 (close #8894)

Super-User-Spark is a program for managing dotfiles.
The author is Tom Sydney Kerckhove.

Details on usage can be found on his [blogpost] as well as the [reddit thread].

[blogpost]: http://cs-syd.eu/posts/2015-07-19-super-user-spark.html
[reddit thread]: http://www.reddit.com/r/haskell/comments/3dsdi5/more_than_just_another_symlink_manager_written_in/
---
 lib/maintainers.nix                           |  1 +
 .../misc/super_user_spark/default.nix         | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/misc/super_user_spark/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7aca12522d1..b0a08cfd619 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -33,6 +33,7 @@
   auntie = "Jonathan Glines <auntieNeo@gmail.com>";
   avnik = "Alexander V. Nikolaev <avn@avnik.info>";
   aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
+  badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
   balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
   bbenoist = "Baptist BENOIST <return_0@live.com>";
   bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>";
diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix
new file mode 100644
index 00000000000..988db35500b
--- /dev/null
+++ b/pkgs/applications/misc/super_user_spark/default.nix
@@ -0,0 +1,33 @@
+{ mkDerivation, fetchurl, ghc, aeson, aeson-pretty, base, binary, bytestring
+, directory, filepath, HTF, HUnit, mtl, parsec, process, shelly
+, stdenv, text, transformers, unix, xdg-basedir
+, happy
+}:
+
+mkDerivation rec {
+  pname = "super-user-spark";
+  version = "0.1.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/NorfairKing/super-user-spark/archive/v0.1.tar.gz";
+    sha256 = "90258cb2d38f35b03867fdf82dbd49500cdec04f3cf05d0eaa18592cb44fe13f";
+  };
+
+  isLibrary = false;
+  isExecutable = true;
+  jailbreak = true;
+
+  buildDepends = [
+    aeson aeson-pretty base binary bytestring directory filepath HTF
+    mtl parsec process shelly text transformers unix xdg-basedir happy
+  ];
+  testDepends = [
+    aeson aeson-pretty base binary bytestring directory filepath HTF
+    HUnit mtl parsec process shelly text transformers unix xdg-basedir
+  ];
+  license = stdenv.lib.licenses.mit;
+  homepage = "https://github.com/NorfairKing/super-user-spark";
+  description = "A safe way to never worry about your beautifully configured system again";
+  platforms = ghc.meta.platforms;
+  maintainers = stdenv.lib.maintainers.badi;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 788e0709fae..be24f4b12d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3036,6 +3036,8 @@ let
 
   super = callPackage ../tools/security/super { };
 
+  super-user-spark = haskellPackages.callPackage ../applications/misc/super_user_spark { };
+
   ssdeep = callPackage ../tools/security/ssdeep { };
 
   sshpass = callPackage ../tools/networking/sshpass { };

From f4a68aaca7211fc0382b26480241884d1013e69e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jul 2015 19:28:51 +0200
Subject: [PATCH 0534/2016] liquidwar: use 1.6 branch of libpng

Seems to work fine. /cc maintainer @7c6f434c.
---
 pkgs/top-level/all-packages.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be24f4b12d3..1a8d1a6173e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7487,14 +7487,13 @@ let
 
   liquidwar = builderDefsPackage ../games/liquidwar {
     inherit (xlibs) xproto libX11 libXrender;
-    inherit gmp mesa libjpeg
+    inherit gmp mesa libjpeg libpng
       expat gettext perl
       SDL SDL_image SDL_mixer SDL_ttf
       curl sqlite
       libogg libvorbis libcaca csound cunit
       ;
     guile = guile_1_8;
-    libpng = libpng15; # 0.0.13 needs libpng 1.2--1.5
   };
 
   log4cpp = callPackage ../development/libraries/log4cpp { };

From b1f1753f259d23eaaff0acbd3630c4d16f43c19c Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Thu, 30 Jul 2015 10:32:32 -0700
Subject: [PATCH 0535/2016] emacs-packages: update flycheck to 0.23

also add let-alist-1.0.4 and flycheck-haskell-0.7.2
---
 pkgs/top-level/emacs-packages.nix | 53 +++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index ef2b505eaa5..26a40a42ae1 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -503,6 +503,32 @@ let self = _self // overrides;
     };
   };
 
+  flycheck = melpaBuild rec {
+    pname   = "flycheck";
+    version = "0.23";
+    src = fetchFromGitHub {
+      owner  = pname;
+      repo   = pname;
+      rev    = version;
+      sha256 = "1ydk1wa7h7z9qw7prfvszxrmy2dyzsdij3xdy10rq197xnrw94wz";
+    };
+    packageRequires = [ dash let-alist pkg-info ];
+    meta = { license = gpl3Plus; };
+  };
+
+  flycheck-haskell = melpaBuild rec {
+    pname   = "flycheck-haskell";
+    version = "0.7.2";
+    src = fetchFromGitHub {
+      owner  = "flycheck";
+      repo   = pname;
+      rev    = version;
+      sha256 = "0143lcn6g46g7skm4r6lqq09s8mr3268rikbzlh65qg80rpg9frj";
+    };
+    packageRequires = [ dash flycheck haskell-mode let-alist pkg-info ];
+    meta = { license = gpl3Plus; };
+  };
+
   flycheck-pos-tip = melpaBuild rec {
     pname   = "flycheck-pos-tip";
     version = "20140813";
@@ -516,19 +542,6 @@ let self = _self // overrides;
     meta = { license = gpl3Plus; };
   };
 
-  flycheck = melpaBuild rec {
-    pname   = "flycheck";
-    version = "0.20";
-    src = fetchFromGitHub {
-      owner  = pname;
-      repo   = pname;
-      rev    = version;
-      sha256 = "0cq7y7ssm6phvx5pfv2yqq4j0yqmm0lhjav7v4a8ql7094cd790a";
-    };
-    packageRequires = [ dash pkg-info ];
-    meta = { license = gpl3Plus; };
-  };
-
   ghc-mod = melpaBuild rec {
     pname = "ghc";
     version = external.ghc-mod.version;
@@ -788,6 +801,20 @@ let self = _self // overrides;
     meta = { license = gpl3Plus; };
   };
 
+  let-alist = melpaBuild rec {
+    pname   = "let-alist";
+    version = "1.0.4";
+    src = fetchurl {
+      url    = "http://elpa.gnu.org/packages/${pname}-${version}.el";
+      sha256 = "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x";
+    };
+    unpackPhase = "true";
+    buildPhase = ''
+      cp $src ${pname}-${version}.el
+    '';
+    meta = { license = gpl3Plus; };
+  };
+
   log4e = melpaBuild rec {
     pname = "log4e";
     version = "0.3.0";

From f21a74995108104a791d0964c5a699fa1e7ba50b Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Thu, 30 Jul 2015 10:52:30 -0700
Subject: [PATCH 0536/2016] emacs-packages: dash 2.9.0 -> 2.11.0

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 26a40a42ae1..495ac8e9e78 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -327,12 +327,12 @@ let self = _self // overrides;
 
   dash = melpaBuild rec {
     pname   = "dash";
-    version = "2.9.0";
+    version = "2.11.0";
     src = fetchFromGitHub {
       owner  = "magnars";
       repo   = "${pname}.el";
       rev    = version;
-      sha256 = "1lg31s8y6ljsz6ps765ia5px39wim626xy8fbc4jpk8fym1jh7ay";
+      sha256 = "02gfrcda7gj3j5yx71dz40xylrafl4pcaj7bgfajqi9by0w2nrnx";
     };
     meta = { license = gpl3Plus; };
   };

From cfa6dfb1dede220e53f9de333d0871b2c3444ec8 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Thu, 30 Jul 2015 10:53:28 -0700
Subject: [PATCH 0537/2016] emacs-packages: magit 1.4.0 -> 2.1.0

---
 pkgs/top-level/emacs-packages.nix | 58 ++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 495ac8e9e78..5982a9f5ce7 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -843,14 +843,62 @@ let self = _self // overrides;
 
   magit = melpaBuild rec {
     pname   = "magit";
-    version = "1.4.0";
+    version = "2.1.0";
     src = fetchFromGitHub {
-      owner  = "magit";
-      repo   = "magit";
+      owner  = pname;
+      repo   = pname;
       rev    = version;
-      sha256 = "0x8bvfw47bfpzsv9yr98aays4idbbwvnkp0pag1q78gcn9h2k9vi";
+      sha256 = "0pyqa79km1y58phsf4sq2a25rx9lw0di1hb6a5y17xisa8li7sfl";
     };
-    packageRequires = [ git-commit-mode git-rebase-mode ];
+    packageRequires = [ dash git-commit magit-popup with-editor ];
+    fileSpecs = [ "lisp/magit-utils.el"
+                  "lisp/magit-section.el"
+                  "lisp/magit-git.el"
+                  "lisp/magit-mode.el"
+                  "lisp/magit-process.el"
+                  "lisp/magit-core.el"
+                  "lisp/magit-diff.el"
+                  "lisp/magit-wip.el"
+                  "lisp/magit-apply.el"
+                  "lisp/magit-log.el"
+                  "lisp/magit.el"
+                  "lisp/magit-sequence.el"
+                  "lisp/magit-commit.el"
+                  "lisp/magit-remote.el"
+                  "lisp/magit-bisect.el"
+                  "lisp/magit-stash.el"
+                  "lisp/magit-blame.el"
+                  "lisp/magit-ediff.el"
+                  "lisp/magit-extras.el"
+                  "lisp/git-rebase.el"
+                  "Documentation/magit.texi"
+                  "Documentation/AUTHORS.md"
+                  "COPYING"
+                ];
+    meta = { license = gpl3Plus; };
+  };
+  git-commit = melpaBuild rec {
+    pname = "git-commit";
+    version = magit.version;
+    src = magit.src;
+    packageRequires = [ dash with-editor ];
+    fileSpecs = [ "lisp/git-commit.el" ];
+    meta = { license = gpl3Plus; };
+  };
+  magit-popup = melpaBuild rec {
+    pname = "magit-popup";
+    version = magit.version;
+    src = magit.src;
+    packageRequires = [ dash with-editor ];
+    fileSpecs = [ "Documentation/magit-popup.texi" "lisp/magit-popup.el" ];
+    meta = { license = gpl3Plus; };
+  };
+  with-editor = melpaBuild rec {
+    pname = "with-editor";
+    version = magit.version;
+    src = magit.src;
+    packageRequires = [ dash ];
+    fileSpecs = [ "Documentation/with-editor.texi" "lisp/with-editor.el" ];
     meta = { license = gpl3Plus; };
   };
 

From 8d34b4a46a9ff741ce4a6021a520441bd8735918 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 30 Jul 2015 19:57:38 +0200
Subject: [PATCH 0538/2016] chromium: Add another mirror for Chrome deb.

The only mirror left which still has the .deb for 44.0.2403.89 is
http://mirror.pcbeta.com/, but that one doesn't seem to be reachable
from certain contries.

And according to @CestDiego, it doesn't seem to be reachable from within
the US.

Closes #9021, thanks to @CestDiego for reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Diego Berrocal <cestdiego@gmail.com>
Tested-by: Diego Berrocal <cestdiego@gmail.com>
---
 pkgs/applications/networking/browsers/chromium/source/update.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index e639cdb087b..49864cf1c7b 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -18,6 +18,7 @@ let
   debMirrors = [
     "http://95.31.35.30/chrome/pool/main/g"
     "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g"
+    "http://repo.fdzh.org/chrome/deb/pool/main/g"
   ];
 
   tryChannel = channel: let

From 3b59175c05adb325c783c9ce0fdfa814727586ba Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Thu, 30 Jul 2015 18:10:47 +0000
Subject: [PATCH 0539/2016] pythonPackages.iniparse: init at 0.4

---
 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 3d05fddc035..6c4d625a414 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3659,6 +3659,23 @@ let
     };
   };
 
+  iniparse = buildPythonPackage rec {
+
+    name = "iniparse-${version}";
+    version = "0.4";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/iniparse/iniparse-${version}.tar.gz";
+      sha256 = "0m60k46vr03x68jckachzsipav0bwhhnqb8715hm1cngs89fxhdb";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Accessing and Modifying INI files";
+      license = licenses.mit;
+      maintainers = [ "abcz2.uprola@gmail.com" ];
+    };
+  };
+
   i3-py = buildPythonPackage rec {
     version = "0.6.4";
     name = "i3-py-${version}";

From 93bfbc9b2ddb4b8442deeb449844b5f82e544d37 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Jul 2015 11:18:22 -0700
Subject: [PATCH 0540/2016] mongo-tools: Init in goPackages

---
 pkgs/top-level/go-packages.nix | 106 +++++++++++++++++----------------
 1 file changed, 55 insertions(+), 51 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index d7597d2a110..d17ed742fae 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -825,17 +825,12 @@ let
     propagatedBuildInputs = [ google-api-go-client ];
   };
 
-  gopass = buildGoPackage rec {
-    rev = "2c70fa70727c953c51695f800f25d6b44abb368e";
-    name = "gopass-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/howeyc/gopass";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "howeyc";
-      repo = "gopass";
-      sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8";
-    };
-    buildInputs = [ crypto ];
+  gopass = buildFromGitHub {
+    rev = "10b54de414cc9693221d5ff2ae14fd2fbf1b0ac1";
+    owner = "howeyc";
+    repo = "gopass";
+    sha256 = "0lsi89zx1i2f5vhm66zqn2drs7xi7ff8r1xlp6m58r99dddws57s";
+    propagatedBuildInputs = [ crypto ];
   };
 
   gopherduty = buildFromGitHub {
@@ -966,10 +961,10 @@ let
   };
 
   go-flags = buildFromGitHub {
-    rev    = "5e118789801496c93ba210d34ef1f2ce5a9173bd";
+    rev    = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539";
     owner  = "jessevdk";
     repo   = "go-flags";
-    sha256 = "1davr5h936fhc8zy7digp5yqxr216d1mshksr7iiad5xb3r8r9ja";
+    sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680";
   };
 
   go-fuse = buildGoPackage rec {
@@ -1568,18 +1563,34 @@ let
     };
   };
 
-  mgo = buildGoPackage rec {
-    rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a";
-    name = "mgo-${rev}";
+  mgo = buildFromGitHub {
+    rev = "r2015.06.03";
+    owner = "go-mgo";
+    repo = "mgo";
+    sha256 = "1bwqbngdy0ghwpvarsz8rlrirdmjrda44aghihpfmin06hxy3zcd";
     goPackagePath = "gopkg.in/mgo.v2";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "go-mgo";
-      repo = "mgo";
-      sha256 ="0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj";
-    };
+    goPackageAliases = [ "github.com/go-mgo/mgo" ];
+    buildInputs = [ pkgs.cyrus_sasl tomb ];
+  };
 
-    buildInputs = [ pkgs.cyrus_sasl ];
+  mongo-tools = buildFromGitHub {
+    rev    = "621464ebd2ba0c6ee373600b0cb7fd4216405550";
+    owner  = "mongodb";
+    repo   = "mongo-tools";
+    sha256 = "0hgh5h7bpn5xxnxgmw30fi51l4cb4g029nih8j8m0sr4if0n9vkf";
+    buildInputs = [ gopass go-flags mgo openssl tomb ];
+    excludedPackages = "vendor";
+
+    # Mongodb incorrectly names all of their binaries main
+    # Let's work around this with our own installer
+    installPhase = ''
+      mkdir -p $out/bin
+      while read b; do
+        rm -f go/bin/main
+        go install $goPackagePath/$b/main
+        cp go/bin/main $out/bin/$b
+      done < <(find go/src/$goPackagePath -name main | xargs dirname | xargs basename -a)
+    '';
   };
 
   mousetrap = buildFromGitHub {
@@ -1700,17 +1711,18 @@ let
     doCheck = false; # check this again
   };
 
-  openssl = buildGoPackage rec {
-    rev = "84b5df477423634115e53fb171a66007cece19f5";
-    name = "openssl-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/spacemonkeygo/openssl";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "spacemonkeygo";
-      repo = "openssl";
-      sha256 = "1l0cyazxp8bwmi151djyr6pknj9jv8n53lgfhgj6l0zj32p5kh1v";
-    };
-    buildInputs = [ spacelog pkgconfig pkgs.openssl ];
+  openssl = buildFromGitHub {
+    rev = "4c6dbafa5ec35b3ffc6a1b1e1fe29c3eba2053ec";
+    owner = "10gen";
+    repo = "openssl";
+    sha256 = "1033c9vgv9lf8ks0qjy0ylsmx1hizqxa6izalma8vi30np6ka6zn";
+    goPackageAliases = [ "github.com/spacemonkeygo/openssl" ];
+    buildInputs = [ pkgs.pkgconfig pkgs.openssl ];
+    propagatedBuildInputs = [ spacelog ];
+
+    preBuild = ''
+      find go/src/$goPackagePath -name \*.go | xargs sed -i 's,spacemonkeygo/openssl,10gen/openssl,g'
+    '';
   };
 
   osext = buildFromGitHub {
@@ -2075,16 +2087,11 @@ let
     propagatedBuildInputs = [ raw ];
   };
 
-  spacelog = buildGoPackage rec {
+  spacelog = buildFromGitHub {
     rev = "ae95ccc1eb0c8ce2496c43177430efd61930f7e4";
-    name = "spacelog-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/spacemonkeygo/spacelog";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "spacemonkeygo";
-      repo = "spacelog";
-      sha256 = "1i1awivsix0ch0vg6rwvx0536ziyw6phcx45b1rmrclp6b6dyacy";
-    };
+    owner = "spacemonkeygo";
+    repo = "spacelog";
+    sha256 = "1i1awivsix0ch0vg6rwvx0536ziyw6phcx45b1rmrclp6b6dyacy";
     buildInputs = [ flagfile ];
   };
 
@@ -2171,16 +2178,13 @@ let
     propagatedBuildInputs = [ pty ];
   };
 
-  tomb = buildGoPackage rec {
+  tomb = buildFromGitHub {
     rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8";
-    name = "tomb-${stdenv.lib.strings.substring 0 7 rev}";
+    owner = "go-tomb";
+    repo = "tomb";
+    sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5";
     goPackagePath = "gopkg.in/tomb.v2";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "go-tomb";
-      repo = "tomb";
-      sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5";
-    };
+    goPackageAliases = [ "github.com/go-tomb/tomb" ];
   };
 
   toml = buildFromGitHub {

From 428f9ad382d2f0911ff3c70e55f427d305002b3e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Jul 2015 11:18:34 -0700
Subject: [PATCH 0541/2016] mongodb-tools: Use mongo-tools from goPackages

---
 pkgs/tools/misc/mongodb-tools/default.nix | 39 -----------------------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 pkgs/tools/misc/mongodb-tools/default.nix

diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
deleted file mode 100644
index 81e05a8790e..00000000000
--- a/pkgs/tools/misc/mongodb-tools/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, goPackages, fetchurl, callPackage }:
-
-with goPackages;
-
-buildGoPackage rec {
-  version = "r3.1.2";
-  name = "mongodb-tools";
-  goPackagePath = "github.com/mongodb/mongo-tools";
-
-  src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://github.com/mongodb/mongo-tools/archive/${version}.tar.gz";
-    sha256 = "1dag8ar95jlfk6rm99y4p3dymcy2s2qnwd9jwqhw9fxr110mgf5s";
-  };
-
-  buildInputs = [ gopass go-flags crypto mgo openssl spacelog
-    oglematchers goconvey tomb ];
-
-  subPackages = [ "bsondump/main" "mongostat/main" "mongofiles/main"
-    "mongoexport/main" "mongoimport/main" "mongorestore/main"
-    "mongodump/main" "mongotop/main" "mongooplog/main" ];
-
-  buildPhase = ''
-    for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do
-      echo Building $i
-      go build -o go/bin/$i go/src/${goPackagePath}/$i/main/$i.go
-    done
-  '';
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "Tools for MongoDB";
-    homepage = https://github.com/mongodb/mongo-tools;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ mschristiansen ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8cbedb66485..c9c953f49aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -948,7 +948,7 @@ let
 
   mcrypt = callPackage ../tools/misc/mcrypt { };
 
-  mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
+  mongodb-tools = goPackages.mongo-tools;
 
   mstflint = callPackage ../tools/misc/mstflint { };
 

From 4dc113ce299482a12157a5614d92817f97fd3f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Jul 2015 20:20:27 +0200
Subject: [PATCH 0542/2016] neverball: update

Seems to work fine. /cc maintainer @viric.
---
 pkgs/games/neverball/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix  |  4 +---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix
index 2bec14a11c1..61f8b1c81e7 100644
--- a/pkgs/games/neverball/default.nix
+++ b/pkgs/games/neverball/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, SDL, mesa, libpng, libjpeg, SDL_ttf, libvorbis, gettext,
-physfs} :
+{ stdenv, fetchurl, SDL2, mesa_noglu, libpng, libjpeg, SDL2_ttf, libvorbis, gettext
+, physfs }:
 
 stdenv.mkDerivation rec {
-  name = "neverball-1.5.4";
+  name = "neverball-1.6.0";
   src = fetchurl {
     url = "http://neverball.org/${name}.tar.gz";
-    sha256 = "19hdgdmv20y56xvbj4vk0zdmyaa8kv7df85advkchw7cdsgwlcga";
+    sha256 = "184gm36c6p6vaa6gwrfzmfh86klhnb03pl40ahsjsvprlk667zkk";
   };
 
-  buildInputs = [ libpng SDL mesa libjpeg SDL_ttf libvorbis gettext physfs];
+  buildInputs = [ libpng SDL2 mesa_noglu libjpeg SDL2_ttf libvorbis gettext physfs ];
 
   dontPatchElf = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a8d1a6173e..c9fadac248f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9985,9 +9985,7 @@ let
 
   nettools = callPackage ../os-specific/linux/net-tools { };
 
-  neverball = callPackage ../games/neverball {
-    libpng = libpng15;
-  };
+  neverball = callPackage ../games/neverball { };
 
   nftables = callPackage ../os-specific/linux/nftables { };
 

From edd76966cbb299cdf0cda2d43df7c9a89ba9f850 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 30 Jul 2015 20:18:07 +0200
Subject: [PATCH 0543/2016] qarte: 2.2.0-147 -> 2.3.0

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

diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix
index c8056512c79..4517f27ce7d 100644
--- a/pkgs/applications/video/qarte/default.nix
+++ b/pkgs/applications/video/qarte/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "qarte-2.2.0-147";
+  name = "qarte-2.3.0";
   src = fetchbzr {
     url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk;
-    rev = "147";
-    sha256 = "0cl3k3vr3kmp5dls0lbv5pka4zrlyh5816pwl5rkgqmycl11pk51";
+    rev = "148";
+    sha256 = "0bp2qbl2g3dygmb31lwlarki9lybkb9zxixda4lwrlz628w93fxh";
   };
 
   buildInputs = [ makeWrapper ];

From ad686d3762ceaae90038097741d8fce9fe9773fa Mon Sep 17 00:00:00 2001
From: Oliver Dunkl <oliver.dunkl@gmail.com>
Date: Thu, 30 Jul 2015 11:38:41 +0200
Subject: [PATCH 0544/2016] Add odi to list of maintainers

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b0a08cfd619..f4cd203e41d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -177,6 +177,7 @@
   nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
   obadz = "obadz <dav-nixos@odav.org>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
+  odi = "Oliver Dunkl <oliver.dunkl@gmail.com>";
   offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
   olcai = "Erik Timan <dev@timan.info>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";

From 8b71698c0728647b1cdf9bb6fbc0c5bd803e2701 Mon Sep 17 00:00:00 2001
From: Oliver Dunkl <oliver.dunkl@gmail.com>
Date: Thu, 30 Jul 2015 11:39:28 +0200
Subject: [PATCH 0545/2016] python-packages: pafy init version 0.3.74

---
 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 e760380132f..d8f05132d95 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16790,4 +16790,24 @@ let
       maintainers = with maintainers; [ kamilchm ];
     };
   };
+
+  pafy = buildPythonPackage rec {
+    name = "pafy-${version}";
+    version = "0.3.74";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pafy/${name}.tar.gz";
+      md5 = "fbf0e7f85914eaf35f87837232eec09c";
+    };
+
+    propagatedBuildInputs = with self; [ youtube-dl ];
+
+    meta = with stdenv.lib; {
+      description = "A library to download YouTube content and retrieve metadata";
+      homepage = http://np1.github.io/pafy/;
+      license = licenses.lgpl3Plus;
+      maintainers = with maintainers; [ odi ];
+    };
+  };
+
 }; in pythonPackages

From 85134cc38680a25c0bf033a524fcbce2113f5177 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Jul 2015 12:11:25 -0700
Subject: [PATCH 0546/2016] chromium: 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 f6d663fcd14..85a92e07e66 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -7,15 +7,15 @@
     sha256bin64 = "0273dy5b1r9s9g8ixrafnxm8jnn4ha36r3b3ckdabm9y4pqwx54s";
   };
   beta = {
-    version = "44.0.2403.89";
-    sha256 = "161shml5w2i0crl57hkfnizgmii6d70lxxg4rjxmays8g6lrmpds";
-    sha256bin32 = "1vk022m9kz9fw82sd94zqzi988ald3p2vlha7pz5wm2dgibwr25g";
-    sha256bin64 = "0kvrpqy3fpfzchly65nrh8z2z2i49xpa3pm2k7k18sn0x4bycji0";
+    version = "45.0.2454.15";
+    sha256 = "1zg562cpn9ddai92jdjg3frhmvbhbkf71ysprwqa3rgbg6w8ipzj";
+    sha256bin32 = "1scjirp54z08h36zs9z9yq4pxcximf00krlip9dkvxsxh65qiw5w";
+    sha256bin64 = "14l8lka8jci1d90vbz5kpl20mk98n1ak4mw667dkz89cch5gal4s";
   };
   stable = {
-    version = "44.0.2403.107";
-    sha256 = "0w9xk2jrpp98fgszswr5jc0g5ggpm8rfxqzxa8402n7iwkxlyqyh";
-    sha256bin32 = "0x4j5ggb2dh56lz5fg2h79lvp92rgsk59gi5h3ml678vcghzyfvn";
-    sha256bin64 = "0nhm9783b314dmicqky3424ak4z6xhb6rjia12pq2ajddz9qj9rj";
+    version = "44.0.2403.125";
+    sha256 = "0li483phq72xlg0bpsgfk1rlxrmldk4g45ijx1xmnfs42g38wmkq";
+    sha256bin32 = "0h5a2wm13bvrq013skp3lq40bzx9519mb9kh8x3n4800lnanbjcb";
+    sha256bin64 = "1p9gfqpgyihvby4pb3fdn4ibg84fh4gksy18cvyi9zq7cibww2ff";
   };
 }

From 3845b25623c802a354a8092105dfb9873c7e504a Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Thu, 30 Jul 2015 19:12:40 +0000
Subject: [PATCH 0547/2016] pythonPackages.qscintilla: init at 2.9

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

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 8c7301e3c40..26d412e5a8c 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
     qmake qscintilla.pro
   '';
 
-  # TODO PyQt Support.
-
   meta = {
     description = "A Qt port of the Scintilla text editing library";
     longDescription = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c4d625a414..e71eb336655 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11397,6 +11397,37 @@ let
     };
   };
 
+  qscintilla = pkgs.stdenv.mkDerivation rec {
+    # TODO: Qt5 support
+    name = "qscintilla-${version}";
+    version = pkgs.qscintilla.version;
+    disabled = isPy3k || isPyPy;
+
+    src = pkgs.qscintilla.src;
+
+    buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
+
+    preConfigure = ''
+      mkdir -p $out
+      lndir ${pkgs.pyqt4} $out
+      cd Python
+      ${python.executable} ./configure-old.py \
+          --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
+          --apidir $out/api/${python.libPrefix} \
+          -n ${pkgs.qscintilla}/include \
+          -o ${pkgs.qscintilla}/lib \
+          --sipdir $out/share/sip
+    '';
+
+    meta = with stdenv.lib; {
+      description = "A Python binding to QScintilla, Qt based text editing control";
+      license = licenses.lgpl21Plus;
+      maintainers = [ "abcz2.uprola@gmail.com" ];
+      platforms = platforms.linux;
+    };
+  };
+
+
   qserve = buildPythonPackage rec {
     name = "qserve-0.2.8";
     disabled = isPy3k;

From 2a31397f536b3bf57e4ee76b812fd83ab31de971 Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Thu, 30 Jul 2015 16:29:38 -0500
Subject: [PATCH 0548/2016] stage-1: fix typo that breaks resume

$d should be $sd, this causes resume from hibernate to fail if
resumeDevice is not explicitly set in config.  Introduced in commit:
'stage-1: Shut up warnings about swap devices that don't exist yet'
---
 nixos/modules/system/boot/stage-1-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 26cf7f06c9e..480bbfa2b07 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -184,7 +184,7 @@ if test -e /sys/power/resume -a -e /sys/power/disk; then
             # https://bugs.launchpad.net/ubuntu/+source/pm-utils/+bug/923326/comments/1
             # when there are multiple swap devices, we can't know where the hibernate
             # image will reside. We can check all of them for swsuspend blkid.
-            resumeInfo="$(test -e "$d" && udevadm info -q property "$sd")"
+            resumeInfo="$(test -e "$sd" && udevadm info -q property "$sd")"
             if [ "$(echo "$resumeInfo" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then
                 resumeDev="$sd"
                 break

From 6c1d408b47cc030edcec7a05d19aa2906382d7dc Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 30 Jul 2015 16:20:04 -0700
Subject: [PATCH 0549/2016] bup: Patch to work on Darwin 10.10

---
 pkgs/tools/backup/bup/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix
index 1964f01b077..b4efe9fb441 100644
--- a/pkgs/tools/backup/bup/default.nix
+++ b/pkgs/tools/backup/bup/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchzip, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper
-, par2cmdline, par2Support ? false }:
+{ stdenv, fetchzip, fetchurl, python, pyxattr, pylibacl, setuptools
+, fuse, git, perl, pandoc, makeWrapper, par2cmdline, par2Support ? false }:
 
 assert par2Support -> par2cmdline != null;
 
@@ -7,7 +7,7 @@ let version = "0.26"; in
 
 with stdenv.lib;
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "bup-${version}";
 
   src = fetchzip {
@@ -18,12 +18,19 @@ stdenv.mkDerivation {
   buildInputs = [ python git ];
   nativeBuildInputs = [ pandoc perl makeWrapper ];
 
-  patchPhase = ''
+  darwin_10_10_patch = fetchurl {
+    url = "https://github.com/bup/bup/commit/75d089e7cdb7a7eb4d69c352f56dad5ad3aa1f97.diff";
+    sha256 = "05kp47p30a45ip0fg090vijvzc7ijr0alc3y8kjl6bvv3gliails";
+  };
+
+  postPatch = ''
     patchShebangs .
     substituteInPlace Makefile --replace "-Werror" ""
     substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl"
   '' + optionalString par2Support ''
     substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'"
+  '' + optionalString (elem stdenv.system platforms.darwin) ''
+    patch -p1 < ${darwin_10_10_patch}
   '';
 
   dontAddPrefix = true;

From 23562aad59048e8e1202e618fcf402079f1593b8 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 30 Jul 2015 16:21:39 -0700
Subject: [PATCH 0550/2016] Revert "emacs: Update Mac Port Emacs to
 24.5-mac-5.9"

This reverts commit 5c896e5511608592b94960c5c419f70dadc5b527, which was
a set of local changes unrelated to the commit title.
---
 .../haskell-modules/configuration-common.nix           |  2 --
 pkgs/development/haskell-modules/hackage-packages.nix  |  2 +-
 pkgs/servers/x11/xorg/overrides.nix                    | 10 +++++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 30c5912a5a8..5260d508ab1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -21,8 +21,6 @@ self: super: {
   options = dontCheck super.options;
   statistics = dontCheck super.statistics;
   text = dontCheck super.text;
-  c2hs = dontCheck super.c2hs;
-  mockery = dontCheck super.mockery;
 
   # The package doesn't compile with ruby 1.9, which is our default at the moment.
   hruby = super.hruby.override { ruby = pkgs.ruby_2_1; };
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 622ebfa7473..ba7bc517aa7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -54313,7 +54313,7 @@ self: {
          yesod-static
        ];
        buildTools = [
-         curl git gnupg openssh perl rsync wget which
+         bup curl git gnupg lsof openssh perl rsync wget which
        ];
        configureFlags = [ "-fassistant" "-fproduction" ];
        preConfigure = "export HOME=$TEMPDIR";
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a43fb6d7706..336ae652628 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -79,9 +79,9 @@ in
     nativeBuildInputs = [ args.python ];
   };
 
-  # libxkbfile = attrs: attrs // {
-  #   patches = lib.optional stdenv.cc.isClang ./libxkbfile-clang36.patch;
-  # };
+  libxkbfile = attrs: attrs // {
+    patches = lib.optional stdenv.cc.isClang ./libxkbfile-clang36.patch;
+  };
 
   libpciaccess = attrs : attrs // {
     patches = [ ./libpciaccess-apple.patch ];
@@ -285,9 +285,9 @@ in
         dmxproto /*libdmx not used*/ xf86vidmodeproto
         recordproto libXext pixman libXfont
         damageproto xcmiscproto  bigreqsproto
-        inputproto xextproto randrproto renderproto presentproto
+        libpciaccess inputproto xextproto randrproto renderproto presentproto
         dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
-      ] ++ lib.optional (!isDarwin) libpciaccess;
+      ];
       commonPatches = [ ./xorgserver-xkbcomp-path.patch ]
                    ++ lib.optional isDarwin ./fix-clang.patch;
       # XQuartz requires two compilations: the first to get X / XQuartz,

From 55932c1beca26c7b5b7c259d95f6eb80644150a7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 31 Jul 2015 01:30:15 +0200
Subject: [PATCH 0551/2016] Don't statically depend on cacert for certificates

This reverts commit cd52c044568bdf1108428698048a9af92dc0b625 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
---
 pkgs/applications/graphics/shotwell/default.nix            | 6 +++---
 pkgs/applications/networking/browsers/vimb/default.nix     | 7 +------
 .../networking/browsers/vimprobable2/default.nix           | 7 +------
 .../networking/cluster/panamax/api/default.nix             | 4 ++--
 .../networking/instant-messengers/fuze/default.nix         | 4 ++--
 .../instant-messengers/telepathy/gabble/default.nix        | 4 ++--
 pkgs/applications/networking/irc/weechat/default.nix       | 6 +++---
 pkgs/applications/version-management/bazaar/default.nix    | 5 ++---
 pkgs/applications/version-management/mercurial/default.nix | 5 ++---
 pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix  | 4 ++--
 pkgs/desktops/gnome-3/3.16/core/rest/default.nix           | 4 ++--
 pkgs/development/interpreters/elixir/default.nix           | 6 +++---
 pkgs/development/libraries/glib-networking/default.nix     | 4 ++--
 pkgs/servers/mail/opensmtpd/default.nix                    | 2 +-
 pkgs/tools/misc/pipelight/pipelight.patch                  | 4 ++--
 pkgs/tools/networking/aria2/default.nix                    | 6 ++----
 pkgs/tools/security/prey/default.nix                       | 5 ++---
 17 files changed, 34 insertions(+), 49 deletions(-)

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 2b25f8d41f6..052ba9402be 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
 , webkitgtk24x, pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib
 , gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, makeWrapper
-, gnome_doc_utils, hicolor_icon_theme, cacert }:
+, gnome_doc_utils, hicolor_icon_theme }:
 
 # for dependencies see http://www.yorba.org/projects/shotwell/install/
 
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
-  
+
   configureFlags = [ "--disable-gsettings-convert-install" ];
-  
+
   preConfigure = ''
     patchShebangs .
   '';
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 3222e87ac65..84a2870b6d0 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk, glib_networking
-, gsettings_desktop_schemas, makeWrapper, cacert
+, gsettings_desktop_schemas, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -11,11 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "0h9m5qfs09lb0dz8a79yccmm3a5rv6z8gi5pkyfh8fqkgkh2940p";
   };
 
-  # Nixos default ca bundle
-  patchPhase = ''
-    sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/etc/ssl/certs/ca-bundle.crt, src/config.def.h
-  '';
-
   buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ];
 
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index ad5f8aa4691..6f8eede9b3f 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk, libsoup, libX11, perl,
-  pkgconfig, webkit, gsettings_desktop_schemas, cacert }:
+  pkgconfig, webkit, gsettings_desktop_schemas }:
 
 stdenv.mkDerivation rec {
   version = "1.4.2";
@@ -9,11 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr";
   };
 
-  # Nixos default ca bundle
-  patchPhase = ''
-    sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/etc/ssl/certs/ca-bundle.crt, config.h
-  '';
-
   buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ];
 
   installPhase = ''
diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix
index 524433b45fb..dcfef83f1be 100644
--- a/pkgs/applications/networking/cluster/panamax/api/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/api/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler_HEAD
-, ruby, libxslt, libxml2, sqlite, openssl, cacert, docker
+, ruby, libxslt, libxml2, sqlite, openssl, docker
 , dataDir ? "/var/lib/panamax-api" }:
 
 with stdenv.lib;
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
       --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \
       --prefix "HOME" : "$out/share/panamax-api" \
       --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \
-      --prefix "SSL_CERT_FILE" : "${cacert}/etc/ssl/certs/ca-bundle.crt" \
+      --prefix "SSL_CERT_FILE" : /etc/ssl/certs/ca-certificates.crt \
       --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}"
   '';
 
diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix
index 6b85e107d06..33ffe87a4ff 100644
--- a/pkgs/applications/networking/instant-messengers/fuze/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, dpkg, openssl, alsaLib, libXext, libXfixes, libXrandr
 , libjpeg, curl, libX11, libXmu, libXv, libXtst, qt4, mesa, zlib
-, gnome, libidn, rtmpdump, c-ares, openldap, makeWrapper, cacert
+, gnome, libidn, rtmpdump, c-ares, openldap, makeWrapper
 }:
 assert stdenv.system == "x86_64-linux";
 let
   curl_custom =
     stdenv.lib.overrideDerivation curl (args: { 
-      configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt"] ; 
+      configureFlags = args.configureFlags ++ ["--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"] ; 
     } );
 in
 stdenv.mkDerivation {
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index a74885b2ce3..971a834f409 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon
-, sqlite, libsoup, libnice, gnutls, cacert }:
+, sqlite, libsoup, libnice, gnutls }:
 
 stdenv.mkDerivation rec {
   name = "telepathy-gabble-0.18.2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]
     ++ stdenv.lib.optional doCheck dbus_daemon;
 
-  configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
 
   enableParallelBuilding = true;
   doCheck = true;
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index c39c5be1d4c..060be8ab1eb 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls
 , zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile
-, pythonPackages, cacert, cmake, makeWrapper, libobjc
+, pythonPackages, cmake, makeWrapper, libobjc
 , extraBuildInputs ? [] }:
 
 stdenv.mkDerivation rec {
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
   buildInputs = 
     [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
       libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
-      cacert cmake ]
+      cmake ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ pythonPackages.pync libobjc ]
     ++ extraBuildInputs;
 
-  NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt";
+  NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=/etc/ssl/certs/ca-certificates.crt";
 
   postInstall = ''
     NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index c3b238eeb0a..28406cecbb0 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, cacert }:
+{ stdenv, fetchurl, pythonPackages }:
 
 stdenv.mkDerivation rec {
   version = "2.6";
@@ -19,10 +19,9 @@ stdenv.mkDerivation rec {
   patches = [ ./add_certificates.patch ];
   postPatch = ''
     substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \
-      --subst-var-by "certPath" "${cacert}/etc/ssl/certs/ca-bundle.crt"
+      --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt
   '';
 
-
   installPhase = ''
     python setup.py install --prefix=$out
     wrapPythonPrograms
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 4d8b2fe27c6..12f3c8f11d8 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich
-, guiSupport ? false, tk ? null, curses, cacert
-
+, guiSupport ? false, tk ? null, curses
 , ApplicationServices }:
 
 let
@@ -48,7 +47,7 @@ stdenv.mkDerivation {
       mkdir -p $out/etc/mercurial
       cat >> $out/etc/mercurial/hgrc << EOF
       [web]
-      cacerts = ${cacert}/etc/ssl/certs/ca-bundle.crt
+      cacerts = /etc/ssl/certs/ca-certificates.crt
       EOF
 
       # copy hgweb.cgi to allow use in apache
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
index a6621aebe43..c3f16db359e 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
 , intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
-, docbook_xsl_ns, docbook_xsl, gnome3, cacert }:
+, docbook_xsl_ns, docbook_xsl, gnome3 }:
 
 let
   majVer = gnome3.version;
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
 
   configureFlags = [
-    "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path
+    "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" # NixOS hardcoded path
     "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
     "--with-pkcs11-modules=$$out/lib/pkcs11/"
   ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
index 354f1715dc1..eada9ab1993 100644
--- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, cacert, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "rest-0.7.92";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
 
-  configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 99d649f3f68..c9a83774486 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash, cacert }:
+{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash }:
 
 let
   version = "1.0.5";
@@ -32,8 +32,8 @@ stdenv.mkDerivation {
      b=$(basename $f)
       if [ $b == "mix" ]; then continue; fi
       wrapProgram $f \
-      --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \
-      --set CURL_CA_BUNDLE "${cacert}/etc/ssl/certs/ca-bundle.crt"
+        --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \
+        --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
     done
   '';
 
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 79b31b1365b..a17b7a21409 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy
-, gsettings_desktop_schemas, cacert }:
+, gsettings_desktop_schemas }:
 
 let
   ver_maj = "2.44";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346";
   };
 
-  configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
 
   preBuild = ''
     sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 810012fb60a..a95a5d81ce9 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     "--with-sock-dir=/run"
     "--with-privsep-user=smtpd"
     "--with-queue-user=smtpq"
-    "--with-ca-file=${cacert}/etc/ssl/certs/ca-bundle.crt"
+    "--with-ca-file=/etc/ssl/certs/ca-certificates.crt"
   ];
 
   installFlags = [
diff --git a/pkgs/tools/misc/pipelight/pipelight.patch b/pkgs/tools/misc/pipelight/pipelight.patch
index bde6ecf943d..66dd0fdab4c 100644
--- a/pkgs/tools/misc/pipelight/pipelight.patch
+++ b/pkgs/tools/misc/pipelight/pipelight.patch
@@ -43,7 +43,7 @@ diff -urN pipelight.old/bin/pipelight-plugin.in pipelight.new/bin/pipelight-plug
 -fi
 +download_file()
 +{
-+	curl --cacert /etc/ssl/certs/ca-bundle.crt -o "$1" "$2"
++	curl --cacert /etc/ssl/certs/ca-certificates.crt -o "$1" "$2"
 +}
 
  # Use shasum instead of sha256sum on MacOS / *BSD
@@ -111,7 +111,7 @@ diff -urN pipelight.old/share/install-dependency pipelight.new/share/install-dep
 -fi
 +download_file()
 +{
-+	curl --cacert /etc/ssl/certs/ca-bundle.crt -o "$1" "$2"
++	curl --cacert /etc/ssl/certs/ca-certificates.crt -o "$1" "$2"
 +}
 +get_download_size()
 +{
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 8d7f4541cad..e48beb3fe35 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, cacert, c-ares, openssl, libxml2, sqlite, zlib }:
+{ stdenv, fetchurl, pkgconfig, c-ares, openssl, libxml2, sqlite, zlib }:
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig c-ares openssl libxml2 sqlite zlib ];
 
-  propagatedBuildInputs = [ cacert ];
-
-  configureFlags = [ "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt" ];
+  configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ];
 
   meta = with stdenv.lib; {
     homepage = http://aria2.sourceforge.net/;
diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix
index d04f48c0f31..b36c11cf934 100644
--- a/pkgs/tools/security/prey/default.nix
+++ b/pkgs/tools/security/prey/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils
-, makeWrapper, coreutils, cacert
+{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils, makeWrapper, coreutils
 , apiKey ? ""
 , deviceKey ? "" }:
 
@@ -36,7 +35,7 @@ in stdenv.mkDerivation rec {
     cp -R ${modulesSrc}/* $out/modules/
     wrapProgram "$out/prey.sh" \
       --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \
-      --set CURL_CA_BUNDLE "${cacert}/etc/ssl/certs/ca-bundle.crt"
+      --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt"
   '';
 
   meta = with stdenv.lib; {

From 0edfda814eea1e24b9ece7fc546bdf97e0d5da12 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 31 Jul 2015 01:36:41 +0200
Subject: [PATCH 0552/2016] Fix random ugliness

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

diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 7bcb499aab4..0b125485fd4 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     unpackFile ${curl.src};
   '';
 
-  nativeBuildInputs = [ perl ] ++ (with perlPackages; [ LWP ]);
+  nativeBuildInputs = [ perl perlPackages.LWP ];
 
   buildPhase = ''
     perl curl-*/lib/mk-ca-bundle.pl -d "file://$(pwd)/nss/lib/ckfw/builtins/certdata.txt" ca-bundle.crt

From 6c6201a99bb52e96d7c10365dbcf67f6cafdfe2c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 30 Jul 2015 18:00:14 +0200
Subject: [PATCH 0553/2016] Remove unnecessary rec{s from "my" packages

---
 pkgs/applications/editors/neovim/default.nix               | 6 +++---
 pkgs/development/compilers/squeak/default.nix              | 2 +-
 pkgs/development/interpreters/picoc/default.nix            | 2 +-
 pkgs/development/libraries/accounts-qt/default.nix         | 2 +-
 pkgs/development/libraries/libcli/default.nix              | 2 +-
 pkgs/development/tools/misc/bin_replace_string/default.nix | 2 +-
 pkgs/development/tools/parsing/flexc++/default.nix         | 2 +-
 pkgs/os-specific/linux/freefall/default.nix                | 2 +-
 pkgs/os-specific/linux/jfbview/default.nix                 | 2 +-
 pkgs/os-specific/linux/phc-intel/default.nix               | 2 +-
 pkgs/tools/filesystems/duff/default.nix                    | 2 +-
 pkgs/tools/filesystems/encfs/default.nix                   | 2 +-
 pkgs/tools/networking/hans/default.nix                     | 4 ++--
 pkgs/tools/security/eid-mw/default.nix                     | 2 +-
 pkgs/tools/security/eid-viewer/default.nix                 | 3 ++-
 pkgs/tools/text/aha/default.nix                            | 2 +-
 16 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 28d455e06b2..c55d4b0e76a 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -17,7 +17,7 @@ let
   version = "2015-06-09";
 
   # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
-  neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation rec {
+  neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation {
     name = "neovim-libvterm-${version}";
 
     src = fetchFromGitHub {
@@ -54,7 +54,7 @@ let
     ignoreCollisions = true;
   };
 
-  neovim = stdenv.mkDerivation rec {
+  neovim = stdenv.mkDerivation {
     name = "neovim-${version}";
 
     src = fetchFromGitHub {
@@ -135,7 +135,7 @@ let
     };
   };
 
-in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation rec {
+in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation {
   name = "neovim-${version}-configured";
   nativeBuildInputs = [ makeWrapper ];
   buildCommand = ''
diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix
index 6e68defb624..7f3ed5c6ec3 100644
--- a/pkgs/development/compilers/squeak/default.nix
+++ b/pkgs/development/compilers/squeak/default.nix
@@ -2,7 +2,7 @@
 , libpthreadstubs, pango, pkgconfig, libpulseaudio, which }:
 
 let version = "4.10.2.2614"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "squeak-${version}";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index c9ec01703bf..290abca5474 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, readline }:
 
 let version = "2015-05-04"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "picoc-${version}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index 824a2949492..26a04362090 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }:
 
 let version = "1.13"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "accounts-qt-${version}";
 
   src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix
index bbeb75d0b8d..a6d564d9294 100644
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/pkgs/development/libraries/libcli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 let version = "1.9.7"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "libcli-${version}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix
index 7d33d8ee3c3..9e4b77c196e 100644
--- a/pkgs/development/tools/misc/bin_replace_string/default.nix
+++ b/pkgs/development/tools/misc/bin_replace_string/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libelf, txt2man }:
 
 let version = "0.2"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "bin_replace_string-${version}";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index d723cc0382b..0b9c4fcbc64 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bobcat, icmake, yodl }:
 
 let version = "2.02.00"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "flexc++-${version}";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix
index 4c1497367e3..34d0f3881e4 100644
--- a/pkgs/os-specific/linux/freefall/default.nix
+++ b/pkgs/os-specific/linux/freefall/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 let version = "3.19"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "freefall-${version}";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index 34bf136ece7..c89f6e81410 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -5,7 +5,7 @@ let
   version = "0.5.1";
   binaries = [ "jfbpdf" "jfbview" "jpdfcat" "jpdfgrep" ];
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "jfbview-${version}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix
index 4b656967386..4c47047ff74 100644
--- a/pkgs/os-specific/linux/phc-intel/default.nix
+++ b/pkgs/os-specific/linux/phc-intel/default.nix
@@ -7,7 +7,7 @@ assert stdenv.lib.versionAtLeast kernel.version "4.0";
 assert !kernel.features ? grsecurity;
 
 let version = "0.4.0-rev17"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "linux-phc-intel-${version}-${kernel.version}";
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix
index edb69aaef5c..31015334166 100644
--- a/pkgs/tools/filesystems/duff/default.nix
+++ b/pkgs/tools/filesystems/duff/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gettext }:
 
 let version = "0.5.2"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "duff-${version}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index d85440c5475..b21054e478d 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, rlog }:
 
 let version = "1.8.1"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "encfs-${version}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix
index c4f7c8da9d4..31a47d2e441 100644
--- a/pkgs/tools/networking/hans/default.nix
+++ b/pkgs/tools/networking/hans/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, nettools }:
 
 let version = "0.4.4"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "hans-${version}";
 
   src = fetchFromGitHub {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ nettools ];
 
   postPatch = ''
-    substituteInPlace src/tun.cpp --replace "/sbin/" "/${nettools}/bin/"
+    substituteInPlace src/tun.cpp --replace "/sbin/" "${nettools}/bin/"
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index e14bc6b9cc4..c039c41314d 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig }:
 
 let version = "4.1.4"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "eid-mw-${version}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix
index f2dfd58a7fb..6df5116ad18 100644
--- a/pkgs/tools/security/eid-viewer/default.nix
+++ b/pkgs/tools/security/eid-viewer/default.nix
@@ -1,9 +1,10 @@
 { stdenv, fetchurl, jre, makeWrapper, pcsclite }:
 
-stdenv.mkDerivation rec {
+let
   # TODO: find out what the version components actually mean, if anything:
   package = "eid-viewer-4.0.7-195";
   build = "tcm406-258907";
+in stdenv.mkDerivation rec {
   name = "${package}-${build}";
 
   src = fetchurl {
diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix
index 4ae8048623c..d1c21e62a66 100644
--- a/pkgs/tools/text/aha/default.nix
+++ b/pkgs/tools/text/aha/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 let version = "0.4.8"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "aha-${version}";
 
   src = fetchFromGitHub {

From c0f59dc0bbdd13eb81c78e7e1bb67d5eb52da08e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 30 Jul 2015 18:44:43 +0200
Subject: [PATCH 0554/2016] lz4: remove test restrictions

Tests are still disabled by default.
---
 pkgs/tools/compression/lz4/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 57f0327fa1e..1fefc1dcc83 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -17,9 +17,8 @@ stdenv.mkDerivation rec {
 
   makeFlags = "PREFIX=$(out)";
 
-  doCheck = false;
+  doCheck = false; # tests take a very long time
   checkTarget = "test";
-  checkFlags = "-j1 -C programs"; # -j1 required since version 128, -C should be temporary
 
   meta = with stdenv.lib; {
     description = "Extremely fast compression algorithm";

From 7b30d6a8cb55ad4e8001acef0a5affcf22e4f383 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 30 Jul 2015 20:03:22 +0200
Subject: [PATCH 0555/2016] sudo: add withInsults flag (disabled by default)

The feature Nix neither needs nor deserves.
Requires the "insults" to be explicitly enabled in sudoers.
This adds 1.6 MB to your sudo as some kind of cruel meta-joke.
---
 pkgs/tools/security/sudo/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 8c9d3533346..34e1731778f 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, coreutils, pam, groff
 , sendmailPath ? "/var/setuid-wrappers/sendmail"
+, withInsults ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -20,6 +21,9 @@ stdenv.mkDerivation rec {
     "--with-vardir=/var/db/sudo"
     "--with-logpath=/var/log/sudo.log"
     "--with-sendmail=${sendmailPath}"
+  ] ++ stdenv.lib.optional withInsults [
+    "--with-insults"
+    "--with-all-insults"
   ];
 
   configureFlagsArray = [

From cf1edbb66251ac176f820e0895ca2268b2f59727 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 30 Jul 2015 23:57:03 +0200
Subject: [PATCH 0556/2016] stress-ng: 0.04.12 -> 0.04.13

Changes: https://launchpad.net/ubuntu/+source/stress-ng/0.04.13-1
---
 pkgs/tools/system/stress-ng/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index a2cff62e2c8..38f2f2551bf 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, attr }:
+{ stdenv, fetchurl, attr, keyutils }:
 
-let version = "0.04.12"; in
+let version = "0.04.13"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "0gc5mai1dzhb7n8wsy2kzx0q85zbsa2ilvc2fpa30ilcwmg28kgm";
+    sha256 = "0h4alfylf15q1rdf9v42fy0bhh4c1s1fagiym445qb3yacf5p9g3";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 
-  buildInputs = [ attr ];
+  buildInputs = [ attr keyutils ];
 
   patchPhase = ''
     substituteInPlace Makefile --replace "/usr" ""

From 083ff50289fc6b83b37f1318ba61a0e6a1d0349b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 31 Jul 2015 02:02:26 +0200
Subject: [PATCH 0557/2016] Revert "python-packages: click 3.3 -> 4.1"

I *think* this might be breaking nox-review on Travis (but not here...)
Reverting to get Travis working ASAP until I figure out if that is so.

This reverts commit ba9a6e2d095a5895e82f791ec8f1b92f05259454.
---
 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 d8f05132d95..32bc74fd15e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1884,11 +1884,11 @@ let
   };
 
   click = buildPythonPackage rec {
-    name = "click-4.1";
+    name = "click-3.3";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
-      sha256 = "1n4fvxpgbna83g6daarscljwpbarr45qfalh9hqla8ayy84ysfg3";
+      sha256 = "1rfn8ml80rw3hkgpm1an5p3vdyhh7hzx4zynr8dhfl7bsw28r77p";
     };
 
     meta = {

From 389a0bf6cc0ca99cff3376648599285ec817b0b3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 31 Jul 2015 02:36:06 +0200
Subject: [PATCH 0558/2016] python-packages: re-add click 4.1 as separate attr

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 32bc74fd15e..d2c83016dca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1903,6 +1903,17 @@ let
     };
   };
 
+  click_4_1 = buildPythonPackage rec {
+    name = "click-4.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
+      sha256 = "1n4fvxpgbna83g6daarscljwpbarr45qfalh9hqla8ayy84ysfg3";
+    };
+
+    inherit (self.click) meta;
+  };
+
   clepy = buildPythonPackage rec {
     name = "clepy-0.3.20";
 

From 967088e00232bbd890951a1945109c42057340b5 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 19 Jul 2015 16:49:23 +0000
Subject: [PATCH 0559/2016] nixos: let's not forget types in the timezone
 module

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

diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index 06857139311..b9844b4adad 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
@@ -26,6 +26,7 @@ in
 
       hardwareClockInLocalTime = mkOption {
         default = false;
+        type = types.bool;
         description = "If set, keep the hardware clock in local time instead of UTC.";
       };
 

From 56fbeb7a93ccec533316a685e2495d4178d3ae6c Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 24 May 2015 14:06:12 +0000
Subject: [PATCH 0560/2016] emacs-packages: add automatic meta.homepages to
 builders, cleanup other expressions

Because we can.
---
 .../editors/emacs-modes/nyan-mode/default.nix        |  7 +++----
 pkgs/build-support/emacs/generic.nix                 |  4 ++++
 pkgs/build-support/emacs/melpa.nix                   |  2 +-
 pkgs/top-level/emacs-packages.nix                    | 12 +++---------
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
index d57c591ec1e..e0057fd30ce 100644
--- a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
+++ b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
@@ -1,4 +1,4 @@
-{trivialBuild, lib, fetchFromGitHub}:
+{lib, trivialBuild, fetchFromGitHub}:
 
 trivialBuild rec {
   pname    = "nyan-mode";
@@ -23,9 +23,8 @@ trivialBuild rec {
     cp -r mus $out
   '';
 
-  meta = with lib; {
+  meta = {
     description = "An analog indicator of the position in the buffer";
-    homepage = https://github.com/TeMPOraL/nyan-mode/;
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix
index be81e93e32a..6fd630b13f4 100644
--- a/pkgs/build-support/emacs/generic.nix
+++ b/pkgs/build-support/emacs/generic.nix
@@ -16,10 +16,14 @@ with lib;
 }@args:
 
 let
+
   defaultMeta = {
     broken = false;
     platforms = emacs.meta.platforms;
+  } // optionalAttrs ((args.src.meta.homepage or "") != "") {
+    homepage = args.src.meta.homepage;
   };
+
 in
 
 stdenv.mkDerivation ({
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index 607a1b4a5ef..5eaa995b412 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -31,7 +31,7 @@ let
   targets = concatStringsSep " " (if files == null then fileSpecs else files);
 
   defaultMeta = {
-    homepage = "http://melpa.org/#/${pname}";
+    homepage = args.src.meta.homepage or "http://melpa.org/#/${pname}";
   };
 
 in
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 5982a9f5ce7..a8cce92c1bc 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -127,7 +127,6 @@ let self = _self // overrides;
         mode which displays current match and total matches information
         in the mode-line in various search mode.
       '';
-      homepage = https://github.com/syohex/emacs-anzu/;
       license = gpl3Plus;
     };
   };
@@ -194,7 +193,6 @@ let self = _self // overrides;
       description = "Auto-complete extension for Emacs";
       homepage = http://cx4a.org/software/auto-complete/;
       license = gpl3Plus;
-      platforms = lib.platforms.all;
     };
   };
 
@@ -235,7 +233,6 @@ let self = _self // overrides;
     };
     meta = {
       description = "Interactively insert items from Emacs kill-ring";
-      homepage = https://github.com/browse-kill-ring/browse-kill-ring/;
       license = gpl2Plus;
     };
   };
@@ -251,7 +248,6 @@ let self = _self // overrides;
     };
     meta = {
       description = "Mouseable text in Emacs";
-      homepage = "https://github.com/rolandwalker/button-lock";
       license  = bsd2;
     };
   };
@@ -355,7 +351,6 @@ let self = _self // overrides;
         The API and implementations were translated from JSDeferred (by cho45)
          and Mochikit.Async (by Bob Ippolito) in JavaScript.
       '';
-      homepage =  https://github.com/kiwanami/emacs-deferred;
       license = gpl3Plus;
     };
   };
@@ -770,7 +765,6 @@ let self = _self // overrides;
     };
     meta = {
       description = "Does what you expected ido-everywhere to do in Emacs";
-      homepage = https://github.com/DarwinAwardWinner/ido-ubiquitous/;
       license = gpl3Plus;
     };
   };
@@ -949,7 +943,9 @@ let self = _self // overrides;
     };
   };
 
-  nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {};
+  nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {
+    inherit lib;
+  };
 
   org-plus-contrib = melpaBuild rec {
     pname   = "org-plus-contrib";
@@ -1211,7 +1207,6 @@ let self = _self // overrides;
     };
     meta = {
       description = "M-x enhancement for Emacs build on top of Ido";
-      homepage = https://github.com/nonsequitur/smex/;
       license = emacs.meta.license; # should be "same as Emacs"
     };
   };
@@ -1224,7 +1219,6 @@ let self = _self // overrides;
     fileSpecs = [ "elisp/*.el" ];
 
     meta = {
-      homepage = "https://github.com/chrisdone/structured-haskell-mode";
       description = "Structured editing Emacs mode for Haskell";
       license = bsd3;
       platforms = external.structured-haskell-mode.meta.platforms;

From 6310a9a3be5da3c410526abfc87369846536588a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 31 Jul 2015 04:13:08 +0200
Subject: [PATCH 0561/2016] gnum4: Fix impurity in shell handling

If gnum4 is built outside of a chroot, it will decide to use
/run/current-system/sw/bin/sh as the shell for "syscmd". (It gets this
path via "getconf PATH". Maybe our Glibc shouldn't return that path,
at least not during Nix builds...) If such a build of gnum4 is
subsequently used *inside* a chroot, it won't work because
/run/current-system doesn't exist. So specify an explicit path to the
shell.
---
 pkgs/development/tools/misc/gnum4/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 67688254a40..7174f4b41c3 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "gnum4-1.4.17";
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     && !stdenv.isCygwin                    # XXX: `test-dup2' fails on Cygwin
     && !stdenv.isSunOS;                    # XXX: `test-setlocale2.sh' fails
 
+  configureFlags = "--with-syscmd-shell=${stdenv.shell}";
+
   # Upstream is aware of it; it may be in the next release.
   patches = [ ./s_isdir.patch ];
 

From dd991dd576386acac34779ba3b572d975e831156 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 20 Jul 2015 23:19:56 +0000
Subject: [PATCH 0562/2016] perl-URIIMAP: init at 1.01

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 51bc30ad1c8..12be02bbf5b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10504,6 +10504,15 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [URI TestMore];
   };
 
+  URIIMAP = buildPerlPackage {
+    name = "URI-imap-1.01";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CW/CWEST/URI-imap-1.01.tar.gz;
+      sha256 = "0bdv6mrdijcq46r3lmz801rscs63f8p9qqliy2safd6fds4rj55v";
+    };
+    propagatedBuildInputs = [URI];
+  };
+
   URINested = buildPerlModule {
     name = "URI-Nested-0.10";
     src = fetchurl {

From 2392cf18976b1fc3977af17912ce170ef6972e62 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 20 Jul 2015 23:20:14 +0000
Subject: [PATCH 0563/2016] perl-IMAPClient: init at 0.13

---
 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 12be02bbf5b..bfb16d3720e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4674,6 +4674,16 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  IMAPClient = buildPerlPackage {
+    name = "IMAP-Client-0.13";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CO/CONTEB/IMAP-Client-0.13.tar.gz;
+      sha256 = "15fa4hpw2rqg2iadyz10rnv99hns78wph5qlh3257a3mbfjjyyla";
+    };
+    propagatedBuildInputs = [IOSocketSSL URIIMAP];
+    doCheck = false; # nondeterministic
+  };
+
   ImportInto = buildPerlPackage {
     name = "Import-Into-1.002004";
     src = fetchurl {

From e5a93ab20104430d6a900980c0b6653bb6ccc9a5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 30 Jul 2015 21:24:11 -0500
Subject: [PATCH 0564/2016] Revert "nixos/quassel: Temporarily switch back to
 qt4 since qt5 tls in quassel is broken"

This reverts commit c61d048427719d6e0c131f58825331df0a9d4ccc.
---
 nixos/modules/services/networking/quassel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index 579d62884c7..005eb7bd761 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  quassel = pkgs.kde4.quasselDaemon;
+  quassel = pkgs.quasselDaemon_qt5;
   cfg = config.services.quassel;
   user = if cfg.user != null then cfg.user else "quassel";
 in

From 03b09e7cd4b6c12efeb4c38a0ba5a699dd30b5bb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 31 Jul 2015 04:47:59 +0200
Subject: [PATCH 0565/2016] eid-viewer: 4.0.7-195-tcm406-258907 ->
 4.1.4-v4.1.4-tcm406-270732

---
 pkgs/tools/security/eid-viewer/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix
index 6df5116ad18..ad33975a7d9 100644
--- a/pkgs/tools/security/eid-viewer/default.nix
+++ b/pkgs/tools/security/eid-viewer/default.nix
@@ -2,14 +2,15 @@
 
 let
   # TODO: find out what the version components actually mean, if anything:
-  package = "eid-viewer-4.0.7-195";
-  build = "tcm406-258907";
+  major = "4.1.4-v4.1.4";
+  minor = "tcm406-270732";
+  version = "${major}-${minor}";
 in stdenv.mkDerivation rec {
-  name = "${package}-${build}";
+  name = "eid-viewer-${version}";
 
   src = fetchurl {
-    url = "http://eid.belgium.be/en/binaries/${package}.src.tar_${build}.gz";
-    sha256 = "e263e6751ef7c185e278a607fdc46c207306d9a56c6ddb2ce6f58fb4464a2893";
+    url = "http://eid.belgium.be/en/binaries/eid-viewer-${major}.src.tar_${minor}.gz";
+    sha256 = "06kda45y7c3wvvqby153zcasgz4jibjypv8gvfwvrwvn4ag2z934";
   };
 
   buildInputs = [ jre pcsclite ];
@@ -32,6 +33,7 @@ in stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Belgian electronic identity card (eID) viewer";
     homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
     license = licenses.lgpl3;

From 6c14111c9df6328374dced088d9fe45b8f693cf3 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Tue, 21 Jul 2015 18:24:31 -0700
Subject: [PATCH 0566/2016] entr: init at 3.2

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

diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
new file mode 100644
index 00000000000..8770a585887
--- /dev/null
+++ b/pkgs/tools/misc/entr/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, coreutils, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "entr-${version}";
+  version = "3.2";
+
+  src = fetchurl {
+    url = "http://entrproject.org/code/${name}.tar.gz";
+    sha256 = "0ikigpfzyjmr8j6snwlvxzqamrjbhlv78m8w1h0h7kzczc5f1vmi";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile.bsd --replace /bin/echo echo
+    substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat
+    substituteInPlace entr.c --replace /usr/bin/clear ${ncurses}/bin/clear
+    substituteInPlace entr.1 --replace /bin/cat cat
+    substituteInPlace entr.1 --replace /usr/bin/clear clear
+  '';
+  dontAddPrefix = true;
+  doCheck = true;
+  checkTarget = "test";
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    homepage = http://entrproject.org/;
+    description = "Run arbitrary commands when files change.";
+
+    license = stdenv.lib.licenses.isc;
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14f98fd8dd0..a0a957ef55f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1415,6 +1415,8 @@ let
 
   enscript = callPackage ../tools/text/enscript { };
 
+  entr = callPackage ../tools/misc/entr { };
+
   eplot = callPackage ../tools/graphics/eplot { };
 
   ethtool = callPackage ../tools/misc/ethtool { };

From 1fb1360ae2508c1ffe9b858fb13be8548a40b429 Mon Sep 17 00:00:00 2001
From: Christian Theune <christian@theune.cc>
Date: Fri, 31 Jul 2015 06:38:28 +0000
Subject: [PATCH 0567/2016] virtualbox: place mount.vboxsf in bin/ instead of
 sbin/

The mount tools aren't looking in sbin/ any longer.
---
 .../virtualization/virtualbox/guest-additions/default.nix      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index b56e80eb3b6..ac447fd50d3 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -87,8 +87,9 @@ stdenv.mkDerivation {
     sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all
 
     # Install binaries
+    mkdir -p $out/bin
+    install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf
     mkdir -p $out/sbin
-    install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/sbin/mount.vboxsf
     install -m 755 sbin/VBoxService $out/sbin
 
     mkdir -p $out/bin

From 47bb91194b251f54cf3ad48e62a828cfc4530d1c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 31 Jul 2015 13:41:43 +0300
Subject: [PATCH 0568/2016] mumble: use our celt library

---
 pkgs/applications/networking/mumble/default.nix | 8 +++++---
 pkgs/top-level/all-packages.nix                 | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index aececbb6130..afe27eb3814 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig
-, avahi, boost, libopus, libsndfile, protobuf, qt4, speex
+, avahi, boost, libopus, celt, libsndfile, protobuf, qt4, speex
 , jackSupport ? false, libjack2 ? null
 , speechdSupport ? false, speechd ? null
 , pulseSupport ? false, libpulseaudio ? null
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     "CONFIG+=no-update"
     "CONFIG+=no-server"
     "CONFIG+=no-embed-qt-translations"
-    "CONFIG+=bundled-celt"
+    "CONFIG+=no-bundled-celt"
     "CONFIG+=no-bundled-opus"
     "CONFIG+=no-bundled-speex"
   ] ++ optional (!speechdSupport) "CONFIG+=no-speechd"
@@ -43,7 +43,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ avahi boost libopus libsndfile protobuf qt4 speex ]
+  NIX_CFLAGS_COMPILE = [ "-I${celt}/include/celt" ];
+
+  buildInputs = [ avahi boost libopus celt libsndfile protobuf qt4 speex ]
     ++ optional jackSupport libjack2
     ++ optional speechdSupport speechd
     ++ optional pulseSupport libpulseaudio;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6bc69da5f28..a1608345621 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12124,6 +12124,7 @@ let
     avahi = avahi.override {
       withLibdnssdCompat = true;
     };
+    celt = celt_0_7;
     jackSupport = config.mumble.jackSupport or false;
     speechdSupport = config.mumble.speechdSupport or false;
     pulseSupport = config.pulseaudio or false;

From 16aadf2d79025de6a9888a81991909859c4a2f91 Mon Sep 17 00:00:00 2001
From: Anton Fedotov <ad.fedotov@gmail.com>
Date: Wed, 29 Jul 2015 12:03:39 +0300
Subject: [PATCH 0569/2016] ccache: create symlinks to gcc utils in
 ccache-links bin directory

---
 pkgs/development/tools/misc/ccache/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 0762d175e89..f41969ebb43 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -42,6 +42,11 @@ stdenv.mkDerivation {
         EOF
           chmod +x $out/bin/g++
         fi
+        for executable in $(ls ${gcc.cc}/bin); do
+          if [ ! -x "$out/bin/$executable" ]; then
+            ln -s ${gcc.cc}/bin/$executable $out/bin/$executable
+          fi
+        done
       '');
   };
 

From 9fdb7edae34839738b2c41ad086a0418cce5b943 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 31 Jul 2015 13:28:56 +0000
Subject: [PATCH 0570/2016] gdm 3.16: share some tests

---
 pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
index 83642f1afe6..51b67afb01f 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
@@ -3,23 +3,24 @@
 , gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  name = "gdm-${gnome3.version}.0";
+  name = "gdm-${gnome3.version}.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0qg2qxlfdvi1081r8bbid5hg7vqlpm91996ck2z7fq6kczy4hvdv";
+    sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3";
   };
 
-  # Only needed to make it build
   preConfigure = ''
     substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
     substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
     substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
     substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
+    sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in
  '';
 
   configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth"
-                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+                     "--with-initial-vt=10" ];
 
   buildInputs = [ pkgconfig glib itstool libxml2 intltool
                   accountsservice gnome3.dconf systemd

From adfd0c78309fe0ccd651c592a5f673b7bfabb2c0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 31 Jul 2015 13:28:37 +0000
Subject: [PATCH 0571/2016] nautilus: 3.16.1 -> 3.16.2

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

diff --git a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
index a4e94db0b74..0e732b60748 100644
--- a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
@@ -3,11 +3,11 @@
 , libnotify, makeWrapper, exempi, librsvg, tracker }:
 
 stdenv.mkDerivation rec {
-  name = "nautilus-${gnome3.version}.1";
+  name = "nautilus-${gnome3.version}.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/nautilus/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0y83adhfaq4ns01rdkqmrvdwj0ch2pb10hl43as98kqqzm0qxs3y";
+    sha256 = "13s785kzk68xf4gdj0inz9k2hy06ll598w42141svdj77bdcsziy";
   };
 
   buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg

From 5cd5c399153703ba50e6d9e6e04767871b400f6f Mon Sep 17 00:00:00 2001
From: Oliver Dunkl <oliver.dunkl@gmail.com>
Date: Thu, 30 Jul 2015 21:16:50 +0200
Subject: [PATCH 0572/2016] python-packages: mps-youtube init at 0.2.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d2c83016dca..ec7f1db41c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16821,4 +16821,27 @@ let
     };
   };
 
+  mps-youtube = buildPythonPackage rec {
+    name = "mps-youtube-${version}";
+    version = "0.2.5";
+
+    disabled = (!isPy3k);
+
+    src = pkgs.fetchFromGitHub {
+      owner = "mps-youtube";
+      repo = "mps-youtube";
+      rev = "7e457d2b4700387b88a3c96579e13cb76ca1f06b";
+      sha256 = "1811vlhgfi4rasjfsfdl7x174s75zk3x08p2z05wfcvinflfgxly";
+    };
+
+    propagatedBuildInputs = with self; [ pafy ];
+
+    meta = with stdenv.lib; {
+      description = "Terminal based YouTube player and downloader";
+      homepage = http://github.com/np1/mps-youtube;
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ odi ];
+    };
+  };
+
 }; in pythonPackages

From eb4a88d8fd27cbda512c8728c797ef2b13a91ade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 31 Jul 2015 15:20:06 +0200
Subject: [PATCH 0573/2016] glibc-locales: check that all we build is supported

Until now, if e.g. the user passed "en_US.UTF-8" instead of "en_US.UTF-8/UTF-8",
the locales would be generated without failing but wouldn't work well.
Now we guard against such mistakes. Real life examples:
https://github.com/fish-shell/fish-shell/issues/1927
---
 pkgs/development/libraries/glibc/locales.nix | 21 +++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix
index 5d6e678bfe6..cbf7af22cac 100644
--- a/pkgs/development/libraries/glibc/locales.nix
+++ b/pkgs/development/libraries/glibc/locales.nix
@@ -29,10 +29,25 @@ build null {
 
       # Hack to allow building of the locales (needed since glibc-2.12)
       sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile
+    ''
+      + stdenv.lib.optionalString (!allLocales) ''
+      # Check that all locales to be built are supported
+      echo -n '${stdenv.lib.concatMapStrings (s: s + " \\\n") locales}' \
+        | sort > locales-to-build.txt
+      cat ../glibc-2*/localedata/SUPPORTED | grep ' \\' \
+        | sort > locales-supported.txt
+      comm -13 locales-supported.txt locales-to-build.txt \
+        > locales-unsupported.txt
+      if [[ $(wc -c locales-unsupported.txt) != "0 locales-unsupported.txt" ]]; then
+        cat locales-supported.txt
+        echo "Error: unsupported locales detected:"
+        cat locales-unsupported.txt
+        echo "You should choose from the list above the error."
+        false
+      fi
 
-      ${if allLocales then "" else
-          "echo SUPPORTED-LOCALES=\"${toString locales}\" > ../glibc-2*/localedata/SUPPORTED"}
-
+      echo SUPPORTED-LOCALES='${toString locales}' > ../glibc-2*/localedata/SUPPORTED
+    '' + ''
       make localedata/install-locales \
           localedir=$out/lib/locale \
     '';

From 831397f13696a2f4cd82a73193dbe048d0a5d116 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 31 Jul 2015 13:42:18 +0000
Subject: [PATCH 0574/2016] suds: add python package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d2c83016dca..ee93f2a8191 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16820,5 +16820,20 @@ let
       maintainers = with maintainers; [ odi ];
     };
   };
+  
+  suds = buildPythonPackage rec {
+    name = "suds-0.4";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz";
+      md5 = "b7502de662341ed7275b673e6bd73191";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Lightweight SOAP client";
+      homepage = https://fedorahosted.org/suds;
+      license = licenses.lgpl3Plus;
+    };
+  };
 
 }; in pythonPackages

From 09b611ee8efc3a2b1ee2c8a464ff590c47de5799 Mon Sep 17 00:00:00 2001
From: Anton Fedotov <ad.fedotov@gmail.com>
Date: Fri, 31 Jul 2015 16:58:03 +0300
Subject: [PATCH 0575/2016] ccache: set attribute isGNU = true

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

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 0762d175e89..32a783cef8f 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   passthru = {
     # A derivation that provides gcc and g++ commands, but that
     # will end up calling ccache for the given cacheDir
-    links = extraConfig : (runCommand "ccache-links" { passthru.gcc = gcc; }
+    links = extraConfig : (runCommand "ccache-links" { passthru.gcc = gcc; passthru.isGNU = true; }
       ''
         mkdir -p $out/bin
         if [ -x "${gcc.cc}/bin/gcc" ]; then

From 0310b484946f3b2434e997655c44687889058ce2 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 31 Jul 2015 16:19:56 +0000
Subject: [PATCH 0576/2016] Add mongodb-tools package as dependency to make
 snapshots and restores work

---
 pkgs/tools/package-management/disnix/dysnomia/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index f79250cf018..275c4b6e61f 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null
+, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null
 , enableApacheWebApplication ? false
 , enableAxis2WebService ? false
 , enableEjabberdDump ? false
@@ -17,7 +17,7 @@ assert enableMySQLDatabase -> mysql != null;
 assert enablePostgreSQLDatabase -> postgresql != null;
 assert enableSubversionRepository -> subversion != null;
 assert enableEjabberdDump -> ejabberd != null;
-assert enableMongoDatabase -> mongodb != null;
+assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);
 
 stdenv.mkDerivation {
   name = "dysnomia-0.4";
@@ -45,7 +45,8 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional enableMySQLDatabase mysql.out
     ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
     ++ stdenv.lib.optional enableSubversionRepository subversion
-    ++ stdenv.lib.optional enableMongoDatabase mongodb;
+    ++ stdenv.lib.optional enableMongoDatabase mongodb
+    ++ stdenv.lib.optional enableMongoDatabase mongodb-tools;
 
   meta = {
     description = "Automated deployment of mutable components and services for Disnix";

From f769593e327db1fb88222c9d475cfe58b32a09f7 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Fri, 31 Jul 2015 21:20:19 +0300
Subject: [PATCH 0577/2016] minecraft-server: 1.8.1 -> 1.8.8

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

diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index a30c0e17489..82f826556f5 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "minecraft-server-${version}";
-  version = "1.8.1";
+  version = "1.8.8";
 
   src  = fetchurl {
     url    = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
-    sha256 = "0icqkcj28l69p618vh0aah9cnvpwgvwsqlw1n5cph23q38d5lpzg";
+    sha256 = "07pkdb8cnfnn8zywnhplpcdh9lrxdx8nmsgjarplf2akvhhggbir";
   };
 
   installPhase = ''

From 7024b4dc62c8f212150f791bf94ff3202bd7c4e2 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 29 Jul 2015 10:29:36 -0700
Subject: [PATCH 0578/2016] add Darwin's flavor of lsof

---
 pkgs/development/tools/misc/lsof/default.nix  |  2 ++
 .../darwin/apple-source-releases/default.nix  |  1 +
 .../apple-source-releases/lsof/default.nix    | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/lsof/default.nix

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index f7feeca5d9d..c17c2d73e5f 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
     cp lsof $out/bin
   '';
 
+  isBroken = stdenv.isDarwin;
+
   meta = {
     homepage = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/;
     description = "A tool to list open files";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index f29a2b5b911..e53637ee148 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -78,6 +78,7 @@ let
     Libsystem       = applePackage "Libsystem"         "1197.1.1"    "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {};
     libutil         = applePackage "libutil"           "38"          "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {};
     libunwind       = applePackage "libunwind"         "35.3"        "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {};
+    lsof            = applePackage "lsof"              "53"          "0ylzds2rhq5v8rddh0dgpcndsp9n3slfp30wsbl5fmsch7a5356j" {};
     mDNSResponder   = applePackage "mDNSResponder"     "522.92.1"    "1cp87qda1s7brriv413i71yggm8yqfwv64vknrnqv24fcb8hzbmy" {};
     objc4           = applePackage "objc4"             "551.1"       "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};
     objc4_pure      = applePackage "objc4/pure.nix"    "551.1"       "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};
diff --git a/pkgs/os-specific/darwin/apple-source-releases/lsof/default.nix b/pkgs/os-specific/darwin/apple-source-releases/lsof/default.nix
new file mode 100644
index 00000000000..23506f5c217
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/lsof/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, appleDerivation, ncurses }:
+
+appleDerivation {
+  buildInputs = [ ncurses ];
+
+  postUnpack = ''
+    sourceRoot="$sourceRoot/lsof"
+  '';
+
+  prePatch = ''
+    mv Configure configure
+    substituteInPlace configure \
+      --replace '`which make`' "$(type -P make)" \
+      --replace /usr/include "${stdenv.libc}/include" \
+      --replace -lcurses -lncurses
+  '';
+
+  dontAddPrefix = true;
+
+  configureFlags = [ "-n" "darwin" ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/man/man8
+    cp lsof.8 $out/man/man8/
+    cp lsof $out/bin
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c75b65cde6..7bbca479b1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5607,7 +5607,9 @@ let
 
   libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { };
 
-  lsof = callPackage ../development/tools/misc/lsof { };
+  lsof = if stdenv.isDarwin
+    then darwin.lsof
+    else callPackage ../development/tools/misc/lsof { };
 
   ltrace = callPackage ../development/tools/misc/ltrace { };
 

From 4a495cfbab2b3ab9ae8219ef1812c766bf27b01e Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 30 Jul 2015 16:17:08 -0700
Subject: [PATCH 0579/2016] build gcc-4.9 on darwin

---
 .../development/compilers/gcc/4.9/default.nix | 29 +++++++------------
 pkgs/development/compilers/gcc/builder.sh     |  7 +++--
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index cf67d880a2c..7e6c4a5fe4f 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -32,7 +32,7 @@
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
-, gnused ? null
+, CF ? null
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -47,8 +47,8 @@ assert cloog != null -> isl != null;
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
-# Make sure we get GNU sed.
-assert stdenv.isDarwin -> gnused != null;
+# Make sure we get CoreFoundation
+assert stdenv.isDarwin -> CF != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
@@ -290,10 +290,6 @@ stdenv.mkDerivation ({
     ++ (optionals (cross != null) [binutilsCross])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
-
-    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
-    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
-    ++ (optional stdenv.isDarwin gnused)
     ;
 
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
@@ -304,14 +300,11 @@ stdenv.mkDerivation ({
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
     export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
-      configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
-      makeFlagsArray+=( \
-       CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
-       CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
-       FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
-      )
-    fi
+    configureFlagsArray+=(
+      --with-sysroot="${stdenv.libc}"
+      --with-native-system-header-dir=/include
+      CFLAGS_FOR_BUILD=
+    )
   '';
 
   dontDisableStatic = true;
@@ -480,10 +473,10 @@ stdenv.mkDerivation ({
                                           ++ optionals javaAwtGtk [ gmp mpfr ]
                                           ++ optional (libpthread != null) libpthread)));
 
-  EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null
+  extraFlags =
+    (if cross != null && libcCross != null
     then "-idirafter ${libcCross}/include"
-    else null;
+    else "") + optionalString stdenv.isDarwin " -F${CF}/Library/Frameworks";
 
   EXTRA_TARGET_LDFLAGS =
     if cross != null && libcCross != null
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index dd77c67a023..ee38fadf418 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -23,8 +23,11 @@ if test "$noSysDirs" = "1"; then
 
         # Figure out what extra flags to pass to the gcc compilers
         # being generated to make sure that they use our glibc.
-        extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)"
-        extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"
+        extraFlags="$(cat $NIX_CC/nix-support/libc-cflags) ${extraFlags}"
+        extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags)"
+        if [ -e "$NIX_CC/nix-support/libc-ldflags-before" ]; then
+          extraLDFlags+=" $(cat $NIX_CC/nix-support/libc-ldflags-before)"
+        fi
 
         # Use *real* header files, otherwise a limits.h is generated
         # that does not include Glibc's limits.h (notably missing
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7bbca479b1a..1ed60e94358 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3849,6 +3849,8 @@ let
     isl = isl_0_11;
 
     cloog = cloog_0_18_0;
+
+    inherit (darwin) CF;
   }));
 
   gcc5 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5 {

From 46ab7db108468544f90d74aa1d47b75b23d07727 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 31 Jul 2015 11:35:35 -0700
Subject: [PATCH 0580/2016] remove useless CFLAGS_FOR_BUILD from configure
 flags in gcc

---
 pkgs/development/compilers/gcc/4.9/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 7e6c4a5fe4f..1e27546af63 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -303,7 +303,6 @@ stdenv.mkDerivation ({
     configureFlagsArray+=(
       --with-sysroot="${stdenv.libc}"
       --with-native-system-header-dir=/include
-      CFLAGS_FOR_BUILD=
     )
   '';
 

From fc155f74d6752bb6af955ff2be2fa2fa22fb40e0 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Fri, 31 Jul 2015 19:29:29 +0000
Subject: [PATCH 0581/2016] tortoisehg: init at 3.4.2

---
 .../version-management/tortoisehg/default.nix | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/version-management/tortoisehg/default.nix

diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
new file mode 100644
index 00000000000..0c5aec00405
--- /dev/null
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -0,0 +1,36 @@
+{ pkgs, lib, mercurial, pyPackages ? pkgs.python27Packages }:
+
+pkgs.buildPythonPackage rec {
+    name = "tortoisehg-${version}";
+    version = "3.4.2";
+    namePrefix = "";
+
+    src = pkgs.fetchurl {
+      url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
+      sha256 = "18a587c8fybfjxbcj8i2smypxy7vfzmmrzibs74n3zy6dlb949nj";
+    };
+
+    pythonPath = [ pkgs.pyqt4 mercurial ]
+       ++ (with pyPackages; [qscintilla iniparse]);
+
+    propagatedBuildInputs = with pyPackages; [ qscintilla iniparse ];
+    
+    doCheck = false;
+
+    postUnpack = ''
+     substituteInPlace $sourceRoot/setup.py \
+       --replace "/usr/share/" "$out/share/"
+    '';
+
+    postInstall = ''
+     ln -s $out/bin/thg $out/bin/tortoisehg     #convenient alias
+    '';
+
+    meta = {
+      description = "Qt based graphical tool for working with Mercurial";
+      homepage = http://tortoisehg.bitbucket.org/;
+      license = lib.licenses.gpl2;
+      platforms = lib.platforms.linux;
+      maintainers = [ "abcz2.uprola@gmail.com" ];
+    };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b5d933c96d..dadaeeb5e55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12858,6 +12858,8 @@ let
     wrapPython = pythonPackages.wrapPython;
   };
 
+  tortoisehg = callPackage ../applications/version-management/tortoisehg { };
+
   toxic = callPackage ../applications/networking/instant-messengers/toxic { };
 
   transcode = callPackage ../applications/audio/transcode { };

From 40061f66ce03bb6dcab62b27b3bdeb0450a09850 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Fri, 31 Jul 2015 19:57:54 +0000
Subject: [PATCH 0582/2016] mercurial: bump 3.3.3 -> 3.4.2

---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 12f3c8f11d8..5026efb7175 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -3,7 +3,7 @@
 , ApplicationServices }:
 
 let
-  version = "3.3.3";
+  version = "3.4.2";
   name = "mercurial-${version}";
 in
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "04xfzwb7jabzsfv2r18c3w6vwag7cjrl79xzg5i3mbyb1mzkcid4";
+    sha256 = "1kcfznv990mj30y4yk59hz4wkd3050h0hg7iib69w53nhi50xjfw";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git

From a4e03fdc668ffe29e377281f37c405fb08dbd12f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 31 Jul 2015 15:38:58 +0200
Subject: [PATCH 0583/2016] python-packages: click 3.3 -> 4.1 (redux)

This reverts:
  commit 389a0bf6cc0ca99cff3376648599285ec817b0b3
  commit 083ff50289fc6b83b37f1318ba61a0e6a1d0349b

The nox-review failures were caused by a transient GitHub glitch that
merely happened to crash in click.
---
 pkgs/top-level/python-packages.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ee93f2a8191..3539d30caf3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1884,11 +1884,11 @@ let
   };
 
   click = buildPythonPackage rec {
-    name = "click-3.3";
+    name = "click-4.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
-      sha256 = "1rfn8ml80rw3hkgpm1an5p3vdyhh7hzx4zynr8dhfl7bsw28r77p";
+      sha256 = "1n4fvxpgbna83g6daarscljwpbarr45qfalh9hqla8ayy84ysfg3";
     };
 
     meta = {
@@ -1903,17 +1903,6 @@ let
     };
   };
 
-  click_4_1 = buildPythonPackage rec {
-    name = "click-4.1";
-
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
-      sha256 = "1n4fvxpgbna83g6daarscljwpbarr45qfalh9hqla8ayy84ysfg3";
-    };
-
-    inherit (self.click) meta;
-  };
-
   clepy = buildPythonPackage rec {
     name = "clepy-0.3.20";
 

From f4502e650b5287257be45b61e5fde5f2c4bc0431 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 31 Jul 2015 16:08:10 -0700
Subject: [PATCH 0584/2016] shout: init at 0.51.1

Shout is an IRC client with a nice web interface.
---
 .../networking/irc/shout/default.nix          |   49 +
 .../networking/irc/shout/package.nix          | 5049 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |    2 +
 3 files changed, 5100 insertions(+)
 create mode 100644 pkgs/applications/networking/irc/shout/default.nix
 create mode 100644 pkgs/applications/networking/irc/shout/package.nix

diff --git a/pkgs/applications/networking/irc/shout/default.nix b/pkgs/applications/networking/irc/shout/default.nix
new file mode 100644
index 00000000000..9d3e3ba449c
--- /dev/null
+++ b/pkgs/applications/networking/irc/shout/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, callPackage, python, utillinux }:
+
+with stdenv.lib;
+
+let
+  nodePackages = callPackage (import ../../../../top-level/node-packages.nix) {
+    neededNatives = [ python ] ++ optional (stdenv.isLinux) utillinux;
+    self = nodePackages;
+    generated = ./package.nix;
+  };
+
+in nodePackages.buildNodePackage rec {
+  name = "shout-${version}";
+  version = "0.51.1";
+
+  src = fetchFromGitHub {
+    owner = "erming";
+    repo = "shout";
+    rev = "2cee0ea6ef5ee51de0190332f976934b55bbc8e4";
+    sha256 = "1kci1qha1csb9sqb4ig487q612hgdn5lycbcpad7m9r6chn835qg";
+  };
+
+  buildInputs = nodePackages.nativeDeps."shout" or [];
+
+  deps = [
+    nodePackages.by-spec."bcrypt-nodejs"."0.0.3"
+    nodePackages.by-spec."cheerio"."^0.17.0"
+    nodePackages.by-spec."commander"."^2.3.0"
+    nodePackages.by-spec."event-stream"."^3.1.7"
+    nodePackages.by-spec."express"."^4.9.5"
+    nodePackages.by-spec."lodash"."~2.4.1"
+    nodePackages.by-spec."mkdirp"."^0.5.0"
+    nodePackages.by-spec."moment"."~2.7.0"
+    nodePackages.by-spec."read"."^1.0.5"
+    nodePackages.by-spec."request"."^2.51.0"
+    nodePackages.by-spec."slate-irc"."~0.7.3"
+    nodePackages.by-spec."socket.io"."~1.0.6"
+  ];
+
+  peerDependencies = [];
+
+  meta = {
+    description = "Web IRC client that you host on your own server";
+    license = licenses.mit;
+    homepage = http://shout-irc.com/;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/networking/irc/shout/package.nix b/pkgs/applications/networking/irc/shout/package.nix
new file mode 100644
index 00000000000..cd9677e1ccc
--- /dev/null
+++ b/pkgs/applications/networking/irc/shout/package.nix
@@ -0,0 +1,5049 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."CSSselect"."~0.4.0" =
+    self.by-version."CSSselect"."0.4.1";
+  by-version."CSSselect"."0.4.1" = self.buildNodePackage {
+    name = "CSSselect-0.4.1";
+    version = "0.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz";
+      name = "CSSselect-0.4.1.tgz";
+      sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2";
+    };
+    deps = {
+      "CSSwhat-0.4.7" = self.by-version."CSSwhat"."0.4.7";
+      "domutils-1.4.3" = self.by-version."domutils"."1.4.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."CSSwhat"."0.4" =
+    self.by-version."CSSwhat"."0.4.7";
+  by-version."CSSwhat"."0.4.7" = self.buildNodePackage {
+    name = "CSSwhat-0.4.7";
+    version = "0.4.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz";
+      name = "CSSwhat-0.4.7.tgz";
+      sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."abbrev"."1" =
+    self.by-version."abbrev"."1.0.7";
+  by-version."abbrev"."1.0.7" = self.buildNodePackage {
+    name = "abbrev-1.0.7";
+    version = "1.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz";
+      name = "abbrev-1.0.7.tgz";
+      sha1 = "5b6035b2ee9d4fb5cf859f08a9be81b208491843";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."accepts"."~1.2.10" =
+    self.by-version."accepts"."1.2.11";
+  by-version."accepts"."1.2.11" = self.buildNodePackage {
+    name = "accepts-1.2.11";
+    version = "1.2.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/accepts/-/accepts-1.2.11.tgz";
+      name = "accepts-1.2.11.tgz";
+      sha1 = "d341c6e3b420489632f0f4f8d2ad4fd9ddf374e0";
+    };
+    deps = {
+      "mime-types-2.1.3" = self.by-version."mime-types"."2.1.3";
+      "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."after"."0.8.1" =
+    self.by-version."after"."0.8.1";
+  by-version."after"."0.8.1" = self.buildNodePackage {
+    name = "after-0.8.1";
+    version = "0.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/after/-/after-0.8.1.tgz";
+      name = "after-0.8.1.tgz";
+      sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."amdefine".">=0.0.4" =
+    self.by-version."amdefine"."1.0.0";
+  by-version."amdefine"."1.0.0" = self.buildNodePackage {
+    name = "amdefine-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz";
+      name = "amdefine-1.0.0.tgz";
+      sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-regex"."^0.2.0" =
+    self.by-version."ansi-regex"."0.2.1";
+  by-version."ansi-regex"."0.2.1" = self.buildNodePackage {
+    name = "ansi-regex-0.2.1";
+    version = "0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
+      name = "ansi-regex-0.2.1.tgz";
+      sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-regex"."^0.2.1" =
+    self.by-version."ansi-regex"."0.2.1";
+  by-spec."ansi-regex"."^2.0.0" =
+    self.by-version."ansi-regex"."2.0.0";
+  by-version."ansi-regex"."2.0.0" = self.buildNodePackage {
+    name = "ansi-regex-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
+      name = "ansi-regex-2.0.0.tgz";
+      sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-styles"."^1.1.0" =
+    self.by-version."ansi-styles"."1.1.0";
+  by-version."ansi-styles"."1.1.0" = self.buildNodePackage {
+    name = "ansi-styles-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz";
+      name = "ansi-styles-1.1.0.tgz";
+      sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-styles"."^2.1.0" =
+    self.by-version."ansi-styles"."2.1.0";
+  by-version."ansi-styles"."2.1.0" = self.buildNodePackage {
+    name = "ansi-styles-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz";
+      name = "ansi-styles-2.1.0.tgz";
+      sha1 = "990f747146927b559a932bf92959163d60c0d0e2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."argparse"."~ 0.1.11" =
+    self.by-version."argparse"."0.1.16";
+  by-version."argparse"."0.1.16" = self.buildNodePackage {
+    name = "argparse-0.1.16";
+    version = "0.1.16";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
+      name = "argparse-0.1.16.tgz";
+      sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
+    };
+    deps = {
+      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "underscore.string-2.4.0" = self.by-version."underscore.string"."2.4.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."array-flatten"."1.1.0" =
+    self.by-version."array-flatten"."1.1.0";
+  by-version."array-flatten"."1.1.0" = self.buildNodePackage {
+    name = "array-flatten-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz";
+      name = "array-flatten-1.1.0.tgz";
+      sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."arraybuffer.slice"."0.0.6" =
+    self.by-version."arraybuffer.slice"."0.0.6";
+  by-version."arraybuffer.slice"."0.0.6" = self.buildNodePackage {
+    name = "arraybuffer.slice-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz";
+      name = "arraybuffer.slice-0.0.6.tgz";
+      sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."asn1"."0.1.11" =
+    self.by-version."asn1"."0.1.11";
+  by-version."asn1"."0.1.11" = self.buildNodePackage {
+    name = "asn1-0.1.11";
+    version = "0.1.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+      name = "asn1-0.1.11.tgz";
+      sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."assert-plus"."^0.1.5" =
+    self.by-version."assert-plus"."0.1.5";
+  by-version."assert-plus"."0.1.5" = self.buildNodePackage {
+    name = "assert-plus-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+      name = "assert-plus-0.1.5.tgz";
+      sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."^1.2.1" =
+    self.by-version."async"."1.4.0";
+  by-version."async"."1.4.0" = self.buildNodePackage {
+    name = "async-1.4.0";
+    version = "1.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-1.4.0.tgz";
+      name = "async-1.4.0.tgz";
+      sha1 = "35f86f83c59e0421d099cd9a91d8278fb578c00d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."~0.1.22" =
+    self.by-version."async"."0.1.22";
+  by-version."async"."0.1.22" = self.buildNodePackage {
+    name = "async-0.1.22";
+    version = "0.1.22";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz";
+      name = "async-0.1.22.tgz";
+      sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."~0.2.6" =
+    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.2.9" =
+    self.by-version."async"."0.2.10";
+  by-spec."aws-sign2"."~0.5.0" =
+    self.by-version."aws-sign2"."0.5.0";
+  by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
+    name = "aws-sign2-0.5.0";
+    version = "0.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+      name = "aws-sign2-0.5.0.tgz";
+      sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."base64-arraybuffer"."0.1.2" =
+    self.by-version."base64-arraybuffer"."0.1.2";
+  by-version."base64-arraybuffer"."0.1.2" = self.buildNodePackage {
+    name = "base64-arraybuffer-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
+      name = "base64-arraybuffer-0.1.2.tgz";
+      sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."base64id"."0.1.0" =
+    self.by-version."base64id"."0.1.0";
+  by-version."base64id"."0.1.0" = self.buildNodePackage {
+    name = "base64id-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+      name = "base64id-0.1.0.tgz";
+      sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bcrypt-nodejs"."0.0.3" =
+    self.by-version."bcrypt-nodejs"."0.0.3";
+  by-version."bcrypt-nodejs"."0.0.3" = self.buildNodePackage {
+    name = "bcrypt-nodejs-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bcrypt-nodejs/-/bcrypt-nodejs-0.0.3.tgz";
+      name = "bcrypt-nodejs-0.0.3.tgz";
+      sha1 = "c60917f26dc235661566c681061c303c2b28842b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "bcrypt-nodejs" = self.by-version."bcrypt-nodejs"."0.0.3";
+  by-spec."better-assert"."~1.0.0" =
+    self.by-version."better-assert"."1.0.2";
+  by-version."better-assert"."1.0.2" = self.buildNodePackage {
+    name = "better-assert-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz";
+      name = "better-assert-1.0.2.tgz";
+      sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
+    };
+    deps = {
+      "callsite-1.0.0" = self.by-version."callsite"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bl"."~1.0.0" =
+    self.by-version."bl"."1.0.0";
+  by-version."bl"."1.0.0" = self.buildNodePackage {
+    name = "bl-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bl/-/bl-1.0.0.tgz";
+      name = "bl-1.0.0.tgz";
+      sha1 = "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5";
+    };
+    deps = {
+      "readable-stream-2.0.2" = self.by-version."readable-stream"."2.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."blob"."0.0.2" =
+    self.by-version."blob"."0.0.2";
+  by-version."blob"."0.0.2" = self.buildNodePackage {
+    name = "blob-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/blob/-/blob-0.0.2.tgz";
+      name = "blob-0.0.2.tgz";
+      sha1 = "b89562bd6994af95ba1e812155536333aa23cf24";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bluebird"."^2.9.30" =
+    self.by-version."bluebird"."2.9.34";
+  by-version."bluebird"."2.9.34" = self.buildNodePackage {
+    name = "bluebird-2.9.34";
+    version = "2.9.34";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz";
+      name = "bluebird-2.9.34.tgz";
+      sha1 = "2f7b4ec80216328a9fddebdf69c8d4942feff7d8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."boom"."2.x.x" =
+    self.by-version."boom"."2.8.0";
+  by-version."boom"."2.8.0" = self.buildNodePackage {
+    name = "boom-2.8.0";
+    version = "2.8.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/boom/-/boom-2.8.0.tgz";
+      name = "boom-2.8.0.tgz";
+      sha1 = "317bdfd47018fe7dd79b0e9da73efe244119fdf1";
+    };
+    deps = {
+      "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."boom"."^2.8.x" =
+    self.by-version."boom"."2.8.0";
+  by-spec."browserify-zlib"."^0.1.4" =
+    self.by-version."browserify-zlib"."0.1.4";
+  by-version."browserify-zlib"."0.1.4" = self.buildNodePackage {
+    name = "browserify-zlib-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz";
+      name = "browserify-zlib-0.1.4.tgz";
+      sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
+    };
+    deps = {
+      "pako-0.2.7" = self.by-version."pako"."0.2.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."callsite"."1.0.0" =
+    self.by-version."callsite"."1.0.0";
+  by-version."callsite"."1.0.0" = self.buildNodePackage {
+    name = "callsite-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
+      name = "callsite-1.0.0.tgz";
+      sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."camelcase"."^1.0.2" =
+    self.by-version."camelcase"."1.1.0";
+  by-version."camelcase"."1.1.0" = self.buildNodePackage {
+    name = "camelcase-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz";
+      name = "camelcase-1.1.0.tgz";
+      sha1 = "953b25c3bc98671ee59a44cb9d542672da7331b9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."caseless"."~0.11.0" =
+    self.by-version."caseless"."0.11.0";
+  by-version."caseless"."0.11.0" = self.buildNodePackage {
+    name = "caseless-0.11.0";
+    version = "0.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
+      name = "caseless-0.11.0.tgz";
+      sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."chalk"."^0.5.0" =
+    self.by-version."chalk"."0.5.1";
+  by-version."chalk"."0.5.1" = self.buildNodePackage {
+    name = "chalk-0.5.1";
+    version = "0.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
+      name = "chalk-0.5.1.tgz";
+      sha1 = "663b3a648b68b55d04690d49167aa837858f2174";
+    };
+    deps = {
+      "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0";
+      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
+      "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0";
+      "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0";
+      "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."chalk"."^0.5.1" =
+    self.by-version."chalk"."0.5.1";
+  by-spec."chalk"."^1.0.0" =
+    self.by-version."chalk"."1.1.0";
+  by-version."chalk"."1.1.0" = self.buildNodePackage {
+    name = "chalk-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chalk/-/chalk-1.1.0.tgz";
+      name = "chalk-1.1.0.tgz";
+      sha1 = "09b453cec497a75520e4a60ae48214a8700e0921";
+    };
+    deps = {
+      "ansi-styles-2.1.0" = self.by-version."ansi-styles"."2.1.0";
+      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
+      "has-ansi-2.0.0" = self.by-version."has-ansi"."2.0.0";
+      "strip-ansi-3.0.0" = self.by-version."strip-ansi"."3.0.0";
+      "supports-color-2.0.0" = self.by-version."supports-color"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cheerio"."^0.17.0" =
+    self.by-version."cheerio"."0.17.0";
+  by-version."cheerio"."0.17.0" = self.buildNodePackage {
+    name = "cheerio-0.17.0";
+    version = "0.17.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz";
+      name = "cheerio-0.17.0.tgz";
+      sha1 = "fa5ae42cc60121133d296d0b46d983215f7268ea";
+    };
+    deps = {
+      "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1";
+      "entities-1.1.1" = self.by-version."entities"."1.1.1";
+      "htmlparser2-3.7.3" = self.by-version."htmlparser2"."3.7.3";
+      "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "cheerio" = self.by-version."cheerio"."0.17.0";
+  by-spec."coffee-script"."~1.3.3" =
+    self.by-version."coffee-script"."1.3.3";
+  by-version."coffee-script"."1.3.3" = self.buildNodePackage {
+    name = "coffee-script-1.3.3";
+    version = "1.3.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz";
+      name = "coffee-script-1.3.3.tgz";
+      sha1 = "150d6b4cb522894369efed6a2101c20bc7f4a4f4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."colors"."~0.6.2" =
+    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"."^1.0.3" =
+    self.by-version."combined-stream"."1.0.5";
+  by-version."combined-stream"."1.0.5" = self.buildNodePackage {
+    name = "combined-stream-1.0.5";
+    version = "1.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
+      name = "combined-stream-1.0.5.tgz";
+      sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
+    };
+    deps = {
+      "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."combined-stream"."~1.0.1" =
+    self.by-version."combined-stream"."1.0.5";
+  by-spec."commander"."0.6.1" =
+    self.by-version."commander"."0.6.1";
+  by-version."commander"."0.6.1" = self.buildNodePackage {
+    name = "commander-0.6.1";
+    version = "0.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+      name = "commander-0.6.1.tgz";
+      sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."commander"."2.3.0" =
+    self.by-version."commander"."2.3.0";
+  by-version."commander"."2.3.0" = self.buildNodePackage {
+    name = "commander-2.3.0";
+    version = "2.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
+      name = "commander-2.3.0.tgz";
+      sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."commander"."^2.3.0" =
+    self.by-version."commander"."2.8.1";
+  by-version."commander"."2.8.1" = self.buildNodePackage {
+    name = "commander-2.8.1";
+    version = "2.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
+      name = "commander-2.8.1.tgz";
+      sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
+    };
+    deps = {
+      "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "commander" = self.by-version."commander"."2.8.1";
+  by-spec."commander"."^2.8.1" =
+    self.by-version."commander"."2.8.1";
+  by-spec."commander"."~0.6.1" =
+    self.by-version."commander"."0.6.1";
+  by-spec."component-bind"."1.0.0" =
+    self.by-version."component-bind"."1.0.0";
+  by-version."component-bind"."1.0.0" = self.buildNodePackage {
+    name = "component-bind-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
+      name = "component-bind-1.0.0.tgz";
+      sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
+    };
+    deps = {
+    };
+    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."component-inherit"."0.0.3" =
+    self.by-version."component-inherit"."0.0.3";
+  by-version."component-inherit"."0.0.3" = self.buildNodePackage {
+    name = "component-inherit-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
+      name = "component-inherit-0.0.3.tgz";
+      sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."concat-stream"."^1.4.1" =
+    self.by-version."concat-stream"."1.5.0";
+  by-version."concat-stream"."1.5.0" = self.buildNodePackage {
+    name = "concat-stream-1.5.0";
+    version = "1.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz";
+      name = "concat-stream-1.5.0.tgz";
+      sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6";
+      "readable-stream-2.0.2" = self.by-version."readable-stream"."2.0.2";
+    };
+    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."content-type"."~1.0.1" =
+    self.by-version."content-type"."1.0.1";
+  by-version."content-type"."1.0.1" = self.buildNodePackage {
+    name = "content-type-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz";
+      name = "content-type-1.0.1.tgz";
+      sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cookie"."0.1.3" =
+    self.by-version."cookie"."0.1.3";
+  by-version."cookie"."0.1.3" = self.buildNodePackage {
+    name = "cookie-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz";
+      name = "cookie-0.1.3.tgz";
+      sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cookie-signature"."1.0.6" =
+    self.by-version."cookie-signature"."1.0.6";
+  by-version."cookie-signature"."1.0.6" = self.buildNodePackage {
+    name = "cookie-signature-1.0.6";
+    version = "1.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
+      name = "cookie-signature-1.0.6.tgz";
+      sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
+    };
+    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."cryptiles"."2.x.x" =
+    self.by-version."cryptiles"."2.0.4";
+  by-version."cryptiles"."2.0.4" = self.buildNodePackage {
+    name = "cryptiles-2.0.4";
+    version = "2.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz";
+      name = "cryptiles-2.0.4.tgz";
+      sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285";
+    };
+    deps = {
+      "boom-2.8.0" = self.by-version."boom"."2.8.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ctype"."0.5.3" =
+    self.by-version."ctype"."0.5.3";
+  by-version."ctype"."0.5.3" = self.buildNodePackage {
+    name = "ctype-0.5.3";
+    version = "0.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
+      name = "ctype-0.5.3.tgz";
+      sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."dateformat"."1.0.2-1.2.3" =
+    self.by-version."dateformat"."1.0.2-1.2.3";
+  by-version."dateformat"."1.0.2-1.2.3" = self.buildNodePackage {
+    name = "dateformat-1.0.2-1.2.3";
+    version = "1.0.2-1.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
+      name = "dateformat-1.0.2-1.2.3.tgz";
+      sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."*" =
+    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"."0.6.0" =
+    self.by-version."debug"."0.6.0";
+  by-version."debug"."0.6.0" = self.buildNodePackage {
+    name = "debug-0.6.0";
+    version = "0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-0.6.0.tgz";
+      name = "debug-0.6.0.tgz";
+      sha1 = "ce9d5d025d5294b3f0748a494bebaf3c9fd8734f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."0.7.4" =
+    self.by-version."debug"."0.7.4";
+  by-version."debug"."0.7.4" = self.buildNodePackage {
+    name = "debug-0.7.4";
+    version = "0.7.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
+      name = "debug-0.7.4.tgz";
+      sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."2.0.0" =
+    self.by-version."debug"."2.0.0";
+  by-version."debug"."2.0.0" = self.buildNodePackage {
+    name = "debug-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
+      name = "debug-2.0.0.tgz";
+      sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef";
+    };
+    deps = {
+      "ms-0.6.2" = self.by-version."ms"."0.6.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."~0.7.0" =
+    self.by-version."debug"."0.7.4";
+  by-spec."debug"."~0.7.2" =
+    self.by-version."debug"."0.7.4";
+  by-spec."debug"."~2.2.0" =
+    self.by-version."debug"."2.2.0";
+  by-spec."decamelize"."^1.0.0" =
+    self.by-version."decamelize"."1.0.0";
+  by-version."decamelize"."1.0.0" = self.buildNodePackage {
+    name = "decamelize-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz";
+      name = "decamelize-1.0.0.tgz";
+      sha1 = "5287122f71691d4505b18ff2258dc400a5b23847";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."delayed-stream"."~1.0.0" =
+    self.by-version."delayed-stream"."1.0.0";
+  by-version."delayed-stream"."1.0.0" = self.buildNodePackage {
+    name = "delayed-stream-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+      name = "delayed-stream-1.0.0.tgz";
+      sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."depd"."~1.0.1" =
+    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."diff"."1.0.8" =
+    self.by-version."diff"."1.0.8";
+  by-version."diff"."1.0.8" = self.buildNodePackage {
+    name = "diff-1.0.8";
+    version = "1.0.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
+      name = "diff-1.0.8.tgz";
+      sha1 = "343276308ec991b7bc82267ed55bc1411f971666";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."dom-serializer"."0" =
+    self.by-version."dom-serializer"."0.1.0";
+  by-version."dom-serializer"."0.1.0" = self.buildNodePackage {
+    name = "dom-serializer-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
+      name = "dom-serializer-0.1.0.tgz";
+      sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
+    };
+    deps = {
+      "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
+      "entities-1.1.1" = self.by-version."entities"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."dom-serializer"."~0.0.0" =
+    self.by-version."dom-serializer"."0.0.1";
+  by-version."dom-serializer"."0.0.1" = self.buildNodePackage {
+    name = "dom-serializer-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz";
+      name = "dom-serializer-0.0.1.tgz";
+      sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf";
+    };
+    deps = {
+      "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
+      "entities-1.1.1" = self.by-version."entities"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."domelementtype"."1" =
+    self.by-version."domelementtype"."1.3.0";
+  by-version."domelementtype"."1.3.0" = self.buildNodePackage {
+    name = "domelementtype-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
+      name = "domelementtype-1.3.0.tgz";
+      sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."domelementtype"."~1.1.1" =
+    self.by-version."domelementtype"."1.1.3";
+  by-version."domelementtype"."1.1.3" = self.buildNodePackage {
+    name = "domelementtype-1.1.3";
+    version = "1.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
+      name = "domelementtype-1.1.3.tgz";
+      sha1 = "bd28773e2642881aec51544924299c5cd822185b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."domhandler"."2.2" =
+    self.by-version."domhandler"."2.2.1";
+  by-version."domhandler"."2.2.1" = self.buildNodePackage {
+    name = "domhandler-2.2.1";
+    version = "2.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz";
+      name = "domhandler-2.2.1.tgz";
+      sha1 = "59df9dcd227e808b365ae73e1f6684ac3d946fc2";
+    };
+    deps = {
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."domutils"."1.4" =
+    self.by-version."domutils"."1.4.3";
+  by-version."domutils"."1.4.3" = self.buildNodePackage {
+    name = "domutils-1.4.3";
+    version = "1.4.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz";
+      name = "domutils-1.4.3.tgz";
+      sha1 = "0865513796c6b306031850e175516baf80b72a6f";
+    };
+    deps = {
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."domutils"."1.5" =
+    self.by-version."domutils"."1.5.1";
+  by-version."domutils"."1.5.1" = self.buildNodePackage {
+    name = "domutils-1.5.1";
+    version = "1.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
+      name = "domutils-1.5.1.tgz";
+      sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
+    };
+    deps = {
+      "dom-serializer-0.1.0" = self.by-version."dom-serializer"."0.1.0";
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  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.1" =
+    self.by-version."ee-first"."1.1.1";
+  by-version."ee-first"."1.1.1" = self.buildNodePackage {
+    name = "ee-first-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz";
+      name = "ee-first-1.1.1.tgz";
+      sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."emitter"."http://github.com/component/emitter/archive/1.0.1.tar.gz" =
+    self.by-version."emitter"."1.0.1";
+  by-version."emitter"."1.0.1" = self.buildNodePackage {
+    name = "emitter-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://github.com/component/emitter/archive/1.0.1.tar.gz";
+      name = "emitter-1.0.1.tgz";
+      sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d";
+    };
+    deps = {
+      "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."engine.io"."1.3.1" =
+    self.by-version."engine.io"."1.3.1";
+  by-version."engine.io"."1.3.1" = self.buildNodePackage {
+    name = "engine.io-1.3.1";
+    version = "1.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/engine.io/-/engine.io-1.3.1.tgz";
+      name = "engine.io-1.3.1.tgz";
+      sha1 = "2d968308fffae5d17f5209b6775246e90d8a705e";
+    };
+    deps = {
+      "debug-0.6.0" = self.by-version."debug"."0.6.0";
+      "ws-0.4.31" = self.by-version."ws"."0.4.31";
+      "engine.io-parser-1.0.6" = self.by-version."engine.io-parser"."1.0.6";
+      "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."engine.io-client"."1.3.1" =
+    self.by-version."engine.io-client"."1.3.1";
+  by-version."engine.io-client"."1.3.1" = self.buildNodePackage {
+    name = "engine.io-client-1.3.1";
+    version = "1.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.3.1.tgz";
+      name = "engine.io-client-1.3.1.tgz";
+      sha1 = "1c5a65d5c5af6d04b44c22c3dbcd95c39ed1c989";
+    };
+    deps = {
+      "has-cors-1.0.3" = self.by-version."has-cors"."1.0.3";
+      "ws-0.4.31" = self.by-version."ws"."0.4.31";
+      "xmlhttprequest-1.5.0" = self.by-version."xmlhttprequest"."1.5.0";
+      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
+      "engine.io-parser-1.0.6" = self.by-version."engine.io-parser"."1.0.6";
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "parseuri-0.0.2" = self.by-version."parseuri"."0.0.2";
+      "parsejson-0.0.1" = self.by-version."parsejson"."0.0.1";
+      "parseqs-0.0.2" = self.by-version."parseqs"."0.0.2";
+      "component-inherit-0.0.3" = self.by-version."component-inherit"."0.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."engine.io-parser"."1.0.6" =
+    self.by-version."engine.io-parser"."1.0.6";
+  by-version."engine.io-parser"."1.0.6" = self.buildNodePackage {
+    name = "engine.io-parser-1.0.6";
+    version = "1.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.0.6.tgz";
+      name = "engine.io-parser-1.0.6.tgz";
+      sha1 = "d38813143a411cb3b914132ab05bf99e6f7a248e";
+    };
+    deps = {
+      "base64-arraybuffer-0.1.2" = self.by-version."base64-arraybuffer"."0.1.2";
+      "after-0.8.1" = self.by-version."after"."0.8.1";
+      "arraybuffer.slice-0.0.6" = self.by-version."arraybuffer.slice"."0.0.6";
+      "blob-0.0.2" = self.by-version."blob"."0.0.2";
+      "utf8-2.0.0" = self.by-version."utf8"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."entities"."1.0" =
+    self.by-version."entities"."1.0.0";
+  by-version."entities"."1.0.0" = self.buildNodePackage {
+    name = "entities-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
+      name = "entities-1.0.0.tgz";
+      sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."entities"."~1.1.1" =
+    self.by-version."entities"."1.1.1";
+  by-version."entities"."1.1.1" = self.buildNodePackage {
+    name = "entities-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
+      name = "entities-1.1.1.tgz";
+      sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."escape-html"."1.0.2" =
+    self.by-version."escape-html"."1.0.2";
+  by-version."escape-html"."1.0.2" = self.buildNodePackage {
+    name = "escape-html-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz";
+      name = "escape-html-1.0.2.tgz";
+      sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."escape-string-regexp"."1.0.2" =
+    self.by-version."escape-string-regexp"."1.0.2";
+  by-version."escape-string-regexp"."1.0.2" = self.buildNodePackage {
+    name = "escape-string-regexp-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz";
+      name = "escape-string-regexp-1.0.2.tgz";
+      sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."escape-string-regexp"."^1.0.0" =
+    self.by-version."escape-string-regexp"."1.0.3";
+  by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage {
+    name = "escape-string-regexp-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz";
+      name = "escape-string-regexp-1.0.3.tgz";
+      sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."escape-string-regexp"."^1.0.2" =
+    self.by-version."escape-string-regexp"."1.0.3";
+  by-spec."esprima"."~ 1.0.2" =
+    self.by-version."esprima"."1.0.4";
+  by-version."esprima"."1.0.4" = self.buildNodePackage {
+    name = "esprima-1.0.4";
+    version = "1.0.4";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
+      name = "esprima-1.0.4.tgz";
+      sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."etag"."~1.7.0" =
+    self.by-version."etag"."1.7.0";
+  by-version."etag"."1.7.0" = self.buildNodePackage {
+    name = "etag-1.7.0";
+    version = "1.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/etag/-/etag-1.7.0.tgz";
+      name = "etag-1.7.0.tgz";
+      sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."event-stream"."^3.1.7" =
+    self.by-version."event-stream"."3.3.1";
+  by-version."event-stream"."3.3.1" = self.buildNodePackage {
+    name = "event-stream-3.3.1";
+    version = "3.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/event-stream/-/event-stream-3.3.1.tgz";
+      name = "event-stream-3.3.1.tgz";
+      sha1 = "b8cf6c00119181e688f335363daa7915ce890bdb";
+    };
+    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 = [ ];
+  };
+  "event-stream" = self.by-version."event-stream"."3.3.1";
+  by-spec."eventemitter2"."~0.4.13" =
+    self.by-version."eventemitter2"."0.4.14";
+  by-version."eventemitter2"."0.4.14" = self.buildNodePackage {
+    name = "eventemitter2-0.4.14";
+    version = "0.4.14";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
+      name = "eventemitter2-0.4.14.tgz";
+      sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."exit"."~0.1.1" =
+    self.by-version."exit"."0.1.2";
+  by-version."exit"."0.1.2" = self.buildNodePackage {
+    name = "exit-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
+      name = "exit-0.1.2.tgz";
+      sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."express"."^4.9.5" =
+    self.by-version."express"."4.13.1";
+  by-version."express"."4.13.1" = self.buildNodePackage {
+    name = "express-4.13.1";
+    version = "4.13.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-4.13.1.tgz";
+      name = "express-4.13.1.tgz";
+      sha1 = "f117aa1d1f6bedbc8de5b6d71fc31a5acd0f63df";
+    };
+    deps = {
+      "accepts-1.2.11" = self.by-version."accepts"."1.2.11";
+      "array-flatten-1.1.0" = self.by-version."array-flatten"."1.1.0";
+      "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
+      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "cookie-0.1.3" = self.by-version."cookie"."0.1.3";
+      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
+      "escape-html-1.0.2" = self.by-version."escape-html"."1.0.2";
+      "etag-1.7.0" = self.by-version."etag"."1.7.0";
+      "finalhandler-0.4.0" = self.by-version."finalhandler"."0.4.0";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
+      "methods-1.1.1" = self.by-version."methods"."1.1.1";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+      "path-to-regexp-0.1.6" = self.by-version."path-to-regexp"."0.1.6";
+      "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8";
+      "qs-4.0.0" = self.by-version."qs"."4.0.0";
+      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "send-0.13.0" = self.by-version."send"."0.13.0";
+      "serve-static-1.10.0" = self.by-version."serve-static"."1.10.0";
+      "type-is-1.6.5" = self.by-version."type-is"."1.6.5";
+      "vary-1.0.1" = self.by-version."vary"."1.0.1";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "express" = self.by-version."express"."4.13.1";
+  by-spec."extend"."~3.0.0" =
+    self.by-version."extend"."3.0.0";
+  by-version."extend"."3.0.0" = self.buildNodePackage {
+    name = "extend-3.0.0";
+    version = "3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
+      name = "extend-3.0.0.tgz";
+      sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."faye-websocket"."~0.4.3" =
+    self.by-version."faye-websocket"."0.4.4";
+  by-version."faye-websocket"."0.4.4" = self.buildNodePackage {
+    name = "faye-websocket-0.4.4";
+    version = "0.4.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz";
+      name = "faye-websocket-0.4.4.tgz";
+      sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."figures"."^1.0.1" =
+    self.by-version."figures"."1.3.5";
+  by-version."figures"."1.3.5" = self.buildNodePackage {
+    name = "figures-1.3.5";
+    version = "1.3.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/figures/-/figures-1.3.5.tgz";
+      name = "figures-1.3.5.tgz";
+      sha1 = "d1a31f4e1d2c2938ecde5c06aa16134cf29f4771";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."finalhandler"."0.4.0" =
+    self.by-version."finalhandler"."0.4.0";
+  by-version."finalhandler"."0.4.0" = self.buildNodePackage {
+    name = "finalhandler-0.4.0";
+    version = "0.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz";
+      name = "finalhandler-0.4.0.tgz";
+      sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "escape-html-1.0.2" = self.by-version."escape-html"."1.0.2";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "unpipe-1.0.0" = self.by-version."unpipe"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."findup-sync"."~0.1.2" =
+    self.by-version."findup-sync"."0.1.3";
+  by-version."findup-sync"."0.1.3" = self.buildNodePackage {
+    name = "findup-sync-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz";
+      name = "findup-sync-0.1.3.tgz";
+      sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683";
+    };
+    deps = {
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."forever-agent"."~0.6.0" =
+    self.by-version."forever-agent"."0.6.1";
+  by-version."forever-agent"."0.6.1" = self.buildNodePackage {
+    name = "forever-agent-0.6.1";
+    version = "0.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+      name = "forever-agent-0.6.1.tgz";
+      sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."form-data"."~1.0.0-rc1" =
+    self.by-version."form-data"."1.0.0-rc2";
+  by-version."form-data"."1.0.0-rc2" = self.buildNodePackage {
+    name = "form-data-1.0.0-rc2";
+    version = "1.0.0-rc2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc2.tgz";
+      name = "form-data-1.0.0-rc2.tgz";
+      sha1 = "5bc9c9b3dd3dec1977b0abf58790192081d95235";
+    };
+    deps = {
+      "async-1.4.0" = self.by-version."async"."1.4.0";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "mime-types-2.1.3" = self.by-version."mime-types"."2.1.3";
+    };
+    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.3.0" =
+    self.by-version."fresh"."0.3.0";
+  by-version."fresh"."0.3.0" = self.buildNodePackage {
+    name = "fresh-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz";
+      name = "fresh-0.3.0.tgz";
+      sha1 = "651f838e22424e7566de161d8358caa199f83d4f";
+    };
+    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."gaze"."~0.5.1" =
+    self.by-version."gaze"."0.5.1";
+  by-version."gaze"."0.5.1" = self.buildNodePackage {
+    name = "gaze-0.5.1";
+    version = "0.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz";
+      name = "gaze-0.5.1.tgz";
+      sha1 = "22e731078ef3e49d1c4ab1115ac091192051824c";
+    };
+    deps = {
+      "globule-0.1.0" = self.by-version."globule"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generate-function"."^2.0.0" =
+    self.by-version."generate-function"."2.0.0";
+  by-version."generate-function"."2.0.0" = self.buildNodePackage {
+    name = "generate-function-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+      name = "generate-function-2.0.0.tgz";
+      sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generate-object-property"."^1.1.0" =
+    self.by-version."generate-object-property"."1.2.0";
+  by-version."generate-object-property"."1.2.0" = self.buildNodePackage {
+    name = "generate-object-property-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
+      name = "generate-object-property-1.2.0.tgz";
+      sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
+    };
+    deps = {
+      "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."getobject"."~0.1.0" =
+    self.by-version."getobject"."0.1.0";
+  by-version."getobject"."0.1.0" = self.buildNodePackage {
+    name = "getobject-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz";
+      name = "getobject-0.1.0.tgz";
+      sha1 = "047a449789fa160d018f5486ed91320b6ec7885c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."glob"."3.2.3" =
+    self.by-version."glob"."3.2.3";
+  by-version."glob"."3.2.3" = self.buildNodePackage {
+    name = "glob-3.2.3";
+    version = "3.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+      name = "glob-3.2.3.tgz";
+      sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
+    };
+    deps = {
+      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."glob"."~3.1.21" =
+    self.by-version."glob"."3.1.21";
+  by-version."glob"."3.1.21" = self.buildNodePackage {
+    name = "glob-3.1.21";
+    version = "3.1.21";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
+      name = "glob-3.1.21.tgz";
+      sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd";
+    };
+    deps = {
+      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+      "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
+      "inherits-1.0.0" = self.by-version."inherits"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."glob"."~3.2.9" =
+    self.by-version."glob"."3.2.11";
+  by-version."glob"."3.2.11" = self.buildNodePackage {
+    name = "glob-3.2.11";
+    version = "3.2.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+      name = "glob-3.2.11.tgz";
+      sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."global"."https://github.com/component/global/archive/v2.0.1.tar.gz" =
+    self.by-version."global"."2.0.1";
+  by-version."global"."2.0.1" = self.buildNodePackage {
+    name = "global-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://github.com/component/global/archive/v2.0.1.tar.gz";
+      name = "global-2.0.1.tgz";
+      sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."globule"."~0.1.0" =
+    self.by-version."globule"."0.1.0";
+  by-version."globule"."0.1.0" = self.buildNodePackage {
+    name = "globule-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
+      name = "globule-0.1.0.tgz";
+      sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
+    };
+    deps = {
+      "lodash-1.0.2" = self.by-version."lodash"."1.0.2";
+      "glob-3.1.21" = self.by-version."glob"."3.1.21";
+      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."graceful-fs"."~1.2.0" =
+    self.by-version."graceful-fs"."1.2.3";
+  by-version."graceful-fs"."1.2.3" = self.buildNodePackage {
+    name = "graceful-fs-1.2.3";
+    version = "1.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+      name = "graceful-fs-1.2.3.tgz";
+      sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."graceful-fs"."~2.0.0" =
+    self.by-version."graceful-fs"."2.0.3";
+  by-version."graceful-fs"."2.0.3" = self.buildNodePackage {
+    name = "graceful-fs-2.0.3";
+    version = "2.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz";
+      name = "graceful-fs-2.0.3.tgz";
+      sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."graceful-readlink".">= 1.0.0" =
+    self.by-version."graceful-readlink"."1.0.1";
+  by-version."graceful-readlink"."1.0.1" = self.buildNodePackage {
+    name = "graceful-readlink-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+      name = "graceful-readlink-1.0.1.tgz";
+      sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."growl"."1.8.1" =
+    self.by-version."growl"."1.8.1";
+  by-version."growl"."1.8.1" = self.buildNodePackage {
+    name = "growl-1.8.1";
+    version = "1.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz";
+      name = "growl-1.8.1.tgz";
+      sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."grunt"."~0.4.0" =
+    self.by-version."grunt"."0.4.5";
+  by-version."grunt"."0.4.5" = self.buildNodePackage {
+    name = "grunt-0.4.5";
+    version = "0.4.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz";
+      name = "grunt-0.4.5.tgz";
+      sha1 = "56937cd5194324adff6d207631832a9d6ba4e7f0";
+    };
+    deps = {
+      "async-0.1.22" = self.by-version."async"."0.1.22";
+      "coffee-script-1.3.3" = self.by-version."coffee-script"."1.3.3";
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+      "dateformat-1.0.2-1.2.3" = self.by-version."dateformat"."1.0.2-1.2.3";
+      "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
+      "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3";
+      "glob-3.1.21" = self.by-version."glob"."3.1.21";
+      "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
+      "iconv-lite-0.2.11" = self.by-version."iconv-lite"."0.2.11";
+      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+      "nopt-1.0.10" = self.by-version."nopt"."1.0.10";
+      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "lodash-0.9.2" = self.by-version."lodash"."0.9.2";
+      "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
+      "js-yaml-2.0.5" = self.by-version."js-yaml"."2.0.5";
+      "exit-0.1.2" = self.by-version."exit"."0.1.2";
+      "getobject-0.1.0" = self.by-version."getobject"."0.1.0";
+      "grunt-legacy-util-0.2.0" = self.by-version."grunt-legacy-util"."0.2.0";
+      "grunt-legacy-log-0.1.2" = self.by-version."grunt-legacy-log"."0.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."grunt"."~0.4.5" =
+    self.by-version."grunt"."0.4.5";
+  "grunt" = self.by-version."grunt"."0.4.5";
+  by-spec."grunt-contrib-uglify"."~0.5.0" =
+    self.by-version."grunt-contrib-uglify"."0.5.1";
+  by-version."grunt-contrib-uglify"."0.5.1" = self.buildNodePackage {
+    name = "grunt-contrib-uglify-0.5.1";
+    version = "0.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.5.1.tgz";
+      name = "grunt-contrib-uglify-0.5.1.tgz";
+      sha1 = "15f0aa5e8e8ba421aea980879ee505bc712b6cde";
+    };
+    deps = {
+      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
+      "maxmin-0.2.2" = self.by-version."maxmin"."0.2.2";
+      "uglify-js-2.4.24" = self.by-version."uglify-js"."2.4.24";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [
+      self.by-version."grunt"."0.4.5"];
+    os = [ ];
+    cpu = [ ];
+  };
+  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.5.1";
+  by-spec."grunt-contrib-watch"."^0.6.1" =
+    self.by-version."grunt-contrib-watch"."0.6.1";
+  by-version."grunt-contrib-watch"."0.6.1" = self.buildNodePackage {
+    name = "grunt-contrib-watch-0.6.1";
+    version = "0.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-0.6.1.tgz";
+      name = "grunt-contrib-watch-0.6.1.tgz";
+      sha1 = "64fdcba25a635f5b4da1b6ce6f90da0aeb6e3f15";
+    };
+    deps = {
+      "gaze-0.5.1" = self.by-version."gaze"."0.5.1";
+      "tiny-lr-fork-0.0.5" = self.by-version."tiny-lr-fork"."0.0.5";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
+      "async-0.2.10" = self.by-version."async"."0.2.10";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [
+      self.by-version."grunt"."0.4.5"];
+    os = [ ];
+    cpu = [ ];
+  };
+  "grunt-contrib-watch" = self.by-version."grunt-contrib-watch"."0.6.1";
+  by-spec."grunt-legacy-log"."~0.1.0" =
+    self.by-version."grunt-legacy-log"."0.1.2";
+  by-version."grunt-legacy-log"."0.1.2" = self.buildNodePackage {
+    name = "grunt-legacy-log-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.2.tgz";
+      name = "grunt-legacy-log-0.1.2.tgz";
+      sha1 = "15ee03b61e262e1b36f13762d967923cd1ce515e";
+    };
+    deps = {
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+      "grunt-legacy-log-utils-0.1.1" = self.by-version."grunt-legacy-log-utils"."0.1.1";
+      "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
+      "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."grunt-legacy-log-utils"."^0.1.1" =
+    self.by-version."grunt-legacy-log-utils"."0.1.1";
+  by-version."grunt-legacy-log-utils"."0.1.1" = self.buildNodePackage {
+    name = "grunt-legacy-log-utils-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz";
+      name = "grunt-legacy-log-utils-0.1.1.tgz";
+      sha1 = "c0706b9dd9064e116f36f23fe4e6b048672c0f7e";
+    };
+    deps = {
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
+      "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."grunt-legacy-util"."~0.2.0" =
+    self.by-version."grunt-legacy-util"."0.2.0";
+  by-version."grunt-legacy-util"."0.2.0" = self.buildNodePackage {
+    name = "grunt-legacy-util-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz";
+      name = "grunt-legacy-util-0.2.0.tgz";
+      sha1 = "93324884dbf7e37a9ff7c026dff451d94a9e554b";
+    };
+    deps = {
+      "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
+      "async-0.1.22" = self.by-version."async"."0.1.22";
+      "lodash-0.9.2" = self.by-version."lodash"."0.9.2";
+      "exit-0.1.2" = self.by-version."exit"."0.1.2";
+      "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1";
+      "getobject-0.1.0" = self.by-version."getobject"."0.1.0";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."gzip-size"."^0.2.0" =
+    self.by-version."gzip-size"."0.2.0";
+  by-version."gzip-size"."0.2.0" = self.buildNodePackage {
+    name = "gzip-size-0.2.0";
+    version = "0.2.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.2.0.tgz";
+      name = "gzip-size-0.2.0.tgz";
+      sha1 = "e3a2a191205fe56ee326f5c271435dfaecfb3e1c";
+    };
+    deps = {
+      "concat-stream-1.5.0" = self.by-version."concat-stream"."1.5.0";
+      "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."handlebars"."^2.0.0" =
+    self.by-version."handlebars"."2.0.0";
+  by-version."handlebars"."2.0.0" = self.buildNodePackage {
+    name = "handlebars-2.0.0";
+    version = "2.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz";
+      name = "handlebars-2.0.0.tgz";
+      sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f";
+    };
+    deps = {
+      "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+    };
+    optionalDependencies = {
+      "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "handlebars" = self.by-version."handlebars"."2.0.0";
+  by-spec."har-validator"."^1.6.1" =
+    self.by-version."har-validator"."1.8.0";
+  by-version."har-validator"."1.8.0" = self.buildNodePackage {
+    name = "har-validator-1.8.0";
+    version = "1.8.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz";
+      name = "har-validator-1.8.0.tgz";
+      sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2";
+    };
+    deps = {
+      "bluebird-2.9.34" = self.by-version."bluebird"."2.9.34";
+      "chalk-1.1.0" = self.by-version."chalk"."1.1.0";
+      "commander-2.8.1" = self.by-version."commander"."2.8.1";
+      "is-my-json-valid-2.12.1" = self.by-version."is-my-json-valid"."2.12.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-ansi"."^0.1.0" =
+    self.by-version."has-ansi"."0.1.0";
+  by-version."has-ansi"."0.1.0" = self.buildNodePackage {
+    name = "has-ansi-0.1.0";
+    version = "0.1.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz";
+      name = "has-ansi-0.1.0.tgz";
+      sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e";
+    };
+    deps = {
+      "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-ansi"."^2.0.0" =
+    self.by-version."has-ansi"."2.0.0";
+  by-version."has-ansi"."2.0.0" = self.buildNodePackage {
+    name = "has-ansi-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+      name = "has-ansi-2.0.0.tgz";
+      sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+    };
+    deps = {
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-binary-data"."0.1.1" =
+    self.by-version."has-binary-data"."0.1.1";
+  by-version."has-binary-data"."0.1.1" = self.buildNodePackage {
+    name = "has-binary-data-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.1.tgz";
+      name = "has-binary-data-0.1.1.tgz";
+      sha1 = "e10749fb87828a52df96f4086587eb4a03966439";
+    };
+    deps = {
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-cors"."1.0.3" =
+    self.by-version."has-cors"."1.0.3";
+  by-version."has-cors"."1.0.3" = self.buildNodePackage {
+    name = "has-cors-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz";
+      name = "has-cors-1.0.3.tgz";
+      sha1 = "502acb9b3104dac33dd2630eaf2f888b0baf4cb3";
+    };
+    deps = {
+      "global-2.0.1" = self.by-version."global"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hawk"."~3.1.0" =
+    self.by-version."hawk"."3.1.0";
+  by-version."hawk"."3.1.0" = self.buildNodePackage {
+    name = "hawk-3.1.0";
+    version = "3.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz";
+      name = "hawk-3.1.0.tgz";
+      sha1 = "8a13ae19977ec607602f3f0b9fd676f18c384e44";
+    };
+    deps = {
+      "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
+      "boom-2.8.0" = self.by-version."boom"."2.8.0";
+      "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4";
+      "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hoek"."2.x.x" =
+    self.by-version."hoek"."2.14.0";
+  by-version."hoek"."2.14.0" = self.buildNodePackage {
+    name = "hoek-2.14.0";
+    version = "2.14.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz";
+      name = "hoek-2.14.0.tgz";
+      sha1 = "81211691f52a5a835ae49edbf1e89c9003476aa4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hooker"."~0.2.3" =
+    self.by-version."hooker"."0.2.3";
+  by-version."hooker"."0.2.3" = self.buildNodePackage {
+    name = "hooker-0.2.3";
+    version = "0.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
+      name = "hooker-0.2.3.tgz";
+      sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."htmlparser2"."~3.7.2" =
+    self.by-version."htmlparser2"."3.7.3";
+  by-version."htmlparser2"."3.7.3" = self.buildNodePackage {
+    name = "htmlparser2-3.7.3";
+    version = "3.7.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz";
+      name = "htmlparser2-3.7.3.tgz";
+      sha1 = "6a64c77637c08c6f30ec2a8157a53333be7cb05e";
+    };
+    deps = {
+      "domhandler-2.2.1" = self.by-version."domhandler"."2.2.1";
+      "domutils-1.5.1" = self.by-version."domutils"."1.5.1";
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "entities-1.0.0" = self.by-version."entities"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."http-errors"."~1.3.1" =
+    self.by-version."http-errors"."1.3.1";
+  by-version."http-errors"."1.3.1" = self.buildNodePackage {
+    name = "http-errors-1.3.1";
+    version = "1.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz";
+      name = "http-errors-1.3.1.tgz";
+      sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."http-signature"."~0.11.0" =
+    self.by-version."http-signature"."0.11.0";
+  by-version."http-signature"."0.11.0" = self.buildNodePackage {
+    name = "http-signature-0.11.0";
+    version = "0.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
+      name = "http-signature-0.11.0.tgz";
+      sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
+    };
+    deps = {
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
+      "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."iconv-lite"."~0.2.11" =
+    self.by-version."iconv-lite"."0.2.11";
+  by-version."iconv-lite"."0.2.11" = self.buildNodePackage {
+    name = "iconv-lite-0.2.11";
+    version = "0.2.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
+      name = "iconv-lite-0.2.11.tgz";
+      sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."indexof"."0.0.1" =
+    self.by-version."indexof"."0.0.1";
+  by-version."indexof"."0.0.1" = self.buildNodePackage {
+    name = "indexof-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
+      name = "indexof-0.0.1.tgz";
+      sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."inherits"."1" =
+    self.by-version."inherits"."1.0.0";
+  by-version."inherits"."1.0.0" = self.buildNodePackage {
+    name = "inherits-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz";
+      name = "inherits-1.0.0.tgz";
+      sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."inherits"."2" =
+    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."inherits"."~2.0.1" =
+    self.by-version."inherits"."2.0.1";
+  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."irc-replies"."~2.0.0" =
+    self.by-version."irc-replies"."2.0.1";
+  by-version."irc-replies"."2.0.1" = self.buildNodePackage {
+    name = "irc-replies-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/irc-replies/-/irc-replies-2.0.1.tgz";
+      name = "irc-replies-2.0.1.tgz";
+      sha1 = "5bf4125fb6ec0f3929a89647b26e653232942b79";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-my-json-valid"."^2.12.0" =
+    self.by-version."is-my-json-valid"."2.12.1";
+  by-version."is-my-json-valid"."2.12.1" = self.buildNodePackage {
+    name = "is-my-json-valid-2.12.1";
+    version = "2.12.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.1.tgz";
+      name = "is-my-json-valid-2.12.1.tgz";
+      sha1 = "0ee5c19c9e93bae2760410cc72ef2798b52cc871";
+    };
+    deps = {
+      "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
+      "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0";
+      "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0";
+      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-property"."^1.0.0" =
+    self.by-version."is-property"."1.0.2";
+  by-version."is-property"."1.0.2" = self.buildNodePackage {
+    name = "is-property-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+      name = "is-property-1.0.2.tgz";
+      sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
+    };
+    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."isstream"."~0.1.1" =
+    self.by-version."isstream"."0.1.2";
+  by-version."isstream"."0.1.2" = self.buildNodePackage {
+    name = "isstream-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+      name = "isstream-0.1.2.tgz";
+      sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jade"."0.26.3" =
+    self.by-version."jade"."0.26.3";
+  by-version."jade"."0.26.3" = self.buildNodePackage {
+    name = "jade-0.26.3";
+    version = "0.26.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
+      name = "jade-0.26.3.tgz";
+      sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c";
+    };
+    deps = {
+      "commander-0.6.1" = self.by-version."commander"."0.6.1";
+      "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."js-yaml"."~2.0.5" =
+    self.by-version."js-yaml"."2.0.5";
+  by-version."js-yaml"."2.0.5" = self.buildNodePackage {
+    name = "js-yaml-2.0.5";
+    version = "2.0.5";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz";
+      name = "js-yaml-2.0.5.tgz";
+      sha1 = "a25ae6509999e97df278c6719da11bd0687743a8";
+    };
+    deps = {
+      "argparse-0.1.16" = self.by-version."argparse"."0.1.16";
+      "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."json-stringify-safe"."~5.0.0" =
+    self.by-version."json-stringify-safe"."5.0.1";
+  by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage {
+    name = "json-stringify-safe-5.0.1";
+    version = "5.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+      name = "json-stringify-safe-5.0.1.tgz";
+      sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."json3"."3.2.6" =
+    self.by-version."json3"."3.2.6";
+  by-version."json3"."3.2.6" = self.buildNodePackage {
+    name = "json3-3.2.6";
+    version = "3.2.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
+      name = "json3-3.2.6.tgz";
+      sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsonpointer"."^1.1.0" =
+    self.by-version."jsonpointer"."1.1.0";
+  by-version."jsonpointer"."1.1.0" = self.buildNodePackage {
+    name = "jsonpointer-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz";
+      name = "jsonpointer-1.1.0.tgz";
+      sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."linewise"."0.0.3" =
+    self.by-version."linewise"."0.0.3";
+  by-version."linewise"."0.0.3" = self.buildNodePackage {
+    name = "linewise-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/linewise/-/linewise-0.0.3.tgz";
+      name = "linewise-0.0.3.tgz";
+      sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash"."^2.4.1" =
+    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"."~0.9.2" =
+    self.by-version."lodash"."0.9.2";
+  by-version."lodash"."0.9.2" = self.buildNodePackage {
+    name = "lodash-0.9.2";
+    version = "0.9.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
+      name = "lodash-0.9.2.tgz";
+      sha1 = "8f3499c5245d346d682e5b0d3b40767e09f1a92c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash"."~1.0.1" =
+    self.by-version."lodash"."1.0.2";
+  by-version."lodash"."1.0.2" = self.buildNodePackage {
+    name = "lodash-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz";
+      name = "lodash-1.0.2.tgz";
+      sha1 = "8f57560c83b59fc270bd3d561b690043430e2551";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash"."~2.4.1" =
+    self.by-version."lodash"."2.4.2";
+  "lodash" = self.by-version."lodash"."2.4.2";
+  by-spec."lru-cache"."2" =
+    self.by-version."lru-cache"."2.6.5";
+  by-version."lru-cache"."2.6.5" = self.buildNodePackage {
+    name = "lru-cache-2.6.5";
+    version = "2.6.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz";
+      name = "lru-cache-2.6.5.tgz";
+      sha1 = "e56d6354148ede8d7707b58d143220fd08df0fd5";
+    };
+    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."maxmin"."^0.2.0" =
+    self.by-version."maxmin"."0.2.2";
+  by-version."maxmin"."0.2.2" = self.buildNodePackage {
+    name = "maxmin-0.2.2";
+    version = "0.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/maxmin/-/maxmin-0.2.2.tgz";
+      name = "maxmin-0.2.2.tgz";
+      sha1 = "a36ced8cc22e3abcd108cfb797a3a4b40275593f";
+    };
+    deps = {
+      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+      "figures-1.3.5" = self.by-version."figures"."1.3.5";
+      "gzip-size-0.2.0" = self.by-version."gzip-size"."0.2.0";
+      "pretty-bytes-0.1.2" = self.by-version."pretty-bytes"."0.1.2";
+    };
+    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"."1.0.0" =
+    self.by-version."merge-descriptors"."1.0.0";
+  by-version."merge-descriptors"."1.0.0" = self.buildNodePackage {
+    name = "merge-descriptors-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
+      name = "merge-descriptors-1.0.0.tgz";
+      sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864";
+    };
+    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.3.4" =
+    self.by-version."mime"."1.3.4";
+  by-version."mime"."1.3.4" = self.buildNodePackage {
+    name = "mime-1.3.4";
+    version = "1.3.4";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
+      name = "mime-1.3.4.tgz";
+      sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-db"."~1.15.0" =
+    self.by-version."mime-db"."1.15.0";
+  by-version."mime-db"."1.15.0" = self.buildNodePackage {
+    name = "mime-db-1.15.0";
+    version = "1.15.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.15.0.tgz";
+      name = "mime-db-1.15.0.tgz";
+      sha1 = "d219e6214bbcae23a6fa69c0868c4fadc1405e8a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."^2.1.1" =
+    self.by-version."mime-types"."2.1.3";
+  by-version."mime-types"."2.1.3" = self.buildNodePackage {
+    name = "mime-types-2.1.3";
+    version = "2.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.3.tgz";
+      name = "mime-types-2.1.3.tgz";
+      sha1 = "f259849c7eb1f85b8f5f826187278a7f74f0c966";
+    };
+    deps = {
+      "mime-db-1.15.0" = self.by-version."mime-db"."1.15.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~2.1.2" =
+    self.by-version."mime-types"."2.1.3";
+  by-spec."mime-types"."~2.1.3" =
+    self.by-version."mime-types"."2.1.3";
+  by-spec."minimatch"."0.3" =
+    self.by-version."minimatch"."0.3.0";
+  by-version."minimatch"."0.3.0" = self.buildNodePackage {
+    name = "minimatch-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
+      name = "minimatch-0.3.0.tgz";
+      sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
+    };
+    deps = {
+      "lru-cache-2.6.5" = self.by-version."lru-cache"."2.6.5";
+      "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."minimatch"."~0.2.11" =
+    self.by-version."minimatch"."0.2.14";
+  by-version."minimatch"."0.2.14" = self.buildNodePackage {
+    name = "minimatch-0.2.14";
+    version = "0.2.14";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
+      name = "minimatch-0.2.14.tgz";
+      sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
+    };
+    deps = {
+      "lru-cache-2.6.5" = self.by-version."lru-cache"."2.6.5";
+      "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."minimatch"."~0.2.12" =
+    self.by-version."minimatch"."0.2.14";
+  by-spec."minimist"."0.0.8" =
+    self.by-version."minimist"."0.0.8";
+  by-version."minimist"."0.0.8" = self.buildNodePackage {
+    name = "minimist-0.0.8";
+    version = "0.0.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+      name = "minimist-0.0.8.tgz";
+      sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mkdirp"."0.3.0" =
+    self.by-version."mkdirp"."0.3.0";
+  by-version."mkdirp"."0.3.0" = self.buildNodePackage {
+    name = "mkdirp-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
+      name = "mkdirp-0.3.0.tgz";
+      sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mkdirp"."0.5.0" =
+    self.by-version."mkdirp"."0.5.0";
+  by-version."mkdirp"."0.5.0" = self.buildNodePackage {
+    name = "mkdirp-0.5.0";
+    version = "0.5.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
+      name = "mkdirp-0.5.0.tgz";
+      sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
+    };
+    deps = {
+      "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mkdirp"."^0.5.0" =
+    self.by-version."mkdirp"."0.5.1";
+  by-version."mkdirp"."0.5.1" = self.buildNodePackage {
+    name = "mkdirp-0.5.1";
+    version = "0.5.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+      name = "mkdirp-0.5.1.tgz";
+      sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+    };
+    deps = {
+      "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "mkdirp" = self.by-version."mkdirp"."0.5.1";
+  by-spec."mocha"."~2.0.1" =
+    self.by-version."mocha"."2.0.1";
+  by-version."mocha"."2.0.1" = self.buildNodePackage {
+    name = "mocha-2.0.1";
+    version = "2.0.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mocha/-/mocha-2.0.1.tgz";
+      name = "mocha-2.0.1.tgz";
+      sha1 = "5a16e88b856d0c4145d8c6888c27ebd4fab13e90";
+    };
+    deps = {
+      "commander-2.3.0" = self.by-version."commander"."2.3.0";
+      "debug-2.0.0" = self.by-version."debug"."2.0.0";
+      "diff-1.0.8" = self.by-version."diff"."1.0.8";
+      "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2";
+      "glob-3.2.3" = self.by-version."glob"."3.2.3";
+      "growl-1.8.1" = self.by-version."growl"."1.8.1";
+      "jade-0.26.3" = self.by-version."jade"."0.26.3";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "mocha" = self.by-version."mocha"."2.0.1";
+  by-spec."moment"."~2.7.0" =
+    self.by-version."moment"."2.7.0";
+  by-version."moment"."2.7.0" = self.buildNodePackage {
+    name = "moment-2.7.0";
+    version = "2.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/moment/-/moment-2.7.0.tgz";
+      name = "moment-2.7.0.tgz";
+      sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "moment" = self.by-version."moment"."2.7.0";
+  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.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."mute-stream"."~0.0.4" =
+    self.by-version."mute-stream"."0.0.5";
+  by-version."mute-stream"."0.0.5" = self.buildNodePackage {
+    name = "mute-stream-0.0.5";
+    version = "0.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz";
+      name = "mute-stream-0.0.5.tgz";
+      sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nan"."~0.3.0" =
+    self.by-version."nan"."0.3.2";
+  by-version."nan"."0.3.2" = self.buildNodePackage {
+    name = "nan-0.3.2";
+    version = "0.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz";
+      name = "nan-0.3.2.tgz";
+      sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d";
+    };
+    deps = {
+    };
+    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."node-uuid"."~1.4.0" =
+    self.by-version."node-uuid"."1.4.3";
+  by-version."node-uuid"."1.4.3" = self.buildNodePackage {
+    name = "node-uuid-1.4.3";
+    version = "1.4.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
+      name = "node-uuid-1.4.3.tgz";
+      sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nopt"."~1.0.10" =
+    self.by-version."nopt"."1.0.10";
+  by-version."nopt"."1.0.10" = self.buildNodePackage {
+    name = "nopt-1.0.10";
+    version = "1.0.10";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
+      name = "nopt-1.0.10.tgz";
+      sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
+    };
+    deps = {
+      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nopt"."~2.0.0" =
+    self.by-version."nopt"."2.0.0";
+  by-version."nopt"."2.0.0" = self.buildNodePackage {
+    name = "nopt-2.0.0";
+    version = "2.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz";
+      name = "nopt-2.0.0.tgz";
+      sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d";
+    };
+    deps = {
+      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."noptify"."~0.0.3" =
+    self.by-version."noptify"."0.0.3";
+  by-version."noptify"."0.0.3" = self.buildNodePackage {
+    name = "noptify-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/noptify/-/noptify-0.0.3.tgz";
+      name = "noptify-0.0.3.tgz";
+      sha1 = "58f654a73d9753df0c51d9686dc92104a67f4bbb";
+    };
+    deps = {
+      "nopt-2.0.0" = self.by-version."nopt"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."oauth-sign"."~0.8.0" =
+    self.by-version."oauth-sign"."0.8.0";
+  by-version."oauth-sign"."0.8.0" = self.buildNodePackage {
+    name = "oauth-sign-0.8.0";
+    version = "0.8.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz";
+      name = "oauth-sign-0.8.0.tgz";
+      sha1 = "938fdc875765ba527137d8aec9d178e24debc553";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."object-component"."0.0.3" =
+    self.by-version."object-component"."0.0.3";
+  by-version."object-component"."0.0.3" = self.buildNodePackage {
+    name = "object-component-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
+      name = "object-component-0.0.3.tgz";
+      sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."on-finished"."~2.3.0" =
+    self.by-version."on-finished"."2.3.0";
+  by-version."on-finished"."2.3.0" = self.buildNodePackage {
+    name = "on-finished-2.3.0";
+    version = "2.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";
+      name = "on-finished-2.3.0.tgz";
+      sha1 = "20f1336481b083cd75337992a16971aa2d906947";
+    };
+    deps = {
+      "ee-first-1.1.1" = self.by-version."ee-first"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."optimist"."~0.3" =
+    self.by-version."optimist"."0.3.7";
+  by-version."optimist"."0.3.7" = self.buildNodePackage {
+    name = "optimist-0.3.7";
+    version = "0.3.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+      name = "optimist-0.3.7.tgz";
+      sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+    };
+    deps = {
+      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."optimist"."~0.3.5" =
+    self.by-version."optimist"."0.3.7";
+  by-spec."options".">=0.0.5" =
+    self.by-version."options"."0.0.6";
+  by-version."options"."0.0.6" = self.buildNodePackage {
+    name = "options-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz";
+      name = "options-0.0.6.tgz";
+      sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pako"."~0.2.0" =
+    self.by-version."pako"."0.2.7";
+  by-version."pako"."0.2.7" = self.buildNodePackage {
+    name = "pako-0.2.7";
+    version = "0.2.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pako/-/pako-0.2.7.tgz";
+      name = "pako-0.2.7.tgz";
+      sha1 = "90e8917affd5ee2b69dfe943ec16b783c4e0c441";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."parsejson"."0.0.1" =
+    self.by-version."parsejson"."0.0.1";
+  by-version."parsejson"."0.0.1" = self.buildNodePackage {
+    name = "parsejson-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
+      name = "parsejson-0.0.1.tgz";
+      sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc";
+    };
+    deps = {
+      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."parseqs"."0.0.2" =
+    self.by-version."parseqs"."0.0.2";
+  by-version."parseqs"."0.0.2" = self.buildNodePackage {
+    name = "parseqs-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
+      name = "parseqs-0.0.2.tgz";
+      sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7";
+    };
+    deps = {
+      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."parseuri"."0.0.2" =
+    self.by-version."parseuri"."0.0.2";
+  by-version."parseuri"."0.0.2" = self.buildNodePackage {
+    name = "parseuri-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz";
+      name = "parseuri-0.0.2.tgz";
+      sha1 = "db41878f2d6964718be870b3140973d8093be156";
+    };
+    deps = {
+      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
+    };
+    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.6" =
+    self.by-version."path-to-regexp"."0.1.6";
+  by-version."path-to-regexp"."0.1.6" = self.buildNodePackage {
+    name = "path-to-regexp-0.1.6";
+    version = "0.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz";
+      name = "path-to-regexp-0.1.6.tgz";
+      sha1 = "f01fd5734047b6bfbc5f208c6135a33d7af09c36";
+    };
+    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."pretty-bytes"."^0.1.0" =
+    self.by-version."pretty-bytes"."0.1.2";
+  by-version."pretty-bytes"."0.1.2" = self.buildNodePackage {
+    name = "pretty-bytes-0.1.2";
+    version = "0.1.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-0.1.2.tgz";
+      name = "pretty-bytes-0.1.2.tgz";
+      sha1 = "cd90294d58a1ca4e8a5d0fb9c8225998881acf00";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."process-nextick-args"."~1.0.0" =
+    self.by-version."process-nextick-args"."1.0.2";
+  by-version."process-nextick-args"."1.0.2" = self.buildNodePackage {
+    name = "process-nextick-args-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.2.tgz";
+      name = "process-nextick-args-1.0.2.tgz";
+      sha1 = "8b4d3fc586668bd5b6573e732edf2b71c1c1d8aa";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."proxy-addr"."~1.0.8" =
+    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"."4.0.0" =
+    self.by-version."qs"."4.0.0";
+  by-version."qs"."4.0.0" = self.buildNodePackage {
+    name = "qs-4.0.0";
+    version = "4.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-4.0.0.tgz";
+      name = "qs-4.0.0.tgz";
+      sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."~0.5.2" =
+    self.by-version."qs"."0.5.6";
+  by-version."qs"."0.5.6" = self.buildNodePackage {
+    name = "qs-0.5.6";
+    version = "0.5.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
+      name = "qs-0.5.6.tgz";
+      sha1 = "31b1ad058567651c526921506b9a8793911a0384";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."~4.0.0" =
+    self.by-version."qs"."4.0.0";
+  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."read"."^1.0.5" =
+    self.by-version."read"."1.0.6";
+  by-version."read"."1.0.6" = self.buildNodePackage {
+    name = "read-1.0.6";
+    version = "1.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/read/-/read-1.0.6.tgz";
+      name = "read-1.0.6.tgz";
+      sha1 = "09873c14ecc114d063fad43b8ca5a33d304721c8";
+    };
+    deps = {
+      "mute-stream-0.0.5" = self.by-version."mute-stream"."0.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "read" = self.by-version."read"."1.0.6";
+  by-spec."readable-stream"."1.1" =
+    self.by-version."readable-stream"."1.1.13";
+  by-version."readable-stream"."1.1.13" = self.buildNodePackage {
+    name = "readable-stream-1.1.13";
+    version = "1.1.13";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz";
+      name = "readable-stream-1.1.13.tgz";
+      sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e";
+    };
+    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."readable-stream"."~2.0.0" =
+    self.by-version."readable-stream"."2.0.2";
+  by-version."readable-stream"."2.0.2" = self.buildNodePackage {
+    name = "readable-stream-2.0.2";
+    version = "2.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz";
+      name = "readable-stream-2.0.2.tgz";
+      sha1 = "bec81beae8cf455168bc2e5b2b31f5bcfaed9b1b";
+    };
+    deps = {
+      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "process-nextick-args-1.0.2" = self.by-version."process-nextick-args"."1.0.2";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "util-deprecate-1.0.1" = self.by-version."util-deprecate"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."request"."^2.51.0" =
+    self.by-version."request"."2.60.0";
+  by-version."request"."2.60.0" = self.buildNodePackage {
+    name = "request-2.60.0";
+    version = "2.60.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.60.0.tgz";
+      name = "request-2.60.0.tgz";
+      sha1 = "498820957fcdded1d37749069610c85f61a29f2d";
+    };
+    deps = {
+      "bl-1.0.0" = self.by-version."bl"."1.0.0";
+      "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-1.0.0-rc2" = self.by-version."form-data"."1.0.0-rc2";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.1.3" = self.by-version."mime-types"."2.1.3";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "qs-4.0.0" = self.by-version."qs"."4.0.0";
+      "tunnel-agent-0.4.1" = self.by-version."tunnel-agent"."0.4.1";
+      "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0";
+      "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
+      "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0";
+      "hawk-3.1.0" = self.by-version."hawk"."3.1.0";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "har-validator-1.8.0" = self.by-version."har-validator"."1.8.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "request" = self.by-version."request"."2.60.0";
+  by-spec."rimraf"."~2.2.8" =
+    self.by-version."rimraf"."2.2.8";
+  by-version."rimraf"."2.2.8" = self.buildNodePackage {
+    name = "rimraf-2.2.8";
+    version = "2.2.8";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+      name = "rimraf-2.2.8.tgz";
+      sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."send"."0.13.0" =
+    self.by-version."send"."0.13.0";
+  by-version."send"."0.13.0" = self.buildNodePackage {
+    name = "send-0.13.0";
+    version = "0.13.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/send/-/send-0.13.0.tgz";
+      name = "send-0.13.0.tgz";
+      sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "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.2" = self.by-version."escape-html"."1.0.2";
+      "etag-1.7.0" = self.by-version."etag"."1.7.0";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."serve-static"."~1.10.0" =
+    self.by-version."serve-static"."1.10.0";
+  by-version."serve-static"."1.10.0" = self.buildNodePackage {
+    name = "serve-static-1.10.0";
+    version = "1.10.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.10.0.tgz";
+      name = "serve-static-1.10.0.tgz";
+      sha1 = "be632faa685820e4a43ed3df1379135cc4f370d7";
+    };
+    deps = {
+      "escape-html-1.0.2" = self.by-version."escape-html"."1.0.2";
+      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+      "send-0.13.0" = self.by-version."send"."0.13.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sigmund"."~1.0.0" =
+    self.by-version."sigmund"."1.0.1";
+  by-version."sigmund"."1.0.1" = self.buildNodePackage {
+    name = "sigmund-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
+      name = "sigmund-1.0.1.tgz";
+      sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."slate-irc"."~0.7.3" =
+    self.by-version."slate-irc"."0.7.3";
+  by-version."slate-irc"."0.7.3" = self.buildNodePackage {
+    name = "slate-irc-0.7.3";
+    version = "0.7.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/slate-irc/-/slate-irc-0.7.3.tgz";
+      name = "slate-irc-0.7.3.tgz";
+      sha1 = "8d01f2bc809e00a5b2faca7d8d3130d155422a77";
+    };
+    deps = {
+      "irc-replies-2.0.1" = self.by-version."irc-replies"."2.0.1";
+      "slate-irc-parser-0.0.2" = self.by-version."slate-irc-parser"."0.0.2";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "slate-irc" = self.by-version."slate-irc"."0.7.3";
+  by-spec."slate-irc-parser"."0.0.2" =
+    self.by-version."slate-irc-parser"."0.0.2";
+  by-version."slate-irc-parser"."0.0.2" = self.buildNodePackage {
+    name = "slate-irc-parser-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/slate-irc-parser/-/slate-irc-parser-0.0.2.tgz";
+      name = "slate-irc-parser-0.0.2.tgz";
+      sha1 = "0c5f8f20d817bb85329da9fca135c66b05947d80";
+    };
+    deps = {
+      "linewise-0.0.3" = self.by-version."linewise"."0.0.3";
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sntp"."1.x.x" =
+    self.by-version."sntp"."1.0.9";
+  by-version."sntp"."1.0.9" = self.buildNodePackage {
+    name = "sntp-1.0.9";
+    version = "1.0.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+      name = "sntp-1.0.9.tgz";
+      sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
+    };
+    deps = {
+      "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."socket.io"."~1.0.6" =
+    self.by-version."socket.io"."1.0.6";
+  by-version."socket.io"."1.0.6" = self.buildNodePackage {
+    name = "socket.io-1.0.6";
+    version = "1.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz";
+      name = "socket.io-1.0.6.tgz";
+      sha1 = "b566532888dae3ac9058a12f294015ebdfa8084a";
+    };
+    deps = {
+      "engine.io-1.3.1" = self.by-version."engine.io"."1.3.1";
+      "socket.io-parser-2.2.0" = self.by-version."socket.io-parser"."2.2.0";
+      "socket.io-client-1.0.6" = self.by-version."socket.io-client"."1.0.6";
+      "socket.io-adapter-0.2.0" = self.by-version."socket.io-adapter"."0.2.0";
+      "has-binary-data-0.1.1" = self.by-version."has-binary-data"."0.1.1";
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "socket.io" = self.by-version."socket.io"."1.0.6";
+  by-spec."socket.io-adapter"."0.2.0" =
+    self.by-version."socket.io-adapter"."0.2.0";
+  by-version."socket.io-adapter"."0.2.0" = self.buildNodePackage {
+    name = "socket.io-adapter-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.2.0.tgz";
+      name = "socket.io-adapter-0.2.0.tgz";
+      sha1 = "bd39329b8961371787e24f345b074ec9cf000e33";
+    };
+    deps = {
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "socket.io-parser-2.1.2" = self.by-version."socket.io-parser"."2.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."socket.io-client"."1.0.6" =
+    self.by-version."socket.io-client"."1.0.6";
+  by-version."socket.io-client"."1.0.6" = self.buildNodePackage {
+    name = "socket.io-client-1.0.6";
+    version = "1.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.0.6.tgz";
+      name = "socket.io-client-1.0.6.tgz";
+      sha1 = "c86cb3e507ab2f96da4500bd34fcf46a1e9dfe5e";
+    };
+    deps = {
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "engine.io-client-1.3.1" = self.by-version."engine.io-client"."1.3.1";
+      "component-bind-1.0.0" = self.by-version."component-bind"."1.0.0";
+      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "object-component-0.0.3" = self.by-version."object-component"."0.0.3";
+      "socket.io-parser-2.2.0" = self.by-version."socket.io-parser"."2.2.0";
+      "has-binary-data-0.1.1" = self.by-version."has-binary-data"."0.1.1";
+      "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
+      "parseuri-0.0.2" = self.by-version."parseuri"."0.0.2";
+      "to-array-0.1.3" = self.by-version."to-array"."0.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."socket.io-parser"."2.1.2" =
+    self.by-version."socket.io-parser"."2.1.2";
+  by-version."socket.io-parser"."2.1.2" = self.buildNodePackage {
+    name = "socket.io-parser-2.1.2";
+    version = "2.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.1.2.tgz";
+      name = "socket.io-parser-2.1.2.tgz";
+      sha1 = "876655b9edd555c5bdf7301cedf30a436c67b8b0";
+    };
+    deps = {
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "json3-3.2.6" = self.by-version."json3"."3.2.6";
+      "emitter-1.0.1" = self.by-version."emitter"."1.0.1";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."socket.io-parser"."2.2.0" =
+    self.by-version."socket.io-parser"."2.2.0";
+  by-version."socket.io-parser"."2.2.0" = self.buildNodePackage {
+    name = "socket.io-parser-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.0.tgz";
+      name = "socket.io-parser-2.2.0.tgz";
+      sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a";
+    };
+    deps = {
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "json3-3.2.6" = self.by-version."json3"."3.2.6";
+      "emitter-1.0.1" = self.by-version."emitter"."1.0.1";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."source-map"."0.1.34" =
+    self.by-version."source-map"."0.1.34";
+  by-version."source-map"."0.1.34" = self.buildNodePackage {
+    name = "source-map-0.1.34";
+    version = "0.1.34";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz";
+      name = "source-map-0.1.34.tgz";
+      sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b";
+    };
+    deps = {
+      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."source-map"."~0.1.7" =
+    self.by-version."source-map"."0.1.43";
+  by-version."source-map"."0.1.43" = self.buildNodePackage {
+    name = "source-map-0.1.43";
+    version = "0.1.43";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
+      name = "source-map-0.1.43.tgz";
+      sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
+    };
+    deps = {
+      "amdefine-1.0.0" = self.by-version."amdefine"."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."statuses"."1" =
+    self.by-version."statuses"."1.2.1";
+  by-version."statuses"."1.2.1" = self.buildNodePackage {
+    name = "statuses-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz";
+      name = "statuses-1.2.1.tgz";
+      sha1 = "dded45cc18256d51ed40aec142489d5c61026d28";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."statuses"."~1.2.1" =
+    self.by-version."statuses"."1.2.1";
+  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_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."stringstream"."~0.0.4" =
+    self.by-version."stringstream"."0.0.4";
+  by-version."stringstream"."0.0.4" = self.buildNodePackage {
+    name = "stringstream-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
+      name = "stringstream-0.0.4.tgz";
+      sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."strip-ansi"."^0.3.0" =
+    self.by-version."strip-ansi"."0.3.0";
+  by-version."strip-ansi"."0.3.0" = self.buildNodePackage {
+    name = "strip-ansi-0.3.0";
+    version = "0.3.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
+      name = "strip-ansi-0.3.0.tgz";
+      sha1 = "25f48ea22ca79187f3174a4db8759347bb126220";
+    };
+    deps = {
+      "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."strip-ansi"."^3.0.0" =
+    self.by-version."strip-ansi"."3.0.0";
+  by-version."strip-ansi"."3.0.0" = self.buildNodePackage {
+    name = "strip-ansi-3.0.0";
+    version = "3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz";
+      name = "strip-ansi-3.0.0.tgz";
+      sha1 = "7510b665567ca914ccb5d7e072763ac968be3724";
+    };
+    deps = {
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."supports-color"."^0.2.0" =
+    self.by-version."supports-color"."0.2.0";
+  by-version."supports-color"."0.2.0" = self.buildNodePackage {
+    name = "supports-color-0.2.0";
+    version = "0.2.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz";
+      name = "supports-color-0.2.0.tgz";
+      sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."supports-color"."^2.0.0" =
+    self.by-version."supports-color"."2.0.0";
+  by-version."supports-color"."2.0.0" = self.buildNodePackage {
+    name = "supports-color-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+      name = "supports-color-2.0.0.tgz";
+      sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+    };
+    deps = {
+    };
+    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."tiny-lr-fork"."0.0.5" =
+    self.by-version."tiny-lr-fork"."0.0.5";
+  by-version."tiny-lr-fork"."0.0.5" = self.buildNodePackage {
+    name = "tiny-lr-fork-0.0.5";
+    version = "0.0.5";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz";
+      name = "tiny-lr-fork-0.0.5.tgz";
+      sha1 = "1e99e1e2a8469b736ab97d97eefa98c71f76ed0a";
+    };
+    deps = {
+      "qs-0.5.6" = self.by-version."qs"."0.5.6";
+      "faye-websocket-0.4.4" = self.by-version."faye-websocket"."0.4.4";
+      "noptify-0.0.3" = self.by-version."noptify"."0.0.3";
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tinycolor"."0.x" =
+    self.by-version."tinycolor"."0.0.1";
+  by-version."tinycolor"."0.0.1" = self.buildNodePackage {
+    name = "tinycolor-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
+      name = "tinycolor-0.0.1.tgz";
+      sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."to-array"."0.1.3" =
+    self.by-version."to-array"."0.1.3";
+  by-version."to-array"."0.1.3" = self.buildNodePackage {
+    name = "to-array-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/to-array/-/to-array-0.1.3.tgz";
+      name = "to-array-0.1.3.tgz";
+      sha1 = "d45dadc6363417f60f28474fea50ecddbb4f4991";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tough-cookie".">=0.12.0" =
+    self.by-version."tough-cookie"."2.0.0";
+  by-version."tough-cookie"."2.0.0" = self.buildNodePackage {
+    name = "tough-cookie-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz";
+      name = "tough-cookie-2.0.0.tgz";
+      sha1 = "41ce08720b35cf90beb044dd2609fb19e928718f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tunnel-agent"."~0.4.0" =
+    self.by-version."tunnel-agent"."0.4.1";
+  by-version."tunnel-agent"."0.4.1" = self.buildNodePackage {
+    name = "tunnel-agent-0.4.1";
+    version = "0.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz";
+      name = "tunnel-agent-0.4.1.tgz";
+      sha1 = "bbeecff4d679ce753db9462761a88dfcec3c5ab3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."type-is"."~1.6.4" =
+    self.by-version."type-is"."1.6.5";
+  by-version."type-is"."1.6.5" = self.buildNodePackage {
+    name = "type-is-1.6.5";
+    version = "1.6.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/type-is/-/type-is-1.6.5.tgz";
+      name = "type-is-1.6.5.tgz";
+      sha1 = "92129495c7b7563eaf923b447382c6c471f95de4";
+    };
+    deps = {
+      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+      "mime-types-2.1.3" = self.by-version."mime-types"."2.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."typedarray"."~0.0.5" =
+    self.by-version."typedarray"."0.0.6";
+  by-version."typedarray"."0.0.6" = self.buildNodePackage {
+    name = "typedarray-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+      name = "typedarray-0.0.6.tgz";
+      sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."uglify-js"."^2.4.0" =
+    self.by-version."uglify-js"."2.4.24";
+  by-version."uglify-js"."2.4.24" = self.buildNodePackage {
+    name = "uglify-js-2.4.24";
+    version = "2.4.24";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz";
+      name = "uglify-js-2.4.24.tgz";
+      sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e";
+    };
+    deps = {
+      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "source-map-0.1.34" = self.by-version."source-map"."0.1.34";
+      "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
+      "yargs-3.5.4" = self.by-version."yargs"."3.5.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."uglify-js"."~2.3" =
+    self.by-version."uglify-js"."2.3.6";
+  by-version."uglify-js"."2.3.6" = self.buildNodePackage {
+    name = "uglify-js-2.3.6";
+    version = "2.3.6";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+      name = "uglify-js-2.3.6.tgz";
+      sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+    };
+    deps = {
+      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+      "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."uglify-to-browserify"."~1.0.0" =
+    self.by-version."uglify-to-browserify"."1.0.2";
+  by-version."uglify-to-browserify"."1.0.2" = self.buildNodePackage {
+    name = "uglify-to-browserify-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+      name = "uglify-to-browserify-1.0.2.tgz";
+      sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."underscore"."~1.7.0" =
+    self.by-version."underscore"."1.7.0";
+  by-version."underscore"."1.7.0" = self.buildNodePackage {
+    name = "underscore-1.7.0";
+    version = "1.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
+      name = "underscore-1.7.0.tgz";
+      sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."underscore.string"."~2.2.1" =
+    self.by-version."underscore.string"."2.2.1";
+  by-version."underscore.string"."2.2.1" = self.buildNodePackage {
+    name = "underscore.string-2.2.1";
+    version = "2.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz";
+      name = "underscore.string-2.2.1.tgz";
+      sha1 = "d7c0fa2af5d5a1a67f4253daee98132e733f0f19";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."underscore.string"."~2.3.3" =
+    self.by-version."underscore.string"."2.3.3";
+  by-version."underscore.string"."2.3.3" = self.buildNodePackage {
+    name = "underscore.string-2.3.3";
+    version = "2.3.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
+      name = "underscore.string-2.3.3.tgz";
+      sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."underscore.string"."~2.4.0" =
+    self.by-version."underscore.string"."2.4.0";
+  by-version."underscore.string"."2.4.0" = self.buildNodePackage {
+    name = "underscore.string-2.4.0";
+    version = "2.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
+      name = "underscore.string-2.4.0.tgz";
+      sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."unpipe"."~1.0.0" =
+    self.by-version."unpipe"."1.0.0";
+  by-version."unpipe"."1.0.0" = self.buildNodePackage {
+    name = "unpipe-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz";
+      name = "unpipe-1.0.0.tgz";
+      sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."utf8"."2.0.0" =
+    self.by-version."utf8"."2.0.0";
+  by-version."utf8"."2.0.0" = self.buildNodePackage {
+    name = "utf8-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz";
+      name = "utf8-2.0.0.tgz";
+      sha1 = "79ce59eced874809cab9a71fc7102c7d45d4118d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."util-deprecate"."~1.0.1" =
+    self.by-version."util-deprecate"."1.0.1";
+  by-version."util-deprecate"."1.0.1" = self.buildNodePackage {
+    name = "util-deprecate-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz";
+      name = "util-deprecate-1.0.1.tgz";
+      sha1 = "3556a3d13c4c6aa7983d7e2425478197199b7881";
+    };
+    deps = {
+    };
+    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."which"."~1.0.5" =
+    self.by-version."which"."1.0.9";
+  by-version."which"."1.0.9" = self.buildNodePackage {
+    name = "which-1.0.9";
+    version = "1.0.9";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/which/-/which-1.0.9.tgz";
+      name = "which-1.0.9.tgz";
+      sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."window-size"."0.1.0" =
+    self.by-version."window-size"."0.1.0";
+  by-version."window-size"."0.1.0" = self.buildNodePackage {
+    name = "window-size-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+      name = "window-size-0.1.0.tgz";
+      sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."wordwrap"."0.0.2" =
+    self.by-version."wordwrap"."0.0.2";
+  by-version."wordwrap"."0.0.2" = self.buildNodePackage {
+    name = "wordwrap-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+      name = "wordwrap-0.0.2.tgz";
+      sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+    };
+    deps = {
+    };
+    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 = [ ];
+  };
+  by-spec."ws"."0.4.31" =
+    self.by-version."ws"."0.4.31";
+  by-version."ws"."0.4.31" = self.buildNodePackage {
+    name = "ws-0.4.31";
+    version = "0.4.31";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ws/-/ws-0.4.31.tgz";
+      name = "ws-0.4.31.tgz";
+      sha1 = "5a4849e7a9ccd1ed5a81aeb4847c9fedf3122927";
+    };
+    deps = {
+      "commander-0.6.1" = self.by-version."commander"."0.6.1";
+      "nan-0.3.2" = self.by-version."nan"."0.3.2";
+      "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1";
+      "options-0.0.6" = self.by-version."options"."0.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xmlhttprequest"."https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" =
+    self.by-version."xmlhttprequest"."1.5.0";
+  by-version."xmlhttprequest"."1.5.0" = self.buildNodePackage {
+    name = "xmlhttprequest-1.5.0";
+    version = "1.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz";
+      name = "xmlhttprequest-1.5.0.tgz";
+      sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xtend"."^4.0.0" =
+    self.by-version."xtend"."4.0.0";
+  by-version."xtend"."4.0.0" = self.buildNodePackage {
+    name = "xtend-4.0.0";
+    version = "4.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
+      name = "xtend-4.0.0.tgz";
+      sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."yargs"."~3.5.4" =
+    self.by-version."yargs"."3.5.4";
+  by-version."yargs"."3.5.4" = self.buildNodePackage {
+    name = "yargs-3.5.4";
+    version = "3.5.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz";
+      name = "yargs-3.5.4.tgz";
+      sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361";
+    };
+    deps = {
+      "camelcase-1.1.0" = self.by-version."camelcase"."1.1.0";
+      "decamelize-1.0.0" = self.by-version."decamelize"."1.0.0";
+      "window-size-0.1.0" = self.by-version."window-size"."0.1.0";
+      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbda5432032..29b7d16cf21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2949,6 +2949,8 @@ let
 
   shotwell = callPackage ../applications/graphics/shotwell { };
 
+  shout = callPackage ../applications/networking/irc/shout { };
+
   shellinabox = callPackage ../servers/shellinabox { };
 
   sic = callPackage ../applications/networking/irc/sic { };

From cb7c053383ff76a454484992b3a6d6a2f1530c15 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 31 Jul 2015 16:21:01 -0700
Subject: [PATCH 0585/2016] add fixes to gcc-4.8

---
 .../development/compilers/gcc/4.8/default.nix | 28 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index ff1d388b6e2..bbf730a26fa 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -32,7 +32,7 @@
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
-, gnused ? null
+, CF ? null
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -47,8 +47,8 @@ assert cloog != null -> isl != null;
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
-# Make sure we get GNU sed.
-assert stdenv.isDarwin -> gnused != null;
+# Make sure we get CoreFoundation
+assert stdenv.isDarwin -> CF != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
@@ -288,10 +288,6 @@ stdenv.mkDerivation ({
     ++ (optionals (cross != null) [binutilsCross])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
-
-    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
-    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
-    ++ (optional stdenv.isDarwin gnused)
     ;
 
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
@@ -302,14 +298,10 @@ stdenv.mkDerivation ({
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
     export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
-      configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
-      makeFlagsArray+=( \
-       CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
-       CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
-       FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
-      )
-    fi
+    configureFlagsArray+=(
+      --with-sysroot="${stdenv.libc}"
+      --with-native-system-header-dir=/include
+    )
   '';
 
   dontDisableStatic = true;
@@ -478,10 +470,10 @@ stdenv.mkDerivation ({
                                           ++ optionals javaAwtGtk [ gmp mpfr ]
                                           ++ optional (libpthread != null) libpthread)));
 
-  EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null
+  extraFlags =
+    (if cross != null && libcCross != null
     then "-idirafter ${libcCross}/include"
-    else null;
+    else "") + optionalString stdenv.isDarwin " -F${CF}/Library/Frameworks";
 
   EXTRA_TARGET_LDFLAGS =
     if cross != null && libcCross != null
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ed60e94358..baaa1872416 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3832,6 +3832,8 @@ let
     libcCross = if crossSystem != null then libcCross else null;
 
     isl = isl_0_14;
+
+    inherit (darwin) CF;
   }));
 
   gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 {

From 3989c87ee1c326f7b986d8fe9c4137473169cc51 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 11:52:31 -0700
Subject: [PATCH 0586/2016] ldb: 1.1.20 -> 1.1.21

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

diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index b400ff813d2..07d4b034474 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ldb-1.1.20";
+  name = "ldb-1.1.21";
 
   src = fetchurl {
     url = "mirror://samba/ldb/${name}.tar.gz";
-    sha256 = "1ckplfvr8rp5y632w5j0abdgkj3irbzjh1wn0yxadnhz4ymknjds";
+    sha256 = "1wfvqys8g3l2gki5xhf5jc50f6k95vdgzb97vvqfls404xzvnyr6";
   };
 
   buildInputs = [
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    echo $PYTHONPATH
     sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf
   '';
 

From 898660f2d0453d64a953b7d6bf89068c1dab44f7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 11:52:59 -0700
Subject: [PATCH 0587/2016] talloc: 2.1.2 -> 2.1.3

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

diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index d9f52d8d87c..467ccf9db86 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "talloc-2.1.2";
+  name = "talloc-2.1.3";
 
   src = fetchurl {
     url = "mirror://samba/talloc/${name}.tar.gz";
-    sha256 = "13c365f7y8idjf2v1jxdjpkc3lxdmsxxfxjx1ymianm7zjiph393";
+    sha256 = "1c1c3zs13qyripjwcjpz2hqc3p9p50m5yl95gdrrrvyl49dzg9bs";
   };
 
   buildInputs = [

From 40f45dcb6d8fa8c0e7831667b9bbe1a0575ff7d2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 11:53:09 -0700
Subject: [PATCH 0588/2016] tdb: 1.3.6 -> 1.3.7

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

diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index 46f4bb68347..2bb47df20cf 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tdb-1.3.6";
+  name = "tdb-1.3.7";
 
   src = fetchurl {
     url = "mirror://samba/tdb/${name}.tar.gz";
-    sha256 = "19arbbicw469q6a9m8yyaigrxzrxkb1jnajlvq1v7n2qgqjdvmw5";
+    sha256 = "04k42cjvjc5wsqsqf44397hclq3nxlm9avjcsbz2hsn01k59akd6";
   };
 
   buildInputs = [

From 308da3054e60c286ae525488a311445a7693a0ec Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 12:38:36 -0700
Subject: [PATCH 0589/2016] ustr: Cleanup

---
 pkgs/development/libraries/ustr/default.nix | 30 ++++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix
index b016a6f715c..9a7475969c6 100644
--- a/pkgs/development/libraries/ustr/default.nix
+++ b/pkgs/development/libraries/ustr/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, glibc }:
-stdenv.mkDerivation rec {
+{ stdenv, fetchurl }:
 
+stdenv.mkDerivation rec {
   name = "ustr-${version}";
   version = "1.0.4";
 
@@ -9,14 +9,30 @@ stdenv.mkDerivation rec {
     sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx";
   };
 
-  prePatch = "substituteInPlace Makefile --replace /usr/include/ ${glibc}/include/";
+  # Fixes bogus warnings that failed libsemanage
+  patches = [ ./va_args.patch ];
 
-  patches = [ ./va_args.patch ]; # fixes bogus warnings that failed libsemanage
+  # Work around gcc5 switch to gnu11
+  NIX_CFLAGS_COMPILE = "-std=gnu89";
 
-  makeFlags = "DESTDIR=$(out) prefix= LDCONFIG=echo";
+  # Fix detection of stdint.h
+  postPatch = ''
+    sed -i 's,\(have_stdint_h\)=0,\1=1,g' Makefile
+    sed -i 's,\(USTR_CONF_HAVE_STDINT_H\) 0,\1 1,g' ustr-import.in
+  '';
 
-  configurePhase = "make ustr-import";
-  buildInputs = [ glibc ];
+  buildTargets = [ "all-shared" ];
+
+  preBuild = ''
+    makeFlagsArray+=("prefix=$out")
+    makeFlagsArray+=("LDCONFIG=echo")
+    makeFlagsArray+=("HIDE=")
+  '';
+
+  # Remove debug libraries
+  postInstall = ''
+    find $out/lib -name \*debug\* -delete
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://www.and.org/ustr/;

From ffa178268892d668f4162a5c66c426476800acfe Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 12:40:00 -0700
Subject: [PATCH 0590/2016] libsepol: 2.3 -> 2.4

---
 pkgs/os-specific/linux/libsepol/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index 29b6d80445a..0417bf59cfa 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, flex }:
 
 stdenv.mkDerivation rec {
   name = "libsepol-${version}";
-  version = "2.3";
-  se_release = "20140506";
+  version = "2.4";
+  se_release = "20150202";
   se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases";
 
   src = fetchurl {
     url = "${se_url}/${se_release}/libsepol-${version}.tar.gz";
-    sha256 = "13z6xakc2qqyhlvnc5h53jy7lqmh5b5cnpfn51lmvfdpqd18d3fc";
+    sha256 = "0ncnwhpc1gx4hrrb822fqkwy5h75zzngsrfkd5mlqh1jk7aib419";
   };
 
-  preBuild = '' makeFlags="$makeFlags PREFIX=$out DESTDIR=$out" '';
+  nativeBuildInputs = [ flex ];
 
-  # TODO: Figure out why the build incorrectly links libsepol.so
-  postInstall = ''
-    rm $out/lib/libsepol.so
-    ln -s libsepol.so.1 $out/lib/libsepol.so
+  preBuild = ''
+    makeFlagsArray+=("PREFIX=$out")
+    makeFlagsArray+=("DESTDIR=$out")
   '';
 
   passthru = { inherit se_release se_url; };

From b18a354c888c38c9373b48db8c32b93838df159a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 12:40:17 -0700
Subject: [PATCH 0591/2016] libselinux: 2.3 -> 2.4

---
 pkgs/os-specific/linux/libselinux/default.nix | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 746f49b519d..69e5fa856e3 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -8,12 +8,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libselinux-${version}";
-  version = "2.3";
+  version = "2.4";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/libselinux-${version}.tar.gz";
-    sha256 = "1ckpiv6m5c07rp5vawlhv02w5rq8kc0n95fh2ckq2jnqxi1hn7hb";
+    sha256 = "0yqg73ns97jwjh1iyv0jr5qxb8k5sqq5ywfkx11lzfn5yj8k0126";
   };
 
   buildInputs = [ pkgconfig libsepol pcre ]
@@ -23,16 +23,19 @@ stdenv.mkDerivation rec {
     sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile
   '';
 
-  installFlags = [ "PREFIX=$(out)" "DESTDIR=$(out)" ];
-  installTargets = [ "install" ] ++ optional enablePython "install-pywrap";
+  NIX_CFLAGS_COMPILE = "-std=gnu89";
 
-  # TODO: Figure out why the build incorrectly links libselinux.so
-  postInstall = ''
-    rm $out/lib/libselinux.so
-    ln -s libselinux.so.1 $out/lib/libselinux.so
+  preBuild = ''
+    # Build fails without this precreated
+    mkdir -p $out/include
+
+    makeFlagsArray+=("PREFIX=$out")
+    makeFlagsArray+=("DESTDIR=$out")
   '';
 
-  meta = {
-    inherit (libsepol.meta) homepage platforms maintainers;
+  installTargets = [ "install" ] ++ optional enablePython "install-pywrap";
+
+  meta = libsepol.meta // {
+    description = "SELinux core library";
   };
 }

From 0b191e565b0b8d0db910fbf99019400d27396370 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 12:40:46 -0700
Subject: [PATCH 0592/2016] checkpolicy: 2.3 -> 2.4

---
 .../os-specific/linux/checkpolicy/default.nix | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix
index 1f06fb66218..d4ae82528f1 100644
--- a/pkgs/os-specific/linux/checkpolicy/default.nix
+++ b/pkgs/os-specific/linux/checkpolicy/default.nix
@@ -1,25 +1,30 @@
-{ stdenv, fetchurl, libsepol, libselinux, bison, flex }:
-stdenv.mkDerivation rec {
+{ stdenv, fetchurl, bison, flex, libsepol }:
 
+stdenv.mkDerivation rec {
   name = "checkpolicy-${version}";
-  version = "2.3";
+  version = "2.4";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz";
-    sha256 = "0yr0r2cxz9lbj7i0wqgcd4wjvc6zf1fmqk0xjybnkdpcmw8jsqwh";
+    sha256 = "1m5wjm43lzp6bld8higsvdm2dkddydihhwv9qw2w9r4dm0largcv";
   };
 
-  buildInputs = [ libsepol libselinux bison flex ];
+  nativeBuildInputs = [ bison flex ];
+  buildInputs = [ libsepol ];
 
-  preBuild = ''
-    makeFlags="$makeFlags LEX=flex LIBDIR=${libsepol}/lib PREFIX=$out"
-    sed -e 's@[.]o$@& ../lex.yy.o@' -i test/Makefile
+  # Don't build tests
+  postPatch = ''
+    sed -i '/-C test/d' Makefile
   '';
 
-  meta = with stdenv.lib; {
+  preBuild = ''
+    makeFlagsArray+=("LEX=flex")
+    makeFlagsArray+=("LIBDIR=${libsepol}/lib")
+    makeFlagsArray+=("PREFIX=$out")
+  '';
+
+  meta = libsepol.meta // {
     description = "SELinux policy compiler";
-    license = licenses.gpl2;
-    inherit (libsepol.meta) homepage platforms maintainers;
   };
 }

From f23406c0e27beff6421deb901dc1ac6fcf4c2073 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 12:40:31 -0700
Subject: [PATCH 0593/2016] libsemanage: 2.3 -> 2.4

---
 .../os-specific/linux/libsemanage/default.nix | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index 599da9e4b3c..fd94fc6b094 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, audit }:
-stdenv.mkDerivation rec {
+{ stdenv, fetchurl, bison, flex, libsepol, libselinux, ustr, bzip2, libaudit }:
 
+stdenv.mkDerivation rec {
   name = "libsemanage-${version}";
-  version = "2.3";
+  version = "2.4";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz";
-    sha256 = "0jrf66df80mvjhrsbxcnb60j69pg4dh2pydy8vj8dhhiwqsrxq03";
+    sha256 = "1134ka4mi4387ac5yv68bpp2y7ln5xxhwp07xhqnay0nxzjaqk0s";
   };
 
-  makeFlags = "PREFIX=$(out) DESTDIR=$(out)";
+  nativeBuildInputs = [ bison flex ];
+  buildInputs = [ libsepol libselinux ustr bzip2 libaudit ];
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
-  NIX_CFLAGS_LINK = "-lsepol";
+  preBuild = ''
+    makeFlagsArray+=("PREFIX=$out")
+    makeFlagsArray+=("DESTDIR=$out")
+  '';
 
-  buildInputs = [ libsepol libselinux ustr bzip2 bison flex audit ];
+  NIX_CFLAGS_COMPILE = "-fstack-protector-all -std=gnu89";
 
-  meta = with stdenv.lib; {
-    inherit (libsepol.meta) homepage platforms maintainers;
+  meta = libsepol.meta // {
     description = "Policy management tools for SELinux";
-    license = licenses.lgpl21;
+    license = stdenv.lib.licenses.lgpl21;
   };
 }

From c06b1d84f137a6c35c22110ebf4c1e7426024756 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 13:05:13 -0700
Subject: [PATCH 0594/2016] sepolgen: 1.2.1 -> 1.2.2

---
 pkgs/os-specific/linux/sepolgen/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/pkgs/os-specific/linux/sepolgen/default.nix
index 812b100699f..4067e5f70e2 100644
--- a/pkgs/os-specific/linux/sepolgen/default.nix
+++ b/pkgs/os-specific/linux/sepolgen/default.nix
@@ -2,17 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "sepolgen-${version}";
-  version = "1.2.1";
+  version = "1.2.2";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/sepolgen-${version}.tar.gz";
-    sha256 = "1c41hz4a64mjvbfhgc7c7plydahsc161z0qn46qz2g3bvimj9323";
+    sha256 = "09139kspr41zgksayi4dh982p8080lrfl96p4dld51nknbpaigdy";
   };
 
-  makeFlags = "PREFIX=$(out) DESTDIR=$(out) PYTHONLIBDIR=lib/${python.libPrefix}/site-packages";
-
-  buildInputs = [ python ];
+  preBuild = ''
+    makeFlagsArray+=("PREFIX=$out")
+    makeFlagsArray+=("DESTDIR=$out")
+    makeFlagsArray+=("PYTHONLIBDIR=lib/${python.libPrefix}/site-packages")
+  '';
 
   meta = with stdenv.lib; {
     inherit (libsepol.meta) homepage platforms maintainers;

From f6e554f28871306a0235cd9be7397cfd587a83f1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 13:02:41 -0700
Subject: [PATCH 0595/2016] selinux: Use fstack-protector=all

---
 pkgs/os-specific/linux/checkpolicy/default.nix | 2 ++
 pkgs/os-specific/linux/libselinux/default.nix  | 4 ++--
 pkgs/os-specific/linux/libsemanage/default.nix | 4 ++--
 pkgs/os-specific/linux/libsepol/default.nix    | 2 ++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix
index d4ae82528f1..9fbed50f3b9 100644
--- a/pkgs/os-specific/linux/checkpolicy/default.nix
+++ b/pkgs/os-specific/linux/checkpolicy/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ libsepol ];
 
+  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
+
   # Don't build tests
   postPatch = ''
     sed -i '/-C test/d' Makefile
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 69e5fa856e3..d3279780c7c 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libsepol pcre ]
              ++ optionals enablePython [ swig python ];
 
+  NIX_CFLAGS_COMPILE = "-fstack-protector-all -std=gnu89";
+
   postPatch = optionalString enablePython ''
     sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile
   '';
 
-  NIX_CFLAGS_COMPILE = "-std=gnu89";
-
   preBuild = ''
     # Build fails without this precreated
     mkdir -p $out/include
diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index fd94fc6b094..c60d96bba78 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ libsepol libselinux ustr bzip2 libaudit ];
 
+  NIX_CFLAGS_COMPILE = "-fstack-protector-all -std=gnu89";
+
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")
   '';
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all -std=gnu89";
-
   meta = libsepol.meta // {
     description = "Policy management tools for SELinux";
     license = stdenv.lib.licenses.lgpl21;
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix
index 0417bf59cfa..ecbb2a0ec46 100644
--- a/pkgs/os-specific/linux/libsepol/default.nix
+++ b/pkgs/os-specific/linux/libsepol/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ flex ];
 
+  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
+
   preBuild = ''
     makeFlagsArray+=("PREFIX=$out")
     makeFlagsArray+=("DESTDIR=$out")

From b7389a2d1ae56ce19b9dfaf556f183e46d7fc5ae Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 14:58:06 -0700
Subject: [PATCH 0596/2016] libaudit: Add stub

---
 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 dbda5432032..acecdb56129 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9374,6 +9374,7 @@ let
   atop = callPackage ../os-specific/linux/atop { };
 
   audit = callPackage ../os-specific/linux/audit { };
+  libaudit = audit;
 
   b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { };
 

From 3ada013455862eeea16a224a140be20aa7e6dbcd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 15:14:58 -0700
Subject: [PATCH 0597/2016] setools: 3.3.8 -> 2015-02-12

---
 pkgs/os-specific/linux/setools/default.nix    | 34 +++++++++----------
 .../ftbfs-invalid-operands-of-types.patch     | 15 --------
 2 files changed, 17 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/setools/ftbfs-invalid-operands-of-types.patch

diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix
index 63a43b2b5e9..bb17683800f 100644
--- a/pkgs/os-specific/linux/setools/default.nix
+++ b/pkgs/os-specific/linux/setools/default.nix
@@ -1,28 +1,28 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, bison, flex
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, bison, flex
 , python, swig2, tcl, libsepol, libselinux, libxml2, sqlite, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "setools-3.3.8";
+  name = "setools-2015-02-12";
 
-  src = fetchurl {
-    url = "http://oss.tresys.com/projects/setools/chrome/site/dists/${name}/${name}.tar.bz2";
-    sha256 = "16g987ijaxabc30zyjzia4nafq49rm038y1pm4vca7i3kb67wf24";
+  src = fetchFromGitHub {
+    owner = "TresysTechnology";
+    repo = "setools3";
+    rev = "f1e5b208d507171968ca4d2eeefd7980f1004a3c";
+    sha256 = "02gzy2kpszhr13f0d9qfiwh2hj4201g2x366j53v5n5qz481aykd";
   };
 
-  patches = [ ./ftbfs-invalid-operands-of-types.patch ];
+  configureFlags = [
+    "--disable-gui"
+    "--with-sepol-devel=${libsepol}"
+    "--with-selinux-devel=${libselinux}"
+    "--with-tcl=${tcl}/lib"
+  ];
 
-  # SWIG-TCL is broken in 3.3.8
-  configureFlags = ''
-    --with-tcl=${tcl}/lib
-    --with-sepol-devel=${libsepol}
-    --with-selinux-devel=${libselinux}
-    --disable-gui
-    --disable-swig-tcl
-  '';
+  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
+  NIX_LDFLAGS = "-L${libsepol}/lib -L${libselinux}/lib";
 
-  buildInputs = [ autoreconfHook pkgconfig bison flex python swig2 ];
-
-  nativeBuildInputs = [ tcl libsepol libselinux libxml2 sqlite bzip2 ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig python swig2 bison flex ];
+  buildInputs = [ tcl libxml2 sqlite bzip2 ];
 
   meta = {
     description = "SELinux Tools";
diff --git a/pkgs/os-specific/linux/setools/ftbfs-invalid-operands-of-types.patch b/pkgs/os-specific/linux/setools/ftbfs-invalid-operands-of-types.patch
deleted file mode 100644
index 97a5727f05b..00000000000
--- a/pkgs/os-specific/linux/setools/ftbfs-invalid-operands-of-types.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750331
-
-Index: setools-git/secmds/replcon.cc
-===================================================================
---- setools-git.orig/secmds/replcon.cc
-+++ setools-git/secmds/replcon.cc
-@@ -60,7 +60,7 @@ static struct option const longopts[] =
- 	{NULL, 0, NULL, 0}
- };
- 
--extern int lsetfilecon_raw(const char *, security_context_t) __attribute__ ((weak));
-+extern int lsetfilecon_raw(const char *, const char *) __attribute__ ((weak));
- 
- /**
-  * As that setools must work with older libselinux versions that may

From c53a13fe0e11cab6bbd8877205b3a1da6fa2592f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 17:00:57 -0700
Subject: [PATCH 0598/2016] policycoreutils: 2.3 -> 2.4

---
 pkgs/os-specific/linux/libselinux/default.nix |  2 +-
 .../linux/policycoreutils/default.nix         | 54 ++++++++++++-------
 .../linux/policycoreutils/size_format.patch   | 11 ----
 3 files changed, 35 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/policycoreutils/size_format.patch

diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index d3279780c7c..22ff351e45a 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libsepol, pcre
-, enablePython ? false, swig ? null, python ? null
+, enablePython ? true, swig ? null, python ? null
 }:
 
 assert enablePython -> swig != null && python != null;
diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
index ef7e76824db..4eb8394a4d3 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -1,29 +1,38 @@
-{ stdenv, fetchurl, intltool, pcre, libcap_ng, libcgroup
-, libsepol, libselinux, libsemanage, setools
-, python, sepolgen }:
-stdenv.mkDerivation rec {
+{ stdenv, fetchurl, pythonPackages, gettext
+, setools, libsepol, libselinux, libcap_ng, libsemanage, sepolgen
+}:
 
+stdenv.mkDerivation rec {
   name = "policycoreutils-${version}";
-  version = "2.3";
+  version = "2.4";
   inherit (libsepol) se_release se_url;
 
   src = fetchurl {
     url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz";
-    sha256 = "1lpwxr5hw3dwhlp2p7y8jcr18mvfcrclwd8c2idz3lmmb3pglk46";
+    sha256 = "0y9l9k60iy21hj0lcvfdfxs1fxydg6d3pxp9rhy7hwr4y5vgh6dq";
   };
 
-  preConfigure = ''
+  postPatch = ''
+    # Fix references to libsepol.a
+    find . -name Makefile -exec sed -i 's,[^ ]*/libsepol.a,${libsepol}/lib/libsepol.a,g' {} \;
+
+    # Fix install references
     substituteInPlace po/Makefile --replace /usr/bin/install install
-    find . -type f -exec sed -i 's,/usr/bin/python,${python}/bin/python,' {} \;
+
+    # Fix references to /usr/share
+    grep -r '/usr/share' | awk -F: '{print $1}' | xargs sed -i "s,\(\$(DESTDIR)\)*/usr/share,$out/share,g"
+
+    # Fix sepolicy install
+    sed -i "s,\(setup.py install\).*,\1 --prefix=$out,g" sepolicy/Makefile
   '';
 
-  buildInputs = [ intltool pcre libcap_ng libcgroup
-    libsepol libselinux libsemanage setools
-    python sepolgen # ToDo? these are optional
-  ];
+  nativeBuildInputs = [ pythonPackages.python gettext ];
+  buildInputs = [ setools libsepol libselinux libcap_ng libsemanage ];
+  pythonPath = [ libselinux sepolgen ];
 
   preBuild = ''
-    mkdir -p "$out/lib" && cp -s "${libsepol}/lib/libsepol.a" "$out/lib"
+    makeFlagsArray+=("PREFIX=$out")
+    makeFlagsArray+=("DESTDIR=$out")
   '';
 
   # Creation of the system-config-selinux directory is broken
@@ -31,14 +40,19 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/system-config-selinux
   '';
 
+  # Fix the python scripts to include paths to libraries
+  # NOTE: We are not using wrapPythonPrograms or makeWrapper as these scripts
+  # purge the environment as a security measure
+  postInstall = ''
+    grep -r '#!.*python' $out/bin | awk -F: '{print $1}' | xargs sed -i "1a \
+    import sys; \
+    sys.path.append('$(toPythonPath "$out")'); \
+    ${stdenv.lib.flip stdenv.lib.concatMapStrings pythonPath (lib: ''
+      sys.path.append('$(toPythonPath "${lib}")'); \
+    '')}"
+  '';
+
   NIX_CFLAGS_COMPILE = "-fstack-protector-all";
-  NIX_LDFLAGS = "-lsepol -lpcre";
-
-  makeFlags = "PREFIX=$(out) DESTDIR=$(out) LOCALEDIR=$(out)/share/locale";
-
-  patches = [ ./size_format.patch ];
-
-  patchFlags = [ "-p0" ];
 
   meta = with stdenv.lib; {
     description = "SELinux policy core utilities";
diff --git a/pkgs/os-specific/linux/policycoreutils/size_format.patch b/pkgs/os-specific/linux/policycoreutils/size_format.patch
deleted file mode 100644
index 04432098547..00000000000
--- a/pkgs/os-specific/linux/policycoreutils/size_format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setfiles/restore.c.orig	2014-08-21 17:26:00.200788259 +0200
-+++ setfiles/restore.c	2014-08-21 17:26:04.728888118 +0200
-@@ -118,7 +118,7 @@
- 		r_opts->count++;
- 		if (r_opts->count % STAR_COUNT == 0) {
- 			if (r_opts->progress == 1) {
--				fprintf(stdout, "\r%luk", (size_t) r_opts->count / STAR_COUNT );
-+				fprintf(stdout, "\r%zuk", (size_t) r_opts->count / STAR_COUNT );
- 			} else {
- 				if (r_opts->nfile > 0) {
- 					progress = (r_opts->count < r_opts->nfile) ? (100.0 * r_opts->count / r_opts->nfile) : 100;

From 7a6b3bf6880b45f1a55ff371564f5c91e26d781f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 17:07:44 -0700
Subject: [PATCH 0599/2016] cgmanager: 0.36 -> 0.37

---
 pkgs/os-specific/linux/cgmanager/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/cgmanager/default.nix b/pkgs/os-specific/linux/cgmanager/default.nix
index 79be500a13d..8f56eda3a1b 100644
--- a/pkgs/os-specific/linux/cgmanager/default.nix
+++ b/pkgs/os-specific/linux/cgmanager/default.nix
@@ -1,31 +1,21 @@
 { stdenv, fetchurl, pkgconfig, libnih, dbus }:
 
 stdenv.mkDerivation rec {
-  name = "cgmanager-0.36";
+  name = "cgmanager-0.37";
 
   src = fetchurl {
     url = "https://linuxcontainers.org/downloads/cgmanager/${name}.tar.gz";
-    sha256 = "039azd4ghpmiccd95ki8fna321kccapff00rib6hrdgg600pyw7l";
+    sha256 = "0vkv8am6h3x89c1rqb6a1glwz3mik3065jigri96njjzmvrff2c3";
   };
 
   buildInputs = [ pkgconfig libnih dbus ];
 
   configureFlags = [
     "--with-init-script=systemd"
-    "--sysconfdir=/etc/"
+    "--sysconfdir=/etc"
     "--localstatedir=/var"
   ];
 
-  installFlags = [ "DESTDIR=\${out}" ];
-
-  postInstall = ''
-    mv $out/$out/* $out
-    DIR=$out/$out
-    while rmdir $DIR 2>/dev/null; do
-      DIR="$(dirname "$DIR")"
-    done
-  '';
-
   meta = with stdenv.lib; {
     homepage = https://linuxcontainers.org/cgmanager/introduction/;
     description = "a central privileged daemon that manages all your cgroups";

From 85e2c8ff23feb5f6344acde44d8b51d46c4ba89a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 31 Jul 2015 17:08:04 -0700
Subject: [PATCH 0600/2016] lxc: Cleanup

---
 pkgs/os-specific/linux/lxc/default.nix | 36 +++++++++++++++++---------
 pkgs/top-level/all-packages.nix        |  4 +--
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 1c6847cce82..c7170d5b464 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -1,7 +1,9 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, docbook2x
-, docbook_xml_dtd_45, systemd, wrapPython
-, libapparmor ? null, gnutls ? null, libseccomp ? null, cgmanager ? null
-, libnih ? null, dbus ? null, libcap ? null, python3 ? null
+, docbook_xml_dtd_45, python3Packages
+
+# Optional Dependencies
+, libapparmor ? null, gnutls ? null, libselinux ? null, libseccomp ? null
+, cgmanager ? null, libnih ? null, dbus ? null, libcap ? null, systemd ? null
 }:
 
 let
@@ -18,10 +20,12 @@ stdenv.mkDerivation rec {
     sha256 = "149nq630h9bg87hb3cn086ci0cz29l7fp3i6qf1mqxv7hnildm8p";
   };
 
+  nativeBuildInputs = [
+    autoreconfHook pkgconfig perl docbook2x python3Packages.wrapPython
+  ];
   buildInputs = [
-    autoreconfHook pkgconfig perl docbook2x systemd
-    libapparmor gnutls libseccomp cgmanager libnih dbus libcap python3
-    wrapPython
+    libapparmor gnutls libselinux libseccomp cgmanager libnih dbus libcap
+    python3Packages.python systemd
   ];
 
   patches = [ ./support-db2x.patch ];
@@ -31,17 +35,23 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"
-    "--with-rootfs-path=/var/lib/lxc/rootfs"
+    "--enable-doc"
+    "--disable-api-docs"
   ] ++ optional (libapparmor != null) "--enable-apparmor"
-    ++ optional (gnutls != null) "--enable-gnutls"
+    ++ optional (libselinux != null) "--enable-selinux"
     ++ optional (libseccomp != null) "--enable-seccomp"
-    ++ optional (enableCgmanager) "--enable-cgmanager"
     ++ optional (libcap != null) "--enable-capabilities"
     ++ [
-    "--enable-doc"
-    "--enable-tests"
+    "--disable-examples"
+    "--enable-python"
+    "--disable-lua"
+    "--enable-bash"
+    (if doCheck then "--enable-tests" else "--disable-tests")
+    "--with-rootfs-path=/var/lib/lxc/rootfs"
   ];
 
+  doCheck = false;
+
   installFlags = [
     "localstatedir=\${TMPDIR}"
     "sysconfdir=\${out}/etc"
@@ -50,7 +60,9 @@ stdenv.mkDerivation rec {
     "LXCPATH=\${TMPDIR}/var/lib/lxc"
   ];
 
-  postInstall = "wrapPythonPrograms";
+  postInstall = ''
+    wrapPythonPrograms
+  '';
 
   meta = {
     homepage = "http://lxc.sourceforge.net";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acecdb56129..149c77a0bf2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2140,9 +2140,7 @@ let
 
   lshw = callPackage ../tools/system/lshw { };
 
-  lxc = callPackage ../os-specific/linux/lxc {
-    wrapPython = python3Packages.wrapPython;
-  };
+  lxc = callPackage ../os-specific/linux/lxc { };
 
   lzip = callPackage ../tools/compression/lzip { };
 

From b80df37494407b0d5410365fe2446f573dd0d83a Mon Sep 17 00:00:00 2001
From: Fabian Kirchner <kirchner@posteo.de>
Date: Sat, 1 Aug 2015 11:03:40 +0200
Subject: [PATCH 0601/2016] Add monkeysphere package

---
 pkgs/tools/security/monkeysphere/default.nix  | 43 +++++++++
 .../security/monkeysphere/monkeysphere.patch  | 92 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 137 insertions(+)
 create mode 100644 pkgs/tools/security/monkeysphere/default.nix
 create mode 100644 pkgs/tools/security/monkeysphere/monkeysphere.patch

diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
new file mode 100644
index 00000000000..99d25007723
--- /dev/null
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, perl, makeWrapper, perlPackages }:
+
+stdenv.mkDerivation rec {
+  name = "monkeysphere-${version}";
+  version = "0.37";
+
+  src = fetchurl {
+    url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz";
+    sha256 = "0nbfd220miflah5l2y20qlmgfpbqi0j8h7qgx1b06h7v2jjbh45m";
+  };
+
+  buildInputs = [ makeWrapper perl ];
+
+  patches = [ ./monkeysphere.patch ];
+
+  makeFlags = ''
+    PREFIX=/
+    DESTDIR=$(out)
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/openpgp2ssh --prefix PERL5LIB : \
+      "${with perlPackages; stdenv.lib.makePerlPath [
+        CryptOpenSSLRSA
+        CryptOpenSSLBignum
+      ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://web.monkeysphere.info/;
+    description = ''
+      The Monkeysphere project's goal is to extend OpenPGP's web of
+      trust to new areas of the Internet to help us securely identify
+      servers we connect to, as well as each other while we work online.
+      The suite of Monkeysphere utilities provides a framework to
+      transparently leverage the web of trust for authentication of
+      TLS/SSL communications through the normal use of tools you are
+      familiar with, such as your web browser0 or secure shell.
+    '';
+    license = licenses.gpl3;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/tools/security/monkeysphere/monkeysphere.patch
new file mode 100644
index 00000000000..8b343b93454
--- /dev/null
+++ b/pkgs/tools/security/monkeysphere/monkeysphere.patch
@@ -0,0 +1,92 @@
+diff -rupN monkeysphere-0.37/Makefile monkeysphere-0.37-patched/Makefile
+--- monkeysphere-0.37/Makefile	2014-08-06 19:27:38.000000000 +0200
++++ monkeysphere-0.37-patched/Makefile	2015-07-31 19:51:57.539373097 +0200
+@@ -42,11 +42,11 @@ install: all installman
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
+ 	printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION
+ 	install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
++	sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
+ 	install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
++	sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
+ 	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
++	sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
+ 	install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0755 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
+@@ -59,8 +59,8 @@ install: all installman
+ 	ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2pem
+ 	ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2spki
+ 	install -m 0744 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28
++	sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23
++	sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28
+ 	install -m 0644 src/transitions/README.txt $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+ 	install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
+ 	install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
+diff -rupN monkeysphere-0.37/src/share/checkperms monkeysphere-0.37-patched/src/share/checkperms
+--- monkeysphere-0.37/src/share/checkperms	2014-08-06 19:27:38.000000000 +0200
++++ monkeysphere-0.37-patched/src/share/checkperms	2015-07-31 19:52:18.170675985 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/usr/bin/perl
+ 
+ # checkperms: ensure as best we can that a given file can only be
+ # modified by the given user (or the superuser, naturally).  This
+diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/share/keytrans
+--- monkeysphere-0.37/src/share/keytrans	2014-08-06 19:27:38.000000000 +0200
++++ monkeysphere-0.37-patched/src/share/keytrans	2015-07-31 20:13:36.664514290 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/usr/bin/perl
+ 
+ # keytrans: this is an RSA key translation utility; it is capable of
+ # transforming RSA keys (both public keys and secret keys) between
+@@ -1069,7 +1069,7 @@ sub packetwalk {
+ 
+ 
+ for (basename($0)) {
+-  if (/^pem2openpgp$/) {
++  if (/pem2openpgp/) {
+     my $rsa;
+     my $stdin;
+ 
+@@ -1107,7 +1107,7 @@ for (basename($0)) {
+ 		      }
+ 		     );
+   }
+-  elsif (/^openpgp2ssh$/) {
++  elsif (/openpgp2ssh/) {
+       my $fpr = shift;
+       my $instream;
+       open($instream,'-');
+@@ -1123,7 +1123,7 @@ for (basename($0)) {
+ 	die "No matching key found.\n";
+       }
+   }
+-  elsif (/^openpgp2pem$/) {
++  elsif (/openpgp2pem/) {
+       my $fpr = shift;
+       my $instream;
+       open($instream,'-');
+@@ -1139,7 +1139,7 @@ for (basename($0)) {
+ 	die "No matching key found.\n";
+       }
+   }
+-  elsif (/^openpgp2spki$/) {
++  elsif (/openpgp2spki/) {
+       my $fpr = shift;
+       my $instream;
+       open($instream,'-');
+@@ -1151,7 +1151,7 @@ for (basename($0)) {
+ 	die "No matching key found.\n";
+       }
+   }
+-  elsif (/^keytrans$/) {
++  elsif (/keytrans/) {
+     # subcommands when keytrans is invoked directly are UNSUPPORTED,
+     # UNDOCUMENTED, and WILL NOT BE MAINTAINED.
+     my $subcommand = shift;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dda7224cb39..b4a14978e38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12042,6 +12042,8 @@ let
 
   monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
 
+  monkeysphere = callPackage ../tools/security/monkeysphere { };
+
   monodevelop = callPackage ../applications/editors/monodevelop {};
 
   monotone = callPackage ../applications/version-management/monotone {

From b6160fa7362ab62f7ad40477d63350827307e2d8 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sat, 1 Aug 2015 13:28:41 +0300
Subject: [PATCH 0602/2016] monkeysphere: fix description

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

diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index 99d25007723..f0d3a870676 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://web.monkeysphere.info/;
-    description = ''
+    description = "Leverage the OpenPGP web of trust for SSH and TLS authentication";
+    longDescription = ''
       The Monkeysphere project's goal is to extend OpenPGP's web of
       trust to new areas of the Internet to help us securely identify
       servers we connect to, as well as each other while we work online.

From ad4c95716383215b71af85c254b9320903f6f7e5 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 31 Jul 2015 16:15:18 -0700
Subject: [PATCH 0603/2016] shout service: New module.

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

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index b53b9c47b01..b25e3d7e40d 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -227,6 +227,7 @@
       riemanntools = 203;
       subsonic = 204;
       riak = 205;
+      shout = 206;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -432,6 +433,7 @@
       riemanntools = 203;
       subsonic = 204;
       riak = 205;
+      #shout = 206; #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 c56e6a82e83..212555d7efc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -328,6 +328,7 @@
   ./services/networking/searx.nix
   ./services/networking/seeks.nix
   ./services/networking/skydns.nix
+  ./services/networking/shout.nix
   ./services/networking/spiped.nix
   ./services/networking/sslh.nix
   ./services/networking/ssh/lshd.nix
diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix
new file mode 100644
index 00000000000..f55b87a9614
--- /dev/null
+++ b/nixos/modules/services/networking/shout.nix
@@ -0,0 +1,80 @@
+{ pkgs, lib, config, options, ... }:
+
+with lib;
+
+let
+  cfg = config.services.shout;
+  shoutHome = "/var/lib/shout";
+
+in {
+  options.services.shout = {
+    enable = mkEnableOption "Shout web IRC client";
+
+    private = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Make your shout instance private. You will need to configure user
+        accounts by adding entries in <filename>${shoutHome}/users</filename>.
+      '';
+    };
+
+    host = mkOption {
+      type = types.string;
+      default = "0.0.0.0";
+      description = "IP interface to listen on for http connections.";
+    };
+
+    port = mkOption {
+      type = types.int;
+      default = 9000;
+      description = "TCP port to listen on for http connections.";
+    };
+
+    configFile = mkOption {
+      type = types.nullOr types.lines;
+      default = null;
+      description = ''
+        Contents of Shout's <filename>config.js</filename> file. If left empty,
+        Shout will generate from its defaults at first startup.
+
+        Documentation: http://shout-irc.com/docs/server/configuration.html
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraUsers = singleton {
+      name = "shout";
+      uid = config.ids.uids.shout;
+      description = "Shout daemon user";
+      home = shoutHome;
+      createHome = true;
+    };
+
+    systemd.services.shout = {
+      description = "Shout web IRC client";
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+      preStart = if isNull cfg.configFile then null
+                 else ''
+                   ln -sf ${pkgs.writeText "config.js" cfg.configFile} \
+                          ${shoutHome}/config.js
+                 '';
+      script = concatStringsSep " " [
+        "${pkgs.shout}/bin/shout"
+        (if cfg.private then "--private" else "--public")
+        "--port" (toString cfg.port)
+        "--host" (toString cfg.host)
+        "--home" shoutHome
+      ];
+      serviceConfig = {
+        User = "shout";
+        ProtectHome = "true";
+        ProtectSystem = "full";
+        PrivateTmp = "true";
+      };
+    };
+  };
+}

From aa63d4299ff3236f8a47d7b20434be7785902d40 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sat, 1 Aug 2015 16:56:06 +0200
Subject: [PATCH 0604/2016] tcsd module: expose firmwarePCRs and kernelPCRs

---
 nixos/modules/services/hardware/tcsd.nix | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix
index 220b154bd97..ced2d49c1e1 100644
--- a/nixos/modules/services/hardware/tcsd.nix
+++ b/nixos/modules/services/hardware/tcsd.nix
@@ -17,8 +17,8 @@ let
     # what is available directly from the PCR registers.
     firmware_log_file = /sys/kernel/security/tpm0/binary_bios_measurements
     kernel_log_file = /sys/kernel/security/ima/binary_runtime_measurements
-    #firmware_pcrs = 0,1,2,3,4,5,6,7
-    #kernel_pcrs = 10,11
+    firmware_pcrs = ${cfg.firmwarePCRs}
+    kernel_pcrs = ${cfg.kernelPCRs}
     platform_cred = ${cfg.platformCred}
     conformance_cred = ${cfg.conformanceCred}
     endorsement_cred = ${cfg.endorsementCred}
@@ -60,20 +60,32 @@ in
       };
 
       stateDir = mkOption {
-	default = "/var/lib/tpm";
+        default = "/var/lib/tpm";
         type = types.path;
-	description = ''
+        description = ''
           The location of the system persistent storage file.
           The system persistent storage file holds keys and data across
           restarts of the TCSD and system reboots. 
-	'';
+        '';
+      };
+
+      firmwarePCRs = mkOption {
+        default = "0,1,2,3,4,5,6,7";
+        type = types.string;
+        description = "PCR indices used in the TPM for firmware measurements.";
+      };
+
+      kernelPCRs = mkOption {
+        default = "10,11";
+        type = types.string;
+        description = "PCR indices used in the TPM for kernel measurements.";
       };
 
       platformCred = mkOption {
         default = "${cfg.stateDir}/platform.cert";
         type = types.path;
         description = ''
-	  Path to the platform credential for your TPM. Your TPM
+          Path to the platform credential for your TPM. Your TPM
           manufacturer may have provided you with a set of credentials
           (certificates) that should be used when creating identities
           using your TPM. When a user of your TPM makes an identity,

From 56b39c2cc57bed61b9656a55b5275d7771fb5636 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 29 Jun 2015 16:45:01 +0200
Subject: [PATCH 0605/2016] minisign: init at 0.4

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

diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix
new file mode 100644
index 00000000000..48de14ddce6
--- /dev/null
+++ b/pkgs/tools/security/minisign/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, cmake, libsodium }:
+
+stdenv.mkDerivation rec {
+  name = "minisign-${version}";
+  version = "0.4";
+
+  src = fetchurl {
+    url = "https://github.com/jedisct1/minisign/archive/${version}.tar.gz";
+    sha256 = "1k1dk6piaz8pw4b9zg55n4wcpyc301mkxb873njm8mki7r8raxnw";
+  };
+
+  buildInputs = [ cmake libsodium ];
+
+  meta = with stdenv.lib; {
+    description = "A simple tool for signing files and verifying signatures";
+    longDescription = ''
+      minisign uses public key cryptography to help facilitate secure (but not
+      necessarily private) file transfer, e.g., of software artefacts. minisign
+      is similar to and compatible with OpenBSD's signify.
+    '';
+    homepage = https://jedisct1.github.io/minisign/;
+    license = licenses.isc;
+    maintainers = with maintainers; [ joachifm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4a14978e38..6562fa0b8ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2026,6 +2026,8 @@ let
 
   minidlna = callPackage ../tools/networking/minidlna { };
 
+  minisign = callPackage ../tools/security/minisign { };
+
   mmv = callPackage ../tools/misc/mmv { };
 
   morituri = callPackage ../applications/audio/morituri { };

From abaedd5de57ba75c9c022169a8901913a3f25573 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@titanous.com>
Date: Sat, 1 Aug 2015 13:32:32 -0400
Subject: [PATCH 0606/2016] makemkv: 1.9.4 -> 1.9.5

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

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 7d604101f4b..040f74c16ff 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -4,17 +4,17 @@
 
 stdenv.mkDerivation rec {
   name = "makemkv-${ver}";
-  ver = "1.9.4";
+  ver = "1.9.5";
   builder = ./builder.sh;
 
   src_bin = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
-    sha256 = "0xr5bfbpzd1s9fyxbwj0crpgi57hm4wrm1dybx13lv4n6xdj2ww0";
+    sha256 = "1qzkdrij89s748rvmibx083g1irfm8dqx257skr45i2gsg2qqijp";
   };
 
   src_oss = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
-    sha256 = "0gpmyp2g44piaj47a52ik5i3sk5flbs8kqlqmjxnqkv16s01vfra";
+    sha256 = "1immnlx1rld8iw89fxgq2sk2l050sa8h046ka8mdwg8682d75lfg";
   };
 
   buildInputs = [openssl qt4 mesa zlib pkgconfig libav];

From 9cac20afa856b4ebd648239fb836a6c0ae679cfb Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 1 Aug 2015 21:11:58 +0200
Subject: [PATCH 0607/2016] cv: update from 0.7.1 to 0.8

---
 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 5b54ed1d4cf..a92bfcdb35d 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.7.1";
+  version = "0.8";
 
   src = fetchFromGitHub {
     owner = "Xfennec";
     repo = "cv";
     rev = "v${version}";
-    sha256 = "1dcq45mz443mzzf344ap5dgsazhcrn3aislxs57jqbg4p5bbmh1b";
+    sha256 = "17vfcv0n1ib4rh1hdl126aid7cnnk94avzlk9yp7y855iml8xzs4";
   };
 
   buildInputs = [ ncurses ];

From 8c652379df07f88d6b434fe1042e9a9ba9078440 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 28 May 2015 12:18:31 +0200
Subject: [PATCH 0608/2016] locate: option includeStore

---
 nixos/doc/manual/release-notes/rl-unstable.xml |  9 +++++++++
 nixos/modules/misc/locate.nix                  | 10 +++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index abfd417c53a..7106690b82b 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -179,6 +179,15 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
   </para>
 </listitem>
 
+<listitem>
+  <para>
+    The <literal>locate</literal> service no longer indexes the nix store
+    by default, preventing packages with potentially numerous versions from
+    cluttering the output. Indexing the store can be activated with
+    <literal>services.locate.includeStore = true;</literal>.
+  </para>
+</listitem>
+
 </itemizedlist>
 </para>
 
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index f3ed2aaba09..bf05c460729 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -56,6 +56,14 @@ in {
         '';
       };
 
+      includeStore = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to include /nix/store in the locate database.
+        '';
+      };
+
     };
 
   };
@@ -63,7 +71,6 @@ in {
   ###### implementation
 
   config = {
-
     systemd.services.update-locatedb =
       { description = "Update Locate Database";
         path  = [ pkgs.su ];
@@ -72,6 +79,7 @@ in {
             mkdir -m 0755 -p $(dirname ${toString cfg.output})
             exec updatedb \
             --localuser=${cfg.localuser} \
+	    ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \
             --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
           '';
         serviceConfig.Nice = 19;

From 4739848cbaef02f95eff820fc3eadf653f0fb378 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 1 Aug 2015 18:04:40 -0700
Subject: [PATCH 0609/2016] libs3: 2015-01-09 -> 2015-04-23

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

diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix
index 62970b71904..f5c4683e730 100644
--- a/pkgs/development/libraries/libs3/default.nix
+++ b/pkgs/development/libraries/libs3/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, curl, libxml2 }:
 
 stdenv.mkDerivation {
-  name = "libs3-2015-01-09";
+  name = "libs3-2015-04-23";
 
   src = fetchFromGitHub {
     owner = "bji";
     repo = "libs3";
-    rev = "4d21fdc0857b88c964649b321057d7105d1e4da3";
-    sha256 = "1c33h8lzlpmsbkymd2dac9g8hqhd6j6yzdjrhha8bcqyys6vcpy3";
+    rev = "11a4e976c28ba525e7d61fbc3867c345a2af1519";
+    sha256 = "0xjjwyw14sk9am6s2m25hxi55vmsrc2yiawd6ln2lvg59xjcr48i";
   };
 
   buildInputs = [ curl libxml2 ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = https://github.com/bji/libs3;
     description = "A library for interfacing with amazon s3";
-    license = licenses.gpl3;
+    license = licenses.lgpl3;
     platforms = platforms.unix;
   };
 }

From dd41013dbace43cfe0ac6159c82cb193ef788355 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 1 Aug 2015 18:05:18 -0700
Subject: [PATCH 0610/2016] ceph: Remove leaveDotGit as it is non-deterministic

---
 pkgs/tools/filesystems/ceph/0.80.nix | 3 +--
 pkgs/tools/filesystems/ceph/0.94.nix | 3 +--
 pkgs/tools/filesystems/ceph/dev.nix  | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/0.80.nix b/pkgs/tools/filesystems/ceph/0.80.nix
index 3e859626ee8..ffb52f3fa5b 100644
--- a/pkgs/tools/filesystems/ceph/0.80.nix
+++ b/pkgs/tools/filesystems/ceph/0.80.nix
@@ -6,8 +6,7 @@ callPackage ./generic.nix (args // rec {
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    leaveDotGit = true;
-    sha256 = "0s81j6yj8y27hlx1hid9maz0l7bhjjskjxzxlhsikzmdc1j27m4r";
+    sha256 = "1arajccczjdqp7igs17569xlq5cj4azcm5wwixg6ryypjr2grcbl";
   };
 
   patches = [
diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
index 3947cd70f56..4dca90e5f27 100644
--- a/pkgs/tools/filesystems/ceph/0.94.nix
+++ b/pkgs/tools/filesystems/ceph/0.94.nix
@@ -6,8 +6,7 @@ callPackage ./generic.nix (args // rec {
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    leaveDotGit = true;
-    sha256 = "094f9knxgx8vb9fb1yzld9ib4m0wpqwqgqjl3xqf0dzm48nxqd73";
+    sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l";
   };
 
   patches = [
diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
index c57bc200f24..5cc183d1053 100644
--- a/pkgs/tools/filesystems/ceph/dev.nix
+++ b/pkgs/tools/filesystems/ceph/dev.nix
@@ -6,8 +6,7 @@ callPackage ./generic.nix (args // rec {
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    leaveDotGit = true;
-    sha256 = "13iyv53kq2ka5py759cdiw0wmzpsycskvhmyr74qkpxmw9g6177y";
+    sha256 = "0kydjyvb1566mh33p6dlljfx1r4cfdj8ic4i19h5r9vavkc46nf0";
   };
 
   patches = [ ./fix-pythonpath.patch ];

From 1b20c87d1f9cb9e3a90fb3077d746a9f41dbb58e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 1 Aug 2015 18:05:40 -0700
Subject: [PATCH 0611/2016] ceph-git: 2015-07-29 -> 2015-07-31

---
 pkgs/tools/filesystems/ceph/generic.nix | 7 ++++---
 pkgs/tools/filesystems/ceph/git.nix     | 7 +++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 51e304bec21..1130772ccd8 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -56,7 +56,7 @@ let
   optLibatomic_ops = shouldUsePkg libatomic_ops;
   optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client;
   optRocksdb = shouldUsePkg rocksdb;
-  optLibs3 = shouldUsePkg libs3;
+  optLibs3 = if versionAtLeast version "10.0.0" then null else shouldUsePkg libs3;
 
   optJemalloc = shouldUsePkg jemalloc;
   optGperftools = shouldUsePkg gperftools;
@@ -195,8 +195,6 @@ stdenv.mkDerivation {
     (mkWith   hasKinetic                   "kinetic"             null)
     (mkWith   hasRocksdb                   "librocksdb"          null)
     (mkWith   false                        "librocksdb-static"   null)
-    (mkWith   (optLibs3 != null)           "system-libs3"        null)
-    (mkWith   true                         "rest-bench"          null)
   ] ++ optional stdenv.isLinux [
     (mkWith   (optLibaio != null)          "libaio"              null)
     (mkWith   (optLibxfs != null)          "libxfs"              null)
@@ -207,6 +205,9 @@ stdenv.mkDerivation {
   ] ++ optional (versionAtLeast version "9.0.2") [
     (mkWith   true                         "man-pages"           null)
     (mkWith   true                         "systemd-libexec-dir" "\${TMPDIR}")
+  ] ++ optional (versionOlder version "10.0.0") [
+    (mkWith   (optLibs3 != null)           "system-libs3"        null)
+    (mkWith   true                         "rest-bench"          null)
   ];
 
   preBuild = optionalString (versionAtLeast version "9.0.0") ''
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index 8534c2fdba3..913901a0f80 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,13 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-07-29";
+  version = "2015-07-31";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "338ead0f498238fd1b5b7f18d86ad407de6f347b";
-    leaveDotGit = true;
-    sha256 = "0ip62l4qkcmszbczwdnqhn93glnpgy0fhymf627x0vf49dgv3a6i";
+    rev = "ef86e29259d0e863e62115926bf67287dc9a7e41";
+    sha256 = "14h387ngx3fmdm0b0sgl0l743j3d22gnp3lv68ah59yc4crfgdcx";
   };
 
   patches = [ ./fix-pythonpath.patch ];

From 58d1a1b07385c99a62361577ea9d16c4e3c96972 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 1 Aug 2015 18:45:23 -0700
Subject: [PATCH 0612/2016] ceph: Make python fixes more reliable

---
 pkgs/tools/filesystems/ceph/generic.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 1130772ccd8..dca6d930020 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -235,15 +235,24 @@ stdenv.mkDerivation {
     for PY in $(find $lib/lib -name \*.py); do
       LIBS="$(sed -n "s/.*find_library('\([^)]*\)').*/\1/p" "$PY")"
 
+      # Delete any calls to find_library
+      sed -i '/find_library/d' "$PY"
+
       # Fix each find_library call
       for LIB in $LIBS; do
         REALLIB="$lib/lib/lib$LIB.so"
-        sed -i "s,find_library('$LIB'),'$REALLIB',g" "$PY"
+        sed -i "s,\(lib$LIB = CDLL(\).*,\1'$REALLIB'),g" "$PY"
       done
 
       # Reapply compilation optimizations
       NAME=$(basename -s .py "$PY")
-      (cd "$(dirname $PY)"; python -c "import $NAME"; python -O -c "import $NAME")
+      rm -f "$PY"{c,o}
+      pushd "$(dirname $PY)"
+      python -c "import $NAME"
+      python -O -c "import $NAME"
+      popd
+      test -f "$PY"c
+      test -f "$PY"o
     done
   '';
 

From 376dc3e044e5721cc864543b341598df9e0c3746 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 1 Aug 2015 19:06:31 -0700
Subject: [PATCH 0613/2016] sqlite: 3.8.10.2 -> 3.8.11.1

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

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 963566e27fa..d4f1d6bcee0 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.8.10.2";
+  name = "sqlite-3.8.11.1";
 
   src = fetchurl {
-    url = "http://sqlite.org/2015/sqlite-autoconf-3081002.tar.gz";
-    sha1 = "c2f2c17d3dc4c4e179d35cc04e4420636d48a152";
+    url = "http://sqlite.org/2015/sqlite-autoconf-3081101.tar.gz";
+    sha1 = "d0e22d7e361b6f50830a3cdeafe35311443f8f9a";
   };
 
   buildInputs = lib.optionals interactive [ readline ncurses ];

From 559d2252e87e88a5c12d2314b151c2899081db32 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 1 Aug 2015 19:08:31 -0700
Subject: [PATCH 0614/2016] sqlite: Add feature flags, mostly taken from the
 gentoo ebuild

---
 pkgs/development/libraries/sqlite/default.nix | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index d4f1d6bcee0..f043a37033a 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -12,9 +12,40 @@ stdenv.mkDerivation {
 
   buildInputs = lib.optionals interactive [ readline ncurses ];
 
-  configureFlags = "--enable-threadsafe";
+  configureFlags = [ "--enable-threadsafe" ];
 
-  NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1";
+  NIX_CFLAGS_COMPILE = [
+    "-DSQLITE_ENABLE_COLUMN_METADATA"
+    "-DSQLITE_ENABLE_DBSTAT_VTAB"
+    "-DSQLITE_ENABLE_FTS3"
+    "-DSQLITE_ENABLE_FTS3_PARENTHESIS"
+    "-DSQLITE_ENABLE_FTS4"
+    "-DSQLITE_ENABLE_RTREE"
+    "-DSQLITE_ENABLE_STMT_SCANSTATUS"
+    "-DSQLITE_ENABLE_UNLOCK_NOTIFY"
+    "-DSQLITE_SOUNDEX"
+    "-DSQLITE_SECURE_DELETE"
+  ];
+
+  # Test for features which may not be available at compile time
+  preBuild = ''
+    # Use pread(), pread64(), pwrite(), pwrite64() functions for better performance if they are available.
+    if cc -Werror=implicit-function-declaration -x c - -o "$TMPDIR/pread_pwrite_test" <<< \
+      ''$'#include <unistd.h>\nint main()\n{\n  pread(0, NULL, 0, 0);\n  pwrite(0, NULL, 0, 0);\n  return 0;\n}'; then
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD"
+    fi
+    if cc -Werror=implicit-function-declaration -x c - -o "$TMPDIR/pread64_pwrite64_test" <<< \
+      ''$'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}'; then
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD64"
+    elif cc -D_LARGEFILE64_SOURCE -Werror=implicit-function-declaration -x c - -o "$TMPDIR/pread64_pwrite64_test" <<< \
+      ''$'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}'; then
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD64 -D_LARGEFILE64_SOURCE"
+    fi
+
+    echo ""
+    echo "NIX_CFLAGS_COMPILE = $NIX_CFLAGS_COMPILE"
+    echo ""
+  '';
 
   meta = {
     homepage = http://www.sqlite.org/;

From da76816b0ccf503ab36e9e2b541315d296e5191b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 1 Aug 2015 19:11:07 -0700
Subject: [PATCH 0615/2016] nghttp2: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index 129a65d3203..9681c4d7eee 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -34,12 +34,12 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}nghttp2-${version}";
-  version = "1.1.1";
+  version = "1.1.2";
 
   # Don't use fetchFromGitHub since this needs a bootstrap curl
   src = fetchurl {
     url = "http://pub.wak.io/nixos/tarballs/nghttp2-${version}.tar.bz2";
-    sha256 = "9659e8598c8481f1bf8e63ba4f828f5283053df62a51fa8324cb55ea7a51b80c";
+    sha256 = "5b218a0d27eeaa6898eb0757b6bbcc643ada2148696d864f185b3123c392904b";
   };
 
   # Configure script searches for a symbol which does not exist in jemalloc on Darwin

From f0269dd8b0c2b8dafaf9d0bc3f076b2af468daed Mon Sep 17 00:00:00 2001
From: Anton Fedotov <ad.fedotov@gmail.com>
Date: Sun, 2 Aug 2015 06:35:45 +0300
Subject: [PATCH 0616/2016] go-modules: This patch fixes an error with copying
 sources during installPhase if src of go module conatins file with spaces

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

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 72b6ad7fdf9..da7a9b179cc 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -138,7 +138,7 @@ go.stdenv.mkDerivation (
         while read f; do
           echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue
           mkdir -p "$(dirname "$out/share/go/$f")"
-          cp $NIX_BUILD_TOP/go/$f $out/share/go/$f
+          cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f"
         done < <(find . -type f)
         popd
     fi

From aefc8b3ddf3de7859d9700967fa89dda5c2929a6 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 2 Aug 2015 01:24:23 +0100
Subject: [PATCH 0617/2016] elfutils: upgrade to 0.163 due to security

... vaguely mentioned by upstream, see e.g. FEDORA-2015-11380.
Close #9084.
---
 .../tools/misc/elfutils/CVE-2014-0172.patch   | 32 -------------------
 .../tools/misc/elfutils/default.nix           |  9 +++---
 2 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/elfutils/CVE-2014-0172.patch

diff --git a/pkgs/development/tools/misc/elfutils/CVE-2014-0172.patch b/pkgs/development/tools/misc/elfutils/CVE-2014-0172.patch
deleted file mode 100644
index 6553dea7b4c..00000000000
--- a/pkgs/development/tools/misc/elfutils/CVE-2014-0172.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugzilla.redhat.com/show_bug.cgi?id=1085663
-
-Reported-by: Florian Weimer <fweimer at redhat.com>
-Signed-off-by: Mark Wielaard <mjw at redhat.com>
----
- libdw/dwarf_begin_elf.c |    8 +++++++-
- 2 files changed, 12 insertions(+), 1 deletions(-)
-
-diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c
-index 79daeac..34ea373 100644
---- a/libdw/dwarf_begin_elf.c
-+++ b/libdw/dwarf_begin_elf.c
-@@ -1,5 +1,5 @@
- /* Create descriptor from ELF descriptor for processing file.
--   Copyright (C) 2002-2011 Red Hat, Inc.
-+   Copyright (C) 2002-2011, 2014 Red Hat, Inc.
-    This file is part of elfutils.
-    Written by Ulrich Drepper <drepper at redhat.com>, 2002.
- 
-@@ -282,6 +282,12 @@ check_section (Dwarf *result, GElf_Ehdr *ehdr, Elf_Scn *scn, bool inscngrp)
- 	    memcpy (&size, data->d_buf + 4, sizeof size);
- 	    size = be64toh (size);
- 
-+	    /* Check for unsigned overflow so malloc always allocated
-+	       enough memory for both the Elf_Data header and the
-+	       uncompressed section data.  */
-+	    if (unlikely (sizeof (Elf_Data) + size < size))
-+	      break;
-+
- 	    Elf_Data *zdata = malloc (sizeof (Elf_Data) + size);
- 	    if (unlikely (zdata == NULL))
- 	      break;
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 53e4bd6821f..95ccdd89de1 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -3,21 +3,20 @@
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   name = "elfutils-${version}";
-  version = "0.158";
+  version = "0.163";
 
   src = fetchurl {
     urls = [
       "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "0z9rprmizd7rwb3xwfmz5liii7hbiv3g2arl23h56brm45fay9xy";
+    sha256 = "7c774f1eef329309f3b05e730bdac50013155d437518a2ec0e24871d312f2e23";
   };
 
   patches = [
-    ./CVE-2014-0172.patch
     (fetchurl {
-      url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/elfutils-portability.patch";
-      sha256 = "0y2fyjis5xrd3g2pcbcm145q2kmh52n5c74w8dwv3hqdp5ky7igd";
+      url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/elfutils-portability-${version}.patch";
+      sha256 = "e4e82315dad2efaa4e4476503e7537e01b7c1b1f98a96de4ca1c7fa85f4f1045";
     }) ];
 
   # We need bzip2 in NativeInputs because otherwise we can't unpack the src,

From 179cdbc62cff2ca316b3dd4f64b55f3a4c1f7906 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 1 Aug 2015 19:43:55 +0100
Subject: [PATCH 0618/2016] ghostscript: add patch fixing CVE-2015-3228 (from
 debian)

---
 pkgs/misc/ghostscript/CVE-2015-3228.patch | 20 ++++++++++++++++++++
 pkgs/misc/ghostscript/default.nix         |  6 +++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/misc/ghostscript/CVE-2015-3228.patch

diff --git a/pkgs/misc/ghostscript/CVE-2015-3228.patch b/pkgs/misc/ghostscript/CVE-2015-3228.patch
new file mode 100644
index 00000000000..7be18b0a730
--- /dev/null
+++ b/pkgs/misc/ghostscript/CVE-2015-3228.patch
@@ -0,0 +1,20 @@
+Description: Sanity check for memory allocation.
+ In gs_heap_alloc_bytes(), add a sanity check to ensure we don't overflow the
+ variable holding the actual number of bytes we allocate.
+Origin: upstream, http://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=0c0b085
+Author: Chris Liddell <chris.liddell@artifex.com>
+Forwarded: yes
+Bug-Debian: http://bugs.debian.org/793489
+Last-Update: 2015-07-26
+
+--- a/base/gsmalloc.c
++++ b/base/gsmalloc.c
+@@ -178,7 +178,7 @@
+     } else {
+         uint added = size + sizeof(gs_malloc_block_t);
+ 
+-        if (mmem->limit - added < mmem->used)
++        if (added <= size || mmem->limit - added < mmem->used)
+             set_msg("exceeded limit");
+         else if ((ptr = (byte *) Memento_label(malloc(added), cname)) == 0)
+             set_msg("failed");
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 11f816dbb97..820e5f3cffe 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -40,7 +40,11 @@ stdenv.mkDerivation rec {
     # [] # maybe sometimes jpeg2000 support
     ;
 
-  patches = [ ./urw-font-files.patch ];
+  patches = [
+    ./urw-font-files.patch
+    # fetched from debian's ghostscript 9.15_dfsg-1 (called 020150707~0c0b085.patch there)
+    ./CVE-2015-3228.patch
+  ];
 
   makeFlags = [ "cups_serverroot=$(out)" "cups_serverbin=$(out)/lib/cups" ];
 

From 84dc71ebe4d84ed3edece37a81c2aa7debbb2c46 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 2 Aug 2015 03:17:03 -0700
Subject: [PATCH 0619/2016] bump dolphinEmuMaster, remove no longer needed SDL
 dep

also add libevdev as a dep, read about all the changes at
https://dolphin-emu.org/blog/2015/08/01/dolphin-progress-report-july-2015/
---
 pkgs/misc/emulators/dolphin-emu/master.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index f742973c08d..06734d24c8a 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,14 +1,14 @@
 { stdenv, gcc5, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
 , gettext, git, libpthreadstubs, libXrandr, libXext, readline
-, openal, libXdmcp, portaudio, SDL, fetchgit, libusb
+, openal, libXdmcp, portaudio, fetchgit, libusb, libevdev
 , libpulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-20150609";
+  name = "dolphin-emu-20150802";
   src = fetchgit {
     url = git://github.com/dolphin-emu/dolphin.git;
-    rev = "e47e4c677ad22895f8c8bc78676dd295e36f2695";
-    sha256 = "0g176x0rw9lssw68alr83cakldq1q38mzjwxdaf524bkvnn7fl3r";
+    rev = "5097a22844b850b429872f4de390bd958b11a616";
+    sha256 = "1qizkahbimpmgjs51av1cdmnnyvbz0j0gknmi5vdc38vrzxvwkrf";
     fetchSubmodules = false;
   };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gcc5 pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
                   gettext libpthreadstubs libXrandr libXext readline openal
-                  git libXdmcp portaudio SDL libusb libpulseaudio ];
+                  libevdev git libXdmcp portaudio libusb libpulseaudio ];
 
   meta = {
     homepage = http://dolphin-emu.org/;

From da0b6a4fdf0ab167bfc943176197159f10f1a8b7 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sun, 2 Aug 2015 12:40:10 +0200
Subject: [PATCH 0620/2016] gnome3: Add myself as a maintainer

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

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 4d30520df11..9c32ddf528c 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -53,7 +53,7 @@ let
   gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
 
   version = "3.16";
-  maintainers = with pkgs.lib.maintainers; [ lethalman ];
+  maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ];
 
 # Simplify the nixos module and gnome packages
   defaultIconTheme = adwaita-icon-theme;

From 6193f5260c6070323500a96d80264332cee14e61 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sun, 2 Aug 2015 22:55:45 +0200
Subject: [PATCH 0621/2016] tcsd module: adjust default value of kernelPCRs

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

diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix
index ced2d49c1e1..d957b5063d3 100644
--- a/nixos/modules/services/hardware/tcsd.nix
+++ b/nixos/modules/services/hardware/tcsd.nix
@@ -76,7 +76,7 @@ in
       };
 
       kernelPCRs = mkOption {
-        default = "10,11";
+        default = "8,9,10,11,12";
         type = types.string;
         description = "PCR indices used in the TPM for kernel measurements.";
       };

From 192091dc069d86452ad0d603aa65d48042c37e59 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sun, 2 Aug 2015 22:50:36 +0200
Subject: [PATCH 0622/2016] trustedGRUB2: git -> 1.2.0

---
 pkgs/tools/misc/grub/trusted.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix
index 790870cf302..315c7145cbe 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/pkgs/tools/misc/grub/trusted.nix
@@ -11,7 +11,7 @@ let
 
   inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
-  version = "2.0-git-2015-07-04";
+  version = "1.2.0";
 
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@@ -28,12 +28,12 @@ let
 in (
 
 stdenv.mkDerivation rec {
-  name = "trustedGRUB-${version}";
+  name = "trustedGRUB2-${version}";
 
   src = fetchgit {
     url = "https://github.com/Sirrix-AG/TrustedGRUB2";
-    rev = "1865d07bdef7f39916790c77103fb85e99de14a4";
-    sha256 = "e6bd9edfeb653e98e585fd691a31533b649b2fca1f4a903c70f6ea371014c9f7";
+    rev = "1ff54a5fbe02ea01df5a7de59b1e0201e08d4f76";
+    sha256 = "8c17bd7e14dd96ae9c4e98723f4e18ec6b21d45ac486ecf771447649829d0b34";
   };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];

From b49fc966177fba9bd2e284977b7c7986393fdf18 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 3 Aug 2015 00:31:07 +0300
Subject: [PATCH 0623/2016] Use GNOME-enabled libsoup in Midori as the build
 fails otherwise

---
 pkgs/applications/networking/browsers/midori/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index d398cdd2942..5cdfcf5e975 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper
 , gtk3, webkitgtk, librsvg, libnotify, sqlite
-, glib_networking, gsettings_desktop_schemas
+, glib_networking, gsettings_desktop_schemas, libsoup
 }:
 
 let
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     cmake pkgconfig intltool vala makeWrapper
     webkitgtk librsvg libnotify sqlite
+    (libsoup.override {gnomeSupport = true;})
   ];
 
   cmakeFlags = ''

From ebda45e6b9db3225c30a998b2624d90b0c08edb4 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sun, 2 Aug 2015 14:38:20 -0700
Subject: [PATCH 0624/2016] add darwin gcc fixes to gcc 5

---
 pkgs/development/compilers/gcc/5/default.nix | 33 ++++++--------------
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 6decc4c8cc3..fc007fe447b 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -32,8 +32,7 @@
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
-, gnused ? null
-, binutils ? null
+, CF ? null
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -45,11 +44,8 @@ assert langVhdl     -> gnat != null;
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
-# Make sure we get GNU sed.
-assert stdenv.isDarwin -> gnused != null;
-
-# Need c++filt on darwin
-assert stdenv.isDarwin -> binutils != null;
+# Make sure we get CoreFoundation.
+assert stdenv.isDarwin -> CF != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
@@ -286,11 +282,6 @@ stdenv.mkDerivation ({
     ++ (optionals (cross != null) [binutilsCross])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
-
-    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
-    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
-    ++ (optional stdenv.isDarwin gnused)
-    ++ (optional stdenv.isDarwin binutils)
     ;
 
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
@@ -301,14 +292,10 @@ stdenv.mkDerivation ({
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
     export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
-      configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
-      makeFlagsArray+=( \
-       CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
-       CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
-       FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
-      )
-    fi
+    configureFlagsArray+=(
+      --with-sysroot="${stdenv.libc}"
+      --with-native-system-header-dir=/include
+    )
   '';
 
   dontDisableStatic = true;
@@ -475,10 +462,10 @@ stdenv.mkDerivation ({
                                           ++ optionals javaAwtGtk [ gmp mpfr ]
                                           ++ optional (libpthread != null) libpthread)));
 
-  EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null
+  extraFlags =
+    (if cross != null && libcCross != null
     then "-idirafter ${libcCross}/include"
-    else null;
+    else "") + optionalString stdenv.isDarwin " -F${CF}/Library/Frameworks";
 
   EXTRA_TARGET_LDFLAGS =
     if cross != null && libcCross != null
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0a088519b6..6150eb4f521 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3868,6 +3868,8 @@ let
     libcCross = if crossSystem != null then libcCross else null;
 
     isl = isl_0_14;
+
+    inherit (darwin) CF;
   }));
 
   gfortran = if !stdenv.isDarwin then gfortran49

From 249b25698e4949d98ce0508224c72b988fe6f352 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 2 Aug 2015 22:03:26 +0200
Subject: [PATCH 0625/2016] xdelta: tidy up

---
 pkgs/tools/compression/xdelta/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index bf02d8c3a0a..407b14a6099 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 let version = "3.0.10"; in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "xdelta-${version}";
   
   src = fetchFromGitHub {
@@ -15,16 +15,16 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     cd xdelta3
-  '' + stdenv.lib.optionalString doCheck ''
-    mkdir tmp
-    substituteInPlace testing/file.h --replace /tmp tmp
-    substituteInPlace xdelta3-test.h --replace /tmp $PWD/tmp
   '';
 
   enableParallelBuilding = true;
 
   doCheck = true;
   checkPhase = ''
+    mkdir $PWD/tmp
+    for i in testing/file.h xdelta3-test.h; do
+      substituteInPlace $i --replace /tmp $PWD/tmp
+    done
     ./xdelta3regtest
   '';
 

From a9a0fedb94e78f7b8c26df274a56d53c9d066a62 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 2 Aug 2015 23:33:50 +0200
Subject: [PATCH 0626/2016] stress-ng: 0.04.13 -> 0.04.14

---
 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 38f2f2551bf..7f02eaa2d51 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr, keyutils }:
 
-let version = "0.04.13"; in
+let version = "0.04.14"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "0h4alfylf15q1rdf9v42fy0bhh4c1s1fagiym445qb3yacf5p9g3";
+    sha256 = "17lgsxg2k7w12i1wmzq4zqavkicikzkgz2h7mzl8lrk8c85mwf3m";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From dad99aae8e294bfc04a5fc0f973fbc592d7c3342 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 2 Aug 2015 23:46:38 +0200
Subject: [PATCH 0627/2016] clipgrab: 3.4.11 -> 3.5.1

---
 pkgs/applications/video/clipgrab/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index fd336dafb23..7661bfbc5ea 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, makeDesktopItem, qt4 }:
 
-let version = "3.4.11"; in
+let version = "3.5.1"; in
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
 
   src = fetchurl {
-    sha256 = "10xxcnib7xkvrx7wma2vbya5fz5s5f6syc9dmr395c83lpcwpxs8";
-    # The "Download" button is a .tar.gz, but there's a .tar.bz2 further down:
-    url = "http://download.clipgrab.de/${name}.tar.bz2";
+    sha256 = "16hm7zv0yhxj7gdd8q462jcxy0jk6hicsk1mkhmarwrhifwsy4g9";
+    # The .tar.bz2 "Download" link is a binary blob, the source is .tar.gz!
+    url = "http://download.clipgrab.de/${name}.tar.gz";
   };
 
   meta = with stdenv.lib; {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://clipgrab.org/;
     license = licenses.gpl3Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 

From 87853e7753cbbc0d4c3801a398fb1377aedce174 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 3 Aug 2015 00:25:26 +0200
Subject: [PATCH 0628/2016] clipgrab: add 1080p (ffmpeg) support

Support is optional (pass ffmpeg = null), but enabled by default.
---
 pkgs/applications/video/clipgrab/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 7661bfbc5ea..d4239685f7b 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeDesktopItem, qt4 }:
+{ stdenv, fetchurl, ffmpeg, makeDesktopItem, qt4 }:
 
 let version = "3.5.1"; in
 stdenv.mkDerivation rec {
@@ -24,7 +24,13 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ qt4 ];
+  buildInputs = [ ffmpeg qt4 ];
+
+  postPatch = stdenv.lib.optionalString (ffmpeg != null) ''
+  substituteInPlace converter_ffmpeg.cpp \
+    --replace '"ffmpeg"' '"${ffmpeg}/bin/ffmpeg"' \
+    --replace '"ffmpeg ' '"${ffmpeg}/bin/ffmpeg '
+  '';
 
   configurePhase = ''
     qmake clipgrab.pro

From 9cd4763e9c6aafe71cccee24fee51dea8242b449 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 3 Aug 2015 01:45:13 +0200
Subject: [PATCH 0629/2016] ipad_charge: init at 2015-02-03

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

diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix
new file mode 100644
index 00000000000..df987ed86c1
--- /dev/null
+++ b/pkgs/tools/misc/ipad_charge/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, libusb }:
+
+let version = "2015-02-03"; in
+stdenv.mkDerivation rec {
+  name = "ipad_charge-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "0f40hqx1dbqpwrhyf42h5982jwqv8j5zp5hwwakz6600hyqvnnz7";
+    rev = "bb24e1c3a79016cfdffb9d28189485766d655ec6";
+    repo = "ipad_charge";
+    owner = "mkorenkov";
+  };
+
+  buildInputs = [ libusb ];
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace " -o root -g root" "" \
+      --replace "/usr" "$out"
+    sed "/rules\.d/d" -i Makefile
+  '';
+
+  enableParallelBuilding = true;
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    inherit version;
+    inherit (src.meta) homepage;
+    description = "Apple device USB charging utility for Linux";
+    longDescription = ''
+      USB charging control utility used to enable/disable charging of an Apple
+      device connected to USB port. For a list of supported devices, see
+      https://github.com/mkorenkov/ipad_charge#supported-devices.
+    '';
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c0a818b38f..216f1bb6463 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1918,6 +1918,8 @@ let
 
   iodine = callPackage ../tools/networking/iodine { };
 
+  ipad_charge = callPackage ../tools/misc/ipad_charge { };
+
   iperf2 = callPackage ../tools/networking/iperf/2.nix { };
   iperf3 = callPackage ../tools/networking/iperf/3.nix { };
   iperf = iperf3;

From 1d3207b27b178ea88f413dd47b195445a14adc6a Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Mon, 3 Aug 2015 00:14:36 -0400
Subject: [PATCH 0630/2016] ati-drivers: update to Catalyst 15.7 and fix build
 with recent kernels

---
 pkgs/os-specific/linux/ati-drivers/builder.sh |  5 +-
 .../os-specific/linux/ati-drivers/default.nix |  8 +--
 .../fglrx_3.17rc6-no_hotplug.patch            | 31 ----------
 ...rx_3.18.19-no_hotplug_underscore_cr4.patch | 58 +++++++++++++++++++
 4 files changed, 66 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/ati-drivers/fglrx_3.17rc6-no_hotplug.patch
 create mode 100644 pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch

diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh
index 8df03910146..520f20e2ed6 100644
--- a/pkgs/os-specific/linux/ati-drivers/builder.sh
+++ b/pkgs/os-specific/linux/ati-drivers/builder.sh
@@ -7,8 +7,11 @@ set -x
 die(){ echo $@; exit 1; }
 
 # custom unpack:
+mkdir fglrx
+cd fglrx
 unzip $src
-run_file=$(echo fglrx-*/amd-driver-installer-*)
+cd ..
+run_file=$(echo fglrx/amd-driver-installer-*)
 sh $run_file --extract .
 
 eval "$patchPhase"
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 179166bbc79..e61237fcb7c 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -31,7 +31,7 @@ assert (!libsOnly) -> kernel != null;
 with stdenv.lib;
 
 stdenv.mkDerivation {
-  name = "ati-drivers-14.12" + (optionalString (!libsOnly) "-${kernel.version}");
+  name = "ati-drivers-15.7" + (optionalString (!libsOnly) "-${kernel.version}");
 
   builder = ./builder.sh;
 
@@ -39,12 +39,12 @@ stdenv.mkDerivation {
   gcc = stdenv.cc.cc;
 
   src = fetchurl {
-    url = http://www2.ati.com/drivers/linux/amd-catalyst-omega-14.12-linux-run-installers.zip;
-    sha256 = "0jd2scrdlyapynxfjdrarnwcdzxjqrk5fg5i10g3bm0ay8v9hrk8";
+    url = "http://www2.ati.com/drivers/linux/amd-driver-installer-15.20.1046-x86.x86_64.zip";
+    sha256 = "ffde64203f49d9288eaa25f4d744187b6f4f14a87a444bab6a001d822b327a9d";
     curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
   };
 
-  patchPhase = "patch -p1 < ${./fglrx_3.17rc6-no_hotplug.patch}";
+  patchPhase = "patch -p1 < ${./fglrx_3.18.19-no_hotplug_underscore_cr4.patch}";
   patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}";
 
   buildInputs =
diff --git a/pkgs/os-specific/linux/ati-drivers/fglrx_3.17rc6-no_hotplug.patch b/pkgs/os-specific/linux/ati-drivers/fglrx_3.17rc6-no_hotplug.patch
deleted file mode 100644
index 7afd54a59c5..00000000000
--- a/pkgs/os-specific/linux/ati-drivers/fglrx_3.17rc6-no_hotplug.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-source: https://aur.archlinux.org/packages/catalyst/
-
-diff -uNr 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-09-09 16:10:17.000000000 +0200
-+++ 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-09-26 19:01:44.000000000 +0200
-@@ -1093,6 +1093,9 @@
-     // directly here to allow suspend/resume without X server start. 
-         firegl_pci_save_state((KCL_PCI_DevHandle)pdev, privdev);
-         pci_disable_device(pdev);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
-+	pci_ignore_hotplug(pdev);
-+#endif
-         PMSG_EVENT(pdev->dev.power.power_state) = state;
-     }
-     else
-diff -uNr 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c
---- 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2014-09-09 16:10:17.000000000 +0200
-+++ 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2014-09-26 18:57:27.000000000 +0200
-@@ -840,10 +840,12 @@
-    if(tdev != NULL)
-    {
-       device = (acpi_device_adr(tdev) >> 16) & 0xffff;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
-       if(PCI_SLOT(pdev->devfn) == device)
-       {
-          tdev->flags.no_hotplug = true;
-       }
-+#endif
-    }
- #endif
-    return 0;
diff --git a/pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch b/pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch
new file mode 100644
index 00000000000..0d6839a1012
--- /dev/null
+++ b/pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch
@@ -0,0 +1,58 @@
+diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-04 10:31:23.000000000 -0400
++++ 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-08-02 19:47:04.123014897 -0400
+@@ -4498,8 +4498,8 @@
+ 
+     if (cpu_has_pge)
+     {
+-        cr4 = read_cr4();
+-        write_cr4(cr4 & ~X86_CR4_PGE);
++        cr4 = __read_cr4();
++        __write_cr4(cr4 & ~X86_CR4_PGE);
+     }
+      __flush_tlb();
+ 
+@@ -4512,7 +4512,7 @@
+     write_cr0(cr0 & 0xbfffffff);
+     if (cpu_has_pge)
+     {
+-        write_cr4(cr4);
++        __write_cr4(cr4);
+     }
+     local_irq_restore(flags);
+ 
+@@ -4539,8 +4539,8 @@
+ 
+     if (cpu_has_pge)
+     {
+-        cr4 = read_cr4();
+-        write_cr4(cr4 & ~X86_CR4_PGE);
++        cr4 = __read_cr4();
++        __write_cr4(cr4 & ~X86_CR4_PGE);
+     }
+      __flush_tlb();
+   
+@@ -4552,7 +4552,7 @@
+     write_cr0(cr0 & 0xbfffffff);
+     if (cpu_has_pge)
+     {
+-        write_cr4(cr4);
++        __write_cr4(cr4);
+     }
+     local_irq_restore(flags);
+ 
+diff -Nru 15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c 15.7.new/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- 15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-07-04 10:31:23.000000000 -0400
++++ 15.7.new/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-08-02 19:59:54.797911610 -0400
+@@ -861,7 +861,10 @@
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
+     if(pdev)
+     {
+-       pci_ignore_hotplug(pdev);
++      struct pci_dev *bridge = pdev->bus->self;
++
++      pdev->ignore_hotplug = 1;
++      if(bridge) bridge->ignore_hotplug = 1; 
+     }
+ #endif
+ }

From 6f2db8fe4423be2a117822016603fdaf1e2a547d Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Mon, 3 Aug 2015 00:36:30 -0400
Subject: [PATCH 0631/2016] ati-drivers: Fixes for kernel 4.1.

* IRQF_DISABLED was already a no-op in recent kernels, has now been
  removed.
* strnicmp is renamed to strncasecmp.
---
 ...rx_3.18.19-no_hotplug_underscore_cr4.patch | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch b/pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch
index 0d6839a1012..de1984c4c49 100644
--- a/pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch
+++ b/pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch
@@ -1,7 +1,21 @@
 diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c
 --- 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-04 10:31:23.000000000 -0400
-+++ 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-08-02 19:47:04.123014897 -0400
-@@ -4498,8 +4498,8 @@
++++ 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-08-03 00:30:34.927839497 -0400
+@@ -3495,10 +3495,12 @@
+         KCL_PUB_InterruptHandlerWrap,
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
+         ((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)),
+-#else
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
+         //when MSI enabled. keep irq disabled when calling the action handler,
+         //exclude this IRQ from irq balancing (only on one CPU) 
+         ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)),    
++#else
++        ((useMSI) ? 0 : IRQF_SHARED),
+ #endif
+         dev_name,
+         context);
+@@ -4498,8 +4500,8 @@
  
      if (cpu_has_pge)
      {
@@ -12,7 +26,7 @@ diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/commo
      }
       __flush_tlb();
  
-@@ -4512,7 +4512,7 @@
+@@ -4512,7 +4514,7 @@
      write_cr0(cr0 & 0xbfffffff);
      if (cpu_has_pge)
      {
@@ -21,7 +35,7 @@ diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/commo
      }
      local_irq_restore(flags);
  
-@@ -4539,8 +4539,8 @@
+@@ -4539,8 +4541,8 @@
  
      if (cpu_has_pge)
      {
@@ -32,7 +46,7 @@ diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/commo
      }
       __flush_tlb();
    
-@@ -4552,7 +4552,7 @@
+@@ -4552,7 +4554,7 @@
      write_cr0(cr0 & 0xbfffffff);
      if (cpu_has_pge)
      {
@@ -56,3 +70,15 @@ diff -Nru 15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c 15.7.new/common/lib
      }
  #endif
  }
+diff -Nru 15.7/common/lib/modules/fglrx/build_mod/kcl_str.c 15.7.new/common/lib/modules/fglrx/build_mod/kcl_str.c
+--- 15.7/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-07-04 10:31:23.000000000 -0400
++++ 15.7.new/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-08-03 00:35:25.938410435 -0400
+@@ -169,7 +169,7 @@
+                                   const char* s2,
+                                   KCL_TYPE_SizeSigned count)
+ {
+-    return strnicmp(s1, s2, count);
++    return strncasecmp(s1, s2, count);
+ }
+ 
+ /** \brief Locate character in string

From 17fb7ac352530c84f1d4b2d3e112c4c01d0db9f7 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Mon, 3 Aug 2015 00:46:29 -0400
Subject: [PATCH 0632/2016] ati-drivers: give the patch file a more sensible
 name

It makes several API fixes for several kernel versions so stop trying to
enumerate them all in the filename.
---
 pkgs/os-specific/linux/ati-drivers/default.nix                  | 2 +-
 ...9-no_hotplug_underscore_cr4.patch => kernel-api-fixes.patch} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/os-specific/linux/ati-drivers/{fglrx_3.18.19-no_hotplug_underscore_cr4.patch => kernel-api-fixes.patch} (100%)

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index e61237fcb7c..834e798e8d1 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
     curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
   };
 
-  patchPhase = "patch -p1 < ${./fglrx_3.18.19-no_hotplug_underscore_cr4.patch}";
+  patchPhase = "patch -p1 < ${./kernel-api-fixes.patch}";
   patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}";
 
   buildInputs =
diff --git a/pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch b/pkgs/os-specific/linux/ati-drivers/kernel-api-fixes.patch
similarity index 100%
rename from pkgs/os-specific/linux/ati-drivers/fglrx_3.18.19-no_hotplug_underscore_cr4.patch
rename to pkgs/os-specific/linux/ati-drivers/kernel-api-fixes.patch

From 5210b4c7a82c3dc46826a7faf53e574645566f7d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 3 Aug 2015 08:38:00 +0300
Subject: [PATCH 0633/2016] ECL: Strip manual configure patching and
 regeneration as it doesn't work anyway

---
 pkgs/development/compilers/ecl/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index bb57ebbfa87..851459ad7d9 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -26,14 +26,6 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
-  patches = [ ./libffi-prefix.patch ];
-  preConfigure = ''
-    (cd src ; libtoolize -f)
-    (cd src ; autoheader -f)
-    (cd src ; aclocal)
-    (cd src ; automake --add-missing -c)
-    (cd src ; autoconf -f)
-  '';
   configureFlags = [
     "--enable-threads"
     "--with-gmp-prefix=${gmp}"

From c6f5bb57853b2fde80b733744a3eabee6aa686ef Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sun, 2 Aug 2015 12:19:06 +0200
Subject: [PATCH 0634/2016] gnome-tweak-tool: Add patches to work nicely on
 NixOS

- Search for themes and icon in system data dirs
- Don't show multiple entries for a single theme
- Create config dir if it doesn't exist
---
 ...themes-and-icons-in-system-data-dirs.patch | 123 ++++++++++++++++++
 ...-multiple-entries-for-a-single-theme.patch | 103 +++++++++++++++
 ...reate-config-dir-if-it-doesn-t-exist.patch |  29 +++++
 .../3.16/misc/gnome-tweak-tool/default.nix    |   9 +-
 4 files changed, 262 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch

diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
new file mode 100644
index 00000000000..d5a6f90e33d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
@@ -0,0 +1,123 @@
+From 175218579aa2b4f4974ff1cf4fd1ac93082a4714 Mon Sep 17 00:00:00 2001
+From: Jascha Geerds <jg@ekby.de>
+Date: Sat, 1 Aug 2015 21:01:11 +0200
+Subject: [PATCH 1/1] Search for themes and icons in system data dirs
+
+---
+ gtweak/tweaks/tweak_group_interface.py | 17 ++++-------------
+ gtweak/tweaks/tweak_group_keymouse.py  |  7 ++-----
+ gtweak/utils.py                        | 17 +++++++++++++++++
+ 3 files changed, 23 insertions(+), 18 deletions(-)
+
+diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
+index ed2ad5f..a319907 100644
+--- a/gtweak/tweaks/tweak_group_interface.py
++++ b/gtweak/tweaks/tweak_group_interface.py
+@@ -26,7 +26,7 @@ from gi.repository import Gtk
+ from gi.repository import GLib
+ 
+ import gtweak
+-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file
++from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
+ from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
+ from gtweak.gshellwrapper import GnomeShellFactory
+ from gtweak.gsettings import GSettingsSetting
+@@ -46,10 +46,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
+ 
+     def _get_valid_themes(self):
+         """ Only shows themes that have variations for gtk+-3 and gtk+-2 """
+-        dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
+-                 os.path.join(GLib.get_user_data_dir(), "themes"),
+-                 os.path.join(os.path.expanduser("~"), ".themes"))
+-        valid = walk_directories(dirs, lambda d:
++        valid = walk_directories(get_resource_dirs('themes'), lambda d:
+                     os.path.exists(os.path.join(d, "gtk-2.0")) and \
+                         os.path.exists(os.path.join(d, "gtk-3.0")))
+         return valid
+@@ -64,10 +61,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
+             **options)
+ 
+     def _get_valid_icon_themes(self):
+-        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
+-                 os.path.join(GLib.get_user_data_dir(), "icons"),
+-                 os.path.join(os.path.expanduser("~"), ".icons"))
+-        valid = walk_directories(dirs, lambda d:
++        valid = walk_directories(get_resource_dirs("icons"), lambda d:
+                     os.path.isdir(d) and \
+ 			os.path.exists(os.path.join(d, "index.theme")))
+         return valid
+@@ -82,10 +76,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
+             **options)
+ 
+     def _get_valid_cursor_themes(self):
+-        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
+-                 os.path.join(GLib.get_user_data_dir(), "icons"),
+-                 os.path.join(os.path.expanduser("~"), ".icons"))
+-        valid = walk_directories(dirs, lambda d:
++        valid = walk_directories(get_resource_dirs("icons"), lambda d:
+                     os.path.isdir(d) and \
+                         os.path.exists(os.path.join(d, "cursors")))
+         return valid
+diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
+index b56a4f4..3486098 100644
+--- a/gtweak/tweaks/tweak_group_keymouse.py
++++ b/gtweak/tweaks/tweak_group_keymouse.py
+@@ -20,7 +20,7 @@ import os.path
+ from gi.repository import GLib
+ 
+ import gtweak
+-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default
++from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
+ from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title
+ 
+ class PrimaryPasteTweak(GetterSetterSwitchTweak):
+@@ -47,10 +47,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
+             **options)
+ 
+     def _get_valid_key_themes(self):
+-        dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
+-                 os.path.join(GLib.get_user_data_dir(), "themes"),
+-                 os.path.join(os.path.expanduser("~"), ".themes"))
+-        valid = walk_directories(dirs, lambda d:
++        valid = walk_directories(get_resource_dirs("themes"), lambda d:
+                     os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
+                     os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
+         return valid
+diff --git a/gtweak/utils.py b/gtweak/utils.py
+index 3d20425..0fcb51d 100644
+--- a/gtweak/utils.py
++++ b/gtweak/utils.py
+@@ -21,6 +21,7 @@ import tempfile
+ import shutil
+ import subprocess
+ import glob
++import itertools
+ 
+ import gtweak
+ from gtweak.gsettings import GSettingsSetting
+@@ -114,6 +115,22 @@ def execute_subprocess(cmd_then_args, block=True):
+         stdout, stderr = p.communicate()
+         return stdout, stderr, p.returncode
+ 
++def get_resource_dirs(resource):
++    """Returns a list of all known resource dirs for a given resource.
++
++    :param str resource:
++        Name of the resource (e.g. "themes")
++    :return:
++        A list of resource dirs
++    """
++    dirs = [os.path.join(dir, resource)
++            for dir in itertools.chain(GLib.get_system_data_dirs(),
++                                       (gtweak.DATA_DIR,
++                                        GLib.get_user_data_dir()))]
++    dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))]
++
++    return [dir for dir in dirs if os.path.isdir(dir)]
++
+ @singleton
+ class AutostartManager:
+ 
+-- 
+2.4.5
+
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
new file mode 100644
index 00000000000..61ae2734979
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
@@ -0,0 +1,103 @@
+From edd3203c7b7d5ba596df9f148c443cdfc8a58d88 Mon Sep 17 00:00:00 2001
+From: Jascha Geerds <jg@ekby.de>
+Date: Sat, 1 Aug 2015 21:26:57 +0200
+Subject: [PATCH 1/1] Don't show multiple entries for a single theme
+
+---
+ gtweak/tweaks/tweak_group_interface.py |  8 ++++----
+ gtweak/tweaks/tweak_group_keymouse.py  |  4 ++--
+ gtweak/utils.py                        | 16 ++++++++++++++++
+ 3 files changed, 22 insertions(+), 6 deletions(-)
+
+diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
+index a319907..82c0286 100644
+--- a/gtweak/tweaks/tweak_group_interface.py
++++ b/gtweak/tweaks/tweak_group_interface.py
+@@ -26,7 +26,7 @@ from gi.repository import Gtk
+ from gi.repository import GLib
+ 
+ import gtweak
+-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
++from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources
+ from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
+ from gtweak.gshellwrapper import GnomeShellFactory
+ from gtweak.gsettings import GSettingsSetting
+@@ -49,7 +49,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
+         valid = walk_directories(get_resource_dirs('themes'), lambda d:
+                     os.path.exists(os.path.join(d, "gtk-2.0")) and \
+                         os.path.exists(os.path.join(d, "gtk-3.0")))
+-        return valid
++        return get_unique_resources(valid)
+ 
+ class IconThemeSwitcher(GSettingsComboTweak):
+     def __init__(self, **options):
+@@ -64,7 +64,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
+         valid = walk_directories(get_resource_dirs("icons"), lambda d:
+                     os.path.isdir(d) and \
+ 			os.path.exists(os.path.join(d, "index.theme")))
+-        return valid
++        return get_unique_resources(valid)
+ 
+ class CursorThemeSwitcher(GSettingsComboTweak):
+     def __init__(self, **options):
+@@ -79,7 +79,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
+         valid = walk_directories(get_resource_dirs("icons"), lambda d:
+                     os.path.isdir(d) and \
+                         os.path.exists(os.path.join(d, "cursors")))
+-        return valid
++        return get_unique_resources(valid)
+ 
+ class ShellThemeTweak(Gtk.Box, Tweak):
+ 
+diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
+index 3486098..9f53425 100644
+--- a/gtweak/tweaks/tweak_group_keymouse.py
++++ b/gtweak/tweaks/tweak_group_keymouse.py
+@@ -20,7 +20,7 @@ import os.path
+ from gi.repository import GLib
+ 
+ import gtweak
+-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
++from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources
+ from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title
+ 
+ class PrimaryPasteTweak(GetterSetterSwitchTweak):
+@@ -50,7 +50,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
+         valid = walk_directories(get_resource_dirs("themes"), lambda d:
+                     os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
+                     os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
+-        return valid
++        return get_unique_resources(valid)
+ 
+ TWEAK_GROUPS = [
+     ListBoxTweakGroup(_("Keyboard and Mouse"),
+diff --git a/gtweak/utils.py b/gtweak/utils.py
+index 0fcb51d..ce8e12e 100644
+--- a/gtweak/utils.py
++++ b/gtweak/utils.py
+@@ -131,6 +131,22 @@ def get_resource_dirs(resource):
+ 
+     return [dir for dir in dirs if os.path.isdir(dir)]
+ 
++def get_unique_resources(dirs):
++    """Filter out duplicated resources.
++
++    :param list dirs:
++        List of resource dirs (e.g. /usr/share/themes/Adwaita)
++    :return:
++        List of dirs without duplicated resources
++    """
++    unique_dirs = {}
++    for dir in dirs:
++        basename = os.path.basename(dir)
++        if basename not in unique_dirs:
++            unique_dirs[basename] = dir
++
++    return unique_dirs
++
+ @singleton
+ class AutostartManager:
+ 
+-- 
+2.4.5
+
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
new file mode 100644
index 00000000000..840ebb82ec7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
@@ -0,0 +1,29 @@
+From dea8fc3c37c43f4fbbcc658ee995a95b93452b3c Mon Sep 17 00:00:00 2001
+From: Jascha Geerds <jg@ekby.de>
+Date: Sun, 2 Aug 2015 12:01:20 +0200
+Subject: [PATCH 1/1] Create config dir if it doesn't exist
+
+Otherwise gnome-tweak-tool can't enable the dark theme and fails
+without a clear error message.
+---
+ gtweak/gtksettings.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py
+index bcec9f1..f39991b 100644
+--- a/gtweak/gtksettings.py
++++ b/gtweak/gtksettings.py
+@@ -35,6 +35,10 @@ class GtkSettingsManager:
+     def _get_keyfile(self):
+         keyfile = None
+         try:
++            config_dir = os.path.dirname(self._path)
++            if not os.path.isdir(config_dir):
++                os.makedirs(config_dir)
++
+             keyfile = GLib.KeyFile()
+             keyfile.load_from_file(self._path, 0)
+         except MemoryError:
+-- 
+2.4.5
+
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
index 2777dc5ca09..979990c7e8e 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
@@ -28,12 +28,17 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/gnome-tweak-tool" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --suffix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
   '';
 
-  patches = [ ./find_gsettings.patch ];
+  patches = [
+    ./find_gsettings.patch
+    ./0001-Search-for-themes-and-icons-in-system-data-dirs.patch
+    ./0002-Don-t-show-multiple-entries-for-a-single-theme.patch
+    ./0003-Create-config-dir-if-it-doesn-t-exist.patch
+  ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;

From dc2a6e3d3da7553d1ea8720b54fa12e9b2108d2b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 3 Aug 2015 09:09:52 +0000
Subject: [PATCH 0635/2016] dd-agent: Add support for MongoDB monitoring

---
 .../modules/services/monitoring/dd-agent.nix  | 19 +++++++++++++++----
 pkgs/tools/networking/dd-agent/default.nix    |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix
index 3e90393a662..0e0340e2fa3 100644
--- a/nixos/modules/services/monitoring/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent.nix
@@ -53,7 +53,8 @@ let
 
   postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig;
   nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig;
-
+  mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig;
+  
   etcfiles =
     [ { source = ddConf;
         target = "dd-agent/datadog.conf";
@@ -65,6 +66,10 @@ let
     (optional (cfg.nginxConfig != null)
       { source = nginxConfig;
         target = "dd-agent/conf.d/nginx.yaml";
+      }) ++
+    (optional (cfg.mongoConfig != null)
+      { source = mongoConfig;
+        target = "dd-agent/conf.d/mongo.yaml";
       });
 
 in {
@@ -106,6 +111,12 @@ in {
       default = null;
       type = types.uniq (types.nullOr types.string);
     };
+    
+    mongoConfig = mkOption {
+      description = "MongoDB integration configuration";
+      default = null;
+      type = types.uniq (types.nullOr types.string);
+    };
   };
 
   config = mkIf cfg.enable {
@@ -123,7 +134,7 @@ in {
 
     systemd.services.dd-agent = {
       description = "Datadog agent monitor";
-      path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps];
+      path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
@@ -132,7 +143,7 @@ in {
         Restart = "always";
         RestartSec = 2;
       };
-      restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig ];
+      restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig mongoConfig ];
     };
 
     systemd.services.dogstatsd = {
@@ -149,7 +160,7 @@ in {
         RestartSec = 2;
       };
       environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
-      restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig ];
+      restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig mongoConfig ];
     };
 
     environment.etc = etcfiles;
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 5838d5407be..cbc5a20997c 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
     pythonPackages.simplejson
     pythonPackages.pyyaml
     pythonPackages.requests
+    pythonPackages.pymongo
   ];
   propagatedBuildInputs = [ python tornado ];
 

From 61ec424cd4d4371f595c43fe18a90c08cd2d9f8f Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 3 Aug 2015 09:28:11 +0000
Subject: [PATCH 0636/2016] python33Packages.asyncio: init at 3.4.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 8eb7174558c..0cd5ef718c2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -517,6 +517,24 @@ let
     };
   };
 
+  asyncio = buildPythonPackage rec {
+    name = "asyncio-${version}";
+    version = "3.4.3";
+
+    disabled = (!isPy33);
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/a/asyncio/${name}.tar.gz";
+      sha256 = "0hfbqwk9y0bbfgxzg93s2wyk6gcjsdxlr5jwy97hx64ppkw0ydl3";
+    };
+
+    meta = {
+      description = "reference implementation of PEP 3156";
+      homepage = http://www.python.org/dev/peps/pep-3156;
+      license = licenses.free;
+    };
+  };
+
   funcsigs = buildPythonPackage rec {
     name = "funcsigs-0.4";
     disabled = ! (isPy26 || isPy27 || isPy33 || isPyPy);

From f3a0fa9d96abc87daded54b8c2db20a869443083 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 3 Aug 2015 09:28:52 +0000
Subject: [PATCH 0637/2016] pythonPackages.pycares: init at 0.7.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 0cd5ef718c2..5fcb060f6fb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4216,6 +4216,23 @@ let
     };
   };
 
+  pycares = buildPythonPackage rec {
+    name = "pycares-${version}";
+    version = "0.7.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pycares/${name}.tar.gz";
+      sha256 = "10lr3ij67khmfm14cb3sqch3vhv37f3j1whwznq6qy4prfmz5gvl";
+    };
+
+    propagatedBuildInputs = [ pkgs.c-ares ];
+
+    meta = {
+      homepage = http://github.com/saghul/pycares;
+      description = "Interface for c-ares";
+      license = licenses.mit;
+    };
+  };
 
   pyramid = buildPythonPackage rec {
     name = "pyramid-1.5.2";

From 44be36869feda036a2eff3a3032c09b8acb0c5b9 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 3 Aug 2015 09:29:34 +0000
Subject: [PATCH 0638/2016] =?UTF-8?q?pythonPackages.aiodns:=C2=A0init=20at?=
 =?UTF-8?q?=200.3.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 5fcb060f6fb..3210141564b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -275,6 +275,26 @@ let
     };
   };
 
+  aiodns = buildPythonPackage rec {
+    name = "aiodns-${version}";
+    version = "0.3.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/a/aiodns/${name}.tar.gz";
+      sha256 = "0i9ypv9l4d59j87kkrsh1livfgnspyzcbx26jw9x58xs5z05xj7k";
+    };
+
+    propagatedBuildInputs = with self ; [
+      pycares
+    ] ++ optional (isPy33) self.asyncio
+      ++ optional (isPy26 || isPy27) self.trollius;
+
+    meta = {
+      homepage = http://github.com/saghul/aiodns;
+      license = licenses.mit;
+      description = "Simple DNS resolver for asyncio";
+    };
+  };
 
   alabaster = buildPythonPackage rec {
     name = "alabaster-0.7.3";

From eda7843cab45ad4fab16896aa04a93e06745d21f Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 3 Aug 2015 09:30:27 +0000
Subject: [PATCH 0639/2016] python34Packages.slixmpp: init at 1.0.post5

---
 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 3210141564b..f1065390f10 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8134,6 +8134,26 @@ let
     };
   };
 
+  slixmpp = buildPythonPackage rec {
+    name = "slixmpp-${version}";
+    version = "1.0.post5";
+
+    disabled = (!isPy34);
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/slixmpp/${name}.tar.gz";
+      sha256 = "0ik23w3y52m30z56874wgac07j70k7b06n20j44slii8avf58p4b";
+    };
+
+    propagatedBuildInputs = with self ; [ aiodns pyasn1 ];
+
+    meta = {
+      meta = "Elegant Python library for XMPP";
+      license = licenses.mit;
+      homepage = https://dev.louiz.org/projects/slixmpp;
+    };
+  };
+
   netaddr = buildPythonPackage rec {
     name = "netaddr-0.7.5";
 

From b867cc62a78221de7378a3e416d44151a8303251 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 3 Aug 2015 09:31:21 +0000
Subject: [PATCH 0640/2016] poezio: 0.8.1 -> 0.9

---
 .../poezio/fix_requirements.patch             | 11 ------
 .../poezio/make_default_config_writable.patch | 34 +++++++++----------
 pkgs/top-level/python-packages.nix            | 11 +++---
 3 files changed, 22 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/development/python-modules/poezio/fix_requirements.patch

diff --git a/pkgs/development/python-modules/poezio/fix_requirements.patch b/pkgs/development/python-modules/poezio/fix_requirements.patch
deleted file mode 100644
index 99b022c0e78..00000000000
--- a/pkgs/development/python-modules/poezio/fix_requirements.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py	2014-03-20 22:27:14.000000000 +0100
-+++ b/setup.py	2015-07-10 21:18:30.156196111 +0200
-@@ -49,7 +49,7 @@
-        scripts = ['scripts/poezio'],
-        data_files = [('share/man/man1/', ['data/poezio.1'])],
- 
--       install_requires = ['sleekxmpp==1.2.4',
-+       install_requires = ['sleekxmpp==1.2.5',
-                            'dnspython3>=1.11.1'],
-        extras_require = {'OTR plugin': 'python-potr>=1.0',
-                          'Screen autoaway plugin': 'pyinotify==0.9.4'}
diff --git a/pkgs/development/python-modules/poezio/make_default_config_writable.patch b/pkgs/development/python-modules/poezio/make_default_config_writable.patch
index aa431dcc928..03d732e256c 100644
--- a/pkgs/development/python-modules/poezio/make_default_config_writable.patch
+++ b/pkgs/development/python-modules/poezio/make_default_config_writable.patch
@@ -1,25 +1,25 @@
 diff -ruN a/src/config.py b/src/config.py
---- a/src/config.py	2014-03-20 22:27:05.000000000 +0100
-+++ b/src/config.py	2015-07-10 21:24:37.583136078 +0200
-@@ -18,6 +18,7 @@
+--- a/src/config.py	2015-07-31 19:35:37.000000000 +0000
++++ b/src/config.py	2015-08-03 09:23:34.322098081 +0000
+@@ -14,6 +14,7 @@
  
+ import logging.config
  import os
- import logging
 +import stat
+ import sys
+ import pkg_resources
  
- from configparser import RawConfigParser, NoOptionError, NoSectionError
- from os import environ, makedirs, path, remove
-@@ -279,6 +280,13 @@
-         copy2(default, options.filename)
-     elif path.isfile(other):
-         copy2(other, options.filename)
+@@ -563,6 +564,13 @@
+             copy2(default, options.filename)
+         elif path.isfile(other):
+             copy2(other, options.filename)
 +
-+    # Inside the nixstore, the reference file is readonly, so is the copy.
-+    # Make it writable by the user who just created it.
-+    if os.path.exists(options.filename):
-+        os.chmod(options.filename,
-+                 os.stat(options.filename).st_mode | stat.S_IWUSR)
++        # Inside the nixstore, the reference file is readonly, so is the copy.
++        # Make it writable by the user who just created it.
++        if os.path.exists(options.filename):
++            os.chmod(options.filename,
++                     os.stat(options.filename).st_mode | stat.S_IWUSR)
 +
-     firstrun = True
+         global firstrun
+         firstrun = True
  
- try:
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f1065390f10..39c459259ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16822,21 +16822,20 @@ let
 
   poezio = buildPythonPackage rec {
     name = "poezio-${version}";
-    version = "0.8.1";
+    version = "0.9";
 
     namePrefix = "";
-    disabled = (!isPy3k);
-    propagatedBuildInputs = with self ; [ dnspython3 sleekxmpp ];
+    disabled = (!isPy34);
+    propagatedBuildInputs = with self ; [ aiodns slixmpp ];
 
    patches =
    let patch_base = ../development/python-modules/poezio ;
    in [ "${patch_base}/make_default_config_writable.patch"
-        "${patch_base}/fix_requirements.patch"
       ];
 
     src = pkgs.fetchurl {
-      url = "http://dev.louiz.org/attachments/download/52/${name}.tar.xz";
-      sha256 = "0n3phh3lc82609ssfvqvd4papvhykd1sf2bm88dggh2x4mypwjff";
+      url = "http://dev.louiz.org/attachments/download/91/${name}.tar.xz";
+      sha256 = "1vc7zn4rp0ds0cdh1xcmbwx6w2qh4pnpzi5mdnj3rpl7xdr6jqzi";
     };
 
     meta = {

From 8c6a2e3b5d291bfc08bb62a50772431e3a5f1854 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 3 Aug 2015 11:37:15 +0200
Subject: [PATCH 0641/2016] ldns: Add linux to platforms

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

diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 01aeeecc6f6..2b153036f90 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -16,9 +16,10 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-ssl=${openssl}" "--with-drill" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Library with the aim of simplifying DNS programming in C";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     homepage = "http://www.nlnetlabs.nl/projects/ldns/";
+    platforms = platforms.linux;
   };
 }

From 4493ca00943196c2f9abb91aff92449a6a16626d Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 3 Aug 2015 11:37:40 +0200
Subject: [PATCH 0642/2016] ldns: Add myself as a maintainer

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

diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 2b153036f90..b4dbbf792ef 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
     homepage = "http://www.nlnetlabs.nl/projects/ldns/";
     platforms = platforms.linux;
+    maintainers = with maintainers; [ jgeerds ];
   };
 }

From 74afccb3adfc1d0891691f7a0254b7702a48a3b2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <robin@loc-com.de>
Date: Sun, 2 Aug 2015 12:21:10 +0000
Subject: [PATCH 0643/2016] phpPackages.composer: 1.0.0-alpha9 -> 1.0.0-alpha10

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 03259dde82d..bfd741ccb4b 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -102,11 +102,11 @@ let self = with self; {
 
   composer = pkgs.stdenv.mkDerivation rec {
     name = "composer-${version}";
-    version = "1.0.0-alpha9";
+    version = "1.0.0-alpha10";
 
     src = pkgs.fetchurl {
-      url = "https://getcomposer.org/download/1.0.0-alpha9/composer.phar";
-      sha256 = "1x7i9xs9xggq0qq4kzrwh2pky8skax0l829zwwsy3hcvch3irvrk";
+      url = "https://getcomposer.org/download/${version}/composer.phar";
+      sha256 = "0a26zlsr2jffcqlz8z6l8s6c6nlyfj2gxqfgx76knx5wch1psb4z";
     };
 
     phases = [ "installPhase" ];
@@ -123,7 +123,7 @@ let self = with self; {
       description = "Dependency Manager for PHP";
       license = licenses.mit;
       homepage = https://getcomposer.org/;
-      maintainers = with maintainers; [offline];
+      maintainers = with maintainers; [ globin offline ];
     };
   };
 }; in self

From c2aadb38a7b7b29b29135cef80b1c4c8b2b15c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 3 Aug 2015 07:36:27 +0200
Subject: [PATCH 0644/2016] ntopng: add extra download URL

It seems upstream have moved the ntopng-1.2.1.tgz into an "old/"
subdirectory.
---
 pkgs/tools/networking/ntopng/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix
index 1a2bac79e1f..ddb6a7bec36 100644
--- a/pkgs/tools/networking/ntopng/default.nix
+++ b/pkgs/tools/networking/ntopng/default.nix
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
   name = "ntopng-1.2.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/ntop/ntopng/${name}.tgz";
+    urls = [
+      "mirror://sourceforge/project/ntop/ntopng/old/${name}.tgz"
+      "mirror://sourceforge/project/ntop/ntopng/${name}.tgz"
+    ];
     sha256 = "1db83cd1v4ivl8hxzzdvvdcgk22ji7mwrfnd5nnwll6kb11i364v";
   };
 

From 89e78b5211b902d0a241c67c2331d57bd8d9b3b1 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 3 Aug 2015 10:00:17 +0200
Subject: [PATCH 0645/2016] omapd: init at 0.9.2

---
 pkgs/tools/security/omapd/default.nix | 39 +++++++++++++++++++++++++++
 pkgs/tools/security/omapd/zlib.patch  |  9 +++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 50 insertions(+)
 create mode 100644 pkgs/tools/security/omapd/default.nix
 create mode 100644 pkgs/tools/security/omapd/zlib.patch

diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix
new file mode 100644
index 00000000000..ae1c2c05f14
--- /dev/null
+++ b/pkgs/tools/security/omapd/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, cmake, qt4, gdb, zlib }:
+stdenv.mkDerivation rec {
+
+  name = "omapd-${version}";
+  version = "0.9.2";
+
+  src = fetchurl {
+    url = "http://omapd.googlecode.com/files/${name}.tgz";
+    sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc";
+  };
+
+  patches = [ ./zlib.patch ];
+
+  buildInputs = [ cmake qt4 zlib gdb ];
+
+  phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" ];
+
+  buildPhase = ''
+    (cd plugins/RAMHashTables; qmake; make)
+    qmake
+    make
+    '';
+
+  installPhase = ''
+    mkdir -p $out $out/bin $out/etc $out/usr/lib/omapd/plugins
+    cp omapd $out/bin/.
+    cp omapd.conf $out/etc/.
+    cp plugins/libRAMHashTables.so $out/usr/lib/omapd/plugins/.
+    ln -s $out/usr/lib/omapd/plugins $out/bin/plugins
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = http://code.google.com/p/omapd;
+    description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.tstrobel ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/security/omapd/zlib.patch b/pkgs/tools/security/omapd/zlib.patch
new file mode 100644
index 00000000000..dc0644f2a01
--- /dev/null
+++ b/pkgs/tools/security/omapd/zlib.patch
@@ -0,0 +1,9 @@
+diff -uNr omapd-0.9.2-old/omapd.pro omapd-0.9.2/omapd.pro
+--- omapd-0.9.2-old/omapd.pro	2015-08-03 09:46:47.463420480 +0200
++++ omapd-0.9.2/omapd.pro	2015-08-03 09:48:32.238657105 +0200
+@@ -37,4 +37,4 @@
+     clientconfiguration.h \
+     managementserver.h \
+     json.h
+-INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
++LIBS += -lz
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 139f655110c..8aea9803be4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3134,6 +3134,8 @@ let
 
   trousers = callPackage ../tools/security/trousers { };
 
+  omapd = callPackage ../tools/security/omapd { };
+
   ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
 
   ttfautohint = callPackage ../tools/misc/ttfautohint { };

From 45bdde550537e7cf212e70d34e94afd4d5942aec Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 3 Aug 2015 13:30:15 +0200
Subject: [PATCH 0646/2016] rustRegistry: 2015-07-07 -> 2015-08-03

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 9d74ab88fc0..0454288eb01 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-07-07";
-  rev = "fd9e3e4a350f5df0d975913bcc29d2051a509199";
+  version = "2015-08-03";
+  rev = "dd3e0cecc30d0efbb50dfe76c83900568502af45";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "1vm28gfq4fmialz5ab8cxk5q1kdf6hlg3ni41qpy9k61pp9bqdwr";
+      sha256 = "0wlbaspa0mvljhkjjnglxwpp9b4mzcxpkdzrciljxwdsr8jvlz30";
   };
 
 in

From ff4e92f2cc96ce4b776fe5de21b54f9c2f897e52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 3 Aug 2015 13:48:43 +0200
Subject: [PATCH 0647/2016] Spelling etc

---
 nixos/doc/manual/release-notes/rl-unstable.xml |  6 +++---
 nixos/modules/misc/locate.nix                  | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 7106690b82b..aedc85f3069 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -181,10 +181,10 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
 
 <listitem>
   <para>
-    The <literal>locate</literal> service no longer indexes the nix store
+    The <literal>locate</literal> service no longer indexes the Nix store
     by default, preventing packages with potentially numerous versions from
-    cluttering the output. Indexing the store can be activated with
-    <literal>services.locate.includeStore = true;</literal>.
+    cluttering the output. Indexing the store can be activated by setting
+    <literal>services.locate.includeStore = true</literal>.
   </para>
 </listitem>
 
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index bf05c460729..e85e390acb6 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -35,7 +35,7 @@ in {
         type = types.listOf types.str;
         default = [ ];
         description = ''
-          Extra flags to append to <command>updatedb</command>.
+          Extra flags to pass to <command>updatedb</command>.
         '';
       };
 
@@ -60,7 +60,7 @@ in {
         type = types.bool;
         default = false;
         description = ''
-          Whether to include /nix/store in the locate database.
+          Whether to include <filename>/nix/store<filename> in the locate database.
         '';
       };
 
@@ -78,9 +78,9 @@ in {
           ''
             mkdir -m 0755 -p $(dirname ${toString cfg.output})
             exec updatedb \
-            --localuser=${cfg.localuser} \
-	    ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \
-            --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
+              --localuser=${cfg.localuser} \
+              ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \
+              --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
           '';
         serviceConfig.Nice = 19;
         serviceConfig.IOSchedulingClass = "idle";

From bae1e6a0e9f8ac0f52cd4d5aa028ab1d33c28711 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 3 Aug 2015 14:33:54 +0200
Subject: [PATCH 0648/2016] geolite-legacy: 2015-07-30 -> 2015-08-03

---
 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 fd940fd3b4f..6f1dfae0e21 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-07-30";
+  version = "2015-08-03";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
     "0j5dq06pjrh6d94wczsg6qdys4v164nvp2a7qqrg8w4knh94qp6n";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "16lfazhyhwmh8fyd7pxzwxp5sxszbqw4xdx3avv78hglhyb2ijkw";
+    "04qlh6zr8m5qxl2gcysb721bqlnqrxhngh128zj1w8rhqckjndgj";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "16jd6f2pwy8616jb78x8j6zda7h0p1bp786y86rq3ipgcw6g0jgn";
+    "06p9wnypnffsmqg5bszwygb73in4gc0h5l26wk0s43pdaldrdrx0";
 
   meta = with stdenv.lib; {
     inherit version;

From fcc671668056698b0bb3f43708c1acf27509004d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 3 Aug 2015 17:12:27 +0300
Subject: [PATCH 0649/2016] openbox: propagate some dependencies

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

diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix
index 2756525b2b0..f1369ebea7d 100644
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig
 , libxml2, libXinerama, libXcursor, libXau, libXrandr
-, imlib2, pango, libstartup_notification, makeWrapper}:
+, imlib2, pango, libstartup_notification, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "openbox-3.5.2";
@@ -8,8 +8,11 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig libxml2
     libXinerama libXcursor libXau libXrandr
-    imlib2 pango libstartup_notification
-    makeWrapper
+    libstartup_notification makeWrapper
+  ];
+
+  propagatedBuildInputs = [
+    pango imlib2
   ];
 
   src = fetchurl {

From 5bbed3d52d242df55b6c96ee0b46b5303e673cdc Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 3 Aug 2015 14:27:23 +0000
Subject: [PATCH 0650/2016] dd-agent: if nginx and mongodb integrations are
 enabled, then disk and network settings are not gathered anymore. This fixes
 the problem

---
 .../modules/services/monitoring/dd-agent.nix  | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix
index 0e0340e2fa3..8c847af3bfc 100644
--- a/nixos/modules/services/monitoring/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent.nix
@@ -51,6 +51,24 @@ let
     # ganglia_port: 8651
   '';
 
+  diskConfig = pkgs.writeText "disk.yaml" ''
+    init_config:
+
+    instances:
+      - use_mount: no
+  '';
+  
+  networkConfig = pkgs.writeText "network.yaml" ''
+    init_config:
+
+    instances:
+      # Network check only supports one configured instance
+      - collect_connection_state: false
+        excluded_interfaces:
+          - lo
+          - lo0
+  '';
+  
   postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig;
   nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig;
   mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig;
@@ -58,6 +76,12 @@ let
   etcfiles =
     [ { source = ddConf;
         target = "dd-agent/datadog.conf";
+      }
+      { source = diskConfig;
+        target = "dd-agent/conf.d/disk.yaml";
+      }
+      { source = networkConfig;
+        target = "dd-agent/conf.d/network.yaml";
       } ] ++
     (optional (cfg.postgresqlConfig != null)
       { source = postgresqlConfig;
@@ -143,7 +167,7 @@ in {
         Restart = "always";
         RestartSec = 2;
       };
-      restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig mongoConfig ];
+      restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig ];
     };
 
     systemd.services.dogstatsd = {
@@ -160,7 +184,7 @@ in {
         RestartSec = 2;
       };
       environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
-      restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig mongoConfig ];
+      restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig ];
     };
 
     environment.etc = etcfiles;

From cb6dc7159998c45113dcc79f0a7b8443109ea1cd Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Fri, 31 Jul 2015 00:22:44 -0400
Subject: [PATCH 0651/2016] GateOne: init at 1.2

---
 nixos/modules/misc/ids.nix                    |  2 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/networking/gateone.nix | 59 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 ++++++
 4 files changed, 80 insertions(+)
 create mode 100644 nixos/modules/services/networking/gateone.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index b25e3d7e40d..1e5393f26b5 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -228,6 +228,7 @@
       subsonic = 204;
       riak = 205;
       shout = 206;
+      gateone = 207;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -434,6 +435,7 @@
       subsonic = 204;
       riak = 205;
       #shout = 206; #unused
+      gateone = 207;
 
       # 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 212555d7efc..cafb869501f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -283,6 +283,7 @@
   ./services/networking/firewall.nix
   ./services/networking/flashpolicyd.nix
   ./services/networking/freenet.nix
+  ./services/networking/gateone.nix
   ./services/networking/git-daemon.nix
   ./services/networking/gnunet.nix
   ./services/networking/gogoclient.nix
diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix
new file mode 100644
index 00000000000..b8ae5490d7b
--- /dev/null
+++ b/nixos/modules/services/networking/gateone.nix
@@ -0,0 +1,59 @@
+{ config, lib, pkgs, ...}:
+with lib;
+let
+  cfg = config.services.gateone;
+in
+{
+options = {
+    services.gateone = {
+      enable = mkEnableOption "GateOne server";
+      pidDir = mkOption {
+        default = "/run/gateone";
+        type = types.path;
+        description = ''Path of pid files for GateOne.'';
+      };
+      settingsDir = mkOption {
+        default = "/var/lib/gateone";
+        type = types.path;
+        description = ''Path of configuration files for GateOne.'';
+      };
+    };
+};
+config = mkIf cfg.enable {
+  environment.systemPackages = with pkgs.pythonPackages; [
+    gateone pkgs.openssh pkgs.procps pkgs.coreutils ];
+
+  users.extraUsers.gateone = {
+    description = "GateOne privilege separation user";
+    uid = config.ids.uids.gateone;
+    home = cfg.settingsDir;
+  };
+  users.extraGroups.gateone.gid = config.ids.gids.gateone;
+
+  systemd.services.gateone = with pkgs; {
+    description = "GateOne web-based terminal";
+    path = [ pythonPackages.gateone nix openssh procps coreutils ];
+    preStart = ''
+      if [ ! -d ${cfg.settingsDir} ] ; then
+        mkdir -m 0750 -p ${cfg.settingsDir}
+        mkdir -m 0750 -p ${cfg.pidDir}
+        chown -R gateone.gateone ${cfg.settingsDir}
+        chown -R gateone.gateone ${cfg.pidDir}
+      fi
+      '';
+    #unitConfig.RequiresMountsFor = "${cfg.settingsDir}";
+    serviceConfig = {
+      ExecStart = ''${pythonPackages.gateone}/bin/gateone --settings_dir=${cfg.settingsDir} --pid_file=${cfg.pidDir}/gateone.pid --gid=${toString config.ids.gids.gateone} --uid=${toString config.ids.uids.gateone}'';
+      User = "gateone";
+      Group = "gateone";
+      WorkingDirectory = cfg.settingsDir;
+      PermissionsStartOnly = true;
+
+    };
+
+    wantedBy = [ "multi-user.target" ];
+    requires = [ "network.target" ];
+  };
+};
+}
+  
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39c459259ea..c2f17a66dfc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3432,6 +3432,24 @@ let
     };
   };
 
+  gateone = buildPythonPackage rec {
+    name = "gateone-1.2-0d57c3";
+    disabled = ! isPy27;
+    src = pkgs.fetchFromGitHub {
+      rev = "11ed97c663b3e8c1b8eba473b5cf8362b10d57c3";
+      owner= "liftoff";
+      repo = "GateOne";
+      sha256 ="0zp9vfs6sqbx4d0g45kkjinfmsl9zqwa6bhp3xd81wx3ph9yr1hq";
+    };
+    propagatedBuildInputs = with pkgs.pythonPackages; [tornado futures html5lib readline pkgs.openssl];
+    meta = {
+      homepage = https://liftoffsoftware.com/;
+      description = "GateOne is a web-based terminal emulator and SSH client";
+      maintainers = with maintainers; [ tomberek ];
+
+    };
+  };
+
   gcutil = buildPythonPackage rec {
     name = "gcutil-1.16.1";
     meta.maintainers = with maintainers; [ phreedom ];

From 6f727a8a8375c234aa8feef8bb30009374c68aaf Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 3 Aug 2015 16:59:33 +0200
Subject: [PATCH 0652/2016] strongswan: add TNC build option

---
 pkgs/tools/networking/strongswan/default.nix | 20 +++++++++++++++++---
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 7d427ac9622..7a9edef5004 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook }:
+{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook
+, curl, trousers, sqlite
+, enableTNC ? false }:
 
 stdenv.mkDerivation rec {
   name = "strongswan-5.3.2";
@@ -10,7 +12,9 @@ stdenv.mkDerivation rec {
 
   dontPatchELF = true;
 
-  buildInputs = [ gmp pkgconfig python autoreconfHook ];
+  buildInputs =
+    [ gmp pkgconfig python autoreconfHook ]
+    ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite ];
 
   patches = [
     ./ext_auth-path.patch
@@ -18,7 +22,17 @@ stdenv.mkDerivation rec {
     ./updown-path.patch
   ];
 
-  configureFlags = [ "--enable-swanctl" "--enable-cmd" ];
+  configureFlags =
+    [ "--enable-swanctl" "--enable-cmd" ]
+    ++ stdenv.lib.optionals enableTNC [
+         "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf"
+         "--enable-curl" "--enable-openssl" "--enable-eap-identity" "--enable-eap-md5" "--enable-eap-mschapv2"
+         "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20"
+         "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation"
+         "--enable-tnc-imv" "--enable-imv-attestation"
+         "--with-tss=trousers"
+         "--enable-aikgen"
+         "--enable-sqlite" ];
 
   NIX_LDFLAGS = "-lgcc_s" ;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c0a818b38f..de30cfb392c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3066,6 +3066,8 @@ let
 
   strongswan = callPackage ../tools/networking/strongswan { };
 
+  strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC=true; };
+
   su = shadow.su;
 
   subsonic = callPackage ../servers/misc/subsonic { };

From 1b0e82659c7bd8828137a9361c4a09c17dba3982 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 3 Aug 2015 17:16:58 +0200
Subject: [PATCH 0653/2016] perl-packages: DateTime-Format-Natural 1.02 -> 1.03

---
 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 bfb16d3720e..6eaa7e11a11 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2374,10 +2374,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateTimeFormatNatural = buildPerlPackage {
-    name = "DateTime-Format-Natural-1.02";
+    name = "DateTime-Format-Natural-1.03";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.02.tar.gz;
-      sha256 = "5479c48ade5eca9712784afee18c58308d56742a204d5ea9040d011f705303e3";
+      url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.03.tar.gz;
+      sha256 = "1m3bmv90kww8xr4dda75isvzigy8y3clgvk58zp0bxc5d7k4qdxi";
     };
     buildInputs = [ ModuleUtil TestMockTime ];
     propagatedBuildInputs = [ Clone DateTime DateTimeTimeZone ListMoreUtils ParamsValidate boolean ];

From 32caa604e3c4fc2704a9d9416e4a244975e4393e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 3 Aug 2015 20:03:11 +0200
Subject: [PATCH 0654/2016] Force Nixpkgs rebuild

Gratuitous change to force Hydra to rebuild Nixpkgs after some
derivations had their references corrupted by a Hydra bug
(https://github.com/NixOS/hydra/commit/ff3f5eb4d8751243a1f7e738a5124c650e541aca).
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 75cc8693480..57875fa6ada 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -126,7 +126,7 @@ exitHandler() {
 
         # If the builder had a non-zero exit code and
         # $succeedOnFailure is set, create the file
-        # `$out/nix-support/failed' to signal failure, and exit
+        # ‘$out/nix-support/failed’ to signal failure, and exit
         # normally.  Otherwise, return the original exit code.
         if [ -n "$succeedOnFailure" ]; then
             echo "build failed with exit code $exitCode (ignored)"

From 8c244bc21c7e6de8ca6de3a3f82b4fb54e9f4dfd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Aug 2015 12:50:11 -0700
Subject: [PATCH 0655/2016] dnsmasq: 2.73 -> 2.75

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

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 7752338c6bb..0e905bb6547 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -11,11 +11,11 @@ let
   ]);
 in
 stdenv.mkDerivation rec {
-  name = "dnsmasq-2.73";
+  name = "dnsmasq-2.75";
 
   src = fetchurl {
     url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz";
-    sha256 = "1xnqfaw2l78f4zw4z9sgr9nl9yc233gxc3sd7hxapz2k7q883zqb";
+    sha256 = "1wa1d4if9q6k3hklv8xi06a59k3aqb7pik8rhi2l53i99hflw334";
   };
 
   preBuild = ''

From 1684ec0bfc8617507f7071596a271ae443682fc5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Aug 2015 12:57:16 -0700
Subject: [PATCH 0656/2016] kernel: 3.10.84 -> 3.10.85

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 3d2b683ee72..0d3bfbefcca 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.84";
+  version = "3.10.85";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "042cybswcxxzi22h96i4h73a4hcb4drhifs6l9jqlqamdn6xabd3";
+    sha256 = "1zn8113m6y1wqmnr6gjzrr7ly2l8860fp2kr4q9di3c2vmnmd9v9";
   };
 
   features.iwlwifi = true;

From 678efd6df09dba16c8dff1b0ba1d1437894b022c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Aug 2015 12:57:20 -0700
Subject: [PATCH 0657/2016] kernel: 3.12.44 -> 3.12.45

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index e34eccadda6..e6e04b7db53 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.44";
+  version = "3.12.45";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "05fyb49ibijq2iv4x25m5a77n8609b4lz8x8n8wfkdywm13479h8";
+    sha256 = "01p3zbhngqnkmzw38xmxd0lf97kf2h7ihgss6bgdnkpqrbzb1pqf";
   };
 
   features.iwlwifi = true;

From 102cfc53bcf924f9fcb8ea47af15e93de01efee1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Aug 2015 12:57:33 -0700
Subject: [PATCH 0658/2016] kernel: 4.1.3 -> 4.1.4

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index 031b0d549d9..82bde253529 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1.3";
+  version = "4.1.4";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "02z3palvki31qimmycz4y4wl4lb46n662qql46iah224k0q2rpcn";
+    sha256 = "17whsim5l9i486y5kchfpm9jhbr9lak4a1gdqygp5kwfrfyz5qiy";
   };
 
   features.iwlwifi = true;

From ce6b96db6e4b0f1fbdba3f669da376900b5984cc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Aug 2015 13:06:22 -0700
Subject: [PATCH 0659/2016] kernel-testing: 4.2.0-rc2 -> 4.2.0-rc5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 0c31c558c47..216f74caa34 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.2-rc2";
-  modDirVersion = "4.2.0-rc2";
+  version = "4.2-rc5";
+  modDirVersion = "4.2.0-rc5";
   extraMeta.branch = "4.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "068g71ns8d2j66hppmnssilf185p33w7argb0r2w9kplqq2ac99w";
+    sha256 = "1ir3g5in53qq50ygnwgkzjkl1pzb12ar8k1zvfzcxapddvnhayr0";
   };
 
   features.iwlwifi = true;

From a8788c4d6a2630e063557b51e822da43a28eec40 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 3 Aug 2015 20:52:53 +0300
Subject: [PATCH 0660/2016] bumblebee: remove redundant bash process

---
 nixos/modules/hardware/video/bumblebee.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
index e341eac4a81..e2202e1e17d 100644
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixos/modules/hardware/video/bumblebee.nix
@@ -52,9 +52,9 @@ in
     systemd.services.bumblebeed = {
       description = "Bumblebee Hybrid Graphics Switcher";
       wantedBy = [ "display-manager.service" ];
-      script = "bumblebeed --use-syslog -g ${config.hardware.bumblebee.group}";
       path = [ kernel.bbswitch bumblebee ];
       serviceConfig = {
+        ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${config.hardware.bumblebee.group}";
         Restart = "always";
         RestartSec = 60;
         CPUSchedulingPolicy = "idle";

From 52fb36e7e05ffbd8f517f4b9d51c81a7ddb063b9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 3 Aug 2015 20:53:30 +0300
Subject: [PATCH 0661/2016] maven: move to dedicated directory to prevent
 clashes with other java applications

---
 .../tools/build-managers/apache-maven/builder.sh       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh
index 03e4a041402..8d06352b135 100644
--- a/pkgs/development/tools/build-managers/apache-maven/builder.sh
+++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh
@@ -2,16 +2,16 @@ source $stdenv/setup
 
 unpackPhase
 
-mkdir -p $out
-cp -r $name/* $out
+mkdir -p $out/maven
+cp -r $name/* $out/maven
 
-wrapProgram $out/bin/mvn --set JAVA_HOME "$jdk"
+makeWrapper $out/maven/bin/mvn $out/bin/mvn --set JAVA_HOME "$jdk"
 
 # Add the maven-axis and JIRA plugin by default when using maven 1.x
-if [ -e $out/bin/maven ]
+if [ -e $out/maven/bin/maven ]
 then
   export OLD_HOME=$HOME
   export HOME=.
-  $out/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7
+  $out/maven/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7
   export HOME=OLD_HOME
 fi

From 4dde32b4f240cb68ba7455bcf98c25749fd0235e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 3 Aug 2015 20:53:37 +0300
Subject: [PATCH 0662/2016] gradle: move to dedicated directory to prevent
 clashes with other java applications

---
 pkgs/development/tools/build-managers/gradle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 3bff9d59e7f..fd99437630c 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    mkdir -pv $out
-    cp -rv lib $out
+    mkdir -pv $out/gradle
+    cp -rv lib $out/gradle
 
-    gradle_launcher_jar=$(echo $out/lib/gradle-launcher-*.jar)
+    gradle_launcher_jar=$(echo $out/gradle/lib/gradle-launcher-*.jar)
     test -f $gradle_launcher_jar
     makeWrapper ${jdk}/bin/java $out/bin/gradle \
       --set JAVA_HOME ${jdk} \

From 4802a277a4874cf1c4971005634abb48a8d16b79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 3 Aug 2015 22:27:42 +0200
Subject: [PATCH 0663/2016] nixos: gitit service, change yesNo to bool and add
 toYesNo from bool

---
 nixos/modules/services/misc/gitit.nix | 72 +++++++++++++--------------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index 72b706ddc5a..28c7396672d 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -8,6 +8,8 @@ let
 
   homeDir = "/var/lib/gitit";
 
+  toYesNo = b: if b then "yes" else "no";
+
   gititShared = with cfg.haskellPackages; gitit + "/share/" + pkgs.stdenv.system + "-" + ghc.name + "/" + gitit.pname + "-" + gitit.version;
 
   gititWithPkgs = hsPkgs: extras: hsPkgs.ghcWithPackages (self: with self; [ gitit ] ++ (extras self));
@@ -18,7 +20,7 @@ let
     #!${stdenv.shell}
     cd $HOME
     export PATH="${makeSearchPath "bin" (
-      [ git curl ] ++ (if cfg.pdfExport == "yes" then [texLiveFull] else [])
+      [ git curl ] ++ (if cfg.pdfExport then [texLiveFull] else [])
       )}:$PATH";
     export NIX_GHC="${env}/bin/ghc"
     export NIX_GHCPKG="${env}/bin/ghc-pkg"
@@ -27,11 +29,7 @@ let
     ${env}/bin/gitit -f ${configFile}
   '';
 
-  gititOptions = let
-
-    yesNo = types.enum [ "yes" "no" ];
-
-  in {
+  gititOptions = {
 
       enable = mkOption {
         type = types.bool;
@@ -202,8 +200,8 @@ let
       };
 
       showLhsBirdTracks = mkOption {
-        type = yesNo;
-        default = "no";
+        type = types.bool;
+        default = false;
         description = ''
           Specifies whether to show Haskell code blocks in "bird style", with
           "> " at the beginning of each line.
@@ -283,8 +281,8 @@ let
       };
 
       tableOfContents = mkOption {
-        type = yesNo;
-        default = "yes";
+        type = types.bool;
+        default = true;
         description = ''
           Specifies whether to print a tables of contents (with links to
           sections) on each wiki page.
@@ -306,8 +304,8 @@ let
       };
 
       useCache = mkOption {
-        type = yesNo;
-        default = "no";
+        type = types.bool;
+        default = false;
         description = ''
           Specifies whether to cache rendered pages.  Note that if use-feed is
           selected, feeds will be cached regardless of the value of use-cache.
@@ -338,14 +336,14 @@ let
       };
 
       debugMode = mkOption {
-        type = yesNo;
-        default = "no";
+        type = types.bool;
+        default = false;
         description = "Causes debug information to be logged while gitit is running.";
       };
 
       compressResponses = mkOption {
-        type = yesNo;
-        default = "yes";
+        type = types.bool;
+        default = true;
         description = "Specifies whether HTTP responses should be compressed.";
       };
 
@@ -363,10 +361,10 @@ let
       };
 
       useReCaptcha = mkOption {
-        type = yesNo;
-        default = "no";
+        type = types.bool;
+        default = false;
         description = ''
-          If "yes", causes gitit to use the reCAPTCHA service
+          If true, causes gitit to use the reCAPTCHA service
           (http://recaptcha.net) to prevent bots from creating accounts.
         '';
       };
@@ -471,8 +469,8 @@ let
       };
 
       useFeed = mkOption {
-        type = yesNo;
-        default = "no";
+        type = types.bool;
+        default = false;
         description = ''
           Specifies whether an ATOM feed should be enabled (for the site and
           for individual pages).
@@ -490,8 +488,8 @@ let
       };
 
       absoluteUrls = mkOption {
-        type = yesNo;
-        default = "no";
+        type = types.bool;
+        default = false;
         description = ''
           Make wikilinks absolute with respect to the base-url.  So, for
           example, in a wiki served at the base URL '/wiki', on a page
@@ -514,8 +512,8 @@ let
       };
 
       pdfExport = mkOption {
-        type = yesNo;
-        default = "no";
+        type = types.bool;
+        default = false;
         description = ''
           If yes, PDF will appear in export options. PDF will be created using
           pdflatex, which must be installed and in the path. Note that PDF
@@ -537,8 +535,8 @@ let
       };
 
       xssSanitize = mkOption {
-        type = yesNo;
-        default = "yes";
+        type = types.bool;
+        default = true;
         description = ''
           If yes, all HTML (including that produced by pandoc) is filtered
           through xss-sanitize.  Set to no only if you trust all of your users.
@@ -560,7 +558,7 @@ let
     default-page-type: ${cfg.defaultPageType}
     math: ${cfg.math}
     mathjax-script: ${cfg.mathJaxScript}
-    show-lhs-bird-tracks: ${cfg.showLhsBirdTracks}
+    show-lhs-bird-tracks: ${toYesNo cfg.showLhsBirdTracks}
     templates-dir: ${cfg.templatesDir}
     log-file: ${cfg.logFile}
     log-level: ${cfg.logLevel}
@@ -568,16 +566,16 @@ let
     no-delete: ${cfg.noDelete}
     no-edit: ${cfg.noEdit}
     default-summary: ${cfg.defaultSummary}
-    table-of-contents: ${cfg.tableOfContents}
+    table-of-contents: ${toYesNo cfg.tableOfContents}
     plugins: ${cfg.plugins}
-    use-cache: ${cfg.useCache}
+    use-cache: ${toYesNo cfg.useCache}
     cache-dir: ${cfg.cacheDir}
     max-upload-size: ${cfg.maxUploadSize}
     max-page-size: ${cfg.maxPageSize}
-    debug-mode: ${cfg.debugMode}
-    compress-responses: ${cfg.compressResponses}
+    debug-mode: ${toYesNo cfg.debugMode}
+    compress-responses: ${toYesNo cfg.compressResponses}
     mime-types-file: ${cfg.mimeTypesFile}
-    use-recaptcha: ${cfg.useReCaptcha}
+    use-recaptcha: ${toYesNo cfg.useReCaptcha}
     recaptcha-private-key: ${toString cfg.reCaptchaPrivateKey}
     recaptcha-public-key: ${toString cfg.reCaptchaPublicKey}
     access-question: ${cfg.accessQuestion}
@@ -586,14 +584,14 @@ let
     rpx-key: ${toString cfg.rpxKey}
     mail-command: ${cfg.mailCommand}
     reset-password-message: ${cfg.resetPasswordMessage}
-    use-feed: ${cfg.useFeed}
+    use-feed: ${toYesNo cfg.useFeed}
     base-url: ${toString cfg.baseUrl}
-    absolute-urls: ${cfg.absoluteUrls}
+    absolute-urls: ${toYesNo cfg.absoluteUrls}
     feed-days: ${toString cfg.feedDays}
     feed-refresh-time: ${toString cfg.feedRefreshTime}
-    pdf-export: ${cfg.pdfExport}
+    pdf-export: ${toYesNo cfg.pdfExport}
     pandoc-user-data: ${toString cfg.pandocUserData}
-    xss-sanitize: ${cfg.xssSanitize}
+    xss-sanitize: ${toYesNo cfg.xssSanitize}
   '';
 
 in

From 6d23f43b30e9bf0abc3d0d33cede022e8edc9ffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 3 Aug 2015 22:27:43 +0200
Subject: [PATCH 0664/2016] nixos: gitit service, use proper documentation
 formatting in examples

---
 nixos/modules/services/misc/gitit.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index 28c7396672d..83186f63c2c 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -292,14 +292,10 @@ let
       plugins = mkOption {
         type = types.path;
         description = ''
-          Specifies a list of plugins to load.  Plugins may be specified either
-          by their path or by their module name.  If the plugin name starts
+          Specifies a list of plugins to load. Plugins may be specified either
+          by their path or by their module name. If the plugin name starts
           with Gitit.Plugin., gitit will assume that the plugin is an installed
           module and will not try to find a source file.
-          Examples:
-          plugins: plugins/DotPlugin.hs, CapitalizeEmphasisPlugin.hs
-          plugins: plugins/DotPlugin
-          plugins: Gitit.Plugin.InterwikiLinks
         '';
       };
 
@@ -355,7 +351,9 @@ let
           line of the file should contain two fields, separated by whitespace.
           The first field is the mime type, the second is a file extension.
           For example:
-          video/x-ms-wmx                    wmx
+<programlisting>
+video/x-ms-wmx  wmx
+</programlisting>
           If the file is not found, some simple defaults will be used.
         '';
       };
@@ -482,7 +480,7 @@ let
         default = null;
         description = ''
           The base URL of the wiki, to be used in constructing feed IDs and RPX
-          token_urls.  Set this if use-feed is 'yes' or authentication-method
+          token_urls.  Set this if useFeed is false or authentication-method
           is 'rpx'.
         '';
       };
@@ -494,7 +492,7 @@ let
           Make wikilinks absolute with respect to the base-url.  So, for
           example, in a wiki served at the base URL '/wiki', on a page
           Sub/Page, the wikilink '[Cactus]()' will produce a link to
-          '/wiki/Cactus' if absolute-urls is 'yes', and a relative link to
+          '/wiki/Cactus' if absoluteUrls is true, and a relative link to
           'Cactus' (referring to '/wiki/Sub/Cactus') if absolute-urls is 'no'.
         '';
       };
@@ -515,7 +513,7 @@ let
         type = types.bool;
         default = false;
         description = ''
-          If yes, PDF will appear in export options. PDF will be created using
+          If true, PDF will appear in export options. PDF will be created using
           pdflatex, which must be installed and in the path. Note that PDF
           exports create significant additional server load.
         '';
@@ -538,7 +536,7 @@ let
         type = types.bool;
         default = true;
         description = ''
-          If yes, all HTML (including that produced by pandoc) is filtered
+          If true, all HTML (including that produced by pandoc) is filtered
           through xss-sanitize.  Set to no only if you trust all of your users.
         '';
       };

From 1e2d3f3b5f7c67d3462355fa81d408bbdad63cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 3 Aug 2015 22:27:43 +0200
Subject: [PATCH 0665/2016] nixos: gitit service, use list of strings for
 plugins

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

diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index 83186f63c2c..b23bbaef5f7 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -290,7 +290,7 @@ let
       };
 
       plugins = mkOption {
-        type = types.path;
+        type = with types; listOf str;
         description = ''
           Specifies a list of plugins to load. Plugins may be specified either
           by their path or by their module name. If the plugin name starts
@@ -565,7 +565,7 @@ video/x-ms-wmx  wmx
     no-edit: ${cfg.noEdit}
     default-summary: ${cfg.defaultSummary}
     table-of-contents: ${toYesNo cfg.tableOfContents}
-    plugins: ${cfg.plugins}
+    plugins: ${concatStringsSep "," cfg.plugins}
     use-cache: ${toYesNo cfg.useCache}
     cache-dir: ${cfg.cacheDir}
     max-upload-size: ${cfg.maxUploadSize}
@@ -604,7 +604,7 @@ in
       haskellPackages = mkDefault pkgs.haskellPackages;
       staticDir = gititShared + "/data/static";
       templatesDir = gititShared + "/data/templates";
-      plugins = gititShared + "/plugins/Dot.hs";
+      plugins = [ ];
     };
 
     users.extraUsers.gitit = {

From 727e2b5237824e28d89056fd8b66ad0f7c5aa694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 3 Aug 2015 22:27:43 +0200
Subject: [PATCH 0666/2016] nixos: gitit service, add all different repo
 initalizers

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

diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index b23bbaef5f7..10a706fbd71 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -19,9 +19,6 @@ let
   in writeScript "gitit" ''
     #!${stdenv.shell}
     cd $HOME
-    export PATH="${makeSearchPath "bin" (
-      [ git curl ] ++ (if cfg.pdfExport then [texLiveFull] else [])
-      )}:$PATH";
     export NIX_GHC="${env}/bin/ghc"
     export NIX_GHCPKG="${env}/bin/ghc-pkg"
     export NIX_GHC_DOCDIR="${env}/share/doc/ghc/html"
@@ -624,8 +621,16 @@ in
       description = "Git and Pandoc Powered Wiki";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
+      path = with pkgs; [ curl ]
+             ++ optional cfg.pdfExport texLiveFull
+	     ++ optional (cfg.repositoryType == "darcs") darcs
+	     ++ optional (cfg.repositoryType == "mercurial") mercurial
+	     ++ optional (cfg.repositoryType == "git") git;
 
-      preStart = with cfg; ''
+      preStart = let
+        gm = "gitit@${config.networking.hostName}";
+      in
+      with cfg; ''
         chown ${uid}:${gid} -R ${homeDir}
         for dir in ${repositoryPath} ${staticDir} ${templatesDir} ${cacheDir}
         do
@@ -637,14 +642,35 @@ in
           fi
         done
         cd ${repositoryPath}
-        if [ ! -d  .git ]
-        then
-          ${pkgs.git}/bin/git init
-          ${pkgs.git}/bin/git config user.email "gitit@${config.networking.hostName}"
-          ${pkgs.git}/bin/git config user.name "gitit"
-          chown ${uid}:${gid} -R {repositoryPath}
-        fi
-        cd -
+	${
+	  if repositoryType == "darcs" then
+	  ''
+	  if [ ! -d _darcs ]
+	  then
+	    ${pkgs.darcs}/bin/darcs initialize
+	    echo "${gm}" > _darcs/prefs/email
+	  ''
+	  else if repositoryType == "mercurial" then
+	  ''
+	  if [ ! -d .hg ]
+	  then
+	    ${pkgs.mercurial}/bin/hg init
+	    cat >> .hg/hgrc <<NAMED
+[ui]
+username = gitit ${gm}
+NAMED
+	  ''
+	  else
+	  ''
+	  if [ ! -d  .git ]
+          then
+            ${pkgs.git}/bin/git init
+            ${pkgs.git}/bin/git config user.email "${gm}"
+            ${pkgs.git}/bin/git config user.name "gitit"
+	  ''}
+          chown ${uid}:${gid} -R ${repositoryPath}
+          fi
+	cd -
       '';
 
       serviceConfig = {

From 29fb4c4dc0b27cf7dbbaa87428540a91200959dd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Aug 2015 13:32:11 -0700
Subject: [PATCH 0667/2016] gssdp: 0.14.6 -> 0.14.11

---
 pkgs/development/libraries/gssdp/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 792b6d2e4db..1a8cb233b77 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -1,14 +1,16 @@
-{stdenv, fetchurl, pkgconfig, libsoup, glib, libxml2}:
+{ stdenv, fetchurl, pkgconfig, libsoup, glib }:
 
 stdenv.mkDerivation {
-  name = "gssdp-0.12.2.1";
+  name = "gssdp-0.14.11";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.6.tar.xz;
-    sha256 = "1kgakr0rpdpm7nkp4ycka12nndga16wmzim79v1nbcc0j2wxxkws";
+    url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.11.tar.xz;
+    sha256 = "0njkqr2y7c6linnw4wkc4y2vq5dfkpryqcinbzn0pzhr46psxxbv";
   };
 
-  buildInputs = [pkgconfig libsoup glib libxml2];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libsoup ];
+  propagatedBuildInputs = [ glib ];
 
   meta = {
     description = "GObject-based API for handling resource discovery and announcement over SSDP";

From 68ba5ae1ef4cc6a9b724338528b6d8486f492f4c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Aug 2015 13:49:57 -0700
Subject: [PATCH 0668/2016] gupnp-igd: 0.2.1 -> 0.2.4

---
 .../development/libraries/gupnp-igd/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix
index 20a5f2d9c94..182905e9546 100644
--- a/pkgs/development/libraries/gupnp-igd/default.nix
+++ b/pkgs/development/libraries/gupnp-igd/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, glib, gupnp, python, pygobject }:
+{ stdenv, fetchurl, pkgconfig, glib, gupnp }:
  
 stdenv.mkDerivation rec {
-  name = "gupnp-igd-0.2.1";
+  name = "gupnp-igd-${version}";
+  majorVersion = "0.2";
+  version = "${majorVersion}.4";
 
   src = fetchurl {
-    url = https://launchpad.net/ubuntu/+archive/primary/+files/gupnp-igd_0.2.1.orig.tar.gz;
-    sha256 = "18ia8l24hbylz3dnbg2jf848bmbx0hjkq4fkwzzfn57z021f0fh2";
+    url = "mirror://gnome/sources/gupnp-igd/${majorVersion}/${name}.tar.xz";
+    sha256 = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44";
   };
 
-  propagatedBuildInputs = [ gupnp ];
-
-  buildInputs = [ glib python pygobject ];
-
   nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib gupnp ];
 
   meta = {
     homepage = http://www.gupnp.org/;
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
 

From 0392e9c8c6417e4a3cdf0db38b8ba6154203073f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Aug 2015 13:54:38 -0700
Subject: [PATCH 0669/2016] gupnp-av: 0.12.4 -> 0.12.7

---
 pkgs/development/libraries/gupnp-av/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
index 2dcd5b11c38..789fdcd9c2a 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, gupnp, pkgconfig }:
+{ stdenv, fetchurl, pkgconfig, gupnp, glib, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gupnp-av-${version}";
   majorVersion = "0.12";
-  version = "${majorVersion}.4";
+  version = "${majorVersion}.7";
+
   src = fetchurl {
-    url = "mirror://gnome/sources/gupnp-av/${majorVersion}/gupnp-av-${version}.tar.xz";
-    sha256 = "0nvsvpiyfslz54j4hjh2gsdjkbi2qj2f4k0aw8s7f05kibprr2jl";
+    url = "mirror://gnome/sources/gupnp-av/${majorVersion}/${name}.tar.xz";
+    sha256 = "35e775bc4f7801d65dcb710905a6b8420ce751a239b5651e6d830615dc906ea8";
   };
   
-  buildInputs = [ gupnp pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gupnp glib libxml2 ];
 
   meta = {
     homepage = http://gupnp.org/;
     description = "A collection of helpers for building AV (audio/video) applications using GUPnP";
-    longDescription = "GUPnP implements the UPnP specification: resource announcement and discovery, description, control, event notification, and presentation (GUPnP includes basic web server functionality through libsoup). GUPnP does not include helpers for construction or control of specific standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework.";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
-}
\ No newline at end of file
+}

From 43bd15b9b51450fbd47c3b55596bffdf101a7e57 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Aug 2015 13:49:39 -0700
Subject: [PATCH 0670/2016] gupnp: 0.20.9 -> 0.20.14

---
 pkgs/development/libraries/gupnp/default.nix | 21 ++++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index e278980e1e1..6145c8c4947 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
+{ stdenv, fetchurl, pkgconfig, glib, gssdp, libsoup, libxml2, libuuid }:
  
 stdenv.mkDerivation rec {
   name = "gupnp-${version}";
   majorVersion = "0.20";
-  version = "${majorVersion}.9";
+  version = "${majorVersion}.14";
+
   src = fetchurl {
     url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz";
-    sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1";
+    sha256 = "77ffb940ba77c4a6426d09d41004c75d92652dcbde86c84ac1c847dbd9ad59bd";
   };
 
-  propagatedBuildInputs = [ libxml2 libsoup gssdp ];
-  buildInputs = [ glib libuuid ];
-
   nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ];
 
-  postInstall = '' 
-    cp -r ${libsoup}/include/libsoup-2.4/libsoup $out/include
-    cp -r ${gssdp}/include/gssdp-1.0/libgssdp $out/include
-    cp -r ${libxml2}/include/libxml2/libxml $out/include
-    '';
+  postInstall = ''
+    ln -sv ${libsoup}/include/*/libsoup $out/include
+    ln -sv ${libxml2}/include/*/libxml $out/include
+    ln -sv ${gssdp}/include/*/libgssdp $out/include
+  '';
 
   meta = {
     homepage = http://www.gupnp.org/;

From 1f103d8efcdf1bce862225e36dac4ebb8b969696 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Aug 2015 14:05:37 -0700
Subject: [PATCH 0671/2016] libnice: 0.1.4 -> 0.1.13

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

diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix
index 4ccb7d4df8b..003b2acc920 100644
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/pkgs/development/libraries/libnice/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gstreamer, gst_plugins_base }:
+{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1 }:
 
 stdenv.mkDerivation rec {
-  name = "libnice-0.1.4";
+  name = "libnice-0.1.13";
 
   src = fetchurl {
     url = "http://nice.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "0mxzr3y91hkjxdz1mzhxwi59la86hw2rzmd3y9c32801kkg1gra4";
+    sha256 = "1q8rhklbz1zla67r4mw0f7v3m5b32maj0prnr0kshcz97fgjs4b1";
   };
 
-  buildInputs = [ pkgconfig glib gupnp_igd gstreamer gst_plugins_base ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
+  propagatedBuildInputs = [ glib gupnp_igd ];
 
   meta = {
     homepage = http://nice.freedesktop.org/wiki/;

From f2d3b5ead934a3334f67405cddc705273e736ef1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Aug 2015 14:12:14 -0700
Subject: [PATCH 0672/2016] grub2: 2015-07-05 -> 2015-07-27

---
 pkgs/tools/misc/grub/2.0x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index f8f0f088079..2880666e8db 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -20,7 +20,7 @@ let
   canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
   inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
-  version = "2.x-2015-07-05";
+  version = "2.x-2015-07-27";
 
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
 
   src = fetchFromSavannah {
     repo = "grub";
-    rev = "0d7c7f751dc5a8338497bef8b38f78153c4f0464";
-    sha256 = "1vkd7na3kp9ri4xsd3zznvnrjzz1qsz62fycg941pm2k18r3m7xd";
+    rev = "72fc110d95129410443b898e931ff7a1db75312e";
+    sha256 = "0l2hws8h1jhww5s0m8pkwdggacpqb7fvz2jx83syg7ynczpgzbxs";
   };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];

From 49adfe2ff914359af74d484aaa96e5c167757d87 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Aug 2015 14:28:11 -0700
Subject: [PATCH 0673/2016] ghostscript: Fix patches

---
 pkgs/misc/ghostscript/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 3cbd156f17d..c5fb141b7e8 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -41,8 +41,6 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  patches = [ ./urw-font-files.patch ];
-
   outputs = [ "out" "doc" ];
 
   enableParallelBuilding = true;

From c31dc22aa2188592d5e0da2ef949f7d865aaff27 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 4 Aug 2015 01:10:13 +0200
Subject: [PATCH 0674/2016] ima-evm-utils: init at 1.0.0

---
 .../linux/ima-evm-utils/default.nix           | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/os-specific/linux/ima-evm-utils/default.nix

diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix
new file mode 100644
index 00000000000..ad3df25df58
--- /dev/null
+++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }:
+
+stdenv.mkDerivation rec {
+  name = "ima-evm-utils-${version}";
+  version = "1.0.0";
+
+  src = fetchgit {
+    url = "git://git.code.sf.net/p/linux-ima/ima-evm-utils";
+    rev = "4b56112c095cb5cc34dc35abac37ebfc6eadba65";
+    sha256 = "6f1ef4e84b9214448ea4a530a562a20ad1ba5a7cfefd7ddda90a56e2404f3a87";
+  };
+
+  buildInputs = [ autoreconfHook pkgconfig openssl attr keyutils asciidoc libxslt ];
+
+  buildPhase = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl";
+
+  meta = {
+    description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)";
+    homepage = "http://sourceforge.net/projects/linux-ima/";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 518890ebb3d..d732e140668 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9587,6 +9587,8 @@ let
 
   ifplugd = callPackage ../os-specific/linux/ifplugd { };
 
+  ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { };
+
   iomelt = callPackage ../os-specific/linux/iomelt { };
 
   iotop = callPackage ../os-specific/linux/iotop { };

From 736552b7e5b3dd845029dc4c09cf5491410f078a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 3 Aug 2015 16:19:08 -0700
Subject: [PATCH 0675/2016] nixos: Fix manpages from
 8c652379df07f88d6b434fe1042e9a9ba9078440

---
 nixos/modules/misc/locate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index e85e390acb6..4f9c8d4e5ba 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -60,7 +60,7 @@ in {
         type = types.bool;
         default = false;
         description = ''
-          Whether to include <filename>/nix/store<filename> in the locate database.
+          Whether to include <filename>/nix/store</filename> in the locate database.
         '';
       };
 

From c94bf0e8b160ae0261892c27bec7c2b6b9e96a92 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@titanous.com>
Date: Mon, 3 Aug 2015 19:50:54 -0400
Subject: [PATCH 0676/2016] libcec: 2.2.0 -> 3.0.1

Also adds the libcec_platform library which is a new dependency.
---
 pkgs/development/libraries/libcec/default.nix | 12 ++++++----
 .../development/libraries/libcec/platform.nix | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/libcec/platform.nix

diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index 6eca14767c5..94b483e1f5d 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, udev }:
+{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }:
 
-let version = "2.2.0"; in
+let version = "3.0.1"; in
 
 stdenv.mkDerivation {
   name = "libcec-${version}";
 
   src = fetchurl {
-    url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}-repack.tar.gz";
-    sha256 = "1kdfak8y96v14d5vp2apkjjs0fvvim9phc0nkhlq5pjlagk8v32x";
+    url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
+    sha256 = "0gi5gq8pz6vfdx80pimx23d5g243zzgmc7s8wpb686csjk470dky";
   };
 
-  buildInputs = [ autoreconfHook pkgconfig udev ];
+  buildInputs = [ cmake pkgconfig udev libcec_platform ];
+
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ];
 
   # Fix dlopen path
   patchPhase = ''
diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix
new file mode 100644
index 00000000000..6db2656c9f4
--- /dev/null
+++ b/pkgs/development/libraries/libcec/platform.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake }:
+
+let version = "1.0.10"; in
+
+stdenv.mkDerivation {
+  name = "libcec-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Pulse-Eight/platform/archive/${version}.tar.gz";
+    sha256 = "1kdmi9b62nky4jrb5519ddnw5n7s7m6qyj7rzhg399f0n6f278vb";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Platform library for libcec and Kodi addons";
+    homepage = "https://github.com/Pulse-Eight/platform";
+    repositories.git = "https://github.com/Pulse-Eight/libcec.git";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.titanous ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d732e140668..72080fa3de1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6764,6 +6764,7 @@ let
     else libcanberra;
 
   libcec = callPackage ../development/libraries/libcec { };
+  libcec_platform = callPackage ../development/libraries/libcec/platform.nix { };
 
   libcello = callPackage ../development/libraries/libcello {};
 

From 387517da84ea88dceae4254403995dbe56bedcf5 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@titanous.com>
Date: Mon, 3 Aug 2015 19:51:42 -0400
Subject: [PATCH 0677/2016] kodi: Fix libcec build

---
 pkgs/applications/video/kodi/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 30eac05c234..09b33099139 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -15,6 +15,7 @@
 , lzo, libcdio, libmodplug, libass, libbluray
 , sqlite, mysql, nasm, gnutls, libva, wayland
 , curl, bzip2, zip, unzip, glxinfo, xdpyinfo
+, libcec, libcec_platform
 , dbus_libs ? null, dbusSupport ? true
 , udev, udevSupport ? true
 , libusb ? null, usbSupport ? false
@@ -24,7 +25,6 @@
 , rtmpdump ? null, rtmpSupport ? true
 , libvdpau ? null, vdpauSupport ? true
 , libpulseaudio ? null, pulseSupport ? true
-, libcec ? null, cecSupport ? true
 }:
 
 assert dbusSupport  -> dbus_libs != null;
@@ -33,7 +33,6 @@ assert usbSupport   -> libusb != null && ! udevSupport; # libusb won't be used i
 assert sambaSupport -> samba != null;
 assert vdpauSupport -> libvdpau != null;
 assert pulseSupport -> libpulseaudio != null;
-assert cecSupport   -> libcec != null;
 assert rtmpSupport  -> rtmpdump != null;
 
 let
@@ -69,6 +68,7 @@ in stdenv.mkDerivation rec {
       lzo libcdio libmodplug libass libbluray
       sqlite mysql.lib nasm avahi libdvdcss lame
       curl bzip2 zip unzip glxinfo xdpyinfo
+      libcec libcec_platform
     ]
     ++ lib.optional dbusSupport dbus_libs
     ++ lib.optional udevSupport udev
@@ -76,7 +76,6 @@ in stdenv.mkDerivation rec {
     ++ lib.optional sambaSupport samba
     ++ lib.optional vdpauSupport libvdpau
     ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional cecSupport libcec
     ++ lib.optional rtmpSupport rtmpdump;
 
     dontUseCmakeConfigure = true;
@@ -93,9 +92,7 @@ in stdenv.mkDerivation rec {
       ./bootstrap
     '';
 
-    configureFlags = [
-      "--enable-external-libraries"
-    ]
+    configureFlags = [ ]
     ++ lib.optional (!sambaSupport) "--disable-samba"
     ++ lib.optional vdpauSupport "--enable-vdpau"
     ++ lib.optional pulseSupport "--enable-pulse"
@@ -112,6 +109,7 @@ in stdenv.mkDerivation rec {
           --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \
+          --prefix LD_LIBRARY_PATH ":" "${libcec_platform}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib"
       done
     '';

From 86b695a18e2a228b88387246107340a1bf6ae275 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 4 Aug 2015 03:03:24 +0200
Subject: [PATCH 0678/2016] vbox-guest: Remove all references to sbin/.

Using $storepath/sbin is deprecated according to commit 98cedb3, so
let's avoid putting anything in .../sbin for the guest additions.

This is a continuation of the initial commit done by @ctheune at
1fb1360, which unfortunately broke VM tests and only changed the path of
the mount.vboxsf helper.

With this commit, the VM test is fixed and I've also verified on my
machine that it is indeed working again.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/virtualisation/virtualbox-guest.nix           | 2 +-
 nixos/tests/virtualbox.nix                                  | 4 ++--
 .../virtualization/virtualbox/guest-additions/default.nix   | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index a0e4bd558e0..6c4014fc4a1 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -54,7 +54,7 @@ in
 
         unitConfig.ConditionVirtualization = "oracle";
 
-        serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/sbin/VBoxService VBoxService --foreground";
+        serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxService VBoxService --foreground";
       };
 
     services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ];
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index f94d219aba6..4895eb134dc 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
         #!${pkgs.stdenv.shell} -xe
         export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin"
 
-        ${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/VBoxService
+        ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/VBoxService
         ${(attrs.vmScript or (const "")) pkgs}
 
         i=0
@@ -39,7 +39,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
     ];
 
     boot.initrd.extraUtilsCommands = ''
-      copy_bin_and_libs "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/mount.vboxsf"
+      copy_bin_and_libs "${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/mount.vboxsf"
       copy_bin_and_libs "${pkgs.utillinux}/bin/unshare"
       ${(attrs.extraUtilsCommands or (const "")) pkgs}
     '';
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index ac447fd50d3..6bf0ef2e825 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -87,10 +87,8 @@ stdenv.mkDerivation {
     sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all
 
     # Install binaries
-    mkdir -p $out/bin
-    install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf
-    mkdir -p $out/sbin
-    install -m 755 sbin/VBoxService $out/sbin
+    install -D -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf
+    install -D -m 755 sbin/VBoxService $out/bin/VBoxService
 
     mkdir -p $out/bin
     install -m 755 bin/VBoxClient $out/bin

From d7443ffb892be6c61eb71a20ae19e2da23f29dc8 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Mon, 3 Aug 2015 21:42:08 -0400
Subject: [PATCH 0679/2016] Only use underscored versions of read_cr4 and
 write_cr4 in 3.18 and above.

I'm not sure precisely in what micro-version the API change was made, so
the check for 3.18.0 and above may not be quite correct. But it's at
least sufficient for every version currently included in NixOS.
---
 .../linux/ati-drivers/kernel-api-fixes.patch  | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/ati-drivers/kernel-api-fixes.patch b/pkgs/os-specific/linux/ati-drivers/kernel-api-fixes.patch
index de1984c4c49..f763518b249 100644
--- a/pkgs/os-specific/linux/ati-drivers/kernel-api-fixes.patch
+++ b/pkgs/os-specific/linux/ati-drivers/kernel-api-fixes.patch
@@ -1,7 +1,22 @@
 diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c
 --- 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-04 10:31:23.000000000 -0400
-+++ 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-08-03 00:30:34.927839497 -0400
-@@ -3495,10 +3495,12 @@
++++ 15.7.new/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-08-03 21:21:13.893211082 -0400
+@@ -242,6 +242,14 @@
+ #endif
+ 
+ // ============================================================
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,0)
++#define __read_cr4 read_cr4
++#define __write_cr4 write_cr4
++#endif
++
++// ============================================================
++
+ /* globals */
+ 
+ char* firegl = NULL;
+@@ -3495,10 +3503,12 @@
          KCL_PUB_InterruptHandlerWrap,
  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
          ((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)),
@@ -15,7 +30,7 @@ diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/commo
  #endif
          dev_name,
          context);
-@@ -4498,8 +4500,8 @@
+@@ -4498,8 +4508,8 @@
  
      if (cpu_has_pge)
      {
@@ -26,7 +41,7 @@ diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/commo
      }
       __flush_tlb();
  
-@@ -4512,7 +4514,7 @@
+@@ -4512,7 +4522,7 @@
      write_cr0(cr0 & 0xbfffffff);
      if (cpu_has_pge)
      {
@@ -35,7 +50,7 @@ diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/commo
      }
      local_irq_restore(flags);
  
-@@ -4539,8 +4541,8 @@
+@@ -4539,8 +4549,8 @@
  
      if (cpu_has_pge)
      {
@@ -46,7 +61,7 @@ diff -Nru 15.7/common/lib/modules/fglrx/build_mod/firegl_public.c 15.7.new/commo
      }
       __flush_tlb();
    
-@@ -4552,7 +4554,7 @@
+@@ -4552,7 +4562,7 @@
      write_cr0(cr0 & 0xbfffffff);
      if (cpu_has_pge)
      {

From 878e69c67c44a521f6ad933bfcfab9e9595243b9 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 3 Aug 2015 21:48:29 -0400
Subject: [PATCH 0680/2016] riak2: use sensible default paths

Make exporting the RIAK_{ETC,LOG,DATA}_DIR variables optional;
if they're not in the environment, we use the same default values as
NixOS.
---
 nixos/tests/riak.nix              | 2 +-
 pkgs/servers/nosql/riak/2.1.1.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix
index a56f51c4e50..f36d12bdb2c 100644
--- a/nixos/tests/riak.nix
+++ b/nixos/tests/riak.nix
@@ -16,6 +16,6 @@ import ./make-test.nix {
 
     $master->waitForUnit("riak");
     $master->sleep(20); # Hopefully this is long enough!!
-    $master->succeed("RIAK_DATA_DIR='/var/db/riak' RIAK_LOG_DIR='/var/log/riak' RIAK_ETC_DIR='/etc/riak' riak ping 2>&1");
+    $master->succeed("riak ping 2>&1");
   '';
 }
diff --git a/pkgs/servers/nosql/riak/2.1.1.nix b/pkgs/servers/nosql/riak/2.1.1.nix
index 74cf03a1ca8..c62cea180be 100644
--- a/pkgs/servers/nosql/riak/2.1.1.nix
+++ b/pkgs/servers/nosql/riak/2.1.1.nix
@@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i deps/node_package/priv/base/env.sh \
-      -e 's@{{platform_data_dir}}@$RIAK_DATA_DIR@' \
+      -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak}@' \
       -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \
       -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \
-      -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=$RIAK_ETC_DIR@' \
-      -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=$RIAK_LOG_DIR@'
+      -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak}@' \
+      -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@'
   '';
 
   preBuild = ''

From 6c50714222a4f4bf46dab8fcd206c3e4c3f61715 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 4 Aug 2015 03:46:44 +0200
Subject: [PATCH 0681/2016] nixos: Give virtualbox-host.nix a better location.

In 14f09e0, I've introduced the module under modules/programs, because
the legacy virtualbox.nix was also under that path. But because we
already have modules/virtualisation/virtualbox-guest.nix, it really
makes sense to put this module alongside of it as well.

This module thus has no change in functionality and I've tested
evaluation against nixos/tests/virtualbox.nix and the manual.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/module-list.nix                                  | 2 +-
 nixos/modules/{programs => virtualisation}/virtualbox-host.nix | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename nixos/modules/{programs => virtualisation}/virtualbox-host.nix (100%)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 212555d7efc..a89723d496b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -72,7 +72,6 @@
   ./programs/ssmtp.nix
   ./programs/uim.nix
   ./programs/venus.nix
-  ./programs/virtualbox-host.nix
   ./programs/wvdial.nix
   ./programs/freetds.nix
   ./programs/zsh/zsh.nix
@@ -486,6 +485,7 @@
   ./virtualisation/openvswitch.nix
   ./virtualisation/parallels-guest.nix
   ./virtualisation/virtualbox-guest.nix
+  ./virtualisation/virtualbox-host.nix
   ./virtualisation/vmware-guest.nix
   ./virtualisation/xen-dom0.nix
 ]
diff --git a/nixos/modules/programs/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
similarity index 100%
rename from nixos/modules/programs/virtualbox-host.nix
rename to nixos/modules/virtualisation/virtualbox-host.nix

From b0e46fc3ead209ef24ed6214bd41ef6e604af54f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 3 Aug 2015 21:31:44 -0500
Subject: [PATCH 0682/2016] hplip: remove ttuegel from maintainers

I no longer commit my changes to Nixpkgs because they are usually broken
by other maintainers.
---
 pkgs/misc/drivers/hplip/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index d173b0ac406..5c29c99c77e 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -175,6 +175,6 @@ stdenv.mkDerivation {
       then licenses.unfree
       else with licenses; [ mit bsd2 gpl2Plus ];
     platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ];
-    maintainers = with maintainers; [ ttuegel jgeerds nckx ];
+    maintainers = with maintainers; [ jgeerds nckx ];
   };
 }

From a5cdd98da41c2e754eed3f108803f604abdbd2ca Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 3 Aug 2015 20:16:03 -0700
Subject: [PATCH 0683/2016] docker: 1.6.0 -> 1.7.1

---
 .../virtualization/docker/default.nix            | 16 +++++++++-------
 pkgs/top-level/all-packages.nix                  |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 90583038145..c3b141cba81 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper,
+{ stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper,
 btrfsProgs, iptables, bash, e2fsprogs, xz}:
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.6.0";
+  version = "1.7.1";
 
-  src = fetchurl {
-    url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz";
-    sha256 = "03nzhikxp60falshzyk6ip8g9fhrczhvnvgmzqr8bny6w8x1v84b";
+  src = fetchFromGitHub {
+    owner = "docker";
+    repo = "docker";
+    rev = "v${version}";
+    sha256 = "0r0j8aj1a7lbnc9piznp02h5n2gdw3v3n4q2ipmapi9ax0wj82lz";
   };
 
   buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ];
@@ -17,7 +19,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     patchShebangs .
     export AUTO_GOPATH=1
-    export DOCKER_GITCOMMIT="03nzhikx"
+    export DOCKER_GITCOMMIT="786b29d4"
     ./hack/make.sh dynbinary
   '';
 
@@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.docker.io/;
+    homepage = http://www.docker.com/;
     description = "An open source project to pack, ship and run any application as a lightweight container";
     license = licenses.asl20;
     maintainers = with maintainers; [ offline tailhook ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d732e140668..34e64195f18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11002,7 +11002,7 @@ let
   };
 
   docker = callPackage ../applications/virtualization/docker {
-    go = go_1_3;
+    go = go_1_4;
   };
 
   doodle = callPackage ../applications/search/doodle { };

From f098967293d9fc018badb3e3a7d7339f3e11aa9a Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 3 Aug 2015 20:37:35 -0700
Subject: [PATCH 0684/2016] chromium: Fix widevine ppapi plugin loading

See "Running a plugin in Chrome" section at:
https://www.chromium.org/developers/design-documents/pepper-plugin-implementation

The colon between the plugin's description and its mime type is indeed
supposed to be a semicolon, according to that design doc.
---
 pkgs/applications/networking/browsers/chromium/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 5bb6a93d8d7..0b0e5bd0838 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -53,7 +53,7 @@ let
       wvDescription = "Playback of encrypted HTML audio/video content";
       wvMimeTypes = "application/x-ppapi-widevine-cdm";
       wvModule = "$widevine/lib/libwidevinecdmadapter.so";
-      wvInfo = "#${wvName}#${wvDescription}:${wvMimeTypes}";
+      wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}";
     in ''
       flashVersion="$(
         sed -n -r 's/.*"version": "([^"]+)",.*/\1/p' PepperFlash/manifest.json

From 3a8d901ace5987fb8fc7e23d1d5419df58093070 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 4 Aug 2015 08:55:46 +0300
Subject: [PATCH 0685/2016] pythonPackages.ssdeep: Init at 3.1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c2f17a66dfc..6fe599eec64 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4558,6 +4558,19 @@ let
   };
 
 
+  ssdeep = buildPythonPackage rec {
+    name = "ssdeep-3.1.1";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/s/ssdeep/${name}.tar.gz";
+      sha256 = "1p9dpykmnfb73cszdiic5wbz5bmbbmkiih08pb4dah5mwq4n7im6";
+    };
+
+    buildInputs = with pkgs; [ ssdeep ];
+    propagatedBuildInputs = with self; [ cffi six ];
+  };
+
+
   statsd = buildPythonPackage rec {
     name = "statsd-2.0.2";
 

From 24f76a55d26cfa42be7bc498ccaf01f4c2f3d5bd Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 4 Aug 2015 09:10:27 +0300
Subject: [PATCH 0686/2016] pythonPackages.libarchive-c: init at 2.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 6fe599eec64..d055bdc872a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15259,6 +15259,22 @@ let
     propagatedBuildInputs = with self; [ pkgs.libarchive ];
   };
 
+  libarchive-c = buildPythonPackage rec {
+    name = "libarchive-c-2.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/l/libarchive-c/${name}.tar.gz";
+      sha256 = "089lrz6xyrfnk55v35vis6jyqyyl77w093057djyspnd2744wi2n";
+    };
+
+    patchPhase = ''
+      substituteInPlace libarchive/ffi.py --replace \
+        "find_library('archive')" "'${pkgs.libarchive}/lib/libarchive.so'"
+    '';
+
+    buildInputs = [ pkgs.libarchive ];
+  };
+
   pybrowserid = buildPythonPackage rec {
     name = "PyBrowserID-${version}";
     version = "0.9.2";

From ba5402a32822193577219cef2682359c2e3587e1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 4 Aug 2015 06:04:12 +0300
Subject: [PATCH 0687/2016] debbindiff: Rename to 'diffoscope' and update 26 ->
 29

Upstream has changed the project name to 'diffoscope' since "debbindiff
has grown way beyond a being just a tool to compare Debian packages."

Besides the rename, there are new dependencies on ssdeep, libarchive-c
and sqlite.
---
 pkgs/tools/misc/debbindiff/default.nix | 46 ---------------------
 pkgs/tools/misc/diffoscope/default.nix | 56 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  4 +-
 3 files changed, 58 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/tools/misc/debbindiff/default.nix
 create mode 100644 pkgs/tools/misc/diffoscope/default.nix

diff --git a/pkgs/tools/misc/debbindiff/default.nix b/pkgs/tools/misc/debbindiff/default.nix
deleted file mode 100644
index f5fcb37324e..00000000000
--- a/pkgs/tools/misc/debbindiff/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchgit, pythonPackages, docutils
-, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext
-, gnupg, gzip, pdftk, poppler_utils, rpm, squashfsTools, unzip, vim, xz
-}:
-
-pythonPackages.buildPythonPackage rec {
-  name = "debbindiff-${version}";
-  version = "26";
-
-  namePrefix = "";
-
-  src = fetchgit {
-    url = "git://anonscm.debian.org/reproducible/debbindiff.git";
-    rev = "refs/tags/${version}";
-    sha256 = "18637gc7c92mwcpx3dvh6xild0sb9bwsgfcrjplmh7s8frvlvkv6";
-  };
-
-  postPatch = ''
-    # Different pkg name in debian
-    sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@"
-
-    # Upstream doesn't provide a PKG-INFO file
-    sed -i setup.py -e "/'rpm',/d"
-  '';
-
-  # Still missing these tools: ghc javap showttf sng
-  propagatedBuildInputs = (with pythonPackages; [ debian magic ]) ++
-    [ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg
-      gzip pdftk poppler_utils rpm squashfsTools unzip vim xz ];
-
-  doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
-
-  postInstall = ''
-    mv $out/bin/debbindiff.py $out/bin/debbindiff
-    mkdir -p $out/share/man/man1
-    ${docutils}/bin/rst2man.py debian/debbindiff.1.rst $out/share/man/man1/debbindiff.1
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Highlight differences between two builds of Debian packages, and even other kind of files";
-    homepage = https://wiki.debian.org/ReproducibleBuilds;
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.dezgeg ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
new file mode 100644
index 00000000000..e6c672d8344
--- /dev/null
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchgit, pythonPackages, docutils
+, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext
+, gnupg, gzip, pdftk, poppler_utils, rpm, sqlite, squashfsTools, unzip, vim, xz
+}:
+
+pythonPackages.buildPythonPackage rec {
+  name = "diffoscope-${version}";
+  version = "29";
+
+  namePrefix = "";
+
+  src = fetchgit {
+    url = "git://anonscm.debian.org/reproducible/diffoscope.git";
+    rev = "refs/tags/${version}";
+    sha256 = "0q7hx2wm9gvzl1f7iilr9pjwpv8i2anscqan7cgk80v90s2pakrf";
+  };
+
+  postPatch = ''
+    # Different pkg name in debian
+    sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@"
+
+    # Upstream doesn't provide a PKG-INFO file
+    sed -i setup.py -e "/'rpm',/d"
+  '';
+
+  # Still missing these tools: ghc javap showttf sng
+  propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c magic ssdeep ]) ++
+    [ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg
+      gzip pdftk poppler_utils rpm sqlite squashfsTools unzip vim xz ];
+
+  doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
+
+  postInstall = ''
+    mv $out/bin/diffoscope.py $out/bin/diffoscope
+    mkdir -p $out/share/man/man1
+    ${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Perform in-depth comparison of files, archives, and directories";
+    longDescription = ''
+      diffoscope will try to get to the bottom of what makes files or directories
+      different. It will recursively unpack archives of many kinds and transform
+      various binary formats into more human readable form to compare them. It can
+      compare two tarballs, ISO images, or PDF just as easily. The differences can
+      be shown in a text or HTML report.
+
+      diffoscope is developed as part of the "reproducible builds" Debian
+      project and was formerly known as "debbindiff".
+    '';
+    homepage = https://wiki.debian.org/ReproducibleBuilds;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d732e140668..261ad9ba811 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1259,8 +1259,6 @@ let
 
   dcfldd = callPackage ../tools/system/dcfldd { };
 
-  debbindiff = callPackage ../tools/misc/debbindiff { };
-
   debian_devscripts = callPackage ../tools/misc/debian-devscripts {
     inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry;
   };
@@ -1303,6 +1301,8 @@ let
 
   di = callPackage ../tools/system/di { };
 
+  diffoscope = callPackage ../tools/misc/diffoscope { };
+
   diffstat = callPackage ../tools/text/diffstat { };
 
   diffutils = callPackage ../tools/text/diffutils { };

From 4a96fa92dbf5e36a0fa526228e16f96cdcfd4c5a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 4 Aug 2015 10:40:44 +0200
Subject: [PATCH 0688/2016] cpulimit: does not build on darwin (ZHF)

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

diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix
index 8ae137bbd89..72656d2969d 100644
--- a/pkgs/tools/misc/cpulimit/default.nix
+++ b/pkgs/tools/misc/cpulimit/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "http://limitcpu.sourceforge.net/";
     description = "A tool to throttle the CPU usage of programs";
-    platforms = with platforms; linux ++ freebsd ++ darwin;
+    platforms = with platforms; linux ++ freebsd;
     license = licenses.gpl2;
     maintainer = [maintainers.rycee];
   };

From d30e63727f28893158b3b1515209f06b90c2095e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 4 Aug 2015 11:03:03 +0200
Subject: [PATCH 0689/2016] pyfribidi: disable on python 3 (ZHF)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c2f17a66dfc..75d1f94d013 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5559,6 +5559,7 @@ let
   pyfribidi = buildPythonPackage rec {
     version = "0.11.0";
     name = "pyfribidi-${version}";
+    disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pyfribidi/${name}.zip";

From 6dd9a136031385a5c922bf5278ca941273a4ef27 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 4 Aug 2015 11:04:21 +0200
Subject: [PATCH 0690/2016] liboauth: use nss instead of openssl

OpenSSL support will be dropped in future releases of liboauth.
Also fix a broken .la file which previously referenced -lcrypto
without proper -L.
---
 pkgs/development/libraries/liboauth/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix
index 3cb9629e3e1..8f46d1c0bfd 100644
--- a/pkgs/development/libraries/liboauth/default.nix
+++ b/pkgs/development/libraries/liboauth/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, nss, openssl, pkgconfig }:
+{ fetchurl, stdenv, nss, nspr, pkgconfig }:
 
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "07w1aq8y8wld43wmbk2q8134p3bfkp2vma78mmsfgw2jn1bh3xhd";
   };
 
-  buildInputs = [ nss openssl ];
+  buildInputs = [ pkgconfig nss nspr ];
+
+  configureFlags = [ "--enable-nss" ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;

From bc042fe0ff3cb67103a5747e5513e65873d1ce32 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 4 Aug 2015 03:12:52 -0400
Subject: [PATCH 0691/2016] mesos: 0.22.1 -> 0.23.0

---
 pkgs/applications/networking/cluster/mesos/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index c330b8acfbf..f9c34fdd29d 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -9,14 +9,14 @@ let
   soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so";
 
 in stdenv.mkDerivation rec {
-  version = "0.22.1";
+  version = "0.23.0";
   name = "mesos-${version}";
 
   dontDisableStatic = true;
 
   src = fetchurl {
     url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz";
-    sha256 = "0ry0ppzgpab68fz5bzd7ry5rjbg8xjz73x1x4c5id42cpsqnn7x5";
+    sha256 = "1v5xpn4wal4vcrvcklchx9slkpa8xlwqkdbnxzy9zkzpq5g3arxr";
   };
 
   buildInputs = [
@@ -93,13 +93,15 @@ in stdenv.mkDerivation rec {
     echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook
 
     # Inspired by: pkgs/development/python-modules/generic/default.nix
+    pushd src/python
     mkdir -p $out/lib/${python.libPrefix}/site-packages
     export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
-    ${python}/bin/${python.executable} src/python/setup.py install \
+    ${python}/bin/${python.executable} setup.py install \
       --install-lib=$out/lib/${python.libPrefix}/site-packages \
       --old-and-unmanageable \
       --prefix="$out"
     rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
+    popd
   '';
 
   postFixup = ''

From 084595f33a5de3f29fb822f2ef7a731d0d2bc775 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 4 Aug 2015 12:16:54 +0200
Subject: [PATCH 0692/2016] hevea: update from 2.23 to 2.25

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

diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index 1acc395dc06..0626ec84fbe 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml }:
 
 stdenv.mkDerivation rec {
-  name = "hevea-2.23";
+  name = "hevea-2.25";
 
   src = fetchurl {
     url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz";
-    sha256 = "1f9pj48518ixhjxbviv2zx27v4anp92zgg3x704g1s5cki2w33nv";
+    sha256 = "0kn99v92xsfy12r9gfvwgs0xf3s9s6frfg86a8q6damj1dampiz4";
   };
 
   buildInputs = [ ocaml ];

From 6b2c6bea0a84c54078cf7200e1fa3f3db629be50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 4 Aug 2015 08:14:05 +0200
Subject: [PATCH 0693/2016] python-sigal: 0.7.0 -> 0.9.2

Sigal has replaced argh with click, and now also depends on blinker.

Tested by generating an album (sigal init + build + serve).
---
 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 75d1f94d013..1fa7c9dae5b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12316,14 +12316,14 @@ let
   };
 
   sigal = buildPythonPackage rec {
-    name = "sigal-0.7.0";
+    name = "sigal-0.9.2";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/s/sigal/${name}.tar.gz";
-      md5 = "d2386706ac8543378aebde1ea4edeba4";
+      sha256 = "0mk3bzaxn9snx9lc0pj9zvgdgdyhkza6b8z5x91772mlv84sfw6c";
     };
 
-    propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint argh pytest ];
+    propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint click pytest blinker ];
 
     meta = {
       description = "Yet another simple static gallery generator";

From 2dc42b1eeceb9613ac9faed01b325c8ca12c04f5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 4 Aug 2015 12:59:34 +0200
Subject: [PATCH 0694/2016] llpp: update to 2015-07-30, fix build and don't
 fetch submodules

---
 pkgs/applications/misc/llpp/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index bd0727ccab1..9d9b69f5958 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -1,19 +1,20 @@
 { stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl
-, gtk3, openjpeg, jbig2dec, mujs, xsel }:
+, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl }:
 
 let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
 in stdenv.mkDerivation rec {
   name = "llpp-${version}";
-  version = "21-git-2015-06-27";
+  version = "21-git-2015-07-30";
 
   src = fetchgit {
     url = "git://repo.or.cz/llpp.git";
-    rev = "843c42ef41bb78a3b1ee995fc2bab91f8796e8ad";
-    sha256 = "0h8wa7f5bj5sm3sr8namcyy81s4s80hyasimyfw935lqyw2q2k60";
+    rev = "e9fe06d684b145a104cc319673076e069e853cac";
+    sha256 = "0x3hgn6sfjln2sqdw40ylcj943rn732a6mlfwz01llx8ykiyvsvq";
+    fetchSubmodules = false;
   };
 
   buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl
-                  gtk3 jbig2dec openjpeg mujs ];
+                  gtk3 jbig2dec openjpeg mujs openssl ];
 
   configurePhase = ''
       sh configure.sh -O -F ${mupdf}

From 76b5c75d48a99789b0bc25e54a25cf97cbb83edf Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 4 Aug 2015 13:04:14 +0200
Subject: [PATCH 0695/2016] dwb: mark it as broken, closes #7952

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

diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index 6f6ffd67a53..d79a5215ce2 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -30,5 +30,9 @@ stdenv.mkDerivation {
     platforms = platforms.mesaPlatforms;
     maintainers = with maintainers; [ pSub ];
     license = licenses.gpl3;
+
+    # dwb is no longer maintained by portix and efforts to keep it alive
+    # were not successful, see issue #7952 for discussion.
+    broken = true;
   };
 }

From 1b4a727959b95b2a793d9b3b4104f6ce517d013c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 4 Aug 2015 13:17:44 +0200
Subject: [PATCH 0696/2016] nixos/tests/printing: unmaintain

I won't be a good maintainer of printing tests, as I don't print.
I don't know why I was made one in #8163, in the first place.
---
 nixos/tests/printing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 0db9a529644..ea18114b61c 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -3,7 +3,7 @@
 import ./make-test.nix ({pkgs, ... }: {
   name = "printing";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ iElectric eelco chaoflow jgeerds vcunat ];
+    maintainers = [ iElectric eelco chaoflow jgeerds ];
   };
 
   nodes = {

From 646938280949734ecd53ae2b308b67095ffd118f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 4 Aug 2015 13:52:55 +0200
Subject: [PATCH 0697/2016] calibre: update from 2.31.0 to 2.33.0

moved from sourceforge to github as sourceforge is outdated
---
 pkgs/applications/misc/calibre/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 787b5e80528..4c15ccc0428 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.31.0";
+  name = "calibre-2.33.0";
+  version = "2.33.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1414c324alvgwbiszalklck1kay41yca2wnm488imr2768fihzkz";
+    url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
+    sha256 = "0j1micmjffi6rsn3ayblnz0wq648v05ckbn1qsiz086iaj2285q9";
   };
 
   inherit python;

From d649a1d88f2126cc2da47368a9235485e61170d2 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 4 Aug 2015 17:11:36 +0300
Subject: [PATCH 0698/2016] telegram-cli: 2014-03-04 -> 2015-07-30 & add
 maintainer

---
 .../telegram-cli/default.nix                  | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
index a68e0ee1104..90c8e9a7e9e 100644
--- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
@@ -1,28 +1,26 @@
 { stdenv, fetchgit, libconfig, lua5_2, openssl, readline, zlib
+, libevent, pkgconfig, python, jansson, bash
 }:
 
 stdenv.mkDerivation rec {
-  name = "telegram-cli-2014-03-04";
+  name = "telegram-cli-2015-07-30";
 
   src = fetchgit {
     url = "https://github.com/vysheng/tg.git";
-    rev = "ac6079a00ac66bb37a3179a82af130b41ec39bc9";
-    sha256 = "1rpwnyzmqk7p97n5pd00m5c6rypc39mb3hs94qxxrdcpwpgcb73q";
+    sha256 = "0phn9nl0sf2fylzfwi427xq60cfrnpsvhh8bp55y1wcjkmp0fxsn";
+    rev = "2052f4b381337d75e783facdbfad56b04dec1a9c";
   };
 
-  buildInputs = [ libconfig lua5_2 openssl readline zlib ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # CPPFunction
-
+  buildInputs = [ libconfig lua5_2 openssl readline zlib libevent pkgconfig python jansson ];
   installPhase = ''
     mkdir -p $out/bin
-    cp ./telegram $out/bin/telegram-wo-key
-    cp ./tg.pub $out/
-    cat > $out/bin/telegram <<EOF
-    #!/usr/bin/env bash
-    $out/bin/telegram-wo-key -k $out/tg.pub
+    cp ./bin/telegram-cli $out/bin/telegram-wo-key
+    cp ./tg-server.pub $out/
+    cat > $out/bin/telegram-cli <<EOF
+    #!${bash}/bin/sh
+    $out/bin/telegram-wo-key -k $out/tg-server.pub
     EOF
-    chmod +x $out/bin/telegram
+    chmod +x $out/bin/telegram-cli
   '';
 
   meta = {
@@ -30,5 +28,6 @@ stdenv.mkDerivation rec {
     homepage = https://telegram.org/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = stdenv.lib.maintainers.jagajaga;
   };
 }

From c9e46da86b00a7c6bcb788565a1eada5be44dd83 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Aug 2015 16:40:02 +0200
Subject: [PATCH 0699/2016] cups-browsed: Only enable if avahi is enabled

This gets rid of

  systemd[1]: Cannot add dependency job for unit avahi-daemon.service, ignoring: Unit avahi-daemon.service failed to load: No such file or directory.
---
 nixos/modules/services/printing/cupsd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index fd9589883ed..e743aa8a323 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -230,8 +230,8 @@ in
           ];
       };
 
-    systemd.services.cups-browsed =
-      { description = "Make remote CUPS printers available locally";
+    systemd.services.cups-browsed = mkIf config.services.avahi.enable
+      { description = "CUPS Remote Printer Discovery";
 
         wantedBy = [ "multi-user.target" ];
         wants = [ "cups.service" "avahi-daemon.service" ];

From 47dad51c2bd8990d4742ba9f3cc1a39d3cbcf702 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 4 Aug 2015 17:30:14 +0200
Subject: [PATCH 0700/2016] nixos.tests.avahi: unmaintain

---
 nixos/tests/avahi.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index a39104f603e..a8369a6d1f8 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -2,7 +2,7 @@
 import ./make-test.nix ({ pkgs, ... } : {
   name = "avahi";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ eelco chaoflow wizeman ];
+    maintainers = [ eelco chaoflow ];
   };
 
   nodes = {

From 804f0098ef3a663465abbb6700d9f611acc5e2b3 Mon Sep 17 00:00:00 2001
From: Null is Too Long <i@null.tl>
Date: Mon, 3 Aug 2015 13:46:11 -0400
Subject: [PATCH 0701/2016] thunderbird-bin: fix icon path

---
 .../networking/mailreaders/thunderbird-bin/default.nix          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index a5806b7dfe8..4dd734ed043 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -134,7 +134,7 @@ stdenv.mkDerivation {
       [Desktop Entry]
       Type=Application
       Exec=$out/bin/thunderbird
-      Icon=$out/lib/thunderbird-bin-${version}/chrome/icons/default/default256.png
+      Icon=$out/usr/lib/thunderbird-bin-${version}/chrome/icons/default/default256.png
       Name=Thunderbird
       GenericName=Mail Reader
       Categories=Application;Network;

From ba59ff216096feb83d3285d7d864da3394240ef1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 4 Aug 2015 12:08:35 -0500
Subject: [PATCH 0702/2016] nixos/fontconfig: separate rendering and alias
 configuration

Fixes #9110. Fontconfig recommends different precedence for rendering
settings and generic alias settings. To comply with the recommendations,
`98-nixos.conf` has been separated into `10-nixos-rendering.conf` and
`60-nixos-generic-alias.conf`.
---
 nixos/modules/config/fonts/fontconfig.nix | 31 +++++++++++++++--------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 6f17bd396a0..922a9cf961d 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -142,7 +142,7 @@ with lib;
   config =
     let fontconfig = config.fonts.fontconfig;
         fcBool = x: "<bool>" + (if x then "true" else "false") + "</bool>";
-        nixosConf = ''
+        renderConf = ''
           <?xml version='1.0'?>
           <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
           <fontconfig>
@@ -169,6 +169,21 @@ with lib;
               </edit>
             </match>
 
+            ${optionalString (fontconfig.dpi != 0) ''
+            <match target="pattern">
+              <edit name="dpi" mode="assign">
+                <double>${toString fontconfig.dpi}</double>
+              </edit>
+            </match>
+            ''}
+
+          </fontconfig>
+        '';
+        genericAliasConf = ''
+          <?xml version='1.0'?>
+          <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+          <fontconfig>
+
             <!-- Default fonts -->
             ${optionalString (fontconfig.defaultFonts.sansSerif != []) ''
             <alias>
@@ -201,14 +216,6 @@ with lib;
             </alias>
             ''}
 
-            ${optionalString (fontconfig.dpi != 0) ''
-            <match target="pattern">
-              <edit name="dpi" mode="assign">
-                <double>${toString fontconfig.dpi}</double>
-              </edit>
-            </match>
-            ''}
-
           </fontconfig>
         '';
     in mkIf fontconfig.enable {
@@ -219,7 +226,8 @@ with lib;
       environment.etc."fonts/fonts.conf".source =
         pkgs.makeFontsConf { fontconfig = pkgs.fontconfig_210; fontDirectories = config.fonts.fonts; };
 
-      environment.etc."fonts/conf.d/98-nixos.conf".text = nixosConf;
+      environment.etc."fonts/conf.d/10-nixos-rendering.conf".text = renderConf;
+      environment.etc."fonts/conf.d/60-nixos-generic-alias.conf".text = genericAliasConf;
 
       # Versioned fontconfig > 2.10. Take shared fonts.conf from fontconfig.
       # Otherwise specify only font directories.
@@ -236,7 +244,8 @@ with lib;
           </fontconfig>
         '';
 
-      environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/98-nixos.conf".text = nixosConf;
+      environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/10-nixos-rendering.conf".text = renderConf;
+      environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/60-nixos-generic-alias.conf".text = genericAliasConf;
 
       environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/99-user.conf" = {
         enable = fontconfig.includeUserConf;

From 69397d9f949fea62068973aab6fc4cc4a5d4f5e9 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 4 Aug 2015 19:16:27 +0200
Subject: [PATCH 0703/2016] strongswan: enable more plugins

---
 pkgs/tools/networking/strongswan/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 7a9edef5004..9f68e5856ba 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook
-, curl, trousers, sqlite
+, curl, trousers, sqlite, iptables, libxml2
 , enableTNC ? false }:
 
 stdenv.mkDerivation rec {
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
 
   buildInputs =
-    [ gmp pkgconfig python autoreconfHook ]
-    ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite ];
+    [ gmp pkgconfig python autoreconfHook iptables ]
+    ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ];
 
   patches = [
     ./ext_auth-path.patch
@@ -23,13 +23,22 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags =
-    [ "--enable-swanctl" "--enable-cmd" ]
+    [ "--enable-swanctl" "--enable-cmd"
+      "--enable-farp" "--enable-dhcp"
+      "--enable-eap-sim" "--enable-eap-sim-file" "--enable-eap-simaka-pseudonym"
+      "--enable-eap-simaka-reauth" "--enable-eap-identity" "--enable-eap-md5"
+      "--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-aesni" "--enable-af-alg" "--enable-rdrand" ]
+    ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock" 
     ++ stdenv.lib.optionals enableTNC [
          "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf"
-         "--enable-curl" "--enable-openssl" "--enable-eap-identity" "--enable-eap-md5" "--enable-eap-mschapv2"
+         "--enable-curl" "--enable-openssl"
          "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20"
          "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation"
          "--enable-tnc-imv" "--enable-imv-attestation"
+         "--enable-tnc-ifmap" "--enable-tnc-imc" "--enable-tnc-imv"
          "--with-tss=trousers"
          "--enable-aikgen"
          "--enable-sqlite" ];

From c22c874aeba7486806b886d2d250b27666378552 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 3 Aug 2015 18:27:57 +0200
Subject: [PATCH 0704/2016] nixos: freefall service: run ASAP

---
 nixos/modules/services/hardware/freefall.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/hardware/freefall.nix b/nixos/modules/services/hardware/freefall.nix
index 6e6960bac49..7867956c1ab 100644
--- a/nixos/modules/services/hardware/freefall.nix
+++ b/nixos/modules/services/hardware/freefall.nix
@@ -39,11 +39,14 @@ with lib;
     mkService = dev:
       assert dev != "";
       let dev' = utils.escapeSystemdPath dev; in
-      nameValuePair "freefall-${dev'}"
-        { description = "Free-fall protection for ${dev}";
+      nameValuePair "freefall-${dev'}" {
+        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}";
           Restart = "on-failure";

From b62debe0423d72062c60f93dab895de532325e38 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 4 Aug 2015 19:29:35 +0200
Subject: [PATCH 0705/2016] hplip: 3.15.7 -> 3.15.6

Version 3.15.7 breaks certain (but not all) PCL-based printers:
https://github.com/NixOS/nixpkgs/commit/b0e46fc3ead209ef24ed6214bd41ef6e604af54f

Forgetting to revert a failed patch hunk certainly didn't help. Grr.
---
 pkgs/misc/drivers/hplip/default.nix | 42 ++++++++++++++++-------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 5c29c99c77e..61d76a6c42f 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -6,18 +6,20 @@
 
 let
 
-  version = "3.15.7";
+  # Version 3.15.7 breaks certain (but not all) PCL-based printers:
+  # https://github.com/NixOS/nixpkgs/commit/b0e46fc3ead209ef24ed6214bd41ef6e604af54f
+  version = "3.15.6";
 
   name = "hplip-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "17flpl89lgwlbsy9mka910g530nnvlwqqnif8a9hyq7k90q9046k";
+    sha256 = "1jbnjw7vrn1qawrjfdv8j58w69q8ki1qkzvlh0nk8nxacpp17i9h";
   };
 
   plugin = fetchurl {
     url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "0fblh5m43jnws4vkwks0b4m9k3jg9kspaj1l8bic0r5swy97s41m";
+    sha256 = "1rymxahz12s1s37rri5qyvka6q0yi0yai08kgspg24176ry3a3fx";
   };
 
   hplip_state =
@@ -75,23 +77,25 @@ stdenv.mkDerivation {
       {} +
   '';
 
-  configureFlags = ''
-    --with-cupsfilterdir=$(out)/lib/cups/filter
-    --with-cupsbackenddir=$(out)/lib/cups/backend
-    --with-icondir=$(out)/share/applications
-    --with-systraydir=$(out)/xdg/autostart
-    --with-mimedir=$(out)/etc/cups
-    --enable-policykit
-  '';
+  preConfigure = ''
+    export configureFlags="$configureFlags
+      --with-cupsfilterdir=$out/lib/cups/filter
+      --with-cupsbackenddir=$out/lib/cups/backend
+      --with-icondir=$out/share/applications
+      --with-systraydir=$out/xdg/autostart
+      --with-mimedir=$out/etc/cups
+      --enable-policykit
+    "
 
-  makeFlags = ''
-    halpredir=$(out)/share/hal/fdi/preprobe/10osvendor
-    rulesdir=$(out)/etc/udev/rules.d
-    policykit_dir=$(out)/share/polkit-1/actions
-    policykit_dbus_etcdir=$(out)/etc/dbus-1/system.d
-    policykit_dbus_sharedir=$(out)/share/dbus-1/system-services
-    hplip_confdir=$(out)/etc/hp
-    hplip_statedir=$(out)/var/lib/hp
+    export makeFlags="
+      halpredir=$out/share/hal/fdi/preprobe/10osvendor
+      rulesdir=$out/etc/udev/rules.d
+      policykit_dir=$out/share/polkit-1/actions
+      policykit_dbus_etcdir=$out/etc/dbus-1/system.d
+      policykit_dbus_sharedir=$out/share/dbus-1/system-services
+      hplip_confdir=$out/etc/hp
+      hplip_statedir=$out/var/lib/hp
+    "
   '';
 
   enableParallelBuilding = true;

From a5d6e61c2f1bf88ea31b2f24bacf1f52f13d9367 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 4 Aug 2015 13:27:06 -0700
Subject: [PATCH 0706/2016] grsecurity: Push testing from 4.0 -> 4.1

---
 pkgs/build-support/grsecurity/default.nix   | 2 +-
 pkgs/os-specific/linux/kernel/linux-4.0.nix | 1 -
 pkgs/os-specific/linux/kernel/linux-4.1.nix | 1 +
 pkgs/os-specific/linux/kernel/patches.nix   | 6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index 0fd3df6d5f5..713f4cdc83e 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -33,7 +33,7 @@ let
 
     grKernel = if cfg.stable
                then mkKernel pkgs.linux_3_14 stable-patch
-               else mkKernel pkgs.linux_4_0 test-patch;
+               else mkKernel pkgs.linux_4_1 test-patch;
 
     ## -- grsecurity configuration ---------------------------------------------
 
diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
index 8607bcf70cf..eacfb396b94 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix
@@ -2,7 +2,6 @@
 
 import ./generic.nix (args // rec {
   version = "4.0.8";
-  # Remember to update grsecurity!
   extraMeta.branch = "4.0";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index 82bde253529..e8534656349 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -2,6 +2,7 @@
 
 import ./generic.nix (args // rec {
   version = "4.1.4";
+  # Remember to update grsecurity!
   extraMeta.branch = "4.1";
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index a8fc0166508..b93261d6729 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -72,10 +72,10 @@ rec {
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "4.0.8";
-      revision  = "201507111211";
+    { kversion  = "4.1.4";
+      revision  = "201508032312";
       branch    = "test";
-      sha256    = "1p9ym8hbwaan9pgxgn8k4rm3n33wl8ag1fzmyr5f4mxs634wgwgx";
+      sha256    = "16p1wq98qgwksav0ry6b5jyyi26s404v1k0cwpj7l7n86hxig67i";
     };
 
   grsec_fix_path =

From 79fb8442139154abe98a280b12498494a55594c4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 4 Aug 2015 13:23:55 -0700
Subject: [PATCH 0707/2016] kernel: 4.0.8 -> 4.0.9

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
index eacfb396b94..eee052ad3bb 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.0.8";
+  version = "4.0.9";
   extraMeta.branch = "4.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1cggqi5kdan818xw5g5wmapcsf501f5m9bympsy6a2cpphknfdmn";
+    sha256 = "0k42blafzd954fncc0b78vi9x1h2k0jhfvkjqxmpv64i7xwwdhsx";
   };
 
   features.iwlwifi = true;

From 04f1b451d71cf16fd911e645afdaa381bbd861f0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 4 Aug 2015 13:23:52 -0700
Subject: [PATCH 0708/2016] kernel: 3.14.48 -> 3.14.49

---
 pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 377f0271aea..c4171948436 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.48";
+  version = "3.14.49";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "098a7kjfw4jf0f7h6z57f2719jfz3y3jjlcd8y6d95xvhy7xxyw9";
+    sha256 = "1x9p6z195c0nv7hsjcwzmr89yag35v3pyrs0081k2d8dykbl70zs";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index b93261d6729..f3e33047e8b 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -65,10 +65,10 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.48";
-      revision  = "201507111210";
+    { kversion  = "3.14.49";
+      revision  = "201508032312";
       branch    = "stable";
-      sha256    = "0phmqlkx6vqlv79ppf6g4wsx7rwsvwpakpkm9xsq8qazffk7s9qk";
+      sha256    = "09x0rb4pgmghcp6sdz57lwhawlb3bzrc3rg372xknhv6993ainjc";
     };
 
   grsecurity_unstable = grsecPatch

From 921055b4a8f5380d1be6e998908896cfa7246df1 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@titanous.com>
Date: Tue, 4 Aug 2015 16:38:38 -0400
Subject: [PATCH 0709/2016] kernel: Enable DRM_LOAD_EDID_FIRMWARE

This allows specifying drm_kms_helper.edid_firmware to work around displays
that provide bad EDID data.

Documentation: https://www.osadl.org/Single-View.111+M5ec938a7b3b.0.html
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 7063017b3a8..386004dad43 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -141,6 +141,8 @@ with stdenv.lib;
   # Video configuration.
   # Enable KMS for devices whose X.org driver supports it.
   DRM_I915_KMS y
+  # Allow specifying custom EDID on the kernel command line
+  DRM_LOAD_EDID_FIRMWARE y
   ${optionalString (versionOlder version "3.9") ''
     DRM_RADEON_KMS? y
   ''}

From 501f667958336b2e9680b1aaee78d7db2f1e41c7 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 4 Aug 2015 14:35:13 -0700
Subject: [PATCH 0710/2016] chromium: fix opening URLs from associated mime
 types

It helps to actually pass the URL to chromium :)

Related to #4370
---
 pkgs/applications/networking/browsers/chromium/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 1b5da0763e7..96852e93cb9 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -41,7 +41,7 @@ let
 
   desktopItem = makeDesktopItem {
     name = "chromium";
-    exec = "chromium";
+    exec = "chromium %U";
     icon = "${chromium.browser}/share/icons/hicolor/48x48/apps/chromium.png";
     comment = "An open source web browser from Google";
     desktopName = "Chromium";

From f6dfaee6f573f8224ec743b8a785713cc674f974 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 4 Aug 2015 14:57:08 -0700
Subject: [PATCH 0711/2016] libidn: 1.31 -> 1.32

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

diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 4c781da6308..21013d2e072 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libidn-1.31";
+  name = "libidn-1.32";
 
   src = fetchurl {
     url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "026z12mczlag443ms9n954h36pi3m7iva9jfw8y4ispsj772zpxg";
+    sha256 = "1xf4hphhahcjm2xwx147lfpsavjwv9l4c2gf6hx71zxywbz5lpds";
   };
 
   doCheck = ! stdenv.isDarwin;

From 6f08fdd26ae362a84487baffed0d48fbd56282e1 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 4 Aug 2015 17:42:08 -0500
Subject: [PATCH 0712/2016] macvim: 7.4.479 -> 7.4.648

This updates macvim to 7.4.648. This also fixes the build, which was broken when I set the default Ruby version to 2.2.2 (one of the symbols was renamed).
---
 pkgs/applications/editors/vim/macvim.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index a63dd0ab9e2..61c57611aac 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -5,11 +5,11 @@
 stdenv.mkDerivation rec {
   name = "macvim-${version}";
 
-  version = "7.4.479";
+  version = "7.4.648";
 
-  src = fetchurl {
-    url = "https://github.com/genoma/macvim/archive/g-snapshot-21.tar.gz";
-    sha256 = "1s86dpb8bcxh309gikiz8gm9ygv3d2jy6i4qlnxarbvcdk65fzv4";
+  src = self.fetchurl {
+    url = "https://github.com/genoma/macvim/archive/g-snapshot-32.tar.gz";
+    sha256 = "1wqg5sy7krgqg3sj00gb34avg90ga2kbvv09bsxv2267j7agi0iq";
   };
 
   enableParallelBuilding = true;

From 7c1a3da1c414abb7a9eab8ea103c5ac77c1105bc Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 4 Aug 2015 17:46:45 -0500
Subject: [PATCH 0713/2016] macvim: fix bad copy/paste in 6f08fdd26

In 6f08fdd26, I left in a typo after copying from my `~/.nixpkgs/config`.
I would normally test this out locally, but I'm fixing up my conf locally,
and, in the interest of not forgetting to push this change up, made the edit
through GitHub's UI.
Oops.
---
 pkgs/applications/editors/vim/macvim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 61c57611aac..d69c1e27c4a 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   version = "7.4.648";
 
-  src = self.fetchurl {
+  src = fetchurl {
     url = "https://github.com/genoma/macvim/archive/g-snapshot-32.tar.gz";
     sha256 = "1wqg5sy7krgqg3sj00gb34avg90ga2kbvv09bsxv2267j7agi0iq";
   };

From 6ee6e9fa570b3a53846b22c97bc2f2d113a34de9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 5 Aug 2015 00:08:51 +0200
Subject: [PATCH 0714/2016] gparted: 0.22.0 -> 0.23.0

Key changes include:
- Add partition name to create dialog and enable online naming
  (relevant for GPT partitioned disk)
- Show serial number in device information
- Add support for btrfs set new file system UUID
- Prevent UI hang when resizing FAT16/32, HFS and HFS+ file systems
---
 pkgs/tools/misc/gparted/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 84709010118..922fefe10e3 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -3,10 +3,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.22.0";
+  name = "gparted-0.23.0";
 
   src = fetchurl {
-    sha256 = "09vg5lxvh81x54ps5ayfjd4jl84wprn42i1wifnfmj44dqd5wxda";
+    sha256 = "0m57bni3nkbbqq920ydzvasy2qc5j6w6bdssyn12jk4157gxvlbz";
     url = "mirror://sourceforge/gparted/${name}.tar.bz2";
   };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://gparted.sourceforge.net;
     license = licenses.gpl2Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }

From 02319b63e044702f2abbf3d4706bd2867b98840f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 5 Aug 2015 00:09:18 +0200
Subject: [PATCH 0715/2016] gparted: update home page

Downloads are still hosted by Sourceforge :-(
---
 pkgs/tools/misc/gparted/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 922fefe10e3..2b9c2297af2 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       partitions. GParted enables you to change the partition organization
       while preserving the partition contents.
     '';
-    homepage = http://gparted.sourceforge.net;
+    homepage = http://gparted.org;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];

From 3dd5c80c536b5af963237e5c10cef95b25acb088 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 5 Aug 2015 00:13:06 +0200
Subject: [PATCH 0716/2016] python-packages: repocheck 2015-06-27 -> 2015-08-05

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1fa7c9dae5b..6fb5d5105bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11607,19 +11607,19 @@ let
   };
 
   repocheck = buildPythonPackage rec {
-    name = "repocheck-2015-06-27";
+    name = "repocheck-2015-08-05";
     disabled = isPy26 || isPy27;
 
     src = pkgs.fetchFromGitHub {
-      sha256 = "0psihwph10sx07xc2gfch739laz7x1kwl5c991cci8cfn5jzy8bp";
-      rev = "231e05b4fa55955ef8492581a15f508ffa0037d4";
+      sha256 = "1jc4v5zy7z7xlfmbfzvyzkyz893f5x2k6kvb3ni3rn2df7jqhc81";
+      rev = "ee48d0e88d3f5814d24a8d1f22d5d83732824688";
       repo = "repocheck";
       owner = "kynikos";
     };
 
     meta = {
+      inherit (src.meta) homepage;
       description = "Check the status of code repositories under a root directory";
-      homepage = https://github.com/kynikos/repocheck;
       license = licenses.gpl3Plus;
       maintainers = with maintainers; [ nckx ];
     };

From 73bccf7c5286064b6fd76c39ff3006dbf69b9f94 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 5 Aug 2015 00:49:36 +0200
Subject: [PATCH 0717/2016] netsniff-ng 0.5.9-34-g95c4582 -> 0.5.9-70-g123b444

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

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 9df8045a2e9..46eb8accb79 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-34-g95c4582"; in
+let version = "0.5.9-70-g123b444"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,14 +10,18 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "95c4582b742fd4fa58e5f14971164b941b0f730d";
-    sha256 = "0anai392n8zx8vcjbjg776lbiwrv95x2dbd8rypbqfzmj8nhzric";
+    rev = "123b444d78337a8f00d3ba83de3af3cdc6891de8";
+    sha256 = "0yqh83g0ja4ggdiylp63h57pxx39fn6axzfvs2w0lp27gbl4yc0i";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl
     libnetfilter_conntrack libpcap libsodium liburcu ncurses perl
     pkgconfig zlib ];
 
+  postPatch = ''
+    substituteInPlace curvetun/Makefile --replace "curvetun.o" "curvetun.o sysctl.o"
+  '';
+
   # ./configure is not autoGNU but some home-brewn magic
   configurePhase = ''
     patchShebangs configure

From c577886ac3bd69e707f034daa193c03342e578d9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 5 Aug 2015 01:04:26 +0200
Subject: [PATCH 0718/2016] python-packages: prompt_toolkit 0.43 -> 0.45

---
 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 6fb5d5105bb..e514fe09073 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9571,10 +9571,10 @@ let
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.43";
+    version = "0.45";
 
     src = pkgs.fetchurl {
-      sha256 = "1z5fap8c7q27p0s82jn11i6fwg0g9zm2zy5na8is53kgbhl10fdr";
+      sha256 = "19lp15rc0rq4jqaacg2a38cdgfy2avhf5v97yanasx4n2swx4gsm";
       url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
     };
 

From c6edf3afabddaff4fd7971242d6847c7ddb14b50 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 5 Aug 2015 01:05:24 +0200
Subject: [PATCH 0719/2016] python-packages: pgcli 0.18.0 -> 0.19.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 e514fe09073..d1d765bc77c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9255,10 +9255,10 @@ let
 
   pgcli = buildPythonPackage rec {
     name = "pgcli-${version}";
-    version = "0.18.0";
+    version = "0.19.0";
 
     src = pkgs.fetchFromGitHub {
-      sha256 = "1ydi1725ryz9by770kyx06cwrvyvixbg3502brkf5hvbjd8ddzrl";
+      sha256 = "1fp73zwbfd4xalrcjnnplvr6890hr528jmqsvc4xgxh9ic2x03bp";
       rev = "v${version}";
       repo = "pgcli";
       owner = "amjith";
@@ -9268,10 +9268,6 @@ let
       click configobj prompt_toolkit psycopg2 pygments sqlparse
     ];
 
-    postPatch = ''
-      substituteInPlace setup.py --replace "==" ">="
-    '';
-
     meta = {
       inherit version;
       description = "Command-line interface for PostgreSQL";

From 10d10b000a9e26d66376976468581eaa1d4120ac Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 4 Aug 2015 17:13:30 -0700
Subject: [PATCH 0720/2016] ceph: Add 0.94 pre

---
 pkgs/tools/filesystems/ceph/0.94-pre.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/tools/filesystems/ceph/0.94-pre.nix

diff --git a/pkgs/tools/filesystems/ceph/0.94-pre.nix b/pkgs/tools/filesystems/ceph/0.94-pre.nix
new file mode 100644
index 00000000000..e496dcccd82
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/0.94-pre.nix
@@ -0,0 +1,13 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "0.94.3";
+
+  src = fetchgit {
+    url = "https://github.com/ceph/ceph.git";
+    rev = "c19b0fc1aa2834ae3027b07a02aebe9639fc2ca7";
+    sha256 = "1h1y5jh2bszia622rmwdblb3cpkpd0mijahkaiasr30jwpkmzh0i";
+  };
+
+  patches = [ ./fix-pgrefdebugging.patch ];
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34e64195f18..98e2fa37b2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1066,6 +1066,7 @@ let
   libceph = ceph.lib;
   ceph-0_80 = callPackage ../tools/filesystems/ceph/0.80.nix { };
   ceph-0_94 = callPackage ../tools/filesystems/ceph/0.94.nix { };
+  ceph-0_94-pre = callPackage ../tools/filesystems/ceph/0.94-pre.nix { };
   ceph = callPackage ../tools/filesystems/ceph { };
   ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
   ceph-git = lowPrio (callPackage ../tools/filesystems/ceph/git.nix { });

From cc12cea4b62cabee595319c9733140e1029481e5 Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Wed, 5 Aug 2015 02:59:20 +0200
Subject: [PATCH 0721/2016] iojs: 2.5.0 -> 3.0.0

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

diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index e8658e09183..d6072484669 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
 
 let
-  version = "2.5.0";
+  version = "3.0.0";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
     url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = "0jj0xqwpq7s45bycs406ml12xyknxgad4vyw9k84al3551m5y2wd";
+    sha256 = "0maxxmr6y7z3y3r88nhcnfzmpvbhs5p8knyz886bh2shgzd6nzqf";
   };
 
   prePatch = ''

From 5a7f1251fec6540c7270e374b8b0d5c85436e4d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 5 Aug 2015 10:28:43 +0200
Subject: [PATCH 0722/2016] drumkv1: update from 0.6.3 to 0.7.0

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

diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 6d585905766..50db71ea723 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumkv1-${version}";
-  version = "0.6.3";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "1f0vpwq7vydldrq9fdfipbkzqqndyxlx0n81ch1i9kw81xj3sxjq";
+    sha256 = "1fbi835559qsg9fxgdbdyf5z1zlzf9n8zrq0p67damb55mmigaj8";
   };
 
   buildInputs = [ libjack2 libsndfile lv2 qt4 ];

From 642a7ca1d756b73f3c471f24ea588b006d328c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 5 Aug 2015 10:29:00 +0200
Subject: [PATCH 0723/2016] guitarix: update from 0.32.3 to 0.33.0

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

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index c3e0fc79e21..d04af37560f 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -11,11 +11,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-  version = "0.32.3";
+  version = "0.33.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
-    sha256 = "1ybc5jk7fj6n8qh9ajzl1f6fzdmzab4nwjrh4fsylm94dn1jv0if";
+    sha256 = "1w6dg2n0alfjsx1iy6s53783invygwxk11p1i65cc3nq3zlidcgx";
   };
 
   nativeBuildInputs = [ gettext intltool pkgconfig python ];

From 4c85902d70a6e3195553a701650f89ef672ce887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 5 Aug 2015 10:29:23 +0200
Subject: [PATCH 0724/2016] samplv1: update from 0.6.3 to 0.7.0

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

diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index fd3f7791c1a..544422cfaea 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "samplv1-${version}";
-  version = "0.6.3";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "1c62fpfl9xv93m04hfh72vzbljr0c5p409vzf3xxmvj9x610yx1w";
+    sha256 = "0w1cl1vjhzzdyxfn8fcfgx5j5d4gi182w5b89f7qzg1akhmsqmfr";
   };
 
   buildInputs = [ libjack2 libsndfile lv2 qt4 ];

From f63fd63eb1e6900dbe4d9ce0db895f2af1d94939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 5 Aug 2015 10:29:47 +0200
Subject: [PATCH 0725/2016] yaws: update from 1.99 to 2.0

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

diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix
index 8d160fc958c..871b3524f42 100644
--- a/pkgs/servers/http/yaws/default.nix
+++ b/pkgs/servers/http/yaws/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yaws-${version}";
-  version = "1.99";
+  version = "2.0";
 
   src = fetchurl {
     url = "http://yaws.hyber.org/download/${name}.tar.gz";
-    sha256 = "057ymg84ji4pfi3xai6kis3mk8zks2ynbiam0x68cb4cb1yfzwcl";
+    sha256 = "1gwk44a07n7yvg900yrlfc6qpvjl64k2h2hddd1jaaay8lgpcch6";
   };
 
   # The tarball includes a symlink yaws -> yaws-1.95, which seems to be

From 9011f117f2daea34760b669749d75a29ed0be88d Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 5 Aug 2015 12:12:09 +0200
Subject: [PATCH 0726/2016] strongswan: fix resolvconf plugin

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

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 9f68e5856ba..784ebb2bb7f 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook
-, curl, trousers, sqlite, iptables, libxml2
+, curl, trousers, sqlite, iptables, libxml2, openresolv
 , enableTNC ? false }:
 
 stdenv.mkDerivation rec {
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
     ./updown-path.patch
   ];
 
+  postPatch = ''
+    substituteInPlace src/libcharon/plugins/resolve/resolve_handler.c --replace "/sbin/resolvconf" "${openresolv}/sbin/resolvconf"
+    '';
+
   configureFlags =
     [ "--enable-swanctl" "--enable-cmd"
       "--enable-farp" "--enable-dhcp"

From 588412857ff7d9ade8e289d3e75d2f5c94add229 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 5 Aug 2015 12:17:11 +0200
Subject: [PATCH 0727/2016] geolite-legacy: 2015-08-03 -> 2015-08-05

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

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 6f1dfae0e21..f3191e430ef 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,23 +8,23 @@ 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-08-03";
+  version = "2015-08-05";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
-    "1yacbh8qcakmnpipscdh99vmsm0874g2gkq8gp8hjgkgi0zvcsnz";
+    "04r1jir9xpd1h5z0a58mwdsbfdbf2kap0ac498w05i11j4vrlh5n";
   srcGeoIPv6 = fetchDB
     "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
-    "038ll8142svhyffxxrg0isrr16rjbz0cnkhd14mck77f1v8z01y5";
+    "0vr2a4mlqlaxq3jz8282zygb2y5hx7y660yrjcq02rpmgpmaxkrd";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
-    "0x5ihg7qikzc195nix9r0izvbdnj4hy4rznvaxk56rf8yqcigdyv";
+    "11jpl54s1r98adlsr2f88zj4x9pg7gwxphd7hhq8jp3hwrgrwhs8";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
-    "0j5dq06pjrh6d94wczsg6qdys4v164nvp2a7qqrg8w4knh94qp6n";
+    "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
     "04qlh6zr8m5qxl2gcysb721bqlnqrxhngh128zj1w8rhqckjndgj";

From 4f7819b89c63e0e331f1439daf3ff995e6c1e7a9 Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Wed, 5 Aug 2015 03:35:24 -0700
Subject: [PATCH 0728/2016] dnsmasq restarts if /etc/hosts file is changed by
 nixos-rebuild

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

diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index 4a812167bb5..eb355151572 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -98,6 +98,7 @@ in
           ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}";
           ExecReload = "${dnsmasq}/bin/kill -HUP $MAINPID";
         };
+        restartTriggers = [ config.environment.etc.hosts.source ];
     };
 
   };

From 25bad2be17b9ef53dd5680e471d33ffc9fe52d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Tue, 4 Aug 2015 22:48:05 +0100
Subject: [PATCH 0729/2016] boot: 2.0.0 -> 2.2.0

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

diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix
index 778019ea541..99a11e9fbf7 100644
--- a/pkgs/development/tools/build-managers/boot/default.nix
+++ b/pkgs/development/tools/build-managers/boot/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jdk }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0";
+  version = "2.2.0";
   name = "boot-${version}";
 
   src = fetchurl {
     url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh";
-    sha256 = "0hvznr0z5ck32wpaqhjv2fr9365b8h0h8brnsmwijpv699l0rf1c";
+    sha256 = "0czavpdhmpgp20vywf326ix1f94dky51mqiwyblrmrd33d89qz9f";
   };
 
   inherit jdk;

From ba3a4a892e834911c0f436c867485e5d748d6abc Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Wed, 5 Aug 2015 14:09:33 +0200
Subject: [PATCH 0730/2016] Update fossil to version 1.33

---
 pkgs/applications/version-management/fossil/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 1093bbe0d02..19c2c1f2ef1 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite, withJson ? true}:
 
 stdenv.mkDerivation rec {
-  name = "fossil-1.32";
+  name = "fossil-1.33";
 
   src = fetchurl {
     urls = 
       [
-        "https://www.fossil-scm.org/fossil/tarball/Fossil-6c40678e.tar.gz?uuid=6c40678e9114c41a50f73cc43f6f942ace0408ec"
-        ];
+        https://www.fossil-scm.org/download/fossil-src-1.33.tar.gz
+      ];
     name = "${name}.tar.gz";
-    sha256 = "0f1rvqiy630z2q1q8r3kgdd0c6sxjx8c8pm46yabn238xvf3bfnr";
+    sha256 = "0gkzd9nj3xyznh9x8whv0phdnj11l5c8164rc3l0jvs5i61c95b2";
   };
 
   buildInputs = [ zlib openssl readline sqlite ];

From 9657be0b95e2ffaabac8e57a54ebde3224ee5df6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 4 Aug 2015 17:34:49 +0200
Subject: [PATCH 0731/2016] svn2git-kde: Mark as broken

The source repository no longer exists.
---
 .../version-management/git-and-tools/svn2git-kde/default.nix    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
index 94c819e711b..91fe1662efe 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
@@ -21,4 +21,6 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ subversion apr qt4 ];
+
+  meta.broken = true;
 }

From 525c901ce941552ef125ac7f61cd095fcf7e1358 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2015 12:03:01 +0200
Subject: [PATCH 0732/2016] Make svn2git visible to nix-env

---
 .../version-management/git-and-tools/svn2git/default.nix   | 2 +-
 pkgs/top-level/all-packages.nix                            | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index f30a47a78b9..c735ef4506a 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = https://github.com/nirvdrum/svn2git;
-    description = "Ruby tool for importing existing svn projects into git";
+    description = "Tool for importing Subversion repositories into git";
     license = stdenv.lib.licenses.mit;
 
     maintainers = [ stdenv.lib.maintainers.the-kenny ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98e2fa37b2f..91b51224c5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11490,14 +11490,13 @@ let
   gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools {
     inherit pkgs;
   });
-  git = gitAndTools.git;
-  gitFull = gitAndTools.gitFull;
+
+  inherit (gitAndTools) git gitFull gitSVN git-cola svn2git;
+
   gitMinimal = git.override {
     withManual = false;
     pythonSupport = false;
   };
-  gitSVN = gitAndTools.gitSVN;
-  git-cola = gitAndTools.git-cola;
 
   gitRepo = callPackage ../applications/version-management/git-repo {
     python = python27;

From 3f1354a3cd61d37d9b5c91706945f849c9af71c4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2015 12:03:19 +0200
Subject: [PATCH 0733/2016] =?UTF-8?q?Add=20an=20option=20=E2=80=98nix.nixP?=
 =?UTF-8?q?ath=E2=80=99=20for=20specifying=20$NIX=5FPATH?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nixos/modules/programs/environment.nix     |  9 ---------
 nixos/modules/services/misc/nix-daemon.nix | 19 ++++++++++++++++++-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index dce757ceb62..52f6cc22111 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -23,15 +23,6 @@ in
         EDITOR = mkDefault "nano";
       };
 
-    environment.sessionVariables =
-      { NIX_PATH =
-          [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
-            "nixpkgs=/etc/nixos/nixpkgs"
-            "nixos-config=/etc/nixos/configuration.nix"
-            "/nix/var/nix/profiles/per-user/root/channels"
-          ];
-      };
-
     environment.profiles =
       [ "$HOME/.nix-profile"
         "/nix/var/nix/profiles/default"
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 4088f9ff055..7c42076280c 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -309,6 +309,21 @@ in
         '';
       };
 
+      nixPath = mkOption {
+        type = types.listOf types.str;
+        default =
+          [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
+            "nixpkgs=/etc/nixos/nixpkgs"
+            "nixos-config=/etc/nixos/configuration.nix"
+            "/nix/var/nix/profiles/per-user/root/channels"
+          ];
+        description = ''
+          The default Nix expression search path, used by the Nix
+          evaluator to look up paths enclosed in angle brackets
+          (e.g. <literal>&lt;nixpkgs&gt;</literal>).
+        '';
+      };
+
     };
 
   };
@@ -378,7 +393,9 @@ in
       };
 
     # Set up the environment variables for running Nix.
-    environment.sessionVariables = cfg.envVars;
+    environment.sessionVariables = cfg.envVars //
+      { NIX_PATH = concatStringsSep ":" cfg.nixPath;
+      };
 
     environment.extraInit =
       ''

From 699ba71b50e9fcdfffcfdb17abee7abba778cc2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2015 13:18:31 +0200
Subject: [PATCH 0734/2016] nixos-install: Source the profile when running
 inside the chroot

---
 nixos/modules/installer/tools/nixos-install.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index b1f4772d570..f7fe6245d6d 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -256,14 +256,8 @@ NIXOS_INSTALL_GRUB=1 chroot $mountPoint \
 chroot $mountPoint /nix/var/nix/profiles/system/activate
 
 
-# Some systems may not be prepared to use NixOS' paths.
-export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin:$PATH
-export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs
-export NIX_PATH=$NIX_PATH:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
-
-
 # Ask the user to set a root password.
-if [ "$(chroot $mountPoint nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then
+if [ "$(chroot $mountPoint /run/current-system/sw/bin/sh -l -c "nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers")" = true ] && [ -t 0 ] ; then
     echo "setting root password..."
     chroot $mountPoint /var/setuid-wrappers/passwd
 fi

From b3d8d750de2c6c470f14468663de4781388be598 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2015 13:21:21 +0200
Subject: [PATCH 0735/2016] Remove /etc/nixos/nixpkgs from $NIX_PATH

NixOS hasn't used /etc/nixos/nixpkgs for a long time, so it's time to
get rid of it.
---
 nixos/doc/manual/release-notes/rl-unstable.xml  | 9 +++++++++
 nixos/modules/services/misc/nix-daemon.nix      | 1 -
 pkgs/tools/package-management/nixui/default.nix | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index aedc85f3069..c50df94bfd8 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -188,6 +188,15 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
   </para>
 </listitem>
 
+<listitem>
+  <para>
+    The Nix expression search path (<envar>NIX_PATH</envar>) no longer
+    contains <filename>/etc/nixos/nixpkgs</filename> by default. You
+    can override <envar>NIX_PATH</envar> by setting
+    <option>nix.nixPath</option>.
+  </para>
+</listitem>
+
 </itemizedlist>
 </para>
 
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 7c42076280c..4aed91c3497 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -313,7 +313,6 @@ in
         type = types.listOf types.str;
         default =
           [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
-            "nixpkgs=/etc/nixos/nixpkgs"
             "nixos-config=/etc/nixos/configuration.nix"
             "/nix/var/nix/profiles/per-user/root/channels"
           ];
diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix
index 73004091a42..dd9dbed2995 100644
--- a/pkgs/tools/package-management/nixui/default.nix
+++ b/pkgs/tools/package-management/nixui/default.nix
@@ -2,7 +2,7 @@
 , profilePaths ? (config.nixui.profilePaths or ["/nix/var/nix/profiles"])
 , dataDir ? (config.nixui.dataDir or "/tmp")
 , configurations ? (config.nixui.configurations or ["/etc/nixos/configuration.nix"])
-, NIX_PATH ? (config.nixui.NIX_PATH or "/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos-config=/etc/nixos/configuration.nix") }:
+, NIX_PATH ? (config.nixui.NIX_PATH or "/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix") }:
 let
   version = "0.1.2";
   src = fetchgit {

From fc7e7f9032722d8d2c9080044b82045e2ba806a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2015 13:28:27 +0200
Subject: [PATCH 0736/2016] Remove broken/unused test

---
 nixos/tests/check-filesystems.nix | 85 -------------------------------
 1 file changed, 85 deletions(-)
 delete mode 100644 nixos/tests/check-filesystems.nix

diff --git a/nixos/tests/check-filesystems.nix b/nixos/tests/check-filesystems.nix
deleted file mode 100644
index cb9ff25f977..00000000000
--- a/nixos/tests/check-filesystems.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ nixos ? ./..
-, nixpkgs ? /etc/nixos/nixpkgs
-, system ? builtins.currentSystem
-}:
-
-with import ../lib/build-vms.nix { inherit nixos nixpkgs system; };
-
-rec {
-  name = "check-filesystems";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ eelco chaoflow ];
-  };
-
-  nodes = {
-    share = {pkgs, config, ...}: {
-      services.nfs.server.enable = true;
-      services.nfs.server.exports = ''
-        /repos1 192.168.1.0/255.255.255.0(rw,no_root_squash)
-        /repos2 192.168.1.0/255.255.255.0(rw,no_root_squash)
-      '';
-      services.nfs.server.createMountPoints = true;
-
-      jobs.checkable = {
-        startOn = [
-          config.jobs.nfs_kernel_exports.name
-          config.jobs.nfs_kernel_nfsd.name
-        ];
-        respawn = true;
-      };
-    };
-
-    fsCheck = {pkgs, config, ...}: {
-      fileSystems =
-        let
-          repos1 = {
-            mountPoint = "/repos1";
-            autocreate = true;
-            device = "share:/repos1";
-            fsType = "nfs";
-          };
-
-          repos2 = {
-            mountPoint = "/repos2";
-            autocreate = true;
-            device = "share:/repos2";
-            fsType = "nfs";
-          };
-        in pkgs.lib.mkVMOverride [
-          repos1
-          repos1 # check remount
-          repos2 # check after remount
-        ];
-
-      jobs.checkable = {
-        startOn = "stopped ${config.jobs.filesystems.name}";
-        respawn = true;
-      };
-    };
-  };
-
-  vms = buildVirtualNetwork { inherit nodes; };
-
-  test = runTests vms
-    ''
-      startAll;
-
-      $share->waitForUnit("checkable");
-      $fsCheck->waitForUnit("checkable");
-
-      # check repos1
-      $fsCheck->succeed("test -d /repos1");
-      $share->succeed("touch /repos1/test1");
-      $fsCheck->succeed("test -e /repos1/test1");
-
-      # check repos2 (check after remount)
-      $fsCheck->succeed("test -d /repos2");
-      $share->succeed("touch /repos2/test2");
-      $fsCheck->succeed("test -e /repos2/test2");
-
-      # check without network
-      $share->block();
-      $fsCheck->fail("test -e /repos1/test1");
-      $fsCheck->fail("test -e /repos2/test2");
-    '';
-}

From bb38d9974b2bff63f3ab4ea82123dfb2038234c8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2015 13:36:28 +0200
Subject: [PATCH 0737/2016] Update fallback Nix store paths

---
 nixos/modules/installer/tools/nixos-rebuild.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index ccafa30856c..7d0e5913cfb 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -157,9 +157,9 @@ if [ -n "$buildNix" ]; then
             if ! nix-build '<nixpkgs>' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
                 machine="$(uname -m)"
                 if [ "$machine" = x86_64 ]; then
-                    nixStorePath=/nix/store/ffig6yaggbh12dh9y5pnf1grf5lqyipz-nix-1.8
+                    nixStorePath=/nix/store/664kxr14kfgx4dl095crvmr7pbh9xlh5-nix-1.9
                 elif [[ "$machine" =~ i.86 ]]; then
-                    nixStorePath=/nix/store/lglhfp4mimfa5wzjjf1kqz6f5wlsj2mn-nix-1.8
+                    nixStorePath=/nix/store/p7xdvz72xx3rhm121jclsbdmmcds7xh6-nix-1.9
                 else
                     echo "$0: unsupported platform"
                     exit 1

From cbecbd01f95fa4a2e417e54454f5f740a550eee9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2015 14:29:38 +0200
Subject: [PATCH 0738/2016] =?UTF-8?q?Module=20system:=20Fix=20=E2=80=98def?=
 =?UTF-8?q?initions=E2=80=99=20field?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes https://github.com/NixOS/nixops/issues/325.
---
 lib/modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 50827e18f10..a40f02dcc3d 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -285,7 +285,7 @@ rec {
 
     in opt //
       { value = addErrorContext "while evaluating the option `${showOption loc}':" value;
-        definitions = map (def: def.value) defsFinal;
+        definitions = map (def: def.value) res.defsFinal;
         files = map (def: def.file) res.defsFinal;
         inherit (res) isDefined;
       };

From 3dbdac801c9197e74c8baeefb6413bf251ab888c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 5 Aug 2015 14:34:37 +0200
Subject: [PATCH 0739/2016] org-mode: update from 8.2.10 to 8.3

---
 pkgs/applications/editors/emacs-modes/org/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index c7ad1c7049b..b447b235bfa 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -2,11 +2,11 @@
 , texLiveAggregationFun }:
 
 stdenv.mkDerivation rec {
-  name = "org-8.2.10";
+  name = "org-8.3";
 
   src = fetchurl {
     url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "1xm8n8zwr3676rl4pd32k61rd7rimlihhrw5a7r4z7r154c4a2fz";
+    sha256 = "0yqbl232hfppljz545jbjawwaw7qjdjsq97c0wf0cbkghgpln3wy";
   };
 
   buildInputs = [ emacs ];

From 7053602206ec04fc519c40c59ba87f7dc3a23442 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Aug 2015 14:37:18 +0200
Subject: [PATCH 0740/2016] nixops: update unstable version to latest git HEAD

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

diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index 2ad826b928b..c8b5131bf75 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -17,13 +17,13 @@ let
 in
 
 pythonPackages.buildPythonPackage rec {
-  name = "nixops-1.3pre1486_7489764";
+  name = "nixops-1.3pre-cefcd9ba";
   namePrefix = "";
 
   src = fetchgit {
     url = https://github.com/NixOS/nixops;
-    rev = "5c7663dfe1e2af9c0396c5c86d995452ef2efc8a";
-    sha256 = "01n2ykszrnqr3kqqdg1n2l8wm38yhri7r3d7b0abklsslz9dlvmy";
+    rev = "cefcd9bae9a4d3bac83f188460619d18972321a8";
+    sha256 = "1jwkbnfwics2j0m6mr75rz914vg0z46d2xv0z1717c1ac5rki0l2";
   };
 
   buildInputs = [ /* libxslt */ pythonPackages.nose pythonPackages.coverage ];

From 6bacb60ca942d7ae752b78c96f54dfe05cbc4dcd Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 5 Aug 2015 14:37:37 +0200
Subject: [PATCH 0741/2016] screenfetch: add grep to PATH, closes #9088

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

diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index 418afee8135..92cc800d83d 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, makeWrapper
-, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop
+, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop, gnugrep
 }:
 
 stdenv.mkDerivation {
@@ -28,6 +28,7 @@ stdenv.mkDerivation {
       --prefix PATH : "${findutils}/bin" \
       --prefix PATH : "${xdpyinfo}/bin" \
       --prefix PATH : "${xprop}/bin" \
+      --prefix PATH : "${gnugrep}/bin"
   '';
 
   meta = {

From 454dc664a6269f6924e5ac8be0c2ba8019926b69 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 5 Aug 2015 14:40:50 +0200
Subject: [PATCH 0742/2016] checkstyle: update from 6.8.1 to 6.8.2

---
 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 f5c6a9bcd1a..f0698de5c7e 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.8.1";
+  version = "6.8.2";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "12da8msz5459ra0g5smr8daqh88mfa653nn475acjp1ycsm395hv";
+    sha256 = "1r0wb8iqvmhvgxk1ya39x8b4ayd549bfxmnw26i84870hnqr179c";
   };
 
   installPhase = ''

From bb04c579c3746dea83b15429ca4acec077577975 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 5 Aug 2015 14:44:19 +0200
Subject: [PATCH 0743/2016] fswatch: update from 1.4.7 to 1.5.0

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

diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 487c57c5484..8f3818fb6b4 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   name = "fswatch-${version}";
-  version = "1.4.7";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
     rev = version;
-    sha256 = "0f6aa14v31gy3j7qx563ml37r8mylpbqfjrz2v5g44zrrg6086w7";
+    sha256 = "09np75m9df2nk7lc5y9wgq467ca6jsd2p5666d5rkzjvy6s0a51n";
   };
 
   buildInputs = [ autoreconfHook gettext libtool makeWrapper texinfo ];

From 3768bdf227e4c4962253880ae2be3cfc0752af58 Mon Sep 17 00:00:00 2001
From: Michael Adler <michael.adler@tngtech.com>
Date: Sat, 25 Jul 2015 15:36:28 +0200
Subject: [PATCH 0744/2016] libcouchbase: 2.4.4 -> 2.5.2, refactor to use cmake

Building libcouchbase with automake is deprecated, thus use
cmake instead. This has the advantage that the package-config
file is installed as well.
---
 .../libraries/libcouchbase/default.nix        | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index bcc9e9f673f..2784cd90a5c 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -1,23 +1,16 @@
-{ stdenv, fetchgit, autoconf, automake, libtool,
-pkgconfig, perl, git, libevent, openssl}:
+{ stdenv, fetchurl, cmake, pkgconfig, libevent, openssl}:
 
 stdenv.mkDerivation {
-  name = "libcouchbase-2.4.4";
-  src = fetchgit {
-    url = "https://github.com/couchbase/libcouchbase.git";
-    rev = "4410eebcd813844b6cd6f9c7eeb4ab3dfa2ab8ac";
-    sha256 = "02lzv5l6fvnqr2l9bqfha0pzkzlzjfddn3w5zcbjz36kw4p2p4h9";
-    leaveDotGit = true;
+  name = "libcouchbase-2.5.2";
+  src = fetchurl {
+    url = "https://github.com/couchbase/libcouchbase/archive/2.5.2.tar.gz";
+    sha256 = "0ka1hix38a2kdhxz6n8frssyznf78ra0irga9d8lr5683y73xw24";
   };
 
-  preConfigure = ''
-    patchShebangs ./config/
-    ./config/autorun.sh
-  '';
+  cmakeFlags = "-DLCB_NO_MOCK=ON";
 
-  configureFlags = "--disable-couchbasemock";
-
-  buildInputs = [ autoconf automake libtool pkgconfig perl git libevent openssl];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ libevent openssl];
 
   meta = {
     description = "C client library for Couchbase";

From 271392a3d19c55a83b67251a81579756253fd79c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 5 Aug 2015 12:44:33 +0200
Subject: [PATCH 0745/2016] python-packages: pgcli 0.19.0 -> 0.19.1

Bugfix for issue #317 ('traceback in completion on "selt *"').
---
 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 d1d765bc77c..c9c42d325ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9255,10 +9255,10 @@ let
 
   pgcli = buildPythonPackage rec {
     name = "pgcli-${version}";
-    version = "0.19.0";
+    version = "0.19.1";
 
     src = pkgs.fetchFromGitHub {
-      sha256 = "1fp73zwbfd4xalrcjnnplvr6890hr528jmqsvc4xgxh9ic2x03bp";
+      sha256 = "1r34bbqbd4h72cl0cxi9w6q2nwx806wpxq220mzyiy8g45xv0ghj";
       rev = "v${version}";
       repo = "pgcli";
       owner = "amjith";

From 7f9b8866bfcdc3a4d268834ba8f123628d6c7847 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2015 15:42:44 +0200
Subject: [PATCH 0746/2016] Nixpkgs channel: Remove channel-name

This file no longer does anything.
---
 pkgs/top-level/make-tarball.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index d023470c48f..cc6e8710335 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -74,7 +74,6 @@ releaseTools.sourceTarball rec {
     mkdir -p $out/tarballs
     mkdir ../$releaseName
     cp -prd . ../$releaseName
-    echo nixpkgs > ../$releaseName/channel-name
     (cd .. && tar cfa $out/tarballs/$releaseName.tar.xz $releaseName) || false
   '';
 

From 91e71725d49c185401f459f58062b02bcbf1651e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2015 15:52:12 +0200
Subject: [PATCH 0747/2016] Remove some obsolete references to <nixos>

---
 .../modules/installer/tools/nixos-build-vms/nixos-build-vms.sh  | 2 +-
 nixos/modules/misc/assertions.nix                               | 2 +-
 nixos/modules/profiles/clone-config.nix                         | 2 +-
 pkgs/development/python-modules/blivet/default.nix              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
index f9cbfffde70..4e981c074a5 100644
--- a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
+++ b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
@@ -53,5 +53,5 @@ fi
 
 # Build a network of VMs
 
-nix-build '<nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
+nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
     --argstr networkExpr $networkExpr $noOutLinkArg $showTraceArg
diff --git a/nixos/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix
index c42de038e61..3b50e60a0ff 100644
--- a/nixos/modules/misc/assertions.nix
+++ b/nixos/modules/misc/assertions.nix
@@ -30,5 +30,5 @@ with lib;
     };
 
   };
-  # impl of assertions is in <nixos/modules/system/activation/top-level.nix>
+  # impl of assertions is in <nixpkgs/nixos/modules/system/activation/top-level.nix>
 }
diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix
index f0d60bb6c42..77d86f8d740 100644
--- a/nixos/modules/profiles/clone-config.nix
+++ b/nixos/modules/profiles/clone-config.nix
@@ -30,7 +30,7 @@ let
   relocatedModuleFiles =
     let
       relocateNixOS = path:
-        "<nixos" + removePrefix nixosPath (toString path) + ">";
+        "<nixpkgs/nixos" + removePrefix nixosPath (toString path) + ">";
       relocateOthers = null;
     in
       { nixos = map relocateNixOS partitionedModuleFiles.nixos;
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index 3065af0fd15..0b7069ab67d 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -36,7 +36,7 @@ in buildPythonPackage rec {
     six
   ];
 
-  # Tests are in <nixos/tests/blivet.nix>.
+  # Tests are in <nixpkgs/nixos/tests/blivet.nix>.
   doCheck = false;
 
   meta = with stdenv.lib; {

From 2cd7c1f19888ae73bf7ef0f41a45680cfb86334a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2015 17:29:08 +0200
Subject: [PATCH 0748/2016] Unify NixOS and Nixpkgs channel structure

This is primarily to ensure that

  -I nixpkgs=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz

and

  -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz

and

  -I nixpkgs=https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz

behave consistently.

It also allows installing packages via "nix-env -iA nixos.<pkg>"
rather than "nixos.pkgs.<pkg>". It would be even better to allow
"nixpkgs.<pkg>", but that requires a change to nix-channel.

Fixes #7659.
---
 doc/haskell-users-guide.xml                     |  8 ++++----
 .../manual/configuration/ad-hoc-packages.xml    |  2 +-
 .../configuration/declarative-packages.xml      |  4 ++--
 nixos/lib/build-vms.nix                         |  2 +-
 nixos/lib/channel-expr.nix                      |  6 ------
 nixos/lib/make-channel.nix                      |  8 ++------
 nixos/lib/nixpkgs.nix                           |  8 --------
 nixos/modules/installer/cd-dvd/channel.nix      | 17 ++++++++---------
 .../modules/installer/tools/nixos-checkout.nix  |  2 +-
 nixos/modules/misc/extra-arguments.nix          |  2 +-
 nixos/modules/misc/nixpkgs.nix                  |  2 +-
 nixos/tests/containers.nix                      |  2 +-
 12 files changed, 22 insertions(+), 41 deletions(-)
 delete mode 100644 nixos/lib/channel-expr.nix
 delete mode 100644 nixos/lib/nixpkgs.nix

diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml
index e3903ddd411..e0dc89cc7ce 100644
--- a/doc/haskell-users-guide.xml
+++ b/doc/haskell-users-guide.xml
@@ -92,18 +92,18 @@ error: attribute ‘haskellPackages’ in selection path
   </para>
   <programlisting>
 $ nix-env -qaP coreutils
-nixos.pkgs.coreutils  coreutils-8.23
+nixos.coreutils  coreutils-8.23
 </programlisting>
   <para>
     If your system responds like that (most NixOS installatios will),
     then the attribute path to <literal>haskellPackages</literal> is
-    <literal>nixos.pkgs.haskellPackages</literal>. Thus, if you want to
+    <literal>nixos.haskellPackages</literal>. Thus, if you want to
     use <literal>nix-env</literal> without giving an explicit
     <literal>-f</literal> flag, then that's the way to do it:
   </para>
   <programlisting>
-$ nix-env -qaP -A nixos.pkgs.haskellPackages
-$ nix-env -iA nixos.pkgs.haskellPackages.cabal-install
+$ nix-env -qaP -A nixos.haskellPackages
+$ nix-env -iA nixos.haskellPackages.cabal-install
 </programlisting>
   <para>
     Our current default compiler is GHC 7.10.x and the
diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml
index e237e20c4ff..a147291c4f3 100644
--- a/nixos/doc/manual/configuration/ad-hoc-packages.xml
+++ b/nixos/doc/manual/configuration/ad-hoc-packages.xml
@@ -11,7 +11,7 @@ uninstall packages from the command line.  For instance, to install
 Mozilla Thunderbird:
 
 <screen>
-$ nix-env -iA nixos.pkgs.thunderbird</screen>
+$ nix-env -iA nixos.thunderbird</screen>
 
 If you invoke this as root, the package is installed in the Nix
 profile <filename>/nix/var/nix/profiles/default</filename> and visible
diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml
index 6de38b452e2..dc2fa715097 100644
--- a/nixos/doc/manual/configuration/declarative-packages.xml
+++ b/nixos/doc/manual/configuration/declarative-packages.xml
@@ -23,13 +23,13 @@ Nixpkgs will be built or downloaded as part of the system when you run
 <para>You can get a list of the available packages as follows:
 <screen>
 $ nix-env -qaP '*' --description
-nixos.pkgs.firefox   firefox-23.0   Mozilla Firefox - the browser, reloaded
+nixos.firefox   firefox-23.0   Mozilla Firefox - the browser, reloaded
 <replaceable>...</replaceable>
 </screen>
 
 The first column in the output is the <emphasis>attribute
 name</emphasis>, such as
-<literal>nixos.pkgs.thunderbird</literal>. (The
+<literal>nixos.thunderbird</literal>. (The
 <literal>nixos</literal> prefix allows distinguishing between
 different channels that you might have.)</para>
 
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 01d6b21bba9..a97bae57d9b 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -1,6 +1,6 @@
 { system, minimal ? false }:
 
-let pkgs = import ./nixpkgs.nix { config = {}; inherit system; }; in
+let pkgs = import ../.. { config = {}; inherit system; }; in
 
 with pkgs.lib;
 with import ../lib/qemu-flags.nix;
diff --git a/nixos/lib/channel-expr.nix b/nixos/lib/channel-expr.nix
deleted file mode 100644
index 453bdd506b8..00000000000
--- a/nixos/lib/channel-expr.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ system ? builtins.currentSystem }:
-
-{ pkgs =
-    (import nixpkgs/default.nix { inherit system; })
-    // { recurseForDerivations = true; };
-}
diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix
index 1c6bf0897f4..fd805f7f943 100644
--- a/nixos/lib/make-channel.nix
+++ b/nixos/lib/make-channel.nix
@@ -10,19 +10,15 @@ pkgs.releaseTools.makeSourceTarball {
 
   buildInputs = [ pkgs.nix ];
 
-  expr = builtins.readFile ./channel-expr.nix;
-
   distPhase = ''
     rm -rf .git
     echo -n $VERSION_SUFFIX > .version-suffix
     echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision
     releaseName=nixos-$VERSION$VERSION_SUFFIX
     mkdir -p $out/tarballs
-    mkdir ../$releaseName
-    cp -prd . ../$releaseName/nixpkgs
+    cp -prd . ../$releaseName
     chmod -R u+w ../$releaseName
-    ln -s nixpkgs/nixos ../$releaseName/nixos
-    echo "$expr" > ../$releaseName/default.nix
+    ln -s . ../$releaseName/nixpkgs # hack to make ‘<nixpkgs>’ work
     NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
     cd ..
     chmod -R u+w $releaseName
diff --git a/nixos/lib/nixpkgs.nix b/nixos/lib/nixpkgs.nix
deleted file mode 100644
index 10096f58c79..00000000000
--- a/nixos/lib/nixpkgs.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Terrible backward compatibility hack to get the path to Nixpkgs
-   from here.  Usually, that's the relative path ‘../..’.  However,
-   when using the NixOS channel, <nixos> resolves to a symlink to
-   nixpkgs/nixos, so ‘../..’ doesn't resolve to the top-level Nixpkgs
-   directory but one above it.  So check for that situation. */
-if builtins.pathExists ../../.version then import ../..
-else if builtins.pathExists ../../nixpkgs then import ../../nixpkgs
-else abort "Can't find Nixpkgs, please set ‘NIX_PATH=nixpkgs=/path/to/nixpkgs’."
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index ca0e233f9e3..eccb19da5cb 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -9,18 +9,17 @@ let
 
   # We need a copy of the Nix expressions for Nixpkgs and NixOS on the
   # CD.  These are installed into the "nixos" channel of the root
-  # user, as expected by nixos-rebuild/nixos-install.
+  # user, as expected by nixos-rebuild/nixos-install. FIXME: merge
+  # with make-channel.nix.
   channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}"
-    { expr = readFile ../../../lib/channel-expr.nix; }
+    { }
     ''
-      mkdir -p $out/nixos
-      cp -prd ${pkgs.path} $out/nixos/nixpkgs
-      ln -s nixpkgs/nixos $out/nixos/nixos
+      mkdir -p $out
+      cp -prd ${pkgs.path} $out/nixos
       chmod -R u+w $out/nixos
-      rm -rf $out/nixos/nixpkgs/.git
-      echo -n ${config.system.nixosVersion} > $out/nixos/nixpkgs/.version
-      echo -n "" > $out/nixos/nixpkgs/.version-suffix
-      echo "$expr" > $out/nixos/default.nix
+      ln -s . $out/nixos/nixpkgs
+      rm -rf $out/nixos/.git
+      echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix
     '';
 
 in
diff --git a/nixos/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix
index 9cdd8a74a18..07274e139f7 100644
--- a/nixos/modules/installer/tools/nixos-checkout.nix
+++ b/nixos/modules/installer/tools/nixos-checkout.nix
@@ -27,7 +27,7 @@ let
 
         if [ -z "$(type -P git)" ]; then
             echo "installing Git..."
-            nix-env -iA nixos.pkgs.git || nix-env -i git
+            nix-env -iA nixos.git
         fi
 
         # Move any old nixpkgs directories out of the way.
diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix
index ff2ff7cd432..02ac6e7a59d 100644
--- a/nixos/modules/misc/extra-arguments.nix
+++ b/nixos/modules/misc/extra-arguments.nix
@@ -2,7 +2,7 @@
 
 {
   _module.args = {
-    pkgs_i686 = import ../../lib/nixpkgs.nix {
+    pkgs_i686 = import ../../.. {
       system = "i686-linux";
       config.allowUnfree = true;
     };
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index fb5516c953c..5eb38c510b4 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -72,7 +72,7 @@ in
   };
 
   config = {
-    _module.args.pkgs = import ../../lib/nixpkgs.nix {
+    _module.args.pkgs = import ../../.. {
       system = config.nixpkgs.system;
 
       inherit (config.nixpkgs) config;
diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix
index c429f9c7b71..ce36a7e0588 100644
--- a/nixos/tests/containers.nix
+++ b/nixos/tests/containers.nix
@@ -46,7 +46,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
 
       # Make sure we have a NixOS tree (required by ‘nixos-container create’).
-      $machine->succeed("PAGER=cat nix-env -qa -A nixos.pkgs.hello >&2");
+      $machine->succeed("PAGER=cat nix-env -qa -A nixos.hello >&2");
 
       # Create some containers imperatively.
       my $id1 = $machine->succeed("nixos-container create foo --ensure-unique-name");

From fd08657281a5c153b9dc088fd8b6b305135eeaeb Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Wed, 5 Aug 2015 19:30:07 +0200
Subject: [PATCH 0749/2016] obnam: 1.12 -> 1.13

---
 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 910fe332d25..edda974281e 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.12";
+  version = "1.13";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "09b9j2mygv1dsrq424j535c92wvlbzpwgzcgg7x922dxrnsdsxpr";
+    sha256 = "13a9icgp7kvxaw700sdhxll0in00ghk0aacg26s4kxmxc85w92i4";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];

From f178817aee7196ce7ef6698690495152a234f4bb Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Thu, 25 Jun 2015 23:44:34 -0500
Subject: [PATCH 0750/2016] xquartz: 1.14.6 -> 1.17.2

closes #9126
---
 ...e-wait-for-the-server-thread-to-term.patch | 33 -------
 ...__glXEnableExtension-to-build-extens.patch | 78 ++++++++++++++++
 ...-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch} | 29 +++---
 ...-clipping-problem-in-miPaintWindow-.patch} | 20 ++---
 ...Trapezoids-and-miTriangles-routines.patch} | 18 ++--
 ...evert-fb-changes-that-broke-XQuartz.patch} | 26 +++---
 ...evert-fb-changes-that-broke-XQuartz.patch} | 89 +++++++++++--------
 pkgs/servers/x11/xorg/fix-clang.patch         | 11 ---
 .../servers/x11/xorg/libpciaccess-apple.patch | 26 ------
 .../servers/x11/xorg/libxkbfile-clang36.patch | 11 ---
 pkgs/servers/x11/xorg/overrides.nix           | 38 +++-----
 11 files changed, 188 insertions(+), 191 deletions(-)
 delete mode 100644 pkgs/servers/x11/xorg/darwin/0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch
 create mode 100644 pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch
 rename pkgs/servers/x11/xorg/darwin/{5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch => 0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch} (54%)
 rename pkgs/servers/x11/xorg/darwin/{5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch => 0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch} (90%)
 rename pkgs/servers/x11/xorg/darwin/{5004-Use-old-miTrapezoids-and-miTriangles-routines.patch => 0004-Use-old-miTrapezoids-and-miTriangles-routines.patch} (95%)
 rename pkgs/servers/x11/xorg/darwin/{5002-fb-Revert-fb-changes-that-broke-XQuartz.patch => 0005-fb-Revert-fb-changes-that-broke-XQuartz.patch} (94%)
 rename pkgs/servers/x11/xorg/darwin/{5003-fb-Revert-fb-changes-that-broke-XQuartz.patch => 0006-fb-Revert-fb-changes-that-broke-XQuartz.patch} (73%)
 delete mode 100644 pkgs/servers/x11/xorg/fix-clang.patch
 delete mode 100644 pkgs/servers/x11/xorg/libpciaccess-apple.patch
 delete mode 100644 pkgs/servers/x11/xorg/libxkbfile-clang36.patch

diff --git a/pkgs/servers/x11/xorg/darwin/0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch b/pkgs/servers/x11/xorg/darwin/0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch
deleted file mode 100644
index cd87e396d4f..00000000000
--- a/pkgs/servers/x11/xorg/darwin/0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ec6007e6f7772a90713c9c51c64359229961ce27 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun, 6 Apr 2014 05:32:00 -0700
-Subject: [PATCH] XQuartz: Ensure we wait for the server thread to terminate
-
-AKA: XQuartz 2.7.5 doesn't delete its /tmp/.X$d-lock
-
-http://xquartz.macosforge.org/trac/ticket/823
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- hw/xquartz/X11Controller.m | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
-index 5445c6f..022e832 100644
---- a/hw/xquartz/X11Controller.m
-+++ b/hw/xquartz/X11Controller.m
-@@ -942,9 +942,8 @@ extern char *bundle_id_prefix;
-     /* shutdown the X server, it will exit () for us. */
-     DarwinSendDDXEvent(kXquartzQuit, 0);
- 
--    /* In case it doesn't, exit anyway after a while. */
--    remain = 10000000;
--    while ((remain = usleep(remain)) > 0) ;
-+    /* In case it doesn't, exit anyway after 5s. */
-+    [NSThread sleepForTimeInterval:5.0];
- 
-     exit(1);
- }
--- 
-1.9.1
-
diff --git a/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch b/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch
new file mode 100644
index 00000000000..ff297a8df96
--- /dev/null
+++ b/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch
@@ -0,0 +1,78 @@
+From fff30cdea46616eb92f4dd9402ebd27fdb55e13b Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun, 1 Jun 2014 04:29:19 -0700
+Subject: [PATCH 1/6] XQuartz: GLX: Use __glXEnableExtension to build
+ extensions list
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit 3790001ea29658872aebda00a03170e392b47878)
+---
+ hw/xquartz/GL/indirect.c | 37 +++++++++++++++++++++++++++++++------
+ 1 file changed, 31 insertions(+), 6 deletions(-)
+
+diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
+index 19b7d86..4e6ab3d 100644
+--- a/hw/xquartz/GL/indirect.c
++++ b/hw/xquartz/GL/indirect.c
+@@ -52,6 +52,7 @@
+ 
+ #include "visualConfigs.h"
+ #include "dri.h"
++#include "extension_string.h"
+ 
+ #include "darwin.h"
+ #define GLAQUA_DEBUG_MSG(msg, args ...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", \
+@@ -111,6 +112,10 @@ typedef struct __GLXAquaDrawable __GLXAquaDrawable;
+  */
+ struct __GLXAquaScreen {
+     __GLXscreen base;
++
++    /* Supported GLX extensions */
++    unsigned char glx_enable_bits[__GLX_EXT_BYTES];
++
+     int index;
+     int num_vis;
+ };
+@@ -541,13 +546,33 @@ __glXAquaScreenProbe(ScreenPtr pScreen)
+ 
+     screen->base.GLXmajor = 1;
+     screen->base.GLXminor = 4;
+-    screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig "
+-                                        "GLX_SGIS_multisample "
+-                                        "GLX_ARB_multisample "
+-                                        "GLX_EXT_visual_info "
+-                                        "GLX_EXT_import_context ");
+ 
+-    /*We may be able to add more GLXextensions at a later time. */
++    memset(screen->glx_enable_bits, 0, __GLX_EXT_BYTES);
++
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_info");
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_rating");
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context");
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method");
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig");
++
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIS_multisample");
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_multisample");
++
++    //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context");
++    //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context_profile");
++
++    // Generate the GLX extensions string (overrides that set by __glXScreenInit())
++    {
++        unsigned int buffer_size =
++            __glXGetExtensionString(screen->glx_enable_bits, NULL);
++        if (buffer_size > 0) {
++            free(screen->base.GLXextensions);
++
++            screen->base.GLXextensions = xnfalloc(buffer_size);
++            __glXGetExtensionString(screen->glx_enable_bits,
++                                    screen->base.GLXextensions);
++        }
++    }
+ 
+     return &screen->base;
+ }
+-- 
+2.3.2 (Apple Git-55)
+
diff --git a/pkgs/servers/x11/xorg/darwin/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch b/pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
similarity index 54%
rename from pkgs/servers/x11/xorg/darwin/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
rename to pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
index 450801c6f2f..ed0518da5ce 100644
--- a/pkgs/servers/x11/xorg/darwin/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
+++ b/pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
@@ -1,7 +1,7 @@
-From d36a301fb3d0f2c7a3d81cbda3fd21d8d36038e5 Mon Sep 17 00:00:00 2001
+From 91971455ee46b1059de75260ef0d1a45170d8b65 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu@apple.com>
 Date: Fri, 13 Jan 2012 12:00:57 -0800
-Subject: [PATCH 5000/5004] sdksyms.sh: Use CPPFLAGS, not CFLAGS
+Subject: [PATCH 2/6] sdksyms.sh: Use CPPFLAGS, not CFLAGS
 
 CFLAGS can include flags which are not useful to the preprocessor
 or can even cause it to fail.  This fixes a build issue on darwin
@@ -10,31 +10,32 @@ when building for more than one architecture.
 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 Reviewed-by: Keith Packard <keithp@keithp.com>
 ---
- hw/xfree86/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ hw/xfree86/Makefile.am | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index c3899b5..4f48b85 100644
+index 27f2cc6..d898c43 100644
 --- a/hw/xfree86/Makefile.am
 +++ b/hw/xfree86/Makefile.am
-@@ -38,7 +38,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
+@@ -48,8 +48,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
  bin_PROGRAMS = Xorg
  nodist_Xorg_SOURCES = sdksyms.c
  
 -AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
-+AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
- INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
+-AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
++AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
  	-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
- 	-I$(srcdir)/dri -I$(srcdir)/dri2
-@@ -115,7 +115,7 @@ CLEANFILES = sdksyms.c sdksyms.dep
+ 	-I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
+ 
+@@ -135,7 +134,7 @@ CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh
  EXTRA_DIST += sdksyms.sh
  
  sdksyms.dep sdksyms.c: sdksyms.sh
--	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(INCLUDES)
-+	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS) $(INCLUDES)
+-	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
++	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS)
  
  SDKSYMS_DEP = sdksyms.dep
- include $(SDKSYMS_DEP)
+ -include $(SDKSYMS_DEP)
 -- 
-1.8.4.1
+2.3.2 (Apple Git-55)
 
diff --git a/pkgs/servers/x11/xorg/darwin/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch b/pkgs/servers/x11/xorg/darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
similarity index 90%
rename from pkgs/servers/x11/xorg/darwin/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
rename to pkgs/servers/x11/xorg/darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
index c9a5f7e0f5b..395853f940f 100644
--- a/pkgs/servers/x11/xorg/darwin/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
+++ b/pkgs/servers/x11/xorg/darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
@@ -1,8 +1,8 @@
-From 9ca14507a31338fad40d430445a4a4cb8106bc9b Mon Sep 17 00:00:00 2001
+From fa5c83fe9129c9cd9cde1420a32112ca2f17566c Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu@apple.com>
 Date: Fri, 30 Apr 2010 13:08:25 -0700
-Subject: [PATCH 5001/5004] Workaround the GC clipping problem in miPaintWindow
- and add some debugging output.
+Subject: [PATCH 3/6] Workaround the GC clipping problem in miPaintWindow and
+ add some debugging output.
 
 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 ---
@@ -10,10 +10,10 @@ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
  1 file changed, 94 insertions(+), 10 deletions(-)
 
 diff --git a/mi/miexpose.c b/mi/miexpose.c
-index 8b7c93f..3e972f7 100644
+index fc4dbc0..5e31b83 100644
 --- a/mi/miexpose.c
 +++ b/mi/miexpose.c
-@@ -489,7 +489,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
+@@ -408,7 +408,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
  void RootlessStartDrawing(WindowPtr pWin);
  void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
  Bool IsFramedWindow(WindowPtr pWin);
@@ -23,7 +23,7 @@ index 8b7c93f..3e972f7 100644
  
  void
  miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
-@@ -518,23 +519,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+@@ -437,23 +438,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
      Bool solid = TRUE;
      DrawablePtr drawable = &pWin->drawable;
  
@@ -70,7 +70,7 @@ index 8b7c93f..3e972f7 100644
          while (pWin->backgroundState == ParentRelative)
              pWin = pWin->parent;
  
-@@ -559,6 +574,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+@@ -478,6 +493,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
      else {
          PixmapPtr pixmap;
  
@@ -89,7 +89,7 @@ index 8b7c93f..3e972f7 100644
          tile_x_off = drawable->x;
          tile_y_off = drawable->y;
  
-@@ -567,6 +594,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+@@ -486,6 +513,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
              return;
          pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable);
          drawable = &pixmap->drawable;
@@ -102,7 +102,7 @@ index 8b7c93f..3e972f7 100644
  #ifdef COMPOSITE
          draw_x_off = pixmap->screen_x;
          draw_y_off = pixmap->screen_y;
-@@ -629,6 +662,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+@@ -548,6 +581,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
      ChangeGC(NullClient, pGC, gcmask, gcval);
      ValidateGC(drawable, pGC);
  
@@ -161,5 +161,5 @@ index 8b7c93f..3e972f7 100644
      pbox = RegionRects(prgn);
      for (i = numRects; --i >= 0; pbox++, prect++) {
 -- 
-1.8.4.1
+2.3.2 (Apple Git-55)
 
diff --git a/pkgs/servers/x11/xorg/darwin/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch b/pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
similarity index 95%
rename from pkgs/servers/x11/xorg/darwin/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch
rename to pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
index f70ddf9e6af..4027227bb53 100644
--- a/pkgs/servers/x11/xorg/darwin/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch
+++ b/pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
@@ -1,7 +1,7 @@
-From bd9fce8b74f5358e4d7e5ce9b5cdd8fd195bb3fd Mon Sep 17 00:00:00 2001
+From b229a04bde765424542eeba17a7e2bc25785a890 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 Date: Sat, 2 Nov 2013 11:00:23 -0700
-Subject: [PATCH 5004/5004] Use old miTrapezoids and miTriangles routines
+Subject: [PATCH 4/6] Use old miTrapezoids and miTriangles routines
 
 Reverts commits:
     788ccb9a8bcf6a4fb4054c507111eec3338fb969
@@ -19,11 +19,11 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
  5 files changed, 201 insertions(+), 4 deletions(-)
 
 diff --git a/fb/fbpict.c b/fb/fbpict.c
-index dc0ca3c..276ff06 100644
+index c8378ad..cafb027 100644
 --- a/fb/fbpict.c
 +++ b/fb/fbpict.c
-@@ -326,10 +326,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
-     ps->Glyphs = miGlyphs;
+@@ -499,10 +499,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
+     ps->UnrealizeGlyph = fbUnrealizeGlyph;
      ps->CompositeRects = miCompositeRects;
      ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
 -    ps->Trapezoids = fbTrapezoids;
@@ -34,10 +34,10 @@ index dc0ca3c..276ff06 100644
      return TRUE;
  }
 diff --git a/render/mipict.c b/render/mipict.c
-index 2e64b20..d21b58a 100644
+index a725104..e14293a 100644
 --- a/render/mipict.c
 +++ b/render/mipict.c
-@@ -595,8 +595,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
+@@ -575,8 +575,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
      ps->Composite = 0;          /* requires DDX support */
      ps->Glyphs = miGlyphs;
      ps->CompositeRects = miCompositeRects;
@@ -49,7 +49,7 @@ index 2e64b20..d21b58a 100644
      ps->RasterizeTrapezoid = 0; /* requires DDX support */
      ps->AddTraps = 0;           /* requires DDX support */
 diff --git a/render/mipict.h b/render/mipict.h
-index 9436228..7ee2991 100644
+index 23ce9e8..e0f1d4c 100644
 --- a/render/mipict.h
 +++ b/render/mipict.h
 @@ -122,6 +122,16 @@ miCompositeRects(CARD8 op,
@@ -293,5 +293,5 @@ index 922f22a..bdca9ca 100644
 +}
 +
 -- 
-1.8.4.1
+2.3.2 (Apple Git-55)
 
diff --git a/pkgs/servers/x11/xorg/darwin/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch b/pkgs/servers/x11/xorg/darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch
similarity index 94%
rename from pkgs/servers/x11/xorg/darwin/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch
rename to pkgs/servers/x11/xorg/darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch
index 9f99ab60335..b9d4b18cf82 100644
--- a/pkgs/servers/x11/xorg/darwin/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch
+++ b/pkgs/servers/x11/xorg/darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch
@@ -1,7 +1,7 @@
-From 07f9e0beaf66ec9de1455a305c87ab642968f3f1 Mon Sep 17 00:00:00 2001
+From a635e397d5830f7f60e3690a1bb36f7a725b915a Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu@apple.com>
 Date: Fri, 12 Feb 2010 19:48:52 -0800
-Subject: [PATCH 5002/5004] fb: Revert fb changes that broke XQuartz
+Subject: [PATCH 5/6] fb: Revert fb changes that broke XQuartz
 
 http://bugs.freedesktop.org/show_bug.cgi?id=26124
 
@@ -21,10 +21,10 @@ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
  3 files changed, 43 insertions(+), 85 deletions(-)
 
 diff --git a/fb/fb.h b/fb/fb.h
-index b869d12..895b148 100644
+index ab110f3..59eaac3 100644
 --- a/fb/fb.h
 +++ b/fb/fb.h
-@@ -1686,8 +1686,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
+@@ -1326,8 +1326,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
                    RegionPtr pRegion, FbBits and, FbBits xor);
  
  extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict,
@@ -35,7 +35,7 @@ index b869d12..895b148 100644
  extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *);
  
 diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 2804ff4..80c2a91 100644
+index cafb027..6ee63e9 100644
 --- a/fb/fbpict.c
 +++ b/fb/fbpict.c
 @@ -46,23 +46,18 @@ fbComposite(CARD8 op,
@@ -67,7 +67,7 @@ index 2804ff4..80c2a91 100644
      }
  
      free_pixman_pict(pSrc, src);
-@@ -293,20 +288,22 @@ create_conical_gradient_image(PictGradient * gradient)
+@@ -289,20 +284,22 @@ create_conical_gradient_image(PictGradient * gradient)
  }
  
  static pixman_image_t *
@@ -97,8 +97,8 @@ index 2804ff4..80c2a91 100644
                                       stride * sizeof(FbStride));
  
      if (!image)
-@@ -333,57 +330,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
-         if (pict->clientClipType != CT_NONE)
+@@ -321,57 +318,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+         if (pict->clientClip)
              pixman_image_set_has_client_clip(image, TRUE);
  
 -        if (*xoff || *yoff)
@@ -159,7 +159,7 @@ index 2804ff4..80c2a91 100644
      }
  
      switch (pict->repeatType) {
-@@ -411,10 +382,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
+@@ -399,10 +370,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
       * as the alpha map for this operation
       */
      if (pict->alphaMap && !is_alpha_map) {
@@ -171,7 +171,7 @@ index 2804ff4..80c2a91 100644
  
          pixman_image_set_alpha_map(image, alpha_map, pict->alphaOrigin.x,
                                     pict->alphaOrigin.y);
-@@ -448,8 +417,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
+@@ -436,8 +405,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
  }
  
  static pixman_image_t *
@@ -181,7 +181,7 @@ index 2804ff4..80c2a91 100644
  {
      pixman_image_t *image = NULL;
  
-@@ -457,7 +425,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
+@@ -445,7 +413,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
          return NULL;
  
      if (pict->pDrawable) {
@@ -190,7 +190,7 @@ index 2804ff4..80c2a91 100644
      }
      else if (pict->pSourcePict) {
          SourcePict *sp = pict->pSourcePict;
-@@ -475,19 +443,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
+@@ -463,19 +431,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
              else if (sp->type == SourcePictTypeConical)
                  image = create_conical_gradient_image(gradient);
          }
@@ -312,5 +312,5 @@ index bf82f8f..0145ce9 100644
  
          DamageRegionProcessPending(pDst->pDrawable);
 -- 
-1.8.4.1
+2.3.2 (Apple Git-55)
 
diff --git a/pkgs/servers/x11/xorg/darwin/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch b/pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
similarity index 73%
rename from pkgs/servers/x11/xorg/darwin/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch
rename to pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
index 0ff989258fb..03d4decdb1c 100644
--- a/pkgs/servers/x11/xorg/darwin/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch
+++ b/pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
@@ -1,38 +1,29 @@
-From 4a0444a2773bddc3abbf5305a344001ecfe9378c Mon Sep 17 00:00:00 2001
+From 4c7572abafeac9b2dcd884c444c5a5bae5b302c3 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 18 Dec 2012 01:03:38 -0800
-Subject: [PATCH 5003/5004] fb: Revert fb changes that broke XQuartz
+Date: Sat, 31 May 2014 13:14:20 -0700
+Subject: [PATCH 6/6] fb: Revert fb changes that broke XQuartz
 
     http://bugs.freedesktop.org/show_bug.cgi?id=26124
 
 Revert "Use new pixman_glyph_cache_t API that will be in pixman 0.28.0"
+Revert "fb: Fix origin of source picture in fbGlyphs"
+Revert "fb: Publish fbGlyphs and fbUnrealizeGlyph"
 
 This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366.
+This reverts commit 983e30361f49a67252d0b5d82630e70724d69dbf.
+This reverts commit 3c2c59eed3c68c0e5a93c38cf01eedad015e3157.
 ---
- configure.ac  |   2 +-
  fb/fb.h       |   3 --
- fb/fbpict.c   | 153 +---------------------------------------------------------
+ fb/fbpict.c   | 149 +---------------------------------------------------------
+ fb/fbpict.h   |  11 +----
  fb/fbscreen.c |   1 -
- 4 files changed, 2 insertions(+), 157 deletions(-)
+ 4 files changed, 2 insertions(+), 162 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index 8797df5..99a1e62 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -811,7 +811,7 @@ LIBPCIACCESS="pciaccess >= 0.12.901"
- LIBUDEV="libudev >= 143"
- LIBSELINUX="libselinux >= 2.0.86"
- LIBDBUS="dbus-1 >= 1.0"
--LIBPIXMAN="pixman-1 >= 0.27.2"
-+LIBPIXMAN="pixman-1 >= 0.21.8"
- 
- dnl Pixman is always required, but we separate it out so we can link
- dnl specific modules against it
 diff --git a/fb/fb.h b/fb/fb.h
-index 895b148..cc5759c 100644
+index 59eaac3..046b948 100644
 --- a/fb/fb.h
 +++ b/fb/fb.h
-@@ -1344,9 +1344,6 @@ extern _X_EXPORT void
+@@ -1116,9 +1116,6 @@ extern _X_EXPORT void
  extern _X_EXPORT Bool
   fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
  
@@ -43,10 +34,10 @@ index 895b148..cc5759c 100644
   * fbpixmap.c
   */
 diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 80c2a91..dc0ca3c 100644
+index 6ee63e9..9c4cc42 100644
 --- a/fb/fbpict.c
 +++ b/fb/fbpict.c
-@@ -65,156 +65,6 @@ fbComposite(CARD8 op,
+@@ -65,152 +65,6 @@ fbComposite(CARD8 op,
      free_pixman_pict(pDst, dest);
  }
  
@@ -70,7 +61,7 @@ index 80c2a91..dc0ca3c 100644
 -	pixman_glyph_cache_remove (glyphCache, pGlyph, NULL);
 -}
 -
--static void
+-void
 -fbGlyphs(CARD8 op,
 -	 PicturePtr pSrc,
 -	 PicturePtr pDst,
@@ -93,7 +84,7 @@ index 80c2a91..dc0ca3c 100644
 -    int xDst = list->xOff, yDst = list->yOff;
 -
 -    miCompositeSourceValidate(pSrc);
--    
+-
 -    n_glyphs = 0;
 -    for (i = 0; i < nlist; ++i)
 -	n_glyphs += list[i].len;
@@ -102,12 +93,12 @@ index 80c2a91..dc0ca3c 100644
 -	glyphCache = pixman_glyph_cache_create();
 -
 -    pixman_glyph_cache_freeze (glyphCache);
--    
+-
 -    if (n_glyphs > N_STACK_GLYPHS) {
 -	if (!(pglyphs = malloc (n_glyphs * sizeof (pixman_glyph_t))))
 -	    goto out;
 -    }
--    
+-
 -    i = 0;
 -    x = y = 0;
 -    while (nlist--) {
@@ -165,19 +156,15 @@ index 80c2a91..dc0ca3c 100644
 -    if (maskFormat) {
 -	pixman_format_code_t format;
 -	pixman_box32_t extents;
--	int x, y;
 -
 -	format = maskFormat->format | (maskFormat->depth << 24);
 -
 -	pixman_glyph_get_extents(glyphCache, n_glyphs, pglyphs, &extents);
 -
--	x = extents.x1;
--	y = extents.y1;
--
 -	pixman_composite_glyphs(op, srcImage, dstImage, format,
--				xSrc + srcXoff + xDst, ySrc + srcYoff + yDst,
--				x, y,
--				x + dstXoff, y + dstYoff,
+-				xSrc + srcXoff + extents.x1 - xDst, ySrc + srcYoff + extents.y1 - yDst,
+-				extents.x1, extents.y1,
+-				extents.x1 + dstXoff, extents.y1 + dstYoff,
 -				extents.x2 - extents.x1,
 -				extents.y2 - extents.y1,
 -				glyphCache, n_glyphs, pglyphs);
@@ -203,7 +190,7 @@ index 80c2a91..dc0ca3c 100644
  static pixman_image_t *
  create_solid_fill_image(PicturePtr pict)
  {
-@@ -473,8 +323,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
+@@ -461,8 +315,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
          return FALSE;
      ps = GetPictureScreen(pScreen);
      ps->Composite = fbComposite;
@@ -212,9 +199,35 @@ index 80c2a91..dc0ca3c 100644
 +    ps->Glyphs = miGlyphs;
      ps->CompositeRects = miCompositeRects;
      ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
-     ps->Trapezoids = fbTrapezoids;
+     ps->AddTraps = fbAddTraps;
+diff --git a/fb/fbpict.h b/fb/fbpict.h
+index 5cb8663..110f32d 100644
+--- a/fb/fbpict.h
++++ b/fb/fbpict.h
+@@ -65,20 +65,11 @@ fbTrapezoids(CARD8 op,
+              INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps);
+ 
+ extern _X_EXPORT void
++
+ fbTriangles(CARD8 op,
+             PicturePtr pSrc,
+             PicturePtr pDst,
+             PictFormatPtr maskFormat,
+             INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris);
+ 
+-extern _X_EXPORT void
+-fbGlyphs(CARD8 op,
+-	 PicturePtr pSrc,
+-	 PicturePtr pDst,
+-	 PictFormatPtr maskFormat,
+-	 INT16 xSrc,
+-	 INT16 ySrc, int nlist,
+-	 GlyphListPtr list,
+-	 GlyphPtr *glyphs);
+-
+ #endif                          /* _FBPICT_H_ */
 diff --git a/fb/fbscreen.c b/fb/fbscreen.c
-index f9080a4..7c7d656 100644
+index 71bcc5d..55330fc 100644
 --- a/fb/fbscreen.c
 +++ b/fb/fbscreen.c
 @@ -32,7 +32,6 @@ fbCloseScreen(ScreenPtr pScreen)
@@ -226,5 +239,5 @@ index f9080a4..7c7d656 100644
          free(depths[d].vids);
      free(depths);
 -- 
-1.8.4.1
+2.3.2 (Apple Git-55)
 
diff --git a/pkgs/servers/x11/xorg/fix-clang.patch b/pkgs/servers/x11/xorg/fix-clang.patch
deleted file mode 100644
index 6b51ebfe3d3..00000000000
--- a/pkgs/servers/x11/xorg/fix-clang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xorgserver/hw/xfree86/common/compiler.h	2014-10-29 23:43:33.000000000 -0700
-+++ xorgserver/hw/xfree86/common/compiler.h.new	2014-10-29 23:47:30.000000000 -0700
-@@ -1352,7 +1352,7 @@
- 
- #if !defined(__SUNPRO_C)
- #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
--#ifdef GCCUSESGAS
-+#if defined(GCCUSESGAS) || defined(__clang__)
- 
- /*
-  * If gcc uses gas rather than the native assembler, the syntax of these
diff --git a/pkgs/servers/x11/xorg/libpciaccess-apple.patch b/pkgs/servers/x11/xorg/libpciaccess-apple.patch
deleted file mode 100644
index a005c03cbbe..00000000000
--- a/pkgs/servers/x11/xorg/libpciaccess-apple.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur libpciaccess-0.12.1-orig/src/common_interface.c libpciaccess-0.12.1/src/common_interface.c
---- libpciaccess-0.12.1-orig/src/common_interface.c	2010-07-12 00:32:05.000000000 -0400
-+++ libpciaccess-0.12.1/src/common_interface.c	2011-08-29 00:48:17.000000000 -0400
-@@ -67,6 +67,22 @@
- # define HTOLE_32(x)   (x)
- #endif /* Solaris */
- 
-+#elif defined(__APPLE__)
-+
-+#include <architecture/byte_order.h>
-+
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+# define LETOH_16(x)   OSSwapInt16(x)
-+# define HTOLE_16(x)   OSSwapInt16(x)
-+# define LETOH_32(x)   OSSwapInt32(x)
-+# define HTOLE_32(x)   OSSwapInt32(x)
-+#else
-+# define LETOH_16(x)   (x)
-+# define HTOLE_16(x)   (x)
-+# define LETOH_32(x)   (x)
-+# define HTOLE_32(x)   (x)
-+#endif /* darwin */
-+
- #else
- 
- #include <sys/endian.h>
diff --git a/pkgs/servers/x11/xorg/libxkbfile-clang36.patch b/pkgs/servers/x11/xorg/libxkbfile-clang36.patch
deleted file mode 100644
index 65bf2ea7437..00000000000
--- a/pkgs/servers/x11/xorg/libxkbfile-clang36.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxkbfile-1.0.8/src/cout.c	2012-03-07 20:37:23.000000000 -0800
-+++ libxkbfile-1.0.8/src/cout.c	2015-03-24 20:51:11.000000000 -0700
-@@ -45,7 +45,7 @@
- {
- register int i,nOut;
- 
--    if ((!xkb)||(!xkb->names)||(!xkb->names->vmods))
-+    if ((!xkb)||(!xkb->names))
- 	return False;
-     for (i=nOut=0;i<XkbNumVirtualMods;i++) {
- 	if (xkb->names->vmods[i]!=None) {
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index afd864eafac..71185643a9e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -80,14 +80,6 @@ in
     nativeBuildInputs = [ args.python ];
   };
 
-  libxkbfile = attrs: attrs // {
-    patches = lib.optional stdenv.cc.isClang ./libxkbfile-clang36.patch;
-  };
-
-  libpciaccess = attrs : attrs // {
-    patches = [ ./libpciaccess-apple.patch ];
-  };
-
   libX11 = attrs: attrs // {
     preConfigure = setMalloc0ReturnsNullCrossCompiling + ''
       sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
@@ -287,15 +279,13 @@ in
         dmxproto /*libdmx not used*/ xf86vidmodeproto
         recordproto libXext pixman libXfont
         damageproto xcmiscproto  bigreqsproto
-        libpciaccess inputproto xextproto randrproto renderproto presentproto
+        inputproto xextproto randrproto renderproto presentproto
         dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
       ];
-      commonPatches = [ ./xorgserver-xkbcomp-path.patch ]
-                   ++ lib.optional isDarwin ./fix-clang.patch;
+      commonPatches = [ ./xorgserver-xkbcomp-path.patch ];
       # XQuartz requires two compilations: the first to get X / XQuartz,
       # and the second to get Xvfb, Xnest, etc.
       darwinOtherX = overrideDerivation xorgserver (oldAttrs: {
-        stdenv = args.stdenv;
         configureFlags = oldAttrs.configureFlags ++ [
           "--disable-xquartz"
           "--enable-xorg"
@@ -309,7 +299,7 @@ in
       if (!isDarwin)
       then {
         buildInputs = [ makeWrapper ] ++ commonBuildInputs;
-        propagatedBuildInputs = commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
+        propagatedBuildInputs = [ libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
           args.udev
         ];
         patches = commonPatches;
@@ -329,23 +319,19 @@ in
         '';
         passthru.version = version; # needed by virtualbox guest additions
       } else {
-        stdenv = args.clangStdenv;
-        name = "xorg-server-1.14.6";
-        src = args.fetchurl {
-          url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2;
-          sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8";
-        };
-        buildInputs = commonBuildInputs ++ [ args.bootstrap_cmds ];
+        buildInputs = commonBuildInputs ++ [ args.bootstrap_cmds args.automake args.autoconf ];
         propagatedBuildInputs = commonPropagatedBuildInputs ++ [
           libAppleWM applewmproto
         ];
+        # Patches can be pulled from the server-*-apple branches of:
+        # http://cgit.freedesktop.org/~jeremyhu/xserver/
         patches = commonPatches ++ [
-          ./darwin/0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch
-          ./darwin/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
-          ./darwin/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
-          ./darwin/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch
-          ./darwin/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch
-          ./darwin/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch
+          ./darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch
+          ./darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
+          ./darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
+          ./darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
+          ./darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch
+          ./darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
           ./darwin/private-extern.patch
           ./darwin/bundle_main.patch
           ./darwin/stub.patch

From ebe412e8f7ad8de74320371fc42e255df2e509b2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Aug 2015 23:57:25 +0200
Subject: [PATCH 0751/2016] ghc: update 7.10.2 to release version

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

diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index df951271a31..f71cd922c10 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -16,12 +16,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "7.10.1.20150630";
+  version = "7.10.2";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/7.10.2-rc2/${name}-src.tar.xz";
-    sha256 = "1wxf7jkkgpvvrg3q311c4rca4vsxrqrmnrqg4j4klgj445yj82gb";
+    url = "https://downloads.haskell.org/~ghc/7.10.2/${name}-src.tar.xz";
+    sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal";
   };
 
   buildInputs = [ ghc perl ];

From 531e93eaf49229c19a83ee6ceda83b31e7575d11 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 5 Aug 2015 21:00:05 +0200
Subject: [PATCH 0752/2016] vpnc: 0.5.3 -> svn-rev-550

also, change default local port from 500 to random to avoid
clashes with other IPSec services like, e.g., strongSwan
---
 pkgs/tools/networking/vpnc/default.nix       | 31 ++++++++++++++------
 pkgs/tools/networking/vpnc/vpnc-script.patch | 12 --------
 2 files changed, 22 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/tools/networking/vpnc/vpnc-script.patch

diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index 1386f7133e5..bde93dfdd48 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -1,30 +1,43 @@
-{ stdenv, fetchurl, nettools, libgcrypt, perl, gawk, makeWrapper }:
+{ stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "vpnc-0.5.3";
-  src = fetchurl {
-    url = "http://www.unix-ag.uni-kl.de/~massar/vpnc/${name}.tar.gz";
-    sha256 = "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6";
+  name = "vpnc-rev550";
+  src = fetchsvn {
+    url = "http://svn.unix-ag.uni-kl.de/vpnc";
+    rev = "550";
+    sha256 = "0x4ckfv9lpykwmh28v1kyzz91y1j2v48fi8q5nsawrba4q0wlrls";
   };
 
-  patches = [ ./makefile.patch ./vpnc-script.patch ];
+  postUnpack = ''
+    mv $sourceRoot/trunk/* $sourceRoot/.
+    rm -r $sourceRoot/{trunk,branches,tags}
+  '';
+
+  patches = [ ./makefile.patch ];
 
   # The `etc/vpnc/vpnc-script' script relies on `which' and on
   # `ifconfig' as found in net-tools (not GNU Inetutils).
   propagatedBuildInputs = [ nettools ];
 
-  buildInputs = [libgcrypt perl makeWrapper];
+  buildInputs = [libgcrypt perl makeWrapper openssl ];
 
   preConfigure = ''
-    substituteInPlace "vpnc-script.in" \
+    sed -i 's|^#OPENSSL|OPENSSL|g' Makefile
+
+    substituteInPlace "vpnc-script" \
       --replace "which" "type -P" \
-      --replace "awk" "${gawk}/bin/awk"
+      --replace "awk" "${gawk}/bin/awk" \
+      --replace "/sbin/resolvconf" "${openresolv}/bin/resolvconf"
 
     substituteInPlace "config.c" \
       --replace "/etc/vpnc/vpnc-script" "$out/etc/vpnc/vpnc-script"
 
     substituteInPlace "pcf2vpnc" \
       --replace "/usr/bin/perl" "${perl}/bin/perl"
+
+    # use random local port by default to reduce clashes with
+    # other IPSec services like, e.g., strongSwan
+    echo "Local Port 0" >> vpnc.conf
   '';
 
   postInstall = ''
diff --git a/pkgs/tools/networking/vpnc/vpnc-script.patch b/pkgs/tools/networking/vpnc/vpnc-script.patch
deleted file mode 100644
index 67a86d5d58f..00000000000
--- a/pkgs/tools/networking/vpnc/vpnc-script.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ubr vpnc-0.5.3-orig/vpnc-script.in vpnc-0.5.3/vpnc-script.in
---- vpnc-0.5.3-orig/vpnc-script.in	2012-02-29 23:03:35.289636602 +0100
-+++ vpnc-0.5.3/vpnc-script.in	2012-02-29 23:03:59.597307445 +0100
-@@ -116,7 +116,7 @@
- 
- if [ -n "$IPROUTE" ]; then
- 	fix_ip_get_output () {
--		sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g'
-+		sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid 0x....//g'
- 	}
- 
- 	set_vpngateway_route() {

From 66d8f03aa43fb8979d3361019ef1f13f9ed8ac75 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Jul 2015 21:24:32 +0200
Subject: [PATCH 0753/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/88d2b472d2e9b251731ae64fc582e874e27ae9e1
 with hackage2nix revision 012eb638a5db2ba7cf2c94e4375ea5cc05aefde0

---
 .../haskell-modules/hackage-packages.nix      | 2419 +++++++++++------
 1 file changed, 1616 insertions(+), 803 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ba7bc517aa7..b6a18d7653c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -50,6 +50,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "AAI" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "AAI";
+       version = "0.2.0.1";
+       sha256 = "0vdq0hscpbl5a9bpf8fiykmyg2c3yvivb0mzcdy99ha0j1p4rwfh";
+       buildDepends = [ base ];
+       description = "Abstract Application Interface";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ABList" = callPackage
     ({ mkDerivation, base, HUnit, linear, newtype, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -665,7 +676,9 @@ self: {
      mkDerivation {
        pname = "Agda";
        version = "2.4.2.3";
+       revision = "1";
        sha256 = "09vvipvab6bys8g7cdka1iirs0wc0jzcyynncccgb614wd2yyvdw";
+       editedCabalFile = "25fe17a2302a30f23a57bedf6bc66a8966f4d5f6b10353e2502e18ba98f80eeb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -676,7 +689,6 @@ self: {
          transformers-compat unordered-containers xhtml zlib
        ];
        buildTools = [ alex cpphs emacs happy ];
-       jailbreak = true;
        postInstall = ''
          $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)
          $out/bin/agda-mode compile
@@ -754,8 +766,8 @@ self: {
      }:
      mkDerivation {
        pname = "Allure";
-       version = "0.4.101.1";
-       sha256 = "1wla31n3jiynjb2fk22shq46g365x6il270jqpy234vjz308sdvw";
+       version = "0.5.0.0";
+       sha256 = "0lmkfa6wk0hqin43lf6ll3227c4h7qvya7s6k6sfz8syy51ggqx7";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -2331,13 +2343,12 @@ self: {
      }:
      mkDerivation {
        pname = "Chart";
-       version = "1.5";
-       sha256 = "1h40322g9nj8hlya6iw9dgvvgzbq816v36vm2vz0lii586j0nqyx";
+       version = "1.5.1";
+       sha256 = "0jm1wr2nb1r8rxqc564nmnclns160y7girc7j2ihvyhm0v34p59g";
        buildDepends = [
          array base colour data-default-class lens mtl old-locale
          operational time vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "A library for generating 2D Charts and Plots";
        license = stdenv.lib.licenses.bsd3;
@@ -2349,13 +2360,12 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-cairo";
-       version = "1.5";
-       sha256 = "19p4fg12r91jhhifwlda6rqm2bm0x6bz2fv3dqr2ni1y3cz7v56c";
+       version = "1.5.1";
+       sha256 = "1fwjgms76z2spgfw3kfmzivkgp6gdkx24mp5nb562kza4y6yjz7f";
        buildDepends = [
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
        ];
-       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Cairo backend for Charts";
        license = stdenv.lib.licenses.bsd3;
@@ -2369,15 +2379,14 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-diagrams";
-       version = "1.5";
-       sha256 = "1i6l6gvy4vlw98b2r5wr5c7dzp01jwca6c5y0pgq663fnp1pwjph";
+       version = "1.5.1";
+       sha256 = "1slsq9p9mq9jxlyhpd90bh32s6fqvy149p4cb7ckygzd77r1aqxz";
        buildDepends = [
          base blaze-markup bytestring Chart colour containers
          data-default-class diagrams-core diagrams-lib diagrams-postscript
          diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts
          text time
        ];
-       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Diagrams backend for Charts";
        license = stdenv.lib.licenses.bsd3;
@@ -2390,8 +2399,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-gtk";
-       version = "1.5";
-       sha256 = "1iwr31ri4f24yxnmg101y30sg3a03nrmp5nr2id2r471c0f4x2gy";
+       version = "1.5.1";
+       sha256 = "025snbbsnd2gsldw2j8r3vxh94jrv57h8z4qvkq3dwyh2mvq21lw";
        buildDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
@@ -3543,7 +3552,9 @@ self: {
      mkDerivation {
        pname = "Diff";
        version = "0.3.2";
+       revision = "1";
        sha256 = "13iqqmpadcm7fvqwbfrz94w030rvjh66w2bdls1253128ac2n0vz";
+       editedCabalFile = "86ab9f6bcb253cabff2673437995faa4c130be7c3898df778b27a801c5361328";
        buildDepends = [ array base pretty ];
        description = "O(ND) diff algorithm in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -3699,11 +3710,10 @@ self: {
     ({ mkDerivation, base, containers, MonadRandom }:
      mkDerivation {
        pname = "Dist";
-       version = "0.2.0.0";
-       sha256 = "0w9n123rngl85qsgwm0dgqnc0v8zn9lsi2v0n4hfxdvxlhcjr3ir";
+       version = "0.3.0.0";
+       sha256 = "00h0cxlxk72k829w8cf2gi2y4v4qj9bdzdmvnphnvc9wz5pyiz26";
        buildDepends = [ base containers MonadRandom ];
        testDepends = [ base containers MonadRandom ];
-       jailbreak = true;
        homepage = "https://github.com/wyager/Dist";
        description = "A Haskell library for probability distributions";
        license = stdenv.lib.licenses.mit;
@@ -4047,8 +4057,8 @@ self: {
      }:
      mkDerivation {
        pname = "Ebnf2ps";
-       version = "1.0.13";
-       sha256 = "1ymfj2n23n1j37p5nw8xwhfccx4xc6wyf3372dr9gxv232jk8znz";
+       version = "1.0.14";
+       sha256 = "0dv7lbw3nb3wyrrq8q4wd26i445ylwiixhhzdl574sw58mw60rk3";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ array base containers directory old-time unix ];
@@ -4976,8 +4986,8 @@ self: {
      }:
      mkDerivation {
        pname = "Frames";
-       version = "0.1.2";
-       sha256 = "11444jhck56y2iclgn1daj087qpi99pznk3w82vhbya3pdvrkjac";
+       version = "0.1.2.1";
+       sha256 = "0vw1fh0nqk3s5p08j4cnwb95jgzxk140wvszjlmr3ms9m0xcx61y";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -5473,6 +5483,21 @@ self: {
        license = "GPL";
      }) {};
 
+  "GeneralTicTacToe" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "GeneralTicTacToe";
+       version = "0.1.0.1";
+       sha256 = "0dng5shk5zs4j6lyjz971axrqziv6davpcyv509mz8fvdjn8q4kg";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base ];
+       jailbreak = true;
+       homepage = "http://afonso.xyz";
+       description = "A general TicTacToe game implementation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "GenericPretty" = callPackage
     ({ mkDerivation, base, ghc-prim, pretty }:
      mkDerivation {
@@ -6824,8 +6849,8 @@ self: {
      }:
      mkDerivation {
        pname = "HList";
-       version = "0.4.0.0";
-       sha256 = "0f6d97vfxlml4dp6zfk95kk4la8xr5m91hiw4zj98kvwvvhb99mz";
+       version = "0.4.1.0";
+       sha256 = "0vbfq2jfdm3dn059flyzxrlhcw7hkni75fpi2gqcl5s6ha95ak10";
        buildDepends = [
          array base ghc-prim mtl profunctors tagged template-haskell
        ];
@@ -8357,14 +8382,12 @@ self: {
     ({ mkDerivation, base, doctest, hspec, parsec }:
      mkDerivation {
        pname = "HostAndPort";
-       version = "0.1.0";
-       revision = "1";
-       sha256 = "0rykpzp3vvc81ra917vicwsh8x1mr1ykw9a597ks959nmjy06mz8";
-       editedCabalFile = "5ad1783e80502877a1de17cb92308dd9e0cc003a1302c5d4c09103b1c98bd627";
+       version = "0.2.0";
+       sha256 = "1rjv6c7j6fdy6gnn1zr5jnfmiqiamsmjfw9h3bx119giw3sjb9hm";
        buildDepends = [ base parsec ];
        testDepends = [ base doctest hspec ];
        homepage = "https://github.com/bacher09/hostandport";
-       description = "Parser host and port pairs like localhost:22";
+       description = "Parser for host and port pairs like localhost:22";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -9074,8 +9097,8 @@ self: {
      }:
      mkDerivation {
        pname = "JuicyPixels";
-       version = "3.2.5.2";
-       sha256 = "07fyn0ns3g66aqpa1jg1v694yvf5idf7cknrkh30hs312lwm1sjl";
+       version = "3.2.5.3";
+       sha256 = "1knq5jbwggf59h8a6aa758387q71fpzcvssg8dsr84bqwqqg2dpw";
        buildDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -9438,8 +9461,8 @@ self: {
      }:
      mkDerivation {
        pname = "LambdaHack";
-       version = "0.4.101.1";
-       sha256 = "065j2zyqi4adh3f01jywxqvsl45i69ky2y0bavkkpzz2klspg6zw";
+       version = "0.5.0.0";
+       sha256 = "0vzra6020jmir6pqs26fnw2pgap7l10160v5admk7wnrrnfr91r5";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -10293,8 +10316,8 @@ self: {
      }:
      mkDerivation {
        pname = "MoeDict";
-       version = "0.0.2";
-       sha256 = "06dhk0n1v1axj0qbx29n2g9p0nw24ix5ij2vq5nfs7jbrb9m7r0n";
+       version = "0.0.3";
+       sha256 = "0sf7qhw3z984mnprgq2jxqsx9z5v2q36hdb84fdn34rgjzrv3z9a";
        buildDepends = [
          aeson base bytestring containers text unordered-containers
        ];
@@ -10366,18 +10389,18 @@ self: {
      }) {};
 
   "MonadCompose" = callPackage
-    ({ mkDerivation, base, data-default, ghc-prim, MaybeT, mmorph
-     , monad-products, mtl, random, transformers
+    ({ mkDerivation, base, data-default, ghc-prim, mmorph, monad-loops
+     , monad-products, mtl, parallel, random, transformers
+     , transformers-compat
      }:
      mkDerivation {
        pname = "MonadCompose";
-       version = "0.8.2.0";
-       sha256 = "1nzb4x8az1m4d5i75cshgjfr4xnkfi3s27rq6jkib9i67my0hsrq";
+       version = "0.8.3.1";
+       sha256 = "0njvbz2cwc3339h87wxhl5kzb2v1ny5skqvhrsdzp95f1k8chnxa";
        buildDepends = [
-         base data-default ghc-prim MaybeT mmorph monad-products mtl random
-         transformers
+         base data-default ghc-prim mmorph monad-loops monad-products mtl
+         parallel random transformers transformers-compat
        ];
-       jailbreak = true;
        homepage = "http://alkalisoftware.net";
        description = "Methods for composing monads";
        license = stdenv.lib.licenses.bsd3;
@@ -10663,6 +10686,21 @@ self: {
        license = "LGPL";
      }) {};
 
+  "MyPrimes" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "MyPrimes";
+       version = "0.1.0.0";
+       sha256 = "1bwq0fwhkw4i2kjx9xbdfn0y86j9s78kyrw9vlxq7zmv4pddazly";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base containers ];
+       jailbreak = true;
+       homepage = "http://afonso.xyz";
+       description = "Generate all primes";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "NGrams" = callPackage
     ({ mkDerivation, base, HCL, HTTP, network, regex-compat }:
      mkDerivation {
@@ -10794,15 +10832,14 @@ self: {
      }:
      mkDerivation {
        pname = "Neks";
-       version = "0.4.0.0";
-       sha256 = "0xi5d9wvk2xzsn500d61b6mmvwd36fs2n92l5qy4hzhww5lmkrrb";
+       version = "0.5.0.0";
+       sha256 = "083hkcgmrk42pyjm1xz1amdjpmccw0c72axmkk163ar6ir7aznc8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring cereal containers directory hashable messagepack
          network stm vector
        ];
-       jailbreak = true;
        description = "Simple networked key/value store";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -11583,6 +11620,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "OrchestrateDB" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, HTTP, http-conduit
+     , http-types, lifted-base, random
+     }:
+     mkDerivation {
+       pname = "OrchestrateDB";
+       version = "1.0.0.3";
+       sha256 = "0d12jbdgpfkzax5c8djab6n611hcwi1bkphwmn5qmny43fb3wsaz";
+       buildDepends = [
+         aeson base bytestring HTTP http-conduit http-types lifted-base
+       ];
+       testDepends = [
+         aeson base bytestring HTTP http-conduit http-types lifted-base
+         random
+       ];
+       homepage = "https://github.com/dwd31415/Haskell-OrchestrateDB";
+       description = "Unofficial Haskell Client Library for the Orchestrate.io API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "OrderedBits" = callPackage
     ({ mkDerivation, base, bits, primitive, QuickCheck, test-framework
      , test-framework-quickcheck2, test-framework-th, vector
@@ -11948,6 +12005,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Phsu" = callPackage
+    ({ mkDerivation, acid-state, aeson, base, blaze-html, blaze-markup
+     , containers, curl, filepath, friendly-time, happstack-server
+     , happstack-server-tls, lifted-base, MissingH, monad-control, mtl
+     , network, network-uri, old-locale, process, regex-base, regex-pcre
+     , safecopy, string-conversions, temporary, text, time
+     }:
+     mkDerivation {
+       pname = "Phsu";
+       version = "0.1.0.3";
+       sha256 = "12f6hqgxyf3svr53g0irn15q69wp9py1bxfw3a5inpkqzmrs04x9";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         acid-state aeson base blaze-html blaze-markup containers curl
+         filepath friendly-time happstack-server happstack-server-tls
+         lifted-base MissingH monad-control mtl network network-uri
+         old-locale process regex-base regex-pcre safecopy
+         string-conversions temporary text time
+       ];
+       jailbreak = true;
+       homepage = "localhost:9119";
+       description = "Personal Happstack Server Utils";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "Pipe" = callPackage
     ({ mkDerivation, base, filepath, process, unix }:
      mkDerivation {
@@ -14041,19 +14124,20 @@ self: {
   "Spock" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , case-insensitive, containers, directory, hashable, hspec
-     , hspec-wai, http-types, list-t, monad-control, mtl, old-locale
-     , path-pieces, random, reroute, resource-pool, resourcet, stm
-     , stm-containers, text, time, transformers, transformers-base
-     , unordered-containers, vault, wai, wai-extra, warp
+     , hspec-wai, http-types, hvect, list-t, monad-control, mtl
+     , old-locale, path-pieces, random, reroute, resource-pool
+     , resourcet, stm, stm-containers, text, time, transformers
+     , transformers-base, unordered-containers, vault, wai, wai-extra
+     , warp
      }:
      mkDerivation {
        pname = "Spock";
-       version = "0.7.10.0";
-       sha256 = "0agis3cy6ijynbzgwyc2wd08db16yz0qhcjj41l6d7a6804ns8nj";
+       version = "0.7.12.0";
+       sha256 = "05vglqzf75dphxx2wnkxqn7aqcb19nh8g560zfpw56jrfbbmygwg";
        buildDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
-         directory hashable http-types list-t monad-control mtl old-locale
-         path-pieces random reroute resource-pool resourcet stm
+         directory hashable http-types hvect list-t monad-control mtl
+         old-locale path-pieces random reroute resource-pool resourcet stm
          stm-containers text time transformers transformers-base
          unordered-containers vault wai wai-extra warp
        ];
@@ -15117,8 +15201,8 @@ self: {
     ({ mkDerivation, base, stm }:
      mkDerivation {
        pname = "Updater";
-       version = "0.1";
-       sha256 = "0wd6ydj6s44mxncg817f9ar4cwxjxakb9m5a4p6yxhzgkwcl7hp2";
+       version = "0.2";
+       sha256 = "03n2r02bgv9hzlvxypdy1mrvdmzrxlm717bf7qp9f9ky1sj3ixp4";
        buildDepends = [ base stm ];
        homepage = "https://github.com/yokto/Updater";
        description = "Monadic FRP library based on stm";
@@ -15562,8 +15646,8 @@ self: {
      }:
      mkDerivation {
        pname = "Win32";
-       version = "2.3.0.2";
-       sha256 = "0s2hp50yb91cmj78shpp7s7v096y6lnipk4j7h3lxph3zgj06zsi";
+       version = "2.3.1.0";
+       sha256 = "1y9z682gmgjkrc8lijkidrlwh5pr30zgpvx2sc3gnvn8krg6jnk8";
        buildDepends = [ base bytestring ];
        extraLibraries = [ advapi32 gdi32 shell32 shfolder user32 winmm ];
        homepage = "https://github.com/haskell/win32";
@@ -16196,6 +16280,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) readline;};
 
+  "ZEBEDDE" = callPackage
+    ({ mkDerivation, base, vect }:
+     mkDerivation {
+       pname = "ZEBEDDE";
+       version = "0.1.0.0";
+       sha256 = "1i85pah79342ivmcg73q305awbf9fi6gw4ckg9i019d6vmdg5d17";
+       buildDepends = [ base vect ];
+       jailbreak = true;
+       description = "Polymer growth simulation method";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ZFS" = callPackage
     ({ mkDerivation, base, CC-delcont, containers, mtl, network, unix
      }:
@@ -16333,8 +16429,8 @@ self: {
      }:
      mkDerivation {
        pname = "abcBridge";
-       version = "0.12";
-       sha256 = "1432hjaj0fccsd16if0wyiayp9wj66gam6c48fc1lgnqc5lvw5jj";
+       version = "0.14";
+       sha256 = "1ki5h3058n3kpvaspl8g1vadprw6kb3xxyadb3a4k1irkfz8lfkf";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ aig base containers directory vector ];
@@ -18014,8 +18110,8 @@ self: {
     ({ mkDerivation, base, mtl, QuickCheck, vector }:
      mkDerivation {
        pname = "aig";
-       version = "0.2.1";
-       sha256 = "0wcqw5scaw2ximhbv9pnpngdlr36adci7hpqwj9haa9ql5pwqqxk";
+       version = "0.2.3";
+       sha256 = "0363wr5fnryz49ksj6mvwngpqi2bj7ldgyzh6hgvmvvdz5nmmxzr";
        buildDepends = [ base mtl QuickCheck vector ];
        description = "And-inverter graphs in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -18500,6 +18596,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "almost-fix" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "almost-fix";
+       version = "0.0.2";
+       sha256 = "03x715jcrsxfs2d08hsg3y5f6a4bnlzfxsmhzimvpdp9bw0psn90";
+       buildDepends = [ base ];
+       description = "Recurse while a predicate is satisfied";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "alms" = callPackage
     ({ mkDerivation, array, base, containers, directory, editline, fgl
      , filepath, HUnit, incremental-sat-solver, mtl, network, parsec
@@ -19083,8 +19190,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "0.3.6";
-       sha256 = "050gspxplhch66awd7gmxyyy3s466ca3jbzp2yq4qh32dn7n1hvi";
+       version = "0.3.6.1";
+       sha256 = "19gyqga1qp50jsi6pykykkivfz18357p6pd6fg84bir0j9d4vawy";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
@@ -19287,8 +19394,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "0.3.6";
-       sha256 = "1xk44z5zp8pr2hyhdshzgwm572y33f9lvjz6yrglc4vpangslcx3";
+       version = "0.3.6.1";
+       sha256 = "155d4yfc96x99mw8h89n2waj7ywx4hcw8izcx1sk1x96lcd6h9mw";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
@@ -20455,15 +20562,14 @@ self: {
      }:
      mkDerivation {
        pname = "applicative-fail";
-       version = "1.1.0";
-       sha256 = "0slxvf7iah7k8mpap6sc1kfibgah8pjls5z82zf62kf7ywzqmfkf";
+       version = "1.1.1";
+       sha256 = "11bk0svzdys8rgx6nzb80fkxz8mp6r0238ylmb5wzsnl8nc9y041";
        buildDepends = [
          base bifunctors dlist mtl transformers transformers-base
        ];
        testDepends = [
          base checkers mtl QuickCheck tasty tasty-quickcheck
        ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/s9gf4ult/applicative-fail";
        description = "Applicative functor and monad which collects all your fails";
        license = stdenv.lib.licenses.bsd3;
@@ -22356,19 +22462,19 @@ self: {
   "avers" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, clock, containers, cryptohash, filepath, hspec
-     , inflections, MonadRandom, mtl, network, resource-pool
-     , rethinkdb-client-driver, scrypt, stm, template-haskell, text
-     , time, unordered-containers, vector
+     , inflections, MonadRandom, mtl, network, network-uri
+     , resource-pool, rethinkdb-client-driver, safe, scrypt, stm
+     , template-haskell, text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "avers";
-       version = "0.0.8";
-       sha256 = "1wnhzkjwp6243mqfwxmw8lhs59vn5v0544hsivcfps427cqamrbq";
+       version = "0.0.9";
+       sha256 = "0zcgq4b20vvg2mqm9yqm4gvakafn9r8mghki8bn87xhk0w7h99km";
        buildDepends = [
          aeson attoparsec base base16-bytestring bytestring clock containers
-         cryptohash filepath inflections MonadRandom mtl network
-         resource-pool rethinkdb-client-driver scrypt stm template-haskell
-         text time unordered-containers vector
+         cryptohash filepath inflections MonadRandom mtl network network-uri
+         resource-pool rethinkdb-client-driver safe scrypt stm
+         template-haskell text time unordered-containers vector
        ];
        testDepends = [
          aeson attoparsec base base16-bytestring bytestring containers
@@ -22376,7 +22482,6 @@ self: {
          rethinkdb-client-driver scrypt stm text time unordered-containers
          vector
        ];
-       jailbreak = true;
        description = "empty";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23519,13 +23624,13 @@ self: {
      }) {};
 
   "base-orphans" = callPackage
-    ({ mkDerivation, base, ghc-prim, hspec }:
+    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
        pname = "base-orphans";
-       version = "0.4.0";
-       sha256 = "06knj296mkhbmfr0b12pfvhzr0bk8p1avabh1llwmx67nnn41r5i";
+       version = "0.4.2";
+       sha256 = "1mfmhvb7zvyi3m5660755ph7xk4fdvhki6ssfd3i2ghzas8g1v7a";
        buildDepends = [ base ghc-prim ];
-       testDepends = [ base hspec ];
+       testDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
@@ -23710,6 +23815,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "basex-client" = callPackage
+    ({ mkDerivation, base, network, pureMD5, utf8-string }:
+     mkDerivation {
+       pname = "basex-client";
+       version = "0.1.0.0";
+       sha256 = "189bmv479fmljy9w7nhc5mb7546iz8vahrmxffvgny51ywklk58n";
+       buildDepends = [ base network pureMD5 utf8-string ];
+       description = "A BaseX client for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bash" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , hxt-regex-xmlschema, mtl, SHA, shell-escape
@@ -24137,27 +24253,27 @@ self: {
      }) {};
 
   "bet" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, bytestring, containers
-     , exceptions, HsOpenSSL, http-client-openssl, lens, mtl, pipes
-     , pipes-http, QuickCheck, semigroupoids, semigroups, test-framework
-     , test-framework-quickcheck2, test-framework-th, text, time
+    ({ mkDerivation, aeson, base, bifunctors, binary, bytestring
+     , containers, exceptions, HsOpenSSL, http-client
+     , http-client-openssl, lens, mtl, QuickCheck, semigroupoids
+     , semigroups, test-framework, test-framework-quickcheck2
+     , test-framework-th, text, time
      }:
      mkDerivation {
        pname = "bet";
-       version = "0.1.2.2";
-       sha256 = "1sk8sgfcywxr54g25ah978k0d1x263mzi69zbx5wk67bs4sqvmds";
+       version = "0.1.2.3";
+       sha256 = "0gy12m81bc6vgzq4m0v134jbq5lw1210dxsq4s28c0www0kxj658";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson base bifunctors bytestring containers exceptions HsOpenSSL
-         http-client-openssl lens mtl pipes pipes-http semigroupoids
+         aeson base bifunctors binary bytestring containers exceptions
+         HsOpenSSL http-client http-client-openssl lens mtl semigroupoids
          semigroups text time
        ];
        testDepends = [
          base lens QuickCheck semigroups test-framework
          test-framework-quickcheck2 test-framework-th
        ];
-       jailbreak = true;
        homepage = "https://github.com/Noeda/bet/";
        description = "Betfair API bindings. Bet on sports on betting exchanges.";
        license = stdenv.lib.licenses.mit;
@@ -24503,15 +24619,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "binary_0_7_5_0" = callPackage
+  "binary_0_7_6_1" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HUnit, QuickCheck, random, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "binary";
-       version = "0.7.5.0";
-       sha256 = "06gg61srfva7rvzf4s63c068s838i5jf33d6cnjb9769gjmca2a7";
+       version = "0.7.6.1";
+       sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg";
        buildDepends = [ array base bytestring containers ];
        testDepends = [
          array base bytestring Cabal containers directory filepath HUnit
@@ -26552,8 +26668,8 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-html";
-       version = "0.8.0.2";
-       sha256 = "1h3z857kqj9h87zyi84pck2rnykfk7i4amlh0vkv5wws5zn9xs74";
+       version = "0.8.1.0";
+       sha256 = "0cgddwdwjszhcd3grfxazvy6jwaxa90s8yw6ir9ji2apbdsw0vgv";
        buildDepends = [ base blaze-builder blaze-markup bytestring text ];
        testDepends = [
          base blaze-builder blaze-markup bytestring containers HUnit
@@ -27366,18 +27482,18 @@ self: {
     ({ mkDerivation, aeson, base, binary, blaze-html, bytestring
      , configurator, cryptohash, directory, hashtables, http-types, mtl
      , random, Spock, text, transformers, wai, wai-extra
-     , wai-middleware-static, warp, xdg-basedir
+     , wai-middleware-static, warp, warp-tls, xdg-basedir
      }:
      mkDerivation {
        pname = "breve";
-       version = "0.3.0.0";
-       sha256 = "14vhwicdi1cln594bfhhj65kwaxmimpzg4jh35mrycw0fpbfk6rp";
+       version = "0.4.0.0";
+       sha256 = "1ndzqwxj7dzff75mgjssh7sgrhxlicdwkcx8j71x52rxyav4aa0j";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          aeson base binary blaze-html bytestring configurator cryptohash
          directory hashtables http-types mtl random Spock text transformers
-         wai wai-extra wai-middleware-static warp xdg-basedir
+         wai wai-extra wai-middleware-static warp warp-tls xdg-basedir
        ];
        homepage = "https://github.com/rnhmjoj/breve";
        description = "a url shortener";
@@ -28711,8 +28827,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.3.6.0";
-       sha256 = "1c6pdrq8ypy9halw6cqdasr0zdr0hdb76h66vs9g0qkqqbpgiyyq";
+       version = "0.3.7.0";
+       sha256 = "1lq8i45wvk8rqilay7j9i9iv5irhqvdg3bp96mj2xxaxrpfi7l20";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -30158,8 +30274,8 @@ self: {
      }:
      mkDerivation {
        pname = "cassandra-cql";
-       version = "0.5.0.1";
-       sha256 = "0n1w1hriscrjky3d4qwzzm3p41yg9gvnxyq9sfm3kb7lijc4xj2d";
+       version = "0.5.0.2";
+       sha256 = "1nk0psvmzhvxls4h0p4blrm8qjn6lyh08bdxpiagpw6nrpvbda54";
        buildDepends = [
          base bytestring cereal containers cryptohash Decimal hslogger
          MonadCatchIO-transformers mtl network resource-pool stm text time
@@ -30881,21 +30997,21 @@ self: {
      }) {};
 
   "cgrep" = callPackage
-    ({ mkDerivation, ansi-terminal, array, base, bytestring, cmdargs
-     , containers, directory, dlist, either, filepath, ghc-prim, mtl
-     , regex-posix, safe, split, stm, stringsearch, unix-compat
+    ({ mkDerivation, ansi-terminal, array, async, base, bytestring
+     , cmdargs, containers, directory, dlist, either, filepath, ghc-prim
+     , mtl, regex-posix, safe, split, stm, stringsearch, unix-compat
      , unordered-containers
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.4.20";
-       sha256 = "1p0nm6gb7hvxvfkgrync1a66zl58s041pgnkly2vx91cpm6yavcm";
+       version = "6.5.2";
+       sha256 = "021cwllz5cljb9j0klh3xn4jpg2vxfqwqyjm631gkpzndc9711wr";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         ansi-terminal array base bytestring cmdargs containers directory
-         dlist either filepath ghc-prim mtl regex-posix safe split stm
-         stringsearch unix-compat unordered-containers
+         ansi-terminal array async base bytestring cmdargs containers
+         directory dlist either filepath ghc-prim mtl regex-posix safe split
+         stm stringsearch unix-compat unordered-containers
        ];
        homepage = "http://awgn.github.io/cgrep/";
        description = "Command line tool";
@@ -31832,30 +31948,30 @@ self: {
 
   "clafer" = callPackage
     ({ mkDerivation, aeson, array, base, bytestring, cmdargs
-     , containers, data-stringmap, directory, executable-path, filepath
-     , ghc, HaXml, HTTP, HUnit, json-builder, lens, lens-aeson, mtl
+     , containers, data-stringmap, directory, doctest, executable-path
+     , filepath, ghc, HTTP, HUnit, json-builder, lens, lens-aeson, mtl
      , network, network-uri, parsec, process, QuickCheck, split
      , string-conversions, tasty, tasty-hunit, tasty-th, text
      , transformers
      }:
      mkDerivation {
        pname = "clafer";
-       version = "0.3.10";
-       sha256 = "0f780l5nh3r93w4ikxliqjg70ih4k4j00s7f4nj1li0dv6bprc3x";
+       version = "0.4.0";
+       sha256 = "1xnjvqwdp7679hr6jkl6xnsrdidw494p1xr8mlng6gybflm8v9gn";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson array base bytestring cmdargs containers data-stringmap
-         directory executable-path filepath HaXml HTTP json-builder lens
+         directory executable-path filepath HTTP json-builder lens
          lens-aeson mtl network network-uri parsec process split
          string-conversions text transformers
        ];
        testDepends = [
-         base containers data-stringmap directory filepath ghc HaXml HUnit
+         base containers data-stringmap directory doctest filepath ghc HUnit
          lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th
        ];
        homepage = "http://clafer.org";
-       description = "clafer compiles Clafer models to other formats, such as Alloy, XML, HTML, Dot";
+       description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -31868,8 +31984,8 @@ self: {
      }:
      mkDerivation {
        pname = "claferIG";
-       version = "0.3.10";
-       sha256 = "17g4jdfla0x90y2jn54yk56h6ih3d1jk4fzdpfvh85xs6dh79n0x";
+       version = "0.4.0";
+       sha256 = "01ilmmhz1wd142qpclk1b5nksm6cacr07pdj5cl5prfv7y04k9nw";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -31894,8 +32010,8 @@ self: {
      }:
      mkDerivation {
        pname = "claferwiki";
-       version = "0.3.10";
-       sha256 = "0v0nad7n3m8gs3l7prv2kwqzdp93g309j4l3l3dv1ibfnf5jr2l9";
+       version = "0.4.0";
+       sha256 = "1in0lzph5h7v9z9b974ibzh0rq7j343q474i9zfkylmdd1aivdyh";
        buildDepends = [
          base clafer containers directory gitit MissingH mtl network
          network-uri process SHA split time transformers utf8-string
@@ -31951,8 +32067,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.5.10";
-       sha256 = "02zv08mkx228fxx1hdraaqmiv1mfq6rgsr3gflh0awyf6x5g6jzn";
+       version = "0.5.11";
+       sha256 = "1lwc47b2iw2l7djga11gp4xdikb8gycqv4fxz1cxrf23xzkg5ggg";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -31978,8 +32094,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.5.9";
-       sha256 = "1kh40vy5sqxpb2akzwyc7k7z251lg3h3a12qj2vq4vkgwx5xcqkh";
+       version = "0.5.10";
+       sha256 = "039j561r7kgrd5b7z55axgjniwm5yi5y1y0azps4ipmvjsvalbdl";
        buildDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath hashable lens mtl
@@ -31998,8 +32114,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "0.9.1";
-       sha256 = "00d4ap4jfw1298g59sfywkjza33s5p5p4n2nc69anwc31lxqnss8";
+       version = "0.9.2";
+       sha256 = "1gl75mbqpv5g5dwg2c2vvqn36ydwhkcv7g6i8gjm41500dsrky0i";
        buildDepends = [
          array base data-default ghc-prim ghc-typelits-natnormalise
          integer-gmp lens QuickCheck singletons template-haskell th-lift
@@ -33771,16 +33887,13 @@ self: {
      }:
      mkDerivation {
        pname = "comonad";
-       version = "4.2.7";
-       revision = "1";
-       sha256 = "03h36hr7vgxxyxfp9yc87vahbm3d6chvrkcrjh5abxg6i42aflma";
-       editedCabalFile = "70542238a847c5b973832fa7e5623a76a485df25b36d511bfd5f5116e4014619";
+       version = "4.2.7.2";
+       sha256 = "0arvbaxgkawzdp38hh53akkahjg2aa3kj2b4ns0ni8a5ylg2cqmp";
        buildDepends = [
          base containers contravariant distributive semigroups tagged
          transformers transformers-compat
        ];
        testDepends = [ base directory doctest filepath ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/comonad/";
        description = "Comonads";
        license = stdenv.lib.licenses.bsd3;
@@ -34705,8 +34818,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-combinators";
-       version = "1.0.1.1";
-       sha256 = "02x0n4yar1s3x73pbaxs6ghd5kihl3wz3svrvvm24xnmwv5j9aaz";
+       version = "1.0.2";
+       sha256 = "1yfck6syqqi5zlp41n3qs8w5ljg63jhg25m8irrcks35n9i541j5";
        buildDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
          conduit conduit-extra filepath monad-control mono-traversable
@@ -35237,8 +35350,8 @@ self: {
      }:
      mkDerivation {
        pname = "consumers";
-       version = "0.1";
-       sha256 = "0y977lhxcaxjw6c760fifmisxn62lji0qs8aqgyag6jmzmkfymdb";
+       version = "1.0";
+       sha256 = "1f7jn9lja9fsznjz7d3wfhbd0dc8whcx9jl74jl39mv20k2sdhib";
        buildDepends = [
          base containers exceptions hpqtypes lifted-base lifted-threads log
          monad-control mtl stm time transformers-base
@@ -35444,8 +35557,8 @@ self: {
      }:
      mkDerivation {
        pname = "contravariant";
-       version = "1.3.1.1";
-       sha256 = "0kjfild3zp34w745p79658i84k45cg9qjhv154sa0plqgk2vmdfs";
+       version = "1.3.2";
+       sha256 = "0fb6az12604vwvfhnmvxfin68n0fb2jcvrliv3vvrmfnfq3axfjj";
        buildDepends = [
          base semigroups StateVar transformers transformers-compat void
        ];
@@ -35852,8 +35965,8 @@ self: {
      }:
      mkDerivation {
        pname = "coordinate";
-       version = "0.0.18";
-       sha256 = "0avag247d74qwy6gikcmva5k41iriba42rkxik781dsnp2caxq1f";
+       version = "0.0.19";
+       sha256 = "01f6dmyx2kqyzf1n06awcyx0ygqgy829snxw6bbxbvih9yhkjq2r";
        buildDepends = [ base lens radian tagged transformers ];
        testDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -36274,6 +36387,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cpio-conduit" = callPackage
+    ({ mkDerivation, base, base16-bytestring, binary, bytestring
+     , conduit, conduit-extra, resourcet
+     }:
+     mkDerivation {
+       pname = "cpio-conduit";
+       version = "0.7.0";
+       sha256 = "04zma03ivg9x5f1xkdpc828fk2lh6qrn7cig7gprci13id9yf2wg";
+       buildDepends = [
+         base base16-bytestring binary bytestring conduit conduit-extra
+       ];
+       testDepends = [
+         base base16-bytestring binary bytestring conduit conduit-extra
+         resourcet
+       ];
+       homepage = "http://github.com/da-x/cpio-conduit";
+       description = "Conduit-based CPIO";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "cplusplus-th" = callPackage
     ({ mkDerivation, base, bytestring, containers, process, QuickCheck
      , template-haskell
@@ -36298,8 +36431,8 @@ self: {
      }:
      mkDerivation {
        pname = "cpphs";
-       version = "1.19";
-       sha256 = "0fiyqyy7zzzbp0jsgl3syvm5db8n42h88ps7qzayxbsycjz9fp70";
+       version = "1.19.2";
+       sha256 = "194hcvhjgm6rmbqp857y3j39lvl2p91mqrrgpi15jq00icnv4idv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base directory old-locale old-time polyparse ];
@@ -36348,8 +36481,8 @@ self: {
     ({ mkDerivation, array, base, containers, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "2.5.1";
-       sha256 = "1lgscv3jkfzr35fwx7aymsgjg3i3sszxdc0hxmrbna8ba509cizk";
+       version = "2.5.2";
+       sha256 = "0zm2waj17ak43rhri9rhvwy970dv22r0k42fzbm3n6gcl5h2mcq5";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ array base containers parallel ];
@@ -36420,15 +36553,15 @@ self: {
   "cql" = callPackage
     ({ mkDerivation, base, bytestring, cereal, Decimal, iproute
      , network, QuickCheck, tasty, tasty-quickcheck, template-haskell
-     , text, time, transformers, uuid
+     , text, time, transformers, uuid, vector
      }:
      mkDerivation {
        pname = "cql";
-       version = "3.0.4";
-       sha256 = "0b4yfmfxb4j039s5il321bc65dmbcbxqvaiqk97ly4fcc8pmdld9";
+       version = "3.0.5";
+       sha256 = "12v5hhlji9w73chxdhazpmhbaxmjs98lw1y6cm8p29bgxdi75q61";
        buildDepends = [
          base bytestring cereal Decimal iproute network template-haskell
-         text time transformers uuid
+         text time transformers uuid vector
        ];
        testDepends = [
          base bytestring cereal Decimal iproute network QuickCheck tasty
@@ -36448,8 +36581,8 @@ self: {
      }:
      mkDerivation {
        pname = "cql-io";
-       version = "0.14.4";
-       sha256 = "09nkp0c8brh87x93ib5ss010kh2izzs05ad7gmf7q54zw6qxask2";
+       version = "0.14.5";
+       sha256 = "0ks2sn3dfrr8ilvmw48hfz3140x9dsi79w6ci4vfksn1g5ndnpiy";
        buildDepends = [
          async auto-update base bytestring containers cql cryptohash
          data-default-class exceptions hashable iproute lens monad-control
@@ -36707,19 +36840,19 @@ self: {
 
   "creatur" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, cereal, cond
-     , directory, filepath, gray-extended, hdaemonize, hsyslog, HUnit
-     , MonadRandom, mtl, old-locale, process, QuickCheck, random, split
-     , temporary, test-framework, test-framework-hunit
+     , directory, exceptions, filepath, gray-extended, hdaemonize
+     , hsyslog, HUnit, MonadRandom, mtl, old-locale, process, QuickCheck
+     , random, split, temporary, test-framework, test-framework-hunit
      , test-framework-quickcheck2, time, transformers, unix, zlib
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.7";
-       sha256 = "1617whwg9f0l6ji3jmd7fcs3n650mz0jpvrw4hf97r7mqzlyfkjp";
+       version = "5.9.8.2";
+       sha256 = "15cjk5hb4j7ydsis8fz7gag3sa17i6yr26pfbf8aqkw7iakmjqs9";
        buildDepends = [
-         array base bytestring cereal cond directory filepath gray-extended
-         hdaemonize hsyslog MonadRandom mtl old-locale process random split
-         time transformers unix zlib
+         array base bytestring cereal cond directory exceptions filepath
+         gray-extended hdaemonize hsyslog MonadRandom mtl old-locale process
+         random split time transformers unix zlib
        ];
        testDepends = [
          array base binary cereal directory filepath hsyslog HUnit
@@ -37385,8 +37518,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptonite";
-       version = "0.5";
-       sha256 = "17b2axxb9i9cmwjhji1lm5nwhqm2wikxzy1cwmk2v8h64dy0rjc5";
+       version = "0.6";
+       sha256 = "0lzqmhslq1pwj6pp82l3vdnnxbqvh0bqjyl02x2yp6sp72mcq5m0";
        buildDepends = [
          base bytestring deepseq ghc-prim integer-gmp memory
        ];
@@ -37465,8 +37598,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression";
-       version = "4.8.1";
-       sha256 = "0mag076inyg9hs37anq7g7545wfjaphk831h8jj1fykp8iag95l4";
+       version = "4.8.2";
+       sha256 = "1zhx4smvs8xnqfcv2hxhq57n16cl3sycz659viw8l6v8f36ibj5i";
        buildDepends = [
          base Boolean colour csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
@@ -37501,8 +37634,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-opcodes";
-       version = "0.0.2";
-       sha256 = "0friwwx0ia2wk75ylmvlladswqfwhza8grsbnqfn5q8ffsjv632r";
+       version = "0.0.3";
+       sha256 = "0f7nwrnrpsi31q9vaxy2yihripzqjzp6683qy94ljkmxmfnm9sb5";
        buildDepends = [
          base csound-expression-dynamic csound-expression-typed transformers
        ];
@@ -37518,8 +37651,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-typed";
-       version = "0.0.7.6";
-       sha256 = "01zi1hychx6vinxpqh7zdcj6jrlcpp86v7cmdzzq42z44apg8d3y";
+       version = "0.0.7.7";
+       sha256 = "1z9hvkgl6lqwrdhngq79425s2frhkg4llkcpsar21d5ld4fhzfdl";
        buildDepends = [
          base Boolean colour containers csound-expression-dynamic
          data-default deepseq ghc-prim stable-maps temporal-media
@@ -40967,19 +41100,22 @@ self: {
      }) {};
 
   "delta" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath
+    ({ mkDerivation, base, containers, directory, filepath, hspec
      , optparse-applicative, process, sodium, time
      }:
      mkDerivation {
        pname = "delta";
-       version = "0.2.1.1";
-       sha256 = "06msfi733jmqqgxyx5p4mifjgxrgh0x8ls4j0fkcan5377sydjcv";
+       version = "0.2.1.2";
+       revision = "2";
+       sha256 = "0r2a2vffs3rn2xp56nhanyywzbm2wph5664spgj4lbsna6zgjnfj";
+       editedCabalFile = "630e85a07132fe54b49c71f855b3d633982026d78120279e00888bc95a9d14dd";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base containers directory filepath optparse-applicative process
          sodium time
        ];
+       testDepends = [ base directory filepath hspec ];
        homepage = "https://github.com/kryoxide/delta";
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.gpl3;
@@ -41064,8 +41200,8 @@ self: {
      }:
      mkDerivation {
        pname = "dependent-sum-template";
-       version = "0.0.0.3";
-       sha256 = "0if3mr0cmaz3yc0hbn0fpx14kwnjsaj3hd8mw9z4va4qp85wya69";
+       version = "0.0.0.4";
+       sha256 = "103jxzzw3drg7pkgmh39s7258zcwr8ixg8mijm6p33b87a8wdpwr";
        buildDepends = [ base dependent-sum template-haskell th-extras ];
        homepage = "/dev/null";
        description = "Template Haskell code to generate instances of classes in dependent-sum package";
@@ -41250,6 +41386,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "deriving-compat" = callPackage
+    ({ mkDerivation, base, base-compat, containers, ghc-prim, hspec
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "deriving-compat";
+       version = "0.1";
+       sha256 = "1v503lj9dds1hwnqhmw8rfbj9337gcyqqzys1d93r7s0bs3glgf3";
+       buildDepends = [ base containers ghc-prim template-haskell ];
+       testDepends = [ base base-compat hspec QuickCheck ];
+       homepage = "https://github.com/haskell-compat/deriving-compat";
+       description = "Backports of GHC deriving extensions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "derp" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -41338,8 +41489,8 @@ self: {
     ({ mkDerivation, base, hspec, mtl }:
      mkDerivation {
        pname = "deterministic-game-engine";
-       version = "0.2.1";
-       sha256 = "0igs10h0mj8xxw9z57icx4y7mb7ag6m4cg7qiqk3b41xipxqn1ig";
+       version = "0.4.0";
+       sha256 = "1hdwr1vxfng3yc9mdnnsraapikq9kq1c07ik16csgp2ggnhgpprs";
        buildDepends = [ base mtl ];
        testDepends = [ base hspec ];
        homepage = "https://github.com/TGOlson/deterministic-game-engine";
@@ -41725,11 +41876,31 @@ self: {
          process semigroups system-filepath 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;
      }) {};
 
+  "diagrams-pandoc" = callPackage
+    ({ mkDerivation, base, diagrams-builder, diagrams-cairo
+     , diagrams-lib, directory, filepath, linear, optparse-applicative
+     , pandoc-types
+     }:
+     mkDerivation {
+       pname = "diagrams-pandoc";
+       version = "0.1";
+       sha256 = "02dz0w2im68667v5k1ykdnl3cijvqfd5pgb7qqdyyizkgza88pb4";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base diagrams-builder diagrams-cairo diagrams-lib directory
+         filepath linear optparse-applicative pandoc-types
+       ];
+       description = "A pandoc filter to express diagrams inline using the haskell EDSL _diagrams_";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "diagrams-pdf" = callPackage
     ({ mkDerivation, base, cmdargs, colour, diagrams-core, diagrams-lib
      , filepath, HPDF, lens, monoid-extras, mtl, semigroups, split
@@ -44471,18 +44642,18 @@ self: {
 
   "dump" = callPackage
     ({ mkDerivation, base, haskell-src-meta, hspec
-     , interpolatedstring-perl6, template-haskell, text
+     , interpolatedstring-perl6, QuickCheck, template-haskell, text
      }:
      mkDerivation {
        pname = "dump";
-       version = "0.2.6";
-       sha256 = "0rhjx4g83pbm0zfqgz8ykfccaq8wa7wspjc6k1n4d1bgcwkc617y";
+       version = "0.2.8";
+       sha256 = "0p0wwcxm2lgfbx82s226dprd8qa526pnrnpakxmdz5svd6ib0gh4";
        buildDepends = [
          base haskell-src-meta interpolatedstring-perl6 template-haskell
          text
        ];
        testDepends = [
-         base haskell-src-meta hspec interpolatedstring-perl6
+         base haskell-src-meta hspec interpolatedstring-perl6 QuickCheck
          template-haskell text
        ];
        homepage = "https://github.com/Wizek/dump";
@@ -45594,16 +45765,16 @@ self: {
      }) {};
 
   "ekg" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, ekg-core, filepath
-     , network, snap-core, snap-server, text, time, transformers
-     , unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
+     , filepath, network, snap-core, snap-server, text, time
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "ekg";
-       version = "0.4.0.7";
-       sha256 = "0isq39a1c8laiigxi5yqv7d6798xc828xh4p0zan0a6m6glrmygr";
+       version = "0.4.0.8";
+       sha256 = "0cp88b5bf4bpjd6qzib00n7j76svwsykzizk52fk1dmknfx8h12v";
        buildDepends = [
-         aeson base bytestring ekg-core filepath network snap-core
+         aeson base bytestring ekg-core ekg-json filepath network snap-core
          snap-server text time transformers unordered-containers
        ];
        homepage = "https://github.com/tibbe/ekg";
@@ -45653,8 +45824,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-core";
-       version = "0.1.0.4";
-       sha256 = "04ym37hc2l3k185dbkmfa4n7ya412cgc5zf0kynwgfvdwggjnxwh";
+       version = "0.1.1.0";
+       sha256 = "07h6lwig1cwb526ack1g3f6w8irmaj4kibn11ihhdffk7avix8bv";
        buildDepends = [
          base containers ghc-prim text unordered-containers
        ];
@@ -45663,6 +45834,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ekg-json" = callPackage
+    ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ekg-json";
+       version = "0.1.0.0";
+       sha256 = "1nhqlajidg94zk6rs86ri5ar4cmkbdz04hwjp8qgam0vgpp5bi2j";
+       buildDepends = [ aeson base ekg-core text unordered-containers ];
+       homepage = "https://github.com/tibbe/ekg-json";
+       description = "JSON encoding of ekg metrics";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ekg-log" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, ekg-core
      , fast-logger, filepath, text, time, unix, unordered-containers
@@ -46386,17 +46570,18 @@ self: {
      }) {};
 
   "engine-io-wai" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, engine-io
-     , http-types, mtl, text, transformers, unordered-containers, wai
-     , wai-websockets, websockets
+    ({ mkDerivation, attoparsec, base, bytestring, either, engine-io
+     , http-types, mtl, text, transformers, transformers-compat
+     , unordered-containers, wai, wai-websockets, websockets
      }:
      mkDerivation {
        pname = "engine-io-wai";
-       version = "1.0.1";
-       sha256 = "0cr53x8bxfmrx97v7jsb7gw3hqb94zp9xvvnl16080zmqm0gi2rh";
+       version = "1.0.3";
+       sha256 = "0p296y3xnpx0wj6yd152y7i765x0pwg8rg2bpcz92hkcmz57gdz7";
        buildDepends = [
-         attoparsec base bytestring engine-io http-types mtl text
-         transformers unordered-containers wai wai-websockets websockets
+         attoparsec base bytestring either engine-io http-types mtl text
+         transformers transformers-compat unordered-containers wai
+         wai-websockets websockets
        ];
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
@@ -46796,8 +46981,8 @@ self: {
      }:
      mkDerivation {
        pname = "equal-files";
-       version = "0.0.5.1";
-       sha256 = "1rm0hk42xnzix1ba7bxfrc910v4nnhvqk3cbdrxy7avzhad31nbf";
+       version = "0.0.5.2";
+       sha256 = "07n9xdsi00nz9xwd0bqrdn2d03q7dzlrr13wlym5lgc15r7iwf8w";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -47158,8 +47343,8 @@ self: {
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "2.2.10";
-       sha256 = "0chxxcy52xrhdq7pgwzq3vk9filrrc3mdnx6j26r2ih56j1ac02l";
+       version = "2.2.11";
+       sha256 = "0ldgiim5d23avzqgzmpyb1nfp9xpxc51fc98f3ii8ic4mxn4bjvp";
        buildDepends = [
          base conduit monad-logger persistent resourcet tagged text
          transformers unordered-containers
@@ -47395,6 +47580,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "euphoria" = callPackage
+    ({ mkDerivation, base, containers, data-default, deepseq, elerea
+     , enummapset-th, hashable, HUnit, test-framework
+     , test-framework-hunit, test-framework-th, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "euphoria";
+       version = "0.6.0.1";
+       sha256 = "1bml75lj30y83bln5a7b36gcb9d6gci4vhmr8ins9nz6bc1l29m9";
+       buildDepends = [
+         base containers data-default deepseq elerea enummapset-th hashable
+         HUnit transformers unordered-containers
+       ];
+       testDepends = [
+         base HUnit test-framework test-framework-hunit test-framework-th
+       ];
+       homepage = "http://github.com/tsurucapital/euphoria";
+       description = "Dynamic network FRP with events and continuous values";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "eurofxref" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, failure
      , hexpat, http-conduit, http-types, monad-control, mtl, time
@@ -47534,16 +47741,16 @@ self: {
      }) {};
 
   "ewe" = callPackage
-    ({ mkDerivation, alex, array, base, containers, happy, mtl
+    ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty
      , transformers
      }:
      mkDerivation {
        pname = "ewe";
-       version = "0.1.0.40";
-       sha256 = "0r9kcpb6j2x4cmg26rvzd2gp4bjjmlsd0rbk1y2dc7vyivd0m14l";
+       version = "0.1.0.44";
+       sha256 = "0v313l0akvw9b3zn7xffy4ixz2c70i40k6kh4vdlrw8dvyv7zxk3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers mtl transformers ];
+       buildDepends = [ array base containers mtl pretty transformers ];
        buildTools = [ alex happy ];
        homepage = "http://github.com/jfcmacro/ewe";
        description = "An language using in Programming Languages teaching";
@@ -47584,8 +47791,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "exact-pi";
-       version = "0.2.0.0";
-       sha256 = "0az47bzrkhb5xmws1rpp080kvsq2pcxjgrm0wzjqqbcqiy5pi3f9";
+       version = "0.2.1.1";
+       sha256 = "1f8lxdaal7m4vw8akzwlhn0j3vw5bh983f02j842g1vzs3n47x3g";
        buildDepends = [ base ];
        homepage = "https://github.com/dmcclean/exact-pi";
        description = "Exact rational multiples of pi (and integer powers of pi)";
@@ -48170,8 +48377,8 @@ self: {
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.4";
-       sha256 = "1cp9vsqgjc46v1i8w8lhakdk1qj6q2bd0y365qj0madpjj7q1qi8";
+       version = "1.4.1";
+       sha256 = "00fhy9l2cgfwj8873jf1iyz2fmhj1b3m0qlf38i4pd1yad8sfb70";
        buildDepends = [ base directory filepath process time unix ];
        testDepends = [ base directory filepath QuickCheck time unix ];
        homepage = "https://github.com/ndmitchell/extra#readme";
@@ -48411,8 +48618,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-builder";
-       version = "0.0.0.0";
-       sha256 = "1ga28vxsv4hk8491jv51jd8xqvafss56kkm97x2ma4naqx4v6snw";
+       version = "0.0.0.2";
+       sha256 = "07fnn282ldfmgkfnsdnjr11hx89jhw7waz573a7nx2a329r1p4pf";
        buildDepends = [ base bytestring ghc-prim ];
        testDepends = [ base bytestring process QuickCheck stm ];
        homepage = "http://github.com/takano-akio/fast-builder";
@@ -48420,6 +48627,24 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "fast-digits" = callPackage
+    ({ mkDerivation, base, digits, integer-gmp, QuickCheck, smallcheck
+     , tasty, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "fast-digits";
+       version = "0.1.0.0";
+       sha256 = "1dhvlsjbp4qrgcr9xlzbaps59160j2zl98xl5nrz6rffypz0gi72";
+       buildDepends = [ base integer-gmp ];
+       testDepends = [
+         base digits QuickCheck smallcheck tasty tasty-quickcheck
+         tasty-smallcheck
+       ];
+       homepage = "https://github.com/Bodigrim/fast-digits";
+       description = "The fast library for integer-to-digits conversion";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "fast-logger" = callPackage
     ({ mkDerivation, array, auto-update, base, bytestring
      , bytestring-builder, directory, filepath, hspec, text
@@ -48443,8 +48668,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "fast-math";
-       version = "1.0.1";
-       sha256 = "1a36mvrdr8gai4sn1s52fyc8alcl6ks6dlmr77df5dgvc2z74hhb";
+       version = "1.0.2";
+       sha256 = "15dyw88z9abiv6n40fz4g3jpj9v6qbxvqaf0ds32wh46igf1s425";
        buildDepends = [ base ];
        description = "Non IEEE-754 compliant compile-time floating-point optimisations";
        license = stdenv.lib.licenses.bsd3;
@@ -48503,8 +48728,8 @@ self: {
      }:
      mkDerivation {
        pname = "fasta";
-       version = "0.7.2.0";
-       sha256 = "1zsghi7883y4ygl0iammfh1dmnsnh3x4ly77jhxg8xz8saw7dbir";
+       version = "0.7.2.1";
+       sha256 = "1jwx8h3z3zlrnandqgmgrkam4y0awm3k1mfzljf7pn9acq6nxhs4";
        buildDepends = [
          base bytestring containers foldl lens parsec pipes pipes-bytestring
          pipes-group pipes-text split text
@@ -49277,8 +49502,8 @@ self: {
      }:
      mkDerivation {
        pname = "fgl";
-       version = "5.5.2.0";
-       sha256 = "1r9vkv5v32nyqghr4fq3ijrdl2sr9bncfpj3zix53h5m2zyn7kg3";
+       version = "5.5.2.1";
+       sha256 = "1nfm3gkr6cccqhi1g46k2d0l99yw2vq7xjd1hxxzcci5gidp8bhc";
        buildDepends = [ array base containers deepseq transformers ];
        testDepends = [ base containers hspec QuickCheck ];
        description = "Martin Erwig's Functional Graph Library";
@@ -49600,8 +49825,8 @@ self: {
      }:
      mkDerivation {
        pname = "filestore";
-       version = "0.6.0.6";
-       sha256 = "1lknngdg1c4a58qxbzzvpy72nx1pncm2p4akid2b3s7ydl7j96xr";
+       version = "0.6.1";
+       sha256 = "0mfllnnb1mqix1v65fyhd9jsvnrjbawd6l4h4012jk8401zwj280";
        buildDepends = [
          base bytestring containers Diff directory filepath old-locale
          parsec process split time utf8-string xml
@@ -51820,22 +52045,23 @@ self: {
      }) {};
 
   "fsnotify" = callPackage
-    ({ mkDerivation, async, base, containers, directory, hinotify
-     , system-fileio, system-filepath, tasty, tasty-hunit, temporary-rc
-     , text, time
+    ({ mkDerivation, async, base, containers, directory, filepath
+     , hinotify, tasty, tasty-hunit, temporary-rc, text, time
+     , unix-compat
      }:
      mkDerivation {
        pname = "fsnotify";
-       version = "0.1.0.3";
-       sha256 = "0m6jyg45azk377jklgwyqrx95q174cxd5znpyh9azznkh09wq58z";
+       version = "0.2.1";
+       sha256 = "0asl313a52qx2w6dw25g845683xsl840bwjh118nkwi5v1xipkzb";
        buildDepends = [
-         async base containers hinotify system-fileio system-filepath text
-         time
+         async base containers directory filepath hinotify text time
+         unix-compat
        ];
        testDepends = [
-         async base directory system-fileio system-filepath tasty
-         tasty-hunit temporary-rc
+         async base directory filepath tasty tasty-hunit temporary-rc
+         unix-compat
        ];
+       homepage = "https://github.com/haskell-fswatch/hfsnotify";
        description = "Cross platform library for file change notification";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52274,6 +52500,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fuzzy" = callPackage
+    ({ mkDerivation, base, HUnit, monoid-subclasses }:
+     mkDerivation {
+       pname = "fuzzy";
+       version = "0.1.0.0";
+       sha256 = "1jz9arrg33x64ygipk0115b7jfchxh20cy14177iwg0na8mpl2l2";
+       buildDepends = [ base monoid-subclasses ];
+       testDepends = [ base HUnit ];
+       homepage = "http://github.com/joom/fuzzy";
+       description = "Filters a list based on a fuzzy string search";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fuzzy-timings" = callPackage
     ({ mkDerivation, base, containers, glpk-hs, HUnit, mtl, QuickCheck
      , random, test-framework, test-framework-hunit
@@ -52315,10 +52554,8 @@ self: {
      }:
      mkDerivation {
        pname = "fwgl";
-       version = "0.1.2.0";
-       revision = "1";
-       sha256 = "1b18xzxbbrnmmvjgmzhy5r4ww7rvbli76m7vh3li30fb95k1sznr";
-       editedCabalFile = "d97edefc7ee59578d181dfc36d85b1a82a6e0c9ed1bb602918655a3439a5eb51";
+       version = "0.1.2.2";
+       sha256 = "1s4j1wgnncn6cmsarsc989zxz1qsqhsa722h7bv2k43093ww0nnh";
        buildDepends = [
          base hashable transformers unordered-containers vector Yampa
        ];
@@ -52334,10 +52571,8 @@ self: {
      }:
      mkDerivation {
        pname = "fwgl-glfw";
-       version = "0.1.0.4";
-       revision = "1";
-       sha256 = "1pph1arlmi905rkcjcn3yf5ypdmk82363vgdmwg26dbrb2sb4cs8";
-       editedCabalFile = "26e4026f5ac7fe57292c5df79d35894b736728c31cad845f11641d833f789fb8";
+       version = "0.1.0.5";
+       sha256 = "1y30mqayih5cd74dm90y7mbb9a0fw9sirzjlrmayvcm7aniyvmql";
        buildDepends = [
          base fwgl gl GLFW-b hashable JuicyPixels transformers
          unordered-containers vector Yampa
@@ -52354,8 +52589,8 @@ self: {
      }:
      mkDerivation {
        pname = "fwgl-javascript";
-       version = "0.1.0.4";
-       sha256 = "1bwg6dzp2kgny5s6zygdi120pcrdclql22rgp43vhwim5aqkp9d7";
+       version = "0.1.0.6";
+       sha256 = "0fxnnjp7403c29pjks739j0j92a1sldrrxg3sp4nrjb1ax01nia9";
        buildDepends = [
          base fwgl ghcjs-base hashable unordered-containers Yampa
        ];
@@ -53332,23 +53567,23 @@ self: {
      }) {};
 
   "getopt-generics" = callPackage
-    ({ mkDerivation, base, base-compat, base-orphans, generics-sop
-     , hspec, hspec-expectations, markdown-unlit, QuickCheck, silently
-     , tagged
+    ({ mkDerivation, base, base-compat, base-orphans, directory
+     , filepath, generics-sop, hspec, process, QuickCheck, silently
+     , tagged, temporary
      }:
      mkDerivation {
        pname = "getopt-generics";
-       version = "0.8";
-       sha256 = "0qxdr9y3dvr4w7hhbgkianaijsqfh36gfwh1blhbr1nf7cv9khmd";
+       version = "0.10.0.1";
+       sha256 = "0x8vh0sng1m05blxr24ijrz16bsyvryxkk70jqkdvq173x5fj8lf";
        buildDepends = [
          base base-compat base-orphans generics-sop tagged
        ];
        testDepends = [
-         base base-compat base-orphans generics-sop hspec hspec-expectations
-         markdown-unlit QuickCheck silently tagged
+         base base-compat base-orphans directory filepath generics-sop hspec
+         process QuickCheck silently tagged temporary
        ];
        homepage = "https://github.com/zalora/getopt-generics#readme";
-       description = "Simple command line argument parsing";
+       description = "Create command line interfaces with ease";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -53532,12 +53767,12 @@ self: {
 
   "ghc-exactprint" = callPackage
     ({ mkDerivation, base, containers, directory, filemanip, filepath
-     , free, ghc, ghc-paths, HUnit, mtl, random, silently, syb
+     , free, ghc, ghc-paths, HUnit, mtl, silently, syb
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.3";
-       sha256 = "0wgqlll95fbxnni1dzlyiyb4d7lqp3hrfw9xh5hqsnqm45smi7j1";
+       version = "0.3.1";
+       sha256 = "07kyifdh8s7jjp1jsm9f823hr0axgpxv54fr0vg8k3ibhdrw5dj1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -53545,8 +53780,9 @@ self: {
        ];
        testDepends = [
          base containers directory filemanip filepath ghc ghc-paths HUnit
-         mtl random silently syb
+         mtl silently syb
        ];
+       jailbreak = true;
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54060,14 +54296,13 @@ self: {
      }) {};
 
   "ghcjs-dom" = callPackage
-    ({ mkDerivation, base, glib, gtk3, mtl, text, transformers
-     , webkitgtk3
+    ({ mkDerivation, base, glib, gtk, mtl, text, transformers, webkit
      }:
      mkDerivation {
        pname = "ghcjs-dom";
        version = "0.1.1.3";
        sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly";
-       buildDepends = [ base glib gtk3 mtl text transformers webkitgtk3 ];
+       buildDepends = [ base glib gtk mtl text transformers webkit ];
        description = "DOM library that supports both GHCJS and WebKitGTK";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -54218,8 +54453,8 @@ self: {
      }:
      mkDerivation {
        pname = "gipeda";
-       version = "0.1.2";
-       sha256 = "0a32q4gi0vfmgvy4ir0ng52nk2gkfxcivyybh5bfh04b3saf5ya4";
+       version = "0.1.2.1";
+       sha256 = "0wra67d2jdnx463vw8hf2yzzwmnkbs9791x5mgarlgc6zj68g926";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -54227,7 +54462,6 @@ self: {
          gitlib gitlib-libgit2 scientific shake split tagged text
          unordered-containers vector yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
@@ -54280,20 +54514,20 @@ self: {
      , git, gnupg, gnutls, hinotify, hslogger, http-client, http-conduit
      , http-types, IfElse, json, lsof, MissingH, monad-control
      , monad-logger, mtl, network, network-info, network-multicast
-     , network-protocol-xmpp, network-uri, openssh, optparse-applicative
-     , path-pieces, perl, persistent, persistent-sqlite
-     , persistent-template, process, QuickCheck, random, regex-tdfa
-     , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare
-     , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
-     , template-haskell, text, time, torrent, transformers, unix
-     , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls
-     , wget, which, xml-types, yesod, yesod-core, yesod-default
-     , yesod-form, yesod-static
+     , network-protocol-xmpp, network-uri, old-locale, openssh
+     , optparse-applicative, path-pieces, perl, persistent
+     , persistent-sqlite, persistent-template, process, QuickCheck
+     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
+     , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-rerun, template-haskell, text, time, torrent, transformers
+     , unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp
+     , warp-tls, wget, which, xml-types, yesod, yesod-core
+     , yesod-default, yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20150710";
-       sha256 = "0q7q8ikgv3dhvs3vad04z1bfa6l92v97jrh0n4zqc0c44wx9a3wp";
+       version = "5.20150731";
+       sha256 = "18akv0xj4mf2ypzzd12briv0rw9ba7xw8k1qxvl10m9z4x6gvvm2";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -54303,7 +54537,7 @@ self: {
          edit-distance esqueleto exceptions fdo-notify feed filepath gnutls
          hinotify hslogger http-client http-conduit http-types IfElse json
          MissingH monad-control monad-logger mtl network network-info
-         network-multicast network-protocol-xmpp network-uri
+         network-multicast network-protocol-xmpp network-uri old-locale
          optparse-applicative path-pieces persistent persistent-sqlite
          persistent-template process QuickCheck random regex-tdfa resourcet
          SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit
@@ -54739,8 +54973,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitit";
-       version = "0.11";
-       sha256 = "1833rxx3c28rvjz1h1nnm0h838zl941zr51r3dp89zn59rs72hn9";
+       version = "0.11.1";
+       sha256 = "06wxy4hpbkbmlwrgnsxbr47k2a791094gzqsmlqzhsq6wa1bgfr9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -55083,8 +55317,8 @@ self: {
      }:
      mkDerivation {
        pname = "glib";
-       version = "0.13.1.1";
-       sha256 = "1wa3kfwwb7hf5g0hw1vcmrgcxd4pykvzbvc6ylx7903vxqbb9574";
+       version = "0.13.2.1";
+       sha256 = "1pxc2a0hnjaryf3f8d410rnhxmc7byx6lwcypgqg4zma6r3qhqwp";
        buildDepends = [ base bytestring containers text utf8-string ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ glib ];
@@ -55277,9 +55511,10 @@ self: {
      mkDerivation {
        pname = "gloss-banana";
        version = "0.1.0.4";
+       revision = "1";
        sha256 = "0zzpdryfcqvxpzv53ymsvkm2nza9ryvzqgf3n89pnvrni91avgj3";
+       editedCabalFile = "232cec279cb20afd92056320c24d3d3041199b014981492ddbbe57eeff312a5a";
        buildDepends = [ base gloss reactive-banana ];
-       jailbreak = true;
        homepage = "https://github.com/Twey/gloss-banana";
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
@@ -55405,8 +55640,8 @@ self: {
     ({ mkDerivation, array, base, containers, deepseq, glpk, mtl }:
      mkDerivation {
        pname = "glpk-hs";
-       version = "0.3.4";
-       sha256 = "0wyasd0dqi5nnh52lx980vnyhm0rwib0sd7qnpj4s9hq8rn994cm";
+       version = "0.3.5";
+       sha256 = "1nx0mcy009cj1h2fsz00qfpr9zawagwsp3w370251hdc5q6bw52p";
        buildDepends = [ array base containers deepseq mtl ];
        extraLibraries = [ glpk ];
        description = "Comprehensive GLPK linear programming bindings";
@@ -56343,14 +56578,16 @@ self: {
      }) {};
 
   "graphics-drawingcombinators" = callPackage
-    ({ mkDerivation, base, bitmap, FTGL, OpenGL, stb-image }:
+    ({ mkDerivation, base, bitmap, bitmap-opengl, FTGL, OpenGL
+     , stb-image
+     }:
      mkDerivation {
        pname = "graphics-drawingcombinators";
-       version = "1.5";
-       sha256 = "064g5zcdm0xpczyf8xwx0q0yr6jrd54461qpfxbvsh90lq0pa051";
+       version = "1.5.1";
+       sha256 = "0j0ilr54pdz61c78khy8bm37g89cvk1n56h5d6c55jabsv5gx3sf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bitmap FTGL OpenGL stb-image ];
+       buildDepends = [ base bitmap bitmap-opengl FTGL OpenGL stb-image ];
        jailbreak = true;
        homepage = "http://github.com/luqui/graphics-drawingcombinators";
        description = "A functional interface to 2D drawing in OpenGL";
@@ -56586,6 +56823,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gridland" = callPackage
+    ({ mkDerivation, array, astar, base, containers, grid, htiled, mtl
+     , random, safe, SDL, SDL-gfx, SDL-image, SDL-mixer, tuple, vector
+     }:
+     mkDerivation {
+       pname = "gridland";
+       version = "0.1.0.3";
+       sha256 = "0q5p73n6h5ngg992f1msdqzxds2baafjypdx53zf2rdhbqp4fdi9";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         array astar base containers grid htiled mtl random safe SDL SDL-gfx
+         SDL-image SDL-mixer tuple vector
+       ];
+       description = "Grid-based multimedia engine";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "grm" = callPackage
     ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, happy
      , parsec, process, syb, wl-pprint
@@ -57265,8 +57520,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3";
-       version = "0.13.9";
-       sha256 = "1zmcvp295sknc2h529nprclw11lnwp79dniyyg573wc99bdzijvr";
+       version = "0.14.0";
+       sha256 = "1j6nwjvjmzb144vbizraax0yf5bbkicg5hx2mm4z9ayacf58sm7c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -57276,7 +57531,7 @@ self: {
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ gtk3 ];
        homepage = "http://projects.haskell.org/gtk2hs/";
-       description = "Binding to the Gtk+ graphical user interface library";
+       description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
      }) { gtk3 = null;};
 
@@ -57286,8 +57541,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3-mac-integration";
-       version = "0.3.1.1";
-       sha256 = "0j6fpzk1gq1y15cjpkq3k1azkn7xvlqiidn3m0g9czz5iy303adv";
+       version = "0.3.2.0";
+       sha256 = "0m7659ca92w9yhd1fnraa255sx74qjagwsavd3navl41h687bzqj";
        buildDepends = [ array base containers glib gtk3 mtl ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ gtk-mac-integration-gtk3 ];
@@ -57375,8 +57630,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtksourceview3";
-       version = "0.13.1.5";
-       sha256 = "15bm58pr92izhwa0sqf8vkzfcg1455947cgl29ak2kwaj3fkzbq1";
+       version = "0.13.2.0";
+       sha256 = "0chn0rl5kkfi7y02h1x0gfkpbm4hfcl6pxrbdpfv20jk4m88a0qj";
        buildDepends = [ array base containers glib gtk3 mtl text ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ gtksourceview ];
@@ -58808,10 +59063,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadoop-tools";
-       version = "0.6";
-       revision = "2";
-       sha256 = "1nkkv9i0qk4k9vijabf1lylq8wsfsycllxvkza7abljii5jpj5fp";
-       editedCabalFile = "31166d3ed285e22977d237a1ae42d29b33503ad7be39c11f97b5890571da19ec";
+       version = "0.7.2";
+       sha256 = "0grwi26xardg8fxvz7g10v9111bgph77s3pdrr58r9hqgm8lhx5v";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -59089,11 +59342,12 @@ self: {
      , process, QuickCheck, random, regex-base, regex-tdfa, snap-core
      , snap-server, system-filepath, tagsoup, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
+     , time-locale-compat
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.7.2.0";
-       sha256 = "0krj7kaikdbxiqkcd5c3pyhp3zchgy74dzx336f8x1ywlja4802r";
+       version = "4.7.2.2";
+       sha256 = "1gy7j15qqh8m0wf8xkpb1hglahylwyy7vq6c4bm9arap3viak29c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -59102,6 +59356,7 @@ self: {
          http-conduit http-types lrucache mtl network network-uri pandoc
          pandoc-citeproc parsec process random regex-base regex-tdfa
          snap-core snap-server system-filepath tagsoup text time
+         time-locale-compat
        ];
        testDepends = [
          base binary blaze-html blaze-markup bytestring cmdargs containers
@@ -59143,6 +59398,7 @@ self: {
          Agda base containers directory filepath hakyll mtl pandoc
          transformers xhtml
        ];
+       jailbreak = true;
        homepage = "https://github.com/bitonic/hakyll-agda";
        description = "Wrapper to integrate literate Agda files with Hakyll";
        license = stdenv.lib.licenses.bsd3;
@@ -59659,6 +59915,7 @@ self: {
        isExecutable = true;
        buildDepends = [ base glib gtk3 text ];
        pkgconfigDepends = [ appindicator ];
+       jailbreak = true;
        homepage = "https://github.com/mlacorte/happindicator3";
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
@@ -60654,17 +60911,16 @@ self: {
 
   "hashable-extras" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, directory, doctest
-     , filepath, generic-deriving, hashable, transformers
+     , filepath, hashable, transformers
      }:
      mkDerivation {
        pname = "hashable-extras";
-       version = "0.2.1";
-       sha256 = "02hzffyns0id9vhaqzax7ijprh1pfb8llrfi67hmji2wrh3nvmml";
+       version = "0.2.2";
+       sha256 = "118l23n78xs1faa0q42h996q210l2p9mzl85a73krljzsz8wkc1b";
        buildDepends = [
-         base bifunctors bytestring generic-deriving hashable transformers
+         base bifunctors bytestring hashable transformers
        ];
        testDepends = [ base directory doctest filepath ];
-       jailbreak = true;
        homepage = "http://github.com/analytics/hashable-extras/";
        description = "Higher-rank Hashable";
        license = stdenv.lib.licenses.bsd3;
@@ -62209,8 +62465,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskellscrabble";
-       version = "1.0";
-       sha256 = "099qhvi7v7bimjqdlnz6scmyr7xqxjk65y861630n9jr133bclnz";
+       version = "1.1";
+       sha256 = "1wb9ncpzsacvwk8gmh8gzxm54viwlzsikj05lk14gpyp8xwhl54h";
        buildDepends = [
          array arrows base containers errors mtl parsec QuickCheck random
          safe semigroups split transformers unordered-containers
@@ -62890,26 +63146,25 @@ self: {
      }) {};
 
   "haste-compiler" = callPackage
-    ({ mkDerivation, array, base, binary, blaze-builder, bytestring
-     , bzlib, containers, data-binary-ieee754, data-default, directory
-     , either, filepath, ghc, ghc-paths, ghc-prim, HTTP, monads-tf, mtl
-     , network, network-uri, process, random, shellmate, system-fileio
-     , tar, transformers, utf8-string, websockets
+    ({ mkDerivation, array, base, bin-package-db, binary, blaze-builder
+     , bytestring, bzlib, Cabal, containers, data-binary-ieee754
+     , data-default, directory, either, filepath, ghc, ghc-paths
+     , ghc-prim, ghc-simple, HTTP, monads-tf, mtl, network, network-uri
+     , process, random, shellmate, system-fileio, tar, terminfo
+     , transformers, unix, utf8-string, websockets
      }:
      mkDerivation {
        pname = "haste-compiler";
-       version = "0.4.4.4";
-       revision = "1";
-       sha256 = "19raiciwll7pgc73h2h704yi9wcifcn7s2gxyjrndp6d7kf1ygyy";
-       editedCabalFile = "de636e39473869692b1fa1dd6047fc2987b6f63c1403a511aab6bd1dcaa98f6f";
+       version = "0.5.0";
+       sha256 = "18n9sl9m2fpzshpj3gqvd7wlmvz5mrgsz8awcd3imcb7136qa9s9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array base binary blaze-builder bytestring bzlib containers
-         data-binary-ieee754 data-default directory either filepath ghc
-         ghc-paths ghc-prim HTTP monads-tf mtl network network-uri process
-         random shellmate system-fileio tar transformers utf8-string
-         websockets
+         array base bin-package-db binary blaze-builder bytestring bzlib
+         Cabal containers data-binary-ieee754 data-default directory either
+         filepath ghc ghc-paths ghc-prim ghc-simple HTTP monads-tf mtl
+         network network-uri process random shellmate system-fileio tar
+         terminfo transformers unix utf8-string websockets
        ];
        configureFlags = [ "-fportable" ];
        homepage = "http://haste-lang.org/";
@@ -63897,19 +64152,19 @@ self: {
      }) {};
 
   "hdocs" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , filepath, ghc, ghc-paths, haddock-api, haddock-library
-     , MonadCatchIO-transformers, mtl, network, process, text
-     , transformers
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal
+     , containers, filepath, ghc, ghc-paths, haddock-api
+     , haddock-library, MonadCatchIO-transformers, mtl, network, process
+     , text, transformers
      }:
      mkDerivation {
        pname = "hdocs";
-       version = "0.4.3.0";
-       sha256 = "10z4aq9f3gy6cqkhz0dxp0q3rr9625hka3c4w4cbczad2qgciiil";
+       version = "0.4.4.0";
+       sha256 = "153rwd1f390j6sjfxx135h3bh80pb8zb5myws9q8d0jkrx2sl198";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson aeson-pretty base bytestring containers filepath ghc
+         aeson aeson-pretty base bytestring Cabal containers filepath ghc
          ghc-paths haddock-api haddock-library MonadCatchIO-transformers mtl
          network process text transformers
        ];
@@ -63961,6 +64216,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "headergen" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+     , filepath, haskeline, time
+     }:
+     mkDerivation {
+       pname = "headergen";
+       version = "0.2.0.0";
+       sha256 = "1hc1pmbj9452k4a71iiazxg6id7caf783m08lqnf3flf77cdjxpa";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson aeson-pretty base bytestring directory filepath haskeline
+         time
+       ];
+       homepage = "https://github.com/aka-bash0r/headergen";
+       description = "Creates a header for a haskell source file";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "heap" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -64057,10 +64331,9 @@ self: {
     ({ mkDerivation, aeson, base, hedis, scientific, text, time }:
      mkDerivation {
        pname = "hedis-config";
-       version = "0.0.1";
-       sha256 = "1c524klmsl8n6alphxdmwm4hw05hhq3rcyb5540ksnnys77b8y2b";
+       version = "0.0.2";
+       sha256 = "1ism20ddgcdsypbic6ikalvajq3918wm53ppiic68zaqfzwk9gk2";
        buildDepends = [ aeson base hedis scientific text time ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/s9gf4ult/hedis-config";
        description = "Easy trivial configuration for Redis";
        license = stdenv.lib.licenses.bsd3;
@@ -64072,13 +64345,12 @@ self: {
      }:
      mkDerivation {
        pname = "hedis-monadic";
-       version = "0.0.3";
-       sha256 = "1z80kdm1cs1pk6fpbby20q49ji840zp9xwbynbry2v43g5q18lq6";
+       version = "0.0.4";
+       sha256 = "1540c4ra65y2kc97n7wxx7rdzf3dkaqqx7r4lwz4qpg3kzfi6q8w";
        buildDepends = [
          base hedis monad-control mtl transformers transformers-base
          transformers-compat
        ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/s9gf4ult/redis-monadic";
        description = "A la MonadReader for Redis connection";
        license = stdenv.lib.licenses.bsd3;
@@ -65011,31 +65283,30 @@ self: {
 
   "heyefi" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, configurator
-     , containers, directory, errors, exceptions, filemanip, filepath
-     , HandsomeSoup, hspec, HTTP, http-types, hxt, iso8601-time
-     , MissingH, mtl, multipart, old-locale, optparse-applicative
-     , random, silently, stm, tar, temporary, text, time, transformers
-     , unix, unordered-containers, utf8-string, wai, warp
+     , containers, directory, exceptions, filepath, HandsomeSoup, hspec
+     , http-types, hxt, iso8601-time, MissingH, mtl, multipart
+     , optparse-applicative, random, silently, stm, tar, temporary, text
+     , time, transformers, unix, unordered-containers, utf8-string, wai
+     , warp
      }:
      mkDerivation {
        pname = "heyefi";
-       version = "0.1.1.0";
-       sha256 = "13m66ix0kmvqwgvqh56mjdwgwpjjqi67hyr6giwhs63fr3wxw3f3";
+       version = "0.1.1.1";
+       sha256 = "0dm9dyn12jgpc317pk5z3rhhgw2hbmbxyfba97jzq34b5z6crz0f";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bytestring case-insensitive configurator directory errors
-         exceptions filemanip filepath HandsomeSoup HTTP http-types hxt
-         iso8601-time MissingH mtl multipart old-locale optparse-applicative
-         random stm tar temporary text time transformers unix
-         unordered-containers utf8-string wai warp
+         base bytestring case-insensitive configurator directory exceptions
+         filepath HandsomeSoup http-types hxt iso8601-time MissingH mtl
+         multipart optparse-applicative random stm tar temporary text time
+         transformers unix unordered-containers utf8-string wai warp
        ];
        testDepends = [
          base bytestring case-insensitive configurator containers directory
-         errors exceptions filemanip filepath HandsomeSoup hspec HTTP
-         http-types hxt iso8601-time MissingH mtl multipart old-locale
-         optparse-applicative random silently stm tar temporary text time
-         transformers unix unordered-containers utf8-string wai warp
+         exceptions filepath HandsomeSoup hspec http-types hxt iso8601-time
+         MissingH mtl multipart optparse-applicative random silently stm tar
+         temporary text time transformers unix unordered-containers
+         utf8-string wai warp
        ];
        homepage = "https://github.com/ryantm/heyefi";
        description = "A server for Eye-Fi SD cards";
@@ -65246,6 +65517,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hgearman" = callPackage
+    ({ mkDerivation, base, binary, bytestring, monad-control, mtl
+     , network, resource-pool, transformers, transformers-base
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "hgearman";
+       version = "0.1.0.2";
+       sha256 = "0bfipd7s6czp3aha0jx1yjzfzn8vywiswd07k68q2207j3br8yxk";
+       buildDepends = [
+         base binary bytestring monad-control mtl network resource-pool
+         transformers transformers-base unordered-containers
+       ];
+       description = "A Gearman client for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hgen" = callPackage
     ({ mkDerivation, base, directory, filepath, hylolib, mtl, random }:
      mkDerivation {
@@ -65612,20 +65900,21 @@ self: {
      }) {};
 
   "highjson" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, hashable
-     , hspec, hvect, scientific, text, unordered-containers, vector
+    ({ mkDerivation, attoparsec, base, buffer-builder, bytestring
+     , containers, hashable, hspec, hvect, QuickCheck, scientific, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "highjson";
-       version = "0.1.0.0";
-       sha256 = "1j0gcbgawimzr8vvglikmdr8q58zvvak68k8221ljydppanc30k0";
+       version = "0.2.0.2";
+       sha256 = "07qz7zb53vbpb9ixrw0qwn5qhvgwzvrvfkp343a1cvbb42slpmkz";
        buildDepends = [
-         attoparsec base bytestring containers hashable hvect scientific
-         text unordered-containers vector
+         attoparsec base buffer-builder bytestring containers hashable hvect
+         scientific text unordered-containers vector
        ];
-       testDepends = [ base hspec text ];
+       testDepends = [ base hspec QuickCheck text ];
        homepage = "https://github.com/agrafix/highjson";
-       description = "Very fast JSON parsing";
+       description = "Very fast JSON serialisation and parsing library";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -66363,8 +66652,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsmin";
-       version = "0.1.4.7";
-       sha256 = "1gw9is6piqrqxnrwp8v3vij90icmym58rxqnnklrcjfi3ai7y58f";
+       version = "0.1.5.0";
+       sha256 = "1mzi7czzw1b8avkfzmsl79hqg57dcrcfp6klzx15drnbl7c1zn7l";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -66376,7 +66665,7 @@ self: {
          language-javascript QuickCheck test-framework test-framework-hunit
          text
        ];
-       homepage = "http://github.com/alanz/hjsmin";
+       homepage = "http://github.com/erikd/hjsmin";
        description = "Haskell implementation of a javascript minifier";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66564,12 +66853,11 @@ self: {
     ({ mkDerivation, base, hledger-lib, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.3";
-       sha256 = "0m2wbjbihv0zlz2y3khy81xhh2c261fb4wr55csqy22rds73fwy8";
+       version = "0.2.0.4";
+       sha256 = "1p0b2xc2axsigmbc5lhl12acsjjvn0j8gjlwp3v4ggyanwyj686r";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base hledger-lib time ];
-       jailbreak = true;
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
@@ -67145,6 +67433,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hmenu" = callPackage
+    ({ mkDerivation, base, MissingH, process }:
+     mkDerivation {
+       pname = "hmenu";
+       version = "0.1.0.1";
+       sha256 = "0ym3nzyx1jwcc7m6qj8zchs2q73rj82d7f1r2rvykhns7ca20hrp";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base MissingH process ];
+       jailbreak = true;
+       description = "CLI fuzzy finder and launcher";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hmidi" = callPackage
     ({ mkDerivation, base, stm }:
      mkDerivation {
@@ -68423,17 +68725,18 @@ self: {
      }) {};
 
   "hothasktags" = callPackage
-    ({ mkDerivation, base, cmdargs, containers, cpphs, filepath
-     , haskell-src-exts
+    ({ mkDerivation, array, base, containers, cpphs, filepath
+     , haskell-src-exts, optparse-applicative, split
      }:
      mkDerivation {
        pname = "hothasktags";
-       version = "0.3.3";
-       sha256 = "1nyr77lm813v521fhhsd3zf7hlpad70g1aj729plrwaxj8c0cizl";
+       version = "0.3.4";
+       sha256 = "0pnp0xkqk2l29p5kr3kjmxl7hb8g1qd198n36vmfx1x8kc8bahdy";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base cmdargs containers cpphs filepath haskell-src-exts
+         array base containers cpphs filepath haskell-src-exts
+         optparse-applicative split
        ];
        homepage = "http://github.com/luqui/hothasktags";
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
@@ -68471,6 +68774,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hourglass-fuzzy-parsing" = callPackage
+    ({ mkDerivation, base, hourglass, parsec }:
+     mkDerivation {
+       pname = "hourglass-fuzzy-parsing";
+       version = "0.1.0.1";
+       sha256 = "188mw1z8n650y3qik98x2m70sr8q66x4l4pg34mirk6kg4mgzy37";
+       buildDepends = [ base hourglass parsec ];
+       homepage = "https://gitlab.com/doshitan/hourglass-fuzzy-parsing";
+       description = "A small library for parsing more human friendly date/time formats";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hp2any-core" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , directory, filepath, network, old-locale, process, time
@@ -68862,8 +69177,8 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.1.3";
-       sha256 = "1fy2bnk8jlakfgvap9ma5qxyvqgl25dbqk7a7n9m4q0z8ba0s1di";
+       version = "2.1.4";
+       sha256 = "01848yssmpi0fgkgnlgwmcrmkmpdqc6yc19z91kj46sl187k2k8j";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -69063,8 +69378,8 @@ self: {
      }:
      mkDerivation {
        pname = "hreader";
-       version = "0.1.0";
-       sha256 = "102i17879ha49yh87i9k5lxrlrjd1fxcb8k8adidqwghbn55dyjc";
+       version = "0.2.0";
+       sha256 = "1a0zllljfjpz6fwq2h0l5wwl1wg1v68n6r84fs70vnny0c3wl6hg";
        buildDepends = [
          base exceptions hset mmorph monad-control mtl transformers-base
        ];
@@ -69094,15 +69409,14 @@ self: {
      }:
      mkDerivation {
        pname = "hruby";
-       version = "0.3.1.4";
-       sha256 = "0pymwdpdl1xwjcgpblsrfyyib4sz2avxwidgxzr2bac91lhf3fpm";
+       version = "0.3.1.5";
+       sha256 = "1x9j3rc3kk64l8idkar35ap4y5kxh4abfssd2iphp8dqnjld3jxa";
        buildDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
        ];
        testDepends = [ aeson attoparsec base QuickCheck text vector ];
        extraLibraries = [ ruby ];
-       jailbreak = true;
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ruby;};
@@ -70330,25 +70644,27 @@ self: {
      , bin-package-db, bytestring, Cabal, containers, deepseq, directory
      , exceptions, filepath, fsnotify, ghc, ghc-mod, ghc-paths
      , haddock-api, haskell-src-exts, hdocs, hlint, HTTP, lens
-     , monad-loops, MonadCatchIO-transformers, mtl, network, process
+     , lifted-base, monad-control, monad-loops
+     , MonadCatchIO-transformers, mtl, network, process
      , regex-pcre-builtin, scientific, simple-log, system-filepath
-     , template-haskell, text, time, transformers, uniplate, unix
-     , unordered-containers, vector
+     , template-haskell, text, time, transformers, transformers-base
+     , uniplate, unix, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.4.0";
-       sha256 = "1m7pfrzi23wq7b3bwp4fc885di96gkg453q8xmlwdip37mh2swgz";
+       version = "0.1.4.1";
+       sha256 = "180xrxamas2fg2366k3cpy7al8mq82d1hgjrs7i1r2s3gr877xz8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson aeson-pretty array attoparsec base bin-package-db bytestring
          Cabal containers deepseq directory exceptions filepath fsnotify ghc
          ghc-mod ghc-paths haddock-api haskell-src-exts hdocs hlint HTTP
-         lens monad-loops MonadCatchIO-transformers mtl network process
-         regex-pcre-builtin scientific simple-log system-filepath
-         template-haskell text time transformers uniplate unix
-         unordered-containers vector
+         lens lifted-base monad-control monad-loops
+         MonadCatchIO-transformers mtl network process regex-pcre-builtin
+         scientific simple-log system-filepath template-haskell text time
+         transformers transformers-base uniplate unix unordered-containers
+         vector
        ];
        testDepends = [ base ];
        jailbreak = true;
@@ -70508,8 +70824,8 @@ self: {
     ({ mkDerivation, base, HUnit, mtl }:
      mkDerivation {
        pname = "hset";
-       version = "1.0.1";
-       sha256 = "1iix3syq0cvpiwf6qr6hvcxii6qlzwqcnm416pvndcm7ymkhw04v";
+       version = "1.1.0";
+       sha256 = "15ls3wkk29mf2nyrm80dcmg66q0dd0srgwyv46ix3zkaxs239mbl";
        buildDepends = [ base mtl ];
        testDepends = [ base HUnit mtl ];
        homepage = "https://bitbucket.org/s9gf4ult/hset";
@@ -70523,8 +70839,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsexif";
-       version = "0.6.0.3";
-       sha256 = "02jpp2p8xmhmx6srpcm330k73x306h34ik2rdavfwpgw5mjk88hl";
+       version = "0.6.0.4";
+       sha256 = "0k9a6d6c2n0x5g6vls4848gydnvw790lf1nyy5piz1rdzsd6bx3k";
        buildDepends = [
          base binary bytestring containers iconv text time
        ];
@@ -71151,8 +71467,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.1.8";
-       sha256 = "0nfg9pmlvp8gnllfx01sfslhznjs5xa432ag9s2q2r7c17bxfnwf";
+       version = "2.1.10";
+       sha256 = "0m51afa2n187jjx0fwarg11chakhv3z7fbmqq5rr7j60d9ix9ypq";
        buildDepends = [
          base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
          transformers
@@ -71197,17 +71513,13 @@ self: {
      }) {};
 
   "hspec-contrib" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, HUnit, logging-facade
-     , QuickCheck
-     }:
+    ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }:
      mkDerivation {
        pname = "hspec-contrib";
-       version = "0.2.2";
-       sha256 = "1jdiv41kf73x8rygj7439wrgm345qlfbkshhdy8ikrqs1k43grw6";
-       buildDepends = [ base hspec-core HUnit logging-facade ];
-       testDepends = [
-         base hspec hspec-core HUnit logging-facade QuickCheck
-       ];
+       version = "0.3.0";
+       sha256 = "006syw8xagfhsx06ws9ywig1qx5lk4cgl7sq6pbid1s64c72mxn4";
+       buildDepends = [ base hspec-core HUnit ];
+       testDepends = [ base hspec hspec-core HUnit QuickCheck ];
        homepage = "http://hspec.github.io/";
        description = "Contributed functionality for Hspec";
        license = stdenv.lib.licenses.mit;
@@ -71221,8 +71533,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.1.8";
-       sha256 = "07jhiw0492xcgiidpyizqwaqjja23m35179s12vb54gw4xbh7b6q";
+       version = "2.1.10";
+       sha256 = "1q0fnag7lw54zf6aj55cckcfzs5ykpc841bczap6q9gnwrvpwbk8";
        buildDepends = [
          ansi-terminal async base deepseq hspec-expectations HUnit
          QuickCheck quickcheck-io random setenv tf-random time transformers
@@ -71241,8 +71553,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.1.8";
-       sha256 = "1pyk901rngv1yv4p502qcbbhhw6sgdsdmdwxk1f5r1s7gkvbd9n4";
+       version = "2.1.10";
+       sha256 = "02qs0y7nn8wczjjs606d8ivixxib0024kny2al6mgvxyp524xcgg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base directory filepath ];
@@ -71256,8 +71568,8 @@ self: {
     ({ mkDerivation, base, HUnit }:
      mkDerivation {
        pname = "hspec-expectations";
-       version = "0.7.0";
-       sha256 = "1gzjnmhi6ia2p5i5jlnj4586rkml5af8f7ijgipzs6fczpx7ds4l";
+       version = "0.7.1";
+       sha256 = "0n52k7qwqc5awig08fvajvymb9bb235q6pp8w0cbcb9a96rwdjmg";
        buildDepends = [ base HUnit ];
        homepage = "https://github.com/sol/hspec-expectations#readme";
        description = "Catchy combinators for HUnit";
@@ -71718,6 +72030,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) { qt5 = null;};
 
+  "hsqml-datamodel" = callPackage
+    ({ mkDerivation, base, hsqml, qt5, template-haskell, text }:
+     mkDerivation {
+       pname = "hsqml-datamodel";
+       version = "0.0.0.1";
+       sha256 = "16q92q00q96kyg41xh8smp5vvkvlfrps6nj7ds1y09msdqvihw9v";
+       buildDepends = [ base hsqml template-haskell text ];
+       pkgconfigDepends = [ qt5 ];
+       homepage = "https://github.com/marcinmrotek/hsqml-datamodel";
+       description = "HsQML (Qt5) data model";
+       license = stdenv.lib.licenses.bsd3;
+     }) { qt5 = null;};
+
+  "hsqml-datamodel-vinyl" = callPackage
+    ({ mkDerivation, base, exceptions, hsqml-datamodel, type-list
+     , vinyl
+     }:
+     mkDerivation {
+       pname = "hsqml-datamodel-vinyl";
+       version = "0.1.0.0";
+       sha256 = "0jg3jl1h4jf92vazyf7wb88dhrl89zm9hh21hymzy3pnc5kssd91";
+       buildDepends = [ base exceptions hsqml-datamodel type-list vinyl ];
+       homepage = "https://github.com/marcinmrotek/hsqml-datamodel-vinyl";
+       description = "HsQML DataModel instances for Vinyl Rec";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hsqml-demo-morris" = callPackage
     ({ mkDerivation, base, containers, deepseq, directory, hsqml
      , OddWord, text
@@ -72204,8 +72543,8 @@ self: {
      }) {};
 
   "htar" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib, directory, filepath
-     , old-locale, tar, time, zlib
+    ({ mkDerivation, base, bytestring, bzlib, directory, filepath, tar
+     , time, zlib
      }:
      mkDerivation {
        pname = "htar";
@@ -72214,9 +72553,8 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bytestring bzlib directory filepath old-locale tar time zlib
+         base bytestring bzlib directory filepath tar time zlib
        ];
-       jailbreak = true;
        description = "Command-line tar archive utility";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72584,8 +72922,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.18";
-       sha256 = "0skla9kvlak482fsk21gz57jcwc568x3q62nkanxjn1pgxc1jili";
+       version = "0.4.18.1";
+       sha256 = "0v0mmsbh8hgzkxyg7gkn3dlq5l21ljzbxr9c3wmmz6viwhhabfv9";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -72759,8 +73097,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit";
-       version = "2.1.7.1";
-       sha256 = "15caswd172i8hzwmxsd3rynnfz96v5iqg9avv1ybydikvvgbqx56";
+       version = "2.1.7.2";
+       sha256 = "0inw95a2vdmsffh3ns1kh8hr7xrx2pbgdrq0yv68bwf1v4sd1mfc";
        buildDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -72904,19 +73242,20 @@ self: {
      }) {};
 
   "http-link-header" = callPackage
-    ({ mkDerivation, attoparsec, base, errors, hspec, hspec-attoparsec
-     , network-uri, QuickCheck, text
+    ({ mkDerivation, attoparsec, base, bytestring-conversion, errors
+     , hspec, hspec-attoparsec, network-uri, QuickCheck, text
      }:
      mkDerivation {
        pname = "http-link-header";
-       version = "0.1.0";
-       sha256 = "1lcl0ylj8lq0i2b806k1yqvzbv9dg1m4ka9bmvmhz4z78kiahck1";
-       buildDepends = [ attoparsec base errors network-uri text ];
+       version = "0.2.0";
+       sha256 = "0vdmb0w7ppss8lffdghn9d2vjawn6nvhx7cx1dcvl4fllxfiaihc";
+       buildDepends = [
+         attoparsec base bytestring-conversion errors network-uri text
+       ];
        testDepends = [ base hspec hspec-attoparsec QuickCheck text ];
-       jailbreak = true;
        homepage = "https://github.com/myfreeweb/http-link-header";
        description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\"";
-       license = stdenv.lib.licenses.asl20;
+       license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "http-media" = callPackage
@@ -73150,8 +73489,8 @@ self: {
      }:
      mkDerivation {
        pname = "http2";
-       version = "1.0.2";
-       sha256 = "0wkzphzxzzvqm947l759vxnl6g60nrx7jygyxdlxfgxi51fd7gap";
+       version = "1.0.3";
+       sha256 = "075j4xhfmgiij431zn5mzmq6m40fj74l5f5wckqa22aq2ay19p8c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -74511,18 +74850,17 @@ self: {
      }:
      mkDerivation {
        pname = "hyperloglog";
-       version = "0.3.3.1";
-       sha256 = "1ns0vz80byssmi39mgdkprpwy26szbmfqqzs1lb6amqf7nx4i14l";
+       version = "0.3.4";
+       sha256 = "122qdkg1xwyhbxll5zimp8w6j79i30102g3iqf41lrbrx0xllpag";
        buildDepends = [
          approximate base binary bits bytes cereal cereal-vector comonad
-         deepseq distributive generic-deriving hashable hashable-extras lens
-         reflection safecopy semigroupoids semigroups siphash tagged vector
+         deepseq distributive hashable hashable-extras lens reflection
+         safecopy semigroupoids semigroups siphash tagged vector
        ];
        testDepends = [
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
-       jailbreak = true;
        homepage = "http://github.com/analytics/hyperloglog";
        description = "An approximate streaming (constant space) unique object counter";
        license = stdenv.lib.licenses.bsd3;
@@ -74560,14 +74898,16 @@ self: {
      }) {};
 
   "hyphenation" = callPackage
-    ({ mkDerivation, base, containers, directory, doctest, filepath
-     , unordered-containers
+    ({ mkDerivation, base, bytestring, containers, directory, doctest
+     , filepath, unordered-containers, zlib
      }:
      mkDerivation {
        pname = "hyphenation";
-       version = "0.5";
-       sha256 = "10xw74d1q2kz8mv8gspa9amgax5a864iz9jxihyjcs9x1pgh762a";
-       buildDepends = [ base containers unordered-containers ];
+       version = "0.6";
+       sha256 = "1xqj4na1gm40ssirc4k70r27bzxhg2dkiipp48a5hqwgq5k3crrg";
+       buildDepends = [
+         base bytestring containers unordered-containers zlib
+       ];
        testDepends = [
          base containers directory doctest filepath unordered-containers
        ];
@@ -74722,14 +75062,14 @@ self: {
      }) {};
 
   "ib-api" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, network }:
+    ({ mkDerivation, attoparsec, base, bytestring, network, unix }:
      mkDerivation {
        pname = "ib-api";
-       version = "0.1.0.0";
-       revision = "1";
-       sha256 = "1030bj90myx5x3y297qmlmnzppfnh5d3cmwglqj1s7i6nyrh86k5";
-       editedCabalFile = "7cb1fe96767e6253ef55d4997404eb3f4048f1b9bfccfb9e6cca627a734c3bcd";
-       buildDepends = [ attoparsec base bytestring network ];
+       version = "0.1.0.1";
+       sha256 = "0zswsb7mvbm8zycb14sks2kvg4jy2wn3vc7z6lb00s0alm1v0srk";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ attoparsec base bytestring network unix ];
        jailbreak = true;
        homepage = "https://github.com/rbermani/ib-api";
        description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell";
@@ -75104,8 +75444,8 @@ self: {
      }:
      mkDerivation {
        pname = "ig";
-       version = "0.3";
-       sha256 = "1sg1dbwjvhixy7qgchg6a2nh76jyp3qlwancj3fcn7c87fmhxdqg";
+       version = "0.3.1";
+       sha256 = "0ggr6h5inwwxvqs9qywiagi1c5bx1vky5h0zvhz0df88nbfd3d21";
        buildDepends = [
          aeson base base16-bytestring bytestring conduit conduit-extra
          crypto-api cryptohash cryptohash-cryptoapi data-default
@@ -76107,20 +76447,20 @@ self: {
      }) {};
 
   "informative" = callPackage
-    ({ mkDerivation, base, csv, highlighting-kate, http-conduit
-     , monad-logger, pandoc, persistent, persistent-postgresql
-     , shakespeare, text, time, time-locale-compat, yesod, yesod-auth
-     , yesod-core, yesod-form
+    ({ mkDerivation, base, containers, csv, highlighting-kate
+     , http-conduit, monad-logger, pandoc, persistent
+     , persistent-postgresql, shakespeare, text, time
+     , time-locale-compat, yesod, yesod-auth, yesod-core, yesod-form
      }:
      mkDerivation {
        pname = "informative";
-       version = "0.1.0.7";
-       sha256 = "0xzckvbscs3946y7sscx15mixyh3xhahjmwli72311gmyxkf767y";
+       version = "0.1.0.20";
+       sha256 = "1xglpqwr4bc7rqaspq7w6pc9g5ilzvxfb6lfkji3inagg5xksl7n";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base csv highlighting-kate http-conduit monad-logger pandoc
-         persistent persistent-postgresql shakespeare text time
+         base containers csv highlighting-kate http-conduit monad-logger
+         pandoc persistent persistent-postgresql shakespeare text time
          time-locale-compat yesod yesod-auth yesod-core yesod-form
        ];
        jailbreak = true;
@@ -76147,8 +76487,8 @@ self: {
      }:
      mkDerivation {
        pname = "inilist";
-       version = "0.1.0.0";
-       sha256 = "18f93kvc5x0y1wqcicrh510r3skldf52jn0n6cxyn7fk2271cc1b";
+       version = "0.2.0.0";
+       sha256 = "1rr71yajc6j0idsqgna8mbnawiv6iw1x8kswkv7x2l0ih89r6y3a";
        buildDepends = [ base bifunctors containers safe trifecta ];
        testDepends = [
          base bifunctors containers deepseq HUnit safe tasty tasty-hunit
@@ -76337,7 +76677,9 @@ self: {
      mkDerivation {
        pname = "instant-generics";
        version = "0.5";
+       revision = "1";
        sha256 = "174avn0jjxv4h04m6k85gvv6x3kvrlwhcbhqg9ih0ps5mp7crmvr";
+       editedCabalFile = "c69a74fef28272e5e46a0e37711bb980ac07d2f3feeed3513da1cc572a1ab6bc";
        buildDepends = [ base containers syb template-haskell ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
        description = "Generic programming library with a sum of products view";
@@ -76361,8 +76703,11 @@ self: {
      mkDerivation {
        pname = "instant-zipper";
        version = "0.0.0";
+       revision = "1";
        sha256 = "0gd5hzlm5rlmzba2dl37al711vp1nn2b30d36rvb2j8y90y8c44c";
+       editedCabalFile = "a0e15510d3e3eefaa18d20fbfce7a1840519e160e2a8a8b36c498a3664b9c037";
        buildDepends = [ base instant-generics mtl ];
+       jailbreak = true;
        description = "Heterogenous Zipper in Instant Generics";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76715,13 +77060,22 @@ self: {
      }) {};
 
   "invariant" = callPackage
-    ({ mkDerivation, base, contravariant, hspec, QuickCheck }:
+    ({ mkDerivation, array, base, bifunctors, containers, contravariant
+     , ghc-prim, hspec, profunctors, QuickCheck, semigroups, stm, tagged
+     , template-haskell, transformers, transformers-compat
+     , unordered-containers
+     }:
      mkDerivation {
        pname = "invariant";
-       version = "0.1.2";
-       sha256 = "02p114wnpxbqxik4sz87bd9rcqfs9klgsxi9pc4v1qwyb64mb92b";
-       buildDepends = [ base contravariant ];
+       version = "0.2";
+       sha256 = "0zxzpbha3z4z23xmsbgajjxk477ad1v28ml3rry0102lpcpvl6j1";
+       buildDepends = [
+         array base bifunctors containers contravariant ghc-prim profunctors
+         semigroups stm tagged template-haskell transformers
+         transformers-compat unordered-containers
+       ];
        testDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/nfrisby/invariant-functors";
        description = "Haskell 98 invariant functors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76841,8 +77195,8 @@ self: {
      }:
      mkDerivation {
        pname = "io-streams";
-       version = "1.3.1.0";
-       sha256 = "1fic83lgvyji75gyx8c9ik9lj6jf65wbqmzp30siqmkhdp9y1rxf";
+       version = "1.3.2.0";
+       sha256 = "0gqj2adc3zlwz81wy38y8x4rihvhk4zm9xb0rd04a77nn15xlc0y";
        buildDepends = [
          attoparsec base bytestring bytestring-builder network primitive
          process text time transformers vector zlib-bindings
@@ -76854,7 +77208,6 @@ self: {
          time transformers vector zlib zlib-bindings
        ];
        configureFlags = [ "-fnointeractivetests" ];
-       jailbreak = true;
        description = "Simple, composable, and easy-to-use stream I/O";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77162,15 +77515,15 @@ self: {
      }:
      mkDerivation {
        pname = "irc-client";
-       version = "0.2.3.1";
-       sha256 = "1i5wsqkz8b0h3vc4xjb1n7dqjhqqlka1pchhwax9w9lvnhw5wl9v";
+       version = "0.2.4.0";
+       sha256 = "137ix1x2qy92v5naaq3lz3iyvbxvf32gnsq09flddadx88d51vv6";
        buildDepends = [
          base bytestring conduit data-default-class irc-conduit irc-ctcp
          old-locale stm stm-conduit text time transformers
        ];
        homepage = "https://github.com/barrucadu/irc-client";
        description = "An IRC client library";
-       license = "unknown";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -77192,15 +77545,15 @@ self: {
      }:
      mkDerivation {
        pname = "irc-conduit";
-       version = "0.1.1.2";
-       sha256 = "1ib75a7dp9f6v7zl51a5z1pvv0vpll6czf5i8zad7ajn3q9d4z3p";
+       version = "0.1.2.0";
+       sha256 = "1mw418frhbnk7gncilvb2c3cj4fvzm5fvafq0p28vggxisda9bkp";
        buildDepends = [
          async base bytestring conduit conduit-extra connection irc irc-ctcp
          network-conduit-tls text time tls transformers x509-validation
        ];
        homepage = "https://github.com/barrucadu/irc-conduit";
        description = "Streaming IRC message library using conduits";
-       license = "unknown";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "irc-core" = callPackage
@@ -77234,14 +77587,12 @@ self: {
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
        pname = "irc-ctcp";
-       version = "0.1.2.1";
-       revision = "1";
-       sha256 = "1bpn9i9mqmhiif6mhw6q9nzy5cwx1x1yh81216gkqc5gi43gsc5s";
-       editedCabalFile = "23e92ff7cad332b34f89273fe543e9b8b87a19b30fb1a18fad61c9c3952d0dce";
+       version = "0.1.3.0";
+       sha256 = "16mp9dpp57id760zc932dszd5r1ncskwwxrp0djka5r1alddjz6n";
        buildDepends = [ base bytestring text ];
        homepage = "https://github.com/barrucadu/irc-ctcp";
        description = "A CTCP encoding and decoding library for IRC clients";
-       license = "unknown";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "irc-fun-color" = callPackage
@@ -79287,19 +79638,22 @@ self: {
      }) {};
 
   "kademlia" = callPackage
-    ({ mkDerivation, base, bytestring, containers, mtl, network, stm
+    ({ mkDerivation, base, bytestring, containers, HUnit, mtl, network
+     , QuickCheck, stm, tasty, tasty-hunit, tasty-quickcheck
      , transformers, transformers-compat
      }:
      mkDerivation {
        pname = "kademlia";
-       version = "1.0.0.0";
-       revision = "1";
-       sha256 = "0f1kwflpizabzyal3x3p9sra3kxlgm2m14xfxnl4k3bndmj02sdb";
-       editedCabalFile = "2553e98d53372b8d4947c115dd696e33f526f0304e9ed39566e6beec276ca641";
+       version = "1.1.0.0";
+       sha256 = "0wjyslrhbms6cnm495g40yl6365h3vgjcka12lka8xdy89v3c0yy";
        buildDepends = [
          base bytestring containers mtl network stm transformers
          transformers-compat
        ];
+       testDepends = [
+         base bytestring containers HUnit mtl network QuickCheck stm tasty
+         tasty-hunit tasty-quickcheck transformers transformers-compat
+       ];
        homepage = "https://github.com/froozen/kademlia";
        description = "An implementation of the Kademlia DHT Protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -79887,15 +80241,14 @@ self: {
      , conduit-extra, containers, data-default, directory, filepath
      , fsnotify, hspec, http-client, http-conduit, http-reverse-proxy
      , http-types, HUnit, lifted-base, mtl, network, process, random
-     , regex-tdfa, stm, system-filepath, tar, template-haskell, text
-     , time, transformers, unix, unix-compat, unordered-containers
-     , vector, wai, wai-app-static, wai-extra, warp, warp-tls, yaml
-     , zlib
+     , regex-tdfa, stm, tar, template-haskell, text, time, transformers
+     , unix, unix-compat, unordered-containers, vector, wai
+     , wai-app-static, wai-extra, warp, warp-tls, yaml, zlib
      }:
      mkDerivation {
        pname = "keter";
-       version = "1.4.2.1";
-       sha256 = "1xwnprbmssvvymwyvcgczlsldplr2va53mzdphqs6969xhhpahh3";
+       version = "1.4.3.1";
+       sha256 = "0bsq6z7krisshcrkb528kixiw6liabb7chgk87088vn3gpwx048i";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -79903,9 +80256,9 @@ self: {
          case-insensitive conduit conduit-extra containers data-default
          directory filepath fsnotify http-client http-conduit
          http-reverse-proxy http-types lifted-base mtl network process
-         random regex-tdfa stm system-filepath tar template-haskell text
-         time transformers unix unix-compat unordered-containers vector wai
-         wai-app-static wai-extra warp warp-tls yaml zlib
+         random regex-tdfa stm tar template-haskell text time transformers
+         unix unix-compat unordered-containers vector wai wai-app-static
+         wai-extra warp warp-tls yaml zlib
        ];
        testDepends = [
          base bytestring conduit hspec HUnit transformers unix
@@ -80194,14 +80547,14 @@ self: {
      }) {};
 
   "kmeans-vector" = callPackage
-    ({ mkDerivation, base, mtl, QuickCheck, vector }:
+    ({ mkDerivation, base, mtl, probable, vector }:
      mkDerivation {
        pname = "kmeans-vector";
-       version = "0.3";
-       sha256 = "0n957b7pcq3v8kf4507crbrd172mv9g14p5hmpalfjzlpb3b5ll1";
+       version = "0.3.2";
+       sha256 = "1ckw3dmwwqzgbl0wcd6h435afjddqmim3y19p2wqcghxd2rk8bdv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl QuickCheck vector ];
+       buildDepends = [ base mtl probable vector ];
        homepage = "http://github.com/alpmestan/kmeans-vector";
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
        license = stdenv.lib.licenses.bsd3;
@@ -80323,6 +80676,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "kraken" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, mtl
+     }:
+     mkDerivation {
+       pname = "kraken";
+       version = "0.0.1";
+       sha256 = "1df6g65wrhzfz3kj9n4bcja09adr4qhl3kzv5vaxl37lbr9nwzr2";
+       buildDepends = [
+         aeson base bytestring http-client http-client-tls mtl
+       ];
+       description = "Kraken.io API client";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "krpc" = callPackage
     ({ mkDerivation, base, bencoding, bytestring, containers
      , data-default-class, hspec, lifted-base, monad-control
@@ -80634,8 +81002,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, read-bounded }:
      mkDerivation {
        pname = "lambda-options";
-       version = "0.7.0.0";
-       sha256 = "0y8q9k3lk71703qzm0bvqh30y7r5ms392gfzh2lcrqkr0mhlf89j";
+       version = "0.8.0.0";
+       sha256 = "1z9gmps06w458v8i3zpkalby83p367r3z9i0c312jxl0zp51q891";
        buildDepends = [ base containers mtl read-bounded ];
        jailbreak = true;
        homepage = "https://github.com/thomaseding/lambda-options";
@@ -80738,8 +81106,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot";
-       version = "5.0.2.2";
-       sha256 = "148s2qlwcs7g89a77xv07yjyjrcnd6x7alvghbldvv4p067f0n86";
+       version = "5.0.3";
+       sha256 = "1kbrmxz5604jzcx9l6j4lmbb0xqz2cmj0f30nmpzdkmzsqv1hfj2";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -80763,8 +81131,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-core";
-       version = "5.0.1";
-       sha256 = "06asm62k2nb32yr0z4sw70z0r4ikakgkph6zqhjw7wj14ic2nxbk";
+       version = "5.0.3";
+       sha256 = "12gawsimdqch61rh4zwvzrx6pqx8yd645wqpki8dr56wnmbhbr03";
        buildDepends = [
          base binary bytestring containers dependent-map dependent-sum
          dependent-sum-template directory edit-distance filepath haskeline
@@ -80789,8 +81157,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-haskell-plugins";
-       version = "5.0.2.1";
-       sha256 = "06jcx3qp87fk58cvnwljr4zyvlqcsfrq0nxg2m67kd2imyg10iyd";
+       version = "5.0.3";
+       sha256 = "0iya4zipjjaqrld0a1v334praw1vnw186scfsi6inqdg314jc7x1";
        buildDepends = [
          array arrows base bytestring containers data-memocombinators
          directory filepath haskell-src-exts hoogle HTTP IOSpec
@@ -80799,7 +81167,6 @@ self: {
          parsec pretty process QuickCheck regex-tdfa show split syb
          transformers utf8-string vector-space
        ];
-       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
@@ -80813,8 +81180,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-irc-plugins";
-       version = "5.0.1";
-       sha256 = "13ybjyx5x84g0w7l2yyni5yary59j4kpaqc4pl1942bp6y7lbfrp";
+       version = "5.0.3";
+       sha256 = "1v4zh2yjdgy9ix6dmxdh8j5iqyrixaln78c5jgpiyjcwgi17blrw";
        buildDepends = [
          base bytestring containers directory filepath lambdabot-core
          lifted-base mtl network SafeSemaphore split time
@@ -80854,8 +81221,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-novelty-plugins";
-       version = "5.0.2.1";
-       sha256 = "07zx59jfsdq7lbfmfq9l3xbbdm0fhzidi5vcripfp5wry8xshn5y";
+       version = "5.0.3";
+       sha256 = "086y8p92a8g2zjjkxj1ny4s1dlza2dz1v64g3jg7p0dz1n1s1jpy";
        buildDepends = [
          base binary brainfuck bytestring containers dice directory
          lambdabot-core misfortune process random-fu regex-tdfa unlambda
@@ -80873,13 +81240,12 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-reference-plugins";
-       version = "5.0.2.1";
-       sha256 = "0xg70m58n03lym8z3lsf0mh634xwb48sj39cfydsacdn5gx0i8kc";
+       version = "5.0.3";
+       sha256 = "1yw1l0jl4iym2q2lfgzcmxm8865av37kf7zji0f7in2phqs3r1zz";
        buildDepends = [
          base bytestring containers HTTP lambdabot-core mtl network
          network-uri oeis process regex-tdfa split tagsoup utf8-string
        ];
-       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot reference plugins";
        license = "GPL";
@@ -80988,8 +81354,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdacms-media";
-       version = "0.3.0.1";
-       sha256 = "074bghfbi3m4ffla34z0yq2qgbw3ps81fq2cm8ibqry3bps511xp";
+       version = "0.4.0.0";
+       sha256 = "0vq32qppnasc24jrjh6c19hr2pxby65c5m5k90fk7afyms307b5c";
        buildDepends = [
          base directory filepath lambdacms-core persistent shakespeare text
          time yesod yesod-form
@@ -81554,8 +81920,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-javascript";
-       version = "0.5.13.3";
-       sha256 = "069spax169v0qq5axwccgxdmiyjlnjg1bhzqh09dp5yx9w5fk47x";
+       version = "0.5.14.2";
+       sha256 = "0inm6yncl5dv9ij3fyk38c6mad8fm1vqs70rpqi1a7w2n5cbv1ia";
        buildDepends = [
          array base blaze-builder bytestring containers mtl utf8-string
        ];
@@ -81565,7 +81931,7 @@ self: {
          utf8-string
        ];
        buildTools = [ alex happy ];
-       homepage = "http://github.com/alanz/language-javascript";
+       homepage = "http://github.com/erikd/language-javascript";
        description = "Parser for JavaScript";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81836,14 +82202,19 @@ self: {
      }) {};
 
   "language-thrift" = callPackage
-    ({ mkDerivation, base, mtl, parsers, text, trifecta }:
+    ({ mkDerivation, base, hspec, hspec-discover, mtl, parsers
+     , QuickCheck, text, trifecta, wl-pprint
+     }:
      mkDerivation {
        pname = "language-thrift";
-       version = "0.2.0.0";
-       sha256 = "01wvpm4aa222ic8z6wg0wdjyfnkd8gh2kqsda7qfckcyxs9679qw";
-       buildDepends = [ base mtl parsers text trifecta ];
+       version = "0.4.0.0";
+       sha256 = "0al6a9j9hwla8kyfw30m9ylw4wzxv0nr3nvri8w9wnh6ckaf5j2w";
+       buildDepends = [ base mtl parsers text trifecta wl-pprint ];
+       testDepends = [
+         base hspec hspec-discover QuickCheck text trifecta wl-pprint
+       ];
        homepage = "https://github.com/abhinav/language-thrift";
-       description = "Parser for the Thrift IDL format";
+       description = "Parser and pretty printer for the Thrift IDL format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -82382,6 +82753,7 @@ self: {
          leksah-server ltk monad-loops QuickCheck stm text transformers
          webkitgtk3
        ];
+       jailbreak = true;
        homepage = "http://www.leksah.org";
        description = "Haskell IDE written in Haskell";
        license = "GPL";
@@ -82449,10 +82821,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.12.1";
-       revision = "1";
-       sha256 = "0rzi0z5vz78v99f1hk8izixhxf3linz3xjkancg8x65g03brwl33";
-       editedCabalFile = "fedce7a783a5a622bb19e00145e775ff8ea7d797f71fd22c9eb2257672b7f741";
+       version = "4.12.3";
+       sha256 = "0898z1ws9sy77yfhvx5did0pibpp81yxz0jg418gdx3znd39vyj8";
        buildDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
@@ -82682,8 +83052,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "0.1.2.7";
-       sha256 = "1g3if2y41li6wyg7ffvpybqvbywiq8bf5b5fb6pz499hinzahb9d";
+       version = "0.1.3.1";
+       sha256 = "19zjwkj9is5fdayvwf6w8r42z0lyrbj2lqqw822zr87xaq96r2g2";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -83280,13 +83650,13 @@ self: {
      }) {};
 
   "libpafe" = callPackage
-    ({ mkDerivation, base, bytestring, iconv, pafe }:
+    ({ mkDerivation, base, bytestring, iconv, pafe, transformers }:
      mkDerivation {
        pname = "libpafe";
-       version = "0.1.0.0";
-       sha256 = "1qb67zb7fh582ws1j1hi704dkzp7am0jjxjnab29kpm6i3xmzprk";
-       buildDepends = [ base ];
-       testDepends = [ base bytestring iconv ];
+       version = "0.1.1.0";
+       sha256 = "1l2s98y805mgxnwy2jvrab65gz1aq5zf48rqk88nclb97w04lnws";
+       buildDepends = [ base transformers ];
+       testDepends = [ base bytestring iconv transformers ];
        extraLibraries = [ pafe ];
        jailbreak = true;
        description = "Wrapper for libpafe";
@@ -83483,10 +83853,9 @@ self: {
     ({ mkDerivation, base, bytestring, cpu }:
      mkDerivation {
        pname = "libvorbis";
-       version = "0.1.0.0";
-       sha256 = "1rl8hqbidxj34j3m8nwy32a9fnbzand726zvyljkgpjfkg1mfb2c";
+       version = "0.1.0.1";
+       sha256 = "0ykv2jv559yalypadwnvpzv87rksn24b4h8qi9x1x6r2x4kbwvrl";
        buildDepends = [ base bytestring cpu ];
-       jailbreak = true;
        homepage = "https://github.com/the-real-blackh/libvorbis";
        description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files";
        license = stdenv.lib.licenses.bsd3;
@@ -85132,6 +85501,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "located-base" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "located-base";
+       version = "0.1.0.0";
+       sha256 = "0jb4ziagvbvgaihgw9ajsni0nylqbh5hw3q4dw561qmx2msjjfpj";
+       buildDepends = [ base ];
+       jailbreak = true;
+       homepage = "http://github.com/gridaphobe/located-base";
+       description = "Location-aware variants of partial functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "locators" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, cryptohash
      , hspec, hspec-expectations, HUnit, QuickCheck
@@ -85247,18 +85629,16 @@ self: {
      }:
      mkDerivation {
        pname = "log-domain";
-       version = "0.10.1.1";
-       sha256 = "084mzaha7g00yxxy4hgl2dia73hzch91961gjvrb20wv6zxf8f7g";
+       version = "0.10.2";
+       sha256 = "0v91xilbgw0cym43fn5abz5ljrxz8anfj1w5x6nzp1qcqcwgwcg4";
        buildDepends = [
-         base binary bytes cereal comonad deepseq distributive
-         generic-deriving hashable hashable-extras safecopy semigroupoids
-         semigroups vector
+         base binary bytes cereal comonad deepseq distributive hashable
+         hashable-extras safecopy semigroupoids semigroups vector
        ];
        testDepends = [
          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;
@@ -85849,6 +86229,7 @@ self: {
          base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text
          transformers
        ];
+       jailbreak = true;
        homepage = "http://www.leksah.org";
        description = "Leksah tool kit";
        license = "GPL";
@@ -86224,6 +86605,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) lzma;};
 
+  "lzma-streams" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, io-streams, lzma
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "lzma-streams";
+       version = "0.0.0.0";
+       sha256 = "0klgi097b8mky989hfzn3kk3r25yq1p0sjna4r68k7z9y143yzm2";
+       buildDepends = [ base bytestring io-streams ];
+       testDepends = [
+         base bytestring HUnit io-streams QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       extraLibraries = [ lzma ];
+       homepage = "https://github.com/hvr/lzma-streams";
+       description = "IO-Streams interface for lzma/xz compression";
+       license = stdenv.lib.licenses.bsd3;
+     }) { inherit (pkgs) lzma;};
+
   "maam" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, ghc
      , template-haskell, text
@@ -86575,8 +86976,8 @@ self: {
     ({ mkDerivation, base, containers, srcloc, text }:
      mkDerivation {
        pname = "mainland-pretty";
-       version = "0.4.0.0";
-       sha256 = "1nym3qiyjgag6jpra1cfm8b722h8ghi0f2dv74y6migzqh768myl";
+       version = "0.4.1.0";
+       sha256 = "0r8xhlbpws6wq305dv3z074d7492jif9dsscz4sjbwvh5dk4x1zl";
        buildDepends = [ base containers srcloc text ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Pretty printing designed for printing source code";
@@ -88507,31 +88908,59 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microformats2-parser" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, containers
+     , data-default, either, hspec, html-conduit, microformats2-types
+     , network, options, pcre-heavy, raw-strings-qq, safe, scotty
+     , streaming-commons, stringable, template-haskell, text, time
+     , wai-extra, warp, xml-lens, xss-sanitize
+     }:
+     mkDerivation {
+       pname = "microformats2-parser";
+       version = "0.1.1";
+       sha256 = "0n4clyzaw2a9vi0qcf6f2pdp7wckl3z84sfjqdj8k4dbp1qnwl55";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base blaze-html blaze-markup containers data-default either
+         html-conduit microformats2-types network options pcre-heavy safe
+         scotty streaming-commons stringable text time wai-extra warp
+         xml-lens xss-sanitize
+       ];
+       testDepends = [
+         base data-default hspec html-conduit microformats2-types
+         raw-strings-qq template-haskell time xml-lens
+       ];
+       homepage = "https://github.com/myfreeweb/microformats2-parser";
+       description = "A Microformats 2 parser";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "microformats2-types" = callPackage
     ({ mkDerivation, aeson, base, data-default-class, pandoc-types
      , setters, text, time
      }:
      mkDerivation {
        pname = "microformats2-types";
-       version = "0.4.0";
-       sha256 = "020193sbvg5arha9pvbc88wqrqyvshy19kz02knkh5kv0dzqngf6";
+       version = "0.4.1";
+       sha256 = "1p2s2g78bnqbcf0www0x11pz5nyxjfac7q7sbd2qfn1v777ylv7b";
        buildDepends = [
          aeson base data-default-class pandoc-types setters text time
        ];
        homepage = "https://github.com/myfreeweb/microformats2-types";
        description = "Microformats 2 types (with Aeson instances)";
-       license = "unknown";
+       license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "microlens" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.1.0.0";
-       sha256 = "173ak9flxdpck7q5b3r38bpgbiv9mzmiz89y3f1wn0wz3q957p44";
+       version = "0.1.3.0";
+       sha256 = "1ryjxc3qa583ryp9sig3rjjr3dpv9sx2ybag4qrlkwja1dz8r2dm";
        buildDepends = [ 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 which you can depend upon";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -88548,12 +88977,16 @@ self: {
      }) {};
 
   "microlens-mtl" = callPackage
-    ({ mkDerivation, base, microlens, mtl }:
+    ({ mkDerivation, base, microlens, mtl, transformers
+     , transformers-compat
+     }:
      mkDerivation {
        pname = "microlens-mtl";
-       version = "0.1.0.0";
-       sha256 = "0wz61g71c0w12apwziww2b6snbmyhfhm2f1304rw4gasify9q5s8";
-       buildDepends = [ base microlens mtl ];
+       version = "0.1.2.0";
+       sha256 = "1jvw9pspnr24rh7bvl6q7hv7x0g6vwy2a5xl19pxf36rl8wlfm9v";
+       buildDepends = [
+         base microlens mtl transformers transformers-compat
+       ];
        homepage = "http://github.com/aelve/microlens";
        description = "microlens support for Reader/Writer/State from mtl";
        license = stdenv.lib.licenses.bsd3;
@@ -88563,11 +88996,11 @@ self: {
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
        pname = "microlens-th";
-       version = "0.1.0.0";
-       sha256 = "0balhqdlj8ighzda5g9qz8s634jlf4pjxs3hvgaqp2rw56jc4i12";
+       version = "0.2.0.0";
+       sha256 = "048q6ridxvg7zi272q01k6ds0f411kg27p5whgj63qgg3k9w72sp";
        buildDepends = [ base containers microlens template-haskell ];
        homepage = "http://github.com/aelve/microlens";
-       description = "Automatic generation of record lenses for 'microlens'";
+       description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -89576,6 +90009,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "moesocks" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , containers, cryptohash, hslogger, HsOpenSSL, lens, mtl, network
+     , optparse-applicative, random, safe, text, transformers, unix
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "moesocks";
+       version = "0.1.0.8";
+       sha256 = "1f09sf41kbza3mci2yps0b38xi2j5gakjqx9hmi7lfzga4dkqgg0";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson attoparsec base binary bytestring containers cryptohash
+         hslogger HsOpenSSL lens mtl network optparse-applicative random
+         safe text transformers unix unordered-containers
+       ];
+       homepage = "https://github.com/nfjinjing/moesocks";
+       description = "moe for all";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "mohws" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , directory, explicit-exception, filepath, html, HTTP, network
@@ -89745,8 +90200,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-extras";
-       version = "0.5.9";
-       sha256 = "1y24yz635brllfygia1mbln4d8xiwb0pq0izh5pil7511gijhs0s";
+       version = "0.5.11";
+       sha256 = "0rq44dk1fvfqkhng2yczyyz7jh6d6m0kjy58k02ady28f7j2r5vn";
        buildDepends = [
          base mmorph monad-control stm transformers transformers-base
        ];
@@ -90758,12 +91213,11 @@ self: {
      }:
      mkDerivation {
        pname = "monoidal-containers";
-       version = "0.1.2.1";
-       sha256 = "1n76vjh785yzirfkh63nlrpi9y1bb9z1r3v514150wfxjn3n723j";
+       version = "0.1.2.2";
+       sha256 = "06yam4ljp4lm2rjaccykg8zx4hnmn0ly3fs24xjm4q45ldz7gwyb";
        buildDepends = [
          base containers deepseq hashable lens newtype unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://github.com/bgamari/monoidal-containers";
        description = "Containers with monoidal accumulation";
        license = stdenv.lib.licenses.bsd3;
@@ -90968,8 +91422,8 @@ self: {
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.2.0";
-       sha256 = "0mr2aaf4r15ysmymqixd592z5w56973qv8ww1d7vkyvj851gfm01";
+       version = "1.2.1";
+       sha256 = "15zvk50qpp3ywkwqgpm4phdcspfszzwipxcf07lnxpk98i7ybc4g";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -91458,6 +91912,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mtl-unleashed" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "mtl-unleashed";
+       version = "0.2.2";
+       sha256 = "0ih03zznq8mf8c76ic43j3vana6127bh6hxfz549g5kv9h54y83h";
+       buildDepends = [ base mtl ];
+       homepage = "https://github.com/seereason/mtl-unleashed";
+       description = "MTL classes without the functional dependency";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mtlparse" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -92434,6 +92900,27 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "myo" = callPackage
+    ({ mkDerivation, aeson, base, containers, inline-c, lens-family
+     , lens-family-th, scientific, tasty, tasty-hunit, template-haskell
+     , text, vector, websockets
+     }:
+     mkDerivation {
+       pname = "myo";
+       version = "0.1.0.0";
+       sha256 = "0sn3ic3h94ff57igs61l2cq82y6xxz87qflm8dykwwy721swq1qn";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base containers inline-c lens-family lens-family-th
+         scientific template-haskell text vector websockets
+       ];
+       testDepends = [ base tasty tasty-hunit ];
+       homepage = "http://github.com/adinapoli/myo";
+       description = "Haskell binding to the Myo armband";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mysnapsession" = callPackage
     ({ mkDerivation, base, bytestring, cereal, clientsession
      , containers, mtl, random, regex-posix, snap, snap-core, time
@@ -92885,8 +93372,8 @@ self: {
      }:
      mkDerivation {
        pname = "nationstates";
-       version = "0.1.0.2";
-       sha256 = "0h01dxf8f2h18cx6ag67370l492jvyqh15ijipxzr1gwmkmnymrl";
+       version = "0.2.0.0";
+       sha256 = "07rs7c5pvq6x8icg5pzk613vazcnnl3rfrcsf3zw6i8gaxh0dq48";
        buildDepends = [
          base bytestring clock containers http-client http-client-tls
          http-types multiset transformers xml
@@ -93311,8 +93798,8 @@ self: {
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "3.1.0";
-       sha256 = "128i669x31c4jagnamzlsv3z584rpijpmc832hr96004qkwr692n";
+       version = "3.2.0";
+       sha256 = "02mj54a797h9ywa0985xw8pspl953xgn813r6mz2apx0mk6gp1xg";
        buildDepends = [
          aeson attoparsec base blaze-html bytestring clay composition
          constraints containers http-media http-types lucid mtl poly-arity
@@ -93855,10 +94342,8 @@ self: {
     ({ mkDerivation, base, bytestring, network, text, time, vector }:
      mkDerivation {
        pname = "network-carbon";
-       version = "1.0.3";
-       revision = "1";
-       sha256 = "0wk3rds1d2c6nr9gdz9qgpqhmkqkdkk0rqxzj3rznv0n9m9sylcr";
-       editedCabalFile = "6500f60c0b037a1e680ef3356ce43e27f145efe2cf85f63cb2e670cb344a926d";
+       version = "1.0.5";
+       sha256 = "0kb3gz8545dgi93ys9pk240vap7zjnl2npn1xryng2ijl7ssn9li";
        buildDepends = [ base bytestring network text time vector ];
        homepage = "http://github.com/ocharles/network-carbon";
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
@@ -95603,8 +96088,8 @@ self: {
      }:
      mkDerivation {
        pname = "nvim-hs";
-       version = "0.0.1";
-       sha256 = "1zma19lb4kzzfiabkx55ffgvdqrycijpm2yz3jszm1m6m58khif5";
+       version = "0.0.2";
+       sha256 = "0f551qr7dgn6p4slr0yyfw7v2c6j6w1haqzgc7n7phrgmnhvrhzp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -96221,6 +96706,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opaleye-sqlite" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring
+     , case-insensitive, containers, contravariant, direct-sqlite
+     , pretty, product-profunctors, profunctors, QuickCheck, semigroups
+     , sqlite-simple, text, time, time-locale-compat, transformers, uuid
+     , void
+     }:
+     mkDerivation {
+       pname = "opaleye-sqlite";
+       version = "0.0.1.0";
+       sha256 = "0r3ij02wkxq50hl70wn53fdr1qi5gigg4x3y0vabm53gabgxdbxq";
+       buildDepends = [
+         base base16-bytestring bytestring case-insensitive contravariant
+         direct-sqlite pretty product-profunctors profunctors semigroups
+         sqlite-simple text time time-locale-compat transformers uuid void
+       ];
+       testDepends = [
+         base containers contravariant product-profunctors profunctors
+         QuickCheck semigroups sqlite-simple time
+       ];
+       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
+       description = "An SQL-generating DSL targeting SQLite";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "open-browser" = callPackage
+    ({ mkDerivation, base, process }:
+     mkDerivation {
+       pname = "open-browser";
+       version = "0.2.0.0";
+       sha256 = "093i475l9gyb5jyk2m6fdz1dw2jm545rlrbmwqz3vfdfy2ikcks3";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base process ];
+       description = "Open a web browser from Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "open-pandoc" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
      , extensible-exceptions, filepath, HTTP, mtl, network, old-time
@@ -96330,6 +96853,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "openflow" = callPackage
+    ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
+     , deepseq-generics, hashable, network
+     }:
+     mkDerivation {
+       pname = "openflow";
+       version = "0.3.0";
+       sha256 = "0dhg34s4imr1v6wlc567qg5929wa82my7jbhxm9hqq0882vb0sb2";
+       buildDepends = [
+         aeson base bimap binary bytestring containers deepseq-generics
+         hashable network
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/AndreasVoellmy/openflow";
+       description = "OpenFlow";
+       license = "unknown";
+     }) {};
+
   "opengles" = callPackage
     ({ mkDerivation, base, bytestring, distributive, EGL
      , future-resource, ghc-prim, GLESv2, lens, linear, packer, vector
@@ -96531,8 +97072,8 @@ self: {
     ({ mkDerivation, base, opentheory-primitive, QuickCheck }:
      mkDerivation {
        pname = "opentheory";
-       version = "1.199";
-       sha256 = "1il1lyjmv7ij7clnbc57ajpfwlg5a5ld3m619hxylpafyrbr4v5y";
+       version = "1.200";
+       sha256 = "0fdxrpsw3c4p1y80xfab0cl5zhkjcp9dlylgxywzq5kcpqv07ifh";
        buildDepends = [ base opentheory-primitive QuickCheck ];
        testDepends = [ base opentheory-primitive QuickCheck ];
        homepage = "http://opentheory.gilith.com/?pkg=base";
@@ -96552,6 +97093,7 @@ self: {
          base opentheory opentheory-primitive opentheory-probability
          QuickCheck
        ];
+       jailbreak = true;
        homepage = "http://opentheory.gilith.com/?pkg=natural-bits";
        description = "Natural number to bit-list conversions";
        license = stdenv.lib.licenses.mit;
@@ -96569,6 +97111,7 @@ self: {
          base opentheory opentheory-bits opentheory-primitive
          opentheory-probability QuickCheck
        ];
+       jailbreak = true;
        homepage = "http://opentheory.gilith.com/?pkg=byte";
        description = "Bytes";
        license = stdenv.lib.licenses.mit;
@@ -96599,8 +97142,8 @@ self: {
      }:
      mkDerivation {
        pname = "opentheory-divides";
-       version = "1.62";
-       sha256 = "182c14c1j9m82pnx6crxgrry02yvixziap9ikhavx7krr52vdwbv";
+       version = "1.63";
+       sha256 = "1jax8103yhgmbwfzbpnis4nj6f90n3wizb2znvafd4pw2afs5mkv";
        buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
        testDepends = [ base opentheory opentheory-primitive QuickCheck ];
        homepage = "http://opentheory.gilith.com/?pkg=natural-divides";
@@ -96608,6 +97151,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "opentheory-fibonacci" = callPackage
+    ({ mkDerivation, base, opentheory, opentheory-primitive
+     , opentheory-stream, QuickCheck
+     }:
+     mkDerivation {
+       pname = "opentheory-fibonacci";
+       version = "1.69";
+       sha256 = "09rqz7fixh1k4ya1aci7v0wy0sz2m7j5cj66plcbvpv6p03yq1vv";
+       buildDepends = [
+         base opentheory opentheory-primitive opentheory-stream QuickCheck
+       ];
+       testDepends = [
+         base opentheory opentheory-primitive opentheory-stream QuickCheck
+       ];
+       description = "Fibonacci numbers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "opentheory-parser" = callPackage
     ({ mkDerivation, base, opentheory, opentheory-primitive, QuickCheck
      }:
@@ -96617,6 +97178,7 @@ self: {
        sha256 = "0325g7m5z64dg8sihmcgi9rmkms6r76hf1d7927v08dl5xh4dlhi";
        buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
        testDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       jailbreak = true;
        homepage = "http://opentheory.gilith.com/?pkg=parser";
        description = "Stream parsers";
        license = stdenv.lib.licenses.mit;
@@ -96638,6 +97200,7 @@ self: {
          base opentheory opentheory-divides opentheory-primitive
          opentheory-stream QuickCheck
        ];
+       jailbreak = true;
        homepage = "http://opentheory.gilith.com/?pkg=natural-prime";
        description = "Prime natural numbers";
        license = stdenv.lib.licenses.mit;
@@ -96664,6 +97227,7 @@ self: {
        version = "1.49";
        sha256 = "0dszjszjdabgafpvxiailpgzm7y96f4a8zhjfhin3m36f3lb0dmy";
        buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       jailbreak = true;
        homepage = "http://opentheory.gilith.com/?pkg=probability";
        description = "Probability";
        license = stdenv.lib.licenses.mit;
@@ -96674,8 +97238,8 @@ self: {
      }:
      mkDerivation {
        pname = "opentheory-stream";
-       version = "1.45";
-       sha256 = "0gl7svhyrvi6bznfmc3jfar6hzlrywni6f7pvaykjzkf80xzljbr";
+       version = "1.46";
+       sha256 = "0p27hvxxxl6x6g97llls8kry5vlmpi5b02x9x96v24m4clxj55wa";
        buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
        homepage = "http://opentheory.gilith.com/?pkg=stream";
        description = "Infinite stream types";
@@ -96699,6 +97263,7 @@ self: {
          base opentheory opentheory-bits opentheory-byte opentheory-parser
          opentheory-primitive opentheory-probability QuickCheck
        ];
+       jailbreak = true;
        homepage = "http://opentheory.gilith.com/?pkg=char";
        description = "Unicode characters";
        license = stdenv.lib.licenses.mit;
@@ -97773,17 +98338,18 @@ self: {
      }) {};
 
   "pandoc-placetable" = callPackage
-    ({ mkDerivation, base, explicit-exception, pandoc-types
-     , spreadsheet
+    ({ mkDerivation, base, bytestring, explicit-exception, http-conduit
+     , pandoc-types, spreadsheet
      }:
      mkDerivation {
        pname = "pandoc-placetable";
-       version = "0.1.1";
-       sha256 = "196x22f76mvd072yzj6vcynrp459zmlg84l42rwx4syhnvn1ca8d";
+       version = "0.1.2";
+       sha256 = "0vq94j5jsq60p0wbml50hwqa2zpidbzx92cbb7d2ialqj7816zwb";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base explicit-exception pandoc-types spreadsheet
+         base bytestring explicit-exception http-conduit pandoc-types
+         spreadsheet
        ];
        homepage = "https://github.com/mb21/pandoc-placetable";
        description = "Pandoc filter to include CSV files";
@@ -99968,15 +100534,17 @@ self: {
      }:
      mkDerivation {
        pname = "pgdl";
-       version = "8.2";
-       sha256 = "04yydjvwnjilyxwqwrbwg5c2mph58728bacz2q8pbd0084lp77nd";
+       version = "8.3";
+       revision = "2";
+       sha256 = "0kbx9dgmy9pvcgcpsjplrpnqlk8x3icfpr0flincmzqkzxxzcaq5";
+       editedCabalFile = "9d6e976e130869b6761d870380b867c2501c43a1318a5f385687608c13a0ef72";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          array base bytestring Cabal configurator directory filepath HTTP
          network-uri process tagsoup text vty vty-ui
        ];
-       description = "simply download a video from webpage and play it";
+       description = "simply download a video (or a file) from a webpage and xdg-open it";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
@@ -100419,10 +100987,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes";
-       version = "4.1.5";
-       revision = "1";
-       sha256 = "1c19am4dr6na9xpx4h7yngvbml0ghc1dbym8988hjhw84gq4lhfx";
-       editedCabalFile = "c23c260bff1178965d87e6fc9f7263877b5f2adc4c0e4c1bd59c55971fff9eb4";
+       version = "4.1.6";
+       sha256 = "0dbl9sa0ryclyxwm0zfmqvpx7ljmpnfccmnihxia35q471h50sid";
        buildDepends = [ base mmorph mtl transformers ];
        testDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
@@ -100450,6 +101016,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-async" = callPackage
+    ({ mkDerivation, base, hspec, lifted-async, lifted-base
+     , monad-control, pipes, pipes-safe, stm, transformers-base
+     }:
+     mkDerivation {
+       pname = "pipes-async";
+       version = "0.1.1";
+       sha256 = "1b0l3fnblfgwgcbd5brs5iwix4wix1ijx10ppwb8yb1wbqbmh8z2";
+       buildDepends = [
+         base lifted-async lifted-base monad-control pipes pipes-safe stm
+         transformers-base
+       ];
+       testDepends = [
+         base hspec lifted-async lifted-base monad-control pipes pipes-safe
+         stm transformers-base
+       ];
+       homepage = "https://github.com/jwiegley/pipes-async";
+       description = "A higher-level interface to using concurrency with pipes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HUnit, mmorph, pipes
      , pipes-parse, tasty, tasty-hunit, text, transformers
@@ -100947,13 +101534,17 @@ self: {
      }) {};
 
   "pipes-safe" = callPackage
-    ({ mkDerivation, base, containers, exceptions, pipes, transformers
+    ({ mkDerivation, base, containers, exceptions, monad-control, mtl
+     , pipes, transformers, transformers-base
      }:
      mkDerivation {
        pname = "pipes-safe";
-       version = "2.2.2";
-       sha256 = "1sp0fw5w4kcf5llxx2qqzx8n5ps8qw1jx5asqg7al89mqr38am05";
-       buildDepends = [ base containers exceptions pipes transformers ];
+       version = "2.2.3";
+       sha256 = "19wr3q6skwdyd68k1r33w2mipfsgsg2982027faq7rnfw9lq2yyi";
+       buildDepends = [
+         base containers exceptions monad-control mtl pipes transformers
+         transformers-base
+       ];
        description = "Safety for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101316,8 +101907,8 @@ self: {
     ({ mkDerivation, base, glib, gtk3, hmatrix, mtl, plot, process }:
      mkDerivation {
        pname = "plot-gtk3";
-       version = "0.1";
-       sha256 = "0dw6ypnwr3xnjl1cvr55x3j182vchjhinc9fxsnd5z7ciraqvnv0";
+       version = "0.1.0.1";
+       sha256 = "0x7s9wb8r2sds25q9k6h8mvpfzgi90v497ccxskvb3qd0a1jv24f";
        buildDepends = [ base glib gtk3 hmatrix mtl plot process ];
        homepage = "http://code.haskell.org/plot";
        description = "GTK3 plots and interaction with GHCi";
@@ -101904,8 +102495,8 @@ self: {
      }:
      mkDerivation {
        pname = "pontarius-xmpp";
-       version = "0.4.2.1";
-       sha256 = "14jhxmccj9ywhxz2rkd4vdwhzz6ciq070ml8vl282hz8k3dr1va9";
+       version = "0.4.2.2";
+       sha256 = "1krbr0vdza3s6w4sa119x591i5ryq9bmqfnacy665xr5si4bkzcv";
        buildDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
@@ -102212,8 +102803,8 @@ self: {
      }:
      mkDerivation {
        pname = "posix-paths";
-       version = "0.2.0.5";
-       sha256 = "046y5i4hw4a326r3145yrfd1p6sn3b9xsn6rdk73nv74ks4wrn5v";
+       version = "0.2.1.0";
+       sha256 = "187sq0rcdg06h64kkjdgqg32s8s51hd4cgf6hvajj1pgd9pyd1i0";
        buildDepends = [ base bytestring unix ];
        testDepends = [ base bytestring doctest HUnit QuickCheck unix ];
        description = "POSIX filepath/directory functionality";
@@ -102332,8 +102923,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-config";
-       version = "0.0.2";
-       sha256 = "1b7rppzarnmndmgwkcahcrcnxzigfldm50iqd81vj0zkii6w0i43";
+       version = "0.1.0";
+       sha256 = "1p5kzj2wsd3kigi9qavsqkxv9kfk4qbl809wqbdk4pd7y34ajab4";
        buildDepends = [
          aeson base bytestring monad-control mtl postgresql-simple
          resource-pool time
@@ -102370,8 +102961,8 @@ self: {
     ({ mkDerivation, base, bytestring, postgresql }:
      mkDerivation {
        pname = "postgresql-libpq";
-       version = "0.9.0.2";
-       sha256 = "1x1nmzl1j6vc3vy746ch6ps4wy6hwqm78yl9cq9fvkpllh0a2dnw";
+       version = "0.9.1.1";
+       sha256 = "0waqg245ly017j1qml4sc24896ax645bv8a2fghwwa46zvbsx0z4";
        buildDepends = [ base bytestring ];
        extraLibraries = [ postgresql ];
        homepage = "http://github.com/lpsmith/postgresql-libpq";
@@ -103462,12 +104053,11 @@ self: {
      }:
      mkDerivation {
        pname = "probable";
-       version = "0.1.0.0";
-       sha256 = "1269cajfjnfrqacs874v6zczrb497474hqhid5wmm8f9fmhiy0wz";
+       version = "0.1.1";
+       sha256 = "1n6p7pharcq2cmfabh2ngfsy9mfqqs6qh57m0kygq13lbzwyy8wr";
        buildDepends = [
          base mtl mwc-random primitive statistics transformers vector
        ];
-       jailbreak = true;
        homepage = "http://github.com/alpmestan/probable";
        description = "Easy and reasonably efficient probabilistic programming and random generation";
        license = stdenv.lib.licenses.bsd3;
@@ -104099,8 +104689,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.6.0";
-       sha256 = "1q9l5bp7sg9lciz8c5qzxmwnfb7b195f8zgdcvzfcx50i3hpxxad";
+       version = "2.7.0";
+       sha256 = "12pfrv6n61bsg4cyylfr0kw82x36mwvnyvzdkr2lrka79i5l9a5w";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -104257,8 +104847,8 @@ self: {
      }:
      mkDerivation {
        pname = "protocol-buffers";
-       version = "2.1.3";
-       sha256 = "1ys0291js4mdfxqjk09lrmf33g7dh4rzq562f471ac98zwc5q588";
+       version = "2.1.4";
+       sha256 = "0sn92mf0dl7w6cg25rhm492sl58pssshjyipadis4w4ww0kyp4md";
        buildDepends = [
          array base binary bytestring containers directory filepath mtl
          parsec syb utf8-string
@@ -104273,8 +104863,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
-       version = "2.1.3";
-       sha256 = "04iw8bfq9i89xvx2dn16cwv4w9zv3ljgngm6aac6imp7za4mvjzf";
+       version = "2.1.4";
+       sha256 = "1m07l890465ks53acmk9g3fzbm2h5l2pdfhp16hcmvvzxlaz2zvy";
        buildDepends = [ base bytestring containers protocol-buffers ];
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
@@ -104469,15 +105059,13 @@ self: {
      }) {};
 
   "publicsuffix" = callPackage
-    ({ mkDerivation, base, bytestring, filepath, hspec
-     , template-haskell, text
-     }:
+    ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20150507";
-       sha256 = "1n1wns0n48rqva5zz4kyj84rw0lf7ih612cp0dhsdk9jgc1kapsj";
-       buildDepends = [ base bytestring filepath template-haskell text ];
-       testDepends = [ base hspec text ];
+       version = "0.20150804";
+       sha256 = "06b311vdwihqhdwf2zr0akndgyaxycli7lymzzyfbn0rhhx1g2kn";
+       buildDepends = [ base filepath template-haskell ];
+       testDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
@@ -104866,8 +105454,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.7.1.0";
-       sha256 = "1hnrqs1dkcrwa1xrnrikcymm65inxfh9jznfb2xqczd9vyn8j518";
+       version = "0.7.2.0";
+       sha256 = "0drx0n1ac0sjnma7c15hsld1n6rwwl7r8fzcdibk73k5pfyz9a6k";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -104890,6 +105478,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) nodejs;};
 
+  "purescript-bundle-fast" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , optparse-applicative, text, vector
+     }:
+     mkDerivation {
+       pname = "purescript-bundle-fast";
+       version = "0.1.0.1";
+       sha256 = "0s9db4nb5ppr3yznay7jlgydq68hcdn525cwnxkj41h8fv9sflfw";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base containers directory filepath optparse-applicative text vector
+       ];
+       homepage = "https://github.com/bitc/purescript-bundle-fast";
+       description = "A fast alternative to Purescript's `psc-bundle` to be used during development";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "push-notify" = callPackage
     ({ mkDerivation, aeson, async, attoparsec-conduit, base
      , base16-bytestring, bytestring, cereal, certificate, conduit
@@ -105758,8 +106364,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "quiver";
-       version = "0.0.0.6";
-       sha256 = "0g9qfspzamxxn8zvl698g9f8y3alm4js7i7k9wa737pgv47lzqbz";
+       version = "0.0.0.11";
+       sha256 = "1pxnxdm84fqmxvv0l312q8nynpaiyf43jksa2qg1wkl53n0mm2fa";
        buildDepends = [ base ];
        homepage = "https://github.com/zadarnowski/quiver";
        description = "Quiver finite stream processing library";
@@ -105770,8 +106376,8 @@ self: {
     ({ mkDerivation, base, bytestring, quiver }:
      mkDerivation {
        pname = "quiver-bytestring";
-       version = "0.0.0.1";
-       sha256 = "03lw2yi4a3d5nd7xqlcs4pmf0rcbfw3n4s36wgaxy4wn3bhh3300";
+       version = "0.0.0.2";
+       sha256 = "17wjj1fg60g3km9d4kxfz7lk9bf4sfz0brsg8pb0h2xlw0zvm3wl";
        buildDepends = [ base bytestring quiver ];
        homepage = "https://github.com/zadarnowski/quiver-bytestring";
        description = "Quiver combinators for bytestring streaming";
@@ -105782,8 +106388,8 @@ self: {
     ({ mkDerivation, base, data-cell, quiver }:
      mkDerivation {
        pname = "quiver-cell";
-       version = "0.0.0.1";
-       sha256 = "1bz74xigj99v9hh4i6m6z4h9f0l09rnbs108npnl953v0bqi44qi";
+       version = "0.0.0.2";
+       sha256 = "10p11ljmwp7szw46saxa972xpjiyr5r19kia6ivaq98jqwcvi5af";
        buildDepends = [ base data-cell quiver ];
        homepage = "https://github.com/zadarnowski/quiver-cell";
        description = "Quiver combinators for cellular data processing";
@@ -105796,8 +106402,8 @@ self: {
      }:
      mkDerivation {
        pname = "quiver-csv";
-       version = "0.0.0.1";
-       sha256 = "0s5m6qhpir5i1n3ifrcr4if4ysk52cwi9pxm354mdw1859h5lmx9";
+       version = "0.0.0.3";
+       sha256 = "19wb16lbv0wr7w2qba6g2cdmzdhpyyjx1bjvrnz0cqbb4di9yscj";
        buildDepends = [
          base bytestring data-cell quiver quiver-bytestring
        ];
@@ -105807,6 +106413,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quiver-enumerator" = callPackage
+    ({ mkDerivation, base, enumerator, quiver }:
+     mkDerivation {
+       pname = "quiver-enumerator";
+       version = "0.0.0.1";
+       sha256 = "0k0822yzlxkb6b46834hm3bad3x1gma1gqcjl9ryxpqsl73nc4mp";
+       buildDepends = [ base enumerator quiver ];
+       homepage = "https://github.com/zadarnowski/quiver-enumerator";
+       description = "Bridge between Quiver and Iteratee paradigms";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "quoridor-hs" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , directory, dlist, exceptions, filepath, hex, HUnit, mtl, network
@@ -106675,8 +107293,8 @@ self: {
      }:
      mkDerivation {
        pname = "react-haskell";
-       version = "2.0.0";
-       sha256 = "016bpbci89b6grkwnq1yqjm5y50di1hmjlf2mkxjc0wyi82c7say";
+       version = "2.0.1";
+       sha256 = "0kjbicrvriliy50gy82b7rsrfk5p3iv20wwnhiaq9i16mbh2zj8j";
        buildDepends = [
          aeson base deepseq lens-family monads-tf text transformers
          unordered-containers void
@@ -107222,10 +107840,8 @@ self: {
      }:
      mkDerivation {
        pname = "reddit";
-       version = "0.1.0.0";
-       revision = "1";
-       sha256 = "1g18lfl9hvz13f3i5h819pfh724i5lhgqfvyy2r06ni7hjfylzj4";
-       editedCabalFile = "84c6e65809dcd5c4fed83d64c71c6465a6ee1fe6e913c637dc2db608c6cc5870";
+       version = "0.1.1.0";
+       sha256 = "1flsawdld5a4bs5crs352zc1r9ag3yn1indbzw7vgs2mmyiavg7k";
        buildDepends = [
          aeson api-builder base bytestring data-default http-conduit
          http-types network stm text time transformers unordered-containers
@@ -107235,6 +107851,7 @@ self: {
          api-builder base bytestring Cabal hspec http-conduit text time
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/intolerable/reddit";
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
@@ -107439,8 +108056,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "refact";
-       version = "0.2.0.0";
-       sha256 = "1ixbji328bxdz4rblb0s7hp6vbckj4yj03a8a8sa756igj988v8f";
+       version = "0.3.0.1";
+       sha256 = "0nmlhx35g3kb5if6qnkmabgi5dj4b446vkd1n5df1vsiyaf65w11";
        buildDepends = [ base ];
        description = "Specify refactorings to perform with apply-refact";
        license = stdenv.lib.licenses.bsd3;
@@ -107571,17 +108188,21 @@ self: {
 
   "reflex" = callPackage
     ({ mkDerivation, base, containers, dependent-map, dependent-sum
-     , mtl, primitive, ref-tf, semigroups, template-haskell, these
+     , exception-transformers, MemoTrie, mtl, primitive, ref-tf
+     , semigroups, template-haskell, these, transformers
+     , transformers-compat
      }:
      mkDerivation {
        pname = "reflex";
-       version = "0.2";
-       revision = "1";
-       sha256 = "0mq5249dhx26z02jzjr5bxxsgyhg7npd3q7v3l4ipxxxgixg1vdv";
-       editedCabalFile = "4454a0c57f83e4490729fe4b1ce95197be989aa2a0f8b384afddcb1ad71817de";
+       version = "0.3";
+       sha256 = "1aw4pz0y0rpf7klsb232q0zi4zqcpkwrw0s3zrkq5iyhzaswfnyd";
        buildDepends = [
-         base containers dependent-map dependent-sum mtl primitive ref-tf
-         semigroups template-haskell these
+         base containers dependent-map dependent-sum exception-transformers
+         mtl primitive ref-tf semigroups template-haskell these transformers
+         transformers-compat
+       ];
+       testDepends = [
+         base containers dependent-map MemoTrie mtl ref-tf
        ];
        homepage = "https://github.com/ryantrinkle/reflex";
        description = "Higher-order Functional Reactive Programming";
@@ -107589,23 +108210,26 @@ self: {
      }) {};
 
   "reflex-dom" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, data-default
-     , dependent-map, dependent-sum, ghcjs-dom, glib, gtk3, lens, mtl
-     , ref-tf, reflex, safe, semigroups, text, these, time, transformers
-     , webkitgtk3, webkitgtk3-javascriptcore
+    ({ mkDerivation, aeson, base, bifunctors, bytestring, containers
+     , data-default, dependent-map, dependent-sum
+     , dependent-sum-template, directory, exception-transformers
+     , ghcjs-dom, glib, gtk3, lens, mtl, ref-tf, reflex, safe
+     , semigroups, text, these, time, transformers, webkitgtk3
+     , webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "reflex-dom";
-       version = "0.1.1";
-       sha256 = "1fzk7x0iwgdsb4fmhx399xvq200pz4sh2g1n0n8a76q9sy6j82hs";
+       version = "0.2";
+       sha256 = "1pc6mz9c6nr4s5b2mhlyxjzzffh85cv1bgvyycmq04s6dmg0ndgx";
        buildDepends = [
-         aeson base bytestring containers data-default dependent-map
-         dependent-sum ghcjs-dom glib gtk3 lens mtl ref-tf reflex safe
-         semigroups text these time transformers webkitgtk3
+         aeson base bifunctors bytestring containers data-default
+         dependent-map dependent-sum dependent-sum-template directory
+         exception-transformers ghcjs-dom glib gtk3 lens mtl ref-tf reflex
+         safe semigroups text these time transformers webkitgtk3
          webkitgtk3-javascriptcore
        ];
        jailbreak = true;
-       description = "Glitch-free Functional Reactive Web Apps";
+       description = "Functional Reactive Web Apps with Reflex";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -108301,8 +108925,8 @@ self: {
      }:
      mkDerivation {
        pname = "rei";
-       version = "0.1.0.1";
-       sha256 = "15xq2aj77y7l4frxkariw1z0c3y324iz697im8ynlzm88z2iixs6";
+       version = "0.2.0.0";
+       sha256 = "17ldmx351b54fxmiw3z89v7cs6p33x09k2aav7jphqgv2520phyv";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -109095,19 +109719,21 @@ self: {
      }) {};
 
   "reroute" = callPackage
-    ({ mkDerivation, base, deepseq, graph-core, hashable, hspec, mtl
-     , path-pieces, regex-compat, text, transformers
+    ({ mkDerivation, base, deepseq, graph-core, hashable, hspec, hvect
+     , mtl, path-pieces, regex-compat, text, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "reroute";
-       version = "0.2.3.0";
-       sha256 = "1wyr54kllh3cfwl9i291ymmpmmk8vv8y4i3k1kwa8b0zv5kky1px";
+       version = "0.3.0.2";
+       sha256 = "14xkkcgqbg7bddln849h2k0xrrj9hfvw2ikai81snz7dsf3mcnb8";
        buildDepends = [
-         base deepseq graph-core hashable mtl path-pieces regex-compat text
-         transformers unordered-containers vector
+         base deepseq graph-core hashable hvect mtl path-pieces regex-compat
+         text transformers unordered-containers vector
+       ];
+       testDepends = [
+         base hspec hvect mtl text unordered-containers vector
        ];
-       testDepends = [ base hspec mtl text unordered-containers vector ];
        homepage = "http://github.com/agrafix/reroute";
        description = "abstract implementation of typed and untyped web routing";
        license = stdenv.lib.licenses.mit;
@@ -109248,8 +109874,8 @@ self: {
      }:
      mkDerivation {
        pname = "resourcet";
-       version = "1.1.5";
-       sha256 = "063v7xfhwqgf1yvdiidg4anx38nfvgcwb0sqim5rcbqhz0fmkypy";
+       version = "1.1.6";
+       sha256 = "0zhsaaa4n8ry76vjih519a8npm2hrzk10d5asrgllcwpzmifl41y";
        buildDepends = [
          base containers exceptions lifted-base mmorph monad-control mtl
          transformers transformers-base transformers-compat
@@ -110536,6 +111162,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "roundtrip-aeson" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, lens
+     , lens-aeson, roundtrip, scientific, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "roundtrip-aeson";
+       version = "0.2.0.0";
+       sha256 = "0m96447l2m0y4aapil077xpnzlkjla0yp2bzajfijik9gkjbiih4";
+       buildDepends = [
+         aeson base bytestring containers lens lens-aeson roundtrip
+         scientific text unordered-containers vector
+       ];
+       testDepends = [
+         aeson base bytestring lens-aeson roundtrip text vector
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/anchor/roundtrip-aeson";
+       description = "Un-/parse JSON with roundtrip invertible syntax definitions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "roundtrip-string" = callPackage
     ({ mkDerivation, base, mtl, parsec, roundtrip }:
      mkDerivation {
@@ -110878,6 +111526,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) rubberband;};
 
+  "ruby-marshal" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, hspec, mtl
+     , string-conv, vector
+     }:
+     mkDerivation {
+       pname = "ruby-marshal";
+       version = "0.1.0";
+       sha256 = "1dmlgks7wfs82k9dxkgi35q4sa0a7ljpcw86j25k85vbclzpyp7j";
+       buildDepends = [
+         base bytestring cereal containers mtl string-conv vector
+       ];
+       testDepends = [
+         base bytestring cereal containers hspec mtl string-conv vector
+       ];
+       homepage = "https://github.com/filib/ruby-marshal";
+       description = "Parse a subset of Ruby objects serialised with Marshal.dump.";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ruby-qq" = callPackage
     ({ mkDerivation, base, bytestring, haskell-src-exts
      , haskell-src-meta, pcre-light, process, template-haskell, trifecta
@@ -111303,15 +111970,14 @@ self: {
      }:
      mkDerivation {
        pname = "saltine";
-       version = "0.0.0.3";
-       sha256 = "1xjpjblxlpziyyz74ldaqh04shvy2qi34sc6b3232wpc0kyl5s8y";
+       version = "0.0.0.4";
+       sha256 = "1n74qk8yb0ylj6gns68rak5g030yjsaycn96x0hvk1cx7qwym887";
        buildDepends = [ base bytestring profunctors ];
        testDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2 vector
        ];
        extraLibraries = [ libsodium ];
-       jailbreak = true;
        description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) libsodium;};
@@ -113575,8 +114241,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.4.3.1";
-       sha256 = "1lbnd4mmn7q0bb091il18g1y8ixsi81s64q8lpfpm5sq4dsn1x6l";
+       version = "0.4.4";
+       sha256 = "1v0n194gj2cy16scfgs94q2vcb2baryp0rl1s21zwww1kfgmpffj";
        buildDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
@@ -113592,12 +114258,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-JuicyPixels" = callPackage
+    ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant
+     , servant-server, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-JuicyPixels";
+       version = "0.1.0.0";
+       sha256 = "1fnlyk6848nzby0nxdrvm4d0vvisdx6pmlzjnh6y1q5q8wq4m48j";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring http-media JuicyPixels servant servant-server wai
+         warp
+       ];
+       homepage = "https://github.com/tvh/servant-JuicyPixels";
+       description = "servant-JuicyPixels";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "servant-blaze" = callPackage
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
        pname = "servant-blaze";
-       version = "0.4.3.1";
-       sha256 = "017y41z82smy848y6a73232rlidiimdxawb048lnrs9z53ai46cn";
+       version = "0.4.4";
+       sha256 = "140sgy7hcp6pxjrh7zk5i59sq79swqgg76gakgdnvkg7zz0a150s";
        buildDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
@@ -113613,8 +114298,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.4.3.1";
-       sha256 = "15b6aww76bw87zps3n3sv5zl4q1h9l9ds72r9g8kn0r53r3vw6ig";
+       version = "0.4.4";
+       sha256 = "0m5aw8pb6iga2rf8m3mnx58xh6jnh33rvvkdzbmb3s6vplsqh6vz";
        buildDepends = [
          aeson attoparsec base bytestring either exceptions http-client
          http-client-tls http-media http-types network-uri safe servant
@@ -113637,8 +114322,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.4.3.1";
-       sha256 = "0kzk4089xnr22gw929babknc9rnjq3wp1rk9fq881l49z8pvvl4r";
+       version = "0.4.4";
+       sha256 = "0kp5346jxakjz8x92wvayz7c3f2xcvnpsgg9dxgb41imvww2pyfc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -113682,8 +114367,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-examples";
-       version = "0.4.3.1";
-       sha256 = "1ypsdpmp8rx6qcwvbw5scc0y41c1jnpn96wxy6wcik1rkc2zjxfq";
+       version = "0.4.4";
+       sha256 = "1qzrlkqwfv4w7d3sjbvz3s4kgx0x6zn0hh07hm955vvlfksgwjym";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -113704,8 +114389,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-jquery";
-       version = "0.4.3.1";
-       sha256 = "13ngnbpip7nps3c8i2r9220i9i9kgf5s5w8s0wjkhb25xfbmnwwx";
+       version = "0.4.4";
+       sha256 = "04j2cnxrx2hljxnha94nbmql61zw3apz7n32mf23vf749svjcmvd";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -113724,8 +114409,8 @@ self: {
     ({ mkDerivation, base, http-media, lucid, servant }:
      mkDerivation {
        pname = "servant-lucid";
-       version = "0.4.3.1";
-       sha256 = "1pgvd3khap4gnnpsi2rrp64rz0182xyy9bqglsvg7f7nfmyprgpq";
+       version = "0.4.4";
+       sha256 = "1vy9vdd1jkvx7nzcw6a83az4p351ds98x7wasn496h3bwk23bbhr";
        buildDepends = [ base http-media lucid servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Servant support for lucid";
@@ -113734,17 +114419,18 @@ self: {
 
   "servant-pandoc" = callPackage
     ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types
-     , semigroupoids, servant-docs, text, unordered-containers
+     , servant-docs, text, unordered-containers
      }:
      mkDerivation {
        pname = "servant-pandoc";
-       version = "0.4.1";
-       sha256 = "1kfs45z6pja2v4dambivc5cxx8dfr7vrjx38w0cfpmhyi5xz5jdp";
+       version = "0.4.1.1";
+       revision = "1";
+       sha256 = "00clyv651fyz0dx9b4g5c0z5z3bgybgg93x4s1b1lciwsin8i6nk";
+       editedCabalFile = "ee2eff37865c8a5c246021f6d05aae5f075ba5910cac6d650312aafb2f4bf091";
        buildDepends = [
-         base bytestring http-media lens pandoc-types semigroupoids
-         servant-docs text unordered-containers
+         base bytestring http-media lens pandoc-types servant-docs text
+         unordered-containers
        ];
-       jailbreak = true;
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113821,8 +114507,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.4.3.1";
-       sha256 = "1qdsv7zr9byjrm7yir8alm1zv0ckb81r6akwdvqfa88a581yz7jx";
+       version = "0.4.4";
+       sha256 = "0byxply71jv558bs33i1j9whrfgfa1iygdjsxap7wiq9f27iyaa9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -113836,7 +114522,6 @@ self: {
          network parsec QuickCheck servant string-conversions temporary text
          transformers wai wai-extra warp
        ];
-       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
@@ -114104,6 +114789,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "set-with" = callPackage
+    ({ mkDerivation, base, containers, invariant, QuickCheck
+     , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "set-with";
+       version = "0.0.1";
+       sha256 = "0mkc44gkhjibq3zhxgiw3c7nfy03jmjmrafdr8x9f5ak4l9ns0h4";
+       buildDepends = [ base containers invariant ];
+       testDepends = [
+         base QuickCheck quickcheck-instances tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       description = "Set of elements sorted by a different data type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "setdown" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, cmdargs, containers
      , directory, filepath, happy, mtl, split, text, uuid
@@ -114427,8 +115129,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake";
-       version = "0.15.4";
-       sha256 = "189qyxvy6rxlkgmssy2v66f7anp4q9xjmwqcpwxq86h0pj7vr3i9";
+       version = "0.15.5";
+       sha256 = "18vkyc8h7dpz5d3snfdssfqd1cfp22wnpv63ckrik9p8r4j6i01c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -114501,8 +115203,8 @@ self: {
     ({ mkDerivation, base, bytestring, css-text, hjsmin, shake, text }:
      mkDerivation {
        pname = "shake-minify";
-       version = "0.1.3";
-       sha256 = "1634dm4rzpp5bkxczj5bbnzcn1mcaxkqbvg08x9gib1nyi2m6zzb";
+       version = "0.1.4";
+       sha256 = "17q0xzjj6xl9h3s6dlxgkxxz2dd4ycbh918ali1lrq2dq9gig3ir";
        buildDepends = [ base bytestring css-text hjsmin shake text ];
        homepage = "https://github.com/LukeHoersten/shake-minify";
        description = "Shake Minify Rules";
@@ -114865,8 +115567,8 @@ self: {
      }:
      mkDerivation {
        pname = "shelly";
-       version = "1.6.3.1";
-       sha256 = "1yd54i4ac1h23b4l4mz9ixpkhj0zxnb8gamk5jdhzgsd809cqy9q";
+       version = "1.6.3.3";
+       sha256 = "173aypf9dcrkhnaz5gfcpicw9ha6cgs7javds3s7m2qr2vdj8rhs";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -114949,8 +115651,8 @@ self: {
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "shortcut-links";
-       version = "0.3.0.0";
-       sha256 = "14g1s2gb1jc52zifn00n1w35qckv7p620rqhpn7rfhymlz6b07rz";
+       version = "0.4.0.0";
+       sha256 = "1i9a5hgzw9w9fqg7vjixc90ck49ag0ikm9bjl2xc30gvjslpy3r8";
        buildDepends = [ base text ];
        homepage = "http://github.com/aelve/shortcut-links";
        description = "Link shortcuts for use in text markup";
@@ -115447,6 +116149,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "simple-genetic-algorithm-mr" = callPackage
+    ({ mkDerivation, base, deepseq, MonadRandom, parallel, random
+     , transformers
+     }:
+     mkDerivation {
+       pname = "simple-genetic-algorithm-mr";
+       version = "0.4.0.0";
+       sha256 = "193n24n5dpmdha85h4vn0kx846hppyzbc9f75wgndc7y7vm1qagy";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base deepseq MonadRandom parallel random transformers
+       ];
+       homepage = "http://eax.me/haskell-genetic-algorithm/";
+       description = "Simple parallel genetic algorithm implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "simple-get-opt" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -115807,15 +116527,15 @@ self: {
      }) {};
 
   "simpleirc" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hspec, HUnit, knob
-     , network, old-locale, time
+    ({ mkDerivation, base, bytestring, connection, containers, hspec
+     , HUnit, knob, network, old-locale, time
      }:
      mkDerivation {
        pname = "simpleirc";
-       version = "0.3.0";
-       sha256 = "045rbiz06zpqvkfh4hxsxz7fr338zmr3mgk2xpaqhh8pp2v14h59";
+       version = "0.3.1";
+       sha256 = "1mwhqa5gby38hlbq0shjbff4whhblw00x8wksqbh47jd6i6ihww5";
        buildDepends = [
-         base bytestring containers network old-locale time
+         base bytestring connection containers network old-locale time
        ];
        testDepends = [ base bytestring hspec HUnit knob ];
        homepage = "http://github.com/dom96/SimpleIRC";
@@ -116643,8 +117363,8 @@ self: {
     ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
        pname = "smoothie";
-       version = "0.4.0.1";
-       sha256 = "1h501mcgfwak586gakqsjhmrdkq2mmfi8gwalb7wbsp57bchfg67";
+       version = "0.4.0.2";
+       sha256 = "1g2lk58p8rbhi45j6q3r0w4103bxi6pn9i3c5i3525s8brl4y8ni";
        buildDepends = [ aeson base linear text vector ];
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
@@ -116981,24 +117701,22 @@ self: {
     ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
      , case-insensitive, configurator, containers, data-default
      , digestive-functors, digestive-functors-heist
-     , digestive-functors-snap, directory-tree, errors, filepath, heist
-     , jmacro, lens, mtl, pcre-light, QuickCheck, readable, safe, snap
+     , digestive-functors-snap, directory-tree, filepath, heist, jmacro
+     , lens, mtl, pcre-light, QuickCheck, readable, safe, snap
      , snap-core, tasty, tasty-hunit, tasty-quickcheck, text, time
      , transformers, wl-pprint-text, xmlhtml
      }:
      mkDerivation {
        pname = "snap-extras";
-       version = "0.11";
-       revision = "1";
-       sha256 = "1s6qdl149x22six61kgm7xnqfyys8z7zh0waajmzip1q4ivxqnij";
-       editedCabalFile = "b0332fedd9b65e483e28c08dc1e76473dc4ab7cee457c69195069aca91d24c46";
+       version = "0.11.0.1";
+       sha256 = "1747qvwbn1rlrjk085rj1780nrsqw4ps78c13si3kkk697k4wcbm";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base blaze-builder blaze-html bytestring case-insensitive
          configurator containers data-default digestive-functors
          digestive-functors-heist digestive-functors-snap directory-tree
-         errors filepath heist jmacro lens mtl pcre-light readable safe snap
+         filepath heist jmacro lens mtl pcre-light readable safe snap
          snap-core text time transformers wl-pprint-text xmlhtml
        ];
        testDepends = [
@@ -117975,6 +118693,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sneathlane-haste" = callPackage
+    ({ mkDerivation, base, haste-compiler }:
+     mkDerivation {
+       pname = "sneathlane-haste";
+       version = "1";
+       sha256 = "0m6281a1hvwbhv02vpdd01vm0jvccvq1kvy26dfncv0a8158y6wj";
+       buildDepends = [ base haste-compiler ];
+       jailbreak = true;
+       homepage = "http://sneathlane.com";
+       description = "A compositional web UI library, which draws to a Canvas element";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "snippet-extractor" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -119569,8 +120300,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "srcloc";
-       version = "0.5.0.2";
-       sha256 = "0r7fgplyys8335bjrdmcx4m0z0xark0f174lrh2hsmzyii37x6jc";
+       version = "0.5.1.0";
+       sha256 = "1zssd6jxdhzl5wcygbmzq1s82i7m7rav6nm1m6kl5b68g77gc7g6";
        buildDepends = [ base ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Data types for managing source code locations";
@@ -120837,8 +121568,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, stm }:
      mkDerivation {
        pname = "stm-io-hooks";
-       version = "1.0.1";
-       sha256 = "079q34wyiv4c8cn92bagh1axdvl7b03amlgygqm0ln9khni0lkg4";
+       version = "1.1.0";
+       sha256 = "0dg2za2p7h9wb9lbs2yb07pdhq9sn4mdxxfmq179d9kinq94009m";
        buildDepends = [ array base containers mtl stm ];
        description = "STM with IO hooks";
        license = stdenv.lib.licenses.bsd3;
@@ -120970,8 +121701,8 @@ self: {
      }:
      mkDerivation {
        pname = "stomp-conduit";
-       version = "0.0.3";
-       sha256 = "0i2fz5hcqjhrnnqkfzpizn1w9iyqy966yny2anl3glwi6nqyam0s";
+       version = "0.1.0";
+       sha256 = "1qzr5fkffs96clxkvm7lf7kfafijv8fsri6k0j85wrarx3qdgapa";
        buildDepends = [
          base conduit mime mtl resourcet stomp-queue stompl
        ];
@@ -120986,8 +121717,8 @@ self: {
      }:
      mkDerivation {
        pname = "stomp-patterns";
-       version = "0.0.1";
-       sha256 = "0wa07y1ks581fvlkfzv23vb0r96iwr5x0r95j9bmcsh0ln405nrn";
+       version = "0.1.0";
+       sha256 = "0rdk9h7blj7j5kiwy7zq2kb4wxxs19xk3lg73c0srrvbclb0qgbw";
        buildDepends = [
          base bytestring containers mime mtl split stomp-queue stompl time
        ];
@@ -121020,8 +121751,8 @@ self: {
      }:
      mkDerivation {
        pname = "stompl";
-       version = "0.2.0";
-       sha256 = "1p583n14q2iqwhw2n6942zcav261119i1g8h2rca5ankpp227a2z";
+       version = "0.3.0";
+       sha256 = "1ip50w8f26362h1s3kb0qzv15dq264j0vbmqw5v0s40gbwmpv2aj";
        buildDepends = [
          attoparsec base bytestring mime split text utf8-string
        ];
@@ -121344,8 +122075,11 @@ self: {
      mkDerivation {
        pname = "strict-concurrency";
        version = "0.2.4.1";
+       revision = "1";
        sha256 = "128sbh5fnv02v2xdjlk7cb525bfckqyj7fyz5399nfycs0nj2f89";
+       editedCabalFile = "e9b8d4599f2eae037bb3b6008284513dbb50af7d3ab42e617b76577bdea656a1";
        buildDepends = [ base deepseq ];
+       jailbreak = true;
        homepage = "http://code.haskell.org/~dons/code/strict-concurrency";
        description = "Strict concurrency abstractions";
        license = stdenv.lib.licenses.bsd3;
@@ -122579,22 +123313,31 @@ self: {
 
   "sync-mht" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, byteable
-     , bytestring, cereal, containers, cryptohash, directory, filepath
-     , io-streams, mtl, process, text, transformers, unix
+     , bytestring, Cabal, cereal, containers, cryptohash, directory
+     , exceptions, filepath, io-streams, mtl, process, random
+     , regex-compat, temporary, text, time, transformers, unix, zlib
      }:
      mkDerivation {
        pname = "sync-mht";
-       version = "0.2.1.0";
-       sha256 = "1yrpsh676ajcqlaq0vdrdzkdi27l4ih0m2jm7r1wdz3yzw4mrr20";
+       version = "0.3.5.0";
+       sha256 = "1mkrap2qhfhnisz28vb4hjl5fmfi8r48n1igvv4c0qf9nclhfbhd";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         array base base16-bytestring byteable bytestring cereal containers
-         cryptohash directory filepath io-streams mtl process text
-         transformers unix
+         array base base16-bytestring byteable bytestring Cabal cereal
+         containers cryptohash directory exceptions filepath io-streams mtl
+         process random regex-compat temporary text time transformers unix
+         zlib
+       ];
+       testDepends = [
+         array base base16-bytestring byteable bytestring Cabal cereal
+         containers cryptohash directory exceptions filepath io-streams mtl
+         process random regex-compat temporary text time transformers unix
+         zlib
        ];
        jailbreak = true;
-       description = "Fast incremental file transfer using Merke-Hash-Trees";
+       homepage = "https://github.com/ekarayel/sync-mht";
+       description = "Fast incremental file transfer using Merkle-Hash-Trees";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -123925,7 +124668,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tar" = callPackage
+  "tar_0_4_1_0" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, time }:
      mkDerivation {
        pname = "tar";
@@ -123936,14 +124679,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "tar_0_4_2_0" = callPackage
+  "tar" = callPackage
     ({ mkDerivation, array, base, bytestring, directory, filepath
      , old-time, QuickCheck, tasty, tasty-quickcheck, time
      }:
      mkDerivation {
        pname = "tar";
-       version = "0.4.2.0";
-       sha256 = "00z0bdj29hrhxwwj1drsn137ny1ia5rl0f64m876f10fr4p5j2c3";
+       version = "0.4.2.1";
+       sha256 = "102hjlrqfb9d0mvz2bdrj0wg7hvhvzbv4f8gsvxz0wfnq7k0mb9g";
        buildDepends = [ array base bytestring directory filepath time ];
        testDepends = [
          array base bytestring directory filepath old-time QuickCheck tasty
@@ -125448,8 +126191,8 @@ self: {
      }:
      mkDerivation {
        pname = "text";
-       version = "1.2.1.1";
-       sha256 = "0l4lrpa216dblm1qk0qpykmx56a28h0hjgccq18sn1mr7n3wyhl8";
+       version = "1.2.1.3";
+       sha256 = "0gzqx5cpkdhshbz9xss51mpyq23pnf8dwjz4h3irbv2ryaa4qdlq";
        buildDepends = [
          array base binary bytestring deepseq ghc-prim integer-gmp
        ];
@@ -126049,20 +126792,23 @@ self: {
 
   "th-context" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, data-default
-     , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, mtl, syb
-     , template-haskell, text, th-desugar, th-orphans, th-reify-many
+     , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, lens, mtl
+     , mtl-unleashed, syb, template-haskell, text, th-desugar
+     , th-orphans, th-reify-many, th-typegraph
      }:
      mkDerivation {
        pname = "th-context";
-       version = "0.13";
-       sha256 = "0i5392x1x06fk8ld7k6y8kj4hdi3s9gdf2lqj8f6vkwlcnj8cjwh";
+       version = "0.22";
+       sha256 = "0zzrb5dzxcn2dxhqniv3nx4kasgpx7mck730y9hgjink58wqsdx4";
        buildDepends = [
-         base containers data-default haskell-src-exts mtl syb
-         template-haskell th-desugar th-orphans
+         base containers data-default haskell-src-exts lens mtl
+         mtl-unleashed syb template-haskell th-desugar th-orphans
+         th-typegraph
        ];
        testDepends = [
          array base bytestring containers deepseq ghc-prim hspec hspec-core
-         mtl syb template-haskell text th-desugar th-orphans th-reify-many
+         lens mtl mtl-unleashed syb template-haskell text th-desugar
+         th-orphans th-reify-many th-typegraph
        ];
        homepage = "https://github.com/seereason/th-context";
        description = "Test instance context";
@@ -126253,15 +126999,14 @@ self: {
      }:
      mkDerivation {
        pname = "th-printf";
-       version = "0.3.0.0";
-       sha256 = "10kq1x8klgny6k5aq8h23fnrja3wfmva58j5kpjwzkz0xzr83biq";
+       version = "0.3.1";
+       sha256 = "089grlpavvqv90graa9rdwg9x1ph484g5bj7sfjklqy8mgwwqg7a";
        buildDepends = [
          attoparsec base bytestring template-haskell text transformers
        ];
        testDepends = [
          base bytestring hspec HUnit QuickCheck template-haskell text
        ];
-       jailbreak = true;
        homepage = "https://github.com/joelteon/th-printf";
        description = "Compile-time printf";
        license = stdenv.lib.licenses.mit;
@@ -126299,21 +127044,21 @@ self: {
   "th-typegraph" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
      , data-default, deepseq, ghc-prim, haskell-src-exts, hspec
-     , hspec-core, lens, mtl, set-extra, syb, template-haskell, text
-     , th-desugar, th-orphans, th-reify-many
+     , hspec-core, lens, mtl, mtl-unleashed, set-extra, syb
+     , template-haskell, text, th-desugar, th-orphans, th-reify-many
      }:
      mkDerivation {
        pname = "th-typegraph";
-       version = "0.21";
-       sha256 = "1w4k466snhkcdg30kzzc2vwiz2p46ybks1bbyf3nazc322zxryq0";
+       version = "0.27";
+       sha256 = "1v7vic9kfig9flcnqcpzazd1s4wgqiz3mj9gcyc1ijkrd4y83cdr";
        buildDepends = [
          base base-compat containers data-default haskell-src-exts lens mtl
-         set-extra syb template-haskell th-desugar th-orphans
+         mtl-unleashed set-extra syb template-haskell th-desugar th-orphans
        ];
        testDepends = [
          array base bytestring containers data-default deepseq ghc-prim
-         hspec hspec-core lens mtl syb template-haskell text th-desugar
-         th-orphans th-reify-many
+         hspec hspec-core lens mtl mtl-unleashed syb template-haskell text
+         th-desugar th-orphans th-reify-many
        ];
        homepage = "https://github.com/seereason/th-typegraph";
        description = "Graph of the subtype relation";
@@ -126622,8 +127367,8 @@ self: {
      }:
      mkDerivation {
        pname = "threepenny-gui";
-       version = "0.6.0.2";
-       sha256 = "0ghcf6p7i39ss63snmk6hn20cw4hyi3agr05rdh7n60fyf9afs4c";
+       version = "0.6.0.3";
+       sha256 = "04qrwvzz705s8aqb8f5vgakh78rv1w64ldv2mvm6fg3llfl5nlfd";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -126821,8 +127566,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal";
-       version = "0.5.2";
-       sha256 = "0ll65q5fi8qfi50q9lqxdq9nsr7gizbh2xrsxgvj09nacdnwfwv0";
+       version = "0.5.3";
+       sha256 = "09bq5ng0wvl1rcaaaw0p2b84f9sddpmabaf9c72ifw3z9k35cfyw";
        buildDepends = [
          base binary bytestring colour containers hashable hmt hosc
          mersenne-random-pure64 mtl parsec process text time transformers
@@ -126834,15 +127579,16 @@ self: {
      }) {};
 
   "tidal-midi" = callPackage
-    ({ mkDerivation, alsa-core, alsa-seq, base, containers, hashable
-     , hosc, process, tidal
+    ({ mkDerivation, base, bytestring, containers, hashable, hosc
+     , PortMidi, process, tidal, time
      }:
      mkDerivation {
        pname = "tidal-midi";
-       version = "0.0.1";
-       sha256 = "0j2smcjbnsa6ksrgfmcjbm6sjq9ps0l8fqzaib60pgi34b6dnzv8";
+       version = "0.0.2";
+       sha256 = "0q3g4qgzpd8p4z3l1npcs0gy14967l3yn4xqingdbcq22xasim6q";
        buildDepends = [
-         alsa-core alsa-seq base containers hashable hosc process tidal
+         base bytestring containers hashable hosc PortMidi process tidal
+         time
        ];
        homepage = "http://tidal.lurk.org/";
        description = "MIDI support for tidal";
@@ -127385,12 +128131,11 @@ self: {
     ({ mkDerivation, base, old-locale, time }:
      mkDerivation {
        pname = "timestamper";
-       version = "1.0";
-       sha256 = "14b9zg2lyd8lja9agy73vpscjbkv5nwk6h780wl0xk6m4md9vyj3";
+       version = "1.0.3";
+       sha256 = "1qpzk3047ky0lx5riivv9fa418qhwsa5iyy1fb9l7az6ri094qys";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base old-locale time ];
-       jailbreak = true;
        homepage = "https://github.com/kisom/timestamper";
        description = "Read standard input and prepend each line with a timestamp";
        license = stdenv.lib.licenses.mit;
@@ -129454,15 +130199,14 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-feed";
-       version = "0.2.0.1";
-       sha256 = "19j10mbvmmdni136b0sdyr0isdhslxcvgabvdqrd3if6cizpmndn";
+       version = "0.2.0.2";
+       sha256 = "19kwhk0bvwnyhychvfzc09w00ix7z9fmvrb4vv56vxdg20rni3fk";
        buildDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
        testDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
-       jailbreak = true;
        homepage = "https://github.com/stackbuilders/twitter-feed";
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
@@ -130526,10 +131270,9 @@ self: {
     ({ mkDerivation, base, io-streams, unagi-chan }:
      mkDerivation {
        pname = "unagi-streams";
-       version = "0.1.2";
-       sha256 = "0fhs55bap2dkp9lismq4df4sy8878f52xawr4an4cl0v1yj12cq0";
+       version = "0.1.3";
+       sha256 = "0m8x1sw925xwj2yd2ji0nk54gw1gqqz1zy0bk9z3c3sgbcy364m6";
        buildDepends = [ base io-streams unagi-chan ];
-       jailbreak = true;
        description = "Unagi Chan IO-Streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130577,17 +131320,17 @@ self: {
      }) {};
 
   "unbound-generics" = callPackage
-    ({ mkDerivation, base, containers, contravariant, mtl, profunctors
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, containers, contravariant, deepseq, mtl
+     , profunctors, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      , template-haskell, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "unbound-generics";
-       version = "0.1.2.1";
-       sha256 = "0vwqbq3xmacc9fa95wvy2l6r4h831a8g6w1pbxbip2bgqmybsfvk";
+       version = "0.2";
+       sha256 = "0wmr7ylczkaqyf1yrcp9d9gmw8hv7v2yip9v96zlqx02m9j57s99";
        buildDepends = [
-         base containers contravariant mtl profunctors template-haskell
-         transformers transformers-compat
+         base containers contravariant deepseq mtl profunctors
+         template-haskell transformers transformers-compat
        ];
        testDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -130885,17 +131628,21 @@ self: {
      }) {};
 
   "uniform-io" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, data-default-class
-     , iproute, network, openssl, transformers, word8
+    ({ mkDerivation, attoparsec, base, bytestring, Cabal
+     , data-default-class, iproute, network, openssl, transformers
+     , word8
      }:
      mkDerivation {
        pname = "uniform-io";
-       version = "0.1.0.0";
-       sha256 = "1xb934jvj3gk6lw2xdm22p8yayybqk823pk0ssly7kz2dyzrqzz7";
+       version = "0.1.1.0";
+       revision = "1";
+       sha256 = "0i9sdf2nnaf099r79mdrqa1hbbqyb874fk8dsqqzb1582m6czikk";
+       editedCabalFile = "4f0651eff7cbdde40b49b5fcf90e8adf5c403a7c150ac318f0f5280b454b19f9";
        buildDepends = [
          attoparsec base bytestring data-default-class iproute network
          transformers word8
        ];
+       testDepends = [ base Cabal ];
        extraLibraries = [ openssl ];
        homepage = "https://sealgram.com/git/haskell/uniform-io";
        description = "Uniform IO over files, network, watever";
@@ -132376,14 +133123,14 @@ self: {
   "uuid" = callPackage
     ({ mkDerivation, base, binary, bytestring, cryptohash, HUnit
      , network-info, QuickCheck, random, tasty, tasty-hunit
-     , tasty-quickcheck, time, uuid-types
+     , tasty-quickcheck, text, time, uuid-types
      }:
      mkDerivation {
        pname = "uuid";
-       version = "1.3.10";
-       sha256 = "0csq2y8rzdy8cnag4piqvxa742jasxqcq07qgrp4kmdkbnbqvyvy";
+       version = "1.3.11";
+       sha256 = "1m8lk12ls4c5xx1y3wm2n2spm2c5slwb27k6zrdibja8z397c637";
        buildDepends = [
-         base binary bytestring cryptohash network-info random time
+         base binary bytestring cryptohash network-info random text time
          uuid-types
        ];
        testDepends = [
@@ -132431,13 +133178,15 @@ self: {
 
   "uuid-types" = callPackage
     ({ mkDerivation, base, binary, bytestring, deepseq, hashable, HUnit
-     , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck
+     , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "uuid-types";
-       version = "1.0.1";
-       sha256 = "1brws1nq3pmd3sq786kig2raaxdcx2s8anwsn9f1jj92i5r7y7jb";
-       buildDepends = [ base binary bytestring deepseq hashable random ];
+       version = "1.0.2";
+       sha256 = "019f9w1jvqacbxmq828wsn6zpwp5yw7bkhyj34a4cc2zq3bfkijn";
+       buildDepends = [
+         base binary bytestring deepseq hashable random text
+       ];
        testDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
@@ -132825,6 +133574,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "varying" = callPackage
+    ({ mkDerivation, base, time }:
+     mkDerivation {
+       pname = "varying";
+       version = "0.1.0.3";
+       sha256 = "1y7mf2q1lawx3f8hdd9b70fa3hrmabm9lmi2rhxvr1dq5r5yh5q7";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base time ];
+       homepage = "https://github.com/schell/varying";
+       description = "Automaton based varying values, event streams and tweening";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "vault" = callPackage
     ({ mkDerivation, base, containers, hashable, unordered-containers
      }:
@@ -132930,8 +133693,8 @@ self: {
      }) {};
 
   "vcsgui" = callPackage
-    ({ mkDerivation, base, directory, filepath, gtk3, mtl, process
-     , text, vcswrapper
+    ({ mkDerivation, base, directory, filepath, gtk, mtl, process, text
+     , vcswrapper
      }:
      mkDerivation {
        pname = "vcsgui";
@@ -132940,7 +133703,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base directory filepath gtk3 mtl process text vcswrapper
+         base directory filepath gtk mtl process text vcswrapper
        ];
        homepage = "https://github.com/forste/haskellVCSGUI";
        description = "GUI library for source code management systems";
@@ -133398,6 +134161,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "verbosity" = callPackage
+    ({ mkDerivation, base, binary, data-default-class, deepseq }:
+     mkDerivation {
+       pname = "verbosity";
+       version = "0.2.0.0";
+       sha256 = "0vwv4f5ni6dzvj3jbgxcy8b2hmal6c8xbdin16pifqrn55d52pa9";
+       buildDepends = [ base binary data-default-class deepseq ];
+       homepage = "https://github.com/trskop/verbosity";
+       description = "Simple enum that encodes application verbosity";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "verilog" = callPackage
     ({ mkDerivation, alex, array, base, happy }:
      mkDerivation {
@@ -133512,8 +134287,8 @@ self: {
      }:
      mkDerivation {
        pname = "vimeta";
-       version = "0.2.0.0";
-       sha256 = "14xzqhykw963ja6wsnrbq8dh9wbk63aramzj4n210srwxy6yqc05";
+       version = "0.2.1.0";
+       sha256 = "0sc5mlv4d9srgv6rj43ddn27rindpyrz2mwz2i5rmm8y4ixn7jrq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -133866,6 +134641,7 @@ self: {
        buildDepends = [ base glib gtk3 pango ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ vte ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
@@ -133882,8 +134658,8 @@ self: {
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.2.9";
-       sha256 = "013bha8b30q7ax2qyv315hmdxhzfqgc2bw2wyz1q53qw0mxyhbjr";
+       version = "5.2.10";
+       sha256 = "0wl4qfag8hkhsbm66cgxs55nq3fgmxdxzcvjvcbcm42pcyikvx9y";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -134165,8 +134941,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.9";
-       sha256 = "19rnkqg4x6n2w2313naxbkcp2hyj4bj6d6kx3rwakk8wmdy70r04";
+       version = "3.0.10";
+       sha256 = "0dqvfwqzkr3g030s24lzy9l9vaws27m0cs0aq771p7f22w9g6fjh";
        buildDepends = [
          ansi-terminal base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -134853,17 +135629,18 @@ self: {
 
   "wai-routes" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
-     , http-types, mtl, path-pieces, random, template-haskell, text, wai
+     , http-types, monad-loops, mtl, path-pieces, random
+     , template-haskell, text, wai
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.7.1";
-       sha256 = "053bgiw2abwjlc6ap9ka4kdg410gxxmyqdfzsxiva94sp3w816xx";
+       version = "0.7.2";
+       sha256 = "05f8524q9rb5y4d8fryhv4jjkcgqygbckg4pkklvs86s5zlg9nsa";
        buildDepends = [
-         aeson base blaze-builder bytestring containers http-types mtl
-         path-pieces random template-haskell text wai
+         aeson base blaze-builder bytestring containers http-types
+         monad-loops mtl path-pieces random template-haskell text wai
        ];
-       homepage = "https://github.com/ajnsit/wai-routes";
+       homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135107,8 +135884,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.1.0";
-       sha256 = "1lx1fbcf8bkr5g6j0flk6mplnvs289lkyds5hv31naa450wbca62";
+       version = "3.1.2";
+       sha256 = "1ya8mfvb18p9d5bj0ijnlbd7m04mj7f1z9ld82a8vry37sdifidq";
        buildDepends = [
          array auto-update base blaze-builder bytestring case-insensitive
          containers ghc-prim hashable http-date http-types http2 iproute
@@ -135658,10 +136435,13 @@ self: {
      mkDerivation {
        pname = "webcrank-dispatch";
        version = "0.1";
+       revision = "1";
        sha256 = "1w4kfcm2d6iw4d45ywg2g6iysxl2iywk3nbk5ac6p6500y6hh97k";
+       editedCabalFile = "50b6b56e1fccc20a2986ea93b04410b8131ea5f2f4df94df538c6b2369400fa8";
        buildDepends = [
          base bytestring mtl path-pieces reroute text unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/webcrank/webcrank-dispatch.hs";
        description = "A simple request dispatcher";
        license = stdenv.lib.licenses.bsd3;
@@ -135846,6 +136626,7 @@ self: {
        buildDepends = [ base bytestring cairo glib gtk3 mtl pango text ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ webkit ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
@@ -135862,6 +136643,7 @@ self: {
        buildDepends = [ base glib gtk3 webkitgtk3 ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ webkit ];
+       jailbreak = true;
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) webkit;};
@@ -137500,8 +138282,8 @@ self: {
      }:
      mkDerivation {
        pname = "xhb";
-       version = "0.5.2014.4.10";
-       sha256 = "1r5z92p98jn8pdcqmdiv0hriq7y8743q4sxfjfds602rr4qf97gz";
+       version = "0.6.2015.8.1";
+       sha256 = "1rq6g96v1fs66kdmnkvlkcxrv614ha77czclm3sfw274f7q2r2kb";
        buildDepends = [
          base binary byteorder bytestring containers network parsec stm
          Xauth
@@ -137713,8 +138495,8 @@ self: {
      }:
      mkDerivation {
        pname = "xlsx";
-       version = "0.1.0.4";
-       sha256 = "1zri5wan5h3nyizfrfmnw9mz2cwapi4wrc3srxqns5w12v866p3a";
+       version = "0.1.0.5";
+       sha256 = "0zd3p0dkb4v9gcd3mvp6g64z1gr1m5x0pf2zyj3w7ab0dgz4gzsz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -137726,7 +138508,6 @@ self: {
          base containers HUnit old-time smallcheck tasty tasty-hunit
          tasty-smallcheck time
        ];
-       jailbreak = true;
        homepage = "https://github.com/qrilka/xlsx";
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
@@ -138710,8 +139491,8 @@ self: {
      }:
      mkDerivation {
        pname = "xss-sanitize";
-       version = "0.3.5.5";
-       sha256 = "05qmhd50bdy5z0nvqvrm25ax4i642gv6gkdn678flg6sckshr4s2";
+       version = "0.3.5.6";
+       sha256 = "1j2qrn2dbfx01m7zyk9ilgnp9zjwq9mk62b0rdal4zkg4vh212h0";
        buildDepends = [
          attoparsec base containers css-text network-uri tagsoup text
          utf8-string
@@ -139718,8 +140499,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.13";
-       sha256 = "0rqwmvl2pl05fp7xyfcpmpjkki8ww47rhifcclasaxvj109hvj1k";
+       version = "1.4.13.1";
+       sha256 = "1vnqiibdjvkja80b8i352afrhphx8v6nihylgxaywch20b2fbkrc";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -139737,6 +140518,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-bootstrap" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, conduit
+     , conduit-extra, containers, either, email-validate
+     , lens-family-core, lens-family-th, MonadRandom, mtl, persistent
+     , shakespeare, text, time, transformers, yesod-core, yesod-form
+     , yesod-markdown
+     }:
+     mkDerivation {
+       pname = "yesod-bootstrap";
+       version = "0.1.0.0";
+       sha256 = "19hzc1k0ssmsi9k4r5bxmngr1h8a42qhaxcl5y99fbf6khpndxzg";
+       buildDepends = [
+         base blaze-html blaze-markup conduit conduit-extra containers
+         either email-validate lens-family-core lens-family-th MonadRandom
+         mtl persistent shakespeare text time transformers yesod-core
+         yesod-form yesod-markdown
+       ];
+       description = "Bootstrap widgets for yesod";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-comments" = callPackage
     ({ mkDerivation, base, bytestring, directory, friendly-time
      , gravatar, old-locale, persistent, template-haskell, text, time
@@ -140110,6 +140912,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-lucid" = callPackage
+    ({ mkDerivation, base, lucid, monads-tf, text, yesod-core }:
+     mkDerivation {
+       pname = "yesod-lucid";
+       version = "0.1";
+       sha256 = "1ymmpi9g3pjl23ymdjwiv748lnq1hyjq24la2ffgwrm4b6f41xip";
+       buildDepends = [ base lucid monads-tf text yesod-core ];
+       description = "Lucid support for Yesod";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yesod-mangopay" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
      , containers, country-codes, data-default, directory, fast-logger
@@ -140143,18 +140956,18 @@ self: {
 
   "yesod-markdown" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
-     , directory, pandoc, persistent, shakespeare, texmath, text
+     , directory, hspec, pandoc, persistent, shakespeare, texmath, text
      , xss-sanitize, yesod-core, yesod-form
      }:
      mkDerivation {
        pname = "yesod-markdown";
-       version = "0.9.4";
-       sha256 = "1mam4ibbnzvi1ljlj8kzz24s8jxk3f3xvvicmcygklz0n9pmaw66";
+       version = "0.10.0";
+       sha256 = "0n9rcpf8s89swj0pz86xddl5zjbkkw1fa1h292wvs15y77lrl0zi";
        buildDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare texmath text xss-sanitize yesod-core yesod-form
        ];
-       jailbreak = true;
+       testDepends = [ base blaze-html hspec text ];
        homepage = "http://github.com/pbrisbin/yesod-markdown";
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
@@ -140650,8 +141463,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-table";
-       version = "1.0.2";
-       sha256 = "0rrc9cfjl1g8if0ncs2xzpb1hnaa4hi3w62q16gwir0l79vfj7b9";
+       version = "1.0.3";
+       sha256 = "02w7ddyi0zzcvhlj1b01p3zjii2g7bn2f7wcgrdidk8dlg9hrgj5";
        buildDepends = [ base containers contravariant text yesod-core ];
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";

From e0826531e1ce40c9a818018f1eb443102210e602 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 19 Jul 2015 07:14:18 -0400
Subject: [PATCH 0754/2016] Update ghcjs-boot

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

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index e4288b9a2cb..9dd1c4fc6c1 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -41,8 +41,8 @@ let
   version = "0.1.0";
   ghcjsBoot = fetchgit {
     url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "d3581514d0a5073f8220a2f5baafe6866faa35a0"; # 7.10 branch
-    sha256 = "1p13ifidpi7y1mjq5qv9229isfnsiklizci7i55sf83mp6wqdyvr";
+    rev = "d435c60b62d24b7a4117493f7aaecbfa09968fe6"; # 7.10 branch
+    sha256 = "07vhmjz21ccnqccms003550xacmwb08pjdkhnjcwcbl2603v4na1";
     fetchSubmodules = true;
   };
   shims = fetchgit {

From 700d365d16c4e67d6cd5c639b142ffbe02540ebb Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 19 Jul 2015 07:14:28 -0400
Subject: [PATCH 0755/2016] Update ghcjs-shims

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

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 9dd1c4fc6c1..a078e335287 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -47,8 +47,8 @@ let
   };
   shims = fetchgit {
     url = git://github.com/ghcjs/shims.git;
-    rev = "9b196ff5ff13a24997011009b37c980c5534e24f"; # master branch
-    sha256 = "1zsfxka692fr3zb710il7g1sj64xwaxmasimciylb4wx84h7c30w";
+    rev = "0b670ca27fff3f0bad515c37e56ccb8b4d6758fb"; # master branch
+    sha256 = "19zq79f2y59lw7c8m100awh3rcra5yhbsvpb5xmp3mq6grac7h08";
   };
 in mkDerivation (rec {
   pname = "ghcjs";

From 297ca5ff21d91fa8a41d73aad65a3c857d651cf5 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 24 Jul 2015 13:35:51 -0400
Subject: [PATCH 0756/2016] Update ghcjs.

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

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index a078e335287..9f1d3122818 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -55,8 +55,8 @@ in mkDerivation (rec {
   inherit version;
   src = fetchgit {
     url = git://github.com/ghcjs/ghcjs.git;
-    rev = "c1b6239b0289371dc6b8d17dfd845c14bd4dc490"; # master branch
-    sha256 = "0ncbk7m1l7cpdgmabm14d7f97fw3vy0hmpj4vs4kkwhhfjf6kp8s";
+    rev = "fb1faa9cb0a11a8b27b0033dfdb07aafb6add35e"; # master branch
+    sha256 = "1vqf19059j86h3rnbvzcp55bdqd5dkw3krb5vkw5mgsmva2g8sch";
   };
   isLibrary = true;
   isExecutable = true;

From b03ce5d57a66d9f454bb736d3c81e97ca546590d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Aug 2015 15:05:47 +0200
Subject: [PATCH 0757/2016] haskell-binary: update to version 0.7.6.1

---
 pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix  | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix  | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix  | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix  | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix  | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 5299cefdc07..daaab9ee391 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -41,7 +41,7 @@ self: super: {
   unix = null;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_5_0;
+  binary = self.binary_0_7_6_1;
 
   # deepseq is not a core library for this compiler.
   deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index a3ad255aab8..c40075d9dee 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -35,7 +35,7 @@ self: super: {
   unix = null;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_5_0;
+  binary = self.binary_0_7_6_1;
 
   # deepseq is not a core library for this compiler.
   deepseq = self.deepseq_1_4_1_1;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 63506bad419..e30d31bdc87 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -41,7 +41,7 @@ self: super: {
   transformers = self.transformers_0_4_3_0;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_7_5_0; process = self.process_1_2_3_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_7_6_1; process = self.process_1_2_3_0; };
 
   # Newer versions don't compile.
   Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index e19a69277db..5b5cb9ffa18 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -38,10 +38,10 @@ self: super: {
   transformers = self.transformers_0_4_3_0;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_5_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_6_1; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_6_1; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index a9e64935faf..dbdd0bc31b2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -40,10 +40,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_5_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_6_1; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_6_1; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 9696ccddcc5..8ec10e22fa4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -85,8 +85,8 @@ self: super: {
   seqid-streams = super.seqid-streams_0_1_0;
 
   # Need binary >= 0.7.2, but our compiler has only 0.7.1.0.
-  hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_5_0; });
-  tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_5_0; });
+  hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_6_1; });
+  tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_6_1; });
 
   # These packages need mtl 2.2.x directly or indirectly via dependencies.
   amazonka = markBroken super.amazonka;

From e4d493fc5449d85c66d45bbfb0531eea3241baa1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Aug 2015 15:07:07 +0200
Subject: [PATCH 0758/2016] jailbreak-cabal: link statically to avoid runtime
 dependency on ghc

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5260d508ab1..40141c60e3b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -11,6 +11,9 @@ self: super: {
   cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; zlib = self.zlib_0_5_4_2; });
   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;
+
   # Break infinite recursions.
   Dust-crypto = dontCheck super.Dust-crypto;
   hasql-postgres = dontCheck super.hasql-postgres;

From ab77228749626b00b726d7050f3e02ef1865218e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jul 2015 22:16:16 +0200
Subject: [PATCH 0759/2016] haskell-generic-builder: improve recognition of
 pkgconfig dependencies

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

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 2af3d964619..26643f075b0 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -45,7 +45,6 @@
 , useCpphs ? false
 } @ args:
 
-assert pkgconfigDepends != [] -> pkgconfig != null;
 assert editedCabalFile != null -> revision != null;
 
 let
@@ -105,10 +104,13 @@ let
   isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env);
   isSystemPkg = x: !isHaskellPkg x;
 
+  allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
+                        optionals doCheck testPkgconfigDepends;
+
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
   otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      buildTools ++ libraryToolDepends ++ executableToolDepends ++
-                     optionals (pkgconfigDepends != []) ([pkgconfig] ++ pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends) ++
+                     optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends);
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 
@@ -122,6 +124,9 @@ let
   ghcCommandCaps = toUpper ghcCommand;
 
 in
+
+assert allPkgconfigDepends != [] -> pkgconfig != null;
+
 stdenv.mkDerivation ({
   name = "${optionalString (hasActiveLibrary && pname != "ghcjs") "haskell-"}${pname}-${version}";
 

From 552fcd0b754a53e85715588aed5becada5d6d224 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Aug 2015 12:53:40 +0200
Subject: [PATCH 0760/2016] haskell-hsqml-datamodel-vinyl is broken because of
 singletons.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 40141c60e3b..a7d2ca907be 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -811,6 +811,7 @@ self: super: {
   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;

From 94e1660d002802a6012f8bb8e92c7d097209a9c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 4 Aug 2015 13:15:17 +0200
Subject: [PATCH 0761/2016] haskell-mockery: run test suite with "TRAVIS=true"
 set to avoid timing issues

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a7d2ca907be..9f0b5d4599a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -900,4 +900,7 @@ self: super: {
   # https://ghc.haskell.org/trac/ghc/ticket/9825
   vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
 
+  # https://github.com/hspec/mockery/issues/6
+  mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; });
+
 }

From 099c1a4522c9c1237e1dfc021ffb25ed13c2bff9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Aug 2015 14:26:42 +0200
Subject: [PATCH 0762/2016] haskell-tar: use older version for builds with GHC
 < 7.6.x.

---
 pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index c40075d9dee..af34629e319 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -70,4 +70,7 @@ self: super: {
   # Needs hashable on pre 7.10.x compilers.
   nats = addBuildDepend super.nats self.hashable;
 
+  # Newer versions require bytestring >=0.10.
+  tar = super.tar_0_4_1_0;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index e30d31bdc87..1ec76e6fa19 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -70,4 +70,7 @@ self: super: {
   # Needs hashable on pre 7.10.x compilers.
   nats = addBuildDepend super.nats self.hashable;
 
+  # Newer versions require bytestring >=0.10.
+  tar = super.tar_0_4_1_0;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index 5b5cb9ffa18..0046ad66c23 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -79,4 +79,7 @@ self: super: {
   # Avoid depending on tasty-golden.
   monad-par = dontCheck super.monad-par;
 
+  # Newer versions require bytestring >=0.10.
+  tar = super.tar_0_4_1_0;
+
 }

From 2d26a0f8aaf99e638a8c8fce60cea5bf4fdbc7da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Aug 2015 14:23:35 +0200
Subject: [PATCH 0763/2016] Update haskellPackages set to GHC 7.10.2.

---
 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 5ec29bbf1b7..4ae906c4875 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4001,7 +4001,7 @@ let
 
   haskell = callPackage ./haskell-packages.nix { };
 
-  haskellPackages = haskell.packages.ghc7101.override {
+  haskellPackages = haskell.packages.ghc7102.override {
     overrides = config.haskellPackageOverrides or (self: super: {});
   };
 

From 466115816402e7cc902cfe4b7c2001d9076a1da2 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 5 Aug 2015 21:55:02 +0200
Subject: [PATCH 0764/2016] vpnc: revert default local port to 500

---
 pkgs/tools/networking/vpnc/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index bde93dfdd48..5d8971e5c6f 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -34,10 +34,6 @@ stdenv.mkDerivation rec {
 
     substituteInPlace "pcf2vpnc" \
       --replace "/usr/bin/perl" "${perl}/bin/perl"
-
-    # use random local port by default to reduce clashes with
-    # other IPSec services like, e.g., strongSwan
-    echo "Local Port 0" >> vpnc.conf
   '';
 
   postInstall = ''

From b093790ae29078afe0d8df38f8408eab816f250f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 5 Aug 2015 22:16:05 +0200
Subject: [PATCH 0765/2016] gnome-desktop: propagate gsettings_desktop_schemas,
 required by the .pc

---
 pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
index c62cbfe7256..e9a853c56a1 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig python libxml2Python libxslt which libX11
                   xkeyboard_config isocodes itstool wayland
                   gtk3 glib intltool gnome_doc_utils libxkbfile
-                  gnome3.gsettings_desktop_schemas gobjectIntrospection ];
+                  gobjectIntrospection ];
+
+  propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;

From eda4fd9be716a34e8dedc5929b2f50e54b58d620 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 5 Aug 2015 22:16:54 +0200
Subject: [PATCH 0766/2016] gnome-video-effects: init at 0.4.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  2 ++
 .../3.16/misc/gnome-video-effects/default.nix | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 9c32ddf528c..98ea1e23bd3 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -330,6 +330,8 @@ let
 
   pomodoro = callPackage ./misc/pomodoro { };
 
+  gnome-video-effects = callPackage ./misc/gnome-video-effects { };
+
     };
   in self; # pkgsFun
 
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix
new file mode 100644
index 00000000000..2a1c1d27f16
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-video-effects-${version}";
+  version = "0.4.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz";
+    sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil";
+  };
+
+  buildInputs = [ pkgconfig intltool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects;
+    platforms = platforms.linux;
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+  };
+}

From dc4d5aa29ab97b46105fb20c21f496b5e5840d84 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 5 Aug 2015 22:17:09 +0200
Subject: [PATCH 0767/2016] cheese: init at 3.16.1

---
 .../gnome-3/3.16/apps/cheese/default.nix      | 30 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  3 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
new file mode 100644
index 00000000000..c3c37c5fd76
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3
+, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst_2, udev, gst_all_1, itstool
+, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "cheese-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/cheese/${gnome3.version}/${name}.tar.xz";
+    sha256 = "184hzwrjjn94ndivb54rrif4jnbr66p1j0nlqqi3nw6qsrm2yqj4";
+  };
+
+  buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool
+                  gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2
+                  gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop
+                  gst_all_1.gst-plugins-bad clutter_gtk clutter-gst_2
+                  libtool libcanberra_gtk3 ];
+
+  enableParallelBuilding = true;
+
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Cheese;
+    description = "Take photos and videos with your webcam, with fun graphical effects";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 98ea1e23bd3..8be88e42db9 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -44,6 +44,7 @@ let
   gnome3 = self // { recurseForDerivations = false; };
   clutter = pkgs.clutter_1_22;
   clutter_gtk = pkgs.clutter_gtk_1_6.override { inherit clutter gtk3; };
+  clutter-gst_2 = pkgs.clutter-gst;
   clutter-gst = pkgs.clutter-gst_3_0.override { inherit clutter; };
   cogl = pkgs.cogl_1_20;
   gtk = gtk3;
@@ -246,6 +247,8 @@ let
     webkitgtk = webkitgtk24x;
   };
 
+  cheese = callPackage ./apps/cheese { };
+
   evolution = callPackage ./apps/evolution {
     webkitgtk = webkitgtk24x;
   };

From a8776cdc3dc44eefffb0e650d07c693ceeb30b4c Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 3 Aug 2015 18:27:19 +0200
Subject: [PATCH 0768/2016] e19 update

efl: 1.14.1 -> 1.15.0
elementary: 1.14.1 -> 1.15.0
emotion: 1.14.0 -> 1.15.0
evas: 1.14.0 -> 1.15.0
enlightenment: 1.19.5 -> 1.19.8
pythonefl: 1.14.0 -> 1.15.0
---
 pkgs/desktops/e19/econnman.nix      | 4 ++--
 pkgs/desktops/e19/efl.nix           | 4 ++--
 pkgs/desktops/e19/elementary.nix    | 8 ++++----
 pkgs/desktops/e19/emotion.nix       | 4 ++--
 pkgs/desktops/e19/enlightenment.nix | 4 ++--
 pkgs/desktops/e19/evas.nix          | 4 ++--
 pkgs/top-level/python-packages.nix  | 6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix
index 4d80b633bd3..c75af81af1a 100644
--- a/pkgs/desktops/e19/econnman.nix
+++ b/pkgs/desktops/e19/econnman.nix
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ];
-  propagatedBuildInputs = [ python27Packages.pythonefl_1_14 python27Packages.dbus e19.elementary ];
+  propagatedBuildInputs = [ python27Packages.pythonefl_1_15 python27Packages.dbus e19.elementary ];
   postInstall = ''
-    wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_14}/lib/python2.7/site-packages
+    wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_15}/lib/python2.7/site-packages
   '';
 
   meta = {
diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix
index 7c2e0c3e378..10b69647c0e 100644
--- a/pkgs/desktops/e19/efl.nix
+++ b/pkgs/desktops/e19/efl.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.14.1";
+  version = "1.15.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
-    sha256 = "16rj4qnpw1ya0bsp9a69w6zjmmhzni7vnc0z4wg819jg5k2njzjf";
+    sha256 = "1x5n2afy5z1akam5y187ajk52mq2k9lwmz7nlrxp92rvx1jf6li5";
   };
 
   buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix
index 15bdc08b6d3..17973d530ff 100644
--- a/pkgs/desktops/e19/elementary.nix
+++ b/pkgs/desktops/e19/elementary.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }:
+{ stdenv, fetchurl, pkgconfig, e19, libcap, automake, autoconf, libdrm, gdbm }:
 stdenv.mkDerivation rec {
   name = "elementary-${version}";
-  version = "1.14.1";
+  version = "1.15.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
-    sha256 = "100bfzw6q57dnzcqg4zm0rqpvkk7zykfklnn6kcymv80j43xg0p1";
+    sha256 = "085s2xw3dhv8xiy7ikaaim5gil423g08wclhk0psi76g0vavgd32";
   };
-  buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
+  buildInputs = [ pkgconfig e19.efl libdrm gdbm automake autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
   NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ];
   patches = [ ./elementary.patch ];
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix
index 6aa4089f52f..a95759b6f17 100644
--- a/pkgs/desktops/e19/emotion.nix
+++ b/pkgs/desktops/e19/emotion.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, e19, vlc }:
 stdenv.mkDerivation rec {
   name = "emotion_generic_players-${version}";
-  version = "1.14.0";
+  version = "1.15.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz";
-    sha256 = "1n1a5n2wi68n8gjw4yk6cyf11djpqpac0025vysn5w6dqgccfic3";
+    sha256 = "08yl473aiklj0yfxbn88000hmnhl7dbhqixsn22ias8a90rxdfhh";
   };
   buildInputs = [ pkgconfig e19.efl vlc ];
   NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ];
diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix
index 7e770ffe00b..7a350d7396b 100644
--- a/pkgs/desktops/e19/enlightenment.nix
+++ b/pkgs/desktops/e19/enlightenment.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
-  version = "0.19.5";
+  version = "0.19.8";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
-    sha256 = "0j66x7x76fbgqfw6fi77v8qy50slw3jnsq3vvs82rrfvniabm8wc";
+    sha256 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi";
   };
   buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb
     xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2
diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix
index a35b4c58321..553abec576e 100644
--- a/pkgs/desktops/e19/evas.nix
+++ b/pkgs/desktops/e19/evas.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }:
 stdenv.mkDerivation rec {
   name = "evas_generic_loaders-${version}";
-  version = "1.14.0";
+  version = "1.15.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz";
-    sha256 = "04m8vsrigbsg9hm94lxac56frdxil1bib0bjmspa6xsfgi12afwl";
+    sha256 = "1k9bmswrgfara4a7znqcv3qbhq3zjbm0ks1zdb0jk5mfl6djr8na";
   };
   buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ];
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39c459259ea..9800d6adda4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16006,12 +16006,12 @@ let
     };
   };
 
-  pythonefl_1_14 = buildPythonPackage rec {
+  pythonefl_1_15 = buildPythonPackage rec {
     name = "python-efl-${version}";
-    version = "1.14.0";
+    version = "1.15.0";
     src = pkgs.fetchurl {
       url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz";
-      sha256 = "1pns5mdyc069z6j1pywjasdd6v9xka5kjdl2yxpd6ds948dia0q0";
+      sha256 = "1k3vb7pb70l2v1s2mzg91wvmncq93vb04vn60pzdlrnbcns0grhi";
     };
     preConfigure = ''
       export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"

From 51a5e01a40ce4f286496134b70d3301a19ad944c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 5 Aug 2015 22:33:41 +0200
Subject: [PATCH 0769/2016] python-packages numexpr: 2.4 -> 2.4.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9c42d325ed..55eef4fd02b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8449,14 +8449,16 @@ let
   };
 
   numexpr = buildPythonPackage rec {
-    version = "2.4";
+    version = "2.4.3";
     name = "numexpr-${version}";
 
-    src = pkgs.fetchgit {
-      url = https://github.com/pydata/numexpr.git;
-      rev = "606cc9a110711e947d35ac2770749c00dab184c8";
-      sha256 = "1gxgkg7ncgjhnifn444iha5nrjhyr8sr6w5yp204186a1ysz858g";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/n/numexpr/${name}.tar.gz";
+      sha256 = "3ae7191c89df40db6b0a8637a4dace7c5956bc910793a53225f985f3b443c722";
     };
+    
+    # Tests fail with python 3. https://github.com/pydata/numexpr/issues/177
+    doCheck = !isPy3k;
 
     propagatedBuildInputs = with self; [ numpy ];
 

From 4f9249caaf4b6ae9a038a2c0fdb13694746cf92a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 5 Aug 2015 21:25:07 +0200
Subject: [PATCH 0770/2016] netsniff-ng 0.5.9-70-g123b444 -> 0.5.9-71-g77445f8

Remove patch to curvetun build (now upstream).
---
 pkgs/tools/networking/netsniff-ng/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 46eb8accb79..0787cb9f29b 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-70-g123b444"; in
+let version = "0.5.9-71-g77445f8"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,18 +10,14 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "123b444d78337a8f00d3ba83de3af3cdc6891de8";
-    sha256 = "0yqh83g0ja4ggdiylp63h57pxx39fn6axzfvs2w0lp27gbl4yc0i";
+    rev = "77445f81d451eef6b78b79a2bcc24d21d4be4178";
+    sha256 = "0ny9bph070mny6i9r0i3wsx2bsl53135n439ab6r9qk710xjz91j";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl
     libnetfilter_conntrack libpcap libsodium liburcu ncurses perl
     pkgconfig zlib ];
 
-  postPatch = ''
-    substituteInPlace curvetun/Makefile --replace "curvetun.o" "curvetun.o sysctl.o"
-  '';
-
   # ./configure is not autoGNU but some home-brewn magic
   configurePhase = ''
     patchShebangs configure

From f12065cba6f190289084e973b4a150c05df1bacb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 5 Aug 2015 22:43:23 +0200
Subject: [PATCH 0771/2016] gnome-video-effects: add missing `gnome3` attr

Fix evaluation.
---
 pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix
index 2a1c1d27f16..c0bd2fed3f2 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool }:
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-video-effects-${version}";

From 80b87bf3cc3259c7b48c41f795a1360bd56119a9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 5 Aug 2015 22:14:24 +0200
Subject: [PATCH 0772/2016] lzo: 2.08 -> 2.09

Also:
  - improve descriptions somewhat;
  - build in parallel;
  - maintain.
---
 pkgs/development/libraries/lzo/default.nix | 33 ++++++++++++----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix
index f4bff72fa80..23168de43ed 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -1,32 +1,35 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "lzo-2.08";
+  name = "lzo-2.09";
 
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "0536ad3ksk1r8h2a27d0y4p27lwjarzyndw7sagvxzj6xr6kw6xc";
+    sha256 = "0k5kpj3jnsjfxqqkblpfpx0mqcy86zs5fhjhgh2kq1hksg7ag57j";
   };
 
   configureFlags = [ "--enable-shared" ];
 
+  enableParallelBuilding = true;
+
   doCheck = true;
 
-  meta = {
-    description = "A data compresion library suitable for real-time data de-/compression";
-    longDescription =
-      '' LZO is a data compression library which is suitable for data
-	 de-/compression in real-time.  This means it favours speed over
-	 compression ratio.
-
-	 LZO is written in ANSI C.  Both the source code and the compressed
-	 data format are designed to be portable across platforms.
-      '';
+  meta = with stdenv.lib; {
+    description = "Real-time data (de)compression library";
+    longDescription = ''
+      LZO is a portable lossless data compression library written in ANSI C.
+      Both the source code and the compressed data format are designed to be
+      portable across platforms.
+      LZO offers pretty fast compression and *extremely* fast decompression.
+      While it favours speed over compression ratio, it includes slower
+      compression levels achieving a quite competitive compression ratio
+      while still decompressing at this very high speed.
+    '';
 
     homepage = http://www.oberhumer.com/opensource/lzo;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ nckx ];
   };
 }

From 3944e4f980c610848f6b297aef7b12db14abf401 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 5 Aug 2015 19:46:55 +0200
Subject: [PATCH 0773/2016] ipython: 3.1 -> 3.2.1

---
 pkgs/shells/ipython/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index f53bed62e44..0283c48add9 100644
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -13,12 +13,13 @@ assert qtconsoleSupport == true -> pyqt4 != null;
 assert pylabQtSupport == true -> pyqt4 != null;
 
 buildPythonPackage rec {
-  name = "ipython-3.1.0";
+  name = "ipython-${version}";
+  version = "3.2.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-    sha256 = "092nilrkr76l1mklnslgbw1cz7z1xabp1hz5s7cb30kgy39r482k";
+    sha256 = "c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177";
   };
 
   propagatedBuildInputs = [

From 150cbd6a65660f10b938a250a103501937a9bdd7 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 29 Jul 2015 13:40:14 +0200
Subject: [PATCH 0774/2016] dropbox: 3.6.9 -> 3.8.5

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 5a37a8eb76a..c5840b93b6f 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -19,11 +19,11 @@
 
 let
   # NOTE: When updating, please also update in current stable, as older versions stop working
-  version = "3.6.9";
+  version = "3.8.5";
   sha256 =
     {
-      "x86_64-linux" = "1i260mi40siwcx9b2sj4zwszxmj1l88mpmyqncsfa72k02jz22j3";
-      "i686-linux" = "0qqc8qbfaighbhjq9y22ka6n6apl8b6cr80a9rkpk2qsk99k8h1z";
+      "x86_64-linux" = "1r0wz2fsx2piasl04qsgwbl88bi0ajr0dm2swbslxwkf789vk18y";
+      "i686-linux" = "1dvfgp9dg3frhwmchwa6fyws4im9vgicchfsv0zzflvc7rm9fcig";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From e15a4b0ee24459ef3872a07d37a6f1969068043c Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 30 Jul 2015 02:53:03 +0200
Subject: [PATCH 0775/2016] wine: 1.7.47 -> 1.7.48

---
 pkgs/misc/emulators/wine/versions.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index 4714834fbcb..fd8890d36bd 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -1,7 +1,7 @@
 {
   unstable = {
-    wineVersion = "1.7.47";
-    wineSha256  = "0bmvgcag0kv0671dj6fbfdz86ij91rb2kp2dssqw83a0xidgfx5s";
+    wineVersion = "1.7.48";
+    wineSha256  = "13kcjirif57p8mg4yhzxf0hjpghlwc18iskz66dx94i0dvjmrxg3";
     geckoVersion = "2.36";
     geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g";
     gecko64Version = "2.36";
@@ -23,8 +23,8 @@
     #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
   };
   staging = {
-    version = "1.7.47";
-    sha256 = "0m47v4jbc70b7qxj0lqnc7an1xlcb81b6k7dwzjyk3pv3ixp2snp";
+    version = "1.7.48";
+    sha256 = "06p1h92vaqlzk09aj4na6z7k3a81y9nw19rfg9q2szpcqjdd437w";
   };
   winetricks = {
     version = "20150706";

From d165ea2329b1f73fea087dab8ccbef7b339302b2 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lancelot@lancelotsix.com>
Date: Mon, 3 Aug 2015 22:05:16 +0200
Subject: [PATCH 0776/2016] hubicfuse: init at 2.1.0

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

diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix
new file mode 100644
index 00000000000..7ce48d28803
--- /dev/null
+++ b/pkgs/tools/filesystems/hubicfuse/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }:
+
+stdenv.mkDerivation rec {
+  name = "hubicfuse-${version}";
+  version = "2.1.0";
+
+  src = fetchurl {
+    url = https://github.com/TurboGit/hubicfuse/archive/v2.1.0.tar.gz;
+    sha256 = "1mnijcwac6k3f6xknvdrsbmkkizpwbayqkb5l6jic15ymxv1fs7d";
+  };
+
+  buildInputs = [ pkgconfig curl openssl fuse libxml2 json_c file ];
+  postInstall = ''
+    install hubic_token $out/bin
+    mkdir -p $out/sbin
+    ln -sf $out/bin/hubicfuse $out/sbin/mount.hubicfuse
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/TurboGit/hubicfuse;
+    description = "FUSE-based filesystem to access hubic cloud storage";
+    platforms = platforms.linux;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 518890ebb3d..60bd02eb1f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1870,6 +1870,8 @@ let
 
   httptunnel = callPackage ../tools/networking/httptunnel { };
 
+  hubicfuse = callPackage ../tools/filesystems/hubicfuse { };
+
   hwinfo = callPackage ../tools/system/hwinfo { };
 
   i2c-tools = callPackage ../os-specific/linux/i2c-tools { };

From 440dde6950a193c0c32a736c41cf14eba975f9bb Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 6 Aug 2015 00:27:32 +0200
Subject: [PATCH 0777/2016] wine: cleanup and comment build script

---
 pkgs/misc/emulators/wine/builder-wow.sh | 2 ++
 pkgs/misc/emulators/wine/versions.nix   | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh
index c7d9ed55a3f..cf6cc59a6da 100644
--- a/pkgs/misc/emulators/wine/builder-wow.sh
+++ b/pkgs/misc/emulators/wine/builder-wow.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+## build described at http://wiki.winehq.org/Wine64
+
 source $stdenv/setup
 
 unpackPhase
diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index fd8890d36bd..2775150385d 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -18,9 +18,6 @@
     gecko64Sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw";
     monoVersion = "4.5.6";
     monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
-    ## TESTME wine stable should work with most recent mono
-    #monoVersion = "0.0.8";
-    #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
   };
   staging = {
     version = "1.7.48";

From 18cf2e0108b5ead079773e1075b2d5ee4b92f439 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 5 Aug 2015 23:34:46 +0200
Subject: [PATCH 0778/2016] perl-Perl-Critic: 1.121 -> 1.125

---
 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 6eaa7e11a11..d965c4b4b87 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7507,18 +7507,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  PerlCritic = buildPerlPackage {
-    name = "Perl-Critic-1.121";
+  PerlCritic = buildPerlModule {
+    name = "Perl-Critic-1.125";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-1.121.tar.gz;
-      sha256 = "1y2bxjwzlp6ix51h36a5g3dqpaviaajij1rn22hpvcqxh4hh6car";
+      url = mirror://cpan/authors/id/T/TH/THALJEF/Perl-Critic-1.125.tar.gz;
+      sha256 = "503b718356b14d4c00ed486b66a0f622f4bef2b206be406ee7922c8270463fa1";
     };
     buildInputs = [ TestDeep ];
-    propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass IOString ListMoreUtils PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ];
+    propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass FileHomeDir FileWhich IOString ListMoreUtils ModulePluggable PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ];
     meta = {
       homepage = http://perlcritic.com;
       description = "Critique Perl source code for best-practices";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 

From eb292fcd0d62a0e4c0ff997532a44d5aee1d199a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 6 Aug 2015 00:27:37 +0200
Subject: [PATCH 0779/2016] perl-PPI: 1.215 -> 1.220

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d965c4b4b87..c5008f57fb9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7704,18 +7704,24 @@ let self = _self // overrides; _self = with self; {
   };
 
   PPI = buildPerlPackage {
-    name = "PPI-1.215";
+    name = "PPI-1.220";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AD/ADAMK/PPI-1.215.tar.gz;
-      sha256 = "db238e84da705b952b69f25554019ce70124079a0ad43713d0638aa14ba54878";
+      url = mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.220.tar.gz;
+      sha256 = "1e15be50e7d95a36d351af8bf5074f6695a2c72165e586d93e616183e7602b83";
     };
     buildInputs = [ ClassInspector FileRemove TestNoWarnings TestObject TestSubCalls ];
     propagatedBuildInputs = [ Clone IOString ListMoreUtils ParamsUtil TaskWeaken ];
+
+    # Remove test that fails due to unexpected shebang after
+    # patchShebang.
+    preCheck = "rm t/03_document.t";
+
     meta = {
+      homepage = https://github.com/adamkennedy/PPI;
       description = "Parse, Analyze and Manipulate Perl (without perl)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
-    doCheck = false;
   };
 
   PPIxRegexp = buildPerlPackage {

From 0bec52a5a230e790667d07b0a86cfaa6168348f2 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 6 Aug 2015 00:35:27 +0200
Subject: [PATCH 0780/2016] perl-Config-MVP: 2.200007 -> 2.200010

---
 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 c5008f57fb9..a5bff5b61c0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1632,17 +1632,18 @@ let self = _self // overrides; _self = with self; {
   };
 
   ConfigMVP = buildPerlPackage {
-    name = "Config-MVP-2.200007";
+    name = "Config-MVP-2.200010";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200007.tar.gz;
-      sha256 = "10hc8v22mv56wqi6drpl4pw3r8y3xrgh80ayrb2gir80ah9s5bvi";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200010.tar.gz;
+      sha256 = "bfb5870452a12ead4d3fd485045d1fa92b2a11741c3b93b61eb43f3dcbd6099b";
     };
     buildInputs = [ TestFatal ];
-    propagatedBuildInputs = [ ClassLoad Moose MooseXOneArgNew ParamsUtil RoleHasMessage RoleIdentifiable Throwable TieIxHash TryTiny ];
+    propagatedBuildInputs = [ ClassLoad ModulePluggable Moose MooseXOneArgNew ParamsUtil RoleHasMessage RoleIdentifiable Throwable TieIxHash TryTiny ];
     meta = {
-      homepage = https://github.com/rjbs/config-mvp;
+      homepage = https://github.com/rjbs/Config-MVP;
       description = "Multivalue-property package-oriented configuration";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 

From 944589c45fbdd5110d5453987ce10b0662dee8b1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 6 Aug 2015 00:43:31 +0200
Subject: [PATCH 0781/2016] perl-Pod-Elemental-PerlMunger: 0.093332 -> 0.200003

---
 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 a5bff5b61c0..7b2b0a95712 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7868,17 +7868,18 @@ let self = _self // overrides; _self = with self; {
   };
 
   PodElementalPerlMunger = buildPerlPackage {
-    name = "Pod-Elemental-PerlMunger-0.093332";
+    name = "Pod-Elemental-PerlMunger-0.200003";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.093332.tar.gz;
-      sha256 = "fc4c4ef76d2b557c590b998d08393b189a2af969d4d195439f37e7d7d466d062";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200003.tar.gz;
+      sha256 = "94b3abe6894c96b7990cb324a3789af05489dc2b5d1ec8961d37309cc6e8c243";
     };
     buildInputs = [ Moose PodElemental ];
-    propagatedBuildInputs = [ ListMoreUtils Moose PPI PodElemental namespaceautoclean ];
+    propagatedBuildInputs = [ ListMoreUtils Moose PPI ParamsUtil PodElemental namespaceautoclean ];
     meta = {
-      homepage = https://github.com/rjbs/pod-elemental-perlmunger;
+      homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger;
       description = "A thing that takes a string of Perl and rewrites its documentation";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 

From 2856d4701e4cf3f992df44aa2f0b885bac5ead6c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 5 Aug 2015 16:22:36 -0700
Subject: [PATCH 0782/2016] buildGoPackage: Support nativeBuildInputs

---
 pkgs/development/go-modules/generic/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index da7a9b179cc..e07fecf7dfd 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,6 +1,6 @@
 { go, govers, lib }:
 
-{ name, buildInputs ? [], passthru ? {}
+{ name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}
 
 # Disabled flag
 , disabled ? false
@@ -28,7 +28,8 @@ go.stdenv.mkDerivation (
   (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
 
   name = "go${go.meta.branch}-${name}";
-  nativeBuildInputs = [ go ] ++ (lib.optional (!dontRenameImports) govers);
+  nativeBuildInputs = [ go ]
+    ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
   buildInputs = [ go ] ++ buildInputs;
 
   configurePhase = args.configurePhase or ''

From c1338b3b06b00edcade5e81985e8d6823dd7a40e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 5 Aug 2015 16:23:03 -0700
Subject: [PATCH 0783/2016] buildGoPackage: Remove references to the go
 compiler to reduce closure size for binaries

---
 pkgs/development/go-modules/generic/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index e07fecf7dfd..021b57c0a19 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -22,6 +22,12 @@ if disabled then throw "${name} not supported for go ${go.meta.branch}" else
 
 let
   args = lib.filterAttrs (name: _: name != "extraSrcs") args';
+
+  removeReferences = [ go ];
+
+  removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: ''
+    | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \
+  '');
 in
 
 go.stdenv.mkDerivation (
@@ -146,10 +152,17 @@ go.stdenv.mkDerivation (
 
     dir="$NIX_BUILD_TOP/go/bin"
     [ -e "$dir" ] && cp -r $dir $out
+    while read file; do
+      cat $file ${removeExpr removeReferences} > $file.tmp
+      mv $file.tmp $file
+      chmod +x $file
+    done < <(find $out/bin -type f 2>/dev/null)
 
     runHook postInstall
   '';
 
+  disallowedReferences = [ go ] ++ lib.optional (!dontRenameImports) govers;
+
   passthru = passthru // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
 
   meta = {

From e2c9270eb69deedddb99aa993dca02d6c27d6a74 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 5 Aug 2015 16:23:21 -0700
Subject: [PATCH 0784/2016] lxd: Init and update goPackages

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79772cfdeae..783e097de29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2145,6 +2145,7 @@ let
   lshw = callPackage ../tools/system/lshw { };
 
   lxc = callPackage ../os-specific/linux/lxc { };
+  lxd = goPackages.lxd;
 
   lzip = callPackage ../tools/compression/lzip { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 2410b0cb500..ec0bd08cd88 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1,15 +1,15 @@
 /* This file defines the composition for Go packages. */
 
-{ overrides, stdenv, go, buildGoPackage, git, pkgconfig, libusb
+{ overrides, stdenv, go, buildGoPackage, git
 , fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchFromBitbucket, fetchbzr, pkgs }:
 
 let
   isGo13 = go.meta.branch == "1.3";
   isGo14 = go.meta.branch == "1.4";
 
-  buildFromGitHub = { rev, owner, repo, sha256, name ? repo, goPackagePath ? "github.com/${owner}/${repo}", ... }@args: buildGoPackage (args // {
+  buildFromGitHub = { rev, date ? null, owner, repo, sha256, name ? repo, goPackagePath ? "github.com/${owner}/${repo}", ... }@args: buildGoPackage (args // {
     inherit rev goPackagePath;
-    name = "${name}-${stdenv.lib.strings.substring 0 7 rev}";
+    name = "${name}-${if date != null then date else stdenv.lib.strings.substring 0 7 rev}";
     src  = fetchFromGitHub { inherit rev owner repo sha256; };
   });
 
@@ -613,6 +613,13 @@ let
     buildInputs = [ net ];
   };
 
+  gettext-go = buildFromGitHub {
+    rev    = "783c0fb3da95b06dd89c4ba2771f1dc289ecc27c";
+    owner  = "chai2010";
+    repo   = "gettext-go";
+    sha256 = "1iz4wjxc3zkj0xkfs88ig670gb08p1sd922l0ig2cxpjcfjp1y99";
+  };
+
   ginkgo = buildGoPackage rec {
     rev = "5ed93e443a4b7dfe9f5e95ca87e6082e503021d2";
     name = "ginkgo-${stdenv.lib.strings.substring 0 7 rev}";
@@ -756,6 +763,13 @@ let
     sha256 = "165x0p8plr3fwn4r1d11m3pxa3r8dhyk98z7x6ah35lf63jm2cwv";
   };
 
+  golang-petname = buildFromGitHub {
+    rev    = "13f8b3a4326b9a6579358543cffe82713c1d6ce4";
+    owner  = "dustinkirkland";
+    repo   = "golang-petname";
+    sha256 = "1xx6lpv1r2sji8m9w35a2fkr9v4vsgvxrrahcq9bdg75qvadq91d";
+  };
+
   golang_protobuf_extensions = buildGoPackage rec {
     rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
     name = "golang-protobuf-extensions-${stdenv.lib.strings.substring 0 7 rev}";
@@ -848,6 +862,16 @@ let
     sha256 = "11w1yqc16fxj5q1y5ha5m99j18fg4p9lyqi542x2xbrmjqqialcf";
   };
 
+  goproxy = buildFromGitHub {
+    rev    = "2624781dc373cecd1136cafdaaaeba6c9bb90e96";
+    date   = "2015-07-26";
+    owner  = "elazarl";
+    repo   = "goproxy";
+    sha256 = "1zz425y8byjaa9i7mslc9anz9w2jc093fjl0562rmm5hh4rc5x5f";
+    buildInputs = [ go-charset ];
+    excludedPackages = "examples";
+  };
+
   gosnappy = buildFromGitHub {
     rev    = "ce8acff4829e0c2458a67ead32390ac0a381c862";
     owner  = "syndtr";
@@ -938,6 +962,19 @@ let
     sha256 = "032nh3y43bpzpcm7bdkxfh55aydvzc2jzhigvy5gd9f648m4j9ha";
   };
 
+  go-charset = buildFromGitHub {
+    rev    = "61cdee49014dc952076b5852ce4707137eb36b64";
+    date   = "2014-07-13";
+    owner  = "paulrosania";
+    repo   = "go-charset";
+    sha256 = "0jp6rwxlgl66dipk6ssk8ly55jxncvsxs7jc3abgdrhr3rzccab8";
+    goPackagePath = "code.google.com/p/go-charset";
+
+    preBuild = ''
+      find go/src/$goPackagePath -name \*.go | xargs sed -i 's,github.com/paulrosania/go-charset,code.google.com/p/go-charset,g'
+    '';
+  };
+
   go-checkpoint = buildFromGitHub {
     rev    = "88326f6851319068e7b34981032128c0b1a6524d";
     owner  = "hashicorp";
@@ -945,6 +982,13 @@ let
     sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4";
   };
 
+  go-colorable = buildFromGitHub {
+    rev    = "40e4aedc8fabf8c23e040057540867186712faa5";
+    owner  = "mattn";
+    repo   = "go-colorable";
+    sha256 = "0pwc0s5lvz209dcyamv1ba1xl0c1r5hpxwlq0w5j2xcz8hzrcwkl";
+  };
+
   go-colortext = buildFromGitHub {
     rev    = "13eaeb896f5985a1ab74ddea58707a73d875ba57";
     owner  = "daviddengcn";
@@ -1041,6 +1085,17 @@ let
     propagatedBuildInputs = [ osext go-systemd ];
   };
 
+  go-lxc = buildFromGitHub {
+    rev    = "a0fa4019e64b385dfa2fb8abcabcdd2f66871639";
+    owner  = "lxc";
+    repo   = "go-lxc";
+    sha256 = "0fkkmn7ynmzpr7j0ha1qsmh3k86ncxcbajmcb90hs0k0iaaiaahz";
+    goPackagePath = "gopkg.in/lxc/go-lxc.v2";
+    nativeBuildInputs = [ pkgs.pkgconfig ];
+    buildInputs = [ pkgs.lxc ];
+    excludedPackages = "examples";
+  };
+
   rcrowley.go-metrics = buildGoPackage rec {
     rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df";
     name = "rcrowley.go-metrics-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1174,6 +1229,14 @@ let
     };
   };
 
+  go-sqlite3 = buildFromGitHub {
+    rev    = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
+    date   = "2015-07-29";
+    owner  = "mattn";
+    repo   = "go-sqlite3";
+    sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
+  };
+
   go-syslog = buildFromGitHub {
     rev    = "42a2b573b664dbf281bd48c3cc12c086b17a39ba";
     owner  = "hashicorp";
@@ -1199,6 +1262,16 @@ let
     buildInputs = [ dbus ];
   };
 
+  lxd-go-systemd = buildFromGitHub {
+    rev = "a3dcd1d0480ee0ae9ec354f1632202bfba715e03";
+    date = "2015-07-01";
+    owner = "stgraber";
+    repo = "lxd-go-systemd";
+    sha256 = "006dhy3j8ld0kycm8hrjxvakd7xdn1b6z2dsjp1l4sqrxdmm188w";
+    excludedPackages = "examples";
+    buildInputs = [ dbus ];
+  };
+
   go-update = buildGoPackage rec {
     rev = "c1385108bc3a016f1c88b75ea7d2e2a356a1571d";
     name = "go-update-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1214,6 +1287,14 @@ let
     };
   };
 
+  go-uuid = buildFromGitHub {
+    rev    = "6b8e5b55d20d01ad47ecfe98e5171688397c61e9";
+    date   = "2015-07-22";
+    owner  = "satori";
+    repo   = "go.uuid";
+    sha256 = "0injxzds41v8nc0brvyrrjl66fk3hycz6im38s5r9ccbwlp68p44";
+  };
+
   go-vhost = buildFromGitHub {
     rev    = "c4c28117502e4bf00960c8282b2d1c51c865fe2c";
     owner  = "inconshreveable";
@@ -1477,6 +1558,15 @@ let
     sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w";
   };
 
+  log15 = buildFromGitHub {
+    rev    = "dc7890abeaadcb6a79a9a5ee30bc1897bbf97713";
+    owner  = "inconshreveable";
+    repo   = "log15";
+    sha256 = "15wgicl078h931n90rksgbqmfixvbfxywk3m8qkaln34v69x4vgp";
+    goPackagePath = "gopkg.in/inconshreveable/log15.v2";
+    propagatedBuildInputs = [ go-colorable ];
+  };
+
   log4go = buildGoPackage rec {
     rev = "cb4cc51cd03958183d3b637d0750497d88c2f7a8";
     name = "log4go-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1522,6 +1612,18 @@ let
     sha256 = "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r";
   };
 
+  lxd = buildFromGitHub {
+    rev    = "22fec6bb6bb5988eb0f1b3532a02ebacfb26cf47";
+    date   = "2015-08-05";
+    owner  = "lxc";
+    repo   = "lxd";
+    sha256 = "1n7fhzl6vrn82r3cqpgqpgq5d5142rnk1cp7vig38323n2yh3749";
+    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
+    ];
+  };
+
   mapstructure = buildFromGitHub {
     rev    = "281073eb9eb092240d33ef253c404f1cca550309";
     owner  = "mitchellh";
@@ -1621,19 +1723,13 @@ let
     };
   };
 
-  mux = buildGoPackage rec {
-    rev = "47e8f450ef38c857cdd922ec08862ca9d65a1c6d";
-    name = "mux-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/gorilla/mux";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "gorilla";
-      repo = "mux";
-      sha256 = "03z7pk95z3314s3jryp6vs33209fj147g5jb2f331567gzld3b9g";
-    };
-
-    buildInputs = [ context ];
+  mux = buildFromGitHub {
+    rev = "5a8a0400500543e28b2886a8c52d21a435815411";
+    date = "2015-08-05";
+    owner = "gorilla";
+    repo = "mux";
+    sha256 = "15w1bw14vx157r6v98fhy831ilnbzdsm5xzvs23j8hw6gnknzaw1";
+    propagatedBuildInputs = [ context ];
   };
 
   muxado = buildFromGitHub {
@@ -1725,7 +1821,8 @@ let
     repo = "openssl";
     sha256 = "1033c9vgv9lf8ks0qjy0ylsmx1hizqxa6izalma8vi30np6ka6zn";
     goPackageAliases = [ "github.com/spacemonkeygo/openssl" ];
-    buildInputs = [ pkgs.pkgconfig pkgs.openssl ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
+    buildInputs = [ pkgs.openssl ];
     propagatedBuildInputs = [ spacelog ];
 
     preBuild = ''
@@ -1813,6 +1910,15 @@ let
     doCheck = false; # bad import path in tests
   };
 
+  pongo2 = buildFromGitHub {
+    rev    = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9";
+    date   = "2014-10-27";
+    owner  = "flosch";
+    repo   = "pongo2";
+    sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8";
+    goPackagePath = "gopkg.in/flosch/pongo2.v3";
+  };
+
   pool = buildGoPackage rec {
     rev = "v2.0.0";
     name = "pq-${rev}";
@@ -2144,6 +2250,14 @@ let
     sha256 = "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50";
   };
 
+  tablewriter = buildFromGitHub {
+    rev    = "bc39950e081b457853031334b3c8b95cdfe428ba";
+    date   = "2015-06-03";
+    owner  = "olekukonko";
+    repo   = "tablewriter";
+    sha256 = "0n4gqjc2dqmnbpqgi9i8vrwdk4mkgyssc7l2n4r5bqx0n3nxpbps";
+  };
+
   termbox-go = buildGoPackage rec {
     rev = "9aecf65084a5754f12d27508fa2e6ed56851953b";
     name = "termbox-go-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2212,7 +2326,8 @@ let
       repo = "usb";
       sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky";
     };
-    buildInputs = [ pkgconfig libusb ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
+    buildInputs = [ pkgs.libusb ];
   };
 
   vault = buildFromGitHub {
@@ -2253,10 +2368,10 @@ let
   };
 
   websocket = buildFromGitHub {
-    rev    = "f4076986b69612ecb8bc7ce06d742eda6286200d";
+    rev    = "6eb6ad425a89d9da7a5549bc6da8f79ba5c17844";
     owner  = "gorilla";
     repo   = "websocket";
-    sha256 = "09arvwlxw15maf4z8pcgjc25hd00mckqpdi0byafqfgm3nvvacvq";
+    sha256 = "0gljdfxqc94yb1kpqqrm5p94ph9dsxrzcixhdj6m92cwwa7z7p99";
   };
 
   yaml-v1 = buildGoPackage rec {
@@ -2271,16 +2386,13 @@ let
     };
   };
 
-  yaml-v2 = buildGoPackage rec {
-    name = "yaml-v2-${version}";
-    version = "git-2015-05-19";
+  yaml-v2 = buildFromGitHub {
+    rev = "7ad95dd0798a40da1ccdff6dff35fd177b5edf40";
+    date = "2015-06-24";
+    owner = "go-yaml";
+    repo = "yaml";
+    sha256 = "0d4jh46jq2yjg5dp00l7yl9ilhly7k4mfvi4harafd5ap5k9wnpb";
     goPackagePath = "gopkg.in/yaml.v2";
-    src = fetchFromGitHub {
-      rev = "c1cd2254a6dd314c9d73c338c12688c9325d85c6";
-      owner = "go-yaml";
-      repo = "yaml";
-      sha256 = "0xhv0i700hh8lczrwxhn3c99npqma7k4337qrh6k36falm0jpp4s";
-    };
   };
 
   yamux = buildFromGitHub {

From 96a0d208a3f0f378dd2c5bb07157c8c73c566578 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 3 Aug 2015 21:12:31 -0300
Subject: [PATCH 0785/2016] MooX-late: init at 0.015

---
 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 7b2b0a95712..605d4e1b958 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6186,6 +6186,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  MooXlate = buildPerlPackage {
+    name = "MooX-late-0.015";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.015.tar.gz;
+      sha256 = "175326af3076fa8698669f289fad1322724978cddaf40ea04e600fcd7f6afbbf";
+    };
+    buildInputs = [ TestFatal TestRequires ];
+    propagatedBuildInputs = [ Moo TypeTiny ];
+    meta = {
+      homepage = https://metacpan.org/release/MooX-late;
+      description = "Easily translate Moose code to Moo";
+      license = "perl";
+    };
+  };
+
   MouseXSimpleConfig = buildPerlPackage {
     name = "MouseX-SimpleConfig-0.11";
     src = fetchurl {

From e72e77806b2aa72a0ce01ece1be06eee19866be0 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 3 Aug 2015 21:14:54 -0300
Subject: [PATCH 0786/2016] Games-Solitaire-Verify: init at 0.1400

---
 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 605d4e1b958..8f1b0bf3c48 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4062,6 +4062,20 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;
   };
 
+  GamesSolitaireVerify = buildPerlModule {
+    name = "Games-Solitaire-Verify-0.1400";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.1400.tar.gz;
+      sha256 = "0c897c17f23ed6710d0e3ddfb54cce0f00f5b68c55277181adc94a03b7d8c659";
+    };
+    buildInputs = [ TestDifferences ];
+    propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils MooXlate ];
+    meta = {
+      description = "Verify solutions for solitaire games";
+      license = "mit";
+    };
+  };
+
   GD = buildPerlPackage rec {
     name = "GD-2.53";
     src = fetchurl {

From 6513e09093369181ae5ce54b3285a3315b034ade Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 3 Aug 2015 21:29:26 -0300
Subject: [PATCH 0787/2016] libtap: init at 1.12.0

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

diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix
new file mode 100644
index 00000000000..a81d5a686bc
--- /dev/null
+++ b/pkgs/development/libraries/libtap/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, cmake, perl }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+  name = "libtap-${version}";
+  version = "1.12.0";
+
+  src = fetchurl {
+    url = "http://web-cpan.shlomifish.org/downloads/${name}.tar.bz2";
+    sha256 = "1ms1770cx8c6q3lhn1chkzy12vzmjgvlms7cqhd2d3260j2wwv5s";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ cmake perl ];
+
+  meta = {
+    description = "A library to implement a test protocol";
+    longDescription = ''
+      libtap is a library to implement the Test Anything Protocol for
+      C originally created by Nik Clayton. This is a maintenance
+      branch by Shlomi Fish.
+    '';
+    homepage = "http://www.shlomifish.org/open-source/projects/libtap/";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ae906c4875..147e89371d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7345,6 +7345,8 @@ let
 
   libtoxcore-dev = callPackage ../development/libraries/libtoxcore/new-api { };
 
+  libtap = callPackage ../development/libraries/libtap { };
+
   libtsm = callPackage ../development/libraries/libtsm {
     automake = automake114x;
   };

From 1810c3dd42f9c9cca4fb08c2128f352f66b8ec4d Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 3 Aug 2015 21:53:33 -0300
Subject: [PATCH 0788/2016] FreeCell-Solver: init at 3.26.0

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

diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix
new file mode 100644
index 00000000000..1c641f55c47
--- /dev/null
+++ b/pkgs/games/freecell-solver/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, cmake, perl, gmp, libtap, perlPackages }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+  name = "freecell-solver-${version}";
+  version = "3.26.0";
+
+  src = fetchurl {
+    url = "http://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.bz2";
+    sha256 = "0pm6xk4fmwgzva70qxb0pqymdfvpasnvqiwwmm8hpx7g37y11wqk";
+  };
+
+  buildInputs = [ pkgconfig cmake perl gmp libtap
+    perlPackages.TemplateToolkit perlPackages.StringShellQuote
+    perlPackages.GamesSolitaireVerify ];
+
+  meta = {
+    description = "A FreeCell automatic solver";
+    longDescription = ''
+      FreeCell Solver is a program that automatically solves layouts
+      of Freecell and similar variants of Card Solitaire such as Eight
+      Off, Forecell, and Seahaven Towers, as well as Simple Simon
+      boards.
+    '';
+    homepage = http://fc-solve.shlomifish.org/;
+    license = licenses.mit;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 147e89371d3..64ee5c66b9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13611,6 +13611,8 @@ let
 
   flightgear = callPackage ../games/flightgear { };
 
+  freecell-solver = callPackage ../games/freecell-solver { };
+
   freeciv = callPackage ../games/freeciv { };
 
   freeciv_gtk = callPackage ../games/freeciv {

From 0abedda1cc4e61deabc89f0166079bf32b70a071 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Thu, 6 Aug 2015 10:56:46 +0900
Subject: [PATCH 0789/2016] vimPlugins: add CheckAttach, vimwiki

---
 pkgs/misc/vim-plugins/default.nix      | 22 ++++++++++++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 7ce997acb68..23f8b0e16e3 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -85,6 +85,17 @@ rec {
   yankring            = YankRing;
 
 
+  CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "CheckAttach-2015-06-22";
+    src = fetchgit {
+      url = "git://github.com/chrisbra/CheckAttach";
+      rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68";
+      sha256 = "b8921c826f5a122e9b128301c620b8b3d3fd88a15a2b0634fdea01062fba2c1f";
+    };
+    dependencies = [];
+
+  };
+
   CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "CSApprox-2013-07-26";
     src = fetchgit {
@@ -1351,6 +1362,17 @@ rec {
 
   };
 
+  vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimwiki-2014-02-21";
+    src = fetchgit {
+      url = "git://github.com/vimwiki/vimwiki";
+      rev = "2c03d82a0e4662adf1e347487d73a9bf4bf6fdac";
+      sha256 = "8f94fe1204ae3770b114370382f9c616f971eb9b940d8d08ca96ac83405a0cdf";
+    };
+    dependencies = [];
+
+  };
+
   vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vundle-2015-03-21";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index fb5f2fc6f97..7d3fa343375 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,3 +1,4 @@
+"CheckAttach"
 "CSApprox"
 "Gist"
 "Gundo"
@@ -100,4 +101,5 @@
 "vim-signature"
 "vim-snippets"
 "vim2hs"
+"vimwiki"
 "vundle"

From 370add9d80c5ebf664fc5a21144e6763ed884aea Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 5 Aug 2015 17:02:29 -0700
Subject: [PATCH 0790/2016] chromium: update.sh Shouldn't use cached hashes as
 they often change upstream for the same version

---
 .../networking/browsers/chromium/update.sh    | 37 ++++---------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh
index e82d22f34fd..e079762420b 100755
--- a/pkgs/applications/networking/browsers/chromium/update.sh
+++ b/pkgs/applications/networking/browsers/chromium/update.sh
@@ -11,22 +11,6 @@ source "$(nix-build --no-out-link "$base_path/update.nix" -A updateHelpers)";
 
 ver_sha_table=""; # list of version:sha256
 
-sha_lookup()
-{
-    version="$1";
-
-    for ver_sha in $ver_sha_table;
-    do
-        if [ "x${ver_sha%:*}" = "x$version" ];
-        then
-            echo "${ver_sha##*:}";
-            return 0;
-        fi;
-    done;
-
-    return 1;
-}
-
 sha_insert()
 {
     version="$1";
@@ -72,22 +56,15 @@ get_channel_exprs()
         channel="${chline%%,*}";
         version="${chline##*,}";
 
-        echo -n "Checking if sha256 of version $version is cached..." >&2;
-        if sha256="$(sha_lookup "$version")";
+        sha256="$(get_sha256 "$channel" "$version")";
+        if [ $? -ne 0 ];
         then
-            echo " yes: $sha256" >&2;
-        else
-            echo " no." >&2;
-            sha256="$(get_sha256 "$channel" "$version")";
-            if [ $? -ne 0 ];
-            then
-                echo "Whoops, failed to fetch $version, trying previous" \
-                     "versions:" >&2;
+            echo "Whoops, failed to fetch $version, trying previous" \
+                 "versions:" >&2;
 
-                sha_ver="$(get_prev_sha256 "$channel" "$version")";
-                sha256="${sha_ver%:*}";
-                version="${sha_ver#*:}";
-            fi;
+            sha_ver="$(get_prev_sha256 "$channel" "$version")";
+            sha256="${sha_ver%:*}";
+            version="${sha_ver#*:}";
         fi;
 
         sha_insert "$version" "$sha256";

From 23c3edd62c851a729a7a126eb92099d2cd117704 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 5 Aug 2015 19:25:37 -0700
Subject: [PATCH 0791/2016] pcsclite: 1.8.13 -> 1.8.14

---
 pkgs/tools/security/pcsclite/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 0b6a8712661..6ec0cb23864 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -1,23 +1,22 @@
 { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }:
 
 stdenv.mkDerivation rec {
-  name = "pcsclite-1.8.13";
+  name = "pcsclite-1.8.14";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/4126/pcsc-lite-1.8.13.tar.bz2";
-    sha256 = "0fxwzckbjsckfp1f01yp3x6y1wlaaivhy12a5hka6qwdh1z085gk";
+    url = "https://alioth.debian.org/frs/download.php/file/4138/pcsc-lite-1.8.14.tar.bz2";
+    sha256 = "0kik09dif6hih09vvprd7zvj31lnrclrbrh5y10mlca2c209f7xr";
   };
 
-  # The OS should care on preparing the drivers into this location
   configureFlags = [
+    # The OS should care on preparing the drivers into this location
     "--enable-usbdropdir=/var/lib/pcsc/drivers"
-    "--with-systemdsystemunitdir=$out/etc/systemd/system"
-    "--enable-confdir=$out/etc"
+    "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
+    "--enable-confdir=/etc"
   ];
 
-  buildInputs = [ udev dbus_libs perl ];
-
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig perl ];
+  buildInputs = [ udev dbus_libs ];
 
   meta = with stdenv.lib; {
     description = "Middleware to access a smart card using SCard API (PC/SC)";

From baf0967947e7f66e232ae00150d620b9d9920e45 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 5 Aug 2015 19:25:49 -0700
Subject: [PATCH 0792/2016] ccid: 1.4.19 -> 1.4.20

---
 pkgs/tools/security/ccid/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index 21de5705e4f..02eee4d7e36 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,23 +1,25 @@
 { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.19";
+  version = "1.4.20";
   name = "ccid-${version}";
 
   src = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2";
-    sha256 = "1q9lx5ci8kikwk9mhbjl6m3zk4id209zfna5wgpqjrp5nhmjrjyc";
+    url = "https://alioth.debian.org/frs/download.php/file/4140/ccid-1.4.20.tar.bz2";
+    sha256 = "1g0w4pv6q30d8lhs3kd6nywkhh34nhf9fbcbcvbxdvk3pdjvh320";
   };
 
   patchPhase = ''
-    sed -i 's,/usr/bin/env perl,${perl}/bin/perl,' src/*.pl
+    patchShebangs .
     substituteInPlace src/Makefile.in --replace /bin/echo echo
   '';
+
   preConfigure = ''
-    configureFlags="$configureFlags --enable-usbdropdir=$out/pcsc/drivers"
+    configureFlagsArray+=("--enable-usbdropdir=$out/pcsc/drivers")
   '';
 
-  buildInputs = [ pcsclite pkgconfig libusb1 ];
+  nativeBuildInputs = [ pkgconfig perl ];
+  buildInputs = [ pcsclite libusb1 ];
 
   meta = with stdenv.lib; {
     description = "ccid drivers for pcsclite";

From 5c6aa391fc480898fa80b34df4037e4ee8b2d8a6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 5 Aug 2015 19:27:29 -0700
Subject: [PATCH 0793/2016] chromium: Cleanup old patch and update stable

---
 .../browsers/chromium/source/default.nix      |  6 +-
 .../chromium/source/nix_plugin_paths_42.patch | 93 -------------------
 .../browsers/chromium/source/sources.nix      |  8 +-
 3 files changed, 5 insertions(+), 102 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch

diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index e8ad569adbf..98445cedfdc 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -17,8 +17,6 @@ let
     "s,^/,,"
   ]);
 
-  pre44 = versionOlder version "44.0.0.0";
-
 in stdenv.mkDerivation {
   name = "chromium-source-${version}";
 
@@ -46,9 +44,7 @@ in stdenv.mkDerivation {
     done
   '';
 
-  patches = if pre44
-            then singleton ./nix_plugin_paths_42.patch
-            else singleton ./nix_plugin_paths_44.patch;
+  patches = singleton ./nix_plugin_paths_44.patch;
 
   patchPhase = let
     diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}";
diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch
deleted file mode 100644
index fb09763c997..00000000000
--- a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_42.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
-index 8a205a6..d5c24e1 100644
---- a/chrome/common/chrome_paths.cc
-+++ b/chrome/common/chrome_paths.cc
-@@ -97,21 +97,14 @@ static base::LazyInstance<base::FilePath>
-     g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
- 
- // Gets the path for internal plugins.
--bool GetInternalPluginsDirectory(base::FilePath* result) {
--#if defined(OS_MACOSX) && !defined(OS_IOS)
--  // If called from Chrome, get internal plugins from a subdirectory of the
--  // framework.
--  if (base::mac::AmIBundled()) {
--    *result = chrome::GetFrameworkBundlePath();
--    DCHECK(!result->empty());
--    *result = result->Append("Internet Plug-Ins");
--    return true;
--  }
--  // In tests, just look in the module directory (below).
--#endif
--
--  // The rest of the world expects plugins in the module directory.
--  return PathService::Get(base::DIR_MODULE, result);
-+bool GetInternalPluginsDirectory(base::FilePath* result,
-+                                 const std::string& ident) {
-+  std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
-+  const char* value = getenv(full_env.c_str());
-+  if (value == NULL)
-+      return PathService::Get(base::DIR_MODULE, result);
-+  else
-+      *result = base::FilePath(value);
- }
- 
- }  // namespace
-@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) {
-       create_dir = true;
-       break;
-     case chrome::DIR_INTERNAL_PLUGINS:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "ALL"))
-         return false;
-       break;
-     case chrome::DIR_PEPPER_FLASH_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
-         return false;
-       cur = cur.Append(kPepperFlashBaseDirectory);
-       break;
-@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) {
-       cur = cur.Append(FILE_PATH_LITERAL("script.log"));
-       break;
-     case chrome::FILE_FLASH_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "FILEFLASH"))
-         return false;
-       cur = cur.Append(kInternalFlashPluginFileName);
-       break;
-@@ -295,7 +288,7 @@ bool PathProvider(int key, base::FilePath* result) {
-       cur = cur.Append(chrome::kPepperFlashPluginFilename);
-       break;
-     case chrome::FILE_EFFECTS_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "FILE_EFFECTS"))
-         return false;
-       cur = cur.Append(kEffectsPluginFileName);
-       break;
-@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) {
-     // We currently need a path here to look up whether the plugin is disabled
-     // and what its permissions are.
-     case chrome::FILE_NACL_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "NACL"))
-         return false;
-       cur = cur.Append(kInternalNaClPluginFileName);
-       break;
-@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) {
-         cur = cur.DirName();
-       }
- #else
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "PNACL"))
-         return false;
- #endif
-       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
-@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) {
-     // In the component case, this is the source adapter. Otherwise, it is the
-     // actual Pepper module that gets loaded.
-     case chrome::FILE_WIDEVINE_CDM_ADAPTER:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "WIDEVINE"))
-         return false;
-       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
-       break;
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 85a92e07e66..c3cc9c3ed18 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -13,9 +13,9 @@
     sha256bin64 = "14l8lka8jci1d90vbz5kpl20mk98n1ak4mw667dkz89cch5gal4s";
   };
   stable = {
-    version = "44.0.2403.125";
-    sha256 = "0li483phq72xlg0bpsgfk1rlxrmldk4g45ijx1xmnfs42g38wmkq";
-    sha256bin32 = "0h5a2wm13bvrq013skp3lq40bzx9519mb9kh8x3n4800lnanbjcb";
-    sha256bin64 = "1p9gfqpgyihvby4pb3fdn4ibg84fh4gksy18cvyi9zq7cibww2ff";
+    version = "44.0.2403.130";
+    sha256 = "055lccfiqdqwcjnx9l9xgzcilm2m341rg66nfnnadqa490prnxrp";
+    sha256bin32 = "0yzjhqyw2aaiwfv395c75avizcg28f3bn9zkqk2p3ifcv231w15v";
+    sha256bin64 = "1dzwlrdvnqyz6rpcl3pavpvqsx6la1d04cvgca3iaanq5xcana8b";
   };
 }

From 34fbb4150044d50bdeea8c4ba97df7a7820b6c03 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 5 Aug 2015 19:28:01 -0700
Subject: [PATCH 0794/2016] ceph: Support newer git version

---
 pkgs/tools/filesystems/ceph/generic.nix | 85 +++++++++++++------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index dca6d930020..8b9cefdbf23 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -164,50 +164,55 @@ stdenv.mkDerivation {
   '';
 
   configureFlags = [
-    (mkOther                               "exec_prefix"        "\${out}")
-    (mkOther                               "sysconfdir"         "/etc")
-    (mkOther                               "localstatedir"      "/var")
-    (mkOther                               "libdir"             "\${lib}/lib")
-    (mkOther                               "includedir"         "\${lib}/include")
-    (mkWith   true                         "rbd"                 null)
-    (mkWith   true                         "cephfs"              null)
-    (mkWith   hasRadosgw                   "radosgw"             null)
-    (mkWith   true                         "radosstriper"        null)
-    (mkWith   hasServer                    "mon"                 null)
-    (mkWith   hasServer                    "osd"                 null)
-    (mkWith   hasServer                    "mds"                 null)
-    (mkEnable true                         "client"              null)
-    (mkEnable hasServer                    "server"              null)
-    (mkWith   (cryptoStr == "cryptopp")    "cryptopp"            null)
-    (mkWith   (cryptoStr == "nss")         "nss"                 null)
-    (mkEnable false                        "root-make-check"     null)
-    (mkWith   false                        "profiler"            null)
-    (mkWith   false                        "debug"               null)
-    (mkEnable false                        "coverage"            null)
-    (mkWith   (optFuse != null)            "fuse"                null)
-    (mkWith   (malloc == optJemalloc)      "jemalloc"            null)
-    (mkWith   (malloc == optGperftools)    "tcmalloc"            null)
-    (mkEnable false                        "pgrefdebugging"      null)
-    (mkEnable false                        "cephfs-java"         null)
-    (mkEnable hasXio                       "xio"                 null)
-    (mkWith   (optLibatomic_ops != null)   "libatomic-ops"       null)
-    (mkWith   true                         "ocf"                 null)
-    (mkWith   hasKinetic                   "kinetic"             null)
-    (mkWith   hasRocksdb                   "librocksdb"          null)
-    (mkWith   false                        "librocksdb-static"   null)
+    (mkOther                               "exec_prefix"         "\${out}")
+    (mkOther                               "sysconfdir"          "/etc")
+    (mkOther                               "localstatedir"       "/var")
+    (mkOther                               "libdir"              "\${lib}/lib")
+    (mkOther                               "includedir"          "\${lib}/include")
+    (mkWith   true                         "rbd"                  null)
+    (mkWith   true                         "cephfs"               null)
+    (mkWith   hasRadosgw                   "radosgw"              null)
+    (mkWith   true                         "radosstriper"         null)
+    (mkWith   hasServer                    "mon"                  null)
+    (mkWith   hasServer                    "osd"                  null)
+    (mkWith   hasServer                    "mds"                  null)
+    (mkEnable true                         "client"               null)
+    (mkEnable hasServer                    "server"               null)
+    (mkWith   (cryptoStr == "cryptopp")    "cryptopp"             null)
+    (mkWith   (cryptoStr == "nss")         "nss"                  null)
+    (mkEnable false                        "root-make-check"      null)
+    (mkWith   false                        "profiler"             null)
+    (mkWith   false                        "debug"                null)
+    (mkEnable false                        "coverage"             null)
+    (mkWith   (optFuse != null)            "fuse"                 null)
+    (mkWith   (malloc == optJemalloc)      "jemalloc"             null)
+    (mkWith   (malloc == optGperftools)    "tcmalloc"             null)
+    (mkEnable false                        "pgrefdebugging"       null)
+    (mkEnable false                        "cephfs-java"          null)
+    (mkEnable hasXio                       "xio"                  null)
+    (mkWith   (optLibatomic_ops != null)   "libatomic-ops"        null)
+    (mkWith   true                         "ocf"                  null)
+    (mkWith   hasKinetic                   "kinetic"              null)
+    (mkWith   hasRocksdb                   "librocksdb"           null)
+    (mkWith   false                        "librocksdb-static"    null)
   ] ++ optional stdenv.isLinux [
-    (mkWith   (optLibaio != null)          "libaio"              null)
-    (mkWith   (optLibxfs != null)          "libxfs"              null)
-    (mkWith   (optZfs != null)             "libzfs"              null)
+    (mkWith   (optLibaio != null)          "libaio"               null)
+    (mkWith   (optLibxfs != null)          "libxfs"               null)
+    (mkWith   (optZfs != null)             "libzfs"               null)
+  ] ++ optional (versionAtLeast version "0.94.3") [
+    (mkWith   false                        "tcmalloc-minimal"     null)
   ] ++ optional (versionAtLeast version "9.0.1") [
-    (mkWith   false                        "tcmalloc-minimal"    null)
-    (mkWith   false                        "valgrind"            null)
+    (mkWith   false                        "valgrind"             null)
   ] ++ optional (versionAtLeast version "9.0.2") [
-    (mkWith   true                         "man-pages"           null)
-    (mkWith   true                         "systemd-libexec-dir" "\${TMPDIR}")
+    (mkWith   true                         "man-pages"            null)
+    (mkWith   true                         "systemd-libexec-dir"  "\${out}/libexec")
   ] ++ optional (versionOlder version "10.0.0") [
-    (mkWith   (optLibs3 != null)           "system-libs3"        null)
-    (mkWith   true                         "rest-bench"          null)
+    (mkWith   (optLibs3 != null)           "system-libs3"         null)
+    (mkWith   true                         "rest-bench"           null)
+  ] ++ optional (versionAtLeast version "10.0.0") [
+    (mkWith   true                         "rgw-user"             "rgw")
+    (mkWith   true                         "rgw-group"            "rgw")
+    (mkWith   true                         "systemd-unit-dir"     "\${out}/etc/systemd/system")
   ];
 
   preBuild = optionalString (versionAtLeast version "9.0.0") ''

From 666629f30b0e740c2deb72d5539e9a93ca4ab61e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 5 Aug 2015 21:52:00 -0700
Subject: [PATCH 0795/2016] ceph-pre: Update

---
 pkgs/tools/filesystems/ceph/0.94-pre.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/0.94-pre.nix b/pkgs/tools/filesystems/ceph/0.94-pre.nix
index e496dcccd82..fcf57526fd1 100644
--- a/pkgs/tools/filesystems/ceph/0.94-pre.nix
+++ b/pkgs/tools/filesystems/ceph/0.94-pre.nix
@@ -4,9 +4,9 @@ callPackage ./generic.nix (args // rec {
   version = "0.94.3";
 
   src = fetchgit {
-    url = "https://github.com/ceph/ceph.git";
-    rev = "c19b0fc1aa2834ae3027b07a02aebe9639fc2ca7";
-    sha256 = "1h1y5jh2bszia622rmwdblb3cpkpd0mijahkaiasr30jwpkmzh0i";
+    url = "https://github.com/wkennington/ceph.git";
+    rev = "6218aa41e04533f0d6e62b5c7be591c2e99716ec";
+    sha256 = "0cyl5i1q6lap5a6vk8fjxfpikhxzwm9zkybg37nibahi2bwjr7rr";
   };
 
   patches = [ ./fix-pgrefdebugging.patch ];

From d516f12dbae4fccf184cef11ce49529b56e9df39 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Tue, 28 Jul 2015 17:30:40 +0200
Subject: [PATCH 0796/2016] camlp4: 4.02.0+1 -> 4.02+6

 * Remove unneeded substitution in postConfigure
   This was fixed here: https://github.com/ocaml/camlp4/commit/81ed5cf2e857c08e433d891328767ad7f07f1447

 * camlp4: use fetchzip

It is considered more reliable than fetchurl
---
 pkgs/development/tools/ocaml/camlp4/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index a8043a9fc5e..20373c923e7 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -1,15 +1,17 @@
-{stdenv, fetchurl, which, ocaml}:
+{stdenv, fetchzip, which, ocaml}:
 let
   ocaml_version = (stdenv.lib.getVersion ocaml);
+  version = "4.02+6";
+
 in
 
 assert stdenv.lib.versionAtLeast ocaml_version "4.02";
 
 stdenv.mkDerivation {
-  name = "camlp4-4.02.0+1";
-  src = fetchurl {
-    url = https://github.com/ocaml/camlp4/archive/4.02.0+1.tar.gz;
-    sha256 = "0055f4jiz82rgn581xhq3mr4qgq2qgdxqppmp8i2x1xnsim4h9pn";
+  name = "camlp4-${version}";
+  src = fetchzip {
+    url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz";
+    sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj";
   };
 
   buildInputs = [ which ocaml ];
@@ -27,10 +29,6 @@ stdenv.mkDerivation {
   postConfigure = ''
     substituteInPlace camlp4/META.in \
     --replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4
-    substituteInPlace camlp4/config/Camlp4_config.ml \
-    --replace \
-      "Filename.concat ocaml_standard_library" \
-      "Filename.concat \"$out/lib/ocaml/${ocaml_version}/site-lib\""
   '';
 
 

From 37d0d8ac7411af01761dbaf58bfa7d673453af2a Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Tue, 28 Jul 2015 17:31:44 +0200
Subject: [PATCH 0797/2016] utop: 1.15 -> 1.17

Version 1.18 doesn't compile cleanly currently, I need to debug what is going on
there
---
 pkgs/development/tools/ocaml/utop/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index c5c0ac9a3ed..c9addf55312 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -1,22 +1,24 @@
 {stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper,
- ocaml_react, camomile, zed
+ ocaml_react, camomile, zed, cppo, camlp4
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.15";
+  version = "1.17";
   name = "utop-${version}";
 
   src = fetchurl {
-    url = https://github.com/diml/utop/archive/1.15.tar.gz;
-    sha256 = "106v0x6sa2x10zgmjf73mpzws7xiqanxswivd00iqnpc0bcpkmrr";
+    url = "https://github.com/diml/utop/archive/${version}.tar.gz";
+    sha256 = "0l9lz2nypl2ls3kqzmp738m02yvscabhsfpj70ckp0p98pimnnfd";
   };
 
-  buildInputs = [ ocaml findlib makeWrapper];
+  buildInputs = [ ocaml findlib makeWrapper cppo camlp4 ];
 
   propagatedBuildInputs = [ lambdaTerm ocaml_lwt ];
 
   createFindlibDestdir = true;
 
+  configureFlags = "--enable-camlp4";
+
   buildPhase = ''
     make
     make doc

From 8164d28315eae1b0cb4aeb26f7dc3334e6ff9e69 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 5 Aug 2015 23:25:55 -0700
Subject: [PATCH 0798/2016] libpng: 1.6.16 -> 1.6.18

Also enable apng by default
---
 pkgs/development/libraries/libpng/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 17820fa8188..53777a0c56f 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, zlib, apngSupport ? false }:
+{ stdenv, fetchurl, zlib, apngSupport ? true }:
 
 assert zlib != null;
 
 let
-  version = "1.6.16";
-  sha256 = "0q5ygy15jkpqbj5701ywrjzqp4nl5yz3r4g58h2p0kiycggm9xs2";
+  version = "1.6.18";
+  sha256 = "0qq96rf31483kxz32h6l6921hy6p2v2pfqfvc74km229g4xw241f";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
-    sha256 = "1sf27a5gvwvcm4wsf2pyq87d3g4l2fym8cirq9sli54bi753ikbh";
+    sha256 = "0g2ljh2vhclas1hacys1c4gk6l6hyy6sngb2yvdsnjz50nyq16kv";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;
 

From f6c1004b2a64138f84bb03c9bf473151adfa50dd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 5 Aug 2015 23:26:31 -0700
Subject: [PATCH 0799/2016] firefox: Use more system libraries

Use system libpng with apng support.
Use the system icu which works fine in newer firefox builds.
Use jemalloc to speed up memory allocations and reduce fragmentation.
---
 .../networking/browsers/firefox/default.nix    | 18 ++++++++++--------
 pkgs/top-level/all-packages.nix                |  1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 31375bd5a5b..916469f8e1c 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -3,7 +3,7 @@
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
 , hunspell, libevent, libstartup_notification, libvpx
-, cairo, gstreamer, gst_plugins_base, icu
+, cairo, gst_all_1, icu, libpng, jemalloc
 , enableGTK3 ? false
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
@@ -34,7 +34,8 @@ stdenv.mkDerivation rec {
       xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
       xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
       hunspell libevent libstartup_notification libvpx cairo
-      gstreamer gst_plugins_base icu
+      gst_all_1.gstreamer gst_all_1.gst-plugins-base icu libpng
+      jemalloc
     ]
     ++ lib.optional enableGTK3 gtk3;
 
@@ -48,26 +49,27 @@ stdenv.mkDerivation rec {
       "--with-system-nss"
       "--with-system-libevent"
       "--with-system-libvpx"
-      # "--with-system-png" # needs APNG support
-      # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0
+      "--with-system-png" # needs APNG support
+      "--with-system-icu"
       "--enable-system-ffi"
       "--enable-system-hunspell"
       "--enable-system-pixman"
       "--enable-system-sqlite"
       "--enable-system-cairo"
-      "--enable-gstreamer"
+      "--enable-gstreamer=1.0"
       "--enable-startup-notification"
-      # "--enable-content-sandbox"            # available since 26.0, but not much info available
-      # "--enable-content-sandbox-reporter"   # keeping disabled for now
+      "--enable-content-sandbox"            # available since 26.0, but not much info available
+      "--disable-content-sandbox-reporter"  # keeping disabled for now
       "--disable-crashreporter"
       "--disable-tests"
       "--disable-necko-wifi" # maybe we want to enable this at some point
       "--disable-installer"
       "--disable-updater"
       "--disable-pulseaudio"
+      "--enable-jemalloc"
     ]
     ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3"
-    ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
+    ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
                       else [ "--disable-debug" "--enable-release"
                              "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}"
                              "--enable-strip" ])
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ae906c4875..a97d45a9896 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11409,6 +11409,7 @@ let
   firefox = callPackage ../applications/networking/browsers/firefox {
     inherit (gnome) libIDL;
     inherit (pythonPackages) pysqlite;
+    libpng = libpng_apng;
     enableGTK3 = false;
   };
 

From f30a8f78a8f633c8b5dd74543b147a8951459a45 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 5 Aug 2015 23:37:07 -0700
Subject: [PATCH 0800/2016] libpng: 1.2.52 -> 1.2.53

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

diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 2a523793559..3071aa3fdfc 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -3,11 +3,11 @@
 assert !(stdenv ? cross) -> zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.52";
+  name = "libpng-1.2.53";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.xz";
-    sha256 = "1h0fa67x4bh7gcdh7qx87m4xpkdfqa7ihd4h678dcyh52jzhzyyl";
+    sha256 = "02jwfqk1ahqfvbs9gdyb5v0123by9ws6m7jnfvainig7i7v4jpml";
   };
 
   propagatedBuildInputs = [ zlib ];

From afdf985244c1bbf5aac5239a0eeeb4dbed543e25 Mon Sep 17 00:00:00 2001
From: hiberno <mail@elfsechsundzwanzig.de>
Date: Thu, 6 Aug 2015 09:37:39 +0200
Subject: [PATCH 0801/2016] pamixer: 1.2.1 -> 1.3

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

diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index c2d32ea3dad..56db4e8352e 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "pamixer-${version}";
-  version = "1.2.1";
+  version = "1.3";
 
   src = fetchurl {
     url = "https://github.com/cdemoulins/pamixer/archive/${version}.tar.gz";
-    sha256 = "1ad6b46hh02hs1978pgihrm2bnq4z2v0imrfm3wy74xdkr6xjxy4";
+    sha256 = "091676ww4jbf4jr728gjfk7fkd5nisy70mr6f3s1p7n05hjpmfjx";
   };
 
   buildInputs = [ boost libpulseaudio ];

From 3a07cc13174ed3927abfa1bac14799311f0df9a4 Mon Sep 17 00:00:00 2001
From: hiberno <mail@elfsechsundzwanzig.de>
Date: Thu, 6 Aug 2015 09:51:13 +0200
Subject: [PATCH 0802/2016] rofi-pass: 2015-06-08 -> 2015-08-06

---
 pkgs/applications/misc/rofi/pass.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix
index ccde370c292..1125a494be2 100644
--- a/pkgs/applications/misc/rofi/pass.nix
+++ b/pkgs/applications/misc/rofi/pass.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "rofi-pass-${version}";
-  version = "2015-06-08";
+  version = "2015-08-06";
 
   src = fetchgit {
     url = "https://github.com/carnager/rofi-pass";
-    rev = "7e376b5ec64974c4e8478acf3ada8d111896f391";
-    sha256 = "1ywsxdgy5m63a2f5vd7np2f1qffz7y95z7s1gq5d87s8xd8myadl";
+    rev = "bb1f0d08cd438cc8da24e0341f902706a88e7aa5";
+    sha256 = "1qx690vazwzzcg4yaghj9zd4c4md7bi6b90lgv4gwmdw74v6ghah";
   };
 
   buildInputs = [ rofi wmctrl xprop xdotool ];

From ce322917169d03ac80bfcd0f60a4a6fed46c39a6 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Thu, 6 Aug 2015 10:29:34 +0200
Subject: [PATCH 0803/2016] openscad: 2014.03 -> 2015.03-1

- Added dependencies harfbuzz, qscintilla, gettext.
- Removed redundant CFLAGS hack for eigen.
---
 pkgs/applications/graphics/openscad/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index e6d5ee5528f..7557e19896f 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -1,23 +1,22 @@
 { stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
-, mpfr, gmp, glib, pkgconfig
+, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext
 }:
 
 stdenv.mkDerivation rec {
-  version = "2014.03";
+  version = "2015.03-1";
   name = "openscad-${version}";
 
   src = fetchurl {
     url = "http://files.openscad.org/${name}.src.tar.gz";
-    sha256 = "1hv1lmq1ayhlvrz5sqipg650xryq25a9k22ysdw0dsrwg9ixqpw6";
+    sha256 = "61e0dd3cd107e5670d727526700104cca5ac54a1f0a84117fcc9e57bf3b6b279";
   };
 
   buildInputs = [
     qt4 bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib
-    pkgconfig
+    pkgconfig harfbuzz qscintilla gettext
   ];
 
   configurePhase = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) "
     qmake PREFIX="$out" VERSION=${version}
   '';
 

From 80129d23d9862d792c9dd952f42ac0166012edcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Aug 2015 11:04:04 +0200
Subject: [PATCH 0804/2016] gsl: fix patch URL that no longer worked (close
 #9143)

---
 pkgs/development/libraries/gsl/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 011e4ecd48e..dbea97a0271 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -11,10 +11,9 @@ stdenv.mkDerivation rec {
   patches = [
     # ToDo: there might be more impurities than FMA support check
     ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
-
     (fetchpatch {
       name = "bug-39055.patch";
-      url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d0377";
+      url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
       sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
     })
   ];

From 23f5a23ec7251a54918d00aa996bfffcb6b72d3b Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Wed, 5 Aug 2015 20:42:33 +0100
Subject: [PATCH 0805/2016] haskell-modules/default.nix: this line of code is
 invalid but wasn't causing harm thanks to non-strictness

---
 pkgs/development/haskell-modules/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 04158ae8e9b..ab3ac6930b9 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -3,8 +3,6 @@
 , overrides ? (self: super: {})
 }:
 
-with ./lib.nix;
-
 let
 
   fix = f: let x = f x // { __unfix__ = f; }; in x;

From 3801ef59127330d30f98ff3af3e04e7ac790722e Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Wed, 5 Aug 2015 20:48:18 +0100
Subject: [PATCH 0806/2016] haskell: move patches to patches directory

---
 pkgs/development/haskell-modules/configuration-common.nix   | 6 +++---
 .../haskell-modules/configuration-ghc-7.10.x.nix            | 2 +-
 pkgs/development/haskell-modules/configuration-ghcjs.nix    | 2 +-
 pkgs/development/haskell-modules/hackage-packages.nix       | 2 +-
 .../haskell-modules/{ => patches}/dyre-nix.patch            | 0
 .../{ => patches}/edit-distance-fix-boundaries.patch        | 0
 .../haskell-modules/{ => patches}/ghc-paths-nix-ghcjs.patch | 0
 .../haskell-modules/{ => patches}/ghc-paths-nix.patch       | 0
 .../haskell-modules/{ => patches}/graphviz-fix-ghc710.patch | 0
 .../{ => patches}/haskell-src-meta-ghc710.patch             | 0
 .../haskell-modules/{ => patches}/wxc-no-ldconfig.patch     | 0
 .../haskell-modules/{ => patches}/xmonad-nix.patch          | 0
 12 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/development/haskell-modules/{ => patches}/dyre-nix.patch (100%)
 rename pkgs/development/haskell-modules/{ => patches}/edit-distance-fix-boundaries.patch (100%)
 rename pkgs/development/haskell-modules/{ => patches}/ghc-paths-nix-ghcjs.patch (100%)
 rename pkgs/development/haskell-modules/{ => patches}/ghc-paths-nix.patch (100%)
 rename pkgs/development/haskell-modules/{ => patches}/graphviz-fix-ghc710.patch (100%)
 rename pkgs/development/haskell-modules/{ => patches}/haskell-src-meta-ghc710.patch (100%)
 rename pkgs/development/haskell-modules/{ => patches}/wxc-no-ldconfig.patch (100%)
 rename pkgs/development/haskell-modules/{ => patches}/xmonad-nix.patch (100%)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9f0b5d4599a..5e412dab8d4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -561,7 +561,7 @@ self: super: {
   duplo = dontCheck super.duplo;
 
   # Nix-specific workaround
-  xmonad = appendPatch super.xmonad ./xmonad-nix.patch;
+  xmonad = appendPatch super.xmonad ./patches/xmonad-nix.patch;
 
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
@@ -633,7 +633,7 @@ self: super: {
 
   # wxc needs help deciding which version of GTK to use.
   wxc = overrideCabal (super.wxc.override { wxGTK = pkgs.wxGTK29; }) (drv: {
-    patches = [ ./wxc-no-ldconfig.patch ];
+    patches = [ ./patches/wxc-no-ldconfig.patch ];
     doHaddock = false;
     postInstall = "cp -v dist/build/libwxc.so.${drv.version} $out/lib/libwxc.so";
   });
@@ -783,7 +783,7 @@ self: super: {
   leksah = dontCheck super.leksah;
 
   # Patch to consider NIX_GHC just like xmonad does
-  dyre = appendPatch super.dyre ./dyre-nix.patch;
+  dyre = appendPatch super.dyre ./patches/dyre-nix.patch;
 
   # Test suite won't compile against tasty-hunit 0.9.x.
   zlib = dontCheck super.zlib;
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 e9f2219f07e..cd06bf0f264 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -205,7 +205,7 @@ self: super: {
   tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
 
   # http://hub.darcs.net/ivanm/graphviz/issue/5
-  graphviz = dontCheck (dontJailbreak (appendPatch super.graphviz ./graphviz-fix-ghc710.patch));
+  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;
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 6fbb28d026e..1e56981fe8f 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -87,7 +87,7 @@ self: super: {
   });
 
   ghc-paths = overrideCabal super.ghc-paths (drv: {
-    patches = [ ./ghc-paths-nix-ghcjs.patch ];
+    patches = [ ./patches/ghc-paths-nix-ghcjs.patch ];
   });
 
   reflex-dom = overrideCabal super.reflex-dom (drv: {
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b6a18d7653c..0c02cdec9b0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -53993,7 +53993,7 @@ self: {
        version = "0.1.0.9";
        sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
        buildDepends = [ base ];
-       patches = [ ./ghc-paths-nix.patch ];
+       patches = [ ./patches/ghc-paths-nix.patch ];
        description = "Knowledge of GHC's installation directories";
        license = stdenv.lib.licenses.bsd3;
      }) {};
diff --git a/pkgs/development/haskell-modules/dyre-nix.patch b/pkgs/development/haskell-modules/patches/dyre-nix.patch
similarity index 100%
rename from pkgs/development/haskell-modules/dyre-nix.patch
rename to pkgs/development/haskell-modules/patches/dyre-nix.patch
diff --git a/pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch b/pkgs/development/haskell-modules/patches/edit-distance-fix-boundaries.patch
similarity index 100%
rename from pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch
rename to pkgs/development/haskell-modules/patches/edit-distance-fix-boundaries.patch
diff --git a/pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch b/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch
similarity index 100%
rename from pkgs/development/haskell-modules/ghc-paths-nix-ghcjs.patch
rename to pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch
diff --git a/pkgs/development/haskell-modules/ghc-paths-nix.patch b/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch
similarity index 100%
rename from pkgs/development/haskell-modules/ghc-paths-nix.patch
rename to pkgs/development/haskell-modules/patches/ghc-paths-nix.patch
diff --git a/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch b/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch
similarity index 100%
rename from pkgs/development/haskell-modules/graphviz-fix-ghc710.patch
rename to pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch
diff --git a/pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch b/pkgs/development/haskell-modules/patches/haskell-src-meta-ghc710.patch
similarity index 100%
rename from pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch
rename to pkgs/development/haskell-modules/patches/haskell-src-meta-ghc710.patch
diff --git a/pkgs/development/haskell-modules/wxc-no-ldconfig.patch b/pkgs/development/haskell-modules/patches/wxc-no-ldconfig.patch
similarity index 100%
rename from pkgs/development/haskell-modules/wxc-no-ldconfig.patch
rename to pkgs/development/haskell-modules/patches/wxc-no-ldconfig.patch
diff --git a/pkgs/development/haskell-modules/xmonad-nix.patch b/pkgs/development/haskell-modules/patches/xmonad-nix.patch
similarity index 100%
rename from pkgs/development/haskell-modules/xmonad-nix.patch
rename to pkgs/development/haskell-modules/patches/xmonad-nix.patch

From 5632ab7b24af33e081e77191b108796e0a80b781 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Wed, 5 Aug 2015 20:49:23 +0100
Subject: [PATCH 0807/2016] haskell: delete unused patches

---
 .../edit-distance-fix-boundaries.patch        | 30 ----------
 .../patches/haskell-src-meta-ghc710.patch     | 55 -------------------
 2 files changed, 85 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/patches/edit-distance-fix-boundaries.patch
 delete mode 100644 pkgs/development/haskell-modules/patches/haskell-src-meta-ghc710.patch

diff --git a/pkgs/development/haskell-modules/patches/edit-distance-fix-boundaries.patch b/pkgs/development/haskell-modules/patches/edit-distance-fix-boundaries.patch
deleted file mode 100644
index ec88c65f8bc..00000000000
--- a/pkgs/development/haskell-modules/patches/edit-distance-fix-boundaries.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ru3 edit-distance-0.2.1.2-old/edit-distance.cabal edit-distance-0.2.1.2/edit-distance.cabal
---- edit-distance-0.2.1.2-old/edit-distance.cabal	2015-04-17 22:46:50.964116064 +0300
-+++ edit-distance-0.2.1.2/edit-distance.cabal	2015-04-17 22:41:31.216027373 +0300
-@@ -36,7 +36,7 @@
-                                 Text.EditDistance.ArrayUtilities
-         
-         if flag(splitBase)
--                Build-Depends:  base >= 3 && < 4.8, array >= 0.1, random >= 1.0, containers >= 0.1.0.1
-+                Build-Depends:  base >= 3 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1
-         else
-                 Build-Depends:  base < 3
-         
-@@ -54,7 +54,7 @@
-         else            
-                 Build-Depends:          test-framework >= 0.1.1, QuickCheck >= 1.1 && < 2.0, test-framework-quickcheck
-                 if flag(splitBase)
--                        Build-Depends:  base >= 3 && < 4.8, array >= 0.1, random >= 1.0
-+                        Build-Depends:  base >= 3 && < 5, array >= 0.1, random >= 1.0
-                 else
-                         Build-Depends:  base < 3
- 
-@@ -65,7 +65,7 @@
-                 Buildable:      False
-         else
-                 if flag(splitBase)
--                        Build-Depends:  base >= 3 && < 4.8, array >= 0.1, random >= 1.0, time >= 1.0, process >= 1.0,
-+                        Build-Depends:  base >= 3 && < 5, array >= 0.1, random >= 1.0, time >= 1.0, process >= 1.0,
-                                         deepseq >= 1.2, unix >= 2.3, criterion >= 0.6
-                 else
-                         Build-Depends:  base < 3,
diff --git a/pkgs/development/haskell-modules/patches/haskell-src-meta-ghc710.patch b/pkgs/development/haskell-modules/patches/haskell-src-meta-ghc710.patch
deleted file mode 100644
index c3df98043b3..00000000000
--- a/pkgs/development/haskell-modules/patches/haskell-src-meta-ghc710.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 24e6f45408083745080ff2f3710f58209041113c Mon Sep 17 00:00:00 2001
-From: Luite Stegeman <stegeman@gmail.com>
-Date: Sun, 28 Dec 2014 21:33:22 +0100
-Subject: [PATCH] updates for GHC 7.10 and Template Haskell 2.10
-
----
- haskell-src-meta.cabal                        | 4 ++--
- src/Language/Haskell/Meta/Syntax/Translate.hs | 6 ++++++
- src/Language/Haskell/Meta/Utils.hs            | 5 ++++-
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/Language/Haskell/Meta/Syntax/Translate.hs b/src/Language/Haskell/Meta/Syntax/Translate.hs
-index 189d32e..36a08f1 100644
---- a/src/Language/Haskell/Meta/Syntax/Translate.hs
-+++ b/src/Language/Haskell/Meta/Syntax/Translate.hs
-@@ -384,9 +384,15 @@ a .->. b = AppT (AppT ArrowT a) b
- toCxt :: Hs.Context -> Cxt
- toCxt = fmap toPred
-  where
-+#if MIN_VERSION_template_haskell(2,10,0)
-+  toPred (Hs.ClassA n ts) = foldl' AppT (ConT (toName n)) (fmap toType ts)
-+  toPred (Hs.InfixA t1 n t2) = foldl' AppT (ConT (toName n)) (fmap toType [t1,t2])
-+  toPred (Hs.EqualP t1 t2) = foldl' AppT EqualityT (fmap toType [t1,t2])
-+#else
-   toPred (Hs.ClassA n ts) = ClassP (toName n) (fmap toType ts)
-   toPred (Hs.InfixA t1 n t2) = ClassP (toName n) (fmap toType [t1, t2])
-   toPred (Hs.EqualP t1 t2) = EqualP (toType t1) (toType t2)
-+#endif
-   toPred a@Hs.IParam{} = noTH "toCxt" a
- 
- foldAppT :: Type -> [Type] -> Type
-diff --git a/src/Language/Haskell/Meta/Utils.hs b/src/Language/Haskell/Meta/Utils.hs
-index 36f7e96..d194f3e 100644
---- a/src/Language/Haskell/Meta/Utils.hs
-+++ b/src/Language/Haskell/Meta/Utils.hs
-@@ -166,6 +166,9 @@ renameT env new (ForallT ns cxt t) =
-     unVarT (VarT n) = PlainTV n
-     renamePreds = renameThings renamePred
- 
-+#if MIN_VERSION_template_haskell(2,10,0)
-+    renamePred = renameT
-+#else
-     renamePred env new (ClassP n ts) = let
-         (ts', env', new') = renameTs env new [] ts
-       in (ClassP (normaliseName n) ts', env', new')
-@@ -174,7 +177,7 @@ renameT env new (ForallT ns cxt t) =
-         (t1', env1, new1) = renameT env new t1
-         (t2', env2, new2) = renameT env1 new1 t2
-       in (EqualP t1' t2', env2, new2)
--
-+#endif
- 
- -- | Remove qualification, etc.
- normaliseName :: Name -> Name
-

From 64befd0cb3290310c1ea2659d9c7af59454f9987 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Wed, 5 Aug 2015 20:54:43 +0100
Subject: [PATCH 0808/2016] haskell/regex-tdfa-text: add patch to fix build

http://hub.darcs.net/shelarcy/regex-tdfa-text/issue/1
---
 .../configuration-ghc-7.10.x.nix              |  3 +++
 .../patches/regex-tdfa-text.patch             | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/patches/regex-tdfa-text.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 cd06bf0f264..5ae71325a9f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -219,6 +219,9 @@ self: super: {
   seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
   vector_0_10_9_3 = markBroken super.vector_0_10_9_3;
 
+  # http://hub.darcs.net/shelarcy/regex-tdfa-text/issue/1 -- upstream seems to be asleep
+  regex-tdfa-text = appendPatch super.regex-tdfa-text ./patches/regex-tdfa-text.patch;
+
   # https://github.com/HugoDaniel/RFC3339/issues/14
   timerep = dontCheck super.timerep;
 
diff --git a/pkgs/development/haskell-modules/patches/regex-tdfa-text.patch b/pkgs/development/haskell-modules/patches/regex-tdfa-text.patch
new file mode 100644
index 00000000000..ef349b1cb64
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/regex-tdfa-text.patch
@@ -0,0 +1,21 @@
+--- regex-tdfa-text-1.0.0.2/Text/Regex/TDFA/Text/Lazy.orig.hs	2015-08-05 20:30:01.228983428 +0100
++++ regex-tdfa-text-1.0.0.2/Text/Regex/TDFA/Text/Lazy.hs	2015-08-05 20:39:25.682563005 +0100
+@@ -26,7 +26,7 @@
+ import Data.Array.IArray((!),elems,amap)
+ import qualified Data.Text.Lazy as L(Text,empty,take,drop,uncons,unpack)
+
+-import Text.Regex.Base(MatchArray,RegexContext(..),Extract(..),RegexMaker(..),RegexLike(..))
++import Text.Regex.Base(MatchText,MatchArray,RegexContext(..),Extract(..),RegexMaker(..),RegexLike(..))
+ import Text.Regex.Base.Impl(polymatch,polymatchM)
+ import Text.Regex.TDFA.ReadRegex(parseRegex)
+ import Text.Regex.TDFA.String() -- piggyback on RegexMaker for String
+@@ -74,7 +74,8 @@
+                ,after (o+l) source))
+          (matchOnce regex source)
+   matchAllText regex source =
+-    let go i _ _ | i `seq` False = undefined
++    let go :: Int -> L.Text -> [MatchArray] -> [MatchText L.Text]
++        go i _ _ | i `seq` False = undefined
+         go _i _t [] = []
+         go i t (x:xs) =
+           let (off0,len0) = x!0

From 7dc9450ed2a2c17ec93eca2e9ebfa96a389ff14e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 6 Aug 2015 12:30:38 +0200
Subject: [PATCH 0809/2016] nixos/ISO profile: fix defaultLocales :-)

https://github.com/NixOS/nixpkgs/commit/eb4a88d8fd2#commitcomment-12527102
---
 nixos/modules/profiles/minimal.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index 3b18ae129b9..c353da227ae 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -7,6 +7,8 @@ with lib;
 
 {
   environment.noXlibs = mkDefault true;
-  i18n.supportedLocales = [ config.i18n.defaultLocale ];
+
+  # This isn't perfect, but let's expect the user specifies an UTF-8 defaultLocale
+  i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ];
   services.nixosManual.enable = mkDefault false;
 }

From 855db4dbbcd8d98a6dbd51ea19b92a6a38fa088e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 6 Aug 2015 12:32:29 +0200
Subject: [PATCH 0810/2016] pulseaudio: fix .la file

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

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 856a22d7bb8..e018c7790b9 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook
-, json_c, libsndfile
+, json_c, libsndfile, libtool
 , xlibs, libcap, alsaLib, glib
 , avahi, libjack2, libasyncns, lirc, dbus
 , sbc, bluez5, udev, openssl, fftwFloat
@@ -109,6 +109,7 @@ stdenv.mkDerivation rec {
 
   postInstall = lib.optionalString libOnly ''
     rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
+    sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $out/lib/libpulsecore-6.0.la
   '';
 
   meta = {

From 86d7228365fe52276b344693d2bcb2002b145fe2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 6 Aug 2015 12:32:46 +0200
Subject: [PATCH 0811/2016] libcanberra: fix .la file

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

diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 2510e3b8621..b441719d31c 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -16,6 +16,12 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-oss";
 
+  postInstall = ''
+    for f in $out/lib/*.la; do
+      sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $f
+    done
+  '';
+
   passthru = {
     gtkModule = "/lib/gtk-2.0/";
   };

From 150b23d3f51a156665cb61aa72d4190f0e662a13 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 6 Aug 2015 12:33:01 +0200
Subject: [PATCH 0812/2016] cheese: don't depend on libtool

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

diff --git a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
index c3c37c5fd76..ce43fe1637d 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3
 , pkgconfig, gtk3, glib, clutter_gtk, clutter-gst_2, udev, gst_all_1, itstool
-, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2, libtool }:
+, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "cheese-${gnome3.version}.1";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
                   gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2
                   gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop
                   gst_all_1.gst-plugins-bad clutter_gtk clutter-gst_2
-                  libtool libcanberra_gtk3 ];
+                  libcanberra_gtk3 ];
 
   enableParallelBuilding = true;
 

From 006a2f553e3da4698306939b9581fc21e2333a76 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 5 Aug 2015 21:49:34 +0200
Subject: [PATCH 0813/2016] picoc: disable broken tests on i686

---
 pkgs/development/interpreters/picoc/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index 290abca5474..e9893dfd1c7 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -39,7 +39,9 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  # Tests are currently broken on i686 see
+  # http://hydra.nixos.org/build/24003763/nixlog/1
+  doCheck = if stdenv.isi686 then false else true;
   checkTarget = "test";
 
   installPhase = ''

From 09ec228c9b75cf6b61de63131388ac793c576431 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 6 Aug 2015 12:51:55 +0200
Subject: [PATCH 0814/2016] pure-octave: mark as broken

reported upstream as https://bitbucket.org/purelang/pure-lang/issues/38
---
 pkgs/development/pure-modules/octave/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix
index 6a039313f0e..41b397a51e7 100644
--- a/pkgs/development/pure-modules/octave/default.nix
+++ b/pkgs/development/pure-modules/octave/default.nix
@@ -21,5 +21,8 @@ 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 86c973d429bfa00cce3e0b6a3adaed4c50796b44 Mon Sep 17 00:00:00 2001
From: makefu <makefu@syntax-fehler.de>
Date: Thu, 6 Aug 2015 08:29:07 +0200
Subject: [PATCH 0815/2016] luaPackages.vicious: init at 2.1.3

vicious is a module for creating widgets on window managers.
This commit adds the library and a wrapper lua file for easy importing.

I use the library with the awesome window manager via luaModules:

    services.xserver.windowManager.awesome.luaModules = [
      pkgs.luaPackages.vicious
    ];
---
 lib/maintainers.nix             |  1 +
 pkgs/top-level/lua-packages.nix | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f4cd203e41d..c490b9ee979 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -151,6 +151,7 @@
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
   magnetophon = "Bart Brouns <bart@magnetophon.nl>";
   mahe = "Matthias Herrmann <matthias.mh.herrmann@gmail.com>";
+  makefu = "Felix Richter <makefu@syntax-fehler.de>";
   malyn = "Michael Alyn Miller <malyn@strangeGizmo.com>";
   manveru = "Michael Fellinger <m.fellinger@gmail.com>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 383f03934a2..37a2ec6faee 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -400,4 +400,29 @@ let
     '';
   };
 
+  vicious = stdenv.mkDerivation rec {
+    name = "vicious-${version}";
+    version = "2.1.3";
+
+    src = fetchzip {
+      url    = "http://git.sysphere.org/vicious/snapshot/vicious-${version}.tar.xz";
+      sha256 = "1c901siza5vpcbkgx99g1vkqiki5qgkzx2brnj4wrpbsbfzq0bcq";
+    };
+
+    meta = with stdenv.lib; {
+      description = "vicious widgets for window managers";
+      homepage    = http://git.sysphere.org/vicious/;
+      license     = licenses.gpl2;
+      maintainers = with maintainers; [ makefu ];
+      platforms   = platforms.linux;
+    };
+
+    buildInputs = [ lua ];
+    installPhase = ''
+      mkdir -p $out/lib/lua/${lua.luaversion}/
+      cp -r . $out/lib/lua/${lua.luaversion}/vicious/
+      printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' ..  package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua
+    '';
+  };
+
 }; in self

From 1bbcaf2eaf90ae75cacecf5150092a1163e6b6f8 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 6 Aug 2015 16:51:42 +0300
Subject: [PATCH 0816/2016] ckbcomp: 1.129 -> 1.131

Based on upstream commit logs; not much has happened: mostly translation
updates and a minor fix for Nokia N900 keyboards.
---
 pkgs/tools/X11/ckbcomp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 90eaef73e16..6495b2de7f3 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "ckbcomp-${version}";
-  version = "1.129";
+  version = "1.131";
 
   src = fetchgit {
     url = "git://anonscm.debian.org/d-i/console-setup.git";
     rev = "refs/tags/${version}";
-    sha256 = "1shbqnjhdmy7qwz2kwfhrdxbjw1vv98rpz1x7wlgqxr812aqcfdd";
+    sha256 = "0xmdnzhm1wsdpjb0wsi24xzk1xpv5h2bxgwm9f4awb7aj7wv59ma";
   };
 
   buildInputs = [ perl ];

From c197e2f60dcd5dbccfa3ecd857b1a47e7094c6e1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 6 Aug 2015 13:28:53 +0200
Subject: [PATCH 0817/2016] sensu: fix build by using ruby_2_1

---
 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 9f8da6397a2..b079bdbc011 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9252,7 +9252,9 @@ let
 
   seyren = callPackage ../servers/monitoring/seyren { };
 
-  sensu = callPackage ../servers/monitoring/sensu { };
+  sensu = callPackage ../servers/monitoring/sensu {
+    ruby = ruby_2_1;
+  };
 
   shishi = callPackage ../servers/shishi { };
 

From 7f2200117d14860a3a937e5c87d5cf4c1c70de49 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 6 Aug 2015 14:20:02 +0200
Subject: [PATCH 0818/2016] serfdom: fix build by updating from 0.6.3 to 0.6.4
 and using an old version of memberlist

---
 pkgs/servers/serfdom/default.nix |  6 +++---
 pkgs/top-level/go-packages.nix   | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix
index 381fe6ddc1e..94a46459d4e 100644
--- a/pkgs/servers/serfdom/default.nix
+++ b/pkgs/servers/serfdom/default.nix
@@ -3,7 +3,7 @@
 with goPackages;
 
 buildGoPackage rec {
-  version = "0.6.3";
+  version = "0.6.4";
   name = "serfdom-${version}";
   goPackagePath = "github.com/hashicorp/serf";
 
@@ -11,10 +11,10 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "serf";
     rev = "v${version}";
-    sha256 = "0ck77ji28bvm4ahzxyyi4sm17c3fxc16k0k5mihl1nlkgdd73m8y";
+    sha256 = "1fhz8wrvsmgaky22n255w9hkyfph2n45c47ivdyzrrxisg5j2438";
   };
 
-  buildInputs = [ cli mapstructure memberlist logutils go-syslog mdns columnize circbuf ];
+  buildInputs = [ cli mapstructure memberlist_v2 logutils go-syslog mdns columnize circbuf ugorji.go ];
 
   dontInstallSrc = true;
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f6b8bfccfe8..080fc1d6747 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1601,6 +1601,21 @@ let
     propagatedBuildInputs = [ ugorji.go armon.go-metrics ];
   };
 
+  memberlist_v2 = buildGoPackage rec {
+    rev = "165267096ca647f00cc0b59a8f1ede9a96cbfbb1";
+    name = "memberlist-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/memberlist";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "hashicorp";
+      repo = "memberlist";
+      sha256 = "09lh79xqy7q0gy23x22lpfwihb5acr750vxl2fx0i4b88kq1vrzh";
+    };
+
+    propagatedBuildInputs = [ ugorji.go armon.go-metrics ];
+  };
+
   mesos-stats = buildGoPackage rec {
     rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920";
     name = "mesos-stats-${stdenv.lib.strings.substring 0 7 rev}";

From dd06e36eb808c95026d009fb453bd10c2d5239c4 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 6 Aug 2015 14:34:13 +0200
Subject: [PATCH 0819/2016] sbsigntool: only build for x86_64-linux, it is
 broken on i686

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

diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix
index 4cc5e2505d1..fceb4c82128 100644
--- a/pkgs/tools/security/sbsigntool/default.nix
+++ b/pkgs/tools/security/sbsigntool/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     description = "Tools for maintaining UEFI signature databases";
     homepage    = http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases;
     maintainers = [ maintainers.tstrobel ];
-    platforms   = platforms.linux;
+    platforms   = [ "x86_64-linux" ]; # Broken on i686
   };
 }
 

From 9e065f227009f1def7fb345aea610566a2569370 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 6 Aug 2015 15:06:21 +0200
Subject: [PATCH 0820/2016] suds: disable for python3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0bd0d0702ce..7c8d72ad6dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16980,6 +16980,7 @@ let
   
   suds = buildPythonPackage rec {
     name = "suds-0.4";
+    disabled = isPy3k;
     
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz";

From 6229ec91da8878f2541f16a78d247725202c34e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 16:13:10 +0200
Subject: [PATCH 0821/2016] Add 'enableExecutableProfiling' argument to the
 generic Haskell builder.

Closes https://github.com/NixOS/nixpkgs/issues/2734.
---
 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 26643f075b0..b4d1461d1d2 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -15,6 +15,7 @@
 , doHoogle ? true
 , editedCabalFile ? null
 , enableLibraryProfiling ? false
+, enableExecutableProfiling ? false
 , enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
 , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
 , enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013
@@ -86,6 +87,7 @@ let
     (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
     (enableFeature enableSplitObjs "split-objs")
     (enableFeature enableLibraryProfiling "library-profiling")
+    (enableFeature enableExecutableProfiling "executable-profiling")
     (enableFeature enableSharedLibraries "shared")
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla"))
     (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))

From 5c90fed5d77a64180abcda4909c1ab1fafcbe6d8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 6 Aug 2015 00:30:09 +0200
Subject: [PATCH 0822/2016] geolite-legacy: support all platforms; it's just
 data

---
 pkgs/data/misc/geolite-legacy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index f3191e430ef..65339574dfb 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     description = "GeoLite Legacy IP geolocation databases";
     homepage = https://geolite.maxmind.com/download/geoip;
     license = licenses.cc-by-sa-30;
-    platforms = with platforms; linux;
+    platforms = platforms.all;
     maintainers = with maintainers; [ nckx ];
   };
 

From 9704396f09f1554e2c3f4762639bc766f3070d19 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 6 Aug 2015 07:10:15 +0200
Subject: [PATCH 0823/2016] fmit: 1.0.0 -> 1.0.5

Now with Qt 5 and a new build system. Who uses "make install" anyway?
---
 pkgs/applications/audio/fmit/default.nix | 37 ++++++++++++++++++------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 712b3df9f25..72797d7628f 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,32 +1,51 @@
-{ stdenv, fetchFromGitHub, alsaLib, cmake, fftw
-, freeglut, libjack2, libXmu, qt4 }:
+# FIXME: upgrading qt5Full (Qt 5.3) to qt5.{base,multimedia} (Qt 5.4) breaks
+# the default Qt audio capture source!
+{ stdenv, fetchFromGitHub, alsaLib, fftw, freeglut, libjack2, qt5Full }:
 
-let version = "1.0.0"; in
+let version = "1.0.5"; in
 stdenv.mkDerivation {
   name = "fmit-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "13y9csv34flz7065kg69h99hd7d9zskq12inmkf34l4qjyk7c185";
+    sha256 = "1p49ykg7mf62xrn08fqss8yr1nf53mm8w9zp2sgcy48bfsa9xbpy";
     rev = "v${version}";
     repo = "fmit";
     owner = "gillesdegottex";
   };
 
-  buildInputs = [ alsaLib fftw freeglut libjack2 libXmu qt4 ];
-  nativeBuildInputs = [ cmake ];
+  buildInputs = [ alsaLib fftw freeglut libjack2 qt5Full ];
+
+  postPatch = ''
+    substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
+    substituteInPlace distrib/fmit.desktop \
+      --replace "Icon=fmit" "Icon=$out/share/pixmaps/fmit.svg"
+    substituteInPlace src/main.cpp --replace "PREFIX" "\"$out\""
+  '';
+
+  configurePhase = ''
+    qmake CONFIG+="acs_alsa acs_jack" fmit.pro
+  '';
 
   enableParallelBuilding = true;
 
+  installPhase = ''
+    install -D fmit $out/bin/fmit
+    install -Dm644 distrib/fmit.desktop $out/share/applications/fmit.desktop
+    install -Dm644 ui/images/fmit.svg $out/share/pixmaps/fmit.svg
+    mkdir -p $out/share/fmit
+    cp -R tr $out/share/fmit
+  '';
+
   meta = with stdenv.lib; {
     inherit version;
     description = "Free Musical Instrument Tuner";
     longDescription = ''
-      FMIT is a graphical utility for tuning your musical instruments, with
-      error and volume history and advanced features.
+      FMIT is a graphical utility for tuning musical instruments, with error
+      and volume history, and advanced features.
     '';
     homepage = http://gillesdegottex.github.io/fmit/;
     license = licenses.gpl3Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }

From dc5f33b395325c5b75a88d2825f76ed0a51f048e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 6 Aug 2015 07:20:12 +0200
Subject: [PATCH 0824/2016] fmit: make ALSA and JACK2 capture support optional

Both are off by default. The default (and already built-in) Qt capture
source should just work.
---
 pkgs/applications/audio/fmit/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 72797d7628f..011f4f15f5d 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,6 +1,11 @@
 # FIXME: upgrading qt5Full (Qt 5.3) to qt5.{base,multimedia} (Qt 5.4) breaks
 # the default Qt audio capture source!
-{ stdenv, fetchFromGitHub, alsaLib, fftw, freeglut, libjack2, qt5Full }:
+{ stdenv, fetchFromGitHub, fftw, freeglut, qt5Full
+, alsaSupport ? false, alsaLib ? null
+, jackSupport ? false, libjack2 ? null }:
+
+assert alsaSupport -> alsaLib != null;
+assert jackSupport -> libjack2 != null;
 
 let version = "1.0.5"; in
 stdenv.mkDerivation {
@@ -13,7 +18,9 @@ stdenv.mkDerivation {
     owner = "gillesdegottex";
   };
 
-  buildInputs = [ alsaLib fftw freeglut libjack2 qt5Full ];
+  buildInputs = [ fftw freeglut qt5Full ]
+    ++ stdenv.lib.optional alsaSupport [ alsaLib ]
+    ++ stdenv.lib.optional jackSupport [ libjack2 ];
 
   postPatch = ''
     substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
@@ -23,7 +30,10 @@ stdenv.mkDerivation {
   '';
 
   configurePhase = ''
-    qmake CONFIG+="acs_alsa acs_jack" fmit.pro
+    qmake \
+      CONFIG+=${stdenv.lib.optionalString alsaSupport "acs_alsa"} \
+      CONFIG+=${stdenv.lib.optionalString jackSupport "acs_jack"} \
+      fmit.pro
   '';
 
   enableParallelBuilding = true;

From a849b160522ff33d4f54764ce6d0aa39319b79d0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 6 Aug 2015 12:54:47 +0200
Subject: [PATCH 0825/2016] radeontop: 2015-06-24 -> 2015-08-06

Adds support for Topaz, Tonga, and Carrizo + new R600 PCI IDs.
---
 pkgs/os-specific/linux/radeontop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix
index 205171ec928..fa529fe71fe 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/pkgs/os-specific/linux/radeontop/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, pkgconfig, gettext, ncurses, libdrm, libpciaccess }:
 
-let version = "2015-06-24"; in
+let version = "2015-08-06"; in
 stdenv.mkDerivation {
   name = "radeontop-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "06cn7lixxx94c1fki0plg9f4rdy459mgi9yl80m0k1a20jqykz2a";
-    rev = "976cae0be0ffb9142d5e63e435960c6b2bb0eb34";
+    sha256 = "01s0j28lk66wb46qymkk1nyk91iv22y3m56z4lqd16yaxmhl0v2f";
+    rev = "93c8ff2f07da8d4c204ee4872aed7eec834ff57d";
     repo = "radeontop";
     owner = "clbr";
   };

From 629ac021b77d2d09302081ae0d6d8c066b2b3dc4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 6 Aug 2015 16:19:30 +0200
Subject: [PATCH 0826/2016] Revert "rethinkdb: Force dynamic linking and allow
 dependency substitution"

This reverts commit 5960a652f1502260348ad7375ace20959b80abe4.

Build is broken since the beginning at configure phase @wkennington ,
I wonder how you were able to build this.

See http://hydra.nixos.org/build/24167778/nixlog/1/raw
---
 pkgs/servers/nosql/rethinkdb/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 5d0b68bba2b..789aa95b157 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -11,21 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "19qhia4lfa8a0rzp2v6lnlxp2lf4z4vqhgfxnicfdnx07q4r847i";
   };
 
-  postPatch = ''
-    # Remove the dependence on bundled libraries
-    sed -i '/must_fetch_list/ s/ v8//' configure
-
-    # Don't use the default command line args
-    rm configure.default
-  '';
-
   preConfigure = ''
     export ALLOW_WARNINGS=1
     patchShebangs .
   '';
 
   configureFlags = [
-    "--dynamic=all"
     "--with-jemalloc"
     "--lib-path=${jemalloc}/lib"
   ];

From 37ff33196fe245d0c12cb1b84389e88d40bbb717 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 6 Aug 2015 16:31:23 +0200
Subject: [PATCH 0827/2016] simple-scan: fix build by adding lcms to
 buildInputs

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

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 954b2e02136..9eac6d0659a 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2
-, makeWrapper, pkgconfig, saneBackends, systemd, vala }:
+, makeWrapper, pkgconfig, saneBackends, systemd, vala, lcms }:
 
 let version = "3.17.4"; in
 stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cairo colord glib gtk3 libxml2
-    saneBackends systemd vala ];
+    saneBackends systemd vala lcms ];
   nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ];
 
   enableParallelBuilding = true;

From ec5940a49620357d4f17886ce640f4ceec51b71c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 6 Aug 2015 00:39:57 +0200
Subject: [PATCH 0828/2016] qgis: fix python console and processing plugin

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

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index bda364cb26f..98663a946ae 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl,
-  pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
+  qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "qgis-2.10.1";
 
-  buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla
+  buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl qwt qscintilla
     fcgi libspatialindex libspatialite postgresql ] ++
-    (with pythonPackages; [ numpy psycopg2 ]);
+    (with pythonPackages; [ numpy psycopg2 ]) ++ [ pythonPackages.qscintilla ];
 
   nativeBuildInputs = [ cmake makeWrapper ];
 

From 0031120921eef7baaa23340e22675a00d842a72e Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 24 May 2015 14:08:07 +0000
Subject: [PATCH 0829/2016] emacs-packages: make the file header more
 informative

---
 pkgs/top-level/emacs-packages.nix | 38 +++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index a8cce92c1bc..444e086afb3 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1,17 +1,35 @@
 # package.el-based emacs packages
+
+## FOR USERS
 #
-## add this at the start your init.el:
-# (require 'package)
+# Recommended way: simply use `emacsWithPackages` from
+# `all-packages.nix` with the packages you want.
 #
-# ;; optional. makes unpure packages archives unavailable
-# (setq package-archives nil)
+# Possible way: use `emacs` from `all-packages.nix`, install
+# everything to a system or user profile and then add this at the
+# start your `init.el`:
+/*
+  (require 'package)
+
+  ;; optional. makes unpure packages archives unavailable
+  (setq package-archives nil)
+
+  ;; optional. use this if you install emacs packages to the system profile
+  (add-to-list 'package-directory-list "/run/current-system/sw/share/emacs/site-lisp/elpa")
+
+  ;; optional. use this if you install emacs packages to user profiles (with nix-env)
+  (add-to-list 'package-directory-list "~/.nix-profile/share/emacs/site-lisp/elpa")
+
+  (package-initialize)
+*/
+
+## FOR CONTRIBUTORS
 #
-# (add-to-list 'package-directory-list "/run/current-system/sw/share/emacs/site-lisp/elpa")
-#
-# ;; optional. use this if you install emacs packages to user profiles (with nix-env)
-# (add-to-list 'package-directory-list "~/.nix-profile/share/emacs/site-lisp/elpa")
-#
-# (package-initialize)
+# When adding a new package here please note that
+# * lib.licenses are `with`ed on top of the file here
+# * both trivialBuild and melpaBuild will automatically derive a
+#   `meta` with `platforms` and `homepage` set to something you are
+#   unlikely to want to override for most packages
 
 { overrides
 

From e403495938fecc24491044db81b280e8c09355a3 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 24 May 2015 14:10:56 +0000
Subject: [PATCH 0830/2016] emacs-packages: cleanup and fix request and
 request-deferred

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 444e086afb3..2738336b858 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1093,7 +1093,9 @@ let self = _self // overrides;
       sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92";
     };
 
-    meta = with stdenv.lib; {
+    files = [ "request.el" ];
+
+    meta = {
       description = "Easy HTTP request for Emacs Lisp";
       longDescription = ''
         Request.el is a HTTP request library with multiple backends. It supports
@@ -1102,36 +1104,18 @@ let self = _self // overrides;
         Library author can use request.el to avoid imposing external dependencies
         such as curl to users while giving richer experience for users who have curl.
       '';
-      homepage = https://github.com/tkf/emacs-request;
       license = gpl3Plus;
     };
   };
 
   request-deferred = melpaBuild rec {
     pname = "request-deferred";
-    version = "0.2.0";
-
-    src = fetchFromGitHub {
-      owner = "tkf";
-      repo = "emacs-request";
-      rev = "adf7de452f9914406bfb693541f1d280093c4efd";
-      sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92";
-    };
-
+    version = request.version;
+    src = request.src;
     packageRequires = [ request deferred ];
-
-    meta = with stdenv.lib; {
-      description = "Easy HTTP request for Emacs Lisp";
-      longDescription = ''
-        Request.el is a HTTP request library with multiple backends. It supports
-        url.el which is shipped with Emacs and curl command line program. User
-        can use curl when s/he has it, as curl is more reliable than url.el.
-        Library author can use request.el to avoid imposing external dependencies
-        such as curl to users while giving richer experience for users who have curl.
-      '';
-      homepage = https://github.com/tkf/emacs-request;
-      license = gpl3Plus;
-    };
+    files = [ "request-deferred.el" ];
+    meta = request.meta
+        // { description = "${request.meta.description} (deferred)"; };
   };
 
   rich-minority = melpaBuild rec {

From b307fcccaee6b03b88f67abcc3b64db68ef477bd Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 24 May 2015 14:12:20 +0000
Subject: [PATCH 0831/2016] emacs-packages: add meta information to more
 packages

---
 pkgs/top-level/emacs-packages.nix | 69 ++++++++++++++++++++++++-------
 1 file changed, 55 insertions(+), 14 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 2738336b858..9f0978ffa1a 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -62,7 +62,10 @@ let self = _self // overrides;
       sha256 = "0dlrhc1dmzgrjvcnlqvm6clyv0r6zray6qqliqngy14880grghbm";
     };
     packageRequires = [ auto-complete haskell-mode ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Haskell code completion for auto-complete Emacs framework";
+      license = gpl3Plus;
+    };
   };
 
   ace-jump-mode = melpaBuild rec {
@@ -90,7 +93,10 @@ let self = _self // overrides;
       sha256 = "19y5w9m2flp4as54q8yfngrkri3kd7fdha9pf2xjgx6ryflqx61k";
     };
     packageRequires = [ dash s ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Search using ag from inside Emacs";
+      license = gpl3Plus;
+    };
   };
 
   agda2-mode = with external; trivialBuild {
@@ -126,7 +132,10 @@ let self = _self // overrides;
       sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26";
     };
     packageRequires = [ gntp log4e ];
-    meta = { license = gpl2Plus; };
+    meta = {
+      description = "A Growl-like alerts notifier for Emacs";
+      license = gpl2Plus;
+    };
   };
 
   anzu = melpaBuild rec {
@@ -181,7 +190,10 @@ let self = _self // overrides;
       rev    = "v${version}";
       sha256 = "1j6mbvvbnm2m1gpsy9ipxiv76b684nn57yssbqdyiwyy499cma6q";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Asynchronous processing in Emacs";
+      license = gpl3Plus;
+    };
   };
 
   auctex = melpaBuild rec {
@@ -194,7 +206,11 @@ let self = _self // overrides;
     buildPhase = ''
       cp $src ${pname}-${version}.tar
     '';
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
+      homepage = https://www.gnu.org/software/auctex/;
+      license = gpl3Plus;
+    };
   };
 
   auto-complete = melpaBuild rec {
@@ -237,7 +253,10 @@ let self = _self // overrides;
       sha256 = "187wnqqm5g43cg8b6a9rbd9ncqad5fhjb96wjszbinjh1mjxyh7i";
     };
     files = [ "bind-key.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "A simple way to manage personal keybindings";
+      license = gpl3Plus;
+    };
   };
 
   browse-kill-ring = melpaBuild rec {
@@ -281,7 +300,10 @@ let self = _self // overrides;
     };
     fileSpecs = [ "emacs/*.el" ];
     configurePhase = "true";
-    meta = { license = gpl2Plus; };
+    meta = {
+      description = "OCaml code editing commands for Emacs";
+      license = gpl2Plus;
+    };
   };
 
   change-inner = melpaBuild rec {
@@ -294,7 +316,10 @@ let self = _self // overrides;
       sha256 = "1fv8630bqbmfr56zai08f1q4dywksmghhm70084bz4vbs6rzdsbq";
     };
     packageRequires = [ expand-region ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Change contents based on semantic units in Emacs";
+      license = gpl3Plus;
+    };
   };
 
   circe = melpaBuild rec {
@@ -308,7 +333,10 @@ let self = _self // overrides;
     };
     packageRequires = [ lcs lui ];
     fileSpecs = [ "lisp/circe*.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "IRC client for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   company = melpaBuild rec {
@@ -320,7 +348,10 @@ let self = _self // overrides;
       rev    = version;
       sha256 = "08rrjfp2amgya1hswjz3vd5ja6lg2nfmm7454p0h1naz00hlmmw0";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Modular text completion framework for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   company-ghc = melpaBuild rec {
@@ -348,7 +379,10 @@ let self = _self // overrides;
       rev    = version;
       sha256 = "02gfrcda7gj3j5yx71dz40xylrafl4pcaj7bgfajqi9by0w2nrnx";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "A modern list library for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   deferred = melpaBuild rec {
@@ -382,7 +416,11 @@ let self = _self // overrides;
       rev    = version;
       sha256 = "0hshw7z5f8pqxvgxw74kbj6nvprsgfvy45fl854xarnkvqcara09";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Diminishes the amount of space taken on the mode-line by Emacs minor modes";
+      homepage = http://www.eskimo.com/~seldon/;
+      license = gpl3Plus;
+    };
   };
 
   epl = melpaBuild rec {
@@ -995,7 +1033,7 @@ let self = _self // overrides;
         Org-trello is an emacs minor mode that extends org-mode with
         Trello abilities.
       '';
-      homepage = https://org-trello.github.io;
+      homepage = https://org-trello.github.io/;
       license = gpl3Plus;
     };
   };
@@ -1128,7 +1166,10 @@ let self = _self // overrides;
       sha256 = "0kvhy4mgs9llihwsb1a9n5a85xzjiyiyawxnz0axy2bvwcxnp20k";
     };
     packageRequires = [ dash ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Hiding and/or highlighting the list of minor modes in the Emacs mode-line.";
+      license = gpl3Plus;
+    };
   };
 
   s = melpaBuild rec {

From d61fb8b9d29eb7f6488cd7ea3d2e44277cc5e60b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 5 Aug 2015 18:55:45 +0000
Subject: [PATCH 0832/2016] python-packages tornado: 4.1 -> 4.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9c42d325ed..e98e4e61ba1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15138,16 +15138,15 @@ let
     doCheck = false;
   };
   tornado = buildPythonPackage rec {
-    name = "tornado-4.1";
+    name = "tornado-${version}";
+    version = "4.2.1";
 
     propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 certifi ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz";
-      sha256 = "0a12f00h277zbifibnj46wf14801f573irvf6hwkgja5vspd7awr";
+      sha256 = "a16fcdc4f76b184cb82f4f9eaeeacef6113b524b26a2cb331222e4a7fa6f2969";
     };
-
-    doCheck = false;
   };
 
   tokenlib = buildPythonPackage rec {

From 56c62ad12a49508e7a6ad9563f8d21623f609d98 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 6 Aug 2015 09:52:06 -0700
Subject: [PATCH 0833/2016] ceph-git: 2015-07-32 -> 2015-08-05

---
 pkgs/tools/filesystems/ceph/git.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index 913901a0f80..9343d2cdf33 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-07-31";
+  version = "2015-08-05";
 
   src = fetchgit {
-    url = "git://github.com/ceph/ceph.git";
-    rev = "ef86e29259d0e863e62115926bf67287dc9a7e41";
-    sha256 = "14h387ngx3fmdm0b0sgl0l743j3d22gnp3lv68ah59yc4crfgdcx";
+    url = "git://github.com/wkennington/ceph.git";
+    rev = "043a780feb973b7ad571bb696437476da3260133";
+    sha256 = "02kk24wm6mxsclklsz5zzpj3wm6f341blj2anx3v5x20cixzdnhp";
   };
 
   patches = [ ./fix-pythonpath.patch ];

From 793cbaedf40d5ef63a688a0328bdfb85986b0eef Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 6 Aug 2015 10:05:14 -0700
Subject: [PATCH 0834/2016] cmake: 3.2.2 -> 3.3.0

---
 pkgs/development/tools/build-managers/cmake/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 112950b690d..bb6029347aa 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -10,8 +10,8 @@ assert wantPS -> (ps != null);
 
 let
   os = stdenv.lib.optionalString;
-  majorVersion = "3.2";
-  minorVersion = "2";
+  majorVersion = "3.3";
+  minorVersion = "0";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "0y3w83al0vh9ll7fnqm3nx7l8hsl85k8iv9abxb791q36rp4xsdd";
+    sha256 = "0d0s4gpsqlzq18pzhzy0q8522nyhffhn593gil1lsyg0bxsjyz45";
   };
 
   enableParallelBuilding = true;

From 73ad191afb6cc76c05b09a15eac605ebead82e35 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jul 2015 12:04:08 +0200
Subject: [PATCH 0835/2016] r-modules: fix Hydra evaluation errors

---
 pkgs/development/r-modules/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d04ce8664fc..1951c02e677 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1499,6 +1499,22 @@ let
     "yaqcaffy" # depends on broken package affyio-1.37.0
     "ZeligMultilevel" # depends on broken package nlopt-2.4.2
     "zetadiv" # depends on broken package nlopt-2.4.2
+    "CNVPanelizer" # depends on broken cn.mops-1.15.1
+    "ClustGeo" # depends on broken FactoMineR-1.31.3
+    "INSPEcT" # depends on broken GenomicFeatures-1.21.13
+    "IONiseR" # depends on broken rhdf5-2.13.4
+    "MBmca" # depends on broken nloptr-1.0.4
+    "RareVariantVis" # depends on broken VariantAnnotation-1.15.19
+    "alsace" # depends on broken nloptr-1.0.4
+    "chipPCR" # depends on broken nloptr-1.0.4
+    "clusterSEs" # depends on broken AER-1.2-4
+    "dpcR" # depends on broken nloptr-1.0.4
+    "erma" # depends on broken GenomicFiles-1.5.4
+    "interplot" # depends on broken arm-1.8-5
+    "pcaBootPlot" # depends on broken FactoMineR-1.31.3
+    "ptw" # depends on broken nloptr-1.0.4
+    "spoccutils" # depends on broken spocc-0.3.0
+    "translateSPSS2R" # depends on broken car-2.0-25
   ];
 
   otherOverrides = old: new: {

From 18cff91fb7ebbcd54acfc1f1c6dd3b3ab03489c5 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Wed, 29 Jul 2015 09:01:35 +0200
Subject: [PATCH 0836/2016] R: regenerate CRAN and BIOC packages

Closes https://github.com/NixOS/nixpkgs/pull/9037.
---
 pkgs/development/r-modules/bioc-packages.nix | 230 ++---
 pkgs/development/r-modules/cran-packages.nix | 891 +++++++++++--------
 2 files changed, 627 insertions(+), 494 deletions(-)

diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index 60fad74cbfe..9b609a915aa 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -21,12 +21,12 @@ AffyExpress = derive { name="AffyExpress"; version="1.35.0"; sha256="1ysn3c8mpnq
 AffyRNADegradation = derive { name="AffyRNADegradation"; version="1.15.0"; sha256="0x7mwlzvcxplvijprch0anwbfmj1qkrxqd9rc6f4p0zf88z2csal"; depends=[affy]; };
 AffyTiling = derive { name="AffyTiling"; version="1.27.0"; sha256="1jqil9hd10cwsqdlxjd7c8s0p9fvrfcqxiw8rfrq117c8dlgl7w6"; depends=[affxparser affy preprocessCore]; };
 AgiMicroRna = derive { name="AgiMicroRna"; version="2.19.0"; sha256="1m1fi6pdqwnfn21a4i7psxdg12bn6bhvcsi43bhwlzxzkrz00257"; depends=[affy affycoretools Biobase limma preprocessCore]; };
-AllelicImbalance = derive { name="AllelicImbalance"; version="1.7.17"; sha256="0fgqsdlnch5rh04pnzjypgba2n67j3m2aab2yddl0kf0wsmb8zwg"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges lattice Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
-AnalysisPageServer = derive { name="AnalysisPageServer"; version="1.1.2"; sha256="057xik4hxaqz1f9m8clq504xa4km2byag546iw20v6i0qa9s1dwi"; depends=[Biobase graph log4r rjson]; };
+AllelicImbalance = derive { name="AllelicImbalance"; version="1.7.19"; sha256="09kjl7rka00vqysg13naqqcks5mjygg45yb6z6k1qmbc7xd19ggl"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges lattice Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
+AnalysisPageServer = derive { name="AnalysisPageServer"; version="1.1.3"; sha256="1k07v1flb7zvni6gmmpjrwl5hrs7adfhcjcg58vqj0b3nbij7aa0"; depends=[Biobase graph log4r rjson]; };
 AnnotationDbi = derive { name="AnnotationDbi"; version="1.31.17"; sha256="04xkhqnr9hmgxihfhn35a6s68s8x5layl7mf5whwhwxmlcd76lx4"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; };
-AnnotationForge = derive { name="AnnotationForge"; version="1.11.7"; sha256="00agvwzmnvs8vx2y62x5qd9y09045j74kk9kp69v8m1iqpigs1v0"; depends=[AnnotationDbi Biobase BiocGenerics DBI RSQLite S4Vectors]; };
+AnnotationForge = derive { name="AnnotationForge"; version="1.11.15"; sha256="02z3kxqcn87ykdsxfzs9j0qzpjkb2k79sz89lxrggk24jxk0rr35"; depends=[AnnotationDbi Biobase BiocGenerics DBI RSQLite S4Vectors]; };
 AnnotationFuncs = derive { name="AnnotationFuncs"; version="1.19.0"; sha256="1qjvkbqpyhwibdqv1c4n2z5wjnzx0h3kdas3fs33jhb597bxhl1y"; depends=[AnnotationDbi]; };
-AnnotationHub = derive { name="AnnotationHub"; version="2.1.28"; sha256="055biw0izf0la405igpp22azgharwhr6xfks32lr4dgbh8n70qjd"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; };
+AnnotationHub = derive { name="AnnotationHub"; version="2.1.31"; sha256="1kc60na1k0ycams6sbs9p282z4qs7y409yv60rzszr5k7vfgqbrz"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; };
 ArrayExpress = derive { name="ArrayExpress"; version="1.29.1"; sha256="0gyckxsmmh81ykf7mj952h2a4z58xrf9lbnmv884hz7zj317lf83"; depends=[affy Biobase limma XML]; };
 ArrayExpressHTS = derive { name="ArrayExpressHTS"; version="1.19.0"; sha256="0qyd9jhkvw4lxqjvix28yzdx08hi7vf77ynlqxcl2q1lb3gmbxar"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; };
 ArrayTV = derive { name="ArrayTV"; version="1.7.0"; sha256="11dlq4lmzw0x8z2qrxff6xlcilp95nd71jpdvg3i5yni3ws6z5m1"; depends=[DNAcopy foreach oligoClasses]; };
@@ -41,14 +41,14 @@ BEclear = derive { name="BEclear"; version="1.1.0"; sha256="1icaxkxwr2rkii4fffln
 BGmix = derive { name="BGmix"; version="1.29.0"; sha256="0s2s6ylbw2wvdkn28842ghsflhcmcn156zw3fxmbdnz7xs29qs1f"; depends=[KernSmooth]; };
 BHC = derive { name="BHC"; version="1.21.0"; sha256="0f8qqid4qxw52zjvvm024wcmn0afr7avkr4hr2jfyvs0ga49khx8"; depends=[]; };
 BRAIN = derive { name="BRAIN"; version="1.15.0"; sha256="09yd3xf3h85wdf56p38mnspyqbswl2v8zb81yg0a008p0l5ax8xr"; depends=[Biostrings lattice PolynomF]; };
-BSgenome = derive { name="BSgenome"; version="1.37.3"; sha256="1a0qk3lh2qhynsink8ysc16d4pmam2midakh26adn1hqrf6n22gb"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
+BSgenome = derive { name="BSgenome"; version="1.37.4"; sha256="09vwkl517nnq9krxwyaf70xaqnk3r3ddxdd834pwrhyij7r49sqr"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
 BUS = derive { name="BUS"; version="1.25.0"; sha256="1n3s0pw4ijgh927mahwqybks8i6ysybp7xn4a86nrbpr2kqhznrd"; depends=[infotheo minet]; };
 BaseSpaceR = derive { name="BaseSpaceR"; version="1.13.2"; sha256="17g87vfx6yy4cdqxchl9ig6s2vhnpfbarssw80ha6kbqw81jh55h"; depends=[RCurl RJSONIO]; };
 Basic4Cseq = derive { name="Basic4Cseq"; version="1.5.1"; sha256="0a4b11rv5ilv84qqpvf320c3knaajg4hlby5km0zzms3vbisr4hi"; depends=[Biostrings caTools GenomicAlignments GenomicRanges RCircos]; };
 BayesPeak = derive { name="BayesPeak"; version="1.21.0"; sha256="0mz00mk6gmc5g79iifn5hzfwf7s568n6s6wy46vrnnnnr3sk9w49"; depends=[IRanges]; };
 BeadDataPackR = derive { name="BeadDataPackR"; version="1.21.1"; sha256="16dh7byvigd6161qznd1k9cz9hp0r50nbrd8nqlsh28zr60pvrj3"; depends=[]; };
 BiGGR = derive { name="BiGGR"; version="1.5.0"; sha256="1q9m870pyhxd1627n94c259094k8jyrg22ni26qpnxkapj18lr0b"; depends=[hyperdraw hypergraph LIM rsbml stringr]; };
-BiRewire = derive { name="BiRewire"; version="2.1.2"; sha256="08innw83yr3imrgklva9djjx3a5sd7mqfnb70ggi6hia729kar01"; depends=[igraph slam]; };
+BiRewire = derive { name="BiRewire"; version="2.3.6"; sha256="1i2fn3lfc93gxy3llc6wwviq7pn3d3na556i2fl538ia66asm2ax"; depends=[igraph slam tsne]; };
 BiSeq = derive { name="BiSeq"; version="1.9.2"; sha256="1z401p2y9sa2cs1zwnkvf3968nyv5c7wcbxvldjyl5dg04qw88wn"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; };
 BicARE = derive { name="BicARE"; version="1.27.0"; sha256="19hslc78nijcs6gyxzzcd8856wa1gf5dsrvm4x6r9lprfrk7d7fb"; depends=[Biobase GSEABase multtest]; };
 BioMVCClass = derive { name="BioMVCClass"; version="1.37.0"; sha256="1k4ba98cjaqhy33vsmflnwasi0vxr30dvj6861pz625m87fyp2g6"; depends=[Biobase graph MVCClass Rgraphviz]; };
@@ -58,8 +58,8 @@ Biobase = derive { name="Biobase"; version="2.29.1"; sha256="12cckssh7x4dd8vaapp
 BiocCaseStudies = derive { name="BiocCaseStudies"; version="1.31.0"; sha256="05nj9i9y8clf406bjcflj8lsrp9x9iw6my1bdqnxg3nv2krp37xn"; depends=[Biobase]; };
 BiocCheck = derive { name="BiocCheck"; version="1.5.6"; sha256="0gpmrqvj31n73bqljf23wbsw3hp44hl3z1jhc2q86s3mw6hlcfip"; depends=[BiocInstaller biocViews codetools devtools graph httr knitr optparse]; };
 BiocGenerics = derive { name="BiocGenerics"; version="0.15.3"; sha256="1wk7mr3jmjr2ljqqlmnpvb3x2cflkkhsyjl2cd4ns0gld4rmmm8x"; depends=[]; };
-BiocInstaller = derive { name="BiocInstaller"; version="1.19.8"; sha256="1jmzvs3sv324n9j6j8mrjpc648650k0sv23xni09x55zq41nm672"; depends=[]; };
-BiocParallel = derive { name="BiocParallel"; version="1.3.31"; sha256="0s47gbrj8cs8wpsac14nj2blqwwr2fkg8fsr61fz5v0j21wrk3kd"; depends=[futile_logger snow]; };
+BiocInstaller = derive { name="BiocInstaller"; version="1.19.9"; sha256="14z4wgvry2mbbv847mlns6ff0irwfpyk1yfcxbr27wmlisk14wxz"; depends=[]; };
+BiocParallel = derive { name="BiocParallel"; version="1.3.41"; sha256="1ri738840w5nprmh69k4n6lp5grw688anl6nz4xvczli3dbzampk"; depends=[futile_logger snow]; };
 BiocStyle = derive { name="BiocStyle"; version="1.7.4"; sha256="0wlydy1a3pspnyjg5vl0657z620n5vlhx99hxisskbrsr026mhmg"; depends=[]; };
 Biostrings = derive { name="Biostrings"; version="2.37.2"; sha256="0j6701qgrnphsy9p34sf3s6d91j1zbd824zwv9rsfdmdffbkqq3b"; depends=[BiocGenerics IRanges S4Vectors XVector zlibbioc]; };
 BitSeq = derive { name="BitSeq"; version="1.13.0"; sha256="1d397bcdyi3d35l1q1661spm3xhr7hqlsrjr5a2ybsjs3wqkf4fj"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; };
@@ -73,7 +73,7 @@ BufferedMatrixMethods = derive { name="BufferedMatrixMethods"; version="1.33.0";
 CAFE = derive { name="CAFE"; version="1.5.0"; sha256="1kzy0g0kwvzvlls316cpvwrvnv5m9vklzjjsiiykvfq1wd21s96f"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; };
 CAGEr = derive { name="CAGEr"; version="1.11.0"; sha256="1rz1r55aji1av70c661d7czwipxah9507h5i9hcngy84ic1m72f1"; depends=[beanplot BSgenome data_table GenomicRanges IRanges Rsamtools rtracklayer som VGAM]; };
 CALIB = derive { name="CALIB"; version="1.35.0"; sha256="08fgzq80ws4i6i1ppbqxdq3ba9qfdv4h0dyi08f9k91kfh1y31x4"; depends=[limma]; };
-CAMERA = derive { name="CAMERA"; version="1.25.0"; sha256="1nl5va3f436vwpcirhcpcph13s2vbh8965v8iizi29vk83gbyfza"; depends=[Biobase graph Hmisc igraph RBGL xcms]; };
+CAMERA = derive { name="CAMERA"; version="1.25.1"; sha256="0g8w5g6kr1s039cyvxk3pkw1mbskrij2vlc657bbxvs6pb3h2mrm"; depends=[Biobase graph Hmisc igraph RBGL xcms]; };
 CAnD = derive { name="CAnD"; version="1.1.1"; sha256="1zyp4z86fda83wdhjfdh1ck9ynvdvrrxcvdlgld7h4x295r35r3s"; depends=[ggplot2 reshape]; };
 CFAssay = derive { name="CFAssay"; version="1.3.0"; sha256="04zgyvm0rrs780z1vn4zzrh3w01lnhaywyn5ar6dvxcyxnr2y3qs"; depends=[]; };
 CGEN = derive { name="CGEN"; version="3.3.0"; sha256="03sdyw6z5xw9ndwkwdli7bz6v0ki8w2slx30v5lgm31lqgl4lpf6"; depends=[mvtnorm survival]; };
@@ -97,7 +97,7 @@ COHCAP = derive { name="COHCAP"; version="1.7.0"; sha256="0clr1jh4jnq54phsnl90zf
 COMPASS = derive { name="COMPASS"; version="1.7.2"; sha256="0c83fsrmi7d2888pa3lnln42mlbnjgvpxw337vdh3dar1185a5b0"; depends=[abind clue data_table knitr plyr RColorBrewer Rcpp scales]; };
 CORREP = derive { name="CORREP"; version="1.35.0"; sha256="0hlij2ch8r3lv130hvyshb82lfqz2c7kr56bka1ghmg6jp0xf1n6"; depends=[e1071]; };
 COSNet = derive { name="COSNet"; version="1.3.3"; sha256="0l9sn0cki0mxacxv0bwp3cczcl8rscx8g3lnr0r448f13j8198f4"; depends=[]; };
-CRISPRseek = derive { name="CRISPRseek"; version="1.9.2"; sha256="1h004gznxrm2k3l4xdr6iyn97rkkh8n85phskiink815ysm2l9z4"; depends=[BiocGenerics Biostrings BSgenome seqinr]; };
+CRISPRseek = derive { name="CRISPRseek"; version="1.9.3"; sha256="1k1divchymr19czc9j1l7bjmx8i48wbsxwj5n9l8gvjq1iw170r2"; depends=[BiocGenerics Biostrings BSgenome seqinr]; };
 CRImage = derive { name="CRImage"; version="1.17.0"; sha256="1sab95gngwi7c333n9hnbd9fdvdy9i69pjpx5ic5799s7qr03llw"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; };
 CSAR = derive { name="CSAR"; version="1.21.0"; sha256="1wn7zxmy5ssj2jkk2624j42yv67wdcigp5ksb6fc2kzpgnvqmxl1"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
 CSSP = derive { name="CSSP"; version="1.7.0"; sha256="1ydxj358sfaygzjvh0b042p7gymjyl7nr5cnxrh8c7x2mv2hdh4d"; depends=[]; };
@@ -111,7 +111,7 @@ ChAMP = derive { name="ChAMP"; version="1.7.0"; sha256="0ll50qyq9k8x4bv30dap6g6l
 ChIPQC = derive { name="ChIPQC"; version="1.5.2"; sha256="0g630lpzwfbg5hgicg0s906a3a6gidswmidszx0hmn3479fah74m"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors]; };
 ChIPXpress = derive { name="ChIPXpress"; version="1.11.0"; sha256="11aifr69ss1hakrhba985bwz6k1sqkpzvv7gnzn8cgqnzxyr2i6b"; depends=[affy biganalytics bigmemory Biobase frma GEOquery]; };
 ChIPpeakAnno = derive { name="ChIPpeakAnno"; version="3.3.2"; sha256="0ww3ddnvdc561lhz27h8n3ywi1xpx1cbsqk2i8m5rkpykkkkr2dh"; depends=[AnnotationDbi BiocGenerics BiocInstaller biomaRt Biostrings BSgenome GenomicFeatures GenomicRanges graph IRanges limma multtest RBGL VennDiagram]; };
-ChIPseeker = derive { name="ChIPseeker"; version="1.5.6"; sha256="0ppv51hd44h15mkw15samdq1awsh1kdfy5p87pj60nmvbl0qj39h"; depends=[AnnotationDbi BiocGenerics boot dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gtools IRanges magrittr plotrix plyr RColorBrewer rtracklayer S4Vectors]; };
+ChIPseeker = derive { name="ChIPseeker"; version="1.5.7"; sha256="013di1c8lam36pyn0bcbaynmwwd72gb1zkw6s7p2phvlm2krprv7"; depends=[AnnotationDbi BiocGenerics boot dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix plyr RColorBrewer rtracklayer S4Vectors UpSetR]; };
 ChIPseqR = derive { name="ChIPseqR"; version="1.23.2"; sha256="1k1vbck7kjyzzgm0hg8hxpq6zfg71rca76q3998fcnnlzsmgvcf4"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
 ChIPsim = derive { name="ChIPsim"; version="1.23.1"; sha256="13kniwvwa49n1kc9114ljn1fmzaiyb2nh33if596llql60p7nd23"; depends=[Biostrings IRanges ShortRead XVector]; };
 ChemmineOB = derive { name="ChemmineOB"; version="1.7.1"; sha256="04agfsdzccsvvvis6vy1gg83gfs4nrph950v6bbzgk15ki32rsjz"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
@@ -124,13 +124,13 @@ CoCiteStats = derive { name="CoCiteStats"; version="1.41.0"; sha256="0shp06qy8cv
 CoGAPS = derive { name="CoGAPS"; version="2.3.2"; sha256="0jh5ij66x3isz67mj0jwypyshplk1l1p47n2hvwgq87xmjzv6c8p"; depends=[BH gplots RColorBrewer Rcpp]; };
 CoRegNet = derive { name="CoRegNet"; version="1.5.0"; sha256="14yq1f005fcfmfp88h2fy05gdgbskjws11qbdh0ndx3sf93nzxm2"; depends=[arules igraph shiny]; };
 CompGO = derive { name="CompGO"; version="1.5.0"; sha256="128ib7w0jxba0p32s796i864b73zjfxac56znd0v4wv4vxv3jiv6"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer]; };
-ComplexHeatmap = derive { name="ComplexHeatmap"; version="1.2.2"; sha256="0v1mj0n5gjdarwdrl9ir9gms0f3v0gplx4n34zvyszxivh4ph4jj"; depends=[circlize colorspace dendextend GetoptLong RColorBrewer]; };
+ComplexHeatmap = derive { name="ComplexHeatmap"; version="1.2.5"; sha256="1016saqj8ykm8frwn4lsma1sp9zwlmyw9dd02abhi7bgqwgsd4p3"; depends=[circlize colorspace dendextend GetoptLong RColorBrewer]; };
 ConsensusClusterPlus = derive { name="ConsensusClusterPlus"; version="1.23.0"; sha256="13iikfh234d2z4k487lb3shmnrfijygrf6gz3x481gba2psnbjyw"; depends=[Biobase cluster]; };
 CopyNumber450k = derive { name="CopyNumber450k"; version="1.5.0"; sha256="0mjhmh4shgckv43zvg4yqr17jfi9p9xnc40fwy9fw9c4vjcfsvsj"; depends=[Biobase BiocGenerics DNAcopy minfi preprocessCore]; };
-CopywriteR = derive { name="CopywriteR"; version="2.1.2"; sha256="0lja77qdfbsl9cc1nv4jbrjwiq8bb93ja6na8hqksrrm9g1qs4q4"; depends=[BiocParallel chipseq data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
+CopywriteR = derive { name="CopywriteR"; version="2.1.3"; sha256="0qhl3lbdf9fsm6hx45sk2nihikbzh08lbnwaz1as3wf5cx7zm08c"; depends=[BiocParallel chipseq data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
 CorMut = derive { name="CorMut"; version="1.11.0"; sha256="0s92bh3610frxbm0gqvlznay70dy7x61hvc0qgh6xmcyz0llx27g"; depends=[igraph seqinr]; };
 Cormotif = derive { name="Cormotif"; version="1.15.0"; sha256="1v36ylwkxr6yqasckmmj2dkr7s72f39srhwvm93rs1rl7kw4dc4p"; depends=[affy limma]; };
-CoverageView = derive { name="CoverageView"; version="1.5.1"; sha256="0qi8r6vw5c6kmlw12j81jmgn555wd51w80m80gm5n7hqnggpwkh4"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
+CoverageView = derive { name="CoverageView"; version="1.5.2"; sha256="1bxx35h9d7gwm5m16i4hkf54zghij95jfxxc46x83glccsirah2f"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
 DART = derive { name="DART"; version="1.17.1"; sha256="1z7lf4d9yjcyikq9j3348z5sxjqaly46c0ls7f9cl8nnqdpw7w42"; depends=[igraph]; };
 DASiR = derive { name="DASiR"; version="1.9.0"; sha256="0b3b7kmhsd6bb1s57c89h495j1ax6779wfca112fq6ba3z4dih3n"; depends=[Biostrings GenomicRanges IRanges XML]; };
 DAVIDQuery = derive { name="DAVIDQuery"; version="1.29.0"; sha256="0gvm6qjx8y61nbnbz66md74pfc4awj4900pjr8q1m5sip5yzbxj2"; depends=[RCurl]; };
@@ -141,17 +141,18 @@ DEGraph = derive { name="DEGraph"; version="1.21.0"; sha256="17f04qngcx8y4glr5wi
 DEGreport = derive { name="DEGreport"; version="1.4.0"; sha256="06l803iy18kkv05b4h46vmzws20c0735m6csfkn2vp3bik8xh4lp"; depends=[coda edgeR ggplot2 Nozzle_R1 plyr quantreg]; };
 DEGseq = derive { name="DEGseq"; version="1.23.0"; sha256="0993f140wwv9z9l53f9g74x7l28bflxq7wdcbilfz7ijhh7isr7p"; depends=[qvalue samr]; };
 DESeq = derive { name="DESeq"; version="1.21.0"; sha256="13f6phdf9g325dlpn38l7zrq3mzldhldil134acxi9p3l50bx23y"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; };
-DESeq2 = derive { name="DESeq2"; version="1.9.21"; sha256="0ywhakri35cz37zlwv760zgmk1z9ldivl0i24mawavccc0hcvrhk"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
+DESeq2 = derive { name="DESeq2"; version="1.9.26"; sha256="0b7w0csg7q5nqbrmc83rviiwhahq88zlqmxwlkz5g01w9zzkgc80"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
 DEXSeq = derive { name="DEXSeq"; version="1.15.9"; sha256="0ml4ibzhw38w0mfp0vdbbkisz40rw65yyd71q3ppj7jg4r4ch39a"; depends=[Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools statmod stringr]; };
 DFP = derive { name="DFP"; version="1.27.0"; sha256="0xcipbhfzvrpbm6dh2y3lbvfbwpn4wly32sssfm702zik5wm9dy1"; depends=[Biobase]; };
 DMRcaller = derive { name="DMRcaller"; version="1.1.1"; sha256="1g7q7cwivvb0m2y4fixvbxp51zfag1jv66bdlai3gawr94pcx56y"; depends=[GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; };
-DMRcate = derive { name="DMRcate"; version="1.5.0"; sha256="12q6if9lljia37zwhcc9fpcp9vhkp1qhzchpypwwyn2j4344bmp3"; depends=[limma minfi]; };
+DMRcate = derive { name="DMRcate"; version="1.5.61"; sha256="0ss8zk2b1y83q49pv9fdm2rqw5hlnd189knfg1y8y0psfjhc9knp"; depends=[limma minfi]; };
 DMRforPairs = derive { name="DMRforPairs"; version="1.5.0"; sha256="0d14qgx07xq7wa687a2znpfw0zcg8ccvxjawkjdbi6ayjwpb6zd7"; depends=[GenomicRanges Gviz R2HTML]; };
 DNAcopy = derive { name="DNAcopy"; version="1.43.0"; sha256="1v1i4bfkblimdmazv29csqr46jaiv8lncihgywvq5wfn8ccr7xl9"; depends=[]; };
 DOQTL = derive { name="DOQTL"; version="1.3.0"; sha256="0g3nyamqdhjg8105kcq6nsgjgqzcxkp04194j82v1xb31baj53bg"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt corpcor GenomicRanges hwriter IRanges mclust QTLRel Rsamtools RUnit S4Vectors XML]; };
-DOSE = derive { name="DOSE"; version="2.7.9"; sha256="0l0rkd7siz251pxgmfv4ijq1l68w3lkjlc83zmhf4ddjf3db07ig"; depends=[AnnotationDbi ggplot2 GOSemSim igraph plyr qvalue reshape2 scales]; };
-DSS = derive { name="DSS"; version="2.7.2"; sha256="01czzgkx6rqpps93vfn8dg2n2hm2nkd887mc955z67845jkrgi2j"; depends=[Biobase bsseq]; };
+DOSE = derive { name="DOSE"; version="2.7.10"; sha256="093gyplk5ylwndynlcvm8s44ra8b6i6xrkqswc7zprndkawc4bgp"; depends=[AnnotationDbi ggplot2 GOSemSim igraph plyr qvalue reshape2 scales]; };
+DSS = derive { name="DSS"; version="2.8.1"; sha256="0nhrq05b5rsfdcxc96pdsppnfwz106k7xdxccgr0xjypbhm01hsk"; depends=[Biobase bsseq]; };
 DTA = derive { name="DTA"; version="2.15.0"; sha256="0amibwj5mnm2plkf3ys8sgy4lpwr60fnvika0psdrahgb4blmkzp"; depends=[LSD scatterplot3d]; };
+DeMAND = derive { name="DeMAND"; version="0.99.9"; sha256="013zwa4flbsf9rwlnbzhg1sgfqwvrr01v9bhgpk73kx312zg30sg"; depends=[KernSmooth]; };
 DeconRNASeq = derive { name="DeconRNASeq"; version="1.11.0"; sha256="0665chwpbs2pw753nb2x65cs9r9ghb5123bsrzrv6pz2p3ni8yz7"; depends=[ggplot2 limSolve pcaMethods]; };
 DiffBind = derive { name="DiffBind"; version="1.15.3"; sha256="1akx65vi8razwpfxnvilh4x1vb8qbsfr2q8lygsb3imfrrb83q44"; depends=[amap edgeR GenomicAlignments GenomicRanges gplots IRanges lattice limma locfit RColorBrewer Rsamtools SummarizedExperiment systemPipeR zlibbioc]; };
 DirichletMultinomial = derive { name="DirichletMultinomial"; version="1.11.2"; sha256="01wmvs7alq7gy1nmb5gdbglfs51qdhwysbmmjvh7yyhb8dqbvrj4"; depends=[IRanges S4Vectors]; };
@@ -159,8 +160,8 @@ DriverNet = derive { name="DriverNet"; version="1.9.0"; sha256="0visiafw9m7i0yy7
 DrugVsDisease = derive { name="DrugVsDisease"; version="2.9.0"; sha256="1wmw1r0x7kkmp47743aq0pp71wamnf5gsk6bhz6rdvswzb12iyqk"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt GEOquery limma qvalue RUnit xtable]; };
 DupChecker = derive { name="DupChecker"; version="1.7.0"; sha256="02wwwnx3w8rxiassd62xr295paw8py9pqsk1396qb5k773l6bfxv"; depends=[R_utils RCurl]; };
 DynDoc = derive { name="DynDoc"; version="1.47.0"; sha256="0gpmhqav4dx8p86pkh18fpmlki60zqaz00m2zhziiawigbrz41ph"; depends=[]; };
-EBImage = derive { name="EBImage"; version="4.11.5"; sha256="15npg7r76avlxq036yis85b91bgl10y4wjjcdnrcn39dbvb50zav"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; };
-EBSeq = derive { name="EBSeq"; version="1.9.2"; sha256="0n3y9ikamcfm786fvqp5b2b4g2fx8hvnicsx1sh4rvrpyab9f5jm"; depends=[blockmodeling gplots]; };
+EBImage = derive { name="EBImage"; version="4.11.7"; sha256="1zddydckv3zy8wf0wh34g5yg8s1p255h66ym6lnw3l5id7v32wz8"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; };
+EBSeq = derive { name="EBSeq"; version="1.9.3"; sha256="1xqh6zjip9y0s34hxvvxvvbvadmlv84s02vvq6s63gmaf3ra51b3"; depends=[blockmodeling gplots]; };
 EBSeqHMM = derive { name="EBSeqHMM"; version="1.3.1"; sha256="0lyf363f1wfgacrj5cyq8n3f3ssl5q400mn2q94cpai6k0qmvgs1"; depends=[EBSeq]; };
 EBarrays = derive { name="EBarrays"; version="2.33.0"; sha256="1zvfqf49chiks5vmj5ki89pvy14bm1cman47n3ybba1gg8z8mw94"; depends=[Biobase cluster lattice]; };
 EBcoexpress = derive { name="EBcoexpress"; version="1.13.0"; sha256="0fl0a7xasqcwvjlgf3h51akyhwpras2865m2idz1nmacm42q1w79"; depends=[EBarrays mclust minqa]; };
@@ -168,12 +169,12 @@ EDASeq = derive { name="EDASeq"; version="2.3.2"; sha256="0l1mmpy71pqqmqnx4xxn1v
 EDDA = derive { name="EDDA"; version="1.7.0"; sha256="0dyyhnc9v232njqnrcaq78g2m1qws30qcf6bsswq2di235ymk2g0"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; };
 ELBOW = derive { name="ELBOW"; version="1.5.0"; sha256="0lnc5hw2x4p9yd561w9dwplf7q2slcaghxsh5796bmyxjxhxanpy"; depends=[]; };
 ELMER = derive { name="ELMER"; version="1.00.0"; sha256="1kb7rixq02cc0cwm52acji69p89jq07zsagg7a8qva6gshs94k86"; depends=[GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra IRanges minfi reshape S4Vectors]; };
-EMDomics = derive { name="EMDomics"; version="1.1.0"; sha256="1i2dy2vqig0lkd13xy4yfwq58zyjiqavpmcvg6pvkh2l48ap1jds"; depends=[BiocParallel emdist ggplot2 matrixStats]; };
+EMDomics = derive { name="EMDomics"; version="1.1.1"; sha256="1a74f1ip4i8a5msdwnas5wbqhzkww1j2wr2qp0qnxcrn01mw93pg"; depends=[BiocParallel emdist ggplot2 matrixStats]; };
 ENCODExplorer = derive { name="ENCODExplorer"; version="1.1.3"; sha256="054cm1ldas26gv4xn16w3i25kykwnikj4s83g7sxxdij93m5rmlb"; depends=[jsonlite RSQLite]; };
 ENVISIONQuery = derive { name="ENVISIONQuery"; version="1.17.0"; sha256="1dnlw62hwysij63yc856c2sncgfwdq0rpmcds6i6wigdcfd21w8q"; depends=[rJava XML]; };
-ENmix = derive { name="ENmix"; version="1.1.6"; sha256="069dniqyg0pljbwnl24bv5kfdh5v2j9vbvyxc127ag1isggh9m7b"; depends=[Biobase doParallel foreach geneplotter impute MASS minfi preprocessCore sva wateRmelon]; };
+ENmix = derive { name="ENmix"; version="1.1.7"; sha256="0p5ywjnm0xknr6k7bnkhcn69870f5wwlq70yfqiah7syqmyim67d"; depends=[Biobase doParallel foreach geneplotter impute MASS minfi preprocessCore sva wateRmelon]; };
 EasyqpcR = derive { name="EasyqpcR"; version="1.11.1"; sha256="0s2jyg6b14wbyl0c1n89c7bi7p88g7s1rz8d830p9hh2x75ly6zj"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; };
-EnrichmentBrowser = derive { name="EnrichmentBrowser"; version="1.3.0"; sha256="1a6w3drh5x20wvxpx1cb5q2h9k6jh65v9hh81924lcp4baplpx31"; depends=[Biobase graph KEGGgraph KEGGREST limma MASS mixtools neaGUI qvalue RColorBrewer Rgraphviz safe SPIA stringr]; };
+EnrichmentBrowser = derive { name="EnrichmentBrowser"; version="1.99.6"; sha256="17xchpf0ddxihz6p0lm0nhhyrbaahcar1phl842b30ccv877ibrs"; depends=[AnnotationDbi Biobase biocGraph biomaRt ComplexHeatmap DESeq2 EDASeq edgeR geneplotter graph GSEABase hwriter KEGGgraph KEGGREST limma MASS mixtools neaGUI npGSEA PathNet pathview ReportingTools Rgraphviz S4Vectors safe SPIA stringr SummarizedExperiment topGO]; };
 ExiMiR = derive { name="ExiMiR"; version="2.11.0"; sha256="1gmfrn3jq4pz5wmijywhxr0kx79534fhrfnqyhjmqq3s9sjn2cbh"; depends=[affy affyio Biobase limma preprocessCore]; };
 ExpressionView = derive { name="ExpressionView"; version="1.21.0"; sha256="026w9f119j26c1078nwg4rhfc54wlb3i56iy8bi0cjpvbm4p698f"; depends=[AnnotationDbi bitops caTools eisa isa2]; };
 FEM = derive { name="FEM"; version="2.3.0"; sha256="112mmah33ar36cpqjwanrfyhdwjfympnvmxwirxbbnk0nfp9cvpr"; depends=[AnnotationDbi corrplot igraph impute limma marray Matrix]; };
@@ -182,12 +183,12 @@ FISHalyseR = derive { name="FISHalyseR"; version="1.3.0"; sha256="0xnmww7ldyxghq
 FRGEpistasis = derive { name="FRGEpistasis"; version="1.5.0"; sha256="1vvcphgirvghzjvic5yq6nl229ryc0y4kp5qd25kgspbcgblg01q"; depends=[fda MASS]; };
 FlowRepositoryR = derive { name="FlowRepositoryR"; version="1.1.1"; sha256="1xxljbdbvxg1dbm82r86frw2bskmfrl6rv98xz0z4jfc0w4ag3pd"; depends=[RCurl XML]; };
 FlowSOM = derive { name="FlowSOM"; version="1.1.0"; sha256="0k5pw46dbhm6nssr5szj251v3479xgky2iipihrdvp5lr5lhxilq"; depends=[BiocGenerics ConsensusClusterPlus flowCore igraph tsne]; };
-FourCSeq = derive { name="FourCSeq"; version="1.3.4"; sha256="1csxfr23b3g1k54h4ksnhg7c7d6aw28v32lrrqyq7x7xls9cx2lg"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; };
+FourCSeq = derive { name="FourCSeq"; version="1.3.5"; sha256="1mjvgi1cbfi5brl7l0v8026hjjksh81kpslm6w6i6b1llcn1sf65"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; };
 FunciSNP = derive { name="FunciSNP"; version="1.11.0"; sha256="19kl14yzqr59ngrd5ygr858zbvx23rihlr4vw5bfdy9cgwlvlzab"; depends=[AnnotationDbi ChIPpeakAnno GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer scales snpStats VariantAnnotation]; };
 GENE_E = derive { name="GENE.E"; version="1.9.0"; sha256="10c9mw9f619z2ai43qvagj7p1lsqpv90z8vzsyyxym614lvlqfzm"; depends=[RCurl rhdf5]; };
 GENESIS = derive { name="GENESIS"; version="1.1.0"; sha256="01d3yc5rc4y22znr7zf980m458qvnmjxpml353k7bkwyz6xyn0fj"; depends=[GWASTools]; };
 GEOmetadb = derive { name="GEOmetadb"; version="1.29.0"; sha256="1s9x3dbh61xisk5hwzqv3991savygdcwv5cww447w4bfgwffzplg"; depends=[GEOquery RSQLite]; };
-GEOquery = derive { name="GEOquery"; version="2.35.4"; sha256="1ny592c1s36a1hkgaqqyss65c190bw5612l23qc9y9qhf4sarq38"; depends=[Biobase RCurl XML]; };
+GEOquery = derive { name="GEOquery"; version="2.35.5"; sha256="0c1jyvl5sm0yjlk4ji8qjwxm4rqakmjz04aq6m8biyf04cdd2crk"; depends=[Biobase RCurl XML]; };
 GEOsubmission = derive { name="GEOsubmission"; version="1.21.0"; sha256="1rr8k4myw7jibibclphj63hp4byk3v0cg37vnyc5b0iacdp8s9gn"; depends=[affy Biobase]; };
 GEWIST = derive { name="GEWIST"; version="1.13.0"; sha256="1mlzyjggv0rh9xk9pifshhdri3vapvzk2h47g75wx57yfapamcwn"; depends=[car]; };
 GGBase = derive { name="GGBase"; version="3.31.2"; sha256="0xbkj7dr7xaq3pj4jph5ii78c4ax5b0p6jqmvkv2hr3j70qk3mh2"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; };
@@ -201,14 +202,14 @@ GOexpress = derive { name="GOexpress"; version="1.3.2"; sha256="151hqhyjaq3ggigi
 GOstats = derive { name="GOstats"; version="2.35.1"; sha256="1almz6gc2xm3njz8pjvynpnniz7xdd8z5293cfvx91v11lz70v7f"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category graph RBGL]; };
 GOsummaries = derive { name="GOsummaries"; version="2.3.0"; sha256="09c4grz9ljwrz37yv9k6gna9zxk708vxfz2190xz7za0mrql1k3k"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; };
 GRENITS = derive { name="GRENITS"; version="1.21.0"; sha256="1lm0074dw0248vyj9wl99if489dx38ia8wscx61842jyi4qz7r2q"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
-GSAR = derive { name="GSAR"; version="1.3.2"; sha256="0fqv6lwi94ibwjjv6g0qmc8plc0ghszvjpd73m88080jiaw44yfl"; depends=[igraph]; };
+GSAR = derive { name="GSAR"; version="1.3.4"; sha256="1hgakyl4ply01m77ffy2vjflwzn5iqnfbsp4a4smi762innm5f3z"; depends=[igraph]; };
 GSCA = derive { name="GSCA"; version="1.7.0"; sha256="1hv9r59fx1hbjnga26shb8crxji1bzmzjmwfbk1wrlm8dsikjnyg"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; };
 GSEABase = derive { name="GSEABase"; version="1.31.3"; sha256="1jq3s3pha624gns7d7yf8qqgzq0fm3qgjrkwdkxgbpc7b09baiz0"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; };
 GSEAlm = derive { name="GSEAlm"; version="1.29.0"; sha256="13ixp6vq9g9ag5rndc40gw64vny70zcj6lll7r7vz06p5i9b6kyk"; depends=[Biobase]; };
 GSRI = derive { name="GSRI"; version="2.17.0"; sha256="158dipqi9mh79d42pv5qsa1gwxz660kl474rdnkd59rnxh7ziyf3"; depends=[Biobase fdrtool genefilter GSEABase les]; };
 GSReg = derive { name="GSReg"; version="1.3.0"; sha256="07s60j68i1r64y8x8r1r9s6w020n41137cf2aj9hrsw6gn4ajh15"; depends=[]; };
 GSVA = derive { name="GSVA"; version="1.17.0"; sha256="0rk1srk95qia5ap69c2lysgv7r8qh50f50v9b569d2v2vjb0hpq5"; depends=[Biobase BiocGenerics GSEABase]; };
-GWASTools = derive { name="GWASTools"; version="1.15.12"; sha256="04k5grfbrcpwnxxpirzb7x9488q8sq19lg00yn4mhpr7y1znrmpc"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf ncdf quantsmooth RSQLite sandwich survival]; };
+GWASTools = derive { name="GWASTools"; version="1.15.14"; sha256="1ir5czbs3z9myq8659xc15i61bk0yifwcdycbgzmfd9frf9mw8ji"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf ncdf quantsmooth RSQLite sandwich survival]; };
 GeneAnswers = derive { name="GeneAnswers"; version="2.11.1"; sha256="15rf8syxhj3332d7f4jkvyby05r3iia7p1ryz1zv629waz6mr4nh"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; };
 GeneExpressionSignature = derive { name="GeneExpressionSignature"; version="1.15.0"; sha256="0wni584412af8a2wzk5r8nf63grw86d6fk74cmwksirw2734mmqs"; depends=[Biobase PGSEA]; };
 GeneGA = derive { name="GeneGA"; version="1.19.0"; sha256="0irfr4q55rda8acchgcqsksh6ija87fryj822nb3d4zklv9raqfv"; depends=[hash seqinr]; };
@@ -222,23 +223,23 @@ GeneticsDesign = derive { name="GeneticsDesign"; version="1.37.0"; sha256="08awf
 GeneticsPed = derive { name="GeneticsPed"; version="1.31.0"; sha256="17fs4gvirji3qp9ik480jpz6qrbq209sjhn57ipkaafvx7rw5j4i"; depends=[gdata genetics MASS]; };
 GenoView = derive { name="GenoView"; version="1.3.0"; sha256="09k9xjmx3qmsfr3a4vrfgs73r0xsymf5m4gl0zjjk4cnfk7bs41v"; depends=[biovizBase GenomicRanges ggbio ggplot2 gridExtra]; };
 GenomeGraphs = derive { name="GenomeGraphs"; version="1.29.0"; sha256="0kl2gapg7hnl4zfsamb3vwmj7z0vag7vd8viwh0pwqj0pd45dswa"; depends=[biomaRt]; };
-GenomeInfoDb = derive { name="GenomeInfoDb"; version="1.5.8"; sha256="0kdz1mkn3ljwxcz6v0np7gbb7b7sqxfj80sxrah3bnck2bzg1yra"; depends=[BiocGenerics IRanges S4Vectors]; };
-GenomicAlignments = derive { name="GenomicAlignments"; version="1.5.11"; sha256="1w4wmxcyj0ja9nkn35n5qhhax0b7sh4pjxk2hib71323y80mxlld"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
+GenomeInfoDb = derive { name="GenomeInfoDb"; version="1.5.9"; sha256="1mnskpj4qb6fyg7a6qkzs6cmxzn0bjff0zzgnp17bm94vx0334zh"; depends=[BiocGenerics IRanges S4Vectors]; };
+GenomicAlignments = derive { name="GenomicAlignments"; version="1.5.12"; sha256="0p1vnkh5h8w69is254zkzpj5y2a9c2yc2s7lvqhkf861x6fgkz1l"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
 GenomicFeatures = derive { name="GenomicFeatures"; version="1.21.13"; sha256="1swk94rqpvfysr3x1r61ypq9vlw1ryc0iw0x6dazfjjchaln0h07"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors]; };
 GenomicFiles = derive { name="GenomicFiles"; version="1.5.4"; sha256="13lglgxkqsxgi453dk56ry7amnv6lyddy74fnhhsqinj5ip9k3vw"; depends=[BiocGenerics BiocParallel GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
-GenomicInteractions = derive { name="GenomicInteractions"; version="1.3.4"; sha256="1dh9l0abwfc9dkznvpnzsxlggifvh8zfcmb22mc36lnkq42r033d"; depends=[BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra igraph IRanges plotrix Rsamtools rtracklayer S4Vectors stringr]; };
-GenomicRanges = derive { name="GenomicRanges"; version="1.21.16"; sha256="11s14ikk2pj3hycanyjv6s1pild3987gfvf4vnzm6a6ilmqsyqzy"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
+GenomicInteractions = derive { name="GenomicInteractions"; version="1.3.6"; sha256="0003hd22c3nfdb5h84pvd754gcpj3b6flzg8nhf7d0s99nzddr6a"; depends=[BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph IRanges Rsamtools rtracklayer S4Vectors stringr]; };
+GenomicRanges = derive { name="GenomicRanges"; version="1.21.17"; sha256="1hp2knf1qnph62480hzmn68lxp193x4zv3b0yx2a7khj4sgy7566"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
 GenomicTuples = derive { name="GenomicTuples"; version="1.3.1"; sha256="0i91qs1c84lyh0irhgnbnnvag0j3f48gfxxndk5x0yjf9kpa0hca"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
 Genominator = derive { name="Genominator"; version="1.23.0"; sha256="03pacbd3d5q7ykrflg258zcf8yfzm8kc976aw3d38q7agkia69h2"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; };
 GlobalAncova = derive { name="GlobalAncova"; version="3.37.0"; sha256="1j35r39plsxlkla2bv7wvg0if5gs2mfy71g6zb65g6ml5cqws45r"; depends=[annotate AnnotationDbi corpcor globaltest]; };
-GoogleGenomics = derive { name="GoogleGenomics"; version="1.1.1"; sha256="06mcg36x41k9s9ick6y3vrg5r4fnkz5qb77a7dh7kk2skinvzips"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; };
+GoogleGenomics = derive { name="GoogleGenomics"; version="1.1.3"; sha256="1y5jkxhrfi5gkckfmilqsshv5l5ql25iwpmqbr5slch1h4myskbl"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; };
 GraphAT = derive { name="GraphAT"; version="1.41.0"; sha256="1mjd54zy4l7ivy347zn5rv6gn65sjhxn2cxm417fm83hm542327l"; depends=[graph MCMCpack]; };
 GraphAlignment = derive { name="GraphAlignment"; version="1.33.0"; sha256="14zxbw8cj12wr6c2a0a6mfskr9sqf6cdfyz0ccbzy91d1lnrxzdf"; depends=[]; };
 GraphPAC = derive { name="GraphPAC"; version="1.11.0"; sha256="1p0rkc1qz0yf0lxyjfvrpd7nqky855kmhb1pdwxg3ckifnypw5mc"; depends=[igraph iPAC RMallow TSP]; };
 GreyListChIP = derive { name="GreyListChIP"; version="1.1.1"; sha256="0kbl9m37aiyv6yrqg4z352k7dpdpxm7yywymjfa9gdd0rv1cy401"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer]; };
 Gviz = derive { name="Gviz"; version="1.13.3"; sha256="0qbad4r0k7j1z4gg785iv57azp9ljlxv5jngnk9kfif05rd3k7v3"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; };
 HCsnip = derive { name="HCsnip"; version="1.9.0"; sha256="14f881v776xn8lw4lvjc26s72laxs9zph902875f76ykbzygayd9"; depends=[Biobase clusterRepro coin fpc impute randomForestSRC sigaR sm survival]; };
-HDTD = derive { name="HDTD"; version="1.3.2"; sha256="19kzd1sjl0riwisdbrsy9j2pd39lpxwmizrnnj65hrfv6dwaqsgq"; depends=[]; };
+HDTD = derive { name="HDTD"; version="1.3.3"; sha256="0b9z2bkfislxn9w5bjcd5jcpby2yq5bhn6zxvylngjwqz98v30hl"; depends=[]; };
 HELP = derive { name="HELP"; version="1.27.0"; sha256="1n2fj316ha2l941biyr9d56pry6n39drwa820rgyrwd116rzx79d"; depends=[Biobase]; };
 HEM = derive { name="HEM"; version="1.41.0"; sha256="0qi6q305p0vdhyah3860dpd3z0lyyn6wn5x0m3mj3p739pk288ik"; depends=[Biobase]; };
 HIBAG = derive { name="HIBAG"; version="1.5.0"; sha256="0rrpz4brij408szfmzv7gpk0hrhikjyx061gkamb02ry1my722j1"; depends=[]; };
@@ -250,22 +251,23 @@ HTqPCR = derive { name="HTqPCR"; version="1.23.0"; sha256="0zp7jbnh5zbrqaq84q114
 Harshlight = derive { name="Harshlight"; version="1.41.0"; sha256="12wpfg785dfn5gwp014dfzk9x8zqvr9qrrs0pq32by576knida5z"; depends=[affy altcdfenvs Biobase]; };
 Heatplus = derive { name="Heatplus"; version="2.15.1"; sha256="1jcrajxvll0hhrsq8qvvyc1sj1nd3dm06n8q25qi9nacnfi865y7"; depends=[]; };
 HiTC = derive { name="HiTC"; version="1.13.2"; sha256="1bkd680n81cd7sdji6gjjljxhlbsrdgn5hwpmi37i83hnryfgf5x"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; };
+HilbertCurve = derive { name="HilbertCurve"; version="0.99.1"; sha256="0nws4y2nc726z6igj3fdkrpv9l4i694g17nz3z1r006ss78gzzf2"; depends=[GenomicRanges HilbertVis IRanges png]; };
 HilbertVis = derive { name="HilbertVis"; version="1.27.0"; sha256="1qcyzn86v0xhb9zc1vcia1n53i33sgncbb7lpink5llmjpalacq6"; depends=[lattice]; };
 HilbertVisGUI = derive { name="HilbertVisGUI"; version="1.27.0"; sha256="03jxn398xv97mmvbpl0qymmydhm4i4c36qnw4s22ch7wy3h9x6h8"; depends=[HilbertVis]; };
 HybridMTest = derive { name="HybridMTest"; version="1.13.0"; sha256="0r4j8yllxzwn5r2rvpkqx6w23836lmly8wlshib6p917ky0djw4s"; depends=[Biobase fdrtool MASS survival]; };
 IMPCdata = derive { name="IMPCdata"; version="1.3.0"; sha256="003qvf47bcfcwxkw7zpzdvpnw7xhd2y12n9by2b1ns5i5jka754b"; depends=[rjson]; };
 INPower = derive { name="INPower"; version="1.5.0"; sha256="0msz24bixp7b5a83n40675xq8fglrhbg8972a93x2k8jgb5gdh38"; depends=[mvtnorm]; };
 INSPEcT = derive { name="INSPEcT"; version="0.99.8"; sha256="0pzh0xkh4py6rwnjqz4wqfnk2h08dp5q9gc4cgxls6gl3574i9ny"; depends=[Biobase BiocParallel deSolve GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve]; };
-IONiseR = derive { name="IONiseR"; version="0.99.6"; sha256="1fzp7ncznqw7pmb4sh1qphrk0ham1158q71kiylggbm88wlisky3"; depends=[BiocGenerics Biostrings data_table dplyr ggplot2 magrittr rhdf5 ShortRead tidyr XVector]; };
+IONiseR = derive { name="IONiseR"; version="0.99.7"; sha256="0b4lxdhajd4mhdnfa8c3zm8n5s398arrxjig2bv6il933lhxi6ps"; depends=[BiocGenerics Biostrings data_table dplyr ggplot2 magrittr rhdf5 ShortRead tidyr XVector]; };
 IPPD = derive { name="IPPD"; version="1.17.0"; sha256="0afhz5ishr1my9gnksa4dl92lfnb2fnvdpsh3n7kj4j2s8xx0crc"; depends=[bitops digest MASS Matrix XML]; };
-IRanges = derive { name="IRanges"; version="2.3.14"; sha256="0pg6zbdhhpk7h64nma9zrdjxvfk2nwad9b9x8y1qnkki8917a1xd"; depends=[BiocGenerics S4Vectors]; };
+IRanges = derive { name="IRanges"; version="2.3.15"; sha256="0pvhvhsvqglym4ncg2aa0fbmrw32nj0givpippv43p9cywhglklw"; depends=[BiocGenerics S4Vectors]; };
 ITALICS = derive { name="ITALICS"; version="2.29.0"; sha256="16l0wq7bxi3nz8f5hggnzddhg07vrcca480ygvmi03cxajxbjr9h"; depends=[affxparser DBI GLAD oligo oligoClasses]; };
 IVAS = derive { name="IVAS"; version="1.1.0"; sha256="15jnmi40bsnyf5yw86gvqppv0g8250lsi74gsjzhm7gijhlxfnrm"; depends=[AnnotationDbi BiocGenerics doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges lme4 Matrix S4Vectors]; };
 Icens = derive { name="Icens"; version="1.41.0"; sha256="1vi2hnzs8z5prggswa6wzr2y53jczkgg09f4vw0pjzkzi7p8bphy"; depends=[survival]; };
 IdMappingAnalysis = derive { name="IdMappingAnalysis"; version="1.13.0"; sha256="1kwalcvb7cxkg89kz5hpk0cvsfzxz5g2cbiflrs2dyaxx96pm5gm"; depends=[Biobase boot mclust R_oo rChoiceDialogs RColorBrewer]; };
 IdMappingRetrieval = derive { name="IdMappingRetrieval"; version="1.17.0"; sha256="0fclrkv53q9aq3xw95k25rw52sjzy40r37kajnrk0kc41cyzf2vv"; depends=[AffyCompatible biomaRt DAVIDQuery ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; };
 IdeoViz = derive { name="IdeoViz"; version="1.3.0"; sha256="1ynqg2a0jq23mlqzgf7k05jc2nkby8hkbc6h0p76ms33fwqj2qxz"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; };
-InPAS = derive { name="InPAS"; version="1.1.3"; sha256="1fyhrf1n7hb34l742d3jrjyyznhjvf6z8bdmjawsqr10dvk1j2mv"; depends=[AnnotationDbi BiocParallel BSgenome cleanUpdTSeq GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma S4Vectors seqinr]; };
+InPAS = derive { name="InPAS"; version="1.1.5"; sha256="1s9jx90r7g9v9ipnnld2kdrbhyjl0vdwbgism6ab2hbpdxc33w7k"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; };
 IsoGeneGUI = derive { name="IsoGeneGUI"; version="2.5.0"; sha256="05k6qdnsr2aywdmhdlimx5axrk07mf14rvia10afhf56380sdf3s"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust orQA RColorBrewer Rcpp relimp tkrplot xlsx]; };
 KCsmart = derive { name="KCsmart"; version="2.27.0"; sha256="1igsmg1l39yladz4dlc9j01nxkwfaciy575d7k6764jhrs6pv39m"; depends=[BiocGenerics KernSmooth multtest siggenes]; };
 KEGGREST = derive { name="KEGGREST"; version="1.9.0"; sha256="0ms60slsf7lpw0yidpy47hyxi7cm9r0gyb0q6ajxv52vn9diz29v"; depends=[Biostrings httr png]; };
@@ -277,6 +279,7 @@ LMGene = derive { name="LMGene"; version="2.25.0"; sha256="17djx1fkjxpmmp56vphcb
 LPE = derive { name="LPE"; version="1.43.0"; sha256="13z3h3mabbwhb5p40a7hil0aq10mya1zqgb8qj2qwnc50sbmgjx2"; depends=[]; };
 LPEadj = derive { name="LPEadj"; version="1.29.0"; sha256="1734ihzvid5bz2wyh7yskk7agd82xmw7dibzb7aivhcfyxs8g8p4"; depends=[LPE]; };
 LVSmiRNA = derive { name="LVSmiRNA"; version="1.19.0"; sha256="1z74y8zbg5amsmslb309gi630v8qa1qqgj37214bv5g9ab8xajmj"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; };
+LedPred = derive { name="LedPred"; version="1.0.0"; sha256="1wglgnl5y61g4jcqfgnf3gqvmfpdvcb6h43n44cv46icybdk0bzs"; depends=[akima e1071 GenomicRanges irr jsonlite plot3D plyr RCurl ROCR testthat]; };
 LiquidAssociation = derive { name="LiquidAssociation"; version="1.23.0"; sha256="178gx8n0ga1ppjk368xacidms1rc2kn301fmdc8rwbcknwvxrwck"; depends=[Biobase geepack]; };
 LowMACA = derive { name="LowMACA"; version="1.1.0"; sha256="0i0pka0jf1yq7vjw1kb9sd2p21gpy4pw855ap815k02i0n7jyny4"; depends=[Biostrings cgdsr data_table motifStack RColorBrewer reshape2 stringr]; };
 M3D = derive { name="M3D"; version="1.3.5"; sha256="1pjfl0kdhzw9l59qzgxjkf60w0rjdswm8wc12cyk39190hnalh49"; depends=[BiSeq GenomicRanges IRanges]; };
@@ -291,7 +294,7 @@ MEDME = derive { name="MEDME"; version="1.29.0"; sha256="1fpi4ri134ii28nfiq2p875
 MEIGOR = derive { name="MEIGOR"; version="1.3.0"; sha256="1kif7m78w0w0qv4fqfby3rknqk56zk83dds3cm4pgv2cii61i9jy"; depends=[CNORode deSolve Rsolnp snowfall]; };
 MGFM = derive { name="MGFM"; version="1.3.0"; sha256="1h2bi2cchfxl0z31pgj6q6pb1jnmqvjy7jv2khp80h7sdr65356i"; depends=[annotate AnnotationDbi]; };
 MIMOSA = derive { name="MIMOSA"; version="1.7.1"; sha256="1gzm90ii18vvpfd2nnl34mcvbvi49ck4hd7c5yziac8m3gx2f9f2"; depends=[Biobase coda data_table Formula ggplot2 Kmisc MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
-MLInterfaces = derive { name="MLInterfaces"; version="1.49.3"; sha256="1c7l9xwyx72hmv4rs24xm4bzj3lzaaj0ax71yw1p008rkgj8ifxz"; depends=[annotate Biobase BiocGenerics cluster fpc gdata genefilter ggvis htmltools MASS pls rda rpart sfsmisc shiny]; };
+MLInterfaces = derive { name="MLInterfaces"; version="1.49.6"; sha256="1lm6sdw2svwqgnkxzy1sdl7y3mpdp42b94asn5fjxdsmmyy6im7d"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis MASS pls RColorBrewer rda rgl rpart sfsmisc shiny]; };
 MLP = derive { name="MLP"; version="1.17.0"; sha256="1wb6bzxn1paba2fxh62ldsfr4kr0nq2sy21v0pp0qwhfxndyzpdn"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; };
 MLSeq = derive { name="MLSeq"; version="1.7.0"; sha256="0vc5rz4l574hmzwn3q7c4giib0lzs720j0j3alvarb3lmfzx9mhq"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; };
 MMDiff = derive { name="MMDiff"; version="1.9.0"; sha256="0xvnv024cv540m0jv9lrb4s5rvc0mq4gwp6wvdgpnsnqnwi9j556"; depends=[Biobase DiffBind GenomicRanges GMD IRanges Rsamtools]; };
@@ -299,7 +302,7 @@ MPFE = derive { name="MPFE"; version="1.5.0"; sha256="123a6qg761j46bs1ckd6yyr2ig
 MSGFgui = derive { name="MSGFgui"; version="1.3.0"; sha256="0r7izs3wpd7l9agrm3mrr3kmm00s9fzljsjxhk4pzxkjg1ran4hp"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; };
 MSGFplus = derive { name="MSGFplus"; version="1.3.0"; sha256="0q75mygrd56kr9hrrxlmckkgvhcrgvpgvbjdxjmz6jaqp5wfbkf5"; depends=[mzID]; };
 MSnID = derive { name="MSnID"; version="1.3.1"; sha256="0a0r2ikyb0spm110xzn3zzhl8g6xsvmh781d65f10l1iqnd2cqza"; depends=[Biobase data_table doParallel foreach iterators MSnbase mzID ProtGenerics R_cache Rcpp reshape2]; };
-MSnbase = derive { name="MSnbase"; version="1.17.11"; sha256="1yrzmanv87rpahpqg40vqx23baahq41w3j7zag8chygr2xhxkjxy"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn]; };
+MSnbase = derive { name="MSnbase"; version="1.17.12"; sha256="1yfkiphcn88dhjsj680jjj671jw1gxixhrg60sd8ri7j7b4z67as"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn]; };
 MSstats = derive { name="MSstats"; version="2.7.0"; sha256="0zhv2c769biv6avb4csi7alabk76bfn0ykzwp0lc6ymzggbj9pil"; depends=[ggplot2 gplots limma lme4 marray MSnbase preprocessCore Rcpp reshape]; };
 MVCClass = derive { name="MVCClass"; version="1.43.0"; sha256="1mbhfkvdkxw9xd76dd2pxk947w9wahwdsk9x1wcryrmwcdvaqqcz"; depends=[]; };
 MantelCorr = derive { name="MantelCorr"; version="1.39.0"; sha256="0l255m63q9idv56svs5m5bc4izwqnm3jy2z3kka7sw4xcx13l39g"; depends=[]; };
@@ -339,18 +342,19 @@ NetSAM = derive { name="NetSAM"; version="1.9.0"; sha256="1bdch37kk1clb8cyffrlcr
 NormqPCR = derive { name="NormqPCR"; version="1.15.0"; sha256="0nfjnx5id04nbkda9v66418yzpp88mq2ijsfn8jyg0sfika405nl"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; };
 NuPoP = derive { name="NuPoP"; version="1.19.0"; sha256="1dpqmhbwr1l95vgjxlw3xayjxksa909xj05jbf4x3gafnlkkdvbk"; depends=[]; };
 OCplus = derive { name="OCplus"; version="1.43.0"; sha256="1x7yqb6hkbglvr0kkq5s7caxambdvzc0f38gahq68wfsfwln7b49"; depends=[akima multtest]; };
+OGSA = derive { name="OGSA"; version="0.99.7"; sha256="03iqpsp1864605yjc7ji064dkiia8y7m66jyi1mskha7hk5mqk5x"; depends=[Biobase gplots limma]; };
 OLIN = derive { name="OLIN"; version="1.47.0"; sha256="19wjz96104rn88pdflixb790qhj24ff4s3hc09ldcii1pfzm0sdw"; depends=[limma locfit marray]; };
 OLINgui = derive { name="OLINgui"; version="1.43.0"; sha256="0714bzbsmd7bsdm5zk05g83yy48z3rlazpv17xbn38ljpykawzjb"; depends=[marray OLIN tkWidgets widgetTools]; };
 OSAT = derive { name="OSAT"; version="1.17.0"; sha256="1ky9xb5ls3xnzinsrxrgggb4r0fmm1q33vxb3ajav7nygyxijq0d"; depends=[]; };
 OTUbase = derive { name="OTUbase"; version="1.19.0"; sha256="0xmp446v57z875lmjkg47f9hx961af9nda658v8qlbjxf1wjw9zb"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; };
 OmicCircos = derive { name="OmicCircos"; version="1.7.0"; sha256="1xil5043hgpypaww1a1wvcxw9im9jmzgdp83p3z71giqiq36dvh4"; depends=[GenomicRanges]; };
-OmicsMarkeR = derive { name="OmicsMarkeR"; version="1.1.0"; sha256="1fw6zfp5jrkvxjb6j48q3n1fqkm1qmmjjvmr70v93hi5jg0an8gy"; depends=[assertive caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
+OmicsMarkeR = derive { name="OmicsMarkeR"; version="1.1.2"; sha256="09mdsvcp7n5qh845lpa1zsjk7jmbi0ni0601jlr1jija0hmkv1zx"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
 OncoSimulR = derive { name="OncoSimulR"; version="1.99.5"; sha256="0pjn2kirf1b72fvqxjawxcbrsn42brhz09kjnywm611kap329dq2"; depends=[data_table graph gtools igraph Rcpp Rgraphviz]; };
 OperaMate = derive { name="OperaMate"; version="0.99.6"; sha256="0xh57d82rmfcs1a6gj0qcjf585drhzns5k69bwxb7x1xw63wp4kp"; depends=[ggplot2 MASS pheatmap RDAVIDWebService]; };
 OrderedList = derive { name="OrderedList"; version="1.41.0"; sha256="1cw8y5f5h15z0qwg8n4dq7g3ixx2wa332rdsb4w2qqmcqlz79bfp"; depends=[Biobase twilight]; };
 OrganismDbi = derive { name="OrganismDbi"; version="1.11.42"; sha256="0y0v5ngall7iyvx2bqhfkxdnw9alkyab5f6qgpq8dpvr6pvyamyl"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller GenomicFeatures GenomicRanges graph IRanges RBGL RSQLite S4Vectors]; };
 OutlierD = derive { name="OutlierD"; version="1.33.0"; sha256="0bljxmrnlqcngzzv6yxjsim7gd4icyi384vimn5gs869mq9gyrj3"; depends=[Biobase quantreg]; };
-PAA = derive { name="PAA"; version="1.3.2"; sha256="1p9900wiy5mmcmwb4l5n8kvsjs3ay6k0k551mpjbwijhk2si7wja"; depends=[e1071 limma MASS mRMRe randomForest Rcpp ROCR sva]; };
+PAA = derive { name="PAA"; version="1.3.3"; sha256="1v5gw9f2glzsz05kqyvvhwzfdfj4ypwbfgy5q16lr1y64slabzq2"; depends=[e1071 limma MASS mRMRe randomForest Rcpp ROCR sva]; };
 PADOG = derive { name="PADOG"; version="1.11.0"; sha256="0x84k32fmd1zrwjc4f71mq4jslh9bxr4gjbl48k1f5kl5j6hlxj3"; depends=[AnnotationDbi Biobase doRNG foreach GSA limma nlme]; };
 PANR = derive { name="PANR"; version="1.15.0"; sha256="0nc2a10z7i16dz41yhz3zw9h51myxzxbxd1vpc2d8gczks07n6ch"; depends=[igraph MASS pvclust RedeR]; };
 PAPi = derive { name="PAPi"; version="1.9.0"; sha256="1553fxm3ma3p5j10acyk5m2wx4dafp346x0pyxj9aah856h4zkw5"; depends=[KEGGREST svDialogs]; };
@@ -378,7 +382,7 @@ ProCoNA = derive { name="ProCoNA"; version="1.7.0"; sha256="1x2wmlhlizd09v4d7q98
 ProtGenerics = derive { name="ProtGenerics"; version="1.1.0"; sha256="1l77j3zl78v86jbxpwnyc0a5q66yds79nirlcvan789hxbggr0i4"; depends=[BiocGenerics]; };
 Pviz = derive { name="Pviz"; version="1.3.0"; sha256="0pvmpxw4dpxxs9lrn9nn44rn36r3l09rwlkh5ph054h56nm80xs1"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; };
 QDNAseq = derive { name="QDNAseq"; version="1.5.1"; sha256="1gykm8r410s9aw75km0f8wnhd0p8gqirszp70g5x97n83r4k6rnq"; depends=[Biobase CGHbase CGHcall DNAcopy matrixStats R_utils Rsamtools]; };
-QUALIFIER = derive { name="QUALIFIER"; version="1.13.0"; sha256="0vk3xx0dmxadxk1wmcnf9cxv7rr4z8624npkmdbqlzb6mxix7p6d"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; };
+QUALIFIER = derive { name="QUALIFIER"; version="1.13.1"; sha256="0b25cgjafs3k2kwbmbla713gxy9xbjclsx6k4pxydz5flz8w8grg"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; };
 QuartPAC = derive { name="QuartPAC"; version="1.1.0"; sha256="0w92hggwihp2nia9dzg8yjbfsyrcgwq4kpxh96jb8kkmq6kl2l8p"; depends=[data_table GraphPAC iPAC SpacePAC]; };
 QuasR = derive { name="QuasR"; version="1.9.9"; sha256="13md1pq0bg9xdlhvwsys3f7ibqll80viica03h2l4cnhgw26zj52"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; };
 R3CPET = derive { name="R3CPET"; version="1.1.0"; sha256="0vwyrqsihnabzqh5r329v3f5zcg2ik51aakvscpp482z0dm2naqh"; depends=[clues clValid data_table DAVIDQuery GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp reshape2 S4Vectors]; };
@@ -386,8 +390,8 @@ R453Plus1Toolbox = derive { name="R453Plus1Toolbox"; version="1.19.1"; sha256="0
 RBGL = derive { name="RBGL"; version="1.45.1"; sha256="0y90pvl3i8pyzxwssciygcd1c1lb8a0rqhpiqgif56075amm71rl"; depends=[graph]; };
 RBM = derive { name="RBM"; version="1.1.0"; sha256="03q7prkrj8y3k8jrnnbjrkmlyv72cxfa8l042df4wajhcbpa4g4l"; depends=[limma marray]; };
 RBioinf = derive { name="RBioinf"; version="1.29.0"; sha256="1cyd18lz3h9b20g6s9azzv9rv9bachh3qsczz84y8lj4kay3qssx"; depends=[graph]; };
-RCASPAR = derive { name="RCASPAR"; version="1.15.1"; sha256="125vrkz5gicizf0acpv0f0ijiky5my7rpfyim25vihcsz5fkb0w1"; depends=[]; };
-RCyjs = derive { name="RCyjs"; version="1.1.12"; sha256="1gv31yj0ms7llsg2rca96rh77h1qw3hkjbiskzc3zmpycx5m9m8b"; depends=[BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; };
+RCASPAR = derive { name="RCASPAR"; version="1.15.2"; sha256="151mil4v8iz5lrn7827imvvnjh171qdgjg927fic3fwyfx0kkyqs"; depends=[]; };
+RCyjs = derive { name="RCyjs"; version="1.1.18"; sha256="0d6zh2ryy9583i2cxahi4gl5ldp1r0yyyz8mjzklp47rkm2cxmkx"; depends=[BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; };
 RCytoscape = derive { name="RCytoscape"; version="1.19.0"; sha256="0yfmlksi7sz0p9nbgjz2cpqwbwyzzxij3zaqmkp3wqfdk89mxgi7"; depends=[BiocGenerics graph]; };
 RDAVIDWebService = derive { name="RDAVIDWebService"; version="1.7.0"; sha256="07hnj7flfacg9j8c6155nw23zjxcb1v4wj4rkfi8xz5clp80v6xh"; depends=[Category ggplot2 GOstats graph RBGL rJava]; };
 RDRToolbox = derive { name="RDRToolbox"; version="1.19.0"; sha256="186cj6xri4prv7y9jvspyql8mkqy3aqs2kd6m5fliqicqbfia2z8"; depends=[MASS rgl]; };
@@ -399,7 +403,7 @@ RLMM = derive { name="RLMM"; version="1.31.0"; sha256="01plzmxz5dzvvxzx4wxsqhhyp
 RMassBank = derive { name="RMassBank"; version="1.11.0"; sha256="1df5kfm4gb5kz1z5sq38wddi4njq3y8nzy7fr2dxk1z2j4b1977z"; depends=[mzR rcdk Rcpp RCurl rjson XML yaml]; };
 RNASeqPower = derive { name="RNASeqPower"; version="1.9.0"; sha256="0nn5wq81cm81wjwc43ky597fyq1l4ya36k64bp6k80ri94qx2vzg"; depends=[]; };
 RNAinteract = derive { name="RNAinteract"; version="1.17.0"; sha256="03rz6xyy9f48ns0r9xcxrghikxlna8cx62rwswq2i1xkh7c5lfiy"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; };
-RNAither = derive { name="RNAither"; version="2.17.0"; sha256="028qf3sj2cms9h6wh4bynxaky8mvlr0axci8yw9bjp4bdlrjland"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
+RNAither = derive { name="RNAither"; version="2.17.2"; sha256="01h9l5inafhzpych76rpkrml442ld6jaxrd31ambspn9hsv8js6z"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
 RNAprobR = derive { name="RNAprobR"; version="1.1.1"; sha256="1n0ra0jb6y01nbdx9qbmkh5w4zy381nzkwcawvdg2bfzva1734mp"; depends=[BiocGenerics Biostrings GenomicFeatures GenomicRanges plyr Rsamtools rtracklayer]; };
 ROC = derive { name="ROC"; version="1.45.0"; sha256="1vcv5q7ylr2b1fb4vmrc8j4j7s3v5szzpkwblnfkcp2y8d03i9a1"; depends=[]; };
 ROntoTools = derive { name="ROntoTools"; version="1.9.0"; sha256="07l9j4d26hn8d5ma3z19ipy4rrw29k66zb2ib8n3ba24pjm0h8w3"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; };
@@ -416,7 +420,7 @@ RUVnormalize = derive { name="RUVnormalize"; version="1.3.0"; sha256="1fqk68rpzn
 RWebServices = derive { name="RWebServices"; version="1.33.1"; sha256="1bxp4zj7r1lrxb7r7l32h6b8hdxb1ryf7dxxj0qhwimh7pmxln31"; depends=[RCurl SJava TypeInfo]; };
 RamiGO = derive { name="RamiGO"; version="1.15.0"; sha256="1q9f2ii5b1xway407gzfpzz6vm6an8p13vmgkw7vb9rldxn85hab"; depends=[graph gsubfn igraph png RCurl RCytoscape]; };
 RankProd = derive { name="RankProd"; version="2.41.0"; sha256="05r8mrgnpfkd7yhcch7nrn9jbapfhvi67h0z9a9nlxlp44mz0qq7"; depends=[]; };
-RareVariantVis = derive { name="RareVariantVis"; version="1.0.0"; sha256="09hww69169c225dmi3rmjhv5j2bxq1c773s1q7048rysgv0har5y"; depends=[BiocGenerics GenomeInfoDb GenomicRanges googleVis IRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
+RareVariantVis = derive { name="RareVariantVis"; version="1.0.3"; sha256="1wc2rb80xvwbnsc93fl04cf6y74qpwhhi4172whxb6affq2682cq"; depends=[BiocGenerics GenomeInfoDb GenomicRanges googleVis IRanges S4Vectors VariantAnnotation]; };
 Rariant = derive { name="Rariant"; version="1.5.0"; sha256="1xwy2xrdk1m1mscnql8cp3az1jx639a9w4mb8bz7jf62z4z4npsi"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; };
 RbcBook1 = derive { name="RbcBook1"; version="1.37.0"; sha256="03q82zjd725w585rgdn9mbx7ddsv1kdxylsndh26csz573j2myhh"; depends=[Biobase graph rpart]; };
 Rbowtie = derive { name="Rbowtie"; version="1.9.0"; sha256="02wc0pzw9vm1mc7y84ic79jjdi1mh77v8h4gk2pl117pdkgg7nl7"; depends=[]; };
@@ -436,27 +440,27 @@ ReportingTools = derive { name="ReportingTools"; version="2.9.1"; sha256="05p005
 Rgraphviz = derive { name="Rgraphviz"; version="2.13.0"; sha256="08apr3v2h5jwah96c2596ggz7xaz41k5zywcqsjm6g8xhd3hs522"; depends=[graph]; };
 Rhtslib = derive { name="Rhtslib"; version="1.1.8"; sha256="1n6mimlkyaxcfwfr4hclmch3h14qaffakkd899p9fwlf1d60j9xw"; depends=[zlibbioc]; };
 Ringo = derive { name="Ringo"; version="1.33.0"; sha256="12qh3aayy317pzb137ds9vqrrwn93c4l4fdcl6yyp8p4fqpki03j"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; };
-Risa = derive { name="Risa"; version="1.11.0"; sha256="1rgyh3yv4ii0xw6ycm0g9b0y6c9nqdq4k8lidmifk0gx835lw7vf"; depends=[affy Biobase biocViews Rcpp xcms]; };
+Risa = derive { name="Risa"; version="1.11.1"; sha256="1bx7n7fjsaig5zq6xgwva2fvy0dlg9f1niwl9m6bi1h04spybp2c"; depends=[affy Biobase biocViews Rcpp xcms]; };
 Rmagpie = derive { name="Rmagpie"; version="1.25.0"; sha256="13mb9aaqmwx1ad4mk0fhxqfql8pjpyaiibip7jawiyji7ghp9iw7"; depends=[Biobase e1071 kernlab pamr]; };
 RmiR = derive { name="RmiR"; version="1.25.0"; sha256="1xc19w8la239ia793qpnpx2h0aavwhidrjf4i87jry2j29npjfzz"; depends=[DBI RSVGTipsDevice]; };
-RnBeads = derive { name="RnBeads"; version="1.1.3"; sha256="1yd5gmi2vvkqrv384ndsn7qgp8rzjj6d0i4zsgr33avxnah757m2"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer]; };
+RnBeads = derive { name="RnBeads"; version="1.1.4"; sha256="1v4cgfrarybansrxk2r77g79xkwhkh28qaffk93mfwf163rq3391"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer]; };
 RnaSeqSampleSize = derive { name="RnaSeqSampleSize"; version="1.1.0"; sha256="0q2w1yd5p9k3pls6ki8yci3r2v4rxi3iy4zk5mafmr7ip0q1rwpp"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp]; };
 Rnits = derive { name="Rnits"; version="1.3.0"; sha256="0hxll8hlv5nc6vijznhzmvbjh1hxmfy9shm2g8al291yi0gfdmk3"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; };
 Roleswitch = derive { name="Roleswitch"; version="1.7.0"; sha256="01b21yyg0d2v10abcbw08zhswh9nb7wj7s3x5kcaaas7671f06ha"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; };
 Rolexa = derive { name="Rolexa"; version="1.25.0"; sha256="1qrf7byimw9s5jp15zmwqk95x34r3yx2npr46gwf1zih06n7kc05"; depends=[Biostrings IRanges mclust ShortRead]; };
 RpsiXML = derive { name="RpsiXML"; version="2.11.0"; sha256="0rvma7vynfh5sjhqnbpagilq54dh0wrvvb3jzykwmrak0dbyk7zh"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; };
 Rqc = derive { name="Rqc"; version="1.3.1"; sha256="02kc0ki021m4hxhzlmxfrb9p7p2ibdqan5hr9h67vd2dcnp9yaij"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings ggplot2 IRanges knitr markdown plyr reshape2 S4Vectors ShortRead]; };
-Rsamtools = derive { name="Rsamtools"; version="1.21.13"; sha256="0fv0a5f1jb8mj3b2qn6bf9vzzpvn8fgrlhxz492rd3ndvvgnabxc"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
+Rsamtools = derive { name="Rsamtools"; version="1.21.14"; sha256="1s2xwz0njbml9x0yw08kk8ykbr5zgzfy5glhzkdhcdfdz7m19ma9"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
 Rsubread = derive { name="Rsubread"; version="1.19.2"; sha256="1xcj13mzw7a8q93kimr61kcl2xvr0mdzvrrqi4j3psbcyf5zn86k"; depends=[]; };
 Rtreemix = derive { name="Rtreemix"; version="1.31.0"; sha256="1z08y8qhc3sv4pwvji4pks46hxpcpwb9yx8y0927bc96a8mqgax4"; depends=[Biobase graph Hmisc]; };
 S4Vectors = derive { name="S4Vectors"; version="0.7.10"; sha256="15hyi728raya0x0fl0pp58kk6w4chvx7xv2f7kmp1432pkgvif9p"; depends=[BiocGenerics]; };
 SAGx = derive { name="SAGx"; version="1.43.0"; sha256="111pgl7rzmscgadkbivwa736gpyw1z7zkcj648zq3jhqix569dvd"; depends=[Biobase multtest]; };
-SANTA = derive { name="SANTA"; version="2.5.2"; sha256="0y49ly3ll8qhbnd5yv5nfzc0bq2xcp2nwdg26338qmif4xklzs43"; depends=[igraph Matrix snow]; };
+SANTA = derive { name="SANTA"; version="2.6.0"; sha256="0zx9azk7j82bzq424rf42nsaw05qyfgzdsy38h6r352mfbmip2dl"; depends=[igraph Matrix snow]; };
 SBMLR = derive { name="SBMLR"; version="1.65.0"; sha256="1nmw5c32ka6l12cid54mc4diahjhmyg6fngsd646v70rbzgffn7q"; depends=[deSolve XML]; };
 SCAN_UPC = derive { name="SCAN.UPC"; version="2.11.0"; sha256="1gwjd78qfaqv6xh4ys6rr29b82wc8qxk7ysfjcl06j6n0qk1v4s6"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; };
 SELEX = derive { name="SELEX"; version="1.1.0"; sha256="13v2aqphpblwslbnm9yk9lfg31vrc3lz9ds4m8j7584iszmlgnar"; depends=[Biostrings rJava]; };
 SEPA = derive { name="SEPA"; version="0.99.0"; sha256="1mc44amd39x1dvl0kamhbsn2cplg7h5j5v5y2lv1gminfl4xs0sw"; depends=[ggplot2 reshape2 segmented shiny topGO]; };
-SGSeq = derive { name="SGSeq"; version="1.3.12"; sha256="19i39vv0ds79hgjjkp37j49apr1jr5n93zc2dmn1llglyp9qqwyl"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+SGSeq = derive { name="SGSeq"; version="1.3.14"; sha256="0m4dsjyww001bqm3ra01jajl0ys9kx605kjb3fjl4dk6adfkn8h8"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
 SIM = derive { name="SIM"; version="1.39.0"; sha256="1r08h5hkciycv4lh998vm742flim07plysgjvrq9dp4c5q4qrzr5"; depends=[globaltest quantreg quantsmooth]; };
 SIMAT = derive { name="SIMAT"; version="1.1.5"; sha256="074r9fyrgkay1xr0i3ps1sn7n24y26w595nssy7bryrvhhd8izbr"; depends=[ggplot2 mzR Rcpp reshape2]; };
 SJava = derive { name="SJava"; version="0.95.1"; sha256="1cl0qybi71srf1ggawxdy128kz8crn8if4yi8c2m6w9ppah9m763"; depends=[]; };
@@ -464,7 +468,7 @@ SLGI = derive { name="SLGI"; version="1.29.0"; sha256="0jhi3nmgnqf8qix90kpz8gqib
 SLqPCR = derive { name="SLqPCR"; version="1.35.0"; sha256="1p35xgwf3i8ksznz1gi3bddj0816hdljamcb7smdrq0md5fqmpzb"; depends=[]; };
 SMAP = derive { name="SMAP"; version="1.33.0"; sha256="0znl289fclws2vnqgpjnrl8b0s5q4cna3ps3il5783vr64ir88cg"; depends=[]; };
 SNAGEE = derive { name="SNAGEE"; version="1.9.0"; sha256="0sn5b8ah9idbz63y1rjx8brz3h58zvh2sk59l4i48nvrm38g169r"; depends=[]; };
-SNPRelate = derive { name="SNPRelate"; version="1.3.5"; sha256="0xr839g6a2m5p7fd2dzaz0c263b2cfdpakq5ydk0k1c3xppzly9y"; depends=[gdsfmt]; };
+SNPRelate = derive { name="SNPRelate"; version="1.3.7"; sha256="04bgql78gwrprj445hkrmrl94ba2dxih48xgbyxhp4ifx5v97cyi"; depends=[gdsfmt]; };
 SNPchip = derive { name="SNPchip"; version="2.15.2"; sha256="1px5ifdsly1z8iwd22vj2xb4pk5jhsa3h2z31scw37b0v4daks50"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses SummarizedExperiment]; };
 SPEM = derive { name="SPEM"; version="1.9.0"; sha256="09klaxlz1ff77jhjsr95g3s4b5m285zf3fl9w4mv5pc8r1viqplf"; depends=[Biobase Rsolnp]; };
 SPIA = derive { name="SPIA"; version="2.21.0"; sha256="0v8m9wfl2kqzzl3k0v7lr7g33ymdnmqi9r2fqyb42mggpq5pwxlm"; depends=[KEGGgraph]; };
@@ -478,7 +482,7 @@ SVM2CRM = derive { name="SVM2CRM"; version="1.1.0"; sha256="0k3mg9b8i406ssvkzacz
 SamSPECTRAL = derive { name="SamSPECTRAL"; version="1.23.4"; sha256="0fqnqffw6q5sja3jkw6ddrachs075s5s7rnpg9fli9lgax5r4rbp"; depends=[]; };
 ScISI = derive { name="ScISI"; version="1.41.0"; sha256="05snqj8qphcmnkrmv42p6zs92dmi09sd06abn5ll5234my5d0vvn"; depends=[annotate AnnotationDbi apComplex RpsiXML]; };
 SemDist = derive { name="SemDist"; version="1.3.0"; sha256="0dvnp3d2s7bc4jv2vm8jikyac2cd23hx7r480g2lkcaic99wbl0s"; depends=[annotate AnnotationDbi]; };
-SeqArray = derive { name="SeqArray"; version="1.9.7"; sha256="0gpn5dispfd8scqhgxw8pfgrwkz479ly5q8431mifmbkq8zh34pd"; depends=[Biostrings gdsfmt GenomicRanges IRanges S4Vectors VariantAnnotation]; };
+SeqArray = derive { name="SeqArray"; version="1.9.9"; sha256="0nlzwr6v1az5apm5lipzxdjdfswjyb8kfasjrg4ndddxwmmr2ads"; depends=[Biostrings gdsfmt GenomicRanges IRanges S4Vectors VariantAnnotation]; };
 SeqGSEA = derive { name="SeqGSEA"; version="1.9.0"; sha256="0znabm84qgzf9m4dk64jppn3s5vzz1sjvrdlr7s6jls8jwi8kqqi"; depends=[Biobase biomaRt DESeq doParallel]; };
 SeqVarTools = derive { name="SeqVarTools"; version="1.7.1"; sha256="04xfph2iphpmlqws5xmibq1jdkclbal2nrf18w7sblqcv67cff7x"; depends=[gdsfmt GenomicRanges GWASExactHW IRanges S4Vectors SeqArray VariantAnnotation]; };
 ShortRead = derive { name="ShortRead"; version="1.27.5"; sha256="0r9gmbg9fd3n6v8c0l1mjkk9x1v6qrisamm5a1nasqbg3wmhmz5k"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
@@ -486,7 +490,7 @@ SigCheck = derive { name="SigCheck"; version="2.1.0"; sha256="012n75gmsifvymbk20
 SigFuge = derive { name="SigFuge"; version="1.7.0"; sha256="1b966n3rl4xs3q1vjgkxxfravqr02rdgwyzvr469y757qdqi1day"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; };
 SimBindProfiles = derive { name="SimBindProfiles"; version="1.7.0"; sha256="04m7h5zil05sg9yfgjjzm1p65302fp50vxf8y1jafp1nwqialxwh"; depends=[Biobase limma mclust Ringo]; };
 SomatiCA = derive { name="SomatiCA"; version="1.13.0"; sha256="06b3mz199qm2ynal8iq4kp8rv40wbc5zipzwm22nccf97krxl9a4"; depends=[DNAcopy doParallel foreach GenomicRanges IRanges lars rebmix sn]; };
-SomaticSignatures = derive { name="SomaticSignatures"; version="2.5.4"; sha256="1kr4z1b9b5a8gb1m9vfk9bxhinh5ccba2mrwnq3cqhb7c3slbjs3"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; };
+SomaticSignatures = derive { name="SomaticSignatures"; version="2.5.5"; sha256="17a74vmnxrznq7y6fafrwlc6kdrs2qf56ikgacsmp6rm7cx7fi36"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; };
 SpacePAC = derive { name="SpacePAC"; version="1.7.0"; sha256="1ay5hlbm2x9g5mjrq5qksgrrr84vwfk49g9qb2sc9wyc46n5af6k"; depends=[iPAC]; };
 SpeCond = derive { name="SpeCond"; version="1.23.0"; sha256="0nbbqazxql9mc5idvrcycrm9fkrnm2vi9zrad3awhc378ippdk8k"; depends=[Biobase fields hwriter mclust RColorBrewer]; };
 SplicingGraphs = derive { name="SplicingGraphs"; version="1.9.1"; sha256="1s3kvaxrrvfndp4imavj0r9zw0rg37cn9xwxhi5zpfd7a784z1xk"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; };
@@ -495,17 +499,18 @@ Streamer = derive { name="Streamer"; version="1.15.2"; sha256="0mah1sq797ihy82mv
 SummarizedExperiment = derive { name="SummarizedExperiment"; version="0.3.2"; sha256="0k7dmly8g1qhpqx4qv376ixkwvx073ydc5xqi29s81mwp5fq08zi"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
 Sushi = derive { name="Sushi"; version="1.6.1"; sha256="0g1fk0xrn584l49r73crj0bc5z2y6rdzyf54d221r7k119njp3dw"; depends=[biomaRt zoo]; };
 SwimR = derive { name="SwimR"; version="1.7.0"; sha256="07kh24m9d1q3swj3srjybj6lq68s89750fbvlg449px4aq23yrq0"; depends=[gplots heatmap_plus R2HTML signal]; };
-TCC = derive { name="TCC"; version="1.9.0"; sha256="1bihqfvrq3sjs38m2a60swxqcxmgabb1lmsnfrb669imiqc7ramj"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; };
+TCC = derive { name="TCC"; version="1.9.2"; sha256="1srlaiavii6sr0d3fiqngp1rchdfxgnmsf7h29szyy34aajqygbw"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; };
 TDARACNE = derive { name="TDARACNE"; version="1.19.0"; sha256="0nwg355n0qs781801pmmwfwp66sa2ci7g6gfdh4669067j4qbqhb"; depends=[Biobase GenKern Rgraphviz]; };
 TEQC = derive { name="TEQC"; version="3.9.0"; sha256="0dkmh901jkf529jcshvr79jmkvw0824r4dxgp6l6vgv9j5c6nf25"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; };
 TFBSTools = derive { name="TFBSTools"; version="1.7.0"; sha256="1c38n6xlm4cfrhh9qih0d8xh3d7r7w797fjcbmhsr2zhd7qssrqb"; depends=[BiocParallel Biostrings BSgenome caTools CNEr DirichletMultinomial GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XVector]; };
 TIN = derive { name="TIN"; version="1.1.0"; sha256="0npf3gwh2izvsa5j0zjy1gkm69nrxhcjlm2ha621fc1gz7lx1i2y"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; };
-TPP = derive { name="TPP"; version="1.1.0"; sha256="06xm73jx4f2pldi7yifvx7zh62zmigidnfd7klpp0jpfxx3xjw61"; depends=[Biobase doParallel foreach ggplot2 gridExtra nls2 openxlsx plyr reshape2 VennDiagram VGAM]; };
+TPP = derive { name="TPP"; version="1.1.3"; sha256="152dpyn6ldw4b3ys0b1ylriq0l1hr9l0qjgfh19bvs2gflhbzyah"; depends=[Biobase doParallel foreach ggplot2 gridExtra nls2 openxlsx plyr reshape2 VennDiagram VGAM]; };
 TRONCO = derive { name="TRONCO"; version="1.1.0"; sha256="18zmn1cxysar3a19n9i47r2gda5r5jvz0bk209wh6kqlhs001q9v"; depends=[graph lattice Rgraphviz]; };
 TSCAN = derive { name="TSCAN"; version="1.5.0"; sha256="1hkmfn9svbgpvxpszfdxjc23qq8x60prsbrgv7z5n3na4sl7y5z5"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; };
 TSSi = derive { name="TSSi"; version="1.15.0"; sha256="0475zw1s34ayiz0v9i770rmha4rx9i3zzkjvyskgvsdpgsq9wl4j"; depends=[Biobase BiocGenerics Hmisc IRanges minqa plyr S4Vectors]; };
 TargetScore = derive { name="TargetScore"; version="1.7.0"; sha256="0lkkxzi3fi0dxika09fkbakq54c2sjw4g4y9bafcy3f225fac8x8"; depends=[Matrix pracma]; };
 TargetSearch = derive { name="TargetSearch"; version="1.25.0"; sha256="071p06gb1rn6sdhdpi7g05rflp6jgs0cdff13gj8hr5jykyw5ix7"; depends=[mzR]; };
+TimerQuant = derive { name="TimerQuant"; version="0.99.3"; sha256="03qa5k4xc8pv677azdc0ar66p23jdyqyblckdnrqlwnscln0y77g"; depends=[deSolve dplyr ggplot2 gridExtra locfit shiny]; };
 TitanCNA = derive { name="TitanCNA"; version="1.7.1"; sha256="0a64bqgyn18qdvgzmc6kqr6c16jlqyz0vah0fm2qwdjz3zmjd081"; depends=[foreach GenomeInfoDb IRanges Rsamtools]; };
 ToPASeq = derive { name="ToPASeq"; version="1.3.0"; sha256="1m6mh30fpf9mmgg2wsv08qvizw0cpa6dz5abspgbw3q0vaskm2db"; depends=[Biobase clipper DESeq DESeq2 edgeR fields GenomicRanges graph graphite gRbase KEGGgraph limma locfit qpgraph R_utils RBGL Rcpp Rgraphviz TeachingDemos]; };
 TransView = derive { name="TransView"; version="1.13.0"; sha256="14fanxl8lqam3492c5sbvhsjwbayrx7dcp5wpsbqrcvbssmfa3cx"; depends=[GenomicRanges gplots IRanges Rsamtools zlibbioc]; };
@@ -514,8 +519,8 @@ TypeInfo = derive { name="TypeInfo"; version="1.35.0"; sha256="0rxwfaqg8sg70hiq8
 UNDO = derive { name="UNDO"; version="1.11.0"; sha256="173cdpp0gipwplxdf7ynxqnv8fqfkbyx7xmr5cx396zi8gpq3am4"; depends=[Biobase BiocGenerics boot MASS nnls]; };
 UniProt_ws = derive { name="UniProt.ws"; version="2.9.2"; sha256="0pby1c7y8fxkpdd2knbv8gbxs78ry1dz8q9zqw6bakp831v5kbgw"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; };
 VanillaICE = derive { name="VanillaICE"; version="1.31.3"; sha256="0niimjngjx8wq2fylzjdijb2za4w4ia53aqkdnjwjfl78rg2hwch"; depends=[Biobase BiocGenerics crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; };
-VariantAnnotation = derive { name="VariantAnnotation"; version="1.15.19"; sha256="1hqpjwrnyl5hp8vwl68v2cnf868vjf7k0vckjczdcc66wp3g9r70"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
-VariantFiltering = derive { name="VariantFiltering"; version="1.5.15"; sha256="1dawzsv358h3p5x7kcml17snpbypgwjl5b0aam2wrsb7qp80sqh7"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny VariantAnnotation XVector]; };
+VariantAnnotation = derive { name="VariantAnnotation"; version="1.15.21"; sha256="0b5i9q2xnclkrziri6575irmm5y3r2g9x45dr5qnq91g9rxi4m7v"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
+VariantFiltering = derive { name="VariantFiltering"; version="1.5.16"; sha256="1fvzhxvirzxcrqw3bm86f5id29s993gpmbwjar5maj86881l1c2f"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny VariantAnnotation XVector]; };
 VariantTools = derive { name="VariantTools"; version="1.11.0"; sha256="1yyx9l6q3v4igm2ppnrsj9c7p4p0zpkqwjyf9d7b7rqvrk9yjyrv"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges gmapR IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
 Vega = derive { name="Vega"; version="1.17.0"; sha256="1c39112czlw9hgh9gmkwxhhz9kwki48k8lsfmy3hkzxqpxx61h01"; depends=[]; };
 VegaMC = derive { name="VegaMC"; version="3.7.0"; sha256="046wly5sn4vwk3h4bcick8q5dpjrfjq393rqjl8y4v24iqynlyqd"; depends=[Biobase biomaRt genoset]; };
@@ -540,8 +545,8 @@ affyPara = derive { name="affyPara"; version="1.29.0"; sha256="06382vyfjrng72hhm
 affyQCReport = derive { name="affyQCReport"; version="1.47.0"; sha256="09f3pbacsrjs5bv1bv3dz7jmd849rnix6pqlkszr507s6by5i47y"; depends=[affy affyPLM Biobase genefilter lattice RColorBrewer simpleaffy xtable]; };
 affycomp = derive { name="affycomp"; version="1.45.0"; sha256="0wwgijr7h2hbv2l0w5p509f70yy873w8kahs7nnhrgl4kzbjiymc"; depends=[Biobase]; };
 affycoretools = derive { name="affycoretools"; version="1.41.9"; sha256="16zdm1idmssg9jp86kkfc2h2dhjz2rl6qnrbybfbkiiklj2gagq7"; depends=[affy AnnotationDbi Biobase gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools xtable]; };
-affyio = derive { name="affyio"; version="1.37.0"; sha256="0p6wgrl8xag85y5vadfxdvvr430d7sa4wh2fw3ijyi3hr83sdr4z"; depends=[zlibbioc]; };
-affylmGUI = derive { name="affylmGUI"; version="1.43.0"; sha256="04np48b2v04w77vhpacdx8790i8jb58rw7da76qvahiqja857vlq"; depends=[affy affyio affyPLM AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
+affyio = derive { name="affyio"; version="1.38.0"; sha256="0rdkbc01bgkvg4pmpv7nl8ggq3jy17ldll50xqi1yv8rx2z0m0vp"; depends=[zlibbioc]; };
+affylmGUI = derive { name="affylmGUI"; version="1.43.2"; sha256="1mkg2addri3x8vchgcdy4wih1pzagbp0i54w3nh9kf64r89m35br"; depends=[affy affyio affyPLM AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
 affypdnn = derive { name="affypdnn"; version="1.43.0"; sha256="01myf9dxzgc2jgdswphinz7ap7bdaqnw0gcfk32sxbykr4g4zyiy"; depends=[affy]; };
 agilp = derive { name="agilp"; version="3.1.0"; sha256="13jnq7v0qfyllbldx2abnia0rg40yxxgkq4i1whsy5qnk1fp0n77"; depends=[]; };
 alsace = derive { name="alsace"; version="1.5.0"; sha256="17ah7dl02w6qysfbs92h4c3wxfb6f1m6vz6yl07s0zd86k12g4nm"; depends=[ALS ptw]; };
@@ -549,7 +554,7 @@ altcdfenvs = derive { name="altcdfenvs"; version="2.31.0"; sha256="05gr6j1w1y289
 ampliQueso = derive { name="ampliQueso"; version="1.7.0"; sha256="1bk0svxg7n6b610d5czkk1mgkrgdsjlghbj38g4hxxw3vciaxhkk"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; };
 annaffy = derive { name="annaffy"; version="1.41.1"; sha256="1rqp0lrhahkimnhifpipf2vw0lhprdx9slz3s4bwylvn0k5balcm"; depends=[AnnotationDbi Biobase]; };
 annmap = derive { name="annmap"; version="1.11.0"; sha256="0s0ifbwra3zczw9h0nqcs88rb3h74ry1gap1bvqvcxqirdwq9nw4"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; };
-annotate = derive { name="annotate"; version="1.47.0"; sha256="06nrzkl9g26rrnqvakwkn2yinvgka02a5iivhi9kgjk4g5plcmkw"; depends=[AnnotationDbi Biobase BiocGenerics DBI XML xtable]; };
+annotate = derive { name="annotate"; version="1.47.4"; sha256="01imryfc18jg8hmxk82arkpvdxfh448fhiv5z0xmkbx03hrrin7b"; depends=[AnnotationDbi Biobase BiocGenerics DBI XML xtable]; };
 annotationTools = derive { name="annotationTools"; version="1.43.0"; sha256="1dqs8f4p1ks03q0lfwm3hs116ahks39hk17knkqs492zcqr83qay"; depends=[Biobase]; };
 anota = derive { name="anota"; version="1.17.0"; sha256="0grdmpdg03wqjs6rk558nvl8vvdi6my0jv06f3h364pk44hrijdn"; depends=[multtest qvalue]; };
 antiProfiles = derive { name="antiProfiles"; version="1.9.1"; sha256="07gzl7wsvv3x7in7n1fwq4cm8bqhlrxwq6ra1k2556z9z8ad7y33"; depends=[locfit matrixStats]; };
@@ -567,7 +572,7 @@ beadarraySNP = derive { name="beadarraySNP"; version="1.35.0"; sha256="0g6ba4iyn
 betr = derive { name="betr"; version="1.25.0"; sha256="0jd7r069jlfp5fj51xw8k6jpxq5kb364xi9331l06hwijp3msrk6"; depends=[Biobase limma mvtnorm]; };
 bgafun = derive { name="bgafun"; version="1.31.0"; sha256="18wk42h1i06j3swlsac9vnkc7riimk7qap59lygji1p3zvy1nkpx"; depends=[ade4 made4 seqinr]; };
 bgx = derive { name="bgx"; version="1.35.0"; sha256="1cawfanrxq82b24ny050hv4p607k2zhfxllgl8j1j9qm9n4yk4yk"; depends=[affy Biobase gcrma]; };
-bigmemoryExtras = derive { name="bigmemoryExtras"; version="1.13.2"; sha256="0qmrpm4bir0si5xd5v8ih6wnwfprwp4q9hcxbylf1721v9m9wpwv"; depends=[bigmemory Biobase]; };
+bigmemoryExtras = derive { name="bigmemoryExtras"; version="1.13.3"; sha256="0jniyz1b11yk00azqxswfdipri84a28ni30kxpazb57d5m6s53h2"; depends=[bigmemory Biobase]; };
 bioDist = derive { name="bioDist"; version="1.41.0"; sha256="14a18ky9x36fa8yx3kry23c0vfazxy0lg0j2zkdnr1irngc9wnw5"; depends=[Biobase KernSmooth]; };
 bioassayR = derive { name="bioassayR"; version="1.7.7"; sha256="1pflygamq0l0pdps4ay3rl4f8c1njrb55lnl0p2z7mgpj6dbgvf8"; depends=[BiocGenerics DBI Matrix rjson RSQLite XML]; };
 biocGraph = derive { name="biocGraph"; version="1.31.0"; sha256="069n4867pkygrsgfjp6arnnmcvlij03r1a2kbs9jgnpx4knck09i"; depends=[BiocGenerics geneplotter graph Rgraphviz]; };
@@ -577,13 +582,13 @@ biomvRCNS = derive { name="biomvRCNS"; version="1.9.1"; sha256="0ni7ncip0vx1ipyr
 biosvd = derive { name="biosvd"; version="2.5.0"; sha256="0xnc3vpbj5p14w2fwql8vpz9lyvivq3kjmwsr62abn418ampa941"; depends=[Biobase BiocGenerics NMF]; };
 biovizBase = derive { name="biovizBase"; version="1.17.1"; sha256="0fffqm8z7x849rd0k7vhpbzwyrx5s0w75iz78627rglczjff6ddp"; depends=[AnnotationDbi BiocGenerics Biostrings dichromat GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
 birta = derive { name="birta"; version="1.13.0"; sha256="01lrwg4naks85gcrlg3sk3pr328j40b1ji4m4bn3s74rqn6sb52h"; depends=[Biobase limma MASS]; };
-birte = derive { name="birte"; version="1.3.0"; sha256="0azkl9x2hk826sdpw96ls868jf83yf1v79inyjg7xsilal2slqgf"; depends=[Biobase limma MASS nem Rcpp RcppArmadillo ridge]; };
+birte = derive { name="birte"; version="1.4.0"; sha256="0fyz2chcgcp98lk6zj21lsixmkr06hd80dbg2j25a4rx2pv6qn5s"; depends=[Biobase limma MASS nem Rcpp RcppArmadillo ridge]; };
 blima = derive { name="blima"; version="1.3.0"; sha256="1i7njg1lw76717irmfbpy9pmv8hy7nzyini2wm6625cafizp5xq8"; depends=[beadarray Biobase BiocGenerics]; };
 bridge = derive { name="bridge"; version="1.33.0"; sha256="06iz67amv80az14s8yim25jfsgbxhxbfifbqazsc78ip9gd7lfyv"; depends=[rama]; };
 bsseq = derive { name="bsseq"; version="1.5.4"; sha256="1hr9h4h099506id4xvh6xm9x40dv5hsiyz8rzj4dxxkq7095h9d1"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges locfit matrixStats S4Vectors scales SummarizedExperiment]; };
 bumphunter = derive { name="bumphunter"; version="1.9.1"; sha256="0phq9dhrj8fa253a64vwfp75j85vp9142g5gmfy1g1n861xy8r26"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; };
 caOmicsV = derive { name="caOmicsV"; version="0.99.2"; sha256="0y96f64m0liv53vbby866v1ga5nml1506pp6ff4ax7dbg0niiwwn"; depends=[bc3net igraph]; };
-canceR = derive { name="canceR"; version="1.1.2"; sha256="07wikalgmf3vw2dzmri1ia80hfman53mynsk40y549qn8hjija1k"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
+canceR = derive { name="canceR"; version="1.1.3"; sha256="1cagv58133w80acjzlyvx2752ap4dhkpvsfr34306gwbvs4gin3j"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
 cancerclass = derive { name="cancerclass"; version="1.13.0"; sha256="066v9dz49ap0db31jrdlx2zbv8l3bwd75sf9gqa1dw3g8m9zq7hg"; depends=[binom Biobase]; };
 casper = derive { name="casper"; version="2.3.1"; sha256="12nz9ypg685c1bly3fp9x76cilh6imlw4hqdmd7sbp2d0z89dcgf"; depends=[Biobase BiocGenerics EBarrays gaga GenomeInfoDb GenomicFeatures GenomicRanges gtools IRanges limma mgcv Rsamtools rtracklayer S4Vectors sqldf survival VGAM]; };
 categoryCompare = derive { name="categoryCompare"; version="1.13.0"; sha256="08r5payxn40xdpaph6zind8miqlqdhnmka9jcijj396rbbhvb480"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCytoscape]; };
@@ -603,21 +608,21 @@ cisPath = derive { name="cisPath"; version="1.9.0"; sha256="1jdq159ixiixh9ppfc5g
 cleanUpdTSeq = derive { name="cleanUpdTSeq"; version="1.7.1"; sha256="0inszzss1fqyhw18lx40iycvpzkm18djxmad1li8bd22hss759c2"; depends=[BiocGenerics BSgenome e1071 GenomicRanges seqinr]; };
 cleaver = derive { name="cleaver"; version="1.7.0"; sha256="14vbdagy61imql6z2qazzlqzp0r9ridydn7phvajc84lnwbf8xa3"; depends=[Biostrings IRanges]; };
 clippda = derive { name="clippda"; version="1.19.0"; sha256="1gd5b2n2qa9bv1n93vcdz8lg8kmn1lv923i3gzq8pcy7fbz7m5cs"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; };
-clipper = derive { name="clipper"; version="1.9.0"; sha256="0py5hdbf8wypw5r9r2d7b3239b83lyrybcvksrmiklv7snw9c2qx"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; };
+clipper = derive { name="clipper"; version="1.9.1"; sha256="1z0wjkzx9v0wlsx2wdjxch7j6m3hlkmg5zy8fddgbv3fdc750ppm"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; };
 clonotypeR = derive { name="clonotypeR"; version="1.7.0"; sha256="1pwwjgln7r7035fdqqfb69fgql91cxfablbwid2m5xkdrwzpb57s"; depends=[]; };
 clst = derive { name="clst"; version="1.17.1"; sha256="08gqxcjchzywvc67nfjmr2i1xxm71i1j00qxdq3zs6p9y4n65qa0"; depends=[lattice ROC]; };
 clstutils = derive { name="clstutils"; version="1.17.1"; sha256="04gwj8mlbqd5l2nas146vk0vzad0z1y4225g935h9baspcmdh3f8"; depends=[ape clst lattice rjson RSQLite]; };
 clusterProfiler = derive { name="clusterProfiler"; version="2.3.6"; sha256="1hfknmad6wix5ciwcfjn80s0y78966gfkifhxa6wxpkddmdhklqw"; depends=[AnnotationDbi DOSE ggplot2 GOSemSim KEGGREST magrittr plyr qvalue topGO]; };
 clusterStab = derive { name="clusterStab"; version="1.41.0"; sha256="0sgj2k70fc3r3s19vxcx95z8s3a42yshl78swxp0qp55kidbhvdp"; depends=[Biobase]; };
 cn_farms = derive { name="cn.farms"; version="1.17.0"; sha256="09xasmanimx3mzis786iwy2nvxqa5rzvrvrz1hpsiyh5y77yrbnb"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; };
-cn_mops = derive { name="cn.mops"; version="1.15.1"; sha256="03gr4i1vpyg6h3yyqrdjq1z1dzq9jzdazcrv9045v652qf4jbshr"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools]; };
+cn_mops = derive { name="cn.mops"; version="1.15.3"; sha256="0swin9qyzi2fcc0frq0xnzmj789vbjj0mi2wnmmy131blp7iy6x9"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools]; };
 cnvGSA = derive { name="cnvGSA"; version="1.13.0"; sha256="1sswh1xwimki8ys08l2h95ajpnm5gr0bscvwilhjw4g2a0y7nibr"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; };
 coGPS = derive { name="coGPS"; version="1.13.0"; sha256="160cf9ijn5crvhwbqldix1n36jrmn51085sr4whgm765si57wwb4"; depends=[]; };
 coMET = derive { name="coMET"; version="1.1.0"; sha256="01baf156p0ldqhczrin2lsf4jir7158b0db5732jddnl5ayghsi3"; depends=[biomaRt colortools GenomicRanges ggbio ggplot2 gridExtra Gviz hash IRanges psych rtracklayer S4Vectors trackViewer]; };
 coRNAi = derive { name="coRNAi"; version="1.19.0"; sha256="1vidwyq8rnkbi0pfbh3mk8m3qj8acwqn7q6jm35gahy4y3p0nq7x"; depends=[cellHTS2 gplots lattice limma locfit MASS]; };
 cobindR = derive { name="cobindR"; version="1.7.1"; sha256="0mya51pynfdxfap3paylinqg10fpir7flsz1bng0sk34y15jnxbz"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; };
-codelink = derive { name="codelink"; version="1.37.4"; sha256="0rn2cbjgb7f9yypdrvk5ahgpghd3pn45pb183rs9fdywivys9a0v"; depends=[annotate Biobase BiocGenerics limma]; };
-cogena = derive { name="cogena"; version="1.1.3"; sha256="074knrfvnhf4fp98dypwzjsp9z15lj7xlgm1wfmnijcwrwf5566p"; depends=[amap Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots igraph kohonen mclust reshape2 STRINGdb]; };
+codelink = derive { name="codelink"; version="1.37.5"; sha256="1nh7cfhamy5l8qsxixwl4bg8k524hlr4l8v5mqf4qis9f3zp3l3x"; depends=[annotate Biobase BiocGenerics limma]; };
+cogena = derive { name="cogena"; version="1.1.6"; sha256="0sf0513qhqpb8mm2ydchdnv20dj9s510nv4rcs5b89vnwm62j0i0"; depends=[amap Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots igraph jsonlite kohonen mclust reshape2 STRINGdb]; };
 compEpiTools = derive { name="compEpiTools"; version="1.3.4"; sha256="0y12sn2dh0x2y7nghkh6dm98b4ilg41694shw3m0fcgaz22c30kp"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; };
 compcodeR = derive { name="compcodeR"; version="1.5.3"; sha256="0208sxff40mjizr47zf6yf87irnnjm0gizdk9h5frbizdxl2i9nn"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; };
 conumee = derive { name="conumee"; version="1.1.0"; sha256="1sxl5m7yfqbzg76n06y1jcv0v75y7wf3ad66zw8v004nz84diaix"; depends=[DNAcopy GenomeInfoDb GenomicRanges IRanges minfi rtracklayer]; };
@@ -645,30 +650,30 @@ derfinderHelper = derive { name="derfinderHelper"; version="1.3.1"; sha256="03ki
 derfinderPlot = derive { name="derfinderPlot"; version="1.3.4"; sha256="1f7x609sknmbn8gsxq75073vfr0qd0k9j7gfi0fxvgnm5f4lkizx"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 scales]; };
 dexus = derive { name="dexus"; version="1.9.0"; sha256="1xnjs6gmzkdj1snwakq73bz8ypnxzzxh8ki9wv0ljfbfwv1j7z53"; depends=[BiocGenerics]; };
 diffGeneAnalysis = derive { name="diffGeneAnalysis"; version="1.51.0"; sha256="1k5as63cd87nnigc0yzaxvhskpnbr7l1ym2bqc57zsm3bwh8xxwb"; depends=[minpack_lm]; };
-diffHic = derive { name="diffHic"; version="1.1.9"; sha256="0azagkb87v2lxmb5bvjqc9bz8pqnn1a9j3p5r4v8izpqwq23hf75"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges IRanges limma locfit rhdf5 Rsamtools S4Vectors]; };
+diffHic = derive { name="diffHic"; version="1.1.11"; sha256="1xc8kw489l4i4dkrsx7hihsg9cqw85y6cr956adf6mlgmgm05n16"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges IRanges limma locfit rhdf5 Rsamtools S4Vectors]; };
 diggit = derive { name="diggit"; version="1.1.1"; sha256="0c3zy1d9bzb6asa4clgq738h7dj6md55gclwa244qyx857b58rqv"; depends=[Biobase ks viper]; };
 dks = derive { name="dks"; version="1.15.0"; sha256="1d66jfca6q8ni5vz5zh7fmxwh3y0yvl2p7gal7w55py6wvyssnl3"; depends=[cubature]; };
 domainsignatures = derive { name="domainsignatures"; version="1.29.0"; sha256="1wkypbm5ldwx8y2n16fajf450pwv6zipjdk0176a5rqihaflz80l"; depends=[AnnotationDbi biomaRt prada]; };
 dualKS = derive { name="dualKS"; version="1.29.0"; sha256="1a2wb137x98nmdm8dvnl4msl89mlyvm8f1kqzr6jhdj4wjv2hrg1"; depends=[affy Biobase]; };
 dyebias = derive { name="dyebias"; version="1.27.0"; sha256="095qcnri2g19m363ipdi31xgn20b51mbfv5mgkk21m6fww1npc92"; depends=[Biobase marray]; };
-easyRNASeq = derive { name="easyRNASeq"; version="2.5.5"; sha256="0g2n3ayl06bn8khf5pail119i1611nq71vvqfkdh0v30nj9rsbw2"; depends=[Biobase BiocGenerics BiocParallel biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; };
+easyRNASeq = derive { name="easyRNASeq"; version="2.5.6"; sha256="0b93i80fjvljjm4il1ad9g3apznj23hcyhpq3z10zsw81clfya1j"; depends=[Biobase BiocGenerics BiocParallel biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; };
 ecolitk = derive { name="ecolitk"; version="1.41.0"; sha256="0jga35q98bidqjlqynq0cack4gwsm3hw34vgns67v37krjs4hn9f"; depends=[Biobase]; };
 edge = derive { name="edge"; version="2.1.0"; sha256="1xxz8qyagrfr92ldaxlgb8dfpm6nx3lyk6fa4dl0m8yvlr6lw2fa"; depends=[Biobase MASS qvalue snm sva]; };
 edgeR = derive { name="edgeR"; version="3.11.2"; sha256="0df181xjga322phjinlffl0j2mg61pq4p8h3sxx3xz100c6xrahr"; depends=[limma]; };
 eiR = derive { name="eiR"; version="1.9.1"; sha256="01wkz9lc6gi1a98q02c6zyzfsnkk52px60xg3lawp2419dvj2ww3"; depends=[BH BiocGenerics ChemmineR DBI digest RCurl RUnit snow snowfall]; };
 eisa = derive { name="eisa"; version="1.21.0"; sha256="03366q5qj4wdfm4d9lwysmgz3bgwc53zynw2cmsj7w3yg6dj63km"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; };
 ensemblVEP = derive { name="ensemblVEP"; version="1.9.2"; sha256="10xjxafm97jnk7dfi0j1ahyd6hp45r5rpfr206fbiipcq3ha2p9h"; depends=[BiocGenerics Biostrings GenomicRanges VariantAnnotation]; };
-ensembldb = derive { name="ensembldb"; version="1.1.5"; sha256="1q32pcg07lgzzavcgx5843ljchklgbscw0qgifrs6d1hidbldjvq"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges Rsamtools RSQLite rtracklayer S4Vectors]; };
+ensembldb = derive { name="ensembldb"; version="1.1.6"; sha256="1kr0yfdfhmd8g5pqazpbmaqcjw6ydv5whxf4c29d77x83alfncyh"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges Rsamtools RSQLite rtracklayer S4Vectors]; };
 epigenomix = derive { name="epigenomix"; version="1.9.2"; sha256="0l7pa2nyllf7imapbxqavyg3h0ba3wc1bhrhz7a7bc8rr8qyq0w1"; depends=[beadarray Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
 epivizr = derive { name="epivizr"; version="1.7.8"; sha256="01z80dbahjbf60d71hiqai5h5i546hvl2j737b4xjca9017g2wsg"; depends=[Biobase GenomeInfoDb GenomicFeatures GenomicRanges httpuv mime OrganismDbi R6 rjson rtracklayer S4Vectors SummarizedExperiment]; };
-erccdashboard = derive { name="erccdashboard"; version="1.3.1"; sha256="10ya8gzd9z3b7kwm9yf7v1cbxpqi1r7ghxwy1sg6b646gf3g580v"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr QuasiSeq qvalue reshape2 ROCR scales stringr]; };
+erccdashboard = derive { name="erccdashboard"; version="1.3.2"; sha256="0vsjk6ba739c2hvx87gz0n3sn2cwfm1nhwk2jcb8ynv7gxww3p4l"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr QuasiSeq qvalue reshape2 ROCR scales stringr]; };
 erma = derive { name="erma"; version="0.1.2"; sha256="046m88bjfkv8xkmz8il6l0zbp0wcr7n6wvsv2lavcyl09qnjghs0"; depends=[BiocGenerics GenomicFiles GenomicRanges ggplot2 rtracklayer S4Vectors]; };
 exomeCopy = derive { name="exomeCopy"; version="1.15.0"; sha256="1047k3whc8pjcrvb10dmykbc3c7ah4fgzsiqxw7asp4ksiqpj5ii"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
 exomePeak = derive { name="exomePeak"; version="1.9.1"; sha256="1lvzr8zsa61vj5qhd4yh9n8vmfw759b8gbpp6q9yxz1py1ky16y6"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; };
 explorase = derive { name="explorase"; version="1.33.0"; sha256="0405q21ivvchmb37jksv46kwxgbmyiavznizn39asv6wrsvw62az"; depends=[limma rggobi RGtk2]; };
 fCI = derive { name="fCI"; version="0.99.10"; sha256="1gknc8pqznxkgdgc403s59xl6x9s8cdb5iql0q88kk8jcqc2fgyl"; depends=[FNN gtools psych rgl VennDiagram zoo]; };
 fabia = derive { name="fabia"; version="2.15.0"; sha256="1631f6q30cxzaw7vqjacr44hwzrjbvk0sw3v41zagpbqbbr11swx"; depends=[Biobase]; };
-facopy = derive { name="facopy"; version="1.3.0"; sha256="0nm7jds5c4p471qyzv61byl61frwnf71kkvcdrc876168bd6s9y3"; depends=[annotate cgdsr coin data_table DOSE FactoMineR ggplot2 GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz scales]; };
+facopy = derive { name="facopy"; version="1.3.1"; sha256="091pgih7daxhz1lhynq98d5yfxv851dv64vl18dafsg3bp4k5ig5"; depends=[annotate cgdsr coin data_table DOSE FactoMineR ggplot2 GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz scales]; };
 factDesign = derive { name="factDesign"; version="1.45.0"; sha256="08d7ma718s8rdbmk00jdbwn9d1g431iaff7hc4ra421drl95yql1"; depends=[Biobase]; };
 farms = derive { name="farms"; version="1.21.0"; sha256="1c0k2ffjqfrhkw0d7h6a6sffh50qvbc7jqd3glgrvbwjnmsys34v"; depends=[affy Biobase MASS]; };
 fastLiquidAssociation = derive { name="fastLiquidAssociation"; version="1.5.0"; sha256="0477z4inv374bv5qs6wr5lcndk0d4if4hf1qbwlvv070sh5001gi"; depends=[Hmisc LiquidAssociation WGCNA]; };
@@ -683,7 +688,7 @@ flowCHIC = derive { name="flowCHIC"; version="1.3.0"; sha256="1g6kkmcja3am6dawdk
 flowCL = derive { name="flowCL"; version="1.7.0"; sha256="0n7gsvsfvfcn1ysc2kzv564hnn963rg6zwzx70vzp8lzvg55z8db"; depends=[Rgraphviz SPARQL]; };
 flowClean = derive { name="flowClean"; version="1.5.0"; sha256="1ggzsm1zrvg7x0x9jvjiqm5172cm6lvkmzkk5v38pjvhplqgx4hi"; depends=[bit changepoint flowCore sfsmisc]; };
 flowClust = derive { name="flowClust"; version="3.7.01"; sha256="06y8sg5mdjzn3d18m5b3753q2g4s4yxm1v8vb6pkdszq88255w6k"; depends=[Biobase BiocGenerics clue corpcor ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; };
-flowCore = derive { name="flowCore"; version="1.35.5"; sha256="1w9x5ynbfglj620i4ffg3p18q16ig553rfd52j7r0adlx8w1hm9d"; depends=[BH Biobase BiocGenerics corpcor graph Rcpp rrcov]; };
+flowCore = derive { name="flowCore"; version="1.35.7"; sha256="1j7819bwyrphwwh6hkcjyc7f7yy5bv2sy1qfc66519wswjr90qzn"; depends=[BH Biobase BiocGenerics corpcor graph Rcpp rrcov]; };
 flowCyBar = derive { name="flowCyBar"; version="1.5.0"; sha256="160vyp9pglsrv23m0118506bikwzi2mm9b1qgsrxjnzls2lqvjfa"; depends=[gplots vegan]; };
 flowDensity = derive { name="flowDensity"; version="1.3.0"; sha256="1z8s1d4qwavi5z8zmvac9yqyd19sma18z1jl129w6sl5964spi86"; depends=[car flowCore GEOmap gplots RFOC]; };
 flowFP = derive { name="flowFP"; version="1.27.0"; sha256="15n57slfn0z4vzqhk38mfqzb22r6krafqyp11hv1xsllp8my2a5g"; depends=[Biobase BiocGenerics flowCore flowViz]; };
@@ -702,39 +707,40 @@ flowType = derive { name="flowType"; version="2.7.0"; sha256="0zrwf7h62jd5xgs0kq
 flowUtils = derive { name="flowUtils"; version="1.33.0"; sha256="0r7l8fbi3p1y7ql60czlqhxx4l0fzxv50phwkr5w85jxxldk2pjm"; depends=[Biobase corpcor flowCore flowViz graph RUnit XML]; };
 flowVS = derive { name="flowVS"; version="1.1.0"; sha256="0g1zmcr1wd3xccx2z1akwk177innzrngmxc5r4hjanl37l0skrpq"; depends=[flowCore flowStats flowViz]; };
 flowViz = derive { name="flowViz"; version="1.33.2"; sha256="11qbpf0yw1gjzgw3pb7mnqfvwd60nms4cwrwag8h36a5whfd158c"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; };
-flowWorkspace = derive { name="flowWorkspace"; version="3.15.12"; sha256="1fw5xg93x92acg2vimp6ks9sxqkqc4vbkghvj4shagnck2zjs0dw"; depends=[BH Biobase BiocGenerics data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow plyr RBGL RColorBrewer Rcpp Rgraphviz stringr XML]; };
-flowcatchR = derive { name="flowcatchR"; version="1.3.0"; sha256="0zgbnfh3sq6s8y81al379lrif67w5xffc6n3fd5y8bp2wmdqmx8b"; depends=[abind BiocParallel colorRamps EBImage rgl]; };
+flowWorkspace = derive { name="flowWorkspace"; version="3.15.15"; sha256="1chjfhij0d4li1q2nz5yqwgmmd4vlf5rcg81z1zfs2kc3c19is18"; depends=[BH Biobase BiocGenerics data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz stringr XML]; };
+flowcatchR = derive { name="flowcatchR"; version="1.3.2"; sha256="1l1m709jfx6k13d9ayv9v355lhws6xnmz2bsklrzrkls25pfm04v"; depends=[abind BiocParallel colorRamps EBImage rgl]; };
 fmcsR = derive { name="fmcsR"; version="1.11.4"; sha256="1ah1gyrhcyv4kqxi4n8yj14mgjh6v9l820k5hzb7fwbw74kh2pa5"; depends=[BiocGenerics ChemmineR RUnit]; };
 focalCall = derive { name="focalCall"; version="1.3.0"; sha256="1g3vk72xnzy2vsjjq7dnmmxiy29qg2bqij1iim9psb2zd6w387r5"; depends=[CGHcall]; };
 frma = derive { name="frma"; version="1.21.0"; sha256="0glsdwzlfba9j850s393jm6ada4j04nz4lilym81qvs9y9jccscp"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; };
-frmaTools = derive { name="frmaTools"; version="1.21.0"; sha256="1k5ghz0ddcypisw2l64cg3r9lhvvmdiv1gpbb9b56rw0sk27w0cr"; depends=[affy Biobase DBI preprocessCore]; };
+frmaTools = derive { name="frmaTools"; version="1.21.1"; sha256="13x1k763gdkh9mab1nvsa45z7b0v2q4ilvhv47fvwagi5r11jf5w"; depends=[affy Biobase DBI preprocessCore]; };
 gCMAP = derive { name="gCMAP"; version="1.13.0"; sha256="06qb51rxxjqanh92g0cj6kwnrcbgkc2f0slav2bxkh2rkrjpyvcn"; depends=[annotate AnnotationDbi Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; };
 gCMAPWeb = derive { name="gCMAPWeb"; version="1.9.0"; sha256="0xn1iyvrw3idhwszvipf3y69i1w1azr5hhgklg57v9wibnq02q9g"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; };
 gQTLBase = derive { name="gQTLBase"; version="1.1.1"; sha256="033lfnn0zkkkzay25fkj7wizyd63jxr2nkgga22iwm8ffjgpyac0"; depends=[BatchJobs BBmisc BiocGenerics doParallel ff ffbase foreach GenomicRanges S4Vectors]; };
-gQTLstats = derive { name="gQTLstats"; version="1.1.0"; sha256="1hc2lwvq5bzxjl7xap8ykr7ja9jxpp6ydalc582v2jz6r8yp0wx8"; depends=[AnnotationDbi BatchJobs Biobase BiocGenerics doParallel dplyr foreach gam GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gQTLBase IRanges limma reshape2 S4Vectors snpStats VariantAnnotation]; };
+gQTLstats = derive { name="gQTLstats"; version="1.1.1"; sha256="0sav44fxh5m9402gip2qaql4rm81ymw7339732nw2lrjk2vm7l7l"; depends=[AnnotationDbi BatchJobs Biobase BiocGenerics doParallel dplyr foreach gam GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gQTLBase IRanges limma reshape2 S4Vectors snpStats SummarizedExperiment VariantAnnotation]; };
 gaga = derive { name="gaga"; version="2.15.1"; sha256="17ccfnvrqq6p9dynlacxw4797n1h9773ilmsh53mzs52w1k2cybm"; depends=[Biobase coda EBarrays mgcv]; };
 gage = derive { name="gage"; version="2.19.0"; sha256="1g8i3w715s10azw7xyzq6gjmz5ilxll4qcf367jn6dwz8xnf15dr"; depends=[AnnotationDbi graph KEGGREST]; };
 gaggle = derive { name="gaggle"; version="1.37.0"; sha256="1429xffj08m3dgfp6z34ngwzaq0wyjm3wv3cwfxzl5pzzy200k41"; depends=[graph rJava RUnit]; };
 gaia = derive { name="gaia"; version="2.13.0"; sha256="10vpz16plzi651aj1f5h3iwz6nzrrdnl9sgx3sgv5wmks2haqij4"; depends=[]; };
 gaucho = derive { name="gaucho"; version="1.5.0"; sha256="0kl8fw1n6dkqmrjp0xri3w2fhx25llrjag7j50m2xh371zfw9chc"; depends=[GA graph heatmap_plus png Rgraphviz]; };
 gcrma = derive { name="gcrma"; version="2.41.0"; sha256="03ncgd26hmj4l0mnnif1cf5qg99ir66d0mafx7wamrr930m17v8x"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; };
-gdsfmt = derive { name="gdsfmt"; version="1.5.6"; sha256="0xncblhsfzwzxmki0mir6khpjb4d5sjc452br8jq0hp9khl9j937"; depends=[]; };
+gdsfmt = derive { name="gdsfmt"; version="1.5.8"; sha256="1p0vr17k0vq3ck13z0xn749ma4q8r03hfvfcijhyd3kg84hxj3f6"; depends=[]; };
 geNetClassifier = derive { name="geNetClassifier"; version="1.9.2"; sha256="04k1j2hqbs75k250i8b17bb8b84mij0hyb3yk1jl1368mpn5vmhc"; depends=[Biobase e1071 EBarrays minet]; };
 geecc = derive { name="geecc"; version="1.3.0"; sha256="0s955yg31papyny42nnqq711hawk5nn3dqgsf24ldz93vjiif9dr"; depends=[gplots hypergea MASS]; };
 genArise = derive { name="genArise"; version="1.45.0"; sha256="07xyy6wa22sa0ziqvy1dvpmpq11j56aw70kvj834da003yvabmg1"; depends=[locfit tkrplot xtable]; };
 geneRecommender = derive { name="geneRecommender"; version="1.41.0"; sha256="0c06xg7jbcn4lnrkwgwwdjq383a7d34svf9cdqlaz5fc662nl5v0"; depends=[Biobase]; };
 geneRxCluster = derive { name="geneRxCluster"; version="1.5.0"; sha256="1m5jxv0qhm68iv6rwy91nkx2mz9b7zh9mdz98gva8mb6gm88iiig"; depends=[GenomicRanges IRanges]; };
 genefilter = derive { name="genefilter"; version="1.51.0"; sha256="0zrav2zw7v67i564v20y02cn2ycyk9ms8cnj2b2l7ajd1lq5cp9s"; depends=[annotate AnnotationDbi Biobase survival]; };
-genefu = derive { name="genefu"; version="1.19.0"; sha256="05rzq0dy4v7z57zqdg9v2csj3ncv2n76igbz2a9nvjpmqrgfcqlc"; depends=[amap biomaRt mclust survcomp]; };
+genefu = derive { name="genefu"; version="2.0.0"; sha256="0vrp2di9pz4xdy2shkl7ccc4ri19q2mv75xl9fkzkan4gnamlkbj"; depends=[amap biomaRt mclust survcomp]; };
 geneplotter = derive { name="geneplotter"; version="1.47.0"; sha256="03vl60rhhfh8imp0ihx83gq9r64gdnh2gjdm7pzi4yc03afqgaw8"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; };
 genoCN = derive { name="genoCN"; version="1.21.0"; sha256="10q16kch3gn6phx1zk3aii87f4liy5l6mp0kvjf29x6aam11l7c7"; depends=[]; };
-genomation = derive { name="genomation"; version="1.1.5"; sha256="0x4pgs7g46giv6z92hqa0fgq3fbw5p2jm5h8qzbwsvir3y7fnf79"; depends=[GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges plyr readr reshape2 Rsamtools rtracklayer]; };
-genomeIntervals = derive { name="genomeIntervals"; version="1.25.2"; sha256="145xg7pjihfg6qmjfmswf33hkxsnq8ml02x6s6y90giyxlmjqisk"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; };
+genomation = derive { name="genomation"; version="1.1.10"; sha256="1cxhap9h1g8a5q0jc7xpg00vcp9jrwqmn1v0vlh5ck54vnp672ks"; depends=[data_table GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr readr reshape2 Rsamtools rtracklayer]; };
+genomeIntervals = derive { name="genomeIntervals"; version="1.25.3"; sha256="14ql99gny196nl8ss3pb9m0277nczx6qj9sj2vhwfrr9q9c3ja9a"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; };
 genomes = derive { name="genomes"; version="2.15.0"; sha256="1a172fz97b6xg4w91dcjbdr9kx0grzf71qn2j7zlyz52dcqppybb"; depends=[Biostrings GenomicRanges IRanges RCurl XML]; };
-genoset = derive { name="genoset"; version="1.23.2"; sha256="0j23ym7v47fv2f2j25hfc4xh1113614ixdd1accx9gindbqf72cl"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
+genoset = derive { name="genoset"; version="1.23.5"; sha256="1vs1yffrjmqz70qc9rbzrabv7271jrqyscb43g3dw5q1mjwifjvn"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
+genotypeeval = derive { name="genotypeeval"; version="0.99.3"; sha256="1a0dxfdlcdxmsih8imhvd4mk40lzg9p8sryccqmycw360nwbxh1h"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; };
 gespeR = derive { name="gespeR"; version="1.1.0"; sha256="0hp2pw4z5kgj4av339v7r43is082c47ms422pwwa5f2pljijz2z6"; depends=[Biobase biomaRt cellHTS2 doParallel foreach ggplot2 glmnet Matrix reshape2]; };
-ggbio = derive { name="ggbio"; version="1.17.1"; sha256="1pc98v500l476sa1krxrj24lfsnbs13ws9hdix3vxfkbklvqjww7"; depends=[Biobase BiocGenerics Biostrings biovizBase BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; };
-ggtree = derive { name="ggtree"; version="1.1.8"; sha256="1y9h93wn0zmmaz4hdn2xgz226y8pak0lnix5wvv1xax7myzhkbyl"; depends=[ape Biostrings colorspace EBImage ggplot2 gridExtra jsonlite magrittr reshape2]; };
+ggbio = derive { name="ggbio"; version="1.17.2"; sha256="09ffhppri2ibprpwps0zxsrpvbrymsnycriy4709x2ldp1ifjn9l"; depends=[Biobase BiocGenerics Biostrings biovizBase BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; };
+ggtree = derive { name="ggtree"; version="1.1.10"; sha256="1p2cc500swcnfv5xa883dq60lgfx9lc080hjydn7zac0k2vvv42r"; depends=[ape Biostrings colorspace EBImage ggplot2 gridExtra jsonlite magrittr reshape2]; };
 girafe = derive { name="girafe"; version="1.21.0"; sha256="11j9aiy6s5cdhwc9591vv344qnwlgn4hvwlp2rx47gccrnxxaqxi"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; };
 globaltest = derive { name="globaltest"; version="5.23.0"; sha256="1cwgqq5i3v6pp5kp4qi0jxqfh09zgaj719mk4kci3wxb18dc6ql7"; depends=[annotate AnnotationDbi Biobase multtest survival]; };
 gmapR = derive { name="gmapR"; version="1.11.0"; sha256="0vn5iz44gcp4k0y5y4pjw6m60w75k82kv25hmnjshh8cpcwqkxkp"; depends=[Biobase BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
@@ -745,7 +751,7 @@ gpls = derive { name="gpls"; version="1.41.0"; sha256="050db8ag8wpngfkw686r9vjvd
 gprege = derive { name="gprege"; version="1.13.0"; sha256="0z27521mjn5ipjq8wi3fbh2qw4k1q694l8268f8lypr9f357i1q4"; depends=[gptk]; };
 graph = derive { name="graph"; version="1.47.2"; sha256="0db15kd5qf993qdbr7dl2wbw6bgyg3kiqvd1iziqdq6d2vvbpzbj"; depends=[BiocGenerics]; };
 graphite = derive { name="graphite"; version="1.15.1"; sha256="1q3ybshd9yxivs1b5vj659c45qa8bf7r1dy3idg8g7glh9f2bgnl"; depends=[AnnotationDbi BiocGenerics graph]; };
-groHMM = derive { name="groHMM"; version="1.3.0"; sha256="0kx574xs0k51wwkvm6rbrrgr76ziwkkyqhiy076yzfsfkm3d1jvf"; depends=[GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; };
+groHMM = derive { name="groHMM"; version="1.3.1"; sha256="1bwa2dc2hmp34grl1ki8wzqn5v12afrmcw0igdiv4j8sfgybw3w7"; depends=[GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; };
 gtrellis = derive { name="gtrellis"; version="1.1.1"; sha256="17jflcq97a3a7k735klj6pphn6ixyshggwi0n7b45jgkqi9j5s08"; depends=[circlize GetoptLong]; };
 gwascat = derive { name="gwascat"; version="2.1.4"; sha256="13hvh6rvlh13n9dxx9g1q68qz4mxsvv4sh0kc1931b3vz2mfs0m0"; depends=[AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicRanges gQTLstats Gviz IRanges Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; };
 h5vc = derive { name="h5vc"; version="2.3.0"; sha256="1cl00k13x03sm60gfkxmaf6ba9kw4186cnik08zn446fipxqypla"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges reshape rhdf5 Rsamtools S4Vectors]; };
@@ -775,10 +781,10 @@ inSilicoDb = derive { name="inSilicoDb"; version="2.5.0"; sha256="1w5irx042z8if0
 inSilicoMerging = derive { name="inSilicoMerging"; version="1.13.0"; sha256="0zaqwachxn3anbjyn0akv0n2djg08475cdxz7c44ja635r1f6y1j"; depends=[Biobase]; };
 intansv = derive { name="intansv"; version="1.9.0"; sha256="0vb5hls1yyw0x0ff2xcjmxplg0gar9g9xvs1bqw96bf9akcr12r9"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; };
 interactiveDisplay = derive { name="interactiveDisplay"; version="1.7.2"; sha256="1ql4qr5m1xsn3z57p2ndfc4b0zmxgjj0d3gb937ikfljm43jkwyk"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; };
-interactiveDisplayBase = derive { name="interactiveDisplayBase"; version="1.7.0"; sha256="0032ljfx6pj0c11imfhxsxvrcn3gwyb6j29xl8xv48x8z44r0vas"; depends=[BiocGenerics shiny]; };
+interactiveDisplayBase = derive { name="interactiveDisplayBase"; version="1.7.1"; sha256="00b32z45xh0n1hrj166ax71p2aka3df9b2440wq0zribb9jf1s02"; depends=[BiocGenerics shiny]; };
 inveRsion = derive { name="inveRsion"; version="1.17.0"; sha256="1km1h75dh5q505x1ddlhvyqxy4c10wvlviiz2l8sv3g3m9mbd26h"; depends=[haplo_stats]; };
 iontree = derive { name="iontree"; version="1.15.0"; sha256="0frq4f357n5w08nwz3m7s0hv858kgcnlvxb4907yrg1b11zpfvmm"; depends=[rJava RSQLite XML]; };
-isobar = derive { name="isobar"; version="1.15.0"; sha256="0zkj2i1hhs9nwflnwidzpnqcs08vbv3vqwz244shs9i7h0c5fd16"; depends=[Biobase distr plyr]; };
+isobar = derive { name="isobar"; version="1.15.1"; sha256="1i4zlfxbx94yb70bvd3wzlald2fi9ix4bhdlyim490rcdhb0lhyr"; depends=[Biobase distr plyr]; };
 iterativeBMA = derive { name="iterativeBMA"; version="1.27.0"; sha256="18g04l2bksjc2563kd2fmjygpci6pdw9lxv4ax0kpbfvc7zwbz17"; depends=[Biobase BMA leaps]; };
 iterativeBMAsurv = derive { name="iterativeBMAsurv"; version="1.27.0"; sha256="1l36lmxlwq16kzh8i8nbi8bbrgqc7im1b5pcc170q89x6rfgvyf7"; depends=[BMA leaps survival]; };
 jmosaics = derive { name="jmosaics"; version="1.9.0"; sha256="00c84fh5798yyzmsy985b79fcf2yz8y8am13dj7xgnzxl5nj32v1"; depends=[mosaics]; };
@@ -787,15 +793,15 @@ kebabs = derive { name="kebabs"; version="1.3.3"; sha256="10pnr5fd2ni4w69qp30q81
 keggorthology = derive { name="keggorthology"; version="2.21.0"; sha256="1d3dz61llgmdnyqxqwv03pacfs97lzynzpjpmn7grf7bbpybjk2q"; depends=[AnnotationDbi DBI graph]; };
 lapmix = derive { name="lapmix"; version="1.35.0"; sha256="1sps41l210h782bry6n8h55ghnlqn7s5dx0bx2805y5izz01linm"; depends=[Biobase]; };
 les = derive { name="les"; version="1.19.0"; sha256="1b3zcvflwyybrh9pf33a0fn5qz6918sszjf0n666iqd3hh7zph8z"; depends=[boot fdrtool gplots RColorBrewer]; };
-limma = derive { name="limma"; version="3.25.12"; sha256="1gl13qnbj4w2bzdxf1ml603r1ccyq0wv1ynlrgb8j9sa7z228ri9"; depends=[]; };
-limmaGUI = derive { name="limmaGUI"; version="1.45.0"; sha256="05pqzb5nq3paddq2zw80gvdaf8rvynga8zs24rwzjpz3ylakqngr"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
+limma = derive { name="limma"; version="3.25.14"; sha256="136pvfqqf9jwdir543wblrv6z4fpha5x2dbwldj980yhj4aqz76d"; depends=[]; };
+limmaGUI = derive { name="limmaGUI"; version="1.45.2"; sha256="1s1dn14d5yhmfqj4r3kaxavpxaxsjw2492fpijgq0v8dnwqhz190"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
 lmdme = derive { name="lmdme"; version="1.11.0"; sha256="0j41rfvbhz31vniax7njnslxd94lws4jjfv3hc2s1ihxnj41dcma"; depends=[limma pls]; };
 logicFS = derive { name="logicFS"; version="1.39.0"; sha256="1sz4bxsg76437j42i6cpbqvj5a35q7dwhya4yh1gmknqjrrcrv56"; depends=[LogicReg mcbiopi]; };
 logitT = derive { name="logitT"; version="1.27.0"; sha256="13gglwkvwrc5xr44ynz10qzyksry0wamk9mjlsfb18c2ncbnyypq"; depends=[affy]; };
 lol = derive { name="lol"; version="1.17.1"; sha256="0adj2bg8akb3z0w3wqj6bdlypf9c587k5c2npx0l21hgy4qv7p8k"; depends=[Matrix penalized]; };
 lpNet = derive { name="lpNet"; version="2.1.2"; sha256="0qy2ardh00gf3xkhqphvmdsnsxa4pjrdpcxpjs53nw68bcsbgy9g"; depends=[lpSolve nem]; };
 lumi = derive { name="lumi"; version="2.21.2"; sha256="0nfkzf11lnpvyqng8ns6nf23qkap04fir8cbqngnzm6yddfk33dq"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; };
-mAPKL = derive { name="mAPKL"; version="1.1.0"; sha256="1knjvwd0z4i70py0dqcngz56j78ylhcxsw8dyxj80ns5jzsdppbx"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene]; };
+mAPKL = derive { name="mAPKL"; version="1.1.1"; sha256="1wya7fhr6xbjdc61q0hk7k2y3iivashdksqj6b8459c9cr1mn5sl"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene]; };
 mBPCR = derive { name="mBPCR"; version="1.23.0"; sha256="0c0idj213l8gwxkh9sb03dr4jhlbwvkpghldccbjrqnk4jqs4zpp"; depends=[Biobase oligoClasses SNPchip]; };
 mQTL_NMR = derive { name="mQTL.NMR"; version="1.3.0"; sha256="05q3p6pxi5x89z3zyrvdv5p2lzwr3as3zwcg8k0zm70liyczqcbx"; depends=[GenABEL MASS outliers qtl]; };
 maCorrPlot = derive { name="maCorrPlot"; version="1.39.0"; sha256="14p6cliik2ar0x8q4x66p43lsdbz11sqa7szafqvk7aw3pbszgh4"; depends=[lattice]; };
@@ -830,20 +836,21 @@ methylMnM = derive { name="methylMnM"; version="1.7.0"; sha256="08y13kkmafn2h55w
 methylPipe = derive { name="methylPipe"; version="1.3.4"; sha256="17y9xsvl6wgm7kn8g35h3zh7bcqhy7qp2lia6dzx609i04a9br9f"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; };
 methylumi = derive { name="methylumi"; version="2.15.2"; sha256="174hikk5flwylifv7n8n67aps4np06klw240bdzfr347r8yrvikp"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; };
 mgsa = derive { name="mgsa"; version="1.17.0"; sha256="1nic4bgk3g3j2l6vr3i3msmid2bz0n7bq8f8zq26n45sr37wb4wq"; depends=[gplots]; };
+miRLAB = derive { name="miRLAB"; version="0.99.2"; sha256="0q255w5myzv9hg27xz4k3ykxf6arpr3nf28ykf23szcw8p01dc80"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; };
 miRNApath = derive { name="miRNApath"; version="1.29.0"; sha256="07r37gzn0y5cp4awj2i638i2cn019rnp7b4hnaqi3gc71sdzb25c"; depends=[]; };
 miRNAtap = derive { name="miRNAtap"; version="1.3.0"; sha256="0hmnhbbai04wp8hxrpgq04czfx2c49aihq7iiz86x9hzlj6xhgn6"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; };
 microRNA = derive { name="microRNA"; version="1.27.0"; sha256="1akq1yxc03v7jmpypmr8a9lx5h2nfdjp1y0433lyffbd49wia2gm"; depends=[Biostrings]; };
 minet = derive { name="minet"; version="3.27.0"; sha256="1wnn3nlpa0ymk465ax2s65i3w9xplhwssvng9qs7p3v2z72p9nqp"; depends=[infotheo]; };
-minfi = derive { name="minfi"; version="1.15.9"; sha256="1q21b57iw8lbzbjq96qmlmccijz0apr9clasrz4nbmbgyn97gba2"; depends=[beanplot Biobase BiocGenerics Biostrings bumphunter genefilter GenomeInfoDb GenomicRanges GEOquery illuminaio IRanges lattice limma MASS matrixStats mclust mixOmics nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; };
+minfi = derive { name="minfi"; version="1.15.11"; sha256="14j5vw6vmfz2h85n4dmsnx7138mxwzfl961p8y5wh1brz4vr31iy"; depends=[beanplot Biobase BiocGenerics Biostrings bumphunter genefilter GenomeInfoDb GenomicRanges GEOquery illuminaio IRanges lattice limma MASS matrixStats mclust mixOmics nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; };
 mirIntegrator = derive { name="mirIntegrator"; version="0.99.5"; sha256="0r8l1lgf9rdxnr0dvc8r05ahjf3q0r4syy9mzx4p3f04s0c78q3h"; depends=[AnnotationDbi ggplot2 graph Rgraphviz ROntoTools]; };
 missMethyl = derive { name="missMethyl"; version="1.3.2"; sha256="05xk70z813jgwz9darqwh0f9ybycq9krig486b3751dd0xnjgmcq"; depends=[limma methylumi minfi ruv statmod stringr]; };
 mitoODE = derive { name="mitoODE"; version="1.7.0"; sha256="182ifqh1g1yz8rbsxdqgk4hzlz3dwy0d03iklbg39cxy6qhgxqg4"; depends=[KernSmooth MASS minpack_lm]; };
 mmnet = derive { name="mmnet"; version="1.7.0"; sha256="0za8a3j2fzyi15hd7l3ccw5qy3lyl7vihbcbixaw2kb81hmpphsa"; depends=[Biobase biom flexmix ggplot2 igraph KEGGREST Matrix plyr RCurl reshape2 RJSONIO stringr XML]; };
-mogsa = derive { name="mogsa"; version="1.1.3"; sha256="0rzqlm0c4skjgic334nfd2s7p0xk86mv1zbwjk036nwf5lnmdd0i"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
+mogsa = derive { name="mogsa"; version="1.1.5"; sha256="1xn2rrp9s3d84i7ln37iblnxadl1dsi7qd98k5xz71kq0v1ljpy4"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
 monocle = derive { name="monocle"; version="1.3.0"; sha256="1ir0f80nsrvpl4i441irprd4pk1f53dxf1jnvnjg5zrkj7dz3wrw"; depends=[Biobase BiocGenerics cluster combinat fastICA ggplot2 igraph irlba limma matrixStats plyr reshape2 VGAM]; };
 mosaics = derive { name="mosaics"; version="2.3.0"; sha256="1jv5sv6xyh5i5m7kypgwc5g3sfsf0n5n683gijxcvrrwpvvfpnqy"; depends=[IRanges lattice MASS Rcpp]; };
 motifRG = derive { name="motifRG"; version="1.13.0"; sha256="01k47padfs393pprjyz9pp9z6vjqlxi6x10y51mhg0anqfb1sar2"; depends=[Biostrings BSgenome IRanges seqLogo XVector]; };
-motifStack = derive { name="motifStack"; version="1.13.3"; sha256="08ddwy3yyydxaxs6qfh99va3v7xx57kq1pizqknxaar0p79x278w"; depends=[ade4 Biostrings grImport MotIV scales XML]; };
+motifStack = derive { name="motifStack"; version="1.13.6"; sha256="0yp3k22i35hdmx5b5a9dk9mkdvglry6s8ck57gsl039ypf58kpja"; depends=[ade4 Biostrings grImport MotIV scales XML]; };
 msa = derive { name="msa"; version="1.1.1"; sha256="0nqgx1zb3n8kk2l3dgilsamwzadnddif39q5br7qs9xl38hag4nr"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; };
 msmsEDA = derive { name="msmsEDA"; version="1.7.0"; sha256="1hywj0vvrqq1zg62gr1rk4sblm201hgwz5kd78819apw5jf50fwd"; depends=[gplots MASS MSnbase RColorBrewer]; };
 msmsTests = derive { name="msmsTests"; version="1.7.0"; sha256="1qvi91shpy02irppq6g6lq43sp3rk2j7n1nfnm2p9767rdhbj13b"; depends=[edgeR msmsEDA MSnbase qvalue]; };
@@ -852,14 +859,14 @@ multiscan = derive { name="multiscan"; version="1.29.0"; sha256="0rp1nc8vjr8b0v9
 multtest = derive { name="multtest"; version="2.25.2"; sha256="1gby3am0rp62lsijhbr8yx8y457yhrv2ghdb41kl53r59mw8ba4z"; depends=[Biobase BiocGenerics MASS survival]; };
 muscle = derive { name="muscle"; version="3.11.0"; sha256="1s3apdcd0qj08bswn7smj7b93yv9qar7wrzyfkp5z3m16jgz979x"; depends=[Biostrings]; };
 mvGST = derive { name="mvGST"; version="1.3.0"; sha256="1chskyx9hgymxg57p6y98rw743lapssx18axvl0r9f2zsmmfz9bn"; depends=[annotate AnnotationDbi GOstats gProfileR graph Rgraphviz stringr topGO]; };
-mygene = derive { name="mygene"; version="1.5.1"; sha256="0f1ck375fqbz3ydjjg9qd9av8jbpc840nv3j83qic8g3r2pck8ij"; depends=[GenomicFeatures Hmisc httr jsonlite S4Vectors sqldf]; };
+mygene = derive { name="mygene"; version="1.5.2"; sha256="0x40bnll85v94dnfpqrs8d9kx0zmdjbvgnqhcin1k9bshxqkypd9"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; };
 mzID = derive { name="mzID"; version="1.7.1"; sha256="1pp0zfffz91g16y1kr81mbham64g00mm3q539ykj5az34g5q1fcm"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; };
 mzR = derive { name="mzR"; version="2.3.1"; sha256="19piyqgdxpi777nd4860d6mp0g4zzcf3wf7q7ilm99jqav9lfrn8"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; };
-ncdfFlow = derive { name="ncdfFlow"; version="2.15.2"; sha256="0s65c26r6q8di73iwpkrx4g3d9dy6v18vna7yy7di5vsgy0phr9l"; depends=[BH Biobase flowCore flowViz Rcpp RcppArmadillo zlibbioc]; };
+ncdfFlow = derive { name="ncdfFlow"; version="2.15.3"; sha256="0xhqis5pj5m4ib4xpkgg1afxzjc1827jw5k569aijr11qmi6jjxw"; depends=[BH Biobase flowCore flowViz Rcpp RcppArmadillo zlibbioc]; };
 neaGUI = derive { name="neaGUI"; version="1.7.0"; sha256="198b0vrr5qp66z4sccwy6rh8sjxpw3qjkdryygg1baxq91ra76p1"; depends=[hwriter]; };
 nem = derive { name="nem"; version="2.43.0"; sha256="1d357gh8binh0fwg1z0mzjzq3nyhazg9dnnf7aqk6gjfgsjda9i8"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; };
 netbenchmark = derive { name="netbenchmark"; version="1.1.6"; sha256="07q5a9kxq5r0ch32q68vxb4gxl6r5zhw6d06b8c89h42cby2qdfp"; depends=[c3net GeneNet minet PCIT pracma randomForest Rcpp]; };
-netbiov = derive { name="netbiov"; version="1.3.0"; sha256="0d6xc74ivzvi0n9ndfgc0m9y79mwdbs344lxv9nps4igd7aaxh34"; depends=[igraph]; };
+netbiov = derive { name="netbiov"; version="1.3.1"; sha256="1v1iddwgz7nn0flgald0nrg96wm8pvdlwjnh8bql8y5x5sm58lmv"; depends=[igraph]; };
 nethet = derive { name="nethet"; version="1.1.0"; sha256="1xklqhwfmv1sk5h3x2g1jjbl5higrzhfj0mvap15vr2agax5hbg5"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; };
 netresponse = derive { name="netresponse"; version="1.19.0"; sha256="0blgcfbhwns4khnsd3m2yafmihr63kh3zsf7imphim0cdrx67xks"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape Rgraphviz]; };
 networkBMA = derive { name="networkBMA"; version="1.11.0"; sha256="09wf696s8n30nnadfds58flv8sv2gamgnw6pzz80isfc3178h1n6"; depends=[BMA Rcpp RcppArmadillo RcppEigen]; };
@@ -874,12 +881,12 @@ oligoClasses = derive { name="oligoClasses"; version="1.31.1"; sha256="0likyfm4x
 omicade4 = derive { name="omicade4"; version="1.9.3"; sha256="00dr419qd563d75srypc02j6m5v281995mrh0r6fylz5bmi9bbks"; depends=[ade4 made4]; };
 oneChannelGUI = derive { name="oneChannelGUI"; version="1.35.0"; sha256="1diclgl4zkzzyz705cyqx983bw4zqw03rx7fn9515w0ifl0bk1r4"; depends=[affylmGUI Biobase Biostrings chimera IRanges Rsamtools siggenes tkrplot tkWidgets]; };
 ontoCAT = derive { name="ontoCAT"; version="1.21.0"; sha256="10d0a0fxg2h9gf6d1jbilxxg8irbqb1k526689qkdn2zh0qjvv04"; depends=[rJava]; };
-openCyto = derive { name="openCyto"; version="1.7.2"; sha256="1x92yam7zdmsf6x0xqydwz70qmh3gzzi64mbiwrihr8abcjmhjhd"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
-oposSOM = derive { name="oposSOM"; version="1.5.2"; sha256="0zvclv05sfgk0mq169igaqhqmx2hqj3iwrxrjgryy276xjywhxcr"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; };
-pRoloc = derive { name="pRoloc"; version="1.9.3"; sha256="09pi362w1vfcx6fsr6bbsjqq9wq93dzhw0myavxsj11g3pnqh66n"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class e1071 FNN ggplot2 gtools kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; };
-pRolocGUI = derive { name="pRolocGUI"; version="1.3.0"; sha256="1k7r8fhj4fqizk1w76mfcdd9sj3y7vxiq3kzfrkbk674gl1jsgmq"; depends=[MSnbase pRoloc shiny]; };
+openCyto = derive { name="openCyto"; version="1.7.4"; sha256="1q07s7rv19yahlpjpvsrhbvld6n2bf7jv7lfrgs6syfl3fwrs008"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
+oposSOM = derive { name="oposSOM"; version="1.5.4"; sha256="0f06wmy1n9gl41x4x7q1fcfxaw6y6qkrmb4ypg9j6v7xjhjpfj03"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; };
+pRoloc = derive { name="pRoloc"; version="1.9.5"; sha256="0fsgz5fl29s2lkgm1dqcymw5gjc1lp4mdafqx9fa5l1rhlg81hyr"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class e1071 FNN ggplot2 gtools kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; };
+pRolocGUI = derive { name="pRolocGUI"; version="1.3.2"; sha256="08q1cavlxryx9isn2wsw8r0bv795hgzkyfx95ycxxdwh6vdvnnyl"; depends=[DT MSnbase pRoloc scales shiny]; };
 paircompviz = derive { name="paircompviz"; version="1.7.0"; sha256="0sf80ji20q6kaqw2747an9b51xxwhl55yj5y7q6j68gif1ndkzl4"; depends=[Rgraphviz]; };
-pandaR = derive { name="pandaR"; version="1.1.0"; sha256="03aa0s1mifq5hyg4xshbjqz9javphgb11135zvfg8cqdq34dzg4m"; depends=[]; };
+pandaR = derive { name="pandaR"; version="1.1.1"; sha256="0rp8qk5cn5zj0nypkhmxjpja6lkjxd3hw2dkl4gaisayhiqlfk3g"; depends=[igraph matrixStats]; };
 panp = derive { name="panp"; version="1.39.0"; sha256="163yii12bhw0skzhwrjbavpsgsl2aygj8x9cilzj9pqsqakvinna"; depends=[affy Biobase]; };
 parglms = derive { name="parglms"; version="1.1.0"; sha256="1msk5ygl030rczm10rp9xnb461cbzcs7qqk6jqk8xhv5dycnwnbd"; depends=[BatchJobs BiocGenerics BiocParallel]; };
 parody = derive { name="parody"; version="1.27.0"; sha256="06lrzix8ydc41siy21fqkf3z6krj07p5v38pzan8jzzhqpwlq4iz"; depends=[]; };
@@ -890,7 +897,7 @@ paxtoolsr = derive { name="paxtoolsr"; version="1.3.1"; sha256="0pv4zcl12yxidiy3
 pcaGoPromoter = derive { name="pcaGoPromoter"; version="1.13.1"; sha256="0a1yfi16sadp5fj112mlq9har0yggp8amn8v4v18jzfrb8aiacsj"; depends=[AnnotationDbi Biostrings ellipse]; };
 pcaMethods = derive { name="pcaMethods"; version="1.59.0"; sha256="12b8qdd38xgpzisz0lm9xkwq22z5ciq7b8i11z3na1wynvim3nll"; depends=[Biobase BiocGenerics MASS Rcpp]; };
 pcot2 = derive { name="pcot2"; version="1.37.0"; sha256="023ly5jgq8zc7k73mfqvra13mask54l7f62dznjh1dcjpv6xgw4p"; depends=[amap Biobase]; };
-pdInfoBuilder = derive { name="pdInfoBuilder"; version="1.33.1"; sha256="1vyw3ggh247km4qag1gy3wz9v338na4hlxmqz57mv51gp7fw6v1l"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
+pdInfoBuilder = derive { name="pdInfoBuilder"; version="1.33.2"; sha256="026l6klpf93h42xgrbjyl022l0d0722gp7cqqgq4j8nb0wydg8l2"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
 pdmclass = derive { name="pdmclass"; version="1.41.0"; sha256="0361s7d6n9wn65pxks3alr8ycqjcgv9dvvb2n9xqiqawyki1nvpm"; depends=[Biobase mda]; };
 pepStat = derive { name="pepStat"; version="1.3.0"; sha256="003gqcs5m5b8mil9r1ydadhcc086nqmdk6i1xz4kkdpkcyxbyz7p"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; };
 pepXMLTab = derive { name="pepXMLTab"; version="1.3.0"; sha256="0rbcj59vsbq8zqxq4h1v077jgpz7l607zalc4lhw9yn8l5lij4j8"; depends=[XML]; };
@@ -934,8 +941,9 @@ qusage = derive { name="qusage"; version="1.9.0"; sha256="1dg8qchhqfvak5cqjs9v30
 qvalue = derive { name="qvalue"; version="2.1.0"; sha256="0qgsqjb90qnf5a77n3zf5dcb5agdbj4hlk3swh1hrjg9iqcs76g0"; depends=[ggplot2 reshape2]; };
 r3Cseq = derive { name="r3Cseq"; version="1.15.0"; sha256="0pi5aq3dbivk23x6axwbqa4danbsvn623icw6xvlh3i71v8m5rkw"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; };
 rBiopaxParser = derive { name="rBiopaxParser"; version="2.7.0"; sha256="1ni8kaivdxqxv8fj2qf5vnwzmmamfd073l1p4072pnfxpn7rn0p4"; depends=[data_table XML]; };
+rCGH = derive { name="rCGH"; version="0.99.6"; sha256="1iqw7za7sy8z9flh537xdxx7gcvq6l3nsbszg68c9ja5lmlm2pmj"; depends=[aCGH affy AnnotationDbi BiocGenerics DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 lattice limma mclust plyr RUnit shiny]; };
 rGADEM = derive { name="rGADEM"; version="2.17.0"; sha256="1xwypnpf7sdaqszfmallgg2314g866xbi9q342yhds2fkiw9sp65"; depends=[Biostrings BSgenome IRanges seqLogo]; };
-rGREAT = derive { name="rGREAT"; version="1.1.0"; sha256="1rd4cjwh4rrqgfg15k32br0iv15j99797z7lx7789wc1zxkpzvg3"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; };
+rGREAT = derive { name="rGREAT"; version="1.1.2"; sha256="0wwwpbxp8263jgkja6szcwqvijig8cfxdb66hvjqq69h9lqg9bkx"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; };
 rHVDM = derive { name="rHVDM"; version="1.35.0"; sha256="0y2vm6xsdsz174xrs22p54z5f5rxqcx937yf02ilv0bnfa0r06hj"; depends=[affy Biobase minpack_lm R2HTML]; };
 rMAT = derive { name="rMAT"; version="3.19.0"; sha256="0nhmf1hbiqwzb9035405f8asnhh2ywj4bm9wdlgbafyhiw6qik98"; depends=[affxparser Biobase BiocGenerics IRanges]; };
 rRDP = derive { name="rRDP"; version="1.3.0"; sha256="0q373nfs4ynjnmq9rp0c0ficnnylwb2gf1j0bzlnxcd2cwz215zv"; depends=[Biostrings]; };
@@ -943,7 +951,7 @@ rSFFreader = derive { name="rSFFreader"; version="0.17.1"; sha256="105qlrjq4777k
 rTANDEM = derive { name="rTANDEM"; version="1.9.0"; sha256="08r73kv83w8rfglbqf2zvczj4yix7sfhvrz93wk22nry04jfgccr"; depends=[data_table Rcpp XML]; };
 rTRM = derive { name="rTRM"; version="1.7.1"; sha256="06p38i0hif1kjsy4xa88jhfl5giprq8gfa15zh1yv1qdqhaf1v1m"; depends=[AnnotationDbi DBI igraph RSQLite]; };
 rTRMui = derive { name="rTRMui"; version="1.7.0"; sha256="132cm40hxhb4apdidifbw90jyxhlz0dqxgqsr6awv8q6dy9jpfw4"; depends=[MotifDb rTRM shiny]; };
-rain = derive { name="rain"; version="1.3.0"; sha256="0ak8wbhsglnylzy1jzh9hb2yxqjzmspvj98x10vf3qmgbqc30i4y"; depends=[gmp multtest]; };
+rain = derive { name="rain"; version="1.3.1"; sha256="0hzfrab9b67wk9kkkx7bn1w2imhlq4j8mi3fch3ij42081g8plww"; depends=[gmp multtest]; };
 rama = derive { name="rama"; version="1.43.0"; sha256="1siqzb0b9j51b06aijz85xn6c9v4dqvcw7scmrlfpf18dihqaig1"; depends=[]; };
 randPack = derive { name="randPack"; version="1.15.0"; sha256="0m9729h3fia15rcgxznz4hmlz7abz8xkbn1ffc3l8qhqks5j50f7"; depends=[Biobase]; };
 rbsurv = derive { name="rbsurv"; version="2.27.0"; sha256="1v97vrralg445zn8s3km7vmhlxhkv8bdwcj90fyvd6kfk7gm4xc7"; depends=[Biobase survival]; };
@@ -953,12 +961,13 @@ regionReport = derive { name="regionReport"; version="1.3.8"; sha256="0gpifx0x2k
 regioneR = derive { name="regioneR"; version="1.1.1"; sha256="1wylrkqiv5lc9rw3mc1by88ckx437jwhlgyg5kasvpry003rm72c"; depends=[BSgenome GenomicRanges memoise rtracklayer]; };
 rfPred = derive { name="rfPred"; version="1.7.0"; sha256="0k1z7bqdjmm668kipz8c74kd9k1vw2pcjbirxdi88clrclz3i47y"; depends=[data_table GenomicRanges IRanges Rsamtools]; };
 rgsepd = derive { name="rgsepd"; version="1.1.0"; sha256="1rvzlzh43j3sj2vrhmg13hl4wq3bg9hml3xq2dpx28lapynywm41"; depends=[AnnotationDbi biomaRt DESeq2 GenomicRanges goseq gplots hash]; };
-rhdf5 = derive { name="rhdf5"; version="2.13.4"; sha256="0vby0cpsc22jrq37p3sxj6f3q0l238d28lx0p558mh8nks9fkai1"; depends=[zlibbioc]; };
+rhdf5 = derive { name="rhdf5"; version="2.13.5"; sha256="1k2hjzzj2irs7jap7g4ys0gd3iymnnbbyvyv986y9pq68p4f1nr0"; depends=[zlibbioc]; };
 riboSeqR = derive { name="riboSeqR"; version="1.3.0"; sha256="0jlh5q1hkxkfvy496hlbwfkl17k36n304yiyz9f0azq5kv7jz1y2"; depends=[abind GenomicRanges]; };
 rnaSeqMap = derive { name="rnaSeqMap"; version="2.27.0"; sha256="1638vikgizcgg4bpfm61ak98smwy74dk5hyx73qjbisd49zvy5nk"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; };
 rnaseqcomp = derive { name="rnaseqcomp"; version="0.99.3"; sha256="0gyz91ayyr1834hr6jg1bnjiiiw4k75j3kn5pfmw9q8v9vg2fcsj"; depends=[RColorBrewer]; };
 roar = derive { name="roar"; version="1.5.2"; sha256="0g0ylr49dvnbyb1kwj20hrh3y3x49n4rbdvg7mpdg1byrygcli3c"; depends=[GenomicAlignments GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
 rols = derive { name="rols"; version="1.11.6"; sha256="0wgzvwfq677dkqzzcq071xbh6v47vkcrzw66ch1vg348pcj58z0f"; depends=[Biobase XML]; };
+ropls = derive { name="ropls"; version="1.1.2"; sha256="06z0ay0rdaawyvpy7dbdpxkwa8311rlb9plk4v52v830zibamhvs"; depends=[]; };
 rpx = derive { name="rpx"; version="1.5.1"; sha256="048qldpx4zsp55jkr8g8vljiyidm9kzv4p1vwh1983y38qbz882v"; depends=[RCurl XML]; };
 rqubic = derive { name="rqubic"; version="1.15.0"; sha256="19n613m7x48wkrfrhnd0ab9018m5dd7rf08qjbgphakwycssfgcw"; depends=[biclust Biobase BiocGenerics]; };
 rsbml = derive { name="rsbml"; version="2.27.0"; sha256="10qmv5gpgqffnr5wqh7zik0l2d1cg0c0m3xak4r4bqmsd1y4dw01"; depends=[BiocGenerics graph]; };
@@ -997,7 +1006,7 @@ snm = derive { name="snm"; version="1.17.0"; sha256="0ckn29nymlml8ldxqq5la1h3bwm
 snpStats = derive { name="snpStats"; version="1.19.1"; sha256="1i4v737mrjjp8b24mihiv53ifgjcs7gaf9c4h2ling6gpasf39z8"; depends=[BiocGenerics Matrix survival zlibbioc]; };
 soGGi = derive { name="soGGi"; version="1.1.2"; sha256="0vqsdlnbdimz1y2q37ycddc3ifykbr9d0hsg47kqh5wjzgsrl4h7"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
 spade = derive { name="spade"; version="1.17.0"; sha256="02ba8ybgcldjmfsxywb0q7drm5nyhg6i72brvbrcgsq2ni0b7cpf"; depends=[Biobase flowCore igraph Rclusterpp]; };
-specL = derive { name="specL"; version="1.3.3"; sha256="17067na171pn55w7znyhrn9bcibjpk7spvdw5l6gzrr5slh49qg8"; depends=[DBI protViz Rcpp RSQLite seqinr]; };
+specL = derive { name="specL"; version="1.3.5"; sha256="0afaxclb4h797hm6rdybvp5dp85r1hmwgykj0q5h9ialqbjkmsv7"; depends=[DBI protViz Rcpp RSQLite seqinr]; };
 spikeLI = derive { name="spikeLI"; version="2.29.0"; sha256="1f7in8zcbdz9i1cqdhvdcjl6g71vhz9hgd8whc0x9nf12qa87l7p"; depends=[]; };
 spkTools = derive { name="spkTools"; version="1.25.0"; sha256="1a260c41jxg0yi2li1159pdp8dqbrxgvda88047k5pjrpzwg0738"; depends=[Biobase gtools RColorBrewer]; };
 spliceR = derive { name="spliceR"; version="1.11.0"; sha256="0zfvbnlslpav4kz385sa5h1v73wrzirahxc6fx752zvn4kqbxdkj"; depends=[cummeRbund GenomicRanges IRanges plyr RColorBrewer rtracklayer VennDiagram]; };
@@ -1011,12 +1020,12 @@ ssviz = derive { name="ssviz"; version="1.3.0"; sha256="1sl181mq7qsibn6f51mp8srl
 staRank = derive { name="staRank"; version="1.11.0"; sha256="0hi3nzm0bdqrgjqjfvgz0qwymdrsd2c4csndw85hw9dj5ml1czqd"; depends=[cellHTS2]; };
 stepNorm = derive { name="stepNorm"; version="1.41.0"; sha256="05g9qgxwfahyfq97pz3xmg49y7ml93w8n5hs5fv6f60l1nz59va1"; depends=[marray MASS]; };
 stepwiseCM = derive { name="stepwiseCM"; version="1.15.0"; sha256="0r0ca29xpzki7lpr91rf99a1dvc5lmyls2v22pd1nxq4fb3g265l"; depends=[Biobase e1071 glmpath MAclinical pamr penalized randomForest snowfall tspair]; };
-supraHex = derive { name="supraHex"; version="1.7.1"; sha256="02jv0mb17d79031b6a8sam0710a0njm2akkcj4bji40bx0bkqsna"; depends=[ape hexbin MASS]; };
-survcomp = derive { name="survcomp"; version="1.19.0"; sha256="1czy90l49f0c31kh9p461wkdxb1iih64pvpbz31wv0mhyi2633i5"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
+supraHex = derive { name="supraHex"; version="1.7.2"; sha256="1ivi3lcck3ygxbask4v3kf8fkjni5ac9qz2pv55lnarws3s0xns7"; depends=[ape hexbin MASS]; };
+survcomp = derive { name="survcomp"; version="1.19.1"; sha256="0nl3i8pbjyvpbn7d9fck5l1z3ayav2s2d943h6jvqdzc24qhb21w"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
 sva = derive { name="sva"; version="3.15.0"; sha256="0bskn3famgz24kjaz4lrrm94vw07g5d2103h9gh5qzhajdsc2d03"; depends=[genefilter mgcv]; };
 switchBox = derive { name="switchBox"; version="1.3.0"; sha256="0bnb1wqxl3rv8w5rm0jw3x22yy8q27j11hpqnd792fvsz8ssr5h1"; depends=[]; };
 synapter = derive { name="synapter"; version="1.11.0"; sha256="05gv788mx1bzizr07cg5cw98i4xm3qdh8hpys4xvr06as7q65h2g"; depends=[Biobase BiocParallel Biostrings cleaver hwriter knitr lattice MSnbase multtest qvalue RColorBrewer]; };
-systemPipeR = derive { name="systemPipeR"; version="1.3.11"; sha256="1ssxavb1dwfma6dvd6jp4vnh4xz1nns0d14ccrrslssnch8knn3g"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicRanges ggplot2 GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
+systemPipeR = derive { name="systemPipeR"; version="1.3.16"; sha256="1b6c0glgnjhxg454s7cx9fhlyxa0l8pd5g6mpmdhf0hi9sk48qdl"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicRanges ggplot2 GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
 tRanslatome = derive { name="tRanslatome"; version="1.7.0"; sha256="1pcr1ghwkmkpsbkqh85yninvgb2za2vdsnax5bjkdj60wfj0d5bc"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma plotrix RankProd samr sigPathway topGO]; };
 ternarynet = derive { name="ternarynet"; version="1.13.0"; sha256="13pnzzlfzgkvqn323xhjvbaqzrk2fjq440ff9hjf09a53g14q7li"; depends=[igraph]; };
 tigre = derive { name="tigre"; version="1.23.0"; sha256="177phidn72rcghb4mqfcr2wbfx5pz2vdw6jh7ahnki7s5q6fkldl"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; };
@@ -1026,6 +1035,7 @@ tkWidgets = derive { name="tkWidgets"; version="1.47.0"; sha256="08vhxl7bdhnx0vk
 topGO = derive { name="topGO"; version="2.21.0"; sha256="0hhglb4zqbjwqywn37h3klz7qgkypl2zmv1afibxjn70xc6wxq46"; depends=[AnnotationDbi Biobase BiocGenerics graph lattice SparseM]; };
 trackViewer = derive { name="trackViewer"; version="1.5.2"; sha256="0kr6mkim32khr5zqm7wzrv03g9fvn4imxr0b7h8jl7sl896hv5ks"; depends=[GenomicAlignments GenomicFeatures GenomicRanges Gviz gWidgetstcltk pbapply Rsamtools rtracklayer scales]; };
 tracktables = derive { name="tracktables"; version="1.3.0"; sha256="125z9b0rjvrrbg91bdzqrf3rrw0aajivpyxd1m9k1gcs6jmsaaj3"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; };
+traseR = derive { name="traseR"; version="0.99.7"; sha256="0rj4jcjgpkqyhclbpmz2ha0afj5jzr9qcc7kl1cw6dbf1syxcj8p"; depends=[GenomicRanges IRanges]; };
 triform = derive { name="triform"; version="1.11.3"; sha256="0j8arzd9zbd37kzz1ndr6ljzz21h7bi33p0iqzy83l5ifidd4kaj"; depends=[BiocGenerics IRanges yaml]; };
 trigger = derive { name="trigger"; version="1.15.0"; sha256="1gsvp2rvry8pg9wfl9rggjfjxd0dcq3lrfkygfsl4jqcwnankpvc"; depends=[corpcor qtl qvalue sva]; };
 trio = derive { name="trio"; version="3.7.1"; sha256="1g3q1pvqq2kp1vck9c7sj000inw5b7q0wvd14yr8096mm6ax8zka"; depends=[]; };
@@ -1035,7 +1045,7 @@ tweeDEseq = derive { name="tweeDEseq"; version="1.15.0"; sha256="17mmkz0qpww2qwz
 twilight = derive { name="twilight"; version="1.45.0"; sha256="0dzgapk34jzxhdadraq072fcj6rwqhkx2795rbn0dkk4vazqz4sn"; depends=[Biobase]; };
 unifiedWMWqPCR = derive { name="unifiedWMWqPCR"; version="1.5.0"; sha256="055yvgwqjh91cf8d2hsacnbzq2z9c911cy3qd206azqlr6qyjiip"; depends=[BiocGenerics HTqPCR]; };
 vbmp = derive { name="vbmp"; version="1.37.0"; sha256="1i4akvqrwj1r0ahi4vjxl7q780sa5bryj3rd2c5wg0ifd5l95h6s"; depends=[]; };
-viper = derive { name="viper"; version="1.5.1"; sha256="0494601adg93i5gwam73x4x3m7vfg25xly6v2gj4aclaq9v6fpyf"; depends=[Biobase e1071 KernSmooth mixtools]; };
+viper = derive { name="viper"; version="1.5.2"; sha256="0zcb03c469nz5ka85m54n8if1188hprh4qgdwap5zc7xgyc0lhya"; depends=[Biobase e1071 KernSmooth mixtools]; };
 vsn = derive { name="vsn"; version="3.37.3"; sha256="09mzv7l5j20sx14m63q9ycpacrh2zayywiyckglfgndpc8v9wp08"; depends=[affy Biobase ggplot2 hexbin lattice limma]; };
 vtpnet = derive { name="vtpnet"; version="0.9.0"; sha256="0gbs4pdwy88pjwsn3r2yspnfscz127awhlwym6g1lk8sxkb4mjxc"; depends=[doParallel foreach GenomicRanges graph gwascat]; };
 wateRmelon = derive { name="wateRmelon"; version="1.9.0"; sha256="1lgadzv28j5qqqqsrjzakxmyj1q9j0hps3waa2nn9r7dq4cvallh"; depends=[limma lumi matrixStats methylumi ROC]; };
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 2f62ede96cf..badf6b17a06 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -9,6 +9,7 @@ ABCanalysis = derive { name="ABCanalysis"; version="1.0.2"; sha256="1lgf9nhh5a8m
 ABCoptim = derive { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; };
 ACCLMA = derive { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; };
 ACD = derive { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; };
+ACDm = derive { name="ACDm"; version="1.0.2"; sha256="1xj706qm5lcq38pm287d78rvyg7pxd4avbbvm1h4086s4l2qikf9"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; };
 ACNE = derive { name="ACNE"; version="0.8.0"; sha256="0ps38lljzm2aszqf8fhh74zbdxh46kypmybkw5w7xaf9nv5kcq8g"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
 ACTCD = derive { name="ACTCD"; version="1.0-0"; sha256="0zn8f6l5vmn4w1lqjnpcxvfbr2fhwbhdjx4144h3bk71bk9raavl"; depends=[R_methodsS3]; };
 ADDT = derive { name="ADDT"; version="1.0"; sha256="1jx7rxi0yfn34pf3cf9zpf434rapgn5qn2mn5rkq5lysr3kwdw91"; depends=[]; };
@@ -33,7 +34,7 @@ AMGET = derive { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy4
 AMOEBA = derive { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; };
 AMORE = derive { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; };
 AOfamilies = derive { name="AOfamilies"; version="1.01"; sha256="0v3b83k12lsrdcrkjl2ff38d0g8sbrnm5pmm9xphyrk3lfgap76k"; depends=[lqmm quantreg]; };
-APSIM = derive { name="APSIM"; version="0.8.0"; sha256="0ph4wl6c9jy2w0w3yh8ba12nqbsldicpn2aii675vrvdrx36vwn7"; depends=[data_table lubridate plyr sirad stringr]; };
+APSIM = derive { name="APSIM"; version="0.8.1"; sha256="1d26f7h773938ag5s6zxydl4hx61gmwxxm47d3wy3xd9pmnhhx88"; depends=[data_table lubridate plyr sirad stringr]; };
 APSIMBatch = derive { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
 AR1seg = derive { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; };
 ARPobservation = derive { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; };
@@ -76,7 +77,7 @@ AquaEnv = derive { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5
 ArArRedux = derive { name="ArArRedux"; version="0.1"; sha256="1fgll399plraijbh1xrhf1nmc308daqhhsi5krq2lm7q2cn584pc"; depends=[]; };
 ArDec = derive { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; };
 ArfimaMLM = derive { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[fracdiff fractal lme4]; };
-ArgumentCheck = derive { name="ArgumentCheck"; version="0.9.0"; sha256="1gyc6bx6sfp7k8cp43l6fic4rfn729h6kl5zqs3ypf4425s7jm3f"; depends=[]; };
+ArgumentCheck = derive { name="ArgumentCheck"; version="0.10.0"; sha256="0cq4yzayj3wc45pna59v55xfa6x98q5s62kxwmqs6q76d50z7mzp"; depends=[]; };
 ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; };
 AssetPricing = derive { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[deSolve polynom]; };
 AssocTests = derive { name="AssocTests"; version="0.0-2"; sha256="1sba4b3rrk3ki95z0xs8aj8pcikczn7c66m00ziivsdi8iy10gzg"; depends=[cluster combinat fExtremes mvtnorm]; };
@@ -119,7 +120,7 @@ BGPhazard = derive { name="BGPhazard"; version="1.2.2"; sha256="1v89pjigrjkin9vs
 BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
 BH = derive { name="BH"; version="1.58.0-1"; sha256="17rnwyw9ib2pvm60iixzkbz7ff4fslpifp1nlx4czp42hy67kqpf"; depends=[]; };
 BHH2 = derive { name="BHH2"; version="2015.06.25"; sha256="19c8qjfvg4f3zlrqvrsdmc776f81ghv8w0l3bnbpdbyz7fivc1qw"; depends=[]; };
-BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.2-6"; sha256="1fin5dr1xxr617i4ysfx39gaw6ygbcm4h7j1l38kqnfz18hn6xsq"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; };
+BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.3-0"; sha256="1sp09aavzz8xibn3lgaxfb5z31wfbnv5gqgwvbd150pq6i7mg0aj"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; };
 BIGDAWG = derive { name="BIGDAWG"; version="1.1"; sha256="0rgk2w7d8qq2dahfmiv81v1ydm1by6nabjzjb6iabfk0b8bnwqy2"; depends=[haplo_stats XML]; };
 BIOM_utils = derive { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; };
 BIPOD = derive { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp RcppArmadillo]; };
@@ -134,7 +135,7 @@ BNPTSclust = derive { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1s
 BNPdensity = derive { name="BNPdensity"; version="2015.5"; sha256="0jgdc9dayc57y77bb2yjcn1pb5ahrvbrsmyjkhyl4365sn5njzl8"; depends=[]; };
 BNSP = derive { name="BNSP"; version="1.0.5"; sha256="0iyrmrpnx32akcfvd43jh74457l56n5n4pnlyqi9v3cjp4n95fds"; depends=[]; };
 BOG = derive { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
-BOIN = derive { name="BOIN"; version="1.1"; sha256="1ffr6w9ml0mkffgg1vds8fmf8ww7rs375pxk2dqv9nlb9061m97r"; depends=[]; };
+BOIN = derive { name="BOIN"; version="1.2"; sha256="1vd1w3cd1l1hk63hdrn6c1hrpqwy6nkkxni1d37yj2iz7gz6wbsg"; depends=[]; };
 BRugs = derive { name="BRugs"; version="0.8-4"; sha256="0bd5m4nfj25bhjy0d96kna50h5a5a2mdxrl21c1kvxmiwxcx4wrs"; depends=[coda]; };
 BSDA = derive { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; };
 BSGS = derive { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; };
@@ -158,6 +159,7 @@ BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdg
 BaySIC = derive { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; };
 BayesBridge = derive { name="BayesBridge"; version="0.6"; sha256="1j03m465pwq0lhbrfvddjglrzs6px7bc89yvfzj776amm7myqd0l"; depends=[]; };
 BayesCR = derive { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324hyfc6922fsxmjnvddb4mrhis54id2r4"; depends=[mnormt mvtnorm Rlab rootSolve truncdist]; };
+BayesComm = derive { name="BayesComm"; version="0.1-2"; sha256="1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk"; depends=[abind coda mvtnorm Rcpp RcppArmadillo]; };
 BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
 BayesFactor = derive { name="BayesFactor"; version="0.9.11-1"; sha256="0vq656q38vlf0ba8g23psk8as1y48y6s8yrvqrppbjx5d9wlm9wv"; depends=[coda gtools Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; };
 BayesGESM = derive { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; };
@@ -194,14 +196,14 @@ BigTSP = derive { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdx
 BinNonNor = derive { name="BinNonNor"; version="1.2"; sha256="15bzpi2q2428661v8z9izp942ihffgq8dgh4fsnzllvdrpqcyc41"; depends=[BB corpcor Matrix mvtnorm]; };
 BinNor = derive { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[corpcor Matrix mvtnorm psych]; };
 BinOrdNonNor = derive { name="BinOrdNonNor"; version="1.0"; sha256="1x231xxdiyp6nwj2dx9w1shi5w6mdyzg43g5zc4r2bpvzccgj0l0"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; };
-Binarize = derive { name="Binarize"; version="1.0"; sha256="1yfr87s1hgjhc8ah81sfrgr1hpp0vd5clqayrz1i698h1c34amkh"; depends=[diptest]; };
+Binarize = derive { name="Binarize"; version="1.1"; sha256="07r41n5123pk6nwdwajgw6m3w38kprf4ksinx4rjldd8h1yd6rik"; depends=[diptest]; };
 BinaryEPPM = derive { name="BinaryEPPM"; version="1.0"; sha256="088yg07966g09gv9hznhwfdka4yk0c9j0viy9x4ldmhxl9w9scv5"; depends=[expm Formula numDeriv]; };
 BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[ape cladoRcpp FD gdata optimx phylobase plotrix rexpokit xtable]; };
 BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69q07cgdzwpjgs3ijmnm42srs5d3brw8cr"; depends=[glmnet MASS pls st]; };
 BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[matrixcalc snow]; };
 BioStatR = derive { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; };
 Biodem = derive { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; };
-BiodiversityR = derive { name="BiodiversityR"; version="2.5-2"; sha256="0l23nlibv7wjmkv1jnssaab3iwm2i5wrkzjji2x9rr5131aj82gn"; depends=[Rcmdr vegan]; };
+BiodiversityR = derive { name="BiodiversityR"; version="2.5-3"; sha256="1j3al5rakpqlacijp3ryr5dlasghda3bli3pxvf3yqjn5wwyddgs"; depends=[Rcmdr vegan]; };
 Biograph = derive { name="Biograph"; version="2.0.4"; sha256="1mik5yvbi28xnyzha8p3xjaa064x29wgn18yx766wha7djxxr353"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; };
 BivarP = derive { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; };
 BlakerCI = derive { name="BlakerCI"; version="1.0-4"; sha256="1sa9qq5frjjcw46p3ankn7v3gj0gwn9lww6jacz8flf5qpplhn4l"; depends=[]; };
@@ -262,7 +264,7 @@ CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84
 CINID = derive { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; };
 CINOEDV = derive { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[ggplot2 igraph R_matlab reshape2]; };
 CITAN = derive { name="CITAN"; version="2014.12-1"; sha256="0hiccsg49zgcdm5iwj2vzyqhwyfw6h5fd2gasy6hlakjp102mvy2"; depends=[agop DBI hash RGtk2 RSQLite stringi]; };
-CLME = derive { name="CLME"; version="2.0-2"; sha256="11krgxn3fvbwknmiz2jyidpbb0svf4frvk99spd7i53m615sai91"; depends=[isotone lme4 MASS prettyR shiny stringr]; };
+CLME = derive { name="CLME"; version="2.0-4"; sha256="1ymaqvmq0ji82kb4c84a6fdz15ri797k9n218kawz21xvx8ilr7w"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; };
 CLSOCP = derive { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; };
 CMC = derive { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; };
 CMF = derive { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; };
@@ -273,8 +275,9 @@ CNVassoc = derive { name="CNVassoc"; version="2.1"; sha256="0gwyhipkvvnivdahr9mk
 CNVassocData = derive { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; };
 CNprep = derive { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; };
 COBRA = derive { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; };
+COMBIA = derive { name="COMBIA"; version="1.0-4"; sha256="02yadw3zjkj0ljq2c5k5zfsn8qnlvr6gxgafzrqw9g95cawv8q4x"; depends=[gdata hash lattice latticeExtra oro_nifti]; };
 COMMUNAL = derive { name="COMMUNAL"; version="1.0"; sha256="0smza4q0gnhskyq3fxcrs2hq3lxkyp5xf3zd6zi92962lg6s3w3n"; depends=[cluster clValid fpc rgl]; };
-COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.4"; sha256="1mf2q7phc2bn700yp7i2i6ccj6lrvh8b2dmibqihh76a85j1ycrq"; depends=[]; };
+COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.5"; sha256="15w78h0kkqbisp34g4wj2mkq4c0pb2166f1m7s65iifnnd5plvb6"; depends=[]; };
 COPASutils = derive { name="COPASutils"; version="0.1.6"; sha256="0vi7x14ma3i4gabdb04byr4ba0209lklj3d5ql2f2vaxyb4a1hj9"; depends=[dplyr ggplot2 kernlab knitr reshape2 stringr]; };
 CORE = derive { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; };
 CORElearn = derive { name="CORElearn"; version="0.9.46"; sha256="1jwc3sqkbhhmn67x44iyqzvpjsnbrwhgq6yam6h6gf086nv0lmic"; depends=[cluster rpart]; };
@@ -296,8 +299,8 @@ CVST = derive { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pw
 CVThresh = derive { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[EbayesThresh wavethresh]; };
 CVTuningCov = derive { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; };
 CVcalibration = derive { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; };
-CaDENCE = derive { name="CaDENCE"; version="1.2.2"; sha256="1rbwm3s63dxd366bs7pdxl0zpv7svsfr3ayznach9bjjrnjk3z3g"; depends=[pso]; };
-Cairo = derive { name="Cairo"; version="1.5-6"; sha256="0x5xd2xq5q8a3kzmz7f9bawg3j131rhyb3s7w34acg7rd79l1935"; depends=[]; };
+CaDENCE = derive { name="CaDENCE"; version="1.2.3"; sha256="1810a785czaxwfvhjnmhzqg743mgcgrdp3j1irlfl9pbli0ppidx"; depends=[pso]; };
+Cairo = derive { name="Cairo"; version="1.5-7"; sha256="0wr03kwmj2b9hamznd3jywv3x06i5phhdfl0iydh41yc9j9xvdfk"; depends=[]; };
 CarletonStats = derive { name="CarletonStats"; version="1.1"; sha256="18pd1hi8bnbv0sdixw746xvdg9szvng422yj12mk0k50v60403xg"; depends=[]; };
 CatDyn = derive { name="CatDyn"; version="1.1-0"; sha256="0bdixcf1iwbmjd2axi6csrzms25ghdj4r6223qhk2b54wlmbzaiz"; depends=[BB optimx]; };
 CateSelection = derive { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; };
@@ -309,10 +312,10 @@ CellularAutomaton = derive { name="CellularAutomaton"; version="1.1-1"; sha256="
 CensRegMod = derive { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; };
 CerioliOutlierDetection = derive { name="CerioliOutlierDetection"; version="1.0.8"; sha256="0n67y7ah496wck9hlrphya9k753gk44v7zgfz4s2a5ii49739zqi"; depends=[robustbase]; };
 CfEstimateQuantiles = derive { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; };
-ChainLadder = derive { name="ChainLadder"; version="0.2.0"; sha256="03gwavmimh4isrc6gpn72m52sqx1aj0prshzsb0531g45qxmvw9x"; depends=[actuar Hmisc lattice MASS Matrix reshape2 statmod systemfit tweedie]; };
+ChainLadder = derive { name="ChainLadder"; version="0.2.1"; sha256="0c7mjxn050nx3ldbvg55paj58mgkk8apsvwqyzhfc9f9py02q07r"; depends=[actuar lattice Matrix reshape2 statmod systemfit tweedie]; };
 ChargeTransport = derive { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; };
 CheckDigit = derive { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
-ChemoSpec = derive { name="ChemoSpec"; version="4.0.6"; sha256="0zhqx6b1zp2vlp003rsaj7ayxa0zrk1kmm5xq3q10rkl6xnk0wid"; depends=[plyr rgl]; };
+ChemoSpec = derive { name="ChemoSpec"; version="4.1.15"; sha256="147ynbj8w4hiwfac3637s2skyjyyyv19axwv5bxlg73kvp40zp0h"; depends=[plyr rgl]; };
 ChemometricsWithR = derive { name="ChemometricsWithR"; version="0.1.8"; sha256="084da2hx6agryw7bv6img10pqmsdz2mpihbrj6j081lammrik4fj"; depends=[ChemometricsWithRData MASS pls]; };
 ChemometricsWithRData = derive { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; };
 ChoiceModelR = derive { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; };
@@ -323,6 +326,7 @@ CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa8
 CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
 Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.3.1"; sha256="0gzwcg6f3p1vr30lyniqiq4893kjxri4y2vjzh6qrldnay42kqf9"; depends=[]; };
 Claddis = derive { name="Claddis"; version="0.1"; sha256="1dxsz62x856lpapw5xpvvr2qpyj3j93m9dn07m0bjbpmx0y0bm9c"; depends=[ape gdata phytools strap]; };
+ClamR = derive { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; };
 ClickClust = derive { name="ClickClust"; version="1.1.4"; sha256="17r8jzhzwqa5h04bxdcyv31jhk6c709sx5m1z53jh3yf9zmkilvi"; depends=[]; };
 ClimClass = derive { name="ClimClass"; version="1.0"; sha256="07jl8vwqyyj4q2hav8qbg69yjs73s3kbms5bd9hqs1y938rrp2l5"; depends=[geosphere ggplot2 reshape2]; };
 ClueR = derive { name="ClueR"; version="1.0"; sha256="1ak8pgbzm5xrk7pjnkbiqdwyvvyvrm6k6h50ycc86w3zy7fnqhds"; depends=[e1071]; };
@@ -349,7 +353,7 @@ CompQuadForm = derive { name="CompQuadForm"; version="1.4.1"; sha256="1kv4bdkwid
 CompR = derive { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; };
 CompRandFld = derive { name="CompRandFld"; version="1.0.3-4"; sha256="1a3j5j50fz3f8vkvdmfccv5hn00spk08xanadqxpdy8pn925gqqb"; depends=[]; };
 CompareCausalNetworks = derive { name="CompareCausalNetworks"; version="0.1.1"; sha256="1j3yrgyv7vlgwi50w62q8dpk1zpvrwk9vn0ka0ry6524s9zs0r03"; depends=[Matrix]; };
-CompareTests = derive { name="CompareTests"; version="1.0"; sha256="098axl20jid35pqvgiwk6h91waafigwks6n5f4pg7xxx1fifks4f"; depends=[]; };
+CompareTests = derive { name="CompareTests"; version="1.1"; sha256="1assdqwr5qhwfqhc8gpfa53kcmd4dy5fb449pm4ng0n674qvra6c"; depends=[]; };
 Compind = derive { name="Compind"; version="1.0"; sha256="13gfsbjaciign8cswsibdj9a4rwj5afwrk4g1x4fyihfhnm4qx7m"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff psych]; };
 ComplexAnalysis = derive { name="ComplexAnalysis"; version="1.0"; sha256="1yk0r3iwxirjsksnpwpnrgq4yhni6in9kgxxrs7v51l35zn78kji"; depends=[]; };
 Compounding = derive { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
@@ -359,6 +363,7 @@ Conake = derive { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwj
 CondReg = derive { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; };
 ConjointChecks = derive { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
 ConnMatTools = derive { name="ConnMatTools"; version="0.1.5"; sha256="02cv2rlfp9shwqc9nwb8278akmwv7yvviwl23jglzsyh721dpqkr"; depends=[]; };
+ConsRank = derive { name="ConsRank"; version="0.0"; sha256="00lk128livwfbkgykgz5g3ap592m70xgi5pni0vsnm1xqhh93rrf"; depends=[gtools MASS proxy rgl]; };
 ConvCalendar = derive { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
 ConvergenceConcepts = derive { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[lattice tkrplot]; };
 Copula_Markov = derive { name="Copula.Markov"; version="1.0"; sha256="028rmpihyz9xr4r305lbcbb0y22jw1szmhw5iznv5zma507grbl3"; depends=[]; };
@@ -385,6 +390,7 @@ CryptRndTest = derive { name="CryptRndTest"; version="1.0.5"; sha256="0ypqwzn9r9
 CrypticIBDcheck = derive { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[car chopsticks ellipse rJPSGCS]; };
 Cubist = derive { name="Cubist"; version="0.0.18"; sha256="176k9l7vrxamahvw346aysj19j7il9a2v6ka6dzmk0qq7hf3w9ka"; depends=[lattice reshape2]; };
 D2C = derive { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[corpcor foreach gRbase lazy MASS randomForest RBGL Rgraphviz]; };
+D3M = derive { name="D3M"; version="0.31"; sha256="1q5syjip82xbb7vxja8byc8ykln2yy2riz019n3wva8lghy0rvii"; depends=[beanplot Rcpp]; };
 DAAG = derive { name="DAAG"; version="1.20"; sha256="05jlsrs0frk9ky20h17c5vj9d4j28c9n0a1jww5lssacimn1d4x5"; depends=[lattice latticeExtra]; };
 DAAGbio = derive { name="DAAGbio"; version="0.62"; sha256="18m4vq8vv0yi79na62nrm0cy1nlk7bg0xbddzxv5gpkmzi1i6m9s"; depends=[limma]; };
 DAAGxtras = derive { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; };
@@ -410,7 +416,7 @@ DEMEtics = derive { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxja
 DESP = derive { name="DESP"; version="0.1-3"; sha256="18dx1ljc8radxdm57n0xcnza3w9wjl1zi60azjrazzfpwyjldc9l"; depends=[graph MASS Matrix RBGL SparseM]; };
 DESnowball = derive { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; };
 DEoptim = derive { name="DEoptim"; version="2.2-3"; sha256="0pcs7kkhad139c3nhmg7bkac1av4siknfg59lpknwwrsxbz208dg"; depends=[]; };
-DEoptimR = derive { name="DEoptimR"; version="1.0-2"; sha256="00viy7x3br3094az635lmjydm826d48vv2f14rwmdhqmv03066kq"; depends=[]; };
+DEoptimR = derive { name="DEoptimR"; version="1.0-3"; sha256="0wvq78hk0fyx2wkskvnwkj3lrk93p80skqykfh9qnc4r94irl5aj"; depends=[]; };
 DFIT = derive { name="DFIT"; version="1.0-2"; sha256="1kn3av6pnkmf9703yp3cn0zbdzjzxrlm6nbbcg7lwv9550jw2c4n"; depends=[ggplot2 mvtnorm simex]; };
 DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso miscTools penalized]; };
 DIFtree = derive { name="DIFtree"; version="1.0.0"; sha256="08s6ba44517xq783fysksb1h53zkqsk7zakaibi1c2npq1gzny9p"; depends=[penalized plotrix]; };
@@ -477,7 +483,7 @@ DirichletReg = derive { name="DirichletReg"; version="0.6-2"; sha256="08qfykyahy
 Disake = derive { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; };
 DiscML = derive { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; };
 DiscreteInverseWeibull = derive { name="DiscreteInverseWeibull"; version="1.0.1"; sha256="0w0s2fixpcmcwids35xx91hll9rf9qbi7155sp90dxd3vr8c939v"; depends=[Rsolnp]; };
-DiscreteLaplace = derive { name="DiscreteLaplace"; version="1.0"; sha256="1mwqvlhgswqp697zjl6yjzqbgazycwwz6dfdvx8s72hdmnlqqr9r"; depends=[]; };
+DiscreteLaplace = derive { name="DiscreteLaplace"; version="1.1"; sha256="1pcq4kggy1z88a0car53d0f69rx2qg7q104cr0bxi6yllrb3q0nr"; depends=[Rsolnp]; };
 DiscreteWeibull = derive { name="DiscreteWeibull"; version="1.0.1"; sha256="09v34lwaahx0d30zxb4b3r84ryllz1fsmbp5wfr341b5flp20wvg"; depends=[Rsolnp]; };
 DiscriMiner = derive { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; };
 Distance = derive { name="Distance"; version="0.9.3"; sha256="054z9pi8m8gjpax3s2hajvaik4yvfpy8qc4gmpl9bqncrk594pbv"; depends=[mrds]; };
@@ -503,6 +509,7 @@ EBEN = derive { name="EBEN"; version="4.1"; sha256="0xin08w8ay3m31a2alnjdgqzw7nw
 EBMAforecast = derive { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[abind ensembleBMA Hmisc plyr separationplot]; };
 EBS = derive { name="EBS"; version="3.0"; sha256="0nrqglbfr7wagd4xrk5jx0kficjgvk7wqwzqrbs589dkll24sn5b"; depends=[MASS]; };
 EBglmnet = derive { name="EBglmnet"; version="3.6"; sha256="0qjwk5y9bghidha4i937nc0kl1jz4d8g2br6ij8651lf2byj9s1a"; depends=[]; };
+EDFIR = derive { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; };
 EDISON = derive { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr2mhwynj4ixj3ma7crhqidgal169p"; depends=[corpcor MASS]; };
 EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; };
 EFDR = derive { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; };
@@ -521,10 +528,11 @@ EMMAgeo = derive { name="EMMAgeo"; version="0.9.1"; sha256="1rxbb666gh9g35m4jqa6
 EMMIXcontrasts = derive { name="EMMIXcontrasts"; version="1.0.0"; sha256="1q7bwf7kkpraj38lz5s1lhhghp7a5lzyj5b9x8024g6rh2qlwp7v"; depends=[]; };
 EMMIXskew = derive { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[KernSmooth lattice mvtnorm]; };
 EMMIXuskew = derive { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; };
-EMMREML = derive { name="EMMREML"; version="3.0"; sha256="0y37ydssn6m2q78v2aympfjr6z2hcn5y3dlgv4pj5g414fikb825"; depends=[Matrix]; };
+EMMREML = derive { name="EMMREML"; version="3.1"; sha256="0qwj4jlfhppjxwcjldh49b6idnagazrxybaid3k2c269wvxwvddq"; depends=[Matrix]; };
 EMP = derive { name="EMP"; version="2.0.1"; sha256="1zdy05jfhcgj6415pnm079v8xjg90n3akp1rwq65jbqdar38zj4y"; depends=[ROCR]; };
 EMT = derive { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; };
 EMVC = derive { name="EMVC"; version="0.1"; sha256="1725zrvq419yj0gd79h8bm56lv2mmk296wq3wapivcy6xn0j97jh"; depends=[]; };
+EMbC = derive { name="EMbC"; version="1.9.3"; sha256="189kgp6qv9dl4q1sirm3v9zqk11259il6ykb0008nnghv78rdcyd"; depends=[maptools mnormt move RColorBrewer sp]; };
 ENMeval = derive { name="ENMeval"; version="0.1.1"; sha256="0g1h8dklv6rv73wwpx3vhbpnwply5lpq8x9jvl7r018x9gcvvb9m"; depends=[dismo raster rJava]; };
 ENiRG = derive { name="ENiRG"; version="0.1"; sha256="1cnl1mjl5y1rc6fv7c9jw2lkm898l3flfrj3idx9v1brjzyx5xlf"; depends=[ade4 fgui gdata miniGUI R_utils raster sp spgrass6]; };
 ENmisc = derive { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; };
@@ -546,7 +554,7 @@ EasyStrata = derive { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8i
 EbayesThresh = derive { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; };
 Ecdat = derive { name="Ecdat"; version="0.2-7"; sha256="1z9mxx3mvn3vi5drxlzss7gs7vpzg7shinl529bx4jpxqpci90jy"; depends=[Ecfun]; };
 Ecfun = derive { name="Ecfun"; version="0.1-4"; sha256="0h3351pcahrn578lz1pcb7h3chmh0vmwbn9iqll98vibck847gai"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; };
-EcoGenetics = derive { name="EcoGenetics"; version="1.2.0-1"; sha256="08wa9w8ib0bp386bs6vlfzbdbcxjf8pz97mlfml3dl15092g13x3"; depends=[adegenet ggplot2 party raster rgdal rkt SoDA sp]; };
+EcoGenetics = derive { name="EcoGenetics"; version="1.2.0-2"; sha256="1c2pz2a8f57fhq0sk4jgfi4v8jwznsjaqx4jnziz3lak7gmcrwql"; depends=[ggplot2 party raster reshape2 rgdal rkt SoDA sp]; };
 EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; };
 EcoSimR = derive { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
 EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
@@ -575,9 +583,10 @@ EpiBayes = derive { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1ac
 EpiContactTrace = derive { name="EpiContactTrace"; version="0.9.1"; sha256="10yd24xcydn03rq9kcqcxj5gn25v54ljsm9mgc206g9wf1xx0wjf"; depends=[]; };
 EpiDynamics = derive { name="EpiDynamics"; version="0.2"; sha256="1hqbfysvw2ln8z3as6lfcjlhkzccksngwh2vm25zsgy93gxw3mcc"; depends=[deSolve ggplot2 reshape2]; };
 EpiEstim = derive { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
-EpiModel = derive { name="EpiModel"; version="1.2.0"; sha256="16vnsgar45y2gr93qzv3c33b11y5j0rys3q2k29mwb0i93f4cf9p"; depends=[deSolve doParallel ergm foreach network networkDynamic RColorBrewer tergm]; };
+EpiModel = derive { name="EpiModel"; version="1.2.1"; sha256="0wmhi9hgrpmp36kbyjgkhiigarbnlf05x3vx2pqajispvph7kn01"; depends=[deSolve doParallel ergm foreach network networkDynamic RColorBrewer tergm]; };
 Eplot = derive { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; };
-EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; };
+EstCRM = derive { name="EstCRM"; version="1.4"; sha256="1p99hmmyiy3havj72jd4xksr1j9gfmy0i7z7f3vqs5sqp72alq1k"; depends=[Hmisc lattice]; };
+EstHer = derive { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; };
 EstSimPDMP = derive { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
 EvCombR = derive { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; };
 EvalEst = derive { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; };
@@ -605,6 +614,7 @@ FAwR = derive { name="FAwR"; version="1.1.0"; sha256="0566h9fgnnk8xankqkpvcshf8a
 FBFsearch = derive { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo]; };
 FBN = derive { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; };
 FCMapper = derive { name="FCMapper"; version="1.0"; sha256="1wp5byx68067fnc0sl5zwvw2wllaqdbcy4g2gbzmlqwli0jz2dsk"; depends=[igraph]; };
+FCNN4R = derive { name="FCNN4R"; version="0.3.4"; sha256="1qzfgspar54ki3n36zr322lxx249w4a5lzr9n18gwmzhkb61lgbf"; depends=[Rcpp]; };
 FD = derive { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; };
 FDGcopulas = derive { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[numDeriv randtoolbox Rcpp]; };
 FDRreg = derive { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; };
@@ -643,12 +653,13 @@ FactoMineR = derive { name="FactoMineR"; version="1.31.3"; sha256="164pxgy9sn7ir
 Factoshiny = derive { name="Factoshiny"; version="1.0.2"; sha256="0wwsv0frn2d6a5l5lr9qzqglznaigc23bq7nhcbfy1wlvsmimnr3"; depends=[FactoMineR shiny]; };
 Fahrmeir = derive { name="Fahrmeir"; version="2015.6.25"; sha256="1ca4m3m4jip7n489yywdfvh6nlhxspg5awxi23spgfnvhrcs9k3y"; depends=[]; };
 Familias = derive { name="Familias"; version="2.2"; sha256="1nhjxn3f063gvi4jvwb8r4fap7f1zbcvb6qa30153yh31yprljls"; depends=[kinship2 paramlink]; };
+FastGP = derive { name="FastGP"; version="1.1"; sha256="01d2435ag4hgwljwp896gqzjih6510aqf05522q7q209r2dbl0km"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; };
 FastHCS = derive { name="FastHCS"; version="0.0.5"; sha256="02ds9syqh8wpjrqibdv3kqxcyijclm572daqrj262b4b6211v46x"; depends=[matrixStats Rcpp RcppEigen robustbase]; };
 FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; };
 FastKNN = derive { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[assertthat pdist]; };
 FastPCS = derive { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4kc5piy3280nlxl41bdkxkng2icmq14l58"; depends=[matrixStats Rcpp RcppEigen]; };
 FastRCS = derive { name="FastRCS"; version="0.0.6"; sha256="0wjsh37jas8hcb9554ijvwj0k8dx96fjf88bzgy7nbim2byiy8p8"; depends=[matrixStats Rcpp RcppEigen]; };
-FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; };
+FastRWeb = derive { name="FastRWeb"; version="1.1-1"; sha256="0xh3710kvnc60pz9rl5m3ym2cxf0mag9gi29y7j3fl4dh2k7zf74"; depends=[base64enc Cairo]; };
 FatTailsR = derive { name="FatTailsR"; version="1.2-3"; sha256="139hc8axzp0faib0lpj3f6kfwna29vsqjjwflcva8xsghakc1d4r"; depends=[minpack_lm timeSeries]; };
 FeaLect = derive { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; };
 FeatureHashing = derive { name="FeatureHashing"; version="0.9"; sha256="1xbzmyah22kjrkd7ln1pjzwyn5w0zmhdhs9w1a3p8rjxrwmx6ssf"; depends=[BH digest magrittr Matrix Rcpp]; };
@@ -684,7 +695,7 @@ Frames2 = derive { name="Frames2"; version="0.1.1"; sha256="004h3w5bfnbbxa8yczlc
 FreeSortR = derive { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[ellipse smacof vegan]; };
 FunChisq = derive { name="FunChisq"; version="2.1.0"; sha256="0k5b0kl64yswl5d41yiav9xnqcsqx8n6qc5p2nz5vqjs6qb7mbvd"; depends=[BH Rcpp RcppClassic]; };
 FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
-FuncMap = derive { name="FuncMap"; version="1.0-3"; sha256="0bhx7y1n75r3jwf5mkx2i2bqfjgzxgsw58nwhfl48ldibgx7h1qs"; depends=[mvbutils]; };
+FuncMap = derive { name="FuncMap"; version="1.0.8"; sha256="04rfmdy1hzxqy16csj6cf3x2kj9lg1xxvvnn494xjdwjdkfkyl09"; depends=[mvbutils]; };
 Funclustering = derive { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp RcppEigen]; };
 FunctionalNetworks = derive { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase]; };
 FusedPCA = derive { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; };
@@ -716,25 +727,25 @@ GENLIB = derive { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47l
 GEOmap = derive { name="GEOmap"; version="2.3-5"; sha256="11sxlijfcswxmry6p9pb4g6prrql0qnqcqc21f72a0jp3k3670nc"; depends=[fields RPMG splancs]; };
 GESTr = derive { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; };
 GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbfpp1bqnyg08rwarsmkxlx16p4is1k3736fmnri9sfp7z6"; depends=[fExtremes fGarch Rsolnp skewt stabledist]; };
-GEVcdn = derive { name="GEVcdn"; version="1.1.3"; sha256="13p6hkdybs8s2i363z2a65yijqarwj9swvy22ljk61shf2nzbk80"; depends=[VGAM]; };
+GEVcdn = derive { name="GEVcdn"; version="1.1.4"; sha256="13p6wi72z6j7iyp5hv16ndvsq6jf6hdqgcmf1i8g713gn73l79kj"; depends=[VGAM]; };
 GExMap = derive { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; };
 GGEBiplotGUI = derive { name="GGEBiplotGUI"; version="1.0-8"; sha256="0bkagsm9mkcghc2q46cc86kjajzgjbq9588v0v2bp71qw8m97mbh"; depends=[rgl tkrplot]; };
 GGIR = derive { name="GGIR"; version="1.1-5"; sha256="0lanza1i7bqa0z745hbxkkyjhf6jy578jjva6nbisbbfsrbf7ydj"; depends=[]; };
 GGMselect = derive { name="GGMselect"; version="0.1-9"; sha256="18l98v6hv0sjhany275lsbdjwclx3abqfi924n9qlcnap1rvsfwz"; depends=[gtools lars mvtnorm]; };
 GGally = derive { name="GGally"; version="0.5.0"; sha256="00ix8qafi71l7vhj6268f9srqbgr9iw1qk0202y59mhfrj6c6f5i"; depends=[ggplot2 gtable plyr reshape stringr]; };
 GHQp = derive { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
-GIGrvg = derive { name="GIGrvg"; version="0.3"; sha256="014srgh79g8y9fcj979v3md9qqx9i6b6fx6lw0r0qdrg4v6bvr76"; depends=[]; };
+GIGrvg = derive { name="GIGrvg"; version="0.4"; sha256="0sflklyzl2l5bcjhz7n75aww76ih93sq5mbgdc4v1p0vqhrbbg47"; depends=[]; };
 GISTools = derive { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; };
 GLDEX = derive { name="GLDEX"; version="2.0.0.3"; sha256="0ymarfwpm7gagq6wk40n0nsmd14r19pbqbrgigk6cvb8dc2zpbfz"; depends=[cluster]; };
 GLDreg = derive { name="GLDreg"; version="1.0.3"; sha256="0d7cclmmhgaf95bw738d8hz166qsr9df33g73ihy8pla3sg5lr7q"; depends=[GLDEX]; };
-GLSME = derive { name="GLSME"; version="1.0.2"; sha256="1zdqrji8x0f3wjl8bhpbnwdfklihv3ii20iz2y2gsm53yzw7dlwq"; depends=[corpcor mvtnorm]; };
+GLSME = derive { name="GLSME"; version="1.0.3"; sha256="0flja5gk25k4z9hwskvdw4c1f88scc47xvc1l3d2447fkfrb0bwc"; depends=[corpcor mvtnorm]; };
 GMCM = derive { name="GMCM"; version="1.2.1"; sha256="1s45xmbx64h3sb10py8n444jpxcgsz4pc36cz3zinfq55amf8r6r"; depends=[Rcpp RcppArmadillo]; };
 GMD = derive { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; };
-GMDH = derive { name="GMDH"; version="1.0"; sha256="194bx1gg0d50fq9002ga8lwx288csfk5vfr1qwkn886wiw97wl9n"; depends=[MASS]; };
+GMDH = derive { name="GMDH"; version="1.1"; sha256="053x0flh1jk61ak84d7y1r22fn1s52pj5xqwlbvkc70jmfmvs141"; depends=[MASS]; };
 GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; };
-GNE = derive { name="GNE"; version="0.99-0"; sha256="1iwlh1mx8z24hgry78i5sqfrbqqp4946x1jxh6h7z1vxs7qfpq0v"; depends=[alabama BB nleqslv SQUAREM]; };
+GNE = derive { name="GNE"; version="0.99-1"; sha256="1avsl54xdlqq8pw16g84igcwms7if7lvdblqvfc2cn3sk8qi5xdv"; depends=[alabama BB nleqslv SQUAREM]; };
 GOGANPA = derive { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; };
-GOplot = derive { name="GOplot"; version="1.0"; sha256="15ix1lcbxf63bmxvjsy7y2nz55wf539xii8rb7lf788jplh47gb6"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; };
+GOplot = derive { name="GOplot"; version="1.0.1"; sha256="0i4b26wkgf77z515027bmq5pqd21bhg0qrg6jbmwiv59nczr146b"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; };
 GPArotation = derive { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; };
 GPC = derive { name="GPC"; version="0.1"; sha256="1naqy5g6a0z65wssfic5s7cw9v0zjckk526nian3l98ci22sz0j7"; depends=[ks lars orthopolynom randtoolbox]; };
 GPCSIV = derive { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; };
@@ -743,14 +754,14 @@ GPLTR = derive { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2f
 GPareto = derive { name="GPareto"; version="1.0.1"; sha256="0wscalc855c99yzy3q154rxvhg0xmzy4a4x37jkf8f45n8sgviif"; depends=[DiceKriging emoa KrigInv MASS pbivnorm pso randtoolbox Rcpp rgenoud]; };
 GPfit = derive { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lattice lhs]; };
 GPseq = derive { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; };
-GPvam = derive { name="GPvam"; version="3.0-2"; sha256="160j0zwbcmvzvia1b5p5midf395xfv1frk2w6w3v2zpbn8h6pdz5"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
+GPvam = derive { name="GPvam"; version="3.0-3"; sha256="0dmws29ahbjhx82s2i8jfzhl8pp5q201a592w90jvhwy2bnm1ywk"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
 GRANBase = derive { name="GRANBase"; version="1.0.12"; sha256="1qfx2zp8vjyqx9rqz23kgl1dj7kz7qkligym8r2l41nc0hinijpi"; depends=[hwriter switchr XML]; };
 GRTo = derive { name="GRTo"; version="1.2"; sha256="0x65g8a39vrb8m3hqajxi0ksmdavz0p6mlamqprkdn9p6ikf5c73"; depends=[bootstrap]; };
 GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; };
 GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; };
 GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; };
-GSE = derive { name="GSE"; version="3.2"; sha256="1zfvwrz4argv47dvxy18bjx19yn0qlqgy501sllxhqxvd1f7780r"; depends=[ggplot2 MASS Rcpp RcppArmadillo rrcov]; };
-GSIF = derive { name="GSIF"; version="0.4-6"; sha256="00m5djgc443678nwnmvgqv070g67pbvp1ci1x8gp7van8knjn5zq"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA sp]; };
+GSE = derive { name="GSE"; version="3.2.1"; sha256="1sq28hi60jayl3yc8432dfv0knavsmy0khmwa5h16ag23cg962w6"; depends=[ggplot2 MASS Rcpp RcppArmadillo rrcov]; };
+GSIF = derive { name="GSIF"; version="0.4-7"; sha256="1c2lk6yzacwrxvs5v0al8hwvi7ncqdvn4f7ngicy6g8iyi4p7z08"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA sp]; };
 GSM = derive { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; };
 GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; };
 GUILDS = derive { name="GUILDS"; version="1.2.1"; sha256="1z90qjgrx16yk956phbifcr7jd3w59h7akzz7p6g5ymrcjzih4qf"; depends=[pracma Rcpp subplex]; };
@@ -814,6 +825,7 @@ HAC = derive { name="HAC"; version="1.0-3"; sha256="084i123fj5vnhn08fa1qzbk93khs
 HAP_ROR = derive { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[ape hash]; };
 HAPim = derive { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; };
 HBSTM = derive { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[fBasics maps MASS]; };
+HBglm = derive { name="HBglm"; version="0.1"; sha256="1sral7lh5qw5mn31n8459pk52frgw1bjq0z5ckpsnbc4qf3xxcjn"; depends=[bayesm Formula MfUSampler sns]; };
 HDMD = derive { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; };
 HDPenReg = derive { name="HDPenReg"; version="0.91"; sha256="0q63pm39ivka64f7rhad6bv0yr1b2b3241ln8gqfnal25qw31w82"; depends=[rtkpp]; };
 HDclassif = derive { name="HDclassif"; version="1.3"; sha256="1b80dnaa6m4px0ijpd9yf45v8jl0b9srcmrdyar8fs7lxpc53k2l"; depends=[MASS]; };
@@ -821,7 +833,7 @@ HDtweedie = derive { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5
 HEAT = derive { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; };
 HGNChelper = derive { name="HGNChelper"; version="0.3.1"; sha256="0vidw7gdvr0i4l175ic5ya8q2x2jj0v2vc7fagzrp2mcy7fn1y6a"; depends=[]; };
 HH = derive { name="HH"; version="3.1-19"; sha256="0hm8fk0wqfhkrjm3ycpxd4i8wwm9hi8ihy45a3wayp0p6lqv4rpp"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
-HHG = derive { name="HHG"; version="1.5"; sha256="0azgl9q3fhaxrjji63kai49jkybdyq1v0ql2jqmg98hynx6s31db"; depends=[]; };
+HHG = derive { name="HHG"; version="1.5.1"; sha256="111b3lqkp8z7m3g4vgmd0dcplkm4szfwa620sxy70084qad1jv4d"; depends=[]; };
 HI = derive { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
 HIV_LifeTables = derive { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; };
 HIest = derive { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; };
@@ -835,8 +847,8 @@ HMP = derive { name="HMP"; version="1.3.1"; sha256="1r39mq8j071khza37ck7w4kvk1di
 HMPTrees = derive { name="HMPTrees"; version="1.2"; sha256="0agp8w7rzr1byj01di89r3qy1vb9inb2zgys78mg8jnk7axi925l"; depends=[ape]; };
 HMR = derive { name="HMR"; version="0.4.1"; sha256="1acaph5q6vgi4c7liv7xsc3crhp23nib5q44aszxhramky0gvaqr"; depends=[]; };
 HPbayes = derive { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; };
-HSAUR = derive { name="HSAUR"; version="1.3-6"; sha256="1872diskd9yz76x0z6yjg6dn1dxh479ybnja8vcly9fr8jb0kqqj"; depends=[]; };
-HSAUR2 = derive { name="HSAUR2"; version="1.1-13"; sha256="13b14m2cknicahvprkn3kmjk1sir7a10vkaq63niinfirw603fa9"; depends=[]; };
+HSAUR = derive { name="HSAUR"; version="1.3-7"; sha256="16qmsyin8b7x9q3xdx74kw6db6zjinhxprp6pfnl6ddwxhz3jzzf"; depends=[]; };
+HSAUR2 = derive { name="HSAUR2"; version="1.1-14"; sha256="0psykccxyqigkfzrszy7x3qhdw02kppzgz0bqr21q8zh51jb2y3v"; depends=[]; };
 HSAUR3 = derive { name="HSAUR3"; version="1.0-4"; sha256="1m2nqvm0ma5rmwwn27nzzyjzq8c0awsrrjjrnyaj50bcnmg0x0k6"; depends=[]; };
 HSROC = derive { name="HSROC"; version="2.1.8"; sha256="056g6iygrddmpmg5nnilqrlw2xavmcc9q07z942vc2nivw06h346"; depends=[coda lattice MASS MCMCpack]; };
 HSSVD = derive { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
@@ -855,8 +867,9 @@ Haplin = derive { name="Haplin"; version="5.5"; sha256="12wkj5x1s920xs0xzhxk0dsw
 HaploSim = derive { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
 HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.5"; sha256="1kz12301bi2880i9ds7wvc6yb5hvrs3fr5689fm1yygkqfq8zc56"; depends=[mice]; };
 HarmonicRegression = derive { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
+Harvest_Tree = derive { name="Harvest.Tree"; version="1.0"; sha256="0nqrplqkvch7vzlrp8pxpg4gs1qvsq33l5498yqn0bbpbs6xj120"; depends=[rpart]; };
 HelpersMG = derive { name="HelpersMG"; version="1.2"; sha256="1a9b7j53a8xfxc5dmm6m5f0ac2mir8yzkhg0fgah4gvbivaaz6nb"; depends=[coda]; };
-HiClimR = derive { name="HiClimR"; version="1.2.1"; sha256="12qq3w20xzw2ih15hw5pzn0h58wv8rczhb4zxcdzc7zbg6i8qas4"; depends=[]; };
+HiClimR = derive { name="HiClimR"; version="1.2.2"; sha256="11qx0ych889vccgbh0ckx5hpmpmnbghi4h8lcawiqk8lzxhv03ld"; depends=[]; };
 HiCseg = derive { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
 HiDimDA = derive { name="HiDimDA"; version="0.2-3"; sha256="0pk7hf8cnwv22p5cbpsh5wd94i1an87ddv80qycgypx4wi0v57hh"; depends=[]; };
 HiDimMaxStable = derive { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula maxLik mnormpow mnormt partitions VGAM]; };
@@ -865,9 +878,9 @@ HiPLARM = derive { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6i
 HiddenMarkov = derive { name="HiddenMarkov"; version="1.8-4"; sha256="1w3j4dnf6ay0a17kn8zdzy38wind4pqfnwlndf9m9fj8m2scaay8"; depends=[]; };
 HierO = derive { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; };
 HighDimOut = derive { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; };
-HistDAWass = derive { name="HistDAWass"; version="0.1.2"; sha256="16c4b9nfl6rbca7zifb2q3c5x60rmj32913hw1f79xs9ffdrnkwr"; depends=[class FactoMineR ggplot2 histogram]; };
+HistDAWass = derive { name="HistDAWass"; version="0.1.3"; sha256="09zg7yrw0zdgy7v6z9awysshks618jiqx01fasi8qb9wrdisvf74"; depends=[class FactoMineR ggplot2 histogram]; };
 HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; };
-HiveR = derive { name="HiveR"; version="0.2-28"; sha256="1zz1cg7cf4yyv1bymqlyh50nzj5lgdv4clzm0l2vladcxzjvgk8c"; depends=[jpeg plyr png RColorBrewer rgl tkrgl xtable]; };
+HiveR = derive { name="HiveR"; version="0.2.44"; sha256="1ckbgn4vmv35bssbjrgvqhsx7ihm40ibpnxqwwsw6bv7g6ppx3ch"; depends=[jpeg plyr png RColorBrewer]; };
 Hmisc = derive { name="Hmisc"; version="3.16-0"; sha256="03d372bld4mikyrvmfw00ljiz6jf7szkmhrlgxs5vqk3v81kkp2f"; depends=[acepack cluster foreign Formula ggplot2 gridExtra gtable lattice latticeExtra nnet proto rpart scales survival]; };
 Holidays = derive { name="Holidays"; version="1.0-6"; sha256="031vddjf7s3pirv041y2mw694db63gjajlbczmmya8b1zp2f3vzk"; depends=[TimeWarp]; };
 HomoPolymer = derive { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[deSolve MenuCollection RGtk2]; };
@@ -898,6 +911,7 @@ ICSNP = derive { name="ICSNP"; version="1.0-9"; sha256="0kisk7wk0zjsr47hgrmz5c8f
 ICsurv = derive { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; };
 IDPSurvival = derive { name="IDPSurvival"; version="1.0"; sha256="1v1w0i74b065b4qc302xbdl5df7qx9z8jmbc9cn46fqm1hh2b6d7"; depends=[gtools Rsolnp survival]; };
 IDPmisc = derive { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
+IDTurtle = derive { name="IDTurtle"; version="1.2"; sha256="15r806vk5lmvyclsynzq9qr8pgwwkxal1j6xcq6408i8kq1hk3fb"; depends=[]; };
 IFP = derive { name="IFP"; version="0.2.0"; sha256="02dm2qbnrs2yi6c64j90hdfimmdsld46k1wdkay8pfg62jy9rrwa"; depends=[coda haplo_stats]; };
 IM = derive { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; };
 IMIS = derive { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
@@ -905,12 +919,13 @@ INLABMA = derive { name="INLABMA"; version="0.1-6"; sha256="0rij3y89yyj25xz8r9n8
 IPMpack = derive { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[MASS Matrix nlme]; };
 IPSUR = derive { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; };
 IQCC = derive { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[MASS micEcon miscTools qcc]; };
+IRISSeismic = derive { name="IRISSeismic"; version="1.0.5"; sha256="1mgb774bmy20c4dzisb7ij4xqz9jhajn384nb7sfcnz5khxznxc4"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
 IRTShiny = derive { name="IRTShiny"; version="1.0"; sha256="1gjfqjqk7izl23b96g758dn6pb784ayb8yjjlryyrwga6mgsqdik"; depends=[beeswarm CTT ltm shiny shinyAce]; };
 ISBF = derive { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; };
 ISDA_R = derive { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; };
 ISLR = derive { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdgf6wxms4svak1501clc87xc6x"; depends=[]; };
 ISOcodes = derive { name="ISOcodes"; version="2015.04.04"; sha256="1mg7mifcqh0g0ra4f1skng6fyp2rhfv2xd9m7nyih39inzdjkcdf"; depends=[]; };
-ISOpureR = derive { name="ISOpureR"; version="1.0.8"; sha256="0jjamyj4rf078rfa2qqrn4i55025sc5968lq95yadbw0izxb51i8"; depends=[Rcpp RcppEigen]; };
+ISOpureR = derive { name="ISOpureR"; version="1.0.18"; sha256="1hh23d4dzhkqli68466gs2n6zhlhwjl53dvrpqvl6ag6i4x974ag"; depends=[futile_logger Rcpp RcppEigen]; };
 ISOweek = derive { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; };
 ISwR = derive { name="ISwR"; version="2.0-7"; sha256="1rd1wrvl8wlc8ya5lndk74gnfvj9wp29z8617v3kbf32gqhby7ng"; depends=[]; };
 IUPS = derive { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[boot Matching R2jags]; };
@@ -1030,7 +1045,7 @@ LiblineaR = derive { name="LiblineaR"; version="1.94-2"; sha256="11q3xydd4navpfc
 LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77ykpr6bpzxfxvq8mm9bmfvcqz7k3ajb78cdr0d"; depends=[mclust]; };
 LinCal = derive { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; };
 LinRegInteractive = derive { name="LinRegInteractive"; version="0.3-1"; sha256="0w7s3i6i2wnydh88l8lnzrh6w5zqkcwvms91iizis0mwd9af2jdl"; depends=[rpanel xtable]; };
-LindenmayeR = derive { name="LindenmayeR"; version="0.1.4"; sha256="05aq7qmzb7a6kw24pwlg78ch17y945ggrxqn7l2rypn1vfm0br9x"; depends=[stringr]; };
+LindenmayeR = derive { name="LindenmayeR"; version="0.1.6"; sha256="10a1m4yqr02gg5akxknwmhrlbqxnza78z8rm0ym36c4vlz8b0hyi"; depends=[stringr]; };
 LinearizedSVR = derive { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[expectreg kernlab LiblineaR]; };
 Lmoments = derive { name="Lmoments"; version="1.1-6"; sha256="0jffnlamll5mwxrfqrb1qr8kjcn40y57kzd10kkm98vzfjcwg4y4"; depends=[]; };
 LncMod = derive { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; };
@@ -1056,7 +1071,7 @@ MAPA = derive { name="MAPA"; version="1.9"; sha256="1i143x2l6fq4vl8l8cagai580yqv
 MAPLES = derive { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
 MAR1 = derive { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[bestglm leaps]; };
 MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[KFAS mvtnorm nlme]; };
-MASS = derive { name="MASS"; version="7.3-42"; sha256="10gv2i0i0ap3yrca53fwx9afl7zri1xfbwncnxi1p58zrwjs54lx"; depends=[]; };
+MASS = derive { name="MASS"; version="7.3-43"; sha256="12cj337xrxrdbvk1dc2vnwviscdxj9ll6aykwisqq2qjcix090d6"; depends=[]; };
 MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; };
 MAT = derive { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; };
 MATA = derive { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; };
@@ -1070,6 +1085,7 @@ MBA = derive { name="MBA"; version="0.0-8"; sha256="09rs1861fz41dgicgh4f95v4zafh
 MBCluster_Seq = derive { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; };
 MBESS = derive { name="MBESS"; version="3.3.3"; sha256="12jsrxwdprrahqbk0i0js7lja81ydy385xmijlqk0slppd72dd9c"; depends=[]; };
 MBI = derive { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; };
+MBTAr = derive { name="MBTAr"; version="1.0.0"; sha256="0324bn4r5434zj47krg6mka9ajwx7mdxhibkbf06x3a7kmh8zgjf"; depends=[jsonlite]; };
 MBmca = derive { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; };
 MC2toPath = derive { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; };
 MCAPS = derive { name="MCAPS"; version="0.3-2"; sha256="1jvxl9xi102pcs3swxlx4jk76i7i4fll88c92k7m379ik3r36alb"; depends=[stashR]; };
@@ -1129,7 +1145,7 @@ MPAgenomics = derive { name="MPAgenomics"; version="1.1.2"; sha256="1gwglzkip54s
 MPDiR = derive { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; };
 MPINet = derive { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; };
 MPSEM = derive { name="MPSEM"; version="0.2-6"; sha256="1vmdjnhxl8v7xw71kd1m66vhgaa1q0vvifd67v8fmii0i0i5i35y"; depends=[ape MASS]; };
-MPTinR = derive { name="MPTinR"; version="1.9.2"; sha256="1k9mkpwrvrkqh2467kklj9v111pjdwfblk7zpikk18v43qjlayb6"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
+MPTinR = derive { name="MPTinR"; version="1.10.3"; sha256="0281w5dhg8wmi1rz80xribq437shp4m890c504kggsacr28mbhkw"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
 MPV = derive { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; };
 MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; };
 MRCV = derive { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
@@ -1150,12 +1166,12 @@ MSwM = derive { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757z
 MTS = derive { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[fGarch mvtnorm Rcpp]; };
 MTurkR = derive { name="MTurkR"; version="0.6.5.1"; sha256="0yg2ycramz0rpac4bfyq8wciyv9jl93al0qsdbzrl7c37z151w3l"; depends=[digest RCurl XML]; };
 MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[geosphere NightDay RSQLite sp XML]; };
-MVA = derive { name="MVA"; version="1.0-5"; sha256="18x075hjqhrjwxivvrixgs6yc67il3n5p1m7v2wymcf8h2mkki91"; depends=[HSAUR2]; };
+MVA = derive { name="MVA"; version="1.0-6"; sha256="09j9frr6jshs6mapqk28bd5jkxnr1ghmmbv6f4zz0lrg81zjizl3"; depends=[HSAUR2]; };
 MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; };
 MVN = derive { name="MVN"; version="4.0"; sha256="1ql50ch6qig7r0xnfv5f74k3vc32k04jgmvjbndgyzbacn2ibrm7"; depends=[MASS moments mvoutlier nortest plyr psych robustbase]; };
-MVR = derive { name="MVR"; version="1.30.1"; sha256="0rs1j2kfa43c0l0vsayrql8fchpyfrrp2hh0cq77pvhpviw4v4ga"; depends=[statmod]; };
+MVR = derive { name="MVR"; version="1.30.2"; sha256="1mq1czz5ipfy19iismdxzrcirji3qvg4av3fabaach20pfdpbrzx"; depends=[statmod]; };
 MVar_pt = derive { name="MVar.pt"; version="1.2"; sha256="1p3xjlykg40zz5354drz962wm9bcp9kmz8fd56pza7dlybblv9i8"; depends=[]; };
-MXM = derive { name="MXM"; version="0.4"; sha256="1hb30n31a54z1v11vmkccdq62h73divmjfv6s7d2a5371xldj73f"; depends=[Hmisc MASS ROCR survival TunePareto VGAM]; };
+MXM = derive { name="MXM"; version="0.4.3"; sha256="028ap2fzw6sqs4wm26g1124fmmmmhzjvgi42ryjcqa7ina8sly6z"; depends=[Hmisc MASS ROCR survival TunePareto VGAM]; };
 MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
 Maeswrap = derive { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; };
 ManyTests = derive { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; };
@@ -1165,16 +1181,18 @@ MareyMap = derive { name="MareyMap"; version="1.3.0"; sha256="1blbz1rr0p4fljk7fz
 MarkowitzR = derive { name="MarkowitzR"; version="0.1502"; sha256="0srrmzr4msn04w5f6s6qs51db8jccpfj10sighsv1l7d056n2xjn"; depends=[gtools matrixcalc sandwich]; };
 MasterBayes = derive { name="MasterBayes"; version="2.52"; sha256="12ka2l4x6psij7wzbb98lwx5shgwzn5v44qfpiw1i6g236yp0mhm"; depends=[coda genetics gtools kinship2]; };
 MatchIt = derive { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; };
+MatchLinReg = derive { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; };
 Matching = derive { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; };
 MatchingFrontier = derive { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; };
 Matrix = derive { name="Matrix"; version="1.2-2"; sha256="0f0a8rl8lx1f0f50fxfq4q37d52hd70a611vvgq3rsb39911j935"; depends=[lattice]; };
 MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; };
 MatrixModels = derive { name="MatrixModels"; version="0.4-0"; sha256="1jcjsyha0xmz264g1haj7x8zpzjmp1m0jl39h5bf8r45hhlaxcsa"; depends=[Matrix]; };
 MaxPro = derive { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; };
-MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.4"; sha256="04ljjzcqfgy136wviz92gdavqzjhbai1v69nj4kg6vc6nwvkhnbx"; depends=[dplyr rgdal rgeos rvest sp stringr]; };
+MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.3.2"; sha256="0mxdz3268mfw8h0hpg4bpfsp9rmbpc68bf2ah70i7gkmfq3x4zyz"; depends=[dplyr rgdal rgeos rvest sp stringr]; };
 McSpatial = derive { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
 Mcomp = derive { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[forecast tseries]; };
 MedOr = derive { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
+Mediana = derive { name="Mediana"; version="1.0.1"; sha256="18whlzikkcbi1wjpbanr9yzcm0xrl0c1zyylzj1nv1dnhrylgslj"; depends=[doParallel doRNG foreach MASS mvtnorm ReporteRs survival]; };
 MenuCollection = derive { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[gplots RGtk2 RGtk2Extras]; };
 MergeGUI = derive { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; };
 MetABEL = derive { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; };
@@ -1196,7 +1214,7 @@ Metrics = derive { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b
 MfUSampler = derive { name="MfUSampler"; version="0.9.1"; sha256="0fw1jw2ljsxmvnaayn7zdrrsnbbkkb5n9nm396321p36bqkf1pk3"; depends=[ars]; };
 MiRSEA = derive { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; };
 MiST = derive { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; };
-MicSim = derive { name="MicSim"; version="1.0.8"; sha256="0i9vyim7wfnaf1zcs1vz6yc7xkr1hzhqcccbcvg15vkzhr23f8lg"; depends=[chron rlecuyer snowfall]; };
+MicSim = derive { name="MicSim"; version="1.0.9"; sha256="1c7gkyb3vpqm14qfwkl06kp3b7rng8sdac74n5j57dspygbb6rw4"; depends=[chron rlecuyer snowfall]; };
 MicroDatosEs = derive { name="MicroDatosEs"; version="0.6.3.1"; sha256="17ka9bdic8vdr0aabmgm216zm9a8jppxll042b5ric4vzplah17d"; depends=[Hmisc memisc]; };
 MicroStrategyR = derive { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; };
 MigClim = derive { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[raster SDMTools]; };
@@ -1209,7 +1227,7 @@ MixAll = derive { name="MixAll"; version="1.0.2"; sha256="10jwiri659i2h0gkaxc41g
 MixGHD = derive { name="MixGHD"; version="1.7"; sha256="0cbrm5n6gsa61fpk02l3fky482vc2z9wd48hpv87pck6pd7ihqk9"; depends=[Bessel e1071 ghyp MASS mixture mvtnorm numDeriv]; };
 MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; };
 MixSim = derive { name="MixSim"; version="1.1-1"; sha256="1a1hrsnm6zv9vag7hq8plrkjr4ak26w7k58wdkgxsjb9r6qzm1yf"; depends=[MASS]; };
-MixedTS = derive { name="MixedTS"; version="1.0.1"; sha256="0ljal2jxscwrv439blavf5gjxbi3k3jfqqmwblzfvc05dqgvdk0b"; depends=[MASS]; };
+MixedTS = derive { name="MixedTS"; version="1.0.3"; sha256="19cf7iir6ann3ahpslysn48pyirr7qbx6vykshf9kkk0rsh6h5ax"; depends=[MASS]; };
 MixtureInf = derive { name="MixtureInf"; version="1.0-1"; sha256="1cq8zzhhb6vg545n9aw1b9fhx025zy75dd6pw161svsb5776py5d"; depends=[]; };
 Mobilize = derive { name="Mobilize"; version="2.16-4"; sha256="16vdvpwspa0igb52zvzyk0if9l4wq1hm8y42572i8sh1m82wyyfs"; depends=[ggplot2 Ohmage reshape2 wordcloud]; };
 Modalclust = derive { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla5627rva0yf69n0zib9z5fl3k5awlqfscz4fw26"; depends=[class mvtnorm zoo]; };
@@ -1238,7 +1256,7 @@ MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102
 Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; };
 Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; };
 NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; };
-NAM = derive { name="NAM"; version="1.3.2"; sha256="0rzhqs9qcry3w4q1lcfzmp4fndbmj4bm8981i7nn4cipcjfx7635"; depends=[randomForest Rcpp]; };
+NAM = derive { name="NAM"; version="1.3.3"; sha256="17b4xbhdncql5wl2a016xh45jm0mip0g10nrhd41v5m1s5k81k4h"; depends=[randomForest Rcpp]; };
 NAPPA = derive { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; };
 NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; };
 NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; };
@@ -1326,9 +1344,10 @@ OneTwoSamples = derive { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f
 OpasnetUtils = derive { name="OpasnetUtils"; version="1.2.0"; sha256="1ckagq14w9923a4x7pk9mfzqcfayi00apwd2kvqzgd0s6355r1q7"; depends=[digest ggplot2 httpRequest plyr RCurl reshape2 rgdal rjson sp triangle xtable]; };
 OpenCL = derive { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; };
 OpenMPController = derive { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; };
-OpenMx = derive { name="OpenMx"; version="2.2.4"; sha256="1w72ikysda45zbvwlr297fqqjl3law2r6m3c9n9j5d8r3clfhqyl"; depends=[BH digest MASS RcppEigen StanHeaders]; };
+OpenMx = derive { name="OpenMx"; version="2.2.6"; sha256="07g1558487rasr78fy1zphpz2lac7j0xjy9zsmpg3b17y1cy49wr"; depends=[BH digest MASS RcppEigen StanHeaders]; };
 OpenRepGrid = derive { name="OpenRepGrid"; version="0.1.9"; sha256="1s40c2yfd4a4khs0ghlbzii94x8cidg851bivanplg2s51j5jrhk"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; };
 OpenStreetMap = derive { name="OpenStreetMap"; version="0.3.1"; sha256="009xiqsbgqb3lba6msyzq7ncripmvpymxynkga8pqc8npv8g7fzb"; depends=[raster rgdal rJava]; };
+OptGS = derive { name="OptGS"; version="1.1"; sha256="1fy1im2ns5mxl15jv0w1d7kzfapff93kbjwjy0ji1pxcxafs0m42"; depends=[]; };
 OptHedging = derive { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
 OptInterim = derive { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; };
 OptimalCutpoints = derive { name="OptimalCutpoints"; version="1.1-3"; sha256="1vrbx62080r9sgk9ipjvdrqvikp4gwidp5gi5j92hspk7cp10amg"; depends=[]; };
@@ -1376,14 +1395,14 @@ PET = derive { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9y
 PF = derive { name="PF"; version="9.5"; sha256="1y99brdabj78s5kxyv0136s40kaaj3zya9lk4qd0kqk83z2gdawp"; depends=[gdata RColorBrewer xtable]; };
 PGICA = derive { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj1kbdclx4j4xa8jq0lcj180abi9"; depends=[fastICA]; };
 PGM2 = derive { name="PGM2"; version="1.0"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; };
-PGRdup = derive { name="PGRdup"; version="0.2"; sha256="12vxdw4093xmmpcl6ars7h03f1a21gjl5p29r5d19hp68h4hchi1"; depends=[data_table igraph stringdist stringi]; };
+PGRdup = derive { name="PGRdup"; version="0.2.1"; sha256="1hkkpylfchs06a42q19sv9ixc3bd7ilk9jc4qmiqg42j0gsizilm"; depends=[data_table igraph stringdist stringi]; };
 PHENIX = derive { name="PHENIX"; version="1.2"; sha256="0fnrx2xf6q9ng9pwfxbbbzvcf6kqj12byd81x0q0vfl85h1xddws"; depends=[ppcor SuppDists]; };
 PHYLOGR = derive { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; };
 PHeval = derive { name="PHeval"; version="0.5.2"; sha256="1q0cyq7b8d42jgiw7ra9vjdjw1zcxpyg6wgb3zgygkmd744ifggp"; depends=[survival]; };
 PIGE = derive { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[ARTP snowfall survival xtable]; };
 PIPS = derive { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
 PK = derive { name="PK"; version="1.3-2"; sha256="0162ri9wlm9inryljal48av8yxb326na94kckkigsrklfxb3wkp2"; depends=[]; };
-PKI = derive { name="PKI"; version="0.1-1"; sha256="1m4q43yq8ddig15k0j9yg9hq4yz3yplqp68zl3p9g2shkam60p6w"; depends=[base64enc]; };
+PKI = derive { name="PKI"; version="0.1-3"; sha256="1xhc84k4iszvfawwwzrwclfs41nvb8bmyygapxmsxjky725s7k1g"; depends=[base64enc]; };
 PKPDmodels = derive { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; };
 PKgraph = derive { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; };
 PKreport = derive { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; };
@@ -1396,18 +1415,19 @@ PMCMR = derive { name="PMCMR"; version="1.1"; sha256="0f3882rjyxlcr183qa9y22bxh8
 PP = derive { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp]; };
 PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
 PPtreeViz = derive { name="PPtreeViz"; version="1.1.0"; sha256="0rdic7xdb5brxkhdrfcr7mdzxz1a02kjjkln7vwxnqxrhicx6pwz"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo reshape2]; };
+PRIMsrc = derive { name="PRIMsrc"; version="0.5.7"; sha256="1va2ck6m8n8mih6qd55fr2jd84gch3d676glcar51139552ddn5h"; depends=[glmnet Hmisc MASS survival]; };
 PRISMA = derive { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[ggplot2 gplots Matrix]; };
 PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[igraph lattice Matrix]; };
 PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
 PRROC = derive { name="PRROC"; version="1.1"; sha256="1v35z9inzb6x42fil8z7kfcrnfif93cj8974mfbqhhx0f9vi476a"; depends=[]; };
 PReMiuM = derive { name="PReMiuM"; version="3.1.1"; sha256="10xrgqq6vii5xcxcf6jqbhzmkiy88ssxjvn2pnfx5a9xj037ymqb"; depends=[BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; };
-PResiduals = derive { name="PResiduals"; version="0.2-1"; sha256="0my5slprmswazsxgjvpw8hjr41aqxm6j1s2dga65fvpfv5qimsw6"; depends=[actuar Formula MASS rms sandwich]; };
+PResiduals = derive { name="PResiduals"; version="0.2-2"; sha256="1c1j9avnaprlcw6x86cf4hy45cb7ki6pq8xj0gi6dyswbs1mxhlf"; depends=[Formula MASS rms]; };
 PSAboot = derive { name="PSAboot"; version="1.1"; sha256="176sbjr906xk2ycl8653k7nch2h7ryxfisdy178k51f55qpvv4h9"; depends=[ggplot2 Matching MatchIt modeltools party PSAgraphics psych reshape2 rpart TriMatch]; };
 PSAgraphics = derive { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
 PSCBS = derive { name="PSCBS"; version="0.44.0"; sha256="1bpvqn2p8pw57dpwk1mr51rsiqirk5sywrycqwbazvjr7hkiqa3d"; depends=[DNAcopy matrixStats R_cache R_methodsS3 R_oo R_utils]; };
 PSM = derive { name="PSM"; version="0.8-10"; sha256="1s60fr85xn3ynpvsbc3nw7vgz6h6jxy3yii1w6jpkw3iwl4bgn84"; depends=[deSolve MASS numDeriv ucminf]; };
 PST = derive { name="PST"; version="0.86"; sha256="0m6v7j36v47zdqqd3lf05w6pk0f3wfs1kix1qfvy2gj8n41jjmxf"; depends=[RColorBrewer TraMineR]; };
-PTAk = derive { name="PTAk"; version="1.2-9"; sha256="1wbjak8dp53601z39kkpa4ysm264x32371rbgbzmyzx89ap2c0cq"; depends=[tensor]; };
+PTAk = derive { name="PTAk"; version="1.2-12"; sha256="1phxh2qbzsj2ia2dr6z30lhi765lk1m8lbk57sdgvm14fmi9v5nk"; depends=[tensor]; };
 PTE = derive { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; };
 PVAClone = derive { name="PVAClone"; version="0.1-2"; sha256="0afl2il5wdcwzpyhjkgq8iz16q1086c3ndr4cjlyspgbss9h5l24"; depends=[dclone dcmle]; };
 PVR = derive { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbkaqb34x2y9nkl1nj1pkwjq2s5"; depends=[ape splancs]; };
@@ -1427,19 +1447,21 @@ PearsonICA = derive { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf7
 PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; };
 PepPrep = derive { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; };
 Peptides = derive { name="Peptides"; version="1.1.0"; sha256="0nfldckrb9cvxnzqkhqr06d8a5nna5b900439x49r8njcwr4xpcg"; depends=[]; };
-PerFit = derive { name="PerFit"; version="1.3.1"; sha256="0zmhafr5fk3z66cp46gasgcxcza2q02821sg8zcs0vk5k80md9a7"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
+PerFit = derive { name="PerFit"; version="1.4"; sha256="1pjyns9qsqr7c3m5n8a12z3i2b0y98alq0fs84r909m4m5lb22k3"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
 PerMallows = derive { name="PerMallows"; version="1.8"; sha256="1p0rnphhjc0rr1zpbff71mk75lnyph994k4p5whwn2fyfzi1pn0f"; depends=[Rcpp]; };
 PerfMeas = derive { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[graph limma RBGL]; };
 PerformanceAnalytics = derive { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; };
 PermAlgo = derive { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; };
 PhViD = derive { name="PhViD"; version="1.0.6"; sha256="04vh3892fwb8pn2wmsw5449al80z5sm6avi6b67shky942dasl17"; depends=[LBE MCMCpack]; };
 PharmPow = derive { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
+PharmacoGx = derive { name="PharmacoGx"; version="1.0.6"; sha256="0ly3zb3kj2hb46745gcdangafz0crywsflmq7l5yvjqq3s6i3ahd"; depends=[Biobase caTools downloader magicaxis piano RColorBrewer]; };
 PhaseType = derive { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
 PhyActBedRest = derive { name="PhyActBedRest"; version="1.0"; sha256="0fpg17fwap12da7xka8pnd1wk6rbmw3zl099588g2r05wq3425sx"; depends=[]; };
 PhyloMeasures = derive { name="PhyloMeasures"; version="1.1"; sha256="1wxm9yiplasxhqxs3qxys46k1i7n459frxxh275abczafq46l8if"; depends=[ape]; };
 PhysicalActivity = derive { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; };
 PivotalR = derive { name="PivotalR"; version="0.1.17.45"; sha256="13rw7y2n2hnyj2lslkb78qhj05765k9snkgdhh4dfnlgnyb19kkw"; depends=[Matrix]; };
 PlayerRatings = derive { name="PlayerRatings"; version="1.0-0"; sha256="0hjb05bdha00ggcpp3n4f86dxjlhzmlpwgsbbx3mhyv3qq1g32ky"; depends=[]; };
+PlotPrjNetworks = derive { name="PlotPrjNetworks"; version="1.0.0"; sha256="13kbyx2phxb3kss6l32f7krf4k5i350indlsmbhav686v0h3nsgp"; depends=[ggplot2 reshape2]; };
 PlotRegionHighlighter = derive { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; };
 PogromcyDanych = derive { name="PogromcyDanych"; version="1.5"; sha256="1m6sycca44h8kdf9cd67annw6dxxwiscidzfnjrzqmqa4v6n7rsg"; depends=[dplyr SmarterPoland]; };
 PoiClaClu = derive { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; };
@@ -1462,8 +1484,8 @@ PortRisk = derive { name="PortRisk"; version="1.0"; sha256="0vyzvi56lmdlhxpbxcxc
 PortfolioAnalytics = derive { name="PortfolioAnalytics"; version="1.0.3636"; sha256="0xva3ff8lz05f1jvx8hgn8rpgr658fjhf3xyh9ga1r7dii13ld50"; depends=[foreach PerformanceAnalytics xts zoo]; };
 PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; };
 PoweR = derive { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp RcppArmadillo]; };
-Power2Stage = derive { name="Power2Stage"; version="0.4-1"; sha256="0g2gvi890hv497h7344j0rnf16k375nlbmxq9v4vh65wkb2bp140"; depends=[PowerTOST]; };
-PowerTOST = derive { name="PowerTOST"; version="1.2-07"; sha256="0d8nbha0jwkz4phiddpfm32kf8hjrkck05y3w60f40110j9f8yy7"; depends=[mvtnorm]; };
+Power2Stage = derive { name="Power2Stage"; version="0.4-2"; sha256="0h1zy5ppqb90x1225k3iqk2cvb2ld0pv6baj6vqz5690rr4g936y"; depends=[PowerTOST]; };
+PowerTOST = derive { name="PowerTOST"; version="1.2-08"; sha256="19963whk1ij255dk0xrg3iy3sgqa17l2js5vcakgh1jh131acsg2"; depends=[mvtnorm]; };
 PracTools = derive { name="PracTools"; version="0.2"; sha256="1njnm0rk2z9p3p8wsj881mddqhpayh56gyyis4cwb5b6pc344s9p"; depends=[]; };
 PredictABEL = derive { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; };
 PredictiveRegression = derive { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
@@ -1485,18 +1507,20 @@ PubBias = derive { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ng
 PubMedWordcloud = derive { name="PubMedWordcloud"; version="0.3.2"; sha256="1xn4ygpvj6pm548yj5kjh2l8n59p2caihfpbkykvbkzgf7hq8p00"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; };
 PurBayes = derive { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
 PwrGSD = derive { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6cbffjm13z7awyxdmnilazghpiq1p7s"; depends=[survival]; };
+PythonInR = derive { name="PythonInR"; version="0.1-0"; sha256="0zbd0yi7f49r20kjljfyvpmmw7zdvw6hi2kqdijz59p53dwzjyml"; depends=[pack R6]; };
 QCA = derive { name="QCA"; version="1.1-4"; sha256="0wg2yfg61bmcxmkxvm9zjrnz4766f176y4gyqvfp5hsp9pp0h2lm"; depends=[lpSolve]; };
 QCA3 = derive { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; };
 QCAGUI = derive { name="QCAGUI"; version="1.9-6"; sha256="020ngni02j2w2ylhyidimm51d426pym2g1hg7gnpb7aplxx67n6x"; depends=[abind QCA]; };
 QCAfalsePositive = derive { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; };
 QCAtools = derive { name="QCAtools"; version="0.1"; sha256="1fcssxpyw0kfm6xgihkv4qxqmg628ahfr1bk36b9di9d29w6vgn9"; depends=[directlabels ggplot2 QCA stringr]; };
 QCGWAS = derive { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; };
+QFRM = derive { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; };
 QRM = derive { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeSeries]; };
 QSARdata = derive { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; };
 QTLRel = derive { name="QTLRel"; version="0.2-14"; sha256="05x56a8fjr6xk38dphdzh77y520cr6zykjp3qlx27drk9s5z06cs"; depends=[gdata]; };
 QUIC = derive { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; };
 QZ = derive { name="QZ"; version="0.1-4"; sha256="1k657i1rf6ayavn0lgfvlh8am3kzypgb1jhf2by147gv103izkrz"; depends=[]; };
-QoLR = derive { name="QoLR"; version="1.0"; sha256="1ah6x1fcs4l571jvgm0c257cgxhhpkzfhqimwbb9j7xbz3h55lp3"; depends=[survival zoo]; };
+QoLR = derive { name="QoLR"; version="1.0.1"; sha256="0hgvb013d2ckvg863lidyjybm6rnrlwmq2y0g0vqxzh05rp6wii5"; depends=[survival zoo]; };
 QuACN = derive { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; };
 QualInt = derive { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; };
 Quandl = derive { name="Quandl"; version="2.6.0"; sha256="1mz39sj7dxfh9p5kdq7bxlifbg9izqz04l3ilnfchva7qq1ij01q"; depends=[httr xts zoo]; };
@@ -1535,6 +1559,7 @@ R4dfp = derive { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0a
 R6 = derive { name="R6"; version="2.1.0"; sha256="0vszmwpc32h3gd5jxr47v338nci69cj30wf0b6hkmwznq34hwdfc"; depends=[]; };
 RAD = derive { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; };
 RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape Biostrings geiger phangorn]; };
+RAHRS = derive { name="RAHRS"; version="1.0.2"; sha256="0s7vkmyc3yh62m2xbsvajgvi9xdw5x4irnp7rcllhqa7z9nj50c9"; depends=[pracma RSpincalc]; };
 RAM = derive { name="RAM"; version="1.2.1"; sha256="11ymhx0nk113cy068s52hjj38y8glv8nh24yljqqvr1fd9fmy64g"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra Hmisc labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; };
 RAMP = derive { name="RAMP"; version="1.0"; sha256="18cz8gvb49j1hic71dzfcl17hz5gjdcabqvq84yr1h7iqkrq95cq"; depends=[]; };
 RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[ellipse lavaan]; };
@@ -1548,6 +1573,7 @@ RAppArmor = derive { name="RAppArmor"; version="1.0.1"; sha256="06j7ghmzw2rrlk8n
 RArcInfo = derive { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; };
 RAtmosphere = derive { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; };
 RBPcurve = derive { name="RBPcurve"; version="1.0-20"; sha256="1fk2zj16xj8n9jnydzd60crdfsigqd6xs2hq572b9r65ldiikv3z"; depends=[BBmisc checkmate mlr shape TeachingDemos]; };
+RBerkeley = derive { name="RBerkeley"; version="0.7-5"; sha256="049qvlpqwcaj82fdl815c0b2il7jbs6karibqpkq0fa3hq0q4hzz"; depends=[]; };
 RBitly = derive { name="RBitly"; version="0.6.1"; sha256="0lwwx9la3dhjy4r14kn8lgz85wwnk59ammn7jh45z2nyk7zflkdr"; depends=[httr jsonlite stringr]; };
 RCA = derive { name="RCA"; version="1.4.5"; sha256="0s200s28a6gh3dggad52dgqnf0k2jsfrqv1hbg8w2529v4s3dc5i"; depends=[igraph]; };
 RCALI = derive { name="RCALI"; version="0.2-15"; sha256="0w9807dyjghqy1rnv2c0k4kdjlwxzg5fk5r3rsqrmzjj4r8x9g9w"; depends=[splancs]; };
@@ -1559,10 +1585,10 @@ RCircos = derive { name="RCircos"; version="1.1.2"; sha256="0j7ww2djnhpra13vjr6y
 RClimMAWGEN = derive { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; };
 RColorBrewer = derive { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; };
 RConics = derive { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; };
-RCryptsy = derive { name="RCryptsy"; version="0.2"; sha256="1sm6l2jbaxia53dqivii5g7pqbczvjk53c2v2vz65qz1qnrmrybj"; depends=[RCurl RJSONIO]; };
+RCryptsy = derive { name="RCryptsy"; version="0.4"; sha256="01rz9wz5y1k77mjw4zs0jng3k4zwqda32m5xvw6kx7vkgzfas6q0"; depends=[RCurl RJSONIO]; };
 RCurl = derive { name="RCurl"; version="1.95-4.7"; sha256="1qsxffqcb3lg3zkq6l1l78bm52szlk4d2y2bnmxn4lg0i4yxfx48"; depends=[bitops]; };
 RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
-RDML = derive { name="RDML"; version="0.8-4"; sha256="0zrzi81rlxz8hrpz19g7v470fh930n5y6brn6mjq52shn0ap742m"; depends=[assertthat dplyr plyr R6 XML]; };
+RDML = derive { name="RDML"; version="0.9-1"; sha256="0ir8qp3k326gxy5f0hy144zi8xcgsk6svahz7lr5pjfj05czmxxm"; depends=[assertthat dplyr plyr R6 rlist tidyr XML]; };
 RDS = derive { name="RDS"; version="0.7-2"; sha256="143pb13wg0ms9zaiilb3ylqj6r6bcy4iqbq19j57z33i1q6ll51c"; depends=[ggplot2 gridExtra igraph reshape2 scales]; };
 RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr RCurl rjson]; };
 RDataCanvas = derive { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; };
@@ -1585,7 +1611,7 @@ RFinanceYJ = derive { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0z
 RFmarkerDetector = derive { name="RFmarkerDetector"; version="1.0"; sha256="0p8dnqwhsjh1gwxvqpicdbsjs9gczqi5j4av786l9g18f5djsv6m"; depends=[AUCRF ggplot2 randomForest ROCR UsingR WilcoxCV]; };
 RForcecom = derive { name="RForcecom"; version="0.7"; sha256="0rjav2rwanzqgi1yasbm9lj18f0mfxwd8w8x41skf656gfcpi0i4"; depends=[plyr RCurl XML]; };
 RFreak = derive { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; };
-RGA = derive { name="RGA"; version="0.2.2"; sha256="1n3czw1yl13ws23yv2rhpq9l7wm0lvgm0jidh6j0mb833322jljx"; depends=[curl httpuv httr jsonlite shiny]; };
+RGA = derive { name="RGA"; version="0.2.3"; sha256="0a4c5bn5pvrf975psyx03s9a78z9ba851ykqhmx85kl33zmq6mhp"; depends=[curl httpuv httr jsonlite shiny]; };
 RGCCA = derive { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; };
 RGENERATE = derive { name="RGENERATE"; version="1.3"; sha256="16gkdwbigdsdvnplqhzs11kk4dhb2rlnf7vj6kbzxw9fb1b7818q"; depends=[RMAWGEN]; };
 RGENERATEPREC = derive { name="RGENERATEPREC"; version="1.0"; sha256="1f6y3i8r6a9cajbj127s0cd13ihbi8scgrsgizza1fjb7fg2g450"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; };
@@ -1608,12 +1634,13 @@ RInSp = derive { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9q
 RInside = derive { name="RInside"; version="0.2.13"; sha256="0cfhljdai9kkw5m01mjaya0s02g4g1cy1g4i0qpjkhgqyihsh7dy"; depends=[Rcpp]; };
 RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[abind lattice SparseM svd xtable]; };
 RJDBC = derive { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; };
-RJSDMX = derive { name="RJSDMX"; version="1.3"; sha256="1z4l6iw404qn3syk2877msywkr8369nic5zzvnx1qj0gj9x2mm2p"; depends=[rJava zoo]; };
+RJSDMX = derive { name="RJSDMX"; version="1.4"; sha256="1g14nrjkspv3wyg9kc5bnn9zb37dw1z8y7mc4sxhacd1n2nxzb97"; depends=[rJava zoo]; };
 RJSONIO = derive { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; };
-RJaCGH = derive { name="RJaCGH"; version="2.0.3"; sha256="0wz7vhlgzf8smzl7gx01dx070266fnmzw66wpl0im20nxfy8mr0l"; depends=[]; };
+RJaCGH = derive { name="RJaCGH"; version="2.0.4"; sha256="1a8nd0w73dvxpamzi2addwr6q3rxhnnpa1girnlwbd1j1dll0bz6"; depends=[]; };
 RJafroc = derive { name="RJafroc"; version="0.0.1"; sha256="0zjyr7qz50wvzkais6q9kyf3wp29g15kan73b8wdqrvab0f5rjqs"; depends=[ggplot2 stringr xlsx]; };
 RKEA = derive { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; };
 RKEAjars = derive { name="RKEAjars"; version="5.0-1"; sha256="00bva6ksdnmwa0i2zvr36n40xp429c0sqyp20a8n3zsblawiralc"; depends=[rJava]; };
+RKlout = derive { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; };
 RLRsim = derive { name="RLRsim"; version="3.0"; sha256="16bqsp15b8ikgix18p63k6sf81d1al4djbb51r08imjs4z9jppg4"; depends=[mgcv Rcpp]; };
 RLumShiny = derive { name="RLumShiny"; version="0.1.0"; sha256="0j4w3h1j6dm5q98639am3xfixjdx2xhiiy3qghkb0z8lv5rbvvw5"; depends=[digest googleVis Luminescence RCurl shiny]; };
 RM2 = derive { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
@@ -1628,7 +1655,7 @@ RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw
 RMark = derive { name="RMark"; version="2.1.13"; sha256="04wrl4i3d6kwy4masqc17qab24jv8p3kbfcx2z5l11wyf84xaqgx"; depends=[coda matrixcalc msm snowfall]; };
 RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[e1071 lavaan MASS]; };
 RMongo = derive { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
-RMySQL = derive { name="RMySQL"; version="0.10.3"; sha256="0791pshzr7rjjcnlm9md7gfsqkzizhzr9vwgnk2acc7sw5hikga6"; depends=[DBI]; };
+RMySQL = derive { name="RMySQL"; version="0.10.4"; sha256="0lybsqmngh9hqkwxgvkz5w13i40i0jbj8k1niwa8yk1fdik57v8d"; depends=[DBI]; };
 RNCBIEUtilsLibs = derive { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
 RNCEP = derive { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[abind fields fossil maps RColorBrewer sp tgp]; };
 RND = derive { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; };
@@ -1643,17 +1670,19 @@ ROCS = derive { name="ROCS"; version="1.2"; sha256="1liph11p5dwvm1z5vq7ph5pizzqr
 ROCt = derive { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date relsurv survival]; };
 ROCwoGS = derive { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; };
 RODBC = derive { name="RODBC"; version="1.3-12"; sha256="042m7bwjhlzpq2hgzsq0zy4ri3s8ngw3w4qrqh1ag7fprpn55flj"; depends=[]; };
-RODBCext = derive { name="RODBCext"; version="0.2.3"; sha256="0j0774gpnd72mw3x9qv7shiwrk0s5rk8hf0wjq4iy42wwbvql7l6"; depends=[RODBC]; };
+RODBCext = derive { name="RODBCext"; version="0.2.5"; sha256="18a0ajqrq3rcfcsyz0c9mwq6bi03prpg83z9jasbbc866gqs6fvq"; depends=[RODBC]; };
 RODM = derive { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; };
 ROI = derive { name="ROI"; version="0.1-0"; sha256="01za8cxjf721m2lxnw352k8g32pglmllk50l7b8yhjwc49k8rl66"; depends=[registry slam]; };
 ROI_plugin_glpk = derive { name="ROI.plugin.glpk"; version="0.0-2"; sha256="10p3cq59app3xdv8dvqr24m937a36lzd274mdl2a9r4fwny2rssa"; depends=[Rglpk ROI]; };
 ROI_plugin_quadprog = derive { name="ROI.plugin.quadprog"; version="0.0-2"; sha256="0mkjq87rv1xf0bggpqd2r4gabv11spgcds2y94r3vpmh8krf71jf"; depends=[quadprog ROI slam]; };
 ROI_plugin_symphony = derive { name="ROI.plugin.symphony"; version="0.0-2"; sha256="1z4cahz0h38jw54p9363ca6i3qq7dwlm3568dr91gvpqf76b05wd"; depends=[ROI Rsymphony slam]; };
+ROMIplot = derive { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; };
 ROSE = derive { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; };
 RObsDat = derive { name="RObsDat"; version="15.02"; sha256="1fagbmp48rnyln6jh2yzvc414q82q6dvixmia7yqg64lrkzkh302"; depends=[DBI e1071 sp spacetime vwr xts zoo]; };
 ROptEst = derive { name="ROptEst"; version="0.9"; sha256="0m5czyqcsz42dzrhm3vwfmn046n57cb7x5sqzf2nad1gqgxzxp1d"; depends=[distr distrEx distrMod RandVar RobAStBase]; };
 ROptEstOld = derive { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx evd RandVar]; };
 ROptRegTS = derive { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[distr distrEx RandVar ROptEstOld]; };
+ROptimizely = derive { name="ROptimizely"; version="0.2.0"; sha256="059zfn6y687h989wryvpqwgnp9njrrr4ys0gf1ql4pw85b2c50dy"; depends=[httr jsonlite]; };
 ROracle = derive { name="ROracle"; version="1.1-12"; sha256="1ydmckr0wzjgvhhh410l4ih7idbr8140g6v11avh655wffk02q5p"; depends=[DBI]; };
 RPANDA = derive { name="RPANDA"; version="1.0"; sha256="1q8chhmdgn697a4qp4f7prdviar29z0py050748qw7ab326lqp5d"; depends=[ape deSolve picante pspline]; };
 RPCLR = derive { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
@@ -1669,15 +1698,16 @@ RPushbullet = derive { name="RPushbullet"; version="0.2.0"; sha256="1h9yvw9kw7df
 RQDA = derive { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li24b6n11p5lcxf9xpy7sbmh5ig6g"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
 RQuantLib = derive { name="RQuantLib"; version="0.4.0"; sha256="1p2hd7wa5yi5ian2akb70pjr4glfni4dvwgglyg5pqmmm2j45k2d"; depends=[Rcpp]; };
 RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; };
+RRNA = derive { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; };
 RRTCS = derive { name="RRTCS"; version="0.0.2"; sha256="0lwc0girdsrni6qv0z7bggqhlwlny4amgkayd8s3cdh3m006dn95"; depends=[sampling samplingVarEst]; };
-RRreg = derive { name="RRreg"; version="0.3.0"; sha256="0pip05wk76h436mvcsddhn2p25ihms3yf1lb23k7ygpx6jx4mdn3"; depends=[doParallel foreach]; };
+RRreg = derive { name="RRreg"; version="0.4.1"; sha256="0qlahjhlfjcbvdr6z3ap8ns8vw8g0pvifrkyvcxfg35p4dr6p3yl"; depends=[doParallel foreach]; };
 RSA = derive { name="RSA"; version="0.9.8"; sha256="1pqblhimhj79ss8js0nf8w24ga2kdmgw64rh496iib36g27asn8n"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; };
 RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
 RSAGA = derive { name="RSAGA"; version="0.94-1"; sha256="0zr3rm3s5pf2l2gkvbsr60srj6s1xx7kn26krpbzz3xqgbfgmz6k"; depends=[gstat plyr shapefiles]; };
 RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; };
 RSDA = derive { name="RSDA"; version="1.2"; sha256="06sa3x0abm2gnf4i4y3d5mlqj1wl7mzzal27sa1x65awzi6rs2kz"; depends=[abind FactoMineR ggplot2 glmnet scales scatterplot3d sqldf XML]; };
 RSEIS = derive { name="RSEIS"; version="3.4-5"; sha256="0wh7977vm721hb566lh721mwn6b4x0p7x6xb7gv0nvrd3kpsw9zn"; depends=[RPMG Rwave]; };
-RSGHB = derive { name="RSGHB"; version="1.1.0"; sha256="08ir7460mg0f414j69s7ffj35drip9qbbzwva1ps6x0gjjdnmzcq"; depends=[]; };
+RSGHB = derive { name="RSGHB"; version="1.1.1"; sha256="0mfxn59p1sd7id1jqw7xk040k6fa8awshfqxdhvka8b93qvwb8f1"; depends=[]; };
 RSKC = derive { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; };
 RSNNS = derive { name="RSNNS"; version="0.4-7"; sha256="15293a6lrihk407spv2ndpcf0r9xm5l8ggc1sagf5r2mvbfiv57c"; depends=[Rcpp]; };
 RSNPset = derive { name="RSNPset"; version="0.4"; sha256="1asrl75jlkdp829phjfza10fcl9akiqspbxncd8zf2a23f2r54sy"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; };
@@ -1685,20 +1715,21 @@ RSPS = derive { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksn
 RSQLServer = derive { name="RSQLServer"; version="0.1.1"; sha256="0xaw8a06xgc78hjg4bndip0jpc7l4glk28pggm2l3j31ybx81kw7"; depends=[DBI rJava RJDBC]; };
 RSQLite = derive { name="RSQLite"; version="1.0.0"; sha256="08b1syv8z887gxiw8i09dpqh0zisfb6ihq6qqr01zipvkahzq34f"; depends=[DBI]; };
 RSVGTipsDevice = derive { name="RSVGTipsDevice"; version="1.0-4"; sha256="1ybk5q4dhskrh7h1sy86ilchdwi6rivy3vv3lph6pms2virgm854"; depends=[]; };
-RSclient = derive { name="RSclient"; version="0.7-2"; sha256="04ml4pynjl97295wrclvb61mpwacrkzc9x5pbwyfg1qr3l8hss93"; depends=[]; };
+RSclient = derive { name="RSclient"; version="0.7-3"; sha256="07mbw6mcin9ivsg313ycw2pi901x9vjpmi6q7sms1hml4yq50k6h"; depends=[]; };
 RSeed = derive { name="RSeed"; version="0.1.31"; sha256="0wljchzkp8800v9zcgjapkbildkb3p2xnkh1m6m7q6qqc9aw8mws"; depends=[graph RBGL sybil]; };
 RSelenium = derive { name="RSelenium"; version="1.3.5"; sha256="15pnmnljl4dm9gbcgnad5j58k6cgs6qm34829kdgyb0ygs9q7ya0"; depends=[caTools RCurl RJSONIO XML]; };
 RSiena = derive { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; };
-RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.4.3"; sha256="003mazcwz7w814pm8i9zdfmsbijf02n80w48ml4grmjjn1v7x5ar"; depends=[base64enc digest httr jsonlite plyr stringr]; };
-RSocrata = derive { name="RSocrata"; version="1.6.0-12"; sha256="0db1p3bxlh07d43rlg4cmj2gbasqd21mg8qnrrp8zkqasmjdzhn7"; depends=[curl httr jsonlite mime]; };
+RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.4.4"; sha256="09bfrfbrkbfg49rwvll1pwl9axibk3s4gmlfg3sry227srnqjg5s"; depends=[base64enc digest httr jsonlite plyr stringr]; };
+RSocrata = derive { name="RSocrata"; version="1.6.2-10"; sha256="0nj0g40cy1g47j6nyp3a86g4gcm9ipalbm7dsy2s7367r7k0fa65"; depends=[httr jsonlite mime]; };
 RSofia = derive { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp]; };
+RSpincalc = derive { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; };
 RStars = derive { name="RStars"; version="1.0"; sha256="1siwqm8sp8wqbb56961drkwcnkv3w1xiy81hxy0zcr2z7rscv7mh"; depends=[RCurl RJSONIO]; };
 RStorm = derive { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
 RSurveillance = derive { name="RSurveillance"; version="0.1.0"; sha256="1y17bfv0glzzb5rfniia0z4px810kgv2gns0igizw7w427zshnm0"; depends=[epiR epitools]; };
 RSurvey = derive { name="RSurvey"; version="0.8-3"; sha256="0dqrajd3m2v5cd3afl9lni9amfqfv4vhz7kakg3a5180j5rcag12"; depends=[MBA rgeos sp]; };
 RSvgDevice = derive { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; };
 RTConnect = derive { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; };
-RTDE = derive { name="RTDE"; version="0.1-0"; sha256="00hh1axipp2blrhjwl9mc4fkqv3l132gxlhi9hdy52w20yhwigin"; depends=[]; };
+RTDE = derive { name="RTDE"; version="0.2-0"; sha256="1dj7dsj4256z9m70y2fpcgprxpqbgqxz0dqwn0jl80sj2325f66s"; depends=[]; };
 RTOMO = derive { name="RTOMO"; version="1.1-3"; sha256="10qkqdx2zj2m854z9s57ddf5jbzagac9mq5v6z5393c0s8bx10x8"; depends=[GEOmap RPMG RSEIS splancs]; };
 RTextTools = derive { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[caTools e1071 glmnet ipred maxent nnet randomForest SparseM tau tm tree]; };
 RTextureMetrics = derive { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
@@ -1726,14 +1757,14 @@ RadioSonde = derive { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3sy
 Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; };
 Ramd = derive { name="Ramd"; version="0.2"; sha256="0a64rp4dwhfr6vxsmya16x7wy7rxj4n98sdhhyy0ll850rdzlxd8"; depends=[]; };
 RandVar = derive { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; };
-RandomFields = derive { name="RandomFields"; version="3.0.62"; sha256="1v2dmwl3nq3mw88439z6hjaf3gkz9sf7dqm9iipgk333qw1s6sfk"; depends=[sp]; };
-RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.7"; sha256="1rdhc81gd0y5ss1ap74y1n8g2d7z4gjryviw86z53aznn3ddnbhg"; depends=[]; };
+RandomFields = derive { name="RandomFields"; version="3.1.1"; sha256="1hxf03nz1pcj2w60kys8mlwdxfyr90g7q457ycj9d8j3sd5zz0ip"; depends=[RandomFieldsUtils sp]; };
+RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.10"; sha256="1g5mpdgfapwkaqgxkk7yqlvgf75qv3l4yp81w437d0d2v1fz2mf5"; depends=[]; };
 RankAggreg = derive { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; };
 RankResponse = derive { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
 Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp RcppEigen]; };
 RapidPolygonLookup = derive { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[PBSmapping RANN RgoogleMaps sp]; };
 Rarity = derive { name="Rarity"; version="1.3-4"; sha256="0zz1axr8a1r6js0la2ncls0l6jnjvx807ay2ngzb52hqbijifghx"; depends=[]; };
-RaschSampler = derive { name="RaschSampler"; version="0.8-7"; sha256="11vkb5gvr1r2a7fpxyygkixc62ms53dpik9jdg7vrb9k43v82ggj"; depends=[]; };
+RaschSampler = derive { name="RaschSampler"; version="0.8-8"; sha256="0y7dkgv1cy6r1mbmyqm27qwl10rl12g1svpx9jkzq5hq0hnm2xhw"; depends=[]; };
 RbioRXN = derive { name="RbioRXN"; version="1.5.1"; sha256="0lc43wm986y3xbdh1xihn7w583cql9kvj6rb018pn06ghz153i0d"; depends=[ChemmineR data_table fmcsR gdata KEGGREST plyr RCurl stringr]; };
 Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; };
 Rborist = derive { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp RcppArmadillo]; };
@@ -1757,7 +1788,7 @@ RcmdrPlugin_IPSUR = derive { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256="
 RcmdrPlugin_KMggplot2 = derive { name="RcmdrPlugin.KMggplot2"; version="0.2-0"; sha256="1w4n7r3sp6h87wxhrzg500w90p8dzr43j28p8p1r2y0v0i0v6mk5"; depends=[ggplot2 ggthemes gtable plyr Rcmdr RColorBrewer scales survival tcltk2]; };
 RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; };
 RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[ordinal Rcmdr]; };
-RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.0.4"; sha256="1qxx685wd974dc2zj7myg0jlxz5s63lkjfycc66f3mcj1qk5j4k6"; depends=[MASS mixlm pls Rcmdr xtable]; };
+RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.3"; sha256="0iyy3kzczifz1ipp8sscaycxd2b2bs86sdmgz9w3gsxxqlrhkqh6"; depends=[MASS mixlm pls Rcmdr xtable]; };
 RcmdrPlugin_RMTCJags = derive { name="RcmdrPlugin.RMTCJags"; version="1.0-1"; sha256="1hk8gmv74mngcx2pjgv1zkdh2csixxgd4yqz38bdn1l2zf243czq"; depends=[coda igraph Rcmdr rmeta runjags]; };
 RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; };
 RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[Rcmdr SCMA SCRT SCVA]; };
@@ -1784,7 +1815,7 @@ RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-5"; sh
 RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7.3"; sha256="1ssnky8basr135lhnagq7dlwlj1c9qrvm14hbdm0k3g9gnqmxkgh"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; };
 Rcolombos = derive { name="Rcolombos"; version="1.5.2"; sha256="1whjn447jk2bjyjf0fwl0165f8x41fjzmkmagl6dfq1c4373sf27"; depends=[httr]; };
 Rcplex = derive { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; };
-Rcpp = derive { name="Rcpp"; version="0.11.6"; sha256="153gwzg2inxmzs5qrr87r3zabjvfh32i8kdivdy77b3c5yfrl5za"; depends=[]; };
+Rcpp = derive { name="Rcpp"; version="0.12.0"; sha256="182109z0yc1snqgd833ssl2cix6cbq83bcxmy5344b15ym820y38"; depends=[]; };
 Rcpp11 = derive { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
 RcppAPT = derive { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp]; };
 RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.6"; sha256="1n4wrllhxn95lgkralvw5jjgff93nay5wdlyihih7f195fq5wqms"; depends=[Rcpp]; };
@@ -1795,7 +1826,7 @@ RcppClassic = derive { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy
 RcppClassicExamples = derive { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; };
 RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7dddpykckzw8hmqslsdl7l68wj60qkc"; depends=[Rcpp RcppArmadillo]; };
 RcppDL = derive { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; };
-RcppEigen = derive { name="RcppEigen"; version="0.3.2.4.0"; sha256="1p6lfylj0mh059pxbp198r8nci8f89h0gb11x2pi0jgg7cqbxgh6"; depends=[Matrix Rcpp]; };
+RcppEigen = derive { name="RcppEigen"; version="0.3.2.5.0"; sha256="164ghglzdwvrfpiw512j19m1hjpy4h7xyaqhlw1yrncngr2sdb99"; depends=[Matrix Rcpp]; };
 RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp]; };
 RcppFaddeeva = derive { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; };
 RcppGSL = derive { name="RcppGSL"; version="0.2.5"; sha256="16zvqgn4hkijsg5fxvzm6hq200w8z4189aag10zciw81ka4isqv5"; depends=[Rcpp]; };
@@ -1803,22 +1834,22 @@ RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.10-2"; sha256="1hdvdk6ni2i
 RcppOctave = derive { name="RcppOctave"; version="0.14.5"; sha256="0dplc2x9fq2jfzfbcxdd45pmiimapqb3xhyjkzd4k6q8xmqjw95p"; depends=[digest pkgmaker Rcpp stringr]; };
 RcppParallel = derive { name="RcppParallel"; version="4.3.14"; sha256="04kch598fqxkclv7ys8s9mqsd9wbzjqk1yjc66drzyycjc8jl9qi"; depends=[]; };
 RcppProgress = derive { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp]; };
-RcppRedis = derive { name="RcppRedis"; version="0.1.4"; sha256="00cv6yicv247bbx617i4k4hfkl5kiv5q2ky84w3sk3g3f0wnp9np"; depends=[RApiSerialize Rcpp]; };
+RcppRedis = derive { name="RcppRedis"; version="0.1.5"; sha256="0yvf3yfdpk7s0vac7njpjdrkcq87j7q750vi6bvilqk9adlbjfny"; depends=[RApiSerialize Rcpp]; };
 RcppRoll = derive { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp]; };
 RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp]; };
 RcppStreams = derive { name="RcppStreams"; version="0.1.0"; sha256="0pb9ri2jajfh7643wx730bkmpvjvvmip682ynm2yn6x6brjll6jf"; depends=[BH Rcpp]; };
-RcppTOML = derive { name="RcppTOML"; version="0.0.3"; sha256="0v9gxbr5gb7k273ld6vx2n0vzy22px13s7cvackbm7mhc68bp5jw"; depends=[Rcpp]; };
+RcppTOML = derive { name="RcppTOML"; version="0.0.4"; sha256="0ipfbcp55ghmh8i80vyq0w2js07360wiq3z11qpkb816ln1gqb89"; depends=[Rcpp]; };
 RcppXts = derive { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; };
-RcppZiggurat = derive { name="RcppZiggurat"; version="0.1.2"; sha256="05ai6s2j025fvr4znpmsvhxj4x7xyw2wsb9j3c5sv7aw1byfs0bb"; depends=[Rcpp RcppGSL]; };
+RcppZiggurat = derive { name="RcppZiggurat"; version="0.1.3"; sha256="0s82haf96krr356lcf978f229np6w0aihm2qxcnlm0w3i02gzh3x"; depends=[Rcpp RcppGSL]; };
 Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; };
 Rd2roxygen = derive { name="Rd2roxygen"; version="1.6"; sha256="0y0vh1dfflh8lrgrdj9wfmwh70ywd9kiia49f09h849mv1ln1z60"; depends=[formatR roxygen2]; };
-Rdistance = derive { name="Rdistance"; version="1.2.2"; sha256="0njfcgcaw8vkvayd102wd5cdp1ai9ghqhi8zsijv6iifxs6yvwq9"; depends=[]; };
-Rdpack = derive { name="Rdpack"; version="0.4-14"; sha256="19vscr9l63c074n76b6a6jbl956sphjhz0d50yiwp3cvqf28yssf"; depends=[bibtex gbRd]; };
-Rdsdp = derive { name="Rdsdp"; version="1.0.2"; sha256="0rpy3897dargrfrn6qd5m1j6i1pvfk2qa3cny0iacqkgqbg8a4wx"; depends=[]; };
+Rdistance = derive { name="Rdistance"; version="1.3.2"; sha256="1ajmr58lgc74727jiydfrh4j6ra7vq8hp8nm3l2s3g2mc8n1mqk5"; depends=[]; };
+Rdpack = derive { name="Rdpack"; version="0.4-18"; sha256="0s387gadr1bz5f5ix69z0r9hzcp5w4axbrn1iq9932kkincmg8qj"; depends=[bibtex gbRd]; };
+Rdsdp = derive { name="Rdsdp"; version="1.0.3"; sha256="0hsgcb7vk5csrcpzvvbjwhzrgbdr7p92lxahf6x8aflrqdk9d95j"; depends=[]; };
 Rdsm = derive { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; };
 ReCiPa = derive { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; };
 ReacTran = derive { name="ReacTran"; version="1.4.2"; sha256="1yc0k3wgg4yb6cqmjkyl25sfkbfcfxi5ria106w5jyx7dr5lfvdi"; depends=[deSolve rootSolve shape]; };
-RealVAMS = derive { name="RealVAMS"; version="0.3-1"; sha256="04d4sc3lhlklx1y016rmh3x27m8caxlp53qn2ks5wz52w26pfdhn"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
+RealVAMS = derive { name="RealVAMS"; version="0.3-2"; sha256="0rmqy3csgfvq5c3sawvd3v37is8v5nnnrhifschqfsycmadf1gdp"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
 RecordLinkage = derive { name="RecordLinkage"; version="0.4-8"; sha256="0wjjrgmz7m11hhsw7dcg3745255xckdgrqp3xlqkyh2kzbyr9rp4"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; };
 Records = derive { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
 RedditExtractoR = derive { name="RedditExtractoR"; version="1.1.1"; sha256="00y9m55isnhx8bl82nc2rpll4aijkcrxqgkayqpp2yxy4rj6klfj"; depends=[RJSONIO]; };
@@ -1841,7 +1872,9 @@ ResourceSelection = derive { name="ResourceSelection"; version="0.2-4"; sha256="
 RevEcoR = derive { name="RevEcoR"; version="0.99.2"; sha256="100sman51vvwg5xkypmksyyjqdb6g858z29vn7x4kvly8ncw4hfd"; depends=[gtools igraph magrittr Matrix plyr stringr XML]; };
 Rfacebook = derive { name="Rfacebook"; version="0.5"; sha256="0cl4s815i4yxp805j8nhqmva31imbd1xp3yxgi53qwjhagh4i57a"; depends=[httpuv httr rjson]; };
 Rfit = derive { name="Rfit"; version="0.21"; sha256="129z5ivwfxbh3rfwk98jnm6ibq5z9z3r9mhy9gv61jfr4ig78dcn"; depends=[quantreg]; };
+Rgbp = derive { name="Rgbp"; version="1.0.9"; sha256="0a0krpj73psf8cahjxd7xzslckzs6325phc2kr1vd2ik56vcyqlz"; depends=[mnormt sn]; };
 Rglpk = derive { name="Rglpk"; version="0.6-1"; sha256="011l60571zs6h8wmv4r834dg24knyjxhnmxc7yrld3y2qrhcl714"; depends=[slam]; };
+Rgnuplot = derive { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; };
 RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.7"; sha256="04k7h8hgxvgsccdiysbblplwjvn8m7g8h3anzdlxmmjaamd8l9lw"; depends=[png RJSONIO]; };
 Rhpc = derive { name="Rhpc"; version="0.15-176"; sha256="0amnr1x1zvh5y2cblx4wjw5y5wm1815x4rm7w03f0ri9qdk5i8ax"; depends=[]; };
 RhpcBLASctl = derive { name="RhpcBLASctl"; version="0.15-148"; sha256="1carylfz9gafradbdyg7fz2bypr7n72fbm8vhyiinmp0k4s5ipvc"; depends=[]; };
@@ -1899,7 +1932,7 @@ Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3.3"; sha256="16bnhrg86rzi4g4zf2
 Rtts = derive { name="Rtts"; version="0.3.1"; sha256="1zgrkj4y7267d1n8iw1q3pgf2lmmklkslf5211kl7v788zxqr9c5"; depends=[RCurl]; };
 Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp]; };
 Runiversal = derive { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
-Runuran = derive { name="Runuran"; version="0.21.0"; sha256="1p33z9h2zj6fx42rlq6yajd6lwvzy4a1a5gs67dz5k1zbza8avw0"; depends=[]; };
+Runuran = derive { name="Runuran"; version="0.22.0"; sha256="10ial5kz4vfprl1rk4v7dd9l3h5wpvzf4ypynl9c1f6p62vz64im"; depends=[]; };
 RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[cairoDevice gWidgets gWidgetsRGtk2 Runuran rvgtest]; };
 Rvcg = derive { name="Rvcg"; version="0.12.2"; sha256="15lj2ba9fwzbqzwwl7wpzij1n983qxmql2fwxjcapkl76hl68kp9"; depends=[Rcpp RcppEigen]; };
 Rvmmin = derive { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5lbfinypkixfy7zsvplisb866f8w45amd152a"; depends=[optextras]; };
@@ -1910,7 +1943,7 @@ RxnSim = derive { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l
 Ryacas = derive { name="Ryacas"; version="0.2-12.1"; sha256="18dpnr6kj0a8f2jcbj9f6ahd0mg7bm1qm8dcs1wh8kmjl3klr1y8"; depends=[XML]; };
 Rz = derive { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign formatR ggplot2 memisc psych RGtk2]; };
 SAENET = derive { name="SAENET"; version="1.1"; sha256="13mfmmjqbkdr6j48smdlqvb83dkb34kx3i16gx0gmmafk3avdaxx"; depends=[autoencoder neuralnet]; };
-SAFD = derive { name="SAFD"; version="0.4"; sha256="1zbja8bgva2j24ks4m14hbf4s0n674lj89nfxkkmwrljzsmjrjhv"; depends=[]; };
+SAFD = derive { name="SAFD"; version="1.0"; sha256="1mq9ncvgw4lpr2ixram9ds9pjcvmg6vbm31cscyqzky9q8bpyv9f"; depends=[]; };
 SAM = derive { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; };
 SAMUR = derive { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; };
 SAMURAI = derive { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; };
@@ -1934,6 +1967,7 @@ SCperf = derive { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24
 SDD = derive { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; };
 SDDE = derive { name="SDDE"; version="1.0.0"; sha256="1vd96w6qjy7ak85gj1c255fb0ifaffp79k6swqnvskvkq2cc524m"; depends=[doParallel foreach igraph iterators]; };
 SDMTools = derive { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; };
+SDR = derive { name="SDR"; version="0.6.0.0"; sha256="0gjliq7pdssyqnchwyhf7mc6blrycfjg82bf75nxbhmis93g5dc4"; depends=[shiny]; };
 SDaA = derive { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; };
 SEAsic = derive { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; };
 SECP = derive { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; };
@@ -2024,7 +2058,7 @@ SamplerCompare = derive { name="SamplerCompare"; version="1.2.7"; sha256="149ipr
 SamplingStrata = derive { name="SamplingStrata"; version="1.0-3"; sha256="16nrcv5hbbvn4rgckzagi84i7h49bd878mnpknlzmzr5ykzywsay"; depends=[]; };
 Scale = derive { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[Hmisc MASS psych]; };
 SciViews = derive { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[ellipse MASS]; };
-SciencesPo = derive { name="SciencesPo"; version="1.02.12"; sha256="0v947xjfwyidl2fa6i7drvv9vnskz06kq4rmz46qzns7g0lwfjnq"; depends=[data_table foreign ggplot2 lubridate MASS xtable]; };
+SciencesPo = derive { name="SciencesPo"; version="1.3.6"; sha256="1xsxr5d88y9zs7kakglg93nmxin99g03z8h78ghkazy59rin22b6"; depends=[data_table dplyr ggplot2 magrittr plyr RSQLite scales stringr vcd]; };
 ScoreGGUM = derive { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; };
 ScottKnott = derive { name="ScottKnott"; version="1.2-5"; sha256="1ywwhdghcy30mp2nhsk2yhgb37nrdmb9yan5vvzsg66bchc3xgll"; depends=[]; };
 ScrabbleScore = derive { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; };
@@ -2038,20 +2072,21 @@ SelvarMix = derive { name="SelvarMix"; version="1.0"; sha256="0yysmf854xz5l0lf2x
 SemiCompRisks = derive { name="SemiCompRisks"; version="2.0"; sha256="0in3pv66nhb0ar4xfxskvf24c7bqkr9ik069a4nynwnc3idpsq32"; depends=[]; };
 SemiMarkov = derive { name="SemiMarkov"; version="1.4.1"; sha256="048hmbcmhqkvqw8nbzm0136mc9w7b27jy8q9r3rvc3banh854d1m"; depends=[MASS numDeriv Rsolnp]; };
 SemiPar = derive { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[cluster MASS nlme]; };
-SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.4"; sha256="038k5vvgrk20n2cbji8qrp9nkg0ck5dcbxnd7wc5hy1l780g4k5g"; depends=[magic mgcv survey trust VGAM VineCopula]; };
+SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.5"; sha256="1m063bv9fqsnmi6aw2w6dx2s2qgh9ci1v9bcvh83zb3j2ajprkrk"; depends=[magic mgcv survey trust VGAM VineCopula]; };
 SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.2"; sha256="1k9xmby8hy4k0qn7pjj0rypxj4iqb206ixv92bz7ga0q8zd0nxbr"; depends=[copula gamlss_dist magic Matrix mgcv mvtnorm trust VGAM]; };
 SenSrivastava = derive { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; };
 SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; };
 SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[cluster FactoMineR KernSmooth]; };
 SensusR = derive { name="SensusR"; version="1.0"; sha256="1b5yrb3iiijr7x0r4ga5dlx6yqqk4bvmh1377655s6c7j36sn1xd"; depends=[jsonlite lubridate plyr rworldmap sp]; };
 SeqFeatR = derive { name="SeqFeatR"; version="0.1.7"; sha256="195pkpk9sh99v01mk827axsynwaccygx19i1x0h0ma7bsqlmw1qc"; depends=[ape Biostrings calibrate ggplot2 phangorn plotrix plyr qvalue tcltk2 widgetTools]; };
-SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; };
+SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.5"; sha256="041hlf64zbndz76r076pmym4dw4xl3fahryvpvjspw0sdlhmfm8c"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; };
 Sequential = derive { name="Sequential"; version="2.0.1"; sha256="11z7d02j97589s5csq5vzsfal3vip5klhm1q8h8pizqjv32i1lv5"; depends=[]; };
 SetMethods = derive { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[betareg lattice]; };
 ShapeSelectForest = derive { name="ShapeSelectForest"; version="1.0"; sha256="0jy40aql33xwl4s7y2s3wb6yig4vr6ly6fhz7hn2d59b8428p04q"; depends=[coneproj raster rgdal]; };
 SharpeR = derive { name="SharpeR"; version="1.0.0"; sha256="107nk8ipqx4mzfhlv5b6k6vx60zi9rmvzk8qaxqic170p4ppcl2z"; depends=[matrixcalc sadists]; };
 ShrinkCovMat = derive { name="ShrinkCovMat"; version="1.1.0"; sha256="1v2rr97wz5521cjy41j5vdqq29xd7696pc1rzw4angsfjrq3fnh4"; depends=[]; };
 SiZer = derive { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; };
+SigTree = derive { name="SigTree"; version="1.10.2"; sha256="0d91s2x809mhirkmcdn8zvnivimssqhnydgfwchfrckk6p4jfm40"; depends=[ape phyext2 phylobase phyloseq RColorBrewer]; };
 SightabilityModel = derive { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; };
 Sim_DiffProc = derive { name="Sim.DiffProc"; version="2.9"; sha256="1cq168ga4p70hgx7rsm9rvam8b0wvjivqp2nsprk39i864j9sr91"; depends=[rgl scatterplot3d]; };
 SimComp = derive { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mratios multcomp mvtnorm]; };
@@ -2082,10 +2117,12 @@ Sofi = derive { name="Sofi"; version="0.0.26"; sha256="0jcnwy308h8qdswapdqpphdx5
 SoftClustering = derive { name="SoftClustering"; version="1.1502"; sha256="1pgg9mjpfw55m3ny726vx5wl8gwsdkrxv8xzgmy3aqdlwzhh4bwz"; depends=[]; };
 SoilR = derive { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; };
 SortableHTMLTables = derive { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; };
-SoundexBR = derive { name="SoundexBR"; version="1.1"; sha256="1rhmwbf7687lgwwx1qldljb9j7qj7hcaypawlchmys61ny9500wl"; depends=[]; };
+SoundexBR = derive { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; };
+SoyNAM = derive { name="SoyNAM"; version="1.0"; sha256="0vqaxkbjwqx8xmwsmyvxg0i1x355wjpzgs2ndiv6dgsgdl52yvan"; depends=[lme4 NAM reshape2]; };
+SparseFactorAnalysis = derive { name="SparseFactorAnalysis"; version="1.0"; sha256="0lgfvydxb86r5hks1mf0p0yhgpx8s8fbkc3q6dimc728rw26qcv5"; depends=[directlabels ggplot2 MASS proto Rcpp RcppArmadillo truncnorm VGAM]; };
 SparseGrid = derive { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; };
 SparseM = derive { name="SparseM"; version="1.6"; sha256="1296snm3481259xwhj97vffwjb2v8367ivf2g5amd4pzqzwx6p1k"; depends=[]; };
-SparseTSCGM = derive { name="SparseTSCGM"; version="2.1.1"; sha256="0xr3l049kssi7k074wggvc96p2zlca076j2hwpwpmna42xl3dmqv"; depends=[abind flare glasso longitudinal MASS mvtnorm network]; };
+SparseTSCGM = derive { name="SparseTSCGM"; version="2.2"; sha256="0a1iscn4l587hn582hx4v8fawn6d9gg1m173fc0bsfpkyckgq8hx"; depends=[abind flare glasso longitudinal MASS mvtnorm network]; };
 SpatPCA = derive { name="SpatPCA"; version="1.0.0.2"; sha256="0f8byi4zhrjj8fdka93r22kbjjqgkx3p06a65sppgvq65v8lff0l"; depends=[fields Rcpp RcppArmadillo]; };
 SpatialEpi = derive { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxmf272fk46wykv9s2lcjqd5yhd80dfs78qjwly77"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; };
 SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-2"; sha256="0ywybk9gziy2hzb1ks88q4rzs3lzzy6y3fzhja2s39ngg195hi6l"; depends=[fields maps]; };
@@ -2095,7 +2132,7 @@ SpatialPosition = derive { name="SpatialPosition"; version="0.9"; sha256="0w09yr
 SpatialTools = derive { name="SpatialTools"; version="0.5.8"; sha256="18zchr8bfjqdr9j6vh6365mhrj2n0ns1ixvmas5s0ppiim59jl7j"; depends=[Rcpp RcppArmadillo spBayes]; };
 SpatialVx = derive { name="SpatialVx"; version="0.2-4"; sha256="0nm3mripq1fiqn7ydl854azwpl1sdh2ls8gj1k432xsvi02m05y3"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
 SpatioTemporal = derive { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[MASS Matrix]; };
-SpecHelpers = derive { name="SpecHelpers"; version="0.1.6"; sha256="1h14a1rsk7x5qafn4hcpmannkdf2wdphkzaa3b6nbb9jqjs1szi0"; depends=[gsubfn]; };
+SpecHelpers = derive { name="SpecHelpers"; version="0.1.19"; sha256="1y6mcxz5d0d48awzkp73v8h43bkn8yjhr7whrs5lxv8ykygzfic5"; depends=[gsubfn]; };
 SpeciesMix = derive { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; };
 SpecsVerification = derive { name="SpecsVerification"; version="0.3-0"; sha256="19vr4xlx9gx0ph6k2kf59bpbhmzncm1mmzz7ld3pjc7k4jfba3np"; depends=[]; };
 SpherWave = derive { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0axzpkfq9sxadrm5cfax0gxh0ncqadaq7w7lml4"; depends=[fields]; };
@@ -2107,14 +2144,14 @@ StMoMo = derive { name="StMoMo"; version="0.2.0"; sha256="1pddlwf3kns9fzmqddfak6
 StMoSim = derive { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; };
 StableEstim = derive { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; };
 Stack = derive { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; };
-StanHeaders = derive { name="StanHeaders"; version="2.6.0-10"; sha256="0bw11myc16ddi1qhh8dcsf8dqg6dcp1wjbyrp5p98dcc1rym7kmg"; depends=[]; };
+StanHeaders = derive { name="StanHeaders"; version="2.7.0"; sha256="016sha21aff2bmry0n77abhkgr5rqm8sb49y8qasg6xqmdz6cix0"; depends=[]; };
 StandardizeText = derive { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
 Stat2Data = derive { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; };
 StatDA = derive { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; };
 StatDataML = derive { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; };
 StatMatch = derive { name="StatMatch"; version="1.2.3"; sha256="10y9xaclxrw65v3k9qwdm7lvvf1kxpssc9nx0f15m8xkw5hhm7pa"; depends=[clue lpSolve proxy RANN survey]; };
 StatMeasures = derive { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; };
-StatMethRank = derive { name="StatMethRank"; version="1.0"; sha256="0mcvwn1f3hylvyg46vigc5wnvhhig5v01ag3y9rap32v85f308zh"; depends=[MASS pmr rjags]; };
+StatMethRank = derive { name="StatMethRank"; version="1.2"; sha256="1mk9yl1flr7garf0278mlj2309s620iiingd2cxkmdrzpfa9g4k2"; depends=[MASS pmr Rcpp rjags]; };
 StatRank = derive { name="StatRank"; version="0.0.4"; sha256="0s0jc4hvrry9a884fqfk3gp1w4ww5wif2kh3m0f22nn7qb49if9p"; depends=[plyr truncdist]; };
 Statomica = derive { name="Statomica"; version="1.0"; sha256="0x60n1d7wxfd013k6jjzvfi2mqgr52fd8ylk3yhm3907002jnh1g"; depends=[Biobase distr fBasics multtest]; };
 Stem = derive { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; };
@@ -2136,17 +2173,19 @@ SurvCorr = derive { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqn
 SurvLong = derive { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; };
 Survgini = derive { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; };
 SvyNom = derive { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; };
+SwarmSVM = derive { name="SwarmSVM"; version="0.1"; sha256="10gsasllycnmgaf5xq44ph5x7ajh38cnfd97x4hyc6bk4wz7p42r"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; };
 SweaveListingUtils = derive { name="SweaveListingUtils"; version="0.6.2"; sha256="0n15gkiil9rlb0dhnkfimhcs09av35b7qx79iba7bx3y7spvzaqy"; depends=[startupmsg]; };
 SwissAir = derive { name="SwissAir"; version="1.1.4"; sha256="1avc32q7nbwjkcbml7z05car6khv1ghcz3miw0krm8i53w032c6f"; depends=[]; };
 SyNet = derive { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; };
 SynchWave = derive { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
 SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RCurl RJSONIO]; };
 Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
-TAM = derive { name="TAM"; version="1.9-0"; sha256="0ysl77dk2fxzm5x7910sgpc9ajlijrlmja6sq8xac52qbmj9ggd9"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
+TAM = derive { name="TAM"; version="1.10-0"; sha256="1x53gjaqwm3hfilxkkn50zkdydlrh19bxcawy3hii9nvmkh6crqq"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
 TANOVA = derive { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
 TAQMNGR = derive { name="TAQMNGR"; version="2015.2-1"; sha256="0j7qb15xy4g4ff0cmyjyz4lsalaxxf6zdwbq49j3y80ld0pvwhbk"; depends=[Rcpp]; };
 TBEST = derive { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; };
 TBSSurvival = derive { name="TBSSurvival"; version="1.2"; sha256="12ipgffympqjjg8l9gbich5pgz0pqr5g07b0il26rr721xiyxk5v"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; };
+TCGA2STAT = derive { name="TCGA2STAT"; version="1.0"; sha256="1jvc29k8s9zqf6fk2gd20vz8zyck07mipfzq0pl69m6yf41mxlp2"; depends=[CNTools XML]; };
 TDA = derive { name="TDA"; version="1.3"; sha256="1f9f5v8c0ynxz8p4kr9w08c4icf0840h7iay8k1ydh5zmr43d7lk"; depends=[FNN igraph scales]; };
 TDAmapper = derive { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; };
 TDCor = derive { name="TDCor"; version="0.1-1"; sha256="001rmwi2v4vy1b2d7wwvvca4xnkizz8dmys3q3xbjv7wrfxyvai8"; depends=[deSolve]; };
@@ -2188,14 +2227,14 @@ TSclust = derive { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l
 TScompare = derive { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[DBI tfplot tframe TSdbi]; };
 TSdata = derive { name="TSdata"; version="2015.4-2"; sha256="1c0ly1gs6p3fspwvk1f6c2xgzvc7p7pkzakm44lisbyjklacnilp"; depends=[]; };
 TSdbi = derive { name="TSdbi"; version="2015.1-1"; sha256="1bqxpd4g0ppm1261srgwjzghfwwl53vybkihz99azckky0539m1s"; depends=[DBI tframe]; };
-TSdist = derive { name="TSdist"; version="2.2"; sha256="1zqqy2pxjzxlj1d32d086qrkf9rlgj9vn9smzbcfix8wlgvxfi1l"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; };
+TSdist = derive { name="TSdist"; version="3.1"; sha256="0kwj1l45qv2iwf14rad71381ajnq2ikz7kkgal25y3d528q4nd6y"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; };
 TSfame = derive { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; };
 TSmisc = derive { name="TSmisc"; version="2015.1-3"; sha256="1hv1q9p7vp7pxx9s4s9w3vkif1w1xr4y656x3zaf48ijxf6c6a90"; depends=[DBI gdata its quantmod tframe tframePlus TSdbi tseries xts zoo]; };
 TSodbc = derive { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[DBI RODBC tframe tframePlus TSdbi TSsql]; };
 TSsdmx = derive { name="TSsdmx"; version="2015.2-2"; sha256="1xwriyg0raqd6812r6vf34dljs0cjhxls9gpal4w0bjmvmc67khb"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; };
 TSsql = derive { name="TSsql"; version="2015.1-2"; sha256="1hpi2cssnkzqgnaj91wrvb94fs8zpfg8hi4m1zwswzyl3az0l9sc"; depends=[DBI tframe tframePlus TSdbi zoo]; };
 TTAinterfaceTrendAnalysis = derive { name="TTAinterfaceTrendAnalysis"; version="1.5.1"; sha256="1i9p5s7xj3py8465yjjaqs2m7krjxzzqd86lkpbgzxnxjdnxcx5i"; depends=[e1071 fBasics Hmisc lubridate multcomp nlme pastecs relimp reshape tcltk2 timeSeries wq]; };
-TTR = derive { name="TTR"; version="0.22-0"; sha256="0aackwmmakjcynpq4nxi8xw1x3688rkg6kypgd5jiprzzdhsz5rq"; depends=[xts]; };
+TTR = derive { name="TTR"; version="0.23-0"; sha256="1p648hdjdnda6c2vcrp6rf9x2gx8nks3ni8pjlkm2cm7fnbfrcj1"; depends=[xts zoo]; };
 TTmoment = derive { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; };
 TUWmodel = derive { name="TUWmodel"; version="0.1-4"; sha256="1xxbrcs3dddzcya15pj4k86z05vnv06fnwblfvygx0zkw0m292av"; depends=[]; };
 Table1Heatmap = derive { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; };
@@ -2215,7 +2254,7 @@ Thermimage = derive { name="Thermimage"; version="1.0.1"; sha256="16wpmwqfqjghhp
 Thinknum = derive { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; };
 ThreeArmedTrials = derive { name="ThreeArmedTrials"; version="0.1-0"; sha256="1pafm8k90yv0hrk5a9adfv37087l2in0psslhkxha6mkmdh6a5f6"; depends=[MASS]; };
 ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; };
-ThresholdROC = derive { name="ThresholdROC"; version="2.0"; sha256="1qnxzp8rkxm39zgs8yv2yqkzda9hkd67910ikig423zs70gb6nj7"; depends=[MASS numDeriv pROC]; };
+ThresholdROC = derive { name="ThresholdROC"; version="2.1"; sha256="06v8dqy23hk6xvqnk8csac041jbwf5p8wiam53wk1jriq7a2s8c2"; depends=[MASS numDeriv pROC]; };
 TickExec = derive { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; };
 TiddlyWikiR = derive { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; };
 Tides = derive { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mfkn8hqdz6p155xm1kfqwvyb28qq"; depends=[]; };
@@ -2223,12 +2262,14 @@ TilePlot = derive { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9
 TimeMachine = derive { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; };
 TimeProjection = derive { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; };
 TimeWarp = derive { name="TimeWarp"; version="1.0.12"; sha256="1qadaf8n8ym5nv1z328hd5wiw78f014imgd2ryvi70sh4dmzb16l"; depends=[]; };
-Tinflex = derive { name="Tinflex"; version="1.0"; sha256="0zvh2nfx4kqf90mmrpdm2fzlzn7s7gs09i8zin604hqxjir6p3ny"; depends=[]; };
+Tinflex = derive { name="Tinflex"; version="1.1"; sha256="1wnb893x4gj1h3fpyblks07dln5ilpllpmmwp7wpqbvj7hzrj661"; depends=[]; };
+TipDatingBeast = derive { name="TipDatingBeast"; version="0.1-6"; sha256="0yfm99j2b3k9har87qb675jxgfp5vq3aizqvxc1njnfyh5yjg89k"; depends=[mclust]; };
 TopKLists = derive { name="TopKLists"; version="1.0.3"; sha256="0687nxsddmlgyz3kwcfmcv0vj2pw91154rd1p19ivhmbvhvnhwvh"; depends=[gplots Hmisc]; };
-TraMineR = derive { name="TraMineR"; version="1.8-9"; sha256="0qawgjifz6w7gb06j9q5kbvhf8pn17922mvmgwzva5mykvqfmdic"; depends=[boot RColorBrewer]; };
-TraMineRextras = derive { name="TraMineRextras"; version="0.2.3"; sha256="0b6xh1xhmigjfj9cbk4gdpi1d131cq9ikwgdblcwwrmnrhcjgld6"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
+TraMineR = derive { name="TraMineR"; version="1.8-10"; sha256="05x23argga7xh7ggv08b659j9ljnygbfwfh3pqiadhw9dipgyqqp"; depends=[boot RColorBrewer]; };
+TraMineRextras = derive { name="TraMineRextras"; version="0.2.4"; sha256="144s25ivq27f81dgh9x9h1fph1hdk86w9yac1hy6358kc8jnmi3q"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
 TrackReconstruction = derive { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
 Traitspace = derive { name="Traitspace"; version="1.0"; sha256="1pxyc5brlhsi0bhgr6nmd80kvrb032iwsshdqamicm48jyxn06xb"; depends=[mclust permute]; };
+TransModel = derive { name="TransModel"; version="1.0"; sha256="1cxvfmf304x8riwcnx6gp5fb5gkqa552zby2n6yxc0ic0m0w77kb"; depends=[survival]; };
 TreatmentSelection = derive { name="TreatmentSelection"; version="1.1.2"; sha256="1mvrb72yz51gmwqlfg5gsjbi65lqk5j24agddw1br53ymdvjgzq4"; depends=[ggplot2]; };
 TreePar = derive { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
 TreeSim = derive { name="TreeSim"; version="2.1"; sha256="01izfzlvrak65mzwpz4bn5cansw10fvfjfvj164f5g0qghg9v84n"; depends=[ape geiger laser]; };
@@ -2252,12 +2293,13 @@ UScensus2000tract = derive { name="UScensus2000tract"; version="0.03"; sha256="1
 UScensus2010 = derive { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[foreign maptools sp]; };
 UWHAM = derive { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; };
 Unicode = derive { name="Unicode"; version="0.1-5"; sha256="088f38qy3vympxj6n4vyvvqd4gldcfli9l8rmzgmm1rm3v195mvn"; depends=[]; };
+UpSetR = derive { name="UpSetR"; version="0.0.5"; sha256="0z4z3xrdgl3rkhni6x356pl0xsa7nvkrcrcl1pfybvh4f6c7dpx2"; depends=[ggplot2 gridExtra plyr]; };
 UsingR = derive { name="UsingR"; version="2.0-4"; sha256="0wj6cn9ijc0rkpxsy1fd104m254b997dhmvwzz0knjkh5nybm8zm"; depends=[HistData Hmisc MASS]; };
 V8 = derive { name="V8"; version="0.6"; sha256="1cr9nm5wvi3b2766fpdgihnfmn1ckrwrzyya6dchvg2lr3giba38"; depends=[curl jsonlite Rcpp]; };
 VAR_etp = derive { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
 VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm mclust sna]; };
 VBmix = derive { name="VBmix"; version="0.2.17"; sha256="0fhx2vk5ffq147kfgsqjbqwgv64m7z9mbz4gchj90440ih7kyxa5"; depends=[lattice mnormt pixmap]; };
-VCA = derive { name="VCA"; version="1.1.1"; sha256="14xm220ymg5p1m2h2xvjkbgaqfhi7dmf8fmi4zmfm5gksgf4v351"; depends=[Matrix numDeriv]; };
+VCA = derive { name="VCA"; version="1.2"; sha256="0hifg22nz9pg56nc0097jp33pa3j0vc3gm7rh5x95jn4kf68zdis"; depends=[Matrix numDeriv]; };
 VDA = derive { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; };
 VGAM = derive { name="VGAM"; version="0.9-8"; sha256="0wizv2r1k79ifg9m0z9m2l80bshvfmajanznk5a5370ih3fih33a"; depends=[]; };
 VGAMdata = derive { name="VGAMdata"; version="0.9-7"; sha256="0fkm90nbmj0gjzxmh54qbf90alcbaiz27rs0zc0i5jhh2cv716y6"; depends=[]; };
@@ -2283,8 +2325,8 @@ Vdgraph = derive { name="Vdgraph"; version="2.2-2"; sha256="1q8l711zbrrj4h1wmpv9
 VecStatGraphs2D = derive { name="VecStatGraphs2D"; version="1.7"; sha256="08f9ixpiq8s5h8h608wrs9l16xk3c1xcrvwgvm5wqm6xfkj9gpfd"; depends=[MASS]; };
 VecStatGraphs3D = derive { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[MASS misc3d rgl]; };
 VennDiagram = derive { name="VennDiagram"; version="1.6.9"; sha256="0sxgspqsn15y3pipd9wy4wh2n5rkb9bazqkfwkf88p483azpjxw9"; depends=[]; };
-VideoComparison = derive { name="VideoComparison"; version="0.11"; sha256="04jc9br4ddck2sh9bhy02jx34cqxvh904lr46sid6dnmaqfn80l7"; depends=[pracma Rcpp RCurl RJSONIO zoo]; };
-VineCopula = derive { name="VineCopula"; version="1.5"; sha256="1ifb7y0y1b5kha9nv395mlf3h3cczlqkvk782a2z0xy5vf0frfhi"; depends=[ADGofTest copula igraph lattice MASS mvtnorm]; };
+VideoComparison = derive { name="VideoComparison"; version="0.15"; sha256="0592fz0v4xvq1qy2hj4ph90v7zn1cnzr6a094mp9p1k61ki3fbg2"; depends=[pracma Rcpp RCurl RJSONIO zoo]; };
+VineCopula = derive { name="VineCopula"; version="1.6"; sha256="16hzjdllpk2dsc66x7yk8n8id0mwd63inlnqxggw9g2shvdyf96j"; depends=[ADGofTest copula igraph lattice MASS mvtnorm]; };
 VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; };
 Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
 VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
@@ -2295,11 +2337,11 @@ WCE = derive { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfi
 WCQ = derive { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
 WDI = derive { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; };
 WGCNA = derive { name="WGCNA"; version="1.47"; sha256="1q4lags9ihadbwyisbyc21bpb7p8dd82sxwmbjq83z7s3vrlh8bd"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach Hmisc impute matrixStats preprocessCore reshape survival]; };
-WMCapacity = derive { name="WMCapacity"; version="0.9.6.6"; sha256="19x6l06srh59q1cnixisa5fgm5hkpq35h9zfmdnfaj3xl8pxhzyn"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; };
+WMCapacity = derive { name="WMCapacity"; version="0.9.6.7"; sha256="167wx759xi7rv74n6sdsdkjnfpxdsiybk4ik70psdgfwdqqcga1y"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; };
 WMDB = derive { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
-WRS2 = derive { name="WRS2"; version="0.3-1"; sha256="11i9zv7p7808v3hvnhjn58yl7mwh26zhis6hh9n73dw3hn22xdng"; depends=[MASS plyr reshape]; };
+WRS2 = derive { name="WRS2"; version="0.3-2"; sha256="0451cj7zqndhmyfc1p9r782a6nc31rza3h3rjfdx9fhc0mh66ggv"; depends=[MASS plyr reshape]; };
 WWGbook = derive { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
-WaterML = derive { name="WaterML"; version="1.2.3"; sha256="0w9040acrvs2kqh4slkg4pcswzvsbbcpzr2cdvxzhjv6a0im7hyz"; depends=[httr RJSONIO XML]; };
+WaterML = derive { name="WaterML"; version="1.3.2"; sha256="14dsmndfmp8v09ahyv0k4h6zss0b7533n0xy62vd0284dywlaimy"; depends=[httr plyr RJSONIO XML]; };
 Wats = derive { name="Wats"; version="0.2-16"; sha256="1wbyyllmjsmh8wb8npzizlfn3hsvfpqp9p3b5wx3zpsavqw839wy"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; };
 WaveletComp = derive { name="WaveletComp"; version="1.0"; sha256="16ghxqjbv39pmgd52im6ilkkh0hpnaw8ns0hwkngpbr479m1grdp"; depends=[]; };
 WeightedCluster = derive { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[cluster RColorBrewer TraMineR]; };
@@ -2307,7 +2349,7 @@ WeightedPortTest = derive { name="WeightedPortTest"; version="1.0"; sha256="007v
 WhatIf = derive { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; };
 WhiteStripe = derive { name="WhiteStripe"; version="1.1.1"; sha256="1naavgkvgky3lzg5vlz11g589cxr0fgiqz2waz86da1ksk4a19gw"; depends=[mgcv oro_nifti]; };
 WhopGenome = derive { name="WhopGenome"; version="0.9.2"; sha256="0nhl3qanwvyxvkrdc0wngzdx6id0yfzbf9wp170mcsyd4qh7pxzs"; depends=[]; };
-WiSEBoot = derive { name="WiSEBoot"; version="1.0.0"; sha256="1hfazm9zb2b6gzm38xlq672y1x1bqzj0mwvzinz6y65m9kb4l93g"; depends=[wavethresh]; };
+WiSEBoot = derive { name="WiSEBoot"; version="1.1.0"; sha256="034f668cjbwz4qwavzflf0jifqhm50v1w7gsxbqq3dy6gbnyl4hl"; depends=[wavethresh]; };
 WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp]; };
 WikidataR = derive { name="WikidataR"; version="1.0.0"; sha256="061745pz4j9gldbwy6pa5pbxmin84csqpv7r5r8lanvc0m7kgcgx"; depends=[httr jsonlite WikipediR]; };
 WikipediR = derive { name="WikipediR"; version="1.2.0"; sha256="1l9q9yg4z4j0lch9r8xr9q0f8mr0lpzf50ygmkkcvfd5sp7hirmi"; depends=[httr jsonlite]; };
@@ -2316,6 +2358,7 @@ WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrb
 WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
 WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; };
 WriteXLS = derive { name="WriteXLS"; version="3.6.1"; sha256="19rifwxfnmb65lf3a8nshyjnq3bn0lpkqfcwslfgjp6y8l7jx7gv"; depends=[]; };
+WufooR = derive { name="WufooR"; version="0.5.5"; sha256="0s5r7sawpx0lh38kf5m49bfazmmbd09f8cq5mp94h3als2hzmn3k"; depends=[dplyr httr jsonlite]; };
 XBRL = derive { name="XBRL"; version="0.99.16"; sha256="1wrcm8srn185qrba7rig3fvwjz1n2ab296i0jr71vhyp9417h40q"; depends=[Rcpp]; };
 XHWE = derive { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; };
 XLConnect = derive { name="XLConnect"; version="0.2-11"; sha256="02wxnr6h06h125dqszs8mzq4av842g445ndr59xgscxr03fyvi8p"; depends=[rJava XLConnectJars]; };
@@ -2342,25 +2385,26 @@ aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0
 aLFQ = derive { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
 aRpsDCA = derive { name="aRpsDCA"; version="1.0.1"; sha256="1hxf3lpdcx8h9gndclppsxr8rs048mi3nysjj1z3fgbpmkqnlxgs"; depends=[]; };
 aRxiv = derive { name="aRxiv"; version="0.5.10"; sha256="1q8nblb0kfdidcj1nwxn0fap87wpkg49z0bgmwayskwv1p860wrh"; depends=[httr XML]; };
-aSPU = derive { name="aSPU"; version="1.35"; sha256="0wlp47wc75mmgh3986npqa72d4jia1jgalfvz7sq62wjsh1wkrbv"; depends=[]; };
+aSPU = derive { name="aSPU"; version="1.36"; sha256="13mvkwqdhhs6wc64dwlw1114nfb9m3iggqbdilhc4w1vljdjxaa5"; depends=[]; };
 aTSA = derive { name="aTSA"; version="3.1.2"; sha256="1p3spas0sxj08hkb8p6k2fy64w86prlw1hbnrqnrklr0hnkg2g54"; depends=[]; };
 abbyyR = derive { name="abbyyR"; version="0.1"; sha256="03krflrjhq7yx06wacfyxzqvq0v2b17xvcyl8sfnaylrilracwjq"; depends=[httr XML]; };
 abc = derive { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; };
 abc_data = derive { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; };
 abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; };
-abctools = derive { name="abctools"; version="1.0.2"; sha256="1wdm42g2maab700fq2shpr1kajpj9m4c4z6k49gghrdzpk1kqxsa"; depends=[abc abind plyr]; };
+abctools = derive { name="abctools"; version="1.0.3"; sha256="0985sgyz8dqqq59klhriwx5rara838i9ca3s40xhgw46n49q0nd7"; depends=[abc abind plyr]; };
 abd = derive { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; };
 abf2 = derive { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; };
 abind = derive { name="abind"; version="1.4-3"; sha256="1km61qygl4g3f91ar15r55b13gl8dra387vhmq0igf0sij3mbhmn"; depends=[]; };
 abn = derive { name="abn"; version="0.85"; sha256="1ml4l4fiqscc1ikv0wsi73rymb9599mpnhmzlfnvv4zp3fkfm6qm"; depends=[Cairo]; };
 abundant = derive { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; };
-acc = derive { name="acc"; version="1.1.1"; sha256="0q4xq5mmcwb9b86k22c1x7zl4zxqacl62w7mcqrdb03v9xmjn4h4"; depends=[mhsmm PhysicalActivity timeDate zoo]; };
+acc = derive { name="acc"; version="1.1.7"; sha256="0b3p46y0d8z43x70yw8haidyk23m9jwsb2sml291p8dl79g8yl8h"; depends=[mhsmm PhysicalActivity zoo]; };
 accelerometry = derive { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp]; };
 accrual = derive { name="accrual"; version="1.1"; sha256="12zlv34pgmhcvisqk3x09hjpmfj91pn56pkjyj483mcf634m9ha4"; depends=[fgui SMPracticals]; };
-accrued = derive { name="accrued"; version="1.3"; sha256="091abkq7jwlw1gj0691qsv7ikgmn471hnkaadb8v0kxhs44mfq52"; depends=[]; };
+accrued = derive { name="accrued"; version="1.3.5"; sha256="10j8vrjgb43bggkf2gn518ccfard2f071mj6nwsxrzkm00pbx32v"; depends=[]; };
 acepack = derive { name="acepack"; version="1.3-3.3"; sha256="13ry3vyys12iplb14jfhmkrl9g5fxg3iijiggq4s4zb5m5436b1y"; depends=[]; };
 acid = derive { name="acid"; version="1.0"; sha256="0m59xnz6435n7j3fggv274g5rap7cpr0zby3aqbaycfdfrp78d1h"; depends=[gamlss gamlss_dist Hmisc]; };
 acm4r = derive { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
+acmeR = derive { name="acmeR"; version="1.0.0"; sha256="1wcfllpcv3x1kc50j212bc64ilsnmfa5ij6aybjgr52vhmf3gcmh"; depends=[foreign]; };
 acnr = derive { name="acnr"; version="0.2.4"; sha256="1nry927zqhb34h9lcixr344n3sxvq1142zwgj8hadlw69dv8m59y"; depends=[R_utils xtable]; };
 acopula = derive { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; };
 acp = derive { name="acp"; version="2.0"; sha256="11ij2xhnkhy7lnzj8fld7habidb9av8a2bk22ycf62f556pqf533"; depends=[quantmod tseries]; };
@@ -2368,10 +2412,10 @@ acs = derive { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqj
 acss = derive { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; };
 acss_data = derive { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
 activity = derive { name="activity"; version="1.0"; sha256="1y1vy3kj9n21jvbyl3s5hllfkqp3z1rnn7701c5jxhay5dbdz3p2"; depends=[circular overlap pbapply]; };
-actuar = derive { name="actuar"; version="1.1-9"; sha256="00b0gpbvm0aivcjvk91rk3c28fzd3ir8h42b1kpnrgdjrc198im4"; depends=[]; };
+actuar = derive { name="actuar"; version="1.1-10"; sha256="1bm61inq8vxics33mj9ix36ibc9qp92q1m3ckha42kw8x521m6l4"; depends=[]; };
 ada = derive { name="ada"; version="2.0-3"; sha256="1c0nj9k628bcl4r8j0rmyp5f1igdjq6qhjxyif6575fvn2gdzmbw"; depends=[rpart]; };
 adabag = derive { name="adabag"; version="4.0"; sha256="0n4zls13f46rxqrx9qkvrifshb3cl8l6ni7zw36pm6fixbz844fk"; depends=[caret mlbench rpart]; };
-adagio = derive { name="adagio"; version="0.5.9"; sha256="1yp9w557advb7dzrdqwkffpdmhn6mk4879lrrjd0d6kv89fwz5yr"; depends=[]; };
+adagio = derive { name="adagio"; version="0.6.1"; sha256="0slch2i3a102621b4fs356gd0apip0h2my9jmkcmwxy9x974755w"; depends=[]; };
 adaptDA = derive { name="adaptDA"; version="1.0"; sha256="0nk7n628d30jz03a2rmpgzrwwd79rlpqvr6lwhilmkg1gblvz7r1"; depends=[MASS]; };
 adaptMCMC = derive { name="adaptMCMC"; version="1.1"; sha256="1y1qxn3qm59nyy9ld5x30p452yam7b2fyl236b14xvpm8g3xx1fa"; depends=[coda Matrix]; };
 adaptTest = derive { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; };
@@ -2383,11 +2427,11 @@ ade4 = derive { name="ade4"; version="1.7-2"; sha256="01pchn70jpz8v9l86ng34a2vgn
 ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; };
 adegenet = derive { name="adegenet"; version="2.0.0"; sha256="10y4l06k2g42s4vf394dx7pdsqsl0ff2w58mzap1khj90pxyrxdz"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep]; };
 adegraphics = derive { name="adegraphics"; version="1.0-3"; sha256="0i1qln99vdfnxjsbfq80c1c7allsw8ras7hlx7vr0dkdzcp1wy6z"; depends=[ade4 KernSmooth lattice RColorBrewer sp]; };
-adehabitat = derive { name="adehabitat"; version="1.8.17"; sha256="0cy98fd6mcbjc152vv41mnh5xj19xdfag8n950fvffbrpvpgbcpb"; depends=[ade4 shapefiles sp tkrplot]; };
-adehabitatHR = derive { name="adehabitatHR"; version="0.4.13"; sha256="140ar1naf67v996d5p0i2v07g02pf9c4c6h1pjicai5n59s7z72v"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; };
-adehabitatHS = derive { name="adehabitatHS"; version="0.3.11"; sha256="0sbhc1mvdc8pxq56plbgk0ry65chxcv3zjry4151hiv7yxpn39ri"; depends=[ade4 adehabitatHR adehabitatMA sp]; };
-adehabitatLT = derive { name="adehabitatLT"; version="0.3.19"; sha256="0h9n6j3a52bik5pslysvhb11d8df5k50ghi34zlxhdcbm09gfnmz"; depends=[ade4 adehabitatMA CircStats sp]; };
-adehabitatMA = derive { name="adehabitatMA"; version="0.3.9"; sha256="15n9mg8m4mjg5zn5c5hz9bl5qcghzkijiflk8psc0kg2csfpv7hy"; depends=[sp]; };
+adehabitat = derive { name="adehabitat"; version="1.8.18"; sha256="1ng55j95hzhh853qa55mfx4xdh954ap8pqy01kyg5mgyn45i7rpa"; depends=[ade4 shapefiles sp tkrplot]; };
+adehabitatHR = derive { name="adehabitatHR"; version="0.4.14"; sha256="0ljmn4zbg2lb5b2ckddbxd7ibbib1pzv4iv0ld2k3bv1mvn2j565"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; };
+adehabitatHS = derive { name="adehabitatHS"; version="0.3.12"; sha256="06lrg1s3l7slbff17my62ap7mn6h3p6s8jnn7j8mrs48nvim00z9"; depends=[ade4 adehabitatHR adehabitatMA sp]; };
+adehabitatLT = derive { name="adehabitatLT"; version="0.3.20"; sha256="0sxi4dzd34p61d8dskj92nw7n4x9iflyf9fx48jxwb19lvy5902m"; depends=[ade4 adehabitatMA CircStats sp]; };
+adehabitatMA = derive { name="adehabitatMA"; version="0.3.10"; sha256="0b8nxk8339chhmjqjwsdlmy9nf729p0fgyh2hd1q93grgds9p1rs"; depends=[sp]; };
 adephylo = derive { name="adephylo"; version="1.1-6"; sha256="1sk639gmk3cs711xn68mx18r28kjd1pychcg89qlki03y1hnxg7j"; depends=[ade4 adegenet ape phylobase]; };
 adhoc = derive { name="adhoc"; version="1.0"; sha256="193adddarjkc2kk1xncfkm919s1lkmc1yzgyz9793p74nqmfsj0a"; depends=[ape polynom spider]; };
 adimpro = derive { name="adimpro"; version="0.7.8"; sha256="06zwdgl7g4azg2mn7p35may8hsjcvf2dz7dj86zqngjspda123s4"; depends=[]; };
@@ -2397,7 +2441,7 @@ adwave = derive { name="adwave"; version="1.1"; sha256="0kkwgcyxddzmrb8h1w1f4xy2
 aemo = derive { name="aemo"; version="0.1.0"; sha256="1iik0rrqkkx9n1qb1pvq5iwxqmvs6vnx8z80hdzb5vqq0lvi1bsx"; depends=[assertthat dplyr lubridate stringr]; };
 afex = derive { name="afex"; version="0.13-145"; sha256="0wyjgxh1rdibj21f8dbwg7f30q1z6jwwpj2dcjx2rh60axvp1dir"; depends=[car coin lme4 Matrix pbkrtest reshape2 stringr]; };
 aftgee = derive { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[BB geepack MASS survival]; };
-agRee = derive { name="agRee"; version="0.3-1"; sha256="1gqbhv44z1r9m54fmrg0frnzsgsp13v5ppmzpv28frz9d8x7sxx6"; depends=[lme4 miscF R2jags]; };
+agRee = derive { name="agRee"; version="0.4-0"; sha256="19nvn2hiijn81wgqhx7s6blr2ilzx6p2s2qx1lw9shmnsmyywmss"; depends=[coda lme4 miscF R2jags]; };
 agop = derive { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; };
 agricolae = derive { name="agricolae"; version="1.2-1"; sha256="1vrc1bjqcp3xk8q41bl3kvjvaj58gw19dv7vwsxn9r6r99hlb3j1"; depends=[cluster klaR MASS nlme spdep]; };
 agridat = derive { name="agridat"; version="1.12"; sha256="1b3dgrp6mkfpfaywqdm22sakadhnl1vlyj1n3rq6bc2f0gf8kcrw"; depends=[lattice reshape2]; };
@@ -2410,6 +2454,7 @@ akmeans = derive { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002r
 alabama = derive { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; };
 ald = derive { name="ald"; version="1.0"; sha256="1vphmqhx6wlzsz3s94jsa4mk6wpacp93wfgpj0vp9ljfb3aplhik"; depends=[]; };
 algstat = derive { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly Rcpp reshape2 stringr]; };
+alineR = derive { name="alineR"; version="1.1"; sha256="15qniiwvn55aab56p85sh84jqi5d77nyqxr86092vnamir5gdzkl"; depends=[]; };
 allan = derive { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; };
 allanvar = derive { name="allanvar"; version="1.1"; sha256="142wy1mf4jbp4hy756rz95w24f4j1dgf14f1n5sd09dg4w98j7xg"; depends=[gplots]; };
 alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c96vbl46553njhvvlq249jxn3y11lfq2gv"; depends=[gtools]; };
@@ -2425,7 +2470,7 @@ amap = derive { name="amap"; version="0.8-14"; sha256="1dz37z9v4zvyvqrs4xvpfv468
 amei = derive { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; };
 amen = derive { name="amen"; version="1.1"; sha256="084bl46sxn2sxslcpi9lm22k6x8cz1jld228l0iardy4vmh4cxdk"; depends=[]; };
 aml = derive { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
-anacor = derive { name="anacor"; version="1.0-5"; sha256="1m2r5x5spb5nahd9cvnsxwqi0ay2kasmha21rbwj3r99jz1vxkql"; depends=[car colorspace fda rgl scatterplot3d]; };
+anacor = derive { name="anacor"; version="1.0-6"; sha256="0nq3jhai586d3980y8raqmbhh8snd5bpx5z8mlwrxvkmr62hcrpl"; depends=[car colorspace fda rgl scatterplot3d]; };
 analogue = derive { name="analogue"; version="0.16-3"; sha256="0lv8ljf10jdrgrd59pcjdi1wvjfd0j6qb87xzfx5k8kcp9awx4h6"; depends=[brglm lattice MASS mgcv princurve vegan]; };
 analogueExtra = derive { name="analogueExtra"; version="0.1-0"; sha256="0hyl0vn2i594r5czzha7y9a1n4dpznfpmh2j46mci2r57p2s3qr2"; depends=[analogue rgl vegan3d]; };
 analyz = derive { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; };
@@ -2438,6 +2483,7 @@ anfis = derive { name="anfis"; version="0.99.1"; sha256="1v8di5dzwb1g1ldi7idcmmr
 anim_plots = derive { name="anim.plots"; version="0.1"; sha256="0qjwmxpkvjf27parh1fvhrkiczm4zlv9c034dp04yysbdz65r1by"; depends=[animation]; };
 animalTrack = derive { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; };
 animation = derive { name="animation"; version="2.3"; sha256="1hqgkaxmyyfrx7cfzv00010r9l2n8gxm35jd41p3kc208mhd7ssp"; depends=[]; };
+anoint = derive { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; };
 anominate = derive { name="anominate"; version="0.5"; sha256="0qhq3ngxi1d3yln6bafg3c36a7whnznnww0101da2y0i6dw79lg5"; depends=[coda MCMCpack oc pscl wnominate]; };
 antitrust = derive { name="antitrust"; version="0.94"; sha256="1k768lmx5vv069bd9fzly1205rxr9mkqi1p8jjx67kwmyhhw5sd2"; depends=[BB evd ggplot2 MASS numDeriv]; };
 aod = derive { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; };
@@ -2455,16 +2501,17 @@ aplpack = derive { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw
 apmsWAPP = derive { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
 appell = derive { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; };
 apple = derive { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; };
+appnn = derive { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; };
 approximator = derive { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; };
 aprean3 = derive { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; };
-aprof = derive { name="aprof"; version="0.2.4"; sha256="0gw5qj6c5ygjc6nwx2lb8biykkk73fv2x3j1xxabpgnsfq1whwyc"; depends=[]; };
-apsimr = derive { name="apsimr"; version="1.0"; sha256="1lk8n0vb20sxs02s6xx16d2xrh09p08b6i50b99bx9k7dhlgn6cf"; depends=[ggplot2 lubridate MASS mgcv reshape2 XML]; };
+aprof = derive { name="aprof"; version="0.2.5"; sha256="1rbdj3dvg5sp19vp2jgwha4ln8wq45jwlllv4ls6i2rkr9vqvv56"; depends=[]; };
+apsimr = derive { name="apsimr"; version="1.1"; sha256="125v9y1d6c0ml3vrh5vr05b4119qf77spcf6231piwg6wx9vq9vb"; depends=[ggplot2 lubridate MASS mgcv reshape2 XML]; };
 apsrtable = derive { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; };
 apt = derive { name="apt"; version="2.3"; sha256="0yrgxdqzwa5zv6rv8d8nnlraxngq60i1f0yrkygwsj4kngv2yhyv"; depends=[car copula erer gWidgets urca]; };
 aqfig = derive { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
 aqp = derive { name="aqp"; version="1.8-6"; sha256="03gwvb5sm9l4vyl0jh9rzjs3ka2qmw4qqh40ywahq3dchpbxmlzd"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
 aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; };
-archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; };
+archdata = derive { name="archdata"; version="1.0"; sha256="1hs2pgdaixifqjnwcbrjxlrzng0r2vmv6pdzghsyvzlg28rnq2rk"; depends=[]; };
 archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
 archiDART = derive { name="archiDART"; version="1.1"; sha256="1md8y3nq575y9v4gj963y92as54h6bzaysnmjirk634rravps9ja"; depends=[XML]; };
 archivist = derive { name="archivist"; version="1.5"; sha256="0mcb35bllg82w0373prcai8h58gd6aj1pil90ni81zp7p1pdmcw3"; depends=[DBI digest httr lubridate RCurl RSQLite shiny]; };
@@ -2472,8 +2519,8 @@ arf3DS4 = derive { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nf
 arfima = derive { name="arfima"; version="1.2-7"; sha256="00mc50hssnv7qj6dn1l3jgx8ca4vjkqirc38rv538xwjgw9mm1ms"; depends=[ltsa]; };
 argosfilter = derive { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
 argparse = derive { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbnmckcx6wzky43dyq71085b0anzsavgx0786"; depends=[findpython getopt proto rjson]; };
-argparser = derive { name="argparser"; version="0.1"; sha256="0x4wm8hjzb779pp39v8q210npg7kzh9m8wwqmd17aaqaa3l2al9f"; depends=[]; };
-arm = derive { name="arm"; version="1.8-5"; sha256="0mjsjqrim2a6ds8gxrbdyp96b6sz1vjsqic80a5izrc2z9bml5p5"; depends=[abind coda lme4 MASS Matrix nlme]; };
+argparser = derive { name="argparser"; version="0.3"; sha256="1lwlkrh8hq4p02jmb76nss9qjrgyf5fqqzifv9z8ff1lk7szgmy4"; depends=[]; };
+arm = derive { name="arm"; version="1.8-6"; sha256="1bdjzq1da9nwfll4ial74ln920f2i19n4mwc5f4a5lwqrk4c69c7"; depends=[abind coda lme4 MASS Matrix nlme]; };
 arnie = derive { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; };
 aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.13.2"; sha256="0km1mhy8p6pksa0wnwx0cxbfgipi6c7xn7913agsqdpfbfphhm8j"; depends=[aroma_apd aroma_core MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; };
 aroma_apd = derive { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_huge R_methodsS3 R_oo R_utils]; };
@@ -2482,7 +2529,7 @@ aroma_core = derive { name="aroma.core"; version="2.13.1"; sha256="1085qh092sij4
 arqas = derive { name="arqas"; version="1.1"; sha256="1vdx9nfqkdrn6s4h90spb0g5vk7qxm5rg3mr2jkk4n67x7s5cv3x"; depends=[distr doParallel fitdistrplus foreach ggplot2 gridExtra iterators reshape]; };
 arrayhelpers = derive { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; };
 ars = derive { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; };
-arules = derive { name="arules"; version="1.1-7"; sha256="19wb85swasa3n2wg1bl6aww56294f2icqcmj0x2kjncin964blg2"; depends=[Matrix]; };
+arules = derive { name="arules"; version="1.1-9"; sha256="1cn5gvjx4g66pn1c79xa0z6gvjxjc36bdzy3micqxl0md6z50gf7"; depends=[Matrix]; };
 arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; };
 arulesSequences = derive { name="arulesSequences"; version="0.2-6"; sha256="1fvph6c8dy3hj0h63h85bzzzka8dx0cc0lcncz9svyahy1j4q3z0"; depends=[arules]; };
 arulesViz = derive { name="arulesViz"; version="1.0-2"; sha256="1lss9xlbdxpcqphczk0i0kib1px30jf2hcygrkhxk8aajnni9ar6"; depends=[arules igraph scatterplot3d seriation vcd]; };
@@ -2491,14 +2538,16 @@ asbio = derive { name="asbio"; version="1.1-5"; sha256="1br9rhj6nghwx54i2hpjrsdh
 ascii = derive { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; };
 asd = derive { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnls0s7y7r0g211b5zagq20z3"; depends=[mvtnorm]; };
 ash = derive { name="ash"; version="1.0-14"; sha256="15x16ld25i160asqf4z4difa6zn2yfgl04j8y8nqb0djymdx7a1f"; depends=[]; };
+asht = derive { name="asht"; version="0.5"; sha256="04wlvn4j8c8c3sxsa9ydb1garb7px768xvrnr6ywhb722srwi5gy"; depends=[bpcp coin exact2x2 exactci ssanv]; };
 aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; };
-aspect = derive { name="aspect"; version="1.0-3"; sha256="12wyyr0ms8g3y96jz1x0y52dlma00j20h7hmm8m6y5p1lgk9kmcd"; depends=[]; };
+aspect = derive { name="aspect"; version="1.0-4"; sha256="1kxddm8v1y0v2r7lg24r1wpzk7lqzxlrpzq5xb9kn343g53lny6i"; depends=[]; };
 asremlPlus = derive { name="asremlPlus"; version="2.0-0"; sha256="1iag76aldb84zwfvy9m3p66ypmc8bz1b3c9yzkf9clk8rlzn53zv"; depends=[dae ggplot2]; };
-assertive = derive { name="assertive"; version="0.2-6"; sha256="1iracxm6af1lbd39zrnjziz31lvwgxi8rry82x8sjlab5l0w6lh9"; depends=[knitr]; };
+assertive = derive { name="assertive"; version="0.3-0"; sha256="1v9l5ni060a3bfwnp9ydpymsjnm633xday9ybgjdcf4sj0qs1crc"; depends=[assertive_base knitr]; };
+assertive_base = derive { name="assertive.base"; version="0.0-1"; sha256="0n6jyhahz4s5l5zy8azbqnqvp3ivl267rapjmbc1rw0jv5mb0pva"; depends=[]; };
 assertr = derive { name="assertr"; version="1.0.0"; sha256="0z7cgksjc0a7niar9f26f0512ln0a7cifyqcfrbhar552dnkg33i"; depends=[dplyr lazyeval MASS]; };
 assertthat = derive { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; };
 assist = derive { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[lattice nlme]; };
-aster = derive { name="aster"; version="0.8-30"; sha256="0vdlimkkmd9ar5v3xrbi9gshvj980l7641brd7cqs78sqf0v71fn"; depends=[trust]; };
+aster = derive { name="aster"; version="0.8-31"; sha256="1rn9hp7dg81rd14ckmfz23aav3ywm7i3w46jx66kqbrfs7kdrslq"; depends=[trust]; };
 aster2 = derive { name="aster2"; version="0.2-1"; sha256="1gr9hx0mhyan0jy7wsl4ccsx9ahlvhfiq0j1xnffa4m3hzazisn5"; depends=[]; };
 astro = derive { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; };
 astroFns = derive { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; };
@@ -2535,7 +2584,7 @@ bandit = derive { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33
 barcode = derive { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
 bartMachine = derive { name="bartMachine"; version="1.2.0"; sha256="0hcz39397v2y8qgdy67i97j0z5g2qidkkf5p9ydcqp9fp5msshq7"; depends=[car missForest randomForest rJava]; };
 base64 = derive { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; };
-base64enc = derive { name="base64enc"; version="0.1-2"; sha256="0d2b7vl08abssfwprfiqc0yscb1gz4xlzlwwbf7y9z19wbyxizh5"; depends=[]; };
+base64enc = derive { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; };
 baseline = derive { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; };
 basicspace = derive { name="basicspace"; version="0.15"; sha256="11aqrai26kdwszznlhrk52jr19syl549qdq3nspbxcn2mj65f5pw"; depends=[]; };
 batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
@@ -2547,10 +2596,10 @@ bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf
 bayesGDS = derive { name="bayesGDS"; version="0.6.1"; sha256="0134x5knwp9pmkjyzgi1k7hjj92sym1p0zq98sizlbs0mff2p2s4"; depends=[Matrix]; };
 bayesLife = derive { name="bayesLife"; version="2.2-0"; sha256="09r915azz60ca5b4w0kkd8x8mb0cxz36lapakdmgrgxd4qax17nv"; depends=[bayesTFR car coda hett wpp2012]; };
 bayesMCClust = derive { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[bayesm boa e1071 gplots gtools MASS mnormt xtable]; };
-bayesPop = derive { name="bayesPop"; version="5.3-4"; sha256="1zq0vjkz4b33niwldli6sh8pgz5wsyzk59iyx5bcdpkbkprv57np"; depends=[abind bayesLife bayesTFR plyr wpp2012]; };
+bayesPop = derive { name="bayesPop"; version="5.4-0"; sha256="0v3k9dp1f8g41zng9w94phpd094y9g7qsnkyx9xw1jslz2f1s048"; depends=[abind bayesLife bayesTFR fields googleVis plyr rworldmap wpp2012]; };
 bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; };
-bayesSurv = derive { name="bayesSurv"; version="2.4"; sha256="014jxlx4w6lzzq9axdk8mwwlppmly0yj9i14zhmngdbr7mxh3f87"; depends=[coda smoothSurv survival]; };
-bayesTFR = derive { name="bayesTFR"; version="4.1-2"; sha256="17qv25yrprj099vx1jj46ycgxnc4ldx6qcqx42h5gz38qqzz2q4s"; depends=[coda MASS mvtnorm wpp2012]; };
+bayesSurv = derive { name="bayesSurv"; version="2.6"; sha256="0lam6w0niy30wgzbc3zrwbfz291whig20prjzdpcpv91syrnw687"; depends=[coda smoothSurv survival]; };
+bayesTFR = derive { name="bayesTFR"; version="4.2-0"; sha256="0c94498ncjzzv8xmi08kw87bqjarg1gg7ls5q4qcz6bhbhsmg2dr"; depends=[coda MASS mvtnorm wpp2012]; };
 bayescount = derive { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; };
 bayesm = derive { name="bayesm"; version="3.0-2"; sha256="014l14k8fraxjqfch2s6ydgp1mcljvj4cgrznjyz2l35fwj3rcf3"; depends=[Rcpp RcppArmadillo]; };
 bayesmix = derive { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; };
@@ -2563,7 +2612,7 @@ bbmle = derive { name="bbmle"; version="1.0.17"; sha256="1j3x2glnn0i0fc0mmafwkkq
 bbo = derive { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; };
 bc3net = derive { name="bc3net"; version="1.0.2"; sha256="0iakqf4apscxb4mb5klj9qklbi25dmdd77la3ads2y882gm2nj0z"; depends=[c3net igraph infotheo lattice Matrix]; };
 bclust = derive { name="bclust"; version="1.4"; sha256="1s04fqff5bw6d5kk0smvach6yq492dv1w0ahh9mrm2jsi2q58h7p"; depends=[]; };
-bcp = derive { name="bcp"; version="3.0.1"; sha256="08sa1az1ljsi00zmj3l7z8p1j5im1w79yjxy8k1p6ba90bck7l4h"; depends=[foreach iterators Rcpp]; };
+bcp = derive { name="bcp"; version="4.0.0"; sha256="1bkd7812jacyk955l71b2szpc9550p0hpv3x337qgl09zck4vdgm"; depends=[Rcpp RcppArmadillo]; };
 bcpa = derive { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; };
 bcpmeta = derive { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
 bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[ggplot2 mvtnorm]; };
@@ -2589,6 +2638,7 @@ ber = derive { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzb
 berryFunctions = derive { name="berryFunctions"; version="1.8.1"; sha256="0plksyprbc5537005aw0yswwpahxk23c16lrq77zspzfa60i2vf0"; depends=[]; };
 bestglm = derive { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; };
 betafam = derive { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
+betalink = derive { name="betalink"; version="2.0.2"; sha256="13v28lzr8jw61cgvm98qrzlcdpps5l78bhm4nmw4bgid281gnf8p"; depends=[igraph plyr stringr]; };
 betapart = derive { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; };
 betaper = derive { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[ellipse vegan]; };
 betareg = derive { name="betareg"; version="3.0-5"; sha256="1zpj1x5jvkn7d8jln16vr4xziahng0f54vb4gc4vs03z7c853i4a"; depends=[flexmix Formula lmtest modeltools sandwich]; };
@@ -2643,6 +2693,7 @@ bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp
 biogas = derive { name="biogas"; version="1.0.1"; sha256="0fjxfj4c4clyp4gkzm0dl5ls7pbyaxmff56dw59wswijm4na2il7"; depends=[]; };
 biogram = derive { name="biogram"; version="1.2"; sha256="1kklidp1nm9jb0nvlhlhxklh4fp86plfsslp4ajnv8i4rc6h0v19"; depends=[bit entropy slam]; };
 biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[Matrix plyr RJSONIO]; };
+biomartr = derive { name="biomartr"; version="0.0.1"; sha256="10bi0vz9y2s7v41rkxifgf23w67ladpmmhhpfvnhbjqwwdk97snc"; depends=[biomaRt Biostrings data_table downloader dplyr httr RCurl stringr XML]; };
 biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[abind gbm ggplot2 MASS mda nnet pROC randomForest raster rasterVis reshape rpart sp]; };
 bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
 biorxivr = derive { name="biorxivr"; version="0.1.1"; sha256="0v2jmqpdcci3wwpcrakqcssahy3yx07s265axs14615w74dgd4kl"; depends=[XML]; };
@@ -2694,7 +2745,7 @@ boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1k
 boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
 boot = derive { name="boot"; version="1.3-17"; sha256="1lxjj0sbm9v21f34srrwkniiwbc59ibjh99yry9756ic55h6jyl5"; depends=[]; };
 bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; };
-bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4g7jjnkbsah69hissa9lqawbj9pi7"; depends=[boot]; };
+bootLR = derive { name="bootLR"; version="1.0"; sha256="1asf4yxy3abfkgqqg89mv9r2iifc5bgcjipy5idni0lvwfjashnd"; depends=[boot]; };
 bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; };
 bootSVD = derive { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; };
 bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
@@ -2704,7 +2755,7 @@ bootsPLS = derive { name="bootsPLS"; version="1.0.2"; sha256="1d2jn3c74d31rp37qp
 bootspecdens = derive { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
 bootstrap = derive { name="bootstrap"; version="2015.2"; sha256="1h068az4sz49ysb0wcas1hfj7jkn13zdmk087scqj5iyqzr459xf"; depends=[]; };
 boottol = derive { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; };
-boral = derive { name="boral"; version="0.6"; sha256="0ldd5slj90xsch498brll6sjbl6j8fb6a28vfciykr2364mgmahp"; depends=[coda fishMod MASS mvtnorm R2jags]; };
+boral = derive { name="boral"; version="0.8"; sha256="19yami2k4b12g4xzvd774hpa5adnk2wszlys0qgygsjxazv4zan5"; depends=[coda fishMod MASS mvtnorm R2jags]; };
 boss = derive { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[geepack lme4 Matrix ncdf]; };
 boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
 boxplotdbl = derive { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; };
@@ -2722,7 +2773,7 @@ brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6y
 brewdata = derive { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl stringdist XML]; };
 brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; };
 bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
-brms = derive { name="brms"; version="0.3.0"; sha256="0rgh0s1nlyhq41w24bq3qf3xxxzbfrnyrqw4pk0n5syqb7rdmi6m"; depends=[abind coda ggmcmc ggplot2 gridExtra Rcpp]; };
+brms = derive { name="brms"; version="0.4.0"; sha256="0bq21zavy0nziyg3z9g0jjxpj2ny36yvx5f3fkxrj9xlihp8fwlr"; depends=[abind ggmcmc ggplot2 gridExtra Rcpp reshape2 rstan]; };
 brnn = derive { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; };
 broman = derive { name="broman"; version="0.55-2"; sha256="04pg362gmxg5lvrv333mjq06lv0q3a1mq6wrbmy87jch6f10lazi"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
 broom = derive { name="broom"; version="0.3.7"; sha256="00z4kwxdqp6g35g4x6js9rc96z8i40hzgvhf5frj9dwfpxclk145"; depends=[dplyr plyr psych stringr tidyr]; };
@@ -2730,7 +2781,7 @@ bshazard = derive { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgk
 bspec = derive { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
 bspmma = derive { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
 bst = derive { name="bst"; version="0.3-4"; sha256="1s7qv2q9mcgg1c5mhblqg3nk9hary4pq6z0xgi3a6rs1929mgdyf"; depends=[gbm rpart]; };
-bsts = derive { name="bsts"; version="0.6.1"; sha256="0hs2inbwwpafpcr6y51qnmxms121z8cy8mil6acjfhrfc27f1msd"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
+bsts = derive { name="bsts"; version="0.6.2"; sha256="0m18yl9c12p19psx3iz7swlblgbkmyyvfls5g74gm8qbbhbxmdsk"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
 btf = derive { name="btf"; version="1.1"; sha256="0n1h4hmjpvj97mpvannh3s5l08m4zfv0w64hrgdv4s5808miwfzc"; depends=[coda Matrix Rcpp RcppEigen]; };
 bujar = derive { name="bujar"; version="0.1-4"; sha256="0v48mkg78sy91z1z4xvy2r3xmay74615kzqxjqlclkk20999z56m"; depends=[earth elasticnet gbm mboost mda ncvreg rms]; };
 bursts = derive { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
@@ -2757,13 +2808,14 @@ candisc = derive { name="candisc"; version="0.6-7"; sha256="1g2vypcniy94h462kylm
 cape = derive { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd fdrtool igraph Matrix qpcR shape]; };
 caper = derive { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; };
 capm = derive { name="capm"; version="0.8.0"; sha256="1vz17x0v5cjs5kdqkbay08f91kclsx4rcli5vgh9yxlk4ih9w4dd"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; };
+captioner = derive { name="captioner"; version="2.2.3"; sha256="0xg72pmgm84f0v45phfwxpsslhf12nhn1swmrj1yifj7g9sjvybj"; depends=[]; };
 capushe = derive { name="capushe"; version="1.0"; sha256="0dwxaiqnz0qbsk4icjapklaa9bpjfl4gqvk1f92livy97jmf1r44"; depends=[MASS]; };
 capwire = derive { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
 car = derive { name="car"; version="2.0-25"; sha256="1h7fndsypg9jqfc4xlr8aszjgs477jsvvw4lkpgjxrlb4j779yyj"; depends=[MASS mgcv nnet pbkrtest quantreg]; };
 carcass = derive { name="carcass"; version="1.4"; sha256="16apmiackw194p5n0fivkgd2ymca9bfajasypl82xqyfk6amh088"; depends=[arm expm lme4 MASS survival]; };
 cardidates = derive { name="cardidates"; version="0.4.6"; sha256="02ib56fvn2z63sbinhwnlw123y86h6xazbkzw68sa9klqaxv69yl"; depends=[boot lattice pastecs]; };
 care = derive { name="care"; version="1.1.9"; sha256="0fx5cbi1fx3hpyzghn1788rkh91i10z1ngryqc1v3iqqn3akbk4j"; depends=[corpcor]; };
-caret = derive { name="caret"; version="6.0-47"; sha256="0mpmch0435gcszj5yq4p7jpq7y9q8jk1bz3i1c9ij7a73kq2368i"; depends=[BradleyTerry2 car foreach ggplot2 lattice nlme plyr reshape2]; };
+caret = derive { name="caret"; version="6.0-52"; sha256="1z6z63q0dh5pjcl8nizs5jrfng9f34imkijfq5xc1m77r8m853dk"; depends=[BradleyTerry2 car foreach ggplot2 lattice nlme plyr reshape2]; };
 caretEnsemble = derive { name="caretEnsemble"; version="1.0.0"; sha256="16qibyx034gi06rs8wnazfdicvrwpdsys3mvgwmb35qgzldqfizy"; depends=[caret caTools digest ggplot2 gridExtra lattice pbapply plyr]; };
 caribou = derive { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; };
 caroline = derive { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; };
@@ -2779,7 +2831,7 @@ catnet = derive { name="catnet"; version="1.14.8"; sha256="03y7ddjyra3cjq7savdgi
 catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
 causaleffect = derive { name="causaleffect"; version="1.1.3"; sha256="04wbwl40iwyqi1j5ngss9rlsrp21qdr9pcp32ckl9g61qj8f6jxa"; depends=[ggm igraph XML]; };
 causalsens = derive { name="causalsens"; version="0.1.1"; sha256="1z92ckqa07ajm451wrldxx9y43nawlvj2bsz0afxc9mrhjwjg5dh"; depends=[]; };
-cba = derive { name="cba"; version="0.2-14"; sha256="067rm1rfz0rrq8xkzibd81pwvc9rx7ki46bncim4j5ra6i9pn24n"; depends=[proxy]; };
+cba = derive { name="cba"; version="0.2-15"; sha256="1qw1r5drxip4y1a59hwz92iw50nj3vkxynsisv28srnwr58imnaj"; depends=[proxy]; };
 ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
 ccaPP = derive { name="ccaPP"; version="0.3.0"; sha256="1wj5yij02372xarhvxsnh43v0l6xb2p8rflmskw6x86vpcdqd6zw"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; };
 cccd = derive { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[deldir FNN igraph proxy]; };
@@ -2814,10 +2866,10 @@ cgh = derive { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697ly
 cghFLasso = derive { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; };
 cghseg = derive { name="cghseg"; version="1.0.2"; sha256="1x7j62aq5c1xj8ss3pys5160y6vny4pa1wvf6xh59ak2zr4xjm9h"; depends=[]; };
 cgwtools = derive { name="cgwtools"; version="3.0"; sha256="01888n056x4c8g0676jnbh6d89hamzxrh33aw6r28mzlnmfy5lmw"; depends=[]; };
-changepoint = derive { name="changepoint"; version="1.1.5"; sha256="090rak3ydlh92w0mpp2sjjx4m9x33clcs77waj20gzxbq38mqdci"; depends=[zoo]; };
+changepoint = derive { name="changepoint"; version="2.0.1"; sha256="13nqnp53rksafdybkvwg434j7cs5wv262qzqgzs77nvk0dzh6gch"; depends=[zoo]; };
 cheb = derive { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
 chebpol = derive { name="chebpol"; version="1.3-1367"; sha256="0w1yfnag0sjqjn7g5yn3wd19kkwzcchb491335h70rm360m1kr0y"; depends=[]; };
-checkmate = derive { name="checkmate"; version="1.6.0"; sha256="0jcqkdw850dndsh6mbyim5zgxgichmkr4yks3zh5fm9ffs1nmqkw"; depends=[]; };
+checkmate = derive { name="checkmate"; version="1.6.2"; sha256="1phw4amr3ck0kglgfsjf3zimlgiygij0dbx50hbxid003281hwxa"; depends=[]; };
 checkpoint = derive { name="checkpoint"; version="0.3.10"; sha256="147phhsv5g8k23fd355jqjqpjjj8n3s0bblm8mv5c3d0322li7ac"; depends=[]; };
 cheddar = derive { name="cheddar"; version="0.1-629"; sha256="13fmr37jj7dky5jrpr20z1iai9jbnpmwsh2pbzjwvib7561pyd6x"; depends=[]; };
 chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; };
@@ -2844,7 +2896,7 @@ circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76k
 cit = derive { name="cit"; version="1.4"; sha256="0axmi41bydkj512jscil9mqz9g6f11khl8hi6fci96wnm9x8gw7s"; depends=[]; };
 citbcmst = derive { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
 citccmst = derive { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
-cjoint = derive { name="cjoint"; version="1.0.3"; sha256="0f9yh4rbgqlx12vx336isfxc3lnrl5sgbapld0qfkv93p26in9h6"; depends=[ggplot2 lmtest sandwich]; };
+cjoint = derive { name="cjoint"; version="2.0.0"; sha256="02jsdlqpcg5xjnpbnw658fsyhym0ssmhhm69z9ij8vm65qxi47f8"; depends=[ggplot2 lmtest sandwich survey]; };
 clValid = derive { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; };
 cladoRcpp = derive { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp RcppArmadillo]; };
 class = derive { name="class"; version="7.3-13"; sha256="0y6gms2hbzx45a10n86899hfaxjg3bjn6gfd5jhqzan5dalnp5w1"; depends=[MASS]; };
@@ -2859,7 +2911,7 @@ clickstream = derive { name="clickstream"; version="1.1.5"; sha256="010bf7rxicv4
 clifro = derive { name="clifro"; version="2.4-0"; sha256="1bjsfk4m7hgq8k1mw07zx34ibgmpxjw8sig9jjzsr5mp3v13kwp8"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; };
 climdex_pcic = derive { name="climdex.pcic"; version="1.1-6"; sha256="0dyhqxrma8g4ny4afv6drr885m88q2b8g1n19yy3yjbrbddyz8yl"; depends=[caTools PCICt Rcpp]; };
 clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
-climwin = derive { name="climwin"; version="0.0.1"; sha256="1ajkqk6lj2d8gx7arkwrznrkrjvdc5g9789vwaawwczbdavyi8kd"; depends=[evd ggplot2 gridExtra lme4 lubridate MuMIn reshape]; };
+climwin = derive { name="climwin"; version="0.1.0"; sha256="1yfnhqmhq9bbkhq1rygwmv02kczz3qih407sndf5j99hifpm6cfn"; depends=[evd ggplot2 gridExtra lme4 lubridate MuMIn reshape]; };
 clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
 clinfun = derive { name="clinfun"; version="1.0.10"; sha256="1q69qn7ib0mzpx5cv69fcgflp9rfmys5j33lqdj4b3g1z036bqrr"; depends=[mvtnorm]; };
 clinsig = derive { name="clinsig"; version="1.0-5"; sha256="1jb2qk6hfvms85whymrfpgvjp8pv33fbllpl8jg80yg1ppmg2jcg"; depends=[]; };
@@ -2870,14 +2922,14 @@ clpAPI = derive { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm
 clue = derive { name="clue"; version="0.3-50"; sha256="0r3lb625a6vhxr7im2slz279zav9i74s0b9srkarqmz1bhaf6ly2"; depends=[cluster]; };
 clues = derive { name="clues"; version="0.5.6"; sha256="1g0pjj4as5wfc7qr3nwkzgxxxp3mrdq7djn8p8qjba6kcdjxak1i"; depends=[]; };
 clustMD = derive { name="clustMD"; version="1.1"; sha256="192li0nx2hwhh5y21xs70vrnzw3wxbzr95f06makaxcrwf4xlp16"; depends=[MASS mclust msm mvtnorm tmvtnorm truncnorm]; };
-cluster = derive { name="cluster"; version="2.0.2"; sha256="1zk6y68l5lz0yvzr1d5rs45xid2pcjpvhdarwxz074iqb0ha5sih"; depends=[]; };
+cluster = derive { name="cluster"; version="2.0.3"; sha256="03jfczb3dwg57f164pya0b762xgyswyb9a7s33lw9i0s5dq72ri8"; depends=[]; };
 cluster_datasets = derive { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
 clusterCrit = derive { name="clusterCrit"; version="1.2.5"; sha256="1xwbvvzrh2dz47y4snmhb96mriblk3czy7dp5bmyvckh5papr2xv"; depends=[]; };
 clusterGeneration = derive { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; };
 clusterGenomics = derive { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
 clusterPower = derive { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; };
 clusterRepro = derive { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; };
-clusterSEs = derive { name="clusterSEs"; version="2.0"; sha256="18m1d5i2mjv5yhi0zbkqwx9c20x79kqwq8cj62xcl531q1gx4bpq"; depends=[AER Formula lmtest mlogit plm sandwich]; };
+clusterSEs = derive { name="clusterSEs"; version="2.0.1"; sha256="186916x3dh8cqy2zrqgksdjbka7hrslbdjj0iz3w3lpy9rq761lz"; depends=[AER Formula lmtest mlogit plm sandwich]; };
 clusterSim = derive { name="clusterSim"; version="0.44-2"; sha256="1xf3byri6mwlf89n896bxffmf3c6yqqh992npg9sqznx955hcggv"; depends=[ade4 cluster e1071 MASS R2HTML rgl]; };
 clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; };
 clustergas = derive { name="clustergas"; version="1.0"; sha256="1vf4czpwk71yxd26vm5sal0ml20ssjrq4bmk31yzxydpxn495fg8"; depends=[cluster]; };
@@ -2896,17 +2948,17 @@ cmsaf = derive { name="cmsaf"; version="1.4"; sha256="1pdfwsy9cjzikld19dh1fhq16l
 cmvnorm = derive { name="cmvnorm"; version="1.0-1"; sha256="00cm7zfxbc5md3p6sakan64a6rzz7nbq0bqq9ys2iyxpilxalj3m"; depends=[elliptic emulator]; };
 cna = derive { name="cna"; version="1.0-3"; sha256="1iy0ispazhib30kh5wp3jziiyf0992nrdklrq80n0w3zhjyi21rh"; depends=[]; };
 cncaGUI = derive { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; };
+coala = derive { name="coala"; version="0.1.1"; sha256="04w1h1v8l4by4wqjhb2qlvkmp7nr5yklq20a2krym9x1frgcqw7m"; depends=[assertthat R6 Rcpp RcppArmadillo rehh scrm]; };
 coalescentMCMC = derive { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
 coarseDataTools = derive { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; };
 cobs = derive { name="cobs"; version="1.3-0"; sha256="1aly7ir7vzir9wnbhyfbrkl7dbq68f79jwxhqrfpf0v2m5kxhz88"; depends=[quantreg SparseM]; };
-cobs99 = derive { name="cobs99"; version="0.9-12"; sha256="0zd0nyw8ma7k90i1k3ryn6qcb6yivrrajc6nmdh4f95ihvhc9ksm"; depends=[]; };
 cocor = derive { name="cocor"; version="1.1-1"; sha256="1w6v9499jj727iznap66hlv9lr4r3s9pr5jnsin9zi8hjb2vhj4h"; depends=[]; };
 cocorresp = derive { name="cocorresp"; version="0.2-3"; sha256="0r1kmcwnf476xbw7r40r3vbn6l1zgmaiq6cpgrvnyss7i5313q8s"; depends=[vegan]; };
 cocron = derive { name="cocron"; version="1.0-0"; sha256="190kfv7haybi7s33bqf8dd3pcj8r6da20781583rrq6585yqh4g6"; depends=[]; };
 coda = derive { name="coda"; version="0.17-1"; sha256="1qjsqf4xi6xii60dscn577gmhqgbm525cgg67ax5mhs7il7br26f"; depends=[lattice]; };
 codadiags = derive { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
 codep = derive { name="codep"; version="0.4-1"; sha256="1jkd6k80d6vyriwmq1car5zjms304zrdrfbjib664zxzx1wadf8z"; depends=[]; };
-codetools = derive { name="codetools"; version="0.2-11"; sha256="1mal1xa7san28l6rssvanndsgm90qhvbskz840ybfwwix8bqnbmh"; depends=[]; };
+codetools = derive { name="codetools"; version="0.2-14"; sha256="0y9r4m2b8xgavr89sc179knzwpz54xljbc1dinpq2q07i4xn0397"; depends=[]; };
 coefficientalpha = derive { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[lavaan rsem]; };
 coefplot = derive { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr proto reshape2 scales useful]; };
 coenocliner = derive { name="coenocliner"; version="0.2-0"; sha256="1ndz7nhkzb8y0akyf1ja39m60c1afk4sb8qk7m4xd3srd71wb35z"; depends=[]; };
@@ -2917,6 +2969,7 @@ coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b
 colorRamps = derive { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
 coloredICA = derive { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; };
 colorfulVennPlot = derive { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; };
+colorscience = derive { name="colorscience"; version="1.0.1"; sha256="0085cxdknfm70i0x57jb9fpaqhpgcvl150n2mcaw8wgw1lf59f06"; depends=[Hmisc munsellinterpol pracma sp]; };
 colorspace = derive { name="colorspace"; version="1.2-6"; sha256="0y8n4ljwhbdvkysdwgqzcnpv107pb3px1jip3k6svv86p72nacds"; depends=[]; };
 colortools = derive { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
 colourlovers = derive { name="colourlovers"; version="0.1.4"; sha256="1c5g9z7cknn4z1jqb0l1w8v5zj0qbk4msaf1pqfcx9a70pw8s0m5"; depends=[png RJSONIO XML]; };
@@ -2960,6 +3013,7 @@ conting = derive { name="conting"; version="1.5"; sha256="02vkpzdcwsny40jdcxgjfr
 contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; };
 controlTest = derive { name="controlTest"; version="1.0"; sha256="0gzhd92qy3dykwdfwckw6x46bd9m044hcn4bqwpv16af1xbrj963"; depends=[survival]; };
 convevol = derive { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj7qwsq3k3al34q3j751bic4kb8zhby3fk"; depends=[ape cluster geiger MASS phytools]; };
+convoSPAT = derive { name="convoSPAT"; version="0.1"; sha256="1vm6ghxbdbhgjr744mffnyrsz0a7x37k9ckm7n1mn862fdvsb2w3"; depends=[ellipse fields geoR MASS plotrix StatMatch]; };
 cooccur = derive { name="cooccur"; version="1.2"; sha256="0v26aa6j77dmm7pdij4qaz03mxn69aa71rw6n5yl3b9qb0w4k81z"; depends=[ggplot2 gmp reshape2]; };
 cooptrees = derive { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; };
 copBasic = derive { name="copBasic"; version="1.7.1"; sha256="0qhrazzsrc429z9fsbqklvwdfgn65adck51vp74jijjd0p6pki4s"; depends=[lmomco]; };
@@ -2999,24 +3053,25 @@ coxphf = derive { name="coxphf"; version="1.11"; sha256="0494szmhc7qp1qynrqf3kmn
 coxphw = derive { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; };
 coxrobust = derive { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; };
 coxsei = derive { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; };
-cp4p = derive { name="cp4p"; version="0.2"; sha256="1rm6dgfiv2dx17svlzyaiqiqkpip24ns5wp8lddr6gmpws581ywl"; depends=[limma MESS multtest qvalue]; };
+cp4p = derive { name="cp4p"; version="0.3"; sha256="10jr3hkqqq305ic3f166zza3zsgsxgh253qm4p700gwgk5z57sqc"; depends=[limma MESS multtest qvalue]; };
 cpa = derive { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; };
 cpca = derive { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; };
 cpk = derive { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; };
 cplexAPI = derive { name="cplexAPI"; version="1.2.11"; sha256="1rfvq2a561dz3szvrs9s5gsizwwp0b5rn4059v9divzw23clr2a9"; depends=[]; };
-cplm = derive { name="cplm"; version="0.7-2"; sha256="0vwj130r5wbax9ixcn0fdznh1zrr0wq48iivmlymqbhbqajmv8fb"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
-cpm = derive { name="cpm"; version="2.0"; sha256="0k27r3bfqrdy3iwpzyh8mp8lr3ndcsc688g6mp5ha4blxiwgciyb"; depends=[]; };
+cplm = derive { name="cplm"; version="0.7-3"; sha256="17h7wnwym49pm56ifi31lnjzja3bqgd4nkla6hbqk338a56lqspl"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
+cpm = derive { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; };
 cqrReg = derive { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; };
-cquad = derive { name="cquad"; version="1.1"; sha256="09rzqdv59q81nsrpjhjbdwm3p803q51w18arjg8x8l2jcgk3zcga"; depends=[]; };
+cquad = derive { name="cquad"; version="1.2"; sha256="1ygq1z9mkrfvjq5yipfg6wpd0gmwh8h40ykp0hv06hvn40aqkw4h"; depends=[MASS]; };
 crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[evd Hmisc]; };
 cramer = derive { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; };
 crank = derive { name="crank"; version="1.0-7"; sha256="1ni5icg1c9ypvcvcxrr7dcp1zbk4iwyns421rrqsgmpns06s59w6"; depends=[]; };
 cranlogs = derive { name="cranlogs"; version="2.0.0"; sha256="13c8sa3s1xvb5naj4cy7d5azcbf716l0gp4x086sqd5dg1hqdy8b"; depends=[httr jsonlite]; };
 crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
 crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm raster sp]; };
-crayon = derive { name="crayon"; version="1.3.0"; sha256="1s51ijdsss02d6wwbx2r14vz03w8b17757rh43i7nc1vh36ylbjk"; depends=[memoise]; };
+crayon = derive { name="crayon"; version="1.3.1"; sha256="0d38fm06h272a8iqlc0d45m2rh36giwqw7mwq4z8hkp4vs975fmm"; depends=[memoise]; };
 crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; };
 crch = derive { name="crch"; version="0.9-0"; sha256="0kd71lv239sn08f3v63k18dxxn6zbk3m0znx2xrmd4a2akrqwjsj"; depends=[Formula ordinal]; };
+credule = derive { name="credule"; version="0.1.2"; sha256="1qzvm2v4p27c58nwkr31s27fyb1hm41qdvyi04jc4jlvwi66747g"; depends=[]; };
 crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; };
 crimelinkage = derive { name="crimelinkage"; version="0.0.3"; sha256="018ni9jgnm4k8vybz99drsx8phb0ar3x0raa5ydkfpgqp525sayi"; depends=[geosphere igraph]; };
 crmn = derive { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; };
@@ -3025,13 +3080,14 @@ crossReg = derive { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w
 crossdes = derive { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; };
 crossmatch = derive { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; };
 crossval = derive { name="crossval"; version="1.0.3"; sha256="0acpcisg6pkxblyc4j9hiri58h1rn7ay43p5ib5ia8a4a8bnfa4p"; depends=[]; };
-crp_CSFP = derive { name="crp.CSFP"; version="2.0"; sha256="0ji208hn3zimql0xhy8bl7w0vg40szw28fia7k1f7g9z0wbl9xqp"; depends=[MASS]; };
-crqa = derive { name="crqa"; version="1.0.5"; sha256="0kiw90p89mf207mmky98g2d4l9mnhzi4dy08d810nm16wiqabkw4"; depends=[fields Matrix pracma tseriesChaos]; };
+crp_CSFP = derive { name="crp.CSFP"; version="2.0.1"; sha256="0l2fwdawfbx7971q7jg7604w2ys056rfywiw0myfgc0z864saz0n"; depends=[MASS]; };
+crqa = derive { name="crqa"; version="1.0.6"; sha256="1v9fwl98jjlg2z5skqsjmmgpmmxy4g1gzvc28yflvdp50qn509v8"; depends=[fields Matrix plot3D pracma tseriesChaos]; };
 crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
 crrp = derive { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; };
 crrstep = derive { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
 crs = derive { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; };
 crunch = derive { name="crunch"; version="1.3.2"; sha256="021xzhxmid5r9f9c02vkywp498xmgyqcdg0yb20j507dabkbayjr"; depends=[httr jsonlite RCurl]; };
+cruts = derive { name="cruts"; version="0.1"; sha256="0p2iiccjf1414g5xp6rcww58vimh2ahj0ghak1mrjyvgb4q6zgh3"; depends=[lubridate ncdf raster sp stringr]; };
 csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
 csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
 cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[maptools plyr sp]; };
@@ -3066,13 +3122,14 @@ cwhmisc = derive { name="cwhmisc"; version="5.0"; sha256="0b70ssss48kpjyimwm8hwc
 cwm = derive { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; };
 cxxfunplus = derive { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; };
 cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; };
+cymruservices = derive { name="cymruservices"; version="0.1.1"; sha256="1pqqqmsgicp87r9axv96qj61mmxrn50d8xnhfhjf7sklxkh57482"; depends=[stringr]; };
 cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
 cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
 d3Network = derive { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; };
-d3heatmap = derive { name="d3heatmap"; version="0.6.0"; sha256="1whagc3pyb03j7p3wsphcfivirgh5an5sx4im5iw2g6a9v7zh0gv"; depends=[base64enc dendextend htmlwidgets png scales]; };
+d3heatmap = derive { name="d3heatmap"; version="0.6.1"; sha256="01lrz8r84yy5cdkl7ip2brwgfmyllg09zz2bayrb132xib21427x"; depends=[base64enc dendextend htmlwidgets png scales]; };
 dMod = derive { name="dMod"; version="0.1"; sha256="0170hvgngwxr0qfl7knmj0l2gg053xj5yfd5hkfyjnl6ivcsw3c9"; depends=[cOde ggplot2 trust]; };
 dae = derive { name="dae"; version="2.7-2"; sha256="0b38bwk5c8fzgvkg8jpci4n8cj94zdypc099apfjzy2gkw5l71ym"; depends=[ggplot2]; };
-daewr = derive { name="daewr"; version="1.1-4"; sha256="0pmz4721999vf023hpvsf17k5fgqpwnisnwssmav46glhmzl2cyj"; depends=[BsMD FrF2 lattice]; };
+daewr = derive { name="daewr"; version="1.1-6"; sha256="1gk7hs7m4ma505i6n8wf3c9ifzz93w8qljmb03xf13c9qchrqi61"; depends=[BsMD FrF2 lattice]; };
 daff = derive { name="daff"; version="0.1.4"; sha256="1g08m9qyrlwxdy9w18132dc9klz6ayw5jbn700vkzvqibfc1l7cx"; depends=[jsonlite V8]; };
 dafs = derive { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
 dagR = derive { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; };
@@ -3102,15 +3159,16 @@ dbEmpLikeGOF = derive { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702
 dbEmpLikeNorm = derive { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
 dbarts = derive { name="dbarts"; version="0.8-5"; sha256="1w170mdfl5qz7dv1p2kqx0wnkmbz2gxh2a4p7vak1nckhz2sgpgn"; depends=[]; };
 dblcens = derive { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
-dbmss = derive { name="dbmss"; version="2.2.0"; sha256="0ngf7l7nsp03jvspa7xfhal2ccaxcvjny5sd5aypfwfgrndrd71z"; depends=[cubature Rcpp spatstat]; };
+dbmss = derive { name="dbmss"; version="2.2.1"; sha256="0maz8zhz8c8xjdcmkhsaxz6149mh4mkcwmmd01saqsy57ncy7qhq"; depends=[cubature Rcpp spatstat]; };
+dbscan = derive { name="dbscan"; version="0.9-1"; sha256="1i8iq5y93f6cmd20h4nnwkj902d967m6d9crxnj76vbnwgilbjgw"; depends=[Rcpp]; };
 dbstats = derive { name="dbstats"; version="1.0.4"; sha256="1miba5h5hkpb79kv9v9hqb5p66sinxpqvrw9hy9l5z4li6849yy1"; depends=[cluster pls]; };
-dcGOR = derive { name="dcGOR"; version="1.0.4"; sha256="1vvij7f2vw9xaky32wyr7h1iwcq5m3s2s46kn9vjq1jllw85phgl"; depends=[dnet igraph Matrix]; };
+dcGOR = derive { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; };
 dcemriS4 = derive { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; };
 dclone = derive { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xizlkq8w1bslav5h72igvzzffcvqbj9hq"; depends=[coda]; };
 dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[coda dclone lattice rjags]; };
 dcmr = derive { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; };
 dcv = derive { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
-ddalpha = derive { name="ddalpha"; version="1.1.2.3"; sha256="1n1502is99gxw84g4a0n8ciq2pr8dpvi7cmzcxqvcpqdjrjdhr20"; depends=[BH class MASS Rcpp robustbase]; };
+ddalpha = derive { name="ddalpha"; version="1.1.3.1"; sha256="0vi7crw30mfpllmspicilz1vwhbsmlzx2mfs53kv2hs8vj7r1in8"; depends=[BH class MASS Rcpp robustbase]; };
 ddeploy = derive { name="ddeploy"; version="1.0.4"; sha256="06s4mn93sl33gldda9qab8l3nqig8zq0fh1s2f98igsysmn31br5"; depends=[httr jsonlite]; };
 ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[evd orthopolynom]; };
 deSolve = derive { name="deSolve"; version="1.12"; sha256="0npcayl6q2f32b3iflfgs7gg2slg4dfgdcz4awpllza0lwgzyyfj"; depends=[]; };
@@ -3120,10 +3178,10 @@ deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1
 debug = derive { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; };
 decctools = derive { name="decctools"; version="0.2.1"; sha256="01h119gdvvbfnqfxaca7ca0yhpp6wggq0b69k6ww5lnkfnlj0sgi"; depends=[lubridate plyr RCurl reshape2 stringr XLConnect XML]; };
 decisionSupport = derive { name="decisionSupport"; version="1.101.1"; sha256="08qcvdwp0wgspnfnlhkpxz3p6y43pjf32p185knw8g81wr1950ip"; depends=[msm mvtnorm]; };
-decode = derive { name="decode"; version="1.1"; sha256="06c6l2s32s1vri51hbnl17sxgkl7x8537prk0zzq6zlqhkwy6j77"; depends=[]; };
+decode = derive { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; };
 decompr = derive { name="decompr"; version="4.1.0"; sha256="1agzfy7iyyzh71pb56l7438bvpsx0q2z9mxh16fc8mfnywcl2jr2"; depends=[]; };
 decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; };
-deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fgkzvgbiq7b67r9lfgll3lxfr1pmx14vmivshb6mmm"; depends=[editrules]; };
+deducorrect = derive { name="deducorrect"; version="1.3.7"; sha256="10lvhdnnc6xiy20hy6s5rpqcvilj8x0y6sn92rfjkdbfsl00sslp"; depends=[editrules]; };
 deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
 degenes = derive { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; };
 degreenet = derive { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrarfzf0d6avbd8zjnc3zd155jzmhi8dacr6r73w"; depends=[igraph network]; };
@@ -3206,11 +3264,11 @@ disp2D = derive { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv
 disparityfilter = derive { name="disparityfilter"; version="2.1"; sha256="0ld43hd4dr389pd8sncslp707jyfgbx7w1larq75gkzjykc29aqw"; depends=[igraph]; };
 displayHTS = derive { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; };
 dispmod = derive { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; };
-disposables = derive { name="disposables"; version="1.0.0"; sha256="0xd8war6vav8swpwgmyi9hd6xv0j6j72yrk4sdcwiwzgs4l8cbfj"; depends=[]; };
+disposables = derive { name="disposables"; version="1.0.1"; sha256="1gmmf34hq8vm2gjg1560hkarppxmzakymgjbpzbpy2j471kd9s7a"; depends=[]; };
 dissUtils = derive { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; };
-distcomp = derive { name="distcomp"; version="0.25.1"; sha256="04cq4hsv1yl65cchhran9s3844w4knsbfja5wxfib5gh4dadriwk"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
+distcomp = derive { name="distcomp"; version="0.25.2"; sha256="1jzsvd4q4pz6gk8a09rq20mzvifpl01d2913hhssdnjqjhaiwy6g"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
 distfree_cr = derive { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; };
-distillery = derive { name="distillery"; version="1.0-1"; sha256="0hfj4qbfb5219dm7yrgf2h4jrh2qsjhwrbv8gbrxcr0xf6gqbxmv"; depends=[]; };
+distillery = derive { name="distillery"; version="1.0-2"; sha256="12m4cacvc18fd3aayc8iih5q6bwsmvf29b55fwp7vs8wp1h8nd8c"; depends=[]; };
 distory = derive { name="distory"; version="1.4.2"; sha256="12j19cb1b4prm8m43gya15kia1ii1k0yy7hkngpn2vsyk7n2z65m"; depends=[ape]; };
 distr = derive { name="distr"; version="2.5.3"; sha256="13ssdidbh4x534f0vvhfpi5cdrhlpmrz8s0y33q7ccf3dfmdsyan"; depends=[sfsmisc startupmsg SweaveListingUtils]; };
 distrDoc = derive { name="distrDoc"; version="2.5.1"; sha256="02wcqy9z36lxkpxy42vj1yv7x2v3i57rngpw58s7immzp5j3dlam"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg SweaveListingUtils]; };
@@ -3237,7 +3295,7 @@ dma = derive { name="dma"; version="1.2-2"; sha256="18v40rr4qx98ap38vr77xxvl7y3a
 dmm = derive { name="dmm"; version="1.6-2"; sha256="00wqa33n1zd6gbl658vrz07f6kkhbmdg8f3y9x9n3zq2ygnxrid1"; depends=[MASS Matrix nadiv pls robustbase]; };
 dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; };
 dna = derive { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
-dnet = derive { name="dnet"; version="1.0.6"; sha256="0zhv2yfrlhfwjbgbvjzmw3c5g5rj33n8l2npdf6b4nqz0c0hc1jn"; depends=[Biobase graph igraph Matrix Rgraphviz supraHex]; };
+dnet = derive { name="dnet"; version="1.0.7"; sha256="0aa64y7mm1xan34h1pimajm7hvlm7z3r9rikysc2dw5dskkhli40"; depends=[Biobase graph igraph Matrix Rgraphviz supraHex]; };
 doBy = derive { name="doBy"; version="4.5-13"; sha256="07ppghcf381wc9s9igsi3viy6p86b5bmpfm1s8iwq7ca4j89qw42"; depends=[MASS Matrix survival]; };
 doMC = derive { name="doMC"; version="1.3.3"; sha256="0g5psgk92b2zk9fkap3a86haay2y0kfz75cyk3d1ila9m7cd2cn4"; depends=[foreach iterators]; };
 doMPI = derive { name="doMPI"; version="0.2.1"; sha256="1d2pkxsap656l7h88q37ymy1jw0zd4n9h892511a1a230dxwc0xh"; depends=[foreach iterators Rmpi]; };
@@ -3251,7 +3309,8 @@ domino = derive { name="domino"; version="0.2-7"; sha256="1wp2rikyggjvqpg29qjn3z
 dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[aod Matrix mvmeta]; };
 dostats = derive { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; };
 dotenv = derive { name="dotenv"; version="1.0"; sha256="1lxwvrhqcwj9q24x30xzrw8qqhxgyr88ja3fajm5hf3pwbw85yls"; depends=[falsy magrittr]; };
-downloader = derive { name="downloader"; version="0.3"; sha256="0jpq8z3i9fkgs8wwjrq5qd7qfi5w3rxmzmsi1c1dxlnxzzhg6kxq"; depends=[digest]; };
+dotwhisker = derive { name="dotwhisker"; version="0.1.0.1"; sha256="00apyw3w7ribazpnbg91q82awd4rhmlrylsimvf9dra4pgaq4n3d"; depends=[dplyr ggplot2 gridExtra gtable]; };
+downloader = derive { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; };
 dpa = derive { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; };
 dpcR = derive { name="dpcR"; version="0.1.4.0"; sha256="0fv17vzlsjb5cy1f0ll5gi5y8npavp2y7frzc595na5g15xphmxc"; depends=[binom chipPCR dgof e1071 multcomp pracma qpcR rateratio_test shiny signal spatstat]; };
 dpglasso = derive { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
@@ -3297,9 +3356,10 @@ dynamicTreeCut = derive { name="dynamicTreeCut"; version="1.62"; sha256="1y11gg6
 dynatopmodel = derive { name="dynatopmodel"; version="1.0"; sha256="1dq18wqbf7y597mbqv8fwwc5fm8l618mkqvb2l95bplq7n508hng"; depends=[fields hydroGOF intervals maptools raster rgdal rgeos shape sp spam topmodel xts]; };
 dynia = derive { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; };
 dynlm = derive { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4gb5wbnpdbgkb5s6zx24lh81whvcs"; depends=[car lmtest zoo]; };
-dynsim = derive { name="dynsim"; version="1.0"; sha256="0w4brs8kcps6gkamkic57nj61iz7zdxq972jwzs17i43wfcrw32c"; depends=[ggplot2 gridExtra MASS]; };
+dynpred = derive { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; };
+dynsim = derive { name="dynsim"; version="1.2"; sha256="0vd08mdv7yklhy5rqmhji0ff9284n2z15a3ij4ylw7a0hzlyp2m3"; depends=[ggplot2 gridExtra MASS]; };
 dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
-e1071 = derive { name="e1071"; version="1.6-4"; sha256="0hakqawy8bz4hvjzz9dbc2pbqhaf1qjsgl0agz3qfg63974whw2i"; depends=[class]; };
+e1071 = derive { name="e1071"; version="1.6-6"; sha256="1620w29mlx12kb93nxags1zgz628isr75f1q2ffn9mxsw13cc5d2"; depends=[class]; };
 eHOF = derive { name="eHOF"; version="1.5.9"; sha256="187c85fp7q63ipqd3qzivlv9asm9zc49rvw33j39js03mak4r0d2"; depends=[lattice mgcv]; };
 eRm = derive { name="eRm"; version="0.15-5"; sha256="0g4avcr709brvzcbmqmq35c7zvgx1hkf5nq6djsprzkgvh6rznjn"; depends=[lattice MASS Matrix]; };
 eVenn = derive { name="eVenn"; version="2.2"; sha256="0k6m61z902spxxrc38504l73h022w5v74g39h4azd1ibr35yrl7j"; depends=[]; };
@@ -3329,12 +3389,14 @@ edcc = derive { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilk
 edeR = derive { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; };
 edgeRun = derive { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; };
 editrules = derive { name="editrules"; version="2.9.0"; sha256="14mfa8flkym2rx9n7bq9icc9fsrk3szib3amx5l0008rxll9qnxm"; depends=[igraph lpSolveAPI]; };
+edmr = derive { name="edmr"; version="0.6.3.1"; sha256="1avb4gnw8s635yyn3sh20pmppsnz39s7r1pr8ggdc61ca1mkh2mk"; depends=[data_table GenomicRanges IRanges mixtools S4Vectors]; };
 edrGraphicalTools = derive { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[lasso2 MASS mvtnorm rgl]; };
 eegAnalysis = derive { name="eegAnalysis"; version="0.0"; sha256="1lrwjbhm5fnf5fhyyga2b21j2snnmj3zfvfxfkvgsbdnzr3qxaxb"; depends=[e1071 fields splus2R wmtsa]; };
 eegkit = derive { name="eegkit"; version="1.0-2"; sha256="10dksmc5lrl0ypifvmmv96xnndl2zx191sl79qif0gfs3wq3w4s0"; depends=[bigsplines eegkitdata ica rgl]; };
 eegkitdata = derive { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; };
 eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[arm data_table ggplot2 maptools MASS memisc stringr]; };
 effects = derive { name="effects"; version="3.0-4"; sha256="0ypw49gighmg2azc2872y8r9rx9v3x0r2gsidgkwqlaqg95vfcd7"; depends=[colorspace lattice lme4 nnet]; };
+efflog = derive { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; };
 effsize = derive { name="effsize"; version="0.5.4"; sha256="1dc90avbnb83nrm70wh0h45g3c6dcg8zh2ynklc2x86cqk7b264b"; depends=[]; };
 ega = derive { name="ega"; version="1.0.1"; sha256="02mbadv505jz6nk1yp9xl12c9l9wnwpl5bajfbhgs837pdca438g"; depends=[ggplot2]; };
 egcm = derive { name="egcm"; version="1.0.6"; sha256="1j499f94ibr9rx544mwbpwjrwhzbdlvv1p156kj8pfnd7qin26xl"; depends=[fArma ggplot2 MASS tseries TTR urca xts zoo]; };
@@ -3361,7 +3423,7 @@ embryogrowth = derive { name="embryogrowth"; version="6.0"; sha256="0l08imqagn2w
 emdbook = derive { name="emdbook"; version="1.3.8"; sha256="10qmppacfww8wg1hhd9fpadrvrivrvfgfn1qgm87xlf3a8jpffjj"; depends=[bbmle coda lattice MASS plyr rgl]; };
 emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
 emg = derive { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; };
-emil = derive { name="emil"; version="2.0.2"; sha256="16fkf5ns6pw0nrpysr1yy5hwwg59mkfa84skajchfvq75aw6hwbi"; depends=[data_table dplyr ggplot2 lazyeval magrittr tidyr]; };
+emil = derive { name="emil"; version="2.1.1"; sha256="09n9qrlww33x4n3020dc8snc7qadyvjinc73dn7r6rvhf76ygrx3"; depends=[data_table dplyr ggplot2 lazyeval magrittr tidyr]; };
 emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; };
 emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
 emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
@@ -3370,7 +3432,7 @@ empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0.3"; sha2
 emplik = derive { name="emplik"; version="1.0-1"; sha256="1kwgikdnxh52wsmzrzqv7sp8s55w9q40aq9kpfd3zshkflx7w8g1"; depends=[quantreg]; };
 emplik2 = derive { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; };
 emulator = derive { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; };
-enaR = derive { name="enaR"; version="2.8.1"; sha256="1p2vhqd1zxwar5fb16ibvwrzrxl7c574ls6747bkdjzlx7vznrn1"; depends=[gdata MASS network sna stringr]; };
+enaR = derive { name="enaR"; version="2.9"; sha256="0nhaqjp18zmjk3bl442fhpgxvz7psk1r3zff3qdrz794hxi5s6a9"; depends=[gdata MASS network sna stringr]; };
 endogMNP = derive { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
 endorse = derive { name="endorse"; version="1.4.1"; sha256="0xyi2cq4k4xa8kr717i4njl6rgjf5z99056jbhp2rbzfyy4sw61d"; depends=[coda]; };
 energy = derive { name="energy"; version="1.6.2"; sha256="008yf4r6546mzk9q515zliqxyjx6w0z19g5wlarg7f4lrzsmqiaw"; depends=[boot]; };
@@ -3399,7 +3461,7 @@ eqs2lavaan = derive { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb
 eqtl = derive { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
 equate = derive { name="equate"; version="2.0-3"; sha256="0y37nxily7zjx00z7h4vmpn8cs7bl3aravhjkjz9l6y0fv0rc5vv"; depends=[]; };
 equateIRT = derive { name="equateIRT"; version="1.2"; sha256="07qh5awa12d1bcm504k0rpgyxyzhymg92131cl676kdlfp49aqk1"; depends=[statmod]; };
-equivalence = derive { name="equivalence"; version="0.6.0"; sha256="1q17c2bs36f46bmm6wzmp0g2lg7d0j9mlrfnkzxnlvmspwksc0zl"; depends=[boot lattice PairedData]; };
+equivalence = derive { name="equivalence"; version="0.7.0"; sha256="0x9840kyyhdlj13r2rhijc6p0chvzyqp6lkxxf561pnprhkzzqdj"; depends=[boot lattice PairedData]; };
 erboost = derive { name="erboost"; version="1.2"; sha256="0afgh0zkl3h3ab4s7wl0cn24qdyhszssai9i390mi7w0p88wgba9"; depends=[lattice]; };
 erer = derive { name="erer"; version="2.3"; sha256="165hngfzbzn403gwdcjkhvlm7jygl57nbpwdmlya2rd43z09kp77"; depends=[ggplot2 lmtest systemfit tseries urca]; };
 ergm = derive { name="ergm"; version="3.4.0"; sha256="1qyj4b22d998qky0rv1h9h0r33vdwr7lw7gpkvbgzf5d44yng33b"; depends=[coda lpSolve Matrix network robustbase statnet_common trust]; };
@@ -3429,7 +3491,7 @@ evolqg = derive { name="evolqg"; version="0.1-5"; sha256="1s9jh14ycymlajc285cczr
 evolvability = derive { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
 evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
 evtree = derive { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; };
-exCon = derive { name="exCon"; version="0.1.9"; sha256="0nqnr21rhhb41nqg55fjhv17qmgjz32hl9yq4gzwihjvb53xkf0z"; depends=[jsonlite]; };
+exCon = derive { name="exCon"; version="0.1.12"; sha256="0zap8jzjxqqg0kzdhjbpn05d5lb4wpvqjdfds15z281gnb19k9hg"; depends=[jsonlite]; };
 exact2x2 = derive { name="exact2x2"; version="1.4.1"; sha256="1a4cg8j8kdgwkj27qza6xm5x16m9sb2vczb1b9im8k4pas6v6jpk"; depends=[exactci ssanv]; };
 exactLoglinTest = derive { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
 exactRankTests = derive { name="exactRankTests"; version="0.8-28"; sha256="1n6rr0wax265y9w341x7m2pqwx3cv8iqx1k5qla29z8lqn4ng1nd"; depends=[]; };
@@ -3456,7 +3518,7 @@ extraBinomial = derive { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n
 extraTrees = derive { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; };
 extrafont = derive { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; };
 extrafontdb = derive { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; };
-extremevalues = derive { name="extremevalues"; version="2.3.0"; sha256="1nn67kgf3qd41nmizkbc2cy3128kajsxbxg03fhfgkjdqa0781lq"; depends=[gWidgets gWidgetstcltk]; };
+extremevalues = derive { name="extremevalues"; version="2.3.1"; sha256="1x1yqm4yif46l9znxba4m8sp3xwj6vrdlqz8jdspqin53jm69gzw"; depends=[gWidgets gWidgetstcltk]; };
 eyetracking = derive { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
 ez = derive { name="ez"; version="4.2-2"; sha256="1dk4ig137ridr4pw4afp3flm22s8l38yrgxabld1zv46slndc8mm"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; };
 ezglm = derive { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; };
@@ -3490,12 +3552,12 @@ fail = derive { name="fail"; version="1.2"; sha256="0xzvb71iq20ah1x1zlb9kbx0r47j
 faisalconjoint = derive { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; };
 falcon = derive { name="falcon"; version="0.1"; sha256="0yas8a8nqdp03s77k5z1xlyz59gapyx68pz0mf6i2snjwpgai59v"; depends=[]; };
 falsy = derive { name="falsy"; version="1.0.1"; sha256="1n2b2h7w7p3vib4vgb9vadd3c07dx12vz5gm8bawbdx7llh2pr24"; depends=[]; };
-fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pklyp2rjn448nl8lx5spjrvycwf4"; depends=[tis]; };
+fame = derive { name="fame"; version="2.21"; sha256="15pcgc67qcg6qkgssbfissicic317v60jsybp86ryqvzqg70cqx3"; depends=[tis]; };
 fanc = derive { name="fanc"; version="1.23"; sha256="01bsny14r3i0a0yxbq3c670vh6m17g0lcjiphm6g5427rkn70whq"; depends=[Matrix]; };
 fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[DiceKriging igraph sensitivity]; };
 fanplot = derive { name="fanplot"; version="3.4.0"; sha256="1arb10jxksicrdpgj8fq8r0sdnzvvdjjbw357aplqh422x54w4mp"; depends=[]; };
 faoutlier = derive { name="faoutlier"; version="0.5"; sha256="1via1gggcj6cpdkyn61fbvlvhl47dwv9hi81x2jlq15lh340ljd4"; depends=[lattice lavaan MASS mirt mvtnorm sem]; };
-far = derive { name="far"; version="0.6-4"; sha256="166lhswdd1shx591wvx8a3lwzjini60mc37rbb3qvm6fxrb6fl55"; depends=[nlme]; };
+far = derive { name="far"; version="0.6-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; };
 faraway = derive { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16v8gcwsbmn8a7p4gb0mm98dncyin5p2a3"; depends=[]; };
 farsi = derive { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; };
 fast = derive { name="fast"; version="0.63"; sha256="00ag9d0dwn9al104y93m8dclbjqabr9liif8gr19v3gv6k2k6p2c"; depends=[zoo]; };
@@ -3510,7 +3572,9 @@ fastcluster = derive { name="fastcluster"; version="1.1.16"; sha256="0x2prrsnqi5
 fastcox = derive { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; };
 fastmatch = derive { name="fastmatch"; version="1.0-4"; sha256="16gfizfb1p7rjybrfm57nb6hdm30iirbppva8p8xf8pndz35fjbs"; depends=[]; };
 fastpseudo = derive { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
+fasttime = derive { name="fasttime"; version="1.0-1"; sha256="1yfxj7k781ks4bx45bmmg1zkfzz7s027h393a0l5h6i5g1z7b81d"; depends=[]; };
 fat2Lpoly = derive { name="fat2Lpoly"; version="1.1.1"; sha256="0xgxlx9m6lgcn784892g2xvnabyq8k45wi3xrszrbdxxa7zqd1i4"; depends=[kinship2 multgee]; };
+favnums = derive { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; };
 fbRanks = derive { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; };
 fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[fgui pbatR rootSolve]; };
 fbroc = derive { name="fbroc"; version="0.2.1"; sha256="06qpdnh86klkbwiv593l57wnbamrmcj5ysabyrbjf9mr8mjzhkkj"; depends=[ggplot2 Rcpp]; };
@@ -3563,7 +3627,7 @@ fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yv
 fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
 fitbitScraper = derive { name="fitbitScraper"; version="0.1.4"; sha256="0shbi5mmr9fw3cc2hn1yzd1ma9kid53ria9pbfkz1pk81n75krj1"; depends=[httr RJSONIO stringr]; };
 fitdistrplus = derive { name="fitdistrplus"; version="1.0-4"; sha256="02ds5vmxc3rk50c33rxdnpqf2hbx186ss6br29n6538q7734nra9"; depends=[survival]; };
-flam = derive { name="flam"; version="2.0"; sha256="10pzjdymcxm5yfqgqc2n99j986585ndxccpfvr4jilq4asf3iiaq"; depends=[MASS Rcpp]; };
+flam = derive { name="flam"; version="3.0"; sha256="0c3j382sa7szqrpd0j8vcg19p6yn18jphd55cbvl0g6z0z76y53p"; depends=[MASS Rcpp]; };
 flare = derive { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[igraph lattice MASS Matrix]; };
 flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
 flexCWM = derive { name="flexCWM"; version="1.5"; sha256="1q6nkw6al56wc53sj719c94iv20a9a82pq4s62jnb2flq1pwdaml"; depends=[adehabitat ellipse Flury MASS mclust mixture mnormt numDeriv statmod]; };
@@ -3575,6 +3639,7 @@ flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1
 flora = derive { name="flora"; version="0.2.4"; sha256="1rdwdx7mphfr7sk3yba0vhbsh3xggz2k6ip8dmfiqjjhv2vxji5k"; depends=[shiny]; };
 flower = derive { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; };
 flowfield = derive { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; };
+flows = derive { name="flows"; version="1.0"; sha256="0bc5xs5dd4np68v7gp7qya37k83mjigjp35i9qsqcxyyvvsyd2jx"; depends=[igraph reshape2 sp]; };
 flsa = derive { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; };
 flux = derive { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
 fma = derive { name="fma"; version="2.01"; sha256="1j5mvhbrdnkyj4svibpahnz7d4221nkhja5b7fnh68mbmil607fc"; depends=[forecast tseries]; };
@@ -3638,6 +3703,7 @@ fun = derive { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayx
 funFEM = derive { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; };
 funHDDC = derive { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; };
 functional = derive { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
+functools = derive { name="functools"; version="0.1.0"; sha256="0vcj376nskpz5a0l2bjrnvarlrc21wwk2w4054da6j63fm6ir8q3"; depends=[]; };
 funreg = derive { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; };
 funtimes = derive { name="funtimes"; version="1.1"; sha256="0z478b57l7hg8b42jyzcdjzs3nn62m2y117xmgbw1gbyf3rcnjkw"; depends=[Jmisc]; };
 futile_any = derive { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; };
@@ -3645,7 +3711,7 @@ futile_logger = derive { name="futile.logger"; version="1.4.1"; sha256="1plld1ic
 futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[futile_logger lambda_r lambda_tools RMTstat]; };
 futile_options = derive { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; };
 futile_paradigm = derive { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
-future = derive { name="future"; version="0.6.0"; sha256="14lsjay59xfdhqhdyz7v2qkwx5zd8hbkgq6l6vnihvm48rzsdg8v"; depends=[globals listenv]; };
+future = derive { name="future"; version="0.7.0"; sha256="0fkaqqwqbg4v4cgsqdsz861g809agz2jmhrs458qqrwx3as3j0gm"; depends=[globals listenv]; };
 fuzzyFDR = derive { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; };
 fuzzyMM = derive { name="fuzzyMM"; version="1.0.1"; sha256="1pqfc9b9l2xx5pl45hfildikqjsdgqfhqzi2nbb34026nla5m8vk"; depends=[frbs igraph osmar rgdal rgeos]; };
 fuzzyRankTests = derive { name="fuzzyRankTests"; version="0.3-7"; sha256="0mhml0zzya58yn4wrafxk62agfrck6rryn5klprr416pj83pzcgk"; depends=[]; };
@@ -3677,7 +3743,7 @@ gWidgetstcltk = derive { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rq
 gains = derive { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; };
 galts = derive { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[DEoptim genalg]; };
 gam = derive { name="gam"; version="1.12"; sha256="00rx8y7pcxabwjvg0ch6c76xqs43drjg3ih3kflqxdcl2rmaapnd"; depends=[foreach]; };
-gamair = derive { name="gamair"; version="0.0-8"; sha256="11qwmhrzks8gi9is2n9xcy6cviy7a8mwh2v78fw78x7g7ccd8i9x"; depends=[]; };
+gamair = derive { name="gamair"; version="0.0-9"; sha256="014fkysiyd49q9j0rrqh6wlp4pqz1q8lqgrqjxbp59x2mfhgxhsg"; depends=[]; };
 gambin = derive { name="gambin"; version="1.1"; sha256="197k8j6mvf8236gwg8vvfnskf4hic9y075chsd8214n1nk7i6jmz"; depends=[]; };
 gamboostLSS = derive { name="gamboostLSS"; version="1.1-3"; sha256="1gdsrizr4q5zyfs2g8c8fdwriqz0xrpq9vyy4wd2ywdh5lbi995b"; depends=[mboost]; };
 gamboostMSM = derive { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; };
@@ -3685,14 +3751,14 @@ gamclass = derive { name="gamclass"; version="0.55"; sha256="0nhy1qdc221hsnby8j0
 games = derive { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; };
 gamlr = derive { name="gamlr"; version="1.13-1"; sha256="1y97zsb9shll93f6j7r95296c26dbmxwa1z67ziy0yh4gsgbijc8"; depends=[Matrix]; };
 gamlss = derive { name="gamlss"; version="4.3-5"; sha256="167kpr6gnjfas8w944h7gds9mkhyly0q8kr0aa8crgi8g3j5npkn"; depends=[gamlss_data gamlss_dist MASS nlme survival]; };
-gamlss_add = derive { name="gamlss.add"; version="4.3-3"; sha256="0cs4mcpm0ckaim3g8q7m4yb6y3izqgvndzgkqgrwr75cxz0wd4vh"; depends=[gamlss gamlss_dist mgcv nnet rpart]; };
-gamlss_cens = derive { name="gamlss.cens"; version="4.3.1"; sha256="1y3a4b6n86h0r287065kr574ix0qpc2nnjpp8fp49nbpxwxlz962"; depends=[gamlss gamlss_dist survival]; };
-gamlss_data = derive { name="gamlss.data"; version="4.2-7"; sha256="0g3fmqrwxmj14r0p0ai1adq6cs3bd3ys47gjcja035xjiajg6cs2"; depends=[]; };
-gamlss_demo = derive { name="gamlss.demo"; version="4.3-1"; sha256="04xl2ddf8wg2j8m05y8j5avcgfrr55a7g6m9wzxx4k599m0c7c8i"; depends=[gamlss_dist gamlss_tr rpanel]; };
-gamlss_dist = derive { name="gamlss.dist"; version="4.3-4"; sha256="0aymwh1lrjalravqf6nfz716v4r805aw82dsi0sn2nlb00fi8w2x"; depends=[MASS]; };
-gamlss_mx = derive { name="gamlss.mx"; version="4.3-1"; sha256="1sjm8a44nh88mvscpspyqsp2agjhwibi4kbyizyi78dmzf2sakiq"; depends=[gamlss gamlss_dist nnet]; };
+gamlss_add = derive { name="gamlss.add"; version="4.3-4"; sha256="1sbs6jc7ashmkv8qz953v8paq4783rzw3m82b8ils4qm53ni8m01"; depends=[gamlss gamlss_dist mgcv nnet rpart]; };
+gamlss_cens = derive { name="gamlss.cens"; version="4.3-2"; sha256="0kakgvlx7g8v6wdlnjyganmvpnv8zqr1ml6n2saz913ykn3mkc77"; depends=[gamlss gamlss_dist survival]; };
+gamlss_data = derive { name="gamlss.data"; version="4.3-0"; sha256="072mgyalaspc5x099n6cc16k5ll1ry8f736114ffirf89yvinn0n"; depends=[]; };
+gamlss_demo = derive { name="gamlss.demo"; version="4.3-3"; sha256="01p6abppwbnh2a2ks1g08z4iwq2fxf125y9s4qzssybsn76a3gf3"; depends=[gamlss_dist gamlss_tr rpanel]; };
+gamlss_dist = derive { name="gamlss.dist"; version="4.3-5"; sha256="0qq4nvcbh7s675bk3afv3wm0xdnzcbabdsbln8n16xgyvsiyr4pl"; depends=[MASS]; };
+gamlss_mx = derive { name="gamlss.mx"; version="4.3-2"; sha256="1hq0nv4l8z1iwbldf9vhdsgr0sd6jans90dvjgdvf2z66bvmc9i0"; depends=[gamlss gamlss_dist nnet]; };
 gamlss_nl = derive { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; };
-gamlss_spatial = derive { name="gamlss.spatial"; version="0.2"; sha256="0sjb47gnzrab4y23c0z7cxqq5k46k2rb31lmqws2c9zgf4n7aqbi"; depends=[gamlss gamlss_dist mgcv spam]; };
+gamlss_spatial = derive { name="gamlss.spatial"; version="1.3"; sha256="0mbvllgr5szrxwrr40jbn2c57hplkgpbnbr2v6pszjjygjcys6ga"; depends=[gamlss gamlss_dist mgcv spam]; };
 gamlss_tr = derive { name="gamlss.tr"; version="4.3-1"; sha256="1fdy61i2dmz2qafk92kl9acjbxx5gm8s9kkc8k9nnx6230qg8iq6"; depends=[gamlss gamlss_dist]; };
 gamlss_util = derive { name="gamlss.util"; version="4.3-2"; sha256="13facgyd14jl4j09d446jjzs91zwmv85g22gkyyi1hl4i5v5nfc4"; depends=[gamlss gamlss_dist zoo]; };
 gamm4 = derive { name="gamm4"; version="0.2-3"; sha256="19vy5wik9nh77cm25gp3j3j8w8vinwzx5pv90nzdzvx84yvvf0y3"; depends=[lme4 Matrix mgcv]; };
@@ -3725,7 +3791,7 @@ gee = derive { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxh
 geeM = derive { name="geeM"; version="0.7.4"; sha256="0vxgwx6qx2xhhj217d6x7m5y89r0b9xxdd4k3sw0zgfga133ij7w"; depends=[Matrix]; };
 geepack = derive { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; };
 geesmv = derive { name="geesmv"; version="1.1"; sha256="1xijdjmkg6nw2y1556zbaic969dg23np0wrb9ncknsrhq4aa28pa"; depends=[gee MASS matrixcalc nlme]; };
-geigen = derive { name="geigen"; version="1.5"; sha256="06k4fc7j8asqv1winmz28hb3r8fvlgikrvi064ysvj2fqwh7jnq1"; depends=[]; };
+geigen = derive { name="geigen"; version="1.6"; sha256="1pw5ncnf4a4ckgrhfhh4nvji9i85sjg9q53258ng2w15j37fglic"; depends=[]; };
 geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape coda deSolve digest MASS mvtnorm Rcpp subplex]; };
 gelnet = derive { name="gelnet"; version="1.1"; sha256="1d77v44azqpk6hzi7fl2ba6z3nyzh33xn0yp7ydp86nmf1gcgwlh"; depends=[]; };
 gems = derive { name="gems"; version="1.0.0"; sha256="0h8z3ih24hxdv8bah4xf8f797pnwihby8hj93z6zw5sq9dyszxwa"; depends=[data_table MASS msm plyr]; };
@@ -3753,7 +3819,7 @@ geoBayes = derive { name="geoBayes"; version="0.2.150402"; sha256="123b2xds69clk
 geoCount = derive { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; };
 geoR = derive { name="geoR"; version="1.7-5.1"; sha256="10rxlvlsg2avrf63p03a22lnq4ysyc4zq06mxidkjpviwk1kvzqy"; depends=[MASS RandomFields sp splancs]; };
 geoRglm = derive { name="geoRglm"; version="0.9-8"; sha256="1zncqsw62m0p4a1wchhb8xsf0152z2xxk3c4xqdr5wbzxf32jhvh"; depends=[geoR sp]; };
-geocodeHERE = derive { name="geocodeHERE"; version="0.1.2"; sha256="0sr8r6f41bpi0rncjcf0aydda68wnsrbmqzsgc1f1has2rb1g9p0"; depends=[httr]; };
+geocodeHERE = derive { name="geocodeHERE"; version="0.1.3"; sha256="10b1fgclv3199cglnip5xy0kgi3gi41q9npv7w3kajkrdknnxms4"; depends=[httr]; };
 geojsonio = derive { name="geojsonio"; version="0.1.0"; sha256="17nv7xn80sf2nn6fvmlbnbcgg66n6bh8x725wdfnhk3gg1rb64g5"; depends=[httr jsonlite magrittr maptools rgdal rgeos sp V8]; };
 geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
 geometry = derive { name="geometry"; version="0.3-5"; sha256="1x1dhdbqnq1wi1r4njj3l1g8yag2dig19rna3a5pwf1j1gxbl0i8"; depends=[magic]; };
@@ -3774,7 +3840,7 @@ getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz
 gets = derive { name="gets"; version="0.2"; sha256="0vdg8g588asyzkld9v3rmscx3k727ncxnjzi8qxinlr2zhw9nbcq"; depends=[zoo]; };
 gettingtothebottom = derive { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; };
 gfcanalysis = derive { name="gfcanalysis"; version="1.2"; sha256="147vgv4z14xn0j94g7z0y099gz8xj2yb02r6j3mfi4412dg5f5fp"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; };
-ggExtra = derive { name="ggExtra"; version="0.1.5.2"; sha256="0lad58245x5gn1yqx65rqpbjwy17yrisns6lqnaw5w1ff5bh7s9i"; depends=[ggplot2]; };
+ggExtra = derive { name="ggExtra"; version="0.2.0"; sha256="15h8ijys5fpz1d42d2pcwvwkc4sffdl36g4yavly1skng0k3gc7c"; depends=[ggplot2]; };
 ggROC = derive { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
 ggRandomForests = derive { name="ggRandomForests"; version="1.1.4"; sha256="0h55593mr2x0kvp97rrm1spj17zbr1p9pqrpngsxmp11iahhccqh"; depends=[ggplot2 randomForestSRC reshape2 survival]; };
 ggdendro = derive { name="ggdendro"; version="0.1-15"; sha256="1xa1pswkf7xnrxs1zqw71ws0r6r0nmc2gnc76bd372czfdn4npci"; depends=[ggplot2 MASS]; };
@@ -3802,16 +3868,16 @@ glarma = derive { name="glarma"; version="1.3-0"; sha256="0fp354zxkddc4giynhwjlf
 glasso = derive { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; };
 glba = derive { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; };
 glcm = derive { name="glcm"; version="1.2"; sha256="00bkhd4arvg7ahdr5kfvran46b2sywv9i0rlwalx9pmyvjwnzm5b"; depends=[Rcpp RcppArmadillo]; };
-gld = derive { name="gld"; version="2.3"; sha256="072q79aisvygi1pjndvvn2xaczi1xlpd9sjc4f1xspavy567z09d"; depends=[]; };
+gld = derive { name="gld"; version="2.3.1"; sha256="0zk192wp8q1v4ilwj9wilx9bgl1fcp92hgwqw2qb1c67bacfwy7a"; depends=[]; };
 gldist = derive { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; };
 glinternet = derive { name="glinternet"; version="1.0.0"; sha256="0aa75xq2w64iknbyl6qw9ckk8v64a96xz0ar1mbqd8zhx0xvibyy"; depends=[]; };
 gllm = derive { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; };
 glm2 = derive { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; };
 glmc = derive { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; };
 glmdm = derive { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; };
-glmgraph = derive { name="glmgraph"; version="1.0.1"; sha256="1jzkz2lri7nbxxkryhf95503wd651ic59h6iafkx9ahwpmibyv4l"; depends=[Rcpp RcppArmadillo]; };
+glmgraph = derive { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; };
 glmlep = derive { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; };
-glmm = derive { name="glmm"; version="1.0.3"; sha256="0bs543x9czg8mbgpy0zhgnfll2nrmj8xz5kwkddf3k6hp859h0v8"; depends=[Matrix mvtnorm trust]; };
+glmm = derive { name="glmm"; version="1.0.4"; sha256="0mcdy8aa5dlscrdahnd7jn9ip28jzipp4imv6cyk8fkkmiy60qhx"; depends=[Matrix mvtnorm trust]; };
 glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[abind MASS]; };
 glmmGS = derive { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; };
 glmmLasso = derive { name="glmmLasso"; version="1.3.4"; sha256="14x74640vvyrg72pq19gqb8db7wq97xhc30iakh84fdh1llyykpn"; depends=[minqa]; };
@@ -3821,7 +3887,7 @@ glmnetcr = derive { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrs
 glmpath = derive { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; };
 glmpathcr = derive { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; };
 glmulti = derive { name="glmulti"; version="1.0.7"; sha256="154s72sjp6pz7ki7s4mgn5v62j7h0lfz9mngf40wvmy31da2s8ix"; depends=[rJava]; };
-glmvsd = derive { name="glmvsd"; version="1.2"; sha256="0p99sanr95vcjfyjx7khwd1l59d319j1i49iv3isgsh3fwikhpgf"; depends=[glmnet MASS ncvreg]; };
+glmvsd = derive { name="glmvsd"; version="1.3"; sha256="0grcncw7wisvy3sr7x7w67n30sa6pasvn4869q7bfd0jwbsr3l7k"; depends=[glmnet MASS ncvreg]; };
 glmx = derive { name="glmx"; version="0.1-0"; sha256="0i0p1xk5yk1l274gfr4ijmqnnbq7yyzmi577pb7igwvi3hjn7g7k"; depends=[Formula lmtest MASS sandwich]; };
 globalGSA = derive { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; };
 globalOptTests = derive { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; };
@@ -3834,7 +3900,7 @@ gmailr = derive { name="gmailr"; version="0.6.0"; sha256="1l0lnlq5vrxrab8d9b5hwm
 gmatrix = derive { name="gmatrix"; version="0.2"; sha256="1w83m6q8xflifqqgkkg2my4fkjfjyv0qq4ly8yqk12k77lb03hxq"; depends=[]; };
 gmm = derive { name="gmm"; version="1.5-2"; sha256="1phd8mmfyhjb72a45gavckb3g8qi927hdq0i8c7iw1d28f04lc70"; depends=[sandwich]; };
 gmnl = derive { name="gmnl"; version="1.1"; sha256="1dz7fhacys88hpf13pbqc9ba37qhwspq7j5zqfy1bg4py1hsx1q7"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; };
-gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[gdata MASS]; };
+gmodels = derive { name="gmodels"; version="2.16.2"; sha256="0zf4krlvdywny5p5hnkr0r0hync6dvzc9yy4dfywaxmkpna8h0db"; depends=[gdata MASS]; };
 gmp = derive { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; };
 gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; };
 gnm = derive { name="gnm"; version="1.0-8"; sha256="1581lzkb1v3y0arrq7x1bg7c91cii87bifxcdi1jzyc5rxj261la"; depends=[MASS Matrix nnet qvcalc relimp]; };
@@ -3871,7 +3937,7 @@ greport = derive { name="greport"; version="0.5-3"; sha256="0cd7rqzrk1yb22ksbmva
 greyzoneSurv = derive { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; };
 gridBase = derive { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
 gridDebug = derive { name="gridDebug"; version="0.4-0"; sha256="1nbcdjip6ghnlv0j7cf45bpqdpirwn636pg324f0hgiqj4rifn09"; depends=[gridGraphviz gridSVG]; };
-gridExtra = derive { name="gridExtra"; version="0.9.1"; sha256="15pj5w5wlrf8gw4z01i9j88gk6bm4kni64fpip9icmxkn887y3hx"; depends=[]; };
+gridExtra = derive { name="gridExtra"; version="2.0.0"; sha256="19yyrfd37c5hxlavb9lca9l26wjhc80rlqhgmfj9k3xhbvvpdp17"; depends=[gtable]; };
 gridGraphics = derive { name="gridGraphics"; version="0.1-3"; sha256="09ml9vy4lz0q235xy2m5l8qd3rb3r73gf3bwz35dgn7qcxps8jjp"; depends=[]; };
 gridGraphviz = derive { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; };
 gridSVG = derive { name="gridSVG"; version="1.4-3"; sha256="1jgrhckjbvccp5zqbkkiw9glhdljwxlc8kkr1fgkbrwmsi053iwk"; depends=[RJSONIO XML]; };
@@ -3910,13 +3976,13 @@ gte = derive { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rd
 gtools = derive { name="gtools"; version="3.5.0"; sha256="1xknwk9xlsj027pg0nwiizigcrsc84hdrig0jn0cgcyxj8dabdl6"; depends=[]; };
 gtop = derive { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; };
 gtx = derive { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
-gumbel = derive { name="gumbel"; version="1.05"; sha256="0d7isx7bhvryhaa25kxb4fm58ph81xaqscj19aaqzs8yg79ac2ar"; depends=[]; };
+gumbel = derive { name="gumbel"; version="1.10-1"; sha256="12rkri8bvgjn0ylf1i4k9vpb8mvbasidvx2479kmis2rc1p07qq7"; depends=[]; };
 gvc = derive { name="gvc"; version="0.2.0"; sha256="0d7plcd5yy6xw1i6dvh2df8jg6fcyfd6kjypbflppnbl5n1zab12"; depends=[decompr]; };
 gvcm_cat = derive { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; };
 gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; };
 gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; };
 gwrr = derive { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
-h2o = derive { name="h2o"; version="3.0.0.22"; sha256="0vgm0dn0jgwpg0ak4x62ib8ai891vqqah0fx8sb3kxr0kxy1q0hw"; depends=[RCurl rjson statmod]; };
+h2o = derive { name="h2o"; version="3.0.0.30"; sha256="052m7ba4wgmvbx7bc1d449896ipj7gsgvw2lr07xlbs1zlqadak2"; depends=[RCurl rjson statmod]; };
 h5 = derive { name="h5"; version="0.9.1"; sha256="1q20i5hnfzr88kb63yvvgn7z39cvk514fj2770i29lm71jdph00q"; depends=[Rcpp]; };
 hSDM = derive { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; };
 haarfisz = derive { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
@@ -3953,7 +4019,7 @@ heatmapFit = derive { name="heatmapFit"; version="2.0.2"; sha256="00p39y6x13yxrx
 heavy = derive { name="heavy"; version="0.2-35"; sha256="04aw0r2hgnxf9nsd18q2b5d130vj578nyv5wacivikgfifyy0y39"; depends=[]; };
 helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; };
 helsinki = derive { name="helsinki"; version="0.9.27"; sha256="1vhzlxjkk2hgzjlin9ksvjk3bi2ly5nm4361777m49lb84ncs7dr"; depends=[maptools RCurl rjson sp]; };
-heplots = derive { name="heplots"; version="1.0-15"; sha256="0sl5pqc57lhhh8s8hym0l874saq974hms6vsq7ll6g60rifx4lbq"; depends=[car MASS]; };
+heplots = derive { name="heplots"; version="1.0-16"; sha256="00aj3x864zlzyj52yya7wajjnpwmpgicqvgyx71gnxdkqmv64x40"; depends=[car MASS]; };
 hergm = derive { name="hergm"; version="2.2-2"; sha256="0jshhf57kybrayk94vv7p1sjvhlfcdya6jllaj9kgn46kkvci54p"; depends=[ergm latentnet network sna]; };
 heritability = derive { name="heritability"; version="1.1"; sha256="05vcprf3rk65197njnhw7n5l19hvy7hfp4fdigkwzvch4rnicidf"; depends=[MASS]; };
 hermite = derive { name="hermite"; version="1.1.0"; sha256="184f7iixsmpli5hp4f0frjxfwpxpicjn1yrk6sf8y4il49cx0s4v"; depends=[maxLik]; };
@@ -3982,6 +4048,7 @@ highTtest = derive { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqm
 highfrequency = derive { name="highfrequency"; version="0.4"; sha256="0kzadnkvmxcrb8flsxlx8vd9c2yad7hh1pij05dhdcpaidrc9acq"; depends=[xts zoo]; };
 highlight = derive { name="highlight"; version="0.4.7"; sha256="1gpwj4phq45hhx4x6r8rf6wc6ak6y4fkbad9v23fl8wldb4a8dyg"; depends=[]; };
 highr = derive { name="highr"; version="0.5"; sha256="0jnab5pk5sg4f5krsg5jdamr4y40z2pzxhp5h6fb6wys3m75hzny"; depends=[]; };
+highriskzone = derive { name="highriskzone"; version="1.2"; sha256="1kv8w1p3d8p9asigcpc713qwy91hiqb2qsw592sr9zy1nr5ax6gc"; depends=[deldir fields ks Matrix rgeos spatstat]; };
 hillmakeR = derive { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
 hint = derive { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
 hisemi = derive { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[fda Iso Matrix]; };
@@ -3989,16 +4056,16 @@ hisse = derive { name="hisse"; version="1.1"; sha256="1f35an1zfsy9ziqqb02fss2kss
 histmdl = derive { name="histmdl"; version="0.4-1"; sha256="0kiz95hdi658j5s7aqlf8n9k35s30pshc5nymif88gjik9gvrxd0"; depends=[]; };
 histogram = derive { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; };
 historydata = derive { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; };
-hitandrun = derive { name="hitandrun"; version="0.5-1"; sha256="0qgja0xw6687hr9qw4cwl9gq1vbv8gdnh6fkq2wx5cahgjz1p3bj"; depends=[rcdd]; };
+hitandrun = derive { name="hitandrun"; version="0.5-2"; sha256="0451rdnp3b4fcdv4wwdxv3wplkxqmidxh4v5n1jjxinnzvl5dv9a"; depends=[rcdd]; };
 hive = derive { name="hive"; version="0.2-0"; sha256="0ywakjphy67c4hwbh6prs4pgq5ifd8x8inxjkigjiqz6jx3z852v"; depends=[rJava XML]; };
 hmeasure = derive { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; };
 hmm_discnp = derive { name="hmm.discnp"; version="0.2-3"; sha256="1r9xxgsqh5pw9incldaxnsqhyanhd4jwm6w0ix1k43i53dw4diyr"; depends=[]; };
 hmmm = derive { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[MASS mvtnorm quadprog]; };
 hnp = derive { name="hnp"; version="1.0"; sha256="1sxbgz57js1vxhz309dnj6jhw4y6c0pzk0a9xk8avacicnv0bxhr"; depends=[MASS]; };
-hoa = derive { name="hoa"; version="2.1.1"; sha256="0ph83z28200q488nj5zbprzxxh7nskp0rx62s1qngai2iy4zfnj8"; depends=[statmod survival]; };
+hoa = derive { name="hoa"; version="2.1.2"; sha256="1y3fg19k8naysbkpg5cxivk9xcck9l1ws27virbdacblc4xfqmpc"; depends=[statmod survival]; };
 hoardeR = derive { name="hoardeR"; version="0.1"; sha256="1a3kf676mchrla9g0b619dx09ihxvlmahgwlbwqny6zwr49w7vzl"; depends=[httr MASS R_utils stringr XML]; };
 holdem = derive { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; };
-homals = derive { name="homals"; version="1.0-5"; sha256="1azrwvdzn379in2sz9d94w2f2xp0d6iiayrv0bws44kvdzr95aqm"; depends=[ape rgl scatterplot3d]; };
+homals = derive { name="homals"; version="1.0-6"; sha256="1xfpb6mxfk18ad2fggljr2g01gy4c290axc3vgwngmmimmcvh4cy"; depends=[ape rgl scatterplot3d]; };
 homeR = derive { name="homeR"; version="0.1"; sha256="0yq93b3wkgbnwzpyhx9c73sb9xgz7m3z4p5rflk3lmc0p53h81g5"; depends=[]; };
 homtest = derive { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; };
 hornpa = derive { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; };
@@ -4010,11 +4077,12 @@ hpoPlot = derive { name="hpoPlot"; version="2.0"; sha256="080jzi1zw510clbbkmf2wk
 hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
 hqreg = derive { name="hqreg"; version="0.9"; sha256="1091qrs31iabnms0z15f1mliaq69k9snxsscfizh8rws2vqhrjvr"; depends=[]; };
 hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
-hsdar = derive { name="hsdar"; version="0.2.1"; sha256="0353601af5n8dkz7adxzqig30pwbli2yvb5lx5lb5ihaq706yr51"; depends=[raster rgdal rootSolve signal sp]; };
+hsdar = derive { name="hsdar"; version="0.3.0"; sha256="1bv7bw27ybw9fkbzk3q0scs8y19maj7321mlcwhgp91xykcp01wg"; depends=[raster rgdal rootSolve signal sp]; };
 hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
 hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
 hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[Rcpp RcppArmadillo snowfall]; };
 htmlTable = derive { name="htmlTable"; version="1.3"; sha256="00zcismapanyb68657gng5l6g3hsmpls84naracshj4gfk2l1cfs"; depends=[knitr magrittr stringr]; };
+htmltab = derive { name="htmltab"; version="0.6.0"; sha256="00171fsdgv3rks6j4i5w8rbk2kar2rbmqqpqrr2xdxkjqxsf6k4b"; depends=[httr XML]; };
 htmltools = derive { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; };
 htmlwidgets = derive { name="htmlwidgets"; version="0.5"; sha256="1d583kk7g29r4sq0y1scri7fs48z6q17c051nyjywcvnpy4lvi8j"; depends=[htmltools jsonlite yaml]; };
 hts = derive { name="hts"; version="4.5"; sha256="1bjribmfczkx139z73b0cl3lzlw5n2byyyc5inqv9qgayz0dc6cp"; depends=[forecast Matrix Rcpp RcppEigen SparseM]; };
@@ -4029,7 +4097,7 @@ hwriter = derive { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqb
 hwriterPlus = derive { name="hwriterPlus"; version="1.0-3"; sha256="1sk95qgpyxwk1cfkkp91qvn1iklad9glrnljdpidj20lnmpwyikx"; depends=[hwriter TeachingDemos]; };
 hwwntest = derive { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; };
 hybridEnsemble = derive { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[ada AUC e1071 FNN genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; };
-hybridHclust = derive { name="hybridHclust"; version="1.0-4"; sha256="1967p6crkrbnlfghd9x1alr2x57nqjl1zh58hhyshgla3xmdmhx5"; depends=[cluster]; };
+hybridHclust = derive { name="hybridHclust"; version="1.0-5"; sha256="0w06vna66hlmvx10dl1l0nzbnxkd634gxjz26w015f83vpmfc5vz"; depends=[cluster]; };
 hydroApps = derive { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; };
 hydroGOF = derive { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizyzkbw0b2zdhnb3x9h965d94ygzg8nw5kbak"; depends=[hydroTSM xts zoo]; };
 hydroPSO = derive { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc lattice lhs sp zoo]; };
@@ -4061,7 +4129,7 @@ iWeigReg = derive { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6q
 ibd = derive { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxanzj291vdf7ailn7300p1ms"; depends=[car lpSolve lsmeans MASS multcompView]; };
 ibdreg = derive { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; };
 ibeemd = derive { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; };
-ibelief = derive { name="ibelief"; version="1.1"; sha256="164cd68qq0z68n5j0b192krpk73y8cy15wr5wnb52rzxv5k7rfd4"; depends=[]; };
+ibelief = derive { name="ibelief"; version="1.2"; sha256="1zh6bpg0gaybslr1p05qd5p2y5kxbgyhgha4j4v5d69d78jwgah9"; depends=[]; };
 ibmdbR = derive { name="ibmdbR"; version="1.36.7"; sha256="0v6l8cm0sww2gm8yal4ffk2wcxfnvfsd76i92f2khank7bhga06r"; depends=[MASS RODBC]; };
 ibr = derive { name="ibr"; version="1.4.5"; sha256="0nw2j232br06l30v3cn4qcr25vbh911v2mz7nfail40sqxc6wwc4"; depends=[]; };
 ic_infer = derive { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[boot kappalab mvtnorm quadprog]; };
@@ -4072,7 +4140,7 @@ icamix = derive { name="icamix"; version="1.0.2"; sha256="0rpqx9q5p3nb5gd76zlkql
 icapca = derive { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
 iccbeta = derive { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp RcppArmadillo]; };
 icd9 = derive { name="icd9"; version="1.2"; sha256="0d0dgd5951chyfimzjb00cphdvqzml8p8wr7sad3qfhv44dsypn7"; depends=[checkmate Rcpp]; };
-icenReg = derive { name="icenReg"; version="1.2.5"; sha256="1qw0c0y0hykb79p55lnvjk9zbxr0gva299i46cj8clcwyh2ivfga"; depends=[foreach survival]; };
+icenReg = derive { name="icenReg"; version="1.2.7"; sha256="0rhsqbnpfd8zbc3mvnb5qlsvvgwfp1jd9mc0k78c76avj1inchbi"; depends=[foreach survival]; };
 icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp]; };
 icsw = derive { name="icsw"; version="0.9"; sha256="0lmq9l9sy0fz3yjj2sj8f19iy26913caibf7d9zb9w9n6cqskvlx"; depends=[]; };
 idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
@@ -4081,12 +4149,13 @@ idm = derive { name="idm"; version="1.0"; sha256="001zvhw38qgq1l66yxz5kchvjspijd
 idr = derive { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; };
 ieeeround = derive { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; };
 ifa = derive { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; };
+ifaTools = derive { name="ifaTools"; version="0.6"; sha256="0yzwz5dq4plhqkd699wrfgas9rsk0qj799bay9vkxh3cgbs73gbi"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; };
 ifctools = derive { name="ifctools"; version="0.3.1"; sha256="0lr1d4z2gzninqchfzmmmymd0ngywrjpbh7bvd6qgxkzabf9yxxx"; depends=[]; };
 ifs = derive { name="ifs"; version="0.1.4"; sha256="0fzani8rnn4rdwlghq967hhi4zfjnk3gwpk3v6wys738xj7yfwp1"; depends=[]; };
 ifultools = derive { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgjq71w9xlfsr4y9aqfw7y0jf6gydaz4y6jq9b9"; depends=[MASS splus2R]; };
 ig_vancouver_2014_topcolour = derive { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; };
 igraph = derive { name="igraph"; version="1.0.1"; sha256="00jnm8v3kvxpxav5klld2z2nnkcpj4sdwv4ksipddy5mp04ysr6w"; depends=[irlba magrittr Matrix NMF]; };
-igraphdata = derive { name="igraphdata"; version="1.0.0"; sha256="1b8almybmsgmjhp6lhxqqbv34kn2hpw9b08g911ip89hmlypd97s"; depends=[]; };
+igraphdata = derive { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; };
 igraphtosonia = derive { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
 ihs = derive { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; };
 iki_dataclim = derive { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[climdex_pcic lubridate PCICt zoo]; };
@@ -4097,7 +4166,8 @@ imprProbEst = derive { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b7
 imputeLCMD = derive { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[impute norm pcaMethods tmvtnorm]; };
 imputeMDR = derive { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; };
 imputeR = derive { name="imputeR"; version="1.0.0"; sha256="18rx70w7xb33m84ifxl3p599js78pa748c9lmlkic6yqrgsabcip"; depends=[caret Cubist gbm glmnet mboost pls rda reshape2 ridge rpart]; };
-in2extRemes = derive { name="in2extRemes"; version="1.0-1"; sha256="0k5qczs54b7bl71my8xmnqly91g7c5skj0lm2g8dk4hgrx6wwsrf"; depends=[extRemes]; };
+imputeTS = derive { name="imputeTS"; version="0.1"; sha256="0sq2qkvzvzk4iglzhm802b3fmvm1iqvc3g32pld6qs0pv5b6n04q"; depends=[]; };
+in2extRemes = derive { name="in2extRemes"; version="1.0-2"; sha256="10ngxv4zsh78gm3xwb22m681nhl2qbnzi4fkqwgjj2iz46ychzvy"; depends=[extRemes]; };
 inTrees = derive { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[arules gbm RRF xtable]; };
 inarmix = derive { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; };
 indicoio = derive { name="indicoio"; version="0.3"; sha256="04c2j4l103fiiibf83z7iq95wfnlv9rj46cyp9xy68bzqkbwdi3m"; depends=[httr png rjson stringr]; };
@@ -4106,7 +4176,7 @@ ineq = derive { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy
 inference = derive { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
 inferference = derive { name="inferference"; version="0.4.62"; sha256="12iag6l2digxb056qc765xi27ayc4qyqdqzbhxscr8a5lxfkdn4p"; depends=[Formula lme4 numDeriv]; };
 inflection = derive { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgplfyjs3q1iqgb5hyk9czxqrjiy18g8p7zdln2"; depends=[]; };
-influence_ME = derive { name="influence.ME"; version="0.9-5"; sha256="0sjrajhc198g391xa78l4gicmpyq4h7dnrnncji3qpgbqi772pkn"; depends=[lattice lme4 Matrix]; };
+influence_ME = derive { name="influence.ME"; version="0.9-6"; sha256="1pfp26dmqs6abb2djf9yn5jk4249vi8ldahpc2xrr0mr3l17g06g"; depends=[lattice lme4 Matrix]; };
 influence_SEM = derive { name="influence.SEM"; version="1.5"; sha256="0h920pxa3sk6y7ipkihxm78i06alm5rmlmn5pr937j7abgypkk3p"; depends=[lavaan]; };
 infoDecompuTE = derive { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; };
 informR = derive { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; };
@@ -4129,14 +4199,14 @@ interAdapt = derive { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm
 interferenceCI = derive { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
 intergraph = derive { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; };
 internetarchive = derive { name="internetarchive"; version="0.1.2"; sha256="08gbkqbzx963c1jy3a540fsd0ff9ylr7la1clwjn46lp4cc4yv1h"; depends=[dplyr httr jsonlite]; };
-interplot = derive { name="interplot"; version="0.1.0.1"; sha256="0a5n4s35v4vxfcynq9dpymc9dfwr0p1zf2974yljgsh5az6iarjk"; depends=[abind arm ggplot2]; };
+interplot = derive { name="interplot"; version="0.1.0.2"; sha256="031zpni88akhdjwrava9xf3k9x7vsldsi3dxjaj5x6q48a6gh19x"; depends=[abind arm ggplot2]; };
 interpretR = derive { name="interpretR"; version="0.2.3"; sha256="1y2j91dm0p6yy9qwkllmlmk8n2b9ics4d40cmq8b0fk3rk61vh59"; depends=[AUC randomForest]; };
 interval = derive { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; };
 intervals = derive { name="intervals"; version="0.15.0"; sha256="0lvxaq5ia7hj65n00awz454a2vdxpskxjw45wsakgh0sc60hk8yz"; depends=[]; };
 interventionalDBN = derive { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
 intpoint = derive { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97q1w5ddrv227846gy9a68h6sgwc0ps88b"; depends=[]; };
 introgress = derive { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; };
-intsvy = derive { name="intsvy"; version="1.6"; sha256="1bv8qap3d8yssfm80ilrn6wg3207hiy34sd92wl64bwpvqyi6i7p"; depends=[foreign ggplot2 memisc plyr reshape]; };
+intsvy = derive { name="intsvy"; version="1.7"; sha256="1q3z8wk809ixnqmhfy4l075km0flsdp3x1m8xqg5ccgwnvdi9igf"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; };
 invGauss = derive { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[optimx survival]; };
 investr = derive { name="investr"; version="1.3.0"; sha256="057wq6c5r7hrg1nz7460alsjsk83cvac2d1d4mjjx160q3m0zcvj"; depends=[nlme]; };
 io = derive { name="io"; version="0.2.2"; sha256="07vifr1h8ldiam8ngp6yrx6mvdnmmnnsq3hcs2pyphws6hgdmwwh"; depends=[filenamer stringr]; };
@@ -4146,9 +4216,9 @@ ipdmeta = derive { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86
 ipdw = derive { name="ipdw"; version="0.2-2"; sha256="1mvxs1039hv9m36jhi11qvjysmpmh7ms522q9phwmljv2nnl7ylz"; depends=[gdistance raster sp]; };
 ipfp = derive { name="ipfp"; version="1.0"; sha256="1hpfbgygnpnl3fpx7zl728jyw00y3kbbc5f0d407phm56sfqmqwi"; depends=[]; };
 iplots = derive { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[png rJava]; };
-ipred = derive { name="ipred"; version="0.9-4"; sha256="0rig1sj0jqv2rrkgcr6fhr8477wxirxwnwk533l7rn6qr90prjwp"; depends=[class MASS nnet prodlim rpart survival]; };
+ipred = derive { name="ipred"; version="0.9-5"; sha256="193bdx5y4xlb5as5h59lkakrsp9m0xs5faqgrp3c85wfh0bn8iis"; depends=[class MASS nnet prodlim rpart survival]; };
 ips = derive { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; };
-iptools = derive { name="iptools"; version="0.2.0"; sha256="010vqz8rnaljjk0prcbsx25aqkrr78x32vcbx8589vwlvy10ka0f"; depends=[BH Rcpp]; };
+iptools = derive { name="iptools"; version="0.2.1"; sha256="1754i1pqs18x2as2vlfn6vi6j7q4s6n25k2bizv8h83bc316cjp2"; depends=[BH Rcpp]; };
 iqLearn = derive { name="iqLearn"; version="1.3"; sha256="05f2spnzyqzbbgwz9llf4x5r6fsz5gxa1ckykv6wxg4sirdqccm1"; depends=[]; };
 irace = derive { name="irace"; version="1.06"; sha256="10dizzjds1aszvyh0fn6ahqvgn2x6sg3lwb7rca8zhgphrjg92bl"; depends=[]; };
 irlba = derive { name="irlba"; version="1.0.3"; sha256="1h2ymk9hg9xj2075w715742j23jl7kqa4cgzl1jvr48gcysq5byy"; depends=[Matrix]; };
@@ -4163,7 +4233,7 @@ ismev = derive { name="ismev"; version="1.40"; sha256="1isxgq62q6dk50c3w1l0j4nfg
 isocir = derive { name="isocir"; version="1.1-3"; sha256="1bx68n9wyfs2dcgph66rsy0jw8hjkl5kw212l0563kz3m1nik9sr"; depends=[circular combinat]; };
 isopam = derive { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; };
 isopat = derive { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; };
-isotone = derive { name="isotone"; version="1.0-2"; sha256="0qcad691c1dk61a75813hxbc61jllvfc3j21gn85f0kcf4hn6dnz"; depends=[]; };
+isotone = derive { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; };
 isotonic_pen = derive { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
 isva = derive { name="isva"; version="1.8"; sha256="09mrvvk09j460dzi45z8hwdpmibfshsii5dcp38g13czr40d48na"; depends=[fastICA qvalue]; };
 iteRates = derive { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; };
@@ -4188,6 +4258,7 @@ jaatha = derive { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0b
 jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; };
 jagsUI = derive { name="jagsUI"; version="1.3.7"; sha256="1zdrqxzjip4lgf99b4z76gvlhbmh0gcbkpghrlrj3j25wqzgn5y0"; depends=[coda lattice rjags]; };
 james_analysis = derive { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; };
+jetset = derive { name="jetset"; version="3.1.3"; sha256="1m19p99ghh3rb0kgbwnyg0aaq011xcsrcf0llnbs9j5l2ziwvg4x"; depends=[AnnotationDbi]; };
 jiebaR = derive { name="jiebaR"; version="0.5"; sha256="1x41jqc1ai3v1fn9f65dk7k4g2llf3pk9z3bwqihb95qf80mhd4v"; depends=[jiebaRD Rcpp]; };
 jiebaRD = derive { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
 jmetrik = derive { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; };
@@ -4202,10 +4273,10 @@ jsonlite = derive { name="jsonlite"; version="0.9.16"; sha256="12whrj9shnf8wd3a5
 jtrans = derive { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
 kSamples = derive { name="kSamples"; version="1.0.1"; sha256="11qylllwpm3rhrzmdlkbdqixpmx4qlvgmfwp9s4jfy5h3q68mfw7"; depends=[SuppDists]; };
 kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; };
-kappalab = derive { name="kappalab"; version="0.4-6"; sha256="0dmzy0d7azzfpnzbf8b7a6zgmmfwzfiybz8610asajyfsj36gszl"; depends=[kernlab lpSolve quadprog]; };
+kappalab = derive { name="kappalab"; version="0.4-7"; sha256="16bwbwwqmq2w7vy8p3wg0y80wfgc8q5l1ly1mqh51xi240z1qmq0"; depends=[kernlab lpSolve quadprog]; };
 kaps = derive { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; };
 kcirt = derive { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; };
-kdecopula = derive { name="kdecopula"; version="0.0.2"; sha256="11cg9avdsdrkffbapxm9qskr0xplvs1djzrpk8gp5wknvmlg483z"; depends=[cubature lattice locfit Rcpp RcppArmadillo VineCopula]; };
+kdecopula = derive { name="kdecopula"; version="0.0.3"; sha256="14n8hf1y49582p8dgmw7qj71nl9m75bjgjp7jxirj6azm8nfdx7z"; depends=[cubature lattice locfit Rcpp RcppArmadillo VineCopula]; };
 kdetrees = derive { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; };
 kedd = derive { name="kedd"; version="1.0.2"; sha256="11mfgjr1pl56y4rcychs8xjgazy3vhg1xasr37fd0g32g7w3lxqg"; depends=[]; };
 kelvin = derive { name="kelvin"; version="1.2-2"; sha256="0fl2yxc0dpmkhq3f7711gd08i7jlzlfncin1d6q251dfnmwd7rzf"; depends=[Bessel]; };
@@ -4215,7 +4286,7 @@ kergp = derive { name="kergp"; version="0.1.0"; sha256="00p3iziz6kjm1v7rpqa2lls1
 kernelFactory = derive { name="kernelFactory"; version="0.2.2"; sha256="1ms6732s17vx120xr2l423qmj0h880r522zsgp474pq3fxc0mr48"; depends=[AUC genalg kernlab randomForest]; };
 kernlab = derive { name="kernlab"; version="0.9-20"; sha256="0gwl3v8gxidzfmvwa2icqla8ypdgnmvcwxf54iwrvvy2csjx0w27"; depends=[]; };
 keypress = derive { name="keypress"; version="1.0.0"; sha256="16msbanmbv2kf09qvl8bd9rf1vr7xgcjzjhzngyfyxv90va3k86b"; depends=[]; };
-kfigr = derive { name="kfigr"; version="1.1.0"; sha256="1mnnd603s741h1vp99q6d8lwvc46k9hmbhylng66wc7a5j6k8psz"; depends=[knitr]; };
+kfigr = derive { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; };
 kimisc = derive { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; };
 kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj87klwm6h7cdqi61ba6y0cg9k1hgbc1ajy3s8"; depends=[survival]; };
 kineticF = derive { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; };
@@ -4224,7 +4295,7 @@ kinship2 = derive { name="kinship2"; version="1.6.0"; sha256="06f544yk61i1xq0rm0
 kintone = derive { name="kintone"; version="0.1.1"; sha256="13c82vkapks9j2crrb4awnhl60ld8b1r7xmy9yv4zzch868kcl5g"; depends=[RCurl rjson]; };
 kissmig = derive { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; };
 kitagawa = derive { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; };
-kknn = derive { name="kknn"; version="1.2-5"; sha256="0c1qnn1lnypjybk2p0dpfrg6hzxflzbwmjb5biq45r57bzji7im7"; depends=[igraph Matrix]; };
+kknn = derive { name="kknn"; version="1.3.0"; sha256="17lg3dy5b4vs7g6d83ai9chz94sm6bla9rk42gzyqlf9n341cji4"; depends=[igraph Matrix]; };
 klaR = derive { name="klaR"; version="0.6-12"; sha256="10nkqb1zradbvifgv1fm373mhyydgdjjgmnw2442a2lark59z3vs"; depends=[combinat MASS]; };
 klausuR = derive { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; };
 klin = derive { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; };
@@ -4280,6 +4351,7 @@ lambda_r = derive { name="lambda.r"; version="1.1.7"; sha256="1lxzrwyminc3dfb07p
 lambda_tools = derive { name="lambda.tools"; version="1.0.7"; sha256="1hskmsd51lvfc634r6bb23vfz1vdkpbs9zac3a022cgqvhvnbmxb"; depends=[lambda_r]; };
 landpred = derive { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; };
 landsat = derive { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[lmodel2 mgcv rgdal sp]; };
+landsat8 = derive { name="landsat8"; version="0.1-9"; sha256="027p4cpxnx25m77z0n5kl4rs0zywwskv7ncfky0fldffg7mqaq42"; depends=[rgdal sp]; };
 languageR = derive { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; };
 lar = derive { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; };
 lars = derive { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; };
@@ -4289,8 +4361,8 @@ lassoscore = derive { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47r
 lassoshooting = derive { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
 latdiag = derive { name="latdiag"; version="0.2-1"; sha256="1xjy6as3wjrl2y1lc5fgrbhqqcvrhdan89mpgvk9cpx71wxv95vc"; depends=[]; };
 latentnet = derive { name="latentnet"; version="2.7.1"; sha256="0bjac9cid11pmhmi2gb4h3p4h9m57ngxx7p73a07afmfjk9p7h5m"; depends=[abind coda ergm mvtnorm network sna statnet_common]; };
-latex2exp = derive { name="latex2exp"; version="0.3.1"; sha256="09sk3zs5ip4xm3q7pzhmp7nnwjkwr5x1v4y1afccl6px04qdkd6j"; depends=[magrittr stringr]; };
-lattice = derive { name="lattice"; version="0.20-31"; sha256="1b3m3rg1zd8ssk5jjswk5y93js89vh6939kfajh6i6wphndxigb1"; depends=[]; };
+latex2exp = derive { name="latex2exp"; version="0.3.2"; sha256="1k5np32a71x1yc363dnvnb960j995j3bji8qvlskkfcnzrd3wckg"; depends=[magrittr stringr]; };
+lattice = derive { name="lattice"; version="0.20-33"; sha256="0car12x5vl9k180i9pc86lq3cvwqakdpqn3lgdf98k9n2h52cilg"; depends=[]; };
 latticeDensity = derive { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[spam spatstat spdep splancs]; };
 latticeExtra = derive { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[lattice RColorBrewer]; };
 lava = derive { name="lava"; version="1.4.1"; sha256="1xwyfn31nr8sppxy25a7p8yhf5isq4ah0dd45plhfclnlwrycr1l"; depends=[numDeriv]; };
@@ -4301,6 +4373,7 @@ lawn = derive { name="lawn"; version="0.1.0"; sha256="0vv2qmz6a692ammh3jxnpq3b66
 lawstat = derive { name="lawstat"; version="3.0"; sha256="0398bf4jv0gnq54v6m7zl5sixspnvfwc3x3z492i38l215pc38kx"; depends=[Hmisc Kendall mvtnorm VGAM]; };
 lazy = derive { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; };
 lazyData = derive { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; };
+lazyWeave = derive { name="lazyWeave"; version="3.0.0"; sha256="1ic05ph55krmzg34fx1gnp1l0198chj0lpm8pnaml36ng7ashwd9"; depends=[Hmisc]; };
 lazyeval = derive { name="lazyeval"; version="0.1.10"; sha256="02qfpn2fmy78vx4jxr7g7rhqzcm1kcivfwai7lbh0vvpawia0qwh"; depends=[]; };
 lba = derive { name="lba"; version="1.2"; sha256="0zfln5dc4v3yaqgdbg22nq3z2by7jnbbi9mwwwvkr4j1z70knpqg"; depends=[alabama ca MASS plotrix]; };
 lbfgs = derive { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; };
@@ -4323,7 +4396,7 @@ learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0p
 learnstats = derive { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; };
 lefse = derive { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; };
 leiv = derive { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
-lessR = derive { name="lessR"; version="3.3.1"; sha256="1nwvkxi9q7fsjgrfpa16ry54cyk2ja5cy4cq0xzqya6wn04mbicg"; depends=[car foreign gdata leaps MBESS triangle]; };
+lessR = derive { name="lessR"; version="3.3.3"; sha256="19044vgjhcsgmmxidgbc7r43d7fg4dg5q3qyf3yzza3iy681wgrn"; depends=[car foreign leaps MBESS readxl sas7bdat triangle]; };
 lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
 letsR = derive { name="letsR"; version="2.1"; sha256="0jgc6k2hbpbr7kl42n01mff7pzjz60zd8mchrfhzgd797pwcqlbq"; depends=[fields geosphere maps maptools raster rgdal sp XML]; };
 lfactors = derive { name="lfactors"; version="0.4.0"; sha256="1f4p5mp6m11njrj421vjl5398laicgyg8m04srshfmpi74hf1nb9"; depends=[]; };
@@ -4336,7 +4409,8 @@ lgcp = derive { name="lgcp"; version="1.3-9"; sha256="093rxvb4irmf04nx1j5zrgh8k0
 lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; };
 lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; };
 libamtrack = derive { name="libamtrack"; version="0.6.2"; sha256="1wmy3baqbmmzc4w1b3w2z3qvsi61khl6a6rlc22i58gnprmgzrph"; depends=[]; };
-lifecontingencies = derive { name="lifecontingencies"; version="1.1.6"; sha256="07gvq93p2f8s4a43h596xmzifnx1jwnfyg5giqhlfvxnq6wdbvrr"; depends=[markovchain Rcpp]; };
+lifecontingencies = derive { name="lifecontingencies"; version="1.1.9"; sha256="1cl1jv0a9016vpqa5an3fh716hciyk7knbfg4gd7hvixg1y1avgd"; depends=[markovchain Rcpp]; };
+liftr = derive { name="liftr"; version="0.1"; sha256="0kmkyxp28n3ha1iic97bdd2czfmqbbn2dnjwffs29xjcs32m9z9s"; depends=[knitr rmarkdown yaml]; };
 likeLTD = derive { name="likeLTD"; version="5.5.0"; sha256="111wdszkk2bdi9sz6gfih32kib0ig9bp4xlq6wl5r5zx3nrlj5zb"; depends=[DEoptim gdata ggplot2 gtools rtf]; };
 likelihood = derive { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; };
 likelihoodAsy = derive { name="likelihoodAsy"; version="0.40"; sha256="1zgqs9pcsb45s414kqbhvsb9cxag0imla682981lqvrbli13p2kg"; depends=[alabama cond nleqslv pracma Rsolnp]; };
@@ -4345,7 +4419,7 @@ limSolve = derive { name="limSolve"; version="1.5.5.1"; sha256="0anrbhw07mird9fj
 limitplot = derive { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; };
 linLIR = derive { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; };
 linbin = derive { name="linbin"; version="0.1.0"; sha256="0812m19kfscb0d23rv0llziapd269r7zlm2yq8h3yp8c8jl8gdb1"; depends=[]; };
-lineup = derive { name="lineup"; version="0.34-1"; sha256="0p6gxbv8xdrhgk8zdlnqrybald9vqz717czb49b123h84rjr2f19"; depends=[class qtl]; };
+lineup = derive { name="lineup"; version="0.37-6"; sha256="1xyvw00lwnx7j3cgk4aw69lam6ndjxx3wj14h4jpx1xn8l3w7652"; depends=[class qtl]; };
 linkR = derive { name="linkR"; version="1.0.1"; sha256="0ayscl0i4flh31l5j8730h5lpqi30p8f2l3nvbd3i2mhp54gpcdx"; depends=[svgViewR]; };
 linkcomm = derive { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; };
 linkim = derive { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
@@ -4361,7 +4435,7 @@ llama = derive { name="llama"; version="0.8.1"; sha256="0pv411kj4n3pi2yg35jzjd4z
 lle = derive { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[MASS scatterplot3d snowfall]; };
 lllcrc = derive { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[combinat data_table plyr VGAM]; };
 lm_beta = derive { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; };
-lm_br = derive { name="lm.br"; version="2.6"; sha256="1f7cxd6ksspgpz2lnppyb466lgis5isk0bj8z4bjiwk4abg4lg3i"; depends=[Rcpp]; };
+lm_br = derive { name="lm.br"; version="2.7"; sha256="09b9f6c7gkkmznypr74f4fdhkkdw7fzpa9gdyx2cl7pj6sg4fvjy"; depends=[Rcpp]; };
 lmSupport = derive { name="lmSupport"; version="2.9.2"; sha256="0mdl5ih7zzxynawxx4prh08nq451x74bfw4ga7cygl2ahi6vqq50"; depends=[AICcmodavg car gvlma lme4 pbkrtest psych]; };
 lme4 = derive { name="lme4"; version="1.1-8"; sha256="0ag9rhdb7q3rsmd8qc7iq88cc0lbmkng2q0pfvdp9cg6lczi0zr0"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
 lmeNB = derive { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; };
@@ -4369,14 +4443,14 @@ lmeNBBayes = derive { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151x
 lmeSplines = derive { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; };
 lmeVarComp = derive { name="lmeVarComp"; version="1.0"; sha256="17zrl33h4lcd8lpdv3d12h5afj8nxr2lyw6699zq4fds2chbq66l"; depends=[]; };
 lmec = derive { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; };
-lmenssp = derive { name="lmenssp"; version="1.0"; sha256="0a1q9ax0pnz9gcv4nzgay9lznaz9gp27jj6vp6la7vfhrfg5qcg6"; depends=[MASS nlme]; };
-lmerTest = derive { name="lmerTest"; version="2.0-25"; sha256="13psyrll5srxahyk4fhp77fds9mxgnargpv2wxjpy3cv8f5b1vpm"; depends=[ggplot2 Hmisc lme4 MASS Matrix plyr]; };
+lmenssp = derive { name="lmenssp"; version="1.1"; sha256="1s0v5fmzmiq271d3x8l83ni7rl7ikw40mqwhhd2xh21a3nrcdw6l"; depends=[geoR MASS mvtnorm nlme]; };
+lmerTest = derive { name="lmerTest"; version="2.0-29"; sha256="01xx4ddy5qgw4ipj4yvqawz33wg71crw02m6kdg75lh7mizq60fm"; depends=[ggplot2 Hmisc lme4 MASS Matrix plyr]; };
 lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; };
 lmfor = derive { name="lmfor"; version="1.1"; sha256="0bbcgpcx0xjla128w80xlxp6i6hnrk4wjwqih66zvyjaf5sz7wx9"; depends=[MASS nlme]; };
 lmm = derive { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; };
 lmmlasso = derive { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; };
 lmmot = derive { name="lmmot"; version="0.1.2"; sha256="1c7cn1g1fl8nwjzm78a8qgw9da170f1q0z5vxl446f167ix5ppkp"; depends=[MASS maxLik]; };
-lmms = derive { name="lmms"; version="1.2"; sha256="12wli7iwnihq42pa1jy1ml4y3l93grwrv9n7vpgp5wp1hj4d1s8c"; depends=[gdata ggplot2 gplots lmeSplines nlme reshape]; };
+lmms = derive { name="lmms"; version="1.3"; sha256="1qmyblvifz7ix04lga6sgpyzyjrf59sxkiyanixmp1zmf50i6ng7"; depends=[gdata ggplot2 gplots gridExtra lmeSplines nlme reshape2]; };
 lmodel2 = derive { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; };
 lmom = derive { name="lmom"; version="2.5"; sha256="0s2x8k6p71hxdqggy8ajk7p9p040b9xr3lm49g31z3kcsmzvk23q"; depends=[]; };
 lmomRFA = derive { name="lmomRFA"; version="3.0-1"; sha256="0lf8n6bhdv3px6p60smghvmwsbgawvjrmgy2dfhs517n67pxg30i"; depends=[lmom]; };
@@ -4386,6 +4460,7 @@ loa = derive { name="loa"; version="0.2.22"; sha256="13j4d4d35nd2ssmkghpd6azysmy
 localdepth = derive { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; };
 localgauss = derive { name="localgauss"; version="0.34"; sha256="04bn777kcxaa5s4zf0r9gclar32y9wpzqnx2rxxhqrxyy419gw37"; depends=[foreach ggplot2 MASS matrixStats]; };
 localsolver = derive { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; };
+locfdr = derive { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; };
 locfit = derive { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; };
 locits = derive { name="locits"; version="1.4"; sha256="1q9vsf5h4n7r4gy1dwdhfyq3n0rn33akb3nx6yzinncj4w4cqq0h"; depends=[igraph wavethresh]; };
 locpol = derive { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm19c4b9kx2k8wy8vkwh744a1kysvdga"; depends=[]; };
@@ -4414,13 +4489,14 @@ longitudinalData = derive { name="longitudinalData"; version="2.3"; sha256="0ld2
 longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
 longpower = derive { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[lme4 Matrix nlme]; };
 longurl = derive { name="longurl"; version="0.1.0"; sha256="1iz25m583gmzl8rkrrikydm3a8g67whzxp9lwysrjpnpqsly82vz"; depends=[dplyr httr pbapply]; };
-loo = derive { name="loo"; version="0.1.0"; sha256="1j471ihvqkc4f7l2aaw9k50qg80617njg72wiavbqmw8skp1gs2a"; depends=[matrixStats]; };
+loo = derive { name="loo"; version="0.1.2"; sha256="0gjawzfgv11mzdr3vfg955bxxd56z31jl4pysh3ksihafhvk04y7"; depends=[matrixStats]; };
 loop = derive { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
 loopr = derive { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; };
 lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[Hmisc ltm MASS msm mvtnorm polycor rms sfsmisc]; };
 lorec = derive { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
 lpSolve = derive { name="lpSolve"; version="5.6.11"; sha256="0mgpns9wflqaz9ynwxwkvmc1694yhf275wgrqfjfy3qxz1hxq7s0"; depends=[]; };
 lpSolveAPI = derive { name="lpSolveAPI"; version="5.5.2.0-14"; sha256="1ffmb9xv6m25ii4n7v576g8xw31qlsxd99ka8cjdhqs7fbr4ng5x"; depends=[]; };
+lpbrim = derive { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; };
 lpc = derive { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; };
 lpint = derive { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; };
 lpme = derive { name="lpme"; version="1.0.1"; sha256="0f0xphlxl0ma3s2miadl74cb1l20cikqgk3nc1dg5ml05cqzhyxr"; depends=[Rcpp RcppArmadillo]; };
@@ -4434,7 +4510,8 @@ lsbclust = derive { name="lsbclust"; version="1.0.2"; sha256="03vaf9l0fy3pdr3cqb
 lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
 lsgl = derive { name="lsgl"; version="1.0.123.1"; sha256="10q3f56yjgs3kvyk7b7d1xi06sa16pv9y3c6lsp1461whqvinpj4"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
 lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
-lsmeans = derive { name="lsmeans"; version="2.18"; sha256="1wnpn4hngjcfr44apsw85g3x4wm3ma7msg2n4dnadj0w0zbf0fq4"; depends=[coda estimability multcomp mvtnorm plyr]; };
+lsl = derive { name="lsl"; version="0.5.0"; sha256="1656bv7j1312m2yq9q7dvxqh4z9i9j50pl07spfa6z5waiy3xda6"; depends=[ggplot2 reshape2]; };
+lsmeans = derive { name="lsmeans"; version="2.19"; sha256="1cnzbk25vy1a3arixhcp45fdlgrskpkmf3gd839vmiis97x2a7ji"; depends=[coda estimability multcomp mvtnorm nlme plyr]; };
 lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
 lsr = derive { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; };
 lss = derive { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; };
@@ -4455,6 +4532,7 @@ m4fe = derive { name="m4fe"; version="0.1"; sha256="06lh45591z2lc6lw91vyn066x0m1
 mAr = derive { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; };
 mFilter = derive { name="mFilter"; version="0.1-3"; sha256="1cz9d8447iiy7sq47civ1lcjafqdqs40lzxm2a4alw4wy57hc2h6"; depends=[]; };
 mGSZ = derive { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; };
+mHG = derive { name="mHG"; version="1.0"; sha256="18hj9chp9dy6nmi5w0808nivqbyni117darvdpf03kzq5ym8dlm6"; depends=[]; };
 mQTL = derive { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; };
 mRMRe = derive { name="mRMRe"; version="2.0.5"; sha256="1lhpamjy8dbk3lzjj0wj041cg99rw6925i9fq297c93jxq562414"; depends=[igraph survival]; };
 mRm = derive { name="mRm"; version="1.1.5"; sha256="0sbpk7z4ij917nw8wyvnm87iav95ybqrzvmsjy3r8nyq55bjzyn7"; depends=[]; };
@@ -4472,16 +4550,16 @@ mailR = derive { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslp
 makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
 mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
 managelocalrepo = derive { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; };
-manifestoR = derive { name="manifestoR"; version="1.0-3"; sha256="0p048ly4rkz08952s6d9cxwvxghba0g5xwx4v04kvjw3p8v9b7cq"; depends=[dplyr functional httr jsonlite NLP psych tm zoo]; };
+manifestoR = derive { name="manifestoR"; version="1.0-4"; sha256="0c908d35hja6fb0wscgpr156nqyw9xj2al3rw6w4dxyy84imdzpf"; depends=[dplyr functional httr jsonlite NLP psych tm zoo]; };
 manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
 mapDK = derive { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; };
 mapStats = derive { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; };
-mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; };
+mapdata = derive { name="mapdata"; version="2.2-4"; sha256="1x92nshzhfm9y0wx9m616f3663kfavdvfz8hm7xrywsj7pkd78gz"; depends=[maps]; };
 mapfit = derive { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
-mapmisc = derive { name="mapmisc"; version="1.3.1"; sha256="0ijxy42k5j85mz2pm0g8fs0fliy0pjkfd2jmisfxgrn1h4sz2d3p"; depends=[raster sp]; };
+mapmisc = derive { name="mapmisc"; version="1.3.2"; sha256="1da2mqjwr4fb1gapd575fg2yjidddqqkra2ki9iqlkanh9jn4iwi"; depends=[raster sp]; };
 mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
-mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; };
-maps = derive { name="maps"; version="2.3-9"; sha256="1gzy81sl4vpr4hsnh4jsp5rd26jdkzsw99qxwfmbadjyf55q06wv"; depends=[]; };
+mapproj = derive { name="mapproj"; version="1.2-3"; sha256="0ssc47qpfpr8gvmwpsm9vn1j7fg0zzcs0cw7q73mjjswjx1vzwvj"; depends=[maps]; };
+maps = derive { name="maps"; version="2.3-10"; sha256="0jqima0c7v655bknps8dbdcpmw36nc3vaqnw142jkrcwrm4dzjy5"; depends=[]; };
 maptools = derive { name="maptools"; version="0.8-36"; sha256="0064b9qqv7241298dswv5kkkqf6y2iyn7dhjcyvfkqn4kvc9g2m8"; depends=[foreign lattice sp]; };
 maptpx = derive { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
 maptree = derive { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
@@ -4526,7 +4604,7 @@ mcheatmaps = derive { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38
 mcll = derive { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; };
 mclogit = derive { name="mclogit"; version="0.3-1"; sha256="0zyms6v9qjh6a5ccahfanarp4sg49yingb8wpjcz61skqvm8j7qx"; depends=[Matrix]; };
 mclust = derive { name="mclust"; version="5.0.2"; sha256="1ilhgiigrnvw5l85vk54xdvlirqhp5wb404i0mh2jyzccr9pjml5"; depends=[]; };
-mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; };
+mcmc = derive { name="mcmc"; version="0.9-4"; sha256="1ws80j64df8inzz0a6k8r51wf44zwjnpvp591pxwah2jbi6j6kna"; depends=[]; };
 mcmcplots = derive { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; };
 mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; };
 mco = derive { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; };
@@ -4543,7 +4621,7 @@ meboot = derive { name="meboot"; version="1.4-6"; sha256="17wjvc375vnya1lhkj10ns
 medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; };
 mederrRank = derive { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; };
 medflex = derive { name="medflex"; version="0.5-1"; sha256="0ljqg7bf2zicyc1qbr5d6lvsdppilmsqv6blrdg2vf1zyz3xyfxx"; depends=[boot Matrix multcomp sandwich]; };
-mediation = derive { name="mediation"; version="4.4.4"; sha256="00w4c51v0xvc8pfpxqn73l8r2j12sv1wf5kj3yjq8g08dgzynham"; depends=[Hmisc lpSolve MASS Matrix mvtnorm sandwich]; };
+mediation = derive { name="mediation"; version="4.4.5"; sha256="0jq0gg5ydqvy0vv8m7xk609ljw7p31jppgwgin3y3mvd32wapgk3"; depends=[Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; };
 medicalrisk = derive { name="medicalrisk"; version="1.1"; sha256="1fb8zp426zcqsnb35sgywnz44lpssa1acfa2aha9bnvyazif3s90"; depends=[hash plyr reshape2]; };
 mefa = derive { name="mefa"; version="3.2-5"; sha256="037vpnwclyj6xgycznh6g6qlirlgy3sjnkjqb1046q80b5ywv2ni"; depends=[]; };
 mefa4 = derive { name="mefa4"; version="0.3-1"; sha256="0zyjhq80krnb11wh8p8006qz0znrps3qsd2qnhkw7zwl5282i1zp"; depends=[Matrix]; };
@@ -4581,7 +4659,7 @@ mets = derive { name="mets"; version="1.1.1"; sha256="1myqcds9glsy3fwzr7v711xzk7
 mewAvg = derive { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
 mfp = derive { name="mfp"; version="1.5.1"; sha256="0flqrvicgks7nxxijhndshpf541drlgqjidm3nql1bg5hnpc5fcq"; depends=[survival]; };
 mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[betareg lmtest MASS sandwich]; };
-mgcv = derive { name="mgcv"; version="1.8-6"; sha256="0605cqrbk26zg8s8qdd8kqwq56wihx7r6hfzr4x0xzk4y1g0m2rq"; depends=[Matrix nlme]; };
+mgcv = derive { name="mgcv"; version="1.8-7"; sha256="0c3cdqrfpjxclbw9fhd87d14ms1ibc6c8csbg737axfvlk29mlgy"; depends=[Matrix nlme]; };
 mglmn = derive { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; };
 mgpd = derive { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; };
 mgraph = derive { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; };
@@ -4596,12 +4674,12 @@ micEconAids = derive { name="micEconAids"; version="0.6-16"; sha256="07hsabrlkwp
 micEconCES = derive { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[car DEoptim micEcon minpack_lm miscTools systemfit]; };
 micEconSNQP = derive { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; };
 mice = derive { name="mice"; version="2.22"; sha256="1b7ivpa21ipzbmmwjn1ch968zpw6wydg30f7jdk95m40lrk2xs68"; depends=[lattice MASS nnet randomForest Rcpp rpart]; };
-miceadds = derive { name="miceadds"; version="1.2-0"; sha256="01gbkpmmd81v5yhj3jparp7li1jzq91f5zk65dhcd8g3a0k0952m"; depends=[bayesm car foreign inline lme4 MASS MBESS mice mitools multiwayvcov mvtnorm pan pls Rcpp RcppArmadillo sirt sjmisc TAM]; };
+miceadds = derive { name="miceadds"; version="1.3-0"; sha256="0fhx787chl8gnb5p2fnil2z5jdvnjwhfi3lrqhmshb2rilhak2w5"; depends=[bayesm car foreign grouped inline lme4 MASS MBESS mice mitools multiwayvcov mvtnorm pls Rcpp RcppArmadillo sirt sjmisc TAM]; };
 microbenchmark = derive { name="microbenchmark"; version="1.4-2"; sha256="05yxvdnkxr2ll94h6f2m5sn3gg7vrlm9nbdxgmj2g8cp8gfxpfkg"; depends=[ggplot2]; };
 micromap = derive { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46agib27i4svs8wyy93ldriryvhpa2w5948y"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; };
 micromapST = derive { name="micromapST"; version="1.0.5"; sha256="1n9mzyl5dj21165j0j99brkqq7c54j3cg6r21ifdzffj2dx29wh0"; depends=[RColorBrewer]; };
 micropan = derive { name="micropan"; version="1.0"; sha256="0qnxm6z2pk1wibchj6rhn3hld77dzl5qgvzl4v9n16ywlgdv09ai"; depends=[igraph]; };
-midasr = derive { name="midasr"; version="0.4"; sha256="190qliv7v80rr3jh9yvchwl3ch7nf5b8p90iywp8qkaav5r8rcdy"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; };
+midasr = derive { name="midasr"; version="0.5"; sha256="1w3rxsxkcjy30sjxv4cxvqzfw7k278s6mrrjm4pbz7cydbiws2vp"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; };
 migest = derive { name="migest"; version="1.7"; sha256="13yzdkikxy0mq60zjbc4wq69ja7dps10bwxzsp8v3awr1r75zpaz"; depends=[]; };
 migration_indices = derive { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; };
 migui = derive { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; };
@@ -4629,19 +4707,19 @@ missForest = derive { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfka
 missMDA = derive { name="missMDA"; version="1.8.2"; sha256="0rb48psaffvlp3i2d1xv9fk949gpnck85v4ysfzw203r2r4rdhmm"; depends=[FactoMineR]; };
 mistat = derive { name="mistat"; version="1.0-3"; sha256="12fykqkcqfxn8m8wwpw69f7h2f24c5yhg4fw50jsifhcj40kk29q"; depends=[]; };
 mistral = derive { name="mistral"; version="1.1-1"; sha256="19zkc5ddjzw17y70x3l6maljsfvg0295xyzx7kavmjrws74jx4rc"; depends=[DiceKriging e1071 kernlab Matrix mvtnorm rgenoud]; };
-mitml = derive { name="mitml"; version="0.2-2"; sha256="11pgwa1cxf1i2qkm8gyzxsjkhg40r75gk2k1lwaqpqgi7vs3drbs"; depends=[haven pan]; };
+mitml = derive { name="mitml"; version="0.2-3"; sha256="063nc32sgzg2q85fbxmxqch7yyf0fhl8rng83mnqbr9fjy1gxdnm"; depends=[haven pan]; };
 mitools = derive { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; };
 mix = derive { name="mix"; version="1.0-9"; sha256="08729y6ih3yixcc4a6m8fszg6pjc0s02iq47339b9gj16p82b74z"; depends=[]; };
-mixAK = derive { name="mixAK"; version="4.0-5"; sha256="1kdcia6j2dw4q1rbrswx9h8ivzrnw8hrg5a206jykmsdbngbifx5"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
+mixAK = derive { name="mixAK"; version="4.1-1"; sha256="0y9p9ixa5kps48snvkmyj7b8lmgb8cqrrzp0idh5g06kgriqcn1k"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
 mixOmics = derive { name="mixOmics"; version="5.0-4"; sha256="020cy0x7qf6x7lb1aqfr6qflf08k2phnygcjr7lq4z8q9v502qyh"; depends=[igraph lattice MASS pheatmap RGCCA rgl]; };
-mixPHM = derive { name="mixPHM"; version="0.7-1"; sha256="0v75xv06m40jqq0c4y1gvdrmyddxs814djbpyq61fv8cn22fn7wx"; depends=[lattice survival]; };
+mixPHM = derive { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; };
 mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
 mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
 mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
 mixedMem = derive { name="mixedMem"; version="1.0.2"; sha256="1nlnlww2xbmlifcp9l293041csnh38hvr686sczyqpb7c5jf39g3"; depends=[BH gtools Rcpp RcppArmadillo]; };
 mixer = derive { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; };
 mixexp = derive { name="mixexp"; version="1.2.1"; sha256="0yjsngr2akj2hhl1hav2kkp8w0g4775qvnbzypa3c1fmx8kf1xvw"; depends=[daewr gdata lattice]; };
-mixlm = derive { name="mixlm"; version="1.0.8.5"; sha256="1xbkh6aaw4j57vkn6ng7i5wkpz2clhvj3sx0mhfmpwhg13rpdkaj"; depends=[car leaps lme4 multcomp pls pracma]; };
+mixlm = derive { name="mixlm"; version="1.0.9.2"; sha256="1rh2sj5h9h4rmv7vqa87jbbln1mz6h0hb3gv3g99zcmazbd18k75"; depends=[car leaps lme4 multcomp pls pracma]; };
 mixlow = derive { name="mixlow"; version="1.0.1"; sha256="12vnp3gl3ykxzgvc4bwhi4flmc1sl2y77yi0zi4by17q93a49akm"; depends=[nlme]; };
 mixor = derive { name="mixor"; version="1.0.2"; sha256="1xkwgk4dvjbpqvvbrb8yb88iz4nkv7sykxaygjq7zfcdrdivxz6n"; depends=[]; };
 mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; };
@@ -4653,13 +4731,13 @@ mixtox = derive { name="mixtox"; version="1.0"; sha256="059vjrz9isyrdqk2ij4b11da
 mixture = derive { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; };
 mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[ggplot2 plyr reshape2]; };
 mkde = derive { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; };
-mkin = derive { name="mkin"; version="0.9-39"; sha256="14yya9fkslk9vplszdxxfa2q1di42nnly67irpl5ry4sgl21nnfp"; depends=[deSolve FME inline minpack_lm rootSolve]; };
+mkin = derive { name="mkin"; version="0.9-40"; sha256="0k037pp7rvwwhmciz4h723hqizw4iajamqvwxqza4sh4b2d3pcrw"; depends=[deSolve FME inline minpack_lm rootSolve]; };
 mkssd = derive { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; };
 mlDNA = derive { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; };
 mlPhaser = derive { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; };
 mlVAR = derive { name="mlVAR"; version="0.1.0"; sha256="0xychak3xdqnsl9z1ifi0niqsrdc10f6frl6zg162mzpil33wp3g"; depends=[arm lme4 plyr qgraph]; };
 mlbench = derive { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; };
-mldr = derive { name="mldr"; version="0.2.25"; sha256="0rwh7gs5qw08x1bx03156qf8bav3yacwi0vzz4yk722gd0wzi88j"; depends=[circlize shiny XML]; };
+mldr = derive { name="mldr"; version="0.2.33"; sha256="0an9kh2gangcwm7csp9k4shjrn2fpr82g7ni5144l5k3lkvza3xh"; depends=[circlize shiny XML]; };
 mlearning = derive { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; };
 mlegp = derive { name="mlegp"; version="3.1.4"; sha256="1932544irhzhf6a8rjyh66j57h9awlhwd6xam603bamfg106cmg2"; depends=[]; };
 mleur = derive { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; };
@@ -4681,13 +4759,13 @@ mmeln = derive { name="mmeln"; version="1.1"; sha256="06bxp157cdab6ghx3yrsn8l2gi
 mmeta = derive { name="mmeta"; version="2.2"; sha256="06zkazi97f3il2vlx4f8c7zz4kxs9ylhscd06j31h504c1w96ddf"; depends=[aod HI]; };
 mmm = derive { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; };
 mmm2 = derive { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; };
-mmod = derive { name="mmod"; version="1.2.1"; sha256="0c2ijg5116hacq0f18xhkbxankjp0k34zfnw8q02ahzwd26ds0z7"; depends=[adegenet pegas]; };
+mmod = derive { name="mmod"; version="1.3.0"; sha256="1rcvqvqmpl5ks1pwb0z2iq3ng2x7fhsihyihnwx05k5pkhyrfsj5"; depends=[adegenet pegas]; };
 mmpp = derive { name="mmpp"; version="0.1"; sha256="1m2079vz4h3h90ikh268jwh20ink5n1mri8n7aj50xkfspmwsmpg"; depends=[]; };
 mmtfa = derive { name="mmtfa"; version="0.1"; sha256="113bpcb05i78y78byrdn9j45dfcar7q8z7qmlid8cl6b8cjv1vfz"; depends=[matrixStats mvnfast]; };
 mnlogit = derive { name="mnlogit"; version="1.2.2"; sha256="01wvlmkf9ddcmsb8pw08j05r7kfn8zr76zaaa3mv92h967v79grp"; depends=[Formula lmtest mlogit]; };
 mnormpow = derive { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; };
 mnormt = derive { name="mnormt"; version="1.5-3"; sha256="1mw5fk4q5cnj2x2938di58179fr51l396qd61i6y5vwmcccj0kn9"; depends=[]; };
-modMax = derive { name="modMax"; version="1.0"; sha256="0p8vnlbw53lqbaq3819jhixq6ns2lwxf56w2md7y98rshf92h474"; depends=[gtools igraph]; };
+modMax = derive { name="modMax"; version="1.1"; sha256="1mx4623az7vzaqf530pklx7j92qwwq93pa2416lnr24jjcxgva2h"; depends=[gtools igraph]; };
 modQR = derive { name="modQR"; version="0.1.0"; sha256="0k9rqwi0amq8cln1a6i58xb19cpkjq0qca4vsgq1r2x1370hf9fq"; depends=[geometry lpSolve]; };
 modTempEff = derive { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; };
 modeest = derive { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; };
@@ -4698,13 +4776,15 @@ modeltools = derive { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv
 modiscloud = derive { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; };
 moduleColor = derive { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; };
 mokken = derive { name="mokken"; version="2.7.7"; sha256="1v0khh1bb2h7j2x54mdw8vqlimhw25r2ps89hw4l88qfaz05ir77"; depends=[poLCA]; };
-mombf = derive { name="mombf"; version="1.5.9"; sha256="0lc3rrmm2vsa4mg2zkbhp5dpnps7w0ld35lav19ff86kccspw1rg"; depends=[actuar mgcv mvtnorm ncvreg survival]; };
+mombf = derive { name="mombf"; version="1.6.0"; sha256="10bik14x322mcw1yx74haizxm5sx50ll6fz35fx16j8g7fy2k17f"; depends=[actuar mgcv mvtnorm ncvreg survival]; };
 momentchi2 = derive { name="momentchi2"; version="0.1.0"; sha256="02k4hzhqmqh7sx7dzb6w84fc1f5523md3284y4gvdbaw9y34ayk8"; depends=[]; };
 moments = derive { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
+momr = derive { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; };
 mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
-mongolite = derive { name="mongolite"; version="0.4"; sha256="0jrjf9sh8y7n4lgy54y5pl9dw6z4c5qb903l0907finm749cb2w1"; depends=[jsonlite]; };
+mongolite = derive { name="mongolite"; version="0.5"; sha256="1rd8q5asa24q8c14swd88rq02bqvvkp63sssdlmrcj736fjr4a4x"; depends=[jsonlite]; };
 monitoR = derive { name="monitoR"; version="1.0.3"; sha256="0g2dhyz3411pa6kcsmmi9x77ygvdrvas3k9ps0w2r69mfab785c6"; depends=[tuneR]; };
-monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; };
+monmlp = derive { name="monmlp"; version="1.1.3"; sha256="1f42d8j6jxz8x3yy02ppimbza3b3dn8402373qhj4yizrfk9wkz9"; depends=[]; };
+monogeneaGM = derive { name="monogeneaGM"; version="1.0"; sha256="10rnc3ipnf8j85kfgfssmdd9578mnx74694r5jsrj2yvbvzm67vq"; depends=[ape circular cluster geomorph gplots phytools rgl]; };
 monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[lars MASS pls]; };
 monreg = derive { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; };
 moonBook = derive { name="moonBook"; version="0.1.3"; sha256="1wy8qwzymh482gfb4v9v74k666mq8dz2yird7gz43l3hps22kfgb"; depends=[nortest survival]; };
@@ -4722,7 +4802,7 @@ move = derive { name="move"; version="1.5.514"; sha256="18rf9d0xxs48l0bk9vvr2sxn
 mp = derive { name="mp"; version="0.2.0"; sha256="1vpjrx04yn1rdmrhj42rhc757cj02sghrv0i5jfm4k2y28ab7qh1"; depends=[Rcpp RcppArmadillo svd]; };
 mpMap = derive { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata qtl seriation wgaim]; };
 mpa = derive { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; };
-mpath = derive { name="mpath"; version="0.1-18"; sha256="04d6lbsqjmr6pkyfpr2vw3rhv5hi044rx1n1isgw96j2c0f7dgzv"; depends=[glmnet MASS numDeriv pscl]; };
+mpath = derive { name="mpath"; version="0.1-19"; sha256="12w6ihr1ggr877agj0jlbsspmikjvp7xpvvn8xa4mav3vcrccyhc"; depends=[glmnet MASS numDeriv pscl]; };
 mpcv = derive { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; };
 mph = derive { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkkm9hn672qy803dwzzxv5y61"; depends=[]; };
 mplot = derive { name="mplot"; version="0.6.2"; sha256="0lnslv471abhfr245wx24ps3c97qs54i43ybpc1f8mqsxh0vxz3s"; depends=[bestglm doParallel foreach googleVis leaps plyr shiny shinydashboard]; };
@@ -4736,6 +4816,7 @@ mra = derive { name="mra"; version="2.16.4"; sha256="134fw4bv34bycgia58z238acj7k
 mratios = derive { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; };
 mrds = derive { name="mrds"; version="2.1.12"; sha256="1v7lv3ssg9m8bx2gskzf31lkg3sxsdkvknrdx9aawdh3mzxwcys7"; depends=[mgcv optimx Rsolnp]; };
 mreg = derive { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
+mri = derive { name="mri"; version="0.1.1"; sha256="07lqr9fv0nqd626jpqa6x1qxf85r1j4r5brv760dll1p2kl060gw"; depends=[]; };
 mritc = derive { name="mritc"; version="0.5-0"; sha256="1344x7gc7wvmcqp0sydppavavvps5v7bs0dza2fr8rz3sn4as8sa"; depends=[lattice misc3d oro_nifti]; };
 msBP = derive { name="msBP"; version="1.0-2.1"; sha256="1yprhglqykh6v2jicab25a0ny1r49kaj3i04fspi3was2md2qbzd"; depends=[DPpackage]; };
 msSurv = derive { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; };
@@ -4754,10 +4835,11 @@ msr = derive { name="msr"; version="0.4.1"; sha256="1kfj6xq7l32ligc53akiym3s9if8
 mstate = derive { name="mstate"; version="0.2.7"; sha256="0rys25cwr814k8z65206s12yv18dala66b3nlfq882dw5cfpaybl"; depends=[RColorBrewer survival]; };
 mtk = derive { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; };
 mtsdi = derive { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; };
+muRL = derive { name="muRL"; version="0.1-10"; sha256="0411vqijsida63jq63qwflr6lvv0rr777z0xba6pn0gpi6khjqqz"; depends=[maps]; };
 muStat = derive { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; };
 muhaz = derive { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; };
 muir = derive { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; };
-multcomp = derive { name="multcomp"; version="1.4-0"; sha256="1n1qbg7amk385ryni97qdbzcinpwpxldl3r477r1kfgv8csynxhj"; depends=[codetools mvtnorm sandwich survival TH_data]; };
+multcomp = derive { name="multcomp"; version="1.4-1"; sha256="07zvpdiphn9ndvhvblnd2li2a70j8igscd685s5mslbx5rqppv3k"; depends=[codetools mvtnorm sandwich survival TH_data]; };
 multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; };
 multgee = derive { name="multgee"; version="1.5.1"; sha256="1ycbbri26hahbi3q4mrsyhrh9bwj89dyv6gvrpx58ghrlsnakjy1"; depends=[gnm VGAM]; };
 multiAssetOptions = derive { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; };
@@ -4771,7 +4853,7 @@ multicool = derive { name="multicool"; version="0.1-6"; sha256="0hzwxrcsz7dm4ilv
 multigroup = derive { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; };
 multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[MASS nlme]; };
 multilevelPSA = derive { name="multilevelPSA"; version="1.2.2"; sha256="0z3qnv14sdkfvyw2wjrfz26r7sr7vv3rlr8n4gf99rwv6k34bdsg"; depends=[ggplot2 party plyr proto PSAgraphics psych reshape xtable]; };
-multimark = derive { name="multimark"; version="1.2.0"; sha256="0gc8dla4npgf1g17k7cqphkm82lywh12zvc82ga5446w3ihpvllg"; depends=[Brobdingnag coda Matrix mvtnorm RMark statmod]; };
+multimark = derive { name="multimark"; version="1.3.0"; sha256="0dw5s1znv83hs5m1d8721n35cabml0s2a26zgc8x0ngnf3zkspny"; depends=[Brobdingnag coda Matrix mvtnorm RMark statmod]; };
 multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
 multinomRob = derive { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; };
 multipleNCC = derive { name="multipleNCC"; version="1.1"; sha256="134a8zm0xz2h9yclc9v2linx881gb3n5x51msifpnm641giamzfd"; depends=[mgcv survival]; };
@@ -4789,19 +4871,20 @@ multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4z
 muma = derive { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[bitops car caTools gplots gtools mvtnorm pcaPP pdist pls robustbase rrcov]; };
 munfold = derive { name="munfold"; version="0.3-3"; sha256="1szm3c1xi1s7r1w6h7xb4x538sbczrblb70a3ysxf4q8c1ihmly9"; depends=[MASS memisc]; };
 munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; };
+munsellinterpol = derive { name="munsellinterpol"; version="1.0.2"; sha256="1c4m9fhggczy3wk51m8qxiahkic1f1lq3r8b0x0mk34pd5wap48a"; depends=[geometry]; };
 musicNMR = derive { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; };
 mutoss = derive { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[multcomp multtest mvtnorm plotrix]; };
 mutossGUI = derive { name="mutossGUI"; version="0.1-9"; sha256="1xdby6n0w1155kx6mhinvgqm0ssgyy4443pkq3k88a5s4bfxw5bw"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; };
 mvMORPH = derive { name="mvMORPH"; version="1.0.5"; sha256="184ywvgi2dz77ivl2g7spx065wh1ap2lpmvbrhik9sgysygkijs2"; depends=[ape corpcor phytools spam subplex]; };
 mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[abind bayesm maxLik miscTools mvtnorm]; };
-mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.5"; sha256="1cq1j4f1k0xhq2ncmji1a4p4m6h7k2afsr39abib4g3md902v0hp"; depends=[ape corpcor mvtnorm numDeriv ouch]; };
+mvSLOUCH = derive { name="mvSLOUCH"; version="1.2"; sha256="0hr31j8gppg5mfifvlmv962bc06s21byyy3gz0pkary15pzy5xg8"; depends=[ape corpcor mvtnorm numDeriv ouch]; };
 mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; };
 mvabund = derive { name="mvabund"; version="3.10.4"; sha256="1hza09nghgz0iyfayqabf5d0yb6zqnvhwmprif6y9qix8jscilwl"; depends=[MASS Rcpp statmod tweedie]; };
 mvbutils = derive { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; };
 mvc = derive { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; };
 mvctm = derive { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn4kdqyls8a8qx6bz609ynzay5r9"; depends=[Formula MNM nlme quantreg Rfit]; };
 mvcwt = derive { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; };
-mvglmmRank = derive { name="mvglmmRank"; version="1.0-2"; sha256="0gpp0ibgji86pxscqzcws0d1qn1ciqqvyfb0x2v18580r4cx8jv7"; depends=[Matrix numDeriv]; };
+mvglmmRank = derive { name="mvglmmRank"; version="1.1-1"; sha256="1n02bhpljvpfiycnmyw18dxp6pvll5014vl58n9hrdkccmhkm6jm"; depends=[Matrix numDeriv]; };
 mvinfluence = derive { name="mvinfluence"; version="0.6"; sha256="1cd5p6cl2zln8madjf3vsbmqlg4nsklzzy6ngdd5glj1a9qapd6c"; depends=[car heplots]; };
 mvmesh = derive { name="mvmesh"; version="1.0"; sha256="168s3n3ibiwdk0wys4kjj1xdpkz891rq5dv3lqf4pil83kbw8jw9"; depends=[rcdd rgl]; };
 mvmeta = derive { name="mvmeta"; version="0.4.7"; sha256="1yadaviq66wdfs0dipn6gxk7jqvzwzjdr8lkfggdsl4vyyi9pwip"; depends=[]; };
@@ -4815,13 +4898,14 @@ mvoutlier = derive { name="mvoutlier"; version="2.0.6"; sha256="00kim5i8xdbaqc0l
 mvprpb = derive { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; };
 mvrtn = derive { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; };
 mvsf = derive { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[mvnormtest nortest]; };
+mvtboost = derive { name="mvtboost"; version="0.2.1"; sha256="02gankqhcidgii99qqdrw8y9d923d0yphln162rd0x72axn91cz2"; depends=[gbm RColorBrewer]; };
 mvtmeta = derive { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; };
-mvtnorm = derive { name="mvtnorm"; version="1.0-2"; sha256="0v4a05i92g70vf8xkh6as7566zgjcnpzr1ghhyszqk1f0maw9gxc"; depends=[]; };
+mvtnorm = derive { name="mvtnorm"; version="1.0-3"; sha256="107p5s3vvwfx51r1wsy8214y3ci00dl7l4jymk702w9mxsb3nc7i"; depends=[]; };
 mvtsplot = derive { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; };
 mwa = derive { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; };
 mwaved = derive { name="mwaved"; version="1.1.1"; sha256="1hn6nbwawkizv9v4k98hm5lz94yha2fng76x0r9f804whmv1pz36"; depends=[Rcpp shiny]; };
 mxkssd = derive { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
-myTAI = derive { name="myTAI"; version="0.1.0"; sha256="0qz2mm3ca5i93kz3pg8llpniix3vdy7mxz1n8k36iap09rbsrgmi"; depends=[doParallel dplyr fitdistrplus foreach nortest Rcpp]; };
+myTAI = derive { name="myTAI"; version="0.2.1"; sha256="0c4wx9x9v3hsc8h3wi0di5inr7r5lls6l0ljk42ry5i6l639n833"; depends=[doParallel dplyr edgeR fitdistrplus foreach nortest RColorBrewer Rcpp taxize]; };
 mycobacrvR = derive { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
 mycor = derive { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; };
 myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
@@ -4832,7 +4916,7 @@ nFCA = derive { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w
 nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[boot lattice MASS psych]; };
 nLTT = derive { name="nLTT"; version="1.1"; sha256="0hrrwil7vcym7zjbnzviw13p60y14w660vndvc2lm5lmhbb8nhcn"; depends=[ape coda deSolve]; };
 nabor = derive { name="nabor"; version="0.4.6"; sha256="0kd0h8n5yrn16vrfdchdiqzws05q0fm8z577p20dm18gdcs2vbxv"; depends=[BH Rcpp RcppEigen]; };
-nadiv = derive { name="nadiv"; version="2.14.0"; sha256="07wrzj5vkz7hgxmlpl4d39crs5bz1xylpq0w13r5w95rwnmn6jzm"; depends=[Matrix]; };
+nadiv = derive { name="nadiv"; version="2.14.1"; sha256="1k94shkcdylaqm2j7yp23nx0c7c6n0a9im3afmfkws2ax6bf2yjf"; depends=[Matrix]; };
 namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
 nanop = derive { name="nanop"; version="2.0-5"; sha256="0zdn2hgp516hcqpc2w2vzhhalcr05dlw539zj3afzi75w8rwb71z"; depends=[distrEx rgl]; };
 nasaweather = derive { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
@@ -4841,9 +4925,9 @@ nat_nblast = derive { name="nat.nblast"; version="1.5"; sha256="1slpk126fwgn90j3
 nat_templatebrains = derive { name="nat.templatebrains"; version="0.6"; sha256="1qhkpvfpzyzf9qcfdc2a53fqhlxqcrvbb08glwkxmjs49is3fy3k"; depends=[digest igraph nat rappdirs rgl]; };
 nat_utils = derive { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; };
 naturalsort = derive { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; };
-nbconvertR = derive { name="nbconvertR"; version="1.0.1"; sha256="1wj8kj7zs6ldy5jc1dh7r637hyllnqk4qns5q767s72zj35kq6s4"; depends=[]; };
+nbconvertR = derive { name="nbconvertR"; version="1.0.2"; sha256="1dc9jxfibvb27qwiykj93322nb1ahwrg69zqcc0p9xp0rpsim02w"; depends=[]; };
 nbpMatching = derive { name="nbpMatching"; version="1.4.5"; sha256="1bglrzhap9rar6c8c2c5009l1ljq44mys66jpafw4xyw2pq7djqg"; depends=[Hmisc MASS]; };
-ncappc = derive { name="ncappc"; version="0.1"; sha256="1145y9k718245mzs8q33mjwcln79dmiyawy771zrk3kpxhfb5985"; depends=[ggplot2 gridExtra gtable knitr lattice PerformanceAnalytics reshape2 scales xtable]; };
+ncappc = derive { name="ncappc"; version="0.2"; sha256="0s1yx1bnahq5a5lryf23rzd8cyvk1q1psqkl9x5nr71by0j9jbs6"; depends=[ggplot2 gridExtra gtable knitr reshape2 scales testthat xtable]; };
 ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
 ncdf = derive { name="ncdf"; version="1.6.8"; sha256="1vrbrrqij7p712wfrki09749yryzr9lg4p95yqvb0zzggqpw2snm"; depends=[]; };
 ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; };
@@ -4858,7 +4942,7 @@ neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y
 needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
 negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; };
 neldermead = derive { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; };
-neotoma = derive { name="neotoma"; version="1.3.0"; sha256="0a5fmas441zl479vfndgyhanp5iivzdp5zqrpnr3pvgf3wfdnppd"; depends=[plyr RCurl reshape2 RJSONIO]; };
+neotoma = derive { name="neotoma"; version="1.3.2"; sha256="0c62bawr2zw937ics45hvs8dicjzrhsjk0mf8kxx3h1cw42q9ayb"; depends=[plyr RCurl reshape2 RJSONIO]; };
 nephro = derive { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; };
 nestedRanksTest = derive { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; };
 netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[AnnotationDbi graph igraph kernlab Matrix ROCR samr]; };
@@ -4870,7 +4954,7 @@ nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq
 nettools = derive { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[combinat dtw igraph Matrix minerva minet rootSolve WGCNA]; };
 netweavers = derive { name="netweavers"; version="1.1"; sha256="0p8hb3m0lbkf0pw9vdhv94spdba432klpqgn07jvxfhfhmr8cyz0"; depends=[Biobase BiocGenerics igraph limma]; };
 network = derive { name="network"; version="1.12.0"; sha256="04n634ia6m86zkmjdla8v6j4x11kdrx72gaj4am7iwv1ha14nfks"; depends=[]; };
-networkD3 = derive { name="networkD3"; version="0.1.7"; sha256="08jazv4mf2h4jdwrlpjr6k1dfcj99rs3nabgqw7x8pi3zb9l6m99"; depends=[htmlwidgets plyr rjson]; };
+networkD3 = derive { name="networkD3"; version="0.1.8"; sha256="1hn52x4dwc6mizyqxjk4id6xai8bx5zp100b05hmjpd3q73mq97h"; depends=[htmlwidgets plyr rjson]; };
 networkDynamic = derive { name="networkDynamic"; version="0.7.1"; sha256="0iv4lyfxmjllxk0cx09gdrg7zf2myf57wd3a2gqymids5gvpsy2d"; depends=[network statnet_common]; };
 networkDynamicData = derive { name="networkDynamicData"; version="0.1.0"; sha256="1vln4n8jldqi1a6qb9j9aaxyjb8pfgwd8brnsqr8hp9lm3axd24b"; depends=[network networkDynamic]; };
 networkTomography = derive { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; };
@@ -4912,14 +4996,15 @@ nodiv = derive { name="nodiv"; version="1.1.0"; sha256="16c7xm46jnzcsd5gyj72krjy
 noia = derive { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
 nomclust = derive { name="nomclust"; version="0.91.1010"; sha256="02jpzcjclm22bjg59wj4490vh2rp9ma1vqxdnwmppyb478558fz1"; depends=[cluster dummies]; };
 noncensus = derive { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; };
-nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.2"; sha256="1p78a9nqn53v9r885p4lg47vqlryw7335pxrid191xqabxxs3ba7"; depends=[Matrix Rcpp rgl TSA tseries]; };
+nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.3"; sha256="1pcah255hh3lqabxgjb5fsaap4s2d92lvxw9a48l1p4dkmm1lbsx"; depends=[Matrix Rcpp rgl TSA tseries]; };
 nonnest2 = derive { name="nonnest2"; version="0.2"; sha256="0z2ihnhphf6c9cklj1l81kqgyz1h9wl2ziwx7s0ssn3dfgw4fnp7"; depends=[CompQuadForm mvtnorm sandwich]; };
 nonparaeff = derive { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; };
 nonrandom = derive { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; };
 nontarget = derive { name="nontarget"; version="1.7"; sha256="1hnqkb8bpp89y42gjrfh7m3lxhif9dyhcmr6yfss8x3lzf018gk2"; depends=[enviPat mgcv nontargetData]; };
 nontargetData = derive { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; };
 nopp = derive { name="nopp"; version="1.0.4"; sha256="00wn0pnqpy9xll0aa8ah45ldgk1ziw464x8zkc8iq4l2a22lgn4v"; depends=[mlogit]; };
-nor1mix = derive { name="nor1mix"; version="1.2-0"; sha256="1s92bwpwq9p0d06adclm43yqq0k7ifv8lknn1scxg8nj4g03qjhs"; depends=[]; };
+nor1mix = derive { name="nor1mix"; version="1.2-1"; sha256="1sh7373w8z1mqkk8wvwzxab57pg1s3wcs6y6sx0sng7pf429x2m3"; depends=[]; };
+nordklimdata1 = derive { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; };
 norm = derive { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; };
 normalp = derive { name="normalp"; version="0.7.0"; sha256="1s12x2qln3s4bbqsm4p3cq4g6461z73r858g6ym1awamhbmncnrl"; depends=[]; };
 normtest = derive { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; };
@@ -4933,11 +5018,11 @@ np = derive { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6
 npIntFactRep = derive { name="npIntFactRep"; version="1.2"; sha256="0fx5923wdzz6122bbyil5imwbhgwlm50wcrscy78qdx8n4n07rv8"; depends=[ez plyr]; };
 nparLD = derive { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; };
 nparcomp = derive { name="nparcomp"; version="2.6"; sha256="111ypwyc885lvn64a5sb2k552j6wr3iihmhgx5y475axdiva5pzf"; depends=[multcomp mvtnorm]; };
-npbr = derive { name="npbr"; version="1.1"; sha256="011zmz1s6kkdgylkl6dc79dpardgpc5dlh6g6y2l84hgax1rbdl6"; depends=[Benchmarking np quadprog Rglpk]; };
-npcp = derive { name="npcp"; version="0.1-1"; sha256="0b2mqx0zrvai5aw6b47qpi4bwcfjrv0bh8ahrgx7n1sf045grm3a"; depends=[]; };
+npbr = derive { name="npbr"; version="1.2"; sha256="0l6r9cwrhbi37p8prrjcli7rpvlxgzma2m1wqck5y97wx1fnh4h3"; depends=[Benchmarking np quadprog Rglpk]; };
+npcp = derive { name="npcp"; version="0.1-6"; sha256="1ki9q49nyw21c6x3iwpd8aa152jc30idl0xx8f803j72yl21j47c"; depends=[]; };
 npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; };
 nplplot = derive { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
-nplr = derive { name="nplr"; version="0.1-2"; sha256="1xs02i14kgggf1gfs612l2jk37z60dxqgrxs6rswzchvlyzwcxd0"; depends=[]; };
+nplr = derive { name="nplr"; version="0.1-3"; sha256="1g7qr88wrgn5j7z0x1csyk7mfagngn282bd42g820z7yg42ija1y"; depends=[]; };
 npmlreg = derive { name="npmlreg"; version="0.46-1"; sha256="1gddl6diw8ix8vz7n1r4ps9cjx3q00mafpapskjk7pcz69m6hfv1"; depends=[statmod]; };
 npmv = derive { name="npmv"; version="2.2"; sha256="1aqlx1y3bxbqp13q0vajwffj8srb6s04d5r2h08m9fk5hhp9l3jf"; depends=[Formula]; };
 nppbib = derive { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
@@ -4952,13 +5037,13 @@ nsprcomp = derive { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd
 nullabor = derive { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[dplyr fpc ggplot2 MASS moments plyr]; };
 numDeriv = derive { name="numDeriv"; version="2014.2-1"; sha256="114wd0hwn2mwlyh84hh3yd2bvcy63f166ihbpnp6xn6fqp019skd"; depends=[]; };
 numOSL = derive { name="numOSL"; version="1.8"; sha256="0md55gfxjvdmjy4hy58wp11c788xy7kq9wl32m1r76ja6g03wwbl"; depends=[]; };
-numbers = derive { name="numbers"; version="0.5-6"; sha256="17v7by1gvqg2mdm5vrmf05kfrbvc2yz8ldb7bd0lrhcyrm5bbbwa"; depends=[gmp]; };
+numbers = derive { name="numbers"; version="0.6-1"; sha256="1mqcps33az5a7vd2czx7nll87yciwmxngnilf16iz4yf9p59gny5"; depends=[]; };
 nutshell = derive { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; };
 nutshell_audioscrobbler = derive { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; };
 nutshell_bbdb = derive { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; };
 nws = derive { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; };
 nycflights13 = derive { name="nycflights13"; version="0.1"; sha256="15bqaphxwqpdzr4bkn6qgbjb3knja5hk34qxjd6xhpjzkgfs5c0b"; depends=[]; };
-oapackage = derive { name="oapackage"; version="2.0.22"; sha256="0qskkzb4xlxz2qkxapcckxfwc5fv0s80kbndsvzcy3pqjzrykvys"; depends=[RcppEigen]; };
+oapackage = derive { name="oapackage"; version="2.0.23"; sha256="1kkwxwgb23i4m8dlh1ybskardwf8ql0m18cv9c5zi1qd2vkk5dx0"; depends=[RcppEigen]; };
 oaxaca = derive { name="oaxaca"; version="0.1.2"; sha256="1ghdrpjp2p4nlwskvs8n8d8ixzf3cdq9k9q49zvq8ag0dhwyswzd"; depends=[Formula ggplot2 reshape2]; };
 objectProperties = derive { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; };
 objectSignals = derive { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; };
@@ -4988,14 +5073,14 @@ onls = derive { name="onls"; version="0.1-0"; sha256="1kfgikswddly9lar6wa1hhz89r
 opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; };
 openNLP = derive { name="openNLP"; version="0.2-5"; sha256="0jc4ii6zsj0pf6nlx3l0db18p6whp047gzvc7q0dbwpa8q4il2mb"; depends=[NLP openNLPdata rJava]; };
 openNLPdata = derive { name="openNLPdata"; version="1.5.3-2"; sha256="1472gg651cdd5d9xjxrzl3k7np77liqnh6ysv1kjrf4sfx13pp9q"; depends=[rJava]; };
-openair = derive { name="openair"; version="1.5"; sha256="0swhaldfhz6zgs50aws18kypilv15k7w99nqcmb7y0wgvkkwda2h"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval mapdata mapproj maps mgcv plyr RColorBrewer Rcpp reshape2 RgoogleMaps]; };
+openair = derive { name="openair"; version="1.6"; sha256="0pmwibwhi44zd4yr6vaqgfa9sz7b60w3aqr8j1pn5cxqnzznwfp9"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval mapdata mapproj maps mgcv plyr RColorBrewer Rcpp reshape2 RgoogleMaps]; };
 opencpu = derive { name="opencpu"; version="1.4.6"; sha256="19anprhkwqw2kii417qy3laalrlj207zfvklc05m0vz9sra7sxj0"; depends=[brew devtools evaluate httpuv httr jsonlite knitr openssl]; };
 openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; };
 openssl = derive { name="openssl"; version="0.4"; sha256="1gfhzxjjssid2z8xmw3vnnd4gj2f6a3zzazkhpg9b1ymmcp9b288"; depends=[]; };
 opentraj = derive { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; };
 openxlsx = derive { name="openxlsx"; version="3.0.0"; sha256="1vx5qmhlyrlwrswbhd95jjcsldcdpdp7gs341dmham26sdzdx658"; depends=[Rcpp]; };
 operator_tools = derive { name="operator.tools"; version="1.4.4"; sha256="1ridxi3pbylb4flfgn371n1v9796rnd1ndxhh6ijyzpysqqmwi08"; depends=[]; };
-operators = derive { name="operators"; version="0.1-7"; sha256="1qik9ihv5blz77bzsnrslf665ndpa8vp3xldqsgvs4gr5bg5algw"; depends=[]; };
+operators = derive { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; };
 ops = derive { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; };
 optAUC = derive { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; };
 optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[e1071 ipred MASS Matrix msm randomForest rgl rpanel]; };
@@ -5025,7 +5110,7 @@ orderedLasso = derive { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8
 ordinal = derive { name="ordinal"; version="2015.6-28"; sha256="0lckjzjq2k8rlibrjf5s0ccf17vcvns5pgzvjjnl3wibr2ff4czs"; depends=[MASS Matrix ucminf]; };
 ordinalCont = derive { name="ordinalCont"; version="0.4"; sha256="1inms74l4zx6r526xd0v79v18bcqa76xwsgfvap0fizyv2dvgpim"; depends=[boot fastGHQuad ucminf]; };
 ordinalgmifs = derive { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; };
-ore = derive { name="ore"; version="1.1.0"; sha256="1khgjd5fl8vi9n9pj4nbai6fbfbiwzc121a0gf7dfk727iid8whq"; depends=[]; };
+ore = derive { name="ore"; version="1.2.0"; sha256="1q7jvbpjwx56h62hpi0lh0b154hcdzb6d5x1ic69mam7ml4lza80"; depends=[]; };
 orgR = derive { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; };
 orientlib = derive { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; };
 orloca = derive { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; };
@@ -5038,7 +5123,7 @@ orthogonalsplinebasis = derive { name="orthogonalsplinebasis"; version="0.1.6";
 orthopolynom = derive { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
 osDesign = derive { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; };
 osmar = derive { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; };
-ouch = derive { name="ouch"; version="2.8-4"; sha256="1kx6qjvc8zlcxihqfxs288hwwh9m05s5544w4c6m1wc02083b735"; depends=[subplex]; };
+ouch = derive { name="ouch"; version="2.9-2"; sha256="05c3bdxpjcgmimk0zl9744f0gmchhpm7myzjrx5fhpbp5h6jayaf"; depends=[subplex]; };
 outbreaker = derive { name="outbreaker"; version="1.1-5"; sha256="1k39pzqbjah4dwwjyaccb13c1aww8i4kdfjanxc4hzkl8av7s8db"; depends=[adegenet ape igraph]; };
 outliers = derive { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
 overlap = derive { name="overlap"; version="0.2.4"; sha256="1pp3fggkbhif52i5lpihy7syhq2qp56mjvsxgbgwlcfbzy27ph1c"; depends=[]; };
@@ -5057,9 +5142,11 @@ pack = derive { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwh
 packClassic = derive { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; };
 packHV = derive { name="packHV"; version="1.8"; sha256="0dr2picjd7mm633vw29524f3n4jpyillpzi9cg7yc2cymxnrgvyg"; depends=[survival WriteXLS]; };
 packS4 = derive { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; };
+packcircles = derive { name="packcircles"; version="0.1.1"; sha256="0xvw283gyjak3j66g8x5jy2jdrkcxwhfzck2wdq2q6a6nxbyb0i1"; depends=[Rcpp]; };
 packdep = derive { name="packdep"; version="0.3.1"; sha256="1827h9xcvgdad9nwz9k3hi79jc33yr7dnxy4xn2frp3fdh4q81ll"; depends=[igraph]; };
 packrat = derive { name="packrat"; version="0.4.4"; sha256="1yxcj9jc1cswimirnxxzir1ac0xva57w57365k8406a8dwx1v650"; depends=[]; };
 pacman = derive { name="pacman"; version="0.3.0"; sha256="10fjkr4zjcx7cyfmnpdnb96swxizhdqhvzgb5crymrafxqvg00c7"; depends=[devtools]; };
+paco = derive { name="paco"; version="0.2.1"; sha256="0vkky4jm8hsq5axmvay3z4cs4l019lprwh9344knn27s95k3x2cb"; depends=[plyr vegan]; };
 paf = derive { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
 pairedCI = derive { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
 pairheatmap = derive { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
@@ -5089,6 +5176,7 @@ parallelMap = derive { name="parallelMap"; version="1.3"; sha256="026d018fr2a43c
 parallelSVM = derive { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; };
 parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
 paramlink = derive { name="paramlink"; version="0.9-7"; sha256="02h7znac93v8ibra3ni2psxc9lpfhiiw4q8asfyrx400345ifk5b"; depends=[kinship2 maxLik]; };
+params = derive { name="params"; version="0.2"; sha256="1q750ivgnsf6sfi1apr2wgnr94fnkak1im07vkan565n8wiac0lr"; depends=[knitr whisker]; };
 paran = derive { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; };
 parboost = derive { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; };
 parcor = derive { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; };
@@ -5104,10 +5192,10 @@ partialOR = derive { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpx
 partitionMap = derive { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; };
 partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
 partitions = derive { name="partitions"; version="1.9-15"; sha256="0jgpknm4zah50w9i3fbq2f1whm4hywm2j72vxc3ignx1snx2z0gs"; depends=[gmp polynom]; };
-partools = derive { name="partools"; version="1.0.1"; sha256="0id6fw582ag0zwkp0yjm5vfcd2gv1bsa3zzhfx2fgiaarhnhzmda"; depends=[]; };
+partools = derive { name="partools"; version="1.1.1"; sha256="1z6grb6iag3r32438la7q06jx2fvdzlcjng3sl96lhvwj4rwi17r"; depends=[]; };
 partsm = derive { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
-party = derive { name="party"; version="1.0-21"; sha256="10kk3mw9kbkzhh5qacmq404d1r0scin2vc33wsf152lgc9fhs1xx"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
-partykit = derive { name="partykit"; version="1.0-1"; sha256="12ja72nginkzl9zrpiidqwrih2zgwxksdkhbw7hbdjbsr4zb7q62"; depends=[survival]; };
+party = derive { name="party"; version="1.0-22"; sha256="16wk9nsjjh8f464xx2izyymqwl89aygiyqir7h1kawm7flw9mrmv"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
+partykit = derive { name="partykit"; version="1.0-2"; sha256="1v1ykha642cgrj8hwj8gmz3860nmr1brgdjgal732dprzm3lg4hl"; depends=[survival]; };
 parviol = derive { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
 pass = derive { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[lars MASS ncvreg]; };
 pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; };
@@ -5135,19 +5223,20 @@ pbivnorm = derive { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245h
 pbkrtest = derive { name="pbkrtest"; version="0.4-2"; sha256="1yppp24a8rl36x6sn1jjhhgs41irbf0z5nrv454g9qwhbvfgiay5"; depends=[lme4 MASS Matrix]; };
 pbo = derive { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
 pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
-pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707aazbrqfcgc3rjrwwyjld11wyzn"; depends=[combinat]; };
+pcIRT = derive { name="pcIRT"; version="0.2"; sha256="18rqyhkzjaqjvsyh3vr3dv9jwqvsa28d0vhnnzj72na6h6rx31w4"; depends=[combinat Rcpp]; };
 pca3d = derive { name="pca3d"; version="0.8"; sha256="03ghncfpma1fwby8kxm0v90l795mknz8s4y81l24f3n7mmhighn6"; depends=[ellipse rgl]; };
 pcaBootPlot = derive { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; };
 pcaL1 = derive { name="pcaL1"; version="1.3"; sha256="026cgi812kvbkmaryd3lyqnb1m78i3ql2phlvsd2r691y1j8w532"; depends=[]; };
 pcaPP = derive { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; };
-pcalg = derive { name="pcalg"; version="2.2-2"; sha256="1cfjzknrlykxs42kyjjy4b09d8qkpl7kjivx0w8dxbgs03r6cmkl"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
+pcalg = derive { name="pcalg"; version="2.2-4"; sha256="0qx0impxh6pzbgdhpkbl13qfql4zpsa3xiy4hc640d15zxprv6zw"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
 pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
 pcnetmeta = derive { name="pcnetmeta"; version="2.2.1"; sha256="0y4sn1aby38c458667fsy2ndq64i8kknmzdc32mbvzd530p1yxai"; depends=[coda rjags]; };
+pco = derive { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; };
 pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
 pdR = derive { name="pdR"; version="1.3"; sha256="0y81nlvq5vwf6021m5ns6j4l44c5456jkbs2x9y7jfkw6r3v2ddf"; depends=[]; };
 pdc = derive { name="pdc"; version="1.0.2"; sha256="0d7p65rkwrh39njhszdrbv25z4jz27746y1qyhqmhkxmvkx6g1fl"; depends=[]; };
 pdfCluster = derive { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; };
-pdfetch = derive { name="pdfetch"; version="0.1.6"; sha256="1j3fdjnmfj84pfd5bc37ssbs83ya3ma0hj5iy1a0bg9wb5xqap13"; depends=[httr jsonlite lubridate reshape2 XML xts zoo]; };
+pdfetch = derive { name="pdfetch"; version="0.1.7"; sha256="12ddf3kyw9pppjn6haq7a3k27vl17016s4h2mc31mbb9fn6h4cjz"; depends=[httr jsonlite lubridate reshape2 XML xts zoo]; };
 pdist = derive { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; };
 pdmod = derive { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; };
 peacots = derive { name="peacots"; version="1.2"; sha256="1qrg6rzdnj0ba6igj4k9m1kc2q7gbwg8kwnmzhkjfza8jl8fqkf2"; depends=[]; };
@@ -5160,10 +5249,10 @@ pedigree = derive { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjk
 pedigreemm = derive { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
 pedometrics = derive { name="pedometrics"; version="0.6-2"; sha256="137685gyd7k9vpjnsy6h280cdbl15bchrizfnalnz6nizi0q85lj"; depends=[car gstat Hmisc lattice latticeExtra MASS moments pbapply plyr Rcpp sp spsurvey xtable]; };
 pegas = derive { name="pegas"; version="0.8-1"; sha256="116r709qp9hcvmvfn6xsis13284nl429sfc9d91p1c7fy8fl46q5"; depends=[adegenet ape]; };
-penDvine = derive { name="penDvine"; version="0.2.2"; sha256="054vw99z68pk0bi4yzdmvx13x8n75sj2371l8w2yady1lqjj4qi7"; depends=[fda lattice Matrix quadprog TSP]; };
+penDvine = derive { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; };
 penMSM = derive { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; };
 penalized = derive { name="penalized"; version="0.9-45"; sha256="0svmhsh0lv3d571jyhk73zd9slcd6xnp3p0l1ijab9gl2rjhlzz5"; depends=[survival]; };
-penalizedLDA = derive { name="penalizedLDA"; version="1.0"; sha256="1ib33l5nqmvi6qn9ykybkdpc0pp55k1b6x4vqpklzp3dgckg0lp6"; depends=[flsa]; };
+penalizedLDA = derive { name="penalizedLDA"; version="1.1"; sha256="1bw5wiixmmg1vr3v0d59vh67f0gy2rvr30bi58skvrkb25qcjq6l"; depends=[flsa]; };
 penalizedSVM = derive { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; };
 pencopula = derive { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[fda lattice latticeExtra quadprog]; };
 pendensity = derive { name="pendensity"; version="0.2.8"; sha256="18mnpsmfnqkbhg75lnqvs0iigx3mk9zr923wpygqviw5qxlwk5km"; depends=[fda lattice]; };
@@ -5189,7 +5278,7 @@ pglm = derive { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7ad
 pgmm = derive { name="pgmm"; version="1.2"; sha256="0f0wdcirjyxzg2139c055i035qzmhm01yvf97nrhp69h4hpynb2n"; depends=[]; };
 pgs = derive { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; };
 phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; };
-phangorn = derive { name="phangorn"; version="1.99-13"; sha256="1d6awphvzkznqvp30bxdi6j6chlakfxrvmkk9a4by21fxa29xmp9"; depends=[ape igraph Matrix nnls quadprog]; };
+phangorn = derive { name="phangorn"; version="1.99.14"; sha256="03llgrpmb443gxp73xj744g1zf9lklzfj01j4ifc5q5p8vq4q3a1"; depends=[ape igraph Matrix nnls quadprog]; };
 phaseR = derive { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; };
 phcfM = derive { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; };
 pheatmap = derive { name="pheatmap"; version="1.0.7"; sha256="0dvflwkwvnlh36w5z3ai1q2rgclrgs1qzh01nxgz9kd23imqp0q8"; depends=[gtable RColorBrewer scales]; };
@@ -5203,12 +5292,14 @@ phia = derive { name="phia"; version="0.2-0"; sha256="1v2znss1snqrn3bpd0513jmw0x
 phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[lattice Matrix survival]; };
 phonR = derive { name="phonR"; version="1.0-3"; sha256="09wzsq92jkxy6cd89czshpj1hsp56v9jbgqr5a06rm6bv3spa31i"; depends=[deldir plotrix splancs]; };
 phonTools = derive { name="phonTools"; version="0.2-2.0"; sha256="1wd1a5506p3ny6vi9pq6yg9gbz082fxw4l3cxsplkdpqgkhryrww"; depends=[]; };
+phonenumber = derive { name="phonenumber"; version="0.1.0"; sha256="0nyax7nnqr2wb0g3m0a0xw7x7cinqb98wq8vrrrssk5h1sdiapgr"; depends=[]; };
 phreeqc = derive { name="phreeqc"; version="1.0-9102"; sha256="09vwqd4mf64l76vgg32vm9vkc8ra6cls9nvrp3ckkj9l2fwcnbzf"; depends=[]; };
 phtt = derive { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; };
 phyclust = derive { name="phyclust"; version="0.1-15"; sha256="1j643k0mjmswsvp9jyiawkjf2qhfrw6xf4s2viqv987zxif2kd7z"; depends=[ape]; };
+phyext2 = derive { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; };
 phylin = derive { name="phylin"; version="1.0"; sha256="10pbs4adsyp43i89jb3xi0m55sl1w7ifmc98v74iq9p8xa15sdci"; depends=[]; };
 phyloTop = derive { name="phyloTop"; version="1.1.1"; sha256="046myyr01c4zc6sfy7r6p2vswkqqqd3w4k173gjbjazl1ims1sjs"; depends=[ape igraph NHPoisson phylobase]; };
-phylobase = derive { name="phylobase"; version="0.6.8"; sha256="0xj7x4cdfp0yadvjhdkw1ai3yd081ri4gpdg0n5g0z13cjaa6mjh"; depends=[ade4 ape Rcpp]; };
+phylobase = derive { name="phylobase"; version="0.8.0"; sha256="1zpypg6qrc39nl96k02qishw61sq4b62qw0mq3inmkrwf7w031m6"; depends=[ade4 ape Rcpp rncl RNeXML]; };
 phyloclim = derive { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; };
 phylocurve = derive { name="phylocurve"; version="1.3.0"; sha256="014y7l2q3yjzj2iq9a6aspnd7dkvjfwnz46rs7x6l45jy41494wb"; depends=[abind ape drc dtw geiger GPfit phylolm phytools]; };
 phyloland = derive { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
@@ -5216,25 +5307,26 @@ phylolm = derive { name="phylolm"; version="2.2"; sha256="1x1mi1mcq3ijbqhr0951sc
 phylotools = derive { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[ape fields picante seqRFLP spaa]; };
 phyreg = derive { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; };
 physiology = derive { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; };
-phytools = derive { name="phytools"; version="0.4-56"; sha256="18cib7yjlbzdpfs5piwx5cw0h7fk26s04wsb2vdfiybr306a9jk2"; depends=[animation ape clusterGeneration maps mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
+phytools = derive { name="phytools"; version="0.4-60"; sha256="1la0pjsb2jwr1ygj520vy15aq1fhhdnc5h1dzavbwcdcd9vl13n7"; depends=[animation ape clusterGeneration maps mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
 phytotools = derive { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; };
 pi0 = derive { name="pi0"; version="1.4-0"; sha256="0qwyfan21k23q4dilnl7hqjghzm8n2qfw21wbvnidr6n9hf2fjjs"; depends=[Iso kernlab limSolve LowRankQP Matrix numDeriv quadprog qvalue rgl scatterplot3d]; };
 picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape nlme vegan]; };
 picasso = derive { name="picasso"; version="0.3.0"; sha256="0z314akr1x2a28hh5hbb7mzkyaxsj4dfkdmx10l6gqllgk9j5qca"; depends=[igraph lattice MASS Matrix]; };
-pid = derive { name="pid"; version="0.13"; sha256="1cn8pc86xkb4dngashglfwlj7sjj4xaamfgglxkcsp0wxaiy9rfg"; depends=[ggplot2]; };
+pid = derive { name="pid"; version="0.32"; sha256="0lyxml25wk2sxjxg90c3mbrh4sg8ms2yk5wrznzb8k6lpgak4zqr"; depends=[DoE_base FrF2 ggplot2 png]; };
 pingr = derive { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; };
-pipe_design = derive { name="pipe.design"; version="0.2"; sha256="1hmc4g3bnpwicjr53xz8yhhshnfhd2fqx9c6v4af8wvnqpy7mlpq"; depends=[ggplot2 gtools]; };
+pipe_design = derive { name="pipe.design"; version="0.3"; sha256="1idgy7s6fnydcda51yj1rjil2pd1r2y6g0m5dmn8sw7wmaq2n3h6"; depends=[ggplot2 gtools]; };
 pipeR = derive { name="pipeR"; version="0.6.0.6"; sha256="1d7vmccvh5ir26cv26mk0ay69rqmwmp0mgwjal9avfn9vrxq1fq3"; depends=[]; };
 pitchRx = derive { name="pitchRx"; version="1.7"; sha256="0mx948bahw0zr0915hz9lcws7iq2l0ikgx4gjnnfhhpiii86xs57"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; };
 pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
 pkgKitten = derive { name="pkgKitten"; version="0.1.3"; sha256="1f7jkriib1f19mc5mdrymg5xzdcyclfvh1220agy4lpyprxgza0f"; depends=[]; };
+pkgconfig = derive { name="pkgconfig"; version="2.0.0"; sha256="1wdi86qyaxq1mwkr3nrax3ab7hhj2gp1lbsyqnbcc9vzg230nh0r"; depends=[]; };
 pkgmaker = derive { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[codetools digest registry stringr xtable]; };
 pks = derive { name="pks"; version="0.3-1"; sha256="1nr36k960yv71yfxkzchjk814sf921hdiiakxvv5f9dxpf00hxp4"; depends=[sets]; };
 plRasch = derive { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; };
 plan = derive { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; };
 planar = derive { name="planar"; version="1.5.2"; sha256="1w843qk88x3kzi4q79d5ifzgp975dj4ih93g2g6fa6wh529j4w3h"; depends=[cubature dielectric plyr Rcpp RcppArmadillo reshape2 statmod]; };
 planor = derive { name="planor"; version="0.2-4"; sha256="0k5rhrnv2spsj2a94msgw03yyv0hzrf8kvlnbhfj1dl7sb1l92a1"; depends=[conf_design]; };
-plantecophys = derive { name="plantecophys"; version="0.6"; sha256="1gxc84njpii82p6n04djbp4n9wni49lxfvmljqz48r643hv48a7h"; depends=[]; };
+plantecophys = derive { name="plantecophys"; version="0.6-3"; sha256="021jycr8jffry38r1d59r20wghmsbdqr354fkjrraq9c3b469ipz"; depends=[]; };
 plaqr = derive { name="plaqr"; version="1.0"; sha256="1vv15zqnmir5hi9ivyifzrc1rkn1sn5qj61by66iczmlmhqh17h8"; depends=[quantreg]; };
 playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[cairoDevice gridBase gWidgets gWidgetsRGtk2 lattice RGtk2]; };
 plfm = derive { name="plfm"; version="1.1.2"; sha256="1dl2pv2v7kp39hlbk5kb33kzhg9dzxjxhafdjv9dqpqb9b77akm8"; depends=[abind sfsmisc]; };
@@ -5247,7 +5339,7 @@ plot2groups = derive { name="plot2groups"; version="0.10"; sha256="00mp82vvx6inl
 plot3D = derive { name="plot3D"; version="1.0-2"; sha256="0qsrd1na4xw2bm1rzwj3asgkh7xqpyja0dxdmz41f3x58ip9wnz1"; depends=[misc3d]; };
 plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[plot3D rgl]; };
 plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; };
-plotKML = derive { name="plotKML"; version="0.5-2"; sha256="006f6j3k2yb20zcmx2lq9d4yy5awpsaxkcp17r6q42bdrffkc0m9"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
+plotKML = derive { name="plotKML"; version="0.5-3"; sha256="1s33a3lq8zi11hzqcvkcb3g9a91jkskxpyg8fyw7d0cwjmflfpfi"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
 plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
 plotROC = derive { name="plotROC"; version="1.3.3"; sha256="090fpj3b5vp0r2zrn38yxiy205mk9kx1fpwp0g8rl4bsa88v4c9y"; depends=[ggplot2 gridSVG shiny]; };
 plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
@@ -5281,7 +5373,7 @@ pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0
 pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
 poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[MASS scatterplot3d]; };
 pocrm = derive { name="pocrm"; version="0.9"; sha256="0p7a7xm1iyyjgzyi7ik2n34gqc3lsnallrijzdakghb8k5cybm4m"; depends=[dfcrm nnet]; };
-pogit = derive { name="pogit"; version="1.0.0"; sha256="0lgvf4d7b2ycz9wryjrd7qymbx1jmj4mw8jl95ax2jylz4li48zf"; depends=[BayesLogit ggplot2 logistf plyr]; };
+pogit = derive { name="pogit"; version="1.0.1"; sha256="19sawm7j5fa9s1nlz4hvhpgjj7n3rrnsh2m5a6scxis4brnaa98n"; depends=[BayesLogit ggplot2 logistf plyr]; };
 poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; };
 poilog = derive { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
 pointRes = derive { name="pointRes"; version="1.0.2"; sha256="1q9vjvmxs1f5g8f2aj674wk8piqzjqxzdrvxnawgw1pfi66adnms"; depends=[ggplot2 gridExtra plyr TripleR]; };
@@ -5291,7 +5383,7 @@ poisson_glm_mix = derive { name="poisson.glm.mix"; version="1.2"; sha256="0328m2
 poistweedie = derive { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; };
 polidata = derive { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; };
 pollstR = derive { name="pollstR"; version="1.2.1"; sha256="0sny330a0d8jicsgyc1qa2mwhxgxng50w2fv3ml1nncml8b88k40"; depends=[httr jsonlite plyr]; };
-polspline = derive { name="polspline"; version="1.1.11"; sha256="000b8mb7q5614pxrrfkbwyl39lqj3rbf13ghgkn0234v9y2i6j76"; depends=[]; };
+polspline = derive { name="polspline"; version="1.1.12"; sha256="0chg5f6fq5ngjp1kkm4kjyxjc3kk83ky2ky5k7q3rhd8rkhd4szw"; depends=[]; };
 polyCub = derive { name="polyCub"; version="0.5-2"; sha256="1j28ia53za3sh9q7q1g5bnmlb5mbzf44bcwzv0919lvkw01f2lvj"; depends=[sp spatstat]; };
 polySegratio = derive { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; };
 polySegratioMM = derive { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[coda gtools lattice polySegratio]; };
@@ -5314,8 +5406,9 @@ popdemo = derive { name="popdemo"; version="0.1-4"; sha256="0syhmm8fnxbsdzj75y7d
 popgen = derive { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; };
 popgraph = derive { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS Matrix sampling sp]; };
 poplite = derive { name="poplite"; version="0.99.16"; sha256="0yp1hfda2k6c5x0gbcfxj9h6igzx3ra05xs7g88wjz76yxp3wb6w"; depends=[DBI dplyr igraph lazyeval RSQLite]; };
-poppr = derive { name="poppr"; version="2.0.0"; sha256="1n3vdrfcwfjrxa9fff39g59kdyxs3lhykg24vppy4ngjv2yhph3y"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph pegas phangorn reshape2 shiny vegan]; };
-popsom = derive { name="popsom"; version="2.3"; sha256="0hdg1nx8mlpqw9aj2q08sb20frsc5jnbvqpfalf5kyvlygnhxdlc"; depends=[fields som]; };
+poppr = derive { name="poppr"; version="2.0.2"; sha256="1ccxjmnqixv59600gn1jknhs00yaq2mfdas6s9rwzywz1m515ff5"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph pegas phangorn reshape2 shiny vegan]; };
+popprxl = derive { name="popprxl"; version="0.1"; sha256="08gfbwlacbpnkb4q99rbxxbg17qg4alzhjn3blpfls8rnasryca4"; depends=[poppr readxl]; };
+popsom = derive { name="popsom"; version="3.0.1"; sha256="0qj4l5cdzrhiaq1q6q7wv75jnbfvw1rrms2v6ffw34wz4fs1w6is"; depends=[fields som]; };
 portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5inkv2cwgzd0zi6ky0vvrc3abchqsjm2ck"; depends=[]; };
 portfolio = derive { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; };
 portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
@@ -5325,17 +5418,17 @@ powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshql
 powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; };
 powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; };
 powerMediation = derive { name="powerMediation"; version="0.2.4"; sha256="1b4hzai52fb0kk04az3rdbfk2vldfkhsa4gx7g98lbsvw4gh9imb"; depends=[]; };
-powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m296mkk47zcpb2haain6bf23k0xzphnb4sq8f06cmq1p"; depends=[survival]; };
+powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.9"; sha256="0f8i867zc1yjdp66rjb1cp92fcfrlq167z3d0c4iv355wv4s35az"; depends=[survival]; };
 powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
 ppcor = derive { name="ppcor"; version="1.0"; sha256="18l5adjysack86ws61xh89z5xfr83v932a0pn6ad8i8py3nd85fj"; depends=[]; };
-ppiPre = derive { name="ppiPre"; version="1.8"; sha256="030jgpm91vjrjas93avxfvs0hrvdzw79p6ghfn81lakc06jjv5j8"; depends=[AnnotationDbi e1071 GOSemSim igraph]; };
+ppiPre = derive { name="ppiPre"; version="1.9"; sha256="07k2mriyz1wmxb5gka0637q4pmvnmd1j16mnkkdrsx252klgjsdw"; depends=[AnnotationDbi e1071 GOSemSim igraph]; };
 ppls = derive { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; };
 ppmlasso = derive { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; };
 pps = derive { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; };
 pqantimalarials = derive { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; };
 prLogistic = derive { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; };
 prabclus = derive { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; };
-pracma = derive { name="pracma"; version="1.8.3"; sha256="06711w5451gb22667i5dx27ysi4pfagkxdfzg270lxwbymcii6pp"; depends=[]; };
+pracma = derive { name="pracma"; version="1.8.6"; sha256="0gwdg6hz186sxanxssinz392l07p4zkyrj1p46agm130hql9a2c8"; depends=[]; };
 pragma = derive { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
 prais = derive { name="prais"; version="0.1.1"; sha256="0vv6h12gsbipi0gnq0w6xh6qvnvc0ydn341g1gnn3zc2n7cx8zcn"; depends=[]; };
 praktikum = derive { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; };
@@ -5348,7 +5441,7 @@ presens = derive { name="presens"; version="1.0.0"; sha256="0hwciahpfp7h7dchn6k6
 preseqR = derive { name="preseqR"; version="1.2.1"; sha256="1izfykccybnr2pnw043g680wg78hbds6hcfqirqhy1sfn6sf8lz1"; depends=[]; };
 prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
 prettyR = derive { name="prettyR"; version="2.1-1"; sha256="173n0cp0mq00y1ydba9m7l3izz04czg9vvadbflfinpi86wvcgq6"; depends=[]; };
-prettyunits = derive { name="prettyunits"; version="1.0.0"; sha256="0lh83pf30hnqcq6ppq8axlyawp0qxpym0lqq8pchh3gq8mgcdz1h"; depends=[assertthat magrittr]; };
+prettyunits = derive { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; };
 prevR = derive { name="prevR"; version="3.1"; sha256="1x8ssz1k8vdq3zx1qhfhyq371i8s3bam2rd6bm3biha5i8icglh6"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; };
 prevalence = derive { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; };
 prim = derive { name="prim"; version="1.0.15"; sha256="008a8fm4as5b6j70xxwiipywhbg1wmdbgjz9r7qfnivcpfarxv7f"; depends=[misc3d rgl]; };
@@ -5422,9 +5515,10 @@ pwr = derive { name="pwr"; version="1.1-2"; sha256="1czganj70qszz32yx2jprhr8h9a2
 pwt = derive { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
 pwt8 = derive { name="pwt8"; version="8.1-0"; sha256="0jvskkn3c4m2lfxm9ivm8g96kcd7ynlmjpjqbrd6sqivas0z46r2"; depends=[]; };
 pxR = derive { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[plyr reshape2 RJSONIO stringr]; };
-pxweb = derive { name="pxweb"; version="0.5.54"; sha256="17vg480b54mcv9jbkci1rrn6zi90zzw098xzrcw3kvp583as9mar"; depends=[data_table httr plyr RJSONIO stringr]; };
+pxweb = derive { name="pxweb"; version="0.5.57"; sha256="0qvafshxrxz2cvipz4rvj1rpmqmh264w78dk8jvyqvyl9qyg2724"; depends=[data_table httr plyr RJSONIO stringr]; };
 pycno = derive { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; };
 pyramid = derive { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; };
+pystr = derive { name="pystr"; version="1.0.0"; sha256="1my0prvil8l2lqc9x8qi0j1zfzxl0ism5v2581himp5n5bcv8gkk"; depends=[]; };
 qLearn = derive { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; };
 qPCR_CT = derive { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj43rjxx6sz2jpf4sk0bfvl1gyj0iz3hi"; depends=[RColorBrewer]; };
 qVarSel = derive { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; };
@@ -5434,7 +5528,7 @@ qclust = derive { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm
 qcr = derive { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; };
 qdap = derive { name="qdap"; version="2.2.2"; sha256="06y4a35ki7cml5sgr5q8cc8wh6rwv4xcrd7rki18ykyjhq4y4gc6"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; };
 qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.6"; sha256="1icivvsi33494ycd7vfqm9zx2g2rc1m3dygs3bi0ndi798z1cvx2"; depends=[]; };
-qdapRegex = derive { name="qdapRegex"; version="0.3.2"; sha256="1hygkck4wilm2f2cg5q82a867608j3dqp7wqj3kbnh5a970lw41y"; depends=[stringi]; };
+qdapRegex = derive { name="qdapRegex"; version="0.4.0"; sha256="0i2mh1xbm1g9vxdp744g23b2lcjwn7may2cn4ijfw3qpi2bf2axl"; depends=[stringi]; };
 qdapTools = derive { name="qdapTools"; version="1.1.0"; sha256="0k3mvcjj2fg2v3z8jm2z02zmrpgjpwbpcaanmp2vlykqzacsrl52"; depends=[chron data_table RCurl XML]; };
 qdm = derive { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
 qgraph = derive { name="qgraph"; version="1.3.1"; sha256="1wmpsgmzl9qg4vjjjlbxqav3ck7p26gidsqv3qryx56jx54164wg"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; };
@@ -5450,11 +5544,13 @@ qqman = derive { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6
 qqtest = derive { name="qqtest"; version="1.0"; sha256="12hw4d2gddb4fgdi986pyqgvlpxgk5lngfp989hq2a830kyxz1ds"; depends=[MASS]; };
 qrLMM = derive { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[ghyp matrixcalc mvtnorm nlme psych quantreg]; };
 qrNLMM = derive { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn122gy6aq3rp38v2bpnxfkbpj10lvy"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
+qrage = derive { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; };
 qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[cluster maptools mgraph mvoutlier pvclust]; };
+qrjoint = derive { name="qrjoint"; version="0.1-1"; sha256="0q39n4y7cdmim88na3pw05w15n95bpqnxknvh6fzz9mpbbjkxqx5"; depends=[coda kernlab Matrix quantreg]; };
 qrmtools = derive { name="qrmtools"; version="0.0-1"; sha256="0xjgb8clyhlrl4qdbhi85m97cbhab5q5sy2zr87gamz2y365alpr"; depends=[xts]; };
 qrng = derive { name="qrng"; version="0.0-2"; sha256="0rs4dggvrlc3bi0wgkjw8lhv4b3jpckcfkqzsaz0j46kf6vfgfw1"; depends=[]; };
-qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; };
-qtbase = derive { name="qtbase"; version="1.0.9"; sha256="1jffdkv6jwxqljx6jd5n27wk9r5sg0llpf34nlr29h4shi3f2f8z"; depends=[]; };
+qrnn = derive { name="qrnn"; version="1.1.3"; sha256="0phbazi47pzhvg7k3az958rk5dv7nk2wvbxqsanppxsvyxl0ykwf"; depends=[]; };
+qtbase = derive { name="qtbase"; version="1.0.11"; sha256="01fx8yabvk2rsb0mdx9f59a9qf981sl88s56iy58w5dd6r2ag6gc"; depends=[]; };
 qte = derive { name="qte"; version="1.0.1"; sha256="15y6n0c9jinfz7hmm107palgy8fl15bc71gw0bcd3bawpydkrq2w"; depends=[]; };
 qtl = derive { name="qtl"; version="1.36-6"; sha256="1qn8fv0s2934pbds2962isr8y96s2k0jlh6y27rz21qlpryrbijb"; depends=[]; };
 qtlDesign = derive { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
@@ -5471,9 +5567,9 @@ qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cp
 qualV = derive { name="qualV"; version="0.3-1"; sha256="0p4yfgq2wxwis2w28mdb61x6hzm6sb9bczjdm9bc05ga5srr3sdd"; depends=[KernSmooth]; };
 qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0ylp5a49b4q4max4yz30ia7r12s4jrvqn9zx5a21qcnpinf8b932"; depends=[]; };
 quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
-quanteda = derive { name="quanteda"; version="0.7.2-1"; sha256="1j6hjcr3sd1xymzznvz1r2z6rs3m6vp3ji5y6dqq5qr18g1bi4cm"; depends=[ca data_table Matrix proxy Rcpp RcppArmadillo SnowballC wordcloud]; };
+quanteda = derive { name="quanteda"; version="0.8.0-4"; sha256="115vds7dinddva0mhwp8cgf28c4rc72bw0hpl6za6kcmlf8a8cyw"; depends=[ca data_table Matrix proxy Rcpp RcppArmadillo SnowballC stringi wordcloud]; };
 quantification = derive { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; };
-quantmod = derive { name="quantmod"; version="0.4-4"; sha256="0a8gr2qb2b2w58zyxbyz3dbprmyiwf5cd62xqv4d3rk29l7vk4n8"; depends=[TTR xts zoo]; };
+quantmod = derive { name="quantmod"; version="0.4-5"; sha256="14y8xra36cg5zam2cmxzvkb8n2jafdpc8hhjv9xnwa91basrx267"; depends=[TTR xts zoo]; };
 quantreg = derive { name="quantreg"; version="5.11"; sha256="0pyc1zknkjyvaix76bn84l90zavajsc7jx17x0zanllnh34siizp"; depends=[SparseM]; };
 quantregForest = derive { name="quantregForest"; version="1.0"; sha256="11mnb32vz6m2g7nggip2y251rkwn6wr7jwdh0hqvl0pgalmipb84"; depends=[randomForest]; };
 quantregGrowth = derive { name="quantregGrowth"; version="0.3-1"; sha256="0cm4ac9rn5vhqhi7f5qiilym1vp7x6bglwghw22b70nf9zvcap9h"; depends=[quantreg]; };
@@ -5503,14 +5599,14 @@ rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r
 rDEA = derive { name="rDEA"; version="1.2-1"; sha256="0zm9vnysj5j3kq8n8ljgxqn45jf1c6cg7mcvpd36bs75kz03bwig"; depends=[maxLik slam truncnorm truncreg]; };
 rDNA = derive { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; };
 rDVR = derive { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; };
-rEMM = derive { name="rEMM"; version="1.0-10"; sha256="0yngddddrc8fwqda79vc3sz58c1amns69ycn7rbyfzqwiifsvdjk"; depends=[clusterGeneration igraph MASS proxy]; };
+rEMM = derive { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; };
 rFDSN = derive { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; };
 rFerns = derive { name="rFerns"; version="1.1.0"; sha256="00ddb9zwf4hqkx9qmrndz182mg69mb5fyg0v0v4b32sy4sixnps5"; depends=[]; };
 rGammaGamma = derive { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
 rHealthDataGov = derive { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; };
 rHpcc = derive { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; };
 rJPSGCS = derive { name="rJPSGCS"; version="0.2-7"; sha256="1j8lc56q20b0qkl20r8mqa6q822rpfphj00dlmj50rgwk02pfc69"; depends=[chopsticks rJava]; };
-rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0"; depends=[]; };
+rJava = derive { name="rJava"; version="0.9-7"; sha256="14wlcq9bcccs9a2kimsllgi9d0hsgnjc5q2xlc0qz8w5rffi54iw"; depends=[]; };
 rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; };
 rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
 rLTP = derive { name="rLTP"; version="0.1.2"; sha256="1cr0r3v7d09bss16fxls341l71i9wkg91hr2hiyr4cl5fg35zzgb"; depends=[RCurl]; };
@@ -5549,7 +5645,7 @@ randomForest = derive { name="randomForest"; version="4.6-10"; sha256="0glj08w6s
 randomForestSRC = derive { name="randomForestSRC"; version="1.6.1"; sha256="174ky1wwdpq6wkn8hanfpfgy55jf6v1hlm6k688gjs0515y5490r"; depends=[]; };
 randomGLM = derive { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; };
 randomLCA = derive { name="randomLCA"; version="1.0-2"; sha256="14v6jmsbyzmavxjdwh9nb0lljhc7kdly4p1v2a9jypjil6kk5ibc"; depends=[boot fastGHQuad lattice]; };
-randomNames = derive { name="randomNames"; version="0.0-8"; sha256="10fhqxnnw6gk5g8jnb83hh2nvvj65g8mwy7rfln8yzq93gjxnykm"; depends=[data_table]; };
+randomNames = derive { name="randomNames"; version="0.1-0"; sha256="0v92w0z0dsdp6hhyyq764nlky8vmbs6vcnrna5ls47fj80f9cqa4"; depends=[data_table]; };
 randomUniformForest = derive { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[cluster doParallel foreach ggplot2 gtools iterators MASS pROC Rcpp]; };
 randomizationInference = derive { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; };
 randomizeBE = derive { name="randomizeBE"; version="0.3-2"; sha256="1mkq1fpr7bwlk01246qy6w175jcc94q8sb3pyjkdr8yms6iqk8i7"; depends=[]; };
@@ -5557,7 +5653,8 @@ randomizr = derive { name="randomizr"; version="0.2.2"; sha256="0g870sr8zjfl1dh3
 randtests = derive { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
 randtoolbox = derive { name="randtoolbox"; version="1.16"; sha256="03z4g2mmdywsgl95xbj80awirkgrghdk2kwhsh58p00aq4bpl5ff"; depends=[rngWELL]; };
 rangeMapper = derive { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[classInt lattice maptools raster RColorBrewer rgdal rgeos RSQLite sp]; };
-rankdist = derive { name="rankdist"; version="0.4.1"; sha256="11lc7ggi5bv836f3bwk8gb5pry4fw4qwbj95bzg34xdascaapw59"; depends=[hash optimx Rcpp]; };
+ranger = derive { name="ranger"; version="0.2.6"; sha256="0dyp4dvxxmydqyrk4d1xzvh4g9ad15hra96p8bf623csfgwj7naf"; depends=[Rcpp]; };
+rankdist = derive { name="rankdist"; version="1.0.0"; sha256="1hzrm21s9zlmhkxl3zqbdizhi8256cvw2l5gwx24azq7gf87mh57"; depends=[hash optimx permute Rcpp]; };
 rankhazard = derive { name="rankhazard"; version="1.0"; sha256="1kylg8yjrixbv86i2ffhhn8f5shsj8kvi66k202ari0li92y7dsg"; depends=[survival]; };
 rappdirs = derive { name="rappdirs"; version="0.3"; sha256="1yjd91h1knagri5m4djal25p7925162zz5g6005h1fgcvwz3sszd"; depends=[]; };
 rapport = derive { name="rapport"; version="0.51"; sha256="1qn45nrcawr8d9pkdnpmm37dg31l28gfbnwjl62fs7y691187cqp"; depends=[lattice pander plyr reshape yaml]; };
@@ -5570,12 +5667,12 @@ rasterVis = derive { name="rasterVis"; version="0.35"; sha256="0kdpng32b3l0hsf24
 rateratio_test = derive { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
 raters = derive { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; };
 rationalfun = derive { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; };
-rattle = derive { name="rattle"; version="3.4.1"; sha256="1ql7zppca6p9cph0wca5wxhhn5f8spzpxa8r65372mvigg0iw6k3"; depends=[]; };
+rattle = derive { name="rattle"; version="3.5.0"; sha256="09v9q5wkmiyvym99kxw0pirzfq3jxp55gfnqlb93jvwjv8k91xy7"; depends=[RGtk2]; };
 rawFasta = derive { name="rawFasta"; version="1.0.0"; sha256="0krvs8d1r8hggjg84n7g3ncdkifa3hipbma98f49kf81fzn2npip"; depends=[]; };
-rbamtools = derive { name="rbamtools"; version="2.10.0"; sha256="00y5393nac4x1vz9m5li0053cr679dj29v7ss6njgph8q27mv19c"; depends=[]; };
+rbamtools = derive { name="rbamtools"; version="2.12.3"; sha256="0vh6kal5r5v708d3a4lsmgbssjb0b9l1iypibkd9v97j00cbk6rr"; depends=[]; };
 rbefdata = derive { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; };
 rbenchmark = derive { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
-rbhl = derive { name="rbhl"; version="0.1.0"; sha256="1m2n1qczhhdlv9pkmw9dlqi2wmdw8wac8d557c4rk0vnzwzgpgpi"; depends=[httr plyr RJSONIO XML]; };
+rbhl = derive { name="rbhl"; version="0.2.0"; sha256="169nrbpi9ijzb5qk1b1dwjayfnsjq8r67dc7bis9aicyp4hpjyzw"; depends=[httr jsonlite plyr XML]; };
 rbison = derive { name="rbison"; version="0.4.8"; sha256="10kwlf7vrzw2rhsdwih5lcvjw0bz0n88mp74ayc9331d8j226214"; depends=[dplyr ggplot2 httr jsonlite mapproj plyr sp]; };
 rbitcoinchartsapi = derive { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; };
 rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; };
@@ -5587,14 +5684,15 @@ rcdd = derive { name="rcdd"; version="1.1-9"; sha256="1mwg9prf7196b7r262ggdqsfq1
 rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint iterators png rcdklibs rJava]; };
 rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; };
 rchallenge = derive { name="rchallenge"; version="1.1"; sha256="1qad0mcadr3zw5r37rgwnqf4ic9brlw3zl5n4jcxyaj324fj4pa3"; depends=[knitr rmarkdown]; };
-rcicr = derive { name="rcicr"; version="0.3.0"; sha256="0fvv6diqg6sw3ar3gzvhl3mbm6zvx0k12lzsa92mccg0giqa9n0w"; depends=[aspace jpeg matlab]; };
+rcicr = derive { name="rcicr"; version="0.3.2"; sha256="153d6wl0grnfc842hpc5zd9m5xkybkmy1mpkw8wba4xy0mgppgjd"; depends=[aspace dplyr jpeg matlab]; };
 rclinicaltrials = derive { name="rclinicaltrials"; version="1.4.1"; sha256="1x8mj4gzfpgvdj3glwanr76g5x8pks8fm806bvnfls35g967z4p4"; depends=[httr plyr XML]; };
-rcorpora = derive { name="rcorpora"; version="1.1.0"; sha256="05i9zqvgg5fxgscqzmbsi84baq9cxs14k70agjy95h61fndaaarf"; depends=[jsonlite]; };
+rcorpora = derive { name="rcorpora"; version="1.1.1"; sha256="14lnfn9armb6rz1wcs7hdrb4j2vzh6b8pi9lsj83l3zixkxx5izk"; depends=[jsonlite]; };
 rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[BH Rcpp RcppArmadillo]; };
-rcrossref = derive { name="rcrossref"; version="0.3.0"; sha256="1w822n6mlld7fa92iy38xjvgnkhyns3mvy7vaqabgr2bikcz6545"; depends=[bibtex dplyr httr jsonlite plyr XML]; };
+rcrossref = derive { name="rcrossref"; version="0.3.4"; sha256="1glgcclc4zqipccmdniqy4ajsh32y3azwkd7cc75i855gbk8vdmn"; depends=[bibtex dplyr httr jsonlite plyr XML]; };
 rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
 rdatamarket = derive { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[RCurl RJSONIO zoo]; };
 rdd = derive { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[AER Formula lmtest sandwich]; };
+rddtools = derive { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; };
 rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
 rdrobust = derive { name="rdrobust"; version="0.80"; sha256="02adafhbjp259hbbbk32yllgn35xxim2mwn6yixv4wh5dgr974v6"; depends=[]; };
 rdrop2 = derive { name="rdrop2"; version="0.6"; sha256="1yxg38v7r34f9rid5q6q1g9f30q3zc4dnkziyps3514l5dnbvk3j"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; };
@@ -5611,20 +5709,21 @@ readr = derive { name="readr"; version="0.1.1"; sha256="1raw3kihksqr274p0mdigfxp
 readstata13 = derive { name="readstata13"; version="0.7"; sha256="14il790jgn8l9c8gxgl2s11vzff5xz77jsgdgjs044r407a72wkb"; depends=[Rcpp]; };
 readxl = derive { name="readxl"; version="0.1.0"; sha256="0a0mjcn70a0nz1bkrdjwq495000kswxvyq1nlad9k3ayni2ixjkd"; depends=[Rcpp]; };
 reams = derive { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
-rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjfab7wngszmy1g8rd3hiwx6br0sjidcg"; depends=[httr plyr RCurl RJSONIO]; };
+rebird = derive { name="rebird"; version="0.2"; sha256="11x8db6gq9qkv9skslda4j6zgzmkmiap78rlwnlvkjvk1gzz13bf"; depends=[dplyr httr jsonlite]; };
 rebmix = derive { name="rebmix"; version="2.7.1"; sha256="1m3mmqi4kfai0hx2khkblqairp59fgh0japg23rgib1djmdcqb4n"; depends=[]; };
 rebus = derive { name="rebus"; version="0.0-5"; sha256="06rl6knnk93k537hhjx4r55hq6hssij7xc426ilki329vwfi5kyf"; depends=[]; };
 recalls = derive { name="recalls"; version="0.1.0"; sha256="121r2lf32x4yq8zxx6pbnphs7ygn382ns85qxws6jnqzy52q41vh"; depends=[RCurl RJSONIO]; };
 recluster = derive { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
-recommenderlab = derive { name="recommenderlab"; version="0.1-6"; sha256="1ds1zvjgn3k7pha8pf3x7q0403zjf45b9hjsw3ixfzd747kwkaw0"; depends=[arules Matrix proxy registry]; };
-recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-0"; sha256="0dl79cxarsfp8l4nxnns05jwnjygigjhwpjrr4lzx4nvsfxmgsr2"; depends=[recommenderlab]; };
-recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-0"; sha256="1m5jg8gs16cwwwcnjzqkyzwyip8fshrwhmqz8g7nlf6g3p9347rl"; depends=[recommenderlab]; };
+recoder = derive { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; };
+recommenderlab = derive { name="recommenderlab"; version="0.1-7"; sha256="1qysw4522wmgrzwdmbmfa2ll689kllrwjrxialpwggq8raccrsqd"; depends=[arules Matrix proxy registry]; };
+recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-1"; sha256="042yh0h8qxj7n9hysrfdxnpb3g0zb6s5b683s7hn5mjc55q7nn4g"; depends=[recommenderlab]; };
+recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-1"; sha256="1ygdq7wd970yi7298i62r22fg657bswwkmqjabph7if6b13fjyfb"; depends=[recommenderlab]; };
 reconstructr = derive { name="reconstructr"; version="1.1.0"; sha256="1kswvpmhk3zzwm4nv6pjb80ww95n9bd4q9j7bhk9kql8v5mnfg5m"; depends=[Rcpp]; };
 recosystem = derive { name="recosystem"; version="0.3"; sha256="064rnnz4m85mwq3084m0ldj8sb5z6jwzqzkh22fagsq2xyqri15l"; depends=[Rcpp]; };
 redcapAPI = derive { name="redcapAPI"; version="1.3"; sha256="08js2lvrdl9ig0pq1wf7cwkmvaah6xs65bgfysdhsyayx0lz5rii"; depends=[chron DBI Hmisc httr stringr]; };
 redist = derive { name="redist"; version="1.1"; sha256="0ddwvmzmqv5nm3azia1g0x0icj1jcd7s34f1kv01phky2pmz5wy4"; depends=[coda Rcpp RcppArmadillo sp spdep]; };
 ref = derive { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; };
-refGenome = derive { name="refGenome"; version="1.3.0"; sha256="121aw4w84hlhxgwlf1gh0w3ydvd8zsijrh0q7fzcwi1vdgnjb7lv"; depends=[DBI doBy RSQLite]; };
+refGenome = derive { name="refGenome"; version="1.5.8"; sha256="12dnf6lbwmxb9zkzfv1s7ivc22z5fvdzf3glb83svyfcbw3fcmqf"; depends=[DBI doBy RSQLite]; };
 referenceIntervals = derive { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; };
 refset = derive { name="refset"; version="0.1.0"; sha256="0yj87sp6ghxv20hz5knmw3d7way1hsggk759wqxsbfprd38y6khd"; depends=[]; };
 refund = derive { name="refund"; version="0.1-11"; sha256="1afsxab1jivs4vj6diqh7352v98divna6az1dxsdn7lvw6cmph6y"; depends=[boot fda gamm4 glmnet lattice lme4 magic MASS Matrix matrixStats mgcv nlme RLRsim wavethresh]; };
@@ -5664,12 +5763,13 @@ reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgyd
 reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; };
 reports = derive { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; };
 reporttools = derive { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; };
-repra = derive { name="repra"; version="0.4.2"; sha256="1djcs83z8ckpmsbyzscnysmy45z28kswzm852176b9pip21mb1w8"; depends=[assertthat data_table dplyr ggplot2 Rcpp reshape2]; };
+repra = derive { name="repra"; version="0.4.4"; sha256="02345sx89d9h37fwh5mh7925jjkcf3kmwxnwb27zhr2wfijv9kfn"; depends=[assertthat data_table dplyr ggplot2 Rcpp reshape2]; };
 represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
 reproducer = derive { name="reproducer"; version="0.1.3"; sha256="1pz2l123xc16m1pqi95khg9r267s25igcyjgr7hn9gy623cqgzah"; depends=[ggplot2 gridExtra metafor openxlsx RColorBrewer tm wordcloud xtable]; };
 rerddap = derive { name="rerddap"; version="0.2.0"; sha256="15p3nh421k7pavjgpmj7lah8mnld3g3zmqima4v2vs81yrg72s24"; depends=[data_table digest dplyr httr jsonlite ncdf xml2]; };
 resample = derive { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
 resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[foreach iterators pls Rcpp RcppArmadillo]; };
+reservoir = derive { name="reservoir"; version="1.0.0"; sha256="178yb8wp82acbn76dg6kz9cn5hnxkkfpnkasj7pfz00l1jakn7li"; depends=[gtools]; };
 reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; };
 reshape2 = derive { name="reshape2"; version="1.4.1"; sha256="0hl082dyk3pk07nqprpn5dvnrkqhnf6zjnjig1ijddxhlmsrzm7v"; depends=[plyr Rcpp stringr]; };
 reshapeGUI = derive { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; };
@@ -5696,10 +5796,11 @@ rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4
 rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
 rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; };
 rgauges = derive { name="rgauges"; version="0.2.0"; sha256="0p42hh32wcjcchsalpsan52kvz6nd1gw28xnydqgfzkzcqkl22dd"; depends=[data_table ggplot2 gridExtra httr lubridate plyr reshape2 scales]; };
-rgbif = derive { name="rgbif"; version="0.8.6"; sha256="03pbqg82xqwzi0x86qpcgznxwvivrai16j5bpv8y21ipxv6dy3xw"; depends=[data_table ggplot2 httr jsonlite magrittr V8 whisker XML]; };
+rgbif = derive { name="rgbif"; version="0.8.8"; sha256="1flabwa0fjwa38idyddbag9a7cyifpdc66nap25pw061a886jndd"; depends=[data_table ggplot2 httr jsonlite magrittr V8 whisker XML]; };
 rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
 rgdal = derive { name="rgdal"; version="1.0-4"; sha256="0c0fwq11ql1spw3791x7yd8fcmi0rlsxvk2bhf0951kvc99vbyv9"; depends=[sp]; };
-rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; };
+rgenoud = derive { name="rgenoud"; version="5.7-12.4"; sha256="19y0297fsxggjrdjv8n3a5klbqf8y3mq4mmdz6xx28cz3k65dk4n"; depends=[]; };
+rgeolocate = derive { name="rgeolocate"; version="0.4.1"; sha256="1xrgk8nzd0j2zhq6m4jlck5vg151bynwjswkqav38iljh9087wv2"; depends=[httr Rcpp]; };
 rgeos = derive { name="rgeos"; version="0.3-11"; sha256="1x5fna4n5ck0wfdrplj5q5cvv289fzsmlr95q86na78lvwn14fzl"; depends=[sp]; };
 rgexf = derive { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
 rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
@@ -5710,12 +5811,12 @@ rgpui = derive { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89
 rgr = derive { name="rgr"; version="1.1.11"; sha256="01hlj3nqzfsffr4k7d3iyp4mfqs1sy94d0scy64wh9kkplrzkh4i"; depends=[fastICA MASS]; };
 rgrass7 = derive { name="rgrass7"; version="0.1-0"; sha256="19fwf3gaq25x3imj9kc1112cf9dhafp0d1gjly2xh2gz1kam5wl6"; depends=[sp XML]; };
 rhandsontable = derive { name="rhandsontable"; version="0.1"; sha256="0nssb7gqx3rsc2mbic2mlzldq5vpmp97qv9c62d7pkbxxwxlm1f0"; depends=[htmlwidgets jsonlite magrittr]; };
-rhosp = derive { name="rhosp"; version="1.06"; sha256="0kii29w292kffxablqnmgvl127jwsriz0p5y5d1xd6n8yzji79j3"; depends=[]; };
+rhosp = derive { name="rhosp"; version="1.07"; sha256="09wq96micv9wpr3sx8ir7frkanpy3zi3mwn6rbixw2kxvn5wkkfn"; depends=[]; };
 ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
 riceware = derive { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; };
 rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot permute vegan]; };
 ridge = derive { name="ridge"; version="2.1-3"; sha256="1i5klabnv328kgy7p11nwdid2x7hzl1j80yqqshbraladszyfpwk"; depends=[]; };
-ridigbio = derive { name="ridigbio"; version="0.2.2"; sha256="065pad7pprax1mgqikjrl4nygyw5mjr80j21072zb7qcki9ag2k5"; depends=[httr jsonlite]; };
+ridigbio = derive { name="ridigbio"; version="0.3"; sha256="0f2jqmm2gpq4inipmmzbhgv1a417czrycqsha5q3h16rqz6jzcfq"; depends=[httr jsonlite plyr]; };
 rinat = derive { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[ggplot2 httr jsonlite maps plyr]; };
 rindex = derive { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
 rio = derive { name="rio"; version="0.2"; sha256="0v64zkxcs2bajdh9hqlhacc6msy7l3h31cvcxpj6in5hb3m1wfv3"; depends=[curl data_table foreign haven jsonlite openxlsx readODS readxl XML]; };
@@ -5741,7 +5842,7 @@ rknn = derive { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjz
 rkt = derive { name="rkt"; version="1.4"; sha256="01c8fwnml1n0sw5lw9p2nz15i1zhxirr0kh39qvjmdiw97c1v1yq"; depends=[]; };
 rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; };
 rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; };
-rlist = derive { name="rlist"; version="0.4"; sha256="00h00jka64m7skrjp1454805fhr3q1k9sqih4pnvbb0maxlzgn7g"; depends=[jsonlite yaml]; };
+rlist = derive { name="rlist"; version="0.4.2.3"; sha256="1p35l7zslhid0913hga7cw240ra43skcgwwdp5fwhclhd89ay9rj"; depends=[data_table jsonlite XML yaml]; };
 rlm = derive { name="rlm"; version="1.1"; sha256="147hn780hjbp8ly3mc5q05g36b080ndq0z0r0vq75c2qfkhybvdc"; depends=[]; };
 rlme = derive { name="rlme"; version="0.4"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; };
 rmaf = derive { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
@@ -5750,7 +5851,7 @@ rmatio = derive { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j4
 rmeta = derive { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; };
 rmetasim = derive { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ade4 ape gtools]; };
 rmgarch = derive { name="rmgarch"; version="1.2-9"; sha256="0nwhjypcfzaamg5kdmlx2lp5pr2xpjxdx15j5vs5ki8kvy65hzqj"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
-rminer = derive { name="rminer"; version="1.4"; sha256="07s971fpl16l4ryrbb24zwy1xx6dwia1ms4hrcpnpz3kb8f6ydda"; depends=[adabag Cubist e1071 kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart]; };
+rminer = derive { name="rminer"; version="1.4.1"; sha256="1rbs5k3jxjbxr3pdlg03591h8yy9nrg8zjq1kcnvmzgza2a25613"; depends=[adabag Cubist e1071 kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart]; };
 rmngb = derive { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; };
 rmongodb = derive { name="rmongodb"; version="1.8.0"; sha256="035a76ak6wi21hdvgzzbggz0qnb53rrr2wfx97ngc8ijwhw8hjh7"; depends=[jsonlite plyr]; };
 rmp = derive { name="rmp"; version="1.0"; sha256="1g0785fwjbwbj82sir3n7sg3idsjzdhrpxc7z88339cv9g4rl7ry"; depends=[]; };
@@ -5758,10 +5859,10 @@ rms = derive { name="rms"; version="4.3-1"; sha256="07198lzk3yzl9vnqcfxqgp5kpb50
 rms_gof = derive { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
 rnaseqWrapper = derive { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; };
 rnbn = derive { name="rnbn"; version="1.0.3"; sha256="05amrx12b7p4pca1wbysn1n2rxbg5r54mpmga4i3xlpijx9baj80"; depends=[httr]; };
-rncl = derive { name="rncl"; version="0.2.2"; sha256="1l9g7mylj4ip15x4985i27n42fhi9vyi1ii23dc9k27s84b274y7"; depends=[ape Rcpp]; };
+rncl = derive { name="rncl"; version="0.6.0"; sha256="067x05xg7bs271zjhylz3dcd9zan1ycmsh771gn06k9905rr2y71"; depends=[Rcpp]; };
 rneos = derive { name="rneos"; version="0.2-8"; sha256="0cg88l1irqkx7d72sa5bfqcn5fb5rapvimi1gw15klci39w0s43q"; depends=[RCurl XML]; };
 rngSetSeed = derive { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; };
-rngWELL = derive { name="rngWELL"; version="0.10-3"; sha256="1wijscc0s6h1ipc1r8h179y94s1bzf409xlpiyr1njaxvvvpwvw1"; depends=[]; };
+rngWELL = derive { name="rngWELL"; version="0.10-4"; sha256="0ayrkd2yllsgl7iqqbhiyrnyyqk13f4wh1np23iz0zj650yjqdq8"; depends=[]; };
 rngtools = derive { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[digest pkgmaker stringr]; };
 rngwell19937 = derive { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; };
 rnoaa = derive { name="rnoaa"; version="0.4.2"; sha256="14fd1mp7ydpqj0wqr3nyysks36dj7bmcyirpsbrn6pjjdasn6a0s"; depends=[dplyr ggplot2 httr jsonlite lubridate rgdal scales tidyr XML]; };
@@ -5775,10 +5876,10 @@ robust = derive { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7
 robustDA = derive { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; };
 robustHD = derive { name="robustHD"; version="0.5.0"; sha256="14ql2k5880lbwkv1acydrli6jyh6dls32jjhimbz82zzkzfk2cxr"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; };
 robustX = derive { name="robustX"; version="1.1-4"; sha256="1s2aav2jr22dgrl7xzk09yn9909k76kpiz271w5r1id6hpfprjwc"; depends=[robustbase]; };
-robustbase = derive { name="robustbase"; version="0.92-4"; sha256="0dyz2wwfjq8bjjwi4fhm6v3sxmlh34bawppakl4l6dv7vpjsv85k"; depends=[DEoptimR]; };
+robustbase = derive { name="robustbase"; version="0.92-5"; sha256="0wsdgqbkr0amid71q52cij9wnyss2sh1fm75g8cp4d6dndh327rl"; depends=[DEoptimR]; };
 robustfa = derive { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; };
 robustgam = derive { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; };
-robustlmm = derive { name="robustlmm"; version="1.7-2"; sha256="0cwr5fsl3m78xvfv3cy6n82zsdwsyq2zrlnzdppba9ja6hnh32wm"; depends=[ggplot2 lattice lme4 Matrix nlme robustbase xtable]; };
+robustlmm = derive { name="robustlmm"; version="1.7-4"; sha256="0c9syqz1hbwwc9kfnsc1f321zy76q9c0rxgb9j1ac33sp5w5g88c"; depends=[ggplot2 lattice lme4 Matrix nlme robustbase xtable]; };
 robustloggamma = derive { name="robustloggamma"; version="0.4-31"; sha256="19ycdvpzns46gjnkddwznnszs0941blpss7l0cqligv91cz7bkjc"; depends=[robustbase]; };
 robustreg = derive { name="robustreg"; version="0.1-7"; sha256="1nrz10065mwccil78c74vmkhinskpnk1vyp1ikrdw23vyk2l00nc"; depends=[Matrix Rcpp RcppArmadillo]; };
 robustvarComp = derive { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[GSE numDeriv plyr robust robustbase]; };
@@ -5792,6 +5893,7 @@ ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177
 rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1fb7mm0dry9s26nfvv1v91cslss82phhf16wd"; depends=[ggplot2 gridExtra Rglpk]; };
 rotationForest = derive { name="rotationForest"; version="0.1"; sha256="07my0i84jvmjxvg2ifvsrbc0r5z4s32xi0vfdwrkhhdzdn87h527"; depends=[rpart]; };
 rotations = derive { name="rotations"; version="1.3"; sha256="01qqiqlp370llk8w9g0nip08cd54rj9dsvf0qxznalyb7vpnvgxf"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; };
+rotl = derive { name="rotl"; version="0.4.1"; sha256="1f5x2adlv7fbz0w4bwc7q69wq20rlx5scyzl1immkxgs27was4l1"; depends=[ape httr jsonlite rncl]; };
 roughrf = derive { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; };
 rowr = derive { name="rowr"; version="1.1.2"; sha256="1hvj17n3fy1jaaz551s1icjv1kgr2s22xvg4fllzs8hpgdsybp1j"; depends=[]; };
 roxygen2 = derive { name="roxygen2"; version="4.1.1"; sha256="0qr562p3jb9kqim6mj344956pikmq1137gv1p086b4k90h5c3wyd"; depends=[brew digest Rcpp stringr]; };
@@ -5805,7 +5907,7 @@ rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16x
 rpf = derive { name="rpf"; version="0.45"; sha256="1d22wjhv14rl16kljn42j4hba30x28zd5svddrpxp1kraxjq5mn7"; depends=[mvtnorm RcppEigen]; };
 rpg = derive { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[RApiSerialize Rcpp uuid]; };
 rphast = derive { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; };
-rplexos = derive { name="rplexos"; version="1.1.1"; sha256="1s3srk5f1ciy43vblwsy7wrwp2k2j5q52dfl4vjg69i63bh9yrpf"; depends=[data_table DBI doParallel dplyr foreach lubridate Rcpp RSQLite stringi tidyr]; };
+rplexos = derive { name="rplexos"; version="1.1.4"; sha256="1q9vlxhglmrwxh9g4wq98nc321kq7jhgkykp9hwl3bd26a1jcfjp"; depends=[data_table DBI doParallel dplyr foreach lubridate Rcpp RSQLite stringi tidyr]; };
 rplos = derive { name="rplos"; version="0.5.0"; sha256="1ajwm413w7p41ifrp4flskgaqilrs3shzjbb2wnmwgwcnnkw43h9"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker]; };
 rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; };
 rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; };
@@ -5830,7 +5932,7 @@ rsatscan = derive { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl
 rscala = derive { name="rscala"; version="1.0.6"; sha256="065ll2xza09hi05w4hq35jl6y1nvwrv93ld983nxaji81z9pfgzx"; depends=[]; };
 rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; };
 rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
-rsdmx = derive { name="rsdmx"; version="0.4-6"; sha256="0hsf0jkp31qfvl4pxaqxwz1fvwgmqld3rnbk9g29g5bqwld40syc"; depends=[plyr RCurl XML]; };
+rsdmx = derive { name="rsdmx"; version="0.4-7"; sha256="1k4imwcw720hwqshmnl6kx9p9rd7yvh3i85hhc3nr62g1i6ckzww"; depends=[plyr RCurl XML]; };
 rseedcalc = derive { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; };
 rsem = derive { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; };
 rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; };
@@ -5838,11 +5940,13 @@ rsig = derive { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k
 rsm = derive { name="rsm"; version="2.7-2"; sha256="0pn018n36h1xhhlsimggbfgfgl9nh5a49x8amkqy3drrnamjl577"; depends=[]; };
 rsml = derive { name="rsml"; version="1.2"; sha256="1w9bqs32sn5ry5qjgnqnns56ylr59cq5kczjsssw3yvc8a8lr39x"; depends=[rgl XML]; };
 rsnps = derive { name="rsnps"; version="0.1.6"; sha256="1pqdmg1cwpm0cvr5ma7gzni88iq5kqv1w40v8iil3xvcmns8msjk"; depends=[httr jsonlite plyr RCurl stringr XML]; };
-rspa = derive { name="rspa"; version="0.1-7"; sha256="0hmdfj1cgy9fjfbrs8qvx79fkv5v1xr6vrwjp89lq0blhsnzn5k2"; depends=[editrules]; };
+rspa = derive { name="rspa"; version="0.1.8"; sha256="1zgk1v1yk9c51wbsl3skqfrznqj84146dzfwg7q3jy2hpdgf1cg6"; depends=[editrules]; };
 rspear = derive { name="rspear"; version="0.1-2"; sha256="1rjg84plnvlcp3p2929f1afl43lb92d3bfsvlhsaw92z7iva1vad"; depends=[plyr]; };
 rstackdeque = derive { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
+rstan = derive { name="rstan"; version="2.7.0-1"; sha256="0b26wp91rkzkpp50jv5n87nqxi8hvhkzy8zphsr10il98k3l52dq"; depends=[BH inline Rcpp RcppEigen StanHeaders]; };
 rstiefel = derive { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; };
-rstream = derive { name="rstream"; version="1.3.2"; sha256="1habswhdlx7l92s9p9554px4kf9f9mhk5vkdq2fv4wk3381c0fgi"; depends=[]; };
+rstpm2 = derive { name="rstpm2"; version="1.2.2"; sha256="0mmawy16b8yvzm8d5rx3dbchs7ybr2s5v6clqg88jkrff7141i7m"; depends=[bbmle mgcv numDeriv Rcpp RcppArmadillo survival]; };
+rstream = derive { name="rstream"; version="1.3.3"; sha256="1fw9bm4ilrgbbgpwy4v483g1w1ag2yzh2p820vni14y649hi5r3f"; depends=[]; };
 rstudioapi = derive { name="rstudioapi"; version="0.3.1"; sha256="0q7671d924nzqsqhs8d9p7l907bcam56wjwm7vvz44xgj0saj8bs"; depends=[]; };
 rsubgroup = derive { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; };
 rsunlight = derive { name="rsunlight"; version="0.4.0"; sha256="0hmpmf0ma0bycb65bq18q4y78187y9rq0vsj2d8hdmkksvyqjviy"; depends=[httr jsonlite plyr stringr]; };
@@ -5852,21 +5956,21 @@ rtdists = derive { name="rtdists"; version="0.2-6"; sha256="1f2yv4qq27i1fc0ys3kk
 rtematres = derive { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; };
 rtf = derive { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_methodsS3 R_oo]; };
 rtfbs = derive { name="rtfbs"; version="0.3.4"; sha256="1z5rhxgi44xdv07g3l18ricxdmp1p59jl8fxawrh5jr83qpcxsks"; depends=[rphast]; };
-rtiff = derive { name="rtiff"; version="1.4.4"; sha256="13cz35dfz735yk2lci8cmjmsg4ddm31lv98lpx8ymy3bwmzdmc3c"; depends=[pixmap]; };
+rtiff = derive { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; };
 rtkpp = derive { name="rtkpp"; version="0.8.6"; sha256="0alg3002q8mcqd55prmsa6hfwg0qfrv30aq5p85v094l8cl7qd8l"; depends=[Rcpp]; };
-rtop = derive { name="rtop"; version="0.3-45"; sha256="0dh7jlnakk1hd27swspa0fj6pq6yddxhz32w3d7xq8jgr7xm8d70"; depends=[gstat sp]; };
+rtop = derive { name="rtop"; version="0.5-5"; sha256="05yygg85f981x2amf9y8nr4ymya3pkwlig8i1rf9b49jx11h5w8j"; depends=[gstat sp]; };
 rts = derive { name="rts"; version="1.0-3"; sha256="0jqk0p2q1vx9l6zf9pbc5k3lsw4hg5x1r6p0f7wjiks50x55pbl4"; depends=[raster xts zoo]; };
 rtype = derive { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
 rucm = derive { name="rucm"; version="0.4"; sha256="1s3q6wfp9nb50rqsaq6h2wb48qvxncmlf8l4gm18pr25wkangfxq"; depends=[KFAS]; };
 rugarch = derive { name="rugarch"; version="1.3-4"; sha256="1za92hqfaws8azf2zml1q8mlbirrdw3rb4rvwg6sclfx7z7gsqkh"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; };
 runittotestthat = derive { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; };
 runjags = derive { name="runjags"; version="2.0.1-4"; sha256="1any5f7paf8a8yyvk594iixvh1l1dc87pil292sd1pq1lh2510lw"; depends=[coda lattice]; };
-ruv = derive { name="ruv"; version="0.9.5"; sha256="19n2zrbfg6kzks395iiv1wbz2zf1j25aap3iy3d8yspmasqxi93x"; depends=[]; };
+ruv = derive { name="ruv"; version="0.9.6"; sha256="12zi775nx6k1j9sz691x6r9r0arfnhwddf5nxbr1xk25dj9qa210"; depends=[]; };
 rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; };
 rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
 rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
 rvalues = derive { name="rvalues"; version="0.3"; sha256="0fkf0gngrx1rfa67blzf3xxjwhlp2m2jplxw3z3j9vgl6ray0nqs"; depends=[]; };
-rversions = derive { name="rversions"; version="1.0.1"; sha256="1qqar1cg8218dr4hp09629jx6yvwcnwxzp8grnqcmhbc5xyx76ch"; depends=[curl xml2]; };
+rversions = derive { name="rversions"; version="1.0.2"; sha256="0xmi461g1rf5ngb7r1sri798jn6icld1xq25wj9jii2ca8j8xv68"; depends=[curl xml2]; };
 rvertnet = derive { name="rvertnet"; version="0.3.0"; sha256="12gsd9p5v0kqdzrjksz10s54h3v3a79njahgajpz6qf3sm6f3jmj"; depends=[dplyr ggplot2 httr jsonlite maps plyr]; };
 rvest = derive { name="rvest"; version="0.2.0"; sha256="1bg9l0wzh9xs7rpacl8s6q33hkjvv85vsl8079qsri0lr856wni7"; depends=[httr magrittr selectr XML]; };
 rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
@@ -5877,7 +5981,7 @@ ryouready = derive { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3
 rysgran = derive { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; };
 rzmq = derive { name="rzmq"; version="0.7.7"; sha256="0gf8gpwidfn4756jqbpdbqsl8l4ahi3jgavrrvbbdi841rxggfmx"; depends=[]; };
 s20x = derive { name="s20x"; version="3.1-16"; sha256="10z19q28wv3jnrs8lhban4a6hxqxgivcalq633p3hpa4zhw7nsj7"; depends=[]; };
-s2dverification = derive { name="s2dverification"; version="2.1.1"; sha256="1m3m5sbq96fhnl4slxgb2j0009kqfdivdn3nbb203pc0knjpflnq"; depends=[GEOmap geomapdata mapproj maps]; };
+s2dverification = derive { name="s2dverification"; version="2.4.0"; sha256="18jj1b2a20x2yzcldjl571m42swrbj8md9hxlkdbgmv4w0zj27d1"; depends=[abind bigmemory GEOmap geomapdata mapproj maps ncdf4 plyr SpecsVerification]; };
 s4vd = derive { name="s4vd"; version="1.0"; sha256="07pnkhyqf9iymj913813d93dmb3iqbdlcl0gsgacihyyinb4id5s"; depends=[biclust]; };
 sBF = derive { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; };
 sExtinct = derive { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; };
@@ -5886,7 +5990,7 @@ sROC = derive { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrl
 sac = derive { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
 saccades = derive { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; };
 sadists = derive { name="sadists"; version="0.2.1"; sha256="0m3rlbhgzl0xvx8bcaswbi9nsrgfhdmkywx7ynayl6q0lmslhk6a"; depends=[hypergeo orthopolynom PDQutils]; };
-sads = derive { name="sads"; version="0.2.1"; sha256="08rr3ixz6phrpdwpqk08sk8a5znggd84d7wc1zpm62kfppy0d2hc"; depends=[bbmle GUILDS MASS poilog VGAM]; };
+sads = derive { name="sads"; version="0.2.2"; sha256="03z404jn809cyhi2ybrhmxa7xhsygrjz9hal9s5ya1jkzc4261z4"; depends=[bbmle GUILDS MASS poilog VGAM]; };
 sae = derive { name="sae"; version="1.1"; sha256="1izww27cqd94yrfbszbzy44plznxsirzn0752ag7xw7qzm5ywp3d"; depends=[MASS nlme]; };
 sae2 = derive { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; };
 saeSim = derive { name="saeSim"; version="0.7.0"; sha256="03zfw18fvx8blh9iijh3rnglg8zbsvd9dq3kqv6ajz3hwr90z29g"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; };
@@ -5909,7 +6013,8 @@ sanitizers = derive { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq
 sanon = derive { name="sanon"; version="1.4"; sha256="0zg0paiz3rb0fk2mgi8rlzqy9vq3afy5vx6s15k1xqz8rjgsbd1x"; depends=[]; };
 sapa = derive { name="sapa"; version="2.0-1"; sha256="11xgd2ijfz5yn0zyl5gfy97h2cxi1vyxkrijy2s9b78wm7fzpnkv"; depends=[ifultools splus2R]; };
 sas7bdat = derive { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; };
-saturnin = derive { name="saturnin"; version="1.0"; sha256="0686c0y6dcnr8jcx26pd4g08hmlalbid6idg465pngshr57kl79k"; depends=[]; };
+satellite = derive { name="satellite"; version="0.1.0"; sha256="0dfbxa7y5jbd1gcpdk0ahkfsfn1cpjfy58wnwk257j4c460inafl"; depends=[plyr raster Rcpp]; };
+saturnin = derive { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; };
 saves = derive { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; };
 saws = derive { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w06px7yn55s2mw9mddd6736l56fv1"; depends=[gee]; };
 sbgcop = derive { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; };
@@ -5933,19 +6038,20 @@ scidb = derive { name="scidb"; version="1.2-0"; sha256="17y1bml8kb896l3hsw356qdj
 scio = derive { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; };
 sciplot = derive { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; };
 score = derive { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; };
+scorer = derive { name="scorer"; version="0.1.0"; sha256="1qbcbhymagaqpcbysj33ncjz1kxg9ig0anrv7pl8s8m2kpqn4vmb"; depends=[]; };
 scoring = derive { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; };
-scout = derive { name="scout"; version="1.0.3"; sha256="0wmjmk0ckd211cq5ykd0yzjschs7fkg04w67arl4pwma0z5z56lq"; depends=[glasso lars]; };
+scout = derive { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; };
 scrapeR = derive { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; };
 scrime = derive { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; };
 scriptests = derive { name="scriptests"; version="1.0-15"; sha256="1f55rnz4zbywyn79l2ac2600k95fwxgnyh1wzxvyxjh4qcg50plv"; depends=[]; };
 scrm = derive { name="scrm"; version="1.6.0-2"; sha256="1a3m56j4ca526mjhc7h0967k5bja336dw1bpna119l5yic6hkc1n"; depends=[Rcpp]; };
 scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp]; };
 scuba = derive { name="scuba"; version="1.8-0"; sha256="1hlgvbcx7xmpaaszyqvhdwvwmf8z209jkf6aap205l3xkkc692c4"; depends=[]; };
-sdPrior = derive { name="sdPrior"; version="0.2"; sha256="12aiddnwhlvvnh9f5jivrs4ml0g6hm9pg828xk39d8kzz43alwzg"; depends=[caTools GB2 MASS]; };
+sdPrior = derive { name="sdPrior"; version="0.3"; sha256="0d3w75p3r2h07xhp7fj4si1y4sav8vs0lq6h2h4fn4f2inn3l0vl"; depends=[caTools GB2 MASS]; };
 sda = derive { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; };
 sdcMicro = derive { name="sdcMicro"; version="4.5.0"; sha256="1cz34g6si7f8kgybcvcsr0lkcspqp3vrkvfqsfdjd0mb8lv5pbjj"; depends=[brew car cluster data_table e1071 knitr MASS Rcpp robustbase sets xtable]; };
 sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.2.0"; sha256="0bhrpric17y1ljm18a00i6bkxfq1cpljfkib8qbb4jyj5s50f3ps"; depends=[cairoDevice foreign gWidgets gWidgetsRGtk2 Hmisc sdcMicro vcd]; };
-sdcTable = derive { name="sdcTable"; version="0.18.1"; sha256="18l6d6q6pawvswj1v9mfmcg4m94dkp38yd2mnndz9l7qmvf6n7kx"; depends=[data_table lpSolveAPI Rcpp Rglpk stringr]; };
+sdcTable = derive { name="sdcTable"; version="0.19.1"; sha256="00d2fi9z4n39waq90f6r4hpvhmz0w55nzaj9w0hmnmc9mr4z4p4p"; depends=[data_table lpSolveAPI Rcpp Rglpk stringr]; };
 sdcTarget = derive { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; };
 sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
 sde = derive { name="sde"; version="2.0.13"; sha256="194dkwrww9win5chhlffjv1xkhpxx2bcv6hf81xaqk7pdf7ifj80"; depends=[fda MASS zoo]; };
@@ -5955,7 +6061,7 @@ sdnet = derive { name="sdnet"; version="2.03.3"; sha256="1884pil3brm7llczacxda6g
 sdprisk = derive { name="sdprisk"; version="1.1-3"; sha256="1rwzi112fjckzxmhagpg60qm9a35fqx8g8xaypxsmnml6q00ysiq"; depends=[numDeriv PolynomF rootSolve]; };
 sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
 sdwd = derive { name="sdwd"; version="1.0.1"; sha256="1df8xx538ba3axi0jbkvyrdl7qnmkvh1x15kh57jmw3qbpf5gh56"; depends=[Matrix]; };
-seacarb = derive { name="seacarb"; version="3.0.6"; sha256="0xhyy8nd20f29j9y3x250fq8qp57gdv61gg4ck24v4jbl8qvwhla"; depends=[oce]; };
+seacarb = derive { name="seacarb"; version="3.0.8"; sha256="0fhf5wqazhxahillgg2xpncb4n5yjvr02251wpb2v4s39v88a5yd"; depends=[oce]; };
 sealasso = derive { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
 searchable = derive { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
 seas = derive { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; };
@@ -5968,7 +6074,7 @@ secrlinear = derive { name="secrlinear"; version="1.0.5"; sha256="084d0spshf3lh1
 seedy = derive { name="seedy"; version="1.2"; sha256="1m800b2faaih4xjsl3jwrqd177jjygbvrf9mb1h84hdzy095b5c0"; depends=[]; };
 seeg = derive { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car sgeostat spatstat]; };
 seem = derive { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqicc1qfnzsair0gvsk3cxsrw6bf"; depends=[]; };
-seewave = derive { name="seewave"; version="2.0.1"; sha256="1xp3frkvzhd6qyp5f3y2w98p5j7adzgn5bj6gzs39cgwb3019zl9"; depends=[tuneR]; };
+seewave = derive { name="seewave"; version="2.0.2"; sha256="1dr2kldx85fbzawy5lp5z3044hsh72vdyirl15b12w8nrh2p1a5z"; depends=[tuneR]; };
 seg = derive { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; };
 segmag = derive { name="segmag"; version="1.2.2"; sha256="130saznhssg0qsc34fcw80x92mmqhjgizrb4fxpjsg7a8jjrclp8"; depends=[Rcpp]; };
 segmented = derive { name="segmented"; version="0.5-1.1"; sha256="0rkbhg8wwqk08jfd29sh4ifx427kmd4mfqrssllckha9hcglqhz7"; depends=[]; };
@@ -5977,7 +6083,7 @@ seismicRoll = derive { name="seismicRoll"; version="1.0.1"; sha256="1lls2gbx994j
 selectMeta = derive { name="selectMeta"; version="1.0.8"; sha256="0i0wzx5ggd60y26lnn4qk4n8h27ahll9732026ppks1djx14cdy0"; depends=[DEoptim]; };
 selectiongain = derive { name="selectiongain"; version="2.0.40"; sha256="1xzvz747242wfv789dl3gqvgbc8l1c4i2r3p95766ypcjw51j55d"; depends=[mvtnorm]; };
 selectr = derive { name="selectr"; version="0.2-3"; sha256="1ppm1f6mwfwbq92iwacyjn46k1d8148j4zykmjvw8as6c8blgap1"; depends=[stringr XML]; };
-selectspm = derive { name="selectspm"; version="0.1"; sha256="0bihyjaacpyjnm5vznix8krw2sqmy62in33hmb5yj4yidwz1gpv0"; depends=[ecespa spatstat]; };
+selectspm = derive { name="selectspm"; version="0.2"; sha256="0wvhlzhl0janhms107xczmilpmr4y26jgk0ag3g34iqba7fbnfqd"; depends=[ecespa spatstat]; };
 selfea = derive { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; };
 selfingTree = derive { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; };
 sem = derive { name="sem"; version="3.1-6"; sha256="1gx0j3ignpmgy3qvnp0qjmhlzbxj0wjfr6jfs9d29cnq8b38p73c"; depends=[boot DiagrammeR MASS matrixcalc mi]; };
@@ -6090,7 +6196,7 @@ sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz
 sirt = derive { name="sirt"; version="1.8-9"; sha256="19kkn2a18kpv6vk45xbi3662mfbmcrz06aq994fzynar2nbix3f0"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix mirt mvtnorm pbivnorm psych qgraph Rcpp RcppArmadillo semPlot sfsmisc sm survey TAM]; };
 sisVIVE = derive { name="sisVIVE"; version="1.1"; sha256="1p1l07pgd88ap3bp0zwinnzda07pfg6cn92ync2pkqn5l0gmfxbs"; depends=[lars]; };
 sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; };
-sitar = derive { name="sitar"; version="1.0.2"; sha256="0z9r3z512s0gpkcpdbi45qdl40rp4jacpm9k0c5pjilwiga6p07z"; depends=[nlme quantreg]; };
+sitar = derive { name="sitar"; version="1.0.3"; sha256="194jyd93h811bvscxklx5cm3vjk9xl8ixmrim49nzrwckdrzfnm0"; depends=[nlme quantreg]; };
 sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
 sivipm = derive { name="sivipm"; version="1.0-0"; sha256="1r548kfsi90rzisx37nw3w9vwj3gs4ck5zhwlskbdzgigb78spfp"; depends=[seqinr]; };
 sjPlot = derive { name="sjPlot"; version="1.8.2"; sha256="1fnqsayg31gk0qggs3024i4nrdardfqqsyggf8l8c6zamcx680fa"; depends=[car dplyr ggplot2 MASS psych scales sjmisc tidyr]; };
@@ -6105,10 +6211,10 @@ sla = derive { name="sla"; version="0.1"; sha256="0fr5n65ppwsh9z7a6rma9ak0bl8x3n
 slackr = derive { name="slackr"; version="1.2"; sha256="1ymj3x52wyp0mp41xnnycg0vhdmv8whimwk1hzfsqr30pccnvn9j"; depends=[data_table ggplot2 httr jsonlite]; };
 slam = derive { name="slam"; version="0.1-32"; sha256="000636dwj4kmj5w1w5s6bqixh78m7262y3fgizj7rfhcnc2gz7ad"; depends=[]; };
 sld = derive { name="sld"; version="0.3"; sha256="18xj57v9gg78d894cr1h6wp10i05hrnmwhmq6yh6211kdyj9ljp1"; depends=[lmom]; };
-slfm = derive { name="slfm"; version="0.1"; sha256="0s5q6ank6075sls9pkqhf7jlvi6gyvsbxa99c34d6ccrv88skyzq"; depends=[coda Rcpp RcppArmadillo]; };
+slfm = derive { name="slfm"; version="0.2.0"; sha256="0hchwxhbq2ca50gbc8qjcjksdx3d3ms0bzqc00hyrakrf7bn0qkp"; depends=[coda lattice Rcpp RcppArmadillo]; };
 slp = derive { name="slp"; version="1.0-3"; sha256="09jyrp6y3rigy043d8s5i7nh89pgpvn3cv51mr729c9ccr6jdjb1"; depends=[mgcv]; };
 sm = derive { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; };
-smaa = derive { name="smaa"; version="0.2-3"; sha256="1vabxxyz2k10sbvrzdf51jlh59zlkjdq82vblk5s37ddmzgwnif9"; depends=[]; };
+smaa = derive { name="smaa"; version="0.2-4"; sha256="1rp0hib79x1rf2v5h1d2gp6ixq7r8v33qy5bz5sfphi94xwasm7l"; depends=[]; };
 smac = derive { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; };
 smacof = derive { name="smacof"; version="1.6-2"; sha256="10yg4dxyv08wq1a74jac6jnmzhbjm6qip3vg5ca06w5pqk6lbdgn"; depends=[colorspace Hmisc nnls polynom rgl scatterplot3d]; };
 smacpod = derive { name="smacpod"; version="1.1.1"; sha256="1pmgxvww24mcgrvv87axqvw457r5wl57scqy93inmzia2mgyva1p"; depends=[spatstat]; };
@@ -6130,18 +6236,19 @@ smirnov = derive { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h
 smnet = derive { name="smnet"; version="2.0"; sha256="0jd574cjkylcrlnlnw859f4vwadi1v955m2lb5z3w3gdpv0lbx3p"; depends=[DBI igraph RSQLite spam SSN]; };
 smoof = derive { name="smoof"; version="1.0"; sha256="10yvx5lr73kzjk7xn4jy97yzvv8qilrp7ilvk0fg5hyimbwlz13s"; depends=[BBmisc checkmate emoa ggplot2 ParamHelpers plot3D RColorBrewer]; };
 smoothHR = derive { name="smoothHR"; version="1.0.1"; sha256="02kjqkgnhjwhq1vmva9nmy36a7bc6zjj6g81dw9m4zd3y9nbb005"; depends=[survival]; };
-smoothSurv = derive { name="smoothSurv"; version="1.5-2"; sha256="07yr97nzp4mfj37v9sr37dgriq0a7kbmsj0n3lmxrzfjhinwnhij"; depends=[survival]; };
+smoothSurv = derive { name="smoothSurv"; version="1.6"; sha256="1s25gpih0nh8waw4r3iw53n3rc44mlzixkh4i2cykbg5rdrs8pnf"; depends=[survival]; };
 smoother = derive { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; };
 smoothie = derive { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; };
 smoothmest = derive { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; };
 smoothtail = derive { name="smoothtail"; version="2.0.4"; sha256="0wbz9r9a7a3pjkdrsxhkjfm2qrbz4jrpsx4s1vm3kz7czkh55yg7"; depends=[logcondens]; };
 sms = derive { name="sms"; version="2.3"; sha256="0grxyp590hj2rvw1fw3yidzkl8nqqp5a14bp9xfpdph2nyas61qq"; depends=[doParallel foreach]; };
 smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3bdhnyawxk1kkmk46q1ss22a1pm"; depends=[]; };
-sn = derive { name="sn"; version="1.2-2"; sha256="1fsl2qjgk7lcjxszdfs7s159qwy6gyg7bsxpfg0l5rcf2mlbwf8m"; depends=[mnormt numDeriv]; };
+sn = derive { name="sn"; version="1.2-3"; sha256="0m3177c5jcf3avzmjc2aqrv0s5sdczj2n4xm39rhss1kxpcwxy0s"; depends=[mnormt numDeriv]; };
 sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; };
 snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
 snht = derive { name="snht"; version="1.0.2"; sha256="1rs9q8fmvz3x21ymbmgmgkqr7hqf3ya3xb33zj31px799jlldpb9"; depends=[ggplot2 gridExtra mgcv plyr reshape zoo]; };
 snipEM = derive { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[GSE MASS mvtnorm Rcpp RcppArmadillo]; };
+snn = derive { name="snn"; version="1.0"; sha256="0pln5kxm7sqwp6zj158lyrkn49p8v26wkqpsxzin5hk5rxjz0jmf"; depends=[]; };
 snow = derive { name="snow"; version="0.3-13"; sha256="1habq43ncac9609xky3nqfkbq52cz36dg8jbdihag269z1kazdnf"; depends=[]; };
 snowFT = derive { name="snowFT"; version="1.4-0"; sha256="0gw2kn80jh1a6sg6ni9kj6ikvyq29c9dmx52k9m6gzcfpa7l0qbk"; depends=[rlecuyer snow]; };
 snowfall = derive { name="snowfall"; version="1.84-6"; sha256="1n9v9m4c02pspgkxfmq7zdk41s2vjcsk06b0kz9km4xy1x7k0hsg"; depends=[snow]; };
@@ -6160,7 +6267,7 @@ soilDB = derive { name="soilDB"; version="1.5-4"; sha256="1n8ybryrg88m12qb6bwiqs
 soilphysics = derive { name="soilphysics"; version="2.4"; sha256="0mxh9jv7klk85zb30agg9c60d0y6v7rxapmvmmkc985ih94r5685"; depends=[MASS rpanel]; };
 soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
 soiltexture = derive { name="soiltexture"; version="1.3.3"; sha256="1a0j10f6mxwrslqd4fvc1nqvsh47ly1nyhc6l0qq1iz6ffqd37mx"; depends=[MASS sp]; };
-soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; };
+soilwater = derive { name="soilwater"; version="1.0.2"; sha256="0rkyh7rcaapp1bxih88ivbaqnrig9jy32694jbg8z04b115hmdpm"; depends=[]; };
 solaR = derive { name="solaR"; version="0.41"; sha256="003f8dka0jqlfshzc3d4z9frq5jb5nq6sw3sm44x7rj79w3ynpyg"; depends=[lattice latticeExtra RColorBrewer zoo]; };
 solarius = derive { name="solarius"; version="0.2.3"; sha256="164va71v77b0lyhccgrb47idhi7dlgyyw1vbs2iqci77ld6x50yl"; depends=[data_table ggplot2 plyr]; };
 solr = derive { name="solr"; version="0.1.4"; sha256="0b1f6mf8fi2ql8j06b0mkk7nyy5wj1zsg46lfxi6bp8n4ywbym9n"; depends=[assertthat httr plyr rjson XML]; };
@@ -6185,7 +6292,7 @@ spBayes = derive { name="spBayes"; version="0.3-9"; sha256="1zdyz5jqbixwj59q9f1x
 spBayesSurv = derive { name="spBayesSurv"; version="1.0.2"; sha256="0pxndjksrd22p60pvc4czxwqhrpx5ik0yr23nz7kmg6wnp36hc6w"; depends=[coda Rcpp RcppArmadillo survival]; };
 spMC = derive { name="spMC"; version="0.3.6"; sha256="0h71m55jmv80kx5ccsrpsakrh4qw5f3kx2qizwi10jlybwggqv0m"; depends=[]; };
 spTDyn = derive { name="spTDyn"; version="1.0"; sha256="0yrnbf9g1n1hrrra2vp6412wfky1bhy3b6raif9k82xvi9p9m6pz"; depends=[coda sp]; };
-spTest = derive { name="spTest"; version="0.1.0"; sha256="0asfgf0dx72025q41ndzgwm2n471lwha7bcc1dfk3zwib75w3lgl"; depends=[]; };
+spTest = derive { name="spTest"; version="0.1.1"; sha256="0bzj5vmb4bwqi8f75f21pwrdi1n4zgq7xandh3dzsq2dahnrmhzh"; depends=[]; };
 spThin = derive { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[fields knitr spam]; };
 spTimer = derive { name="spTimer"; version="2.0-0"; sha256="0ldby68p4y5cz5dj2m33jcbgd3mw9nv0py4llg8aj10bxylarmfv"; depends=[coda sp]; };
 spa = derive { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
@@ -6202,8 +6309,8 @@ spanel = derive { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi0
 spanr = derive { name="spanr"; version="1.0"; sha256="1x29hky347kvmk9q75884vf6msgcmfi3w4lyarq99aasi442n1ps"; depends=[plyr stringr survival]; };
 sparc = derive { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
 sparcl = derive { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; };
-spareserver = derive { name="spareserver"; version="1.0.0"; sha256="0vaql5v3337xh1ifjziav3v7fkjff4zhrz557mgy75ham554gs7c"; depends=[assertthat httr pingr]; };
-spark = derive { name="spark"; version="1.0.0"; sha256="0ryc7kq3hx8nd5m999p1y7lxli6x862y6hqpv8xwpqak0y863p6m"; depends=[magrittr]; };
+spareserver = derive { name="spareserver"; version="1.0.1"; sha256="094q5i6v4v37hzfdyps8zni394z312r802hl04jw0xzzps922rq4"; depends=[assertthat httr pingr]; };
+spark = derive { name="spark"; version="1.0.1"; sha256="03viih0r7bpv6zkm5ckk0c99lf2iv0fkgrzkbs1gg7ki9qyxji8c"; depends=[magrittr]; };
 sparkTable = derive { name="sparkTable"; version="1.0.0"; sha256="1d5vv7whayblq5g4pjrngkqf3d1pi4f0gibnskllv7rdad10n4nd"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; };
 sparktex = derive { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; };
 sparr = derive { name="sparr"; version="0.3-6"; sha256="1imgph2bf575rm06l4vsz0nhizkrwa3p5j6b6gdn30l0hlhxjp0j"; depends=[MASS rgl spatstat]; };
@@ -6215,6 +6322,7 @@ sparseMVN = derive { name="sparseMVN"; version="0.2.0"; sha256="12g387bvpy4249kw
 sparseSEM = derive { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; };
 sparsediscrim = derive { name="sparsediscrim"; version="0.2"; sha256="0m8ccmqpg1np738njavf736qh917hd3blywyzc3vwa1xl59wqccl"; depends=[bdsmatrix corpcor mvtnorm]; };
 sparsenet = derive { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; };
+sparsereg = derive { name="sparsereg"; version="1.0"; sha256="14v2dmvvs9h59ba0z3nd0mh82g1sr1lgfx87b8lrfbi3h26n0207"; depends=[coda ggplot2 glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; };
 spartan = derive { name="spartan"; version="2.2.1"; sha256="1syrvx3gmgsi3f49j27zg59b3i29v20352qbsc5mrqnwh5lawi1y"; depends=[]; };
 spatcounts = derive { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; };
 spate = derive { name="spate"; version="1.4"; sha256="1cr63qm3hgz6viw6ynzjv7q5ckfsan7zhbp224gz4cgx5yjg0pn3"; depends=[mvtnorm truncnorm]; };
@@ -6230,7 +6338,7 @@ spatialnbda = derive { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyi
 spatialprobit = derive { name="spatialprobit"; version="0.9-10"; sha256="1z88nss69pixazqk3b6rpyc7mjryfznrgw9swfyfxky0bsdfj6mv"; depends=[Matrix mvtnorm spdep tmvtnorm]; };
 spatialsegregation = derive { name="spatialsegregation"; version="2.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; };
 spatstat = derive { name="spatstat"; version="1.42-2"; sha256="1wsdxl711p4vhaz69if1whjfrj81xkr6d2piw5hz0l04c6dcbac9"; depends=[abind deldir goftest Matrix mgcv polyclip tensor]; };
-spatsurv = derive { name="spatsurv"; version="0.9-9"; sha256="1zvf8n4isaxi8n47qvgw6zqrgsnf3g6jpm19k6w6zbp9v5r8fw7r"; depends=[fields geostatsp iterators Matrix RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
+spatsurv = derive { name="spatsurv"; version="0.9-10"; sha256="0hfdmp206rw6lgdlmkasl7l1hq1avwnp726cw2fzhrbp88a1s2jm"; depends=[fields geostatsp iterators Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
 spc = derive { name="spc"; version="0.5.1"; sha256="1299lhk8snrhm7xpq0ccmq5kmpapc13rxcyvljs4c7frj645rwz4"; depends=[]; };
 spca = derive { name="spca"; version="0.6.0"; sha256="156bz3w3999vhjpsa9cs21rf2r9hv49vw1pfak0r37kbvf2d4rm6"; depends=[MASS]; };
 spcadjust = derive { name="spcadjust"; version="0.9"; sha256="05w32bznv6s5jwwv4l1392zng6ia36205j88d0i6l9hcbp2g599a"; depends=[]; };
@@ -6239,10 +6347,12 @@ spcov = derive { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0
 spcr = derive { name="spcr"; version="1.2.1"; sha256="0cm59cfw3c24i1br08fdzsz426ldljxb41pdrmbmma4a69jkv1sb"; depends=[]; };
 spd = derive { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; };
 spdep = derive { name="spdep"; version="0.5-88"; sha256="1m2bxbf472xq7wr76znjirslx3hb1ylk6lp7x5003ka3i2zpakxn"; depends=[boot coda deldir LearnBayes MASS Matrix nlme sp]; };
-spdynmod = derive { name="spdynmod"; version="1.0"; sha256="05gaaln14lrrds43l2f9hw43c86gswyzymz97hc3mci1cgiwfwbz"; depends=[animation deSolve raster]; };
+spduration = derive { name="spduration"; version="0.13.1"; sha256="13z7ykrb84smnjhabq6h7mxva16r44hx9c6kgjy91xypz1ynk26f"; depends=[corpcor MASS plyr Rcpp RcppArmadillo separationplot xtable]; };
+spdynmod = derive { name="spdynmod"; version="1.1"; sha256="09lc8gyp9nw3w1vcid19q064plga7v99h8nfmg57i76dpny3s9ys"; depends=[animation deSolve raster]; };
 spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
 speaq = derive { name="speaq"; version="1.2.1"; sha256="0glvw1jdyc8w8b8m7l74d0rl74xfs4zmanmx4i41l7ynswhmqm01"; depends=[MassSpecWavelet]; };
 speccalt = derive { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
+speciesgeocodeR = derive { name="speciesgeocodeR"; version="1.0-3"; sha256="0iyll1w91mfxh4lbddmwlvvrxpchkh2pknh37idpsv5k8mvbyby6"; depends=[maps maptools raster sp]; };
 specificity = derive { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; };
 spectral_methods = derive { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[abind DistributionUtils foreach JBTools ncdf_tools nnet raster RColorBrewer RNetCDF Rssa]; };
 spectralGP = derive { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; };
@@ -6259,7 +6369,7 @@ sphet = derive { name="sphet"; version="1.6"; sha256="0149wkak7lp2hj69d83rn05fzh
 spi = derive { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; };
 spider = derive { name="spider"; version="1.3-0"; sha256="1p6f8mlm055xq3qwa4bqn9kvq60p8fn2w0cc6qcr22cblm5ww7jp"; depends=[ape pegas]; };
 spiders = derive { name="spiders"; version="1.0"; sha256="1n3ym9vc3vzjzm35z29sz4mz8sa25r761y0ph45srhq0lv7c66w6"; depends=[plyr]; };
-spikeSlabGAM = derive { name="spikeSlabGAM"; version="1.1-8"; sha256="0h9b3hhnsqbxbxww7jhbkqf1wl72q347naxpjjbz3q5p2y8yli4z"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
+spikeSlabGAM = derive { name="spikeSlabGAM"; version="1.1-9"; sha256="04xlin61hfq9j9q4wvpkzmc189cpq4jp5cdn3kz64skzlsc5yj2z"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
 spikeslab = derive { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; };
 splancs = derive { name="splancs"; version="2.01-37"; sha256="0q548i76107laa9yrsjxqvwhl8zyhlib557qqr8aa7kjg6j0p5fn"; depends=[sp]; };
 splitstackshape = derive { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; };
@@ -6277,6 +6387,7 @@ sprint = derive { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha
 sprinter = derive { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost GAMBoost LogicReg randomForestSRC survival]; };
 sprm = derive { name="sprm"; version="1.1"; sha256="0xnbdnzgf54r93bvnyjcdcqlr0q7s7f2cvayw681zi0ig3z633j0"; depends=[cvTools ggplot2 pcaPP reshape2]; };
 sprsmdl = derive { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; };
+spsann = derive { name="spsann"; version="1.0.0"; sha256="1kbrj4qnkmh6ss7vgkh6avvlqcgbz5ixwaya7p36z5zwxxb9mmrk"; depends=[gstat pedometrics Rcpp sp SpatialTools]; };
 spsmooth = derive { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; };
 spsurvey = derive { name="spsurvey"; version="3.0"; sha256="15i10a6hhk1wwnyd4lbrqaql8i4s10302bxmpr0s5cyifs084l77"; depends=[deldir foreign MASS rgeos sp]; };
 spt = derive { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; };
@@ -6312,7 +6423,7 @@ stackoverflow = derive { name="stackoverflow"; version="0.1.2"; sha256="1psw96is
 stacomirtools = derive { name="stacomirtools"; version="0.3"; sha256="1lbbnvmilf3j3hyhvpkyjd4b4sf3zwygilb8x0kjn2jfhkxnx4c1"; depends=[RODBC xtable]; };
 stagePop = derive { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; };
 stam = derive { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; };
-stargazer = derive { name="stargazer"; version="5.1"; sha256="0ar0qm289ncsns2pqkabpyjc90ws0il1q7fp5206wqghgsvqjcc0"; depends=[]; };
+stargazer = derive { name="stargazer"; version="5.2"; sha256="0nikfkzjr44piv8hng5ak4f8d7q78f2znw2df0gy223kis8q2hsd"; depends=[]; };
 startupmsg = derive { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; };
 stashR = derive { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[digest filehash]; };
 statar = derive { name="statar"; version="0.3.0"; sha256="0ynvabdyp5vy90gz7c9ywbdyg8dp4vmmz2zjd7z8b5jjk0f8xsf1"; depends=[data_table dplyr ggplot2 lazyeval matrixStats proto stargazer stringr tidyr]; };
@@ -6321,7 +6432,7 @@ statebins = derive { name="statebins"; version="1.0"; sha256="1mqky4nb31xjhn922c
 statfi = derive { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; };
 stationaRy = derive { name="stationaRy"; version="0.3"; sha256="151hsda3j8ii40v5z6nh6ypahrl0b2zlfdii75xlrpwryb7n3cq6"; depends=[downloader dplyr plyr readr]; };
 statmod = derive { name="statmod"; version="1.4.21"; sha256="138lh9qa25w6vaksbq43iqisj4c8hvmkjc3q81fn7m8b7zlnz6da"; depends=[]; };
-statnet = derive { name="statnet"; version="2014.2.0"; sha256="0xp8xnqb32wzkxfm7f34z6mnsd9id8an5829n16czwldj9vv6s10"; depends=[ergm ergm_count latentnet network networkDynamic sna statnet_common tergm]; };
+statnet = derive { name="statnet"; version="2015.6.2"; sha256="0dvkiz7i5ljnbs6qxz4a2v4rqynn2fi4wy4vd1hqhf4kpkj0amna"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm]; };
 statnet_common = derive { name="statnet.common"; version="3.2.2"; sha256="1xdkc1pyf6wfb86dwz6bkjli5qw6yz6dvlxwp5bpgkpg83aa9n7g"; depends=[]; };
 statnetWeb = derive { name="statnetWeb"; version="0.3.4"; sha256="1nkis4l6yzpjcwxryskqfjgc2naxplzjc3gpp6xvpl0pcvw9mdk7"; depends=[ergm network RColorBrewer shiny sna]; };
 stcm = derive { name="stcm"; version="0.1.1"; sha256="05p0lp0p1mgcsf3mi3qgx42pgpv04m5wfmqa14gp63ialkl9pgx5"; depends=[caret dendextend ggplot2 magrittr plyr QCA randomForest XML]; };
@@ -6335,11 +6446,12 @@ stheoreme = derive { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq
 stilt = derive { name="stilt"; version="1.0.1"; sha256="1vrbbic0vqzgy574kzcr38iqyhax4wa6zl6w74n65z15map2fyma"; depends=[fields]; };
 stima = derive { name="stima"; version="1.1"; sha256="1i8l7pfnqxx660h3r2jf6a9bj5ikg9hw7v8apwk98ms8l7q77p5l"; depends=[rpart]; };
 stinepack = derive { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6w62z1nnkqmhkifz2w0bi341jh0ybmak4fq"; depends=[]; };
-stm = derive { name="stm"; version="1.0.8"; sha256="0dnzkqh3hnnjm0wmzpn48bwylmh49a8ib263bzvjaqpi70mck49p"; depends=[glmnet lda Matrix matrixStats slam stringr]; };
-stmCorrViz = derive { name="stmCorrViz"; version="1.1"; sha256="03bjxil8v4ixgbabg2gq78xgqy4s3wh89hq1z5598gxysz12z3ji"; depends=[jsonlite stm]; };
+stm = derive { name="stm"; version="1.1.0"; sha256="0j1mgi584b28g3c0ai56fr1gks1kbd0s18xl7jbxndfiprk8q8f4"; depends=[glmnet lda Matrix matrixStats Rcpp RcppArmadillo slam stringr]; };
+stmBrowser = derive { name="stmBrowser"; version="1.0"; sha256="0jfh0c835a2sxn2cqlmwdlzj2g2dmkfl2z3pkv4fc1ajggw2n7g2"; depends=[httr jsonlite rjson stm]; };
+stmCorrViz = derive { name="stmCorrViz"; version="1.2"; sha256="0mhwl64hv4hjq72mqnvc5ii94aibmc0fw5rmdrvsad4bj6gg67p3"; depends=[jsonlite stm]; };
 stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8dzdw6ac79zg3v99zksli6i7c8jdz"; depends=[coda fields Matrix truncnorm]; };
 stochprofML = derive { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; };
-stochvol = derive { name="stochvol"; version="1.1.3"; sha256="077pky9k2cvakm4ap38hby8xdjc4d7b20qndyy2skk1622kmr0w6"; depends=[coda Rcpp]; };
+stochvol = derive { name="stochvol"; version="1.2.0"; sha256="10j6iz0nrcmy79b2ns1zszb8w7x2jc85sfj8xaf57j7z4f3n98ff"; depends=[coda Rcpp RcppArmadillo]; };
 stockPortfolio = derive { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; };
 stocks = derive { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp]; };
 stoichcalc = derive { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
@@ -6357,7 +6469,7 @@ streamR = derive { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23x
 stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan MASS numDeriv]; };
 stressr = derive { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; };
 stringdist = derive { name="stringdist"; version="0.9.2"; sha256="13cwp2ic4v48r6h1gjbb1kn4m88d69z7wnhwyxsh64lqlhaz1xsm"; depends=[]; };
-stringgaussnet = derive { name="stringgaussnet"; version="1.0"; sha256="11pkvbq2lddwhrwrpspqhjkma4ixl9hv8w7m4jrnlx8dkabibw25"; depends=[AnnotationDbi biomaRt httr igraph limma pspearman RCurl RJSONIO simone VennDiagram]; };
+stringgaussnet = derive { name="stringgaussnet"; version="1.1"; sha256="161fi78cd7yddbcq71z3fgx1q2sacg1n1ggrkrqz17icwzviqrh5"; depends=[AnnotationDbi biomaRt httr igraph limma pspearman RCurl RJSONIO simone VennDiagram]; };
 stringi = derive { name="stringi"; version="0.5-5"; sha256="183wrrjhpgl1wbnn9lhghyvhz7l2mc64mpcmzplckal7y9j7pmhw"; depends=[]; };
 stringr = derive { name="stringr"; version="1.0.0"; sha256="0jnz6r9yqyf7dschr2fnn1slg4wn6b4ik5q00j4zrh43bfw7s9pq"; depends=[magrittr stringi]; };
 strucchange = derive { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[sandwich zoo]; };
@@ -6369,13 +6481,13 @@ stsm_class = derive { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2
 stylo = derive { name="stylo"; version="0.5.9"; sha256="061nfjh932qjlzvnarpwvzar0qv7ij8l6m3iax1jilygzhfqfyin"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
 suRtex = derive { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; };
 subgroup = derive { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; };
-subplex = derive { name="subplex"; version="1.1-4"; sha256="0c6y5ibyxh0mpn77f7kwrmkpb3mah10hbqhwqmz4i1lfv58mb4zk"; depends=[]; };
+subplex = derive { name="subplex"; version="1.1-6"; sha256="0camqd0n468h93jxvvcnclki66glr39rb87nvrkrbiklbqd0s1fp"; depends=[]; };
 subrank = derive { name="subrank"; version="0.9.1"; sha256="0ghfpvw7aflbnnisn3rq8vrpi134ghm6vnyb7md1gi730mqgxfxv"; depends=[]; };
 subselect = derive { name="subselect"; version="0.12-5"; sha256="00wlkj6p0p2x057zwwk1xdvji25yakgagf98ggixmvfrk1m1saa4"; depends=[]; };
 subsemble = derive { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2r4f2xyghmrprx3nk58bd6zfskdgj0ymfgz5z"; depends=[SuperLearner]; };
 subtype = derive { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
 sudoku = derive { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; };
-sudokuAlt = derive { name="sudokuAlt"; version="0.1-4"; sha256="14jqwsp692dq0bfnk2i70qc42inb6jbissvp88c5r2cgzc1ry072"; depends=[]; };
+sudokuAlt = derive { name="sudokuAlt"; version="0.1-5"; sha256="048fxib2b2wz0amgb1gxlpqrd5w8fci5yjrv0la0mhs9vz42sjd2"; depends=[]; };
 summarytools = derive { name="summarytools"; version="0.3"; sha256="1hhkhpyaj8sc62vap5s7ds0kmk1jiy6gdvsz65ynqy2qfz58c3ms"; depends=[htmltools pander rapportools rstudioapi xtable]; };
 supclust = derive { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; };
 supcluster = derive { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[gtools mvtnorm]; };
@@ -6423,11 +6535,12 @@ svapls = derive { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22
 svcm = derive { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
 svd = derive { name="svd"; version="0.3.3-2"; sha256="064y4iq4rj2h35fhi6749wkffg37ppj29g9aw7h156c2rqvhxcln"; depends=[]; };
 svdvisual = derive { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
+svgPanZoom = derive { name="svgPanZoom"; version="0.2.0"; sha256="10ckz859c9wh09fjqxa6qfrfjk17f9nhkmvgcj1qfiasmp3qj2wk"; depends=[htmlwidgets]; };
 svgViewR = derive { name="svgViewR"; version="1.0.1"; sha256="1ggw5w5xjqp33z6nzszimcab3vkv4rliiilhcqbhppqlnhjb8nab"; depends=[]; };
 svmpath = derive { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nkknbq1ag67f4m5xdg271f2jxvnmhdv6wv"; depends=[]; };
 svyPVpack = derive { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
 swamp = derive { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots impute MASS]; };
-sweidnumbr = derive { name="sweidnumbr"; version="0.6.0"; sha256="1qdak16jnm436m7nlngarimlhx9sc6wwq9pfrcijq8240mh7xwa2"; depends=[lubridate stringr]; };
+sweidnumbr = derive { name="sweidnumbr"; version="0.6.1"; sha256="0fpbqh5ff54slmpvvyp02gwclz4p1rca3qfdb2xxn19sfiqx0wf7"; depends=[lubridate stringr]; };
 swfscMisc = derive { name="swfscMisc"; version="1.0.3"; sha256="0ciwvxpafpc6an58r1ffkab8kj4np6l2kbpkijnqnfbf6cya0aim"; depends=[mapdata maps]; };
 swirl = derive { name="swirl"; version="2.2.21"; sha256="0lpin7frm1a6y9lz0nyykhvydr1qbx85iqy24sm52r1vxycv2r8h"; depends=[digest httr RCurl stringr testthat yaml]; };
 switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
@@ -6436,7 +6549,7 @@ switchrGist = derive { name="switchrGist"; version="0.2.1"; sha256="0n8fzzsxm0m4
 sybil = derive { name="sybil"; version="1.3.0"; sha256="1wprxwxyh5vzi263x1s7vdnyjgmyh3lha9ld2qqyjabrkg6wjzwg"; depends=[lattice Matrix]; };
 sybilDynFBA = derive { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; };
 sybilEFBA = derive { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[Matrix sybil]; };
-sybilSBML = derive { name="sybilSBML"; version="2.0.8"; sha256="1sxp0naws7d1ak0xna1sy87zzjrravwax0qvcd6vy4p0f39z06ci"; depends=[Matrix sybil]; };
+sybilSBML = derive { name="sybilSBML"; version="2.0.10"; sha256="0zw41lcq3b1qbs4ik7v3jjjqgm3hhi35mmxvq9vm78rrz1cz59b5"; depends=[Matrix sybil]; };
 sybilccFBA = derive { name="sybilccFBA"; version="2.0.0"; sha256="0x0is1a56jyahaba6dk9inj5v248m8n46f70ynqyqp1xpiax1fkr"; depends=[Matrix sybil]; };
 sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.1"; sha256="0ffmgnr239xz8864vmrqlhwwc97fqzzib6kwrsm7bszdnw1kkv3r"; depends=[MASS Matrix sybil]; };
 symbolicDA = derive { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp8j3ghw50z49yzvwhm0izc6wgc7a99300xrr77s"; depends=[ade4 cluster clusterSim e1071 rgl shapes XML]; };
@@ -6472,7 +6585,7 @@ tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdc
 taxize = derive { name="taxize"; version="0.6.0"; sha256="0zxlawj79l117hj3d93663xdzbkcq5gh6m090yfbvkzrb6a4rq3f"; depends=[ape bold data_table foreach httr jsonlite plyr RCurl reshape2 stringr Taxonstand XML]; };
 tbart = derive { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; };
 tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
-tcR = derive { name="tcR"; version="2.0"; sha256="05y3nbqdaxry7jwph6z2v8d2304xh791l0vviywyghrw7b2hqw9q"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 roxygen2 stringdist]; };
+tcR = derive { name="tcR"; version="2.1"; sha256="03q9smpc63d306apgszr2l99gdndsj39zx0nkdlkw0bjwhc1pd5y"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 roxygen2 stringdist]; };
 tcltk2 = derive { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
 tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[cluster mclust mvtnorm sn]; };
 tdr = derive { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[ggplot2 lattice RColorBrewer]; };
@@ -6500,9 +6613,10 @@ tfplot = derive { name="tfplot"; version="2015.4-1"; sha256="1qrw8x7pz7xcmpym3j1
 tframe = derive { name="tframe"; version="2015.1-1"; sha256="10igwmrfslyz3z3cbyldik8fcxq43pwh60yggka6mkl0nzkxagbd"; depends=[]; };
 tframePlus = derive { name="tframePlus"; version="2015.1-2"; sha256="043ay79x520lbh4jm2nb3331pwd7dvwfw20k1kc9cxbplxiy8pnb"; depends=[tframe timeSeries]; };
 tgcd = derive { name="tgcd"; version="1.4"; sha256="108i7kkfkpgavs8d2c6aih9winfqhin777jn5zfxzkjd6clj857i"; depends=[]; };
+tglm = derive { name="tglm"; version="1.0"; sha256="1gv33jq3bzd5wlrqjvcfb1ax258q9asawkdi64rbj18qp7fg2dbx"; depends=[BayesLogit coda mvtnorm truncnorm]; };
 tgp = derive { name="tgp"; version="2.4-11"; sha256="0hdi05bz9qn4zmljfnll5hk9j8z9qaqmya77pdcgr6vc31ckixw5"; depends=[maptree]; };
 tgram = derive { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; };
-thermocouple = derive { name="thermocouple"; version="1.0.0"; sha256="1pawk7aq27vc708xwz997pmxxhipw8449793zv6fw5aj47wcw1l5"; depends=[]; };
+thermocouple = derive { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; };
 thgenetics = derive { name="thgenetics"; version="0.3-4"; sha256="1316nx0s52y12j9499mvi050p3qvp6b8i01v82na01vidl54b9c2"; depends=[]; };
 threeboost = derive { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
 threejs = derive { name="threejs"; version="0.2.1"; sha256="01zfv5lm11i2nkb876f3fg8vsff2wk271jqs6xw1njjdhbnnihs1"; depends=[base64enc htmlwidgets]; };
@@ -6522,6 +6636,7 @@ timeDate = derive { name="timeDate"; version="3012.100"; sha256="0cn4h23y2y2bbg6
 timeROC = derive { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[mvtnorm pec]; };
 timeSeq = derive { name="timeSeq"; version="1.0.0"; sha256="1b7jcld1h3xsp3nl2nk9nqsgdg1pdi4m54hgsdlvivk9zzv3k6wr"; depends=[doParallel edgeR foreach gss lattice pheatmap reshape]; };
 timeSeries = derive { name="timeSeries"; version="3012.99"; sha256="06lz9xljzadfs94xwn8578h8mw56wp923k0xfppzq69hcpcrhsvf"; depends=[timeDate]; };
+timedelay = derive { name="timedelay"; version="1.0.0"; sha256="0wqcc8kzgvn6bn7kclb3wnaibycg5hpcji9g1a66pj14fwdabny3"; depends=[]; };
 timeit = derive { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; };
 timeline = derive { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; };
 timeordered = derive { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl3l9r3aaz5a3bxh0zq81rbga9gh63zads2xy5axmf"; depends=[igraph plyr]; };
@@ -6544,7 +6659,7 @@ tlnise = derive { name="tlnise"; version="2.0"; sha256="1vh998vqj359249n9zmw04rs
 tm = derive { name="tm"; version="0.6-2"; sha256="0q7plaqgc2ypihnz3dyjv2pwa0aimd4kv5i2z6m7aycc4wkmc7j4"; depends=[NLP slam]; };
 tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; };
 tm_plugin_dc = derive { name="tm.plugin.dc"; version="0.2-7"; sha256="1ikkxp5jdr385yqvhknvkvs97039jw964pcm6dl1k66nbdv1q59i"; depends=[DSL NLP slam tm]; };
-tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.2"; sha256="1sgm9wnzlphl4qhc69nj5im4y1qs6b0vssmn5j98fbc3xlxiyzjx"; depends=[NLP tm XML]; };
+tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.3"; sha256="04sqaqmi00xm85732sk5iqv6ywfqh52qkkk0wv8xzqxwsixf3hyc"; depends=[NLP tm XML]; };
 tm_plugin_factiva = derive { name="tm.plugin.factiva"; version="1.5"; sha256="06s75rwx9fzld1dw0nw6q5phc1h0zsdzhy1dcdcvmsf97d4s2qdr"; depends=[NLP tm XML]; };
 tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[ISOcodes NLP tm XML]; };
 tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; };
@@ -6556,11 +6671,11 @@ tmle_npvi = derive { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh
 tmod = derive { name="tmod"; version="0.19"; sha256="0wnj2dfp3jjvr8xl43kw86b3xgqd1662zjagzb9ayznx5vi2k5zb"; depends=[beeswarm pca3d tagcloud XML]; };
 tmvtnorm = derive { name="tmvtnorm"; version="1.4-9"; sha256="1dacdhqv6bb29a81bmxp8hxy4hragpg8mb5kql4cp59q08zmizyi"; depends=[gmm Matrix mvtnorm]; };
 tnet = derive { name="tnet"; version="3.0.11"; sha256="00hifb145w0a9f5qi3gx16lm1qg621jp523vswb8h86jqmxcczbc"; depends=[igraph survival]; };
-toOrdinal = derive { name="toOrdinal"; version="0.0-1"; sha256="1rr6liw0krzdarc9gd406mf242n3hl38bn52xphr1g0riq5y2m4q"; depends=[]; };
+toOrdinal = derive { name="toOrdinal"; version="0.0-4"; sha256="0vvdz9l4sl7nlq6y93c65gbwssisrp3a9sp021g2l0rli00zq9q1"; depends=[]; };
 tolerance = derive { name="tolerance"; version="1.1.0"; sha256="1mrgvrdlawrmbz8bhq9cxqgn4fxvn18f1gjf9f9s8fvfnc4nda96"; depends=[rgl]; };
 topicmodels = derive { name="topicmodels"; version="0.2-2"; sha256="1nk3jgibs881isaadawyc377f4491af97jaqywc0z905wkzi008r"; depends=[modeltools slam tm]; };
 topmodel = derive { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; };
-topologyGSA = derive { name="topologyGSA"; version="1.4.4"; sha256="092f57gpm8jlb2y4j74a6dx1lwqjdgcm3yrm1yzy4511j6vg0axh"; depends=[fields graph gRbase qpgraph]; };
+topologyGSA = derive { name="topologyGSA"; version="1.4.5"; sha256="1v6plj7v0i5fr6khl0ls34xc0hfd61cpabqpw5s1z3mqmqnma56a"; depends=[fields graph gRbase qpgraph]; };
 topsis = derive { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; };
 tosls = derive { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; };
 tourr = derive { name="tourr"; version="0.5.4"; sha256="11xg5slvx7rgyzrc0lzandw7vr7wzk3w2pplsnyrqq3d990qp40d"; depends=[]; };
@@ -6580,9 +6695,9 @@ translateSPSS2R = derive { name="translateSPSS2R"; version="1.0.0"; sha256="11qn
 translation_ko = derive { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; };
 transport = derive { name="transport"; version="0.6-3"; sha256="1sldlccsprzan1liyslzp9wzz3d36khyr6zri773npvnss9pa67w"; depends=[]; };
 trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
-treatSens = derive { name="treatSens"; version="1.1"; sha256="1h49idgv3rsday8xdj3rfqflj42ya9i5sg7cm1026arff1yqxxz8"; depends=[]; };
+treatSens = derive { name="treatSens"; version="2.0"; sha256="0maf9r35yixar1gb56z5h4v7al7qbh3a043ygx1y685smpwbj4vq"; depends=[dbarts]; };
 tree = derive { name="tree"; version="1.0-36"; sha256="0kqsmjw77p7n2awnlbnwny65rmmwb6z37x9rv1k4iqvvf8xbphg1"; depends=[]; };
-treeClust = derive { name="treeClust"; version="1.0-0"; sha256="1xn6m031vx12wcyyh04yb68cw416a6v5wd8rcp5f9jqirv1hp4xb"; depends=[cluster rpart]; };
+treeClust = derive { name="treeClust"; version="1.1-1"; sha256="06293w4r1h845jqzdqfnh7w5nsvyz4d0h6nn0w2aj4addj3sbp9y"; depends=[cluster rpart]; };
 treebase = derive { name="treebase"; version="0.1.1"; sha256="00xjmvnfh8f05w0076f5rlqa6w5yw0xiqpk076j3ixsv8z6m10hy"; depends=[ape data_table RCurl reshape2 XML]; };
 treeclim = derive { name="treeclim"; version="1.0.11"; sha256="09i7zxwdrbfgridxsm20r554nyvwp40ngc47isy16a7f1q3rwjah"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
 treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; };
@@ -6610,7 +6725,7 @@ trust = derive { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfda
 trustOptim = derive { name="trustOptim"; version="0.8.5"; sha256="1y9krw2z5skkwgfdjagl8l04l9sbiqbk1fbxp30wrf4qj3pba5w6"; depends=[Matrix Rcpp RcppEigen]; };
 tsDyn = derive { name="tsDyn"; version="0.9-43"; sha256="0fhqfwhac1ac1vakwll41m54l88b1c5y34hln5i1y2ngvhy277l1"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
 tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
-tsallisqexp = derive { name="tsallisqexp"; version="0.9-1"; sha256="0z4csd3ircpf5jync6h1snj1k2awkd0s6vj2k4ij6rvs8w3nf8nn"; depends=[]; };
+tsallisqexp = derive { name="tsallisqexp"; version="0.9-2"; sha256="19535zlr6gjg45f8z6hm98pamgn20z19m8qb63997vbj4azsrjfv"; depends=[]; };
 tsbridge = derive { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; };
 tsbugs = derive { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; };
 tsc = derive { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; };
@@ -6640,7 +6755,7 @@ tvm = derive { name="tvm"; version="0.2"; sha256="1fwa37xnp3idal8v1xxlc9gr25595f
 twang = derive { name="twang"; version="1.4-9.3"; sha256="06lgawzq3b2jg84rvg24582ndlk8qji4gcbvxz5acf302cvdnmji"; depends=[gbm lattice latticeExtra survey xtable]; };
 tweedie = derive { name="tweedie"; version="2.2.1"; sha256="1fsi0qf901bvvwa8bb6qvp90fkx1svzswljlvw4zirdavy65w0iq"; depends=[]; };
 twiddler = derive { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; };
-twitteR = derive { name="twitteR"; version="1.1.8"; sha256="1gzahkipzpgfc160sgxzzga7byncih4j30r303m788c9lxk5dbxv"; depends=[bit64 DBI httr rjson]; };
+twitteR = derive { name="twitteR"; version="1.1.9"; sha256="1hh055aqb8iddk9bdqw82r3df9rwjqsg5a0d2i0rs1bry8z4kzbr"; depends=[bit64 DBI httr rjson]; };
 twoStageGwasPower = derive { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; };
 twostageTE = derive { name="twostageTE"; version="1.2"; sha256="05k9lvkailv06cah71p71hnx8in045nxz6waplsccznplhgqg5ar"; depends=[isotone]; };
 txtplot = derive { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; };
@@ -6670,19 +6785,20 @@ uskewFactors = derive { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77
 usl = derive { name="usl"; version="1.4.1"; sha256="0z3dvxczp2vp4clnwds34w5rgv4la5hpadbcmdkfqcpdy1vjryv5"; depends=[nlmrt]; };
 ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; };
 utility = derive { name="utility"; version="1.3"; sha256="0ng7jc45k9rgj9055ndmgl308zjvxd2cjsk2pn57x44rl1lldcj5"; depends=[]; };
-uuid = derive { name="uuid"; version="0.1-1"; sha256="1b35h2n86233zb6dwkgxxlvnlld8kmv0j6j3m31xjbpmc3ppr7w3"; depends=[]; };
+uuid = derive { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; };
 vacem = derive { name="vacem"; version="0.1-1"; sha256="0lh32hj4g1hsa45v6pmfyj1hw0klk8gr1k451lvs4hzpkkcwkqbn"; depends=[foreach]; };
 varComp = derive { name="varComp"; version="0.1-360"; sha256="18xazjx102j6v1jgswxjdqjb0hq6hd646yhwb7bcplqyls9hzha0"; depends=[CompQuadForm MASS Matrix mvtnorm nlme quadprog RLRsim SPA3G]; };
 varSelRF = derive { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqdr610hw7ji79j0wsbl823s097dndmv51axk"; depends=[randomForest]; };
 varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; };
 vardiag = derive { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
-vardpoor = derive { name="vardpoor"; version="0.3.2"; sha256="0vb684yhvafdmzphx4vv8gqih10x3mj8vmwshppwfgd3jp76dnps"; depends=[data_table foreach gdata laeken MASS plyr reshape2 stringr]; };
+vardpoor = derive { name="vardpoor"; version="0.3.4"; sha256="0hn45hb9x6zyhprnn68dwqipklrf6dqvj59w48v6clvhspbkk41b"; depends=[data_table foreach gdata laeken MASS plyr reshape2 stringr]; };
+varian = derive { name="varian"; version="0.2.1"; sha256="1rk8pmqkbsvjsfz704dawvqrqxdvbnql8sjwv0z38f9kgwvqh5p7"; depends=[Formula ggplot2 gridExtra MASS rstan]; };
 vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[lmtest MASS sandwich strucchange urca]; };
 vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; };
 vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
 vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
 vcd = derive { name="vcd"; version="1.4-1"; sha256="1529q8gysqzpgphsnqdwqqr630i4k1kr0zdbmxqq5wpy5r97fk5g"; depends=[colorspace lmtest MASS]; };
-vcdExtra = derive { name="vcdExtra"; version="0.6-8"; sha256="00nxvq5fn5il3lmip8ag22cqc2sxlbl1rqw5zxp309wp4nrm5i2v"; depends=[gnm MASS vcd]; };
+vcdExtra = derive { name="vcdExtra"; version="0.6-9"; sha256="0y00g6llf40sl0xx60l1r6qxz59gl7pqmgf906cjwrkikfmbx068"; depends=[gnm MASS vcd]; };
 vcrpart = derive { name="vcrpart"; version="0.3-3"; sha256="0rnf9cwynfwr956hwj4kxqiqq3cdw4wf5ia73s7adxixh5kpqxqa"; depends=[nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
 vdg = derive { name="vdg"; version="1.1"; sha256="08bl7835m5c62lgaghgnd80zlbic6i80sjfxdr39a715bxpr8g3b"; depends=[ggplot2 gridExtra proxy quantreg]; };
 vdmR = derive { name="vdmR"; version="0.1.1"; sha256="0hmn7xgi1dzril6jdwxkpxp8isin0kxn3yb5fmcyfjhf03kcv4d4"; depends=[dplyr GGally ggplot2 gridSVG maptools plyr rjson Rook]; };
@@ -6694,14 +6810,16 @@ vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2ds
 vegdata = derive { name="vegdata"; version="0.7"; sha256="1h0prrpsiywqx2h49hrr3h9i4515vbgqb2yxfpp81zv2pipa353b"; depends=[foreign XML]; };
 vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
 venneuler = derive { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
-verification = derive { name="verification"; version="1.41"; sha256="1c8l0kqk02xijr4yhgpmhlqsflm3wizybkwpzmlnfanh8vzn49g2"; depends=[boot CircStats dtw fields MASS]; };
+verification = derive { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; };
+vertexenum = derive { name="vertexenum"; version="1.0.1"; sha256="060sfa22m35d1hqxqngxhy7bwjihf6b4sqa1kg5r0cqvdw9zg51d"; depends=[numbers]; };
 vetools = derive { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; };
 vines = derive { name="vines"; version="1.1.3"; sha256="1m862kgcwfz2af00p3vqg959dfldw88bdmb7p4zr3jnqzb6l7rnk"; depends=[ADGofTest copula cubature TSP]; };
 violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
 vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
 viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
+viridis = derive { name="viridis"; version="0.1"; sha256="0mdbdnc9d14lyqk2vcb3dc20m57d21q6i1csjbji5y2zqb2lyq85"; depends=[]; };
 virtualspecies = derive { name="virtualspecies"; version="1.1"; sha256="0znrb6xqyzddd1r999rhx6ix6wgpj1laf5bcns7zgmq6zb39j74s"; depends=[ade4 dismo raster rworldmap]; };
-visNetwork = derive { name="visNetwork"; version="0.0.4"; sha256="0609zg6n8f0nddzvwm6bhi1xysxw2z197jvidycwd45f68qfg0ld"; depends=[htmlwidgets magrittr rjson]; };
+visNetwork = derive { name="visNetwork"; version="0.1.0"; sha256="1sm88wgr5grcqszdi1ifbb6vvjsy0l533q55fgkbvmkg34rn2j2c"; depends=[htmlwidgets magrittr rjson]; };
 visreg = derive { name="visreg"; version="2.2-0"; sha256="1hnyrfgyk5fign5l35aql2q7q4mmw3jby5pkv696h8k1mc8qq096"; depends=[lattice]; };
 visualFields = derive { name="visualFields"; version="0.4.2"; sha256="14plg94g4znl8n6798na2rivjjamjgayqkk1qwn1nx5df040l4q5"; depends=[flip gridBase Hmisc matrixStats]; };
 visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; };
@@ -6719,6 +6837,7 @@ waffect = derive { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an
 waffle = derive { name="waffle"; version="0.3.1"; sha256="0z6snwf29n1p1i4zc3hx95yq388jgw8v3mcmjhsa2w95zsz9dxr0"; depends=[ggplot2 gridExtra gtable RColorBrewer]; };
 wahc = derive { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; };
 walkscoreAPI = derive { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
+warbleR = derive { name="warbleR"; version="1.0.2"; sha256="1mcdqn2zs0dq0mk3lnnm6h17yb1dp5p4a3vxazqx8sjc2fdwpbzi"; depends=[fftw maps pbapply RCurl rjson seewave tuneR]; };
 wasim = derive { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; };
 waterData = derive { name="waterData"; version="1.0.4"; sha256="0wk49f079jfbjncyirdvq50wswf9g361iivshjfhyndv83gbqrzk"; depends=[lattice latticeExtra XML]; };
 waveband = derive { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; };
@@ -6729,7 +6848,10 @@ waveslim = derive { name="waveslim"; version="1.7.5"; sha256="0lqslkihgrd7rbihqh
 wavethresh = derive { name="wavethresh"; version="4.6.6"; sha256="1ykhfw1bdibvq2b3rrgqszvwqmzkd3fgxqg7p36ms1cxph68g2r9"; depends=[MASS]; };
 wbs = derive { name="wbs"; version="1.3"; sha256="1fdf3dj23n63nfnzafq88sxqvi15cbrzsvc8wrljw1raq5z012yv"; depends=[]; };
 weatherData = derive { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; };
+weatherr = derive { name="weatherr"; version="0.1"; sha256="06ig2l5wiy8irzpzrv3q2lx3il9b4jsn5jxccm8b37g8i89v2jfp"; depends=[ggmap lubridate RJSONIO XML]; };
 webchem = derive { name="webchem"; version="0.0.1"; sha256="0hfsjaffxz78mxxh2wx5api2blnpg5y16lyc0jf1zmq7zkhccx3l"; depends=[RCurl RJSONIO XML]; };
+webreadr = derive { name="webreadr"; version="0.3.0"; sha256="1xbp1mmqabl9kdg07ysqva5rxfm59q698hm8av481hd3ggcqvv98"; depends=[Rcpp readr]; };
+webuse = derive { name="webuse"; version="0.1.1"; sha256="1xvf3ll84x7gxz1n9al64hgbbmb7agbbn7m1llawvg2m9jgabclf"; depends=[rio]; };
 webutils = derive { name="webutils"; version="0.3"; sha256="1wzpwigc5mmdnz453qr4s1viaslgdrcg238n25qcg4xjakmnxrss"; depends=[jsonlite]; };
 webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; };
 weightedScores = derive { name="weightedScores"; version="0.9.1"; sha256="0wd2ymxy8yh3l4xd3xgifbihi89h53wy6n84x7x26px12c70q8fa"; depends=[mvtnorm rootSolve]; };
@@ -6740,12 +6862,12 @@ wfe = derive { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9ls
 wgaim = derive { name="wgaim"; version="1.4-10"; sha256="0wf6j7f7hn2cnsb9yi28rjl7sa60zjggg62i00039b7gxcznxj1r"; depends=[lattice qtl]; };
 wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[snpStats]; };
 whisker = derive { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
-whoami = derive { name="whoami"; version="1.1.0"; sha256="15mj1s0dfr9y14b23nx0506r0vz48bm1f6mf0fi7b390q0zmndq7"; depends=[httr jsonlite]; };
+whoami = derive { name="whoami"; version="1.1.1"; sha256="1njyjzp9jl5k0vys0ymnvx9vbfckscg4r8hgl1nq7a2q9b9cg06f"; depends=[httr jsonlite]; };
 whoapi = derive { name="whoapi"; version="0.1.0"; sha256="01hi47da4i482ma7fzyk7ivs0xalinh7g9hjkynk9kr7xq1dj8ci"; depends=[httr]; };
 widals = derive { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; };
 widenet = derive { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; };
 wikibooks = derive { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
-wikipediatrend = derive { name="wikipediatrend"; version="1.1.4"; sha256="1ccqwnlp0zchjqwxpy1li4wlgjlmdq3vdz6nrcgg7npplq4f6pjl"; depends=[httr jsonlite RCurl rvest stringr]; };
+wikipediatrend = derive { name="wikipediatrend"; version="1.1.6"; sha256="1yw22zs1rx4x8hk3fi4f0hbxmic102j9gj62dzwmsk6k02s6wvgw"; depends=[httr jsonlite RCurl rvest stringr]; };
 wildlifeDI = derive { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; };
 windex = derive { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; };
 witness = derive { name="witness"; version="1.2"; sha256="1pccn7czm1q0w31zpmky5arkcbnfl94gh1nnkf8kmcccdrr3lxph"; depends=[]; };
@@ -6754,6 +6876,7 @@ wle = derive { name="wle"; version="0.9-9"; sha256="032zqfqg6ghg56zgr005g8q94zsk
 wmlf = derive { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; };
 wmtsa = derive { name="wmtsa"; version="2.0-0"; sha256="0y2bv166xwwpb1wf6897qybyf84f34qjsmygdbv90r637c050yk5"; depends=[ifultools MASS splus2R]; };
 wnominate = derive { name="wnominate"; version="0.99"; sha256="19pis0p4kkwyddn8f93p4ff7l1hvcdr7m3hrv4bzmm9nd8iy8mk1"; depends=[pscl]; };
+woe = derive { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; };
 wombsoft = derive { name="wombsoft"; version="2.0"; sha256="11ri29vj1yg2lpr6vf1i45w20hqh8dswj04ylbq0vy27cwmxqljd"; depends=[]; };
 wordcloud = derive { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer Rcpp slam]; };
 wordmatch = derive { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; };
@@ -6787,14 +6910,14 @@ xtable = derive { name="xtable"; version="1.7-4"; sha256="1fvx4p058ygsyj9f4xb9k5
 xtal = derive { name="xtal"; version="1.0"; sha256="1717pl64nbliwbdg5fs6cwj7zvgrm00zlyj2dhi06yyg16gq1w8k"; depends=[]; };
 xtermStyle = derive { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; };
 xts = derive { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; };
-yaImpute = derive { name="yaImpute"; version="1.0-24"; sha256="0vqzcxkrnsj99kpc4fx9lbm446fjgsjcbfakm9pdk013mxiii72d"; depends=[]; };
+yaImpute = derive { name="yaImpute"; version="1.0-26"; sha256="00w127wnwnhkfkrn4764l1ap3d3njlidglk9izcxm0n4kqj0zb49"; depends=[]; };
 yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; };
 yaml = derive { name="yaml"; version="2.1.13"; sha256="18kz5mfn7qpif5pn91w4vbrc5bkycsj85vwm5wxwzjlb02i9mxi6"; depends=[]; };
 ycinterextra = derive { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; };
 yhat = derive { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[boot miscTools plotrix yacca]; };
 yhatr = derive { name="yhatr"; version="0.13.6"; sha256="0g08ass0vrqcmw1zfybiaqbrspcwyf4bsmcmzbz3nzdlkgwbn3bh"; depends=[httr jsonlite plyr RCurl rjson stringr]; };
 ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
-yuima = derive { name="yuima"; version="1.0.71"; sha256="0aqb87jlvlq6iw2mlngiylvayd6y2wrc82zl1za442gqq8py00if"; depends=[cubature expm mvtnorm zoo]; };
+yuima = derive { name="yuima"; version="1.0.73"; sha256="1nb91c3ii643sdw5yn8q55g5sy0x04xp9z4z3jipc72r6qcc84vw"; depends=[cubature expm mvtnorm zoo]; };
 zCompositions = derive { name="zCompositions"; version="1.0.3"; sha256="0lxy201ys9dvv8c09q8wbks1c2jkjyd1bbrxhjr7zi9j7m0parl7"; depends=[MASS NADA truncnorm]; };
 zendeskR = derive { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
 zetadiv = derive { name="zetadiv"; version="0.1"; sha256="1p9mxy70mgqxjn7szh44217nvhjh90237kp5znli1r01ch64mx6b"; depends=[car mgcv vegan]; };
@@ -6804,7 +6927,7 @@ zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc
 zoeppritz = derive { name="zoeppritz"; version="1.0-5"; sha256="0a501411gjs02vvhxdy8z3a5449arkamdidf2q6qswkkiv68qq04"; depends=[]; };
 zoib = derive { name="zoib"; version="1.3.0"; sha256="15i2gczc6sh0vyi51k105qd3bymwkpbpv2xm99jwflpa170yd8jp"; depends=[coda Formula matrixcalc rjags]; };
 zoo = derive { name="zoo"; version="1.7-12"; sha256="1n64pdmk2vrmiprwkncaaf936c97nlc1l78bvmzp991rijr9vqg5"; depends=[lattice]; };
-zooaRch = derive { name="zooaRch"; version="1.0"; sha256="1krzwrk2cknlsmd3hn8c2lly10pd8k8jj2x12mbjhr2wws0i5fj4"; depends=[ggplot2]; };
+zooaRch = derive { name="zooaRch"; version="1.1"; sha256="1a4cbayw5qj9wp925g06a1djiravh7yg3w7vdxzaks5a16pwv5li"; depends=[ggplot2]; };
 zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[filehash jpeg mlearning png svDialogs svMisc]; };
 zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
 ztable = derive { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; };

From 7a0fa8f898243c2dd185cc5a222ab147e9ddd0bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Aug 2015 21:08:31 +0200
Subject: [PATCH 0837/2016] r-modules: fix evaluation errors

---
 pkgs/development/r-modules/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 1951c02e677..2175ff7e697 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1515,6 +1515,14 @@ let
     "ptw" # depends on broken nloptr-1.0.4
     "spoccutils" # depends on broken spocc-0.3.0
     "translateSPSS2R" # depends on broken car-2.0-25
+    "EnrichmentBrowser" # depends on broken package r-EDASeq-2.3.2
+    "SoyNAM" # depends on broken package r-lme4-1.1-8
+    "genotypeeval" # depends on broken package r-rtracklayer-1.29.12
+    "ifaTools" # depends on broken package r-OpenMx-2.2.6
+    "mediation" # depends on broken package r-lme4-1.1-8
+    "rCGH" # depends on broken package r-affy-1.47.1
+    "rddtools" # depends on broken package r-AER-1.2-4
+    "spsann" # depends on broken package r-pedometrics-0.6-2
   ];
 
   otherOverrides = old: new: {

From 36fc26c0fc221e84529c5d0e8ebed47bca0a9e4e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 5 Aug 2015 21:21:41 +0200
Subject: [PATCH 0838/2016] R: regenerate CRAN and BIOC packages

---
 pkgs/development/r-modules/bioc-packages.nix |  87 +++---
 pkgs/development/r-modules/cran-packages.nix | 292 ++++++++++---------
 2 files changed, 206 insertions(+), 173 deletions(-)

diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index 9b609a915aa..2501cd9662b 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -26,7 +26,7 @@ AnalysisPageServer = derive { name="AnalysisPageServer"; version="1.1.3"; sha256
 AnnotationDbi = derive { name="AnnotationDbi"; version="1.31.17"; sha256="04xkhqnr9hmgxihfhn35a6s68s8x5layl7mf5whwhwxmlcd76lx4"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; };
 AnnotationForge = derive { name="AnnotationForge"; version="1.11.15"; sha256="02z3kxqcn87ykdsxfzs9j0qzpjkb2k79sz89lxrggk24jxk0rr35"; depends=[AnnotationDbi Biobase BiocGenerics DBI RSQLite S4Vectors]; };
 AnnotationFuncs = derive { name="AnnotationFuncs"; version="1.19.0"; sha256="1qjvkbqpyhwibdqv1c4n2z5wjnzx0h3kdas3fs33jhb597bxhl1y"; depends=[AnnotationDbi]; };
-AnnotationHub = derive { name="AnnotationHub"; version="2.1.31"; sha256="1kc60na1k0ycams6sbs9p282z4qs7y409yv60rzszr5k7vfgqbrz"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; };
+AnnotationHub = derive { name="AnnotationHub"; version="2.1.32"; sha256="1a8hxbj97fhg64zxfhwk107ih8y4zgq48yx6xgpzm2pdsx5x9ndx"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; };
 ArrayExpress = derive { name="ArrayExpress"; version="1.29.1"; sha256="0gyckxsmmh81ykf7mj952h2a4z58xrf9lbnmv884hz7zj317lf83"; depends=[affy Biobase limma XML]; };
 ArrayExpressHTS = derive { name="ArrayExpressHTS"; version="1.19.0"; sha256="0qyd9jhkvw4lxqjvix28yzdx08hi7vf77ynlqxcl2q1lb3gmbxar"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; };
 ArrayTV = derive { name="ArrayTV"; version="1.7.0"; sha256="11dlq4lmzw0x8z2qrxff6xlcilp95nd71jpdvg3i5yni3ws6z5m1"; depends=[DNAcopy foreach oligoClasses]; };
@@ -57,10 +57,10 @@ BioSeqClass = derive { name="BioSeqClass"; version="1.27.0"; sha256="1pv7zibcrgb
 Biobase = derive { name="Biobase"; version="2.29.1"; sha256="12cckssh7x4dd8vaapp5nfc5bfcqls8k3rblcfi17z5cpi0jply6"; depends=[BiocGenerics]; };
 BiocCaseStudies = derive { name="BiocCaseStudies"; version="1.31.0"; sha256="05nj9i9y8clf406bjcflj8lsrp9x9iw6my1bdqnxg3nv2krp37xn"; depends=[Biobase]; };
 BiocCheck = derive { name="BiocCheck"; version="1.5.6"; sha256="0gpmrqvj31n73bqljf23wbsw3hp44hl3z1jhc2q86s3mw6hlcfip"; depends=[BiocInstaller biocViews codetools devtools graph httr knitr optparse]; };
-BiocGenerics = derive { name="BiocGenerics"; version="0.15.3"; sha256="1wk7mr3jmjr2ljqqlmnpvb3x2cflkkhsyjl2cd4ns0gld4rmmm8x"; depends=[]; };
+BiocGenerics = derive { name="BiocGenerics"; version="0.15.5"; sha256="0l8gqzqqnxx99ziamclsf4krmlyrq6fjzifh19xg7wqiyp59h41x"; depends=[]; };
 BiocInstaller = derive { name="BiocInstaller"; version="1.19.9"; sha256="14z4wgvry2mbbv847mlns6ff0irwfpyk1yfcxbr27wmlisk14wxz"; depends=[]; };
-BiocParallel = derive { name="BiocParallel"; version="1.3.41"; sha256="1ri738840w5nprmh69k4n6lp5grw688anl6nz4xvczli3dbzampk"; depends=[futile_logger snow]; };
-BiocStyle = derive { name="BiocStyle"; version="1.7.4"; sha256="0wlydy1a3pspnyjg5vl0657z620n5vlhx99hxisskbrsr026mhmg"; depends=[]; };
+BiocParallel = derive { name="BiocParallel"; version="1.3.47"; sha256="0y3nv2ff8r2mijhljrgkky6b1vyb22iywbq38rv1ac6kbbpf680p"; depends=[futile_logger snow]; };
+BiocStyle = derive { name="BiocStyle"; version="1.7.6"; sha256="1bdsz8s74wfgbq6afihi40ra1kljf8w8vxrgna34aks49908rxnd"; depends=[]; };
 Biostrings = derive { name="Biostrings"; version="2.37.2"; sha256="0j6701qgrnphsy9p34sf3s6d91j1zbd824zwv9rsfdmdffbkqq3b"; depends=[BiocGenerics IRanges S4Vectors XVector zlibbioc]; };
 BitSeq = derive { name="BitSeq"; version="1.13.0"; sha256="1d397bcdyi3d35l1q1661spm3xhr7hqlsrjr5a2ybsjs3wqkf4fj"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; };
 BrainStars = derive { name="BrainStars"; version="1.13.0"; sha256="07wygi0fw0ilg404gx1ifswr61w6qlg8j0vkmnsr0migm70rgzzg"; depends=[Biobase RCurl RJSONIO]; };
@@ -97,7 +97,7 @@ COHCAP = derive { name="COHCAP"; version="1.7.0"; sha256="0clr1jh4jnq54phsnl90zf
 COMPASS = derive { name="COMPASS"; version="1.7.2"; sha256="0c83fsrmi7d2888pa3lnln42mlbnjgvpxw337vdh3dar1185a5b0"; depends=[abind clue data_table knitr plyr RColorBrewer Rcpp scales]; };
 CORREP = derive { name="CORREP"; version="1.35.0"; sha256="0hlij2ch8r3lv130hvyshb82lfqz2c7kr56bka1ghmg6jp0xf1n6"; depends=[e1071]; };
 COSNet = derive { name="COSNet"; version="1.3.3"; sha256="0l9sn0cki0mxacxv0bwp3cczcl8rscx8g3lnr0r448f13j8198f4"; depends=[]; };
-CRISPRseek = derive { name="CRISPRseek"; version="1.9.3"; sha256="1k1divchymr19czc9j1l7bjmx8i48wbsxwj5n9l8gvjq1iw170r2"; depends=[BiocGenerics Biostrings BSgenome seqinr]; };
+CRISPRseek = derive { name="CRISPRseek"; version="1.9.7"; sha256="164f12s8arg1460fcsaa9l3igav4vjn4niwwpxaj19i4iar1f3pw"; depends=[BiocGenerics Biostrings BSgenome seqinr]; };
 CRImage = derive { name="CRImage"; version="1.17.0"; sha256="1sab95gngwi7c333n9hnbd9fdvdy9i69pjpx5ic5799s7qr03llw"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; };
 CSAR = derive { name="CSAR"; version="1.21.0"; sha256="1wn7zxmy5ssj2jkk2624j42yv67wdcigp5ksb6fc2kzpgnvqmxl1"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
 CSSP = derive { name="CSSP"; version="1.7.0"; sha256="1ydxj358sfaygzjvh0b042p7gymjyl7nr5cnxrh8c7x2mv2hdh4d"; depends=[]; };
@@ -111,7 +111,7 @@ ChAMP = derive { name="ChAMP"; version="1.7.0"; sha256="0ll50qyq9k8x4bv30dap6g6l
 ChIPQC = derive { name="ChIPQC"; version="1.5.2"; sha256="0g630lpzwfbg5hgicg0s906a3a6gidswmidszx0hmn3479fah74m"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors]; };
 ChIPXpress = derive { name="ChIPXpress"; version="1.11.0"; sha256="11aifr69ss1hakrhba985bwz6k1sqkpzvv7gnzn8cgqnzxyr2i6b"; depends=[affy biganalytics bigmemory Biobase frma GEOquery]; };
 ChIPpeakAnno = derive { name="ChIPpeakAnno"; version="3.3.2"; sha256="0ww3ddnvdc561lhz27h8n3ywi1xpx1cbsqk2i8m5rkpykkkkr2dh"; depends=[AnnotationDbi BiocGenerics BiocInstaller biomaRt Biostrings BSgenome GenomicFeatures GenomicRanges graph IRanges limma multtest RBGL VennDiagram]; };
-ChIPseeker = derive { name="ChIPseeker"; version="1.5.7"; sha256="013di1c8lam36pyn0bcbaynmwwd72gb1zkw6s7p2phvlm2krprv7"; depends=[AnnotationDbi BiocGenerics boot dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix plyr RColorBrewer rtracklayer S4Vectors UpSetR]; };
+ChIPseeker = derive { name="ChIPseeker"; version="1.5.8"; sha256="14prgyzrhh5r6mmrf88my8a0r3n6m45rx2ik0ajlz76avjpzdawr"; depends=[AnnotationDbi BiocGenerics boot dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix plyr RColorBrewer rtracklayer S4Vectors UpSetR]; };
 ChIPseqR = derive { name="ChIPseqR"; version="1.23.2"; sha256="1k1vbck7kjyzzgm0hg8hxpq6zfg71rca76q3998fcnnlzsmgvcf4"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
 ChIPsim = derive { name="ChIPsim"; version="1.23.1"; sha256="13kniwvwa49n1kc9114ljn1fmzaiyb2nh33if596llql60p7nd23"; depends=[Biostrings IRanges ShortRead XVector]; };
 ChemmineOB = derive { name="ChemmineOB"; version="1.7.1"; sha256="04agfsdzccsvvvis6vy1gg83gfs4nrph950v6bbzgk15ki32rsjz"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
@@ -124,7 +124,7 @@ CoCiteStats = derive { name="CoCiteStats"; version="1.41.0"; sha256="0shp06qy8cv
 CoGAPS = derive { name="CoGAPS"; version="2.3.2"; sha256="0jh5ij66x3isz67mj0jwypyshplk1l1p47n2hvwgq87xmjzv6c8p"; depends=[BH gplots RColorBrewer Rcpp]; };
 CoRegNet = derive { name="CoRegNet"; version="1.5.0"; sha256="14yq1f005fcfmfp88h2fy05gdgbskjws11qbdh0ndx3sf93nzxm2"; depends=[arules igraph shiny]; };
 CompGO = derive { name="CompGO"; version="1.5.0"; sha256="128ib7w0jxba0p32s796i864b73zjfxac56znd0v4wv4vxv3jiv6"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer]; };
-ComplexHeatmap = derive { name="ComplexHeatmap"; version="1.2.5"; sha256="1016saqj8ykm8frwn4lsma1sp9zwlmyw9dd02abhi7bgqwgsd4p3"; depends=[circlize colorspace dendextend GetoptLong RColorBrewer]; };
+ComplexHeatmap = derive { name="ComplexHeatmap"; version="1.2.6"; sha256="0n0bn69ms6ny42i0rvajhvrwivxd21spgk9s9xzqbln7758fvnw2"; depends=[circlize colorspace dendextend GetoptLong RColorBrewer]; };
 ConsensusClusterPlus = derive { name="ConsensusClusterPlus"; version="1.23.0"; sha256="13iikfh234d2z4k487lb3shmnrfijygrf6gz3x481gba2psnbjyw"; depends=[Biobase cluster]; };
 CopyNumber450k = derive { name="CopyNumber450k"; version="1.5.0"; sha256="0mjhmh4shgckv43zvg4yqr17jfi9p9xnc40fwy9fw9c4vjcfsvsj"; depends=[Biobase BiocGenerics DNAcopy minfi preprocessCore]; };
 CopywriteR = derive { name="CopywriteR"; version="2.1.3"; sha256="0qhl3lbdf9fsm6hx45sk2nihikbzh08lbnwaz1as3wf5cx7zm08c"; depends=[BiocParallel chipseq data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
@@ -138,11 +138,11 @@ DBChIP = derive { name="DBChIP"; version="1.13.0"; sha256="0gk9kgmyp9540sq5gpbn7
 DECIPHER = derive { name="DECIPHER"; version="1.15.0"; sha256="1kbdsqvkznzsk4ljy91r5ipndwxb8hhkm46qqkakgr24mia3yvl1"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; };
 DEDS = derive { name="DEDS"; version="1.43.0"; sha256="1z049ppkrbyp0xjpiygz5i6rbxbv3vvnvspwz2vv77495v7ykj6z"; depends=[]; };
 DEGraph = derive { name="DEGraph"; version="1.21.0"; sha256="17f04qngcx8y4glr5wiryi8fifbla8fxh8nb6wagnrai5x6vhzis"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; };
-DEGreport = derive { name="DEGreport"; version="1.4.0"; sha256="06l803iy18kkv05b4h46vmzws20c0735m6csfkn2vp3bik8xh4lp"; depends=[coda edgeR ggplot2 Nozzle_R1 plyr quantreg]; };
+DEGreport = derive { name="DEGreport"; version="1.5.0"; sha256="14mrfnmkik74yf5vml03x96brq7qlja2hpvndbffxr5a8ddb7117"; depends=[coda edgeR ggplot2 Nozzle_R1 plyr quantreg]; };
 DEGseq = derive { name="DEGseq"; version="1.23.0"; sha256="0993f140wwv9z9l53f9g74x7l28bflxq7wdcbilfz7ijhh7isr7p"; depends=[qvalue samr]; };
 DESeq = derive { name="DESeq"; version="1.21.0"; sha256="13f6phdf9g325dlpn38l7zrq3mzldhldil134acxi9p3l50bx23y"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; };
 DESeq2 = derive { name="DESeq2"; version="1.9.26"; sha256="0b7w0csg7q5nqbrmc83rviiwhahq88zlqmxwlkz5g01w9zzkgc80"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
-DEXSeq = derive { name="DEXSeq"; version="1.15.9"; sha256="0ml4ibzhw38w0mfp0vdbbkisz40rw65yyd71q3ppj7jg4r4ch39a"; depends=[Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools statmod stringr]; };
+DEXSeq = derive { name="DEXSeq"; version="1.15.10"; sha256="1sddciia2zxn5jxpzyrg3mxcrl28kcvxfbc6nk5dwrnqd9mj53jj"; depends=[Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools statmod stringr]; };
 DFP = derive { name="DFP"; version="1.27.0"; sha256="0xcipbhfzvrpbm6dh2y3lbvfbwpn4wly32sssfm702zik5wm9dy1"; depends=[Biobase]; };
 DMRcaller = derive { name="DMRcaller"; version="1.1.1"; sha256="1g7q7cwivvb0m2y4fixvbxp51zfag1jv66bdlai3gawr94pcx56y"; depends=[GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; };
 DMRcate = derive { name="DMRcate"; version="1.5.61"; sha256="0ss8zk2b1y83q49pv9fdm2rqw5hlnd189knfg1y8y0psfjhc9knp"; depends=[limma minfi]; };
@@ -161,7 +161,7 @@ DrugVsDisease = derive { name="DrugVsDisease"; version="2.9.0"; sha256="1wmw1r0x
 DupChecker = derive { name="DupChecker"; version="1.7.0"; sha256="02wwwnx3w8rxiassd62xr295paw8py9pqsk1396qb5k773l6bfxv"; depends=[R_utils RCurl]; };
 DynDoc = derive { name="DynDoc"; version="1.47.0"; sha256="0gpmhqav4dx8p86pkh18fpmlki60zqaz00m2zhziiawigbrz41ph"; depends=[]; };
 EBImage = derive { name="EBImage"; version="4.11.7"; sha256="1zddydckv3zy8wf0wh34g5yg8s1p255h66ym6lnw3l5id7v32wz8"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; };
-EBSeq = derive { name="EBSeq"; version="1.9.3"; sha256="1xqh6zjip9y0s34hxvvxvvbvadmlv84s02vvq6s63gmaf3ra51b3"; depends=[blockmodeling gplots]; };
+EBSeq = derive { name="EBSeq"; version="1.9.4"; sha256="01pzjhqx61005jbw3l3m24h10225fkml9889aqvxdxzv5n4rvc03"; depends=[blockmodeling gplots testthat]; };
 EBSeqHMM = derive { name="EBSeqHMM"; version="1.3.1"; sha256="0lyf363f1wfgacrj5cyq8n3f3ssl5q400mn2q94cpai6k0qmvgs1"; depends=[EBSeq]; };
 EBarrays = derive { name="EBarrays"; version="2.33.0"; sha256="1zvfqf49chiks5vmj5ki89pvy14bm1cman47n3ybba1gg8z8mw94"; depends=[Biobase cluster lattice]; };
 EBcoexpress = derive { name="EBcoexpress"; version="1.13.0"; sha256="0fl0a7xasqcwvjlgf3h51akyhwpras2865m2idz1nmacm42q1w79"; depends=[EBarrays mclust minqa]; };
@@ -169,7 +169,7 @@ EDASeq = derive { name="EDASeq"; version="2.3.2"; sha256="0l1mmpy71pqqmqnx4xxn1v
 EDDA = derive { name="EDDA"; version="1.7.0"; sha256="0dyyhnc9v232njqnrcaq78g2m1qws30qcf6bsswq2di235ymk2g0"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; };
 ELBOW = derive { name="ELBOW"; version="1.5.0"; sha256="0lnc5hw2x4p9yd561w9dwplf7q2slcaghxsh5796bmyxjxhxanpy"; depends=[]; };
 ELMER = derive { name="ELMER"; version="1.00.0"; sha256="1kb7rixq02cc0cwm52acji69p89jq07zsagg7a8qva6gshs94k86"; depends=[GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra IRanges minfi reshape S4Vectors]; };
-EMDomics = derive { name="EMDomics"; version="1.1.1"; sha256="1a74f1ip4i8a5msdwnas5wbqhzkww1j2wr2qp0qnxcrn01mw93pg"; depends=[BiocParallel emdist ggplot2 matrixStats]; };
+EMDomics = derive { name="EMDomics"; version="1.1.2"; sha256="14gh59gq0wjhkmrclpmlixn3mbabwwq01bwq6hilf9s2s0i8qkpv"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; };
 ENCODExplorer = derive { name="ENCODExplorer"; version="1.1.3"; sha256="054cm1ldas26gv4xn16w3i25kykwnikj4s83g7sxxdij93m5rmlb"; depends=[jsonlite RSQLite]; };
 ENVISIONQuery = derive { name="ENVISIONQuery"; version="1.17.0"; sha256="1dnlw62hwysij63yc856c2sncgfwdq0rpmcds6i6wigdcfd21w8q"; depends=[rJava XML]; };
 ENmix = derive { name="ENmix"; version="1.1.7"; sha256="0p5ywjnm0xknr6k7bnkhcn69870f5wwlq70yfqiah7syqmyim67d"; depends=[Biobase doParallel foreach geneplotter impute MASS minfi preprocessCore sva wateRmelon]; };
@@ -225,7 +225,7 @@ GenoView = derive { name="GenoView"; version="1.3.0"; sha256="09k9xjmx3qmsfr3a4v
 GenomeGraphs = derive { name="GenomeGraphs"; version="1.29.0"; sha256="0kl2gapg7hnl4zfsamb3vwmj7z0vag7vd8viwh0pwqj0pd45dswa"; depends=[biomaRt]; };
 GenomeInfoDb = derive { name="GenomeInfoDb"; version="1.5.9"; sha256="1mnskpj4qb6fyg7a6qkzs6cmxzn0bjff0zzgnp17bm94vx0334zh"; depends=[BiocGenerics IRanges S4Vectors]; };
 GenomicAlignments = derive { name="GenomicAlignments"; version="1.5.12"; sha256="0p1vnkh5h8w69is254zkzpj5y2a9c2yc2s7lvqhkf861x6fgkz1l"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
-GenomicFeatures = derive { name="GenomicFeatures"; version="1.21.13"; sha256="1swk94rqpvfysr3x1r61ypq9vlw1ryc0iw0x6dazfjjchaln0h07"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors]; };
+GenomicFeatures = derive { name="GenomicFeatures"; version="1.21.14"; sha256="0lnkidki4pl40878nd6bzswkdxgkz75nn052693glcvzw3qm6wg5"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors]; };
 GenomicFiles = derive { name="GenomicFiles"; version="1.5.4"; sha256="13lglgxkqsxgi453dk56ry7amnv6lyddy74fnhhsqinj5ip9k3vw"; depends=[BiocGenerics BiocParallel GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
 GenomicInteractions = derive { name="GenomicInteractions"; version="1.3.6"; sha256="0003hd22c3nfdb5h84pvd754gcpj3b6flzg8nhf7d0s99nzddr6a"; depends=[BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph IRanges Rsamtools rtracklayer S4Vectors stringr]; };
 GenomicRanges = derive { name="GenomicRanges"; version="1.21.17"; sha256="1hp2knf1qnph62480hzmn68lxp193x4zv3b0yx2a7khj4sgy7566"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
@@ -260,7 +260,7 @@ INPower = derive { name="INPower"; version="1.5.0"; sha256="0msz24bixp7b5a83n406
 INSPEcT = derive { name="INSPEcT"; version="0.99.8"; sha256="0pzh0xkh4py6rwnjqz4wqfnk2h08dp5q9gc4cgxls6gl3574i9ny"; depends=[Biobase BiocParallel deSolve GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve]; };
 IONiseR = derive { name="IONiseR"; version="0.99.7"; sha256="0b4lxdhajd4mhdnfa8c3zm8n5s398arrxjig2bv6il933lhxi6ps"; depends=[BiocGenerics Biostrings data_table dplyr ggplot2 magrittr rhdf5 ShortRead tidyr XVector]; };
 IPPD = derive { name="IPPD"; version="1.17.0"; sha256="0afhz5ishr1my9gnksa4dl92lfnb2fnvdpsh3n7kj4j2s8xx0crc"; depends=[bitops digest MASS Matrix XML]; };
-IRanges = derive { name="IRanges"; version="2.3.15"; sha256="0pvhvhsvqglym4ncg2aa0fbmrw32nj0givpippv43p9cywhglklw"; depends=[BiocGenerics S4Vectors]; };
+IRanges = derive { name="IRanges"; version="2.3.17"; sha256="1fjz4whvw68xw6w0anzcrympk6xfsa7rgx0mxbzlwkpj96j2805k"; depends=[BiocGenerics S4Vectors]; };
 ITALICS = derive { name="ITALICS"; version="2.29.0"; sha256="16l0wq7bxi3nz8f5hggnzddhg07vrcca480ygvmi03cxajxbjr9h"; depends=[affxparser DBI GLAD oligo oligoClasses]; };
 IVAS = derive { name="IVAS"; version="1.1.0"; sha256="15jnmi40bsnyf5yw86gvqppv0g8250lsi74gsjzhm7gijhlxfnrm"; depends=[AnnotationDbi BiocGenerics doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges lme4 Matrix S4Vectors]; };
 Icens = derive { name="Icens"; version="1.41.0"; sha256="1vi2hnzs8z5prggswa6wzr2y53jczkgg09f4vw0pjzkzi7p8bphy"; depends=[survival]; };
@@ -294,7 +294,7 @@ MEDME = derive { name="MEDME"; version="1.29.0"; sha256="1fpi4ri134ii28nfiq2p875
 MEIGOR = derive { name="MEIGOR"; version="1.3.0"; sha256="1kif7m78w0w0qv4fqfby3rknqk56zk83dds3cm4pgv2cii61i9jy"; depends=[CNORode deSolve Rsolnp snowfall]; };
 MGFM = derive { name="MGFM"; version="1.3.0"; sha256="1h2bi2cchfxl0z31pgj6q6pb1jnmqvjy7jv2khp80h7sdr65356i"; depends=[annotate AnnotationDbi]; };
 MIMOSA = derive { name="MIMOSA"; version="1.7.1"; sha256="1gzm90ii18vvpfd2nnl34mcvbvi49ck4hd7c5yziac8m3gx2f9f2"; depends=[Biobase coda data_table Formula ggplot2 Kmisc MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
-MLInterfaces = derive { name="MLInterfaces"; version="1.49.6"; sha256="1lm6sdw2svwqgnkxzy1sdl7y3mpdp42b94asn5fjxdsmmyy6im7d"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis MASS pls RColorBrewer rda rgl rpart sfsmisc shiny]; };
+MLInterfaces = derive { name="MLInterfaces"; version="1.49.8"; sha256="0asl6mibg1r2i9kmgax2qmsnj80spkn4n2pg237wxs9pm70qgpnv"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS pls RColorBrewer rda rgl rpart sfsmisc shiny]; };
 MLP = derive { name="MLP"; version="1.17.0"; sha256="1wb6bzxn1paba2fxh62ldsfr4kr0nq2sy21v0pp0qwhfxndyzpdn"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; };
 MLSeq = derive { name="MLSeq"; version="1.7.0"; sha256="0vc5rz4l574hmzwn3q7c4giib0lzs720j0j3alvarb3lmfzx9mhq"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; };
 MMDiff = derive { name="MMDiff"; version="1.9.0"; sha256="0xvnv024cv540m0jv9lrb4s5rvc0mq4gwp6wvdgpnsnqnwi9j556"; depends=[Biobase DiffBind GenomicRanges GMD IRanges Rsamtools]; };
@@ -302,7 +302,7 @@ MPFE = derive { name="MPFE"; version="1.5.0"; sha256="123a6qg761j46bs1ckd6yyr2ig
 MSGFgui = derive { name="MSGFgui"; version="1.3.0"; sha256="0r7izs3wpd7l9agrm3mrr3kmm00s9fzljsjxhk4pzxkjg1ran4hp"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; };
 MSGFplus = derive { name="MSGFplus"; version="1.3.0"; sha256="0q75mygrd56kr9hrrxlmckkgvhcrgvpgvbjdxjmz6jaqp5wfbkf5"; depends=[mzID]; };
 MSnID = derive { name="MSnID"; version="1.3.1"; sha256="0a0r2ikyb0spm110xzn3zzhl8g6xsvmh781d65f10l1iqnd2cqza"; depends=[Biobase data_table doParallel foreach iterators MSnbase mzID ProtGenerics R_cache Rcpp reshape2]; };
-MSnbase = derive { name="MSnbase"; version="1.17.12"; sha256="1yfkiphcn88dhjsj680jjj671jw1gxixhrg60sd8ri7j7b4z67as"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn]; };
+MSnbase = derive { name="MSnbase"; version="1.17.13"; sha256="0ijh800jbdjw4nlcx69f3dp9q5zhghvfprgpjvx407a32i47dz3k"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn]; };
 MSstats = derive { name="MSstats"; version="2.7.0"; sha256="0zhv2c769biv6avb4csi7alabk76bfn0ykzwp0lc6ymzggbj9pil"; depends=[ggplot2 gplots limma lme4 marray MSnbase preprocessCore Rcpp reshape]; };
 MVCClass = derive { name="MVCClass"; version="1.43.0"; sha256="1mbhfkvdkxw9xd76dd2pxk947w9wahwdsk9x1wcryrmwcdvaqqcz"; depends=[]; };
 MantelCorr = derive { name="MantelCorr"; version="1.39.0"; sha256="0l255m63q9idv56svs5m5bc4izwqnm3jy2z3kka7sw4xcx13l39g"; depends=[]; };
@@ -335,7 +335,7 @@ NCIgraph = derive { name="NCIgraph"; version="1.17.0"; sha256="103p0i4y9frkvdpzh
 NGScopy = derive { name="NGScopy"; version="1.3.0"; sha256="09b323rx0v5dnck2dgq9rzzjk7dbpry74q6c4dkgvjvxkf7khh8m"; depends=[changepoint rbamtools Xmisc]; };
 NOISeq = derive { name="NOISeq"; version="2.11.1"; sha256="13q3v2jphridbjk1059c475xgw9ywkdyqf0b6pbl3pk9l3ag9dr9"; depends=[Biobase Matrix]; };
 NTW = derive { name="NTW"; version="1.19.0"; sha256="027rdvy8xpsa70g6x33v4fmzk8gyvd8p3lgf65ac36wcy120gyhl"; depends=[mvtnorm]; };
-NanoStringQCPro = derive { name="NanoStringQCPro"; version="1.1.1"; sha256="0mmbbxhxd7nh7mqzckw0as68ac0nv005liif0laadbz49y6p4rwm"; depends=[AnnotationDbi Biobase knitr NMF png RColorBrewer]; };
+NanoStringQCPro = derive { name="NanoStringQCPro"; version="1.1.2"; sha256="1xk7rzaschgb39982jkb25xaz1l547dl020nl4wn0fdmy8kalp86"; depends=[AnnotationDbi Biobase knitr NMF png RColorBrewer]; };
 NarrowPeaks = derive { name="NarrowPeaks"; version="1.13.2"; sha256="0cryjprj8y1fgn5xxzsyyv4zdzv5qy8405qkj47kvjbrk0kbr97s"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; };
 NetPathMiner = derive { name="NetPathMiner"; version="1.5.2"; sha256="0k3vq5l95hapw8hbc00m4pchxwzylp97y20w21g0g1yaf1cf9br0"; depends=[igraph]; };
 NetSAM = derive { name="NetSAM"; version="1.9.0"; sha256="1bdch37kk1clb8cyffrlcr6d5qykk5a5ql3dfi94bw1l0w6v4fjq"; depends=[graph igraph seriation]; };
@@ -353,6 +353,7 @@ OncoSimulR = derive { name="OncoSimulR"; version="1.99.5"; sha256="0pjn2kirf1b72
 OperaMate = derive { name="OperaMate"; version="0.99.6"; sha256="0xh57d82rmfcs1a6gj0qcjf585drhzns5k69bwxb7x1xw63wp4kp"; depends=[ggplot2 MASS pheatmap RDAVIDWebService]; };
 OrderedList = derive { name="OrderedList"; version="1.41.0"; sha256="1cw8y5f5h15z0qwg8n4dq7g3ixx2wa332rdsb4w2qqmcqlz79bfp"; depends=[Biobase twilight]; };
 OrganismDbi = derive { name="OrganismDbi"; version="1.11.42"; sha256="0y0v5ngall7iyvx2bqhfkxdnw9alkyab5f6qgpq8dpvr6pvyamyl"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller GenomicFeatures GenomicRanges graph IRanges RBGL RSQLite S4Vectors]; };
+Oscope = derive { name="Oscope"; version="0.99.1"; sha256="0kv586yv17cf61jnvglsr08175dq0qz5zif8xflnliac9whj7yvf"; depends=[BiocParallel cluster EBSeq testthat]; };
 OutlierD = derive { name="OutlierD"; version="1.33.0"; sha256="0bljxmrnlqcngzzv6yxjsim7gd4icyi384vimn5gs869mq9gyrj3"; depends=[Biobase quantreg]; };
 PAA = derive { name="PAA"; version="1.3.3"; sha256="1v5gw9f2glzsz05kqyvvhwzfdfj4ypwbfgy5q16lr1y64slabzq2"; depends=[e1071 limma MASS mRMRe randomForest Rcpp ROCR sva]; };
 PADOG = derive { name="PADOG"; version="1.11.0"; sha256="0x84k32fmd1zrwjc4f71mq4jslh9bxr4gjbl48k1f5kl5j6hlxj3"; depends=[AnnotationDbi Biobase doRNG foreach GSA limma nlme]; };
@@ -404,7 +405,7 @@ RMassBank = derive { name="RMassBank"; version="1.11.0"; sha256="1df5kfm4gb5kz1z
 RNASeqPower = derive { name="RNASeqPower"; version="1.9.0"; sha256="0nn5wq81cm81wjwc43ky597fyq1l4ya36k64bp6k80ri94qx2vzg"; depends=[]; };
 RNAinteract = derive { name="RNAinteract"; version="1.17.0"; sha256="03rz6xyy9f48ns0r9xcxrghikxlna8cx62rwswq2i1xkh7c5lfiy"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; };
 RNAither = derive { name="RNAither"; version="2.17.2"; sha256="01h9l5inafhzpych76rpkrml442ld6jaxrd31ambspn9hsv8js6z"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
-RNAprobR = derive { name="RNAprobR"; version="1.1.1"; sha256="1n0ra0jb6y01nbdx9qbmkh5w4zy381nzkwcawvdg2bfzva1734mp"; depends=[BiocGenerics Biostrings GenomicFeatures GenomicRanges plyr Rsamtools rtracklayer]; };
+RNAprobR = derive { name="RNAprobR"; version="1.1.2"; sha256="0cjxf53q9g5g2092grbwp2z9q0sgw4bj5fism0a34w5r1varr9nb"; depends=[BiocGenerics Biostrings GenomicFeatures GenomicRanges plyr Rsamtools rtracklayer]; };
 ROC = derive { name="ROC"; version="1.45.0"; sha256="1vcv5q7ylr2b1fb4vmrc8j4j7s3v5szzpkwblnfkcp2y8d03i9a1"; depends=[]; };
 ROntoTools = derive { name="ROntoTools"; version="1.9.0"; sha256="07l9j4d26hn8d5ma3z19ipy4rrw29k66zb2ib8n3ba24pjm0h8w3"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; };
 RPA = derive { name="RPA"; version="1.25.0"; sha256="1bzjb0064xdn5zk9y9dpxjdw79i8kkfb29f13balx78nq5xznxh4"; depends=[affy]; };
@@ -451,9 +452,9 @@ Rolexa = derive { name="Rolexa"; version="1.25.0"; sha256="1qrf7byimw9s5jp15zmwq
 RpsiXML = derive { name="RpsiXML"; version="2.11.0"; sha256="0rvma7vynfh5sjhqnbpagilq54dh0wrvvb3jzykwmrak0dbyk7zh"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; };
 Rqc = derive { name="Rqc"; version="1.3.1"; sha256="02kc0ki021m4hxhzlmxfrb9p7p2ibdqan5hr9h67vd2dcnp9yaij"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings ggplot2 IRanges knitr markdown plyr reshape2 S4Vectors ShortRead]; };
 Rsamtools = derive { name="Rsamtools"; version="1.21.14"; sha256="1s2xwz0njbml9x0yw08kk8ykbr5zgzfy5glhzkdhcdfdz7m19ma9"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
-Rsubread = derive { name="Rsubread"; version="1.19.2"; sha256="1xcj13mzw7a8q93kimr61kcl2xvr0mdzvrrqi4j3psbcyf5zn86k"; depends=[]; };
+Rsubread = derive { name="Rsubread"; version="1.19.3"; sha256="1qb43g5868m3590p1kzb1g5dcl1dkpggk8qq2lnmbw5v761ryamp"; depends=[]; };
 Rtreemix = derive { name="Rtreemix"; version="1.31.0"; sha256="1z08y8qhc3sv4pwvji4pks46hxpcpwb9yx8y0927bc96a8mqgax4"; depends=[Biobase graph Hmisc]; };
-S4Vectors = derive { name="S4Vectors"; version="0.7.10"; sha256="15hyi728raya0x0fl0pp58kk6w4chvx7xv2f7kmp1432pkgvif9p"; depends=[BiocGenerics]; };
+S4Vectors = derive { name="S4Vectors"; version="0.7.12"; sha256="1ym0kph98ab7rdm8b2h3g8zhx92dax7c2nbdmkrahfnldiq60sgn"; depends=[BiocGenerics]; };
 SAGx = derive { name="SAGx"; version="1.43.0"; sha256="111pgl7rzmscgadkbivwa736gpyw1z7zkcj648zq3jhqix569dvd"; depends=[Biobase multtest]; };
 SANTA = derive { name="SANTA"; version="2.6.0"; sha256="0zx9azk7j82bzq424rf42nsaw05qyfgzdsy38h6r352mfbmip2dl"; depends=[igraph Matrix snow]; };
 SBMLR = derive { name="SBMLR"; version="1.65.0"; sha256="1nmw5c32ka6l12cid54mc4diahjhmyg6fngsd646v70rbzgffn7q"; depends=[deSolve XML]; };
@@ -468,12 +469,12 @@ SLGI = derive { name="SLGI"; version="1.29.0"; sha256="0jhi3nmgnqf8qix90kpz8gqib
 SLqPCR = derive { name="SLqPCR"; version="1.35.0"; sha256="1p35xgwf3i8ksznz1gi3bddj0816hdljamcb7smdrq0md5fqmpzb"; depends=[]; };
 SMAP = derive { name="SMAP"; version="1.33.0"; sha256="0znl289fclws2vnqgpjnrl8b0s5q4cna3ps3il5783vr64ir88cg"; depends=[]; };
 SNAGEE = derive { name="SNAGEE"; version="1.9.0"; sha256="0sn5b8ah9idbz63y1rjx8brz3h58zvh2sk59l4i48nvrm38g169r"; depends=[]; };
-SNPRelate = derive { name="SNPRelate"; version="1.3.7"; sha256="04bgql78gwrprj445hkrmrl94ba2dxih48xgbyxhp4ifx5v97cyi"; depends=[gdsfmt]; };
+SNPRelate = derive { name="SNPRelate"; version="1.3.8"; sha256="0rmqx5s4748jpcbqjjpkm4snkvbs8c0xpdm5qfg18cgkx3jbpxpr"; depends=[gdsfmt]; };
 SNPchip = derive { name="SNPchip"; version="2.15.2"; sha256="1px5ifdsly1z8iwd22vj2xb4pk5jhsa3h2z31scw37b0v4daks50"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses SummarizedExperiment]; };
 SPEM = derive { name="SPEM"; version="1.9.0"; sha256="09klaxlz1ff77jhjsr95g3s4b5m285zf3fl9w4mv5pc8r1viqplf"; depends=[Biobase Rsolnp]; };
 SPIA = derive { name="SPIA"; version="2.21.0"; sha256="0v8m9wfl2kqzzl3k0v7lr7g33ymdnmqi9r2fqyb42mggpq5pwxlm"; depends=[KEGGgraph]; };
 SQUADD = derive { name="SQUADD"; version="1.19.0"; sha256="0xss3vhn6471z44gd44i8j5bni8471nb1sq3cx99f2gyk817nxp8"; depends=[RColorBrewer]; };
-SRAdb = derive { name="SRAdb"; version="1.23.0"; sha256="042y06ds1jdj26jzi51wxb6mlmlr751jyf7ggjaq7zrz267dmj76"; depends=[GEOquery graph RCurl RSQLite]; };
+SRAdb = derive { name="SRAdb"; version="1.25.0"; sha256="1gkg3qyk98zc8gjlmgg34xgjmh92iy2bl9larhdv5inqv2jn3yj3"; depends=[GEOquery graph RCurl RSQLite]; };
 SSPA = derive { name="SSPA"; version="2.9.0"; sha256="1kkvj3s2l6zzvv6pybx38qrnm3i5dxckx2fpc4snlx7km2w175xz"; depends=[lattice limma qvalue]; };
 STAN = derive { name="STAN"; version="1.3.0"; sha256="02qg79aa0j2ns1xswdirgbpwb0dlghd0lbdxgnpmy225wgb7nak6"; depends=[Rsolnp]; };
 STATegRa = derive { name="STATegRa"; version="1.3.1"; sha256="0kfwi5qimg4myx5x0gjwrkhz8cxh2hz1mvxla8yn8v8fkb3ryshj"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; };
@@ -482,7 +483,7 @@ SVM2CRM = derive { name="SVM2CRM"; version="1.1.0"; sha256="0k3mg9b8i406ssvkzacz
 SamSPECTRAL = derive { name="SamSPECTRAL"; version="1.23.4"; sha256="0fqnqffw6q5sja3jkw6ddrachs075s5s7rnpg9fli9lgax5r4rbp"; depends=[]; };
 ScISI = derive { name="ScISI"; version="1.41.0"; sha256="05snqj8qphcmnkrmv42p6zs92dmi09sd06abn5ll5234my5d0vvn"; depends=[annotate AnnotationDbi apComplex RpsiXML]; };
 SemDist = derive { name="SemDist"; version="1.3.0"; sha256="0dvnp3d2s7bc4jv2vm8jikyac2cd23hx7r480g2lkcaic99wbl0s"; depends=[annotate AnnotationDbi]; };
-SeqArray = derive { name="SeqArray"; version="1.9.9"; sha256="0nlzwr6v1az5apm5lipzxdjdfswjyb8kfasjrg4ndddxwmmr2ads"; depends=[Biostrings gdsfmt GenomicRanges IRanges S4Vectors VariantAnnotation]; };
+SeqArray = derive { name="SeqArray"; version="1.9.10"; sha256="0r4308fich1wwdrqfw6d6c88cq8xsyg2p8wvfnhn1ah4lng9s6z3"; depends=[Biostrings gdsfmt GenomicRanges IRanges S4Vectors VariantAnnotation]; };
 SeqGSEA = derive { name="SeqGSEA"; version="1.9.0"; sha256="0znabm84qgzf9m4dk64jppn3s5vzz1sjvrdlr7s6jls8jwi8kqqi"; depends=[Biobase biomaRt DESeq doParallel]; };
 SeqVarTools = derive { name="SeqVarTools"; version="1.7.1"; sha256="04xfph2iphpmlqws5xmibq1jdkclbal2nrf18w7sblqcv67cff7x"; depends=[gdsfmt GenomicRanges GWASExactHW IRanges S4Vectors SeqArray VariantAnnotation]; };
 ShortRead = derive { name="ShortRead"; version="1.27.5"; sha256="0r9gmbg9fd3n6v8c0l1mjkk9x1v6qrisamm5a1nasqbg3wmhmz5k"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
@@ -490,7 +491,7 @@ SigCheck = derive { name="SigCheck"; version="2.1.0"; sha256="012n75gmsifvymbk20
 SigFuge = derive { name="SigFuge"; version="1.7.0"; sha256="1b966n3rl4xs3q1vjgkxxfravqr02rdgwyzvr469y757qdqi1day"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; };
 SimBindProfiles = derive { name="SimBindProfiles"; version="1.7.0"; sha256="04m7h5zil05sg9yfgjjzm1p65302fp50vxf8y1jafp1nwqialxwh"; depends=[Biobase limma mclust Ringo]; };
 SomatiCA = derive { name="SomatiCA"; version="1.13.0"; sha256="06b3mz199qm2ynal8iq4kp8rv40wbc5zipzwm22nccf97krxl9a4"; depends=[DNAcopy doParallel foreach GenomicRanges IRanges lars rebmix sn]; };
-SomaticSignatures = derive { name="SomaticSignatures"; version="2.5.5"; sha256="17a74vmnxrznq7y6fafrwlc6kdrs2qf56ikgacsmp6rm7cx7fi36"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; };
+SomaticSignatures = derive { name="SomaticSignatures"; version="2.5.6"; sha256="17w3dszcaxpkyk9chb7bfdii9zr1hppqhgsarzls4s4p4472f7d1"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; };
 SpacePAC = derive { name="SpacePAC"; version="1.7.0"; sha256="1ay5hlbm2x9g5mjrq5qksgrrr84vwfk49g9qb2sc9wyc46n5af6k"; depends=[iPAC]; };
 SpeCond = derive { name="SpeCond"; version="1.23.0"; sha256="0nbbqazxql9mc5idvrcycrm9fkrnm2vi9zrad3awhc378ippdk8k"; depends=[Biobase fields hwriter mclust RColorBrewer]; };
 SplicingGraphs = derive { name="SplicingGraphs"; version="1.9.1"; sha256="1s3kvaxrrvfndp4imavj0r9zw0rg37cn9xwxhi5zpfd7a784z1xk"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; };
@@ -524,7 +525,7 @@ VariantFiltering = derive { name="VariantFiltering"; version="1.5.16"; sha256="1
 VariantTools = derive { name="VariantTools"; version="1.11.0"; sha256="1yyx9l6q3v4igm2ppnrsj9c7p4p0zpkqwjyf9d7b7rqvrk9yjyrv"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges gmapR IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
 Vega = derive { name="Vega"; version="1.17.0"; sha256="1c39112czlw9hgh9gmkwxhhz9kwki48k8lsfmy3hkzxqpxx61h01"; depends=[]; };
 VegaMC = derive { name="VegaMC"; version="3.7.0"; sha256="046wly5sn4vwk3h4bcick8q5dpjrfjq393rqjl8y4v24iqynlyqd"; depends=[Biobase biomaRt genoset]; };
-XBSeq = derive { name="XBSeq"; version="0.99.6"; sha256="1j8hwy2wi4vmc1nnc5xij578w445vqj0v6ngz06rlbdi5kb9k7ls"; depends=[Biobase BiocGenerics DESeq2 ggplot2 locfit matrixStats pracma]; };
+XBSeq = derive { name="XBSeq"; version="0.99.7"; sha256="01vi1p5h1lin0d62mm92y745crv21qqf24kwaj0nlhny93aq45gp"; depends=[Biobase BiocGenerics Delaporte DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma]; };
 XDE = derive { name="XDE"; version="2.15.0"; sha256="17i8zxb6q4wpsa8lymcnilmr39ip1a54h6rqyl3m7qa8xwb0gv50"; depends=[Biobase BiocGenerics genefilter gtools MergeMaid mvtnorm]; };
 XVector = derive { name="XVector"; version="0.9.1"; sha256="0l5l45i7sx1j51s3wkab207qwbk77i8iazd26isf0yp3rsb84a4c"; depends=[BiocGenerics IRanges S4Vectors]; };
 a4 = derive { name="a4"; version="1.17.0"; sha256="0pn0gm4xkngz72i92h58d0xbpcx04938x4vm0mqsilrjapchripj"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; };
@@ -536,7 +537,7 @@ a4Reporting = derive { name="a4Reporting"; version="1.17.0"; sha256="1fpdkw048gv
 aCGH = derive { name="aCGH"; version="1.47.0"; sha256="095arlryay4gdr6kva7vf9lcby60pyx5bs4vcx586zgwskzpb2ln"; depends=[Biobase cluster multtest survival]; };
 acde = derive { name="acde"; version="0.99.5"; sha256="1bbsfr7a2sivb6dpn06hwj0i95wdlfxzba4a36pakx7nzn6nv76p"; depends=[boot]; };
 adSplit = derive { name="adSplit"; version="1.39.0"; sha256="1jprbqwhksyp9jf05r5dbfzgn30xm16shqsf8yi9b3nr7z2swvwm"; depends=[AnnotationDbi Biobase cluster multtest]; };
-affxparser = derive { name="affxparser"; version="1.41.5"; sha256="0naiv8z07zr1xjnmimx17awnsb9dryiz4w9jx17whrjwdpddx1p5"; depends=[]; };
+affxparser = derive { name="affxparser"; version="1.41.6"; sha256="1d1jnsx3dq52yfcchnagidlsw73dk7j5pagqfzba6pa6vv8l3sl0"; depends=[]; };
 affy = derive { name="affy"; version="1.47.1"; sha256="1c9ggyqhj65mj0nq9xsqfmzp4a5705qj67swjpk5bmqajxr390a3"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; };
 affyContam = derive { name="affyContam"; version="1.27.0"; sha256="1hd9kchhdjcnkxlf6kcc59jb5a9v67671shvzprraa1lg4800j5x"; depends=[affy Biobase]; };
 affyILM = derive { name="affyILM"; version="1.21.0"; sha256="1gvagg83p4vxp6q72s7camcg5lhxdfy7rmm3a2p2n29267xvcz5x"; depends=[affxparser affy Biobase gcrma]; };
@@ -545,7 +546,7 @@ affyPara = derive { name="affyPara"; version="1.29.0"; sha256="06382vyfjrng72hhm
 affyQCReport = derive { name="affyQCReport"; version="1.47.0"; sha256="09f3pbacsrjs5bv1bv3dz7jmd849rnix6pqlkszr507s6by5i47y"; depends=[affy affyPLM Biobase genefilter lattice RColorBrewer simpleaffy xtable]; };
 affycomp = derive { name="affycomp"; version="1.45.0"; sha256="0wwgijr7h2hbv2l0w5p509f70yy873w8kahs7nnhrgl4kzbjiymc"; depends=[Biobase]; };
 affycoretools = derive { name="affycoretools"; version="1.41.9"; sha256="16zdm1idmssg9jp86kkfc2h2dhjz2rl6qnrbybfbkiiklj2gagq7"; depends=[affy AnnotationDbi Biobase gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools xtable]; };
-affyio = derive { name="affyio"; version="1.38.0"; sha256="0rdkbc01bgkvg4pmpv7nl8ggq3jy17ldll50xqi1yv8rx2z0m0vp"; depends=[zlibbioc]; };
+affyio = derive { name="affyio"; version="1.39.0"; sha256="07m032wbfgi06yl79waskb2h1r4qi65pzr1j2ry60cr9jv50sizc"; depends=[zlibbioc]; };
 affylmGUI = derive { name="affylmGUI"; version="1.43.2"; sha256="1mkg2addri3x8vchgcdy4wih1pzagbp0i54w3nh9kf64r89m35br"; depends=[affy affyio affyPLM AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
 affypdnn = derive { name="affypdnn"; version="1.43.0"; sha256="01myf9dxzgc2jgdswphinz7ap7bdaqnw0gcfk32sxbykr4g4zyiy"; depends=[affy]; };
 agilp = derive { name="agilp"; version="3.1.0"; sha256="13jnq7v0qfyllbldx2abnia0rg40yxxgkq4i1whsy5qnk1fp0n77"; depends=[]; };
@@ -585,7 +586,7 @@ birta = derive { name="birta"; version="1.13.0"; sha256="01lrwg4naks85gcrlg3sk3p
 birte = derive { name="birte"; version="1.4.0"; sha256="0fyz2chcgcp98lk6zj21lsixmkr06hd80dbg2j25a4rx2pv6qn5s"; depends=[Biobase limma MASS nem Rcpp RcppArmadillo ridge]; };
 blima = derive { name="blima"; version="1.3.0"; sha256="1i7njg1lw76717irmfbpy9pmv8hy7nzyini2wm6625cafizp5xq8"; depends=[beadarray Biobase BiocGenerics]; };
 bridge = derive { name="bridge"; version="1.33.0"; sha256="06iz67amv80az14s8yim25jfsgbxhxbfifbqazsc78ip9gd7lfyv"; depends=[rama]; };
-bsseq = derive { name="bsseq"; version="1.5.4"; sha256="1hr9h4h099506id4xvh6xm9x40dv5hsiyz8rzj4dxxkq7095h9d1"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges locfit matrixStats S4Vectors scales SummarizedExperiment]; };
+bsseq = derive { name="bsseq"; version="1.5.5"; sha256="1yhrysqrbv38p7k7g8sywp6ly6prll1kgjpkk7ff9gklpgmdygkq"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges locfit matrixStats R_utils S4Vectors scales SummarizedExperiment]; };
 bumphunter = derive { name="bumphunter"; version="1.9.1"; sha256="0phq9dhrj8fa253a64vwfp75j85vp9142g5gmfy1g1n861xy8r26"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; };
 caOmicsV = derive { name="caOmicsV"; version="0.99.2"; sha256="0y96f64m0liv53vbby866v1ga5nml1506pp6ff4ax7dbg0niiwwn"; depends=[bc3net igraph]; };
 canceR = derive { name="canceR"; version="1.1.3"; sha256="1cagv58133w80acjzlyvx2752ap4dhkpvsfr34306gwbvs4gin3j"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
@@ -633,7 +634,7 @@ cosmiq = derive { name="cosmiq"; version="1.3.0"; sha256="1868sxwlmaqas3w3nrw4bv
 cpvSNP = derive { name="cpvSNP"; version="1.1.0"; sha256="066y409zfz0bway990ygck5lf0vzl6whh212v4rpis1l9bzfv434"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; };
 cqn = derive { name="cqn"; version="1.15.1"; sha256="1g1ip7lxs82qq0qbhnx90hxmjiypc76p1sgx7yvj5nmp6wp1m5xy"; depends=[mclust nor1mix preprocessCore quantreg]; };
 crlmm = derive { name="crlmm"; version="1.27.0"; sha256="16i3ijqhwp6c2dshk8r7idrjwga3sm1qcafqz9gl4q6b04s5jvym"; depends=[affyio Biobase BiocGenerics ellipse ff foreach illuminaio lattice matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; };
-csaw = derive { name="csaw"; version="1.3.9"; sha256="10ad0nflzy5ygq7rcn5swpdhxd4rr4y65759pvhji17scsinhswp"; depends=[AnnotationDbi edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges limma Rsamtools S4Vectors SummarizedExperiment]; };
+csaw = derive { name="csaw"; version="1.3.10"; sha256="01vap3h0j9pklmdh5i90p6j9mppvyld000cbhhyj7rmx7z8bsswy"; depends=[AnnotationDbi edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges limma Rsamtools S4Vectors SummarizedExperiment]; };
 ctc = derive { name="ctc"; version="1.43.0"; sha256="139rxdvyvv3wvlc5q3581y5hkjkd5smxvb606mlxjb8lww4qmcj8"; depends=[amap]; };
 cummeRbund = derive { name="cummeRbund"; version="2.11.1"; sha256="0nd1a9wi2qvvdhfvkb18ql82bfzhz6fivc7wdfv90mibrd7ypb2a"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer]; };
 customProDB = derive { name="customProDB"; version="1.9.4"; sha256="0ws620i6s9p477zfns0m6qpzzhrsivjziv2gv3gmy19dhfh0ln08"; depends=[AnnotationDbi biomaRt Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer stringr VariantAnnotation]; };
@@ -648,9 +649,10 @@ deltaGseg = derive { name="deltaGseg"; version="1.9.0"; sha256="0y8fw4gxmhsr5xrb
 derfinder = derive { name="derfinder"; version="1.3.3"; sha256="11npavkr27f3c48bp40vgn9klgmpqs2w17gl96qn5g1y2gyvrhk5"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
 derfinderHelper = derive { name="derfinderHelper"; version="1.3.1"; sha256="03kijh42x1v4ix4gxs1729rifwckaz9npcrd9b3j6xsizx97b4cr"; depends=[IRanges Matrix S4Vectors]; };
 derfinderPlot = derive { name="derfinderPlot"; version="1.3.4"; sha256="1f7x609sknmbn8gsxq75073vfr0qd0k9j7gfi0fxvgnm5f4lkizx"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 scales]; };
+destiny = derive { name="destiny"; version="0.99.14"; sha256="1k44mwmvrh3fyjdslk8vh2kw075nijzsviy7i0glsbj9q1lhfnzk"; depends=[Biobase BiocGenerics FNN igraph Matrix proxy Rcpp RcppEigen scatterplot3d VIM]; };
 dexus = derive { name="dexus"; version="1.9.0"; sha256="1xnjs6gmzkdj1snwakq73bz8ypnxzzxh8ki9wv0ljfbfwv1j7z53"; depends=[BiocGenerics]; };
 diffGeneAnalysis = derive { name="diffGeneAnalysis"; version="1.51.0"; sha256="1k5as63cd87nnigc0yzaxvhskpnbr7l1ym2bqc57zsm3bwh8xxwb"; depends=[minpack_lm]; };
-diffHic = derive { name="diffHic"; version="1.1.11"; sha256="1xc8kw489l4i4dkrsx7hihsg9cqw85y6cr956adf6mlgmgm05n16"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges IRanges limma locfit rhdf5 Rsamtools S4Vectors]; };
+diffHic = derive { name="diffHic"; version="1.1.12"; sha256="1ywa1c9g4v19w3xmgxvk202h2dd9ax3h99d4rff9xjp2ywkxy2qz"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges IRanges limma locfit rhdf5 Rsamtools S4Vectors]; };
 diggit = derive { name="diggit"; version="1.1.1"; sha256="0c3zy1d9bzb6asa4clgq738h7dj6md55gclwa244qyx857b58rqv"; depends=[Biobase ks viper]; };
 dks = derive { name="dks"; version="1.15.0"; sha256="1d66jfca6q8ni5vz5zh7fmxwh3y0yvl2p7gal7w55py6wvyssnl3"; depends=[cubature]; };
 domainsignatures = derive { name="domainsignatures"; version="1.29.0"; sha256="1wkypbm5ldwx8y2n16fajf450pwv6zipjdk0176a5rqihaflz80l"; depends=[AnnotationDbi biomaRt prada]; };
@@ -723,8 +725,8 @@ gaggle = derive { name="gaggle"; version="1.37.0"; sha256="1429xffj08m3dgfp6z34n
 gaia = derive { name="gaia"; version="2.13.0"; sha256="10vpz16plzi651aj1f5h3iwz6nzrrdnl9sgx3sgv5wmks2haqij4"; depends=[]; };
 gaucho = derive { name="gaucho"; version="1.5.0"; sha256="0kl8fw1n6dkqmrjp0xri3w2fhx25llrjag7j50m2xh371zfw9chc"; depends=[GA graph heatmap_plus png Rgraphviz]; };
 gcrma = derive { name="gcrma"; version="2.41.0"; sha256="03ncgd26hmj4l0mnnif1cf5qg99ir66d0mafx7wamrr930m17v8x"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; };
-gdsfmt = derive { name="gdsfmt"; version="1.5.8"; sha256="1p0vr17k0vq3ck13z0xn749ma4q8r03hfvfcijhyd3kg84hxj3f6"; depends=[]; };
-geNetClassifier = derive { name="geNetClassifier"; version="1.9.2"; sha256="04k1j2hqbs75k250i8b17bb8b84mij0hyb3yk1jl1368mpn5vmhc"; depends=[Biobase e1071 EBarrays minet]; };
+gdsfmt = derive { name="gdsfmt"; version="1.5.9"; sha256="1j849lizdsyqqp8wyssk00jc0l3mqk0ya0p8ca005i11vz8rivv3"; depends=[]; };
+geNetClassifier = derive { name="geNetClassifier"; version="1.9.3"; sha256="1vcbh910g6hsgqian6kf4vd62bf16m3bbycg7rn69rd5nhyn9b8x"; depends=[Biobase e1071 EBarrays minet]; };
 geecc = derive { name="geecc"; version="1.3.0"; sha256="0s955yg31papyny42nnqq711hawk5nn3dqgsf24ldz93vjiif9dr"; depends=[gplots hypergea MASS]; };
 genArise = derive { name="genArise"; version="1.45.0"; sha256="07xyy6wa22sa0ziqvy1dvpmpq11j56aw70kvj834da003yvabmg1"; depends=[locfit tkrplot xtable]; };
 geneRecommender = derive { name="geneRecommender"; version="1.41.0"; sha256="0c06xg7jbcn4lnrkwgwwdjq383a7d34svf9cdqlaz5fc662nl5v0"; depends=[Biobase]; };
@@ -738,11 +740,11 @@ genomeIntervals = derive { name="genomeIntervals"; version="1.25.3"; sha256="14q
 genomes = derive { name="genomes"; version="2.15.0"; sha256="1a172fz97b6xg4w91dcjbdr9kx0grzf71qn2j7zlyz52dcqppybb"; depends=[Biostrings GenomicRanges IRanges RCurl XML]; };
 genoset = derive { name="genoset"; version="1.23.5"; sha256="1vs1yffrjmqz70qc9rbzrabv7271jrqyscb43g3dw5q1mjwifjvn"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
 genotypeeval = derive { name="genotypeeval"; version="0.99.3"; sha256="1a0dxfdlcdxmsih8imhvd4mk40lzg9p8sryccqmycw360nwbxh1h"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; };
-gespeR = derive { name="gespeR"; version="1.1.0"; sha256="0hp2pw4z5kgj4av339v7r43is082c47ms422pwwa5f2pljijz2z6"; depends=[Biobase biomaRt cellHTS2 doParallel foreach ggplot2 glmnet Matrix reshape2]; };
+gespeR = derive { name="gespeR"; version="1.1.2"; sha256="1mfsy2jca89qh22l95y8cd6bjgdss0p1zhprh87jq973w2saj1kf"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; };
 ggbio = derive { name="ggbio"; version="1.17.2"; sha256="09ffhppri2ibprpwps0zxsrpvbrymsnycriy4709x2ldp1ifjn9l"; depends=[Biobase BiocGenerics Biostrings biovizBase BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; };
-ggtree = derive { name="ggtree"; version="1.1.10"; sha256="1p2cc500swcnfv5xa883dq60lgfx9lc080hjydn7zac0k2vvv42r"; depends=[ape Biostrings colorspace EBImage ggplot2 gridExtra jsonlite magrittr reshape2]; };
+ggtree = derive { name="ggtree"; version="1.1.13"; sha256="1vbv7qawd3zrppxlgy2gjf31q1v74ww8r2cn4w3q5dlv883pxcvm"; depends=[ape Biostrings colorspace EBImage ggplot2 gridExtra jsonlite magrittr reshape2]; };
 girafe = derive { name="girafe"; version="1.21.0"; sha256="11j9aiy6s5cdhwc9591vv344qnwlgn4hvwlp2rx47gccrnxxaqxi"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; };
-globaltest = derive { name="globaltest"; version="5.23.0"; sha256="1cwgqq5i3v6pp5kp4qi0jxqfh09zgaj719mk4kci3wxb18dc6ql7"; depends=[annotate AnnotationDbi Biobase multtest survival]; };
+globaltest = derive { name="globaltest"; version="5.23.1"; sha256="1zcyiixjia9lznaaksfb6mnwpsa4nsqzv92l86kgrvq9a5655pzd"; depends=[annotate AnnotationDbi Biobase survival]; };
 gmapR = derive { name="gmapR"; version="1.11.0"; sha256="0vn5iz44gcp4k0y5y4pjw6m60w75k82kv25hmnjshh8cpcwqkxkp"; depends=[Biobase BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
 goProfiles = derive { name="goProfiles"; version="1.31.0"; sha256="0nnc5idd3p969nhcsw2bjv7ws1qlb30sywhvpy8kcvk64wzz4jgw"; depends=[AnnotationDbi Biobase]; };
 goTools = derive { name="goTools"; version="1.43.0"; sha256="104xj0q1151ch0b4sswnky6shscx6fps25ycmig1s1ingd8dqnby"; depends=[AnnotationDbi]; };
@@ -829,7 +831,7 @@ metabomxtr = derive { name="metabomxtr"; version="1.3.2"; sha256="0wbpb79k9026ql
 metagene = derive { name="metagene"; version="2.1.0"; sha256="0fk7cgf96g1ax009g6f45jppb0w80akv5n3iwaaryy5b9pvsfk21"; depends=[BiocParallel biomaRt GenomicAlignments GenomicRanges ggplot2 gplots muStat R6 Rsamtools rtracklayer]; };
 metagenomeSeq = derive { name="metagenomeSeq"; version="1.11.10"; sha256="0b9vylijb6gzri61qn8wkj9si1zrgznzqhxzib1aw9y71v8y8k05"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; };
 metahdep = derive { name="metahdep"; version="1.27.0"; sha256="0kjd27brcvhfqbqk9r3fclbzf2np2zj88gi522y1c6vh3pc6fd22"; depends=[]; };
-metaseqR = derive { name="metaseqR"; version="1.9.0"; sha256="0p8bpnjm73jkng2xrypnz14rmrw1pppkrx1r88vnx33hzpkx83zx"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; };
+metaseqR = derive { name="metaseqR"; version="1.9.1"; sha256="1qaa28wnvafi7239lla8xfi8kxxwvi6ar684fg8f5a98s8vjk8i2"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; };
 methVisual = derive { name="methVisual"; version="1.21.0"; sha256="18kin1ibcc4ilfh59qgb0zilhvhvs0a1gmbg0lbvj2r0kbsk1ryy"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; };
 methyAnalysis = derive { name="methyAnalysis"; version="1.11.0"; sha256="0ka0svxvb76j0xkdx4pbwf2cyplihh45mb953csrapyh5r6hxwkn"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi rtracklayer S4Vectors VariantAnnotation]; };
 methylMnM = derive { name="methylMnM"; version="1.7.0"; sha256="08y13kkmafn2h55wwkgs1mpskb4i2wpxzzgjdr9gb3ns06qc9799"; depends=[edgeR statmod]; };
@@ -861,7 +863,7 @@ muscle = derive { name="muscle"; version="3.11.0"; sha256="1s3apdcd0qj08bswn7smj
 mvGST = derive { name="mvGST"; version="1.3.0"; sha256="1chskyx9hgymxg57p6y98rw743lapssx18axvl0r9f2zsmmfz9bn"; depends=[annotate AnnotationDbi GOstats gProfileR graph Rgraphviz stringr topGO]; };
 mygene = derive { name="mygene"; version="1.5.2"; sha256="0x40bnll85v94dnfpqrs8d9kx0zmdjbvgnqhcin1k9bshxqkypd9"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; };
 mzID = derive { name="mzID"; version="1.7.1"; sha256="1pp0zfffz91g16y1kr81mbham64g00mm3q539ykj5az34g5q1fcm"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; };
-mzR = derive { name="mzR"; version="2.3.1"; sha256="19piyqgdxpi777nd4860d6mp0g4zzcf3wf7q7ilm99jqav9lfrn8"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; };
+mzR = derive { name="mzR"; version="2.3.2"; sha256="0hl3g2fn90lpka5r96cfzcw3msw8wnvq6d52p5axhb1214v5zpr6"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; };
 ncdfFlow = derive { name="ncdfFlow"; version="2.15.3"; sha256="0xhqis5pj5m4ib4xpkgg1afxzjc1827jw5k569aijr11qmi6jjxw"; depends=[BH Biobase flowCore flowViz Rcpp RcppArmadillo zlibbioc]; };
 neaGUI = derive { name="neaGUI"; version="1.7.0"; sha256="198b0vrr5qp66z4sccwy6rh8sjxpw3qjkdryygg1baxq91ra76p1"; depends=[hwriter]; };
 nem = derive { name="nem"; version="2.43.0"; sha256="1d357gh8binh0fwg1z0mzjzq3nyhazg9dnnf7aqk6gjfgsjda9i8"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; };
@@ -883,7 +885,7 @@ oneChannelGUI = derive { name="oneChannelGUI"; version="1.35.0"; sha256="1diclgl
 ontoCAT = derive { name="ontoCAT"; version="1.21.0"; sha256="10d0a0fxg2h9gf6d1jbilxxg8irbqb1k526689qkdn2zh0qjvv04"; depends=[rJava]; };
 openCyto = derive { name="openCyto"; version="1.7.4"; sha256="1q07s7rv19yahlpjpvsrhbvld6n2bf7jv7lfrgs6syfl3fwrs008"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
 oposSOM = derive { name="oposSOM"; version="1.5.4"; sha256="0f06wmy1n9gl41x4x7q1fcfxaw6y6qkrmb4ypg9j6v7xjhjpfj03"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; };
-pRoloc = derive { name="pRoloc"; version="1.9.5"; sha256="0fsgz5fl29s2lkgm1dqcymw5gjc1lp4mdafqx9fa5l1rhlg81hyr"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class e1071 FNN ggplot2 gtools kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; };
+pRoloc = derive { name="pRoloc"; version="1.9.6"; sha256="01gk4xnij5l4sk0c4km94i5b26vjfm8qhh3irb7xwfijank7mxd9"; depends=[Biobase BiocGenerics BiocParallel biomaRt caret class e1071 FNN ggplot2 gtools kernlab knitr lattice MASS mclust MLInterfaces MSnbase mvtnorm nnet plyr proxy randomForest RColorBrewer Rcpp RcppArmadillo sampling scales]; };
 pRolocGUI = derive { name="pRolocGUI"; version="1.3.2"; sha256="08q1cavlxryx9isn2wsw8r0bv795hgzkyfx95ycxxdwh6vdvnnyl"; depends=[DT MSnbase pRoloc scales shiny]; };
 paircompviz = derive { name="paircompviz"; version="1.7.0"; sha256="0sf80ji20q6kaqw2747an9b51xxwhl55yj5y7q6j68gif1ndkzl4"; depends=[Rgraphviz]; };
 pandaR = derive { name="pandaR"; version="1.1.1"; sha256="0rp8qk5cn5zj0nypkhmxjpja6lkjxd3hw2dkl4gaisayhiqlfk3g"; depends=[igraph matrixStats]; };
@@ -941,7 +943,7 @@ qusage = derive { name="qusage"; version="1.9.0"; sha256="1dg8qchhqfvak5cqjs9v30
 qvalue = derive { name="qvalue"; version="2.1.0"; sha256="0qgsqjb90qnf5a77n3zf5dcb5agdbj4hlk3swh1hrjg9iqcs76g0"; depends=[ggplot2 reshape2]; };
 r3Cseq = derive { name="r3Cseq"; version="1.15.0"; sha256="0pi5aq3dbivk23x6axwbqa4danbsvn623icw6xvlh3i71v8m5rkw"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; };
 rBiopaxParser = derive { name="rBiopaxParser"; version="2.7.0"; sha256="1ni8kaivdxqxv8fj2qf5vnwzmmamfd073l1p4072pnfxpn7rn0p4"; depends=[data_table XML]; };
-rCGH = derive { name="rCGH"; version="0.99.6"; sha256="1iqw7za7sy8z9flh537xdxx7gcvq6l3nsbszg68c9ja5lmlm2pmj"; depends=[aCGH affy AnnotationDbi BiocGenerics DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 lattice limma mclust plyr RUnit shiny]; };
+rCGH = derive { name="rCGH"; version="0.99.7"; sha256="1bn8rwln7zh686hz87zz3ymv5lylk64xfmwjj357q7kx5r75n2hz"; depends=[aCGH affy AnnotationDbi BiocGenerics DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 lattice limma mclust plyr RUnit shiny]; };
 rGADEM = derive { name="rGADEM"; version="2.17.0"; sha256="1xwypnpf7sdaqszfmallgg2314g866xbi9q342yhds2fkiw9sp65"; depends=[Biostrings BSgenome IRanges seqLogo]; };
 rGREAT = derive { name="rGREAT"; version="1.1.2"; sha256="0wwwpbxp8263jgkja6szcwqvijig8cfxdb66hvjqq69h9lqg9bkx"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; };
 rHVDM = derive { name="rHVDM"; version="1.35.0"; sha256="0y2vm6xsdsz174xrs22p54z5f5rxqcx937yf02ilv0bnfa0r06hj"; depends=[affy Biobase minpack_lm R2HTML]; };
@@ -964,14 +966,14 @@ rgsepd = derive { name="rgsepd"; version="1.1.0"; sha256="1rvzlzh43j3sj2vrhmg13h
 rhdf5 = derive { name="rhdf5"; version="2.13.5"; sha256="1k2hjzzj2irs7jap7g4ys0gd3iymnnbbyvyv986y9pq68p4f1nr0"; depends=[zlibbioc]; };
 riboSeqR = derive { name="riboSeqR"; version="1.3.0"; sha256="0jlh5q1hkxkfvy496hlbwfkl17k36n304yiyz9f0azq5kv7jz1y2"; depends=[abind GenomicRanges]; };
 rnaSeqMap = derive { name="rnaSeqMap"; version="2.27.0"; sha256="1638vikgizcgg4bpfm61ak98smwy74dk5hyx73qjbisd49zvy5nk"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; };
-rnaseqcomp = derive { name="rnaseqcomp"; version="0.99.3"; sha256="0gyz91ayyr1834hr6jg1bnjiiiw4k75j3kn5pfmw9q8v9vg2fcsj"; depends=[RColorBrewer]; };
+rnaseqcomp = derive { name="rnaseqcomp"; version="0.99.4"; sha256="0m3xz7fnry89i7b4f51x90mwiqlv2z4d3p2r41mdm4xvwmqj4ghf"; depends=[RColorBrewer]; };
 roar = derive { name="roar"; version="1.5.2"; sha256="0g0ylr49dvnbyb1kwj20hrh3y3x49n4rbdvg7mpdg1byrygcli3c"; depends=[GenomicAlignments GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
 rols = derive { name="rols"; version="1.11.6"; sha256="0wgzvwfq677dkqzzcq071xbh6v47vkcrzw66ch1vg348pcj58z0f"; depends=[Biobase XML]; };
 ropls = derive { name="ropls"; version="1.1.2"; sha256="06z0ay0rdaawyvpy7dbdpxkwa8311rlb9plk4v52v830zibamhvs"; depends=[]; };
 rpx = derive { name="rpx"; version="1.5.1"; sha256="048qldpx4zsp55jkr8g8vljiyidm9kzv4p1vwh1983y38qbz882v"; depends=[RCurl XML]; };
 rqubic = derive { name="rqubic"; version="1.15.0"; sha256="19n613m7x48wkrfrhnd0ab9018m5dd7rf08qjbgphakwycssfgcw"; depends=[biclust Biobase BiocGenerics]; };
 rsbml = derive { name="rsbml"; version="2.27.0"; sha256="10qmv5gpgqffnr5wqh7zik0l2d1cg0c0m3xak4r4bqmsd1y4dw01"; depends=[BiocGenerics graph]; };
-rtracklayer = derive { name="rtracklayer"; version="1.29.12"; sha256="0gz3284d5cy3n0hr5w7x86lraryfi2jdg1yzj2jg6cq0hgga40c1"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
+rtracklayer = derive { name="rtracklayer"; version="1.29.13"; sha256="04f7fxl5k7yl4jr4la57k1z613m39zvrmrf8n5pmdy0j25lxk2z6"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
 sRAP = derive { name="sRAP"; version="1.9.0"; sha256="0rvnq41gns4ccr6gnfw0xbbi2c2wjl14qh0yr7wj7s4yrxzqr866"; depends=[gplots pls qvalue ROCR WriteXLS]; };
 sSeq = derive { name="sSeq"; version="1.7.0"; sha256="0wcw77cz47wklwsrwwimwryqmyc0lrd9mk2aawk0vx1zkqci1yca"; depends=[caTools RColorBrewer]; };
 safe = derive { name="safe"; version="3.9.0"; sha256="0x1gdzpgrm4m2m64h6y5rayp64j6ckxlr081d3w46zvfb935294a"; depends=[AnnotationDbi Biobase SparseM]; };
@@ -979,7 +981,7 @@ sagenhaft = derive { name="sagenhaft"; version="1.39.1"; sha256="15aimbx6wn4il0j
 sangerseqR = derive { name="sangerseqR"; version="1.5.0"; sha256="0wiqaqzn6n63k1389nqj35k5wn93bq7c99gayblwjrhks0y9fll0"; depends=[Biostrings shiny]; };
 sapFinder = derive { name="sapFinder"; version="1.7.0"; sha256="1xg3scw5ijm1z2l4ha4ik52s97vr10plr9ifs9rdk2l6vh8na6kh"; depends=[pheatmap Rcpp rTANDEM]; };
 saps = derive { name="saps"; version="2.1.0"; sha256="0r6525n8ksxaa5dcvs9419bca1v369251psvwphfsdnfa4xg2n14"; depends=[piano reshape2 survcomp survival]; };
-savR = derive { name="savR"; version="1.7.4"; sha256="1v0rzrh27yl0fx5gcwb04yq2vln3ngisg59614qmmdppc36qf5k6"; depends=[ggplot2 gridExtra reshape2 scales XML]; };
+savR = derive { name="savR"; version="1.7.5"; sha256="0pdkf8rkqd3fl1p8h1adfixmi0fgj1hwfbn2qn5y326w6aq6cqrs"; depends=[ggplot2 gridExtra reshape2 scales XML]; };
 scsR = derive { name="scsR"; version="1.5.0"; sha256="1n9clp1ldspxbrv4chihv1xhw2fmys13p884cmn037xhwv5b7j3r"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; };
 segmentSeq = derive { name="segmentSeq"; version="2.3.1"; sha256="005b9a7rhhhcpkac8xyvl9lbzgwjbfpqr49wyn0i9j99v9zw1lfv"; depends=[baySeq GenomicRanges IRanges S4Vectors ShortRead]; };
 seq2pathway = derive { name="seq2pathway"; version="1.1.2"; sha256="1ghanxmfs99h8w2fxn6im3ml7brhhx131k7djbvsm695lvxgqm7a"; depends=[biomaRt GenomicRanges GSA nnet WGCNA]; };
@@ -1025,7 +1027,7 @@ survcomp = derive { name="survcomp"; version="1.19.1"; sha256="0nl3i8pbjyvpbn7d9
 sva = derive { name="sva"; version="3.15.0"; sha256="0bskn3famgz24kjaz4lrrm94vw07g5d2103h9gh5qzhajdsc2d03"; depends=[genefilter mgcv]; };
 switchBox = derive { name="switchBox"; version="1.3.0"; sha256="0bnb1wqxl3rv8w5rm0jw3x22yy8q27j11hpqnd792fvsz8ssr5h1"; depends=[]; };
 synapter = derive { name="synapter"; version="1.11.0"; sha256="05gv788mx1bzizr07cg5cw98i4xm3qdh8hpys4xvr06as7q65h2g"; depends=[Biobase BiocParallel Biostrings cleaver hwriter knitr lattice MSnbase multtest qvalue RColorBrewer]; };
-systemPipeR = derive { name="systemPipeR"; version="1.3.16"; sha256="1b6c0glgnjhxg454s7cx9fhlyxa0l8pd5g6mpmdhf0hi9sk48qdl"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicRanges ggplot2 GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
+systemPipeR = derive { name="systemPipeR"; version="1.3.20"; sha256="164xjy8vsjr1ri196xhklisiqjj3frcm3nbpvixc6kd4zjgn0r0q"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicRanges ggplot2 GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
 tRanslatome = derive { name="tRanslatome"; version="1.7.0"; sha256="1pcr1ghwkmkpsbkqh85yninvgb2za2vdsnax5bjkdj60wfj0d5bc"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma plotrix RankProd samr sigPathway topGO]; };
 ternarynet = derive { name="ternarynet"; version="1.13.0"; sha256="13pnzzlfzgkvqn323xhjvbaqzrk2fjq440ff9hjf09a53g14q7li"; depends=[igraph]; };
 tigre = derive { name="tigre"; version="1.23.0"; sha256="177phidn72rcghb4mqfcr2wbfx5pz2vdw6jh7ahnki7s5q6fkldl"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; };
@@ -1044,6 +1046,7 @@ tspair = derive { name="tspair"; version="1.27.0"; sha256="0kx2iw2g0nji25qds5z6q
 tweeDEseq = derive { name="tweeDEseq"; version="1.15.0"; sha256="17mmkz0qpww2qwzk1vd5945wqpr59v091rlvn1s2013h248173vm"; depends=[cqn edgeR limma MASS]; };
 twilight = derive { name="twilight"; version="1.45.0"; sha256="0dzgapk34jzxhdadraq072fcj6rwqhkx2795rbn0dkk4vazqz4sn"; depends=[Biobase]; };
 unifiedWMWqPCR = derive { name="unifiedWMWqPCR"; version="1.5.0"; sha256="055yvgwqjh91cf8d2hsacnbzq2z9c911cy3qd206azqlr6qyjiip"; depends=[BiocGenerics HTqPCR]; };
+variancePartition = derive { name="variancePartition"; version="0.99.4"; sha256="1xy99saci2cihx95dy7yn92b09fan317iiacnyabsrd6z8l7ypp4"; depends=[Biobase dendextend doParallel foreach ggplot2 iterators limma lme4 reshape]; };
 vbmp = derive { name="vbmp"; version="1.37.0"; sha256="1i4akvqrwj1r0ahi4vjxl7q780sa5bryj3rd2c5wg0ifd5l95h6s"; depends=[]; };
 viper = derive { name="viper"; version="1.5.2"; sha256="0zcb03c469nz5ka85m54n8if1188hprh4qgdwap5zc7xgyc0lhya"; depends=[Biobase e1071 KernSmooth mixtools]; };
 vsn = derive { name="vsn"; version="3.37.3"; sha256="09mzv7l5j20sx14m63q9ycpacrh2zayywiyckglfgndpc8v9wp08"; depends=[affy Biobase ggplot2 hexbin lattice limma]; };
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index badf6b17a06..169ef5899d4 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -26,7 +26,7 @@ AID = derive { name="AID"; version="1.5"; sha256="0fpgq2ahl0mdj0sb0p39z2ksslsiwm
 AIM = derive { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; };
 ALDqr = derive { name="ALDqr"; version="0.5"; sha256="0294d6cjfl5m63jhrv4rbh7npwrbmmw5101jz5bbwihhj94qcxp9"; depends=[HyperbolicDist]; };
 ALKr = derive { name="ALKr"; version="0.5.3.1"; sha256="09df3vx2q0sn8fwz2cc9lckzwrf2hgbglzyn376d6nkrm6gq792a"; depends=[MASS Rcpp]; };
-ALS = derive { name="ALS"; version="0.0.5"; sha256="1ryviknpf7c0v20bmc40khhmx51b83hbh9q9iwz9d694by51xryc"; depends=[Iso nnls]; };
+ALS = derive { name="ALS"; version="0.0.6"; sha256="1swrn39vy50fazkpf97r7c542gkj6mlvy8gmcxllg7mf2mqx546a"; depends=[Iso nnls]; };
 ALSCPC = derive { name="ALSCPC"; version="1.0"; sha256="0ippxzq5qwb9dnpvm1kxhc0fxh83rs9ny5rcvd30w2bp632q9qdx"; depends=[]; };
 ALTopt = derive { name="ALTopt"; version="0.1.0"; sha256="0vdn535x199m95gs715i42p0cf9zlj74s7xgxly7aknr0l2ypl2c"; depends=[cubature lattice]; };
 AMAP_Seq = derive { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; };
@@ -136,7 +136,7 @@ BNPdensity = derive { name="BNPdensity"; version="2015.5"; sha256="0jgdc9dayc57y
 BNSP = derive { name="BNSP"; version="1.0.5"; sha256="0iyrmrpnx32akcfvd43jh74457l56n5n4pnlyqi9v3cjp4n95fds"; depends=[]; };
 BOG = derive { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
 BOIN = derive { name="BOIN"; version="1.2"; sha256="1vd1w3cd1l1hk63hdrn6c1hrpqwy6nkkxni1d37yj2iz7gz6wbsg"; depends=[]; };
-BRugs = derive { name="BRugs"; version="0.8-4"; sha256="0bd5m4nfj25bhjy0d96kna50h5a5a2mdxrl21c1kvxmiwxcx4wrs"; depends=[coda]; };
+BRugs = derive { name="BRugs"; version="0.8-5"; sha256="13941d3x3l9jr4xdn7xyp3yixnlzmi5xmh42isni0fc1ji86p0jm"; depends=[coda]; };
 BSDA = derive { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; };
 BSGS = derive { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; };
 BSGW = derive { name="BSGW"; version="0.9"; sha256="0df5d0d0kfvwavxbxra36jjs9044q1szq1xm37dvh4wfvvv6igmb"; depends=[survival]; };
@@ -184,13 +184,14 @@ BcDiag = derive { name="BcDiag"; version="1.0.8"; sha256="1x9rkr96dgxp88z9qaw72i
 Bchron = derive { name="Bchron"; version="4.1.1"; sha256="0dnfz7xpmbygyarh9ai9x3xfsqiizi0zhnxm8bmkvqyb8h7zpghb"; depends=[coda ellipse hdrcde inline MASS mclust]; };
 Bclim = derive { name="Bclim"; version="2.3.1"; sha256="160c9v83bpik73yjj45lr8sdgl8v4ymlkqw424ncc3lficyhvfjg"; depends=[hdrcde MASS mclust statmod]; };
 Benchmarking = derive { name="Benchmarking"; version="0.26"; sha256="00w7a16lhra6rjylyj26q67mvgbc3wa27a2wmiwjz5yh7wdnh193"; depends=[lpSolveAPI ucminf]; };
-BenfordTests = derive { name="BenfordTests"; version="1.1.1"; sha256="12xzc4gq4h7p18ypbkybrzjj2qh71rgd7nzznij36yv7n6h21mlw"; depends=[]; };
+BenfordTests = derive { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; };
 Bergm = derive { name="Bergm"; version="3.0.1"; sha256="1ngxqpagf8snnwdm82bg8yxbf1zpzd99g32fhw9l4gjx77kpkhl2"; depends=[coda ergm mvtnorm network]; };
 BerlinData = derive { name="BerlinData"; version="1.0.1"; sha256="1shhx4pisi139sc0siawa7gp9psfgxm58qijg5m65nihv7spki75"; depends=[rjson stringr XML]; };
 Bessel = derive { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; };
 Bhat = derive { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
 BiDimRegression = derive { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; };
 BiSEp = derive { name="BiSEp"; version="2.0.1"; sha256="15sn9kxs0mb98kclfpif90c808a1365gdj2j332sxi07f64pb87q"; depends=[AnnotationDbi GOSemSim mclust]; };
+BiTrinA = derive { name="BiTrinA"; version="1.0"; sha256="04q3dkv5h8nrizgbw6qawwzh7v9jl0ykdxqxbp1z8cmv1r4n7z37"; depends=[diptest]; };
 BiasedUrn = derive { name="BiasedUrn"; version="1.06.1"; sha256="1ra9fmymm97a2b8jsrsi98cjnnxc478zq51lx7a5pgafprcwcgkg"; depends=[]; };
 BigTSP = derive { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; };
 BinNonNor = derive { name="BinNonNor"; version="1.2"; sha256="15bzpi2q2428661v8z9izp942ihffgq8dgh4fsnzllvdrpqcyc41"; depends=[BB corpcor Matrix mvtnorm]; };
@@ -249,7 +250,7 @@ CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27h
 CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
 CDM = derive { name="CDM"; version="4.4-1"; sha256="0m75h7q60bzn66hrv9w2s21w7yp1qphylrfv8323srnj2q4yqi93"; depends=[lattice MASS mvtnorm plyr polycor psych Rcpp RcppArmadillo sfsmisc]; };
 CDNmoney = derive { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; };
-CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[igraph MASS mvtnorm]; };
+CDVine = derive { name="CDVine"; version="1.3"; sha256="0z3n9zplrmqhclq6skfg13h7mqdifphlaa8bc67q4n9ff4x697rm"; depends=[igraph MASS mvtnorm]; };
 CEC = derive { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; };
 CEGO = derive { name="CEGO"; version="1.0.1108"; sha256="0klj9g656rnfqhj36r4v8y6mv4cazlzyrvws6yqa0r61abfbxy68"; depends=[DEoptim MASS]; };
 CEoptim = derive { name="CEoptim"; version="1.0"; sha256="1mrv2vhrwd7hvw67ys08nilbn3f1fp3bsvlbc8ggwyl3lw957fi9"; depends=[MASS msm]; };
@@ -300,7 +301,7 @@ CVThresh = derive { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3c
 CVTuningCov = derive { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; };
 CVcalibration = derive { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; };
 CaDENCE = derive { name="CaDENCE"; version="1.2.3"; sha256="1810a785czaxwfvhjnmhzqg743mgcgrdp3j1irlfl9pbli0ppidx"; depends=[pso]; };
-Cairo = derive { name="Cairo"; version="1.5-7"; sha256="0wr03kwmj2b9hamznd3jywv3x06i5phhdfl0iydh41yc9j9xvdfk"; depends=[]; };
+Cairo = derive { name="Cairo"; version="1.5-8"; sha256="1paqyb95jikbwyp1x3c8fxwla1ihp003vn53l3z9mqywxyamvjdw"; depends=[]; };
 CarletonStats = derive { name="CarletonStats"; version="1.1"; sha256="18pd1hi8bnbv0sdixw746xvdg9szvng422yj12mk0k50v60403xg"; depends=[]; };
 CatDyn = derive { name="CatDyn"; version="1.1-0"; sha256="0bdixcf1iwbmjd2axi6csrzms25ghdj4r6223qhk2b54wlmbzaiz"; depends=[BB optimx]; };
 CateSelection = derive { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; };
@@ -363,7 +364,7 @@ Conake = derive { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwj
 CondReg = derive { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; };
 ConjointChecks = derive { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
 ConnMatTools = derive { name="ConnMatTools"; version="0.1.5"; sha256="02cv2rlfp9shwqc9nwb8278akmwv7yvviwl23jglzsyh721dpqkr"; depends=[]; };
-ConsRank = derive { name="ConsRank"; version="0.0"; sha256="00lk128livwfbkgykgz5g3ap592m70xgi5pni0vsnm1xqhh93rrf"; depends=[gtools MASS proxy rgl]; };
+ConsRank = derive { name="ConsRank"; version="0.0.1"; sha256="04hqqc1d29yxfb53ccy1gr5qaw3jpm92zp0zvm5ps3jqw170kvxx"; depends=[gtools MASS proxy rgl]; };
 ConvCalendar = derive { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
 ConvergenceConcepts = derive { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[lattice tkrplot]; };
 Copula_Markov = derive { name="Copula.Markov"; version="1.0"; sha256="028rmpihyz9xr4r305lbcbb0y22jw1szmhw5iznv5zma507grbl3"; depends=[]; };
@@ -385,12 +386,12 @@ CpGFilter = derive { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5
 CpGassoc = derive { name="CpGassoc"; version="2.50"; sha256="052mzkcp7510dm12winmwpxz6dvy54aziff0mn3nzy0xbk5v1fw4"; depends=[nlme]; };
 Cprob = derive { name="Cprob"; version="1.2.4"; sha256="0zird0l0kx2amrp4qjvlagw55pk9jrx0536gq7bvajj8avyvyykr"; depends=[geepack lattice lgtdl prodlim tpr]; };
 CreditMetrics = derive { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; };
-Crossover = derive { name="Crossover"; version="0.1-14"; sha256="0d35am446z1pj7iz2zk1fvmp3xn5nhz3pgj7rwhmj77ad8vy8p8b"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; };
+Crossover = derive { name="Crossover"; version="0.1-15"; sha256="1g9z4ssqyb3silaprcsjsdd1bk5rsih2hvqr6rm1qb8ayqjr1sp3"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; };
 CryptRndTest = derive { name="CryptRndTest"; version="1.0.5"; sha256="0ypqwzn9r9x7l4wzz6vqnirmjx7zrbx0jck4wpy83w1jvx02qcqv"; depends=[copula kSamples LambertW MissMech sfsmisc tseries]; };
 CrypticIBDcheck = derive { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[car chopsticks ellipse rJPSGCS]; };
 Cubist = derive { name="Cubist"; version="0.0.18"; sha256="176k9l7vrxamahvw346aysj19j7il9a2v6ka6dzmk0qq7hf3w9ka"; depends=[lattice reshape2]; };
 D2C = derive { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[corpcor foreach gRbase lazy MASS randomForest RBGL Rgraphviz]; };
-D3M = derive { name="D3M"; version="0.31"; sha256="1q5syjip82xbb7vxja8byc8ykln2yy2riz019n3wva8lghy0rvii"; depends=[beanplot Rcpp]; };
+D3M = derive { name="D3M"; version="0.41"; sha256="12yny4a6rggaz5zfjpacsmxcj805nbkw19n26m9vr58a7zg1iwa1"; depends=[beanplot Rcpp]; };
 DAAG = derive { name="DAAG"; version="1.20"; sha256="05jlsrs0frk9ky20h17c5vj9d4j28c9n0a1jww5lssacimn1d4x5"; depends=[lattice latticeExtra]; };
 DAAGbio = derive { name="DAAGbio"; version="0.62"; sha256="18m4vq8vv0yi79na62nrm0cy1nlk7bg0xbddzxv5gpkmzi1i6m9s"; depends=[limma]; };
 DAAGxtras = derive { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; };
@@ -444,7 +445,7 @@ DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2
 DTK = derive { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; };
 DTMCPack = derive { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; };
 DTR = derive { name="DTR"; version="1.6"; sha256="186qgrx9alzmj1vdy2yvfqs5xgidmwddm0zgg041s5q992cih36g"; depends=[aod ggplot2 gridExtra proto survival]; };
-DVHmetrics = derive { name="DVHmetrics"; version="0.3"; sha256="1ndrzd5q12kabpk3yj95s24kn7ri61w1h4aa50zw9qb12f5dzc98"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; };
+DVHmetrics = derive { name="DVHmetrics"; version="0.3.1"; sha256="1njvxjbfdal73b5z4wdmdw76h1f8d5i037b4yga79bc6h4b3xfk5"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; };
 DYM = derive { name="DYM"; version="0.1.1"; sha256="0k6iqn1397by9pg31m3ypbnn85zv192ghsn4gpnsfhqfcp18q4d4"; depends=[]; };
 Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; };
 DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; };
@@ -486,7 +487,7 @@ DiscreteInverseWeibull = derive { name="DiscreteInverseWeibull"; version="1.0.1"
 DiscreteLaplace = derive { name="DiscreteLaplace"; version="1.1"; sha256="1pcq4kggy1z88a0car53d0f69rx2qg7q104cr0bxi6yllrb3q0nr"; depends=[Rsolnp]; };
 DiscreteWeibull = derive { name="DiscreteWeibull"; version="1.0.1"; sha256="09v34lwaahx0d30zxb4b3r84ryllz1fsmbp5wfr341b5flp20wvg"; depends=[Rsolnp]; };
 DiscriMiner = derive { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; };
-Distance = derive { name="Distance"; version="0.9.3"; sha256="054z9pi8m8gjpax3s2hajvaik4yvfpy8qc4gmpl9bqncrk594pbv"; depends=[mrds]; };
+Distance = derive { name="Distance"; version="0.9.4"; sha256="18iip9xny2vazpah96qziqwql4hnxg2m8hyjhh8b34w29jv0nsm5"; depends=[mrds]; };
 DistatisR = derive { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[car prettyGraphs]; };
 DistributionUtils = derive { name="DistributionUtils"; version="0.5-1"; sha256="0gw531wfrjx1sxh17qh48dwbxnibgr0viga07vsp8nay7l02jap9"; depends=[RUnit]; };
 DivE = derive { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; };
@@ -512,6 +513,7 @@ EBglmnet = derive { name="EBglmnet"; version="3.6"; sha256="0qjwk5y9bghidha4i937
 EDFIR = derive { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; };
 EDISON = derive { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr2mhwynj4ixj3ma7crhqidgal169p"; depends=[corpcor MASS]; };
 EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; };
+EEM = derive { name="EEM"; version="1.0.1"; sha256="05kmys1qq2v7zj4akpbs81ss74q1zp2v7n8m5mmgj4frivzgqbzn"; depends=[colorRamps R_utils readxl reshape2 sp]; };
 EFDR = derive { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; };
 EGRET = derive { name="EGRET"; version="2.3.0"; sha256="07b2wxdciybvm3l579vibdprcxvzl2ym25xba7wlxmrbx37ndx5z"; depends=[dataRetrieval fields lubridate survival]; };
 EIAdata = derive { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[plyr XML xts zoo]; };
@@ -536,6 +538,7 @@ EMbC = derive { name="EMbC"; version="1.9.3"; sha256="189kgp6qv9dl4q1sirm3v9zqk1
 ENMeval = derive { name="ENMeval"; version="0.1.1"; sha256="0g1h8dklv6rv73wwpx3vhbpnwply5lpq8x9jvl7r018x9gcvvb9m"; depends=[dismo raster rJava]; };
 ENiRG = derive { name="ENiRG"; version="0.1"; sha256="1cnl1mjl5y1rc6fv7c9jw2lkm898l3flfrj3idx9v1brjzyx5xlf"; depends=[ade4 fgui gdata miniGUI R_utils raster sp spgrass6]; };
 ENmisc = derive { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; };
+EPGLM = derive { name="EPGLM"; version="1.0"; sha256="0cijk21dl7hkd0m8dzj2nx5yzm3q1l764fyv82dr3k31c7vq7xh1"; depends=[BH MASS Rcpp RcppArmadillo]; };
 EQL = derive { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[lattice ttutils]; };
 ERP = derive { name="ERP"; version="1.0.1"; sha256="0wy1p7pp9dvc3krylskb627rmfqaj11qvia97m88x05ydqx1fwmr"; depends=[fdrtool mnormt]; };
 ES = derive { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; };
@@ -553,7 +556,7 @@ EasyMARK = derive { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs1
 EasyStrata = derive { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8ijwxmjkcqjvc1ng0jsadkqpfz71a963nkqdcl"; depends=[Cairo plotrix]; };
 EbayesThresh = derive { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; };
 Ecdat = derive { name="Ecdat"; version="0.2-7"; sha256="1z9mxx3mvn3vi5drxlzss7gs7vpzg7shinl529bx4jpxqpci90jy"; depends=[Ecfun]; };
-Ecfun = derive { name="Ecfun"; version="0.1-4"; sha256="0h3351pcahrn578lz1pcb7h3chmh0vmwbn9iqll98vibck847gai"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; };
+Ecfun = derive { name="Ecfun"; version="0.1-6"; sha256="1mz2smbxyjzc6vf3vhycgvjwqq6hr22vxikrl0hx185qxgwbgrxn"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; };
 EcoGenetics = derive { name="EcoGenetics"; version="1.2.0-2"; sha256="1c2pz2a8f57fhq0sk4jgfi4v8jwznsjaqx4jnziz3lak7gmcrwql"; depends=[ggplot2 party raster reshape2 rgdal rkt SoDA sp]; };
 EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; };
 EcoSimR = derive { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
@@ -624,7 +627,7 @@ FField = derive { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dw
 FGN = derive { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; };
 FGSG = derive { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; };
 FGalgorithm = derive { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; };
-FHtest = derive { name="FHtest"; version="1.2"; sha256="033p90zzlgx2galzp2iwwpg29hhhgscqmqkwpr69y2ck3nj3hz0v"; depends=[interval KMsurv MASS perm survival]; };
+FHtest = derive { name="FHtest"; version="1.3"; sha256="1cay1cl1x4lias55vxc14caznggdw6j8vgqgkxfmvldnvjfljsq1"; depends=[interval KMsurv MASS perm survival]; };
 FI = derive { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; };
 FITSio = derive { name="FITSio"; version="2.0-0"; sha256="1gf3i1q9g81gydag2gj1wsy6wi5jj2v4j3lyrnh1n2g4kxd6s3cp"; depends=[]; };
 FKF = derive { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; };
@@ -648,7 +651,7 @@ FTICRMS = derive { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55s
 FWDselect = derive { name="FWDselect"; version="2.0"; sha256="12hhb2vysg3c9fzh56xy3kwhwbgcn1yx4afhlpydnavp3aclrqrg"; depends=[cvTools mgcv]; };
 FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; };
 FactMixtAnalysis = derive { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
-FactoClass = derive { name="FactoClass"; version="1.1.1"; sha256="0m5108g2nhdwqqmkn04l1x0kx32ikkhcz6gki0hpj9hlzrkya5w6"; depends=[ade4 xtable]; };
+FactoClass = derive { name="FactoClass"; version="1.1.2"; sha256="0wg8n2vn586dj5g6js6c7rshsjibciyvg2j53mxgnn0f63xdb3ip"; depends=[ade4 xtable]; };
 FactoMineR = derive { name="FactoMineR"; version="1.31.3"; sha256="164pxgy9sn7irk4l31nfpmdmrw9qscwzdmvzr9nc9m36nhmajvkr"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; };
 Factoshiny = derive { name="Factoshiny"; version="1.0.2"; sha256="0wwsv0frn2d6a5l5lr9qzqglznaigc23bq7nhcbfy1wlvsmimnr3"; depends=[FactoMineR shiny]; };
 Fahrmeir = derive { name="Fahrmeir"; version="2015.6.25"; sha256="1ca4m3m4jip7n489yywdfvh6nlhxspg5awxi23spgfnvhrcs9k3y"; depends=[]; };
@@ -739,7 +742,7 @@ GISTools = derive { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9c
 GLDEX = derive { name="GLDEX"; version="2.0.0.3"; sha256="0ymarfwpm7gagq6wk40n0nsmd14r19pbqbrgigk6cvb8dc2zpbfz"; depends=[cluster]; };
 GLDreg = derive { name="GLDreg"; version="1.0.3"; sha256="0d7cclmmhgaf95bw738d8hz166qsr9df33g73ihy8pla3sg5lr7q"; depends=[GLDEX]; };
 GLSME = derive { name="GLSME"; version="1.0.3"; sha256="0flja5gk25k4z9hwskvdw4c1f88scc47xvc1l3d2447fkfrb0bwc"; depends=[corpcor mvtnorm]; };
-GMCM = derive { name="GMCM"; version="1.2.1"; sha256="1s45xmbx64h3sb10py8n444jpxcgsz4pc36cz3zinfq55amf8r6r"; depends=[Rcpp RcppArmadillo]; };
+GMCM = derive { name="GMCM"; version="1.2.2"; sha256="1zvhbxz1bli460c9nh2p3vx7v3a5w2jwyyyd7r8dqgxpf3xr1pzw"; depends=[Rcpp RcppArmadillo]; };
 GMD = derive { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; };
 GMDH = derive { name="GMDH"; version="1.1"; sha256="053x0flh1jk61ak84d7y1r22fn1s52pj5xqwlbvkc70jmfmvs141"; depends=[MASS]; };
 GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; };
@@ -790,7 +793,7 @@ GenWin = derive { name="GenWin"; version="0.1"; sha256="0jm537i4jn3azdpvd50y9p0f
 GeneCycle = derive { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[fdrtool longitudinal MASS]; };
 GeneF = derive { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; };
 GeneFeST = derive { name="GeneFeST"; version="1.0.1"; sha256="0qgzjzhwf3nigfi09maywg9zkjxiicwiwiyqfcdk9gsvmp6mr4qn"; depends=[BASIX]; };
-GeneNet = derive { name="GeneNet"; version="1.2.12"; sha256="0z94ws95nvk7jx5fnrwb81925y14fash1g5pd1mmkkj8njq9kk4l"; depends=[corpcor fdrtool igraph longitudinal]; };
+GeneNet = derive { name="GeneNet"; version="1.2.13"; sha256="0w52apk0nnr8nsskf26ff7ana8xiksr8wqmkjxzwhzgg7fncm61p"; depends=[corpcor fdrtool longitudinal]; };
 GeneReg = derive { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; };
 Geneland = derive { name="Geneland"; version="4.0.5"; sha256="1v2m8v4sy95rajjw8m9bg4yal5ay7x1k5kqjxrivm45ad546ykwh"; depends=[fields RandomFields]; };
 GeneralizedHyperbolic = derive { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="0rx07z5npawvsah2lhhkryzpj19sg0sl0w410gmff985ksdn285m"; depends=[DistributionUtils RUnit]; };
@@ -810,7 +813,7 @@ GlobalDeviance = derive { name="GlobalDeviance"; version="0.4"; sha256="0s318arq
 GlobalFit = derive { name="GlobalFit"; version="1.0"; sha256="0cx4jpr5yhjdqbvnswqjwx7542mnmk73dy99klwg8bsz0c36ii5k"; depends=[sybil]; };
 GlobalOptions = derive { name="GlobalOptions"; version="0.0.7"; sha256="1vg948xh0ndwkspbf5qb00b28fy9ygda55m5fq8bspq9d2y3c0pc"; depends=[]; };
 Gmisc = derive { name="Gmisc"; version="1.1"; sha256="1dcnnsjxap50zfx984rxgksjcvqgbb9zxxd03186h4669slh1d0d"; depends=[abind forestplot Hmisc htmlTable knitr lattice magrittr Rcpp]; };
-GoFKernel = derive { name="GoFKernel"; version="2.0-5"; sha256="030gcj608nkalscjqs2ad73pwhk4gp5gl1lvm4mc9b39jhki0r70"; depends=[KernSmooth]; };
+GoFKernel = derive { name="GoFKernel"; version="2.0-6"; sha256="11x9xvgrb7si2y6s2cgxgk01j0laizjqddbqmmj37ylmnh0539mw"; depends=[KernSmooth]; };
 GrammR = derive { name="GrammR"; version="1.0.1"; sha256="1dhq4srzxbdbym89dy4gh0c4jjfkljxdnriv4v0yh9g688my1gvn"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; };
 GraphPCA = derive { name="GraphPCA"; version="1.0"; sha256="17ipcp7nh47lfs9jy1aybpz4r172zj5yyrdrgmd6wa7hax8yv8gg"; depends=[FactoMineR ggplot2 scales scatterplot3d]; };
 GrapheR = derive { name="GrapheR"; version="1.9-84"; sha256="1wwks2a4vzhj1rcspizp1vadl6kvrqr8s4zd6pghj02nd266znk9"; depends=[]; };
@@ -849,7 +852,7 @@ HMR = derive { name="HMR"; version="0.4.1"; sha256="1acaph5q6vgi4c7liv7xsc3crhp2
 HPbayes = derive { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; };
 HSAUR = derive { name="HSAUR"; version="1.3-7"; sha256="16qmsyin8b7x9q3xdx74kw6db6zjinhxprp6pfnl6ddwxhz3jzzf"; depends=[]; };
 HSAUR2 = derive { name="HSAUR2"; version="1.1-14"; sha256="0psykccxyqigkfzrszy7x3qhdw02kppzgz0bqr21q8zh51jb2y3v"; depends=[]; };
-HSAUR3 = derive { name="HSAUR3"; version="1.0-4"; sha256="1m2nqvm0ma5rmwwn27nzzyjzq8c0awsrrjjrnyaj50bcnmg0x0k6"; depends=[]; };
+HSAUR3 = derive { name="HSAUR3"; version="1.0-5"; sha256="0hjlkmxp1yhwkfcbx16nda96ysqddjrcvl4z52w2ab84prqn6196"; depends=[]; };
 HSROC = derive { name="HSROC"; version="2.1.8"; sha256="056g6iygrddmpmg5nnilqrlw2xavmcc9q07z942vc2nivw06h346"; depends=[coda lattice MASS MCMCpack]; };
 HSSVD = derive { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
 HTMLUtils = derive { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; };
@@ -867,7 +870,7 @@ Haplin = derive { name="Haplin"; version="5.5"; sha256="12wkj5x1s920xs0xzhxk0dsw
 HaploSim = derive { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
 HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.5"; sha256="1kz12301bi2880i9ds7wvc6yb5hvrs3fr5689fm1yygkqfq8zc56"; depends=[mice]; };
 HarmonicRegression = derive { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
-Harvest_Tree = derive { name="Harvest.Tree"; version="1.0"; sha256="0nqrplqkvch7vzlrp8pxpg4gs1qvsq33l5498yqn0bbpbs6xj120"; depends=[rpart]; };
+Harvest_Tree = derive { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; };
 HelpersMG = derive { name="HelpersMG"; version="1.2"; sha256="1a9b7j53a8xfxc5dmm6m5f0ac2mir8yzkhg0fgah4gvbivaaz6nb"; depends=[coda]; };
 HiClimR = derive { name="HiClimR"; version="1.2.2"; sha256="11qx0ych889vccgbh0ckx5hpmpmnbghi4h8lcawiqk8lzxhv03ld"; depends=[]; };
 HiCseg = derive { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
@@ -880,6 +883,7 @@ HierO = derive { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2
 HighDimOut = derive { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; };
 HistDAWass = derive { name="HistDAWass"; version="0.1.3"; sha256="09zg7yrw0zdgy7v6z9awysshks618jiqx01fasi8qb9wrdisvf74"; depends=[class FactoMineR ggplot2 histogram]; };
 HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; };
+HistogramTools = derive { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; };
 HiveR = derive { name="HiveR"; version="0.2.44"; sha256="1ckbgn4vmv35bssbjrgvqhsx7ihm40ibpnxqwwsw6bv7g6ppx3ch"; depends=[jpeg plyr png RColorBrewer]; };
 Hmisc = derive { name="Hmisc"; version="3.16-0"; sha256="03d372bld4mikyrvmfw00ljiz6jf7szkmhrlgxs5vqk3v81kkp2f"; depends=[acepack cluster foreign Formula ggplot2 gridExtra gtable lattice latticeExtra nnet proto rpart scales survival]; };
 Holidays = derive { name="Holidays"; version="1.0-6"; sha256="031vddjf7s3pirv041y2mw694db63gjajlbczmmya8b1zp2f3vzk"; depends=[TimeWarp]; };
@@ -919,6 +923,7 @@ INLABMA = derive { name="INLABMA"; version="0.1-6"; sha256="0rij3y89yyj25xz8r9n8
 IPMpack = derive { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[MASS Matrix nlme]; };
 IPSUR = derive { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; };
 IQCC = derive { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[MASS micEcon miscTools qcc]; };
+IRISMustangMetrics = derive { name="IRISMustangMetrics"; version="1.0.0"; sha256="00s3jg1fsicqbmh52ajhacd7r11pnjpgv7qj2n4mdpxfvbndr1v3"; depends=[IRISSeismic pracma RCurl seismicRoll signal stringr XML]; };
 IRISSeismic = derive { name="IRISSeismic"; version="1.0.5"; sha256="1mgb774bmy20c4dzisb7ij4xqz9jhajn384nb7sfcnz5khxznxc4"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
 IRTShiny = derive { name="IRTShiny"; version="1.0"; sha256="1gjfqjqk7izl23b96g758dn6pb784ayb8yjjlryyrwga6mgsqdik"; depends=[beeswarm CTT ltm shiny shinyAce]; };
 ISBF = derive { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; };
@@ -937,6 +942,7 @@ InPosition = derive { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja
 IndependenceTests = derive { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; };
 InfDim = derive { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; };
 InferenceSMR = derive { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; };
+InformationValue = derive { name="InformationValue"; version="1.1.0"; sha256="0lnwvxjr1q30aqrcmcrwnliwix8195ax2p814zi13x2rbw59lqx2"; depends=[ggplot2]; };
 IntLik = derive { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; };
 InterVA4 = derive { name="InterVA4"; version="1.5"; sha256="0w2klq9dara941d4xz85qrq8dcp7vpc6rrz2k9ry01rsnpdzzybh"; depends=[]; };
 Interact = derive { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; };
@@ -950,7 +956,7 @@ IsingFit = derive { name="IsingFit"; version="0.3.0"; sha256="0imgj3g6sankzmycjk
 IsingSampler = derive { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[magrittr nnet plyr Rcpp]; };
 Iso = derive { name="Iso"; version="0.0-17"; sha256="0lljc99sdzdqj6d56qbsggibr6pkdwkh821bj70ianikyvmdc1y0"; depends=[]; };
 IsoCI = derive { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; };
-IsoGene = derive { name="IsoGene"; version="1.0-23"; sha256="18sl1qki2dn4ldycpqazj23zcibs3zqwp355q24nwr802xx3y4a6"; depends=[affy Biobase ff Iso xtable]; };
+IsoGene = derive { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; };
 IsotopeR = derive { name="IsotopeR"; version="0.4.7"; sha256="18gwmh4nprj4z0ar1w8npj2ymxihw5ydwa33g25mimjk8y2cs0x5"; depends=[coda fgui runjags]; };
 JADE = derive { name="JADE"; version="1.9-92"; sha256="0ki3jpz4npjikn3jjb7ppiyx0flhxx3p8aghjxlm3klhkm0k6ix4"; depends=[clue]; };
 JAGUAR = derive { name="JAGUAR"; version="2.0"; sha256="1c9pyg9jph95161g6zz0jlv5hlyvr9z960by7x3pv7plfkppjy7m"; depends=[doParallel lme4 plyr Rcpp]; };
@@ -984,7 +990,7 @@ KappaV = derive { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb66
 Kendall = derive { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
 KernSmooth = derive { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; };
 KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[plotrix Rcpp rgl]; };
-Kernelheaping = derive { name="Kernelheaping"; version="0.9"; sha256="0x42cv28c074zcb023plb3pw5ffrihwbl1jlwm2f4h68q84ra3a4"; depends=[evmix ks MASS plyr sparr]; };
+Kernelheaping = derive { name="Kernelheaping"; version="1.0"; sha256="0i255s5gwlcydxpn69kz7qyvzqbr3syppkzq1sq3sfn680i3hdyq"; depends=[evmix ks MASS plyr sparr]; };
 Kmisc = derive { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[data_table knitr lattice markdown Rcpp]; };
 KoNLP = derive { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[hash rJava Sejong stringr tau]; };
 Kpart = derive { name="Kpart"; version="1.1"; sha256="1cyml48i1jvwy4xzymijwraqpnssnkrd81q3m7nyjd5m2czjvihv"; depends=[leaps]; };
@@ -1076,7 +1082,7 @@ MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9iv
 MAT = derive { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; };
 MATA = derive { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; };
 MATTOOLS = derive { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; };
-MAVIS = derive { name="MAVIS"; version="1.1"; sha256="1nbvm6nfwymim63xvfqpvyk1w5fv6cwfh6cl2089myimid22ws1l"; depends=[compute_es ggplot2 MAc MAd metafor quantreg SCMA SCRT shiny shinyAce shinyBS]; };
+MAVIS = derive { name="MAVIS"; version="1.1.1"; sha256="1ydmnf4nn1d0iik3ldkk8d4291fvzhrgsjm0qkzd242r0mm2ss2p"; depends=[compute_es ggplot2 MAc MAd metafor quantreg SCMA SCRT shiny shinyAce shinyBS]; };
 MAVTgsa = derive { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach MASS multcomp randomForest]; };
 MAc = derive { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; };
 MAclinical = derive { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[e1071 party plsgenomics st]; };
@@ -1152,6 +1158,7 @@ MRCV = derive { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0a
 MRH = derive { name="MRH"; version="2.0"; sha256="0d6zfhyy8a0pjrr74lj0mcagh49pjh15yp4wa7g7j4qv8wfw5pkv"; depends=[coda KMsurv survival]; };
 MRIaggr = derive { name="MRIaggr"; version="1.1.2"; sha256="0z410xkfyaqfrdiwkw29z7l6n15hdwd4dwbjn211sj6s90fa4q2w"; depends=[Rcpp RcppArmadillo]; };
 MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[ggplot2 lmtest lubridate plyr reshape2]; };
+MRQoL = derive { name="MRQoL"; version="1.0"; sha256="0isn4g3jpz7wm99ymrshl6zgkb7iancdzdxl2w98n8fbxsh5z6sw"; depends=[]; };
 MRSP = derive { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[Formula matrixcalc]; };
 MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; };
 MRwarping = derive { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; };
@@ -1201,7 +1208,7 @@ MetNorm = derive { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1av
 MetSizeR = derive { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; };
 MetStaT = derive { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[abind MASS pls]; };
 MetaDE = derive { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[Biobase combinat impute survival]; };
-MetaLandSim = derive { name="MetaLandSim"; version="0.3"; sha256="04pyl9p2mqf4sgsfbzc2l0hccnq6z9q1929lq24ip0g8pn2svj96"; depends=[Biobase e1071 fgui googleVis maptools raster rgeos sp spatstat spgrass6]; };
+MetaLandSim = derive { name="MetaLandSim"; version="0.4"; sha256="1r2yr3zmd1ldcaxnxqdd6z0vv1jnwv2ghchrsn463r0ibbpciw2a"; depends=[Biobase e1071 fgui googleVis maptools raster rgeos rgrass7 sp spatstat]; };
 MetaPCA = derive { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; };
 MetaQC = derive { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[foreach iterators proto]; };
 MetaSKAT = derive { name="MetaSKAT"; version="0.40"; sha256="1jxs32hvsw6wzci9f1rc7sw1dfyazdm2d57wcmhkggfg3hkdn1vv"; depends=[SKAT]; };
@@ -1326,10 +1333,11 @@ OOmisc = derive { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40k
 OPDOE = derive { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; };
 OPI = derive { name="OPI"; version="2.1"; sha256="1pzw5b4gwf1q98547cgq7b363fn72ll0zlvcahy56wc1ci5ny3dd"; depends=[]; };
 ORCI = derive { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; };
-ORCME = derive { name="ORCME"; version="2.0.1"; sha256="0wr4z19alyp2cvlpg4bs8sni6nrwnhk11bbr00ycqym39alr2wjw"; depends=[Iso]; };
+ORCME = derive { name="ORCME"; version="2.0.2"; sha256="1pm8ajj24qqj2fir0gjzq5f4mfpl1cnj6fm2z5qg6g3sbnm57ayk"; depends=[Iso]; };
 ORDER2PARENT = derive { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; };
 ORIClust = derive { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4innxl0ckfb80q2j9pmd56wvbc0qnbm0w3q"; depends=[]; };
 ORMDR = derive { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; };
+OTE = derive { name="OTE"; version="1.0"; sha256="18w483syhs523yfib9sibzmj16bypqxk4sc4771kfr1958h3igai"; depends=[randomForest]; };
 OUwie = derive { name="OUwie"; version="1.45"; sha256="1g1315g015pcnd7g8k0vngjg7f842nq8ixhmqnj64by4vsafliva"; depends=[ape corpcor lattice nloptr numDeriv phangorn phytools]; };
 Oarray = derive { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; };
 OasisR = derive { name="OasisR"; version="1.0.0"; sha256="0anw1ncbjjmlnhigcfwm9zqmp4ah5cfbmmm3588k95xxp6xq9vmv"; depends=[rgdal rgeos spdep]; };
@@ -1379,6 +1387,7 @@ PBSadmb = derive { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5
 PBSddesolve = derive { name="PBSddesolve"; version="1.11.29"; sha256="13vprr66hh5d19xambpyw7k7fvqxb8mj5s9ba19ls7xgypw22cmm"; depends=[]; };
 PBSmapping = derive { name="PBSmapping"; version="2.69.76"; sha256="1fci7mx5m3jqy92nqfaw5w5yd5rw6f0bk5kya1v0mmvf7j715kar"; depends=[]; };
 PBSmodelling = derive { name="PBSmodelling"; version="2.67.266"; sha256="0ych9k20x0m71gkdrpwv5jnx6pfsk45wwsaaamy32cmnhd3y14sq"; depends=[XML]; };
+PCA4TS = derive { name="PCA4TS"; version="0.1"; sha256="1qi9nlaf5181afrdvddh10a9vxyhry102n3dhai86im8yz4if9y6"; depends=[tseries]; };
 PCAmixdata = derive { name="PCAmixdata"; version="2.2"; sha256="0gbmiy2mhz8lgp0pcjby4ny8a28wlx1xrsa2lknzxn4d0m2csxjn"; depends=[]; };
 PCDSpline = derive { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[matrixcalc nleqslv]; };
 PCGSE = derive { name="PCGSE"; version="0.2"; sha256="19bpnn1b8ihmf52zh9g9pc38130np1ki8l7wf0j5myw2cnw6fna8"; depends=[MASS RMTstat safe]; };
@@ -1431,7 +1440,7 @@ PTAk = derive { name="PTAk"; version="1.2-12"; sha256="1phxh2qbzsj2ia2dr6z30lhi7
 PTE = derive { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; };
 PVAClone = derive { name="PVAClone"; version="0.1-2"; sha256="0afl2il5wdcwzpyhjkgq8iz16q1086c3ndr4cjlyspgbss9h5l24"; depends=[dclone dcmle]; };
 PVR = derive { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbkaqb34x2y9nkl1nj1pkwjq2s5"; depends=[ape splancs]; };
-Pade = derive { name="Pade"; version="0.1-3"; sha256="0jysdk55gnxa3x0j9v7r7qqqim0wfjph1v3amn08xf5wh5fd68yi"; depends=[]; };
+Pade = derive { name="Pade"; version="0.1-4"; sha256="1kx5qpxd3x43bmyhk8g2af44hz3prhnrzrm571kfjmak63kym741"; depends=[]; };
 PairViz = derive { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[graph gtools TSP]; };
 PairedData = derive { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[ggplot2 gld lattice MASS mvtnorm]; };
 Paneldata = derive { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
@@ -1440,6 +1449,7 @@ ParallelForest = derive { name="ParallelForest"; version="1.1.0"; sha256="1xa9lf
 ParamHelpers = derive { name="ParamHelpers"; version="1.5"; sha256="1ywsc96gc252i6girr2ph674wfrzjfk96l2w8512rqy9bgimr0lr"; depends=[BBmisc checkmate]; };
 ParentOffspring = derive { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; };
 ParetoPosStable = derive { name="ParetoPosStable"; version="1.0.3"; sha256="0f3f4wn33vw1y3cjcvlk44g8z6hjkv4ws535pkcz3lgb95fl4q0n"; depends=[ADGofTest lmom]; };
+Pasha = derive { name="Pasha"; version="0.99.16"; sha256="1arzvii3rm4l94ivjccxvy9jgk8answy4r97l0zh7sznng8w1x6z"; depends=[Biostrings bitops GenomicAlignments GenomicRanges gtools IRanges Rsamtools S4Vectors ShortRead]; };
 PatternClass = derive { name="PatternClass"; version="1.5"; sha256="1paw39xm2rqjnc7pnbya7gyl160kzl56nys9g0y1sa6cqycy3y5x"; depends=[SDMTools]; };
 Peaks = derive { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dccy593g02c4qjwky1cgzy5rvin2"; depends=[]; };
 PearsonDS = derive { name="PearsonDS"; version="0.97"; sha256="0bsdj4zir12zkv8yhq1z6dqjzhkb9l0f88jrr4iyclns1pcqvrvi"; depends=[]; };
@@ -1490,7 +1500,7 @@ PracTools = derive { name="PracTools"; version="0.2"; sha256="1njnm0rk2z9p3p8wsj
 PredictABEL = derive { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; };
 PredictiveRegression = derive { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
 PresenceAbsence = derive { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
-PrevMap = derive { name="PrevMap"; version="1.1.5"; sha256="0bzk09ygz4i3v8s39p0n157wrylp38h5xz32f18py8gr776x311n"; depends=[geoR maxLik pdist raster splancs]; };
+PrevMap = derive { name="PrevMap"; version="1.2"; sha256="06036c5171lz8ys6sh2q58jq6frb9j5rgzd2v862prr6jg5643ci"; depends=[geoR maxLik pdist raster splancs truncnorm]; };
 PrivateLR = derive { name="PrivateLR"; version="1.2-21"; sha256="1jwq8f0dnngj8sfbmcmxy34nkkq6yjw0mq3w1f8rasz67v3bwzp3"; depends=[]; };
 ProDenICA = derive { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
 ProbForecastGOP = derive { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; };
@@ -1549,7 +1559,7 @@ R2MLwiN = derive { name="R2MLwiN"; version="0.8-1"; sha256="0gkp5jvvbf9rppxirs1s
 R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-3.1"; sha256="1nnyfhpqgx6wd4n039c4d42png80b2xcwalyj08bmq0cgl32cjgk"; depends=[boot coda]; };
 R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[cairoDevice gWidgets gWidgetsRGtk2 lattice latticeExtra lme4 MASS Matrix proto RGtk2Extras statmod]; };
 R2SWF = derive { name="R2SWF"; version="0.9"; sha256="0c3lkmm8wgpix3fv7dxql6zpklwbcsv1y30r26yws12fnavw4y1k"; depends=[sysfonts]; };
-R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-20"; sha256="052frb3qlqfy6zl0qd2a9d4w2s7prfvdb0vn45rns68q03dma1ml"; depends=[boot coda]; };
+R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-21"; sha256="0k8k214x712vjj2k1am4zzf6scccs3b98ysiz4lwxpzm818wp1ps"; depends=[boot coda]; };
 R2admb = derive { name="R2admb"; version="0.7.13"; sha256="0sjli498pz1vk5wmw65mca08mramwhzlfli2aih15xj7qzvp0nky"; depends=[coda lattice]; };
 R2jags = derive { name="R2jags"; version="0.5-6"; sha256="0zknl9qrypp96qz6rx7bkxg7bslvsnlhrgh749q4q566fz944n1g"; depends=[abind coda R2WinBUGS rjags]; };
 R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; };
@@ -1600,7 +1610,7 @@ REDCapR = derive { name="REDCapR"; version="0.7-1"; sha256="1r5vvl52z5gpqhq949fz
 REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
 REPPlab = derive { name="REPPlab"; version="0.9.1"; sha256="1yrw03p7rk5dbr23z343kxn7vbac8khcz4c718wq9w6sykhgv8d0"; depends=[lattice rJava]; };
 REQS = derive { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; };
-RESS = derive { name="RESS"; version="1.1"; sha256="1g4g15m29cb6c60ah86si6ibi8sb2j7spqml6lmcflk4rrnyi4pc"; depends=[]; };
+RESS = derive { name="RESS"; version="1.2"; sha256="13125b616z3ib2y9bkn770h4ix914gxgqi0yxqnr99qc99n7lavs"; depends=[]; };
 REST = derive { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; };
 REdaS = derive { name="REdaS"; version="0.9.2"; sha256="0w1b2996b0sdpxklkxylnk18dx8vgssn5avh7pnrvdqa464ci4f8"; depends=[]; };
 RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
@@ -1637,7 +1647,7 @@ RJDBC = derive { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vp
 RJSDMX = derive { name="RJSDMX"; version="1.4"; sha256="1g14nrjkspv3wyg9kc5bnn9zb37dw1z8y7mc4sxhacd1n2nxzb97"; depends=[rJava zoo]; };
 RJSONIO = derive { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; };
 RJaCGH = derive { name="RJaCGH"; version="2.0.4"; sha256="1a8nd0w73dvxpamzi2addwr6q3rxhnnpa1girnlwbd1j1dll0bz6"; depends=[]; };
-RJafroc = derive { name="RJafroc"; version="0.0.1"; sha256="0zjyr7qz50wvzkais6q9kyf3wp29g15kan73b8wdqrvab0f5rjqs"; depends=[ggplot2 stringr xlsx]; };
+RJafroc = derive { name="RJafroc"; version="0.1.0"; sha256="00nag4yak89pialch9p3r2ln6gs03jl5cx9rmipgvgyg031gf43f"; depends=[ggplot2 shiny stringr xlsx]; };
 RKEA = derive { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; };
 RKEAjars = derive { name="RKEAjars"; version="5.0-1"; sha256="00bva6ksdnmwa0i2zvr36n40xp429c0sqyp20a8n3zsblawiralc"; depends=[rJava]; };
 RKlout = derive { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; };
@@ -1678,12 +1688,12 @@ ROI_plugin_quadprog = derive { name="ROI.plugin.quadprog"; version="0.0-2"; sha2
 ROI_plugin_symphony = derive { name="ROI.plugin.symphony"; version="0.0-2"; sha256="1z4cahz0h38jw54p9363ca6i3qq7dwlm3568dr91gvpqf76b05wd"; depends=[ROI Rsymphony slam]; };
 ROMIplot = derive { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; };
 ROSE = derive { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; };
-RObsDat = derive { name="RObsDat"; version="15.02"; sha256="1fagbmp48rnyln6jh2yzvc414q82q6dvixmia7yqg64lrkzkh302"; depends=[DBI e1071 sp spacetime vwr xts zoo]; };
+RObsDat = derive { name="RObsDat"; version="15.08"; sha256="0n64jqba682rdy696yfpi5l5sw6g33421hg1rnb1dwdnvr7yd0y9"; depends=[DBI e1071 sp spacetime vwr xts zoo]; };
 ROptEst = derive { name="ROptEst"; version="0.9"; sha256="0m5czyqcsz42dzrhm3vwfmn046n57cb7x5sqzf2nad1gqgxzxp1d"; depends=[distr distrEx distrMod RandVar RobAStBase]; };
 ROptEstOld = derive { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx evd RandVar]; };
 ROptRegTS = derive { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[distr distrEx RandVar ROptEstOld]; };
 ROptimizely = derive { name="ROptimizely"; version="0.2.0"; sha256="059zfn6y687h989wryvpqwgnp9njrrr4ys0gf1ql4pw85b2c50dy"; depends=[httr jsonlite]; };
-ROracle = derive { name="ROracle"; version="1.1-12"; sha256="1ydmckr0wzjgvhhh410l4ih7idbr8140g6v11avh655wffk02q5p"; depends=[DBI]; };
+ROracle = derive { name="ROracle"; version="1.2-1"; sha256="19avgm4sxv052alh938bcvc7z8xx70vdwd9pilaidxydbar5kqz1"; depends=[DBI]; };
 RPANDA = derive { name="RPANDA"; version="1.0"; sha256="1q8chhmdgn697a4qp4f7prdviar29z0py050748qw7ab326lqp5d"; depends=[ape deSolve picante pspline]; };
 RPCLR = derive { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
 RPEnsemble = derive { name="RPEnsemble"; version="0.2"; sha256="1kbgpbk7gma0vhl0aybdj7bk2chhbggzh7h1w7snddgdvvj6cz10"; depends=[class MASS]; };
@@ -1775,7 +1785,7 @@ Rcgmin = derive { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiy
 Rchoice = derive { name="Rchoice"; version="0.3"; sha256="1ac2nw03g66z2rgxzv8jqad74cp4c9ry0hvnw77d57ddaxszkrva"; depends=[Formula maxLik msm plm plotrix]; };
 Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen]; };
 Rcmdr = derive { name="Rcmdr"; version="2.1-7"; sha256="1qn0bfh36shdnm2qbjwggjv19vqkkhng82x39sdbljx0z3g3bmdg"; depends=[abind car RcmdrMisc tcltk2]; };
-RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-2"; sha256="18by1b1iz7q6lbnhxj5l5w58fqsvki84d830sv7iyzrs2q6n7vhq"; depends=[abind car e1071 Hmisc MASS sandwich]; };
+RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-3"; sha256="134yr2n0m61bw8rv1iar2l9dk9a178k2pxba0bsxrd1c9j3s1f0j"; depends=[abind car colorspace e1071 Hmisc MASS readxl sandwich]; };
 RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[BCA car flexclust foreign nnet Rcmdr RcmdrMisc rpart rpart_plot]; };
 RcmdrPlugin_DoE = derive { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; };
 RcmdrPlugin_EACSPIR = derive { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; };
@@ -1819,7 +1829,7 @@ Rcpp = derive { name="Rcpp"; version="0.12.0"; sha256="182109z0yc1snqgd833ssl2ci
 Rcpp11 = derive { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
 RcppAPT = derive { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp]; };
 RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.6"; sha256="1n4wrllhxn95lgkralvw5jjgff93nay5wdlyihih7f195fq5wqms"; depends=[Rcpp]; };
-RcppArmadillo = derive { name="RcppArmadillo"; version="0.5.200.1.0"; sha256="0vz0yl5k0q57xrnjpz1bxs6j3hpysp1mkcxf5fs6xdy6nzaqsr7x"; depends=[Rcpp]; };
+RcppArmadillo = derive { name="RcppArmadillo"; version="0.5.300.4"; sha256="0d6lda82lh896k7rf9s7alzqklmkrr0jwk8zxf6zqli7g1qmrywb"; depends=[Rcpp]; };
 RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
 RcppCNPy = derive { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp]; };
 RcppClassic = derive { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp]; };
@@ -1865,14 +1875,14 @@ RenextGUI = derive { name="RenextGUI"; version="1.3-0"; sha256="0ydq57k5va1l10dx
 Reol = derive { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[ape RCurl XML]; };
 ReorderCluster = derive { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; };
 RepeatedHighDim = derive { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
-ReporteRs = derive { name="ReporteRs"; version="0.7.8"; sha256="1gzsdrkmz2g59m2653xfcl4d6zs010hzcjxr6sk26dhxj11alqgr"; depends=[ReporteRsjars rJava]; };
+ReporteRs = derive { name="ReporteRs"; version="0.8.2"; sha256="1widvbfwqvzcjyk746ybz921yifnn1q3ybi3ijy31mixqgm9m9ka"; depends=[ReporteRsjars rJava]; };
 ReporteRsjars = derive { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; };
 ResistorArray = derive { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; };
 ResourceSelection = derive { name="ResourceSelection"; version="0.2-4"; sha256="01r1w03paazyix5jjxww89falba1qfiqcznx79a6fmsiv8gm2x5w"; depends=[]; };
 RevEcoR = derive { name="RevEcoR"; version="0.99.2"; sha256="100sman51vvwg5xkypmksyyjqdb6g858z29vn7x4kvly8ncw4hfd"; depends=[gtools igraph magrittr Matrix plyr stringr XML]; };
 Rfacebook = derive { name="Rfacebook"; version="0.5"; sha256="0cl4s815i4yxp805j8nhqmva31imbd1xp3yxgi53qwjhagh4i57a"; depends=[httpuv httr rjson]; };
 Rfit = derive { name="Rfit"; version="0.21"; sha256="129z5ivwfxbh3rfwk98jnm6ibq5z9z3r9mhy9gv61jfr4ig78dcn"; depends=[quantreg]; };
-Rgbp = derive { name="Rgbp"; version="1.0.9"; sha256="0a0krpj73psf8cahjxd7xzslckzs6325phc2kr1vd2ik56vcyqlz"; depends=[mnormt sn]; };
+Rgbp = derive { name="Rgbp"; version="1.1.0"; sha256="1bz5w8xd9vldlsr23dsbp1s70xwsikl253awv8bk26hck76mk85s"; depends=[mnormt sn]; };
 Rglpk = derive { name="Rglpk"; version="0.6-1"; sha256="011l60571zs6h8wmv4r834dg24knyjxhnmxc7yrld3y2qrhcl714"; depends=[slam]; };
 Rgnuplot = derive { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; };
 RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.7"; sha256="04k7h8hgxvgsccdiysbblplwjvn8m7g8h3anzdlxmmjaamd8l9lw"; depends=[png RJSONIO]; };
@@ -2070,7 +2080,7 @@ Sejong = derive { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6d
 SeleMix = derive { name="SeleMix"; version="0.9.1"; sha256="04gxgja35qs4k66iil014dzgl5bkx0qhr9w4v7qpmwv2bb07jwz3"; depends=[Ecdat mvtnorm xtable]; };
 SelvarMix = derive { name="SelvarMix"; version="1.0"; sha256="0yysmf854xz5l0lf2x0hw0qxbrdhgfrcx5ggw8n4pjfv553p38ni"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; };
 SemiCompRisks = derive { name="SemiCompRisks"; version="2.0"; sha256="0in3pv66nhb0ar4xfxskvf24c7bqkr9ik069a4nynwnc3idpsq32"; depends=[]; };
-SemiMarkov = derive { name="SemiMarkov"; version="1.4.1"; sha256="048hmbcmhqkvqw8nbzm0136mc9w7b27jy8q9r3rvc3banh854d1m"; depends=[MASS numDeriv Rsolnp]; };
+SemiMarkov = derive { name="SemiMarkov"; version="1.4.2"; sha256="0xfa3arn98pfnhbcq3p880v177dhczcjm5bc1m84kygbhiaifsjg"; depends=[MASS numDeriv Rsolnp]; };
 SemiPar = derive { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[cluster MASS nlme]; };
 SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.5"; sha256="1m063bv9fqsnmi6aw2w6dx2s2qgh9ci1v9bcvh83zb3j2ajprkrk"; depends=[magic mgcv survey trust VGAM VineCopula]; };
 SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.2"; sha256="1k9xmby8hy4k0qn7pjj0rypxj4iqb206ixv92bz7ga0q8zd0nxbr"; depends=[copula gamlss_dist magic Matrix mgcv mvtnorm trust VGAM]; };
@@ -2206,7 +2216,7 @@ TIMP = derive { name="TIMP"; version="1.12.1"; sha256="06zjpa9j4sr62f2lspa75i7n8
 TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[ExPosition InPosition prettyGraphs TExPosition]; };
 TKF = derive { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[ape expm numDeriv phangorn phytools]; };
 TMDb = derive { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; };
-TOC = derive { name="TOC"; version="0.0-2"; sha256="0zkwbjyi5dc6y0fzmwkbyrf32h0r5vhxxz67zjrhqc06vyasai8w"; depends=[bit raster rgdal]; };
+TOC = derive { name="TOC"; version="0.0-3"; sha256="0zgggkxsn7mqa5bh9rpb29ag019bwpy4yf3nd3nrcz5yk22bh7bn"; depends=[bit raster rgdal]; };
 TPmsm = derive { name="TPmsm"; version="1.2.0"; sha256="1670b9g6sqlg5xk76x77cph1wzp44yp957sn8px5k7kkb1hgi0pl"; depends=[KernSmooth]; };
 TR8 = derive { name="TR8"; version="0.9.13"; sha256="07wrqwa5gf1l1y3b07mganr5xkzxdzrh6lrv7gf01m9b7bsz564m"; depends=[gdata gWidgets gWidgetstcltk plyr rappdirs RCurl taxize XML]; };
 TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; };
@@ -2264,6 +2274,7 @@ TimeProjection = derive { name="TimeProjection"; version="0.2.0"; sha256="04yr4c
 TimeWarp = derive { name="TimeWarp"; version="1.0.12"; sha256="1qadaf8n8ym5nv1z328hd5wiw78f014imgd2ryvi70sh4dmzb16l"; depends=[]; };
 Tinflex = derive { name="Tinflex"; version="1.1"; sha256="1wnb893x4gj1h3fpyblks07dln5ilpllpmmwp7wpqbvj7hzrj661"; depends=[]; };
 TipDatingBeast = derive { name="TipDatingBeast"; version="0.1-6"; sha256="0yfm99j2b3k9har87qb675jxgfp5vq3aizqvxc1njnfyh5yjg89k"; depends=[mclust]; };
+Tmisc = derive { name="Tmisc"; version="0.1.1"; sha256="14yz8j0dzpxhn7w7zviy3habq78dn4z1absz664vhdrkcql4f3fx"; depends=[dplyr]; };
 TopKLists = derive { name="TopKLists"; version="1.0.3"; sha256="0687nxsddmlgyz3kwcfmcv0vj2pw91154rd1p19ivhmbvhvnhwvh"; depends=[gplots Hmisc]; };
 TraMineR = derive { name="TraMineR"; version="1.8-10"; sha256="05x23argga7xh7ggv08b659j9ljnygbfwfh3pqiadhw9dipgyqqp"; depends=[boot RColorBrewer]; };
 TraMineRextras = derive { name="TraMineRextras"; version="0.2.4"; sha256="144s25ivq27f81dgh9x9h1fph1hdk86w9yac1hy6358kc8jnmi3q"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
@@ -2330,7 +2341,7 @@ VineCopula = derive { name="VineCopula"; version="1.6"; sha256="16hzjdllpk2dsc66
 VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; };
 Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
 VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
-W2CWM2C = derive { name="W2CWM2C"; version="1.0"; sha256="14q1y4vpmrx8qz5nav8bbjkxqsqk646zcwr8h7yzi7cfa85b4cxz"; depends=[wavemulcor waveslim]; };
+W2CWM2C = derive { name="W2CWM2C"; version="2.0"; sha256="139rbbhshiap3iq4s4n84sip3cwwjn2x7lm7kmzwj5glhl5dc6ga"; depends=[colorspace wavemulcor waveslim]; };
 W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-4"; sha256="08697va5n59d7yyv882ya3s2qw94n7c53d8wyavpvhqq9d3n8nwi"; depends=[RCurl XML]; };
 WARN = derive { name="WARN"; version="1.1"; sha256="0rnzsc8vbm116g4cwdivmxqv1zyg4givjrrlahvbf4xl5pbryg6d"; depends=[MASS]; };
 WCE = derive { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; };
@@ -2374,7 +2385,7 @@ YaleToolkit = derive { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgn
 YieldCurve = derive { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; };
 YourCast = derive { name="YourCast"; version="1.6.2"; sha256="0vl37svwky6j1am235ac2wk1fdmh509w0h4m7y93lpjhzj6m8c1p"; depends=[foreign ggplot2 gridExtra lattice reshape2]; };
 YplantQMC = derive { name="YplantQMC"; version="0.6-4"; sha256="09galr2bcjvfpcp84znsv45j2cfyn4yhdx31kxs062sylys6kxld"; depends=[geometry gplots LeafAngle rgl]; };
-YuGene = derive { name="YuGene"; version="1.1.2"; sha256="0sy0bh49l0fajh1z88mpb4f0k3hsf3kd1vxv731qhpxcrc3pz09b"; depends=[mixOmics]; };
+YuGene = derive { name="YuGene"; version="1.1.4"; sha256="0qvws7jccq7cg4r3lr7c19q56rh3gy2jx7bba4mfjy2ywl24q62n"; depends=[mixOmics]; };
 ZIM = derive { name="ZIM"; version="1.0.2"; sha256="1n4dc0as011gzaac153zq1dfbg1axvmf9znlmhl7xjj4dz4966qm"; depends=[MASS]; };
 ZeBook = derive { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[deSolve triangle]; };
 Zelig = derive { name="Zelig"; version="4.2-1"; sha256="1hhr9jx25fdnkqwyj2bkgrvqlah4z2drphmb5mdn1an2p2g23v9z"; depends=[boot MASS sandwich]; };
@@ -2385,7 +2396,7 @@ aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0
 aLFQ = derive { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
 aRpsDCA = derive { name="aRpsDCA"; version="1.0.1"; sha256="1hxf3lpdcx8h9gndclppsxr8rs048mi3nysjj1z3fgbpmkqnlxgs"; depends=[]; };
 aRxiv = derive { name="aRxiv"; version="0.5.10"; sha256="1q8nblb0kfdidcj1nwxn0fap87wpkg49z0bgmwayskwv1p860wrh"; depends=[httr XML]; };
-aSPU = derive { name="aSPU"; version="1.36"; sha256="13mvkwqdhhs6wc64dwlw1114nfb9m3iggqbdilhc4w1vljdjxaa5"; depends=[]; };
+aSPU = derive { name="aSPU"; version="1.37"; sha256="01593vykj5hiw3nhl7kxylb52qvndpmpiwsb0igh0ci20ng45ci4"; depends=[]; };
 aTSA = derive { name="aTSA"; version="3.1.2"; sha256="1p3spas0sxj08hkb8p6k2fy64w86prlw1hbnrqnrklr0hnkg2g54"; depends=[]; };
 abbyyR = derive { name="abbyyR"; version="0.1"; sha256="03krflrjhq7yx06wacfyxzqvq0v2b17xvcyl8sfnaylrilracwjq"; depends=[httr XML]; };
 abc = derive { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; };
@@ -2590,7 +2601,7 @@ basicspace = derive { name="basicspace"; version="0.15"; sha256="11aqrai26kdwszz
 batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
 batch = derive { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; };
 batchmeans = derive { name="batchmeans"; version="1.0-2"; sha256="126q7gyb1namhb56pi0rv9hchlghjr95pflmmpwhblqfq27djss2"; depends=[]; };
-bayesDccGarch = derive { name="bayesDccGarch"; version="1.1"; sha256="1gjba5c9vfgvhlard6k47rc2f4r497qy4ybjwr57rm3n3jb0vkl1"; depends=[coda numDeriv]; };
+bayesDccGarch = derive { name="bayesDccGarch"; version="1.2"; sha256="15skkm4vmqj1r0vic1wgr58x8c7p6igvlmafbv0c46yl224qgryv"; depends=[coda numDeriv]; };
 bayesDem = derive { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2012]; };
 bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[coda mvtnorm]; };
 bayesGDS = derive { name="bayesGDS"; version="0.6.1"; sha256="0134x5knwp9pmkjyzgi1k7hjj92sym1p0zq98sizlbs0mff2p2s4"; depends=[Matrix]; };
@@ -2618,7 +2629,7 @@ bcpmeta = derive { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7
 bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[ggplot2 mvtnorm]; };
 bcrypt = derive { name="bcrypt"; version="0.2"; sha256="0f4sw1w2k1237wipfva3k9w2a678pvfz0k86jd7djslhyimb6jrq"; depends=[openssl]; };
 bcv = derive { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; };
-bda = derive { name="bda"; version="5.1.3"; sha256="0v2xki9a1j6y42x03a3rrm746xx4qd3ris1m0k7alh25j3ayhs3p"; depends=[]; };
+bda = derive { name="bda"; version="5.1.6"; sha256="0rpxvmjbqiph8hpzsvlj8q6h70jsc9771fiq7l3lmkz69jn1gf4q"; depends=[]; };
 bde = derive { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; };
 bdpv = derive { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; };
 bdscale = derive { name="bdscale"; version="1.2"; sha256="0j2h7ainfnh78szp355didbkmcl6d5vz1di8nznjarwxncrbgc6g"; depends=[ggplot2 scales]; };
@@ -2690,7 +2701,7 @@ binseqtest = derive { name="binseqtest"; version="1.0.1"; sha256="0snlrwmmmwrl3f
 bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
 bio3d = derive { name="bio3d"; version="2.2-2"; sha256="0sqwl27n15sbablw4mcqgf0w2k28jc59wf8yqxrmqbg8cckfsh9j"; depends=[]; };
 bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
-biogas = derive { name="biogas"; version="1.0.1"; sha256="0fjxfj4c4clyp4gkzm0dl5ls7pbyaxmff56dw59wswijm4na2il7"; depends=[]; };
+biogas = derive { name="biogas"; version="1.1.0"; sha256="0cbz4vy6iah4qbxlk4dmvpvyj4by7mkmzac1xi5j14w8xjlw5h0y"; depends=[]; };
 biogram = derive { name="biogram"; version="1.2"; sha256="1kklidp1nm9jb0nvlhlhxklh4fp86plfsslp4ajnv8i4rc6h0v19"; depends=[bit entropy slam]; };
 biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[Matrix plyr RJSONIO]; };
 biomartr = derive { name="biomartr"; version="0.0.1"; sha256="10bi0vz9y2s7v41rkxifgf23w67ladpmmhhpfvnhbjqwwdk97snc"; depends=[biomaRt Biostrings data_table downloader dplyr httr RCurl stringr XML]; };
@@ -2698,7 +2709,7 @@ biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl25
 bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
 biorxivr = derive { name="biorxivr"; version="0.1.1"; sha256="0v2jmqpdcci3wwpcrakqcssahy3yx07s265axs14615w74dgd4kl"; depends=[XML]; };
 bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; };
-biosignalEMG = derive { name="biosignalEMG"; version="1.0.3"; sha256="0nbr0d2hf28csv3lhl4af7hhqivwxaa1c1aj2yy1xjvnn6fd8mr3"; depends=[]; };
+biosignalEMG = derive { name="biosignalEMG"; version="2.0.0"; sha256="0avn35r567crp3z4i1fvlfirvc085cf3g6znc6wgnm7mhxp3l1ss"; depends=[signal]; };
 biotools = derive { name="biotools"; version="2.1"; sha256="15ncx700v5ignr3gggz5zfspskzpj3kpzsy6rg2y4pnjm1vlndgj"; depends=[boot MASS rpanel tkrplot]; };
 bipartite = derive { name="bipartite"; version="2.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[fields igraph MASS permute sna vegan]; };
 biplotbootGUI = derive { name="biplotbootGUI"; version="1.1"; sha256="0k92z9iavvq5v56x2hgkmrf339xl7ns1pvpqb4ban8r1j8glzawi"; depends=[cluster dendroextras MASS rgl shapes tcltk2 tkrplot]; };
@@ -2734,9 +2745,11 @@ bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834l
 bmmix = derive { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
 bmp = derive { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; };
 bmrm = derive { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[LowRankQP lpSolve]; };
+bnclassify = derive { name="bnclassify"; version="0.3.0"; sha256="0fqib9gq0rpwy5bs11dn251s6yld1scrg0lib034dzbkkblvik1m"; depends=[assertthat crossval entropy graph matrixStats RBGL rpart]; };
 bnlearn = derive { name="bnlearn"; version="3.8.1"; sha256="07lh67nw7wpjimim44zpw8h1rq4yqa2sdjcwj95bmyc25hlzv1s1"; depends=[]; };
 bnormnlr = derive { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
 bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; };
+bnstruct = derive { name="bnstruct"; version="1.0"; sha256="1bc4q5gk56xmmsiglg8434hpl3lvbyg9hgv5xx5b8law6hn5znz4"; depends=[bitops igraph Matrix]; };
 boa = derive { name="boa"; version="1.1.8-1"; sha256="15nkr24hgv1286h9b6sdhlpljnm98fi5mmpsygl76h24dayy3854"; depends=[]; };
 boilerpipeR = derive { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; };
 bold = derive { name="bold"; version="0.2.6"; sha256="15hnbspp5s293v2jykmirf9rvdgpkd71h431gizz71ssayanzp67"; depends=[assertthat httr jsonlite plyr reshape stringr XML]; };
@@ -2773,15 +2786,16 @@ brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6y
 brewdata = derive { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl stringdist XML]; };
 brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; };
 bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
-brms = derive { name="brms"; version="0.4.0"; sha256="0bq21zavy0nziyg3z9g0jjxpj2ny36yvx5f3fkxrj9xlihp8fwlr"; depends=[abind ggmcmc ggplot2 gridExtra Rcpp reshape2 rstan]; };
+brms = derive { name="brms"; version="0.4.1"; sha256="0kkkg2wp49f6iclbahxlrnz5cczv3qs2qb9jazflshgpnnn0vqqy"; depends=[abind ggmcmc ggplot2 gridExtra Rcpp reshape2 rstan]; };
 brnn = derive { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; };
-broman = derive { name="broman"; version="0.55-2"; sha256="04pg362gmxg5lvrv333mjq06lv0q3a1mq6wrbmy87jch6f10lazi"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
+broman = derive { name="broman"; version="0.59-5"; sha256="0sl7ppdy0d3mnnp7vz98ingv9irv58xjazf3rx473qw811ybcjdn"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
 broom = derive { name="broom"; version="0.3.7"; sha256="00z4kwxdqp6g35g4x6js9rc96z8i40hzgvhf5frj9dwfpxclk145"; depends=[dplyr plyr psych stringr tidyr]; };
 bshazard = derive { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[Epi survival]; };
 bspec = derive { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
 bspmma = derive { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
 bst = derive { name="bst"; version="0.3-4"; sha256="1s7qv2q9mcgg1c5mhblqg3nk9hary4pq6z0xgi3a6rs1929mgdyf"; depends=[gbm rpart]; };
 bsts = derive { name="bsts"; version="0.6.2"; sha256="0m18yl9c12p19psx3iz7swlblgbkmyyvfls5g74gm8qbbhbxmdsk"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
+btergm = derive { name="btergm"; version="1.5.2"; sha256="1llf9f9qkiw0pnbsnsybyxgch92dyzwdr77bcxqhipbmdb8fdckd"; depends=[boot coda ergm Matrix network ROCR sna speedglm statnet statnet_common texreg xergm_common]; };
 btf = derive { name="btf"; version="1.1"; sha256="0n1h4hmjpvj97mpvannh3s5l08m4zfv0w64hrgdv4s5808miwfzc"; depends=[coda Matrix Rcpp RcppEigen]; };
 bujar = derive { name="bujar"; version="0.1-4"; sha256="0v48mkg78sy91z1z4xvy2r3xmay74615kzqxjqlclkk20999z56m"; depends=[earth elasticnet gbm mboost mda ncvreg rms]; };
 bursts = derive { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
@@ -2803,6 +2817,7 @@ calibrate = derive { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k
 calibrator = derive { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[cubature emulator]; };
 calmate = derive { name="calmate"; version="0.12.0"; sha256="1jd1ag1v10bpgkqpf5134av0yc7xph1679q40y541kyr59df0lxw"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
 camel = derive { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[igraph lattice MASS Matrix]; };
+camtrapR = derive { name="camtrapR"; version="0.97.1"; sha256="1kcq4wyfxz4zs90wib0siiv50qlrkm1z4p6r4wfs4j126cvxq95q"; depends=[overlap]; };
 cancerTiming = derive { name="cancerTiming"; version="3.0.0"; sha256="1sc5mz2gnrzvkc9kfnspq9vddk48a0a99yyywkwy1vvj0q2dgmyn"; depends=[gplots LearnBayes]; };
 candisc = derive { name="candisc"; version="0.6-7"; sha256="1g2vypcniy94h462kylmzraa6q3ys9m0r1cn21dm8rzzjxid9g3g"; depends=[car heplots]; };
 cape = derive { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd fdrtool igraph Matrix qpcR shape]; };
@@ -2829,7 +2844,7 @@ catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2
 cati = derive { name="cati"; version="0.99"; sha256="1xghdqmqfwi0wnzvrd896z4snyjqqs9kw3whmkd3cph8zf0jl931"; depends=[ade4 ape e1071 FD geometry hypervolume mice nlme rasterVis vegan]; };
 catnet = derive { name="catnet"; version="1.14.8"; sha256="03y7ddjyra3cjq7savdgickmw82ncx4k01rn752sks6rpl6bjslc"; depends=[]; };
 catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
-causaleffect = derive { name="causaleffect"; version="1.1.3"; sha256="04wbwl40iwyqi1j5ngss9rlsrp21qdr9pcp32ckl9g61qj8f6jxa"; depends=[ggm igraph XML]; };
+causaleffect = derive { name="causaleffect"; version="1.2.0"; sha256="0dw2660g958ni086jhqr084hxfsf7rnv30qyx56vi8l5qbapsxaw"; depends=[ggm igraph XML]; };
 causalsens = derive { name="causalsens"; version="0.1.1"; sha256="1z92ckqa07ajm451wrldxx9y43nawlvj2bsz0afxc9mrhjwjg5dh"; depends=[]; };
 cba = derive { name="cba"; version="0.2-15"; sha256="1qw1r5drxip4y1a59hwz92iw50nj3vkxynsisv28srnwr58imnaj"; depends=[proxy]; };
 ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
@@ -2891,7 +2906,7 @@ chromer = derive { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yj
 chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
 chron = derive { name="chron"; version="2.3-47"; sha256="1xj50kk8b8mbjpszp8i0wbripb5a4b36jcscwlbyap8n4487g34s"; depends=[]; };
 cin = derive { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
-circlize = derive { name="circlize"; version="0.2.5"; sha256="0kc58cin98a5w63iz20kwpll7129l1ww455hjjp4yvlpnsr6m038"; depends=[GlobalOptions shape]; };
+circlize = derive { name="circlize"; version="0.3.0"; sha256="0hd74fss5f3nr0m7vdb6apkgplydhqkknad4ng4frfyf03pnxkpx"; depends=[GlobalOptions shape]; };
 circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; };
 cit = derive { name="cit"; version="1.4"; sha256="0axmi41bydkj512jscil9mqz9g6f11khl8hi6fci96wnm9x8gw7s"; depends=[]; };
 citbcmst = derive { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
@@ -2911,7 +2926,7 @@ clickstream = derive { name="clickstream"; version="1.1.5"; sha256="010bf7rxicv4
 clifro = derive { name="clifro"; version="2.4-0"; sha256="1bjsfk4m7hgq8k1mw07zx34ibgmpxjw8sig9jjzsr5mp3v13kwp8"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; };
 climdex_pcic = derive { name="climdex.pcic"; version="1.1-6"; sha256="0dyhqxrma8g4ny4afv6drr885m88q2b8g1n19yy3yjbrbddyz8yl"; depends=[caTools PCICt Rcpp]; };
 clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
-climwin = derive { name="climwin"; version="0.1.0"; sha256="1yfnhqmhq9bbkhq1rygwmv02kczz3qih407sndf5j99hifpm6cfn"; depends=[evd ggplot2 gridExtra lme4 lubridate MuMIn reshape]; };
+climwin = derive { name="climwin"; version="0.1.1"; sha256="0idn3nlnlgm81npxkszgk5fph32z35hcs24a9qkam4j95nk7jfyn"; depends=[evd ggplot2 gridExtra lme4 lubridate MuMIn reshape]; };
 clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
 clinfun = derive { name="clinfun"; version="1.0.10"; sha256="1q69qn7ib0mzpx5cv69fcgflp9rfmys5j33lqdj4b3g1z036bqrr"; depends=[mvtnorm]; };
 clinsig = derive { name="clinsig"; version="1.0-5"; sha256="1jb2qk6hfvms85whymrfpgvjp8pv33fbllpl8jg80yg1ppmg2jcg"; depends=[]; };
@@ -2929,7 +2944,7 @@ clusterGeneration = derive { name="clusterGeneration"; version="1.3.4"; sha256="
 clusterGenomics = derive { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
 clusterPower = derive { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; };
 clusterRepro = derive { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; };
-clusterSEs = derive { name="clusterSEs"; version="2.0.1"; sha256="186916x3dh8cqy2zrqgksdjbka7hrslbdjj0iz3w3lpy9rq761lz"; depends=[AER Formula lmtest mlogit plm sandwich]; };
+clusterSEs = derive { name="clusterSEs"; version="2.1"; sha256="1r1cwnx7kdisq6v9ssr0z270yhfkkq3jyg2rq81l43dx7a6yv04y"; depends=[AER Formula lmtest mlogit plm sandwich]; };
 clusterSim = derive { name="clusterSim"; version="0.44-2"; sha256="1xf3byri6mwlf89n896bxffmf3c6yqqh992npg9sqznx955hcggv"; depends=[ade4 cluster e1071 MASS R2HTML rgl]; };
 clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; };
 clustergas = derive { name="clustergas"; version="1.0"; sha256="1vf4czpwk71yxd26vm5sal0ml20ssjrq4bmk31yzxydpxn495fg8"; depends=[cluster]; };
@@ -2944,7 +2959,7 @@ cmaes = derive { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqa
 cmm = derive { name="cmm"; version="0.8"; sha256="1661v2lzxgf4s37wdsrnbsvqwppcr7mbp70i1xsysfzki1z6xr19"; depends=[]; };
 cmprsk = derive { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; };
 cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrqdjdvddqjd9ps6v205kaw0nqdx30xn96hmm"; depends=[chron]; };
-cmsaf = derive { name="cmsaf"; version="1.4"; sha256="1pdfwsy9cjzikld19dh1fhq16l03wha5pg144wp3j1g78cldyb08"; depends=[fields ncdf4 raster RNetCDF sp]; };
+cmsaf = derive { name="cmsaf"; version="1.5"; sha256="06gmdxiss71qn3gaw4cs3wp0mizyny1ln3ymjlnp6kh3v9vzkjkw"; depends=[fields ncdf4 raster sp]; };
 cmvnorm = derive { name="cmvnorm"; version="1.0-1"; sha256="00cm7zfxbc5md3p6sakan64a6rzz7nbq0bqq9ys2iyxpilxalj3m"; depends=[elliptic emulator]; };
 cna = derive { name="cna"; version="1.0-3"; sha256="1iy0ispazhib30kh5wp3jziiyf0992nrdklrq80n0w3zhjyi21rh"; depends=[]; };
 cncaGUI = derive { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; };
@@ -3071,7 +3086,7 @@ crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q
 crayon = derive { name="crayon"; version="1.3.1"; sha256="0d38fm06h272a8iqlc0d45m2rh36giwqw7mwq4z8hkp4vs975fmm"; depends=[memoise]; };
 crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; };
 crch = derive { name="crch"; version="0.9-0"; sha256="0kd71lv239sn08f3v63k18dxxn6zbk3m0znx2xrmd4a2akrqwjsj"; depends=[Formula ordinal]; };
-credule = derive { name="credule"; version="0.1.2"; sha256="1qzvm2v4p27c58nwkr31s27fyb1hm41qdvyi04jc4jlvwi66747g"; depends=[]; };
+credule = derive { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; };
 crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; };
 crimelinkage = derive { name="crimelinkage"; version="0.0.3"; sha256="018ni9jgnm4k8vybz99drsx8phb0ar3x0raa5ydkfpgqp525sayi"; depends=[geosphere igraph]; };
 crmn = derive { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; };
@@ -3086,7 +3101,7 @@ crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q8
 crrp = derive { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; };
 crrstep = derive { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
 crs = derive { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; };
-crunch = derive { name="crunch"; version="1.3.2"; sha256="021xzhxmid5r9f9c02vkywp498xmgyqcdg0yb20j507dabkbayjr"; depends=[httr jsonlite RCurl]; };
+crunch = derive { name="crunch"; version="1.4.2"; sha256="141m8kmci7fdvi1dzfpgyx5fg435pz4ggsjv972s0n01wjwifp8i"; depends=[curl httr jsonlite]; };
 cruts = derive { name="cruts"; version="0.1"; sha256="0p2iiccjf1414g5xp6rcww58vimh2ahj0ghak1mrjyvgb4q6zgh3"; depends=[lubridate ncdf raster sp stringr]; };
 csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
 csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
@@ -3096,6 +3111,7 @@ csn = derive { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p0
 csrplus = derive { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; };
 cstar = derive { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; };
 csvread = derive { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; };
+ctmm = derive { name="ctmm"; version="0.2.7"; sha256="07dh6ginqp4xj7g2sd27xsxiwwbvdvkpz65kv9kasv6flk9fwy0a"; depends=[expm manipulate MASS Matrix numDeriv raster rgdal sp]; };
 cts = derive { name="cts"; version="1.0-19"; sha256="16f6nah3w63bz8b9xlhi3a7mpkiywq6gqkxgm5am90g0bqg5j3py"; depends=[]; };
 ctv = derive { name="ctv"; version="0.8-1"; sha256="1fmjhh4vr4vcvqg76dzp1avqappsap5piki1ixahikwbwirxcwvw"; depends=[]; };
 cubature = derive { name="cubature"; version="1.1-2"; sha256="1vgyvygg37b6yhy8nkly4w6p01jsqg2kyam4cn0vvml5vjdlc18a"; depends=[]; };
@@ -3118,7 +3134,7 @@ cvplogistic = derive { name="cvplogistic"; version="3.1-0"; sha256="1lm66nn0q766
 cvq2 = derive { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; };
 cvxbiclustr = derive { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; };
 cvxclustr = derive { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; };
-cwhmisc = derive { name="cwhmisc"; version="5.0"; sha256="0b70ssss48kpjyimwm8hwcx82whg77j40qxaaj4vhhqc8d2bzgd2"; depends=[lattice]; };
+cwhmisc = derive { name="cwhmisc"; version="6.0"; sha256="13lgpxl957lbf333m1a17ad8iy3kjfrzav0sxx7w3vnsj98aqa43"; depends=[lattice]; };
 cwm = derive { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; };
 cxxfunplus = derive { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; };
 cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; };
@@ -3192,7 +3208,7 @@ demi = derive { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1
 deming = derive { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; };
 demoKde = derive { name="demoKde"; version="0.9-3"; sha256="1nkvsjms1gfvjz5l7zza0cgx4yqmn2kgnax44pysn0zqmhfny8bw"; depends=[]; };
 demography = derive { name="demography"; version="1.18"; sha256="17r7sz5ikngc4qg495wmn99xawmllpx7rw2gpv8q8bypbc47wlfv"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; };
-dendextend = derive { name="dendextend"; version="1.0.1"; sha256="1q2lhl1h1f9ga3anqcdhzksg8kqri6gwl9a8mjzs8yr17cs51ff6"; depends=[magrittr whisker]; };
+dendextend = derive { name="dendextend"; version="1.1.0"; sha256="0gpxifsfhzdrif33hcsqs462vfrs44q6406w9zipzffywy5i5mvh"; depends=[magrittr whisker]; };
 dendextendRcpp = derive { name="dendextendRcpp"; version="0.6.1"; sha256="125kjlfcj7y282j5g62c6j5hflvwngrm70waxym0lzr7xldwx7bk"; depends=[dendextend Rcpp]; };
 dendroextras = derive { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; };
 dendsort = derive { name="dendsort"; version="0.3.2"; sha256="0qj65jraj6ksmsfsrc4f3y8m7x5lqg9bqc9yb5s3bav2r8qjyhv6"; depends=[]; };
@@ -3207,7 +3223,7 @@ depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6j
 depthTools = derive { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
 dequer = derive { name="dequer"; version="1.0"; sha256="1xf2kl6ppgsplqwhxxyak39575bjijh81snq534yndf31pdqqhd7"; depends=[]; };
 descomponer = derive { name="descomponer"; version="1.2"; sha256="08hc3p4l8dy1h2z8ijifwlgidmac9b29g1k725yzwzbdr5jzvnzl"; depends=[taRifx]; };
-descr = derive { name="descr"; version="1.1.1"; sha256="1flnz05j390izwadsv2l5bcxgl6zmq4vzz1aycfifjz75zyqqy8s"; depends=[xtable]; };
+descr = derive { name="descr"; version="1.1.2"; sha256="1bqr63s2w0gak117506f5v7k9wfj08cn6jy6idw5ii7x6jjh6xx7"; depends=[xtable]; };
 deseasonalize = derive { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; };
 desiR = derive { name="desiR"; version="1.0"; sha256="10c9ld918yg5zgvf40bhlsj2i7w6i08ws26q799w9ma9splgq8sk"; depends=[]; };
 designGG = derive { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; };
@@ -3266,7 +3282,7 @@ displayHTS = derive { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204
 dispmod = derive { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; };
 disposables = derive { name="disposables"; version="1.0.1"; sha256="1gmmf34hq8vm2gjg1560hkarppxmzakymgjbpzbpy2j471kd9s7a"; depends=[]; };
 dissUtils = derive { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; };
-distcomp = derive { name="distcomp"; version="0.25.2"; sha256="1jzsvd4q4pz6gk8a09rq20mzvifpl01d2913hhssdnjqjhaiwy6g"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
+distcomp = derive { name="distcomp"; version="0.25.3"; sha256="1rjgzwh3i17w0r9qdiix88px1ddynkfwwzn78g6s3f8kjksiackn"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
 distfree_cr = derive { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; };
 distillery = derive { name="distillery"; version="1.0-2"; sha256="12m4cacvc18fd3aayc8iih5q6bwsmvf29b55fwp7vs8wp1h8nd8c"; depends=[]; };
 distory = derive { name="distory"; version="1.4.2"; sha256="12j19cb1b4prm8m43gya15kia1ii1k0yy7hkngpn2vsyk7n2z65m"; depends=[ape]; };
@@ -3319,7 +3335,7 @@ dplRCon = derive { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vv
 dplyr = derive { name="dplyr"; version="0.4.2"; sha256="1b0nb7agzb515jrm33sv8yhszsf06d9fga6pgdxi2kwl71vjfrd6"; depends=[assertthat BH DBI lazyeval magrittr R6 Rcpp]; };
 dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[cluster oro_nifti]; };
 dpmr = derive { name="dpmr"; version="0.1.7-1"; sha256="0nh45hg9za9w4w4syrrg54s1fpn6iikv431qkdjyinv8y1a3klga"; depends=[digest httr jsonlite magrittr rio]; };
-dr = derive { name="dr"; version="3.0.9"; sha256="0gmxa5mbmkz54l75ss6kj5ka5kingf02pqj0xsfjxfv0311hwm52"; depends=[MASS]; };
+dr = derive { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; };
 drat = derive { name="drat"; version="0.0.4"; sha256="0pq74a0f1pkgfzgrh0r2xa2xkgxbanp8a5v13bmma09ghy5vnrhm"; depends=[]; };
 drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
 drc = derive { name="drc"; version="2.5-12"; sha256="1gw78n0w262wl6mdm5wvyp3f0hvrb2kj714acdxz84h2znxr9879"; depends=[car gtools MASS multcomp plotrix scales]; };
@@ -3333,11 +3349,12 @@ ds = derive { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9n
 dsample = derive { name="dsample"; version="0.91.1.5"; sha256="02ksm4d9ybz4w7j3c9rjqh262k6rqs1bdhj3p7w5rcaskpc6qz9s"; depends=[]; };
 dse = derive { name="dse"; version="2014.11-1"; sha256="0fl1av8zd0csbsk6fplcxgqsb50qr1baasw2jrqv6h83j2xwph2l"; depends=[setRNG tfplot tframe]; };
 dslice = derive { name="dslice"; version="1.1.4"; sha256="0srqw1kznbjl1v6dpgh7vsrpf9k3zj7j55zw9k50jsbw2z4xqzfw"; depends=[ggplot2 Rcpp scales]; };
-dsm = derive { name="dsm"; version="2.2.5"; sha256="0sfsfzcsqnvjkc5l7h5xq8p2jsgwxfzds75sqs58a0kzagcm1b05"; depends=[ggplot2 mgcv mrds nlme statmod]; };
+dsm = derive { name="dsm"; version="2.2.9"; sha256="147c94bk73ss7bcliz4a65zx0lhf3gap9ygcc82yvf7sibpasnqd"; depends=[ggplot2 mgcv mrds nlme statmod]; };
 dst = derive { name="dst"; version="0.3"; sha256="1gdf4sjk2svywx2m6z22d383xppsm6dm108w93pcwfs8fpcdwxb9"; depends=[]; };
 dti = derive { name="dti"; version="1.2-0.1"; sha256="09ad7mwa53dk1jlddkql3wm1s2diyqij7prd5klh59j21kvkf0hy"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; };
 dtt = derive { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
 dtw = derive { name="dtw"; version="1.17-1"; sha256="0kbf38a14k112vdi7yaql18w0sj694smlm6pmdw5q4sqpk7azhqg"; depends=[proxy]; };
+dtwclust = derive { name="dtwclust"; version="0.1.0"; sha256="0q0d9qnppj6wdc5dlic7x53dpn7l99lrmkbhwkhdj4w1mcbsg9v0"; depends=[caTools dtw flexclust ggplot2 modeltools proxy reshape2]; };
 dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; };
 dummies = derive { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
 dummy = derive { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; };
@@ -3359,7 +3376,7 @@ dynlm = derive { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4
 dynpred = derive { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; };
 dynsim = derive { name="dynsim"; version="1.2"; sha256="0vd08mdv7yklhy5rqmhji0ff9284n2z15a3ij4ylw7a0hzlyp2m3"; depends=[ggplot2 gridExtra MASS]; };
 dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
-e1071 = derive { name="e1071"; version="1.6-6"; sha256="1620w29mlx12kb93nxags1zgz628isr75f1q2ffn9mxsw13cc5d2"; depends=[class]; };
+e1071 = derive { name="e1071"; version="1.6-7"; sha256="1069qwj9gsjq6par2cgfah8nn5x2w38830761x1f7mqpmk0gnj3h"; depends=[class]; };
 eHOF = derive { name="eHOF"; version="1.5.9"; sha256="187c85fp7q63ipqd3qzivlv9asm9zc49rvw33j39js03mak4r0d2"; depends=[lattice mgcv]; };
 eRm = derive { name="eRm"; version="0.15-5"; sha256="0g4avcr709brvzcbmqmq35c7zvgx1hkf5nq6djsprzkgvh6rznjn"; depends=[lattice MASS Matrix]; };
 eVenn = derive { name="eVenn"; version="2.2"; sha256="0k6m61z902spxxrc38504l73h022w5v74g39h4azd1ibr35yrl7j"; depends=[]; };
@@ -3487,7 +3504,7 @@ eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid
 evir = derive { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; };
 evmix = derive { name="evmix"; version="2.6"; sha256="1rc52mqmzl05n5n1lr990czqgpq9h2x8shnv6s7hvr8896kjasjm"; depends=[gsl MASS SparseM]; };
 evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[ape geiger seqinr stringr taxize]; };
-evolqg = derive { name="evolqg"; version="0.1-5"; sha256="1s9jh14ycymlajc285cczr9m529vv6la4bkv0lgk3dc0557m7q5w"; depends=[ape ggplot2 magrittr mvtnorm phytools plyr Rcpp reshape2 tidyr vegan]; };
+evolqg = derive { name="evolqg"; version="0.1-6"; sha256="1n37cvngaw5sqfw71k7kysxp848p6d4cir46959cqj9q3yvgffvc"; depends=[ape ggplot2 magrittr Matrix mvtnorm phytools plyr Rcpp reshape2 tidyr vegan]; };
 evolvability = derive { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
 evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
 evtree = derive { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; };
@@ -3560,7 +3577,7 @@ faoutlier = derive { name="faoutlier"; version="0.5"; sha256="1via1gggcj6cpdkyn6
 far = derive { name="far"; version="0.6-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; };
 faraway = derive { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16v8gcwsbmn8a7p4gb0mm98dncyin5p2a3"; depends=[]; };
 farsi = derive { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; };
-fast = derive { name="fast"; version="0.63"; sha256="00ag9d0dwn9al104y93m8dclbjqabr9liif8gr19v3gv6k2k6p2c"; depends=[zoo]; };
+fast = derive { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; };
 fastGHQuad = derive { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp]; };
 fastHICA = derive { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; };
 fastICA = derive { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wji85bvji7nayjvkfp07hyaxq9d15jmf0r"; depends=[]; };
@@ -3580,7 +3597,7 @@ fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0
 fbroc = derive { name="fbroc"; version="0.2.1"; sha256="06qpdnh86klkbwiv593l57wnbamrmcj5ysabyrbjf9mr8mjzhkkj"; depends=[ggplot2 Rcpp]; };
 fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; };
 fclust = derive { name="fclust"; version="1.1.1"; sha256="0gxgyvz6nzqp5sdjhfdjmm3r4lf1b4min3s5rfddwdqiswzxg8m8"; depends=[]; };
-fcros = derive { name="fcros"; version="1.3"; sha256="1ylkma69gfc5ij3vvf1axyasya31qm5bwj2bjlvj12byf52wsiy8"; depends=[]; };
+fcros = derive { name="fcros"; version="1.4"; sha256="0bawzzyx4512kyvd44dgnswpxgilmzz5xf2bmrnfapc9p4xcfjfw"; depends=[]; };
 fda = derive { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; };
 fda_usc = derive { name="fda.usc"; version="1.2.1"; sha256="1w0dw06vgviia4yy2v5mrq0jvnfvdp7y8f2x246v3xliqgjmg7as"; depends=[fda MASS mgcv rpart]; };
 fdaMixed = derive { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp RcppArmadillo]; };
@@ -3651,12 +3668,12 @@ fontcm = derive { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0
 foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; };
 forams = derive { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; };
 foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; };
-forecTheta = derive { name="forecTheta"; version="1.0"; sha256="1ip6l27d37xqnmg8w285lq1y5j6akrjrviq4338c8sq075d8hckn"; depends=[forecast]; };
+forecTheta = derive { name="forecTheta"; version="1.1"; sha256="0cp582mwi9jf8nnb4p4hvzy86w8q12js3i8rp0gaq2xhm36w6v02"; depends=[forecast]; };
 forecast = derive { name="forecast"; version="6.1"; sha256="1hwv3arcpkkhpj5n2dvpw2fyx687b6x6yakxx55cw9rrka70rx1k"; depends=[colorspace fracdiff nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
 foreign = derive { name="foreign"; version="0.8-65"; sha256="03zg48vjqqcq9ri4a53czpyp82hml409g2rmdnmbfw8c1isdqacf"; depends=[]; };
 forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; };
 forensim = derive { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
-forestFloor = derive { name="forestFloor"; version="1.5"; sha256="1cpgjj2p4j14h2ks586nq8426k9nlnnwhnxniaack33rdy3axbdp"; depends=[kknn Rcpp rgl trimTrees]; };
+forestFloor = derive { name="forestFloor"; version="1.8.3"; sha256="1qxlkalq49ww290hz3dh4ha10qclaqbki063g2nxinrj4sqapap1"; depends=[ggplot2 gridExtra kknn Rcpp rgl]; };
 forestplot = derive { name="forestplot"; version="1.1"; sha256="1h28lwqdizs450bm5hb8zfbmx633n8v5bj2p8mi4cl814sjjylr0"; depends=[]; };
 formatR = derive { name="formatR"; version="1.2"; sha256="0dlj728qdm7wmxcxvw1ip64pl4ajgmi8ax69zafrn3306pg9y136"; depends=[]; };
 formula_tools = derive { name="formula.tools"; version="1.5.4"; sha256="1qs7ls757qvh5gdkx32zslgpx1a4zk2vf8bbgjdax02jmlyp2qrp"; depends=[operator_tools]; };
@@ -3696,7 +3713,7 @@ fslr = derive { name="fslr"; version="1.4.4"; sha256="0k6973hd1q54q6243lir4xi3wl
 fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; };
 ftnonpar = derive { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
 fts = derive { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[BH zoo]; };
-ftsa = derive { name="ftsa"; version="4.3"; sha256="0hf3v83a5mh6s8y3hhvnwqmj55n707c8lgkpmxlc52gxykgnayjz"; depends=[colorspace forecast MASS pcaPP rainbow]; };
+ftsa = derive { name="ftsa"; version="4.4"; sha256="1nj1m1asvhp8x9cdi9ywk94yhh0x12crqp2hs1rw5fdfw8w6k0xy"; depends=[colorspace fda forecast MASS pcaPP rainbow sde]; };
 fueleconomy = derive { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; };
 fugeR = derive { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; };
 fun = derive { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; };
@@ -3805,6 +3822,7 @@ genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1j
 gendata = derive { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; };
 gender = derive { name="gender"; version="0.4.3"; sha256="0dhwhv2b86arpmyr89g69h8ikw0f2x27ig420jngfb9gxljj9phc"; depends=[devtools dplyr httr jsonlite]; };
 genderizeR = derive { name="genderizeR"; version="1.2.0"; sha256="1a7vafspdd64wr47k1z391ff1ri5f8bynlgn876khcxzhm2vwdva"; depends=[data_table httr magrittr stringr tm]; };
+gendist = derive { name="gendist"; version="1.0"; sha256="0n3ax7iy40ymrxhmb88w31a4aacaps9f1iild42afin7i7vy4dq9"; depends=[]; };
 geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
 geneSignatureFinder = derive { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; };
 genepi = derive { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
@@ -3848,12 +3866,12 @@ ggenealogy = derive { name="ggenealogy"; version="0.1.0"; sha256="0shy6ylrx49ycc
 gglasso = derive { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; };
 ggm = derive { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; };
 ggmap = derive { name="ggmap"; version="2.4"; sha256="06mdczacjnlzyr5sm1d099sqyf6anhlnn2bnjxni8h36100m5nm2"; depends=[digest geosphere ggplot2 jpeg mapproj plyr png proto reshape2 RgoogleMaps rjson scales]; };
-ggmcmc = derive { name="ggmcmc"; version="0.6"; sha256="12z0six1swpmisbm8x9a9dk19cd0f9yvzm92gc9qs484ihpcscvq"; depends=[dplyr ggplot2 tidyr]; };
+ggmcmc = derive { name="ggmcmc"; version="0.7.1"; sha256="00knrahhl1bbhgz04qyc9bk992k9x4axdd25kpx39jrr5rzz9b2r"; depends=[dplyr GGally ggplot2 tidyr]; };
 ggparallel = derive { name="ggparallel"; version="0.1.1"; sha256="1z8w4bm4ahmmwbr87qlqhm8jlrqf7dhdvm1cf0xrwjlkmy6dqjvg"; depends=[ggplot2 plyr reshape2]; };
 ggplot2 = derive { name="ggplot2"; version="1.0.1"; sha256="0794kjqi3lrxb33lr1mykd58959hlgkhdn259vj8fxrh65mqw920"; depends=[digest gtable MASS plyr proto reshape2 scales]; };
 ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; };
 ggswissmaps = derive { name="ggswissmaps"; version="0.0.2"; sha256="1cl8m9j3d2kf8dbpq09q36v7nwkgz7khqds431l0kmkzq02qhddf"; depends=[ggplot2]; };
-ggtern = derive { name="ggtern"; version="1.0.5.0"; sha256="0ykgz3268381glkrv1gbn9qnyrkxsmihc3srv8zrldbq18zbr0a8"; depends=[ggplot2 gtable MASS plyr proto reshape2 scales sp]; };
+ggtern = derive { name="ggtern"; version="1.0.6.0"; sha256="10aiicvr2vklajmcacpa9ki30hvqjr8y9150mfx6fyqhk8c2r6kl"; depends=[ggplot2 gtable MASS plyr polyclip proto reshape2 scales sp]; };
 ggthemes = derive { name="ggthemes"; version="2.2.1"; sha256="0d6h3ymxwxcii95wggxmyvihnwsl85nlqja2ac34dsfwlv75cc16"; depends=[colorspace ggplot2 proto scales]; };
 ggvis = derive { name="ggvis"; version="0.4.2"; sha256="07arzhczvh2sgqv9h30n32s6l2a3rc98rid2fpz6kp7vlin2pk1g"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
 ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[gplots numDeriv]; };
@@ -3911,6 +3929,7 @@ gof = derive { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp
 goft = derive { name="goft"; version="1.1"; sha256="19mb2i2iri09v2dgkyl1ral2m7bzyizncnz24niwg13afpwbq12h"; depends=[gPdtest mvShapiroTest]; };
 goftest = derive { name="goftest"; version="1.0-3"; sha256="0rwz8y23dsklwvmd4sxq0bcklsa7l47lbs5lkcdn58jsdzm7bfrq"; depends=[]; };
 gogarch = derive { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; };
+googlePublicData = derive { name="googlePublicData"; version="0.15.7.28"; sha256="1bkfj88rn8ai0kbjbd0s3zih6iz018xybr13w2h9i6wdi3dhs75s"; depends=[XLConnect XML]; };
 googleVis = derive { name="googleVis"; version="0.5.9"; sha256="0r182x6ccpdqkgqmqf26lvajhw954vqzm4bnyvpqif57nnzw4zpx"; depends=[RJSONIO]; };
 googlesheets = derive { name="googlesheets"; version="0.1.0"; sha256="0c3a521i2nw5v6ydz0ci7vbxlzfv3bh39yi7njah25zfbxjgm751"; depends=[cellranger dplyr ggplot2 httr plyr stringr tidyr XML xml2]; };
 goric = derive { name="goric"; version="0.0-8"; sha256="0ayac0yfkxrl13ckc2pwfqnmsrhmbg5bi6iwzx0fmh81vrlp0zrm"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
@@ -3983,10 +4002,10 @@ gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz
 gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; };
 gwrr = derive { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
 h2o = derive { name="h2o"; version="3.0.0.30"; sha256="052m7ba4wgmvbx7bc1d449896ipj7gsgvw2lr07xlbs1zlqadak2"; depends=[RCurl rjson statmod]; };
-h5 = derive { name="h5"; version="0.9.1"; sha256="1q20i5hnfzr88kb63yvvgn7z39cvk514fj2770i29lm71jdph00q"; depends=[Rcpp]; };
+h5 = derive { name="h5"; version="0.9.2"; sha256="1fsd4wgks9xlyyrmfc8pcs81a7b6wpfcshyf41lr7sncsvbzs0cd"; depends=[Rcpp]; };
 hSDM = derive { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; };
 haarfisz = derive { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
-hamlet = derive { name="hamlet"; version="0.7"; sha256="0f3gl5xvgdksaxk76dyv46hahc41f2j3pf9wp0rc0q7wpp5nfsjl"; depends=[]; };
+hamlet = derive { name="hamlet"; version="0.9.4"; sha256="0x8g7fxbns41zrlr4cmq6d523bajyny9kd4846lx2lma1q2jrn4s"; depends=[]; };
 hapassoc = derive { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; };
 haplo_ccs = derive { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; };
 haplo_stats = derive { name="haplo.stats"; version="1.6.11"; sha256="0j3zh4n2rly8dij8srm8ck6fl63haw6d27m3nfnrxywr87pljg14"; depends=[]; };
@@ -4088,7 +4107,7 @@ htmlwidgets = derive { name="htmlwidgets"; version="0.5"; sha256="1d583kk7g29r4s
 hts = derive { name="hts"; version="4.5"; sha256="1bjribmfczkx139z73b0cl3lzlw5n2byyyc5inqv9qgayz0dc6cp"; depends=[forecast Matrix Rcpp RcppEigen SparseM]; };
 httk = derive { name="httk"; version="1.2"; sha256="016njh1cm21bmdrn94cbsmf36gzcwfg21bqp8nl100qb16d6yqq6"; depends=[deSolve msm]; };
 httpRequest = derive { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
-httpuv = derive { name="httpuv"; version="1.3.2"; sha256="0vp3bz1nxi0ladlgi1r6wd480y0m2m0gsba2hrs73s9b8afrfh6v"; depends=[Rcpp]; };
+httpuv = derive { name="httpuv"; version="1.3.3"; sha256="0aibs0hf38n8f6xxx4g2i2lzd6l5h92m5pscx2z834sdvhnladxv"; depends=[Rcpp]; };
 httr = derive { name="httr"; version="1.0.0"; sha256="1yprw8p4g8026jhravgg1hdwj1g51cpdgycyr5a58jwm4i5f79cq"; depends=[curl digest jsonlite mime R6 stringr]; };
 huge = derive { name="huge"; version="1.2.6"; sha256="11njfd4i8q950apga6sdk84p4wk4qvp8bpg6yz9lgjrgj2hn14n2"; depends=[igraph lattice MASS Matrix]; };
 humanFormat = derive { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; };
@@ -4212,6 +4231,7 @@ investr = derive { name="investr"; version="1.3.0"; sha256="057wq6c5r7hrg1nz7460
 io = derive { name="io"; version="0.2.2"; sha256="07vifr1h8ldiam8ngp6yrx6mvdnmmnnsq3hcs2pyphws6hgdmwwh"; depends=[filenamer stringr]; };
 ionflows = derive { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; };
 iosmooth = derive { name="iosmooth"; version="0.91"; sha256="03kyzhcl5lipaiajs53dc8jaazxv877nl0njbq88cp4af3gd6s82"; depends=[]; };
+iotools = derive { name="iotools"; version="0.1-12"; sha256="1b2crnhx84h1gp10sy2mkhi9vylp9z97ld16jijddzlf4v23bmlx"; depends=[]; };
 ipdmeta = derive { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; };
 ipdw = derive { name="ipdw"; version="0.2-2"; sha256="1mvxs1039hv9m36jhi11qvjysmpmh7ms522q9phwmljv2nnl7ylz"; depends=[gdistance raster sp]; };
 ipfp = derive { name="ipfp"; version="1.0"; sha256="1hpfbgygnpnl3fpx7zl728jyw00y3kbbc5f0d407phm56sfqmqwi"; depends=[]; };
@@ -4249,7 +4269,7 @@ itsmr = derive { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8
 ivbma = derive { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1klxxwymml63qnrq6a6fia3ck9kk9"; depends=[]; };
 ivfixed = derive { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; };
 ivlewbel = derive { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm lmtest plyr]; };
-ivmodel = derive { name="ivmodel"; version="1.0"; sha256="14ic49vyikx5fiz2ccjmd53f0vcg3jh3fs6fqhl8w3hm9z9x4qvz"; depends=[Matrix]; };
+ivmodel = derive { name="ivmodel"; version="1.1"; sha256="18hq667ls552vq59dhirx5q9ky252p3cjvkhm3d017bdpi3m1hq5"; depends=[Matrix]; };
 ivpack = derive { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; };
 ivpanel = derive { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; };
 ivprobit = derive { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; };
@@ -4284,14 +4304,14 @@ kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53
 kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
 kergp = derive { name="kergp"; version="0.1.0"; sha256="00p3iziz6kjm1v7rpqa2lls1xgp2w3q754mj1x6bj24kx69xpc7g"; depends=[MASS numDeriv Rcpp testthat]; };
 kernelFactory = derive { name="kernelFactory"; version="0.2.2"; sha256="1ms6732s17vx120xr2l423qmj0h880r522zsgp474pq3fxc0mr48"; depends=[AUC genalg kernlab randomForest]; };
-kernlab = derive { name="kernlab"; version="0.9-20"; sha256="0gwl3v8gxidzfmvwa2icqla8ypdgnmvcwxf54iwrvvy2csjx0w27"; depends=[]; };
+kernlab = derive { name="kernlab"; version="0.9-22"; sha256="1k0f8kwc3rncdfccqfs42670lkxx53vrcal0jk3nybsyl37jza8x"; depends=[]; };
 keypress = derive { name="keypress"; version="1.0.0"; sha256="16msbanmbv2kf09qvl8bd9rf1vr7xgcjzjhzngyfyxv90va3k86b"; depends=[]; };
 kfigr = derive { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; };
 kimisc = derive { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; };
 kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj87klwm6h7cdqi61ba6y0cg9k1hgbc1ajy3s8"; depends=[survival]; };
 kineticF = derive { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; };
 kinfit = derive { name="kinfit"; version="1.1.14"; sha256="0gb43pghgllb9gzh8jzzpfmc46snv02ln4g3yqsdah3cyqnck0ih"; depends=[]; };
-kinship2 = derive { name="kinship2"; version="1.6.0"; sha256="06f544yk61i1xq0rm0r5gpzwfl6rvzyg7gz8z86bjyxg0z44h3vy"; depends=[Matrix quadprog]; };
+kinship2 = derive { name="kinship2"; version="1.6.4"; sha256="19r3y5as83nzk922hi4fkpp86gbqxdg1bgng798g1b073bp6m9yj"; depends=[Matrix quadprog]; };
 kintone = derive { name="kintone"; version="0.1.1"; sha256="13c82vkapks9j2crrb4awnhl60ld8b1r7xmy9yv4zzch868kcl5g"; depends=[RCurl rjson]; };
 kissmig = derive { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; };
 kitagawa = derive { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; };
@@ -4410,7 +4430,7 @@ lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypd
 lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; };
 libamtrack = derive { name="libamtrack"; version="0.6.2"; sha256="1wmy3baqbmmzc4w1b3w2z3qvsi61khl6a6rlc22i58gnprmgzrph"; depends=[]; };
 lifecontingencies = derive { name="lifecontingencies"; version="1.1.9"; sha256="1cl1jv0a9016vpqa5an3fh716hciyk7knbfg4gd7hvixg1y1avgd"; depends=[markovchain Rcpp]; };
-liftr = derive { name="liftr"; version="0.1"; sha256="0kmkyxp28n3ha1iic97bdd2czfmqbbn2dnjwffs29xjcs32m9z9s"; depends=[knitr rmarkdown yaml]; };
+liftr = derive { name="liftr"; version="0.2"; sha256="019q619fy7l81d68bk8pwf4x6073zzvhvngkw636k28mqi9qiphj"; depends=[knitr rmarkdown stringr yaml]; };
 likeLTD = derive { name="likeLTD"; version="5.5.0"; sha256="111wdszkk2bdi9sz6gfih32kib0ig9bp4xlq6wl5r5zx3nrlj5zb"; depends=[DEoptim gdata ggplot2 gtools rtf]; };
 likelihood = derive { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; };
 likelihoodAsy = derive { name="likelihoodAsy"; version="0.40"; sha256="1zgqs9pcsb45s414kqbhvsb9cxag0imla682981lqvrbli13p2kg"; depends=[alabama cond nleqslv pracma Rsolnp]; };
@@ -4524,6 +4544,7 @@ ltsk = derive { name="ltsk"; version="1.0.3"; sha256="17l4mwggd4s39l6x1b6gvwgd6g
 lubridate = derive { name="lubridate"; version="1.3.3"; sha256="1f07z3f90vbghsarwjzn2nj6qz8qyfkqalszx8cb5kliijdkwy8z"; depends=[memoise plyr stringr]; };
 luca = derive { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[genetics survival]; };
 lucid = derive { name="lucid"; version="1.3"; sha256="018vp4xibxr7aanffcvhmppsh7vjsjrqqc41iavyasjbamj3hyck"; depends=[nlme]; };
+lulcc = derive { name="lulcc"; version="1.0.0"; sha256="0a7j08211831hddnngm83lz3a8gr2bq5azadgsdv7cwabg79msk2"; depends=[lattice raster rasterVis ROCR]; };
 lunar = derive { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
 lvm4net = derive { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; };
 lxb = derive { name="lxb"; version="1.3"; sha256="0mvjk0s9bzvznjy0cxjsqv28f6jjzvr713b2346ym4cm0y4l3mir"; depends=[]; };
@@ -4554,12 +4575,12 @@ manifestoR = derive { name="manifestoR"; version="1.0-4"; sha256="0c908d35hja6fb
 manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
 mapDK = derive { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; };
 mapStats = derive { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; };
-mapdata = derive { name="mapdata"; version="2.2-4"; sha256="1x92nshzhfm9y0wx9m616f3663kfavdvfz8hm7xrywsj7pkd78gz"; depends=[maps]; };
+mapdata = derive { name="mapdata"; version="2.2-5"; sha256="0pl4k7lxmyg96h2i8mwdqgwq5ff1v08g54dig5zmqn9wi71y6nl9"; depends=[maps]; };
 mapfit = derive { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
 mapmisc = derive { name="mapmisc"; version="1.3.2"; sha256="1da2mqjwr4fb1gapd575fg2yjidddqqkra2ki9iqlkanh9jn4iwi"; depends=[raster sp]; };
 mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
-mapproj = derive { name="mapproj"; version="1.2-3"; sha256="0ssc47qpfpr8gvmwpsm9vn1j7fg0zzcs0cw7q73mjjswjx1vzwvj"; depends=[maps]; };
-maps = derive { name="maps"; version="2.3-10"; sha256="0jqima0c7v655bknps8dbdcpmw36nc3vaqnw142jkrcwrm4dzjy5"; depends=[]; };
+mapproj = derive { name="mapproj"; version="1.2-4"; sha256="1sywwzdikpnkzygb2jx9c67sgrykgbkm39dkf45clz3yylsib2ng"; depends=[maps]; };
+maps = derive { name="maps"; version="2.3-11"; sha256="0752dh646bngw726941p0xd3p9chxlg4mdyns3jc23h68w7da0kc"; depends=[]; };
 maptools = derive { name="maptools"; version="0.8-36"; sha256="0064b9qqv7241298dswv5kkkqf6y2iyn7dhjcyvfkqn4kvc9g2m8"; depends=[foreign lattice sp]; };
 maptpx = derive { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
 maptree = derive { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
@@ -4569,7 +4590,7 @@ marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9p
 markdown = derive { name="markdown"; version="0.7.7"; sha256="00j1hlib3il50azs2vlcyhi0bjpx1r50mxr9w9dl5g1bwjjc71hb"; depends=[mime]; };
 marked = derive { name="marked"; version="1.1.8"; sha256="1xsg0iy8mcy9b98bxmjr3y413xwblbhks3fcydbvjnry0k03gd5i"; depends=[coda expm ggplot2 lme4 Matrix numDeriv optimx plyr R2admb Rcpp truncnorm]; };
 markophylo = derive { name="markophylo"; version="1.0.1"; sha256="17lzmjb34ky0y5hjijfxhxnry0b3vrmfs0q9iyd293wngmjs6r0s"; depends=[Rcpp RcppArmadillo]; };
-markovchain = derive { name="markovchain"; version="0.3.1"; sha256="067rib4sxcqq8wwf139x6k4b37caw1wslv0lbss9nzwhv50bxgvd"; depends=[expm igraph matlab Matrix MultinomialCI Rcpp RcppArmadillo RcppParallel]; };
+markovchain = derive { name="markovchain"; version="0.4"; sha256="0pg51inyp9b62dnw3855hvvcn1svapdxc5wfgf2zz9ysyzvcipfy"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
 marl = derive { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
 marmap = derive { name="marmap"; version="0.9.2"; sha256="1csi6v6z2p3nmyqwy8bmbj036693rzmxrc317g0a45gsqxggp3n4"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf plotrix raster reshape2 RSQLite shape sp]; };
 marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
@@ -4606,7 +4627,7 @@ mclogit = derive { name="mclogit"; version="0.3-1"; sha256="0zyms6v9qjh6a5ccahfa
 mclust = derive { name="mclust"; version="5.0.2"; sha256="1ilhgiigrnvw5l85vk54xdvlirqhp5wb404i0mh2jyzccr9pjml5"; depends=[]; };
 mcmc = derive { name="mcmc"; version="0.9-4"; sha256="1ws80j64df8inzz0a6k8r51wf44zwjnpvp591pxwah2jbi6j6kna"; depends=[]; };
 mcmcplots = derive { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; };
-mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; };
+mcmcse = derive { name="mcmcse"; version="1.1-1"; sha256="0swbdp444ixg0lda8f0az612573md53vj4xg156zdb612gf8x4dv"; depends=[ellipse Rcpp RcppArmadillo]; };
 mco = derive { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; };
 mcprofile = derive { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 mvtnorm quadprog]; };
 mcr = derive { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; };
@@ -4694,7 +4715,7 @@ minpack_lm = derive { name="minpack.lm"; version="1.1-8"; sha256="0nvsxqwg3k9k3d
 minqa = derive { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp]; };
 minque = derive { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; };
 minxent = derive { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
-mipfp = derive { name="mipfp"; version="2.0"; sha256="1sh33lgvq31nk8vkl9p195v4z3whv2c1fc7bnhc8wxgglm6vc126"; depends=[cmm numDeriv Rsolnp]; };
+mipfp = derive { name="mipfp"; version="2.2"; sha256="02jy32kbrfjb38q1jwm07yp0irsbq5hk3r3bsqrvwm6vlg6rxalz"; depends=[cmm numDeriv Rsolnp]; };
 mirt = derive { name="mirt"; version="1.10"; sha256="0bylba0z8g9kx3idfpzf3qbw7pgjvpd8d1vx930nr02vhv3c3cms"; depends=[GPArotation lattice mgcv numDeriv Rcpp sfsmisc]; };
 mirtCAT = derive { name="mirtCAT"; version="0.5"; sha256="0lv4dxpby3izmh3avl70i0iiaj8rz1fpb666cwga5590ks7rq4lr"; depends=[lattice markdown mirt Rcpp RcppArmadillo shiny]; };
 misc3d = derive { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
@@ -4710,8 +4731,8 @@ mistral = derive { name="mistral"; version="1.1-1"; sha256="19zkc5ddjzw17y70x3l6
 mitml = derive { name="mitml"; version="0.2-3"; sha256="063nc32sgzg2q85fbxmxqch7yyf0fhl8rng83mnqbr9fjy1gxdnm"; depends=[haven pan]; };
 mitools = derive { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; };
 mix = derive { name="mix"; version="1.0-9"; sha256="08729y6ih3yixcc4a6m8fszg6pjc0s02iq47339b9gj16p82b74z"; depends=[]; };
-mixAK = derive { name="mixAK"; version="4.1-1"; sha256="0y9p9ixa5kps48snvkmyj7b8lmgb8cqrrzp0idh5g06kgriqcn1k"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
-mixOmics = derive { name="mixOmics"; version="5.0-4"; sha256="020cy0x7qf6x7lb1aqfr6qflf08k2phnygcjr7lq4z8q9v502qyh"; depends=[igraph lattice MASS pheatmap RGCCA rgl]; };
+mixAK = derive { name="mixAK"; version="4.2"; sha256="0z96ddlvkpr4y2chi929ik81snsr0f03a0k4cnh0q1lx0lr51p1z"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
+mixOmics = derive { name="mixOmics"; version="5.1.1"; sha256="1kkpww3x782h3zklfspzc8dkr40qnk4wrp0yqkx803svynsdr83a"; depends=[ellipse ggplot2 igraph lattice MASS pheatmap rgl]; };
 mixPHM = derive { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; };
 mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
 mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
@@ -4720,7 +4741,6 @@ mixedMem = derive { name="mixedMem"; version="1.0.2"; sha256="1nlnlww2xbmlifcp9l
 mixer = derive { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; };
 mixexp = derive { name="mixexp"; version="1.2.1"; sha256="0yjsngr2akj2hhl1hav2kkp8w0g4775qvnbzypa3c1fmx8kf1xvw"; depends=[daewr gdata lattice]; };
 mixlm = derive { name="mixlm"; version="1.0.9.2"; sha256="1rh2sj5h9h4rmv7vqa87jbbln1mz6h0hb3gv3g99zcmazbd18k75"; depends=[car leaps lme4 multcomp pls pracma]; };
-mixlow = derive { name="mixlow"; version="1.0.1"; sha256="12vnp3gl3ykxzgvc4bwhi4flmc1sl2y77yi0zi4by17q93a49akm"; depends=[nlme]; };
 mixor = derive { name="mixor"; version="1.0.2"; sha256="1xkwgk4dvjbpqvvbrb8yb88iz4nkv7sykxaygjq7zfcdrdivxz6n"; depends=[]; };
 mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; };
 mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; };
@@ -4814,7 +4834,7 @@ mppa = derive { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrc
 mpt = derive { name="mpt"; version="0.5-1"; sha256="1b6n7kivkj4ndcc27jmznx9dh40kvjjk7hfxh21kmnknl5ap4ffb"; depends=[]; };
 mra = derive { name="mra"; version="2.16.4"; sha256="134fw4bv34bycgia58z238acj7kb8jkw51pjfa2cwprrgsjdpf5g"; depends=[]; };
 mratios = derive { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; };
-mrds = derive { name="mrds"; version="2.1.12"; sha256="1v7lv3ssg9m8bx2gskzf31lkg3sxsdkvknrdx9aawdh3mzxwcys7"; depends=[mgcv optimx Rsolnp]; };
+mrds = derive { name="mrds"; version="2.1.14"; sha256="0lvr9zqyi45a100w31k228b03plna24rzgamsvfa34inyd8q4y9m"; depends=[mgcv numDeriv optimx Rsolnp]; };
 mreg = derive { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
 mri = derive { name="mri"; version="0.1.1"; sha256="07lqr9fv0nqd626jpqa6x1qxf85r1j4r5brv760dll1p2kl060gw"; depends=[]; };
 mritc = derive { name="mritc"; version="0.5-0"; sha256="1344x7gc7wvmcqp0sydppavavvps5v7bs0dza2fr8rz3sn4as8sa"; depends=[lattice misc3d oro_nifti]; };
@@ -4840,7 +4860,7 @@ muStat = derive { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9w
 muhaz = derive { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; };
 muir = derive { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; };
 multcomp = derive { name="multcomp"; version="1.4-1"; sha256="07zvpdiphn9ndvhvblnd2li2a70j8igscd685s5mslbx5rqppv3k"; depends=[codetools mvtnorm sandwich survival TH_data]; };
-multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; };
+multcompView = derive { name="multcompView"; version="0.1-7"; sha256="18gfn3dxgfzjs13l039l2xdkkf10fapjjhxzjx76k0iac06i1p7i"; depends=[]; };
 multgee = derive { name="multgee"; version="1.5.1"; sha256="1ycbbri26hahbi3q4mrsyhrh9bwj89dyv6gvrpx58ghrlsnakjy1"; depends=[gnm VGAM]; };
 multiAssetOptions = derive { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; };
 multiDimBio = derive { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 MASS misc3d pcaMethods RColorBrewer]; };
@@ -4905,7 +4925,7 @@ mvtsplot = derive { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw
 mwa = derive { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; };
 mwaved = derive { name="mwaved"; version="1.1.1"; sha256="1hn6nbwawkizv9v4k98hm5lz94yha2fng76x0r9f804whmv1pz36"; depends=[Rcpp shiny]; };
 mxkssd = derive { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
-myTAI = derive { name="myTAI"; version="0.2.1"; sha256="0c4wx9x9v3hsc8h3wi0di5inr7r5lls6l0ljk42ry5i6l639n833"; depends=[doParallel dplyr edgeR fitdistrplus foreach nortest RColorBrewer Rcpp taxize]; };
+myTAI = derive { name="myTAI"; version="0.3.0"; sha256="0j0wdc7p98h14l51f0mgl6k7ns8fb93y12z7mjik4dpakzsanl68"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 nortest RColorBrewer Rcpp reshape2 taxize]; };
 mycobacrvR = derive { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
 mycor = derive { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; };
 myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
@@ -4982,9 +5002,9 @@ nloptr = derive { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrb
 nlreg = derive { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; };
 nls2 = derive { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; };
 nlsMicrobio = derive { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; };
-nlsem = derive { name="nlsem"; version="0.3"; sha256="1lpp6f6nby1rzxv7hrqnm4qbwj406g9ls9jmidb8rqgy177sk4w6"; depends=[gaussquad mvtnorm nlme]; };
+nlsem = derive { name="nlsem"; version="0.4.1"; sha256="11i1dma87bx55dhqb8j9ccc7cg3qc9ppmg6g0a61xdkw2nlg42vm"; depends=[gaussquad mvtnorm nlme]; };
 nlsmsn = derive { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; };
-nlstools = derive { name="nlstools"; version="1.0-1"; sha256="00m2x587gvrbgs7wdkz2n54ylp0rnrs76rb6xmi3pf9xlbmnplr2"; depends=[]; };
+nlstools = derive { name="nlstools"; version="1.0-2"; sha256="0mjn1j9fqqgr3qgdr0ki4lfbd0yrkanvya4y2483q3wklqa6qvjc"; depends=[]; };
 nlt = derive { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[adlift EbayesThresh]; };
 nlts = derive { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[acepack locfit]; };
 nmcdr = derive { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; };
@@ -5009,7 +5029,7 @@ norm = derive { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf
 normalp = derive { name="normalp"; version="0.7.0"; sha256="1s12x2qln3s4bbqsm4p3cq4g6461z73r858g6ym1awamhbmncnrl"; depends=[]; };
 normtest = derive { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; };
 normwhn_test = derive { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; };
-nortest = derive { name="nortest"; version="1.0-3"; sha256="0kih1r703hjw2vha2hx13vm3fvbyra7v229khgv3hxxfppb7jis8"; depends=[]; };
+nortest = derive { name="nortest"; version="1.0-4"; sha256="17r0wpz72z9312c70nwi1i1kp1v9fm1h6jg7q5cx1mc1h420m1d3"; depends=[]; };
 nose = derive { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; };
 notifyR = derive { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
 novelist = derive { name="novelist"; version="1.0"; sha256="0wzx0vkqvl9sfhbbrzylsxhm3qmjj5w8sy5w6gvd104fn84d49yk"; depends=[]; };
@@ -5022,7 +5042,7 @@ npbr = derive { name="npbr"; version="1.2"; sha256="0l6r9cwrhbi37p8prrjcli7rpvlx
 npcp = derive { name="npcp"; version="0.1-6"; sha256="1ki9q49nyw21c6x3iwpd8aa152jc30idl0xx8f803j72yl21j47c"; depends=[]; };
 npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; };
 nplplot = derive { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
-nplr = derive { name="nplr"; version="0.1-3"; sha256="1g7qr88wrgn5j7z0x1csyk7mfagngn282bd42g820z7yg42ija1y"; depends=[]; };
+nplr = derive { name="nplr"; version="0.1-4"; sha256="03yq8f2bfdyi21d8kqcca0byjrw9a7pgp0c6fwpk1lnniaabzn2d"; depends=[]; };
 npmlreg = derive { name="npmlreg"; version="0.46-1"; sha256="1gddl6diw8ix8vz7n1r4ps9cjx3q00mafpapskjk7pcz69m6hfv1"; depends=[statmod]; };
 npmv = derive { name="npmv"; version="2.2"; sha256="1aqlx1y3bxbqp13q0vajwffj8srb6s04d5r2h08m9fk5hhp9l3jf"; depends=[Formula]; };
 nppbib = derive { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
@@ -5062,7 +5082,7 @@ odeintr = derive { name="odeintr"; version="1.3"; sha256="12y5hr6f7bj3aqj4gd0hlj
 odfWeave = derive { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; };
 odfWeave_survey = derive { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; };
 oem = derive { name="oem"; version="1.02.1"; sha256="0z9k0jhpp5dayyin6v8p26rgl8s983hnpsk195c9z458i7nbmrpd"; depends=[Rcpp RcppArmadillo]; };
-oglmx = derive { name="oglmx"; version="1.0.2"; sha256="1yln1ysk19mxnb0aq74xgqj0qqipqg3qbczyhdygakjd4v4ndvhg"; depends=[maxLik]; };
+oglmx = derive { name="oglmx"; version="1.0.3"; sha256="01r0j7d2l4pf61x2q4pa6pnkv2yzsk2jb62cvh0jz2rhkpvqjniq"; depends=[maxLik]; };
 okmesonet = derive { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; };
 omd = derive { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
 oncomodel = derive { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
@@ -5093,7 +5113,7 @@ optimbase = derive { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5b
 optimsimplex = derive { name="optimsimplex"; version="1.0-5"; sha256="1aiq0w2zlra3k6x4hf2rglb6bj8w25yc8djnpgm508kkrbv3cc17"; depends=[optimbase]; };
 optimx = derive { name="optimx"; version="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[BB dfoptim minqa numDeriv Rcgmin Rvmmin setRNG svUnit ucminf]; };
 optiscale = derive { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; };
-optmatch = derive { name="optmatch"; version="0.9-3"; sha256="16mhrhdpyqrj1g24mwc3fl0qyqq1kna8z6cj239fpbjhqb1mirjb"; depends=[digest]; };
+optmatch = derive { name="optmatch"; version="0.9-5"; sha256="1dgsxd6w2fgy07yzihbrg30ya0lmy146m70cfaaxr6pnr8d0rszr"; depends=[digest Rcpp RItools survival]; };
 optparse = derive { name="optparse"; version="1.3.0"; sha256="02sy28imvssr49pngdbg9qbx1h1fyjl11j7nql55m10a7cdzhwd4"; depends=[getopt]; };
 optpart = derive { name="optpart"; version="2.1-1"; sha256="0m2nsrynqbw9sj7cp7c37grx9g20dld2f26g0xzbj16wz7whgp02"; depends=[cluster labdsv MASS plotrix]; };
 optrees = derive { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; };
@@ -5192,7 +5212,7 @@ partialOR = derive { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpx
 partitionMap = derive { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; };
 partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
 partitions = derive { name="partitions"; version="1.9-15"; sha256="0jgpknm4zah50w9i3fbq2f1whm4hywm2j72vxc3ignx1snx2z0gs"; depends=[gmp polynom]; };
-partools = derive { name="partools"; version="1.1.1"; sha256="1z6grb6iag3r32438la7q06jx2fvdzlcjng3sl96lhvwj4rwi17r"; depends=[]; };
+partools = derive { name="partools"; version="1.1.3"; sha256="07bvhs6a53cm0gvmxbibg8rhzvjxrhjgl65ib348a4q43pgap2v1"; depends=[]; };
 partsm = derive { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
 party = derive { name="party"; version="1.0-22"; sha256="16wk9nsjjh8f464xx2izyymqwl89aygiyqir7h1kawm7flw9mrmv"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
 partykit = derive { name="partykit"; version="1.0-2"; sha256="1v1ykha642cgrj8hwj8gmz3860nmr1brgdjgal732dprzm3lg4hl"; depends=[survival]; };
@@ -5244,10 +5264,10 @@ pear = derive { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1
 pearson7 = derive { name="pearson7"; version="1.0-1"; sha256="0li32my02gv5yaf4q1w48pjbmij2njkpd15135n9mzjc5ibvf5kh"; depends=[]; };
 pec = derive { name="pec"; version="2.4.4"; sha256="110v8jb6l79prbkm8vp1qgrdks598q3ygmqj2yyv1d5plmsj9dh6"; depends=[foreach prodlim rms survival]; };
 pedantics = derive { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[kinship2 MasterBayes MCMCglmm]; };
-pedgene = derive { name="pedgene"; version="2.1"; sha256="0nmp1s0i5b4h45p3f4rvvixjz8sgv56as3c85rvv3a8xwfd1gcxq"; depends=[CompQuadForm kinship2 Matrix survey]; };
+pedgene = derive { name="pedgene"; version="2.7"; sha256="1qgk8a601ynvbk94zl81a94pa4iw3l3bwjf19dlgkfs30nkq5p9x"; depends=[CompQuadForm kinship2 Matrix survey]; };
 pedigree = derive { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; };
 pedigreemm = derive { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
-pedometrics = derive { name="pedometrics"; version="0.6-2"; sha256="137685gyd7k9vpjnsy6h280cdbl15bchrizfnalnz6nizi0q85lj"; depends=[car gstat Hmisc lattice latticeExtra MASS moments pbapply plyr Rcpp sp spsurvey xtable]; };
+pedometrics = derive { name="pedometrics"; version="0.6-3"; sha256="00jv9v3hrvh9jfl5vzkjh7frym9m6d9di4zv5ybwww2ba9rq2xaf"; depends=[lattice latticeExtra Rcpp]; };
 pegas = derive { name="pegas"; version="0.8-1"; sha256="116r709qp9hcvmvfn6xsis13284nl429sfc9d91p1c7fy8fl46q5"; depends=[adegenet ape]; };
 penDvine = derive { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; };
 penMSM = derive { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; };
@@ -5291,8 +5311,8 @@ phenology = derive { name="phenology"; version="4.2.4"; sha256="1074sr1p3bjz4f2z
 phia = derive { name="phia"; version="0.2-0"; sha256="1v2znss1snqrn3bpd0513jmw0x39p9vpwdc60klx725yrr2cfznw"; depends=[car Matrix]; };
 phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[lattice Matrix survival]; };
 phonR = derive { name="phonR"; version="1.0-3"; sha256="09wzsq92jkxy6cd89czshpj1hsp56v9jbgqr5a06rm6bv3spa31i"; depends=[deldir plotrix splancs]; };
-phonTools = derive { name="phonTools"; version="0.2-2.0"; sha256="1wd1a5506p3ny6vi9pq6yg9gbz082fxw4l3cxsplkdpqgkhryrww"; depends=[]; };
-phonenumber = derive { name="phonenumber"; version="0.1.0"; sha256="0nyax7nnqr2wb0g3m0a0xw7x7cinqb98wq8vrrrssk5h1sdiapgr"; depends=[]; };
+phonTools = derive { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; };
+phonenumber = derive { name="phonenumber"; version="0.2.0"; sha256="0dsdf87lys52pb3sc1z21fbqswrz5n89pcgxp9fak9flb9b51jky"; depends=[]; };
 phreeqc = derive { name="phreeqc"; version="1.0-9102"; sha256="09vwqd4mf64l76vgg32vm9vkc8ra6cls9nvrp3ckkj9l2fwcnbzf"; depends=[]; };
 phtt = derive { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; };
 phyclust = derive { name="phyclust"; version="0.1-15"; sha256="1j643k0mjmswsvp9jyiawkjf2qhfrw6xf4s2viqv987zxif2kd7z"; depends=[ape]; };
@@ -5317,6 +5337,7 @@ pingr = derive { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8ky
 pipe_design = derive { name="pipe.design"; version="0.3"; sha256="1idgy7s6fnydcda51yj1rjil2pd1r2y6g0m5dmn8sw7wmaq2n3h6"; depends=[ggplot2 gtools]; };
 pipeR = derive { name="pipeR"; version="0.6.0.6"; sha256="1d7vmccvh5ir26cv26mk0ay69rqmwmp0mgwjal9avfn9vrxq1fq3"; depends=[]; };
 pitchRx = derive { name="pitchRx"; version="1.7"; sha256="0mx948bahw0zr0915hz9lcws7iq2l0ikgx4gjnnfhhpiii86xs57"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; };
+pixiedust = derive { name="pixiedust"; version="0.1.1"; sha256="1vzkv9hs4vxamrn8prn0plhvqfdgy4lq6vk4sm8il5w6qyxzbadq"; depends=[ArgumentCheck broom dplyr knitr lazyWeave magrittr tidyr]; };
 pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
 pkgKitten = derive { name="pkgKitten"; version="0.1.3"; sha256="1f7jkriib1f19mc5mdrymg5xzdcyclfvh1220agy4lpyprxgza0f"; depends=[]; };
 pkgconfig = derive { name="pkgconfig"; version="2.0.0"; sha256="1wdi86qyaxq1mwkr3nrax3ab7hhj2gp1lbsyqnbcc9vzg230nh0r"; depends=[]; };
@@ -5343,7 +5364,7 @@ plotKML = derive { name="plotKML"; version="0.5-3"; sha256="1s33a3lq8zi11hzqcvkc
 plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
 plotROC = derive { name="plotROC"; version="1.3.3"; sha256="090fpj3b5vp0r2zrn38yxiy205mk9kx1fpwp0g8rl4bsa88v4c9y"; depends=[ggplot2 gridSVG shiny]; };
 plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
-plotmo = derive { name="plotmo"; version="3.1.3"; sha256="0jdam773azxi5pv2ix4gc0zl3xji0rdlb7v5m51z1j0l93z50mk6"; depends=[plotrix TeachingDemos]; };
+plotmo = derive { name="plotmo"; version="3.1.4"; sha256="0b12w6sg317vgmhyn4gh9jcnyps1pyqnh5ai15y1dfajsf2zjhca"; depends=[plotrix TeachingDemos]; };
 plotpc = derive { name="plotpc"; version="1.0.3"; sha256="0dw9k702a67c2k77dl4k2747lhsr84x41qrgj5mp9jnyfq6naciq"; depends=[]; };
 plotrix = derive { name="plotrix"; version="3.5-12"; sha256="13gffp7zp46wal83609652x48i63zb5i20x6ycmgc97l4nanhrfi"; depends=[]; };
 pls = derive { name="pls"; version="2.4-3"; sha256="114ka4766x8fx0zvvr7cylky1jsy542nj6s7sb2dwv8zjhbclkhn"; depends=[]; };
@@ -5364,8 +5385,8 @@ pmcgd = derive { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x
 pmclust = derive { name="pmclust"; version="0.1-6"; sha256="05zjx4psvk5zjmr0iwwwig990g6h04ajn5wi0xi8bqv046r47q3h"; depends=[MASS pbdMPI rlecuyer]; };
 pmg = derive { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiqvw0ls8igkk8s1xc7k8ympfqi6"; depends=[foreign gWidgets gWidgetsRGtk2 lattice MASS proto]; };
 pmlr = derive { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; };
-pmml = derive { name="pmml"; version="1.4.2"; sha256="0588sph67zs58knf4g3fd7c84i2yag81igr882jgbaxhfhxrpk6n"; depends=[survival XML]; };
-pmmlTransformations = derive { name="pmmlTransformations"; version="1.2.2"; sha256="1p31lakhqwk0qhb565j2sjcfsjsx0i5v8kj8779ryjyvy7717m6m"; depends=[]; };
+pmml = derive { name="pmml"; version="1.5.0"; sha256="192jffh9xb7zfvx4crpynrbdrx1fpiq303c2xz1wjqnq7wjmb3qw"; depends=[survival XML]; };
+pmmlTransformations = derive { name="pmmlTransformations"; version="1.3.0"; sha256="17dhgpldwadsvm25p8xwqsamcn1ypsqdijy2jia048qqmsy4ky86"; depends=[]; };
 pmr = derive { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
 pnf = derive { name="pnf"; version="0.1.1"; sha256="0kasq27dnjwqzlzybc8m3wv9jwyag6z38ayv88msa7lxcnibr34i"; depends=[]; };
 png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
@@ -5511,6 +5532,7 @@ pvclass = derive { name="pvclass"; version="1.2"; sha256="099lk0x24h7g77lpr22mzp
 pvclust = derive { name="pvclust"; version="1.3-2"; sha256="0w9cxr0bc591icbyn8239f76ypb2nwv9fa5b1ix05wh55d1h0rgc"; depends=[]; };
 pvrank = derive { name="pvrank"; version="1.0"; sha256="0kvy0b1x7q23pjw2ckyqzyh3ihqnbrd067v85l9rvf0pxyycqyhx"; depends=[Rmpfr]; };
 pvsR = derive { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; };
+pweight = derive { name="pweight"; version="0.0.1"; sha256="0pxxfrap1bmnhbfbmkddfbqwkpw42hq37s0y26zmkxqlx4wblira"; depends=[qqman]; };
 pwr = derive { name="pwr"; version="1.1-2"; sha256="1czganj70qszz32yx2jprhr8h9a2lpg67gwfwfjf8kpk97qvkalj"; depends=[]; };
 pwt = derive { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
 pwt8 = derive { name="pwt8"; version="8.1-0"; sha256="0jvskkn3c4m2lfxm9ivm8g96kcd7ynlmjpjqbrd6sqivas0z46r2"; depends=[]; };
@@ -5533,7 +5555,7 @@ qdapTools = derive { name="qdapTools"; version="1.1.0"; sha256="0k3mvcjj2fg2v3z8
 qdm = derive { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
 qgraph = derive { name="qgraph"; version="1.3.1"; sha256="1wmpsgmzl9qg4vjjjlbxqav3ck7p26gidsqv3qryx56jx54164wg"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; };
 qgtools = derive { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; };
-qicharts = derive { name="qicharts"; version="0.2.0"; sha256="0dinkcaz3dgi4r8nxzy57czi7b0192c4b9y5wbiqqf1l7b1zjqlp"; depends=[lattice latticeExtra]; };
+qicharts = derive { name="qicharts"; version="0.3.1"; sha256="1h2hf6psz5rkbg4s29576mz6cp9vyynw30sy999dx4yyriw3c3yb"; depends=[lattice latticeExtra]; };
 qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; };
 qlcMatrix = derive { name="qlcMatrix"; version="0.9.4"; sha256="1nkk712h9nnaqshw766mvk72w6gq9abyry4q1a0ghn0naq3gyl0s"; depends=[Matrix slam]; };
 qmap = derive { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; };
@@ -5567,7 +5589,7 @@ qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cp
 qualV = derive { name="qualV"; version="0.3-1"; sha256="0p4yfgq2wxwis2w28mdb61x6hzm6sb9bczjdm9bc05ga5srr3sdd"; depends=[KernSmooth]; };
 qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0ylp5a49b4q4max4yz30ia7r12s4jrvqn9zx5a21qcnpinf8b932"; depends=[]; };
 quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
-quanteda = derive { name="quanteda"; version="0.8.0-4"; sha256="115vds7dinddva0mhwp8cgf28c4rc72bw0hpl6za6kcmlf8a8cyw"; depends=[ca data_table Matrix proxy Rcpp RcppArmadillo SnowballC stringi wordcloud]; };
+quanteda = derive { name="quanteda"; version="0.8.2-0"; sha256="17v1xilcivj57p7w562bj4224cqi5hap4lw7h12c29n26x2b33l3"; depends=[ca data_table Matrix proxy Rcpp RcppArmadillo SnowballC stringi wordcloud]; };
 quantification = derive { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; };
 quantmod = derive { name="quantmod"; version="0.4-5"; sha256="14y8xra36cg5zam2cmxzvkb8n2jafdpc8hhjv9xnwa91basrx267"; depends=[TTR xts zoo]; };
 quantreg = derive { name="quantreg"; version="5.11"; sha256="0pyc1zknkjyvaix76bn84l90zavajsc7jx17x0zanllnh34siizp"; depends=[SparseM]; };
@@ -5596,7 +5618,7 @@ rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5
 rCarto = derive { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[classInt maptools RColorBrewer]; };
 rChoiceDialogs = derive { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; };
 rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; };
-rDEA = derive { name="rDEA"; version="1.2-1"; sha256="0zm9vnysj5j3kq8n8ljgxqn45jf1c6cg7mcvpd36bs75kz03bwig"; depends=[maxLik slam truncnorm truncreg]; };
+rDEA = derive { name="rDEA"; version="1.2-2"; sha256="05adyzj9cyviz5dy0c86m9hkb8k13qkjxrw9xkk1710z50i427jd"; depends=[maxLik slam truncnorm truncreg]; };
 rDNA = derive { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; };
 rDVR = derive { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; };
 rEMM = derive { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; };
@@ -5637,7 +5659,7 @@ raincpc = derive { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rar
 rainfreq = derive { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
 ramify = derive { name="ramify"; version="0.3.1"; sha256="1anma8kwfhm4k74fakpifrymnrjxmmk48jf1apxkg3406xcxy020"; depends=[]; };
 ramps = derive { name="ramps"; version="0.6-13"; sha256="1y7jaajzbf6d9xwr0rg0qr43l8kncgwbpfy5rpka90g3244v8nwz"; depends=[coda fields maps Matrix nlme]; };
-randNames = derive { name="randNames"; version="0.2"; sha256="0mgfwdbadfvxg1dp8aqp2c24lkhz3bi9ssmym4ns6xjq088l3ldh"; depends=[dplyr httr jsonlite]; };
+randNames = derive { name="randNames"; version="0.2.1"; sha256="177xdgrikvfcgjag382v5d1j72322ihnbggzxp9ip6p48ib4p3qg"; depends=[dplyr httr jsonlite]; };
 randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
 random = derive { name="random"; version="0.2.5"; sha256="0n96zv3b95msahpzdwfqsd9i9bq2z94flxxm8ghnqb0b75qcsdg0"; depends=[curl]; };
 random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
@@ -5651,9 +5673,9 @@ randomizationInference = derive { name="randomizationInference"; version="1.0.3"
 randomizeBE = derive { name="randomizeBE"; version="0.3-2"; sha256="1mkq1fpr7bwlk01246qy6w175jcc94q8sb3pyjkdr8yms6iqk8i7"; depends=[]; };
 randomizr = derive { name="randomizr"; version="0.2.2"; sha256="0g870sr8zjfl1dh3ay14kd6v6jg2qw86w2wcdzr8f201xy5i1fgr"; depends=[]; };
 randtests = derive { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
-randtoolbox = derive { name="randtoolbox"; version="1.16"; sha256="03z4g2mmdywsgl95xbj80awirkgrghdk2kwhsh58p00aq4bpl5ff"; depends=[rngWELL]; };
+randtoolbox = derive { name="randtoolbox"; version="1.17"; sha256="107kckva43xpqncak8ll4h0mjm8lcks4jpf7dffgw5ggcc77ycrb"; depends=[rngWELL]; };
 rangeMapper = derive { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[classInt lattice maptools raster RColorBrewer rgdal rgeos RSQLite sp]; };
-ranger = derive { name="ranger"; version="0.2.6"; sha256="0dyp4dvxxmydqyrk4d1xzvh4g9ad15hra96p8bf623csfgwj7naf"; depends=[Rcpp]; };
+ranger = derive { name="ranger"; version="0.2.7"; sha256="0ajzbbawhxmlcpy1vyka82xwfpgx07ng432w3s9xy8h58s12yljc"; depends=[Rcpp]; };
 rankdist = derive { name="rankdist"; version="1.0.0"; sha256="1hzrm21s9zlmhkxl3zqbdizhi8256cvw2l5gwx24azq7gf87mh57"; depends=[hash optimx permute Rcpp]; };
 rankhazard = derive { name="rankhazard"; version="1.0"; sha256="1kylg8yjrixbv86i2ffhhn8f5shsj8kvi66k202ari0li92y7dsg"; depends=[survival]; };
 rappdirs = derive { name="rappdirs"; version="0.3"; sha256="1yjd91h1knagri5m4djal25p7925162zz5g6005h1fgcvwz3sszd"; depends=[]; };
@@ -5679,7 +5701,7 @@ rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293
 rbounds = derive { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; };
 rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
 rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
-rcbalance = derive { name="rcbalance"; version="1.6"; sha256="0nbwsisx4ajdccywwvpg2xcaf8b4b25zij2qcb39yzmlz0yk6jjz"; depends=[MASS plyr]; };
+rcbalance = derive { name="rcbalance"; version="1.7"; sha256="0k95dkig6m9g04skz2s6iqrldmzkz3w0pcyvi1dq20h6rz9a4ic0"; depends=[MASS plyr]; };
 rcdd = derive { name="rcdd"; version="1.1-9"; sha256="1mwg9prf7196b7r262ggdqsfq1i7czm1a0apk4j5014cxzyb6j5s"; depends=[]; };
 rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint iterators png rcdklibs rJava]; };
 rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; };
@@ -5695,7 +5717,7 @@ rdd = derive { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5q
 rddtools = derive { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; };
 rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
 rdrobust = derive { name="rdrobust"; version="0.80"; sha256="02adafhbjp259hbbbk32yllgn35xxim2mwn6yixv4wh5dgr974v6"; depends=[]; };
-rdrop2 = derive { name="rdrop2"; version="0.6"; sha256="1yxg38v7r34f9rid5q6q1g9f30q3zc4dnkziyps3514l5dnbvk3j"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; };
+rdrop2 = derive { name="rdrop2"; version="0.7.0"; sha256="03r3iqi796y7s8bnyca6nya2ys7s1rdxm00sy9c7l7sh0z6npcq4"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; };
 rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[ape gdata OAIHarvester plyr RCurl RJSONIO stringr XML]; };
 reGenotyper = derive { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; };
 readBrukerFlexData = derive { name="readBrukerFlexData"; version="1.8.2"; sha256="1cagv6l29h3p87h7c2bgba23v2wxrs2kg4zg1dk046m2x11mwx3c"; depends=[]; };
@@ -5758,6 +5780,7 @@ repijson = derive { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6n
 replicatedpp2w = derive { name="replicatedpp2w"; version="0.1-1"; sha256="0q6mfrdjpx6nh4xgr5i7ka3xvnx9585xdhni020q4pm05rhimid2"; depends=[spatstat]; };
 replicationInterval = derive { name="replicationInterval"; version="1.0.0"; sha256="1ll6gyibd41kasc3sn6hvydc6xaacx6h5q5nhj09ha36x4lgr0gb"; depends=[MBESS]; };
 repmis = derive { name="repmis"; version="0.4.4"; sha256="12sw9l2nifkvri5kvgf0br7yqqmjlq5rj58g6yik8gh7wwy5157z"; depends=[data_table digest httr plyr R_cache]; };
+repo = derive { name="repo"; version="1.0"; sha256="103bjd880hd76qpipryl17l9972hwj5c3dxicjq0dcbdfmdk7q7h"; depends=[digest]; };
 repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; };
 reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; };
 reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; };
@@ -5785,7 +5808,7 @@ revealedPrefs = derive { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkj
 reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
 rex = derive { name="rex"; version="1.0.1"; sha256="1k1s5rx3lpyh6apakaf4mw94y72zkxf14c2kj0d9njhf5j6g1sdj"; depends=[lazyeval magrittr]; };
 rexpokit = derive { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[Rcpp SparseM]; };
-rfPermute = derive { name="rfPermute"; version="1.7"; sha256="1nnnrbznig7hkdg9hkpw1yfvn2rbgbshjmssz1afk8c1w3q9knsi"; depends=[ggplot2 gridExtra randomForest]; };
+rfPermute = derive { name="rfPermute"; version="1.9.2"; sha256="1rn61vscxgb0lq86id5sy56sjnfnpapzrpz363cl5x13j7028sjm"; depends=[ggplot2 gridExtra randomForest]; };
 rfUtilities = derive { name="rfUtilities"; version="1.0-1"; sha256="0y0jn4c5dpr9drjyjg2vsgsb37s0l284hvh35zm53hs8f881ycx3"; depends=[randomForest]; };
 rfigshare = derive { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; };
 rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[RCurl XML]; };
@@ -5881,7 +5904,7 @@ robustfa = derive { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf
 robustgam = derive { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; };
 robustlmm = derive { name="robustlmm"; version="1.7-4"; sha256="0c9syqz1hbwwc9kfnsc1f321zy76q9c0rxgb9j1ac33sp5w5g88c"; depends=[ggplot2 lattice lme4 Matrix nlme robustbase xtable]; };
 robustloggamma = derive { name="robustloggamma"; version="0.4-31"; sha256="19ycdvpzns46gjnkddwznnszs0941blpss7l0cqligv91cz7bkjc"; depends=[robustbase]; };
-robustreg = derive { name="robustreg"; version="0.1-7"; sha256="1nrz10065mwccil78c74vmkhinskpnk1vyp1ikrdw23vyk2l00nc"; depends=[Matrix Rcpp RcppArmadillo]; };
+robustreg = derive { name="robustreg"; version="0.1-8"; sha256="0ankpqdnjl5w3w73h6gp78klkjk43xjzhv8wv3vffdsr2fbpl8js"; depends=[Matrix Rcpp RcppArmadillo]; };
 robustvarComp = derive { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[GSE numDeriv plyr robust robustbase]; };
 rocc = derive { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; };
 rockchalk = derive { name="rockchalk"; version="1.8.92"; sha256="1mi1w8323m4q0s17cnafnlswgnlxqb5c9nq3rv8fq77k7klmq5rz"; depends=[car lme4 MASS tables]; };
@@ -5904,11 +5927,12 @@ rpart_plot = derive { name="rpart.plot"; version="1.5.2"; sha256="0aw0bhd0bliih7
 rpart_utils = derive { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; };
 rpartScore = derive { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
 rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; };
+rpca = derive { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; };
 rpf = derive { name="rpf"; version="0.45"; sha256="1d22wjhv14rl16kljn42j4hba30x28zd5svddrpxp1kraxjq5mn7"; depends=[mvtnorm RcppEigen]; };
 rpg = derive { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[RApiSerialize Rcpp uuid]; };
 rphast = derive { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; };
 rplexos = derive { name="rplexos"; version="1.1.4"; sha256="1q9vlxhglmrwxh9g4wq98nc321kq7jhgkykp9hwl3bd26a1jcfjp"; depends=[data_table DBI doParallel dplyr foreach lubridate Rcpp RSQLite stringi tidyr]; };
-rplos = derive { name="rplos"; version="0.5.0"; sha256="1ajwm413w7p41ifrp4flskgaqilrs3shzjbb2wnmwgwcnnkw43h9"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker]; };
+rplos = derive { name="rplos"; version="0.5.2"; sha256="0h8i6payk5yg0sxn07zw10jrbkf9pac6ljmkj6jsy681wirp20gg"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker]; };
 rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; };
 rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; };
 rprime = derive { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; };
@@ -5959,7 +5983,7 @@ rtfbs = derive { name="rtfbs"; version="0.3.4"; sha256="1z5rhxgi44xdv07g3l18ricx
 rtiff = derive { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; };
 rtkpp = derive { name="rtkpp"; version="0.8.6"; sha256="0alg3002q8mcqd55prmsa6hfwg0qfrv30aq5p85v094l8cl7qd8l"; depends=[Rcpp]; };
 rtop = derive { name="rtop"; version="0.5-5"; sha256="05yygg85f981x2amf9y8nr4ymya3pkwlig8i1rf9b49jx11h5w8j"; depends=[gstat sp]; };
-rts = derive { name="rts"; version="1.0-3"; sha256="0jqk0p2q1vx9l6zf9pbc5k3lsw4hg5x1r6p0f7wjiks50x55pbl4"; depends=[raster xts zoo]; };
+rts = derive { name="rts"; version="1.0-10"; sha256="0fvs82n8lxbm4n8w22ahx7j38xhaafwvr3sqr3lrfni2cs346pzs"; depends=[raster sp xts zoo]; };
 rtype = derive { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
 rucm = derive { name="rucm"; version="0.4"; sha256="1s3q6wfp9nb50rqsaq6h2wb48qvxncmlf8l4gm18pr25wkangfxq"; depends=[KFAS]; };
 rugarch = derive { name="rugarch"; version="1.3-4"; sha256="1za92hqfaws8azf2zml1q8mlbirrdw3rb4rvwg6sclfx7z7gsqkh"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; };
@@ -6029,7 +6053,7 @@ scam = derive { name="scam"; version="1.1-9"; sha256="1hx8y324bgwvv888d34wq0nnmq
 scape = derive { name="scape"; version="2.2-0"; sha256="0dgbh65fg6i5x4lpfkshn382zcc4jk1wp62pwd2l2f59pyfb92a3"; depends=[coda Hmisc lattice]; };
 scar = derive { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
 scatterD3 = derive { name="scatterD3"; version="0.1.1"; sha256="1xrs1a68x29fyzg6a3frr3nlapi1k6nk3ndg54fm6f54k8hvxdf3"; depends=[htmlwidgets]; };
-scatterplot3d = derive { name="scatterplot3d"; version="0.3-35"; sha256="1w0r7cyz01rzmgcf2x7wa4xs88ga6fd67wksyjyzrh2pdcbc56yx"; depends=[]; };
+scatterplot3d = derive { name="scatterplot3d"; version="0.3-36"; sha256="0bdxfdw23921h3rbpq0y4aixplzpkk95wgm2932kh0x7a4bnhswh"; depends=[]; };
 schoRsch = derive { name="schoRsch"; version="1.2"; sha256="1dz4mws227a5h3kkmpnz06liy9n3k01ihvcxxwnj8283w3b23bci"; depends=[]; };
 scholar = derive { name="scholar"; version="0.1.2"; sha256="1h1a6psgmiifi7p87ar3fr0mcfmg44yh4683dmqxrxrfcvgaxvca"; depends=[plyr R_cache stringr XML]; };
 schoolmath = derive { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; };
@@ -6060,7 +6084,7 @@ sdmvspecies = derive { name="sdmvspecies"; version="0.3.1"; sha256="1rpbj5559886
 sdnet = derive { name="sdnet"; version="2.03.3"; sha256="1884pil3brm7llczacxda6gki501ddyc5m8ggqjix64kbvw37slv"; depends=[]; };
 sdprisk = derive { name="sdprisk"; version="1.1-3"; sha256="1rwzi112fjckzxmhagpg60qm9a35fqx8g8xaypxsmnml6q00ysiq"; depends=[numDeriv PolynomF rootSolve]; };
 sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
-sdwd = derive { name="sdwd"; version="1.0.1"; sha256="1df8xx538ba3axi0jbkvyrdl7qnmkvh1x15kh57jmw3qbpf5gh56"; depends=[Matrix]; };
+sdwd = derive { name="sdwd"; version="1.0.2"; sha256="0l0w4jn2p9b7acp8gmlv4w8n662l397kbrm4glslik0vnmjv151w"; depends=[Matrix]; };
 seacarb = derive { name="seacarb"; version="3.0.8"; sha256="0fhf5wqazhxahillgg2xpncb4n5yjvr02251wpb2v4s39v88a5yd"; depends=[oce]; };
 sealasso = derive { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
 searchable = derive { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
@@ -6143,7 +6167,7 @@ shapefiles = derive { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbz
 shapes = derive { name="shapes"; version="1.1-10"; sha256="038xps6f8b6w9qa9csqk33ggmb311h5zxwsxr027bd95a3vmyijx"; depends=[MASS rgl scatterplot3d]; };
 sharpshootR = derive { name="sharpshootR"; version="0.7-2"; sha256="04plsgmyil6znmcqx2j78n2vjj4y4mprb3wqbhwagapdhvp9rcis"; depends=[ape aqp circular cluster Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; };
 sharx = derive { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[dclone dcmle Formula]; };
-shiny = derive { name="shiny"; version="0.12.1"; sha256="041illlgpw47y88razd77xj8q2h3brf582bhh8p8mmn7rn2af0mc"; depends=[digest htmltools httpuv jsonlite mime R6 xtable]; };
+shiny = derive { name="shiny"; version="0.12.2"; sha256="0hdgvqsg0s7va55z2pf76898fslcnghpcjvwsqlfw2q441h7dkh9"; depends=[digest htmltools httpuv jsonlite mime R6 xtable]; };
 shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; };
 shinyBS = derive { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; };
 shinyFiles = derive { name="shinyFiles"; version="0.6.0"; sha256="08cvpvrsr1bh0yh17ap20bmwxa4bsan3h6bicrxzanl2dlwp8kvr"; depends=[htmltools RJSONIO shiny]; };
@@ -6151,7 +6175,7 @@ shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk6
 shinyTree = derive { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; };
 shinybootstrap2 = derive { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
 shinydashboard = derive { name="shinydashboard"; version="0.5.0"; sha256="1q2g0vdid14id489ybfhf6x67bmc4g2zhamw3vx9piqvdlfmnqg5"; depends=[htmltools shiny]; };
-shinyjs = derive { name="shinyjs"; version="0.0.7.0"; sha256="0yrv7qy7wbsi45gqia3vl0s7mi758j7qbkmh2hdbfs0aj7jxgr7y"; depends=[shiny]; };
+shinyjs = derive { name="shinyjs"; version="0.0.8.3"; sha256="0dd20p3j4yk9q6846s1ykxvp94kp06nykxrq29nhba8jgf9gm2g0"; depends=[shiny]; };
 shinythemes = derive { name="shinythemes"; version="1.0.1"; sha256="0wv579cxjlnd7wkfqzy2x3qk7d1abql1nhw10rx1c4c808vsylkw"; depends=[shiny]; };
 shopifyr = derive { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[R6 RCurl RJSONIO]; };
 shotGroups = derive { name="shotGroups"; version="0.6"; sha256="0khcgzli6114yqrglmsvhr8rwkkkwdkd06b50isbc24vpv6xbfx9"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; };
@@ -6168,7 +6192,7 @@ sievetest = derive { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg
 sig = derive { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; };
 sigclust = derive { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
 sigloc = derive { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[ellipse nleqslv]; };
-signal = derive { name="signal"; version="0.7-5"; sha256="0v6zmy25ikkrc2ravaj7k1qzxm3zdvj6g0d55lkyjv7pb3kl5m1k"; depends=[MASS]; };
+signal = derive { name="signal"; version="0.7-6"; sha256="1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b"; depends=[MASS]; };
 signalHsmm = derive { name="signalHsmm"; version="1.3"; sha256="0hx389ibk473mfycc8sj96ppz9hri4x9ni05fv32zvzxy8b9i9jv"; depends=[biogram Rcpp seqinr shiny]; };
 signmedian_test = derive { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
 simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; };
@@ -6258,7 +6282,7 @@ snpRF = derive { name="snpRF"; version="0.4"; sha256="1amxc4jprrc6n5w5h9jm2as025
 snpStatsWriter = derive { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace snpStats]; };
 snpar = derive { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; };
 snplist = derive { name="snplist"; version="0.13"; sha256="1v9n3gdvygx4s6hlm0ijyw04szxwn9c1dqnhaqn61a8yfkmmnxn8"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; };
-sns = derive { name="sns"; version="1.0.0"; sha256="0qr5gj095xg48mqj7maz1m1zizx1jdjca8qygygqvak1b7nl4ccs"; depends=[coda mvtnorm]; };
+sns = derive { name="sns"; version="1.1.0"; sha256="1pppf1h39kv8jjngkcrq091ldzz3knjgcn81gfg7y54yndb2mapr"; depends=[coda mvtnorm numDeriv]; };
 soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn3kr614wq4hr09xpwk17nv7q8qw8cnh"; depends=[ellipse ggplot2 gridExtra scales]; };
 softImpute = derive { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; };
 softclassval = derive { name="softclassval"; version="1.0-20150416"; sha256="1zrf0nmyy4pfs4dzardghzznw1ahl21w4nykfh2pp8il4dpi21fs"; depends=[arrayhelpers svUnit]; };
@@ -6387,7 +6411,7 @@ sprint = derive { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha
 sprinter = derive { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost GAMBoost LogicReg randomForestSRC survival]; };
 sprm = derive { name="sprm"; version="1.1"; sha256="0xnbdnzgf54r93bvnyjcdcqlr0q7s7f2cvayw681zi0ig3z633j0"; depends=[cvTools ggplot2 pcaPP reshape2]; };
 sprsmdl = derive { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; };
-spsann = derive { name="spsann"; version="1.0.0"; sha256="1kbrj4qnkmh6ss7vgkh6avvlqcgbz5ixwaya7p36z5zwxxb9mmrk"; depends=[gstat pedometrics Rcpp sp SpatialTools]; };
+spsann = derive { name="spsann"; version="1.0.1"; sha256="0hdanihvcwmqsjsc2hinxwdmkkxyvv8qa9sp25mb9vf8ky3w4msm"; depends=[pedometrics Rcpp sp SpatialTools]; };
 spsmooth = derive { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; };
 spsurvey = derive { name="spsurvey"; version="3.0"; sha256="15i10a6hhk1wwnyd4lbrqaql8i4s10302bxmpr0s5cyifs084l77"; depends=[deldir foreign MASS rgeos sp]; };
 spt = derive { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; };
@@ -6396,7 +6420,7 @@ spuRs = derive { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn4
 sqldf = derive { name="sqldf"; version="0.4-10"; sha256="0n8yvrg3gjgbc3vzq0vlf7fwhgm28kwf0jv25qy44x21n6fg11h7"; depends=[chron DBI gsubfn proto RSQLite]; };
 sqliter = derive { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[DBI functional RSQLite stringr]; };
 sqlutils = derive { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; };
-squash = derive { name="squash"; version="1.0.6"; sha256="16iplngzzlif999z821a9bwx9jlmikdvwnk6p6d9w75b1fsbc0pz"; depends=[]; };
+squash = derive { name="squash"; version="1.0.7"; sha256="1wdnzagibh9fz7a3x6m4ixckh7493shvwxg7cn5kpnfzf8m1imyj"; depends=[]; };
 sra = derive { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
 srd = derive { name="srd"; version="1.0"; sha256="04j2gj7fn7p2rm34haayswrfhn6w5lln439d07m9g4c020kqqsr3"; depends=[animation colorspace plyr stringr survival]; };
 ss3sim = derive { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gny5x1zq4brkhqgw0nww41spnimascfr"; depends=[gtools lubridate plyr r4ss reshape2]; };
@@ -6433,7 +6457,7 @@ statfi = derive { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4
 stationaRy = derive { name="stationaRy"; version="0.3"; sha256="151hsda3j8ii40v5z6nh6ypahrl0b2zlfdii75xlrpwryb7n3cq6"; depends=[downloader dplyr plyr readr]; };
 statmod = derive { name="statmod"; version="1.4.21"; sha256="138lh9qa25w6vaksbq43iqisj4c8hvmkjc3q81fn7m8b7zlnz6da"; depends=[]; };
 statnet = derive { name="statnet"; version="2015.6.2"; sha256="0dvkiz7i5ljnbs6qxz4a2v4rqynn2fi4wy4vd1hqhf4kpkj0amna"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm]; };
-statnet_common = derive { name="statnet.common"; version="3.2.2"; sha256="1xdkc1pyf6wfb86dwz6bkjli5qw6yz6dvlxwp5bpgkpg83aa9n7g"; depends=[]; };
+statnet_common = derive { name="statnet.common"; version="3.2.3"; sha256="0z1nnav5kfjj5a54c7l8fingi3f4cm0nhlyyrwabxg98rydwxldm"; depends=[]; };
 statnetWeb = derive { name="statnetWeb"; version="0.3.4"; sha256="1nkis4l6yzpjcwxryskqfjgc2naxplzjc3gpp6xvpl0pcvw9mdk7"; depends=[ergm network RColorBrewer shiny sna]; };
 stcm = derive { name="stcm"; version="0.1.1"; sha256="05p0lp0p1mgcsf3mi3qgx42pgpv04m5wfmqa14gp63ialkl9pgx5"; depends=[caret dendextend ggplot2 magrittr plyr QCA randomForest XML]; };
 steepness = derive { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; };
@@ -6487,8 +6511,8 @@ subselect = derive { name="subselect"; version="0.12-5"; sha256="00wlkj6p0p2x057
 subsemble = derive { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2r4f2xyghmrprx3nk58bd6zfskdgj0ymfgz5z"; depends=[SuperLearner]; };
 subtype = derive { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
 sudoku = derive { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; };
-sudokuAlt = derive { name="sudokuAlt"; version="0.1-5"; sha256="048fxib2b2wz0amgb1gxlpqrd5w8fci5yjrv0la0mhs9vz42sjd2"; depends=[]; };
-summarytools = derive { name="summarytools"; version="0.3"; sha256="1hhkhpyaj8sc62vap5s7ds0kmk1jiy6gdvsz65ynqy2qfz58c3ms"; depends=[htmltools pander rapportools rstudioapi xtable]; };
+sudokuAlt = derive { name="sudokuAlt"; version="0.1-6"; sha256="1x3h6si0g4k5xc327daa85k74qh3dqbql7b4ynmasrb5xpcnb92b"; depends=[]; };
+summarytools = derive { name="summarytools"; version="0.4"; sha256="1hf20fddi128jv083ljylwqg1ij39hyf6kdnzfxalczl9572wih9"; depends=[htmltools pander pryr rapportools rstudioapi xtable]; };
 supclust = derive { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; };
 supcluster = derive { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[gtools mvtnorm]; };
 superMDS = derive { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; };
@@ -6541,7 +6565,7 @@ svmpath = derive { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nk
 svyPVpack = derive { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
 swamp = derive { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots impute MASS]; };
 sweidnumbr = derive { name="sweidnumbr"; version="0.6.1"; sha256="0fpbqh5ff54slmpvvyp02gwclz4p1rca3qfdb2xxn19sfiqx0wf7"; depends=[lubridate stringr]; };
-swfscMisc = derive { name="swfscMisc"; version="1.0.3"; sha256="0ciwvxpafpc6an58r1ffkab8kj4np6l2kbpkijnqnfbf6cya0aim"; depends=[mapdata maps]; };
+swfscMisc = derive { name="swfscMisc"; version="1.0.6"; sha256="14bbcn8xkc32nagi92sahdvfbgfd4v7pari1c004dz0qgxxcnz1h"; depends=[mapdata maps spatstat]; };
 swirl = derive { name="swirl"; version="2.2.21"; sha256="0lpin7frm1a6y9lz0nyykhvydr1qbx85iqy24sm52r1vxycv2r8h"; depends=[digest httr RCurl stringr testthat yaml]; };
 switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
 switchr = derive { name="switchr"; version="0.9.10"; sha256="02595b4mhhgm8j1abmk78z27fz27kr0mg01d7hf7n6yv6ybhn0qz"; depends=[]; };
@@ -6569,7 +6593,7 @@ syuzhet = derive { name="syuzhet"; version="0.2.0"; sha256="1l83wjiv1xsxw4wrcgcj
 taRifx = derive { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[plyr reshape2]; };
 taRifx_geo = derive { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[RCurl rgdal rgeos RJSONIO sp taRifx]; };
 tab = derive { name="tab"; version="3.1.1"; sha256="05wypi4v9r2qlgwafd9f58vnxn2c4fnz18l8xpb24nhdgm35adqy"; depends=[gee survey survival]; };
-taber = derive { name="taber"; version="0.0.1"; sha256="1dqcsxl82s96rlw5jx8wzdvx351qd9jz6npfrhnwifr7vxhl2prd"; depends=[dplyr magrittr]; };
+taber = derive { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; };
 table1xls = derive { name="table1xls"; version="0.3.1"; sha256="0zd93wrdj4q0ph375qlgdhpqm3n8s941vks5h07ks9gc8id1bnx5"; depends=[XLConnect]; };
 tableone = derive { name="tableone"; version="0.6.3"; sha256="0r91vzq3whz949kxg9q9bf413r41cxqsjvmicmb4najhwzhdr9fv"; depends=[e1071 gmodels]; };
 tableplot = derive { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; };
@@ -6585,7 +6609,7 @@ tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdc
 taxize = derive { name="taxize"; version="0.6.0"; sha256="0zxlawj79l117hj3d93663xdzbkcq5gh6m090yfbvkzrb6a4rq3f"; depends=[ape bold data_table foreach httr jsonlite plyr RCurl reshape2 stringr Taxonstand XML]; };
 tbart = derive { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; };
 tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
-tcR = derive { name="tcR"; version="2.1"; sha256="03q9smpc63d306apgszr2l99gdndsj39zx0nkdlkw0bjwhc1pd5y"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 roxygen2 stringdist]; };
+tcR = derive { name="tcR"; version="2.1.1"; sha256="0lrw05n80110lwhms3gjbrh87rlsvib2hpfc1balf1wlrzd2ynj4"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 roxygen2 stringdist]; };
 tcltk2 = derive { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
 tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[cluster mclust mvtnorm sn]; };
 tdr = derive { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[ggplot2 lattice RColorBrewer]; };
@@ -6612,7 +6636,7 @@ tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm2
 tfplot = derive { name="tfplot"; version="2015.4-1"; sha256="1qrw8x7pz7xcmpym3j1d095bhvy2s7znxplml1qyw5minc67n1mh"; depends=[tframe]; };
 tframe = derive { name="tframe"; version="2015.1-1"; sha256="10igwmrfslyz3z3cbyldik8fcxq43pwh60yggka6mkl0nzkxagbd"; depends=[]; };
 tframePlus = derive { name="tframePlus"; version="2015.1-2"; sha256="043ay79x520lbh4jm2nb3331pwd7dvwfw20k1kc9cxbplxiy8pnb"; depends=[tframe timeSeries]; };
-tgcd = derive { name="tgcd"; version="1.4"; sha256="108i7kkfkpgavs8d2c6aih9winfqhin777jn5zfxzkjd6clj857i"; depends=[]; };
+tgcd = derive { name="tgcd"; version="1.5"; sha256="0yvb0yc5vwnd054lfgzwg96pvaf8q41x5f03ih3schrl32z3pvv6"; depends=[]; };
 tglm = derive { name="tglm"; version="1.0"; sha256="1gv33jq3bzd5wlrqjvcfb1ax258q9asawkdi64rbj18qp7fg2dbx"; depends=[BayesLogit coda mvtnorm truncnorm]; };
 tgp = derive { name="tgp"; version="2.4-11"; sha256="0hdi05bz9qn4zmljfnll5hk9j8z9qaqmya77pdcgr6vc31ckixw5"; depends=[maptree]; };
 tgram = derive { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; };
@@ -6689,6 +6713,7 @@ traitr = derive { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9n
 traits = derive { name="traits"; version="0.1.0"; sha256="0xn4jznf4fvm7d6yinyw8viik9gdnfskcgavwdb7r9als4qxqs58"; depends=[data_table dplyr httr jsonlite taxize XML]; };
 traj = derive { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; };
 trajectories = derive { name="trajectories"; version="0.1-3"; sha256="1lk2mxfsf8x8idhb4dcj9lqvkjwm2yarvjid42xr2a9wwylvz9vq"; depends=[lattice sp spacetime]; };
+transcribeR = derive { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; };
 translate = derive { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; };
 translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; };
 translateSPSS2R = derive { name="translateSPSS2R"; version="1.0.0"; sha256="11qnf44aq0dykcsv29faa9r4fcw9cc9rkgczsqx3mngvg3bilada"; depends=[car data_table e1071 foreign Hmisc plyr stringr tidyr zoo]; };
@@ -6710,6 +6735,7 @@ triangle = derive { name="triangle"; version="0.8"; sha256="0jdphz1rf4cx4y28syff
 trifield = derive { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdya0ihpkwnh20sgj3rc7fmzjil47kqscvy"; depends=[]; };
 trimTrees = derive { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; };
 trimcluster = derive { name="trimcluster"; version="0.1-2"; sha256="0lsgbg93hm0w1rdb813ry0ks2l0jfpyqzqkf3h3bj6fch0avcbv2"; depends=[]; };
+trimr = derive { name="trimr"; version="1.0.0"; sha256="0f6h7fwp1888fip0ybh91bgi2la5k37ylrllginv3dfrd914vsrm"; depends=[]; };
 trioGxE = derive { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; };
 trip = derive { name="trip"; version="1.1-21"; sha256="0rawckw3xd8kz2jn6xgspgl5axabjcp4xh4kp93n3h41xlarv9xa"; depends=[maptools MASS raster sp spatstat]; };
 tripEstimation = derive { name="tripEstimation"; version="0.0-42"; sha256="17spnvrrqv89vldd496wc1psmaby0mhw9nh0qnfm7yc2jcqaf5nb"; depends=[lattice mgcv rgdal sp zoo]; };
@@ -6778,7 +6804,7 @@ upclass = derive { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pn
 uplift = derive { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; };
 urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl5276vlyaagizax8k20ns9ddl4b"; depends=[nlme]; };
 urltools = derive { name="urltools"; version="1.2.0"; sha256="0fn84xb9yykpl2lccl75f675braaswfsr8p17grvnaplf8hpl8gj"; depends=[Rcpp]; };
-usdm = derive { name="usdm"; version="1.1-12"; sha256="0padc9ppfisnjg1nzw5csv2zki6dby7487lis8pixf1hhbinsnci"; depends=[raster]; };
+usdm = derive { name="usdm"; version="1.1-15"; sha256="1638fv8if7pcnm6y44w3vbmivgcg4a577zd2jwhmp00vrwml2a9m"; depends=[raster sp]; };
 useful = derive { name="useful"; version="1.1.8"; sha256="1lzl7rr9qxqa0ga6ml7qi7wi02fd4isgpfskvi3igy10iw1zv3hb"; depends=[ggplot2 plyr scales]; };
 userfriendlyscience = derive { name="userfriendlyscience"; version="0.3-0"; sha256="0gz59n315dbjlyh6fdqihr1x458wplnd43q2gw9s6f9b55359m2c"; depends=[car fBasics foreign GGally ggplot2 GPArotation knitr lavaan ltm MASS MBESS mosaic plyr psych pwr SuppDists xtable]; };
 uskewFactors = derive { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77ndn1cfkq53a090fgs95yzvas1qg2siwpfsm4yix6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; };
@@ -6851,7 +6877,7 @@ weatherData = derive { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay1
 weatherr = derive { name="weatherr"; version="0.1"; sha256="06ig2l5wiy8irzpzrv3q2lx3il9b4jsn5jxccm8b37g8i89v2jfp"; depends=[ggmap lubridate RJSONIO XML]; };
 webchem = derive { name="webchem"; version="0.0.1"; sha256="0hfsjaffxz78mxxh2wx5api2blnpg5y16lyc0jf1zmq7zkhccx3l"; depends=[RCurl RJSONIO XML]; };
 webreadr = derive { name="webreadr"; version="0.3.0"; sha256="1xbp1mmqabl9kdg07ysqva5rxfm59q698hm8av481hd3ggcqvv98"; depends=[Rcpp readr]; };
-webuse = derive { name="webuse"; version="0.1.1"; sha256="1xvf3ll84x7gxz1n9al64hgbbmb7agbbn7m1llawvg2m9jgabclf"; depends=[rio]; };
+webuse = derive { name="webuse"; version="0.1.2"; sha256="0ks3pb9ir778j9x4l0s4ly2xa1jc9syddqm65wkck52q3lrarg3l"; depends=[haven]; };
 webutils = derive { name="webutils"; version="0.3"; sha256="1wzpwigc5mmdnz453qr4s1viaslgdrcg238n25qcg4xjakmnxrss"; depends=[jsonlite]; };
 webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; };
 weightedScores = derive { name="weightedScores"; version="0.9.1"; sha256="0wd2ymxy8yh3l4xd3xgifbihi89h53wy6n84x7x26px12c70q8fa"; depends=[mvtnorm rootSolve]; };
@@ -6870,6 +6896,7 @@ wikibooks = derive { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l
 wikipediatrend = derive { name="wikipediatrend"; version="1.1.6"; sha256="1yw22zs1rx4x8hk3fi4f0hbxmic102j9gj62dzwmsk6k02s6wvgw"; depends=[httr jsonlite RCurl rvest stringr]; };
 wildlifeDI = derive { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; };
 windex = derive { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; };
+wiod = derive { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; };
 witness = derive { name="witness"; version="1.2"; sha256="1pccn7czm1q0w31zpmky5arkcbnfl94gh1nnkf8kmcccdrr3lxph"; depends=[]; };
 wkb = derive { name="wkb"; version="0.1-0"; sha256="0ynamg8zrk80j5ysyg7pymdcxzlscbhhygp8czmsd33p2y31pggd"; depends=[sp]; };
 wle = derive { name="wle"; version="0.9-9"; sha256="032zqfqg6ghg56zgr005g8q94zskmbzv1p08lxv227ikkbmnwn53"; depends=[circular]; };
@@ -6885,7 +6912,7 @@ wpp2008 = derive { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jp
 wpp2010 = derive { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; };
 wpp2012 = derive { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; };
 wppExplorer = derive { name="wppExplorer"; version="1.6-2"; sha256="1y9mdghq4is81gabx47pm1kfay67zv3b9hxz58lhml68wwwsfmsj"; depends=[ggplot2 googleVis Hmisc plyr reshape2 shiny wpp2012]; };
-wq = derive { name="wq"; version="0.4.3"; sha256="1lgxf5pfw3563dpyq0dgj4ps2mc5nqh56y1i77ypscj5lrcgjxrf"; depends=[ggplot2 reshape2 zoo]; };
+wq = derive { name="wq"; version="0.4.4"; sha256="1c99jr6wzalz2k7m85j6k1rmv33vrijkrrg24kjr6i08b4xgsxc5"; depends=[ggplot2 reshape2 zoo]; };
 wrassp = derive { name="wrassp"; version="0.1.3"; sha256="1xza4w5dgc6gda9ybmq386jnb1gkahdi6sds5dqay7pm5mjql6fl"; depends=[]; };
 write_snns = derive { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
 wrspathrow = derive { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[raster rgdal rgeos sp wrspathrowData]; };
@@ -6898,6 +6925,8 @@ x_ent = derive { name="x.ent"; version="1.1.2"; sha256="0wbbhsnlm5yln72h648nz3y5
 x12 = derive { name="x12"; version="1.6.0"; sha256="0bl50nva4ai8p24f9hr622m0fc5nmbjakn3rsvl79g050gjsd4i3"; depends=[stringr]; };
 x12GUI = derive { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; };
 xergm = derive { name="xergm"; version="1.5"; sha256="1gjdcvpi84s0cy52a27n872ygb50mqw0w5117s3h7v1j68w88wv8"; depends=[boot coda ergm igraph lme4 Matrix network Rcpp ROCR sna speedglm statnet statnet_common texreg vegan]; };
+xergm_common = derive { name="xergm.common"; version="1.5.1"; sha256="0fxgzbczqbbir8f70d9k5d3jbih4nc8fs3l41wjbbdi9lvafqa0l"; depends=[ergm]; };
+xgboost = derive { name="xgboost"; version="0.4-2"; sha256="1m6jv1ww0cxqg87kq412akcwimj6i7ncg7anrbfhbq2h5v53brak"; depends=[data_table magrittr Matrix stringr]; };
 xgobi = derive { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; };
 xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; };
 xkcd = derive { name="xkcd"; version="0.0.4"; sha256="1hwr3ylgflzizgp8ffwdv9cgcngpjwmpxvgrvg8ad89a40l1mxcr"; depends=[extrafont ggplot2 Hmisc]; };
@@ -6912,10 +6941,11 @@ xtermStyle = derive { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb
 xts = derive { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; };
 yaImpute = derive { name="yaImpute"; version="1.0-26"; sha256="00w127wnwnhkfkrn4764l1ap3d3njlidglk9izcxm0n4kqj0zb49"; depends=[]; };
 yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; };
+yakmoR = derive { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; };
 yaml = derive { name="yaml"; version="2.1.13"; sha256="18kz5mfn7qpif5pn91w4vbrc5bkycsj85vwm5wxwzjlb02i9mxi6"; depends=[]; };
 ycinterextra = derive { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; };
 yhat = derive { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[boot miscTools plotrix yacca]; };
-yhatr = derive { name="yhatr"; version="0.13.6"; sha256="0g08ass0vrqcmw1zfybiaqbrspcwyf4bsmcmzbz3nzdlkgwbn3bh"; depends=[httr jsonlite plyr RCurl rjson stringr]; };
+yhatr = derive { name="yhatr"; version="0.13.7"; sha256="1n4n8v8qz3isvg8g1cwh0xz83g65n01x9pwzbxzvqidw5ip4ybb0"; depends=[httr jsonlite plyr RCurl rjson stringr]; };
 ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
 yuima = derive { name="yuima"; version="1.0.73"; sha256="1nb91c3ii643sdw5yn8q55g5sy0x04xp9z4z3jipc72r6qcc84vw"; depends=[cubature expm mvtnorm zoo]; };
 zCompositions = derive { name="zCompositions"; version="1.0.3"; sha256="0lxy201ys9dvv8c09q8wbks1c2jkjyd1bbrxhjr7zi9j7m0parl7"; depends=[MASS NADA truncnorm]; };

From 5d1bcf2f4e52144c04fcaefd9b3ec7c3ca44078e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 12:04:36 +0200
Subject: [PATCH 0839/2016] R: fix Hydra build & evaluation errors

---
 pkgs/development/r-modules/default.nix | 561 +++++++++++++------------
 1 file changed, 289 insertions(+), 272 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 2175ff7e697..c24d5af7ddf 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -678,6 +678,7 @@ let
     "a4" # depends on broken package annaffy-1.41.1
     "a4Reporting" # depends on broken package annaffy-1.41.1
     "abd" # depends on broken package nlopt-2.4.2
+    "Actigraphy" # Build Is Broken
     "adabag" # depends on broken package nlopt-2.4.2
     "ADaCGH2" # depends on broken package tilingArray-1.47.0
     "adSplit" # build is broken
@@ -699,11 +700,15 @@ let
     "AgiMicroRna" # depends on broken package affyio-1.37.0
     "agRee" # depends on broken package nlopt-2.4.2
     "aLFQ" # depends on broken package nlopt-2.4.2
+    "AllelicImbalance" # depends on broken package Rsamtools-1.21.8
     "alr3" # depends on broken package nlopt-2.4.2
     "alr4" # depends on broken package nlopt-2.4.2
+    "alsace" # depends on broken nloptr-1.0.4
     "altcdfenvs" # depends on broken package affyio-1.37.0
+    "ampliQueso" # depends on broken package Rsamtools-1.21.8
     "anacor" # depends on broken package nlopt-2.4.2
     "annaffy" # build is broken
+    "annmap" # depends on broken package Rsamtools-1.21.8
     "AnnotationForge" # Build Is Broken
     "AnnotationHub" # depends on broken package interactiveDisplayBase-1.7.0
     "aods3" # depends on broken package nlopt-2.4.2
@@ -712,6 +717,7 @@ let
     "ArfimaMLM" # depends on broken package nlopt-2.4.2
     "arm" # depends on broken package nlopt-2.4.2
     "ArrayExpress" # depends on broken package affyio-1.37.0
+    "ArrayExpressHTS" # depends on broken package Rsamtools-1.21.8
     "arrayMvout" # depends on broken package affyio-1.37.0
     "arrayQualityMetrics" # depends on broken package affyio-1.37.0
     "ArrayTools" # depends on broken package affyio-1.37.0
@@ -721,20 +727,31 @@ let
     "attract" # depends on broken package AnnotationForge-1.11.3
     "BACA" # depends on broken package Category-2.35.1
     "BAGS" # build is broken
+    "ballgown" # depends on broken package Rsamtools-1.21.8
+    "bamsignals" # build is broken
     "bartMachine" # depends on broken package nlopt-2.4.2
+    "Basic4Cseq" # depends on broken package Rsamtools-1.21.8
     "bayesDem" # depends on broken package nlopt-2.4.2
     "bayesLife" # depends on broken package nlopt-2.4.2
     "bayesPop" # depends on broken package nlopt-2.4.2
     "Bayesthresh" # depends on broken package nlopt-2.4.2
     "BBRecapture" # depends on broken package nlopt-2.4.2
     "BCA" # depends on broken package nlopt-2.4.2
+    "BEAT" # depends on broken package Rsamtools-1.21.8
     "bgmm" # depends on broken package nlopt-2.4.2
     "bgx" # depends on broken package affyio-1.37.0
     "BIFIEsurvey" # depends on broken package nlopt-2.4.2
+    "bigGP" # build is broken
     "BiGGR" # depends on broken package rsbml-2.27.0
     "BiodiversityR" # depends on broken package nlopt-2.4.2
+    "biomvRCNS" # depends on broken package Rsamtools-1.21.8
+    "biotools" # depends on broken package rpanel-1.1-3
+    "biovizBase" # depends on broken package Rsamtools-1.21.8
     "birte" # build is broken
     "BiSEp" # depends on broken package GOSemSim-1.27.3
+    "BiSeq" # depends on broken package Rsamtools-1.21.8
+    "BitSeq" # depends on broken package Rsamtools-1.21.8
+    "BLCOP" # depends on broken package Rsymphony-0.1-20
     "blmeco" # depends on broken package nlopt-2.4.2
     "blme" # depends on broken package nlopt-2.4.2
     "bmd" # depends on broken package nlopt-2.4.2
@@ -743,295 +760,90 @@ let
     "boss" # depends on broken package nlopt-2.4.2
     "BradleyTerry2" # depends on broken package nlopt-2.4.2
     "BRugs" # build is broken
+    "BSgenome" # depends on broken package Rsamtools-1.21.8
+    "bumphunter" # depends on broken package Rsamtools-1.21.8
     "CADFtest" # depends on broken package nlopt-2.4.2
     "CAFE" # depends on broken package affyio-1.37.0
+    "CAGEr" # depends on broken package Rsamtools-1.21.8
     "cAIC4" # depends on broken package nlopt-2.4.2
+    "CAMERA" # depends on broken package mzR-2.3.1
     "canceR" # depends on broken package Category-2.35.1
     "candisc" # depends on broken package nlopt-2.4.2
     "carcass" # depends on broken package nlopt-2.4.2
     "car" # depends on broken package nlopt-2.4.2
     "caret" # depends on broken package nlopt-2.4.2
     "caretEnsemble" # depends on broken package nlopt-2.4.2
+    "CARrampsOcl" # depends on broken package OpenCL-0.1-3
+    "casper" # depends on broken package Rsamtools-1.21.8
     "Category" # Build Is Broken
     "categoryCompare" # depends on broken package Category-2.35.1
     "CCpop" # depends on broken package nlopt-2.4.2
     "cellHTS2" # depends on broken package Category-2.35.1
+    "CexoR" # depends on broken package Rsamtools-1.21.8
     "ChainLadder" # depends on broken package nlopt-2.4.2
     "ChAMP" # depends on broken package affyio-1.37.0
     "charm" # depends on broken package affyio-1.37.0
     "ChemmineR" # Build Is Broken
+    "chimera" # depends on broken package Rsamtools-1.21.8
     "chipenrich" # build is broken
+    "chipPCR" # depends on broken nloptr-1.0.4
+    "ChIPpeakAnno" # depends on broken package Rsamtools-1.21.8
     "ChIPQC" # depends on broken package AnnotationForge-1.11.3
+    "ChIPseeker" # depends on broken package Rsamtools-1.21.8
+    "chipseq" # depends on broken package Rsamtools-1.21.8
+    "ChIPseqR" # depends on broken package Rsamtools-1.21.8
+    "ChIPsim" # depends on broken package Rsamtools-1.21.8
     "ChIPXpress" # depends on broken package affyio-1.37.0
+    "ChromHeatMap" # depends on broken package Rsamtools-1.21.8
+    "cleanUpdTSeq" # depends on broken package Rsamtools-1.21.8
     "climwin" # depends on broken package nlopt-2.4.2
+    "clipper" # depends on broken package Rsamtools-1.21.8
     "CLME" # depends on broken package nlopt-2.4.2
     "clpAPI" # build is broken
     "clusterPower" # depends on broken package nlopt-2.4.2
-    "Actigraphy" # Build Is Broken
-    "Crossover" # Build Is Broken
-    "FunctionalNetworks" # Build Is Broken
-    "HiPLARM" # Build Is Broken
-    "HierO" # Build Is Broken
-    "KEGGprofile" # Build Is Broken
-    "MigClim" # Build Is Broken
-    "ROracle" # Build Is Broken
-    "Rcplex" # Build Is Broken
-    "RcppAPT" # Build Is Broken
-    "RnaSeqSampleSize" # Build Is Broken
-    "Rsamtools" # Build Is Broken
-    "SeqGrapheR" # Build Is Broken
-    "bamsignals" # build is broken
-    "bigGP" # build is broken
-    "cudaBayesreg" # build is broken
-    "dagbag" # build is broken
-    "gMCP" # build is broken
-    "h5" # build is broken
-    "lefse" # build is broken
-    "metaMix" # build is broken
-    "mirIntegrator" # build is broken
-    "pathview" # build is broken
-    "pcaL1" # build is broken
-    "permGPU" # build is broken
-    "pmclust" # build is broken
-    "qtbase" # build is broken
-    "rDEA" # build is broken
-    "rJPSGCS" # build is broken
-    "rLindo" # build is broken
-    "seqCNA" # build is broken
-    "sybilSBML" # build is broken
-    "AllelicImbalance" # depends on broken package Rsamtools-1.21.8
-    "ArrayExpressHTS" # depends on broken package Rsamtools-1.21.8
-    "BEAT" # depends on broken package Rsamtools-1.21.8
-    "BLCOP" # depends on broken package Rsymphony-0.1-20
-    "BSgenome" # depends on broken package Rsamtools-1.21.8
-    "Basic4Cseq" # depends on broken package Rsamtools-1.21.8
-    "BiSeq" # depends on broken package Rsamtools-1.21.8
-    "BitSeq" # depends on broken package Rsamtools-1.21.8
-    "CAGEr" # depends on broken package Rsamtools-1.21.8
-    "CAMERA" # depends on broken package mzR-2.3.1
-    "CARrampsOcl" # depends on broken package OpenCL-0.1-3
-    "CNEr" # depends on broken package Rsamtools-1.21.8
-    "CNVrd2" # depends on broken package Rsamtools-1.21.8
-    "CODEX" # depends on broken package Rsamtools-1.21.8
-    "CRISPRseek" # depends on broken package Rsamtools-1.21.8
-    "CexoR" # depends on broken package Rsamtools-1.21.8
-    "ChIPpeakAnno" # depends on broken package Rsamtools-1.21.8
-    "ChIPseeker" # depends on broken package Rsamtools-1.21.8
-    "ChIPseqR" # depends on broken package Rsamtools-1.21.8
-    "ChIPsim" # depends on broken package Rsamtools-1.21.8
-    "ChromHeatMap" # depends on broken package Rsamtools-1.21.8
-    "CopyNumber450k" # depends on broken package Rsamtools-1.21.8
-    "CopywriteR" # depends on broken package Rsamtools-1.21.8
-    "CoverageView" # depends on broken package Rsamtools-1.21.8
-    "DBKGrad" # depends on broken package rpanel-1.1-3
-    "DEXSeq" # depends on broken package Rsamtools-1.21.8
-    "DMRcate" # depends on broken package Rsamtools-1.21.8
-    "DMRforPairs" # depends on broken package Rsamtools-1.21.8
-    "DOQTL" # depends on broken package Rsamtools-1.21.8
-    "EDASeq" # depends on broken package Rsamtools-1.21.8
-    "ELMER" # depends on broken package Rsamtools-1.21.8
-    "ExomeDepth" # depends on broken package Rsamtools-1.21.8
-    "FourCSeq" # depends on broken package Rsamtools-1.21.8
-    "GOGANPA" # depends on broken package WGCNA-1.47
-    "GOTHiC" # depends on broken package Rsamtools-1.21.8
-    "GUIDE" # depends on broken package rpanel-1.1-3
-    "GenoView" # depends on broken package Rsamtools-1.21.8
-    "GenomicAlignments" # depends on broken package Rsamtools-1.21.8
-    "GenomicFeatures" # depends on broken package Rsamtools-1.21.8
-    "GenomicFiles" # depends on broken package Rsamtools-1.21.8
-    "GenomicInteractions" # depends on broken package Rsamtools-1.21.8
-    "GoogleGenomics" # depends on broken package Rsamtools-1.21.8
-    "GreyListChIP" # depends on broken package Rsamtools-1.21.8
-    "Gviz" # depends on broken package Rsamtools-1.21.8
-    "HTSeqGenie" # depends on broken package Rsamtools-1.21.8
-    "HiTC" # depends on broken package Rsamtools-1.21.8
-    "IdeoViz" # depends on broken package Rsamtools-1.21.8
-    "InPAS" # depends on broken package Rsamtools-1.21.8
-    "LinRegInteractive" # depends on broken package rpanel-1.1-3
-    "LowMACA" # depends on broken package Rsamtools-1.21.8
-    "M3D" # depends on broken package Rsamtools-1.21.8
-    "MEDIPS" # depends on broken package Rsamtools-1.21.8
-    "MSeasy" # depends on broken package mzR-2.3.1
-    "MSeasyTkGUI" # depends on broken package mzR-2.3.1
-    "Metab" # depends on broken package mzR-2.3.1
-    "MethylAid" # depends on broken package Rsamtools-1.21.8
-    "MethylSeekR" # depends on broken package Rsamtools-1.21.8
-    "MotIV" # depends on broken package Rsamtools-1.21.8
-    "MotifDb" # depends on broken package Rsamtools-1.21.8
-    "OTUbase" # depends on broken package Rsamtools-1.21.8
-    "OrganismDbi" # depends on broken package Rsamtools-1.21.8
-    "PGA" # depends on broken package Rsamtools-1.21.8
-    "PICS" # depends on broken package Rsamtools-1.21.8
-    "PING" # depends on broken package Rsamtools-1.21.8
-    "Pviz" # depends on broken package Rsamtools-1.21.8
-    "QDNAseq" # depends on broken package Rsamtools-1.21.8
-    "QuasR" # depends on broken package Rsamtools-1.21.8
-    "R3CPET" # depends on broken package Rsamtools-1.21.8
-    "R453Plus1Toolbox" # depends on broken package Rsamtools-1.21.8
-    "RAPIDR" # depends on broken package Rsamtools-1.21.8
-    "REBayes" # depends on broken package Rmosek-1.2.5.1
-    "REDseq" # depends on broken package Rsamtools-1.21.8
-    "RIPSeeker" # depends on broken package Rsamtools-1.21.8
-    "RMassBank" # depends on broken package mzR-2.3.1
-    "RNAprobR" # depends on broken package Rsamtools-1.21.8
-    "ROI_plugin_symphony" # depends on broken package Rsymphony-0.1-20
-    "RSVSim" # depends on broken package Rsamtools-1.21.8
-    "RUVSeq" # depends on broken package Rsamtools-1.21.8
-    "RVideoPoker" # depends on broken package rpanel-1.1-3
-    "RapidPolygonLookup" # depends on broken package PBSmapping-2.69.76
-    "Rariant" # depends on broken package Rsamtools-1.21.8
-    "Rcade" # depends on broken package Rsamtools-1.21.8
-    "ReQON" # depends on broken package Rsamtools-1.21.8
-    "RnBeads" # depends on broken package Rsamtools-1.21.8
-    "Rolexa" # depends on broken package Rsamtools-1.21.8
-    "Rqc" # depends on broken package Rsamtools-1.21.8
-    "SDD" # depends on broken package rpanel-1.1-3
-    "SGSeq" # depends on broken package Rsamtools-1.21.8
-    "SIMAT" # depends on broken package mzR-2.3.1
-    "SNPtools" # depends on broken package Rsamtools-1.21.8
-    "SVM2CRM" # depends on broken package Rsamtools-1.21.8
-    "SeqArray" # depends on broken package Rsamtools-1.21.8
-    "SeqVarTools" # depends on broken package Rsamtools-1.21.8
-    "ShortRead" # depends on broken package Rsamtools-1.21.8
-    "SimRAD" # depends on broken package Rsamtools-1.21.8
-    "SomaticSignatures" # depends on broken package Rsamtools-1.21.8
-    "SplicingGraphs" # depends on broken package Rsamtools-1.21.8
-    "TEQC" # depends on broken package Rsamtools-1.21.8
-    "TIN" # depends on broken package WGCNA-1.47
-    "TargetSearch" # depends on broken package mzR-2.3.1
-    "TitanCNA" # depends on broken package Rsamtools-1.21.8
-    "ToPASeq" # depends on broken package Rsamtools-1.21.8
-    "TransView" # depends on broken package Rsamtools-1.21.8
-    "VariantAnnotation" # depends on broken package Rsamtools-1.21.8
-    "VariantFiltering" # depends on broken package Rsamtools-1.21.8
-    "VariantTools" # depends on broken package Rsamtools-1.21.8
-    "ampliQueso" # depends on broken package Rsamtools-1.21.8
-    "annmap" # depends on broken package Rsamtools-1.21.8
-    "ballgown" # depends on broken package Rsamtools-1.21.8
-    "biomvRCNS" # depends on broken package Rsamtools-1.21.8
-    "biotools" # depends on broken package rpanel-1.1-3
-    "biovizBase" # depends on broken package Rsamtools-1.21.8
-    "bumphunter" # depends on broken package Rsamtools-1.21.8
-    "casper" # depends on broken package Rsamtools-1.21.8
-    "chimera" # depends on broken package Rsamtools-1.21.8
-    "chipseq" # depends on broken package Rsamtools-1.21.8
-    "cleanUpdTSeq" # depends on broken package Rsamtools-1.21.8
-    "clipper" # depends on broken package Rsamtools-1.21.8
-    "cn_mops" # depends on broken package Rsamtools-1.21.8
-    "coMET" # depends on broken package Rsamtools-1.21.8
-    "cobindR" # depends on broken package Rsamtools-1.21.8
-    "conumee" # depends on broken package Rsamtools-1.21.8
-    "cosmiq" # depends on broken package mzR-2.3.1
-    "cpvSNP" # depends on broken package Rsamtools-1.21.8
-    "csaw" # depends on broken package Rsamtools-1.21.8
-    "cummeRbund" # depends on broken package Rsamtools-1.21.8
-    "customProDB" # depends on broken package Rsamtools-1.21.8
-    "daff" # depends on broken package V8-0.6
-    "dagLogo" # depends on broken package Rsamtools-1.21.8
-    "deepSNV" # depends on broken package Rsamtools-1.21.8
-    "derfinder" # depends on broken package Rsamtools-1.21.8
-    "derfinderPlot" # depends on broken package Rsamtools-1.21.8
-    "easyRNASeq" # depends on broken package Rsamtools-1.21.8
-    "ensemblVEP" # depends on broken package Rsamtools-1.21.8
-    "epigenomix" # depends on broken package Rsamtools-1.21.8
-    "epivizr" # depends on broken package Rsamtools-1.21.8
-    "erpR" # depends on broken package rpanel-1.1-3
-    "exomeCopy" # depends on broken package Rsamtools-1.21.8
-    "exomePeak" # depends on broken package Rsamtools-1.21.8
-    "fPortfolio" # depends on broken package Rsymphony-0.1-20
-    "fastLiquidAssociation" # depends on broken package LiquidAssociation-1.23.0
-    "flagme" # depends on broken package mzR-2.3.1
-    "gamlss_demo" # depends on broken package rpanel-1.1-3
-    "genomation" # depends on broken package Rsamtools-1.21.8
-    "geojsonio" # depends on broken package V8-0.6
-    "ggbio" # depends on broken package Rsamtools-1.21.8
-    "girafe" # depends on broken package Rsamtools-1.21.8
-    "gmapR" # depends on broken package Rsamtools-1.21.8
-    "groHMM" # depends on broken package Rsamtools-1.21.8
-    "hiAnnotator" # depends on broken package Rsamtools-1.21.8
-    "hiReadsProcessor" # depends on broken package Rsamtools-1.21.8
-    "htSeqTools" # depends on broken package Rsamtools-1.21.8
-    "intansv" # depends on broken package Rsamtools-1.21.8
-    "js" # depends on broken package V8-0.6
-    "lawn" # depends on broken package V8-0.6
-    "lgcp" # depends on broken package rpanel-1.1-3
-    "mcaGUI" # depends on broken package Rsamtools-1.21.8
-    "metaMS" # depends on broken package mzR-2.3.1
-    "metaSEM" # depends on broken package OpenMx-2.2.4
-    "metagene" # depends on broken package Rsamtools-1.21.8
-    "methylPipe" # depends on broken package Rsamtools-1.21.8
-    "methylumi" # depends on broken package Rsamtools-1.21.8
-    "minfi" # depends on broken package Rsamtools-1.21.8
-    "minimist" # depends on broken package V8-0.6
-    "missMethyl" # depends on broken package Rsamtools-1.21.8
-    "motifRG" # depends on broken package Rsamtools-1.21.8
-    "motifStack" # depends on broken package Rsamtools-1.21.8
-    "mygene" # depends on broken package Rsamtools-1.21.8
-    "nettools" # depends on broken package WGCNA-1.47
-    "nucleR" # depends on broken package Rsamtools-1.21.8
-    "optBiomarker" # depends on broken package rpanel-1.1-3
-    "ora" # depends on broken package ROracle-1.1-12
-    "pbdBASE" # depends on broken package pbdSLAP-0.2-0
-    "pbdDEMO" # depends on broken package pbdSLAP-0.2-0
-    "pbdDMAT" # depends on broken package pbdSLAP-0.2-0
-    "podkat" # depends on broken package Rsamtools-1.21.8
-    "proBAMr" # depends on broken package Rsamtools-1.21.8
-    "qpgraph" # depends on broken package Rsamtools-1.21.8
-    "qrqc" # depends on broken package Rsamtools-1.21.8
-    "qtpaint" # depends on broken package qtbase-1.0.9
-    "qtutils" # depends on broken package qtbase-1.0.9
-    "quantro" # depends on broken package Rsamtools-1.21.8
-    "r3Cseq" # depends on broken package Rsamtools-1.21.8
-    "rGADEM" # depends on broken package Rsamtools-1.21.8
-    "rSFFreader" # depends on broken package Rsamtools-1.21.8
-    "rTRMui" # depends on broken package Rsamtools-1.21.8
-    "regionReport" # depends on broken package Rsamtools-1.21.8
-    "regioneR" # depends on broken package Rsamtools-1.21.8
-    "repijson" # depends on broken package V8-0.6
-    "rfPred" # depends on broken package Rsamtools-1.21.8
-    "rgbif" # depends on broken package V8-0.6
-    "rgpui" # depends on broken package rgp-0.4-1
-    "rjade" # depends on broken package V8-0.6
-    "rnaSeqMap" # depends on broken package Rsamtools-1.21.8
-    "roar" # depends on broken package Rsamtools-1.21.8
-    "rtracklayer" # depends on broken package Rsamtools-1.21.8
-    "sapFinder" # depends on broken package rTANDEM-1.9.0
-    "segmentSeq" # depends on broken package Rsamtools-1.21.8
-    "seq2pathway" # depends on broken package WGCNA-1.47
-    "seqbias" # depends on broken package Rsamtools-1.21.8
-    "seqplots" # depends on broken package Rsamtools-1.21.8
-    "shinyMethyl" # depends on broken package Rsamtools-1.21.8
-    "shinyTANDEM" # depends on broken package rTANDEM-1.9.0
-    "similaRpeak" # depends on broken package Rsamtools-1.21.8
-    "soGGi" # depends on broken package Rsamtools-1.21.8
-    "soilphysics" # depends on broken package rpanel-1.1-3
-    "spliceR" # depends on broken package Rsamtools-1.21.8
-    "spocc" # depends on broken package V8-0.6
-    "ssviz" # depends on broken package Rsamtools-1.21.8
-    "stagePop" # depends on broken package PBSddesolve-1.11.29
-    "topologyGSA" # depends on broken package Rsamtools-1.21.8
-    "trackViewer" # depends on broken package Rsamtools-1.21.8
-    "tracktables" # depends on broken package Rsamtools-1.21.8
-    "vmsbase" # depends on broken package PBSmapping-2.69.76
-    "wavClusteR" # depends on broken package Rsamtools-1.21.8
-    "xcms" # depends on broken package mzR-2.3.1
     "clusterProfiler" # depends on broken package GOSemSim-1.27.3
+    "clusterSEs" # depends on broken AER-1.2-4
+    "ClustGeo" # depends on broken FactoMineR-1.31.3
+    "CNEr" # depends on broken package Rsamtools-1.21.8
     "cn_farms" # depends on broken package affyio-1.37.0
+    "cn_mops" # depends on broken package Rsamtools-1.21.8
     "CNORfuzzy" # depends on broken package nlopt-2.4.2
+    "CNVPanelizer" # depends on broken cn.mops-1.15.1
+    "CNVrd2" # depends on broken package Rsamtools-1.21.8
+    "cobindR" # depends on broken package Rsamtools-1.21.8
     "CoCiteStats" # Build Is Broken
+    "CODEX" # depends on broken package Rsamtools-1.21.8
     "COHCAP" # build is broken
+    "colorscience"
+    "coMET" # depends on broken package Rsamtools-1.21.8
     "compEpiTools" # depends on broken package topGO-2.21.0
     "CompGO" # depends on broken package Category-2.35.1
     "conformal" # depends on broken package nlopt-2.4.2
     "ConsensusClusterPlus" # Build Is Broken
+    "conumee" # depends on broken package Rsamtools-1.21.8
+    "CopyNumber450k" # depends on broken package Rsamtools-1.21.8
+    "CopywriteR" # depends on broken package Rsamtools-1.21.8
     "corHMM" # depends on broken package nlopt-2.4.2
     "Cormotif" # depends on broken package affyio-1.37.0
     "coRNAi" # depends on broken package Category-2.35.1
+    "cosmiq" # depends on broken package mzR-2.3.1
     "CosmoPhotoz" # depends on broken package nlopt-2.4.2
+    "CoverageView" # depends on broken package Rsamtools-1.21.8
     "cplexAPI" # build is broken
+    "cpvSNP" # depends on broken package Rsamtools-1.21.8
+    "CRISPRseek" # depends on broken package Rsamtools-1.21.8
     "crlmm" # depends on broken package affyio-1.37.0
+    "Crossover" # Build Is Broken
     "CrypticIBDcheck" # depends on broken package nlopt-2.4.2
+    "csaw" # depends on broken package Rsamtools-1.21.8
+    "cudaBayesreg" # build is broken
+    "cummeRbund" # depends on broken package Rsamtools-1.21.8
+    "customProDB" # depends on broken package Rsamtools-1.21.8
+    "daff" # depends on broken package V8-0.6
+    "dagbag" # build is broken
+    "dagLogo" # depends on broken package Rsamtools-1.21.8
     "DAMisc" # depends on broken package nlopt-2.4.2
+    "DBKGrad" # depends on broken package rpanel-1.1-3
     "Deducer" # depends on broken package nlopt-2.4.2
     "DeducerExtras" # depends on broken package nlopt-2.4.2
     "DeducerPlugInExample" # depends on broken package nlopt-2.4.2
@@ -1039,8 +851,13 @@ let
     "DeducerSpatial" # depends on broken package nlopt-2.4.2
     "DeducerSurvival" # depends on broken package nlopt-2.4.2
     "DeducerText" # depends on broken package nlopt-2.4.2
+    "deepSNV" # depends on broken package Rsamtools-1.21.8
     "DEGraph" # depends on broken package RCytoscape-1.19.0
     "demi" # depends on broken package affyio-1.37.0
+    "derfinder" # depends on broken package Rsamtools-1.21.8
+    "derfinderPlot" # depends on broken package Rsamtools-1.21.8
+    "destiny" # depends on broken package VIM-4.3.0
+    "DEXSeq" # depends on broken package Rsamtools-1.21.8
     "DiagTest3Grp" # depends on broken package nlopt-2.4.2
     "DiffBind" # depends on broken package AnnotationForge-1.11.3
     "diffHic" # depends on broken package rhdf5-2.13.1
@@ -1049,10 +866,14 @@ let
     "discSurv" # depends on broken package nlopt-2.4.2
     "DistatisR" # depends on broken package nlopt-2.4.2
     "diveRsity" # depends on broken package nlopt-2.4.2
+    "DMRcate" # depends on broken package Rsamtools-1.21.8
+    "DMRforPairs" # depends on broken package Rsamtools-1.21.8
     "domainsignatures" # build is broken
     "doMPI" # build is broken
+    "DOQTL" # depends on broken package Rsamtools-1.21.8
     "DOSE" # depends on broken package GOSemSim-1.27.3
     "dpa" # depends on broken package nlopt-2.4.2
+    "dpcR" # depends on broken nloptr-1.0.4
     "drc" # depends on broken package nlopt-2.4.2
     "drfit" # depends on broken package nlopt-2.4.2
     "drsmooth" # depends on broken package nlopt-2.4.2
@@ -1060,20 +881,32 @@ let
     "dualKS" # depends on broken package affyio-1.37.0
     "dynlm" # depends on broken package nlopt-2.4.2
     "easyanova" # depends on broken package nlopt-2.4.2
+    "easyRNASeq" # depends on broken package Rsamtools-1.21.8
+    "EDASeq" # depends on broken package Rsamtools-1.21.8
     "edge" # depends on broken package nlopt-2.4.2
     "eeptools" # depends on broken package nlopt-2.4.2
     "EffectLiteR" # depends on broken package nlopt-2.4.2
     "effects" # depends on broken package nlopt-2.4.2
     "eiR" # depends on broken package ChemmineR-2.21.7
     "eisa" # depends on broken package Category-2.35.1
+    "ELMER" # depends on broken package Rsamtools-1.21.8
     "EMA" # depends on broken package nlopt-2.4.2
     "ENmix" # depends on broken package affyio-1.37.0
     "EnQuireR" # depends on broken package nlopt-2.4.2
+    "EnrichmentBrowser" # depends on broken package r-EDASeq-2.3.2
     "ensembldb" # depends on broken package interactiveDisplayBase-1.7.0
+    "ensemblVEP" # depends on broken package Rsamtools-1.21.8
+    "epigenomix" # depends on broken package Rsamtools-1.21.8
     "episplineDensity" # depends on broken package nlopt-2.4.2
+    "epivizr" # depends on broken package Rsamtools-1.21.8
     "epr" # depends on broken package nlopt-2.4.2
     "erer" # depends on broken package nlopt-2.4.2
+    "erma" # depends on broken GenomicFiles-1.5.4
+    "erpR" # depends on broken package rpanel-1.1-3
     "ExiMiR" # depends on broken package affyio-1.37.0
+    "exomeCopy" # depends on broken package Rsamtools-1.21.8
+    "ExomeDepth" # depends on broken package Rsamtools-1.21.8
+    "exomePeak" # depends on broken package Rsamtools-1.21.8
     "ExpressionView" # depends on broken package Category-2.35.1
     "extRemes" # depends on broken package nlopt-2.4.2
     "ez" # depends on broken package nlopt-2.4.2
@@ -1082,10 +915,12 @@ let
     "Factoshiny" # depends on broken package nlopt-2.4.2
     "faoutlier" # depends on broken package nlopt-2.4.2
     "farms" # depends on broken package affyio-1.37.0
+    "fastLiquidAssociation" # depends on broken package LiquidAssociation-1.23.0
     "fastR" # depends on broken package nlopt-2.4.2
     "FDRreg" # depends on broken package nlopt-2.4.2
     "FEM" # build is broken
     "ffpe" # depends on broken package affyio-1.37.0
+    "flagme" # depends on broken package mzR-2.3.1
     "flowDensity" # depends on broken package nlopt-2.4.2
     "flowPeaks" # build is broken
     "flowQ" # build is broken
@@ -1094,13 +929,17 @@ let
     "flowVS" # depends on broken package ncdfFlow-2.15.2
     "flowWorkspace" # depends on broken package ncdfFlow-2.15.2
     "fmcsR" # depends on broken package ChemmineR-2.21.7
+    "FourCSeq" # depends on broken package Rsamtools-1.21.8
+    "fPortfolio" # depends on broken package Rsymphony-0.1-20
     "freqweights" # depends on broken package nlopt-2.4.2
     "frma" # depends on broken package affyio-1.37.0
     "frmaTools" # depends on broken package affyio-1.37.0
     "fscaret" # depends on broken package nlopt-2.4.2
     "FunciSNP" # depends on broken package snpStats-1.19.0
+    "FunctionalNetworks" # Build Is Broken
     "fxregime" # depends on broken package nlopt-2.4.2
     "gamclass" # depends on broken package nlopt-2.4.2
+    "gamlss_demo" # depends on broken package rpanel-1.1-3
     "gamm4" # depends on broken package nlopt-2.4.2
     "gCMAP" # depends on broken package Category-2.35.1
     "gCMAPWeb" # depends on broken package Category-2.35.1
@@ -1110,20 +949,35 @@ let
     "GENE_E" # depends on broken package rhdf5-2.13.1
     "GeneExpressionSignature" # depends on broken package annaffy-1.41.1
     "GeneticTools" # depends on broken package snpStats-1.19.0
+    "genomation" # depends on broken package Rsamtools-1.21.8
+    "GenomicAlignments" # depends on broken package Rsamtools-1.21.8
+    "GenomicFeatures" # depends on broken package Rsamtools-1.21.8
+    "GenomicFiles" # depends on broken package Rsamtools-1.21.8
+    "GenomicInteractions" # depends on broken package Rsamtools-1.21.8
+    "genotypeeval" # depends on broken package r-rtracklayer-1.29.12
+    "GenoView" # depends on broken package Rsamtools-1.21.8
     "genridge" # depends on broken package nlopt-2.4.2
+    "geojsonio" # depends on broken package V8-0.6
     "GEOsubmission" # depends on broken package affyio-1.37.0
     "gespeR" # depends on broken package Category-2.35.1
     "GEWIST" # depends on broken package nlopt-2.4.2
     "GGBase" # depends on broken package snpStats-1.19.0
+    "ggbio" # depends on broken package Rsamtools-1.21.8
     "GGtools" # depends on broken package snpStats-1.19.0
     "gimme" # depends on broken package nlopt-2.4.2
+    "girafe" # depends on broken package Rsamtools-1.21.8
+    "gmapR" # depends on broken package Rsamtools-1.21.8
     "gmatrix" # depends on broken package cudatoolkit-5.5.22
+    "gMCP" # build is broken
     "GOFunction" # build is broken
+    "GOGANPA" # depends on broken package WGCNA-1.47
+    "GoogleGenomics" # depends on broken package Rsamtools-1.21.8
     "goProfiles" # build is broken
     "GOSemSim" # Build Is Broken
     "goseq" # build is broken
     "GOSim" # depends on broken package topGO-2.21.0
     "GOstats" # depends on broken package AnnotationForge-1.11.3
+    "GOTHiC" # depends on broken package Rsamtools-1.21.8
     "goTools" # build is broken
     "gplm" # depends on broken package nlopt-2.4.2
     "gputools" # depends on broken package cudatoolkit-5.5.22
@@ -1131,24 +985,40 @@ let
     "granova" # depends on broken package nlopt-2.4.2
     "graphicalVAR" # depends on broken package nlopt-2.4.2
     "GraphPCA" # depends on broken package nlopt-2.4.2
+    "GreyListChIP" # depends on broken package Rsamtools-1.21.8
+    "groHMM" # depends on broken package Rsamtools-1.21.8
     "GSCA" # depends on broken package rhdf5-2.13.1
+    "GUIDE" # depends on broken package rpanel-1.1-3
+    "Gviz" # depends on broken package Rsamtools-1.21.8
     "GWAF" # depends on broken package nlopt-2.4.2
     "gwascat" # depends on broken package interactiveDisplayBase-1.7.0
     "h2o" # build is broken
+    "h5" # build is broken
     "h5vc" # depends on broken package rhdf5-2.13.1
     "Harshlight" # depends on broken package affyio-1.37.0
     "hbsae" # depends on broken package nlopt-2.4.2
     "heplots" # depends on broken package nlopt-2.4.2
+    "hiAnnotator" # depends on broken package Rsamtools-1.21.8
+    "hierGWAS"
+    "HierO" # Build Is Broken
+    "highriskzone"
     "HilbertVisGUI" # Build Is Broken
+    "HiPLARM" # Build Is Broken
+    "hiReadsProcessor" # depends on broken package Rsamtools-1.21.8
     "HistDAWass" # depends on broken package nlopt-2.4.2
+    "HiTC" # depends on broken package Rsamtools-1.21.8
     "HLMdiag" # depends on broken package nlopt-2.4.2
     "HTqPCR" # depends on broken package affyio-1.37.0
     "HTSanalyzeR" # depends on broken package Category-2.35.1
+    "HTSeqGenie" # depends on broken package Rsamtools-1.21.8
+    "htSeqTools" # depends on broken package Rsamtools-1.21.8
     "hysteresis" # depends on broken package nlopt-2.4.2
     "IATscores" # depends on broken package nlopt-2.4.2
     "ibd" # depends on broken package nlopt-2.4.2
     "ibh" # build is broken
     "iccbeta" # depends on broken package nlopt-2.4.2
+    "IdeoViz" # depends on broken package Rsamtools-1.21.8
+    "ifaTools" # depends on broken package r-OpenMx-2.2.6
     "iFes" # depends on broken package cudatoolkit-5.5.22
     "imageHTS" # depends on broken package Category-2.35.1
     "immunoClust" # build is broken
@@ -1156,9 +1026,15 @@ let
     "in2extRemes" # depends on broken package nlopt-2.4.2
     "inferference" # depends on broken package nlopt-2.4.2
     "influence_ME" # depends on broken package nlopt-2.4.2
+    "InPAS" # depends on broken package Rsamtools-1.21.8
     "inSilicoMerging" # build is broken
+    "INSPEcT" # depends on broken GenomicFeatures-1.21.13
+    "intansv" # depends on broken package Rsamtools-1.21.8
     "interactiveDisplayBase" # build is broken
     "interactiveDisplay" # depends on broken package Category-2.35.1
+    "interplot" # depends on broken arm-1.8-5
+    "IONiseR" # depends on broken rhdf5-2.13.4
+    "iptools"
     "IsingFit" # depends on broken package nlopt-2.4.2
     "IsoGene" # depends on broken package affyio-1.37.0
     "IsoGeneGUI" # depends on broken package affyio-1.37.0
@@ -1166,14 +1042,21 @@ let
     "IVAS" # depends on broken package nlopt-2.4.2
     "ivpack" # depends on broken package nlopt-2.4.2
     "JAGUAR" # depends on broken package nlopt-2.4.2
+    "jetset"
     "joda" # depends on broken package nlopt-2.4.2
     "jomo" # build is broken
+    "js" # depends on broken package V8-0.6
     "KANT" # depends on broken package affyio-1.37.0
     "keggorthology" # build is broken
+    "KEGGprofile" # Build Is Broken
+    "lawn" # depends on broken package V8-0.6
     "learnstats" # depends on broken package nlopt-2.4.2
+    "lefse" # build is broken
     "lessR" # depends on broken package nlopt-2.4.2
     "lfe" # build is broken
+    "lgcp" # depends on broken package rpanel-1.1-3
     "limmaGUI" # depends on broken package affyio-1.37.0
+    "LinRegInteractive" # depends on broken package rpanel-1.1-3
     "LiquidAssociation" # build is broken
     "lmdme" # build is broken
     "lme4" # depends on broken package nlopt-2.4.2
@@ -1184,8 +1067,10 @@ let
     "LogisticDx" # depends on broken package nlopt-2.4.2
     "logitT" # depends on broken package affyio-1.37.0
     "longpower" # depends on broken package nlopt-2.4.2
+    "LowMACA" # depends on broken package Rsamtools-1.21.8
     "lumi" # depends on broken package affyio-1.37.0
     "LVSmiRNA" # depends on broken package affyio-1.37.0
+    "M3D" # depends on broken package Rsamtools-1.21.8
     "MAIT" # depends on broken package nlopt-2.4.2
     "makecdfenv" # depends on broken package affyio-1.37.0
     "mAPKL" # build is broken
@@ -1195,27 +1080,46 @@ let
     "MatrixRider" # depends on broken package DirichletMultinomial-1.11.1
     "MaxPro" # depends on broken package nlopt-2.4.2
     "mbest" # depends on broken package nlopt-2.4.2
+    "MBmca" # depends on broken nloptr-1.0.4
     "mBPCR" # depends on broken package affyio-1.37.0
+    "mcaGUI" # depends on broken package Rsamtools-1.21.8
     "MCRestimate" # build is broken
     "mdgsa" # build is broken
     "meboot" # depends on broken package nlopt-2.4.2
+    "mediation" # depends on broken package r-lme4-1.1-8
+    "MEDIPS" # depends on broken package Rsamtools-1.21.8
     "MEDME" # depends on broken package nlopt-2.4.2
     "MEMSS" # depends on broken package nlopt-2.4.2
     "meshr" # depends on broken package Category-2.35.1
+    "Metab" # depends on broken package mzR-2.3.1
     "metagear" # build is broken
+    "metagene" # depends on broken package Rsamtools-1.21.8
+    "metaMix" # build is broken
+    "metaMS" # depends on broken package mzR-2.3.1
     "metaplus" # depends on broken package nlopt-2.4.2
+    "metaSEM" # depends on broken package OpenMx-2.2.4
     "metaseqR" # depends on broken package affyio-1.37.0
     "Metatron" # depends on broken package nlopt-2.4.2
     "methyAnalysis" # depends on broken package affyio-1.37.0
+    "MethylAid" # depends on broken package Rsamtools-1.21.8
+    "methylPipe" # depends on broken package Rsamtools-1.21.8
+    "MethylSeekR" # depends on broken package Rsamtools-1.21.8
+    "methylumi" # depends on broken package Rsamtools-1.21.8
     "miceadds" # depends on broken package nlopt-2.4.2
     "micEconAids" # depends on broken package nlopt-2.4.2
     "micEconCES" # depends on broken package nlopt-2.4.2
     "micEconSNQP" # depends on broken package nlopt-2.4.2
     "mi" # depends on broken package nlopt-2.4.2
+    "MigClim" # Build Is Broken
     "migui" # depends on broken package nlopt-2.4.2
     "MineICA" # depends on broken package AnnotationForge-1.11.3
+    "minfi" # depends on broken package Rsamtools-1.21.8
+    "minimist" # depends on broken package V8-0.6
     "MinimumDistance" # depends on broken package affyio-1.37.0
+    "mirIntegrator" # build is broken
+    "missDeaths"
     "missMDA" # depends on broken package nlopt-2.4.2
+    "missMethyl" # depends on broken package Rsamtools-1.21.8
     "mitoODE" # build is broken
     "mixAK" # depends on broken package nlopt-2.4.2
     "mixlm" # depends on broken package nlopt-2.4.2
@@ -1229,6 +1133,12 @@ let
     "mongolite" # build is broken
     "monocle" # build is broken
     "mosaic" # depends on broken package nlopt-2.4.2
+    "MotifDb" # depends on broken package Rsamtools-1.21.8
+    "motifRG" # depends on broken package Rsamtools-1.21.8
+    "motifStack" # depends on broken package Rsamtools-1.21.8
+    "MotIV" # depends on broken package Rsamtools-1.21.8
+    "MSeasy" # depends on broken package mzR-2.3.1
+    "MSeasyTkGUI" # depends on broken package mzR-2.3.1
     "MSGFgui" # depends on broken package MSGFplus-1.3.0
     "MSGFplus" # Build Is Broken
     "msmsEDA" # depends on broken package affyio-1.37.0
@@ -1239,15 +1149,19 @@ let
     "multiDimBio" # depends on broken package nlopt-2.4.2
     "MultiRR" # depends on broken package nlopt-2.4.2
     "muma" # depends on broken package nlopt-2.4.2
+    "munsellinterpol"
     "mutossGUI" # build is broken
     "mvGST" # depends on broken package AnnotationForge-1.11.3
     "mvinfluence" # depends on broken package nlopt-2.4.2
+    "mygene" # depends on broken package Rsamtools-1.21.8
     "mzR" # build is broken
     "NanoStringQCPro" # build is broken
     "nCal" # depends on broken package nlopt-2.4.2
     "ncdfFlow" # build is broken
     "NCIgraph" # depends on broken package RCytoscape-1.19.0
     "netbenchmark" # build is broken
+    "nettools" # depends on broken package WGCNA-1.47
+    "NGScopy"
     "NHPoisson" # depends on broken package nlopt-2.4.2
     "nloptr" # depends on broken package nlopt-2.4.2
     "nondetects" # depends on broken package affyio-1.37.0
@@ -1255,6 +1169,7 @@ let
     "NormqPCR" # depends on broken package affyio-1.37.0
     "NORRRM" # build is broken
     "npIntFactRep" # depends on broken package nlopt-2.4.2
+    "nucleR" # depends on broken package Rsamtools-1.21.8
     "oligoClasses" # depends on broken package affyio-1.37.0
     "oligo" # depends on broken package affyio-1.37.0
     "OmicsMarkeR" # depends on broken package nlopt-2.4.2
@@ -1263,7 +1178,11 @@ let
     "openCyto" # depends on broken package ncdfFlow-2.15.2
     "OpenMx" # build is broken
     "OperaMate" # depends on broken package Category-2.35.1
+    "optBiomarker" # depends on broken package rpanel-1.1-3
+    "ora" # depends on broken package ROracle-1.1-12
     "ordBTL" # depends on broken package nlopt-2.4.2
+    "OrganismDbi" # depends on broken package Rsamtools-1.21.8
+    "OTUbase" # depends on broken package Rsamtools-1.21.8
     "OUwie" # depends on broken package nlopt-2.4.2
     "PADOG" # build is broken
     "pamm" # depends on broken package nlopt-2.4.2
@@ -1273,15 +1192,22 @@ let
     "papeR" # depends on broken package nlopt-2.4.2
     "parboost" # depends on broken package nlopt-2.4.2
     "parma" # depends on broken package nlopt-2.4.2
+    "Pasha" # depends on broken package GenomicAlignments-1.5.12
     "pathClass" # depends on broken package affyio-1.37.0
     "pathRender" # build is broken
+    "pathview" # build is broken
     "PatternClass" # build is broken
     "Pbase" # depends on broken package affyio-1.37.0
+    "pbdBASE" # depends on broken package pbdSLAP-0.2-0
+    "pbdDEMO" # depends on broken package pbdSLAP-0.2-0
+    "pbdDMAT" # depends on broken package pbdSLAP-0.2-0
     "pbdSLAP" # build is broken
     "PBImisc" # depends on broken package nlopt-2.4.2
     "pbkrtest" # depends on broken package nlopt-2.4.2
     "PBSddesolve" # build is broken
     "PBSmapping" # build is broken
+    "pcaBootPlot" # depends on broken FactoMineR-1.31.3
+    "pcaL1" # build is broken
     "PCpheno" # depends on broken package Category-2.35.1
     "pdInfoBuilder" # depends on broken package affyio-1.37.0
     "pdmclass" # build is broken
@@ -1289,20 +1215,27 @@ let
     "pedigreemm" # depends on broken package nlopt-2.4.2
     "pedometrics" # depends on broken package nlopt-2.4.2
     "pequod" # depends on broken package nlopt-2.4.2
+    "permGPU" # build is broken
+    "PGA" # depends on broken package Rsamtools-1.21.8
     "PGSEA" # depends on broken package annaffy-1.41.1
+    "PharmacoGx"
     "phenoDist" # depends on broken package Category-2.35.1
     "phenoTest" # depends on broken package Category-2.35.1
     "PhenStat" # depends on broken package nlopt-2.4.2
     "phia" # depends on broken package nlopt-2.4.2
     "phylocurve" # depends on broken package nlopt-2.4.2
     "phyloTop" # depends on broken package nlopt-2.4.2
+    "PICS" # depends on broken package Rsamtools-1.21.8
+    "PING" # depends on broken package Rsamtools-1.21.8
     "plateCore" # depends on broken package ncdfFlow-2.15.2
     "plier" # depends on broken package affyio-1.37.0
     "plsRbeta" # depends on broken package nlopt-2.4.2
     "plsRcox" # depends on broken package nlopt-2.4.2
     "plsRglm" # depends on broken package nlopt-2.4.2
     "plw" # depends on broken package affyio-1.37.0
+    "pmclust" # build is broken
     "pmm" # depends on broken package nlopt-2.4.2
+    "podkat" # depends on broken package Rsamtools-1.21.8
     "polytomous" # depends on broken package nlopt-2.4.2
     "pomp" # depends on broken package nlopt-2.4.2
     "ppiPre" # depends on broken package GOSemSim-1.27.3
@@ -1310,28 +1243,51 @@ let
     "prebs" # depends on broken package affyio-1.37.0
     "predictmeans" # depends on broken package nlopt-2.4.2
     "prLogistic" # depends on broken package nlopt-2.4.2
+    "proBAMr" # depends on broken package Rsamtools-1.21.8
     "ProCoNA" # depends on broken package AnnotationForge-1.11.3
     "pRoloc" # depends on broken package nlopt-2.4.2
     "pRolocGUI" # depends on broken package nlopt-2.4.2
     "proteoQC" # depends on broken package affyio-1.37.0
     "PSAboot" # depends on broken package nlopt-2.4.2
+    "ptw" # depends on broken nloptr-1.0.4
     "puma" # depends on broken package affyio-1.37.0
     "pvac" # depends on broken package affyio-1.37.0
     "pvca" # depends on broken package nlopt-2.4.2
+    "Pviz" # depends on broken package Rsamtools-1.21.8
     "pwOmics" # depends on broken package interactiveDisplayBase-1.7.0
+    "PythonInR"
     "qcmetrics" # build is broken
+    "QDNAseq" # depends on broken package Rsamtools-1.21.8
+    "QFRM"
     "qgraph" # depends on broken package nlopt-2.4.2
     "qpcrNorm" # depends on broken package affyio-1.37.0
+    "qpgraph" # depends on broken package Rsamtools-1.21.8
+    "qrqc" # depends on broken package Rsamtools-1.21.8
+    "qtbase" # build is broken
     "qtlnet" # depends on broken package nlopt-2.4.2
+    "qtpaint" # depends on broken package qtbase-1.0.9
+    "qtutils" # depends on broken package qtbase-1.0.9
     "QUALIFIER" # depends on broken package ncdfFlow-2.15.2
     "quantification" # depends on broken package nlopt-2.4.2
+    "quantro" # depends on broken package Rsamtools-1.21.8
+    "QuasR" # depends on broken package Rsamtools-1.21.8
     "R2STATS" # depends on broken package nlopt-2.4.2
+    "R3CPET" # depends on broken package Rsamtools-1.21.8
+    "r3Cseq" # depends on broken package Rsamtools-1.21.8
+    "R453Plus1Toolbox" # depends on broken package Rsamtools-1.21.8
     "radiant" # depends on broken package nlopt-2.4.2
     "raincpc" # build is broken
     "rainfreq" # build is broken
     "RamiGO" # depends on broken package RCytoscape-1.19.0
+    "RapidPolygonLookup" # depends on broken package PBSmapping-2.69.76
+    "RAPIDR" # depends on broken package Rsamtools-1.21.8
+    "RareVariantVis" # depends on broken VariantAnnotation-1.15.19
+    "Rariant" # depends on broken package Rsamtools-1.21.8
     "rasclass" # depends on broken package nlopt-2.4.2
+    "RBerkeley"
     "RbioRXN" # depends on broken package ChemmineR-2.21.7
+    "Rcade" # depends on broken package Rsamtools-1.21.8
+    "rCGH" # depends on broken package r-affy-1.47.1
     "Rchemcpp" # depends on broken package ChemmineR-2.21.7
     "Rcmdr" # depends on broken package nlopt-2.4.2
     "RcmdrMisc" # depends on broken package nlopt-2.4.2
@@ -1373,27 +1329,47 @@ let
     "RcmdrPlugin_temis" # depends on broken package nlopt-2.4.2
     "RcmdrPlugin_UCA" # depends on broken package nlopt-2.4.2
     "Rcpi" # depends on broken package ChemmineR-2.21.7
+    "Rcplex" # Build Is Broken
+    "RcppAPT" # Build Is Broken
     "RcppOctave" # build is broken
     "RcppRedis" # build is broken
     "RCytoscape" # Build Is Broken
     "RDAVIDWebService" # depends on broken package Category-2.35.1
     "rdd" # depends on broken package nlopt-2.4.2
+    "rddtools" # depends on broken package r-AER-1.2-4
+    "rDEA" # build is broken
     "RDieHarder" # build is broken
     "ReactomePA" # depends on broken package GOSemSim-1.27.3
     "ReadqPCR" # depends on broken package affyio-1.37.0
+    "REBayes" # depends on broken package Rmosek-1.2.5.1
+    "REDseq" # depends on broken package Rsamtools-1.21.8
     "referenceIntervals" # depends on broken package nlopt-2.4.2
     "RefNet" # depends on broken package interactiveDisplayBase-1.7.0
     "RefPlus" # depends on broken package affyio-1.37.0
     "refund" # depends on broken package nlopt-2.4.2
+    "regioneR" # depends on broken package Rsamtools-1.21.8
+    "regionReport" # depends on broken package Rsamtools-1.21.8
+    "repijson" # depends on broken package V8-0.6
     "Repitools" # depends on broken package affyio-1.37.0
     "ReportingTools" # depends on broken package Category-2.35.1
+    "ReQON" # depends on broken package Rsamtools-1.21.8
     "REST" # depends on broken package nlopt-2.4.2
+    "rfPred" # depends on broken package Rsamtools-1.21.8
+    "rGADEM" # depends on broken package Rsamtools-1.21.8
+    "rgbif" # depends on broken package V8-0.6
+    "Rgnuplot"
     "rgp" # build is broken
+    "rgpui" # depends on broken package rgp-0.4-1
     "rgsepd" # depends on broken package goseq-1.21.1
     "rhdf5" # build is broken
     "rHVDM" # depends on broken package affyio-1.37.0
     "Ringo" # depends on broken package affyio-1.37.0
+    "RIPSeeker" # depends on broken package Rsamtools-1.21.8
     "Risa" # depends on broken package affyio-1.37.0
+    "rjade" # depends on broken package V8-0.6
+    "rJPSGCS" # build is broken
+    "rLindo" # build is broken
+    "RMassBank" # depends on broken package mzR-2.3.1
     "rMAT" # build is broken
     "rmgarch" # depends on broken package nlopt-2.4.2
     "rminer" # depends on broken package nlopt-2.4.2
@@ -1401,37 +1377,56 @@ let
     "Rmosek" # build is broken
     "RNAinteract" # depends on broken package Category-2.35.1
     "RNAither" # depends on broken package nlopt-2.4.2
+    "RNAprobR" # depends on broken package Rsamtools-1.21.8
+    "rnaSeqMap" # depends on broken package Rsamtools-1.21.8
+    "RnaSeqSampleSize" # Build Is Broken
     "RnavGraph" # build is broken
+    "RnBeads" # depends on broken package Rsamtools-1.21.8
     "Rnits" # depends on broken package affyio-1.37.0
+    "roar" # depends on broken package Rsamtools-1.21.8
     "RobLoxBioC" # depends on broken package affyio-1.37.0
     "robustlmm" # depends on broken package nlopt-2.4.2
     "rockchalk" # depends on broken package nlopt-2.4.2
+    "ROI_plugin_symphony" # depends on broken package Rsymphony-0.1-20
+    "Rolexa" # depends on broken package Rsamtools-1.21.8
     "rols" # build is broken
+    "ROracle" # Build Is Broken
     "RPA" # depends on broken package affyio-1.37.0
     "rpanel" # build is broken
     "rpubchem" # depends on broken package nlopt-2.4.2
+    "Rqc" # depends on broken package Rsamtools-1.21.8
     "RQuantLib" # build is broken
     "rr" # depends on broken package nlopt-2.4.2
+    "Rsamtools" # Build Is Broken
     "RSAP" # build is broken
     "rsbml" # build is broken
     "rscala" # build is broken
     "RSDA" # depends on broken package nlopt-2.4.2
+    "rSFFreader" # depends on broken package Rsamtools-1.21.8
     "Rsubread" # Build Is Broken
+    "RSVSim" # depends on broken package Rsamtools-1.21.8
     "Rsymphony" # build is broken
     "rTANDEM" # build is broken
     "RTN" # depends on broken package nlopt-2.4.2
+    "rtracklayer" # depends on broken package Rsamtools-1.21.8
+    "rTRMui" # depends on broken package Rsamtools-1.21.8
     "rugarch" # depends on broken package nlopt-2.4.2
     "RUVcorr" # build is broken
     "RUVnormalize" # Build Is Broken
+    "RUVSeq" # depends on broken package Rsamtools-1.21.8
     "RVAideMemoire" # depends on broken package nlopt-2.4.2
     "RVFam" # depends on broken package nlopt-2.4.2
+    "RVideoPoker" # depends on broken package rpanel-1.1-3
     "ryouready" # depends on broken package nlopt-2.4.2
     "sampleSelection" # depends on broken package nlopt-2.4.2
+    "sapFinder" # depends on broken package rTANDEM-1.9.0
     "SCAN_UPC" # depends on broken package affyio-1.37.0
     "ScISI" # depends on broken package apComplex-2.35.0
     "sdcMicro" # depends on broken package nlopt-2.4.2
     "sdcMicroGUI" # depends on broken package nlopt-2.4.2
+    "SDD" # depends on broken package rpanel-1.1-3
     "seeg" # depends on broken package nlopt-2.4.2
+    "segmentSeq" # depends on broken package Rsamtools-1.21.8
     "sem" # depends on broken package nlopt-2.4.2
     "semdiag" # depends on broken package nlopt-2.4.2
     "SemDist" # Build Is Broken
@@ -1439,9 +1434,23 @@ let
     "semPlot" # depends on broken package nlopt-2.4.2
     "SensoMineR" # depends on broken package nlopt-2.4.2
     "SEPA" # depends on broken package topGO-2.21.0
+    "seq2pathway" # depends on broken package WGCNA-1.47
+    "SeqArray" # depends on broken package Rsamtools-1.21.8
+    "seqbias" # depends on broken package Rsamtools-1.21.8
+    "seqCNA" # build is broken
+    "SeqGrapheR" # Build Is Broken
+    "seqplots" # depends on broken package Rsamtools-1.21.8
     "seqTools" # build is broken
+    "SeqVarTools" # depends on broken package Rsamtools-1.21.8
+    "SGSeq" # depends on broken package Rsamtools-1.21.8
+    "shinyMethyl" # depends on broken package Rsamtools-1.21.8
+    "shinyTANDEM" # depends on broken package rTANDEM-1.9.0
+    "ShortRead" # depends on broken package Rsamtools-1.21.8
+    "SIMAT" # depends on broken package mzR-2.3.1
     "SimBindProfiles" # depends on broken package affyio-1.37.0
+    "similaRpeak" # depends on broken package Rsamtools-1.21.8
     "simpleaffy" # depends on broken package affyio-1.37.0
+    "SimRAD" # depends on broken package Rsamtools-1.21.8
     "sirt" # depends on broken package nlopt-2.4.2
     "sjPlot" # depends on broken package nlopt-2.4.2
     "skewr" # depends on broken package affyio-1.37.0
@@ -1453,11 +1462,23 @@ let
     "snpEnrichment" # depends on broken package snpStats-1.19.0
     "snpStats" # build is broken
     "snpStatsWriter" # depends on broken package snpStats-1.19.0
+    "SNPtools" # depends on broken package Rsamtools-1.21.8
     "SOD" # depends on broken package cudatoolkit-5.5.22
+    "soGGi" # depends on broken package Rsamtools-1.21.8
+    "soilphysics" # depends on broken package rpanel-1.1-3
+    "SomaticSignatures" # depends on broken package Rsamtools-1.21.8
+    "SoyNAM" # depends on broken package r-lme4-1.1-8
     "spacom" # depends on broken package nlopt-2.4.2
     "specificity" # depends on broken package nlopt-2.4.2
+    "spliceR" # depends on broken package Rsamtools-1.21.8
+    "SplicingGraphs" # depends on broken package Rsamtools-1.21.8
+    "spocc" # depends on broken package V8-0.6
+    "spoccutils" # depends on broken spocc-0.3.0
+    "spsann" # depends on broken package r-pedometrics-0.6-2
     "sscore" # depends on broken package affyio-1.37.0
     "ssmrob" # depends on broken package nlopt-2.4.2
+    "ssviz" # depends on broken package Rsamtools-1.21.8
+    "stagePop" # depends on broken package PBSddesolve-1.11.29
     "staRank" # depends on broken package Category-2.35.1
     "Starr" # depends on broken package affyio-1.37.0
     "STATegRa" # depends on broken package affyio-1.37.0
@@ -1465,16 +1486,29 @@ let
     "stepp" # depends on broken package nlopt-2.4.2
     "stringgaussnet" # build is broken
     "Surrogate" # depends on broken package nlopt-2.4.2
+    "SVM2CRM" # depends on broken package Rsamtools-1.21.8
+    "sybilSBML" # build is broken
     "synapter" # depends on broken package affyio-1.37.0
     "systemfit" # depends on broken package nlopt-2.4.2
     "systemPipeR" # depends on broken package AnnotationForge-1.11.3
+    "TargetSearch" # depends on broken package mzR-2.3.1
     "TcGSA" # depends on broken package nlopt-2.4.2
     "TDMR" # depends on broken package nlopt-2.4.2
+    "TEQC" # depends on broken package Rsamtools-1.21.8
     "TFBSTools" # depends on broken package DirichletMultinomial-1.11.1
     "tigerstats" # depends on broken package nlopt-2.4.2
     "tilingArray" # depends on broken package affyio-1.37.0
+    "TIN" # depends on broken package WGCNA-1.47
+    "TitanCNA" # depends on broken package Rsamtools-1.21.8
+    "ToPASeq" # depends on broken package Rsamtools-1.21.8
     "topGO" # build is broken
+    "topologyGSA" # depends on broken package Rsamtools-1.21.8
+    "tracktables" # depends on broken package Rsamtools-1.21.8
+    "trackViewer" # depends on broken package Rsamtools-1.21.8
+    "translateSPSS2R" # depends on broken car-2.0-25
     "tRanslatome" # depends on broken package GOSemSim-1.27.3
+    "TransView" # depends on broken package Rsamtools-1.21.8
+    "traseR"
     "TriMatch" # depends on broken package nlopt-2.4.2
     "TROM" # depends on broken package topGO-2.21.0
     "TurboNorm" # depends on broken package affyio-1.37.0
@@ -1482,47 +1516,30 @@ let
     "userfriendlyscience" # depends on broken package nlopt-2.4.2
     "V8" # build is broken
     "VanillaICE" # depends on broken package affyio-1.37.0
+    "variancePartition" # depends on broken package lme4-1.1-8
+    "VariantAnnotation" # depends on broken package Rsamtools-1.21.8
+    "VariantFiltering" # depends on broken package Rsamtools-1.21.8
+    "VariantTools" # depends on broken package Rsamtools-1.21.8
     "VIM" # depends on broken package nlopt-2.4.2
     "VIMGUI" # depends on broken package nlopt-2.4.2
+    "vmsbase" # depends on broken package PBSmapping-2.69.76
     "vows" # depends on broken package nlopt-2.4.2
     "vsn" # depends on broken package affyio-1.37.0
     "vtpnet" # depends on broken package interactiveDisplayBase-1.7.0
     "wateRmelon" # depends on broken package affyio-1.37.0
+    "wavClusteR" # depends on broken package Rsamtools-1.21.8
     "waveTiling" # depends on broken package affyio-1.37.0
     "webbioc" # depends on broken package affyio-1.37.0
     "wfe" # depends on broken package nlopt-2.4.2
     "WGCNA" # build is broken
     "wgsea" # depends on broken package snpStats-1.19.0
     "WideLM" # depends on broken package cudatoolkit-5.5.22
+    "xcms" # depends on broken package mzR-2.3.1
     "xergm" # depends on broken package nlopt-2.4.2
     "xps" # build is broken
     "yaqcaffy" # depends on broken package affyio-1.37.0
     "ZeligMultilevel" # depends on broken package nlopt-2.4.2
     "zetadiv" # depends on broken package nlopt-2.4.2
-    "CNVPanelizer" # depends on broken cn.mops-1.15.1
-    "ClustGeo" # depends on broken FactoMineR-1.31.3
-    "INSPEcT" # depends on broken GenomicFeatures-1.21.13
-    "IONiseR" # depends on broken rhdf5-2.13.4
-    "MBmca" # depends on broken nloptr-1.0.4
-    "RareVariantVis" # depends on broken VariantAnnotation-1.15.19
-    "alsace" # depends on broken nloptr-1.0.4
-    "chipPCR" # depends on broken nloptr-1.0.4
-    "clusterSEs" # depends on broken AER-1.2-4
-    "dpcR" # depends on broken nloptr-1.0.4
-    "erma" # depends on broken GenomicFiles-1.5.4
-    "interplot" # depends on broken arm-1.8-5
-    "pcaBootPlot" # depends on broken FactoMineR-1.31.3
-    "ptw" # depends on broken nloptr-1.0.4
-    "spoccutils" # depends on broken spocc-0.3.0
-    "translateSPSS2R" # depends on broken car-2.0-25
-    "EnrichmentBrowser" # depends on broken package r-EDASeq-2.3.2
-    "SoyNAM" # depends on broken package r-lme4-1.1-8
-    "genotypeeval" # depends on broken package r-rtracklayer-1.29.12
-    "ifaTools" # depends on broken package r-OpenMx-2.2.6
-    "mediation" # depends on broken package r-lme4-1.1-8
-    "rCGH" # depends on broken package r-affy-1.47.1
-    "rddtools" # depends on broken package r-AER-1.2-4
-    "spsann" # depends on broken package r-pedometrics-0.6-2
   ];
 
   otherOverrides = old: new: {

From 9966ec4e548254aba78f2daef45f94dace74c527 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 30 Jul 2015 19:59:17 +0000
Subject: [PATCH 0840/2016] notmuch: fix gpg path in notmuch-config.c

Fixes errors when attempting to decrypt an encrypted message.
I'm not sure that `crypto.c` needs to be patched after this, since this setting
should propagate there, but let's play it safe.
---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 7cbec61b5e2..04d4eaebaa7 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
 
     for src in \
       crypto.c \
+      notmuch-config.c \
       emacs/notmuch-crypto.el
     do
       substituteInPlace "$src" \

From 9e60241f2f186338019bb2794dc54e1b3b051df3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 6 Aug 2015 19:47:00 +0200
Subject: [PATCH 0841/2016] libpsl: 0.7.1 -> 0.8.0

---
 pkgs/development/libraries/libpsl/default.nix | 51 ++++++++++++++-----
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index c304b9e6930..a64d3b108c2 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -1,16 +1,48 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, icu, libxslt, pkgconfig }:
+{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, icu, libxslt
+, pkgconfig }:
 
-let version = "0.7.1"; in
-stdenv.mkDerivation rec {
+let
+
+  version = "${libVersion}-list-${listVersion}";
+
+  listVersion = "2015-08-03";
+  listArchive = let
+    rev = "447962d71bf512fe41e828afc7fa66a1701c7c3c";
+  in fetchurl {
+    sha256 = "0gp0cb6p8yvyy5kvgdwg45ian9rb07bb0a9ibdj58g21l54mx3r2";
+    url = "https://codeload.github.com/publicsuffix/list/tar.gz/${rev}";
+  };
+
+  libVersion = "0.8.0";
+
+in stdenv.mkDerivation {
   name = "libpsl-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0hbsidbmwgpg0h48wh2pzsq59j8az7naz3s5q3yqn99yyjji2vgw";
-    rev = name;
+    sha256 = "0mjnj36igk6w3c0d4k2fqqg1kl6bpnxfrcgcgz1zdw33gfa5gdi7";
+    rev = "libpsl-${libVersion}";
     repo = "libpsl";
     owner = "rockdaboot";
   };
 
+  buildInputs = [ icu libxslt ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  preAutoreconf = ''
+    echo "EXTRA_DIST =" > gtk-doc.make
+    echo "CLEANFILES =" >> gtk-doc.make
+  '';
+
+  preConfigure = ''
+    # The libpsl check phase requires the list's test scripts (tests/) as well
+    tar --directory=list --strip-components=1 -xf "${listArchive}"
+  '';
+  configureFlags = "--disable-static --enable-man";
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
   meta = with stdenv.lib; {
     inherit version;
     description = "C library for the Publix Suffix List";
@@ -26,13 +58,4 @@ stdenv.mkDerivation rec {
     platforms = with platforms; linux ++ darwin;
     maintainers = with maintainers; [ nckx ];
   };
-
-  buildInputs = [ icu libxslt ];
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
-  configureFlags = "--disable-static --enable-man";
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
 }

From 22b2330a4df67734c9b18c52a095e21ce75cb8b5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 6 Aug 2015 21:33:05 +0200
Subject: [PATCH 0842/2016] libpsl: build & install documentation

Since this includes the man page, it seems worth the dependencies.
---
 pkgs/development/libraries/libpsl/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index a64d3b108c2..753577a2918 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, icu, libxslt
-, pkgconfig }:
+{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc
+, icu, libxslt, pkgconfig }:
 
 let
 
@@ -26,18 +26,18 @@ in stdenv.mkDerivation {
   };
 
   buildInputs = [ icu libxslt ];
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig ];
 
   preAutoreconf = ''
-    echo "EXTRA_DIST =" > gtk-doc.make
-    echo "CLEANFILES =" >> gtk-doc.make
+    mkdir m4
+    gtkdocize
   '';
 
   preConfigure = ''
     # The libpsl check phase requires the list's test scripts (tests/) as well
     tar --directory=list --strip-components=1 -xf "${listArchive}"
   '';
-  configureFlags = "--disable-static --enable-man";
+  configureFlags = "--disable-static --enable-gtk-doc --enable-man";
 
   enableParallelBuilding = true;
 

From fa7a0f24a4c8e02789be6b5c9c83c4c3ee6948a5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 7 Aug 2015 01:45:18 +0200
Subject: [PATCH 0843/2016] Revert "simple-scan: fix build by adding lcms to
 buildInputs"

This reverts commit 37ff33196fe245d0c12cb1b84389e88d40bbb717.

This can't be it. `lcms` and `lcms2` are two entirely different packages.

Furthermore, the dependency is propagated through colord and should be
fixed there, if needed.
---
 pkgs/applications/graphics/simple-scan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 9eac6d0659a..954b2e02136 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2
-, makeWrapper, pkgconfig, saneBackends, systemd, vala, lcms }:
+, makeWrapper, pkgconfig, saneBackends, systemd, vala }:
 
 let version = "3.17.4"; in
 stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cairo colord glib gtk3 libxml2
-    saneBackends systemd vala lcms ];
+    saneBackends systemd vala ];
   nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ];
 
   enableParallelBuilding = true;

From 214d4fb73cd5c2aab6718a38b35c8b5217f0f200 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 6 Aug 2015 19:55:42 +0200
Subject: [PATCH 0844/2016] Allow options with type "package" to be store paths

For example, this allows writing

  nix.package = /nix/store/786mlvhd17xvcp2r4jmmay6jj4wj6b7f-nix-1.10pre4206_896428c;

Also, document types.package in the manual.
---
 lib/attrsets.nix                                     | 10 ++++++++++
 lib/strings.nix                                      |  5 +++++
 lib/types.nix                                        |  8 +++++---
 nixos/doc/manual/development/option-declarations.xml | 11 ++++++++++-
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 20be2002402..2300ee9c000 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -221,6 +221,16 @@ rec {
   isDerivation = x: isAttrs x && x ? type && x.type == "derivation";
 
 
+  /* Convert a store path to a fake derivation. */
+  toDerivation = path:
+    let path' = builtins.storePath path; in
+    { type = "derivation";
+      name = builtins.unsafeDiscardStringContext (builtins.substring 33 (-1) (baseNameOf path'));
+      outPath = path';
+      outputs = [ "out" ];
+    };
+
+
   /* If the Boolean `cond' is true, return the attribute set `as',
      otherwise an empty attribute set. */
   optionalAttrs = cond: as: if cond then as else {};
diff --git a/lib/strings.nix b/lib/strings.nix
index bac03c9d7ad..e72bdc6d968 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -218,4 +218,9 @@ rec {
 
   # Format a number adding leading zeroes up to fixed width.
   fixedWidthNumber = width: n: fixedWidthString width "0" (toString n);
+
+
+  # Check whether a value is a store path.
+  isStorePath = x: builtins.substring 0 1 (toString x) == "/" && dirOf (builtins.toPath x) == builtins.storeDir;
+
 }
diff --git a/lib/types.nix b/lib/types.nix
index 49f24b022de..a7f9bf1946e 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -94,14 +94,16 @@ rec {
     # derivation is a reserved keyword.
     package = mkOptionType {
       name = "derivation";
-      check = isDerivation;
-      merge = mergeOneOption;
+      check = x: isDerivation x || isStorePath x;
+      merge = loc: defs:
+        let res = mergeOneOption loc defs;
+        in if isDerivation res then res else toDerivation res;
     };
 
     path = mkOptionType {
       name = "path";
       # Hacky: there is no ‘isPath’ primop.
-      check = x: builtins.unsafeDiscardStringContext (builtins.substring 0 1 (toString x)) == "/";
+      check = x: builtins.substring 0 1 (toString x) == "/";
       merge = mergeOneOption;
     };
 
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index 6d93dc5c009..ea5d1241876 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -106,6 +106,15 @@ options = {
     </listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>types.package</varname></term>
+    <listitem>
+      <para>A derivation (such as <literal>pkgs.hello</literal>) or a
+      store path (such as
+      <filename>/nix/store/1ifi1cfbfs5iajmvwgrbmrnrw3a147h9-hello-2.10</filename>).</para>
+    </listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>types.listOf</varname> <replaceable>t</replaceable></term>
     <listitem>
@@ -138,4 +147,4 @@ You can also create new types using the function
 <varname>mkOptionType</varname>.  See
 <filename>lib/types.nix</filename> in Nixpkgs for details.</para>
 
-</section>
\ No newline at end of file
+</section>

From 80d9b426638563a6d8b6dc1604180cc60b4b2862 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 7 Aug 2015 05:25:59 +0200
Subject: [PATCH 0845/2016] Allow units to specify that they shouldn't be
 stopped when removed

---
 nixos/modules/system/activation/switch-to-configuration.pl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 4289740322a..655fbab2a84 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -97,7 +97,7 @@ sub parseFstab {
 sub parseUnit {
     my ($filename) = @_;
     my $info = {};
-    parseKeyValues($info, read_file($filename));
+    parseKeyValues($info, read_file($filename)) if -f $filename;
     parseKeyValues($info, read_file("${filename}.d/overrides.conf")) if -f "${filename}.d/overrides.conf";
     return $info;
 }
@@ -157,7 +157,8 @@ while (my ($unit, $state) = each %{$activePrev}) {
 
     if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) {
         if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") {
-            $unitsToStop{$unit} = 1;
+            my $unitInfo = parseUnit($prevUnitFile);
+            $unitsToStop{$unit} = 1 if boolIsTrue($unitInfo->{'X-StopOnRemoval'} // "yes");
         }
 
         elsif ($unit =~ /\.target$/) {

From 43c47560906f80e67ccf093884a50bf3f2972a51 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 7 Aug 2015 05:28:17 +0200
Subject: [PATCH 0846/2016] Add auto update feature

You can now keep your system up to date automatically by setting:

  system.autoUpgrade.enable = true;

Fixes #7369.
---
 .../modules/installer/tools/auto-upgrade.nix  | 81 +++++++++++++++++++
 nixos/modules/installer/tools/tools.nix       |  4 +
 nixos/modules/module-list.nix                 |  1 +
 3 files changed, 86 insertions(+)
 create mode 100644 nixos/modules/installer/tools/auto-upgrade.nix

diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix
new file mode 100644
index 00000000000..b2676b05a02
--- /dev/null
+++ b/nixos/modules/installer/tools/auto-upgrade.nix
@@ -0,0 +1,81 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.system.autoUpgrade; in
+
+{
+
+  options = {
+
+    system.autoUpgrade = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to periodically upgrade NixOS to the latest
+          version. If enabled, a systemd timer will run
+          <literal>nixos-rebuild switch --upgrade</literal> once a
+          day.
+        '';
+      };
+
+      channel = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = https://nixos.org/channels/nixos-14.12-small;
+        description = ''
+          The URI of the NixOS channel to use for automatic
+          upgrades. By default, this is the channel set using
+          <command>nix-channel</command> (run <literal>nix-channel
+          --list</literal> to see the current value).
+        '';
+      };
+
+      flags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "-I" "stuff=/home/alice/nixos-stuff" "--option" "extra-binary-caches" "http://my-cache.example.org/" ];
+        description = ''
+          Any additional flags passed to <command>nixos-rebuild</command>.
+        '';
+      };
+
+    };
+
+  };
+
+  config = {
+
+    system.autoUpgrade.flags =
+      [ "--no-build-output" ]
+      ++ (if cfg.channel == null
+          then [ "--upgrade" ]
+          else [ "-I" "nixpkgs=${cfg.channel}/nixexprs.tar.xz" ]);
+
+    systemd.services.nixos-upgrade = {
+      description = "NixOS Upgrade";
+
+      restartIfChanged = false;
+      unitConfig.X-StopOnRemoval = false;
+
+      serviceConfig.Type = "oneshot";
+
+      environment = config.nix.envVars //
+        { inherit (config.environment.sessionVariables) NIX_PATH SSL_CERT_FILE;
+          HOME = "/root";
+        };
+
+      path = [ pkgs.gnutar pkgs.xz config.nix.package ];
+
+      script = ''
+        ${config.system.build.nixos-rebuild}/bin/nixos-rebuild test ${toString cfg.flags}
+      '';
+
+      startAt = mkIf cfg.enable "04:40";
+    };
+
+  };
+
+}
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 61744c39d60..04e4c1eb945 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -57,7 +57,9 @@ let
 in
 
 {
+
   config = {
+
     environment.systemPackages =
       [ nixos-build-vms
         nixos-install
@@ -70,5 +72,7 @@ in
     system.build = {
       inherit nixos-install nixos-generate-config nixos-option nixos-rebuild;
     };
+
   };
+
 }
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 409f2292087..93d378aa95f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -41,6 +41,7 @@
   ./hardware/video/bumblebee.nix
   ./hardware/video/nvidia.nix
   ./hardware/video/ati.nix
+  ./installer/tools/auto-upgrade.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
   ./misc/assertions.nix

From 9f79830345d504fc11c495f283cd9e1cb8ff47aa Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Thu, 6 Aug 2015 21:19:20 -0700
Subject: [PATCH 0847/2016] firefox: 39.0 -> 39.0.3

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 916469f8e1c..c11eef3189b 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -16,14 +16,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "39.0"; in
+let version = "39.0.3"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "32785daee7ddb9da8d7509ef095258fc58fe838e";
+    sha1 = "e024e528317d6c531fb36a26d2ce3317d3510b42";
   };
 
   buildInputs =

From 404b37594898ebaa5765237adc8ae77a2e10ed06 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Fri, 7 Aug 2015 13:42:37 +0900
Subject: [PATCH 0848/2016] mupdf: desktop file fix

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

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index c988d171327..12dbbe6a9aa 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     Version=1.0
     Name=mupdf
     Comment=PDF viewer
-    Exec=$out/bin/mupdf-x11
+    Exec=$out/bin/mupdf-x11 %f
     Terminal=false
     EOF
   '';

From 825b8403a258106d8e0c5894b3558c01b915979a Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Fri, 7 Aug 2015 00:43:29 -0400
Subject: [PATCH 0849/2016] Check for pidDir and create

---
 nixos/modules/services/networking/gateone.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix
index b8ae5490d7b..93273837181 100644
--- a/nixos/modules/services/networking/gateone.nix
+++ b/nixos/modules/services/networking/gateone.nix
@@ -36,8 +36,10 @@ config = mkIf cfg.enable {
     preStart = ''
       if [ ! -d ${cfg.settingsDir} ] ; then
         mkdir -m 0750 -p ${cfg.settingsDir}
-        mkdir -m 0750 -p ${cfg.pidDir}
         chown -R gateone.gateone ${cfg.settingsDir}
+      fi
+      if [ ! -d ${cfg.pidDir} ] ; then
+        mkdir -m 0750 -p ${cfg.pidDir}
         chown -R gateone.gateone ${cfg.pidDir}
       fi
       '';

From 6b280b648f7ed505a0911b797f53b21c30c927c9 Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Fri, 7 Aug 2015 01:01:22 -0400
Subject: [PATCH 0850/2016] kippo: fix check for pidPath

---
 nixos/modules/services/networking/kippo.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix
index 68f26eefe27..7d70a3d05fa 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixos/modules/services/networking/kippo.nix
@@ -86,8 +86,7 @@ rec {
       wantedBy = [ "multi-user.target" ];
       environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.pythonPackages.twisted}/lib/python2.7/site-packages/:.";
       preStart = ''
-        if [ ! -d ${cfg.varPath}/ ] ; then 
-            mkdir -p ${cfg.pidPath}
+        if [ ! -d ${cfg.varPath}/ ] ; then
             mkdir -p ${cfg.logPath}/tty
             mkdir -p ${cfg.logPath}/dl
             mkdir -p ${cfg.varPath}/keys
@@ -97,12 +96,15 @@ rec {
             cp ${pkgs.kippo}/src/txtcmds ${cfg.varPath} -r
 
             chmod u+rw ${cfg.varPath} -R
-            chmod u+rw ${cfg.pidPath}
             chown kippo.kippo ${cfg.varPath} -R
-            chown kippo.kippo ${cfg.pidPath}
             chown kippo.kippo ${cfg.logPath} -R
             chmod u+rw ${cfg.logPath} -R
         fi
+        if [ ! -d ${cfg.pidPath}/ ] ; then
+            mkdir -p ${cfg.pidPath}
+            chmod u+rw ${cfg.pidPath}
+            chown kippo.kippo ${cfg.pidPath}
+        fi
       '';
 
       serviceConfig.ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";

From 0ec4386003bfcb736f4ea7cc6abd68d7ce43112e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 7 Aug 2015 09:54:44 +0200
Subject: [PATCH 0851/2016] luaPackages.lrexlib: mark as broken

Doesn't build neither with 5.1 nor 5.2 lua.
---
 pkgs/top-level/lua-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 383f03934a2..bfaa66c432e 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -287,6 +287,7 @@ let
       homepage = "https://github.com/lua-stdlib/lua-stdlib/";
       hydraPlatforms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
+      broken = true;
     };
   };
 

From 152a8b82a8b5b593bd887e6d199531ccb4bd62af Mon Sep 17 00:00:00 2001
From: hiberno <mail@elfsechsundzwanzig.de>
Date: Fri, 7 Aug 2015 10:15:44 +0200
Subject: [PATCH 0852/2016] rofi-pass: 2015-08-06 -> 1.0

Upstream switched to (semantic) versioning, this commit reflects that
change.
---
 pkgs/applications/misc/rofi/pass.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix
index 1125a494be2..20f2bcc1700 100644
--- a/pkgs/applications/misc/rofi/pass.nix
+++ b/pkgs/applications/misc/rofi/pass.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "rofi-pass-${version}";
-  version = "2015-08-06";
+  version = "1.0";
 
   src = fetchgit {
     url = "https://github.com/carnager/rofi-pass";
-    rev = "bb1f0d08cd438cc8da24e0341f902706a88e7aa5";
-    sha256 = "1qx690vazwzzcg4yaghj9zd4c4md7bi6b90lgv4gwmdw74v6ghah";
+    rev = "refs/tags/${version}";
+    sha256 = "16k7bj5mf5alfks8mylp549q3lmpbxjsrsgyj7gibdmhjz768jz3";
   };
 
   buildInputs = [ rofi wmctrl xprop xdotool ];

From 39863c04ee3459c1d1e70809e7c3a6e2300baabd Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lancelot@lancelotsix.com>
Date: Wed, 17 Jun 2015 21:44:56 +0200
Subject: [PATCH 0853/2016] pythonPackages.pysftp: init at 0.2.8

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f2fe0d53652..cc1f9734b93 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9336,6 +9336,29 @@ let
     propagatedBuildInputs = with self; [ unittest2 ];
   };
 
+  pysftp = buildPythonPackage rec {
+    name = "pysftp-${version}";
+    version = "0.2.8";
+    disabled = isPyPy;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pysftp/${name}.tar.gz";
+      sha256 = "1d69z8yngciksch1i8rivy1xl8f6g6sb7c3kk5cm3pf8304q6hhm";
+    };
+
+    propagatedBuildInputs = with self; [ paramiko ];
+
+    meta = {
+      homepage = https://bitbucket.org/dundeemt/pysftp;
+      description = "A friendly face on SFTP";
+      license = licenses.mit;
+      longDescription = ''
+        A simple interface to SFTP. The module offers high level abstractions
+        and task based routines to handle your SFTP needs. Checkout the Cook
+        Book, in the docs, to see what pysftp can do for you.
+      '';
+    };
+  };
 
   python3pika = buildPythonPackage {
     name = "python3-pika-0.9.14";

From 462a667d5b4392ffb0bab4b22d6d2f1aab80092c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 7 Aug 2015 11:27:06 +0200
Subject: [PATCH 0854/2016] pyinotify: disable on darwin

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f2fe0d53652..b4ff8661227 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10518,6 +10518,7 @@ let
       homepage = https://github.com/seb-m/pyinotify/wiki;
       description = "Monitor filesystems events on Linux platforms with inotify";
       license = licenses.mit;
+      platforms = platforms.linux;
     };
   };
 

From 20543fc7928adb73c23cc075218f8d4e4fe0657e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 7 Aug 2015 11:51:45 +0200
Subject: [PATCH 0855/2016] python-cryptography: use older cffi. Closes #9157

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b4ff8661227..22c72ad4223 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2300,7 +2300,7 @@ let
 
     buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
                     self.iso8601 self.pyasn1 self.pytest ];
-    propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi;
+    propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi_0_8;
   };
 
   cryptography_vectors = buildPythonPackage rec {
@@ -2402,6 +2402,21 @@ let
     };
   };
 
+  cffi_0_8 = buildPythonPackage rec {
+    name = "cffi-0.8.6";
+ 
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz";
+      sha256 = "0406j3sgndmx88idv5zxkkrwfqxmjl18pj8gf47nsg4ymzixjci5";
+    };
+
+    propagatedBuildInputs = with self; [ pkgs.libffi pycparser ];
+
+    meta = {
+      maintainers = with maintainers; [ iElectric ];
+    };
+  };
+
   cffi = buildPythonPackage rec {
     name = "cffi-1.1.2";
 

From 6699992368f34aee065a1fd5d1caeb39b208d349 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 7 Aug 2015 12:16:28 +0200
Subject: [PATCH 0856/2016] vdirsyncer: 0.5.2 -> 0.6.0

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

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index abe6a8adc14..d07e99e2660 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.5.2";
+  version = "0.6.0";
   name = "vdirsyncer-${version}";
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://github.com/untitaker/vdirsyncer/archive/${version}.tar.gz";
-    sha256 = "02k6ijj0z0r08l50ignm2ngd4ax84l0r1wshh1is0wcfr70d94h9";
+    url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz";
+    sha256 = "1mb0pws5vsgnmyp5dp5m5jvgl6jcvdamxjz7wmgvxkw6n1vrcahd";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From f1227ca8a28f35cce37573db145b9f9a869fad8e Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 7 Aug 2015 13:05:29 +0200
Subject: [PATCH 0857/2016] gnome-yelp: 3.16.0 -> 3.16.1

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

diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
index 11aaae1e6cb..5ca053d81b9 100644
--- a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
@@ -3,11 +3,11 @@
 , bash, makeWrapper, itstool, libxml2, libxslt, icu }:
 
 stdenv.mkDerivation rec {
-  name = "yelp-${gnome3.version}.0";
+  name = "yelp-${gnome3.version}.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0az2f1g8gz341i93zxnm6sabrqx416a348ylwfr8vzlg592am2r3";
+    sha256 = "1jk7aad1srykhgc3x0hd3q3dnlshmy1ak00alwjzaasxvy6hp0b0";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

From 05a653ba5862b5c2b923c0c33b2b08aab4a97d48 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 7 Aug 2015 13:12:08 +0200
Subject: [PATCH 0858/2016] gnome-tweak-tool: 3.16.0 -> 3.16.2

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

diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
index 979990c7e8e..c078297c803 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
@@ -4,11 +4,11 @@
 , gnome3, librsvg, gdk_pixbuf, file, libnotify }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-tweak-tool-${gnome3.version}.0";
+  name = "gnome-tweak-tool-${gnome3.version}.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-tweak-tool/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0pc62qwxgjrgxdhn3qqdzxpx0prrn6c948hqj66w2dy8r0yrdiqw";
+    sha256 = "0r5x67aj79dsw2xl98q4harxv3hjs52g0m6pw43vx29lbir07r5i";
   };
 
   doCheck = true;

From c17cc5a56a0bd420296502b5d5f00478166f5cfb Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 7 Aug 2015 14:16:47 +0200
Subject: [PATCH 0859/2016] pythonPackages.praw: 2.1.21 -> 3.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f9cb099e04b..cf0140a25d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9594,15 +9594,21 @@ let
 
 
 
-  praw = pythonPackages.buildPythonPackage rec {
-    name = "praw-2.1.21";
+  praw = buildPythonPackage rec {
+    name = "praw-3.1.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/praw/praw-2.1.21.tar.gz";
-      md5 = "3b0388c9105662f8be8f1a4d3a38216d";
+      url = "https://pypi.python.org/packages/source/p/praw/${name}.zip";
+      sha256 = "1dilb3vr5llqy344i6nh7gl07wcssb5dmqrhjwhfqi1mais7b953";
     };
 
-    propagatedBuildInputs = with pythonPackages; [ update_checker six mock flake8 ];
+    propagatedBuildInputs = with self; [
+      decorator
+      flake8
+      mock
+      six
+      update_checker
+    ];
 
     # can't find the tests module?
     doCheck = false;
@@ -9611,6 +9617,8 @@ let
       description = "Python Reddit API wrapper";
       homepage = http://praw.readthedocs.org/;
       license = licenses.gpl3;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ jgeerds ];
     };
   };
 

From 84a4ed9a46d3a5fd9808d2a84535856f84f29e27 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 7 Aug 2015 14:18:01 +0200
Subject: [PATCH 0860/2016] rtv: 1.4 -> 1.4.2

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

diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index d190ed706c4..37a664a4918 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pkgs, python, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "1.4";
+  version = "1.4.2";
   name = "rtv-${version}";
 
   src = fetchFromGitHub {
     owner = "michael-lazar";
     repo = "rtv";
     rev = "v${version}";
-    sha256 = "071p7idprknpra6mrdjjka8lrr80ykag62rhbsaf6zcz1d9p55cp";
+    sha256 = "103ahwaaghxpih5bkbzqyqgxqmx6kc859vjla8fy8scg21cijghh";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 01eef86aca295499579131a04647a8dbc65e136a Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Fri, 7 Aug 2015 14:40:10 +0200
Subject: [PATCH 0861/2016] obnam: Add dependency on python fuse. Fixes 'obnam
 mount'.

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

diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index edda974281e..9bd0afb4d32 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage rec {
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];
-  propagatedBuildInputs = [ pycrypto pythonPackages.paramiko pythonPackages.tracing pythonPackages.ttystatus pythonPackages.cliapp pythonPackages.larch pythonPackages.pyyaml ];
+  propagatedBuildInputs = [ pycrypto pythonPackages.paramiko pythonPackages.tracing pythonPackages.ttystatus pythonPackages.cliapp pythonPackages.larch pythonPackages.pyyaml pythonPackages.fuse ];
 
   doCheck = false;
 

From 29fed6f834c1f8be1252d273b51b111589ad8ff8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Aug 2015 14:43:21 +0200
Subject: [PATCH 0862/2016] cabal2nix: update to version 20150807

This update greatly enhances the accuracy with which dependencies are expressed
in the generated Nix files. Previous versions distinguished dependencies for
building ("buildDepends") and testing ("testDepends"). This distinction didn't
apply to system packages or build tools, however: the fields "extraLibs" and
"buildTools" applied to the entire build. This meant that dependencies required
only for testing would be pulled in regardless of whether the test were
actually being run, etc.

These days, we distinguish dependencies for libraries, executables, and tests,
and for each of those types we distinguish dependencies on Haskell libraries,
system libraries, pkgconfig libraries, and build tools. This gives us a
whopping 12 new attributes

    xxxHaskellDepends
    xxxSystemDepends
    xxxPkgconfigDepends
    xxxToolDepends

where "xxx" is any of "library", "executable", or "test".

The old dependency attributes are no longer generated by cabal2nix. The generic
builder in Nixpkgs still accepts them, though, for the sake of backwards
compatibility. This means that you don't have to re-generate all your build
expressions with the new version, but you *should*.
---
 .../tools/haskell/cabal2nix/default.nix       | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 3da457bdf76..b56dc6bdd89 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -1,35 +1,41 @@
-{ mkDerivation, fetchgit, aeson, base, bytestring, Cabal, containers
-, deepseq, deepseq-generics, directory, doctest, filepath, gitMinimal
-, hackage-db, hspec, lens, monad-par, monad-par-extras, mtl, pretty
-, process, QuickCheck, regex-posix, SHA, split, stdenv, transformers
-, utf8-string, cartel, nix-prefetch-scripts, optparse-applicative
-, makeWrapper
+{ mkDerivation, fetchgit, aeson, ansi-wl-pprint, base, bytestring, Cabal
+, containers, deepseq, deepseq-generics, directory, doctest, filepath
+, hackage-db, hspec, lens, monad-par, monad-par-extras, mtl
+, optparse-applicative, pretty, process, QuickCheck, regex-posix, SHA, split
+, stdenv, transformers, utf8-string, makeWrapper, gitMinimal, cartel
+, nix-prefetch-scripts
 }:
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150531";
+  version = "20150807";
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
-    rev = "513a5fce6cfabe0b062424f6deb191a12f7e2187";
-    sha256 = "1j4x85cqj823d9swi473b4i9rz9wlm9m7c1il73h02dq5i67wida";
+    rev = "796dabfc3fb0a98174b680c5d722954096465103";
+    sha256 = "1blyjq80w9534ap4cg0m6awks0zj2135kxld1i9d2z88x1ijzx9v";
     deepClone = true;
   };
+  isLibrary = true;
   isExecutable = true;
-  enableSharedLibraries = false;
-  enableSharedExecutables = false;
-  buildDepends = [
-    aeson base bytestring Cabal containers deepseq-generics directory
-    filepath hackage-db lens monad-par monad-par-extras mtl pretty
-    process regex-posix SHA split transformers utf8-string cartel
-    optparse-applicative
+  libraryHaskellDepends = [
+    aeson ansi-wl-pprint base bytestring Cabal containers
+    deepseq-generics directory filepath hackage-db lens monad-par
+    monad-par-extras mtl optparse-applicative pretty process
+    regex-posix SHA split transformers utf8-string
   ];
-  testDepends = [
-    aeson base bytestring Cabal containers deepseq deepseq-generics
-    directory doctest filepath hackage-db hspec lens monad-par
-    monad-par-extras mtl pretty process QuickCheck regex-posix SHA
-    split transformers utf8-string
+  executableHaskellDepends = [
+    aeson ansi-wl-pprint base bytestring Cabal containers
+    deepseq-generics directory filepath hackage-db lens monad-par
+    monad-par-extras mtl optparse-applicative pretty process
+    regex-posix SHA split transformers utf8-string
   ];
+  testHaskellDepends = [
+    aeson ansi-wl-pprint base bytestring Cabal containers deepseq
+    deepseq-generics directory doctest filepath hackage-db hspec lens
+    monad-par monad-par-extras mtl optparse-applicative pretty process
+    QuickCheck regex-posix SHA split transformers utf8-string
+  ];
+  buildDepends = [ cartel ];
   buildTools = [ gitMinimal makeWrapper ];
   preConfigure = ''
     git reset --hard # Re-create the index that fetchgit destroyed in the name of predictable hashes.

From bc88e645cc5d195345fba5673f17f5d45546ed0b Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 7 Aug 2015 22:09:25 +0900
Subject: [PATCH 0863/2016] firefox-bin: 39.0 -> 39.0.3

---
 .../browsers/firefox-bin/sources.nix          | 358 +++++++++---------
 1 file changed, 179 insertions(+), 179 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index ebb5348795c..6517097a19d 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "39.0";
+  version = "39.0.3";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "802ac533ba95ecfb4780f84d52698a2cc2d7ac82"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "3c000ef496165cb4e0e104d72a381040a3bc6787"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "6fa249f63fe690f3459f4b0112f4945a502a79eb"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "f22b92d0fb0ed21f0e6a3a47c5f2fe873b3bfb56"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "650c772ef89bc5ef6efe5129ddf8feaf993c8f1d"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "e722d65e3b9b706e6b9214ae79543130ad6dba95"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "8ff6fbc92e5b9cedfa17eda240fc89f14eb68f73"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "a1e94f56148a554e522cd317d0f2384073020278"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "c6815876c23117a462d79eb5da291610c1d96feb"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "629997b112da84852a01606f7fa4f15448c0ebb3"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "acda6aefe872e4982d0e8f3ac337d4243bb5e00f"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "181d998305bb75ea5e99bb1b4b5059b54a724ab9"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "230ebfaf61efac65c9daae983ec2fd854a9c1dac"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "a8ddb38542bce008924e4b593691ae84a839e564"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "47a242cd2c91cd7435c8c959d5eaa8595710f6aa"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "db62ad921f9df2683522db1968db9b79edfbadf2"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "c2fddb3667c5bb50fee3011cfb782b2dff7f4063"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "1b891a9df513e9f099f68fe2f0429b00bd12505b"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "0ad965be5c9ce5468e65667dcb0390a9afabd7b0"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "301b659d5689de81ca60f7092176efaf48a50a18"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "df99d9e80ebda8c146724f893ae2de77cf2518ab"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "4b4cc8e588a518af8a922d32163249af115fac42"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "39976bf6a0c7bdfc1832a6f2c48e92324f4a6727"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "ea66a36ea70486f39c7cf7abbf637d37c04d32ef"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "71eeeccd5bf5757d6ec4f9e1442c4fcfbf312d79"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "10911d28d56d4083aea7eb2174d0d7dd78772215"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "434532ff2cca7a0401a7aed8753d1c5578e98c1a"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "2a6aaed334856d06ce8c426282f3345d9bcaa435"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "e2445b13ab680f5dfd5d67e4e796170fbd6bd120"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "ef1df48bd465a3b05d1046bf4627c1ae4f60ee06"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "f95974e478e2d0fec7400424a33202e1e2b1e5b9"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "c521abab2bffe24863c087f02d57ffafae47def7"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "f11b050caae304029ccf23ce2906fe18115adbc8"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "800e0f3b649c9a03d4e9cd2a4ccd8f14bbb5ed95"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "b9502be9396e00b69946f0094c5939a8a57da64b"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "84fab2779bc055821afdb5d7ff45e3ffe95e2858"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "5eee946bc2182990b310ed57fbf527e82f93bc8b"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "8b3219b071e836ecc4966e153ec0adb4e691de89"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "9759c69061d6419edb949c55f7e797302b477c78"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "db5025d393a763c7cd4ed447d61b640ee77e7e79"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "4fdc423d6d15bd6a14030a526ad7017fd5bdf937"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "0d8637f1ca6acfe494f963c936d8510c6c11f8bf"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "e05722e42ea1d844d8fe40672026cacb19575ccf"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "8143b339d0ceedaf797b49ca4b54bcc0c91925e3"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "fac507eebec642fd50f248ac184dbde4538ad0bb"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "2670a80c7ca5d5390df9fcee907afbe7a01f9f37"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "a134117ddd446b63f325a38f818a80921adb5b2f"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "5b073a912221e8e734ba17ecfe735d820f5febf3"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "0e518d9fe0644a6ada9463ae14fa67c2c49bfd5f"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "fa33935aa4abb696ea9a399cff0c1dc29beffab0"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "3c7df32ed5d2570e62e35dcb9f9d91588d7584d2"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "ced3821f7e334b2f0d5b5115cc04cbaf5bcdbe15"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "6af75a3e116162591dd6a15c8903ee5182afe03b"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "fa1ddbc5a3d9bd7c9cc424fe6c5e94c87d51eab2"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "8110bdf4c8657e88f71b8a6bec1ca92f2eac0538"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "30df4777fde7eba8724fab002cb7387203eeb82e"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "2f16472e5cd030a14e3cfa761a32c0ef5ffd395e"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "19a96b008a49e7a223ea2463edab7cda504e2ba5"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "786db5ad8d92324d3086f7b2b8da71767829a8f2"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "31273f797cb90615032611d2d86cac8cf6d28994"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "e2980430f1cd25edb401862b83fb49f2d730ff5e"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "dae850824c3eaaa31fec4aad19e38e2073d96f10"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "f865672eaa7815f3bb527baf3946c62c01c76dbb"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "aa207b51d24ca275b0cbd5ba4cd93ce16a6bd28a"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "30ef856ecdadeba171977859324f010d441a51e9"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "3ebbabc2346eeac01aaf88e91fd1fd55538c0770"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "4dd376ccc6811d46be052fcf1aab82e50a3e0999"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "f6409e276b400ecaa689d92fe5387662d1b5f2ab"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "751cd1092a58a8b6cde5d9e80790715d249ac11b"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "3cc75c55220f81b0291c16d2f237cb6a2d2609f0"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "2bfa436c566a4e2f0fe7847feccf3c157e026d4b"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "0b2ce0b246e107d99b13e497c64ad169e85eec51"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "3afc8ad8747bfcbc5a7e6f2e6de37cbefb3967e7"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "5bec8bcc0a67f304485b1efa7be5d952ce7985ce"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "8fa3dfdc0d2da19f6c98dc76363c9e0d9d10f978"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "4345cf5673267fb41c2c38f5fb92a3b0a9208cf0"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "e57883626a22d3935716417194e78a689c5535c2"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "be6095129ee3f3fc80f6705594a53c6ced996cb2"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "7ca70c0648b2f3928c1dc33288b48f488cf1d19b"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "f2eb7c6c33e8b4bc9a03bee587de4fe5b442ac95"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "32b242a2c6865fdad63ba4de701c566ffb33ef99"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "f83ceece81a71e6fb1494863b2970b2dc384d4c4"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "77f9c855e5f728dcd3b4ff27ed656aa67217dd35"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "f48bcf72d740f4a34bb7f888d977d4d39c141567"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "2db09bd59f3761bfdba8bad565e27e1b42a93727"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "99e0f119e5e79df5b20f686dd065fee5bda4511f"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "0d601a679675c517a535bf706e7cbad9882a5d7c"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "dbd3d180342d0946ab857bdd8d6bc30373e991b5"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "5f3e01cf375af38bee7014ff21fe75daf4e27071"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "a78fbb1cc4e6d10056cc7a3ccecf4750979c5953"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "7efc031614247ddb93a27531d3fa1d19ce21d516"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "e409bb73aad373791d83569dfb4a475bc617eac8"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "0e5c4e9173379457b6c8edd1812121fce84cda07"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "dc6cbffde61b6188080e458b4a31b634f4c0434c"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "d75318f8421f634eeacf15aaa91a28261324044c"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "b024d0e3498c3dd32757997a273d9f1051ccd47f"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "f74c1c567582a207efb501892845d1c28d7b8751"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "cb4151c0c1c6efa4c8ec5e4656de60b1abd65bac"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "1e9d43eedb0bab9f428a80ee3c2721a944961562"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "18a55f6ea18663922052411ebaed18c16c9f3050"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "f4f6af5a09072e004e7c8db7a10edc9ab8d474c3"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "43694f66fea7caf9b2f4d976564c00a99f7092e7"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "3a94f8a0cadc729e97bb6a7b273b02d79c9012dd"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "ec51644f69354aebac67f36e387d1a5b45d0dfa8"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "599de739c08799b8e4082190a53de3ae0dfc6617"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "338825804362d34911beaad146ca6d104bc69788"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "f2a6112a81043cc9608594cd56680a2e075dfd36"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "8650de76d89abdcba3d0e4bba8c2b90533e54ce6"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "0ea6e49b51dfd12150334b6023e26419716cdb65"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "a16c9e916462e3780159677528ffa35b9569a80b"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "0255634959aa739ae6807a1c249e4c78f51f8316"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "ada8dc2d3ea22c2afffac88b581dfc72a27f2f89"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "fa932b9e6d9798753e7b89b91a5db6565fe2b695"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "8a9252658d549d2cbc764197265275461db605b6"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "641c882870dfa7fb23bed9c07def585477ff459d"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "4b68d11f2a613bc8350d37dae899c2c65afe5dc9"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "f636e9b8d5e268f7c124ef3f35f6933de83fed62"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "ed98b20d8eb88a73b119c3a1435904f69529eabd"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "d5ef4d4dbf4d0b63f526d102e95f28078096032a"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "8e92bf456593359afb256c387578042c6085916f"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "d94320d0c8aee23b6d3c603664caab45180b6069"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "b9fdc0248d9656b3555c475643c7e07ca3c6b222"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "d49719c255a43151ed5e94d7024c39914ea27ec7"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "f2b1f00254ef350f817b5c1958384a9f5144f83e"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "cc54828041f57f623de691a49e4bb055bd059c54"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "5728a30bf53644a3b13bc00f5652e067cbe9100b"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "0f69ddbd963a19d104ee96589c405c55aa7140b2"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "26af2b8cf928fedb5442c5257289f5e38c4f8432"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "2da0842ebe8ae5a8e80061d0fc159a5d408c4464"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "b7cc446178a493589d8654236f6e9113aee48455"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "dd81dc403366a7fd0d395338878b8b8fcb858365"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "2ca8cc4c491f0ded4cef8e3826a3c1419a580051"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "468d45392126ac7852012ed43d76d83e238dc2ac"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "ed20af16563516671f32bb588728e90f29955964"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "b197bca20e972ce2f8851dc128fb212a7d293454"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "2cd05329c3612330fdc1354fe651cc13ab8d9a5f"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "1087ba6ba17aa102888e929ccf7acc6b2476e447"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "aa1907c10e980a8466c1604519ffa08aaabb2d7c"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "fdb717a0f40b94a53077ff036a55c0f93b61a2cc"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "af10206080a7ad21e5fda9cdf66a734ee33b07ac"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "f08c67c6ea2a63c216f944453b4ce8b36f4ed840"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "07efb37804ffab35f117eb32f9f645b554ac1dd8"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "874f588d7ac5554ae4e8e134bfc272897f839f97"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "af64b6eb8d33d6bd78ce86e4785be50babe5c919"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "672523b996c7021e06b4a713f7ac1239a3b1800f"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "2e594b56230c079a9f1735e9bab9dc4a9d9e31ab"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "6edffa576d9829673c65400d4570b34dc787faad"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "7b506fedbf3a25cd1ed54b05c9b5cb7b8c237ad8"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "e8d1fea389b7cb75b7ccbf22ad5b8691e9bf1b6a"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "20163798733ee36ffa510987b18d1eb67b82aca1"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "9076d0e9de6adb7fbd26dbd3cd89dd5728939aab"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "352aeb9f5ccb1e3bb87c8e47f93e96a049991412"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "838c4c525a9f93117704851ad81b2c199a9c28fc"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "0139a064056da0ed1730fd768da1322a9661bca9"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "7d74018cd9948ee31e05b30ff1fb45a84d417494"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "85c43e2359f444faf111efd83fb0dc3e1b0edb48"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "bc95ee926f82aba58691d923eb4cb963aa4cb64a"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "7c8946d6180e2c48a80958b6a790bf6c9231591e"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "dfaad8f934869d714c94a95a775bcdcd67fda3c4"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "5523c6df4e2b03ae71c865aabe6bb0dd0446fc87"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "7a61ca88c832af3d15f197ba01d66c6fc43465d3"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "696823890791a05c6cf0230d1063a30012873090"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "4a3b932813ad0ab07f467a598e9e85b847bbe142"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "f847f3f0fb07f97053066f4b4314d93e9614e6cf"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "59eee567e30cf6321c234c60002b416faec07aa4"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "b64dfdbdc75f87003f00883173084646a2617a29"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "44e6b53ede97835847ed84defe4235cad513c653"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "bb6f84f58a19c6287bbc84e0e7101fcd48bd720a"; }
-    { locale = "uz"; arch = "linux-i686"; sha1 = "1aec3ba9efd52a1f386e0bb075745a7c01c443a2"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha1 = "2ce2caccb638c0467ba1382a15146ef1cc33fa72"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "d8b339892c152254c89ec1d42ff9b7f128455aab"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "e4503686f2a997e1c793ef8e3c80bccd3dc0e2f0"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "d130fae691b91a1f1f7d15ca84f643ccf299b0e3"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "18b5d09571f4db7b18dbbdb3f3c29c80480a16aa"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "303816f99659e2bbb8ecc4f9b1c83932a0c9205d"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "238b50b8bb745f2d80099354592c9b710c55f1d8"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "9159a6fea44a97a33390c527abf7730cdbbc9216"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "74e3c2292aed9c2a7de24d6f3693ac1d0ba4c41f"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "4b732557876ff3e4d02ad480b7c73bd7abd6782d"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "0a63b048b33638ade924bcf7ae435423c9da906c"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "87349773cdb5e07aaa1387e75e08d03786df700d"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "137d3558eb674036d43e5764ca691a66f9a07782"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "db99f86de92b0d1782611926b3053b25ad302e8b"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "d000f9e8a983be0fa7d05176fb6cc0954bb06ad7"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "b794a584da47ee9197666ab6976863f23ff1972c"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "0319aec1942cd8311b236aef5772850897b36f64"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "83b83af48caf75bcdc39efb9c8a09333d6ae97b7"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "827463330470ab2abd4a71a92e15fea451957fb5"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "9f994c9374c53afa094271907fc6aecbf5a93eb4"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "611835134f1008fcff72f3ab264ce9448a6a0948"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "67339f5005bf8c805b6c8ed24fbed597865f5dd0"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "ecdd763f7d40bcb1ff6004fd0a3f511f5cbb9d9b"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "d6a7d84744c0ac6e4cb7f0a1f0025bbee053cdc2"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "051646e7d213099433bc198c74f85d99aeb6e846"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "28e48822cc2977037db1493ddc06ef106a11e8bf"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "7b59deab0fd2b35d2ec087947f5c5a85bd70cf4a"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "4c5bff7f6b3f664138a881479701cfea81ff60b8"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "3a659a5335d4b215ac2a0452264a61c702420c60"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "a641b87769d90db720fc5294ab06f6dae2a597d3"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "1c1e47f4012c765ce96e4d2581e47f9b61344370"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "0491cf87e0815079eba8f57ae8c6f392d2e5251f"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "abe34c6d4998ac2f4e2d1f2d4655f8ace9f0a857"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "40f2eb7fd72f4a05ee47cb136c73e75f139e9ed1"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "3a737c33921af68621d906702fb1298f5bf161f9"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "46cf625eea24a819d93741f2d11bc315a21361cc"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "be84a0a6e32fbbb977b654f195064add8881a853"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "ce507b8801646f3156bb38776c17dd7955ba9678"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "5b1599282512c66a8619202b494042dbe959adc0"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "9eb6a71214122e02e7e94b526b4ff1e0bad71680"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "4f21da86ab876bf916157fe7e1fd84502e8fb923"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "d175b55ebf05905531f28a74f9a075c4dd4467d1"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "62039edbacf4d5ed9b32f5ef2d993c0b6fc7a0cc"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "933cc29a7902f4de25fc593ffbaf6e62ccceb2fc"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "eb69a42286f7d4a7106ddd24ec0c1f1356101956"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "6683f985caece486b068a3ddd85e732903b1f738"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "fd92cd5ab674762fce35fddc54b7dcdfa4829dcf"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "91416a56f0221772a0f9691ad418602327d193e2"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "ce89cdb9c8c88d7c4dcd089eef006b98171f5d04"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "8322cad2eacba0c064eb9ef2f5cd1d426411c648"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "c4102cc705610d7ad5b0cc530c600b2170f55419"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "571067007e0dff64095b8eeb760aec7f78f367fd"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "64a0422e42cf1d19e558377d5ecee6536917b414"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "9f5611cd3043b1c267724b198ab04c16078b7818"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "3a22150e16a12d8fba9d21cef0c8e7ac434edf35"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "6502874b051c281e565cd0e0953698b88b69e5f5"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "3bdbcf6d324c43fbf7f3c71243df10a760f7fec2"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "83edce65b276d9989e66d11bfd4e9c1c87955364"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "6281d1d560fb7dd1a8bc1af0be046491a4ee4382"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "d394d731f7cde2b17bafd9d9d4cb6819fdbcbfd5"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "b969107e5e840e1701672b3d5ba81ae3e53889be"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "a9c801142df7a932b2eba4d8f540b2579d0fabeb"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "96cb7bb0bd079d683304168b2b14255a1217fa92"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "c233e4da88f3fcc5eb5f2c45766c9197b5910dfc"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e04973316a340325888f0f2e06590773f81a7cf0"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "22c59e40b39aefe356e8b5305ce720d4a2cdd0b7"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "74256cbb8a76d835887727aa01f6e6a22936a43e"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "fa14a31fe15106f224df47a62c3e5ec16da1cb95"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "c8b6216d448f6f192e584ceb81fb22e5ac79a280"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "a1c67f4bec3f46de3cf6297e8a711d55f8189e3b"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "70d3b99652e8c690bbd05af7af9c65eeb780d455"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "1f42b51648eb296dfc339982c331e7d63bfbbd96"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "bd176a2bda1246e15dbbfb1b068f6b196a0ce266"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "2cd7757360efeca608b8a9b4b56c04f9aca89a79"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "dc130d8ab31c739e4406f8cc72dc32d3795db208"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "6dccfb2944006379271c308fa31d8f6a4bd6bb3d"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "aca6deabd521e29611fccbdeca3bf036a2239c1d"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "4ffb659a341308a097ad26f1873ae243e581bba9"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "340caff2afeb8f9f01c84f780b6aef079ab257e6"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "7adb1a44e0367b570437fdeae9f04c6f94f6702f"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "d427e6ca8287d97b27949ccb412207ef48d0cebe"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "2741c8bdcfad1edc36968bfac70c71b1a2837df4"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "430817ee768fd76dd29e76ae00488d6397f7b6f1"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "725c194c1e08293b44cbeb2a6791f4340a773b81"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "611e5f92796707379a9fd60ade840896eac4eabd"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "720ee20fa7a74dc321ab7fa8a95732ff2e9e5250"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "778496274c362d9d854b1cc6ac9b1806ce8e708c"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "f31729cecde50073e49d1387356c13060cf50c61"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "72e9c8c602c403d16e4d60fbeb1bf5a415aabf25"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "f2498d503005d0a1d7432bbc5a981be350421cfa"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "b003f7d484ec995fe4f10808d1141e20c6ed9bfc"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "de191039fb5acb5ca9ab556ef4ef6b6211b5b697"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "d5cd94ddd0b301dc0edf2f64bafa678864aa4595"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "cf66178d0a18fcabcde897d4ba869da8d82fe999"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "b83bbf3fb4d3aabdc961b9ef669dd2aa9f05ee52"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "0550d016ad044fdac193beee822171a0d891a34d"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "4f5916dac9d8efb333e2ad21370bd8a3d961b68f"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b72515f5e194a4c543c8a6487c858abe07e24db0"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "aef7fdc2f59edbde165c4e98de10f7e20e203f9d"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "1db4444dbc9479cad1122925a9af73e358e09cbf"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "a826b23b1783fff4d51451284301610cd26b578f"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "2943bbe86e052280d610cbf3adceb89e949615b3"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "c1b0bb2f22c11974e5e3a2d9b221601da07a858d"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "2e3568872301c3897e83ee5692638a76fbef15fc"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "5af762e2487171f6b41a6c1654b672c86e6964f8"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "40c042713ee07d4d375327515c7425d6733b926f"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "0dd2808378e870f553e02066f5ee78b11543e420"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "294eb8f7345f6baffc183605988bd1a57bbdd880"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "fbd9524ac8c1286e4c4bcf77efa8c9bf86d03948"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "09b63d181398b1ff6a83849aa209952c0c5ce9b0"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "d7478ba2f1b59ef83b1447789034bbdca78fab77"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "72e1e6e225790e4438da20cd2f69dce6e455fe53"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "3ef27144bb335d7a3f168bbadc0592a5fd554d78"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "5ef7f628aeb20d20ffa01316c234afafc2a6e2c7"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "cbf6a8d123e98ef1b99221083c743e962ccec58c"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "46f34520fc023f9d20781c9d5f13c683bc7f86bd"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "c07c7ca26034e53d29e868315201605b95d83e65"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "8ab47bda33eeec6d135049f775f06478480394b2"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "82b0c898ebf2e3714763640f2cabd00dd14c9078"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "1dba01bbf772b38c67b90d5e68f7e1a5c20f0b02"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "ade71dce8572628f99bf59132e8c0efd01a77016"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "486411e211d5505ca696a936db64682e04d43392"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "0239e14c627499220518d1f9a3f643315c1846c6"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "d7f314a0caec40e367faa29e071a81da2e50d802"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "4ad6c120360f90dea82282a6891419f17d0b5068"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "14a6534cba54ff08695b4322f6566a375f9cb713"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "badad6dfe2d794d508c4f8b061ef2a91209a8c32"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "1602ac0a3ac5c8c49a370a64d450aa06b490c8b5"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "a8108ecee8557be024c35818a99c30dfd811da83"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "02952ca95545f83231b36e9c05adc51ab955f9e5"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "164c31da7ad4272500b8906ee5d29c69ac285618"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c09a24b8f00409c7c93686586b091bfc33f22e52"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "9124e6b86f947dd4a7d2d7c9b8860dd28647d2f4"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "fb2dbbda6817d8fbcf9870a3233396051ce7c67f"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "bbf1e039a02556df8c68d6d49aa30f821bfdfae9"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "9ff1ae86d0989f81ae3324e9ccbda2d2069281be"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "2be8ac327c7aa90abb38ee6ccfb0181194d5592e"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "a6ff7bf9c96b1baa2d22e897d1083c9907300de5"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "4ab6eff3bf8c99f3404a313f54ea3e0d48842d9f"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "7ed256e6b3a5aec16eb0c5d3cab8c4cd5bf07999"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "da6511f215e206df0fe450225f2b2e4d8d541838"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "d3df1cc8647d6dc8576fcfd0c6a1e28a28c0ce8a"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "af999c2bcb0d865d38e336eaad5d6766fed291cc"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "7369a73558f6df1218dac14c3259e08cfa80ac52"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "bd21ac0aca091de913201d2df5f914b9eeb83c8d"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8b9a5cf1259a824edb54d4db9aa7db3637ab041a"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "f8004907aac63d8e9e4196424aa94db4fa1ff8c0"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "3403690013738c55f87c56d52ed8f9923a496b42"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "3b00a49b87fa900ecea9fdedce1b49d2560a81dd"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "6e5f1e0460792c080aa9ac82d3be69c047862203"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "2f09d74e5e39f9016ab5594f95f61b369cd6467c"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "df7b6c0806b27ade147dc6d42d181d599cc2c28b"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "1dedbe2a377cee5b32ca4aa0ec54eb24261238b0"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "0309c2c97affcfa4c0d155eec2f9f4f586c940eb"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "890a17e8f1d771e12d3e9c03ee0c8069654dae66"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "73fbaabb4644ae3726681bd6c49f6efa25a74a1a"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "573ba7d8526147e47f49fedb5f8c2e3bf0aaee82"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "abacb4f8ad9ed7eb42d5bbf3ebdce4136557bff5"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "cd1dc2a385e1911b5eaf69bc0cab13f257d8f68d"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "5c1aff5bbf858e1e7f6fa2c2d996a396b8710124"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "a6d7e023615936b0d61e956a4dadb6431febaa0c"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "19a7147c4a7de505ef0106b121640f5f651d6dbd"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "f1120ddacc1d5a124512c405855a4014fc910034"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "d21616842495521d3b71877ff2b694e019a4c2c2"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "43b9236a33a803fc0b0dd41cef93a5bf9fd91472"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "17e06ab17369c234bef72b1a284bef39d5810671"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "8f8e2cb6acd475d7d75116c6494ab237b9531364"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "77fb9f32965af6a70275fbca308caf5bf88c3c8e"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "4a65de127708cbee44cc7238d14b9c0942d2673b"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "37a556dafc73e5de983cb62fdd545d01f32f698d"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "2f4549d5ef998449b553a5d6f62d01d0313c6c95"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "f6a10236fe0fcc9d11c3c5aee3bd84365bb06013"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "c2694589cc28b938fd7a079378e5fa99cdd7c98b"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "e7888b70a1a90613fd7d38a5a7735857385ae683"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "6ebef5649484bfda154c44232a9e3aae239c0990"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "fe5ffb931bd7e5bb403f6aef6b879c2c9446721e"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "4b53989b554929b085b120788e1e30d5232dedb4"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "bed269a3a7e3fc82d2fb1931632be9b04fe6b6da"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "786d51639cd7e952f4c73e9d91b50f6da0ba9242"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "db04c29c9038c856c67e99c77c0628c377bcd8f7"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "d9525ad0b0069ae05cad173ab567198b67fc13dc"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "2a8bbe15f2b2b242e9787704e542a6c0a9ed93bc"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "532e224a166addee7b6068bbcee7e6c0b1c3f6df"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "514bc01fe7055a050898a01f0c1ed4773fb33b7e"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "0d5154d3d5062c7e1ff33112ad0a1399ba548b29"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "291ee73bc5540f8089f6b7bbdf8160c931cc4dd7"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "16df041eeaf6a3885d52569db1781635e519fd3f"; }
   ];
 }

From 4fb4e24bf3b84d2b59a3d474d8887e137bc7b7a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 14:01:46 +0200
Subject: [PATCH 0864/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/71e5685240e904ee2fe540c62c09b6869452023c
 with hackage2nix version 20150807

---
 .../haskell-modules/hackage-packages.nix      | 28505 +++++++++-------
 1 file changed, 16014 insertions(+), 12491 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 0c02cdec9b0..9c95632413e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -12,12 +12,11 @@ self: {
        sha256 = "13b7n9mdx7f6a2ghikc7xvscbj8wp0dxcbm5alinnic433sandy5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT OpenGL random ];
+       executableHaskellDepends = [ base GLUT OpenGL random ];
        jailbreak = true;
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/3d-graphics-examples";
        description = "Examples of 3D graphics programming with OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "3dmodels" = callPackage
@@ -26,7 +25,9 @@ self: {
        pname = "3dmodels";
        version = "0.3.0";
        sha256 = "00pp8g1b59950i5ik9ycimxd284vsv1hnfgxgg1mjvxwaj2pbyhr";
-       buildDepends = [ attoparsec base bytestring linear packer ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring linear packer
+       ];
        jailbreak = true;
        homepage = "https://github.com/capsjac/3dmodels";
        description = "3D model parsers";
@@ -42,7 +43,9 @@ self: {
        sha256 = "1lya7320jf2cvd69prvjfwdlci2j17m21qcqaqxaczlrv4aykg6w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cairo containers gtk haskell98 mtl ];
+       executableHaskellDepends = [
+         base cairo containers gtk haskell98 mtl
+       ];
        jailbreak = true;
        homepage = "http://lambdacolyte.wordpress.com/2009/08/06/tetris-in-haskell/";
        description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)";
@@ -56,7 +59,7 @@ self: {
        pname = "AAI";
        version = "0.2.0.1";
        sha256 = "0vdq0hscpbl5a9bpf8fiykmyg2c3yvivb0mzcdy99ha0j1p4rwfh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Abstract Application Interface";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -69,8 +72,8 @@ self: {
        pname = "ABList";
        version = "0.0.3";
        sha256 = "06hj35k3lbcxh9yn70sa4bw0jafxmxyi2237d6r48dznk4a5fvq1";
-       buildDepends = [ base linear newtype ];
-       testDepends = [
+       libraryHaskellDepends = [ base linear newtype ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -84,7 +87,7 @@ self: {
        pname = "AC-Angle";
        version = "1.0";
        sha256 = "0ra97a4im3w2cq3mf17j8skn6bajs7rw7d0mmvcwgb9jd04b0idm";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Angles in degrees and radians";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95,7 +98,7 @@ self: {
        pname = "AC-Boolean";
        version = "1.1.0";
        sha256 = "0id19wgp2jg2pf1gdhfzkyknjj19jii3pz0lva29x3lcck38rw2b";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Handle Boolean values generatically";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106,7 +109,7 @@ self: {
        pname = "AC-BuildPlatform";
        version = "1.1.0";
        sha256 = "0vlhakc6mc4zzyvb54rgmskkj8hp43zy35giimk0g7i5068r2czh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Detect which OS you're running on";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118,7 +121,7 @@ self: {
        pname = "AC-Colour";
        version = "1.1.6";
        sha256 = "02v3b1pfhwnf3cl8kbxfkk0a7hdp0gqq5v4w9ka32zl1p007rz19";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Efficient RGB colour types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129,7 +132,7 @@ self: {
        pname = "AC-EasyRaster-GTK";
        version = "1.1.3";
        sha256 = "082il76032biyan170p4qp13154nmkzil4v2wv7fmjn9z7v8w49b";
-       buildDepends = [ array base gtk ];
+       libraryHaskellDepends = [ array base gtk ];
        description = "GTK+ pixel plotting";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141,7 +144,7 @@ self: {
        pname = "AC-HalfInteger";
        version = "1.2.1";
        sha256 = "0wwnb7a6dmzgh122qg322mi3vpyk93xw52cql6dx18sqdbxyxdbb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Efficient half-integer type";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153,7 +156,7 @@ self: {
        pname = "AC-MiniTest";
        version = "1.1.1";
        sha256 = "0ish59q50npljgmfrcffcyx6scf99xdncmy1kpwy1i5622r1kcps";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "A simple test framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165,7 +168,7 @@ self: {
        pname = "AC-PPM";
        version = "1.1.1";
        sha256 = "0y2wzwfnlx50rzkdigmjy3dg5f91pmkf4gmnzjhs3r916d296gkq";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Trivial package for writing PPM images";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176,7 +179,7 @@ self: {
        pname = "AC-Random";
        version = "0.1";
        sha256 = "1c00pcz0c4l2sdaj61zcmw68ckmqb7xlfykv489xms7ak4xl8nc1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A pure Haskell PRNG";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187,7 +190,7 @@ self: {
        pname = "AC-Terminal";
        version = "1.0";
        sha256 = "0d0vdqf7i49d2hsdm7x9ad88l7kfc1wvkzppzhs8k9xf4gbrvl43";
-       buildDepends = [ ansi-terminal base ];
+       libraryHaskellDepends = [ ansi-terminal base ];
        description = "Trivial wrapper over ansi-terminal";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199,7 +202,7 @@ self: {
        pname = "AC-VanillaArray";
        version = "1.1.2";
        sha256 = "044kiwc5g2irky0k3fg9l2qqnvcnh9vdx0yz8m1awnkab6mk0i3v";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        description = "Immutable arrays with plain integer indicies";
        license = stdenv.lib.licenses.bsd3;
@@ -212,7 +215,7 @@ self: {
        pname = "AC-Vector";
        version = "2.3.2";
        sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Efficient geometric vectors and transformations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223,7 +226,7 @@ self: {
        pname = "AC-Vector-Fancy";
        version = "2.4.0";
        sha256 = "0wcan2s75c89s1mxhcvvjgbpn8xqrhmwnfbsrszkzydw3x46465y";
-       buildDepends = [ AC-Angle AC-Vector base ];
+       libraryHaskellDepends = [ AC-Angle AC-Vector base ];
        description = "Fancy type-system stuff for AC-Vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -236,7 +239,9 @@ self: {
        pname = "ACME";
        version = "0.0.0.1";
        sha256 = "103mil8lixg0v2wjizy0pqyy9ywbmrk56mc0n37wwvz0qkjaqnds";
-       buildDepends = [ base list-extras mtl random random-shuffle void ];
+       libraryHaskellDepends = [
+         base list-extras mtl random random-shuffle void
+       ];
        homepage = "http://alkalisoftware.net";
        description = "Essential features";
        license = stdenv.lib.licenses.bsd3;
@@ -256,12 +261,12 @@ self: {
        sha256 = "06ff9f4wdf7dr0v2cwhzsjn00bmaijgqznhnyf5fp9jyw8ffbbzp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bits containers ghc-prim mmorph monad-primitive mtl
          OrderedBits primitive PrimitiveArray QuickCheck strict
          template-haskell th-orphans transformers tuple vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
@@ -280,10 +285,11 @@ self: {
        sha256 = "1zzm6974mfwzswhx9dfh4w1qrlk44w5k8pajqmrgs8hwnx3k8awa";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers criterion deepseq directory QuickCheck random
-         test-framework test-framework-quickcheck2
+       libraryHaskellDepends = [
+         base containers criterion deepseq QuickCheck random test-framework
+         test-framework-quickcheck2
        ];
+       executableHaskellDepends = [ base containers directory ];
        jailbreak = true;
        homepage = "http://code.google.com/p/aern/";
        description = "foundational type classes for approximating exact real numbers";
@@ -299,7 +305,7 @@ self: {
        pname = "AERN-Net";
        version = "0.2.1.1";
        sha256 = "1h7yw85zp8dlyjfi5mr3zvb8cn3xbfxw19nqkz6r7v6s5hfg50qg";
-       buildDepends = [
+       libraryHaskellDepends = [
          AERN-Real AERN-RnToRm base binary containers html stm time
        ];
        jailbreak = true;
@@ -317,7 +323,7 @@ self: {
        pname = "AERN-Real";
        version = "2011.1.0.1";
        sha256 = "1m8fc3agvm5r5vgzsxhjdmmxl679n68isa5cwbbfrv38c20s2p6v";
-       buildDepends = [
+       libraryHaskellDepends = [
          AERN-Basics base criterion QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -339,7 +345,11 @@ self: {
        sha256 = "0hwbw2nibgfddqfhbq8fcm1anibdfa9kgbbxnsbxvkkl6l52cbg2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         AERN-Basics AERN-Real AERN-Real-Interval base ieee-utils QuickCheck
+         test-framework test-framework-quickcheck2
+       ];
+       executableHaskellDepends = [
          AERN-Basics AERN-Real AERN-Real-Interval base criterion ieee-utils
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -358,7 +368,7 @@ self: {
        pname = "AERN-Real-Interval";
        version = "2011.1.0.1";
        sha256 = "1myh6r2cg4sg7k21y3p415pwm2vjfggi92631wzcjxk8ygcafbwv";
-       buildDepends = [
+       libraryHaskellDepends = [
          AERN-Basics AERN-Real base deepseq QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -377,7 +387,7 @@ self: {
        pname = "AERN-RnToRm";
        version = "0.5.0.1";
        sha256 = "0rx93h1h303r4gf9jq32gl08lg4jkfc12kzjnjxampwx75b4lgjv";
-       buildDepends = [
+       libraryHaskellDepends = [
          AERN-Real base binary containers directory filepath html QuickCheck
          time
        ];
@@ -397,7 +407,7 @@ self: {
        pname = "AERN-RnToRm-Plot";
        version = "0.2.0.3";
        sha256 = "0zpp0s90q2jhpagf6iswbmm6hyi0x2hns8vqd5swwa8d258avrbq";
-       buildDepends = [
+       libraryHaskellDepends = [
          AERN-Real AERN-RnToRm base binary containers directory filepath
          glade glib gtk gtkglext mtl OpenGL stm time
        ];
@@ -415,10 +425,10 @@ self: {
      mkDerivation {
        pname = "AES";
        version = "0.2.9";
-       revision = "1";
        sha256 = "12n484dpjr08910ni1vvw030g9p37lz68l5lw0212rvklkva6wzc";
+       revision = "1";
        editedCabalFile = "9e51c1b1687fe35ccd0f2983e861b5b0441399803ff76b192530984724a68d6f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal monads-tf random transformers
        ];
        description = "Fast AES encryption/decryption for bytestrings";
@@ -431,7 +441,9 @@ self: {
        pname = "AGI";
        version = "1.3";
        sha256 = "1h0hcdvdjs635inq96fpyh2g3d482ilpqn474vk1xkycww0xgsnv";
-       buildDepends = [ base mtl network parsec random syb unix ];
+       libraryHaskellDepends = [
+         base mtl network parsec random syb unix
+       ];
        homepage = "http://src.seereason.com/haskell-agi";
        description = "A library for writing AGI scripts for Asterisk";
        license = stdenv.lib.licenses.bsd3;
@@ -444,8 +456,8 @@ self: {
        pname = "ALUT";
        version = "2.4.0.0";
        sha256 = "0g8rzzk54y8d567dvj32bq0h409ag0am196kkirsjd6f58vgjp0g";
-       buildDepends = [ base OpenAL StateVar transformers ];
-       extraLibraries = [ freealut ];
+       libraryHaskellDepends = [ base OpenAL StateVar transformers ];
+       librarySystemDepends = [ freealut ];
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding for the OpenAL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -459,7 +471,7 @@ self: {
        pname = "AMI";
        version = "0.1";
        sha256 = "00w6kcikc5ac26786fwshwbh8ndj9aq1w7wz263j5rnhdf12irky";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl network pureMD5 stm
        ];
        homepage = "http://redmine.iportnov.ru/projects/ami";
@@ -474,7 +486,7 @@ self: {
        pname = "ANum";
        version = "0.1.1.0";
        sha256 = "0ilgz1akz66cwwvxd8dkz2fq9gyplc4m206jpmp380ys5n37b4q9";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/DanBurton/ANum#readme";
        description = "Num instance for Applicatives provided via the ANum newtype";
        license = stdenv.lib.licenses.bsd3;
@@ -488,7 +500,7 @@ self: {
        pname = "ASN1";
        version = "0.0.1.1";
        sha256 = "188mf1k8p4h8ryngpcs6ldz9n2590h9wfxzxsj396is5r8rxscmh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HUnit mtl NewBinary old-time pretty QuickCheck
        ];
        homepage = "http://www.haskell.org/asn1";
@@ -502,7 +514,7 @@ self: {
        pname = "AVar";
        version = "0.0.5.1";
        sha256 = "0jggzjyms1w4p1ynv8m5yvya64kbxkjdis7wvy3lildmp0w0x0c7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Mutable variables with Exception handling and concurrency support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -513,7 +525,7 @@ self: {
        pname = "AWin32Console";
        version = "1.1";
        sha256 = "0il5bngj4919mmpm0rwmbx74ih3sfbqkaph6w12p49fs466sxkh1";
-       buildDepends = [ base regex-compat Win32 ];
+       libraryHaskellDepends = [ base regex-compat Win32 ];
        description = "A binding to a part of the ANSI escape code for the console";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -525,7 +537,7 @@ self: {
        pname = "AbortT-monadstf";
        version = "1.0";
        sha256 = "1ijv4bs299ijqbkspbg1kry627ra6p6qlkd74q4y2pvamrm4dn6f";
-       buildDepends = [ AbortT-transformers base monads-tf ];
+       libraryHaskellDepends = [ AbortT-transformers base monads-tf ];
        homepage = "http://github.com/gcross/AbortT-transformers";
        description = "Monads-tf instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -537,7 +549,7 @@ self: {
        pname = "AbortT-mtl";
        version = "1.0";
        sha256 = "17rp4v5ibna9fplm526x31k8df8zwkm1imv71yqzpgcqcn48pps2";
-       buildDepends = [ AbortT-transformers base mtl ];
+       libraryHaskellDepends = [ AbortT-transformers base mtl ];
        jailbreak = true;
        homepage = "http://github.com/gcross/AbortT-mtl";
        description = "mtl instances for the AbortT monad transformer";
@@ -552,8 +564,8 @@ self: {
        pname = "AbortT-transformers";
        version = "1.0.1.1";
        sha256 = "00q3c2pr9rl2110624rndn7j2843rl62vh5569q96l2vzfpccgbp";
-       buildDepends = [ base transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
@@ -573,11 +585,15 @@ self: {
        sha256 = "0dsfgclgx4kqjnvn54vvxcbn8l8jyy9gb06qp13hfm5l7lxfjzxq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers gloss gloss-juicy lens mtl OpenGL StateVar
          template-haskell
        ];
-       testDepends = [ base hspec ];
+       executableHaskellDepends = [
+         base containers gloss gloss-juicy lens mtl OpenGL StateVar
+         template-haskell
+       ];
+       testHaskellDepends = [ base hspec ];
        jailbreak = true;
        homepage = "https://github.com/egonSchiele/actionkid";
        description = "An easy-to-use video game framework for Haskell";
@@ -593,7 +609,7 @@ self: {
        sha256 = "0n27d8dvk0qq68zp4l5bsj5y9xqmrk9d25psrrf29mmw1f43wp8c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -607,7 +623,7 @@ self: {
        sha256 = "08iblifpyi569zh55ha5bi0nfibz0zlqiibwaimx2k1nd6n6yv5a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -621,7 +637,7 @@ self: {
        sha256 = "16grzya42pzn3zaahs77lw5n2ka138bs0g3vgi0qbxlvxwy5ikyy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 mtl ];
+       executableHaskellDepends = [ base haskell98 mtl ];
        jailbreak = true;
        description = "Lisperati's adventure game in Lisp translated to Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -636,10 +652,10 @@ self: {
        pname = "AesonBson";
        version = "0.2.2";
        sha256 = "1p7636bjczcwwi2c0cdzvpj95vx2fr27qnmh8pcs8hqgmisagq8s";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bson unordered-containers vector
        ];
-       testDepends = [ aeson base bson hspec HUnit text ];
+       testHaskellDepends = [ aeson base bson hspec HUnit text ];
        jailbreak = true;
        homepage = "https://github.com/nh2/AesonBson";
        description = "Mapping between Aeson's JSON and Bson objects";
@@ -655,7 +671,7 @@ self: {
        pname = "Agata";
        version = "0.2.1.1";
        sha256 = "0v8gy2gdbn9133yki7s71a7ph50xzawdvciiahr463apbn6439hm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl QuickCheck tagged template-haskell
        ];
        jailbreak = true;
@@ -676,19 +692,21 @@ self: {
      mkDerivation {
        pname = "Agda";
        version = "2.4.2.3";
-       revision = "1";
        sha256 = "09vvipvab6bys8g7cdka1iirs0wc0jzcyynncccgb614wd2yyvdw";
+       revision = "1";
        editedCabalFile = "25fe17a2302a30f23a57bedf6bc66a8966f4d5f6b10353e2502e18ba98f80eeb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary boxes bytestring containers data-hash deepseq
          directory edit-distance equivalence filepath geniplate-mirror
          hashable hashtables haskeline haskell-src-exts mtl parallel pretty
          process QuickCheck strict template-haskell text time transformers
          transformers-compat unordered-containers xhtml zlib
        ];
-       buildTools = [ alex cpphs emacs happy ];
+       libraryToolDepends = [ alex cpphs happy ];
+       executableHaskellDepends = [ base directory filepath process ];
+       executableToolDepends = [ emacs ];
        postInstall = ''
          $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)
          $out/bin/agda-mode compile
@@ -696,7 +714,6 @@ self: {
        homepage = "http://wiki.portal.chalmers.se/agda/";
        description = "A dependently typed functional programming language and proof assistant";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) emacs;};
 
   "Agda-executable" = callPackage
@@ -707,12 +724,11 @@ self: {
        sha256 = "156nzvpmqi7yizjr4yym2ybc0iv4nqfp84qrpdxcha682k298ib1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ Agda base ];
+       executableHaskellDepends = [ Agda base ];
        jailbreak = true;
        homepage = "http://wiki.portal.chalmers.se/agda/";
        description = "Command-line program for type-checking and compiling Agda programs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AhoCorasick" = callPackage
@@ -722,7 +738,9 @@ self: {
        pname = "AhoCorasick";
        version = "0.0.3";
        sha256 = "171im3xhrgdzhpxmi1350323apy58pisap0dskcibd3g4jmzslza";
-       buildDepends = [ array base hashable mtl unordered-containers ];
+       libraryHaskellDepends = [
+         array base hashable mtl unordered-containers
+       ];
        homepage = "http://github.com/lymar/AhoCorasick";
        description = "Aho-Corasick string matching algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -737,7 +755,7 @@ self: {
        sha256 = "0avkxhw5hp00znhmqw3kqxx165ba5y5kgq8b9ahp679p0qf84a3c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl pretty ];
+       executableHaskellDepends = [ base containers mtl pretty ];
        homepage = "https://github.com/mgrabmueller/AlgorithmW";
        description = "Example implementation of Algorithm W for Hindley-Milner type inference";
        license = stdenv.lib.licenses.bsd3;
@@ -751,7 +769,7 @@ self: {
        pname = "AlignmentAlgorithms";
        version = "0.0.2.0";
        sha256 = "110vhp7kdg9l5j3w19wbimmfpq4c05xgx680vb938r1pgpx9s76r";
-       buildDepends = [
+       libraryHaskellDepends = [
          ADPfusion base containers fmlist FormalGrammars GrammarProducts
          PrimitiveArray vector
        ];
@@ -770,11 +788,11 @@ self: {
        sha256 = "0lmkfa6wk0hqin43lf6ll3227c4h7qvya7s6k6sfz8syy51ggqx7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers enummapset-th filepath LambdaHack template-haskell
          text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers enummapset-th filepath LambdaHack template-haskell
          text
        ];
@@ -794,7 +812,7 @@ self: {
        sha256 = "1ksmxhriqy8z3fymnvhg7bwaj032nrsvq3gygfwkg3m8538v9xyc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdtheline containers mtl network opml pretty
          process QuickCheck split transformers xml
        ];
@@ -810,7 +828,7 @@ self: {
        pname = "Animas";
        version = "0.2";
        sha256 = "01vpw9s93qq8c0zymp4qzv0ljn9jrnwi3x68qx9lcjr6spa0rkvm";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        homepage = "https://github.com/eamsden/Animas";
        description = "Updated version of Yampa: a library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
@@ -823,11 +841,10 @@ self: {
        pname = "Annotations";
        version = "0.2.1";
        sha256 = "1iqcg47rklibps6xjs7zw76npycpa1jj3x68zz75np3r0fnwiqhj";
-       buildDepends = [ base mtl multirec parsec ];
-       testDepends = [ base mtl multirec parsec ];
+       libraryHaskellDepends = [ base mtl multirec parsec ];
+       testHaskellDepends = [ base mtl multirec parsec ];
        description = "Constructing, analyzing and destructing annotated trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ansi2Html" = callPackage
@@ -838,7 +855,7 @@ self: {
        sha256 = "1dqq1rnx1w0cn4w11knmxvn7qy4lg4m39dgw4rs6r2pjqzgrwarh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl parsec xhtml ];
+       executableHaskellDepends = [ base mtl parsec xhtml ];
        homepage = "http://janzzstimmpfle.de/~jens/software/Ansi2Html/";
        description = "Convert ANSI Terminal Sequences to nice HTML markup";
        license = stdenv.lib.licenses.bsd3;
@@ -854,9 +871,10 @@ self: {
        sha256 = "0dw52pj17fggi605zf4px852479yc6m6ksbidyw84lkys5dyll3r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring haskell98 json mtl network
        ];
+       executableHaskellDepends = [ base ];
        description = "Library for Apple Push Notification Service";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -868,7 +886,7 @@ self: {
        pname = "AppleScript";
        version = "0.2.0.1";
        sha256 = "1jmwixyv5msb3lmza7dljvm3l0x5mx8r93zr607sx9m5x9yhlsvr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/reinerp/haskell-AppleScript";
        description = "Call AppleScript from Haskell, and then call back into Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -881,7 +899,7 @@ self: {
        pname = "ApproxFun-hs";
        version = "0.1.0.0";
        sha256 = "1s7amy8ij5bgv8afbjdzqd3lflvhzrrh3cs3krl1rf73y8b1nqpy";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        jailbreak = true;
        homepage = "https://github.com/idontgetoutmuch/ApproxFun.hs";
        description = "Function approximation";
@@ -894,7 +912,7 @@ self: {
        pname = "ArrayRef";
        version = "0.1.3.1";
        sha256 = "1yb209v3lab3knggplmwih1ww6qalf8v86j8ggv1gkhm5jkwz1yq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/Library/ArrayRef";
        description = "Unboxed references, dynamic arrays and more";
        license = stdenv.lib.licenses.bsd3;
@@ -907,7 +925,7 @@ self: {
        pname = "ArrowVHDL";
        version = "1.1";
        sha256 = "1lv76m4qc1sabagllaagi7bpqf1mnmzsra333a77b6134mk2f9hb";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        jailbreak = true;
        homepage = "https://github.com/frosch03/arrowVHDL";
        description = "A library to generate Netlist code from Arrow descriptions";
@@ -920,10 +938,12 @@ self: {
      mkDerivation {
        pname = "AspectAG";
        version = "0.3.6.1";
-       revision = "1";
        sha256 = "01pglvf38v5ii2w03kdlgngxbb3ih0j5bsilv5qwc9vrh2iwirhf";
+       revision = "1";
        editedCabalFile = "d5b68030eaf2111998f6d5774a1d26d5afb685fe6b087fe1aed7ef90084a0070";
-       buildDepends = [ base containers HList mtl template-haskell ];
+       libraryHaskellDepends = [
+         base containers HList mtl template-haskell
+       ];
        jailbreak = true;
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG";
        description = "Attribute Grammars in the form of an EDSL";
@@ -940,10 +960,10 @@ self: {
        pname = "AttoBencode";
        version = "0.3.1.0";
        sha256 = "0rzzi4asfmkg8nqlxdyq3gwg0q10hqrnvlmq4fjcxvxgvz1ys9hb";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -961,7 +981,7 @@ self: {
        pname = "AttoJson";
        version = "0.5.10";
        sha256 = "0mavq6akhx7pjdz15ckgnmgf8z9zhi5fm97lvjpjdfiggfy191d2";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-show containers mtl
          utf8-string
        ];
@@ -978,7 +998,9 @@ self: {
        sha256 = "0spvvgkf33km969l524580kwn7y43rjm2k0lqp9bl60nbvlsw760";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base colour GLUT OpenGL random ];
+       executableHaskellDepends = [
+         array base colour GLUT OpenGL random
+       ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/rhz/StrangeAttractors";
        description = "Visualisation of Strange Attractors in 3-Dimensions";
@@ -994,7 +1016,7 @@ self: {
        sha256 = "0n51j50qlpkgkq64n7w96qkv270lwxac1h7ariqq7w70zgdgiqf5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers parsec pretty ];
+       executableHaskellDepends = [ base containers parsec pretty ];
        description = "Yet another parser generator for C/C++";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1008,7 +1030,7 @@ self: {
        pname = "AutoForms";
        version = "0.4.2";
        sha256 = "14dd6s3j9w738dvhyhxb9q8w9m0xhd6fm0d40b3gzl5sjb6g16zf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base haskell98 mtl syb-with-class template-haskell wx wxcore
        ];
        homepage = "http://autoforms.sourceforge.net/";
@@ -1023,7 +1045,7 @@ self: {
        pname = "AvlTree";
        version = "4.2";
        sha256 = "0bw6856h75wks0mfvvqqm5i31sici1hacyl5zfj225jf9gn5q7dx";
-       buildDepends = [ base COrdering ];
+       libraryHaskellDepends = [ base COrdering ];
        description = "Balanced binary trees using the AVL algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1035,7 +1057,7 @@ self: {
        pname = "BASIC";
        version = "0.1.5.0";
        sha256 = "1ypq7m09ki5wbwkvmqdl7ch40cbdfhb91kq8n17im184r5liyxlc";
-       buildDepends = [ base containers llvm random timeit ];
+       libraryHaskellDepends = [ base containers llvm random timeit ];
        description = "Embedded BASIC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1052,10 +1074,15 @@ self: {
        sha256 = "1693kg8hxr1jl8h0ri11dbrbyhyznipkvcp0cvvx9chn97761ys4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring bytestring-lexing cereal colour conduit
-         conduit-extra data-default-class matrices optparse-applicative
-         resourcet split transformers unordered-containers vector zlib
+       libraryHaskellDepends = [
+         base bytestring cereal colour conduit conduit-extra
+         data-default-class matrices transformers unordered-containers
+         vector zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring bytestring-lexing cereal conduit conduit-extra
+         data-default-class optparse-applicative resourcet split
+         unordered-containers
        ];
        description = "Big Contact Map Tools";
        license = stdenv.lib.licenses.mit;
@@ -1073,14 +1100,15 @@ self: {
        sha256 = "0d3zcxspxcpnifv3kqg8d6gp01wxybakcbw7jh69gqg8rzfmzgi1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ array base ];
+       executableHaskellDepends = [
          array base containers deepseq directory filepath mtl pretty process
        ];
-       testDepends = [
+       executableToolDepends = [ alex happy ];
+       testHaskellDepends = [
          array base containers deepseq directory doctest filepath hspec
          HUnit mtl pretty process QuickCheck temporary
        ];
-       buildTools = [ alex happy ];
        homepage = "http://bnfc.digitalgrammars.com/";
        description = "A compiler front-end generator";
        license = stdenv.lib.licenses.gpl2;
@@ -1094,13 +1122,12 @@ self: {
        pname = "BNFC-meta";
        version = "0.4.0.3";
        sha256 = "10rfljhygdl75ibmj0xqj7qwdk0ppjr8iw4wmvzdpl28mqjshny2";
-       buildDepends = [
+       libraryHaskellDepends = [
          alex-meta array base happy-meta haskell-src-meta syb
          template-haskell
        ];
        description = "Deriving Parsers and Quasi-Quoters from BNF Grammars";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Baggins" = callPackage
@@ -1108,10 +1135,10 @@ self: {
      mkDerivation {
        pname = "Baggins";
        version = "1.0";
-       revision = "1";
        sha256 = "0mgxq8zqyfmwkvn91y91c2vjhrni3br0vgiih2ynlafnas1ji0bc";
+       revision = "1";
        editedCabalFile = "654cbc7a4109bf3baaa2491f10a7f49d1831008129d4d5ef9e0e558a5a374098";
-       buildDepends = [ base cairo containers mtl ];
+       libraryHaskellDepends = [ base cairo containers mtl ];
        jailbreak = true;
        homepage = "http://pageperso.lif.univ-mrs.fr/~pierre-etienne.meunier/Baggins";
        description = "Tools for self-assembly";
@@ -1127,7 +1154,9 @@ self: {
        pname = "Bang";
        version = "0.1.1.0";
        sha256 = "1y68k1xsx2fksz70z5b8wdf5brk3vqsc6sih2asp4f97nwlkm5fw";
-       buildDepends = [ base bifunctors hmidi mtl stm time transformers ];
+       libraryHaskellDepends = [
+         base bifunctors hmidi mtl stm time transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/5outh/Bang/";
        description = "A Drum Machine DSL for Haskell";
@@ -1146,7 +1175,13 @@ self: {
        sha256 = "0i8b6g2jvwg5r5gi1q3fgckh675pc6viqdvncl4ycr4zf72r4jj3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         adhoc-network array base bytestring containers Crypto dataenc
+         directory filepath gtk HaXml heap hsgnutls mtl network old-locale
+         parsec pkcs1 random regex-compat stm time unix utf8-string
+         xml-parsec
+       ];
+       executableHaskellDepends = [
          adhoc-network array base bytestring containers Crypto dataenc
          directory filepath gtk HaXml heap hsgnutls mtl network old-locale
          parsec pkcs1 random regex-compat stm time unix utf8-string
@@ -1166,7 +1201,7 @@ self: {
        sha256 = "1hs4p5s30ml97yrr91ahy7275jh4vyvh2l5p0p3jvpfysvg9sl6l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base mtl random ];
+       executableHaskellDepends = [ array base mtl random ];
        jailbreak = true;
        homepage = "http://coder.bsimmons.name/blog/2010/05/befunge-93-interpreter-on-hackage";
        description = "An interpreter for the Befunge-93 Programming Language";
@@ -1184,7 +1219,7 @@ self: {
        sha256 = "07qdadcs76h7yd0k4hn3x3yqdiq7hp5lflxbxxlicx76k20fgl99";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cassava deepseq directory statistics time vector
        ];
        homepage = "https://github.com/choener/BenchmarkHistory";
@@ -1198,8 +1233,8 @@ self: {
        pname = "BerkeleyDB";
        version = "0.8.7";
        sha256 = "0q1qc6rds05bkxl2m3anp7x75cwinp9nhy8j0g1vaj2scasvki62";
-       buildDepends = [ base bytestring extensible-exceptions ];
-       extraLibraries = [ db ];
+       libraryHaskellDepends = [ base bytestring extensible-exceptions ];
+       librarySystemDepends = [ db ];
        homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML";
        description = "Berkeley DB binding";
        license = stdenv.lib.licenses.bsd3;
@@ -1213,8 +1248,8 @@ self: {
        pname = "BerkeleyDBXML";
        version = "0.7.2";
        sha256 = "1ymdi5qi4hxaikqf8min830r1rs1z4bvy9bdybsq378v7mrgfihp";
-       buildDepends = [ base BerkeleyDB bytestring ];
-       extraLibraries = [ db dbxml xercesc xqilla ];
+       libraryHaskellDepends = [ base BerkeleyDB bytestring ];
+       librarySystemDepends = [ db dbxml xercesc xqilla ];
        homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML";
        description = "Berkeley DB XML binding";
        license = stdenv.lib.licenses.bsd3;
@@ -1228,7 +1263,7 @@ self: {
        pname = "BerlekampAlgorithm";
        version = "0.1.0.0";
        sha256 = "14wjpfr9d8fpgl1jkpm2123lprr3hf3a6smkaflzkgxqlgcrkmyr";
-       buildDepends = [ base besout ];
+       libraryHaskellDepends = [ base besout ];
        jailbreak = true;
        description = "Factorization of polynomials over finite field";
        license = stdenv.lib.licenses.bsd3;
@@ -1242,7 +1277,7 @@ self: {
        sha256 = "19fxxbgj67rz2fpxd6f307xd6p7blwynq6gcakjnc7kdq8ghfrgz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base bmp bytestring gloss ];
+       executableHaskellDepends = [ array base bmp bytestring gloss ];
        homepage = "https://github.com/mchakravarty/BigPixel";
        description = "Image editor for pixel art";
        license = stdenv.lib.licenses.bsd3;
@@ -1254,7 +1289,7 @@ self: {
        pname = "Binpack";
        version = "0.4.1";
        sha256 = "0am0487l7njngp2k6h3qfbhjs61d9ir9rp8iw1r5448b20n4fxas";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Common bin-packing heuristics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1270,7 +1305,7 @@ self: {
        pname = "Biobase";
        version = "0.3.1.1";
        sha256 = "1zrslhf3aiwc3y0b628j1w93z78v9apcjm2sxyw5qcq6r48zrmcc";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq directory either-unwrap
          file-embed filemanip filepath ghc-prim HsTools mtl parsec
          ParsecTools primitive PrimitiveArray split tuple utility-ht vector
@@ -1289,7 +1324,7 @@ self: {
        pname = "BiobaseBlast";
        version = "0.0.0.1";
        sha256 = "1p7f2azq92shmxvs3n683mr5965qkmijbj4ya6333cd7nilwgl0f";
-       buildDepends = [ array base BiobaseXNA containers ];
+       libraryHaskellDepends = [ array base BiobaseXNA containers ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "BLAST-related tools";
        license = stdenv.lib.licenses.gpl3;
@@ -1302,7 +1337,7 @@ self: {
        pname = "BiobaseDotP";
        version = "0.1.0.0";
        sha256 = "0m7n3c2ly6kly146xrxzx41g3pv0cylrmzpdgv5c54x9gvb1hg7w";
-       buildDepends = [ base bytestring iteratee ];
+       libraryHaskellDepends = [ base bytestring iteratee ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Vienna / DotBracket / ExtSS parsers";
        license = stdenv.lib.licenses.gpl3;
@@ -1317,7 +1352,7 @@ self: {
        pname = "BiobaseFR3D";
        version = "0.2.3.0";
        sha256 = "1y8aqxb8gq4k4l0i2wcrn2yi6f7lcmbhbvs4n063r4hgda6xfgch";
-       buildDepends = [
+       libraryHaskellDepends = [
          base BiobaseXNA bytestring containers filemanip iteratee tuple
        ];
        jailbreak = true;
@@ -1337,9 +1372,10 @@ self: {
        sha256 = "035pr31mrmfhmpja8llw81jyxy11aba62bfph34gf3rsi96iylnw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base biocore bytestring cmdargs conduit containers transformers
+       libraryHaskellDepends = [
+         base biocore bytestring conduit containers transformers
        ];
+       executableHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "conduit-based FASTA parser";
@@ -1357,7 +1393,7 @@ self: {
        pname = "BiobaseInfernal";
        version = "0.7.1.0";
        sha256 = "19ga8qaqfp3jkd3mn8p1qrxv0frp4f4qkzhn0p0n8as6dlsifd2s";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-conduit base BiobaseXNA biocore bytestring
          bytestring-lexing conduit containers either-unwrap lens primitive
          PrimitiveArray repa transformers tuple vector
@@ -1375,7 +1411,7 @@ self: {
        pname = "BiobaseMAF";
        version = "0.5.0.0";
        sha256 = "0mwyyb7n232wgjipn9jsbqpcbxqms07adi5a6v14qaiynsjz4n1r";
-       buildDepends = [ base bytestring containers iteratee ];
+       libraryHaskellDepends = [ base bytestring containers iteratee ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Multiple Alignment Format";
        license = stdenv.lib.licenses.gpl3;
@@ -1392,10 +1428,11 @@ self: {
        sha256 = "0qqyj3y2ivxj4d1c4bl5mdi7xm649dvksl57ba0wl0awimi5xn2s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base BiobaseDotP BiobaseFR3D BiobaseXNA bytestring cmdargs
-         either-unwrap iteratee vector
+       libraryHaskellDepends = [
+         base BiobaseDotP BiobaseFR3D BiobaseXNA bytestring either-unwrap
+         iteratee vector
        ];
+       executableHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "RNA folding training data";
@@ -1412,7 +1449,7 @@ self: {
        pname = "BiobaseTurner";
        version = "0.3.1.1";
        sha256 = "1h6yn6nwl8ifbz8y1rq5xklhmnbbjibfi9qz4n79xmv7y9bgkbxf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base BiobaseXNA bytestring bytestring-lexing conduit containers
          filepath lens primitive PrimitiveArray repa split vector
        ];
@@ -1433,19 +1470,18 @@ self: {
        pname = "BiobaseTypes";
        version = "0.1.1.0";
        sha256 = "1z3vhxqqyc1bn1byvld21psi7am8zwmxsa7aiqshppw5hqyslwvl";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary cereal cereal-text data-default deepseq hashable
          log-domain primitive PrimitiveArray QuickCheck stringable text
          text-binary vector vector-binary-instances vector-th-unbox
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
        homepage = "https://github.com/choener/BiobaseTypes";
        description = "Collection of types for bioinformatics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseVienna" = callPackage
@@ -1456,7 +1492,7 @@ self: {
        pname = "BiobaseVienna";
        version = "0.3.0.0";
        sha256 = "0bv100rmr04w8wbzabihv43lxilr0b2rm97rx54bhln1sy0ih1wj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base BiobaseTurner BiobaseXNA primitive PrimitiveArray vector
        ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
@@ -1477,12 +1513,13 @@ self: {
        sha256 = "1ck6yba372w3cbzgifcbfdd2m4nfyy7zd8zygkji3zbxymz2ak18";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bimaps binary bytes bytestring cereal cereal-vector
-         cmdargs containers csv deepseq file-embed hashable lens primitive
+         containers csv deepseq file-embed hashable lens primitive
          PrimitiveArray split text tuple vector vector-binary-instances
          vector-th-unbox
        ];
+       executableHaskellDepends = [ base cmdargs ];
        homepage = "https://github.com/choener/BiobaseXNA";
        description = "Efficient RNA/DNA representations";
        license = stdenv.lib.licenses.gpl3;
@@ -1496,7 +1533,7 @@ self: {
        sha256 = "14wbnxjyg75vc7zwg42cpk8a1cb7gm4881c52yaq1bq053g5dsz2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 ];
+       executableHaskellDepends = [ base haskell98 ];
        jailbreak = true;
        description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup";
        license = "GPL";
@@ -1511,7 +1548,7 @@ self: {
        pname = "BitSyntax";
        version = "0.3.2";
        sha256 = "1kz9s9g05b5qzw9p7vvyw8zmy9sx1wzn83ay6prdyv74x0wycjbl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring haskell98 QuickCheck template-haskell
        ];
        homepage = "http://www.imperialviolet.org/bitsyntax";
@@ -1526,7 +1563,7 @@ self: {
        pname = "Bitly";
        version = "0.1.0";
        sha256 = "1pmmgg6n6pc0qvp5r4qxan32887132si0cayd0xh1g5v98fa9ari";
-       buildDepends = [ base HTTP json2 ];
+       libraryHaskellDepends = [ base HTTP json2 ];
        homepage = "http://bitbucket.org/jetxee/hs-bitly/";
        description = "A library to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
@@ -1540,10 +1577,10 @@ self: {
      mkDerivation {
        pname = "BlastHTTP";
        version = "1.2.0";
-       revision = "1";
        sha256 = "0vhnwjgamc1zry8w7m6jb7ambz3lqqr00j05xymzwcapgwg8v9b5";
+       revision = "1";
        editedCabalFile = "7076650ad04d2c5945b96ec1a8d5db8ee680314d4dc4cff54f264316e7f69bba";
-       buildDepends = [
+       libraryHaskellDepends = [
          base biocore biofasta blastxml bytestring conduit HTTP http-conduit
          hxt mtl network transformers
        ];
@@ -1562,7 +1599,10 @@ self: {
        sha256 = "09mpf3qwr38x0ljz4ziyhdcwl5j37i353wc2dkpc6hjki9p08rgl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory HaXml polyparse pretty wx wxcore
+       ];
+       executableHaskellDepends = [
          base containers directory HaXml polyparse pretty wx wxcore
        ];
        homepage = "http://www.cs.york.ac.uk/fp/darcs/Blobs/";
@@ -1584,12 +1624,13 @@ self: {
        sha256 = "02q0i2p892adpmi7p4hh8666qzrpi76bxwljf575hiaz018yixlb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bool-extras bytestring cmdargs containers
          data-default directory filepath HaXml haxr highlighting-kate
          hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec
          process split strict temporary transformers
        ];
+       executableHaskellDepends = [ base cmdargs ];
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
@@ -1606,10 +1647,11 @@ self: {
        sha256 = "190wny2ggqahsiv5ar23pndf3ngparb5mrrjp7his5crp6xvk66m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base BlogLiterately containers diagrams-builder diagrams-lib
          diagrams-rasterific directory filepath JuicyPixels pandoc safe
        ];
+       executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1621,7 +1663,7 @@ self: {
        pname = "BluePrintCSS";
        version = "0.1";
        sha256 = "0ryjgi70isgfv3nw3djzvb1saky40xqy536h6sr3mfpy2iqnim0c";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://git.ierton.ru/?p=BluePrint.git;a=summary";
        description = "Html document layout library";
        license = stdenv.lib.licenses.bsd3;
@@ -1649,11 +1691,11 @@ self: {
        sha256 = "1h23ncphq717xqvg3bhij0ypmi6whm0aibhmiwak71sjkzv604in";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath pandoc pandoc-citeproc
          pandoc-types parseargs
        ];
-       testDepends = [ base process ];
+       testHaskellDepends = [ base process ];
        homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html";
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
@@ -1666,7 +1708,7 @@ self: {
        pname = "Boolean";
        version = "0.2.3";
        sha256 = "1lsm06y7hgjp9qmlr6csf24x3wgna7sbf8dgh6sfl2rhs7fn8kgn";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generalized booleans and numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1677,7 +1719,7 @@ self: {
        pname = "BoundedChan";
        version = "1.0.3.0";
        sha256 = "0vf4mlw08n056g5256cf46m5xsijng5gvjx7ccm4r132gznyl72k";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Implementation of bounded channels";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1690,7 +1732,7 @@ self: {
        pname = "Bravo";
        version = "0.1.0.1";
        sha256 = "16li42rl77jvhyp14fjic66c7d6qm2fjln93gyw4bqbykai291in";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts haskell-src-meta mtl parsec syb
          template-haskell
        ];
@@ -1707,7 +1749,7 @@ self: {
        pname = "BufferedSocket";
        version = "0.2.0.0";
        sha256 = "0sgwglnzsqwz1k11jbzp7lpb29h9ap2mny2lv9m9nrlr0ydhcdqf";
-       buildDepends = [ base bytestring network text ];
+       libraryHaskellDepends = [ base bytestring network text ];
        jailbreak = true;
        description = "A socker wrapper that makes the IO of sockets much cleaner";
        license = stdenv.lib.licenses.mit;
@@ -1725,11 +1767,11 @@ self: {
        sha256 = "12zchy3sqdcqdgbb7d29jrsqifz4hfdx94s514v2mmyzzr0m8xqd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring conduit data-default errors hinotify hslogger
          http-conduit http-types transformers unbounded-delays unix yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring errors hslogger hspec hspec-expectations
          http-conduit http-types string-qq temporary unix yaml
        ];
@@ -1749,10 +1791,10 @@ self: {
        pname = "CBOR";
        version = "0.1.0.1";
        sha256 = "03h8lp5sm8prbphq98c7ar93rl9yfy29pvwrkrskdjhx79pd1w6q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary binary-bits bytestring data-binary-ieee754
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary binary-bits bytestring data-binary-ieee754 doctest
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -1768,7 +1810,7 @@ self: {
        pname = "CC-delcont";
        version = "0.2";
        sha256 = "0bl71vj1ypzplx92kz27hhbpnwnxkz5g2q86m4fcmjmp4fym8kc1";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://code.haskell.org/~dolio/CC-delcont";
        description = "Delimited continuations and dynamically scoped variables";
        license = "unknown";
@@ -1783,10 +1825,10 @@ self: {
        pname = "CC-delcont-alt";
        version = "0.1.1.1";
        sha256 = "0s6z5bcxmcx1vzgjc6r2i4898j6s3ngjjdqhggp893hmhpxlbgsv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base CC-delcont-cxe CC-delcont-exc CC-delcont-ref mtl
        ];
-       testDepends = [ base doctest mtl ];
+       testHaskellDepends = [ base doctest mtl ];
        description = "Three new monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1798,7 +1840,7 @@ self: {
        pname = "CC-delcont-cxe";
        version = "0.1.0.2";
        sha256 = "1s6bql9r78yfzgarm3i4f2glhc5w8qq91adhs15cnqj6h7768a5c";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1810,7 +1852,7 @@ self: {
        pname = "CC-delcont-exc";
        version = "0.1.0.0";
        sha256 = "07v388bzs8x9k1p677310rbh8baj1fdq3bhbqyvxqzx93kv8g381";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1822,7 +1864,7 @@ self: {
        pname = "CC-delcont-ref";
        version = "0.1.0.0";
        sha256 = "0fzjr73id8rlrcmf0j3y1qn4jnc8incqhhkp9wl35lig20kqy82m";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1834,7 +1876,7 @@ self: {
        pname = "CC-delcont-ref-tf";
        version = "0.1.0.2";
        sha256 = "0zavw824xcr1jhmlpz9hmabhhi459y0s7z434lxalzha01j1wfih";
-       buildDepends = [ base ref-tf transformers ];
+       libraryHaskellDepends = [ base ref-tf transformers ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1850,10 +1892,9 @@ self: {
        sha256 = "05zv1vha31fgw4ddvrnbvk5pzhq8lkvfx1xrgja5ggy451zrs6aw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base containers ghc-prim haskell-src syb template-haskell
-       ];
-       buildTools = [ happy ];
+       libraryHaskellDepends = [ base ghc-prim syb template-haskell ];
+       executableHaskellDepends = [ array base containers haskell-src ];
+       executableToolDepends = [ happy ];
        homepage = "not available";
        description = "preprocessor and library for Causal Commutative Arrows (CCA)";
        license = stdenv.lib.licenses.bsd3;
@@ -1866,7 +1907,9 @@ self: {
        pname = "CHXHtml";
        version = "0.2.0";
        sha256 = "0pr2mvcnrz3240wnpd44g3pz9x8am6vhhfvl0lyl129kvc33v99q";
-       buildDepends = [ base bytestring hxt-regex-xmlschema utf8-string ];
+       libraryHaskellDepends = [
+         base bytestring hxt-regex-xmlschema utf8-string
+       ];
        homepage = "http://fuzzpault.com/chxhtml";
        description = "A W3C compliant (X)HTML generating library";
        license = stdenv.lib.licenses.bsd3;
@@ -1880,7 +1923,7 @@ self: {
        pname = "CLASE";
        version = "2009.2.11";
        sha256 = "10jab7jxlhppmqqw31g653l8jmz4vz8f9h9wr2i9fjf6bipvgfi3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath mtl parsec template-haskell
        ];
        homepage = "http://www.zonetora.co.uk/clase/";
@@ -1895,8 +1938,8 @@ self: {
        pname = "CLI";
        version = "0.1.0.0";
        sha256 = "1g271n7z6xndqylwxwcaa1xscgd36wzb2apbmrilv42v7ii4aall";
-       buildDepends = [ base directory split time ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base directory split time ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        description = "CLI tools";
        license = stdenv.lib.licenses.bsd3;
@@ -1912,9 +1955,10 @@ self: {
        sha256 = "1ccjyn0cc8yx7fgnvsjap0swlxql3gdygb5mabzvkgk84zc3bh2b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base BiobaseInfernal BiobaseXNA cmdargs containers lens
+       libraryHaskellDepends = [
+         array base BiobaseInfernal BiobaseXNA containers lens
        ];
+       executableHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "http://www.tbi.univie.ac.at/software/cmcompare/";
        description = "Infernal covariance model comparison";
@@ -1930,7 +1974,7 @@ self: {
        pname = "CMQ";
        version = "0.0.12";
        sha256 = "0zskbcjdd4s8bkll7jvb8qzyq8pa52li4db9r5wg16pd2l3m0fpb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers iproute mtl network PSQueue stm
          time
        ];
@@ -1945,7 +1989,7 @@ self: {
        pname = "COrdering";
        version = "2.3";
        sha256 = "1lkav4wkyrraq1f6kyqfyjrxasgkayg4hmyv8a1gkr4h484b1cx8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "An algebraic data type similar to Prelude Ordering";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1959,7 +2003,7 @@ self: {
        sha256 = "041bm02xar8g6ppz6g0fdgs4ywavlcn4pqkncydx0lw5wp9ygwwn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 ];
+       executableHaskellDepends = [ base haskell98 ];
        description = "A simple Brainfuck interpretter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1973,7 +2017,9 @@ self: {
        sha256 = "1hm2slnvcp1fqdrgx505wkj3w511x9896h2hj9riyky6vg2mzgr7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers mtl parsec readline ];
+       executableHaskellDepends = [
+         array base containers mtl parsec readline
+       ];
        description = "An interpreter of Hagino's Categorical Programming Language (CPL)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1985,7 +2031,7 @@ self: {
        pname = "CSPM-CoreLanguage";
        version = "0.3.0.3";
        sha256 = "0vr6zpdz5lnpkyzwhig72pv8ncvqdjyp1nn76zpx3v6xlpzrs3q2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Definition of a FDR-compatible CSP core-language";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1998,7 +2044,7 @@ self: {
        pname = "CSPM-FiringRules";
        version = "0.4.3.0";
        sha256 = "0rdggf00zq51j4af6rhk4ix8rbpd82piy2al4m6ymziwflv3b70m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers CSPM-CoreLanguage mtl parallel-tree-search
          QuickCheck random tree-monad
        ];
@@ -2016,11 +2062,11 @@ self: {
        pname = "CSPM-Frontend";
        version = "0.10.0.0";
        sha256 = "0wmfk9givv604ajzkg60586lz08xqcx60bnqgslpfzkh458mz9z3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers dlist either ghc-prim mtl parsec2 prettyclass
          syb transformers
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
        jailbreak = true;
        description = "A CSP-M parser compatible with FDR-2.91";
        license = stdenv.lib.licenses.bsd3;
@@ -2035,7 +2081,7 @@ self: {
        pname = "CSPM-Interpreter";
        version = "0.7.0.0";
        sha256 = "0shf0bb4zqnxvclsavvxnsy697xbl5q1xjqww8makps6dirwk0qn";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers CSPM-CoreLanguage CSPM-Frontend mtl
          prettyclass syb
        ];
@@ -2053,7 +2099,7 @@ self: {
        pname = "CSPM-ToProlog";
        version = "0.5.2.0";
        sha256 = "0qy2zdxgdm9vacm2ickf1lvyj6wrcnpifaxgh25apg9j9v6g0h12";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers CSPM-Frontend ghc-prim pretty
        ];
        jailbreak = true;
@@ -2073,7 +2119,12 @@ self: {
        sha256 = "1lhfq8gjls2g3xwskwa7vx1kj6n83b4msx4fc6769li4r2xn1bc9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules
+         CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty
+         prettyclass syb transformers xml
+       ];
+       executableHaskellDepends = [
          base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules
          CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty
          prettyclass syb transformers xml
@@ -2092,7 +2143,7 @@ self: {
        pname = "CTRex";
        version = "0.6";
        sha256 = "0cjinznkvdrswbqrsha49b6hch7sjv2qq9xllx780klf01kdahi6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hashable mtl unordered-containers
        ];
        homepage = "http://www.haskell.org/haskellwiki/CTRex";
@@ -2113,17 +2164,17 @@ self: {
        pname = "CV";
        version = "0.3.7";
        sha256 = "0c200jn6q4y744k39jll7xw418js7y86vvihz49i8kk2316vakmr";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bindings-DSL carray containers deepseq directory
          filepath lazysmallcheck mtl mwc-random parallel parallel-io
          primitive QuickCheck storable-complex storable-tuple vector
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [
+       librarySystemDepends = [
          opencv_calib3d opencv_contrib opencv_core opencv_features2d
          opencv_flann opencv_gpu opencv_highgui opencv_imgproc opencv_legacy
          opencv_ml opencv_objdetect opencv_video
        ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "http://aleator.github.com/CV/";
        description = "OpenCV based machine vision library";
@@ -2145,17 +2196,16 @@ self: {
        pname = "Cabal";
        version = "1.18.1.6";
        sha256 = "15nn6f8bnqzy7pqxb45hdf30qid2hw608dcqgmwrcfrd8zrrvylw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath pretty
          process time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory extensible-exceptions filepath HUnit
          process QuickCheck regex-posix test-framework test-framework-hunit
          test-framework-quickcheck2 unix
        ];
        jailbreak = true;
-       preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
        homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
@@ -2171,17 +2221,16 @@ self: {
        pname = "Cabal";
        version = "1.20.0.3";
        sha256 = "0vq1xcwvvk74jkzp7386ldyrls8qszg3rj4l37fyq3fvjkqnx80v";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath pretty
          process time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory extensible-exceptions filepath HUnit
          process QuickCheck regex-posix test-framework test-framework-hunit
          test-framework-quickcheck2 unix
        ];
        jailbreak = true;
-       preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
        homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
@@ -2198,17 +2247,16 @@ self: {
        pname = "Cabal";
        version = "1.22.4.0";
        sha256 = "19nwapy5rvsrk8jc75ql5klp8hikzrwd3c5x07nisl73d2r8ssmr";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          pretty process time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers directory extensible-exceptions filepath
          HUnit old-time process QuickCheck regex-posix test-framework
          test-framework-hunit test-framework-quickcheck2 unix
        ];
        jailbreak = true;
-       preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
        homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
@@ -2225,11 +2273,11 @@ self: {
        pname = "Cabal-ide-backend";
        version = "1.23.0.0";
        sha256 = "07s9gkq2d4sz8nrjayrnb3gbjm58sp7gfl3hnl8n1gsxsfbl2cgw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          pretty process time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring Cabal containers directory extensible-exceptions
          filepath HUnit old-time process QuickCheck regex-posix
          test-framework test-framework-hunit test-framework-quickcheck2 unix
@@ -2250,7 +2298,7 @@ self: {
        sha256 = "181k2rybbyhjmwf1fq69hiaf14a0rzcvnv4j9w03n2v7cal4k08b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath HDBC HDBC-sqlite3 process unix
        ];
        jailbreak = true;
@@ -2265,7 +2313,7 @@ self: {
        pname = "Capabilities";
        version = "0.1.0.0";
        sha256 = "0nd5yvhbxmabs0890y9gjjiq37h8c3blpplv2m13k29zkijwad04";
-       buildDepends = [ base compdata directory free unix ];
+       libraryHaskellDepends = [ base compdata directory free unix ];
        jailbreak = true;
        homepage = "https://github.com/Icelandjack/Capabilities";
        description = "Separate and contain effects of IO monad";
@@ -2279,7 +2327,7 @@ self: {
        pname = "Cardinality";
        version = "0.2";
        sha256 = "01bp045vl08sixvi6h0i21vvmjirnyzlmwxx8yq5njbcxrgbq6dn";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Measure container capacity. Use it to safely change container.";
        license = "LGPL";
      }) {};
@@ -2290,7 +2338,7 @@ self: {
        pname = "CarneadesDSL";
        version = "1.3";
        sha256 = "06ri47cfskvpm65zb63kjrwwhzlmcp2f0z99hqkfw216p85648a3";
-       buildDepends = [ base containers fgl parsec ];
+       libraryHaskellDepends = [ base containers fgl parsec ];
        homepage = "http://www.cs.nott.ac.uk/~bmv/CarneadesDSL/";
        description = "An implementation and DSL for the Carneades argumentation model";
        license = stdenv.lib.licenses.bsd3;
@@ -2305,7 +2353,9 @@ self: {
        sha256 = "0gmrc778zan5rrkb7rip61736rzx13abfzyjcj4bgdvc3fhih1rx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base CarneadesDSL cmdargs containers Dung fgl ];
+       libraryHaskellDepends = [
+         base CarneadesDSL cmdargs containers Dung fgl
+       ];
        homepage = "http://www.cs.nott.ac.uk/~bmv/CarneadesIntoDung/";
        description = "A translation from the Carneades argumentation model into Dung's AFs";
        license = stdenv.lib.licenses.bsd3;
@@ -2317,7 +2367,7 @@ self: {
        pname = "Cascade";
        version = "0.1.0.0";
        sha256 = "1ih8ydc29axckgidc5xvsdac5558gprscw667msh8qh41j9sshng";
-       buildDepends = [ base comonad ghc-prim mtl void ];
+       libraryHaskellDepends = [ base comonad ghc-prim mtl void ];
        jailbreak = true;
        homepage = "http://github.com/rampion/Cascade";
        description = "Playing with reified categorical composition";
@@ -2331,7 +2381,7 @@ self: {
        pname = "Catana";
        version = "0.3";
        sha256 = "10m7l701p3a2w0kxi2b93g2ii6s4s71zyjypqk3mi79siv8yilif";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "A monad for complex manipulation of a stream";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2345,7 +2395,7 @@ self: {
        pname = "Chart";
        version = "1.5.1";
        sha256 = "0jm1wr2nb1r8rxqc564nmnclns160y7girc7j2ihvyhm0v34p59g";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base colour data-default-class lens mtl old-locale
          operational time vector
        ];
@@ -2362,7 +2412,7 @@ self: {
        pname = "Chart-cairo";
        version = "1.5.1";
        sha256 = "1fwjgms76z2spgfw3kfmzivkgp6gdkx24mp5nb562kza4y6yjz7f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
        ];
@@ -2381,7 +2431,7 @@ self: {
        pname = "Chart-diagrams";
        version = "1.5.1";
        sha256 = "1slsq9p9mq9jxlyhpd90bh32s6fqvy149p4cb7ckygzd77r1aqxz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-markup bytestring Chart colour containers
          data-default-class diagrams-core diagrams-lib diagrams-postscript
          diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts
@@ -2401,7 +2451,7 @@ self: {
        pname = "Chart-gtk";
        version = "1.5.1";
        sha256 = "025snbbsnd2gsldw2j8r3vxh94jrv57h8z4qvkq3dwyh2mvq21lw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
        ];
@@ -2418,7 +2468,7 @@ self: {
        pname = "Chart-simple";
        version = "1.3.3";
        sha256 = "0kk81jz4lciga8qc78gm9khw02n84snyclzf5lcmlz9rs50z3v5r";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cairo Chart Chart-cairo Chart-gtk colour
          data-default-class gtk mtl old-locale time
        ];
@@ -2436,8 +2486,12 @@ self: {
        pname = "ChasingBottoms";
        version = "1.3.0.13";
        sha256 = "1fb86jd6cdz4rx3fj3r9n8d60kx824ywwy7dw4qnrdran46ja3pl";
-       buildDepends = [ base containers mtl QuickCheck random syb ];
-       testDepends = [ array base containers mtl QuickCheck random syb ];
+       libraryHaskellDepends = [
+         base containers mtl QuickCheck random syb
+       ];
+       testHaskellDepends = [
+         array base containers mtl QuickCheck random syb
+       ];
        description = "For testing partial and infinite values";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -2450,7 +2504,7 @@ self: {
        sha256 = "1pw6sssdmxpsjclkhsaf1b06vlimi4w11rxy65ccyj8c9zgs2g23";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers directory ];
+       executableHaskellDepends = [ base containers directory ];
        homepage = "http://cheatsheet.codeslower.com";
        description = "A Haskell cheat sheet in PDF and literate formats";
        license = stdenv.lib.licenses.bsd3;
@@ -2462,7 +2516,7 @@ self: {
        pname = "Checked";
        version = "0.0.0.2";
        sha256 = "1mr323rhh3lr6a5ni60n2kxz2k57763a3rrf7c6i18hxs9d4w2s4";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        jailbreak = true;
        description = "Inbuilt checking for ultra reliable computing";
        license = stdenv.lib.licenses.bsd3;
@@ -2476,7 +2530,7 @@ self: {
        sha256 = "0qf6a1xmpv29hpwcrn3acfvpcx0f95dq980mv5mijzfsznz4d43k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring mtl network ];
+       executableHaskellDepends = [ base binary bytestring mtl network ];
        homepage = "https://github.com/ckkashyap/Chitra";
        description = "A platform independent mechanism to render graphics using vnc";
        license = stdenv.lib.licenses.bsd3;
@@ -2491,7 +2545,7 @@ self: {
        pname = "ChristmasTree";
        version = "0.2.1.1";
        sha256 = "1xng99msiyck127zv12cbksgyprwr6i6nwwjplc9c0jdfiisa9n8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers fgl template-haskell TTTAS uulib
        ];
        jailbreak = true;
@@ -2507,7 +2561,7 @@ self: {
        pname = "CirruParser";
        version = "0.0.1";
        sha256 = "111ccwiszrjy54y5hincyvjj97kmar9n26bbn902qa9jd9y9k3g9";
-       buildDepends = [ aeson base text vector ];
+       libraryHaskellDepends = [ aeson base text vector ];
        homepage = "https://github.com/Cirru/parser.hs";
        description = "Cirru Parser in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -2519,7 +2573,7 @@ self: {
        pname = "ClassLaws";
        version = "0.3.1.0";
        sha256 = "1277vn384hpxd7xnzg0gpr7ilnw5cqhsi11c24g9zsfqa36llwgk";
-       buildDepends = [ base ChasingBottoms mtl QuickCheck ];
+       libraryHaskellDepends = [ base ChasingBottoms mtl QuickCheck ];
        jailbreak = true;
        homepage = "http://wiki.portal.chalmers.se/cse/pmwiki.php/FP/ClassLaws";
        description = "Stating and checking laws for type class methods";
@@ -2533,7 +2587,7 @@ self: {
        pname = "ClassyPrelude";
        version = "0.1";
        sha256 = "1yvkrzd3l7ijh3fqvkbzqv5vp4nv5z26fbxy91sfwh3zqlscpim9";
-       buildDepends = [ base strict ];
+       libraryHaskellDepends = [ base strict ];
        description = "Prelude replacement using classes instead of concrete types where reasonable";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2545,7 +2599,7 @@ self: {
        pname = "Clean";
        version = "0.6";
        sha256 = "0kr9i13ch2wbcnxchrnx562r8ar7kb84gmk3cqxc40x5w416205f";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "A light, clean and powerful utility library";
        license = stdenv.lib.licenses.bsd3;
@@ -2558,7 +2612,7 @@ self: {
        pname = "Clipboard";
        version = "2.2.0.3";
        sha256 = "0qpcfgpfgw426v4040ch63pc2zl7amd2ljapx4xv0j4hwc4rsqz3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/Clipboard";
        description = "System clipboard interface";
        license = stdenv.lib.licenses.bsd3;
@@ -2574,8 +2628,9 @@ self: {
        sha256 = "1xblyxmwbhmfkm2d2a87qnryk6mg5n1zarzr9d3xjh9qx3mbbclb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs either-unwrap parsec vector ];
-       testDepends = [ base hspec parsec ];
+       libraryHaskellDepends = [ base parsec vector ];
+       executableHaskellDepends = [ base cmdargs either-unwrap ];
+       testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing Clustal tools output";
        license = "GPL";
      }) {};
@@ -2589,7 +2644,7 @@ self: {
        pname = "Coadjute";
        version = "0.1.1";
        sha256 = "1crbs8dk93cff252c3nj2brdbjbfygpvlrm4lrp7vpnwfz2709b3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring bytestring-csv containers directory fgl
          filepath mtl old-time pretty pureMD5 safe utf8-string
        ];
@@ -2606,7 +2661,7 @@ self: {
        pname = "Codec-Compression-LZF";
        version = "0.2";
        sha256 = "0jj2iaa632s60dckj8s46g4vrlqc8x9fndkq0kzk8rk4jzwlbwsn";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/Codec-Compression-LZF/";
        description = "LZF compression bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -2618,8 +2673,8 @@ self: {
        pname = "Codec-Image-DevIL";
        version = "0.2.3";
        sha256 = "1kv3hns9f0bhfb723nj9szyz3zfqpvy02azzsiymzjz4ajhqmrsz";
-       buildDepends = [ array base ];
-       extraLibraries = [ libdevil ];
+       libraryHaskellDepends = [ array base ];
+       librarySystemDepends = [ libdevil ];
        description = "An FFI interface to the DevIL library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2638,7 +2693,7 @@ self: {
        sha256 = "0dx5pysxyk5c0fa33khjr86zgm43jz7nwhgl0w8jngyai8b1rbra";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array attoparsec base bytestring cereal containers deepseq
          directory filepath hopenssl hslogger HTTP HUnit mtl network
          network-bytestring parsec pretty PSQueue QuickCheck random
@@ -2656,7 +2711,7 @@ self: {
        pname = "Command";
        version = "0.0.7";
        sha256 = "043dwvjkc1m2cz0rgiib7gv19ds1vn4cmf27lyw68nmc0lcm2v3d";
-       buildDepends = [ base directory process ];
+       libraryHaskellDepends = [ base directory process ];
        homepage = "https://github.com/tonymorris/command";
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
@@ -2672,7 +2727,11 @@ self: {
        sha256 = "1wfpxaj9j68knf1fp3zngxrc1acqvhzrzbblar4ckq9y5kxjwwsj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base data-default fsnotify optparse-applicative process
+         system-fileio system-filepath text
+       ];
+       executableHaskellDepends = [
          base data-default fsnotify optparse-applicative process
          system-fileio system-filepath text
        ];
@@ -2680,6 +2739,7 @@ self: {
        homepage = "https://github.com/sordina/Commando";
        description = "Watch some files; Rerun a command";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ComonadSheet" = callPackage
@@ -2691,7 +2751,7 @@ self: {
        pname = "ComonadSheet";
        version = "0.3.0.0";
        sha256 = "1jpxc5ymhjdk18nggw9fjr6dmqhlz0jwwailyw9i8yzs5dzbn67z";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-numbers base comonad containers distributive
          IndexedList NestedFunctor PeanoWitnesses Stream Tape transformers
        ];
@@ -2710,7 +2770,7 @@ self: {
        pname = "ConcurrentUtils";
        version = "0.4.2.0";
        sha256 = "1bxw8jrniczwc0pprva7zp6kzzrp5cj05r19j024fbgfw6vq9xz4";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers crypto-random cryptohash
          network parallel process reexport-crypto-random RSA securemem
          tagged
@@ -2727,7 +2787,7 @@ self: {
        pname = "Concurrential";
        version = "0.5.0.0";
        sha256 = "1fcl1ckinzv9c0iyfvhh3sm649jn7q8yv2r9vz99l139dw25l5vb";
-       buildDepends = [ async base ];
+       libraryHaskellDepends = [ async base ];
        jailbreak = true;
        homepage = "http://github.com/avieth/Concurrential";
        description = "Mix concurrent and sequential computation";
@@ -2744,10 +2804,11 @@ self: {
        sha256 = "0vrflmjyc1h0mfvc07p3p3wqfscyza7pyxxp7bn1glprg6c9ph5p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base binary containers glider-nlp text ];
+       executableHaskellDepends = [
          base binary containers directory filepath glider-nlp text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary Cabal containers glider-nlp HUnit text
        ];
        jailbreak = true;
@@ -2765,7 +2826,7 @@ self: {
        sha256 = "057mw146bip9wzs7j4b5xr1x24d8w0kr4i3inri5m57jkwspn25f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers MissingH mtl parsec ];
+       libraryHaskellDepends = [ base containers MissingH mtl parsec ];
        homepage = "http://software.complete.org/configfile";
        description = "Configuration file reading & writing";
        license = stdenv.lib.licenses.bsd3;
@@ -2777,7 +2838,9 @@ self: {
        pname = "ConfigFileTH";
        version = "0.2";
        sha256 = "1349vkrnl2z0cfcvdalqf77jajhz0izmnlsbiv84vvj23n04rj9h";
-       buildDepends = [ base ConfigFile parsec template-haskell ];
+       libraryHaskellDepends = [
+         base ConfigFile parsec template-haskell
+       ];
        description = "Template haskell for reading ConfigFiles";
        license = "LGPL";
      }) {};
@@ -2788,7 +2851,7 @@ self: {
        pname = "Configger";
        version = "0.1";
        sha256 = "0fk7165abh4rw4jk6wy4f6y0qpakxlrs4mwrs3r2q7lz03jsyig2";
-       buildDepends = [ base Dangerous MissingH mtl parsec ];
+       libraryHaskellDepends = [ base Dangerous MissingH mtl parsec ];
        description = "Parse config files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2800,7 +2863,7 @@ self: {
        pname = "Configurable";
        version = "0.1.0.0";
        sha256 = "1if0hff6fn7zjj1vh16gxf2kldibh1dkscm8n33d1admvpjpw9sb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/tel/Configurable";
        description = "Declare types as Configurable then specialize them all in one place";
@@ -2813,7 +2876,7 @@ self: {
        pname = "ConsStream";
        version = "0.1";
        sha256 = "1ywhrj2wq24my4cji5fm5cwb3j4yjwzch9hxncr7k989smjdmjpz";
-       buildDepends = [ base Stream ];
+       libraryHaskellDepends = [ base Stream ];
        homepage = "github";
        description = "Trivial re-export of Wouter Swierstra's Stream package, avoiding module name clash";
        license = stdenv.lib.licenses.bsd3;
@@ -2827,7 +2890,7 @@ self: {
        sha256 = "0hiz3wjnvfp9n440kmwq7a88k7m7vq5s49nq85v520j7qnf4y82n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        jailbreak = true;
        homepage = "https://github.com/sordina/Conscript";
        description = "Restart a command on STDIN activity";
@@ -2840,7 +2903,7 @@ self: {
        pname = "ConstraintKinds";
        version = "1.3.0";
        sha256 = "0rhy5wq3v5hdryjn8pcsgqy4k772agj1rgq3021pjki7n3zm3dza";
-       buildDepends = [ base dlist ghc-prim vector ];
+       libraryHaskellDepends = [ base dlist ghc-prim vector ];
        jailbreak = true;
        description = "Repackages standard type classes with the ConstraintKinds extension";
        license = stdenv.lib.licenses.bsd3;
@@ -2852,7 +2915,7 @@ self: {
        pname = "Consumer";
        version = "1.2";
        sha256 = "03ham35vh49h780h7dxb6zs85rkdlry0nwi8wp6p9iamw952xi6i";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://src.seereason.com/ghc6103/haskell-consumer";
        description = "A monad and monad transformer for consuming streams";
        license = stdenv.lib.licenses.bsd3;
@@ -2865,7 +2928,7 @@ self: {
        pname = "ContArrow";
        version = "0.0.5";
        sha256 = "1paj8wx2k86i5xb11scbyca4fb2fnxgln5d661mcwxvs0i91jj1b";
-       buildDepends = [ arrows base ];
+       libraryHaskellDepends = [ arrows base ];
        jailbreak = true;
        description = "Control.Arrow.Transformer.Cont";
        license = stdenv.lib.licenses.bsd3;
@@ -2877,7 +2940,7 @@ self: {
        pname = "Contract";
        version = "0.1";
        sha256 = "027dv53jrfk46dmiidnnrrdvhyin60i862znp414213w72yjrbhh";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://www.cs.kent.ac.uk/~oc/contracts.html";
        description = "Practical typed lazy contracts";
        license = stdenv.lib.licenses.bsd3;
@@ -2890,7 +2953,7 @@ self: {
        pname = "Control-Engine";
        version = "1.1.0.1";
        sha256 = "1jyj42xrja8ic3lajgrfmign9n2bdfkaplnlhzcifd5wf30qj6fa";
-       buildDepends = [ base BoundedChan stm ];
+       libraryHaskellDepends = [ base BoundedChan stm ];
        homepage = "http://www.haskell.org/haskellwiki/Control-Engine";
        description = "A parallel producer/consumer engine (thread pool)";
        license = stdenv.lib.licenses.bsd3;
@@ -2905,8 +2968,10 @@ self: {
        pname = "Control-Monad-MultiPass";
        version = "0.1.0.0";
        sha256 = "0pdayn1v9dw5600fgzlag2bqy1p68i4yzpxzqna9p7jk0iyvfy0i";
-       buildDepends = [ array base containers Control-Monad-ST2 mtl ];
-       testDepends = [
+       libraryHaskellDepends = [
+         array base containers Control-Monad-ST2 mtl
+       ];
+       testHaskellDepends = [
          array base containers Control-Monad-ST2 mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -2924,8 +2989,8 @@ self: {
        pname = "Control-Monad-ST2";
        version = "0.1.0.1";
        sha256 = "02nl4dbh7lk2gx5vacnn9mlcbs5j4b68jj0db94j51mqwj22y0zk";
-       buildDepends = [ array base QuickCheck SafeSemaphore ];
-       testDepends = [
+       libraryHaskellDepends = [ array base QuickCheck SafeSemaphore ];
+       testHaskellDepends = [
          array base mtl QuickCheck SafeSemaphore test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -2941,7 +3006,7 @@ self: {
        pname = "CoreErlang";
        version = "0.0.2";
        sha256 = "1wiwk4947h5x2swi9k6bh4zyhp849ibxhc5458kn5vipngrp4k78";
-       buildDepends = [ base parsec pretty ];
+       libraryHaskellDepends = [ base parsec pretty ];
        homepage = "http://github.com/amtal/CoreErlang";
        description = "Manipulating Core Erlang source code";
        license = stdenv.lib.licenses.bsd3;
@@ -2957,11 +3022,11 @@ self: {
        pname = "CoreFoundation";
        version = "0.1";
        sha256 = "0mra2aswl0gfic19l55i63a6il6i13caph56fdk8g7shcw3j605l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq filepath network property-list
          tagged text time transformers vector
        ];
-       buildTools = [ c2hs ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "https://github.com/reinerp/CoreFoundation";
        description = "Bindings to Mac OSX's CoreFoundation framework";
@@ -2975,7 +3040,7 @@ self: {
        pname = "Coroutine";
        version = "0.1.0.0";
        sha256 = "1cad9j7ivd6mfcff44773v8z3z2ilparxfikbnv0gab6csc9p1nw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Type-safe coroutines using lightweight session types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2989,11 +3054,11 @@ self: {
        pname = "CouchDB";
        version = "1.2.2";
        sha256 = "0imzpwrynr54as3bzx2222vqcnmmrzx6dis5qa2vmclf6yd8q1z8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers HTTP json mtl network network-uri
          utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers HTTP HUnit json mtl network network-uri
          utf8-string
        ];
@@ -3011,7 +3076,9 @@ self: {
        sha256 = "1qrsjkwr1njdsyiryskdjmy6nhbbzin4r0ja7mib26injzmrx45p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base HUnit mtl old-locale QuickCheck time ];
+       libraryHaskellDepends = [
+         base HUnit mtl old-locale QuickCheck time
+       ];
        jailbreak = true;
        homepage = "http://www.haskellcraft.com/";
        description = "Code for Haskell: the Craft of Functional Programming, 3rd ed";
@@ -3027,7 +3094,9 @@ self: {
        sha256 = "0rmgl0a4k6ys2lc6d607g28c2p443a46dla903rz5aha7m9y1mba";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base HUnit pretty QuickCheck random ];
+       libraryHaskellDepends = [
+         array base HUnit pretty QuickCheck random
+       ];
        description = "Collects together existing Haskell cryptographic functions into a package";
        license = "unknown";
      }) {};
@@ -3047,15 +3116,18 @@ self: {
        sha256 = "1mjgxbmwf37wqbdbhfbq3pj4mmgkf1w0lv49gagx1m5yny21q3l3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array async attoparsec attoparsec-conduit base binary blaze-builder
          blaze-textual bytestring conduit containers data-default
          fast-logger hashable lens lifted-base monad-control monad-logger
-         mtl network network-conduit optparse-applicative stm system-fileio
-         system-filepath template-haskell text time transformers
-         transformers-base unordered-containers
+         mtl network network-conduit stm system-fileio system-filepath
+         template-haskell text time transformers transformers-base
+         unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base network-conduit optparse-applicative system-filepath
+       ];
+       testHaskellDepends = [
          base conduit directory doctest filepath hspec lifted-base mtl stm
        ];
        description = "CurryDB: In-memory Key/Value Database";
@@ -3073,7 +3145,7 @@ self: {
        sha256 = "1yyr63r6ziljvcxacs7zn66lnkzgmlvcr36ic60c3z1r2rd2nflk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo containers directory filepath gtk mtl time
        ];
        description = "Real-Time Game Tournament Evaluator";
@@ -3094,7 +3166,12 @@ self: {
        sha256 = "0bkwcgxisp1ipnc1v63z16mcw40dy6fxszjrr2b251sfah5h1ad8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers data-default either
+         exceptions http-client http-client-tls http-types lens mtl
+         transformers transformers-base utf8-string xml-conduit xml-hamlet
+       ];
+       executableHaskellDepends = [
          base bytestring case-insensitive containers data-default either
          exceptions http-client http-client-tls http-types lens mtl network
          network-uri optparse-applicative transformers transformers-base
@@ -3113,7 +3190,7 @@ self: {
        sha256 = "1lic2ml1q16idg9rk2ky2xi030kln4m8nz1vyvy7w37qxhddvl2f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers parsec ];
+       executableHaskellDepends = [ base containers parsec ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/DBlimited/";
        description = "A command-line SQL interface for flat files (tdf,csv,etc.)";
@@ -3126,7 +3203,7 @@ self: {
        pname = "DBus";
        version = "0.5.1";
        sha256 = "0l212yy40w8sjkv5m7rnd24fkihvnadv7szf10g9n5r34m4jb6lh";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/alexkay/hdbus";
        description = "D-Bus bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -3139,7 +3216,7 @@ self: {
        pname = "DCFL";
        version = "0.1.6.0";
        sha256 = "10f0c3y0y39rmvvvrvz426srb18wsv4qfzzx9r9zjac2m14b96jx";
-       buildDepends = [ base deepseq HUnit parallel random ];
+       libraryHaskellDepends = [ base deepseq HUnit parallel random ];
        homepage = "https://github.com/Poincare/DCFL";
        description = "Communication Free Learning-based constraint solver";
        license = stdenv.lib.licenses.mit;
@@ -3156,7 +3233,7 @@ self: {
        sha256 = "00dhky0hnda85lvrs155jgwxnpqfm36cqakj3wp0yrn2xlz383ad";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary directory distributed-process
          distributed-process-simplelocalnet hint MuCheck
          network-transport-tcp unix
@@ -3165,7 +3242,6 @@ self: {
        homepage = "https://bitbucket.com/osu-testing/d-mucheck";
        description = "Distributed Mutation Analysis framework for MuCheck";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DOM" = callPackage
@@ -3174,7 +3250,7 @@ self: {
        pname = "DOM";
        version = "2.0.1";
        sha256 = "13zj4jg78y5s05gfi3j83izxw6d2csbvznd7mq900zlv4xwddw2b";
-       buildDepends = [ base mtl WebBits ];
+       libraryHaskellDepends = [ base mtl WebBits ];
        jailbreak = true;
        description = "DOM Level 2 bindings for the WebBits package";
        license = stdenv.lib.licenses.bsd3;
@@ -3189,7 +3265,7 @@ self: {
        pname = "DP";
        version = "0.1.1";
        sha256 = "03gjwkzna2mf0a103g0kiwnbd9ra6hss6vm73i7vhl87zgrwsh8z";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers list-tries mtl QuickCheck safe semiring
        ];
        jailbreak = true;
@@ -3211,12 +3287,13 @@ self: {
        sha256 = "03rf2s9qinfahqsc870cxv5117g4hmqza2dbj7s5hi50sh32xkjc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers convertible darcs directory
          filepath HSH HTF HTTP mtl network old-locale pretty process
          regex-posix split syb time unix
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [ array base bytestring HTF ];
        jailbreak = true;
        description = "Darcs Patch Manager";
        license = "GPL";
@@ -3233,11 +3310,11 @@ self: {
        pname = "DRBG";
        version = "0.5.4";
        sha256 = "03nkcrjkaj36bs4sasf1286ca3wam1ndahq3y88bib2q0h5psqdx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal cipher-aes128 crypto-api
          cryptohash-cryptoapi entropy mtl parallel prettyclass tagged
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring cereal cipher-aes128 crypto-api
          crypto-api-tests cryptohash-cryptoapi entropy HUnit mtl parallel
          prettyclass QuickCheck tagged test-framework test-framework-hunit
@@ -3256,11 +3333,11 @@ self: {
        pname = "DSA";
        version = "1";
        sha256 = "0js67dj7dls7ivvdw1hvxc1cw0rl4bvnfip16ygmgwg98344bfwl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types ghc-prim
          integer-gmp SHA tagged
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types DRBG ghc-prim
          HUnit integer-gmp QuickCheck SHA tagged test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -3283,15 +3360,18 @@ self: {
        sha256 = "1m69phqjrb4wg6fji5plw1mghyz7jzzqixljaa5gb5s0cy5gfkfy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal
          dlist either hashable HUnit kure mtl process QuickCheck random
          semigroups template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 text time unordered-containers vector
        ];
+       executableHaskellDepends = [
+         aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal
+         mtl semigroups template-haskell text time vector
+       ];
        description = "Database Supported Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DSTM" = callPackage
@@ -3304,7 +3384,12 @@ self: {
        sha256 = "084yscqbwypkb32avjm2b92a7s4qpvps3pjfgpy14sligww3hifb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers haskell98 network process unix ];
+       libraryHaskellDepends = [
+         base containers haskell98 network process unix
+       ];
+       executableHaskellDepends = [
+         base containers haskell98 network process unix
+       ];
        description = "A framework for using STM within distributed systems";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3316,7 +3401,7 @@ self: {
        pname = "DTC";
        version = "1.1.0.1";
        sha256 = "0m3697zw0j2l9fxx8flr83n8x03pva1hn74rgilgxdrsrifhds5l";
-       buildDepends = [ base haskell-src-exts ];
+       libraryHaskellDepends = [ base haskell-src-exts ];
        homepage = "https://github.com/Daniel-Diaz/DTC";
        description = "Data To Class transformation";
        license = stdenv.lib.licenses.bsd3;
@@ -3329,7 +3414,7 @@ self: {
        pname = "Dangerous";
        version = "0.3.2";
        sha256 = "0pnywhva7s5xp9xlxk6h56n3fjflna6zhk5qdb8wax7i1qbp85vs";
-       buildDepends = [ base MaybeT mtl ];
+       libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Monads for operations that can exit early and produce warnings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3346,12 +3431,17 @@ self: {
        sha256 = "1f7svqvlywj0jgzssdgrhvbbfm0yjnq0qr2c7xqc501y6wr3msym";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers Crypto data-binary-ieee754
          deepseq directory filepath mtl process random time transformers
          utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base binary bytestring containers Crypto data-binary-ieee754
+         deepseq directory filepath mtl process random time transformers
+         utf8-string
+       ];
+       testHaskellDepends = [
          array base binary bytestring containers Crypto data-binary-ieee754
          deepseq directory filepath mtl process random time transformers
          utf8-string
@@ -3367,7 +3457,7 @@ self: {
        pname = "DarcsHelpers";
        version = "0.1";
        sha256 = "02nqaphxd3xlh191wxpx3rcixms70v8d6h4a3lxg24d7lcyf82n3";
-       buildDepends = [ base HaXml mtl parsec safe xml-parsec ];
+       libraryHaskellDepends = [ base HaXml mtl parsec safe xml-parsec ];
        jailbreak = true;
        description = "Code used by Patch-Shack that seemed sensible to open for reusability";
        license = "GPL";
@@ -3382,7 +3472,7 @@ self: {
        pname = "Data-Hash-Consistent";
        version = "0.1.1";
        sha256 = "1vblfzndfzb458j6ygfcq0mfzzc5c87gwpmcx31v10fxpqnfmm65";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring digest utf8-string vector vector-algorithms
        ];
        homepage = "https://github.com/bradclawsie/haskell-Data.Hash.Consistent";
@@ -3396,7 +3486,7 @@ self: {
        pname = "Data-Rope";
        version = "0.2";
        sha256 = "0zvp9h06f2ylkn325d35cap3y67zpfyc70nqad3426p64p1xmnrw";
-       buildDepends = [ base bytestring unix ];
+       libraryHaskellDepends = [ base bytestring unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3411,7 +3501,7 @@ self: {
        pname = "DataTreeView";
        version = "0.1.1";
        sha256 = "0z54kr79bjv8w1gnsrxq9vkwdhasdwzrsi48q7ndsg8x7k30gpdj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq glib gtk lifted-base ListLike
          MissingH monad-control mtl syb transformers-base
        ];
@@ -3432,12 +3522,17 @@ self: {
        sha256 = "03vs4pvca80wwgfgm1a6hbincvsmlxyyz319ihk9pw22zqiq5qvs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring containers hashable lens
+         mtl network network-uri random safe scientific stm text time
+         transformers unordered-containers vector websockets
+       ];
+       executableHaskellDepends = [
          aeson base base64-bytestring bytestring containers hashable
          haskeline lens mtl network network-uri random safe scientific stm
          text time transformers unordered-containers vector websockets
        ];
-       testDepends = [ base doctest QuickCheck ];
+       testHaskellDepends = [ base doctest QuickCheck ];
        homepage = "http://github.com/sordina/Deadpan-DDP";
        description = "Write clients for Meteor's DDP Protocol";
        license = stdenv.lib.licenses.mit;
@@ -3450,7 +3545,7 @@ self: {
        pname = "DebugTraceHelpers";
        version = "0.12";
        sha256 = "0yjv3awhp3jsfqqn36xc0jpisp4hfypx3hkibad3yqrrn61bkzy8";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Convenience functions and instances for Debug.Trace";
        license = "GPL";
      }) {};
@@ -3463,8 +3558,8 @@ self: {
        pname = "Decimal";
        version = "0.4.2";
        sha256 = "0qa2z2lq1hrvakhyhj624mg8sd05ikhb66zwpa6x9vcyji93dxf5";
-       buildDepends = [ base deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
          base deepseq HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -3479,7 +3574,7 @@ self: {
        pname = "DecisionTree";
        version = "0.0";
        sha256 = "14yprfh2b5x7dswp6kyaym3z2f32nqvgrfhvwsiv7brxq80cfvbd";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://page.mi.fu-berlin.de/~aneumann/decisiontree.html";
        description = "A very simple implementation of decision trees for discrete attributes";
        license = "LGPL";
@@ -3492,7 +3587,7 @@ self: {
        pname = "DeepArrow";
        version = "0.4.0";
        sha256 = "1jbvb8yk291iimpqi8h302r8554k4j2p3k42znzppv1wqrbhvjyc";
-       buildDepends = [ base haskell-src mtl TypeCompose ];
+       libraryHaskellDepends = [ base haskell-src mtl TypeCompose ];
        homepage = "http://haskell.org/haskellwiki/DeepArrow";
        description = "Arrows for \"deep application\"";
        license = stdenv.lib.licenses.bsd3;
@@ -3508,7 +3603,7 @@ self: {
        sha256 = "09wzab0343m55xq4dxfv0f9lwpd5v97mymd6408s6p82xa2vqlzw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers GLUT HTTP MaybeT mtl network
          peakachu random time utility-ht zlib
        ];
@@ -3524,7 +3619,7 @@ self: {
        pname = "DescriptiveKeys";
        version = "0.0.4";
        sha256 = "0ywipcmnr3ysmx8m61yrymyn10lnizjfkk2q2scdfkrkgh7ayj7v";
-       buildDepends = [ base containers xmonad xmonad-contrib ];
+       libraryHaskellDepends = [ base containers xmonad xmonad-contrib ];
        homepage = "https://bitbucket.org/dibblego/descriptive-keys/";
        description = "A library for specifying xmonad key bindings with functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -3538,8 +3633,8 @@ self: {
        pname = "Dflow";
        version = "0.0.1";
        sha256 = "00gzs5fdybfrvqidw4qzk6i69qzq4jaljzhb49ah2hsv3gqjr1iq";
-       buildDepends = [ base containers QuickCheck stm time ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers QuickCheck stm time ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Processing Real-time event streams";
@@ -3552,10 +3647,10 @@ self: {
      mkDerivation {
        pname = "Diff";
        version = "0.3.2";
-       revision = "1";
        sha256 = "13iqqmpadcm7fvqwbfrz94w030rvjh66w2bdls1253128ac2n0vz";
+       revision = "1";
        editedCabalFile = "86ab9f6bcb253cabff2673437995faa4c130be7c3898df778b27a801c5361328";
-       buildDepends = [ array base pretty ];
+       libraryHaskellDepends = [ array base pretty ];
        description = "O(ND) diff algorithm in haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -3566,7 +3661,9 @@ self: {
        pname = "DifferenceLogic";
        version = "0.1.0.4";
        sha256 = "0ylpn6bksf6alxzk45cg88ff8xgffh88x3csvjlhb6zn8ik0w99a";
-       buildDepends = [ base containers fgl FirstOrderTheory HUnit ];
+       libraryHaskellDepends = [
+         base containers fgl FirstOrderTheory HUnit
+       ];
        jailbreak = true;
        homepage = "https://github.com/dillonhuff/DifferenceLogic";
        description = "A theory solver for conjunctions of literals in difference logic";
@@ -3582,7 +3679,7 @@ self: {
        pname = "DifferentialEvolution";
        version = "0.0.2";
        sha256 = "0z16g40n369d2wqljnrkmpd18149ny8nh2pd13hkkjnq5n6k209w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq fclabels mtl mwc-random parallel primitive vector
        ];
        jailbreak = true;
@@ -3600,7 +3697,7 @@ self: {
        pname = "Digit";
        version = "0.0.3";
        sha256 = "0cdsmy9km9wpywqprdymn9bd982ba859px2giswz41xh6pbjri8w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -3618,11 +3715,11 @@ self: {
        pname = "DigitalOcean";
        version = "0.1.1.0";
        sha256 = "09sh0j1dk366nkq3pwgsxi8zcka9p3f38bsw6nfzr7q4chjjblz4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers exceptions lens mtl text
          transformers unordered-containers vector wreq
        ];
-       testDepends = [ base hspec lens mtl text ];
+       testHaskellDepends = [ base hspec lens mtl text ];
        jailbreak = true;
        description = "A client library for the DigitalOcean API";
        license = stdenv.lib.licenses.agpl3;
@@ -3634,7 +3731,7 @@ self: {
        pname = "DimensionalHash";
        version = "0.1.5.2";
        sha256 = "0bbg9w5n3b296g884y8qvgzsndqhzwh0mkn3dlp9nx4a7i321c97";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "An n-dimensional hash using Morton numbers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3646,8 +3743,8 @@ self: {
        pname = "DirectSound";
        version = "0.0.0";
        sha256 = "1x78y1na375nwgk4izsjprj3yrg0xbrhqv6nrzfbvbfdyqlf5kyz";
-       buildDepends = [ base Win32 ];
-       extraLibraries = [ dsound ];
+       libraryHaskellDepends = [ base Win32 ];
+       librarySystemDepends = [ dsound ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Partial binding to the Microsoft DirectSound API";
        license = stdenv.lib.licenses.bsd3;
@@ -3665,7 +3762,7 @@ self: {
        sha256 = "0pnlk09jsallyparwdfcy7jmqjjiprp2pqlg9agp6xbw5xmnkzwb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal chunks containers directory filepath hinstaller
          old-locale parsec pretty process template-haskell time xhtml
        ];
@@ -3683,8 +3780,10 @@ self: {
        pname = "DiscussionSupportSystem";
        version = "0.11.0.3";
        sha256 = "0iqcv3b06r9sqj1adxfq08vq5mlq4b7z88c2cw4qa7l9xw2p2js3";
-       buildDepends = [ base blaze-html blaze-markup html parsers ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup html parsers
+       ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        homepage = "https://github.com/minamiyama1994/DiscussionSupportSystem";
        description = "Discussion support system";
@@ -3699,7 +3798,8 @@ self: {
        sha256 = "1xhz0yb8xrjdznvx5prpl7r8k73n78n6gmshqbraq5jdh3vcnisx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "http://github.com/zcourts/Dish";
        description = "Hash modules (currently Murmur3)";
@@ -3712,8 +3812,8 @@ self: {
        pname = "Dist";
        version = "0.3.0.0";
        sha256 = "00h0cxlxk72k829w8cf2gi2y4v4qj9bdzdmvnphnvc9wz5pyiz26";
-       buildDepends = [ base containers MonadRandom ];
-       testDepends = [ base containers MonadRandom ];
+       libraryHaskellDepends = [ base containers MonadRandom ];
+       testHaskellDepends = [ base containers MonadRandom ];
        homepage = "https://github.com/wyager/Dist";
        description = "A Haskell library for probability distributions";
        license = stdenv.lib.licenses.mit;
@@ -3727,8 +3827,8 @@ self: {
        pname = "DistanceTransform";
        version = "0.1.2";
        sha256 = "0c77sbx6qls8wfhv0wbappbkgfab046ls8mqs32qj02k549s6fk5";
-       buildDepends = [ base primitive vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base primitive vector ];
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit vector
        ];
        description = "Distance transform function";
@@ -3741,7 +3841,7 @@ self: {
        pname = "DistanceUnits";
        version = "0.1.0.1";
        sha256 = "0ls6rq4nqn3z9h9lagl8sff9q94zfm6gssa2jj1zfyfxl5869bas";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/gambogi/DistanceUnits";
        description = "A comprehensive distance library";
        license = stdenv.lib.licenses.bsd3;
@@ -3759,7 +3859,12 @@ self: {
        sha256 = "00c74anpm3varyf0man1i213dksxvh2p32xsp4rqijkbnxpkjbx3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         ADPfusion ansi-wl-pprint array base BiobaseBlast BiobaseFasta
+         BiobaseXNA biocore bytestring cmdargs conduit dlist parallel
+         PrimitiveArray repa split vector
+       ];
+       executableHaskellDepends = [
          ADPfusion ansi-wl-pprint array base BiobaseBlast BiobaseFasta
          BiobaseXNA biocore bytestring cmdargs conduit dlist parallel
          PrimitiveArray repa split vector
@@ -3780,7 +3885,7 @@ self: {
        sha256 = "1w9r50cyiz31fn4dmlh3qmmpv9qapxgg70c10a86m6sxdl75q827";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers ghc ghc-paths haddock HUnit process
        ];
        jailbreak = true;
@@ -3796,7 +3901,7 @@ self: {
        pname = "Docs";
        version = "1.0.0";
        sha256 = "1hjdznp29kwj9cca0jxr3dds9cnfbss6sgn52wym2380az3jcvnz";
-       buildDepends = [ base html ];
+       libraryHaskellDepends = [ base html ];
        homepage = "http://ddiaz.asofilak.es/packages/Docs.html";
        description = "Documentation types library";
        license = stdenv.lib.licenses.bsd3;
@@ -3812,10 +3917,10 @@ self: {
        sha256 = "1cs7zqz0yzdyj3vn38cfh1lj90xnxm24q8lml457f2yia4z7l6h7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base containers haskell-src-exts mtl pointless-haskell pretty
-         syb
+       libraryHaskellDepends = [
+         base haskell-src-exts mtl pointless-haskell syb
        ];
+       executableHaskellDepends = [ array base containers pretty ];
        jailbreak = true;
        homepage = "http://haskell.di.uminho.pt/wiki/DrHylo";
        description = "A tool for deriving hylomorphisms";
@@ -3831,7 +3936,10 @@ self: {
        sha256 = "1w0wfmrjifidl2qz998ig07afd4p6yp890lwl8as57bay490nakl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base filepath old-time process random ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base filepath old-time process random
+       ];
        homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
@@ -3846,7 +3954,7 @@ self: {
        sha256 = "0jk7qmlgjw69w38hm91bnyp8gyi1mjmrq4vyv7jv3y69rk0fi6wl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base old-time process random ];
+       executableHaskellDepends = [ base old-time process random ];
        homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
@@ -3861,7 +3969,7 @@ self: {
        sha256 = "1higdpqg599lfc92m7dd4zy98l9vjg5xr4n4qjv0wifszj8lrsgb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs containers parsec ];
+       libraryHaskellDepends = [ base cmdargs containers parsec ];
        homepage = "http://www.cs.nott.ac.uk/~bmv/Dung/";
        description = "An implementation of the Dung argumentation frameworks";
        license = stdenv.lib.licenses.bsd3;
@@ -3878,12 +3986,12 @@ self: {
        pname = "Dust";
        version = "2.3.1";
        sha256 = "0j2pm2ram7idh46mi6jv0whk4rx0bicvsvayrn3arnq65zk2mavj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal containers crypto-api directory
          Dust-crypto entropy ghc-prim network random random-extras random-fu
          random-source split threefish
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal Dust-crypto ghc-prim HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
          test-framework-th threefish
@@ -3904,17 +4012,17 @@ self: {
        pname = "Dust-crypto";
        version = "0.1";
        sha256 = "112prydwsjd32aiv3kg8wsxwaj95p6x7jhxcf118fxgrrg202z9w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal containers crypto-api cryptohash
          directory entropy ghc-prim network random random-extras random-fu
          random-source skein split threefish
        ];
-       testDepends = [
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [
          base bytestring cereal Dust ghc-prim HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
          threefish
        ];
-       extraLibraries = [ openssl ];
        description = "Cryptographic operations";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3931,11 +4039,15 @@ self: {
        sha256 = "1g1l7h5400f9qckhj4yw2zwwjjkqz5w1fgnc9gxa7rdl37wgxwn4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring cereal containers csv directory Dust
-         Dust-crypto entropy ghc-prim network random random-extras random-fu
+       libraryHaskellDepends = [
+         base binary bytestring cereal containers directory Dust Dust-crypto
+         entropy ghc-prim network random random-extras random-fu
          random-source split
        ];
+       executableHaskellDepends = [
+         base binary bytestring cereal containers csv directory Dust entropy
+         ghc-prim network random random-extras random-fu random-source split
+       ];
        description = "Network filtering exploration tools";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3953,7 +4065,7 @@ self: {
        sha256 = "1swykscl17qy17qy38y6zc47sbiyaszh9m4qwn7d9sckfa6azsdr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring cereal containers csv directory Dust
          Dust-crypto Dust-tools entropy ghc-prim network pcap random
          random-extras random-fu random-source split
@@ -3972,7 +4084,10 @@ self: {
        sha256 = "0m58bq2jvnr17kdapfydd063af6w5vdyzxad5izk0cj0gids5hk7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base criterion QuickCheck random vector ];
+       libraryHaskellDepends = [ array base vector ];
+       executableHaskellDepends = [
+         array base criterion QuickCheck random vector
+       ];
        jailbreak = true;
        homepage = "https://github.com/zombiecalypse/DynamicTimeWarp";
        description = "Dynamic time warping of sequences";
@@ -3986,7 +4101,9 @@ self: {
        pname = "DysFRP";
        version = "0.1";
        sha256 = "1jw1s2imd2qhh9i0m7sm1zhy876bgp1pcrh4jcf5dilvqnhvv4j1";
-       buildDepends = [ base contravariant mtl time transformers ];
+       libraryHaskellDepends = [
+         base contravariant mtl time transformers
+       ];
        homepage = "https://github.com/tilk/DysFRP";
        description = "dysFunctional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -3998,7 +4115,7 @@ self: {
        pname = "DysFRP-Cairo";
        version = "0.1";
        sha256 = "1pg6gwyrlvp6z08ab1qp783z9gm0xhnh337shf443f1bwbcz9m7f";
-       buildDepends = [ base cairo DysFRP gtk mtl ];
+       libraryHaskellDepends = [ base cairo DysFRP gtk mtl ];
        homepage = "https://github.com/tilk/DysFRP";
        description = "dysFunctional Reactive Programming on Cairo";
        license = stdenv.lib.licenses.bsd3;
@@ -4013,7 +4130,7 @@ self: {
        pname = "DysFRP-Craftwerk";
        version = "0.1";
        sha256 = "0rhm7ya1h43dwa83fcvnc8nd9da7ji6qlwzsa9ngv7pqvs7aamy1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers craftwerk craftwerk-gtk DysFRP DysFRP-Cairo
          gtk
        ];
@@ -4029,7 +4146,7 @@ self: {
        pname = "EEConfig";
        version = "1.0";
        sha256 = "1bkkzj1d0j4nisdl9jfmadjx32w35ipdw3k12krhzzlf5aiwnrf1";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "ExtremlyEasyConfig - Extremly Simple parser for config files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4045,8 +4162,9 @@ self: {
        sha256 = "0czdpgyxw3n0603hmd8kl8dnz9800df1lnkkf8a95cjd8nx3k8fv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ListLike unordered-containers ];
-       testDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       libraryHaskellDepends = [ base ListLike ];
+       executableHaskellDepends = [ base unordered-containers ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4061,12 +4179,13 @@ self: {
        sha256 = "0dv7lbw3nb3wyrrq8q4wd26i445ylwiixhhzdl574sw58mw60rk3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers directory old-time unix ];
-       buildTools = [ happy ];
+       executableHaskellDepends = [
+         array base containers directory old-time unix
+       ];
+       executableToolDepends = [ happy ];
        homepage = "https://github.com/FranklinChen/Ebnf2ps";
        description = "Peter's Syntax Diagram Drawing Tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EdisonAPI" = callPackage
@@ -4075,7 +4194,7 @@ self: {
        pname = "EdisonAPI";
        version = "1.2.2.1";
        sha256 = "1r8xfsqz58s6x7026yrjafcbjkwsjg6fpcj6gbcpidw5hymymqfp";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://rwd.rdockins.name/edison/home/";
        description = "A library of efficent, purely-functional data structures (API)";
        license = "unknown";
@@ -4089,7 +4208,9 @@ self: {
        pname = "EdisonCore";
        version = "1.2.2.1";
        sha256 = "0yj68glq50qkn2ckhhq7q5y5kbwb5lh08z1kgksc61wds22a87pz";
-       buildDepends = [ array base containers EdisonAPI mtl QuickCheck ];
+       libraryHaskellDepends = [
+         array base containers EdisonAPI mtl QuickCheck
+       ];
        homepage = "http://rwd.rdockins.name/edison/home/";
        description = "A library of efficent, purely-functional data structures (Core Implementations)";
        license = "unknown";
@@ -4106,7 +4227,7 @@ self: {
        sha256 = "11a922535h6jvg79cv03jz6sn93h7jhqfrf9wi9x8arak9l06j70";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers csv directory editline filepath haskell98
          html pretty xhtml
        ];
@@ -4123,10 +4244,10 @@ self: {
      mkDerivation {
        pname = "EitherT";
        version = "0.2.0";
-       revision = "1";
        sha256 = "1vry479zdq1fw7bd4d373c7wf2gg0aibkyb03710w7z2x86chssw";
+       revision = "1";
        editedCabalFile = "a1c6f78c9a4379af0738a6d4dee5d1781099c5c56acb0b39c45ad23b256e8c6e";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-control transformers transformers-base
        ];
        jailbreak = true;
@@ -4150,13 +4271,19 @@ self: {
        sha256 = "1l6p00h0717blwvia0gvqpsakq8jy44fxc6brr4qxs5g4yjcjnmh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
          cheapskate cmdargs containers directory filepath highlighting-kate
          indents language-ecmascript language-glsl mtl parsec pretty text
          transformers union-find unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson aeson-pretty base binary blaze-html blaze-markup bytestring
+         cheapskate cmdargs containers directory filepath highlighting-kate
+         indents language-ecmascript language-glsl mtl parsec pretty text
+         transformers union-find unordered-containers
+       ];
+       testHaskellDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
          cheapskate cmdargs containers directory filemanip filepath
          highlighting-kate HUnit indents language-ecmascript language-glsl
@@ -4179,7 +4306,9 @@ self: {
        sha256 = "131h71fgn0zbsmbqmvbfl57is0dbm37xsi5g87gpjgq0k2cq0nkr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers fgl gtk mtl parsec ];
+       executableHaskellDepends = [
+         array base containers fgl gtk mtl parsec
+       ];
        homepage = "http://www.muitovar.com";
        description = "derives heuristic rules from nominal data";
        license = "GPL";
@@ -4194,7 +4323,8 @@ self: {
        sha256 = "141iddlpvjp6hqjx5c5dm3ldf7yk64iqbhaiv51np27y6pazfgb5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal containers mtl ];
+       libraryHaskellDepends = [ base Cabal containers mtl ];
+       executableHaskellDepends = [ base Cabal containers mtl ];
        homepage = "http://otakar-smrz.users.sf.net/";
        description = "Encoding character data";
        license = "GPL";
@@ -4207,7 +4337,7 @@ self: {
        pname = "EnumContainers";
        version = "0.1";
        sha256 = "14ckpgaviny3c0d1jn3blkkpri0cm8ac264y7kak965knjccq0k8";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        jailbreak = true;
        description = "Simple Enum-class-based int containers";
        license = stdenv.lib.licenses.bsd3;
@@ -4219,7 +4349,7 @@ self: {
        pname = "EnumMap";
        version = "0.0.2";
        sha256 = "1v3jp1l95kybvdlpvp6bd0ryihxrvlnpkqz7fl1n4vazhkqk6zjz";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "More general IntMap replacement";
        license = stdenv.lib.licenses.bsd3;
@@ -4236,7 +4366,7 @@ self: {
        sha256 = "0hcfjzlirw11jl752g2jncb71i8sk2w3nqjm4ykc64f5awj1hi23";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers filepath HaXml mtl parsec template-haskell
          transformers
        ];
@@ -4252,7 +4382,9 @@ self: {
        pname = "EqualitySolver";
        version = "0.1.0.2";
        sha256 = "0ynzzl9mmn5hxkcndx60lnxn455nm065v7nk7rhpq1yigwz0cl1g";
-       buildDepends = [ base containers HUnit mtl union-find-array ];
+       libraryHaskellDepends = [
+         base containers HUnit mtl union-find-array
+       ];
        jailbreak = true;
        description = "A theory solver for conjunctions of literals in the theory of uninterpreted functions with equality";
        license = stdenv.lib.licenses.bsd3;
@@ -4269,7 +4401,7 @@ self: {
        sha256 = "1d22k3836c92xd6qg5pvjhgrhbajd438z3pfjvi0bl2wdrkzddjr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bindings-EsounD monad-control network
          regions safer-file-handles storablevector transformers unix
        ];
@@ -4286,7 +4418,7 @@ self: {
        pname = "EstProgress";
        version = "0.2.0.0";
        sha256 = "0xq2r7mbgs00hf1c8c2ffgsk7jjzd932br59rgkg06qym14dp3b3";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://alkalisoftware.net";
        description = "Methods for estimating the progress of functions";
        license = stdenv.lib.licenses.bsd3;
@@ -4305,13 +4437,13 @@ self: {
        sha256 = "0v7qq4d6zd3nr0856q3crivqqfq5q0rdppzf48jgzc9fzas6jl9n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring case-insensitive containers hashable
          haskeline mtl network old-locale parsec pipes pipes-bytestring
          pipes-concurrency pipes-network pureMD5 random stm stm-chans text
          time transformers unix unordered-containers vector
        ];
-       extraLibraries = [ pcre ];
+       executableSystemDepends = [ pcre ];
        homepage = "http://verement.github.io/etamoo";
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
@@ -4326,7 +4458,7 @@ self: {
        pname = "Etage";
        version = "0.1.12";
        sha256 = "1ik8j7s1z64dpdg251m8dr7k7llkhxydlf6l6dhyv9ra55dg4n20";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc mtl operational random SafeSemaphore time unix
        ];
        homepage = "http://mitar.tnode.com";
@@ -4345,7 +4477,8 @@ self: {
        sha256 = "0xzsvah4nhxv5hw8p0sv1pjy4p30xa3f2afs8jncx20n918mk9l2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base containers Etage fgl mtl ];
+       executableHaskellDepends = [
          array base containers deepseq Etage fgl mtl parallel random time
        ];
        jailbreak = true;
@@ -4363,7 +4496,7 @@ self: {
        sha256 = "0kh1zjqr9cmx7xyfk2y3iwr3x3zvh3pb4ghfjz3xr2wwg2rmymxp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 SDL SDL-mixer ];
+       executableHaskellDepends = [ base haskell98 SDL SDL-mixer ];
        homepage = "http://www.kryozahiro.org/eternal10/";
        description = "A 2-D shooting game";
        license = stdenv.lib.licenses.bsd3;
@@ -4380,8 +4513,13 @@ self: {
        sha256 = "0cm98x626cqwri9qsfhwi6s50kg433a1p78y9na70z868p6n27nj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring haskell98 network pcap ];
-       extraLibraries = [ libpcap ];
+       libraryHaskellDepends = [
+         base binary bytestring haskell98 network pcap
+       ];
+       executableHaskellDepends = [
+         base binary bytestring haskell98 network pcap
+       ];
+       executableSystemDepends = [ libpcap ];
        homepage = "http://etherbunny.anytini.com/";
        description = "A network analysis toolkit for Haskell";
        license = "GPL";
@@ -4394,7 +4532,7 @@ self: {
        pname = "EuroIT";
        version = "2010.2.5";
        sha256 = "1a6bvi0y1pnzpx0x3arrardgkbs0m8ssfwcyxf6fim87wcb0jcgv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Library for using euro currency, italian language";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4408,15 +4546,15 @@ self: {
      mkDerivation {
        pname = "Euterpea";
        version = "1.0.0";
-       revision = "1";
        sha256 = "0cfcsrm47sb1z4zdmipipg9p31hzicwzpqdpa2m985j3hwm42vds";
+       revision = "1";
        editedCabalFile = "61d418cc49621a3373fd25f547d2dd6b76b700dcc4b7e38b2f055b5c6f781afd";
-       buildDepends = [
+       libraryHaskellDepends = [
          array arrows base bytestring CCA containers deepseq ghc-prim
          HCodecs heap markov-chain monadIO mtl PortMidi pure-fft random stm
          syb template-haskell UISF
        ];
-       testDepends = [ ansi-terminal base Cabal QuickCheck ];
+       testHaskellDepends = [ ansi-terminal base Cabal QuickCheck ];
        jailbreak = true;
        homepage = "http://haskell.cs.yale.edu/";
        description = "Library for computer music research and education";
@@ -4432,7 +4570,7 @@ self: {
        pname = "EventSocket";
        version = "0.1";
        sha256 = "03wf8msjcpj8bpnjr7f1wcbag018kap544jwz9a7vnllamps92xd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers haskell98 mtl network
        ];
        description = "Interfaces with FreeSwitch Event Socket";
@@ -4450,7 +4588,7 @@ self: {
        pname = "Extra";
        version = "1.46.3";
        sha256 = "1xmwp9cp905nzx5x858wyacjpppn76mkfpkxksdhlq9zhmkp5yyh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bzlib containers directory filepath HUnit mtl
          network-uri old-locale old-time pretty process pureMD5 QuickCheck
          random regex-compat time unix Unixutils zlib
@@ -4471,7 +4609,12 @@ self: {
        sha256 = "0hkmh3vjibbzkh004b4zig2rvvnh6l2cdqsmxbpyjbwqryzraxrn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base binary deepseq ghc-prim HarmTrace-Base haskore
+         instant-generics ListLike midi mtl QuickCheck random
+         template-haskell time uu-parsinglib
+       ];
+       executableHaskellDepends = [
          array base binary deepseq ghc-prim HarmTrace-Base haskore
          instant-generics ListLike midi mtl QuickCheck random
          template-haskell time uu-parsinglib
@@ -4490,7 +4633,7 @@ self: {
        sha256 = "1cb3qq8yqn19xpsjbczxs8rablkczaigs6hp2vypsjyw5s8sqza8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers haskell98 ];
+       executableHaskellDepends = [ array base containers haskell98 ];
        homepage = "http://spraakbanken.gu.se/eng/research/swefn/fm-sblex";
        description = "A set of computational morphology tools for Swedish diachronic lexicons";
        license = "GPL";
@@ -4503,8 +4646,8 @@ self: {
        pname = "FModExRaw";
        version = "0.2.0.0";
        sha256 = "0l2zhlxh88wy9y9gk1aa03yy65iw8zigr4pgp63mn2mqcrskfszl";
-       buildDepends = [ base ];
-       extraLibraries = [ fmodex64 ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ fmodex64 ];
        homepage = "https://github.com/skypers/hsFModEx";
        description = "The Haskell FModEx raw API";
        license = stdenv.lib.licenses.gpl3;
@@ -4517,7 +4660,7 @@ self: {
        pname = "FPretty";
        version = "1.0";
        sha256 = "1lc31mid1a9pqb9py9f6nvzvlixhngpficczvhpdxlws3fn9drga";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://www.cs.kent.ac.uk/~oc/pretty.html";
        description = "Efficient simple pretty printing combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -4530,8 +4673,8 @@ self: {
        pname = "FTGL";
        version = "2.1";
        sha256 = "0b76798bxxivjrjx92qiv8ghsg3j8rhvfms8sl19ji6fip2h3fw2";
-       buildDepends = [ base ];
-       extraLibraries = [ ftgl ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ftgl;};
@@ -4544,10 +4687,10 @@ self: {
        pname = "FTGL-bytestring";
        version = "2.0";
        sha256 = "11y8g2gi4g6x639c9wfj2224f9vgaf88hdd1f981al53kzf7y2y2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring StateVar-transformer transformers
        ];
-       extraLibraries = [ ftgl ];
+       librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ftgl;};
@@ -4562,7 +4705,7 @@ self: {
        sha256 = "0nnwfn4jxnxfr8q8gq16xn0ixjmw7dnxznsh8lbk41lwfsr9j4n5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring directory ftphs haskeline mtl network
          strict
        ];
@@ -4578,7 +4721,7 @@ self: {
        pname = "Facts";
        version = "0.1.2";
        sha256 = "018g9qj6nmabjbl4rakqjp32vwfyak1wk5cx3s0amm53wnf2mz75";
-       buildDepends = [
+       libraryHaskellDepends = [
          AC-Angle base containers digits QuickCheck template-haskell
        ];
        jailbreak = true;
@@ -4592,7 +4735,7 @@ self: {
        pname = "FailureT";
        version = "15778.1";
        sha256 = "1qhjqswx4qyfan3rpvvl1hgmf369krqprlr6x20hp34r2qw9s135";
-       buildDepends = [ base base-unicode-symbols mmtl ];
+       libraryHaskellDepends = [ base base-unicode-symbols mmtl ];
        description = "Failure Monad Transformer";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4606,7 +4749,7 @@ self: {
        pname = "FastxPipe";
        version = "0.2.0.0";
        sha256 = "1img1aivadrdljsixzll3qpdzvbjqy18mcwanli6w70ch556jsa9";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring pipes pipes-attoparsec
          pipes-bytestring
        ];
@@ -4621,8 +4764,8 @@ self: {
        pname = "FenwickTree";
        version = "0.1.2.1";
        sha256 = "0g7hhkim16wsjf8l79hqkiv1lain6jm8wpiml1iycra3n9i2s5ww";
-       buildDepends = [ base QuickCheck template-haskell ];
-       testDepends = [ base QuickCheck template-haskell ];
+       libraryHaskellDepends = [ base QuickCheck template-haskell ];
+       testHaskellDepends = [ base QuickCheck template-haskell ];
        homepage = "https://github.com/mgajda/FenwickTree";
        description = "Data structure for fast query and update of cumulative sums";
        license = stdenv.lib.licenses.bsd3;
@@ -4639,7 +4782,7 @@ self: {
        sha256 = "07sryfn26afisrsgnzrp0vjshspa40pvl4214mzb5mdm9h5c63f8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base HAppS-Data HAppS-IxSet HAppS-Server HAppS-State HAppS-Util
          haskell98 HaXml mtl old-time random syb-with-class template-haskell
        ];
@@ -4657,7 +4800,7 @@ self: {
        pname = "FerryCore";
        version = "0.4.6.4";
        sha256 = "1dxhbrmcl36dg14lyihpy8fd8sdsmawh70fykllcjk3fh7a11wgp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HaXml mtl parsec pretty TableAlgebra
          template-haskell
        ];
@@ -4674,7 +4817,7 @@ self: {
        pname = "FieldTrip";
        version = "0.2.7";
        sha256 = "1161mz8443j1jr8pnkh6gz6w99cd16hk94ypsh8vzmpbfp40i5rb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base GLUT graphicsFormats MemoTrie old-time OpenGL TypeCompose
          vector-space
        ];
@@ -4692,7 +4835,7 @@ self: {
        pname = "FileManip";
        version = "0.3.3.1";
        sha256 = "0dhl7zkyy4p0pgmraci82krph6hqrq1bwmx7wgm9agrnpdyg4dxi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory extensible-exceptions filepath mtl unix
        ];
        description = "Expressive file and directory manipulation for Haskell";
@@ -4708,7 +4851,7 @@ self: {
        pname = "FileManipCompat";
        version = "0.18";
        sha256 = "0c017r7bzgf1mdbk0iyr2amhm41q89mcq69fkszskjhy4z9wl6v0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath mtl unix-compat
        ];
        description = "Expressive file and directory manipulation for Haskell";
@@ -4724,7 +4867,7 @@ self: {
        pname = "FilePather";
        version = "0.2.0";
        sha256 = "1rwj8hqys01cn14d754wyl2vr19mvh4vsg2f3hrqjqiafkij90xd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad comonad-transformers data-lens directory filepath mtl
          transformers
        ];
@@ -4741,7 +4884,7 @@ self: {
        pname = "FileSystem";
        version = "1.0.0";
        sha256 = "0qyzwpvajvqywbnfhj3vzb5xl4wjjywyqr4szywd8qwb7kly29w6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring directory filepath mtl old-time
        ];
        jailbreak = true;
@@ -4759,7 +4902,7 @@ self: {
        pname = "Finance-Quote-Yahoo";
        version = "0.8.0";
        sha256 = "1d786xkrj0h270mfwxxkfxysmk78xkz2jdj8w1iin3hgy3ramifz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-conduit network old-locale time
        ];
        homepage = "http://www.b7j0c.org/stuff/haskell-yquote.xhtml";
@@ -4776,7 +4919,7 @@ self: {
        pname = "Finance-Treasury";
        version = "0.1.2";
        sha256 = "17wxdwj8162c0yawz4anjs6d3fjbhs3b05wk319acblksjx60sal";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HTTP HTTP-Simple hxt hxt-filter network old-locale
          time
        ];
@@ -4792,7 +4935,7 @@ self: {
        pname = "FindBin";
        version = "0.0.5";
        sha256 = "197xvn05yysmibm1p5wzxfa256lvpbknr5d1l2ws6g40w1kpk717";
-       buildDepends = [ base directory filepath ];
+       libraryHaskellDepends = [ base directory filepath ];
        homepage = "https://github.com/audreyt/findbin";
        description = "Locate directory of original program";
        license = stdenv.lib.licenses.bsd3;
@@ -4804,7 +4947,7 @@ self: {
        pname = "FiniteMap";
        version = "0.1";
        sha256 = "1kf638h5gsc8fklhaw2jiad1r0ssgj8zkfmzywp85lrx5z529gky";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562";
        license = stdenv.lib.licenses.bsdOriginal;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4816,7 +4959,7 @@ self: {
        pname = "FirstOrderTheory";
        version = "0.1.0.6";
        sha256 = "1941ickx8aj3qbkry4gz8ni6snh26gkdrgabpx9z588518q4x27i";
-       buildDepends = [ base containers Proper ];
+       libraryHaskellDepends = [ base containers Proper ];
        jailbreak = true;
        description = "Grammar and typeclass for first order theories";
        license = stdenv.lib.licenses.bsd3;
@@ -4829,7 +4972,7 @@ self: {
        pname = "FixedPoint-simple";
        version = "0.6.1";
        sha256 = "0qfys17q3i56l20wzkpr8inq130j67kya022ynf0sgbc86avlrcn";
-       buildDepends = [ base deepseq template-haskell ];
+       libraryHaskellDepends = [ base deepseq template-haskell ];
        homepage = "https://github.com/TomMD/FixedPoint";
        description = "Fixed point, large word, and large int numerical representations (types and common class instances)";
        license = stdenv.lib.licenses.bsd3;
@@ -4845,7 +4988,7 @@ self: {
        sha256 = "1w25h3n3cnsl9dvr5s94jzf5qxyx0dl0v8dmqv2rkwwm7s2hdbl9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cgi containers directory haskell98 old-time parsec xhtml
        ];
        homepage = "http://www.flippac.org/projects/flippi/";
@@ -4860,7 +5003,7 @@ self: {
        pname = "Focus";
        version = "0.1.2";
        sha256 = "1f1ch6mxgaam1i4ryd1av879y2f8wn3wmg47h23w2l0pvgmxgrj1";
-       buildDepends = [ base MissingH split ];
+       libraryHaskellDepends = [ base MissingH split ];
        description = "Tools for focusing in on locations within numbers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -4873,7 +5016,8 @@ self: {
        sha256 = "0ygxgshgaddxfibl0paqm9sm4cq47247hr43awq8gib8zyg3amgi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers HUnit parsec ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers HUnit parsec ];
        homepage = "https://github.com/dillonhuff/Folly";
        description = "A first order logic library in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -4888,7 +5032,7 @@ self: {
        pname = "FontyFruity";
        version = "0.5.1.1";
        sha256 = "064c9qq82r2kmsabciigyzp04hjqmpnc52xfshgiy77jq7k0jk2y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath text
          vector
        ];
@@ -4905,7 +5049,7 @@ self: {
        pname = "ForSyDe";
        version = "3.1.1";
        sha256 = "0ggwskyxpdrjny0rz61zdp20r5vzig8ggmqxf0qa8gljvvfp6bhp";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath mtl old-time
          parameterized-data pretty process random regex-posix
          template-haskell type-level
@@ -4922,7 +5066,7 @@ self: {
        pname = "ForkableT";
        version = "0.1.0.2";
        sha256 = "0lzrggy1j15cajb6k5qhz2s8ddngr3hhhsj781ya45fcx82mngvj";
-       buildDepends = [ base monad-control mtl resourcet ];
+       libraryHaskellDepends = [ base monad-control mtl resourcet ];
        homepage = "https://github.com/exFalso/ForkableT/";
        description = "Forkable monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -4940,12 +5084,12 @@ self: {
        sha256 = "10b7hcwzxnl31wdfdbakcaapihhnwx8lwj0znidvgkk7hyirnx2n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ADPfusion ansi-wl-pprint base bytestring cmdargs containers
-         data-default HaTeX lens mtl parsers PrimitiveArray semigroups
-         template-haskell text transformers trifecta unordered-containers
-         vector
+       libraryHaskellDepends = [
+         ADPfusion ansi-wl-pprint base bytestring containers data-default
+         HaTeX lens mtl parsers PrimitiveArray semigroups template-haskell
+         text transformers trifecta unordered-containers vector
        ];
+       executableHaskellDepends = [ ansi-wl-pprint base cmdargs ];
        homepage = "https://github.com/choener/FormalGrammars";
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
@@ -4961,7 +5105,9 @@ self: {
        sha256 = "0w4jnxk32c0pvrh2k7y93fckvrkcj3q8w4yi12zsgj9k1ic7yb6a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base cmdtheline containers random strict ];
+       executableHaskellDepends = [
+         array base cmdtheline containers random strict
+       ];
        jailbreak = true;
        description = "Utilities to generate and solve puzzles";
        license = stdenv.lib.licenses.mit;
@@ -4974,7 +5120,7 @@ self: {
        pname = "FpMLv53";
        version = "0.1";
        sha256 = "0h7vi940zrl2fqv8c2g0vj0gh9qfm2jf8c2drclx37zax5kb0r6p";
-       buildDepends = [ base HaXml ];
+       libraryHaskellDepends = [ base HaXml ];
        homepage = "http://www.fpml.org/";
        description = "A binding for the Financial Products Markup Language (v5.3)";
        license = "LGPL";
@@ -4990,7 +5136,7 @@ self: {
        sha256 = "0vw1fh0nqk3s5p08j4cnwb95jgzxk140wvszjlmr3ms9m0xcx61y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base ghc-prim pipes primitive readable template-haskell text
          transformers vector vinyl
        ];
@@ -5006,7 +5152,7 @@ self: {
        sha256 = "1p99ab5qgvyh13iy9wgv0a8lqx6s2mygx0s6z51m5mzi9nxf0qw1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl newtype she void ];
+       executableHaskellDepends = [ base mtl newtype she void ];
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/Frank/";
        description = "An experimental programming language with typed algebraic effects";
        license = stdenv.lib.licenses.publicDomain;
@@ -5021,7 +5167,7 @@ self: {
        sha256 = "10sivjxppn138805iwka54cfby59nc39ja30nx2w3762fybz71af";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base freetype2 OpenGL ];
+       libraryHaskellDepends = [ base freetype2 OpenGL ];
        jailbreak = true;
        description = "Loadable texture fonts for OpenGL";
        license = stdenv.lib.licenses.bsd3;
@@ -5036,7 +5182,8 @@ self: {
        sha256 = "0v9y9a82d2h34ai5hhwnalgfs5m2s909blr4f30dawgryn8gnbfp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base GLUT OpenGL random ];
+       libraryHaskellDepends = [ base GLUT OpenGL random ];
+       executableHaskellDepends = [ base GLUT OpenGL random ];
        jailbreak = true;
        homepage = "http://joyful.com/fungen";
        description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine";
@@ -5054,7 +5201,7 @@ self: {
        sha256 = "181m78c0m1ldnkpng0sps9fbkpq5j4p57j0km34g5kwasxhmwfcc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath ListZipper mtl
          mwc-random old-time process random transformers tuple
        ];
@@ -5070,7 +5217,7 @@ self: {
        pname = "GA";
        version = "1.0";
        sha256 = "1nsmpph27yv0anrhhfqbpdqs2rrdbhm0jxzs3kk6ab32zb3ivhp2";
-       buildDepends = [ base directory random transformers ];
+       libraryHaskellDepends = [ base directory random transformers ];
        homepage = "http://boegel.kejo.be";
        description = "Genetic algorithm library";
        license = stdenv.lib.licenses.bsd3;
@@ -5084,7 +5231,7 @@ self: {
        sha256 = "129z0391zm7v4ixwwq2irqhpb43s5pd0imgh3i9i5l9ahq9lk1h7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bimap ];
+       executableHaskellDepends = [ base bimap ];
        jailbreak = true;
        homepage = "https://github.com/xnil/GGg";
        description = "GGg cipher";
@@ -5097,7 +5244,7 @@ self: {
        pname = "GHood";
        version = "0.0.4";
        sha256 = "0ab6dngl8gjkj8wvjvrjijgqb59aq88c1ra2z92iqky2d0plrfca";
-       buildDepends = [ array base process ];
+       libraryHaskellDepends = [ array base process ];
        homepage = "http://www.cs.kent.ac.uk/people/staff/cr3/toolbox/haskell/GHood";
        description = "A graphical viewer for Hood";
        license = stdenv.lib.licenses.bsd3;
@@ -5110,12 +5257,11 @@ self: {
        pname = "GLFW";
        version = "0.5.2.4";
        sha256 = "1aac9xz943h3jjbx22kmvzmbzqw7k6cl2qsh1kr4nnx83pxrxz28";
-       buildDepends = [ base OpenGL ];
-       extraLibraries = [ libX11 mesa ];
+       libraryHaskellDepends = [ base OpenGL ];
+       librarySystemDepends = [ libX11 mesa ];
        homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;};
 
   "GLFW-OGL" = callPackage
@@ -5124,8 +5270,8 @@ self: {
        pname = "GLFW-OGL";
        version = "0.0";
        sha256 = "118hpgdp8rb0jlvlibxcaia4jjjdrn8xpzyvj109piw63g44n910";
-       buildDepends = [ base mtl OGL ];
-       extraLibraries = [ libX11 libXrandr ];
+       libraryHaskellDepends = [ base mtl OGL ];
+       librarySystemDepends = [ libX11 libXrandr ];
        homepage = "http://haskell.org/haskellwiki/GLFW-OGL";
        description = "A binding for GLFW (OGL)";
        license = stdenv.lib.licenses.bsd3;
@@ -5141,8 +5287,8 @@ self: {
        pname = "GLFW-b";
        version = "1.4.7.2";
        sha256 = "1hjsv6yqkwqi18c1vha105jl56xjvb5dqwqs4bgjkk99qcqq70rd";
-       buildDepends = [ base bindings-GLFW ];
-       testDepends = [
+       libraryHaskellDepends = [ base bindings-GLFW ];
+       testHaskellDepends = [
          base bindings-GLFW HUnit test-framework test-framework-hunit
        ];
        description = "Bindings to GLFW OpenGL library";
@@ -5159,7 +5305,9 @@ self: {
        sha256 = "01qf0bsv3q60m3as763q49hd3nm5lkady48nc214zjsx31x8by59";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLFW-b mtl OpenGL pretty stm transformers ];
+       executableHaskellDepends = [
+         base GLFW-b mtl OpenGL pretty stm transformers
+       ];
        jailbreak = true;
        description = "GLFW-b demo";
        license = stdenv.lib.licenses.bsd3;
@@ -5171,12 +5319,13 @@ self: {
        pname = "GLFW-task";
        version = "0.2.0";
        sha256 = "110iwxp6xs3wj4bva8m6mgz7iq90zrcz2dnjlq3s2x3in2m4818p";
-       buildDepends = [ base GLFW monad-task OpenGL transformers ];
+       libraryHaskellDepends = [
+         base GLFW monad-task OpenGL transformers
+       ];
        jailbreak = true;
        homepage = "http://github.com/ninegua/GLFW-task";
        description = "GLFW utility functions to use together with monad-task";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GLHUI" = callPackage
@@ -5185,8 +5334,8 @@ self: {
        pname = "GLHUI";
        version = "1.1.0";
        sha256 = "043xw36hrwzc6xdr5vlydbsv5m8675vnk8pfxycr7qixzwljn0aa";
-       buildDepends = [ base ];
-       extraLibraries = [ libX11 mesa ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ libX11 mesa ];
        description = "Open OpenGL context windows in X11 with libX11";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;};
@@ -5197,7 +5346,7 @@ self: {
        pname = "GLMatrix";
        version = "0.1.0.1";
        sha256 = "13n80rplyl73ahk8cxgvs9gf655l063sd55spx0zvhw774vvxwv4";
-       buildDepends = [ base OpenGLRaw ];
+       libraryHaskellDepends = [ base OpenGLRaw ];
        jailbreak = true;
        homepage = "https://github.com/fiendfan1/GLMatrix";
        description = "Utilities for working with OpenGL matrices";
@@ -5210,31 +5359,29 @@ self: {
        pname = "GLURaw";
        version = "1.5.0.1";
        sha256 = "1wf8nav298wsjl417vgp94wdvh38g8hxvb20iyivxhi0g1iw4lhv";
-       buildDepends = [ base OpenGLRaw transformers ];
-       extraLibraries = [ freeglut mesa ];
+       libraryHaskellDepends = [ base OpenGLRaw transformers ];
+       librarySystemDepends = [ freeglut mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) freeglut;  inherit (pkgs) mesa;};
 
   "GLUT" = callPackage
-    ({ mkDerivation, array, base, containers, freeglut, libICE, libSM
-     , libXi, libXmu, mesa, OpenGL, OpenGLRaw, StateVar, transformers
+    ({ mkDerivation, array, base, containers, freeglut, mesa, OpenGL
+     , OpenGLRaw, StateVar, transformers
      }:
      mkDerivation {
        pname = "GLUT";
        version = "2.7.0.1";
        sha256 = "0kcw8nf0k0ql220yy6sp3cf0vhij378j94l3ffrz3nynxq5xh7pv";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers OpenGL OpenGLRaw StateVar transformers
        ];
-       extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
+       librarySystemDepends = [ freeglut mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) freeglut;  inherit (pkgs.xlibs) libICE;
-          inherit (pkgs.xlibs) libSM;  inherit (pkgs.xlibs) libXi;
-          inherit (pkgs.xlibs) libXmu;  inherit (pkgs) mesa;};
+     }) { inherit (pkgs) freeglut;  inherit (pkgs) mesa;};
 
   "GLUtil" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, cpphs
@@ -5245,11 +5392,11 @@ self: {
        pname = "GLUtil";
        version = "0.8.6";
        sha256 = "15z6l1r4dn8jp5b7awzw16zxd3lh297iwab712ah0dx8m3hk0df3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath JuicyPixels
          linear OpenGL OpenGLRaw transformers vector
        ];
-       buildTools = [ cpphs ];
+       libraryToolDepends = [ cpphs ];
        description = "Miscellaneous OpenGL utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5262,7 +5409,7 @@ self: {
        pname = "GPX";
        version = "0.8.0";
        sha256 = "08qvl4l81bgjx40nmlrmb0csxa3xjj4l0dbq9bzcq65p403xs1pk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad comonad-transformers containers data-lens hxt newtype
          xsd
        ];
@@ -5281,7 +5428,7 @@ self: {
        pname = "GPipe";
        version = "1.4.1";
        sha256 = "0w1xgn7pmz9pgpimsmy3fx66dax37qkd5a5q0yk1fh396dxsybx3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Boolean containers GLUT list-tries OpenGL transformers Vec
          Vec-Boolean
        ];
@@ -5298,7 +5445,9 @@ self: {
        pname = "GPipe-Collada";
        version = "0.1.4";
        sha256 = "0aqvyv50gx0qx7icp70pw73gr3p6y05dkn347nqx82jc9dyxjghw";
-       buildDepends = [ array base containers GPipe HaXml mtl Vec ];
+       libraryHaskellDepends = [
+         array base containers GPipe HaXml mtl Vec
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/GPipe";
        description = "Load GPipe meshes from Collada files";
@@ -5316,7 +5465,7 @@ self: {
        sha256 = "0ir32fx0mk5hmmqilv6z89453rqcsgbs13a6ln4cydlkw5lbgv1k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base GLUT GPipe GPipe-TextureLoad haskell98 Vec Vec-Transform
        ];
        description = "Examples for the GPipes package";
@@ -5330,7 +5479,7 @@ self: {
        pname = "GPipe-TextureLoad";
        version = "1.0.4";
        sha256 = "1yf74k3yvpj42ynivlkacp5zwxwsx3yyfxb2436ljrv3339kjkb4";
-       buildDepends = [ base bitmap GPipe stb-image ];
+       libraryHaskellDepends = [ base bitmap GPipe stb-image ];
        homepage = "http://www.haskell.org/haskellwiki/GPipe";
        description = "Load GPipe textures from filesystem";
        license = stdenv.lib.licenses.bsd3;
@@ -5345,10 +5494,12 @@ self: {
        pname = "GTALib";
        version = "0.0.6";
        sha256 = "10l72wn8wdgcvpbcj10hmib6z0175ihsgvmwpp9akx4d6vpf2dz8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq parallel template-haskell
        ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        jailbreak = true;
        homepage = "https://bitbucket.org/emoto/gtalib";
        description = "A library for GTA programming";
@@ -5366,7 +5517,7 @@ self: {
        pname = "Gamgine";
        version = "0.5";
        sha256 = "131pgif3x61agk6an27p33bnqi45zlyiwxivxkxdbzi82wckr0w0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring composition cpphs data-lens directory
          filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show
          StateVar time unordered-containers utility-ht Vec zlib
@@ -5386,7 +5537,7 @@ self: {
        sha256 = "1fmb6fpdfk21yxrvlgdg32qymzirfbygsq6p4jvm925kvpwqbcwk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath mtl parsec transformers
        ];
        jailbreak = true;
@@ -5402,7 +5553,7 @@ self: {
        pname = "GaussQuadIntegration";
        version = "0.1";
        sha256 = "0v91q0m90338qpxg4hnvb7n6vm1jap3y1rvn9kyzmnxh03rarpx2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Non-adaptive Gaussian quadrature for numeric integraton";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5415,7 +5566,9 @@ self: {
        sha256 = "0cldjrk26p2llyhsp1rcvzbgz5qg8k898fvmdxkfc9ihc5lsxxf5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base directory random wx wxcore ];
+       executableHaskellDepends = [
+         array base directory random wx wxcore
+       ];
        homepage = "http://www.haskell.org/haskellwiki/GeBoP";
        description = "Several games";
        license = stdenv.lib.licenses.bsd3;
@@ -5434,12 +5587,16 @@ self: {
        sha256 = "0gmig362ayxxqgj4m6g1r1i6q5zfg6j8bmvsd7i9kmqn12nl3l0p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cabal-macosx containers deepseq directory
          errors filepath hslogger json mtl old-locale ordered parsec process
          syb text time transformers yaml-light
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base containers directory errors filepath hslogger json mtl process
+         yaml-light
+       ];
+       testHaskellDepends = [
          base containers errors filepath HUnit json mtl parsec QuickCheck
          smallcheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-smallcheck text
@@ -5460,7 +5617,7 @@ self: {
        sha256 = "1vs1m78lp87mccqs3i80zpl121yb063vqxx6a4sqzkfxzhvjvcbz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 QuickCheck random ];
+       executableHaskellDepends = [ base haskell98 QuickCheck random ];
        description = "Automatic SMS message generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5476,9 +5633,10 @@ self: {
        sha256 = "14rbknlc1bxrld04i7dc5dklng5sp0b1rbiilndw5cair0d67brb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base biocore biofasta bytestring cmdargs parsec split
+       libraryHaskellDepends = [
+         base biocore biofasta bytestring parsec split
        ];
+       executableHaskellDepends = [ base cmdargs ];
        description = "Libary for processing the NCBI genbank format";
        license = "GPL";
      }) {};
@@ -5491,11 +5649,12 @@ self: {
        sha256 = "0dng5shk5zs4j6lyjz971axrqziv6davpcyv509mz8fvdjn8q4kg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://afonso.xyz";
        description = "A general TicTacToe game implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GenericPretty" = callPackage
@@ -5504,7 +5663,7 @@ self: {
        pname = "GenericPretty";
        version = "1.2.1";
        sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php";
-       buildDepends = [ base ghc-prim pretty ];
+       libraryHaskellDepends = [ base ghc-prim pretty ];
        homepage = "https://github.com/RazvanRanca/GenericPretty";
        description = "A generic, derivable, haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
@@ -5523,12 +5682,13 @@ self: {
        sha256 = "1byshl3wa637nnvwxa80r9p1azgvgbczp5j77hpqaxacxkx1q0sm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ADPfusion ansi-wl-pprint base bytestring cmdargs containers
-         data-default FormalGrammars lens mtl PrimitiveArray semigroups
-         template-haskell text transformers unordered-containers vector
+       libraryHaskellDepends = [
+         ADPfusion ansi-wl-pprint base bytestring containers data-default
+         FormalGrammars lens mtl PrimitiveArray semigroups template-haskell
+         text transformers unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ base cmdargs FormalGrammars ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
@@ -5543,7 +5703,7 @@ self: {
        pname = "GeoIp";
        version = "0.3";
        sha256 = "1q3km52w7qcrawbgaxvglb3x6rgc8f22c8rw8705lgcxxn9pjxm1";
-       buildDepends = [ base bytestring bytestring-mmap syb ];
+       libraryHaskellDepends = [ base bytestring bytestring-mmap syb ];
        description = "Pure bindings for the MaxMind IP database";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5555,7 +5715,7 @@ self: {
        pname = "Geodetic";
        version = "0.4";
        sha256 = "1nb0q5hs9qqgygw35rbvanbjf9l6vjxrl6l4jp9dqwlnl1kdd88q";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/geodetic/";
        description = "Geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
@@ -5567,7 +5727,7 @@ self: {
        pname = "GeomPredicates";
        version = "0.1";
        sha256 = "19scirh2hy9y9kv16pcp44v31cs3868ig28r8blj39gdv4wqxwcy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Geometric predicates";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5578,7 +5738,7 @@ self: {
        pname = "GeomPredicates-SSE";
        version = "0.2";
        sha256 = "18mdaf2j1svklka5ms9ihj07d9l92ivqjk0y8jv0l9ni44hrhxcq";
-       buildDepends = [ base GeomPredicates ];
+       libraryHaskellDepends = [ base GeomPredicates ];
        description = "Geometric predicates (Intel SSE)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5590,7 +5750,7 @@ self: {
        pname = "GiST";
        version = "0.0.1";
        sha256 = "0ykvsjqpi7pd81857n2gqycgpnm0j8dxnpf345h7pgzrkz10qi9f";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        jailbreak = true;
        description = "A Haskell implementation of a Generalized Search Tree (GiST)";
        license = "GPL";
@@ -5602,7 +5762,7 @@ self: {
        pname = "GiveYouAHead";
        version = "0.2.2.3";
        sha256 = "10f9yl62gwnjmb0mbfffdzhwscpwpvq9gj52zsrz8w6z6sbkijbf";
-       buildDepends = [ base directory extra old-time process ];
+       libraryHaskellDepends = [ base directory extra old-time process ];
        homepage = "https://github.com/Qinka/GiveYouAHead/";
        description = "to auto-do somethings";
        license = stdenv.lib.licenses.mit;
@@ -5615,10 +5775,10 @@ self: {
      mkDerivation {
        pname = "Glob";
        version = "0.7.5";
-       revision = "1";
        sha256 = "0hdyi49zp2yr4h4wgngl8ajrss1p309c3pn0alj543yrh33bnqq0";
+       revision = "1";
        editedCabalFile = "219b9caf1aaf9c2ab69ac75242f6017f0cd804a3370e0d63ac48777888fd909b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory dlist filepath transformers
        ];
        homepage = "http://iki.fi/matti.niemenmaa/glob/";
@@ -5632,7 +5792,7 @@ self: {
        pname = "GlomeTrace";
        version = "0.3";
        sha256 = "0n1290ls68fsky3a80fvfdq6bycvmpn3i3kmflq6yn45qa959f0k";
-       buildDepends = [ array base GlomeVec ];
+       libraryHaskellDepends = [ array base GlomeVec ];
        homepage = "http://www.haskell.org/haskellwiki/Glome";
        description = "Ray Tracing Library";
        license = "GPL";
@@ -5645,8 +5805,8 @@ self: {
        pname = "GlomeVec";
        version = "0.2";
        sha256 = "08hyiadkbkmcsd1g51xvxqzp6l94hnqqbz4r6yk0zk29iawq8610";
-       buildDepends = [ array base ];
-       buildTools = [ llvm ];
+       libraryHaskellDepends = [ array base ];
+       libraryPkgconfigDepends = [ llvm ];
        homepage = "http://www.haskell.org/haskellwiki/Glome";
        description = "Simple 3D vector library";
        license = "GPL";
@@ -5662,7 +5822,7 @@ self: {
        sha256 = "0plglb289gadk8mqxgqj8n25xa6dql2jl0b8cm9v7q5rwykx0kbq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base deepseq GlomeTrace GlomeVec monad-par random SDL time vector
        ];
        homepage = "http://haskell.org/haskellwiki/Glome";
@@ -5677,7 +5837,7 @@ self: {
        pname = "GoogleChart";
        version = "0.2";
        sha256 = "0wfabsdn4agmg459srnknkwqb7ri5knj9npzgzhilybwrrqq46v9";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://neugierig.org/software/darcs/browse/?r=google-chart;a=summary";
        description = "Generate web-based charts using the Google Chart API";
        license = stdenv.lib.licenses.bsd3;
@@ -5691,7 +5851,7 @@ self: {
        pname = "GoogleDirections";
        version = "0.3.0.1";
        sha256 = "1x7k72iy8aa6r60p3hrqb8a4p5avyjh8czymrkarc3wpkc73bjb3";
-       buildDepends = [
+       libraryHaskellDepends = [
          AttoJson base bytestring containers dataenc download-curl
        ];
        homepage = "https://github.com/favilo/GoogleDirections.git";
@@ -5707,7 +5867,7 @@ self: {
        pname = "GoogleSB";
        version = "0.1";
        sha256 = "1gfjpxcjr9xqinha3wzdk101avjzyvji2xs5abkj9pj8lsrbh2w8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary Crypto haskell98 HTTP mtl network split
        ];
        description = "Interface to Google Safe Browsing API";
@@ -5721,7 +5881,9 @@ self: {
        pname = "GoogleSuggest";
        version = "0.0.4";
        sha256 = "1jqfd9zi4yp0kr506v71dlg5zgmvzqbxdsfjr2574ajx5xp2fjrb";
-       buildDepends = [ base dataenc download-curl utf8-string xml ];
+       libraryHaskellDepends = [
+         base dataenc download-curl utf8-string xml
+       ];
        description = "Interface to Google Suggest API";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -5733,7 +5895,9 @@ self: {
        pname = "GoogleTranslate";
        version = "0.0.5";
        sha256 = "0hr0rjz7nx5rcy4h5pcbvh8sh9v4qvl9ffrqhnrcslh7ibvwbca6";
-       buildDepends = [ AttoJson base bytestring dataenc download-curl ];
+       libraryHaskellDepends = [
+         AttoJson base bytestring dataenc download-curl
+       ];
        description = "Interface to Google Translate API";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -5744,7 +5908,7 @@ self: {
        pname = "GotoT-transformers";
        version = "1.0.0.1";
        sha256 = "1w1w1p2cpndiilr002whm58bzqjh9cp9lw3jl7khdxh20c1dfzhy";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/gcross/GotoT-transformers";
        description = "A monad and monadic transformer providing \"goto\" functionality";
@@ -5763,7 +5927,7 @@ self: {
        sha256 = "026sjppwk0g10zyw64rds1fifdi7d6p7jzri35cl6hxc33fqdiy3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ADPfusion ansi-wl-pprint base bytestring containers data-default
          FormalGrammars lens newtype parsers PrimitiveArray semigroups
          template-haskell transformers trifecta
@@ -5783,9 +5947,10 @@ self: {
        sha256 = "0lhn2r54488949gh5m5fgwrj2z30r9pf34860sikb6zq07gjz759";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers mersenne-random-pure64 mtl random
        ];
+       executableHaskellDepends = [ array base mtl ];
        description = "Graph500 benchmark-related definitions and data set generator";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5798,7 +5963,9 @@ self: {
        pname = "GraphHammer";
        version = "0.3";
        sha256 = "0fga3g2y38ylvmkgi57h4j5brc7gjxh8d183qfa2vhx8i4sr3pzm";
-       buildDepends = [ array base containers Graph500 mtl stm time ];
+       libraryHaskellDepends = [
+         array base containers Graph500 mtl stm time
+       ];
        description = "GraphHammer Haskell graph analyses framework inspired by STINGER";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5814,7 +5981,9 @@ self: {
        sha256 = "18p1dr08nq8dnvghkshihzra0p9ja0qa9bxbkm561jkrdpk3zndv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers Graph500 GraphHammer mtl ];
+       executableHaskellDepends = [
+         array base containers Graph500 GraphHammer mtl
+       ];
        description = "Test harness for TriangleCount analysis";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5826,7 +5995,7 @@ self: {
        pname = "GraphSCC";
        version = "1.0.4";
        sha256 = "1wbcx3wb02adb7l4nchxla3laliz0h5q074vfw4z0ic833k977bq";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        description = "Tarjan's algorithm for computing the strongly connected components of a graph";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5840,7 +6009,7 @@ self: {
        pname = "Graphalyze";
        version = "0.14.1.0";
        sha256 = "0pyrhpl06lsppr8ch21crinkax7fh0k18wfvgjinc8phkk6j5hz3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bktrees containers directory fgl filepath graphviz
          old-locale pandoc process random text time
        ];
@@ -5857,7 +6026,7 @@ self: {
        pname = "Grempa";
        version = "0.2.2";
        sha256 = "0w0apbk8hw555cbpprvxpnxviyzmbsxzlc6qpf6w0cfsybkkiv1f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers mtl QuickCheck template-haskell th-lift
        ];
        description = "Embedded grammar DSL and LALR parser generator";
@@ -5871,7 +6040,7 @@ self: {
        pname = "GroteTrap";
        version = "0.5.1";
        sha256 = "131i63paaapdbdnqvmacsfqbg1719xlbx8phjchw6zlh9njn727k";
-       buildDepends = [ base mtl parsec QuickCheck syb ];
+       libraryHaskellDepends = [ base mtl parsec QuickCheck syb ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/GroteTrap";
        description = "Parser and selection library for expression languages";
@@ -5887,10 +6056,10 @@ self: {
      mkDerivation {
        pname = "Grow";
        version = "1.1.0.3";
-       revision = "3";
        sha256 = "1vc4ln5fzvcv68qlanyw8mc6qchnjn1kj9rpz661n8ia1x8gkb3l";
+       revision = "3";
        editedCabalFile = "e599aab8eefc612bbf1dbae0b60308305a9d3009dda186b228e4e8aeeda1f36a";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring clock containers deepseq definitive-base
          definitive-filesystem definitive-parser definitive-reactive
          directory filepath old-locale primitive process time unix vector
@@ -5912,7 +6081,12 @@ self: {
        sha256 = "13m213d6l81k0iwjbbwg8n2xz960dhfnrs1il48xvlc8z25y6nh5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring Crypto haskell98 network ];
+       libraryHaskellDepends = [
+         base binary bytestring Crypto haskell98 network
+       ];
+       executableHaskellDepends = [
+         base binary bytestring Crypto haskell98 network
+       ];
        description = "Notification utility for Growl";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5926,7 +6100,7 @@ self: {
        pname = "Gtk2hsGenerics";
        version = "0.1";
        sha256 = "1gj775yny73qvi3inc38c6yy1av503m5ilbz7ch0xx4a3ywnw5l9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cairo containers glib gtk haskell98 mtl
        ];
        description = "Convenience functions to extend Gtk2hs";
@@ -5942,7 +6116,7 @@ self: {
        pname = "GtkGLTV";
        version = "0.2.0";
        sha256 = "1xkc3ga65prffjzlymimwmfnmvf0lc42h2rm4b72rlmm8316kmp2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bitmap bitmap-opengl gtk gtkglext GtkTV OpenGL stb-image time
        ];
        description = "OpenGL support for Gtk-based GUIs for Tangible Values";
@@ -5956,7 +6130,9 @@ self: {
        pname = "GtkTV";
        version = "0.2.0";
        sha256 = "0jxx8lgg533kjvq1sxr4jvqvxj9pcpabsy2mvbpsd2lwv2ffr618";
-       buildDepends = [ base gtk time TV TypeCompose vector-space ];
+       libraryHaskellDepends = [
+         base gtk time TV TypeCompose vector-space
+       ];
        homepage = "http://haskell.org/haskellwiki/GtkTV";
        description = "Gtk-based GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
@@ -5972,7 +6148,7 @@ self: {
        sha256 = "1rgyrbnlbvsqgd8m36fccq7qzxj2n682lz2rdq04j35zsgajyk11";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath glade gtk parsec process
          proplang
        ];
@@ -5988,7 +6164,7 @@ self: {
        pname = "GuiTV";
        version = "0.4";
        sha256 = "15mndbxm83q0d8ci3vj51zwrmzl0f5i5yqv0caw05vlzfsr4ib5i";
-       buildDepends = [ base DeepArrow phooey TV TypeCompose ];
+       libraryHaskellDepends = [ base DeepArrow phooey TV TypeCompose ];
        homepage = "http://haskell.org/haskellwiki/GuiTV";
        description = "GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
@@ -6003,7 +6179,8 @@ self: {
        sha256 = "0mld40jm0qnsr9flbip3s2lxwd43nhzs11v23bm5m2s83y6j33jn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
+       executableHaskellDepends = [ array base ];
        homepage = "http://www.engr.uconn.edu/~jeffm/Classes/CSE240-Spring-2001/Lectures/index.html";
        description = "A simple ARM emulator in haskell";
        license = "unknown";
@@ -6018,7 +6195,7 @@ self: {
        pname = "HAppS-Data";
        version = "0.9.3";
        sha256 = "0df3bcvqpmjrg2c28jny20r52f3x7gf1wy7r8x71j9wrji56yg5j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers HAppS-Util HaXml mtl pretty syb
          syb-with-class template-haskell
        ];
@@ -6036,7 +6213,7 @@ self: {
        pname = "HAppS-IxSet";
        version = "0.9.3";
        sha256 = "0wm3apqsqb2p9cqxikz9j6lzi66ya1sn1yplifqszg1v2lpdgb7b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HAppS-Data HAppS-State HAppS-Util hslogger mtl syb
          syb-with-class template-haskell
        ];
@@ -6054,7 +6231,7 @@ self: {
        pname = "HAppS-Server";
        version = "0.9.3.1";
        sha256 = "0f10qp2aiv036izzdpfpgmja5kqx68kccazkn1cdap636brjjcdh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory HAppS-Data HAppS-IxSet
          HAppS-State HAppS-Util HaXml hslogger html HTTP mtl network
          old-locale old-time parsec process random syb template-haskell unix
@@ -6076,7 +6253,7 @@ self: {
        pname = "HAppS-State";
        version = "0.9.3";
        sha256 = "1r1ing4c8s91d9p41q7yv6v6xaqs9si438j7b5vnzxgwz0syd6ah";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory filepath HAppS-Data
          HAppS-Util HaXml hslogger hspread mtl network old-locale old-time
          random stm syb template-haskell unix
@@ -6095,7 +6272,7 @@ self: {
        pname = "HAppS-Util";
        version = "0.9.3";
        sha256 = "0mg6p14xv6f9b1rb77mvadzchf6limcypi6z0di1n49pdqjhs4pr";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring directory hslogger mtl old-time process
          template-haskell
        ];
@@ -6123,7 +6300,10 @@ self: {
        sha256 = "0dzfnvdc1nm4f7q759xnq1lavi90axc7b6jd39sl898jbjg8wrrl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers mtl QuickCheck random ];
+       libraryHaskellDepends = [ base containers mtl QuickCheck random ];
+       executableHaskellDepends = [
+         base containers mtl QuickCheck random
+       ];
        jailbreak = true;
        homepage = "http://github.com/m4dc4p/hcl/tree/master";
        description = "High-level library for building command line interfaces";
@@ -6137,7 +6317,9 @@ self: {
        pname = "HCard";
        version = "0.0";
        sha256 = "0bvj1vc8m69bsnjz8xb4nbbpbd4xbqp4kfab0bmk6a4ixgnqk14b";
-       buildDepends = [ base mtl QuickCheck random random-shuffle ];
+       libraryHaskellDepends = [
+         base mtl QuickCheck random random-shuffle
+       ];
        homepage = "http://patch-tag.com/publicrepos/HCard";
        description = "A library for implementing a Deck of Cards";
        license = stdenv.lib.licenses.bsd3;
@@ -6150,8 +6332,10 @@ self: {
        pname = "HCodecs";
        version = "0.5";
        sha256 = "0mhp1alx0p9lzq3vm0k802f8ndm2386sshprn9zb8xq8bsd11gxi";
-       buildDepends = [ array base bytestring QuickCheck random ];
-       testDepends = [ array base bytestring QuickCheck random ];
+       libraryHaskellDepends = [
+         array base bytestring QuickCheck random
+       ];
+       testHaskellDepends = [ array base bytestring QuickCheck random ];
        homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze";
        description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files";
        license = stdenv.lib.licenses.bsd3;
@@ -6167,7 +6351,7 @@ self: {
        sha256 = "1bfjffn44n8w0bvznjiqm4ckfs28nipachip98f125p784ff4gks";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers convertible mtl old-time text time
          utf8-string
        ];
@@ -6182,7 +6366,7 @@ self: {
        pname = "HDBC-mysql";
        version = "0.6.6.1";
        sha256 = "1q50xynasb2h65g14ycz4s38fyz185yz1sp9rl02h4p940pz7w9m";
-       buildDepends = [ base bytestring HDBC time utf8-string ];
+       libraryHaskellDepends = [ base bytestring HDBC time utf8-string ];
        homepage = "http://github.com/bos/hdbc-mysql";
        description = "MySQL driver for HDBC";
        license = "LGPL";
@@ -6199,8 +6383,11 @@ self: {
        sha256 = "1sdf5llz40q9cg0gi0rglnz6agamb7z4n5c6dhwwly902b6fxinv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring HDBC mtl time utf8-string ];
-       extraLibraries = [ unixODBC ];
+       libraryHaskellDepends = [
+         base bytestring HDBC mtl time utf8-string
+       ];
+       librarySystemDepends = [ unixODBC ];
+       executableSystemDepends = [ unixODBC ];
        homepage = "https://github.com/hdbc/hdbc-odbc";
        description = "ODBC driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -6216,11 +6403,12 @@ self: {
        sha256 = "1jv43rv3a0x7b7q5vzp07xffaf690gijx3rqnfv19fk63a7075j3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring convertible HDBC mtl old-time parsec time
          utf8-string
        ];
-       extraLibraries = [ postgresql ];
+       librarySystemDepends = [ postgresql ];
+       executableSystemDepends = [ postgresql ];
        homepage = "http://github.com/hdbc/hdbc-postgresql";
        description = "PostgreSQL driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -6232,7 +6420,7 @@ self: {
        pname = "HDBC-postgresql-hstore";
        version = "0.0.1.2";
        sha256 = "0657a1qy51bihh9gvpwpqpm4gch68rw32plnjcfdbc37yjq5dj1d";
-       buildDepends = [ attoparsec base containers HDBC text ];
+       libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        jailbreak = true;
        homepage = "https://bitbucket.org/dpwiz/hdbc-postgresql-hstore";
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
@@ -6245,7 +6433,7 @@ self: {
        pname = "HDBC-session";
        version = "0.1.0.0";
        sha256 = "1fxx0q9hnxwsivsg2qinm0n3lvf89r9b72cnhipjlpf36nin5x5w";
-       buildDepends = [ base HDBC ];
+       libraryHaskellDepends = [ base HDBC ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Bracketed connection for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -6260,8 +6448,9 @@ self: {
        sha256 = "1spbhvwwyj4q7li33kvw1bsr6m1xbnxipga67s7cdgvyf2mxk0x7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring HDBC mtl utf8-string ];
-       extraLibraries = [ sqlite ];
+       libraryHaskellDepends = [ base bytestring HDBC mtl utf8-string ];
+       librarySystemDepends = [ sqlite ];
+       executableSystemDepends = [ sqlite ];
        homepage = "https://github.com/hdbc/hdbc-sqlite3";
        description = "Sqlite v3 driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -6275,8 +6464,8 @@ self: {
        pname = "HDRUtils";
        version = "1.0.2";
        sha256 = "0rkykxmqpqiclvxlvfd0v9rrvkkb25shyajdmajxisfqxl684y0g";
-       buildDepends = [ array base colour containers mtl unix ];
-       extraLibraries = [ pfstools ];
+       libraryHaskellDepends = [ array base colour containers mtl unix ];
+       librarySystemDepends = [ pfstools ];
        jailbreak = true;
        homepage = "http://vis.renci.org/jeff/pfs";
        description = "Utilities for reading, manipulating, and writing HDR images";
@@ -6290,8 +6479,8 @@ self: {
        pname = "HERA";
        version = "0.2";
        sha256 = "08lry7w4zb7j81q9d7rjpz0chcbr9laxi4h9dz327pfcgmy083sy";
-       buildDepends = [ base ];
-       extraLibraries = [ mpfr ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ mpfr ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) mpfr;};
@@ -6304,8 +6493,8 @@ self: {
        sha256 = "1894dk7flfdblyyrx0d1acznrdbjw41dnal45cqvrxz5vy4hd3p2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring unix ];
-       extraLibraries = [ fuse ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       librarySystemDepends = [ fuse ];
        preConfigure = ''
          sed -i -e "s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@" HFuse.cabal
        '';
@@ -6320,7 +6509,7 @@ self: {
        pname = "HGL";
        version = "3.2.0.5";
        sha256 = "0z8dfxg2x530lawx7gyv9d25wcfpwvbfmknq17d5wgkxz47j95wb";
-       buildDepends = [ array base X11 ];
+       libraryHaskellDepends = [ array base X11 ];
        description = "A simple graphics library based on X11 or Win32";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6335,7 +6524,7 @@ self: {
        pname = "HGamer3D";
        version = "0.5.0";
        sha256 = "00mkjpmygz3h7rq1y4b8r8gpg4qk52dah1q0h14f50cr2lxvq3b7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HGamer3D-Audio HGamer3D-Common HGamer3D-Data
          HGamer3D-Graphics3D HGamer3D-InputSystem HGamer3D-Network
        ];
@@ -6353,7 +6542,7 @@ self: {
        pname = "HGamer3D-API";
        version = "0.1.6";
        sha256 = "14wji303z3frjr4rc675pcispbpbpm1ilj6g3cb1fxm5wmi30q5l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell98 HGamer3D-Data HGamer3D-Ogre-Binding
          HGamer3D-SFML-Binding
        ];
@@ -6372,7 +6561,7 @@ self: {
        pname = "HGamer3D-Audio";
        version = "0.5.0";
        sha256 = "0zfzk0vjn2w127dxcsg64d8j6jw1an3i0a2v32sx05l6whrnhabd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HGamer3D-Common HGamer3D-Data HGamer3D-SFML-Binding
        ];
        homepage = "http://www.hgamer3d.org";
@@ -6387,7 +6576,7 @@ self: {
        pname = "HGamer3D-Bullet-Binding";
        version = "0.2.1";
        sha256 = "1ilj8p1gm56dffics90qj6gspnam56s84wvaig9s0cwjbwxqi4hy";
-       buildDepends = [ base HGamer3D-Data ];
+       libraryHaskellDepends = [ base HGamer3D-Data ];
        homepage = "http://www.hgamer3d.org";
        description = "Windows Game Engine for the Haskell Programmer - Bullet Bindings";
        license = "unknown";
@@ -6400,8 +6589,8 @@ self: {
        pname = "HGamer3D-CAudio-Binding";
        version = "0.1.5";
        sha256 = "1q69ffhnnh4iaghb1g8s6bqlsry7jy5sbp5vpg4lprnr4wna5ya1";
-       buildDepends = [ base haskell98 HGamer3D-Data ];
-       extraLibraries = [ HGamer3DCAudio015 ];
+       libraryHaskellDepends = [ base haskell98 HGamer3D-Data ];
+       librarySystemDepends = [ HGamer3DCAudio015 ];
        jailbreak = true;
        homepage = "http://www.althainz.de/HGamer3D.html";
        description = "Library to enable 3D game development for Haskell - cAudio Bindings";
@@ -6417,8 +6606,10 @@ self: {
        pname = "HGamer3D-CEGUI-Binding";
        version = "0.5.0";
        sha256 = "1lh7gajn69l8yh2lvv552spf31g4br05cvpb2cwrpkijcnq6x8d0";
-       buildDepends = [ base HGamer3D-Data ];
-       extraLibraries = [ CEGUIBase CEGUIOgreRenderer hg3dcegui050 ];
+       libraryHaskellDepends = [ base HGamer3D-Data ];
+       librarySystemDepends = [
+         CEGUIBase CEGUIOgreRenderer hg3dcegui050
+       ];
        homepage = "http://www.hgamer3d.org";
        description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings";
        license = "unknown";
@@ -6434,7 +6625,7 @@ self: {
        pname = "HGamer3D-Common";
        version = "0.5.0";
        sha256 = "1klb8974hlsbjg06jwg1akl3pvbp6wr17apmdn69x8zarmb84skh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clock containers directory filepath FindBin HGamer3D-Data stm
          vect
        ];
@@ -6451,7 +6642,7 @@ self: {
        pname = "HGamer3D-Data";
        version = "0.5.0";
        sha256 = "0361153939v63qy204fxpajkgij7f8kfcz93y38jikqcz6nh7bgz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clock containers directory filepath FindBin stm vect
        ];
        homepage = "http://www.hgamer3d.org";
@@ -6465,8 +6656,8 @@ self: {
        pname = "HGamer3D-Enet-Binding";
        version = "0.5.0";
        sha256 = "0a5na073ysmcvr9nkbg7jgrkapzbd22wn7p09s2kpxzl9fr8axwd";
-       buildDepends = [ base HGamer3D-Data ];
-       extraLibraries = [ enet hg3denet050 ];
+       libraryHaskellDepends = [ base HGamer3D-Data ];
+       librarySystemDepends = [ enet hg3denet050 ];
        homepage = "http://www.hgamer3d.org";
        description = "Enet Binding for HGamer3D";
        license = "unknown";
@@ -6481,7 +6672,7 @@ self: {
        pname = "HGamer3D-GUI";
        version = "0.4.0";
        sha256 = "006j6g6w990il30kgpwvls77hsmlbg2haiwckrpq3mcywxrhrbsd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HGamer3D-CEGUI-Binding HGamer3D-Data HGamer3D-WinEvent split
        ];
        jailbreak = true;
@@ -6501,7 +6692,7 @@ self: {
        pname = "HGamer3D-Graphics3D";
        version = "0.5.0";
        sha256 = "1a6fizaf0l6271407z8kzlzd8yhh9ky2l9n10xcns0a1asvdkj5y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath HGamer3D-CEGUI-Binding
          HGamer3D-Common HGamer3D-Data HGamer3D-Ogre-Binding
          HGamer3D-SDL2-Binding mtl split transformers
@@ -6520,7 +6711,7 @@ self: {
        pname = "HGamer3D-InputSystem";
        version = "0.5.0";
        sha256 = "1dpc5zncc9fayf3gqqpki7chimq5cjpvnpjswapllsmykginlyfh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HGamer3D-Common HGamer3D-Data HGamer3D-SDL2-Binding
          HGamer3D-SFML-Binding
        ];
@@ -6538,7 +6729,7 @@ self: {
        pname = "HGamer3D-Network";
        version = "0.5.0";
        sha256 = "105m6k112qs96cih9jp0s9l24s671a3hlnsv4jm893mdk28zvznl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HGamer3D-Common HGamer3D-Data HGamer3D-Enet-Binding
        ];
        homepage = "http://www.hgamer3d.org";
@@ -6555,10 +6746,10 @@ self: {
        pname = "HGamer3D-OIS-Binding";
        version = "0.1.5";
        sha256 = "1n00s6vpwyw8zcasqzg6ycgc98w6hh3sylxjh05w1pya9v853syf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell98 HGamer3D-Data HGamer3D-Ogre-Binding
        ];
-       extraLibraries = [ HGamer3DOIS015 ];
+       librarySystemDepends = [ HGamer3DOIS015 ];
        jailbreak = true;
        homepage = "http://www.althainz.de/HGamer3D.html";
        description = "Library to enable 3D game development for Haskell - OIS Bindings";
@@ -6575,8 +6766,8 @@ self: {
        pname = "HGamer3D-Ogre-Binding";
        version = "0.5.0";
        sha256 = "1m2mgqky2bswwskgkmp7xmnm4df5i3rdkshlxkhihglgx3z1wy1w";
-       buildDepends = [ base HGamer3D-Data mtl transformers ];
-       extraLibraries = [
+       libraryHaskellDepends = [ base HGamer3D-Data mtl transformers ];
+       librarySystemDepends = [
          hg3dogre050 OgreMain OgrePaging OgreProperty OgreRTShaderSystem
          OgreTerrain
        ];
@@ -6596,8 +6787,10 @@ self: {
        pname = "HGamer3D-SDL2-Binding";
        version = "0.5.0";
        sha256 = "11j9gysd6sc8wvia7hgf3qvzbxmpqkj7hv65iza474yig2dcr5hh";
-       buildDepends = [ base bytestring HGamer3D-Data utf8-string ];
-       extraLibraries = [ hg3dsdl2050 libX11 SDL2 ];
+       libraryHaskellDepends = [
+         base bytestring HGamer3D-Data utf8-string
+       ];
+       librarySystemDepends = [ hg3dsdl2050 libX11 SDL2 ];
        homepage = "http://www.hgamer3d.org";
        description = "SDL2 Binding for HGamer3D";
        license = "unknown";
@@ -6613,8 +6806,8 @@ self: {
        pname = "HGamer3D-SFML-Binding";
        version = "0.5.0";
        sha256 = "1087g60dxg8pzxvx7bh72ws5slf4mfqmya8cnv11vxl6hk04vc4v";
-       buildDepends = [ base HGamer3D-Data ];
-       extraLibraries = [
+       libraryHaskellDepends = [ base HGamer3D-Data ];
+       librarySystemDepends = [
          hg3dsfml050 sfml-audio sfml-network sfml-system sfml-window
        ];
        homepage = "http://www.hgamer3d.org";
@@ -6631,7 +6824,9 @@ self: {
        pname = "HGamer3D-WinEvent";
        version = "0.4.0";
        sha256 = "0d3vjlgpzzb473dmhllxvi05lnh010vgfdbizlj4yxywrp6aas9a";
-       buildDepends = [ base HGamer3D-Data HGamer3D-SDL2-Binding text ];
+       libraryHaskellDepends = [
+         base HGamer3D-Data HGamer3D-SDL2-Binding text
+       ];
        jailbreak = true;
        homepage = "http://www.hgamer3d.org";
        description = "Windowing and Event Functionality for HGamer3D";
@@ -6648,7 +6843,7 @@ self: {
        pname = "HGamer3D-Wire";
        version = "0.3.3";
        sha256 = "0w5iafs9ldafc3kzq13alnk1ng766p9w97nak3aijpxfrc4m6z77";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HGamer3D HGamer3D-Audio HGamer3D-Data HGamer3D-GUI
          HGamer3D-InputSystem HGamer3D-WinEvent mtl netwire transformers
        ];
@@ -6669,12 +6864,12 @@ self: {
        pname = "HGraphStorage";
        version = "0.0.3";
        sha256 = "1qbhzrw8sjxaz95b34w3w71dv79wlkmqjgvcsr79vxxfn4c83dfc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers data-default directory filepath
          lifted-base monad-control monad-logger resourcet text transformers
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers data-default directory filepath HUnit
          lifted-base monad-control monad-logger QuickCheck resourcet tasty
          tasty-hunit tasty-quickcheck text transformers transformers-base
@@ -6691,7 +6886,7 @@ self: {
        pname = "HHDL";
        version = "0.1.0.0";
        sha256 = "1215nz6l3bbkld2fqqsc494xw4qw4vqavznaqxgja2p60w9mwg0q";
-       buildDepends = [ base containers mtl template-haskell ];
+       libraryHaskellDepends = [ base containers mtl template-haskell ];
        jailbreak = true;
        homepage = "http://thesz.mskhug.ru/svn/hhdl/hackage/hhdl/";
        description = "Hardware Description Language embedded in Haskell";
@@ -6705,7 +6900,7 @@ self: {
        pname = "HJScript";
        version = "0.7.0";
        sha256 = "0xvhzmsl1z6im36svjhcl4zlbnmpknlfn0m426cj5l06a3c5mfa8";
-       buildDepends = [ base HJavaScript hsp mtl text ];
+       libraryHaskellDepends = [ base HJavaScript hsp mtl text ];
        homepage = "http://patch-tag.com/r/nibro/hjscript";
        description = "HJScript is a Haskell EDSL for writing JavaScript programs";
        license = stdenv.lib.licenses.bsd3;
@@ -6720,15 +6915,15 @@ self: {
        pname = "HJVM";
        version = "0.1";
        sha256 = "0ixzhgrb2jj7np8gmfwca724w5n26i5xalppm5idnhxw6k4jbklr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath haskell-src-exts mtl parsec process
          transformers
        ];
-       testDepends = [
+       librarySystemDepends = [ jvm ];
+       testHaskellDepends = [
          base Cabal haskell-src-exts HUnit mtl parsec test-framework
          test-framework-hunit transformers
        ];
-       extraLibraries = [ jvm ];
        homepage = "https://github.com/JPMoresmau/HJVM";
        description = "A library to create a Java Virtual Machine and manipulate Java objects";
        license = stdenv.lib.licenses.bsd3;
@@ -6741,7 +6936,7 @@ self: {
        pname = "HJavaScript";
        version = "0.4.7";
        sha256 = "0sb2wqbf6kml5d414xi6jk0gr31673djqxa5wg1mxl40vwn14pvh";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        description = "HJavaScript is an abstract syntax for a typed subset of JavaScript";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6755,7 +6950,7 @@ self: {
        pname = "HLearn-algebra";
        version = "1.1.0.1";
        sha256 = "1k0a01cqaay4wp6i603yvcjpmap7inyjxiblqkbpifk9mwjxf15a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ConstraintKinds containers deepseq hashable MonadRandom
          parallel random template-haskell vector vector-heterogenous
        ];
@@ -6775,7 +6970,7 @@ self: {
        pname = "HLearn-approximation";
        version = "1.1.0";
        sha256 = "1gqrpnliy4jqjlhdhi7vygvq2lnfgwl2hr5hlkzgqmz2gjyib8vn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ConstraintKinds containers heap HLearn-algebra
          HLearn-datastructures HLearn-distributions list-extras vector
        ];
@@ -6793,7 +6988,7 @@ self: {
        pname = "HLearn-classification";
        version = "1.0.1.3";
        sha256 = "11c1016nhhckmdrzlazz5b7iabl0iz0g2245bwws3alnnn74svhd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring ConstraintKinds containers deepseq dlist
          hashable HLearn-algebra HLearn-distributions list-extras logfloat
          math-functions MonadRandom normaldistribution parsec primitive
@@ -6812,7 +7007,7 @@ self: {
        pname = "HLearn-datastructures";
        version = "1.1.0";
        sha256 = "06kbscd7nbbb6dlsgyigyag851bbvhiz6p05gdawpb7y0fh8f3wb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ConstraintKinds containers deepseq HLearn-algebra list-extras
          MonadRandom QuickCheck vector
        ];
@@ -6831,7 +7026,7 @@ self: {
        pname = "HLearn-distributions";
        version = "1.1.0.2";
        sha256 = "19v9askkccbv405bchq5h72jahsbivj2s31ajwi316kksan2iwzf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base ConstraintKinds containers deepseq erf gamma graphviz
          HLearn-algebra HLearn-datastructures hmatrix list-extras
          math-functions MonadRandom normaldistribution process QuickCheck
@@ -6843,25 +7038,24 @@ self: {
      }) {};
 
   "HList" = callPackage
-    ({ mkDerivation, array, base, cmdargs, diffutils, directory
-     , doctest, filepath, ghc-prim, hspec, lens, mtl, process
-     , profunctors, QuickCheck, syb, tagged, template-haskell
+    ({ mkDerivation, array, base, cmdargs, directory, doctest, filepath
+     , ghc-prim, hspec, lens, mtl, process, profunctors, QuickCheck, syb
+     , tagged, template-haskell
      }:
      mkDerivation {
        pname = "HList";
        version = "0.4.1.0";
        sha256 = "0vbfq2jfdm3dn059flyzxrlhcw7hkni75fpi2gqcl5s6ha95ak10";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base ghc-prim mtl profunctors tagged template-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base cmdargs directory doctest filepath hspec lens mtl
          process QuickCheck syb template-haskell
        ];
-       buildTools = [ diffutils ];
        description = "Heterogeneous lists";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) diffutils;};
+     }) {};
 
   "HListPP" = callPackage
     ({ mkDerivation, applicative-quoters, base, regex-applicative }:
@@ -6871,7 +7065,9 @@ self: {
        sha256 = "0jq2sdfg47dqf8gmmzm0049x4hsfh9prgfvxzplhrxsisknyhfr8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ applicative-quoters base regex-applicative ];
+       executableHaskellDepends = [
+         applicative-quoters base regex-applicative
+       ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~aavogt/HListPP";
        description = "A preprocessor for HList labelable labels";
@@ -6887,7 +7083,8 @@ self: {
        sha256 = "0amxyg9j6fh58g2wh9k0231mxmvi6j96z7ykd3rm3jzs96fhlncp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base old-locale time ];
+       libraryHaskellDepends = [ base old-locale time ];
+       executableHaskellDepends = [ base old-locale time ];
        jailbreak = true;
        homepage = "http://www.pontarius.org/sub-projects/hlogger/";
        description = "Simple, concurrent and easy-to-use logging library";
@@ -6913,7 +7110,7 @@ self: {
        pname = "HMap";
        version = "1.2.4";
        sha256 = "087a7ykk84lxa0c75wid6bkjmd89krgyrilxgps1fzl142hyvl13";
-       buildDepends = [ base hashable mtl unordered-containers ];
+       libraryHaskellDepends = [ base hashable mtl unordered-containers ];
        homepage = "https://github.com/atzeus/HMap";
        description = "Fast heterogeneous maps and unconstrained typeable like functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -6930,10 +7127,13 @@ self: {
        sha256 = "04325gwmlrx4iy9609vzaw2dhs4kg3ydr4r6af6rllrf500f6w9j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory glib gtk haskell98 mtl process
          regex-posix unix
        ];
+       executableHaskellDepends = [
+         base containers glib gtk haskell98 mtl process regex-posix unix
+       ];
        homepage = "http://sert.homedns.org/hs/hnm/";
        description = "Happy Network Manager";
        license = stdenv.lib.licenses.bsd3;
@@ -6946,8 +7146,8 @@ self: {
        pname = "HODE";
        version = "2008.10.27";
        sha256 = "0fr3bivmlciicba1brhm86l8diadb765ff1s8g6ylygs8l7lingv";
-       buildDepends = [ array base ];
-       extraLibraries = [ ode ];
+       libraryHaskellDepends = [ array base ];
+       librarySystemDepends = [ ode ];
        description = "Binding to libODE";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6961,8 +7161,10 @@ self: {
        sha256 = "1q32rcrzv79z125sbjlzhd4sl1pl8if01vrwd7y18s3acs3aqr4b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ allocated-processor base vector-space ];
-       pkgconfigDepends = [ opencv ];
+       libraryHaskellDepends = [ allocated-processor base vector-space ];
+       libraryPkgconfigDepends = [ opencv ];
+       executableHaskellDepends = [ base ];
+       executablePkgconfigDepends = [ opencv ];
        description = "A binding for the OpenCV computer vision library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) opencv;};
@@ -6975,7 +7177,7 @@ self: {
        pname = "HPDF";
        version = "1.4.6";
        sha256 = "15v1mf58fqa25higf52jqlf3fw2fbggfm5v8a8v00zz6q0f3lzn9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers mtl random vector zlib
        ];
        homepage = "http://www.alpheccar.org";
@@ -6994,7 +7196,11 @@ self: {
        sha256 = "10hlqyhcpgnkiqwjwb3d10wrhzc82jcbz1qvxa0mzzif36rys1wk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath haskell-src-exts mtl
+         parsec utf8-string
+       ];
+       executableHaskellDepends = [
          base Cabal containers directory filepath haskell-src-exts mtl
          parsec utf8-string
        ];
@@ -7011,7 +7217,7 @@ self: {
        pname = "HPi";
        version = "0.4.0";
        sha256 = "0d0r89a92lavbaf6svkqwd7fvc1q4kwbdvr0jvxarx2xgrhl342a";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "https://github.com/WJWH/HPi";
        description = "GPIO and I2C functions for the Raspberry Pi";
@@ -7026,9 +7232,11 @@ self: {
        sha256 = "022642xp13fl34y854n4j7kxn0nyxhrz4gxgn3nfqs67m13bcsqy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base glade glib gtk ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ plplotd-gnome2 ];
+       libraryHaskellDepends = [ base glade glib gtk ];
+       libraryPkgconfigDepends = [ plplotd-gnome2 ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base glade glib gtk ];
+       executablePkgconfigDepends = [ plplotd-gnome2 ];
        jailbreak = true;
        homepage = "http://yakov.cc/HPlot.html";
        description = "A minimal monadic PLplot interface for Haskell";
@@ -7046,7 +7254,7 @@ self: {
        sha256 = "0dzzq4ksny537b151g6c1jgj2ns143klhdjfbq84srs026pvpvzi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base data-accessor data-accessor-template GLFW OpenGL
        ];
        homepage = "http://bonsaicode.wordpress.com/2009/04/23/hpong-012/";
@@ -7062,10 +7270,10 @@ self: {
      mkDerivation {
        pname = "HROOT";
        version = "0.8";
-       revision = "1";
        sha256 = "0q6n5j1hzl8fk6a0ziqjzfi1515shqzqxx0argbvnhw85vjajvqf";
+       revision = "1";
        editedCabalFile = "43058ba39e0517740c45b1087a39e4f84912c1a3c500504850395d4f2fda0917";
-       buildDepends = [
+       libraryHaskellDepends = [
          base fficxx-runtime HROOT-core HROOT-graf HROOT-hist HROOT-io
          HROOT-math
        ];
@@ -7081,7 +7289,7 @@ self: {
        pname = "HROOT-core";
        version = "0.8";
        sha256 = "1f40n224r640dp3g4x9kwnpcjpll3axs3pc71nqcch748bh0f60n";
-       buildDepends = [ base fficxx-runtime ];
+       libraryHaskellDepends = [ base fficxx-runtime ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Core modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -7094,7 +7302,9 @@ self: {
        pname = "HROOT-graf";
        version = "0.8";
        sha256 = "1jh2c6wrzajrzbkw77fsvjnj7nhrfx192hs9vlkd0aja2xy7z0bw";
-       buildDepends = [ base fficxx-runtime HROOT-core HROOT-hist ];
+       libraryHaskellDepends = [
+         base fficxx-runtime HROOT-core HROOT-hist
+       ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Graf modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -7107,7 +7317,7 @@ self: {
        pname = "HROOT-hist";
        version = "0.8";
        sha256 = "0yzlqg2nzw26j1a2i8zaihwd22bl7y9cbxxps99vy7fxph81ikh1";
-       buildDepends = [ base fficxx-runtime HROOT-core ];
+       libraryHaskellDepends = [ base fficxx-runtime HROOT-core ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Hist modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -7120,7 +7330,7 @@ self: {
        pname = "HROOT-io";
        version = "0.8";
        sha256 = "0sbh6jz24xv2pvh0m2f26aqj3fzkmyiqp8p4g1vcnh8jlisdn6k2";
-       buildDepends = [ base fficxx-runtime HROOT-core ];
+       libraryHaskellDepends = [ base fficxx-runtime HROOT-core ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT IO modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -7133,7 +7343,7 @@ self: {
        pname = "HROOT-math";
        version = "0.8";
        sha256 = "0qmsvrhxzdw2n0lw8x06l2sbx36xm77nv55kpps1h60l4l0nmzwm";
-       buildDepends = [ base fficxx-runtime HROOT-core ];
+       libraryHaskellDepends = [ base fficxx-runtime HROOT-core ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Math modules";
        license = stdenv.lib.licenses.lgpl21;
@@ -7148,7 +7358,7 @@ self: {
        sha256 = "0bg0b8260cd2l8q7ccijwqg1yz49mkifv1r0a5q1hrbsagvac4nf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base directory haskell98 ];
+       executableHaskellDepends = [ array base directory haskell98 ];
        homepage = "http://boegel.kejo.be/ELIS/Haskell/HRay/";
        description = "Haskell raytracer";
        license = stdenv.lib.licenses.bsd3;
@@ -7165,7 +7375,10 @@ self: {
        sha256 = "10zkg2lhvzxi6csyrah8kw3xd1da60im0whpg884hpnf5h220086";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base Cabal containers directory filepath parsec process unix
+       ];
+       executableHaskellDepends = [
          array base Cabal containers directory filepath parsec process unix
        ];
        jailbreak = true;
@@ -7185,10 +7398,10 @@ self: {
        sha256 = "16k853180smf2smw8ch3mzjv14imj9w2ssh61hcc23carhrsbg9p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base csv mersenne-random-pure64 monad-mersenne-random mtl split
-         vector
+       libraryHaskellDepends = [
+         base mersenne-random-pure64 monad-mersenne-random mtl split vector
        ];
+       executableHaskellDepends = [ csv ];
        homepage = "http://github.com/mjsottile/hsgep/";
        description = "Gene Expression Programming evolutionary algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -7206,7 +7419,7 @@ self: {
        sha256 = "17ysn131xskx4s1g5kg08zy141q3q16bns4bsg3yjzvf6cjpz2kq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath hslogger MissingH mtl process
          regex-base regex-compat regex-posix unix
        ];
@@ -7224,7 +7437,7 @@ self: {
        pname = "HSHHelpers";
        version = "0.24";
        sha256 = "0mz25xak9fkircdxcpzrf3rym9l5ivhifk7dqm2xki3mv6fw214d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring DebugTraceHelpers directory filepath HSH
          HStringTemplateHelpers MissingH mtl regex-pcre unix
        ];
@@ -7240,7 +7453,7 @@ self: {
        pname = "HSlippyMap";
        version = "2.2";
        sha256 = "17n1kpva97lwhwg2vs7875bfqlwcq6xpl2agqc53qb7j4153p559";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/j4/HSlippyMap";
        description = "OpenStreetMap Slippy Map";
@@ -7255,11 +7468,11 @@ self: {
        pname = "HSmarty";
        version = "0.2.0.3";
        sha256 = "07m7xpwv565cf78qyqkd6babpl2b7jnq88psv55jclzdqlsvv0rq";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-expr base HTTP mtl scientific text
          unordered-containers vector
        ];
-       testDepends = [ aeson attoparsec base HTF text ];
+       testHaskellDepends = [ aeson attoparsec base HTF text ];
        homepage = "https://github.com/agrafix/HSmarty";
        description = "Small template engine";
        license = stdenv.lib.licenses.bsd3;
@@ -7274,7 +7487,7 @@ self: {
        pname = "HSoundFile";
        version = "0.2.2";
        sha256 = "0qlz17dzlysj36zz3s8dzwvfdr9rdfp6gnabc262iraidqapshzb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring filepath haskell98 mtl parallel
        ];
        homepage = "http://mml.music.utexas.edu/jwlato/HSoundFile";
@@ -7292,7 +7505,7 @@ self: {
        pname = "HStringTemplate";
        version = "0.8.3";
        sha256 = "064x4d9vhzln1c8ka3saqdz6a8skn3xbhaxrf3rjwqgmjg4v3mk3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base blaze-builder bytestring containers deepseq directory
          filepath mtl old-locale parsec pretty syb template-haskell text
          time void
@@ -7309,7 +7522,7 @@ self: {
        pname = "HStringTemplateHelpers";
        version = "0.0.14";
        sha256 = "1dgr28hxm9zlxl13ms9mn63rbm5ya6bkyys6q0kbns2y2zwmkswh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory FileManipCompat filepath HSH
          HStringTemplate mtl safe strict
        ];
@@ -7325,7 +7538,7 @@ self: {
        pname = "HSvm";
        version = "0.1.0.2.89";
        sha256 = "1mb8kclb7631ihj356g5ddf758cnwz9y6r5ck72daa7vndz01aa9";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Haskell Bindings for libsvm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7345,13 +7558,16 @@ self: {
        sha256 = "0lrc60ydqsizz3rdyijqywncr1bcj3b95mgn99bz5q4yb3l6dc54";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array base base64-bytestring bytestring containers cpphs Diff
          directory haskell-src HUnit lifted-base monad-control mtl old-time
          pretty process QuickCheck random regex-compat text time unix vector
          xmlgen
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base cpphs directory HUnit mtl old-time random text
+       ];
+       testHaskellDepends = [
          aeson aeson-pretty base bytestring directory filepath HUnit mtl
          process random regex-compat template-haskell temporary text
          unordered-containers
@@ -7363,7 +7579,7 @@ self: {
 
   "HTTP" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
-     , conduit-extra, deepseq, ghc, http-types, httpd-shed, HUnit, mtl
+     , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
      , network, network-uri, old-time, parsec, pureMD5, split
      , test-framework, test-framework-hunit, wai, warp
      }:
@@ -7371,11 +7587,11 @@ self: {
        pname = "HTTP";
        version = "4000.2.20";
        sha256 = "0nyqdxr5ls2dxkf4a1f3x15xzwdm46ppn99nkcbhswlr6s3cq1s4";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring mtl network network-uri old-time parsec
        ];
-       testDepends = [
-         base bytestring case-insensitive conduit conduit-extra deepseq ghc
+       testHaskellDepends = [
+         base bytestring case-insensitive conduit conduit-extra deepseq
          http-types httpd-shed HUnit mtl network network-uri pureMD5 split
          test-framework test-framework-hunit wai warp
        ];
@@ -7391,7 +7607,7 @@ self: {
        pname = "HTTP-Simple";
        version = "0.2";
        sha256 = "1294pn82fbskgfw2mh3ri31wab5l9y3j0g50dcx5sqbhz79pnj9w";
-       buildDepends = [ base HTTP network ];
+       libraryHaskellDepends = [ base HTTP network ];
        homepage = "http://www.b7j0c.org/content/haskell-http.html";
        description = "DEPRECATED Enable simple wrappers to Network.HTTP";
        license = stdenv.lib.licenses.bsd3;
@@ -7408,7 +7624,7 @@ self: {
        sha256 = "0c0igscng6gqhabmvvgappsbzbhkpybcx7vr8yd72pqh988ml4zv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers deepseq hylolib mtl strict
        ];
        homepage = "http://www.glyc.dc.uba.ar/intohylo/htab.php";
@@ -7426,7 +7642,9 @@ self: {
        sha256 = "0h3pr4lyx14zndwbas5ba8sg3s84sq19qhh6pcqpy4v2ajfyyfqc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base mtl random SDL SDL-image SDL-ttf ];
+       executableHaskellDepends = [
+         array base mtl random SDL SDL-image SDL-ttf
+       ];
        homepage = "http://github.com/snkkid/HTicTacToe";
        description = "An SDL tic-tac-toe game";
        license = stdenv.lib.licenses.mit;
@@ -7439,7 +7657,7 @@ self: {
        pname = "HUnit";
        version = "1.2.5.2";
        sha256 = "0hcs6qh8bqhip1kkjjnw7ccgcsmawdz5yvffjj5y8zd2vcsavx8a";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        homepage = "http://hunit.sourceforge.net/";
        description = "A unit testing framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -7451,7 +7669,7 @@ self: {
        pname = "HUnit-Diff";
        version = "0.1";
        sha256 = "0dlsx6qicnrqkhb52jbgh31f0y6lxh32yl5gr6bg3fnqr36vc6x6";
-       buildDepends = [ ansi-terminal base Diff groom HUnit ];
+       libraryHaskellDepends = [ ansi-terminal base Diff groom HUnit ];
        jailbreak = true;
        homepage = "https://github.com/dag/HUnit-Diff";
        description = "Assertions for HUnit with difference reporting";
@@ -7468,11 +7686,11 @@ self: {
        pname = "HUnit-Plus";
        version = "1.0.1";
        sha256 = "0ph4560i8nb4ggbfc2yfam0mgfl21pnpgj0x0v9dh86lbfj9p4ki";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal cmdargs containers hashable hexpat hostname
          old-locale parsec time timeit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring Cabal cmdargs containers directory hashable hexpat
          hostname old-locale parsec time timeit
        ];
@@ -7488,8 +7706,8 @@ self: {
        pname = "HUnit-approx";
        version = "1.0";
        sha256 = "0svkjvcanjsi5bhn9b91jhig36np5imr3qyj6b1s5msm7wmlk3v1";
-       buildDepends = [ base HUnit ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base HUnit ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/goldfirere/HUnit-approx";
        description = "Approximate equality for floating point numbers with HUnit";
        license = stdenv.lib.licenses.bsd3;
@@ -7507,7 +7725,12 @@ self: {
        sha256 = "094j5bafrwr0d5sz3fidz7k328w6f4nqhja2c9gf89759nc470ss";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base base64-string binary bytestring crypto-api enumerator HLogger
+         network pureMD5 random regex-posix text transformers utf8-string
+         xml-enumerator xml-types
+       ];
+       executableHaskellDepends = [
          base base64-string binary bytestring crypto-api enumerator HLogger
          network pureMD5 random regex-posix text transformers utf8-string
          xml-enumerator xml-types
@@ -7527,7 +7750,7 @@ self: {
        pname = "HXQ";
        version = "0.19.0";
        sha256 = "1k2lway8nfy6vwsxq7kmjh25q5diw8sy4hrqzn3irk6rlg7zh77l";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base haskeline haskell98 HTTP mtl regex-base regex-compat
          template-haskell
        ];
@@ -7545,7 +7768,7 @@ self: {
        sha256 = "029khjgyay3pzydq7bj6rvlglmm66wj728y4fadqvh6yxr7ddc0s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html";
        description = "HaLeX enables modelling, manipulation and animation of regular languages";
        license = stdenv.lib.licenses.publicDomain;
@@ -7558,7 +7781,7 @@ self: {
        pname = "HaMinitel";
        version = "0.1.0.0";
        sha256 = "0q7fq5z0wrk2qg9n715033yp25dpl73g6iqkbvxbg2ahp9caq458";
-       buildDepends = [ base bytestring serialport stm ];
+       libraryHaskellDepends = [ base bytestring serialport stm ];
        jailbreak = true;
        homepage = "https://github.com/Zigazou/HaMinitel";
        description = "An Haskell library to drive the french Minitel through a serial port";
@@ -7571,7 +7794,7 @@ self: {
        pname = "HaPy";
        version = "0.1.1.1";
        sha256 = "0li04k27pkq7ci1dfx4sl022ivl4gjqy5ny25jszifwrx4n4pmwz";
-       buildDepends = [ base template-haskell th-lift ];
+       libraryHaskellDepends = [ base template-haskell th-lift ];
        homepage = "https://github.com/sakana/HaPy";
        description = "Haskell bindings for Python";
        license = stdenv.lib.licenses.mit;
@@ -7591,13 +7814,19 @@ self: {
        sha256 = "19vldhyl1636g05yc1kg9ih3z9rlcvcl596slc1hqwkd564nld36";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory dual-tree filepath ghc ghc-mod ghc-paths
+         ghc-prim ghc-syb-utils haskell-token-utils hslogger monoid-extras
+         mtl old-time pretty rosezipper semigroups Strafunski-StrategyLib
+         syb syz time transformers
+       ];
+       executableHaskellDepends = [
          array base containers directory dual-tree filepath ghc ghc-mod
          ghc-paths ghc-prim ghc-syb-utils haskell-token-utils hslogger
          monoid-extras mtl old-time parsec pretty rosezipper semigroups
          Strafunski-StrategyLib syb syz time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers deepseq Diff directory dual-tree filepath ghc
          ghc-mod ghc-paths ghc-prim ghc-syb-utils haskell-token-utils
          hslogger hspec HUnit monoid-extras mtl old-time process QuickCheck
@@ -7619,11 +7848,13 @@ self: {
        pname = "HaTeX";
        version = "3.16.1.1";
        sha256 = "0xi89wclnkrl17jl3ymvsvg802aj201m4lp0rg9adgmrrdgz042p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers matrix parsec QuickCheck text
          transformers wl-pprint-extras
        ];
-       testDepends = [ base QuickCheck tasty tasty-quickcheck text ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-quickcheck text
+       ];
        homepage = "http://wrongurl.net/haskell/HaTeX";
        description = "The Haskell LaTeX library";
        license = stdenv.lib.licenses.bsd3;
@@ -7639,7 +7870,7 @@ self: {
        sha256 = "1cfn823xfp4962x4ww3dawm017nkg00wxa20b8nbq3pmjjnpb2xl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory filepath ghc haddock
          haskell-src-exts mtl parsec
        ];
@@ -7657,7 +7888,7 @@ self: {
        pname = "HaTeX-qq";
        version = "0.0.1.1";
        sha256 = "1kjhdg9vm7n07zxgdkmqkgwpf2204hrjwslnyhg8i7f07cd3pdrl";
-       buildDepends = [
+       libraryHaskellDepends = [
          antiquoter base haskell-src-meta HaTeX template-haskell text
          uniplate
        ];
@@ -7676,7 +7907,8 @@ self: {
        sha256 = "1hh324i7gvazlkm3vfmzah41h2hlxwb2k8g1z8dmfbif6pmp0apk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base logict ];
+       executableHaskellDepends = [
          base HUnit logict QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck
        ];
@@ -7696,10 +7928,10 @@ self: {
        sha256 = "1iq74dnxvannx9x1whqc3ixn93r4v5z7b4yv21n9q5963kpafj34";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers directory filepath polyparse pretty
-         random
+       libraryHaskellDepends = [
+         base bytestring containers filepath polyparse pretty random
        ];
+       executableHaskellDepends = [ base directory polyparse pretty ];
        homepage = "http://projects.haskell.org/HaXml/";
        description = "Utilities for manipulating XML documents";
        license = "LGPL";
@@ -7715,9 +7947,8 @@ self: {
        sha256 = "1bp7ngsh655x0iamb8bhn2sqkpg3p6mhg0n0fgqz5k4pjskjyavy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers network old-locale text time vty vty-ui
-       ];
+       libraryHaskellDepends = [ base containers network old-locale ];
+       executableHaskellDepends = [ text time vty vty-ui ];
        homepage = "http://github.com/dmalikov/HaCh";
        description = "Simple chat";
        license = stdenv.lib.licenses.mit;
@@ -7734,7 +7965,10 @@ self: {
        sha256 = "1j8lw1c5asx40fag9gd6ni19c0z0q46f55yry5cj94v4s5m2gzbw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Crypto directory hint mtl old-time parsec
+       ];
+       executableHaskellDepends = [
          base Crypto directory hdaemonize hint mtl old-time parsec
        ];
        homepage = "http://patch-tag.com/publicrepos/Hackmail";
@@ -7751,11 +7985,11 @@ self: {
        pname = "Haggressive";
        version = "0.1.0.4";
        sha256 = "08f8i8bmnjv255xzpasa7drd83fh82qjm49mscn6dmiw6yp47vz1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal cassava containers directory HUnit PSQueue
          text tokenize tuple vector
        ];
-       testDepends = [ base Cabal containers HUnit tuple vector ];
+       testHaskellDepends = [ base Cabal containers HUnit tuple vector ];
        homepage = "https://github.com/Pold87/Haggressive";
        description = "Aggression analysis for Tweets on Twitter";
        license = stdenv.lib.licenses.gpl2;
@@ -7768,7 +8002,7 @@ self: {
        pname = "HandlerSocketClient";
        version = "0.0.5";
        sha256 = "1jp8cwlp6h1wvvkh71813i3lzxc7ckxzc7nvvcsjvcz0apxcl7vv";
-       buildDepends = [ base bytestring network ];
+       libraryHaskellDepends = [ base bytestring network ];
        homepage = "https://github.com/wuxb45/HandlerSocket-Haskell-Client";
        description = "Haskell implementation of a HandlerSocket client (API)";
        license = stdenv.lib.licenses.bsd3;
@@ -7784,11 +8018,12 @@ self: {
        sha256 = "1yzfrvivvxwlaiqwbjx27rxwq9mmnnpb512vwklzw7nyzg9xmqha";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HTTP hxt hxt-http mtl network network-uri parsec
          transformers
        ];
-       testDepends = [ base hspec hxt ];
+       executableHaskellDepends = [ base hxt ];
+       testHaskellDepends = [ base hspec hxt ];
        homepage = "https://github.com/egonSchiele/HandsomeSoup";
        description = "Work with HTML more easily in HXT";
        license = stdenv.lib.licenses.bsd3;
@@ -7806,12 +8041,17 @@ self: {
        sha256 = "1l2w53ispw7sg1daxnynfc94njzm6w838a8ij7rpzd3nxa2b596v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base binary cmdargs deepseq Diff directory filepath ghc-prim
+       libraryHaskellDepends = [
+         array base binary deepseq Diff directory filepath ghc-prim
          HarmTrace-Base HCodecs hmatrix hmatrix-gsl-stats instant-generics
-         ListLike mtl parallel parseargs process sox template-haskell
+         ListLike mtl parallel parseargs process template-haskell
          uu-parsinglib vector
        ];
+       executableHaskellDepends = [
+         array base binary cmdargs deepseq Diff directory filepath ghc-prim
+         HarmTrace-Base hmatrix hmatrix-gsl-stats instant-generics ListLike
+         mtl parallel process sox template-haskell uu-parsinglib vector
+       ];
        jailbreak = true;
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/HarmTrace";
        description = "Harmony Analysis and Retrieval of Music";
@@ -7827,10 +8067,10 @@ self: {
        pname = "HarmTrace-Base";
        version = "1.4.0.1";
        sha256 = "174a05473577vyyf6rz5bq3b9wrgmsbz23xdg945pfc78lb6n70j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers ghc-prim ListLike uu-parsinglib
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary containers ghc-prim ListLike QuickCheck uu-parsinglib
        ];
        jailbreak = true;
@@ -7848,7 +8088,7 @@ self: {
        pname = "HasGP";
        version = "0.1";
        sha256 = "1sw5l74p2md4whq0c1xifcnwbb525i84n1razjxs7cpf8gicgggx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell98 hmatrix hmatrix-special mtl parsec random
        ];
        jailbreak = true;
@@ -7868,7 +8108,7 @@ self: {
        sha256 = "0jh506p0clwyb5wwrhlgbc5xp7w6smz5vky3lc8vhnwvwk324qcj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base list-tries monad-loops mtl numbers parsec
        ];
        jailbreak = true;
@@ -7888,7 +8128,7 @@ self: {
        sha256 = "0yn525sr7i2nwf4y44va00aswnphn89072zaqjr2i0f1n1jjaxpl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory ghc haskell98 parsec process readline regex-compat
          unix
        ];
@@ -7904,7 +8144,7 @@ self: {
        pname = "HaskellForMaths";
        version = "0.4.8";
        sha256 = "0yn2nj6irmj24j1djvnnq26i2lbf9g9x1wdhmcrk519glcn5k64j";
-       buildDepends = [ array base containers random ];
+       libraryHaskellDepends = [ array base containers random ];
        homepage = "http://haskellformaths.blogspot.com/";
        description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
        license = stdenv.lib.licenses.bsd3;
@@ -7916,7 +8156,7 @@ self: {
        pname = "HaskellLM";
        version = "0.1.2";
        sha256 = "0baqn15zdhlinf4v3c244005nb3wm63gpr0w6fy7g9gmn8a00scq";
-       buildDepends = [ base hmatrix ];
+       libraryHaskellDepends = [ base hmatrix ];
        description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm";
        license = "GPL";
      }) {};
@@ -7927,7 +8167,7 @@ self: {
        pname = "HaskellNN";
        version = "0.1.3";
        sha256 = "0i5jqhkxna1kq361hh66830x4z5m782pp898g9ggfvdiwpp8phmr";
-       buildDepends = [ base hmatrix random ];
+       libraryHaskellDepends = [ base hmatrix random ];
        description = "High Performance Neural Network in Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7941,7 +8181,7 @@ self: {
        pname = "HaskellNet";
        version = "0.4.5";
        sha256 = "1d34zknk8knjsw1w3bl91z8qc47vqb6mhfh6rq1rm93na616i3p5";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base64-string bytestring cryptohash mime-mail mtl
          network old-time pretty text
        ];
@@ -7958,7 +8198,7 @@ self: {
        pname = "HaskellNet-SSL";
        version = "0.3.0.0";
        sha256 = "1n1jlnxp16dmfkw4yh1bsbylsk5c1kyixh3gi81202fjx3q9z2pf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring connection data-default HaskellNet network tls
        ];
        homepage = "https://github.com/dpwright/HaskellNet-SSL";
@@ -7978,7 +8218,7 @@ self: {
        sha256 = "0dy9irl085jw7wz6y50566rwsj05ymp8g2xp2444vg12ryd5dra1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cereal cml containers directory hopenssl hslogger
          HTTP HUnit mtl network parsec pretty QuickCheck random
          random-shuffle test-framework test-framework-hunit
@@ -7997,7 +8237,7 @@ self: {
        sha256 = "0gnf8x4dqz3bwyhrcn17qci2rzmms3r0cyr7cgf593jlkxiq287q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cmdargs text ];
+       executableHaskellDepends = [ base cmdargs text ];
        jailbreak = true;
        homepage = "https://github.com/mrLSD/HaskellTutorials";
        description = "Haskell Tutorials by Evgeny Ukhanov";
@@ -8014,7 +8254,7 @@ self: {
        sha256 = "0v171rzpbh4w5kxzbc9h2x4kha1ykw4vk69scfpmdz5iqih2bqz8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers HGL hmatrix MonadRandom random Yampa
        ];
        jailbreak = true;
@@ -8035,7 +8275,7 @@ self: {
        pname = "Hawk";
        version = "0.0.2";
        sha256 = "0g7dgj3asxwcjg43nzhjp7agvnzv882xhgbrr7jnpdckywkgacgq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-trie cgi containers convertible
          data-default dataenc directory filepath hack HDBC HDBC-sqlite3
          hslogger hslogger-template HTTP hxt json-b MonadCatchIO-mtl mtl
@@ -8062,7 +8302,7 @@ self: {
        sha256 = "0bpkkdwgwf7xagp4rda1g07mdglzvl4hzq2jif7c3s8j7f6zq48c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring bzlib containers deepseq enummapset filepath
          Holumbus-Searchengine hxt hxt-cache hxt-charproperties hxt-curl
          hxt-http hxt-regex-xmlschema hxt-unicode hxt-xpath json
@@ -8082,8 +8322,8 @@ self: {
        pname = "Hclip";
        version = "3.0.0.3";
        sha256 = "0h6q44yv4m325gdwpvkxz31syy6qwdsixfanzr3fx1v5nbhm22af";
-       buildDepends = [ base mtl process strict ];
-       testDepends = [ base tasty tasty-hunit ];
+       libraryHaskellDepends = [ base mtl process strict ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/jetho/Hclip";
        description = "A small cross-platform library for reading and modifying the system clipboard";
        license = stdenv.lib.licenses.bsd3;
@@ -8099,7 +8339,10 @@ self: {
        sha256 = "0z0sa658fngv68611k76ncf5j59v517xchhw2y84blj97fl6jkn9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base editline mtl parsec pretty process QuickCheck regex-posix
+       ];
+       executableHaskellDepends = [
          base editline mtl parsec pretty process QuickCheck regex-posix
        ];
        description = "Line oriented editor";
@@ -8116,7 +8359,7 @@ self: {
        pname = "Hermes";
        version = "0.0.4";
        sha256 = "0j5vg3rvf4hbvg6jan4im7ijqffy6k9dvijfwxjcn164qjzh6xb3";
-       buildDepends = [
+       libraryHaskellDepends = [
          AES base bytestring cereal containers hslogger monads-tf network
          old-time random random-shuffle RSA SHA2 stm syb time transformers
          unamb yjtools
@@ -8136,7 +8379,7 @@ self: {
        pname = "Hieroglyph";
        version = "3.89";
        sha256 = "0dkvvk3qwn72vn4kc0q2iv6raxslrxf0ypr0sn7i0fjds3cjxs6s";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base buster bytestring cairo colour containers glib GLUT gtk
          gtkglext IfElse mtl OpenGL parallel pretty random
        ];
@@ -8155,7 +8398,7 @@ self: {
        pname = "HiggsSet";
        version = "0.1.1";
        sha256 = "1k0qlpm4akzx820b0j3g3f562ailxa56sa41268xyq3046xdpyl1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq mtl text th-expand-syns TrieMap
          vector
        ];
@@ -8171,7 +8414,9 @@ self: {
        pname = "Hipmunk";
        version = "5.2.0.17";
        sha256 = "1yxs1v9pzb35g3zlvycsx762dk8swrbry7ajr50zlq667j20n4a8";
-       buildDepends = [ array base containers StateVar transformers ];
+       libraryHaskellDepends = [
+         array base containers StateVar transformers
+       ];
        homepage = "https://github.com/meteficha/Hipmunk";
        description = "A Haskell binding for Chipmunk";
        license = "unknown";
@@ -8187,7 +8432,7 @@ self: {
        sha256 = "075am1d0hjbhnibk2x56fbh4ybw5pavfmqk2dz4yjw7yh264vcs7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers GLFW Hipmunk OpenGL StateVar transformers
        ];
        jailbreak = true;
@@ -8202,9 +8447,8 @@ self: {
        pname = "Histogram";
        version = "0.1.0.2";
        sha256 = "00f0a3lbpc7s70lzmnf9a7hjzc3yv8nfxcvz5nparr34x585zbxl";
-       buildDepends = [ base containers gnuplot ];
+       libraryHaskellDepends = [ base containers gnuplot ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hmpf" = callPackage
@@ -8217,7 +8461,7 @@ self: {
        sha256 = "0lw2d9yv3zxqv20v96czx0msahbyk0rc5d68gj567dxnyb377yx7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile Crypto HTTP mtl network time unix utf8-string
        ];
        description = "An MPD client designed for a Home Theatre PC";
@@ -8236,14 +8480,13 @@ self: {
        sha256 = "0b6jljwn8dq2szhz3k9axfphv3yi0zq7rhligvlwa5p8hr49wblx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath libgraph mtl process
          RBTree regex-posix template-haskell threepenny-gui
        ];
        homepage = "http://maartenfaddegon.nl";
        description = "Lighweight algorithmic debugging based on observing intermediate values and the cost centre stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HoleyMonoid" = callPackage
@@ -8252,7 +8495,7 @@ self: {
        pname = "HoleyMonoid";
        version = "0.1.1";
        sha256 = "1z3d80r6w8n7803q52xlp8mzpk87q1pr3mnz6dswp39q3gygr9fr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/MedeaMelana/HoleyMonoid";
        description = "Monoids with holes";
        license = stdenv.lib.licenses.bsd3;
@@ -8269,7 +8512,7 @@ self: {
        sha256 = "1mhljxyfv02pfy2lyh10nlv5x05qvv37ij9i6c8c17f5b5qcgc78";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers deepseq haskell98 hslogger
          hxt network random readline stm time unix
        ];
@@ -8291,7 +8534,7 @@ self: {
        sha256 = "0dqwj7xpw1lidv7ixfm1wzfx6psrzl2q08x3scyiskpm3a2l67q8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq directory
          extensible-exceptions haskell98 Holumbus-Distribution
          Holumbus-Storage hslogger hxt network readline time unix
@@ -8312,7 +8555,7 @@ self: {
        pname = "Holumbus-Searchengine";
        version = "1.2.3";
        sha256 = "1kx0j4f13fj6k3xlhh5cmlb7lz35vyqd0sp913yy8yc2h56ybbqq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring bzlib containers deepseq directory
          enummapset filepath hslogger hxt hxt-cache hxt-curl
          hxt-regex-xmlschema hxt-unicode mtl network parallel parsec process
@@ -8335,7 +8578,7 @@ self: {
        sha256 = "1zs6m3rsxh3886idcn0qm056bzv9yllgf3n2qsfa97cpbzhah54q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory haskell98
          Holumbus-Distribution hslogger hxt network random time unix
        ];
@@ -8351,7 +8594,7 @@ self: {
        pname = "Homology";
        version = "0.1.1";
        sha256 = "12cqfy2vpshly1rgjclzpnhb094s5wr038ahh5agsx03x6mnsr9n";
-       buildDepends = [ base containers vector ];
+       libraryHaskellDepends = [ base containers vector ];
        homepage = "http://www.math.ucla.edu/~damek";
        description = "Compute the homology of a chain complex";
        license = "GPL";
@@ -8366,12 +8609,12 @@ self: {
        pname = "HongoDB";
        version = "0.0.1";
        sha256 = "19dwxv7fjk2k55mxgsc2gjx5jp9vr77yg01292gdj1piwmxx459v";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-binary base blaze-builder bytestring
          directory enumerator hashable monad-control mtl unix
          unix-bytestring unordered-containers
        ];
-       testDepends = [ base process random ];
+       testHaskellDepends = [ base process random ];
        jailbreak = true;
        description = "A Simple Key Value Store";
        license = stdenv.lib.licenses.bsd3;
@@ -8384,8 +8627,8 @@ self: {
        pname = "HostAndPort";
        version = "0.2.0";
        sha256 = "1rjv6c7j6fdy6gnn1zr5jnfmiqiamsmjfw9h3bx119giw3sjb9hm";
-       buildDepends = [ base parsec ];
-       testDepends = [ base doctest hspec ];
+       libraryHaskellDepends = [ base parsec ];
+       testHaskellDepends = [ base doctest hspec ];
        homepage = "https://github.com/bacher09/hostandport";
        description = "Parser for host and port pairs like localhost:22";
        license = stdenv.lib.licenses.mit;
@@ -8399,7 +8642,7 @@ self: {
        sha256 = "0cmmhljlgb23kr6v8as2cma3cpgr6zpkb11qg6hmq1ilbi363282";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://github.com/Raynes/Hricket";
        description = "A Cricket scoring application";
@@ -8418,13 +8661,17 @@ self: {
        sha256 = "0yjkghshbdbajib35hy3qr8x608i9qi2pgffpi59118krcw6k8mn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory filepath ghc haskell-src-exts old-locale random syb
+         time
+       ];
+       libraryToolDepends = [ cpphs ];
+       executableHaskellDepends = [
          array base cereal containers directory filepath ghc ghc-paths
          haddock haskell-src-exts mtl old-locale process QuickCheck random
          syb time
        ];
-       testDepends = [ base directory filepath process ];
-       buildTools = [ cpphs ];
+       testHaskellDepends = [ base directory filepath process ];
        jailbreak = true;
        homepage = "http://blog.zhox.com/category/hs2lib/";
        description = "A Library and Preprocessor that makes it easier to create shared libs from Haskell programs";
@@ -8438,7 +8685,7 @@ self: {
        pname = "HsASA";
        version = "0.2";
        sha256 = "1kdf2yq3v8lr84h2pf1ydi6vrqfr685vbkxjz4ai5wd2mij8i361";
-       buildDepends = [ array base random ];
+       libraryHaskellDepends = [ array base random ];
        homepage = "http://repetae.net/recent/out/HsASA.html";
        description = "A haskell interface to Lester Ingber's adaptive simulating annealing code";
        license = stdenv.lib.licenses.bsd3;
@@ -8450,7 +8697,7 @@ self: {
        pname = "HsHaruPDF";
        version = "0.0.0";
        sha256 = "1yifhxk1m3z2i7gaxgwlmk6cv2spbpx8fny4sn59ybca8wd9z7ps";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell binding to libharu (http://libharu.sourceforge.net/)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8464,10 +8711,10 @@ self: {
        pname = "HsHyperEstraier";
        version = "0.4";
        sha256 = "0q7nngghplw97q5cmayqkkixa5lbprilvkcv0260yaz7wg5xpqk8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bytestring network text
        ];
-       pkgconfigDepends = [ hyperestraier qdbm ];
+       libraryPkgconfigDepends = [ hyperestraier qdbm ];
        jailbreak = true;
        homepage = "http://cielonegro.org/HsHyperEstraier.html";
        description = "HyperEstraier binding for Haskell";
@@ -8481,8 +8728,8 @@ self: {
        pname = "HsJudy";
        version = "0.2";
        sha256 = "1ypdsjy7gn6b3ynn17fcpirgwq3017jahm3pj5fh4qr6zr1cljkh";
-       buildDepends = [ base bytestring containers ];
-       extraLibraries = [ Judy ];
+       libraryHaskellDepends = [ base bytestring containers ];
+       librarySystemDepends = [ Judy ];
        homepage = "http://www.pugscode.org/";
        description = "Judy bindings, and some nice APIs";
        license = stdenv.lib.licenses.bsd3;
@@ -8497,11 +8744,13 @@ self: {
        pname = "HsOpenSSL";
        version = "0.11.1.1";
        sha256 = "1hf4xgc2488hm0y9isrl7mxlacf1iazb6h1l1wz8dab8x5sf0qaa";
-       buildDepends = [ base bytestring network old-locale time ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring network old-locale time
+       ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit
        ];
-       extraLibraries = [ openssl ];
        homepage = "https://github.com/phonohawk/HsOpenSSL";
        description = "Partial OpenSSL binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
@@ -8513,7 +8762,7 @@ self: {
        pname = "HsOpenSSL-x509-system";
        version = "0.1.0.2";
        sha256 = "16r82d6mk5l1pb0vvc16d1cn5pi4wg9k83y7vr9gl9ackz345jgc";
-       buildDepends = [ base bytestring HsOpenSSL unix ];
+       libraryHaskellDepends = [ base bytestring HsOpenSSL unix ];
        homepage = "https://github.com/redneb/HsOpenSSL-x509-system";
        description = "Use the system's native CA certificate store with HsOpenSSL";
        license = stdenv.lib.licenses.bsd3;
@@ -8525,7 +8774,9 @@ self: {
        pname = "HsParrot";
        version = "0.0.2.20120717";
        sha256 = "19f95cyxcyhsk2x13l7csahgnn8rs029s3hdlxp5z0d3a9vb41gd";
-       buildDepends = [ base bytestring HsSyck pretty pugs-DrIFT ];
+       libraryHaskellDepends = [
+         base bytestring HsSyck pretty pugs-DrIFT
+       ];
        description = "Haskell integration with Parrot virtual machine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8537,7 +8788,7 @@ self: {
        pname = "HsPerl5";
        version = "0.0.6";
        sha256 = "0czhibr8lw4mjinwszjp4nh1ifi1xgkynwbjs6l3k97dqfd8bw4v";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell interface to embedded Perl 5 interpreter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8549,7 +8800,7 @@ self: {
        pname = "HsSVN";
        version = "0.4.3.3";
        sha256 = "1yx4dzcjmykk4nzrh888jhikb8x635dpx7g27rgnlaiy5nid3pc7";
-       buildDepends = [ base bytestring mtl stm ];
+       libraryHaskellDepends = [ base bytestring mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/phonohawk/HsSVN";
        description = "Partial Subversion (SVN) binding for Haskell";
@@ -8563,7 +8814,9 @@ self: {
        pname = "HsSyck";
        version = "0.53";
        sha256 = "17r4jwnkjinmzpw9m2crjwccdyv9wmpljnv1ldgljkr9p9mb5ywf";
-       buildDepends = [ base bytestring hashtables syb utf8-string ];
+       libraryHaskellDepends = [
+         base bytestring hashtables syb utf8-string
+       ];
        description = "Fast, lightweight YAML loader and dumper";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -8574,7 +8827,7 @@ self: {
        pname = "HsTools";
        version = "0.0.1.1";
        sha256 = "0banfivx4xc0j3c1qmda31gvvrqqsg12fzizcpman2fvdlk7kn5l";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        description = "Haskell helper functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8591,7 +8844,7 @@ self: {
        sha256 = "09v2gcazqlmw7j7sqzzzmsz1jr3mrnfy3p30w9hnp2g430w10r2a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cmdargs data-accessor data-accessor-template
          data-accessor-transformers directory filepath Glob
          GotoT-transformers haskell98 mtl parsec regex-base regex-compat
@@ -8610,10 +8863,10 @@ self: {
      mkDerivation {
        pname = "Hsmtlib";
        version = "2.8.8.8";
-       revision = "1";
        sha256 = "1zb5s5rwcqc90c3zv332k44p7l13ngp9nqci8qalnlbxbypx3hab";
+       revision = "1";
        editedCabalFile = "01f30561cce8648a656f075ba1e1f8c23144e7f10c6377a7949881dc513f8a89";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers parsec pretty process smtLib transformers
        ];
        jailbreak = true;
@@ -8631,7 +8884,7 @@ self: {
        pname = "HueAPI";
        version = "0.2.5";
        sha256 = "1yz0cjacywrv72hj9dqf9c3zqslhcfz68z149hhv49f7g7k5m64i";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers lens lens-aeson mtl transformers wreq
        ];
        homepage = "https://github.com/sjoerdvisscher/HueAPI";
@@ -8647,8 +8900,10 @@ self: {
        pname = "Hungarian-Munkres";
        version = "0.1.5";
        sha256 = "0g2hgcrsfwqp4w3mzg6vwi7lypgqd0b6axaff81wbi27h9n8q4qd";
-       buildDepends = [ base ];
-       testDepends = [ array base Munkres random tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         array base Munkres random tasty tasty-quickcheck
+       ];
        description = "A Linear Sum Assignment Problem (LSAP) solver";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -8659,7 +8914,7 @@ self: {
        pname = "IDynamic";
        version = "0.1";
        sha256 = "1p4h2hxwzp0bxkzh864vkqbwychi0j2c3rqck9vk5kfax5i1jfz8";
-       buildDepends = [ base containers directory ];
+       libraryHaskellDepends = [ base containers directory ];
        jailbreak = true;
        description = "Indexable, serializable form of Data.Dynamic";
        license = stdenv.lib.licenses.bsd3;
@@ -8674,7 +8929,9 @@ self: {
        sha256 = "1r2dbpsmmsgxb43ycsz54zxcyfwanp72r9ry645mjlshg4q360xr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base bytestring containers random ];
+       libraryHaskellDepends = [
+         array base bytestring containers random
+       ];
        homepage = "http://www.alpheccar.org";
        description = "Iterated Function System generation for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -8691,7 +8948,7 @@ self: {
        sha256 = "04il63xafq20jn3m4hahn93xxfrp6whrjvsz974zczxqm41ygb10";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory haskell98 HaXml polyparse pretty process
          wx wxcore
        ];
@@ -8707,7 +8964,7 @@ self: {
        pname = "IOR";
        version = "0.1";
        sha256 = "0iinsva0pwparpg4lkgx8mw8l49rnl1h3zzblp89nkqk5i7qhq8a";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Region based resource management for the IO monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8721,8 +8978,10 @@ self: {
        pname = "IORefCAS";
        version = "0.2.0.1";
        sha256 = "06vfck59x30mqa9h2ljd4r2cx1ks91b9gwcr928brp7filsq9fdb";
-       buildDepends = [ base bits-atomic ghc-prim ];
-       testDepends = [ base bits-atomic ghc-prim HUnit QuickCheck time ];
+       libraryHaskellDepends = [ base bits-atomic ghc-prim ];
+       testHaskellDepends = [
+         base bits-atomic ghc-prim HUnit QuickCheck time
+       ];
        homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
        description = "Atomic compare and swap for IORefs and STRefs";
        license = stdenv.lib.licenses.bsd3;
@@ -8735,7 +8994,7 @@ self: {
        pname = "IOSpec";
        version = "0.3";
        sha256 = "0dwl2nx8fisl1syggwd3060wa50lj5nl9312x4q7pq153cxjppyy";
-       buildDepends = [ base mtl QuickCheck Stream ];
+       libraryHaskellDepends = [ base mtl QuickCheck Stream ];
        description = "A pure specification of the IO monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8748,10 +9007,10 @@ self: {
        pname = "IPv6Addr";
        version = "0.6.0.2";
        sha256 = "0qzrida38n92ngrrnmjpdg3vinjjscijz8fsfr7lyffaw55k6pld";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base iproute network network-info random text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit text
        ];
        homepage = "https://github.com/MichelBoucey/IPv6Addr";
@@ -8765,7 +9024,7 @@ self: {
        pname = "IcoGrid";
        version = "0.1.2";
        sha256 = "0ryb2q5xfddcx2qg019jajac7xvaw2ci5wi094gbrqhhflj7wc8n";
-       buildDepends = [ array base GlomeVec ];
+       libraryHaskellDepends = [ array base GlomeVec ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/IcoGrid";
        description = "Library for generating grids of hexagons and pentagons mapped to a sphere";
@@ -8778,7 +9037,7 @@ self: {
        pname = "IfElse";
        version = "0.85";
        sha256 = "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Anaphoric and miscellaneous useful control-flow";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8789,8 +9048,8 @@ self: {
        pname = "Imlib";
        version = "0.1.2";
        sha256 = "075x1vcrxdwknzbad05l08i5c79svf714yvv6990ffvsfykiilry";
-       buildDepends = [ array base X11 ];
-       extraLibraries = [ imlib2 ];
+       libraryHaskellDepends = [ array base X11 ];
+       librarySystemDepends = [ imlib2 ];
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) imlib2;};
 
@@ -8800,7 +9059,7 @@ self: {
        pname = "ImperativeHaskell";
        version = "2.0.0.1";
        sha256 = "06px87hc6gz7n372lvpbq0g2v2s0aghd3k5a1ajgn5hbxirhnpwb";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/mmirman/ImperativeHaskell";
        description = "A library for writing Imperative style haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -8813,7 +9072,7 @@ self: {
        pname = "IndentParser";
        version = "0.2.1";
        sha256 = "0l9k8md2n0vhjqlvxcaf43i4cv09lnbbbw8vfz7bkbzhbwirs32j";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        homepage = "http://www.cse.iitk.ac.in/~ppk";
        description = "Combinators for parsing indentation based syntatic structures";
        license = "GPL";
@@ -8825,7 +9084,7 @@ self: {
        pname = "IndexedList";
        version = "0.1.0.1";
        sha256 = "1i7gv3iqjj4j026k0ywmksbpjyqxlgb0f6bq2v0p9pkrj5q3jxfm";
-       buildDepends = [ base PeanoWitnesses ];
+       libraryHaskellDepends = [ base PeanoWitnesses ];
        jailbreak = true;
        homepage = "https://github.com/kwf/IndexedList";
        description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous";
@@ -8838,7 +9097,7 @@ self: {
        pname = "InfixApplicative";
        version = "1.1";
        sha256 = "03c0jlnlnqm6faiandfg0kzajffk03aazkrqwav3g4vc3cdqwfgp";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        description = "liftA2 for infix operators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8850,7 +9109,9 @@ self: {
        pname = "Interpolation";
        version = "0.3.0";
        sha256 = "046bx18mlgicp26391gvgzbi0wfwl9rddam3jdfz4lpxva4q9xhv";
-       buildDepends = [ base haskell-src-meta syb template-haskell ];
+       libraryHaskellDepends = [
+         base haskell-src-meta syb template-haskell
+       ];
        description = "Multiline strings, interpolation and templating";
        license = "unknown";
      }) {};
@@ -8861,7 +9122,7 @@ self: {
        pname = "Interpolation-maxs";
        version = "0.3.0";
        sha256 = "0dh8d681h47jngan89vxnf8yhm31vjv8ysf21w6gclzfcl521vgn";
-       buildDepends = [ base syb template-haskell ];
+       libraryHaskellDepends = [ base syb template-haskell ];
        description = "Multiline strings, interpolation and templating";
        license = "unknown";
      }) {};
@@ -8872,8 +9133,8 @@ self: {
        pname = "IntervalMap";
        version = "0.4.0.1";
        sha256 = "0cq0dmmawrss4jjkz3br0lhp37d4k7rd3cinbcyf0bf39dfk6mrf";
-       buildDepends = [ base containers deepseq ];
-       testDepends = [ base Cabal containers deepseq QuickCheck ];
+       libraryHaskellDepends = [ base containers deepseq ];
+       testHaskellDepends = [ base Cabal containers deepseq QuickCheck ];
        homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
        description = "Maps from Intervals to values, with efficient search";
        license = stdenv.lib.licenses.bsd3;
@@ -8887,8 +9148,10 @@ self: {
        pname = "Irc";
        version = "0.1.0.2";
        sha256 = "0qh1j9zy0yfpzdjxn6mypsw555pq2gm5nzys08zj5ilqn5z2r2pi";
-       buildDepends = [ base data-default mtl network transformers ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [
+         base data-default mtl network transformers
+       ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        homepage = "https://github.com/yunxing/Irc";
        description = "DSL for IRC bots";
@@ -8902,7 +9165,7 @@ self: {
        pname = "IrrHaskell";
        version = "0.2";
        sha256 = "1j0m4ib2r84kb7c0s3qpmv3cziq3a2mql4ga9rnqi5pqkqpz2xcc";
-       buildDepends = [ base random time ];
+       libraryHaskellDepends = [ base random time ];
        description = "Haskell FRP binding to the Irrlicht game engine";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8917,8 +9180,8 @@ self: {
        pname = "IsNull";
        version = "0.4.0.0";
        sha256 = "06f03b9my7hix5fvcv9cc0saf9zfwgkvn3210vymlyc1rj450ykm";
-       buildDepends = [ base bytestring containers text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring containers text ];
+       testHaskellDepends = [
          base bytestring containers hspec HUnit QuickCheck
          quickcheck-instances system-filepath text unordered-containers
          vector
@@ -8938,7 +9201,7 @@ self: {
        pname = "JSON-Combinator";
        version = "0.2.8";
        sha256 = "0rdiva15wspaz33dh1g7x6llswsx1l4j51wqyvszzcjzifx2ly6q";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-trie containers failure
          hjson json JSONb parsec text vector
        ];
@@ -8953,7 +9216,9 @@ self: {
        pname = "JSON-Combinator-Examples";
        version = "0.0.1";
        sha256 = "1s5grfgnklnwh55yn5mlg2ibdm7mx2i7hwqs7649gkapda054ywg";
-       buildDepends = [ base bytestring json JSON-Combinator JSONb ];
+       libraryHaskellDepends = [
+         base bytestring json JSON-Combinator JSONb
+       ];
        description = "Example uses of the JSON-Combinator library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8966,12 +9231,16 @@ self: {
      mkDerivation {
        pname = "JSONb";
        version = "1.0.8";
-       revision = "1";
        sha256 = "16gjdlajqvwvq1znyq3vqxfa9vq4xs0ywxpm93v0y1rgmzcfqzj7";
+       revision = "1";
        editedCabalFile = "47b2855a9c5769eadfdbb4eaddca6c66e6de21432d555162f2cc4dcde6e0861a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-nums bytestring-trie
+         containers utf8-string
+       ];
+       executableHaskellDepends = [
          attoparsec base bytestring bytestring-nums bytestring-trie
          containers utf8-string
        ];
@@ -8992,7 +9261,7 @@ self: {
        pname = "JYU-Utils";
        version = "0.1.1.2";
        sha256 = "1c3cxdzbdvmvy1qvy4xvg10zijm8vw48pgh9c8a6mykgncwq6pw9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          lazysmallcheck mtl mwc-random parallel process QuickCheck random
          stm template-haskell unix zlib
@@ -9009,7 +9278,7 @@ self: {
        pname = "JackMiniMix";
        version = "0.1";
        sha256 = "0ivqfk1rac1hv5j6nlsbpcm5yjqwpic34mdq9gf2m63lygqkbwqp";
-       buildDepends = [ base hosc ];
+       libraryHaskellDepends = [ base hosc ];
        homepage = "http://www.renickbell.net/doku.php?id=jackminimix";
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
@@ -9025,7 +9294,9 @@ self: {
        sha256 = "14v0skqf1s54jkscgdcxjh1yv5lcrc5ni44bizx0kw35vf07faah";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring language-java-classfile ];
+       executableHaskellDepends = [
+         base binary bytestring language-java-classfile
+       ];
        description = "A utility to print the SourceFile attribute of one or more Java class files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9039,7 +9310,7 @@ self: {
        sha256 = "06aiiq1bhl8gvhk2agk2rsmqrqf6ac5ym194bm5aq47hmdwi33h9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9055,10 +9326,13 @@ self: {
        sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath mtl parsec pretty syb WebBits
          WebBits-Html
        ];
+       executableHaskellDepends = [
+         base containers mtl parsec pretty syb WebBits WebBits-Html
+       ];
        jailbreak = true;
        homepage = "http://www.cs.brown.edu/research/plt/";
        description = "Design-by-contract for JavaScript";
@@ -9076,12 +9350,12 @@ self: {
        pname = "JsonGrammar";
        version = "1.0.2";
        sha256 = "0baywdqdj0r73rfxm5zk51bgsl014s19j01wnzarfbhak8cpwcdf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers hashable
          language-typescript mtl semigroups stack-prism template-haskell
          text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base HUnit language-typescript stack-prism test-framework
          test-framework-hunit text
        ];
@@ -9099,7 +9373,7 @@ self: {
        pname = "JuicyPixels";
        version = "3.2.5.3";
        sha256 = "1knq5jbwggf59h8a6aa758387q71fpzcvssg8dsr84bqwqqg2dpw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
        ];
@@ -9114,7 +9388,7 @@ self: {
        pname = "JuicyPixels-canvas";
        version = "0.1.0.0";
        sha256 = "0y791kwg9gc3nlz5sbpszd7wiqr5b5bwmgvafyjzk9xnlxlc7xcm";
-       buildDepends = [ base containers JuicyPixels ];
+       libraryHaskellDepends = [ base containers JuicyPixels ];
        jailbreak = true;
        homepage = "http://eax.me/";
        description = "Functions for drawing lines, squares and so on pixel by pixel";
@@ -9127,7 +9401,9 @@ self: {
        pname = "JuicyPixels-repa";
        version = "0.7";
        sha256 = "0fn9i3w8s2ifyg0zsdryyw1nm0c5ybaq0c6jxcggs79x0ngi0mm5";
-       buildDepends = [ base bytestring JuicyPixels repa vector ];
+       libraryHaskellDepends = [
+         base bytestring JuicyPixels repa vector
+       ];
        description = "Convenience functions to obtain array representations of images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9139,7 +9415,7 @@ self: {
        pname = "JuicyPixels-util";
        version = "0.2";
        sha256 = "1b2rx5g8kd83hl50carr02mz21gvkasnsddw1f3pfvfsyfv3yyrc";
-       buildDepends = [ base JuicyPixels vector ];
+       libraryHaskellDepends = [ base JuicyPixels vector ];
        homepage = "https://github.com/fumieval/JuicyPixels-util";
        description = "Convert JuicyPixel images into RGBA format, flip, trim and so on";
        license = stdenv.lib.licenses.bsd3;
@@ -9153,7 +9429,7 @@ self: {
        pname = "JunkDB";
        version = "0.1.1.0";
        sha256 = "0g68khpfiwknqwwa7hv7db0563hsnd3hczfd0p4nx777xqrkh2dx";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary bytestring conduit data-default directory
          filepath mtl network resourcet
        ];
@@ -9169,7 +9445,7 @@ self: {
        pname = "JunkDB-driver-gdbm";
        version = "0.1.1.0";
        sha256 = "1q8sa4w60pv7mgf17zg8yjpjvbzrg2xlpn30myp66vq2kdv293jj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit directory filepath JunkDB mtl resourcet
        ];
        jailbreak = true;
@@ -9185,7 +9461,7 @@ self: {
        pname = "JunkDB-driver-hashtables";
        version = "0.1.1.0";
        sha256 = "0385f0vpp4dy9r9cqh2rr7gpx07fazzqjk9bwrbs4nka4wfnqbv0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit hashable hashtables JunkDB mtl resourcet
        ];
        jailbreak = true;
@@ -9198,7 +9474,7 @@ self: {
        pname = "JustParse";
        version = "2.1";
        sha256 = "16il25s1fb4b6ih6njsqxx7p7x0fc0kcwa5vqn7n7knqph6vvjaa";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/grantslatton/JustParse";
        description = "A simple and comprehensive Haskell parsing library";
        license = stdenv.lib.licenses.publicDomain;
@@ -9210,8 +9486,8 @@ self: {
        pname = "KMP";
        version = "0.1.0.2";
        sha256 = "14dpqfji00jq2rc09l8d1ivphpiwkryjk5sn6lrwxv8mcly3pvhn";
-       buildDepends = [ array base ];
-       testDepends = [ base Cabal ];
+       libraryHaskellDepends = [ array base ];
+       testHaskellDepends = [ base Cabal ];
        homepage = "https://github.com/CindyLinz/Haskell-KMP";
        description = "Knuth–Morris–Pratt string searching algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -9223,7 +9499,7 @@ self: {
        pname = "KSP";
        version = "0.1";
        sha256 = "19sjr9vavxnbv5yp2c01gy6iz1q2abllcsf378n15f3z064ffqn6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/frosch03/kerbal";
        description = "A library with the kerbal space program universe and demo code";
@@ -9236,7 +9512,7 @@ self: {
        pname = "Kalman";
        version = "0.1.0.1";
        sha256 = "1mzdaj6h21is3fwnckzq5zcxd4zqahsdppsx65bv5vdplsiadrw5";
-       buildDepends = [ base hmatrix ];
+       libraryHaskellDepends = [ base hmatrix ];
        jailbreak = true;
        homepage = "https://github.com/idontgetoutmuch/Kalman";
        description = "A slightly extended Kalman filter";
@@ -9251,7 +9527,8 @@ self: {
        sha256 = "1vj1kbhyqh0xzwyr9v6fdyakx508vbf6n494z81yndisp115qi61";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ QuickCheck ];
        homepage = "https://github.com/ijt/kdtree";
        description = "KdTree, for efficient search in K-dimensional point clouds";
        license = stdenv.lib.licenses.bsd3;
@@ -9265,7 +9542,7 @@ self: {
        pname = "Ketchup";
        version = "0.4.3";
        sha256 = "1f5dnxfch3xrhxbgn74adzj7lalx1fpz3cicnhvvxj2aay62a7d1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring directory mime-types network text
        ];
        jailbreak = true;
@@ -9286,11 +9563,15 @@ self: {
        sha256 = "0z5ps5apr436dbm5wkfnpqksnqi3jsqmp2zkmy37crzzinlilzvn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers curry-frontend directory filepath network old-time
+         process random syb unix
+       ];
+       libraryToolDepends = [ kics ];
+       executableHaskellDepends = [
          base containers curry-base curry-frontend directory filepath
-         ghc-paths network old-time process random readline syb unix
+         ghc-paths old-time process readline
        ];
-       buildTools = [ kics ];
        homepage = "http://www.curry-language.org";
        description = "A compiler from Curry to Haskell";
        license = "unknown";
@@ -9307,9 +9588,11 @@ self: {
        sha256 = "1hvdqil8lfybcp2j04ig03270q5fy29cbmg8jmv38dpcgjsx6mk1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers curry-base directory filepath haskell-src haskell98
-         KiCS KiCS-prophecy mtl readline syb
+       libraryHaskellDepends = [
+         base containers filepath haskell98 KiCS mtl readline syb
+       ];
+       executableHaskellDepends = [
+         base curry-base directory haskell-src KiCS KiCS-prophecy
        ];
        jailbreak = true;
        homepage = "http://curry-language.org";
@@ -9326,7 +9609,8 @@ self: {
        sha256 = "0l278x2gavm0ndbm4k0197cwyvamz37vzy7nz35lb7n5sc5b2gsr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base filepath KiCS ];
+       libraryHaskellDepends = [ base filepath KiCS ];
+       executableHaskellDepends = [ base KiCS ];
        jailbreak = true;
        homepage = "http://curry-language.org";
        description = "a transformation used by the kics debugger";
@@ -9340,7 +9624,7 @@ self: {
        pname = "Kleislify";
        version = "0.0.4";
        sha256 = "0f7f6sxb774h9dx6xy6wbcrc5b2i27k9m5ay3hq9hqsjg86qmxyl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Variants of Control.Arrow functions, specialised to kleislis.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -9351,7 +9635,7 @@ self: {
        pname = "Konf";
        version = "0.1.0.0";
        sha256 = "113jxbaw8b17j91aakxli3r3zdvnx3gvf2m57sx5d7mfk2qx28r6";
-       buildDepends = [ base containers parsec ];
+       libraryHaskellDepends = [ base containers parsec ];
        jailbreak = true;
        homepage = "http://www.gkayaalp.com/p/konf.html";
        description = "A configuration language and a parser";
@@ -9367,8 +9651,8 @@ self: {
        pname = "KyotoCabinet";
        version = "0.1";
        sha256 = "1l7cpppjfz5nd8k67ss959g8sg5kbsfl4zy80a3yrlwbivyrg58n";
-       buildDepends = [ base bytestring extensible-exceptions ];
-       extraLibraries = [ kyotocabinet ];
+       libraryHaskellDepends = [ base bytestring extensible-exceptions ];
+       librarySystemDepends = [ kyotocabinet ];
        homepage = "https://code.google.com/p/kyotocabinet-hs/";
        description = "Kyoto Cabinet DB bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -9385,7 +9669,7 @@ self: {
        sha256 = "1dj4320fpwmlqv5jzzi7x218mrsacdmmk3czb1szzq44pmfmpy32";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers gtk mtl old-time parsec random
        ];
        jailbreak = true;
@@ -9403,8 +9687,10 @@ self: {
        sha256 = "10lzag91slnkd1nnh0vs9nxwrsd1k5a05c2bw4fdfzqmyrfqfl20";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       extraLibraries = [ lber openldap ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ lber openldap ];
+       executableHaskellDepends = [ base ];
+       executableSystemDepends = [ lber openldap ];
        homepage = "https://github.com/ezyang/ldap-haskell";
        description = "Haskell binding for C LDAP API";
        license = stdenv.lib.licenses.bsd3;
@@ -9416,7 +9702,7 @@ self: {
        pname = "LRU";
        version = "0.1.1";
        sha256 = "0yppxz78y5myh9f53yqz6naqj15vk2h7fl3h8h8dps72zw9c5aqn";
-       buildDepends = [ base containers QuickCheck ];
+       libraryHaskellDepends = [ base containers QuickCheck ];
        homepage = "http://www.imperialviolet.org/lru";
        description = "Implements an LRU data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -9428,7 +9714,7 @@ self: {
        pname = "LTree";
        version = "0.1";
        sha256 = "0liqz3n2ycidwmg8iz7mbm0d087fcfgphvbip8bsn0hpwlf10dvw";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Tree with only leaves carrying the data";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -9443,7 +9729,7 @@ self: {
        sha256 = "0b4na8jsiwjnvyg1pl356ryffk2sj0l5f2dsivn71ii1qqblagcz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring haskeline mtl parsec pretty
        ];
        description = "A basic lambda calculator with beta reduction and a REPL";
@@ -9465,14 +9751,21 @@ self: {
        sha256 = "0vzra6020jmir6pqs26fnw2pgap7l10160v5admk7wnrrnfr91r5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array assert-failure async base binary bytestring containers
          data-default deepseq directory enummapset-th filepath ghc-prim gtk
          hashable hsini keys miniutter mtl old-time pretty-show random stm
+         text transformers unordered-containers vector
+         vector-binary-instances zlib
+       ];
+       executableHaskellDepends = [
+         array assert-failure async base binary bytestring containers
+         data-default deepseq directory enummapset-th filepath ghc-prim
+         hashable hsini keys miniutter mtl old-time pretty-show random stm
          template-haskell text transformers unordered-containers vector
          vector-binary-instances zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          array assert-failure async base binary bytestring containers
          data-default deepseq directory enummapset-th filepath ghc-prim
          hashable hsini keys miniutter mtl old-time pretty-show random stm
@@ -9494,7 +9787,7 @@ self: {
        sha256 = "1hdl25dzv19gjr8dzpq1r267v3jj2c2yiskbg0kzdcrh4cj7jcwk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers GLFW GLFW-task monad-task mtl OpenGL transformers
          vector
        ];
@@ -9512,7 +9805,7 @@ self: {
        pname = "LambdaNet";
        version = "0.2.0.0";
        sha256 = "06sg360vbayz1314djlg6z885yrknd7gz15s355kna21xjqydmz4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring hmatrix random random-shuffle split
        ];
        jailbreak = true;
@@ -9530,12 +9823,12 @@ self: {
        pname = "LambdaPrettyQuote";
        version = "0.0.0.8";
        sha256 = "0rxh9gxsd0qh76nzib9pqgzh10gdc629ypnhbg8fjgdiaza7hyal";
-       buildDepends = [
+       libraryHaskellDepends = [
          base DebugTraceHelpers HUnit lambda-ast mtl parsec QuickCheck syb
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 transformers tuple uniplate
        ];
-       testDepends = [
+       testHaskellDepends = [
          base checkers DebugTraceHelpers derive HUnit lambda-ast mtl parsec
          QuickCheck syb template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 th-instances transformers tuple uniplate
@@ -9556,7 +9849,7 @@ self: {
        sha256 = "1nqzlnw3fchgqn9bvlvbjma1m0wwssrip2mwb2kiv4rbhqdbfijv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers mtl parsec Shellac Shellac-compatline
        ];
        homepage = "http://rwd.rdockins.name/lambda/home/";
@@ -9571,7 +9864,7 @@ self: {
        pname = "LargeCardinalHierarchy";
        version = "0.0.1";
        sha256 = "0agq2593h5yb9r3jqnycis9fdizwij3and61ljc4prnhhyxv48g2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "A transfinite cardinal arithmetic library including all known large cardinals";
        license = "unknown";
@@ -9585,7 +9878,7 @@ self: {
        pname = "Lastik";
        version = "0.7.0";
        sha256 = "1bq8az2lrdqszn1aicvxj0spmwpxphvcvgkl6p0mnz8878hyxsdm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filemanip filepath process
          pureMD5 SHA zip-archive
        ];
@@ -9603,8 +9896,8 @@ self: {
        pname = "Lattices";
        version = "0.0.1";
        sha256 = "1x1rxl1pc64ifjrlmqqgs0p71bqymc17ls7wlj6skk1sy7kys2f5";
-       buildDepends = [ array base HaskellForMaths ];
-       testDepends = [
+       libraryHaskellDepends = [ array base HaskellForMaths ];
+       testHaskellDepends = [
          array base HaskellForMaths HUnit test-framework
          test-framework-hunit
        ];
@@ -9621,7 +9914,7 @@ self: {
        sha256 = "1y80bzcjyk5gkzkgyn8h7sf0bg11qn4qr0qgvi640spppxqfqkjq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath unix ];
+       executableHaskellDepends = [ base directory filepath unix ];
        jailbreak = true;
        homepage = "https://github.com/AtticHacker/lazyvault";
        description = "A simple sandboxing tool for Haskell packages";
@@ -9636,7 +9929,7 @@ self: {
        sha256 = "1kpz8qpm2xj5nm0sav5439flyj3zdx6ha9lgg3c7ky4sjqvwwzxv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory random SDL SDL-ttf ];
+       executableHaskellDepends = [ base directory random SDL SDL-ttf ];
        jailbreak = true;
        homepage = "http://quasimal.com/projects/level_0.html";
        description = "A Snake II clone written using SDL";
@@ -9650,7 +9943,7 @@ self: {
        pname = "LibClang";
        version = "0.1.0";
        sha256 = "12bbmgd9xh6l9c9z3r82j2csksbplha1zzzzzb8338kj81wp1pjb";
-       buildDepends = [ base greencard time ];
+       libraryHaskellDepends = [ base greencard time ];
        homepage = "https://github.com/chetant/LibClang/issues";
        description = "Haskell bindings for libclang (a C++ parsing library)";
        license = stdenv.lib.licenses.bsd3;
@@ -9665,10 +9958,10 @@ self: {
        pname = "LibZip";
        version = "0.11.1";
        sha256 = "04nzh9gqji20qhiiyy8i23cb4gy9qbdza5pkwicgghiqbyfrpk6f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-libzip bytestring filepath mtl time utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bindings-libzip bytestring directory filepath HUnit mtl time
          utf8-string
        ];
@@ -9683,7 +9976,7 @@ self: {
        pname = "Limit";
        version = "1.0";
        sha256 = "1yd8c443ql17daicn3r9jiwxxjlpqnpnvkbxcszjha4i4ar94zq1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Wrapper for data that can be unbounded";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9695,7 +9988,9 @@ self: {
        pname = "LinearSplit";
        version = "0.2.1";
        sha256 = "05rdlxsl5zpnczahaw2fdycqyryd3y7bccizjbn5sap23spwd7di";
-       buildDepends = [ array base cmdargs haskell98 QuickCheck ];
+       libraryHaskellDepends = [
+         array base cmdargs haskell98 QuickCheck
+       ];
        homepage = "http://github.com/rukav/LinearSplit";
        description = "Partition the sequence of items to the subsequences in the order given";
        license = stdenv.lib.licenses.bsd3;
@@ -9712,7 +10007,7 @@ self: {
        sha256 = "00wlyqclmzn03y86ba64pkc85kndnakgj8spv4vm7z0k8dsphnfq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers haskell98 HTTP mtl network tagsoup
        ];
        homepage = "http://janzzstimmpfle.de/~jens/software/LinkChecker/";
@@ -9727,7 +10022,7 @@ self: {
        pname = "List";
        version = "0.5.2";
        sha256 = "1b7ar17d2sq6ibgbiqbsrhk2zlxcxiwfv2xsfbya5hs8nflzkp97";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/yairchu/generator/tree";
        description = "List monad transformer and class";
        license = stdenv.lib.licenses.bsd3;
@@ -9741,10 +10036,10 @@ self: {
        pname = "ListLike";
        version = "4.2.0";
        sha256 = "1ih0kjr3n576l6abasa8pnjajml27rj8h7nx3kqv2fdm7l6lk6zg";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers dlist fmlist text vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring containers dlist fmlist HUnit QuickCheck
          random text vector
        ];
@@ -9759,7 +10054,9 @@ self: {
        pname = "ListTree";
        version = "0.2.1";
        sha256 = "1ril13w2n1sgl44qwm1ydg94cvkm2qk55hsfv5bxbb6r99xc645m";
-       buildDepends = [ base directory filepath List transformers ];
+       libraryHaskellDepends = [
+         base directory filepath List transformers
+       ];
        homepage = "http://github.com/yairchu/generator/tree";
        description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list";
        license = stdenv.lib.licenses.bsd3;
@@ -9772,7 +10069,7 @@ self: {
        pname = "ListZipper";
        version = "1.2.0.2";
        sha256 = "0z3izxpl21fxz43jpx7zqs965anb3gp5vidv3pwwznr88ss2j6a9";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        description = "Simple zipper for lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -9783,7 +10080,7 @@ self: {
        pname = "Logic";
        version = "0.1.0.0";
        sha256 = "0jplyy09i2rr5l8qzkyd41wwi7yj3sxlrz8f36ygdwxnwqfk2w01";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://gogotanaka.me/";
        description = "Logic";
@@ -9807,14 +10104,17 @@ self: {
        sha256 = "1yqnrzcmx8ch9xcpg07if9cs4z1sdpyjfpgzkqkhv9i263pfgxpk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          AbortT-mtl AbortT-transformers base bytestring cereal cmdtheline
          composition containers data-ivar derive directory hslogger
          hslogger-template lens MonadCatchIO-transformers monoid-statistics
          mtl multiset old-locale operational prefix-units pretty PSQueue
          sequential-index split stm time transformers void yjtools
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base cereal cmdtheline containers transformers
+       ];
+       testHaskellDepends = [
          base bytestring cereal composition containers data-ivar directory
          hslogger hslogger-template HUnit lens MonadCatchIO-transformers
          operational QuickCheck quickcheck-instances random smallcheck stm
@@ -9838,12 +10138,16 @@ self: {
        sha256 = "0sqlx06i9f3wxzpk7mivbnn2k4z5n141vbkn1bj886bk5srbrx92";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal cmdtheline containers data-ivar derive
          hslogger hslogger-template LogicGrowsOnTrees
          MonadCatchIO-transformers stm transformers
        ];
-       extraLibraries = [ openmpi ];
+       librarySystemDepends = [ openmpi ];
+       executableHaskellDepends = [
+         base cereal cmdtheline hslogger LogicGrowsOnTrees
+       ];
+       executableSystemDepends = [ openmpi ];
        jailbreak = true;
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
@@ -9862,12 +10166,15 @@ self: {
        sha256 = "0r66pb35fpmgvkf41kxz289c9ylwv7jdf9bxbsrv7p4ylg83x2dn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cereal cmdtheline composition containers hslogger
          hslogger-template lens LogicGrowsOnTrees MonadCatchIO-transformers
          mtl network pretty transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base cereal cmdtheline LogicGrowsOnTrees
+       ];
+       testHaskellDepends = [
          base hslogger hslogger-template HUnit LogicGrowsOnTrees network
          random stm test-framework test-framework-hunit transformers
        ];
@@ -9889,12 +10196,15 @@ self: {
        sha256 = "0d1kz5d83frn1591vgk33d0rw2s4z98lp993rnvhl3k5zqpr2svn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal cmdtheline containers filepath FindBin
          hslogger hslogger-template LogicGrowsOnTrees
          MonadCatchIO-transformers process transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base cereal cmdtheline LogicGrowsOnTrees
+       ];
+       testHaskellDepends = [
          base cereal hslogger hslogger-template HUnit LogicGrowsOnTrees
          random test-framework test-framework-hunit transformers
        ];
@@ -9915,7 +10225,7 @@ self: {
        sha256 = "0dwsx23fibgj36181rfwfj1kl6sgdkf8bk4dd9cwia0rbjrl4qyk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers directory filepath haskell98 HaXml
          mtl network old-time parsec pureMD5 random syb template-haskell
          utf8-string
@@ -9938,7 +10248,7 @@ self: {
        sha256 = "09vhz5gc9nmlwlxn6vk5whq6lpqbidqifx4i4lvp4n21gib64v9b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols base64-bytestring bytestring containers
          directory filepath haskell-src HsOpenSSL hxt mtl network stm time
          time-http unix zlib
@@ -9960,9 +10270,10 @@ self: {
        sha256 = "0h76xsh4p4zbxnbk7hszwm1gj44p6349d4bkbixn7fyiyp4f0pvh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base Biobase cmdargs PrimitiveArray split tuple vector
+       libraryHaskellDepends = [
+         base Biobase PrimitiveArray tuple vector
        ];
+       executableHaskellDepends = [ cmdargs split ];
        homepage = "http://www.tbi.univie.ac.at/software/mcfolddp/";
        description = "Folding algorithm based on nucleotide cyclic motifs";
        license = stdenv.lib.licenses.gpl3;
@@ -9972,7 +10283,7 @@ self: {
   "MFlow" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , case-insensitive, clientsession, conduit, conduit-extra
-     , containers, cpphs, directory, extensible-exceptions, http-types
+     , containers, directory, extensible-exceptions, http-types
      , monadloc, mtl, old-time, parsec, pwstore-fast, random
      , RefSerialize, resourcet, stm, TCache, text, time, transformers
      , utf8-string, vector, wai, wai-extra, warp, warp-tls, Workflow
@@ -9981,7 +10292,7 @@ self: {
        pname = "MFlow";
        version = "0.4.5.9";
        sha256 = "0mqsyx7wkfgvpppqgpjpvzwx79vj7lh4c8afzzj1hgh8z0ilb4ik";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring case-insensitive
          clientsession conduit conduit-extra containers directory
          extensible-exceptions http-types monadloc mtl old-time parsec
@@ -9989,7 +10300,6 @@ self: {
          transformers utf8-string vector wai wai-extra warp warp-tls
          Workflow
        ];
-       buildTools = [ cpphs ];
        description = "stateful, RESTful web framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10001,7 +10311,7 @@ self: {
        pname = "MHask";
        version = "0.3.0.0";
        sha256 = "0nlj914ahipyfqv1l7qr66pa0a8g4g6ks6mipc38z5f1jy0kjrva";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "https://github.com/DanBurton/MHask#readme";
        description = "The category of monads";
@@ -10015,7 +10325,7 @@ self: {
        pname = "MSQueue";
        version = "0.0.1";
        sha256 = "04yvf4a07cy47qzl9p8x45qbk2i6yapfps7hx85p589338s8b72y";
-       buildDepends = [ base ghc-prim monad-loops ref-mtl stm ];
+       libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/Julek";
        description = "Michael-Scott queue";
@@ -10031,7 +10341,7 @@ self: {
        pname = "MagicHaskeller";
        version = "0.9.1";
        sha256 = "1rr1gp808qwi0i84l6hmm03b8khnawz8qq606p5a351pd0mbxkak";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory ghc ghc-paths
          haskell-src html mtl network old-time pretty random syb
          template-haskell
@@ -10047,10 +10357,10 @@ self: {
      mkDerivation {
        pname = "MaybeT";
        version = "0.1.2";
-       revision = "1";
        sha256 = "0cmnfs22ldai0z172rdsvryzsh33a70yax21v03nhr92a4b62plr";
+       revision = "1";
        editedCabalFile = "399ec60488680853ace716790b8ebaeee1a74da8a24ced5b5caaea4341b88580";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "MaybeT monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -10062,7 +10372,7 @@ self: {
        pname = "MaybeT-monads-tf";
        version = "0.2.0.1";
        sha256 = "034v9n6ldjn1hsv4rphvysbykm8x0jqa2prbw7k28fkp6m30j74x";
-       buildDepends = [ base monads-tf transformers ];
+       libraryHaskellDepends = [ base monads-tf transformers ];
        jailbreak = true;
        description = "MaybeT monad transformer compatible with monads-tf (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -10075,7 +10385,7 @@ self: {
        pname = "MaybeT-transformers";
        version = "0.2";
        sha256 = "189w8dpxyq7gksca6k08hb4vpanpz06c99akgzpcpjy0i7k22ily";
-       buildDepends = [ base monads-fd transformers ];
+       libraryHaskellDepends = [ base monads-fd transformers ];
        jailbreak = true;
        description = "MaybeT monad transformer using transformers instead of mtl";
        license = stdenv.lib.licenses.bsd3;
@@ -10092,7 +10402,7 @@ self: {
        sha256 = "041kqz5j8xaa2ciyrfnwz6p9gcx4il5s6f34kzv9kp0s07hmn1q2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory filepath HUnit mtl old-locale
          pretty random regex-posix time
        ];
@@ -10107,7 +10417,7 @@ self: {
        pname = "MeanShift";
        version = "0.1";
        sha256 = "0rnbg7w3qc3xsbzpw5is7w7qdjl2kqbr1acc744aggwlibazl59w";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        jailbreak = true;
        description = "Mean shift algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -10119,7 +10429,7 @@ self: {
        pname = "Measure";
        version = "0.0.2";
        sha256 = "1vy8ykjy9cpv661byqv21775zbyciqx2hf77c1nl58nn34x0s2ds";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "A library for units of measurement";
        license = stdenv.lib.licenses.bsd3;
@@ -10132,7 +10442,7 @@ self: {
        pname = "MemoTrie";
        version = "0.6.2";
        sha256 = "1g4b82s30bqkfids3iywf873nyn8h7l8rp8l3xl58smj5lbi3p4x";
-       buildDepends = [ base void ];
+       libraryHaskellDepends = [ base void ];
        homepage = "http://haskell.org/haskellwiki/MemoTrie";
        description = "Trie-based memo functions";
        license = stdenv.lib.licenses.bsd3;
@@ -10146,7 +10456,7 @@ self: {
        pname = "MetaHDBC";
        version = "0.1.4";
        sha256 = "0l47v2cpbngxrq1r6p95rfcs16jqwr8l1sy4bcg9liazz50i8lyr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base convertible hashtables HDBC HDBC-odbc mtl template-haskell
        ];
        jailbreak = true;
@@ -10160,7 +10470,7 @@ self: {
        pname = "MetaObject";
        version = "0.0.6.20110925";
        sha256 = "0cgn13rpbqkywpiki6fcl76iwmc74d0f9ixki6dg7lrg49lhb67r";
-       buildDepends = [ base containers stringtable-atom ];
+       libraryHaskellDepends = [ base containers stringtable-atom ];
        description = "A meta-object system for Haskell based on Perl 6";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10172,7 +10482,7 @@ self: {
        pname = "Metrics";
        version = "0.1.2";
        sha256 = "1ks5h3vlla2d86wvf2a4z1qifsinya2skq8ygdk45ynnwk735y4x";
-       buildDepends = [ base hstats ];
+       libraryHaskellDepends = [ base hstats ];
        homepage = "http://github.com/benhamner/Metrics/";
        description = "Evaluation metrics commonly used in supervised machine learning";
        license = stdenv.lib.licenses.bsd3;
@@ -10189,7 +10499,7 @@ self: {
        sha256 = "1vxsaw2kfrx6g5y57lchcs1xwj0jnanw9svg59mjnasw53z674ck";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring directory filepath haskell98 mtl old-locale
          process time
        ];
@@ -10209,10 +10519,10 @@ self: {
        sha256 = "14h7ksd95wiixfmvrkxw3l13qdxhrhgkhmz00mcw04bdyzfmgr0n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers haskell-src-exts mtl pretty
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        jailbreak = true;
        homepage = "http://www.tcs.ifi.lmu.de/~abel/miniagda/";
        description = "A toy dependently typed programming language with type-based termination";
@@ -10230,11 +10540,11 @@ self: {
        pname = "MissingH";
        version = "1.3.0.1";
        sha256 = "1cwdhgqqv2riqwhsgyrpmqyzvg19lx6zp1g7xdp4rikh7rkn03ds";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath hslogger HUnit mtl network
          old-locale old-time parsec process random regex-compat time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base containers directory errorcall-eq-instance filepath
          hslogger HUnit mtl network old-locale old-time parsec process
          QuickCheck random regex-compat testpack time unix
@@ -10250,7 +10560,7 @@ self: {
        pname = "MissingK";
        version = "0.0.0.2";
        sha256 = "0cynzg5piy14g5j576kf79dh4zqa5pcpwnpfl0fdkyy1rqm50q03";
-       buildDepends = [ base glib template-haskell ];
+       libraryHaskellDepends = [ base glib template-haskell ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Useful types and definitions missing from other libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -10264,8 +10574,8 @@ self: {
        pname = "MissingM";
        version = "0.0.4";
        sha256 = "19kijf02jq8w3n2fvisb8xrws524sa690lbp9di6499xakkzyqxs";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
@@ -10279,7 +10589,7 @@ self: {
        pname = "MissingPy";
        version = "0.10.6";
        sha256 = "0390ap25qj6a37jllsih39q5apgvwdjdw5m7jgfrllkp5bng6yj6";
-       buildDepends = [ anydbm base MissingH ];
+       libraryHaskellDepends = [ anydbm base MissingH ];
        homepage = "http://github.com/softmechanics/missingpy";
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.mit;
@@ -10292,7 +10602,7 @@ self: {
        pname = "Modulo";
        version = "0.2.0.1";
        sha256 = "1n90lfrvfr1ni7ninlxbs4wk0m7mibdpi9sy26ifih51nmk8nziq";
-       buildDepends = [ base numeric-prelude ];
+       libraryHaskellDepends = [ base numeric-prelude ];
        description = "Modular arithmetic via Numeric-Prelude";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -10305,7 +10615,8 @@ self: {
        sha256 = "1nk767nywssg5p50wd6czcbhi61v5gcncyy3d59a90slzic8n5b3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base GLUT random ];
+       libraryHaskellDepends = [ base GLUT random ];
+       executableHaskellDepends = [ base GLUT random ];
        description = "A FRP library based on signal functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -10318,7 +10629,7 @@ self: {
        pname = "MoeDict";
        version = "0.0.3";
        sha256 = "0sf7qhw3z984mnprgq2jxqsx9z5v2q36hdb84fdn34rgjzrv3z9a";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers text unordered-containers
        ];
        homepage = "https://github.com/audreyt/MoeDict.hs";
@@ -10334,7 +10645,7 @@ self: {
        pname = "MonadCatchIO-mtl";
        version = "0.3.1.0";
        sha256 = "0qarf73c8zq8dgvxdiwqybpjfy8gba9vf4k0skiwyk5iphilxhhq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base extensible-exceptions MonadCatchIO-transformers
        ];
        jailbreak = true;
@@ -10349,7 +10660,7 @@ self: {
        pname = "MonadCatchIO-mtl-foreign";
        version = "0.1";
        sha256 = "0jfq5v1jigxl9mnnvpqph9ayq840s9nyb5srym04mbicri4gbjan";
-       buildDepends = [ base MonadCatchIO-mtl mtl primitive ];
+       libraryHaskellDepends = [ base MonadCatchIO-mtl mtl primitive ];
        jailbreak = true;
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
@@ -10364,7 +10675,7 @@ self: {
        pname = "MonadCatchIO-transformers";
        version = "0.3.1.3";
        sha256 = "1g840h7whsvgyrh4v58mdmsb7hinq785irbz6x9y08r1q8r9r90h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base extensible-exceptions monads-tf transformers
        ];
        description = "Monad-transformer compatible version of the Control.Exception module";
@@ -10379,7 +10690,7 @@ self: {
        pname = "MonadCatchIO-transformers-foreign";
        version = "0.1";
        sha256 = "070ifw78z2si3l1hqqvx236spdf61p3bf1qspd54fzq2dm89i1yw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base MonadCatchIO-transformers primitive transformers
        ];
        jailbreak = true;
@@ -10397,7 +10708,7 @@ self: {
        pname = "MonadCompose";
        version = "0.8.3.1";
        sha256 = "0njvbz2cwc3339h87wxhl5kzb2v1ny5skqvhrsdzp95f1k8chnxa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default ghc-prim mmorph monad-loops monad-products mtl
          parallel random transformers transformers-compat
        ];
@@ -10415,7 +10726,8 @@ self: {
        sha256 = "1p8xhxxjhwr93as98pvp1z25ypgj7arka8bw75r0q46948h7nxf7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskell98 parsec process template-haskell ];
+       libraryHaskellDepends = [ base parsec template-haskell ];
+       executableHaskellDepends = [ base haskell98 process ];
        homepage = "http://monadgarden.cs.missouri.edu/MonadLab";
        description = "Automatically generate layered monads";
        license = stdenv.lib.licenses.bsd3;
@@ -10428,7 +10740,7 @@ self: {
        pname = "MonadPrompt";
        version = "1.0.0.5";
        sha256 = "1nmy7dfzrkd8yfv5i9vlmjq9khnyi76ayvkzgcf783v5hfzcn4mh";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "MonadPrompt, implementation & examples";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -10441,7 +10753,7 @@ self: {
        pname = "MonadRandom";
        version = "0.4";
        sha256 = "14vgp2sml9jsras9l0488gy2siamcqf78y3vlr1my4lhhdx3ybyk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl random transformers transformers-compat
        ];
        description = "Random-number generation monad";
@@ -10454,7 +10766,7 @@ self: {
        pname = "MonadRandomLazy";
        version = "0.1";
        sha256 = "1nsnv47mwka4bsmv7hvsx96s6w6qrzvfsn47fvcfy4fi88b56p2j";
-       buildDepends = [ base MonadRandom mtl random ];
+       libraryHaskellDepends = [ base MonadRandom mtl random ];
        description = "Lazy monad for psuedo random-number generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10466,7 +10778,7 @@ self: {
        pname = "MonadStack";
        version = "0.1.0.3";
        sha256 = "0fsnc17dxmv3qnmz54gw3wy2camgp23ip9jfi543xqks0l8n7gcz";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/bhurt/MonadStack";
        description = "Generalizing lift to monad stacks";
        license = stdenv.lib.licenses.bsd2;
@@ -10480,7 +10792,7 @@ self: {
        sha256 = "0jq59nnnydllqpvg3h2d1ylz3g58hwi0m08lmw2bv0ajzgn5mc8x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base directory GLUT OpenGL ];
+       executableHaskellDepends = [ array base directory GLUT OpenGL ];
        homepage = "http://www.geocities.jp/takascience/haskell/monadius_en.html";
        description = "2-D arcade scroller";
        license = "GPL";
@@ -10496,7 +10808,7 @@ self: {
        sha256 = "0myghw0w122n1czpaaqmpiyv0nragjkwnja8kb4agrwhcjfk3icb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory free free-game mtl
        ];
        homepage = "https://github.com/fumieval/Monaris/";
@@ -10511,7 +10823,7 @@ self: {
        pname = "Monatron";
        version = "0.3.1";
        sha256 = "0250xqc5fgl8mg9yb0ykbfmxnyxacqbvi692irgfw89gf9vkh886";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Monad transformer library with uniform liftings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10523,7 +10835,7 @@ self: {
        pname = "Monatron-IO";
        version = "1.0";
        sha256 = "0svdyfzv4xlwjnc61wwik8a60a5667lhsys49sgry65a1v2csnv0";
-       buildDepends = [ base Monatron transformers ];
+       libraryHaskellDepends = [ base Monatron transformers ];
        jailbreak = true;
        homepage = "https://github.com/kreuzschlitzschraubenzieher/Monatron-IO";
        description = "MonadIO instances for the Monatron transformers";
@@ -10537,7 +10849,7 @@ self: {
        pname = "Monocle";
        version = "0.0.4";
        sha256 = "1p8s2agsni56h7vlydbhy7qhi0qkwafpcrsfafrlg44gvpwff15y";
-       buildDepends = [ base containers haskell98 mtl ];
+       libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "Symbolic computations in strict monoidal categories with LaTeX output";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10549,7 +10861,7 @@ self: {
        pname = "MorseCode";
        version = "0.0.5";
        sha256 = "1dglyak17db7q9nd6s255w2zh8lh192vidyjvgvh53vbybymb20z";
-       buildDepends = [ base containers split ];
+       libraryHaskellDepends = [ base containers split ];
        description = "Morse code";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -10562,11 +10874,11 @@ self: {
        pname = "MuCheck";
        version = "0.3.0.4";
        sha256 = "183p3fmzz5d67g8wmzgv8c8yyhs0cp7x3xig4cm9s98nhrsm1j0r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory hashable haskell-src-exts hint mtl random syb
          temporary time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory hashable haskell-src-exts hint hspec mtl random syb
          temporary time
        ];
@@ -10583,7 +10895,8 @@ self: {
        sha256 = "05x5sfwlzzis29sps93ypsn53y2vs4cjmxifjqn7wd5lmhaxjbhj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base HUnit MuCheck ];
+       libraryHaskellDepends = [ base HUnit MuCheck ];
+       executableHaskellDepends = [ base HUnit MuCheck ];
        homepage = "https://bitbucket.com/osu-testing/mucheck-hunit";
        description = "Automated Mutation Testing for HUnit tests";
        license = stdenv.lib.licenses.gpl2;
@@ -10597,7 +10910,8 @@ self: {
        sha256 = "0c8sd6ns8hnhc7577j0y7iqyhf7ld51zmrr3jgpckgpcghycw5mw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base hspec hspec-core MuCheck ];
+       libraryHaskellDepends = [ base hspec hspec-core MuCheck ];
+       executableHaskellDepends = [ base hspec hspec-core MuCheck ];
        homepage = "https://bitbucket.com/osu-testing/mucheck-hspec";
        description = "Automated Mutation Testing for Hspec tests";
        license = stdenv.lib.licenses.gpl2;
@@ -10611,7 +10925,8 @@ self: {
        sha256 = "1q242vw70jccfj19jn6wx1fm74mshd60lay9ql4379mgcl2lf6qk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base MuCheck QuickCheck ];
+       libraryHaskellDepends = [ base MuCheck QuickCheck ];
+       executableHaskellDepends = [ base MuCheck QuickCheck ];
        homepage = "https://bitbucket.com/osu-testing/mucheck-quickcheck";
        description = "Automated Mutation Testing for QuickCheck tests";
        license = stdenv.lib.licenses.gpl2;
@@ -10625,7 +10940,8 @@ self: {
        sha256 = "19brgllnbsbbg57jgwgd745iial53ykn7c329x9lq6gd82siavii";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base MuCheck smallcheck ];
+       libraryHaskellDepends = [ base MuCheck smallcheck ];
+       executableHaskellDepends = [ base MuCheck smallcheck ];
        homepage = "https://bitbucket.com/osu-testing/mucheck-smallcheck";
        description = "Automated Mutation Testing for SmallCheck tests";
        license = stdenv.lib.licenses.gpl2;
@@ -10637,7 +10953,7 @@ self: {
        pname = "Munkres";
        version = "0.1";
        sha256 = "169mgcyls0dsifnbp615r4i3g64ga2vbczsiv4aq17d1nma8sw19";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Munkres' assignment algorithm (hungarian method)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -10648,7 +10964,7 @@ self: {
        pname = "Munkres-simple";
        version = "0.1.0.1";
        sha256 = "0k5v37qrhb8i5hfx9jvkggjmry2jrzw967s17l2x561qmm59c2rb";
-       buildDepends = [ array base bimap containers Munkres ];
+       libraryHaskellDepends = [ array base bimap containers Munkres ];
        jailbreak = true;
        description = "Simple and typesafe layer over the Munkres package";
        license = stdenv.lib.licenses.bsd3;
@@ -10664,7 +10980,7 @@ self: {
        pname = "MusicBrainz";
        version = "0.2.4";
        sha256 = "1f1x3iivxkn5d7w3xyh2q8mpn1mg24c1n6v8dvdsph745xszh8fj";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra HTTP http-conduit
          http-types monad-control resourcet text time time-locale-compat
          transformers vector xml-conduit xml-types
@@ -10680,7 +10996,7 @@ self: {
        pname = "MusicBrainz-libdiscid";
        version = "0.5.0.0";
        sha256 = "15fwpbh8yxv41k73j9q4v5d5c5rh3q2xfp7pc7b5mc3rxipw4pa5";
-       buildDepends = [ base containers vector ];
+       libraryHaskellDepends = [ base containers vector ];
        homepage = "https://github.com/atwupack/MusicBrainz-libdiscid";
        description = "Binding to libdiscid by MusicBrainz";
        license = "LGPL";
@@ -10694,7 +11010,8 @@ self: {
        sha256 = "1bwq0fwhkw4i2kjx9xbdfn0y86j9s78kyrw9vlxq7zmv4pddazly";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://afonso.xyz";
        description = "Generate all primes";
@@ -10709,7 +11026,7 @@ self: {
        sha256 = "1niwh0ndkzgd38phx5527i14nb9swvybdjwjwbndkpb21x5j82nc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HCL HTTP network regex-compat ];
+       executableHaskellDepends = [ base HCL HTTP network regex-compat ];
        description = "Simple application for calculating n-grams using Google";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10723,7 +11040,7 @@ self: {
        pname = "NTRU";
        version = "1.0.0.0";
        sha256 = "0n96hxzv5b1zs0xkq5ksh0hp075ca46l8xd7cs2hdnmkmi6rwvha";
-       buildDepends = [
+       libraryHaskellDepends = [
          arithmoi base bytestring containers crypto-api polynomial random
          SHA split
        ];
@@ -10743,14 +11060,15 @@ self: {
        sha256 = "1ka1k9dww84rxx8c45dab6f92cb8mx3fy3sskw07p3f4ahv9whi3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring filepath mtl serialport time unix
+       libraryHaskellDepends = [
+         base bytestring mtl serialport time unix
        ];
-       testDepends = [
+       librarySystemDepends = [ bluetooth ];
+       executableHaskellDepends = [ base bytestring filepath mtl ];
+       testHaskellDepends = [
          base bytestring filepath HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
-       extraLibraries = [ bluetooth ];
        homepage = "http://mitar.tnode.com";
        description = "A Haskell interface to Lego Mindstorms NXT";
        license = stdenv.lib.licenses.gpl3;
@@ -10767,7 +11085,7 @@ self: {
        sha256 = "117ngz15j5chnyrhj1da3r4z11vqx5g70wan7zblwr3s6n006485";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base hashable mtl resourcet stm text
          unordered-containers
        ];
@@ -10785,7 +11103,8 @@ self: {
        sha256 = "0wjjwzzc78sj7nsaq1hgxiwv0pc069mxns425lhmrlxcm0vf8fmn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ListLike uu-parsinglib ];
+       libraryHaskellDepends = [ base containers ListLike uu-parsinglib ];
+       executableHaskellDepends = [ base uu-parsinglib ];
        jailbreak = true;
        description = "Very small interpreter for a Prolog-like language";
        license = stdenv.lib.licenses.bsd3;
@@ -10801,7 +11120,7 @@ self: {
        pname = "NaturalLanguageAlphabets";
        version = "0.0.1.0";
        sha256 = "0s2dv9vsfy1j3v7n0j35y69sjmsjcps88idd7b3f6fnxbmwms3z2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base bimaps bytestring deepseq file-embed hashable
          hashtables intern stringable system-filepath text
          unordered-containers vector vector-th-unbox
@@ -10820,7 +11139,8 @@ self: {
        sha256 = "1xjhmjxp7w0nxvphnfh2phfpg4aqhjyg2f8q99qqavf8cq2k3za9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring QuickCheck strict ];
+       libraryHaskellDepends = [ base bytestring strict ];
+       executableHaskellDepends = [ base bytestring QuickCheck strict ];
        homepage = "http://github.com/joachifm/natsort";
        description = "Natural sorting for strings";
        license = stdenv.lib.licenses.bsd3;
@@ -10836,7 +11156,11 @@ self: {
        sha256 = "083hkcgmrk42pyjm1xz1amdjpmccw0c72axmkk163ar6ir7aznc8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring cereal containers directory hashable messagepack
+         network stm vector
+       ];
+       executableHaskellDepends = [
          base bytestring cereal containers directory hashable messagepack
          network stm vector
        ];
@@ -10850,7 +11174,7 @@ self: {
        pname = "NestedFunctor";
        version = "0.2.0.2";
        sha256 = "1kmv20haxkqn1cwy9g59nmjpn5x1rng2rrd8y3gwxfdwn8blc735";
-       buildDepends = [ base comonad distributive ];
+       libraryHaskellDepends = [ base comonad distributive ];
        jailbreak = true;
        homepage = "https://github.com/kwf/NestedFunctor";
        description = "Nested composition of functors with a type index tracking nesting";
@@ -10863,7 +11187,7 @@ self: {
        pname = "NestedSampling";
        version = "0.1.4";
        sha256 = "1sdlnjnlbk5b04zyhr7574g2ghcivzvkxnm2aak4h9bik00gb1lv";
-       buildDepends = [ base random vector ];
+       libraryHaskellDepends = [ base random vector ];
        homepage = "https://github.com/ijt/haskell_nested_sampling";
        description = "A port of John Skilling's nested sampling C code to Haskell";
        license = stdenv.lib.licenses.gpl2;
@@ -10877,9 +11201,9 @@ self: {
        pname = "NetSNMP";
        version = "0.3.2.0";
        sha256 = "1z3d4qmwzg3hkx78z4fbdsdh6vxnw95fkvfxgzng4bq10y6d2bb8";
-       buildDepends = [ base bytestring utf8-string ];
-       testDepends = [ base bytestring HUnit process utf8-string ];
-       extraLibraries = [ net_snmp ];
+       libraryHaskellDepends = [ base bytestring utf8-string ];
+       librarySystemDepends = [ net_snmp ];
+       testHaskellDepends = [ base bytestring HUnit process utf8-string ];
        homepage = "https://github.com/ptek/netsnmp";
        description = "Bindings for net-snmp's C API for clients";
        license = stdenv.lib.licenses.bsd3;
@@ -10897,14 +11221,13 @@ self: {
        sha256 = "1h6p1p16wvsi6pjpz2xdvbljd394bzpqqfiah7aq9d7f7zh7hzid";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers convertible exceptions
          monad-loops monad-peel mstate mtl network NineP regex-posix
          stateref transformers
        ];
        description = "High-level abstraction over 9P protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NewBinary" = callPackage
@@ -10913,7 +11236,7 @@ self: {
        pname = "NewBinary";
        version = "0.2.1";
        sha256 = "0cp71hkx8cccx7jxf5qw1bxdylcc56v68mvjp0dn9hkh1idxplzq";
-       buildDepends = [ array base integer ];
+       libraryHaskellDepends = [ array base integer ];
        jailbreak = true;
        description = "A binary I/O library";
        license = "unknown";
@@ -10926,7 +11249,7 @@ self: {
        pname = "NineP";
        version = "0.0.2.1";
        sha256 = "1k6qdp4zmqjl2f6cqy1zzzl6ncb2m9r0qgh4c24i2h5kkxmm3cab";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://9ph.googlecode.com";
        description = "9P2000 in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -10942,7 +11265,7 @@ self: {
        sha256 = "0wz80cv7m7m4q6y6rd07y422b97hyhnb9yl6bj68pi1nxmjzcjhm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers filepath gloss network
          networked-game random
        ];
@@ -10964,7 +11287,7 @@ self: {
        sha256 = "1pr1v8xxnhd7yxbhjqhlkwlsfzbk425bmxn99d80w8p4biag104x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers criterion dph-base dph-prim-seq statistics
          storablevector template-haskell uvector vector
        ];
@@ -10981,8 +11304,8 @@ self: {
        pname = "NoTrace";
        version = "0.2.0.1";
        sha256 = "053w0j90sf16by9pqllgjxy6r57vzlq33fgwz4ywjn6bypw6009d";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/CindyLinz/Haskell-NoTrace";
        description = "Remove all the functions come from Debug.Trace after debugging";
@@ -10995,7 +11318,7 @@ self: {
        pname = "Noise";
        version = "1.0.6";
        sha256 = "0sjyq8nilqhmlhbagi1ms2zh7fyhzci9w5hj3dyxpd2ccq1bbvyq";
-       buildDepends = [ array base data-default vector ];
+       libraryHaskellDepends = [ array base data-default vector ];
        description = "A Haskell coherent noise generator based on libnoise";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11011,7 +11334,7 @@ self: {
        sha256 = "1zbrirplcgff9z75lmamh0i5749m22kvnwcr3s51wajnvh982qi3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory exceptions filepath hint-server mtl network
          Nomyx-Core Nomyx-Language Nomyx-Web safe stm time
        ];
@@ -11035,7 +11358,7 @@ self: {
        pname = "Nomyx-Core";
        version = "0.7.6";
        sha256 = "16s60gap32kjs62zxjddppxyg9jhamzgm4d41mfg3vviadlacdrq";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state aeson base blaze-html blaze-markup bytestring data-lens
          data-lens-fd data-lens-template DebugTraceHelpers deepseq directory
          either-unwrap exceptions filepath happstack-authenticate hint
@@ -11059,7 +11382,7 @@ self: {
        pname = "Nomyx-Language";
        version = "0.7.6";
        sha256 = "0na9nm6qnayip2lx3nd3if4c1iyp7zs89jp2dgb7zkmbiwvax3l9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Boolean containers data-lens data-lens-fd data-lens-template
          DebugTraceHelpers ghc mtl old-locale random safe time
          time-recurrence
@@ -11079,7 +11402,7 @@ self: {
        pname = "Nomyx-Rules";
        version = "0.1.0";
        sha256 = "16kzpdvn57sdmpqkwswgixm6pnyi01vj44yvzczn9sy4azwd10q5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc hint-server hslogger mtl old-locale safe stm
          time time-recurrence
        ];
@@ -11100,7 +11423,7 @@ self: {
        pname = "Nomyx-Web";
        version = "0.7.6";
        sha256 = "193v967bzhs0linqvh93w7viwdrlmsbdpnr8asigqhp5905zdjb7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring data-lens data-lens-fd fb
          filepath happstack-authenticate happstack-server hscolour mtl
          Nomyx-Core Nomyx-Language old-locale reform reform-blaze
@@ -11120,7 +11443,7 @@ self: {
        pname = "NonEmpty";
        version = "0.1";
        sha256 = "0nycv791c6b5bcaz5y9wm3wxn1p930p163qs1rpdiix04fnaxgxl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Library providing a non-empty list datatype, and total functions operating on it";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11133,7 +11456,7 @@ self: {
        pname = "NonEmptyList";
        version = "0.0.9";
        sha256 = "09515y7ax4vndsj1828b6xxnnkml4vg9x29rn3lrw3rc65fi11x2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base category-extras QuickCheck Semigroup test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -11149,7 +11472,7 @@ self: {
        pname = "NumInstances";
        version = "1.4";
        sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/conal/NumInstances";
        description = "Instances of numeric classes for functions and tuples";
        license = stdenv.lib.licenses.bsd3;
@@ -11161,7 +11484,7 @@ self: {
        pname = "NumLazyByteString";
        version = "0.0.0.1";
        sha256 = "17ca34hxaz9xk3ykkzp14n7wb31aiza12859k3rmvwhnq4j89jqs";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        description = "Num, Enum, Eq, Integral, Ord, Real, and Show instances for Lazy ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11172,7 +11495,7 @@ self: {
        pname = "NumberSieves";
        version = "0.1.2";
        sha256 = "1w8y46ivli37rlhkdrnw13qv6f0m13a88w0qkfw949b09vdp2nw2";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://patch-tag.com/r/lpsmith/NumberSieves";
        description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient";
        license = stdenv.lib.licenses.bsd3;
@@ -11185,7 +11508,7 @@ self: {
        pname = "Numbers";
        version = "0.2.1";
        sha256 = "1z1v396lar6b0lyis3k5gn5kn17ndggm8j7qxnhirlpgm831fgg7";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        homepage = "http://page.mi.fu-berlin.de/aneumann/numbers/index.html";
        description = "An assortment of number theoretic functions";
        license = "LGPL";
@@ -11201,7 +11524,7 @@ self: {
        sha256 = "1j9qmin7fqwfy69f7wi1is1nawhh46phda6na20am7r8cjzdnjsh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ADPfusion base ghc-prim mtl primitive PrimitiveArray vector
        ];
        jailbreak = true;
@@ -11217,7 +11540,7 @@ self: {
        pname = "Nutri";
        version = "0.1";
        sha256 = "1m7qx5zydz5jpk6a55k7rzchlwmkd91gsiqmn26qqn50ab3di35j";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/frosch03/Nutri";
        description = "A little library to calculate nutrition values of food items";
@@ -11230,7 +11553,7 @@ self: {
        pname = "OGL";
        version = "0.0.3";
        sha256 = "1w8lpi2r315b4ry234gi4rq09j92zvhr9ibxwsig6544cbb5g8qm";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://haskell.org/haskellwiki/OGL";
        description = "A context aware binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
@@ -11245,7 +11568,7 @@ self: {
        pname = "OSM";
        version = "0.6.4";
        sha256 = "1m606r0lc0hsniqn7krm2hpvhj7y6sq4qbjjj4g8n4hap6v4syr9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad-transformers containers data-lens hxt newtype
        ];
        homepage = "https://github.com/tonymorris/geo-osm";
@@ -11260,8 +11583,8 @@ self: {
        pname = "OTP";
        version = "0.0.0.1";
        sha256 = "0vcxyfk1vx30cfngq5cv3lc34x0sxsirykhbi4ygw5pvd9ylzadb";
-       buildDepends = [ base Crypto time ];
-       testDepends = [ base Crypto time ];
+       libraryHaskellDepends = [ base Crypto time ];
+       testHaskellDepends = [ base Crypto time ];
        homepage = "https://github.com/matshch/OTP";
        description = "HMAC-Based and Time-Based One-Time Passwords";
        license = stdenv.lib.licenses.mit;
@@ -11273,7 +11596,7 @@ self: {
        pname = "Object";
        version = "1.0";
        sha256 = "05lrqq4008vnfs2x8kxlyrgdvxmzk04rqvn0w65b691bp3vwnbf9";
-       buildDepends = [ base containers ghc template-haskell ];
+       libraryHaskellDepends = [ base containers ghc template-haskell ];
        homepage = "https://github.com/yokto/object";
        description = "Object oriented programming for haskell using multiparameter typeclasses";
        license = stdenv.lib.licenses.asl20;
@@ -11288,7 +11611,7 @@ self: {
        pname = "ObjectIO";
        version = "1.0.1.1";
        sha256 = "1f8ac7dk1ls6xla3w0wy2qr164kv67k5ilj7niakfr9x74mpp6jy";
-       extraLibraries = [
+       librarySystemDepends = [
          comctl32 comdlg32 gdi32 kernel32 ole32 shell32 user32 winmm
          winspool
        ];
@@ -11304,7 +11627,7 @@ self: {
        pname = "ObjectName";
        version = "1.1.0.0";
        sha256 = "0kh5fb9ykag6rfsm3f0bx3w323s18w2cyry34w5xgli5ncqimadg";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "https://github.com/svenpanne/ObjectName";
        description = "Explicitly handled object names";
        license = stdenv.lib.licenses.bsd3;
@@ -11319,7 +11642,7 @@ self: {
        pname = "Obsidian";
        version = "0.1.0.0";
        sha256 = "14dbaj54i4li4hbc2bhl19ma9vgs97mfz8xfwvlndldb2kac4x01";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers cuda language-c-quote mainland-pretty mtl
          mwc-random process rdtsc text value-supply vector
        ];
@@ -11335,8 +11658,8 @@ self: {
        pname = "Octree";
        version = "0.5.4.2";
        sha256 = "0q07jylv5ggvnp32h3b63pk1rcvvxh7bzi3dyx4ga2s0zwfaq1q2";
-       buildDepends = [ AC-Vector base QuickCheck ];
-       testDepends = [ AC-Vector base markdown-unlit QuickCheck ];
+       libraryHaskellDepends = [ AC-Vector base QuickCheck ];
+       testHaskellDepends = [ AC-Vector base markdown-unlit QuickCheck ];
        homepage = "https://github.com/mgajda/octree";
        description = "Simple unbalanced Octree for storing data about 3D points";
        license = stdenv.lib.licenses.bsd3;
@@ -11348,8 +11671,8 @@ self: {
        pname = "OddWord";
        version = "1.0.0.2";
        sha256 = "1c4xbfkikyn1jh3qz0ycxzmx0zqfg5gliafb764942dvd851hljv";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "http://www.gekkou.co.uk/";
        description = "Provides a wrapper for deriving word types with fewer bits";
@@ -11357,13 +11680,13 @@ self: {
      }) {};
 
   "Omega" = callPackage
-    ({ mkDerivation, base, containers, hsc2hs, HUnit }:
+    ({ mkDerivation, base, containers, HUnit }:
      mkDerivation {
        pname = "Omega";
        version = "1.0.3";
        sha256 = "05dax2r7rrdbsvxszxn13xcf24zq87xq8scxzvl2ccr2y29n0f5j";
-       buildDepends = [ base containers ];
-       testDepends = [ base containers hsc2hs HUnit ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers HUnit ];
        description = "Integer sets and relations using Presburger arithmetic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11375,7 +11698,7 @@ self: {
        pname = "OneTuple";
        version = "0.2.1";
        sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Singleton Tuple";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11388,7 +11711,7 @@ self: {
        pname = "OpenAFP";
        version = "1.4.2";
        sha256 = "0x8yrxyfwgzgp7158nrk4y3wzpfm9bnww0nfbbi9hajiqfd8ymc0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory hashable
          hashtables mtl process regex-compat
        ];
@@ -11409,7 +11732,7 @@ self: {
        sha256 = "160qlcjh0pgslql9f4zv2asw8kb9kl7wd6dk5958dv0n9p96pay0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers directory filepath hashable
          line2pdf OpenAFP regex-base regex-posix text text-locale-encoding
          xhtml
@@ -11427,8 +11750,10 @@ self: {
        pname = "OpenAL";
        version = "1.7.0.0";
        sha256 = "111r78zx39nyfnpq2pmy440bi4ymr6i2difwfaislvmjq43plhjw";
-       buildDepends = [ base ObjectName OpenGL StateVar transformers ];
-       extraLibraries = [ openal ];
+       libraryHaskellDepends = [
+         base ObjectName OpenGL StateVar transformers
+       ];
+       librarySystemDepends = [ openal ];
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding to the OpenAL cross-platform 3D audio API";
        license = stdenv.lib.licenses.bsd3;
@@ -11440,10 +11765,10 @@ self: {
        pname = "OpenCL";
        version = "1.0.3.4";
        sha256 = "04cqddhn4b5m0rj2f6i3gr62yhlfgffmkplb4599sd3qbgx0g27x";
-       buildDepends = [ base bytestring mtl ];
-       testDepends = [ base QuickCheck ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ OpenCL ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       librarySystemDepends = [ OpenCL ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/IFCA/opencl";
        description = "Haskell high-level wrapper for OpenCL";
@@ -11457,7 +11782,7 @@ self: {
        pname = "OpenCLRaw";
        version = "1.0.1001";
        sha256 = "1a9nlrmxp3jwc3hbj79xm35aypfby04qy01fk4vyrp19diiinl07";
-       buildDepends = [ base bytestring mtl ];
+       libraryHaskellDepends = [ base bytestring mtl ];
        jailbreak = true;
        homepage = "http://vis.renci.org/jeff/opencl";
        description = "The OpenCL Standard for heterogenous data-parallel computing";
@@ -11471,7 +11796,7 @@ self: {
        pname = "OpenCLWrappers";
        version = "0.1.0.3";
        sha256 = "0xlm26jksp4jf1dhkpg4708r1ak5mjdc5x5fjp4fhizmzlk3348s";
-       buildDepends = [ base bytestring mtl ];
+       libraryHaskellDepends = [ base bytestring mtl ];
        jailbreak = true;
        homepage = "https://github.com/jkarlson/OpenCLWrappers";
        description = "The OpenCL Standard for heterogenous data-parallel computing";
@@ -11479,22 +11804,21 @@ self: {
      }) {};
 
   "OpenGL" = callPackage
-    ({ mkDerivation, base, bytestring, GLURaw, libX11, mesa, ObjectName
-     , OpenGLRaw, StateVar, text, transformers
+    ({ mkDerivation, base, bytestring, GLURaw, ObjectName, OpenGLRaw
+     , StateVar, text, transformers
      }:
      mkDerivation {
        pname = "OpenGL";
        version = "2.12.0.1";
        sha256 = "1mcfb167jl75qc2hgylh83vf2jqizvyvkvhhb72adi2crc3zqz4b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring GLURaw ObjectName OpenGLRaw StateVar text
          transformers
        ];
-       extraLibraries = [ libX11 mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;};
+     }) {};
 
   "OpenGLCheck" = callPackage
     ({ mkDerivation, base, checkers, haskell98, OpenGL, QuickCheck }:
@@ -11502,7 +11826,9 @@ self: {
        pname = "OpenGLCheck";
        version = "1.0";
        sha256 = "0zjgwd9h6jncvp7x4nn049878jagcajsc63ch5i1ynndnrr1cfar";
-       buildDepends = [ base checkers haskell98 OpenGL QuickCheck ];
+       libraryHaskellDepends = [
+         base checkers haskell98 OpenGL QuickCheck
+       ];
        description = "Quickcheck instances for various data structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11514,8 +11840,8 @@ self: {
        pname = "OpenGLRaw";
        version = "2.5.1.0";
        sha256 = "1kfq24mxg922ml3kkmym2qfpc56jbmrfbiix4rc2cxlwv05i191k";
-       buildDepends = [ base transformers ];
-       extraLibraries = [ mesa ];
+       libraryHaskellDepends = [ base transformers ];
+       librarySystemDepends = [ mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
@@ -11527,7 +11853,7 @@ self: {
        pname = "OpenGLRaw21";
        version = "2.0.0.2";
        sha256 = "1kfgwwjnwl5dzwf8bpxcs4q241zap29pjhh4ih5k2cdrnbbn1bz1";
-       buildDepends = [ OpenGLRaw ];
+       libraryHaskellDepends = [ OpenGLRaw ];
        description = "The intersection of OpenGL 2.1 and OpenGL 3.1 Core";
        license = "unknown";
      }) {};
@@ -11540,8 +11866,10 @@ self: {
        pname = "OpenSCAD";
        version = "0.3.0.2";
        sha256 = "04b7n6905qvvz8az8zhsjjg8jcf71y5yby7svy2mqzavq2azjm8x";
-       buildDepends = [ base colour containers filepath semigroups ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base colour containers filepath semigroups
+       ];
+       testHaskellDepends = [
          base Cabal colour containers deepseq filepath HUnit semigroups
          tasty tasty-hunit testpack
        ];
@@ -11557,7 +11885,7 @@ self: {
        pname = "OpenVG";
        version = "0.7.0";
        sha256 = "0ad96lbwcwl7vvk5vx1mmb0wj28c541jwd9nsm7l5na9qdxfhzvj";
-       buildDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ];
+       libraryHaskellDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "OpenVG (ShivaVG-0.2.1) binding";
        license = stdenv.lib.licenses.bsd3;
@@ -11570,7 +11898,7 @@ self: {
        pname = "OpenVGRaw";
        version = "0.4.0";
        sha256 = "1fdg5b8f2x36x6gmdkazkmhqgknagd0kzr70hydygsmqbf2im5x2";
-       buildDepends = [ base OpenGLRaw ];
+       libraryHaskellDepends = [ base OpenGLRaw ];
        jailbreak = true;
        homepage = "http://code.google.com/p/copperbox/";
        description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation).";
@@ -11584,7 +11912,7 @@ self: {
        pname = "Operads";
        version = "1.0";
        sha256 = "1b880lrzdxww3j19zspnj49ifsn89n0ac1h5xf7nn83847k8q2qk";
-       buildDepends = [ array base containers mtl ];
+       libraryHaskellDepends = [ array base containers mtl ];
        jailbreak = true;
        homepage = "http://math.stanford.edu/~mik/operads";
        description = "Groebner basis computation for Operads";
@@ -11598,7 +11926,7 @@ self: {
        pname = "OptDir";
        version = "0.0.3";
        sha256 = "1bb5s57d3wyr9rd275jl0sk85yisl1dpbz042yg7pksv5l0xal0q";
-       buildDepends = [ base hashable syb ];
+       libraryHaskellDepends = [ base hashable syb ];
        description = "The OptDir type for representing optimization directions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11611,7 +11939,7 @@ self: {
        pname = "OrPatterns";
        version = "0.1";
        sha256 = "0fkg2bnk7gh8lzf8i0bffj6qbbpq15sf8yw88rqpzghsz7xrr111";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src-exts haskell-src-meta mtl split syb
          template-haskell
        ];
@@ -11628,16 +11956,17 @@ self: {
        pname = "OrchestrateDB";
        version = "1.0.0.3";
        sha256 = "0d12jbdgpfkzax5c8djab6n611hcwi1bkphwmn5qmny43fb3wsaz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring HTTP http-conduit http-types lifted-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring HTTP http-conduit http-types lifted-base
          random
        ];
        homepage = "https://github.com/dwd31415/Haskell-OrchestrateDB";
        description = "Unofficial Haskell Client Library for the Orchestrate.io API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OrderedBits" = callPackage
@@ -11649,10 +11978,10 @@ self: {
        pname = "OrderedBits";
        version = "0.0.0.2";
        sha256 = "10scfjvng05vsx4clvzkfq128vf1qwwvc0zikkzx4b96pjxf80i2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bits primitive QuickCheck vector vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
@@ -11667,7 +11996,7 @@ self: {
        pname = "Ordinals";
        version = "0.0.0.2";
        sha256 = "04xk74rl2d6vp1kn197hsbkkwdvwvqpjqg3kgkpkl2i0r90y8lsi";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://patch-tag.com/r/kyagrd/Ordinals/";
        description = "Ordinal arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -11679,7 +12008,7 @@ self: {
        pname = "PArrows";
        version = "0.1.1";
        sha256 = "08mkq72zv9ywp002vwjk7gl6pq6915zdd06sp4ap935aqdjrhn0p";
-       buildDepends = [ base containers ghc-prim mtl ];
+       libraryHaskellDepends = [ base containers ghc-prim mtl ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/PArrows/";
        description = "Arrow parser combinators similar to Parsec";
        license = stdenv.lib.licenses.bsd3;
@@ -11690,10 +12019,10 @@ self: {
      mkDerivation {
        pname = "PBKDF2";
        version = "0.3.1.5";
-       revision = "1";
        sha256 = "0ljacj31pmcwk4lk24p37761sb60ncwjnjbqhnfrgdjqnyj2bd62";
+       revision = "1";
        editedCabalFile = "6e8829aa00d16484705a23417f548b237aa1bd152c864a7cfa6948996584db3e";
-       buildDepends = [ base binary bytestring Crypto random ];
+       libraryHaskellDepends = [ base binary bytestring Crypto random ];
        description = "Make password-based security schemes more secure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11704,7 +12033,9 @@ self: {
        pname = "PCLT";
        version = "0.1";
        sha256 = "0k5abpdz066dsszkj39fd03slb279ddj4i8clnq4gafpa90xbg9q";
-       buildDepends = [ base bytestring containers mtl utf8-string ];
+       libraryHaskellDepends = [
+         base bytestring containers mtl utf8-string
+       ];
        homepage = "http://github.com/Andrey-Sisoyev/PCLT";
        description = "Extension to Show: templating, catalogizing, languages, parameters, etc";
        license = "LGPL";
@@ -11719,7 +12050,7 @@ self: {
        pname = "PCLT-DB";
        version = "0.1.1";
        sha256 = "0nb5mijpkbllrs9034d3a24drd95lvrhlx60ahcd73kmagh9rfqf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers convertible HDBC HDBC-postgresql mtl
          PCLT
        ];
@@ -11737,7 +12068,7 @@ self: {
        sha256 = "1i5hixmywy63pnh15zl7npfiwc7dvlnz6izjxg08cnvn8jyi026q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://www.github.com/rotskoff";
        description = "A library for analysis of 3-D protein coordinates";
        license = stdenv.lib.licenses.gpl3;
@@ -11749,7 +12080,7 @@ self: {
        pname = "PSQueue";
        version = "1.1";
        sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Priority Search Queue";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11763,7 +12094,9 @@ self: {
        sha256 = "0pfd5y8plxicdchkbij0nqj6zwxw3fcy5cz1ji5bky9g3bmz9mhm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl network network-uri xml ];
+       executableHaskellDepends = [
+         base containers mtl network network-uri xml
+       ];
        homepage = "http://msakai.jp/hiki/?hsPTQ";
        description = "An implementation of Montague's PTQ";
        license = "LGPL";
@@ -11781,7 +12114,12 @@ self: {
        sha256 = "0pnnhwmlhjvpb3g94p2asbhy9arvlvcbch11m0hmy7w9m3zj9wjk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array attoparsec base base64-string bytestring containers directory
+         iconv network old-time regex-base regex-compat regex-tdfa sqlite
+         stringtable-atom utf8-string uuid
+       ];
+       executableHaskellDepends = [
          array attoparsec base base64-string bytestring containers directory
          iconv network old-time regex-base regex-compat regex-tdfa sqlite
          stringtable-atom utf8-string uuid
@@ -11800,8 +12138,8 @@ self: {
        pname = "Paillier";
        version = "0.1.0.3";
        sha256 = "0jcb72shia5p0lpnr3qz57jlzjvnwh4642zwys5d3rg0rwnxigz2";
-       buildDepends = [ base crypto-numbers crypto-random ];
-       testDepends = [
+       libraryHaskellDepends = [ base crypto-numbers crypto-random ];
+       testHaskellDepends = [
          base crypto-numbers crypto-random HUnit QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
@@ -11820,10 +12158,11 @@ self: {
        sha256 = "1g39mxrfii8vm40cbb7vdfrx2rx9gm4s1xhp3zjkiyi7f979cbk0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          Agda base containers directory filepath mtl pandoc pandoc-types
          QuickCheck text time xhtml
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        description = "Pandoc support for literate Agda";
        license = stdenv.lib.licenses.bsd3;
@@ -11841,11 +12180,11 @@ self: {
        pname = "Paraiso";
        version = "0.3.1.3";
        sha256 = "177sinj5il7azsajf9fl65lml7pq792lnvwb07vln5my250ibwi9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers control-monad-failure directory fgl filepath
          mtl numeric-prelude random text typelevel-tensor vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base containers control-monad-failure directory fgl filepath
          HUnit ListLike listlike-instances mtl numeric-prelude QuickCheck
          random test-framework test-framework-hunit
@@ -11866,7 +12205,7 @@ self: {
        pname = "Parry";
        version = "0.1.0.0";
        sha256 = "0jy0pya7ahy0nzw1yizi1ll7q5kv4jxgn3n56qgcwv25rh374n4s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory ghc-prim network
          old-locale process random RSA SafeSemaphore time unix
        ];
@@ -11882,7 +12221,7 @@ self: {
        pname = "ParsecTools";
        version = "0.0.2.0";
        sha256 = "11vshnbxfl8p38aix4h2b0vms8j58agwxbmhd9pkxai764sl6j7g";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Parsec combinators for more complex objects";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -11893,7 +12232,7 @@ self: {
        pname = "ParserFunction";
        version = "0.1.0";
        sha256 = "0l0j1mdycqsb5d32l7h0giwrj5yj54523gdn0bvim2vz67qrbxrq";
-       buildDepends = [ base containers parsec ];
+       libraryHaskellDepends = [ base containers parsec ];
        description = "Parse and evaluate mathematical expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11904,7 +12243,7 @@ self: {
        pname = "PartialTypeSignatures";
        version = "0.1.0.1";
        sha256 = "04c01bcfrb79av2j9bivlwanmycasn7gjnc9gb5jm6gkwyvgv0h3";
-       buildDepends = [ base containers syb template-haskell ];
+       libraryHaskellDepends = [ base containers syb template-haskell ];
        homepage = "http://code.haskell.org/~aavogt/PartialTypeSignatures";
        description = "emulate partial type signatures with template haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -11916,7 +12255,7 @@ self: {
        pname = "PasswordGenerator";
        version = "0.1.0.0";
        sha256 = "12lxylmpi2f1ahy6w1n7jmwn9kay4hajgr95xbnqqdzv4dw6whzw";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/VictorDenisov/PasswordGenerator";
        description = "Simple library for generating passwords";
@@ -11931,7 +12270,8 @@ self: {
        sha256 = "10gf9xkys704k89i9lajqcwqsihfxs314vjy35shhwgga5rjnslz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs HTTP network network-uri ];
+       libraryHaskellDepends = [ base cmdargs HTTP network network-uri ];
+       executableHaskellDepends = [ base cmdargs ];
        homepage = "http://github.com/Fuuzetsu/pastepipe";
        description = "CLI for pasting to lpaste.net";
        license = stdenv.lib.licenses.gpl3;
@@ -11943,8 +12283,8 @@ self: {
        pname = "Pathfinder";
        version = "0.5.10";
        sha256 = "1k38p73jnkfcmmz94iqpzg2g6apsxflidvy8p9lwqyzfmg70brqf";
-       buildDepends = [ base bytestring text ];
-       extraLibraries = [ libxml2 ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ libxml2 ];
        description = "Relational optimiser and code generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11956,7 +12296,7 @@ self: {
        pname = "Peano";
        version = "0.0.4";
        sha256 = "0ss4p40gkqcw9bdh5iy0yar56gpsanrxld74q5dxvakrf8m6cqmz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "simple Peano numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11967,7 +12307,7 @@ self: {
        pname = "PeanoWitnesses";
        version = "0.1.0.0";
        sha256 = "1g83jws23grl84gnq89rnppw6q7vsbhi9hk6lp5dq2n4818kamgg";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "GADT type witnesses for Peano-style natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -11981,10 +12321,10 @@ self: {
        pname = "PerfectHash";
        version = "0.1.4";
        sha256 = "1hj05lv8yj81nhpb01ljaqj9k7j6amw6lfx1azzjnwysmjj6ipkn";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers digest time
        ];
-       extraLibraries = [ cmph ];
+       librarySystemDepends = [ cmph ];
        jailbreak = true;
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
@@ -11997,7 +12337,7 @@ self: {
        pname = "PermuteEffects";
        version = "0.2";
        sha256 = "0lmmsvqbnw0k321254xfqlzmddvymy0mj50ax7caqj2fnarfgy4l";
-       buildDepends = [ base ReplicateEffects ];
+       libraryHaskellDepends = [ base ReplicateEffects ];
        jailbreak = true;
        homepage = "https://github.com/MedeaMelana/PermuteEffects";
        description = "Permutations of effectful computations";
@@ -12018,7 +12358,7 @@ self: {
        sha256 = "12f6hqgxyf3svr53g0irn15q69wp9py1bxfw3a5inpkqzmrs04x9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          acid-state aeson base blaze-html blaze-markup containers curl
          filepath friendly-time happstack-server happstack-server-tls
          lifted-base MissingH monad-control mtl network network-uri
@@ -12029,6 +12369,7 @@ self: {
        homepage = "localhost:9119";
        description = "Personal Happstack Server Utils";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Pipe" = callPackage
@@ -12037,7 +12378,7 @@ self: {
        pname = "Pipe";
        version = "2.1.2";
        sha256 = "1453rjp5whl9vywiq8i86vjfa8ys1ppwabhvlibqwsbx804q9yhr";
-       buildDepends = [ base filepath process unix ];
+       libraryHaskellDepends = [ base filepath process unix ];
        homepage = "http://iki.fi/matti.niemenmaa/pipe/";
        description = "Process piping library";
        license = stdenv.lib.licenses.bsd3;
@@ -12050,7 +12391,7 @@ self: {
        pname = "Piso";
        version = "0.1";
        sha256 = "123hwav5bsadd2lmzgys4dwja1xrbn1c5w19063ak21y5415ci83";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/MedeaMelana/Piso";
        description = "Partial isomorphisms";
        license = stdenv.lib.licenses.bsd3;
@@ -12066,7 +12407,7 @@ self: {
        sha256 = "17avnaz6da80v5kgz0b3v0zq3y9p2d3mxxv5a09ggcmilbz4xwlg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory mtl random regex-compat
        ];
        homepage = "freizl.github.com";
@@ -12082,7 +12423,7 @@ self: {
        pname = "PlayingCards";
        version = "0.3.0.0";
        sha256 = "1wq4y6dfn93c8pyxbz5dwbd1c2lq78fbw6s2pdk6nvi0zgf5hp6k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HUnit MonadRandom QuickCheck random-shuffle
        ];
        jailbreak = true;
@@ -12101,10 +12442,11 @@ self: {
        sha256 = "0x8mq7368yjb1q4xmkj6iqrxkf81d0vslfdrhp8cr12k83ydg3g3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo Chart Chart-cairo containers data-default-class
          generic-accessors glib gtk lens text time
        ];
+       executableHaskellDepends = [ base containers ];
        description = "Real-time line plotter for protobuf-like data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -12119,7 +12461,7 @@ self: {
        sha256 = "1kly1jfki4n9fhgkh2m9j9xj8182s92i7rsq81vcm6i3hd4fac94";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base directory filepath haskell98 old-locale old-time parsec
          process random
        ];
@@ -12135,7 +12477,7 @@ self: {
        pname = "Plural";
        version = "0.0.2";
        sha256 = "047aw1pka7xsqnshbmirkxd80m92w96xfb0kpi1a22bx0kpgg58w";
-       buildDepends = [ base containers regex-tdfa ];
+       libraryHaskellDepends = [ base containers regex-tdfa ];
        description = "Pluralize English words";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -12148,7 +12490,7 @@ self: {
        sha256 = "036b114f6fas2w3kmbcb1ria2ymdgi1sc5iqkskfgbc1iizhm2wh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base clock GLUT random ];
+       executableHaskellDepends = [ array base clock GLUT random ];
        description = "An imaginary world";
        license = "GPL";
      }) {};
@@ -12161,7 +12503,7 @@ self: {
        sha256 = "1n095a7ggkgvxdagn7wi1rnb3h766lah5avyrdxnv4g0kl143vvy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring network splice ];
+       executableHaskellDepends = [ base bytestring network splice ];
        homepage = "http://fusion.corsis.eu";
        description = "high-performance distributed reverse / forward proxy & tunneling for TCP";
        license = stdenv.lib.licenses.gpl3;
@@ -12173,8 +12515,8 @@ self: {
        pname = "PortMidi";
        version = "0.1.4";
        sha256 = "00w4208dan87adyd8gm7izbs38mva7glbi7s9rbcdjdkiz486q8m";
-       buildDepends = [ base ];
-       extraLibraries = [ alsaLib ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ alsaLib ];
        homepage = "http://haskell.org/haskellwiki/PortMidi";
        description = "A binding for PortMedia/PortMidi";
        license = stdenv.lib.licenses.bsd3;
@@ -12186,7 +12528,7 @@ self: {
        pname = "PostgreSQL";
        version = "0.2";
        sha256 = "0p5q3yc8ymgzzlc600h4mb9w86ncrgjdbpqfi49b2jqvkcx5bwrr";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Thin wrapper over the C postgresql library";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12202,11 +12544,11 @@ self: {
        pname = "PrimitiveArray";
        version = "0.6.1.0";
        sha256 = "1annz4pkz66jxcwzgq3b897vigf8b23aprv0vx1xyly9bbccdpcn";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary bits cereal deepseq OrderedBits primitive
          QuickCheck vector vector-binary-instances vector-th-unbox
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
@@ -12221,7 +12563,7 @@ self: {
        pname = "Printf-TH";
        version = "0.1.1";
        sha256 = "0n1gva510p69vy25zvjkzwqqz2gilbns1wnrzz2p22rjkkbrinvx";
-       buildDepends = [ base haskell98 pretty template-haskell ];
+       libraryHaskellDepends = [ base haskell98 pretty template-haskell ];
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -12232,7 +12574,7 @@ self: {
        pname = "PriorityChansConverger";
        version = "0.1";
        sha256 = "0258ysarn6k5kxxwy4lz9ww2rdhg5mg7h6idfbfrszcgwkcp22a1";
-       buildDepends = [ base containers stm ];
+       libraryHaskellDepends = [ base containers stm ];
        description = "Read single output from an array of inputs - channels with priorities";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12244,7 +12586,7 @@ self: {
        pname = "ProbabilityMonads";
        version = "0.1.0";
        sha256 = "0vmjg91yq4p0121ypjx4l1hh77j8xj6ha7awdvrjk5fjmz9xryh3";
-       buildDepends = [ base MaybeT MonadRandom mtl ];
+       libraryHaskellDepends = [ base MaybeT MonadRandom mtl ];
        description = "Probability distribution monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12258,7 +12600,8 @@ self: {
        sha256 = "1gr3xiwj5ggqlrvi2xi612sba0v7lwc3bz0w18knhh0gz60vslqy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base old-time random ];
+       libraryHaskellDepends = [ base old-time random ];
+       executableHaskellDepends = [ base old-time random ];
        homepage = "http://www.bucephalus.org/PropLogic";
        description = "Propositional Logic";
        license = stdenv.lib.licenses.bsd3;
@@ -12272,7 +12615,8 @@ self: {
        sha256 = "0y8jrvhnvb3nr8zi4hw8cm90nnz4lmcp3npvzsbz2wlkif5qf7k6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers HUnit parsec syb ];
+       libraryHaskellDepends = [ base containers syb ];
+       executableHaskellDepends = [ base containers HUnit parsec syb ];
        homepage = "https://github.com/dillonhuff/Proper";
        description = "An implementation of propositional logic in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -12285,7 +12629,7 @@ self: {
        pname = "ProxN";
        version = "0.0.1";
        sha256 = "0mx3kgkcbhppz2p6g8vb9yx27219ca2w7k36j60vfhszni1c4gid";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/exFalso/ProxN";
        description = "Proximity sets in N dimensions";
        license = stdenv.lib.licenses.bsd3;
@@ -12304,7 +12648,7 @@ self: {
        sha256 = "13advi8qykjslpg6kqilzdabz5076z6d69b66sf1ikyhjpc1j55i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring containers control-timeout directory
          filepath FindBin haskeline HsParrot HsSyck MetaObject mtl network
          parsec pretty process pugs-compat pugs-DrIFT random stm
@@ -12326,9 +12670,10 @@ self: {
        sha256 = "13zjhxq8q1qd7sbc17d73g6mfsfls6rl3ndawbcfjgj73b7xajyj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Pup-Events-Client Pup-Events-PQueue Pup-Events-Server
        ];
+       executableHaskellDepends = [ base ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12342,7 +12687,7 @@ self: {
        pname = "Pup-Events-Client";
        version = "1.1.4";
        sha256 = "1b6vkjnk1yk7ra221njh1mm92jgzqh2hjbh67p2h4fz2jf202xvm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base network parsec Pup-Events-PQueue stm transformers
        ];
        description = "A networked event handling framework for hooking into other programs";
@@ -12359,7 +12704,7 @@ self: {
        sha256 = "06cf18ccamaknkm2fcmj17ymdb2i3130q5bakbji4m8349bzhxxb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base GLUT OpenGL parsec Pup-Events-Client Pup-Events-PQueue
          Pup-Events-Server stm
        ];
@@ -12374,7 +12719,7 @@ self: {
        pname = "Pup-Events-PQueue";
        version = "1.0";
        sha256 = "0sngiqxzj5kif452s2hn3x1kv257815c5v19dp4wqazbyc373iwx";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -12387,7 +12732,7 @@ self: {
        pname = "Pup-Events-Server";
        version = "1.2";
        sha256 = "18n4bzhwvx336dv4yb5pbicaxbzzhhd36951diwhgw4gf5ji80dn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base network parsec Pup-Events-PQueue stm transformers
        ];
        description = "A networked event handling framework for hooking into other programs";
@@ -12400,7 +12745,7 @@ self: {
        pname = "QIO";
        version = "1.2";
        sha256 = "1wm0n5r5nfgbd35ry4fn25bzfj83gn3xbrd14clpw4wqqq45rhx6";
-       buildDepends = [ base containers mtl old-time random ];
+       libraryHaskellDepends = [ base containers mtl old-time random ];
        homepage = "http://www.cs.nott.ac.uk/~asg/QIO/";
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -12413,7 +12758,7 @@ self: {
        pname = "QuadEdge";
        version = "0.2";
        sha256 = "1f3wxc8ipb8ka02xq2snjs5wgl10mk528zjkpwdw5wf3fldhz037";
-       buildDepends = [ base random vector ];
+       libraryHaskellDepends = [ base random vector ];
        description = "QuadEdge structure for representing triangulations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -12424,7 +12769,7 @@ self: {
        pname = "QuadTree";
        version = "0.10.1";
        sha256 = "0r4qv6xw03g79sn1889vv1rzpkcpjm9lmipvxdl0l1d8r8kvxdxw";
-       buildDepends = [ base composition lens ];
+       libraryHaskellDepends = [ base composition lens ];
        jailbreak = true;
        description = "QuadTree library for Haskell, with lens support";
        license = stdenv.lib.licenses.gpl3;
@@ -12438,7 +12783,7 @@ self: {
        pname = "QuasiText";
        version = "0.1.2.5";
        sha256 = "10y2lirprxyh9m47qxq0plihc22xvmkhq6lfbx3i19vfvkbhnbwx";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base haskell-src-meta template-haskell text
        ];
        homepage = "https://github.com/mikeplus64/QuasiText";
@@ -12454,7 +12799,8 @@ self: {
        sha256 = "0xphlira6gxfs7md1b55vf9biqzw9v1kzmcs17x07xnzcy1y3dvb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskell-src-exts ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base haskell-src-exts ];
        jailbreak = true;
        homepage = "http://code.haskell.org/QuickAnnotate/";
        description = "Annotation Framework";
@@ -12467,10 +12813,10 @@ self: {
      mkDerivation {
        pname = "QuickCheck";
        version = "1.2.0.1";
-       revision = "2";
        sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld";
+       revision = "2";
        editedCabalFile = "8f06f07cae74e90cd5bdde3eed23b0e3293ad494f42f0f0cb77074fa3b7950d9";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        jailbreak = true;
        homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/";
        description = "Automatic testing of Haskell programs";
@@ -12485,10 +12831,12 @@ self: {
        pname = "QuickCheck";
        version = "2.8.1";
        sha256 = "0fvnfl30fxmj5q920l13641ar896d53z0z6z66m7c1366lvalwvh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers random template-haskell tf-random transformers
        ];
-       testDepends = [ base containers template-haskell test-framework ];
+       testHaskellDepends = [
+         base containers template-haskell test-framework
+       ];
        homepage = "https://github.com/nick8325/quickcheck";
        description = "Automatic testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -12500,7 +12848,7 @@ self: {
        pname = "QuickCheck-GenT";
        version = "0.1.4";
        sha256 = "07zsp1praq0g6mcpfli9r1dwhfgj2cl5a2dljm6cdc8nsjl6dz7x";
-       buildDepends = [ base mtl QuickCheck random ];
+       libraryHaskellDepends = [ base mtl QuickCheck random ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/QuickCheck-GenT";
        description = "A GenT monad transformer for QuickCheck library";
@@ -12513,10 +12861,10 @@ self: {
      mkDerivation {
        pname = "QuickCheck-safe";
        version = "0.1.0.1";
-       revision = "3";
        sha256 = "0rxqd1n814b9mf6zg1i0g9d96ym9xqdgky7w7qf5bnnnpkk1ckc7";
+       revision = "3";
        editedCabalFile = "4e791ac9fa2f2e73029ab92d17e3ab93571ec5b1d5acda0ea1f340c5ee1346f6";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        description = "Safe reimplementation of QuickCheck's core";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -12528,7 +12876,9 @@ self: {
        pname = "Quickson";
        version = "0.2";
        sha256 = "1mr8ilcjlwxcpbblk6l6w022qbf4ngzd0q62fc9k1kjb0w1palbg";
-       buildDepends = [ aeson attoparsec base bytestring either text ];
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring either text
+       ];
        homepage = "https://github.com/ssadler/quickson";
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -12543,8 +12893,8 @@ self: {
        pname = "RANSAC";
        version = "0.1.0.1";
        sha256 = "1frn3y0j4w337mfaakqw58d7p9pqhbi2fzk8blv6zilzvqmhbqqv";
-       buildDepends = [ base random vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base random vector ];
+       testHaskellDepends = [
          base HUnit lens linear test-framework test-framework-hunit vector
        ];
        description = "The RANSAC algorithm for parameter estimation";
@@ -12557,7 +12907,7 @@ self: {
        pname = "RBTree";
        version = "0.0.5";
        sha256 = "0p46b105lixbxqjz8pwxf4asl4s7zdh2ss3nvgmp1rclqfg6cwrq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "git://github.com/wuxb45/Haskell-RBTree.git";
        description = "Pure haskell Red-Black-Tree implemetation";
        license = stdenv.lib.licenses.bsd3;
@@ -12571,7 +12921,7 @@ self: {
        pname = "RESTng";
        version = "0.1";
        sha256 = "1fans0znb3i33n9cxd8w140n1sl8bdyl874cdrgc5wvlg6y3y4aj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HDBC HDBC-postgresql mtl old-time parsec redHandlers xhtml
          yuiGrid
        ];
@@ -12589,8 +12939,8 @@ self: {
        pname = "RFC1751";
        version = "0.3.0.1";
        sha256 = "1347cl0z5zw7f4dn6bjyf19pnfq06dzwpcl68z14zgxw0p58crka";
-       buildDepends = [ base binary bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring ];
+       testHaskellDepends = [
          base binary bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -12607,7 +12957,7 @@ self: {
        pname = "RJson";
        version = "0.3.7";
        sha256 = "04vlhcyikd4liy65xiy3xn4slkm5w4q3r8ir54s095zs9bq8jx1n";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers iconv mtl parsec syb-with-class
        ];
        description = "A reflective JSON serializer/parser";
@@ -12625,10 +12975,12 @@ self: {
        sha256 = "0bcilw8z764p6idjj19kxk9if5l4pxyn7zszxjv0q3bfky1rd8ay";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ allocated-processor base ];
+       librarySystemDepends = [ canlib ftd2xx ];
+       executableHaskellDepends = [
          allocated-processor base cv-combinators HOpenCV vector-space
        ];
-       extraLibraries = [ canlib ftd2xx ];
+       executableSystemDepends = [ canlib ftd2xx ];
        description = "Binding to code that controls a Segway RMP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12645,10 +12997,13 @@ self: {
        sha256 = "0r4y4rinrdr2xwfpnys5agm1awr3qr9im4cqczz1fzjz7r425m96";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ADPfusion base BiobaseTurner BiobaseVienna BiobaseXNA cmdargs
          containers deepseq lens primitive PrimitiveArray repa strict vector
        ];
+       executableHaskellDepends = [
+         base BiobaseTurner BiobaseVienna BiobaseXNA cmdargs
+       ];
        homepage = "http://www.tbi.univie.ac.at/~choener/adpfusion";
        description = "RNA secondary structure prediction";
        license = stdenv.lib.licenses.gpl3;
@@ -12666,7 +13021,7 @@ self: {
        sha256 = "1bmybm80fhw7xqjzny2iricicbzqsl33snpsjamfcr16a939wlwp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Biobase BiobaseTurner BiobaseTypes BiobaseVienna cmdargs
          containers HsTools primitive PrimitiveArray RNAFold split vector
        ];
@@ -12690,13 +13045,13 @@ self: {
        sha256 = "1qdfbwiydkh0974m7r4ashxhsbkss8k9d6kpc07vj4hspjf5v5ag";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base BiobaseTurner BiobaseVienna BiobaseXNA bytestring
-         cmdargs containers fgl fgl-extras-decompositions file-embed lens
-         monad-primitive mwc-random-monad parallel parsec ParsecTools
-         primitive PrimitiveArray random RNAFold transformers tuple vector
-         ViennaRNA-bindings
+       libraryHaskellDepends = [
+         array base BiobaseTurner BiobaseVienna BiobaseXNA containers fgl
+         fgl-extras-decompositions lens monad-primitive mwc-random-monad
+         parallel parsec ParsecTools primitive PrimitiveArray random RNAFold
+         transformers tuple vector ViennaRNA-bindings
        ];
+       executableHaskellDepends = [ bytestring cmdargs file-embed ];
        description = "Multi-target RNA sequence design";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12712,10 +13067,11 @@ self: {
        sha256 = "1d85lps04b2sn23fzyn5hd8lj2lf7byqk7flj8p2b905hl3062dx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base BiobaseXNA bytestring cmdargs containers PrimitiveArray
+       libraryHaskellDepends = [
+         array base BiobaseXNA bytestring containers PrimitiveArray
          QuasiText repa split text vector
        ];
+       executableHaskellDepends = [ cmdargs ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Draw RNA secondary structures";
        license = stdenv.lib.licenses.gpl3;
@@ -12733,11 +13089,11 @@ self: {
        sha256 = "1s7ilg8814gglg4n64nk94b51fdzh2fm1y4k1mw8d81qd66y60vn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base BiobaseTrainingData BiobaseXNA bytestring cmdargs containers
-         deepseq directory parallel PrimitiveArray random split
-         StatisticalMethods vector
+       libraryHaskellDepends = [
+         base BiobaseTrainingData BiobaseXNA bytestring containers deepseq
+         directory parallel PrimitiveArray random StatisticalMethods vector
        ];
+       executableHaskellDepends = [ cmdargs split ];
        jailbreak = true;
        homepage = "http://www.tbi.univie.ac.at/software/rnawolf/";
        description = "RNA folding with non-canonical basepairs and base-triplets";
@@ -12754,10 +13110,10 @@ self: {
        pname = "RSA";
        version = "2.1.0.1";
        sha256 = "0m74683bm34zd5r46ndb1h8jx1xp8wypfqm0gi3zmrv1rmm0j0hv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types pureMD5 SHA
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5
          QuickCheck SHA tagged test-framework test-framework-quickcheck2
        ];
@@ -12775,7 +13131,7 @@ self: {
        sha256 = "1aalh68h6799mv4vyg30zpskl5jkn6x2j1jza7p4lrflyifxzar8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers extensible-exceptions GLUT mtl OpenGL random SDL
          SDL-image SDL-mixer time
        ];
@@ -12793,8 +13149,8 @@ self: {
        pname = "Random123";
        version = "0.2.0";
        sha256 = "18q6nf63qapypj10iifpc1qdaq7pndmv2p7jz0f96y113z33nqy4";
-       buildDepends = [ array base data-dword random ];
-       testDepends = [
+       libraryHaskellDepends = [ array base data-dword random ];
+       testHaskellDepends = [
          base HUnit QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -12809,7 +13165,7 @@ self: {
        pname = "RandomDotOrg";
        version = "0.2.1";
        sha256 = "0rfarn424wsvvwvi7b1qzvzc63dxfqmlyrfd0hdcvmgkq5h2iy4c";
-       buildDepends = [ base HTTP-Simple network ];
+       libraryHaskellDepends = [ base HTTP-Simple network ];
        description = "Interface to random.org";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12823,7 +13179,7 @@ self: {
        sha256 = "1anj962cpgl06hipjfdygxlvq6adkdg3r0ghkwkzzf3dklmwzng6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base random-fu ];
+       executableHaskellDepends = [ base random-fu ];
        homepage = "http://github.com/Soares/Randometer.hs";
        description = "Randomness intuition trainer";
        license = stdenv.lib.licenses.mit;
@@ -12835,7 +13191,7 @@ self: {
        pname = "Range";
        version = "0.1.0.0";
        sha256 = "0759508s75zba89jjr56sqpm7idgwsxynmf9zl9hwrz9q11fxrqh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Data structure for managing ranges";
        license = stdenv.lib.licenses.bsd3;
@@ -12847,7 +13203,7 @@ self: {
        pname = "Ranged-sets";
        version = "0.3.0";
        sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l";
-       buildDepends = [ base HUnit QuickCheck ];
+       libraryHaskellDepends = [ base HUnit QuickCheck ];
        homepage = "http://code.haskell.org/ranged-sets";
        description = "Ranged sets for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -12861,7 +13217,9 @@ self: {
        sha256 = "1df010121jdjbagc3gg906kydmwwpa7np1c0mx7w2v64mr7i2q1r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HTTP json network utf8-string XMPP ];
+       executableHaskellDepends = [
+         base HTTP json network utf8-string XMPP
+       ];
        homepage = "http://kagami.touhou.ru/projects/show/ranka";
        description = "HTTP to XMPP omegle chats gate";
        license = "GPL";
@@ -12879,7 +13237,7 @@ self: {
        sha256 = "0y90clz236lqhacv6ba4w3qx4fyd5yls9nh4chk8s945hr92jg57";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring cereal containers convertible directory
          filepath ghc GLUT monad-loops OpenGL OpenGLRaw time Yampa
        ];
@@ -12896,7 +13254,7 @@ self: {
        pname = "Rasterific";
        version = "0.6.1";
        sha256 = "1y9jciiaam0dn2falhxc0nb97vy35dfvv71xzc1bhiw4gn66n4rm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers dlist FontyFruity free JuicyPixels mtl
          primitive vector vector-algorithms
        ];
@@ -12912,8 +13270,9 @@ self: {
        sha256 = "1v6yr5zzrrj31prfzxxh1n27sfnkqpkw34v3a47rcnm444ba58a7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base system-filepath text ];
-       testDepends = [ base hspec system-filepath text ];
+       libraryHaskellDepends = [ base system-filepath text ];
+       executableHaskellDepends = [ base system-filepath text ];
+       testHaskellDepends = [ base hspec system-filepath text ];
        jailbreak = true;
        homepage = "http://github.com/rampion/ReadArgs";
        description = "Simple command line argument parsing";
@@ -12930,12 +13289,12 @@ self: {
        pname = "Redmine";
        version = "0.0.6";
        sha256 = "10lq9lhz3yyzkzwbi8rx060hmwh0c8cplydrfzdmd1653x8267z8";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring connection containers HTTP http-client-tls
          http-conduit http-types MissingH network old-locale old-time
          resourcet text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring connection containers http-client-tls
          http-conduit HUnit MissingH network old-locale resourcet text time
          transformers
@@ -12951,7 +13310,7 @@ self: {
        pname = "Ref";
        version = "0.1.1.0";
        sha256 = "15qikbjbydbabc26skhavshzrsaz17a71q8hfxqvi5ix2bhhz4hm";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "https://bitbucket.org/carter/ref";
        description = "Generic Mutable Ref Abstraction Layer";
@@ -12967,7 +13326,7 @@ self: {
        pname = "RefSerialize";
        version = "0.3.1.4";
        sha256 = "1hl1jxdarqp59fs1sjvxpyhcazrnlm4iywysgkf3iqm56jfp2f6w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers hashtables stringsearch
        ];
        description = "Write to and read from ByteStrings maintaining internal memory references";
@@ -12984,9 +13343,11 @@ self: {
        sha256 = "076pa25455jd4b0dbs9gfksaa1ww66yvnknki4yivc0pm60pnh7r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring cassava cmdargs cond containers directory glpk-hs
-         matrix MissingH vector
+       libraryHaskellDepends = [
+         base bytestring cassava containers glpk-hs matrix MissingH vector
+       ];
+       executableHaskellDepends = [
+         base cmdargs cond containers directory
        ];
        jailbreak = true;
        homepage = "https://github.com/pablocouto/Referees";
@@ -13001,7 +13362,7 @@ self: {
        pname = "RepLib";
        version = "0.5.3.3";
        sha256 = "1772r6rfajcn622dxwy9z1bvv53l5xj6acbcv8n9p7h01fs52mpr";
-       buildDepends = [ base containers mtl template-haskell ];
+       libraryHaskellDepends = [ base containers mtl template-haskell ];
        jailbreak = true;
        homepage = "http://code.google.com/p/replib/";
        description = "Generic programming library with representation types";
@@ -13015,7 +13376,7 @@ self: {
        pname = "ReplicateEffects";
        version = "0.3";
        sha256 = "194nbnbrf5g3d2pch6z9zapzhi0i2z30vpgjj0h5x8bfwzpf1527";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/MedeaMelana/ReplicateEffects";
        description = "Composable replication schemes of applicative functors";
        license = stdenv.lib.licenses.bsd3;
@@ -13031,7 +13392,8 @@ self: {
        sha256 = "1grcs7mily2gpxdzq1pcz1f71z2d8pz6paqrb8yv38nkckvm4j75";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base HTTP json mtl network random ];
+       executableHaskellDepends = [
          base directory HTTP json mtl network process random
        ];
        description = "Haskell bindings to ReviewBoard";
@@ -13045,7 +13407,7 @@ self: {
        pname = "RichConditional";
        version = "0.1.0.0";
        sha256 = "065plckw5r16aalkf51y7hs2xjandad3hgfly795wakqfhdnrajw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/avieth/RichConditional";
        description = "Tiny library to replace classic if/else";
@@ -13063,13 +13425,13 @@ self: {
        pname = "Rlang-QQ";
        version = "0.3.1.0";
        sha256 = "0rl3cmr7vfc8vk7132y40ib0l53v9yndw71bmp25zj24nkmha7hj";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring Cabal containers data-binary-ieee754
          directory filepath haskell-src-meta HList lens mtl process repa SHA
          split syb template-haskell temporary text transformers trifecta
          utf8-string vector zlib
        ];
-       testDepends = [ base directory doctest hspec lens vector ];
+       testHaskellDepends = [ base directory doctest hspec lens vector ];
        homepage = "http://code.haskell.org/~aavogt/Rlang-QQ";
        description = "quasiquoter for inline-R code";
        license = stdenv.lib.licenses.bsd3;
@@ -13087,11 +13449,11 @@ self: {
        sha256 = "0mw4hd99v8pp75ng75cv3vym5ld93f07mpkcbi2b6v12k68bxx4v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath hdaemonize-buildfix hinotify hsyslog
          monad-parallel unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -13106,7 +13468,7 @@ self: {
        pname = "RxHaskell";
        version = "0.2";
        sha256 = "0pwxsvkpdr4vzr6cpgjmkr55ip6ns3gcv8pma7dwzg21myx9c3vl";
-       buildDepends = [ base containers stm transformers ];
+       libraryHaskellDepends = [ base containers stm transformers ];
        homepage = "https://github.com/jspahrsummers/RxHaskell";
        description = "Reactive Extensions for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -13122,7 +13484,7 @@ self: {
        pname = "SBench";
        version = "0.2.0";
        sha256 = "0ym9qdwwn180365hgvwi6djzbqvfiyqrd2fhywpvxihwxnlnhiam";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cassava criterion deepseq directory filepath
          gnuplot hp2any-core parsec process utf8-string vector
        ];
@@ -13137,7 +13499,7 @@ self: {
        pname = "SConfig";
        version = "0.2.0.0";
        sha256 = "032s6szll58zavdnf6fsj2rhpdlizv3l46lh819bqjy1kbffv0yz";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/fgaz/SConfig";
        description = "A simple config library";
        license = stdenv.lib.licenses.mit;
@@ -13148,14 +13510,13 @@ self: {
      mkDerivation {
        pname = "SDL";
        version = "0.6.5.1";
-       revision = "1";
        sha256 = "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46";
+       revision = "1";
        editedCabalFile = "233e3fde4727ca7b597e0bf86619c6b862c32445191a37b7a536a3188634473e";
-       buildDepends = [ base ];
-       extraLibraries = [ SDL ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ SDL ];
        description = "Binding to libSDL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) SDL;};
 
   "SDL-gfx" = callPackage
@@ -13164,37 +13525,35 @@ self: {
        pname = "SDL-gfx";
        version = "0.6.0.1";
        sha256 = "1ay72r29ybxf4icaqadly02xi03ifz82a8jz3xkvlk26c9bxl4c3";
-       buildDepends = [ base SDL ];
+       libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_gfx";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SDL-image" = callPackage
-    ({ mkDerivation, base, SDL, SDL_image }:
+    ({ mkDerivation, base, SDL }:
      mkDerivation {
        pname = "SDL-image";
        version = "0.6.1.1";
        sha256 = "1m02q2426qp8m8pzz2jkk4srk2vb3j3ickiaga5jx9rkkhz732zq";
-       buildDepends = [ base SDL ];
-       extraLibraries = [ SDL_image ];
+       libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_image";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) SDL_image;};
+     }) {};
 
   "SDL-mixer" = callPackage
-    ({ mkDerivation, base, SDL, SDL_mixer }:
+    ({ mkDerivation, base, SDL }:
      mkDerivation {
        pname = "SDL-mixer";
        version = "0.6.1.1";
        sha256 = "0md3238hx79mxb9a7l43kg3b3d28x4mqvj0hjsbsh15ajnvy9x2z";
-       buildDepends = [ base SDL ];
-       extraLibraries = [ SDL_mixer ];
+       libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_mixer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) SDL_mixer;};
+     }) {};
 
   "SDL-mpeg" = callPackage
     ({ mkDerivation, base, SDL, smpeg }:
@@ -13202,25 +13561,24 @@ self: {
        pname = "SDL-mpeg";
        version = "0.0.1";
        sha256 = "0hx4977iynchnyd4b9ycbiw5qq07wk1a7dkisqx0a3x0ca4qirwj";
-       buildDepends = [ base SDL ];
-       extraLibraries = [ smpeg ];
+       libraryHaskellDepends = [ base SDL ];
+       librarySystemDepends = [ smpeg ];
        description = "Binding to the SMPEG library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) smpeg;};
 
   "SDL-ttf" = callPackage
-    ({ mkDerivation, base, SDL, SDL_ttf }:
+    ({ mkDerivation, base, SDL }:
      mkDerivation {
        pname = "SDL-ttf";
        version = "0.6.2.1";
        sha256 = "1ld551jgrcs3c7n53zyzlkrxkf01rp81wwvf9ynkm0c5kgll779s";
-       buildDepends = [ base SDL ];
-       extraLibraries = [ SDL_ttf ];
+       libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_ttf";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) SDL_ttf;};
+     }) {};
 
   "SDL2-ttf" = callPackage
     ({ mkDerivation, base, SDL2, SDL2_ttf }:
@@ -13228,13 +13586,13 @@ self: {
        pname = "SDL2-ttf";
        version = "0.1.0";
        sha256 = "03ng8kih285pvwj06jdwk4hkyyyb8j666pnvagnw5hsjhq60r8h6";
-       buildDepends = [ base ];
-       extraLibraries = [ SDL2 SDL2_ttf ];
+       libraryHaskellDepends = [ base SDL2 ];
+       librarySystemDepends = [ SDL2 SDL2_ttf ];
        jailbreak = true;
        description = "Binding to libSDL-ttf";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) SDL2;  inherit (pkgs) SDL2_ttf;};
+       broken = true;
+     }) { SDL2 = null;  inherit (pkgs) SDL2_ttf;};
 
   "SFML" = callPackage
     ({ mkDerivation, base, csfml-audio, csfml-graphics, csfml-network
@@ -13244,8 +13602,8 @@ self: {
        pname = "SFML";
        version = "0.2.0.0";
        sha256 = "1jz7wgrjc169slq7akf9sdgpfnl1cbiahig8hqck9p40ixn456k6";
-       buildDepends = [ base ];
-       extraLibraries = [
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [
          csfml-audio csfml-graphics csfml-network csfml-system csfml-window
        ];
        homepage = "https://github.com/jeannekamikaze/SFML";
@@ -13262,7 +13620,7 @@ self: {
        pname = "SFML-control";
        version = "0.2.0.2";
        sha256 = "001h9y9395mz6fr58s1i8svn4pyy5iqbkzzsp19xdphh4w69za9g";
-       buildDepends = [ base mtl SFML template-haskell ];
+       libraryHaskellDepends = [ base mtl SFML template-haskell ];
        homepage = "https://github.com/SFML-haskell/SFML-control";
        description = "Higher level library on top of SFML";
        license = stdenv.lib.licenses.mit;
@@ -13275,7 +13633,7 @@ self: {
        pname = "SFont";
        version = "0.1.1";
        sha256 = "077yvys00kp8lmkvc4mbynmkk9nn2ib5rh38bqcw0wnwsvl7140i";
-       buildDepends = [ array base SDL Sprig ];
+       libraryHaskellDepends = [ array base SDL Sprig ];
        homepage = "http://liamoc.net/static/SFont";
        description = "SFont SDL Bitmap Fonts";
        license = stdenv.lib.licenses.bsd3;
@@ -13288,7 +13646,7 @@ self: {
        pname = "SG";
        version = "1.0";
        sha256 = "0aj15lp5wbldaa9ndfvni1iq7kcrjv1syln9yz77jg6p8ndk61jv";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13302,7 +13660,7 @@ self: {
        sha256 = "0f7s8y5wq479i2yix2ik5ffsqkrb65pi31n6a03453kvk5jc7wv6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT OpenGL SG ];
+       executableHaskellDepends = [ base GLUT OpenGL SG ];
        jailbreak = true;
        description = "An example of using the SG and OpenGL libraries";
        license = "GPL";
@@ -13319,8 +13677,9 @@ self: {
        sha256 = "134ajm87fm4lpsw86m9q8apv20dw4bpk46raa389zr6bcdpifw64";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base binary bytestring directory ];
-       testDepends = [
+       libraryHaskellDepends = [ array base binary bytestring ];
+       executableHaskellDepends = [ base bytestring directory ];
+       testHaskellDepends = [
          array base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -13334,7 +13693,9 @@ self: {
        pname = "SHA2";
        version = "0.2.5";
        sha256 = "1zs79a327x6myfam3p2vr8lmszcaqnkll2qz8n4sy835vz328j40";
-       buildDepends = [ AES base bytestring monads-tf transformers ];
+       libraryHaskellDepends = [
+         AES base bytestring monads-tf transformers
+       ];
        description = "Fast, incremental SHA hashing for bytestrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13347,7 +13708,7 @@ self: {
        pname = "SMTPClient";
        version = "1.1.0";
        sha256 = "07njj24c43iz33c641d5ish62h13lhpvn2mx5pv5i6s3fm3bxsfk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers extensible-exceptions hsemail network old-locale
          old-time
        ];
@@ -13363,10 +13724,10 @@ self: {
        pname = "SNet";
        version = "0.1.0";
        sha256 = "19ls2icg5vflznf9wn5b429x6blismcdxinh66vd8cr8hwgc8m99";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL containers data-default lens mtl transformers
        ];
-       buildTools = [ c2hsc ];
+       libraryToolDepends = [ c2hsc ];
        jailbreak = true;
        homepage = "http://www.snet-home.org/";
        description = "Declarative coördination language for streaming networks";
@@ -13382,7 +13743,7 @@ self: {
        pname = "SQLDeps";
        version = "0.1";
        sha256 = "1dx4vxrc7hjms3bx80bngwr5jxkb1v9hps09ayi0mqwhnfzq5vgp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hashable HDBC HDBC-sqlite3 mtl unordered-containers
        ];
        description = "Calculate db-data dependencies of functions";
@@ -13395,7 +13756,7 @@ self: {
        pname = "STL";
        version = "0.3.0.2";
        sha256 = "0papwfxp4y8rn1rqm0sw22lbfw6iaziziprh04z85isrwkfh8v43";
-       buildDepends = [ attoparsec base bytestring cereal text ];
+       libraryHaskellDepends = [ attoparsec base bytestring cereal text ];
        homepage = "http://github.com/bergey/STL";
        description = "STL 3D geometry format parsing and pretty-printing";
        license = stdenv.lib.licenses.bsd3;
@@ -13407,7 +13768,7 @@ self: {
        pname = "STMonadTrans";
        version = "0.3.3";
        sha256 = "05d37ax0j8dp1h1w6pxkf1415mzn4gasdhn7gbsr8ay46iv1r4fr";
-       buildDepends = [ array base mtl ];
+       libraryHaskellDepends = [ array base mtl ];
        description = "A monad transformer version of the ST monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13422,7 +13783,7 @@ self: {
        sha256 = "07cr20cdz4dk8c9j84j1wlzhg4qb4hmgyvh2nnlh4vc52bvvizmq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base haskell98 language-c pretty svgutils syb xml
        ];
        jailbreak = true;
@@ -13441,7 +13802,7 @@ self: {
        pname = "SVGFonts";
        version = "1.5.0.0";
        sha256 = "0w1675cwd8gx65vh421abnl4z6jw7jaz3a43g04x0a5kgf1sfl76";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-markup blaze-svg containers
          data-default-class diagrams-core diagrams-lib directory parsec
          split text tuple vector xml
@@ -13456,7 +13817,7 @@ self: {
        pname = "SVGPath";
        version = "1.1.2";
        sha256 = "1a4rmp1rn6jv8nkab688i146ywiv4w6fp5bpm0slwgda2x0h6lp4";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Parsing the path command of SVG";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13469,7 +13830,7 @@ self: {
        pname = "SWMMoutGetMB";
        version = "0.1.0.0";
        sha256 = "069076ckklky3hw26ff82kqnambb7yfcwf76dwzp7cahp8fpvq6l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 split
        ];
        jailbreak = true;
@@ -13488,7 +13849,8 @@ self: {
        sha256 = "1sngk170p5wyi3sgjkl74fr3k570fbfabhbg0dnp8z4iw53d8jfl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ array base containers ];
+       executableHaskellDepends = [
          array base containers filepath loch-th pretty text transformers
          wl-pprint-text xml
        ];
@@ -13503,7 +13865,7 @@ self: {
        pname = "Safe";
        version = "0.1";
        sha256 = "0ybi5r4635yjx41ig54bm426fbdzrivc5kn8fwqxmzm62ai0v623";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/projects/libraries.php";
        description = "Library for safe (pattern match free) functions";
        license = stdenv.lib.licenses.bsd3;
@@ -13514,11 +13876,11 @@ self: {
      mkDerivation {
        pname = "SafeSemaphore";
        version = "0.10.1";
-       revision = "1";
        sha256 = "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91";
+       revision = "1";
        editedCabalFile = "1b168ec8de4b3958df15b33ba9ab60d8a651d9dd4ea36891d4c31ae81e7ec1cc";
-       buildDepends = [ base containers stm ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base containers stm ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/ChrisKuklewicz/SafeSemaphore";
        description = "Much safer replacement for QSemN, QSem, and SampleVar";
        license = stdenv.lib.licenses.bsd3;
@@ -13530,8 +13892,8 @@ self: {
        pname = "Salsa";
        version = "0.2.0.2";
        sha256 = "0915mwi1ksa85in03vzm5hqbvk6ih7l0zslg5cmy7j9fc0jhgwgd";
-       buildDepends = [ base bytestring file-embed ];
-       extraLibraries = [ glib mono ];
+       libraryHaskellDepends = [ base bytestring file-embed ];
+       librarySystemDepends = [ glib mono ];
        homepage = "http://haskell.org/haskellwiki/Salsa";
        description = "A .NET Bridge for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -13550,12 +13912,13 @@ self: {
        sha256 = "0f6z17ry2n0qkgajiwip09r7dbcn72dkz7gh4igwk3n0igxlpqsr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default directory either exceptions filepath
          formatting ini mtl network old-locale process spawn stm temporary
          text time unordered-containers yaml
        ];
-       testDepends = [ base data-default either hlint hspec mtl ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base data-default either hlint hspec mtl ];
        description = "Saturnin CI / Job System";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13568,7 +13931,7 @@ self: {
        pname = "SciFlow";
        version = "0.2.0";
        sha256 = "1cvh5c5mj5jy02ky2hjkf7bkjy9wx2187dmf9d71wby9ymklg8ng";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class mtl shelly template-haskell text
          unordered-containers yaml
        ];
@@ -13586,7 +13949,7 @@ self: {
        sha256 = "0c410hnby7g5qdx1kj3shwxl0m910vl3rj3ayx6f5qsz5by5rczh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath HFuse hsyslog process
          regex-compat sqlite-simple unix
        ];
@@ -13607,7 +13970,7 @@ self: {
        sha256 = "0iwlai8zspz08l3v7qf505mgfxn5v177kqa1x4xfssq7wzxawq8j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers network network-bytestring parsec
          random stm time unix
        ];
@@ -13625,7 +13988,7 @@ self: {
        sha256 = "1hagm0y9x2j1wcgk5ibxnlh2slnxfggn79cq20ws0zvd4yqw3231";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Data structure for querying the set (or count) of intervals covering given point";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13640,7 +14003,7 @@ self: {
        sha256 = "1l334lvm56xr7rw135l6nj7iz4h1yskl1fcrr5rdimlw7dyw2cr8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring classify containers mongoDB mtl network process
          split tagsoup text
        ];
@@ -13656,7 +14019,7 @@ self: {
        pname = "Semigroup";
        version = "0.0.7";
        sha256 = "1mdw1z50gr02j5hycki5rl95b1yk7xfrdk056ajw9ghw48s0jpx6";
-       buildDepends = [ base bytestring containers mtl ];
+       libraryHaskellDepends = [ base bytestring containers mtl ];
        homepage = "https://bitbucket.org/dibblego/semigroup/";
        description = "A semigroup";
        license = stdenv.lib.licenses.bsd3;
@@ -13668,7 +14031,7 @@ self: {
        pname = "SeqAlign";
        version = "0.1.0.0";
        sha256 = "0vk63ni1a93win8if032nps5y0xi245cmjqq2j4xfsdddg5bdln5";
-       buildDepends = [ base bytestring vector ];
+       libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13682,7 +14045,7 @@ self: {
        pname = "SessionLogger";
        version = "0.3.0.0";
        sha256 = "1zgjslf9p64aa7dwww44jq2f6iic1192ic98gmjsjj5ww8anl8c3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath hslogger mtl old-locale random time
        ];
        jailbreak = true;
@@ -13701,11 +14064,14 @@ self: {
        sha256 = "06k5adw28abdfpvfjq0zka05211w6nlbf1ry3d9hck3jcrqvg1f1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory json mtl parsec QuickCheck regex-tdfa
+       ];
+       executableHaskellDepends = [
          base containers directory json mtl parsec QuickCheck regex-tdfa
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory json mtl parsec QuickCheck regex-tdfa
          transformers
        ];
@@ -13720,7 +14086,7 @@ self: {
        pname = "Shellac";
        version = "0.9.5.2";
        sha256 = "1js9la0hziqsmb56q9kzfycda2sw3xm4kv2y5q2h3zlw5gzc5xli";
-       buildDepends = [ base directory mtl unix ];
+       libraryHaskellDepends = [ base directory mtl unix ];
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "A framework for creating shell envinronments";
        license = stdenv.lib.licenses.bsd3;
@@ -13733,7 +14099,7 @@ self: {
        pname = "Shellac-compatline";
        version = "0.9.5.2";
        sha256 = "134m0krbd3vlswjxdfvv9xy9x962g7ksg1mqmmgczss9ph2dx08i";
-       buildDepends = [ base Shellac Shellac-editline ];
+       libraryHaskellDepends = [ base Shellac Shellac-editline ];
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "\"compatline\" backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
@@ -13746,7 +14112,7 @@ self: {
        pname = "Shellac-editline";
        version = "0.9.5.2";
        sha256 = "14x4w4msh99c8vzhlv88ixb8yx43k178qz7504na68820389l9ah";
-       buildDepends = [ base editline Shellac ];
+       libraryHaskellDepends = [ base editline Shellac ];
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "Editline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
@@ -13759,7 +14125,7 @@ self: {
        pname = "Shellac-haskeline";
        version = "0.2.0.2";
        sha256 = "0q70d5arw1yg0f8b6p3k0g3i4jbh2d8rp1cchswd3ynhinzhrnqg";
-       buildDepends = [ base haskeline mtl Shellac ];
+       libraryHaskellDepends = [ base haskeline mtl Shellac ];
        jailbreak = true;
        description = "Haskeline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
@@ -13772,7 +14138,7 @@ self: {
        pname = "Shellac-readline";
        version = "0.9.5.2";
        sha256 = "0248zzp40gadcc4xkr5dmjc4phq0xz9j4sirdncnr62y3pi4zi0n";
-       buildDepends = [ base readline Shellac ];
+       libraryHaskellDepends = [ base readline Shellac ];
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "Readline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
@@ -13785,7 +14151,7 @@ self: {
        pname = "ShowF";
        version = "0.1.1";
        sha256 = "1nq4i4h43nfh86f6wgwng1ps6mcdl1ba96x9wsjl3qzn3blavyfh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/conal/ShowF/";
        description = "Show for * -> *";
        license = stdenv.lib.licenses.bsd3;
@@ -13797,7 +14163,7 @@ self: {
        pname = "Shrub";
        version = "0.1.0.0";
        sha256 = "105rnyrqzagfgbfdxbdx4wqhvdfxkd8d5jaxkyqd1zyvf0chi858";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "4-way trie fuzzy search";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13810,7 +14176,7 @@ self: {
        sha256 = "185vcxd3qvii9k0134j634x6znvk7v83sj24a4dnw7jjsax0kqiv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT ];
+       executableHaskellDepends = [ base GLUT ];
        homepage = "http://www.geocities.jp/takascience/index_en.html";
        description = "A vector shooter game";
        license = stdenv.lib.licenses.bsd3;
@@ -13822,7 +14188,7 @@ self: {
        pname = "SimpleAES";
        version = "0.4.2";
        sha256 = "0s85xgwrhldyr2w3kcn9f72yjajmpz3d4dizq9p9z97rx4qva4vj";
-       buildDepends = [ base binary bytestring mwc-random ];
+       libraryHaskellDepends = [ base binary bytestring mwc-random ];
        description = "Fast AES encryption/decryption for bytestrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13833,7 +14199,9 @@ self: {
        pname = "SimpleEA";
        version = "0.2.1";
        sha256 = "0qimm9y138jjnzy5i6s5b7899rkxahk7p2kcwfry0gdq2pcb68vr";
-       buildDepends = [ base mersenne-random-pure64 MonadRandom ];
+       libraryHaskellDepends = [
+         base mersenne-random-pure64 MonadRandom
+       ];
        homepage = "http://www.github.com/ehamberg/simpleea/";
        description = "Simple evolutionary algorithm framework";
        license = stdenv.lib.licenses.bsd3;
@@ -13846,7 +14214,9 @@ self: {
        pname = "SimpleGL";
        version = "0.9.3";
        sha256 = "0c674q5jiqvscc53m0z5vkmljla29pcll15gbvxr86pqxwmqm5hr";
-       buildDepends = [ base GLFW JuicyPixels OpenGL SimpleH vector ];
+       libraryHaskellDepends = [
+         base GLFW JuicyPixels OpenGL SimpleH vector
+       ];
        jailbreak = true;
        description = "A Simple Graphics Library from the SimpleH framework";
        license = stdenv.lib.licenses.bsd3;
@@ -13861,7 +14231,7 @@ self: {
        pname = "SimpleH";
        version = "1.2";
        sha256 = "0g05yplsm65xmx7brdcqy5kc8qcmzj96vywicwqpmigcv8pi9zmc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring clock containers cpu directory filepath network
          time unix
        ];
@@ -13881,7 +14251,7 @@ self: {
        pname = "SimpleLog";
        version = "0.1.0.3";
        sha256 = "12fjdmaxcpgp13gr1s25ybb5fysvbcg40j9yb29wvpbmf67xrsbw";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal attoparsec base bytestring containers directory
          ForkableT monad-control mtl old-locale resourcet semigroups stm
          template-haskell text th-lift time transformers transformers-base
@@ -13898,7 +14268,7 @@ self: {
        pname = "SizeCompare";
        version = "0.1";
        sha256 = "0f53vggmc1ysi1rn8zd2kafi45w20d6j7iv1jgnrqy7izpah91a7";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Fast size comparison for standard containers";
        license = "GPL";
      }) {};
@@ -13911,7 +14281,7 @@ self: {
        pname = "Smooth";
        version = "0.1.0.1";
        sha256 = "0rwl5dw1vpgszhs7pjk146kp8h8n3ggvpby9y18fr7zsqgsckzcd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers DifferenceLogic FirstOrderTheory HUnit Proper
        ];
        jailbreak = true;
@@ -13926,7 +14296,7 @@ self: {
        pname = "SmtLib";
        version = "0.1.0.0";
        sha256 = "0wmdzl3anbbfqik2kl2wjy57cd9r3ix8h8g28rmzqbvlajrvqcv1";
-       buildDepends = [ base parsec transformers ];
+       libraryHaskellDepends = [ base parsec transformers ];
        jailbreak = true;
        homepage = "https://github.com/MfesGA/HsmtlibParser";
        description = "Library for parsing SMTLIB2";
@@ -13944,13 +14314,13 @@ self: {
        sha256 = "1f4d493hnv7fag9c2p2hnm0kc6b705z7mgdk4z6s4g24536j4ksk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring convertible directory filepath haskell98 HDBC
          HDBC-sqlite3 HFuse hslogger iconv LibZip regex-tdfa stm unix
          utf8-string xml
        ];
-       buildTools = [ cpphs ];
-       extraLibraries = [ zip ];
+       executableSystemDepends = [ zip ];
+       executableToolDepends = [ cpphs ];
        jailbreak = true;
        homepage = "http://bitbucket.org/jetxee/snusmumrik/";
        description = "E-library directory based on FUSE virtual file system";
@@ -13966,7 +14336,7 @@ self: {
        pname = "SoOSiM";
        version = "0.2.1.0";
        sha256 = "0ghblkhf942gcidsvah8z6wigymzfng1010mp17pvacizamakcmp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base concurrent-supply containers monad-coroutine mtl stm
          transformers
        ];
@@ -13987,7 +14357,7 @@ self: {
        sha256 = "0xwgj4k1gn84sb8jc2nyxnvfp8sdmy4x5428fpvmn6n6ca8h6f17";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols binary derive directory mtl process
          random zlib
        ];
@@ -14008,7 +14378,7 @@ self: {
        sha256 = "1rzqibia10pl4yy64g5pqiqidhn109z0hlf38z3s57hx2zqqi9if";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols binary GLUT OpenGL process random
          SoccerFun
        ];
@@ -14025,8 +14395,8 @@ self: {
        pname = "Sonnex";
        version = "0.1.0.3";
        sha256 = "0fqaw4wh7ml35kl75qsvqsq17g5pndf7x6clcmqxpwayjn2syzda";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/Zigazou/Sonnex";
        description = "Sonnex is an alternative to Soundex for french language";
@@ -14043,7 +14413,7 @@ self: {
        sha256 = "03psglm6xyqvcgnbimidafy51kwpipk5q6s8ip5vhjm2d5makkhm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory fgl filepath Graphalyze graphviz
          haskell-src-exts mtl multiset random
        ];
@@ -14061,7 +14431,7 @@ self: {
        pname = "Southpaw";
        version = "0.1.0.2";
        sha256 = "1zijb1b6ryrmq2230i1fr7iqz8iax9f2rwpy75fkggiknrd4xnpq";
-       buildDepends = [
+       libraryHaskellDepends = [
          ALUT base bytestring cairo containers filepath GLFW-b gtk3
          JuicyPixels OpenAL OpenGL vector Win32
        ];
@@ -14078,7 +14448,7 @@ self: {
        sha256 = "1idy95ym336c19rcvvrm8j9lgf77bs10hhmrnw2jc55m1z93m683";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base HGL random Yampa ];
+       executableHaskellDepends = [ array base HGL random Yampa ];
        homepage = "http://www.haskell.org/yampa/";
        description = "Video game";
        license = stdenv.lib.licenses.bsd3;
@@ -14092,12 +14462,12 @@ self: {
      mkDerivation {
        pname = "SpacePrivateers";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "0gj709knv4lvz34900jigb1hiq35acbbl86iwa5yszibm8f0drkh";
+       revision = "1";
        editedCabalFile = "b59d607892ad860616cef196c83ff54388204102eae597acf88467a2f54764bf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers enummapset-th filepath LambdaHack template-haskell
          text
        ];
@@ -14114,7 +14484,7 @@ self: {
        pname = "SpinCounter";
        version = "0.0.1";
        sha256 = "1rf9r69a2k3qfmy2nvwm3gdimncjglsv698rdc8i8gnjwrr0c1i2";
-       buildDepends = [ base monad-loops ref-mtl stm ];
+       libraryHaskellDepends = [ base monad-loops ref-mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/Julek";
        description = "Lock free Spin Counter";
@@ -14134,14 +14504,14 @@ self: {
        pname = "Spock";
        version = "0.7.12.0";
        sha256 = "05vglqzf75dphxx2wnkxqn7aqcb19nh8g560zfpw56jrfbbmygwg";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          directory hashable http-types hvect list-t monad-control mtl
          old-locale path-pieces random reroute resource-pool resourcet stm
          stm-containers text time transformers transformers-base
          unordered-containers vault wai wai-extra warp
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec hspec-wai http-types reroute stm text wai
        ];
        homepage = "http://www.spock.li";
@@ -14155,7 +14525,7 @@ self: {
        pname = "Spock-auth";
        version = "0.2.0.1";
        sha256 = "1vcrl5dqjn0ri9ybza2yv80xvbv2iwrz5hj5rbhgy6i803ixlpx0";
-       buildDepends = [ base http-types Spock text time ];
+       libraryHaskellDepends = [ base http-types Spock text time ];
        jailbreak = true;
        homepage = "https://github.com/agrafix/Spock-auth";
        description = "Provides authentification helpers for Spock";
@@ -14171,7 +14541,7 @@ self: {
        pname = "Spock-digestive";
        version = "0.1.0.1";
        sha256 = "13766v5y43jmdh7m3q1790ppw2chwg3g29dfh1zacxw7n1gmhlyl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base digestive-functors http-types mtl Spock text
          unordered-containers wai
        ];
@@ -14188,11 +14558,11 @@ self: {
        pname = "Spock-worker";
        version = "0.2.1.3";
        sha256 = "0pxh7ccqb6xpab0807vsfb65lk4bafa44fram1f4d84slggyn1a1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers lifted-base mtl Spock stm text time transformers
          vector
        ];
-       testDepends = [ base containers HTF stm vector ];
+       testHaskellDepends = [ base containers HTF stm vector ];
        homepage = "http://github.com/agrafix/Spock-worker";
        description = "Background workers for Spock";
        license = stdenv.lib.licenses.mit;
@@ -14204,7 +14574,7 @@ self: {
        pname = "SpreadsheetML";
        version = "0.1";
        sha256 = "14d3fk0cal0svb2clbhbbk48fygwvb0k01aawfm72576mrz9mb18";
-       buildDepends = [ base xml ];
+       libraryHaskellDepends = [ base xml ];
        description = "Write support for Excel's SpreadsheetML format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14215,7 +14585,7 @@ self: {
        pname = "Sprig";
        version = "0.1.1";
        sha256 = "06jxs1hc69viv38nvafhn8ilj3xn2j9k543abgd8p69gc95w1lbn";
-       buildDepends = [ base SDL ];
+       libraryHaskellDepends = [ base SDL ];
        homepage = "http://liamoc.net/static/Sprig";
        description = "Binding to Sprig";
        license = stdenv.lib.licenses.bsd3;
@@ -14230,7 +14600,8 @@ self: {
        sha256 = "1pycmc30hg7vzf3addl0kdd74hpamzg3c1z4fj6fzr4542afhcq8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/zcourts/Stasis";
        description = "A simple MVCC like library";
@@ -14241,9 +14612,9 @@ self: {
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "StateVar";
-       version = "1.1.0.0";
-       sha256 = "0zixg7wzqvllxrlxhlqfchxfbpridckfam1wb81n6lfl2kq676d1";
-       buildDepends = [ base stm transformers ];
+       version = "1.1.0.1";
+       sha256 = "1ap51cvwq61xckx5hw44l82ihbxvsq3263xr5hqg42c5qp67kbhf";
+       libraryHaskellDepends = [ base stm transformers ];
        homepage = "https://github.com/haskell-opengl/StateVar";
        description = "State variables";
        license = stdenv.lib.licenses.bsd3;
@@ -14255,7 +14626,7 @@ self: {
        pname = "StateVar-transformer";
        version = "1.0.0.0";
        sha256 = "1dbpxwjz6yf4ap20wm5ngvd0i0knkjsdahmd90ymddqj82v8w3d0";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        homepage = "http://github.com/seagull-kamome/StateVar-transformer";
        description = "State variables";
        license = stdenv.lib.licenses.bsd3;
@@ -14267,7 +14638,7 @@ self: {
        pname = "StatisticalMethods";
        version = "0.0.0.1";
        sha256 = "1h90i6crknxv23zryqi7mfzg65g1ydv62mza1hiri66jlmdahir6";
-       buildDepends = [ base statistics tuple vector ];
+       libraryHaskellDepends = [ base statistics tuple vector ];
        homepage = "http://www.tbi.univie.ac.at/~choener/Haskell/";
        description = "Collection of useful statistical methods";
        license = stdenv.lib.licenses.gpl3;
@@ -14281,7 +14652,9 @@ self: {
        pname = "Stomp";
        version = "0.1.1";
        sha256 = "0fdibnhab5j03df70pfg9psk6ah80a91ds4nmlb0rdlldddbi3wn";
-       buildDepends = [ base binary bytestring network time utf8-string ];
+       libraryHaskellDepends = [
+         base binary bytestring network time utf8-string
+       ];
        homepage = "http://github.com/rukav/Stomp";
        description = "Client library for Stomp brokers";
        license = stdenv.lib.licenses.bsd3;
@@ -14294,7 +14667,7 @@ self: {
        pname = "Strafunski-ATermLib";
        version = "1.6.0.3";
        sha256 = "1cicz4d5kyl9j4y3p79m3fk56vcqk3220a6y536dw525x6180dzw";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "An abstract data type designed for the exchange of tree-like data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -14310,7 +14683,7 @@ self: {
        sha256 = "0h73yj74pl0k3p7vamqhw1jz36pvh8kfpw58gkmskdmkh7j6wb30";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory haskell-src mtl pretty process Strafunski-ATermLib
          Strafunski-StrategyLib template-haskell
        ];
@@ -14326,7 +14699,7 @@ self: {
        pname = "Strafunski-StrategyLib";
        version = "5.0.0.8";
        sha256 = "09k9lcrrdzj6p7ywagc6mw17g4x9i743np36p4dkdp37q48j0mac";
-       buildDepends = [ base directory mtl syb transformers ];
+       libraryHaskellDepends = [ base directory mtl syb transformers ];
        description = "Library for strategic programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14339,16 +14712,15 @@ self: {
        pname = "StrappedTemplates";
        version = "0.2.0.2";
        sha256 = "0x0nsrzb2r9pwp353ksxwik48iw17whmsclfj07qrqxchdwrjy6h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers filemanip filepath mtl
          parsec text transformers
        ];
-       testDepends = [ base blaze-builder bytestring hspec text ];
+       testHaskellDepends = [ base blaze-builder bytestring hspec text ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/StrappedTemplates";
        description = "General purpose templates in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "StrategyLib" = callPackage
@@ -14357,7 +14729,7 @@ self: {
        pname = "StrategyLib";
        version = "4.0.0.0";
        sha256 = "1sskndywpm1gi4bs4i1gah73jk49inlscg4jzcqhq0phb8f886xk";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://naesten.dyndns.org:8080/repos/StrategyLib";
        license = stdenv.lib.licenses.unfree;
      }) {};
@@ -14368,7 +14740,7 @@ self: {
        pname = "Stream";
        version = "0.4.7.2";
        sha256 = "1l87l0kl4awzdyx6b28npwy6xf03r39d89iharsh06zgnd4y42wr";
-       buildDepends = [ base lazysmallcheck QuickCheck ];
+       libraryHaskellDepends = [ base lazysmallcheck QuickCheck ];
        description = "A library for manipulating infinite lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14379,7 +14751,7 @@ self: {
        pname = "StrictBench";
        version = "0.1.1";
        sha256 = "1l4l77rjhl5g9089kjyarsrvbvm43bk370ld50qp17dqhvisl73m";
-       buildDepends = [ base benchpress parallel ];
+       libraryHaskellDepends = [ base benchpress parallel ];
        homepage = "http://bonsaicode.wordpress.com/2009/06/07/strictbench-0-1/";
        description = "Benchmarking code through strict evaluation";
        license = "GPL";
@@ -14397,10 +14769,12 @@ self: {
        sha256 = "0s294s06pj95i6q8n1cxsgkdc7x98mvvr1qd720rxqd3y54n63lb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base binary bytestring cereal cmdargs containers
-         data-default-class ListLike primitive vector vector-algorithms
-         vector-binary-instances
+       libraryHaskellDepends = [
+         aeson base binary bytestring cereal containers data-default-class
+         ListLike primitive vector vector-algorithms vector-binary-instances
+       ];
+       executableHaskellDepends = [
+         aeson base binary bytestring cereal cmdargs containers vector
        ];
        jailbreak = true;
        homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
@@ -14416,7 +14790,7 @@ self: {
        pname = "SybWidget";
        version = "0.5.6";
        sha256 = "0m3papl90fs3zmlqxsjn0cymk049352cl42bif2x7gij75cv2b68";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl syb-with-class template-haskell TypeCompose
        ];
        jailbreak = true;
@@ -14432,7 +14806,7 @@ self: {
        pname = "SyntaxMacros";
        version = "1.0.3";
        sha256 = "155vkv7kg026zc2crywdyna1df98mw41qm0sadqihaj49xk59vyc";
-       buildDepends = [
+       libraryHaskellDepends = [
          AspectAG base containers HList ListLike template-haskell TTTAS
          uu-parsinglib uulib
        ];
@@ -14451,7 +14825,7 @@ self: {
        pname = "Sysmon";
        version = "0.1.2";
        sha256 = "1zyp333vicjarcmip2q52nzfv948yl2q6qr3k3glp4v4m8f75ap3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ConfigFile filepath fingertree Glob MissingH mtl old-locale
          pretty statistics template-haskell time vector
        ];
@@ -14471,8 +14845,11 @@ self: {
        sha256 = "1063ckv034mb6s41xy8pr387y1hnknkyk4r29vmzdrm3pdcyzdn3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base Cabal deepseq directory filepath process unix
+       libraryHaskellDepends = [
+         base Cabal deepseq directory filepath process
+       ];
+       executableHaskellDepends = [
+         base Cabal directory filepath process unix
        ];
        description = "Testing By Convention";
        license = stdenv.lib.licenses.bsd3;
@@ -14487,7 +14864,7 @@ self: {
        pname = "TBit";
        version = "0.4.2.3";
        sha256 = "1by1wy2w3ankg1php7m911kc53q2dv5jfl8v1iwp3mb68s8b6wrs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq fgl free hmatrix integration list-extras
          mtl numeric-tools parallel
        ];
@@ -14504,7 +14881,7 @@ self: {
        pname = "TCache";
        version = "0.12.0";
        sha256 = "0marslz5jg66r3i2d0yjjrj11bpywpadcxs5k4j6782iczxybd7s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory hashtables mtl old-time
          RefSerialize stm text
        ];
@@ -14518,7 +14895,7 @@ self: {
        pname = "TTTAS";
        version = "0.6.0";
        sha256 = "18p3rxh3g44ky5q4hjq53l4shg4gd8v68wra6bdxv8bjafxld1wp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/TTTAS";
        description = "Typed Transformations of Typed Abstract Syntax";
        license = "LGPL";
@@ -14530,7 +14907,7 @@ self: {
        pname = "TV";
        version = "0.5.0";
        sha256 = "0vz9j5vjypnkbzld18f6kczfj54disf43x5052s4n7gqzsjxpxvb";
-       buildDepends = [ base DeepArrow TypeCompose ];
+       libraryHaskellDepends = [ base DeepArrow TypeCompose ];
        homepage = "http://haskell.org/haskellwiki/TV";
        description = "Tangible Values -- composable interfaces";
        license = stdenv.lib.licenses.bsd3;
@@ -14544,7 +14921,7 @@ self: {
        pname = "TYB";
        version = "0.2.3";
        sha256 = "1rdwj6dg156i60i7s8xr310j0yza41jjqk6pmgx2giqjs122dz5n";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers mtl template-haskell transformers
        ];
        description = "Template Your Boilerplate - a Template Haskell version of SYB";
@@ -14560,7 +14937,7 @@ self: {
        pname = "TableAlgebra";
        version = "0.7.1";
        sha256 = "1jqkjnyznklyiy2shm4c9gix267war1hmsjncdmailhca41fs4bz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HaXml mtl pretty template-haskell
        ];
        description = "Ferry Table Algebra";
@@ -14575,7 +14952,7 @@ self: {
        sha256 = "02a6awbqwhmv7c74lgbp35ykqn31mgwp7ffd0j4rs42vv1a4ffkr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cookbook ];
+       executableHaskellDepends = [ base cookbook ];
        jailbreak = true;
        description = "A client for Quill databases";
        license = stdenv.lib.licenses.bsd3;
@@ -14590,7 +14967,7 @@ self: {
        sha256 = "10w3idjhrgmkrkjblrmb2wb2s2fg657nw5rmg5k147wrgrkzbsz3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base parsec xhtml ];
+       executableHaskellDepends = [ base parsec xhtml ];
        homepage = "http://www.storytotell.org/code/tablify";
        description = "Tool to render CSV into tables of various formats";
        license = stdenv.lib.licenses.bsd3;
@@ -14602,7 +14979,7 @@ self: {
        pname = "Tainted";
        version = "0.1.0.2";
        sha256 = "1mjr81z42qhwa6njlvlsslpzbbpiab88ns8g8amskwv159gk6mlb";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/RossMeikleham/Tainted";
        description = "Tainted type, and associated operations";
        license = stdenv.lib.licenses.bsd3;
@@ -14616,7 +14993,8 @@ self: {
        sha256 = "0mxck66rz6lplgcl3a3i0gaybc2ki0q7wfilhkp2f3h3m50fg7wy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl old-time time ];
+       libraryHaskellDepends = [ base mtl old-time time ];
+       executableHaskellDepends = [ base mtl old-time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14628,7 +15006,7 @@ self: {
        pname = "Tape";
        version = "0.4.0.0";
        sha256 = "1d66l67cicn3q4a6glfxfkhc9cjm7vqi0bnyjad0bzyyv409j6bp";
-       buildDepends = [ base comonad distributive Stream ];
+       libraryHaskellDepends = [ base comonad distributive Stream ];
        jailbreak = true;
        homepage = "https://github.com/kwf/Tape";
        description = "Bidirectionally infinite streams, akin to the tape of a Turing machine";
@@ -14643,7 +15021,7 @@ self: {
        pname = "TeaHS";
        version = "0.3.1";
        sha256 = "1326lrpkw2gyn7y9px38gyzi2cnx87ki65r6mwds746d1s1zmmcn";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers mtl SDL SDL-image SDL-mixer SFont Sprig
        ];
        homepage = "http://liamoc.net/tea";
@@ -14658,7 +15036,7 @@ self: {
        pname = "Tensor";
        version = "1.1.0.1";
        sha256 = "1q8infjcszbbfqybg1fv33fy33chyvj2nbj9d2sxvsixx57hm12m";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/svenpanne/Tensor";
        description = "Tensor data types";
        license = stdenv.lib.licenses.bsd3;
@@ -14672,7 +15050,8 @@ self: {
        sha256 = "06m4mi9cl16sfyn9wibb0ph32vhgf501adjq059s3hdlxr4acdwr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary ];
+       libraryHaskellDepends = [ base binary ];
+       executableHaskellDepends = [ base ];
        description = "Efficient pure ternary tree Sets and Maps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14685,7 +15064,7 @@ self: {
        pname = "TestExplode";
        version = "0.1.0.0";
        sha256 = "0r4nwzwdila9p05g5y99rp06dbh1k2yl5jsc6yn6dwvxkvvdjcs1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory fgl graphviz interpolatedstring-perl6 mtl
          process text
        ];
@@ -14701,8 +15080,8 @@ self: {
        pname = "Theora";
        version = "1.0";
        sha256 = "1gw97mxwb6ywc4qvfggjzsryl0m4g6g30ljx4xcvy6snfmgv00ig";
-       buildDepends = [ base ];
-       extraLibraries = [ ogg theora ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ ogg theora ];
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { ogg = null;  theora = null;};
@@ -14713,7 +15092,7 @@ self: {
        pname = "Thingie";
        version = "0.80";
        sha256 = "0fl6pk2vp765gyzc4afjdg0lgbnh5v08gfbp0kzny4ng25bmxqwa";
-       buildDepends = [ base cairo gtk mtl ];
+       libraryHaskellDepends = [ base cairo gtk mtl ];
        description = "Purely functional 2D drawing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14725,7 +15104,7 @@ self: {
        pname = "ThreadObjects";
        version = "0.0";
        sha256 = "0rpcv6kw351ykj36f83qdqygrhk4ylqlcgcswxl8gg1v33jaaqmz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Mutable objects that reside in their own threads";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -14736,10 +15115,12 @@ self: {
      mkDerivation {
        pname = "Thrift";
        version = "0.6.0.1";
-       revision = "1";
        sha256 = "0yk496zql0jpyj83ybdzffc03sylf5pwn093k831m99j54l2r5yv";
+       revision = "1";
        editedCabalFile = "56a8ab041685777391702f1475e5c2a3462b36765bd53de2e21e1f55aa5999d9";
-       buildDepends = [ base binary bytestring ghc-prim HTTP network ];
+       libraryHaskellDepends = [
+         base binary bytestring ghc-prim HTTP network
+       ];
        jailbreak = true;
        homepage = "http://thrift.apache.org";
        description = "Haskell bindings for the Apache Thrift RPC system";
@@ -14755,7 +15136,7 @@ self: {
        pname = "TicTacToe";
        version = "0.0.1";
        sha256 = "0542hripn5nlwdvnhkd9xzzh2b1x6alwnqxq877r92c7kqnlffw4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -14770,7 +15151,7 @@ self: {
        pname = "TigerHash";
        version = "0.2";
        sha256 = "02plz1y7lmvp3jpl5srsnx2nkl6yhhfn6pqj00szs688cahk2dik";
-       buildDepends = [ base binary bytestring dataenc ];
+       libraryHaskellDepends = [ base binary bytestring dataenc ];
        description = "TigerHash with C implementation";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -14785,7 +15166,11 @@ self: {
        sha256 = "1ylf4kzyf947szgib0ivkvygbinmy97nvy77d0crryzxdmccrzbj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers old-locale old-time random SDL SDL-gfx SDL-image
+         SDL-ttf
+       ];
+       executableHaskellDepends = [
          base containers old-locale old-time random SDL SDL-gfx SDL-image
          SDL-ttf
        ];
@@ -14800,7 +15185,7 @@ self: {
        pname = "TinyLaunchbury";
        version = "1.0.1";
        sha256 = "1xxadd8pqbgl0z8vrqn8fm6x0c9l2y3a7irjmjkh9750x6hdb4b9";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Simple implementation of call-by-need using Launchbury's semantics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14812,7 +15197,7 @@ self: {
        pname = "TinyURL";
        version = "0.1.0";
        sha256 = "0y8bl6w3ix2zjhm10wazgi70sr02ydc3hrwjbr6whk341n140wsh";
-       buildDepends = [ base HTTP network ];
+       libraryHaskellDepends = [ base HTTP network ];
        description = "Use TinyURL to compress URLs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14826,7 +15211,7 @@ self: {
        sha256 = "1s8zvb38r9pxh55d5206lijprc6xsqnr0j670sdjrw7n8gyn7vav";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers matrix random ];
+       executableHaskellDepends = [ base containers matrix random ];
        jailbreak = true;
        description = "Game for Lounge Marmelade";
        license = stdenv.lib.licenses.gpl3;
@@ -14841,7 +15226,8 @@ self: {
        sha256 = "0ykicqwayja14z30hn5cy3c96sikqhbyrh0bcqykk9izwhxs339x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers mtl parsec ];
+       libraryHaskellDepends = [ base containers mtl ];
+       executableHaskellDepends = [ base containers mtl parsec ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "Constraint solving framework employed by the Helium Compiler";
        license = "GPL";
@@ -14856,8 +15242,8 @@ self: {
        pname = "Tournament";
        version = "0.0.1";
        sha256 = "1yzgcsp3g5sfyxavq1firna5z5m9bnk9ddrbxxmpy1yydmj1n5jk";
-       buildDepends = [ base containers mtl ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers mtl ];
+       testHaskellDepends = [
          base containers mtl QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -14874,7 +15260,7 @@ self: {
        pname = "TraceUtils";
        version = "0.1.0.2";
        sha256 = "0la19yynd7bpswi9012hf0vl9c4fdnn8p6y0287xanmdcs9zqz16";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Peaker/TraceUtils";
        description = "Functions that should have been in Debug.Trace";
        license = stdenv.lib.licenses.bsd3;
@@ -14888,7 +15274,7 @@ self: {
        sha256 = "1cd8sh6gi9zmvd70kzw1x9ycanfsyphjdy3r65xrph54ilwy511p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl ];
+       executableHaskellDepends = [ base containers mtl ];
        homepage = "https://github.com/mgrabmueller/TransformersStepByStep";
        description = "Tutorial on monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -14900,7 +15286,7 @@ self: {
        pname = "Transhare";
        version = "0.9";
        sha256 = "04n1ld6h3q71iqnvwyabzj69vdy2x98w0drriyx13ykywbd31036";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "A library to apply transformation to containers so as to maximize sharing of unchanged subcomponents";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14911,7 +15297,7 @@ self: {
        pname = "TreeCounter";
        version = "0.0.2";
        sha256 = "06ci4v8gflsgi73wrpqvhb7w3mdkbjgidhqf95yyk4wiga1mrzal";
-       buildDepends = [ base ref-mtl stm ];
+       libraryHaskellDepends = [ base ref-mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/Julek";
        description = "Wait-free Tree Counter";
@@ -14924,7 +15310,7 @@ self: {
        pname = "TreeStructures";
        version = "0.0.2";
        sha256 = "1lcj166i8f7850fqjv7xqxdn6zwpdynzxn3bf243wdnwmnn5pysx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://www.github.com/bhickey/TreeStructures";
        description = "A collection of heaps and search trees";
@@ -14937,7 +15323,7 @@ self: {
        pname = "TreeT";
        version = "0.0";
        sha256 = "0d1k4nblcnksh2j6b4v14r2xd2kn6cmqmyqhmy6wyz3kr0lyzxqd";
-       buildDepends = [ base containers transformers ];
+       libraryHaskellDepends = [ base containers transformers ];
        description = "Transformer for Data.Tree";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -14948,7 +15334,7 @@ self: {
        pname = "Treiber";
        version = "0.0.4";
        sha256 = "09sd9p1y3zqkfahkp1vgdnlvgv1vnvdl7kdzccsd41h1h61fz3jd";
-       buildDepends = [ base ghc-prim monad-loops ref-mtl stm ];
+       libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/Julek";
        description = "Lock free Treiber stack";
@@ -14963,7 +15349,7 @@ self: {
        pname = "TrendGraph";
        version = "0.1.0.1";
        sha256 = "1rdlimlbdpa089knhnqzgxc8ngqag4m4w3r92jd95kwnmr8nizkp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers diagrams-cairo diagrams-lib mtl
          optparse-applicative time
        ];
@@ -14982,7 +15368,7 @@ self: {
        pname = "TrieMap";
        version = "4.1.0";
        sha256 = "14wril1sa35cja66y7ah9qwr3bmsi985y7rlxyj12x2fv6dclpc4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers primitive template-haskell
          th-expand-syns transformers unpack-funcs vector
        ];
@@ -14999,10 +15385,10 @@ self: {
        pname = "Twofish";
        version = "0.3.2";
        sha256 = "1bv79582fxwgk255fhss6k8irb7mlbdvlvvx8jyzs16g3fyw1y5a";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring cereal crypto-api largeword mtl tagged
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base binary bytestring cereal crypto-api HUnit largeword
          tagged
        ];
@@ -15021,7 +15407,7 @@ self: {
        sha256 = "0crymgw91xx0hblbmz488x39i2qzf9c15kv5x950ljmpyrhy5jhv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers filepath random reactive-banana reactive-banana-sdl
          SDL SDL-ttf transformers
        ];
@@ -15037,7 +15423,7 @@ self: {
        pname = "TypeCompose";
        version = "0.9.10";
        sha256 = "1wpldqdf6czl36fs4pvvj2z3kg1487sanqncp4rbmgrrhbfmqxxq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/conal/TypeCompose";
        description = "Type composition classes & instances";
        license = stdenv.lib.licenses.bsd3;
@@ -15051,7 +15437,7 @@ self: {
        sha256 = "02ck7sik5wvh989k9ban1m2dlpfld0d0zs7sqb12m1f6wls7fghc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 ];
+       executableHaskellDepends = [ base haskell98 ];
        homepage = "http://www.cs.kent.ac.uk/people/staff/oc/TypeIlluminator/";
        description = "TypeIlluminator is a prototype tool exploring debugging of type errors/";
        license = stdenv.lib.licenses.bsd3;
@@ -15064,7 +15450,7 @@ self: {
        pname = "TypeNat";
        version = "0.2.1.0";
        sha256 = "01dsw64zzwbkvm7q4jwyidjvxbkx6fvx8hhn70d2bpdxxammnxry";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/avieth/TypeNat";
        description = "Some Nat-indexed types for GHC";
@@ -15080,7 +15466,7 @@ self: {
        sha256 = "07qwvmdh5164v552qkk4fm66nlvb4dcv0wh5jircfgh7gsd60l6n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers directory time ];
+       executableHaskellDepends = [ base containers directory time ];
        homepage = "https://github.com/xpika/typingtester";
        description = "Command Line Typing speed tester";
        license = stdenv.lib.licenses.gpl3;
@@ -15094,13 +15480,12 @@ self: {
        pname = "UISF";
        version = "0.3.0.2";
        sha256 = "0i5kw450yk44kh25xbqzjwnjipzh81i20vk8il9ic2fh4d79va46";
-       buildDepends = [
+       libraryHaskellDepends = [
          arrows base containers deepseq GLFW OpenGL stm transformers
        ];
        homepage = "http://haskell.cs.yale.edu/";
        description = "Library for Arrowized Graphical User Interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "UMM" = callPackage
@@ -15113,7 +15498,7 @@ self: {
        sha256 = "0k9kvlkcznk6ydfcymzzh0a4j4zkl5iblvnx6fkmk8xah1qnkq5h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base haskell98 old-time parsec process utf8-string
        ];
        homepage = "http://www.korgwal.com/umm/";
@@ -15131,7 +15516,7 @@ self: {
        pname = "URLT";
        version = "0.14";
        sha256 = "14qlyrc3ins3lwhd2c8lyhm1j3v6nj4qgs5g9xys4w6hnndz2g3s";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base Consumer happstack-server hsp hsx mtl
          QuickCheck regular template-haskell
        ];
@@ -15146,7 +15531,7 @@ self: {
        pname = "URLb";
        version = "0.0.1";
        sha256 = "1l62z7798bby4fbrz62ic802g8zah3flb2pmsd3ky7y5903s3nxr";
-       buildDepends = [ attoparsec base bytestring containers ];
+       libraryHaskellDepends = [ attoparsec base bytestring containers ];
        homepage = "http://github.com/solidsnack/URLb";
        description = "DEPRECATED A simple, liberal URL parser";
        license = stdenv.lib.licenses.bsd3;
@@ -15160,7 +15545,7 @@ self: {
        pname = "Unique";
        version = "0.4.2";
        sha256 = "0riyn68bi6wxz2mhqlywva6a1ngfr4k3gglp12dkhcmllh5l3dc2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers extra hashable unordered-containers
        ];
        jailbreak = true;
@@ -15176,7 +15561,7 @@ self: {
        pname = "Unixutils";
        version = "1.53";
        sha256 = "0gh8fii9kc2nah5l0gv1pzlxdxgw962vgr1w9kc5wksf85hgyplr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory exceptions filepath mtl process
          process-extras pureMD5 regex-tdfa unix zlib
        ];
@@ -15191,7 +15576,7 @@ self: {
        pname = "Unixutils-shadow";
        version = "1.0.0";
        sha256 = "11m8lgq2rjvh7j8si7sqixf4k4ns65jy0zp6apqp0xc23c1znyr7";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "http://src.seereason.com/haskell-unixutils-shadow";
        description = "A simple interface to shadow passwords (aka, shadow.h)";
        license = stdenv.lib.licenses.bsd3;
@@ -15203,11 +15588,10 @@ self: {
        pname = "Updater";
        version = "0.2";
        sha256 = "03n2r02bgv9hzlvxypdy1mrvdmzrxlm717bf7qp9f9ky1sj3ixp4";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/yokto/Updater";
        description = "Monadic FRP library based on stm";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "UrlDisp" = callPackage
@@ -15216,7 +15600,7 @@ self: {
        pname = "UrlDisp";
        version = "0.1.7";
        sha256 = "1y21v5k7s9sj8z5r3czp5i80x40zvyqxzr1xl28ardwj5q5rrvzp";
-       buildDepends = [ base cgi MaybeT mtl ];
+       libraryHaskellDepends = [ base cgi MaybeT mtl ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/UrlDisp";
        description = "Url dispatcher. Helps to retain friendly URLs in web applications.";
@@ -15230,7 +15614,7 @@ self: {
        pname = "Useful";
        version = "0.0.6";
        sha256 = "01xb68qh29q6b0pdxvadqw7q1p855k14jdz1qjlhg6785n0qp954";
-       buildDepends = [ base containers random ];
+       libraryHaskellDepends = [ base containers random ];
        description = "Some useful functions and shorthands";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -15241,7 +15625,7 @@ self: {
        pname = "UtilityTM";
        version = "0.0.4";
        sha256 = "1mjy3w4sw32rbmm13yhmpidfsj91v3p58jvki16z0kzk3fswpa85";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/tonymorris/utility-tm";
        description = "Utility functions that are missing from the standard library";
        license = stdenv.lib.licenses.bsd3;
@@ -15260,13 +15644,13 @@ self: {
        sha256 = "0621x6mqa1qplswirxnzpzn24520qvl5ii1wyvqm8nfb69sbqzpg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bimap bytestring containers curlhs directory failure
          filepath mtl optparse-applicative parsec pretty-show regexpr safe
          split tagsoup tagsoup-parsec template-haskell text time
          transformers utf8-string vector
        ];
-       extraLibraries = [ curl ];
+       executableSystemDepends = [ curl ];
        homepage = "http://github.com/grwlf/vkhs";
        description = "Provides access to Vkontakte social network via public API";
        license = stdenv.lib.licenses.bsd3;
@@ -15279,7 +15663,9 @@ self: {
        pname = "Validation";
        version = "0.2.0";
        sha256 = "10smif8y5bgjiarag3ws131kwji32mlh6mqfnmmp20xf41fsm0z3";
-       buildDepends = [ base bifunctors semigroupoids semigroups ];
+       libraryHaskellDepends = [
+         base bifunctors semigroupoids semigroups
+       ];
        jailbreak = true;
        homepage = "https://github.com/tonymorris/validation";
        description = "A data-type like Either but with an accumulating Applicative";
@@ -15292,7 +15678,7 @@ self: {
        pname = "Vec";
        version = "1.0.5";
        sha256 = "0hyk553pdn72zc1i82njz3md8ycmzfiwi799y08qr3fg0i8r88zm";
-       buildDepends = [ array base ghc-prim ];
+       libraryHaskellDepends = [ array base ghc-prim ];
        homepage = "http://github.net/sedillard/Vec";
        description = "Fixed-length lists and low-dimensional linear algebra";
        license = stdenv.lib.licenses.bsd3;
@@ -15304,7 +15690,7 @@ self: {
        pname = "Vec-Boolean";
        version = "1.0.6";
        sha256 = "0zxxpychddmlrv7r190gn4dl282ak4qfk2d92l24qxi9fds1rshk";
-       buildDepends = [ base Boolean Vec ];
+       libraryHaskellDepends = [ base Boolean Vec ];
        jailbreak = true;
        description = "Provides Boolean instances for the Vec package";
        license = stdenv.lib.licenses.bsd3;
@@ -15317,7 +15703,7 @@ self: {
        pname = "Vec-OpenGLRaw";
        version = "0.2.0.1";
        sha256 = "0qsi1s8qp3fkr5alh2m7y1a1lm5xypjvmk174ywf0aga2y20bblm";
-       buildDepends = [ base OpenGLRaw Vec ];
+       libraryHaskellDepends = [ base OpenGLRaw Vec ];
        homepage = "http://www.downstairspeople.org/darcs/Vec-opengl";
        description = "Instances and functions to interoperate Vec and OpenGL";
        license = stdenv.lib.licenses.bsd3;
@@ -15342,7 +15728,7 @@ self: {
        pname = "VecN";
        version = "0.0.2";
        sha256 = "1hv8idxv9gniwwjs67q75bbcc5ry9r05cxjmsxk0q54l8zscdss2";
-       buildDepends = [ base Peano ];
+       libraryHaskellDepends = [ base Peano ];
        description = "a simple peano-indexed vector type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -15353,8 +15739,8 @@ self: {
        pname = "ViennaRNA-bindings";
        version = "0.1.2.2";
        sha256 = "06zz3svdsy6qzbj7s02sbifkprmm58r14ss46r6680c9ybw9w5l3";
-       buildDepends = [ array base ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ array base ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "ViennaRNA v2 bindings";
        license = "unknown";
@@ -15366,8 +15752,8 @@ self: {
        pname = "ViennaRNAParser";
        version = "1.2.5";
        sha256 = "0kc3b49g52dh0a4q8v5ir7pwa0x8s6rclmqjhkj95v1070ag4w0f";
-       buildDepends = [ base parsec process ];
-       testDepends = [ base hspec parsec ];
+       libraryHaskellDepends = [ base parsec process ];
+       testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
        license = "GPL";
      }) {};
@@ -15380,7 +15766,10 @@ self: {
        sha256 = "1cgla9y1lwcsdad5qdspymd7s6skdw961fgzh02kvi7gjbrrcyi7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers parseargs ];
+       libraryHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [
+         base bytestring containers parseargs
+       ];
        homepage = "http://github.com/BartMassey/WAVE";
        description = "WAVE audio file IO library";
        license = stdenv.lib.licenses.bsd3;
@@ -15395,7 +15784,9 @@ self: {
        sha256 = "0gbjb432758wvd3p5brb4kjn037x6h30bzvn9f681pg0m1w52hgv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath mtl unix WL500gPLib ];
+       executableHaskellDepends = [
+         base directory filepath mtl unix WL500gPLib
+       ];
        jailbreak = true;
        description = "A simple command line tools to control the Asus WL500gP router";
        license = stdenv.lib.licenses.bsd3;
@@ -15410,7 +15801,8 @@ self: {
        sha256 = "15w065yg8hjhljgnmx88fnryhbh7dysmsqmpr9qnj96as7vrkwgs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base curl mtl tagsoup ];
+       libraryHaskellDepends = [ base curl mtl tagsoup ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        description = "A simple library to access to the WL 500gP router from the Haskell code";
        license = stdenv.lib.licenses.bsd3;
@@ -15424,11 +15816,11 @@ self: {
        pname = "WMSigner";
        version = "0.1.0.0";
        sha256 = "0im8rfyfnhq2s445cjm4xvnqqs8pgpavhmyk98jqshpfm9d1cd6q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring binary bytestring cryptohash directory lens
          mtl random split vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cryptohash hspec lens random split vector
        ];
        jailbreak = true;
@@ -15442,7 +15834,7 @@ self: {
        pname = "WURFL";
        version = "0.1";
        sha256 = "13vfszyfyxwz4zi8zilifd0jad1gwlr75x931q8qbpi1kwr7mivk";
-       buildDepends = [ base haskell98 parsec ];
+       libraryHaskellDepends = [ base haskell98 parsec ];
        description = "Convert the WURFL file into a Parsec parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15454,7 +15846,7 @@ self: {
        pname = "WXDiffCtrl";
        version = "0.0.1";
        sha256 = "0vv8s483g3dkxyk833cjczj0a5zxiy9xh56kij6n0jjyzxb9bz0k";
-       buildDepends = [ base containers wx wxcore ];
+       libraryHaskellDepends = [ base containers wx wxcore ];
        homepage = "http://wewantarock.wordpress.com";
        description = "WXDiffCtrl";
        license = stdenv.lib.licenses.bsd3;
@@ -15471,10 +15863,10 @@ self: {
        sha256 = "11d9cwqfpvf999a5fi3a3v5b4gdrszzgf4gbdhx63afy42ylbnfj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers directory ghc-paths haskell98 parsec process
-         regex-compat
+       libraryHaskellDepends = [
+         base containers haskell98 parsec regex-compat
        ];
+       executableHaskellDepends = [ directory ghc-paths process ];
        jailbreak = true;
        homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/";
        description = "WASH is a family of EDSLs for programming Web applications in Haskell";
@@ -15490,7 +15882,7 @@ self: {
        pname = "Weather";
        version = "0.1.0.4";
        sha256 = "0g5rpz6gnf8hl7gpjc7nwci8x24yw02ps3jwjsi6js5yf3mlrxnv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring HTTP text unordered-containers
        ];
        homepage = "https://github.com/bstamour/weather";
@@ -15504,7 +15896,7 @@ self: {
        pname = "WebBits";
        version = "2.2";
        sha256 = "1frmnjbpgm76dzs1p4766fb6isqc3pxv4dnj8sdhnfliv5j0xv2z";
-       buildDepends = [ base containers mtl parsec pretty syb ];
+       libraryHaskellDepends = [ base containers mtl parsec pretty syb ];
        homepage = "http://github.com/brownplt/webbits";
        description = "JavaScript analysis tools";
        license = stdenv.lib.licenses.bsd3;
@@ -15518,7 +15910,9 @@ self: {
        pname = "WebBits-Html";
        version = "1.0.2";
        sha256 = "18dd52970cd27kra4l89vvrx2mrdbqd4w4f76xrq3142daxsagal";
-       buildDepends = [ base containers mtl parsec pretty syb WebBits ];
+       libraryHaskellDepends = [
+         base containers mtl parsec pretty syb WebBits
+       ];
        jailbreak = true;
        homepage = "http://www.cs.brown.edu/research/plt/";
        description = "JavaScript analysis tools";
@@ -15534,7 +15928,7 @@ self: {
        pname = "WebBits-multiplate";
        version = "0.0.0.1";
        sha256 = "1j3difi3f1w6bgbnsvqw9cv88aikin22myli0lx29pqn7xhqsbv3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base multiplate multiplate-simplified transformers WebBits
        ];
        jailbreak = true;
@@ -15552,7 +15946,7 @@ self: {
        pname = "WebCont";
        version = "0.0.1";
        sha256 = "1lr5iz0kqhr8w0c7038mlbysw1c3lbzfjis085n68ib104ykyyi6";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base concatenative containers formlets
          happstack-server happstack-state happstack-util mtl utf8-string
          xhtml
@@ -15571,7 +15965,8 @@ self: {
        sha256 = "0nl79q3y2qi0xnkppxj8d9h96hfwrgb3gksm2x1zp9lq7836562z";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
+       executableHaskellDepends = [ base parsec ];
        jailbreak = true;
        homepage = "https://github.com/cameronbwhite/WeberLogic";
        description = "Logic interpreter";
@@ -15590,7 +15985,12 @@ self: {
        sha256 = "1iv969gd4xmagw74i6fmw4d864zxlzi4yf0y9ns1nvijn7w7s5jb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson array base bytestring containers directory filepath HaXml
+         HTTP hxt mtl network parsec process regex-pcre-builtin
+         template-haskell text transformers unordered-containers vector
+       ];
+       executableHaskellDepends = [
          aeson array base bytestring containers directory filepath HaXml
          HTTP hxt mtl network parsec process regex-pcre-builtin
          template-haskell text transformers unordered-containers vector
@@ -15612,12 +16012,12 @@ self: {
        pname = "Wheb";
        version = "0.3.1.0";
        sha256 = "13x204lz2azfrry38w791rni2d0g9xsg5lhajrkrgfhdn56yrzqs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive containers cookie
          http-types mtl pwstore-fast stm text time transformers unix uuid
          wai wai-extra wai-websockets warp web-routes websockets
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
@@ -15634,7 +16034,7 @@ self: {
        pname = "WikimediaParser";
        version = "0.1";
        sha256 = "0rzpf8z414qvkbks16zizsxsinvbdxbm1n0dbav11p286791xx1j";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "A parser for wikimedia style article markup";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15648,12 +16048,13 @@ self: {
        pname = "Win32";
        version = "2.3.1.0";
        sha256 = "1y9z682gmgjkrc8lijkidrlwh5pr30zgpvx2sc3gnvn8krg6jnk8";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ advapi32 gdi32 shell32 shfolder user32 winmm ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [
+         advapi32 gdi32 shell32 shfolder user32 winmm
+       ];
        homepage = "https://github.com/haskell/win32";
        description = "A binding to part of the Win32 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { advapi32 = null;  gdi32 = null;  shell32 = null;
           shfolder = null;  user32 = null;  winmm = null;};
 
@@ -15663,7 +16064,7 @@ self: {
        pname = "Win32-dhcp-server";
        version = "0.3.1";
        sha256 = "0mkxk822gcg1r61cf5wq9ayya51am4dy8v2xqm3ld30d7hss4dij";
-       buildDepends = [ base text Win32 Win32-errors ];
+       libraryHaskellDepends = [ base text Win32 Win32-errors ];
        homepage = "http://github.com/mikesteele81/win32-dhcp-server";
        description = "Win32 DHCP Server Management API";
        license = stdenv.lib.licenses.bsd3;
@@ -15676,7 +16077,7 @@ self: {
        pname = "Win32-errors";
        version = "0.2.2.1";
        sha256 = "1v7gm7vll1lq6d7d0y8vza7ilcw6i95jkprhy906awhqlhv3z031";
-       buildDepends = [ base template-haskell text Win32 ];
+       libraryHaskellDepends = [ base template-haskell text Win32 ];
        homepage = "http://github.com/mikesteele81/win32-errors";
        description = "Alternative error handling for Win32 foreign calls";
        license = stdenv.lib.licenses.bsd3;
@@ -15689,8 +16090,8 @@ self: {
        pname = "Win32-extras";
        version = "0.2.0.1";
        sha256 = "00lrqvsa74mqv0k4yz00j2jdpmchkyhcicqv24z9a53iv1i0xp7h";
-       buildDepends = [ base Win32 ];
-       extraLibraries = [ imm32 msimg32 ];
+       libraryHaskellDepends = [ base Win32 ];
+       librarySystemDepends = [ imm32 msimg32 ];
        homepage = "http://hub.darcs.net/shelarcy/Win32-extras/";
        description = "Provides missing Win32 API";
        license = stdenv.lib.licenses.bsd3;
@@ -15703,7 +16104,7 @@ self: {
        pname = "Win32-junction-point";
        version = "0.2.1.1";
        sha256 = "1pvlvhdp4wcz8kn5nldhrkryz03dmzyzvjbm8x1ri9kwq1icd941";
-       buildDepends = [ base text Win32 Win32-errors ];
+       libraryHaskellDepends = [ base text Win32 Win32-errors ];
        homepage = "http://github.com/mikesteele81/Win32-junction-point";
        description = "Support for manipulating NTFS junction points";
        license = stdenv.lib.licenses.bsd3;
@@ -15718,7 +16119,8 @@ self: {
        sha256 = "0zzbb00rykl8y1prkcm3paaamhmdrqji34070b9zg7sg2pc5k4f4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers directory Win32 ];
+       libraryHaskellDepends = [ base containers directory Win32 ];
+       executableHaskellDepends = [ base directory ];
        description = "A binding to part of the Win32 library for file notification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15732,7 +16134,7 @@ self: {
        sha256 = "0dh4z7a0mxwpqhx1cxvwwjc7w24mcrqc0bmg7bp86kd6zqz6rjly";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base text Win32 Win32-errors ];
+       libraryHaskellDepends = [ base text Win32 Win32-errors ];
        homepage = "https://github.com/anton-dessiatov/Win32-security";
        description = "Haskell bindings to a security-related functions of the Windows API";
        license = stdenv.lib.licenses.mit;
@@ -15745,8 +16147,8 @@ self: {
        pname = "Win32-services";
        version = "0.3";
        sha256 = "07vby574s528g259zq8jby1327b6jqn4zlzs406ml99w1p02d9js";
-       buildDepends = [ base Win32 Win32-errors ];
-       extraLibraries = [ Advapi32 ];
+       libraryHaskellDepends = [ base Win32 Win32-errors ];
+       librarySystemDepends = [ Advapi32 ];
        homepage = "http://github.com/mikesteele81/win32-services";
        description = "Windows service applications";
        license = stdenv.lib.licenses.bsd3;
@@ -15761,7 +16163,7 @@ self: {
        pname = "Win32-services-wrapper";
        version = "0.1.3.0";
        sha256 = "1nihf12bcgahs5220pdny1kf54973qxh7llhzv5d9s9lxias2jyd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath Win32 Win32-errors Win32-services
        ];
        description = "Wrapper code for making a Win32 service";
@@ -15777,7 +16179,7 @@ self: {
        pname = "Wired";
        version = "0.3";
        sha256 = "14zxf849r4k3mk5i5rakfjp2f216sz84ww4hfggq9cnr9w8j406j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base chalmers-lava2000 containers mtl QuickCheck
        ];
        homepage = "http://www.cse.chalmers.se/~emax/wired/";
@@ -15791,7 +16193,7 @@ self: {
        pname = "WordNet";
        version = "1.1.0";
        sha256 = "0b44xxkihafzsw25xx484xxw17zlzzqbj0bx8cs2nvf3p7jxd02k";
-       buildDepends = [ array base containers filepath ];
+       libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15803,7 +16205,7 @@ self: {
        pname = "WordNet-ghc74";
        version = "0.1.3";
        sha256 = "1ab5wybawa3dfq89dn0g3zdhsqd03bcm3qky2d4z6irw7afdqrr8";
-       buildDepends = [ array base containers filepath ];
+       libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15817,7 +16219,8 @@ self: {
        sha256 = "08d02h4ynkwxqxxqzk8hfmdj9y7rg23biybb969pk0scgvg7iyd5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base boxes cmdargs ];
+       libraryHaskellDepends = [ base boxes cmdargs ];
+       executableHaskellDepends = [ base boxes cmdargs ];
        jailbreak = true;
        homepage = "https://github.com/gbgar/Wordlint";
        description = "Plaintext prose redundancy linter";
@@ -15833,10 +16236,10 @@ self: {
      mkDerivation {
        pname = "Workflow";
        version = "0.8.3";
-       revision = "1";
        sha256 = "08r1s840771z1gy44dj3xc6ary7gk3ka3zvji5pmgzi998x4p6y8";
+       revision = "1";
        editedCabalFile = "1be542eaf091e04c561a2a589f37330b0a65d6d3d5a44609c197a74e8385c64b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory exceptions
          extensible-exceptions mtl old-time RefSerialize stm TCache vector
        ];
@@ -15851,7 +16254,9 @@ self: {
        pname = "WxGeneric";
        version = "0.8.1";
        sha256 = "0lvbdmb1qwsz8bz0z715nzgbpshfckm4syk1ny52akkb4ddkrd60";
-       buildDepends = [ base containers mtl SybWidget wx wxcore xtc ];
+       libraryHaskellDepends = [
+         base containers mtl SybWidget wx wxcore xtc
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/WxGeneric";
        description = "Generic (SYB3) construction of wxHaskell widgets";
@@ -15859,34 +16264,29 @@ self: {
      }) {};
 
   "X11" = callPackage
-    ({ mkDerivation, base, data-default, libX11, libXext, libXinerama
-     , libXrandr, libXrender
-     }:
+    ({ mkDerivation, base, data-default, libX11, libXext, libXrandr }:
      mkDerivation {
        pname = "X11";
        version = "1.6.1.2";
        sha256 = "1kzjcynm3rr83ihqx2y2d852jc49da4p18gv6jzm7g87z22x85jj";
-       buildDepends = [ base data-default ];
-       extraLibraries = [
-         libX11 libXext libXinerama libXrandr libXrender
-       ];
+       libraryHaskellDepends = [ base data-default ];
+       librarySystemDepends = [ libX11 libXext libXrandr ];
        homepage = "https://github.com/haskell-pkg-janitors/X11";
        description = "A binding to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs.xlibs) libXext;
-          inherit (pkgs.xlibs) libXinerama;  inherit (pkgs.xlibs) libXrandr;
-          inherit (pkgs.xlibs) libXrender;};
+          inherit (pkgs.xlibs) libXrandr;};
 
   "X11-extras" = callPackage
     ({ mkDerivation, base, libX11, X11 }:
      mkDerivation {
        pname = "X11-extras";
        version = "0.4";
-       revision = "1";
        sha256 = "1cpjr09gddcjd0wqwvaankv1zj7fyc6hbfdvar63f51g3vvw627a";
+       revision = "1";
        editedCabalFile = "f7b315acd1fb4d44ee6312b2e8d397b7cda103cf5e9e8ca6867389ef6cadff3c";
-       buildDepends = [ base X11 ];
-       extraLibraries = [ libX11 ];
+       libraryHaskellDepends = [ base X11 ];
+       librarySystemDepends = [ libX11 ];
        jailbreak = true;
        description = "Missing bindings to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
@@ -15899,7 +16299,7 @@ self: {
        pname = "X11-rm";
        version = "0.2";
        sha256 = "11jxlaad9jgjddd5v8ygy2rdrajrbm9dlp6f0mslvxa2wzn4v4r3";
-       buildDepends = [ base X11 ];
+       libraryHaskellDepends = [ base X11 ];
        description = "A binding to the resource management functions missing from X11";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15911,8 +16311,8 @@ self: {
        pname = "X11-xdamage";
        version = "0.1.2";
        sha256 = "0r6dq9xx0v100162y7bvkj1l0lv5m697y35c659kgjj0mg8p9bjv";
-       buildDepends = [ base X11 ];
-       extraLibraries = [ Xdamage ];
+       libraryHaskellDepends = [ base X11 ];
+       librarySystemDepends = [ Xdamage ];
        homepage = "http://darcs.haskell.org/X11-xdamage";
        description = "A binding to the Xdamage X11 extension library";
        license = stdenv.lib.licenses.bsd3;
@@ -15925,8 +16325,8 @@ self: {
        pname = "X11-xfixes";
        version = "0.1.1";
        sha256 = "0wwhyqqybrjvy8mi5d5429wraky93xq348gr9ldhg2qj95hj13yk";
-       buildDepends = [ base X11 ];
-       extraLibraries = [ Xfixes ];
+       libraryHaskellDepends = [ base X11 ];
+       librarySystemDepends = [ Xfixes ];
        homepage = "https://github.com/reacocard/x11-xfixes";
        description = "A binding to the Xfixes X11 extension library";
        license = stdenv.lib.licenses.mit;
@@ -15934,23 +16334,16 @@ self: {
      }) { Xfixes = null;};
 
   "X11-xft" = callPackage
-    ({ mkDerivation, base, fontconfig, freetype, libXft, pkgconfig
-     , utf8-string, X11
-     }:
+    ({ mkDerivation, base, libXft, utf8-string, X11 }:
      mkDerivation {
        pname = "X11-xft";
        version = "0.3.1";
        sha256 = "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf";
-       buildDepends = [ base utf8-string X11 ];
-       extraLibraries = [ fontconfig freetype pkgconfig ];
-       pkgconfigDepends = [ libXft ];
-       configureFlags = [
-         "--extra-include-dirs=${freetype}/include/freetype2"
-       ];
+       libraryHaskellDepends = [ base utf8-string X11 ];
+       libraryPkgconfigDepends = [ libXft ];
        description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts";
        license = "LGPL";
-     }) { inherit (pkgs) fontconfig;  inherit (pkgs) freetype;
-          inherit (pkgs.xlibs) libXft;  inherit (pkgs) pkgconfig;};
+     }) { inherit (pkgs.xlibs) libXft;};
 
   "X11-xshape" = callPackage
     ({ mkDerivation, base, X11 }:
@@ -15958,7 +16351,7 @@ self: {
        pname = "X11-xshape";
        version = "0.1.1";
        sha256 = "19p71lc0hihfn0xzl29j01kd0zf9yalspwj7dava0ybc1rm3g62h";
-       buildDepends = [ base X11 ];
+       libraryHaskellDepends = [ base X11 ];
        homepage = "http://darcs.haskell.org/X11-xshape";
        description = "A binding to the Xshape X11 extension library";
        license = stdenv.lib.licenses.bsd3;
@@ -15970,7 +16363,7 @@ self: {
        pname = "XAttr";
        version = "0.1.1";
        sha256 = "16vap0rw026lgxfcqpdfsx7l26ik97rhkkv1mg2j61akydhijs67";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "Read, set, and list extended attributes";
        license = "GPL";
      }) {};
@@ -15981,8 +16374,8 @@ self: {
        pname = "XInput";
        version = "0.1";
        sha256 = "1kk0gccv83mw8463x29c7rpl5davmhk9vyf82i4rbksgrdzkhjh9";
-       buildDepends = [ base Win32 ];
-       extraLibraries = [ xinput ];
+       libraryHaskellDepends = [ base Win32 ];
+       librarySystemDepends = [ xinput ];
        homepage = "http://code.fac9.com/xinput/";
        description = "Bindings for the DirectX XInput library";
        license = stdenv.lib.licenses.bsd3;
@@ -15995,8 +16388,8 @@ self: {
        pname = "XMMS";
        version = "0.1.1";
        sha256 = "08l53b0wp6v9wjfn53xfa1vlh64bnqidajc4lzlk8p31km1c09qx";
-       buildDepends = [ base containers ];
-       extraLibraries = [ xmmsclient xmmsclient-glib ];
+       libraryHaskellDepends = [ base containers ];
+       librarySystemDepends = [ xmmsclient xmmsclient-glib ];
        homepage = "http://kawais.org.ua/XMMS/";
        description = "XMMS2 client library";
        license = "LGPL";
@@ -16011,7 +16404,7 @@ self: {
        pname = "XMPP";
        version = "0.1.2";
        sha256 = "03gypa9kln2v3zqyxszn4k2x364g8wj0hppsy10ywmandghsvn7b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell98 hsdns mtl network parsec random utf8-string
        ];
        jailbreak = true;
@@ -16028,12 +16421,15 @@ self: {
      mkDerivation {
        pname = "XSaiga";
        version = "1.0.0.0";
-       revision = "3";
        sha256 = "0smf0ym26kv0fa34plnsndxp5hflc7w6g0wbkg6n4cy9bz4sgd4z";
+       revision = "3";
        editedCabalFile = "a152097b5010d51d0192d2c1748dce912a050f3f705f5a4b86ffa7a2f726488f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cgi containers hsparql pretty rdf4h text ];
+       libraryHaskellDepends = [ base pretty ];
+       executableHaskellDepends = [
+         base cgi containers hsparql pretty rdf4h text
+       ];
        jailbreak = true;
        homepage = "http://hafiz.myweb.cs.uwindsor.ca/proHome.html";
        description = "An implementation of a polynomial-time top-down parser suitable for NLP";
@@ -16047,8 +16443,8 @@ self: {
        pname = "Xauth";
        version = "0.1";
        sha256 = "1mvflp6y1nz9961gngbwk0b7wr8sx3p6296jfvvb6ln1kvm2scxs";
-       buildDepends = [ base ];
-       pkgconfigDepends = [ libXau ];
+       libraryHaskellDepends = [ base ];
+       libraryPkgconfigDepends = [ libXau ];
        description = "A binding to the X11 authentication library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs.xlibs) libXau;};
@@ -16063,7 +16459,7 @@ self: {
        sha256 = "1n3y232v9i5jzbshk2zw675g09snc45ni60acmi6kvfsk7nkmfw8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring cairo containers directory filepath gtk mtl
          old-time SHA unix
        ];
@@ -16078,7 +16474,7 @@ self: {
        pname = "XmlHtmlWriter";
        version = "0.0.0.1";
        sha256 = "0dv5nvvqy6w0ndjyab4bwhjpw1hlx8xi4bv2jw4rl8v6y68bilk1";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        homepage = "http://github.com/mmirman/haskogeneous/tree/XmlHtmlWriter";
        description = "A library for writing XML and HTML";
        license = stdenv.lib.licenses.bsd3;
@@ -16091,7 +16487,7 @@ self: {
        pname = "Xorshift128Plus";
        version = "0.1.0.1";
        sha256 = "11g1gipc9v81h5jzndr3j7j4mwr4lva9b52fd0hml4mrzf6vj2dx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kanaihiroki/Xorshift128Plus";
        description = "Pure haskell implementation of xorshift128plus random number generator";
        license = stdenv.lib.licenses.publicDomain;
@@ -16108,7 +16504,7 @@ self: {
        sha256 = "1r2n1vbzq755p68fzb5f6fm1yjfq2c5jgx52ri9p5rlrwmfk3hw5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base data-accessor-transformers fclabels monads-fd random SDL
          SDL-image SDL-mixer SDL-ttf transformers
        ];
@@ -16124,7 +16520,7 @@ self: {
        pname = "YFrob";
        version = "0.4";
        sha256 = "17pp79yr8jfmhx85vlr5kx7q5wha48p3ra7l4ligd583yxzvlnif";
-       buildDepends = [ array base HGL Yampa ];
+       libraryHaskellDepends = [ array base HGL Yampa ];
        homepage = "http://www.haskell.org/yampa/";
        description = "Yampa-based library for programming robots";
        license = stdenv.lib.licenses.bsd3;
@@ -16149,7 +16545,7 @@ self: {
        sha256 = "0qa7m9y3dclr2r2vpd2cmpc58nib158hnr49hrdjvk00ncd4lyvk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder blaze-html bytestring case-insensitive
          clientsession conduit containers data-default directory filepath
          hamlet hjsmin http-conduit http-types mime-mail monad-control mtl
@@ -16177,9 +16573,10 @@ self: {
        sha256 = "0nk7zw3ikv459hzrs0si06j4qf2yrgggsiv8vpm0r1lg5v5l3vng";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers directory dlist HUnit regex-compat
+       libraryHaskellDepends = [
+         base bytestring containers dlist HUnit regex-compat
        ];
+       executableHaskellDepends = [ directory ];
        homepage = "http://www.ben-kiki.org/oren/YamlReference";
        description = "YAML reference implementation";
        license = "LGPL";
@@ -16192,7 +16589,7 @@ self: {
        pname = "Yampa";
        version = "0.10.2";
        sha256 = "1pmszrbf1fxid4km0jdam8iqfba2mfyz8mzn6vxfb0da19vlz4cq";
-       buildDepends = [ base deepseq random ];
+       libraryHaskellDepends = [ base deepseq random ];
        homepage = "http://www.haskell.org/haskellwiki/Yampa";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
@@ -16206,8 +16603,9 @@ self: {
        sha256 = "06mgmnj8zsnfzg3li3nw4a5lmiz0jkc4hxzilwhh1r84qiki72xp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base deepseq random vector-space ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base deepseq random vector-space ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/ony/Yampa-core";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
@@ -16223,7 +16621,9 @@ self: {
        sha256 = "028a7lrfyikvky52s19kffssnry1grnip3sm7z55bs5fazma1im1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base bytestring containers HCodecs Yampa ];
+       executableHaskellDepends = [
+         array base bytestring containers HCodecs Yampa
+       ];
        homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze";
        description = "Software synthesizer";
        license = stdenv.lib.licenses.bsd3;
@@ -16235,7 +16635,7 @@ self: {
        pname = "Yocto";
        version = "0.1.0";
        sha256 = "1krp17rw25b7a280rf3idpfzkx39kpfcjqwznz96y0d2sdqbhg6p";
-       buildDepends = [ base containers parsec ];
+       libraryHaskellDepends = [ base containers parsec ];
        homepage = "https://github.com/ajg/yocto";
        description = "A Minimal JSON Parser & Printer for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -16249,7 +16649,7 @@ self: {
        pname = "Yogurt";
        version = "0.4.1";
        sha256 = "04fzixjgsn0azx2dp352kipxdijfafsm5dnrcvxpxdxms35npffq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl network old-locale process readline regex-posix
          syb time
        ];
@@ -16269,11 +16669,11 @@ self: {
        sha256 = "151kamqwdwnhinvsmzdq9ckryyvnrf9ihzw6qm4j851y375452hl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers hint mtl network old-locale process regex-posix syb
          time Yogurt
        ];
-       extraLibraries = [ readline ];
+       executableSystemDepends = [ readline ];
        homepage = "http://code.google.com/p/yogurt-mud/";
        description = "A functional MUD client";
        license = stdenv.lib.licenses.bsd3;
@@ -16286,7 +16686,7 @@ self: {
        pname = "ZEBEDDE";
        version = "0.1.0.0";
        sha256 = "1i85pah79342ivmcg73q305awbf9fi6gw4ckg9i019d6vmdg5d17";
-       buildDepends = [ base vect ];
+       libraryHaskellDepends = [ base vect ];
        jailbreak = true;
        description = "Polymer growth simulation method";
        license = stdenv.lib.licenses.bsd3;
@@ -16299,7 +16699,9 @@ self: {
        pname = "ZFS";
        version = "0.0.2";
        sha256 = "1mwpcgkw1cci2grhb8vl081wykkgsmfbanwapp10mrzzp0df1yzr";
-       buildDepends = [ base CC-delcont containers mtl network unix ];
+       libraryHaskellDepends = [
+         base CC-delcont containers mtl network unix
+       ];
        homepage = "https://github.com/jkarni/ZipperFS";
        description = "Oleg's Zipper FS";
        license = stdenv.lib.licenses.publicDomain;
@@ -16314,7 +16716,7 @@ self: {
        sha256 = "1s005k892z9651mr2jj0jdwpm8aa0y72vi405xi4h6czg52i4rb3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base gtk mtl random ];
+       executableHaskellDepends = [ array base gtk mtl random ];
        description = "A Z-machine interpreter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16326,7 +16728,7 @@ self: {
        pname = "ZipFold";
        version = "0.1.4";
        sha256 = "05cnpl9c6i0j8jqr4j43b32jgryv34gahimhp9g1m45idgnl2sn0";
-       buildDepends = [ base TypeCompose ];
+       libraryHaskellDepends = [ base TypeCompose ];
        homepage = "http://haskell.org/haskellwiki/ZipFold";
        description = "Zipping folds";
        license = stdenv.lib.licenses.bsd3;
@@ -16338,7 +16740,7 @@ self: {
        pname = "ZipperAG";
        version = "0.9";
        sha256 = "0nl08r7s3r5hr5jag499fillca16wsb8yqz1dlzydvacqcklcxr9";
-       buildDepends = [ base syz ];
+       libraryHaskellDepends = [ base syz ];
        homepage = "www.di.uminho.pt/~prmartins";
        description = "An implementationg of Attribute Grammars using Functional Zippers";
        license = stdenv.lib.licenses.bsd3;
@@ -16352,11 +16754,11 @@ self: {
        pname = "Zora";
        version = "1.2.0";
        sha256 = "1yni2yq8ynq9jhnzabyx0ahmvmvcyblc0swxy0n7qdzlz5rxzm3i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory fgl graphviz random shelly
          text
        ];
-       testDepends = [ base containers random tasty tasty-hunit ];
+       testHaskellDepends = [ base containers random tasty tasty-hunit ];
        homepage = "http://github.com/bgwines/zora";
        description = "Graphing library wrapper + assorted useful functions";
        license = stdenv.lib.licenses.bsd3;
@@ -16368,7 +16770,7 @@ self: {
        pname = "Zwaluw";
        version = "0.1";
        sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/MedeaMelana/Zwaluw";
        description = "Combinators for bidirectional URL routing";
        license = stdenv.lib.licenses.bsd3;
@@ -16385,7 +16787,7 @@ self: {
        sha256 = "0jfnf0rq3rfic196zjwbaiamyis98zrr8d4zn2myjlgqlzhljzs0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base biofasta biopsl cmdargs containers directory process
        ];
        homepage = "http://blog.malde.org/index.php/a50-a-graphical-comparison-of-genome-assemblies";
@@ -16399,8 +16801,8 @@ self: {
        pname = "abacate";
        version = "0.0.0.0";
        sha256 = "1lxsn3n77fk7jl8i76nffj1zngvi2s38y17s54ha29h8hrp3s3dg";
-       buildDepends = [ base parsec text ];
-       testDepends = [ base HUnit text ];
+       libraryHaskellDepends = [ base parsec text ];
+       testHaskellDepends = [ base HUnit text ];
        jailbreak = true;
        homepage = "http://github.com/marcotmarcot/abacate";
        description = "Parser for a language similar to Cucumber's Gherkin";
@@ -16416,7 +16818,9 @@ self: {
        sha256 = "0i162j9wlpcisqzf9klqvag9hrs9v7araw4l16cvw0yrifvqzswd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base minisat random random-shuffle Safe ];
+       executableHaskellDepends = [
+         array base minisat random random-shuffle Safe
+       ];
        homepage = "https://github.com/pa-ba/abc-puzzle";
        description = "Generate instances of the ABC Logic Puzzle";
        license = stdenv.lib.licenses.bsd3;
@@ -16433,13 +16837,14 @@ self: {
        sha256 = "1ki5h3058n3kpvaspl8g1vadprw6kb3xxyadb3a4k1irkfz8lfkf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aig base containers directory vector ];
-       testDepends = [
+       libraryHaskellDepends = [ aig base containers directory vector ];
+       librarySystemDepends = [ abc ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          aig base directory QuickCheck tasty tasty-ant-xml tasty-hunit
          tasty-quickcheck vector
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ abc ];
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16451,7 +16856,9 @@ self: {
        pname = "abcnotation";
        version = "1.9.0";
        sha256 = "0vmpgdqasnhj0fbb5wl7ikxmp6kzrlnbixp2yj4x93mh8vrrsk40";
-       buildDepends = [ base parsec prettify process semigroups ];
+       libraryHaskellDepends = [
+         base parsec prettify process semigroups
+       ];
        description = "Haskell representation and parser for ABC notation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16464,10 +16871,10 @@ self: {
      mkDerivation {
        pname = "abeson";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "1g258gfk7sk8hsd4nixah0vj69rwphvv6aywsvdldm8pbw51sy1c";
+       revision = "1";
        editedCabalFile = "fc1839c19327f8fb9b36d2aa6dd133e3d391696183b3292894f9f7e1ca188727";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bson bytestring data-default-class
          scientific text time unordered-containers uuid vector
        ];
@@ -16483,7 +16890,7 @@ self: {
        pname = "abstract-deque";
        version = "0.3";
        sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9";
-       buildDepends = [ array base containers random time ];
+       libraryHaskellDepends = [ array base containers random time ];
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "Abstract, parameterized interface to mutable Deques";
        license = stdenv.lib.licenses.bsd3;
@@ -16497,11 +16904,11 @@ self: {
        pname = "abstract-deque-tests";
        version = "0.3";
        sha256 = "19gb5x5z3nvazdra3skm24c2g2byj0i4cjbzfwfghnb5q96gn5sz";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-deque array base containers HUnit random test-framework
          test-framework-hunit time
        ];
-       testDepends = [
+       testHaskellDepends = [
          abstract-deque array base containers HUnit random test-framework
          test-framework-hunit time
        ];
@@ -16516,7 +16923,7 @@ self: {
        pname = "abstract-par";
        version = "0.3.3";
        sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/simonmar/monad-par";
        description = "Type classes generalizing the functionality of the 'monad-par' library";
        license = stdenv.lib.licenses.bsd3;
@@ -16528,7 +16935,9 @@ self: {
        pname = "abstract-par-accelerate";
        version = "0.3.3";
        sha256 = "0k1730mg2vyf21837fc459m8si1ffnbj78cdkbgglp2vn51f3nz4";
-       buildDepends = [ abstract-par accelerate array base vector ];
+       libraryHaskellDepends = [
+         abstract-par accelerate array base vector
+       ];
        homepage = "https://github.com/simonmar/monad-par";
        description = "Provides the class ParAccelerate, nothing more";
        license = stdenv.lib.licenses.bsd3;
@@ -16543,7 +16952,7 @@ self: {
        pname = "abt";
        version = "0.1.1.0";
        sha256 = "1hgbzzpxn6gcs3zjs8hqz065gqk2x6gzra2b1fw9lyb2x4lw42y9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base profunctors transformers transformers-compat vinyl
        ];
        jailbreak = true;
@@ -16558,7 +16967,9 @@ self: {
        pname = "ac-machine";
        version = "0.2.0.5";
        sha256 = "00s2nvd85l00kpl45ipaq4ypa1ymaxmvnaf5mdvdladg4icl50i4";
-       buildDepends = [ base hashable unordered-containers vector ];
+       libraryHaskellDepends = [
+         base hashable unordered-containers vector
+       ];
        jailbreak = true;
        description = "Aho-Corasick string matching algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -16570,7 +16981,7 @@ self: {
        pname = "ac-machine-conduit";
        version = "0.1.0.0";
        sha256 = "1nsnbvllwznbqycw33f09vfgqvqmqfkcbi367clm6k4v6rfswzl3";
-       buildDepends = [ ac-machine base conduit text ];
+       libraryHaskellDepends = [ ac-machine base conduit text ];
        jailbreak = true;
        description = "Drive Aho-Corasick machines in Conduit pipelines";
        license = stdenv.lib.licenses.bsd3;
@@ -16585,7 +16996,7 @@ self: {
        pname = "accelerate";
        version = "0.15.1.0";
        sha256 = "07bbam9za0g15vm0h0p9dypblw2f709v4qmvc52jcvmsv1drl3yv";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers fclabels ghc-prim hashable hashtables pretty
          template-haskell unordered-containers
        ];
@@ -16602,10 +17013,10 @@ self: {
        pname = "accelerate-arithmetic";
        version = "0.0.1";
        sha256 = "093j1wdabhws695hfb4cmj05ys6i4hkh0yppkszmhn5z4imlv741";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate accelerate-utility base QuickCheck utility-ht
        ];
-       testDepends = [ accelerate base QuickCheck ];
+       testHaskellDepends = [ accelerate base QuickCheck ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/accelerate-arithmetic/";
        description = "Linear algebra and interpolation using the Accelerate framework";
@@ -16624,9 +17035,13 @@ self: {
        sha256 = "1dcra6qpva8sg5bdh6ilrfdg44h7p6dfh7vkrhifiim4vkvgh9sc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-cuda accelerate-io
-         accelerate-utility base cublas cuda random utility-ht vector
+         accelerate-utility base cublas cuda utility-ht vector
+       ];
+       executableHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-cuda accelerate-utility
+         base cublas random
        ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/accelerate-cublas/";
@@ -16644,10 +17059,10 @@ self: {
      mkDerivation {
        pname = "accelerate-cuda";
        version = "0.15.0.0";
-       revision = "2";
        sha256 = "1z8nfciwxm2f2vaddnhan5gi9i1l7qa9h9fsngmdh8d6wabxxidy";
+       revision = "2";
        editedCabalFile = "5ed199c4c1d360ed3eaee24df7016462ed1fb1313ff47d6828be546eec8708fc";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate array base binary bytestring cryptohash cuda directory
          fclabels filepath hashable hashtables language-c-quote
          mainland-pretty mtl old-time pretty process SafeSemaphore srcloc
@@ -16669,7 +17084,7 @@ self: {
        sha256 = "12faz5z0k682381fgwav91wx5wny0n5jdzgnrajx3sxc8gpg5xd7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate accelerate-cuda accelerate-fourier accelerate-utility
          base cuda cufft
        ];
@@ -16684,13 +17099,13 @@ self: {
      mkDerivation {
        pname = "accelerate-examples";
        version = "0.15.0.0";
-       revision = "1";
        sha256 = "1jfwb0ryb8idfjc1gccb1h67hl730qn455k5z5wna8aikfscy7rq";
+       revision = "1";
        editedCabalFile = "2cf8a02096ae9902b9336ce9d0665b3233abb20381d0cb4585efc53357d795cc";
+       configureFlags = [ "-f-opencl" ];
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ accelerate-cuda ekg ];
-       configureFlags = [ "-f-opencl" ];
+       executableHaskellDepends = [ accelerate-cuda ekg ];
        homepage = "https://github.com/AccelerateHS/accelerate-examples";
        description = "Examples using the Accelerate library";
        license = stdenv.lib.licenses.bsd3;
@@ -16701,10 +17116,12 @@ self: {
      mkDerivation {
        pname = "accelerate-fft";
        version = "0.15.0.0";
-       revision = "1";
        sha256 = "0nxlw8z7bnr29vp24qbbwwmq9rj2q6jqqkmm46pp8dp582y4yk6v";
+       revision = "1";
        editedCabalFile = "c23b93ae20f528782aeb10b528fa2a7847cce5c1aa9db546f3b000d7f05f53ca";
-       buildDepends = [ accelerate accelerate-cuda base cuda cufft ];
+       libraryHaskellDepends = [
+         accelerate accelerate-cuda base cuda cufft
+       ];
        jailbreak = true;
        homepage = "https://github.com/AccelerateHS/accelerate-fft";
        description = "FFT using the Accelerate library";
@@ -16719,7 +17136,7 @@ self: {
        pname = "accelerate-fftw";
        version = "0.0";
        sha256 = "03ffsa6xshhrx8a4grld128g46x2nkkydwql8h7jw7b2igr7i1ks";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate accelerate-io base carray fft storable-complex
        ];
        jailbreak = true;
@@ -16738,11 +17155,11 @@ self: {
        pname = "accelerate-fourier";
        version = "0.0";
        sha256 = "0b7cm540im3z9ja7a68sbs5y0ayzbx5h4sbwr437f05qdwkg7b2q";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-utility base containers
          QuickCheck transformers utility-ht
        ];
-       testDepends = [
+       testHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-utility base QuickCheck
          utility-ht
        ];
@@ -16763,7 +17180,7 @@ self: {
        sha256 = "1679sn9ajn6fmj9pdgjdr434vcgj05chvn2fld3sri16q3jbqrga";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          accelerate accelerate-cuda accelerate-cufft accelerate-fftw
          accelerate-fourier base criterion
        ];
@@ -16780,10 +17197,10 @@ self: {
      mkDerivation {
        pname = "accelerate-io";
        version = "0.15.0.0";
-       revision = "1";
        sha256 = "00p8jmxsgywhx30nd44pl6hdcr076y2s6z2fsam6sgrmgr0qx936";
+       revision = "1";
        editedCabalFile = "5c3f8f7ebc03117652646329743ea251d281f72d81454e55538c27e87e8c0ecc";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate array base bmp bytestring repa vector
        ];
        jailbreak = true;
@@ -16799,7 +17216,7 @@ self: {
        pname = "accelerate-utility";
        version = "0.1";
        sha256 = "1n5hyklil2x2x5bc5z7iq0yz4p8lab8xxdnlwzgjpn3lliq0vgpv";
-       buildDepends = [ accelerate base utility-ht ];
+       libraryHaskellDepends = [ accelerate base utility-ht ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/accelerate-utility/";
        description = "Utility functions for the Accelerate framework";
@@ -16813,7 +17230,7 @@ self: {
        pname = "accentuateus";
        version = "0.9.4";
        sha256 = "16hgs81cs3zgbvsprh9lzvyxbh58g7rijf1d4j0dkrpnqnrvg0hy";
-       buildDepends = [ base bytestring HTTP json network text ];
+       libraryHaskellDepends = [ base bytestring HTTP json network text ];
        jailbreak = true;
        homepage = "http://accentuate.us/";
        description = "A Haskell implementation of the Accentuate.us API.";
@@ -16827,7 +17244,7 @@ self: {
        pname = "access-time";
        version = "0.1.0.4";
        sha256 = "13kg8mjrnif88r0w7b041x4vmzdm9aqrx4fskc3qv3smpq2q2ngs";
-       buildDepends = [ base filepath old-time time unix ];
+       libraryHaskellDepends = [ base filepath old-time time unix ];
        jailbreak = true;
        homepage = "http://www.github.com/batterseapower/access-time";
        description = "Cross-platform support for retrieving file access times";
@@ -16843,10 +17260,12 @@ self: {
        pname = "ace";
        version = "0.6";
        sha256 = "0f07j2rj9ylvdrijwwlpx66mj503mhjfq1x2mylpxkr6kmjjniyk";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-html blaze-markup data-default parsec text
        ];
-       testDepends = [ base bifunctors hspec HUnit mtl parsec text ];
+       testHaskellDepends = [
+         base bifunctors hspec HUnit mtl parsec text
+       ];
        description = "Attempto Controlled English parser and printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16860,7 +17279,7 @@ self: {
        pname = "acid-state";
        version = "0.12.4";
        sha256 = "0mb2p29pi9dhby2bwn6zkg1nn3sf6vr7xzf6npx3738ffj3b2bad";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal containers directory
          extensible-exceptions filepath mtl network safecopy stm
          template-haskell unix
@@ -16878,7 +17297,7 @@ self: {
        pname = "acid-state-tls";
        version = "0.9.2";
        sha256 = "04w3r1x3msvsixmdlif99ly4k0py9bzb8pgi06j780zz5lpm1zpi";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state base directory HsOpenSSL network safecopy
        ];
        jailbreak = true;
@@ -16893,7 +17312,7 @@ self: {
        pname = "acl2";
        version = "0.0.1";
        sha256 = "0bwlsdxk3lbir90xhar7xd83cwarqcm0a86gvwaghknpil2ay4cg";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        description = "Writing and calling ACL2 from Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16904,7 +17323,7 @@ self: {
        pname = "acme-all-monad";
        version = "0.1.0.0";
        sha256 = "1qay7m16yjsjg8anbinkagb2v8r67k5wsppkrwyskn9jcb1wnbgv";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        description = "A monad which is powerful enough to interpret any action";
        license = stdenv.lib.licenses.publicDomain;
@@ -16918,8 +17337,9 @@ self: {
        sha256 = "0n6mawj9kq6s84j4yxwqabhni7kzgvhmhxi9dw1mrwnxkh5ial8v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/drwebb/acme-box";
        description = "A full featured empty project";
        license = stdenv.lib.licenses.bsd3;
@@ -16931,7 +17351,7 @@ self: {
        pname = "acme-cadre";
        version = "0.1";
        sha256 = "1nclcq48r547rgmd4h0hf498z27d15lp4da9yb3a3sy7qk6m92bi";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "car, cdr and more";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -16942,7 +17362,7 @@ self: {
        pname = "acme-cofunctor";
        version = "0.1.0.0";
        sha256 = "06ii13zfr5iqf0cxaw35mxjxx16q0n7mvbgnqv0gwyfmgm3vxv6m";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jaspervdj/acme-cofunctor";
        description = "A Cofunctor is a structure from category theory dual to Functor";
        license = stdenv.lib.licenses.bsd3;
@@ -16954,7 +17374,7 @@ self: {
        pname = "acme-colosson";
        version = "0.1";
        sha256 = "0mfnav0wb0ks365n3kghaic6nasp3qaznhmsdccx35h164ixj9vc";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        description = "Determines whether it is numberwang";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16965,7 +17385,7 @@ self: {
        pname = "acme-comonad";
        version = "0.1.0.0";
        sha256 = "1sc0alwdgfls18y4q4y0qkbzqm4fgzd9yv6dwwnzw3472vsz2x8s";
-       buildDepends = [ base comonad ];
+       libraryHaskellDepends = [ base comonad ];
        jailbreak = true;
        description = "A more efficient dualization";
        license = stdenv.lib.licenses.bsd3;
@@ -16979,7 +17399,8 @@ self: {
        sha256 = "1vvhfncnrq4pbzrgq45kannqv1c029b96lvi1qzwvzf513rqfb3z";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://github.com/Fuuzetsu/acme-cutegirl";
        description = "Maybe gives you a cute girl";
        license = stdenv.lib.licenses.gpl3;
@@ -16991,7 +17412,7 @@ self: {
        pname = "acme-dont";
        version = "1.1";
        sha256 = "1kj3qjgn1rz093050z49w3js4is9p0g9pk5g7d7wvg28hpzk28n3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A don't construct";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17002,7 +17423,7 @@ self: {
        pname = "acme-flipping-tables";
        version = "0";
        sha256 = "1xl5gwc67acg47fdkgrn7sjvvvnc4sjf5vifph0jb3c7gv93n757";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/jystic/acme-flipping-tables";
        description = "Stop execution with rage";
        license = stdenv.lib.licenses.bsd3;
@@ -17014,7 +17435,7 @@ self: {
        pname = "acme-hq9plus";
        version = "0.1";
        sha256 = "0da4ysj74fmhcbbvxxfb6w97pr870518k90vwnc3z8kglj1ni187";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/joeyadams/haskell-acme-hq9plus";
        description = "An embedded DSL for the HQ9+ programming language";
        license = stdenv.lib.licenses.publicDomain;
@@ -17031,7 +17452,7 @@ self: {
        sha256 = "1nmv8ilh783jrp6mxl308ybv032xi833awhsys7svma3l9v5i4gi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring extensible-exceptions mtl network pretty
        ];
        jailbreak = true;
@@ -17048,7 +17469,8 @@ self: {
        sha256 = "1h1vdzqarrmb8sl6y6250h6fia4rxi9vz4i4sj7km7nyk3778zyk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Evil inventions in the Tri-State area";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17060,7 +17482,7 @@ self: {
        pname = "acme-io";
        version = "0.1.0.1";
        sha256 = "091czdcbydc75ndaw2ns8cncxa6ihlvclhrbcz9vp29kvhf483cb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "N/A";
        description = "The only true way to do IO in Haskell!";
@@ -17073,7 +17495,7 @@ self: {
        pname = "acme-lolcat";
        version = "0.1.1";
        sha256 = "08issbr9lgc2saqvgs80sxl1sgi7ig5jg6iykv1g1zl5k1kv2a32";
-       buildDepends = [ base parsec random random-shuffle text ];
+       libraryHaskellDepends = [ base parsec random random-shuffle text ];
        homepage = "https://github.com/llelf/acme-lolcat";
        description = "LOLSPEAK translator";
        license = stdenv.lib.licenses.bsd3;
@@ -17085,7 +17507,7 @@ self: {
        pname = "acme-lookofdisapproval";
        version = "0.1";
        sha256 = "194xvcab14bs3b3nrayxp4z3da60afxa9cmip58mkms5016kwhis";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/llelf/acme-lookofdisapproval";
        description = "Express your disapproval";
        license = stdenv.lib.licenses.bsd3;
@@ -17097,7 +17519,7 @@ self: {
        pname = "acme-memorandom";
        version = "0.0.3";
        sha256 = "1l6kxmdb7fi47ldfpcqbl6h4dnzw6zw0ahxmvx6sxwxm3x4hynhi";
-       buildDepends = [ base MemoTrie random ];
+       libraryHaskellDepends = [ base MemoTrie random ];
        homepage = "https://github.com/ion1/acme-memorandom";
        description = "Memoized random number generation";
        license = stdenv.lib.licenses.mit;
@@ -17109,7 +17531,7 @@ self: {
        pname = "acme-microwave";
        version = "0.1.0.2";
        sha256 = "136lwxcimj241nq9l0x7icxk1q9xz826sg07d40yj87shir52j39";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "The eighth wonder of the world, kitchen math!";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17120,7 +17542,7 @@ self: {
        pname = "acme-miscorder";
        version = "0.1.0.0";
        sha256 = "180fs64vlbxb2700qq8hzzz82kkmpknakkbk66ddkk1pdl7nm0j4";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        jailbreak = true;
        description = "Miscellaneous newtypes for orderings of discutable use";
        license = stdenv.lib.licenses.publicDomain;
@@ -17132,7 +17554,7 @@ self: {
        pname = "acme-missiles";
        version = "0.3";
        sha256 = "0nvkgdj04i21gq5k541an8zjz0hzzy7dpi384yrhcyh14jsxhqz5";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "Cause serious international side effects";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -17143,7 +17565,7 @@ self: {
        pname = "acme-now";
        version = "1.0.0.1";
        sha256 = "0lnrsndx7r00b7vgh9jmp5j635m4pb2bzx0lfhqidkzfc2llzwsm";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        jailbreak = true;
        description = "An interface to the philosophical and metaphysical \"now\"";
        license = stdenv.lib.licenses.publicDomain;
@@ -17155,7 +17577,7 @@ self: {
        pname = "acme-numbersystem";
        version = "0.3.0.0";
        sha256 = "1p5rdssdmds6yqgv3yvlh835h180h9q9430j8i6qrhygqn8lmv87";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        description = "Define the less than and add and subtract for nats";
        license = stdenv.lib.licenses.bsd3;
@@ -17168,8 +17590,8 @@ self: {
        pname = "acme-omitted";
        version = "2.0.0.0";
        sha256 = "0pj6jlm4i05m0nys8d66d0xfkhfz6gfa9122bsk64xcms5n0hxad";
-       buildDepends = [ base ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/joachifm/acme-omitted#readme";
        description = "A name for omitted definitions";
        license = stdenv.lib.licenses.bsd3;
@@ -17192,7 +17614,7 @@ self: {
        pname = "acme-operators";
        version = "0.2.0.0";
        sha256 = "1wf12iphv12srygdvhy7xyja453dzjmm6kd9l2qp00fx986zd01w";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/phadej/acme-operators#readme";
        description = "Operators of base, all in one place!";
        license = stdenv.lib.licenses.bsd3;
@@ -17204,7 +17626,7 @@ self: {
        pname = "acme-php";
        version = "0.0.3";
        sha256 = "091ddg3441ac6hbzd84jzakll7nvz2r6mcfdwxy8d7rd8wx9jdyz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "The flexibility of Haskell and the safety of PHP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17215,7 +17637,7 @@ self: {
        pname = "acme-pointful-numbers";
        version = "0.1.2.4";
        sha256 = "02gml2db5vigkwkx99lqzjkpfaqdc74x16bgdx62kf7r3nn37my9";
-       buildDepends = [ base split ];
+       libraryHaskellDepends = [ base split ];
        description = "Make more than one point in numeric literals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17226,7 +17648,7 @@ self: {
        pname = "acme-realworld";
        version = "0.1.1";
        sha256 = "0ffhichjhhic7d5cjypmd2zmcq0dpqiz5ygsw0y67v83hry0vf8r";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Primitives for manipulating the state of the universe";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17237,7 +17659,7 @@ self: {
        pname = "acme-safe";
        version = "0.1.0.0";
        sha256 = "0bmv45b3v45967gdvsy37xfw6x50qpl8234y20m3nc48f4nf0z68";
-       buildDepends = [ acme-dont base ];
+       libraryHaskellDepends = [ acme-dont base ];
        homepage = "http://github.com/fgaz/acme-safe";
        description = "Safe versions of some infamous haskell functions such as fromJust";
        license = "unknown";
@@ -17251,8 +17673,8 @@ self: {
        pname = "acme-schoenfinkel";
        version = "0.1.1";
        sha256 = "0jvbrivxpq8jb5rhz6j3pxx2g3d0ckviprp4iza31d6ik7cpk8ad";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
@@ -17267,7 +17689,7 @@ self: {
        pname = "acme-strfry";
        version = "0.1";
        sha256 = "1r6xnkyx22khzq6hlb8bk0fnbb6hlwbf12wajhx8vcxa7bkhh8lb";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "https://github.com/ehird/acme-strfry";
        description = "A binding to the glibc strfry function";
@@ -17280,7 +17702,7 @@ self: {
        pname = "acme-stringly-typed";
        version = "1.0.0.0";
        sha256 = "18wvsvdmbwh9dcawiy4f9pn4vg98kdq9zxc37sz7dpmaigimw16f";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Stringly Typed Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -17292,7 +17714,7 @@ self: {
        pname = "acme-strtok";
        version = "0.1.0.3";
        sha256 = "1anj8yygzcqkl4nwqwbrmwsqda84qcl8yzq7pgx2b7p895xcfa68";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "A Haskell port of the C/PHP strtok function";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -17303,7 +17725,7 @@ self: {
        pname = "acme-timemachine";
        version = "0.0.1.0";
        sha256 = "1dfwn0n4hg6zs4ikz6jzkn2spwsvchs1jgq7662aq4ljyp7f1rvb";
-       buildDepends = [ base ghc-prim mtl transformers ];
+       libraryHaskellDepends = [ base ghc-prim mtl transformers ];
        description = "An easy way to perform and unperform IO and other stateful actions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17314,8 +17736,8 @@ self: {
        pname = "acme-year";
        version = "2015";
        sha256 = "1ymsxy51vi2i75jkq0hfm2ii8qp78c3g35ijma0ygcrq9mmm12rv";
-       buildDepends = [ base ];
-       testDepends = [ base time ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base time ];
        homepage = "http://github.com/joeyadams/hs-acme-year";
        description = "Get the current year";
        license = stdenv.lib.licenses.publicDomain;
@@ -17340,7 +17762,7 @@ self: {
        pname = "action-permutations";
        version = "0.0.0.1";
        sha256 = "0rhlzpwshixpnqma7sk28f22dkwz39b6lcwnzmd31rcnz5cyw6d4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Execute a set of actions (e.g. parsers) in each possible order";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17353,10 +17775,10 @@ self: {
        pname = "active";
        version = "0.2.0.4";
        sha256 = "1xm2y8knqhd883c41194h323vchv4hx57wl32l9f64kf7gdglag0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base lens linear QuickCheck semigroupoids semigroups vector
        ];
        description = "Abstractions for animation";
@@ -17377,7 +17799,7 @@ self: {
        sha256 = "03za0c24a22fy28mcm173r0cca6fk60jikp0pp817mrq6gpv62hc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          activehs-base array base blaze-html bytestring cmdargs containers
          data-pprint deepseq dia-base dia-functions directory filepath
          haskell-src-exts highlighting-kate hint hoogle mtl old-locale
@@ -17396,7 +17818,7 @@ self: {
        pname = "activehs-base";
        version = "0.3.0.3";
        sha256 = "1q433by9ygs7rrjj8z76hg94zyh2cp4qiwsv7q1mywr5scfccn32";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        description = "Basic definitions for activehs";
        license = stdenv.lib.licenses.bsd3;
@@ -17408,7 +17830,9 @@ self: {
        pname = "activitystreams-aeson";
        version = "0.2.0.1";
        sha256 = "1bprj41552zr1aj0k73c3skdhg8jb60rhcm9p9hjcmy2al9izsag";
-       buildDepends = [ aeson base text time unordered-containers ];
+       libraryHaskellDepends = [
+         aeson base text time unordered-containers
+       ];
        jailbreak = true;
        description = "An interface to the ActivityStreams specification";
        license = stdenv.lib.licenses.bsd3;
@@ -17420,7 +17844,7 @@ self: {
        pname = "actor";
        version = "0.1.1";
        sha256 = "1ic74yrfy6hk7217vh2ff6yacvf3dc5m1hjkcpfvxzdk5xhdv2b5";
-       buildDepends = [ base haskell98 stm time ];
+       libraryHaskellDepends = [ base haskell98 stm time ];
        homepage = "http://sulzmann.blogspot.com/2008/10/actors-with-multi-headed-receive.html";
        description = "Actors with multi-headed receive clauses";
        license = stdenv.lib.licenses.bsd3;
@@ -17436,11 +17860,11 @@ self: {
        pname = "ad";
        version = "4.2.3";
        sha256 = "0w9nd8llzcjb91x1d3mh5482pavbx1jpn8w2ahm6ydjwvijjd9r5";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base comonad containers data-reify erf free nats reflection
          transformers
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/ad";
        description = "Automatic Differentiation";
@@ -17453,7 +17877,7 @@ self: {
        pname = "adaptive-containers";
        version = "0.3";
        sha256 = "16h0zi55hf9g07xisbcmgkx72m9laiqykh2r9nh2siczx3sxi1qk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~dons/code/adaptive-containers";
        description = "Self optimizing container types";
        license = stdenv.lib.licenses.bsd3;
@@ -17466,7 +17890,7 @@ self: {
        pname = "adaptive-tuple";
        version = "0.2.0";
        sha256 = "1kf4d3qf8nv61c7pajv234b2vil84c2cq40csnm456lg55qh53r1";
-       buildDepends = [ base template-haskell type-level ];
+       libraryHaskellDepends = [ base template-haskell type-level ];
        homepage = "http://inmachina.net/~jwlato/haskell/";
        description = "Self-optimizing tuple types";
        license = stdenv.lib.licenses.bsd3;
@@ -17480,7 +17904,9 @@ self: {
        pname = "adb";
        version = "0.1.0.0";
        sha256 = "17dxvdzmg3i8n0gbgbj0jyhm90w0dq7j27id8n24frild2w4c0d0";
-       buildDepends = [ base bytestring cereal containers mtl network ];
+       libraryHaskellDepends = [
+         base bytestring cereal containers mtl network
+       ];
        jailbreak = true;
        description = "Android Debug Bridge (ADB) protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -17497,7 +17923,7 @@ self: {
        sha256 = "1iy0dmaw48nvgq4cqlx41n51almhz1w4k7rjpgsxqbsdnlwd8zdl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath http-conduit MissingH mtl
          network network-uri old-locale parsec parsec-permutation strict
          text time
@@ -17516,7 +17942,7 @@ self: {
        sha256 = "054kcm0ibh1qdkyci36w3yxwxln56hz1yvi7gskp636nzhw5sjrw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        description = "Adds license info to the top of a file";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17530,7 +17956,7 @@ self: {
        pname = "adhoc-network";
        version = "1.0.3";
        sha256 = "1whdrmxw13nr7bb95rhqaz3klgmcwx4ai51bz5yb38nldf4ac377";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers Crypto dataenc HaXml hsgnutls network
          old-locale parsec pkcs1 random time utf8-string xml-parsec
        ];
@@ -17548,10 +17974,10 @@ self: {
        pname = "adict";
        version = "0.4.1";
        sha256 = "07w3595cwlicvwg04w9i5sg1x9d3r8c64pq0yi5pmnza7jpd5vgq";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary containers dawg PSQueue vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers dawg QuickCheck test-framework
          test-framework-quickcheck2 vector
        ];
@@ -17570,7 +17996,7 @@ self: {
        pname = "adjunctions";
        version = "4.2.1";
        sha256 = "0vzlz2q6863ywnhvax3m5xq99x6bz1h47z7z8hmnqdfg5pa4r9k5";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base comonad containers contravariant distributive free mtl
          profunctors semigroupoids semigroups tagged transformers void
        ];
@@ -17589,7 +18015,10 @@ self: {
        sha256 = "0jc6xwh1m2hmpfclsi27233775kp4yk0wrkr498qx7fs6p7xflpv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring data-binary-ieee754 language-css mtl pretty
+       ];
+       executableHaskellDepends = [
          base binary bytestring data-binary-ieee754 language-css mtl pretty
        ];
        jailbreak = true;
@@ -17610,8 +18039,8 @@ self: {
        sha256 = "1lmmyxa22lm9a86w0gap8g676mnh5l1kxczbsv8ymb98fzcg6a27";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers htrace ];
-       testDepends = [
+       libraryHaskellDepends = [ array base containers htrace ];
+       testHaskellDepends = [
          array base containers htrace HUnit mtl QuickCheck random-shuffle
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -17632,8 +18061,8 @@ self: {
        sha256 = "13zlmhgyf46pcnrjwcrk7l6nmrkgqvycrajq3v7z72kjixakis6s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ adp-multi base containers monadiccp ];
-       testDepends = [
+       libraryHaskellDepends = [ adp-multi base containers monadiccp ];
+       testHaskellDepends = [
          adp-multi base containers monadiccp mtl QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -17645,24 +18074,24 @@ self: {
      }) {};
 
   "aeson_0_7_0_6" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl
-     , old-locale, QuickCheck, scientific, syb, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, unordered-containers, vector
+    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
+     , dlist, ghc-prim, hashable, HUnit, mtl, old-locale, QuickCheck
+     , scientific, syb, template-haskell, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson";
        version = "0.7.0.6";
-       revision = "1";
        sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4";
+       revision = "1";
        editedCabalFile = "8b87a1343dd8d93d98e48e530f2ec14f5949fcdc96c8ecc81458a1d20defd001";
-       buildDepends = [
-         attoparsec base blaze-builder bytestring containers deepseq dlist
-         ghc-prim hashable mtl old-locale scientific syb template-haskell
-         text time unordered-containers vector
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers deepseq dlist ghc-prim
+         hashable mtl old-locale scientific syb template-haskell text time
+         unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers ghc-prim HUnit QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 text time unordered-containers vector
@@ -17674,22 +18103,22 @@ self: {
      }) {};
 
   "aeson" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl
-     , QuickCheck, scientific, syb, template-haskell, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, time
-     , transformers, unordered-containers, vector
+    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
+     , dlist, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific
+     , syb, template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson";
        version = "0.9.0.1";
        sha256 = "1g7qdq7zpyvqwmh4sfhizqpb51cg24lrcj9vq5msz8k896y7vfcj";
-       buildDepends = [
-         attoparsec base blaze-builder bytestring containers deepseq dlist
-         ghc-prim hashable mtl scientific syb template-haskell text time
-         transformers unordered-containers vector
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers deepseq dlist ghc-prim
+         hashable mtl scientific syb template-haskell text time transformers
+         unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers ghc-prim HUnit QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 text time unordered-containers vector
@@ -17705,7 +18134,7 @@ self: {
        pname = "aeson-applicative";
        version = "0.1.0.0";
        sha256 = "0plbpln1glmf8a53f4nag1lx7sy8lcali6f1m526zifgak99p3qz";
-       buildDepends = [ aeson base text unordered-containers ];
+       libraryHaskellDepends = [ aeson base text unordered-containers ];
        jailbreak = true;
        homepage = "https://github.com/gregwebs/aeson-applicative-dsl";
        description = "make To/From JSOn instances from an applicative description";
@@ -17721,7 +18150,7 @@ self: {
        pname = "aeson-better-errors";
        version = "0.9.0";
        sha256 = "00b9mjf636pfgg50961y86qbkpix19x5pvbzlha0mr0icqqaan76";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring dlist mtl scientific text transformers
          transformers-compat unordered-containers vector void
        ];
@@ -17738,7 +18167,7 @@ self: {
        pname = "aeson-bson";
        version = "0.3.0";
        sha256 = "0a4hrx56q1kfvf2ff9flsmrpgpvz3rshri9dpj4a9bf76ah04jn9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array attoparsec base bson bytestring containers text
          unordered-containers vector
        ];
@@ -17754,10 +18183,10 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-casing";
-       version = "0.1.0.1";
-       sha256 = "0paspgxayshz007gibijrh4j141q0lxshl6h9nyn24lbkrs62nnb";
-       buildDepends = [ aeson base ];
-       testDepends = [
+       version = "0.1.0.2";
+       sha256 = "07r19341n6k5pxk0xr7y5sylxgd9ryyhj7gx2irxhqsg9hn11yax";
+       libraryHaskellDepends = [ aeson base ];
+       testHaskellDepends = [
          aeson base tasty tasty-hunit tasty-quickcheck tasty-th
        ];
        description = "Tools to change the formatting of field names in Aeson instances";
@@ -17776,11 +18205,14 @@ self: {
        sha256 = "00bmvdnqhw364i1j2f1n2didfzpgs93ia8djmmq81adgry73xmbq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base bytestring edit-distance-vector hashable mtl
-         optparse-applicative scientific text unordered-containers vector
+       libraryHaskellDepends = [
+         aeson base bytestring edit-distance-vector hashable mtl scientific
+         text unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring optparse-applicative text
+       ];
+       testHaskellDepends = [
          aeson base QuickCheck quickcheck-instances text
          unordered-containers vector
        ];
@@ -17797,10 +18229,10 @@ self: {
        pname = "aeson-lens";
        version = "0.5.0.0";
        sha256 = "1pr8cxkx41wi7095cp1gpqrwadwx6azcrdi1kr1ik0fs6606dkks";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring lens text unordered-containers vector
        ];
-       testDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest ];
        description = "Lens of Aeson";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17813,10 +18245,10 @@ self: {
      mkDerivation {
        pname = "aeson-native";
        version = "0.3.3.2";
-       revision = "1";
        sha256 = "1s5i88r8sdd7ayrpjw6f18273k6r0igk0sswb503hzvjagzmzffh";
+       revision = "1";
        editedCabalFile = "c9519a30bce75564cfbe84aade5ffb99fad12ecea1c7d2c362cca2234b8ae497";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual-native bytestring
          containers deepseq hashable mtl old-locale syb text time
          unordered-containers vector
@@ -17838,9 +18270,11 @@ self: {
        sha256 = "03ap81853qi8yd9kdgczllrrni23a6glsfxrwj8zab6ipjrbh234";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson attoparsec base bytestring cmdargs text unordered-containers
-         vector
+       libraryHaskellDepends = [
+         aeson base bytestring text unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring cmdargs
        ];
        homepage = "http://github.com/informatikr/aeson-pretty";
        description = "JSON pretty-printing library and command-line tool";
@@ -17856,11 +18290,11 @@ self: {
        pname = "aeson-qq";
        version = "0.8.0";
        sha256 = "12vs3mh1a6j2r74xr11bpzb69i0k25dxplhvw15ph72kmhfbri7f";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base haskell-src-meta parsec scientific
          template-haskell text vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base ghc-prim haskell-src-meta hspec parsec
          scientific template-haskell text vector
        ];
@@ -17881,12 +18315,12 @@ self: {
        pname = "aeson-schema";
        version = "0.3.0.7";
        sha256 = "1r84ih3bhnzfl3hl6a4ph4x2l25ls11py3mrxqd04kcpyqzsll5g";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
          regex-base regex-compat regex-pcre scientific syb template-haskell
          text th-lift transformers unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring containers directory filepath
          hashable hint HUnit mtl QuickCheck regex-compat scientific
          template-haskell temporary test-framework test-framework-hunit
@@ -17903,8 +18337,8 @@ self: {
        pname = "aeson-serialize";
        version = "0.0.0";
        sha256 = "010lbzm5ik2gdiqm8slnf9kwgbnz8ib03c901schrw5kildfxq51";
-       buildDepends = [ aeson base cereal ];
-       testDepends = [ aeson base cereal hspec HUnit ];
+       libraryHaskellDepends = [ aeson base cereal ];
+       testHaskellDepends = [ aeson base cereal hspec HUnit ];
        description = "Simple serialization functions for aeson types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17917,7 +18351,7 @@ self: {
        pname = "aeson-smart";
        version = "0.2.0.0";
        sha256 = "1r3262k6d7nskbnnam5rw5vq7i84347amz8lk6hrjn3c4bwacf35";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base data-default template-haskell text unordered-containers
          vector
        ];
@@ -17936,7 +18370,7 @@ self: {
        pname = "aeson-streams";
        version = "0.1.0";
        sha256 = "1mmkilvjrffzbf7d024kpc4i6b72f7dbq5hrkvrzr0q7dg1mg825";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring HsOpenSSL http-streams io-streams
        ];
        jailbreak = true;
@@ -17953,10 +18387,10 @@ self: {
        pname = "aeson-t";
        version = "0.0.5";
        sha256 = "1mpqkjxsg4bpmbkj8ys39g53knw851l428x83619bmvnlrj1fkkd";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-qq base bytestring hspec text unordered-containers
          vector
        ];
@@ -17972,8 +18406,8 @@ self: {
        pname = "aeson-toolkit";
        version = "0.0.1";
        sha256 = "07cb4f4zwm64x0q5z63gsskl80s6qbwnk4nl6x2jiardcl3k8cl3";
-       buildDepends = [ aeson base bytestring failure text ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ aeson base bytestring failure text ];
+       testHaskellDepends = [ base hspec ];
        description = "A generalization of Aeson over Failure";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -17986,7 +18420,7 @@ self: {
        pname = "aeson-utils";
        version = "0.3.0.2";
        sha256 = "07sbvmm158yqmw4hri9l66ag4r6l59x230gbjm9r97w4x0dlp0bi";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific text
        ];
        description = "Utilities for working with Aeson";
@@ -18001,7 +18435,7 @@ self: {
        pname = "affine-invariant-ensemble-mcmc";
        version = "0.2.0.0";
        sha256 = "116ln9zf4n0xy95nyyb3kwhg7ds36m793ys5yd5ha74vqf48gvk5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mwc-random primitive split vector
        ];
        jailbreak = true;
@@ -18019,10 +18453,10 @@ self: {
        pname = "afis";
        version = "0.1.2";
        sha256 = "0ppq3rbwszz3wczg0zgk8hjqplv2ck11bbq5xr8306s5n02ybcf9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-random cryptohash packer
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-random cryptohash HUnit mtl
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -18042,7 +18476,7 @@ self: {
        sha256 = "06p2xp5myipjhyzqak4zwr755kc1l4qljdf2bxn8rg0m7rhy01vk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory language-c mtl process yices
        ];
        jailbreak = true;
@@ -18063,7 +18497,7 @@ self: {
        sha256 = "070xszykrazkisp1lsh2q1ri1i64lhd8psz8g4blv37zm899fpga";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          Agda base cmdargs containers directory filepath HJavaScript mtl
          pandoc snap-core snap-server transformers utf8-string xhtml
        ];
@@ -18084,7 +18518,12 @@ self: {
        sha256 = "0pmnrij90xag46af4c5yws5g26pf77l5ck864f4cyw5g9acw67g6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base binary bitwise bytestring containers data-default Diff
+         fclabels mtl network pipes pipes-concurrency pipes-network safe
+         snmp time transformers unix
+       ];
+       executableHaskellDepends = [
          base binary bitwise bytestring containers data-default Diff
          fclabels mtl network pipes pipes-concurrency pipes-network safe
          snmp time transformers unix
@@ -18101,7 +18540,8 @@ self: {
        sha256 = "1j2qlwnvg7rxjx8fk3y5n3wjkikv1d17p8grh4gzp4c5a7pn5kim";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        description = "Unification and Matching in an Abelian Group";
        license = "GPL";
      }) {};
@@ -18112,7 +18552,7 @@ self: {
        pname = "aig";
        version = "0.2.3";
        sha256 = "0363wr5fnryz49ksj6mvwngpqi2bj7ldgyzh6hgvmvvdz5nmmxzr";
-       buildDepends = [ base mtl QuickCheck vector ];
+       libraryHaskellDepends = [ base mtl QuickCheck vector ];
        description = "And-inverter graphs in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18125,7 +18565,7 @@ self: {
        pname = "air";
        version = "2015.5.4";
        sha256 = "1g9zzsxhmkiqpdmmapsvvh3vq5dp5gmmyr0x7ja59529xndslwaj";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath mtl text time
        ];
        homepage = "https://github.com/nfjinjing/air";
@@ -18141,7 +18581,7 @@ self: {
        pname = "air-extra";
        version = "2015.5.4";
        sha256 = "07k01yjr9kj5q0dr871w9jmf23sdd75xrwgldsrkpppfc8kvnd97";
-       buildDepends = [
+       libraryHaskellDepends = [
          air array base bytestring containers directory filepath parallel
          parsec regexpr text time
        ];
@@ -18156,7 +18596,7 @@ self: {
        pname = "air-spec";
        version = "2013.7.1";
        sha256 = "0s4y2805nmfydzxgr5lnhmyzkb6rh9mx2kpvzqqgyh4jvccdnwfx";
-       buildDepends = [ base hspec text ];
+       libraryHaskellDepends = [ base hspec text ];
        homepage = "https://github.com/nfjinjing/air-spec";
        description = "air spec helper";
        license = stdenv.lib.licenses.bsd3;
@@ -18168,7 +18608,7 @@ self: {
        pname = "air-th";
        version = "2014.11.17";
        sha256 = "0rhp56qvwiwlrs7pvpbslybvlp4xnllfjab6pap2chxgywas34pq";
-       buildDepends = [ air base template-haskell ];
+       libraryHaskellDepends = [ air base template-haskell ];
        homepage = "https://github.com/nfjinjing/air-th";
        description = "air";
        license = stdenv.lib.licenses.bsd3;
@@ -18184,7 +18624,7 @@ self: {
        pname = "airbrake";
        version = "0.2.0.0";
        sha256 = "03z5hjrdwv8kjsj1vhipqhfmc19mi5cnjkcvcm71b0gmnpd71shq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-markup bytestring directory exceptions filepath
          http-conduit monad-control network semigroups template-haskell text
          transformers utf8-string wai
@@ -18210,14 +18650,18 @@ self: {
        sha256 = "118valfn96mwdl8pfrvpqgp1rg9armcwlw2r4lvvzb6ci0nyp9n8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring blaze-builder bytestring
          bytestring-trie case-insensitive cryptohash directory either
          filepath http-date http-media http-types lifted-base mime-types
          monad-control mtl network old-locale random text time transformers
-         transformers-base unix unordered-containers wai warp
+         transformers-base unix unordered-containers wai
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base blaze-builder bytestring http-types mtl text time
+         unordered-containers wai warp
+       ];
+       testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-quickcheck text
          transformers wai
        ];
@@ -18232,7 +18676,9 @@ self: {
        pname = "aivika";
        version = "4.3";
        sha256 = "01vcjc6i040lp92xhxma6sp3iffam9d7nxqch6i64pajvd8cq97j";
-       buildDepends = [ array base containers mtl random vector ];
+       libraryHaskellDepends = [
+         array base containers mtl random vector
+       ];
        homepage = "http://github.com/dsorokin/aivika";
        description = "A multi-paradigm simulation library";
        license = stdenv.lib.licenses.bsd3;
@@ -18246,7 +18692,7 @@ self: {
        pname = "aivika-experiment";
        version = "4.0.3";
        sha256 = "1v0x37kmav87b3mxvribw6658glf5hbk7npipkabp1qbfz5sp7zv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aivika base containers directory filepath mtl network-uri
          parallel-io split
        ];
@@ -18263,7 +18709,7 @@ self: {
        pname = "aivika-experiment-cairo";
        version = "4.3.1";
        sha256 = "0p54ssbl0ack51gwlj962x45954v4h22mqq6zqa5r8xrbcig2pdb";
-       buildDepends = [
+       libraryHaskellDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-cairo
        ];
        homepage = "http://github.com/dsorokin/aivika-experiment-cairo";
@@ -18280,7 +18726,7 @@ self: {
        pname = "aivika-experiment-chart";
        version = "4.3.1";
        sha256 = "18fagq4ddvqzi6r0c850yassgncicqy0plasfn262fmhgwflpa8n";
-       buildDepends = [
+       libraryHaskellDepends = [
          aivika aivika-experiment array base Chart colour containers
          data-default-class filepath lens mtl split
        ];
@@ -18297,7 +18743,7 @@ self: {
        pname = "aivika-experiment-diagrams";
        version = "4.3.1";
        sha256 = "1plb44bcjnawg3fsb9crmlyzwzyiz802ldsk559ni9sb590ywr7n";
-       buildDepends = [
+       libraryHaskellDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-diagrams
          containers filepath
        ];
@@ -18315,7 +18761,9 @@ self: {
        pname = "aivika-transformers";
        version = "3.0";
        sha256 = "1b9hkza735g1gxr3l73fz48y29fyph89j8114wzld3ydma2f6d1z";
-       buildDepends = [ aivika array base containers mtl random vector ];
+       libraryHaskellDepends = [
+         aivika array base containers mtl random vector
+       ];
        homepage = "http://github.com/dsorokin/aivika-transformers";
        description = "Transformers for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
@@ -18334,10 +18782,15 @@ self: {
        sha256 = "1x2rc0gyyg7idc07hi64fvkv5h5a652kmcrczfxqyzbiyx2fjphs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers cpphs directory fgl
-         filepath haskeline HsSyck HTTP mtl network old-time pretty process
-         random regex-compat syb temporary unix utf8-string zlib
+         filepath haskeline HsSyck mtl old-time pretty process random
+         regex-compat syb temporary unix utf8-string zlib
+       ];
+       executableHaskellDepends = [
+         array base binary bytestring containers directory fgl filepath
+         haskeline HsSyck HTTP mtl network old-time pretty process random
+         regex-compat syb temporary unix utf8-string zlib
        ];
        homepage = "http://ajhc.metasepi.org/";
        description = "Haskell compiler that produce binary through C language";
@@ -18351,9 +18804,9 @@ self: {
        pname = "al";
        version = "0.1.4";
        sha256 = "1jr707fhsl1jvjidaznxj7xsi6br2v7gzckfhvcrmicd4i98yg1q";
-       buildDepends = [ base mtl ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ openal ];
+       libraryHaskellDepends = [ base mtl ];
+       libraryPkgconfigDepends = [ openal ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/phaazon/al";
        description = "OpenAL 1.1 raw API.";
        license = stdenv.lib.licenses.bsd3;
@@ -18365,8 +18818,8 @@ self: {
        pname = "alarmclock";
        version = "0.2.0.8";
        sha256 = "1g06bnbp0y6dcz7zgbh828klk7xc1spwzw3ff6jpqh74cm82vq6f";
-       buildDepends = [ base stm time unbounded-delays ];
-       testDepends = [ base time ];
+       libraryHaskellDepends = [ base stm time unbounded-delays ];
+       testHaskellDepends = [ base time ];
        homepage = "https://bitbucket.org/davecturner/alarmclock";
        description = "Wake up and perform an action at a certain time";
        license = stdenv.lib.licenses.bsd3;
@@ -18380,7 +18833,7 @@ self: {
        sha256 = "1j18hqyrfyyhngla4dikdchi659bi7gj1lsl38r08645hf9n5395";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ argparser base containers threefish ];
+       executableHaskellDepends = [ argparser base containers threefish ];
        homepage = "https://github.com/Rnhmjoj/alea";
        description = "a diceware passphrase generator";
        license = stdenv.lib.licenses.mit;
@@ -18388,8 +18841,8 @@ self: {
      }) {};
 
   "alex" = callPackage
-    ({ mkDerivation, array, base, containers, directory, happy, perl
-     , process, QuickCheck
+    ({ mkDerivation, array, base, containers, directory, process
+     , QuickCheck
      }:
      mkDerivation {
        pname = "alex";
@@ -18397,13 +18850,14 @@ self: {
        sha256 = "17x13nbbr79xgdlzywjqw19vcl6iygjnssjnxnajgijkv764wknn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers directory QuickCheck ];
-       testDepends = [ base process ];
-       buildTools = [ happy perl ];
+       executableHaskellDepends = [
+         array base containers directory QuickCheck
+       ];
+       testHaskellDepends = [ base process ];
        homepage = "http://www.haskell.org/alex/";
        description = "Alex is a tool for generating lexical analysers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) perl;};
+     }) {};
 
   "alex-meta" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy
@@ -18413,13 +18867,12 @@ self: {
        pname = "alex-meta";
        version = "0.3.0.8";
        sha256 = "1ja5y2dyil4h6j7q9dhrxzhry018fqc7vy3v5mrkvxyp7bhw1n9f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers haskell-src-meta QuickCheck template-haskell
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        description = "Quasi-quoter for Alex lexers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alfred" = callPackage
@@ -18429,10 +18882,10 @@ self: {
      mkDerivation {
        pname = "alfred";
        version = "0.5";
-       revision = "1";
        sha256 = "1c6ak56g29wkas66x7yhg1zk039mp2mvlp7njixchhh2c4kx9fvn";
+       revision = "1";
        editedCabalFile = "06e4b9ba672fc3d29452df70d2e9f9018ada5e8b62aa5890b9a70d9d937d6581";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring hexpat http-conduit http-types network-uri
          text xmlgen
        ];
@@ -18447,10 +18900,10 @@ self: {
      mkDerivation {
        pname = "algebra";
        version = "4.2";
-       revision = "1";
        sha256 = "1b74c55326qsnpyqzyhyq87j61wp3zrpsqhipgw8db8nm2lq9nhs";
+       revision = "1";
        editedCabalFile = "621c4b71305b0a6a926f055608b5ca76c4c2360a523bcdf88d80fd10d20f4210";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions array base containers distributive mtl nats
          semigroupoids semigroups tagged transformers void
        ];
@@ -18468,12 +18921,11 @@ self: {
        pname = "algebra-dag";
        version = "0.1.1.1";
        sha256 = "1pr6bbj67n13bw120l82zn5bj7bj0x00b754w852pbpij03fjay9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers fgl mtl parsec template-haskell transformers
        ];
        description = "Infrastructure for DAG-shaped relational algebra plans";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebra-sql" = callPackage
@@ -18488,14 +18940,18 @@ self: {
        sha256 = "1wvm9qkixmyawwjd6ypshsmby7y7229zwidj3qhzkbmyi7p5sgzj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal
+         dlist errors fgl filepath ghc-prim mtl multiset parsec pretty
+         process template-haskell text time transformers
+       ];
+       executableHaskellDepends = [
          aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal
          dlist errors fgl filepath ghc-prim mtl multiset parsec pretty
          process template-haskell text time transformers
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic" = callPackage
@@ -18504,7 +18960,7 @@ self: {
        pname = "algebraic";
        version = "0.1.0.2";
        sha256 = "15gv6w9vz02960r6bd0k979vi6kj7pfxg705ajbrsd1pnwklfnwh";
-       buildDepends = [ accelerate base ];
+       libraryHaskellDepends = [ accelerate base ];
        jailbreak = true;
        homepage = "https://github.com/wdanilo/algebraic";
        description = "General linear algebra structures";
@@ -18518,7 +18974,7 @@ self: {
        pname = "algebraic-classes";
        version = "0.6";
        sha256 = "0i34n1lmnw12xrnaqvmiydnnlm8m8ky12chwb9jmnsf3klv8qm61";
-       buildDepends = [ base syb template-haskell ];
+       libraryHaskellDepends = [ base syb template-haskell ];
        jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/algebraic-classes";
        description = "Conversions between algebraic classes and F-algebras";
@@ -18531,7 +18987,7 @@ self: {
        pname = "align";
        version = "0.1.1.2";
        sha256 = "1bv7x687ga563kdnl23smrspljq32bkaarq4zdg071glqckrffq9";
-       buildDepends = [ base containers transformers vector ];
+       libraryHaskellDepends = [ base containers transformers vector ];
        description = "Sequence alignment algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18544,7 +19000,7 @@ self: {
        sha256 = "1vn8l9lxih2w8bjkfl8j4xxi8p44c1gqia63gi143xk9s035rjh2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base optparse-applicative text ];
+       executableHaskellDepends = [ base optparse-applicative text ];
        jailbreak = true;
        homepage = "https://github.com/danchoi/align-text";
        description = "A simple unix filter to align text on specified substrings";
@@ -18557,7 +19013,7 @@ self: {
        pname = "aligned-foreignptr";
        version = "0.1";
        sha256 = "0hmnp08k04c0ag9fyp5sajg54r4gi57vrd9krk4g8y8fri0fgc00";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "An aligned ForeignPtr type";
        license = stdenv.lib.licenses.publicDomain;
@@ -18569,7 +19025,7 @@ self: {
        pname = "allocated-processor";
        version = "0.0.2";
        sha256 = "0jhz3q0972snrgd9c7lr934ddkwllwgw6anj7ax8hj4zi0zc615m";
-       buildDepends = [ base vector-space ];
+       libraryHaskellDepends = [ base vector-space ];
        description = "Functional combinators for monadic actions that require allocation and de-allocation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18580,7 +19036,7 @@ self: {
        pname = "alloy";
        version = "1.2.1";
        sha256 = "00bndi30yhd92vwij3dwhbj79dhv9n3l45bw01mfqak45gqbfwyv";
-       buildDepends = [ base containers mtl syb vector ];
+       libraryHaskellDepends = [ base containers mtl syb vector ];
        description = "Generic programming library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18591,7 +19047,7 @@ self: {
        pname = "alloy-proxy-fd";
        version = "1.0.0";
        sha256 = "1fhk5ydnf0l0n579gqg5lfg2cc9z8xbgqsqzgkpcw0046kp53rjw";
-       buildDepends = [ alloy base mtl ];
+       libraryHaskellDepends = [ alloy base mtl ];
        description = "Some add-on instances for the Alloy library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18602,7 +19058,7 @@ self: {
        pname = "almost-fix";
        version = "0.0.2";
        sha256 = "03x715jcrsxfs2d08hsg3y5f6a4bnlzfxsmhzimvpdp9bw0psn90";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Recurse while a predicate is satisfied";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18619,7 +19075,7 @@ self: {
        sha256 = "1xickrpjx2dn2pa5zcbjsfm5j6mqn54hpyzi7c6sv5i20hs2gamp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory editline fgl filepath HUnit
          incremental-sat-solver mtl network parsec pretty QuickCheck random
          stm syb template-haskell transformers tuple
@@ -18641,7 +19097,7 @@ self: {
        sha256 = "1gc2kjyk75cxggy52w49j97q4gcn74q7f582q6kjb3gsp2pdrn09";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array AvlTree base bimap bindings-posix bytestring cereal
          containers COrdering cpphs directory filepath ghc-prim mtl parsec
          transformers unix
@@ -18664,10 +19120,13 @@ self: {
        sha256 = "1sh0mrlpfak5i20wqmz23ihphim4di802h02kyxj795gq8q6v61r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-lexing conduit containers hexpat-pickle
          MonadRandom mtl random-shuffle resourcet rosezipper utf8-string
        ];
+       executableHaskellDepends = [
+         base conduit containers MonadRandom mtl resourcet utf8-string
+       ];
        jailbreak = true;
        homepage = "http://github.com/danieldk/alpino-tools";
        description = "Alpino data manipulation tools";
@@ -18683,8 +19142,10 @@ self: {
        pname = "alsa";
        version = "0.4";
        sha256 = "0zdnhi2wm7w6182k6mccm16x453g7kvbsqx2afnhfjpr3iaj69mg";
-       buildDepends = [ array base extensible-exceptions sample-frame ];
-       extraLibraries = [ alsaLib ];
+       libraryHaskellDepends = [
+         array base extensible-exceptions sample-frame
+       ];
+       librarySystemDepends = [ alsaLib ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API";
@@ -18698,8 +19159,8 @@ self: {
        pname = "alsa-core";
        version = "0.5.0.1";
        sha256 = "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b";
-       buildDepends = [ base extensible-exceptions ];
-       pkgconfigDepends = [ alsaLib ];
+       libraryHaskellDepends = [ base extensible-exceptions ];
+       libraryPkgconfigDepends = [ alsaLib ];
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (Exceptions)";
        license = stdenv.lib.licenses.bsd3;
@@ -18715,7 +19176,7 @@ self: {
        sha256 = "0zcyjckdjhsj614iib3dzj9dfp8xj847jfqf4q1sk9311gscbzns";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          alsa-core alsa-seq base midi midi-alsa wx wxcore
        ];
        jailbreak = true;
@@ -18734,8 +19195,11 @@ self: {
        sha256 = "1dmc336irhw6wdny6f2za9n3gnd83i3pcfr7qfkm8fzq6kzkkjy3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base event-list midi non-negative ];
-       extraLibraries = [ alsaLib ];
+       libraryHaskellDepends = [
+         array base event-list midi non-negative
+       ];
+       librarySystemDepends = [ alsaLib ];
+       executableSystemDepends = [ alsaLib ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Bindings for the ALSA sequencer API (MIDI stuff)";
@@ -18749,9 +19213,9 @@ self: {
        pname = "alsa-mixer";
        version = "0.2.0.2";
        sha256 = "11sc2n879a8rb9yz54cb8vg8rplgapbymzy785p7n7638xx877hk";
-       buildDepends = [ alsa-core base unix ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ alsaLib ];
+       libraryHaskellDepends = [ alsa-core base unix ];
+       librarySystemDepends = [ alsaLib ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://github.com/ttuegel/alsa-mixer";
        description = "Bindings to the ALSA simple mixer API";
        license = stdenv.lib.licenses.bsd3;
@@ -18767,11 +19231,11 @@ self: {
        sha256 = "0rq0i17xhd0x7dnlhdf3i1fdvmyxrsbm0w0k9lrx20xpy4gw2zfs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          alsa-core array base extensible-exceptions sample-frame
          storable-record
        ];
-       pkgconfigDepends = [ alsaLib ];
+       libraryPkgconfigDepends = [ alsaLib ];
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (PCM audio)";
        license = stdenv.lib.licenses.bsd3;
@@ -18785,7 +19249,7 @@ self: {
        sha256 = "1bhrjf731jqs5297zcid5b6mmdh2njqx2hxssd077a4iqvm0c21k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ alsa base ];
+       executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA audio signal library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18802,11 +19266,11 @@ self: {
        sha256 = "1ll42nlhjwgzan9h1vzyyyhilj9d41l3gavnbahhgbr8h9wb2f0j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          alsa-core array base bytestring data-accessor enumset
          extensible-exceptions poll transformers utility-ht
        ];
-       pkgconfigDepends = [ alsaLib ];
+       libraryPkgconfigDepends = [ alsaLib ];
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (MIDI sequencer)";
        license = stdenv.lib.licenses.bsd3;
@@ -18820,7 +19284,7 @@ self: {
        sha256 = "0is11wdymarzm5zlilh572j1nw3akxma0czbswvgy391pj1a007s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ alsa base ];
+       executableHaskellDepends = [ alsa base ];
        jailbreak = true;
        description = "Tests for the ALSA sequencer library";
        license = stdenv.lib.licenses.bsd3;
@@ -18833,7 +19297,7 @@ self: {
        pname = "altcomposition";
        version = "0.2.2.0";
        sha256 = "0893802bwdmywl5jh5d6mdf7l4h4qyc5y53mp39xc5lx6dsiq1d9";
-       buildDepends = [ base composition ];
+       libraryHaskellDepends = [ base composition ];
        homepage = "https://github.com/jcristovao/altcomposition";
        description = "Alternative combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
@@ -18846,10 +19310,10 @@ self: {
      mkDerivation {
        pname = "alternative-io";
        version = "0.0.1";
-       revision = "1";
        sha256 = "01hypbci3hw2czkmx78ls51ycx518ich4k753jgv0z8ilrq8isch";
+       revision = "1";
        editedCabalFile = "982094590ae1e54131d4b1285eaec6d4160717a2864858f90a3511522fc591d6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control transformers transformers-base
        ];
        description = "IO as Alternative instance (deprecated)";
@@ -18862,7 +19326,7 @@ self: {
        pname = "altfloat";
        version = "0.3.1";
        sha256 = "1n0mxgl1jzap74sglw85l0595lhaj493bz46b90cnsqr5as9mal8";
-       buildDepends = [ base ghc-prim integer-gmp ];
+       libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        homepage = "http://repo.or.cz/w/altfloat.git";
        description = "Alternative floating point support for GHC";
        license = "unknown";
@@ -18875,8 +19339,8 @@ self: {
        pname = "alure";
        version = "0.1";
        sha256 = "1nrlw8qdbgv3l99mlcql35zknyj767fgh3f53y2mjksrh0p61v8n";
-       buildDepends = [ base OpenAL ];
-       extraLibraries = [ alure ];
+       libraryHaskellDepends = [ base OpenAL ];
+       librarySystemDepends = [ alure ];
        description = "A Haskell binding for ALURE";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18893,7 +19357,7 @@ self: {
        sha256 = "0s8m16qbcz6jgxx83sx1swg2217bvv3q3pm8b7f2jsn33nihrzxx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring configurator http-conduit lifted-base mime-mail
          mime-mail-ses postgresql-simple resourcet text time
        ];
@@ -18911,12 +19375,13 @@ self: {
        pname = "amazon-emailer-client-snap";
        version = "0.1.1.1";
        sha256 = "03am5nzacq2wd9jf46fnwmwq2ghfsh3yd9s0mzrrkskd26q1askb";
-       buildDepends = [ base mtl snap snaplet-postgresql-simple text ];
+       libraryHaskellDepends = [
+         base mtl snap snaplet-postgresql-simple text
+       ];
        jailbreak = true;
        homepage = "https://github.com/dbp/amazon-emailer-client-snap";
        description = "Client library for amazon-emailer daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazon-products" = callPackage
@@ -18931,12 +19396,15 @@ self: {
        sha256 = "10y86b3bzx6yk0478pixh3hh4nkkh0qlwwr0ac2fn6sh1hd6c7sl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring byteable bytestring conduit containers
          cryptohash http-conduit http-types mtl old-locale resourcet text
          time transformers transformers-base xml-conduit xml-picklers
          xml-types
        ];
+       executableHaskellDepends = [
+         base bytestring http-conduit text transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/AndrewRademacher/hs-amazon-products";
        description = "Connector for Amazon Products API";
@@ -18954,7 +19422,7 @@ self: {
        pname = "amazonka";
        version = "0.3.6";
        sha256 = "1snzrclzs275gks19glrrayiysvywzwpzx6y5hnwmm48z4lh4gsb";
-       buildDepends = [
+       libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra cryptohash
          cryptohash-conduit exceptions http-conduit lens mmorph
          monad-control mtl resourcet retry text time transformers
@@ -18971,7 +19439,7 @@ self: {
        pname = "amazonka-autoscaling";
        version = "0.3.6";
        sha256 = "11dkcf0arjimvdzdin690811hs9klhr4xbhmjxcvqmwjr0z0sbb9";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
        license = "unknown";
@@ -18983,7 +19451,7 @@ self: {
        pname = "amazonka-cloudformation";
        version = "0.3.6";
        sha256 = "0m64p8xgwskv5vyzkkd5cxcwg5a7qa86a8sndan7yffap5b4nzq3";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
        license = "unknown";
@@ -18995,7 +19463,7 @@ self: {
        pname = "amazonka-cloudfront";
        version = "0.3.6";
        sha256 = "09kl01agnmq24r1ip2f047ayrlf95x51nm80l3g40lx91n3mc7rp";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
        license = "unknown";
@@ -19007,7 +19475,7 @@ self: {
        pname = "amazonka-cloudhsm";
        version = "0.3.6";
        sha256 = "0m17yjilg4d7hm8d5mbs3bqsm9hlxcybk9b49bj06266jcd9rxff";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
        license = "unknown";
@@ -19019,7 +19487,7 @@ self: {
        pname = "amazonka-cloudsearch";
        version = "0.3.6";
        sha256 = "1hyapllcv5g2s8qxmyigy2k0fha9k07dd2jax69hkwi2qv88cks5";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
        license = "unknown";
@@ -19031,7 +19499,7 @@ self: {
        pname = "amazonka-cloudsearch-domains";
        version = "0.3.6";
        sha256 = "0dfi0flb77zjbjzdsfybr0hxwwdh2qd1pc5pry88l57iibjhmxym";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
        license = "unknown";
@@ -19043,7 +19511,7 @@ self: {
        pname = "amazonka-cloudtrail";
        version = "0.3.6";
        sha256 = "07b47dy9r1f7dl5zq6z1zx1xa9q4qlack49zy8y48x1im90dnc9x";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
        license = "unknown";
@@ -19055,7 +19523,7 @@ self: {
        pname = "amazonka-cloudwatch";
        version = "0.3.6";
        sha256 = "14vx5v9iicxv768637v8smzwj04nhd80dcrwrxq3yqqlq9mbk9nk";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
        license = "unknown";
@@ -19067,7 +19535,7 @@ self: {
        pname = "amazonka-cloudwatch-logs";
        version = "0.3.6";
        sha256 = "15xpyfifqm6c5s4ysak1y0sgn6h5g9bapl69s9dpacg7nfpajqvb";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
        license = "unknown";
@@ -19079,7 +19547,7 @@ self: {
        pname = "amazonka-codedeploy";
        version = "0.3.6";
        sha256 = "1cp99l1kjm0w0jb1c4brq00dy4mn53pycra5gvlvz9k210g72ndm";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
        license = "unknown";
@@ -19091,7 +19559,7 @@ self: {
        pname = "amazonka-cognito-identity";
        version = "0.3.6";
        sha256 = "1ig50w3z85y8g7hiq1hahbv529kq5pfrcpqwsrpf1zwynl50jjkz";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
        license = "unknown";
@@ -19103,7 +19571,7 @@ self: {
        pname = "amazonka-cognito-sync";
        version = "0.3.6";
        sha256 = "1m6nw80ls7rl55ci36y2xvw8a1wfqiv64wm3q4anzmyybl50s133";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
        license = "unknown";
@@ -19115,7 +19583,7 @@ self: {
        pname = "amazonka-config";
        version = "0.3.6";
        sha256 = "0aa73cmlaydayvy6vxbxdz5br8a6hsns3dn3s06r4nzxxy7zmfzg";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
        license = "unknown";
@@ -19134,7 +19602,7 @@ self: {
        pname = "amazonka-core";
        version = "0.3.6";
        sha256 = "1l60z0fcfbyrhi7r4lfy2a6b2vwc4bn1swd6ddna19qyq9fn67l2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bifunctors bytestring case-insensitive conduit conduit-extra
          cryptohash data-default-class hashable http-client http-types lens
@@ -19142,7 +19610,7 @@ self: {
          transformers transformers-compat unordered-containers vector
          xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base tasty tasty-hunit template-haskell text
        ];
        homepage = "https://github.com/brendanhay/amazonka";
@@ -19156,7 +19624,7 @@ self: {
        pname = "amazonka-datapipeline";
        version = "0.3.6";
        sha256 = "0p0k76hiif5nd4kxm1ww6p0srjfmmq8q3xln4sbkq8ss448zfymh";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
        license = "unknown";
@@ -19168,7 +19636,7 @@ self: {
        pname = "amazonka-directconnect";
        version = "0.3.6";
        sha256 = "0q258fxwklm5xwyzram3kdq3ylayk498a02xzs7v2vb2vd3pmdb6";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
        license = "unknown";
@@ -19180,7 +19648,7 @@ self: {
        pname = "amazonka-dynamodb";
        version = "0.3.6";
        sha256 = "1k6kzip69sjakcw1y7n0xjd0qjpbrk604fs4hng8n6az107vbdjq";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
        license = "unknown";
@@ -19192,7 +19660,7 @@ self: {
        pname = "amazonka-ec2";
        version = "0.3.6.1";
        sha256 = "19gyqga1qp50jsi6pykykkivfz18357p6pd6fg84bir0j9d4vawy";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
@@ -19204,7 +19672,7 @@ self: {
        pname = "amazonka-ecs";
        version = "0.3.6";
        sha256 = "1md59pdqir5prlfwlmlgd78g6c9gq0dszm2lxpa3kbv9zxs1kgfr";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
        license = "unknown";
@@ -19216,7 +19684,7 @@ self: {
        pname = "amazonka-elasticache";
        version = "0.3.6";
        sha256 = "0hapj08jj89gl934zgkfj2lg9bsc71y1mvdl5dmv4vk8qrwp912a";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
        license = "unknown";
@@ -19228,7 +19696,7 @@ self: {
        pname = "amazonka-elasticbeanstalk";
        version = "0.3.6";
        sha256 = "1bpixxvj4rdx3v07f2pdky0xbz0kz5p3afjazwv8w588sj2i6773";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
        license = "unknown";
@@ -19240,7 +19708,7 @@ self: {
        pname = "amazonka-elastictranscoder";
        version = "0.3.6";
        sha256 = "1rfnzwl6z0ym2ln5nbcx6an2iiqcwnb3rjki2jnxpqkv6hj8d1p8";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
        license = "unknown";
@@ -19252,7 +19720,7 @@ self: {
        pname = "amazonka-elb";
        version = "0.3.6";
        sha256 = "0yriv45wrxw9jns17idiqwxxvh086g3bg2hclzaanzxllir4jb59";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
        license = "unknown";
@@ -19264,7 +19732,7 @@ self: {
        pname = "amazonka-emr";
        version = "0.3.6";
        sha256 = "0pv0li7823alrgl9w1fjx9i02ndk4k12fbb6z5z50krypcxp8819";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
        license = "unknown";
@@ -19276,7 +19744,7 @@ self: {
        pname = "amazonka-glacier";
        version = "0.3.6";
        sha256 = "0i3j1yha1hjj7imqn6m42329p3637v09hbjampq0c500dvy1j5dl";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
        license = "unknown";
@@ -19288,7 +19756,7 @@ self: {
        pname = "amazonka-iam";
        version = "0.3.6";
        sha256 = "0nzs9xn70f2a0n3xdnprwdk0mwnr23cgq0rwwxc83gf08i19nl8j";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
        license = "unknown";
@@ -19300,7 +19768,7 @@ self: {
        pname = "amazonka-importexport";
        version = "0.3.6";
        sha256 = "1qcqzqg9sxqaf5kb3l91n7zp5brdpyv2mhy7da08wxb16f1v1r9x";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
        license = "unknown";
@@ -19312,7 +19780,7 @@ self: {
        pname = "amazonka-kinesis";
        version = "0.3.6";
        sha256 = "0r4s5qfpirapg2gsgk9gbyp3ap4pz3cpnz4wdidlc4ys9v4vfhay";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
        license = "unknown";
@@ -19324,7 +19792,7 @@ self: {
        pname = "amazonka-kms";
        version = "0.3.6";
        sha256 = "1x68jg5m79rapwvb6nb9xmf2hwdv34r63r0aar742igpjwssxzn9";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
        license = "unknown";
@@ -19336,7 +19804,7 @@ self: {
        pname = "amazonka-lambda";
        version = "0.3.6";
        sha256 = "1g6gf64k60zanmv787rsg8zxnv6vxzdwv3dibwm5b00fzw7cshlp";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
        license = "unknown";
@@ -19348,7 +19816,7 @@ self: {
        pname = "amazonka-ml";
        version = "0.3.6";
        sha256 = "0ma60mdn14xs3999yg98dzlx96arlwrc9wsvgf0gq6s6c0gnrc04";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Machine Learning SDK";
        license = "unknown";
@@ -19360,7 +19828,7 @@ self: {
        pname = "amazonka-opsworks";
        version = "0.3.6";
        sha256 = "1d9qgazp4qk6lc4isggb0rm50crp0s1qmz6m0s3wwfdwd6lvhaql";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
        license = "unknown";
@@ -19372,7 +19840,7 @@ self: {
        pname = "amazonka-rds";
        version = "0.3.6";
        sha256 = "105xj8zrjha5yvpj8m0r7asy0hys17g1gglf95kgnkwdh9zhj3yl";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
        license = "unknown";
@@ -19384,7 +19852,7 @@ self: {
        pname = "amazonka-redshift";
        version = "0.3.6";
        sha256 = "195lawjhy6hmfwk05cm9wi2x8pn6f3zr8rhcvrwa0igg8xi39fpr";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
        license = "unknown";
@@ -19396,7 +19864,7 @@ self: {
        pname = "amazonka-route53";
        version = "0.3.6.1";
        sha256 = "155d4yfc96x99mw8h89n2waj7ywx4hcw8izcx1sk1x96lcd6h9mw";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
        license = "unknown";
@@ -19408,7 +19876,7 @@ self: {
        pname = "amazonka-route53-domains";
        version = "0.3.6";
        sha256 = "13dykx5w35dj3fn7nqs3znisjzqczpsxxyyghh2kfsgfhxna0kqv";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
        license = "unknown";
@@ -19420,7 +19888,7 @@ self: {
        pname = "amazonka-s3";
        version = "0.3.6";
        sha256 = "1q45d6g4wrfjmw9d65bvrin1p9vcfv5xyz47158p9zxm2cvpvcv9";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
@@ -19432,7 +19900,7 @@ self: {
        pname = "amazonka-sdb";
        version = "0.3.6";
        sha256 = "1wswsirmjq1zvhppv4bk4h9k2b94hdl1w8q18c7mh5i4j6kx41lc";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
        license = "unknown";
@@ -19444,7 +19912,7 @@ self: {
        pname = "amazonka-ses";
        version = "0.3.6";
        sha256 = "1f7k13mpf1hs27li4fdfv4wsbckyljmhwf9i6r176h6lkkb24vxx";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
        license = "unknown";
@@ -19456,7 +19924,7 @@ self: {
        pname = "amazonka-sns";
        version = "0.3.6";
        sha256 = "00bln36dmxikxgjyib009i3y56nln4i4j58nj89sclc87mdbzbma";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
        license = "unknown";
@@ -19468,7 +19936,7 @@ self: {
        pname = "amazonka-sqs";
        version = "0.3.6";
        sha256 = "04qz8d81xz5pj3ib7cpxrig61n70val2vgjjy3xc0wjki3sk7xw8";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
        license = "unknown";
@@ -19480,7 +19948,7 @@ self: {
        pname = "amazonka-ssm";
        version = "0.3.6";
        sha256 = "1xzz82hxh0am6mgzgqx0w8lxm5q8d3zpny2qyyl7bjyjh8k7v370";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Systems Management Service SDK";
        license = "unknown";
@@ -19492,7 +19960,7 @@ self: {
        pname = "amazonka-storagegateway";
        version = "0.3.6";
        sha256 = "1cjajpwf0lfvn3r62n7y4ly16496cn7qhs17grjxv3c9i8pikq2z";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
        license = "unknown";
@@ -19504,7 +19972,7 @@ self: {
        pname = "amazonka-sts";
        version = "0.3.6";
        sha256 = "096av2p79b4vnb3zzmkbjspvxkcgzx77w96mrziggfj8mxh3x5f1";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
        license = "unknown";
@@ -19516,7 +19984,7 @@ self: {
        pname = "amazonka-support";
        version = "0.3.6";
        sha256 = "0igaq8538vrbwn7pqap5500alx3lp1c37imq75gk9nx7q846gqy6";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
        license = "unknown";
@@ -19528,7 +19996,7 @@ self: {
        pname = "amazonka-swf";
        version = "0.3.6";
        sha256 = "0mijdc797ybdz7g0nkyncahspsl0dpy3g8hkhcj2jdhhdbqn7qfc";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
@@ -19540,7 +20008,7 @@ self: {
        pname = "amazonka-workspaces";
        version = "0.3.6";
        sha256 = "1hwlm2a5fn4hrqqv79iw39xrrgfhl1d1p6236lqqfdyycnq4x5wk";
-       buildDepends = [ amazonka-core base ];
+       libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkSpaces SDK";
        license = "unknown";
@@ -19556,12 +20024,12 @@ self: {
      mkDerivation {
        pname = "ampersand";
        version = "3.0.3";
-       revision = "1";
        sha256 = "0xasmdcsrnvyfw3q5jkd1cpmi26yj8c5ifzgmjy6qp6wpsldswqc";
+       revision = "1";
        editedCabalFile = "42a4a0f82e5c10b76a8412ba625df82da44d7e28353a9efa5aad2b10e7cc9d2a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers csv directory filepath graphviz hashable
          HDBC HDBC-odbc HStringTemplate mtl old-locale old-time pandoc
          pandoc-types process simple-sql-parser split SpreadsheetML text
@@ -19586,12 +20054,13 @@ self: {
        sha256 = "1qnknyk8xizq5i94s9zv7prqqcpccigc92c6jqqh82y2yqz5xnjj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring clock connection containers
          data-binary-ieee754 monad-control network network-uri split stm
-         text vector xml
+         text vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ base containers xml ];
+       testHaskellDepends = [
          base binary bytestring clock connection containers
          data-binary-ieee754 hspec hspec-expectations network network-uri
          split stm text vector
@@ -19610,11 +20079,11 @@ self: {
        pname = "amqp-conduit";
        version = "0.2.0.0";
        sha256 = "1mlapyp22bbnkz7ny2rs2da6a6nbs41j8ljsjlxv1x9cfnjzjayb";
-       buildDepends = [
+       libraryHaskellDepends = [
          amqp base conduit exceptions lifted-base monad-control mtl
          resourcet text transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          amqp base bytestring conduit hspec HUnit resourcet transformers
        ];
        jailbreak = true;
@@ -19631,7 +20100,7 @@ self: {
        sha256 = "1y0azhsjarv26lkny1wckdz45bs87wbga29hbg6w59wc2gjkbxqz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base deepseq parsec ];
+       executableHaskellDepends = [ base deepseq parsec ];
        description = "Interpreter for AM";
        license = "GPL";
      }) {};
@@ -19644,14 +20113,13 @@ self: {
        pname = "analyze-client";
        version = "0.1.0.2";
        sha256 = "12csrds628c3ff9giyc6q74jn1s2fbkdyagzbqcvnh3brnzsjvss";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-conduit MonadCatchIO-transformers mtl snap
          snap-core time
        ];
        homepage = "https://github.com/dbp/analyze-client";
        description = "Client for analyze service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anansi" = callPackage
@@ -19664,14 +20132,17 @@ self: {
        sha256 = "1fzrry9axri0wcff0zbxq0dbq0pxyq6x6bzw426xkm3ayzfd825a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers monads-tf options parsec system-argv0
+         system-fileio system-filepath text
+       ];
+       executableHaskellDepends = [
          base bytestring containers monads-tf options parsec system-argv0
          system-fileio system-filepath text
        ];
        homepage = "https://john-millikin.com/software/anansi/";
        description = "Simple literate programming preprocessor";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anansi-hscolour" = callPackage
@@ -19682,13 +20153,12 @@ self: {
        pname = "anansi-hscolour";
        version = "0.1.2";
        sha256 = "0ffk44lacm3al96cmnacyi6pnhlzhw34jgn87fsfjcl516ffmfxw";
-       buildDepends = [
+       libraryHaskellDepends = [
          anansi base bytestring containers hscolour monads-tf text
        ];
        homepage = "https://john-millikin.com/software/anansi/";
        description = "Colorized looms for Anansi";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anansi-pandoc" = callPackage
@@ -19699,7 +20169,7 @@ self: {
        pname = "anansi-pandoc";
        version = "0.1.3";
        sha256 = "13s370b35wmwvbp6a9afsbl62hswj4mdhnvcgigwjz6bcwxxxpxi";
-       buildDepends = [
+       libraryHaskellDepends = [
          anansi base bytestring containers monads-tf pandoc text
        ];
        jailbreak = true;
@@ -19720,7 +20190,12 @@ self: {
        sha256 = "0xza3xfzzbix9xf0vwwk4qz02h4iil3hglqspgdymhjbxfl68714";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         atomo base blaze-html bytestring containers directory filepath
+         hashable haskeline highlighter mtl parsec pretty pretty-show
+         tagsoup text time vector
+       ];
+       executableHaskellDepends = [
          atomo base blaze-html bytestring containers directory filepath
          hashable haskeline highlighter mtl parsec pretty pretty-show
          tagsoup text time vector
@@ -19742,11 +20217,15 @@ self: {
        sha256 = "1sk2mfxfbj6bbsff89jch1x7rhag2yv5331qhal50qf1q7fvzgx1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base basic-prelude data-default directory filemanip hxt lens mtl
          optparse-applicative rainbow stringable terminal-size text
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base basic-prelude data-default directory filemanip mtl
+         optparse-applicative rainbow stringable terminal-size text
+       ];
+       testHaskellDepends = [
          base basic-prelude directory hspec hxt QuickCheck stringable
        ];
        homepage = "https://github.com/passy/android-lint-summary";
@@ -19767,11 +20246,11 @@ self: {
        sha256 = "0n73w8lczsncagf2041lq1963mnsmw9albwy0n5qbhqx9030pzya";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base configurator containers mtl old-locale optparse-applicative
          process stm text time transformers unix unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base configurator containers mtl old-locale process stm tasty
          tasty-hunit tasty-quickcheck text time transformers unix
          unordered-containers
@@ -19788,7 +20267,7 @@ self: {
        pname = "animalcase";
        version = "0.1.0.2";
        sha256 = "0csbs9yrl8vhlgs7zax06shqlhcjs38q91wnkz5d3f6a4588lyqi";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/ibotty/animalcase";
        description = "Convert camelCase to snake_case and vice versa";
        license = stdenv.lib.licenses.mit;
@@ -19800,7 +20279,7 @@ self: {
        pname = "annotated-wl-pprint";
        version = "0.6.0";
        sha256 = "1rwjfw4fspyi564a847sb6k679sa6psajm2jybzpa1pvjq9z2a9x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer, with annotation support";
        license = stdenv.lib.licenses.bsd3;
@@ -19814,7 +20293,8 @@ self: {
        sha256 = "0jb7s6m7dblnydrzh5nsczr0kpqwy9gr346pcrxsaywz2gfjcrhi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.github.com/massysett/anonymous-sums";
        description = "Anonymous sum types";
        license = stdenv.lib.licenses.bsd3;
@@ -19826,7 +20306,7 @@ self: {
        pname = "anonymous-sums-tests";
        version = "0.4.0.0";
        sha256 = "0a7f7d3xzn8nl9gyzr4wl7m83aszmw42nd0dj8b875khh7i01h0b";
-       buildDepends = [ anonymous-sums base QuickCheck ];
+       libraryHaskellDepends = [ anonymous-sums base QuickCheck ];
        homepage = "http://www.github.com/massysett/anonymous-sums";
        description = "QuickCheck functions to accompany the anonymous-sums package";
        license = stdenv.lib.licenses.bsd3;
@@ -19840,7 +20320,8 @@ self: {
        sha256 = "1xmp8wpcyvqys777qpyfx99bhlnvmr7jil7r78j5n6fx3mkkhnln";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
+       executableHaskellDepends = [ base unix ];
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
@@ -19854,7 +20335,8 @@ self: {
        sha256 = "0x0pv7hq4q2n103pzzxghmgzmd3b5cwpnmkdbpzry222890w8ph1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ ansi-terminal base ];
+       libraryHaskellDepends = [ ansi-terminal base ];
+       executableHaskellDepends = [ ansi-terminal base ];
        homepage = "http://github.com/batterseapower/ansi-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
        license = stdenv.lib.licenses.bsd3;
@@ -19871,7 +20353,11 @@ self: {
        sha256 = "1dkrjn07445kmdq09fwdlnk676dvjzrzkgcfwni661lr5kbrj7p9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         antisplice base chatty chatty-utils mtl shakespeare text time
+         time-locale-compat yesod yesod-auth
+       ];
+       executableHaskellDepends = [
          antisplice base chatty chatty-utils ironforge mtl shakespeare text
          time time-locale-compat yesod yesod-auth
        ];
@@ -19890,10 +20376,11 @@ self: {
        sha256 = "1s2lfd7va0nq5z0q4f37ig2spjpxigfhkhi067fz4y0n1zjc1isd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers minimorph mtl parsec text transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base containers minimorph mtl text ];
+       testHaskellDepends = [
          base HUnit minimorph test-framework test-framework-hunit text
          transformers
        ];
@@ -19914,7 +20401,11 @@ self: {
        sha256 = "0sxxa2kylgagbnlf7msrgfq98jaf26lvlas6afypnr15aavvlfzh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         antisplice base chatty chatty-text chatty-utils ctpl ironforge mtl
+         network plugins time transformers
+       ];
+       executableHaskellDepends = [
          antisplice base chatty chatty-text chatty-utils ctpl directory
          ironforge mtl network plugins time transformers
        ];
@@ -19933,7 +20424,7 @@ self: {
        pname = "antigate";
        version = "2.0.1";
        sha256 = "0vd2f4kq2zkngyqpnw3lcvjkn8335gs9rdfr7kb8442p8dhps139";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default deepseq exceptions failure http-client
          http-conduit resourcet safe text transformers
        ];
@@ -19951,7 +20442,8 @@ self: {
        sha256 = "0aay5fhw2r502hvdlh6svj6k88zh5wjinn8mk2a3md7zdaiji9iq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers QuickCheck ];
+       libraryHaskellDepends = [ base containers QuickCheck ];
+       executableHaskellDepends = [ base containers QuickCheck ];
        description = "Define the language containment (=subtyping) relation on regulare expressions";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19963,7 +20455,7 @@ self: {
        pname = "antiquoter";
        version = "0.1.1.0";
        sha256 = "1qv5iid7az7bn1jf6r7ffg5qqbcs8ypf78j4vrs5ajwp39jnbiiy";
-       buildDepends = [ base syb template-haskell ];
+       libraryHaskellDepends = [ base syb template-haskell ];
        description = "Combinator library for quasi- and anti-quoting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -19976,7 +20468,7 @@ self: {
        pname = "antisplice";
        version = "0.17.1.0";
        sha256 = "1f4872gmw1h2xl5jy9ajck5n4qmxdwk0f3v3bk1fxc9x8y5mscny";
-       buildDepends = [
+       libraryHaskellDepends = [
          base chatty chatty-utils haskeline mtl template-haskell text time
          transformers
        ];
@@ -19995,11 +20487,12 @@ self: {
        sha256 = "1hjk2cvn6j1ijvg3gnml46ysri672jnxmfyh09y1aqsrbimkw8gd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base haskell98 ];
+       librarySystemDepends = [ antlr3c ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
          base bytestring enumerator haskell98 regex-posix
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ antlr3c ];
        homepage = "https://github.com/markwright/antlrc";
        description = "Haskell binding to the ANTLR parser generator C runtime library";
        license = stdenv.lib.licenses.bsd3;
@@ -20014,7 +20507,8 @@ self: {
        sha256 = "1rxk36r6i065m0qiq4g5xlrk2yjsds7j896cbddbsyddbzy10d6k";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers MissingH mtl ];
+       libraryHaskellDepends = [ base containers MissingH mtl ];
+       executableHaskellDepends = [ base containers MissingH mtl ];
        homepage = "http://software.complete.org/anydbm";
        description = "Interface for DBM-like database systems";
        license = "GPL";
@@ -20030,13 +20524,13 @@ self: {
        pname = "aosd";
        version = "0.2.1";
        sha256 = "0zma3ypjnqn8c9pk4zfyzzwn27l3wb6l6xnjjydn90fxsmpa1vh6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL cairo colour monad-control pango transformers X11
        ];
-       testDepends = [
+       libraryPkgconfigDepends = [ libaosd ];
+       testHaskellDepends = [
          base colour language-haskell-extract pango template-haskell
        ];
-       pkgconfigDepends = [ libaosd ];
        description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20048,7 +20542,7 @@ self: {
        pname = "ap-reflect";
        version = "0.2";
        sha256 = "1ih0in9j26v96pjqr1wbjxl881xb2xsrcvhmn50wbv4iwxv7y222";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/cmc-msu-ai/ap-reflect";
        description = "Partial evaluation reflection a la simple-reflect";
        license = stdenv.lib.licenses.bsd3;
@@ -20063,12 +20557,13 @@ self: {
        pname = "apache-md5";
        version = "0.6.1.4";
        sha256 = "1dwnn200sjp2pvriii3y4srrms0gyicd6qp6kvc74yyad8pqhky8";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [
          base bytestring HUnit MonadRandom process random test-framework
          test-framework-hunit transformers
        ];
-       extraLibraries = [ openssl ];
+       testSystemDepends = [ openssl ];
        homepage = "https://github.com/trskop/apache-md5";
        description = "Apache specific MD5 digest algorighm";
        license = stdenv.lib.licenses.bsd3;
@@ -20085,7 +20580,7 @@ self: {
        sha256 = "08a747p0dyjvgn5pjfvrb1hnh7vk2km8hbbyvjmnsxl89r5m992l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers deepseq directory filepath glib
          gtk HTTP mtl network process transformers tremulous-query
          xdg-basedir
@@ -20105,11 +20600,11 @@ self: {
        pname = "api-builder";
        version = "0.10.0.0";
        sha256 = "0pzbp0grmnrc48h1cbsxsxzyjgnxzmf4d6cfi53ccq0v3yfybw9v";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors bytestring HTTP http-client http-client-tls
          http-types text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring Cabal containers hspec http-conduit text
          transformers
        ];
@@ -20124,8 +20619,10 @@ self: {
        pname = "api-opentheory-unicode";
        version = "1.2";
        sha256 = "1mzbkrbdwcxr83bprk3gjrrg6sarl0vwv729xs8x5d1rfdiqlm88";
-       buildDepends = [ base bytestring opentheory-unicode ];
-       testDepends = [ base bytestring directory opentheory-unicode ];
+       libraryHaskellDepends = [ base bytestring opentheory-unicode ];
+       testHaskellDepends = [
+         base bytestring directory opentheory-unicode
+       ];
        description = "OpenTheory unicode character API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -20144,20 +20641,26 @@ self: {
        sha256 = "0pd2kaii40isbnc1rgh0zkm2abrljipmq27nlgz3zbldbm1l5xw6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty array attoparsec base base64-bytestring
          bytestring Cabal case-insensitive containers deepseq lens
          old-locale QuickCheck regex-compat-tdfa safe safecopy
          template-haskell text time unordered-containers vector
        ];
-       testDepends = [
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         aeson aeson-pretty array attoparsec base base64-bytestring
+         bytestring case-insensitive containers lens old-locale QuickCheck
+         regex-compat-tdfa safe safecopy template-haskell text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
          aeson aeson-pretty array attoparsec base base64-bytestring
          bytestring Cabal case-insensitive containers lens old-locale
          QuickCheck regex-compat-tdfa safe safecopy tasty tasty-hunit
          tasty-quickcheck template-haskell text time unordered-containers
          vector
        ];
-       buildTools = [ alex happy ];
        jailbreak = true;
        homepage = "http://github.com/iconnect/api-tools";
        description = "DSL for generating API boilerplate and docs";
@@ -20177,10 +20680,10 @@ self: {
      mkDerivation {
        pname = "apiary";
        version = "1.4.3";
-       revision = "1";
        sha256 = "1z6fgdkn3k4sbwk5jyz6yp9qwllhv2m9vq7z25fhmj41y3spgcsc";
+       revision = "1";
        editedCabalFile = "024867d05ec04c0b83c41e948b80c56686cc170beed600daffa8d8c725e50a32";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
          bytestring-read case-insensitive data-default-class exceptions
          hashable http-date http-types mime-types monad-control mtl process
@@ -20188,7 +20691,7 @@ self: {
          transformers-base types-compat unix-compat unordered-containers
          vault wai web-routing
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring http-types HUnit mtl tasty tasty-hunit
          tasty-quickcheck wai wai-extra
        ];
@@ -20206,10 +20709,10 @@ self: {
      mkDerivation {
        pname = "apiary-authenticate";
        version = "1.4.0";
-       revision = "1";
        sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0";
+       revision = "1";
        editedCabalFile = "724a8cbf0f2e57cd497b54de4401acda2877437053f13164dd23ba7b6c7d119b";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary apiary-session authenticate base blaze-builder bytestring
          cereal data-default-class http-client http-client-tls http-types
          monad-control resourcet text types-compat wai web-routing
@@ -20227,10 +20730,10 @@ self: {
      mkDerivation {
        pname = "apiary-clientsession";
        version = "1.4.0";
-       revision = "1";
        sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6";
+       revision = "1";
        editedCabalFile = "ac724d51a8bd867838bccb788a0db76f97cfe19b052d1247e38ba001561e4bfd";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary apiary-cookie apiary-session base bytestring cereal
          clientsession data-default-class time unix-compat vault
        ];
@@ -20246,10 +20749,10 @@ self: {
      mkDerivation {
        pname = "apiary-cookie";
        version = "1.4.0";
-       revision = "2";
        sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx";
+       revision = "2";
        editedCabalFile = "4edecbd2a1e6fb740815be85cc9c4836144338af88e6774348a1703e861a9771";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base blaze-builder blaze-html bytestring cookie time
          types-compat wai web-routing
        ];
@@ -20263,10 +20766,10 @@ self: {
      mkDerivation {
        pname = "apiary-eventsource";
        version = "1.4.0";
-       revision = "1";
        sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7";
+       revision = "1";
        editedCabalFile = "368e1b555b07ff026b4753cab0364d0f70a4e2536166f756bde35f8ce9fb9ae6";
-       buildDepends = [ apiary base blaze-builder wai-extra ];
+       libraryHaskellDepends = [ apiary base blaze-builder wai-extra ];
        homepage = "https://github.com/philopon/apiary";
        description = "eventsource support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -20280,10 +20783,10 @@ self: {
      mkDerivation {
        pname = "apiary-helics";
        version = "1.4.0";
-       revision = "1";
        sha256 = "1qm9fnhzafdja6fr20c7qhl6dmagmnzn23ni49ln5k55kbawfk8a";
+       revision = "1";
        editedCabalFile = "80ce4b1a9dd5c7a30099392219d0077b9281b9ceeabbb01843f12754df0b0827";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base bytestring data-default-class helics helics-wai
          monad-control text transformers types-compat vault wai
        ];
@@ -20301,10 +20804,10 @@ self: {
      mkDerivation {
        pname = "apiary-logger";
        version = "1.4.0";
-       revision = "3";
        sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48";
+       revision = "3";
        editedCabalFile = "03f6b1ac0e588631c2deed8459e527f935a74a86c15455c3f509270ba5bbd5f7";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base data-default-class fast-logger lifted-base
          monad-control monad-logger transformers transformers-base
          types-compat
@@ -20321,10 +20824,10 @@ self: {
      mkDerivation {
        pname = "apiary-memcached";
        version = "1.4.0";
-       revision = "1";
        sha256 = "1rwkj7byc84yism5sxphs1s231910ay8w7lap2cdg0y9k9f24gby";
+       revision = "1";
        editedCabalFile = "7a332392add31b3f5ef9fcc2e69069de3a23bdbfdcfeececc47d2832ec767c29";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base bytestring data-default-class memcached-binary
          monad-control text transformers types-compat
        ];
@@ -20341,10 +20844,10 @@ self: {
      mkDerivation {
        pname = "apiary-mongoDB";
        version = "1.4.0";
-       revision = "1";
        sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd";
+       revision = "1";
        editedCabalFile = "e2578f19108129ed47946fa7369c86203610d5b447a6a7a8f1af5f2537d55a4b";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base bson data-default-class lifted-base monad-control
          mongoDB resource-pool text time transformers types-compat
        ];
@@ -20361,10 +20864,10 @@ self: {
      mkDerivation {
        pname = "apiary-persistent";
        version = "1.4.0";
-       revision = "2";
        sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9";
+       revision = "2";
        editedCabalFile = "7f1c18de1d41b15397df81d9a3377e109cc07f6efc07390584e0e2952d34e889";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary apiary-logger base monad-control monad-logger persistent
          resource-pool resourcet transformers transformers-base types-compat
          web-routing
@@ -20382,10 +20885,10 @@ self: {
      mkDerivation {
        pname = "apiary-purescript";
        version = "1.4.0";
-       revision = "1";
        sha256 = "0z1d2wqpa86bv6xkpiw696sn77fdq52vk2s8951v8qdffbxia3jz";
+       revision = "1";
        editedCabalFile = "9f716a5d9173c31c6472a4bf7decc34523bdc761540d440f5d0ad4f9521bf98c";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base bytestring data-default-class filepath Glob parsec
          purescript text transformers types-compat unordered-containers
        ];
@@ -20401,10 +20904,12 @@ self: {
      mkDerivation {
        pname = "apiary-session";
        version = "1.4.0";
-       revision = "1";
        sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23";
+       revision = "1";
        editedCabalFile = "8e4a0b590972ea4e1ab1252696b7339038c4d7206ae44d1f1397a67cdde077dd";
-       buildDepends = [ apiary base types-compat wai web-routing ];
+       libraryHaskellDepends = [
+         apiary base types-compat wai web-routing
+       ];
        homepage = "https://github.com/philopon/apiary";
        description = "session support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -20417,10 +20922,10 @@ self: {
      mkDerivation {
        pname = "apiary-websockets";
        version = "1.4.0";
-       revision = "1";
        sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1";
+       revision = "1";
        editedCabalFile = "5162825445fc14b48d11a0a1f63d67e8d66a8c5aaeaf1e117a1f2302474d7581";
-       buildDepends = [
+       libraryHaskellDepends = [
          apiary base wai-websockets web-routing websockets
        ];
        homepage = "https://github.com/philopon/apiary";
@@ -20438,7 +20943,7 @@ self: {
        pname = "apis";
        version = "0.0.1";
        sha256 = "07jvx1bsfiqk9l4l9k9yrsmvqm7dc2lb6p7h8p2bzqc3dqcqp67q";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers deepseq directory ecma262 exceptions
          filemanip filepath hslogger hxt mtl opendatatable split
          template-haskell text th-lift time transformers
@@ -20464,7 +20969,13 @@ self: {
        sha256 = "1rih1lasky5sjdf3lz2qi2qya3iwbbxs658p77h1amqpsa7lsfp7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring containers crypto-api
+         cryptohash directory http-types old-time openpgp openpgp-asciiarmor
+         openpgp-crypto-api scotty strict tar text transformers wai-extra
+         wai-middleware-static zlib
+       ];
+       executableHaskellDepends = [
          aeson attoparsec base binary bytestring containers crypto-api
          cryptohash directory http-types old-time openpgp openpgp-asciiarmor
          openpgp-crypto-api scotty strict tar text transformers wai-extra
@@ -20482,10 +20993,10 @@ self: {
      mkDerivation {
        pname = "app-lens";
        version = "0.1.0.0";
-       revision = "2";
        sha256 = "0gizjnc7x1ggryfrm4d87xiyjz9yw6c5y3zp23x40bgmw49zl318";
+       revision = "2";
        editedCabalFile = "29d9e8cabf54f27b1ccf007530fe698c0895c0bb6a2a6da50b71fafd4c27bd6d";
-       buildDepends = [ base containers lens mtl ];
+       libraryHaskellDepends = [ base containers lens mtl ];
        jailbreak = true;
        homepage = "https://bitbucket.org/kztk/app-lens";
        description = "applicative (functional) bidirectional programming beyond composition chains";
@@ -20501,8 +21012,10 @@ self: {
        pname = "app-settings";
        version = "0.2.0.5";
        sha256 = "17918i7k1wagmqxvkhww69w8ffybshfm6y1dd9iyg9x45qdrvr6k";
-       buildDepends = [ base containers directory mtl parsec text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers directory mtl parsec text
+       ];
+       testHaskellDepends = [
          base containers directory hspec HUnit mtl parsec text
        ];
        jailbreak = true;
@@ -20517,7 +21030,7 @@ self: {
        pname = "appar";
        version = "0.1.4";
        sha256 = "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "A simple applicative parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20533,15 +21046,19 @@ self: {
        sha256 = "0qns7kjp9sjrpdx6vfkci9q6xinb0gwkb1a9ssw8xfbqqhf9ljms";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring containers semver text uuid
+       ];
+       executableHaskellDepends = [
          aeson base bytestring containers optparse-applicative semver text
          uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base hspec hspec-smallcheck semver smallcheck text uuid
        ];
        description = "app container types and tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "applicative-extras" = callPackage
@@ -20550,7 +21067,7 @@ self: {
        pname = "applicative-extras";
        version = "0.1.8";
        sha256 = "1svsf8mvb816nksg1dh4dz3cms2zx2hjprz2z7h3zidpxmzs0pr8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/chriseidhof/applicative-extras/";
        description = "Instances for Applicative";
        license = stdenv.lib.licenses.bsd3;
@@ -20564,10 +21081,10 @@ self: {
        pname = "applicative-fail";
        version = "1.1.1";
        sha256 = "11bk0svzdys8rgx6nzb80fkxz8mp6r0238ylmb5wzsnl8nc9y041";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors dlist mtl transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base checkers mtl QuickCheck tasty tasty-quickcheck
        ];
        homepage = "https://bitbucket.org/s9gf4ult/applicative-fail";
@@ -20581,7 +21098,7 @@ self: {
        pname = "applicative-numbers";
        version = "0.1.3";
        sha256 = "0rnjl7yz6nga4qi0jdvhf911yf1qk6gy2fm5236bsgc50d5wbaw0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/applicative-numbers";
        description = "Applicative-based numeric instances";
        license = stdenv.lib.licenses.bsd3;
@@ -20595,8 +21112,8 @@ self: {
        pname = "applicative-parsec";
        version = "0.1.0.0";
        sha256 = "12y2j9lpaqpjcr2a9fk4anlvc1cw5rimyx031b6xa5dx500phrrx";
-       buildDepends = [ base containers lens mtl text ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers lens mtl text ];
+       testHaskellDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -20611,7 +21128,7 @@ self: {
        pname = "applicative-quoters";
        version = "0.1.0.8";
        sha256 = "10m29d0938khjdazsmsvvncr5xndnpzpm1b7ymzb3b4b81xmcpgl";
-       buildDepends = [ base haskell-src-meta template-haskell ];
+       libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
        description = "Quasiquoters for idiom brackets and an applicative do-notation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20629,13 +21146,16 @@ self: {
        sha256 = "17aww5sffw07wk8hlyf0qv26v0jkr5qzv45wxk4zhhyb453b9m41";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base mersenne-random-pure64 monad-mersenne-random mtl statistics
+         transformers vector
+       ];
+       executableHaskellDepends = [
          base Chart Chart-diagrams colour conduit containers data-default
          data-default-class filepath lens mersenne-random-pure64
-         monad-mersenne-random mtl statistics text transformers vector
-         vector-algorithms
+         monad-mersenne-random mtl statistics text vector vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit ieee754 mersenne-random-pure64 monad-mersenne-random mtl
          test-framework test-framework-hunit vector
        ];
@@ -20656,12 +21176,12 @@ self: {
        pname = "approximate";
        version = "0.2.2.1";
        sha256 = "1h09257l7rfy64fiwr4d1jyq6vcfhly3hrn314rkfp6rkzxpvh79";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq ghc-prim hashable
          hashable-extras lens log-domain pointed safecopy semigroupoids
          semigroups vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath semigroups simple-reflect
        ];
        homepage = "http://github.com/analytics/approximate/";
@@ -20675,7 +21195,7 @@ self: {
        pname = "approximate-equality";
        version = "1.1.0.2";
        sha256 = "0pxvyb5a6vh0isba81flv7wjlwfn091xrma7g6wzr08bvqmix883";
-       buildDepends = [ base type-level-natural-number ];
+       libraryHaskellDepends = [ base type-level-natural-number ];
        homepage = "http://github.com/gcross/approximate-equality";
        description = "Newtype wrappers for approximate equality";
        license = stdenv.lib.licenses.bsd3;
@@ -20689,7 +21209,8 @@ self: {
        sha256 = "1gk1z0dw7i0c3wql1zh8iri6573falmiz31s0widfz7dav45vkrz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/nh2/ar-timestamp-wiper";
        description = "Wipes time stamps from .a files (like ar -D)";
        license = stdenv.lib.licenses.mit;
@@ -20706,11 +21227,12 @@ self: {
        sha256 = "1yxhafzv71xx2gva4b9slr26iqs6p1lh578x1774bv07ifqys6dp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers criterion directory filepath primitive transformers
          vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ base containers criterion vector ];
+       testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck vector
        ];
        jailbreak = true;
@@ -20728,10 +21250,10 @@ self: {
        pname = "arbb-vm";
        version = "0.1.1.20";
        sha256 = "0k31ardnlg925vcrrl4n9w09867dbr68sdnc3bhs9xz1r9cdlkv8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers directory mtl pretty
        ];
-       extraLibraries = [ arbb_dev ];
+       librarySystemDepends = [ arbb_dev ];
        homepage = "https://github.com/svenssonjoel/arbb-vm/wiki";
        description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine";
        license = stdenv.lib.licenses.bsd3;
@@ -20751,17 +21273,17 @@ self: {
        sha256 = "02qz7qsk1kjavsdl8mq56blxzzjnnjlnyjvjnyfamq7j0rqzdq5v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson array base binary bytestring bytestring-progress containers
          deepseq directory filepath parsec pcre-light strict
          terminal-progress-bar time transformers unix utf8-string X11
        ];
-       testDepends = [
+       executableSystemDepends = [ libXScrnSaver ];
+       testHaskellDepends = [
          base binary bytestring containers deepseq directory parsec
          pcre-light process-extras tasty tasty-golden tasty-hunit time
          transformers unix utf8-string
        ];
-       extraLibraries = [ libXScrnSaver ];
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
@@ -20779,7 +21301,7 @@ self: {
        sha256 = "0rdgrdmmsn4qijbbprw4dbppb5klgn9lw3fyizzcd79gsgz4s61r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring debian debian-mirror directory Extra filepath help
          HUnit mtl network old-locale pretty process progress regex-compat
          regex-posix time unix Unixutils xhtml
@@ -20800,8 +21322,9 @@ self: {
        sha256 = "19gvja890lhn9zr2aqjshwq5qqb95nynxrsw5wk4z2a417xj70j2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers curl HTTP network process random
+       libraryHaskellDepends = [ base curl HTTP network ];
+       executableHaskellDepends = [
+         base bytestring containers process random
        ];
        description = "Archive supplied URLs in WebCite & Internet Archive";
        license = stdenv.lib.licenses.bsd3;
@@ -20816,7 +21339,9 @@ self: {
        pname = "archlinux";
        version = "1.3";
        sha256 = "051pgn39f8xq80qf8g04j162n6zysvcdbj8a8m05x6vi6mbr9jx2";
-       buildDepends = [ base Cabal containers directory filepath pretty ];
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath pretty
+       ];
        homepage = "http://github.com/archhaskell/";
        description = "Support for working with Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
@@ -20834,7 +21359,12 @@ self: {
        sha256 = "1rzjkxxmf24hrmlc70s416akn6rbcly7152ly618dxgigvqnir48";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         archlinux base Cabal containers csv deepseq directory filepath HTTP
+         json old-time parallel pretty prettyclass process
+         strict-concurrency xhtml
+       ];
+       executableHaskellDepends = [
          archlinux base Cabal containers csv deepseq directory filepath HTTP
          json old-time parallel pretty prettyclass process
          strict-concurrency xhtml
@@ -20853,7 +21383,9 @@ self: {
        sha256 = "1v7b6w2cqfy69kvsr09a1qv4zyz78khygmd9l9hqjlmj7w3x8gys";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers download-curl feed tagsoup ];
+       executableHaskellDepends = [
+         base containers download-curl feed tagsoup
+       ];
        homepage = "http://archhaskell.wordpress.com/";
        description = "Convert Arch Linux package updates in RSS to pretty markdown";
        license = stdenv.lib.licenses.bsd3;
@@ -20867,7 +21399,7 @@ self: {
        pname = "arff";
        version = "0.1.0";
        sha256 = "1mwak4kl4ksg5vqya9abz02v0zgj6lbi6bzq2bd8jpnncazsxha5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring bytestring-lexing bytestring-show old-locale
          time
        ];
@@ -20884,8 +21416,8 @@ self: {
        pname = "argparser";
        version = "0.3.4";
        sha256 = "0ypdj4mcm4yk5pswzwi9jk2w25f6qhiari8gam72za6ihyjwfig6";
-       buildDepends = [ base containers ];
-       testDepends = [ base containers HTF HUnit ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers HTF HUnit ];
        description = "Command line parsing framework for console applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20901,7 +21433,7 @@ self: {
        sha256 = "17s6m9mjai439j8g0cd5pr2zb0224h1ckik9fg0rbd06zgxvfmq6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bimap containers glib gtk HDBC indents mtl parsec
        ];
        jailbreak = true;
@@ -20923,13 +21455,13 @@ self: {
        sha256 = "02hyn3y4h7w4l5k48kp73al67lp8vzlymblb7al72w14r01ww8p3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          async base bert Cabal containers data-lens data-lens-fd
          data-lens-template directory filepath haskell-names
          haskell-packages haskell-src-exts hse-cpp hslogger mtl stm tagged
          transformers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bert containers directory filepath haskell-src-exts tasty
          tasty-hunit utf8-string
        ];
@@ -20950,17 +21482,18 @@ self: {
        sha256 = "107rbbzmqg0zrgv3qb0pr8svmzh25a63dm0kn0hhyirkjzdyjgqw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filemanip fsnotify process regex-posix
          safe split system-filepath text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory filemanip fsnotify hspec process
          regex-posix safe split system-filepath text time
        ];
        homepage = "http://github.com/karun012/arion";
        description = "Watcher and runner for Hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arith-encode" = callPackage
@@ -20971,11 +21504,11 @@ self: {
        pname = "arith-encode";
        version = "1.0.0";
        sha256 = "1wqm2jcc2dac31gvad6pmnq0wbajpj488h93xl93vfipsbak0cm8";
-       buildDepends = [
+       libraryHaskellDepends = [
          arithmoi array base binary Cabal containers fgl hashable
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          arithmoi array base binary Cabal containers fgl hashable HUnit-Plus
          unordered-containers
        ];
@@ -20990,7 +21523,7 @@ self: {
        pname = "arithmatic";
        version = "0.1.0.1";
        sha256 = "1qa1yqi67l1cd3ggb67h9iji9ps3ma43fcddv0vmc1hin61xnzj8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Basic arithmatic in haskell";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -21003,11 +21536,11 @@ self: {
        pname = "arithmoi";
        version = "0.4.1.3";
        sha256 = "1j8k0hqg5ddglw9lpbp3qg81s1g01sil1grizlrqfgwx0wj3jqif";
-       buildDepends = [
+       configureFlags = [ "-f-llvm" ];
+       libraryHaskellDepends = [
          array base containers ghc-prim integer-gmp mtl random
        ];
-       testDepends = [ base hspec ];
-       configureFlags = [ "-f-llvm" ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/cartazio/arithmoi";
        description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
        license = stdenv.lib.licenses.mit;
@@ -21021,7 +21554,7 @@ self: {
        sha256 = "18ym9cs0mr4pr6pdgyk14rrwsxh1fa0xvqz3jg60lnxbgjlynvc1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT mtl OpenGL stm ];
+       executableHaskellDepends = [ base GLUT mtl OpenGL stm ];
        description = "Space-based real time strategy game";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21035,7 +21568,8 @@ self: {
        sha256 = "13n878vafx1igw3q3v1c676iaidyqa4wk6z727vh7dagkkyl7653";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/sfischer13/haskell-arpa";
        description = "Library for reading ARPA n-gram models";
@@ -21048,7 +21582,7 @@ self: {
        pname = "array";
        version = "0.5.1.0";
        sha256 = "18hz1jcshdj6c10lsxq86rs6rbx77g91w4ay2s58h9j5rnkchjxq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Mutable and immutable arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21065,11 +21599,12 @@ self: {
        sha256 = "03kjkpygi9jc8vrvnw9i8zwbfaihsl50bi39j0liclja442j9h5m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base mcmc-synthesis modular-arithmetic MonadRandom OddWord
          split vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ base split vector ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework-hunit
          test-framework-quickcheck2 test-framework-th
        ];
@@ -21085,7 +21620,7 @@ self: {
        pname = "array-memoize";
        version = "0.6.0";
        sha256 = "1p05vg8mdyad03aa7s1nrgw5xqgl80f6l7v0llhmi1q4xnrqrj3n";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Memoization combinators using arrays for finite sub-domains of functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21096,7 +21631,7 @@ self: {
        pname = "array-primops";
        version = "0.1.0.0";
        sha256 = "11qwgs06ivfjhcjhihchg46hvpcrwmc7zz36630v9qyy2611q66x";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        description = "Extra foreign primops for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21107,7 +21642,7 @@ self: {
        pname = "array-utils";
        version = "0.3";
        sha256 = "1gh7gmbm0djr78dqkf8q3ap9yk4gm3dq48k8jad9ssp3w19wpkan";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Primitive functions for updating many elements in mutable arrays at once";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21119,7 +21654,9 @@ self: {
        pname = "arrow-improve";
        version = "0.1.0.0";
        sha256 = "0ppl8v746lj41aqb0k2724vm4n32jxmz723qa0j860jvhkh2nww7";
-       buildDepends = [ arrows base pointed profunctors semigroupoids ];
+       libraryHaskellDepends = [
+         arrows base pointed profunctors semigroupoids
+       ];
        jailbreak = true;
        homepage = "https://github.com/prophile/arrow-improve/";
        description = "Improved arrows";
@@ -21133,7 +21670,7 @@ self: {
        pname = "arrow-list";
        version = "0.7";
        sha256 = "1n6m77hdkpjd12r0b8fwxiz3jz0j86cplgsk27m2raj86vr3dy1k";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "https://github.com/silkapp/arrow-list";
        description = "List arrows for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -21145,7 +21682,7 @@ self: {
        pname = "arrowapply-utils";
        version = "0.2";
        sha256 = "02zampc6cc5a9fvdvxkz2r6i5sxf5w0qilsvsx8jxiw4kprbghii";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Utilities for working with ArrowApply instances more naturally";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21159,7 +21696,7 @@ self: {
        sha256 = "0a0ss5q8ximbd6hr0agy1106jfvdm8cx50q7a9yaiqfxs20fy6lx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers haskell-src ];
+       executableHaskellDepends = [ array base containers haskell-src ];
        homepage = "http://www.haskell.org/arrows/";
        description = "preprocessor translating arrow notation into Haskell 98";
        license = "GPL";
@@ -21172,7 +21709,7 @@ self: {
        pname = "arrows";
        version = "0.4.4.1";
        sha256 = "1qpbpwsc3frjdngwjv3r58nfa0ik88cqh24ls47svigsz3c4n42v";
-       buildDepends = [ base Stream ];
+       libraryHaskellDepends = [ base Stream ];
        homepage = "http://www.haskell.org/arrows/";
        description = "Arrow classes and transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -21184,7 +21721,9 @@ self: {
        pname = "artery";
        version = "0.1.1";
        sha256 = "1fs8jap2ndcj21qgpkzy9nbnabvp4ac0xm0vdwkjjdf7i4j5kaqr";
-       buildDepends = [ base containers profunctors transformers ];
+       libraryHaskellDepends = [
+         base containers profunctors transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/fumieval/artery";
        description = "A simple, arrow-based reactive programming";
@@ -21202,7 +21741,11 @@ self: {
        sha256 = "0w29sdzhc54jjl7d0f3irq2s0kisd66amf0li0h9x7r00j72lvwx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-nums containers
+         file-embed parsec process shell-escape template-haskell
+       ];
+       executableHaskellDepends = [
          attoparsec base blaze-builder bytestring bytestring-nums containers
          file-embed parsec process shell-escape template-haskell
        ];
@@ -21217,10 +21760,10 @@ self: {
      mkDerivation {
        pname = "arxiv";
        version = "0.0.1";
-       revision = "1";
        sha256 = "1has8v40h8w4v393pgd4qk4fzgdw02y12zk2hspkic1q5bx33dxh";
+       revision = "1";
        editedCabalFile = "746311e6003440248df63acd19e428cbdbf5c95cdd3ee0993d2c89c7b2ceada7";
-       buildDepends = [ base parsec split tagsoup ];
+       libraryHaskellDepends = [ base parsec split tagsoup ];
        homepage = "http://github.com/toschoo/Haskell-Libs";
        description = "A client for the Arxiv API";
        license = "LGPL";
@@ -21232,7 +21775,7 @@ self: {
        pname = "ascetic";
        version = "0.0.0.4";
        sha256 = "1c5ip8q9b6xnvh3li03iilmqz33rrlis78zs0lh4jva67b37akqk";
-       buildDepends = [ base MissingH ];
+       libraryHaskellDepends = [ base MissingH ];
        description = "Generic markup builder";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -21245,7 +21788,7 @@ self: {
        pname = "ascii";
        version = "0.0.4.1";
        sha256 = "1xpw2n3gskndg74ilrq8zngawlvc3mbsji3nx2aprar96hdlpvpv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive hashable text
        ];
        jailbreak = true;
@@ -21265,11 +21808,14 @@ self: {
        sha256 = "0lnxph4zdhkhp2w4rvx85xdwy8lnnm81apvkrddbwfr405j4nf1w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         ansi-terminal async base data-default time
+       ];
+       executableHaskellDepends = [
          ansi-terminal async base bytestring conduit data-default HTTP
          http-conduit http-types time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal async base data-default hspec QuickCheck time
        ];
        homepage = "https://github.com/yamadapc/haskell-ascii-progress";
@@ -21287,7 +21833,11 @@ self: {
        sha256 = "09m7wcq207glaz3s824vakj42vdaxc334y5k9lsh095v2xp7pwz4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring deepseq deepseq-generics HUnit
+         split zlib
+       ];
+       executableHaskellDepends = [
          attoparsec base binary bytestring deepseq deepseq-generics HUnit
          split zlib
        ];
@@ -21302,8 +21852,8 @@ self: {
        pname = "ascii85-conduit";
        version = "0.1.0.0";
        sha256 = "191qw61y3jrbwzv7nabvxr6dxxigyxflbw49f0q637psqzdblsl5";
-       buildDepends = [ base bytestring conduit ];
-       testDepends = [ base bytestring conduit hspec ];
+       libraryHaskellDepends = [ base bytestring conduit ];
+       testHaskellDepends = [ base bytestring conduit hspec ];
        jailbreak = true;
        description = "Conduit for encoding ByteString into Ascii85";
        license = stdenv.lib.licenses.bsd3;
@@ -21321,10 +21871,13 @@ self: {
        sha256 = "0nzg4m1nd41x6fyki5qva5jj80sl7jd1z1gd674v50zchkw71a9m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers directory filepath FontyFruity
-         JuicyPixels lens linear mtl optparse-applicative rasterific-svg
-         svg-tree text vector
+       libraryHaskellDepends = [
+         base bytestring containers FontyFruity JuicyPixels lens linear mtl
+         rasterific-svg svg-tree text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring directory filepath FontyFruity JuicyPixels
+         optparse-applicative rasterific-svg svg-tree text
        ];
        description = "Pretty rendering of Ascii diagram into svg or png";
        license = stdenv.lib.licenses.bsd3;
@@ -21338,7 +21891,7 @@ self: {
        sha256 = "0w7pkfd0i46a6x2ivk659rx56v9nkjvlvnmiafy96y1cbfzkyffg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ asil base bytestring utf8-string ];
+       executableHaskellDepends = [ asil base bytestring utf8-string ];
        homepage = "http://www.pros.upv.es/fittest/";
        description = "Action Script Instrumentation Compiler";
        license = "LGPL";
@@ -21354,7 +21907,7 @@ self: {
        pname = "asil";
        version = "1.2";
        sha256 = "1zprddksk91wfyl1597cdgdy2r46d7vxjfxxi80rhxbfkshs4qwx";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers data-binary-ieee754
          directory filepath haskell-src-exts mtl pretty utf8-string uuagc
          zip-archive zlib
@@ -21370,12 +21923,12 @@ self: {
      mkDerivation {
        pname = "asn1-data";
        version = "0.7.1";
-       revision = "1";
        sha256 = "10s7mxygw6w8a8mx090msvbl8pji8m68lsxxyr5bp7p887naia7r";
+       revision = "1";
        editedCabalFile = "6c8f01076a88b9ea0f2ce9b5fa2b09dc658332bd4dedfbc8d6e7fae25ea5ed1f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cereal mtl text ];
+       libraryHaskellDepends = [ base bytestring cereal mtl text ];
        jailbreak = true;
        homepage = "http://github.com/vincenthz/hs-asn1-data";
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
@@ -21391,8 +21944,10 @@ self: {
        pname = "asn1-encoding";
        version = "0.9.0";
        sha256 = "02x3lzyl4gavl3lc2lrg8rknyvs6r2hf8kmm7xrmma5m857iks8p";
-       buildDepends = [ asn1-types base bytestring hourglass mtl ];
-       testDepends = [
+       libraryHaskellDepends = [
+         asn1-types base bytestring hourglass mtl
+       ];
+       testHaskellDepends = [
          asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
          text
        ];
@@ -21408,7 +21963,9 @@ self: {
        pname = "asn1-parse";
        version = "0.9.1";
        sha256 = "1pik647wjj1mpk2vj74kjdiblqmkk5s8yxf987maa9bjm2x8g071";
-       buildDepends = [ asn1-encoding asn1-types base bytestring mtl ];
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base bytestring mtl
+       ];
        homepage = "https://github.com/vincenthz/hs-asn1";
        description = "Simple monadic parser for ASN1 stream types";
        license = stdenv.lib.licenses.bsd3;
@@ -21420,7 +21977,7 @@ self: {
        pname = "asn1-types";
        version = "0.3.0";
        sha256 = "1am8nmfarv7ymy3rqm0js2i82v6n6qwz0lnzb1qdmy4ligcdm65r";
-       buildDepends = [ base bytestring hourglass ];
+       libraryHaskellDepends = [ base bytestring hourglass ];
        homepage = "http://github.com/vincenthz/hs-asn1-types";
        description = "ASN.1 types";
        license = stdenv.lib.licenses.bsd3;
@@ -21435,7 +21992,9 @@ self: {
        sha256 = "05kdx00bkpp3f4x1i9j8kfbdnhsivx1njcfpcxxgw93jm5ng3lj7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ asn1-encoding asn1-types base bytestring pem ];
+       executableHaskellDepends = [
+         asn1-encoding asn1-types base bytestring pem
+       ];
        homepage = "http://github.com/vincenthz/hs-asn1dump";
        description = "Dump ASN1 structure";
        license = stdenv.lib.licenses.bsd3;
@@ -21449,7 +22008,8 @@ self: {
        sha256 = "1crwfndk7qci5id132s9f57i3kslxcdcqpymsykm1460x5nd42qs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ghc-binary parsec ];
+       libraryHaskellDepends = [ base containers ghc-binary parsec ];
+       executableHaskellDepends = [ base containers ghc-binary parsec ];
        jailbreak = true;
        description = "Haskell Assembler";
        license = stdenv.lib.licenses.bsd3;
@@ -21464,8 +22024,8 @@ self: {
        pname = "assert";
        version = "0.0.1.2";
        sha256 = "0pycrpa9m8kif31jsbmb2cb4rbvm6qinmzhkdam1b5mbmmmg5q96";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base bytestring Cabal directory filepath system-posix-redirect
        ];
        homepage = "https://github.com/liyang/assert";
@@ -21479,7 +22039,7 @@ self: {
        pname = "assert-failure";
        version = "0.1.1.0";
        sha256 = "09djlhhyn9w822a5r41y7gk4cqk74a2fy7skzml2bah2an166gm1";
-       buildDepends = [ base pretty-show text ];
+       libraryHaskellDepends = [ base pretty-show text ];
        homepage = "https://github.com/Mikolaj/assert-failure";
        description = "Syntactic sugar improving 'assert' and 'error'";
        license = stdenv.lib.licenses.bsd3;
@@ -21493,8 +22053,8 @@ self: {
        pname = "assertions";
        version = "0.1.0.4";
        sha256 = "1b2p6b6brk0b1hq264i20bpdhdaq4xdzcqp7gzvfy1s5q3zwjzj8";
-       buildDepends = [ ansi-terminal base containers ];
-       testDepends = [ base interpolate process ];
+       libraryHaskellDepends = [ ansi-terminal base containers ];
+       testHaskellDepends = [ base interpolate process ];
        description = "A simple testing framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -21505,9 +22065,9 @@ self: {
        pname = "assimp";
        version = "0.1";
        sha256 = "0jhf76v08dh1bf65ln0az1b8bc8zi9gxb0bx273mi3jvprhns4zh";
-       buildDepends = [ base haskell98 vect ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ assimp ];
+       libraryHaskellDepends = [ base haskell98 vect ];
+       librarySystemDepends = [ assimp ];
+       libraryToolDepends = [ c2hs ];
        description = "The Assimp asset import library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21519,7 +22079,7 @@ self: {
        pname = "astar";
        version = "0.2.1";
        sha256 = "0qgymyaawk0ml929d5lgfikmqbxyz4shs66wq9ch9d6r175cs5b8";
-       buildDepends = [ base containers PSQueue ];
+       libraryHaskellDepends = [ base containers PSQueue ];
        description = "General A* search algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21534,7 +22094,7 @@ self: {
        sha256 = "1zb265z6m1py2jxhxzrq2kb3arw2riagajhh3vs0m54rkrak6szs";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory MonadRandom mtl OpenGL random SDL
          SDL-image SDL-mixer SDL-ttf unix
        ];
@@ -21555,7 +22115,7 @@ self: {
        sha256 = "0lv4wbblv4r0vwfynswsxzyrl6qp45byjdmg4cs760qq3jj749zl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          astview-utils base bytestring containers directory filepath glade
          glib Glob gtk gtksourceview2 hint mtl process syb
        ];
@@ -21570,7 +22130,7 @@ self: {
        pname = "astview-utils";
        version = "0.1";
        sha256 = "1rqqlngmcdd7i1gww95lyim971w8xv0hjg20h0j8av4y29pjxfyn";
-       buildDepends = [ base containers syb ];
+       libraryHaskellDepends = [ base containers syb ];
        description = "Interfacing between hint and astview";
        license = stdenv.lib.licenses.bsdOriginal;
      }) {};
@@ -21583,8 +22143,10 @@ self: {
        pname = "async";
        version = "2.0.2";
        sha256 = "0azx4qk65a9a2gvqsfmz3w89m6shzr2iz0i5lly2zvly4n2d6m6v";
-       buildDepends = [ base stm ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        homepage = "https://github.com/simonmar/async";
        description = "Run IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
@@ -21598,7 +22160,7 @@ self: {
        pname = "async-extras";
        version = "0.1.2.0";
        sha256 = "137vpkc4xlbmghbjmgdjxaqcji19cj1vxm64df9gxb7356d0rzyh";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base lifted-async lifted-base monad-control SafeSemaphore stm
          transformers-base
        ];
@@ -21616,7 +22178,8 @@ self: {
        sha256 = "002w3n0ykn5ga7mwz9kjvr77izqnhklq5r3aczwjikvgkik9q6ck";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ async base stm unordered-containers ];
+       libraryHaskellDepends = [ async base stm unordered-containers ];
+       executableHaskellDepends = [ async base stm unordered-containers ];
        jailbreak = true;
        homepage = "http://github.com/jfischoff/async-manager";
        description = "A thread manager for async";
@@ -21631,11 +22194,11 @@ self: {
        pname = "async-pool";
        version = "0.9.0";
        sha256 = "10952y60ivkx78skf7ds0dv8gp6bf3v47lays928vnpb8m5cr0rh";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base containers fgl monad-control stm transformers
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base containers fgl hspec monad-control stm time transformers
          transformers-base
        ];
@@ -21649,7 +22212,7 @@ self: {
        pname = "asynchronous-exceptions";
        version = "1.1.0.1";
        sha256 = "0vfx2ikw61sic35n4ayy7rng6izpafksz7lh4xgkcmbg627vkm8s";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/feuerbach/asynchronous-exceptions";
        description = "Distinguish between synchronous and asynchronous exceptions";
@@ -21662,7 +22225,7 @@ self: {
        pname = "aterm";
        version = "0.1.0.1";
        sha256 = "02aajiirz68wqyrcigfb4cym7j43cf3p0dn4awcw8simnqhfaskh";
-       buildDepends = [ array base containers ghc-prim ];
+       libraryHaskellDepends = [ array base containers ghc-prim ];
        homepage = "https://svn-agbkb.informatik.uni-bremen.de/Hets/trunk/atermlib";
        description = "serialisation for Haskell values with sharing support";
        license = stdenv.lib.licenses.gpl2;
@@ -21676,7 +22239,8 @@ self: {
        sha256 = "0yyk2mdxrla0hwh1mn50x5mgqskkaw6i086gqqmprljr2668kkj0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aterm base mtl transformers wl-pprint ];
+       libraryHaskellDepends = [ aterm base mtl transformers wl-pprint ];
+       executableHaskellDepends = [ aterm base transformers wl-pprint ];
        homepage = "https://github.com/GaloisInc/aterm-utils";
        description = "Utility functions for working with aterms as generated by Minitermite";
        license = stdenv.lib.licenses.bsd3;
@@ -21689,7 +22253,7 @@ self: {
        pname = "atl";
        version = "15409.2";
        sha256 = "1by20xr3s3f0rh1h9zfpcp1i8sn1qv6292mjvav108iws0dh4wq2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Arrow Transformer Library";
        license = "LGPL";
      }) {};
@@ -21706,7 +22270,7 @@ self: {
        pname = "atlassian-connect-core";
        version = "0.7.0.1";
        sha256 = "16pf2ir84fx6x01mpp109qh9rf96fp57230qr4k4n7qms068dgpy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson atlassian-connect-descriptor base base64-bytestring
          bytestring case-insensitive cipher-aes configurator containers
          cryptohash hostname http-client http-client-tls http-media
@@ -21729,11 +22293,11 @@ self: {
        pname = "atlassian-connect-descriptor";
        version = "0.4.0.2";
        sha256 = "1pss2rkd1s4dmnym5w2sanhqgz2pv1n9zyq4n8jy8ihc4zgrcscp";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring Cabal cases HUnit network network-uri
          scientific text time-units unordered-containers vector
        ];
@@ -21750,8 +22314,10 @@ self: {
        pname = "atmos";
        version = "0.2.0.0";
        sha256 = "0qx5a6dzaxjw1flybpmbf3hf7xycg4x69283njszwijw23ak6sv6";
-       buildDepends = [ base ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        description = "1976 US Standard Atmosphere";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -21762,7 +22328,7 @@ self: {
        pname = "atmos-dimensional";
        version = "0.1.2";
        sha256 = "19rlcp1zn3k838c5ixsn6i09nclfwvd9prbirxy5fmch0yjlp39d";
-       buildDepends = [ atmos base dimensional ];
+       libraryHaskellDepends = [ atmos base dimensional ];
        description = "dimensional wrapper on atmos package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21773,7 +22339,7 @@ self: {
        pname = "atmos-dimensional-tf";
        version = "0.1.2";
        sha256 = "05g2v7ppbcvaw0dk9f0z0gb7k33c4lk2cm2ziyqahxmwsz928khm";
-       buildDepends = [ atmos base dimensional-tf ];
+       libraryHaskellDepends = [ atmos base dimensional-tf ];
        description = "dimensional-tf wrapper on atmos package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21784,11 +22350,10 @@ self: {
        pname = "atom";
        version = "1.0.13";
        sha256 = "111lz39q12rvh2iigxakcnf2firxgbgm462id805n3z7rmg8f807";
-       buildDepends = [ base bimap containers mtl process syb ];
+       libraryHaskellDepends = [ base bimap containers mtl process syb ];
        homepage = "http://tomahawkins.org";
        description = "An EDSL for embedded hard realtime applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atom-basic" = callPackage
@@ -21799,7 +22364,7 @@ self: {
        pname = "atom-basic";
        version = "0.2.2";
        sha256 = "1n9illmrkrd1gr3imjvclzny8kjx7d0mak9yvyc129gfb9ap52cd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring network network-uri old-locale
          text time
        ];
@@ -21819,12 +22384,12 @@ self: {
        pname = "atom-conduit";
        version = "0.1.0.0";
        sha256 = "1jhd7036ga1sf1zgclc1m5gjzj5smf84rzvy5xac70wgcaa8iajk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit conduit-parse containers exceptions lens
          mono-traversable network-uri parsers text time timerep xml-conduit
          xml-conduit-parse xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit conduit-parse data-default exceptions hlint lens
          mono-traversable network-uri parsers quickcheck-instances resourcet
          tasty tasty-hunit tasty-quickcheck text time xml-conduit
@@ -21840,7 +22405,7 @@ self: {
        pname = "atom-msp430";
        version = "0.5.3";
        sha256 = "02h1g35f3bd3cjjhr28g63vk1mnghshq9586wa922rfl79jp6jcs";
-       buildDepends = [ atom base mtl ];
+       libraryHaskellDepends = [ atom base mtl ];
        homepage = "https://github.com/eightyeight/atom-msp430";
        description = "Convenience functions for using Atom with the MSP430 microcontroller family";
        license = stdenv.lib.licenses.mit;
@@ -21853,7 +22418,7 @@ self: {
        pname = "atomic-primops";
        version = "0.8";
        sha256 = "0wb45yjflpih94i95s88hfl4mcddcjsabspnm6h20wxv0n09xqf0";
-       buildDepends = [ base ghc-prim primitive ];
+       libraryHaskellDepends = [ base ghc-prim primitive ];
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "A safe approach to CAS and other atomic ops in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -21866,11 +22431,11 @@ self: {
      mkDerivation {
        pname = "atomic-primops-foreign";
        version = "0.6.2";
-       revision = "1";
        sha256 = "1pfdbrxx4s6n53lfhxghcalm8dif2r9zj45bipibvyiczz5xkkpm";
+       revision = "1";
        editedCabalFile = "fd1067adbd96e923226347dccaa9e3e221439702fe7824c86db44eb5b7f6c318";
-       buildDepends = [ base bits-atomic ];
-       testDepends = [
+       libraryHaskellDepends = [ base bits-atomic ];
+       testHaskellDepends = [
          base bits-atomic HUnit test-framework test-framework-hunit time
        ];
        jailbreak = true;
@@ -21885,8 +22450,8 @@ self: {
        pname = "atomic-primops-vector";
        version = "0.1.0.1";
        sha256 = "0m4mlixiz7cs4hqrh7i6dzbsj55p0qh3m16nc94819wbzcgi3vq7";
-       buildDepends = [ atomic-primops base primitive vector ];
-       testDepends = [ base vector ];
+       libraryHaskellDepends = [ atomic-primops base primitive vector ];
+       testHaskellDepends = [ base vector ];
        jailbreak = true;
        description = "Atomic operations on Data.Vector types";
        license = stdenv.lib.licenses.bsd3;
@@ -21900,10 +22465,10 @@ self: {
        pname = "atomic-write";
        version = "0.2.0.4";
        sha256 = "1y09vyxv1fdlkzz7r27snrjhi19msqj06cjdwy7mgbjb6v7z46w9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath temporary text unix-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath hspec temporary text unix-compat
        ];
        homepage = "https://github.com/stackbuilders/atomic-write";
@@ -21922,7 +22487,11 @@ self: {
        sha256 = "0hby64jd9zi518rnfk46ilipnp3x0ynkgqk2n0brf1873y88mwx8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring containers directory filepath hashable hint
+         mtl parsec pretty regex-pcre template-haskell text time vector
+       ];
+       executableHaskellDepends = [
          array base bytestring containers directory filepath hashable
          haskeline hint mtl parsec pretty regex-pcre template-haskell text
          time vector
@@ -21940,7 +22509,7 @@ self: {
        pname = "attempt";
        version = "0.4.0.1";
        sha256 = "1gvq04ds62kk88r2210mxd1fggp6vf5p8j5hci9vqkkss1hy9rxh";
-       buildDepends = [ base failure ];
+       libraryHaskellDepends = [ base failure ];
        homepage = "http://github.com/snoyberg/attempt/tree/master";
        description = "Concrete data type for handling extensible exceptions as failures. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -21954,14 +22523,14 @@ self: {
      mkDerivation {
        pname = "atto-lisp";
        version = "0.2.2";
-       revision = "1";
        sha256 = "13lhdalam4gn9faa58c3c7nssdwp2y0jsfl1lnnvr3dx6wzp0jhc";
+       revision = "1";
        editedCabalFile = "feb39753d89c58abac767ed3fe5644428b5d15d83c69f7b26b282f3b9969f2fa";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          deepseq text
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring HUnit test-framework
          test-framework-hunit text
        ];
@@ -21980,11 +22549,11 @@ self: {
        pname = "attoparsec";
        version = "0.13.0.1";
        sha256 = "0cprkr7bl4lrr80pz8mryb4rbfwdgpsrl7g0fbcaybhl8p5hm26f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq scientific text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring containers deepseq QuickCheck
          quickcheck-unicode scientific test-framework
          test-framework-quickcheck2 text transformers vector
@@ -22000,7 +22569,7 @@ self: {
        pname = "attoparsec-arff";
        version = "0.0";
        sha256 = "1jf9065pqmdfshkd0cqiamhivs9an4slqx82n7yj0kkhdxw5lyq4";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "An ARFF file parser using Attoparsec";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -22011,7 +22580,7 @@ self: {
        pname = "attoparsec-binary";
        version = "0.2";
        sha256 = "02vswxsgayw50xli7mbacsjmk1diifzkfgnyfn9ck5mk41dl9rh5";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Binary processing extensions to Attoparsec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22022,7 +22591,7 @@ self: {
        pname = "attoparsec-conduit";
        version = "1.1.0";
        sha256 = "18xn3nzxfghcd88cana1jw85ijv0ysw3bp36fb6r5wsf6m79z01y";
-       buildDepends = [ base conduit ];
+       libraryHaskellDepends = [ base conduit ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Consume attoparsec parsers via conduit. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -22034,7 +22603,7 @@ self: {
        pname = "attoparsec-csv";
        version = "0.1.0.1";
        sha256 = "0zh1g9687nrdxksniq348jc04hbgf5kxbzqs0kggmz7qqw03iq0v";
-       buildDepends = [ attoparsec base text ];
+       libraryHaskellDepends = [ attoparsec base text ];
        jailbreak = true;
        homepage = "https://github.com/robinbb/attoparsec-csv";
        description = "A parser for CSV files that uses Attoparsec";
@@ -22048,7 +22617,9 @@ self: {
        pname = "attoparsec-enumerator";
        version = "0.3.4";
        sha256 = "127mj0v6342mzxnc73qki3k197vhwsff8qkf92gm5idyxdisg5dy";
-       buildDepends = [ attoparsec base bytestring enumerator text ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring enumerator text
+       ];
        homepage = "https://john-millikin.com/software/attoparsec-enumerator/";
        description = "Pass input from an enumerator to an Attoparsec parser";
        license = stdenv.lib.licenses.mit;
@@ -22060,7 +22631,7 @@ self: {
        pname = "attoparsec-expr";
        version = "0.1.1.2";
        sha256 = "0z25pc3rq98ysk92jclr90n35982a566sxri51yh1s9c24vd8k4d";
-       buildDepends = [ attoparsec base ];
+       libraryHaskellDepends = [ attoparsec base ];
        description = "Port of parsec's expression parser to attoparsec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22073,7 +22644,7 @@ self: {
        pname = "attoparsec-iteratee";
        version = "0.4.0";
        sha256 = "1j57xhk34ghi1b2gnzrfbswv2nab5h0z52h3wvx9w8d97bbvqp2s";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring iteratee transformers
        ];
        jailbreak = true;
@@ -22091,8 +22662,8 @@ self: {
        pname = "attoparsec-parsec";
        version = "0.1.3";
        sha256 = "0mi3f1kwcss8m1679ymiydp1sb1xdyv1f6a0qx9d683p86qxrwzq";
-       buildDepends = [ attoparsec base parsec text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base parsec text ];
+       testHaskellDepends = [
          attoparsec base hspec markdown-unlit QuickCheck text
        ];
        description = "An Attoparsec compatibility layer for Parsec";
@@ -22105,7 +22676,7 @@ self: {
        pname = "attoparsec-text";
        version = "0.8.5.3";
        sha256 = "1qq42lp1sah80a6lnnafi6pwl61b4w4q4jk1pbb7pg5p06mmk315";
-       buildDepends = [ array attoparsec base containers text ];
+       libraryHaskellDepends = [ array attoparsec base containers text ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/felipe/attoparsec-text/home";
        description = "(deprecated)";
@@ -22119,7 +22690,7 @@ self: {
        pname = "attoparsec-text-enumerator";
        version = "0.2.0.1";
        sha256 = "0cffcwji141js09r7avb15b08xl4s8cgk5vxyrqaq7zw40hhb1gz";
-       buildDepends = [ attoparsec-text base enumerator text ];
+       libraryHaskellDepends = [ attoparsec-text base enumerator text ];
        jailbreak = true;
        description = "(deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -22132,7 +22703,7 @@ self: {
        pname = "attoparsec-trans";
        version = "0.1.1.0";
        sha256 = "0lsbl7hhirr13jmn6fc4g5443j73p4rxjgxvv967n5dsp7xrjaa7";
-       buildDepends = [ attoparsec base transformers ];
+       libraryHaskellDepends = [ attoparsec base transformers ];
        homepage = "https://github.com/srijs/haskell-attoparsec-trans";
        description = "Interleaved effects for attoparsec parsers";
        license = stdenv.lib.licenses.mit;
@@ -22144,7 +22715,7 @@ self: {
        pname = "attosplit";
        version = "0.1.0.0";
        sha256 = "01sh8k9n9040xqx1lbn74rcf59j54n5861d9db1y5cdy7qssxyg4";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/attosplit";
        description = "Split a lazy bytestring at boundaries defined by an attoparsec parser";
@@ -22159,7 +22730,9 @@ self: {
        sha256 = "1wmfnvl39amyfzkvpd3gysshyf10fjjb91zibalkqbq9pbsnfzjk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base Cabal directory epic haskell98 ];
+       executableHaskellDepends = [
+         array base Cabal directory epic haskell98
+       ];
        homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
        description = "Embedded Turtle language compiler in Haskell, with Epic output";
        license = stdenv.lib.licenses.bsd3;
@@ -22174,7 +22747,7 @@ self: {
        sha256 = "1vfp5x5b6z7lwjiv8jla5bdwbcbafdm31zs9kr555idzz1n8wmqz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base deepseq utility-ht ];
+       libraryHaskellDepends = [ base deepseq utility-ht ];
        homepage = "http://code.haskell.org/~thielema/audacity";
        description = "Interchange with the Audacity sound signal editor";
        license = stdenv.lib.licenses.bsd3;
@@ -22190,7 +22763,7 @@ self: {
        pname = "audiovisual";
        version = "0.0";
        sha256 = "0qjcsvv52l53iqyh7hkhwdsifqb943wjp1vn63qhqsrdaajazp3h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base boundingboxes colors deepseq directory filepath free freetype2
          hashable JuicyPixels JuicyPixels-util lens linear mtl objective
          random template-haskell transformers vector void WAVE
@@ -22209,9 +22782,11 @@ self: {
        sha256 = "08z6l97hi6clv3b34mz9zjc5rns02jx1zx9iqdsmjl2p7hcn7rs5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring directory HUnit unix ];
-       extraLibraries = [ augeas ];
-       pkgconfigDepends = [ augeas ];
+       libraryHaskellDepends = [ base bytestring directory unix ];
+       libraryPkgconfigDepends = [ augeas ];
+       executableHaskellDepends = [ HUnit ];
+       executableSystemDepends = [ augeas ];
+       executablePkgconfigDepends = [ augeas ];
        homepage = "http://trac.haskell.org/augeas";
        description = "A Haskell FFI wrapper for the Augeas API";
        license = "LGPL";
@@ -22228,7 +22803,7 @@ self: {
        sha256 = "1jvbf3z9z6m40hprykxcc5xwbmwm6p5hwlyab0dimd8h2ar50xfr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring classify containers directory filepath HaXml mtl
          process
        ];
@@ -22246,7 +22821,7 @@ self: {
        pname = "aur";
        version = "3.0.0";
        sha256 = "1sf76lysp8xchym78ha4glrw11hxic5g684mm8h6w0n05x1ywxcn";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base filepath lens lens-aeson mtl text vector
          wreq
        ];
@@ -22265,7 +22840,7 @@ self: {
        pname = "authenticate";
        version = "1.3.2.11";
        sha256 = "1xkzaw9a338yclbm10cfa9cnjdjpmzif2qj4hprig45z5szqi4q4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring case-insensitive
          conduit containers http-conduit http-types monad-control
          network-uri resourcet tagstream-conduit text transformers
@@ -22282,7 +22857,7 @@ self: {
        pname = "authenticate-kerberos";
        version = "1.0.0";
        sha256 = "06k8xi9n44xq63dpmcv4l0vg35y19dk5x1ibyay05w58k4kv4fdq";
-       buildDepends = [ base process text ];
+       libraryHaskellDepends = [ base process text ];
        homepage = "http://github.com/yesodweb/authenticate";
        description = "Authentication methods for Haskell web applications";
        license = stdenv.lib.licenses.bsd3;
@@ -22294,7 +22869,7 @@ self: {
        pname = "authenticate-ldap";
        version = "0.0.3";
        sha256 = "1wsx43l7jl40jpzhiv2fjc1mnpsaaryrjpqaiyqsn3ahacsy4ly5";
-       buildDepends = [ base LDAP text transformers ];
+       libraryHaskellDepends = [ base LDAP text transformers ];
        jailbreak = true;
        homepage = "http://github.com:mlitchard/authenticate-ldap";
        description = "LDAP authentication for Haskell web applications";
@@ -22310,7 +22885,7 @@ self: {
        pname = "authenticate-oauth";
        version = "1.5.1.1";
        sha256 = "02y35yd4zmpy36yba2nzbvijhfw0wvijkiqmh7h9qjpbqvmib7zb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring crypto-pubkey-types
          data-default http-client http-types random RSA SHA time
          transformers
@@ -22326,7 +22901,7 @@ self: {
        pname = "authinfo-hs";
        version = "0.1.0.0";
        sha256 = "1jv0y4y2ig8dx95xw3zbxc1h9mv3wi3r8xqx00llmf2qs6wgdlp5";
-       buildDepends = [ attoparsec base network text ];
+       libraryHaskellDepends = [ attoparsec base network text ];
        homepage = "http://github.com/robgssp/authinfo-hs";
        description = "Password querying for .authinfo";
        license = stdenv.lib.licenses.mit;
@@ -22341,7 +22916,7 @@ self: {
        pname = "authoring";
        version = "0.3.4";
        sha256 = "0jfxgrbkcqpfcvg1jk7ysd74bq7xjlvzqamnr3qg4ib9zg6yw0k4";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base citation-resolve containers data-default
          haskell-src-meta HaTeX lens mtl parsers safe template-haskell text
          transformers trifecta
@@ -22361,7 +22936,7 @@ self: {
        pname = "auto";
        version = "0.4.3.0";
        sha256 = "13ic0sh45ixxg456yg3y47f6b3avqn2l5ds0jc933ldk0z0wsdn8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-orphans bytestring cereal containers deepseq MonadRandom
          profunctors random semigroups transformers
        ];
@@ -22376,7 +22951,7 @@ self: {
        pname = "auto-update";
        version = "0.1.2.2";
        sha256 = "1ns4c5mqhnm7hsiqxf1ivjs5fflyq92b16ldzrcl0p85631h0c3v";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/yesodweb/wai";
        description = "Efficiently run periodic, on-demand actions";
        license = stdenv.lib.licenses.mit;
@@ -22392,7 +22967,7 @@ self: {
        pname = "autonix-deps";
        version = "0.3.0.0";
        sha256 = "0mp2v6wdm4nlagg3z9xmxd9dfkchazgvbgdphm1nfqzkg8w7ralv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base bytestring conduit containers errors
          filepath lens libarchive-conduit mtl optparse-applicative process
          regex-tdfa resourcet semigroups text transformers xml
@@ -22411,10 +22986,13 @@ self: {
        sha256 = "0njmgx2x6018ca1r2xvbi3pq0rigqm4fjkk33q5kzacvmv5ni461";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          autonix-deps base bytestring conduit containers filepath lens mtl
          text transformers
        ];
+       executableHaskellDepends = [
+         autonix-deps base containers lens mtl
+       ];
        description = "Generate dependencies for KDE 5 Nix expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22427,7 +23005,7 @@ self: {
        sha256 = "0yrlaq2jr89ncla3cpj6ir8bamwdchxnr39vsvkm7qpan61f2x65";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory mtl process unix ];
+       libraryHaskellDepends = [ base directory mtl process unix ];
        homepage = "http://code.haskell.org/autoproc";
        description = "EDSL for Procmail scripts";
        license = stdenv.lib.licenses.bsd3;
@@ -22440,7 +23018,7 @@ self: {
        pname = "avahi";
        version = "0.1.1";
        sha256 = "0b2bw0rp33g8s1y6hyqji3ycv26a4ixgjmkph93isnjxglfl6ah0";
-       buildDepends = [ base dbus-core text ];
+       libraryHaskellDepends = [ base dbus-core text ];
        description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22451,10 +23029,10 @@ self: {
      mkDerivation {
        pname = "average";
        version = "0.6.1";
-       revision = "1";
        sha256 = "13qkgkwdcb09s69wzhd3b6dl1nm66lv2hqb51gmr4s64ylgf0a9h";
+       revision = "1";
        editedCabalFile = "90c8c1d4ece76a1f1b43f1a6bef7ba15340a2bec8e2efbb465884d6b50b5d174";
-       buildDepends = [ base semigroups vector-space ];
+       libraryHaskellDepends = [ base semigroups vector-space ];
        description = "An average (arithmetic mean) monoid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22470,13 +23048,13 @@ self: {
        pname = "avers";
        version = "0.0.9";
        sha256 = "0zcgq4b20vvg2mqm9yqm4gvakafn9r8mghki8bn87xhk0w7h99km";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring clock containers
          cryptohash filepath inflections MonadRandom mtl network network-uri
          resource-pool rethinkdb-client-driver safe scrypt stm
          template-haskell text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring containers
          cryptohash hspec inflections MonadRandom mtl resource-pool
          rethinkdb-client-driver scrypt stm text time unordered-containers
@@ -22495,8 +23073,8 @@ self: {
        pname = "avl-static";
        version = "0.1.0.0";
        sha256 = "13rl5wrpmbb4c0zsaymivi4d9qg2wl4lfw4nvkd81naqm3vskc10";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -22510,7 +23088,7 @@ self: {
        pname = "avr-shake";
        version = "0.0.1.1";
        sha256 = "0avj9idsk70c7gzkm18kcsvh3xhg57r8aifhdpyihzyvp87k61pn";
-       buildDepends = [ base dependent-sum mtl process shake ];
+       libraryHaskellDepends = [ base dependent-sum mtl process shake ];
        homepage = "https://github.com/mokus0/avr-shake";
        description = "AVR Crosspack actions for shake build systems";
        license = stdenv.lib.licenses.publicDomain;
@@ -22524,7 +23102,7 @@ self: {
        pname = "awesomium";
        version = "0.1.0.0";
        sha256 = "0qd89nlw4rqdl8iya49rldyn5a36d64slcnw5pfh5c5aajh27aq2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec awesomium-raw base containers text vector
        ];
        description = "High-level Awesomium bindings";
@@ -22538,7 +23116,7 @@ self: {
        pname = "awesomium-glut";
        version = "0.1.0.0";
        sha256 = "175hgqix2j26579g0rrryl86w7qvla95nvf4lwfxsxxwqgcq3zpd";
-       buildDepends = [ awesomium awesomium-raw base GLUT ];
+       libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ];
        description = "Utilities for using Awesomium with GLUT";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22550,9 +23128,9 @@ self: {
        pname = "awesomium-raw";
        version = "0.1.0.0";
        sha256 = "0djilsrgb8y84ssslwawhw6lky7bqspz31qwjy9lkxywi5hwxnyb";
-       buildDepends = [ base ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ awesomium ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ awesomium ];
+       libraryToolDepends = [ c2hs ];
        description = "Low-level Awesomium bindings";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22575,7 +23153,7 @@ self: {
        sha256 = "0aykch71qakmxn47i6h23h52dp41x7kwcibv527xg57ab71vm1bc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
          conduit-extra containers cryptohash data-default directory filepath
@@ -22583,7 +23161,7 @@ self: {
          old-locale resourcet safe scientific tagged text time transformers
          unordered-containers utf8-string vector xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring errors http-client lifted-base monad-control
          mtl QuickCheck quickcheck-instances resourcet tagged tasty
          tasty-quickcheck text time transformers transformers-base
@@ -22601,7 +23179,7 @@ self: {
        pname = "aws-cloudfront-signer";
        version = "1.1.0.2";
        sha256 = "0cxh0b0g4lms2zpgw6q4k7bk2a7px8kafdr6qrbrcf7p3dkmzwd9";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types base base64-bytestring bytestring
          crypto-pubkey-types old-locale RSA time
        ];
@@ -22620,10 +23198,10 @@ self: {
      mkDerivation {
        pname = "aws-configuration-tools";
        version = "0.1.0.0";
-       revision = "2";
        sha256 = "0xqwhd15ijwf6h26hb1nl16813b1rfh1nx6qipslz6pw857vv53b";
+       revision = "2";
        editedCabalFile = "536eacac6f54fbeb3e823d5b751eaa8cf1bb45a69f1d0bf54bdbff6245eb93e9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aws aws-general aws-kinesis base base-unicode-symbols bytestring
          configuration-tools mtl text transformers
        ];
@@ -22640,7 +23218,7 @@ self: {
        pname = "aws-dynamodb-conduit";
        version = "0.1.0.6";
        sha256 = "15svx7c8nld8bgwqwy5mwkbniz4c1ifw2rw427gwk7y2py1hq38p";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec-trans aws base bytestring conduit containers
          http-conduit http-types json-togo resourcet text transformers
        ];
@@ -22660,7 +23238,7 @@ self: {
        pname = "aws-dynamodb-streams";
        version = "0.1.0.0";
        sha256 = "0yqmijls71jyvic2saabj3kwnpaxmlj6mf4krcdli3626ra7w4r2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec aws aws-general base base-unicode-symbols
          base16-bytestring base64-bytestring byteable bytestring
          case-insensitive conduit conduit-extra containers cryptohash
@@ -22686,12 +23264,15 @@ self: {
        sha256 = "0wgg05hnzjrlhzkc5giy5gdkiy4dg6hvgdq433ifld11vrpy152d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aws base base16-bytestring base64-bytestring blaze-builder
          byteable bytestring conduit-extra containers cryptohash
-         http-conduit http-types mtl optparse-applicative resourcet
-         scientific template-haskell text time unordered-containers vector
-         xml-conduit yaml
+         http-conduit http-types mtl resourcet scientific template-haskell
+         text time unordered-containers vector xml-conduit
+       ];
+       executableHaskellDepends = [
+         aeson aws base bytestring containers optparse-applicative text
+         unordered-containers vector yaml
        ];
        homepage = "https://github.com/zalora/aws-ec2";
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
@@ -22710,11 +23291,11 @@ self: {
        sha256 = "02dygqqyal6s3ibjvgxng4vspld3c6mrgrwdhig8lfri2zdpqsw9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aws aws-sign4 base bytestring conduit containers http-conduit
          http-types QuickCheck regex-compat safe text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base Cabal containers QuickCheck regex-compat safe text
        ];
        homepage = "http://github.com/iconnect/aws-elastic-transcoder";
@@ -22734,12 +23315,12 @@ self: {
        pname = "aws-general";
        version = "0.2.2";
        sha256 = "08sy37w162zqd6dqi8kkg0782nv00jsp48bnrmhwhmkhnd2arfrj";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring blaze-builder byteable
          bytestring case-insensitive cryptohash deepseq hashable http-types
          parsers QuickCheck quickcheck-instances text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec aws base bytestring case-insensitive charset directory
          either errors http-types parsers QuickCheck quickcheck-instances
          tagged tasty tasty-quickcheck text time transformers
@@ -22760,13 +23341,13 @@ self: {
        pname = "aws-kinesis";
        version = "0.1.5";
        sha256 = "0npiff5zrcs552y8lq3q6fgnwffqy11dvgs3yaygy0m99mgiaaiz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aws aws-general base base64-bytestring blaze-builder
          bytestring conduit conduit-extra deepseq http-conduit http-types
          parsers QuickCheck quickcheck-instances resourcet text time
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aws aws-general base bytestring errors mtl QuickCheck tagged
          tasty tasty-quickcheck text transformers
        ];
@@ -22787,18 +23368,23 @@ self: {
      mkDerivation {
        pname = "aws-kinesis-client";
        version = "0.4.0.2";
-       revision = "1";
        sha256 = "1vygs2qdnwjw8pygbsncc22cq9294hmlbzi2fysi3agva2qxzmwx";
+       revision = "1";
        editedCabalFile = "4bd055f19f3ced5d6f52eec169220d7c5159cfa521128a3118aedecc9c3ad2f3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson aws aws-kinesis base base-unicode-symbols conduit containers
+         data-carousel enclosed-exceptions http-conduit kan-extensions lens
+         lens-action lifted-async lifted-base monad-control mtl nats random
+         resourcet stm stm-chans stm-queue-extras text transformers
+         unordered-containers
+       ];
+       executableHaskellDepends = [
          aeson aws aws-configuration-tools aws-general aws-kinesis base
          base-unicode-symbols bytestring conduit configuration-tools
-         containers data-carousel enclosed-exceptions http-conduit
-         kan-extensions lens lens-action lifted-async lifted-base
-         monad-control mtl nats optparse-applicative random resourcet stm
-         stm-chans stm-queue-extras text transformers unordered-containers
+         http-conduit kan-extensions lens lifted-async lifted-base
+         monad-control mtl optparse-applicative text transformers
        ];
        jailbreak = true;
        description = "A producer & consumer client library for AWS Kinesis";
@@ -22817,9 +23403,15 @@ self: {
        sha256 = "1v7i39sd6rizrrgxpqp3pnc45sry4glkb7yi0jx8qcxf2d8bklnn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aws aws-general aws-kinesis aws-sdk base base-unicode-symbols
-         bytestring conduit either hoist-error lens lens-action lifted-async
+         bytestring conduit hoist-error lens lens-action lifted-async
+         lifted-base monad-control mtl optparse-applicative resourcet text
+         time transformers
+       ];
+       executableHaskellDepends = [
+         aws aws-general aws-kinesis aws-sdk base base-unicode-symbols
+         conduit either hoist-error lens lens-action lifted-async
          lifted-base monad-control mtl optparse-applicative resourcet text
          time transformers
        ];
@@ -22840,7 +23432,7 @@ self: {
        pname = "aws-lambda";
        version = "0.1.0.1";
        sha256 = "1dy9q86yvrydw7h1l1n4ciai400w7czc26mizzfi4r369mqyan89";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aws-general base base-unicode-symbols bytestring containers
          exceptions filepath http-client http-types lens lens-action
          lens-aeson mtl old-locale text time wreq zip-archive
@@ -22864,11 +23456,14 @@ self: {
        sha256 = "1m9najkh21ww4xmddad8ksnfa3if8q955q1vf3m48f52r2dl81hw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson async aws base bytestring configuration-tools containers
-         dlist errors http-client lens lifted-base monad-control mtl
-         optparse-applicative resourcet statistics text time transformers
-         vector
+       libraryHaskellDepends = [
+         aeson aws base errors lifted-base monad-control mtl text
+         transformers
+       ];
+       executableHaskellDepends = [
+         async aws base bytestring configuration-tools containers dlist
+         errors http-client lens monad-control optparse-applicative
+         resourcet statistics text time transformers vector
        ];
        homepage = "http://github.com/alephcloud/hs-aws-performance-tests";
        description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)";
@@ -22884,7 +23479,7 @@ self: {
        pname = "aws-route53";
        version = "0.1.2";
        sha256 = "0qg0fzw5kb3xvldxc2sx7xgkwgspyscvs83sv3nrw91qjp6ypi18";
-       buildDepends = [
+       libraryHaskellDepends = [
          aws base bytestring containers http-conduit http-types old-locale
          resourcet text time xml-conduit xml-hamlet
        ];
@@ -22904,14 +23499,14 @@ self: {
        pname = "aws-sdk";
        version = "0.12.4";
        sha256 = "0zmwfkfddiyyn264kay6m295fh23gii8axln1fjykbsdgd6yy5rb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring conduit conduit-extra containers
          data-default http-conduit http-types iproute lifted-base
          monad-control mtl old-locale parallel parsec resourcet safe SHA
          simple-config strptime template-haskell text time tls transformers
          transformers-base xml-conduit xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit hspec http-conduit HUnit iproute lifted-base
          monad-control QuickCheck random resourcet text time tls
          transformers
@@ -22931,11 +23526,11 @@ self: {
        pname = "aws-sdk-text-converter";
        version = "0.3";
        sha256 = "06a9sj9k1zpnzjcz8bd952fljwdn5r3vn5cg0vvc50bnidf99nfk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring iproute old-locale safe strptime template-haskell
          text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec HUnit iproute old-locale QuickCheck safe
          strptime template-haskell text time
        ];
@@ -22954,11 +23549,11 @@ self: {
        pname = "aws-sdk-xml-unordered";
        version = "0.3.1";
        sha256 = "0f90l61npi6x59i81k2cjfklpjl5m52zj7ww04k3y5x5c7nj26nd";
-       buildDepends = [
+       libraryHaskellDepends = [
          aws-sdk-text-converter base conduit containers lifted-base mtl
          resourcet text unordered-containers xml-conduit xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit hspec mtl resourcet text xml-conduit
        ];
        homepage = "https://github.com/worksap-ate/aws-sdk-xml-unordered";
@@ -22977,11 +23572,11 @@ self: {
        pname = "aws-sign4";
        version = "1.1.0.1";
        sha256 = "1jw4dp8gg4lzski55iw5m5xihyx1cp33c334nlkd2xydrkk8rjhh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aws base blaze-builder byteable bytestring case-insensitive
          cryptohash http-types old-locale safe time
        ];
-       testDepends = [
+       testHaskellDepends = [
          attempt aws base blaze-builder byteable bytestring
          bytestring-lexing Cabal case-insensitive cryptohash directory
          filepath http-types old-locale safe text time
@@ -23003,12 +23598,12 @@ self: {
        pname = "aws-sns";
        version = "0.1";
        sha256 = "1v1fjldn1bx65vv84zgx7np84pl4cr1wddngchkjxzci07ydrjpm";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aws aws-general base blaze-builder bytestring conduit
          containers http-conduit http-types parsers QuickCheck resourcet
          text time transformers xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aws aws-general base bytestring errors mtl QuickCheck tagged
          tasty tasty-quickcheck text transformers
        ];
@@ -23027,7 +23622,7 @@ self: {
        pname = "azure-acs";
        version = "0.0.1.1";
        sha256 = "09gv4ym6nxx5854m40p06pxvxrqfhmadxlb0d72pji6hk180yg5l";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring conduit conduit-extra connection
          http-conduit http-types network time
        ];
@@ -23045,7 +23640,7 @@ self: {
        pname = "azure-service-api";
        version = "0.1.0.0";
        sha256 = "09wb94k8f8wgcdx036x2fzixck7cbv739rrh299m7awbl4i3mfhg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring case-insensitive certificate
          crypto-pubkey-types http-conduit hxt hxt-xpath pretty resourcet tls
          tls-extra transformers
@@ -23066,7 +23661,7 @@ self: {
        pname = "azure-servicebus";
        version = "0.1.6.0";
        sha256 = "1ig8af14m11di9fis6s5hxmfqh7hc40c3bqyighnpi25xnv7mm13";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec azure-acs base bytestring case-insensitive
          conduit connection http-client http-conduit http-types network text
        ];
@@ -23089,7 +23684,13 @@ self: {
        sha256 = "0nqkpizqiwv7wfs1bgl8q13aaqnc9wjh8gs6fyiklplnjdcpqf9g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring case-insensitive conduit
+         data-default http-conduit http-date http-types hxt hxt-unicode
+         network old-locale SHA text time transformers unix-compat
+         utf8-string
+       ];
+       executableHaskellDepends = [
          base base64-bytestring bytestring case-insensitive cmdargs conduit
          data-default directory http-conduit http-date http-types hxt
          hxt-unicode network old-locale SHA text time transformers
@@ -23110,11 +23711,11 @@ self: {
        pname = "b-tree";
        version = "0.1.1";
        sha256 = "1c20w9rzyj2gnd18042pv41r45cv3zvd5h83igh6w2gz1z7hl821";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory errors filepath lens
          mmap mtl pipes pipes-interleave transformers vector
        ];
-       testDepends = [ base binary containers pipes QuickCheck ];
+       testHaskellDepends = [ base binary containers pipes QuickCheck ];
        jailbreak = true;
        homepage = "http://github.com/bgamari/b-tree";
        description = "Immutable disk-based B* trees";
@@ -23135,13 +23736,16 @@ self: {
        sha256 = "0r8gjgmy9v655kza2c6ilngr4glijizgjddq0125s11pd40hzhvi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async base bifunctors binary bytestring conduit conduit-extra
-         ConfigFile directory filepath free mtl optparse-applicative parsec
-         pretty pretty-show process QuickCheck random semigroups syb
-         template text time transformers unordered-containers vector yaml
+         ConfigFile directory filepath free mtl parsec pretty pretty-show
+         process QuickCheck random semigroups syb template text time
+         transformers unordered-containers vector yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring optparse-applicative
+       ];
+       testHaskellDepends = [
          aeson base bytestring hspec hspec-expectations QuickCheck
          semigroups text unordered-containers vector yaml
        ];
@@ -23158,7 +23762,9 @@ self: {
        sha256 = "12cyn149dgd9wvnc7smqsfy15mzgyfg8l17y6qz0k4dyapp8fvhf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers random wx wxcore ];
+       executableHaskellDepends = [
+         array base containers random wx wxcore
+       ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
      }) {};
@@ -23173,7 +23779,7 @@ self: {
        sha256 = "1z5v0p2yfgln9sv41myr10cjq60xcaav0hfzc18bmmssl8x2yljy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory haskell98 hslogger old-time process random
        ];
        jailbreak = true;
@@ -23190,7 +23796,7 @@ self: {
        pname = "backtracking-exceptions";
        version = "0.1.0.0";
        sha256 = "1m4z4m4ncyswvbr12dsvl0gz5398jxy99zkh22xjrdmfgl8rx6p2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base either free kan-extensions mtl semigroupoids semigroups
          transformers
        ];
@@ -23206,7 +23812,7 @@ self: {
        pname = "backward-state";
        version = "0.1.0.2";
        sha256 = "1akxm0v23gnph5jxwi20wq4lk07vd2kpiqns550k499yw95vqyam";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "https://github.com/luqui/backward-state";
        description = "A state monad that runs the state in reverse through the computation";
@@ -23221,7 +23827,7 @@ self: {
        sha256 = "19y7p53b80lqfrs1b945l4pc73c54zivk8l6lffzznd7gmbc0mv5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gd X11 ];
+       executableHaskellDepends = [ base gd X11 ];
        homepage = "http://www.dmwit.com/bacteria";
        description = "braindead utility to compose Xinerama backgrounds";
        license = "unknown";
@@ -23233,7 +23839,7 @@ self: {
        pname = "bag";
        version = "0.1";
        sha256 = "18n7ggrfm39mn4rva661hkxj75gjx2p3jcm0hlzpcshxyk93iblr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A simple stable bag";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23252,7 +23858,13 @@ self: {
        sha256 = "1xxv78i2q9hiw30vkbcx09nabqv88g3a6k872ckm9wk8isrnw2zz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring cmdargs containers deepseq direct-sqlite
+         directory disk-free-space extra filepath hashable HTTP http-types
+         old-locale random safe shake smtp-mail sqlite-simple text time
+         transformers unordered-containers wai warp
+       ];
+       executableHaskellDepends = [
          aeson base bytestring cmdargs containers deepseq direct-sqlite
          directory disk-free-space extra filepath hashable HTTP http-types
          old-locale process random safe shake smtp-mail sqlite-simple text
@@ -23273,7 +23885,7 @@ self: {
        pname = "bamboo";
        version = "2010.2.25";
        sha256 = "0v96ync9vkq7xyc5jmm7k7vfxpy4m1l2370m99wa8qlrpcffhrmi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default directory filepath gravatar
          hack hack-contrib haskell98 mps mtl network old-locale old-time
          pandoc parsec parsedate process time unix utf8-string xhtml zlib
@@ -23295,7 +23907,7 @@ self: {
        sha256 = "1xp2k33jxbkf0maj3p3grv93c9vnjg6fzy6l8gg5dhil18834vdd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          bamboo bamboo-theme-blueprint base bytestring data-default hack
          hack-contrib hack-handler-hyena haskell98 mps process
        ];
@@ -23313,7 +23925,7 @@ self: {
        pname = "bamboo-plugin-highlight";
        version = "2009.7.5";
        sha256 = "0f8hpampawv0csqsb504hg97r7mimkcs9irm9i2m2b13w5fciaqc";
-       buildDepends = [
+       libraryHaskellDepends = [
          bamboo base bytestring hack hack-contrib highlighting-kate hxt mps
          xhtml
        ];
@@ -23332,7 +23944,7 @@ self: {
        pname = "bamboo-plugin-photo";
        version = "2009.7.5";
        sha256 = "19ik80hcshmw8gpsb9gwngnwvriri10xx2v6xvrz0q25cxgwdjah";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default directory filepath hack hack-contrib
          haskell98 hxt mps utf8-string xhtml
        ];
@@ -23351,7 +23963,7 @@ self: {
        pname = "bamboo-theme-blueprint";
        version = "2010.2.25.1";
        sha256 = "1wchvz2nm4klg11wjk3yb5yvqpa26c9lg6xc65k0dwxhy0cyd2zx";
-       buildDepends = [
+       libraryHaskellDepends = [
          bamboo base bytestring containers data-default gravatar hack
          hack-contrib hcheat mps network rss utf8-string xhtml
        ];
@@ -23372,7 +23984,7 @@ self: {
        pname = "bamboo-theme-mini-html5";
        version = "2009.11.27";
        sha256 = "02zh9jqq46gg3hrsfjfq2skajr4jni3cisak4nd3shl6aqapw9d6";
-       buildDepends = [
+       libraryHaskellDepends = [
          bamboo base base64-string bytestring cgi containers data-default
          directory filepath gravatar hack hack-contrib haskell98 hcheat moe
          mps mtl network old-locale old-time parsec parsedate process rss
@@ -23394,10 +24006,10 @@ self: {
        sha256 = "1nykyywrqmf5nyszfg3acm0ydr9z8q78wc7bgabfmjwrnpq1dw68";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base com directory filepath HUnit old-time pretty process
-         QuickCheck regex-compat
+       libraryHaskellDepends = [
+         base com directory filepath old-time pretty process regex-compat
        ];
+       executableHaskellDepends = [ HUnit QuickCheck ];
        description = "A Windows Installer (MSI) generator framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23411,7 +24023,7 @@ self: {
        sha256 = "0z8k47h492818yvgxggqw4gcb6m91pw70kpibf9s384vxcbj6r24";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs samtools ];
+       executableHaskellDepends = [ base cmdargs samtools ];
        homepage = "http://blog.malde.org/posts/bamstats.html";
        description = "A program to extract various information from BAM alignmnet files";
        license = "GPL";
@@ -23423,8 +24035,8 @@ self: {
        pname = "bank-holidays-england";
        version = "0.1.0.3";
        sha256 = "12k01aa0293izblgr7kszkilnw29716hddqfs9cq18h49gp6m7s5";
-       buildDepends = [ base containers time ];
-       testDepends = [ base containers hspec QuickCheck time ];
+       libraryHaskellDepends = [ base containers time ];
+       testHaskellDepends = [ base containers hspec QuickCheck time ];
        homepage = "https://bitbucket.org/davecturner/bank-holidays-england";
        description = "Calculation of bank holidays in England and Wales";
        license = stdenv.lib.licenses.bsd3;
@@ -23438,10 +24050,10 @@ self: {
        pname = "banwords";
        version = "0.2.0.1";
        sha256 = "13mnz060yi1j6gsxknn1ara34s4ymdswysypj8d94k1741jv89yn";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring data-default text vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base HUnit test-framework test-framework-hunit text
          vector
        ];
@@ -23458,7 +24070,8 @@ self: {
        sha256 = "160ja5sdk0zdqc0ncsyldp4rmhc2g4zfa6xc7vbzf8gpqrcmzvgy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs csv diagrams filepath ];
+       libraryHaskellDepends = [ base csv diagrams filepath ];
+       executableHaskellDepends = [ base cmdargs csv diagrams filepath ];
        jailbreak = true;
        homepage = "http://sebfisch.github.com/haskell-barchart";
        description = "Creating Bar Charts in Haskell";
@@ -23471,7 +24084,7 @@ self: {
        pname = "barcodes-code128";
        version = "0.1.0";
        sha256 = "14blxjhapn9g7cp7374f5s2nln7wgyb7a6z50gp04lnqf1aw6kmg";
-       buildDepends = [ base bytestring HPDF ];
+       libraryHaskellDepends = [ base bytestring HPDF ];
        jailbreak = true;
        description = "Generate Code 128 barcodes as PDFs";
        license = stdenv.lib.licenses.mit;
@@ -23484,7 +24097,7 @@ self: {
        pname = "barecheck";
        version = "0.2.0.8";
        sha256 = "0hja4lrgv1faqaq41wzf1r88aw4pin8jh60k9n65yd0sxi1103a7";
-       buildDepends = [ base containers QuickCheck text time ];
+       libraryHaskellDepends = [ base containers QuickCheck text time ];
        jailbreak = true;
        homepage = "http://github.com/massysett/barecheck";
        description = "QuickCheck implementations for common types";
@@ -23502,7 +24115,7 @@ self: {
        sha256 = "0igz39bxlw4p0fna1wf6g791pk7r1m7hfyib5rgmsdahzkkp7v2h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath ghc ghc-prim html
          plugins snap-core snap-server text transformers unix-compat
        ];
@@ -23518,7 +24131,7 @@ self: {
        pname = "barrie";
        version = "0.4.1";
        sha256 = "10iraid6v333374mx9vinvaw6r1903ipa92xjxhl8qh4w7xmr9yv";
-       buildDepends = [ base containers filepath glib gtk ];
+       libraryHaskellDepends = [ base containers filepath glib gtk ];
        homepage = "http://thewhitelion.org/haskell/barrie";
        description = "Declarative Gtk GUI library";
        license = "GPL";
@@ -23532,16 +24145,16 @@ self: {
      mkDerivation {
        pname = "barrier";
        version = "0.1.0";
-       revision = "1";
        sha256 = "1flhgx323dnqhh6gxmfv4m8qj2yysckrr9pzw0g7jisvk6pmcz4z";
+       revision = "1";
        editedCabalFile = "2f75bd296d54424250895888d24eaec14bbdb35b355306306b6f8632052473bc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-svg bytestring template-haskell text
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring lens-family-core tasty tasty-golden
        ];
        homepage = "https://github.com/philopon/barrier";
@@ -23555,7 +24168,7 @@ self: {
        pname = "barrier-monad";
        version = "0.1.0.1";
        sha256 = "014nc21wnrklsvy5z7w4v9p9psn6bl210l7v97gj42cv6a8jk5nm";
-       buildDepends = [ base comonad mtl transformers ];
+       libraryHaskellDepends = [ base comonad mtl transformers ];
        jailbreak = true;
        description = "Implementation of barrier monad, can use custom front/back type";
        license = stdenv.lib.licenses.publicDomain;
@@ -23568,7 +24181,7 @@ self: {
        pname = "base";
        version = "4.8.1.0";
        sha256 = "0rwya445hvnnzj3x5gsrmr72kr3yspd6w9mypxkrxxg19zfazjaj";
-       buildDepends = [ ghc-prim rts ];
+       libraryHaskellDepends = [ ghc-prim rts ];
        description = "Basic libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23579,8 +24192,8 @@ self: {
        pname = "base-compat";
        version = "0.8.2";
        sha256 = "02m93hzgxg4bcnp7xcc2fdh2hrsc2h6fwl8hix5nx9k864kwf41q";
-       buildDepends = [ base unix ];
-       testDepends = [ base hspec QuickCheck ];
+       libraryHaskellDepends = [ base unix ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        description = "A compatibility layer for base";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -23591,7 +24204,7 @@ self: {
        pname = "base-generics";
        version = "0.1.0.1";
        sha256 = "19k6kl66p71pza23b1n5njmj97k1pdlcm6brl1danfaxlflsmcms";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/HaskellZhangSong/base-generics";
        description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well.";
@@ -23604,7 +24217,7 @@ self: {
        pname = "base-io-access";
        version = "0.4.0.0";
        sha256 = "0d0i8ndh2j42qf8ns9wprkjiffy3hyybgvs9nbf67yd50di6p263";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/bheklilr/base-io-access";
        description = "The IO functions included in base delimited into small, composable classes";
@@ -23617,7 +24230,8 @@ self: {
        pname = "base-noprelude";
        version = "4.8.0.0";
        sha256 = "0kxpkahlwvmy86g94rawhv6x3kl761xf4s78jv1cjzglsb28q0zl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/hvr/base-noprelude";
        description = "\"base\" package sans \"Prelude\" module";
        license = stdenv.lib.licenses.bsd3;
@@ -23629,8 +24243,8 @@ self: {
        pname = "base-orphans";
        version = "0.4.2";
        sha256 = "1mfmhvb7zvyi3m5660755ph7xk4fdvhki6ssfd3i2ghzas8g1v7a";
-       buildDepends = [ base ghc-prim ];
-       testDepends = [ base hspec QuickCheck ];
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
@@ -23642,7 +24256,7 @@ self: {
        pname = "base-prelude";
        version = "0.1.19";
        sha256 = "00mk7zpm3yb804h0gngvpjxhb2a6nds8qb8mwpn80s20x72083wb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nikita-volkov/base-prelude";
        description = "The most complete prelude formed from only the \"base\" package";
        license = stdenv.lib.licenses.mit;
@@ -23654,7 +24268,7 @@ self: {
        pname = "base-unicode-symbols";
        version = "0.2.2.4";
        sha256 = "1afc5pchd3vw33bmjbjygkd0l5zh7glbsx4bfyxfscpc1x1l3y52";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
@@ -23666,7 +24280,7 @@ self: {
        pname = "base16-bytestring";
        version = "0.1.1.6";
        sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs";
-       buildDepends = [ base bytestring ghc-prim ];
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
        homepage = "http://github.com/bos/base16-bytestring";
        description = "Fast base16 (hex) encoding and decoding for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -23680,8 +24294,8 @@ self: {
        pname = "base32-bytestring";
        version = "0.2.1.0";
        sha256 = "0z0q3fw3jzprgxmq9b2iz98kf4hwl3nydrzlaiwk81aplisfdgkl";
-       buildDepends = [ base bits-extras bytestring cpu ];
-       testDepends = [ base bytestring hspec QuickCheck ];
+       libraryHaskellDepends = [ base bits-extras bytestring cpu ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "https://github.com/pxqr/base32-bytestring";
        description = "Fast base32 and base32hex codec for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -23693,8 +24307,8 @@ self: {
        pname = "base32string";
        version = "0.9.1";
        sha256 = "0cpa6bvam4zd2l2hb3sdngj0dx482c9rkz4jj87n6pxsmq9id4wy";
-       buildDepends = [ aeson base binary bytestring text ];
-       testDepends = [ base binary bytestring hspec text ];
+       libraryHaskellDepends = [ aeson base binary bytestring text ];
+       testHaskellDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Fast and safe representation of a Base-32 string";
        license = stdenv.lib.licenses.mit;
@@ -23708,8 +24322,8 @@ self: {
        pname = "base58-bytestring";
        version = "0.1.0";
        sha256 = "1ls05nzswjr6aw0wwk3q7cpv1hf0lw7vk16a5khm6l21yfcgbny2";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring quickcheck-assertions quickcheck-instances tasty
          tasty-quickcheck
        ];
@@ -23726,8 +24340,10 @@ self: {
        pname = "base58address";
        version = "0.4";
        sha256 = "0z15x9wx962ywkmh5lzfg4kq2jjmyzncbpayx2lkjnpdra4xgz7a";
-       buildDepends = [ base binary bytestring containers cryptohash ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring containers cryptohash
+       ];
+       testHaskellDepends = [
          base binary bytestring containers cryptohash QuickCheck
          test-framework test-framework-quickcheck2
        ];
@@ -23742,8 +24358,8 @@ self: {
        pname = "base58string";
        version = "0.10.0";
        sha256 = "1260x4bkrizvnmylm237gpi92wazh31md9nf982sac3fsxyn0wiv";
-       buildDepends = [ aeson base binary bytestring text ];
-       testDepends = [ base binary bytestring hspec text ];
+       libraryHaskellDepends = [ aeson base binary bytestring text ];
+       testHaskellDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Fast and safe representation of a Base-58 string";
        license = stdenv.lib.licenses.mit;
@@ -23757,8 +24373,8 @@ self: {
        pname = "base64-bytestring";
        version = "1.0.0.1";
        sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -23775,8 +24391,10 @@ self: {
        pname = "base64-conduit";
        version = "1.0.0.1";
        sha256 = "07zhvn3fy60q04a5g5mzhkl17rap9jlh00vb4f6565bjha2k16g9";
-       buildDepends = [ base base64-bytestring bytestring conduit ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring conduit
+       ];
+       testHaskellDepends = [
          base base64-bytestring bytestring conduit hspec QuickCheck
          transformers
        ];
@@ -23792,7 +24410,7 @@ self: {
        pname = "base64-string";
        version = "0.2";
        sha256 = "0pkhrimabacsjalzq0y3a197fqfbspsbv8xszzg4vbb1fb59dj1y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://urchin.earth.li/~ian/cabal/base64-string/";
        description = "Base64 implementation for String's";
        license = "unknown";
@@ -23808,8 +24426,13 @@ self: {
        sha256 = "1lz9s7w5nlp4naj9jzwb73im0vbs5nlrddg18irjz64sgq3qd2nn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring mono-traversable text ];
-       testDepends = [ base bytestring mono-traversable QuickCheck text ];
+       libraryHaskellDepends = [ base mono-traversable ];
+       executableHaskellDepends = [
+         base bytestring mono-traversable text
+       ];
+       testHaskellDepends = [
+         base bytestring mono-traversable QuickCheck text
+       ];
        homepage = "https://github.com/ajg/base91";
        description = "A Generic Base91 Encoder & Decoder";
        license = stdenv.lib.licenses.mit;
@@ -23821,7 +24444,7 @@ self: {
        pname = "basex-client";
        version = "0.1.0.0";
        sha256 = "189bmv479fmljy9w7nhc5mb7546iz8vahrmxffvgny51ywklk58n";
-       buildDepends = [ base network pureMD5 utf8-string ];
+       libraryHaskellDepends = [ base network pureMD5 utf8-string ];
        description = "A BaseX client for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -23834,7 +24457,7 @@ self: {
        pname = "bash";
        version = "0.1.8";
        sha256 = "1wv7haxb4vvnh9i7y17m1d7qbpl92qjrnn022g6hyxbxzmpgsw60";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers hxt-regex-xmlschema mtl SHA
          shell-escape
        ];
@@ -23848,10 +24471,10 @@ self: {
      mkDerivation {
        pname = "basic-lens";
        version = "0.0.0";
-       revision = "1";
        sha256 = "0qgd2066vgsrzglcmw1jd7lcrpxvrzch7bnyyfxzddwxj148mvnj";
+       revision = "1";
        editedCabalFile = "dcb1e49555431b94fedf161e3a2169213eea59167a34eb20b91be22baac9e170";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Basic lens type and functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23864,10 +24487,10 @@ self: {
      mkDerivation {
        pname = "basic-prelude";
        version = "0.5.0";
-       revision = "1";
        sha256 = "1l8hc99sxm27gd93zq6v0l0x2rzl6fd9zp7snh14m4yriqrn5xfi";
+       revision = "1";
        editedCabalFile = "2ddf5a9d3413a8e7c877c488f63451357fcde4d187f7c560f5281a0c4856fd0b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers filepath hashable lifted-base ReadArgs
          safe text transformers unordered-containers vector
        ];
@@ -23882,7 +24505,9 @@ self: {
        pname = "basic-sop";
        version = "0.1.0.5";
        sha256 = "0zmjd11jckaknkifyif4zq5833cs2kxpm98j43viqc09w63brcx3";
-       buildDepends = [ base deepseq generics-sop QuickCheck text ];
+       libraryHaskellDepends = [
+         base deepseq generics-sop QuickCheck text
+       ];
        description = "Basic examples and functions for generics-sop";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23895,7 +24520,9 @@ self: {
        sha256 = "1vb74crz57i4qmjl8k3gxr2abz9rmpw7yl5sm1pggnlfy9wcm15l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl parsec pretty unix ];
+       executableHaskellDepends = [
+         base containers mtl parsec pretty unix
+       ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "An interpreter for a small functional language";
        license = "GPL";
@@ -23908,7 +24535,9 @@ self: {
        pname = "battlenet";
        version = "0.2.0.0";
        sha256 = "1nzli8n6lpa9jahwp3awvpafzfkx4j02bwanilh30sxfyp0mlxxa";
-       buildDepends = [ aeson base containers http-conduit text ];
+       libraryHaskellDepends = [
+         aeson base containers http-conduit text
+       ];
        jailbreak = true;
        homepage = "https://github.com/teozkr/hs-battlenet/";
        description = "API client for Battle.Net";
@@ -23921,7 +24550,9 @@ self: {
        pname = "battlenet-yesod";
        version = "0.2.0.0";
        sha256 = "056z84rha1nwjij3am16vfp4nwgp7xzqrhkvrx9s8p1vivyb80yz";
-       buildDepends = [ base battlenet http-conduit text yesod-core ];
+       libraryHaskellDepends = [
+         base battlenet http-conduit text yesod-core
+       ];
        jailbreak = true;
        homepage = "https://github.com/teozkr/hs-battlenet/";
        description = "Yesod integration for the battlenet package";
@@ -23943,13 +24574,18 @@ self: {
        sha256 = "1rg96qikd687wndwj0pgvzg2ln4vh7x304cnyiisci2ka9763cld";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array attoparsec base base64-bytestring blaze-svg bytestring
-         cereal colour containers cookie crypto-random data-default
-         diagrams-lib diagrams-svg fast-logger filepath hamlet hjsmin
-         MonadRandom mtl shakespeare-js shakespeare-text SimpleAES
-         template-haskell text transformers wai-extra wai-handler-fastcgi
-         wai-logger word8 yaml yesod yesod-core yesod-routes yesod-static
+         cereal colour containers cookie data-default diagrams-lib
+         diagrams-svg fast-logger filepath hamlet hjsmin MonadRandom mtl
+         shakespeare-js shakespeare-text SimpleAES template-haskell text
+         transformers wai-extra wai-logger word8 yaml yesod yesod-core
+         yesod-routes yesod-static
+       ];
+       executableHaskellDepends = [
+         base blaze-svg bytestring containers crypto-random diagrams-lib
+         diagrams-svg filepath MonadRandom mtl transformers
+         wai-handler-fastcgi yesod
        ];
        jailbreak = true;
        homepage = "https://github.com/zrho/afp";
@@ -23968,7 +24604,7 @@ self: {
        pname = "bayes-stack";
        version = "0.2.0.1";
        sha256 = "1nz4lnnxdfgacnv6mjxsgq543zxmim4rxvxbpsfx8yypjp6lsx5l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cereal containers deepseq digamma enummapset gamma ghc-prim
          logfloat mtl mwc-random pretty random-fu random-source rvar
          statistics stm transformers vector
@@ -23985,7 +24621,7 @@ self: {
        pname = "bbdb";
        version = "0.4";
        sha256 = "18f07dg0f7z7b8qwmyrcl1c48mgmprnj97va33dahvm0p0iw2039";
-       buildDepends = [ base mtl parsec ];
+       libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://www.nadineloveshenry.com/haskell/database-bbdb.html";
        description = "Ability to read, write, and examine BBDB files";
        license = stdenv.lib.licenses.gpl3;
@@ -23997,7 +24633,7 @@ self: {
        pname = "bcrypt";
        version = "0.0.6";
        sha256 = "032la7v7kp0k26s3lj006hgc7a99ylqpp5qi27jxnac10yjl5bi5";
-       buildDepends = [ base bytestring entropy ];
+       libraryHaskellDepends = [ base bytestring entropy ];
        description = "Haskell bindings to the bcrypt password hash";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24010,8 +24646,8 @@ self: {
        pname = "bdd";
        version = "0.2.0.0";
        sha256 = "17hwqksqkrriqrm7sx70jzmi3r8184p485y9i7cqbakdjapb5a4q";
-       buildDepends = [ base HUnit mtl transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base HUnit mtl transformers ];
+       testHaskellDepends = [
          base directory HUnit mtl process test-framework
          test-framework-hunit
        ];
@@ -24026,7 +24662,7 @@ self: {
        pname = "bdelta";
        version = "0.1.1.1";
        sha256 = "17zapldywid4xq0a6qdxh6hnk5igjjgplfydnr800xdpicicbrww";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/joeyadams/haskell-bytestring-delta";
        description = "Simple, fast binary diff/patch";
        license = stdenv.lib.licenses.mit;
@@ -24040,7 +24676,8 @@ self: {
        sha256 = "1mwc7l1n2gnw8yx5zphxlkgi6bkcw56qwifpy34wpa55x2lf6n82";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aeson base network text url ];
+       libraryHaskellDepends = [ aeson base network text url ];
+       executableHaskellDepends = [ aeson base network text url ];
        description = "Update CSS in the browser without reloading the page";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24054,10 +24691,10 @@ self: {
        pname = "beamable";
        version = "0.1.1.1";
        sha256 = "068d70ylk5b6jlg6j1c1nayb4a3mmf7r92blcgmdbjrz3ipqwg27";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring ghc-prim integer-gmp murmur-hash
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring ghc-prim integer-gmp murmur-hash
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -24075,7 +24712,7 @@ self: {
        sha256 = "15k41z1p8h0b677wba4mqkfszwggkrfcp3n5hbdvdjfiqyx2hbzi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base haskell98 mtl ];
+       executableHaskellDepends = [ array base haskell98 mtl ];
        homepage = "http://www.cs.indiana.edu/~lepike/pub_pages/holpp.html";
        description = "A pretty-printer for higher-order logic";
        license = "GPL";
@@ -24089,11 +24726,13 @@ self: {
      mkDerivation {
        pname = "bed-and-breakfast";
        version = "0.4.3";
-       revision = "1";
        sha256 = "0183770vkb5r9srxqr3fa4s601g10bx07b05hjr3b3nvc0ab9f6z";
+       revision = "1";
        editedCabalFile = "3efbed0b49112bb9addddcd87fdb8ffe58f14497c16a2aba9deb39e10dae0d4f";
-       buildDepends = [ array base binary deepseq template-haskell ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [
+         array base binary deepseq template-haskell
+       ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://hackage.haskell.org/package/bed-and-breakfast";
        description = "Efficient Matrix operations in 100% Haskell";
@@ -24113,7 +24752,7 @@ self: {
        sha256 = "1sq6z2a9bddqh0kys10g495bfj7pcyibsvhfxfl279z53va7d6ch";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers convertible Crypto directory filepath
          happstack-server happstack-util hdaemonize HDBC HDBC-postgresql
          hsyslog mtl network old-locale parsec process random stm time unix
@@ -24130,7 +24769,7 @@ self: {
        pname = "benchmark-function";
        version = "0.1.0.0";
        sha256 = "1cdbaf001m79xbpfdf3gg2z8jgyf25xqwrkg6y7da2mvk3127c5b";
-       buildDepends = [ base process random time ];
+       libraryHaskellDepends = [ base process random time ];
        homepage = "xy30.com";
        description = "Test the time it takes to run a haskell function";
        license = stdenv.lib.licenses.gpl3;
@@ -24142,7 +24781,7 @@ self: {
        pname = "benchpress";
        version = "0.2.2.6";
        sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg";
-       buildDepends = [ base mtl time ];
+       libraryHaskellDepends = [ base mtl time ];
        jailbreak = true;
        homepage = "http://github.com/tibbe/benchpress";
        description = "Micro-benchmarking with detailed statistics";
@@ -24155,7 +24794,9 @@ self: {
        pname = "bencode";
        version = "0.6.0.0";
        sha256 = "12pnh598k30ggs54f0pic19j7ji8f4xn7fydkdnlig79rvzgv3iv";
-       buildDepends = [ base binary bytestring containers parsec ];
+       libraryHaskellDepends = [
+         base binary bytestring containers parsec
+       ];
        description = "Parser and printer for bencoded data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24168,10 +24809,10 @@ self: {
        pname = "bencoding";
        version = "0.4.3.0";
        sha256 = "0f6d3g88y7i4s5wa53771n0fbkbs4na8vpy51wk21b563smdcpcc";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring deepseq ghc-prim mtl pretty text
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers ghc-prim hspec QuickCheck
        ];
        jailbreak = true;
@@ -24186,8 +24827,8 @@ self: {
        pname = "berkeleydb";
        version = "2008.10.31";
        sha256 = "1qqzxi011xmb4b09r1j5x1b7slgrazh19csfilk4a9f91zvq6l3p";
-       buildDepends = [ base binary bytestring ];
-       extraLibraries = [ db ];
+       libraryHaskellDepends = [ base binary bytestring ];
+       librarySystemDepends = [ db ];
        description = "Pretty BerkeleyDB v4 binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24205,10 +24846,14 @@ self: {
        sha256 = "066m1nyfwi1nivjmcnykjdypqzkm2zqfzb07zf6f9hiz9m4g6x09";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base containers directory extensible-exceptions filepath ghc
-         ghc-paths ghc-prim haskeline haskell-src-exts language-python
-         monads-tf parseargs process template-haskell transformers
+       libraryHaskellDepends = [
+         array base containers ghc-prim monads-tf template-haskell
+         transformers
+       ];
+       executableHaskellDepends = [
+         base containers directory extensible-exceptions filepath ghc
+         ghc-paths haskeline haskell-src-exts language-python monads-tf
+         parseargs process transformers
        ];
        jailbreak = true;
        homepage = "http://wiki.github.com/bjpop/berp/";
@@ -24227,11 +24872,11 @@ self: {
        pname = "bert";
        version = "1.2.2.4";
        sha256 = "1vcbylvci91rqq5dxsa2gxc709klr0xkcflpdhcng69s6pihgsg4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
          containers mtl network parsec time unix void
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base binary bytestring containers network smallcheck tasty
          tasty-hunit tasty-smallcheck
        ];
@@ -24246,7 +24891,7 @@ self: {
        pname = "besout";
        version = "0.2.0.1";
        sha256 = "0bv68nn6ijf1wv57kwp4yj6s75g960pds0n9wihxwkr4hh5azls1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Extended GCD of polynomials over F_p[x]";
        license = stdenv.lib.licenses.bsd3;
@@ -24265,12 +24910,12 @@ self: {
        sha256 = "0gy12m81bc6vgzq4m0v134jbq5lw1210dxsq4s28c0www0kxj658";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors binary bytestring containers exceptions
          HsOpenSSL http-client http-client-openssl lens mtl semigroupoids
          semigroups text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base lens QuickCheck semigroups test-framework
          test-framework-quickcheck2 test-framework-th
        ];
@@ -24287,8 +24932,10 @@ self: {
        pname = "betacode";
        version = "0.1.0.0";
        sha256 = "0ry42sp40234c83iw7di37j3jfjfbszxcv4mzgqc54b1693mjq7b";
-       buildDepends = [ attoparsec base errors hashable text text-icu ];
-       testDepends = [ base hspec QuickCheck smallcheck ];
+       libraryHaskellDepends = [
+         attoparsec base errors hashable text text-icu
+       ];
+       testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        jailbreak = true;
        description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code).";
        license = stdenv.lib.licenses.asl20;
@@ -24300,7 +24947,7 @@ self: {
        pname = "between";
        version = "0.10.0.0";
        sha256 = "10bj4v2451c9dri3r9c825xnr4lb8jhihr05nhc6m8fdvqnyqvsi";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/trskop/between";
        description = "Function combinator \"between\" and derived combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -24312,7 +24959,7 @@ self: {
        pname = "bf-cata";
        version = "1.1";
        sha256 = "0f8pyd2j24x574xs73zhadsd058ib217vd12snkqzg6vg9l7vgzw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        license = "LGPL";
      }) {};
@@ -24327,7 +24974,7 @@ self: {
        sha256 = "1i5y7pki3hyhq2vyshzi40n7yx354p7wiflfig8qxc4h31nbwi2x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bimap category-extras containers derive haskell98 mtl
          template-haskell unix
        ];
@@ -24343,7 +24990,7 @@ self: {
        pname = "bff-mono";
        version = "0.2.3";
        sha256 = "1qswfjrij01g7g85iiyxpvk1k5hgnf6ll7jcf6b33k6dawi3a4qr";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "https://bitbucket.org/kztk/bff-mono/";
        description = "\"Bidirectionalization for Free\" for Monomorphic Transformations";
        license = stdenv.lib.licenses.bsd3;
@@ -24355,7 +25002,7 @@ self: {
        pname = "bgmax";
        version = "0.1.0.1";
        sha256 = "0wg2dh3i50c4f1bc0csi3ppbz28scjfhcr0hqfd0cpfiaf79fs5s";
-       buildDepends = [ attoparsec base bytestring time ];
+       libraryHaskellDepends = [ attoparsec base bytestring time ];
        jailbreak = true;
        homepage = "http://github.com/jonpetterbergman/bgmax";
        description = "Parse BgMax-files";
@@ -24370,7 +25017,7 @@ self: {
        pname = "bgzf";
        version = "0.1.0.0";
        sha256 = "1lmwb65ads6ip5v0h8z03nyzxr9556p13j1y34lhgsyk2lxwdkrv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring mtl parallel pipes streaming-commons
        ];
        description = "Blocked GZip";
@@ -24386,7 +25033,7 @@ self: {
        sha256 = "0y6jf52361d225a1jynq7ysnwihid3qivsjqv2hbf0f8sayi8ic0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base latex parsec utility-ht ];
+       libraryHaskellDepends = [ base latex parsec utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/BibTeX";
        description = "Parse, format and processing BibTeX files";
        license = stdenv.lib.licenses.bsd3;
@@ -24402,7 +25049,7 @@ self: {
        sha256 = "0bclazwhg3ra7zv19xfx5rw2z3p8h8scw5r4m281524qzrkm9j6m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cgi containers directory hint mtl parsec pretty
          template-haskell unix utf8-string xhtml
        ];
@@ -24418,7 +25065,7 @@ self: {
        pname = "bidispec";
        version = "0.1.3";
        sha256 = "0y9hskhp1vcl92wrh3l7b1g6i7y9v4b06pl2qa9hhp9ladnvw7g4";
-       buildDepends = [ base bytestring mtl ];
+       libraryHaskellDepends = [ base bytestring mtl ];
        description = "Specification of generators and parsers";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24430,7 +25077,7 @@ self: {
        pname = "bidispec-extras";
        version = "0.1";
        sha256 = "0insqi63q6gvz39l0k584w583cw9m85vdx5dhpyx9qbb5zxyb0rm";
-       buildDepends = [ base bytestring dataenc mtl ];
+       libraryHaskellDepends = [ base bytestring dataenc mtl ];
        jailbreak = true;
        description = "Extra helper functions for bidirectional specifications";
        license = "LGPL";
@@ -24442,7 +25089,7 @@ self: {
        pname = "bifunctors";
        version = "5";
        sha256 = "13990xdgx0n23qgi18ghhmsywj5zkr0a5bim0g8a4nzi0cx95ps1";
-       buildDepends = [ base semigroups tagged ];
+       libraryHaskellDepends = [ base semigroups tagged ];
        homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -24458,7 +25105,11 @@ self: {
        sha256 = "1jhiq5w4z7axlqqm6pyl1d3g1vh7ykyy2z69d9ma8qzgm6v72l05";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory filepath HarmTrace-Base HUnit ListLike mtl
+         uu-parsinglib
+       ];
+       executableHaskellDepends = [
          base directory filepath HarmTrace-Base HUnit ListLike mtl parseargs
          uu-parsinglib
        ];
@@ -24478,7 +25129,7 @@ self: {
        pname = "billeksah-forms";
        version = "1.0.0";
        sha256 = "094sq2kn0xfvy146i7r89vf1by90nqaj4ki1fk3i2rw9glrv25ms";
-       buildDepends = [
+       libraryHaskellDepends = [
          base billeksah-pane billeksah-services Cabal containers directory
          filepath glib gtk mtl parsec pretty transformers
        ];
@@ -24499,7 +25150,7 @@ self: {
        sha256 = "1dyg6qfvhzxh2d90gvb8j7djqa04c3aci7rfk3s1wdqz5rkxmnlx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base billeksah-services containers directory filepath mtl parsec
          plugins pretty transformers
        ];
@@ -24522,7 +25173,7 @@ self: {
        sha256 = "1g4zldnza6s2xvkqar4rgqirs4p8j2j4ssacg9x0zzc4njzklj7y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base billeksah-forms billeksah-pane billeksah-services containers
          directory filepath leksah-dummy leksah-main leksah-plugin-pane mtl
          parsec pretty transformers
@@ -24543,7 +25194,7 @@ self: {
        pname = "billeksah-pane";
        version = "1.0.0";
        sha256 = "1ckzjbdfi3y09qvq951xki3h7q3sah41j29mgpqk45rayzqmiavg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base billeksah-services containers directory filepath glib gtk mtl
          parsec pretty time transformers
        ];
@@ -24562,7 +25213,7 @@ self: {
        pname = "billeksah-services";
        version = "1.0.0";
        sha256 = "00bsbrsnclwnayqzs24c5fdz9r6ankbhnnkbkzyd1fxsl7lrziwn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath mtl parsec pretty transformers
        ];
        jailbreak = true;
@@ -24578,7 +25229,7 @@ self: {
        pname = "bimap";
        version = "0.3.0";
        sha256 = "1j9rrxzzggvajz8laf58nda9hgf5lqsqxxc556690yyliln0gii1";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/joelwilliamson/bimap";
        description = "Bidirectional mapping between two key types";
        license = stdenv.lib.licenses.bsd3;
@@ -24592,7 +25243,7 @@ self: {
        pname = "bimap-server";
        version = "0.1.0.1";
        sha256 = "0dgmiv1pzzrq22778a2l46knxfk5rh2vw331gcqhxx0jb23d3pq9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bimap binary directory http-types unix wai warp
        ];
        description = "Two-column database server";
@@ -24609,7 +25260,7 @@ self: {
        pname = "bimaps";
        version = "0.0.0.2";
        sha256 = "1wipia9lil9r7lhsf9rk82k8ydy5c97qsixg0fia0ms5chmdr7qw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary cereal containers deepseq hashable primitive
          QuickCheck storable-tuple unordered-containers vector
          vector-binary-instances vector-th-unbox
@@ -24628,8 +25279,8 @@ self: {
        pname = "binary";
        version = "0.7.6.1";
        sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg";
-       buildDepends = [ array base bytestring containers ];
-       testDepends = [
+       libraryHaskellDepends = [ array base bytestring containers ];
+       testHaskellDepends = [
          array base bytestring Cabal containers directory filepath HUnit
          QuickCheck random test-framework test-framework-quickcheck2
        ];
@@ -24646,8 +25297,8 @@ self: {
        pname = "binary-bits";
        version = "0.5";
        sha256 = "1577bd5q4lhw024v4hfil10iyx7v4cf72ldhxb8xhm27i80lllqn";
-       buildDepends = [ base binary bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring ];
+       testHaskellDepends = [
          base binary bytestring QuickCheck random test-framework
          test-framework-quickcheck2
        ];
@@ -24661,7 +25312,7 @@ self: {
        pname = "binary-communicator";
        version = "1.0.2.1";
        sha256 = "02w5ybp5fdqwz1ffvfs3pfrpx67bzh75njgzr6iai1vrdyjisfkl";
-       buildDepends = [ base binary bytestring mtl ];
+       libraryHaskellDepends = [ base binary bytestring mtl ];
        jailbreak = true;
        description = "Flexible way to ease transmission of binary data";
        license = stdenv.lib.licenses.bsd3;
@@ -24674,11 +25325,13 @@ self: {
      mkDerivation {
        pname = "binary-conduit";
        version = "1.2.3";
-       revision = "1";
        sha256 = "0ymhxyf754j1pki7ap2vay8f9j49rzsjzp5yr253sn5wpw3qg8fr";
+       revision = "1";
        editedCabalFile = "9cb1c58171575429a65947d1ef7e22c1501b4ca9becc07904c7b4a5066345e29";
-       buildDepends = [ base binary bytestring conduit resourcet vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring conduit resourcet vector
+       ];
+       testHaskellDepends = [
          base binary bytestring conduit hspec QuickCheck
          quickcheck-assertions resourcet
        ];
@@ -24693,7 +25346,7 @@ self: {
        pname = "binary-derive";
        version = "0.1.0";
        sha256 = "1rb4fpx5hlq661md7nrpgpmi7jjdq3r1ky6q9vxl6f72h085acvl";
-       buildDepends = [ base binary ghc-prim ];
+       libraryHaskellDepends = [ base binary ghc-prim ];
        jailbreak = true;
        description = "Automatic deriving of Binary using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
@@ -24708,7 +25361,7 @@ self: {
        pname = "binary-file";
        version = "0.15.24";
        sha256 = "134iigqjwlkj85pdp95xl6ia6fxr9l516j9b0dpg3r0zqi1kzp7i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring monads-tf peggy template-haskell
        ];
        homepage = "https://skami.iocikun.jp/haskell/packages/binary-file";
@@ -24725,7 +25378,7 @@ self: {
        pname = "binary-generic";
        version = "0.2.1";
        sha256 = "0c6gfa1wvrcw4frrqzrfnc5ydqlbs56jq7hnxgzg89mr510mfsgz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 syb text
        ];
        homepage = "http://github.com/lpeterse/binary-generic";
@@ -24739,7 +25392,7 @@ self: {
        pname = "binary-indexed-tree";
        version = "0.1";
        sha256 = "1csbmkwrcfcfydyl2ab6s5bz1fy4fgl14m63zdyi0vy3d17zbl4d";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Binary Indexed Trees (a.k.a. Fenwick Trees).";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24753,7 +25406,7 @@ self: {
        pname = "binary-list";
        version = "1.1.1.0";
        sha256 = "03fh5ipmmjzdyywm28m2kkbxn11yb4ygrs1q2igll1mbmpm2km6x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring deepseq phantom-state transformers
        ];
        description = "Lists of length a power of two";
@@ -24766,7 +25419,7 @@ self: {
        pname = "binary-literal-qq";
        version = "1.0";
        sha256 = "0kbxd2ryls1zhmfg831ls219fn58xa7dq1bca48v7n7075nmh1jm";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "Extends Haskell with binary literals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24777,7 +25430,7 @@ self: {
        pname = "binary-protocol";
        version = "1.0";
        sha256 = "1hn6jc4j20z8ni7rpcyamam898yl6jy7zinrhy2rdjvx0p5br13h";
-       buildDepends = [ base binary bytestring mtl ];
+       libraryHaskellDepends = [ base binary bytestring mtl ];
        jailbreak = true;
        homepage = "http://github.com/gcross/binary-protocol";
        description = "Monad to ease implementing a binary network protocol";
@@ -24792,7 +25445,9 @@ self: {
        sha256 = "14jap6kc1jbr3i010qg2z8d0li09d3a88fwzwrlb750pn67x7amy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring mtl zeromq-haskell ];
+       libraryHaskellDepends = [
+         base binary bytestring mtl zeromq-haskell
+       ];
        homepage = "http://github.com/NicolasT/binary-protocol-zmq";
        description = "Monad to ease implementing a binary network protocol over ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
@@ -24807,8 +25462,10 @@ self: {
        pname = "binary-search";
        version = "0.1";
        sha256 = "02s81jpysgqnnk8c45y9xc2fhy59mm1k2wskrl4hzhdjlp4c65f3";
-       buildDepends = [ base containers ];
-       testDepends = [ base directory doctest filepath hspec QuickCheck ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
+         base directory doctest filepath hspec QuickCheck
+       ];
        description = "Binary and exponential searches";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24819,7 +25476,7 @@ self: {
        pname = "binary-shared";
        version = "0.8.3";
        sha256 = "1clqq0rqjw1v7y6glkjnfyga5gxh768flyw617g47z0qa181c0c3";
-       buildDepends = [ base binary bytestring containers mtl ];
+       libraryHaskellDepends = [ base binary bytestring containers mtl ];
        homepage = "http://www.leksah.org";
        description = "Sharing for the binary package";
        license = "GPL";
@@ -24831,7 +25488,7 @@ self: {
        pname = "binary-state";
        version = "0.1.1";
        sha256 = "06v3qxyl2mvwi3y29rxxf91b2vxvlh5gfznwlnzb4mxzd00aakgl";
-       buildDepends = [ base binary bytestring containers mtl ];
+       libraryHaskellDepends = [ base binary bytestring containers mtl ];
        description = "Simple wrapper around Data.Binary, which adds StateT to Get/Put monads.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24845,11 +25502,11 @@ self: {
        pname = "binary-store";
        version = "0.1.0.1";
        sha256 = "1wjhc18zj6p5gy15y1b7gz0vlqdbwhmfyv82l55ggmzjv1qyv7rl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary binary-list binary-transform bytestring bzlib deepseq
          reinterpret-cast
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary-list QuickCheck tasty tasty-quickcheck
        ];
        jailbreak = true;
@@ -24866,8 +25523,8 @@ self: {
        pname = "binary-streams";
        version = "0.1.0.1";
        sha256 = "1kjf5ks9l7fs0fsmwk5bcyhxlrz22hi4315bqqx2jzyq6pnwf4mv";
-       buildDepends = [ base binary bytestring io-streams ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring io-streams ];
+       testHaskellDepends = [
          base binary bytestring Cabal cabal-test-quickcheck io-streams
          QuickCheck
        ];
@@ -24883,7 +25540,7 @@ self: {
        pname = "binary-strict";
        version = "0.4.8.2";
        sha256 = "0cyrr45wpq5h4gg6qms54nmvhqpyj59d5bhlk316g4yjsf3484b7";
-       buildDepends = [ array base bytestring containers mtl ];
+       libraryHaskellDepends = [ array base bytestring containers mtl ];
        jailbreak = true;
        homepage = "https://github.com/idontgetoutmuch/binary-low-level";
        description = "Binary deserialisation using strict ByteStrings";
@@ -24899,8 +25556,8 @@ self: {
        pname = "binary-typed";
        version = "0.3";
        sha256 = "12yzgcrj528pss4jk753xmcrzv2qm70dacqjnx7460bcdsmyd6zy";
-       buildDepends = [ base binary bytestring murmur-hash ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring murmur-hash ];
+       testHaskellDepends = [
          base binary bytestring tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/quchen/binary-typed";
@@ -24914,7 +25571,7 @@ self: {
        pname = "binarydefer";
        version = "1.2.2";
        sha256 = "06q255kip3j31bmj01fqkikvjxbklvcaa1kv3al8v04nkqx6rg3p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Binary serialization with deferred loading";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24928,7 +25585,7 @@ self: {
        pname = "bind-marshal";
        version = "0.1";
        sha256 = "13riawcdzwr97vmixvg2wf8aysxblzik2mvkrp2gqf9ywda9ksr6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim monads-tf mtl
          numeric-prelude random stm strict transformers type-level-tf unix
        ];
@@ -24944,11 +25601,11 @@ self: {
      mkDerivation {
        pname = "binding-core";
        version = "0.2.2";
-       revision = "1";
        sha256 = "0qr7nr9cksy2cx2h8g2d485797hvv67197c654va0xwadkj5iviz";
+       revision = "1";
        editedCabalFile = "1aeacdf0ebf89a2f515ab0ef767ed86f44b4b22f740ac23d1afd76df391955c6";
-       buildDepends = [ base stm ];
-       testDepends = [ base HTF HUnit QuickCheck random ];
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [ base HTF HUnit QuickCheck random ];
        homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding";
        license = stdenv.lib.licenses.bsd3;
@@ -24959,11 +25616,11 @@ self: {
      mkDerivation {
        pname = "binding-gtk";
        version = "0.2.1";
-       revision = "1";
        sha256 = "0l68n13w1khfqkc791l9mcnk3cb0565a9ysfn7b3hh5cjx8zi7vr";
+       revision = "1";
        editedCabalFile = "9e435774bd5d6a7d9dd1e96dd9293d6a739f7ecde23838571d30866ac4628cb5";
-       buildDepends = [ base binding-core gtk mtl ];
-       testDepends = [ base binding-core directory gtk ];
+       libraryHaskellDepends = [ base binding-core gtk mtl ];
+       testHaskellDepends = [ base binding-core directory gtk ];
        homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in Gtk2Hs";
        license = stdenv.lib.licenses.bsd3;
@@ -24975,11 +25632,11 @@ self: {
      mkDerivation {
        pname = "binding-wx";
        version = "0.2.1";
-       revision = "1";
        sha256 = "07nbb6a0fmyhmx2dakkw4msxnv273hfcw3swdk3aczpfqlxd1r4i";
+       revision = "1";
        editedCabalFile = "0307431866ac8b7f34ece32a684a3c70aa1b36ce74c05d815f249d1effe2efb2";
-       buildDepends = [ base binding-core stm wx wxcore ];
-       testDepends = [ base binding-core directory wx ];
+       libraryHaskellDepends = [ base binding-core stm wx wxcore ];
+       testHaskellDepends = [ base binding-core directory wx ];
        homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
@@ -24991,7 +25648,7 @@ self: {
        pname = "bindings";
        version = "0.1.2";
        sha256 = "0zczf1yfjnfzdzv33j33vcc71zsf88a5qxsdmswxrpzika3rs6i0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Deprecated package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25002,7 +25659,7 @@ self: {
        pname = "bindings-DSL";
        version = "1.0.22";
        sha256 = "0xkr1x3klpfwbh1yimah1dqmqcilifyblnf3kr6ay4gsvw74zkwr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
        description = "FFI domain specific language, on top of hsc2hs";
        license = stdenv.lib.licenses.bsd3;
@@ -25014,8 +25671,8 @@ self: {
        pname = "bindings-EsounD";
        version = "0.1.0.1";
        sha256 = "0fl7gdh60k7wj3bnn5hpgsi0kkji857xb47spii7mrip5p4m8pff";
-       buildDepends = [ base bindings-audiofile bindings-DSL ];
-       pkgconfigDepends = [ esound ];
+       libraryHaskellDepends = [ base bindings-audiofile bindings-DSL ];
+       libraryPkgconfigDepends = [ esound ];
        homepage = "http://cielonegro.org/Bindings-EsounD.html";
        description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
@@ -25031,12 +25688,14 @@ self: {
        pname = "bindings-GLFW";
        version = "3.1.1.3";
        sha256 = "0pzhlzx8h5g3cs7wr06zydabprlrf5sgdvdqmr2wg10azikxc12z";
-       buildDepends = [ base bindings-DSL ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
-       extraLibraries = [
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [
          libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr
          libXxf86vm mesa
        ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        description = "Low-level bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs.xlibs) libXcursor;
@@ -25051,8 +25710,8 @@ self: {
        pname = "bindings-K8055";
        version = "0.1.2";
        sha256 = "0daga3vh9x9gih25qgcsl0hafi4hw8h5x64ba6wbmywa9z3hrr20";
-       buildDepends = [ base ];
-       extraLibraries = [ K8055D ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ K8055D ];
        homepage = "https://github.com/jputcu/bindings-K8055";
        description = "Bindings to Velleman K8055 dll";
        license = stdenv.lib.licenses.bsd3;
@@ -25065,8 +25724,8 @@ self: {
        pname = "bindings-apr";
        version = "0.1";
        sha256 = "0fw71z74pv8dxw301iss66kmarhlgwj2lpsy0skmlqfkg98zc96k";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ apr-1 ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ apr-1 ];
        jailbreak = true;
        homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime (APR)";
@@ -25080,8 +25739,8 @@ self: {
        pname = "bindings-apr-util";
        version = "0.1";
        sha256 = "0sr041vpakklpf2mmy78wl5wl8yzfbwvsy07wlplmlh5rgjdm4wx";
-       buildDepends = [ base bindings-apr bindings-DSL ];
-       pkgconfigDepends = [ apr-util-1 ];
+       libraryHaskellDepends = [ base bindings-apr bindings-DSL ];
+       libraryPkgconfigDepends = [ apr-util-1 ];
        jailbreak = true;
        homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
@@ -25095,8 +25754,8 @@ self: {
        pname = "bindings-audiofile";
        version = "0.1.0.2";
        sha256 = "0ls0iy33i0b86fg7hx23s1d8ypa16bdiw3l8nmsni3zgnn67w6mj";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ audiofile ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ audiofile ];
        homepage = "http://cielonegro.org/Bindings-AudioFile.html";
        description = "Low level bindings to audiofile";
        license = stdenv.lib.licenses.publicDomain;
@@ -25110,9 +25769,9 @@ self: {
        pname = "bindings-bfd";
        version = "1.2.0.0";
        sha256 = "0c05zr3k0az2hfyfync8z2sgdxx6gskqdb1n548fjc986cx298q4";
-       buildDepends = [ array base containers unix ];
-       buildTools = [ alex happy ];
-       extraLibraries = [ bfd opcodes ];
+       libraryHaskellDepends = [ array base containers unix ];
+       librarySystemDepends = [ bfd opcodes ];
+       libraryToolDepends = [ alex happy ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/bindings-bfd/";
        description = "Bindings for libbfd, a library of the GNU `binutils'";
@@ -25126,8 +25785,8 @@ self: {
        pname = "bindings-cctools";
        version = "3.6.1.0.1.0.0.1";
        sha256 = "1k0p0m09ndk6c42h3yy230q86fnm0hzr1zjr3871f9hapvnvzqr8";
-       buildDepends = [ bindings-DSL ];
-       extraLibraries = [ dttools ];
+       libraryHaskellDepends = [ bindings-DSL ];
+       librarySystemDepends = [ dttools ];
        homepage = "http://bitbucket.org/badi/bindings-cctools";
        description = "Bindings to the CCTools WorkQueue C library";
        license = stdenv.lib.licenses.gpl2;
@@ -25141,13 +25800,14 @@ self: {
      mkDerivation {
        pname = "bindings-codec2";
        version = "0.1.1.0";
-       revision = "1";
        sha256 = "0mpb79djfqi0had6rx20jsgahdfv23bnp0i25lbxv8vg72m3wdnn";
+       revision = "1";
        editedCabalFile = "48e69a5b497247c96ab7a6ed3ff818bef596c712249819e63a84c4667ef5d0b1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bindings-DSL bytestring split ];
-       extraLibraries = [ codec2 ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ codec2 ];
+       executableHaskellDepends = [ base binary bytestring split ];
        homepage = "https://github.com/relrod/bindings-codec2";
        description = "Very low-level FFI bindings for Codec2";
        license = stdenv.lib.licenses.gpl2;
@@ -25160,7 +25820,7 @@ self: {
        pname = "bindings-common";
        version = "1.3.4";
        sha256 = "1zbm8v5xp4pay6h0y24ngf8nw96ab0zr754b9n2zczadiarccmcb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "This package is obsolete. Look for bindings-DSL instead.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25172,9 +25832,9 @@ self: {
        pname = "bindings-dc1394";
        version = "0.2.1";
        sha256 = "06xg2amlcqldb7h0xaw8dvzq65npirsibbgmbr5n8s59rwa6hfwq";
-       buildDepends = [ base bindings-DSL ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ dc1394 ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ dc1394 ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/aleator/bindings-dc1394";
        description = "Library for using firewire (iidc-1394) cameras";
        license = stdenv.lib.licenses.bsd3;
@@ -25187,8 +25847,8 @@ self: {
        pname = "bindings-directfb";
        version = "0.1";
        sha256 = "0mmba1h9in9xh590nmr1vb5ccqng3nwdc4q0b9d67v22cmc7fhpp";
-       buildDepends = [ base bindings-DSL bindings-posix ];
-       pkgconfigDepends = [ directfb ];
+       libraryHaskellDepends = [ base bindings-DSL bindings-posix ];
+       libraryPkgconfigDepends = [ directfb ];
        description = "Low level bindings to DirectFB";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) directfb;};
@@ -25199,9 +25859,9 @@ self: {
        pname = "bindings-eskit";
        version = "0.0.1";
        sha256 = "0j0fi74ky1qdvkgbapyq8fag2linawz3ndgzgi8lcci8lsby0n72";
-       buildDepends = [ array base bindings-DSL ];
-       extraLibraries = [ eskit ];
-       pkgconfigDepends = [ eskit ];
+       libraryHaskellDepends = [ array base bindings-DSL ];
+       librarySystemDepends = [ eskit ];
+       libraryPkgconfigDepends = [ eskit ];
        jailbreak = true;
        homepage = "http://github.com/a1kmm/bindings-eskit";
        description = "Bindings to ESKit";
@@ -25215,8 +25875,8 @@ self: {
        pname = "bindings-fann";
        version = "0.0.2";
        sha256 = "1hryjj9aabaxrcgmr3i6sklbyb58djzsrlssidgll3vb0wwcgbq7";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ fann ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ fann ];
        description = "Low level bindings to FANN neural network library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25228,8 +25888,8 @@ self: {
        pname = "bindings-fluidsynth";
        version = "0.1.1";
        sha256 = "04q5zxv4iyjb7zf7bhx19cfc8nhnqxmxnl1q63qszjysmlpy39g5";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ fluidsynth ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ fluidsynth ];
        homepage = "http://github.com/bgamari/bindings-fluidsynth";
        description = "Haskell FFI bindings for fluidsynth software synthesizer";
        license = stdenv.lib.licenses.bsd3;
@@ -25241,8 +25901,8 @@ self: {
        pname = "bindings-friso";
        version = "0.1.0.0";
        sha256 = "0wg120qrqqf2g38ifjkwj5cc42sdcdn2lrs93wrdq9dd7kldn79c";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ friso ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ friso ];
        description = "Low level bindings for friso";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25254,8 +25914,8 @@ self: {
        pname = "bindings-glib";
        version = "0.1.5";
        sha256 = "0jhifzbwbphlzz9ffv3pyjv27phvcvky1gczmi9kvfz761b9qgyx";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ glib ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings to GLib";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) glib;};
@@ -25266,8 +25926,8 @@ self: {
        pname = "bindings-gobject";
        version = "0.4";
        sha256 = "1r2cg06r068nfyppjs2kwfmam7vk5x0l4f865arrrgrqam3bs1av";
-       buildDepends = [ base bindings-DSL bindings-glib ];
-       pkgconfigDepends = [ glib ];
+       libraryHaskellDepends = [ base bindings-DSL bindings-glib ];
+       libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings supporting GObject and derived libraries";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) glib;};
@@ -25278,8 +25938,8 @@ self: {
        pname = "bindings-gpgme";
        version = "0.1.6";
        sha256 = "0mwlb1fk852pk6an3ay9mgxmxqf6f6bzm965agm80yhr2ab3iqhq";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ gpgme ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ gpgme ];
        homepage = "http://bitbucket.org/mauricio/bindings-gpgme";
        description = "Project bindings-* raw interface to gpgme";
        license = stdenv.lib.licenses.bsd3;
@@ -25291,8 +25951,8 @@ self: {
        pname = "bindings-gsl";
        version = "0.2.1";
        sha256 = "0yv0k6r2pd4bbq0qsf6wfx752qn0d2d0s3jfa633gy6sg97j2n3y";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ gsl ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) gsl;};
@@ -25303,8 +25963,8 @@ self: {
        pname = "bindings-gts";
        version = "0.1.1";
        sha256 = "1niqkxw7wxircwgvd9z4q9j3jxswifhl0h88v3j35lbxhiz6v7kh";
-       buildDepends = [ base bindings-DSL bindings-glib ];
-       pkgconfigDepends = [ gts ];
+       libraryHaskellDepends = [ base bindings-DSL bindings-glib ];
+       libraryPkgconfigDepends = [ gts ];
        description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25315,13 +25975,14 @@ self: {
      mkDerivation {
        pname = "bindings-hamlib";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "1na9v5s5lqdnnj031zmqg3xfpsvy80gzr7qg0f3gsyyniww72xlz";
+       revision = "1";
        editedCabalFile = "1eea9735be1dd9f54d91406fbf56da41b8d68a3760ada5e4fc4caf0658c997c9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ hamlib ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ hamlib ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/relrod/hamlib-haskell";
        description = "Hamlib bindings for Haskell";
        license = stdenv.lib.licenses.lgpl21;
@@ -25333,7 +25994,7 @@ self: {
        pname = "bindings-hdf5";
        version = "0.1";
        sha256 = "0x6p1mwwnpcd5bd6iy4di11n7b45c4zp9d6l957mmhsyg24h2n79";
-       buildDepends = [ base bindings-DSL ];
+       libraryHaskellDepends = [ base bindings-DSL ];
        description = "Project bindings-* raw interface to HDF5 library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25345,12 +26006,11 @@ self: {
        pname = "bindings-levmar";
        version = "1.1.0.3";
        sha256 = "1da9n88wwjpm3ph7q73niv3cslpa0h8r0lsyfl35arymxfqpb4c0";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ blas lapack ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ blas lapack ];
        homepage = "https://github.com/basvandijk/bindings-levmar";
        description = "Low level bindings to the C levmar (Levenberg-Marquardt) library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) blas;  lapack = null;};
 
   "bindings-libcddb" = callPackage
@@ -25359,8 +26019,8 @@ self: {
        pname = "bindings-libcddb";
        version = "0.3";
        sha256 = "1hygdr4w27igwc513vs7rc9i2xcmr1ndvbiwhkrdw2x0wsmz6yyy";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ libcddb ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ libcddb ];
        homepage = "http://bitbucket.org/mauricio/bindings-libcddb";
        description = "Low level binding to libcddb";
        license = stdenv.lib.licenses.bsd3;
@@ -25372,8 +26032,8 @@ self: {
        pname = "bindings-libffi";
        version = "0.3";
        sha256 = "1321hr92nsa7fljxxir8waj7i42m8dvz76h693vp4n3lqll9hcf9";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ libffi ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ libffi ];
        description = "Low level bindings to libffi";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) libffi;};
@@ -25384,8 +26044,8 @@ self: {
        pname = "bindings-libftdi";
        version = "0.1";
        sha256 = "07kabkvdjiskika9vddrf9vhknld1x9s4m3b89d9m6l4gb2ln76i";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ libftdi libusb ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ libftdi libusb ];
        description = "Low level bindings to libftdi";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25397,8 +26057,8 @@ self: {
        pname = "bindings-librrd";
        version = "0.2.0.1";
        sha256 = "1dyhq06rs91g77c67lfnscn7l9fgbzikiqnv2d494jd60y1q8n8y";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ librrd ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ librrd ];
        homepage = "http://cielonegro.org/Bindings-librrd.html";
        description = "Low level bindings to RRDtool";
        license = stdenv.lib.licenses.publicDomain;
@@ -25413,8 +26073,10 @@ self: {
        pname = "bindings-libstemmer";
        version = "0.1.0.0";
        sha256 = "03plarpy0fpv9anqnaqwcji3vij2qrxd4qmli77jb5npmax20r92";
-       buildDepends = [ base bindings-DSL resourcet transformers ];
-       extraLibraries = [ stemmer ];
+       libraryHaskellDepends = [
+         base bindings-DSL resourcet transformers
+       ];
+       librarySystemDepends = [ stemmer ];
        description = "Binding for libstemmer with low level binding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25426,8 +26088,8 @@ self: {
        pname = "bindings-libusb";
        version = "1.4.5.0";
        sha256 = "0xnx9p6wqbwiaqigdnf7x6vd0qq7w9wm0vxsh93adpb5wdpjza66";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ libusb ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ libusb ];
        homepage = "https://github.com/basvandijk/bindings-libusb";
        description = "Low level bindings to libusb";
        license = stdenv.lib.licenses.bsd3;
@@ -25439,8 +26101,8 @@ self: {
        pname = "bindings-libv4l2";
        version = "0.1";
        sha256 = "0s31dh5g26nldb6aq6q4i6ypgajincw7n3d3vm838x3w320qvg2g";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ v4l2 ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ v4l2 ];
        homepage = "https://gitorious.org/hsv4l2";
        description = "bindings to libv4l2 for Linux";
        license = stdenv.lib.licenses.bsd3;
@@ -25453,8 +26115,8 @@ self: {
        pname = "bindings-libzip";
        version = "0.11";
        sha256 = "0hqkp4hvav67xqjfwbik3i06vq8f78jjzf37ncl6wwcw5w65hhrj";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ libzip ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ libzip ];
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Low level bindings to libzip";
        license = stdenv.lib.licenses.bsd3;
@@ -25466,7 +26128,7 @@ self: {
        pname = "bindings-linux-videodev2";
        version = "0.1";
        sha256 = "1pqi8ks441m1s1md6nhjr7zhal5fv6s71xq4881zijd539qhq9dq";
-       buildDepends = [ base bindings-DSL ioctl ];
+       libraryHaskellDepends = [ base bindings-DSL ioctl ];
        homepage = "https://gitorious.org/hsv4l2";
        description = "bindings to Video For Linux Two (v4l2) kernel interfaces";
        license = stdenv.lib.licenses.bsd3;
@@ -25479,8 +26141,8 @@ self: {
        pname = "bindings-lxc";
        version = "0.2.0.1";
        sha256 = "0w61xzx8krr1pfa9ys7akpra2r0njziysm3ri08fb98g75hp9942";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ lxc ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ lxc ];
        jailbreak = true;
        homepage = "https://github.com/fizruk/bindings-lxc";
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
@@ -25493,7 +26155,7 @@ self: {
        pname = "bindings-mmap";
        version = "1.0";
        sha256 = "19qdf5z6mf8j8inlnax0nv1wiv4va27z4a303hpkbgda459093nd";
-       buildDepends = [ bindings-posix ];
+       libraryHaskellDepends = [ bindings-posix ];
        description = "(deprecated) see bindings-posix instead";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25504,7 +26166,7 @@ self: {
        pname = "bindings-mpdecimal";
        version = "0.8.0.0";
        sha256 = "18i68ivsrdndjpfnyq6dlmmkkx22v3rp619nm26af8ka3qai12j5";
-       buildDepends = [ base bindings-DSL ];
+       libraryHaskellDepends = [ base bindings-DSL ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/bindings-mpdecimal";
        description = "bindings to mpdecimal library";
@@ -25520,15 +26182,14 @@ self: {
        pname = "bindings-nettle";
        version = "0.4";
        sha256 = "11fnyjxb6gvl2mfnsahzadd5xj0y1p25n98qbhrkzziaihsf01ph";
-       buildDepends = [ base bindings-DSL ];
-       testDepends = [
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ nettle ];
+       testHaskellDepends = [
          base bytestring hspec HUnit QuickCheck quickcheck-io
        ];
-       pkgconfigDepends = [ nettle ];
        homepage = "http://floss.scru.org/bindings-nettle";
        description = "bindings to nettle crypto library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) nettle;};
 
   "bindings-parport" = callPackage
@@ -25537,7 +26198,7 @@ self: {
        pname = "bindings-parport";
        version = "0.0.4";
        sha256 = "1q404clpqzv0gik80ycipl94hvj27397z5cw1cs7b0yxlypllg3j";
-       buildDepends = [ base bindings-DSL ];
+       libraryHaskellDepends = [ base bindings-DSL ];
        description = "parport bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25548,8 +26209,8 @@ self: {
        pname = "bindings-portaudio";
        version = "0.1";
        sha256 = "0wcxq300ijfkf4zc7p4xwsd9wzhnlss0kxjf04fka01mf9bh3ai2";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ portaudio ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) portaudio;};
@@ -25560,7 +26221,7 @@ self: {
        pname = "bindings-posix";
        version = "1.2.6";
        sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff";
-       buildDepends = [ base bindings-DSL ];
+       libraryHaskellDepends = [ base bindings-DSL ];
        description = "Low level bindings to posix";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25571,8 +26232,8 @@ self: {
        pname = "bindings-potrace";
        version = "0.1";
        sha256 = "0vb889f49li0lwy3zsji0f1cwzriizh9x6kg3r8676q5j08p7znd";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ potrace ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ potrace ];
        homepage = "https://github.com/rwbarton/bindings-potrace";
        description = "Low-level bindings to the potrace bitmap tracing library";
        license = stdenv.lib.licenses.gpl2;
@@ -25584,7 +26245,7 @@ self: {
        pname = "bindings-ppdev";
        version = "0.0.3";
        sha256 = "18px429hplpabfhapwasbdgw8ynfm3vr5rf81pp173j1z0bv4ygq";
-       buildDepends = [ base bindings-DSL ioctl ];
+       libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "PPDev bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25599,7 +26260,10 @@ self: {
        sha256 = "11k56zsz1fg0hb0pqamq2hh3gczzqgj105qss5xrk0cgmsphhbmy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory filepath process unix
+       ];
+       executableHaskellDepends = [
          base cmdargs containers directory filepath process text unix
        ];
        homepage = "https://github.com/michelk/bindings-saga-cmd.hs";
@@ -25613,8 +26277,8 @@ self: {
        pname = "bindings-sane";
        version = "0.0.1";
        sha256 = "0jxhc0x5hq6y7iznqlxbgnl37a7k8yki2ri475gyc158d47b0zm2";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ saneBackends ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ saneBackends ];
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.gpl3;
@@ -25626,8 +26290,8 @@ self: {
        pname = "bindings-sc3";
        version = "0.4.1";
        sha256 = "07vp6hzjjrbh3j152mq8f1i6xh9m2r20a555y03p9fzdfrb5kixd";
-       buildDepends = [ base bindings-DSL ];
-       extraLibraries = [ scsynth ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       librarySystemDepends = [ scsynth ];
        homepage = "https://github.com/kaoskorobase/bindings-sc3/";
        description = "Low-level bindings to the SuperCollider synthesis engine library";
        license = "GPL";
@@ -25642,8 +26306,9 @@ self: {
        sha256 = "1r2akdkhw054k6vg9a7jpm9ck280lsfkizz7y6cqbn1hy463grkd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       extraLibraries = [ sipc ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ sipc ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/justinethier/hs-bindings-sipc";
        description = "Low level bindings to SIPC";
        license = "LGPL";
@@ -25656,7 +26321,7 @@ self: {
        pname = "bindings-sophia";
        version = "0.2.0.2";
        sha256 = "0fiibm7nrsx9pzi2lvhhbw71bah6s22h3jvn417ng3lj6ghhzii6";
-       buildDepends = [ base bindings-DSL ];
+       libraryHaskellDepends = [ base bindings-DSL ];
        description = "Low-level bindings to sophia library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25667,8 +26332,8 @@ self: {
        pname = "bindings-sqlite3";
        version = "1.0.3";
        sha256 = "0f30a7xdx50gs7hdv16b3m2055f0ar5c2cani318iwympnrpgww1";
-       buildDepends = [ base bindings-DSL ];
-       pkgconfigDepends = [ sqlite ];
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ sqlite ];
        description = "Low level bindings to sqlite3";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) sqlite;};
@@ -25679,7 +26344,7 @@ self: {
        pname = "bindings-svm";
        version = "0.2.1";
        sha256 = "1nnmyxn28qdfy2sclnxv2mf2d426vrzgs7f0vvqri6fkjnvmk11b";
-       buildDepends = [ base bindings-DSL ];
+       libraryHaskellDepends = [ base bindings-DSL ];
        homepage = "http://github.com/tanimoto/bindings-svm";
        description = "Low level bindings to libsvm";
        license = stdenv.lib.licenses.bsd3;
@@ -25691,7 +26356,7 @@ self: {
        pname = "bindings-uname";
        version = "0.1";
        sha256 = "1lsw4dh5vgmfvrx62ns5kmngzlmjzbxkx43x5i2k5qlmzp1pa3hk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Low-level binding to POSIX uname(3)";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -25702,8 +26367,8 @@ self: {
        pname = "bindings-yices";
        version = "0.2";
        sha256 = "13yfhx6krj59qij9yvcl4fr6znd28nbldbv0qfhf83h3h18araf9";
-       buildDepends = [ base ];
-       extraLibraries = [ gmp yices ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ gmp yices ];
        description = "Bindings to the Yices theorem prover";
        license = stdenv.lib.licenses.publicDomain;
      }) { inherit (pkgs) gmp;  inherit (pkgs) yices;};
@@ -25718,8 +26383,9 @@ self: {
        sha256 = "163cs2qfj68dvbsyfg37hzb29jp0ylfpqlnhzjswm4j8mrcfsl3r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring Cabal containers directory dlist filepath
+       libraryHaskellDepends = [ base bytestring Cabal ];
+       executableHaskellDepends = [
+         base containers directory dlist filepath
        ];
        homepage = "http://code.mathr.co.uk/binembed";
        description = "Embed data into object files";
@@ -25735,7 +26401,9 @@ self: {
        sha256 = "06lw6jvg382k3wj8ybld05bj3nchb8dqk363a69mak3r5zxg43iy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binembed bytestring containers filepath ];
+       executableHaskellDepends = [
+         base binembed bytestring containers filepath
+       ];
        homepage = "http://code.mathr.co.uk/binembed";
        description = "Example project using binembed to embed data in object files";
        license = stdenv.lib.licenses.bsd3;
@@ -25752,9 +26420,12 @@ self: {
        sha256 = "1vby3nbqbwza65jg5d0bmzh22i5s20cjbqdgaq9zasza7ywgkj22";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base binary bytestring containers directory mtl old-time
-         parallel parsec process QuickCheck random tagsoup
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory mtl parallel
+         parsec QuickCheck tagsoup
+       ];
+       executableHaskellDepends = [
+         base bytestring containers old-time process QuickCheck random
        ];
        jailbreak = true;
        homepage = "http://biohaskell.org/Libraries/Bio";
@@ -25769,7 +26440,9 @@ self: {
        pname = "bioace";
        version = "0.0.1";
        sha256 = "08k2w66gpysjk038pi50lc21gbn2dyp5z8ls0qhcmjqc59dn8hvg";
-       buildDepends = [ base bioalign biocore bytestring parsec ];
+       libraryHaskellDepends = [
+         base bioalign biocore bytestring parsec
+       ];
        homepage = "https://patch-tag.com/r/dfornika/bioace/home";
        description = "Library for reading ace assembly files";
        license = "GPL";
@@ -25781,7 +26454,7 @@ self: {
        pname = "bioalign";
        version = "0.0.5";
        sha256 = "006gg8ds6klrl9rc1csi247rf8gzlgn9mdi0jl4pjz5xmf0jw5dr";
-       buildDepends = [ base biocore bytestring ];
+       libraryHaskellDepends = [ base biocore bytestring ];
        homepage = "https://patch-tag.com/r/dfornika/biophd/home";
        description = "Data structures and helper functions for calculating alignments";
        license = "GPL";
@@ -25793,7 +26466,7 @@ self: {
        pname = "biocore";
        version = "0.3.1";
        sha256 = "06ml9p144bv0c9hv6pkcvhdgc0vw0jxzbqb834ilr38kjmrpsar1";
-       buildDepends = [ base bytestring stringable ];
+       libraryHaskellDepends = [ base bytestring stringable ];
        description = "A bioinformatics library";
        license = "LGPL";
      }) {};
@@ -25804,7 +26477,7 @@ self: {
        pname = "biofasta";
        version = "0.0.3";
        sha256 = "1l770sg2gcg7wl5yfrrk9nr7hgd5m0q158ad5nd8z7i5vsfah8b2";
-       buildDepends = [ base biocore bytestring ];
+       libraryHaskellDepends = [ base biocore bytestring ];
        homepage = "https://patch-tag.com/r/dfornika/biofasta/home";
        description = "Library for reading fasta sequence files";
        license = "GPL";
@@ -25816,7 +26489,7 @@ self: {
        pname = "biofastq";
        version = "0.1";
        sha256 = "0453cb2sw6x9hx3z7w3fvymwi0l0s86wlvi6vvsh0jcwas3iirbl";
-       buildDepends = [ base biocore bytestring ];
+       libraryHaskellDepends = [ base biocore bytestring ];
        homepage = "http://biohaskell.org/";
        description = "A library for reading FASTQ files";
        license = "LGPL";
@@ -25830,7 +26503,7 @@ self: {
        pname = "biophd";
        version = "0.0.8";
        sha256 = "0p3xfv61xzz29qg660pcsgns7r5q1cybk3hdvdnwf0cqdc9fhxbl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary biocore bytestring parsec text time time-locale-compat
        ];
        homepage = "https://github.com/dfornika/biophd/wiki";
@@ -25849,9 +26522,8 @@ self: {
        sha256 = "1v9vg9gnrf606raqlzcd15irg60v3cf5m0yy5qsdyxm24102bgmj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base biocore bytestring cmdargs unordered-containers
-       ];
+       libraryHaskellDepends = [ base biocore bytestring ];
+       executableHaskellDepends = [ cmdargs unordered-containers ];
        homepage = "http://biohaskell.org/";
        description = "Library and executables for working with PSL files";
        license = "LGPL";
@@ -25867,9 +26539,8 @@ self: {
        sha256 = "1mxsqxcf5sh37gpfqil499i9n8wi3sk5sl2cx6x6agbc0n726bwq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base binary biocore bytestring cmdargs mtl
-       ];
+       libraryHaskellDepends = [ array base binary biocore bytestring ];
+       executableHaskellDepends = [ array base cmdargs mtl ];
        homepage = "http://biohaskell.org/";
        description = "Library and executables for working with SFF files";
        license = stdenv.lib.licenses.lgpl21;
@@ -25886,11 +26557,11 @@ self: {
        pname = "biostockholm";
        version = "0.3.4";
        sha256 = "04k7cl8fjsi2mv60p2qg2nmy86z2adw9gzjnkxffqsc1q85y4lz7";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-conduit base biocore blaze-builder
          blaze-builder-conduit bytestring conduit containers deepseq
        ];
-       testDepends = [
+       testHaskellDepends = [
          base biocore bytestring conduit containers hspec HUnit QuickCheck
          transformers zlib-conduit
        ];
@@ -25911,7 +26582,7 @@ self: {
        sha256 = "0w380dcpk8gp5cx24nh6xlnibd6pw93wmxcajl26p4kd5cxbgfqz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default hack hack-handler-happstack
          haskell98 MissingH mtl parsec process rallod
        ];
@@ -25929,8 +26600,8 @@ self: {
        pname = "bit-array";
        version = "0.1.0";
        sha256 = "0v04drr3m3096shp70l4iwqzva45szjhfl1yzaqblvn49hky8kns";
-       buildDepends = [ base loch-th numeric-qq placeholders ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ base loch-th numeric-qq placeholders ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/bit-array";
        description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types";
@@ -25946,8 +26617,8 @@ self: {
        pname = "bit-vector";
        version = "0.2.0";
        sha256 = "1h3hm1akbj2qzl3df877hfgz3fanhvrj6czxvjbpcalpf3d6h5z1";
-       buildDepends = [ base vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
        homepage = "https://github.com/acfoltzer/bit-vector";
@@ -25961,7 +26632,7 @@ self: {
        pname = "bitarray";
        version = "0.0.1.1";
        sha256 = "00nqd62cbh42qqqvcl6iv1i9kbv0f0mkiygv4j70wfh5cl86yzxj";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Mutable and immutable bit arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -25977,12 +26648,12 @@ self: {
        pname = "bitcoin-api";
        version = "0.12.1";
        sha256 = "0c1ydggik4k3vj93bqk53privyblkwhd32jizw25qk5j34axwy69";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base58string binary bitcoin-block bitcoin-script
          bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text
          unordered-containers wreq
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base58string bitcoin-script bitcoin-tx bytestring hspec
          http-client lens text wreq
        ];
@@ -26000,11 +26671,11 @@ self: {
        pname = "bitcoin-api-extra";
        version = "0.9.1";
        sha256 = "1z6pppjgq6sy4q78k176pnr6y3lq369brqf0pg90v0qggl0cc8y4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bitcoin-api bitcoin-block bitcoin-tx bytestring conduit
          lens stm stm-chans stm-conduit text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bitcoin-api bitcoin-tx bytestring conduit hspec http-client
          lens text wreq
        ];
@@ -26021,11 +26692,11 @@ self: {
        pname = "bitcoin-block";
        version = "0.13.1";
        sha256 = "0nkx86fwv65x9vz6ni6qgz61afnvcifw2g92bnwdli8hww7prxfp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bitcoin-tx bitcoin-types bytestring cryptohash
          hexstring largeword lens
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bitcoin-tx bitcoin-types bytestring hexstring hspec
        ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -26043,11 +26714,11 @@ self: {
        pname = "bitcoin-rpc";
        version = "0.5.0.1";
        sha256 = "0bx54033w0yjb2isd7cvnd46qz3nqs7z6flw0mb1nkd81sdxbhp2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal containers ghc-prim HTTP
          mtl network text unix unordered-containers watchdog
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring cereal containers ghc-prim HTTP
          HUnit mtl network QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text unix unordered-containers watchdog
@@ -26066,8 +26737,10 @@ self: {
        pname = "bitcoin-script";
        version = "0.11.1";
        sha256 = "0k3v35p6qpgh88gc5rqpcmh202xrn2rind9641dinwqqx631v31r";
-       buildDepends = [ base base16-bytestring binary bytestring text ];
-       testDepends = [ base bytestring hspec ];
+       libraryHaskellDepends = [
+         base base16-bytestring binary bytestring text
+       ];
+       testHaskellDepends = [ base bytestring hspec ];
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Compilation, manipulation and decompilation of Bitcoin scripts";
        license = stdenv.lib.licenses.mit;
@@ -26081,11 +26754,13 @@ self: {
        pname = "bitcoin-tx";
        version = "0.13.1";
        sha256 = "006c55l6q6cknxw0k0kzr8vkv8azapfb4mkax6ac6rih6mjq5f1v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bitcoin-script bitcoin-types bytestring cryptohash
          hexstring lens
        ];
-       testDepends = [ base bitcoin-script bytestring hexstring hspec ];
+       testHaskellDepends = [
+         base bitcoin-script bytestring hexstring hspec
+       ];
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Utility functions for manipulating bitcoin transactions";
        license = stdenv.lib.licenses.mit;
@@ -26099,10 +26774,12 @@ self: {
        pname = "bitcoin-types";
        version = "0.9.2";
        sha256 = "02y4svhcsml37p78g4cm97kyigcakgf4hds4bxnp0r4ba1498bxp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base58string binary bytestring hexstring text
        ];
-       testDepends = [ base base58string bytestring hexstring hspec ];
+       testHaskellDepends = [
+         base base58string bytestring hexstring hspec
+       ];
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Provides consistent low-level types used commonly among Bitcoin implementations";
        license = stdenv.lib.licenses.mit;
@@ -26116,7 +26793,9 @@ self: {
        sha256 = "0g63lg3599clbn4xcg9kcak6hs4877dwj00607c5gyh5x4d2c21d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Bitly directory filepath regexpr ];
+       executableHaskellDepends = [
+         base Bitly directory filepath regexpr
+       ];
        jailbreak = true;
        homepage = "http://bitbucket.org/jetxee/hs-bitly/";
        description = "A command line tool to access bit.ly URL shortener.";
@@ -26130,11 +26809,10 @@ self: {
        pname = "bitmap";
        version = "0.0.2";
        sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitmap-opengl" = callPackage
@@ -26143,11 +26821,10 @@ self: {
        pname = "bitmap-opengl";
        version = "0.0.1.5";
        sha256 = "1wq1p0vvif750gpyh2kq3agzwga3hx0fq28irbw5dgrz462dd9pv";
-       buildDepends = [ base bitmap OpenGL ];
+       libraryHaskellDepends = [ base bitmap OpenGL ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for Data.Bitmap.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitmaps" = callPackage
@@ -26158,14 +26835,13 @@ self: {
        pname = "bitmaps";
        version = "0.2.6.3";
        sha256 = "1cbfbbyvmdlfwn6pjhxkd8f4ajkp9cm18apzmrqffrj58gmzr1p0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bitmap bytestring cereal containers monad-state
          stb-image string-class tagged zlib
        ];
        homepage = "https://github.com/bairyn/bitmaps";
        description = "Bitmap library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bits" = callPackage
@@ -26176,8 +26852,8 @@ self: {
        pname = "bits";
        version = "0.4";
        sha256 = "12s5yk47y0zqzqiyaw9jchyl3crf1id9dk67m638b070d46k29p6";
-       buildDepends = [ base bytes mtl transformers ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ base bytes mtl transformers ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/analytics/bits";
        description = "Various bit twiddling and bitwise serialization primitives";
        license = stdenv.lib.licenses.bsd3;
@@ -26191,7 +26867,7 @@ self: {
        sha256 = "13fbakkwcdk63dm7r0mcsanm5mijp73c7x1kxpay2f03rxb39b70";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Atomic bit operations on memory locations for low-level synchronization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -26202,8 +26878,8 @@ self: {
        pname = "bits-conduit";
        version = "0.2.0.0";
        sha256 = "08hgl1pvwadnrgqcs1yl7lvqgh955swbscpay4chb097pqqggdrj";
-       buildDepends = [ base bytestring conduit mtl ];
-       testDepends = [ base bytestring conduit hspec HUnit mtl ];
+       libraryHaskellDepends = [ base bytestring conduit mtl ];
+       testHaskellDepends = [ base bytestring conduit hspec HUnit mtl ];
        jailbreak = true;
        description = "Bitstream support for Conduit";
        license = stdenv.lib.licenses.bsd3;
@@ -26211,18 +26887,18 @@ self: {
      }) {};
 
   "bits-extras" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, gcc_s }:
      mkDerivation {
        pname = "bits-extras";
        version = "0.1.3";
        sha256 = "0sy9dksmdx0773bsn8yi5hw4qpgn16g8aqqj888w1x75cbsxr997";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       configureFlags = [ "--ghc-option=-lgcc_s" ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+     }) { gcc_s = null;};
 
   "bitset" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, gmp, integer-gmp
@@ -26232,9 +26908,9 @@ self: {
        pname = "bitset";
        version = "1.4.8";
        sha256 = "0h912i3wb6v8sx0c4mlp0j65l3yhpdsk3my8zhif2jls2sxns988";
-       buildDepends = [ base deepseq ghc-prim integer-gmp ];
-       testDepends = [ base QuickCheck tasty tasty-quickcheck ];
-       extraLibraries = [ gmp ];
+       libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
+       librarySystemDepends = [ gmp ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        jailbreak = true;
        description = "A space-efficient set data structure";
        license = stdenv.lib.licenses.mit;
@@ -26251,10 +26927,10 @@ self: {
        sha256 = "02dyi59lp6blrvsc10ahjnra1vaz3kzb8h0jpk74k7n6flia8z1k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bindings-DSL bindings-glib bindings-gobject
        ];
-       pkgconfigDepends = [ gtk pango ];
+       executablePkgconfigDepends = [ gtk pango ];
        jailbreak = true;
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
@@ -26269,8 +26945,10 @@ self: {
        pname = "bitstream";
        version = "0.2.0.4";
        sha256 = "1j00r6jv9yp0h476gz7yalrlnxhkrdrl1w73d3zl98kyf207q2sy";
-       buildDepends = [ base base-unicode-symbols bytestring vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base base-unicode-symbols bytestring vector
+       ];
+       testHaskellDepends = [
          base base-unicode-symbols bytestring QuickCheck vector
        ];
        homepage = "https://github.com/phonohawk/bitstream";
@@ -26284,7 +26962,7 @@ self: {
        pname = "bitstring";
        version = "0.0.0";
        sha256 = "1ix2x4v76wq5148k1aax69cf8sk14cd0z362dz1d2qmj9qxsnsw8";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Lazy bit strings";
        license = stdenv.lib.licenses.bsd3;
@@ -26305,7 +26983,7 @@ self: {
        pname = "bittorrent";
        version = "0.0.0.3";
        sha256 = "155bbqqn33mlavvcm6xfxs4dqij66jfhqxjmrjkyxvzd36yz0ann";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base16-bytestring base32-bytestring base64-bytestring
          bencoding binary binary-conduit bits-extras BoundedChan bytestring
          cereal cereal-conduit conduit containers cryptohash data-default
@@ -26314,7 +26992,7 @@ self: {
          pretty-class resourcet SafeSemaphore split stm text time
          transformers unordered-containers urlencoded vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bencoding bytestring cereal directory filepath hspec
          network QuickCheck quickcheck-instances text time
        ];
@@ -26333,8 +27011,8 @@ self: {
        pname = "bitvec";
        version = "0.1.0.1";
        sha256 = "0zgg72qpxgcgjrr2lr702abibnm79h6knb3jcwdjcxssgb6l70q4";
-       buildDepends = [ base primitive vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base primitive vector ];
+       testHaskellDepends = [
          base HUnit primitive QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector
        ];
@@ -26349,8 +27027,8 @@ self: {
        pname = "bitwise";
        version = "0.1.0.2";
        sha256 = "195g09frdyyn3wsb4jyspdmz8dlmpymqdlbss6zyslkddkrs8hdf";
-       buildDepends = [ array base bytestring ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ array base bytestring ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://code.mathr.co.uk/bitwise";
        description = "fast multi-dimensional unboxed bit packed Bool arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -26364,11 +27042,11 @@ self: {
        pname = "bitx-bitcoin";
        version = "0.2.0.2";
        sha256 = "0m91zh2g6ahpzwgfhj2phhghylgjp6qksca741bdffkax7xd6x17";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-conduit network record scientific split
          text time
        ];
-       testDepends = [ aeson base bytestring hspec record time ];
+       testHaskellDepends = [ aeson base bytestring hspec record time ];
        jailbreak = true;
        homepage = "https://github.com/tebello-thejane/bitx-haskell";
        description = "A Haskell library for working with the BitX bitcoin exchange";
@@ -26382,7 +27060,7 @@ self: {
        pname = "bk-tree";
        version = "0.1.1";
        sha256 = "0av4gkh2vr9righ26hbagh8j30i8k4sp3af98lmwm5gf81vs5az4";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/bitonic/language-spelling";
        description = "BK-tree implementation";
        license = stdenv.lib.licenses.publicDomain;
@@ -26399,7 +27077,11 @@ self: {
        sha256 = "1zi429ny66qp3ywlqfg7y0xk472vxh4z572a4c8rbzpx5lgiypxs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aws base bytestring directory filepath HDBC HDBC-sqlite3 hslogger
+         http-conduit MissingH pureMD5 random strict text unix utf8-string
+       ];
+       executableHaskellDepends = [
          aws base bytestring directory filepath HDBC HDBC-sqlite3 hslogger
          http-conduit MissingH pureMD5 random strict text unix utf8-string
        ];
@@ -26416,7 +27098,7 @@ self: {
        pname = "bktrees";
        version = "0.3.1";
        sha256 = "1d2iz48n0ayn0hi9xa110pxy1mv5a4m21rmbpvs6ki1a7cv4ghn9";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        description = "A set data structure with approximate searching";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -26429,7 +27111,7 @@ self: {
        sha256 = "1zb076m4673jmvzazwjjmlw3nrnw0j22hiim6r90014sqcpb6xhp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 unix ];
+       executableHaskellDepends = [ base haskell98 unix ];
        homepage = "http://github.com/nfjinjing/bla";
        description = "a stupid cron";
        license = stdenv.lib.licenses.bsd3;
@@ -26447,11 +27129,11 @@ self: {
        sha256 = "1ki6kdmc5ss0dp7jrhv9zx9a93f2p38q7i57n0y94awyv5772yla";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring directory download haskeline HTTP hxt
          network process safe tagsoup transformers zlib
        ];
-       testDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://git.kaction.name/black-jewel";
        description = "The pirate bay client";
        license = stdenv.lib.licenses.gpl3;
@@ -26467,11 +27149,11 @@ self: {
        pname = "blacktip";
        version = "0.1.0.1";
        sha256 = "12s05l348q6xlhrwhh2i5v04i9bglvb00vpy25j5axdv5k8nwn62";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bitwise bytestring deepseq deepseq-generics locators
          network-info safe split system-fileio system-filepath time
        ];
-       testDepends = [ base hspec ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/bitemyapp/blacktip";
        description = "Decentralized, k-ordered unique ID generator";
        license = stdenv.lib.licenses.asl20;
@@ -26483,7 +27165,7 @@ self: {
        pname = "blakesum";
        version = "0.5";
        sha256 = "15k3vf9jqcw1a9gyppkhn5ibj7ld8mb2irfhbwd3plj86xyxxa0g";
-       buildDepends = [ base bytestring text vector ];
+       libraryHaskellDepends = [ base bytestring text vector ];
        jailbreak = true;
        homepage = "https://github.com/killerswan/Haskell-BLAKE";
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
@@ -26501,7 +27183,9 @@ self: {
        sha256 = "1d07005fd670p74vkyi9gg3wawyi21s37ww69fsrrgarf3i5p4m9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base blakesum bytestring haskell98 text vector ];
+       executableHaskellDepends = [
+         base blakesum bytestring haskell98 text vector
+       ];
        jailbreak = true;
        homepage = "https://github.com/killerswan/Haskell-BLAKE";
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
@@ -26517,10 +27201,10 @@ self: {
      mkDerivation {
        pname = "blank-canvas";
        version = "0.5";
-       revision = "1";
        sha256 = "05kfyjp9vncyzsvq018ilb8vh7fyzbc06nlx35jk3dzj6i6x5bgs";
+       revision = "1";
        editedCabalFile = "a9d9c32056144a2e5b84e96dfb3a5334aa89dc616c759e523c538a6b950d5084";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring colour containers
          data-default-class http-types kansas-comet scotty stm text
          transformers vector wai wai-extra warp
@@ -26538,7 +27222,7 @@ self: {
        pname = "blas";
        version = "0.7.6";
        sha256 = "1q6fkw2bsppymy5wi7mgkl09caij52xplw64786548z9i95r0bli";
-       buildDepends = [ base ieee QuickCheck storable-complex ];
+       libraryHaskellDepends = [ base ieee QuickCheck storable-complex ];
        jailbreak = true;
        homepage = "http://github.com/patperry/blas";
        description = "Bindings to the BLAS library";
@@ -26552,9 +27236,9 @@ self: {
        pname = "blas-hs";
        version = "0.1.1.0";
        sha256 = "11mhjvqjnap4lj70f6lxjrjrdlkw8gnmd1lz4cfkjawq4w4npq40";
-       buildDepends = [ base storable-complex ];
-       testDepends = [ base vector ];
-       extraLibraries = [ blas ];
+       libraryHaskellDepends = [ base storable-complex ];
+       librarySystemDepends = [ blas ];
+       testHaskellDepends = [ base vector ];
        homepage = "https://github.com/Rufflewind/blas-hs";
        description = "Low-level Haskell bindings to Blas";
        license = stdenv.lib.licenses.mit;
@@ -26567,7 +27251,9 @@ self: {
        pname = "blastxml";
        version = "0.3.2";
        sha256 = "0slqvv8729vlniwswwipw3yss9id6xvmd416kad1ij064g28j00c";
-       buildDepends = [ base biocore bytestring parallel tagsoup ];
+       libraryHaskellDepends = [
+         base biocore bytestring parallel tagsoup
+       ];
        homepage = "http://biohaskell.org/";
        description = "Library for reading Blast XML output";
        license = "LGPL";
@@ -26590,7 +27276,7 @@ self: {
        pname = "blaze-bootstrap";
        version = "0.1.0.0";
        sha256 = "1q1gwjg8xfp20lrlrlkdprny7j437fsnm5c9p5rv4549nyam7prw";
-       buildDepends = [ base blaze-html text ];
+       libraryHaskellDepends = [ base blaze-html text ];
        jailbreak = true;
        homepage = "http://github.com/agrafix/blaze-bootstrap";
        description = "Blaze helper functions for bootstrap pages";
@@ -26606,8 +27292,8 @@ self: {
        pname = "blaze-builder";
        version = "0.4.0.1";
        sha256 = "1id3w33x9f7q5m3xpggmvzw03bkp94bpfyz81625bldqgf3yqdn1";
-       buildDepends = [ base bytestring deepseq text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq text ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text utf8-string
        ];
@@ -26622,7 +27308,7 @@ self: {
        pname = "blaze-builder-conduit";
        version = "1.1.0";
        sha256 = "0xxyn3lhcn1bkybhrl5dx68d0adf26ilf34gv0mxkwpfj7m7d3k3";
-       buildDepends = [ base conduit ];
+       libraryHaskellDepends = [ base conduit ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Convert streams of builders to streams of bytestrings. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -26635,10 +27321,10 @@ self: {
      mkDerivation {
        pname = "blaze-builder-enumerator";
        version = "0.2.1.0";
-       revision = "1";
        sha256 = "15mz4dfnngll61b1xv3hfazvzjfd8g9ym0hps1qiks1hl4c2kxah";
+       revision = "1";
        editedCabalFile = "28796d33301d22cfca6188f54699d9efd7721802bc5e9c88a394bec14c9c4fae";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring bytestring-builder enumerator
          streaming-commons transformers
        ];
@@ -26655,7 +27341,9 @@ self: {
        sha256 = "1li3zxrgwj5rgk894d9zwfxnx5dfjzkvjlcyck2g7s0awfp2kq4s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers directory filepath tagsoup ];
+       executableHaskellDepends = [
+         base containers directory filepath tagsoup
+       ];
        homepage = "http://jaspervdj.be/blaze";
        description = "Tool to convert HTML to BlazeHtml code";
        license = stdenv.lib.licenses.bsd3;
@@ -26670,8 +27358,10 @@ self: {
        pname = "blaze-html";
        version = "0.8.1.0";
        sha256 = "0cgddwdwjszhcd3grfxazvy6jwaxa90s8yw6ir9ji2apbdsw0vgv";
-       buildDepends = [ base blaze-builder blaze-markup bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base blaze-builder blaze-markup bytestring text
+       ];
+       testHaskellDepends = [
          base blaze-builder blaze-markup bytestring containers HUnit
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
@@ -26689,7 +27379,7 @@ self: {
        pname = "blaze-html-contrib";
        version = "0.2.2";
        sha256 = "0a10vzbd5l32y716nmgc49rj2gpyavl8fl1z4qs5drx9adwj50cf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html cgi data-default network safe text
        ];
        homepage = "https://github.com/egonSchiele/blaze-html-contrib";
@@ -26704,7 +27394,7 @@ self: {
        pname = "blaze-html-hexpat";
        version = "0.1.0.0";
        sha256 = "11bw5ywvi7dlz5inch3z0vlg936ch1rnp99bh4nmwskvszidd7kg";
-       buildDepends = [ base blaze-html bytestring hexpat text ];
+       libraryHaskellDepends = [ base blaze-html bytestring hexpat text ];
        jailbreak = true;
        homepage = "https://github.com/jaspervdj/blaze-html-hexpat";
        description = "A hexpat backend for blaze-html";
@@ -26720,7 +27410,7 @@ self: {
        pname = "blaze-html-truncate";
        version = "0.3.0.0";
        sha256 = "1czjqxaik1c9ialdwh8inh5iajl87lrnfa9rxnidzvfhc7ks9zbl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-markup bytestring html-truncate tagsoup text
        ];
        homepage = "http://github.com/mruegenberg/blaze-html-truncate";
@@ -26737,11 +27427,11 @@ self: {
        pname = "blaze-json";
        version = "0.2.1";
        sha256 = "1jqrvv485qyscjppgq2kh6cvhd2lwwqq7gd69ynmrp3qllsc8x83";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-builder containers data-default-class
          text
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base doctest QuickCheck scientific tasty tasty-quickcheck
          text unordered-containers vector
        ];
@@ -26760,8 +27450,8 @@ self: {
        pname = "blaze-markup";
        version = "0.7.0.2";
        sha256 = "0p3jsl7ng3fapvbp431cm1bckdwjgc1kmijyvxlgxn1l90l8l1p4";
-       buildDepends = [ base blaze-builder bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [ base blaze-builder bytestring text ];
+       testHaskellDepends = [
          base blaze-builder bytestring containers HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
@@ -26776,7 +27466,7 @@ self: {
        pname = "blaze-svg";
        version = "0.3.4.1";
        sha256 = "1bfxl2jwr622kgf4gz4gqpdrvscciqpfyzy6qad8j7w633xg8vrp";
-       buildDepends = [ base blaze-markup mtl ];
+       libraryHaskellDepends = [ base blaze-markup mtl ];
        homepage = "https://github.com/deepakjois/blaze-svg";
        description = "SVG combinator library";
        license = stdenv.lib.licenses.bsd3;
@@ -26791,11 +27481,11 @@ self: {
        pname = "blaze-textual";
        version = "0.2.1.0";
        sha256 = "0bbcykkrlgdb6jaz72njriq9if6bzsx52jn26k093f5sn1d7jhhh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring ghc-prim integer-gmp old-locale text
          time vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring double-conversion QuickCheck
          test-framework test-framework-quickcheck2
        ];
@@ -26812,7 +27502,7 @@ self: {
        pname = "blaze-textual-native";
        version = "0.2.1.1";
        sha256 = "1q3gdf4ljc5xhw8f72qkvi6insk2nwdfk28a00y1b58jmk8003sd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring ghc-prim integer-gmp old-locale text
          time vector
        ];
@@ -26829,7 +27519,7 @@ self: {
        pname = "blazeMarker";
        version = "0.1.0.0";
        sha256 = "03gx3ylxz7xa86ngi33dm347ni6a4mcq4fizlx3majpfdk5fs38c";
-       buildDepends = [ base blaze-html blaze-markup ];
+       libraryHaskellDepends = [ base blaze-html blaze-markup ];
        description = "...";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26843,7 +27533,8 @@ self: {
        sha256 = "0547wg4qk2xv5gzj1alaxk06j65dhmzhn6y48rjllyr4lc5bm2qj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
+       executableHaskellDepends = [ base unix ];
        description = "Control library for blink(1) LED from ThingM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -26858,7 +27549,7 @@ self: {
        sha256 = "0ilzdjfaq8dzfla0kxgkqbjsba0kbgkz8w5bzlhl0fw6rnaa0hn7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bliplib bytestring containers filepath language-python mtl
          old-time parseargs pretty
        ];
@@ -26876,7 +27567,7 @@ self: {
        pname = "bliplib";
        version = "0.2.1";
        sha256 = "0i5lh78yyj82g08ypyfp01kgc56p6c3nrl9fk49bp2yqpghv65qz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers mtl pretty utf8-string
        ];
        jailbreak = true;
@@ -26891,7 +27582,7 @@ self: {
        pname = "blocking-transactions";
        version = "0.1.0.5";
        sha256 = "00xlj503h6073f9sk7a1p2b66nw2lryyvxxbawwz030mjdb6hgps";
-       buildDepends = [ base containers parallel ];
+       libraryHaskellDepends = [ base containers parallel ];
        homepage = "http://www.downstairspeople.org/git/blocking-transactions.git";
        description = "Composable, blocking transactions";
        license = stdenv.lib.licenses.bsd3;
@@ -26908,11 +27599,11 @@ self: {
        sha256 = "0bdhcjiz2b4zavmixvrl5la91s9z5pra05xk52118cjk4dcfdzfg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base ConfigFile directory feed filepath haskell98 higherorder
-         highlighting-kate mtl old-locale old-time pandoc regex-compat time
-         utf8-string xhtml xml
+       libraryHaskellDepends = [
+         base directory feed filepath higherorder highlighting-kate mtl
+         old-locale pandoc regex-compat time utf8-string xhtml xml
        ];
+       executableHaskellDepends = [ base ConfigFile haskell98 old-time ];
        description = "Very simple static blog software";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26929,12 +27620,12 @@ self: {
        pname = "bloodhound";
        version = "0.7.0.1";
        sha256 = "1r66nb6vbq1pbh2a97wmsk9iav16ac4ppj5yjv3s5l8qc0rydmjs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers data-default-class
          exceptions http-client http-types mtl semigroups text time
          transformers uri-bytestring vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers directory doctest doctest-prop
          filepath hspec http-client http-types mtl QuickCheck
          quickcheck-properties semigroups text time unordered-containers
@@ -26953,8 +27644,8 @@ self: {
        pname = "bloomfilter";
        version = "2.0.1.0";
        sha256 = "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc";
-       buildDepends = [ array base bytestring deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ array base bytestring deepseq ];
+       testHaskellDepends = [
          base bytestring QuickCheck random test-framework
          test-framework-quickcheck2
        ];
@@ -26971,10 +27662,9 @@ self: {
        sha256 = "0cryvs5ia52dkc232cl2crhf0qq7ncir5c3zvrgsbzcc2hnmyrww";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLFW OpenGL ];
+       executableHaskellDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blubber" = callPackage
@@ -26987,7 +27677,7 @@ self: {
        sha256 = "0bc30pw6gvw7i6gh58hhkgx2j432zlh2wh4d41abnkjqygifsxsd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blubber-server bytestring cereal containers gloss network unix
        ];
        homepage = "https://secure.plaimi.net/games/blubber.html";
@@ -27006,7 +27696,8 @@ self: {
        sha256 = "12f594sl2c2hrxr95bpv911x0bdfpmaflp29mhw2yln2vh64nhj5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base cereal containers random ];
+       executableHaskellDepends = [
          base Cabal cereal containers data-default-class network pandoc
          process random scotty text transformers unix
        ];
@@ -27027,7 +27718,7 @@ self: {
        sha256 = "13xfnx08xgbfppr4cqmrqj82w192ll4m1x4kmv5jdpk02yb4zqa2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile containers directory filepath glade gtk mtl process
          random regex-compat unix utf8-string X11 X11-xft xmonad
          xmonad-contrib
@@ -27046,7 +27737,7 @@ self: {
        sha256 = "1qna8rr50mmd90xp7pwhcknx12dv2n7w5pdsw28kpbxykljrszgm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gtk ];
+       executableHaskellDepends = [ base gtk ];
        jailbreak = true;
        description = "Utilities for Bluetile";
        license = stdenv.lib.licenses.bsd3;
@@ -27063,11 +27754,12 @@ self: {
        sha256 = "1p0mwpjvrv9d0b0gp6s55zys9vcbhpjsjbi711f5x4dagdl0xkhc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring clay flow http-types jmacro lucid pointfree
          pointful text wai wai-extra wai-websockets warp websockets
          wl-pprint-text
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://blunt.herokuapp.com";
        description = "Convert between pointfree and pointful expressions";
@@ -27080,7 +27772,7 @@ self: {
        pname = "bmp";
        version = "1.2.5.2";
        sha256 = "0f88f2ynm1fpzbjijy5fa8blfrdv42h5h28hfjlpd4fp0h96in5x";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://code.ouroborus.net/bmp";
        description = "Read and write uncompressed BMP image files";
        license = stdenv.lib.licenses.mit;
@@ -27096,11 +27788,14 @@ self: {
        sha256 = "12b5hzazqilwwj0535wrh6i9r6lxi7lbzl727470mvzlr8p8lkyz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base cgi containers html random transformers utility-ht
+       ];
+       executableHaskellDepends = [
          array base cgi containers html httpd-shed network random
          transformers utility-ht
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base containers QuickCheck random transformers utility-ht
        ];
        jailbreak = true;
@@ -27120,9 +27815,10 @@ self: {
        sha256 = "0zlrm911sbszxyffz18yf64935iv8s2yk3v8v6cwjij69haryvwi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base hogre hois monad-control random reactive-banana
        ];
+       executableHaskellDepends = [ base hogre hois random ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -27133,7 +27829,7 @@ self: {
        pname = "bool-extras";
        version = "0.4.0";
        sha256 = "008m43f04ncx2c24c241gzwjyyglw8rwpq2gsakqkw0nwz3czs61";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://tom.lokhorst.eu/bool-extras";
        description = "A fold function for Bool";
        license = stdenv.lib.licenses.bsd3;
@@ -27145,7 +27841,7 @@ self: {
        pname = "boolean-list";
        version = "0.1.0.0";
        sha256 = "0yr1szkaaz90nmawzrgfljv7hcd59xs7nr2fhc2rb4582crkykvp";
-       buildDepends = [ base bytestring HUnit ];
+       libraryHaskellDepends = [ base bytestring HUnit ];
        homepage = "http://xy30.com";
        description = "convert numbers to binary coded lists";
        license = stdenv.lib.licenses.gpl3;
@@ -27159,8 +27855,8 @@ self: {
        pname = "boolean-normal-forms";
        version = "0.0.0.1";
        sha256 = "11y26whzibxkcfck83lcrmxl34j7qp374wj6nzx2k3l65sdqm2ic";
-       buildDepends = [ base cond containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base cond containers ];
+       testHaskellDepends = [
          base cond containers QuickCheck tasty tasty-quickcheck
        ];
        jailbreak = true;
@@ -27175,7 +27871,7 @@ self: {
        pname = "boolexpr";
        version = "0.1";
        sha256 = "14v894clplpcc1visqn337p7vmacj5hgx41vr60pwvflmv98d8xn";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Boolean expressions with various representations and search queries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27197,9 +27893,10 @@ self: {
        pname = "boolsimplifier";
        version = "0.1.8";
        sha256 = "13w2i7b2g9w5kzqnbjjdzf3r2dm7a4xxags02khhwlj1f8vsjvq9";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Simplification tools for simple propositional formulas";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boomange" = callPackage
@@ -27212,7 +27909,7 @@ self: {
        sha256 = "1sg1ldrglhca62xiak33k5023zrpmgg3aa8xpwn8l1323kwlkqm0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers descrilo directory filepath simtreelo
        ];
        description = "A Bookmarks manager with a HTML generator";
@@ -27225,7 +27922,7 @@ self: {
        pname = "boomerang";
        version = "1.4.5";
        sha256 = "03iaasyg2idvq25wzzjk2yr9lyql7bcgmfkycy1cy4ms5dg91k6q";
-       buildDepends = [ base mtl template-haskell text ];
+       libraryHaskellDepends = [ base mtl template-haskell text ];
        description = "Library for invertible parsing and printing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27241,7 +27938,7 @@ self: {
        sha256 = "0yqqb4s5ld4fv7x17d5dp7z2dglrcmgb7fr4n8x4n2pysylxm9nh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers data-accessor data-accessor-template
          font-opengl-basic4x6 GLFW-b MonadRandom mtl OpenGL
        ];
@@ -27263,14 +27960,14 @@ self: {
        pname = "borel";
        version = "0.18.0";
        sha256 = "0daayl70l8afpf6l4822nz2cqjy2k8zbrj89apipjbynsq543453";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base bimap cassava ceilometer-common
          chevalier-common configurator containers errors hslogger lens
          marquise mtl multiset network network-uri pipes pipes-concurrency
          pipes-safe text time transformers unordered-containers
          vaultaire-common vector zeromq4-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async attoparsec base bimap cassava ceilometer-common
          chevalier-common configurator containers either errors hslogger
          hspec lens lens-properties marquise mtl multiset network
@@ -27291,7 +27988,7 @@ self: {
        pname = "bot";
        version = "0.3";
        sha256 = "0crs1c6v298zqkjzkdgicigx22gvp9xv7bjlynbyckvx0lrvfmrc";
-       buildDepends = [ arrows base Stream ];
+       libraryHaskellDepends = [ arrows base Stream ];
        homepage = "http://haskell.org/haskellwiki/Bot";
        description = "bots for functional reactive programming";
        license = stdenv.lib.licenses.bsd3;
@@ -27306,7 +28003,7 @@ self: {
        sha256 = "0ir6h4zkj05na1gyf7h97s832jkphh33c9qjk2i290d0q9y8s4fw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Build tool for Lambdabot";
        license = "GPL";
@@ -27321,11 +28018,11 @@ self: {
        pname = "bound";
        version = "1.0.6";
        sha256 = "0i1q6pv7d7vy9agb6yzj0mi8hq8154wv17qhwkf4jd87k07xv76v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad hashable
          hashable-extras prelude-extras profunctors transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath prelude-extras transformers vector
        ];
        jailbreak = true;
@@ -27340,7 +28037,7 @@ self: {
        pname = "bound-gen";
        version = "0.1.0.2";
        sha256 = "1il4vb497d0195mhvra5djkn3mbdzd8dmcnffpqh1pv1pj8n8hwp";
-       buildDepends = [ base bound monad-gen mtl ];
+       libraryHaskellDepends = [ base bound monad-gen mtl ];
        description = "Unwrap Scope's with globally fresh values";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -27351,7 +28048,7 @@ self: {
        pname = "bounded-tchan";
        version = "0.2.3";
        sha256 = "12c78dz3y1ly05hckd9pf0j4fpknk383qyb5yrhps4sc2m3i9k9w";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "Bounded Transactional channels (queues)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27362,7 +28059,7 @@ self: {
        pname = "boundingboxes";
        version = "0.2.3";
        sha256 = "0r3mffqxqadn8qklq3kr0ggirkficfj8ic1fxgki2zrc5jm4f2g8";
-       buildDepends = [ base lens ];
+       libraryHaskellDepends = [ base lens ];
        homepage = "https://github.com/fumieval/boundingboxes";
        description = "A generic boundingbox for an arbitrary vector";
        license = stdenv.lib.licenses.bsd3;
@@ -27377,11 +28074,11 @@ self: {
        pname = "bower-json";
        version = "0.7.0.0";
        sha256 = "0vz9xxw2xr27lh70mqxfgvs43sr3sq88xf5vppcn2frsk1hnb7hs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-better-errors base bytestring mtl scientific text
          transformers unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring tasty tasty-hunit text unordered-containers
        ];
        homepage = "https://github.com/hdgarrood/bower-json";
@@ -27395,8 +28092,8 @@ self: {
        pname = "boxes";
        version = "0.1.4";
        sha256 = "1n7xiplzd3s1a39nizwjcgsh3wi2348mp21c3fk19v98ialfjgjf";
-       buildDepends = [ base split ];
-       testDepends = [ base QuickCheck split ];
+       libraryHaskellDepends = [ base split ];
+       testHaskellDepends = [ base QuickCheck split ];
        description = "2D text pretty-printing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27407,7 +28104,7 @@ self: {
        pname = "bpann";
        version = "0.1.1";
        sha256 = "02c8xyzs4kz9cx7ql48kq5cxf686vvd5mqrprkikynif9r4dk7w8";
-       buildDepends = [ base random split ];
+       libraryHaskellDepends = [ base random split ];
        description = "backpropagation neuronal network";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27420,7 +28117,8 @@ self: {
        sha256 = "18xp0vlmh2n37x6rhczxw115cnips7vm9f560qsr395crqk5dzz9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base mtl unix ];
+       libraryHaskellDepends = [ array base mtl ];
+       executableHaskellDepends = [ array base mtl unix ];
        description = "Brainfuck interpreter";
        license = "GPL";
      }) {};
@@ -27431,7 +28129,7 @@ self: {
        pname = "brainfuck-monad";
        version = "0.4.0";
        sha256 = "14534i070l6w886sjp91yp9bfc2is5z6y7wzm8b6w4j9l78pfgmz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "BrainFuck monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27445,7 +28143,8 @@ self: {
        sha256 = "19x8mg15mscfrj1ppm32rzk8hhm4a2v498aq7sl3kkihrhp19x6j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
+       executableHaskellDepends = [ array base ];
        jailbreak = true;
        homepage = "https://gitlab.com/cpp.cabrera/brainfuck-tut";
        description = "A simple BF interpreter";
@@ -27458,7 +28157,7 @@ self: {
        pname = "break";
        version = "1.0.0";
        sha256 = "15fqdha71i4ziv0ra8v2mfp0fviwgs27xlsvc0chb8icqf33y22m";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        description = "Break from a loop";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27471,7 +28170,7 @@ self: {
        sha256 = "04qs2r944jbb2i11dqlvrav8iaanrgp15jri0mq6nf8ccjldh3wr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskgame mtl SDL ];
+       executableHaskellDepends = [ base haskgame mtl SDL ];
        homepage = "http://github.com/Peaker/breakout/tree/master";
        description = "A simple Breakout game implementation";
        license = "GPL";
@@ -27490,7 +28189,7 @@ self: {
        sha256 = "1ndzqwxj7dzff75mgjssh7sgrhxlicdwkcx8j71x52rxyav4aa0j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base binary blaze-html bytestring configurator cryptohash
          directory hashtables http-types mtl random Spock text transformers
          wai wai-extra wai-middleware-static warp warp-tls xdg-basedir
@@ -27508,7 +28207,7 @@ self: {
        sha256 = "0a9gzclnqb28mm5gf2iiiby30qa0pwlwz3c115sim4lxpq60qran";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base parallel random SDL ];
+       executableHaskellDepends = [ array base parallel random SDL ];
        homepage = "http://github.com/willdonnelly/brians-brain";
        description = "A Haskell implementation of the Brian's Brain cellular automaton";
        license = stdenv.lib.licenses.bsd3;
@@ -27525,8 +28224,11 @@ self: {
        sha256 = "18gm24fd5ad6dgbqiwcs750rvq2v6lmclysd6acj2y8iybwcsg8n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary cmdargs containers directory filepath ListZipper text
+       libraryHaskellDepends = [
+         base binary containers directory filepath ListZipper text
+       ];
+       executableHaskellDepends = [
+         base binary cmdargs containers directory filepath text
        ];
        jailbreak = true;
        description = "Simple part of speech tagger";
@@ -27540,7 +28242,7 @@ self: {
        pname = "broadcast-chan";
        version = "0.1.0";
        sha256 = "1dympzv8gwh31hd0x6ap29rm83rf2klkj34as2xjrayfs9kbp87s";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/merijn/broadcast-chan";
        description = "Broadcast channel type that avoids 0 reader space leaks";
        license = stdenv.lib.licenses.bsd3;
@@ -27552,7 +28254,7 @@ self: {
        pname = "broccoli";
        version = "0.4.1.0";
        sha256 = "084nil9rfs3xpp4rk3qlwf6gsaljm57g7divfzd88dk9np6q5iwh";
-       buildDepends = [ base containers stm time ];
+       libraryHaskellDepends = [ base containers stm time ];
        jailbreak = true;
        description = "Small library for interactive functional programs";
        license = stdenv.lib.licenses.bsd3;
@@ -27564,7 +28266,7 @@ self: {
        pname = "bsd-sysctl";
        version = "1.0.7";
        sha256 = "18qs5s6sq6696w7y23fq6pd303j5bfh94lw86dz4z9hgdlmrx36y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Access to the BSD sysctl(3) interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27579,11 +28281,11 @@ self: {
        pname = "bson";
        version = "0.3.1";
        sha256 = "1kihsjws8sqb44gvilh1zxrqn2bml8gxq2bbanxqb7nr4ymwfkiv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cryptohash data-binary-ieee754 mtl network
          text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring cryptohash data-binary-ieee754 mtl network
          QuickCheck test-framework test-framework-quickcheck2 text time
        ];
@@ -27599,7 +28301,7 @@ self: {
        pname = "bson-generic";
        version = "0.0.8";
        sha256 = "0r1gd6jxwzqana2b3i3xm8mx66lq4zkcir11c3v78g9fjyyhy7dh";
-       buildDepends = [ base bson ghc-prim text ];
+       libraryHaskellDepends = [ base bson ghc-prim text ];
        jailbreak = true;
        description = "Generic functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
@@ -27611,7 +28313,7 @@ self: {
        pname = "bson-generics";
        version = "0.0.1";
        sha256 = "03ifgmifk0dx6fzws1qlx3c1nslrkvwman5g3c4iag842bl03gxp";
-       buildDepends = [ base bson ghc-prim ];
+       libraryHaskellDepends = [ base bson ghc-prim ];
        jailbreak = true;
        description = "Generics functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
@@ -27626,7 +28328,7 @@ self: {
        pname = "bson-mapping";
        version = "0.1.4.1";
        sha256 = "0k91rkyh7lmq2iw2kmkl3lbzx4c46yzb2fp9pkag8yd05na2k9za";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bson compact-string-fix template-haskell th-lift
        ];
        description = "Mapping between BSON and algebraic data types";
@@ -27642,8 +28344,8 @@ self: {
        pname = "bspack";
        version = "0.0.4";
        sha256 = "0nzw1cs3nxb55yj3sy5afr6kycbm7xk26xpl0gvysgrd6bs0p8pb";
-       buildDepends = [ base bytestring ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       testHaskellDepends = [
          base bytestring mtl tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/NicolasDP/hs-bspack";
@@ -27657,7 +28359,7 @@ self: {
        pname = "bsparse";
        version = "0.0.5";
        sha256 = "12wn8jlqkb9d9vpdbwc3m288cgnr15cq4wv5fxlp7f10p3y42l2a";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/vincenthz/hs-bsparse";
        description = "A simple unassuming parser for bytestring";
        license = stdenv.lib.licenses.bsd3;
@@ -27672,11 +28374,11 @@ self: {
        pname = "btree-concurrent";
        version = "0.1.5";
        sha256 = "1xgw3ki3vypyxxiyzfjajjx1vzavyn1v9445cgbqwrr0n0wpkqm6";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base64-bytestring bytestring cereal containers directory
          filepath hashable mtl random snappy stm time
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base base64-bytestring bytestring cereal containers directory
          filepath hashable mtl QuickCheck random snappy stm time unix
        ];
@@ -27692,12 +28394,12 @@ self: {
      mkDerivation {
        pname = "btrfs";
        version = "0.1.1.1";
-       revision = "1";
        sha256 = "1k1b8x0p0q43872c4x5dma2hs9dzkvr7n2dnb3w29ha7f24k8g8z";
+       revision = "1";
        editedCabalFile = "1ef2b2d9f4768be3250cf2f971639c1a0e410e6bb9b035e922305c62c5f00887";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring time unix ];
+       libraryHaskellDepends = [ base bytestring time unix ];
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
        license = stdenv.lib.licenses.bsd3;
@@ -27712,10 +28414,10 @@ self: {
        pname = "buffer-builder";
        version = "0.2.4.0";
        sha256 = "1krhzcd6jwfi2rclkzrvmlzr8mz1kcll481w890yi64vb65j5cn2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring mtl text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring criterion deepseq HUnit
          quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th
          text vector
@@ -27735,11 +28437,11 @@ self: {
        pname = "buffer-builder-aeson";
        version = "0.2.0.3";
        sha256 = "0i8jv5w016m8az6g809mf54wbkz1dci5w4c7w94rxl2xhsx7q98p";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base buffer-builder bytestring integer-gmp scientific
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base buffer-builder bytestring hashable HUnit
          QuickCheck scientific tasty tasty-hunit tasty-quickcheck tasty-th
          text unordered-containers vector
@@ -27760,16 +28462,16 @@ self: {
        sha256 = "19ayjkaniksivm99lgl7bfjabig00y0gd3w9ssabksg7rfwajc5d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring connection containers
          data-default http-conduit http-types iso8601-time resourcet text
          time transformers unordered-containers vector
        ];
+       executableHaskellDepends = [ base containers text time ];
        jailbreak = true;
        homepage = "https://github.com/sethfowler/hsbugzilla";
        description = "A Haskell interface to the Bugzilla native REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buildable" = callPackage
@@ -27778,7 +28480,7 @@ self: {
        pname = "buildable";
        version = "0.1.0.3";
        sha256 = "1jrvgm2k6m8k9hj7h727pf357zydmhq1ndl1z39ag6294xd2rgpx";
-       buildDepends = [ base bytestring containers dlist text ];
+       libraryHaskellDepends = [ base bytestring containers dlist text ];
        jailbreak = true;
        description = "Typeclass for builders of linear data structures";
        license = stdenv.lib.licenses.mit;
@@ -27792,7 +28494,7 @@ self: {
        pname = "buildbox";
        version = "2.1.6.1";
        sha256 = "15ddnbnm6wqm5dqf6f2qmxlxy5az0sxvml4rwghivcj0609lfc6i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory mtl old-locale pretty process
          random stm time
        ];
@@ -27809,7 +28511,7 @@ self: {
        sha256 = "0j1fsdmaxnl1zxgvxilznw5jfaaphij6wnhllb64f59kvhpqmy4f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base buildbox parseargs ];
+       executableHaskellDepends = [ base buildbox parseargs ];
        jailbreak = true;
        homepage = "http://code.ouroborus.net/buildbox";
        description = "Tools for working with buildbox benchmark result files";
@@ -27831,14 +28533,20 @@ self: {
        sha256 = "1icm2vqimza6lslav01d11xq4v0p6dpymvx4md48ch8qbhdrn8r3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson async attoparsec base bytestring Cabal cmdargs conduit
-         conduit-extra containers cpphs deepseq directory dynamic-cabal
-         filepath ghc ghc-paths ghc-pkg-lib haskell-src-exts mtl old-time
-         process regex-tdfa syb text time transformers unordered-containers
+       libraryHaskellDepends = [
+         aeson async attoparsec base bytestring Cabal conduit conduit-extra
+         containers cpphs deepseq directory dynamic-cabal filepath ghc
+         ghc-paths ghc-pkg-lib haskell-src-exts mtl old-time process
+         regex-tdfa syb text time transformers unordered-containers
          utf8-string vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson async base bytestring Cabal cmdargs conduit conduit-extra
+         containers cpphs directory dynamic-cabal filepath ghc ghc-paths
+         ghc-pkg-lib haskell-src-exts mtl old-time process regex-tdfa syb
+         text time transformers vector
+       ];
+       testHaskellDepends = [
          aeson async attoparsec base bytestring Cabal conduit conduit-extra
          containers directory dynamic-cabal filepath ghc-pkg-lib HTF HUnit
          mtl old-time process text time transformers unordered-containers
@@ -27857,9 +28565,9 @@ self: {
        pname = "bullet";
        version = "0.2.4";
        sha256 = "0fksxkp6xq0q88g21b917qrg6pzzr1a00w5jjh45f4f9b3smibgn";
-       buildDepends = [ base vect ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ bullet ];
+       libraryHaskellDepends = [ base vect ];
+       libraryPkgconfigDepends = [ bullet ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://www.haskell.org/haskellwiki/Bullet";
        description = "A wrapper for the Bullet physics engine";
        license = stdenv.lib.licenses.bsd3;
@@ -27876,7 +28584,7 @@ self: {
        sha256 = "1a6sqkdzq05az6yj3zmlcbx6bmhw4zjx2aijxfi481z3ifiy7z3w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers fclabels process regex-compat split strict
        ];
        homepage = "http://github.com/silkapp/bumper";
@@ -27890,8 +28598,8 @@ self: {
        pname = "burst-detection";
        version = "1.0";
        sha256 = "1pgrqjdc4n97s7jsb9ddmjkw3qa4c28p4fp1ajyx5bfxdll44dwm";
-       buildDepends = [ base deepseq ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://parsci.com/";
        description = "Burst detection algorithms";
@@ -27906,7 +28614,7 @@ self: {
        pname = "bus-pirate";
        version = "0.6.2";
        sha256 = "1l2icqm9wm1q61nrhab9zininifwql304lgzfqbddvah6qx53iqd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring either errors serialport transformers
        ];
        homepage = "http://www.github.com/bgamari/bus-pirate";
@@ -27922,7 +28630,7 @@ self: {
        pname = "buster";
        version = "2.51";
        sha256 = "12h77sa7z5ba6n2hx5kag51lp7q7hdmsd1cb006l7i46cq5b5zzg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dataenc mtl old-locale parsec
          pretty time
        ];
@@ -27941,7 +28649,7 @@ self: {
        pname = "buster-gtk";
        version = "2.0";
        sha256 = "1ajmwdrx7cq5dh7zj0viipnhas0p910ax1yb37ina4nddrpx0gd1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary buster bytestring containers dataenc gtk mtl old-locale
          parsec pretty time
        ];
@@ -27959,7 +28667,7 @@ self: {
        pname = "buster-network";
        version = "1.2";
        sha256 = "17nzw5ycdrw3f1cgwcg1vh1jk80528nl7ksmbmxg2mgndc89kg3i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary buster bytestring containers dataenc haxr HTTP mtl
          network old-locale pretty time
        ];
@@ -27981,18 +28689,17 @@ self: {
        sha256 = "1mj8zxwjbp35pdslnssb9hz6mr3wapslfr3g265s5gk9kn8iqq06";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cairo containers dbus directory filepath gio glib
          gtk3 hgettext mtl pango parsec pcap process setlocale text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cairo containers dbus directory filepath gtk3
          hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework
          test-framework-hunit text
        ];
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bv" = callPackage
@@ -28003,7 +28710,7 @@ self: {
        sha256 = "0r2bp39ilwq3zx38spbx5qrpccwm255ax2skab3i7jxjmf7yj025";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://bitbucket.org/iago/bv-haskell";
        description = "Bit-vector arithmetic library";
        license = stdenv.lib.licenses.bsd3;
@@ -28019,10 +28726,11 @@ self: {
        sha256 = "1194h9bhd1n9sxc224j22mir852b9c5ww2cq0sf9x8k3vlfpm1jl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base colour containers exceptions haskeline mtl
          terminfo-hs text transformers
        ];
+       executableHaskellDepends = [ base text ];
        homepage = "http://github.com/pjones/byline";
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
@@ -28034,7 +28742,7 @@ self: {
        pname = "bytable";
        version = "0.1.0.0";
        sha256 = "0x4yh9li0pi2r9pjih000a143iw9kaz7r4z72510kv6kzkkcr9mn";
-       buildDepends = [ base bytestring word24 ];
+       libraryHaskellDepends = [ base bytestring word24 ];
        description = "data from/to ByteString";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28046,7 +28754,7 @@ self: {
        pname = "byteable";
        version = "0.1.1";
        sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/vincenthz/hs-byteable";
        description = "Type class for sequence of bytes";
        license = stdenv.lib.licenses.bsd3;
@@ -28060,7 +28768,7 @@ self: {
        sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/vincenthz/hs-bytedump";
        description = "Flexible byte dump helpers for human readers";
        license = stdenv.lib.licenses.bsd3;
@@ -28072,7 +28780,7 @@ self: {
        pname = "byteorder";
        version = "1.0.4";
        sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://community.haskell.org/~aslatter/code/byteorder";
        description = "Exposes the native endianness or byte ordering of the system";
        license = stdenv.lib.licenses.bsd3;
@@ -28087,11 +28795,11 @@ self: {
        pname = "bytes";
        version = "0.15.0.1";
        sha256 = "1qlqih83bx2vh5g15wffh4v9cfb5lv6jkj6i1xncd2imw5ynfi08";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal containers mtl text time transformers
          transformers-compat void
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "https://github.com/ekmett/bytes";
        description = "Sharing code for serialization between binary and cereal";
        license = stdenv.lib.licenses.bsd3;
@@ -28103,7 +28811,7 @@ self: {
        pname = "byteset";
        version = "0.1.1.0";
        sha256 = "18dg863wbbjh95yial4gy6vi5spwygp0l7dfx6bj00lz4xdrqj8k";
-       buildDepends = [ base binary ];
+       libraryHaskellDepends = [ base binary ];
        description = "Set of bytes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28117,8 +28825,8 @@ self: {
        pname = "bytestring";
        version = "0.10.6.0";
        sha256 = "0xw924djdbs15r4dh2zyn209b0ji94si4ywliagjbg41gdmrl6r7";
-       buildDepends = [ base deepseq ghc-prim integer-gmp ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
+       testHaskellDepends = [
          base byteorder deepseq directory dlist ghc-prim HUnit mtl
          QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -28135,8 +28843,8 @@ self: {
        pname = "bytestring-arbitrary";
        version = "0.0.3";
        sha256 = "1mxxgdak43wz7vzl2hbff9an7krqz4rhld9h173vvq6w2n8jnbi7";
-       buildDepends = [ base bytestring cryptohash QuickCheck ];
-       testDepends = [ base bytestring cryptohash QuickCheck ];
+       libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ];
+       testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/tsuraan/bytestring-arbitrary";
        description = "Arbitrary instances for ByteStrings";
@@ -28149,7 +28857,7 @@ self: {
        pname = "bytestring-builder";
        version = "0.10.6.0.0";
        sha256 = "1mkg24zl0rapb3gqzkyj5ibp07wx3yzd72hmfczssl0is63rjhww";
-       buildDepends = [ base bytestring deepseq ];
+       libraryHaskellDepends = [ base bytestring deepseq ];
        description = "The new bytestring builder, packaged outside of GHC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28159,10 +28867,10 @@ self: {
      mkDerivation {
        pname = "bytestring-class";
        version = "0.0.0.1";
-       revision = "1";
        sha256 = "1z65br00rplhniaw9fg3phpxwf13acgycn5hnhyjfcyr962xp03x";
+       revision = "1";
        editedCabalFile = "e3aa2813d237dcd0a12bfd27293d8bf592cdf13bfdc01a4b609f34df238d0417";
-       buildDepends = [ base bytestring utf8-string ];
+       libraryHaskellDepends = [ base bytestring utf8-string ];
        jailbreak = true;
        description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -28177,10 +28885,10 @@ self: {
        pname = "bytestring-conversion";
        version = "0.3.1";
        sha256 = "1y2fhwz632sp7n0iw87lz2g8vks4jgxz2kw99kysgivxfd4fmdqk";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive double-conversion text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-quickcheck
        ];
        homepage = "https://github.com/twittner/bytestring-conversion/";
@@ -28194,7 +28902,7 @@ self: {
        pname = "bytestring-csv";
        version = "0.1.2";
        sha256 = "0x7qklb36jwxry1ih5x3jw7s861vlvd5g9h7yn7b2x64c0phyj0r";
-       buildDepends = [ array base bytestring dlist ];
+       libraryHaskellDepends = [ array base bytestring dlist ];
        homepage = "http://code.haskell.org/~dons/code/bytestring-csv";
        description = "Parse CSV formatted data efficiently";
        license = stdenv.lib.licenses.bsd3;
@@ -28207,7 +28915,7 @@ self: {
        pname = "bytestring-delta";
        version = "0.1.0.1";
        sha256 = "0iq59if3in08ssashk80wvh6yh1yr115387fi9kj952v6bzvzw1q";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/joeyadams/haskell-bytestring-delta";
        description = "Simple, fast binary diff/patch";
        license = stdenv.lib.licenses.mit;
@@ -28221,8 +28929,8 @@ self: {
        pname = "bytestring-from";
        version = "0.3";
        sha256 = "030jrpri4qmv8lr8ahgkbl3gghv2c00lfigx2wbrrv9hz74gkpn4";
-       buildDepends = [ attoparsec base bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base bytestring text ];
+       testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-quickcheck
        ];
        description = "A type-class to convert values from ByteString";
@@ -28237,8 +28945,8 @@ self: {
        pname = "bytestring-handle";
        version = "0.1.0.3";
        sha256 = "0dakwnpymxj2nghqsnq09862czby8hy0xl8m74yzqdnd9ky22g0z";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -28253,7 +28961,7 @@ self: {
        pname = "bytestring-lexing";
        version = "0.5.0.2";
        sha256 = "0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Parse and produce literals efficiently from strict or lazy bytestrings";
        license = stdenv.lib.licenses.bsd2;
@@ -28265,7 +28973,7 @@ self: {
        pname = "bytestring-mmap";
        version = "0.2.2";
        sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v";
-       buildDepends = [ base bytestring unix ];
+       libraryHaskellDepends = [ base bytestring unix ];
        homepage = "http://code.haskell.org/~dons/code/bytestring-mmap/";
        description = "mmap support for strict ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -28279,7 +28987,7 @@ self: {
        sha256 = "1kg777gpqj05h5bj0637yky64bdx7x77hm7nq2rhpw4i1mh9gjmx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://github.com/solidsnack/bytestring-nums";
        description = "Parse numeric literals from ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -28291,7 +28999,9 @@ self: {
        pname = "bytestring-plain";
        version = "0.1.0.1";
        sha256 = "057f9kyvj7cf2a53f6wqah0bw9cp67s7y3b6l6y78m24ipx8c56a";
-       buildDepends = [ base bytestring deepseq ghc-prim hashable ];
+       libraryHaskellDepends = [
+         base bytestring deepseq ghc-prim hashable
+       ];
        jailbreak = true;
        homepage = "https://github.com/hvr/bytestring-plain";
        description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)";
@@ -28305,7 +29015,9 @@ self: {
        pname = "bytestring-progress";
        version = "1.0.5";
        sha256 = "02j9gmvncap4xzvvmj0s84bkhf4xh8plw5saakiljxf6zi7hpdwq";
-       buildDepends = [ base bytestring terminal-progress-bar time ];
+       libraryHaskellDepends = [
+         base bytestring terminal-progress-bar time
+       ];
        homepage = "http://github.com/acw/bytestring-progress";
        description = "A library for tracking the consumption of a lazy ByteString";
        license = stdenv.lib.licenses.bsd3;
@@ -28318,11 +29030,13 @@ self: {
      mkDerivation {
        pname = "bytestring-read";
        version = "0.3.1";
-       revision = "1";
        sha256 = "0df6mb5fhfd1kgah5gv4q4ykxvl0y8hbqrdvm17nh33cxj2csj00";
+       revision = "1";
        editedCabalFile = "8a8b5f5c2f109a11df1cf47ffec170b810e02186f0406fd6c7f4155bfd2de0b6";
-       buildDepends = [ base bytestring types-compat ];
-       testDepends = [ base bytestring doctest tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base bytestring types-compat ];
+       testHaskellDepends = [
+         base bytestring doctest tasty tasty-quickcheck
+       ];
        homepage = "https://github.com/philopon/bytestring-read";
        description = "fast ByteString to number converting library";
        license = stdenv.lib.licenses.mit;
@@ -28334,8 +29048,8 @@ self: {
        pname = "bytestring-rematch";
        version = "0.1.0.0";
        sha256 = "01yk1pmsp6c89z4lf6p37g4jqbqz1d93g61gn4i99p8dijbg0pbh";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base bytestring hspec HUnit rematch ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hspec HUnit rematch ];
        jailbreak = true;
        homepage = "github.com/tcrayford/rematch";
        description = "Rematch support for ByteString";
@@ -28349,8 +29063,8 @@ self: {
        pname = "bytestring-short";
        version = "0.0.1.0";
        sha256 = "034c63hw49sy4mg6xarf61d4f3shafj66v4sqky04sin460s28wv";
-       buildDepends = [ base bytestring deepseq ];
-       testDepends = [ base bytestring QuickCheck ];
+       libraryHaskellDepends = [ base bytestring deepseq ];
+       testHaskellDepends = [ base bytestring QuickCheck ];
        jailbreak = true;
        description = "Backport copy of ShortByteString";
        license = stdenv.lib.licenses.bsd3;
@@ -28365,7 +29079,7 @@ self: {
        pname = "bytestring-show";
        version = "0.3.5.6";
        sha256 = "04h81a0bh2fvnkby1qafnydb29gzk6d4d311i2lbn7lm2vyjw919";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers integer-gmp
        ];
        homepage = "http://code.haskell.org/~dolio/";
@@ -28379,7 +29093,7 @@ self: {
        pname = "bytestring-trie";
        version = "0.2.4.1";
        sha256 = "0qqklrvdcprchnl4bxr6w7zf6k5gncincl3kysm34gd04sszxr1g";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://code.haskell.org/~wren/";
        description = "An efficient finite map from (byte)strings to values";
        license = stdenv.lib.licenses.bsd3;
@@ -28391,7 +29105,7 @@ self: {
        pname = "bytestringparser";
        version = "0.3";
        sha256 = "1g99vbp14ki563lb41y1fxlgvdmrmq1y0xsk0ia1m438rdpnh2qd";
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28403,7 +29117,7 @@ self: {
        pname = "bytestringparser-temporary";
        version = "0.4.1";
        sha256 = "019axq65hmgmszkc1lyyyy8rpv5xkjbf1pmgz1bz0hnc8lgv58pd";
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28414,7 +29128,7 @@ self: {
        pname = "bytestringreadp";
        version = "0.2";
        sha256 = "07hx3072zg9y3kj6h99yl8fd3n115x4z8z411c1cpx1hj292d57f";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "A ReadP style parser library for ByteString";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28426,8 +29140,8 @@ self: {
        pname = "bzlib";
        version = "0.5.0.5";
        sha256 = "0zh130vw719a8d11q5qzc3ilzgv8cqyc2a7r1a131cv1fjnd1rwy";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ bzip2 ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ bzip2 ];
        description = "Compression and decompression in the bzip2 format";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) bzip2;};
@@ -28441,15 +29155,15 @@ self: {
        pname = "bzlib-conduit";
        version = "0.2.1.3";
        sha256 = "0jqg38zvxc0fpp74az0vm8klb88zwy076ncwzgq2zr0nrmr5cghm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL bytestring conduit conduit-extra data-default mtl
          resourcet
        ];
-       testDepends = [
+       librarySystemDepends = [ bzip2 ];
+       testHaskellDepends = [
          base bytestring conduit conduit-extra hspec QuickCheck random
          resourcet
        ];
-       extraLibraries = [ bzip2 ];
        homepage = "https://github.com/snoyberg/bzlib-conduit";
        description = "Streaming compression/decompression via conduits";
        license = stdenv.lib.licenses.bsd3;
@@ -28461,7 +29175,7 @@ self: {
        pname = "c-dsl";
        version = "0.3.1";
        sha256 = "04hj3d26rp7ibv15n48y4xkfld3nnh6dqn8shxvw1h546z1316pw";
-       buildDepends = [ base language-c ];
+       libraryHaskellDepends = [ base language-c ];
        description = "A higher level DSL on top of language-c";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -28472,7 +29186,7 @@ self: {
        pname = "c-io";
        version = "0.1.0";
        sha256 = "1za4wcrjrxqk8yqy1bddzxw8xxx0vlxyy31dj1glb5azx6qh7qp2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "C IO";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28484,7 +29198,7 @@ self: {
        pname = "c-storable-deriving";
        version = "0.1.2";
        sha256 = "0cdy3fy8lpz5layc0qzixfpbx2jksl9smrf012l5rpl994dwc9x1";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/maurer/c-storable-deriving";
        description = "Generate C-like storable instances from datatypes";
        license = stdenv.lib.licenses.bsd3;
@@ -28498,7 +29212,7 @@ self: {
        sha256 = "0alzv8cdv5q6inhgp5zpms24460iqbgmwbc3l1fmf31p6jj802im";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base c0parser ];
+       executableHaskellDepends = [ base c0parser ];
        description = "Simple C0 Syntax Check";
        license = "GPL";
      }) {};
@@ -28509,7 +29223,7 @@ self: {
        pname = "c0parser";
        version = "0.2";
        sha256 = "0i6bsi30dkz51044r92gcgqr07bzbjfzgbr1z7p078j4016zb7cw";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Simple C0 Parser";
        license = "GPL";
      }) {};
@@ -28520,14 +29234,14 @@ self: {
        pname = "c10k";
        version = "0.5.0";
        sha256 = "1i62ilk95p1vjyk7gl1fv7lwq6yk3ysfn3v1bbyfpabf97gzr0d9";
-       buildDepends = [ base network unix ];
+       libraryHaskellDepends = [ base network unix ];
        homepage = "http://github.com/kazu-yamamoto/c10k";
        description = "C10k server library using prefork";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "c2hs" = callPackage
-    ({ mkDerivation, array, base, containers, directory, dlist
+    ({ mkDerivation, array, base, c2hs, containers, directory, dlist
      , filepath, HUnit, language-c, pretty, process, shelly
      , test-framework, test-framework-hunit, text, transformers
      }:
@@ -28537,18 +29251,19 @@ self: {
        sha256 = "0d1rgcwvz49v3h511dibiv6m06v8s179pg4sw386z17pz3a2hghm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory dlist filepath language-c pretty
          process
        ];
-       testDepends = [
+       testHaskellDepends = [
          base filepath HUnit shelly test-framework test-framework-hunit text
          transformers
        ];
+       testToolDepends = [ c2hs ];
        homepage = "https://github.com/haskell/c2hs";
        description = "C->Haskell FFI tool that gives some cross-language type safety";
        license = stdenv.lib.licenses.gpl2;
-     }) {};
+     }) { c2hs = null;};
 
   "c2hsc" = callPackage
     ({ mkDerivation, base, cmdargs, containers, directory, filepath
@@ -28560,7 +29275,7 @@ self: {
        sha256 = "0c5hzi4nw9n3ir17swbwymkymnpiw958z8r2hw6656ijwqkxvzgd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers directory filepath HStringTemplate
          language-c mtl pretty split transformers
        ];
@@ -28580,10 +29295,14 @@ self: {
        sha256 = "0g2z9ypnkxbva2h96ihf0slwg2wz389pxr974vn69v2sblkzl9c9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring Cabal conduit conduit-extra containers
          directory filepath process resourcet
        ];
+       executableHaskellDepends = [
+         attoparsec base bytestring Cabal conduit conduit-extra containers
+         directory filepath process
+       ];
        homepage = "http://www.mew.org/~kazu/proj/cab/";
        description = "A maintenance command of Haskell cabal packages";
        license = stdenv.lib.licenses.bsd3;
@@ -28599,7 +29318,7 @@ self: {
        sha256 = "02cfwka49fd399drv6rxb3hbxflpv6s1xfa7l759ihkp19d6ph9v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal directory filepath HTTP optparse-applicative
        ];
        jailbreak = true;
@@ -28609,8 +29328,8 @@ self: {
      }) {};
 
   "cabal-bounds" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-install, cabal-lenses, cmdargs
-     , directory, either, filepath, Glob, lens, process, strict, tasty
+    ({ mkDerivation, base, Cabal, cabal-lenses, cmdargs, directory
+     , either, filepath, Glob, lens, process, strict, tasty
      , tasty-golden, transformers, unordered-containers
      }:
      mkDerivation {
@@ -28619,14 +29338,14 @@ self: {
        sha256 = "1l1nqf8878kmmdc5ssrpn52cszn9w0ym70pjjbaprpa1c7mdbziy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal cabal-lenses cmdargs either lens strict transformers
          unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base directory filepath Glob process tasty tasty-golden
        ];
-       buildTools = [ cabal-install ];
        jailbreak = true;
        description = "A command line program for managing the bounds/versions of the dependencies in a cabal file";
        license = stdenv.lib.licenses.bsd3;
@@ -28643,12 +29362,13 @@ self: {
        sha256 = "08f3fpfsjj4kk5flxgpjvqffifhfkhnf7i4n23adkf7w1rdw4nlz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal cabal-lenses cmdargs directory either lens strict
          system-fileio system-filepath text transformers
          unordered-containers
        ];
-       testDepends = [ base filepath tasty tasty-golden ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base filepath tasty tasty-golden ];
        jailbreak = true;
        description = "A command line program for extracting compiler arguments from a cabal file";
        license = stdenv.lib.licenses.bsd3;
@@ -28662,7 +29382,7 @@ self: {
        sha256 = "06k43il8yiwbj6x3fhw64xdwq8d8qsmvvd1ycgml7vsry6cz6pdh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal optparse-applicative ];
+       executableHaskellDepends = [ base Cabal optparse-applicative ];
        jailbreak = true;
        homepage = "https://github.com/benarmston/cabal-constraints";
        description = "Repeatable builds for cabalized Haskell projects";
@@ -28681,7 +29401,7 @@ self: {
        sha256 = "1phksjb1ahg0dbgsxsckgmqvvhrzvpn02c3w26gbiq9diindx267";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base bytestring Cabal containers directory filepath
          mtl optparse-applicative pretty process tar utf8-string
        ];
@@ -28704,14 +29424,17 @@ self: {
        sha256 = "07wv05fi9sgh8v9239c4rvwrxrmwk7awmk5hpcnpyx8yj8z9z7q5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base bifunctors Cabal containers data-default debian
          deepseq Diff directory exceptions filepath hsemail HUnit lens
          memoize mtl network-uri newtype-generics optparse-applicative
          parsec pretty process pureMD5 regex-tdfa set-extra syb text unix
          Unixutils utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base Cabal debian lens mtl pretty Unixutils
+       ];
+       testHaskellDepends = [
          base Cabal containers debian Diff filepath hsemail HUnit lens
          pretty process text
        ];
@@ -28728,7 +29451,9 @@ self: {
        sha256 = "11bp5gmm0j0w5pbd26qd7w05v1mkkxi5gf28rlx44dzic55xpkld";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal containers directory filepath ];
+       executableHaskellDepends = [
+         base Cabal containers directory filepath
+       ];
        homepage = "http://github.com/jaspervdj/cabal-dependency-licenses";
        description = "Compose a list of a project's transitive dependencies with their licenses";
        license = stdenv.lib.licenses.bsd3;
@@ -28745,12 +29470,12 @@ self: {
        sha256 = "1372bpn8s7d7nm01ggp3m98ldrynidbchk3p14yrjysvxwr3l6q8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers directory filepath HTTP mtl
          network pretty process setenv tar template-haskell transformers
          zlib
        ];
-       buildTools = [ cabal-install ];
+       executableToolDepends = [ cabal-install ];
        jailbreak = true;
        homepage = "http://github.com/creswick/cabal-dev";
        description = "Manage sandboxed Haskell build environments";
@@ -28766,7 +29491,7 @@ self: {
        sha256 = "0kbq549bl18f1cd2q4w7nngsvnvgc3366xr7y37x5sw80rq5w5wg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ base Cabal directory filepath ];
        description = "show dist dir of 'cabal copy/install'";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28776,11 +29501,11 @@ self: {
      mkDerivation {
        pname = "cabal-file-th";
        version = "0.2.3";
-       revision = "1";
        sha256 = "0kawvb5n56rkq4453l6pia3wrr6jvvdwkghi6i176n1gm2zf2ri8";
+       revision = "1";
        editedCabalFile = "50bc6cf5a335a2608ab1e5e59b73f184d3f48d91f49fec189701416ff3e1e37e";
-       buildDepends = [ base Cabal directory template-haskell ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base Cabal directory template-haskell ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/nkpart/cabal-file-th";
        description = "Template Haskell expressions for reading fields from a project's cabal file";
        license = stdenv.lib.licenses.bsd3;
@@ -28794,7 +29519,10 @@ self: {
        sha256 = "1x7fpvvmr2mq7l960wgsijhyrdaiq3lnnl3z6drklc5p73pms8w6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath process ];
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [
+         base Cabal directory filepath process
+       ];
        homepage = "http://github.com/atnnn/cabal-ghci";
        description = "Set up ghci with options taken from a .cabal file";
        license = stdenv.lib.licenses.bsd3;
@@ -28811,7 +29539,7 @@ self: {
        sha256 = "105q051bna299pf1ka0r9bmqsbpzcg9vmbi5ynmalancgjpnm29a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory options parsec process split temporary
        ];
        homepage = "https://john-millikin.com/software/cabal-graphdeps/";
@@ -28831,11 +29559,15 @@ self: {
        sha256 = "1lq8i45wvk8rqilay7j9i9iv5irhqvdg3bp96mj2xxaxrpfi7l20";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring Cabal data-default directory filepath ghc-prim mtl
-         process template-haskell temporary transformers utf8-string
+       libraryHaskellDepends = [
+         base Cabal data-default directory filepath ghc-prim mtl process
+         transformers
        ];
-       testDepends = [ base extra unix ];
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath process template-haskell
+         temporary transformers utf8-string
+       ];
+       testHaskellDepends = [ base extra unix ];
        description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -28850,16 +29582,16 @@ self: {
      mkDerivation {
        pname = "cabal-install";
        version = "1.18.1.0";
-       revision = "1";
        sha256 = "1r1shhvnpgxf91rmbv3wa1rkd24plbgr6bpz3aj80ir0z3zbdayn";
+       revision = "1";
        editedCabalFile = "7f1c53bbf3a3906d0594e217d236e54acc015c67db88301dbadaf5008cb9ac4c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring Cabal containers directory filepath HTTP mtl
          network network-uri pretty process random stm time unix zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring Cabal containers directory filepath HTTP
          HUnit mtl network network-uri pretty process QuickCheck stm
          test-framework test-framework-hunit test-framework-quickcheck2 time
@@ -28888,11 +29620,11 @@ self: {
        sha256 = "1d5h7h2wjwc2s3dvsvzjgmmfrfl2312ym2h6kyjgm9wnaqw9w8wx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring Cabal containers directory filepath HTTP mtl
          network network-uri pretty process random stm time unix zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring Cabal containers directory
          extensible-exceptions filepath HTTP HUnit mtl network network-uri
          pretty process QuickCheck regex-posix stm test-framework
@@ -28918,11 +29650,11 @@ self: {
        sha256 = "0gsghmpn38idqivba8islfy5y1xhnhyjdyahdg7h7isc9kvq6isq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring Cabal containers directory filepath old-time
          pretty process time unix
        ];
-       extraLibraries = [ zlib ];
+       executableSystemDepends = [ zlib ];
        description = "The (bundled) command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28939,7 +29671,7 @@ self: {
        sha256 = "1fgy79w5bzzhqpnwgfd9jis9w6ix5wwdbwr2g556rxvmqsgl7mmg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base Cabal containers directory filepath HTTP network
          old-time pretty process random time unix zlib
        ];
@@ -28961,7 +29693,7 @@ self: {
        sha256 = "1ssk5h0hlv3aivzsr0iv90g683qkqmppc7glivhwfm6q1vkv9gmd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base Cabal containers directory filepath HTTP network
          old-time pretty process random time unix zlib
        ];
@@ -28978,7 +29710,7 @@ self: {
        pname = "cabal-lenses";
        version = "0.4.5";
        sha256 = "1v09n4mah5azb1hmc14ygiqwwm2an6ff2z2f9hw2c7jddbmays5n";
-       buildDepends = [ base Cabal lens unordered-containers ];
+       libraryHaskellDepends = [ base Cabal lens unordered-containers ];
        jailbreak = true;
        description = "Lenses and traversals for the Cabal library";
        license = stdenv.lib.licenses.bsd3;
@@ -28994,7 +29726,10 @@ self: {
        sha256 = "0rvmb6lx2alr7f0v7nbv48xzg7wp4nrn03hdkjc4a4c97rai14i9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Cabal directory fgl filepath parsec process text
+       ];
+       executableHaskellDepends = [
          base Cabal directory fgl filepath parsec process text
        ];
        jailbreak = true;
@@ -29013,8 +29748,13 @@ self: {
        sha256 = "14k8nv2kg8n9ssz6jivvin56jjazsvp4xg7zi0z6hcawfmcdmzd6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base shelly system-fileio system-filepath text ];
-       testDepends = [ base hspec shelly system-filepath text unix ];
+       libraryHaskellDepends = [ base shelly system-filepath text ];
+       executableHaskellDepends = [
+         base shelly system-fileio system-filepath text
+       ];
+       testHaskellDepends = [
+         base hspec shelly system-filepath text unix
+       ];
        homepage = "http://www.yesodweb.com/";
        description = "build multiple packages at once";
        license = stdenv.lib.licenses.bsd3;
@@ -29030,7 +29770,7 @@ self: {
        sha256 = "1wngmf73dqyyf9nfbpwyg3mvbp32rqrhhp4kf9nylhawwkv7c8v0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath process simple-get-opt vty
        ];
        description = "A monitor for cabal builds";
@@ -29047,7 +29787,7 @@ self: {
        sha256 = "1clwhlqm1k9km29i9b2c2ys59nfspsffrixr2sz824gnd415x3lk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory HTTP process tar
        ];
        homepage = "http://github.com/snoyberg/cabal-nirvana";
@@ -29063,7 +29803,7 @@ self: {
        sha256 = "0fz2hpm8fd49jhqdc9cwzvdq34b64zwn4ln8n77hxqx8rfw8zvif";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ base Cabal directory filepath ];
        jailbreak = true;
        description = "Show dependencies of program being built in current directory";
        license = stdenv.lib.licenses.bsd3;
@@ -29077,7 +29817,7 @@ self: {
        pname = "cabal-query";
        version = "0.1";
        sha256 = "0j4n48ngwins8bl7g3mazwmbwgyjpp17mi77c9j1klfgx7fam6wa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal derive ghc MissingH mtl tar template-haskell
          uniplate
        ];
@@ -29098,7 +29838,9 @@ self: {
        sha256 = "07ig7lwkf9lv10kacxcydpz3z6fhpmmpwcr6kq32xgh3larsf0g5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath process time unix ];
+       executableHaskellDepends = [
+         base Cabal directory filepath process time unix
+       ];
        homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
@@ -29110,7 +29852,7 @@ self: {
        pname = "cabal-scripts";
        version = "0.1.1";
        sha256 = "1ajgx29hvcsdd6lwc78dyhsjm5ikx2zn0kdbwnzn1kggz2l08ls4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Shell scripts for support of Cabal maintenance";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29124,7 +29866,7 @@ self: {
        sha256 = "0k1lnixkmgdjn8d2akhj60133brs424y0cwwzwraq7awx03y72bm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal ];
+       executableHaskellDepends = [ base Cabal ];
        homepage = "http://www.haskell.org/cabal/";
        description = "The user interface for building and installing Cabal packages";
        license = stdenv.lib.licenses.bsd3;
@@ -29141,7 +29883,7 @@ self: {
        sha256 = "1b8yr4k0mapysgh96dxabpzxznd65v8yrcba0jk6wda3mwlm1nqk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cereal directory filepath process tar zlib
        ];
        description = "Sign and verify Cabal packages";
@@ -29159,7 +29901,7 @@ self: {
        sha256 = "1991k6p8vvagnm8wpmzy84088whkqls1q4rdgir4f2m7r0wxl414";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers directory explicit-exception fgl
          filepath process transformers utility-ht
        ];
@@ -29180,7 +29922,7 @@ self: {
        sha256 = "1x8fb7hly9cxhfacwrai1zam6737dgfhjs9g85826f2cp4vp0g29";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring conduit conduit-extra containers directory filepath
          http-conduit http-types network process resourcet shelly
          system-fileio system-filepath tar text transformers
@@ -29198,7 +29940,9 @@ self: {
        sha256 = "11883q7zjy3l5qla5rvbmflm19kalvzqx7n1hprmiizr1kczh6ax";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal filepath ghc pqc QuickCheck ];
+       executableHaskellDepends = [
+         base Cabal filepath ghc pqc QuickCheck
+       ];
        description = "Automated test tool for cabal projects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29214,8 +29958,9 @@ self: {
        sha256 = "1qjshg9r6vh964mwsj0spsxcl3sdvll2znjd2hq4lw71va4iwm87";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath unix ];
-       testDepends = [ base hspec process regex-posix ];
+       libraryHaskellDepends = [ base directory filepath unix ];
+       executableHaskellDepends = [ base directory filepath unix ];
+       testHaskellDepends = [ base hspec process regex-posix ];
        description = "A program for finding temporary build file during cabal-test";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29226,7 +29971,7 @@ self: {
        pname = "cabal-test-compat";
        version = "0.2.0.0";
        sha256 = "15lxyrza1n9saac1awjx482gi7wq3sshqf4ich6k9xkfj464lrdq";
-       buildDepends = [ base Cabal QuickCheck ];
+       libraryHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "http://twitter.com/khibino/";
        description = "Compatibility interface of cabal test-suite";
        license = stdenv.lib.licenses.bsd3;
@@ -29238,7 +29983,7 @@ self: {
        pname = "cabal-test-quickcheck";
        version = "0.1.6";
        sha256 = "0rffvz3khxdfbl9rfk1q47xqv013dwmd4sy8cy7y833175j2zibi";
-       buildDepends = [ base Cabal QuickCheck ];
+       libraryHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/zmthy/cabal-test-quickcheck";
        description = "QuickCheck for Cabal";
        license = stdenv.lib.licenses.mit;
@@ -29252,7 +29997,7 @@ self: {
        sha256 = "0ys1c8z8042vc7dzmis47w0q3qapyllmsdkpb1by22qmcnaavii2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath mtl process ];
+       executableHaskellDepends = [ base directory filepath mtl process ];
        description = "Uninstall cabal packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29265,7 +30010,7 @@ self: {
        sha256 = "05k77hdx0sbgnn454vb6rc7mmrc3zby7s44x498i4ncrkivz90bz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base filepath HTTP network ];
+       executableHaskellDepends = [ base filepath HTTP network ];
        jailbreak = true;
        description = "Command-line tool for uploading packages to Hackage";
        license = stdenv.lib.licenses.bsd3;
@@ -29282,7 +30027,7 @@ self: {
        sha256 = "0sk10z9lj291rpidlaydp7nvgl7adbp7gyf2nvqqhrshxnlqpc8z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          archlinux base bytestring Cabal cmdargs containers directory
          filepath mtl pretty process
        ];
@@ -29300,7 +30045,9 @@ self: {
        sha256 = "1nqchq9mzq8k99agvafwa4vll7d3ahpkaifnjj2bnljqdkxlh9al";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal hsemail hxt parsec process ];
+       executableHaskellDepends = [
+         base Cabal hsemail hxt parsec process
+       ];
        jailbreak = true;
        homepage = "http://gregheartsfield.com/cabal2doap/";
        description = "Cabal to Description-of-a-Project (DOAP)";
@@ -29316,7 +30063,8 @@ self: {
        sha256 = "11fp52hmzkrgcmkxzclmq6bbzxsn0ph78ib6wzzkza5j2c48ya2l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal curl directory filepath ];
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ base curl directory ];
        homepage = "yet";
        description = "make gentoo's .ebuild file from .cabal file";
        license = stdenv.lib.licenses.bsd3;
@@ -29332,7 +30080,7 @@ self: {
        sha256 = "1fg3pr25f78a6b8nqxvxki4z3fvgx4i6zkmpl992a0iarycqdrsg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal cmdargs stylish-haskell system-fileio system-filepath
          text unordered-containers yaml
        ];
@@ -29348,16 +30096,16 @@ self: {
      mkDerivation {
        pname = "cabal2nix";
        version = "1.73";
-       revision = "5";
        sha256 = "1nskcr8k5a8wm9q5is0b1kww574q2nq45f16agya8z44hgk97xiv";
+       revision = "5";
        editedCabalFile = "54866b8081ddfc72761c1f38cc96df6782682058cd09b465300562910f57e2ea";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers deepseq directory filepath hackage-db mtl
          pretty process regex-posix transformers
        ];
-       testDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        homepage = "http://github.com/NixOS/cabal2nix";
        description = "Convert Cabal files into Nix build instructions";
@@ -29374,7 +30122,7 @@ self: {
        sha256 = "08y8rwj86n7f3bqfv2ximlx8qas12zspiz6ix8gg01whsry43nsj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal directory filepath haskell98 old-locale
          process tar time unix Unixutils zlib
        ];
@@ -29394,7 +30142,10 @@ self: {
        sha256 = "195wsfh813z6pmba3lz2xgfcqijcql6xwqsggqb5rmzqxbkvk0bd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal containers directory MissingH pretty ];
+       libraryHaskellDepends = [ base Cabal pretty ];
+       executableHaskellDepends = [
+         base Cabal containers directory MissingH
+       ];
        jailbreak = true;
        homepage = "http://github.com/creswick/cabal-query";
        description = "A simple tool to query cabal files";
@@ -29409,8 +30160,9 @@ self: {
        sha256 = "02brl9b1g3cyw5nmk0mih073kbszpc6g2nqgs0sh93h7y5naf5kp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath process ];
-       testDepends = [ base directory doctest filepath process ];
+       libraryHaskellDepends = [ base directory filepath process ];
+       executableHaskellDepends = [ base directory filepath process ];
+       testHaskellDepends = [ base directory doctest filepath process ];
        description = "alias for cabal install from given git repo";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -29425,7 +30177,7 @@ self: {
        sha256 = "1kgw1n22zh1ap6dfzhmh18d0wkr6ppd9b20r77f7q6m371hhbkvy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers directory filepath pretty process
        ];
        homepage = "http://code.haskell.org/~dons/code/cabalgraph";
@@ -29442,7 +30194,8 @@ self: {
        sha256 = "0pgkav4ifwkqh9idj8rpbnq3rw51i94dj1zw0wf7mv72bb32a0c6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal cabalrpmdeps haskell98 ];
+       libraryHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ];
+       executableHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ];
        homepage = "http://nanardon.zarb.org/darcsweb/darcsweb.cgi?r=haskell-cabalmdvrpm;a=shortlog;topi=0";
        description = "Create mandriva rpm from cabal package";
        license = "GPL";
@@ -29457,7 +30210,8 @@ self: {
        sha256 = "19kzbwpb9gv9knz1dfvck8yb1kda5dg9rig5xrsd118wgq6xpkr1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal filepath haskell98 ];
+       libraryHaskellDepends = [ base Cabal filepath haskell98 ];
+       executableHaskellDepends = [ base Cabal filepath haskell98 ];
        homepage = "http://nanardon.zarb.org/darcsweb/darcsweb.cgi?r=haskell-CabalRpmDeps;a=summary";
        description = "Autogenerate rpm dependencies from cabal files";
        license = "GPL";
@@ -29472,7 +30226,7 @@ self: {
        sha256 = "1ai2yz4whbjk9qfpyzjqkdypqknnzfdr1fdp5ii7h059na0q6iq2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal ];
+       executableHaskellDepends = [ base Cabal ];
        description = "Verify installed package version against user-specified constraints";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29487,7 +30241,7 @@ self: {
        sha256 = "0wj1x6gsr5jlnq0l6xgwy2y64jlxna7bvx7vwk73znf572rswmxk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring directory filepath optparse-applicative
          process unix
        ];
@@ -29501,9 +30255,9 @@ self: {
        pname = "cabocha";
        version = "0.1.0.0";
        sha256 = "0siqh3dly69b1kfm5y3q0sccqxx25hflwhizw6ga70icmvscwrwf";
-       buildDepends = [ base bytestring text ];
-       testDepends = [ base text-format ];
-       extraLibraries = [ cabocha ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ cabocha ];
+       testHaskellDepends = [ base text-format ];
        homepage = "http://github.com/pecorarista/hscabocha";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29517,7 +30271,7 @@ self: {
        pname = "cached-traversable";
        version = "0.1.0.1";
        sha256 = "05hlj6qdy0iqyi8z75h7fr9ijfhxngyr3v60q8y681acsgr54dv6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory filepath mtl
        ];
        description = "Transparent, persistent caching of lazy, traversable structures";
@@ -29530,7 +30284,7 @@ self: {
        pname = "caf";
        version = "0.0.3";
        sha256 = "1yrl3ffkfwgs4kljx57m1ldam087s7iby2qs74c4crxkrcj0j7a8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://sites.google.com/site/cafwiki/";
        description = "A library of Concurrency Abstractions using Futures";
        license = stdenv.lib.licenses.bsd3;
@@ -29542,7 +30296,7 @@ self: {
        pname = "cafeteria-prelude";
        version = "0.1.0.0";
        sha256 = "1iyasmd8zcg98vy7ffhxyyr664f02ird5z7rks9n67ixv7n60mrl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Scott-Fleischman/cafeteria-prelude";
        description = "Prelude subsets—take only what you want!";
        license = stdenv.lib.licenses.mit;
@@ -29558,7 +30312,7 @@ self: {
        pname = "caffegraph";
        version = "0.1.0.2";
        sha256 = "1yz427ygabkycvngqw250ksl17nwi0fy52x2fy3x6apg79cw1ng2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers fgl filepath graphviz language-lua lens
          mtl optparse-applicative process protocol-buffers
          protocol-buffers-descriptor template-haskell temporary text
@@ -29576,9 +30330,11 @@ self: {
        pname = "cairo";
        version = "0.13.1.0";
        sha256 = "0vi7glzizi2nvv0p5wsdxlpkx3f1875jpij26k2j4h0h6z53z3kb";
-       buildDepends = [ array base bytestring mtl text utf8-string ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ cairo ];
+       libraryHaskellDepends = [
+         array base bytestring mtl text utf8-string
+       ];
+       libraryPkgconfigDepends = [ cairo ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Cairo library";
        license = stdenv.lib.licenses.bsd3;
@@ -29592,7 +30348,7 @@ self: {
        sha256 = "1191j2587f1sy4d6z57df21xn00qdpv27clib7cyaqdy5jnv3zw2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cairo glib gtk ];
+       executableHaskellDepends = [ base cairo glib gtk ];
        description = "A template for building new GUI applications using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29608,13 +30364,15 @@ self: {
        sha256 = "168szg38gq0g0mppjszcsmsdygs8qy23w6xsz8gbg7dkh7izy1ba";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base binary bytestring cmdargs containers derive directory
-         filepath mtl parsek process pureMD5 regex-tdfa split
+       libraryHaskellDepends = [
+         base binary bytestring containers derive directory filepath mtl
+         parsek process pureMD5 split
+       ];
+       executableHaskellDepends = [
+         array base cmdargs directory filepath process regex-tdfa
        ];
        description = "A build-system library and driver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cake3" = callPackage
@@ -29629,11 +30387,15 @@ self: {
        sha256 = "0k045qqnivhmsvxas0zlmp9qgkb16917s4wk67l7mscgpi99fhdq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq directory filepath
+         haskell-src-meta language-javascript mime-types monadloc mtl parsec
+         process syb system-filepath template-haskell text text-format
+       ];
+       executableHaskellDepends = [
+         attoparsec base bytestring containers directory filepath
          haskell-src-meta language-javascript mime-types monadloc mtl
-         optparse-applicative parsec process syb system-filepath
-         template-haskell text text-format
+         optparse-applicative parsec process syb template-haskell text
        ];
        jailbreak = true;
        homepage = "https://github.com/grwlf/cake3";
@@ -29652,7 +30414,9 @@ self: {
        sha256 = "1a2ypgkpzzp2hn14x35ava0p0k781s7mhldw29ppl1an7fs91fyx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT gluturtle lojbanParser yjsvg yjtools ];
+       executableHaskellDepends = [
+         base GLUT gluturtle lojbanParser yjsvg yjtools
+       ];
        homepage = "http://homepage3.nifty.com/salamander/myblog/cakyrespa.html";
        description = "run turtle like LOGO with lojban";
        license = stdenv.lib.licenses.bsd3;
@@ -29665,8 +30429,8 @@ self: {
        pname = "cal3d";
        version = "0.1";
        sha256 = "1b4pajzpf879vns2kffkqgyk5sbsfrr3q2kv5ryvls8rgwcjc3q6";
-       buildDepends = [ base ];
-       extraLibraries = [ cal3d ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ cal3d ];
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "Haskell binding to the Cal3D animation library";
        license = "LGPL";
@@ -29681,7 +30445,7 @@ self: {
        sha256 = "1fj6v1dw1gyy6dx4ssiziahxf8j8vr4l35n3rm04g797wypswmw0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
+       executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "Examples for the Cal3d animation library";
        license = "GPL";
@@ -29694,7 +30458,7 @@ self: {
        pname = "cal3d-opengl";
        version = "0.1";
        sha256 = "02na1ww5dw08n2y7v2vkgdvzw0zpiic5683jac7f2zvhcij68sf2";
-       buildDepends = [ base cal3d OpenGL ];
+       libraryHaskellDepends = [ base cal3d OpenGL ];
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "OpenGL rendering for the Cal3D animation library";
        license = "LGPL";
@@ -29709,7 +30473,7 @@ self: {
        sha256 = "1h3rqxj2df68knrb2rhp75rc92q9knsa7jp749j9h24258yr6qxw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base harpy haskell98 mtl ];
+       executableHaskellDepends = [ array base harpy haskell98 mtl ];
        description = "A small compiler for arithmetic expressions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29723,8 +30487,8 @@ self: {
        sha256 = "1k21wf4gnq8h1a8nk5xx41yibc3azscxgkm8ajmjnj1a5w71wm8c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers haskeline parsec ];
-       testDepends = [ base containers parsec QuickCheck ];
+       executableHaskellDepends = [ base containers haskeline parsec ];
+       testHaskellDepends = [ base containers parsec QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/sumitsahrawat/calculator";
        description = "A calculator repl, with variables, functions & Mathematica like dynamic plots";
@@ -29741,7 +30505,10 @@ self: {
        sha256 = "0mlgxghah8mw0v17rywfj190kmc4jajpmjpgkpgfxdqzw8djyph0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory haskell98 mtl parsec readline
+       ];
+       executableHaskellDepends = [
          base containers directory haskell98 mtl parsec readline
        ];
        description = "Calculation tool and library supporting units";
@@ -29759,7 +30526,7 @@ self: {
        sha256 = "0mg3qn4zfsg5pvfp51zjvsy24mljkqh2f7bsjbz04zasx5852dz9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers cpphs lens mtl parsec transformers
        ];
        jailbreak = true;
@@ -29783,13 +30550,14 @@ self: {
        sha256 = "1hbzrhhx0cjgpxiq3200n38pl2m2y727zfmgfdfs45l1hqbvrldp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          audiovisual base bindings-portaudio boundingboxes colors containers
          control-bool deepseq directory filepath free freetype2 GLFW-b
          hashable JuicyPixels JuicyPixels-util lens linear mtl objective
          OpenGL OpenGLRaw random reflection template-haskell text
          transformers vector WAVE
        ];
+       executableHaskellDepends = [ base lens ];
        jailbreak = true;
        homepage = "https://github.com/fumieval/call";
        description = "The call game engine";
@@ -29806,9 +30574,10 @@ self: {
        sha256 = "0hav4kypy39lil49wrclrrajrwa5prmi7r7s6y9i3xshn1mhnjx1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring msgpack mtl template-haskell
        ];
+       executableHaskellDepends = [ base bytestring msgpack mtl ];
        jailbreak = true;
        homepage = "https://github.com/nh2/call-haskell-from-anything";
        description = "Python-to-Haskell function calls";
@@ -29824,7 +30593,7 @@ self: {
        sha256 = "0xk1rxydncwfwj9cg4jwdgi8mlgwmk5nfk462pla26dqqg44aw2p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring Imlib terminfo ];
+       executableHaskellDepends = [ base bytestring Imlib terminfo ];
        homepage = "not yet available";
        description = "Image converter to 256-colored text";
        license = stdenv.lib.licenses.bsd3;
@@ -29839,7 +30608,7 @@ self: {
        pname = "campfire";
        version = "0.2.1";
        sha256 = "06m5d7b6dqmp3x09b1nib1rxjh1gvx84bhvfnydlb26093za71b4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers filepath
          http-enumerator http-types mtl old-locale process text time
          transformers unordered-containers url
@@ -29857,7 +30626,7 @@ self: {
        pname = "canonical-filepath";
        version = "1.0.0.3";
        sha256 = "0dg9d4v08gykbjmzafpakgwc51mq5d5m6ilmhp68czpl30sqjhwf";
-       buildDepends = [ base deepseq directory filepath ];
+       libraryHaskellDepends = [ base deepseq directory filepath ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/canonical-filepath";
        description = "Abstract data type for canonical file paths";
@@ -29870,7 +30639,7 @@ self: {
        pname = "canteven-config";
        version = "1.0.0.0";
        sha256 = "1dkw0w43ajjgpczp8hmclr93v9scl75rlnsmxdjvwmv9phpj5559";
-       buildDepends = [ base unix yaml ];
+       libraryHaskellDepends = [ base unix yaml ];
        description = "A pattern for configuring programs";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -29883,7 +30652,7 @@ self: {
        pname = "canteven-log";
        version = "0.2.0.0";
        sha256 = "15gfic3yzi4wc06s9zfpxs0ygxbhasarfn92dj7h0aqfgqa0wvff";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base canteven-config directory filepath hslogger text yaml
        ];
        homepage = "https://github.com/SumAll/haskell-canteven-log";
@@ -29901,11 +30670,11 @@ self: {
        sha256 = "16dx8v29gfwrrfb2lwkjlwbbp8n6jdpdcmwh15rrfx97rz4k0qz3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath hxt hxt-xpath parsec
          split
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring Cabal containers directory filepath hspec hxt
          hxt-xpath parsec QuickCheck split
        ];
@@ -29927,11 +30696,11 @@ self: {
        sha256 = "0rmq22fiaadpszckbj5k5gi4sr1jipinyrx9hwc21k5d185vsakd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base cmdargs ConfigFile containers directory dlist filepath
          language-c mtl pretty process yices
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        homepage = "http://haslab.uminho.pt/mbb/software/cao-domain-specific-language-cryptography";
        description = "CAO Compiler";
        license = "GPL";
@@ -29946,7 +30715,7 @@ self: {
        sha256 = "1492x5hy5ljf0h40c045jd3w26f7jwqplgncka3dnw4mx9kq4g15";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers haskell98 ];
+       executableHaskellDepends = [ array base containers haskell98 ];
        description = "Interprets and debug the cap language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29958,7 +30727,7 @@ self: {
        pname = "capped-list";
        version = "1.2";
        sha256 = "0sik7svknaam6fhlvb4p1ijwaiwrgssrdl9gmq1wmfx66g069xi9";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy sequences, with a user-defined termination value";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29971,7 +30740,9 @@ self: {
        sha256 = "0hsrznygvn1b2qpc75591kzmcpqh7p5fhi1mw3ws2c75igjqbni7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath process ];
+       executableHaskellDepends = [
+         base Cabal directory filepath process
+       ];
        description = "A simple wrapper over cabal-install to operate in project-private mode";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29989,11 +30760,11 @@ self: {
        sha256 = "1cvpyad7kmkndan1bfpfaav6lara8g78x02pgascrq8n73b2jcgs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers exceptions gl lens linear mtl semigroups
          text transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit linear sdl2 test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
@@ -30012,7 +30783,7 @@ self: {
        sha256 = "1wi06n0cdqkvyqqr9ji7nyjn09qqckskrzi3djcnxgwhwwp8da3i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring filepath haskell98 IfElse MissingH
        ];
        homepage = "http://github.com/jdevelop/carboncopy";
@@ -30031,7 +30802,7 @@ self: {
        sha256 = "1vjrppsqmlxajj7dxr13ynipp0adi6xxpqic5mma04sjgi3afrj2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo directory filepath gtk hcwiid highlighting-kate mtl
          pandoc pango process time
        ];
@@ -30048,7 +30819,9 @@ self: {
        pname = "carray";
        version = "0.1.5.2";
        sha256 = "0kjqxjnamhnpjjf2bgm1gnsy6jx1fjbn5mx394pyx1vq3lkfgfb0";
-       buildDepends = [ array base binary bytestring ix-shapable syb ];
+       libraryHaskellDepends = [
+         array base binary bytestring ix-shapable syb
+       ];
        description = "A C-compatible array library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30063,8 +30836,10 @@ self: {
        sha256 = "05m4b8gi5ysx73yzlhl27fx9i8fnlihxwsyh6a0702kzwgn40icc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath time transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base directory filepath time transformers
+       ];
+       testHaskellDepends = [
          base directory filepath multiarg QuickCheck random tasty
          tasty-quickcheck tasty-th time transformers
        ];
@@ -30082,11 +30857,11 @@ self: {
        pname = "casadi-bindings";
        version = "2.3.0.1";
        sha256 = "1a1644lwzarfcjgnhzyi7lp0xhxmzm80h6nini6bcgkm4g4c9h4q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear vector vector-binary-instances
        ];
-       pkgconfigDepends = [ casadi ];
+       libraryPkgconfigDepends = [ casadi ];
        homepage = "http://github.com/ghorn/casadi-bindings";
        description = "mid-level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
@@ -30101,10 +30876,10 @@ self: {
        pname = "casadi-bindings-control";
        version = "2.0.0.1";
        sha256 = "03lpg9vp47db8wc4waajfh1z96f3nc1v29wqc9a58vrhfdnhp52w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base casadi-bindings-core casadi-bindings-internal vector
        ];
-       pkgconfigDepends = [ casadi_control ];
+       libraryPkgconfigDepends = [ casadi_control ];
        jailbreak = true;
        description = "low level bindings to casadi-control";
        license = stdenv.lib.licenses.gpl3;
@@ -30117,8 +30892,8 @@ self: {
        pname = "casadi-bindings-core";
        version = "2.3.0.1";
        sha256 = "0agzm3bqb3fii626m40684g7hahj2mhv60xx0smhw78z978cqw57";
-       buildDepends = [ base casadi-bindings-internal vector ];
-       pkgconfigDepends = [ casadi ];
+       libraryHaskellDepends = [ base casadi-bindings-internal vector ];
+       libraryPkgconfigDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30130,8 +30905,8 @@ self: {
        pname = "casadi-bindings-internal";
        version = "0.1.3.0";
        sha256 = "1kazy8xppydbl6gkdn1y1gv2lz38sif6i92crkxb476xz0fvmf00";
-       buildDepends = [ base vector ];
-       pkgconfigDepends = [ casadi ];
+       libraryHaskellDepends = [ base vector ];
+       libraryPkgconfigDepends = [ casadi ];
        homepage = "http://github.com/ghorn/casadi-bindings";
        description = "low level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
@@ -30146,10 +30921,10 @@ self: {
        pname = "casadi-bindings-ipopt-interface";
        version = "1.9.0.3";
        sha256 = "1h1qpl8ch8riz614fssirlp5j3vzi39jjajwjnfqvgw7h8sdam2a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base casadi-bindings-core casadi-bindings-internal vector
        ];
-       pkgconfigDepends = [ casadi_ipopt_interface ];
+       libraryPkgconfigDepends = [ casadi_ipopt_interface ];
        description = "low level bindings to casadi-ipopt_interface";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30163,10 +30938,10 @@ self: {
        pname = "casadi-bindings-snopt-interface";
        version = "1.9.0.3";
        sha256 = "0sygbbvdrd1za6k9yf0yqxfd48imlhghzf6sy0dh77jmdhlb8asw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base casadi-bindings-core casadi-bindings-internal vector
        ];
-       pkgconfigDepends = [ casadi_snopt_interface ];
+       libraryPkgconfigDepends = [ casadi_snopt_interface ];
        description = "low level bindings to casadi-snopt_interface";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30180,7 +30955,7 @@ self: {
        pname = "cascading";
        version = "0.1.0";
        sha256 = "0w9zhaf4a09nl3b1sffllgf0zc10lzy38a8k4f7sbc0hr45wzj5y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring colour containers lens mtl text
          utf8-string web-routes
        ];
@@ -30196,7 +30971,7 @@ self: {
        pname = "case-conversion";
        version = "0.1";
        sha256 = "1njnhbqj1c0zxr0vkb7qh51764f3hscjqjq2yzgyy1shfrc1y1i4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "www.xy30.com";
        description = "Convert between different cases";
        license = stdenv.lib.licenses.bsd3;
@@ -30210,8 +30985,8 @@ self: {
        pname = "case-insensitive";
        version = "1.2.0.4";
        sha256 = "07nm40r9yw2p9qsfp3pjbsmyn4dabrxw34p48171zmccdd5hv0v3";
-       buildDepends = [ base bytestring deepseq hashable text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq hashable text ];
+       testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit text
        ];
        homepage = "https://github.com/basvandijk/case-insensitive";
@@ -30225,7 +31000,7 @@ self: {
        pname = "cased";
        version = "0.1.0.0";
        sha256 = "08xdc0mpp6b6inaxh6cr6ni08sy2ahfcbq8xbs3m4cfqbrqfd543";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        homepage = "https://github.com/jb55/cased";
        description = "Track string casing in its type";
        license = stdenv.lib.licenses.mit;
@@ -30239,8 +31014,8 @@ self: {
        pname = "cases";
        version = "0.1.2.1";
        sha256 = "0p2dfnyj887bnp414psbmkin4ybmflvgr1q2npvcih2sxianywkd";
-       buildDepends = [ attoparsec base-prelude loch-th text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base-prelude loch-th text ];
+       testHaskellDepends = [
          base HTF HUnit loch-th placeholders QuickCheck text
        ];
        jailbreak = true;
@@ -30257,7 +31032,7 @@ self: {
        pname = "cash";
        version = "0.1.0.1";
        sha256 = "0pwn33dpv5bgs74i8x6q47hsbl0jg68xwhjjiwyjdyl6sb3rfih7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq haskell98 HaXml network parallel pretty
        ];
        jailbreak = true;
@@ -30276,7 +31051,7 @@ self: {
        pname = "cassandra-cql";
        version = "0.5.0.2";
        sha256 = "1nk0psvmzhvxls4h0p4blrm8qjn6lyh08bdxpiagpw6nrpvbda54";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers cryptohash Decimal hslogger
          MonadCatchIO-transformers mtl network resource-pool stm text time
          uuid
@@ -30291,7 +31066,7 @@ self: {
        pname = "cassandra-thrift";
        version = "0.8.5.1";
        sha256 = "0hmmi0g32nfwcny56sb4jw463jp7hiwj2hhv42bf8h9az30vjxwc";
-       buildDepends = [ base bytestring containers Thrift ];
+       libraryHaskellDepends = [ base bytestring containers Thrift ];
        homepage = "http://cassandra.apache.org/";
        description = "thrift bindings to the cassandra database";
        license = "unknown";
@@ -30308,11 +31083,11 @@ self: {
        pname = "cassava";
        version = "0.4.3.1";
        sha256 = "1b62zx6fna0nx3qvs316bwc39l8qan9fpm82f1p28ipkyq0ym2g3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
          hashable text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring hashable HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
          unordered-containers vector
@@ -30330,11 +31105,11 @@ self: {
        pname = "cassava-conduit";
        version = "0.2.0";
        sha256 = "09z7i147qs292xl3hqqi1x1kigrxdh5s8gzin12fgcpbyjggv30n";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bifunctors bytestring cassava conduit conduit-extra
          containers mtl
        ];
-       testDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/domdere/cassava-conduit";
        description = "Conduit interface for cassava package";
@@ -30351,8 +31126,10 @@ self: {
        sha256 = "08b144jm9805wqj68cgmh5j0bq03i439cpbxvq5m2k72m9s81kl7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cassava io-streams vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring cassava io-streams vector
+       ];
+       testHaskellDepends = [
          base bytestring cassava io-streams QuickCheck tasty
          tasty-quickcheck vector
        ];
@@ -30369,7 +31146,7 @@ self: {
        pname = "cassette";
        version = "0.1.0";
        sha256 = "04qnk1s4bdj3wbbxdwzzvpnhkcgma8c4qfkg454ybg7f8kyv6h7x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A combinator library for simultaneously defining parsers and pretty printers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30386,13 +31163,13 @@ self: {
        pname = "cassy";
        version = "0.7.1";
        sha256 = "0nm1xn7rkxqdap0k3lcl29jp7ajn5fypaqx3ag1zbyp8llc7xy0f";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base binary bytestring cassandra-thrift
          cereal conduit containers data-default errors exceptions mtl
          network resource-pool retry safecopy stm syb text Thrift time
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cassandra-thrift containers derive HUnit network
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text Thrift time
@@ -30414,7 +31191,7 @@ self: {
        sha256 = "0h6dvc8lzlxkgkqkj3zwxjdmws29g4fsw7p6ysd7i54xqb8vy5ka";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers optparse-applicative shelly system-fileio
          system-filepath text
        ];
@@ -30431,7 +31208,7 @@ self: {
        sha256 = "1vjhg9dxg23q0dqr07gbrg92h3m9r38d7jb3c4sxnw6gaj76f5gw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gtk haskell98 mtl parsec ];
+       executableHaskellDepends = [ base gtk haskell98 mtl parsec ];
        homepage = "http://code.atnnn.com/projects/casui";
        description = "Equation Manipulator";
        license = stdenv.lib.licenses.mit;
@@ -30444,7 +31221,7 @@ self: {
        pname = "catamorphism";
        version = "0.5.1.0";
        sha256 = "1lhqdr0l3wc59ms1i1xmwp6iy4n4xrd8pi0an0n0jgxw5j2sfbkq";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/frerich/catamorphism";
        description = "A package exposing a helper function for generating catamorphisms";
        license = stdenv.lib.licenses.bsd3;
@@ -30456,7 +31233,7 @@ self: {
        pname = "catch-fd";
        version = "0.2.0.2";
        sha256 = "05fvrkvqyj7xdn6vvdwhfbym7rg9fl7r7lzzcsr2cx59iqi23frx";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "http://github.com/sonyandy/catch-fd";
        description = "MonadThrow and MonadCatch, using functional dependencies";
@@ -30470,7 +31247,7 @@ self: {
        pname = "categorical-algebra";
        version = "0.0.0.1";
        sha256 = "1kx6195mfnw4aqmcd1m4s8z5l1s8zh69in00p9a0mxm3xj3pfvpl";
-       buildDepends = [ base newtype pointless-haskell void ];
+       libraryHaskellDepends = [ base newtype pointless-haskell void ];
        description = "Categorical Monoids and Semirings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30482,7 +31259,7 @@ self: {
        pname = "categories";
        version = "1.0.7";
        sha256 = "18ihv16g4w0s6n89c64j4998hbsgzhp5w9ph2gdkygq7f30cx7f2";
-       buildDepends = [ base void ];
+       libraryHaskellDepends = [ base void ];
        homepage = "http://github.com/ekmett/categories";
        description = "Categories";
        license = stdenv.lib.licenses.bsd3;
@@ -30501,7 +31278,7 @@ self: {
        pname = "category-extras";
        version = "1.0.2";
        sha256 = "168psp1qd80838b9945499qh99jidbl2gngcrjqk6hb0qsyhckcq";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions bifunctors categories comonad comonad-extras
          comonad-transformers comonads-fd contravariant distributive either
          free groupoids indexed indexed-extras invariant kan-extensions keys
@@ -30521,10 +31298,12 @@ self: {
      mkDerivation {
        pname = "cautious-file";
        version = "1.0.2";
-       revision = "1";
        sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq";
+       revision = "1";
        editedCabalFile = "c6183204fc6d4767c8b8c4b954f6908fd376054c28904866a90a66497970d893";
-       buildDepends = [ base bytestring directory filepath unix ];
+       libraryHaskellDepends = [
+         base bytestring directory filepath unix
+       ];
        description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30538,7 +31317,7 @@ self: {
        pname = "cayley-client";
        version = "0.1.3.0";
        sha256 = "0wzpnylzlyx0lanjqg44b134s2irb55072dz5s8ljq76acg1jmfl";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring exceptions http-client
          http-conduit lens lens-aeson mtl text transformers
          unordered-containers vector
@@ -30560,7 +31339,7 @@ self: {
        sha256 = "0yp2z0dpw19r6av71ghlp1pzal7276wlywsmjz5xmkggy04v1xnj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson ansi-wl-pprint base bytestring Cabal containers directory
          filepath mtl optparse-applicative process safe stringsearch tar
          transformers unix Unixutils utf8-string zlib
@@ -30580,12 +31359,12 @@ self: {
        sha256 = "0pvap67fn9kmjvn2qqq3x99k3mzrrsnb6q6fhawvyxv8drihsfc7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ cci ];
+       testHaskellDepends = [
          base binary bytestring cmdargs containers filepath mtl pretty
          process random time
        ];
-       extraLibraries = [ cci ];
        description = "Bindings for the CCI networking library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30597,7 +31376,7 @@ self: {
        pname = "ccnx";
        version = "0.0.0";
        sha256 = "18gnm6skzdnh6cis7l7v3d5813zn6irw6nywg6shffrn8v2y6xh7";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "http://tomahawkins.org";
        description = "A Haskell implementation of the CCNx network protocol";
@@ -30612,10 +31391,10 @@ self: {
        pname = "cctools-workqueue";
        version = "3.6.1.0.1.0.0.1";
        sha256 = "1nqczr2f4bv107sdhqnllqcaz413r4f69f9ypshig8jyxzpcdwn3";
-       buildDepends = [
+       libraryHaskellDepends = [
          bindings-cctools bytestring lens monad-loops unix
        ];
-       extraLibraries = [ dttools ];
+       librarySystemDepends = [ dttools ];
        homepage = "http://bitbucket.org/badi/hs-cctools-workqueue";
        description = "High-level interface to CCTools' WorkQueue library";
        license = stdenv.lib.licenses.gpl2;
@@ -30632,7 +31411,7 @@ self: {
        sha256 = "13nhwd07ly2ppgbakffr2cc2idacz0q5bahz0819jjascspm32vy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl parsec utf8-string
        ];
        jailbreak = true;
@@ -30649,8 +31428,8 @@ self: {
        pname = "cef";
        version = "0.1.2";
        sha256 = "0f5qj5xhmlys09i4vis3ricz0ym2hmdn53kgcb1qk23y0m4s94ci";
-       buildDepends = [ base bytestring text time ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ base bytestring text time ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/picussecurity/haskell-cef.git";
        description = "CEF log format";
        license = stdenv.lib.licenses.bsd3;
@@ -30666,11 +31445,11 @@ self: {
        pname = "ceilometer-common";
        version = "0.2.3";
        sha256 = "1zqqh7k627yw6vfcdihl2gw8hh3l9gxj283azmmcc9pm15grblps";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bimap binary bytestring containers foldl lens pipes siphash
          template-haskell text vaultaire-common
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bimap binary bytestring containers data-ordlist foldl hspec
          lens lens-properties mtl pipes QuickCheck siphash template-haskell
          text transformers vaultaire-common
@@ -30687,8 +31466,8 @@ self: {
        pname = "cellrenderer-cairo";
        version = "1.0.0.0";
        sha256 = "05cdrq1mrrhfbsk1w1dg5qayan0h9m92r4gqgcpzfa9a073w78zw";
-       buildDepends = [ base cairo glib gtk mtl ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base cairo glib gtk mtl ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        description = "Cairo-based CellRenderer";
        license = stdenv.lib.licenses.bsd3;
@@ -30700,7 +31479,9 @@ self: {
        pname = "cereal";
        version = "0.4.1.1";
        sha256 = "15rhfn9hrjm01ksh9xpz9syxsp9vkvpp6b736iqq38wv2wb7416z";
-       buildDepends = [ array base bytestring containers ghc-prim ];
+       libraryHaskellDepends = [
+         array base bytestring containers ghc-prim
+       ];
        description = "A binary serialization library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30713,10 +31494,10 @@ self: {
        pname = "cereal-conduit";
        version = "0.7.2.3";
        sha256 = "0s1s8jm25wxj44x44vjz4kz5qblkyjaz7f8rw5i81bzam32afj9s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal conduit resourcet transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal conduit HUnit mtl resourcet transformers
        ];
        homepage = "https://github.com/snoyberg/conduit";
@@ -30730,7 +31511,7 @@ self: {
        pname = "cereal-derive";
        version = "0.1.1";
        sha256 = "04mlg1r2qvrwdzcfbf1aqs4bf9n2gc7cwv73fbhld2ji5naa6fwb";
-       buildDepends = [ base cereal ghc-prim ];
+       libraryHaskellDepends = [ base cereal ghc-prim ];
        jailbreak = true;
        description = "Automatic deriving of Serialize using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
@@ -30742,7 +31523,7 @@ self: {
        pname = "cereal-enumerator";
        version = "0.3.1";
        sha256 = "0lpsj4f7v4sgrr6lf8jl07xwj8j3i3wj23as0imswk71f7xwfnnk";
-       buildDepends = [ base bytestring cereal enumerator ];
+       libraryHaskellDepends = [ base bytestring cereal enumerator ];
        description = "Deserialize things with cereal and enumerator";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30754,7 +31535,7 @@ self: {
        pname = "cereal-ieee754";
        version = "0.1";
        sha256 = "1gr22ziz9bj4q3y8j1vg46m648zqvbajfdks8p64xc28ci25pw2s";
-       buildDepends = [ array base cereal ];
+       libraryHaskellDepends = [ array base cereal ];
        jailbreak = true;
        homepage = "http://github.com/jystic/cereal-ieee754";
        description = "Floating point support for the 'cereal' serialization library";
@@ -30772,11 +31553,11 @@ self: {
        pname = "cereal-plus";
        version = "0.4.0";
        sha256 = "109y4ydhbl68rsi95fwck3gq1wvn9bpv0r9g9b7fm8wsgd06gipc";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal containers errors hashable hashtables
          mmorph mtl stm text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring cereal containers errors hashable hashtables
          HTF HUnit mmorph mtl QuickCheck quickcheck-instances stm text time
          unordered-containers vector
@@ -30794,7 +31575,7 @@ self: {
        pname = "cereal-text";
        version = "0.1.0.1";
        sha256 = "1wsp4zb6ib8fym4kaq6ixm7l2slljmz6waliab3dyb2zdl400spq";
-       buildDepends = [ base cereal text ];
+       libraryHaskellDepends = [ base cereal text ];
        homepage = "https://github.com/ulikoehler/cereal-text";
        description = "Data.Text instances for the cereal serialization library";
        license = stdenv.lib.licenses.asl20;
@@ -30806,8 +31587,8 @@ self: {
        pname = "cereal-vector";
        version = "0.2.0.1";
        sha256 = "0czrb4l1n73cfxxlzbcqfa34qa3gw0m5w5mlz0rawylyqfk8a1pz";
-       buildDepends = [ base bytestring cereal vector ];
-       testDepends = [ base cereal QuickCheck vector ];
+       libraryHaskellDepends = [ base bytestring cereal vector ];
+       testHaskellDepends = [ base cereal QuickCheck vector ];
        homepage = "https://github.com/acfoltzer/cereal-vector";
        description = "Serialize instances for Data.Vector types.";
        license = stdenv.lib.licenses.bsd3;
@@ -30824,7 +31605,7 @@ self: {
        sha256 = "18g5rq7lpxmvmlnz610537w6mix6z6kxjrfj2ylbhkc81r5pn9g6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-data base bytestring containers crypto-pubkey-types cryptohash
          directory filepath mtl pem process time
        ];
@@ -30841,11 +31622,11 @@ self: {
      mkDerivation {
        pname = "cf";
        version = "0.4.1";
-       revision = "1";
        sha256 = "1z8hqd06nrrbgmg2gpryalhnk4z0sxm7is46sgpy09x9p6xd0fqx";
+       revision = "1";
        editedCabalFile = "9fd574edfce6ea014201ccc3591638de0574f251290bcf0f44a8a00338131692";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
@@ -30865,7 +31646,7 @@ self: {
        sha256 = "1lwgqibxrs8n3czhpyg1halizsmz5jd8r2z8ham4pwi58815fzij";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers data-default dequeue mtl
        ];
        homepage = "https://github.com/bairyn/cfipu";
@@ -30883,7 +31664,7 @@ self: {
        pname = "cflp";
        version = "2009.2.1";
        sha256 = "01j4904fa8z2wmflqs3q1g3dg966dllbp2sbxxbghh0hhzwyg0vy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers control-monad-omega HUnit incremental-sat-solver
          level-monad logict MonadRandom mtl random stream-monad syb
          value-supply
@@ -30904,7 +31685,7 @@ self: {
        sha256 = "1vd1ilcdd1k081bg4nk1zazdsd9fbz7zzcz453ff0xxjp9xl1b3z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers data-default dequeue mtl
        ];
        description = "cfopu processor";
@@ -30923,7 +31704,7 @@ self: {
        sha256 = "0slsckr1xyn1b3vb2xhd2diqhr9cdbkn9g5hfsy0q6sjiy979vpl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cereal containers deepseq directory filepath
          hashable mtl parallel parsec process split text
          unordered-containers utf8-string void
@@ -30942,7 +31723,7 @@ self: {
        sha256 = "18k9na7gwmnmn5gdin1qi041cb7w49xcgdnjjpc3dhmfiqnq41q8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath mtl parsec regex-posix safe
          template-haskell
        ];
@@ -30961,7 +31742,7 @@ self: {
        pname = "cgi";
        version = "3001.2.2.2";
        sha256 = "0q1pxpa8gi42c0hsidcdkhk5xr5anfrvhqsn3iksr9c0rllhz193";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers exceptions mtl multipart network
          network-uri old-locale old-time parsec xhtml
        ];
@@ -30976,7 +31757,7 @@ self: {
        pname = "cgi-undecidable";
        version = "3000.0.0";
        sha256 = "1xh3q0s7398gd3513ycxypnj0m9jn0kdbb7459dsb459kbvzdpab";
-       buildDepends = [ base cgi mtl ];
+       libraryHaskellDepends = [ base cgi mtl ];
        description = "Undecidable instances for the cgi package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30986,10 +31767,10 @@ self: {
      mkDerivation {
        pname = "cgi-utils";
        version = "0.2.1";
-       revision = "1";
        sha256 = "0msljq31bz40hsrhhq9qhxrgmdlqq32l3ykcy4wviv8kmc3dic7p";
+       revision = "1";
        editedCabalFile = "df1cb1e658d9b79adde373fc31a1d7553a4803f8967c760abf233e75913ddd52";
-       buildDepends = [ base cgi containers mtl random ];
+       libraryHaskellDepends = [ base cgi containers mtl random ];
        homepage = "http://github.com/chrisdone/haskell-cgi-utils";
        description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)";
        license = stdenv.lib.licenses.bsd3;
@@ -31008,7 +31789,7 @@ self: {
        sha256 = "021cwllz5cljb9j0klh3xn4jpg2vxfqwqyjm631gkpzndc9711wr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal array async base bytestring cmdargs containers
          directory dlist either filepath ghc-prim mtl regex-posix safe split
          stm stringsearch unix-compat unordered-containers
@@ -31024,8 +31805,8 @@ self: {
        pname = "chain-codes";
        version = "0.3.0.0";
        sha256 = "0vw6qwgcljxgrjrsgkpkdqqnpxvibnsc0c4h5kyg5p8h4avsk8k6";
-       buildDepends = [ base containers JuicyPixels ];
-       testDepends = [ base containers hspec JuicyPixels ];
+       libraryHaskellDepends = [ base containers JuicyPixels ];
+       testHaskellDepends = [ base containers hspec JuicyPixels ];
        homepage = "http://github.com/Fuuzetsu/chain-codes";
        description = "Library decoding chain codes from images";
        license = stdenv.lib.licenses.gpl3;
@@ -31037,7 +31818,7 @@ self: {
        pname = "chalk";
        version = "0.1.0.1";
        sha256 = "0d9qp512ww5cpvv7pby4saqjxy9qyid3gf0gndqhglikcc0wayxy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/joom/chalk";
        description = "Terminal string styling";
@@ -31054,10 +31835,11 @@ self: {
        sha256 = "0786fxylzz73kgbyyy6pz5fhk7rfh4fnrbq0br7ghg74qka66sb9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring Codec-Image-DevIL containers
          data-reify directory GLUT OpenGLRaw process time
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/ChalkBoard";
        description = "Combinators for building and processing 2D images";
        license = stdenv.lib.licenses.bsd3;
@@ -31070,7 +31852,7 @@ self: {
        pname = "chalkboard-viewer";
        version = "0.1";
        sha256 = "1gvnp176j8gd0s6wzq10zpiqkn3wma99pwn3f78wgxm9rh588gh2";
-       buildDepends = [ array base chalkboard GLUT OpenGL time ];
+       libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ];
        jailbreak = true;
        homepage = "http://ittc.ku.edu/~andygill/chalkboard.php";
        description = "OpenGL based viewer for chalkboard rendered images";
@@ -31084,7 +31866,7 @@ self: {
        pname = "chalmers-lava2000";
        version = "1.5";
        sha256 = "1xrzh1mqa6d3hwr7lfazfskh6bklbj3kv9vlm40n650l2l42arga";
-       buildDepends = [ array base process random ];
+       libraryHaskellDepends = [ array base process random ];
        homepage = "http://projects.haskell.org/chalmers-lava2000/Doc/tutorial.pdf";
        description = "Hardware description EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -31096,7 +31878,7 @@ self: {
        pname = "chan-split";
        version = "0.5.0";
        sha256 = "1mzvrxcf263gs61hj7gafra1cqvpfbzy7rza7ql0xvnmj2g2ybrc";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "http://brandon.si/code/module-chan-split-released/";
        description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class.";
        license = stdenv.lib.licenses.bsd3;
@@ -31110,7 +31892,8 @@ self: {
        sha256 = "071qc0nhg4431c32z4qh23fiw1bjd1jc4s0sgq5v8ymwz4rfy9a2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory process ];
+       libraryHaskellDepends = [ base process ];
+       executableHaskellDepends = [ directory ];
        description = "Parse VCS changelogs into ChangeLogs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31126,7 +31909,11 @@ self: {
        sha256 = "0vi82z2c3km5shyk3wwb07y3cqcnkvkgvbl1s36a50kbz65jrl64";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base configurator containers heist mtl QuickCheck random snap text
+         xmlhtml
+       ];
+       executableHaskellDepends = [
          base configurator containers filepath heist lens mtl QuickCheck
          random snap snap-core snap-extras snap-server text xmlhtml
        ];
@@ -31145,7 +31932,7 @@ self: {
        pname = "charset";
        version = "0.3.7.1";
        sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers semigroups unordered-containers
        ];
        homepage = "http://github.com/ekmett/charset";
@@ -31159,7 +31946,7 @@ self: {
        pname = "charsetdetect";
        version = "1.0";
        sha256 = "1w302v6pmi448k2rq2cc7wp1javsd9rgk7r7i43lxvbjhniydn7p";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "http://www.github.com/batterseapower/charsetdetect";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
@@ -31172,7 +31959,7 @@ self: {
        pname = "charsetdetect-ae";
        version = "1.0.1";
        sha256 = "0bvdnv608glim8yn4dvh3av7x0fxxp3z6719j0n005bygdfgjxna";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/Aelve/charsetdetect-ae";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
        license = "LGPL";
@@ -31184,7 +31971,7 @@ self: {
        pname = "chart-histogram";
        version = "1.0.0";
        sha256 = "130jbbbb1spkbqapxys0bqr0spq6c03x1m259alg5wxnl8xnn4w5";
-       buildDepends = [ base Chart ];
+       libraryHaskellDepends = [ base Chart ];
        jailbreak = true;
        description = "Easily render histograms with Chart";
        license = stdenv.lib.licenses.bsd3;
@@ -31199,11 +31986,11 @@ self: {
        pname = "chaselev-deque";
        version = "0.5.0.5";
        sha256 = "1x2301faqkchkzrvbnganly341jilvg1fmx6lazgbs98cbazhn2d";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-deque array atomic-primops base ghc-prim transformers
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          abstract-deque abstract-deque-tests array atomic-primops base
          containers ghc-prim HUnit test-framework test-framework-hunit
          vector
@@ -31226,13 +32013,16 @@ self: {
        sha256 = "01594wp13kigqvr27112fmsrgz4cny4vlprqvyygp90k8mavxw8s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal containers deepseq directory filepath
          fullstop mbox MonadRandom parsec QuickCheck quickcheck-instances
          random-shuffle regex-tdfa regex-tdfa-text text tokenize
          transformers zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring cereal containers filepath text
+       ];
+       testHaskellDepends = [
          base cereal containers filepath HUnit parsec QuickCheck
          quickcheck-instances tasty tasty-ant-xml tasty-hunit
          tasty-quickcheck text tokenize
@@ -31252,7 +32042,7 @@ self: {
        pname = "chatty";
        version = "0.6.4.1";
        sha256 = "02garbdwhg32f089xd18w1i5hr9cbmvzk6cjdsl48w976liwqglz";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base chatty-utils directory mtl process random setenv
          template-haskell text time transformers unix
        ];
@@ -31268,7 +32058,7 @@ self: {
        pname = "chatty-text";
        version = "0.6.2.0";
        sha256 = "0gfgzqpdjja3ddz3hkynm31p9ma3g16qxavqcwybmp3v6h1pa2l3";
-       buildDepends = [ base chatty transformers ];
+       libraryHaskellDepends = [ base chatty transformers ];
        homepage = "http://doomanddarkness.eu/pub/chatty";
        description = "Provides some classes and types for dealing with text, using the fundaments of Chatty";
        license = stdenv.lib.licenses.agpl3;
@@ -31280,7 +32070,7 @@ self: {
        pname = "chatty-utils";
        version = "0.7.3.2";
        sha256 = "1d929y9zqj9mr99v691ymp0amy1x6nzkxjdaj3ylbgydjw1m3j8j";
-       buildDepends = [ base mtl text transformers ];
+       libraryHaskellDepends = [ base mtl text transformers ];
        homepage = "http://doomanddarkness.eu/pub/chatty";
        description = "Some utilities every serious chatty-based application may need";
        license = stdenv.lib.licenses.agpl3;
@@ -31297,9 +32087,12 @@ self: {
        sha256 = "0drx1hlqvdcrij4097q6bxhbfcqm73jsqv1wwhd3hsnjdmr46ch2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base blaze-html bytestring containers data-default http-types
-         mtl syb text uniplate wai wai-extra xss-sanitize
+       libraryHaskellDepends = [
+         base blaze-html containers data-default mtl syb text uniplate
+         xss-sanitize
+       ];
+       executableHaskellDepends = [
+         aeson base blaze-html bytestring http-types text wai wai-extra
        ];
        homepage = "http://github.com/jgm/cheapskate";
        description = "Experimental markdown processor";
@@ -31312,8 +32105,8 @@ self: {
        pname = "check-email";
        version = "1.0";
        sha256 = "1drw8rspdc4a7jw2ql3fi1dcmw56ah5csf2bil6ii8ccq5vsbfyz";
-       buildDepends = [ base bytestring email-validate ];
-       extraLibraries = [ resolv ];
+       libraryHaskellDepends = [ base bytestring email-validate ];
+       librarySystemDepends = [ resolv ];
        description = "Confirm whether an email is valid and probably existant";
        license = stdenv.lib.licenses.bsd3;
      }) { resolv = null;};
@@ -31328,7 +32121,7 @@ self: {
        sha256 = "18xhm11xwvy9cz149ddm3lj4gxb514jglwhdr50mkrdd4rw8w59f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers explicit-exception filepath haskell-src-exts
          non-empty transformers utility-ht
        ];
@@ -31345,7 +32138,7 @@ self: {
        pname = "checked";
        version = "0.1.0.1";
        sha256 = "00l04qxdid2pi885ixnyh91bsigsmk5rxb0jw6dl6j1mlcq27smd";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Bounds-checking integer types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31357,7 +32150,7 @@ self: {
        pname = "checkers";
        version = "0.4.3";
        sha256 = "0ry5c9c1hcp9rgf2h3gy5ajjp96anhp2738hgzrvf9aj90hr6n60";
-       buildDepends = [ array base QuickCheck random ];
+       libraryHaskellDepends = [ array base QuickCheck random ];
        description = "Check properties on standard classes and data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31370,7 +32163,7 @@ self: {
        pname = "chell";
        version = "0.4.0.1";
        sha256 = "0lb95abzxl4a87nfqxsxpb3a39pd52cci43hcvj8615hyhqvs2jz";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring options patience random
          template-haskell text transformers
        ];
@@ -31385,7 +32178,7 @@ self: {
        pname = "chell-hunit";
        version = "0.2.1";
        sha256 = "006l2j98gmgjrapyp00vz93hxlx9gwkdnxwh5nx293zp7vm27x00";
-       buildDepends = [ base chell HUnit ];
+       libraryHaskellDepends = [ base chell HUnit ];
        homepage = "https://john-millikin.com/software/chell/";
        description = "HUnit support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
@@ -31397,7 +32190,7 @@ self: {
        pname = "chell-quickcheck";
        version = "0.2.5";
        sha256 = "02bkcnx5k6r5csdnnkvk4wfd0l36nxb87i1463ynw17n7ym9s4cs";
-       buildDepends = [ base chell QuickCheck random ];
+       libraryHaskellDepends = [ base chell QuickCheck random ];
        homepage = "https://john-millikin.com/software/chell/";
        description = "QuickCheck support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
@@ -31409,7 +32202,9 @@ self: {
        pname = "chesshs";
        version = "0.2.1";
        sha256 = "0dydib3rf735wljyqij2g03xi0yxfviga5ws708nhg64f4kv8cfv";
-       buildDepends = [ array attoparsec base bytestring containers ];
+       libraryHaskellDepends = [
+         array attoparsec base bytestring containers
+       ];
        homepage = "http://arnovanlumig.com/chesshs.html";
        description = "Simple library for validating chess moves and parsing PGN files";
        license = stdenv.lib.licenses.bsd3;
@@ -31424,7 +32219,7 @@ self: {
        pname = "chevalier-common";
        version = "0.6.0";
        sha256 = "0fg7cb5ds2ixk046isz6wala7azaxqlfsacb1p7l9j6din9mgzrs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring cereal locators mtl network network-uri
          protobuf text unordered-containers vaultaire-common zeromq4-haskell
        ];
@@ -31442,7 +32237,7 @@ self: {
        pname = "chp";
        version = "2.2.0.1";
        sha256 = "18z0836hxs4ix7mdjxvpb40i4s71dc1j3vpxfh0vj8mf5drpc942";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq extensible-exceptions pretty stm
        ];
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
@@ -31457,7 +32252,7 @@ self: {
        pname = "chp-mtl";
        version = "1.0.0";
        sha256 = "1x14xl9hm9n3zczj6xhffvpac09q5a13i94fhkq2kzj2s3rk1b4z";
-       buildDepends = [ base chp chp-plus mtl ];
+       libraryHaskellDepends = [ base chp chp-plus mtl ];
        jailbreak = true;
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "MTL class instances for the CHP library";
@@ -31473,7 +32268,7 @@ self: {
        pname = "chp-plus";
        version = "1.3.1.2";
        sha256 = "1875fqf24jwl5vf2cys7yc70k0c53pg74i041y1xbrczincaww0z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base chp containers deepseq extensible-exceptions HUnit pretty
          QuickCheck stm
        ];
@@ -31491,7 +32286,9 @@ self: {
        pname = "chp-spec";
        version = "1.0.0";
        sha256 = "0jil6p0cw8bbpzb0kf9lxljdnbbp0xyq7c6x7bfc7291kqkafgdi";
-       buildDepends = [ base containers deepseq mtl pretty TypeCompose ];
+       libraryHaskellDepends = [
+         base containers deepseq mtl pretty TypeCompose
+       ];
        jailbreak = true;
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "A mirror implementation of chp that generates a specification of the program";
@@ -31505,7 +32302,7 @@ self: {
        pname = "chp-transformers";
        version = "1.0.0";
        sha256 = "0d4hcqpjxmns1fhq918s6z9f4bxlbjlkxzq5xkpqwjxpzy83wq23";
-       buildDepends = [ base chp chp-plus transformers ];
+       libraryHaskellDepends = [ base chp chp-plus transformers ];
        jailbreak = true;
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "Transformers instances for the CHP library";
@@ -31519,7 +32316,9 @@ self: {
        pname = "chronograph";
        version = "0.2.0.1";
        sha256 = "0qy2ahnp324jh0ybqwsa4nc3r2x1hkbrg6sl6f8dg1xnr0gpaag2";
-       buildDepends = [ base deepseq ghc-prim thyme vector-space ];
+       libraryHaskellDepends = [
+         base deepseq ghc-prim thyme vector-space
+       ];
        jailbreak = true;
        description = "measure timings of data evaluation";
        license = stdenv.lib.licenses.bsd3;
@@ -31534,7 +32333,7 @@ self: {
        pname = "chu2";
        version = "2012.11.20";
        sha256 = "01q34kzhisb8ani3k5dfjaixa7j1vqg0nh8mbmnya52hr7p4sdiz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default hack2 hack2-handler-snap-server
          utf8-string
        ];
@@ -31551,11 +32350,11 @@ self: {
        pname = "chuchu";
        version = "0.4.5";
        sha256 = "04xyylp5gliwpps753xqn8r72708ygxcp08j0fypc64ykhv5pnqc";
-       buildDepends = [
+       libraryHaskellDepends = [
          abacate ansi-wl-pprint base cmdargs lifted-base monad-control
          parsec text transformers
        ];
-       testDepends = [ base HUnit text transformers unix ];
+       testHaskellDepends = [ base HUnit text transformers unix ];
        jailbreak = true;
        homepage = "http://github.com/marcotmarcot/chuchu";
        description = "Behaviour Driven Development like Cucumber for Haskell";
@@ -31571,7 +32370,7 @@ self: {
        pname = "chunked-data";
        version = "0.2.0";
        sha256 = "0wmjpb0vq0nqvy317gmzxqh8yqq1bx0h2r90vqfpq3cv3z4g784s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers mono-traversable
          semigroups text transformers vector
        ];
@@ -31586,7 +32385,7 @@ self: {
        pname = "chunks";
        version = "2007.4.18";
        sha256 = "0qdwilzhbnx5zgga65lcwd6kzwvsbvi8ybfw9i4d8ziz89190fkz";
-       buildDepends = [ base haskell98 parsec template-haskell ];
+       libraryHaskellDepends = [ base haskell98 parsec template-haskell ];
        homepage = "http://www.wellquite.org/chunks/";
        description = "Simple template library with static safety";
        license = "LGPL";
@@ -31601,8 +32400,9 @@ self: {
        sha256 = "12g5hvb5qpbmfn1389wj7sfkc4qp19vg24gpn6j225yfyk8ccik7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring text ];
-       testDepends = [ base binary bytestring HUnit text ];
+       libraryHaskellDepends = [ base binary bytestring text ];
+       executableHaskellDepends = [ base binary bytestring text ];
+       testHaskellDepends = [ base binary bytestring HUnit text ];
        jailbreak = true;
        description = "Human-readable storage of text/binary objects";
        license = stdenv.lib.licenses.gpl3;
@@ -31614,7 +32414,7 @@ self: {
        pname = "church-list";
        version = "0.0.2";
        sha256 = "0xidwcn79acpg691n0xqk3q7xlprp9gibqkafn262zq24sks31xw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Removed; please see fmlist";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31626,7 +32426,7 @@ self: {
        pname = "cil";
        version = "0.1.1";
        sha256 = "0farjdyq6w33jm0qqdkfd6l7b8rr6k55dqfha643mj6nh1y904az";
-       buildDepends = [ base bytestring language-c ];
+       libraryHaskellDepends = [ base bytestring language-c ];
        jailbreak = true;
        homepage = "http://tomahawkins.org";
        description = "An interface to CIL";
@@ -31640,8 +32440,8 @@ self: {
        pname = "cinvoke";
        version = "0.1";
        sha256 = "0niz7banhrkcwdfp6w5gwy1brz1c26mylnlavi5zxgawfq4d3sl2";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ cinvoke ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ cinvoke ];
        homepage = "http://haskell.org/haskellwiki/Library/cinvoke";
        description = "A binding to cinvoke";
        license = stdenv.lib.licenses.bsd3;
@@ -31654,7 +32454,7 @@ self: {
        pname = "cio";
        version = "0.1.0";
        sha256 = "0518cbfyjh13ghihvnxvbhlw4060cqw5047bdrflphmigwbvpplb";
-       buildDepends = [ base monad-stm mtl parallel-io stm ];
+       libraryHaskellDepends = [ base monad-stm mtl parallel-io stm ];
        homepage = "https://github.com/nikita-volkov/cio";
        description = "A monad for concurrent IO on a thread pool";
        license = stdenv.lib.licenses.mit;
@@ -31670,10 +32470,10 @@ self: {
        pname = "cipher-aes";
        version = "0.2.11";
        sha256 = "05ahz6kjq0fl1w66gpiqy0vndli5yx1pbsbw9ni3viwqas4p3cfk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -31690,7 +32490,9 @@ self: {
        sha256 = "0qknpgg7dimx2nm4bzig7vvzcq3kvbxjv5rb0s4f2ina4vwczbhq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cereal crypto-api tagged ];
+       libraryHaskellDepends = [
+         base bytestring cereal crypto-api tagged
+       ];
        homepage = "https://github.com/TomMD/cipher-aes128";
        description = "AES and common modes using AES-NI when available";
        license = stdenv.lib.licenses.bsd3;
@@ -31705,10 +32507,10 @@ self: {
        pname = "cipher-blowfish";
        version = "0.0.3";
        sha256 = "0hb67gmiyqrknynz5am8nada1b1v47rqla87dw5nvfhxhl51fhcg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -31726,10 +32528,10 @@ self: {
        pname = "cipher-camellia";
        version = "0.0.2";
        sha256 = "19z2mi1rvp8fsqjdbmrm1hdlxmx61yr55fyknmmn945qrlvx234d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -31747,10 +32549,10 @@ self: {
        pname = "cipher-des";
        version = "0.0.6";
        sha256 = "1isazxa2nr1y13y0danfk7wghy34rfpn3f43rw714nk2xk6vrwc5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -31768,8 +32570,10 @@ self: {
        pname = "cipher-rc4";
        version = "0.1.4";
        sha256 = "0k9qf0cn5yxc4qlqikcm5yyrnkkvr6g3v7306cp8iwz7r4dp6zn6";
-       buildDepends = [ base byteable bytestring crypto-cipher-types ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base byteable bytestring crypto-cipher-types
+       ];
+       testHaskellDepends = [
          base bytestring crypto-cipher-tests crypto-cipher-types QuickCheck
          test-framework test-framework-quickcheck2
        ];
@@ -31784,7 +32588,7 @@ self: {
        pname = "cipher-rc5";
        version = "0.1.0.1";
        sha256 = "1ld4kdn0bd7ka448bl6df30iw3kd3mw7117qlwxyfzwbisdcsrif";
-       buildDepends = [ base split ];
+       libraryHaskellDepends = [ base split ];
        jailbreak = true;
        homepage = "http://github.com/fegu/cipher-rc5";
        description = "Pure RC5 implementation";
@@ -31797,7 +32601,7 @@ self: {
        pname = "circ";
        version = "0.0.4";
        sha256 = "0n3m7kjyqic10dl06zic5qjb1yb1ff8jn9d1wchrarkprcw25knc";
-       buildDepends = [ base directory mtl ];
+       libraryHaskellDepends = [ base directory mtl ];
        description = "A Compiler IR Compiler";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31808,7 +32612,7 @@ self: {
        pname = "circle-packing";
        version = "0.1.0.4";
        sha256 = "1sysyzhkjb7z4mn9hgxqiq0nd7ap3rs7w22swjrpnf8l1sv09xgv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Simple heuristic for packing discs of varying radii in a circle";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31819,7 +32623,7 @@ self: {
        pname = "cirru-parser";
        version = "0.0.2";
        sha256 = "11qnc8rbw9zxrsaa49x5wmkrnr0vi6pgb1j18nrn40sbbww95xrz";
-       buildDepends = [ aeson base text vector ];
+       libraryHaskellDepends = [ aeson base text vector ];
        homepage = "https://github.com/Cirru/parser.hs";
        description = "Cirru Parser in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -31835,12 +32639,12 @@ self: {
        pname = "citation-resolve";
        version = "0.4.3";
        sha256 = "1x561l7shkz1nh43xh2nj83pb183rah1swi0ql9n0wr9ykq1mh1l";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring citeproc-hs containers curl data-default
          directory download-curl either lens mtl process safe text
          transformers yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath hspec MissingH QuickCheck
        ];
        homepage = "https://github.com/nushio3/citation-resolve";
@@ -31858,7 +32662,7 @@ self: {
        pname = "citeproc-hs";
        version = "0.3.10";
        sha256 = "1fb51v8hv8ik3a8grba2br6cfbj1b3y72lgjh4i75xh09i7xna0r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath hexpat hs-bibutils
          HTTP json mtl network network-uri old-locale pandoc-types parsec
          syb time utf8-string
@@ -31880,7 +32684,7 @@ self: {
        sha256 = "1kwsmwm0yxvqdxxr7x13hmq4nm8a9plmsfkwbvfp13bbd4mwcxnj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring citeproc-hs containers directory filepath mtl
          pandoc pandoc-types parsec tagsoup texmath utf8-string yaml
        ];
@@ -31898,8 +32702,8 @@ self: {
        pname = "cityhash";
        version = "0.3.0.1";
        sha256 = "1nr0sqrvnsjkgyhlw55mnr69s5ddxk9f0bbpwkigqc7m457vkxi6";
-       buildDepends = [ base bytestring largeword ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring largeword ];
+       testHaskellDepends = [
          base bytestring largeword QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -31916,10 +32720,10 @@ self: {
        pname = "cjk";
        version = "0.1.0.1";
        sha256 = "1r0rw33vqkhck0mfqz19plw9a71f56gdcjldrxl23178fps349vl";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers text text-icu
        ];
-       testDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/batterseapower/cjk";
        description = "Data about Chinese, Japanese and Korean characters and languages";
        license = stdenv.lib.licenses.bsd3;
@@ -31936,7 +32740,7 @@ self: {
        sha256 = "1ajah3ma4ms2y2kg4wkasjycsqz728n6chx1lm1r3xaiv17akya8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers dsp optparse-applicative plailude pretty-tree safe
          split
        ];
@@ -31949,7 +32753,7 @@ self: {
   "clafer" = callPackage
     ({ mkDerivation, aeson, array, base, bytestring, cmdargs
      , containers, data-stringmap, directory, doctest, executable-path
-     , filepath, ghc, HTTP, HUnit, json-builder, lens, lens-aeson, mtl
+     , filepath, HTTP, HUnit, json-builder, lens, lens-aeson, mtl
      , network, network-uri, parsec, process, QuickCheck, split
      , string-conversions, tasty, tasty-hunit, tasty-th, text
      , transformers
@@ -31960,14 +32764,17 @@ self: {
        sha256 = "1xnjvqwdp7679hr6jkl6xnsrdidw494p1xr8mlng6gybflm8v9gn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array base bytestring cmdargs containers data-stringmap
          directory executable-path filepath HTTP json-builder lens
          lens-aeson mtl network network-uri parsec process split
          string-conversions text transformers
        ];
-       testDepends = [
-         base containers data-stringmap directory doctest filepath ghc HUnit
+       executableHaskellDepends = [
+         base cmdargs containers filepath mtl process split
+       ];
+       testHaskellDepends = [
+         base containers data-stringmap directory doctest filepath HUnit
          lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th
        ];
        homepage = "http://clafer.org";
@@ -31988,12 +32795,16 @@ self: {
        sha256 = "01ilmmhz1wd142qpclk1b5nksm6cacr07pdj5cl5prfv7y04k9nw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base clafer cmdargs containers data-stringmap directory
+       libraryHaskellDepends = [
+         array base clafer containers data-stringmap directory
          executable-path filepath haskeline HaXml json-builder mtl parsec
          process string-conversions transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base clafer cmdargs containers directory executable-path filepath
+         haskeline mtl transformers
+       ];
+       testHaskellDepends = [
          array base clafer cmdargs directory filepath HUnit tasty
          tasty-hunit tasty-th transformers
        ];
@@ -32012,7 +32823,7 @@ self: {
        pname = "claferwiki";
        version = "0.4.0";
        sha256 = "1in0lzph5h7v9z9b974ibzh0rq7j343q474i9zfkylmdd1aivdyh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clafer containers directory gitit MissingH mtl network
          network-uri process SHA split time transformers utf8-string
        ];
@@ -32030,7 +32841,9 @@ self: {
        sha256 = "0s94zxgcxq230y80kfqgim9yci3wqbq85byyvp0f0kqadsn4wmv1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring directory safe strict time ];
+       executableHaskellDepends = [
+         base bytestring directory safe strict time
+       ];
        jailbreak = true;
        description = "Command-line spaced-repetition software";
        license = stdenv.lib.licenses.mit;
@@ -32046,7 +32859,7 @@ self: {
        pname = "clash";
        version = "0.1.3.11";
        sha256 = "047dhg6y7yvp5vdarylry0q4l29a4x2dkjilk6j624lxcc17gyhx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-accessor data-accessor-template directory
          filepath ghc haskell98 pretty prettyclass template-haskell tfp
          th-lift time transformers utility-ht vhdl
@@ -32071,14 +32884,13 @@ self: {
        sha256 = "1lwc47b2iw2l7djga11gp4xdikb8gycqv4fxz1cxrf23xzkg5ggg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bifunctors bytestring clash-lib clash-prelude
          clash-systemverilog clash-verilog clash-vhdl containers directory
          filepath ghc ghc-typelits-natnormalise hashable haskeline lens mtl
          process text transformers unbound-generics unix
          unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
@@ -32096,7 +32908,7 @@ self: {
        pname = "clash-lib";
        version = "0.5.10";
        sha256 = "039j561r7kgrd5b7z55axgjniwm5yi5y1y0azps4ipmvjsvalbdl";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath hashable lens mtl
          pretty process template-haskell text time transformers
@@ -32116,11 +32928,11 @@ self: {
        pname = "clash-prelude";
        version = "0.9.2";
        sha256 = "1gl75mbqpv5g5dwg2c2vvqn36ydwhkcv7g6i8gjm41500dsrky0i";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base data-default ghc-prim ghc-typelits-natnormalise
          integer-gmp lens QuickCheck singletons template-haskell th-lift
        ];
-       testDepends = [ base doctest Glob ];
+       testHaskellDepends = [ base doctest Glob ];
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Prelude library";
        license = stdenv.lib.licenses.bsd2;
@@ -32133,7 +32945,7 @@ self: {
        pname = "clash-prelude-quickcheck";
        version = "0.1.2.1";
        sha256 = "1fn5wlg2lmxl6rs2ygnf0m88bgcjf62jpprbp425pqbq6lvhw70w";
-       buildDepends = [ base clash-prelude QuickCheck ];
+       libraryHaskellDepends = [ base clash-prelude QuickCheck ];
        jailbreak = true;
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
@@ -32148,7 +32960,7 @@ self: {
        pname = "clash-systemverilog";
        version = "0.5.7";
        sha256 = "0s8yqs4h5abamfrawfw95q9p0h8ni98pwyqr76nkvkrybxwykam5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
        ];
@@ -32166,7 +32978,7 @@ self: {
        pname = "clash-verilog";
        version = "0.5.7";
        sha256 = "04wa7y108hk2bn453dwrr1x71bvxx48hivdpqxsx0gyhya14143j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
        ];
@@ -32183,7 +32995,7 @@ self: {
        pname = "clash-vhdl";
        version = "0.5.8";
        sha256 = "08qplvnal8jjqy8rkivgn53n8qpzk232dslqxypx6ky6fks3bc0w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
        ];
@@ -32199,7 +33011,7 @@ self: {
        pname = "classify";
        version = "2013.11.6.1";
        sha256 = "03d4ygqhqbg4cvfjp8c5cyy0fkgf1fpzc1li45bqc555jrxwszwr";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Library for classification of media files";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -32212,7 +33024,7 @@ self: {
        pname = "classy-parallel";
        version = "0.1.0.0";
        sha256 = "0vfik37g2fwzc4p343hag5aidvi77396vfhfdx1207gahbzqf21v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control parallel resourcet transformers
        ];
        jailbreak = true;
@@ -32232,14 +33044,14 @@ self: {
        pname = "classy-prelude";
        version = "0.12.1.1";
        sha256 = "04rxmh4jzj4j5dx9i8ndh9ibn01cjdi485n1xvjngx0gs7zqa2k7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base basic-prelude bifunctors bytestring chunked-data containers
          dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base
          mono-traversable mtl mutable-containers primitive semigroups stm
          text time time-locale-compat transformers unordered-containers
          vector vector-instances
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec QuickCheck transformers unordered-containers
        ];
        homepage = "https://github.com/snoyberg/classy-prelude";
@@ -32256,11 +33068,11 @@ self: {
        pname = "classy-prelude-conduit";
        version = "0.12.0.1";
        sha256 = "1xv20i31f1za88kkdd00vin9shn9zxhqmwd0ln62cag4xfrmh9xi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring classy-prelude conduit conduit-combinators
          monad-control resourcet transformers void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit hspec QuickCheck transformers
        ];
        homepage = "https://github.com/snoyberg/classy-prelude";
@@ -32277,7 +33089,7 @@ self: {
        pname = "classy-prelude-yesod";
        version = "0.12.0.1";
        sha256 = "00pzlsbsdajzdlna1flrdd1lb98g0vx2b9757m8kfa37h6l443r2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base classy-prelude classy-prelude-conduit data-default
          http-conduit http-types persistent yesod yesod-newsfeed
          yesod-static
@@ -32294,11 +33106,11 @@ self: {
      mkDerivation {
        pname = "clay";
        version = "0.10.1";
-       revision = "1";
        sha256 = "0m0ajbgypn9ki741x2bmcmpmpkccazv76wh8b9gha9483cl21f1v";
+       revision = "1";
        editedCabalFile = "8ecb3c320c9470f2bf250552d7fac738520d90d28e8e90b11922d1c4940a0263";
-       buildDepends = [ base mtl text ];
-       testDepends = [
+       libraryHaskellDepends = [ base mtl text ];
+       testHaskellDepends = [
          base HUnit mtl test-framework test-framework-hunit text
        ];
        homepage = "http://fvisser.nl/clay";
@@ -32322,7 +33134,7 @@ self: {
        pname = "clckwrks";
        version = "0.23.8";
        sha256 = "0inhxyjs12990mngfx2n3m107wxnamgi4gby5lnvai5nz913qgzd";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
          happstack-hsp happstack-jmacro happstack-server
@@ -32333,8 +33145,8 @@ self: {
          web-plugins web-routes web-routes-happstack web-routes-hsp
          web-routes-th xss-sanitize
        ];
-       buildTools = [ hsx2hs ];
-       extraLibraries = [ openssl ];
+       librarySystemDepends = [ openssl ];
+       libraryToolDepends = [ hsx2hs ];
        jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "A secure, reliable content management system (CMS) and blogging platform";
@@ -32352,7 +33164,7 @@ self: {
        sha256 = "1dwvrxz2sjk61bbima9m70qv6gf4h4jx9yysmwnwpinmmqixwdi3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          acid-state base clckwrks haskeline mtl network parsec
        ];
        homepage = "http://www.clckwrks.com/";
@@ -32372,12 +33184,12 @@ self: {
        sha256 = "0f39ws919qy00090l002k3g8dkcldq7rwayf0wyxg8mfycrnb700";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base clckwrks clckwrks-plugin-media clckwrks-plugin-page
          clckwrks-theme-clckwrks containers happstack-server hsp mtl network
          text web-plugins
        ];
-       buildTools = [ hsx2hs ];
+       executableToolDepends = [ hsx2hs ];
        jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "clckwrks.com";
@@ -32397,14 +33209,14 @@ self: {
        pname = "clckwrks-plugin-bugs";
        version = "0.7.5";
        sha256 = "0la4ivk8sbh8wq1g2nhxx522ir2idffz5818bghjf8qffmqa47fv";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state attoparsec base cereal clckwrks clckwrks-plugin-page
          containers directory filepath happstack-authenticate happstack-hsp
          happstack-server hsp ixset mtl network network-uri reform
          reform-happstack reform-hsp safecopy text time web-plugins
          web-routes web-routes-th
        ];
-       buildTools = [ hsx2hs ];
+       libraryToolDepends = [ hsx2hs ];
        jailbreak = true;
        homepage = "http://clckwrks.com/";
        description = "bug tracking plugin for clckwrks";
@@ -32423,13 +33235,13 @@ self: {
        pname = "clckwrks-plugin-ircbot";
        version = "0.6.14";
        sha256 = "1lrh2929ia6326vf9lyd5jy1a3nnavl8f27f9faw35871p1my1r2";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state attoparsec base blaze-html bytestring clckwrks
          containers directory filepath happstack-hsp happstack-server hsp
          ircbot ixset mtl network reform reform-happstack reform-hsp
          safecopy text web-plugins web-routes web-routes-th
        ];
-       buildTools = [ hsx2hs ];
+       libraryToolDepends = [ hsx2hs ];
        homepage = "http://clckwrks.com/";
        description = "ircbot plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -32447,13 +33259,13 @@ self: {
        pname = "clckwrks-plugin-media";
        version = "0.6.13";
        sha256 = "0j6ijdq3n011h4d0gxxpjs35kwppp2kyjkg0bjcdw752ppk4y14w";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state attoparsec base blaze-html cereal clckwrks containers
          directory filepath gd happstack-server hsp ixset magic mtl reform
          reform-happstack reform-hsp safecopy text web-plugins web-routes
          web-routes-th
        ];
-       buildTools = [ hsx2hs ];
+       libraryToolDepends = [ hsx2hs ];
        homepage = "http://clckwrks.com/";
        description = "media plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -32472,14 +33284,14 @@ self: {
        pname = "clckwrks-plugin-page";
        version = "0.4.0";
        sha256 = "0j82xzdgpy97s4xf6vx3an5ssbybcixhasmh0ca9bjmv9iqkjkws";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state aeson attoparsec base clckwrks containers directory
          filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
          old-locale random reform reform-happstack reform-hsp safecopy
          tagsoup template-haskell text time time-locale-compat uuid
          web-plugins web-routes web-routes-happstack web-routes-th
        ];
-       buildTools = [ hsx2hs ];
+       libraryToolDepends = [ hsx2hs ];
        homepage = "http://www.clckwrks.com/";
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -32494,11 +33306,11 @@ self: {
        pname = "clckwrks-theme-bootstrap";
        version = "0.4.0";
        sha256 = "08sdklr7nikngkdcls9dwy0ij4nqrb1n6dnkm3cw73iaifsl6klz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
          mtl text web-plugins
        ];
-       buildTools = [ hsx2hs ];
+       libraryToolDepends = [ hsx2hs ];
        homepage = "http://www.clckwrks.com/";
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -32513,7 +33325,7 @@ self: {
        pname = "clckwrks-theme-clckwrks";
        version = "0.5.0";
        sha256 = "06szqp7mcak7ra1pzxzmj8hzhm1lmdr7nwjkxk1h8bba5ipcjwhv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clckwrks containers happstack-authenticate hsp hsx2hs mtl text
          web-plugins
        ];
@@ -32529,7 +33341,7 @@ self: {
        pname = "clckwrks-theme-geo-bootstrap";
        version = "0.1.1";
        sha256 = "1qxik7hdz300n5lfb5xzh2md44b4xwwlr0c92y9x2na2xz41da7k";
-       buildDepends = [ base clckwrks hsp text ];
+       libraryHaskellDepends = [ base clckwrks hsp text ];
        jailbreak = true;
        homepage = "http://divshot.github.com/geo-bootstrap/";
        description = "geo bootstrap based template for clckwrks";
@@ -32542,10 +33354,10 @@ self: {
      mkDerivation {
        pname = "cld2";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "0fsjp0y5f17gv3k43vbxgx7w6i2l4ralrc6g1wb0xi0gp1vrm3hd";
+       revision = "1";
        editedCabalFile = "60506ceb359329f803a733a06f9a6060a31cab7e86dd4a8e3fd843953cb4cfbd";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/dfoxfranke/haskell-cld2";
        description = "Haskell bindings to Google's Compact Language Detector 2";
        license = stdenv.lib.licenses.asl20;
@@ -32560,7 +33372,9 @@ self: {
        sha256 = "0s894l3vjjkz94cvl5hv3vdpm934k7ila60kmr6acl7pvhppnc22";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cmdargs containers directory HSH IfElse ];
+       executableHaskellDepends = [
+         base cmdargs containers directory HSH IfElse
+       ];
        homepage = "https://github.com/ivanperez-keera/clean-home";
        description = "Keep your home dir clean by finding old conf files";
        license = stdenv.lib.licenses.bsd3;
@@ -32572,7 +33386,7 @@ self: {
        pname = "clean-unions";
        version = "0.1.1";
        sha256 = "1y4cj15s6gjcazwk0iycyc2qs7chrqcvchf4g5h4xnf2x8ld4i21";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/fumieval/clean-unions";
        description = "Open unions without need for Typeable";
        license = stdenv.lib.licenses.bsd3;
@@ -32588,7 +33402,7 @@ self: {
        sha256 = "16v2hj2qxw7ij8aqhbx11fs4ss62d4d0jwi4mk0kc76yfdwl61hg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base highlighting-kate optparse-applicative process terminfo
          wl-pprint-extras wl-pprint-terminfo
        ];
@@ -32606,7 +33420,8 @@ self: {
        sha256 = "0nnczd93j160747dc11z06ds81g938bw8lnqywg7mgylsfxalznl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers mtl parsec ];
+       libraryHaskellDepends = [ base containers mtl parsec ];
+       executableHaskellDepends = [ parsec ];
        homepage = "http://sandbox.pocoo.org/clevercss-hs/";
        description = "A CSS preprocessor";
        license = stdenv.lib.licenses.bsd3;
@@ -32621,7 +33436,7 @@ self: {
        sha256 = "0iychwxbmnlywv7b7fpxym0ybcbk0aba9p0pvg8brs6llz2qrn9x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/NicolasDP/hs-cli";
        description = "Simple Command Line Interface Library";
        license = stdenv.lib.licenses.bsd3;
@@ -32637,7 +33452,7 @@ self: {
        sha256 = "0ngvdq0i82qxwawqb5pqa3fscnyv1kxc3ifc3qijnn5v4py9ydd8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers GLFW Hipmunk MonadRandom mtl OpenGL random StateVar
          transformers
        ];
@@ -32658,11 +33473,12 @@ self: {
        sha256 = "08h0461ydhfymw2pya472n81kx5rqp7awfgxlbz2r851rl5kqmn9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cereal cipher-aes cprng-aes
          crypto-api crypto-random directory entropy setenv skein tagged
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base bytestring cereal containers hspec HUnit QuickCheck
          transformers
        ];
@@ -32684,13 +33500,18 @@ self: {
        sha256 = "00xxvwa60ihrd24267hzs5ssjm6nrli39qlh9gm4fkdnrzif9r4r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base cereal Chart Chart-cairo colour converge criterion
-         data-default-class data-ordlist deepseq derive gnuplot hspec lens
-         MemoTrie monoid-extras nats numeric-prelude permutation QuickCheck
-         reflection semigroupoids stream-fusion tagged vector
+       libraryHaskellDepends = [
+         base cereal converge criterion data-ordlist deepseq derive hspec
+         lens MemoTrie monoid-extras nats numeric-prelude permutation
+         QuickCheck reflection semigroupoids stream-fusion tagged vector
+       ];
+       executableHaskellDepends = [
+         base Chart Chart-cairo colour data-default-class gnuplot lens
+         numeric-prelude stream-fusion
+       ];
+       testHaskellDepends = [
+         base hspec nats numeric-prelude QuickCheck
        ];
-       testDepends = [ base hspec nats numeric-prelude QuickCheck ];
        jailbreak = true;
        homepage = "http://github.com/spacekitteh/haskell-clifford";
        description = "A Clifford algebra library";
@@ -32704,7 +33525,7 @@ self: {
        pname = "clippard";
        version = "0.1.1";
        sha256 = "0qhi727irlkvi4ygx5qvd6h1zzz22588lymi39s0gcjir473a538";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        jailbreak = true;
        homepage = "https://github.com/Raynes/clippard";
        description = "A simple Haskell library for copying text to the clipboard in a cross-platform way";
@@ -32717,7 +33538,7 @@ self: {
        pname = "clipper";
        version = "0.0.1";
        sha256 = "0s4n8d07190yarkxpa2kjphkm6lw2ljgwcix3x6m3lxcxrvc3nr0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/chetant/clipper";
        description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)";
        license = stdenv.lib.licenses.bsd3;
@@ -32735,11 +33556,13 @@ self: {
        sha256 = "0dm0cpqcv8r66zlwq7myjv7klpp43lbcwdgxs2zkg6mbsb2f1qvr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bifunctors bytestring cassava data-default old-locale parsec
-         safecopy strptime time
+       libraryHaskellDepends = [
+         base bifunctors data-default old-locale parsec strptime time
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bifunctors bytestring cassava parsec safecopy
+       ];
+       testHaskellDepends = [
          assertions base data-default filepath old-locale parsec time
        ];
        description = "A parser/generator for Kindle-format clipping files (`My Clippings.txt`),";
@@ -32753,7 +33576,7 @@ self: {
        pname = "clist";
        version = "0.1.0.0";
        sha256 = "1jvkv6dwx2gm59vczmiagpxb0614fz63jzqrqm81bdai8yb0gpzd";
-       buildDepends = [ base base-unicode-symbols peano ];
+       libraryHaskellDepends = [ base base-unicode-symbols peano ];
        homepage = "https://github.com/strake/clist.hs";
        description = "Counted list";
        license = "unknown";
@@ -32765,8 +33588,8 @@ self: {
        pname = "clock";
        version = "0.5.1";
        sha256 = "1ncph7vi2q6ywwc8ysxl1ibw6i5dwfvln88ssfazk8jgpj4iyykw";
-       buildDepends = [ base ];
-       testDepends = [ base tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/corsis/clock";
        description = "High-resolution clock functions: monotonic, realtime, cputime";
        license = stdenv.lib.licenses.bsd3;
@@ -32780,10 +33603,10 @@ self: {
        pname = "clocked";
        version = "0.4.1.3";
        sha256 = "1z9n4nisa73zlwch7arixg6633w3jmcqw5w97jf4p5559q874wi8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clock containers MonadCatchIO-transformers transformers
        ];
-       pkgconfigDepends = [ QtCore ];
+       libraryPkgconfigDepends = [ QtCore ];
        homepage = "http://patch-tag.com/r/shahn/clocked/home";
        description = "timer functionality to clock IO commands";
        license = stdenv.lib.licenses.gpl3;
@@ -32798,7 +33621,7 @@ self: {
        pname = "clogparse";
        version = "0.2";
        sha256 = "17n5rwi64wjyv2xcxm86bawgmnpfrg7fjzwr9l3bj5jg0ggbyrbx";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring filepath text time timezone-olson
          timezone-series
        ];
@@ -32818,7 +33641,7 @@ self: {
        sha256 = "1mif1cqwpgp1wis7lplqrvv5aikdl0iv5ddazwgm6zgrxz645p09";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring directory github optparse-applicative process
          system-fileio system-filepath text transformers
        ];
@@ -32835,7 +33658,7 @@ self: {
        pname = "closure";
        version = "0.1.0.0";
        sha256 = "1z9clkwjpj01g258h8bldlc759vwsgdlyppn29sr11kyani1zjwf";
-       buildDepends = [ base hashable unordered-containers ];
+       libraryHaskellDepends = [ base hashable unordered-containers ];
        jailbreak = true;
        homepage = "http://github.com/tel/closure";
        description = "Depth- and breadth-first set closures";
@@ -32853,7 +33676,7 @@ self: {
        pname = "cloud-haskell";
        version = "0.2.0.0";
        sha256 = "11i2r7zf3vvywsfnlcsgvnh2qf92wgc81sfmhkhfpdrpcd2zx606";
-       buildDepends = [
+       libraryHaskellDepends = [
          distributed-process distributed-process-async
          distributed-process-client-server distributed-process-execution
          distributed-process-extras distributed-process-supervisor
@@ -32875,7 +33698,7 @@ self: {
        pname = "cloudfront-signer";
        version = "0.0.0.1";
        sha256 = "1ikjrlb421rxsj4c7dl4dw8a3kls43gzn4mapg1y9b2bkd7q6ywz";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types base base64-bytestring bytestring
          crypto-pubkey-types old-locale RSA time
        ];
@@ -32896,7 +33719,7 @@ self: {
        sha256 = "0jfv3830kg3yp1vqqs75bmiwflv4y8ya86q575bsw1l695dc5lwg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers convertible datetime filepath HFuse HTTP
          regex-base regex-tdfa tagsoup timerep unix
        ];
@@ -32914,7 +33737,7 @@ self: {
        sha256 = "08nishc8ngmvx0pdksn4z8a6l8vdgm3jiyz3w6d302pwp566z4q9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base curl mtl random tagsoup ];
+       executableHaskellDepends = [ base curl mtl random tagsoup ];
        homepage = "http://ui3.info/d/proj/cltw.html";
        description = "Command line Twitter utility";
        license = stdenv.lib.licenses.bsd3;
@@ -32930,7 +33753,7 @@ self: {
        sha256 = "0xzhpjsb9nf8xw7fa111n5gki46gz67aiyd2wr1k50pzyjrvl3vv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers haskell98 language-c pretty pretty-show
        ];
        homepage = "http://zwizwa.be/-/meta";
@@ -32945,7 +33768,7 @@ self: {
        pname = "cluss";
        version = "0.3";
        sha256 = "1q5km2f8zwnzcwnzj0khnszsgrb1x53zp0ryjwz2nfx9ajvh7zgg";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/Kinokkory/cluss";
        description = "simple alternative to type classes";
        license = stdenv.lib.licenses.bsd3;
@@ -32961,11 +33784,11 @@ self: {
        pname = "clustering";
        version = "0.2.1";
        sha256 = "1jxrgb13zm8bqcsx39fp31lrpna3y0pn7ckcf9q6gljz327c4y2h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers matrices mwc-random parallel primitive
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary hierarchical-clustering matrices mwc-random Rlang-QQ
          split tasty tasty-hunit tasty-quickcheck vector
        ];
@@ -32984,7 +33807,7 @@ self: {
        sha256 = "0in6fqzr1aki2dhbkv3vlmw17vla5m39g6msaplk4vix5yjw7vkq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bio bytestring containers QuickCheck regex-compat simpleargs
        ];
        homepage = "http://malde.org/~ketil/";
@@ -33001,9 +33824,11 @@ self: {
        pname = "clutterhs";
        version = "0.1";
        sha256 = "0mcl6pc0qjyijyqqlf1wh3548gn71kv6xy0jaqgrjddf20qlc8xl";
-       buildDepends = [ array base cairo glib gtk haskell98 mtl X11 ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ clutter pango ];
+       libraryHaskellDepends = [
+         array base cairo glib gtk haskell98 mtl X11
+       ];
+       libraryPkgconfigDepends = [ clutter pango ];
+       libraryToolDepends = [ c2hs ];
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33017,8 +33842,8 @@ self: {
        pname = "cmaes";
        version = "0.2.2";
        sha256 = "060bmnkhbwrxhalfy5zxwjzbb6mp5ffj4r0qgkv6wp7bac2nnrp8";
-       buildDepends = [ base mtl process safe strict syb ];
-       testDepends = [
+       libraryHaskellDepends = [ base mtl process safe strict syb ];
+       testHaskellDepends = [
          base doctest doctest-prop mtl process random syb vector
        ];
        description = "CMA-ES wrapper in Haskell";
@@ -33032,8 +33857,8 @@ self: {
        pname = "cmark";
        version = "0.4.0.1";
        sha256 = "1kimba33r0f2ify0sxy7x9npqarb9xaw8hih1z6vvf1bkjsji0v3";
-       buildDepends = [ base bytestring text ];
-       testDepends = [ base HUnit text ];
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [ base HUnit text ];
        homepage = "https://github.com/jgm/commonmark-hs";
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
        license = stdenv.lib.licenses.bsd3;
@@ -33045,7 +33870,7 @@ self: {
        pname = "cmath";
        version = "0.3";
        sha256 = "1hb92cgblmwp49lv0x0ib8g557mhjk6db7ihnim75ldii2f93dnm";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~dons/code/cmath";
        description = "A binding to the standard C math library";
        license = stdenv.lib.licenses.bsd3;
@@ -33062,10 +33887,11 @@ self: {
        sha256 = "0mh6qzdlbfc1lfx7353p2qfa2j77xjlnnnnw3csmv125zha4y96d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array arrowapply-utils base Cabal containers filepath hxt monads-tf
-         parsec syb transformers url
+       libraryHaskellDepends = [
+         array arrowapply-utils base containers hxt monads-tf parsec syb
+         transformers url
        ];
+       executableHaskellDepends = [ base Cabal filepath ];
        description = "Data model, parser, serialiser and transformations for Content MathML 3";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33079,8 +33905,8 @@ self: {
        pname = "cmd-item";
        version = "0.0.1.0";
        sha256 = "1lawn0v32dn38xf3jaz70gks99llbq453zlf876pylinh5id7q62";
-       buildDepends = [ base containers templater text ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers templater text ];
+       testHaskellDepends = [
          base hspec hspec-laws HUnit QuickCheck quickcheck-instances text
        ];
        homepage = "https://github.com/geraud/cmd-item";
@@ -33098,7 +33924,7 @@ self: {
        sha256 = "0vmz7f0ssrqlp6wzmc0mjqj4qczfgk58g0lr0yz7jamamlgpq4b6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base filepath process template-haskell transformers
        ];
        homepage = "http://community.haskell.org/~ndm/cmdargs/";
@@ -33116,7 +33942,7 @@ self: {
        sha256 = "1k0g2vh7sqkblzjsfvyhfiy1fcwkw0i10kgl4n2r68w7v52mmzd0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs directory filepath http-types process text
          transformers wai wai-handler-launch
        ];
@@ -33135,7 +33961,7 @@ self: {
        sha256 = "0mxk7yy3sglxc97my5lnphisg6fawifrbdbpz31h7ybiqccx4hsn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl split syb transformers ];
+       libraryHaskellDepends = [ base mtl split syb transformers ];
        description = "a library for command line parsing & online help";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33149,11 +33975,11 @@ self: {
        pname = "cmdtheline";
        version = "0.2.3";
        sha256 = "1jwbr34xgccjbz6nm58bdsg1vqyv87rh45yia5j36vlfbaclyb04";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath parsec pretty process
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory filepath HUnit parsec pretty process
          test-framework test-framework-hunit transformers
        ];
@@ -33170,7 +33996,7 @@ self: {
        pname = "cml";
        version = "0.1.3";
        sha256 = "1hym074a8akzg3c96b1yczmdw5pgn4g0ahqxsxhg8d0kf8lzi5ph";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/cml/";
        description = "Events and Channels as in Concurrent ML";
        license = stdenv.lib.licenses.bsd3;
@@ -33182,7 +34008,7 @@ self: {
        pname = "cmonad";
        version = "0.1.1.1";
        sha256 = "07adwhpsmg3q4nhifjpdjv2dy1m08n0qkvlssmbl3b6gklvb82sk";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "A library for C-like programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33196,7 +34022,8 @@ self: {
        sha256 = "0zlc6spb51s2k455s9mspqjjk8xm90wwjlj2nm7949ihkim4j5gy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
+       executableHaskellDepends = [ array base containers ];
        description = "Unification in a Commutative Monoid";
        license = "GPL";
      }) {};
@@ -33212,7 +34039,7 @@ self: {
        sha256 = "0nfqglz6szbi3s8xf5i87rnac7hc8cqfyrx2rs5ydb5i439s22b0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal array base binary bytestring containers directory fgl
          filepath HUnit mtl parsec pretty prettyclass process split
          stringtable-atom unix zlib
@@ -33230,10 +34057,10 @@ self: {
      mkDerivation {
        pname = "cndict";
        version = "0.6.1";
-       revision = "1";
        sha256 = "0pi0n1chwv6y3ch7dw2smrllwsdiy6r295lmmsnfnbprc8w6gksq";
+       revision = "1";
        editedCabalFile = "6371863e768d5b9d01f80b10783bb7ab4530e8e168d0c0bcc0fcee2a4f1aa468";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cassava containers file-embed text vector
        ];
        jailbreak = true;
@@ -33249,7 +34076,7 @@ self: {
        pname = "code-builder";
        version = "0.1.3";
        sha256 = "1ax4c19xkszahcxvwc1wa1hrgk6ajck5sbprbplsi1gc9jj4g7jm";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Simple system for generating code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33263,11 +34090,11 @@ self: {
        pname = "codec";
        version = "0.1.1";
        sha256 = "0fkcbdas270gad7d3k40q96w68iwfb8jgi866x3dp4mf8wvsll9k";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary binary-bits bytestring data-default-class mtl
          template-haskell text transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base binary binary-bits bytestring data-default-class mtl
          template-haskell text transformers unordered-containers
        ];
@@ -33286,7 +34113,11 @@ self: {
        sha256 = "17v7adxs65jq74ngid0iywg3p5pq5j2p9mznqwj7i53238l3p60l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base binary binary-strict bytestring containers parsec
+         QuickCheck regex-compat
+       ];
+       executableHaskellDepends = [
          array base binary binary-strict bytestring containers parsec
          QuickCheck regex-compat
        ];
@@ -33301,7 +34132,7 @@ self: {
        pname = "codec-mbox";
        version = "0.2.0.0";
        sha256 = "0kbn76g6ly1pjd9higi0k0f26hplm0jhz85b23inn0bjli14n2cl";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "A library to read and write mailboxes in mbox format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33316,11 +34147,14 @@ self: {
        sha256 = "0y1vv9iayjvikjfp4y41m4gypybxd1lq3pv4154nvbjpfapmndsw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring cmdargs containers curl hpc safe split
+       ];
+       executableHaskellDepends = [
          aeson async base bytestring cmdargs containers curl hpc process
          regex-posix safe split
        ];
-       testDepends = [ base HUnit ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/codecov-haskell";
        description = "Codecov.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
@@ -33337,7 +34171,7 @@ self: {
        sha256 = "14jywd60mxbj5q1srxj4igs1ah0ddf8ww5k4n5d9g7cp1b1yv1mc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo containers directory filepath gtk haskell98 hinotify
          MissingH process regex-posix time
        ];
@@ -33352,10 +34186,10 @@ self: {
      mkDerivation {
        pname = "codepad";
        version = "0.1";
-       revision = "1";
        sha256 = "03jvbbv4cgrmk0ihz34shd1ydv5jhl1h1xiwqrln60622jlh8mr1";
+       revision = "1";
        editedCabalFile = "52fe2b461d77b36400724ddd77e6ec5a92cb9c1bbf5f97efb4cfe87adba3a07a";
-       buildDepends = [ base curl mtl network tagsoup ];
+       libraryHaskellDepends = [ base curl mtl network tagsoup ];
        jailbreak = true;
        homepage = "http://github.com/chrisdone/codepad";
        description = "Submit and retrieve paste output from CodePad.org.";
@@ -33375,11 +34209,14 @@ self: {
        sha256 = "1jlrap3qhgnsgdmp0nb2hf3bbjlajp6p4z2q2rl70l93v0v9xi02";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal containers cryptohash directory either
          filepath hackage-db http-client lens machines machines-directory
-         MissingH monad-loops network process tar text transformers wreq
-         yaml zlib
+         process tar text transformers wreq yaml zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal directory either filepath hackage-db MissingH
+         monad-loops network wreq yaml
        ];
        homepage = "http://github.com/aloiscochard/codex";
        description = "A ctags file generator for cabal project dependencies";
@@ -33394,7 +34231,7 @@ self: {
        pname = "codo-notation";
        version = "0.5.2";
        sha256 = "1bwfjg0bzph0vka1rx8m6f505l9dmj8nn6al9kmjkva18l05gsvq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad haskell-src-meta parsec template-haskell uniplate
        ];
        description = "A notation for comonads, analogous to the do-notation for monads";
@@ -33407,7 +34244,7 @@ self: {
        pname = "cofunctor";
        version = "0.1.0.1";
        sha256 = "0xn4k1c7l9z3g0slbwvlfg9kpfq8jbk0qf9363qz7azv7ks1149p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "DEPRECATED: use the \"contravariant\" package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33424,12 +34261,16 @@ self: {
        sha256 = "00bq5qad7x8x0fac1gb8aq97zm4pylnk7n9bg4nkhyyvwnmjsy5l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring collections-api comonad-transformers
          containers data-lens data-lens-fd data-lens-template deepseq
          ghc-prim mtl primitive QuickCheck stm tagged template-haskell
          transformers
        ];
+       executableHaskellDepends = [
+         base bytestring containers mtl QuickCheck template-haskell
+         transformers
+       ];
        homepage = "https://github.com/Cognimeta/cognimeta-utils";
        description = "Utilities for Cognimeta products (such as perdure). API may change often.";
        license = "unknown";
@@ -33451,14 +34292,18 @@ self: {
        sha256 = "0mh95pfzdvfqy1frwsqi9fi1wgs1nk1xkzijh1pyjm2paqxzynn2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-casing base base64-bytestring byteable bytestring
          conduit conduit-extra cryptohash deepseq exceptions hashable
-         http-client http-client-tls http-conduit http-types mtl network
-         old-locale resourcet scientific text time transformers
-         transformers-base uuid uuid-aeson vector websockets wuss
+         http-conduit http-types mtl network old-locale resourcet scientific
+         text time transformers-base uuid uuid-aeson vector websockets wuss
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring conduit conduit-extra http-client
+         http-client-tls http-conduit network old-locale resourcet
+         scientific text time transformers uuid websockets wuss
+       ];
+       testHaskellDepends = [
          base bytestring http-client-tls http-conduit old-locale tasty
          tasty-hunit tasty-quickcheck tasty-th time transformers uuid
        ];
@@ -33478,7 +34323,11 @@ self: {
        sha256 = "16inmr2hp2racg85crrpwd45p1wgjhcp7w242nixc8dlwdy1lkz3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring cereal cmdargs containers fclabels ghc-prim
+         ListZipper monad-atom mtl nlp-scores split swift-lda text vector
+       ];
+       executableHaskellDepends = [
          base bytestring cereal cmdargs containers fclabels ghc-prim
          ListZipper monad-atom mtl nlp-scores split swift-lda text vector
        ];
@@ -33498,7 +34347,7 @@ self: {
        pname = "colchis";
        version = "0.2.0.3";
        sha256 = "1fhamxm740r59q0sazs2np1b8hv74dhhbb4ah73m94im96729rbb";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base conceit network network-simple pipes pipes-aeson
          pipes-attoparsec pipes-network text transformers
        ];
@@ -33517,7 +34366,7 @@ self: {
        sha256 = "1k6k2ljz9x06j0nrpbbpcgd3axamf3cgr6jyslam0xkgxzsi7w7x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base collada-types containers SVGPath time vector xml
        ];
        jailbreak = true;
@@ -33534,7 +34383,7 @@ self: {
        pname = "collada-types";
        version = "0.3";
        sha256 = "0aw1y3ylcnpj3wwh6w8168a4mmkiayav6swyh2fq3vfjlds91xc8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers enumerable OpenGL tuple tuple-gen vector
        ];
        jailbreak = true;
@@ -33551,7 +34400,7 @@ self: {
        sha256 = "02r4cz92wjm3hcih8jf5jvimw3ijwbp4x7iw90rkj05360ajikj7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/mwotton/collapse";
        description = "utility for collapsing adjacent writes";
@@ -33564,7 +34413,7 @@ self: {
        pname = "collection-json";
        version = "0.1.0.0";
        sha256 = "1nzpa791s04r3qikn329r67a64gl9rnk389bk3blijx6q2r9xacc";
-       buildDepends = [ aeson base bytestring text ];
+       libraryHaskellDepends = [ aeson base bytestring text ];
        jailbreak = true;
        homepage = "https://github.com/danchoi/collection-json.hs";
        description = "Collection+JSON hypermedia type tools";
@@ -33577,7 +34426,9 @@ self: {
        pname = "collections";
        version = "0.3.1.1";
        sha256 = "0a5km8k2jwjv4gfd2vf0jiq3f9cw47dgz8f3lspmpx2b0g2pac7g";
-       buildDepends = [ array base bytestring containers QuickCheck ];
+       libraryHaskellDepends = [
+         array base bytestring containers QuickCheck
+       ];
        jailbreak = true;
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
@@ -33590,7 +34441,7 @@ self: {
        pname = "collections-api";
        version = "1.0.0.0";
        sha256 = "0vgw1spiv6wnk11j3y45d95r3axgr1sgksb5lilnxdjj2pn4gp5l";
-       buildDepends = [ array base QuickCheck ];
+       libraryHaskellDepends = [ array base QuickCheck ];
        homepage = "http://code.haskell.org/collections/";
        description = "API for collection data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -33605,7 +34456,7 @@ self: {
        pname = "collections-base-instances";
        version = "1.0.0.0";
        sha256 = "0nw6wpzqsj33pnffsflc6ipjcx6lknzdnxgn4rm3vhrl5y9rgpzk";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring collections-api containers
        ];
        homepage = "http://code.haskell.org/collections/";
@@ -33620,7 +34471,7 @@ self: {
        pname = "colock";
        version = "0.2.2";
        sha256 = "0h3y5c3c3711k2glmnydc1rlz9ff73iibcc8vf0zjzvvw9rz0xb1";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "thread-friendly file locks that don't block the entire program";
        license = "LGPL";
      }) {};
@@ -33633,7 +34484,8 @@ self: {
        sha256 = "1v4spa6vw9igjpd1dr595z5raz5fr8f485q5w9imrv8spms46xh3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ ansi-terminal base haskell-lexer ];
+       libraryHaskellDepends = [ ansi-terminal base haskell-lexer ];
+       executableHaskellDepends = [ ansi-terminal base haskell-lexer ];
        homepage = "http://github.com/yav/colorize-haskell";
        description = "Highligt Haskell source";
        license = stdenv.lib.licenses.bsd3;
@@ -33644,10 +34496,10 @@ self: {
      mkDerivation {
        pname = "colors";
        version = "0.3.0.2";
-       revision = "1";
        sha256 = "0gbdqn5wrh9711j5hs5ypbd3w7a3mh37g6aadqiq4m5n7jna6phm";
+       revision = "1";
        editedCabalFile = "b49946d81e0089d4d80191523839f934802975ede3b9fd9521ead9e591142560";
-       buildDepends = [ base lens linear profunctors ];
+       libraryHaskellDepends = [ base lens linear profunctors ];
        homepage = "https://github.com/fumieval/colors";
        description = "A type for colors";
        license = stdenv.lib.licenses.bsd3;
@@ -33659,7 +34511,7 @@ self: {
        pname = "colour";
        version = "2.3.3";
        sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.haskell.org/haskellwiki/Colour";
        description = "A model for human colour/color perception";
        license = stdenv.lib.licenses.mit;
@@ -33673,7 +34525,7 @@ self: {
        pname = "coltrane";
        version = "0.1.0.0";
        sha256 = "131arfizyniapjvc9ds6l90z7gig98imhm17k1vza5wvgjqbb5fa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring HTTP http-types HUnit mtl regex-compat text wai
          wai-extra warp
        ];
@@ -33701,7 +34553,9 @@ self: {
        pname = "combinat";
        version = "0.2.7.0";
        sha256 = "1rch5pk0sggmdr2wmqys5i5p1cjyqdymrngjf8a2721q6nycfjjz";
-       buildDepends = [ array base containers random transformers ];
+       libraryHaskellDepends = [
+         array base containers random transformers
+       ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Generation of various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
@@ -33716,7 +34570,7 @@ self: {
        pname = "combinat-diagrams";
        version = "0.1";
        sha256 = "1m7b0qf583jgi65vg6lxvypvjal74p83iir03ma7cfrgw5s5mw2q";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base colour combinat containers diagrams-core diagrams-lib
          transformers vector-space
        ];
@@ -33736,7 +34590,10 @@ self: {
        sha256 = "0yxdy413pj6ah4d5qcpajbphfg02p0gxgs1x9salfa18fyflljc4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base lens template-haskell th-lift trifecta void
+       ];
+       executableHaskellDepends = [
          base bytestring cereal containers directory lens mtl
          template-haskell th-lift trifecta void
        ];
@@ -33755,7 +34612,7 @@ self: {
        pname = "combinatorial-problems";
        version = "0.0.5";
        sha256 = "1k3isi62i66xbisn48b018w7fcfhwwng1f64ca530qkk600fg850";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring bytestring-lexing containers parsec random
        ];
        homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellCombinatorialProblems";
@@ -33770,7 +34627,7 @@ self: {
        pname = "combinatorics";
        version = "0.1.0";
        sha256 = "101b3lycfav6wqdqjhs0v93vgy4g3pfn5xyimip0x3alq0q2ix9a";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Efficient computation of common combinatoric functions";
        license = stdenv.lib.licenses.bsd3;
@@ -33784,7 +34641,7 @@ self: {
        pname = "combobuffer";
        version = "0.2";
        sha256 = "1zsdi9c9my6nrxpqqsy584swp4zg8lckrymfig1ywisbdfzb8rjh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers template-haskell vector vector-space
        ];
        jailbreak = true;
@@ -33799,7 +34656,7 @@ self: {
        pname = "command";
        version = "0.1.1";
        sha256 = "0qj6i5r1iz3d8visqpd74xwkribxzs4p66b1vgp0i3jiqgfrn2hw";
-       buildDepends = [ base deepseq process ];
+       libraryHaskellDepends = [ base deepseq process ];
        homepage = "https://github.com/nh2/command";
        description = "Conveniently run shell commands";
        license = stdenv.lib.licenses.bsd3;
@@ -33813,8 +34670,8 @@ self: {
        pname = "command-qq";
        version = "0.3.0.0";
        sha256 = "1bqfb4gc5ja9d9jygijqpf6014bmfcxnsvpv7c5n4f1z2aj07jy5";
-       buildDepends = [ base process template-haskell text ];
-       testDepends = [ base doctest hspec template-haskell text ];
+       libraryHaskellDepends = [ base process template-haskell text ];
+       testHaskellDepends = [ base doctest hspec template-haskell text ];
        homepage = "http://biegunka.github.io/command-qq/";
        description = "Quasiquoters for external commands";
        license = stdenv.lib.licenses.bsd3;
@@ -33830,11 +34687,11 @@ self: {
        pname = "commodities";
        version = "0.2.0";
        sha256 = "0xf2vp7wb3qkxkrcwhcqpqfzg9345ws890rkmibvcd21jnczhg89";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers distributive keys lens linear mtl numbers
          PSQueue semigroupoids semigroups text thyme transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory doctest filepath hspec hspec-expectations
          lens QuickCheck semigroups thyme transformers
        ];
@@ -33852,7 +34709,7 @@ self: {
        pname = "commsec";
        version = "0.3.5";
        sha256 = "1lshp876qm29370mpa3bh0gijcv317sf1y8vajixzz1083bkpngm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cipher-aes128 crypto-api network
        ];
        description = "Provide communications security using symmetric ephemeral keys";
@@ -33869,7 +34726,7 @@ self: {
        pname = "commsec-keyexchange";
        version = "0.3.3";
        sha256 = "1c207fv429frkyb742n0r1z0kkvlwnkcxblfkrjm1lwqfkdx0prn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal cipher-aes128 commsec crypto-api
          crypto-pubkey-types cryptohash-cryptoapi DRBG monadcryptorandom
          network RSA
@@ -33889,11 +34746,11 @@ self: {
        pname = "comonad";
        version = "4.2.7.2";
        sha256 = "0arvbaxgkawzdp38hh53akkahjg2aa3kj2b4ns0ni8a5ylg2cqmp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers contravariant distributive semigroups tagged
          transformers transformers-compat
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/ekmett/comonad/";
        description = "Comonads";
        license = stdenv.lib.licenses.bsd3;
@@ -33907,7 +34764,7 @@ self: {
        pname = "comonad-extras";
        version = "4.0";
        sha256 = "0irlx6rbp0cq5njxssm5a21mv7v5yccchfpn7h9hzr9fgyaxsr62";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base comonad containers distributive semigroupoids
          transformers
        ];
@@ -33924,7 +34781,7 @@ self: {
        pname = "comonad-random";
        version = "0.1.2";
        sha256 = "11jak28rpnnaswrlf2wgn91v096zkz1laq2cdhjfc7abgmkx9gay";
-       buildDepends = [ base category-extras random ];
+       libraryHaskellDepends = [ base category-extras random ];
        jailbreak = true;
        description = "Comonadic interface for random values";
        license = "unknown";
@@ -33937,7 +34794,7 @@ self: {
        pname = "comonad-transformers";
        version = "4.0";
        sha256 = "13zzp6r6s6c80skniphwvzxhpazbyal5854m53139kgcw560rv6z";
-       buildDepends = [ base comonad ];
+       libraryHaskellDepends = [ base comonad ];
        homepage = "http://github.com/ekmett/comonad-transformers/";
        description = "This package has been merged into comonad 4.0";
        license = stdenv.lib.licenses.bsd3;
@@ -33949,7 +34806,7 @@ self: {
        pname = "comonads-fd";
        version = "4.0";
        sha256 = "19xpv0dsz7w3a1sq1gdxwzglfal45vj2s22zb12g9mpk5rp3hw1s";
-       buildDepends = [ base comonad ];
+       libraryHaskellDepends = [ base comonad ];
        homepage = "http://github.com/ekmett/comonads-fd/";
        description = "This package has been merged into comonad 4.0";
        license = stdenv.lib.licenses.bsd3;
@@ -33961,7 +34818,9 @@ self: {
        pname = "compact-map";
        version = "2008.11.9";
        sha256 = "0rk2g5swblbbairwabv5azp6a7cjqywhv49prm1rz8mc361dd9by";
-       buildDepends = [ array base binary bytestring containers ];
+       libraryHaskellDepends = [
+         array base binary bytestring containers
+       ];
        description = "Compact Data.Map implementation using Data.Binary";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33973,7 +34832,7 @@ self: {
        pname = "compact-string";
        version = "0.3.1";
        sha256 = "02lqxl82jmw276mzxwsc0gmps1kb5i62im85bpjvzqwycbf3gnj8";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://twan.home.fmf.nl/compact-string/";
        description = "Fast, packed and strict strings with Unicode support, based on bytestrings";
        license = stdenv.lib.licenses.bsd3;
@@ -33986,7 +34845,7 @@ self: {
        pname = "compact-string-fix";
        version = "0.3.2";
        sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://twan.home.fmf.nl/compact-string/";
        description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
        license = stdenv.lib.licenses.bsd3;
@@ -33998,7 +34857,7 @@ self: {
        pname = "compare-type";
        version = "0.1.1";
        sha256 = "1s6p3ni8pqxbp08ci4w6y646wrh60s0g34figrwdcqrywscyicsb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Kinokkory/compare-type";
        description = "compare types of any kinds in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -34013,14 +34872,14 @@ self: {
      mkDerivation {
        pname = "compdata";
        version = "0.10";
-       revision = "1";
        sha256 = "1538jdaww57vil32hvd6s13lfiwkczpjgym07ipwccw06cj49l8h";
+       revision = "1";
        editedCabalFile = "09ef1d8f84ae93c4f212661d411542155b0da1c8202e8bf10bfc18d69001a82e";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq derive mtl QuickCheck template-haskell
          th-expand-syns transformers tree-view
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers deepseq derive HUnit mtl QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 th-expand-syns transformers
@@ -34034,10 +34893,10 @@ self: {
      mkDerivation {
        pname = "compdata-automata";
        version = "0.9";
-       revision = "1";
        sha256 = "1hlv6a4ywlnr86pzrlffqbg55mfkrkkxn2yir6a28bdirgi69fkf";
+       revision = "1";
        editedCabalFile = "f8bda15b8d1d1e56f64c37f39ac8ba1c7bf860c291adad3698041eee68146130";
-       buildDepends = [ base compdata containers projection ];
+       libraryHaskellDepends = [ base compdata containers projection ];
        jailbreak = true;
        description = "Tree automata on Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
@@ -34052,10 +34911,10 @@ self: {
        pname = "compdata-dags";
        version = "0.2";
        sha256 = "0z5vjfm0c4bcixnh951mzc06977l3lcs0v8mz6pbn65qbvv0d27c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base compdata containers mtl unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base compdata containers HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
          unordered-containers vector
@@ -34074,8 +34933,10 @@ self: {
        pname = "compdata-param";
        version = "0.9";
        sha256 = "1b7kdg4g1mqpzy10wdxm90mbjfwmfpprkbb52ba9qbcg7scap4i4";
-       buildDepends = [ base compdata mtl template-haskell transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base compdata mtl template-haskell transformers
+       ];
+       testHaskellDepends = [
          base compdata containers HUnit mtl template-haskell test-framework
          test-framework-hunit transformers
        ];
@@ -34093,12 +34954,12 @@ self: {
        pname = "compensated";
        version = "0.6.1";
        sha256 = "026gq3ppk3id4bvkn3pdg6ljbl14gd8p4hg6i0rc13138b0mlxnh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad deepseq distributive
          generic-deriving hashable lens log-domain safecopy semigroupoids
          semigroups vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
@@ -34114,7 +34975,7 @@ self: {
        pname = "competition";
        version = "0.2.0.0";
        sha256 = "07c6b6yai8x9i8qndimzmyp5bzhwckis8kg207n152gnskk7i3zn";
-       buildDepends = [ base filepath parsec ];
+       libraryHaskellDepends = [ base filepath parsec ];
        jailbreak = true;
        homepage = "github.com/yanatan16/haskell-competition";
        description = "Helpers and runners for code competitions";
@@ -34127,7 +34988,7 @@ self: {
        pname = "compilation";
        version = "0.0.0.3";
        sha256 = "0a1pp1jafra1agsx2jizdb33afzg02w6jh4a4pyw5w71kzqfrril";
-       buildDepends = [ base MissingH ];
+       libraryHaskellDepends = [ base MissingH ];
        description = "Haskell functionality for quickly assembling simple compilers";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34139,7 +35000,7 @@ self: {
        pname = "complex-generic";
        version = "0.1.1";
        sha256 = "15lqcwg3jp1whf086mlx9f5jv6sbkn53jrilhapalgcgs07nf8ll";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://gitorious.org/complex-generic";
        description = "complex numbers with non-mandatory RealFloat";
        license = stdenv.lib.licenses.bsd3;
@@ -34151,7 +35012,7 @@ self: {
        pname = "complex-integrate";
        version = "1.0.0";
        sha256 = "0q0ffpqir4f2ch7d7p2fxgb73n7dg7xf19rg78an7i7zdl430cfj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/hijarian/complex-integrate";
        description = "A simple integration function to integrate a complex-valued complex functions";
        license = stdenv.lib.licenses.publicDomain;
@@ -34165,7 +35026,7 @@ self: {
        pname = "complexity";
        version = "0.1.3";
        sha256 = "16crk93qyh0arcgqq2bx0i61cah2yhm8wwdr6sasma8y5hlw76lj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Chart colour data-accessor hstats parallel pretty time
          transformers
        ];
@@ -34181,7 +35042,7 @@ self: {
        pname = "compose-trans";
        version = "0.1";
        sha256 = "0p2fd0knfbfjk4s0aalzrsrzpxffrykmaprxyakbgs1lmp4jyq9z";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Composable monad transformers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34203,7 +35064,7 @@ self: {
        pname = "composition-extra";
        version = "1.1.0";
        sha256 = "1mkm0m08g9q6d8vfz33kj5lz0gnwlkmsnj4r5ar4p3slf2kaybz1";
-       buildDepends = [ base contravariant ];
+       libraryHaskellDepends = [ base contravariant ];
        description = "Combinators for unorthodox structure composition";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34216,10 +35077,10 @@ self: {
      mkDerivation {
        pname = "compressed";
        version = "3.10";
-       revision = "1";
        sha256 = "1y290n421knfh8k8zbcabhw24hb13xj9pkxx4h4v15yji97p5mcw";
+       revision = "1";
        editedCabalFile = "0ab968cb9d6a6da40cb91befc6051d91b77039f8f64442eecf7a61bd508f61bb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers fingertree hashable keys pointed reducers
          semigroupoids semigroups unordered-containers
        ];
@@ -34234,7 +35095,7 @@ self: {
        pname = "compression";
        version = "0.1";
        sha256 = "0cy7851i7dvn5aphg649jr3wmw9x57s29adk7qv0mvwz99fb4cpr";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://urchin.earth.li/~ian/cabal/compression/";
        description = "Common compression algorithms";
        license = "unknown";
@@ -34249,7 +35110,7 @@ self: {
        pname = "compstrat";
        version = "0.1.0.2";
        sha256 = "1jdxvyqkszwkry3vly65nh80519cpfw4ghzg1lsbnhyrbhvlchkg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base compdata mtl template-haskell th-expand-syns transformers
        ];
        jailbreak = true;
@@ -34267,7 +35128,7 @@ self: {
        pname = "comptrans";
        version = "0.1.0.5";
        sha256 = "05r07900bniy1gazvgj3wj4g07j33h493885bhh7gq1n1xilqgkm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base compdata containers deepseq deepseq-generics ghc-prim lens
          template-haskell th-expand-syns
        ];
@@ -34286,7 +35147,7 @@ self: {
        pname = "computational-algebra";
        version = "0.3.0.0";
        sha256 = "09ljbspgwpg4g0fca8j10qmbc7194cjhv0l6svz2qr6zzhmb3l4x";
-       buildDepends = [
+       libraryHaskellDepends = [
          algebra base containers equational-reasoning heaps lens monad-loops
          monomorphic peggy singletons sized-vector tagged type-natural
        ];
@@ -34303,7 +35164,7 @@ self: {
        pname = "computations";
        version = "0.0.0.0";
        sha256 = "1kyg3dmgq5z0217rxgljs3x7x3xvcdly2aqj2ky4h4kbw1h0r260";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/computations";
        description = "Advanced notions of computation";
        license = stdenv.lib.licenses.bsd3;
@@ -34315,7 +35176,7 @@ self: {
        pname = "concatenative";
        version = "1.0.1";
        sha256 = "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty";
        description = "A library for postfix control flow";
        license = stdenv.lib.licenses.bsd3;
@@ -34329,7 +35190,7 @@ self: {
        pname = "conceit";
        version = "0.3.2.0";
        sha256 = "16pj90dnjn5v16ym2gglx895c9lc5qhrry4wydqyn4f0j7rm6drg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors exceptions mtl semigroupoids transformers void
        ];
        description = "Concurrent actions that may fail";
@@ -34342,7 +35203,7 @@ self: {
        pname = "concorde";
        version = "0.1";
        sha256 = "0903lrj6bzajjdr01hbld1jm6vf7assn84hqk4kgrrs1mr3ykc20";
-       buildDepends = [ base containers process safe temporary ];
+       libraryHaskellDepends = [ base containers process safe temporary ];
        description = "Simple interface to the Concorde solver for the Traveling Salesperson Problem";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34360,7 +35221,7 @@ self: {
        sha256 = "17q7mhf0n9pnxhvwk3yy61ljfifz8nhld1xhhnn13fldq34663q3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array base binary bytestring cmdargs comonad containers
          crf-chain1-constrained crf-chain2-tiers data-lens lazy-io
          monad-codec monad-ox sgd tagset-positional temporary text
@@ -34384,11 +35245,11 @@ self: {
        sha256 = "0q2l2yqxk210ycw1alcps9x7l2f60g9sb0wan7d1d2fkbfhq3z41";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base binary bytestring cmdargs concraft containers
-         double-conversion lazy-io moan network sgd split tagset-positional
-         text
+       libraryHaskellDepends = [
+         aeson base binary bytestring concraft containers double-conversion
+         lazy-io moan network sgd split tagset-positional text
        ];
+       executableHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "https://github.com/vjeranc/concraft-hr";
        description = "Part-of-speech tagger for Croatian";
@@ -34407,10 +35268,11 @@ self: {
        sha256 = "0yhq3vdg7l0ibhv0pxj70jm5lrfjk3k0xd1p6ap6im4rh3xxvgw3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base binary bytestring cmdargs concraft containers lazy-io
-         mtl network process sgd split tagset-positional text transformers
+       libraryHaskellDepends = [
+         aeson base binary bytestring concraft containers lazy-io mtl
+         network process sgd split tagset-positional text transformers
        ];
+       executableHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "http://zil.ipipan.waw.pl/Concraft";
        description = "Morphological tagger for Polish";
@@ -34428,7 +35290,7 @@ self: {
        sha256 = "1w4bg284fcnd15yg7097d8sh0rzxr76zlrr1bfj2dksw8ddy3jda";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers hxt hxt-charproperties hxt-curl hxt-relaxng
          hxt-tagsoup
        ];
@@ -34443,11 +35305,11 @@ self: {
      mkDerivation {
        pname = "concrete-typerep";
        version = "0.1.0.2";
-       revision = "1";
        sha256 = "07wy8drg4723zdy2172jrcvd5ir2c4ggcfz1n33jhm9iv3cl2app";
+       revision = "1";
        editedCabalFile = "cdcd034ff6ff0e8cf9313f312294e12494f3f021c4bf562b9c1365b91715ff4e";
-       buildDepends = [ base binary hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary hashable ];
+       testHaskellDepends = [
          base binary hashable QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -34463,7 +35325,7 @@ self: {
        pname = "concurrent-barrier";
        version = "0.1.2";
        sha256 = "13idx7w5k8rk3qqls3yn9xqwk116xsqb36ya3vxkb5x4q4vix3mv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jsgf/concurrent-barrier";
        description = "Simple thread barriers";
        license = stdenv.lib.licenses.bsd3;
@@ -34479,11 +35341,15 @@ self: {
        sha256 = "0awba7ar4iky211psq5d44snd5j75ddvl6klalriic4i5w41dhv2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array async base bytestring containers dns hashable iproute network
          stm time
        ];
-       testDepends = [ async base dns hspec ];
+       executableHaskellDepends = [
+         array async base bytestring containers dns hashable iproute network
+         stm time
+       ];
+       testHaskellDepends = [ async base dns hspec ];
        description = "Concurrent DNS cache";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34496,8 +35362,8 @@ self: {
        pname = "concurrent-extra";
        version = "0.7.0.9";
        sha256 = "19bqm0brnbhhmp5nypi995p27mna7kd33xzw0kf7yx2w2p2kb1aw";
-       buildDepends = [ base stm unbounded-delays ];
-       testDepends = [
+       libraryHaskellDepends = [ base stm unbounded-delays ];
+       testHaskellDepends = [
          async base HUnit random stm test-framework test-framework-hunit
          unbounded-delays
        ];
@@ -34515,11 +35381,11 @@ self: {
        pname = "concurrent-machines";
        version = "0.1.0.0";
        sha256 = "1rlxb9cjzjfzj3xj3m6cab3h6pqazi850lkglc6palamn6yd2vw4";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base containers lifted-async machines monad-control
          semigroups time transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base machines tasty tasty-hunit time transformers
        ];
        description = "Concurrent networked stream transducers";
@@ -34532,7 +35398,7 @@ self: {
        pname = "concurrent-sa";
        version = "1.0.1";
        sha256 = "1szvw0vih5jx2hvgb3h7mqh05im3pw687h7dshiy4ii5vs9pi6d6";
-       buildDepends = [ base MonadRandom ];
+       libraryHaskellDepends = [ base MonadRandom ];
        description = "Concurrent simulated annealing system";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34543,7 +35409,7 @@ self: {
        pname = "concurrent-split";
        version = "0.0.0.1";
        sha256 = "0xriw08w70dj4gji4afa034q9vcgwymjw2j6gx1x7fwdpi04lzsb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "MVars and Channels with distinguished input and output side";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34556,7 +35422,7 @@ self: {
        sha256 = "0b9lndzqm451j9wv2694gjd9w9j2vmhp32j57fqnq43pq8a1h1z6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base exceptions mtl stm transformers ];
+       libraryHaskellDepends = [ base exceptions mtl stm transformers ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/concurrent-state";
        description = "MTL-like library using TVars";
@@ -34570,8 +35436,8 @@ self: {
        pname = "concurrent-supply";
        version = "0.1.7.1";
        sha256 = "050d1k4hvjjyap3w8spcx57lagnh77z131jbgsndpc9mjx8r4l5y";
-       buildDepends = [ base ghc-prim hashable ];
-       testDepends = [ base containers ];
+       libraryHaskellDepends = [ base ghc-prim hashable ];
+       testHaskellDepends = [ base containers ];
        homepage = "http://github.com/ekmett/concurrent-supply/";
        description = "A fast concurrent unique identifier supply with a pure API";
        license = stdenv.lib.licenses.bsd3;
@@ -34583,7 +35449,7 @@ self: {
        pname = "concurrentoutput";
        version = "0.2.0.2";
        sha256 = "0fd372awmxrngbcb2phyzy3az9j2327kdhjnm7c5mm808vix67a8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Ungarble output from several threads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34594,7 +35460,7 @@ self: {
        pname = "cond";
        version = "0.4.1.1";
        sha256 = "12xcjxli1scd4asr4zc77i5q9qka2100gx97hv3vv12l7gj7d703";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kallisti-dev/cond";
        description = "Basic conditional and boolean operators with monadic variants";
        license = stdenv.lib.licenses.bsd3;
@@ -34610,10 +35476,11 @@ self: {
        sha256 = "0ahikfb6h2clkx3pi6a7gyp39jhv2am98vyyaknyd1nvfvxl96x7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base binary containers glider-nlp text ];
+       executableHaskellDepends = [
          base binary containers directory filepath glider-nlp text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary Cabal containers glider-nlp HUnit text
        ];
        jailbreak = true;
@@ -34629,7 +35496,7 @@ self: {
        pname = "condorcet";
        version = "0.0.1";
        sha256 = "1raf8mrnfnn90ymcnyhqf1kzb9mpfsk83qlmajibjd8n94iq76nd";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://neugierig.org/software/darcs/condorcet";
        description = "Library for Condorcet voting";
        license = stdenv.lib.licenses.bsd3;
@@ -34642,7 +35509,7 @@ self: {
        pname = "conductive-base";
        version = "0.3";
        sha256 = "1jdslfnwyh7l10xhk9i0293p0qnw0xsd70d5xgpc6xlijhrsg8wp";
-       buildDepends = [ array base containers random stm time ];
+       libraryHaskellDepends = [ array base containers random stm time ];
        homepage = "http://www.renickbell.net/doku.php?id=conductive-base";
        description = "a library for live coding and real-time musical applications";
        license = stdenv.lib.licenses.gpl3;
@@ -34668,7 +35535,7 @@ self: {
        pname = "conductive-hsc3";
        version = "0.3.1";
        sha256 = "1z037753mxkfqbqqrlkpg5a6z9afpjj16bfplsmbbx3r3vrxbkpa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conductive-base conductive-song containers directory filepath
          hosc hsc3 random
        ];
@@ -34685,7 +35552,7 @@ self: {
        pname = "conductive-song";
        version = "0.2";
        sha256 = "16bdsjv64fc3ydv230rja5q9rqzlr4vd9mh3jabiyahck44imrvi";
-       buildDepends = [ base conductive-base random ];
+       libraryHaskellDepends = [ base conductive-base random ];
        homepage = "http://www.renickbell.net/doku.php?id=conductive-song";
        description = "a library of functions which are useful for composing music";
        license = stdenv.lib.licenses.gpl3;
@@ -34700,11 +35567,11 @@ self: {
        pname = "conduit";
        version = "1.2.4.1";
        sha256 = "0g5rdcj0xbiz3x2pkmhwm67r9f0yncpnssv32s7k0w7qld46wri6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exceptions lifted-base mmorph mtl resourcet transformers
          transformers-base void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers exceptions hspec mtl QuickCheck resourcet safe
          transformers void
        ];
@@ -34722,11 +35589,11 @@ self: {
        pname = "conduit";
        version = "1.2.5";
        sha256 = "0iia5hc3rx813aayp839ixr377ajnrhfvpbjach266bk52scs05i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exceptions lifted-base mmorph mtl resourcet transformers
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers exceptions hspec mtl QuickCheck resourcet safe
          transformers void
        ];
@@ -34740,10 +35607,10 @@ self: {
      mkDerivation {
        pname = "conduit-audio";
        version = "0.1";
-       revision = "1";
        sha256 = "1xmxnr7w8s3kmdv5h0y08rnp3sx5wvxqmkg1j7yjycp9z7hbmylb";
+       revision = "1";
        editedCabalFile = "bf853ba8300deda982d278245bd268e91f444ca42185bd0d57eb9feae5ab066c";
-       buildDepends = [ base conduit vector ];
+       libraryHaskellDepends = [ base conduit vector ];
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "Combinators to efficiently slice and dice audio streams";
        license = "LGPL";
@@ -34756,13 +35623,13 @@ self: {
      mkDerivation {
        pname = "conduit-audio-lame";
        version = "0.1";
-       revision = "1";
        sha256 = "0i4nmb4yf2wlkl5da215ysj25gyaikfd292nc9gzmnxjgg1fx19w";
+       revision = "1";
        editedCabalFile = "34e31416cde87ad1d75570612f3e95d8f54cbeac0539a6f85b93aebaf3979c1a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-audio resourcet transformers vector
        ];
-       extraLibraries = [ mp3lame ];
+       librarySystemDepends = [ mp3lame ];
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the LAME MP3 library";
        license = "LGPL";
@@ -34776,13 +35643,13 @@ self: {
      mkDerivation {
        pname = "conduit-audio-samplerate";
        version = "0.1";
-       revision = "1";
        sha256 = "04s5ld0nsgbjlgkj3f32xnwyah26m6j5qmjxycwgvxjp1siq2xsg";
+       revision = "1";
        editedCabalFile = "c3601c344d95841d594827a61b1a7ad05042dec6f62ce9952e88b3d0fe814a63";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit conduit-audio resourcet transformers vector
        ];
-       extraLibraries = [ samplerate ];
+       librarySystemDepends = [ samplerate ];
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = "LGPL";
@@ -34796,10 +35663,10 @@ self: {
      mkDerivation {
        pname = "conduit-audio-sndfile";
        version = "0.1";
-       revision = "1";
        sha256 = "0v0vzc23c9wfc594pc91d3dw2sda26z1lrkdjjvf572771xysdbd";
+       revision = "1";
        editedCabalFile = "f753b66e55fc5332463bc54a7077b9c503439cd03c7c1c799cd60751ab954a87";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit conduit-audio hsndfile hsndfile-vector resourcet
          transformers
        ];
@@ -34820,13 +35687,13 @@ self: {
        pname = "conduit-combinators";
        version = "1.0.2";
        sha256 = "1yfck6syqqi5zlp41n3qs8w5ljg63jhg25m8irrcks35n9i541j5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
          conduit conduit-extra filepath monad-control mono-traversable
          mwc-random primitive resourcet text transformers transformers-base
          unix unix-compat vector void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
          conduit containers directory filepath hspec mono-traversable mtl
          mwc-random QuickCheck safe silently text transformers vector
@@ -34845,10 +35712,10 @@ self: {
        pname = "conduit-connection";
        version = "0.1.0.1";
        sha256 = "1z3i2s8xl02qb4wfnmqd92kzmbp2jb09msywnzgawyxs5aghy0n4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit connection resourcet transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit connection HUnit network resourcet
          test-framework test-framework-hunit transformers
        ];
@@ -34867,12 +35734,12 @@ self: {
        pname = "conduit-extra";
        version = "1.1.9.1";
        sha256 = "18x01yll1jfv1p9kb7529k8gdh0lav4pbqcqkam2qr9jxxdy26rz";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring conduit directory filepath
          monad-control network primitive process resourcet stm
          streaming-commons text transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async attoparsec base blaze-builder bytestring bytestring-builder
          conduit exceptions hspec process resourcet stm streaming-commons
          text transformers transformers-base
@@ -34890,8 +35757,8 @@ self: {
        pname = "conduit-iconv";
        version = "0.1.1.0";
        sha256 = "0bnak5dpqgdgybi62w1rbmr9brbcqv4i2v345x0m275gzsz0i84h";
-       buildDepends = [ base bytestring conduit ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring conduit ];
+       testHaskellDepends = [
          base bytestring conduit mtl QuickCheck test-framework
          test-framework-quickcheck2 text
        ];
@@ -34909,7 +35776,7 @@ self: {
        pname = "conduit-network-stream";
        version = "0.2";
        sha256 = "0ch0b23z7k4kxnbkvfd3gaxc7xrnlbjz7hv0pshp4k6xqg2bymv4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit mtl network-conduit resourcet
        ];
        description = "A base layer for network protocols using Conduits";
@@ -34925,10 +35792,10 @@ self: {
        pname = "conduit-parse";
        version = "0.1.0.0";
        sha256 = "093qc82nrn8ziza1bfp4xnz8k0cpm39k868a3rq4dhah3s40gsv3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit exceptions parsers text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit exceptions hlint parsers resourcet tasty tasty-hunit
        ];
        homepage = "https://github.com/k0ral/conduit-parse";
@@ -34944,8 +35811,10 @@ self: {
        pname = "conduit-resumablesink";
        version = "0.1.1";
        sha256 = "1bqdpnhqjh4dhvppsa8nlgja0jpdw48kxywz2999sp5hi53qxdfg";
-       buildDepends = [ base conduit void ];
-       testDepends = [ base bytestring conduit hspec transformers void ];
+       libraryHaskellDepends = [ base conduit void ];
+       testHaskellDepends = [
+         base bytestring conduit hspec transformers void
+       ];
        jailbreak = true;
        homepage = "http://github.com/A1kmm/conduit-resumablesink";
        description = "Allows conduit to resume sinks to feed multiple sources into it";
@@ -34961,8 +35830,8 @@ self: {
        pname = "conf";
        version = "0.1.1.0";
        sha256 = "1mxrr14188ikizyxb06764qq1iwhnh19g150mz310q8yw6cypbfw";
-       buildDepends = [ base haskell-src ];
-       testDepends = [
+       libraryHaskellDepends = [ base haskell-src ];
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit test-framework-th
        ];
        jailbreak = true;
@@ -34978,7 +35847,9 @@ self: {
        sha256 = "1b1fs42c5y5sixgag972m5hb6xwbwp1d64p0gadqg9mg1vknl34y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath unix vty-menu ];
+       executableHaskellDepends = [
+         base directory filepath unix vty-menu
+       ];
        description = "A small program for swapping out dot files";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34992,8 +35863,8 @@ self: {
        pname = "config-value";
        version = "0.4.0.1";
        sha256 = "0d9g6ih1rl0z4a2gf285f408vz7iysxwvw6kav280nvx99k2msb7";
-       buildDepends = [ array base pretty text transformers ];
-       buildTools = [ alex happy ];
+       libraryHaskellDepends = [ array base pretty text transformers ];
+       libraryToolDepends = [ alex happy ];
        homepage = "https://github.com/glguy/config-value";
        description = "Simple, layout-based value language similar to YAML or JSON";
        license = stdenv.lib.licenses.mit;
@@ -35011,12 +35882,14 @@ self: {
        sha256 = "0k3r8i2mb06kvrqfln0birwd92bwx8m55wpahnbbzs35i35p60vz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring case-insensitive containers either mtl pretty-show
-         regex-easy safe string-conversions text unordered-containers vector
-         yaml
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers either mtl regex-easy
+         safe string-conversions unordered-containers vector yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring mtl pretty-show string-conversions text yaml
+       ];
+       testHaskellDepends = [
          aeson aeson-pretty base case-insensitive hspec hspec-discover mtl
          pretty-show QuickCheck scientific string-conversions
          unordered-containers vector
@@ -35024,7 +35897,6 @@ self: {
        jailbreak = true;
        description = "parser for config files, shell variables, command line args";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "configuration" = callPackage
@@ -35033,7 +35905,7 @@ self: {
        pname = "configuration";
        version = "0.1.1";
        sha256 = "1jqc5xpbxrlnpxk2yci861gpxl5c9vm9lffchrpp1hk8ag5wkxk1";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Simple data type for application configuration";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35052,7 +35924,7 @@ self: {
        pname = "configuration-tools";
        version = "0.2.13";
        sha256 = "0rhr5c91bk853zlgld2im0sm0pcss0q6g82c92p85vwkdgrgxlz2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base base-unicode-symbols
          base64-bytestring bytestring Cabal case-insensitive connection
          data-default deepseq directory dlist enclosed-exceptions filepath
@@ -35061,7 +35933,7 @@ self: {
          transformers unordered-containers x509 x509-system x509-validation
          yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-unicode-symbols bytestring Cabal enclosed-exceptions
          http-types monad-control mtl text transformers unordered-containers
          wai warp warp-tls yaml
@@ -35080,11 +35952,11 @@ self: {
        pname = "configurator";
        version = "0.3.0.0";
        sha256 = "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring directory hashable text unix-compat
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath HUnit test-framework
          test-framework-hunit text
        ];
@@ -35103,7 +35975,7 @@ self: {
        sha256 = "0984gcahddrzlvzsfsrkr8i8jijjg7j2m5namfv8zhdlkrny8h11";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base cmdargs process system-fileio system-filepath text
          time unordered-containers
        ];
@@ -35118,7 +35990,7 @@ self: {
        pname = "congruence-relation";
        version = "0.1.0.0";
        sha256 = "1pj4kby5pba1xfz2fvv2lij7h2i8crf3qkhgs3rp4ziay0jkg18v";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        jailbreak = true;
        description = "Decidable congruence relations for Haskell: up to you whether this is a joke";
        license = stdenv.lib.licenses.mit;
@@ -35130,7 +36002,7 @@ self: {
        pname = "conjugateGradient";
        version = "2.2";
        sha256 = "1is3j61ra1whjpm8rq89yj9rscqj1ipgqlnh1nwvyzi2nggl06ya";
-       buildDepends = [ base containers random ];
+       libraryHaskellDepends = [ base containers random ];
        homepage = "http://github.com/LeventErkok/conjugateGradient";
        description = "Sparse matrix linear-equation solver";
        license = stdenv.lib.licenses.bsd3;
@@ -35147,7 +36019,7 @@ self: {
        sha256 = "02a33940rnwq5bzqx50fjy76q0z6nimsg2fk3q17ai4kvi0rw0p3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers filepath html HTTP mtl network
          old-time parsec pretty random stm unix
        ];
@@ -35164,7 +36036,8 @@ self: {
        sha256 = "1bxpn27spj4cq9cwg5b486xb35gmwb8hnrhq5g5dpmm7lxgijzh3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
+       executableHaskellDepends = [ base text ];
        jailbreak = true;
        homepage = "https://github.com/tattsun/conlogger";
        description = "A logger for a concurrent program";
@@ -35180,7 +36053,7 @@ self: {
        pname = "connection";
        version = "0.2.5";
        sha256 = "090il95jnm7ihwvcx3s9v6iwnp37nnsdx15q7722l845g51d95c8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring containers data-default-class network
          socks tls x509 x509-store x509-system x509-validation
        ];
@@ -35198,14 +36071,13 @@ self: {
        pname = "connection-pool";
        version = "0.1.2.0";
        sha256 = "12nr9vl884yj4yq9dyfc725zi6dw0amp65xlm9hjm7wffz6mc5az";
-       buildDepends = [
+       libraryHaskellDepends = [
          base between data-default-class monad-control network resource-pool
          streaming-commons time transformers-base
        ];
        homepage = "https://github.com/trskop/connection-pool";
        description = "Connection pool built on top of resource-pool and streaming-commons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "consistent" = callPackage
@@ -35216,11 +36088,11 @@ self: {
        pname = "consistent";
        version = "0.0.1";
        sha256 = "003vnmh6mbjz08msnvnjfwwfsn8m15fa9apr5igkvscdqrr5hzd5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-async lifted-base monad-control stm transformers
          transformers-base unordered-containers
        ];
-       testDepends = [ base lifted-async transformers ];
+       testHaskellDepends = [ base lifted-async transformers ];
        description = "Eventually consistent STM transactions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35235,7 +36107,7 @@ self: {
        pname = "console-program";
        version = "0.3.2.0";
        sha256 = "1517vwn9l10hihw7ysj812x7cypf5gca468sdzgdlcwvqa8wsr3m";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers directory fez-conf
          haskeline parsec parsec-extra split transformers utility-ht
        ];
@@ -35249,8 +36121,8 @@ self: {
        pname = "const-math-ghc-plugin";
        version = "1.0.0.0";
        sha256 = "1fcj3ssfyxnq4cmb3lr5cg7qkgnkhf1ra0469cbw61gr2fl3kzdl";
-       buildDepends = [ base containers ghc ];
-       testDepends = [ base directory process ];
+       libraryHaskellDepends = [ base containers ghc ];
+       testHaskellDepends = [ base directory process ];
        homepage = "https://github.com/kfish/const-math-ghc-plugin";
        description = "Compiler plugin for constant math elimination";
        license = stdenv.lib.licenses.bsd3;
@@ -35263,7 +36135,7 @@ self: {
        pname = "constrained-categories";
        version = "0.2.0.0";
        sha256 = "1mh61gfydh068qws3r52rbnw30ihi9k88wklx8p18j43c7jngamx";
-       buildDepends = [ base tagged void ];
+       libraryHaskellDepends = [ base tagged void ];
        homepage = "https://github.com/leftaroundabout/constrained-categories";
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
@@ -35276,7 +36148,7 @@ self: {
        pname = "constrained-normal";
        version = "1.0.2";
        sha256 = "1mq0w2qndrjx9ap9dkyxvz91fbszsnwlhh4hnm9g2dx020fawgac";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://dx.doi.org/10.1145/2500365.2500602";
        description = "Normalised Deep Embeddings for Constrained Type-Class Instances";
        license = stdenv.lib.licenses.bsd3;
@@ -35288,7 +36160,7 @@ self: {
        pname = "constraints";
        version = "0.4.1.3";
        sha256 = "1w3ssvg30rfkp1y20vx0fbq1c0md2wys2rh50mih7645djv56hyx";
-       buildDepends = [ base ghc-prim newtype ];
+       libraryHaskellDepends = [ base ghc-prim newtype ];
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
        license = stdenv.lib.licenses.bsd3;
@@ -35300,7 +36172,9 @@ self: {
        pname = "constructible";
        version = "0.1.0.1";
        sha256 = "0d3x92h194y6q8qn11prj05gcnv01vmbvlcsvb1zxgp51qmv1aih";
-       buildDepends = [ arithmoi base binary-search complex-generic ];
+       libraryHaskellDepends = [
+         arithmoi base binary-search complex-generic
+       ];
        homepage = "http://andersk.mit.edu/haskell/constructible/";
        description = "Exact computation with constructible real numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -35312,7 +36186,7 @@ self: {
        pname = "constructive-algebra";
        version = "0.3.0";
        sha256 = "17ab0vkq5w3zwh76ws7b82wbc0871qdmvrxhxga78h3h0axjiz1x";
-       buildDepends = [ base QuickCheck type-level ];
+       libraryHaskellDepends = [ base QuickCheck type-level ];
        jailbreak = true;
        description = "A library of constructive algebra";
        license = stdenv.lib.licenses.bsd3;
@@ -35329,12 +36203,12 @@ self: {
        pname = "consul-haskell";
        version = "0.2.1";
        sha256 = "13c3yqn5nsx7r0hkgdwka6fis2ypg54k4damv3c22rdjyids17x7";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring http-client http-types
          lifted-async lifted-base monad-control network stm text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base http-client HUnit network tasty tasty-hunit text transformers
        ];
        homepage = "https://github.com/alphaHeavy/consul-haskell";
@@ -35352,7 +36226,7 @@ self: {
        pname = "consumers";
        version = "1.0";
        sha256 = "1f7jn9lja9fsznjz7d3wfhbd0dc8whcx9jl74jl39mv20k2sdhib";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers exceptions hpqtypes lifted-base lifted-threads log
          monad-control mtl stm time transformers-base
        ];
@@ -35367,7 +36241,7 @@ self: {
        pname = "container-classes";
        version = "0.0.0.0";
        sha256 = "18mx50mp9pv1a33kcwmckz6r4a0j6rlc1165ivn9cj8iiwpmd6pv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generic classes for interacting with different container types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35377,10 +36251,10 @@ self: {
      mkDerivation {
        pname = "containers";
        version = "0.4.2.1";
-       revision = "2";
        sha256 = "10xjyxlx6raz5jx17wyw7zqif3bp3xsbzb1756l263g91gd20rsm";
+       revision = "2";
        editedCabalFile = "4cdf787be0b51ffe34f02055117470f87d03c2f6567cd53d908b048c5fc970c8";
-       buildDepends = [ array base deepseq ];
+       libraryHaskellDepends = [ array base deepseq ];
        jailbreak = true;
        description = "Assorted concrete container types";
        license = stdenv.lib.licenses.bsd3;
@@ -35395,8 +36269,8 @@ self: {
        pname = "containers";
        version = "0.5.6.3";
        sha256 = "1kcd55nl0vzi99i8sr8fmc5j25fv7m0a9hd3nihnq1pd64pfciqn";
-       buildDepends = [ array base deepseq ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ array base deepseq ghc-prim ];
+       testHaskellDepends = [
          array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -35414,7 +36288,7 @@ self: {
        sha256 = "11h88lgwgiyacv9b9k96aih95ydjq1i4ny03z0zw8iyd3c0yi7m0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers criterion deepseq ghc-prim random
        ];
        jailbreak = true;
@@ -35429,7 +36303,7 @@ self: {
        pname = "containers-deepseq";
        version = "0.1.0.1";
        sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        description = "Provide orphan NFData instances for containers as needed. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35440,7 +36314,7 @@ self: {
        pname = "containers-unicode-symbols";
        version = "0.3.1.1";
        sha256 = "0ccv7rqkykfk5wmr73mc0kwrnwyzakgp5x495dgwn5nila3g4ma6";
-       buildDepends = [ base base-unicode-symbols containers ];
+       libraryHaskellDepends = [ base base-unicode-symbols containers ];
        homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
@@ -35456,11 +36330,11 @@ self: {
        pname = "context-free-grammar";
        version = "0.1.0";
        sha256 = "11s6v8h39iq0wy4p4y8cwpr8fjhphql07s38rgbm8qsq1hj9f3a1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers control-monad-omega dlist mtl pretty
          template-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit pretty QuickCheck quickcheck-properties
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -35476,7 +36350,9 @@ self: {
        pname = "context-stack";
        version = "0.1.0.1";
        sha256 = "0y51xlva4364658bgbchcasbq5pka2ixlvhdf9g38xwlmhfg736x";
-       buildDepends = [ base classy-prelude mtl unordered-containers ];
+       libraryHaskellDepends = [
+         base classy-prelude mtl unordered-containers
+       ];
        jailbreak = true;
        homepage = "http://github.com/thinkpad20/context-stack";
        description = "An abstraction of a stack and stack-based monadic context";
@@ -35492,7 +36368,7 @@ self: {
        pname = "continue";
        version = "0.2.0";
        sha256 = "0iyqwqbzmk8v4j6xdmfir8mdxjgzl1dh76c9ngwzyccpv7xbz59a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors monad-control mtl semigroupoids transformers
          transformers-base
        ];
@@ -35508,7 +36384,7 @@ self: {
        pname = "continued-fractions";
        version = "0.9.1.1";
        sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "/dev/null";
        description = "Continued fractions";
        license = stdenv.lib.licenses.publicDomain;
@@ -35526,12 +36402,15 @@ self: {
        sha256 = "0viqn05l4xjwb3w2qbldxmwv0dj1bzwbvjcgczj1clhdx2zdgfx6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring cereal containers mtl nanomsg-haskell time
+       ];
+       executableHaskellDepends = [
          base bytestring cereal containers data-default foldl
          leveldb-haskell-fork mtl nanomsg-haskell parallel-io resourcet stm
          suspend time timers transformers transformers-base
        ];
-       extraLibraries = [ hyperleveldb ];
+       executableSystemDepends = [ hyperleveldb ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { hyperleveldb = null;};
@@ -35544,7 +36423,7 @@ self: {
        pname = "continuum-client";
        version = "0.1.0.0";
        sha256 = "0qv7dz2h3aay4ak5nz38wp3wrrk2zzg2g58xdlglvml08hpxsf7k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
        license = stdenv.lib.licenses.mit;
@@ -35559,7 +36438,7 @@ self: {
        pname = "contravariant";
        version = "1.3.2";
        sha256 = "0fb6az12604vwvfhnmvxfin68n0fb2jcvrliv3vvrmfnfq3axfjj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base semigroups StateVar transformers transformers-compat void
        ];
        homepage = "http://github.com/ekmett/contravariant/";
@@ -35573,7 +36452,7 @@ self: {
        pname = "control-bool";
        version = "0.2.1";
        sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/fumieval/control-bool";
        description = "Useful combinators for boolean expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -35585,7 +36464,7 @@ self: {
        pname = "control-event";
        version = "1.2.1.1";
        sha256 = "0hwsidsxnzi4b3aphn3f7lsf1z508ql6cnhfq6zbqfsvcynm7565";
-       buildDepends = [ base containers stm time ];
+       libraryHaskellDepends = [ base containers stm time ];
        description = "Event scheduling system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35597,7 +36476,7 @@ self: {
        pname = "control-monad-attempt";
        version = "0.3.0.1";
        sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s";
-       buildDepends = [ attempt base transformers ];
+       libraryHaskellDepends = [ attempt base transformers ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/control-monad-attempt";
        description = "Monad transformer for attempt. (deprecated)";
@@ -35613,7 +36492,7 @@ self: {
        pname = "control-monad-exception";
        version = "0.11.2";
        sha256 = "0vdms5if6c04459ksix5q38l9cflgc5bwnchd422fp2qfji5j14p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base failure lifted-base monad-control monadloc transformers
          transformers-base
        ];
@@ -35630,7 +36509,7 @@ self: {
        pname = "control-monad-exception-monadsfd";
        version = "0.10.3";
        sha256 = "1izyxqry863jg9i88gcs7cib39q9c2mnm74mxdyl1d84kj1hrnim";
-       buildDepends = [
+       libraryHaskellDepends = [
          base control-monad-exception monads-fd transformers
        ];
        homepage = "http://pepeiborra.github.com/control-monad-exception";
@@ -35646,7 +36525,7 @@ self: {
        pname = "control-monad-exception-monadstf";
        version = "0.10.3";
        sha256 = "1qj4y71g5p6b4aa5wn5fp4i5c9iw0pdrqs9yvzr6f41v6knw16za";
-       buildDepends = [
+       libraryHaskellDepends = [
          base control-monad-exception monads-tf transformers
        ];
        homepage = "http://pepeiborra.github.com/control-monad-exception";
@@ -35660,7 +36539,7 @@ self: {
        pname = "control-monad-exception-mtl";
        version = "0.10.3";
        sha256 = "1wwqn3xcd2fspfd2cnf9cym0cbbgvlajr3pkx7f2v3b37mx6blni";
-       buildDepends = [ base control-monad-exception mtl ];
+       libraryHaskellDepends = [ base control-monad-exception mtl ];
        homepage = "http://pepeiborra.github.com/control-monad-exception";
        description = "MTL instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
@@ -35673,7 +36552,7 @@ self: {
        pname = "control-monad-failure";
        version = "0.7.0.1";
        sha256 = "1g304wb1fhx81iw2vv7nv6cp2qmy69frwiv3vax85lxw03s4nlkq";
-       buildDepends = [ base failure transformers ];
+       libraryHaskellDepends = [ base failure transformers ];
        jailbreak = true;
        homepage = "http://github.com/pepeiborra/control-monad-failure";
        description = "A class for monads which can fail with an error. (deprecated)";
@@ -35687,7 +36566,7 @@ self: {
        pname = "control-monad-failure-mtl";
        version = "0.7.1";
        sha256 = "0j9i85vq033789vx2589mfqwk954hqy1wla527ssbyf05k6vkn8j";
-       buildDepends = [ base failure mtl ];
+       libraryHaskellDepends = [ base failure mtl ];
        jailbreak = true;
        homepage = "http://github.com/pepeiborra/control-monad-failure";
        description = "A class for monads which can fail with an error for mtl 1 (deprecated)";
@@ -35701,7 +36580,7 @@ self: {
        pname = "control-monad-free";
        version = "0.5.3";
        sha256 = "1igwawcdpg8irayjax1xdrlpa9587k1v4y28ib3xfb7yk0xv7vk1";
-       buildDepends = [ base deepseq transformers ];
+       libraryHaskellDepends = [ base deepseq transformers ];
        homepage = "http://github.com/pepeiborra/control-monad-free";
        description = "Free monads and monad transformers";
        license = stdenv.lib.licenses.publicDomain;
@@ -35712,10 +36591,10 @@ self: {
      mkDerivation {
        pname = "control-monad-free";
        version = "0.6.1";
-       revision = "1";
        sha256 = "11i297ngwb5ck23vsr84fh5qx4hn7fzm9ml90y79lwi97hyigagy";
+       revision = "1";
        editedCabalFile = "d08dceee154098bee492a1c00ef699a2a3a0e8a3851c5d49ccd49d5645a501a4";
-       buildDepends = [ base prelude-extras transformers ];
+       libraryHaskellDepends = [ base prelude-extras transformers ];
        homepage = "http://github.com/pepeiborra/control-monad-free";
        description = "Free monads and monad transformers";
        license = stdenv.lib.licenses.publicDomain;
@@ -35727,7 +36606,7 @@ self: {
        pname = "control-monad-loop";
        version = "0.1";
        sha256 = "003k4pp6wgn30m9ksbh8680f0klzsvd90wsl9jpqs9lpg14hi6zj";
-       buildDepends = [ base transformers transformers-base ];
+       libraryHaskellDepends = [ base transformers transformers-base ];
        homepage = "https://github.com/joeyadams/haskell-control-monad-loop";
        description = "Simple monad transformer for imperative-style loops";
        license = stdenv.lib.licenses.bsd3;
@@ -35739,7 +36618,7 @@ self: {
        pname = "control-monad-omega";
        version = "0.3.1";
        sha256 = "11hirysr76i01qj8rm22xjcrv2qwxgwjlrqqyd1dsnnvypn9hfrq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/control-monad-omega";
        description = "A breadth-first list monad";
        license = stdenv.lib.licenses.publicDomain;
@@ -35751,7 +36630,7 @@ self: {
        pname = "control-monad-queue";
        version = "0.2";
        sha256 = "15syy24v1a2h25j4ijddi9l0pmp84wq9hlryh18f1jvqm8apc8vs";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Reusable corecursive queues, via continuations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35762,7 +36641,7 @@ self: {
        pname = "control-timeout";
        version = "0.1.2";
        sha256 = "1g1x6c4dafckwcw48v83f3nm2sxv8kynwv8ib236ay913ycgayvg";
-       buildDepends = [ base containers stm time ];
+       libraryHaskellDepends = [ base containers stm time ];
        description = "Timeout handling";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35773,7 +36652,7 @@ self: {
        pname = "contstuff";
        version = "1.2.6";
        sha256 = "0rw2bslajjch057fsxf881wi39bsd9y6196j0kb0lz47r0zn8003";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://haskell.org/haskellwiki/Contstuff";
        description = "Fast, easy to use CPS-based monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -35785,7 +36664,7 @@ self: {
        pname = "contstuff-monads-tf";
        version = "0.2.1";
        sha256 = "0j4y76ar0m642jxcyrvlrxagawrlq637cvx3fqprw5sl5cslgxh5";
-       buildDepends = [ base contstuff monads-tf ];
+       libraryHaskellDepends = [ base contstuff monads-tf ];
        description = "ContStuff instances for monads-tf transformers (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35797,7 +36676,7 @@ self: {
        pname = "contstuff-transformers";
        version = "0.1.1";
        sha256 = "0b5vskp1bxqpi4ffcxwjw6kr0jd6n8v8jlhf03p54ckfd5ym4ai6";
-       buildDepends = [ base contstuff transformers ];
+       libraryHaskellDepends = [ base contstuff transformers ];
        jailbreak = true;
        description = "Deprecated interface between contstuff 0.7.0 and the transformers package";
        license = stdenv.lib.licenses.bsd3;
@@ -35810,7 +36689,7 @@ self: {
        pname = "converge";
        version = "0.1.0.1";
        sha256 = "0y28m7kgphknra0w2kzf0g4m2bdj604nr3f22xng46nl7kljbpvj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "/dev/null";
        description = "Limit operations for converging sequences";
        license = stdenv.lib.licenses.publicDomain;
@@ -35822,7 +36701,7 @@ self: {
        pname = "conversion";
        version = "1.1.0.1";
        sha256 = "1bgads36prqw7m10hfmg9161d3hs5pa5qql9lbsny5hqvxsmb30d";
-       buildDepends = [ base-prelude ];
+       libraryHaskellDepends = [ base-prelude ];
        homepage = "https://github.com/nikita-volkov/conversion";
        description = "Universal converter between values of different types";
        license = stdenv.lib.licenses.mit;
@@ -35834,7 +36713,7 @@ self: {
        pname = "conversion-bytestring";
        version = "1.0.0.1";
        sha256 = "1gsbfmp58qzhvnyl6jgy1pah954qaxi184clh31lzam9m1j44k3y";
-       buildDepends = [ base-prelude bytestring conversion ];
+       libraryHaskellDepends = [ base-prelude bytestring conversion ];
        homepage = "https://github.com/nikita-volkov/conversion-bytestring";
        description = "\"Conversion\" instances for the \"bytestring\" library";
        license = stdenv.lib.licenses.mit;
@@ -35846,7 +36725,7 @@ self: {
        pname = "conversion-case-insensitive";
        version = "1.0.0.0";
        sha256 = "14mf5jincplqrdln6xja0c840mmj4khd5n3z5f4glgpnmk9r3dcp";
-       buildDepends = [ case-insensitive conversion ];
+       libraryHaskellDepends = [ case-insensitive conversion ];
        homepage = "https://github.com/nikita-volkov/conversion-case-insensitive";
        description = "\"Conversion\" instances for the \"case-insensitive\" library";
        license = stdenv.lib.licenses.mit;
@@ -35860,7 +36739,7 @@ self: {
        pname = "conversion-text";
        version = "1.0.0.2";
        sha256 = "0j7j0jww92v9gldh8hd35p51ka2mq4n26chfw6n4m034q3pjqpby";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude bytestring conversion conversion-bytestring text
        ];
        homepage = "https://github.com/nikita-volkov/conversion-text";
@@ -35878,7 +36757,7 @@ self: {
        sha256 = "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl old-locale old-time text time
        ];
        homepage = "http://hackage.haskell.org/package/convertible";
@@ -35894,7 +36773,7 @@ self: {
        pname = "convertible-ascii";
        version = "0.1.0.1";
        sha256 = "0yzfq0r430ziclxn44k9x3jwl675gs3lafr5d1cb6y9j20fl1sjw";
-       buildDepends = [
+       libraryHaskellDepends = [
          ascii base base-unicode-symbols blaze-builder bytestring
          convertible-text failure text
        ];
@@ -35915,7 +36794,7 @@ self: {
        sha256 = "1wqpl9dms1rsd24d00f18l9sm601nm6kr7h4ig8y70jdzy8w73fz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attempt base bytestring containers old-time template-haskell text
          time
        ];
@@ -35932,7 +36811,7 @@ self: {
        pname = "cookbook";
        version = "3.0.0.1";
        sha256 = "1mhj4g7bg6gi1wx8pshwl4n37vgqacnssh5hwskyaajy4gqz6hki";
-       buildDepends = [ base directory strict ];
+       libraryHaskellDepends = [ base directory strict ];
        description = "Tiered general-purpose libraries with domain-specific applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35946,11 +36825,11 @@ self: {
        pname = "cookie";
        version = "0.4.1.6";
        sha256 = "0b6ym6fn29p5az4dwydy036lxj131kagrmgb93w4bbkqfkds8b9s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring data-default-class deepseq old-locale
          text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring HUnit QuickCheck tasty tasty-hunit
          tasty-quickcheck text time
        ];
@@ -35967,8 +36846,8 @@ self: {
        pname = "coordinate";
        version = "0.0.19";
        sha256 = "01f6dmyx2kqyzf1n06awcyx0ygqgy829snxw6bbxbvih9yhkjq2r";
-       buildDepends = [ base lens radian tagged transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base lens radian tagged transformers ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/coordinate";
@@ -35987,7 +36866,11 @@ self: {
        sha256 = "0mslkyyl5shcxh05i1vprzacaxxg3jjdqcfin475zv5gm5cn26vz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base copilot-c99 copilot-cbmc copilot-core copilot-language
+         copilot-libraries copilot-sbv
+       ];
+       executableHaskellDepends = [
          base copilot-c99 copilot-cbmc copilot-core copilot-language
          copilot-libraries copilot-sbv directory random
        ];
@@ -36007,7 +36890,11 @@ self: {
        sha256 = "0lvldfkksxxmf3mbchwxzj1a1yagdk7k3zbyid181gskvmkxnfzd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         atom base bytestring containers copilot-core csv directory pretty
+         process QuickCheck random text vector
+       ];
+       executableHaskellDepends = [
          atom base bytestring containers copilot-core csv directory pretty
          process QuickCheck random text vector
        ];
@@ -36024,7 +36911,7 @@ self: {
        pname = "copilot-cbmc";
        version = "2.1.2";
        sha256 = "02ng4iqsr5yp435fcqjjh9j5p93l4cixjdnqjx4fafhhfrv8g8a1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring copilot-c99 copilot-core copilot-sbv directory
          pretty process
        ];
@@ -36041,7 +36928,7 @@ self: {
        pname = "copilot-core";
        version = "2.1.2";
        sha256 = "1gdq76c170sv58fb56ik8mam3f63dg0jk6myd5rv4sbh4z45xfs7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dlist mtl pretty pretty-ncols random
        ];
        description = "An intermediate representation for Copilot";
@@ -36057,7 +36944,7 @@ self: {
        pname = "copilot-language";
        version = "2.1.2";
        sha256 = "1099w6hk6v4rna02z4zsrwf1m883w6nxgycy5d8iamd4n2pk6bk3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers copilot-core data-reify ghc-prim mtl
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
@@ -36073,7 +36960,7 @@ self: {
        pname = "copilot-libraries";
        version = "2.1.1";
        sha256 = "0b69rfz4gvdvk9f9y7yns3hmh1m7akcrm3rcdi8rkhizykcnnsyj";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers copilot-language mtl parsec
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
@@ -36089,7 +36976,7 @@ self: {
        pname = "copilot-sbv";
        version = "2.1.2";
        sha256 = "1a4blmxrglp4fmrfnc7g3w0zhyl3fdx3lvaw2mi47wchqbqcgicr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers copilot-core filepath pretty sbv
        ];
        description = "A compiler for CoPilot targeting SBV";
@@ -36104,14 +36991,14 @@ self: {
      mkDerivation {
        pname = "copr";
        version = "1.1.1";
-       revision = "1";
        sha256 = "0zgg60ri8yvz96gk08wdfn0445wqszigh2p0964nr2zdnffq5rnw";
+       revision = "1";
        editedCabalFile = "ef9fb8be7d257feae9e4647de62d489860e2bd6510e34a35465cf5b763fa2425";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers HsOpenSSL http-streams io-streams
          semigroups text
        ];
-       testDepends = [ base hlint ];
+       testHaskellDepends = [ base hlint ];
        jailbreak = true;
        homepage = "https://github.com/relrod/copr-hs";
        description = "Haskell interface to the Fedora Copr system";
@@ -36124,7 +37011,7 @@ self: {
        pname = "core";
        version = "0.5";
        sha256 = "1fqgfbd3in8l84250kda67paakz4sr2ywf5qzsy403546w7q9ccz";
-       buildDepends = [ base bytestring parsec pretty ];
+       libraryHaskellDepends = [ base bytestring parsec pretty ];
        description = "External core parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36138,7 +37025,9 @@ self: {
        sha256 = "1wjmj2p8j6xw7cga01jsjgpi4dswrxif3j6mml48fq8a4k19zqxr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskeline haskell-src-exts hint ];
+       executableHaskellDepends = [
+         base haskeline haskell-src-exts hint
+       ];
        homepage = "https://github.com/happlebao/Core-Haskell";
        description = "A subset of Haskell using in UCC for teaching purpose";
        license = stdenv.lib.licenses.bsd3;
@@ -36156,7 +37045,12 @@ self: {
        sha256 = "10pfz4bw1wh55c2cizd8jiwh8bkaqw9p773976vl52f0jrhns1qg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring containers directory filepath
+         filestore http-types monads-tf pandoc template-haskell text time
+         yesod
+       ];
+       executableHaskellDepends = [
          aeson base blaze-builder bytestring containers directory filepath
          filestore http-types monads-tf pandoc template-haskell text time
          yesod
@@ -36173,7 +37067,7 @@ self: {
        pname = "coroutine-enumerator";
        version = "0.1.1";
        sha256 = "1rjbhpy5vw1maawi47jsrnagqm19say9w1i31pgcpxl45vhrshp7";
-       buildDepends = [ base enumerator monad-coroutine ];
+       libraryHaskellDepends = [ base enumerator monad-coroutine ];
        jailbreak = true;
        homepage = "http://trac.haskell.org/SCC/wiki/coroutine-enumerator";
        description = "Bridge between the monad-coroutine and enumerator packages";
@@ -36186,7 +37080,7 @@ self: {
        pname = "coroutine-iteratee";
        version = "0.1.1";
        sha256 = "1ycir4kwpcz34yg64cdb9q0jxv3ma12vrrs28cr5jm64jmi8m0wd";
-       buildDepends = [ base iteratee monad-coroutine ];
+       libraryHaskellDepends = [ base iteratee monad-coroutine ];
        jailbreak = true;
        homepage = "http://trac.haskell.org/SCC/wiki/coroutine-iteratee";
        description = "Bridge between the monad-coroutine and iteratee packages";
@@ -36202,7 +37096,7 @@ self: {
        pname = "coroutine-object";
        version = "0.3";
        sha256 = "0q0rvcc7ipxwmikaxh0ymq1d65f2q1a2jrd1i553pdf8hwmv0k1r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers either lens mtl safecopy
          transformers transformers-free uuid
        ];
@@ -36220,7 +37114,7 @@ self: {
        sha256 = "0mrx0mjh9kzk6nx53gn5hvhjgmhlwphxkl5yn9a1x17l62v3x6q7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring hint random text transformers
          vector
        ];
@@ -36242,13 +37136,13 @@ self: {
        pname = "couchdb-conduit";
        version = "0.10.6";
        sha256 = "0rp5pj56m9n20g5hjjw8gbx81lb2z0ckwpgpvyr2a5sgk6b7z2al";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder bytestring
          conduit containers data-default http-conduit http-types lifted-base
          monad-control resourcet string-conversions syb text transformers
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder bytestring
          conduit containers data-default http-conduit http-types HUnit
          lifted-base monad-control string-conversions syb test-framework
@@ -36273,12 +37167,12 @@ self: {
        pname = "couchdb-enumerator";
        version = "0.3.7";
        sha256 = "02h0a61dbchyjp0shpj0shsdfcggx0cm5psxgw9g67vv3v8f98pn";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-enumerator base bytestring enumerator
          http-enumerator http-types lifted-base monad-control text
          transformers unordered-containers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec attoparsec-enumerator base bytestring enumerator
          http-enumerator http-types HUnit lifted-base monad-control
          QuickCheck test-framework test-framework-hunit
@@ -36298,7 +37192,7 @@ self: {
        pname = "count";
        version = "0.0.1";
        sha256 = "1az2vr1rjq4pfgzswwbwgfq4kcb8kq759vn5kl7ghzaqr7b6vkgx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Bijective mappings between values and possibly infinite prefixes of [0..]";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -36309,7 +37203,7 @@ self: {
        pname = "countable";
        version = "0.2";
        sha256 = "1az6pk1is587ggys6v1qh3yabnc63vr0fcd5bmvwx20c137yflik";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/AshleyYakeley/countable";
        description = "Countable, Searchable, Finite, Empty classes";
        license = stdenv.lib.licenses.bsd3;
@@ -36321,7 +37215,7 @@ self: {
        pname = "counter";
        version = "0.1.0.1";
        sha256 = "0pfg34ph6b7qb3wscvvnqdkqqzkjdjc8wynv35ikgf295bsf3kaz";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/wei2912/counter";
        description = "An object frequency counter";
        license = stdenv.lib.licenses.mit;
@@ -36337,8 +37231,9 @@ self: {
        sha256 = "16729grgn4bgnh9nw51h3pil054bixqxfa8lxwfz8xf3b6lcm774";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aeson base shakespeare tagsoup text ];
-       testDepends = [ aeson base HTF HUnit ];
+       libraryHaskellDepends = [ aeson base shakespeare text ];
+       executableHaskellDepends = [ base tagsoup text ];
+       testHaskellDepends = [ aeson base HTF HUnit ];
        homepage = "https://github.com/prowdsponsor/country-codes";
        description = "ISO 3166 country codes and i18n names";
        license = stdenv.lib.licenses.bsd3;
@@ -36353,11 +37248,11 @@ self: {
        pname = "courier";
        version = "0.1.0.15";
        sha256 = "1aj9anrw7jfqx8s2xkdznqs212f54g6i2lcf79bgnkmxsbax252v";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring cereal containers hslogger network stm text
          uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base cereal containers directory hslogger HUnit network stm
          test-framework test-framework-hunit
        ];
@@ -36376,7 +37271,7 @@ self: {
        sha256 = "0cpvm6cjfz203hajl8fj5gxc5hc7516v0bzz4d7hyih2kh21k6dn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring directory filepath old-locale
          optparse-applicative process stm text time unix
        ];
@@ -36395,16 +37290,17 @@ self: {
        pname = "cpio-conduit";
        version = "0.7.0";
        sha256 = "04zma03ivg9x5f1xkdpc828fk2lh6qrn7cig7gprci13id9yf2wg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring binary bytestring conduit conduit-extra
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base16-bytestring binary bytestring conduit conduit-extra
          resourcet
        ];
        homepage = "http://github.com/da-x/cpio-conduit";
        description = "Conduit-based CPIO";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cplusplus-th" = callPackage
@@ -36415,10 +37311,10 @@ self: {
        pname = "cplusplus-th";
        version = "1.0.0.0";
        sha256 = "0gmsn35rd6ij4ax4j626hg9pdb40ilj22zg0nxrnl6n1828a9rqj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers process template-haskell
        ];
-       testDepends = [ base process QuickCheck ];
+       testHaskellDepends = [ base process QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/nicta/cplusplus-th";
        description = "C++ Foreign Import Generation";
@@ -36435,7 +37331,12 @@ self: {
        sha256 = "194hcvhjgm6rmbqp857y3j39lvl2p91mqrrgpi15jq00icnv4idv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory old-locale old-time polyparse ];
+       libraryHaskellDepends = [
+         base directory old-locale old-time polyparse
+       ];
+       executableHaskellDepends = [
+         base directory old-locale old-time polyparse
+       ];
        homepage = "http://projects.haskell.org/cpphs/";
        description = "A liberalised re-implementation of cpp, the C pre-processor";
        license = "LGPL";
@@ -36449,7 +37350,7 @@ self: {
        pname = "cprng-aes";
        version = "0.6.1";
        sha256 = "1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring cipher-aes crypto-random
        ];
        homepage = "http://github.com/vincenthz/hs-cprng-aes";
@@ -36464,10 +37365,10 @@ self: {
      mkDerivation {
        pname = "cprng-aes-effect";
        version = "0.1.0.2";
-       revision = "1";
        sha256 = "0443h7jfpjvc6vmp3kfx0h6j2aynvgfznssz7lin9fmsxghlvsfb";
+       revision = "1";
        editedCabalFile = "b9752152bb1764da66976eaf18776b09dabf80eeb6f252bcee0da10fa0a1057e";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cprng-aes crypto-random crypto-random-effect
          extensible-effects
        ];
@@ -36485,7 +37386,7 @@ self: {
        sha256 = "0zm2waj17ak43rhri9rhvwy970dv22r0k42fzbm3n6gcl5h2mcq5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers parallel ];
+       executableHaskellDepends = [ array base containers parallel ];
        description = "Symbolic cryptographic protocol analyzer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36499,7 +37400,7 @@ self: {
        sha256 = "0x19mlanmkg96h6h1i04w2i631z84y4rbk22ki4zhgsajysgw9sn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/vincenthz/hs-cpu";
        description = "Cpu information and properties helpers";
        license = stdenv.lib.licenses.bsd3;
@@ -36513,7 +37414,7 @@ self: {
        sha256 = "126xg98yaf3q61h85yrs1cm6wxlayf590l0a3h0gw6c282s8l6gq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base data-accessor enumset ];
+       libraryHaskellDepends = [ base data-accessor enumset ];
        homepage = "http://code.haskell.org/cpuid/";
        description = "Binding for the cpuid machine instruction on x86 compatible processors";
        license = "GPL";
@@ -36527,7 +37428,7 @@ self: {
        sha256 = "1xnmrm3agkxziflvanihckg6q97z5w9gh7yv7mbbc7gqax3sz6l0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl process ];
+       executableHaskellDepends = [ base mtl process ];
        homepage = "http://code.haskell.org/~dons/code/cpuperf";
        description = "Modify the cpu frequency on OpenBSD systems";
        license = stdenv.lib.licenses.bsd3;
@@ -36540,9 +37441,9 @@ self: {
        pname = "cpython";
        version = "3.3.0";
        sha256 = "162m0dfgnicyv3jb9dqq6pmyymh1dim043kbmbg1hfhxjfrv17jj";
-       buildDepends = [ base bytestring text ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ python3 ];
+       libraryHaskellDepends = [ base bytestring text ];
+       libraryPkgconfigDepends = [ python3 ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "https://john-millikin.com/software/haskell-python/";
        description = "Bindings for libpython";
@@ -36559,11 +37460,11 @@ self: {
        pname = "cql";
        version = "3.0.5";
        sha256 = "12v5hhlji9w73chxdhazpmhbaxmjs98lw1y6cm8p29bgxdi75q61";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal Decimal iproute network template-haskell
          text time transformers uuid vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal Decimal iproute network QuickCheck tasty
          tasty-quickcheck text time uuid
        ];
@@ -36583,7 +37484,7 @@ self: {
        pname = "cql-io";
        version = "0.14.5";
        sha256 = "0ks2sn3dfrr8ilvmw48hfz3140x9dsi79w6ci4vfksn1g5ndnpiy";
-       buildDepends = [
+       libraryHaskellDepends = [
          async auto-update base bytestring containers cql cryptohash
          data-default-class exceptions hashable iproute lens monad-control
          mtl mwc-random network semigroups stm text time tinylog
@@ -36603,11 +37504,11 @@ self: {
        pname = "cqrs";
        version = "0.9.0";
        sha256 = "1r3wl6fwkqccnfhazq7dk4c2zmlirxrh3y7a7fjhxm9273g59f1b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers cqrs-types deepseq pool-conduit
          random SafeSemaphore stm transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring conduit cqrs-test hspec HUnit pool-conduit
          stm transformers
        ];
@@ -36628,7 +37529,7 @@ self: {
        sha256 = "0yllvs64qaxpgqlwdv3hmi4gzl5qf2lbyy3r0whyi2kz53kwl03i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base blaze-builder bytestring cereal conduit containers cqrs
          deepseq derive scotty stm text transformers wai-eventsource
          wai-middleware-static
@@ -36648,11 +37549,11 @@ self: {
        pname = "cqrs-postgresql";
        version = "0.9.0";
        sha256 = "0zannh06gbc5vm5cpx9015i7ssg38k5lwwyajxhxa1nckwynqmzb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-lexing conduit cqrs-types old-locale
          pool-conduit postgresql-libpq text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit cqrs-test cqrs-types hspec pool-conduit
          postgresql-libpq
        ];
@@ -36670,11 +37571,11 @@ self: {
        pname = "cqrs-sqlite3";
        version = "0.9.0";
        sha256 = "086g5z7ajr2x2didd0q8qcvnxdsf2gfrn27436gbj8y81cbg0fsh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit cqrs-types direct-sqlite pool-conduit text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit cqrs-test direct-sqlite hspec pool-conduit
          text transformers
        ];
@@ -36692,7 +37593,7 @@ self: {
        pname = "cqrs-test";
        version = "0.9.0";
        sha256 = "1i47c2d7c64kp63spm12jkwg3g21i0z4n9z9gdwvmsr1s638k5gl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit cqrs-types hspec HUnit pool-conduit stm
          transformers
        ];
@@ -36710,7 +37611,7 @@ self: {
        pname = "cqrs-types";
        version = "0.9.0";
        sha256 = "1xxyy8zrx76x3vg54awhp9lz5qhg9x5cafhlqr45ilfz2rxjkzbg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring conduit deepseq
          derive random
        ];
@@ -36730,7 +37631,7 @@ self: {
        sha256 = "107chyp8br2ryjqdf7100109k0wg3jawzva76wf4r6fndjr3gin1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs directory process shelly text transformers unix
        ];
        homepage = "https://github.com/scvalex/cr";
@@ -36745,8 +37646,8 @@ self: {
        pname = "crack";
        version = "0.1";
        sha256 = "0rfwvvb3q0a7z8is95yjh3wfvz818xyblp1hrwh8fwddppncrzrk";
-       buildDepends = [ base ];
-       extraLibraries = [ crack ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ crack ];
        description = "A haskell binding to cracklib";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36760,7 +37661,8 @@ self: {
        sha256 = "06balzwvvpl69abfcq0gynv6zpy42aygvlicb9jsnrys2vyipv28";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base data-binary-ieee754 ieee754 ];
+       libraryHaskellDepends = [ base data-binary-ieee754 ieee754 ];
+       executableHaskellDepends = [ base data-binary-ieee754 ieee754 ];
        description = "Crack various integer, floating-point data formats";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -36773,7 +37675,7 @@ self: {
        sha256 = "0002n3fq3afmby843gfi0dnwm2saq29w6hnn6lzqhsalw33j97d3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base colour mtl vector-space ];
+       libraryHaskellDepends = [ base colour mtl vector-space ];
        jailbreak = true;
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "2D graphics library with integrated TikZ output";
@@ -36787,7 +37689,7 @@ self: {
        pname = "craftwerk-cairo";
        version = "0.1";
        sha256 = "16in87l2v49k785fldm7fvprywg0v497kz29jr22y91q5j5gnm4z";
-       buildDepends = [ base cairo craftwerk mtl ];
+       libraryHaskellDepends = [ base cairo craftwerk mtl ];
        jailbreak = true;
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "Cairo backend for Craftwerk";
@@ -36805,7 +37707,7 @@ self: {
        sha256 = "18b63yh4p5ry38c3p6plyhk5j0gmmnyjw25r2dxdaddpnn051nff";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers craftwerk craftwerk-cairo gtk mtl
        ];
        jailbreak = true;
@@ -36821,7 +37723,7 @@ self: {
        pname = "crc16";
        version = "0.1.1";
        sha256 = "15x3xwq2vyg474m09jak1c2zx9w5acpfjgmy5jj4asxj33z9n7bz";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Calculate the crc16-ccitt";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36833,7 +37735,7 @@ self: {
        pname = "crc16-table";
        version = "0.1";
        sha256 = "0x943wmcbj679kj7q2a2ipjycq17ajm71m487vkb8b6gdrdy8f2z";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Compute CRC16 checksums using a lookup table";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -36849,12 +37751,12 @@ self: {
        pname = "creatur";
        version = "5.9.8.2";
        sha256 = "15cjk5hb4j7ydsis8fz7gag3sa17i6yr26pfbf8aqkw7iakmjqs9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal cond directory exceptions filepath
          gray-extended hdaemonize hsyslog MonadRandom mtl old-locale process
          random split time transformers unix zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base binary cereal directory filepath hsyslog HUnit
          MonadRandom mtl QuickCheck temporary test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -36873,7 +37775,7 @@ self: {
        pname = "crf-chain1";
        version = "0.2.2";
        sha256 = "0v0mmpvn9qma3xz92s13ywk9p5czxzshh2rf06hb2zqqq5m6iwhq";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary containers data-lens logfloat monad-codec
          parallel random sgd vector vector-binary vector-th-unbox
        ];
@@ -36893,7 +37795,7 @@ self: {
        pname = "crf-chain1-constrained";
        version = "0.3.2";
        sha256 = "02xf9q96rlmmfcdz45bpbsdi0ki7mdrdwzg2zph7b55jwsnb4fja";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary containers data-lens logfloat monad-codec
          parallel random sgd vector vector-binary vector-th-unbox
        ];
@@ -36912,7 +37814,7 @@ self: {
        pname = "crf-chain2-generic";
        version = "0.3.0";
        sha256 = "104r52rf5q84bm6977bsfm4djcz8c08warfkk4xmympb0cmxkhxy";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary comonad-transformers containers data-lens
          logfloat monad-codec parallel sgd vector vector-binary
        ];
@@ -36932,7 +37834,7 @@ self: {
        pname = "crf-chain2-tiers";
        version = "0.2.4";
        sha256 = "0sxa5rsla676x47a1l8cvypccyl8vi7y68fnbnrk7r20ahw6vxi1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary comonad containers data-lens logfloat monad-codec
          parallel sgd vector vector-binary vector-th-unbox
        ];
@@ -36951,8 +37853,10 @@ self: {
        pname = "critbit";
        version = "0.2.0.0";
        sha256 = "1xdgaj73ffvj1q1kyi62bifbazmzgamfwzdbdz0c339axw5dga82";
-       buildDepends = [ array base bytestring deepseq text vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         array base bytestring deepseq text vector
+       ];
+       testHaskellDepends = [
          base bytestring containers QuickCheck test-framework
          test-framework-quickcheck2 text transformers vector
        ];
@@ -36975,13 +37879,14 @@ self: {
        sha256 = "0f1d8lxb9jhrhcm0gbqqimmq52q36b5h1nqznmjmxa75nqdx9vaw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-wl-pprint base binary bytestring cassava containers
          deepseq directory filepath Glob hastache mtl mwc-random
          optparse-applicative parsec statistics text time transformers
          transformers-compat vector vector-algorithms
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck statistics test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -37001,13 +37906,13 @@ self: {
        pname = "criterion-plus";
        version = "0.1.3";
        sha256 = "127nqhp2gczbfqablvrrk92am4kpsnzhvyl4kcy98kdv313vcwdl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base criterion deepseq loch-th monad-control mtl
          optparse-applicative placeholders statistics string-conversions
          system-fileio system-filepath text th-printf transformers
          transformers-base vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base criterion deepseq HTF HUnit loch-th monad-control mtl
          optparse-applicative placeholders QuickCheck statistics
          string-conversions system-fileio system-filepath text th-printf
@@ -37030,7 +37935,7 @@ self: {
        sha256 = "010x56czgipw3p1cfkx07mlcy4yj6advq3zzgrxpmjhrxzsa89xn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers filepath
        ];
        jailbreak = true;
@@ -37045,7 +37950,7 @@ self: {
        pname = "crockford";
        version = "0.2";
        sha256 = "1fgsmf2k0v1j7b3gv06q9c65410qa2ivl59rwkm7j931wsymsg26";
-       buildDepends = [ base digits QuickCheck safe ];
+       libraryHaskellDepends = [ base digits QuickCheck safe ];
        description = "An implementation of Douglas Crockford's base32 encoding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37060,7 +37965,7 @@ self: {
        sha256 = "1krvcn5yb9i6jxwn2wwnpc8ylivhn27315a2sifn19f1l2vvy038";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bmp bytestring deepseq ghc-prim heap HUnit
          mersenne-random-pure64 mtl parallel
        ];
@@ -37079,17 +37984,16 @@ self: {
        pname = "cron";
        version = "0.3.0";
        sha256 = "18yadf94bzyhm5nab6lc8zagp39yv5k8cjjakhaxncgipcm30s9k";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base mtl mtl-compat old-locale text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base derive hspec hspec-expectations QuickCheck text
          time transformers-compat
        ];
        homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cron-compat" = callPackage
@@ -37101,11 +38005,11 @@ self: {
        pname = "cron-compat";
        version = "0.2.6";
        sha256 = "0km70j3xfqvpra9mvbxpvpqd7arjjfcpazmilvmj6kjxk6cw7pfx";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base mtl mtl-compat old-locale text time
          transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base cron derive hspec hspec-expectations QuickCheck
          text time transformers
        ];
@@ -37121,8 +38025,8 @@ self: {
        pname = "cruncher-types";
        version = "1.1.0";
        sha256 = "0kp0vm8mvgn12kk5csyhzv6g6az43acl6iwjbhvfdfr2mqif2b9h";
-       buildDepends = [ aeson base containers lens text ];
-       testDepends = [ base hlint ];
+       libraryHaskellDepends = [ aeson base containers lens text ];
+       testHaskellDepends = [ base hlint ];
        homepage = "http://github.com/eval-so/cruncher-types";
        description = "Request and Response types for Eval.so's API";
        license = stdenv.lib.licenses.bsd3;
@@ -37138,7 +38042,7 @@ self: {
        sha256 = "08341mvdca70nlkdi2im344hhkv62s278a1gkp02hj0zrixzfkqm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filelock filepath process SHA text time
          transformers unix
        ];
@@ -37156,7 +38060,7 @@ self: {
        pname = "crypto-api";
        version = "0.13.2";
        sha256 = "1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal entropy tagged transformers
        ];
        homepage = "https://github.com/TomMD/crypto-api";
@@ -37173,7 +38077,7 @@ self: {
        pname = "crypto-api-tests";
        version = "0.3";
        sha256 = "0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal crypto-api directory filepath HUnit
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -37191,7 +38095,7 @@ self: {
        pname = "crypto-cipher-benchmarks";
        version = "0.0.5";
        sha256 = "1ddyz0fn3srvm37afbiw86lv0z7iwrmnhazgvk0gg5n3ic57anhq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring criterion crypto-cipher-types mtl pretty
          securemem
        ];
@@ -37210,12 +38114,12 @@ self: {
        pname = "crypto-cipher-tests";
        version = "0.0.11";
        sha256 = "19wqignlq90qwpam01hnmmrxaxh5lkax9l1l6rlbi4a07nvp1dnz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types HUnit mtl QuickCheck
          securemem test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-cipher-types HUnit mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -37230,7 +38134,7 @@ self: {
        pname = "crypto-cipher-types";
        version = "0.0.9";
        sha256 = "03qa1i1kj07pfrxsi7fiaqnnd0vi94jd4jfswbmnm4gp1nvzcwr0";
-       buildDepends = [ base byteable bytestring securemem ];
+       libraryHaskellDepends = [ base byteable bytestring securemem ];
        homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Generic cryptography cipher types";
        license = stdenv.lib.licenses.bsd3;
@@ -37245,7 +38149,7 @@ self: {
        pname = "crypto-classical";
        version = "0.1.0";
        sha256 = "06x694ia1alw53a282krzmkbcr1xbvn5nmgfqbgysgpz5ky931wg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers crypto-numbers crypto-random lens
          modular-arithmetic QuickCheck random random-shuffle text
          transformers
@@ -37264,11 +38168,11 @@ self: {
        pname = "crypto-conduit";
        version = "0.5.5";
        sha256 = "0zd4smj3rk2x1msl8z8f5y01x4b87rhgm45g26g6c3dsdasn1lyf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra crypto-api resourcet
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal conduit conduit-extra crypto-api
          cryptocipher cryptohash-cryptoapi hspec skein transformers
        ];
@@ -37285,13 +38189,13 @@ self: {
      mkDerivation {
        pname = "crypto-numbers";
        version = "0.2.7";
-       revision = "1";
        sha256 = "19l9y5jzvqrqfam13xin9m9ca0s5ql86yv0cjn6dzkydx4byn2j2";
+       revision = "1";
        editedCabalFile = "2b493386b7605b70a67f751d6496e9feff8ef319a5294b122a3ff3895a8453ca";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-random ghc-prim integer-gmp vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-random tasty tasty-hunit
          tasty-quickcheck vector
        ];
@@ -37309,11 +38213,11 @@ self: {
        pname = "crypto-pubkey";
        version = "0.2.8";
        sha256 = "0vmmx2fqq2xc3xfavy22i2nyynpk88jhmjr62qgxw5w5qgsz5k60";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-numbers crypto-pubkey-types
          crypto-random cryptohash
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring crypto-numbers crypto-pubkey-types
          crypto-random cryptohash tasty tasty-hunit tasty-kat
          tasty-quickcheck
@@ -37333,11 +38237,11 @@ self: {
        pname = "crypto-pubkey-openssh";
        version = "0.2.7";
        sha256 = "0ndb1crjl3xbd18bfs3ipqbzn120mpqnn27jfi4vjqf5ak48b444";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types attoparsec base base64-bytestring
          bytestring cereal crypto-pubkey-types pem
        ];
-       testDepends = [
+       testHaskellDepends = [
          asn1-encoding asn1-types attoparsec base base64-bytestring
          bytestring cereal crypto-pubkey-types deepseq filepath pem process
          QuickCheck tasty tasty-quickcheck temporary
@@ -37353,7 +38257,7 @@ self: {
        pname = "crypto-pubkey-types";
        version = "0.4.3";
        sha256 = "0q0wlzjmpx536h1zcdzrpxjkvqw8abj8z0ci38138kpch4igbnby";
-       buildDepends = [ asn1-encoding asn1-types base ];
+       libraryHaskellDepends = [ asn1-encoding asn1-types base ];
        homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";
        description = "Generic cryptography Public keys algorithm types";
        license = stdenv.lib.licenses.bsd3;
@@ -37365,7 +38269,7 @@ self: {
        pname = "crypto-random";
        version = "0.0.9";
        sha256 = "0139kbbb2h7vshf68y3fvjda29lhj7jjwl4vq78w4y8k8hc7l2hp";
-       buildDepends = [ base bytestring securemem unix vector ];
+       libraryHaskellDepends = [ base bytestring securemem unix vector ];
        homepage = "http://github.com/vincenthz/hs-crypto-random";
        description = "Simple cryptographic random related types";
        license = stdenv.lib.licenses.bsd3;
@@ -37377,7 +38281,7 @@ self: {
        pname = "crypto-random-api";
        version = "0.2.0";
        sha256 = "0z49kwgjj7rz235642q64hbkgp0zl6ipn29xd19yb75xc5q7gsan";
-       buildDepends = [ base bytestring entropy ];
+       libraryHaskellDepends = [ base bytestring entropy ];
        homepage = "http://github.com/vincenthz/hs-crypto-random-api";
        description = "Simple random generators API for cryptography related code";
        license = stdenv.lib.licenses.bsd3;
@@ -37390,10 +38294,10 @@ self: {
      mkDerivation {
        pname = "crypto-random-effect";
        version = "0.2.0.4.1";
-       revision = "1";
        sha256 = "1gj40r6i79jvsghyv4nqm3yrjlby9fkxxhzp0lkr5j1b9b3b2xwr";
+       revision = "1";
        editedCabalFile = "f217573816b1efe3fcc9b1dcbd6325015bc9a87872200547f56a80ec2b959c31";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-random extensible-effects securemem
          transformers
        ];
@@ -37411,7 +38315,7 @@ self: {
        pname = "crypto-totp";
        version = "0.1.0.1";
        sha256 = "0vkjkyaxp0rb4n2p7gdbbswm32gvbsbqnb6xs9hh4rncfaghpqds";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers cryptohash tagged unix
        ];
        description = "Provides generation and verification services for time-based one-time keys";
@@ -37426,7 +38330,7 @@ self: {
        pname = "cryptocipher";
        version = "0.6.2";
        sha256 = "0ip3a2as0df6drl29sryayxx22sx55v6bs60s2fh3i1nxqnydf9l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cipher-aes cipher-blowfish cipher-camellia cipher-des
          cipher-rc4 crypto-cipher-types
        ];
@@ -37443,8 +38347,8 @@ self: {
        pname = "cryptohash";
        version = "0.11.6";
        sha256 = "0dyzcaxr8vhzqq9hj4240rxpi87h4ps87yz09klz723shls26f6s";
-       buildDepends = [ base byteable bytestring ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ base byteable bytestring ghc-prim ];
+       testHaskellDepends = [
          base byteable bytestring HUnit QuickCheck tasty tasty-hunit
          tasty-quickcheck
        ];
@@ -37461,7 +38365,7 @@ self: {
        pname = "cryptohash-conduit";
        version = "0.1.1";
        sha256 = "1kmlskgb0jx8hkzdncr24aqir9k1kyfcb2rypvkdld1yin4nslga";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra cryptohash resourcet
          transformers
        ];
@@ -37478,7 +38382,7 @@ self: {
        pname = "cryptohash-cryptoapi";
        version = "0.1.3";
        sha256 = "0wj53p32js8lfg0i8akrljpash0jdiyv2vcqpmjbd4dq2fx81w2n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal crypto-api cryptohash tagged
        ];
        homepage = "http://github.com/vincenthz/hs-cryptohash-cryptoapi";
@@ -37499,13 +38403,17 @@ self: {
        sha256 = "07aai72kg66skdnbydy25a07124znvrixbw91gk4n9430gsvv26z";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ansi-terminal array async base containers deepseq directory
-         filepath gitrev GraphSCC haskeline heredoc monadLib old-time
-         presburger pretty process QuickCheck random sbv smtLib syb
-         template-haskell text tf-random transformers utf8-string
+       libraryHaskellDepends = [
+         array async base containers deepseq directory filepath gitrev
+         GraphSCC heredoc monadLib old-time presburger pretty process
+         QuickCheck random sbv smtLib syb template-haskell text tf-random
+         transformers utf8-string
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         ansi-terminal base containers deepseq directory filepath haskeline
+         monadLib process random sbv tf-random transformers
        ];
-       buildTools = [ alex happy ];
        homepage = "http://www.cryptol.net/";
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
@@ -37520,10 +38428,10 @@ self: {
        pname = "cryptonite";
        version = "0.6";
        sha256 = "0lzqmhslq1pwj6pp82l3vdnnxbqvh0bqjyl02x2yp6sp72mcq5m0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring deepseq ghc-prim integer-gmp memory
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring memory tasty tasty-hunit tasty-kat
          tasty-quickcheck
        ];
@@ -37542,7 +38450,7 @@ self: {
        pname = "cryptsy-api";
        version = "0.2.1";
        sha256 = "1knnzh77y4rr7ka2nfwr99z61v2pvx2p1mzji06ac0mjk2n80ybs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring deepseq either http-client http-client-tls
          old-locale pipes-attoparsec pipes-http text time transformers
          unordered-containers vector
@@ -37559,7 +38467,7 @@ self: {
        pname = "crystalfontz";
        version = "0.1";
        sha256 = "14mh098kgckncips17bdsbg08q78xk1114174zq860z4znmc1gxv";
-       buildDepends = [ base crc16-table MaybeT serialport ];
+       libraryHaskellDepends = [ base crc16-table MaybeT serialport ];
        description = "Control Crystalfontz LCD displays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37571,7 +38479,7 @@ self: {
        pname = "cse-ghc-plugin";
        version = "0.1.1";
        sha256 = "123x10ircbj8lrsqapf6cb9b3ibjgp1q8l862a3i6i0ak7ash49f";
-       buildDepends = [ base ghc ];
+       libraryHaskellDepends = [ base ghc ];
        homepage = "http://thoughtpolice.github.com/cse-ghc-plugin";
        description = "Compiler plugin for common subexpression elimination";
        license = stdenv.lib.licenses.bsd3;
@@ -37584,7 +38492,7 @@ self: {
        pname = "csound-catalog";
        version = "0.2.2";
        sha256 = "0rrd0gk6z16ydpn90i4siy3p7d1qxb14q022r3mqmj792c1v6z5p";
-       buildDepends = [ base csound-expression transformers ];
+       libraryHaskellDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-catalog";
        description = "a gallery of Csound instruments";
        license = stdenv.lib.licenses.bsd3;
@@ -37600,7 +38508,7 @@ self: {
        pname = "csound-expression";
        version = "4.8.2";
        sha256 = "1zhx4smvs8xnqfcv2hxhq57n16cl3sycz659viw8l6v8f36ibj5i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Boolean colour csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
          process temporal-media transformers
@@ -37619,7 +38527,7 @@ self: {
        pname = "csound-expression-dynamic";
        version = "0.1.4.3";
        sha256 = "1rzfah8d7j7s45w6zvrs5sabplcapx6njaimkmvfj9dby2brxprw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base Boolean containers data-default data-fix data-fix-cse
          transformers wl-pprint
        ];
@@ -37636,7 +38544,7 @@ self: {
        pname = "csound-expression-opcodes";
        version = "0.0.3";
        sha256 = "0f7nwrnrpsi31q9vaxy2yihripzqjzp6683qy94ljkmxmfnm9sb5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base csound-expression-dynamic csound-expression-typed transformers
        ];
        description = "opcodes for the library csound-expression";
@@ -37653,7 +38561,7 @@ self: {
        pname = "csound-expression-typed";
        version = "0.0.7.7";
        sha256 = "1z9hvkgl6lqwrdhngq79425s2frhkg4llkcpsar21d5ld4fhzfdl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          data-default deepseq ghc-prim stable-maps temporal-media
          transformers wl-pprint
@@ -37670,7 +38578,7 @@ self: {
        pname = "csound-sampler";
        version = "0.0.6.2";
        sha256 = "0qgz3k6cw5hzp5la051xnmg3697p7yfdamn8r6mp7ca4fai311h0";
-       buildDepends = [ base csound-expression transformers ];
+       libraryHaskellDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
        license = stdenv.lib.licenses.bsd3;
@@ -37683,7 +38591,7 @@ self: {
        pname = "csp";
        version = "1.0";
        sha256 = "0skz2yx8armbr0x7vhixxkbm7qbspg38723x98k6kysz7n5nzw2c";
-       buildDepends = [ base containers mtl nondeterminism ];
+       libraryHaskellDepends = [ base containers mtl nondeterminism ];
        description = "Discrete constraint satisfaction problem (CSP) solvers";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37698,7 +38606,9 @@ self: {
        sha256 = "1yz94yvggw6a7fh2p7fszyp02nnk7labbl6z079gqn3smayzfs31";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath haskeline libcspm mtl ];
+       executableHaskellDepends = [
+         base directory filepath haskeline libcspm mtl
+       ];
        homepage = "https://github.com/tomgr/libcspm";
        description = "A command line type checker for CSPM files";
        license = stdenv.lib.licenses.bsd3;
@@ -37711,7 +38621,7 @@ self: {
        pname = "css";
        version = "0.2";
        sha256 = "150gdsf059x658z6cbclrydzbynw06nhrpf4i1l9gwb6siarvjv9";
-       buildDepends = [ base mtl text ];
+       libraryHaskellDepends = [ base mtl text ];
        description = "Minimal monadic CSS DSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37723,8 +38633,8 @@ self: {
        pname = "css-text";
        version = "0.1.2.1";
        sha256 = "1xi1n2f0g8y43p95lynhcg50wxbq7hqfzbfzm7fy8mn7gvd920nw";
-       buildDepends = [ attoparsec base text ];
-       testDepends = [ attoparsec base hspec QuickCheck text ];
+       libraryHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [ attoparsec base hspec QuickCheck text ];
        homepage = "http://www.yesodweb.com/";
        description = "CSS parser and renderer";
        license = stdenv.lib.licenses.bsd3;
@@ -37736,7 +38646,7 @@ self: {
        pname = "csv";
        version = "0.1.2";
        sha256 = "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c";
-       buildDepends = [ base filepath parsec ];
+       libraryHaskellDepends = [ base filepath parsec ];
        description = "CSV loader and dumper";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -37754,13 +38664,17 @@ self: {
        sha256 = "12sxxv92qblsa63zdnl80a8yk01b4cvk9k6h58w82bvcy5m0aabk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring conduit
-         conduit-extra containers data-default directory ghc-prim mmorph
-         monad-control mtl primitive resourcet text transformers
-         unordered-containers vector
+         conduit-extra containers data-default ghc-prim mmorph monad-control
+         mtl primitive resourcet text transformers unordered-containers
+         vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring containers directory mtl primitive text
+         transformers vector
+       ];
+       testHaskellDepends = [
          base bytestring containers directory HUnit mtl primitive
          test-framework test-framework-hunit text transformers vector
        ];
@@ -37778,7 +38692,7 @@ self: {
        pname = "csv-enumerator";
        version = "0.10.2.0";
        sha256 = "0n1zc9rwzj9w39nmjfn65qawj19b6zay3d62ss2crnxbgqnh07gh";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring containers
          directory enumerator safe transformers unix-compat
        ];
@@ -37797,7 +38711,7 @@ self: {
        sha256 = "0898553pikxjgmycdyiw92bbmzxgbl4dl8029qljyjzlzlasj7by";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring csv html tabular text txt-sushi vector
        ];
        description = "A collection of CSV tools";
@@ -37814,10 +38728,10 @@ self: {
        sha256 = "1mfy19fvi92zzzqn70ga2p5csmc8qm0qnkn3vyl41ic6f69vm73x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base explicit-exception regex-tdfa split spreadsheet
        ];
-       testDepends = [ base Cabal hspec regex-tdfa split ];
+       testHaskellDepends = [ base Cabal hspec regex-tdfa split ];
        homepage = "https://github.com/mrVanDalo/csv-to-qif/";
        description = "A small program that will read csv files and create qif files";
        license = stdenv.lib.licenses.bsd3;
@@ -37829,8 +38743,8 @@ self: {
        pname = "ctemplate";
        version = "0.1";
        sha256 = "02xsw0zpg728cq018w6zjgbzk6d7px62mapn40gir9c0hi6rqlx8";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ ctemplate ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ ctemplate ];
        homepage = "http://darcs.imperialviolet.org/ctemplate";
        description = "Binding to the Google ctemplate library";
        license = stdenv.lib.licenses.bsd3;
@@ -37843,7 +38757,7 @@ self: {
        pname = "ctkl";
        version = "0.27.0.0";
        sha256 = "0sqrg04zlwq62jggjvrd1dq7a2alwx2190w6b19d3jn51n0s907m";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        jailbreak = true;
        description = "packaging of Manuel Chakravarty's CTK Light for Hackage";
        license = stdenv.lib.licenses.bsd3;
@@ -37856,7 +38770,7 @@ self: {
        pname = "ctpl";
        version = "0.1.0.1";
        sha256 = "1mbqgbig5n8rrkxmrdbcl8qafa2r58c2pial2b67yr6cw08v0srv";
-       buildDepends = [ base chatty-text chatty-utils ];
+       libraryHaskellDepends = [ base chatty-text chatty-utils ];
        jailbreak = true;
        description = "A programming language for text modification";
        license = stdenv.lib.licenses.gpl3;
@@ -37871,8 +38785,8 @@ self: {
        pname = "ctrie";
        version = "0.1.0.2";
        sha256 = "11ylwjmp015ppisczggzj1x7mfg1bfg4g4qg0s91xrrgms78r014";
-       buildDepends = [ atomic-primops base hashable primitive ];
-       testDepends = [
+       libraryHaskellDepends = [ atomic-primops base hashable primitive ];
+       testHaskellDepends = [
          base containers hashable QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -37891,8 +38805,13 @@ self: {
        sha256 = "0shclcwnh1az40ckvmhpw93xbhrr19wfhhvclcnv2fijy29667yp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cereal containers hspec STL ];
-       testDepends = [ base bytestring cereal containers hspec STL ];
+       libraryHaskellDepends = [ base bytestring cereal containers STL ];
+       executableHaskellDepends = [
+         base bytestring cereal containers hspec STL
+       ];
+       testHaskellDepends = [
+         base bytestring cereal containers hspec STL
+       ];
        description = "Cubic DSL for 3D printing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37907,10 +38826,10 @@ self: {
        sha256 = "1n44d39s3r5iakbhjf99w49gb1y8l1xl46lz40jkhx7k4knwb1fj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base BNFC directory filepath haskeline mtl transformers
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        homepage = "https://github.com/simhu/cubical";
        description = "Implementation of Univalence in Cubical Sets";
        license = stdenv.lib.licenses.mit;
@@ -37924,8 +38843,8 @@ self: {
        pname = "cubicbezier";
        version = "0.3.0";
        sha256 = "1d5mr1xr1y7qnb65ybf6gncndzdz63di3gxrzwykks706ry475sr";
-       buildDepends = [ base containers integration ];
-       testDepends = [ base parsec tasty tasty-hunit ];
+       libraryHaskellDepends = [ base containers integration ];
+       testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Efficient manipulating of 2D cubic bezier curves";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37936,7 +38855,7 @@ self: {
        pname = "cubicspline";
        version = "0.1.1";
        sha256 = "0n4c80vjf8sh5wf1n0qp9z8v8z7mj7rfygjg5a02sz0s6l7q1i8s";
-       buildDepends = [ base hmatrix safe ];
+       libraryHaskellDepends = [ base hmatrix safe ];
        description = "Natural cubic spline interpolation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37949,11 +38868,11 @@ self: {
        pname = "cublas";
        version = "0.2.1.0";
        sha256 = "02x8a9varkj770cl4nnb0mf4qh519gf9mv51awinlaikyz932q1w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cuda filepath language-c storable-complex template-haskell
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ cublas cusparse ];
+       librarySystemDepends = [ cublas cusparse ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "https://github.com/bmsherman/cublas";
        description = "FFI bindings to the CUDA CUBLAS and CUSPARSE libraries";
@@ -37968,7 +38887,7 @@ self: {
        sha256 = "08l8qf98d5p9d5qyj3kh35rzp8fih77bd2pras4dkn7an39pmr6b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT Yampa ];
+       executableHaskellDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -37981,8 +38900,9 @@ self: {
        sha256 = "10c2nn0qhhznajpkjvmxivz3w6zr96fpsych53hnvpi2g6a332k1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring pretty ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base bytestring ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base pretty ];
        homepage = "https://github.com/tmcdonell/cuda";
        description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
        license = stdenv.lib.licenses.bsd3;
@@ -37996,9 +38916,9 @@ self: {
        pname = "cudd";
        version = "0.1.0.2";
        sha256 = "0zhsj4qrvk1q1rj55nsysznv11m1x31dg7gxmgp5wdsk8l18w02r";
-       buildDepends = [ array base mtl transformers ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ cudd dddmp epd mtr st util ];
+       libraryHaskellDepends = [ array base mtl transformers ];
+       librarySystemDepends = [ cudd dddmp epd mtr st util ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://github.com/adamwalker/haskell_cudd";
        description = "Bindings to the CUDD binary decision diagrams library";
        license = stdenv.lib.licenses.bsd3;
@@ -38012,8 +38932,8 @@ self: {
        pname = "cufft";
        version = "0.1.2.1";
        sha256 = "1qkrp2dwfpivf5j42a7wij61010a3rmldxng4j8ivkrc7vllv76j";
-       buildDepends = [ base cuda ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base cuda ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/robeverest/cufft";
        description = "Haskell bindings for the CUFFT library";
        license = stdenv.lib.licenses.bsd3;
@@ -38025,8 +38945,8 @@ self: {
        pname = "curl";
        version = "1.3.8";
        sha256 = "0vj4hpaa30jz7c702xpsfvqaqdxz28zslsqnsfx6bf6dpwvck1wh";
-       buildDepends = [ base bytestring containers ];
-       extraLibraries = [ curl ];
+       libraryHaskellDepends = [ base bytestring containers ];
+       librarySystemDepends = [ curl ];
        description = "Haskell binding to libcurl";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) curl;};
@@ -38037,7 +38957,7 @@ self: {
        pname = "curl-aeson";
        version = "0.0.4";
        sha256 = "1fpi448f6bgf3rbw3zxf7r9nwyhv9q67zan5sixnad1y7lqxivrx";
-       buildDepends = [ aeson base curl text utf8-string ];
+       libraryHaskellDepends = [ aeson base curl text utf8-string ];
        homepage = "https://github.com/zouppen/haskell-curl-aeson";
        description = "Communicate with HTTP service using JSON";
        license = stdenv.lib.licenses.bsd3;
@@ -38048,11 +38968,11 @@ self: {
      mkDerivation {
        pname = "curlhs";
        version = "0.1.6";
-       revision = "1";
        sha256 = "1yh7rfk9ppglpjymzzi2yc44g9bp0irnl2yvj77y55djdkmckq3b";
+       revision = "1";
        editedCabalFile = "ac8dbe0348ce66746774f019fe62dbdaf40a200bed62f5b7fb0ecb9bd11cfa1c";
-       buildDepends = [ base bytestring rtld time ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base bytestring rtld time ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/kkardzis/curlhs";
        description = "bindings to libcurl, the multiprotocol file transfer library";
        license = "unknown";
@@ -38065,7 +38985,9 @@ self: {
        pname = "currency";
        version = "0.2.0.0";
        sha256 = "0yj1x7zmkmwr9az55i9gvf84m7i3b4qi80p8qk9hszzlv7rigmdw";
-       buildDepends = [ base containers hashable iso3166-country-codes ];
+       libraryHaskellDepends = [
+         base containers hashable iso3166-country-codes
+       ];
        homepage = "https://github.com/singpolyma/currency-haskell";
        description = "Types representing standard and non-standard currencies";
        license = "unknown";
@@ -38077,7 +38999,7 @@ self: {
        pname = "current-locale";
        version = "0.2.0.1";
        sha256 = "18lg46fzpz207bd60hbcas6ippw0wnsc8n93pnz775ks5y7apyr5";
-       buildDepends = [ base old-locale process split ];
+       libraryHaskellDepends = [ base old-locale process split ];
        homepage = "https://github.com/koterpillar/current-locale";
        description = "Get the current system locale in System.Locale format";
        license = stdenv.lib.licenses.mit;
@@ -38091,7 +39013,7 @@ self: {
        pname = "curry-base";
        version = "0.2.9";
        sha256 = "0sdwygsbqmvcbzi7zsr0jd02s2r19pc7zsk4b6hjxv4vzjc9f120";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath mtl old-time pretty syb
        ];
        homepage = "http://www.curry-language.org";
@@ -38110,8 +39032,9 @@ self: {
        sha256 = "1igys4i7wwj1ildkf4is66gq22zsjg158kv3ald5xiilwkmvfc4h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers curry-base filepath mtl old-time pretty syb
+       libraryHaskellDepends = [ filepath ];
+       executableHaskellDepends = [
+         base containers curry-base mtl old-time pretty syb
        ];
        homepage = "http://www.curry-language.org";
        description = "Compile the functional logic language Curry to several intermediate formats";
@@ -38129,7 +39052,7 @@ self: {
        sha256 = "045lfyhpwjgcdw3wxj2klq0aqn555f5r4w95fr06vsq5pxspnnvc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring csv-enumerator enumerator hscurses mtl natural-sort
          parseargs regex-tdfa safe unix
        ];
@@ -38147,8 +39070,8 @@ self: {
        pname = "curve25519";
        version = "0.2.1";
        sha256 = "1kfs7cjxig0rk17nb7dzi189msww90yw0066rlalw01kff5w2hdy";
-       buildDepends = [ base bytestring crypto-api ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring crypto-api ];
+       testHaskellDepends = [
          base bytestring crypto-api DRBG HUnit QuickCheck tagged
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -38166,7 +39089,7 @@ self: {
        pname = "curves";
        version = "1.1.0.1";
        sha256 = "0zmy9an40wnxjhqjhlvsg0jy4bqqby6hl8ckjcm0406988ma8mi6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers filepath HaXml JuicyPixels QuickCheck
        ];
        description = "Library for drawing curve based images";
@@ -38180,7 +39103,7 @@ self: {
        pname = "custom-prelude";
        version = "0.2.2.0";
        sha256 = "00lkpkl79kznib0s6xm644f3k13dv59x5z06ccymvx6l6iqxyzn6";
-       buildDepends = [ base basic-prelude monad-loops ];
+       libraryHaskellDepends = [ base basic-prelude monad-loops ];
        jailbreak = true;
        homepage = "https://github.com/ajnsit/custom-prelude";
        description = "An enhanced prelude, serving as a foundation for my projects";
@@ -38197,13 +39120,15 @@ self: {
        sha256 = "1bdhs4dy9yfgc9j281rxiiy9md3s27yy44scz86s29vbm7prccvp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         allocated-processor base HOpenCV vector-space
+       ];
+       executableHaskellDepends = [
          allocated-processor base graphics-drawingcombinators HOpenCV SDL
          vector-space
        ];
        description = "Functional Combinators for Computer Vision";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cyclotomic" = callPackage
@@ -38212,7 +39137,7 @@ self: {
        pname = "cyclotomic";
        version = "0.4.3";
        sha256 = "14rfyxmqjrlirszk2mrqm030rya6cbcydbf7fl7if82y21qrfg0p";
-       buildDepends = [ arithmoi base containers ];
+       libraryHaskellDepends = [ arithmoi base containers ];
        jailbreak = true;
        description = "A subfield of the complex numbers for exact calculation";
        license = stdenv.lib.licenses.gpl3;
@@ -38228,7 +39153,7 @@ self: {
        pname = "cypher";
        version = "0.8.1";
        sha256 = "0f79791j9nczm80cifpc4iq5pqkhca67s94c5wqm0kiprlxblc53";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring classy-parallel conduit
          http-conduit http-types resourcet text transformers
          transformers-base unordered-containers vector
@@ -38251,14 +39176,14 @@ self: {
        pname = "d-bus";
        version = "0.1.2";
        sha256 = "176brypscws03sswda215ywc6l5hj6l5iw4vkfrcppzycdyh3yd2";
-       buildDepends = [
+       libraryHaskellDepends = [
          async attoparsec base binary blaze-builder bytestring conduit
          conduit-extra containers data-binary-ieee754 data-default
          exceptions free hslogger mtl network singletons stm
          template-haskell text transformers xml-conduit xml-picklers
          xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring mtl QuickCheck singletons tasty
          tasty-quickcheck tasty-th text xml-hamlet
        ];
@@ -38273,7 +39198,7 @@ self: {
        pname = "d3js";
        version = "0.1.0.0";
        sha256 = "0wrxvfgss9fiv1pwsdi1md0plc4mf9sadkhgm46dsfq16dwrp3q2";
-       buildDepends = [ base mtl random text ];
+       libraryHaskellDepends = [ base mtl random text ];
        jailbreak = true;
        homepage = "https://github.com/nebuta/d3js-haskell";
        description = "Declarative visualization on a web browser with DSL approach";
@@ -38286,7 +39211,7 @@ self: {
        pname = "daemonize-doublefork";
        version = "0.1.1";
        sha256 = "1g446qxff8ajv44341y0f9v39j8idmnn23lwi08gq3ps4qrz0py2";
-       buildDepends = [ base directory unix ];
+       libraryHaskellDepends = [ base directory unix ];
        homepage = "https://github.com/scvalex/daemonize-doublefork";
        description = "Start background daemons by double-forking";
        license = stdenv.lib.licenses.gpl3;
@@ -38303,11 +39228,15 @@ self: {
        sha256 = "0zf9831vl1hz606nsp0yhjg46wxzvwkd3hn9shjw5akk26sddi8p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring cereal containers data-default directory filepath
-         ghc-prim network pipes transformers unix
+       libraryHaskellDepends = [
+         base bytestring cereal data-default directory filepath ghc-prim
+         network pipes transformers unix
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring cereal containers data-default ghc-prim network
+         pipes transformers
+       ];
+       testHaskellDepends = [
          base data-default directory ghc-prim HUnit test-framework
          test-framework-hunit unix
        ];
@@ -38324,8 +39253,10 @@ self: {
        pname = "dag";
        version = "0.1.0.2";
        sha256 = "0khfyyzqzw7jj4n8p1k96wdrb2087jd380fzhlkmf0g7s4346pvp";
-       buildDepends = [ base constraints singletons ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       libraryHaskellDepends = [ base constraints singletons ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances
+       ];
        description = "Compile-time, type-safe directed acyclic graphs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38339,10 +39270,10 @@ self: {
        pname = "damnpacket";
        version = "0.6.0";
        sha256 = "137ckcsy2a9f8xfw83rapl2msb6z0pdlsksay5qkymxcpfwrabyb";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq text
        ];
-       testDepends = [ base containers QuickCheck text ];
+       testHaskellDepends = [ base containers QuickCheck text ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/damnpacket";
        description = "Parsing dAmn packets";
@@ -38360,12 +39291,17 @@ self: {
        sha256 = "0caas3ql32925rzsghb7rdrm17bw3hn84cizkl9dqmz6nwlhclk9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers Crypto data-binary-ieee754
          deepseq directory filepath mtl process random time transformers
          utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base binary bytestring containers Crypto data-binary-ieee754
+         deepseq directory filepath mtl process random time transformers
+         utf8-string
+       ];
+       testHaskellDepends = [
          array base binary bytestring containers Crypto data-binary-ieee754
          deepseq directory filepath mtl process random time transformers
          utf8-string
@@ -38385,7 +39321,7 @@ self: {
        sha256 = "0idi472qqks286fbw718vddk5kc3vxicrb8m38sllw6x663xnljz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers explicit-exception multiarg old-locale parsec
          prednote rainbow text time transformers
        ];
@@ -38399,10 +39335,10 @@ self: {
   "darcs" = callPackage
     ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
      , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
-     , dataenc, directory, filepath, FindBin, ghc, hashable, haskeline
-     , html, HTTP, HUnit, mmap, mtl, network, network-uri, old-time
-     , parsec, process, QuickCheck, random, regex-applicative
-     , regex-compat-tdfa, shelly, split, tar, terminfo, test-framework
+     , dataenc, directory, filepath, FindBin, hashable, haskeline, html
+     , HTTP, HUnit, mmap, mtl, network, network-uri, old-time, parsec
+     , process, QuickCheck, random, regex-applicative, regex-compat-tdfa
+     , shelly, split, tar, terminfo, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
      , transformers, transformers-compat, unix, unix-compat, utf8-string
      , vector, zip-archive, zlib
@@ -38411,9 +39347,10 @@ self: {
        pname = "darcs";
        version = "2.10.1";
        sha256 = "157faxxzziaj79ln1qqvrii1vnafyknfbnmgl4y5krw06ys6bvzi";
+       configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base base16-bytestring binary bytestring
          containers cryptohash data-ordlist dataenc directory filepath
          hashable haskeline html HTTP mmap mtl network network-uri old-time
@@ -38421,15 +39358,15 @@ self: {
          terminfo text time transformers transformers-compat unix
          unix-compat utf8-string vector zip-archive zlib
        ];
-       testDepends = [
+       librarySystemDepends = [ curl ];
+       executableHaskellDepends = [ base filepath regex-compat-tdfa ];
+       testHaskellDepends = [
          array base binary bytestring cmdargs containers cryptohash dataenc
-         directory filepath FindBin ghc html HUnit mmap mtl parsec process
+         directory filepath FindBin html HUnit mmap mtl parsec process
          QuickCheck regex-compat-tdfa shelly split test-framework
          test-framework-hunit test-framework-quickcheck2 text unix-compat
          zip-archive zlib
        ];
-       extraLibraries = [ curl ];
-       configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
        postInstall = ''
          mkdir -p $out/etc/bash_completion.d
          mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
@@ -38451,7 +39388,7 @@ self: {
        sha256 = "1qwh4yas6alp65lwimh8xlz3i572nxn4iwqsppx7qqlj8kjhbyvj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs containers datetime directory filepath
          hs-gchart html HTTP json mtl network old-locale process regex-posix
          SHA split statistics strict tabular tar time utf8-string uvector
@@ -38477,13 +39414,20 @@ self: {
        sha256 = "0jkgy8k2i7hhcl7dzm4zvbm0q189hhp4cza9aslslzcq15jsa225";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory extensible-exceptions
          filepath hashed-storage haskeline html HTTP mmap mtl network
          old-time parsec process random regex-compat tar terminfo text unix
          vector zlib
        ];
-       extraLibraries = [ curl ];
+       librarySystemDepends = [ curl ];
+       executableHaskellDepends = [
+         array base bytestring containers directory extensible-exceptions
+         filepath hashed-storage haskeline html HTTP mmap mtl network
+         old-time parsec process random regex-compat tar terminfo text unix
+         vector zlib
+       ];
+       executableSystemDepends = [ curl ];
        jailbreak = true;
        homepage = "http://darcs.net/";
        description = "a distributed, interactive, smart revision control system";
@@ -38501,7 +39445,7 @@ self: {
        sha256 = "0c82r7bgz8wj172q1n4dfz9kfn4466v7k159vlkfdqv7as0qj8qf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile directory hslogger MissingH network parsec process
          regex-compat unix
        ];
@@ -38521,11 +39465,11 @@ self: {
        sha256 = "1lc1v30zmlcrp6i22d3arghqhy9pjncddr34df6zd8s0r9wsi61d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers directory html HUnit mtl old-time
          parsec process QuickCheck regex-compat unix
        ];
-       extraLibraries = [ curl ncurses zlib ];
+       executableSystemDepends = [ curl ncurses zlib ];
        homepage = "http://darcs.net/";
        description = "David's Advanced Version Control System";
        license = "GPL";
@@ -38544,7 +39488,7 @@ self: {
        sha256 = "1a49v3l9n5cqlmdpjj8mzz5v6b47my84id62ag7004ynr11vih9s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base bytestring cmdlib containers darcs datetime
          directory filepath hashed-storage mtl old-time utf8-string
        ];
@@ -38563,7 +39507,7 @@ self: {
        sha256 = "01404plnjrds57lf7widss2piwpal9khl0gq22xkswj68zzfjcv6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory old-locale old-time process
          time
        ];
@@ -38582,7 +39526,9 @@ self: {
        sha256 = "0rp6flaizbaxzr28fr82vaacl4wajh6zdqnwcbgyhwz5dj7rdanq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers directory HaXml mtl process ];
+       executableHaskellDepends = [
+         base containers directory HaXml mtl process
+       ];
        jailbreak = true;
        homepage = "http://wiki.darcs.net/RelatedSoftware/DarcsMonitor";
        description = "Darcs repository monitor (sends email)";
@@ -38596,7 +39542,7 @@ self: {
        pname = "darcs-scripts";
        version = "0.1.1";
        sha256 = "06gs18s89nc5qyicfpkj0hz999l5pf4glhlanm2yhyd6lxbfgkba";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Shell scripts for support of darcs workflow";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38612,7 +39558,7 @@ self: {
        sha256 = "0r6hri2kpfq7r0c25qrlrj5y9pi2j76njvwsgrpnpm6p4gg151wk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers darcs graph-wrapper string-conversions
        ];
        jailbreak = true;
@@ -38636,7 +39582,7 @@ self: {
        sha256 = "1dz87a6a6bmi2sfk0q21syipgnhpg9fdlr86m7sdrlk4s9s1s0c5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base base64-string blaze-builder blaze-html blaze-markup
          bytestring containers CouchDB darcs directory filepath harp
          hashed-storage highlighting-kate HsOpenSSL hsp http-conduit HUnit
@@ -38663,7 +39609,7 @@ self: {
        sha256 = "1gl0wplzlhb6ynacq7bv38ijhazpwr642zc0a2dixbpibchgxksf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cgi concurrentoutput containers Crypto directory
          filepath HTTP mime-string mtl nano-md5 network old-locale old-time
          parsec process regex-compat safe time unix xhtml zlib
@@ -38682,16 +39628,18 @@ self: {
      mkDerivation {
        pname = "darkplaces-demo";
        version = "0.1";
-       revision = "1";
        sha256 = "0map78fnnqm2nlh92xrxmg3fs9q2hb4pl87hyara41v2dvwlsj3f";
+       revision = "1";
        editedCabalFile = "d16b0f7e29060476084a0457d38e524e1965b05e591af570197f287d574a8d01";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring containers darkplaces-text
-         data-binary-ieee754 directory mtl optparse-applicative regex-tdfa
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 regex-tdfa
          transformers
        ];
+       executableHaskellDepends = [
+         base bytestring darkplaces-text directory mtl optparse-applicative
+       ];
        jailbreak = true;
        homepage = "https://github.com/bacher09/darkplaces-demo";
        description = "Utility and parser for DarkPlaces demo files";
@@ -38707,10 +39655,10 @@ self: {
        pname = "darkplaces-rcon";
        version = "0.1";
        sha256 = "0ngxjb6zja7l905ixkr0cjyan21m311wc5dqdzacw5j5w7119v75";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring cryptohash network time
        ];
-       testDepends = [ base bytestring hspec hspec-core ];
+       testHaskellDepends = [ base bytestring hspec hspec-core ];
        jailbreak = true;
        homepage = "https://github.com/bacher09/darkplaces-rcon";
        description = "Darkplaces rcon client library";
@@ -38729,12 +39677,16 @@ self: {
        sha256 = "1xv9906ag2vgkzbk66f9r6lr5j6qwlwss246hjl7iriq315dmqlg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring ConfigFile containers darkplaces-rcon
          darkplaces-text directory filepath haskeline HostAndPort mtl
          optparse-applicative text time utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring darkplaces-rcon darkplaces-text haskeline mtl
+         optparse-applicative text utf8-string
+       ];
+       testHaskellDepends = [
          base bytestring darkplaces-rcon darkplaces-text hspec hspec-core
          text
        ];
@@ -38752,11 +39704,11 @@ self: {
        pname = "darkplaces-text";
        version = "0.2.1";
        sha256 = "12nsr005pk0v1nril61javh6nrjhqcvlif11mfhch8bvvcaiy4rm";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal array base bytestring text utf8-string vector
        ];
-       testDepends = [ base bytestring hspec QuickCheck ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "https://github.com/bacher09/darkplaces-text";
        description = "Parser for darkplaces colorful text";
        license = stdenv.lib.licenses.gpl2;
@@ -38773,12 +39725,11 @@ self: {
        sha256 = "1h22ay2cl5j2ngm2xi2hyvvprnmz48qcpzxiq9ldkzx8gg3gs36j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers direct-sqlite directory either filepath ghc
          haddock-api optparse-applicative parsec pipes sqlite-simple tagsoup
          text transformers
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/jfeltz/dash-haskell";
        description = "Convert package Haddock to Dash docsets (IDE docs)";
        license = stdenv.lib.licenses.gpl3;
@@ -38790,7 +39741,7 @@ self: {
        pname = "data-accessor";
        version = "0.2.2.6";
        sha256 = "0668qgllmp2911ppsb0g9z95nq2x0h2cvzyyjlb6iwhnjzyyg7gf";
-       buildDepends = [ array base containers transformers ];
+       libraryHaskellDepends = [ array base containers transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Utilities for accessing and manipulating fields of records";
        license = stdenv.lib.licenses.bsd3;
@@ -38802,7 +39753,7 @@ self: {
        pname = "data-accessor-monadLib";
        version = "0.0.1";
        sha256 = "0l1ywmr4jry4cys7lq6k0w0nsdpqj1g5l3vsnxyf0ai1901zk18i";
-       buildDepends = [ base data-accessor monadLib ];
+       libraryHaskellDepends = [ base data-accessor monadLib ];
        jailbreak = true;
        description = "Accessor functions for monadLib's monads";
        license = "unknown";
@@ -38814,7 +39765,9 @@ self: {
        pname = "data-accessor-monads-fd";
        version = "0.2.0.3";
        sha256 = "1yvfk55qra7f9ggcybw3j68xg9dzx2f07swj99v4f588gh32ixhz";
-       buildDepends = [ base data-accessor monads-fd transformers ];
+       libraryHaskellDepends = [
+         base data-accessor monads-fd transformers
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in monads-fd State monad class";
@@ -38827,7 +39780,9 @@ self: {
        pname = "data-accessor-monads-tf";
        version = "0.2.1.4";
        sha256 = "12skayn01s8svfdr4h5am2y2dw7ax6s83pb7vy3jxyddywpm04mk";
-       buildDepends = [ base data-accessor monads-tf transformers ];
+       libraryHaskellDepends = [
+         base data-accessor monads-tf transformers
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in monads-tf State monad type family";
@@ -38840,7 +39795,7 @@ self: {
        pname = "data-accessor-mtl";
        version = "0.2.0.4";
        sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh";
-       buildDepends = [ base data-accessor mtl ];
+       libraryHaskellDepends = [ base data-accessor mtl ];
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in mtl State monad class";
        license = stdenv.lib.licenses.bsd3;
@@ -38853,7 +39808,9 @@ self: {
        pname = "data-accessor-template";
        version = "0.2.1.12";
        sha256 = "0pkr9qbvgysgsa28dpa77a21ghlgiykkcyl41gpr4s7jl9wjs107";
-       buildDepends = [ base data-accessor template-haskell utility-ht ];
+       libraryHaskellDepends = [
+         base data-accessor template-haskell utility-ht
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Utilities for accessing and manipulating fields of records";
        license = stdenv.lib.licenses.bsd3;
@@ -38865,7 +39822,7 @@ self: {
        pname = "data-accessor-transformers";
        version = "0.2.1.6";
        sha256 = "1iawhp1h68ynr2axj12jrn47nf08mss0ar8blagp59yi8j7170fa";
-       buildDepends = [ base data-accessor transformers ];
+       libraryHaskellDepends = [ base data-accessor transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in transformers State monad";
        license = stdenv.lib.licenses.bsd3;
@@ -38877,7 +39834,7 @@ self: {
        pname = "data-aviary";
        version = "0.4.0";
        sha256 = "03jhlb7w98bwx5xa23as9i6id0qxcl4f7k9rql2cgcy8nxf7c2xn";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "Combinator birds";
        license = stdenv.lib.licenses.bsd3;
@@ -38889,7 +39846,7 @@ self: {
        pname = "data-binary-ieee754";
        version = "0.4.4";
        sha256 = "02nzg1barhqhpf4x26mpzvk7jd29nali033qy01adjplv2z5m5sr";
-       buildDepends = [ base binary ];
+       libraryHaskellDepends = [ base binary ];
        homepage = "https://john-millikin.com/software/data-binary-ieee754/";
        description = "Parser/Serialiser for IEEE-754 floating-point values";
        license = stdenv.lib.licenses.mit;
@@ -38901,8 +39858,8 @@ self: {
        pname = "data-bword";
        version = "0.1";
        sha256 = "1s0fid1b8fjazii4j9rsjfmfhyacacknvy374y7nixsdgl4xp44d";
-       buildDepends = [ base ghc-prim ];
-       testDepends = [ base tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/mvv/data-bword";
        description = "Extra operations on binary words of fixed length";
        license = stdenv.lib.licenses.bsd3;
@@ -38913,10 +39870,10 @@ self: {
      mkDerivation {
        pname = "data-carousel";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "1vp17428a2pw4g3y2ra22ll5vjnqwl2xwr2wfj8ppkxaj34a2nsh";
+       revision = "1";
        editedCabalFile = "56aa17d4ad0390625d0694ff6f8e281720d96bdabc678cc10934ac9becc663ea";
-       buildDepends = [ base containers lens ];
+       libraryHaskellDepends = [ base containers lens ];
        description = "A rotating sequence data structure";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -38938,7 +39895,7 @@ self: {
        pname = "data-cell";
        version = "1.0.0.2";
        sha256 = "03liak61gr90i48rd4dlm5lhr8z9v02nn6kdy33sinbpm6313agr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/zadarnowski/data-cell";
        description = "Generic cellular data representation library";
        license = stdenv.lib.licenses.bsd3;
@@ -38950,7 +39907,7 @@ self: {
        pname = "data-checked";
        version = "0.3";
        sha256 = "0xjn7iqlsgi51h8gz4x40kc2qb5lwf6nw5kjwgkck1w5gjfd11yw";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/mvv/data-checked";
        description = "Type-indexed runtime-checked properties";
        license = stdenv.lib.licenses.bsd3;
@@ -38962,7 +39919,7 @@ self: {
        pname = "data-clist";
        version = "0.0.7.4";
        sha256 = "0vnrn8fcnibdbvwdf2smipnvmamgva0x7pszl4bykmh15ns417vn";
-       buildDepends = [ base deepseq QuickCheck ];
+       libraryHaskellDepends = [ base deepseq QuickCheck ];
        homepage = "https://github.com/sw17ch/data-clist";
        description = "Simple functional ring type";
        license = stdenv.lib.licenses.bsd3;
@@ -38974,7 +39931,7 @@ self: {
        pname = "data-concurrent-queue";
        version = "0.3.0.0";
        sha256 = "0rmn4pq5pgvam78vxp4y7431jai8dklml322r4nw47jjc1m20kmv";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        jailbreak = true;
        description = "A Library for directional queues";
        license = stdenv.lib.licenses.mit;
@@ -38987,7 +39944,9 @@ self: {
        pname = "data-cycle";
        version = "0.1.2";
        sha256 = "1k7a2k4vvbwilayh5827na7fifaww66fnmd7mr9vzwmsw9g6q80g";
-       buildDepends = [ base collections-api collections-base-instances ];
+       libraryHaskellDepends = [
+         base collections-api collections-base-instances
+       ];
        description = "a cyclic doubly linked list";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39002,7 +39961,7 @@ self: {
        pname = "data-default";
        version = "0.5.3";
        sha256 = "0d1hm0l9kim3kszshr4msmgzizrzha48gz2kb7b61p7n3gs70m7c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class data-default-instances-base
          data-default-instances-containers data-default-instances-dlist
          data-default-instances-old-locale
@@ -39017,7 +39976,7 @@ self: {
        pname = "data-default-class";
        version = "0.0.1";
        sha256 = "0ccgr3jllinchqhw3lsn73ic6axk4196if5274rr1rghls0fxj5d";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A class for types with a default value";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39031,11 +39990,11 @@ self: {
        pname = "data-default-generics";
        version = "0.3";
        sha256 = "0asjirn324ixyzkf5vhanyf7q9aj9zh693m55qln7dx3vdayn1yv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers dlist ghc-prim old-locale text time
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers dlist ghc-prim hspec HUnit old-locale
          text time unordered-containers vector
        ];
@@ -39049,7 +40008,7 @@ self: {
        pname = "data-default-instances-base";
        version = "0.0.1";
        sha256 = "1832nq6by91f1iw73ycvkbgn8kpra83pvf2q61hy47xffh0zy4pb";
-       buildDepends = [ base data-default-class ];
+       libraryHaskellDepends = [ base data-default-class ];
        description = "Default instances for types in base";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39060,7 +40019,7 @@ self: {
        pname = "data-default-instances-containers";
        version = "0.0.1";
        sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
-       buildDepends = [ base containers data-default-class ];
+       libraryHaskellDepends = [ base containers data-default-class ];
        description = "Default instances for types in containers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39071,7 +40030,7 @@ self: {
        pname = "data-default-instances-dlist";
        version = "0.0.1";
        sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
-       buildDepends = [ base data-default-class dlist ];
+       libraryHaskellDepends = [ base data-default-class dlist ];
        description = "Default instances for types in dlist";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39082,7 +40041,7 @@ self: {
        pname = "data-default-instances-old-locale";
        version = "0.0.1";
        sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
-       buildDepends = [ base data-default-class old-locale ];
+       libraryHaskellDepends = [ base data-default-class old-locale ];
        description = "Default instances for types in old-locale";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39096,11 +40055,11 @@ self: {
        pname = "data-dispersal";
        version = "1.0.0.2";
        sha256 = "1x6wd4xah19isysk2b9waws3fyvzx3w6l917zyw0cvdzf1lkpbw6";
-       buildDepends = [
+       libraryHaskellDepends = [
          AES array base binary bytestring entropy finite-field matrix
          secret-sharing syb vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base binary bytestring QuickCheck spool syb test-framework
          test-framework-quickcheck2 vector
        ];
@@ -39118,10 +40077,10 @@ self: {
        pname = "data-dword";
        version = "0.3";
        sha256 = "0m4jmmdi5j6h0pa4d8ll6pv2qvsf3y3bk6kss0hfglcwaa5vvy73";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-bword ghc-prim hashable template-haskell
        ];
-       testDepends = [ base tasty tasty-quickcheck ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/mvv/data-dword";
        description = "Stick two binary words together to get a bigger one";
        license = stdenv.lib.licenses.bsd3;
@@ -39136,8 +40095,8 @@ self: {
        pname = "data-easy";
        version = "0.6.1";
        sha256 = "01plc0cs3bgyq16j94qqvswwmi12iqfxyxgw9jipqgvi7vbf5h9v";
-       buildDepends = [ base containers safe ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers safe ];
+       testHaskellDepends = [
          base containers directory errors haskell-src-exts hlint hspec HUnit
          QuickCheck safe text transformers unix
        ];
@@ -39154,7 +40113,7 @@ self: {
        pname = "data-endian";
        version = "0.1";
        sha256 = "0ilvpd3xw1nljxvl7jdrzzyfkfl7gykidvbjvc7px3bca5mlmf1r";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mvv/data-endian";
        description = "Endian-sensitive data";
        license = stdenv.lib.licenses.bsd3;
@@ -39179,7 +40138,7 @@ self: {
        pname = "data-filepath";
        version = "2.2.0.0";
        sha256 = "1l71sg02rqgk7i6w401il7crx3ikdbxi5wbb6ida677pfdrpm7f7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors ghc-prim semigroups split template-haskell
        ];
        jailbreak = true;
@@ -39196,7 +40155,7 @@ self: {
        pname = "data-fin";
        version = "0.1.1.3";
        sha256 = "02n3dr4gj73z549vwq5h7h1kvmx2j8vaxjcggpdlppps9wl6flry";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lazysmallcheck prelude-safeenum QuickCheck reflection
          smallcheck tagged
        ];
@@ -39212,8 +40171,8 @@ self: {
        pname = "data-fin-simple";
        version = "0.1.0.0";
        sha256 = "17qj3b3lkrakdk3vbs9nqc2pvqr81n43qxphcznfbkv91k1ygrp6";
-       buildDepends = [ base ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/seagull-kamome/data-fin-simple";
        description = "Simple integral finite set";
        license = stdenv.lib.licenses.bsd3;
@@ -39225,7 +40184,7 @@ self: {
        pname = "data-fix";
        version = "0.0.1";
        sha256 = "09r08lrv92ka6p35wkbfhq9ywg7y5pmgszwbz8a20h31vjz1ffpr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/anton-k/data-fix";
        description = "Fixpoint data types";
        license = stdenv.lib.licenses.bsd3;
@@ -39237,7 +40196,7 @@ self: {
        pname = "data-fix-cse";
        version = "0.0.2";
        sha256 = "1xn6qnir5dss23y8d71dsy78sdk7hczwprxir8v6la15c43rf9p2";
-       buildDepends = [ base containers data-fix transformers ];
+       libraryHaskellDepends = [ base containers data-fix transformers ];
        homepage = "https://github.com/anton-k/data-fix-cse";
        description = "Common subexpression elimination for the fixploint types";
        license = stdenv.lib.licenses.bsd3;
@@ -39249,7 +40208,7 @@ self: {
        pname = "data-flags";
        version = "0.0.3.1";
        sha256 = "1s0djw1qarjn1fkyf21fd6pacfpfy4cvyw3wbd63ccaf9g0s1gs5";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "A package for working with bit masks and flags in general";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39260,7 +40219,7 @@ self: {
        pname = "data-flagset";
        version = "1.0.0.0";
        sha256 = "0ygvzrcb2vskjf203svk9wpv8lw4447rd218zvys4a0787ss1aw2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "An efficient data type for sets of flags";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -39271,7 +40230,7 @@ self: {
        pname = "data-fresh";
        version = "0.2013.251.0";
        sha256 = "1hz30myv78mw4sf19k1yg4qikrnxsa5ng0ff4naxyz1zyi2m87f1";
-       buildDepends = [ base free transformers ];
+       libraryHaskellDepends = [ base free transformers ];
        description = "Interface and functor transformers for fresh values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39284,8 +40243,8 @@ self: {
        pname = "data-hash";
        version = "0.2.0.1";
        sha256 = "1ghbqvc48gf9p8wiy71hdpaj7by3b9cw6wgwi3qqz8iw054xs5wi";
-       buildDepends = [ array base containers ];
-       testDepends = [
+       libraryHaskellDepends = [ array base containers ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Combinators for building fast hashing functions";
@@ -39302,8 +40261,10 @@ self: {
        pname = "data-interval";
        version = "1.2.0";
        sha256 = "139v825r0r4k8b8cmndpx6gfkdn55ygiwmq8r3fcgljajk99y4km";
-       buildDepends = [ base deepseq extended-reals hashable lattices ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base deepseq extended-reals hashable lattices
+       ];
+       testHaskellDepends = [
          base containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
        ];
@@ -39317,7 +40278,7 @@ self: {
        pname = "data-inttrie";
        version = "0.1.0";
        sha256 = "00kzf3cw0y0848cprmx3i7g70rmr92hhfzn60a2x98vb8f7y3814";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/data-inttrie";
        description = "A lazy, infinite trie of integers";
        license = stdenv.lib.licenses.bsd3;
@@ -39329,7 +40290,7 @@ self: {
        pname = "data-ivar";
        version = "0.30";
        sha256 = "1vnbmvihkrcknys33sam9zlb5qk5qqkxz6w3wamsbdmpp0q6zfb2";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Write-once variables with concurrency support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39343,7 +40304,7 @@ self: {
        pname = "data-kiln";
        version = "0.1.0.0";
        sha256 = "13pkpmpjy787cjn1hcsl9r04w70nxrzdx8xrn9w6ifbzb2xj2iny";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-fix IfElse mtl transformers
        ];
        jailbreak = true;
@@ -39358,7 +40319,7 @@ self: {
        pname = "data-layout";
        version = "0.1.0.0";
        sha256 = "1w8r4vw731dmam8vcidz9a4wb2swqd5djsf9vkkxihxnphh0a1x5";
-       buildDepends = [ base bytestring vector ];
+       libraryHaskellDepends = [ base bytestring vector ];
        homepage = "http://github.com/jystic/data-layout";
        description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\".";
        license = stdenv.lib.licenses.bsd3;
@@ -39372,7 +40333,7 @@ self: {
        pname = "data-lens";
        version = "2.10.7";
        sha256 = "0l70jzys2qb31cyq3nci97i01ncadkhizxvc9c3psxcd2n28l69v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers semigroupoids transformers
        ];
        homepage = "http://github.com/roconnor/data-lens/";
@@ -39386,7 +40347,9 @@ self: {
        pname = "data-lens-fd";
        version = "2.0.5";
        sha256 = "0r8cfgn6wx304b5ihmwgsxxjwalb7086wii655mgmb6cn3nirpyk";
-       buildDepends = [ base comonad data-lens mtl transformers ];
+       libraryHaskellDepends = [
+         base comonad data-lens mtl transformers
+       ];
        homepage = "http://github.com/roconnor/data-lens-fd/";
        description = "Lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -39398,8 +40361,8 @@ self: {
        pname = "data-lens-ixset";
        version = "0.1.4";
        sha256 = "0frzjfcp7w1ayfai1m07n0fpj3z1vbi971bc1kn1iarxhakny651";
-       buildDepends = [ base data-lens ixset ];
-       testDepends = [ QuickCheck ];
+       libraryHaskellDepends = [ base data-lens ixset ];
+       testHaskellDepends = [ QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/dag/data-lens-ixset";
        description = "A Lens for IxSet";
@@ -39413,7 +40376,7 @@ self: {
        pname = "data-lens-light";
        version = "0.1.2.1";
        sha256 = "038vfzb4vxk1qb0246l2kgv9br37wg59wnlhzyjpn97lypwlf68w";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/feuerbach/data-lens-light";
        description = "Simple lenses, minimum dependencies";
        license = stdenv.lib.licenses.mit;
@@ -39425,7 +40388,7 @@ self: {
        pname = "data-lens-template";
        version = "2.1.9";
        sha256 = "0dpj3a1dj5l5jll2f0flj3wss9h2jbsljihrwh68zbb92pcgb56g";
-       buildDepends = [ base data-lens template-haskell ];
+       libraryHaskellDepends = [ base data-lens template-haskell ];
        homepage = "http://github.com/roconnor/data-lens-template/";
        description = "Utilities for Data.Lens";
        license = stdenv.lib.licenses.bsd3;
@@ -39437,7 +40400,7 @@ self: {
        pname = "data-list-sequences";
        version = "0.1";
        sha256 = "0r3y66lxgk0sdg500xnz0fvg4dvzvx47imnw0qkici22b9d92kv8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jkramer/data-list-sequences";
        description = "Utilities for working with sequences within lists";
        license = stdenv.lib.licenses.gpl3;
@@ -39449,7 +40412,7 @@ self: {
        pname = "data-map-multikey";
        version = "0.0.1.2";
        sha256 = "04h4k2zn6w8rahzyr80hwf8mvsmzgbqh7aw2138sva874bsk9mkf";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://github.com/jhickner/data-map-multikey";
        description = "Data.Map with multiple, unique keys";
@@ -39462,7 +40425,7 @@ self: {
        pname = "data-memocombinators";
        version = "0.5.1";
        sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l";
-       buildDepends = [ array base data-inttrie ];
+       libraryHaskellDepends = [ array base data-inttrie ];
        homepage = "http://github.com/luqui/data-memocombinators";
        description = "Combinators for building memo tables";
        license = stdenv.lib.licenses.bsd3;
@@ -39474,7 +40437,7 @@ self: {
        pname = "data-named";
        version = "0.5.2";
        sha256 = "1mzwnbcb7ji4m6p4s68422gmpna06llbh2rhk6w048mgjxv4fhsx";
-       buildDepends = [ attoparsec base binary containers text ];
+       libraryHaskellDepends = [ attoparsec base binary containers text ];
        homepage = "https://github.com/kawu/data-named";
        description = "Data types for named entities";
        license = stdenv.lib.licenses.bsd3;
@@ -39487,7 +40450,7 @@ self: {
        pname = "data-nat";
        version = "0.1.2";
        sha256 = "1yzxkch0xzy76iyad0yshfnpvz38xklqdlyj8lgqnqsllw0vwh0m";
-       buildDepends = [ base semigroups ];
+       libraryHaskellDepends = [ base semigroups ];
        jailbreak = true;
        homepage = "http://github.com/glehel/data-nat";
        description = "data Nat = Zero | Succ Nat";
@@ -39501,7 +40464,7 @@ self: {
        pname = "data-object";
        version = "0.3.1.9";
        sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l";
-       buildDepends = [ base bytestring failure text time ];
+       libraryHaskellDepends = [ base bytestring failure text time ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/data-object/tree/master";
        description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
@@ -39516,7 +40479,7 @@ self: {
        pname = "data-object-json";
        version = "0.3.1.8";
        sha256 = "06zkiqj4pkl5q4fmh816y4yj74rzwi2b91k542lxswjvfa3za3qk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-trie convertible-text data-object
          failure JSONb text
        ];
@@ -39537,7 +40500,7 @@ self: {
        sha256 = "18a9r4wfpb7icjb6nji9iy3abq6sxafmsnfwqpnm1nn2nn3fm1ap";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers convertible-text data-object
          failure text transformers yaml
        ];
@@ -39554,7 +40517,7 @@ self: {
        pname = "data-or";
        version = "1.0.0.5";
        sha256 = "0wp6qqq6k1zbdw9bv9gkzdiz6y8wp8r7zsqbjh54c43j3i7vdvwx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "A data type for non-exclusive disjunction";
        license = stdenv.lib.licenses.bsd3;
@@ -39566,7 +40529,7 @@ self: {
        pname = "data-ordlist";
        version = "0.4.7.0";
        sha256 = "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Set and bag operations on ordered lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39577,7 +40540,7 @@ self: {
        pname = "data-partition";
        version = "0.3.0.0";
        sha256 = "05i8fg9q7fpc9jalhwbqpw6pfki2flqj4nqwgs3yfi0hvasvgjjb";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/luqui/data-partition";
        description = "A pure disjoint set (union find) data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -39589,7 +40552,7 @@ self: {
        pname = "data-pprint";
        version = "0.2.4";
        sha256 = "0r4q95pl9gmgc080psi3j87cg1v3cmm6gxnrps17j5sw1nqzb6v5";
-       buildDepends = [ base deepseq mtl parallel pretty time ];
+       libraryHaskellDepends = [ base deepseq mtl parallel pretty time ];
        description = "Prettyprint and compare Data values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39600,7 +40563,7 @@ self: {
        pname = "data-quotientref";
        version = "0.1";
        sha256 = "0ylimakhw37klz2axg8qrdhwag34mfa1byb2z2mz2i8z0w4737j8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Reference cells that need two independent indices to be accessed";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39615,8 +40578,8 @@ self: {
        pname = "data-r-tree";
        version = "0.0.5.0";
        sha256 = "1zgwm020zxfhb70llch4y075rd6klwwnv9yn8mpgh0rm0ib7jvyy";
-       buildDepends = [ base binary deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary deepseq ];
+       testHaskellDepends = [
          base binary containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -39631,7 +40594,7 @@ self: {
        pname = "data-ref";
        version = "0.0";
        sha256 = "0bcizcf6i1hfpk7ry64si40mfdndgd8k0h9mzh873xp1v2qali7n";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Mutable_variable";
        description = "Unify STRef and IORef in plain Haskell 98";
@@ -39646,7 +40609,8 @@ self: {
        sha256 = "00mjv6dc3fwhbqzrll02qxilwpfypahkzcdqnv17c4nbjqg0ldb1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/IOReification";
        description = "Reify a recursive data structure into an explicit graph";
        license = stdenv.lib.licenses.bsd3;
@@ -39658,7 +40622,7 @@ self: {
        pname = "data-reify-cse";
        version = "0.0.3";
        sha256 = "0vjfpbp0maqwirvi8j21z9qbs396l76dk5npn8zxac56j0i6l62r";
-       buildDepends = [ base containers data-reify ];
+       libraryHaskellDepends = [ base containers data-reify ];
        description = "Common Sub-Expression Elimination for graphs generated by Data.Reify.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39669,7 +40633,7 @@ self: {
        pname = "data-rev";
        version = "0.1.0.1";
        sha256 = "13bqp3vvsc6i6lcvw480i08fz2rm3f8varwyhvrp44dzv2q8zkl1";
-       buildDepends = [ base bytestring containers text vector ];
+       libraryHaskellDepends = [ base bytestring containers text vector ];
        jailbreak = true;
        homepage = "https://github.com/jxv/data-rev";
        description = "A typeclass for reversing order of contents";
@@ -39682,7 +40646,7 @@ self: {
        pname = "data-rope";
        version = "0.3";
        sha256 = "06sz6z0kd53av4acmgxh4668fsn588hx5k5qp752rrjf2nx9vww8";
-       buildDepends = [ base bytestring bytestring-mmap unix ];
+       libraryHaskellDepends = [ base bytestring bytestring-mmap unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39694,7 +40658,9 @@ self: {
        pname = "data-size";
        version = "0.1.1.7";
        sha256 = "0j1g39ha2fjgd960zd0gbhpznisw3qw07mbdacbx226bw50nwa7y";
-       buildDepends = [ base bytestring containers deepseq text ];
+       libraryHaskellDepends = [
+         base bytestring containers deepseq text
+       ];
        description = "Profiling of data structures";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -39705,7 +40671,7 @@ self: {
        pname = "data-spacepart";
        version = "20090215.0";
        sha256 = "0h6z4yibjbnzck2fvh9mnppz9j0lzgx8nzmzm08q5yzmzjydy3rk";
-       buildDepends = [ base vector-space ];
+       libraryHaskellDepends = [ base vector-space ];
        jailbreak = true;
        homepage = "http://code.haskell.org/data-spacepart";
        description = "Deprecated. Now called \"spacepart\". Space partitioning data structures.";
@@ -39721,10 +40687,10 @@ self: {
        pname = "data-store";
        version = "0.3.0.7";
        sha256 = "0cv02d3fwyyyxjv3519k9wilaagxlcn8m2nfifrcq0q0qihxd1bd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cereal containers deepseq lens safecopy transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cereal containers deepseq lens QuickCheck safecopy
          test-framework test-framework-quickcheck2 transformers vector
        ];
@@ -39744,8 +40710,8 @@ self: {
        pname = "data-stringmap";
        version = "1.0.1.1";
        sha256 = "0djbky5m6hxr04jgxi2cq3fsivja32nzn16zs8ffqgadxw030pa1";
-       buildDepends = [ base binary containers deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary containers deepseq ];
+       testHaskellDepends = [
          base containers deepseq ghc-heap-view HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -39764,11 +40730,11 @@ self: {
        sha256 = "0jkbysk1rmbkjvjizwx72h58amvnz4iyjbs0lcx6987m4fn456w9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal array base deepseq derive directory filepath
          language-c mtl random safe utility-ht
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        homepage = "http://github.com/alistra/data-structure-inferrer";
        description = "Program that infers the fastest data structure available for your program";
        license = stdenv.lib.licenses.mit;
@@ -39780,7 +40746,7 @@ self: {
        pname = "data-tensor";
        version = "0.1.0.0";
        sha256 = "0j6jsgj3lhx6ps3xs90vbgyvzmlr3sfl33r6rz34rvb29gs171n8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://bitbucket.org/tdammers/data-tensor";
        description = "Tensor and Group typeclasses";
        license = stdenv.lib.licenses.mit;
@@ -39795,10 +40761,10 @@ self: {
        pname = "data-textual";
        version = "0.3.0.2";
        sha256 = "0c4qs923dj4jnvvkjvbij0c1yg922iw66140cq6wb1m4h6q31ia4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring parsers text text-latin1 text-printer
        ];
-       testDepends = [
+       testHaskellDepends = [
          base parsers QuickCheck test-framework test-framework-quickcheck2
          text-printer type-hint
        ];
@@ -39815,7 +40781,7 @@ self: {
        pname = "data-timeout";
        version = "0.3";
        sha256 = "1b6af2x19hb1kynsv7ypc2q6b71cazcg86gf1yhq0rr0fjj478ah";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-textual parsers tagged text-printer transformers-base
        ];
        homepage = "https://github.com/mvv/data-timeout";
@@ -39829,7 +40795,7 @@ self: {
        pname = "data-transform";
        version = "0.1.0.0";
        sha256 = "1mhcbwh4s414hq4cwljxxadazxfi382spfgkw38fz2xi08lbfsji";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Functions to transform data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39840,7 +40806,7 @@ self: {
        pname = "data-treify";
        version = "0.3.4";
        sha256 = "03xchr2h0f54rlcq285xaq5bakjq13mbjwz3xi3kfa6i71rr2rk9";
-       buildDepends = [ base containers ty ];
+       libraryHaskellDepends = [ base containers ty ];
        homepage = "http://ittc.ku.edu/~andygill/data-reify.php";
        description = "Reify a recursive data structure into an explicit graph";
        license = stdenv.lib.licenses.bsd3;
@@ -39852,7 +40818,7 @@ self: {
        pname = "data-type";
        version = "0.1.0";
        sha256 = "1x3wsnilp9sxy061sfmyyg0f6b0k2lxvi0g4qf2gkldrz32c4qvj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Basic type wrangling types and classes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39864,7 +40830,7 @@ self: {
        pname = "data-util";
        version = "0.4";
        sha256 = "1ywp3h2zccknc2sr0b5zbf9ms2zph5qh8znswxc7bi5wynyk9z98";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/cutsea110/data-util";
        description = "utilities for handle data";
@@ -39877,7 +40843,7 @@ self: {
        pname = "data-variant";
        version = "0.28.0.5";
        sha256 = "11ia37q28xz8a87xkc8yyvqqd3qzfvcbdnp2caxdbzvdnjbazhmk";
-       buildDepends = [ base safe ];
+       libraryHaskellDepends = [ base safe ];
        homepage = "https://bitbucket.org/tdammers/data-variant";
        description = "A variant data type, useful for modeling dynamically-typed programming languages";
        license = stdenv.lib.licenses.bsd3;
@@ -39892,7 +40858,7 @@ self: {
        pname = "database-migrate";
        version = "0.2.0";
        sha256 = "1hhx3851yzgq7cf397sifdbnznk0sfqf3blflxfl50yq68rmwbzy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cmdargs containers directory either filepath lens
          postgresql-simple text time transformers
        ];
@@ -39907,7 +40873,7 @@ self: {
        pname = "database-study";
        version = "0.0.1";
        sha256 = "1aqp7a46p758f1q99cn700mgc1dic896gpsih3vj2fmffqj42gd7";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://dbs.informatik.uni-halle.de/Lehre/LP09/";
        description = "Demonstrate how a database can be implemented the functional way";
@@ -39923,7 +40889,7 @@ self: {
        pname = "datadog";
        version = "0.1.0.1";
        sha256 = "05hfpkaizbgqi998wa0l0hb8qph8y7gwyx05690ljr0883m5a663";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson auto-update base buffer-builder bytestring lens lifted-base
          monad-control network old-locale text time transformers-base
        ];
@@ -39940,7 +40906,7 @@ self: {
        sha256 = "1wwgm7wakkz6v94lyxyd3yi21l3h28sss4xxdb3d770vmjhp1lzr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding";
        description = "Data encoding library";
@@ -39957,8 +40923,9 @@ self: {
        sha256 = "099n0mlx695zvazx7q53i474nzmdrqk38q8lrzf6qh440h60q7bx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers MissingH mtl parsec ];
-       testDepends = [ base hspec HUnit ];
+       libraryHaskellDepends = [ base containers MissingH mtl parsec ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec HUnit ];
        jailbreak = true;
        homepage = "https://github.com/sonyxperiadev/dataflow";
        description = "Generate Graphviz documents from a Haskell representation";
@@ -39976,11 +40943,15 @@ self: {
        sha256 = "1nfjmgf6j8a8602rmk7fg3kbkafiyd7lsnhvnwc95ms90icg0r86";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers exceptions hashable text transformers
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
          base containers exceptions hashable haskeline parsec pretty text
          transformers unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hashable HUnit test-framework test-framework-hunit
          text
        ];
@@ -40000,7 +40971,7 @@ self: {
        sha256 = "10fj1z4wbr76wfnp9h1jzyd8afzn495r6xvbjiw55bimy0hasalg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath hslogger MissingH mtl process unix
        ];
        homepage = "http://software.complete.org/datapacker";
@@ -40014,7 +40985,7 @@ self: {
        pname = "date-cache";
        version = "0.3.0";
        sha256 = "0grhcbd0rhdn0cf1fz82x8pv8cmxfhndlcwyrax4mnnr3pql9kmb";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Date cacher";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40025,7 +40996,9 @@ self: {
        pname = "dates";
        version = "0.2.2.0";
        sha256 = "08d90fii0nmvmfxhhw4k5ja13jyxg79n527089lrc2r31l3wj40a";
-       buildDepends = [ base base-unicode-symbols parsec syb time ];
+       libraryHaskellDepends = [
+         base base-unicode-symbols parsec syb time
+       ];
        jailbreak = true;
        homepage = "http://redmine.iportnov.ru/projects/dates/";
        description = "Small library for parsing different dates formats";
@@ -40041,15 +41014,14 @@ self: {
        pname = "datetime";
        version = "0.3.1";
        sha256 = "0jmxxmv5s9rch84ivfjhqxdqnvqqzvabjs152wyv47h5qmvpag1k";
-       buildDepends = [ base old-locale old-time time ];
-       testDepends = [
+       libraryHaskellDepends = [ base old-locale old-time time ];
+       testHaskellDepends = [
          base HUnit old-locale old-time QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
        homepage = "http://github.com/stackbuilders/datetime";
        description = "Utilities to make Data.Time.* easier to use";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "datetime-sb" = callPackage
@@ -40061,8 +41033,8 @@ self: {
        pname = "datetime-sb";
        version = "0.2.4";
        sha256 = "1p2pn0jdidqcvmmi80njqm9z4amn1qp05nlxbnz1svpp6nc7amjf";
-       buildDepends = [ base old-locale old-time time ];
-       testDepends = [
+       libraryHaskellDepends = [ base old-locale old-time time ];
+       testHaskellDepends = [
          base HUnit old-locale old-time QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
@@ -40079,7 +41051,7 @@ self: {
        pname = "dawg";
        version = "0.11";
        sha256 = "0xvkw5hp66r46v59ld0s7yi2jzvlcc4vc8ignadai9vqxayzm799";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers mtl transformers vector vector-binary
        ];
        homepage = "https://github.com/kawu/dawg";
@@ -40093,8 +41065,8 @@ self: {
        pname = "dbcleaner";
        version = "0.1.1";
        sha256 = "1n4al0fd577ldvaxca6nz181lp0b29z4slrjldx3m51nkxy1ficc";
-       buildDepends = [ base postgresql-simple text ];
-       testDepends = [ base hspec postgresql-simple text ];
+       libraryHaskellDepends = [ base postgresql-simple text ];
+       testHaskellDepends = [ base hspec postgresql-simple text ];
        description = "Clean database tables automatically around hspec tests";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -40105,7 +41077,9 @@ self: {
        pname = "dbf";
        version = "0.0.0.2";
        sha256 = "1pay47bbmxvishmczs3kgn19nzkfmmip3m51h4zlwydm5kxfc5n2";
-       buildDepends = [ base binary bytestring monad-loops rwlock ];
+       libraryHaskellDepends = [
+         base binary bytestring monad-loops rwlock
+       ];
        homepage = "http://code.haskell.org/~mokus/dbf";
        description = "Read and write XBase \".dbf\" files";
        license = stdenv.lib.licenses.publicDomain;
@@ -40121,7 +41095,12 @@ self: {
        sha256 = "06xz0a38sjjr64sz19lg0wzb73yz1msdlbg5s02ldd8n4b9yjk5f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring haskell98 process uulib ];
+       libraryHaskellDepends = [
+         base binary bytestring haskell98 process uulib
+       ];
+       executableHaskellDepends = [
+         base binary bytestring haskell98 process uulib
+       ];
        homepage = "http://devel.comunidadhaskell.org/dbjava/";
        description = "Decompiler Bytecode Java";
        license = stdenv.lib.licenses.bsd3;
@@ -40140,12 +41119,17 @@ self: {
        sha256 = "031ibk22iyqzbkc6cy5ab5kmbhk68k5217szpw50vdp646rya21w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring configurator containers directory fgl filepath HDBC
          HDBC-postgresql HDBC-sqlite3 mtl random template-haskell text time
          yaml-light
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring configurator containers directory fgl filepath HDBC
+         HDBC-postgresql HDBC-sqlite3 mtl random template-haskell text time
+         yaml-light
+       ];
+       testHaskellDepends = [
          base bytestring containers directory fgl filepath HDBC
          HDBC-postgresql HDBC-sqlite3 HUnit mtl process template-haskell
          time yaml-light
@@ -40164,11 +41148,11 @@ self: {
        pname = "dbus";
        version = "0.10.10";
        sha256 = "0s14yb2bbi5n9m3xkznm4nbb0hpj9hmiwl0ppqqiml5s7xhwas6d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers libxml-sax network parsec random
          text transformers unix vector xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal chell chell-quickcheck containers directory
          filepath libxml-sax network parsec process QuickCheck random text
          transformers unix vector xml-types
@@ -40186,7 +41170,7 @@ self: {
        pname = "dbus-client";
        version = "0.4.1";
        sha256 = "0z7061kafjzd4jaws4xcp1xzh2kx559bgp7cmcjq55mbxr1rrsjq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dbus-core monads-tf text transformers
        ];
        jailbreak = true;
@@ -40205,7 +41189,7 @@ self: {
        pname = "dbus-core";
        version = "0.9.3";
        sha256 = "110373yinimq0k7hl8wkk7g4hm3hj563dpa2y8ag2lpl9yydzgfa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 libxml-sax
          network parsec text unix vector xml-types
        ];
@@ -40224,8 +41208,10 @@ self: {
        pname = "dbus-qq";
        version = "0.1.0";
        sha256 = "0dg03nv7bsjydywhby0rv1a6jc90gf2885djxd8pb9aly2ncpjxx";
-       buildDepends = [ base containers dbus parsec template-haskell ];
-       testDepends = [ base containers dbus QuickCheck ];
+       libraryHaskellDepends = [
+         base containers dbus parsec template-haskell
+       ];
+       testHaskellDepends = [ base containers dbus QuickCheck ];
        jailbreak = true;
        description = "Quasi-quoter for DBus functions";
        license = stdenv.lib.licenses.bsd3;
@@ -40239,7 +41225,9 @@ self: {
        pname = "dbus-th";
        version = "0.1.1.1";
        sha256 = "0sxk7m8fdd7cx0n0lbcfz2bv28d0i8v0im50y1sciac7pi13q4bc";
-       buildDepends = [ base containers dbus syb template-haskell text ];
+       libraryHaskellDepends = [
+         base containers dbus syb template-haskell text
+       ];
        description = "TemplateHaskell generator of DBus bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40252,8 +41240,8 @@ self: {
        pname = "dclabel";
        version = "0.9.0.0";
        sha256 = "0bnbqbjpbx98wjgsz7kgr5znljbwhd6lsb8m9ky7dmzqygzybvir";
-       buildDepends = [ base bytestring cereal containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring cereal containers ];
+       testHaskellDepends = [
          base bytestring cereal containers QuickCheck quickcheck-instances
          test-framework test-framework-quickcheck2
        ];
@@ -40269,7 +41257,7 @@ self: {
        pname = "dclabel-eci11";
        version = "0.3";
        sha256 = "1bfc9ip4fqzjzlzppkrnspnm6gc50f4rkf0wngnxyj7f79fvjr6k";
-       buildDepends = [ base pretty QuickCheck ];
+       libraryHaskellDepends = [ base pretty QuickCheck ];
        description = "The Disjunction Category Label Format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40282,7 +41270,7 @@ self: {
        pname = "ddc-base";
        version = "0.4.1.3";
        sha256 = "1v3qkvfcajr8ljnrkmdpkhp6069b54fg168ryknq4b7rkl4piqfm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq parsec transformers wl-pprint
        ];
        jailbreak = true;
@@ -40301,7 +41289,7 @@ self: {
        pname = "ddc-build";
        version = "0.4.1.3";
        sha256 = "15bjdr9g48p1ahga9qc1cgfbpr89551yaqx9psa44da0vy468fjs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ddc-base ddc-core ddc-core-eval ddc-core-flow
          ddc-core-llvm ddc-core-salt ddc-core-simpl ddc-core-tetra
          ddc-source-tetra deepseq directory filepath mtl process
@@ -40319,7 +41307,7 @@ self: {
        pname = "ddc-code";
        version = "0.4.1.3";
        sha256 = "1m904n1s2cszakjrlz81y1gplrgfv3np2ja0m6fapj9c2yyfmg6r";
-       buildDepends = [ base filepath ];
+       libraryHaskellDepends = [ base filepath ];
        jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler base libraries";
@@ -40334,7 +41322,7 @@ self: {
        pname = "ddc-core";
        version = "0.4.1.3";
        sha256 = "15a51cgk3pqsbmy6hv0jrf8ldxmb0kvzd0pwkqa6141phk2g1dd5";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base deepseq directory mtl transformers
        ];
        jailbreak = true;
@@ -40352,7 +41340,7 @@ self: {
        pname = "ddc-core-eval";
        version = "0.4.1.3";
        sha256 = "0s11wzl75fa4pnjclgqdvymddk8srpknvpf6p3vkm2b09y0fryxd";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core deepseq mtl transformers
        ];
        jailbreak = true;
@@ -40370,7 +41358,7 @@ self: {
        pname = "ddc-core-flow";
        version = "0.4.1.3";
        sha256 = "1szy9x5pc2l5ib8sbkajj6i7nfb46ypgi655wy0jrcnp7m2q22fy";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
          ddc-core-simpl deepseq mtl transformers
        ];
@@ -40389,7 +41377,7 @@ self: {
        pname = "ddc-core-llvm";
        version = "0.4.1.3";
        sha256 = "0f0cby09lqhvw5ajm6q25qg57qbb4h3qvqwv30bzl6kw0884lkb5";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
          ddc-core-simpl mtl transformers
        ];
@@ -40408,7 +41396,7 @@ self: {
        pname = "ddc-core-salt";
        version = "0.4.1.3";
        sha256 = "18cywxp3zp6aafpq8si1vvqy7lywwl31mdp58asyzcwi1g1v7y7q";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core deepseq mtl transformers
        ];
        jailbreak = true;
@@ -40426,7 +41414,7 @@ self: {
        pname = "ddc-core-simpl";
        version = "0.4.1.3";
        sha256 = "0y3rxcl2h6dqmy367zfri1r21flcbygvrpa7sj8cr8gh128xwbbz";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core deepseq mtl transformers
        ];
        jailbreak = true;
@@ -40444,7 +41432,7 @@ self: {
        pname = "ddc-core-tetra";
        version = "0.4.1.3";
        sha256 = "01ax5dirrf8jk03316dw1cnrs9fl5qlm8k07nb0rzxwybm3wqdv2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
          ddc-core-simpl deepseq mtl transformers
        ];
@@ -40465,7 +41453,7 @@ self: {
        pname = "ddc-driver";
        version = "0.4.1.3";
        sha256 = "0iyvmifnj05v9r2sh867dm2vgm8hijsxf6bmzrksj1kcs36qwrrk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ddc-base ddc-build ddc-core ddc-core-eval
          ddc-core-flow ddc-core-llvm ddc-core-salt ddc-core-simpl
          ddc-core-tetra ddc-interface ddc-source-tetra deepseq directory
@@ -40484,7 +41472,7 @@ self: {
        pname = "ddc-interface";
        version = "0.4.1.3";
        sha256 = "0pbsnxzlbx9xblqf9199wrl80aard59l3193gm8gzxx7ispfhs3f";
-       buildDepends = [ base containers ddc-base directory ];
+       libraryHaskellDepends = [ base containers ddc-base directory ];
        jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler user interface support";
@@ -40499,7 +41487,7 @@ self: {
        pname = "ddc-source-tetra";
        version = "0.4.1.3";
        sha256 = "088lsavx4fhyxyxzxd4vj1880j19r4l4fvlb4dly42mbyfrg5jrs";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
          ddc-core-tetra deepseq mtl transformers
        ];
@@ -40523,7 +41511,7 @@ self: {
        sha256 = "1hg6hajqrb7sf8bvr27cabdxalwvkw8lm2igsx05p9wq4bpirz62";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers ddc-base ddc-build ddc-code ddc-core ddc-core-eval
          ddc-core-flow ddc-core-llvm ddc-core-salt ddc-core-simpl
          ddc-core-tetra ddc-driver ddc-interface ddc-source-tetra directory
@@ -40546,7 +41534,7 @@ self: {
        sha256 = "0y9h4z1drgwgmw9wjf8ga2kiagmfgppdy29l9cz0j4rjz3mm302y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base buildbox containers directory filepath process random stm
        ];
        jailbreak = true;
@@ -40565,7 +41553,7 @@ self: {
        sha256 = "1w4kcqivphc9gmj4xnkqx2hbzd3cmssww5hqgja1kh0b03q026w0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers ddc-base ddc-core ddc-core-eval ddc-core-simpl
          haskeline haskell-src-exts
        ];
@@ -40584,7 +41572,7 @@ self: {
        pname = "dead-simple-json";
        version = "0.1.2";
        sha256 = "10wp97pxhkvlk3lhknvsnwkl9p7lm1v7y1wk0nn55q68jx1b5zpr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers parsec template-haskell transformers vector
        ];
        homepage = "http://hub.darcs.net/scravy/dead-simple-json";
@@ -40606,14 +41594,17 @@ self: {
        sha256 = "135f0szbnn8xp5zzfmlqcpmsrswahgc4rlgviyznfx6c4j7hg519";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bzlib containers directory either exceptions
          filepath HaXml HUnit ListLike mtl network network-uri old-locale
          parsec pretty process process-extras pureMD5 regex-compat
          regex-tdfa template-haskell text time unix Unixutils utf8-string
          zlib
        ];
-       testDepends = [ base HUnit parsec pretty regex-tdfa text ];
+       executableHaskellDepends = [
+         base directory filepath HaXml pretty process unix
+       ];
+       testHaskellDepends = [ base HUnit parsec pretty regex-tdfa text ];
        homepage = "https://github.com/ddssff/debian-haskell";
        description = "Modules for working with the Debian package system";
        license = stdenv.lib.licenses.bsd3;
@@ -40627,7 +41618,7 @@ self: {
        sha256 = "0k6blaq1p2phydl4pqlqg6kdicrfjhm6h27svws7dq8di3y274fq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath HSH ];
+       libraryHaskellDepends = [ base directory filepath HSH ];
        description = "Utilities to work with debian binary packages";
        license = "unknown";
      }) {};
@@ -40642,9 +41633,10 @@ self: {
        sha256 = "1x3jvrz5y85m9mnp5b8b85f4magbxa4r0yhkw30vgcljph6v7mfm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal directory filepath process split transformers
        ];
+       executableHaskellDepends = [ base filepath ];
        homepage = "http://twitter.com/khibino/";
        description = "Debian package build sequence tools";
        license = stdenv.lib.licenses.bsd3;
@@ -40656,7 +41648,7 @@ self: {
        pname = "debug-diff";
        version = "0.1";
        sha256 = "19k9f92pjh52qnr31l0468hn2klkb8wszs7azwczvxzg8aq7krld";
-       buildDepends = [ base groom process temporary ];
+       libraryHaskellDepends = [ base groom process temporary ];
        description = "Display a colorized diff between two Haskell values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40667,7 +41659,7 @@ self: {
        pname = "decepticons";
        version = "0.1.0.0";
        sha256 = "1fnp2c2rdpihvxm5j22z1mrf8pnpcnasvfsrlg7lvg5m76md7k3v";
-       buildDepends = [ base comonad-transformers ];
+       libraryHaskellDepends = [ base comonad-transformers ];
        jailbreak = true;
        description = "The categorical dual of transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -40683,7 +41675,9 @@ self: {
        sha256 = "10mj871j5gd4d8v8341lr5lr9avxxfph58sjhmd9kgywc10grqph";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ api-opentheory-unicode base opentheory-unicode ];
+       executableHaskellDepends = [
+         api-opentheory-unicode base opentheory-unicode
+       ];
        description = "Decode a UTF-8 byte stream on standard input";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -40694,7 +41688,7 @@ self: {
        pname = "decoder-conduit";
        version = "0.0.1.1";
        sha256 = "0z5krcl4xd385f7v2bsnfyr7zidqwfjvc6b432gbbn2vcrx966c7";
-       buildDepends = [ base binary bytestring conduit ];
+       libraryHaskellDepends = [ base binary bytestring conduit ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/decoder-conduit";
        description = "Conduit for decoding ByteStrings using Data.Binary.Get";
@@ -40713,10 +41707,11 @@ self: {
        sha256 = "0b7328529m3xl8bj7sncv5rr13ld2aghgqkf55j4n15jagv6g72d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ time unix ];
+       executableHaskellDepends = [
          base bytestring containers directory filepath haskell-src-exts
          haskell-src-exts-qq hmk mtl parsec process Stream stringtable-atom
-         time unix wl-pprint
+         wl-pprint
        ];
        jailbreak = true;
        homepage = "http://www.lix.polytechnique.fr/dedukti";
@@ -40736,8 +41731,13 @@ self: {
        sha256 = "1cw29xisgykb20qv3jkpcpaiijicyzkfsgglrsbx1admfzbqv98d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ accelerate base mtl repa repa-algorithms vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         accelerate base mtl repa repa-algorithms vector
+       ];
+       executableHaskellDepends = [
+         accelerate base mtl repa repa-algorithms vector
+       ];
+       testHaskellDepends = [
          accelerate base mtl QuickCheck repa repa-algorithms test-framework
          test-framework-quickcheck2 vector
        ];
@@ -40754,7 +41754,7 @@ self: {
        pname = "deepseq";
        version = "1.3.0.1";
        sha256 = "068zka6rwprbzpx7yisi1ajsxdly23zaf2vjklx1wp66yypx54lp";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        jailbreak = true;
        description = "Deep evaluation of data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -40768,8 +41768,8 @@ self: {
        pname = "deepseq";
        version = "1.4.1.1";
        sha256 = "1gxk6bdqfplvq0lma2sjcxl8ibix5k60g71dncpvwsmc63mmi0ch";
-       buildDepends = [ array base ];
-       testDepends = [
+       libraryHaskellDepends = [ array base ];
+       testHaskellDepends = [
          array base HUnit test-framework test-framework-hunit
        ];
        description = "Deep evaluation of data structures";
@@ -40785,11 +41785,11 @@ self: {
        pname = "deepseq-bounded";
        version = "0.8.0.0";
        sha256 = "192hqyidgbrsig2yx7x9vdx180w1jfcqxsgg4wslwfwj7d3sa81f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cpphs deepseq deepseq-generics generics-sop mtl parallel
          random syb
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cpphs deepseq deepseq-generics generics-sop ghc-prim HUnit
          parallel random syb template-haskell
        ];
@@ -40807,11 +41807,11 @@ self: {
      mkDerivation {
        pname = "deepseq-generics";
        version = "0.1.1.2";
-       revision = "1";
        sha256 = "01pvigx8n9p8hwbzp2qiq6kzf7cxiam843jz2sjgliacmmp1v7l3";
+       revision = "1";
        editedCabalFile = "3f52867fe9267876504d8ce20c77dcfb2ac6613af8c915017859b6022d3cc9fd";
-       buildDepends = [ base deepseq ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ghc-prim ];
+       testHaskellDepends = [
          base deepseq ghc-prim HUnit test-framework test-framework-hunit
        ];
        homepage = "https://github.com/hvr/deepseq-generics";
@@ -40825,7 +41825,7 @@ self: {
        pname = "deepseq-magic";
        version = "1.0.0.3";
        sha256 = "15nisjmhcfippz153b8l8f291halkgbrync5c2v6xwkh07ibn7yp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ezyang/deepseq-magic";
        description = "Deep evaluation of data structures without NFData";
        license = stdenv.lib.licenses.publicDomain;
@@ -40837,8 +41837,8 @@ self: {
        pname = "deepseq-th";
        version = "0.1.0.4";
        sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965";
-       buildDepends = [ base deepseq template-haskell ];
-       testDepends = [ base deepseq template-haskell ];
+       libraryHaskellDepends = [ base deepseq template-haskell ];
+       testHaskellDepends = [ base deepseq template-haskell ];
        jailbreak = true;
        description = "Template Haskell based deriver for optimised NFData instances";
        license = stdenv.lib.licenses.bsd3;
@@ -40851,7 +41851,7 @@ self: {
        pname = "deepzoom";
        version = "0.1";
        sha256 = "1hisk6yfq4182ak7d1mi1kmnwwlcl8w7gwc8wqkq4l8m3zfyij8k";
-       buildDepends = [ base directory filepath hsmagick ];
+       libraryHaskellDepends = [ base directory filepath hsmagick ];
        description = "A DeepZoom image slicer. Only known to work on 32bit Linux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40863,7 +41863,7 @@ self: {
        pname = "defargs";
        version = "0.3";
        sha256 = "1rz37w83awji034spyv4cnfbqb6r98r1bbvzh2i979qh5c5s6ckg";
-       buildDepends = [ base cluss ];
+       libraryHaskellDepends = [ base cluss ];
        homepage = "https://github.com/Kinokkory/defargs";
        description = "default arguments in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -40878,7 +41878,7 @@ self: {
        pname = "definitive-base";
        version = "2.3";
        sha256 = "126ln7k6k188xjnig60ksc425fp3hql5znb98h5c1w157jgg0sw9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq ghc-prim GLURaw OpenGL
          OpenGLRaw primitive vector
        ];
@@ -40897,10 +41897,10 @@ self: {
      mkDerivation {
        pname = "definitive-filesystem";
        version = "1.2";
-       revision = "1";
        sha256 = "0bc098igiqzbm25bjaxdxm4jq17kc8bgz1ab0pgm0h5jvy1bf8id";
+       revision = "1";
        editedCabalFile = "3a78d4d8aaa291ca95d889b62a979c4132bbe6f91073ab2bd9fdb0d55ed63121";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring clock containers deepseq definitive-base
          definitive-reactive directory filepath old-locale primitive time
          unix vector
@@ -40921,10 +41921,10 @@ self: {
      mkDerivation {
        pname = "definitive-graphics";
        version = "1.2";
-       revision = "1";
        sha256 = "0ah19j2al9l6pbin821rsicidmg3rd4cc74r8qw095773sa98zyr";
+       revision = "1";
        editedCabalFile = "a6d867ea8098390daff40c088c81f854ca054f9a0c8b097f9194be329416baed";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring clock containers cpu deepseq
          definitive-base definitive-parser definitive-reactive GLFW
          JuicyPixels mtl primitive stb-truetype transformers utf8-string
@@ -40946,7 +41946,7 @@ self: {
        pname = "definitive-parser";
        version = "2.1";
        sha256 = "0sl77xgk7vjn69mx89k4f3yviz821mg01fga0klqplcccbkzknmh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers cpu deepseq definitive-base
          ghc-prim GLURaw OpenGL OpenGLRaw primitive utf8-string vector
        ];
@@ -40964,10 +41964,10 @@ self: {
      mkDerivation {
        pname = "definitive-reactive";
        version = "1.0";
-       revision = "1";
        sha256 = "0gk39602k5yjxxgpd725dnvqhlcnaqgds7g0c8v1h509lc0d7xm3";
+       revision = "1";
        editedCabalFile = "8c3c6afcc4ce7569ede32c8006d1d66fb10448321159f875d1dec03419bd7797";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring clock containers deepseq definitive-base
          primitive vector
        ];
@@ -40986,10 +41986,10 @@ self: {
      mkDerivation {
        pname = "definitive-sound";
        version = "1.0";
-       revision = "1";
        sha256 = "01k4h7av4fhp4xchrcbnc1gnnbsh5ngasq55l16n3l438pr73vzj";
+       revision = "1";
        editedCabalFile = "1491f0a01f47b84ea8f01a94492738a7f3b5fe7c68c805cca8701926cc443d71";
-       buildDepends = [
+       libraryHaskellDepends = [
          alsa-core alsa-pcm array base bytestring clock containers deepseq
          definitive-base primitive sample-frame storable-record vector
        ];
@@ -41008,7 +42008,7 @@ self: {
        pname = "deiko-config";
        version = "0.5.0.0";
        sha256 = "0zhi173mm905aqh52fsw1c9y3hxk07yc1g2s0rrjr75cdl7ssljy";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers exceptions mtl parsec text transformers
        ];
        jailbreak = true;
@@ -41023,8 +42023,8 @@ self: {
        pname = "deka";
        version = "0.6.0.2";
        sha256 = "1l23b5v0wjg72vlnyxa87v3j2dxbld536ws8j03ddcwgqgws1fj4";
-       buildDepends = [ base bytestring parsec transformers ];
-       extraLibraries = [ mpdec ];
+       libraryHaskellDepends = [ base bytestring parsec transformers ];
+       librarySystemDepends = [ mpdec ];
        jailbreak = true;
        homepage = "https://github.com/massysett/deka";
        description = "Decimal floating point arithmetic";
@@ -41042,11 +42042,12 @@ self: {
        sha256 = "08226vca64v8brcgci8a3s5fnf4qy8g9drk3lzzd0dq6g8yvypy9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base bytestring deka QuickCheck ];
+       executableHaskellDepends = [
          base bytestring containers deka parsec pipes QuickCheck
          transformers
        ];
-       testDepends = [ base bytestring deka QuickCheck quickpull ];
+       testHaskellDepends = [ base bytestring deka QuickCheck quickpull ];
        jailbreak = true;
        homepage = "https://github.com/massysett/deka";
        description = "Tests for deka, decimal floating point arithmetic";
@@ -41062,8 +42063,10 @@ self: {
        pname = "delaunay";
        version = "0.1.0.2";
        sha256 = "145a220kv3fk2lk6jpvqmmhwmbgiqzkcbsi5hynsg196chydxgvd";
-       buildDepends = [ AC-Vector base hashable unordered-containers ];
-       testDepends = [ AC-Vector base HUnit QuickCheck ];
+       libraryHaskellDepends = [
+         AC-Vector base hashable unordered-containers
+       ];
+       testHaskellDepends = [ AC-Vector base HUnit QuickCheck ];
        homepage = "http://github.com/mruegenberg/Delaunay";
        description = "Build a Delaunay triangulation of a set of points";
        license = stdenv.lib.licenses.bsd3;
@@ -41076,7 +42079,9 @@ self: {
        pname = "delicious";
        version = "0.3.4";
        sha256 = "1dx2y2ggzcwcjs618jmg21342pcd0maqx8pj2hwv80zq6f5v0c50";
-       buildDepends = [ base bytestring curl feed json nano-md5 xml ];
+       libraryHaskellDepends = [
+         base bytestring curl feed json nano-md5 xml
+       ];
        homepage = "https://github.com/sof/delicious";
        description = "Accessing the del.icio.us APIs from Haskell (v2)";
        license = stdenv.lib.licenses.bsd3;
@@ -41091,7 +42096,7 @@ self: {
        pname = "delimited-text";
        version = "0.3.0";
        sha256 = "0mn6sv4nm3wbzq5cc9s9kb3xbm9jd5i059xr6qr9mqxa18j78c05";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary bytestring bytestring-show
        ];
        homepage = "http://space.k-hornz.de/software/delimited-text";
@@ -41106,20 +42111,21 @@ self: {
      mkDerivation {
        pname = "delta";
        version = "0.2.1.2";
-       revision = "2";
        sha256 = "0r2a2vffs3rn2xp56nhanyywzbm2wph5664spgj4lbsna6zgjnfj";
+       revision = "2";
        editedCabalFile = "630e85a07132fe54b49c71f855b3d633982026d78120279e00888bc95a9d14dd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers directory filepath optparse-applicative process
-         sodium time
+       libraryHaskellDepends = [
+         base containers directory filepath sodium time
        ];
-       testDepends = [ base directory filepath hspec ];
+       executableHaskellDepends = [
+         base directory optparse-applicative process sodium
+       ];
+       testHaskellDepends = [ base directory filepath hspec ];
        homepage = "https://github.com/kryoxide/delta";
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "delta-h" = callPackage
@@ -41132,7 +42138,10 @@ self: {
        sha256 = "0ya0hgvpa9w41gswngg84yxhvll3fyr6b3h56p80yc5bldw700wg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring containers monad-atom nlp-scores text
+       ];
+       executableHaskellDepends = [
          base binary bytestring containers monad-atom nlp-scores text
        ];
        homepage = "https://bitbucket.org/gchrupala/delta-h";
@@ -41147,8 +42156,8 @@ self: {
        pname = "demarcate";
        version = "0.1.0";
        sha256 = "130yk7461rwmjgzivsya10xzh0d0ca8pfkxh7fpll239r7xlbds3";
-       buildDepends = [ base free transformers ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base free transformers ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/fizruk/demarcate";
        description = "Demarcating transformed monad";
        license = stdenv.lib.licenses.bsd3;
@@ -41163,7 +42172,8 @@ self: {
        sha256 = "06jdr1236wlsmapwn6hdmjl41qlig7ck541lynyds0qd6ymcb9k1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath ];
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
        jailbreak = true;
        homepage = "http://protempore.net/denominate/";
        description = "Functions supporting bulk file and directory name normalization";
@@ -41177,7 +42187,7 @@ self: {
        pname = "dependent-map";
        version = "0.1.1.3";
        sha256 = "1by83rrv8dfn5lxrpx3qzs1lg31fhnzlqy979h8ampyxd0w93pa4";
-       buildDepends = [ base containers dependent-sum ];
+       libraryHaskellDepends = [ base containers dependent-sum ];
        homepage = "https://github.com/mokus0/dependent-map";
        description = "Dependent finite maps (partial dependent products)";
        license = "unknown";
@@ -41189,7 +42199,7 @@ self: {
        pname = "dependent-sum";
        version = "0.2.1.0";
        sha256 = "1h6wsrh206k6q3jcfdxvlsswbm47x30psp6x30l2z0j9jyf7jpl3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mokus0/dependent-sum";
        description = "Dependent sum type";
        license = stdenv.lib.licenses.publicDomain;
@@ -41202,7 +42212,9 @@ self: {
        pname = "dependent-sum-template";
        version = "0.0.0.4";
        sha256 = "103jxzzw3drg7pkgmh39s7258zcwr8ixg8mijm6p33b87a8wdpwr";
-       buildDepends = [ base dependent-sum template-haskell th-extras ];
+       libraryHaskellDepends = [
+         base dependent-sum template-haskell th-extras
+       ];
        homepage = "/dev/null";
        description = "Template Haskell code to generate instances of classes in dependent-sum package";
        license = stdenv.lib.licenses.publicDomain;
@@ -41218,10 +42230,10 @@ self: {
        sha256 = "0y43bhxx5s4v72gc0y1cwfy2h4hyz9x5cab2fbkd7rvj5wn4w4gq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath process transformers yaml-config
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory filepath hspec process QuickCheck
          transformers yaml-config
        ];
@@ -41240,7 +42252,7 @@ self: {
        sha256 = "0qgqlnj7wkmjba5f2rql51g9jhak0ksx3xdmr25j3p6qwb43k5ih";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bio bytestring cmdargs directory process regex-compat
        ];
        homepage = "http://malde.org/~ketil/biohaskell/dephd";
@@ -41257,7 +42269,8 @@ self: {
        sha256 = "1z4c3hyk1lbjqm5is1d9qb6sxwv8i870ph7n2h51r631mhxbdnxl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base QuickCheck safe ];
+       libraryHaskellDepends = [ base QuickCheck safe ];
+       executableHaskellDepends = [ base QuickCheck ];
        description = "A typeclass and an implementation for double-ended queues";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41269,7 +42282,7 @@ self: {
        pname = "derangement";
        version = "0.1.0";
        sha256 = "13w257bndjpaz7fiz4g2w4v2bmlch07ay5pxxv5ifc4llh665ch0";
-       buildDepends = [ base fgl ];
+       libraryHaskellDepends = [ base fgl ];
        description = "Find derangements of lists";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41281,7 +42294,9 @@ self: {
        pname = "derivation-trees";
        version = "0.7.3";
        sha256 = "05f77vkqzia91rywkg68ad24j98a7h9aqkd0568x2zmqcndzbisy";
-       buildDepends = [ applicative-extras base labeled-tree mtl ];
+       libraryHaskellDepends = [
+         applicative-extras base labeled-tree mtl
+       ];
        jailbreak = true;
        description = "Typeset Derivation Trees via MetaPost";
        license = "GPL";
@@ -41299,7 +42314,7 @@ self: {
        sha256 = "0g2grz9y23n8g4wwjinx5cc70aawswl84i3njgj6l1fl29fk1yf2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath haskell-src-exts
          pretty process syb template-haskell transformers uniplate
        ];
@@ -41314,7 +42329,7 @@ self: {
        pname = "derive-IG";
        version = "0.1.1";
        sha256 = "0bggj2jb3bbgxcz75v8q2yx29v88skiwjaj3fxkkynnv5zvrbgwr";
-       buildDepends = [ base instant-generics template-haskell ];
+       libraryHaskellDepends = [ base instant-generics template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/konn/derive-IG";
        description = "Macro to derive instances for Instant-Generics using Template Haskell";
@@ -41328,7 +42343,7 @@ self: {
        pname = "derive-enumerable";
        version = "0.1.1.0";
        sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp";
-       buildDepends = [ base data-default ];
+       libraryHaskellDepends = [ base data-default ];
        jailbreak = true;
        homepage = "https://github.com/mgoszcz2/derive-enumerable";
        description = "Generic instances for enumerating complex data types";
@@ -41345,10 +42360,13 @@ self: {
        sha256 = "0s6vb3b3chf1gy44a6zsi2z19d6snk12qlk4v8q2smipmj42v7d6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src-exts haskell-src-meta pretty
          template-haskell
        ];
+       executableHaskellDepends = [
+         base haskell-src-exts haskell-src-meta template-haskell
+       ];
        jailbreak = true;
        description = "Instance deriving for (a subset of) GADTs";
        license = stdenv.lib.licenses.bsd3;
@@ -41363,7 +42381,7 @@ self: {
        pname = "derive-topdown";
        version = "0.0.0.2";
        sha256 = "0gdalqq1ks9jjp34kzavlx2ncpdad2pf6vdhx64yii5l2nl04r8p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base derive mtl template-haskell template-haskell-util
        ];
        homepage = "https://github.com/HaskellZhangSong/derive-topdown";
@@ -41378,7 +42396,7 @@ self: {
        pname = "derive-trie";
        version = "0.2.1";
        sha256 = "11c378mh5razibd9ljffm5353v4plrgvkfb62p6029f04sf29jnc";
-       buildDepends = [ array base containers template-haskell ];
+       libraryHaskellDepends = [ array base containers template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/baldo/derive-trie";
        description = "Automatic derivation of Trie implementations";
@@ -41394,8 +42412,10 @@ self: {
        pname = "deriving-compat";
        version = "0.1";
        sha256 = "1v503lj9dds1hwnqhmw8rfbj9337gcyqqzys1d93r7s0bs3glgf3";
-       buildDepends = [ base containers ghc-prim template-haskell ];
-       testDepends = [ base base-compat hspec QuickCheck ];
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell
+       ];
+       testHaskellDepends = [ base base-compat hspec QuickCheck ];
        homepage = "https://github.com/haskell-compat/deriving-compat";
        description = "Backports of GHC deriving extensions";
        license = stdenv.lib.licenses.bsd3;
@@ -41407,7 +42427,7 @@ self: {
        pname = "derp";
        version = "0.1.6";
        sha256 = "0g8y98qjjampbwnxhvjzrs2jczh2mcwsacjq95jxpidgsld00shk";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Derivative Parsing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41418,7 +42438,7 @@ self: {
        pname = "derp-lib";
        version = "0.0.0.1";
        sha256 = "0j883w01k9scz6cfxljkw9s2kgs9f7vdxyyxxhlvvkgzb0050v0x";
-       buildDepends = [ base derp ];
+       libraryHaskellDepends = [ base derp ];
        homepage = "http://darcsden.com/kyagrd/derp-lib";
        description = "combinators based on parsing with derivatives (derp) package";
        license = stdenv.lib.licenses.bsd3;
@@ -41431,7 +42451,7 @@ self: {
        pname = "descrilo";
        version = "0.1.0.3";
        sha256 = "19x78lv6rd5i5xvqj92q5snly1579jiiw2fgmxzxza0km9j9yiw2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Loads a list of items with fields";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -41443,10 +42463,10 @@ self: {
      mkDerivation {
        pname = "descriptive";
        version = "0.0.2";
-       revision = "3";
        sha256 = "0jh0l4assmqsmq9ajsbdl7vn8k6srl0z27kpxwzg1v0nmkkcl48p";
+       revision = "3";
        editedCabalFile = "0aeae1dd5ab8c21ade57c1e036600b8162cd790823618a9c5894417ba68e2ea2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors containers mtl text transformers
        ];
        homepage = "https://github.com/chrisdone/descriptive";
@@ -41462,11 +42482,11 @@ self: {
        pname = "descriptive";
        version = "0.9.4";
        sha256 = "0bxskc4q6jzpvifnhh6zl77xic0fbni8abf9lipfr1xzarbwcpkr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors containers mtl scientific text transformers
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bifunctors containers hspec HUnit mtl text transformers
        ];
        homepage = "https://github.com/chrisdone/descriptive";
@@ -41480,7 +42500,7 @@ self: {
        pname = "despair";
        version = "0.0.2";
        sha256 = "1dwhp1izikvj1qfz6shvnl4q519vgjpnfmkwkj8zp875dki87pnj";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        description = "Despair";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41491,8 +42511,8 @@ self: {
        pname = "deterministic-game-engine";
        version = "0.4.0";
        sha256 = "1hdwr1vxfng3yc9mdnnsraapikq9kq1c07ik16csgp2ggnhgpprs";
-       buildDepends = [ base mtl ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/TGOlson/deterministic-game-engine";
        description = "Simple deterministic game engine";
        license = stdenv.lib.licenses.mit;
@@ -41508,7 +42528,7 @@ self: {
        sha256 = "0fsdbagj9zhbm6hh5rsjgz3iq1raxkljnr65ba506nwxmc052xcn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring cmdargs containers hashable mwc-random text
          unordered-containers zlib
        ];
@@ -41524,7 +42544,7 @@ self: {
        sha256 = "08skd630jj9h3mlxm86s7qkdrpcwhknk21dmlj69126dn67v159f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring utf8-string ];
+       executableHaskellDepends = [ base bytestring utf8-string ];
        jailbreak = true;
        description = "Get rid of unicode (utf-8) symbols in Haskell sources";
        license = stdenv.lib.licenses.mit;
@@ -41540,7 +42560,7 @@ self: {
        sha256 = "1n5rzm40srakb0jv8j9gin6m15x5l37knmdckc4xhwvliyvllrf4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring directory filepath hinotify process split
          text unix unordered-containers
        ];
@@ -41555,7 +42575,9 @@ self: {
        pname = "dewdrop";
        version = "0.1";
        sha256 = "1xi78d31hljbybpm3jzs4l3g35sdfhmmm7ksivjdi91gv9m88l0n";
-       buildDepends = [ base bytestring containers elf hdis86 syb ];
+       libraryHaskellDepends = [
+         base bytestring containers elf hdis86 syb
+       ];
        homepage = "https://github.com/kmcallister/dewdrop";
        description = "Find gadgets for return-oriented programming on x86";
        license = stdenv.lib.licenses.bsd3;
@@ -41568,7 +42590,7 @@ self: {
        pname = "dfrac";
        version = "0.1.2.0";
        sha256 = "1ybq5bnh85dbr9lfx5d6qw87x9qc8fs0yvbi1a6860an13lvrzy7";
-       buildDepends = [ base scientific ];
+       libraryHaskellDepends = [ base scientific ];
        description = "A package for precise decimal arithmatic using rationals";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -41584,7 +42606,7 @@ self: {
        sha256 = "0nh5cvb8macw523iids072rs9kylkv8zrliraw1jrvmhsznkj05x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile directory filepath HSH hslogger MissingH network
          old-time parsec random regex-compat unix
        ];
@@ -41599,8 +42621,8 @@ self: {
        pname = "dgim";
        version = "0.0.3";
        sha256 = "1brffyfawrdgr2659hbda42mpn9jiiq474a0yd57kj7z0dzq25f6";
-       buildDepends = [ base ];
-       testDepends = [ base Cabal QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base Cabal QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/musically-ut/haskell-dgim";
        description = "Implementation of DGIM algorithm";
@@ -41614,7 +42636,7 @@ self: {
        pname = "dgs";
        version = "0.2";
        sha256 = "100xlxqhy33kllyb4dy7q0bwwy5wn9w45qy1cb5f0yb0dqff1pnx";
-       buildDepends = [ base HTTP mtl network split ];
+       libraryHaskellDepends = [ base HTTP mtl network split ];
        jailbreak = true;
        homepage = "http://www.dmwit.com/dgs";
        description = "Haskell front-end for DGS' bot interface";
@@ -41628,7 +42650,7 @@ self: {
        pname = "dia-base";
        version = "0.1.1.3";
        sha256 = "1kx7dczabfklqpvbz7zcf1hhha8vrcbv35xl82fips02x0065b75";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        description = "An EDSL for teaching Haskell with diagrams - data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41641,7 +42663,7 @@ self: {
        pname = "dia-functions";
        version = "0.2.1.4";
        sha256 = "14hfapfnfl2m9g8b6mdcmmq2fbyqgg14s0sagxbb8hhz47pznc27";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-pprint deepseq dia-base mtl xhtml
        ];
        description = "An EDSL for teaching Haskell with diagrams - functions";
@@ -41656,7 +42678,7 @@ self: {
        pname = "diagrams";
        version = "1.3";
        sha256 = "1f5cpa2qjpzq9m8d3066iixbq414zk0pv1vajghb214a1w9sqaf9";
-       buildDepends = [
+       libraryHaskellDepends = [
          diagrams-contrib diagrams-core diagrams-lib diagrams-svg
        ];
        homepage = "http://projects.haskell.org/diagrams";
@@ -41675,15 +42697,18 @@ self: {
        pname = "diagrams-builder";
        version = "0.7.1.1";
        sha256 = "1klmmh144bdwrg3zs45l6yy1li64r60jygqspxzyzlm8pfgzvgah";
+       configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base base-orphans bytestring cmdargs diagrams-cairo diagrams-lib
+       libraryHaskellDepends = [
+         base base-orphans cmdargs diagrams-lib directory exceptions
+         filepath hashable haskell-src-exts hint lens mtl split transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs diagrams-cairo diagrams-lib
          diagrams-postscript diagrams-rasterific diagrams-svg directory
-         exceptions filepath hashable haskell-src-exts hint JuicyPixels lens
-         lucid-svg mtl split transformers
+         filepath JuicyPixels lens lucid-svg
        ];
-       configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41700,7 +42725,7 @@ self: {
        pname = "diagrams-cairo";
        version = "1.3.0.3";
        sha256 = "0962kz1b45hycjij90yxq88wa5qsdll82h16agzf0pm16j8r4v5s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cairo colour containers data-default-class
          diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
          optparse-applicative pango split statestack transformers unix
@@ -41720,7 +42745,7 @@ self: {
        pname = "diagrams-canvas";
        version = "1.3.0.2";
        sha256 = "1jklgvkmdhg5ari577jh5y7vr54wjdwyz2hql1n1icbfba5d6p0c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
          optparse-applicative statestack text
@@ -41743,13 +42768,13 @@ self: {
        pname = "diagrams-contrib";
        version = "1.3.0.4";
        sha256 = "0mr4m4kl028jxrjldn38kq7zsph6vqwzdjhxd0rznzbwpsnvsnkf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base circle-packing colour containers data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
          force-layout lens linear MonadRandom mtl parsec random semigroups
          split text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers diagrams-lib HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -41767,7 +42792,7 @@ self: {
        pname = "diagrams-core";
        version = "1.3.0.2";
        sha256 = "0lrzphpia24dk1mxv33c9f5iy18r5d0lfsw92422nhbs36dslyzm";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl semigroups unordered-containers
        ];
@@ -41782,7 +42807,9 @@ self: {
        pname = "diagrams-gtk";
        version = "1.3";
        sha256 = "0kf340d63jzb0clw9kv2i8wdhprv5cialcfqbaxyhdvf0qswp8ms";
-       buildDepends = [ base cairo diagrams-cairo diagrams-lib gtk ];
+       libraryHaskellDepends = [
+         base cairo diagrams-cairo diagrams-lib gtk
+       ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
@@ -41802,13 +42829,16 @@ self: {
        sha256 = "0pa83kd1b1fnj9plwmz8gsi2nm35ghdsxdxi4w4f7shsgc64nhrj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ansi-terminal base base64-bytestring bytestring Cabal cautious-file
-         cmdargs containers cpphs diagrams-builder diagrams-lib diagrams-svg
+       libraryHaskellDepends = [
+         ansi-terminal base base64-bytestring bytestring cautious-file
+         containers cpphs diagrams-builder diagrams-lib diagrams-svg
          directory filepath haskell-src-exts lens linear lucid-svg mtl
          parsec split strict text uniplate
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base Cabal cmdargs cpphs directory filepath
+       ];
+       testHaskellDepends = [
          base containers haskell-src-exts lens parsec QuickCheck tasty
          tasty-quickcheck
        ];
@@ -41826,7 +42856,7 @@ self: {
        pname = "diagrams-hsqml";
        version = "0.1.0.0";
        sha256 = "1j1n9bamb1fyfgbmiyqssyzh93fahmg48yb7z3z18rrxmn04rnax";
-       buildDepends = [
+       libraryHaskellDepends = [
          base colour containers diagrams-core diagrams-lib hsqml lens text
          transformers
        ];
@@ -41845,7 +42875,7 @@ self: {
        pname = "diagrams-html5";
        version = "1.3.0.2";
        sha256 = "18ifqv5xkk9cd86d3mir1qka2jy35vj4hqycq44z96hhp50yl29j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cmdargs containers data-default-class diagrams-core
          diagrams-lib lens mtl NumInstances optparse-applicative split
          statestack static-canvas text
@@ -41868,7 +42898,7 @@ self: {
        pname = "diagrams-lib";
        version = "1.3.0.2";
        sha256 = "1gvvyzpzzdwzvrh452l6r2709qpbdzx1fi1ysvzalywi3gib69ds";
-       buildDepends = [
+       libraryHaskellDepends = [
          active adjunctions array base colour containers data-default-class
          diagrams-core diagrams-solve directory distributive dual-tree
          exceptions filepath fingertree fsnotify hashable intervals
@@ -41893,7 +42923,7 @@ self: {
        sha256 = "02dz0w2im68667v5k1ykdnl3cijvqfd5pgb7qqdyyizkgza88pb4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base diagrams-builder diagrams-cairo diagrams-lib directory
          filepath linear optparse-applicative pandoc-types
        ];
@@ -41910,7 +42940,7 @@ self: {
        pname = "diagrams-pdf";
        version = "0.3.1";
        sha256 = "0wi38w0r1n1zm49r16vhmgg14v3pw7ca6wwb85y3zrbjmzfa37vy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cmdargs colour diagrams-core diagrams-lib filepath HPDF lens
          monoid-extras mtl semigroups split vector-space
        ];
@@ -41931,7 +42961,7 @@ self: {
        pname = "diagrams-pgf";
        version = "0.1.0.2";
        sha256 = "1lwwr143nlvpxpkdvsbq4z4bs7qhbx636p6hi6w448xmbniq90rj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-builder colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels mtl
          optparse-applicative process split texrunner time vector zlib
@@ -41951,7 +42981,7 @@ self: {
        pname = "diagrams-postscript";
        version = "1.3.0.2";
        sha256 = "0cdhs5ia6jm89h1bxgqm1w9gkjqnw6g0nw13vjasj0fh08nayk7s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default-class diagrams-core diagrams-lib dlist
          filepath hashable lens monoid-extras mtl semigroups split
          statestack
@@ -41968,7 +42998,9 @@ self: {
        pname = "diagrams-qrcode";
        version = "1.2";
        sha256 = "15c1h0izxi475b1n8q3dmg0kpp7dk0s4nifnxcq3lbq71jmsg8ll";
-       buildDepends = [ array base colour diagrams-core diagrams-lib ];
+       libraryHaskellDepends = [
+         array base colour diagrams-core diagrams-lib
+       ];
        jailbreak = true;
        homepage = "https://github.com/prowdsponsor/diagrams-qrcode";
        description = "Draw QR codes to SVG, PNG, PDF or PS files";
@@ -41986,7 +43018,7 @@ self: {
        pname = "diagrams-rasterific";
        version = "1.3.1.3";
        sha256 = "1gkapj3n2xyy13a819zbckslvv8k5jkdlz7x2dzhcganra9gkcki";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
          optparse-applicative Rasterific split unix
@@ -42002,7 +43034,9 @@ self: {
        pname = "diagrams-rubiks-cube";
        version = "0.2.0.0";
        sha256 = "1rymsiqwnd37mly5dlq5hkmy5vxvyvzwkn2rm2gwmxy3amk5g4db";
-       buildDepends = [ base data-default-class diagrams-lib lens ];
+       libraryHaskellDepends = [
+         base data-default-class diagrams-lib lens
+       ];
        homepage = "https://github.com/timjb/rubiks-cube";
        description = "Library for drawing the Rubik's Cube";
        license = stdenv.lib.licenses.mit;
@@ -42014,7 +43048,7 @@ self: {
        pname = "diagrams-solve";
        version = "0.1";
        sha256 = "0jqc0mlswrp7iz7wg02fp9ggi04rb97bzlssvpv26z6i6ig3b5sf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Pure Haskell solver routines used by diagrams";
        license = stdenv.lib.licenses.bsd3;
@@ -42031,7 +43065,7 @@ self: {
        pname = "diagrams-svg";
        version = "1.3.1.4";
        sha256 = "009xn6q9qwgi3l4v0rm79309i91m1s0jbng34bbli29s6vzwgjmz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
          monoid-extras mtl old-time optparse-applicative process semigroups
@@ -42048,7 +43082,9 @@ self: {
        pname = "diagrams-tikz";
        version = "0.6";
        sha256 = "1qs4m1xy62pv6gjgip9vx2pwlv2gzjq1h86yiiq15yg4gcbn5fav";
-       buildDepends = [ base diagrams-core diagrams-lib dlist mtl ];
+       libraryHaskellDepends = [
+         base diagrams-core diagrams-lib dlist mtl
+       ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "TikZ backend for diagrams drawing EDSL";
@@ -42064,7 +43100,7 @@ self: {
        sha256 = "1rfx3vh983f3gc6si661zimhjl47ip30l3pvf7dysjirr3gffgz1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec random-fu transformers ];
+       libraryHaskellDepends = [ base parsec random-fu transformers ];
        description = "Simplistic D&D style dice-rolling system";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -42077,8 +43113,10 @@ self: {
        pname = "dice-entropy-conduit";
        version = "1.0.0.1";
        sha256 = "01xwxajwyvv6ac48j9if6xsv05aqg1p02i7d25ivk1k56ky41l1s";
-       buildDepends = [ base bytestring conduit entropy transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring conduit entropy transformers
+       ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "http://monoid.at/code";
@@ -42095,7 +43133,7 @@ self: {
        pname = "dicom";
        version = "0.1.1.0";
        sha256 = "16n6mx95zfg8pa6y2zlj20imssykcrjilas1dh9li4r377rz5sdb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring old-locale pretty safe time
        ];
        jailbreak = true;
@@ -42113,8 +43151,9 @@ self: {
        sha256 = "1wjxcn53h9rp8jancspb9yq4h26215b63pghw802wgh073vp9h0i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec split ];
-       testDepends = [ base hspec parsec ];
+       libraryHaskellDepends = [ base parsec split ];
+       executableHaskellDepends = [ base parsec ];
+       testHaskellDepends = [ base hspec parsec ];
        homepage = "http://github.com/mwotton/dictparser";
        description = "Parsec parsers for the DICT format produced by dictfmt -t";
        license = stdenv.lib.licenses.bsd3;
@@ -42127,7 +43166,7 @@ self: {
        pname = "diet";
        version = "0.0.1";
        sha256 = "0qkyfmys5k6la10dvi8wsmw120xfarjblpkr33xiazll2m9845wh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/tonymorris/diet";
        description = "Discrete Interval Encoding Tree";
        license = stdenv.lib.licenses.bsd3;
@@ -42139,8 +43178,8 @@ self: {
        pname = "diff-parse";
        version = "0.2.1";
        sha256 = "0idwhxwhqd65sy0kfgwi8d942lpabyknwpyq9454y49dnn8k0lam";
-       buildDepends = [ attoparsec base text ];
-       testDepends = [ attoparsec base hspec text ];
+       libraryHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [ attoparsec base hspec text ];
        jailbreak = true;
        description = "A parser for diff file formats";
        license = stdenv.lib.licenses.agpl3;
@@ -42154,8 +43193,8 @@ self: {
        pname = "diff3";
        version = "0.2.0.3";
        sha256 = "0zdfn1jhsq8pd23qpkhzr8wgiwbazfbq688bjnpc406i7gq88k78";
-       buildDepends = [ base Diff ];
-       testDepends = [
+       libraryHaskellDepends = [ base Diff ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "http://github.com/ocharles/diff3.git";
@@ -42169,7 +43208,7 @@ self: {
        pname = "diffarray";
        version = "0.1.1";
        sha256 = "0p95i1xzp0bdm0zrdil79rfxfyz372y2qjdxyvxdzxvfb1mvalcm";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "DiffArray";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42184,7 +43223,7 @@ self: {
        sha256 = "0ggla2i4jw24a3vdq2xyz70asp80s5jl5nkwms6ck4r69zm3mci6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers Diff directory filepath pretty
          process
        ];
@@ -42205,7 +43244,7 @@ self: {
        sha256 = "08z1h3xf3j5xzhf08i9w7hvg05wvqcf13k50chx6av70f0cs2rvh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring cmdargs directory filemanip filepath
          parallel-io process process-extras unix
        ];
@@ -42219,7 +43258,7 @@ self: {
        pname = "digamma";
        version = "0.1";
        sha256 = "0qij2pn107dfb9rl9rrd77l69wmfp9fghv9ysql2d7g5qdr306pd";
-       buildDepends = [ base polynomial ];
+       libraryHaskellDepends = [ base polynomial ];
        jailbreak = true;
        homepage = "https://github.com/bgamari/digamma";
        description = "A robust implementation of the digamma function";
@@ -42232,8 +43271,8 @@ self: {
        pname = "digest";
        version = "0.0.1.2";
        sha256 = "04gy2zp8yzvv7j9bdfvmfzcz3sqyqa6rwslqcn4vyair2vmif5v4";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ zlib ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ zlib ];
        description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) zlib;};
@@ -42244,8 +43283,8 @@ self: {
        pname = "digest-pure";
        version = "0.0.3";
        sha256 = "0rb5jkzn1d4z90hd47qh98mf4n90wvj0cqf3qfpj7ndvw52yy95w";
-       buildDepends = [ array base bytestring ];
-       testDepends = [ array base bytestring digest QuickCheck ];
+       libraryHaskellDepends = [ array base bytestring ];
+       testHaskellDepends = [ array base bytestring digest QuickCheck ];
        homepage = "http://github.com/danieldk/digest-pure";
        description = "Pure hash functions for bytestrings";
        license = "unknown";
@@ -42259,7 +43298,7 @@ self: {
        pname = "digestive-bootstrap";
        version = "0.1.0.0";
        sha256 = "0c1hd3l29sci624r4gwp3ndzmancwdy9dp3gz2fmd4jniani3kzz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-bootstrap blaze-html digestive-functors
          digestive-functors-blaze http-types text
        ];
@@ -42276,7 +43315,7 @@ self: {
        pname = "digestive-foundation-lucid";
        version = "0.0.0.1";
        sha256 = "1gpmmbf5s4kxf9xhbhf086b5n3kkr9ay2qlm6xlnf8cx1l9rn6bi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base digestive-functors digestive-functors-lucid http-types lucid
          lucid-foundation text
        ];
@@ -42294,10 +43333,10 @@ self: {
        pname = "digestive-functors";
        version = "0.8.0.0";
        sha256 = "0wlp4504dpv0diw6ln0j3f3dz3232dgcccyzlck92b27asvl3yq3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl old-locale text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers HUnit mtl old-locale QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time
@@ -42316,11 +43355,11 @@ self: {
        pname = "digestive-functors-aeson";
        version = "1.1.16";
        sha256 = "0v01applw92imi3yr6drd1bqig1l1mlps1ia2i1dcln1sh31ms9y";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers digestive-functors lens lens-aeson safe text
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring digestive-functors HUnit mtl scientific tasty
          tasty-hunit text
        ];
@@ -42337,7 +43376,7 @@ self: {
        pname = "digestive-functors-blaze";
        version = "0.6.0.6";
        sha256 = "1kx8d6w89cs9dr7fpfikv7mf0ql1lz854i492nwm64x3d016q6xi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup digestive-functors text
        ];
        homepage = "http://github.com/jaspervdj/digestive-functors";
@@ -42353,7 +43392,7 @@ self: {
        pname = "digestive-functors-happstack";
        version = "0.6.1.1";
        sha256 = "0d613rxwja327fb2dm79xh55vhpa4mg8c1ch4xzrgw3jcchykag5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring digestive-functors happstack-server text
        ];
        homepage = "http://github.com/jaspervdj/digestive-functors";
@@ -42369,7 +43408,7 @@ self: {
        pname = "digestive-functors-heist";
        version = "0.8.6.2";
        sha256 = "0njdhyrwzvcla65j5za0h4n41f2n1sdnar7glcal343xsy2rl019";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder digestive-functors heist mtl text xmlhtml
        ];
        homepage = "http://github.com/jaspervdj/digestive-functors";
@@ -42383,8 +43422,8 @@ self: {
        pname = "digestive-functors-hsp";
        version = "0.5.0";
        sha256 = "00n1cxkrkd3ayl7pp6pr7nyx6zcwqpsqzflnnnf0f8dabrz4wzdc";
-       buildDepends = [ base digestive-functors hsp hsx text ];
-       buildTools = [ trhsx ];
+       libraryHaskellDepends = [ base digestive-functors hsp hsx text ];
+       libraryToolDepends = [ trhsx ];
        jailbreak = true;
        homepage = "http://src.seereason.com/digestive-functors-hsp";
        description = "HSP support for digestive-functors";
@@ -42398,7 +43437,7 @@ self: {
        pname = "digestive-functors-lucid";
        version = "0.0.0.3";
        sha256 = "1f9vlyh20b4qr7q324mxpkn7wbfp3h80il79rwqd5s5n1xx8ryhm";
-       buildDepends = [ base digestive-functors lucid text ];
+       libraryHaskellDepends = [ base digestive-functors lucid text ];
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Lucid frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
@@ -42412,7 +43451,7 @@ self: {
        pname = "digestive-functors-scotty";
        version = "0.2.0.2";
        sha256 = "0flm1akhx3fj8pli3nz9s7asah7cfm9afz99jx3f4rv7352saclp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring digestive-functors http-types scotty text wai
          wai-extra
        ];
@@ -42429,7 +43468,7 @@ self: {
        pname = "digestive-functors-snap";
        version = "0.6.1.3";
        sha256 = "11ah4rvi5fj9vjjzjw0m60s72qiizy1i4hnj44v88ajf2095aigh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers digestive-functors directory filepath
          mtl snap-core text
        ];
@@ -42446,8 +43485,10 @@ self: {
        pname = "digit";
        version = "0.1.1";
        sha256 = "18l6ca3kgp0g8zmai6jsq6pz7hjilcnyspvz95h9pqklhh2z32qk";
-       buildDepends = [ base lens ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       libraryHaskellDepends = [ base lens ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "https://github.com/NICTA/digit";
        description = "A data-type representing digits 0-9 and other combinations";
        license = stdenv.lib.licenses.bsd3;
@@ -42461,11 +43502,11 @@ self: {
        pname = "digitalocean-kzs";
        version = "0.1.0.3";
        sha256 = "0w1gbh84sbaab4gn9avjqmwd29rzv0b2dyxqqg22vq1da8g3bzng";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring HTTP http-conduit http-types text
          transformers
        ];
-       testDepends = [ base doctest hspec ];
+       testHaskellDepends = [ base doctest hspec ];
        jailbreak = true;
        homepage = "https://github.com/KazumaSATO/digitalocean-kzs";
        description = "digitalocean api for haskell";
@@ -42478,7 +43519,7 @@ self: {
        pname = "digits";
        version = "0.2";
        sha256 = "18s9k7kj0qvd4297msl0k6ziwfb5bl1gwnxlrl8b4rkqda4kf17l";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        description = "Converts integers to lists of digits and back";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42489,7 +43530,7 @@ self: {
        pname = "dimensional";
        version = "0.13.0.2";
        sha256 = "1gi8948q1kxnbc76v05swj0yr58j9lljxak6lyci529ny0ac4qlp";
-       buildDepends = [ base numtype time ];
+       libraryHaskellDepends = [ base numtype time ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Statically checked physical dimensions";
        license = stdenv.lib.licenses.bsd3;
@@ -42501,7 +43542,7 @@ self: {
        pname = "dimensional-tf";
        version = "0.3.0.2";
        sha256 = "1bqd7298y9ymykhi70pqgxwh1599xbq5x4v75mrki5kirh8gqc4x";
-       buildDepends = [ base numtype-tf time ];
+       libraryHaskellDepends = [ base numtype-tf time ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Statically checked physical dimensions, implemented using type families";
        license = stdenv.lib.licenses.bsd3;
@@ -42519,7 +43560,7 @@ self: {
        pname = "dingo-core";
        version = "0.2.0";
        sha256 = "1h0ir5h6nq2c8qk4irbcai87mxgiyahyi2lcxps959zja70pmqf5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-builder blaze-html
          blaze-textual bytestring conduit containers cookie deepseq fclabels
          file-embed hashable http-types random SHA shakespeare-js
@@ -42543,7 +43584,7 @@ self: {
        sha256 = "0mla83bijf077bx16r9rsvbyr8v684j1bfllfw7kswlgyz37rf4b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base blaze-html bytestring dingo-core dingo-widgets fclabels
          shakespeare-js template-haskell text transformers
        ];
@@ -42562,7 +43603,7 @@ self: {
        pname = "dingo-widgets";
        version = "0.2.0";
        sha256 = "1d61l2c6vwpngffr5ynm3zrvn7as9zgsm3zg18ldq958s0mvdn8p";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-html bytestring containers dingo-core fclabels
          file-embed shakespeare-js template-haskell text transformers
          unordered-containers
@@ -42579,8 +43620,8 @@ self: {
        pname = "diophantine";
        version = "0.2.1.0";
        sha256 = "118r59mwvihzqsjd530x4pdnvqjk87b3jjdhx5avq31cfdbiyaj9";
-       buildDepends = [ array base ];
-       buildTools = [ happy ];
+       libraryHaskellDepends = [ array base ];
+       libraryToolDepends = [ happy ];
        homepage = "https://github.com/llllllllll/Math.Diophantine";
        description = "A quadratic diophantine equation solving library";
        license = stdenv.lib.licenses.gpl2;
@@ -42593,7 +43634,7 @@ self: {
        pname = "direct-binary-files";
        version = "1.0";
        sha256 = "0ci6av8sgrlsn12dbpvqf3imq9w1hm2ll5np2fz7gh9760vvdidr";
-       buildDepends = [ base bytestring mtl ];
+       libraryHaskellDepends = [ base bytestring mtl ];
        homepage = "http://ireneknapp.com/software/";
        description = "Serialization and deserialization monads for streams and ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -42606,7 +43647,7 @@ self: {
        pname = "direct-daemonize";
        version = "3.1";
        sha256 = "0698l8zylkgafx8g91icysz6rq2lyrnd25blhday67s9vkdpbvxh";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "http://dankna.com/software/";
        description = "Library to switch to daemon mode using built-in OS facilities";
        license = stdenv.lib.licenses.bsd3;
@@ -42620,7 +43661,7 @@ self: {
        pname = "direct-fastcgi";
        version = "1.0.3";
        sha256 = "049z23gkssk3h8sx9xr3baln3hz5cykf2zp9kzmvbk2n4ky8fs78";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl network utf8-string
        ];
        jailbreak = true;
@@ -42639,7 +43680,7 @@ self: {
        pname = "direct-http";
        version = "0.6";
        sha256 = "0aghfhg0nx2bqi56cw5hnnqxnjbziihn36yqpq12gyhnahwdfvpg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers direct-daemonize lifted-base
          monad-control mtl network old-locale SafeSemaphore time
          transformers-base unix utf8-string
@@ -42657,7 +43698,7 @@ self: {
        pname = "direct-murmur-hash";
        version = "1.0.1";
        sha256 = "09hv06hslz83gpqfxxv6bfg4i6l7pfv82jxab4lf8g964ciaa42q";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://ireneknapp.com/software/";
        description = "An implementation of the MurmurHash3 algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -42669,7 +43710,7 @@ self: {
        pname = "direct-plugins";
        version = "1.1";
        sha256 = "03f7jrx0skqiirvpzzakk3wwwdjanjxpzv8j5nwpzvqpb4syshcr";
-       buildDepends = [ base ghc ghc-paths ];
+       libraryHaskellDepends = [ base ghc ghc-paths ];
        homepage = "http://dankna.com/software/";
        description = "Lightweight replacement for Plugins, specific to GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -42684,8 +43725,8 @@ self: {
        pname = "direct-sqlite";
        version = "2.3.15";
        sha256 = "0hlpc3j4crh9hnydcpp6fmiisq9ddn916bslm46x5q1ajvcw7v12";
-       buildDepends = [ base bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
          base base16-bytestring bytestring directory HUnit text
        ];
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
@@ -42701,7 +43742,7 @@ self: {
        pname = "directed-cubical";
        version = "0.1.2.0";
        sha256 = "0wy6p5nymri7l1ldc6c34b9y4ncmzr2wpidbqjrmacxg07iypn3z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq hashable parallel QuickCheck
          unordered-containers vector
        ];
@@ -42717,8 +43758,8 @@ self: {
        pname = "directory";
        version = "1.2.3.0";
        sha256 = "1511nw0hgy6sg82xfimg8rbbf43vcqn6gw076m96b9zcy1dzijln";
-       buildDepends = [ base filepath time unix ];
-       testDepends = [ base filepath time unix ];
+       libraryHaskellDepends = [ base filepath time unix ];
+       testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42733,12 +43774,12 @@ self: {
        pname = "directory-layout";
        version = "0.7.4.1";
        sha256 = "0hj7dfv5i2s1dk0rws2fg84crpxz1kgvrq68f373a6hwkbfhv89b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring command-qq containers directory filepath free hspec
          lens semigroups template-haskell text transformers unix
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring command-qq containers directory doctest filepath
          free hspec lens semigroups template-haskell temporary text
          transformers unix unordered-containers
@@ -42753,8 +43794,8 @@ self: {
        pname = "directory-tree";
        version = "0.12.0";
        sha256 = "1idknm7fwci91fkwvzl35g0qd0jk1vb00ds2x82zjf2hdbkcc2gz";
-       buildDepends = [ base directory filepath ];
-       testDepends = [ base directory filepath process ];
+       libraryHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [ base directory filepath process ];
        homepage = "http://brandon.si/code/directory-tree-module-released/";
        description = "A simple directory-like tree datatype, with useful IO functions";
        license = stdenv.lib.licenses.bsd3;
@@ -42768,7 +43809,7 @@ self: {
        pname = "dirfiles";
        version = "0.1.0.9";
        sha256 = "0jqavj2s28ffaql3mcgasxa8fg0bv0v6irr2a5334jqydksj0b96";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers hblock safecopy text time
          unordered-containers
        ];
@@ -42784,7 +43825,7 @@ self: {
        pname = "dirstream";
        version = "1.0.0";
        sha256 = "1hxmcc62h21zsy5bgm9m4d4q7vcgps168j2mp365d2wva56r87vw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory pipes pipes-safe system-fileio system-filepath unix
        ];
        description = "Easily stream directory contents in constant memory";
@@ -42797,7 +43838,7 @@ self: {
        pname = "disassembler";
        version = "0.2.0.1";
        sha256 = "1yg1mb9w679m1iml0rx2i6gq1ps8s56da4dvn2knvkgg7m1cr39c";
-       buildDepends = [ array base containers mtl parsec ];
+       libraryHaskellDepends = [ array base containers mtl parsec ];
        homepage = "https://github.com/mgrabmueller/disassembler";
        description = "Disassembler for X86 & AMD64 machine code";
        license = stdenv.lib.licenses.bsd3;
@@ -42809,7 +43850,7 @@ self: {
        pname = "discordian-calendar";
        version = "0.1";
        sha256 = "0ykbfisrb6k8vsqx5avv99j0z4j4615hmql263h12jzhjxfzd22d";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        jailbreak = true;
        homepage = "https://github.com/kallisti-dev/discordian-calendar";
        description = "library for handling Discordian calendar dates";
@@ -42822,8 +43863,8 @@ self: {
        pname = "discount";
        version = "0.1.1";
        sha256 = "1q1lz9dgxp5kq0ngh7pagijmlc616vwrfrb14pjx2vc9s7yvg779";
-       buildDepends = [ base bytestring text ];
-       extraLibraries = [ markdown ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ markdown ];
        homepage = "http://github.com/lightquake/discount";
        description = "Haskell bindings to the discount Markdown library";
        license = stdenv.lib.licenses.mit;
@@ -42838,7 +43879,7 @@ self: {
        pname = "discrete-space-map";
        version = "0.0.4";
        sha256 = "1dci1yk1xpndszwcxshdh6sz6ibzxk6l2726b550xx1wffakpmcq";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base comonad distributive keys semigroupoids
        ];
        homepage = "https://github.com/sjoerdvisscher/discrete-space-map";
@@ -42855,7 +43896,7 @@ self: {
        pname = "discrimination";
        version = "0.1";
        sha256 = "11ddphyjqc1zhsr6l94hyvxmz68sbjfwaasms7ilf55x5h61g3l1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers contravariant deepseq ghc-prim primitive
          profunctors promises semigroups transformers vector void
        ];
@@ -42872,8 +43913,8 @@ self: {
        pname = "disjoint-set";
        version = "0.2";
        sha256 = "05m7liind4fdw5lw8a8381hm6rjzsqz86qzir79y30pj0axayc3z";
-       buildDepends = [ base containers mtl transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers mtl transformers ];
+       testHaskellDepends = [
          base containers HUnit mtl QuickCheck transformers
        ];
        homepage = "https://github.com/maxwellsayles/disjoint-set";
@@ -42888,7 +43929,7 @@ self: {
        pname = "disjoint-sets-st";
        version = "0.1";
        sha256 = "0yy4gp5jhfsj3gbk7gh3yplxkxxfsmrl84chp4wfr4v46ff9pc2m";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://github.com/ppetr/disjoint-sets-st/";
        description = "Imperative ST/IO based disjoint set data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -42899,10 +43940,10 @@ self: {
      mkDerivation {
        pname = "disk-free-space";
        version = "0.1.0.1";
-       revision = "2";
        sha256 = "07rqj8k1vh3cykq9yidpjxhgh1f7vgmjs6y1nv5kq2217ff4yypi";
+       revision = "2";
        editedCabalFile = "60ab6de6ad0e36274c675338a37c8985972a5a64db69dee7b4f88b797c9b401b";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/redneb/disk-free-space";
        description = "Retrieve information about disk space usage";
        license = stdenv.lib.licenses.bsd3;
@@ -42916,7 +43957,7 @@ self: {
        sha256 = "1i9g4jqmmjydcvi07878k6yb5kvxab6dlw3j6nkjdn4mcsc50s71";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath process ];
+       libraryHaskellDepends = [ base Cabal directory filepath process ];
        description = "Generate/Upload cabal package to Hackage";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42932,7 +43973,7 @@ self: {
        pname = "distributed-process";
        version = "0.5.5";
        sha256 = "0w3jwnfc8ca0sx9mshgbxr61pfbnp82ihy3ca5v1pkwz34dqd3f5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static ghc-prim hashable mtl network-transport random
          rank1dynamic stm syb template-haskell time transformers
@@ -42941,7 +43982,6 @@ self: {
        homepage = "http://haskell-distributed.github.com/";
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-async" = callPackage
@@ -42956,12 +43996,12 @@ self: {
        pname = "distributed-process-async";
        version = "0.2.1";
        sha256 = "0g28f2f5b28ra1gnm99yalah6rxqps4yvmi403nb0axw295pbmib";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-extras fingertree hashable mtl stm time
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary deepseq distributed-process
          distributed-process-extras distributed-process-tests HUnit network
          network-transport network-transport-tcp rematch stm test-framework
@@ -42986,7 +44026,7 @@ self: {
        sha256 = "0dc0izlsxzcr5jyiad5yvgs5sp5b6dqwr6gxxkk99p7h1wpd4r2g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          azure-service-api base binary bytestring certificate
          distributed-process distributed-static executable-path filepath
          libssh2 mtl network-transport network-transport-tcp pureMD5
@@ -43012,12 +44052,12 @@ self: {
        pname = "distributed-process-client-server";
        version = "0.1.2";
        sha256 = "0wr0fxdg9114jd180p4lrjkashqcyxv69harj1ww5jc8dxdb3k2s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-async distributed-process-extras fingertree
          hashable mtl stm time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary containers deepseq distributed-process
          distributed-process-async distributed-process-extras
          distributed-process-tests fingertree ghc-prim HUnit mtl network
@@ -43045,13 +44085,13 @@ self: {
        pname = "distributed-process-execution";
        version = "0.1.1";
        sha256 = "1zm4mcicasf59s3zzca2m7hp4ialzmsmn6arjlz2mnrhcpbkg7ja";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
          distributed-process-supervisor fingertree hashable mtl stm time
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-process-extras
          distributed-static fingertree ghc-prim hashable HUnit mtl network
@@ -43079,11 +44119,11 @@ self: {
        pname = "distributed-process-extras";
        version = "0.2.0";
        sha256 = "0l8k1h0nx2pign82ydyzsjbkc8qw3vhhbrdggzfwvr3hamnjpqly";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          fingertree hashable mtl stm time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-process-tests
          distributed-static fingertree ghc-prim hashable HUnit mtl network
@@ -43106,14 +44146,13 @@ self: {
        pname = "distributed-process-monad-control";
        version = "0.5.1";
        sha256 = "01sdzmb8izsycxshhsg0pbx0mgn10y41df1dj1s66ish0qszw07m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base distributed-process monad-control transformers
          transformers-base
        ];
        homepage = "http://haskell-distributed.github.io";
        description = "Orphan instances for MonadBase and MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-p2p" = callPackage
@@ -43127,14 +44166,14 @@ self: {
        sha256 = "13m283cwlas0xzqxlrmnwmwimwy29hbvymavyqffd1b0k2m6ag31";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers distributed-process mtl network
          network-transport network-transport-tcp
        ];
+       executableHaskellDepends = [ base distributed-process mtl ];
        homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/";
        description = "Peer-to-peer node discovery for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-platform" = callPackage
@@ -43152,11 +44191,11 @@ self: {
        sha256 = "0bxfynvqkzvah7gbg74yzwpma8j32bamnyysj6dk39da0v880abm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          fingertree hashable mtl stm time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-static fingertree ghc-prim
          hashable HUnit mtl network network-transport network-transport-tcp
@@ -43184,13 +44223,13 @@ self: {
        pname = "distributed-process-registry";
        version = "0.1.0";
        sha256 = "0c2a5x70sfii053b11xfj2x7199vmmn1k759zylbd5qs129q7hw2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
          distributed-process-supervisor fingertree hashable mtl stm time
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-process-extras
          distributed-process-tests distributed-static fingertree hashable
@@ -43216,7 +44255,7 @@ self: {
        sha256 = "01871r4cj5zwcv63m95i622h0xxfjnflj33wvpxv1ii5z265rkjy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers data-accessor distributed-process
          network network-multicast network-transport network-transport-tcp
          transformers
@@ -43224,7 +44263,6 @@ self: {
        homepage = "http://haskell-distributed.github.com";
        description = "Simple zero-configuration backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-supervisor" = callPackage
@@ -43240,12 +44278,12 @@ self: {
        pname = "distributed-process-supervisor";
        version = "0.1.2";
        sha256 = "1b2rskzjimb2s8xrz4iv4q3c10njjnycxy5bcy159m6hawz1hzj1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
          fingertree hashable mtl stm time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-process-client-server
          distributed-process-extras distributed-static fingertree ghc-prim
@@ -43274,13 +44312,13 @@ self: {
        pname = "distributed-process-task";
        version = "0.1.1";
        sha256 = "04w1nhca59i6bzmwfi80mryf5pcsn0zmswq3s3ksqc6wy4mfzy1m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-async distributed-process-client-server
          distributed-process-extras fingertree hashable mtl stm time
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
          deepseq distributed-process distributed-process-async
          distributed-process-client-server distributed-process-extras
@@ -43306,12 +44344,12 @@ self: {
        pname = "distributed-process-tests";
        version = "0.4.1";
        sha256 = "1jjj77pw39bbbf58j61hdcpr872ncd1k1z2ly75n96gklw9aikbb";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base binary bytestring distributed-process
          distributed-static HUnit network network-transport random rematch
          test-framework test-framework-hunit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base network network-transport network-transport-tcp test-framework
        ];
        jailbreak = true;
@@ -43333,11 +44371,12 @@ self: {
        sha256 = "1v8jm5i4kjds7xcmzrhxg9lcz49l9ip7mm8gwjz3f3lgdxm2ykxi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq distributed-process hzk
          mtl network network-transport network-transport-tcp transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base distributed-process ];
+       testHaskellDepends = [
          base bytestring deepseq distributed-process
          distributed-process-monad-control enclosed-exceptions hspec hzk
          lifted-base monad-control network network-transport
@@ -43358,13 +44397,12 @@ self: {
        pname = "distributed-static";
        version = "0.3.2.0";
        sha256 = "1zz18lgf39i8anw17qxacb6cicm1kq0yayx9a4inxpnch5xfvg4m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq rank1dynamic
        ];
        homepage = "http://haskell-distributed.github.com";
        description = "Compositional, type-safe, polymorphic static values and closures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distribution" = callPackage
@@ -43373,7 +44411,9 @@ self: {
        pname = "distribution";
        version = "1.0.0.0";
        sha256 = "0zh9ap3hhylpk7bsp54hm9gj5x8f8zvm5sg7nydmxnigyq0b3l4y";
-       buildDepends = [ array base containers MonadRandom random ];
+       libraryHaskellDepends = [
+         array base containers MonadRandom random
+       ];
        jailbreak = true;
        homepage = "https://github.com/redelmann/haskell-distribution";
        description = "Finite discrete probability distributions";
@@ -43389,7 +44429,7 @@ self: {
        pname = "distribution-plot";
        version = "1.0.0.0";
        sha256 = "16k57dxg79x3i7j62ln063j4g4v4n5x80b12pajjrpxrmaffy79n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Chart Chart-cairo colour containers data-default-class
          distribution lens
        ];
@@ -43408,10 +44448,10 @@ self: {
        pname = "distributive";
        version = "0.4.4";
        sha256 = "0s2ln9jv7bh4ri2y31178pvjl8x6nik5d0klx7j2b77yjlsgblc2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ghc-prim tagged transformers transformers-compat
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/ekmett/distributive/";
        description = "Distributive functors -- Dual to Traversable";
        license = stdenv.lib.licenses.bsd3;
@@ -43428,9 +44468,12 @@ self: {
        sha256 = "04zmqsdpplps0xnhndpvfhxq2mfhnxbj1nzspw28ky7pcps1w621";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-ordlist fasta math-functions MonadRandom
-         optparse-applicative parsec pipes random-shuffle scientific split
+         parsec random-shuffle scientific split
+       ];
+       executableHaskellDepends = [
+         base containers fasta optparse-applicative pipes
        ];
        jailbreak = true;
        homepage = "https://github.com/GregorySchwartz/diversity";
@@ -43446,7 +44489,9 @@ self: {
        sha256 = "1p9dvzb83nlrq8h4brdq5l9dm2zf28rjhsmi7nwmac79p5pk9y2g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers haskeline mtl pretty ];
+       executableHaskellDepends = [
+         array base containers haskeline mtl pretty
+       ];
        description = "Generate Haskell code from a type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -43459,7 +44504,7 @@ self: {
        pname = "djinn-ghc";
        version = "0.0.2.3";
        sha256 = "190llfn8dvxkdan806nybn3d4psmnr1126zg8lmk8p5wd7nnm5fb";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base containers djinn-lib ghc mtl transformers
        ];
        description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
@@ -43472,7 +44517,7 @@ self: {
        pname = "djinn-lib";
        version = "0.0.1.2";
        sha256 = "048hs27awl4j9lg04qbnpf8c51mzbgy2afckis19zcswmavi1zn0";
-       buildDepends = [ base containers mtl pretty ];
+       libraryHaskellDepends = [ base containers mtl pretty ];
        homepage = "http://www.augustsson.net/Darcs/Djinn/";
        description = "Generate Haskell code from a type. Library extracted from djinn package.";
        license = stdenv.lib.licenses.bsd3;
@@ -43484,7 +44529,9 @@ self: {
        pname = "djinn-th";
        version = "0.0.1";
        sha256 = "089b6z8hcv6q9y77zy8m96lc00r1ckzmff0mybp9l1akj7gwdpix";
-       buildDepends = [ base containers logict template-haskell ];
+       libraryHaskellDepends = [
+         base containers logict template-haskell
+       ];
        jailbreak = true;
        homepage = "http://gitorious.org/djinn-th";
        description = "Generate executable Haskell code from a type";
@@ -43498,8 +44545,8 @@ self: {
        pname = "dlist";
        version = "0.7.1.1";
        sha256 = "1zayvxvkan2s2ixajdr3f5rn1gzhprzv6cww4cbpwjhzw0l7zc08";
-       buildDepends = [ base deepseq ];
-       testDepends = [ base Cabal QuickCheck ];
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/spl/dlist";
        description = "Difference lists";
        license = stdenv.lib.licenses.bsd3;
@@ -43511,7 +44558,7 @@ self: {
        pname = "dlist-instances";
        version = "0.1";
        sha256 = "0r1j7djywqd7c224wc9ixkplj3m2mbf9k3ra7n92ja2kfpksm615";
-       buildDepends = [ base dlist semigroups ];
+       libraryHaskellDepends = [ base dlist semigroups ];
        homepage = "https://github.com/gregwebs/dlist-instances";
        description = "Difference lists instances";
        license = stdenv.lib.licenses.bsd3;
@@ -43526,11 +44573,11 @@ self: {
        pname = "dns";
        version = "2.0.0";
        sha256 = "1jq12jdidgz9nrcpnr362n6rwvxywd5v7j4fi18bqaq2f67ybjay";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary blaze-builder bytestring conduit
          conduit-extra containers iproute mtl network random resourcet
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base binary blaze-builder bytestring conduit
          conduit-extra containers doctest hspec iproute mtl network random
          resourcet word8
@@ -43550,9 +44597,10 @@ self: {
        sha256 = "0bwpfw7fsis0sqnqrgw13ifla17mcm2xk9b9jagjjqmim66d6zxb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers contstuff dns iproute time
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        description = "Caching DNS resolver library and mass DNS resolver utility";
        license = stdenv.lib.licenses.bsd3;
@@ -43565,7 +44613,7 @@ self: {
        pname = "dnsrbl";
        version = "0.0.3";
        sha256 = "07xq52aqqmzq1f68m8spr7fyax0cqnpv9mh5m4x3klxm0iznv9xm";
-       buildDepends = [ base containers hsdns HUnit network ];
+       libraryHaskellDepends = [ base containers hsdns HUnit network ];
        homepage = "http://www.pigscanfly.ca/~holden/dnsrbl/";
        description = "Asynchronous DNS RBL lookup";
        license = stdenv.lib.licenses.bsd3;
@@ -43577,8 +44625,8 @@ self: {
        pname = "dnssd";
        version = "0.1.0.0";
        sha256 = "0gfyyr1wcxni0r0r9df6lkmv6gvi0qvwclwi9majzg10pas6dk2n";
-       buildDepends = [ base transformers ];
-       extraLibraries = [ dns_sd ];
+       libraryHaskellDepends = [ base transformers ];
+       librarySystemDepends = [ dns_sd ];
        jailbreak = true;
        homepage = "https://github.com/maxpow4h/dnssd";
        description = "DNS service discovery bindings";
@@ -43599,7 +44647,7 @@ self: {
        sha256 = "0009gpm6hgjr78bsp0cd4skvhbms83j4j9axf6zns7pnfqvc6inf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base64-bytestring binary bytestring containers directory feed
          filepath haskell98 heist hexpat json MonadCatchIO-transformers
          MonadRandom monads-fd network old-locale snap-core snap-server
@@ -43623,7 +44671,7 @@ self: {
        sha256 = "055jns09s50iyzgk9m9d7gbxvnmgd4wxfb5axsxra8qnlfq331lb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base directory directory-tree filepath ghc ghc-paths
          text
        ];
@@ -43643,7 +44691,7 @@ self: {
        sha256 = "0020pi4m0n6cvb6hdzhai5f9jidwc8dy6qq3pjs6g4dwql9igsb8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory filepath html MissingH mtl
          old-locale tagsoup time
        ];
@@ -43663,11 +44711,11 @@ self: {
        pname = "docker";
        version = "0.2.0.2";
        sha256 = "0iv36j8ixjbxlwbpw426lj5z39kwd3mrpb5qqw7c2nxkfp2dr0gi";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-default lens lens-aeson
          network-uri pipes pipes-bytestring pipes-http pipes-text text wreq
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers data-default http-types lens
          lens-aeson pipes pipes-bytestring pipes-http pipes-text process
          QuickCheck tasty tasty-hunit tasty-quickcheck text wreq
@@ -43693,15 +44741,18 @@ self: {
        sha256 = "0gsaw0qbbd3a017w82hwvmrv0ygxki2c8ls3b6hfc38a17ja68vc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring conduit
          conduit-combinators conduit-extra cryptohash directory filepath
-         hashable hslogger lens monad-logger mtl optparse-applicative
-         persistent-sqlite persistent-template process regex-compat
-         resourcet retry stm streaming-commons system-filepath temporary
-         text time transformers unix unordered-containers vector wreq
+         hashable hslogger lens monad-logger mtl persistent-sqlite
+         persistent-template process regex-compat resourcet retry stm
+         streaming-commons system-filepath temporary text time transformers
+         unix unordered-containers vector wreq
        ];
-       testDepends = [ base HTF text vector ];
+       executableHaskellDepends = [
+         base directory filepath hslogger optparse-applicative process
+       ];
+       testHaskellDepends = [ base HTF text vector ];
        jailbreak = true;
        homepage = "https://github.com/factisresearch/dockercook";
        description = "A build tool for multiple docker image layers";
@@ -43715,8 +44766,8 @@ self: {
        pname = "dockerfile";
        version = "0.1.0.1";
        sha256 = "0980w0fh5xb7azknnmph6rmnzswsjw360ga5ymds2valq2vc0ji9";
-       buildDepends = [ base ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        description = "A simple DSL for describing and generating Dockerfile containers in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -43729,8 +44780,10 @@ self: {
        pname = "docopt";
        version = "0.7.0.2";
        sha256 = "0c62lz0xmrd3ycnpmw254jbc5s999nb0xzrrkbv3cj3n9zzcyzak";
-       buildDepends = [ base containers parsec template-haskell th-lift ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers parsec template-haskell th-lift
+       ];
+       testHaskellDepends = [
          aeson ansi-terminal base bytestring containers parsec split
        ];
        homepage = "https://github.com/docopt/docopt.hs";
@@ -43749,11 +44802,12 @@ self: {
        sha256 = "1jbyhzbi2hfrfg7vbkpj6vriaap8cn99nnmzwcfscwaijz09jyrm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq directory filepath ghc ghc-paths process syb
          transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base base-compat deepseq directory filepath ghc ghc-paths hspec
          HUnit process QuickCheck setenv silently stringbuilder syb
          transformers
@@ -43773,10 +44827,13 @@ self: {
        sha256 = "1rgk831yf4gamb4m10bbcc2r4hhdh4ffjjr80smkfs95x3pi15d3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring directory doctest filepath
        ];
-       testDepends = [ base doctest ];
+       executableHaskellDepends = [
+         aeson base bytestring directory doctest filepath
+       ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        homepage = "http://github.com/karun012/doctest-discover";
        description = "Easy way to run doctests via cabal";
@@ -43791,15 +44848,18 @@ self: {
      mkDerivation {
        pname = "doctest-discover-configurator";
        version = "0.1.0.6";
-       revision = "1";
        sha256 = "1n2x8rp67ddifyahxcny0k7r514qa82lbxg13z7yg2kvmrfip7r8";
+       revision = "1";
        editedCabalFile = "79f62a00ff10acba4f850730ed2ffe99d5637bdfdb48f6fc4b92f03fbbb20a45";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring configurator directory doctest filepath
        ];
-       testDepends = [ base doctest ];
+       executableHaskellDepends = [
+         base bytestring configurator directory doctest filepath
+       ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        homepage = "http://github.com/relrod/doctest-discover-noaeson";
        description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)";
@@ -43813,8 +44873,8 @@ self: {
        pname = "doctest-prop";
        version = "0.2.0.1";
        sha256 = "1amfsq53s0bgal77g7hbsvbn1vlqh1jc3qvcjwv0achc6z65dc2a";
-       buildDepends = [ base HUnit QuickCheck ];
-       testDepends = [ base doctest HUnit QuickCheck ];
+       libraryHaskellDepends = [ base HUnit QuickCheck ];
+       testHaskellDepends = [ base doctest HUnit QuickCheck ];
        description = "Allow QuickCheck-style property testing within doctest";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -43825,7 +44885,7 @@ self: {
        pname = "dom-lt";
        version = "0.1.3";
        sha256 = "0i51d8d49jpf7mhl6c2a4565d4vmh0x5f4kam46hn5ahb1v2nrga";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        description = "The Lengauer-Tarjan graph dominators algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -43838,11 +44898,11 @@ self: {
        pname = "dom-selector";
        version = "0.2.0.1";
        sha256 = "1nm3r79k4is5lh5fna4v710vhb0n5hpp3d21r0w6hmqizhdrkb22";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html containers html-conduit parsec QuickCheck
          template-haskell text th-lift xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-html containers html-conduit parsec QuickCheck
          template-haskell text th-lift xml-conduit
        ];
@@ -43859,7 +44919,7 @@ self: {
        pname = "domain-auth";
        version = "0.2.1";
        sha256 = "1b1kw4pkm1f5z5qwyfpppk5rjqzi4i7b2vx4zmb2cd9398dnkj4a";
-       buildDepends = [
+       libraryHaskellDepends = [
          appar base binary blaze-builder bytestring containers
          crypto-pubkey-types dns iproute network RSA SHA
        ];
@@ -43877,10 +44937,13 @@ self: {
        sha256 = "13ypa09adkj7yilyxxf84rkpap5h4mmx4pwvc4x6121j77xz29dy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base hscolour lens mtl random random-extras random-fu transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base hscolour lens mtl random random-extras random-fu transformers
+       ];
+       testHaskellDepends = [
          base hscolour hspec lens mtl random random-extras random-fu
          transformers
        ];
@@ -43888,7 +44951,6 @@ self: {
        homepage = "http://github.com/egonschiele/dominion";
        description = "A simulator for the board game Dominion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "domplate" = callPackage
@@ -43899,7 +44961,7 @@ self: {
        pname = "domplate";
        version = "0.1.0.1";
        sha256 = "1njzjxz7mymjfismmv8rxkqb24m0gindbsiszbjgy1wm1lwrspb4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers tagsoup text unordered-containers vector
          yaml
        ];
@@ -43916,7 +44978,7 @@ self: {
        sha256 = "1fwfwp24fdgir0m721c801xi8gkhz2y8s1r1gxdp7m1vl5d0xqii";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers graphviz hxt text ];
+       executableHaskellDepends = [ base containers graphviz hxt text ];
        homepage = "http://redmine.iportnov.ru/projects/dot2graphml";
        description = "Converter from GraphViz .dot format to yEd GraphML";
        license = stdenv.lib.licenses.bsd3;
@@ -43932,10 +44994,13 @@ self: {
        sha256 = "1hrr8w5hi6l8v85cwq5r6175al6waj0hmfkvnx8xib2rpby47px6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base base-compat parsec ];
+       executableHaskellDepends = [
          base base-compat optparse-applicative parsec process
        ];
-       testDepends = [ base base-compat hspec parsec parseerror-eq ];
+       testHaskellDepends = [
+         base base-compat hspec parsec parseerror-eq
+       ];
        homepage = "https://github.com/stackbuilders/dotenv-hs";
        description = "Loads environment variables from dotenv files";
        license = stdenv.lib.licenses.mit;
@@ -43953,12 +45018,16 @@ self: {
        sha256 = "0hj21rvjbn8hmb3kf4225ir57j75d8jyzhw2rw8kmjxw3w62l49f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath haskell-src HFuse
          HUnit parsec process QuickCheck template-haskell test-framework
          test-framework-hunit test-framework-quickcheck2 transformers unix
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring containers directory filepath HFuse parsec process
+         transformers unix
+       ];
+       testHaskellDepends = [
          base containers haskell-src HUnit parsec QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
@@ -43976,7 +45045,8 @@ self: {
        sha256 = "148q93qsmqgr5pzdwvpjqfd6bdm1pwzcp2rblfwswx2x8c5f43fg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/ku-fpg/dotgen";
        description = "A simple interface for building .dot graph files.";
        license = stdenv.lib.licenses.bsd3;
@@ -43990,8 +45060,10 @@ self: {
        pname = "double-conversion";
        version = "2.0.1.0";
        sha256 = "034ji9jgf3jl0n5pp1nki3lsg173c3b9vniwnwp1q21iasqbawh0";
-       buildDepends = [ base bytestring ghc-prim integer-gmp text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring ghc-prim integer-gmp text
+       ];
+       testHaskellDepends = [
          base bytestring test-framework test-framework-quickcheck2 text
        ];
        homepage = "https://github.com/bos/double-conversion";
@@ -44005,7 +45077,7 @@ self: {
        pname = "dove";
        version = "0.0.0";
        sha256 = "19h3inxxxcblsbakm93mblhg8g68qc699c13cnska65ij50h3jwd";
-       buildDepends = [ acl2 base ];
+       libraryHaskellDepends = [ acl2 base ];
        description = "The Dove verification language";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44020,12 +45092,11 @@ self: {
        sha256 = "15vlydfw0yw49jha90zcxynwajnyxhqn32x9w7n58k3j0rkcrp9l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base directory elerea GLFW mersenne-random OpenGL
        ];
        description = "Dungeons of Wor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "download" = callPackage
@@ -44034,7 +45105,7 @@ self: {
        pname = "download";
        version = "0.3.2";
        sha256 = "0nhbfq8q9ckc5fnlg54l361p2jhkag9cz11v07kj9f1kwkm4d7w3";
-       buildDepends = [ base bytestring feed tagsoup xml ];
+       libraryHaskellDepends = [ base bytestring feed tagsoup xml ];
        homepage = "http://code.haskell.org/~dons/code/download";
        description = "High-level file download based on URLs";
        license = stdenv.lib.licenses.bsd3;
@@ -44047,7 +45118,7 @@ self: {
        pname = "download-curl";
        version = "0.1.4";
        sha256 = "1wf3pf2k4i6jvpfsjlxdj6v53qd33jj1z1ipaf3p47glgx4xw3lm";
-       buildDepends = [ base bytestring curl feed tagsoup xml ];
+       libraryHaskellDepends = [ base bytestring curl feed tagsoup xml ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~dons/code/download-curl";
        description = "High-level file download based on URLs";
@@ -44064,7 +45135,7 @@ self: {
        sha256 = "1bj4310j3s26xd4ic6hm284dlk91npwilfbwvrk1zz8fas6yr6z6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring filepath http-enumerator tagsoup text
        ];
        jailbreak = true;
@@ -44080,7 +45151,7 @@ self: {
        pname = "dozenal";
        version = "0.1.0.0";
        sha256 = "0sqvxyj3aybqvjlrz2a93lnp1vbjiqikysm575wizri2rd3vfj1l";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/siddhanathan/dozenal";
        description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers";
@@ -44095,10 +45166,10 @@ self: {
      mkDerivation {
        pname = "dozens";
        version = "0.1.1";
-       revision = "1";
        sha256 = "1hvsdc69ag4x8rp2pzr3cxjfbl4fh9bdj4bwlkfvpr755qdi45ky";
+       revision = "1";
        editedCabalFile = "08e6297d7be6ec753261aa5cb8f265a6ba6c369f44d25f46f9784ae1d8a88e52";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default-class http-client http-types
          reflection scientific text transformers
        ];
@@ -44114,7 +45185,9 @@ self: {
        pname = "dph-base";
        version = "0.7.0.1";
        sha256 = "19rc0h94lgxyndaw41wgnc0prwffl780i6nqsn9b7byvgy97f15y";
-       buildDepends = [ array base ghc-prim pretty random vector ];
+       libraryHaskellDepends = [
+         array base ghc-prim pretty random vector
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell common config and debugging functions";
@@ -44131,7 +45204,7 @@ self: {
        sha256 = "1qbj8hsgpmcx95qsqycb6cnfb5vfk9h3w1jyq4k02hf9g7gyvckz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers dph-base dph-lifted-vseg dph-prim-par HUnit
          old-time parseargs random vector
        ];
@@ -44150,7 +45223,7 @@ self: {
        pname = "dph-lifted-base";
        version = "0.7.0.1";
        sha256 = "1gp3l9bgpmly3h74hyfxi3yfm8v4r918800ca64q1b16019hk20k";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers dph-base dph-prim-par ghc pretty random
          template-haskell vector
        ];
@@ -44169,7 +45242,7 @@ self: {
        pname = "dph-lifted-copy";
        version = "0.7.0.1";
        sha256 = "11aaiarvrm5463b77r2jimw78pr39g8apjk7bim3d8rl3ija775q";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base dph-base dph-prim-par ghc random template-haskell vector
        ];
        jailbreak = true;
@@ -44187,7 +45260,7 @@ self: {
        pname = "dph-lifted-vseg";
        version = "0.7.0.1";
        sha256 = "0vkq7kyd65znzqxh32ql2lrm30vg1wy85bnjg8g08s9q9j3j6a45";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers dph-base dph-lifted-base dph-prim-par ghc
          pretty random template-haskell vector
        ];
@@ -44216,7 +45289,7 @@ self: {
        pname = "dph-prim-interface";
        version = "0.7.0.1";
        sha256 = "17m03gylc61d7mx26rz70kwmi014rv1g14683vraa1b77pci5h8j";
-       buildDepends = [ base dph-base random vector ];
+       libraryHaskellDepends = [ base dph-base random vector ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell segmented arrays. (abstract interface)";
@@ -44231,7 +45304,7 @@ self: {
        pname = "dph-prim-par";
        version = "0.7.0.1";
        sha256 = "13x7ribvcm965pnzissj0cwk17r5f0ag1zs7w31za17kal3r91pp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base dph-base dph-prim-interface dph-prim-seq old-time random
          vector
        ];
@@ -44250,7 +45323,7 @@ self: {
        pname = "dph-prim-seq";
        version = "0.7.0.1";
        sha256 = "1fz95qzvk2f7zg8am73vdbk14ms420vfvapz79piip0s4bv8cnqr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base dph-base dph-prim-interface ghc-prim primitive random vector
        ];
        jailbreak = true;
@@ -44272,20 +45345,23 @@ self: {
      }) {};
 
   "dpkg" = callPackage
-    ({ mkDerivation, base, bindings-DSL, bytestring, HUnit, libdpkg
-     , monad-loops
+    ({ mkDerivation, base, bindings-DSL, bytestring, dpkg, HUnit
+     , libdpkg, monad-loops
      }:
      mkDerivation {
        pname = "dpkg";
        version = "0.0.3";
        sha256 = "1bqrj1vqqjnv3qcs1s7lbwyzry95fzxrhi6340zqv0ibvyqnaz5k";
-       buildDepends = [ base bindings-DSL bytestring monad-loops ];
-       testDepends = [ base bytestring HUnit libdpkg ];
-       pkgconfigDepends = [ libdpkg ];
+       libraryHaskellDepends = [
+         base bindings-DSL bytestring monad-loops
+       ];
+       libraryPkgconfigDepends = [ libdpkg ];
+       testHaskellDepends = [ base bytestring HUnit ];
+       testSystemDepends = [ dpkg ];
+       testPkgconfigDepends = [ libdpkg ];
        description = "libdpkg bindings";
        license = stdenv.lib.licenses.gpl3;
-       broken = true;
-     }) { libdpkg = null;};
+     }) { inherit (pkgs) dpkg;  libdpkg = null;};
 
   "drClickOn" = callPackage
     ({ mkDerivation, base, containers }:
@@ -44293,7 +45369,7 @@ self: {
        pname = "drClickOn";
        version = "0.1";
        sha256 = "10rcmqa2x5xlh5pqfsg9dagf2lmrwc2bby3zklzv3x4s3yqg2ar3";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/cwi-swat/monadic-frp";
        description = "Monadic FRP";
        license = stdenv.lib.licenses.publicDomain;
@@ -44305,13 +45381,14 @@ self: {
      mkDerivation {
        pname = "draw-poker";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "16b17qfj3bah468hqsksk2rhyl33m2vyqw0rrs1wyaz75yq35257";
+       revision = "1";
        editedCabalFile = "62a11039e0b634f0b372c28d87f6fe84f40a33981211c9f2bc077135abcef629";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base random-shuffle safe ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base random-shuffle safe ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://tune.hateblo.jp/entry/2015/05/12/023112";
        description = "playing draw poker";
        license = stdenv.lib.licenses.bsd3;
@@ -44325,8 +45402,8 @@ self: {
        sha256 = "08zmy1r1qj7adhsp4z0mr7h0qvc9gaziacjqfl0629n5x2i7zddr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
-       testDepends = [ base containers hspec QuickCheck ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
        homepage = "https://github.com/yamadapc/haskell-drawille";
        description = "A port of asciimoo's drawille to haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -44338,7 +45415,9 @@ self: {
        pname = "drifter";
        version = "0.1.0.1";
        sha256 = "1ldqlkxkshg4i1iqvjzq01cz9mxhyaszhybhq4kngd0rig3n1qhq";
-       buildDepends = [ base bytestring postgresql-simple text time ];
+       libraryHaskellDepends = [
+         base bytestring postgresql-simple text time
+       ];
        jailbreak = true;
        homepage = "https://github.com/AndrewRademacher/drifter";
        description = "Simple schema management for arbitrary databases";
@@ -44356,7 +45435,7 @@ self: {
        pname = "dropbox-sdk";
        version = "0.3.1";
        sha256 = "1s0aki1ayjickkkwmn1mc38gnd257v24wy6yj9p05qm2g8gm7xy2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive certificate conduit
          HTTP http-conduit http-types json monad-control network old-locale
          pem resourcet template-haskell time tls tls-extra transformers
@@ -44379,7 +45458,7 @@ self: {
        sha256 = "1nrvrcf51jdy5vhqbnrllb3y5rgrhg1qwsd05z24s38ra40whbgp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath haskell98 process regex-posix
          time
        ];
@@ -44397,8 +45476,8 @@ self: {
        pname = "ds-kanren";
        version = "0.2.0.1";
        sha256 = "14sgqd55jnqahp0mi4x46a5903bnj2f2crlfrkyg9qds73wjj7fk";
-       buildDepends = [ base containers logict ];
-       testDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base containers logict ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A subset of the miniKanren language";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44417,16 +45496,18 @@ self: {
        sha256 = "00r1wbgbkpnza1jjd14vqr4hwgfkhnz7yivkx4bla5frfdlv5q58";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson algebra-dag algebra-sql base bytestring bytestring-lexing
-         containers Decimal DSH either HDBC HDBC-odbc HUnit mtl process
-         QuickCheck random semigroups set-monad template-haskell
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-         vector
+         containers Decimal DSH either HDBC HDBC-odbc mtl process random
+         semigroups set-monad template-haskell text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring bytestring-lexing containers DSH HDBC HDBC-odbc
+         HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 text vector
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dsmc" = callPackage
@@ -44438,7 +45519,7 @@ self: {
        pname = "dsmc";
        version = "0.1.0.1";
        sha256 = "0va22bx3fj80rl03mv3pnwvsdjkax41pp8qxyj3yiicbyi6zzaa5";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers entropy hslogger mwc-random
          parallel primitive repa strict transformers vector
        ];
@@ -44458,7 +45539,7 @@ self: {
        sha256 = "0wry1dwcf3dwd780aic3v6jlrdjplrsciw1rr582a78c7anasjr0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs ConfigFile dsmc gloss gloss-raster hslogger
          mtl repa strict transformers vector
        ];
@@ -44474,7 +45555,7 @@ self: {
        pname = "dson";
        version = "0.3.0.0";
        sha256 = "15pqja0q1lram7xi5xk8dlcfg5m1z0l4zscqw24wm50hmqpxi09d";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        jailbreak = true;
        homepage = "https://github.com/lcycon/hs-dson";
        description = "Haskell DogeScript Object Notation Parser";
@@ -44487,7 +45568,7 @@ self: {
        pname = "dson-parsec";
        version = "0.4.1.1";
        sha256 = "1zflz9vhcz7psssn6hrizmwdmrvpagxhl0648k6f1n9xj50kp99y";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        jailbreak = true;
        homepage = "https://github.com/alvare/dson-parsec";
        description = "DSON parser";
@@ -44502,7 +45583,8 @@ self: {
        sha256 = "1h7y3b2gwbkq97lv6f9a4zssyqs422g5zj2bi9mq1a5fzy5i4v4v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base random ];
+       libraryHaskellDepends = [ array base random ];
+       executableHaskellDepends = [ array base ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/DSP";
        description = "Haskell Digital Signal Processing";
@@ -44516,7 +45598,7 @@ self: {
        pname = "dstring";
        version = "0.4.0.4";
        sha256 = "15zy1dhfs87hxq1qm54ym0pdhvg7l76m7vy5y06dnksb1sblhaqm";
-       buildDepends = [ base base-unicode-symbols dlist ];
+       libraryHaskellDepends = [ base base-unicode-symbols dlist ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/dstring";
        description = "Difference strings";
@@ -44531,15 +45613,16 @@ self: {
      mkDerivation {
        pname = "dtab";
        version = "1.0";
-       revision = "2";
        sha256 = "1zx5kpljjxyzbsg0hg8ml8mig1s9hggm2nlqmbfbxmldxh3pq1j3";
+       revision = "2";
        editedCabalFile = "50fe31cffb6f7eab4428bf547fd0c7e7804a0f20c604692a18b213d4a54a0a7a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers data-binary-ieee754 pretty
          transformers
        ];
+       executableHaskellDepends = [ base bytestring ];
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44555,7 +45638,7 @@ self: {
        pname = "dtd";
        version = "1.1.0.2";
        sha256 = "11sqmsxw36rn2xkccr7zrmpzijpc3j0z1cxsjcfncnj3l5iaqryp";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-conduit base blaze-builder conduit containers
          lifted-base monad-control network resourcet text transformers
          uri-conduit xml-catalog xml-conduit xml-types
@@ -44575,7 +45658,7 @@ self: {
        pname = "dtd-text";
        version = "0.1.2.0";
        sha256 = "1czygz52aparm4qbkfsskm9qd5wirdpccjn66nh7d62d440j1as8";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base containers dtd-types text xml-types
        ];
        homepage = "http://github.com/m15k/hs-dtd-text";
@@ -44590,7 +45673,7 @@ self: {
        pname = "dtd-types";
        version = "0.3.0.1";
        sha256 = "1w2ni9b8kn242grdqb4wxvgxqpkpp9qy66d57n33l5jghlg8b0s7";
-       buildDepends = [ base text xml-types ];
+       libraryHaskellDepends = [ base text xml-types ];
        homepage = "http://projects.haskell.org/dtd/";
        description = "Basic types for representing XML DTDs";
        license = stdenv.lib.licenses.bsd3;
@@ -44605,7 +45688,7 @@ self: {
        sha256 = "0qszlhll0cx0clydypg0r0g00v8ig1aasqp1ga0jnbfr7q7rwfrr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell interface to the DTrace system tracing utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44618,8 +45701,8 @@ self: {
        pname = "dtw";
        version = "1.0.1.0";
        sha256 = "15qk8r958pssgwqhxffw45vm5bpvv9wfarv9spaplrnb3sm5bzhk";
-       buildDepends = [ base containers vector vector-space ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers vector vector-space ];
+       testHaskellDepends = [
          base containers QuickCheck test-framework
          test-framework-quickcheck2 thyme vector vector-space
        ];
@@ -44635,7 +45718,7 @@ self: {
        pname = "dual-tree";
        version = "0.2.0.6";
        sha256 = "0zdmycfr7b2gf63r2w48ylhcywphz9v3z79im33q1wb7p7pjiacv";
-       buildDepends = [ base monoid-extras newtype semigroups ];
+       libraryHaskellDepends = [ base monoid-extras newtype semigroups ];
        description = "Rose trees with cached and accumulating monoidal annotations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44648,11 +45731,11 @@ self: {
        pname = "dump";
        version = "0.2.8";
        sha256 = "0p0wwcxm2lgfbx82s226dprd8qa526pnrnpakxmdz5svd6ib0gh4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta interpolatedstring-perl6 template-haskell
          text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base haskell-src-meta hspec interpolatedstring-perl6 QuickCheck
          template-haskell text
        ];
@@ -44676,14 +45759,21 @@ self: {
        sha256 = "1k63904aly7qwx96vqys0yx4amys8y5dl9xb9hp4x7ymw0b6h43i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty ansi-terminal base base64-bytestring bytestring
-         containers directory executable-path filepath fsnotify http-types
-         language-javascript lens MissingH mtl process regex-compat scotty
-         shake system-fileio system-filepath text text-format transformers
-         unordered-containers utf8-string wai warp
+       libraryHaskellDepends = [
+         aeson aeson-pretty ansi-terminal base bytestring containers
+         directory executable-path filepath fsnotify http-types
+         language-javascript lens MissingH mtl regex-compat scotty shake
+         system-fileio text text-format transformers unordered-containers
+         utf8-string wai warp
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson aeson-pretty ansi-terminal base base64-bytestring bytestring
+         containers directory filepath fsnotify http-types
+         language-javascript lens MissingH mtl process regex-compat scotty
+         shake system-filepath text text-format transformers
+         unordered-containers wai warp
+       ];
+       testHaskellDepends = [
          base HUnit MissingH QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        jailbreak = true;
@@ -44702,10 +45792,10 @@ self: {
        pname = "dvda";
        version = "0.4";
        sha256 = "1q8avdmzqxnr63ak0i1n6n4cvc23qkrmqlii628mis7vzfcw2yp8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hashable hashtables mtl unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          ad base containers directory fgl file-location graphviz hashable
          hashtables mtl process QuickCheck test-framework
          test-framework-quickcheck2 unordered-containers
@@ -44721,9 +45811,9 @@ self: {
        pname = "dvdread";
        version = "0.1";
        sha256 = "1lxqm9r4zcw364yzpqaaf4nrja5n88vlwa527ixifhc80x6ffx0m";
-       buildDepends = [ base bytestring mtl ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ dvdread ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       libraryPkgconfigDepends = [ dvdread ];
+       libraryToolDepends = [ c2hs ];
        description = "A monadic interface to libdvdread";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44735,7 +45825,7 @@ self: {
        pname = "dvi-processing";
        version = "0.3.1";
        sha256 = "0dp6acmrvlns85nzbbh65vd6fjam04h11kxd9bk6j6hqa2qaqa43";
-       buildDepends = [ base bytestring filepath transformers ];
+       libraryHaskellDepends = [ base bytestring filepath transformers ];
        jailbreak = true;
        description = "Read/write DVI and TFM file";
        license = stdenv.lib.licenses.publicDomain;
@@ -44747,8 +45837,8 @@ self: {
        pname = "dvorak";
        version = "0.1.0.0";
        sha256 = "1kxnzzm24kslsyy9fsjazfz14svbh9svh6f7rnf060as864vmj5g";
-       buildDepends = [ base containers ];
-       testDepends = [ base hspec QuickCheck ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/kvanberendonck/codec-dvorak";
        description = "Dvorak encoding for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -44760,7 +45850,7 @@ self: {
        pname = "dwarf";
        version = "0.23";
        sha256 = "0h6bzh628cz0qnbk4aiz5859r9va99q307scbwzvs1wn3nm6dszl";
-       buildDepends = [ base binary bytestring containers ];
+       libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for DWARF debug format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44773,7 +45863,7 @@ self: {
        pname = "dwarf-el";
        version = "0.2.1.1";
        sha256 = "18ba03v1m7xbsgygjgfrzr9c7fah21lr3300mhvqipicdgrb691w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers transformers utf8-string
        ];
        description = "Parser for DWARF debug format";
@@ -44790,10 +45880,11 @@ self: {
        sha256 = "15mzv6sa2qf0g9skwq4ij35l3lqbc4x3fzwj5hkx93f8pz2bj1hi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-mmap containers dwarf-el elf lens pretty
          transformers
        ];
+       executableHaskellDepends = [ base containers dwarf-el ];
        jailbreak = true;
        description = "High-level wrapper around the dwarf library";
        license = stdenv.lib.licenses.bsd3;
@@ -44805,7 +45896,7 @@ self: {
        pname = "dx9base";
        version = "0.1.1";
        sha256 = "16gwlpxfgh78sx7cb2ryqklhz5smhwk51ma260d6rg082nhy5y3i";
-       buildDepends = [ base Win32 ];
+       libraryHaskellDepends = [ base Win32 ];
        description = "Backend for a binding to the Microsoft DirectX 9 API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44817,8 +45908,8 @@ self: {
        pname = "dx9d3d";
        version = "0.1.1.1";
        sha256 = "1y9g53jajgnlrzzg5vzgx329mii9k396xai4b04hs6gndkdrwprj";
-       buildDepends = [ base dx9base Win32 ];
-       extraLibraries = [ d3d9 ];
+       libraryHaskellDepends = [ base dx9base Win32 ];
+       librarySystemDepends = [ d3d9 ];
        description = "A binding to the Microsoft DirectX 9 API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44830,8 +45921,8 @@ self: {
        pname = "dx9d3dx";
        version = "0.1.1";
        sha256 = "1n5rbq7k1g5l9y5vkadypfksai9sfx2vimdsas1if9h3jnqvvf67";
-       buildDepends = [ base dx9base dx9d3d Win32 ];
-       extraLibraries = [ d3dx9 ];
+       libraryHaskellDepends = [ base dx9base dx9d3d Win32 ];
+       librarySystemDepends = [ d3dx9 ];
        description = "A binding to the Microsoft DirectX 9 D3DX API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44846,11 +45937,11 @@ self: {
        pname = "dynamic-cabal";
        version = "0.3.5";
        sha256 = "0fkr3hps3v0ygcah4dpzfqyfxm0rj4knivbbarllzv86h042vwxw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default directory filepath ghc ghc-paths
          haskell-generate haskell-src-exts time void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory doctest filepath ghc HUnit tasty
          tasty-hunit tasty-th
        ];
@@ -44867,7 +45958,7 @@ self: {
        pname = "dynamic-graph";
        version = "0.1.0.8";
        sha256 = "1lh7wlzmm1nsbzy7ahkcajyfkg4v2vbyp0992570w32bn7nl4b5k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo colour either GLFW-b GLUtil OpenGL pango pipes
          transformers
        ];
@@ -44883,7 +45974,7 @@ self: {
        pname = "dynamic-linker-template";
        version = "0.1.0.4";
        sha256 = "043d8kp4a5pskfyzihm7laa1h9jchdgzvc8v32ck0mxcrigicrgq";
-       buildDepends = [ base containers template-haskell unix ];
+       libraryHaskellDepends = [ base containers template-haskell unix ];
        homepage = "http://github.com/hsyl20/dynamic-linker-template";
        description = "Automatically derive dynamic linking methods from a data type";
        license = stdenv.lib.licenses.bsd3;
@@ -44897,7 +45988,7 @@ self: {
        pname = "dynamic-loader";
        version = "0.0";
        sha256 = "0cwmwf60gfcb1xzbx9yz870fxxpdwcd0kmj4pkz6zy8l53j3mqi0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory ghc-prim hashable hashtables time transformers
        ];
        homepage = "https://github.com/ggreif/dynamic-loader";
@@ -44911,7 +46002,7 @@ self: {
        pname = "dynamic-mvector";
        version = "0.1.0.3";
        sha256 = "1nydfmhkdgynng4pn7c6f3rqdx2b21j7sqnzkb477gkri58y6335";
-       buildDepends = [ base primitive vector ];
+       libraryHaskellDepends = [ base primitive vector ];
        homepage = "https://github.com/AndrasKovacs/dynamic-mvector";
        description = "A wrapper around MVector that enables pushing, popping and extending";
        license = stdenv.lib.licenses.bsd3;
@@ -44925,10 +46016,10 @@ self: {
        pname = "dynamic-object";
        version = "0.2.1";
        sha256 = "1xzjwsdq4v08m66lph81h67sii7qkvni5pygmh3iblx7rybsvflb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers lens mtl QuickCheck text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base doctest ghc hspec lens QuickCheck transformers
        ];
        description = "Object-oriented programming with duck typing and singleton classes";
@@ -44946,10 +46037,10 @@ self: {
      mkDerivation {
        pname = "dynamic-plot";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "0yrkf28hsh992bd9cx3dpc69xg444n9j819ysqjfci7wwnvzxx31";
+       revision = "1";
        editedCabalFile = "bf93f06c056b95264f16bd647b64220d9dd81c421045b66a9a2d2005659cecf5";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base colour constrained-categories containers deepseq
          diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib gtk
          lens manifolds MemoTrie MonadRandom mtl process random semigroups
@@ -44970,11 +46061,11 @@ self: {
        pname = "dynamic-pp";
        version = "0.2.0";
        sha256 = "03y9sl3xcnp1ixi4y0i1a7frd2bgfvnb0r4pqjs38bvjkz96bbdd";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base blaze-builder bytestring Cabal hashable
          unordered-containers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base blaze-builder bytestring Cabal hashable
          HUnit-Plus unordered-containers utf8-string
        ];
@@ -44992,7 +46083,7 @@ self: {
        pname = "dynamic-state";
        version = "0.2.0.0";
        sha256 = "1dp0sp5cjk7rga9jkjdhl1alpj9g6g51zm57g58b64h070b9r82k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring hashable unordered-containers
        ];
        description = "Optionally serializable dynamic state keyed by type";
@@ -45016,15 +46107,19 @@ self: {
        sha256 = "1dmgi69gsh7rm385pykajlq73m3cfaw617gkj2nv0h4x11mdp0ms";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring casadi-bindings casadi-bindings-core cereal
-         Chart Chart-gtk cmdargs colour containers data-default-class
-         distributive generic-accessors hmatrix jacobi-roots lens linear mtl
-         not-gloss Plot-ho-matic process reflection semigroups spatial-math
-         stm unordered-containers vector vector-binary-instances
-         zeromq4-haskell
+       libraryHaskellDepends = [
+         base binary casadi-bindings casadi-bindings-core cereal containers
+         distributive generic-accessors hmatrix jacobi-roots linear mtl
+         Plot-ho-matic process reflection spatial-math vector
+         vector-binary-instances
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring casadi-bindings casadi-bindings-core cereal Chart
+         Chart-gtk cmdargs colour containers data-default-class
+         generic-accessors lens linear mtl not-gloss Plot-ho-matic
+         semigroups stm unordered-containers vector zeromq4-haskell
+       ];
+       testHaskellDepends = [
          base binary casadi-bindings cereal hmatrix hmatrix-gsl HUnit linear
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector
@@ -45042,7 +46137,7 @@ self: {
        pname = "dyre";
        version = "0.8.12";
        sha256 = "10hnlysy4bjvvznk8v902mlk4jx95qf972clyi1l32xkqrf30972";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary directory executable-path filepath ghc-paths io-storage
          process time unix xdg-basedir
        ];
@@ -45057,7 +46152,7 @@ self: {
        pname = "dzen-utils";
        version = "0.1.1";
        sha256 = "05s47s40amydwd6dc75rnaganx2qi2spx668p8x0xs0fdwnqvsf0";
-       buildDepends = [ base colour process ];
+       libraryHaskellDepends = [ base colour process ];
        description = "Utilities for creating inputs for dzen";
        license = "GPL";
      }) {};
@@ -45068,7 +46163,7 @@ self: {
        pname = "eager-sockets";
        version = "0.1";
        sha256 = "10g8w50hhw8ap6lvsv9apmmfaqvqjwzhnq4mx1npapb8cmsmzgdb";
-       buildDepends = [ base bytestring network ];
+       libraryHaskellDepends = [ base bytestring network ];
        jailbreak = true;
        description = "Socket operations with timeouts";
        license = "unknown";
@@ -45082,7 +46177,7 @@ self: {
        pname = "easy-api";
        version = "0.1.0.0";
        sha256 = "0ch4vb7h499gfc2j60gfzj164f3s8rk9hw22g36ymiihsi3ipl1b";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring either http-conduit mtl resourcet text
        ];
        jailbreak = true;
@@ -45098,7 +46193,7 @@ self: {
        pname = "easy-file";
        version = "0.2.1";
        sha256 = "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz";
-       buildDepends = [ base directory filepath time unix ];
+       libraryHaskellDepends = [ base directory filepath time unix ];
        homepage = "http://github.com/kazu-yamamoto/easy-file";
        description = "Cross-platform File handling";
        license = stdenv.lib.licenses.bsd3;
@@ -45112,7 +46207,7 @@ self: {
        pname = "easyjson";
        version = "0.1.0.1";
        sha256 = "19464q0xc3pk1jbf3p94ym97i90600dzhyy4ddv9xf4ligvgbsg2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl parsec text unordered-containers vector
        ];
        jailbreak = true;
@@ -45128,7 +46223,7 @@ self: {
        pname = "easyplot";
        version = "1.0";
        sha256 = "18kndgvdj2apjpfga6fp7m16y1gx8zrwp3c5vfj03sx4v6jvciqk";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        homepage = "http://hub.darcs.net/scravy/easyplot";
        description = "A tiny plotting library, utilizes gnuplot for plotting";
        license = stdenv.lib.licenses.mit;
@@ -45142,7 +46237,9 @@ self: {
        pname = "easyrender";
        version = "0.1.0.1";
        sha256 = "147r2jw0vrld73637vw4k83v4xf8r1dl9cy6gcll9kkpkcck8lkn";
-       buildDepends = [ base bytestring containers mtl superdoc zlib ];
+       libraryHaskellDepends = [
+         base bytestring containers mtl superdoc zlib
+       ];
        jailbreak = true;
        homepage = "http://www.mathstat.dal.ca/~selinger/easyrender/";
        description = "User-friendly creation of EPS, PostScript, and PDF files";
@@ -45156,7 +46253,7 @@ self: {
        pname = "ebeats";
        version = "0.1.0";
        sha256 = "0r3pl63fxrrfafwp3791xh0c47pb4jqqcm9lk52g0gaqg0s8x5qk";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        jailbreak = true;
        description = "Time in ebeats";
        license = stdenv.lib.licenses.bsd3;
@@ -45170,10 +46267,10 @@ self: {
        pname = "ec2-signature";
        version = "3.1";
        sha256 = "1yzyz2a4fm2q6r3nlfjqjmm4fabhl31mq8dgg9shfd3p7cm646g0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring http-types SHA
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base64-bytestring bytestring doctest hspec http-types HUnit
          QuickCheck SHA
        ];
@@ -45190,7 +46287,7 @@ self: {
        pname = "ecdsa";
        version = "0.2";
        sha256 = "1300m9rszfjmwqbqb7x9clg6y3qwgwa9s38w72r6plhzbiqmy28n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-api crypto-pubkey-types hecc
        ];
        homepage = "https://github.com/singpolyma/ecdsa-haskell";
@@ -45209,9 +46306,10 @@ self: {
        sha256 = "1hvi5adgqjkxq1y10d7jr39h4i63khmgrgmlfk09114flllnh8gm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default lens parsec safe transformers
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/fabianbergmark/ECMA-262";
        description = "A ECMA-262 interpreter library";
@@ -45228,8 +46326,10 @@ self: {
        sha256 = "1afb507ywpy2y29zmvywj25qw4gn1h5sd0k051jiw03yvdasn0wj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring digest directory process vcd ];
-       extraLibraries = [ canlib ];
+       executableHaskellDepends = [
+         base bytestring digest directory process vcd
+       ];
+       executableSystemDepends = [ canlib ];
        jailbreak = true;
        description = "Tools for automotive ECU development";
        license = stdenv.lib.licenses.bsd3;
@@ -45242,8 +46342,8 @@ self: {
        pname = "ed25519";
        version = "0.0.2.0";
        sha256 = "0x08p2941g7f3xsg8jgy5j73v0dihg47j2i1hb53c7h4jhvc1fmj";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base bytestring hlint QuickCheck ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hlint QuickCheck ];
        homepage = "http://thoughtpolice.github.com/hs-ed25519";
        description = "ed25519 cryptographic signatures";
        license = stdenv.lib.licenses.mit;
@@ -45256,7 +46356,7 @@ self: {
        pname = "ed25519-donna";
        version = "0.1";
        sha256 = "1x7dmv53hj9j360rwyq379mfzsddbabyzpl37i5fmjwpy160c2r6";
-       buildDepends = [ base bytestring crypto-api ];
+       libraryHaskellDepends = [ base bytestring crypto-api ];
        jailbreak = true;
        homepage = "github.com/tommd/hs-ed25519-donna";
        description = "Haskell bindings to ed25519-donna (Elliptical Curve Signature Scheme)";
@@ -45273,7 +46373,7 @@ self: {
        sha256 = "1zq2xadpl33mxdn99aim5rscwqgpy5w0lk7pa3k3h9x3d3c3qzxx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bifunctors classy-prelude hint optparse-applicative safe
        ];
        homepage = "http://chiselapp.com/user/mwm/repository/eddie/";
@@ -45292,12 +46392,12 @@ self: {
        pname = "ede";
        version = "0.2.8.2";
        sha256 = "0j0b0pn9apvpqxb0gnxxp51g32xc47jky4njb9jn0x59jssc1g1q";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-wl-pprint base bifunctors bytestring comonad directory
          filepath free lens mtl parsers scientific semigroups text
          text-format text-manipulate trifecta unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bifunctors bytestring directory tasty tasty-golden text
        ];
        homepage = "http://github.com/brendanhay/ede";
@@ -45311,7 +46411,7 @@ self: {
        pname = "edenmodules";
        version = "1.2.0.0";
        sha256 = "1wbasb9lsw2rycl2ibd8r9p3d9dl8gd75390qsc83znqx802ylxj";
-       buildDepends = [ base containers deepseq parallel ];
+       libraryHaskellDepends = [ base containers deepseq parallel ];
        jailbreak = true;
        homepage = "http://www.mathematik.uni-marburg.de/~eden";
        description = "Semi-explicit parallel programming library";
@@ -45325,7 +46425,7 @@ self: {
        pname = "edenskel";
        version = "2.1.0.0";
        sha256 = "1bf5zw1x4f6a801ig2b8b84kbnmp0asn804gkm18v9fjcchz3j9q";
-       buildDepends = [ base edenmodules parallel ];
+       libraryHaskellDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45342,7 +46442,7 @@ self: {
        sha256 = "0jkcva53vm8lm76z947xms8a2zkh9sn9951cwry8k7r132dmcn32";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring cairo containers directory filepath
          ghc-events-parallel gtk mtl text zip-archive
        ];
@@ -45362,7 +46462,7 @@ self: {
        sha256 = "0rd95pw3b83zg50i29g6bvqh4dnz5ma9l3v5r1hhszmrkpyfvzkv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ALUT base cmdtheline containers gloss random wraparound
        ];
        jailbreak = true;
@@ -45380,8 +46480,8 @@ self: {
        pname = "edit-distance";
        version = "0.2.2.1";
        sha256 = "0jkca97zyv23yyilp3jydcrzxqhyk27swhzh82llvban5zp8b21y";
-       buildDepends = [ array base containers random ];
-       testDepends = [
+       libraryHaskellDepends = [ array base containers random ];
+       testHaskellDepends = [
          array base containers QuickCheck random test-framework
          test-framework-quickcheck2
        ];
@@ -45396,8 +46496,10 @@ self: {
        pname = "edit-distance-vector";
        version = "1.0.0.2";
        sha256 = "00j0lmj7wz5bm5z4v0v3bamf1pnrlmjkc2ysb5d16dqwi9768x85";
-       buildDepends = [ base vector ];
-       testDepends = [ base QuickCheck quickcheck-instances vector ];
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [
+         base QuickCheck quickcheck-instances vector
+       ];
        homepage = "https://github.com/thsutton/edit-distance-vector";
        description = "Calculate edit distances and edit scripts between vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -45409,7 +46511,9 @@ self: {
        pname = "edit-lenses";
        version = "0.2";
        sha256 = "1nrpbrq38q779s0fbzaxig2fdqgg9qg41vajx7lbhasal6aiclya";
-       buildDepends = [ base containers data-default lattices mtl ];
+       libraryHaskellDepends = [
+         base containers data-default lattices mtl
+       ];
        description = "Symmetric, stateful edit lenses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45423,7 +46527,7 @@ self: {
        sha256 = "0dvxiwhbmknmg4w5dj202g8r0capvgy3rn6c757ci5nhcmr4lypc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Programs demoing the use of symmetric, stateful edit lenses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45434,27 +46538,27 @@ self: {
        pname = "editable";
        version = "1.0.0.2";
        sha256 = "15jz0b913xd8yd3nzk4vrlj0vzbhjarl05h9j0mdcfgxns5j0yxi";
-       buildDepends = [ base text vty vty-ui ];
+       libraryHaskellDepends = [ base text vty vty-ui ];
        jailbreak = true;
        homepage = "https://github.com/maxpow4h/editable";
        description = "Interactive editors for Generics";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "editline" = callPackage
-    ({ mkDerivation, base, libedit }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "editline";
        version = "0.2.1.1";
        sha256 = "101zhzja14n8bhbrly7w2aywx3sxyzgyjdrmgpg4gn4alf4lzdlz";
-       buildDepends = [ base ];
-       extraLibraries = [ libedit ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://code.haskell.org/editline";
        description = "Bindings to the editline library (libedit)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libedit;};
+     }) {};
 
   "editor-open" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
@@ -45466,10 +46570,13 @@ self: {
        sha256 = "0raj0s8v72kz63hqpqhf58sx0a8mcwi4ania40spjirdrsdx3i9g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra directory process resourcet
          temporary transformers unix
        ];
+       executableHaskellDepends = [
+         base bytestring conduit conduit-extra resourcet
+       ];
        homepage = "https://github.com/pharpend/editor-open";
        description = "Open the user's $VISUAL or $EDITOR for text input";
        license = stdenv.lib.licenses.asl20;
@@ -45483,8 +46590,10 @@ self: {
        pname = "effect-handlers";
        version = "0.1.0.6";
        sha256 = "0i7glghwh35pfyzznzabaf8fnadk00lpajmasw5h5ndjl2dmqzy9";
-       buildDepends = [ base free kan-extensions mtl ];
-       testDepends = [ base hspec hspec-discover HUnit QuickCheck ];
+       libraryHaskellDepends = [ base free kan-extensions mtl ];
+       testHaskellDepends = [
+         base hspec hspec-discover HUnit QuickCheck
+       ];
        homepage = "https://github.com/edofic/effect-handlers";
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
@@ -45496,7 +46605,7 @@ self: {
        pname = "effect-monad";
        version = "0.6.1";
        sha256 = "0kbjsdiv2x84spbw4qrgk76xwwgqrqhasim83h2jjwvn4qdpyjw8";
-       buildDepends = [ base ghc-prim type-level-sets ];
+       libraryHaskellDepends = [ base ghc-prim type-level-sets ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45511,8 +46620,10 @@ self: {
        pname = "effective-aspects";
        version = "0.1.0.0";
        sha256 = "0hcczdc98w8mqhap20dm0dmxbmqrxa8xxs8mjx4lga7y2n6wq22i";
-       buildDepends = [ base ghc-prim hashtables HUnit mtl QuickCheck ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base ghc-prim hashtables HUnit mtl QuickCheck
+       ];
+       testHaskellDepends = [
          base Cabal ghc-prim hashtables HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -45532,8 +46643,10 @@ self: {
        pname = "effective-aspects-mzv";
        version = "0.1.0.1";
        sha256 = "03mignf38inf10l19mcsjgjb0935lm53b29xy39pkcycrpmp0ckj";
-       buildDepends = [ base ghc-prim hashtables HUnit mzv QuickCheck ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base ghc-prim hashtables HUnit mzv QuickCheck
+       ];
+       testHaskellDepends = [
          base Cabal ghc-prim hashtables HUnit mzv QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -45550,7 +46663,7 @@ self: {
        pname = "effects";
        version = "0.2.2";
        sha256 = "0ysz02qvw9gg271dsign11hs7cfsz7xfc4kjmggf10j86lcpi034";
-       buildDepends = [ base containers newtype void ];
+       libraryHaskellDepends = [ base containers newtype void ];
        homepage = "http://github.com/sjoerdvisscher/effects";
        description = "Computational Effects";
        license = stdenv.lib.licenses.bsd3;
@@ -45562,7 +46675,7 @@ self: {
        pname = "effects-parser";
        version = "0.1";
        sha256 = "0vjjld95kg02a4nr2a0lwlcwaq3867qvbbjk8b1g6fd3d1qj456r";
-       buildDepends = [ base effects ];
+       libraryHaskellDepends = [ base effects ];
        homepage = "http://github.com/nybble41/effects-parser";
        description = "Parser Effect for the Control.Effects Library";
        license = stdenv.lib.licenses.bsd3;
@@ -45574,7 +46687,7 @@ self: {
        pname = "effin";
        version = "0.3.0.1";
        sha256 = "0rckxjdkw5p4yy1kizj1z8kp7sxfxxhh9s7714jsn9in7lc4lsif";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/YellPika/effin";
        description = "A Typeable-free implementation of extensible effects";
        license = stdenv.lib.licenses.bsd3;
@@ -45592,19 +46705,22 @@ self: {
        sha256 = "16d3c4r72f6hv8v7zbcqwjjc1c53895kxjn1m61d2fhz8gmb8yq0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base containers directory ghc ghc-paths haskeline mtl parsec
+         process random regex-tdfa text transformers unordered-containers
+       ];
+       executableHaskellDepends = [
          array base containers directory filepath ghc ghc-paths haskeline
-         mtl parsec process random regex-tdfa text transformers
+         mtl parsec process regex-tdfa text transformers
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base Glob HUnit mtl test-framework test-framework-hunit
          transformers
        ];
        homepage = "http://www.egison.org";
        description = "Programming language with non-linear pattern-matching against non-free data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "egison-quote" = callPackage
@@ -45613,7 +46729,9 @@ self: {
        pname = "egison-quote";
        version = "0.2";
        sha256 = "1qmbivr4lp8m27ns5cz38fkkynfky9z73hqr173dhyvqccjamfgk";
-       buildDepends = [ base egison mtl parsec template-haskell ];
+       libraryHaskellDepends = [
+         base egison mtl parsec template-haskell
+       ];
        homepage = "https://github.com/xenophobia/Egison-Quote";
        description = "A quasi quotes for using Egison expression in Haskell code";
        license = stdenv.lib.licenses.mit;
@@ -45631,7 +46749,7 @@ self: {
        sha256 = "1ay9m7ibl2z19yq9pd3fwghbyki6cawg3w9x42dllncjrwxwlh4m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers directory egison filepath ghc
          ghc-paths haskeline mtl parsec regex-posix transformers
          unordered-containers
@@ -45639,7 +46757,6 @@ self: {
        homepage = "http://www.egison.org";
        description = "A tutorial program for the Egison programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ehaskell" = callPackage
@@ -45652,7 +46769,7 @@ self: {
        sha256 = "0d7j20lrxy5qy1ybgywfjk0d0f6iin37nfw9zdbmhi1z2l89mmnj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath mtlparse process regexpr utf8-string
          yjtools
        ];
@@ -45669,15 +46786,16 @@ self: {
      mkDerivation {
        pname = "ehs";
        version = "0.7.0";
-       revision = "3";
        sha256 = "0kckic7v6gab6ksbdmnxbv41fm68zvhfcmvshln9hxmq2mgli11x";
+       revision = "3";
        editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring haskell-src-meta parsec template-haskell text time
+       libraryHaskellDepends = [
+         base bytestring haskell-src-meta parsec template-haskell text
          transformers
        ];
+       executableHaskellDepends = [ base bytestring text time ];
        homepage = "http://github.com/minpou/ehs/";
        description = "Embedded haskell template using quasiquotes";
        license = stdenv.lib.licenses.mit;
@@ -45691,11 +46809,13 @@ self: {
      mkDerivation {
        pname = "eibd-client-simple";
        version = "0.0.4";
-       revision = "1";
        sha256 = "14nxahznqy6xfjgyi8d11b4hgrw431ywqc5hkz0lbpgxysgkc61d";
+       revision = "1";
        editedCabalFile = "5154a0f9083521b4c60cee92f2614b253961fd1e2dd9e7c5b541630df8597d80";
-       buildDepends = [ base bytestring containers mtl transformers ];
-       extraLibraries = [ eibclient ];
+       libraryHaskellDepends = [
+         base bytestring containers mtl transformers
+       ];
+       librarySystemDepends = [ eibclient ];
        jailbreak = true;
        description = "EIBd Client";
        license = stdenv.lib.licenses.gpl3;
@@ -45710,16 +46830,15 @@ self: {
        pname = "eigen";
        version = "2.1.6";
        sha256 = "0287j907pasjb7w7bwr6snb4qic7j14msxhps445yjfkqa2arzfz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring primitive transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring mtl primitive transformers vector
        ];
        homepage = "https://github.com/osidorkin/haskell-eigen";
        description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "either" = callPackage
@@ -45731,7 +46850,7 @@ self: {
        pname = "either";
        version = "4.4.1";
        sha256 = "1jq9b7mwljyqxmcs09bnqzza6710sfk2x444p3aagjlvq3mpvrci";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors exceptions free mmorph monad-control MonadRandom
          mtl profunctors semigroupoids semigroups transformers
          transformers-base
@@ -45747,7 +46866,7 @@ self: {
        pname = "either-unwrap";
        version = "1.1";
        sha256 = "0g1f5m7bcpnyg2sdvwx8x34ml6dqfrn326s8pbfciaqqf7wddayc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/gcross/either-unwrap";
        description = "Functions for probing and unwrapping values inside of Either";
        license = stdenv.lib.licenses.bsd3;
@@ -45773,7 +46892,7 @@ self: {
        pname = "ekg";
        version = "0.4.0.8";
        sha256 = "0cp88b5bf4bpjd6qzib00n7j76svwsykzizk52fk1dmknfx8h12v";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath network snap-core
          snap-server text time transformers unordered-containers
        ];
@@ -45791,14 +46910,13 @@ self: {
        pname = "ekg-bosun";
        version = "1.0.4";
        sha256 = "0cjwv99dbb1spfn25vdl4ikxr10s7yqr9ih36amvs02rnb47lx7f";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
        ];
        homepage = "http://github.com/ocharles/ekg-bosun";
        description = "Send ekg metrics to a Bosun instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-carbon" = callPackage
@@ -45809,7 +46927,7 @@ self: {
        pname = "ekg-carbon";
        version = "1.0.4";
        sha256 = "0l1gg13wxyivcxcsmzq6wv7ma4vk6afxjmw7f9n9dc3zdga0v772";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ekg-core network network-carbon text time unordered-containers
          vector
        ];
@@ -45826,7 +46944,7 @@ self: {
        pname = "ekg-core";
        version = "0.1.1.0";
        sha256 = "07h6lwig1cwb526ack1g3f6w8irmaj4kibn11ihhdffk7avix8bv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim text unordered-containers
        ];
        homepage = "https://github.com/tibbe/ekg-core";
@@ -45841,7 +46959,9 @@ self: {
        pname = "ekg-json";
        version = "0.1.0.0";
        sha256 = "1nhqlajidg94zk6rs86ri5ar4cmkbdz04hwjp8qgam0vgpp5bi2j";
-       buildDepends = [ aeson base ekg-core text unordered-containers ];
+       libraryHaskellDepends = [
+         aeson base ekg-core text unordered-containers
+       ];
        homepage = "https://github.com/tibbe/ekg-json";
        description = "JSON encoding of ekg metrics";
        license = stdenv.lib.licenses.bsd3;
@@ -45855,7 +46975,7 @@ self: {
        pname = "ekg-log";
        version = "0.1.0.3";
        sha256 = "1rgjpd0cksxxr1934k9xpzhyzsl54d7yp1mh65m85z7665kcjshw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring directory ekg-core fast-logger filepath text
          time unix unordered-containers
        ];
@@ -45875,9 +46995,10 @@ self: {
        sha256 = "1yxp0s3i87zc205bqkw8arq8n0y225gin94x98csldb9rd0k0s5y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring ekg-core text time unordered-containers
        ];
+       executableHaskellDepends = [ base ekg-core ];
        jailbreak = true;
        homepage = "https://github.com/adarqui/ekg-push";
        description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library";
@@ -45893,10 +47014,10 @@ self: {
        pname = "ekg-rrd";
        version = "0.2.1.69";
        sha256 = "172p0whjyql5in94rcpr6h13zilhd84qp54z8qvk23kg5jqaf43r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory ekg-core mtl process text time unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base ekg-core HUnit test-framework test-framework-hunit text time
          unordered-containers
        ];
@@ -45914,7 +47035,7 @@ self: {
        pname = "ekg-statsd";
        version = "0.2.0.3";
        sha256 = "02sknwz5cqwy5byqjiyc6nfppmbmfnxndp3dcs4lz276221h91hn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring ekg-core network text time unordered-containers
        ];
        homepage = "https://github.com/tibbe/ekg-statsd";
@@ -45928,8 +47049,8 @@ self: {
        pname = "electrum-mnemonic";
        version = "0.1.2";
        sha256 = "1lswfw72imi326146dyvva3w9g4v5725kj817q9bjgrfmzn2k2k3";
-       buildDepends = [ base ];
-       testDepends = [ base tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "easy to remember mnemonic for a high-entropy value";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -45941,7 +47062,9 @@ self: {
        pname = "elerea";
        version = "2.8.0";
        sha256 = "1sc71775f787dh70ay9fm6x6npsn81yci9yr984ai87ddz023sab";
-       buildDepends = [ base containers transformers transformers-base ];
+       libraryHaskellDepends = [
+         base containers transformers transformers-base
+       ];
        description = "A minimalistic FRP library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45954,10 +47077,9 @@ self: {
        sha256 = "17m52c6qa905wpfanllhnaizq6vv2hp0ldfmlv10b0hbzjs29bx1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base elerea GLFW OpenGL ];
+       executableHaskellDepends = [ base elerea GLFW OpenGL ];
        description = "Example applications for Elerea";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elerea-sdl" = callPackage
@@ -45966,11 +47088,10 @@ self: {
        pname = "elerea-sdl";
        version = "0.1.1";
        sha256 = "1dfbgnwn0jj3lv2fskc2k3m4h0crars2d1p0gpj265r4k58qis36";
-       buildDepends = [ base elerea SDL ];
+       libraryHaskellDepends = [ base elerea SDL ];
        homepage = "http://github.com/singpolyma/elerea-sdl";
        description = "Elerea FRP wrapper for SDL";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elevator" = callPackage
@@ -45979,7 +47100,7 @@ self: {
        pname = "elevator";
        version = "0.2.3";
        sha256 = "1m509dh5k9ci87g22gd2j8lfg4hm4wn156gvd86p3r636c5hbdw2";
-       buildDepends = [ base extensible transformers ];
+       libraryHaskellDepends = [ base extensible transformers ];
        homepage = "https://github.com/fumieval/elevator";
        description = "Immediately lifts to a desired level";
        license = stdenv.lib.licenses.bsd3;
@@ -45991,7 +47112,7 @@ self: {
        pname = "elf";
        version = "0.27";
        sha256 = "19ylk13ny2clwfgqv6r55h80ghlgzbwydzrfy1msyxcxn4zmdpjs";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://github.com/erikcharlebois/elf";
        description = "Parser for ELF object format";
        license = stdenv.lib.licenses.bsd3;
@@ -46005,7 +47126,7 @@ self: {
        pname = "elm-build-lib";
        version = "0.14.0.0";
        sha256 = "12hhyjr3bshbz66zxl5jfs4s3qx6laqqwcim3kf8rj2vh12h6wj5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers elm-compiler elm-core-sources file-embed
          template-haskell
        ];
@@ -46031,13 +47152,18 @@ self: {
        sha256 = "1g3q1z6bji1vx36kfkn8qayidds29b0jkk7k70sip4055jr4jc5n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
          cmdargs containers directory edit-distance filepath indents
          language-ecmascript language-glsl mtl parsec pretty process text
          transformers union-find unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson aeson-pretty base binary bytestring cmdargs containers
+         directory filepath indents language-glsl mtl parsec pretty process
+         text transformers union-find
+       ];
+       testHaskellDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
          cmdargs containers directory edit-distance filemanip filepath HUnit
          indents language-ecmascript language-glsl mtl parsec pretty process
@@ -46060,7 +47186,7 @@ self: {
        pname = "elm-core-sources";
        version = "1.0.0";
        sha256 = "1yr0csgz0hv25cz3jslap0adwvfcvv35bns32b9g0vyda1fm00x4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers file-embed template-haskell
        ];
        homepage = "http://github.com/JoeyEremondi/elm-build-lib";
@@ -46080,7 +47206,11 @@ self: {
        sha256 = "1did7vjd1h2kh5alndd2b63zi8b1m9hf6k1k75yxwvw6f6mz5i4q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring directory Elm filepath http-client
+         http-client-tls http-types mtl network process vector
+       ];
+       executableHaskellDepends = [
          aeson aeson-pretty ansi-wl-pprint base binary bytestring containers
          directory Elm filepath HTTP http-client http-client-tls http-types
          mtl network optparse-applicative process vector
@@ -46102,13 +47232,12 @@ self: {
        sha256 = "0jvdln18dhsxly33ysy1vv1740ri1576x44jn10gjva432rp8rwx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty base bytestring containers directory file-embed
          filepath text time
        ];
        description = "Set up basic structure for an elm project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-make" = callPackage
@@ -46122,7 +47251,7 @@ self: {
        sha256 = "10yli9nxfyykkr3p2dma5zgblwgx2434axjj17a878xd0r4841sb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base binary blaze-html blaze-markup bytestring
          containers directory elm-compiler elm-package filepath mtl
          optparse-applicative text
@@ -46147,7 +47276,13 @@ self: {
        sha256 = "08wsl42gf5wf9pmsnld38p2m675ljihpzkrvn3dzh6zf0dwblm5n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson aeson-pretty base binary bytestring containers directory
+         elm-compiler filepath HTTP http-client http-client-tls http-types
+         mtl network process text time unordered-containers vector
+         zip-archive
+       ];
+       executableHaskellDepends = [
          aeson aeson-pretty ansi-wl-pprint base binary bytestring containers
          directory elm-compiler filepath HTTP http-client http-client-tls
          http-types mtl network optparse-applicative pretty process text
@@ -46173,7 +47308,7 @@ self: {
        sha256 = "0j8md3cqg7wrcx85s5hj8g812zvrr3y4833n0wc3dvfa3wlblpga";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html blaze-markup bytestring cmdargs containers
          directory elm-compiler filepath fsnotify HTTP mtl process snap-core
          snap-server system-filepath text time transformers
@@ -46197,11 +47332,11 @@ self: {
        sha256 = "05fyk3q7243c8p4kw03jggrvp8qfgcfanr291bmgnn9s1lk0q253";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring bytestring-trie cmdargs containers directory
          elm-compiler elm-package filepath haskeline mtl parsec process
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring bytestring-trie cmdargs directory elm-compiler
          elm-package filepath haskeline HUnit mtl parsec process QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
@@ -46223,7 +47358,7 @@ self: {
        sha256 = "0nnkhmmm4cl6a314xxh5qwxkjsc3k3vcwdfar62578ykarxb53g1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs containers directory Elm filepath mtl
          process snap-core snap-server unordered-containers
        ];
@@ -46241,7 +47376,7 @@ self: {
        pname = "elm-yesod";
        version = "0.2";
        sha256 = "0hza3khwspwlqbyllh2w1083hh19hslc0lhdryq1bbs8bssird39";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-markup Elm shakespeare-js text yesod-core
        ];
        jailbreak = true;
@@ -46261,15 +47396,15 @@ self: {
        sha256 = "1hssxqhm962hr41mvjnrs4h74121nmvlbww0g9nyk10mx71rcbcg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base MonadRandom random ];
-       testDepends = [
+       libraryHaskellDepends = [ base MonadRandom random ];
+       executableHaskellDepends = [ base random ];
+       testHaskellDepends = [
          base MonadRandom proctest QuickCheck random tasty tasty-quickcheck
          tasty-th
        ];
        homepage = "https://www.github.com/sgillespie/elocrypt";
        description = "Generate easy-to-remember, hard-to-guess passwords";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "emacs-keys" = callPackage
@@ -46280,8 +47415,10 @@ self: {
        pname = "emacs-keys";
        version = "0.0.2.0";
        sha256 = "12zxvjmlp06rjlhb7iaz7qrzb7cr1rgqg5ql5vv3lkz7z84h82ph";
-       buildDepends = [ base split template-haskell th-lift xkbcommon ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base split template-haskell th-lift xkbcommon
+       ];
+       testHaskellDepends = [
          base doctest tasty tasty-hspec tasty-quickcheck xkbcommon
        ];
        homepage = "https://github.com/cocreature/emacs-keys";
@@ -46297,7 +47434,7 @@ self: {
        pname = "email";
        version = "0.1.1.2";
        sha256 = "144a53an7laivcc6zxawsjz8yijknswnlbrd8id87d6x6lbq1cw3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring encoding HaskellNet hsemail old-locale
          old-time parsec process time
        ];
@@ -46316,11 +47453,11 @@ self: {
        pname = "email-header";
        version = "0.2.0";
        sha256 = "1kl7d1scxq6ygjdixl4xkhaa4d60zr8i92fkcw5qczk44la4wiyv";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring case-insensitive
          containers text text-icu time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring case-insensitive containers QuickCheck tasty
          tasty-quickcheck text time
        ];
@@ -46338,7 +47475,7 @@ self: {
        pname = "email-postmark";
        version = "0.2";
        sha256 = "17zby98j1glsslrndmxl6zwrc3q7ir9771yvfxijawp4wdx6nayy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers HTTP network
        ];
        jailbreak = true;
@@ -46356,8 +47493,8 @@ self: {
        pname = "email-validate";
        version = "2.1.3";
        sha256 = "1jw15hyj6p1155i3h5n4f728x33ym21ibpirkdiid0ksf6cpk5jv";
-       buildDepends = [ attoparsec base bytestring ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base bytestring ghc-prim ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -46377,11 +47514,11 @@ self: {
        sha256 = "0ai0fj7rpq9h0i0rznrsqwvqbkkry5dgq4hgg5jc8ma3j9gym87n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs directory dns email-validate HUnit
          parallel-io pcre-light tasty tasty-hunit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cmdargs directory dns doctest email-validate HUnit
          parallel-io pcre-light tasty tasty-hunit
        ];
@@ -46398,7 +47535,10 @@ self: {
        sha256 = "01xyqwnyza1cpd7ky4kgr1z5m8w2ms395lj7xjwxh42jg65b1rfr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base filepath her-lexer MissingH process ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base filepath her-lexer MissingH process
+       ];
        homepage = "https://github.com/nushio3/embeddock";
        description = "Embed the values in scope in the haddock documentation of the module";
        license = stdenv.lib.licenses.bsd3;
@@ -46411,7 +47551,7 @@ self: {
        pname = "embeddock-example";
        version = "0.1";
        sha256 = "07xc7kdnlbfwr08zhgjphbcmn8ycilp6pna3nk4y0w2hw87g7db0";
-       buildDepends = [ base embeddock time ];
+       libraryHaskellDepends = [ base embeddock time ];
        homepage = "https://github.com/nushio3/embeddock-example";
        description = "Example of using embeddock";
        license = stdenv.lib.licenses.bsd3;
@@ -46428,9 +47568,10 @@ self: {
        sha256 = "1vqksv7a12xzi6zp4b2qfnsb5gaarg5bhxanhbi4qkn1jmwy82yx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring dlist gloss haskell98 HCodecs mtl
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://ludflu@github.com/ludflu/embroidery.git";
        description = "support for embroidery formats in haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -46443,8 +47584,8 @@ self: {
        pname = "emgm";
        version = "0.4";
        sha256 = "0cpcwrb6wqwq371wqjmhzfhdwk3vfhjjgz4vgjsjvw6cdhbpw5p1";
-       buildDepends = [ base ];
-       testDepends = [ base HUnit QuickCheck syb ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base HUnit QuickCheck syb ];
        jailbreak = true;
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/EMGM";
        description = "Extensible and Modular Generics for the Masses";
@@ -46471,11 +47612,11 @@ self: {
        pname = "enclosed-exceptions";
        version = "1.0.1.1";
        sha256 = "16ax1kqdsk4apg642qxkm2hf9vb5hzmkd14zmkxra8ssp8rn28z5";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base deepseq lifted-base monad-control transformers
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base deepseq hspec lifted-base monad-control QuickCheck
          transformers transformers-base
        ];
@@ -46492,7 +47633,7 @@ self: {
        pname = "encoding";
        version = "0.8";
        sha256 = "0y2fx99vxrqpvjflpqgnbikxsc3p50sn5b5g97zivjr9bbck52ji";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers extensible-exceptions
          ghc-prim HaXml mtl regex-compat
        ];
@@ -46507,7 +47648,7 @@ self: {
        pname = "endo";
        version = "0.2.0.1";
        sha256 = "0szbv44sgsnbkcdmmsvbiy539iiyd608p513slfw1pbb240sabii";
-       buildDepends = [ base between transformers ];
+       libraryHaskellDepends = [ base between transformers ];
        homepage = "https://github.com/trskop/endo";
        description = "Endomorphism utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -46522,7 +47663,7 @@ self: {
        pname = "engine-io";
        version = "1.2.10";
        sha256 = "02wc4fdwrnaw934bxk39bfndzn2rjdcaa3rifcj84ap750fx16h0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base base64-bytestring bytestring either
          free monad-loops mwc-random stm stm-delay text transformers
          unordered-containers vector websockets
@@ -46542,7 +47683,7 @@ self: {
        pname = "engine-io-growler";
        version = "0.1.0.1";
        sha256 = "1yk7cpg89nsmd9kvmxdrxcgyr8wilara4kw35hyxl4l2b9c9pwjc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring engine-io growler http-types mtl pipes
          pipes-attoparsec pipes-wai socket-io text transformers
          unordered-containers wai wai-websockets websockets
@@ -46560,7 +47701,7 @@ self: {
        pname = "engine-io-snap";
        version = "1.0.3";
        sha256 = "0i2099b4drvzknz6ifi4dvgfibkqxfrz6w3a15k09nw3vxc14hbg";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec-enumerator base bytestring containers engine-io
          MonadCatchIO-transformers snap-core unordered-containers websockets
          websockets-snap
@@ -46578,7 +47719,7 @@ self: {
        pname = "engine-io-wai";
        version = "1.0.3";
        sha256 = "0p296y3xnpx0wj6yd152y7i765x0pwg8rg2bpcz92hkcmz57gdz7";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring either engine-io http-types mtl text
          transformers transformers-compat unordered-containers wai
          wai-websockets websockets
@@ -46596,7 +47737,7 @@ self: {
        pname = "engine-io-yesod";
        version = "1.0.2";
        sha256 = "15hjq128zn23kq5nlmpv7sbrhzhv1936psgf8aa7yxvx4xwy6baw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra engine-io http-types text
          unordered-containers wai wai-websockets websockets yesod-core
        ];
@@ -46609,7 +47750,7 @@ self: {
        pname = "engineering-units";
        version = "0.0.1";
        sha256 = "1jpipav3znxbj7ld5m53wv6pmv1nrcxprqm0m1p3ny9cmpnw3r9x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A numeric type for managing and automating engineering units";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46620,7 +47761,7 @@ self: {
        pname = "entropy";
        version = "0.3.7";
        sha256 = "1vzg9fi597dbrcbjsr71y47rvmhiih7lg5rjnb297fzdlbmj1w0z";
-       buildDepends = [ base bytestring unix ];
+       libraryHaskellDepends = [ base bytestring unix ];
        homepage = "https://github.com/TomMD/entropy";
        description = "A platform independent entropy source";
        license = stdenv.lib.licenses.bsd3;
@@ -46632,7 +47773,7 @@ self: {
        pname = "enumerable";
        version = "0.0.3";
        sha256 = "1v94y0a3rlkg3qlbv70d1zj2vjhssf1f89xlgb5cnsy9az07517q";
-       buildDepends = [ base control-monad-omega tagged ];
+       libraryHaskellDepends = [ base control-monad-omega tagged ];
        description = "A typeclass for enumerating all values a type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46645,10 +47786,10 @@ self: {
        pname = "enumeration";
        version = "0.1.0";
        sha256 = "17d7vm2nkyhxw2f0wk6llrw9y5kqzgqlgswv98wrpnpsspwmx0bk";
-       buildDepends = [
+       libraryHaskellDepends = [
          arith-encode arithmoi base binary Cabal containers heap
        ];
-       testDepends = [
+       testHaskellDepends = [
          arith-encode arithmoi base binary Cabal containers heap HUnit-Plus
        ];
        homepage = "https://github.com/emc2/enumeration";
@@ -46663,7 +47804,9 @@ self: {
        pname = "enumerator";
        version = "0.4.20";
        sha256 = "02a75dggj295zkhgjry5cb43s6y6ydpjb5w6vgl7kd9b6ma11qik";
-       buildDepends = [ base bytestring containers text transformers ];
+       libraryHaskellDepends = [
+         base bytestring containers text transformers
+       ];
        homepage = "https://john-millikin.com/software/enumerator/";
        description = "Reliable, high-performance processing with left-fold enumerators";
        license = stdenv.lib.licenses.mit;
@@ -46675,7 +47818,7 @@ self: {
        pname = "enumerator-fd";
        version = "0.1.0.2";
        sha256 = "0xbrkv65m206qlvnjlbfb52kvjhw91rdnihwv3y31p2qj5zlz29p";
-       buildDepends = [ base enumerator mtl ];
+       libraryHaskellDepends = [ base enumerator mtl ];
        homepage = "https://john-millikin.com/software/enumerator/";
        description = "Enumerator instances for monads-fd classes";
        license = stdenv.lib.licenses.mit;
@@ -46687,7 +47830,7 @@ self: {
        pname = "enumerator-tf";
        version = "0.1.1";
        sha256 = "0s47j6pf05nwl105i2vwvsn18gis1v96gid85kj49ngb8ax0pjsp";
-       buildDepends = [ base enumerator monads-tf ];
+       libraryHaskellDepends = [ base enumerator monads-tf ];
        homepage = "https://john-millikin.com/software/enumerator/";
        description = "Enumerator instances for monads-tf classes";
        license = stdenv.lib.licenses.mit;
@@ -46699,7 +47842,7 @@ self: {
        pname = "enumfun";
        version = "0.5.1.0";
        sha256 = "1fq4zmhc825bmyslfm7kbsa29qq773cgrz4npj2bcfl0jkbl3ndc";
-       buildDepends = [ base enummapset-th ];
+       libraryHaskellDepends = [ base enummapset-th ];
        jailbreak = true;
        homepage = "https://github.com/liyang/enumfun";
        description = "Finitely represented /total/ EnumMaps";
@@ -46716,11 +47859,11 @@ self: {
        pname = "enummapmap";
        version = "0.7.0";
        sha256 = "17rlynm46i3y76ms8s5ajkz50cj5m1anw83dizj281887qg63iwr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base contravariant data-default deepseq ghc-prim lens safecopy
          semigroups
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cereal containers deepseq hspec hspec-expectations HUnit lens
          QuickCheck safecopy semigroups
        ];
@@ -46736,7 +47879,7 @@ self: {
        pname = "enummapset";
        version = "0.5.2.1";
        sha256 = "019q0b1qm6bcp1ld67aklvq76wfx1qwzjbdywliv9g8ybwivaxqg";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        homepage = "https://github.com/michalt/enummapset";
        description = "IntMap and IntSet with Enum keys/elements";
        license = stdenv.lib.licenses.bsd3;
@@ -46748,7 +47891,9 @@ self: {
        pname = "enummapset-th";
        version = "0.6.0.2";
        sha256 = "1g6z60qalyf8iv41xdl409kmcjm406zccljkgl658y1x9rdi08gr";
-       buildDepends = [ base containers deepseq template-haskell ];
+       libraryHaskellDepends = [
+         base containers deepseq template-haskell
+       ];
        homepage = "https://github.com/liyang/enummapset-th";
        description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
        license = stdenv.lib.licenses.bsd3;
@@ -46760,7 +47905,7 @@ self: {
        pname = "enumset";
        version = "0.0.4";
        sha256 = "1dzwxi7i757zdf68v470n8dwn1g8kg51w3c1mwqyxwq85650805w";
-       buildDepends = [ base data-accessor storable-record ];
+       libraryHaskellDepends = [ base data-accessor storable-record ];
        description = "Sets of enumeration values represented by machine words";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46774,7 +47919,7 @@ self: {
        pname = "env-parser";
        version = "0.0.2.1";
        sha256 = "13d6yi5jbdi84nccn3ffiw96v5knbz4madjfg980izxfrnbsl1rr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring containers http-types mtl network old-locale text time
          transformers
@@ -46792,8 +47937,8 @@ self: {
        pname = "envparse";
        version = "0.2.1";
        sha256 = "1pkxlda74wpl3f4xd5h69bcbgrw6q045hkdfj98dqd6z2czr2wcg";
-       buildDepends = [ base containers ];
-       testDepends = [ base containers hspec ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers hspec ];
        homepage = "https://supki.github.io/envparse";
        description = "Parse environment variables";
        license = stdenv.lib.licenses.bsd2;
@@ -46807,10 +47952,10 @@ self: {
        pname = "envy";
        version = "0.2.0.0";
        sha256 = "0hi9nlrr2g32f4cp3ibmdvmqmqhbyps5d9f0v7612fbxhimqrkbq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec mtl QuickCheck quickcheck-instances text time
          transformers
        ];
@@ -46824,7 +47969,7 @@ self: {
        pname = "epanet-haskell";
        version = "2.0.12.4";
        sha256 = "1jpz58zlkhgf2fl4fzicpdkqqdbwy3sw56dga8yvjmgv5zcqqshx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://epanet.de/developer/haskell.html";
        description = "Haskell binding for EPANET";
@@ -46837,7 +47982,7 @@ self: {
        pname = "epass";
        version = "0.2.1";
        sha256 = "0sg5pipzc4s9xq83ari7rigjbvhyh76kqnp57i98bs3k54ba53ym";
-       buildDepends = [ base stm time ];
+       libraryHaskellDepends = [ base stm time ];
        jailbreak = true;
        homepage = "http://github.com/baldo/epass";
        description = "Baisc, Erlang-like message passing supporting sockets";
@@ -46845,22 +47990,21 @@ self: {
      }) {};
 
   "epic" = callPackage
-    ({ mkDerivation, array, base, boehmgc, Cabal, directory, gmp, happy
-     , mtl, process
-     }:
+    ({ mkDerivation, array, base, Cabal, directory, mtl, process }:
      mkDerivation {
        pname = "epic";
        version = "0.9.3.3";
        sha256 = "0ap8jr11sk8v2sdi03pahjhaxx3mc4ba7qbh3m8nsg0g5wr4962m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base Cabal directory mtl process ];
-       buildTools = [ happy ];
-       extraLibraries = [ boehmgc gmp ];
+       libraryHaskellDepends = [ array base Cabal directory mtl process ];
+       executableHaskellDepends = [
+         array base Cabal directory mtl process
+       ];
        homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
        description = "Compiler for a simple functional language";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) boehmgc;  inherit (pkgs) gmp;};
+     }) {};
 
   "epoll" = callPackage
     ({ mkDerivation, base, unix }:
@@ -46868,7 +48012,7 @@ self: {
        pname = "epoll";
        version = "0.2.2";
        sha256 = "0iz1x6lb5b71h4sgiacsnv5f8zj445v88a3rsra7vbza5g35nwnp";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "http://github.com/twittner/epoll/";
        description = "epoll bindings";
        license = "LGPL";
@@ -46881,10 +48025,9 @@ self: {
        pname = "eprocess";
        version = "1.7.2";
        sha256 = "190qgsqj41dbkphjrgljif7q0zjm9ddp8wawc9wx8qklb897jrvj";
-       buildDepends = [ base exceptions mtl ];
+       libraryHaskellDepends = [ base exceptions mtl ];
        description = "Basic Erlang-like process support for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "epub" = callPackage
@@ -46897,7 +48040,7 @@ self: {
        sha256 = "0h9j9qqdllkng13w978fpd44zxni5v0mpywh7yxz259hlihwmw22";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring filepath old-time utf8-string xml zip-archive
        ];
        description = "EPUB E-Book construction support library";
@@ -46912,11 +48055,11 @@ self: {
        pname = "epub-metadata";
        version = "4.3";
        sha256 = "0gw5mfysvfqk9daa4807qq4xh190a1pzxmwwi2xbnpz7m4kyffyk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath hxt mtl regex-compat
          zip-archive
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath HUnit hxt mtl regex-compat
          zip-archive
        ];
@@ -46935,11 +48078,11 @@ self: {
        sha256 = "17r7p68mdrc7mla65xwb5g8inh94hncqkg09igha9fyhnax4m3dk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory epub-metadata filepath mtl parsec process
          regex-compat zip-archive
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory epub-metadata filepath HUnit mtl parsec regex-compat
        ];
        homepage = "http://hub.darcs.net/dino/epub-tools";
@@ -46956,7 +48099,9 @@ self: {
        sha256 = "1l3vi5z46x4m5h3x97hgr9g76i4s5scmpmpjzf97c1kddw31hlh3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory epub-metadata mtl regex-compat ];
+       executableHaskellDepends = [
+         base directory epub-metadata mtl regex-compat
+       ];
        homepage = "http://ui3.info/d/proj/epubname.html";
        description = "Rename epub ebook files based on meta information";
        license = stdenv.lib.licenses.bsd3;
@@ -46969,7 +48114,7 @@ self: {
        pname = "eq";
        version = "4.0.4";
        sha256 = "1rdxmkmlgyinpih5p708k18j7qq0rj1c8gv240naa9gbkqg4qbq4";
-       buildDepends = [ base semigroupoids ];
+       libraryHaskellDepends = [ base semigroupoids ];
        homepage = "http://github.com/ekmett/eq/";
        description = "Leibnizian equality";
        license = stdenv.lib.licenses.bsd3;
@@ -46985,7 +48130,7 @@ self: {
        sha256 = "07n9xdsi00nz9xwd0bqrdn2d03q7dzlrr13wlym5lgc15r7iwf8w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring explicit-exception filemanip transformers
          utility-ht
        ];
@@ -47000,7 +48145,7 @@ self: {
        pname = "equational-reasoning";
        version = "0.2.0.5";
        sha256 = "1i8c3wn0z7binnz9p62c2mrvzgb305h797pnf5pvj9zk0iqxg21k";
-       buildDepends = [ base singletons template-haskell void ];
+       libraryHaskellDepends = [ base singletons template-haskell void ];
        description = "Proof assistant for Haskell using DataKinds & PolyKinds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47015,10 +48160,10 @@ self: {
        pname = "equivalence";
        version = "0.3.1";
        sha256 = "0zi053l03r5qcnpsphnq8xqazd0cbgj9n44hn47s1hagdra3j1bs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl STMonadTrans transformers transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers mtl QuickCheck STMonadTrans template-haskell
          test-framework test-framework-quickcheck2 transformers
          transformers-compat
@@ -47038,7 +48183,9 @@ self: {
        sha256 = "00cf1q7472kkl12z48dwnhixvyk99451by577qmfj0vhlnl1dc09";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring containers graphviz parsec text ];
+       executableHaskellDepends = [
+         base bytestring containers graphviz parsec text
+       ];
        jailbreak = true;
        homepage = "https://github.com/BurntSushi/erd";
        description = "An entity-relationship diagram generator from a plain text description";
@@ -47051,7 +48198,7 @@ self: {
        pname = "erf";
        version = "2.0.0.0";
        sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "The error function, erf, and related functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47062,7 +48209,7 @@ self: {
        pname = "erf-native";
        version = "1.0.0.1";
        sha256 = "0i031ws189rjl5gn44qpkfylx8kz7rdf3nzw9h0dmy2h86xbkckc";
-       buildDepends = [ base polynomial ];
+       libraryHaskellDepends = [ base polynomial ];
        homepage = "http://code.haskell.org/~mokus/erf-native";
        description = "Native Haskell implementation of the interface from the erf package";
        license = "GPL";
@@ -47076,7 +48223,7 @@ self: {
        pname = "erlang";
        version = "0.1";
        sha256 = "14jvl8mqdaxavzlkwdxr227m4igmcckhakmy45h7bgcxi5qbkla4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring directory filepath nano-md5 network random
        ];
        homepage = "http://github.com/esessoms/haskell-interface";
@@ -47091,7 +48238,7 @@ self: {
        pname = "eros";
        version = "0.6.0.0";
        sha256 = "0nr0c2qq30ji50pyjrklrb6a73i6qkqws7ywbfpa4pcd176xwlrw";
-       buildDepends = [ aeson base bytestring containers text ];
+       libraryHaskellDepends = [ aeson base bytestring containers text ];
        jailbreak = true;
        description = "A text censorship library";
        license = stdenv.lib.licenses.bsd3;
@@ -47107,7 +48254,7 @@ self: {
        sha256 = "15pi4khibvfpxni4v3kz6f92s8s34kmkx4q7kwq1rxk5gb6p8rcb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty base bytestring containers eros text
        ];
        jailbreak = true;
@@ -47126,7 +48273,7 @@ self: {
        sha256 = "1c7bwszjvbb3qnbvpjm0vin2x2z6dylplhs10hbhszkq2ypjjxyk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base blaze-html bytestring eros http-types markdown text wai
          warp
        ];
@@ -47141,7 +48288,7 @@ self: {
        pname = "errno";
        version = "0.1";
        sha256 = "0jix16b2c24pfbc3rig01nl68zdwpi28zzbciscalmq8lkpp10fa";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "a FFI utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47152,7 +48299,7 @@ self: {
        pname = "error-continuations";
        version = "0.1.0.0";
        sha256 = "0rv59fhlfr03qis957mjgl4gyk1i5axfyvr680z3ykbfd3k5gc1s";
-       buildDepends = [ base either mtl transformers ];
+       libraryHaskellDepends = [ base either mtl transformers ];
        jailbreak = true;
        homepage = "https://github.com/echatav/error-continuations";
        description = "Error Continuations";
@@ -47165,7 +48312,7 @@ self: {
        pname = "error-list";
        version = "0.1.0.3";
        sha256 = "0k0rpscg4h55215mgkd72yd5la3f2im21vlsgyg7v4pkrxd1cj1j";
-       buildDepends = [ base mtl text text-render ];
+       libraryHaskellDepends = [ base mtl text text-render ];
        homepage = "http://github.com/thinkpad20/error-list";
        description = "A useful type for collecting error messages";
        license = stdenv.lib.licenses.mit;
@@ -47177,7 +48324,7 @@ self: {
        pname = "error-loc";
        version = "0.1.0.0";
        sha256 = "0ch7c537fp52yg3qmc1v9rs4y70cc0zyb3g3i0bmmhgdhxd90bm5";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/error-loc";
        description = "An error replacement with call-site metadata";
@@ -47190,7 +48337,7 @@ self: {
        pname = "error-location";
        version = "0.1.5.5";
        sha256 = "1gfi3jvag662xbsiv75ndb8p9s3c7j6lny15a9gqk8wd4l71myid";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/gregwebs/ErrorLocation.hs";
        description = "error functions that show file location information";
        license = stdenv.lib.licenses.bsd3;
@@ -47204,7 +48351,7 @@ self: {
        pname = "error-message";
        version = "1.1";
        sha256 = "0xnz5l3r9x81pmb6nddzrrws1yqzdqydqkr2g1ib4pwmdwazf7f9";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base containers either-unwrap InfixApplicative mtl
        ];
        jailbreak = true;
@@ -47220,8 +48367,8 @@ self: {
        pname = "errorcall-eq-instance";
        version = "0.3.0";
        sha256 = "0hqw82m8bbrxy5vgdwb83bhzdx070ibqrm9rshyja7cb808ahijm";
-       buildDepends = [ base base-orphans ];
-       testDepends = [ base hspec QuickCheck ];
+       libraryHaskellDepends = [ base base-orphans ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        description = "An orphan Eq instance for ErrorCall";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -47232,7 +48379,7 @@ self: {
        pname = "errors";
        version = "1.4.7";
        sha256 = "09g53dylwsw1phxq5zhkbq8pnpwqzipvqclmcrdypzkpwkmfncl7";
-       buildDepends = [ base either safe transformers ];
+       libraryHaskellDepends = [ base either safe transformers ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47243,7 +48390,7 @@ self: {
        pname = "errors";
        version = "2.0.0";
        sha256 = "00s7vsqfvv23j3mpicrhspibbyzi5diqrdgajqx9n2snq8vxn9s5";
-       buildDepends = [ base safe transformers ];
+       libraryHaskellDepends = [ base safe transformers ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47256,16 +48403,19 @@ self: {
      mkDerivation {
        pname = "ersatz";
        version = "0.3";
-       revision = "3";
        sha256 = "1hq6cdw1rvwc0289saz36x2imwwnj203hqk2lsbkbhyghdvqmpbr";
+       revision = "3";
        editedCabalFile = "aafa6482bcf20d998dfc122b780b0378ec05187235252f4715e98bac02fc5b6c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base bytestring containers data-default lens mtl parsec
-         process temporary transformers unordered-containers
+       libraryHaskellDepends = [
+         array base bytestring containers data-default lens mtl process
+         temporary transformers unordered-containers
        ];
-       testDepends = [ base directory doctest filepath ];
+       executableHaskellDepends = [
+         array base containers lens mtl parsec
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/ersatz";
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
@@ -47283,7 +48433,7 @@ self: {
        sha256 = "1dpp4jl5mzc2z07f5670baxn95xvqgl9ynk0r0m83arpyp380fdq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ersatz toysolver transformers
        ];
        homepage = "https://github.com/msakai/ersatz-toysat";
@@ -47303,15 +48453,17 @@ self: {
        sha256 = "0ica7vir4ragcc3xrkzlmhncnn0ddx8ky61cj32z7ginybfjq2ig";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-expr base bytestring regex-compat text
-         unordered-containers vector yaml
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring yaml
        ];
        jailbreak = true;
        homepage = "https://bitbucket.org/kayo/ert";
        description = "Easy Runtime Templates";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "esotericbot" = callPackage
@@ -47324,7 +48476,11 @@ self: {
        sha256 = "0r77y94ff210nqjga0xm2hrraa01dgjfaxs3ijrg11z6hfz523s7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers directory fgl mtl network stm
+         stream-fusion tuple unix
+       ];
+       executableHaskellDepends = [
          attoparsec base bytestring containers directory fgl mtl network stm
          stream-fusion tuple unix
        ];
@@ -47336,20 +48492,20 @@ self: {
      }) {};
 
   "esqueleto" = callPackage
-    ({ mkDerivation, base, conduit, containers, hspec, HUnit
-     , monad-control, monad-logger, persistent, persistent-sqlite
-     , persistent-template, QuickCheck, resourcet, tagged, text
-     , transformers, unordered-containers
+    ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
+     , hspec, HUnit, monad-control, monad-logger, persistent
+     , persistent-sqlite, persistent-template, QuickCheck, resourcet
+     , tagged, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "2.2.11";
-       sha256 = "0ldgiim5d23avzqgzmpyb1nfp9xpxc51fc98f3ii8ic4mxn4bjvp";
-       buildDepends = [
-         base conduit monad-logger persistent resourcet tagged text
-         transformers unordered-containers
+       version = "2.4.0";
+       sha256 = "1lihililzzryy93lka06cyv60sjjk91jlymsj68rkzz4238vh4z0";
+       libraryHaskellDepends = [
+         base blaze-html bytestring conduit monad-logger persistent
+         resourcet tagged text transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit containers hspec HUnit monad-control monad-logger
          persistent persistent-sqlite persistent-template QuickCheck
          resourcet text transformers
@@ -47365,7 +48521,7 @@ self: {
        pname = "ess";
        version = "0.1.0.0";
        sha256 = "0pxrs9vr6gc61md9q4rxdc5fikvjandqw2rygs0xamrqlna51bcq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/michaelochurch/ess";
        description = "The type-level S combinator in Haskell";
@@ -47379,7 +48535,9 @@ self: {
        pname = "estimator";
        version = "1.1.0.1";
        sha256 = "1sf378qhmsxxazkk7nn1d7nvrq1ladsfvkzshqjwsnyl5pgj7sgq";
-       buildDepends = [ ad base distributive lens linear reflection ];
+       libraryHaskellDepends = [
+         ad base distributive lens linear reflection
+       ];
        jailbreak = true;
        homepage = "https://github.com/GaloisInc/estimator";
        description = "State-space estimation algorithms such as Kalman Filters";
@@ -47394,7 +48552,7 @@ self: {
        pname = "estimators";
        version = "0.1.4";
        sha256 = "0n7j2ay68m73f1mkfsxrrcs1rq0fpavwf58r50y7wirpm5f6agcy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers deepseq list-tries MonadRandom mtl pretty
          prettyclass QuickCheck text
        ];
@@ -47412,7 +48570,9 @@ self: {
        sha256 = "100pqygnwclmpzjhzpz3j34y8v75d8ldxg76f9jys90gb41kggpi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bio bytestring containers random ];
+       executableHaskellDepends = [
+         base bio bytestring containers random
+       ];
        jailbreak = true;
        homepage = "http://blog.malde.org/";
        description = "Repeats from ESTs";
@@ -47427,11 +48587,13 @@ self: {
      mkDerivation {
        pname = "etcd";
        version = "1.0.5";
-       revision = "1";
        sha256 = "0bqz678mnpw2jpywz2m76923cyq864xn537a9zsqhm6c80gc0vwi";
+       revision = "1";
        editedCabalFile = "5cdbbc8d2aedc68e82e7c4d0cface390c3c68fb7ee7fb162d8123e42351f98fa";
-       buildDepends = [ aeson base bytestring http-conduit text time ];
-       testDepends = [ async base hspec MonadRandom mtl text ];
+       libraryHaskellDepends = [
+         aeson base bytestring http-conduit text time
+       ];
+       testHaskellDepends = [ async base hspec MonadRandom mtl text ];
        description = "Client for etcd, a highly-available key value store";
        license = "unknown";
      }) {};
@@ -47444,7 +48606,7 @@ self: {
        pname = "eternal";
        version = "0.1.1";
        sha256 = "151b9qcdyh0vixn0y4s9h54g1h0kk1hwcgh5xcx9qp7bgy0h8wv9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols transformers utf8-string
        ];
        description = "everything breaking the Fairbairn threshold";
@@ -47461,11 +48623,11 @@ self: {
        pname = "ether";
        version = "0.3.0.0";
        sha256 = "1k8g01ypck0w6sp6f3w3asdakzjg6k8m1sz58c2r5iz3z1v9b04m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mmorph monad-control mtl newtype-generics template-haskell
          transformers transformers-base transformers-lift
        ];
-       testDepends = [
+       testHaskellDepends = [
          base mtl QuickCheck tasty tasty-quickcheck transformers
        ];
        homepage = "https://int-index.github.io/ether/";
@@ -47487,14 +48649,14 @@ self: {
        sha256 = "0dkvvs7bk4paqjmr1zihi14kp4cb28s33b18kd3a17lz1vd4qbfc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint array base base16-bytestring binary bytestring
          cmdargs containers cryptohash data-default directory either entropy
          ethereum-merkle-patricia-db ethereum-rlp filepath haskoin
          leveldb-haskell mtl network network-simple nibblestring resourcet
          time transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
        description = "A Haskell version of an Ethereum client";
@@ -47512,11 +48674,11 @@ self: {
        pname = "ethereum-merkle-patricia-db";
        version = "0.0.1";
        sha256 = "0pxncaam139nl99wm1i7fcnnsy683p6inasz10knfd2jsxcz8yr8";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base base16-bytestring binary bytestring cryptohash
          data-default ethereum-rlp leveldb-haskell nibblestring resourcet
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-wl-pprint base base16-bytestring binary bytestring containers
          cryptohash data-default ethereum-rlp HUnit leveldb-haskell
          nibblestring resourcet test-framework test-framework-hunit
@@ -47535,10 +48697,10 @@ self: {
        pname = "ethereum-rlp";
        version = "0.0.1";
        sha256 = "1hx5nhdy27kx67mwi8zjgqfxir0z7bp47xsw3a6hz40hj716n9r5";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base base16-bytestring bytestring
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-wl-pprint base base16-bytestring bytestring HUnit
          test-framework test-framework-hunit
        ];
@@ -47556,7 +48718,10 @@ self: {
        sha256 = "165vwca1q001pa9f09vfhf724kq5jnsip907c9dr6fncj9yjdp2p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring curl random text-icu utf8-string xml
+       ];
+       executableHaskellDepends = [
          base bytestring curl random text-icu utf8-string xml
        ];
        description = "Random etymology online entry";
@@ -47571,10 +48736,11 @@ self: {
        pname = "euler";
        version = "0.9.2";
        sha256 = "14ghmy5qblfgacc6b07jja6pssglf393j5hjypz0l0azd9w56kh5";
-       buildDepends = [ base ];
-       testDepends = [
-         base directory happy hlint hspec process regex-posix xml
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory hlint hspec process regex-posix xml
        ];
+       testToolDepends = [ happy ];
        homepage = "https://github.com/decomputed/euler";
        description = "Mathematics utilities for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -47590,16 +48756,17 @@ self: {
        pname = "euphoria";
        version = "0.6.0.1";
        sha256 = "1bml75lj30y83bln5a7b36gcb9d6gci4vhmr8ins9nz6bc1l29m9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default deepseq elerea enummapset-th hashable
          HUnit transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit test-framework-th
        ];
        homepage = "http://github.com/tsurucapital/euphoria";
        description = "Dynamic network FRP with events and continuous values";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eurofxref" = callPackage
@@ -47610,7 +48777,7 @@ self: {
        pname = "eurofxref";
        version = "0.2.1";
        sha256 = "0zjf3rky2ww2nq4ryyz0069cv3ps1h29nwrgr2sk127bsik868x9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers failure hexpat http-conduit
          http-types monad-control mtl time
        ];
@@ -47626,7 +48793,9 @@ self: {
        pname = "event";
        version = "0.1.1";
        sha256 = "191d72dbaddxl2ql2860145iwfsrx2jrbcsylfq7028vmzzxqqm6";
-       buildDepends = [ base containers semigroups transformers ];
+       libraryHaskellDepends = [
+         base containers semigroups transformers
+       ];
        description = "Monoidal, monadic and first-class events";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47637,7 +48806,7 @@ self: {
        pname = "event-driven";
        version = "0.0.2";
        sha256 = "1jkrc1k0ixjs95fvj36gr08igpx5vqff5zc6bi9f04ldxqz4wbap";
-       buildDepends = [ base monads-tf yjtools ];
+       libraryHaskellDepends = [ base monads-tf yjtools ];
        description = "library for event driven programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47649,7 +48818,7 @@ self: {
        pname = "event-handlers";
        version = "0.0.0.3";
        sha256 = "1515v1khdkr145z5inrm2ardhpzfsbncpl5wmfd9nmilw97da9ld";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://code.haskell.org/~mokus/event-handlers";
        description = "Event handlers";
        license = stdenv.lib.licenses.publicDomain;
@@ -47663,10 +48832,10 @@ self: {
        pname = "event-list";
        version = "0.1.1.2";
        sha256 = "1nvc473rv9m6vr9l9d5x9v6h89819s822gwzilx8d5fj5i50nqzb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base non-negative QuickCheck transformers utility-ht
        ];
-       testDepends = [
+       testHaskellDepends = [
          base non-negative QuickCheck random transformers utility-ht
        ];
        homepage = "http://code.haskell.org/~thielema/event-list/";
@@ -47682,7 +48851,7 @@ self: {
        pname = "event-monad";
        version = "0.0.3";
        sha256 = "1phs799i4da1nfgx530bp93n9xhzgnavilwlk8nz5vi3kd61gzf4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers event-handlers haskell98 monad-loops mtl pretty
          prettyclass priority-queue stateref
        ];
@@ -47700,7 +48869,7 @@ self: {
        pname = "eventloop";
        version = "0.4.1.1";
        sha256 = "0d870kzcb08pc0ngrdkfibi0yq4zs5vcgg8acqpa8gdjaiksm8jg";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring network suspend text timers websockets
        ];
        jailbreak = true;
@@ -47718,7 +48887,7 @@ self: {
        pname = "eventstore";
        version = "0.8.0.0";
        sha256 = "0p1z7xs3412s2hnv7pc18y1gx65p5hf09038n96vl22kvc9d84ww";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base bytestring cereal containers network
          protobuf random sodium stm text time unordered-containers uuid
        ];
@@ -47733,7 +48902,7 @@ self: {
        pname = "every-bit-counts";
        version = "0.1";
        sha256 = "0r959iyd5nsw3sj7p0gwsccdgaald9lwisg0lvq9qynyz09kh4vj";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://research.microsoft.com/en-us/people/dimitris/pearl.pdf";
        description = "A functional pearl on encoding and decoding using question-and-answer strategies";
        license = stdenv.lib.licenses.bsd3;
@@ -47750,8 +48919,10 @@ self: {
        sha256 = "0v313l0akvw9b3zn7xffy4ixz2c70i40k6kh4vdlrw8dvyv7zxk3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers mtl pretty transformers ];
-       buildTools = [ alex happy ];
+       executableHaskellDepends = [
+         array base containers mtl pretty transformers
+       ];
+       executableToolDepends = [ alex happy ];
        homepage = "http://github.com/jfcmacro/ewe";
        description = "An language using in Programming Languages teaching";
        license = stdenv.lib.licenses.bsd3;
@@ -47766,7 +48937,7 @@ self: {
        pname = "ex-pool";
        version = "0.2";
        sha256 = "0da5grl2fdca24zhlngq2n16smdb4f5vvxqzc29ipsc3j7wkbmva";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exceptions hashable stm time transformers vector
        ];
        jailbreak = true;
@@ -47781,7 +48952,7 @@ self: {
        pname = "exact-combinatorics";
        version = "0.2.0.8";
        sha256 = "0pj7sh6s1kawk39hb42q1sx20g2rmzanpmr3zri9yvmb16qj5a1j";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Efficient exact computation of combinatoric functions";
        license = stdenv.lib.licenses.bsd3;
@@ -47793,7 +48964,7 @@ self: {
        pname = "exact-pi";
        version = "0.2.1.1";
        sha256 = "1f8lxdaal7m4vw8akzwlhn0j3vw5bh983f02j842g1vzs3n47x3g";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/dmcclean/exact-pi";
        description = "Exact rational multiples of pi (and integer powers of pi)";
        license = stdenv.lib.licenses.mit;
@@ -47805,7 +48976,7 @@ self: {
        pname = "exception-mailer";
        version = "0.4.1";
        sha256 = "068zhr90gldin0f6xafqp1pncf6rhhm3gagnvn6r3p0kx060ia23";
-       buildDepends = [ base hslogger mime-mail text ];
+       libraryHaskellDepends = [ base hslogger mime-mail text ];
        homepage = "https://github.com/drpowell/exception-mailer";
        description = "Catch all runtime exceptions and send an email";
        license = stdenv.lib.licenses.bsd3;
@@ -47819,7 +48990,7 @@ self: {
        pname = "exception-monads-fd";
        version = "0.2";
        sha256 = "1wrhi9h2k068f0q0aqvpmlyx3318znm137xnvx7icf5shlpsilvi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exception-transformers monads-fd transformers
        ];
        jailbreak = true;
@@ -47836,7 +49007,7 @@ self: {
        pname = "exception-monads-tf";
        version = "0.4";
        sha256 = "0k9ada0g4nxwxggarpfcfdzg2zvxqdg9bkb4hv5v3qqanjmvb9hg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exception-transformers monads-tf transformers
        ];
        description = "Exception monad transformer instances for monads-tf classes";
@@ -47849,7 +49020,9 @@ self: {
        pname = "exception-mtl";
        version = "0.4";
        sha256 = "1ya2xxl25afj2rxl2vziifrc91nzyg47vs06s0b65qjd7yz533j3";
-       buildDepends = [ base exception-transformers mtl transformers ];
+       libraryHaskellDepends = [
+         base exception-transformers mtl transformers
+       ];
        description = "Exception monad transformer instances for mtl classes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47862,8 +49035,10 @@ self: {
        pname = "exception-transformers";
        version = "0.4.0.1";
        sha256 = "1ay46wawrrsvii3b4kqxi2cg3b6r7wfw0l7d66il195qa6hh4sfq";
-       buildDepends = [ base stm transformers transformers-compat ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base stm transformers transformers-compat
+       ];
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit transformers
          transformers-compat
        ];
@@ -47877,7 +49052,7 @@ self: {
        pname = "exceptional";
        version = "0.3.0.0";
        sha256 = "01lzx4ihdvyivjnkvn78hcdsk83dvm6iy9v5q1f28kd1iv96x1ns";
-       buildDepends = [ base exceptions ];
+       libraryHaskellDepends = [ base exceptions ];
        homepage = "https://github.com/";
        description = "Essentially the Maybe type with error messages";
        license = stdenv.lib.licenses.bsd2;
@@ -47891,8 +49066,10 @@ self: {
        pname = "exceptions";
        version = "0.8.0.2";
        sha256 = "1x1bk1jf42k1gigiqqmkkh38z2ffhx8rsqiszdq3f94m2h6kw2h7";
-       buildDepends = [ base mtl stm transformers transformers-compat ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base mtl stm transformers transformers-compat
+       ];
+       testHaskellDepends = [
          base mtl QuickCheck stm test-framework test-framework-quickcheck2
          transformers transformers-compat
        ];
@@ -47912,11 +49089,12 @@ self: {
        sha256 = "103s0095bb71wz3axhzw2w2nm5wfr01r9ypkdvbp22zhmq3xr1bj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cryptohash directory executable-path file-embed
          template-haskell
        ];
-       testDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/fpco/executable-hash";
        description = "Provides the SHA1 hash of the program executable";
        license = stdenv.lib.licenses.mit;
@@ -47928,7 +49106,7 @@ self: {
        pname = "executable-path";
        version = "0.0.3";
        sha256 = "1jg58qf19qz93c60ryglcavwdcysz4fd4qn8kpw5im9w9kniawlc";
-       buildDepends = [ base directory filepath unix ];
+       libraryHaskellDepends = [ base directory filepath unix ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Finding out the full path of the executable";
        license = stdenv.lib.licenses.publicDomain;
@@ -47941,7 +49119,9 @@ self: {
        pname = "exhaustive";
        version = "1.1.1";
        sha256 = "0bgzg2qhx91hd9711bxv6cr2qc7m23g29al4gb7yx20cs78bz1mg";
-       buildDepends = [ base generics-sop template-haskell transformers ];
+       libraryHaskellDepends = [
+         base generics-sop template-haskell transformers
+       ];
        homepage = "http://github.com/ocharles/exhaustive";
        description = "Compile time checks that a computation considers producing data through all possible constructors";
        license = stdenv.lib.licenses.bsd3;
@@ -47957,13 +49137,12 @@ self: {
        sha256 = "1i1p9pwzdf44cp8d1crq40g1hv84gpimywq5kdpz2nfgcnr17ans";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers haddock-library http-client
          pcre-light pretty
        ];
        description = "Exheres generator for cabal packages";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exif" = callPackage
@@ -47972,8 +49151,8 @@ self: {
        pname = "exif";
        version = "3000.0.0";
        sha256 = "0w0l4xk3qwfiw10880729mwfdkx4xpfn9ffdw7fi5swyhinjh6wi";
-       buildDepends = [ base ];
-       extraLibraries = [ exif ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ exif ];
        description = "A Haskell binding to a subset of libexif";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47985,7 +49164,7 @@ self: {
        pname = "exists";
        version = "0.2";
        sha256 = "1f7v2f7jmqx0nkl2wla88mnb21nava74b73rvsmfbj4kxmwchsgy";
-       buildDepends = [ base contravariant ];
+       libraryHaskellDepends = [ base contravariant ];
        jailbreak = true;
        homepage = "http://github.com/glehel/exists";
        description = "Existential datatypes holding evidence of constraints";
@@ -48002,10 +49181,10 @@ self: {
        pname = "exp-pairs";
        version = "0.1.3.0";
        sha256 = "033sdkfg94m33qrkw0l3lbs6dm8ssxfdj3jg3p39w63q7va2c0hr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq generic-deriving ghc-prim memoize wl-pprint
        ];
-       testDepends = [
+       testHaskellDepends = [
          base matrix memoize QuickCheck random smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
@@ -48021,7 +49200,9 @@ self: {
        pname = "expand";
        version = "0.0.1";
        sha256 = "0i8agr9np8pg40z58z8jz1fvq3vqjk2sx247dn33mvqyd03hnbss";
-       buildDepends = [ AspectAG base HList murder uu-parsinglib ];
+       libraryHaskellDepends = [
+         AspectAG base HList murder uu-parsinglib
+       ];
        jailbreak = true;
        description = "Extensible Pandoc";
        license = "LGPL";
@@ -48036,7 +49217,7 @@ self: {
        pname = "expat-enumerator";
        version = "0.1.0.3";
        sha256 = "0alllaa9qj94jp99pyvbh4ckdvb43aba2l2jmigazqvbc9db03mx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator hexpat text transformers xml-types
        ];
        jailbreak = true;
@@ -48054,8 +49235,10 @@ self: {
        pname = "expiring-cache-map";
        version = "0.0.5.4";
        sha256 = "0wbx9qp9ki9gwrc9qafpflkmyj1yiryak1di163mz0i3dv2w73h8";
-       buildDepends = [ base containers hashable unordered-containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers hashable unordered-containers
+       ];
+       testHaskellDepends = [
          base bytestring containers hashable time unordered-containers
        ];
        homepage = "https://github.com/elblake/expiring-cache-map";
@@ -48069,7 +49252,7 @@ self: {
        pname = "expiring-mvar";
        version = "0.1";
        sha256 = "0mkc7d346vdsjg83a253986w4pps53r262w1if91q16kx6qci7yy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Create values which expire after a period of time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48082,7 +49265,9 @@ self: {
        sha256 = "14n8ic5mg2819s9bk4czwfxrkyz96c2lvnksv1hq5vwr579rvjx2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ ansi-wl-pprint base haskell-src-exts ];
+       executableHaskellDepends = [
+         ansi-wl-pprint base haskell-src-exts
+       ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/explain";
        description = "Show how expressions are parsed";
@@ -48096,7 +49281,7 @@ self: {
        pname = "explicit-determinant";
        version = "0.1.0.0";
        sha256 = "0g20kblzvhx53mi82frpx29x0nsfjrzsanqq8f6yw22lh47pbm4y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/jwaldmann/haskell-explicit-determinant";
        description = "explicit computation of determinant of small matrices";
@@ -48111,7 +49296,7 @@ self: {
        sha256 = "0f1p1llz6z4ag1wnf57mgm861cbw7va0g0m8klp6f6pnirdhlwz1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Exception";
        description = "Exceptions which are explicit in the type signature";
        license = stdenv.lib.licenses.bsd3;
@@ -48123,7 +49308,7 @@ self: {
        pname = "explicit-iomodes";
        version = "0.6.0.5";
        sha256 = "0irz1zy6iaipym73x343zvr6cqym6ci2vbjbyr564d29ymd6ldzd";
-       buildDepends = [ base base-unicode-symbols tagged ];
+       libraryHaskellDepends = [ base base-unicode-symbols tagged ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/explicit-iomodes/";
        description = "File handles with explicit IOModes";
@@ -48136,7 +49321,7 @@ self: {
        pname = "explicit-iomodes-bytestring";
        version = "0.2.0.2";
        sha256 = "0h3dlgkd2gx8zr3sh949nhqgrdg943dgpp4v1n599jjjpqpw16hj";
-       buildDepends = [ base bytestring explicit-iomodes ];
+       libraryHaskellDepends = [ base bytestring explicit-iomodes ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/explicit-iomodes-bytestring/";
        description = "Extends explicit-iomodes with ByteString operations";
@@ -48149,7 +49334,7 @@ self: {
        pname = "explicit-iomodes-text";
        version = "0.1.0.8";
        sha256 = "12ny5wa1j1wp8fbg5k8zkv4a3axmssxcvfvhg3frsm4dych6hmyg";
-       buildDepends = [ base explicit-iomodes text ];
+       libraryHaskellDepends = [ base explicit-iomodes text ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/explicit-iomodes-text/";
        description = "Extends explicit-iomodes with Text operations";
@@ -48162,7 +49347,9 @@ self: {
        pname = "explicit-sharing";
        version = "0.9";
        sha256 = "0jshv56i60mzlfddvfkcx0j7rzqdlhy6h09bmqci15wzisvpvjpq";
-       buildDepends = [ base containers derive mtl template-haskell ];
+       libraryHaskellDepends = [
+         base containers derive mtl template-haskell
+       ];
        jailbreak = true;
        homepage = "http://sebfisch.github.com/explicit-sharing";
        description = "Explicit Sharing of Monadic Effects";
@@ -48178,7 +49365,7 @@ self: {
        sha256 = "18x2gw9w2jzisyl2hsp2rlml6slnlbjpqbadqcbcm8pamnl7w1fc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base directory pngload ];
+       executableHaskellDepends = [ array base directory pngload ];
        homepage = "http://corsis.sourceforge.net/haskell/explore";
        description = "Experimental Plot data Reconstructor";
        license = stdenv.lib.licenses.bsd3;
@@ -48193,11 +49380,11 @@ self: {
      mkDerivation {
        pname = "exposed-containers";
        version = "0.5.5.1";
-       revision = "1";
        sha256 = "09ck4hadxgdlqpgxr45jxr261mzkzihmwd5b02xi05z8034bhqk7";
+       revision = "1";
        editedCabalFile = "25516f8a7288ce438b872a0d3054434c3ba48ce0ce8a57209ea6d78ce6e2665c";
-       buildDepends = [ array base deepseq ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ array base deepseq ghc-prim ];
+       testHaskellDepends = [
          array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -48213,7 +49400,7 @@ self: {
        pname = "expression-parser";
        version = "0.1";
        sha256 = "1ldp1f2c823byx4ag8jpmq9bhw26lq98fz7ljqslffs37pc098qs";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generalization of parsec's expression parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48226,7 +49413,7 @@ self: {
        pname = "extcore";
        version = "1.0.2";
        sha256 = "1dpn4dbbn5d3zqrhxkg8nvb97vp9pf61gwa46yf218nvwgqvx437";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath mtl parsec
          pretty syb
        ];
@@ -48247,7 +49434,7 @@ self: {
        sha256 = "1vbazvs1ij4qfhzf38f7z75lx4mdxnkvcb79ngqc3h67844s90xy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers feed happstack-auth happstack-server
          happstack-state happstack-util HTTP MaybeT monad-parallel mtl
          network old-locale regex-tdfa smartGroup stringsearch time xhtml
@@ -48265,7 +49452,7 @@ self: {
        pname = "extended-categories";
        version = "0.2.0";
        sha256 = "1dg9zvqszlg5v3mygazzgm84qlkcmpryv3vv4x3zwrzi1g0idq72";
-       buildDepends = [ base constraints ghc-prim tagged ];
+       libraryHaskellDepends = [ base constraints ghc-prim tagged ];
        jailbreak = true;
        homepage = "github.com/ian-mi/extended-categories";
        description = "Extended Categories";
@@ -48282,8 +49469,8 @@ self: {
        pname = "extended-reals";
        version = "0.2.1.0";
        sha256 = "1a3vp51l07kj85p578y5bryalqv1a8b5766w0hrr85yp67y7wfdp";
-       buildDepends = [ base deepseq hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq hashable ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th
        ];
@@ -48301,7 +49488,7 @@ self: {
        pname = "extensible";
        version = "0.3.5";
        sha256 = "0jff7vrmhj5sdd3migfi5p2bx35m6jbqlfai7rqpg0iqbxbp6pmy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints monad-skeleton profunctors tagged template-haskell
          transformers
        ];
@@ -48318,7 +49505,7 @@ self: {
        pname = "extensible-data";
        version = "0.1.0.4";
        sha256 = "143cl3w129mkvs410lx63v3x1dq2az8sk0hlcymaavnqik5maa6g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-lens hashable template-haskell unordered-containers
        ];
        jailbreak = true;
@@ -48336,10 +49523,10 @@ self: {
        pname = "extensible-effects";
        version = "1.11.0.0";
        sha256 = "14f8x6gyq28n3lpap4f5bn290llj57my1k28km9r1nh14kxl1lp9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base transformers transformers-base type-aligned void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th void
        ];
@@ -48354,7 +49541,7 @@ self: {
        pname = "extensible-exceptions";
        version = "0.1.1.4";
        sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Extensible exceptions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48365,7 +49552,9 @@ self: {
        pname = "external-sort";
        version = "0.2";
        sha256 = "1i7q3wh2c4fyv6wn4smws8r382hnnppj39xys43h9pkqfis786r9";
-       buildDepends = [ base binary bytestring EdisonAPI EdisonCore ];
+       libraryHaskellDepends = [
+         base binary bytestring EdisonAPI EdisonCore
+       ];
        description = "Sort large arrays on your hard drive. Kind of like the unix util sort.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48379,8 +49568,12 @@ self: {
        pname = "extra";
        version = "1.4.1";
        sha256 = "00fhy9l2cgfwj8873jf1iyz2fmhj1b3m0qlf38i4pd1yad8sfb70";
-       buildDepends = [ base directory filepath process time unix ];
-       testDepends = [ base directory filepath QuickCheck time unix ];
+       libraryHaskellDepends = [
+         base directory filepath process time unix
+       ];
+       testHaskellDepends = [
+         base directory filepath QuickCheck time unix
+       ];
        homepage = "https://github.com/ndmitchell/extra#readme";
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
@@ -48396,7 +49589,7 @@ self: {
        sha256 = "13wbzqw0iz7xkqdrwan9xxl8vwqvhvwzlypps964v1s1bgabmpqj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring bytestring-mmap directory elf filepath
          optparse-applicative
        ];
@@ -48418,7 +49611,7 @@ self: {
        pname = "ez-couch";
        version = "0.7.0";
        sha256 = "023wrrk7slrg8p547saspfvp771zqwdh7mnvwg1sag4a2j20b660";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder bytestring
          classy-prelude classy-prelude-conduit containers ghc-prim hashable
          hslogger http-conduit http-types mtl neat-interpolation old-locale
@@ -48438,7 +49631,7 @@ self: {
        pname = "faceted";
        version = "0.0.2.0";
        sha256 = "0apgad2rqpgxypm10n98agmfrlxydcawvsvyafdwj8jhynfycx03";
-       buildDepends = [ base free ];
+       libraryHaskellDepends = [ base free ];
        jailbreak = true;
        homepage = "http://github.com/haskell-faceted/haskell-faceted";
        description = "Faceted computation for dynamic information flow security";
@@ -48456,10 +49649,10 @@ self: {
        sha256 = "07shidg02drvxpny0qgmshgliz0agw1app5xjs3d0z9zv3v5y1am";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base Cabal containers deepseq parallel primes QuickCheck
-         random toolshed
+       libraryHaskellDepends = [
+         array base containers deepseq parallel primes random toolshed
        ];
+       executableHaskellDepends = [ Cabal QuickCheck ];
        homepage = "http://functionalley.eu";
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
@@ -48474,7 +49667,7 @@ self: {
        pname = "factual-api";
        version = "0.6.1";
        sha256 = "1njijf5l277qndp5xmyqji0fcd84zxnn9vhz5v8nlqp3pfcilidp";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers curl dataenc hoauth
          HTTP MissingH text unordered-containers utf8-string vector
        ];
@@ -48490,7 +49683,7 @@ self: {
        pname = "fad";
        version = "1.1.0.1";
        sha256 = "00n5m3fa14y882rnzw7pwc154bgp46rhvvj2cghldvybxmj61zgm";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/bjornbm/fad";
        description = "Forward Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
@@ -48502,7 +49695,7 @@ self: {
        pname = "failable-list";
        version = "0.2";
        sha256 = "0bq0q9n4wnacjqs517i12kl56m16n5ff4gk8kamh87gqkd58w06x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy streams, which might terminate with an error";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48513,7 +49706,7 @@ self: {
        pname = "failure";
        version = "0.2.0.3";
        sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Failure";
        description = "A simple type class for success/failure computations. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -48525,7 +49718,7 @@ self: {
        pname = "fair-predicates";
        version = "0.1.1";
        sha256 = "1z0c83gfmvwhzsj2iz422mxcyxc8jnic25i1vz6yp4xzv41ibmj6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://sebfisch.github.com/fair-predicates";
        description = "Fair Predicates";
        license = stdenv.lib.licenses.publicDomain;
@@ -48537,7 +49730,7 @@ self: {
        pname = "faker";
        version = "0.0.0.2";
        sha256 = "1wl0jx3adibf7z8k3jadnr90jvkmf3zhkq34qpsifcl18zip8skq";
-       buildDepends = [ base gimlh random split ];
+       libraryHaskellDepends = [ base gimlh random split ];
        homepage = "https://github.com/gazay/faker";
        description = "Pure Haskell library for generating fake data";
        license = stdenv.lib.licenses.mit;
@@ -48553,7 +49746,7 @@ self: {
        sha256 = "035rjjjvwbjw4z6nlmiyxia5y91yiiw7902f9q6n5jimi5xk2hgk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base gloss gloss-raster JuicyPixels-repa QuickCheck random repa
          repa-algorithms vector
        ];
@@ -48573,7 +49766,9 @@ self: {
        sha256 = "18h5d33hd4cs6dc508mzl7c46pxwrk2q0daabvg8m4fiwk5wzlr0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers haskell98 SDL SDL-mixer SDL-ttf ];
+       executableHaskellDepends = [
+         base containers haskell98 SDL SDL-mixer SDL-ttf
+       ];
        jailbreak = true;
        homepage = "http://bencode.blogspot.com/2009/03/falling-blocks-tetris-clone-in-haskell.html";
        description = "A fun falling blocks game";
@@ -48589,7 +49784,7 @@ self: {
        pname = "family-tree";
        version = "0.5.1";
        sha256 = "0b2063f8yz7hwv7h0yisrgh6glr5h4s1cx0q75gfg2wgp2mr72s1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers hashable intervals lens tables text time
          unordered-containers
        ];
@@ -48605,8 +49800,8 @@ self: {
        pname = "farmhash";
        version = "0.1.0.3";
        sha256 = "0zqyp55grrkl4x4bhn13ng635zpsnd7g6vj2dqmvn3dg4zhyigf6";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base bytestring hspec QuickCheck ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "https://github.com/abhinav/farmhash";
        description = "Fast hash functions";
        license = stdenv.lib.licenses.bsd3;
@@ -48620,8 +49815,8 @@ self: {
        pname = "fast-builder";
        version = "0.0.0.2";
        sha256 = "07fnn282ldfmgkfnsdnjr11hx89jhw7waz573a7nx2a329r1p4pf";
-       buildDepends = [ base bytestring ghc-prim ];
-       testDepends = [ base bytestring process QuickCheck stm ];
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       testHaskellDepends = [ base bytestring process QuickCheck stm ];
        homepage = "http://github.com/takano-akio/fast-builder";
        description = "Fast ByteString Builder";
        license = stdenv.lib.licenses.publicDomain;
@@ -48635,8 +49830,8 @@ self: {
        pname = "fast-digits";
        version = "0.1.0.0";
        sha256 = "1dhvlsjbp4qrgcr9xlzbaps59160j2zl98xl5nrz6rffypz0gi72";
-       buildDepends = [ base integer-gmp ];
-       testDepends = [
+       libraryHaskellDepends = [ base integer-gmp ];
+       testHaskellDepends = [
          base digits QuickCheck smallcheck tasty tasty-quickcheck
          tasty-smallcheck
        ];
@@ -48652,14 +49847,14 @@ self: {
      mkDerivation {
        pname = "fast-logger";
        version = "2.4.0";
-       revision = "3";
        sha256 = "1hh5rll2q4dpshplyk0hciknvypx3v2hd102hf0f2z5h70d4xzsc";
+       revision = "3";
        editedCabalFile = "af5edf5e05ecd782e1d87b9d5730c5a9eb1016ac01fb1a377dda1cd8e88a274b";
-       buildDepends = [
+       libraryHaskellDepends = [
          array auto-update base bytestring bytestring-builder directory
          filepath text
        ];
-       testDepends = [ base bytestring directory hspec ];
+       testHaskellDepends = [ base bytestring directory hspec ];
        description = "A fast logging system";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48670,7 +49865,7 @@ self: {
        pname = "fast-math";
        version = "1.0.2";
        sha256 = "15dyw88z9abiv6n40fz4g3jpj9v6qbxvqaf0ds32wh46igf1s425";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Non IEEE-754 compliant compile-time floating-point optimisations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48685,10 +49880,13 @@ self: {
        sha256 = "1m6v9jdla0r36l45gs3swycfgisl48hjq7x9rvfc08h4kd5mcmay";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers cpphs deepseq directory filepath text
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring containers directory filepath text
+       ];
+       testHaskellDepends = [
          base bytestring containers directory filepath tasty tasty-hunit
          text
        ];
@@ -48704,7 +49902,7 @@ self: {
        pname = "fast-tagsoup";
        version = "1.0.7";
        sha256 = "089karddj08z0lfr83r2x070j67i2s0aq2s1qi5i66vw335y91d8";
-       buildDepends = [ base bytestring tagsoup text text-icu ];
+       libraryHaskellDepends = [ base bytestring tagsoup text text-icu ];
        homepage = "https://github.com/vshabanov/fast-tagsoup";
        description = "Fast parser for tagsoup package";
        license = stdenv.lib.licenses.bsd3;
@@ -48716,7 +49914,7 @@ self: {
        pname = "fast-tagsoup-utf8-only";
        version = "1.0.5";
        sha256 = "10svhgjvp1802jawr1s5chkincl2xhh6k0grm60f216jpasbvff4";
-       buildDepends = [ base bytestring tagsoup text ];
+       libraryHaskellDepends = [ base bytestring tagsoup text ];
        homepage = "https://github.com/exbb2/fast-tagsoup";
        description = "Fast parser for tagsoup package";
        license = stdenv.lib.licenses.bsd3;
@@ -48730,7 +49928,7 @@ self: {
        pname = "fasta";
        version = "0.7.2.1";
        sha256 = "1jwx8h3z3zlrnandqgmgrkam4y0awm3k1mfzljf7pn9acq6nxhs4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers foldl lens parsec pipes pipes-bytestring
          pipes-group pipes-text split text
        ];
@@ -48746,7 +49944,7 @@ self: {
        pname = "fastbayes";
        version = "0.2.0.0";
        sha256 = "1nqrfrhw8gd3blfzrwbf7pm4wwqbxfaw640bzx62kwh7x2h6v3cm";
-       buildDepends = [ base hmatrix vector ];
+       libraryHaskellDepends = [ base hmatrix vector ];
        jailbreak = true;
        homepage = "https://github.com/cscherrer/fastbayes";
        description = "Bayesian modeling algorithms accelerated for particular model structures";
@@ -48758,11 +49956,11 @@ self: {
      mkDerivation {
        pname = "fastcgi";
        version = "3001.0.2.4";
-       revision = "1";
        sha256 = "0lp17w098043xczwkah7h1x47wzrym7vv5adgla0aq9iybqay7xr";
+       revision = "1";
        editedCabalFile = "74cd87692a90492171802f25c034ef047f0b68aaa1b53303d4e50ce3ec30e98a";
-       buildDepends = [ base bytestring cgi ];
-       extraLibraries = [ fcgi ];
+       libraryHaskellDepends = [ base bytestring cgi ];
+       librarySystemDepends = [ fcgi ];
        description = "A Haskell library for writing FastCGI programs";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) fcgi;};
@@ -48776,11 +49974,11 @@ self: {
        pname = "fastedit";
        version = "0.1.0.0";
        sha256 = "0ax5wnbf75n39crd9bw0xf3g83zlh29pbhwapbc5q7315rjdfxfj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude bytestring containers hashable safe
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-prelude bytestring edit-distance file-embed hspec
          QuickCheck
        ];
@@ -48797,7 +49995,7 @@ self: {
        pname = "fastirc";
        version = "0.2.0";
        sha256 = "0ddacpw19kh304j8js9ybwclkgyh8n5yy1r2xh48z9h3gas2zim4";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-show containers monadLib
          network-fancy
        ];
@@ -48812,7 +50010,7 @@ self: {
        pname = "fault-tree";
        version = "0.0.0";
        sha256 = "04m6hfj0sqhmq89fwfq4igz1rc0p3rzkhfg6fzsw5kyda2c8bbz0";
-       buildDepends = [ base yices ];
+       libraryHaskellDepends = [ base yices ];
        homepage = "http://tomahawkins.org";
        description = "A fault tree analysis library";
        license = stdenv.lib.licenses.bsd3;
@@ -48833,14 +50031,14 @@ self: {
        sha256 = "1772gdqka5hcgs2bq76bba9pca5xx32q3fg9vvkjqd5249rk5gv6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-default data-lens-light
          directory filepath ghc-paths haskell-src-exts language-ecmascript
-         mtl mtl-compat optparse-applicative process safe sourcemap split
-         spoon syb text time transformers transformers-compat
-         traverse-with-class type-eq uniplate unordered-containers
-         utf8-string vector
+         mtl mtl-compat process safe sourcemap split spoon syb text time
+         transformers transformers-compat traverse-with-class type-eq
+         uniplate unordered-containers utf8-string vector
        ];
+       executableHaskellDepends = [ base mtl optparse-applicative split ];
        homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
@@ -48852,7 +50050,7 @@ self: {
        pname = "fay-base";
        version = "0.20.0.1";
        sha256 = "17mfblr40jhn93vz6vn0n0xsk4lwf5d5cavfy5zy8sg4inp6dkjr";
-       buildDepends = [ base fay ];
+       libraryHaskellDepends = [ base fay ];
        homepage = "https://github.com/faylang/fay/";
        description = "The base package for Fay";
        license = stdenv.lib.licenses.bsd3;
@@ -48866,7 +50064,7 @@ self: {
        pname = "fay-builder";
        version = "0.2.0.5";
        sha256 = "18ii5dnzk866q79h43fspdz8dzg17mzfrykh3pl4p0q4qdnylv8i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal data-default directory fay filepath safe split text
        ];
        description = "Compile Fay code on cabal install, and ad-hoc recompile during development";
@@ -48879,7 +50077,7 @@ self: {
        pname = "fay-dom";
        version = "0.5.0.1";
        sha256 = "1zm6w6nccswaksr283alhnsss6xw4k7s61yp8ff4lg5127ff9wp0";
-       buildDepends = [ fay-base ];
+       libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/faylang/fay-dom";
        description = "DOM FFI wrapper library for Fay";
        license = stdenv.lib.licenses.bsd3;
@@ -48891,7 +50089,7 @@ self: {
        pname = "fay-geoposition";
        version = "0.1.0.1";
        sha256 = "1qmkwfqgvj6a8fan1l3i18ggpl00vrfd2mhqj13g0gh9yhvgxv1q";
-       buildDepends = [ fay-base fay-text ];
+       libraryHaskellDepends = [ fay-base fay-text ];
        homepage = "https://github.com/victoredwardocallaghan/fay-geoposition";
        description = "W3C compliant implementation of GeoPosition API";
        license = stdenv.lib.licenses.bsd3;
@@ -48903,7 +50101,7 @@ self: {
        pname = "fay-hsx";
        version = "0.2.0";
        sha256 = "1mzjna8yc7jczgggpcgh9i6akiy72d60jczvmzxngh778z3g5zmi";
-       buildDepends = [ fay-base fay-jquery ];
+       libraryHaskellDepends = [ fay-base fay-jquery ];
        jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Clientside HTML generation for fay";
@@ -48917,7 +50115,7 @@ self: {
        pname = "fay-jquery";
        version = "0.6.0.3";
        sha256 = "1x6i8y6xbz4nyzw59j3cqkhmjvgx9l4vdyh7jr0l1vv396ssnghf";
-       buildDepends = [ fay-base fay-text ];
+       libraryHaskellDepends = [ fay-base fay-text ];
        homepage = "https://github.com/faylang/fay-jquery";
        description = "jQuery bindings for Fay";
        license = stdenv.lib.licenses.bsd3;
@@ -48929,7 +50127,7 @@ self: {
        pname = "fay-ref";
        version = "0.1.0.0";
        sha256 = "1dcifraih13zqwmm4xn57wfg63rdkiac81avyymid308r6p1x9cn";
-       buildDepends = [ fay-base ];
+       libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/A1kmm/fay-ref";
        description = "Like IORef but for Fay";
        license = stdenv.lib.licenses.bsd3;
@@ -48941,7 +50139,7 @@ self: {
        pname = "fay-text";
        version = "0.3.2.2";
        sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans";
-       buildDepends = [ fay fay-base text ];
+       libraryHaskellDepends = [ fay fay-base text ];
        homepage = "https://github.com/faylang/fay-text";
        description = "Fay Text type represented as JavaScript strings";
        license = stdenv.lib.licenses.mit;
@@ -48953,7 +50151,7 @@ self: {
        pname = "fay-uri";
        version = "0.2.0.0";
        sha256 = "1vv4jgkz9cx8inbn6g6sn3a0nf1ak81qlj5li21sk2isj0yws1nr";
-       buildDepends = [ fay-base ];
+       libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/faylang/fay-uri";
        description = "Persistent FFI bindings for using jsUri in Fay";
        license = stdenv.lib.licenses.bsd3;
@@ -48971,14 +50169,14 @@ self: {
        pname = "fb";
        version = "1.0.11";
        sha256 = "19kvsc6ap56b3h1z6wnjqmxgnqs7jqlhd3zx08h6nxkip3ddnzh5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring cereal conduit conduit-extra crypto-api cryptohash
          cryptohash-cryptoapi data-default http-conduit http-types
          lifted-base monad-control monad-logger old-locale resourcet text
          time transformers transformers-base unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring conduit containers data-default hspec
          http-conduit HUnit lifted-base monad-control QuickCheck resourcet
          text time transformers
@@ -48995,7 +50193,7 @@ self: {
        pname = "fb-persistent";
        version = "0.3.5";
        sha256 = "0idxwm4brbn73s8azxsys6lxg9c4vzs0b123h9lg4qs4ks5451hh";
-       buildDepends = [ base cereal fb persistent text time ];
+       libraryHaskellDepends = [ base cereal fb persistent text time ];
        homepage = "https://github.com/prowdsponsor/fb-persistent";
        description = "Provides Persistent instances to Facebook types";
        license = stdenv.lib.licenses.bsd3;
@@ -49009,7 +50207,7 @@ self: {
        pname = "fca";
        version = "0.1.0.2";
        sha256 = "1c38524r3mhy4m7s1cvfcn539xvf50x0z8a9fzk4x4pz5yq9c1vp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers cryptohash hashable text
          unordered-containers
        ];
@@ -49028,10 +50226,11 @@ self: {
        sha256 = "1z3vphn3vgvsq0mshhvsks03v79wnj9g6r8mmrwkiax126aqzqn6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base directory process text unix vty vty-ui
        ];
-       testDepends = [ base tasty tasty-hunit ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/Neki/fcd";
        description = "A faster way to navigate directories using the command line";
        license = stdenv.lib.licenses.mit;
@@ -49044,7 +50243,7 @@ self: {
        pname = "fckeditor";
        version = "0.1";
        sha256 = "1yvsnk9awik143jh2268w1l5x70kmky60gac10fy2y1450dcn65x";
-       buildDepends = [ base cgi HaXml xhtml ];
+       libraryHaskellDepends = [ base cgi HaXml xhtml ];
        jailbreak = true;
        homepage = "http://peteg.org/";
        description = "Server-Side Integration for FCKeditor";
@@ -49059,8 +50258,10 @@ self: {
        pname = "fclabels";
        version = "2.0.2.2";
        sha256 = "0jvmmmky2h4i6lh0zj67j8rf1r1r1plv1s9y67jbs821266ffra8";
-       buildDepends = [ base mtl template-haskell transformers ];
-       testDepends = [ base HUnit mtl template-haskell transformers ];
+       libraryHaskellDepends = [ base mtl template-haskell transformers ];
+       testHaskellDepends = [
+         base HUnit mtl template-haskell transformers
+       ];
        homepage = "https://github.com/sebastiaanvisser/fclabels";
        description = "First class accessor labels implemented as lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -49072,7 +50273,7 @@ self: {
        pname = "fclabels-monadlib";
        version = "0.2.1";
        sha256 = "1j15fxrpwnjnbjkswsy6jxn8f0bj2nhcdsf5976i7rka7gsjzr3d";
-       buildDepends = [ base fclabels monadLib ];
+       libraryHaskellDepends = [ base fclabels monadLib ];
        jailbreak = true;
        description = "MonadLib monadic interface for the \"fclabels\" package";
        license = stdenv.lib.licenses.bsd3;
@@ -49084,7 +50285,7 @@ self: {
        pname = "fdo-notify";
        version = "0.3.1";
        sha256 = "1n4zk1i7g34w0wk5zy8n4r63xbglxf62h8j78kv5fc2yn95l30vh";
-       buildDepends = [ base containers dbus ];
+       libraryHaskellDepends = [ base containers dbus ];
        homepage = "http://bitbucket.org/taejo/fdo-notify/";
        description = "Desktop Notifications client";
        license = stdenv.lib.licenses.bsd3;
@@ -49100,7 +50301,10 @@ self: {
        sha256 = "04y29wmndyvrlrixj57m7jgx3z8qld0nvlggmg0rvia4p2dv82bk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Diff directory filepath old-locale parsec time unix url
+       ];
+       executableHaskellDepends = [
          base Diff directory filepath old-locale parsec time unix url
        ];
        homepage = "https://github.com/jkarlson/fdo-trash";
@@ -49115,7 +50319,7 @@ self: {
        pname = "feature-flags";
        version = "0.1.0.1";
        sha256 = "1lssjgksq0k2dd7l5lmzxnr9f5zk3gbh386zfmcqgc4iczdzfk0f";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        homepage = "https://github.com/iand675/feature-flags";
        description = "A simple library for dynamically enabling and disabling functionality";
        license = stdenv.lib.licenses.mit;
@@ -49127,7 +50331,7 @@ self: {
        pname = "fec";
        version = "0.1.1";
        sha256 = "04ryd1c06l45af6627vjvprhs0rk1rwl0k9gq0byr95ghvc6mk6d";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://allmydata.org/source/zfec";
        description = "Forward error correction of ByteStrings";
        license = "GPL";
@@ -49140,14 +50344,14 @@ self: {
      mkDerivation {
        pname = "fedora-packages";
        version = "0.0.3";
-       revision = "1";
        sha256 = "14fpv76ndp755mysgbya2hgr35rg2hb6dsagmrq2j2mn06xmngqk";
+       revision = "1";
        editedCabalFile = "b09d857e6d91527f8c9fbb8626e1610c5c7b994a6fcf30cd3328c668a6e8d33a";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers HsOpenSSL http-streams io-streams
          lens text
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers hlint HsOpenSSL hspec http-streams
          io-streams lens text
        ];
@@ -49165,10 +50369,10 @@ self: {
        pname = "feed";
        version = "0.3.9.7";
        sha256 = "01ssy7a1525cw72igpk1xksyafs7can68gmb81kvlzw8fddl4s0l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base old-locale old-time time time-locale-compat utf8-string xml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit old-locale old-time test-framework test-framework-hunit
          time time-locale-compat utf8-string xml
        ];
@@ -49187,7 +50391,7 @@ self: {
        sha256 = "0gql641jmbldx6vhk37i2v41j2nq22lrihm48f97wirrxw7yjn61";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory feed old-locale old-time time xml
        ];
        jailbreak = true;
@@ -49205,7 +50409,7 @@ self: {
        pname = "feed-crawl";
        version = "0.1.2.0";
        sha256 = "0d3yfkiazzlypp3s85fqikwlli28ss27h0i215114vxsswmx1g7c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit connection http-conduit http-types hxt
          network-uri text transformers
        ];
@@ -49225,7 +50429,7 @@ self: {
        sha256 = "0ym4f6d8fxl6j9kfqmp3ds36qj35nypxjmmqv6w96yz5y8ia3ynv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base curl directory feed haskell98 HTTP old-locale pureMD5
          regex-posix tagsoup time utf8-string
        ];
@@ -49243,7 +50447,9 @@ self: {
        sha256 = "1zhl7f5zlyv0l5h0zay66p532n1vywnirwxbc1c9fjaia7yv0rij";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring download-curl feed hs-twitter ];
+       libraryHaskellDepends = [
+         base bytestring download-curl feed hs-twitter
+       ];
        homepage = "http://github.com/tomlokhorst/feed2twitter";
        description = "Send posts from a feed to Twitter";
        license = stdenv.lib.licenses.bsd3;
@@ -49261,16 +50467,16 @@ self: {
        pname = "feldspar-compiler";
        version = "0.7";
        sha256 = "0kkxjnbx4yn3k2s1gdxg4jj06fhdd2jprq8s4zyaybs8xcddgvhh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers data-default directory feldspar-language
          filepath ghc-paths mtl plugins plugins-multistage pretty process
          storable-record storable-tuple syntactic template-haskell
        ];
-       testDepends = [
+       librarySystemDepends = [ gcc_s ];
+       testHaskellDepends = [
          base bytestring Cabal feldspar-language mtl process QuickCheck
          tasty tasty-golden tasty-quickcheck
        ];
-       extraLibraries = [ gcc_s ];
        jailbreak = true;
        homepage = "http://feldspar.github.com";
        description = "Compiler for the Feldspar language";
@@ -49288,12 +50494,12 @@ self: {
        pname = "feldspar-language";
        version = "0.7";
        sha256 = "0gzs2qdvpzcx4w89wpmwk2jnambvyl08afpk16989vcviq5ri51n";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers data-default data-hash data-lens deepseq
          monad-par mtl patch-combinators QuickCheck random syntactic tagged
          tuple
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring QuickCheck random tasty tasty-golden
          tasty-quickcheck tasty-th utf8-string
        ];
@@ -49313,7 +50519,7 @@ self: {
        pname = "feldspar-signal";
        version = "0.0.1.0";
        sha256 = "147y0fy5pzagk8pm8way8qnxv42mn5qh8kmzjf02laydzxrwvpxd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat feldspar-compiler feldspar-compiler-shim
          feldspar-language imperative-edsl mainland-pretty monadic-edsl-priv
        ];
@@ -49334,8 +50540,15 @@ self: {
        sha256 = "01111rxpdd9pqpjs54krx4z67k3abjglw9zbvn5j97z9zdj5qr81";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ api-opentheory-unicode base opentheory-unicode ];
-       testDepends = [ api-opentheory-unicode base opentheory-unicode ];
+       libraryHaskellDepends = [
+         api-opentheory-unicode base opentheory-unicode
+       ];
+       executableHaskellDepends = [
+         api-opentheory-unicode base opentheory-unicode
+       ];
+       testHaskellDepends = [
+         api-opentheory-unicode base opentheory-unicode
+       ];
        description = "Converting a chess position from FEN notation to text";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -49346,7 +50559,7 @@ self: {
        pname = "fences";
        version = "0.1.1";
        sha256 = "16qzqczr6nlbng16vby1c12a0apfjm4lmm0pgybi5xaziaq4c4db";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "To be written";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49362,10 +50575,10 @@ self: {
        sha256 = "0sq4g0sdayk1lqzdhggwshl22gny5cjbv70cmr1p27q0wfwfbfff";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo gtk harp HaXml mtl template-haskell unix
        ];
-       extraLibraries = [ raptor ];
+       executableSystemDepends = [ raptor ];
        homepage = "http://fenfire.org/";
        description = "Graph-based notetaking system";
        license = "GPL";
@@ -49378,7 +50591,7 @@ self: {
        pname = "fez-conf";
        version = "1.0.3";
        sha256 = "1gssbkwg9lqm3ajqkkcjnxjz8nhz855ki2hi5n2di3dappr73f0b";
-       buildDepends = [ base containers regex-compat ];
+       libraryHaskellDepends = [ base containers regex-compat ];
        homepage = "http://ui3.info/d/proj/fez-conf.html";
        description = "Simple functions for loading config files";
        license = stdenv.lib.licenses.bsd3;
@@ -49392,7 +50605,8 @@ self: {
        sha256 = "1976v5m050lwp8v2vh1cm08pn6q9lbdkxhq10pql6fyzysn6qz62";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base HTTP json network pretty utf8-string ];
+       libraryHaskellDepends = [ base HTTP json network utf8-string ];
+       executableHaskellDepends = [ base pretty ];
        description = "Haskell binding to the FriendFeed API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49408,14 +50622,13 @@ self: {
        pname = "fficxx";
        version = "0.2.1";
        sha256 = "1vjkwp0krs2762ww7vkl1g0dpaw6ifba7acjndmqbnvm3yl0ha0d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal containers data-default directory either
          errors filepath hashable HStringTemplate lens mtl process pureMD5
          split template-haskell transformers unordered-containers
        ];
        description = "automatic C++ binding generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fficxx-runtime" = callPackage
@@ -49424,7 +50637,7 @@ self: {
        pname = "fficxx-runtime";
        version = "0.2.1";
        sha256 = "0hcpc0db4mh3yx8yzbkllq9b04dd1qvr63ppz2qa9nq5zydb5pxk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Runtime for fficxx-generated library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49439,10 +50652,15 @@ self: {
        sha256 = "13pkdsjsw1h6gscpp2jwly1w81jj3rpb27ssa0w7gi2qhjcg1inw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base either exceptions JuicyPixels mtl transformers vector
        ];
-       pkgconfigDepends = [ ffmpeg libavcodec libavformat libswscale ];
+       libraryPkgconfigDepends = [
+         ffmpeg libavcodec libavformat libswscale
+       ];
+       executableHaskellDepends = [
+         base JuicyPixels mtl transformers vector
+       ];
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ffmpeg;  libavcodec = null;
@@ -49457,7 +50675,9 @@ self: {
        sha256 = "134czpbzxw0mpnc5mz6j1l6vavdbhw5w3l4lg5zbc2gq1qg9ikqv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring haskell98 hs-ffmpeg SDL stm ];
+       executableHaskellDepends = [
+         base bytestring haskell98 hs-ffmpeg SDL stm
+       ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/VasylPasternak/ffmpeg-tutorials";
        description = "Tutorials on ffmpeg usage to play video/audio";
@@ -49473,11 +50693,11 @@ self: {
        pname = "fft";
        version = "0.1.8.1";
        sha256 = "00q1j6swi5y740n5dnbc73aw1nphsgyx7qnv59snqd48fcllhcww";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base carray ix-shapable storable-complex syb
        ];
-       testDepends = [ base carray QuickCheck storable-complex ];
-       pkgconfigDepends = [ fftw fftwFloat ];
+       libraryPkgconfigDepends = [ fftw fftwFloat ];
+       testHaskellDepends = [ base carray QuickCheck storable-complex ];
        jailbreak = true;
        description = "Bindings to the FFTW library";
        license = stdenv.lib.licenses.bsd3;
@@ -49489,8 +50709,8 @@ self: {
        pname = "fftwRaw";
        version = "0.1.0.0";
        sha256 = "1dkkn72g4arjamv647ba05j7aj95vvjy2wdd6g9xcc5w2ix45kr4";
-       buildDepends = [ base ];
-       extraLibraries = [ fftw ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ fftw ];
        homepage = "https://github.com/adamwalker/haskell-fftw-simple";
        description = "Low level bindings to FFTW";
        license = stdenv.lib.licenses.bsd3;
@@ -49504,8 +50724,10 @@ self: {
        pname = "fgl";
        version = "5.5.2.1";
        sha256 = "1nfm3gkr6cccqhi1g46k2d0l99yw2vq7xjd1hxxzcci5gidp8bhc";
-       buildDepends = [ array base containers deepseq transformers ];
-       testDepends = [ base containers hspec QuickCheck ];
+       libraryHaskellDepends = [
+         array base containers deepseq transformers
+       ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Martin Erwig's Functional Graph Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49516,11 +50738,10 @@ self: {
        pname = "fgl-arbitrary";
        version = "0.2.0.0";
        sha256 = "1116c4r1ick3xjhwwq9b6i1082njmxj2aymgkqppabj3d0hv43c4";
-       buildDepends = [ base fgl QuickCheck ];
-       testDepends = [ base containers fgl hspec QuickCheck ];
+       libraryHaskellDepends = [ base fgl QuickCheck ];
+       testHaskellDepends = [ base containers fgl hspec QuickCheck ];
        description = "QuickCheck support for fgl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fgl-extras-decompositions" = callPackage
@@ -49529,7 +50750,7 @@ self: {
        pname = "fgl-extras-decompositions";
        version = "0.1.1.0";
        sha256 = "0p9dv7hq312wjqzm2ha4rafnmd1vplzwd5vk5fmzypgl2a1cz42s";
-       buildDepends = [ base containers fgl ];
+       libraryHaskellDepends = [ base containers fgl ];
        homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "Graph decomposition algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -49541,7 +50762,7 @@ self: {
        pname = "fgl-visualize";
        version = "0.1.0.1";
        sha256 = "0vwafx0rggksg5i7cx4r2bs5wa6csb5p39vpix425zr3l6vggrxq";
-       buildDepends = [ base dotgen fgl ];
+       libraryHaskellDepends = [ base dotgen fgl ];
        description = "Convert FGL graphs to dot (graphviz) files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49558,7 +50779,7 @@ self: {
        sha256 = "1jkawf65gdmyzmdw4xfk3jihahi3x7vsavjfy6rnl96bj15q4vzl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base bytestring bytestring-lexing Cabal cereal
          containers directory filepath hslogger mtl old-locale old-time
          process regex-compat statistics syb tabular time vector
@@ -49576,7 +50797,7 @@ self: {
        pname = "fibonacci";
        version = "0.2.0.1";
        sha256 = "18jqb4ynjsnpvydzpqzh7l5wyrjb3s3kxgc6a6ipwb6w2hygyf7k";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/sebfisch/fibonacci";
        description = "Fast computation of Fibonacci numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -49590,7 +50811,7 @@ self: {
        pname = "fields";
        version = "0.1.0";
        sha256 = "0xxri0a3y75ppywcm6py9zbffaawcycrv8gabflbl1m1z8n6jq6v";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers fclabels monads-fd transformers
        ];
        homepage = "http://github.com/AstraFIN/fields";
@@ -49607,7 +50828,7 @@ self: {
        pname = "fields-json";
        version = "0.2.2.3";
        sha256 = "0wqci95ad339nd3lfbhc6v55c7zdkq714hw8igq5fwvbd8kq11d0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring containers json mtl utf8-string
        ];
        description = "Abusing monadic syntax JSON objects generation";
@@ -49620,8 +50841,8 @@ self: {
        pname = "fieldwise";
        version = "0.1.0.0";
        sha256 = "1mmlw5nk09w829gjp8lc0p280vdkh68rv05b1j55x99l7xywgvj7";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components";
        license = stdenv.lib.licenses.bsd2;
@@ -49634,7 +50855,7 @@ self: {
        pname = "fig";
        version = "1.4.0";
        sha256 = "03bxiicvfwia5g0whg454ph2s34n8firjcqhn6d7qvbim338hkxq";
-       buildDepends = [ base containers parsec pretty ];
+       libraryHaskellDepends = [ base containers parsec pretty ];
        homepage = "http://www.bergsoe.org/fig";
        description = "Manipulation of FIG files";
        license = stdenv.lib.licenses.bsd3;
@@ -49646,7 +50867,9 @@ self: {
        pname = "file-collection";
        version = "0.1.1.9";
        sha256 = "06bcj143j85p8m519zn88z6qn4bg5ifrw5pv5yva5x49gc3jq6gc";
-       buildDepends = [ base bytestring clock directory zip-archive ];
+       libraryHaskellDepends = [
+         base bytestring clock directory zip-archive
+       ];
        jailbreak = true;
        homepage = "https://github.com/joelwilliamson/file-collection";
        description = "Provide a uniform interface over file archives and directories";
@@ -49661,7 +50884,7 @@ self: {
        pname = "file-command-qq";
        version = "0.1.0.5";
        sha256 = "06bi4nnz1f3i79wza6bxbnglqzddpq3r4w581wdl3bq26b52d3ab";
-       buildDepends = [
+       libraryHaskellDepends = [
          base parsec process system-filepath template-haskell text
        ];
        jailbreak = true;
@@ -49678,10 +50901,10 @@ self: {
        pname = "file-embed";
        version = "0.0.8.2";
        sha256 = "1gdxz9244wjhfigpsyaan81gyx6vanb8574xxi7944sj9pcgi74y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath template-haskell
        ];
-       testDepends = [ base filepath HUnit ];
+       testHaskellDepends = [ base filepath HUnit ];
        homepage = "https://github.com/snoyberg/file-embed";
        description = "Use Template Haskell to embed file contents directly";
        license = stdenv.lib.licenses.bsd3;
@@ -49695,11 +50918,11 @@ self: {
        pname = "file-location";
        version = "0.4.9";
        sha256 = "1p0lz02pvlvq2781542ims3x5vcck35dw4g58bv16y96qarxwady";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HUnit lifted-base template-haskell th-orphans
          transformers
        ];
-       testDepends = [ base lifted-base process ];
+       testHaskellDepends = [ base lifted-base process ];
        homepage = "https://github.com/gregwebs/FileLocation.hs";
        description = "common functions that show file location information";
        license = stdenv.lib.licenses.bsd3;
@@ -49714,11 +50937,13 @@ self: {
        pname = "filecache";
        version = "0.2.8";
        sha256 = "0dkdjj29dqgdywzxc24l54v8xqxrqy65l43ig2qr3l381mqi87lf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exceptions hashable hinotify lens mtl stm strict-base-types
          unordered-containers
        ];
-       testDepends = [ base directory temporary unordered-containers ];
+       testHaskellDepends = [
+         base directory temporary unordered-containers
+       ];
        homepage = "http://lpuppet.banquise.net/";
        description = "A Linux-only cache system associating values to files";
        license = stdenv.lib.licenses.bsd3;
@@ -49733,12 +50958,12 @@ self: {
        pname = "filediff";
        version = "2.0.0";
        sha256 = "15a02dya0qhgxq98whxza268vqsrkw6b1ipdskw3hwnjp02hnc9p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default data-memocombinators directory either
          hashmap mtl rainbow tasty tasty-hunit text threads time
          transformers Zora
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory either mtl tasty tasty-hunit text time transformers
        ];
        jailbreak = true;
@@ -49753,7 +50978,7 @@ self: {
        pname = "filelock";
        version = "0.1.0.1";
        sha256 = "0qypjnbkfayqyaymx8qrq4abddlrlzanf6lqhfn9cqzcgzr6735d";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "http://github.com/takano-akio/filelock";
        description = "Portable interface to file locking (flock / LockFileEx)";
        license = stdenv.lib.licenses.publicDomain;
@@ -49767,7 +50992,7 @@ self: {
        pname = "filemanip";
        version = "0.3.6.3";
        sha256 = "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath mtl unix-compat
        ];
        homepage = "https://github.com/bos/filemanip";
@@ -49781,8 +51006,8 @@ self: {
        pname = "filepath";
        version = "1.4.0.0";
        sha256 = "0a5hhgfxh91clkk6c9iipdd0y3wb9y6lx2hhraaaa73b8y83afx4";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/haskell/filepath#readme";
        description = "Library for manipulating FilePaths in a cross platform way";
@@ -49795,7 +51020,7 @@ self: {
        pname = "filepath-io-access";
        version = "0.1.0.0";
        sha256 = "08rb2nafnh5vx7i6i3ddhq4h1s2ffgz8ailap5knr1xl7izgyywp";
-       buildDepends = [ base base-io-access filepath ];
+       libraryHaskellDepends = [ base base-io-access filepath ];
        jailbreak = true;
        description = "IO Access for filepath";
        license = stdenv.lib.licenses.gpl2;
@@ -49809,7 +51034,7 @@ self: {
        pname = "filepather";
        version = "0.3.0";
        sha256 = "1gqnanmnhrpdw5iryf757qwj7j9izyzx1j4y74ydivxafz8w469v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad comonad-transformers data-lens directory filepath mtl
          transformers
        ];
@@ -49827,11 +51052,13 @@ self: {
        pname = "filestore";
        version = "0.6.1";
        sha256 = "0mfllnnb1mqix1v65fyhd9jsvnrjbawd6l4h4012jk8401zwj280";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers Diff directory filepath old-locale
          parsec process split time utf8-string xml
        ];
-       testDepends = [ base Diff directory filepath HUnit mtl time ];
+       testHaskellDepends = [
+         base Diff directory filepath HUnit mtl time
+       ];
        description = "Interface for versioning file stores";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49845,11 +51072,11 @@ self: {
        pname = "filesystem-conduit";
        version = "1.0.0.2";
        sha256 = "05dsl3bgyjciq6sgmba0hki7imilrjq3ddp9ip5gxl9884j1f4a1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers system-fileio system-filepath
          text transformers unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring conduit hspec QuickCheck text
          transformers
        ];
@@ -49868,7 +51095,7 @@ self: {
        pname = "filesystem-enumerator";
        version = "0.1.1";
        sha256 = "04cs5kz390g5qanwqps5kx1pd70b9vzaykn4c0yc0kxi16xlxyrc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base enumerator system-fileio system-filepath transformers unix
        ];
        homepage = "https://john-millikin.com/software/haskell-filesystem/";
@@ -49885,7 +51112,7 @@ self: {
        pname = "filesystem-trees";
        version = "0.1.0.6";
        sha256 = "1bnxhf9ppqwgcnpcanxj6ji8yi1i0pspzhjh3p3zyf57d7y6p8sh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cond containers data-lens-light deepseq directory dlist
          filepath mtl unix
        ];
@@ -49900,7 +51127,7 @@ self: {
        pname = "filtrable";
        version = "0.1.0.2";
        sha256 = "0dfw08pqw4wlja1iavb8zz0rkr97hd7fg1v2akng8n7shmjhgbl5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/strake/filtrable.hs";
        description = "Class of filtrable containers";
        license = "unknown";
@@ -49912,7 +51139,7 @@ self: {
        pname = "final";
        version = "0.1";
        sha256 = "189vby5ym6hcjpz6y9chlgkyzl8wnndqkhzk7s7qy8mksr3g66f9";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        homepage = "http://github.com/errge/final";
        description = "utility to add extra safety to monadic returns";
        license = stdenv.lib.licenses.bsd3;
@@ -49931,13 +51158,18 @@ self: {
        sha256 = "15p1aj8lckmvnrq8a8wz6sbs0d2qbcjgachf5sgpf2lv57hzxksz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base conduit conduit-combinators conduit-extra either
+         exceptions filepath mmorph monad-control mtl regex-posix semigroups
+         streaming-commons text time transformers transformers-base
+         unix-compat
+       ];
+       executableHaskellDepends = [
          attoparsec base conduit conduit-combinators conduit-extra either
          exceptions filepath mmorph monad-control mtl regex-posix semigroups
          streaming-commons text time transformers transformers-base unix
-         unix-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base conduit conduit-combinators directory doctest
          either exceptions filepath hspec mmorph monad-control mtl
          regex-posix semigroups streaming-commons text time transformers
@@ -49956,8 +51188,8 @@ self: {
        pname = "fingertree";
        version = "0.1.1.0";
        sha256 = "1w6x3kp3by5yjmam6wlrf9vap5l5rrqaip0djbrdp0fpf2imn30n";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -49971,7 +51203,7 @@ self: {
        pname = "fingertree-psqueue";
        version = "0.3";
        sha256 = "14kc0ijx44q7whniickjj3h9ag1pixn51dlxjs6n2ypaclcjz34z";
-       buildDepends = [ base fingertree ];
+       libraryHaskellDepends = [ base fingertree ];
        description = "Implementation of priority search queues as finger trees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49982,7 +51214,7 @@ self: {
        pname = "fingertree-tf";
        version = "0.1.0.0";
        sha256 = "1ja8cqxpqhvssbcywph3zna946g1li5hlzsqab9lhg6vw0baakdn";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generic finger-tree structure using type families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49997,10 +51229,10 @@ self: {
        pname = "finite-field";
        version = "0.8.0";
        sha256 = "0wlbq7dpb4545xdnqjqppp0cmjx9m8g1p6lydkvn7pj7dwar8lni";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq hashable template-haskell type-level-numbers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit primes QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
          type-level-numbers
@@ -50015,11 +51247,10 @@ self: {
        pname = "first-class-patterns";
        version = "0.3.2.2";
        sha256 = "0da7mayn8lcizwjv06rafkgrsj257fhkj5xsxk7nx00n3aazzr68";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "https://github.com/reinerp/first-class-patterns";
        description = "First class patterns and pattern matching, using type families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "firstify" = callPackage
@@ -50032,7 +51263,7 @@ self: {
        sha256 = "1g851dgsxq9gfbsx4qas9vm844ay3g5vhfd1493fgpay0j7i5fnd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath homeomorphic mtl Safe yhccore
        ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/firstify/";
@@ -50051,7 +51282,7 @@ self: {
        sha256 = "0bmp24mgg9y7ysnb1rig26cwgz1l40ca1fckzxh0yly0j9if062k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers factory mtl QuickCheck toolshed unix
        ];
        homepage = "http://functionalley.eu";
@@ -50067,10 +51298,10 @@ self: {
        pname = "fit";
        version = "0.5.1";
        sha256 = "0y7jvczi0ldzjw9y102z1k4nyj7z8f6p8w368x5v0m308d0jw6db";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers contravariant mtl text
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers hspec hspec-attoparsec mtl
          QuickCheck text
        ];
@@ -50085,8 +51316,8 @@ self: {
        pname = "fitsio";
        version = "0.2";
        sha256 = "07zsd05ncq8rnrswk4kzg97sam8czibw2nhlrqxg8q1a5canisag";
-       buildDepends = [ base filepath mtl ];
-       extraLibraries = [ cfitsio ];
+       libraryHaskellDepends = [ base filepath mtl ];
+       librarySystemDepends = [ cfitsio ];
        homepage = "http://github.com/esessoms/fitsio";
        description = "A library for reading and writing data files in the FITS data format";
        license = "GPL";
@@ -50103,7 +51334,7 @@ self: {
        sha256 = "0j8yqqf61f2m4zri844gp6k80vkfzk1rby2miv90niz3hbciknj6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers cpphs directory filepath haskell-src-exts process
          split text uniplate
        ];
@@ -50117,7 +51348,7 @@ self: {
        pname = "fix-parser-simple";
        version = "15320.3";
        sha256 = "0ls5fxwq2lnb0rjqih4isfwiv0603ga12gxnf7w3rpqp5qhrhas8";
-       buildDepends = [ base mmtl ];
+       libraryHaskellDepends = [ base mmtl ];
        description = "Simple fix-expression parser";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50129,7 +51360,7 @@ self: {
        pname = "fix-symbols-gitit";
        version = "0.1.0";
        sha256 = "01fxzhd2wqzp0paba64q5psfc4qvc4b8i88rdkn6mxlkm21gkp6y";
-       buildDepends = [ base containers gitit ];
+       libraryHaskellDepends = [ base containers gitit ];
        description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50141,7 +51372,7 @@ self: {
        pname = "fixed";
        version = "0.2.1.1";
        sha256 = "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/fixed";
        description = "Signed 15.16 precision fixed point arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -50153,7 +51384,7 @@ self: {
        pname = "fixed-length";
        version = "0.1";
        sha256 = "115j7bc6s45qn87hamy4w1ih247cxhyhrzaz244sw4qfkxypigkj";
-       buildDepends = [ base non-empty utility-ht ];
+       libraryHaskellDepends = [ base non-empty utility-ht ];
        homepage = "http://code.haskell.org/~thielema/fixed-length/";
        description = "Lists with statically known length based on non-empty package";
        license = stdenv.lib.licenses.bsd3;
@@ -50165,7 +51396,7 @@ self: {
        pname = "fixed-list";
        version = "0.1.6";
        sha256 = "1gpv0p7xyzmrrq20irf0mpggnc0vm5hpq36j4vd1xlq6bplq1xmb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/jvranish/FixedList/tree/master";
        description = "A fixed length list type";
        license = stdenv.lib.licenses.bsd3;
@@ -50177,7 +51408,7 @@ self: {
        pname = "fixed-point";
        version = "0.5.0.1";
        sha256 = "010gx32av4cn5bqq1zrrcah50ay528vw01fvv1xhfpkrx1ll9wka";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Binary fixed-point arithmetic";
        license = stdenv.lib.licenses.mit;
@@ -50190,7 +51421,7 @@ self: {
        pname = "fixed-point-vector";
        version = "0.5.0.1";
        sha256 = "029mn44d1i794b1pbpa0zmf6b20zl0cvsf77mbfdkqnyx8986883";
-       buildDepends = [ base fixed-point vector ];
+       libraryHaskellDepends = [ base fixed-point vector ];
        jailbreak = true;
        description = "Unbox instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
@@ -50203,7 +51434,7 @@ self: {
        pname = "fixed-point-vector-space";
        version = "0.5.0.1";
        sha256 = "10b29gqy3rpwd5wf2b65p0llm8ksyp1p7k43rm1n5g5z67wkd7dx";
-       buildDepends = [ base fixed-point vector-space ];
+       libraryHaskellDepends = [ base fixed-point vector-space ];
        jailbreak = true;
        description = "vector-space instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
@@ -50218,7 +51449,7 @@ self: {
        pname = "fixed-precision";
        version = "0.4.0";
        sha256 = "1akgiark8svzkqx764iic10qpfixm0js8vwga0134d81ppcp58f6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hmpfr integer-gmp reflection tagged template-haskell
        ];
        jailbreak = true;
@@ -50234,7 +51465,7 @@ self: {
        pname = "fixed-storable-array";
        version = "0.3.1.1";
        sha256 = "0vb5h2v2qx19d7xibf7ksv2cha2pngh49mfpkh43f9vrwc6042ph";
-       buildDepends = [ array base tagged ];
+       libraryHaskellDepends = [ array base tagged ];
        jailbreak = true;
        description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead.";
        license = stdenv.lib.licenses.bsd3;
@@ -50247,8 +51478,8 @@ self: {
        pname = "fixed-vector";
        version = "0.8.0.0";
        sha256 = "1hlg0rbi2phk7qr7nvjnazg344jqp5p13c3m8v5n01vw9bvjbnir";
-       buildDepends = [ base deepseq primitive ];
-       testDepends = [ base doctest filemanip primitive ];
+       libraryHaskellDepends = [ base deepseq primitive ];
+       testHaskellDepends = [ base doctest filemanip primitive ];
        jailbreak = true;
        description = "Generic vectors with statically known size";
        license = stdenv.lib.licenses.bsd3;
@@ -50262,8 +51493,10 @@ self: {
        pname = "fixed-vector-binary";
        version = "0.6.0.0";
        sha256 = "1yjyw9wc92laiwd9w8ng3456azicvf9a9wqk2v6liiksj3flw7hy";
-       buildDepends = [ base binary fixed-vector ];
-       testDepends = [ base binary fixed-vector tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base binary fixed-vector ];
+       testHaskellDepends = [
+         base binary fixed-vector tasty tasty-quickcheck
+       ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50276,8 +51509,10 @@ self: {
        pname = "fixed-vector-cereal";
        version = "0.6.0.0";
        sha256 = "1kf3d0pfaif5fish1vc5z7d5ym23bwl80l8bg4bgpdw75cg2dnn6";
-       buildDepends = [ base cereal fixed-vector ];
-       testDepends = [ base cereal fixed-vector tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base cereal fixed-vector ];
+       testHaskellDepends = [
+         base cereal fixed-vector tasty tasty-quickcheck
+       ];
        description = "Cereal instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50290,7 +51525,7 @@ self: {
        pname = "fixed-vector-hetero";
        version = "0.3.1.0";
        sha256 = "0x5fjggm0licrdd442pr1968zlzfb0ah4ib8s9yxcb2p6vc39lzv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq fixed-vector ghc-prim primitive transformers
        ];
        homepage = "http://github.org/Shimuuar/fixed-vector-hetero";
@@ -50304,7 +51539,7 @@ self: {
        pname = "fixedprec";
        version = "0.2.2.1";
        sha256 = "0s921nhkmdglmcwzyr048r04dswc6hz7kvh9p4lvd8i2mxq0szgi";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        description = "A fixed-precision real number type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50317,7 +51552,10 @@ self: {
        sha256 = "0k4lidf95nb4a735331xdr77643b1yb15xllplxknbxxq9r2z3px";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aeson attoparsec base bytestring text ];
+       libraryHaskellDepends = [ aeson attoparsec base bytestring text ];
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring text
+       ];
        homepage = "https://github.com/michaelochurch/fixedwidth-hs";
        description = "Quick parsing of fixed-width data formats";
        license = stdenv.lib.licenses.mit;
@@ -50334,11 +51572,15 @@ self: {
        sha256 = "0kxfx3k2d8xy75s7cln3l1hiia5vjcr6k5almbpys63dkr3svcz2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring containers deepseq
          dlist enumerator HaXml MissingH network old-time parallel
          QuickCheck text
        ];
+       executableHaskellDepends = [
+         attoparsec base bytestring containers deepseq dlist HaXml MissingH
+         old-time QuickCheck text
+       ];
        homepage = "http://github.com/urv/fixhs";
        description = "FIX (co)parser";
        license = stdenv.lib.licenses.lgpl21;
@@ -50350,7 +51592,7 @@ self: {
        pname = "fixplate";
        version = "0.1.5";
        sha256 = "0mmkkydvdiw4nawgw3w7a9gpcxc3wzzlhz2083hqa6sxhx8x3b29";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Uniplate-style generic traversals for optionally annotated fixed-point types";
        license = stdenv.lib.licenses.bsd3;
@@ -50363,7 +51605,7 @@ self: {
        pname = "fixpoint";
        version = "0.1.1";
        sha256 = "05h1cw1gpnwk1qjlia4l27j375cva8pp75fzn99w2rxsv6khszpb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cse.unsw.edu.au/~rl/code/fixpoint.html";
        description = "Data types as fixpoints";
        license = stdenv.lib.licenses.bsd3;
@@ -50375,7 +51617,7 @@ self: {
        pname = "fixtime";
        version = "1.5.0.2";
        sha256 = "1walxcyi1wrv28vgy318c88z3mprz6mc8qfhbjgxb156iwfv80w5";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        homepage = "https://github.com/pharpend/fixtime";
        description = "Some fixes to the time package";
        license = stdenv.lib.licenses.bsd2;
@@ -50387,7 +51629,7 @@ self: {
        pname = "fizz-buzz";
        version = "0.1.0.1";
        sha256 = "169xaj7iczz0mnvd03pf95dcvy918jscpzap6z9y62kb0daskg4p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Functional Fizz/Buzz";
        license = stdenv.lib.licenses.bsd3;
@@ -50403,7 +51645,7 @@ self: {
        sha256 = "0vx4fn1d8i2qh0q20vijhp7yc0zcvjdwk1v7f7ra0kbm4ygmi38h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary deepseq HTTP optparse-applicative process
        ];
        homepage = "http://noaxiom.org/flAccurateRip";
@@ -50417,7 +51659,7 @@ self: {
        pname = "flamethrower";
        version = "0.0.5.1";
        sha256 = "10kfy1cnp721hgz6lbc28y7hkjhbv6gpk2jff6nk2avrfbaqqd8x";
-       buildDepends = [ base template-haskell text ];
+       libraryHaskellDepends = [ base template-haskell text ];
        jailbreak = true;
        homepage = "https://charmander.me/flamethrower/";
        description = "A template engine for HTML";
@@ -50432,7 +51674,10 @@ self: {
        sha256 = "1yfqgbjam33vrkic5xnb8pp76215jnacr6sj1xw1xqcbcs02bn3v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base either optparse-applicative pipes ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base either optparse-applicative pipes
+       ];
        description = "FlameGraphs of profiling";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50445,7 +51690,7 @@ self: {
        pname = "flat-mcmc";
        version = "0.1.0.0";
        sha256 = "1fp5jga82kbkj77xhy4m4vsn7zqf6fr9fwram3a2ybqssicgs3z5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-par monad-par-extras mtl mwc-random primitive vector
        ];
        jailbreak = true;
@@ -50462,7 +51707,7 @@ self: {
        pname = "flexible-defaults";
        version = "0.0.1.1";
        sha256 = "0cbp8hb7y29xz3hl780173cs6ca4df0r98fz7v3drqr46aq55ipl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers template-haskell th-extras transformers
        ];
        homepage = "https://github.com/mokus0/flexible-defaults";
@@ -50476,7 +51721,7 @@ self: {
        pname = "flexible-time";
        version = "0.1.0.3";
        sha256 = "179k0r58r5s0g1vfs7ab382iq7qf5xbrnmvx2y8p86pz8fcz7a8l";
-       buildDepends = [ base bytestring unix-time ];
+       libraryHaskellDepends = [ base bytestring unix-time ];
        jailbreak = true;
        homepage = "https://github.com/tattsun/flexible-time";
        description = "simple extension of Data.UnixTime.";
@@ -50491,7 +51736,8 @@ self: {
        sha256 = "0jwsa2qfzw4rdj55axy7cw1p82314i28c16f7p7pjp53cwnsp02a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base text ];
+       executableHaskellDepends = [ base bytestring text ];
        description = "A configurable reimplementation of unlit";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50502,7 +51748,7 @@ self: {
        pname = "flexiwrap";
        version = "0.1.0";
        sha256 = "0vvl9w3i374k720sscbcsbha89fcfk1hcvdr0nk4y7gkp13xwdba";
-       buildDepends = [ base data-type mtl QuickCheck ];
+       libraryHaskellDepends = [ base data-type mtl QuickCheck ];
        jailbreak = true;
        description = "Flexible wrappers";
        license = stdenv.lib.licenses.bsd3;
@@ -50515,7 +51761,9 @@ self: {
        pname = "flexiwrap-smallcheck";
        version = "0.0.1";
        sha256 = "1dara0az10fxx46jmplf2l6a6x8qqjk00fxjzb9n10ndd4lxcsm3";
-       buildDepends = [ base data-type flexiwrap mtl smallcheck ];
+       libraryHaskellDepends = [
+         base data-type flexiwrap mtl smallcheck
+       ];
        jailbreak = true;
        description = "SmallCheck (Serial) instances for flexiwrap";
        license = stdenv.lib.licenses.bsd3;
@@ -50532,9 +51780,10 @@ self: {
        sha256 = "12fi34zl2ggbxf5gmfldplzi1pk9byf8rpn58ljw2fvz3qb8x6yl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base filepath HTTP mime network random utf8-string xhtml xml
+       libraryHaskellDepends = [
+         base filepath HTTP mime network random utf8-string xml
        ];
+       executableHaskellDepends = [ xhtml ];
        description = "Haskell binding to the Flickr API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50545,10 +51794,10 @@ self: {
      mkDerivation {
        pname = "flippers";
        version = "1.0.1";
-       revision = "1";
        sha256 = "1swyj1f67giq7h9xcl6dzsw4ywk1jbl6avpihbv0q9g9hp6yzqp3";
+       revision = "1";
        editedCabalFile = "e908ada5c891a6ac39cefb7e41648606d1a5f1b1048281f93bd496c5f22d73b4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Variations on flip for multiple arguments";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50561,7 +51810,10 @@ self: {
        sha256 = "0ck44icwg6gzi9x5h5iszk59qnr0fhsj95ghk0lxm8aygavwq44d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers haskell98 parsec ];
+       libraryHaskellDepends = [ array base containers haskell98 parsec ];
+       executableHaskellDepends = [
+         array base containers haskell98 parsec
+       ];
        jailbreak = true;
        homepage = "http://www.cs.york.ac.uk/fp/reduceron/";
        description = "f-lite compiler, interpreter and libraries";
@@ -50578,7 +51830,12 @@ self: {
        sha256 = "1hxzdgnsfxallmw7z07hs4ax8pfn57hk55kyjxg8vnrj7i07bp9l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring mtl parsec regex-compat text ];
+       libraryHaskellDepends = [
+         base bytestring mtl parsec regex-compat text
+       ];
+       executableHaskellDepends = [
+         base bytestring mtl parsec regex-compat text
+       ];
        description = "Generate flow charts from your code base";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50592,8 +51849,8 @@ self: {
        pname = "float-binstring";
        version = "0.2";
        sha256 = "0dcxk1s13ppslqxd378yh92pzmxnmnhk1q07wl5ifcnfy5zamzdq";
-       buildDepends = [ attoparsec base split text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base split text ];
+       testHaskellDepends = [
          attoparsec base hspec HUnit QuickCheck split text
        ];
        homepage = "https://github.com/llelf/float-binstring";
@@ -50607,8 +51864,8 @@ self: {
        pname = "floating-bits";
        version = "0.3.0.0";
        sha256 = "1cp2k9rks0g8i6lf6j3zrz7wxh42qmsqwvf26dkdqnnzi0aqkkxj";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        description = "Conversions between floating and integral values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50620,7 +51877,7 @@ self: {
        pname = "floatshow";
        version = "0.2.4";
        sha256 = "1zsxjwgm8nkphnmsbz03yvplc2r02qybb387n910j4j6vya98khc";
-       buildDepends = [ array base integer-gmp ];
+       libraryHaskellDepends = [ array base integer-gmp ];
        homepage = "https://bitbucket.org/dafis/floatshow";
        description = "Alternative faster String representations for Double and Float, String representations for more general numeric types";
        license = stdenv.lib.licenses.bsd3;
@@ -50634,7 +51891,7 @@ self: {
        pname = "flock";
        version = "0.3.1.8";
        sha256 = "1g1gf7qnlqkl57h28nzxnbzj7v2h73czffp5y7s7jm9vbihcwd4n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control transformers unix
        ];
        homepage = "http://github.com/hesselink/flock";
@@ -50648,8 +51905,8 @@ self: {
        pname = "flow";
        version = "1.0.1";
        sha256 = "11i0p2f8zxpcpssga279hx8vy6a14xykmb8qxyfrrpvd6qg42i8y";
-       buildDepends = [ base ];
-       testDepends = [ base doctest QuickCheck template-haskell ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        homepage = "http://taylor.fausak.me/flow/";
        description = "Write more understandable Haskell";
        license = stdenv.lib.licenses.mit;
@@ -50665,7 +51922,7 @@ self: {
        sha256 = "1pf60wpwsvxxgqkz3zh2qlcyz9pyd8axi41y5y6pn77n9x8p2613";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl parsec QuickCheck utf8-string
        ];
        homepage = "http://adept.linux.kiev.ua:8080/repos/flow2dot";
@@ -50684,7 +51941,7 @@ self: {
        pname = "flowdock";
        version = "0.3.0.1";
        sha256 = "1az9wwdng7i3jrjwizzz3690506b3vk1m8h2b96wf59r51qnpr6i";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring http-client http-client-tls
          lens lens-action mtl network pipes pipes-aeson pipes-http
          pipes-parse template-haskell text unordered-containers uuid
@@ -50692,7 +51949,6 @@ self: {
        homepage = "https://github.com/brewtown/hs-flowdock";
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowdock-api" = callPackage
@@ -50709,13 +51965,19 @@ self: {
        sha256 = "0p0b0pabyykvli9l0jrcbfgpyq7dna3zilb4z0s1hb6mamfdn7ng";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring data-default
+         HsOpenSSL http-streams http-types io-streams monad-logger
+         MonadCatchIO-transformers text time transformers
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring data-default
          directory filepath HsOpenSSL http-streams http-types io-streams
-         monad-logger MonadCatchIO-transformers optparse-applicative split
-         text time transformers unordered-containers vector
+         MonadCatchIO-transformers optparse-applicative split text time
+         transformers unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring data-default
          heredoc HsOpenSSL hspec http-streams http-types io-streams
          monad-logger MonadCatchIO-transformers template-haskell text time
@@ -50737,7 +51999,7 @@ self: {
        sha256 = "0r9l3b91kyhf4ab8m2qv5jsfqf3k7x639bq1wjbf852imzl6138b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bio bytestring cmdargs containers mtl random
        ];
        jailbreak = true;
@@ -50753,8 +52015,8 @@ self: {
        pname = "flowlocks-framework";
        version = "0.1.3.1";
        sha256 = "1v9z302fg2fx6k9k7ci5128gxrrcgdqp40r7axk0yhrzc06b9wa8";
-       buildDepends = [ base containers syb ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base containers syb ];
+       testHaskellDepends = [ base QuickCheck ];
        description = "Generalized Flow Locks Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50770,7 +52032,7 @@ self: {
        sha256 = "0l3222a2r2khhrfhzvd0iikqq1rlcwhvf785bwnwqygq35i1w6j3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base biocore biofasta biosff bytestring cmdargs containers
          directory MonadRandom mtl random
        ];
@@ -50788,8 +52050,9 @@ self: {
        sha256 = "11p957d12ivrf9r76zf2khjd736fdnhaj7qp0x6fbwmda2ifrij3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring directory process ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base bytestring ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base bytestring directory process ];
        homepage = "http://github.com/deech/fltkhs";
        description = "FLTK bindings";
        license = stdenv.lib.licenses.mit;
@@ -50805,11 +52068,11 @@ self: {
        pname = "fluent-logger";
        version = "0.2.3.1";
        sha256 = "0m97hljfrs5mh5pjbwvnw7b581y7w96qfyjr3d9p1aqbj6nsa6dp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers messagepack network
          network-socket-options random stm text time vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring cereal cereal-conduit conduit
          conduit-extra containers exceptions hspec messagepack network text
          time transformers
@@ -50826,7 +52089,7 @@ self: {
        pname = "fluent-logger-conduit";
        version = "0.3.0.0";
        sha256 = "0z21dg1y0rqfgvpvgci5kp3jh0kdx5v5paxdidwp8dd6v7y3ag9q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit fluent-logger resourcet transformers
        ];
        description = "Conduit interface for fluent-logger";
@@ -50841,8 +52104,8 @@ self: {
        pname = "fluidsynth";
        version = "0.2.0.0";
        sha256 = "18r7q7sh35sr71ays0c9ic6f7vmrblpw25mz1y5v9sbk5x2lh64s";
-       buildDepends = [ base bindings-DSL containers directory ];
-       extraLibraries = [ fluidsynth ];
+       libraryHaskellDepends = [ base bindings-DSL containers directory ];
+       librarySystemDepends = [ fluidsynth ];
        jailbreak = true;
        homepage = "https://github.com/MostAwesomeDude/hsfluidsynth";
        description = "Haskell bindings to FluidSynth";
@@ -50858,7 +52121,9 @@ self: {
        sha256 = "1bjkkd90mw1nbm5pyjh52dwhqa6xx3i3hhl2ys3qpk08mrw5r09l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath mtl process Unixutils ];
+       executableHaskellDepends = [
+         base directory filepath mtl process Unixutils
+       ];
        jailbreak = true;
        homepage = "http://github.com/jabolopes/fmark";
        description = "A Friendly Markup language without syntax";
@@ -50871,7 +52136,7 @@ self: {
        pname = "fmlist";
        version = "0.9";
        sha256 = "1gzwmsrbxk22v7syf8zfvxphm23dmjzfpysz6qww3qvib8wm64aq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/sjoerdvisscher/fmlist";
        description = "FoldMap lists";
        license = stdenv.lib.licenses.bsd3;
@@ -50883,7 +52148,7 @@ self: {
        pname = "focus";
        version = "0.1.4";
        sha256 = "0h6q48ybcch1p15f4x56ya4d8mn4dwzbfjx573dy6z3x12v7qi2n";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nikita-volkov/focus";
        description = "A general abstraction for manipulating elements of container data structures";
        license = stdenv.lib.licenses.mit;
@@ -50895,8 +52160,8 @@ self: {
        pname = "fold-debounce";
        version = "0.2.0.0";
        sha256 = "1nq0729wy3v29liwhy5rp706cpspv9jygh0pvxf398ng2plgfjmb";
-       buildDepends = [ base data-default stm stm-delay time ];
-       testDepends = [ base hspec stm time ];
+       libraryHaskellDepends = [ base data-default stm stm-delay time ];
+       testHaskellDepends = [ base hspec stm time ];
        homepage = "https://github.com/debug-ito/fold-debounce";
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
@@ -50910,11 +52175,13 @@ self: {
        pname = "fold-debounce-conduit";
        version = "0.1.0.0";
        sha256 = "0d5yw44zbkissnw7f0zssrr3f3m8ymkskizvjp6rhsiyx3iafj5k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit fold-debounce resourcet stm transformers
          transformers-base
        ];
-       testDepends = [ base conduit hspec resourcet stm transformers ];
+       testHaskellDepends = [
+         base conduit hspec resourcet stm transformers
+       ];
        homepage = "https://github.com/debug-ito/fold-debounce-conduit";
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
        license = stdenv.lib.licenses.bsd3;
@@ -50928,7 +52195,7 @@ self: {
        pname = "foldl";
        version = "1.1.1";
        sha256 = "01zqlb3hh5jsq49ax08nkwvysqq4fgkxpz4sdcman9y9fnxgwjgg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mwc-random primitive profunctors text
          transformers vector
        ];
@@ -50945,10 +52212,10 @@ self: {
        pname = "foldl-incremental";
        version = "0.2.0.0";
        sha256 = "09xf9cba3j49z4bwfmad6q9gdnp3f1zn817q4px7hky2gln3bhzk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq foldl histogram-fill vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers foldl histogram-fill mwc-random pipes
          QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck vector
        ];
@@ -50968,14 +52235,14 @@ self: {
        pname = "folds";
        version = "0.6.3";
        sha256 = "1p8vr71vqzn0h4j5rz3wh7fsvsaaig52ds7sx8r2c8klbdf91zd4";
-       buildDepends = [
+       configureFlags = [ "-f-test-hlint" ];
+       libraryHaskellDepends = [
          base comonad contravariant lens pointed profunctors reflection
          semigroupoids tagged transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring deepseq directory doctest filepath mtl semigroups
        ];
-       configureFlags = [ "-f-test-hlint" ];
        homepage = "http://github.com/ekmett/folds";
        description = "Beautiful Folding";
        license = stdenv.lib.licenses.bsd3;
@@ -50989,8 +52256,8 @@ self: {
        pname = "folds-common";
        version = "0.2.0.0";
        sha256 = "1dcyh798ijq4ms8xr0jwfp4fy5i5l4czl7m3yvk2z6rkha9w1zmc";
-       buildDepends = [ base containers folds ];
-       testDepends = [ base containers tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base containers folds ];
+       testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        description = "A playground of common folds for folds";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51006,7 +52273,7 @@ self: {
        sha256 = "0iy8q06fpc03n4z6dcrl95vji67dia6bp30q42rrlqw6s9cwigsm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base cmdargs directory filepath hs-twitter
          old-locale strict time
        ];
@@ -51022,8 +52289,8 @@ self: {
        pname = "foma";
        version = "0.1.1.0";
        sha256 = "1aiy4bizzx5g87lvlx8xy24rxvzh093mlaavxkcr542fq9ki8yb3";
-       buildDepends = [ base ];
-       extraLibraries = [ foma ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ foma ];
        homepage = "http://github.com/joom/foma.hs";
        description = "Simple Haskell bindings for Foma";
        license = stdenv.lib.licenses.mit;
@@ -51038,7 +52305,8 @@ self: {
        sha256 = "0myjb8g3mis887l0jmr88nb757x0zcvhnanx02hxjbfb5iqx3cx9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base GLFW-b OpenGL ];
+       libraryHaskellDepends = [ base OpenGL ];
+       executableHaskellDepends = [ base GLFW-b OpenGL ];
        jailbreak = true;
        description = "Basic4x6 font for OpenGL";
        license = stdenv.lib.licenses.publicDomain;
@@ -51053,7 +52321,9 @@ self: {
        sha256 = "1f1abijdfvnmkgbvw9q94k4p39pbqslmg9am1j1sjyxrag5y0vv8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers GLUT haskell98 OpenGL ];
+       executableHaskellDepends = [
+         base containers GLUT haskell98 OpenGL
+       ];
        homepage = "http://sourceforge.net/projects/fooengine/?abmode=1";
        description = "Paper soccer, an OpenGL game";
        license = "GPL";
@@ -51068,7 +52338,7 @@ self: {
        pname = "for-free";
        version = "0.1";
        sha256 = "048m95sg8jq7kpr55iq5h93c7zbaqp5v340phb13v9yw2hv50sql";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad comonad-transformers containers contravariant
          transformers
        ];
@@ -51086,11 +52356,11 @@ self: {
        pname = "forbidden-fruit";
        version = "0.1.0";
        sha256 = "0sxaa2lpz6j0ljz8kjxifvp4lk5x12w0ka9wjws4w7r8q9bld8dd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base control-monad-loop hashable hashtables primitive transformers
          transformers-base vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base control-monad-loop hashable hashtables hspec primitive
          transformers vector
        ];
@@ -51107,7 +52377,9 @@ self: {
        pname = "force-layout";
        version = "0.4.0.2";
        sha256 = "0lncciqizp55if5ivlcbv5lqj21hlp2vfi40iagjswf2apxi0w0g";
-       buildDepends = [ base containers data-default-class lens linear ];
+       libraryHaskellDepends = [
+         base containers data-default-class lens linear
+       ];
        description = "Simple force-directed layout";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51120,7 +52392,7 @@ self: {
        sha256 = "0vlh5rfn3n8vi3gbfmpbw20jgv5skvcw187walgv6dns39pagsar";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process transformers ];
+       executableHaskellDepends = [ base process transformers ];
        description = "Run a command on files with magic substituion support (sequencing and regexp)";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51132,7 +52404,7 @@ self: {
        pname = "forecast-io";
        version = "0.2.0.0";
        sha256 = "17wsqrq1zq1p80gnrfsvks5bhickfqj5mh2prbzzkzb3s28l1mby";
-       buildDepends = [ aeson base text ];
+       libraryHaskellDepends = [ aeson base text ];
        homepage = "https://github.com/stormont/forecast-io";
        description = "A Haskell library for working with forecast.io data.";
        license = stdenv.lib.licenses.bsd3;
@@ -51144,7 +52416,7 @@ self: {
        pname = "foreign-storable-asymmetric";
        version = "0.0.1";
        sha256 = "1pj30p7z5nq8j95z9c4kjv6spandfch3r0dvx3n8wsbh3270dvxj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Types and instances for implementing a Storable with different peek and poke";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51155,7 +52427,7 @@ self: {
        pname = "foreign-store";
        version = "0.2";
        sha256 = "1p436dn6l5zjzizcsj0hn10s2n907gr7c8y89i4sm3h69lhqlw86";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/chrisdone/foreign-store";
        description = "Store a stable pointer in a foreign context to be retrieved later";
        license = stdenv.lib.licenses.bsd3;
@@ -51166,10 +52438,10 @@ self: {
      mkDerivation {
        pname = "foreign-var";
        version = "0.1";
-       revision = "1";
        sha256 = "1rxfmzq9npj1170i85qhq5fhvvzb9j1wdi5lzmj57k4hlyxcwqjd";
+       revision = "1";
        editedCabalFile = "f9c906434533279cfa8e2897c6eed6ed9c279f373efc5180bda76b704601fa1c";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        homepage = "http://github.com/ekmett/foreign-var/";
        description = "Encapsulating mutatable state in external libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -51183,7 +52455,8 @@ self: {
        sha256 = "1bykssfas1fz46qmiwhxs09xnnwp104hlmq08z9g1xh7qv8bh7iy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/sfischer13/haskell-forger";
        description = "Library for generating fake placeholder data";
@@ -51196,7 +52469,7 @@ self: {
        pname = "forkable-monad";
        version = "0.1.1";
        sha256 = "0nxcjx3cf8bkl0cwkpgz5c6byld13kw2601q4157fmfa370bi11h";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://code.google.com/p/forkable-monad/";
        description = "An implementation of forkIO for monad stacks";
@@ -51215,7 +52488,7 @@ self: {
        sha256 = "0z8a5a9w7mg69c1x6h8825bhkll63gz6j85lbc0w59w1ag2x8865";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring containers directory file-embed HTTP
          indents interpolatedstring-perl6 jmacro MissingH mtl network pandoc
          parsec process text transformers urlencoded wl-pprint-text
@@ -51232,8 +52505,8 @@ self: {
        pname = "format";
        version = "0.1.0.0";
        sha256 = "1vv9b0hif5hi3jkd1n6j85b5mkfkjyixldblm2l4qfgrj95igmph";
-       buildDepends = [ haskell2010 parsec ];
-       testDepends = [ haskell2010 parsec QuickCheck ];
+       libraryHaskellDepends = [ haskell2010 parsec ];
+       testHaskellDepends = [ haskell2010 parsec QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/bytbox/hs-format";
        description = "Rendering from and scanning to format strings";
@@ -51251,7 +52524,7 @@ self: {
        sha256 = "0dfmjp307c8685cdw41nmjmisf3aplyf177r973wyqcrifabvs2q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base data-concurrent-queue old-locale stm text time
        ];
        jailbreak = true;
@@ -51268,7 +52541,7 @@ self: {
        pname = "formatting";
        version = "6.2.2";
        sha256 = "04ilp8zkzkab3x4v5kczpa58k5jr67yg9fq4prj7xrj81kixgp2g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clock old-locale scientific text text-format time
        ];
        description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
@@ -51288,7 +52561,7 @@ self: {
        sha256 = "1bqfw3h06mbznivg37840qnzjygflzp90wkyssnb1kjxi4bj1vbv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring cereal containers directory
          file-embed ghc-prim GraphSCC hslogger HTTP indents
          interpolatedstring-perl6 jmacro MissingH mtl network pandoc parsec
@@ -51309,7 +52582,7 @@ self: {
        pname = "formlets";
        version = "0.8";
        sha256 = "0jx56vhrzcwca33rgp738plmssw95nv20rrzw5xrxcmdv26zp1w9";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base blaze-html bytestring haskell98 syb
          transformers xhtml
        ];
@@ -51328,10 +52601,10 @@ self: {
        pname = "formlets-hsp";
        version = "2.3.1";
        sha256 = "19m0nryrksh1cgsz7sx3gamjczw36hqfsbml05p6j7li3bk0fpw2";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base formlets haskell98 hsp hsx mtl
        ];
-       buildTools = [ trhsx ];
+       libraryToolDepends = [ trhsx ];
        description = "HSP support for Formlets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51343,7 +52616,7 @@ self: {
        pname = "forth-hll";
        version = "0.1.0.0";
        sha256 = "1hmcicxnxcl99chidkbg1kspjzpxxcw8qh4lrwvmlpz2knzf11g3";
-       buildDepends = [ array-forth base free mtl ];
+       libraryHaskellDepends = [ array-forth base free mtl ];
        jailbreak = true;
        description = "A simple eDSL for generating arrayForth code";
        license = stdenv.lib.licenses.gpl3;
@@ -51356,7 +52629,7 @@ self: {
        pname = "fountain";
        version = "0.1";
        sha256 = "0mxzrvrag2qwn22llklmdkcf4icd8n9ifg1awd9q7ffll8a1a67p";
-       buildDepends = [ base containers random ];
+       libraryHaskellDepends = [ base containers random ];
        homepage = "http://tomahawkins.org";
        description = "A fountain codec";
        license = stdenv.lib.licenses.bsd3;
@@ -51380,15 +52653,19 @@ self: {
        sha256 = "1r80a6vimpy4nviskl62c4ivp2l8wrg3vhzgdg53nnfa5j6lmha2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html bytestring
          cereal containers data-default deepseq deepseq-generics directory
-         failure fay filepath ghc-prim hashable http-conduit http-types ini
+         failure fay filepath ghc-prim hashable http-conduit http-types
          lifted-async lifted-base monad-control monad-extras monad-logger
-         mtl network optparse-applicative persistent persistent-template
-         pretty-show process random resourcet safe semigroups shakespeare
-         shakespeare-i18n stm syb template-haskell text time transformers
-         transformers-base unordered-containers vector yesod-core
+         mtl network persistent persistent-template pretty-show random
+         resourcet safe semigroups shakespeare shakespeare-i18n stm syb
+         template-haskell text time transformers transformers-base
+         unordered-containers vector yesod-core
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring data-default directory filepath ini network
+         optparse-applicative process safe text unordered-containers
        ];
        homepage = "https://www.fpcomplete.com/page/api";
        description = "Simple interface to the FP Complete IDE API";
@@ -51402,7 +52679,7 @@ self: {
        pname = "fpipe";
        version = "0.0.1";
        sha256 = "1b6r19yy9wh5w8xb0ajjxsd2qyzjnkgyav1975qv92wwxslyxwr8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "F#-style composition and application";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51413,7 +52690,7 @@ self: {
        pname = "fpnla";
        version = "0.1.1";
        sha256 = "15qpfi3b9vnpm17q3y64nsrhlj5vi9rgrgysjfk98aw1gkj9mvv4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library for NLA operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51428,11 +52705,11 @@ self: {
        pname = "fpnla-examples";
        version = "0.1.1";
        sha256 = "1p305r0jgcqrbny22ic1ziyav9yjy6v02wgna0sgh4p0c1wi7pb2";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate array base deepseq fpnla hmatrix linear-algebra-cblas
          monad-par parallel repa vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          accelerate array base data-default deepseq fpnla hmatrix HUnit
          linear-algebra-cblas monad-par parallel QuickCheck random repa
          tagged test-framework test-framework-hunit
@@ -51454,11 +52731,11 @@ self: {
        sha256 = "1wqca640h9qcrnwkqdw1pyl73c4nraglgwqgimkrgbkjlwpyn824";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base HUnit parsec parsec3-numbers QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       testDepends = [
+       testHaskellDepends = [
          base doctest Glob hlint HUnit parsec parsec3-numbers process
          QuickCheck regex-compat test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -51479,7 +52756,7 @@ self: {
        sha256 = "1v1qrbr5kz17haawrh0ksmjw7j4ks0x4kqzss5z1fbldl6axw97i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory extensible-exceptions hashtables parsec process
          regex-compat unix
        ];
@@ -51495,7 +52772,7 @@ self: {
        sha256 = "0iw5454mi0ms3w62m118rlqr6lr1j9mbxwfj26mlc5p38bq9k7ds";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Draw Newton, Julia and Mandelbrot fractals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51506,7 +52783,7 @@ self: {
        pname = "fraction";
        version = "0.1.0.4";
        sha256 = "0blvvsc1rbn45nwgmkhd28bdz0awi5mk6h48yqbqy3ajm2gvpvdf";
-       buildDepends = [ base semigroups ];
+       libraryHaskellDepends = [ base semigroups ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/fraction";
        description = "Fractions";
        license = stdenv.lib.licenses.bsd3;
@@ -51520,7 +52797,7 @@ self: {
        sha256 = "1xgnp4cls8i61hyl4kcf3afri77jlcahwjvww498xl5d5frdiv90";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base GLUT OpenGL random ];
+       executableHaskellDepends = [ array base GLUT OpenGL random ];
        homepage = "http://haskell.org/haskellwiki/Frag";
        description = "A 3-D First Person Shooter Game";
        license = "GPL";
@@ -51539,12 +52816,13 @@ self: {
        sha256 = "0ldncqifcnk4d50qivgw62hcdy4nc23zr64q787azid0vb9vsdja";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory ghc-binary happstack-fastcgi
          happstack-server haskell98 haskelldb haskelldb-hdbc
          haskelldb-hdbc-odbc HDBC HDBC-odbc HTTP MissingH mtl old-time
-         pretty utf8-string
+         utf8-string
        ];
+       executableHaskellDepends = [ pretty ];
        jailbreak = true;
        description = "A simple web framework";
        license = stdenv.lib.licenses.bsd3;
@@ -51557,7 +52835,7 @@ self: {
        pname = "frame-markdown";
        version = "0.1";
        sha256 = "0wy1c9xgd6ykymqciga1sla83wfdwy17p88bygfp6pflbc0rw57g";
-       buildDepends = [ base frame pandoc ];
+       libraryHaskellDepends = [ base frame pandoc ];
        jailbreak = true;
        description = "A markdown to Frame GUI writer for Pandoc";
        license = stdenv.lib.licenses.bsd3;
@@ -51569,7 +52847,7 @@ self: {
        pname = "franchise";
        version = "0.0.6";
        sha256 = "144fywp5fcix5i06wvwvzwsr19bgxpajx7bi7jw43hnm3rlcj4vr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A package for configuring and building Haskell software";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51584,7 +52862,7 @@ self: {
        pname = "free";
        version = "4.12.1";
        sha256 = "0sr8phvrb4ny8j1wzq55rdn8q4br23q4pw2j276npr844825jr9p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors comonad distributive exceptions mtl prelude-extras
          profunctors semigroupoids semigroups template-haskell transformers
        ];
@@ -51601,7 +52879,7 @@ self: {
        pname = "free-functors";
        version = "0.6.4.1";
        sha256 = "1mc5y29j4khl222dwb9xcnfmn2jh3v47rkvkzwvlgrbg5bh81kzk";
-       buildDepends = [
+       libraryHaskellDepends = [
          algebraic-classes base comonad constraints template-haskell
          transformers void
        ];
@@ -51621,7 +52899,7 @@ self: {
        pname = "free-game";
        version = "1.1.81";
        sha256 = "1z8l9k70rbcc9jbrnh7xhrnny6wd5l0jfb1a6ki7dnq6m5klivyp";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base boundingboxes colors containers control-bool directory
          filepath free freetype2 GLFW-b hashable JuicyPixels
          JuicyPixels-util lens linear mtl OpenGL OpenGLRaw random reflection
@@ -51642,7 +52920,7 @@ self: {
        pname = "free-http";
        version = "0.1.1.3";
        sha256 = "1gmafmi0mrmbm7a08cxiz96s43k4sc38wvzrnmcrqcl44a1n38fm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring free http-client http-types mtl QuickCheck text
          time transformers
        ];
@@ -51659,7 +52937,7 @@ self: {
        pname = "free-operational";
        version = "0.5.0.0";
        sha256 = "0gim4m0l76sxxg6a8av1gl6qjpwxwdzyviij86d06v1150r08dmb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad-transformers free kan-extensions mtl transformers
        ];
        jailbreak = true;
@@ -51676,7 +52954,7 @@ self: {
        pname = "free-theorems";
        version = "0.3.2.0";
        sha256 = "1r0qz8h8fjb9akkhd3impr30gd0s5ky51dj667x0pf155b4lvx2w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src haskell-src-exts mtl pretty syb
        ];
        description = "Automatic generation of free theorems";
@@ -51694,10 +52972,10 @@ self: {
        sha256 = "1wq5lvnylw92qzv1q93liz4i3q2j8sbgwgaw8nw79q0x0cdvbbb3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base cgi containers free-theorems haskell-src haskell-src-exts
-         HUnit mtl pretty syb utf8-string xhtml
+       libraryHaskellDepends = [
+         base containers haskell-src haskell-src-exts HUnit mtl pretty syb
        ];
+       executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Automatically Generating Counterexamples to Naive Free Theorems";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51712,7 +52990,7 @@ self: {
        pname = "free-theorems-seq";
        version = "1.0";
        sha256 = "1scqjv6hc2y0w1x9f8v8bwrl1dnz64hf5jgrdam12dxbsk6qjs6g";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers free-theorems haskell-src mtl
          old-locale old-time parsec pretty syb utf8-string xhtml
        ];
@@ -51732,7 +53010,7 @@ self: {
        sha256 = "1bx7fg1ddycl9pgrlh2qij5vb6fqx79gl6lbm248c95xyygi3iy5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cgi containers free-theorems-seq mtl network pretty syb
          utf8-string xhtml
        ];
@@ -51751,7 +53029,7 @@ self: {
        sha256 = "1qxdfbzr52dw0qww03l86vpgmylznifqzvjarmgpkfr129szl7ba";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cgi csv dataenc directory filepath free-theorems
          process time xhtml
        ];
@@ -51771,7 +53049,7 @@ self: {
        sha256 = "1ybmffs05hgzn81szcd8nrz4f94qc64d9y2d2hkyq57djb87503j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring containers directory EdisonCore
          filepath FTGL haskell98 mtl OpenGL pngload random SDL
          template-haskell
@@ -51788,8 +53066,8 @@ self: {
        pname = "freenect";
        version = "1.2";
        sha256 = "11ggp90npdyfdmf8zhjk442zl0j0lni6hizhgc0409za9i6s1l5g";
-       buildDepends = [ base vector ];
-       extraLibraries = [ freenect freenect_sync ];
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ freenect freenect_sync ];
        homepage = "https://github.com/chrisdone/freenect";
        description = "Interface to the Kinect device";
        license = stdenv.lib.licenses.bsd3;
@@ -51806,7 +53084,7 @@ self: {
        sha256 = "150ch1xmx3slmq7hb74z8sjrqhrsc9kl1zjn030fj6k6kphrwd88";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base cpphs directory mtl parallel pretty random syb
        ];
        jailbreak = true;
@@ -51826,7 +53104,7 @@ self: {
        sha256 = "0a34qc62sjc355qfr3qz92nh27gmcyqk2jlhq77pjfdzv0ivigcy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring curl data-accessor data-accessor-template directory
          mtl xml
        ];
@@ -51843,7 +53121,9 @@ self: {
        pname = "freetype-simple";
        version = "0.1.0.1";
        sha256 = "1qhiy896a10af9fnzcp4y0ra1c9l6fbcclrr3k74pn2qvvfybnss";
-       buildDepends = [ base boundingboxes bytestring freetype2 linear ];
+       libraryHaskellDepends = [
+         base boundingboxes bytestring freetype2 linear
+       ];
        jailbreak = true;
        homepage = "https://github.com/capsjac/freetype-simple";
        description = "Single line text rendering for OpenGL ES";
@@ -51858,7 +53138,7 @@ self: {
        sha256 = "16ayyqvbl278z68ssfbv2nvbyxs7585zmnk2w53vlxvj0k9zj66s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell binding for FreeType 2 library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51869,7 +53149,7 @@ self: {
        pname = "fresh";
        version = "0.1.1";
        sha256 = "1441yv55bwmiwnr6jsccq91anq8vhc2a4ka0irn3i2i9cjzw0gkw";
-       buildDepends = [ base containers haskell-src-exts syb ];
+       libraryHaskellDepends = [ base containers haskell-src-exts syb ];
        homepage = "https://github.com/davidlazar/fresh";
        description = "Introduce fresh variables into Haskell source code";
        license = stdenv.lib.licenses.mit;
@@ -51884,10 +53164,10 @@ self: {
        pname = "friday";
        version = "0.2.2.0";
        sha256 = "0cw8mghygbd76l2nf0s1n0n1a7ymh2hv4dfm11hkv0gcdrqrp9fr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base convertible deepseq primitive ratio-int transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2 vector
        ];
        homepage = "https://github.com/RaphaelJ/friday";
@@ -51903,10 +53183,10 @@ self: {
        pname = "friday-devil";
        version = "0.1.1.1";
        sha256 = "19g1h7palsaycv81fks9zbq979jdn7fqapxd6igxhkgzw73n69aj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring convertible deepseq friday transformers vector
        ];
-       extraLibraries = [ libdevil ];
+       librarySystemDepends = [ libdevil ];
        homepage = "https://github.com/RaphaelJ/friday-devil";
        description = "Uses the DevIL C library to read and write images from and to files and memory buffers";
        license = stdenv.lib.licenses.gpl3;
@@ -51918,8 +53198,8 @@ self: {
        pname = "friendly-time";
        version = "0.4";
        sha256 = "1x73jk9smga912nfyxa77j6yz74kyx8zdr4q6xj3sirp46qm5nh5";
-       buildDepends = [ base old-locale time ];
-       testDepends = [ base hspec old-locale time ];
+       libraryHaskellDepends = [ base old-locale time ];
+       testHaskellDepends = [ base hspec old-locale time ];
        description = "Print time information in friendly ways";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51930,7 +53210,7 @@ self: {
        pname = "frisby";
        version = "0.2";
        sha256 = "0isj9p7j33va1a4q78vnq32j9jdbjww596rxja235z4whicraf53";
-       buildDepends = [ array base containers mtl ];
+       libraryHaskellDepends = [ array base containers mtl ];
        homepage = "http://repetae.net/computer/frisby/";
        description = "Linear time composable parser for PEG grammars";
        license = stdenv.lib.licenses.bsd3;
@@ -51942,7 +53222,7 @@ self: {
        pname = "frp-arduino";
        version = "0.1.0.3";
        sha256 = "00659x5f5dq4lb25ss880cqggqc63i7wqik04qvzk1kq3dl9six5";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://github.com/frp-arduino/frp-arduino";
        description = "Arduino programming without the hassle of C";
        license = stdenv.lib.licenses.gpl3;
@@ -51955,7 +53235,7 @@ self: {
        pname = "frpnow";
        version = "0.13";
        sha256 = "13dvyf1zwzvcpal7zp1jx5ns49a01jsjn3pz0iqdrph7qgll2aqr";
-       buildDepends = [ base containers mtl transformers ];
+       libraryHaskellDepends = [ base containers mtl transformers ];
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Principled practical FRP";
        license = stdenv.lib.licenses.bsd3;
@@ -51968,7 +53248,9 @@ self: {
        pname = "frpnow-gloss";
        version = "0.12";
        sha256 = "1xywqcif16r3x4qckz3n6k5mp2pya4vj35h0jrh4rd1sspnhi99i";
-       buildDepends = [ base containers frpnow gloss mtl transformers ];
+       libraryHaskellDepends = [
+         base containers frpnow gloss mtl transformers
+       ];
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Program awesome stuff with Gloss and frpnow!";
        license = stdenv.lib.licenses.bsd3;
@@ -51982,7 +53264,7 @@ self: {
        pname = "frpnow-gtk";
        version = "0.11";
        sha256 = "0yq9pgjlmzg5pzcky7z7n2ks82x92dp5pjacr6h3w8mdrhhhk80c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers frpnow glib gtk mtl transformers
        ];
        homepage = "https://github.com/atzeus/FRPNow";
@@ -51998,7 +53280,8 @@ self: {
        sha256 = "0s5cb0m6xgf9zfch75nzk9b8lvghl4nc5dk35xkakq6ys3zizw6c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Lexical extension for Quasi-Quotations using French-Quotes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52009,7 +53292,7 @@ self: {
        pname = "fs-events";
        version = "0.1";
        sha256 = "0jw6cx9fzzs8r20acjq8nq8zjhwiwnvg1b0kc97c2sij1bhw6pw4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/nkpart/fs-events";
        description = "A haskell binding to the FSEvents API";
        license = stdenv.lib.licenses.bsd3;
@@ -52022,7 +53305,7 @@ self: {
        pname = "fsharp";
        version = "0.0.4";
        sha256 = "1scmvhbsn988x6j4a94ibg1c7adrxf8lzn06n9n1iv62bjd450m3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "some F# operators, high priority pipes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52035,7 +53318,7 @@ self: {
        pname = "fsmActions";
        version = "0.4.4";
        sha256 = "05713wj1s1307brqkbnapqi42dva55kcjgb8n3x6yirpfp6lhdsc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers fgl filepath graphviz MissingH mtl parsec pretty
        ];
        homepage = "http://projects.haskell.org/fsmActions/";
@@ -52053,11 +53336,11 @@ self: {
        pname = "fsnotify";
        version = "0.2.1";
        sha256 = "0asl313a52qx2w6dw25g845683xsl840bwjh118nkwi5v1xipkzb";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base containers directory filepath hinotify text time
          unix-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base directory filepath tasty tasty-hunit temporary-rc
          unix-compat
        ];
@@ -52076,8 +53359,11 @@ self: {
        sha256 = "190a89445fv006m5nv8g58h569rpw9s8jadqdy6m3ik43mnggzpy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base haskeline mtl transformers ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ array base mtl ];
+       executableHaskellDepends = [
+         array base haskeline mtl transformers
+       ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://www.cse.chalmers.se/alumni/markus/fstStudio/";
        description = "Finite state transducers";
        license = stdenv.lib.licenses.bsd3;
@@ -52089,7 +53375,7 @@ self: {
        pname = "fsutils";
        version = "0.1.2";
        sha256 = "07lx4928d1fnjbpfmky4jhhk7sqj98b11vdbv4f67p3bwfn5lrp8";
-       buildDepends = [ base directory filepath ];
+       libraryHaskellDepends = [ base directory filepath ];
        jailbreak = true;
        homepage = "https://github.com/Raynes/fsutils";
        description = "File system utilities for Haskell that are missing from built in libraries";
@@ -52106,12 +53392,13 @@ self: {
        sha256 = "1b6pm3jfyi5lbrpjv8n6z970xs11h61hj1g5ph54fhsqd2wvmpc2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory fsnotify process system-filepath unix
        ];
        homepage = "http://www.github.com/ehamberg/fswatcher/";
        description = "Watch a file/directory and run a command when it's modified";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ftdi" = callPackage
@@ -52124,7 +53411,7 @@ self: {
        sha256 = "1gnfbngn3jwva6nvrcrzmi2n2vy4k55yh41zvg0kyb61w7kgm4m8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bytestring safe transformers usb
        ];
        jailbreak = true;
@@ -52141,7 +53428,7 @@ self: {
        pname = "ftp-conduit";
        version = "0.0.5";
        sha256 = "0gb65g46nr9haysy3dbrylka08fsz81yn7aiwwingc6wlp7d76dg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteorder bytestring conduit MissingH network transformers
          utf8-string
        ];
@@ -52162,7 +53449,7 @@ self: {
        sha256 = "1whvawaifhi5xgmiagdayjf7m6p6vs71mvc4a4csd4vzzjr0a2yf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base hslogger MissingH mtl network parsec regex-compat
        ];
        homepage = "http://software.complete.org/ftphs";
@@ -52176,7 +53463,7 @@ self: {
        pname = "ftree";
        version = "0.1.3";
        sha256 = "1ma87jnwsgzlr7z6ac303i0qy9i2lywvjgb2zjv9qgnbkf18pg3m";
-       buildDepends = [ base ShowF type-unary ];
+       libraryHaskellDepends = [ base ShowF type-unary ];
        homepage = "https://github.com/conal/ftree/";
        description = "Depth-typed functor-based trees, both top-down and bottom-up";
        license = stdenv.lib.licenses.bsd3;
@@ -52192,7 +53479,7 @@ self: {
        sha256 = "1jrpb6dzq47xy6xvsisc7g1y53dc97s4l826f9sscxpdsrx3yp8r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers free-theorems mtl pretty Shellac Shellac-readline
        ];
        jailbreak = true;
@@ -52207,7 +53494,7 @@ self: {
        pname = "fugue";
        version = "0.1";
        sha256 = "0g0qy0lcixbjm5srmfl1dnci4m09zwqcs5dpknpnsdc4b4l3925r";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A recapitulated prelude with minimal dependencies and profligate exports";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52218,7 +53505,7 @@ self: {
        pname = "full-sessions";
        version = "0.6.2.1";
        sha256 = "0irm1zrggjl9zrapzxfl3kj32d81k30c8nbmr3bf9ramjg65xm90";
-       buildDepends = [ base ghc network ];
+       libraryHaskellDepends = [ base ghc network ];
        homepage = "http://www.agusa.i.is.nagoya-u.ac.jp/person/sydney/full-sessions.html";
        description = "a monad for protocol-typed network programming";
        license = stdenv.lib.licenses.bsd3;
@@ -52235,11 +53522,11 @@ self: {
        sha256 = "0s537hzb21w506bp4i6v7k5sbk905s9950gihh99r0b7id185ppk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers text vector ];
-       testDepends = [
+       libraryHaskellDepends = [ array base containers text vector ];
+       executableToolDepends = [ alex happy ];
+       testHaskellDepends = [
          array base containers QuickCheck tasty tasty-quickcheck text vector
        ];
-       buildTools = [ alex happy ];
        jailbreak = true;
        description = "In-memory full text search engine";
        license = stdenv.lib.licenses.bsd3;
@@ -52255,8 +53542,9 @@ self: {
        sha256 = "10452kdl98igk2y48bb2ligj8nk7gpjcsf0nsiifvpjbfxv4gakc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base split ];
-       testDepends = [
+       libraryHaskellDepends = [ base split ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "http://hub.darcs.net/kowey/fullstop";
@@ -52271,7 +53559,7 @@ self: {
        pname = "funcmp";
        version = "1.8";
        sha256 = "09kmfgl15d71fr5h66j2b0ngw69y8dp41d55lz35nrjxq3l3gz1k";
-       buildDepends = [ base filepath process ];
+       libraryHaskellDepends = [ base filepath process ];
        homepage = "http://savannah.nongnu.org/projects/funcmp/";
        description = "Functional MetaPost";
        license = stdenv.lib.licenses.gpl3;
@@ -52283,7 +53571,7 @@ self: {
        pname = "function-combine";
        version = "0.1.0";
        sha256 = "1m8bmqxb9kar3y8zv22qs2a6kzd636m5li1r2q4y6pps0nglv9i9";
-       buildDepends = [ base data-type ];
+       libraryHaskellDepends = [ base data-type ];
        description = "Combining functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52295,7 +53583,7 @@ self: {
        pname = "function-instances-algebra";
        version = "0.1";
        sha256 = "0dxym6xrylngw8r5spi246nmi8fvvxxx776qismcr04zqshv7ygw";
-       buildDepends = [ base numeric-prelude ];
+       libraryHaskellDepends = [ base numeric-prelude ];
        jailbreak = true;
        homepage = "github.com/kreuzschlitzschraubenzieher/function-instances-algebra";
        description = "Instances of the Algebra.* classes for functions";
@@ -52308,7 +53596,7 @@ self: {
        pname = "functional-arrow";
        version = "0.0";
        sha256 = "1la9xqm5gs6a6cb18wyx9wr0nx6p5ryhczvb72d0zm6xrjrf0r5s";
-       buildDepends = [ base HList ];
+       libraryHaskellDepends = [ base HList ];
        jailbreak = true;
        description = "Combinators that allow for a more functional/monadic style of Arrow programming";
        license = stdenv.lib.licenses.bsd3;
@@ -52335,7 +53623,7 @@ self: {
        pname = "functor-combo";
        version = "0.3.6";
        sha256 = "1jlva6imjjpj9iww7dxiplw60vszjiw6456yq30zsqrb63sz2lk1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-orphans containers data-inttrie lub type-unary
          TypeCompose
        ];
@@ -52349,11 +53637,10 @@ self: {
        pname = "functor-infix";
        version = "0.0.3";
        sha256 = "1hpk1q58kwxdpva57hylpqj4ywk6grsi4ks2cqg6lspprqfi60gy";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/fmap/functor-infix";
        description = "Infix operators for mapping over compositions of functors. Lots of them.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "functor-monadic" = callPackage
@@ -52362,7 +53649,7 @@ self: {
        pname = "functor-monadic";
        version = "0.1.0.3";
        sha256 = "1qfrnny4qsn94n24q705z8d9gh9llz9nbyqbyy7hwh79bf1rkrcg";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ombocomp/FunctorMonadic/";
        description = "Monad-style combinators for functors";
        license = stdenv.lib.licenses.asl20;
@@ -52374,7 +53661,7 @@ self: {
        pname = "functorm";
        version = "1.0.1";
        sha256 = "1aa4f6yp4vrrrs3rswhjxw2gij3mwn8yf299kgv42wd03xazyxrs";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Data.FunctorM (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52386,7 +53673,7 @@ self: {
        pname = "functors";
        version = "0.1";
        sha256 = "0nfnjxihn0nhj0rhi1wvqax1f95wskr3fwb7c2clz4lvsma6bfg6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/aristidb/functors";
        description = "(.:) and friends, syntax for Functor and Applicative.";
        license = stdenv.lib.licenses.bsd3;
@@ -52402,7 +53689,7 @@ self: {
        sha256 = "0pgl4fg29xg7g2pdyjqmi7qlpzcs25ggwg6d9y4fzbc7fzh31wxv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath haskell98 HFuse unix
        ];
        jailbreak = true;
@@ -52418,7 +53705,7 @@ self: {
        pname = "funpat";
        version = "0.1";
        sha256 = "0zblrfg8mfbc1hzxb36hk2lb3c167xmpcvg8h595m9kjpdmj4ayw";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "A generalization of pattern matching";
        license = stdenv.lib.licenses.bsd3;
@@ -52434,7 +53721,10 @@ self: {
        sha256 = "1hyyx3ivrhw5svklyl36qzbcd0wwx4978znvn42lsl53273ds5n3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bimap bitset containers fgl mtl parse-dimacs pretty
+       ];
+       executableHaskellDepends = [
          array base bimap bitset containers fgl mtl parse-dimacs pretty
          QuickCheck random time
        ];
@@ -52453,7 +53743,7 @@ self: {
        sha256 = "1vfi30mlr0lds975wgq3197sv1qdwy6lvm6xaqwk28h5flmk28k1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring network unix ];
+       executableHaskellDepends = [ base bytestring network unix ];
        jailbreak = true;
        description = "Simple IP-over-UDP tunnel using TUNTAP";
        license = stdenv.lib.licenses.gpl3;
@@ -52465,7 +53755,7 @@ self: {
        pname = "future";
        version = "2.0.0";
        sha256 = "1gvv1m6sfxdc28h4rzp5dh6hrz6nfh031nhs192606v8wg78m3ri";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/future";
        description = "Supposed to mimics and enhance proposed C++ \"future\" features";
        license = stdenv.lib.licenses.bsd3;
@@ -52478,7 +53768,7 @@ self: {
        pname = "future-resource";
        version = "0.4.0.0";
        sha256 = "10whksji6r1bilmj2fxcccg89zh7c08s2zfn07r6wj3xgschrckv";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "realtime resource handling with manual concurrency";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -52491,10 +53781,12 @@ self: {
        pname = "fuzzcheck";
        version = "0.1.1";
        sha256 = "0qfr4f0b50l368b45yzwhqd4g2y1kvfrfj4hr84cdxcwdrwn9mpc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control QuickCheck random transformers
        ];
-       testDepends = [ base hspec hspec-expectations HUnit QuickCheck ];
+       testHaskellDepends = [
+         base hspec hspec-expectations HUnit QuickCheck
+       ];
        homepage = "https://github.com/fpco/fuzzcheck";
        description = "A simple checker for stress testing monadic code";
        license = stdenv.lib.licenses.bsd3;
@@ -52506,8 +53798,8 @@ self: {
        pname = "fuzzy";
        version = "0.1.0.0";
        sha256 = "1jz9arrg33x64ygipk0115b7jfchxh20cy14177iwg0na8mpl2l2";
-       buildDepends = [ base monoid-subclasses ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base monoid-subclasses ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "http://github.com/joom/fuzzy";
        description = "Filters a list based on a fuzzy string search";
        license = stdenv.lib.licenses.mit;
@@ -52522,8 +53814,10 @@ self: {
        pname = "fuzzy-timings";
        version = "0.0.1";
        sha256 = "1sm4g04y9n8r61q2sqa91n87hh32kpcn2r5zjlvdy7qxc11lrmj7";
-       buildDepends = [ base containers glpk-hs mtl random time ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers glpk-hs mtl random time
+       ];
+       testHaskellDepends = [
          base containers HUnit mtl QuickCheck random test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
@@ -52531,7 +53825,6 @@ self: {
        homepage = "https://github.com/tlaitinen/fuzzy-timings";
        description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fuzzytime" = callPackage
@@ -52542,7 +53835,10 @@ self: {
        sha256 = "16ybyzki390g2172d3f48vyr1gr27grkvs1jjb6cblws34n5g2pr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs directory old-time process ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base cmdargs directory old-time process
+       ];
        description = "A 'ten past six' style clock";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52556,7 +53852,7 @@ self: {
        pname = "fwgl";
        version = "0.1.2.2";
        sha256 = "1s4j1wgnncn6cmsarsc989zxz1qsqhsa722h7bv2k43093ww0nnh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hashable transformers unordered-containers vector Yampa
        ];
        jailbreak = true;
@@ -52573,7 +53869,7 @@ self: {
        pname = "fwgl-glfw";
        version = "0.1.0.5";
        sha256 = "1y30mqayih5cd74dm90y7mbb9a0fw9sirzjlrmayvcm7aniyvmql";
-       buildDepends = [
+       libraryHaskellDepends = [
          base fwgl gl GLFW-b hashable JuicyPixels transformers
          unordered-containers vector Yampa
        ];
@@ -52591,7 +53887,7 @@ self: {
        pname = "fwgl-javascript";
        version = "0.1.0.6";
        sha256 = "0fxnnjp7403c29pjks739j0j92a1sldrrxg3sp4nrjb1ax01nia9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base fwgl ghcjs-base hashable unordered-containers Yampa
        ];
        jailbreak = true;
@@ -52609,7 +53905,7 @@ self: {
        sha256 = "1blr3xbqn8fa59av4kgfp2y3szky40v5qmw3k9gsr2barrvkjqz0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HTTP json ];
+       executableHaskellDepends = [ base HTTP json ];
        description = "Generate Gentoo ebuilds from NodeJS/npm packages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52625,7 +53921,7 @@ self: {
        sha256 = "0p1rb24yldkjnkrygjb43g63vfgzq2bix7rrmiqyrdwb37s65ixq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base biopsl bytestring cmdargs hashable unordered-containers
        ];
        description = "General Alignment Clustering Tool";
@@ -52641,7 +53937,7 @@ self: {
        sha256 = "1d2hy2bb3dgzf3bj0p97hchsznzckirgws8cjm9qh5ba5mk0wl2z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base hscurses random text ];
+       executableHaskellDepends = [ array base hscurses random text ];
        jailbreak = true;
        homepage = "http://github.com/marcusbuffett/game-of-life";
        description = "Conway's Game of Life";
@@ -52655,7 +53951,7 @@ self: {
        pname = "game-probability";
        version = "1.1";
        sha256 = "1wl29h702g79kwy4ca35x1q37aaj3rphf1i9vdm2hmd44bzrwvkk";
-       buildDepends = [ base containers probability random ];
+       libraryHaskellDepends = [ base containers probability random ];
        jailbreak = true;
        description = "Simple probability library for dice rolls, card games and similar";
        license = stdenv.lib.licenses.bsd3;
@@ -52667,7 +53963,7 @@ self: {
        pname = "game-tree";
        version = "0.1.0.0";
        sha256 = "1g8gkp4g18dr6m0scilhgdwg0zh0f9a2q3b1sk0gh4m3jw6gj4m5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Searching game trees with alpha-beta pruning";
        license = "GPL";
      }) {};
@@ -52680,7 +53976,7 @@ self: {
        sha256 = "192rn2d8bil8wqilnaqxba8nzq0fjlbf0innv6rdcjs1kxw1ga0l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cairo containers glib gtk time ];
+       executableHaskellDepends = [ base cairo containers glib gtk time ];
        description = "Game clock that shows two analog clock faces";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52694,7 +53990,7 @@ self: {
        pname = "gamma";
        version = "0.9.0.2";
        sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base continued-fractions converge template-haskell vector
        ];
        homepage = "https://github.com/mokus0/gamma";
@@ -52708,7 +54004,7 @@ self: {
        pname = "gang-of-threads";
        version = "3.2.1";
        sha256 = "0gj7ln0xq1a7zzxhyl636z854xfq714kmh2ld30ll0dskr701l1p";
-       buildDepends = [ base containers mtl stm transformers ];
+       libraryHaskellDepends = [ base containers mtl stm transformers ];
        description = "Non-deterministic parallelism with bags";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52721,7 +54017,8 @@ self: {
        sha256 = "1cylwaj62gmcjczw5g44k9x6g5bamgk88h2arbbripzphhaf7cm7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskeline transformers ];
+       libraryHaskellDepends = [ base haskeline transformers ];
+       executableHaskellDepends = [ base haskeline transformers ];
        jailbreak = true;
        homepage = "http://hub.darcs.net/mekeor/Garepinoh/text/README.md";
        description = "reverse prefix notation calculator and calculation library";
@@ -52734,7 +54031,7 @@ self: {
        pname = "garsia-wachs";
        version = "1.2";
        sha256 = "0mks5nwc19i0wsc5hhxh0ji2bh0224y3r89b3p9dfzzn64n3za6v";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A Functional Implementation of the Garsia-Wachs Algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52747,7 +54044,7 @@ self: {
        pname = "gbu";
        version = "0.1";
        sha256 = "0zqgq5hr3vmajijf1vmc1s1lwilnymwvv493rra4fl0zy28k5cz6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers fgl Graphalyze haskell98 mtl regex-posix
        ];
        homepage = "http://www.daneel0yaitskov.000space.com";
@@ -52763,7 +54060,7 @@ self: {
        pname = "gc-monitoring-wai";
        version = "0.1.2";
        sha256 = "04i86mngz0s6x5j36vs2nrxivqayqjfa2ppk016r4ffs4mi7i4va";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder conduit http-types text transformers
          unordered-containers wai
        ];
@@ -52779,9 +54076,9 @@ self: {
        pname = "gconf";
        version = "0.13.0.2";
        sha256 = "0xyxia19bfpi4pd118d33z8gi5cnyygs3idrby7zrmj69rnwj2lk";
-       buildDepends = [ base glib text ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ GConf ];
+       libraryHaskellDepends = [ base glib text ];
+       libraryPkgconfigDepends = [ GConf ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GNOME configuration database system";
        license = stdenv.lib.licenses.lgpl21;
@@ -52795,8 +54092,8 @@ self: {
        pname = "gd";
        version = "3000.7.3";
        sha256 = "1dkzv6zs00qi0jmblkw05ywizc8y3baz7pnz0lcqn1cs1mhcpbhl";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [
          expat fontconfig freetype gd libjpeg libpng zlib
        ];
        description = "A Haskell binding to a subset of the GD graphics library";
@@ -52812,7 +54109,7 @@ self: {
        pname = "gdiff";
        version = "1.1";
        sha256 = "1d0d8f8bfw7ld6a1d5y6syzdha5qsm909mqzd5gfqcbi2wnh8aqc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/eelco/gdiff";
        description = "Generic diff and patch";
        license = stdenv.lib.licenses.bsd3;
@@ -52826,7 +54123,7 @@ self: {
        pname = "gdiff-ig";
        version = "0.1.1";
        sha256 = "1ma9w9ypk078vvqwlfgkwcw962xha1g1fx4abji1b7km09p58jm2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base ghc-prim instant-generics template-haskell
        ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
@@ -52843,10 +54140,10 @@ self: {
        pname = "gdiff-th";
        version = "0.1.0.7";
        sha256 = "1ihbz95k01giqbpbp1hddx71pkhz63pz5q4b71gv6z2vvvh34s2w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers gdiff mtl template-haskell th-expand-syns uniplate
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers gdiff mtl template-haskell th-expand-syns uniplate
        ];
        jailbreak = true;
@@ -52864,7 +54161,7 @@ self: {
        sha256 = "1j68vrb0fxschslh3q5i1afv0vx8q6qgv1bipfr3p77cqazp26zx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT OpenGLRaw Vec ];
+       executableHaskellDepends = [ base GLUT OpenGLRaw Vec ];
        jailbreak = true;
        homepage = "http://code.mathr.co.uk/gearbox";
        description = "zooming rotating fractal gears graphics demo";
@@ -52881,7 +54178,7 @@ self: {
        pname = "geek";
        version = "1.1.1.0";
        sha256 = "0n52s5azqqx06flfhsgbp5a63mpd4vd60y4rzrpa4jx13bydlp50";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty air air-extra air-th base bytestring containers
          curl data-default directory filepath fsnotify Glob hack2
          hack2-contrib miku moe mtl process random safe system-filepath text
@@ -52903,7 +54200,11 @@ self: {
        sha256 = "1951jw8la59c7qvjpx8x898l7hnwc51c4264mmw0h402ik233bp2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         air base bytestring data-default geek hack2
+         hack2-handler-snap-server pandoc text
+       ];
+       executableHaskellDepends = [
          air base bytestring data-default geek hack2
          hack2-handler-snap-server pandoc text
        ];
@@ -52922,7 +54223,7 @@ self: {
        pname = "gemstone";
        version = "0.3.0.1";
        sha256 = "0y9ilxpkyb42iddks31k1f6vjkm78z6yaj2yd9ppis42r2advg40";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bitmap bitmap-opengl containers FTGL lens linear OpenGL
          random SDL SDL-image stb-image transformers
        ];
@@ -52941,7 +54242,7 @@ self: {
        pname = "gencheck";
        version = "0.1.1";
        sha256 = "1fa1p13zmqqhlcakcy73ypasn4ircg1x5p3q1p5mklvfjifphfir";
-       buildDepends = [
+       libraryHaskellDepends = [
          base combinat containers ieee754 memoize random template-haskell
          transformers
        ];
@@ -52959,7 +54260,8 @@ self: {
        sha256 = "0sfl3729v03s5ykd8ijv4yrf8lzja5hyaphsfgk96gcx3zvd1a0q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base text ];
+       libraryHaskellDepends = [ attoparsec base text ];
+       executableHaskellDepends = [ attoparsec base text ];
        jailbreak = true;
        homepage = "https://github.com/womfoo/gender";
        description = "Identify a persons gender by their first name";
@@ -52975,9 +54277,9 @@ self: {
        pname = "genders";
        version = "0.1.0.1";
        sha256 = "0jl1sqj9syp31qcn3x6c0pjwj5ligirsc67ahzw2chgpf09bwh8g";
-       buildDepends = [ base bytestring filepath vector ];
-       testDepends = [ base bytestring hspec network vector ];
-       extraLibraries = [ genders ];
+       libraryHaskellDepends = [ base bytestring filepath vector ];
+       librarySystemDepends = [ genders ];
+       testHaskellDepends = [ base bytestring hspec network vector ];
        description = "Bindings to libgenders";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52990,7 +54292,9 @@ self: {
        pname = "general-prelude";
        version = "0.1.2";
        sha256 = "0km8nrd7pili8s5fz68xpb6nw9mfk0phgwaxnflk6a78vz9ic76d";
-       buildDepends = [ base lens pointless-fun strict system-filepath ];
+       libraryHaskellDepends = [
+         base lens pointless-fun strict system-filepath
+       ];
        description = "Prelude replacement using generalized type classes where possible";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53002,7 +54306,7 @@ self: {
        pname = "generator";
        version = "0.5.5";
        sha256 = "1rwz2ribijj5hb2isg0yz6hb2mwyjhzfg0ys041yb43qlcbhkhdd";
-       buildDepends = [ base List transformers ];
+       libraryHaskellDepends = [ base List transformers ];
        homepage = "http://github.com/yairchu/generator/tree";
        description = "Python-generators notation for creation of monadic lists";
        license = stdenv.lib.licenses.bsd3;
@@ -53014,7 +54318,7 @@ self: {
        pname = "generators";
        version = "1.0.3";
        sha256 = "0i51xx2hhjqjdvyzy2jza921jcfhy37azyp1cfaakvrj9kxl2w2q";
-       buildDepends = [ base mtl random ];
+       libraryHaskellDepends = [ base mtl random ];
        jailbreak = true;
        homepage = "http://liamoc.net/pdf/Generator.pdf";
        description = "Actually useful monadic random value generators";
@@ -53030,8 +54334,8 @@ self: {
        pname = "generic-accessors";
        version = "0.4.1";
        sha256 = "1qhik496296v42pjmlxxlimnw4z9p451ndc2fjvrid4g0knfzvg0";
-       buildDepends = [ base linear spatial-math ];
-       testDepends = [
+       libraryHaskellDepends = [ base linear spatial-math ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
        ];
        description = "stringly-named getters for generic data";
@@ -53045,10 +54349,10 @@ self: {
      mkDerivation {
        pname = "generic-aeson";
        version = "0.2.0.7";
-       revision = "1";
        sha256 = "06qczarf6vzd9wr9ad685v69hvd88zfv5lhry0zkka2bcdqc5wqz";
+       revision = "1";
        editedCabalFile = "f14b6017d6c92b2fc7a585bc81fd2ee286c8d73338cf1eb5964006bffeb70abd";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
        ];
@@ -53062,7 +54366,7 @@ self: {
        pname = "generic-binary";
        version = "1.0.1";
        sha256 = "1h6xs56c351137mjc3hdba7yfcw8jy9dvzj0vdrgwm0dprn0xh29";
-       buildDepends = [ base binary bytestring ghc-prim ];
+       libraryHaskellDepends = [ base binary bytestring ghc-prim ];
        jailbreak = true;
        description = "Generic Data.Binary derivation using GHC generics.";
        license = stdenv.lib.licenses.bsd3;
@@ -53075,8 +54379,10 @@ self: {
        pname = "generic-church";
        version = "0.3.0.0";
        sha256 = "1cw48dnw2nbnm3vr5xcsz7nma6g8dxvwvv7hwm63jikd9jgisnac";
-       buildDepends = [ base ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        description = "Automatically convert Generic instances to and from church representations";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53087,10 +54393,10 @@ self: {
      mkDerivation {
        pname = "generic-deepseq";
        version = "2.0.1.1";
-       revision = "1";
        sha256 = "1yajkzp79ri5i7n5ynv0i6spxyg6kyi6qvqj46brlgjag98526iv";
+       revision = "1";
        editedCabalFile = "58ed9aeb48cc2a00e3122780fcbf2732c4d6fc46198434926a8b1bcc91d4a29b";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic deep evaluation of data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53101,7 +54407,7 @@ self: {
        pname = "generic-deriving";
        version = "1.8.0";
        sha256 = "1kc6lhdanls6kgpk8xv5xi14lz1sngcd8xn930hkf7ilq4kxkcr6";
-       buildDepends = [ base ghc-prim template-haskell ];
+       libraryHaskellDepends = [ base ghc-prim template-haskell ];
        description = "Generic programming library for generalised deriving";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53112,7 +54418,7 @@ self: {
        pname = "generic-lucid-scaffold";
        version = "0.0.1";
        sha256 = "13lry3hqqrqgk5z9dc6q6hr70iqky4ssra2l71y51gnrg1kprkrz";
-       buildDepends = [ base lucid text ];
+       libraryHaskellDepends = [ base lucid text ];
        description = "General-purpose web page scaffold for Lucid";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -53127,8 +54433,8 @@ self: {
        pname = "generic-maybe";
        version = "0.3.0.4";
        sha256 = "1gs89wzs3288l2p24pj5yi68xyy2kj3aczj31zk6v9xi3bwb73x1";
-       buildDepends = [ base ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [
          base bytestring containers deepseq directory doctest filepath
          generic-deriving hlint mtl nats parallel semigroups simple-reflect
          split text unordered-containers vector
@@ -53147,10 +54453,10 @@ self: {
        pname = "generic-pretty";
        version = "0.1.0";
        sha256 = "0mg7mdbxf3va0xl2j0kz5wzy3mg6nvxv68axfjvx1zij1yjlamn7";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base bytestring containers text vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers tasty tasty-hunit text vector
        ];
        homepage = "https://github.com/tanakh/generic-pretty";
@@ -53164,7 +54470,7 @@ self: {
        pname = "generic-server";
        version = "0.1";
        sha256 = "0bl3gfqdw6sdwcailzkzmpz433cpxf6np9w9qnkwwa05xhcpd2k6";
-       buildDepends = [ base bytestring network ];
+       libraryHaskellDepends = [ base bytestring network ];
        description = "Simple generic TCP/IP server";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53175,8 +54481,8 @@ self: {
        pname = "generic-storable";
        version = "0.1.0.0";
        sha256 = "016gg232r453i7grbjg2hb69ww8jqgafnq32f38lv7l81dgzwfxj";
-       buildDepends = [ base ghc-prim ];
-       testDepends = [ base ghc-prim hspec QuickCheck ];
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base ghc-prim hspec QuickCheck ];
        jailbreak = true;
        description = "Generic implementation of Storable";
        license = stdenv.lib.licenses.bsd3;
@@ -53189,7 +54495,7 @@ self: {
        pname = "generic-tree";
        version = "15329.2";
        sha256 = "1frwwa45kahflnw2cgs8nb8jfxgrxw0n9i7h9cakpqzgbywy9b28";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generic Tree data type";
        license = "LGPL";
      }) {};
@@ -53200,7 +54506,7 @@ self: {
        pname = "generic-trie";
        version = "0.3.0.1";
        sha256 = "09f4rasw8q2yi7dakcr21igy02vhgiasylw6lzsz225kl58vjwz7";
-       buildDepends = [ base containers transformers ];
+       libraryHaskellDepends = [ base containers transformers ];
        homepage = "http://github.com/glguy/tries";
        description = "A map, where the keys may be complex structured data";
        license = stdenv.lib.licenses.bsd3;
@@ -53213,7 +54519,9 @@ self: {
        pname = "generic-xml";
        version = "0.1";
        sha256 = "08fy9wc90wcnr74wbr7q3pfr0bigrzhchx158p1ji3gagb2n2njd";
-       buildDepends = [ base HaXml mtl syb-with-class template-haskell ];
+       libraryHaskellDepends = [
+         base HaXml mtl syb-with-class template-haskell
+       ];
        description = "Marshalling Haskell values to/from XML";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53227,8 +54535,8 @@ self: {
        pname = "generic-xmlpickler";
        version = "0.1.0.3";
        sha256 = "11vbfsws5agqiv9x6pfh0z6kbvjx6i27wnp5dcjh40z4bz6bjdgy";
-       buildDepends = [ base generic-deriving hxt text ];
-       testDepends = [
+       libraryHaskellDepends = [ base generic-deriving hxt text ];
+       testHaskellDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
        ];
        homepage = "http://github.com/silkapp/generic-xmlpickler";
@@ -53242,7 +54550,7 @@ self: {
        pname = "generics-sop";
        version = "0.1.1.2";
        sha256 = "1r9icxwyh4pg952yaywk4nfj4j21klzf361z9z24avd6vw89p6v7";
-       buildDepends = [ base ghc-prim template-haskell ];
+       libraryHaskellDepends = [ base ghc-prim template-haskell ];
        description = "Generic Programming using True Sums of Products";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53253,7 +54561,7 @@ self: {
        pname = "genericserialize";
        version = "0.1";
        sha256 = "0zpb5rq2zvfsb0wlp9q4cckjkz6sdrngpir49d0sr06pivh8s6cl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Serialization library using Data.Generics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53267,7 +54575,7 @@ self: {
        sha256 = "0rq1m7psvs2r35mnz7gwmsvzyd3jv44bqp0zhq8l7mq2pq2x7dhv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base random-fu ];
+       executableHaskellDepends = [ base random-fu ];
        description = "A Genetic Algorithm library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53284,10 +54592,11 @@ self: {
        sha256 = "1kng7bv8amch6bswhica6xhmavc0r5phg402lg76xwz7ywrsc6y3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cabal-macosx containers directory filepath GenI graphviz
          hslogger json mtl process text transformers wx wxcore yaml-light
        ];
+       executableHaskellDepends = [ base GenI ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/GenI";
        description = "GenI graphical user interface";
@@ -53306,9 +54615,12 @@ self: {
        sha256 = "1ydxg10s6bk02i3mikb8aqjai099874gby26q50lwf9xp04csbfk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base blaze-html blaze-markup bytestring cmdargs directory filepath
-         GenI geniserver HTTP http-streams io-streams json text
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup bytestring directory filepath GenI
+         geniserver HTTP http-streams io-streams json text
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs directory filepath GenI json text
        ];
        jailbreak = true;
        homepage = "http://kowey.github.io/GenI";
@@ -53327,7 +54639,7 @@ self: {
        sha256 = "0brnh6f8zdpn37fjdmnpbdvb75vmaf6iq7i9vpv4a8g7asc425wd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary containers GenI haskell98 HaXml HUnit mtl parsec
          QuickCheck utf8-string
        ];
@@ -53344,8 +54656,8 @@ self: {
        pname = "genifunctors";
        version = "0.3";
        sha256 = "16jsy5dyp1hqnk40nzjprkw3bfdbc92vkgzmwdds67ljh0jn6815";
-       buildDepends = [ base containers mtl template-haskell ];
-       testDepends = [ base containers mtl template-haskell ];
+       libraryHaskellDepends = [ base containers mtl template-haskell ];
+       testHaskellDepends = [ base containers mtl template-haskell ];
        homepage = "https://github.com/danr/genifunctors";
        description = "Generate generalized fmap, foldMap and traverse";
        license = stdenv.lib.licenses.bsd3;
@@ -53357,7 +54669,7 @@ self: {
        pname = "geniplate";
        version = "0.6.0.5";
        sha256 = "01cwyf5kql4hf76p1ssqpmhaxyl7rmnmqwv644wgd0j8km8b6szc";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        jailbreak = true;
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
@@ -53369,7 +54681,7 @@ self: {
        pname = "geniplate-mirror";
        version = "0.7.1";
        sha256 = "0wz7fp0cgf7xn37mmy91scacihnr0fcd6lpbi28yx4qss2hb1m30";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/danr/geniplate";
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
@@ -53385,9 +54697,12 @@ self: {
        sha256 = "1597ah64rqag20qx8dvjmdhhhsjzsfdq2f43y3jyy2cnzssj953c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring cmdargs GenI http-types json snap-core snap-server
-         text transformers utf8-string
+       libraryHaskellDepends = [
+         base bytestring cmdargs GenI http-types json snap-core text
+         transformers utf8-string
+       ];
+       executableHaskellDepends = [
+         base GenI snap-core snap-server text
        ];
        jailbreak = true;
        description = "Simple HTTP server for GenI results";
@@ -53401,7 +54716,7 @@ self: {
        pname = "genprog";
        version = "0.1.0.2";
        sha256 = "1a9b2h4swfwx5zwcyr2zdhxdxi9f68pwpglijxhxb5javjc4dppr";
-       buildDepends = [ base MonadRandom syb syz ];
+       libraryHaskellDepends = [ base MonadRandom syb syz ];
        jailbreak = true;
        homepage = "http://github.com/jsnajder/genprog";
        description = "Genetic programming library";
@@ -53414,8 +54729,8 @@ self: {
        pname = "gentlemark";
        version = "1.0.0";
        sha256 = "1cb9si5axwqi1d893vp6n2mr68isdxc9qp6dfygy0v6hci2spnmm";
-       buildDepends = [ base parsec transformers ];
-       testDepends = [ base HUnit parsec transformers ];
+       libraryHaskellDepends = [ base parsec transformers ];
+       testHaskellDepends = [ base HUnit parsec transformers ];
        jailbreak = true;
        homepage = "http://github.com/andriyp/gentlemark";
        description = "Gentle markup language";
@@ -53428,7 +54743,7 @@ self: {
        pname = "geocalc";
        version = "1.0.0";
        sha256 = "1bvbvrkxh8dvm796ilpp294qlacid6aap2ljdi9pmz1lkf20fxjg";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Libary for calculating distances between two coordinates in WSG84";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53441,8 +54756,8 @@ self: {
        pname = "geodetic";
        version = "0.1.4";
        sha256 = "07l6yha31l0ahd6jhlj09vclms8km4q82xq2mfx2a3lbv2kffcfz";
-       buildDepends = [ base coordinate lens optional radian ];
-       testDepends = [
+       libraryHaskellDepends = [ base coordinate lens optional radian ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/geodetic";
@@ -53458,8 +54773,8 @@ self: {
        pname = "geodetics";
        version = "0.0.3";
        sha256 = "15ax0cj6q2zhlxl0fjxb434v1npq6w7n8bdqsw3vz3s9ngsvbldg";
-       buildDepends = [ array base dimensional ];
-       testDepends = [
+       libraryHaskellDepends = [ array base dimensional ];
+       testHaskellDepends = [
          array base dimensional HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -53476,7 +54791,7 @@ self: {
        pname = "geohash";
        version = "1.0.1";
        sha256 = "1pdx4pnq893kkjmgg0bgh9bfvfqdvzfq5fi02zfyhw3h8h4k05v4";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Geohash latitudes and longitudes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53489,7 +54804,7 @@ self: {
        pname = "geoip2";
        version = "0.1.0.1";
        sha256 = "0h6iivpxkc1k463cj5npzagzd01xddinpnbv8357d40617gihgrg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring bytestring-mmap containers iproute
          reinterpret-cast text
        ];
@@ -53507,10 +54822,10 @@ self: {
        pname = "geojson";
        version = "1.3.0";
        sha256 = "18fr5n3nmxlr97b7s9a5x1dx91fcg2fjfhlpxpcglkpwpkhabnqs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base lens semigroups text transformers validation vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory doctest filepath hlint QuickCheck
          template-haskell
        ];
@@ -53518,7 +54833,6 @@ self: {
        homepage = "https://github.com/domdere/hs-geojson";
        description = "A thin GeoJSON Layer above the aeson library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geom2d" = callPackage
@@ -53527,11 +54841,10 @@ self: {
        pname = "geom2d";
        version = "0.1.3.1";
        sha256 = "1kz0cdxfc27412vzqv7vcywg9pba177ds6mpwknxlh049vcfrvh5";
-       buildDepends = [ base ieee754 QuickCheck ];
-       testDepends = [ base ieee754 QuickCheck ];
+       libraryHaskellDepends = [ base ieee754 QuickCheck ];
+       testHaskellDepends = [ base ieee754 QuickCheck ];
        description = "package for geometry in euklidean 2d space";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "getemx" = callPackage
@@ -53544,7 +54857,7 @@ self: {
        sha256 = "1qgq465ck4z0mix3ari9n7a5qx5xc1zii4hmfsp093vx3qlc5nwm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base curl directory filepath haskell98 hxt mtl old-locale process
          time
        ];
@@ -53560,7 +54873,7 @@ self: {
        pname = "getflag";
        version = "1.0";
        sha256 = "0jsr8cmbnllcswdvf1rp11sc6cpjhwr22x7kx9sk3dw8bv772jjc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Command-line parser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53575,10 +54888,10 @@ self: {
        pname = "getopt-generics";
        version = "0.10.0.1";
        sha256 = "0x8vh0sng1m05blxr24ijrz16bsyvryxkk70jqkdvq173x5fj8lf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat base-orphans generics-sop tagged
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-compat base-orphans directory filepath generics-sop hspec
          process QuickCheck silently tagged temporary
        ];
@@ -53593,7 +54906,7 @@ self: {
        pname = "getopt-simple";
        version = "0.1.0.2";
        sha256 = "1pf40nc3jzprv4wn9h8mr0nhzxzilffgkapxg3k0qksfxydzv7pp";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://bitbucket.org/dpwiz/getopt-simple";
        description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy.";
        license = stdenv.lib.licenses.bsd3;
@@ -53612,14 +54925,17 @@ self: {
        sha256 = "13y01s94pq466jjzb3czxr93bdfh43mvypqp176n0zfp2v9496nb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cgi containers directory exceptions filepath
-         haskeline httpd-shed json lifted-base mtl network network-uri
-         old-locale parallel pretty process random terminfo time time-compat
-         unix utf8-string
+         haskeline httpd-shed json mtl network network-uri old-locale
+         parallel pretty process random terminfo time time-compat unix
+         utf8-string
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [ base containers lifted-base mtl ];
+       testHaskellDepends = [
+         base Cabal directory filepath HTF HUnit process
        ];
-       testDepends = [ base Cabal directory filepath HTF HUnit process ];
-       buildTools = [ alex happy ];
        doCheck = false;
        postPatch = ''
          sed -i "s|\"-s\"|\"\"|" ./Setup.hs
@@ -53639,7 +54955,7 @@ self: {
        sha256 = "0k5in0r3lwjr5yn4ayw5ssdvinh7zwzsx6pfjdj246ngx1r7ydxj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers parsec ];
+       executableHaskellDepends = [ base containers parsec ];
        homepage = "http://a319-101.ipm.edu.mo/~wke/ggts/impl/";
        description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
        license = stdenv.lib.licenses.gpl3;
@@ -53656,7 +54972,7 @@ self: {
        sha256 = "11byidxq2mcqams9a7df0hwwlzir639mr1s556sw5rrbi7jz6d7c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base colorize-haskell directory filepath pcre-light process
        ];
        homepage = "https://github.com/shachaf/ghc-core";
@@ -53674,7 +54990,7 @@ self: {
        sha256 = "1yx22p9572zg2nvmlilbmraqjmws2x47hmin2l9xd0dnck5qhy35";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html bytestring containers mtl parsec process
        ];
        homepage = "https://github.com/vincenthz/ghc-core-html";
@@ -53688,7 +55004,7 @@ self: {
        pname = "ghc-datasize";
        version = "0.1.2";
        sha256 = "0bjdcfrk3q0rsy9wmw0b01q0vmbi9jsw1bxl4l78azs7xpk9yl03";
-       buildDepends = [ base ghc-heap-view ];
+       libraryHaskellDepends = [ base ghc-heap-view ];
        homepage = "http://felsin9.de/nnis/ghc-datasize";
        description = "Determine the size of data structures in GHC's memory";
        license = stdenv.lib.licenses.bsd3;
@@ -53700,7 +55016,7 @@ self: {
        pname = "ghc-dup";
        version = "0.1";
        sha256 = "0aw4wnbzfw031xqmq0lpi4zz2md1f43nj921ni91mhdl5xgqcajm";
-       buildDepends = [ base ghc ];
+       libraryHaskellDepends = [ base ghc ];
        jailbreak = true;
        description = "Explicitly prevent sharing";
        license = stdenv.lib.licenses.bsd3;
@@ -53716,8 +55032,15 @@ self: {
        sha256 = "0vagr03rivl5ymcnkxnzb1x5b4cr6xknnkwmfliqfrc1hhjgcaxb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base binary bytestring containers mtl ];
-       testDepends = [ array base binary bytestring containers mtl ];
+       libraryHaskellDepends = [
+         array base binary bytestring containers mtl
+       ];
+       executableHaskellDepends = [
+         array base binary bytestring containers mtl
+       ];
+       testHaskellDepends = [
+         array base binary bytestring containers mtl
+       ];
        description = "Library and tool for parsing .eventlog files from GHC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53733,7 +55056,7 @@ self: {
        sha256 = "0lf063p2wj2d1hxb5hx4bcid3a3ni3g9x8sglm5q5kfbmdk7awj4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers diagrams-lib diagrams-svg filepath ghc-events lens
          mtl optparse-applicative parsec SVGFonts template-haskell th-lift
          transformers
@@ -53754,10 +55077,13 @@ self: {
        sha256 = "181qnh6mm3pmlalf17g2g87gj7hyzf5pxzvix1cmap2f31x4p6by";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base binary bytestring containers transformers
+       ];
+       testHaskellDepends = [
          array base binary bytestring containers transformers
        ];
        description = "Library and tool for parsing .eventlog files from parallel GHC";
@@ -53775,14 +55101,13 @@ self: {
        sha256 = "07kyifdh8s7jjp1jsm9f823hr0axgpxv54fr0vg8k3ibhdrw5dj1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath free ghc ghc-paths mtl syb
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory filemanip filepath ghc ghc-paths HUnit
          mtl silently syb
        ];
-       jailbreak = true;
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53796,7 +55121,7 @@ self: {
        sha256 = "0ghp3f86m91zi6kl8zq157717s2p73nwdgln4aiclq830m72ys9w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath process ];
+       executableHaskellDepends = [ base directory filepath process ];
        homepage = "http://code.haskell.org/~dons/code/ghc-gc-tune";
        description = "Graph performance of Haskell programs with different GC flags";
        license = stdenv.lib.licenses.bsd3;
@@ -53808,7 +55133,7 @@ self: {
        pname = "ghc-generic-instances";
        version = "0.1.0.0";
        sha256 = "0264ma0w85fwypnagd0l4zfs1wi1yk16rygn6fhpzgsxycwmg47h";
-       buildDepends = [ base ghc ];
+       libraryHaskellDepends = [ base ghc ];
        homepage = "https://github.com/alanz/ghc-generic-instances";
        description = "Derived instances of GHC.Generic of the GHC AST";
        license = stdenv.lib.licenses.publicDomain;
@@ -53822,14 +55147,10 @@ self: {
        pname = "ghc-heap-view";
        version = "0.5.4";
        sha256 = "02n414m1lb6lilrkmjss2pd1s7hd4lf2sga7ql2ahib69kygzhx1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers ghc template-haskell transformers
        ];
-       testDepends = [ base deepseq ];
-       postInstall = ''
-         ensureDir "$out/share/ghci"
-         ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
-       '';
+       testHaskellDepends = [ base deepseq ];
        description = "Extract the heap representation of Haskell values and thunks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53845,12 +55166,17 @@ self: {
        sha256 = "0y9gln7lbp8xqg5apfwfs95z3faawd236wqz69q8j7riwfra9bqm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath ghc ghc-mod ghc-paths
+         ghc-syb-utils mtl optparse-applicative parsec process safe syb
+         transformers
+       ];
+       executableHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-mod ghc-paths
          ghc-syb-utils hspec mtl optparse-applicative parsec process safe
          syb transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-mod ghc-paths
          ghc-syb-utils hspec mtl optparse-applicative parsec process safe
          syb transformers
@@ -53869,7 +55195,9 @@ self: {
        sha256 = "10vbibmgssb1ichxha92q5mqlaglhkcv4xxiikq4mh3l3bgzw6bj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process shake unordered-containers ];
+       executableHaskellDepends = [
+         base process shake unordered-containers
+       ];
        homepage = "https://github.com/ndmitchell/ghc-make#readme";
        description = "Accelerated version of ghc --make";
        license = stdenv.lib.licenses.bsd3;
@@ -53883,7 +55211,7 @@ self: {
        sha256 = "08qyn6mpmkq1vdfrqhckfqc096jv21scss76x9zcss4hfbljfa0p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base parsec process ];
+       executableHaskellDepends = [ base parsec process ];
        jailbreak = true;
        description = "Generate a bash completion from the GHC manpage";
        license = stdenv.lib.licenses.bsd3;
@@ -53891,10 +55219,10 @@ self: {
 
   "ghc-mod" = callPackage
     ({ mkDerivation, async, base, Cabal, containers, data-default
-     , deepseq, directory, djinn-ghc, doctest, emacs, filepath, ghc
-     , ghc-paths, ghc-syb-utils, haskell-src-exts, hlint, hspec
-     , io-choice, monad-control, monad-journal, mtl, old-time, pretty
-     , process, split, syb, temporary, text, time, transformers
+     , deepseq, directory, djinn-ghc, doctest, filepath, ghc, ghc-paths
+     , ghc-syb-utils, haskell-src-exts, hlint, hspec, io-choice
+     , monad-control, monad-journal, mtl, old-time, pretty, process
+     , split, syb, temporary, text, time, transformers
      , transformers-base
      }:
      mkDerivation {
@@ -53903,33 +55231,26 @@ self: {
        sha256 = "11wnrdb6blw169w6kd49ax9h1r9qkka5329lmdhimvki8amv8riv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base Cabal containers data-default deepseq directory
-         djinn-ghc filepath ghc ghc-paths ghc-syb-utils haskell-src-exts
-         hlint io-choice monad-control monad-journal mtl old-time pretty
-         process split syb temporary text time transformers
-         transformers-base
+       libraryHaskellDepends = [
+         base Cabal containers deepseq directory djinn-ghc filepath ghc
+         ghc-paths ghc-syb-utils haskell-src-exts hlint io-choice
+         monad-control monad-journal mtl old-time pretty process split syb
+         temporary text time transformers transformers-base
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         async base containers data-default directory filepath ghc mtl
+         old-time pretty process split time
+       ];
+       testHaskellDepends = [
          base Cabal containers deepseq directory djinn-ghc doctest filepath
          ghc ghc-paths ghc-syb-utils haskell-src-exts hlint hspec io-choice
          monad-control monad-journal mtl old-time pretty process split syb
          temporary text time transformers transformers-base
        ];
-       buildTools = [ emacs ];
-       configureFlags = "--datasubdir=ghc-mod-5.2.1.2";
-       postInstall = ''
-         cd $out/share/ghc-mod-5.2.1.2
-         make
-         rm Makefile
-         cd ..
-         ensureDir "$out/share/emacs"
-         mv ghc-mod-5.2.1.2 emacs/site-lisp
-       '';
        homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
        description = "Happy Haskell Programming";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) emacs;};
+     }) {};
 
   "ghc-mtl" = callPackage
     ({ mkDerivation, base, exceptions, extensible-exceptions, ghc, mtl
@@ -53938,7 +55259,9 @@ self: {
        pname = "ghc-mtl";
        version = "1.2.1.0";
        sha256 = "0h6r6gip9nsjlsq88wj105hhqliy7ac2dmmndsfzbjz07b03cklk";
-       buildDepends = [ base exceptions extensible-exceptions ghc mtl ];
+       libraryHaskellDepends = [
+         base exceptions extensible-exceptions ghc mtl
+       ];
        homepage = "http://hub.darcs.net/jcpetruzza/ghc-mtl";
        description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -53955,10 +55278,13 @@ self: {
        sha256 = "089ma8mjyvz61hr2907aihz8bh7h1pdmjrpm9smqmz8j5x72bsfc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath process temporary
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base containers directory filepath process temporary
+       ];
+       testHaskellDepends = [
          base directory filepath HUnit process QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -53975,15 +55301,11 @@ self: {
        pname = "ghc-parser";
        version = "0.1.7.0";
        sha256 = "0cb0d9szrimlflxh67ad74cqfi6yc2cr1bcl17c6b23ccnyqbq73";
-       buildDepends = [ base ghc ];
-       buildTools = [ cpphs happy ];
-       patchPhase = ''
-         substituteInPlace build-parser.sh --replace "/bin/bash" "$SHELL"
-       '';
+       libraryHaskellDepends = [ base ghc ];
+       libraryToolDepends = [ cpphs happy ];
        homepage = "https://github.com/gibiansky/IHaskell";
        description = "Haskell source parser from GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-paths" = callPackage
@@ -53992,8 +55314,7 @@ self: {
        pname = "ghc-paths";
        version = "0.1.0.9";
        sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
-       buildDepends = [ base ];
-       patches = [ ./patches/ghc-paths-nix.patch ];
+       libraryHaskellDepends = [ base ];
        description = "Knowledge of GHC's installation directories";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54008,7 +55329,7 @@ self: {
        sha256 = "0rm7vksfzwkpby1b8k2v745d7bylxbgspjhhfvdxc40a3rix8sz7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal cmdargs filepath parsec process split
        ];
        jailbreak = true;
@@ -54024,7 +55345,9 @@ self: {
        pname = "ghc-pkg-lib";
        version = "0.3";
        sha256 = "1m2ny3f5i1ihvpq0vigpzj701gzrbzdz5h7f41qn37ikp9a6kd5a";
-       buildDepends = [ base Cabal directory filepath ghc ghc-paths ];
+       libraryHaskellDepends = [
+         base Cabal directory filepath ghc ghc-paths
+       ];
        homepage = "https://github.com/JPMoresmau/ghc-pkg-lib";
        description = "Provide library support for ghc-pkg information";
        license = stdenv.lib.licenses.bsd3;
@@ -54037,7 +55360,7 @@ self: {
        pname = "ghc-prim";
        version = "0.4.0.0";
        sha256 = "1w3hkl1xyfi67kh65gqn99pinxrfqjl2s08yg0010r907w3qys31";
-       buildDepends = [ rts ];
+       libraryHaskellDepends = [ rts ];
        description = "GHC primitives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54050,7 +55373,8 @@ self: {
        sha256 = "0nzk3h65iqnmva7n2m00kknllqbmg95xav4g5rpizhridpivg9hb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Generates data to be used with flamegraph.pl from .prof files.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -54072,7 +55396,7 @@ self: {
        pname = "ghc-simple";
        version = "0.1.2.1";
        sha256 = "0hk3sii5d6mjry28gaipl45c6si82rhdsd43cq130fk9m0xzl9hf";
-       buildDepends = [ base ghc ghc-paths ];
+       libraryHaskellDepends = [ base ghc ghc-paths ];
        homepage = "https://github.com/valderman/ghc-simple";
        description = "Simplified interface to the GHC API";
        license = stdenv.lib.licenses.mit;
@@ -54084,7 +55408,7 @@ self: {
        pname = "ghc-srcspan-plugin";
        version = "0.2.1.0";
        sha256 = "1cb669zhgibv9x7c924333kyzqa728031invr0smdnv0a2mgi2wi";
-       buildDepends = [ array base containers ghc hpc ];
+       libraryHaskellDepends = [ array base containers ghc hpc ];
        description = "Generic GHC Plugin for annotating Haskell code with source location data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54095,7 +55419,7 @@ self: {
        pname = "ghc-syb";
        version = "0.2.0.0";
        sha256 = "0rwx7l89r5yfi1187c0zgx1ph2rsagyvrizb1c0vnbyrwhpbslh0";
-       buildDepends = [ base ghc ];
+       libraryHaskellDepends = [ base ghc ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/ghc-syb";
        description = "Data and Typeable instances for the GHC API";
@@ -54109,7 +55433,7 @@ self: {
        pname = "ghc-syb-utils";
        version = "0.2.3";
        sha256 = "0rxwdivpcppwzbqglbrz8rm9f4g1gmba9ij7p7aj3di9x37kzxky";
-       buildDepends = [ base ghc syb ];
+       libraryHaskellDepends = [ base ghc syb ];
        homepage = "http://github.com/nominolo/ghc-syb";
        description = "Scrap Your Boilerplate utilities for the GHC API";
        license = stdenv.lib.licenses.bsd3;
@@ -54121,8 +55445,7 @@ self: {
        pname = "ghc-tcplugins-extra";
        version = "0.1";
        sha256 = "1lr3x3vg5aw8fjwz7skcisqg2hsls16abxp8p4w4940qnw5zznkf";
-       buildDepends = [ base ghc ];
-       jailbreak = true;
+       libraryHaskellDepends = [ base ghc ];
        homepage = "http://www.clash-lang.org/";
        description = "Utilities for writing GHC type-checker plugins";
        license = stdenv.lib.licenses.bsd2;
@@ -54136,7 +55459,8 @@ self: {
        sha256 = "0a3800pngsbjc0fxpbqps9caa7gp5956wfyh18ybarlpi0ah7d7r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base containers text time ];
+       libraryHaskellDepends = [ attoparsec base containers text time ];
+       executableHaskellDepends = [ attoparsec base containers text ];
        homepage = "https://github.com/maoe/ghc-time-alloc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
@@ -54149,9 +55473,8 @@ self: {
        pname = "ghc-typelits-natnormalise";
        version = "0.3";
        sha256 = "169imqq6hch4lamsgz8s3cnszysvxvw9xlgd5bjldq09zvpy7i8r";
-       buildDepends = [ base ghc ghc-tcplugins-extra ];
-       testDepends = [ base tasty tasty-hunit ];
-       jailbreak = true;
+       libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "http://www.clash-lang.org/";
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
@@ -54166,15 +55489,11 @@ self: {
        pname = "ghc-vis";
        version = "0.7.2.7";
        sha256 = "0kxkmbp71yx5mskzpcyjd8s2yq01q1q6dxmqzmwg6naalcpcbswv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers deepseq fgl ghc-heap-view graphviz gtk mtl
          svgcairo text transformers xdot
        ];
        jailbreak = true;
-       postInstall = ''
-         ensureDir "$out/share/ghci"
-         ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
-       '';
        homepage = "http://felsin9.de/nnis/ghc-vis";
        description = "Live visualization of data structures in GHCi";
        license = stdenv.lib.licenses.bsd3;
@@ -54186,7 +55505,7 @@ self: {
        pname = "ghci-diagrams";
        version = "0.1.1";
        sha256 = "1jlym5k2d43avkgw7ff3pdaad5j2q5yq803cy74bgy0z69x77v1w";
-       buildDepends = [ base cairo colour diagrams gtk ];
+       libraryHaskellDepends = [ base cairo colour diagrams gtk ];
        jailbreak = true;
        description = "Display simple diagrams from ghci";
        license = stdenv.lib.licenses.bsd3;
@@ -54202,7 +55521,7 @@ self: {
        sha256 = "01j2ryxxmd5zzdv1ayvzibi3njl3nbn0ypxmafvglrvn2zwnmsqy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring directory filepath ghc ghc-paths haskeline
          mtl process unix
        ];
@@ -54219,7 +55538,7 @@ self: {
        pname = "ghci-lib";
        version = "0.1.0.0";
        sha256 = "06lg1czsr6k5h18aks33p2kbahiidhv7xsrv7n1fcvqsgglzgk3z";
-       buildDepends = [ base ghc MissingH ];
+       libraryHaskellDepends = [ base ghc MissingH ];
        jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for interactively evaluating Haskell code";
@@ -54236,7 +55555,7 @@ self: {
        sha256 = "01ghvv0y1qif19v8dlbspxyb9m5zag832sx2k3qyhqh8iccnr14x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring directory filepath ghc ghc-paths haskeline
          process transformers unix
        ];
@@ -54253,7 +55572,7 @@ self: {
        pname = "ghci-pretty";
        version = "0.0.2";
        sha256 = "01syl5c6ana4m8d3jc5pbi64zf3c4l2x0r7jwkizm7kymszmbns5";
-       buildDepends = [ base hscolour ipprint ];
+       libraryHaskellDepends = [ base hscolour ipprint ];
        homepage = "https://github.com/larskuhtz/ghci-pretty";
        description = "colored pretty-printing within ghci";
        license = stdenv.lib.licenses.mit;
@@ -54270,11 +55589,14 @@ self: {
        sha256 = "1b5d70f1422lwn8xmcdn6b52qwqp3aax0h7q3zfnkv2ima18yk6l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base cmdargs directory extra filepath process terminal-size time
+       ];
+       executableHaskellDepends = [
          ansi-terminal base cmdargs containers directory extra filepath
          fsnotify process terminal-size time
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base cmdargs containers directory extra filepath
          fsnotify process tasty tasty-hunit terminal-size time
        ];
@@ -54289,7 +55611,7 @@ self: {
        pname = "ghcjs-codemirror";
        version = "0.0.0.1";
        sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ghcjs/CodeMirror";
        description = "Installs CodeMirror JavaScript files";
        license = stdenv.lib.licenses.mit;
@@ -54302,7 +55624,9 @@ self: {
        pname = "ghcjs-dom";
        version = "0.1.1.3";
        sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly";
-       buildDepends = [ base glib gtk mtl text transformers webkit ];
+       libraryHaskellDepends = [
+         base glib gtk mtl text transformers webkit
+       ];
        description = "DOM library that supports both GHCJS and WebKitGTK";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -54315,7 +55639,7 @@ self: {
        sha256 = "0jbn6nhaq7h01wh1limsb4xzgwp7i71922gql5mz916kv6wa2cgl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ghcjs-dom mtl ];
+       executableHaskellDepends = [ base ghcjs-dom mtl ];
        homepage = "https://github.com/ghcjs/ghcjs-dom-hello";
        description = "GHCJS DOM Hello World, an example package";
        license = stdenv.lib.licenses.mit;
@@ -54328,7 +55652,9 @@ self: {
        pname = "ghcjs-websockets";
        version = "0.3.0.4";
        sha256 = "03ycfbp756hiivbynfsmkn4ddh5gj82dswzkj3cm8dwq94m8wd16";
-       buildDepends = [ base base64-bytestring binary bytestring text ];
+       libraryHaskellDepends = [
+         base base64-bytestring binary bytestring text
+       ];
        homepage = "http://github.com/mstksg/ghcjs-websockets";
        description = "GHCJS interface for the Javascript Websocket API";
        license = stdenv.lib.licenses.mit;
@@ -54347,11 +55673,14 @@ self: {
        sha256 = "0rnmv09sl5pj9y8hr7s8hwh23zfm4j8nsn524hpj73diwmzf5fh8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base blaze-html blaze-markup bytestring containers
-         diagrams-lib diagrams-svg directory file-embed ghc-prim hint mtl
-         text time unix unordered-containers vector wai wai-websockets warp
-         websockets yesod yesod-static
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup containers diagrams-lib
+         diagrams-svg ghc-prim text
+       ];
+       executableHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         file-embed hint mtl text time unix unordered-containers vector wai
+         wai-websockets warp websockets yesod yesod-static
        ];
        jailbreak = true;
        homepage = "http://github.com/shapr/ghclive/";
@@ -54368,7 +55697,7 @@ self: {
        sha256 = "1yn6blszccmgv0zrq5cxv6kww47j7pwgywgy7piz6is44ab5s5l9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base zenc ];
+       executableHaskellDepends = [ base zenc ];
        homepage = "https://github.com/Peaker/ghczdecode";
        description = "Decode Z-encoded strings from GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -54385,10 +55714,13 @@ self: {
        sha256 = "03lrn3s79gxdn5fwh6cbp46k303662fnisjs7qp1yf8c66vxi8wc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring data-default directory filepath iteratee
-         iteratee-compress mmap mtl old-locale SHA storable-endian time
-         ui-command unix zlib
+       libraryHaskellDepends = [
+         base binary bytestring data-default iteratee iteratee-compress mmap
+         old-locale SHA storable-endian time
+       ];
+       executableHaskellDepends = [
+         base bytestring data-default directory filepath mtl SHA ui-command
+         unix zlib
        ];
        description = "Trivial routines for inspecting git repositories";
        license = "GPL";
@@ -54401,7 +55733,7 @@ self: {
        pname = "gimlh";
        version = "0.1.3.0";
        sha256 = "1hxdgff1rw3yp3a2p26bj6034jgc458bdzma1xkbh9pahlhwhs2l";
-       buildDepends = [ base split ];
+       libraryHaskellDepends = [ base split ];
        homepage = "https://github.com/gazay/gimlh";
        description = "Haskell parser for GIML";
        license = stdenv.lib.licenses.mit;
@@ -54419,12 +55751,12 @@ self: {
        sha256 = "0qvhdzmqi1pppfcfld27mjzbzj9h6yaz2n7b6inp0ybr80vm6x4w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring containers directory hashable
          hashtables mtl network old-locale old-time parsec pretty process
          random regex-posix syb unix utf8-string
        ];
-       extraLibraries = [ openssl ];
+       executableSystemDepends = [ openssl ];
        homepage = "http://repetae.net/computer/ginsu/";
        description = "Ginsu Gale Client";
        license = stdenv.lib.licenses.mit;
@@ -54439,8 +55771,10 @@ self: {
        pname = "gio";
        version = "0.13.1.0";
        sha256 = "1qxbdjznxz56jw108cc78lzwh1r4g8l2jcaz2bh2akc1nwhv2x5j";
-       buildDepends = [ array base bytestring containers glib mtl ];
-       buildTools = [ gtk2hs-buildtools ];
+       libraryHaskellDepends = [
+         array base bytestring containers glib mtl
+       ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GIO";
        license = stdenv.lib.licenses.lgpl21;
@@ -54457,7 +55791,7 @@ self: {
        sha256 = "0wra67d2jdnx463vw8hf2yzzwmnkbs9791x5mgarlgc6zj68g926";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring cassava containers directory extra filepath
          gitlib gitlib-libgit2 scientific shake split tagged text
          unordered-containers vector yaml
@@ -54465,6 +55799,7 @@ self: {
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gist" = callPackage
@@ -54477,7 +55812,9 @@ self: {
        sha256 = "1jgdhga0qjbc6kx1nr5yngcx560rlxiil3cnsmzh8mwazbs3yyl1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ aeson base bytestring conduit http-conduit text ];
+       executableHaskellDepends = [
+         aeson base bytestring conduit http-conduit text
+       ];
        jailbreak = true;
        homepage = "http://github.com/simonmichael/gist";
        description = "A reliable command-line client for gist.github.com";
@@ -54495,7 +55832,7 @@ self: {
        sha256 = "0wfvfrmwn81myiaa5x4bw6ypyk0hljaaf3f7b9rnpxwk291dwc3z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs hslogger parallel-io regex-posix shelly system-fileio
          system-filepath text transformers unix
        ];
@@ -54528,9 +55865,10 @@ self: {
        pname = "git-annex";
        version = "5.20150731";
        sha256 = "18akv0xj4mf2ypzzd12briv0rw9ba7xw8k1qxvl10m9z4x6gvvm2";
+       configureFlags = [ "-fassistant" "-fproduction" ];
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson async aws base blaze-builder bloomfilter byteable bytestring
          case-insensitive clientsession conduit conduit-extra containers
          crypto-api cryptohash data-default DAV dbus directory dlist dns
@@ -54546,10 +55884,9 @@ self: {
          warp-tls xml-types yesod yesod-core yesod-default yesod-form
          yesod-static
        ];
-       buildTools = [
+       executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which
        ];
-       configureFlags = [ "-fassistant" "-fproduction" ];
        preConfigure = "export HOME=$TEMPDIR";
        checkPhase = ''
          cp dist/build/git-annex/git-annex git-annex
@@ -54574,7 +55911,7 @@ self: {
        sha256 = "1q4fbvpdjca5k530dcm6yspsgzy60dx7nimar2fkm8s086qsf662";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath optparse-applicative parsec pretty process
        ];
        jailbreak = true;
@@ -54592,8 +55929,8 @@ self: {
        pname = "git-date";
        version = "0.2.2";
        sha256 = "0yld8p7jgq0ihz21nkmirz3ynwi0mgrlgzx727kim59hplm6xrcl";
-       buildDepends = [ base bytestring time utf8-string ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring time utf8-string ];
+       testHaskellDepends = [
          base bytestring old-locale QuickCheck test-framework
          test-framework-quickcheck2 time utf8-string
        ];
@@ -54611,7 +55948,7 @@ self: {
        pname = "git-embed";
        version = "0.1.0";
        sha256 = "0yrx06ay25zsk90djr4mrqnn80xp3w6cmkciqavrmijf25fc5jvn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath process template-haskell
        ];
        homepage = "https://github.com/borsboom/git-embed";
@@ -54629,10 +55966,10 @@ self: {
        sha256 = "1vi87kdb58d7yg5bc97nkz2lcnfxsmn4w66m2m52rbfi8xnqkl6l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers optparse-applicative process text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec optparse-applicative process text
        ];
        homepage = "https://github.com/fujimura/git-freq";
@@ -54651,7 +55988,7 @@ self: {
        sha256 = "13m95j227mvl7facqjlwcz11kd88ibhr7fwf5ph81wppyic8136g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath gitlib gitlib-cmdline
          hslogger old-locale optparse-applicative shelly tagged text time
          transformers
@@ -54675,7 +56012,7 @@ self: {
        sha256 = "00byw8y9av60rwacp4006kv7qb9sc26j1f82cz1ngr42nfx9955c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath gitlib gitlib-libgit2
          lifted-async logging monad-logger old-locale optparse-applicative
          shelly tagged template-haskell text time transformers unix
@@ -54695,7 +56032,7 @@ self: {
        pname = "git-object";
        version = "0.0.2";
        sha256 = "1hwsl5n6im6b13iy1whvgd3avax9xb81maaan2vf3r474r3321jm";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring directory
          enumerator filepath zlib-enum
        ];
@@ -54716,7 +56053,7 @@ self: {
        sha256 = "19hgrp2kjqhcw53rf9payiajzfz6d7jqf2m2mnmbjv2zpr9y74dp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          async base bytestring containers directory exceptions filepath
          hslogger IfElse MissingH mtl network network-uri
          optparse-applicative process QuickCheck text time transformers unix
@@ -54738,10 +56075,11 @@ self: {
        sha256 = "1yywxganjl7rj4lf3pp1fh4adjhp3110l4az1w76r3rywql6v8w2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring Cabal machines machines-io machines-process process
-         safe transformers
+       libraryHaskellDepends = [
+         base bytestring machines machines-io machines-process process safe
+         transformers
        ];
+       executableHaskellDepends = [ base Cabal ];
        jailbreak = true;
        homepage = "github.com/aloiscochard/git-sanity";
        description = "A sanity checker for your git history";
@@ -54760,13 +56098,17 @@ self: {
        sha256 = "1l1ly1wkfidpzxr68z0qyfyj0pq7wdn534m4ks0hvh45sp6v569c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bifunctors Cabal containers cpphs Diff directory filepath
-         formatting ghc-mod haskell-src-exts hlint hscolour mtl
-         optparse-applicative process split strict stylish-haskell text
+       libraryHaskellDepends = [
+         base containers directory filepath formatting ghc-mod hlint mtl
+         optparse-applicative process split stylish-haskell text
          transformers unix
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bifunctors Cabal containers cpphs Diff directory filepath
+         ghc-mod haskell-src-exts hlint hscolour optparse-applicative
+         process split strict stylish-haskell text
+       ];
+       testHaskellDepends = [
          base containers directory filepath hspec process temporary
          transformers unix
        ];
@@ -54786,7 +56128,7 @@ self: {
        sha256 = "0vd580k1cxipycyyjpzhwvv6q70nf6fjfrsxp3gz3gy4iqzzssgy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cryptohash directory filepath process utf8-string
        ];
        homepage = "https://github.com/vincenthz/gitcache";
@@ -54805,7 +56147,7 @@ self: {
        sha256 = "0krna2rqdscnrd86d7ipq4gad7dzk1w5lnk8757a13qnd5jqrxdl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-lens base bytestring foldl lens mtl
          optparse-applicative sqlite-simple system-filepath text turtle wreq
        ];
@@ -54827,13 +56169,13 @@ self: {
        pname = "github";
        version = "0.13.2";
        sha256 = "1i07jwhkzaxia98a3fjnm3hynh4mjdhy9rzdh9chdlram5wqk87z";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring byteable bytestring
          case-insensitive conduit containers cryptohash data-default failure
          hashable HTTP http-conduit http-types network old-locale text time
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base base16-bytestring byteable bytestring
          case-insensitive conduit containers cryptohash data-default failure
          hashable hspec HTTP http-conduit http-types network old-locale text
@@ -54856,13 +56198,13 @@ self: {
        sha256 = "110nivss9436ls2mr5bl0m6fzg6ds5m0ams803zq60b8dya96wic";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory exceptions filepath github
          hslogger IfElse MissingH mtl network network-uri
          optparse-applicative pretty-show process text transformers unix
          unix-compat
        ];
-       buildTools = [ git ];
+       executableToolDepends = [ git ];
        homepage = "https://github.com/joeyh/github-backup";
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
@@ -54876,7 +56218,7 @@ self: {
        pname = "github-post-receive";
        version = "1.2.0.1";
        sha256 = "14vd9rnr3x3wasnc6w6d3kcs5dnka902n9cbxblqdryc8l7p360q";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers email-validate http-types text wai
          wai-logger warp
        ];
@@ -54891,7 +56233,7 @@ self: {
        pname = "github-types";
        version = "0.1.0.5";
        sha256 = "0lymbga0rwhni0rrjdla6fz5a1gz8zclf421rdiz5cnnh8lbd97i";
-       buildDepends = [ aeson base text ];
+       libraryHaskellDepends = [ aeson base text ];
        description = "Type definitions for objects used by the GitHub v3 API";
        license = "unknown";
      }) {};
@@ -54902,7 +56244,7 @@ self: {
        pname = "github-utils";
        version = "0.1.0";
        sha256 = "1d7g1rzaqg19bc41vqvcdxdi37z9h7ajy3khsqa4pwbfavj412a5";
-       buildDepends = [ base basic-prelude github text ];
+       libraryHaskellDepends = [ base basic-prelude github text ];
        jailbreak = true;
        homepage = "https://github.com/greenrd/github-utils";
        description = "Useful functions that use the GitHub API";
@@ -54917,7 +56259,7 @@ self: {
        pname = "github-webhook-handler";
        version = "0.0.3";
        sha256 = "1dwq1fccgnngh97kxyb3kp4f6xr8dsydlgkydl28lxkbwcapk39h";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring cryptohash github-types text transformers
          uuid vector
        ];
@@ -54933,7 +56275,7 @@ self: {
        pname = "github-webhook-handler-snap";
        version = "0.0.3";
        sha256 = "0v9wman214rj81dfvkgng195s3gsvy5d7csshqwcw9x10giby9iy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive github-types
          github-webhook-handler snap-core uuid
        ];
@@ -54951,7 +56293,7 @@ self: {
        sha256 = "03sjhlsp7xswciypp7sw9x0b3h6m7fvc2dk5k0a3bibflns2zgql";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base base64-bytestring bytestring http-conduit network safe
          text
        ];
@@ -54977,13 +56319,16 @@ self: {
        sha256 = "06wxy4hpbkbmlwrgnsxbr47k2a791094gzqsmlqzhsq6wa1bgfr9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base filepath ghc ghc-paths pandoc pandoc-types safe
+       ];
+       executableHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring ConfigFile
          containers directory feed filepath filestore ghc ghc-paths
          happstack-server highlighting-kate hoauth2 hslogger HStringTemplate
          HTTP http-client-tls http-conduit json mtl network network-uri
          old-locale old-time pandoc pandoc-types parsec pretty process
-         random recaptcha safe SHA split syb tagsoup text time uri url
+         random recaptcha SHA split syb tagsoup text time uri url
          utf8-string uuid xhtml xml xss-sanitize zlib
        ];
        homepage = "http://gitit.net";
@@ -55002,7 +56347,7 @@ self: {
        pname = "gitlib";
        version = "3.1.0.2";
        sha256 = "05l5i2s0212sx3bzw6r9njanjv1q1gmqc7f6g1z1sy9fibyxcwah";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring bytestring conduit conduit-combinators
          containers directory exceptions filepath hashable lifted-async
          lifted-base monad-control monad-logger mtl resourcet semigroups
@@ -55024,20 +56369,19 @@ self: {
        pname = "gitlib-cmdline";
        version = "3.1.0.2";
        sha256 = "1dridps65mw06r9slza80vl21f5n1kq1if7gnwcrbagicvy45p0k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-combinators containers directory
          exceptions gitlib monad-control mtl old-locale parsec
          process-extras shelly system-filepath tagged text time
          time-locale-compat transformers transformers-base
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base gitlib gitlib-test hspec hspec-expectations system-filepath
          tagged text transformers
        ];
        description = "Gitlib repository backend that uses the git command-line tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-cross" = callPackage
@@ -55048,8 +56392,8 @@ self: {
        pname = "gitlib-cross";
        version = "3.1.0";
        sha256 = "0iack7kafbfa45s9k7ypbafapahrifh2grjdzyrhvzjg767l3i1h";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base gitlib gitlib-cmdline gitlib-libgit2 gitlib-test hspec
          hspec-expectations HUnit
        ];
@@ -55071,14 +56415,14 @@ self: {
        pname = "gitlib-libgit2";
        version = "3.1.0.5";
        sha256 = "1xnzks7jwl7d0xf7qgz9gmqf4n1yn3qvjrs73prla8n063kgdh95";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-combinators containers directory
          exceptions fast-logger filepath gitlib hlibgit2 lifted-async
          lifted-base mmorph monad-control monad-logger monad-loops mtl
          resourcet stm stm-conduit tagged template-haskell text text-icu
          time transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base exceptions gitlib gitlib-test hspec hspec-expectations HUnit
          monad-logger transformers
        ];
@@ -55100,14 +56444,14 @@ self: {
        pname = "gitlib-s3";
        version = "3.1.0.1";
        sha256 = "1vcx26dny7pj4lqn1rli3vqad2xh7vkqj86c6i7hyskilgbs6n8m";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attempt aws base bifunctors binary bytestring conduit
          conduit-combinators data-default directory exceptions filepath
          ghc-prim gitlib gitlib-libgit2 hlibgit2 http-conduit lens
          lifted-base monad-control monad-logger resourcet retry split stm
          template-haskell text time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aws base data-default directory exceptions filepath gitlib
          gitlib-libgit2 gitlib-test hlibgit2 hspec hspec-expectations HUnit
          monad-logger resourcet temporary text transformers
@@ -55123,7 +56467,9 @@ self: {
        pname = "gitlib-sample";
        version = "3.1.0";
        sha256 = "1px3yskxkr1kmgwfw1jdrbgjgkz8wxznz56g0gn3gqx63haxifmc";
-       buildDepends = [ base exceptions gitlib mtl transformers ];
+       libraryHaskellDepends = [
+         base exceptions gitlib mtl transformers
+       ];
        description = "Sample backend for gitlib showing the basic structure for any backend";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -55137,7 +56483,7 @@ self: {
        pname = "gitlib-test";
        version = "3.1.0.3";
        sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-combinators exceptions gitlib hspec
          hspec-expectations HUnit monad-control tagged text time
          transformers
@@ -55155,7 +56501,7 @@ self: {
        pname = "gitlib-utils";
        version = "1.2.0";
        sha256 = "081vagmlf6lkh7qqr9y42nl8c1ds011s05a567dsw6ckf166wshn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit data-default failure gitlib hex lifted-base
          system-fileio system-filepath tagged text transformers
          unordered-containers
@@ -55173,7 +56519,7 @@ self: {
        pname = "gitrev";
        version = "1.0.0";
        sha256 = "05jxzhpjzd9n5sdaa8d9y2zczs2v5w4n9718wl411ghvx54jhnfd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath process template-haskell
        ];
        homepage = "https://github.com/acfoltzer/gitrev";
@@ -55190,11 +56536,11 @@ self: {
        pname = "gitson";
        version = "0.5.1";
        sha256 = "175j2pkc3cb37h3vilb99i782as9yg68nacs2ysnp1m7hrxvvyjy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base bytestring directory errors filepath flock
          monad-control process transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base directory doctest Glob hspec process transformers
        ];
        homepage = "https://github.com/myfreeweb/gitson";
@@ -55211,11 +56557,11 @@ self: {
        pname = "gl";
        version = "0.7.7";
        sha256 = "0lsz8gq3cmkh6s9hhxnr3m95ibra9y63230jyqhwk9wamid2x2pg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath fixed half hxt split
          transformers
        ];
-       extraLibraries = [ mesa ];
+       librarySystemDepends = [ mesa ];
        description = "Complete OpenGL raw bindings";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) mesa;};
@@ -55226,7 +56572,7 @@ self: {
        pname = "gl-capture";
        version = "0.1.0.0";
        sha256 = "0pcan0fpb1mfwda69f8z8pdrdav79rdm31yvmrk98dca7al7k583";
-       buildDepends = [ base bytestring OpenGL ];
+       libraryHaskellDepends = [ base bytestring OpenGL ];
        description = "simple image capture from OpenGL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55237,9 +56583,9 @@ self: {
        pname = "glade";
        version = "0.12.5.0";
        sha256 = "0dbl7y5rdwzcham16iym9cikfyaphzr1rqcsni9ab6s2368a1vkr";
-       buildDepends = [ base glib gtk ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ libglade ];
+       libraryHaskellDepends = [ base glib gtk ];
+       libraryPkgconfigDepends = [ libglade ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the glade library";
@@ -55253,7 +56599,7 @@ self: {
        pname = "gladexml-accessor";
        version = "0.0";
        sha256 = "06kzakvssmldjgx0s8qm0a3cd9glmwrdnh690sv708jcvg8x45y3";
-       buildDepends = [ base glade HaXml template-haskell ];
+       libraryHaskellDepends = [ base glade HaXml template-haskell ];
        description = "Automagically declares getters for widget handles in specified interface file";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55270,11 +56616,12 @@ self: {
        sha256 = "01bqh7g76a02qvzqm8di6ig84k0v7crd9aljsg339h7d3y7grxhf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base containers directory errors haskeline mtl
          parsec
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          ansi-wl-pprint base errors mtl parsec tasty tasty-hunit
          template-haskell
        ];
@@ -55291,7 +56638,10 @@ self: {
        sha256 = "076v7h0p91dj8hx110vm0li2njsc8p5dgcf6zxk721mdx5xkymhz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers GLFW-b lens mtl OpenGL ];
+       libraryHaskellDepends = [ base containers GLFW-b lens mtl OpenGL ];
+       executableHaskellDepends = [
+         base containers GLFW-b lens mtl OpenGL
+       ];
        jailbreak = true;
        homepage = "zyghost.com";
        description = "An OpenGL micro framework";
@@ -55303,10 +56653,10 @@ self: {
      mkDerivation {
        pname = "glasso";
        version = "0.1.0";
-       revision = "1";
        sha256 = "1ibkvgfighkfn3v27cqy7wwhvlhmnbi1dvyycwbfba6rfy9w6gb8";
+       revision = "1";
        editedCabalFile = "abf1b0cb0b9cc8c106f833a2549e2be95111a58296d6cc01c39e18c03abef797";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        description = "Graphical Lasso algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55319,9 +56669,11 @@ self: {
        pname = "glib";
        version = "0.13.2.1";
        sha256 = "1pxc2a0hnjaryf3f8d410rnhxmc7byx6lwcypgqg4zma6r3qhqwp";
-       buildDepends = [ base bytestring containers text utf8-string ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ glib ];
+       libraryHaskellDepends = [
+         base bytestring containers text utf8-string
+       ];
+       libraryPkgconfigDepends = [ glib ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GLIB library for Gtk2Hs";
        license = stdenv.lib.licenses.lgpl21;
@@ -55333,8 +56685,8 @@ self: {
        pname = "glider-nlp";
        version = "0.1";
        sha256 = "1i604gj3ssabr3dcas6gfh20d4psqwl1j4d7wk4p3gy0hvjvr8fb";
-       buildDepends = [ base containers text ];
-       testDepends = [ base Cabal containers HUnit text ];
+       libraryHaskellDepends = [ base containers text ];
+       testHaskellDepends = [ base Cabal containers HUnit text ];
        jailbreak = true;
        homepage = "https://github.com/klangner/glider-nlp";
        description = "Natural Language Processing library";
@@ -55350,7 +56702,7 @@ self: {
        sha256 = "1xgx02cxvpc8sv99wl44lpzbv9cc87nnihbpalmddb71mwrmj4ji";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ppm split ];
+       executableHaskellDepends = [ base ppm split ];
        description = "A simple ray tracer in an early stage of development";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55361,7 +56713,8 @@ self: {
        pname = "gll";
        version = "0.2.0.3";
        sha256 = "1w2z5071idac1jn367dymphqvayd580jlnhapmfrd3s40b6z6xaf";
-       buildDepends = [ array base containers TypeCompose ];
+       libraryHaskellDepends = [ array base containers TypeCompose ];
+       jailbreak = true;
        description = "GLL parser with simple combinator interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55375,7 +56728,7 @@ self: {
        pname = "global";
        version = "0.2.1.0";
        sha256 = "00d9qsh0n9yxr411mdisk602qiizy9h4wgz4k04mfr5x5g6cp418";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts haskell-src-exts-qq loch-th SafeSemaphore stm
          syntax-trees-fork-bairyn tagged template-haskell
        ];
@@ -55394,8 +56747,10 @@ self: {
        pname = "global-config";
        version = "0.3.1";
        sha256 = "1rp855j0rzx528x01q5wi2hah80bwqf5rrw7p8p8qzl39fhlpzqa";
-       buildDepends = [ base data-default global-variables transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base data-default global-variables transformers
+       ];
+       testHaskellDepends = [
          base bytestring data-default HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
@@ -55410,7 +56765,7 @@ self: {
        pname = "global-lock";
        version = "0.1";
        sha256 = "0b2sz9ag6wcr0amgrx08l7924brfansnh9rv64wg9s3nk4ni2sxp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A global lock implemented without unsafePerformIO";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55421,7 +56776,7 @@ self: {
        pname = "global-variables";
        version = "1.0.1.1";
        sha256 = "0fvhh6q6z114qyi5rhwzxhrlqfhx6af97187b49lyvx2k9zkzvzp";
-       buildDepends = [ base containers stm ];
+       libraryHaskellDepends = [ base containers stm ];
        jailbreak = true;
        description = "Namespaced, global, and top-level mutable variables without unsafePerformIO";
        license = stdenv.lib.licenses.bsd3;
@@ -55437,7 +56792,11 @@ self: {
        sha256 = "069j4xvh5039xkg300h1cwa0lyvkycixasxr8zh4iqyl1g5bcvs8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base GlomeTrace GlomeVec GLUT haskell98 OpenGL parallel
+         random time
+       ];
+       executableHaskellDepends = [
          array base GlomeTrace GlomeVec GLUT haskell98 OpenGL parallel
          random time
        ];
@@ -55456,7 +56815,7 @@ self: {
        pname = "gloss";
        version = "1.9.2.1";
        sha256 = "1fk7472lw4621gv64fv4mna8z1av15f7d0didpc9r22rdlkpa80l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
        jailbreak = true;
@@ -55473,7 +56832,7 @@ self: {
        pname = "gloss";
        version = "1.9.4.1";
        sha256 = "1rdgcv9jmawzgvshnc6pgdl7f2p6a3f09jwjnhmkfxx3gdwr8q5i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
        homepage = "http://gloss.ouroborus.net";
@@ -55486,10 +56845,10 @@ self: {
      mkDerivation {
        pname = "gloss-accelerate";
        version = "1.9.0.0";
-       revision = "1";
        sha256 = "13vr758nl712kpkc8nii05iv1zidsp55ihvaknqzn8zdhyk4dxrv";
+       revision = "1";
        editedCabalFile = "cddab61d37317ec1a15ad7da65d909b8668b284dcf182a7a348d234bff7d30ff";
-       buildDepends = [ accelerate base gloss gloss-rendering ];
+       libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55500,7 +56859,7 @@ self: {
        pname = "gloss-algorithms";
        version = "1.9.4.1";
        sha256 = "0j8n0769690ikrqwbqp4ba6zz2l4i6211alic3l7mqc2h6rggjs0";
-       buildDepends = [ base containers ghc-prim gloss ];
+       libraryHaskellDepends = [ base containers ghc-prim gloss ];
        homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
@@ -55511,10 +56870,10 @@ self: {
      mkDerivation {
        pname = "gloss-banana";
        version = "0.1.0.4";
-       revision = "1";
        sha256 = "0zzpdryfcqvxpzv53ymsvkm2nza9ryvzqgf3n89pnvrni91avgj3";
+       revision = "1";
        editedCabalFile = "232cec279cb20afd92056320c24d3d3041199b014981492ddbbe57eeff312a5a";
-       buildDepends = [ base gloss reactive-banana ];
+       libraryHaskellDepends = [ base gloss reactive-banana ];
        homepage = "https://github.com/Twey/gloss-banana";
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
@@ -55526,7 +56885,7 @@ self: {
        pname = "gloss-devil";
        version = "0.2";
        sha256 = "17gwy13z4lymm9dpj26q4ihcl198gqn9kpcjdw8lcgfcg4gxszsm";
-       buildDepends = [ base bytestring gloss repa repa-devil ];
+       libraryHaskellDepends = [ base bytestring gloss repa repa-devil ];
        description = "Display images in Gloss using libdevil for decoding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55543,7 +56902,7 @@ self: {
        sha256 = "02qsxxbrg8d4338mcj3ka3l2f9qyf3r515b32dm5iingjb8dn5ly";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bmp bytestring containers ghc-prim GLFW-b gloss
          gloss-algorithms gloss-raster gloss-rendering random repa
          repa-algorithms repa-io vector
@@ -55559,7 +56918,7 @@ self: {
        pname = "gloss-game";
        version = "0.3.3.0";
        sha256 = "01k9600f9lv65n9bi2v40gzcl14gg9cm27fxz8yk4kx1hk5hv980";
-       buildDepends = [ base gloss gloss-juicy ];
+       libraryHaskellDepends = [ base gloss gloss-juicy ];
        homepage = "https://github.com/mchakravarty/gloss-game";
        description = "Gloss wrapper that simplifies writing games";
        license = stdenv.lib.licenses.bsd3;
@@ -55574,7 +56933,12 @@ self: {
        sha256 = "1y525ck3cqqg9zggd88ilzxv1pfcz801s0sdgprw3amzyxn71kqq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bmp bytestring gloss JuicyPixels vector ];
+       libraryHaskellDepends = [
+         base bmp bytestring gloss JuicyPixels vector
+       ];
+       executableHaskellDepends = [
+         base bmp bytestring gloss JuicyPixels vector
+       ];
        homepage = "http://github.com/alpmestan/gloss-juicy";
        description = "Load any image supported by Juicy.Pixels in your gloss application";
        license = stdenv.lib.licenses.bsd3;
@@ -55582,20 +56946,19 @@ self: {
 
   "gloss-raster" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering
-     , llvm, repa
+     , repa
      }:
      mkDerivation {
        pname = "gloss-raster";
        version = "1.9.4.1";
        sha256 = "0q6mqgmi3gx2yx8a3rq4nzk2mz2iidnzl26b5h4zhjgmgz8jawv9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim gloss gloss-rendering repa
        ];
-       extraLibraries = [ llvm ];
        homepage = "http://gloss.ouroborus.net";
        description = "Parallel rendering of raster images";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (self.llvmPackages) llvm;};
+     }) {};
 
   "gloss-raster-accelerate" = callPackage
     ({ mkDerivation, accelerate, accelerate-cuda, base, gloss
@@ -55605,7 +56968,7 @@ self: {
        pname = "gloss-raster-accelerate";
        version = "1.9.0.0";
        sha256 = "0kgjbqharpl9an4kpciiy17chsdlzx5n4mgxp93yja4av8vik3i8";
-       buildDepends = [
+       libraryHaskellDepends = [
          accelerate accelerate-cuda base gloss gloss-accelerate
        ];
        description = "Parallel rendering of raster images using Accelerate";
@@ -55618,7 +56981,9 @@ self: {
        pname = "gloss-rendering";
        version = "1.9.3.1";
        sha256 = "1ns9x9fwkvxy0dwgdd3apv3p0d4857h3mkb3dx0rg9rs3wbapyzy";
-       buildDepends = [ base bmp bytestring containers GLUT OpenGL ];
+       libraryHaskellDepends = [
+         base bmp bytestring containers GLUT OpenGL
+       ];
        description = "Gloss picture data types and rendering functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -55629,7 +56994,7 @@ self: {
        pname = "gloss-sodium";
        version = "0.1.0.0";
        sha256 = "0ygjqzb1pn092j0d0gcwhxdv940rdlvpaj1gxa347mdgvp4jb9za";
-       buildDepends = [ base gloss sodium ];
+       libraryHaskellDepends = [ base gloss sodium ];
        jailbreak = true;
        homepage = "https://github.com/Twey/gloss-sodium";
        description = "A Sodium interface to the Gloss drawing package";
@@ -55642,11 +57007,10 @@ self: {
        pname = "glpk-hs";
        version = "0.3.5";
        sha256 = "1nx0mcy009cj1h2fsz00qfpr9zawagwsp3w370251hdc5q6bw52p";
-       buildDepends = [ array base containers deepseq mtl ];
-       extraLibraries = [ glpk ];
+       libraryHaskellDepends = [ array base containers deepseq mtl ];
+       librarySystemDepends = [ glpk ];
        description = "Comprehensive GLPK linear programming bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) glpk;};
 
   "glue" = callPackage
@@ -55660,11 +57024,15 @@ self: {
        sha256 = "1p93cv8c52dbw0lz48yjpfbrj48giyxrwmc9bymfpgjmynda4zab";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base ekg-core hashable lifted-base monad-control text time
+         transformers transformers-base unordered-containers
+       ];
+       executableHaskellDepends = [
          async base ekg-core hashable lifted-base monad-control text time
          transformers transformers-base unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base ekg-core hashable hspec lifted-base monad-control
          QuickCheck quickcheck-instances text time transformers
          transformers-base unordered-containers
@@ -55679,7 +57047,9 @@ self: {
        pname = "gluturtle";
        version = "0.0.58.1";
        sha256 = "0jwkppf9ipm61g052r9m65awq3nsigf3q4m9bj2hmb3n9z75i1hp";
-       buildDepends = [ base convertible GLUT stm yjsvg yjtools ];
+       libraryHaskellDepends = [
+         base convertible GLUT stm yjsvg yjtools
+       ];
        description = "turtle like LOGO with glut";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55692,7 +57062,9 @@ self: {
        pname = "gmap";
        version = "0.1";
        sha256 = "0kwx0zknxpda0pjf9hphniz33b9m0md54z8zx09vzkjq7lpljx7r";
-       buildDepends = [ array AvlTree base COrdering QuickCheck random ];
+       libraryHaskellDepends = [
+         array AvlTree base COrdering QuickCheck random
+       ];
        description = "Composable maps and generic tries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55708,7 +57080,7 @@ self: {
        sha256 = "04r7n24jnqgggi19d4l1lj1ag5jrh3zk2pvxwm5xfb7imlg37zm8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ad array base gtk gtkglext mtl OpenGL OpenGLRaw parsec
          priority-queue qd reflection Vec
        ];
@@ -55726,7 +57098,9 @@ self: {
        sha256 = "0ipx8hka4ly3dc3dv6dnk2bq3hbiiahqqragdm1bqgy1plvwa5q6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory gconf glib gtk random ];
+       executableHaskellDepends = [
+         base directory gconf glib gtk random
+       ];
        description = "Randomly set a picture as the GNOME desktop background";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55739,10 +57113,10 @@ self: {
        pname = "gnome-keyring";
        version = "0.3.1";
        sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8";
-       buildDepends = [ base bytestring text time ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ gnome_keyring ];
-       pkgconfigDepends = [ gnome_keyring ];
+       libraryHaskellDepends = [ base bytestring text time ];
+       librarySystemDepends = [ gnome_keyring ];
+       libraryPkgconfigDepends = [ gnome_keyring ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://john-millikin.com/software/haskell-gnome-keyring/";
        description = "Bindings for libgnome-keyring";
        license = stdenv.lib.licenses.gpl3;
@@ -55757,9 +57131,11 @@ self: {
        pname = "gnomevfs";
        version = "0.11.0";
        sha256 = "0g4dic9k1c4221v4kacc46sj2vra1jlnb4pn657zfwbkni8z0kmp";
-       buildDepends = [ array base containers glib gtk haskell98 mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gnome_vfs gnome_vfs_module ];
+       libraryHaskellDepends = [
+         array base containers glib gtk haskell98 mtl
+       ];
+       libraryPkgconfigDepends = [ gnome_vfs gnome_vfs_module ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the GNOME Virtual File System library";
@@ -55773,10 +57149,10 @@ self: {
        pname = "gnuidn";
        version = "0.2.1";
        sha256 = "1jii635wc3j1jnwwx24j9gg9xd91g2iw5967acn74p7db62lqx37";
-       buildDepends = [ base bytestring text ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ libidn ];
-       pkgconfigDepends = [ libidn ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ libidn ];
+       libraryPkgconfigDepends = [ libidn ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://john-millikin.com/software/haskell-gnuidn/";
        description = "Bindings for GNU IDN";
        license = stdenv.lib.licenses.gpl3;
@@ -55793,14 +57169,13 @@ self: {
        sha256 = "1rx6gppgikjyd8ndlmc1yx3b4670184l80g8vrpcgjmbq23wjnmh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers data-accessor data-accessor-transformers
          deepseq filepath process temporary time transformers utility-ht
        ];
        homepage = "http://www.haskell.org/haskellwiki/Gnuplot";
        description = "2D and 3D plots using gnuplot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gnutls" = callPackage
@@ -55810,9 +57185,9 @@ self: {
        pname = "gnutls";
        version = "0.2";
        sha256 = "1c5pm0d80wpgh2bkcgbvmc72agf89h8ghfnrn1m1x3fljbgzvrn0";
-       buildDepends = [ base bytestring monads-tf transformers ];
-       extraLibraries = [ gnutls ];
-       pkgconfigDepends = [ gnutls ];
+       libraryHaskellDepends = [ base bytestring monads-tf transformers ];
+       librarySystemDepends = [ gnutls ];
+       libraryPkgconfigDepends = [ gnutls ];
        homepage = "https://john-millikin.com/software/haskell-gnutls/";
        description = "Bindings for GNU libgnutls";
        license = stdenv.lib.licenses.gpl3;
@@ -55823,10 +57198,10 @@ self: {
      mkDerivation {
        pname = "goa";
        version = "3.3";
-       revision = "1";
        sha256 = "0z1mhi2y4qm1lj6vfsmxf2gs5shfwdac3p9gqj89hx28mpc3rmzk";
+       revision = "1";
        editedCabalFile = "5ae2bd1f4c29e22070fa32e5c126066813467ffe71a912148304d6f30d200137";
-       buildDepends = [ base directory filepath process ];
+       libraryHaskellDepends = [ base directory filepath process ];
        description = "GHCi bindings to lambdabot";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55840,8 +57215,10 @@ self: {
        pname = "goatee";
        version = "0.3.0";
        sha256 = "1py0cnmvqnjdf6bwwn8p6c78p9qnmk82932j7j6y2q91yhna6b2d";
-       buildDepends = [ base containers mtl parsec template-haskell ];
-       testDepends = [ base containers HUnit mtl parsec ];
+       libraryHaskellDepends = [
+         base containers mtl parsec template-haskell
+       ];
+       testHaskellDepends = [ base containers HUnit mtl parsec ];
        homepage = "http://khumba.net/projects/goatee";
        description = "A monadic take on a 2,500-year-old board game - library";
        license = stdenv.lib.licenses.agpl3;
@@ -55858,10 +57235,11 @@ self: {
        sha256 = "0wdspqs5pfa4axys87c8bci2s3y475fddjrdwh1kvc9vdsanb7xv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers directory filepath goatee gtk mtl parsec
        ];
-       testDepends = [ base HUnit ];
+       executableHaskellDepends = [ base gtk ];
+       testHaskellDepends = [ base HUnit ];
        jailbreak = true;
        homepage = "http://khumba.net/projects/goatee";
        description = "A monadic take on a 2,500-year-old board game - GTK+ UI";
@@ -55875,7 +57253,7 @@ self: {
        pname = "gofer-prelude";
        version = "2.30.3";
        sha256 = "1whl3fvwxh26nsb4l6brljsmwl891w5yxlsv69mdfvfb1rl7p64f";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        homepage = "http://code.haskell.org/~dons/code/gofer-prelude";
        description = "The Gofer 2.30 standard prelude";
        license = stdenv.lib.licenses.bsd3;
@@ -55888,7 +57266,7 @@ self: {
        pname = "google-dictionary";
        version = "0.1.0.2";
        sha256 = "12ib4y8cjg0dvvizy8yxgjaqvyawdy7vxmh1ab12b4yg40wwsg6g";
-       buildDepends = [ aeson base bytestring HTTP lens mtl ];
+       libraryHaskellDepends = [ aeson base bytestring HTTP lens mtl ];
        homepage = "https://github.com/mitchellwrosen/google-dictionary-api";
        description = "Simple interface to the google.com/dictionary API";
        license = stdenv.lib.licenses.bsd3;
@@ -55904,11 +57282,11 @@ self: {
        pname = "google-drive";
        version = "0.3.1";
        sha256 = "0fzz9dgb2l5zcfjrzf4bqv0dgjhy12r9i1h66y1mji2z0f9qj37y";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra directory filepath
          http-conduit http-types mtl random resourcet text time timerep
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit conduit-extra directory google-oauth2 hspec
          hspec-expectations-lifted load-env text time
        ];
@@ -55927,7 +57305,7 @@ self: {
        sha256 = "0wkblf0i4lfw6s8adf2clcqj3161863vbsq1cip3rcn9djqbimzl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html cmdargs data-default hamlet pandoc shakespeare-css
          syb text time
        ];
@@ -55945,10 +57323,10 @@ self: {
        pname = "google-mail-filters";
        version = "0.0.1.1";
        sha256 = "0cxslr062h536q4vgs16r2s1lm7x5m9lcy1hzif6mpnmvjzqsn11";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers google-search old-locale text time xml-conduit
        ];
-       testDepends = [ base google-search text time xml-conduit ];
+       testHaskellDepends = [ base google-search text time xml-conduit ];
        homepage = "https://github.com/liyang/google-mail-filters";
        description = "Write GMail filters and output to importable XML";
        license = stdenv.lib.licenses.bsd3;
@@ -55963,8 +57341,10 @@ self: {
        pname = "google-oauth2";
        version = "0.2.0";
        sha256 = "15aqwbr8wb1ghzy0r0k3fvfr187d9s3zz21lp07ci9pyz8ln8z08";
-       buildDepends = [ aeson base bytestring HTTP http-conduit ];
-       testDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring HTTP http-conduit
+       ];
+       testHaskellDepends = [
          base bytestring hspec http-conduit http-types load-env
        ];
        jailbreak = true;
@@ -55978,7 +57358,7 @@ self: {
        pname = "google-search";
        version = "0.1.0.1";
        sha256 = "0nkpvp5zjf3mkhqv6z5xvrmr6b6d5zgmzlh67y7ssslp4620m5m7";
-       buildDepends = [ base free nats old-locale text time ];
+       libraryHaskellDepends = [ base free nats old-locale text time ];
        homepage = "https://github.com/liyang/google-search";
        description = "EDSL for Google and GMail search expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -55994,7 +57374,7 @@ self: {
        pname = "googleplus";
        version = "0.3.1.1";
        sha256 = "046fvrr8cg00wagx4vdx35l2xk8qbs7fbs0v5hj45h4jk9dnk2jg";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers enumerator haskell98
          http-enumerator http-types mtl text time timerep transformers url
        ];
@@ -56015,7 +57395,7 @@ self: {
        sha256 = "0qa4xs07975spf4pwc2y0hichn4x8l7kn2949v0j19gbd099vjng";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base HDBC HDBC-postgresql MissingH network parsec unix
        ];
        description = "Spidering robot to download files from Gopherspace";
@@ -56034,7 +57414,7 @@ self: {
        sha256 = "1zwz065fdg3k09nh976igr90p1qpb397fyi7jh941c512m70qbxr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal cmdargs containers csv deepseq directory
          filepath haskell-src-exts hint HTTP network process syb tar
          uniplate uu-parsinglib zlib
@@ -56050,7 +57430,7 @@ self: {
        pname = "gpcsets";
        version = "0.9.2.0";
        sha256 = "1fm0k6n6fb5a3wvmb2l6k4zq3sdfxv16cb2y2zmjgxgj5n3gy9s8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generalized Pitch Class Sets for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56061,7 +57441,7 @@ self: {
        pname = "gpolyline";
        version = "0.1.0.1";
        sha256 = "01bsl7s8r33jgvk9lyca02awj43acii8spa6sskz19ivhm2adcr8";
-       buildDepends = [ base split ];
+       libraryHaskellDepends = [ base split ];
        homepage = "https://github.com/fegu/gpolyline";
        description = "Pure module for encoding/decoding Google Polyline";
        license = stdenv.lib.licenses.bsd3;
@@ -56076,10 +57456,10 @@ self: {
        pname = "gps";
        version = "1.2";
        sha256 = "1krq6sv9qblwqlx7j6gb5qfv5zarxlyvaj6svhd4n8f7pr5w510r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base pretty prettyclass statistics text time vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base gpx-conduit QuickCheck statistics test-framework
          test-framework-quickcheck2 time vector
        ];
@@ -56099,7 +57479,7 @@ self: {
        sha256 = "1n6a1c6w3wmyaqan3ymlrk36h98yvy40wgwfdah4ayyxlsmvvxg8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cairo Chart cmdargs colour data-accessor directory
          filepath gd gps GPX hsmagick html http-enumerator process random
          tar time xsd
@@ -56119,7 +57499,7 @@ self: {
        pname = "gpx-conduit";
        version = "0.1.1";
        sha256 = "0ffb0npx0yb69qxdcdznxpw36zjp2za7vdpzy2r5l245y0xr7mj4";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base conduit filepath monad-control old-locale text time
          void xml-conduit xml-types
        ];
@@ -56137,8 +57517,8 @@ self: {
        pname = "graceful";
        version = "0.1.1.5";
        sha256 = "1kl4y01ny5w1y77r2jf830d7vd99by7frk106m2wc9nbl066mbhr";
-       buildDepends = [ base directory network stm unix ];
-       testDepends = [
+       libraryHaskellDepends = [ base directory network stm unix ];
+       testHaskellDepends = [
          base directory filepath hspec network process stm unix
        ];
        description = "Library to write graceful shutdown / upgrade service";
@@ -56154,7 +57534,7 @@ self: {
        pname = "grammar-combinators";
        version = "0.2.7";
        sha256 = "1z7i1270g919g1756wgfap2mfhvln13bhgya2pw4b9lbr5fphkdd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers enumerable fgl graphviz MaybeT mtl multirec parsec
          template-haskell text uu-parsinglib
        ];
@@ -56171,7 +57551,7 @@ self: {
        pname = "grapefruit-examples";
        version = "0.1.0.5";
        sha256 = "0ad64jnp71gh7rj3rlfw7z67l5xnmc052g5q3slw3s6ga7spajlr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base colour containers fraction grapefruit-frp grapefruit-records
          grapefruit-ui
        ];
@@ -56189,7 +57569,7 @@ self: {
        pname = "grapefruit-frp";
        version = "0.1.0.5";
        sha256 = "155hmjflmzm463b00r1jjwbpjq8ilwss5xqwi6nz6lm3xbc2ddhm";
-       buildDepends = [
+       libraryHaskellDepends = [
          arrows base containers fingertree semigroups TypeCompose
        ];
        jailbreak = true;
@@ -56205,7 +57585,7 @@ self: {
        pname = "grapefruit-records";
        version = "0.1.0.5";
        sha256 = "02hyrbsz20fl9mnynval55xar175vgy77s23zaq66r3f8c6gf6h1";
-       buildDepends = [ arrows base grapefruit-frp ];
+       libraryHaskellDepends = [ arrows base grapefruit-frp ];
        homepage = "http://grapefruit-project.org/";
        description = "A record system for Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -56220,7 +57600,7 @@ self: {
        pname = "grapefruit-ui";
        version = "0.1.0.5";
        sha256 = "11xxvg2847vyzpw8i11a6mnflyr639hdwj51r9pfyaq95034q9jq";
-       buildDepends = [
+       libraryHaskellDepends = [
          arrows base colour containers fraction grapefruit-frp
          grapefruit-records
        ];
@@ -56238,7 +57618,7 @@ self: {
        pname = "grapefruit-ui-gtk";
        version = "0.1.0.5";
        sha256 = "106svyjnv72f0ikcfxgq8zagqxcn52yc1f31kfgz9258mmdki49z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base colour containers fraction glib grapefruit-frp
          grapefruit-records grapefruit-ui gtk
        ];
@@ -56256,11 +57636,11 @@ self: {
        pname = "graph-core";
        version = "0.2.2.0";
        sha256 = "0czqcdg7w7al7gl339b9l15kn5n79zmdjbic3gn9mblnjb1666r9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq hashable mtl QuickCheck safe
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers deepseq hashable HTF mtl QuickCheck safe
          unordered-containers vector
        ];
@@ -56277,8 +57657,10 @@ self: {
        pname = "graph-generators";
        version = "0.1.2.0";
        sha256 = "0iw22rmlhryc0z6k92lzdyjkc1qs98lj2509rk7qc7z0ghbhir9s";
-       buildDepends = [ base containers fgl multiset mwc-random ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers fgl multiset mwc-random
+       ];
+       testHaskellDepends = [
          base Cabal containers fgl hspec hspec-expectations multiset
          mwc-random QuickCheck
        ];
@@ -56294,7 +57676,7 @@ self: {
        pname = "graph-matchings";
        version = "0.1.0.0";
        sha256 = "0dzkv13w06hkxg2vkbblpskvsq02c2ay06rw2j4vyjpw13hms5bv";
-       buildDepends = [ base containers fgl ];
+       libraryHaskellDepends = [ base containers fgl ];
        description = "An implementation of algorithms for matchings in graphs";
        license = stdenv.lib.licenses.lgpl21;
      }) {};
@@ -56305,7 +57687,9 @@ self: {
        pname = "graph-rewriting";
        version = "0.7.6";
        sha256 = "014zsw98ksylr4g1ax3xxlsh9jiybaz7xjapl2h88a8ma91da3jz";
-       buildDepends = [ base base-unicode-symbols containers mtl ];
+       libraryHaskellDepends = [
+         base base-unicode-symbols containers mtl
+       ];
        jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
@@ -56323,7 +57707,7 @@ self: {
        sha256 = "0rwycs3vnzy9awm081h836136s2wjyk9qyhsx9j6z7y3lgsb2cr0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout OpenGL parsec
        ];
@@ -56342,7 +57726,7 @@ self: {
        pname = "graph-rewriting-gl";
        version = "0.7.5";
        sha256 = "0cynzhr226944w3sn13bdnl60z9fy87va5fjayd4g0as2168ikhy";
-       buildDepends = [
+       libraryHaskellDepends = [
          AC-Vector base base-unicode-symbols containers GLUT graph-rewriting
          graph-rewriting-layout OpenGL
        ];
@@ -56364,7 +57748,7 @@ self: {
        sha256 = "1qwy2mn22a5ppz3lrqz6czxrr3j26zxpp6lm3sf121k3a78c7vvp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout graph-rewriting-strategies IndentParser
          OpenGL parsec
@@ -56384,7 +57768,7 @@ self: {
        pname = "graph-rewriting-layout";
        version = "0.5.3";
        sha256 = "09fscyaknd3nhqn7d3wa4j8n2yagmmfk661m41cqx5hlay60x5f5";
-       buildDepends = [
+       libraryHaskellDepends = [
          AC-Vector base base-unicode-symbols graph-rewriting
        ];
        jailbreak = true;
@@ -56404,7 +57788,7 @@ self: {
        sha256 = "0jdfwcz427lx3r0alba1rphc6hj43mqygkdqmwn37yll4r1c62a4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout OpenGL parsec
        ];
@@ -56423,7 +57807,7 @@ self: {
        pname = "graph-rewriting-strategies";
        version = "0.2.3";
        sha256 = "0mimp7xbmnp9c2j8hr09qivc6kgfi4g63p071s560laddins39jr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols containers graph-rewriting
        ];
        jailbreak = true;
@@ -56444,7 +57828,7 @@ self: {
        sha256 = "1v8imc3ym0jjyhpw10xh36l060nvd0klp9llnmdnv8qkmy7pn8yg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-unicode-symbols containers directory filepath GLUT
          graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL
          uu-parsinglib
@@ -56467,7 +57851,7 @@ self: {
        sha256 = "169s5iy15q9ll12fjxizrc0l2q34rvqmxfpbcanc602cj3inav2w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout IndentParser OpenGL parsec
        ];
@@ -56484,7 +57868,7 @@ self: {
        pname = "graph-serialize";
        version = "0.2";
        sha256 = "1a9qq5gpyxg6j6ja3kjldnf11wywjvvxpwvgiahlsrmwfw2c8d74";
-       buildDepends = [ array base bytestring containers ];
+       libraryHaskellDepends = [ array base bytestring containers ];
        homepage = "http://github.com/nominolo/graph-serialize";
        description = "Serialization of data structures with references";
        license = stdenv.lib.licenses.bsd3;
@@ -56498,7 +57882,7 @@ self: {
        pname = "graph-utils";
        version = "0.3.7";
        sha256 = "06wl6i8z0gfndr96g5ps11h877rbwvi1d9cbbr3d2whvbcsyclsf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers fgl mtl parsec syb template-haskell
        ];
        jailbreak = true;
@@ -56516,7 +57900,7 @@ self: {
        pname = "graph-visit";
        version = "0.1.0.2";
        sha256 = "0afj0wqpk549n0xs4vqcblrxs1d6knmxcldfnmz5vy2da5zlfn0q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-lens data-lens-template mtl
        ];
        homepage = "https://github.com/atzedijkstra/graph-visit";
@@ -56532,8 +57916,10 @@ self: {
        pname = "graph-wrapper";
        version = "0.2.5.1";
        sha256 = "04z1qbsf1c31r0mhn8bgr8hisffxacq3j61y4fym28idr8zqaqc3";
-       buildDepends = [ array base containers ];
-       testDepends = [ array base containers deepseq hspec QuickCheck ];
+       libraryHaskellDepends = [ array base containers ];
+       testHaskellDepends = [
+         array base containers deepseq hspec QuickCheck
+       ];
        homepage = "https://github.com/soenkehahn/graph-wrapper";
        description = "A wrapper around the standard Data.Graph with a less awkward interface";
        license = stdenv.lib.licenses.bsd3;
@@ -56547,8 +57933,8 @@ self: {
        pname = "graphbuilder";
        version = "0.1.0.0";
        sha256 = "0zhjzb53qaj6dy6ncqjaxdfrs2hwfy4g9czybpsgnbniqm07i22b";
-       buildDepends = [ base containers mtl ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers mtl ];
+       testHaskellDepends = [
          base containers mtl QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -56567,7 +57953,7 @@ self: {
        pname = "graphene";
        version = "0.1.0.4";
        sha256 = "09q57hqf3s29y3b6wn79wa9ksm5r2p75ww3kpwqmigvngy4sz006";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors containers hashable lens-family lens-family-core
          mtl transformers
        ];
@@ -56587,12 +57973,13 @@ self: {
        sha256 = "0j0ilr54pdz61c78khy8bm37g89cvk1n56h5d6c55jabsv5gx3sf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bitmap bitmap-opengl FTGL OpenGL stb-image ];
+       libraryHaskellDepends = [
+         base bitmap bitmap-opengl FTGL OpenGL stb-image
+       ];
        jailbreak = true;
        homepage = "http://github.com/luqui/graphics-drawingcombinators";
        description = "A functional interface to 2D drawing in OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphics-formats-collada" = callPackage
@@ -56603,7 +57990,7 @@ self: {
        pname = "graphics-formats-collada";
        version = "0.3.1";
        sha256 = "1kfx1c2x8v2i7ckhjiqv7ghhn44w7fscghxkn1iqkp3mj1p3xvbv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bitmap-opengl containers hxt OpenGL stb-image transformers
        ];
        jailbreak = true;
@@ -56619,7 +58006,7 @@ self: {
        pname = "graphicsFormats";
        version = "0.1";
        sha256 = "0bcqj0n8qqaqfrn21qgkf8si5qgxl3qlsc8djy0rqhnfi2grb8nh";
-       buildDepends = [ base haskell98 OpenGL QuickCheck ];
+       libraryHaskellDepends = [ base haskell98 OpenGL QuickCheck ];
        description = "Classes for renderable objects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56635,9 +58022,10 @@ self: {
        sha256 = "0hcz8w6yf7dls4sv0i5kihs22ysv0dl63q5bs5y4hgv6d747psp8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL containers CV directory ghc-prim wx wxcore
        ];
+       executableHaskellDepends = [ base CV wx wxcore ];
        homepage = "https://yousource.it.jyu.fi/cvlab/pages/GraphicsTools";
        description = "Tools for creating graphical UIs, based on wxHaskell";
        license = stdenv.lib.licenses.bsd3;
@@ -56654,7 +58042,7 @@ self: {
        sha256 = "02p1x44ywv2mb4l2dsz9z3ybnvv4nns3882lqm3nc8sw2hkib8z3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory dotgen filepath haskell-lexer
        ];
        homepage = "http://github.com/yav/graphmod/wiki";
@@ -56668,7 +58056,9 @@ self: {
        pname = "graphs";
        version = "0.6.0.1";
        sha256 = "061n1k5v6izpa77wyxch3ym4hzs1k64a902x2250gi724mj3mjsk";
-       buildDepends = [ array base containers transformers void ];
+       libraryHaskellDepends = [
+         array base containers transformers void
+       ];
        homepage = "http://github.com/ekmett/graphs";
        description = "A simple monadic graph library";
        license = stdenv.lib.licenses.bsd3;
@@ -56684,7 +58074,7 @@ self: {
        sha256 = "13nblgd4b3pwpw8idvbd54fq2lf233vj8gvsl0qr381lsvj69fbi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers dotgen haskell-src-exts haskell98 uniplate
        ];
        homepage = "http://github.com/explicitcall/graphtype";
@@ -56704,11 +58094,16 @@ self: {
        sha256 = "1zfndf5mpwx3nrgybxg5hy8n30zwsfx6jgp9468b0pp8c5h65j13";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring colour containers directory dlist fgl filepath
          polyparse process temporary text transformers wl-pprint-text
        ];
-       testDepends = [ base containers fgl filepath QuickCheck text ];
+       executableHaskellDepends = [
+         base bytestring directory filepath text
+       ];
+       testHaskellDepends = [
+         base containers fgl filepath QuickCheck text
+       ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/graphviz/";
        description = "Bindings to Graphviz for graph visualisation";
@@ -56723,8 +58118,10 @@ self: {
        pname = "gravatar";
        version = "0.8.0";
        sha256 = "1mzl08qzwzzhz6bvkz4qnrdnzsgvsmi2lnhzf743yzx4msn00q3g";
-       buildDepends = [ base bytestring data-default HTTP pureMD5 text ];
-       testDepends = [ base hspec text ];
+       libraryHaskellDepends = [
+         base bytestring data-default HTTP pureMD5 text
+       ];
+       testHaskellDepends = [ base hspec text ];
        description = "Generate Gravatar image URLs";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -56735,8 +58132,8 @@ self: {
        pname = "gray-code";
        version = "0.3.1";
        sha256 = "0b0pm24mxjsxg95q6yisr9pa0jfklsfw66cicryib42czvv083av";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://bitbucket.org/astanin/hs-gray-code";
        description = "Gray code encoder/decoder";
        license = stdenv.lib.licenses.bsd3;
@@ -56750,8 +58147,8 @@ self: {
        pname = "gray-extended";
        version = "1.5.1";
        sha256 = "1lami8ncp9d4k25vzb23gz9067ahp8vws378qb57hnkisfnn932q";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -56768,7 +58165,8 @@ self: {
        sha256 = "1vl9p6mqss5r4jfqnjir7m1q7fhh9f204c99qd5y5d0j7yc26r5y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers pretty ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ array base containers pretty ];
        homepage = "https://github.com/sof/greencard";
        description = "GreenCard, a foreign function pre-processor for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -56781,7 +58179,7 @@ self: {
        pname = "greencard-lib";
        version = "3.0.1";
        sha256 = "1a8h36kclb5db7kfy1pb4h2pwy6a6wwnjpm21xzvc9fjx9vj44kd";
-       buildDepends = [ array base containers greencard pretty ];
+       libraryHaskellDepends = [ array base containers greencard pretty ];
        homepage = "http://www.haskell.org/greencard/";
        description = "A foreign function interface pre-processor library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -56796,7 +58194,7 @@ self: {
        pname = "greg-client";
        version = "1.0.2";
        sha256 = "1p645qgn5i194mna20ariypxp0dci7lzyxhszmnyylpd0icyg4in";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring clock hostname network stm system-uuid time
        ];
        homepage = "http://code.google.com/p/greg/";
@@ -56813,8 +58211,8 @@ self: {
        pname = "grid";
        version = "7.8.4";
        sha256 = "1jci2191l6k1qlch54id7z05zn9lp5lzyh7g6hm9s522z97lgb2k";
-       buildDepends = [ base cereal containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base cereal containers ];
+       testHaskellDepends = [
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -56833,12 +58231,13 @@ self: {
        sha256 = "0q5p73n6h5ngg992f1msdqzxds2baafjypdx53zf2rdhbqp4fdi9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array astar base containers grid htiled mtl random safe SDL SDL-gfx
          SDL-image SDL-mixer tuple vector
        ];
        description = "Grid-based multimedia engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grm" = callPackage
@@ -56851,10 +58250,13 @@ self: {
        sha256 = "1za45931c6avyqxb6dwiafl739fmwdk68kxpk13zkv0jwxxpp9px";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory filepath process syb wl-pprint
+       ];
+       executableHaskellDepends = [
          base Cabal cmdargs directory filepath parsec process syb wl-pprint
        ];
-       buildTools = [ happy ];
+       executableToolDepends = [ happy ];
        description = "grm grammar converter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56866,7 +58268,7 @@ self: {
        pname = "groom";
        version = "0.1.2";
        sha256 = "045hzpnf17rp1ib6q3gcznl9b7ivz5zmv0gh7qfg726kr8i030hf";
-       buildDepends = [ base haskell-src-exts ];
+       libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Pretty printing for well-behaved Show instances";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -56880,10 +58282,10 @@ self: {
      mkDerivation {
        pname = "groundhog";
        version = "0.7.0.3";
-       revision = "1";
        sha256 = "0n5c501wfyqcl1iy4017yyxp95kz7mb4lgc0mjjk9si36ixkww9r";
+       revision = "1";
        editedCabalFile = "dcf9bbeaf0fd7e7ac0809902a54779097e8935a07b1e7e43c404bc683c17e7f0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          containers monad-control monad-logger mtl scientific text time
          transformers transformers-base
@@ -56904,10 +58306,13 @@ self: {
        sha256 = "14wxmn18z4022vkakyrdl7mz7zbdaa3dnwbb52ymg3f5r13lr7lh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson-pretty base bytestring cmdargs containers groundhog
-         groundhog-sqlite groundhog-th mtl regex-compat syb template-haskell
-         text time transformers
+       libraryHaskellDepends = [
+         aeson-pretty base bytestring containers groundhog groundhog-th
+         regex-compat syb template-haskell text time transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs containers groundhog groundhog-sqlite
+         groundhog-th mtl
        ];
        jailbreak = true;
        homepage = "http://github.com/lykahb/groundhog";
@@ -56924,7 +58329,7 @@ self: {
        pname = "groundhog-mysql";
        version = "0.7.0.1";
        sha256 = "01pnninva0va0pl9k7mjk2l7fm42978j9x82sj8z7cscshvl327f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers groundhog monad-control monad-logger
          mysql mysql-simple resource-pool text time transformers
        ];
@@ -56942,7 +58347,7 @@ self: {
        pname = "groundhog-postgresql";
        version = "0.7.0.2";
        sha256 = "18wdj51v6qqyqx10lvknr3irhs5qddvh301bx7l9cdcpkk1la81i";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers groundhog
          monad-control monad-logger postgresql-libpq postgresql-simple
          resource-pool text time transformers
@@ -56960,7 +58365,7 @@ self: {
        pname = "groundhog-sqlite";
        version = "0.7.0.1";
        sha256 = "0lsm9yfapdpy4nf5bxrbjkvw9nwc82qfmyw1h9l3mc4b8nfp12dy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers direct-sqlite groundhog monad-control
          monad-logger resource-pool text transformers unordered-containers
        ];
@@ -56976,7 +58381,7 @@ self: {
        pname = "groundhog-th";
        version = "0.7.0.1";
        sha256 = "15g07rzw2jygzs5p9jflq6l2rjrmf03lj8pprzc4vgwvk04x233h";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers groundhog template-haskell text
          time unordered-containers yaml
        ];
@@ -56992,8 +58397,8 @@ self: {
        pname = "group-with";
        version = "0.2.0.2";
        sha256 = "0c7p3bj3b68h2zp0lzldfjwq7x2a38v0gnxyflisawdg61jnx8h6";
-       buildDepends = [ base containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
          base Cabal containers hspec hspec-expectations QuickCheck
        ];
        jailbreak = true;
@@ -57008,7 +58413,7 @@ self: {
        pname = "groupoid";
        version = "0.1.0";
        sha256 = "0gpjlq9f2il4vp7ihh1sf5g2jr1rbi5big5c6dhjk961n8b1dq0z";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "A Groupoid class";
        license = stdenv.lib.licenses.bsd3;
@@ -57020,7 +58425,7 @@ self: {
        pname = "groupoids";
        version = "4.0";
        sha256 = "08la44c19pz2clws5mb939zc1d17cb6qy9qlh2n1634pl0zrawb6";
-       buildDepends = [ base semigroupoids ];
+       libraryHaskellDepends = [ base semigroupoids ];
        homepage = "http://github.com/ekmett/groupoids/";
        description = "This package has been absorbed into semigroupoids 4.0";
        license = stdenv.lib.licenses.bsd3;
@@ -57032,7 +58437,7 @@ self: {
        pname = "groups";
        version = "0.4.0.0";
        sha256 = "1kp8h3617cimya8nnadljyy4vk66dzl5nzfm900k2gh3ci8kja6k";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell 98 groups";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -57048,7 +58453,7 @@ self: {
        pname = "growler";
        version = "0.6.0";
        sha256 = "0skykz2p0kcs8g1vq7832h7fnw193hpq4pplkcaxazg8z97k8q75";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive either
          http-types lens monad-control mtl pipes pipes-aeson pipes-wai
          regex-compat text transformers transformers-base
@@ -57070,7 +58475,8 @@ self: {
        sha256 = "0is9bpaalyr78g0hfp6bbmny4w6w8a3aj9a041f82499hhy0vv0h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base ruff ];
+       executableHaskellDepends = [
          base bytestring containers directory filepath FTGL gtk gtkglext mtl
          old-locale OpenGL OpenGLRaw parallel qd qd-vec ruff time Vec
        ];
@@ -57090,7 +58496,7 @@ self: {
        sha256 = "02ygb88zxikf5ggw9ypyzganngk4dgfcszpkyzy6cwm47mksdzg7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers data-memocombinators filepath gruff qd qd-vec
          random ruff Vec
        ];
@@ -57106,8 +58512,8 @@ self: {
        pname = "gsasl";
        version = "0.3.6";
        sha256 = "0cgrw5ypkwp4mzj8m12q783jqng1jp1j7ny15704jmjxbq13cq3q";
-       buildDepends = [ base bytestring transformers ];
-       pkgconfigDepends = [ gsasl ];
+       libraryHaskellDepends = [ base bytestring transformers ];
+       libraryPkgconfigDepends = [ gsasl ];
        homepage = "https://john-millikin.com/software/haskell-gsasl/";
        description = "Bindings for GNU libgsasl";
        license = stdenv.lib.licenses.gpl3;
@@ -57119,10 +58525,9 @@ self: {
        pname = "gsc-weighting";
        version = "0.2.2";
        sha256 = "0y80j5qk601c965assl8d91k9bpvzijn2z0w64n2ksij9lm6b8p5";
-       buildDepends = [ base hierarchical-clustering ];
+       libraryHaskellDepends = [ base hierarchical-clustering ];
        description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gsl-random" = callPackage
@@ -57131,7 +58536,7 @@ self: {
        pname = "gsl-random";
        version = "0.5.0";
        sha256 = "0bhwi2ianxazyxyp2siczk8rfdnj4dx3rfz5d82bag2xcbzcrbfj";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        homepage = "http://github.com/patperry/hs-gsl-random";
        description = "Bindings the the GSL random number generation facilities";
        license = stdenv.lib.licenses.bsd3;
@@ -57144,7 +58549,7 @@ self: {
        pname = "gsl-random-fu";
        version = "0.0.0.1";
        sha256 = "1qf5m3zksn16mlgavrwbq6yd1mbyafy27qf1ws4nmkxl8ci0k48i";
-       buildDepends = [ base gsl-random random-fu ];
+       libraryHaskellDepends = [ base gsl-random random-fu ];
        homepage = "http://code.haskell.org/~mokus/gsl-random-fu";
        description = "Instances for using gsl-random with random-fu";
        license = stdenv.lib.licenses.publicDomain;
@@ -57161,7 +58566,7 @@ self: {
        sha256 = "15ddm69fmk0nkkrs5g80amdvld2mq59ah58nbnk83mwkffpi484f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers mtl parsec permute sindre text X11
        ];
        jailbreak = true;
@@ -57179,9 +58584,11 @@ self: {
        pname = "gstreamer";
        version = "0.12.5.0";
        sha256 = "0grg20wsvdyfpm2y3ykw7d3j7s2hlbs8psjwfy0yfz3839yvccy6";
-       buildDepends = [ array base bytestring directory glib mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gst_plugins_base gstreamer ];
+       libraryHaskellDepends = [
+         array base bytestring directory glib mtl
+       ];
+       libraryPkgconfigDepends = [ gst_plugins_base gstreamer ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
@@ -57199,7 +58606,7 @@ self: {
        sha256 = "1mkccxgnvgjxkbsdl6bcn61yv0zi20i8h9z11hqcfd3ibfnsw7bh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers extensible-exceptions haskeline HTTP json mtl unix
          url utf8-string
        ];
@@ -57215,7 +58622,9 @@ self: {
        pname = "gtfs";
        version = "0.1";
        sha256 = "0m0i13xpj9wz6ykngwfqi2vnrliwf0y1d2cxg9254dm865l5gvsi";
-       buildDepends = [ base csv directory filepath rowrecord split ];
+       libraryHaskellDepends = [
+         base csv directory filepath rowrecord split
+       ];
        description = "The General Transit Feed Specification format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57229,11 +58638,11 @@ self: {
        pname = "gtk";
        version = "0.13.9";
        sha256 = "1mdz3s03y69713cr3grn8gawimykk8rs1f9vgch8a8q04ivhkq0j";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtk ];
+       libraryPkgconfigDepends = [ gtk ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -57247,7 +58656,7 @@ self: {
        pname = "gtk-helpers";
        version = "0.0.7";
        sha256 = "0cx43z79r77ksicgz4ajg8b4hhllyfadcb46zdh6lg088zsgc6v7";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base gio glib gtk mtl process template-haskell
        ];
        homepage = "http://keera.es/blog/community";
@@ -57261,7 +58670,7 @@ self: {
        pname = "gtk-jsinput";
        version = "0.0.0";
        sha256 = "0fjlk6z8j77l35k9cdzgbyf1w5wd0v0k1sry78vf7f6j4mvv8wb0";
-       buildDepends = [ base gtk json transformers ];
+       libraryHaskellDepends = [ base gtk json transformers ];
        homepage = "http://github.com/timthelion/gtk-jsinput";
        description = "A simple custom form widget for gtk which allows inputing of JSON values";
        license = stdenv.lib.licenses.gpl3;
@@ -57275,8 +58684,10 @@ self: {
        pname = "gtk-largeTreeStore";
        version = "0.0.1.0";
        sha256 = "0nzddvm17gqkdjpkls4rd5lxshx8fwvn35b9r3njqqpm2yi5qci0";
-       buildDepends = [ base containers glib gtk3 mtl nested-sets ];
-       testDepends = [ base containers gtk3 hspec ];
+       libraryHaskellDepends = [
+         base containers glib gtk3 mtl nested-sets
+       ];
+       testHaskellDepends = [ base containers gtk3 hspec ];
        description = "Large TreeStore support for gtk2hs";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -57289,9 +58700,9 @@ self: {
        pname = "gtk-mac-integration";
        version = "0.3.1.1";
        sha256 = "02s5ksr8fkqlbwlq468v93w0is1xa73wswgxahyyvhh51wnqp3ax";
-       buildDepends = [ array base containers glib gtk mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtk-mac-integration-gtk2 ];
+       libraryHaskellDepends = [ array base containers glib gtk mtl ];
+       libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
@@ -57305,7 +58716,9 @@ self: {
        pname = "gtk-serialized-event";
        version = "0.12.0";
        sha256 = "0gh8kwd9758ws941xbxhrm3144pmnqln0md5r6vjbq7s1x54bsrf";
-       buildDepends = [ array base containers glib gtk haskell98 mtl ];
+       libraryHaskellDepends = [
+         array base containers glib gtk haskell98 mtl
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "GTK+ Serialized event";
@@ -57319,7 +58732,7 @@ self: {
        pname = "gtk-simple-list-view";
        version = "0.0.0";
        sha256 = "1qqfhaap2996015h3jkgg9j3hyxrh88wn6kba29ys0q1h35f8yws";
-       buildDepends = [ base gtk ];
+       libraryHaskellDepends = [ base gtk ];
        homepage = "http://github.com/timthelion/gtk-simple-list-view";
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views";
        license = stdenv.lib.licenses.gpl3;
@@ -57331,7 +58744,7 @@ self: {
        pname = "gtk-toggle-button-list";
        version = "0.0.0";
        sha256 = "14hb7nxf4l0q7hab8dzll8dh5ccb4hhc8arywijdgdrz4i2s2706";
-       buildDepends = [ base gtk ];
+       libraryHaskellDepends = [ base gtk ];
        homepage = "http://github.com/timthelion/gtk-toggle-button-list";
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists";
        license = stdenv.lib.licenses.gpl3;
@@ -57343,7 +58756,7 @@ self: {
        pname = "gtk-toy";
        version = "0.2.0";
        sha256 = "0zf3k0c5h5wcgkqr8np5kvgz4c9nha86k5whsn4f1wk0ikj98dfq";
-       buildDepends = [ base containers gtk ];
+       libraryHaskellDepends = [ base containers gtk ];
        jailbreak = true;
        description = "Convenient Gtk canvas with mouse and keyboard input";
        license = stdenv.lib.licenses.bsd3;
@@ -57356,8 +58769,8 @@ self: {
        pname = "gtk-traymanager";
        version = "0.1.5";
        sha256 = "0hzl9pa5vx04vslb2visx35wwjagzzi1j5gyk5acy8pym8ly50hm";
-       buildDepends = [ base glib gtk ];
-       pkgconfigDepends = [ x11 ];
+       libraryHaskellDepends = [ base glib gtk ];
+       libraryPkgconfigDepends = [ x11 ];
        homepage = "http://github.com/travitch/gtk-traymanager";
        description = "A wrapper around the eggtraymanager library for Linux system trays";
        license = stdenv.lib.licenses.lgpl21;
@@ -57373,11 +58786,11 @@ self: {
        sha256 = "041mprflgqc74qb21czzy3m2nzj5mc3ji4i60f04dh2f2bac491a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory filepath hashtables pretty process
          random
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Tools to build the Gtk2Hs suite of User Interface libraries";
        license = stdenv.lib.licenses.gpl2;
@@ -57391,7 +58804,7 @@ self: {
        pname = "gtk2hs-cast-glade";
        version = "0.10.1.1";
        sha256 = "0azyf3h53r5dqvz66bbvqk9qp418v0mq0yzd1ia6pc6d7ypknkx6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base glade gtk gtk2hs-cast-glib hint template-haskell
        ];
        description = "A type class for cast functions of Gtk2hs: glade package";
@@ -57405,7 +58818,7 @@ self: {
        pname = "gtk2hs-cast-glib";
        version = "0.10.1.1";
        sha256 = "1bsz1zyz2hxf07q6xr232aciwxl3819jklj16hqqbfjwm4mzn2mp";
-       buildDepends = [ base glib ];
+       libraryHaskellDepends = [ base glib ];
        description = "A type class for cast functions of Gtk2hs: glib package";
        license = "unknown";
      }) {};
@@ -57418,7 +58831,7 @@ self: {
        pname = "gtk2hs-cast-gnomevfs";
        version = "0.10.1.2";
        sha256 = "0fkrrsvagsn51rn0b16y8ac3fg509wrxqdfwsij9nbprcd8iz75g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gnomevfs gtk2hs-cast-glib gtk2hs-cast-th hint template-haskell
        ];
        description = "A type class for cast functions of Gtk2hs: gnomevfs package";
@@ -57434,7 +58847,7 @@ self: {
        pname = "gtk2hs-cast-gtk";
        version = "0.10.1.2";
        sha256 = "15d6c0mdd9nzpb310n19kyw0jqv019w17ncxxhg3wk90ckb43l3j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gtk gtk2hs-cast-glib gtk2hs-cast-th hint template-haskell
        ];
        description = "A type class for cast functions of Gtk2hs: gtk package";
@@ -57450,7 +58863,7 @@ self: {
        pname = "gtk2hs-cast-gtkglext";
        version = "0.10.1.2";
        sha256 = "05m4h8wh820mwiarrysa4fkxj14l90ky89kv24irpa3vw27xnsm9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gtk2hs-cast-glib gtk2hs-cast-th gtkglext hint template-haskell
        ];
        description = "A type class for cast functions of Gtk2hs: gtkglext package";
@@ -57466,7 +58879,7 @@ self: {
        pname = "gtk2hs-cast-gtksourceview2";
        version = "0.10.1.2";
        sha256 = "1fyca2kwjc4hk9jqshn9hzq4m7415kapdln1nv0rgxsd1iabjk81";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gtk2hs-cast-glib gtk2hs-cast-th gtksourceview2 hint
          template-haskell
        ];
@@ -57480,7 +58893,7 @@ self: {
        pname = "gtk2hs-cast-th";
        version = "0.10.1.0";
        sha256 = "19a7qb0dlfqw22fz7m94xyzbssvia106wlvy3brag5nhfza833px";
-       buildDepends = [ base hint template-haskell ];
+       libraryHaskellDepends = [ base hint template-haskell ];
        description = "A type class for cast functions of Gtk2hs: TH package";
        license = "unknown";
      }) {};
@@ -57493,7 +58906,7 @@ self: {
        sha256 = "0km86yd8wkn85x8xr326a8pzrfmbrf0cpf6zz3sggk3kn4jrmbj4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base glib gtk3 transformers ];
+       executableHaskellDepends = [ base glib gtk3 transformers ];
        jailbreak = true;
        homepage = "http://www.haskell.org/hello/";
        description = "Gtk2Hs Hello World, an example package";
@@ -57506,7 +58919,7 @@ self: {
        pname = "gtk2hs-rpn";
        version = "0.2.1";
        sha256 = "01wikd60b48qcz6vk31kwfkpkf2za5laxbhdyns45s90lvr98rvi";
-       buildDepends = [ base cairo glib gtk mtl ];
+       libraryHaskellDepends = [ base cairo glib gtk mtl ];
        jailbreak = true;
        description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation";
        license = "LGPL";
@@ -57524,12 +58937,14 @@ self: {
        sha256 = "1j6nwjvjmzb144vbizraax0yf5bbkicg5hx2mm4z9ayacf58sm7c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base bytestring cairo containers gio glib mtl pango text time
-         transformers
+       libraryHaskellDepends = [
+         array base bytestring cairo containers gio glib mtl pango text
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
+       executableHaskellDepends = [
+         array base cairo text time transformers
        ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtk3 ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -57543,9 +58958,9 @@ self: {
        pname = "gtk3-mac-integration";
        version = "0.3.2.0";
        sha256 = "0m7659ca92w9yhd1fnraa255sx74qjagwsavd3navl41h687bzqj";
-       buildDepends = [ array base containers glib gtk3 mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtk-mac-integration-gtk3 ];
+       libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
+       libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
@@ -57554,22 +58969,21 @@ self: {
 
   "gtkglext" = callPackage
     ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, gtkglext
-     , pango, pangox_compat
+     , pango
      }:
      mkDerivation {
        pname = "gtkglext";
        version = "0.12.5.0";
        sha256 = "1xhalcb85cpswdpqxx64fxpmyqq7iakgaczjrbr25fp0h1glshhk";
-       buildDepends = [ base glib gtk pango ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtkglext pangox_compat ];
+       libraryHaskellDepends = [ base glib gtk pango ];
+       libraryPkgconfigDepends = [ gtkglext ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gtkglext;
-          inherit (pkgs) pangox_compat;};
+     }) { inherit (pkgs.gnome) gtkglext;};
 
   "gtkimageview" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk
@@ -57579,9 +58993,11 @@ self: {
        pname = "gtkimageview";
        version = "0.12.0";
        sha256 = "0sdfb7gmgqh4dkc0a39abx84x7j7zs5z1l62nfzz22wsx1h641j3";
-       buildDepends = [ array base containers glib gtk haskell98 mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtkimageview ];
+       libraryHaskellDepends = [
+         array base containers glib gtk haskell98 mtl
+       ];
+       libraryPkgconfigDepends = [ gtkimageview ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the GtkImageView library";
@@ -57599,7 +59015,7 @@ self: {
        sha256 = "0z7mwgmjpbmj2949bfrragyjr6s38vv9sz8zpy63ss9h7b5xn4xw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base gconf glade gtk MissingH process regex-posix unix
        ];
        homepage = "http://hg.complete.org/gtkrsync";
@@ -57616,9 +59032,11 @@ self: {
        pname = "gtksourceview2";
        version = "0.13.1.3";
        sha256 = "1ji8sfkjggjxl4yrazm6n8gp74hlh3h28kjc9nfxka062bjmxfhf";
-       buildDepends = [ array base containers glib gtk mtl text ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtksourceview ];
+       libraryHaskellDepends = [
+         array base containers glib gtk mtl text
+       ];
+       libraryPkgconfigDepends = [ gtksourceview ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
@@ -57632,9 +59050,11 @@ self: {
        pname = "gtksourceview3";
        version = "0.13.2.0";
        sha256 = "0chn0rl5kkfi7y02h1x0gfkpbm4hfcl6pxrbdpfv20jk4m88a0qj";
-       buildDepends = [ array base containers glib gtk3 mtl text ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtksourceview ];
+       libraryHaskellDepends = [
+         array base containers glib gtk3 mtl text
+       ];
+       libraryPkgconfigDepends = [ gtksourceview ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
@@ -57646,11 +59066,10 @@ self: {
        pname = "guarded-rewriting";
        version = "0.1";
        sha256 = "04396pd4c4yqpw6ai5ciigva9l3acdz7yn4d5hvyks52khv5fsf9";
-       buildDepends = [ base instant-generics ];
+       libraryHaskellDepends = [ base instant-generics ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/GuardedRewriting";
        description = "Datatype-generic rewriting with preconditions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "guess-combinator" = callPackage
@@ -57659,7 +59078,7 @@ self: {
        pname = "guess-combinator";
        version = "0.1.1";
        sha256 = "1xaj8zl6cbgks3r0asbnkz1ixq1hlglpjxdymj6ikyjq955sxmzj";
-       buildDepends = [ base HList ];
+       libraryHaskellDepends = [ base HList ];
        homepage = "http://code.atnnn.com/project/guess";
        description = "Generate simple combinators given their type";
        license = stdenv.lib.licenses.bsd3;
@@ -57674,7 +59093,7 @@ self: {
        sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cairo containers filepath gtk ];
+       executableHaskellDepends = [ base cairo containers filepath gtk ];
        jailbreak = true;
        homepage = "http://code.mathr.co.uk/gulcii";
        description = "graphical untyped lambda calculus interactive interpreter";
@@ -57687,7 +59106,7 @@ self: {
        pname = "gutenberg-fibonaccis";
        version = "1.1.0";
        sha256 = "0vvzlfnvh9r9jqf7v83d0piqpvl40sg0mswf9f41vncgzg0z79v2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/justinhanekom/gutenberg-fibonaccis";
        description = "The first 1001 Fibonacci numbers, retrieved from the Gutenberg Project";
        license = stdenv.lib.licenses.gpl3;
@@ -57701,7 +59120,7 @@ self: {
        sha256 = "19r2vsi5v43a3wq2vbfh2wfscmbzvcbyd1lqc2xdg4bbla9pf648";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base extra GiveYouAHead ];
+       executableHaskellDepends = [ base extra GiveYouAHead ];
        description = "A binary version of GiveYouAHead";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -57717,7 +59136,11 @@ self: {
        sha256 = "0v2mcf35j4dr32j9n6rx10h7mx9d9f14bh70yphj01laxg240746";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring filepath http-conduit hxt mtl stm template-haskell
+         transformers utf8-string vinyl
+       ];
+       executableHaskellDepends = [
          base bytestring containers directory filepath http-conduit hxt mtl
          stm template-haskell transformers utf8-string vinyl
        ];
@@ -57736,8 +59159,10 @@ self: {
        pname = "h-gpgme";
        version = "0.3.0.0";
        sha256 = "172awh918zldbivnn8jy24r30mxppgjvn2bz52phjxln02kcpm3x";
-       buildDepends = [ base bindings-gpgme bytestring either time unix ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bindings-gpgme bytestring either time unix
+       ];
+       testHaskellDepends = [
          base bindings-gpgme bytestring either HUnit QuickCheck tasty
          tasty-hunit tasty-quickcheck time transformers unix
        ];
@@ -57756,13 +59181,17 @@ self: {
        sha256 = "1s8r476bhvmhpj914n4sjsa1z6dgf26m872rpzhlsyhw1rsxgcfr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base MonadRandom mtl text transformers vty vty-ui
        ];
-       testDepends = [ base HUnit MonadRandom mtl transformers ];
+       executableHaskellDepends = [
+         base MonadRandom mtl text transformers vty vty-ui
+       ];
+       testHaskellDepends = [ base HUnit MonadRandom mtl transformers ];
        homepage = "https://github.com/Javran/h2048";
        description = "a haskell implementation of Game 2048";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hArduino" = callPackage
@@ -57773,7 +59202,9 @@ self: {
        pname = "hArduino";
        version = "0.9";
        sha256 = "03wq0c9aqv3n27zcm74l2df75z3sr7kvyszgs0m2sn2680izl024";
-       buildDepends = [ base bytestring containers mtl serialport time ];
+       libraryHaskellDepends = [
+         base bytestring containers mtl serialport time
+       ];
        homepage = "http://leventerkok.github.com/hArduino";
        description = "Control your Arduino board from Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -57785,7 +59216,7 @@ self: {
        pname = "hBDD";
        version = "0.0.3";
        sha256 = "1jj8hj8wl95fy0n1qixhra4sqlmgddgn080plk7q7iv000qv67gk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "An abstraction layer for BDD libraries";
        license = "LGPL";
      }) {};
@@ -57798,9 +59229,9 @@ self: {
        pname = "hBDD-CMUBDD";
        version = "0.0.3";
        sha256 = "16pvi496qi3q2rrw08p6lndnsz6d6p65i8m10ldjlh143y8k9ga9";
-       buildDepends = [ base containers deepseq hBDD unix ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ bdd mem ];
+       libraryHaskellDepends = [ base containers deepseq hBDD unix ];
+       librarySystemDepends = [ bdd mem ];
+       libraryToolDepends = [ c2hs ];
        description = "An FFI binding to CMU/Long's BDD library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57814,9 +59245,9 @@ self: {
        pname = "hBDD-CUDD";
        version = "0.0.3";
        sha256 = "1r94nj23pj134bd5b2mqk01g8xvbcn4ik2xs9yp01v1jg2clhjha";
-       buildDepends = [ base containers deepseq hBDD unix ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ cudd epd mtr st util ];
+       libraryHaskellDepends = [ base containers deepseq hBDD unix ];
+       librarySystemDepends = [ cudd epd mtr st util ];
+       libraryToolDepends = [ c2hs ];
        description = "An FFI binding to the CUDD library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57831,9 +59262,9 @@ self: {
        pname = "hCsound";
        version = "0.4.2";
        sha256 = "0z4zcf70jplm68k69kigj0kfx78r00y6fx6rjymzpvpbhppmyyd2";
-       buildDepends = [ base monads-tf transformers vector ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ csound64 libsndfile ];
+       libraryHaskellDepends = [ base monads-tf transformers vector ];
+       librarySystemDepends = [ csound64 libsndfile ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        description = "interface to CSound API";
        license = "LGPL";
@@ -57846,7 +59277,7 @@ self: {
        pname = "hDFA";
        version = "0.0.2";
        sha256 = "1ays1qy2zsl3h49ryr2y9dymfv1ak1m1d0jvarmqwg3nb49armhm";
-       buildDepends = [ base containers directory process ];
+       libraryHaskellDepends = [ base containers directory process ];
        description = "A simple library for representing and minimising DFAs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57858,7 +59289,7 @@ self: {
        pname = "hF2";
        version = "0.2";
        sha256 = "1y0731fsay2dp9m4b94w15m054vqsnnafz4k8jjqjvvrmwyfgicz";
-       buildDepends = [ base cereal vector ];
+       libraryHaskellDepends = [ base cereal vector ];
        description = "F(2^e) math for cryptography";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57872,7 +59303,7 @@ self: {
        pname = "hGelf";
        version = "0.1";
        sha256 = "0jkgf0sm8xv204hrzpkplccfq88y5xyrm8y2b5gjfp473872jqxw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring cereal network old-time pureMD5 QuickCheck
          text time zlib
        ];
@@ -57891,7 +59322,11 @@ self: {
        sha256 = "0my2071si1x25q482rz48ihj6b9pg1vf6g722jdx8nbgri1x4wzz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring cmdargs containers data-dword directory
+         filepath hooplext mtl parsec pretty template-haskell transformers
+       ];
+       executableHaskellDepends = [
          array base bytestring cmdargs containers data-dword directory
          filepath hooplext mtl parsec pretty template-haskell transformers
        ];
@@ -57910,7 +59345,7 @@ self: {
        pname = "hMollom";
        version = "0.4.0";
        sha256 = "1grhkvmcdyi7gmmcqfqi3n78p4gbimzxa4mylj1f0j8iy5iycmg5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring Crypto dataenc ghc-prim HTTP mtl
          old-locale old-time pureMD5 random time
        ];
@@ -57936,7 +59371,7 @@ self: {
        pname = "hOpenPGP";
        version = "2.1";
        sha256 = "0jl2rciqgnhjw6q4xgdm2117vrj25l18hzl58fdls7j9bqlvrn5y";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bifunctors binary
          binary-conduit byteable bytestring bzlib conduit conduit-extra
          containers crypto-cipher-types crypto-pubkey crypto-random
@@ -57946,7 +59381,7 @@ self: {
          securemem semigroups split text time transformers
          unordered-containers wl-pprint-extras zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bifunctors binary binary-conduit byteable
          bytestring bzlib conduit conduit-extra containers
          crypto-cipher-types crypto-pubkey crypto-random cryptocipher
@@ -57971,7 +59406,7 @@ self: {
        pname = "hPDB";
        version = "1.2.0.4";
        sha256 = "0fzr6y19x7c47y3jl68zcrjnlc8j3b0xnvvrpmqm15qznlrdh41s";
-       buildDepends = [
+       libraryHaskellDepends = [
          AC-Vector base bytestring containers deepseq directory ghc-prim
          iterable mmap mtl Octree parallel QuickCheck tagged
          template-haskell text vector zlib
@@ -57993,18 +59428,19 @@ self: {
        sha256 = "1s1m09y3x8lpsdxs6ch77y1qipfy35swqwaj242aa0v5p8xs58wa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          AC-Vector base bytestring containers deepseq directory ghc-prim
          GLUT hPDB iterable mtl Octree OpenGL QuickCheck template-haskell
          text text-format vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          AC-Vector base bytestring containers deepseq directory ghc-prim
          hPDB IfElse iterable mtl process template-haskell text time vector
        ];
        homepage = "https://github.com/BioHaskell/hPDB-examples";
        description = "Examples for hPDB library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPushover" = callPackage
@@ -58015,7 +59451,9 @@ self: {
        pname = "hPushover";
        version = "0.2";
        sha256 = "14k3sdy2c0anfsw0hdir0l107ixlsnr90miwxrxdsckh40kz3ad3";
-       buildDepends = [ aeson base bytestring http-conduit network text ];
+       libraryHaskellDepends = [
+         aeson base bytestring http-conduit network text
+       ];
        jailbreak = true;
        homepage = "tot";
        description = "Pushover.net API functions";
@@ -58028,7 +59466,7 @@ self: {
        pname = "hR";
        version = "0.1.1";
        sha256 = "1kc03mgsxijszdvxw4qwq4fnd0ln61v08rk9y1k6kx9vyqc7bilc";
-       buildDepends = [ array base containers unix ];
+       libraryHaskellDepends = [ array base containers unix ];
        description = "R bindings and interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58040,7 +59478,7 @@ self: {
        pname = "hRESP";
        version = "0.1.0.0";
        sha256 = "188rs1g2yacka8c4wbqkhwjrin95f3ribm8007lqsxiapaj1d89y";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        homepage = "https://github.com/yihuang/hresp";
        description = "haskell implementation of RESP (REdis Serialization Protocol)";
        license = stdenv.lib.licenses.bsd3;
@@ -58057,7 +59495,7 @@ self: {
        sha256 = "0nf71jb15gkkcrb0x83mmql6j55c6dnz3bl3yq1grphwn0jbmq3y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Crypto dataenc HTTP hxt MissingH network
          network-uri old-locale old-time random regex-compat utf8-string
        ];
@@ -58074,7 +59512,7 @@ self: {
        pname = "hSimpleDB";
        version = "0.3";
        sha256 = "045mgg2b7wmkcziil8njb2wsy8pgzqcc46dwdrabxgbw1nzsfkaa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Crypto dataenc HTTP hxt network old-locale old-time
          utf8-string
        ];
@@ -58090,8 +59528,8 @@ self: {
        pname = "hTalos";
        version = "0.2";
        sha256 = "05l9nlrwpb9gwgj8z48paxx46lkasa82naiq7armi98salk1a9ip";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/mgajda/hTalos";
        description = "Parser, print and manipulate structures in PDB file format";
@@ -58105,7 +59543,7 @@ self: {
        pname = "hTensor";
        version = "0.8.2";
        sha256 = "1nwzh68v2b11lph64432bjdrpxrr62cv4hdh935wml13mac3l2ly";
-       buildDepends = [ base containers hmatrix random ];
+       libraryHaskellDepends = [ base containers hmatrix random ];
        homepage = "http://perception.inf.um.es/tensor";
        description = "Multidimensional arrays and simple tensor computations";
        license = stdenv.lib.licenses.bsd3;
@@ -58120,8 +59558,8 @@ self: {
        sha256 = "0r9a461k1rr0j9zgjfq1z37i6blv9rqf8pzb984h1nmlfqpnidnc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base hmatrix ];
-       extraLibraries = [ blas lapack ];
+       executableHaskellDepends = [ array base hmatrix ];
+       executableSystemDepends = [ blas lapack ];
        homepage = "http://dslsrv4.cs.missouri.edu/~qqbm9";
        description = "Optimal variable selection in chain graphical model";
        license = "GPL";
@@ -58133,12 +59571,14 @@ self: {
      mkDerivation {
        pname = "hXmixer";
        version = "0.3.0.0";
-       revision = "2";
        sha256 = "1n9wlg6inzvnyqkx61bpbgx744q25zpjhkihwbqv6569lgir1h4x";
+       revision = "2";
        editedCabalFile = "ba9345a3146b34d0101920f9efd6af7f435188dd7ae53b50d76cc0851f13014f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory gtk3 process split text ];
+       executableHaskellDepends = [
+         base directory gtk3 process split text
+       ];
        description = "A Gtk mixer GUI application for FreeBSD";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58151,8 +59591,8 @@ self: {
        pname = "haar";
        version = "0.1";
        sha256 = "1xmz659lqr25c0xxkmly5w4fxgk9rqnms2sknd5ab8czqdgq6n1v";
-       buildDepends = [ base split ];
-       testDepends = [
+       libraryHaskellDepends = [ base split ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -58168,7 +59608,7 @@ self: {
        pname = "hacanon-light";
        version = "2008.10.28";
        sha256 = "0m0wfg74kmpz6ydldz5h9z5xd54957v1rprl9wal9sjr0pzl28a7";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Template Haskell framework for automatic FFI code generation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58179,7 +59619,7 @@ self: {
        pname = "hack";
        version = "2012.2.6";
        sha256 = "0wrfa9fa6skl985fi2a6iv4m8kchg87w9x3k37nf3l8vaz95jmdr";
-       buildDepends = [ base bytestring data-default ];
+       libraryHaskellDepends = [ base bytestring data-default ];
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "a Haskell Webserver Interface";
        license = stdenv.lib.licenses.bsd3;
@@ -58194,7 +59634,7 @@ self: {
        pname = "hack-contrib";
        version = "2010.9.28";
        sha256 = "1r0g8fcwz6r4vrsadjyb5awjmfbqsskmc1c8xkfwv0knak1qq2p1";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base bytestring cgi containers data-default
          directory filepath hack haskell98 mps network old-locale old-time
          time utf8-string
@@ -58213,7 +59653,7 @@ self: {
        pname = "hack-contrib-press";
        version = "0.1.2";
        sha256 = "12v7xw448cxl93bnbzqkinlij74flffpif0x5jd51sndvpgsh12r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-class containers hack json mtl parsec
          press
        ];
@@ -58231,7 +59671,7 @@ self: {
        pname = "hack-frontend-happstack";
        version = "2009.6.24.1";
        sha256 = "1x4kaj4nk5lrgsm6pfxr6f8rvjyxhy0agqv9f810xh6s1r9pihw1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers hack happstack-server network
          utf8-string
        ];
@@ -58247,7 +59687,7 @@ self: {
        pname = "hack-frontend-monadcgi";
        version = "0.0.3.1";
        sha256 = "0m0af44jv03djn5i2lgrnnvvcdqx44qppfx76m1bwr7gv1vzm432";
-       buildDepends = [ base bytestring cgi containers hack ];
+       libraryHaskellDepends = [ base bytestring cgi containers hack ];
        description = "Allows programs written against MonadCGI to run with any hack handler. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58258,7 +59698,7 @@ self: {
        pname = "hack-handler-cgi";
        version = "0.2.0.2";
        sha256 = "0pm8vs94dbaahqrdwfffwa1jb9ghyjnq48sirlw1dj2gcsa3np2x";
-       buildDepends = [ base bytestring hack ];
+       libraryHaskellDepends = [ base bytestring hack ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/hack-handler-cgi/tree/master";
        description = "Hack handler using CGI protocol. (deprecated)";
@@ -58273,7 +59713,7 @@ self: {
        pname = "hack-handler-epoll";
        version = "0.1.3";
        sha256 = "0q4cw789x8c93y53lwhr7g0hkli8x6qb9k0cg5pxln6cxxvi9p82";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default epoll failure hack HTTP network unix
          utf8-string
        ];
@@ -58291,11 +59731,11 @@ self: {
        pname = "hack-handler-evhttp";
        version = "2009.8.4";
        sha256 = "1a09ls9jgakdx8ya6zd5z3ss2snb4pp0db1573hzmrhr37i2gklz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-class containers data-default hack
          hack-contrib network
        ];
-       extraLibraries = [ event ];
+       librarySystemDepends = [ event ];
        homepage = "http://github.com/bickfordb/hack-handler-evhttp";
        description = "Hack EvHTTP (libevent) Handler";
        license = "GPL";
@@ -58308,8 +59748,8 @@ self: {
        pname = "hack-handler-fastcgi";
        version = "0.2.0.1";
        sha256 = "02slh33r9qy8q0vpi4s4vvf5lmb14ypk8bixdicvxakahjvxhanr";
-       buildDepends = [ base bytestring hack hack-handler-cgi ];
-       extraLibraries = [ fcgi ];
+       libraryHaskellDepends = [ base bytestring hack hack-handler-cgi ];
+       librarySystemDepends = [ fcgi ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/hack-handler-fastcgi/tree/master";
        description = "Hack handler direct to fastcgi (deprecated)";
@@ -58325,7 +59765,7 @@ self: {
        pname = "hack-handler-happstack";
        version = "2009.12.20";
        sha256 = "10b3cp1gap59ialfl33dwhzw50nwrqg49zvv0v813q7rqk3nkhg4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cgi containers data-default hack happstack-server
          mtl network
        ];
@@ -58343,7 +59783,7 @@ self: {
        pname = "hack-handler-hyena";
        version = "2010.3.15";
        sha256 = "1p0zyki1iapz2xncq0l5bbas44pk5kb29kbb3bdxb4anb0m5jb2q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default hack hyena network
        ];
        homepage = "http://github.com/nfjinjing/hack-handler-hyena";
@@ -58358,7 +59798,9 @@ self: {
        pname = "hack-handler-kibro";
        version = "2009.5.27";
        sha256 = "0py30rp7r4hrazrfq3avpqcp1w8405pyfw1yxz7msb58yjppa792";
-       buildDepends = [ base cgi data-default hack kibro network ];
+       libraryHaskellDepends = [
+         base cgi data-default hack kibro network
+       ];
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "Hack Kibro handler";
        license = "GPL";
@@ -58373,7 +59815,7 @@ self: {
        pname = "hack-handler-simpleserver";
        version = "0.2.2";
        sha256 = "1p7igprgxkzkqhsy5n2qci75dbx2qxs1dcq8krghwj3isl6wds3y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring failure hack network web-encodings
        ];
        jailbreak = true;
@@ -58389,7 +59831,9 @@ self: {
        pname = "hack-middleware-cleanpath";
        version = "0.0.1.1";
        sha256 = "0107ajkiwkn33h56dz576y4dxl0sr2lkkcmjy6f9s2nzqp9ibin4";
-       buildDepends = [ base bytestring hack split web-encodings ];
+       libraryHaskellDepends = [
+         base bytestring hack split web-encodings
+       ];
        homepage = "http://github.com/snoyberg/hack-middleware-cleanpath/tree/master";
        description = "Applies some basic redirect rules to get cleaner paths. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -58404,7 +59848,7 @@ self: {
        pname = "hack-middleware-clientsession";
        version = "0.0.1.1";
        sha256 = "0h4l2lvshf9cqg43az9alq4rybhr4k07mhrila4fx7yjxslw871f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base clientsession hack old-locale predicates time web-encodings
        ];
        homepage = "http://github.com/snoyberg/hack-middleware-clientsession/tree/master";
@@ -58419,7 +59863,7 @@ self: {
        pname = "hack-middleware-gzip";
        version = "0.0.0.1";
        sha256 = "1x7526939h7g44yyscyk324gdb40cryyiffh13iinf8aw1rach70";
-       buildDepends = [ base hack split zlib ];
+       libraryHaskellDepends = [ base hack split zlib ];
        homepage = "http://github.com/snoyberg/hack-middleware-gzip/tree/master";
        description = "Automatic gzip compression of responses. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -58433,7 +59877,7 @@ self: {
        pname = "hack-middleware-jsonp";
        version = "0.0.2.1";
        sha256 = "0g7l441s0065f5dw2rj82m547nnc1i7cclx81kvgbpbi8q6hz0iw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-class hack web-encodings
        ];
        homepage = "http://github.com/snoyberg/hack-middleware-jsonp/tree/master";
@@ -58448,7 +59892,7 @@ self: {
        pname = "hack2";
        version = "2014.11.17";
        sha256 = "1b6jzdisv58scyzb9pxhqrnz74sy0j96jkbbnf84wccwbwn4rf28";
-       buildDepends = [ base bytestring data-default ];
+       libraryHaskellDepends = [ base bytestring data-default ];
        homepage = "https://github.com/nfjinjing/hack2";
        description = "a Haskell Webserver Interface (V2)";
        license = stdenv.lib.licenses.bsd3;
@@ -58462,7 +59906,7 @@ self: {
        pname = "hack2-contrib";
        version = "2015.5.4";
        sha256 = "1vbdnbab5f090fp5zgviwbc2w33y7calgbh67fgxcaflhg0514vk";
-       buildDepends = [
+       libraryHaskellDepends = [
          air base bytestring containers data-default directory filepath
          hack2 network-uri text time
        ];
@@ -58480,7 +59924,7 @@ self: {
        pname = "hack2-contrib-extra";
        version = "2014.12.20";
        sha256 = "1mxgvlr593cw523mknr5bcwf55544q04cz0nlpzgm5bg3336b5wl";
-       buildDepends = [
+       libraryHaskellDepends = [
          air air-extra base bytestring cgi containers data-default directory
          filepath hack2 hack2-contrib network old-locale old-time time
        ];
@@ -58497,7 +59941,7 @@ self: {
        pname = "hack2-handler-happstack-server";
        version = "2011.6.20";
        sha256 = "115nrzf0626pc716n01qjhxs44c1awdd4q1c8kbax025cwac7kpx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cgi containers data-default enumerator hack2
          happstack-server mtl network
        ];
@@ -58518,7 +59962,7 @@ self: {
        pname = "hack2-handler-mongrel2-http";
        version = "2011.10.31";
        sha256 = "1pymar803n696yx3dwqpfwqlkg93ncff162p26mrs7iqn14v851w";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson air attoparsec base blaze-builder blaze-textual bytestring
          containers data-default directory enumerator hack2 mtl network safe
          stm text unix zeromq-haskell
@@ -58538,7 +59982,7 @@ self: {
        pname = "hack2-handler-snap-server";
        version = "2015.3.9";
        sha256 = "1qs5mncl44p410ni8hbpgvmv81158z62mcg66fmnnlrkwdr1bbh7";
-       buildDepends = [
+       libraryHaskellDepends = [
          air base blaze-builder bytestring case-insensitive containers
          data-default directory enumerator hack2 mtl network snap-core
          snap-server
@@ -58556,7 +60000,7 @@ self: {
        pname = "hack2-handler-warp";
        version = "2012.5.25";
        sha256 = "1p0lkhf95xkllfpcb9yibpa1rkam90bccmzj2aa60shd7v9qx9r5";
-       buildDepends = [
+       libraryHaskellDepends = [
          air base data-default hack2 hack2-interface-wai warp
        ];
        homepage = "https://github.com/nfjinjing/hack2-handler-warp";
@@ -58574,7 +60018,7 @@ self: {
        pname = "hack2-interface-wai";
        version = "2012.5.25";
        sha256 = "18yyvb38axz18ac2q9z31qmqjd3d9yrzsgiv11wbf8ccdp2irm5w";
-       buildDepends = [
+       libraryHaskellDepends = [
          air base bytestring case-insensitive containers data-default hack2
          http-types mtl network safe wai
        ];
@@ -58591,10 +60035,10 @@ self: {
      mkDerivation {
        pname = "hackage-db";
        version = "1.22";
-       revision = "1";
        sha256 = "0rhh7w4929zkwzv10ika952yiw4dkffqd8f79f1bl76lz1la6cjd";
+       revision = "1";
        editedCabalFile = "b5277a8cbbfcfba81f29db4910003c2fa7e34c06bceb4f3e7318510e1ce74376";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal containers directory filepath tar utf8-string
        ];
        homepage = "http://github.com/peti/hackage-db";
@@ -58613,7 +60057,7 @@ self: {
        sha256 = "0kdc7ah1mn6xcaan56li9k7ccrcsjz3ysi04fp334l57kd3i105z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal async attoparsec base Cabal cpphs directory filepath
          haskell-src-exts HTTP mtl process text
        ];
@@ -58635,18 +60079,20 @@ self: {
      mkDerivation {
        pname = "hackage-mirror";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "1iaaxdn4lsfrjksax8c9pawrjwj4sb6irqd4sfkdm3k9l2f8nqvg";
+       revision = "1";
        editedCabalFile = "848ea26073e706a9303ec1baf811a74b65859ae649731a3b799b4fb8c558c1bc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aws base bytestring cereal conduit conduit-extra cryptohash
          data-default directory exceptions fast-logger filepath http-conduit
          lifted-async lifted-base mmorph monad-control monad-logger
-         old-locale optparse-applicative resourcet retry shakespeare stm tar
-         template-haskell temporary text thyme transformers
-         unordered-containers
+         old-locale resourcet retry shakespeare stm tar template-haskell
+         temporary text thyme transformers unordered-containers
+       ];
+       executableHaskellDepends = [
+         base monad-logger optparse-applicative
        ];
        homepage = "http://fpcomplete.com";
        description = "Simple mirroring utility for Hackage";
@@ -58664,14 +60110,13 @@ self: {
        sha256 = "11vlnmadnjz1q4iw4ay8gh1yclba7550mnxwakdryakws5v75am1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory download-curl filepath gnuplot
          old-locale old-time parsedate
        ];
        homepage = "http://code.haskell.org/~dons/code/hackage-plot";
        description = "Generate cumulative graphs of hackage uploads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-proxy" = callPackage
@@ -58687,7 +60132,7 @@ self: {
        sha256 = "1vicmj070nb76zcxfmkj4sv0rxrrl13r31psnsgb8azbmvs1s0yp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base basic-prelude blaze-builder bytestring Cabal case-insensitive
          conduit containers filepath http-client http-client-conduit
          http-conduit http-types optparse-applicative tar text transformers
@@ -58716,7 +60161,7 @@ self: {
        sha256 = "1xsy2clsg53rhxgkb9vlan7dw7xqphm8gr1ajl8kq5ymfahnyd1i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          acid-state aeson array async attoparsec base base16-bytestring
          base64-bytestring binary blaze-builder bytestring Cabal cereal
          containers crypto-api csv deepseq directory filepath
@@ -58726,12 +60171,12 @@ self: {
          time tokenize transformers unix unordered-containers vector xhtml
          zlib
        ];
-       testDepends = [
+       executableToolDepends = [ alex happy ];
+       testHaskellDepends = [
          aeson base base64-bytestring bytestring Cabal directory filepath
          HTTP network process random tar text unix unordered-containers
          vector xml zlib
        ];
-       buildTools = [ alex happy ];
        jailbreak = true;
        description = "The Hackage web server";
        license = stdenv.lib.licenses.bsd3;
@@ -58748,7 +60193,7 @@ self: {
        sha256 = "0b43vd1b18ksivxr7cfymzwcgs8rhwib2prn86wmwhghyx8a4qnw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory download filepath hsparklines old-locale
          old-time parsedate tagsoup
        ];
@@ -58766,7 +60211,7 @@ self: {
        sha256 = "0vbp7c1g7dx119xxsn0f0fhk14l35jxmg7zdaqr1vcjhprj3nh6q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base download feed tagsoup ];
+       executableHaskellDepends = [ base download feed tagsoup ];
        homepage = "http://code.haskell.org/~dons/code/hackage2hwn";
        description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org";
        license = stdenv.lib.licenses.bsd3;
@@ -58781,7 +60226,7 @@ self: {
        sha256 = "131hl59imxhql3hfp8m9363fgsgdywz1p8idrybncipyblwpsjgq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base feed feed2twitter ];
+       executableHaskellDepends = [ base feed feed2twitter ];
        homepage = "http://github.com/tomlokhorst/hackage2twitter";
        description = "Send new Hackage releases to Twitter";
        license = stdenv.lib.licenses.bsd3;
@@ -58798,13 +60243,12 @@ self: {
        sha256 = "06lrsfs70zjhxqsz93wmhrmyq1v64kiq0580f9im9nw69w4yl4ax";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory filepath mtl process
        ];
        homepage = "https://github.com/dterei/Hackager";
        description = "Hackage testing tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackernews" = callPackage
@@ -58816,11 +60260,11 @@ self: {
        pname = "hackernews";
        version = "0.5.0.0";
        sha256 = "1yj8wip52dagmdpziyyjs9hp7k1gdvwl6ynk5hr8c8wxapcj28bs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring either HsOpenSSL http-streams
          io-streams text time transformers
        ];
-       testDepends = [ base hspec transformers ];
+       testHaskellDepends = [ base hspec transformers ];
        description = "API for Hacker News";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58834,7 +60278,7 @@ self: {
        sha256 = "17c77f687874bfwahmzcz2v6k8z9p4fv555r5r1f38snsdi825gf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/fgaz/hackertyper";
        description = "\"Hack\" like a programmer in movies and games!";
        license = stdenv.lib.licenses.mit;
@@ -58852,13 +60296,13 @@ self: {
        sha256 = "18sv8kwhg0frsn6phg47hsm5vv84yaxxvk47sazgrb5hjl3qiam7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers deepseq directory
          extensible-exceptions filepath HTTP MissingH mtl network
          network-uri old-locale old-time parsec pretty process regex-compat
          tar time unix xml zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers deepseq directory extensible-exceptions
          filepath HUnit mtl pretty process time unix xml
        ];
@@ -58875,7 +60319,7 @@ self: {
        pname = "hactor";
        version = "1.2.0.0";
        sha256 = "0jgnifwgfxapi8l0ds56xr7h66jprn1ynpwmvhafbyk84ymznf8y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers monad-control mtl resourcet stm stm-chans
          transformers-base
        ];
@@ -58892,7 +60336,7 @@ self: {
        pname = "hactors";
        version = "0.0.3.1";
        sha256 = "0nxcl3v9gnnyjzdpk30m2pmrhwcva9rky2dxrj4nnkr67ajm2dj0";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        jailbreak = true;
        homepage = "https://github.com/treep/hactors";
        description = "Practical actors for Haskell";
@@ -58909,8 +60353,8 @@ self: {
        sha256 = "1mnnvc5jqp6n6rj7xw8wdm0z2xp9fndkz11c8p3vbljsrcqd3v26";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haddock-api ];
-       testDepends = [ base Cabal directory filepath process ];
+       executableHaskellDepends = [ base haddock-api ];
+       testHaskellDepends = [ base Cabal directory filepath process ];
        preCheck = "unset GHC_PACKAGE_PATH";
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
@@ -58926,7 +60370,7 @@ self: {
        pname = "haddock-api";
        version = "2.15.0.2";
        sha256 = "1gdmwid3qg86ql0828bp8g121psvmz11s0xivrzhiv8knxbqj8l7";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
        ];
@@ -58945,11 +60389,10 @@ self: {
        pname = "haddock-api";
        version = "2.16.1";
        sha256 = "1spd5axg1pdjv4dkdb5gcwjsc8gg37qi4mr2k2db6ayywdkis1p2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
        ];
-       jailbreak = true;
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -58965,7 +60408,7 @@ self: {
        sha256 = "1a56nihkxybldk55g69v2aw6r4ipa9x86i0jr19fd23zxvancs8h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base Cabal containers directory filepath ghc ghc-paths pretty
        ];
        jailbreak = true;
@@ -58983,8 +60426,8 @@ self: {
        pname = "haddock-library";
        version = "1.2.1";
        sha256 = "0mhh2ppfhrvvi9485ipwbkv2fbgj35jvz3la02y3jlvg5ffs1c8g";
-       buildDepends = [ base bytestring deepseq transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq transformers ];
+       testHaskellDepends = [
          base base-compat bytestring deepseq hspec QuickCheck transformers
        ];
        homepage = "http://www.haskell.org/haddock/";
@@ -59004,7 +60447,7 @@ self: {
        sha256 = "0ppbvmmiz07p8kyblkplzkki3kc4z8hlmxc9h18fj0xwr6dpfib7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal conduit conduit-extra exceptions ghc haddock-api mtl
          optparse-applicative process resourcet sqlite-simple system-fileio
          system-filepath tagsoup text transformers
@@ -59024,9 +60467,9 @@ self: {
        pname = "hadoop-formats";
        version = "0.2.1.1";
        sha256 = "1w3869jz3mxhzdik5fwaha7dn9rhjg5w8g0qnznd4x45cnzxv5ga";
-       buildDepends = [ attoparsec base bytestring text vector ];
-       testDepends = [ base bytestring filepath text vector ];
-       extraLibraries = [ snappy ];
+       libraryHaskellDepends = [ attoparsec base bytestring text vector ];
+       librarySystemDepends = [ snappy ];
+       testHaskellDepends = [ base bytestring filepath text vector ];
        jailbreak = true;
        homepage = "http://github.com/jystic/hadoop-formats";
        description = "Read/write file formats commonly used by Hadoop";
@@ -59043,12 +60486,12 @@ self: {
        pname = "hadoop-rpc";
        version = "1.0.0.1";
        sha256 = "1nm1xgb1ks57sbqg8x8aasr5l8lgdf4inr4ndgnnlsdjah6nbli1";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring cereal exceptions hashable monad-loops
          network protobuf random socks stm text transformers unix
          unordered-containers uuid vector xmlhtml
        ];
-       testDepends = [ base protobuf tasty tasty-hunit vector ];
+       testHaskellDepends = [ base protobuf tasty tasty-hunit vector ];
        homepage = "http://github.com/jystic/hadoop-rpc";
        description = "Use the Hadoop RPC interface from Haskell";
        license = stdenv.lib.licenses.asl20;
@@ -59067,19 +60510,18 @@ self: {
        sha256 = "0grwi26xardg8fxvz7g10v9111bgph77s3pdrr58r9hqgm8lhx5v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base boxes bytestring configurator exceptions filepath
          hadoop-rpc old-locale optparse-applicative protobuf
          regex-pcre-builtin split stm text time transformers unix vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring hadoop-rpc tasty tasty-hunit
          tasty-quickcheck vector
        ];
        homepage = "http://github.com/jystic/hadoop-tools";
        description = "Fast command line tools for working with Hadoop";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haeredes" = callPackage
@@ -59092,10 +60534,10 @@ self: {
        sha256 = "0m6d75kgf40m3vnh148v2ysfhplspqbbqs8jha29ascap8xz7n47";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs dns iproute MissingH parallel-io
        ];
-       testDepends = [ base doctest filemanip ];
+       testHaskellDepends = [ base doctest filemanip ];
        homepage = "http://michael.orlitzky.com/code/haeredes.php";
        description = "Confirm delegation of NS and MX records";
        license = stdenv.lib.licenses.gpl3;
@@ -59114,11 +60556,14 @@ self: {
        sha256 = "09mqs4y26w7f4729gvrpv9mh431xpdngas14ad86bbjf2ncvggjg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers convertible directory
          filemanip filepath HDBC HDBC-sqlite3 hquery MissingH network
-         old-locale optparse-applicative pandoc pandoc-types parsec rss
-         split text time unix xmlhtml
+         old-locale pandoc pandoc-types parsec rss split text time unix
+         xmlhtml
+       ];
+       executableHaskellDepends = [
+         base directory filemanip filepath optparse-applicative
        ];
        homepage = "http://github.com/tych0/haggis";
        description = "A static site generator with blogging/comments support";
@@ -59134,7 +60579,8 @@ self: {
        sha256 = "1vfsy6ks9rnynwvavakj90662vxgvk7y0vwpdga2k2fc8nkqjf10";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers time ];
+       libraryHaskellDepends = [ base containers time ];
+       executableHaskellDepends = [ base containers time ];
        description = "A simple library for creating animated ascii art on ANSI terminals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59148,7 +60594,7 @@ self: {
        pname = "hailgun";
        version = "0.4.0.3";
        sha256 = "1c4fd116xhkw0hknzfyxyw7v62wjixcdbdidx804rs8g8f3c5p1c";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring email-validate exceptions filepath
          http-client http-client-tls http-types tagsoup text time
          transformers
@@ -59166,7 +60612,9 @@ self: {
        sha256 = "1cxvzg5bfwsdly9k24izwnk5gf9vvzisaj3m6ng647bm1fc598c6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring configurator hailgun text ];
+       executableHaskellDepends = [
+         base bytestring configurator hailgun text
+       ];
        jailbreak = true;
        description = "A program to send emails throught the Mailgun api";
        license = stdenv.lib.licenses.mit;
@@ -59189,14 +60637,21 @@ self: {
        sha256 = "1s447iqgpxsx78zd873izyqhdq34dz1ikjcfw8m9r0rv5nkxkf7c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         authenticate base base64-bytestring binary blaze-builder bson
+         bytestring conduit conduit-extra containers cookie exceptions
+         failure http-conduit http-types lio mongoDB mtl network network-uri
+         parsec resourcet SHA text time transformers wai wai-app-static
+         wai-extra
+       ];
+       executableHaskellDepends = [
          authenticate base base64-bytestring binary blaze-builder bson
          bytestring conduit conduit-extra containers cookie directory
-         exceptions failure filepath ghc-paths hint http-conduit http-types
-         lio mongoDB mtl network network-uri parsec resourcet SHA text time
+         exceptions filepath ghc-paths hint http-conduit http-types lio
+         mongoDB mtl network network-uri parsec resourcet SHA text time
          transformers unix wai wai-app-static wai-extra warp
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bson containers http-types HUnit lio mongoDB QuickCheck
          quickcheck-instances quickcheck-lio-instances test-framework
          test-framework-hunit test-framework-quickcheck2 text time unix wai
@@ -59218,7 +60673,7 @@ self: {
        sha256 = "006qy5mkhh8zqy9mrpwjiym7klqma49zglwpjmx2ikmkkq9qnfvr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bson bytestring containers ghc-paths hails iterIO
          iterio-server mongoDB mtl
        ];
@@ -59239,12 +60694,13 @@ self: {
        sha256 = "19kgygj9d3m56xcfc1zm0ki2ncgifrrsrf90bvp9bykyixycplap";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base data-default heroku http-types monad-logger mtl
          persistent persistent-postgresql persistent-template scotty text
          time transformers wai wai-extra warp
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base hspec http-types mtl persistent scotty time wai wai-extra
        ];
        jailbreak = true;
@@ -59266,13 +60722,13 @@ self: {
        pname = "hakaru";
        version = "0.1.4";
        sha256 = "033m28jckpqgc4izmyf4h60riy29mcvfhyw340z604miqg7ss2hf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array base bytestring cassava containers directory hmatrix
          integration logfloat math-functions monad-loops mwc-random parallel
          parsec pretty primitive random statistics text transformers vector
          zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          base Cabal containers hmatrix HUnit logfloat math-functions
          monad-loops mwc-random pretty primitive QuickCheck random
          statistics test-framework test-framework-hunit
@@ -59295,9 +60751,8 @@ self: {
        sha256 = "0h0y466b664xyxi1hr8c7il4cslrmb1hyhsjzhvs55l33zb7591b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base directory filepath mtl process regexpr time yjtools
-       ];
+       libraryHaskellDepends = [ base filepath mtl time ];
+       executableHaskellDepends = [ directory process regexpr yjtools ];
        homepage = "http://homepage3.nifty.com/salamander/second/projects/hake/index.xhtml";
        description = "make tool. ruby : rake = haskell : hake";
        license = "GPL";
@@ -59309,7 +60764,7 @@ self: {
        pname = "hakismet";
        version = "0.1";
        sha256 = "1ddmnzan16vn0fbp1fgsidahayihhr0vw8saypdqq7lnhqw8j9d4";
-       buildDepends = [ base HTTP network ];
+       libraryHaskellDepends = [ base HTTP network ];
        jailbreak = true;
        homepage = "https://code.reaktor42.de/projects/hakismet";
        description = "Akismet spam protection library";
@@ -59325,10 +60780,10 @@ self: {
        pname = "hako";
        version = "1.0.0";
        sha256 = "1gcw15522yh0aa7xa793gda45qmq8my15id4ybivv3n16pcr7prm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta parsec template-haskell text transformers
        ];
-       testDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        description = "A mako-like quasi-quoter template library";
        license = stdenv.lib.licenses.bsd3;
@@ -59350,7 +60805,7 @@ self: {
        sha256 = "1gy7j15qqh8m0wf8xkpb1hglahylwyy7vq6c4bm9arap3viak29c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-html blaze-markup bytestring cmdargs containers
          cryptohash data-default deepseq directory filepath fsnotify
          http-conduit http-types lrucache mtl network network-uri pandoc
@@ -59358,7 +60813,8 @@ self: {
          snap-core snap-server system-filepath tagsoup text time
          time-locale-compat
        ];
-       testDepends = [
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
          base binary blaze-html blaze-markup bytestring cmdargs containers
          cryptohash data-default deepseq directory filepath fsnotify
          http-conduit http-types HUnit lrucache mtl network network-uri
@@ -59379,7 +60835,9 @@ self: {
        pname = "hakyll-R";
        version = "0.1.0.3";
        sha256 = "0sr0mpyhjr7ajg227rfylhv2950vip6zkryalxp39m1xv0dh2rb3";
-       buildDepends = [ base directory filepath hakyll pandoc process ];
+       libraryHaskellDepends = [
+         base directory filepath hakyll pandoc process
+       ];
        jailbreak = true;
        description = "A package allowing to write Hakyll blog posts in Rmd";
        license = stdenv.lib.licenses.bsd3;
@@ -59394,7 +60852,7 @@ self: {
        pname = "hakyll-agda";
        version = "0.1.10";
        sha256 = "1621l7pw2rcyalp17dcjp1bk650rs8w1i3swnwrzr9wwi6nrx7qb";
-       buildDepends = [
+       libraryHaskellDepends = [
          Agda base containers directory filepath hakyll mtl pandoc
          transformers xhtml
        ];
@@ -59402,7 +60860,6 @@ self: {
        homepage = "https://github.com/bitonic/hakyll-agda";
        description = "Wrapper to integrate literate Agda files with Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-blaze-templates" = callPackage
@@ -59411,7 +60868,7 @@ self: {
        pname = "hakyll-blaze-templates";
        version = "0.1.1.0";
        sha256 = "11dl3rqls2yxkmycx63xr1cix4adk6b29sbwr4v5n48bqamr7p1j";
-       buildDepends = [ base blaze-html blaze-markup hakyll ];
+       libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ];
        jailbreak = true;
        description = "Blaze templates for Hakyll";
        license = stdenv.lib.licenses.bsd3;
@@ -59426,7 +60883,8 @@ self: {
        sha256 = "0w23laiw6a5hxfq5hjq8vn3k7fx5l4yb9p8qcbm62zlycza1ci14";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath hakyll pandoc ];
+       libraryHaskellDepends = [ base hakyll pandoc ];
+       executableHaskellDepends = [ base directory filepath hakyll ];
        jailbreak = true;
        homepage = "http://jaspervdj.be/hakyll";
        description = "Extra modules for the hakyll website compiler";
@@ -59440,7 +60898,7 @@ self: {
        pname = "hakyll-contrib-hyphenation";
        version = "0.1.0.3";
        sha256 = "0mkbsivifggi64k97ssxb0dskzwf7h0sny4m8gmkdsvwqjhfdjam";
-       buildDepends = [ base hakyll hyphenation split tagsoup ];
+       libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ];
        jailbreak = true;
        homepage = "https://bitbucket.org/rvlm/hakyll-contrib-hyphenation";
        description = "automatic hyphenation for Hakyll";
@@ -59456,10 +60914,10 @@ self: {
        pname = "hakyll-contrib-links";
        version = "0.2.0.0";
        sha256 = "0gzg88pcqxwj4qwr2qj24csjljvxcz3v9iclhz5f9g8dx41rkiy5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers hakyll pandoc pandoc-types parsec
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -59478,9 +60936,11 @@ self: {
        sha256 = "1dvif26avp6fczhlg8pi591wp8d1z3kvjr745r5p17lzwpwy1rx3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring cmdargs directory feed filepath hakyll
-         old-locale text time xml
+       libraryHaskellDepends = [
+         base binary bytestring feed hakyll old-locale text time xml
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs directory feed filepath hakyll text xml
        ];
        homepage = "http://github.com/kowey/hakyll-convert";
        description = "Convert from other blog engines to Hakyll";
@@ -59495,7 +60955,9 @@ self: {
        pname = "hakyll-elm";
        version = "0.2.1";
        sha256 = "0bgwcxarsa40aylvg4cc7ha5y87xklkc4ifwd17l69l4xbb4iqpk";
-       buildDepends = [ base blaze-html blaze-markup Elm hakyll mtl ];
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup Elm hakyll mtl
+       ];
        jailbreak = true;
        homepage = "https://github.com/maxsnew/hakyll-elm";
        description = "Hakyll wrapper for the Elm compiler";
@@ -59514,11 +60976,15 @@ self: {
        sha256 = "1d8r1cz9q9mgw1abz8b8n6lnnc19g223hv3igznxfldbws7d6zrj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers haskell-names haskell-packages
-         haskell-src-exts mtl safe syb tagged
+         haskell-src-exts mtl safe syb
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base Cabal haskell-names haskell-packages haskell-src-exts mtl safe
+         tagged
+       ];
+       testHaskellDepends = [
          base Cabal containers haskell-names haskell-packages
          haskell-src-exts HUnit mtl split tagged test-framework
          test-framework-hunit
@@ -59535,10 +61001,10 @@ self: {
      mkDerivation {
        pname = "half";
        version = "0.2.0.1";
-       revision = "1";
        sha256 = "0lwh5bv8pnp9fzq64z1fg1i4fv8h2lcchs1298agq881hcay19qw";
+       revision = "1";
        editedCabalFile = "cfadc0b87a5d9c4cc9a3ab5d7a5524221ae88e962f812eb41beba7b39111ccce";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/half";
        description = "Half-precision floating-point";
        license = stdenv.lib.licenses.bsd3;
@@ -59555,7 +61021,11 @@ self: {
        sha256 = "1k47q0vp0cmvmxz28hmv8dgniz9ks7h0wjjmdkjgvb77p8jj2akd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring cereal containers directory filepath
+         fingertree mtl QuickCheck random time unix
+       ];
+       executableHaskellDepends = [
          array base bytestring cereal containers directory filepath
          fingertree HFuse mtl QuickCheck random time unix
        ];
@@ -59571,7 +61041,7 @@ self: {
        pname = "halipeto";
        version = "2.4.1";
        sha256 = "1anyf6mh13rmj5a0lsayrcxzvm3zk0a2943pzkgz06y3aqgmcbdb";
-       buildDepends = [ base directory HaXml pandoc ];
+       libraryHaskellDepends = [ base directory HaXml pandoc ];
        jailbreak = true;
        homepage = "http://github.com/peti/halipeto";
        description = "Haskell Static Web Page Generator";
@@ -59590,13 +61060,15 @@ self: {
        sha256 = "0rxcklxmfk6z9f3alvzszq7g5wik7x9nj43m4vvf6iw1nsjvk580";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bin-package-db containers directory filepath foreign-store
-         fsnotify ghc ghc-paths system-filepath transformers
+       libraryHaskellDepends = [ base containers foreign-store ];
+       executableHaskellDepends = [
+         base bin-package-db directory filepath fsnotify ghc ghc-paths
+         system-filepath transformers
        ];
        homepage = "https://github.com/lukexi/halive";
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halma" = callPackage
@@ -59611,11 +61083,14 @@ self: {
        sha256 = "04b0djijhmgwr79hkprikqxdzfxabavrvkwmb1pv9qybsa82j6sc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base containers data-default diagrams-cairo diagrams-gtk
-         diagrams-lib grid gtk mtl mvc pipes timeit
+       libraryHaskellDepends = [
+         base containers data-default diagrams-lib grid
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         async base data-default diagrams-cairo diagrams-gtk diagrams-lib
+         gtk mtl mvc pipes timeit
+       ];
+       testHaskellDepends = [
          base containers grid HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -59632,7 +61107,7 @@ self: {
        sha256 = "0l2qlibfxj8n7jqqqrbswx3fgislxz39075bhip07qx55193dx2f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hint process ];
+       executableHaskellDepends = [ base hint process ];
        description = "looks for functions given a set of example input/outputs";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -59643,7 +61118,7 @@ self: {
        pname = "hamid";
        version = "0.10";
        sha256 = "19792k9pwpkqwqznxm00nbq22swnayz7fv60ly0wsw5zmf1g6wv8";
-       buildDepends = [ base HCodecs newtype ];
+       libraryHaskellDepends = [ base HCodecs newtype ];
        description = "Binding to the OS level Midi services (fork of system-midi)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59654,7 +61129,7 @@ self: {
        pname = "hamlet";
        version = "1.2.0";
        sha256 = "0rla3ap3malk8j6mh07fr2aqvbscpy743wrfq3skgjv3j4jlpjfi";
-       buildDepends = [ base shakespeare ];
+       libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Haml-like template files that are compile-time checked (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -59670,7 +61145,7 @@ self: {
        sha256 = "0y7lsh16xrlgsgfsqw00ldcdcjwsy8cziw8p3g753k9m23can4wl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath Glob
          preprocessor-tools
        ];
@@ -59686,7 +61161,7 @@ self: {
        pname = "hamtmap";
        version = "0.3";
        sha256 = "04fr1wjlbmr0c9cp9ybdcirlgayw843klxi0lwl9b9pzwzn0glfl";
-       buildDepends = [ array base deepseq hashable ];
+       libraryHaskellDepends = [ array base deepseq hashable ];
        homepage = "https://github.com/exclipy/pdata";
        description = "A purely functional and persistent hash map";
        license = stdenv.lib.licenses.bsd3;
@@ -59703,10 +61178,11 @@ self: {
        sha256 = "1gfzydgnf8fffsl2f189gy81pb13dbf81i1a83laqsck6dhp60in";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers directory filepath haskore HaXml musicxml
-         non-negative process
+       libraryHaskellDepends = [
+         base containers directory haskore HaXml musicxml non-negative
+         process
        ];
+       executableHaskellDepends = [ filepath ];
        jailbreak = true;
        homepage = "https://troglodita.di.uminho.pt/svn/musica/work/HaMusic";
        description = "Library to handle abstract music";
@@ -59727,12 +61203,18 @@ self: {
        sha256 = "1rm61kzvy8vrqmpa82y98hdf3dhqxkq9yh583p0l48zfj28ljh91";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base base64-bytestring binary bytestring case-insensitive cmdargs
+       libraryHaskellDepends = [
+         base base64-bytestring binary bytestring case-insensitive
          data-default directory filepath GenericPretty HTTP http-conduit
          json network old-locale pretty process pureMD5 random regex-posix
          resourcet split time unix-compat utf8-string xml
        ];
+       executableHaskellDepends = [
+         base base64-bytestring binary bytestring case-insensitive cmdargs
+         directory filepath GenericPretty HTTP http-conduit json network
+         old-locale pretty process pureMD5 random regex-posix resourcet
+         split time unix-compat utf8-string xml
+       ];
        homepage = "http://code.google.com/p/hgdata";
        description = "Library and command-line utility for accessing Google services and APIs";
        license = stdenv.lib.licenses.mit;
@@ -59746,7 +61228,12 @@ self: {
        sha256 = "0x0ix66wcpv172rxk9daifirnrcbblkjlvlg762z4i7qhipjfi2n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aeson base bytestring containers scientific ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers scientific
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers scientific
+       ];
        homepage = "http://code.bwbush.io/handa-geodata/";
        description = "Geographic and Geometric Data";
        license = stdenv.lib.licenses.mit;
@@ -59758,7 +61245,7 @@ self: {
        pname = "handle-like";
        version = "0.1.0.2";
        sha256 = "1cn7423962fg21m75ww5gpg2kwbn1fb7y76hgfq9n6hhbnz8nd4m";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "HandleLike class";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59773,11 +61260,13 @@ self: {
        pname = "handsy";
        version = "0.0.14";
        sha256 = "1a2yzpj883wsn013cy2jvn6wjsqqyf5xn91nkw6f5cg4sd9znzmy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class operational process-extras retry
          shell-escape split transformers
        ];
-       testDepends = [ base bytestring tasty tasty-hunit tasty-th ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit tasty-th
+       ];
        jailbreak = true;
        homepage = "https://github.com/utdemir/handsy";
        description = "A DSL to describe common shell operations and interpeters for running them locally and remotely";
@@ -59792,7 +61281,7 @@ self: {
        sha256 = "0k86z27qiaz967hsdnb3sac5ybmnyzd4d2gxzvdngw8rcvcq3biy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl random utility-ht ];
+       executableHaskellDepends = [ base mtl random utility-ht ];
        description = "Hangman implementation in Haskell written in two hours";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -59808,7 +61297,7 @@ self: {
        sha256 = "072f9zsfrs8g6nw83g6qzczzybngrhyrm1m2y7ha37vf0y9gdpn0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring directory formatting http-types lens
          lens-aeson process scotty text transformers unix-time wai-extra
          wai-middleware-static yaml
@@ -59829,12 +61318,17 @@ self: {
        sha256 = "19zmwwnccmr1smypm8xbxh1r0fcrd9967dqcrjw5mm9675v1iw0p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base blaze-html blaze-markup bytestring cereal containers
-         fingertree HTTP monadLib network old-locale random time unix
+       libraryHaskellDepends = [
+         base bytestring cereal containers fingertree monadLib random time
+         unix
+       ];
+       executableHaskellDepends = [
+         base blaze-html blaze-markup bytestring cereal containers HTTP
+         monadLib network old-locale time
        ];
        description = "IPv4 Network Stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hans-pcap" = callPackage
@@ -59843,11 +61337,12 @@ self: {
        pname = "hans-pcap";
        version = "0.1.0.2";
        sha256 = "10zj129s6l4gf9acvs1yahdwv5vqj9kqwshvfjdak3gbi7arw48s";
-       buildDepends = [ base bytestring hans pcap ];
+       libraryHaskellDepends = [ base bytestring hans pcap ];
        jailbreak = true;
        homepage = "https://github.com/tolysz/hans-pcap";
        description = "Driver for real ethernet devices for HaNS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hans-pfq" = callPackage
@@ -59856,7 +61351,7 @@ self: {
        pname = "hans-pfq";
        version = "0.1.0.0";
        sha256 = "07jspsi8y921n5m5ar93w4gqaff4mjx79ss416ccm4s1k4l2km0b";
-       buildDepends = [ base bytestring hans pfq ];
+       libraryHaskellDepends = [ base bytestring hans pfq ];
        jailbreak = true;
        homepage = "https://github.com/tolysz/hans-pfq";
        description = "Driver for real ethernet devices for HaNS";
@@ -59875,11 +61370,15 @@ self: {
        sha256 = "1bw37wb7wwf6qagp5q0i9biy5cma6i0yvn7z051da3gnad89iil1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat either filepath mtl old-locale process time
          time-locale-compat transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base base-compat either filepath mtl old-locale process time
+         time-locale-compat transformers
+       ];
+       testHaskellDepends = [
          base base-compat directory either filepath hspec mtl old-locale
          process temporary time time-locale-compat transformers
        ];
@@ -59896,9 +61395,11 @@ self: {
        pname = "happindicator";
        version = "0.0.4";
        sha256 = "1d0ycpxmlz2ab8dzys7i6ihc3rbs43d0l5l2mxvshqbpj3j73643";
-       buildDepends = [ array base bytestring containers glib gtk mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ appindicator ];
+       libraryHaskellDepends = [
+         array base bytestring containers glib gtk mtl
+       ];
+       libraryPkgconfigDepends = [ appindicator ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
@@ -59913,8 +61414,9 @@ self: {
        sha256 = "09h3077s61krg814aw2whgc869m6ff96rrxfk6rjpjy71lkmcl92";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base glib gtk3 text ];
-       pkgconfigDepends = [ appindicator ];
+       libraryHaskellDepends = [ base glib gtk3 ];
+       libraryPkgconfigDepends = [ appindicator ];
+       executableHaskellDepends = [ base gtk3 text ];
        jailbreak = true;
        homepage = "https://github.com/mlacorte/happindicator3";
        description = "Binding to the appindicator library";
@@ -59930,7 +61432,7 @@ self: {
        sha256 = "1vcbfil9wxhk7vrmrmkn094rb281h4a3mrzpw5gl1842dpp5hp1g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
        description = "A small program for counting the comments in haskell source";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59943,7 +61445,9 @@ self: {
        pname = "happs-hsp";
        version = "0.1";
        sha256 = "0l1gb0qhhmld77qyz8qclbqxnv0hvyvjhav78690z50kvpjpqrxx";
-       buildDepends = [ base bytestring HAppS-Server hsp mtl plugins ];
+       libraryHaskellDepends = [
+         base bytestring HAppS-Server hsp mtl plugins
+       ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -59956,7 +61460,7 @@ self: {
        pname = "happs-hsp-template";
        version = "0.2";
        sha256 = "0591ipk9zzzznmhz5wpp3qk7fkirhcp801qnk399jsms66fc8378";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath HAppS-Server hinotify
          hsp mtl network plugins RJson
        ];
@@ -59978,7 +61482,7 @@ self: {
        sha256 = "1pkk78npgrr6dar00n93j6fbbkjam6198lkxp3q4zpdqspz4qypn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers DebugTraceHelpers directory filepath
          happstack happstack-data happstack-helpers happstack-ixset
          happstack-server happstack-state hscolour HStringTemplate
@@ -59999,7 +61503,7 @@ self: {
        sha256 = "1dfmfyrynggf1ff6364kb9a53rm64zhirx6ispnhykwdf60zbm6r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base happstack-server ];
+       libraryHaskellDepends = [ base happstack-server ];
        jailbreak = true;
        homepage = "http://happstack.com";
        description = "The haskell application server stack + code generation";
@@ -60015,7 +61519,7 @@ self: {
        pname = "happstack-auth";
        version = "0.2.1.1";
        sha256 = "0mfd2r88681dskn1l1gcbam8rvaqsry09zavywkm4kvmw8912vy4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers convertible happstack happstack-data
          happstack-ixset happstack-server happstack-state mtl old-time
          random
@@ -60041,7 +61545,7 @@ self: {
        pname = "happstack-authenticate";
        version = "2.1.4";
        sha256 = "075bncl5mz7hi674gyhd9mrnf3xb8zn5frcy39dj5m7jrsrdy91z";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state aeson authenticate base base64-bytestring boomerang
          bytestring containers data-default filepath happstack-hsp
          happstack-jmacro happstack-server hsp hsx-jmacro hsx2hs
@@ -60064,7 +61568,7 @@ self: {
        pname = "happstack-clientsession";
        version = "7.3.0";
        sha256 = "1dh6l52mfd6p9y39lr0qax1gs7rxpamy21iwxca7ylbhlqyxfa2g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal clientsession happstack-server monad-control
          mtl safecopy transformers-base
        ];
@@ -60084,11 +61588,12 @@ self: {
        sha256 = "0cqdfnjcmghw3wwny2brw51qbkvi8ps2crl8382sqwqq9gkw0l75";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory happstack-data happstack-ixset
-         happstack-server happstack-state happstack-util HTTP HUnit mtl
-         network old-time syb unix
+         happstack-server happstack-state happstack-util HTTP mtl network
+         old-time syb unix
        ];
+       executableHaskellDepends = [ HUnit ];
        jailbreak = true;
        homepage = "http://happstack.com";
        description = "Web related tools and services";
@@ -60107,7 +61612,7 @@ self: {
        sha256 = "0v2ln4mdnild72p02mzjn8mn5srvjixsjqjgkdqzshvxjnnm95l8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers mtl pretty syb syb-with-class
          syb-with-class-instances-text template-haskell text time
        ];
@@ -60127,7 +61632,7 @@ self: {
        pname = "happstack-dlg";
        version = "0.1.2";
        sha256 = "1zm8f224r0nwpykvil8s05lcswrw31iigcw9arnf4j362y03n2qp";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base bytestring containers formlets
          happstack-server mtl random template-haskell time xhtml
        ];
@@ -60151,14 +61656,14 @@ self: {
        sha256 = "1rfd2rkizviq7pv6lmhkp0dmwwk2m25kz9vzczk3ycm57mk7ql8c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base bytestring containers filepath happstack
          happstack-data happstack-hsp happstack-ixset happstack-server
          happstack-state happstack-util harp hsp hsx html HTTP json mtl
          network old-time random RJson syb text time utf8-string web-routes
          web-routes-mtl
        ];
-       buildTools = [ trhsx ];
+       executableToolDepends = [ trhsx ];
        homepage = "http://src.seereason.com/happstack-facebook/";
        description = "A package for building Facebook applications using Happstack";
        license = stdenv.lib.licenses.bsd3;
@@ -60173,7 +61678,7 @@ self: {
        pname = "happstack-fastcgi";
        version = "0.1.5";
        sha256 = "0rvb041nx2f8azvfy1yysisjqrmsfbxnccn992v5q7zhlglcvj8h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cgi containers fastcgi happstack-server mtl
          utf8-string
        ];
@@ -60189,7 +61694,7 @@ self: {
        pname = "happstack-fay";
        version = "0.2.0";
        sha256 = "1mwx7ki35s6x3ypxl8sv611a2h4zxwd77ij95bydf5azzz9l6ys5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base fay happstack-fay-ajax happstack-server mtl
        ];
        jailbreak = true;
@@ -60205,7 +61710,7 @@ self: {
        pname = "happstack-fay-ajax";
        version = "0.2.0";
        sha256 = "0zdkvvmywnfvqg5jdvf29qczzxmprvspxj0r1vj46fd6vld53j4j";
-       buildDepends = [ fay-base fay-jquery ];
+       libraryHaskellDepends = [ fay-base fay-jquery ];
        jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Support for using Fay with Happstack";
@@ -60222,7 +61727,7 @@ self: {
        pname = "happstack-foundation";
        version = "0.5.8";
        sha256 = "1sbqp78mgnc5rrnn35myd0izlh3w1nv5pgpg807w3cax2xakw3bh";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state base happstack-hsp happstack-server hsp lifted-base
          monad-control mtl reform reform-happstack reform-hsp safecopy text
          web-routes web-routes-happstack web-routes-hsp web-routes-th
@@ -60239,7 +61744,7 @@ self: {
        pname = "happstack-hamlet";
        version = "7.0.4";
        sha256 = "1l12gyyqzblb9psk6692r9xw640jxzyxqldfyg2yrzz8y0zi649a";
-       buildDepends = [ base happstack-server shakespeare text ];
+       libraryHaskellDepends = [ base happstack-server shakespeare text ];
        jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Support for Hamlet HTML templates in Happstack";
@@ -60254,7 +61759,7 @@ self: {
        pname = "happstack-heist";
        version = "7.2.4";
        sha256 = "1ax1fyw9788iilmczqr6s1ryh2h9x2f6n9c8mqxjmq58zg1lc2d3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring either filepath happstack-server
          heist mtl text
        ];
@@ -60277,7 +61782,7 @@ self: {
        pname = "happstack-helpers";
        version = "0.56";
        sha256 = "0yrspdcgxj2izivwm7fy8msfbzlpdn3zv0j1z6b1smzydcbad202";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers DebugTraceHelpers directory filepath
          happstack-data happstack-ixset happstack-server happstack-state
          haskell98 hscolour HSH HStringTemplate HStringTemplateHelpers HTTP
@@ -60299,7 +61804,7 @@ self: {
        pname = "happstack-hsp";
        version = "7.3.5";
        sha256 = "0p8hidcdrqj7n4b9a5gbc0ic279wjmxvjacn6b8nzcnridq3mif6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring happstack-server harp hsp hsx2hs mtl syb text
          utf8-string
        ];
@@ -60318,7 +61823,7 @@ self: {
        pname = "happstack-hstringtemplate";
        version = "7.0.4";
        sha256 = "1pcj6vixzrbdmqi2yxcxhjnj5rdwlyg4nzcjkgks01ilgpg7fsf4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring happstack-server hslogger HStringTemplate mtl
        ];
        jailbreak = true;
@@ -60337,7 +61842,7 @@ self: {
        sha256 = "1hnhn0iyfw5rknz17p7m1p3rrngr77zv3lkni8d35q50bzzyw8ni";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers happstack-data happstack-util mtl syb
          syb-with-class template-haskell
        ];
@@ -60357,7 +61862,7 @@ self: {
        pname = "happstack-jmacro";
        version = "7.0.10";
        sha256 = "0kzp3dfy2qrd9bwq3lwnxvh1zibw7kib8w8rfqz36k0ywdwq8768";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cereal digest happstack-server
          jmacro text utf8-string wl-pprint-text
        ];
@@ -60372,7 +61877,9 @@ self: {
        pname = "happstack-lite";
        version = "7.3.6";
        sha256 = "1mvzpbmjgf5gv9ls5kmg0s6cr765jl701vy2kmbynjkg6jimjmp8";
-       buildDepends = [ base bytestring happstack-server mtl text ];
+       libraryHaskellDepends = [
+         base bytestring happstack-server mtl text
+       ];
        homepage = "http://www.happstack.com/";
        description = "Happstack minus the useless stuff";
        license = stdenv.lib.licenses.bsd3;
@@ -60386,7 +61893,7 @@ self: {
        pname = "happstack-monad-peel";
        version = "0.1";
        sha256 = "0v6lshy572pvzhgqphyrhw8w2wsgxp9mqz8p3lrxmcp3i7sgqbry";
-       buildDepends = [
+       libraryHaskellDepends = [
          base happstack-server monad-peel mtl transformers
        ];
        description = "monad-peel instances for Happstack types";
@@ -60402,7 +61909,7 @@ self: {
        pname = "happstack-plugins";
        version = "7.0.2";
        sha256 = "07zh0gk77rbd1akzax29l7d6412sx5ghjhz640d6cbzxs39nlaif";
-       buildDepends = [
+       libraryHaskellDepends = [
          base happstack-server mtl plugins-auto template-haskell th-lift
        ];
        jailbreak = true;
@@ -60425,7 +61932,7 @@ self: {
        pname = "happstack-server";
        version = "7.4.4";
        sha256 = "1whyv6rb4b9x9m381fs8938n74dgq7hd9gpznwnlzh76ah2nanjf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
          monad-control mtl network network-uri old-locale parsec process
@@ -60433,7 +61940,9 @@ self: {
          time-compat transformers transformers-base transformers-compat unix
          utf8-string xhtml zlib
        ];
-       testDepends = [ base bytestring containers HUnit parsec zlib ];
+       testHaskellDepends = [
+         base bytestring containers HUnit parsec zlib
+       ];
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
@@ -60448,11 +61957,11 @@ self: {
        pname = "happstack-server-tls";
        version = "7.1.6";
        sha256 = "00fmgws8hc0v1lsmxlj478xdbmlpgaz581m9hqw5nfjljg8mi74w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring extensible-exceptions happstack-server hslogger
          HsOpenSSL network sendfile time unix
        ];
-       extraLibraries = [ openssl ];
+       librarySystemDepends = [ openssl ];
        homepage = "http://www.happstack.com/";
        description = "extend happstack-server with https:// support (TLS/SSL)";
        license = stdenv.lib.licenses.bsd3;
@@ -60469,7 +61978,7 @@ self: {
        sha256 = "1xfp0546z70sfda0z7w7ns4jhgcbx3vmnz4vsnckzhgflzmdixq9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory extensible-exceptions
          filepath happstack-data happstack-util hslogger mtl old-time random
          stm syb template-haskell unix
@@ -60489,7 +61998,7 @@ self: {
        pname = "happstack-static-routing";
        version = "0.4.2";
        sha256 = "0g8b94mfhajgs99rgvzfrlc19cxm5a0j6cgrrlrdhgfx7lggc9h2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers happstack-server list-tries transformers
        ];
        homepage = "https://github.com/scrive/happstack-static-routing";
@@ -60509,7 +62018,7 @@ self: {
        sha256 = "0hqssd5wzir6rxn46q8r3hdp3nl7v5m7w322j39120xpg2bhiphh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring directory extensible-exceptions filepath
          hslogger mtl network old-locale old-time parsec process random
          template-haskell time unix unix-compat
@@ -60531,7 +62040,7 @@ self: {
        pname = "happstack-yui";
        version = "7373.5.3";
        sha256 = "178r3jqxmrdp0glp9p4baw8x7zk0w8j4m5l173rjnz9yxn53nyni";
-       buildDepends = [
+       libraryHaskellDepends = [
          base boomerang bytestring containers directory happstack-jmacro
          happstack-server hsp interpolatedstring-perl6 jmacro mtl pretty
          template-haskell text web-routes web-routes-boomerang
@@ -60545,22 +62054,21 @@ self: {
      }) {};
 
   "happy" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, perl, process }:
+    ({ mkDerivation, array, base, containers, mtl, process }:
      mkDerivation {
        pname = "happy";
        version = "1.19.5";
-       revision = "1";
        sha256 = "1nj353q4z1g186fpjzf0dnsg71qhxqpamx8jy89rjjvv3p0kmw32";
+       revision = "1";
        editedCabalFile = "d6a01f50aab2c480799b7d19643c5bb01891e01ac97aa892ffec3e6029a1446c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers mtl ];
-       testDepends = [ base process ];
-       buildTools = [ perl ];
+       executableHaskellDepends = [ array base containers mtl ];
+       testHaskellDepends = [ base process ];
        homepage = "http://www.haskell.org/happy/";
        description = "Happy is a parser generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) perl;};
+     }) {};
 
   "happy-meta" = callPackage
     ({ mkDerivation, array, base, containers, happy, haskell-src-meta
@@ -60570,13 +62078,12 @@ self: {
        pname = "happy-meta";
        version = "0.2.0.8";
        sha256 = "0hnj039vspqvym70c59y80ygb8ciz5bf18sqm0dbvzr5v2mixbag";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers haskell-src-meta mtl template-haskell
        ];
-       buildTools = [ happy ];
+       libraryToolDepends = [ happy ];
        description = "Quasi-quoter for Happy parsers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happybara" = callPackage
@@ -60587,7 +62094,7 @@ self: {
        pname = "happybara";
        version = "0.0.1";
        sha256 = "1lp2awvj077d16gppir6nv9fx6d9g1k7w6j01bxkffy3q5x04xrv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base filepath http-types lifted-base monad-control mtl text
          time transformers transformers-base
        ];
@@ -60608,7 +62115,7 @@ self: {
        pname = "happybara-webkit";
        version = "0.0.1";
        sha256 = "17446wkyljwd7nq6mhsj2v411zb9wsz833sczm4nzcigywvhx4fw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring case-insensitive data-default directory
          filepath happybara http-types lifted-base monad-control mtl network
          process text time transformers transformers-base vector word8
@@ -60626,7 +62133,7 @@ self: {
        pname = "happybara-webkit-server";
        version = "0.0.1";
        sha256 = "0vh9ig9mvg12qgysk7gbqwiib3m2ciwi10asb1i0x25xjp585shi";
-       buildDepends = [ base directory filepath process ];
+       libraryHaskellDepends = [ base directory filepath process ];
        jailbreak = true;
        homepage = "https://github.com/cstrahan/happybara/happybara-webkit-server";
        description = "WebKit Server binary for Happybara (taken from capybara-webkit)";
@@ -60641,7 +62148,9 @@ self: {
        pname = "har";
        version = "0.1.1.0";
        sha256 = "0x51sqlybfq2pqv6nrhvf50yds3gs08sfih7zi9ijvn5dkrxx1z3";
-       buildDepends = [ aeson base bytestring directory filepath text ];
+       libraryHaskellDepends = [
+         aeson base bytestring directory filepath text
+       ];
        jailbreak = true;
        homepage = "https://github.com/freizl/har";
        description = "HAR spec in Haskell";
@@ -60658,8 +62167,10 @@ self: {
        sha256 = "10485indn9sszq3514gs547phb0kpikm8m6ykq1ns2kp0pmkgz9m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary network parsec unix zlib ];
-       extraLibraries = [ openssl sqlite ];
+       executableHaskellDepends = [
+         base binary network parsec unix zlib
+       ];
+       executableSystemDepends = [ openssl sqlite ];
        homepage = "http://www.davidb.org/darcs/harchive/";
        description = "Networked content addressed backup and restore software";
        license = "GPL";
@@ -60676,7 +62187,7 @@ self: {
        sha256 = "1wxwxx3l4zvb1jr19lckamb0gxywsq1f4n4ncb373vqdnwnrr8x4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath haskell98 mtl old-locale
          old-time regex-pcre
        ];
@@ -60694,10 +62205,10 @@ self: {
        pname = "haroonga";
        version = "0.1.7.1";
        sha256 = "0j4668611qazzwb4w05v0xliw1w0a7kmlz0g2z9ixz0kywbfim2g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL monad-control resourcet transformers
        ];
-       pkgconfigDepends = [ groonga ];
+       libraryPkgconfigDepends = [ groonga ];
        description = "Low level bindings for Groonga";
        license = stdenv.lib.licenses.lgpl21;
      }) { groonga = null;};
@@ -60712,7 +62223,7 @@ self: {
        sha256 = "1745b7khz1dn7n9w3z89na01jap62vbg1mb6c7i9n2mgwkkrys5g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory haroonga http-types old-locale optparse-applicative
          scotty text time transformers wai-extra
        ];
@@ -60726,7 +62237,7 @@ self: {
        pname = "harp";
        version = "0.4.1";
        sha256 = "0q9q3rw9yqkryjf5vvm41ckycqjfaxnsrmc1p0kmdrlb4f4dgclz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/seereason/harp";
        description = "HaRP allows pattern-matching with regular expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -60740,14 +62251,13 @@ self: {
        pname = "harpy";
        version = "0.6.0.2";
        sha256 = "1rlbakwqfjfr3d71jc6d5nyw5ms0y9wmb79p8jax45rxk1a8cfry";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers disassembler mtl parsec pretty
          template-haskell
        ];
        homepage = "https://github.com/mgrabmueller/harpy";
        description = "Runtime code generation for x86 machine code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "has" = callPackage
@@ -60758,7 +62268,7 @@ self: {
        sha256 = "0zydwhr2ac66knmrlf0b9vsys61w6370g9rid2gag2dvmy7xqp2s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        homepage = "http://github.com/nonowarn/has";
        description = "Entity based records";
        license = stdenv.lib.licenses.bsd3;
@@ -60771,7 +62281,7 @@ self: {
        pname = "has-th";
        version = "0.1";
        sha256 = "0yyrfd8mgxwyfgwcg61q7yj2cq2zj6zlk1l340y4vzj71r53qgc4";
-       buildDepends = [ base has template-haskell ];
+       libraryHaskellDepends = [ base has template-haskell ];
        homepage = "http://github.com/chrisdone/has-th";
        description = "Template Haskell function for Has records";
        license = stdenv.lib.licenses.bsd3;
@@ -60786,8 +62296,9 @@ self: {
        sha256 = "1nq383fg2cn82rbmnp6kgzyk42fgp9xnqj84ypz0kf42954n4h1l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base numbers ];
-       testDepends = [ HUnit ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base numbers ];
+       testHaskellDepends = [ HUnit ];
        homepage = "http://darcsden.com/mekeor/hascal";
        description = "A minimalistic but extensible and precise calculator";
        license = "GPL";
@@ -60804,7 +62315,7 @@ self: {
        sha256 = "04z9q3l2hwf7lii8d3cxbh7zh6cqbbmy07yv5bal4lvrnd1wqia7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring hascat-lib hascat-setup hascat-system HaXml haxr
          html HTTP network unix
        ];
@@ -60823,7 +62334,7 @@ self: {
        pname = "hascat-lib";
        version = "0.2";
        sha256 = "0l2cixgnyv2xhbpvkzrrn1wxikx7gcmwpkwagkfzx27iy33xkrqj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory haskell98 HaXml html HTTP mtl
          network old-locale old-time parsec plugins xhtml
        ];
@@ -60843,7 +62354,10 @@ self: {
        sha256 = "058abyr70yr2130nbi64zhigglw207dh5anyxzw19c1qk4zmwsyi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory hascat-lib hascat-system haskell98 plugins
+       ];
+       executableHaskellDepends = [
          base directory hascat-lib hascat-system haskell98 plugins
        ];
        description = "Hascat Installation helper";
@@ -60859,7 +62373,7 @@ self: {
        pname = "hascat-system";
        version = "0.2";
        sha256 = "1fabn71llrlxs5xlcpzkkvzjv7zibxlna0jvh6rkrz6pqyp1nd94";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers hascat-lib HaXml HTTP mtl network
          old-time parsec plugins unix
        ];
@@ -60878,11 +62392,11 @@ self: {
        pname = "hash";
        version = "0.2.0.1";
        sha256 = "1ka6izpkz6gs4ag3xvnslxywi9344w3mh9rl968vq6ck203pv2rx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring data-default generic-deriving hashable
          lens transformers
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/analytics/hash/";
        description = "Hashing tools";
@@ -60899,8 +62413,10 @@ self: {
        pname = "hashable";
        version = "1.2.3.3";
        sha256 = "0kp4aj0x1iicz9qirpqxxqd8x5g1njbapxk1d90n406w3xykz4pw";
-       buildDepends = [ base bytestring ghc-prim integer-gmp text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring ghc-prim integer-gmp text
+       ];
+       testHaskellDepends = [
          base bytestring ghc-prim HUnit QuickCheck random test-framework
          test-framework-hunit test-framework-quickcheck2 text unix
        ];
@@ -60917,10 +62433,10 @@ self: {
        pname = "hashable-extras";
        version = "0.2.2";
        sha256 = "118l23n78xs1faa0q42h996q210l2p9mzl85a73krljzsz8wkc1b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring hashable transformers
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/analytics/hashable-extras/";
        description = "Higher-rank Hashable";
        license = stdenv.lib.licenses.bsd3;
@@ -60934,8 +62450,8 @@ self: {
        pname = "hashable-generics";
        version = "1.1.8";
        sha256 = "1l5i4lasz32hsjvm9fbf7p9fy7s6bjy868w7rmpxci40qkz7ffhq";
-       buildDepends = [ base ghc-prim hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base ghc-prim hashable ];
+       testHaskellDepends = [
          base ghc-prim hashable QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -60952,7 +62468,7 @@ self: {
        pname = "hashable-time";
        version = "0.1.0.1";
        sha256 = "1137cc7jyyn293g3nx9bs4mw4r8i7k9cq0rz5f5rs7j8997gkmbf";
-       buildDepends = [ base hashable time ];
+       libraryHaskellDepends = [ base hashable time ];
        description = "Hashable instances for Data.Time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -60965,7 +62481,7 @@ self: {
        pname = "hashabler";
        version = "0.1.0.2";
        sha256 = "0n3cw5vc48144kddz0krcm682bcigdafap81kdkvhq8alhc50532";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring ghc-prim integer-gmp primitive
          template-haskell text
        ];
@@ -60984,7 +62500,7 @@ self: {
        sha256 = "0s8mnayxlvwrrii2l63b372yi5g08br6gpbgz2256d8y128mwjvk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dataenc directory
          extensible-exceptions filepath mmap mtl zlib
        ];
@@ -60999,11 +62515,10 @@ self: {
        pname = "hashids";
        version = "1.0.2.1";
        sha256 = "03q0fcxiw4yncmbdirnh6kaz9jhyxqy348dnrvgkbn4mzkh8fi2z";
-       buildDepends = [ base bytestring containers split ];
+       libraryHaskellDepends = [ base bytestring containers split ];
        homepage = "http://hashids.org/";
        description = "Hashids generates short, unique, non-sequential ids from numbers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashmap" = callPackage
@@ -61012,7 +62527,7 @@ self: {
        pname = "hashmap";
        version = "1.3.0.1";
        sha256 = "16scl1rbq0f18mggrj4lbhgkz7kzshsw9a523rjd8cjkdjz1ijwr";
-       buildDepends = [ base containers deepseq hashable ];
+       libraryHaskellDepends = [ base containers deepseq hashable ];
        homepage = "http://git.auryn.cz/haskell/hashmap/";
        description = "Persistent containers Map and Set based on hashing";
        license = stdenv.lib.licenses.bsd3;
@@ -61026,8 +62541,8 @@ self: {
        pname = "hashring";
        version = "0.0.0";
        sha256 = "05q9iay0ygr79x8yikgbi99v74kagyrd68zvjx8qakfzqgs9a19j";
-       buildDepends = [ base containers hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers hashable ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -61042,7 +62557,9 @@ self: {
        pname = "hashtables";
        version = "1.2.0.2";
        sha256 = "0dqq5ssgkqzplqf5dmc4l8cj28j5py7i6n6a069qn4cibvxfjaq1";
-       buildDepends = [ base ghc-prim hashable primitive vector ];
+       libraryHaskellDepends = [
+         base ghc-prim hashable primitive vector
+       ];
        homepage = "http://github.com/gregorycollins/hashtables";
        description = "Mutable hash tables in the ST monad";
        license = stdenv.lib.licenses.bsd3;
@@ -61055,7 +62572,9 @@ self: {
        pname = "hashtables-plus";
        version = "0.2.0";
        sha256 = "0g9jmc15g36iy0wmmsj74qwybh509j4lf8jzv3dws7c2j24kc7l7";
-       buildDepends = [ base hashable hashtables loch-th placeholders ];
+       libraryHaskellDepends = [
+         base hashable hashtables loch-th placeholders
+       ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/hashtables-plus";
        description = "Extensions for a \"hashtables\" library";
@@ -61068,7 +62587,7 @@ self: {
        pname = "hasim";
        version = "0.1.2";
        sha256 = "03wn142r0sh7adfghjqwb2mgq4rgkqs8nq2rx2jq717dr2xp987n";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://huygens.functor.nl/hasim/";
        description = "Process-Based Discrete Event Simulation library";
        license = stdenv.lib.licenses.bsd3;
@@ -61082,10 +62601,10 @@ self: {
      mkDerivation {
        pname = "hask";
        version = "0";
-       revision = "1";
        sha256 = "1c87jxafxpnlyblhdif4br61wqvnad0s6hvfhmzhx9y1jri3rb39";
+       revision = "1";
        editedCabalFile = "04abcba45a7fbaa11d7f3bd9834f1e70a30f356ae871e59ab472f20d4cd60026";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints ghc-prim reflection tagged transformers void
        ];
        homepage = "http://github.com/ekmett/hask";
@@ -61104,7 +62623,7 @@ self: {
        sha256 = "128hkd1yycjvbnvwjd2r2mxhjdnmfkghyf0fcslh9fxprqgrhk18";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal directory hmarkup hsemail network parsec process
          regex-compat xhtml
        ];
@@ -61124,7 +62643,7 @@ self: {
        sha256 = "19cglzgzxbg65qr7m68gnc6y45b7n0wl98pgd9jrk20sblrhc6p6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers errors haskell-src text text-format
        ];
        homepage = "http://github.com/singpolyma/haskades";
@@ -61140,12 +62659,14 @@ self: {
        pname = "haskakafka";
        version = "1.0.0";
        sha256 = "0j1vii11lp91gydw3h0hb2b3lb85n9cji9m9rvb1d7svs91nhhk7";
-       buildDepends = [ base bytestring containers temporary unix ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers temporary unix
+       ];
+       librarySystemDepends = [ rdkafka ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
          base bytestring containers either-unwrap hspec regex-posix
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ rdkafka ];
        homepage = "http://github.com/cosbynator/haskakafka";
        description = "Kafka bindings for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -61161,7 +62682,7 @@ self: {
        sha256 = "1k2y406kjxyv3sdpa50m6i15z2aiysy43xhjgln99v21x6rp08ia";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base freenect hcwiid IfElse MissingH mtl SDL SDL-image SDL-mixer
          SDL-ttf transformers vector Yampa
        ];
@@ -61181,7 +62702,7 @@ self: {
        sha256 = "01l90qningjlb4wn02avjy9lmi4ry4yxzw0a9sd29qbzfpnf3viy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers cpphs directory her-lexer split
        ];
        description = "A dialect of haskell with order of execution based on dependency resolution";
@@ -61197,11 +62718,11 @@ self: {
        pname = "haskbot-core";
        version = "0.1";
        sha256 = "0alqjgg2gvb9610s2b4fil5frknn5j8d6r558bfp1n6a0d51pz74";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring connection containers http-conduit http-types
          monads-tf stm text wai warp
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring connection containers hspec http-conduit
          http-types monads-tf stm text wai warp
        ];
@@ -61224,7 +62745,7 @@ self: {
        sha256 = "0ncx9wx9ldynqwq0zwljwqzskm5mrq8rx74np43pm9qxvjc9f5vx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base base16-bytestring bytestring cereal conduit
          conduit-combinators conduit-extra containers crypto-api
          crypto-conduit cryptohash cryptohash-cryptoapi directory filepath
@@ -61235,7 +62756,6 @@ self: {
        homepage = "https://github.com/maurotrb/haskdeep";
        description = "Computes and audits file hashes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskdogs" = callPackage
@@ -61246,7 +62766,7 @@ self: {
        sha256 = "0vl3c66ki9j9ncs2rapdn80kbfk0l3y97qwfraqlnjycdl10sm6r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal filepath HSH ];
+       executableHaskellDepends = [ base Cabal filepath HSH ];
        homepage = "http://github.com/ierton/haskdogs";
        description = "Generate ctags file for haskell project directory and it's deps";
        license = stdenv.lib.licenses.bsd3;
@@ -61262,7 +62782,7 @@ self: {
        sha256 = "0fmglaiq2axpb9f4yyk53fpppc1ysqglqgjxhy78yl3r8mik836n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory haskeline haskell98 mtl network old-time
          parsec process random unix
        ];
@@ -61274,17 +62794,17 @@ self: {
 
   "haskeline_0_7_2_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , terminfo, transformers, unix, utf8-string
+     , terminfo, transformers, unix
      }:
      mkDerivation {
        pname = "haskeline";
        version = "0.7.2.1";
        sha256 = "09v4vy6nf23b13ws9whdqwv84mj1nhnla88rw2939qyqxb4a6mmf";
-       buildDepends = [
-         base bytestring containers directory filepath terminfo transformers
-         unix utf8-string
-       ];
        configureFlags = [ "-fterminfo" ];
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath terminfo transformers
+         unix
+       ];
        homepage = "http://trac.haskell.org/haskeline";
        description = "A command-line interface for user input, written in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -61296,7 +62816,7 @@ self: {
        pname = "haskeline-class";
        version = "0.6.2";
        sha256 = "0xgdq2xgw2ccyfzkj5n36s5n6km5l947d2iy4y1qms8kbc05zmfl";
-       buildDepends = [ base haskeline mtl ];
+       libraryHaskellDepends = [ base haskeline mtl ];
        jailbreak = true;
        homepage = "http://community.haskell.org/~aslatter/code/haskeline-class";
        description = "Class interface for working with Haskeline";
@@ -61315,7 +62835,7 @@ self: {
        pname = "haskell-aliyun";
        version = "0.1.0.0";
        sha256 = "1id1l7arf3yq9mym6ds58k5wins57k71v8fgzyhxsg81657vh74a";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring basic-prelude blaze-builder bytestring
          case-insensitive conduit Crypto data-default http-conduit
          http-types lifted-base monad-control old-locale resourcet safe
@@ -61340,12 +62860,15 @@ self: {
        sha256 = "0s6vzfsqh2wwsp98l8zpg6cvh7jwz5wha44idz3yavhmy6z08zgd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers stringsearch
+       ];
+       executableHaskellDepends = [
          base bytestring containers directory easy-file exceptions filepath
          haskell-src-exts hint mtl network process stringsearch time
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers directory doctest easy-file exceptions
          filepath haskell-src-exts hint hspec HUnit mtl network process
          stringsearch temporary test-framework test-framework-hunit time
@@ -61362,7 +62885,7 @@ self: {
        pname = "haskell-bcrypt";
        version = "0.3.1";
        sha256 = "1w8crppmm02qw03n59s7dnqfhmqwmd44sj8qm38bf90fabl1wa7d";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://www.github.com/zbskii/haskell-bcrypt";
        description = "A bcrypt implementation for haskell";
        license = stdenv.lib.licenses.mit;
@@ -61379,8 +62902,9 @@ self: {
        sha256 = "12yhnlcif0jj9pmi3a098f1swvnww45rg2rpn6g82bkjzmd4sjr8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring mtl parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring mtl parsec ];
+       executableHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring mtl QuickCheck tasty tasty-quickcheck tasty-th
        ];
        jailbreak = true;
@@ -61400,10 +62924,11 @@ self: {
        sha256 = "0x1kjdxbayq6z85w9fw6c4mpixzl60332wxgx4nh0ih9235jfdhd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base bytestring containers directory extensible-exceptions
-         ghc-prim HSH HUnit MissingH mtl process random time unix
+       libraryHaskellDepends = [
+         array base bytestring containers extensible-exceptions ghc-prim HSH
+         HUnit MissingH mtl random time unix
        ];
+       executableHaskellDepends = [ base directory process ];
        homepage = "http://software.intel.com/en-us/articles/intel-concurrent-collections-for-cc/";
        description = "Library for parallel programming in the Intel Concurrent Collections paradigm";
        license = stdenv.lib.licenses.bsd3;
@@ -61416,7 +62941,7 @@ self: {
        pname = "haskell-coffee";
        version = "0.1.0.2";
        sha256 = "1iz94kyq1xn3v89aay282qglv2sh41b04p8vaygwm22v1g4b4kk7";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        description = "Simple CoffeeScript API";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -61430,7 +62955,12 @@ self: {
        sha256 = "0d0rfkl6ladsl0s033ny390nk5qkiwddg84di0d8hgxblqsxj11m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bimap boolean-list bytestring containers ];
+       libraryHaskellDepends = [
+         base bimap boolean-list bytestring containers
+       ];
+       executableHaskellDepends = [
+         base bimap boolean-list bytestring containers
+       ];
        homepage = "codekinder.com";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61441,7 +62971,7 @@ self: {
        pname = "haskell-course-preludes";
        version = "0.0.0.4";
        sha256 = "1r0vhaxcsszrcqnw70gz8xpfrqddmxf9kpka63gix1bjic4alzjn";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        jailbreak = true;
        description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality";
        license = stdenv.lib.licenses.mit;
@@ -61459,12 +62989,14 @@ self: {
        sha256 = "09xagxs0br6781flp430syfn6yv36ri0y1yki8cakrn7ak722fq2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base16-bytestring bytestring Cabal containers cryptohash
          directory filepath ghc ghc-paths haddock-api monad-loops process
          text unordered-containers
        ];
-       testDepends = [ base ];
+       executableHaskellDepends = [ base ghc text ];
+       testHaskellDepends = [ base ];
+       jailbreak = true;
        homepage = "http://github.com/chrisdone/haskell-docs";
        description = "A program to find and display the docs and type of a name";
        license = stdenv.lib.licenses.bsd3;
@@ -61483,11 +63015,14 @@ self: {
        sha256 = "0mrcd57g3pnn11smgak51pikxxf5zsi7h06f270pmf2r1vv2977b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers directory filepath haskell-src-exts
-         optparse-applicative scientific text unordered-containers yaml
+       libraryHaskellDepends = [
+         base containers haskell-src-exts scientific text
+         unordered-containers yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base directory filepath optparse-applicative
+       ];
+       testHaskellDepends = [
          base containers directory-tree doctest filemanip filepath hlint
          tasty tasty-hunit
        ];
@@ -61510,7 +63045,12 @@ self: {
        sha256 = "0736kh5q63qgvq23k5w06ds9538cwymk64i5wdycxh35lz64qaip";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base basic-prelude bytestring case-insensitive conduit directory
+         lifted-base monad-control network network-conduit process-conduit
+         system-filepath text transformers transformers-base unix
+       ];
+       executableHaskellDepends = [
          base basic-prelude bytestring case-insensitive conduit directory
          lifted-base monad-control network network-conduit process-conduit
          system-filepath text transformers transformers-base unix
@@ -61530,10 +63070,10 @@ self: {
        pname = "haskell-generate";
        version = "0.2.3";
        sha256 = "07j0z9jxxgbxfxz9bpy5w8nphrqsl5wyq1jysfhypfi7v87nv9an";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src-exts template-haskell transformers
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/bennofs/haskell-generate/";
        description = "Typesafe generation of haskell source code";
        license = stdenv.lib.licenses.bsd3;
@@ -61547,7 +63087,7 @@ self: {
        sha256 = "1rcz5s3xa0f9yalyqb540l47bzql8p18y2mmax1zr92m7sh7m274";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HGL random ];
+       executableHaskellDepends = [ base HGL random ];
        homepage = "http://www.informatik.uni-bremen.de/~cxl/lehre/pi3.ws01/asteroids/";
        description = "'Asteroids' arcade games";
        license = stdenv.lib.licenses.bsd3;
@@ -61560,7 +63100,7 @@ self: {
        pname = "haskell-lexer";
        version = "1.0";
        sha256 = "11jv30msg4rym73lk6j21ky2510c3av8qxk5p4z63j4m283w9l46";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A fully compliant Haskell 98 lexer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61571,8 +63111,8 @@ self: {
        pname = "haskell-modbus";
        version = "0.3.2";
        sha256 = "08bcw7g84509rak9xqn2g4pr1mk3a2clikgfdiafrsr7lff16gyf";
-       buildDepends = [ array base bytestring cereal ];
-       testDepends = [ array base bytestring cereal hspec ];
+       libraryHaskellDepends = [ array base bytestring cereal ];
+       testHaskellDepends = [ array base bytestring cereal hspec ];
        homepage = "http://www.github.com/jhickner/haskell-modbus";
        description = "A cereal-based parser for the Modbus protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -61588,11 +63128,13 @@ self: {
        sha256 = "1aw8jjvysdf3vsf6rcxnvwnqpiqmfrp88gryngakjjkxwzzh5an0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal extensible-exceptions
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ open-pal open-rte openmpi ];
+       librarySystemDepends = [ open-pal open-rte openmpi ];
+       libraryToolDepends = [ c2hs ];
+       executableSystemDepends = [ open-pal open-rte openmpi ];
+       executableToolDepends = [ c2hs ];
        homepage = "http://github.com/bjpop/haskell-mpi";
        description = "Distributed parallel programming in Haskell using MPI";
        license = stdenv.lib.licenses.bsd3;
@@ -61609,12 +63151,12 @@ self: {
        pname = "haskell-names";
        version = "0.5.3";
        sha256 = "066mh4qgldh8nspinm97695zdhw5hkpz9mmrnc2a0y0wblggq5sm";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring Cabal containers data-lens-light filepath
          haskell-packages haskell-src-exts hse-cpp mtl tagged transformers
          traverse-with-class type-eq uniplate
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring Cabal containers filemanip filepath
          haskell-packages haskell-src-exts hse-cpp mtl pretty-show tagged
          tasty tasty-golden traverse-with-class uniplate utf8-string
@@ -61622,7 +63164,6 @@ self: {
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-neo4j-client" = callPackage
@@ -61637,13 +63178,13 @@ self: {
        pname = "haskell-neo4j-client";
        version = "0.3.1.4";
        sha256 = "171ar3vfhgijy79p0a4wqm0b8bisgqf8iqzm17yb5pwirlfm5hi6";
-       buildDepends = [
+       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
        ];
-       testDepends = [
+       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
@@ -61662,8 +63203,10 @@ self: {
        pname = "haskell-openflow";
        version = "0.0.0.1";
        sha256 = "1zrzkvw4i7jaz74g63k1yj1v2i9lsxgr8zj2b6p3srag1dwgnmkd";
-       buildDepends = [ base bytestring cereal network network-info ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [
+         base bytestring cereal network network-info
+       ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/brooksbp/haskell-openflow";
        description = "OpenFlow protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -61679,7 +63222,7 @@ self: {
        pname = "haskell-packages";
        version = "0.3";
        sha256 = "199srg8k8j2nirs83hx04r1hkwv83h4k73z1sji547f5w0zwnws0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring Cabal containers deepseq directory filepath
          haskell-src-exts hse-cpp mtl optparse-applicative tagged
          transformers transformers-compat
@@ -61700,7 +63243,7 @@ self: {
        sha256 = "11y3n7ldnlx8vq2qb42kn8fg6ikq42x28bm46ivydx7h3z0zf5s3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cairo containers directory filepath glib gtk
          old-locale poppler template-haskell time zlib
        ];
@@ -61726,7 +63269,7 @@ self: {
        sha256 = "0ki6mppxk9a6lm0miagr4mpsbjx66gizc3qxl5vfp7wvbc977bwk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring Cabal cgi containers deepseq directory
          extensible-exceptions fgl filepath ghc ghc-prim GLUT haskell-src
          haskell98 hpc html HTTP HUnit mtl network old-locale old-time
@@ -61734,7 +63277,7 @@ self: {
          regex-compat regex-posix stm syb template-haskell time unix xhtml
          zlib
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~dons/code/haskell-platform-test";
        description = "A test system for the Haskell Platform environment";
@@ -61750,7 +63293,7 @@ self: {
        pname = "haskell-plot";
        version = "0.1.0.0";
        sha256 = "0dwa2kz3sbnhc99kzhspf4hhid9q0c8irq8m9vr95l9kbq45avpi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Chart Chart-cairo Chart-gtk colour data-default lens
          math-functions vector
        ];
@@ -61766,8 +63309,8 @@ self: {
        pname = "haskell-qrencode";
        version = "1.0.4";
        sha256 = "1cq6fpz4vsx1kfnxnxnqz0pi5nzfg86s76vd0hcqvyqxnqbcd8hj";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ qrencode ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ qrencode ];
        homepage = "https://github.com/jamessanders/haskell-qrencode";
        description = "Haskell bindings for libqrencode";
        license = stdenv.lib.licenses.bsd3;
@@ -61781,7 +63324,7 @@ self: {
        pname = "haskell-reflect";
        version = "0.9";
        sha256 = "116vs8p9j0py3rxh0m53nanwsa99ga0lg9z3avn5r0clmpak9zyn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hint MonadCatchIO-mtl mtl parsec template-haskell
          transformers
        ];
@@ -61796,7 +63339,7 @@ self: {
        pname = "haskell-rules";
        version = "0.1.0.1";
        sha256 = "03d8c1gnxd923f3fqqw06w3ibnd20llfgd7s5jgkscc872i5ghz6";
-       buildDepends = [ base syb ];
+       libraryHaskellDepends = [ base syb ];
        description = "A DSL for expressing natural deduction rules in Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61810,7 +63353,7 @@ self: {
        pname = "haskell-spacegoo";
        version = "0.2.0.1";
        sha256 = "0g6ximrv5jwibklkyr74vy3qkx8mv4xbpc7f6w1qg9gnlylzmcqy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra mtl pretty pretty-show
          text vector vector-space
        ];
@@ -61824,8 +63367,8 @@ self: {
        pname = "haskell-src";
        version = "1.0.2.0";
        sha256 = "19lilhpwnjb7cks9fq1ipnc8f7dwxy0ri3dgjkdxs3i355byw99a";
-       buildDepends = [ array base pretty syb ];
-       buildTools = [ happy ];
+       libraryHaskellDepends = [ array base pretty syb ];
+       libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61839,12 +63382,12 @@ self: {
        pname = "haskell-src-exts";
        version = "1.15.0.1";
        sha256 = "0xp5i06c478vn5m504ax5dfa7p5zc0kflbdkm2ijdzc779lpbx45";
-       buildDepends = [ array base cpphs ghc-prim pretty ];
-       testDepends = [
+       libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
+       libraryToolDepends = [ happy ];
+       testHaskellDepends = [
          base containers directory filemanip filepath mtl smallcheck syb
          tasty tasty-golden tasty-smallcheck
        ];
-       buildTools = [ happy ];
        homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
@@ -61859,12 +63402,12 @@ self: {
        pname = "haskell-src-exts";
        version = "1.16.0.1";
        sha256 = "1h8gjw5g92rvvzadqzpscg73x7ajvs1wlphrh27afim3scdd8frz";
-       buildDepends = [ array base cpphs ghc-prim pretty ];
-       testDepends = [
+       libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
+       libraryToolDepends = [ happy ];
+       testHaskellDepends = [
          base containers directory filepath mtl smallcheck syb tasty
          tasty-golden tasty-smallcheck
        ];
-       buildTools = [ happy ];
        homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
@@ -61878,7 +63421,7 @@ self: {
        pname = "haskell-src-exts-qq";
        version = "0.6.1";
        sha256 = "0cblv8fk369236szwzwmyaxaa8fkwia5r50zz5ghfbglb2xvwsmn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts haskell-src-meta syb template-haskell
        ];
        description = "A quasiquoter for haskell-src-exts";
@@ -61887,15 +63430,14 @@ self: {
 
   "haskell-src-meta" = callPackage
     ({ mkDerivation, base, haskell-src-exts, pretty, syb
-     , template-haskell, th-orphans, uniplate
+     , template-haskell, th-orphans
      }:
      mkDerivation {
        pname = "haskell-src-meta";
        version = "0.6.0.10";
        sha256 = "0flcyimibz4flq66isshn2zsmzlly6sja6gfb0a0xn4ns4xpwpy1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts pretty syb template-haskell th-orphans
-         uniplate
        ];
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
@@ -61909,7 +63451,7 @@ self: {
        pname = "haskell-src-meta-mwotton";
        version = "0.1.0";
        sha256 = "04f0p3jxmvw1kqygvxihdr4dirapi6bdv2w213c2s771xbnx88nn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim haskell-src-exts pretty syb
          template-haskell
        ];
@@ -61929,11 +63471,11 @@ self: {
        pname = "haskell-token-utils";
        version = "0.0.0.6";
        sha256 = "14nzlw9vqnp70xcwan6mjsr318p2sky5nsyqxw5iivggy7qspp9r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dual-tree ghc ghc-paths ghc-syb-utils
          haskell-src-exts monoid-extras mtl pretty rosezipper semigroups syb
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers Diff directory dual-tree ghc ghc-mod ghc-paths
          ghc-prim ghc-syb-utils haskell-src-exts hspec HUnit monoid-extras
          mtl pretty QuickCheck rosezipper semigroups syb uniplate
@@ -61950,7 +63492,9 @@ self: {
        pname = "haskell-type-exts";
        version = "0.1.0";
        sha256 = "051lsg9j3dgkr2akannfaddawdhybvsnm6x6xafmdmwn31v73z98";
-       buildDepends = [ base containers haskell-src-exts pretty ];
+       libraryHaskellDepends = [
+         base containers haskell-src-exts pretty
+       ];
        homepage = "http://code.haskell.org/haskell-type-exts";
        description = "A type checker for Haskell/haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
@@ -61963,7 +63507,7 @@ self: {
        pname = "haskell-typescript";
        version = "0.1.0.0";
        sha256 = "0fv533nac6dlawgffr1kvn4xpv63hdcb4wgyqbbg2s6dg9a2hw38";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        jailbreak = true;
        description = "Simple TypeScript API";
        license = stdenv.lib.licenses.gpl3;
@@ -61975,7 +63519,7 @@ self: {
        pname = "haskell-tyrant";
        version = "0.4";
        sha256 = "1pqh1v0klpi8iq882l5gk0fsf87kabq6rw1wjwkiq6fvw8cc1l97";
-       buildDepends = [ base binary bytestring network ];
+       libraryHaskellDepends = [ base binary bytestring network ];
        homepage = "https://github.com/PeterScott/haskell-tyrant";
        description = "Haskell implementation of the Tokyo Tyrant binary protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -61992,7 +63536,7 @@ self: {
        sha256 = "0nd8xjlyr8zjrqj9mw6xpn3rxsj9vpb8khc6hq6dc5agmldl9z7a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers directory filepath process
        ];
        homepage = "http://haskell.org/haskellwiki/Gentoo#haskell-updater";
@@ -62010,7 +63554,7 @@ self: {
        sha256 = "1z4x4mn0vry8mwq6ily668ignmf4s9m92fmga15dr83y7aq5wd59";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base HaXml html mtl network polyparse pretty random
          regex-compat stm utf8-string
        ];
@@ -62026,7 +63570,7 @@ self: {
        pname = "haskell2010";
        version = "1.1.2.0";
        sha256 = "1s0avb08b5iwaym42jz783mk1az9kmjf3zmhfag0kzdw10qcnz4m";
-       buildDepends = [ array base ghc-prim ];
+       libraryHaskellDepends = [ array base ghc-prim ];
        jailbreak = true;
        homepage = "http://www.haskell.org/onlinereport/haskell2010/";
        description = "Compatibility with Haskell 2010";
@@ -62042,7 +63586,7 @@ self: {
        pname = "haskell98";
        version = "2.0.0.3";
        sha256 = "1450bgkn7gasj6cmkxn4afs828fc9slrrp2lqsqs3jlryr94cpdx";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base directory old-locale old-time process time
        ];
        jailbreak = true;
@@ -62060,7 +63604,7 @@ self: {
        pname = "haskell98libraries";
        version = "2.0.0.2";
        sha256 = "1dcjwkvggvwrs8lv2pcxcz2kcz179nbca9q16mbk90qnznysr8i8";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base directory old-locale old-time process time
        ];
        jailbreak = true;
@@ -62077,7 +63621,7 @@ self: {
        pname = "haskelldb";
        version = "2.2.4";
        sha256 = "0f8c9bz25wzsc65czv0chxk93w947824axl7p821fljlrykcm45y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory mtl old-locale old-time pretty time
        ];
        homepage = "https://github.com/m4dc4p/haskelldb";
@@ -62091,7 +63635,7 @@ self: {
        pname = "haskelldb-connect-hdbc";
        version = "0.1.0.0";
        sha256 = "1l9ifff33xbgdr6fahnzz00nb7va2r0i3pncjd1j8bbnyya1w2kl";
-       buildDepends = [ base containers haskelldb HDBC ];
+       libraryHaskellDepends = [ base containers haskelldb HDBC ];
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HDBC session for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
@@ -62106,7 +63650,7 @@ self: {
        pname = "haskelldb-connect-hdbc-catchio-mtl";
        version = "0.1.0.0";
        sha256 = "1ssg96r7cphakis5c494m5lc3m5ksn1w03k554p0qx2kl1g885xw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-connect-hdbc HDBC MonadCatchIO-mtl mtl
        ];
        homepage = "http://twitter.com/khibino";
@@ -62123,7 +63667,7 @@ self: {
        pname = "haskelldb-connect-hdbc-catchio-tf";
        version = "0.1.0.0";
        sha256 = "16qab88ryli9jbinw9frhhzl0ph09dinzx40x9cr9a3db7wvphw4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-connect-hdbc HDBC
          MonadCatchIO-transformers transformers
        ];
@@ -62141,7 +63685,7 @@ self: {
        pname = "haskelldb-connect-hdbc-catchio-transformers";
        version = "0.1.0.0";
        sha256 = "0hbb6klc4azz6f5wi39l5736xq0b7wgja35fk9vmmn0lnf6iv5j7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-connect-hdbc HDBC
          MonadCatchIO-transformers transformers
        ];
@@ -62159,7 +63703,7 @@ self: {
        pname = "haskelldb-connect-hdbc-lifted";
        version = "0.1.0.0";
        sha256 = "1ysnha7bmrd3accrnbswr17nv6j4pj1mbshcphjkhdffcvxb82wa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-connect-hdbc HDBC lifted-base
          monad-control transformers-base
        ];
@@ -62177,7 +63721,8 @@ self: {
        sha256 = "0wdiywxjara2fwb1d548f9s0vcjxm1c38v4s05xqm5bz141l7a6a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskell98 haskelldb mtl plugins ];
+       libraryHaskellDepends = [ base haskell98 haskelldb mtl plugins ];
+       executableHaskellDepends = [ haskelldb ];
        jailbreak = true;
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the dynamically loaded drivers";
@@ -62195,7 +63740,7 @@ self: {
        sha256 = "0f75am17zfpbxhg951gnjqmdfgi1q7byhw1xv1rz4k36kcg623x1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory haskelldb mtl old-time
        ];
        jailbreak = true;
@@ -62212,7 +63757,7 @@ self: {
        pname = "haskelldb-hdbc";
        version = "2.2.2";
        sha256 = "06vzzya6k1l74bm5ky7cbn6ch1wx5j5phnhi49bw17y3q632vd3f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers convertible haskelldb HDBC mtl old-time
        ];
        homepage = "https://github.com/m4dc4p/haskelldb";
@@ -62231,7 +63776,7 @@ self: {
        sha256 = "0nn8jjrsi62xqws00izh3qi2shlxa58l37q91x1xnd9fig7j0ai2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hdbc HDBC HDBC-mysql mtl
        ];
        jailbreak = true;
@@ -62250,7 +63795,7 @@ self: {
        sha256 = "1y87iiil6k9ycsni70kvfcq50fiws8aqnhmk4018f6k6q1bx7q6p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hdbc HDBC HDBC-odbc mtl
        ];
        homepage = "https://github.com/m4dc4p/haskelldb";
@@ -62269,10 +63814,10 @@ self: {
        sha256 = "08cv3y22zvf0pf1cs57vrma3vp3b5fzzs6nsnvcnfnzsvacanh7g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hdbc HDBC HDBC-postgresql mtl
        ];
-       extraLibraries = [ postgresql ];
+       executableSystemDepends = [ postgresql ];
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HDBC PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
@@ -62289,7 +63834,7 @@ self: {
        sha256 = "0qdp2lzhk8ywb9pmppvvmwqkaagvrnyjiglahy6mb7rdfq89bas6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hdbc HDBC HDBC-sqlite3 mtl
        ];
        homepage = "https://github.com/m4dc4p/haskelldb";
@@ -62304,7 +63849,7 @@ self: {
        pname = "haskelldb-hsql";
        version = "1.0.0";
        sha256 = "0j1aqix21pqcsw7skl897pd1ir6hg836g4zb2h5338h4gih6blx0";
-       buildDepends = [ base haskelldb hsql mtl old-time ];
+       libraryHaskellDepends = [ base haskelldb hsql mtl old-time ];
        jailbreak = true;
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for HSQL";
@@ -62322,7 +63867,7 @@ self: {
        sha256 = "09rlrv9jb2hw7jypglfqhgfx3b0bcp68iq2wk4jfqw74m4d34xkm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-mysql mtl
        ];
        jailbreak = true;
@@ -62342,7 +63887,7 @@ self: {
        sha256 = "18r7b4x43729c9l34gvbhgw2fwgq7llcb6cfwcp077f9ia0kgn6a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-odbc mtl
        ];
        jailbreak = true;
@@ -62362,7 +63907,7 @@ self: {
        sha256 = "0j26gm9bibnj2jl5fs3sf2m8b5gl05brf55bzxnxa1cb78dgbpx9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-oracle mtl
        ];
        jailbreak = true;
@@ -62382,7 +63927,7 @@ self: {
        sha256 = "1d1vgw9q95h864gfv0n2gmdvnvkxjg4pdjmfpfj899xx1s0a0vsv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-postgresql mtl
        ];
        jailbreak = true;
@@ -62402,7 +63947,7 @@ self: {
        sha256 = "0hs8ympicys4p6lpfcvny3c183v4s25lk990yb4fzrpv0hy3bhhw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-sqlite mtl
        ];
        jailbreak = true;
@@ -62422,7 +63967,7 @@ self: {
        sha256 = "11xlr2f7203wxg17696yjqgyzckavqjazc9brmdqpbrnplaqdrc5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-sqlite3 mtl
        ];
        jailbreak = true;
@@ -62438,7 +63983,7 @@ self: {
        pname = "haskelldb-th";
        version = "2.1.0";
        sha256 = "12whvz0qy9lqk1frfl5px9lhr1nwy519vj2z9c3g8nqjzscwzayb";
-       buildDepends = [ base haskelldb mtl template-haskell ];
+       libraryHaskellDepends = [ base haskelldb mtl template-haskell ];
        jailbreak = true;
        homepage = "http://trac.haskell.org/haskelldb-th";
        description = "Template Haskell utilities for HaskellDB";
@@ -62467,11 +64012,11 @@ self: {
        pname = "haskellscrabble";
        version = "1.1";
        sha256 = "1wb9ncpzsacvwk8gmh8gzxm54viwlzsikj05lk14gpyp8xwhl54h";
-       buildDepends = [
+       libraryHaskellDepends = [
          array arrows base containers errors mtl parsec QuickCheck random
          safe semigroups split transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory filepath HUnit QuickCheck random
          semigroups test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -62492,7 +64037,7 @@ self: {
        sha256 = "0jrvvbpx35dhrwvknrxcwg1j1yi0mwzrnzrr2hsxja21drrqklf3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cryptohash directory either filepath mtl process text
        ];
        homepage = "http://github.com/seanparsons/haskellscript/";
@@ -62512,12 +64057,17 @@ self: {
        sha256 = "1bzp79fcq6gxy8pvspw4q71iakzvrbdwr3vjahd698ymfbj5ji8y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary containers directory haskell-src-exts
          haskell-src-meta mtl parsec pretty split template-haskell temporary
          text th-desugar unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base binary containers directory haskell-src-exts
+         haskell-src-meta mtl parsec pretty split template-haskell temporary
+         text th-desugar unordered-containers vector
+       ];
+       testHaskellDepends = [
          aeson base binary containers directory Elm haskell-src-exts
          haskell-src-meta mtl parsec pretty shakespeare split
          template-haskell temporary text th-desugar unordered-containers
@@ -62535,7 +64085,7 @@ self: {
        pname = "haskgame";
        version = "0.0.6";
        sha256 = "061dhk7d9d8mnb1rs7077q383sqlby8s31ips8jjadkkhyxi5lvz";
-       buildDepends = [ base containers haskell98 SDL SDL-ttf ];
+       libraryHaskellDepends = [ base containers haskell98 SDL SDL-ttf ];
        homepage = "http://haskell.org/haskellwiki/HaskGame";
        description = "Haskell game library";
        license = stdenv.lib.licenses.bsd3;
@@ -62550,7 +64100,7 @@ self: {
        pname = "haskheap";
        version = "0.1.2";
        sha256 = "1c2fgqq2i3s2v0xi04y8y6li41ilvi50zlf2ba843my9s3i8njqr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types network old-locale
          text time unordered-containers
        ];
@@ -62570,7 +64120,7 @@ self: {
        pname = "haskhol-core";
        version = "1.1.0";
        sha256 = "0vlzybbplqggvgnj61yl0g2rak2qbsp7hly9srgr6wd6qm9l1nxx";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state base containers deepseq filepath ghc-prim hashable mtl
          parsec pretty safecopy shelly template-haskell text text-show
          th-lift unordered-containers
@@ -62593,10 +64143,11 @@ self: {
        sha256 = "0gbsr3b832rb3gk6gx3s1lrjpv4kqcf62cz3wgjj5riscq1vg73k";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory filepath
          haskell-src-exts HaTeX hint parsec process text transformers
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://daniel-diaz.github.io/projects/haskintex";
        description = "Haskell Evaluation inside of LaTeX code";
        license = stdenv.lib.licenses.bsd3;
@@ -62610,7 +64161,7 @@ self: {
        pname = "haskmon";
        version = "0.1.1.0";
        sha256 = "1xsp0jd7n5rbky4giy3dik2hcsnkzwlj2mdr8v3ahr17cqj3sm74";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers http-streams io-streams old-locale
          time vector
        ];
@@ -62630,11 +64181,11 @@ self: {
        pname = "haskoin";
        version = "0.1.0.2";
        sha256 = "0l3h2wvi56k0dcfjambqyjrd45hb7bj0brp8nzrrcfn7fbpyjg8c";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary byteable bytestring containers cryptohash deepseq
          either json-rpc mtl pbkdf split text
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async base binary byteable bytestring containers cryptohash
          deepseq either HUnit json-rpc mtl pbkdf QuickCheck split
          test-framework test-framework-hunit test-framework-quickcheck2 text
@@ -62655,11 +64206,11 @@ self: {
        pname = "haskoin-crypto";
        version = "0.0.1.1";
        sha256 = "00argpj3qkaj8dcxbd46xsi1abjgr394li6ygyvna55508r1hd79";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary byteable bytestring containers cryptohash haskoin-util
          mtl QuickCheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary byteable bytestring containers cryptohash haskoin-util
          HUnit mtl QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -62680,10 +64231,10 @@ self: {
        pname = "haskoin-protocol";
        version = "0.0.1.1";
        sha256 = "0r15csyylg5vd95z0spl5wkv6r8w7lpi983alsvlnkhv4dqnrg2v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring haskoin-crypto haskoin-util QuickCheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring haskoin-crypto haskoin-util HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -62703,11 +64254,11 @@ self: {
        pname = "haskoin-script";
        version = "0.0.1";
        sha256 = "18lw5hxwvj4ichw1k4a35hjih7h0hd24khvl4m0yf2cq12m2gl11";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring haskoin-crypto haskoin-protocol haskoin-util
          mtl QuickCheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring haskoin-crypto haskoin-protocol haskoin-util
          HUnit mtl QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -62728,8 +64279,10 @@ self: {
        pname = "haskoin-util";
        version = "0.0.1.1";
        sha256 = "0hh3vavqsp8pafw4nrv9py1kqcc1yx52zr80xsqzqjlsxq04fgfw";
-       buildDepends = [ base binary bytestring either mtl QuickCheck ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring either mtl QuickCheck
+       ];
+       testHaskellDepends = [
          base binary bytestring containers either HUnit mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -62754,13 +64307,19 @@ self: {
        sha256 = "18q110q93qc00mqzprs5wprzrl0jfw5fjpli73n99knqb127aq5s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson aeson-pretty base binary bytestring conduit containers either
+         haskoin-crypto haskoin-protocol haskoin-script haskoin-util mtl
+         persistent persistent-sqlite persistent-template QuickCheck text
+         time unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [
          aeson aeson-pretty base binary bytestring conduit containers
          directory either haskoin-crypto haskoin-protocol haskoin-script
          haskoin-util mtl persistent persistent-sqlite persistent-template
-         QuickCheck text time unordered-containers vector yaml
+         text time unordered-containers vector yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-pretty base binary bytestring conduit containers either
          haskoin-crypto haskoin-protocol haskoin-script haskoin-util HUnit
          mtl persistent persistent-sqlite persistent-template QuickCheck
@@ -62783,7 +64342,7 @@ self: {
        pname = "haskoon";
        version = "0.3.1.1";
        sha256 = "1rf5w1mvpsiqim1h5hh6s2cxzh3c5gm1k3n6z4h2ryc1s7m2bl9l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cgi directory fastcgi filepath hslogger hsp hsx
          MaybeT MissingH mtl network regex-posix safe utf8-string
        ];
@@ -62800,7 +64359,7 @@ self: {
        pname = "haskoon-httpspec";
        version = "0.5.0.1";
        sha256 = "059hywia5fa15j2dpbzvnvjzv55bzgivy3ddxcrdskd85zx7lx6z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bidispec bytestring haskoon hslogger HTTP httpspec mtl network
        ];
        description = "Integrating HttpSpec with Haskoon";
@@ -62817,7 +64376,7 @@ self: {
        pname = "haskoon-salvia";
        version = "0.4.0.2";
        sha256 = "0d0s0zd9gr3xbssyk62l7w507prjnyak81czhnd6fgbfqx82d6hk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cgi fclabels haskoon hslogger HTTP monads-fd mtl
          network salvia salvia-protocol transformers
        ];
@@ -62837,7 +64396,7 @@ self: {
        sha256 = "0zvr7hwxnv01g626617yv7f0vwpmyqvlwbyc6yhb2mrlfqwdgbd0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers data-accessor event-list
          haskell-src markov-chain midi non-negative parsec process random
          transformers utility-ht
@@ -62857,7 +64416,7 @@ self: {
        pname = "haskore-realtime";
        version = "0.2";
        sha256 = "0fhlfivp44py93gjlqrp370cjkvi0g79p156vayylds128hgpi5f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-accessor directory event-list haskore midi
          non-negative old-time process transformers unix utility-ht
        ];
@@ -62879,7 +64438,7 @@ self: {
        sha256 = "04rzbk1v8ay569npd8i1xv3aqx55jn8p6cvqpi6774afaxvb0qxy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers data-accessor event-list haskore
          haskore-realtime hosc hsc3 non-negative opensoundcontrol-ht process
          random supercollider-ht transformers unix utility-ht
@@ -62902,7 +64461,7 @@ self: {
        sha256 = "0bdfn8s7gj39i3rr3xvi9xchi8zczqimb5gnkg0225m2zcfgvmy8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-accessor event-list haskore non-negative numeric-prelude
          random synthesizer-core utility-ht
        ];
@@ -62919,7 +64478,7 @@ self: {
        pname = "haskore-vintage";
        version = "0.2";
        sha256 = "1dpqs7xv3hvhla94v60q0fxfzgr4l3l69s7xc45rh712r9iws66n";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskore/";
        description = "The February 2000 version of Haskore";
        license = stdenv.lib.licenses.bsd3;
@@ -62936,9 +64495,10 @@ self: {
        sha256 = "1rpi9nrxizvzs7cxmykxvkbwd78144gwglk5f0rc19qyb0n80gr4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath json unix utf8-string
        ];
+       executableHaskellDepends = [ base directory filepath unix ];
        homepage = "http://github.com/MarcWeber/hasktags";
        description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -62952,7 +64512,8 @@ self: {
        sha256 = "0iizdi98w4k9kdizg9xwm2aca6mnn30frp15f8kyak3i194sk3kl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl old-time QuickCheck time wtk ];
+       libraryHaskellDepends = [ base mtl old-time wtk ];
+       executableHaskellDepends = [ mtl old-time QuickCheck time wtk ];
        description = "Loan calculator engine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62968,7 +64529,7 @@ self: {
        sha256 = "03avp9yn7ag1dc1wzk07sxkj3krqsrg3n44qcynxw9n1fmvk54lx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base convertible gtk haslo lenses mtl old-time QuickCheck time wtk
          wtk-gtk
        ];
@@ -62983,7 +64544,7 @@ self: {
        pname = "hasparql-client";
        version = "0.1";
        sha256 = "1ln0kdm40y6l8sncrjl0mj9bpd30ffg3msaxyd6fq520ypyws9pm";
-       buildDepends = [ base HTTP monads-fd network xml ];
+       libraryHaskellDepends = [ base HTTP monads-fd network xml ];
        homepage = "https://github.com/lhpaladin/HaSparql-Client";
        description = "This package enables to write SPARQL queries to remote endpoints";
        license = stdenv.lib.licenses.bsd3;
@@ -62996,8 +64557,8 @@ self: {
        pname = "haspell";
        version = "1.1.0";
        sha256 = "08ihdjgjvr8mgxxw62xwymj1lyl33r6w3mhy9chlw7ijcsy44y21";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ aspell ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ aspell ];
        homepage = "https://github.com/otters/haspell";
        description = "Haskell bindings to aspell";
        license = stdenv.lib.licenses.mit;
@@ -63013,12 +64574,12 @@ self: {
        pname = "hasql";
        version = "0.7.3.2";
        sha256 = "1hhqs4acq8g3331av1lm6l7mmd0sswym278wsn3i0p9khyafpkcm";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base-prelude either hasql-backend list-t mmorph
          monad-control mtl resource-pool template-haskell text transformers
          transformers-base vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base-prelude either hasql-backend hasql-postgres hspec
          monad-control mtl-prelude slave-thread text vector
        ];
@@ -63036,7 +64597,7 @@ self: {
        pname = "hasql-backend";
        version = "0.4.1.1";
        sha256 = "13llpvppkj2k6kfhmqyllm3m2h8g7lvm6gy8y2bnqq8y5jw9xdm5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude bytestring either free list-t text transformers vector
        ];
        homepage = "https://github.com/nikita-volkov/hasql-backend";
@@ -63056,13 +64617,13 @@ self: {
        pname = "hasql-postgres";
        version = "0.10.3.3";
        sha256 = "0xwc1r7jirscsn1f11s7hkhc5knzzhb5l6if7c5w4skfx0vla7rh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base-prelude bytestring either free hashable
          hashtables hasql-backend list-t loch-th mmorph placeholders
          postgresql-binary postgresql-libpq scientific template-haskell text
          time transformers uuid vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base-prelude bytestring directory doctest either
          filepath hashable hasql hasql-backend hspec list-t mtl-prelude
          old-locale postgresql-binary QuickCheck quickcheck-instances
@@ -63081,7 +64642,7 @@ self: {
        pname = "hasql-postgres-options";
        version = "0.1.4";
        sha256 = "19jsi8r63phyjcwgvbbs30idl944dnl0iw15i0q2d501sa51ksf4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude hasql-postgres optparse-applicative
        ];
        homepage = "https://github.com/nikita-volkov/hasql-postgres-options";
@@ -63097,16 +64658,22 @@ self: {
      mkDerivation {
        pname = "hastache";
        version = "0.6.1";
-       revision = "2";
        sha256 = "0r5l8k157pgvz1ck4lfid5x05f2s0nlmwf33f4fj09b1kmk8k3wc";
+       revision = "2";
        editedCabalFile = "92cea66e7c2d33e62c5caac8eaaf0e716fa6e2146ef906360db4d5f72cd30091";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers directory filepath ieee754
+         mtl syb text transformers
+       ];
+       executableHaskellDepends = [
          base blaze-builder bytestring containers directory filepath ieee754
          mtl process syb text transformers
        ];
-       testDepends = [ base bytestring directory HUnit mtl syb text ];
+       testHaskellDepends = [
+         base bytestring directory HUnit mtl syb text
+       ];
        homepage = "http://github.com/lymar/hastache";
        description = "Haskell implementation of Mustache templates";
        license = stdenv.lib.licenses.bsd3;
@@ -63120,7 +64687,7 @@ self: {
        pname = "hastache-aeson";
        version = "0.1.0.0";
        sha256 = "0b69ppgs0s8zjkrycz5iyd1wa92wr9wln3dvgzf736pbfhsgv2qi";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers hastache text
          unordered-containers vector
        ];
@@ -63139,7 +64706,7 @@ self: {
        sha256 = "1vz36i74l1nnm34nn1rj3v8kprqa2piz3j5f58cccg2gvxl0abnj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base curl filepath mtl ];
+       executableHaskellDepends = [ base curl filepath mtl ];
        jailbreak = true;
        description = "A universal pastebin tool, written in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -63157,16 +64724,23 @@ self: {
        pname = "haste-compiler";
        version = "0.5.0";
        sha256 = "18n9sl9m2fpzshpj3gqvd7wlmvz5mrgsz8awcd3imcb7136qa9s9";
+       configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base bin-package-db binary blaze-builder bytestring bzlib
-         Cabal containers data-binary-ieee754 data-default directory either
-         filepath ghc ghc-paths ghc-prim ghc-simple HTTP monads-tf mtl
-         network network-uri process random shellmate system-fileio tar
-         terminfo transformers unix utf8-string websockets
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 data-default
+         directory filepath ghc ghc-paths ghc-prim monads-tf network
+         network-uri process random shellmate transformers utf8-string
+         websockets
        ];
-       configureFlags = [ "-fportable" ];
+       executableHaskellDepends = [
+         array base bin-package-db binary blaze-builder bytestring bzlib
+         Cabal containers data-default directory either filepath ghc
+         ghc-paths ghc-prim ghc-simple HTTP mtl network network-uri process
+         random shellmate system-fileio tar terminfo transformers unix
+         utf8-string
+       ];
+       jailbreak = true;
        homepage = "http://haste-lang.org/";
        description = "Haskell To ECMAScript compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -63180,7 +64754,9 @@ self: {
        pname = "haste-markup";
        version = "0.0.1.0";
        sha256 = "02rqm4qjaww2c622bqd1bb2mjb73w2s7d7pwvz94x03npxkf4hn1";
-       buildDepends = [ base containers directory filepath haste-lib ];
+       libraryHaskellDepends = [
+         base containers directory filepath haste-lib
+       ];
        jailbreak = true;
        homepage = "http://github.com/ajnsit/haste-markup";
        description = "A port of blaze-markup and blaze-html to Haste";
@@ -63194,7 +64770,7 @@ self: {
        pname = "haste-perch";
        version = "0.1.0.9";
        sha256 = "1a92ahmphsr0dgj1jlp2cxpq5yy59b3avw3gzmv0jzrds41p3ic8";
-       buildDepends = [ base haste-compiler transformers ];
+       libraryHaskellDepends = [ base haste-compiler transformers ];
        homepage = "https://github.com/agocorona/haste-perch";
        description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler";
        license = stdenv.lib.licenses.gpl3;
@@ -63212,14 +64788,16 @@ self: {
        sha256 = "05sbgq1mliahdn4qj7flgw7klrm67r2mz7gxs03i6lx6mi3phm9f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory old-locale old-time process random
+       ];
+       executableHaskellDepends = [
          base bytestring containers directory filepath haskeline
-         haskell-src-exts old-locale old-time polyparse process random
+         haskell-src-exts polyparse process
        ];
        homepage = "http://projects.haskell.org/hat/";
        description = "The Haskell tracer, generating and viewing Haskell execution traces";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hatex-guide" = callPackage
@@ -63230,7 +64808,7 @@ self: {
        pname = "hatex-guide";
        version = "1.3.1.0";
        sha256 = "11wi053g9kybw0qa3wdfccyy0ka3xnnghgamaaf220r8hz49g25y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html directory filepath HaTeX parsec text time
          transformers
        ];
@@ -63250,11 +64828,11 @@ self: {
        sha256 = "17ijsy0fmvaqq4ql7c2788kk3pi975pbi1g7ijh5fj0ybgxk5dww";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs dns MissingH parallel-io split tasty
          tasty-hunit tasty-quickcheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cmdargs dns MissingH parallel-io process split
          tasty tasty-hunit tasty-quickcheck
        ];
@@ -63273,10 +64851,13 @@ self: {
        sha256 = "0dgjia07v489wlk23hg84d1043rh71hl9yg7vdcih2jcj8pn00z4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ansi-wl-pprint base cmdargs containers haskeline parsec QuickCheck
+       libraryHaskellDepends = [
+         ansi-wl-pprint base containers parsec QuickCheck
+       ];
+       executableHaskellDepends = [ base cmdargs haskeline ];
+       testHaskellDepends = [
+         base test-framework test-framework-quickcheck2
        ];
-       testDepends = [ base test-framework test-framework-quickcheck2 ];
        homepage = "http://extralogical.net/projects/hatt";
        description = "A truth table generator for classical propositional logic";
        license = stdenv.lib.licenses.bsd3;
@@ -63293,11 +64874,12 @@ self: {
        sha256 = "1p4llwjab7h2zg10585jp5a5bfrzmmkziq7in164wk15rb2z5y0p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base basic-prelude containers errors lens MonadRandom mtl
          random-shuffle tasty tasty-quickcheck text
        ];
-       testDepends = [
+       executableHaskellDepends = [ base basic-prelude text ];
+       testHaskellDepends = [
          base basic-prelude containers errors mtl random-shuffle tasty
          tasty-hunit tasty-quickcheck text
        ];
@@ -63318,7 +64900,7 @@ self: {
        sha256 = "10qg24qkh17l9zqn47g64cg6hp48x7bjbcwigj35zpqcq71s9dxc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base64-string bytestring clock containers gconf glade gtk
          hoauth HTTP json mtl network old-locale parsec regex-base
          regex-tdfa SHA time utf8-string
@@ -63338,11 +64920,11 @@ self: {
        pname = "haxl";
        version = "0.2.0.0";
        sha256 = "13nd291s04wyyx60cfs7x02dfpm4b9qn73h70c97gjq2s7l7y7qy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers directory filepath hashable HUnit
          pretty text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers hashable HUnit text
          unordered-containers
        ];
@@ -63361,11 +64943,11 @@ self: {
        pname = "haxl-facebook";
        version = "0.1.0.0";
        sha256 = "0m8dycsh51sfrxhmajsaydgima4r0nc60yklv9w26302i176j2aq";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async base conduit data-default fb hashable haxl
          http-client-tls http-conduit resourcet text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async base conduit data-default fb hashable haxl
          http-client-tls http-conduit resourcet text time transformers
          unordered-containers vector
@@ -63387,7 +64969,11 @@ self: {
        sha256 = "12ksmhmk1yns8znh9srqm53q4by8dibdvkd9qhbihiwdyz137y6j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 data-default
+         mtl parsec split template-haskell transformers utf8-string zlib
+       ];
+       executableHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 data-default
          mtl optparse-applicative parsec split template-haskell transformers
          utf8-string zlib
@@ -63409,7 +64995,7 @@ self: {
        pname = "haxr";
        version = "3000.11.1.1";
        sha256 = "0a4ad0h45a6jv1x19ss0p6krhq040164cvvaivf0zba5q4ifmffh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base-compat base64-bytestring blaze-builder bytestring
          HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat
          network network-uri old-locale old-time template-haskell time
@@ -63426,7 +65012,7 @@ self: {
        pname = "haxr-th";
        version = "3000.5";
        sha256 = "1h1g4r7c5k3rja49ip4m21f2sscn06xjxharnlyazvvs6mzfysif";
-       buildDepends = [ base haxr template-haskell ];
+       libraryHaskellDepends = [ base haxr template-haskell ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haxr/";
        description = "Automatic deriving of XML-RPC structs for Haskell records";
@@ -63440,10 +65026,10 @@ self: {
      mkDerivation {
        pname = "haxy";
        version = "1.0";
-       revision = "2";
        sha256 = "1fzdxk0vl7pd3k1dgxli6f721lfvwpb2zl354fl0zy5gimiky7fs";
+       revision = "2";
        editedCabalFile = "1dfd6805d921438c33b5388de37716d320af9aff2d8067837f510d43c3cf5940";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class hostname HTTP http-server mtl
          url
        ];
@@ -63462,11 +65048,12 @@ self: {
        sha256 = "0dpisbqfsay8lwpfihw5fmpzi2ajc8qshsawbr4r6x8indy4kdy0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-flags process template-haskell time xml
        ];
-       testDepends = [ base process xml ];
-       extraLibraries = [ mesa wayland ];
+       librarySystemDepends = [ mesa wayland ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base process xml ];
        jailbreak = true;
        description = "Haskell bindings for the C Wayland library";
        license = stdenv.lib.licenses.mit;
@@ -63483,7 +65070,7 @@ self: {
        sha256 = "05wfxpkpxma3ynla3wdgzq0raxqwg21fsa01qqpsh1ib7v462ls0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring http-conduit http-types optparse-applicative
          pandoc url
        ];
@@ -63504,7 +65091,7 @@ self: {
        sha256 = "01wx4dls0ccl0q09hvydjhj0lfpqfd32z76rjgc89p5889czkm5j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo filepath glade gtk haskell98 process svgcairo time unix
        ];
        homepage = "http://hback.googlecode.com/";
@@ -63523,7 +65110,7 @@ self: {
        pname = "hbayes";
        version = "0.5";
        sha256 = "1zhjhham5jyfwll8sp3kprp92l4whqfyys4jfl81gpb5igpgz039";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary boxes containers directory filepath gamma HUnit
          mtl mwc-random parsec pretty QuickCheck random split statistics
          test-framework test-framework-hunit test-framework-quickcheck2
@@ -63544,7 +65131,9 @@ self: {
        sha256 = "1whnsbv04b9hr3dc6a3xzv270q7ygk8x4i20mb092fr98klbk9wn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory ghc ghc-mod ghc-paths libhbb ];
+       executableHaskellDepends = [
+         base directory ghc ghc-mod ghc-paths libhbb
+       ];
        jailbreak = true;
        homepage = "https://bitbucket.org/bhris/hbb";
        description = "Haskell Busy Bee, a backend for text editors";
@@ -63557,7 +65146,7 @@ self: {
        pname = "hbcd";
        version = "1.0";
        sha256 = "1glld44m6h8yfh5h63w9q5isy238j0j312ycx43va1xa80x5r4dq";
-       buildDepends = [ base bytestring Decimal digits split ];
+       libraryHaskellDepends = [ base bytestring Decimal digits split ];
        description = "Packed binary-coded decimal (BCD) serialization";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -63570,7 +65159,7 @@ self: {
        pname = "hbeanstalk";
        version = "0.2.4";
        sha256 = "13xcia1nnayhr22zi1wzgn8qs403ib4n2zikpxd3xnzy33yrgbzy";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers network
        ];
        homepage = "http://github.com/scsibug/hbeanstalk/";
@@ -63588,10 +65177,10 @@ self: {
        sha256 = "1lgsjwwpimvgczzgg2lvnf08hhcsnk5is52rm2lbmilky8ayhxjp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers mtl old-time OpenGL SDL SDL-mixer
        ];
-       extraLibraries = [ SDL SDL_mixer ];
+       executableSystemDepends = [ SDL SDL_mixer ];
        homepage = "http://www.dockerz.net/software/hbeat.html";
        description = "A simple step sequencer GUI";
        license = stdenv.lib.licenses.bsd3;
@@ -63606,9 +65195,9 @@ self: {
        pname = "hblas";
        version = "0.3.2.1";
        sha256 = "05c2mqhwjq0r8jyaj0cncaxn4n5x27dd8z6lv8g8cdc7r749q59y";
-       buildDepends = [ base primitive storable-complex vector ];
-       testDepends = [ base HUnit tasty tasty-hunit vector ];
-       extraLibraries = [ blas lapack ];
+       libraryHaskellDepends = [ base primitive storable-complex vector ];
+       librarySystemDepends = [ blas lapack ];
+       testHaskellDepends = [ base HUnit tasty tasty-hunit vector ];
        jailbreak = true;
        homepage = "http://github.com/wellposed/hblas/";
        description = "Human friendly BLAS and Lapack bindings for Haskell";
@@ -63625,7 +65214,7 @@ self: {
        pname = "hblock";
        version = "0.1.0.2";
        sha256 = "0g8hj42ir3jcpmwf3pin2k4zdcf5p1f1sx1f8rj380qbyxgdrw3v";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-markup bytestring cereal containers deepseq
          hashable path-pieces safecopy text unordered-containers uuid vector
        ];
@@ -63646,12 +65235,12 @@ self: {
      mkDerivation {
        pname = "hbro";
        version = "1.4.0.0";
-       revision = "1";
        sha256 = "08vw5j3a22gszbsjhjp13dkgvxj2875zjsx6w3w7c2dkjg4lijpr";
+       revision = "1";
        editedCabalFile = "331a844037ba6df7831151e45e40223eed66313dabef7dc0285a6e658747b15c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring classy-prelude cond containers
          data-default-class directory dyre errors exceptions fast-logger
          filepath glib gtk3 lens lifted-async lifted-base monad-control
@@ -63659,6 +65248,7 @@ self: {
          process resourcet safe semigroups stm-chans text time transformers
          transformers-base unix webkitgtk3 zeromq4-haskell
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/k0ral/hbro";
        description = "Minimal extensible web-browser";
        license = "unknown";
@@ -63674,7 +65264,7 @@ self: {
        pname = "hbro-contrib";
        version = "1.4.0.0";
        sha256 = "0v7qxg1phac5m06raspaq6782iid7rnvkinkji0fs0yjigbblps2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base bytestring classy-prelude containers
          directory glib gtk3 hbro lens monad-control mtl network-uri pango
          parsec process resourcet safe text time transformers-base unix
@@ -63694,7 +65284,9 @@ self: {
        sha256 = "03gd0hgms5hmjvd1j533357h0gh7mh16vmlbbgdhzad1igq1lcfv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers filepath haskell98 mtl ];
+       executableHaskellDepends = [
+         array base containers filepath haskell98 mtl
+       ];
        homepage = "http://www.bytelabs.org/hburg.html";
        description = "Haskell Bottom Up Rewrite Generator";
        license = stdenv.lib.licenses.bsd3;
@@ -63709,7 +65301,7 @@ self: {
        sha256 = "04aczl9mh1gb25kggh2jj043az61gzzhxqfg9gb3lcjr5krrnh4p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring language-c ];
+       executableHaskellDepends = [ base bytestring language-c ];
        jailbreak = true;
        homepage = "http://tomahawkins.org";
        description = "A toy C compiler";
@@ -63722,7 +65314,7 @@ self: {
        pname = "hcg-minus";
        version = "0.15";
        sha256 = "04g0f4sr7904w3ynyl0gnbyi2sl0z7ziv5q15mfb6c7h0zl25d5r";
-       buildDepends = [ base colour ];
+       libraryHaskellDepends = [ base colour ];
        homepage = "http://rd.slavepianos.org/t/hcg-minus";
        description = "haskell cg (minus)";
        license = stdenv.lib.licenses.bsd3;
@@ -63736,7 +65328,7 @@ self: {
        pname = "hcg-minus-cairo";
        version = "0.15";
        sha256 = "002gh8adqzhcjfnqkbcnpzz8qiqbj9zkbk6jj11dnnxjigc4l2q9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo colour filepath hcg-minus utf8-string
        ];
        homepage = "http://rd.slavepianos.org/t/hcg-minus-cairo";
@@ -63750,7 +65342,7 @@ self: {
        pname = "hcheat";
        version = "2010.1.16";
        sha256 = "1fwgnp15kha9qb7iagd8n5ahjjhg194wbva5i436mb57fn86pya2";
-       buildDepends = [ base mps ];
+       libraryHaskellDepends = [ base mps ];
        homepage = "http://github.com/nfjinjing/hcheat/";
        description = "A collection of code cheatsheet";
        license = stdenv.lib.licenses.bsd3;
@@ -63765,8 +65357,8 @@ self: {
        pname = "hchesslib";
        version = "0.1.0.0";
        sha256 = "10785d9n87ddln1rvr19wnvcj401x3b53psdcf8vrwfaq930kjrv";
-       buildDepends = [ array attoparsec base containers text ];
-       testDepends = [
+       libraryHaskellDepends = [ array attoparsec base containers text ];
+       testHaskellDepends = [
          array attoparsec base containers hlint hspec QuickCheck text
        ];
        homepage = "https://github.com/nablaa/hchesslib";
@@ -63785,17 +65377,16 @@ self: {
        pname = "hcltest";
        version = "0.3.7";
        sha256 = "1hqx0khbxypq4hqq1hq0ybyadd7m6bpd6rzc3zya3w0s7kwk0dgd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory dlist either filepath free lens mmorph
          monad-control mtl optparse-applicative process random-shuffle split
          stm tagged tasty temporary text transformers transformers-base
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/bennofs/hcltest/";
        description = "A testing library for command line applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcron" = callPackage
@@ -63806,7 +65397,7 @@ self: {
        pname = "hcron";
        version = "0.0.0.3";
        sha256 = "0ckq98aj6fgdgpwyy6ssydp4jazhhfshnalv71h2xx1z80m1ynq7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory mtl old-locale pretty process
          random stm time
        ];
@@ -63826,7 +65417,12 @@ self: {
        sha256 = "1h1g05a8wnk2q65mm4mwywxhygr7fs0150q8ml33ik59mcc5v7fr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory HaskellForMaths QuickCheck text ];
+       libraryHaskellDepends = [
+         base directory HaskellForMaths QuickCheck text
+       ];
+       executableHaskellDepends = [
+         base directory HaskellForMaths QuickCheck text
+       ];
        description = "Virtual Rubik's cube of arbitrary size";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63838,8 +65434,8 @@ self: {
        pname = "hcwiid";
        version = "0.0.5";
        sha256 = "0dn19kkd1da9yk6yk8mmpz927d1gsjyip9v4dibsvc1w4v49n94x";
-       buildDepends = [ base unix ];
-       extraLibraries = [ bluetooth cwiid ];
+       libraryHaskellDepends = [ base unix ];
+       librarySystemDepends = [ bluetooth cwiid ];
        homepage = "https://github.com/ivanperez-keera/hcwiid";
        description = "Library to interface with the wiimote";
        license = stdenv.lib.licenses.gpl2;
@@ -63854,7 +65450,7 @@ self: {
        pname = "hdaemonize";
        version = "0.5.0.1";
        sha256 = "03daf8qb8x0503h5k2vr6r4lyv6fv1a5n6mhykx5872khl81d8ms";
-       buildDepends = [
+       libraryHaskellDepends = [
          base extensible-exceptions filepath hsyslog mtl unix
        ];
        homepage = "http://github.com/greydot/hdaemonize";
@@ -63870,7 +65466,7 @@ self: {
        pname = "hdaemonize-buildfix";
        version = "0.4.5";
        sha256 = "15k4z77caa5y1jix4llqdmqpx0j7iv9nx5lk3vc5hs8vl2ax86f6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base extensible-exceptions filepath hsyslog mtl unix
        ];
        homepage = "http://github.com/madhadron/hdaemonize";
@@ -63887,7 +65483,7 @@ self: {
        pname = "hdbc-aeson";
        version = "0.1.3.2";
        sha256 = "04bp1zxw5alazk241gbz7g1s4cr0gabb7c15irzzlkbjz5jsk6d5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base convertible HDBC scientific text unordered-containers
          vector
        ];
@@ -63903,7 +65499,7 @@ self: {
        pname = "hdbc-postgresql-hstore";
        version = "0.0.1.1";
        sha256 = "034zsmqgavh4ns69f6j4a1afyqbd1b7h35macmf20vzxj0j0bawj";
-       buildDepends = [ attoparsec base containers HDBC text ];
+       libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        jailbreak = true;
        homepage = "http://bitbucket.com/dpwiz/hdbc-postgresql-hstore";
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
@@ -63916,7 +65512,7 @@ self: {
        pname = "hdbc-tuple";
        version = "0.0.1";
        sha256 = "155darl83c1b3gjkh7x8pwpj6v4nqfb389ix9vr39j7qw1pkjwdd";
-       buildDepends = [ base convertible HDBC typical ];
+       libraryHaskellDepends = [ base convertible HDBC typical ];
        description = "Type save tuples for HDBC";
        license = "GPL";
      }) {};
@@ -63933,11 +65529,11 @@ self: {
        pname = "hdbi";
        version = "1.3.0";
        sha256 = "0z8ivqs79lkqr2bji6nc5djd29ajag5r7d7caja482ksfq75wdc2";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers Decimal deepseq
          old-locale stm template-haskell text time uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base blaze-builder bytestring containers Decimal deepseq
          derive hspec-expectations HUnit old-locale QuickCheck
          quickcheck-assertions quickcheck-instances stm template-haskell
@@ -63960,8 +65556,10 @@ self: {
        pname = "hdbi-conduit";
        version = "1.3.0";
        sha256 = "1wrc38m8451vslvnmd4p128x9885dbjx5hzc566s06dw8wshfdgj";
-       buildDepends = [ base conduit hdbi resourcet transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base conduit hdbi resourcet transformers
+       ];
+       testHaskellDepends = [
          base conduit hdbi hdbi-sqlite QuickCheck quickcheck-assertions
          resourcet test-framework test-framework-quickcheck2 transformers
        ];
@@ -63983,11 +65581,11 @@ self: {
        pname = "hdbi-postgresql";
        version = "1.3.0";
        sha256 = "1fjcp3ldc54bm8gj8l9ifjvdxx6h6lsswjspmwnzwfh1ahfrbg1x";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring hdbi mtl old-locale
          postgresql-libpq postgresql-simple safe text time uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base blaze-builder bytestring containers Decimal derive
          hdbi hdbi-tests HUnit ieee754 mtl old-locale postgresql-libpq
          postgresql-simple QuickCheck quickcheck-assertions
@@ -64009,10 +65607,10 @@ self: {
        pname = "hdbi-sqlite";
        version = "1.3.0";
        sha256 = "03vf5xv14hb6rwwaiv997a7j3s5rgp81cb60v0n013l20dqh1g04";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring direct-sqlite hdbi text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring direct-sqlite hdbi hdbi-tests
          test-framework text
        ];
@@ -64032,7 +65630,7 @@ self: {
        pname = "hdbi-tests";
        version = "1.3.0";
        sha256 = "0rvrjcv890flsmq8v6bpgh8kvg0ix3x2n149kdg7xviy26liyjg5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers Decimal hdbi HUnit ieee754 QuickCheck
          quickcheck-assertions quickcheck-instances stm test-framework
          test-framework-hunit test-framework-quickcheck2 text time uuid
@@ -64054,7 +65652,7 @@ self: {
        sha256 = "0cwgm4yws4irrrpk2jvgvgr74w7gn9ilcidb9flkxfh7kqwsjxac";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal cmdargs directory filepath ghc ghc-paths network process
          syb time unix
        ];
@@ -64071,7 +65669,7 @@ self: {
        pname = "hdf";
        version = "0.15";
        sha256 = "11nf9wlymdhydf0bhh9gdl0cdn0i4mbvx3hfdcmnxfvag5jmfbkk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory fgl fgl-visualize filepath hosc hsc3 murmur-hash
          process split transformers
        ];
@@ -64087,7 +65685,9 @@ self: {
        pname = "hdigest";
        version = "1.0";
        sha256 = "1wm9j8ncjfb0gscdz4zmkymrzykc6rqbcx7988r207l5s9q3043f";
-       buildDepends = [ base cgi Crypto network parsec random time ];
+       libraryHaskellDepends = [
+         base cgi Crypto network parsec random time
+       ];
        description = "Server-side HTTP Digest (RFC2617) in the CGI monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64101,8 +65701,10 @@ self: {
        sha256 = "1v7yx9k0kib6527k49hf3s4jvdda7a0wgv09qhyjk6lyriyi3ny2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base haskell98 pretty ];
-       buildTools = [ happy ];
+       libraryHaskellDepends = [ array base haskell98 pretty ];
+       libraryToolDepends = [ happy ];
+       executableHaskellDepends = [ array base haskell98 pretty ];
+       executableToolDepends = [ happy ];
        homepage = "http://www.haskell.org/hdirect/";
        description = "An IDL compiler for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -64115,7 +65717,7 @@ self: {
        pname = "hdis86";
        version = "0.2";
        sha256 = "0qr8d4qbvkncv4im0iwwdr9khvkyy4ky8wnwxri1jqhylcq8vdks";
-       buildDepends = [ base bytestring containers QuickCheck ];
+       libraryHaskellDepends = [ base bytestring containers QuickCheck ];
        homepage = "https://github.com/kmcallister/hdis86";
        description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64";
        license = stdenv.lib.licenses.bsd3;
@@ -64128,8 +65730,8 @@ self: {
        pname = "hdiscount";
        version = "0.1.0.0";
        sha256 = "0z6kpsk57gjqwpvs5v6ikiirnyyg26mbrxx827bb1v27lhsy7py0";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ markdown ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ markdown ];
        jailbreak = true;
        homepage = "https://github.com/jamwt/hdiscount";
        description = "Haskell bindings to the Discount markdown library";
@@ -64145,7 +65747,7 @@ self: {
        sha256 = "1qgq4bwq2ip315j43f0pyhxah033bjrj3wrmvnzmc62s8k2rfvgh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory process unix vty ];
+       executableHaskellDepends = [ base directory process unix vty ];
        description = "a small display manager";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64163,12 +65765,16 @@ self: {
        sha256 = "153rwd1f390j6sjfxx135h3bh80pb8zb5myws9q8d0jkrx2sl198";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty base bytestring Cabal containers filepath ghc
-         ghc-paths haddock-api haddock-library MonadCatchIO-transformers mtl
-         network process text transformers
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal containers filepath ghc ghc-paths
+         haddock-api haddock-library MonadCatchIO-transformers mtl network
+         process text transformers
        ];
-       testDepends = [ base containers mtl ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring containers filepath mtl network
+         text
+       ];
+       testHaskellDepends = [ base containers mtl ];
        homepage = "https://github.com/mvoidex/hdocs";
        description = "Haskell docs tool";
        license = stdenv.lib.licenses.bsd3;
@@ -64186,7 +65792,12 @@ self: {
        sha256 = "116499cr0pcc1gg7aniprlcp9vp8s61b4vk7rcm673nw3lay496a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring cereal containers deepseq hdph-closure mtl network
+         network-info network-multicast network-transport
+         network-transport-tcp random template-haskell time
+       ];
+       executableHaskellDepends = [
          base bytestring cereal containers deepseq hdph-closure mtl network
          network-info network-multicast network-transport
          network-transport-tcp random template-haskell time
@@ -64206,7 +65817,7 @@ self: {
        pname = "hdph-closure";
        version = "0.0.1";
        sha256 = "0rcmp5i7jvpghg8nql5wlidbyjs79cxxmdb6bq3xxk806gdj66d8";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal containers deepseq template-haskell
        ];
        jailbreak = true;
@@ -64226,7 +65837,7 @@ self: {
        sha256 = "1hc1pmbj9452k4a71iiazxg6id7caf783m08lqnf3flf77cdjxpa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty base bytestring directory filepath haskeline
          time
        ];
@@ -64243,7 +65854,8 @@ self: {
        sha256 = "1xwgdx4m558m2xqmqnskkbja9s1lqm131xphjgk0yclsk0sv8was";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base QuickCheck ];
        description = "Heaps in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64254,8 +65866,8 @@ self: {
        pname = "heaps";
        version = "0.3.2.1";
        sha256 = "1g4nf361qfjyymwpyiiq0qk5brrsr4wz1pncij69pwda919b3j6b";
-       buildDepends = [ base ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/heaps/";
        description = "Asymptotically optimal Brodal/Okasaki heaps";
@@ -64270,7 +65882,7 @@ self: {
        sha256 = "0fzws9fjhqsygsbwj7nvj786j16264vqvqzc97dr73y72538k9qa";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base QuickCheck ];
+       executableHaskellDepends = [ array base QuickCheck ];
        homepage = "http://wiki.cs.pdx.edu/bartforge/heapsort";
        description = "Heapsort of MArrays as a demo of imperative programming";
        license = stdenv.lib.licenses.bsd3;
@@ -64284,8 +65896,8 @@ self: {
        pname = "hebrew-time";
        version = "0.1.1";
        sha256 = "0ckridxf4rvhhp0k1mckbbbpzfs32l4mwg7n9mrmsggldpl7x6f7";
-       buildDepends = [ base time ];
-       testDepends = [
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 time
        ];
@@ -64300,7 +65912,7 @@ self: {
        pname = "hecc";
        version = "0.4.1.1";
        sha256 = "1p7h9mlap8i0w2inhq944r0dgr27rzwk44igylil7gv0dgf4hsyx";
-       buildDepends = [ base cereal crypto-api hF2 ];
+       libraryHaskellDepends = [ base cereal crypto-api hF2 ];
        description = "Elliptic Curve Cryptography for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64315,11 +65927,11 @@ self: {
        pname = "hedis";
        version = "0.6.9";
        sha256 = "0yciwxsnqc8d09356fisfb44nbzsnvi01aad86gbx4vhrdnw7n7a";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base BoundedChan bytestring bytestring-lexing mtl
          network resource-pool time vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit mtl test-framework test-framework-hunit time
        ];
        homepage = "https://github.com/informatikr/hedis";
@@ -64333,7 +65945,7 @@ self: {
        pname = "hedis-config";
        version = "0.0.2";
        sha256 = "1ism20ddgcdsypbic6ikalvajq3918wm53ppiic68zaqfzwk9gk2";
-       buildDepends = [ aeson base hedis scientific text time ];
+       libraryHaskellDepends = [ aeson base hedis scientific text time ];
        homepage = "https://bitbucket.org/s9gf4ult/hedis-config";
        description = "Easy trivial configuration for Redis";
        license = stdenv.lib.licenses.bsd3;
@@ -64347,7 +65959,7 @@ self: {
        pname = "hedis-monadic";
        version = "0.0.4";
        sha256 = "1540c4ra65y2kc97n7wxx7rdzf3dkaqqx7r4lwz4qpg3kzfi6q8w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hedis monad-control mtl transformers transformers-base
          transformers-compat
        ];
@@ -64365,11 +65977,11 @@ self: {
        pname = "hedis-pile";
        version = "0.6.3";
        sha256 = "0awwga4hvmfkkkqy68g4ja51szjifs1z20rav0kmbn3gn978248n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring hedis hedis-tags string-conversions
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring hedis HUnit lifted-base string-conversions
          test-framework test-framework-hunit transformers
        ];
@@ -64385,7 +65997,7 @@ self: {
        pname = "hedis-simple";
        version = "0.1.0.0";
        sha256 = "1dq7rpqg35caqj664q2ndqgd59mq7cfjahkaka5mlk1k5yjvz7av";
-       buildDepends = [ base bytestring either hedis mtl ];
+       libraryHaskellDepends = [ base bytestring either hedis mtl ];
        jailbreak = true;
        homepage = "http://github.com/sanetracker/hedis-simple";
        description = "A simplified API for hedis";
@@ -64400,8 +66012,8 @@ self: {
        pname = "hedis-tags";
        version = "0.2.3";
        sha256 = "0d9jr26366xjjcc39ma36bs944d11xpw5izww9pw3lajsgdr0d1s";
-       buildDepends = [ base bytestring hedis ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring hedis ];
+       testHaskellDepends = [
          base bytestring hedis HUnit lifted-base test-framework
          test-framework-hunit transformers
        ];
@@ -64420,11 +66032,11 @@ self: {
        pname = "hedn";
        version = "0.1.8.1";
        sha256 = "12r7ndjq59q9pdnhziq7af4jkp2mgpq7qhnnzgv6w1z8v893b9r1";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq mtl old-locale
          stringsearch text time utf8-string vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec HUnit QuickCheck template-haskell
          text time vector
        ];
@@ -64445,7 +66057,7 @@ self: {
        sha256 = "0z3c9pvhnfx9zizzwkyawvzvs4zl7i5w5zkrjpax8rkrh8ai1060";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath http-conduit process
          transformers
        ];
@@ -64464,10 +66076,10 @@ self: {
      mkDerivation {
        pname = "heist";
        version = "0.14.1.1";
-       revision = "1";
        sha256 = "0hwf8d20lw4gn5mal8iqd62npr2859541h3md451hjlbwpjyqd19";
+       revision = "1";
        editedCabalFile = "51f2aa86d7582ba504e26ead511da54db5350cf4bed7f13252c678c0cf19d400";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist either filepath hashable
          map-syntax MonadCatchIO-transformers mtl process random text time
@@ -64486,7 +66098,7 @@ self: {
        pname = "heist-aeson";
        version = "0.5";
        sha256 = "1m0rwrb0gzsajnp5h0w7cf10jf6fram4mjkmny5hk0h5xwcn19dc";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers heist monads-fd text
          vector xmlhtml
        ];
@@ -64501,7 +66113,9 @@ self: {
        pname = "heist-async";
        version = "0.6.0.0";
        sha256 = "16ab3cfs6fj66ssf6ypmx2yddq5an115wlmwybk3va0a7kbp58ll";
-       buildDepends = [ base heist template-haskell text xmlhtml ];
+       libraryHaskellDepends = [
+         base heist template-haskell text xmlhtml
+       ];
        homepage = "http://github.com/dbp/heist-async";
        description = "Adding support for asynchronous updates (\"AJAX\") with heist";
        license = stdenv.lib.licenses.bsd3;
@@ -64515,15 +66129,15 @@ self: {
      mkDerivation {
        pname = "helics";
        version = "0.5.1";
-       revision = "1";
        sha256 = "06kj42rmlzlw6zrilq9kc5whk0np5714wwn3nwbpv6fx4ginzg2c";
+       revision = "1";
        editedCabalFile = "698732187d22f634ca220584e3b4056415c873360a85bc0a4ab7c1e2c86fca3d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-show data-default-class time unix
        ];
-       extraLibraries = [
+       librarySystemDepends = [
          newrelic-collector-client newrelic-common newrelic-transaction
        ];
        homepage = "https://github.com/philopon/helics";
@@ -64543,7 +66157,7 @@ self: {
        sha256 = "10rb9l4sf31h59f5pwv54vqjnlm047mbq5gvhv5wblkh53ch1b31";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class helics vault wai
        ];
        homepage = "https://github.com/philopon/helics";
@@ -64560,7 +66174,7 @@ self: {
        sha256 = "1j495j3kc43d34aviln6jrab3ydzsp1hrnk079p53mcnx2rpjz81";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl parsec process ];
+       executableHaskellDepends = [ base containers mtl parsec process ];
        homepage = "http://www.codersbase.com/index.php/Helisp";
        description = "An incomplete Elisp compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -64576,7 +66190,11 @@ self: {
        sha256 = "0vwk8h5fwl63pjcydwndqgpikfjdm37w7gjmmgac95gl66fc5h5j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory filepath lvmlib mtl network parsec
+         process Top transformers wl-pprint
+       ];
+       executableHaskellDepends = [
          base containers directory filepath lvmlib mtl network parsec
          process Top transformers wl-pprint
        ];
@@ -64599,12 +66217,13 @@ self: {
        sha256 = "1kdxkk994g38bl2kcxcs0p9wn1rankn0jw14nlvy9z9appgxalnl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra data-default directory
          filepath ghc ghc-paths haskeline monad-extras mtl pdfinfo process
          process-extras resourcet shell-conduit split template-haskell text
-         time transformers unix utf8-string
+         time transformers unix
        ];
+       executableHaskellDepends = [ base transformers utf8-string ];
        description = "A Haskell shell based on shell-conduit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64621,7 +66240,7 @@ self: {
        sha256 = "1gqz042qycwhka6fyma6fb104mi8wd22nsbywrini3m3nib5ci75";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory hellnet hjpath hjson HTTP Lucu
          mtl network regex-pcre safe stm tar utf8-string zlib
        ];
@@ -64643,10 +66262,13 @@ self: {
        sha256 = "0fb4r9nb39l1qr7xczgkx5i93cv4rqrin0fl22qq4h12ajvrp6m6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers Crypto directory filepath haskell98
-         hjpath hjson HTTP Lucu mtl network old-locale parsec pretty process
-         random regex-posix RSA safe time unix uri utf8-string
+       libraryHaskellDepends = [
+         base bytestring Crypto directory filepath haskell98 hjpath hjson
+         HTTP old-locale parsec pretty process random RSA safe time unix uri
+         utf8-string
+       ];
+       executableHaskellDepends = [
+         base containers Lucu mtl network regex-posix
        ];
        homepage = "http://bitcheese.net/wiki/hellnet/hspawn";
        description = "Simple, distributed, anonymous data sharing network";
@@ -64662,7 +66284,7 @@ self: {
        sha256 = "1x6q7frbrc4jdfx1qhxrydmdp5k7mm3lx504d7rhg6z2m6ibbh57";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.haskell.org/hello/";
        description = "Hello World, an example package";
        license = stdenv.lib.licenses.bsd3;
@@ -64678,11 +66300,11 @@ self: {
        pname = "helm";
        version = "0.7.1";
        sha256 = "04smx6q2k4zj4gjvwy393s4abik9k108c5j31yy3dwksbbhhmygg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers cpu elerea filepath mtl pango random sdl2
          text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cairo containers elerea HUnit sdl2 test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
@@ -64701,7 +66323,7 @@ self: {
        pname = "help-esb";
        version = "0.1.6";
        sha256 = "0fy0dygx3hdkbdip7gppk25akjar0p2px0s5q7sl1lmzgkcl1016";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers MissingH network network-uri text
          uuid
        ];
@@ -64720,7 +66342,7 @@ self: {
        sha256 = "16f1nzpi20j7fza1rs1b89mhyni4162q2x4l3ixrnd82yjmcmc1l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring hemkay-core portaudio
        ];
        description = "A module music mixer and player";
@@ -64734,7 +66356,7 @@ self: {
        pname = "hemkay-core";
        version = "0.1.4";
        sha256 = "0br41879jynw3dzb2hlb07m55zmzgyim6gi8i48bzimbi70c9z89";
-       buildDepends = [ array base binary bytestring ];
+       libraryHaskellDepends = [ array base binary bytestring ];
        description = "A device independent module music mixer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64752,13 +66374,17 @@ self: {
        sha256 = "104387q98qfhykmjkyhg08rji8pljlllp2j57ilhpb7ws9ik2g26";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base base64-bytestring bytestring cairo cipher-aes conduit
-         deepseq deepseq-generics gtk hidapi mtl network-simple
-         optparse-applicative pretty-show robot split svgcairo text time
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cipher-aes conduit deepseq
+         deepseq-generics hidapi mtl network-simple optparse-applicative
+         text vector websockets
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cairo conduit gtk mtl network-simple
+         optparse-applicative pretty-show robot split svgcairo time
          transformers vector vector-fftw websockets
        ];
-       testDepends = [ base bytestring hspec HUnit vector ];
+       testHaskellDepends = [ base bytestring hspec HUnit vector ];
        jailbreak = true;
        homepage = "https://github.com/nh2/haskell-hemokit";
        description = "Haskell port of the Emokit EEG project";
@@ -64774,12 +66400,14 @@ self: {
        pname = "hen";
        version = "0.1.3";
        sha256 = "1ri6brxmc2m09jx2r9p47lgpfn8zkxy147hyyw3x2pw3g6cgsill";
-       buildDepends = [ base bitset exceptions mtl transformers uuid ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bitset exceptions mtl transformers uuid
+       ];
+       librarySystemDepends = [ xenctrl ];
+       testHaskellDepends = [
          base bitset exceptions mtl QuickCheck tasty tasty-quickcheck
          transformers uuid
        ];
-       extraLibraries = [ xenctrl ];
        jailbreak = true;
        homepage = "https://github.com/selectel/hen";
        description = "Haskell bindings to Xen hypervisor interface";
@@ -64794,7 +66422,9 @@ self: {
        pname = "henet";
        version = "1.3.9.3";
        sha256 = "0pm5lnn7rc647ic404c8bmki9wfrkc0mdmmkng50vv0bm2d7z5aq";
-       buildDepends = [ base bitset bytestring network typesafe-endian ];
+       libraryHaskellDepends = [
+         base bitset bytestring network typesafe-endian
+       ];
        description = "Bindings and high level interface for to ENet v1.3.9";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64806,7 +66436,7 @@ self: {
        pname = "hepevt";
        version = "0.5";
        sha256 = "0b7syzfzbcznjb98hi4k8bp46ss08s9qg2763bnnm1b10i7km23z";
-       buildDepends = [ bytestring haskell2010 lha ];
+       libraryHaskellDepends = [ bytestring haskell2010 lha ];
        description = "HEPEVT parser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64818,7 +66448,7 @@ self: {
        pname = "her-lexer";
        version = "0.1.1";
        sha256 = "1hbx48r8zdmyr5qjf0b3pagmamj8pibsp7ca7bxdgk4jz8pxv2my";
-       buildDepends = [ base mtl split ];
+       libraryHaskellDepends = [ base mtl split ];
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she";
        description = "A lexer for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
@@ -64831,7 +66461,7 @@ self: {
        pname = "her-lexer-parsec";
        version = "0.0.0";
        sha256 = "1gkcd9ikaxjirxh8haq8b9a372n1dlaq63n9xzq9gsyazkxz7lgn";
-       buildDepends = [ base her-lexer parsec transformers ];
+       libraryHaskellDepends = [ base her-lexer parsec transformers ];
        description = "Parsec frontend to \"her-lexer\" for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64847,7 +66477,7 @@ self: {
        sha256 = "1gm1ya1p1i734sxadbmj1zn6mbq1gssmzp897h5xjgb8vsa2fxs6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers ghc-prim indents mtl parsec regex-posix
        ];
        homepage = "https://github.com/danchoi/herbalizer";
@@ -64864,7 +66494,7 @@ self: {
        pname = "here";
        version = "1.2.7";
        sha256 = "1fqjqzfg3fif67ic75pavsnfjb9lxk5cf82chxs2hrkx41gm4gr6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta mtl parsec template-haskell
        ];
        homepage = "https://github.com/tmhedberg/here";
@@ -64878,7 +66508,7 @@ self: {
        pname = "heredoc";
        version = "0.2.0.0";
        sha256 = "0h0g2f7yscwl1ba1yn3jnz2drvd6ns9m910hwlmq3kdq3k39y3f9";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://hackage.haskell.org/package/heredoc";
        description = "multi-line string / here document using QuasiQuotes";
        license = stdenv.lib.licenses.publicDomain;
@@ -64896,12 +66526,13 @@ self: {
        sha256 = "1m3dgp22ix3l64basv8bx0k9waagi0rckprpgqnfpxnir7cbhrkv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal array base base-compat containers data-default-class
          directory ghc haskeline kure marked-pretty mtl process stm
          temporary terminfo transformers transformers-compat
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [ base ];
        description = "Haskell Equational Reasoning Model-to-Implementation Tunnel";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64915,7 +66546,7 @@ self: {
        pname = "hermit-syb";
        version = "0.1.0.0";
        sha256 = "1970n7q88q76dnp2h7h8r1d6psq0d9pdvrim556rqiv8smwi661x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc ghc-prim hermit syb template-haskell
        ];
        description = "HERMIT plugin for optimizing Scrap-Your-Boilerplate traversals";
@@ -64929,8 +66560,8 @@ self: {
        pname = "heroku";
        version = "0.1.2.3";
        sha256 = "1gldsdpnmj7ljrmyvjfwqdmhhml2yp27icl2qqj9pz42pllq4x2k";
-       buildDepends = [ base network-uri text ];
-       testDepends = [ base hspec network-uri text ];
+       libraryHaskellDepends = [ base network-uri text ];
+       testHaskellDepends = [ base hspec network-uri text ];
        homepage = "https://github.com/gregwebs/haskell-heroku";
        description = "helpers for deploying to Heroku";
        license = stdenv.lib.licenses.bsd3;
@@ -64944,10 +66575,10 @@ self: {
        pname = "heroku-persistent";
        version = "0.1.0";
        sha256 = "1ws4076dk4a8l2yz9mwfwqk57sm7y2ch2c5318agsm7hnwil7wbf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring heroku persistent-postgresql text
        ];
-       testDepends = [ base hspec persistent-postgresql ];
+       testHaskellDepends = [ base hspec persistent-postgresql ];
        description = "Parse DATABASE_URL into configuration types for Persistent";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -64962,7 +66593,7 @@ self: {
        pname = "herringbone";
        version = "0.1.1";
        sha256 = "1xpdz24dinm56z4gx51frw19j2169ms9jvasg8xixi944q34hwmk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory http-types mtl old-locale
          process process-listlike system-fileio system-filepath text time
          transformers unix-compat
@@ -64980,7 +66611,7 @@ self: {
        pname = "herringbone-embed";
        version = "0.1.1";
        sha256 = "02i0k29fg0nb4ax0yaw6bnrnb0v0rk2fy7lckd5f5bny557mk1h6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring file-embed herringbone system-fileio
          system-filepath template-haskell text
        ];
@@ -64997,7 +66628,7 @@ self: {
        pname = "herringbone-wai";
        version = "0.1.1";
        sha256 = "1kw0n89qqazyap9w315pa6k4smnw1pf8s82grbm8z9d9xyhk980f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring herringbone http-types system-fileio
          system-filepath text time wai wai-app-static
        ];
@@ -65016,7 +66647,7 @@ self: {
        sha256 = "1xxmm5b3n8wj548lmf7hp05g7qwy0sq7mkh0g98n7z1iqdmfamwa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base filepath haskell-src HDBC HDBC-postgresql hssqlppp parsec
        ];
        jailbreak = true;
@@ -65031,7 +66662,7 @@ self: {
        pname = "hetero-map";
        version = "0.21";
        sha256 = "1fnzj37kya5gqjchm3yq0709ay50n0spb24x5rxkxfbl0yy2nzk7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/hetero-map";
        description = "Pure heterogeneous maps";
        license = stdenv.lib.licenses.bsd3;
@@ -65046,8 +66677,8 @@ self: {
        sha256 = "0sj0grykzb7xq7iz0nj27c4fzhcr9f0yshfcq81xq2wdmg09j8yx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base hscurses old-time random ];
-       extraLibraries = [ ncurses ];
+       executableHaskellDepends = [ array base hscurses old-time random ];
+       executableSystemDepends = [ ncurses ];
        homepage = "http://web.comlab.ox.ac.uk/oucl/work/ian.lynagh/Hetris/";
        description = "Text Tetris";
        license = "GPL";
@@ -65061,7 +66692,9 @@ self: {
        pname = "heukarya";
        version = "0.2.0.2";
        sha256 = "1ycfy29crdj8ch07wm77lfpg656vm2vl34mdqvsxfxijdxb23cxg";
-       buildDepends = [ base containers deepseq parallel random text ];
+       libraryHaskellDepends = [
+         base containers deepseq parallel random text
+       ];
        homepage = "https://github.com/t3476/heukarya";
        description = "A genetic programming based on tree structure";
        license = stdenv.lib.licenses.bsd3;
@@ -65076,7 +66709,9 @@ self: {
        sha256 = "1ys7xqdrnvwn6z2vgmh49zhfxj73pdmscblqcjk6qrwmpb2xha2s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring cairo filepath haskell98 ];
+       executableHaskellDepends = [
+         base bytestring cairo filepath haskell98
+       ];
        description = "Genetic Mona Lisa problem in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65092,7 +66727,7 @@ self: {
        sha256 = "0jsynxd33r7d5s5vn204z4wdgm4cq6qyjs7afa77p94ni5m2p3kb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cairo dph-seq filepath haskell98
        ];
        description = "Genetic Mona Lisa problem in Haskell - using Data Parallel Haskell";
@@ -65106,7 +66741,7 @@ self: {
        pname = "hex";
        version = "0.1.2";
        sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Convert strings into hexadecimal and back";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65117,7 +66752,7 @@ self: {
        pname = "hexdump";
        version = "0.1";
        sha256 = "012hknn9qhwr3hn3dbyd9s7vvaz4i3bvimmxkb1jyfckw3wjcnhc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library for forming hexdumps";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -65128,7 +66763,7 @@ self: {
        pname = "hexif";
        version = "0.2.0.0";
        sha256 = "1asv5vs694mcifffvm5a4gsplpz7frk3p3zr9lqqv1f172ql9lql";
-       buildDepends = [ base binary bytestring filepath ];
+       libraryHaskellDepends = [ base binary bytestring filepath ];
        jailbreak = true;
        homepage = "http://www.github.com/hansroland/hexif";
        description = "Reading Exif data form a JPEG file with Haskell";
@@ -65143,7 +66778,7 @@ self: {
        pname = "hexpat";
        version = "0.20.9";
        sha256 = "17cx8iafb07f2c8wmfmrfgpz9cjilciba6001klf42z039ghf72x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq List text transformers
          utf8-string
        ];
@@ -65161,7 +66796,7 @@ self: {
        pname = "hexpat-iteratee";
        version = "0.6";
        sha256 = "10cqgrrqg518lhr9mk6gq48fgc0sjzwiakm2amhqgfflva3q0nqn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers extensible-exceptions hexpat iteratee
          List parallel transformers
        ];
@@ -65180,7 +66815,7 @@ self: {
        pname = "hexpat-lens";
        version = "0.1.3";
        sha256 = "0283zpzj1xsav50d4k66i90fhll89flqnb1jv0x7gxppv1460vfr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring deepseq hexpat hexpat-tagsoup lens
        ];
        jailbreak = true;
@@ -65196,7 +66831,7 @@ self: {
        pname = "hexpat-pickle";
        version = "0.6";
        sha256 = "1k01s49mz4xxfbw1b7ab0ian2m0d7w5awbwf4jyz5ykgxg11kz9m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers extensible-exceptions hexpat text
          utf8-string
        ];
@@ -65213,8 +66848,8 @@ self: {
        pname = "hexpat-pickle-generic";
        version = "0.1.7";
        sha256 = "0l0h5n1afkg8zjq28h7aidsskdzf1i5lnz9jlq0hblwa9wamamis";
-       buildDepends = [ base bytestring hexpat text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring hexpat text ];
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -65229,7 +66864,7 @@ self: {
        pname = "hexpat-tagsoup";
        version = "0.1";
        sha256 = "0481446ba5m0h8lxmp216gzll0wr77mhk6hvm087749fwjj597aj";
-       buildDepends = [ base hexpat tagsoup ];
+       libraryHaskellDepends = [ base hexpat tagsoup ];
        description = "Parse (possibly malformed) HTML to hexpat tree";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65241,7 +66876,9 @@ self: {
        pname = "hexpr";
        version = "0.0.0.0";
        sha256 = "0wpmbzxdl63r2p398101ywzfs7b4p4x8ds4zzqbhvhs2r0fsg5wv";
-       buildDepends = [ base data-ref either mtl parsec transformers ];
+       libraryHaskellDepends = [
+         base data-ref either mtl parsec transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/Zankoku-Okuno/hexpr/";
        description = "A framework for symbolic, homoiconic languages";
@@ -65256,7 +66893,7 @@ self: {
        pname = "hexquote";
        version = "0.1";
        sha256 = "0fr0sn2k12yvbbwmldqkmwgg0qk6bfd6811h2dgpq77821y62hq8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers parsec template-haskell
        ];
        description = "Hexadecimal ByteString literals, with placeholders that bind variables";
@@ -65272,10 +66909,10 @@ self: {
        pname = "hexstring";
        version = "0.11.1";
        sha256 = "0509h2fhrpcsjf7gffychf700xca4a5l937jfgdzywpm4bzdpn20";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base16-bytestring binary bytestring text
        ];
-       testDepends = [ base binary bytestring hspec text ];
+       testHaskellDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Fast and safe representation of a hex string";
        license = stdenv.lib.licenses.mit;
@@ -65295,13 +66932,13 @@ self: {
        sha256 = "0dm9dyn12jgpc317pk5z3rhhgw2hbmbxyfba97jzq34b5z6crz0f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring case-insensitive configurator directory exceptions
          filepath HandsomeSoup http-types hxt iso8601-time MissingH mtl
          multipart optparse-applicative random stm tar temporary text time
          transformers unix unordered-containers utf8-string wai warp
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring case-insensitive configurator containers directory
          exceptions filepath HandsomeSoup hspec http-types hxt iso8601-time
          MissingH mtl multipart optparse-applicative random silently stm tar
@@ -65321,9 +66958,11 @@ self: {
        sha256 = "09pr24riz63irvykn6csbnm28z35ikwzg52ksah1p7zrywmgq9as";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       extraLibraries = [ doublefann ];
-       pkgconfigDepends = [ fann ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ doublefann ];
+       libraryPkgconfigDepends = [ fann ];
+       executableHaskellDepends = [ base ];
+       executableSystemDepends = [ doublefann ];
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65339,7 +66978,7 @@ self: {
        sha256 = "1n60h76hzkb4avnsl6lybq7ya4p4ghcdlplyml7fqwg7i20cak54";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring haskeline iteratee MissingH
          MonadCatchIO-transformers network transformers
        ];
@@ -65357,7 +66996,8 @@ self: {
        sha256 = "1jsq33cdpdd52yriky989vd8wlafi9dq1bxzild7sjw1mql69d71";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base eprocess mtl wx wxcore ];
+       libraryHaskellDepends = [ base eprocess mtl ];
+       executableHaskellDepends = [ wx wxcore ];
        jailbreak = true;
        homepage = "http://github.com/elbrujohalcon/hfiar";
        description = "Four in a Row in Haskell!!";
@@ -65371,7 +67011,7 @@ self: {
        pname = "hflags";
        version = "0.4";
        sha256 = "17zzx273kmnwwazmmns78cllz3l7wad1gi7hizgcxi68j04blhd4";
-       buildDepends = [ base containers template-haskell text ];
+       libraryHaskellDepends = [ base containers template-haskell text ];
        homepage = "http://github.com/errge/hflags";
        description = "Command line flag parser, very similar to Google's gflags";
        license = "unknown";
@@ -65387,13 +67027,13 @@ self: {
        sha256 = "0jwnyfl1rcd2439738jgs0rgl0p09d1j877z84g0ax3xh7cm4zj1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory haskeline hmatrix HTTP linear not-gloss parsec
          transformers
        ];
+       executableHaskellDepends = [ base ];
        description = "Hess-Smith panel code for inviscid 2-d airfoil analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hfov" = callPackage
@@ -65402,7 +67042,7 @@ self: {
        pname = "hfov";
        version = "1.0.2";
        sha256 = "04qwmjxm06akvpakc5imcx0ls9zlsz74s4r9p7xzj0q5fv20z09l";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/nornagon/hfov";
        description = "Field-of-view calculation for low-resolution 2D raster grids";
@@ -65419,7 +67059,7 @@ self: {
        sha256 = "060qx7wmqhlavamxxyzjyn2ar1cigvfw5ww7c0r70ns54xm0rw5z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base colour containers data-accessor data-accessor-template
          gd GLUT OpenGL OpenGLRaw
        ];
@@ -65435,7 +67075,7 @@ self: {
        pname = "hfsevents";
        version = "0.1.5";
        sha256 = "0hp9jjj59smfcs51d9zjhyvgdbn46l0rl0jr98wbzg3qya0vwj5k";
-       buildDepends = [ base bytestring cereal mtl text unix ];
+       libraryHaskellDepends = [ base bytestring cereal mtl text unix ];
        homepage = "http://github.com/luite/hfsevents";
        description = "File/folder watching for OS X";
        license = stdenv.lib.licenses.bsd3;
@@ -65448,7 +67088,9 @@ self: {
        pname = "hfusion";
        version = "0.0.6.1";
        sha256 = "05pisic8s6n2jqymyd2qjifr8kr824v3mflng1a0y4rp8pvbaj7r";
-       buildDepends = [ base containers haskell-src mtl pretty syb ];
+       libraryHaskellDepends = [
+         base containers haskell-src mtl pretty syb
+       ];
        homepage = "http://www.fing.edu.uy/inco/proyectos/fusion";
        description = "A library for fusing a subset of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -65465,7 +67107,7 @@ self: {
        sha256 = "0csibld3wrxi4jp35qqhfm17sw9fd5sca5rs9yd7i7l4jvsmfqhq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory HSH hslogger MissingH network parsec regex-compat
          regex-posix unix
        ];
@@ -65480,7 +67122,7 @@ self: {
        pname = "hgal";
        version = "2.0.0.2";
        sha256 = "17qw8izy54042g56mp3hdbmqcyk95cdarg58xggniwd85q2l5dpi";
-       buildDepends = [ array base containers mtl ];
+       libraryHaskellDepends = [ array base containers mtl ];
        description = "library for computation automorphism group and canonical labelling of a graph";
        license = "GPL";
      }) {};
@@ -65491,7 +67133,7 @@ self: {
        pname = "hgalib";
        version = "0.2";
        sha256 = "08a8lmh1rg3d1rmpfhcc2fzyc0kybqhzahx4hrvfrqjw7czcnmrw";
-       buildDepends = [ array base haskell98 mtl ];
+       libraryHaskellDepends = [ array base haskell98 mtl ];
        description = "Haskell Genetic Algorithm Library";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65506,8 +67148,8 @@ self: {
        pname = "hgdbmi";
        version = "0.2";
        sha256 = "1gfmpk9a909vc8khf40lr32l3srqqrfbcprp28dp6g02id1xmck4";
-       buildDepends = [ base parsec process stm unix ];
-       testDepends = [
+       libraryHaskellDepends = [ base parsec process stm unix ];
+       testHaskellDepends = [
          base directory HUnit process template-haskell temporary
          test-framework test-framework-hunit
        ];
@@ -65526,7 +67168,7 @@ self: {
        pname = "hgearman";
        version = "0.1.0.2";
        sha256 = "0bfipd7s6czp3aha0jx1yjzfzn8vywiswd07k68q2207j3br8yxk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring monad-control mtl network resource-pool
          transformers transformers-base unordered-containers
        ];
@@ -65542,7 +67184,9 @@ self: {
        sha256 = "190zm0lkr2ymq91ka84a3v2lhxjv9yl43abqcyxj6c3cjqym9ib5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath hylolib mtl random ];
+       executableHaskellDepends = [
+         base directory filepath hylolib mtl random
+       ];
        homepage = "http://www.glyc.dc.uba.ar/intohylo/hgen.php";
        description = "Random generation of modal and hybrid logic formulas";
        license = "GPL";
@@ -65555,7 +67199,7 @@ self: {
        pname = "hgeometric";
        version = "0.0.2.2";
        sha256 = "0l460mmbla7354dldil0d7qzba7dp4jhhsna0s27gdd9aad4flsd";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "ftp://ftp.cs.man.ac.uk/pub/toby/gpc/";
        description = "A geometric library with bindings to GPC";
        license = stdenv.lib.licenses.mit;
@@ -65572,12 +67216,12 @@ self: {
        pname = "hgeometry";
        version = "0.4.0.0";
        sha256 = "00z6xna83j9klba6rj09cdiriqgn45cx15pw22zylywn0s8agc4d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring containers data-clist fixed-vector
          hexpat lens linear mtl parsec random semigroups singletons text
          validation vector vinyl
        ];
-       testDepends = [ array base data-clist doctest lens linear ];
+       testHaskellDepends = [ array base data-clist doctest lens linear ];
        jailbreak = true;
        homepage = "http://fstaals.net/software/hgeometry";
        description = "Data types for geometric objects, geometric algorithms, and data structures";
@@ -65594,10 +67238,10 @@ self: {
        sha256 = "1pgzyd1nqzl7g88pcw7sncija5sd2k4zif9d8qfw96cw6m6kli96";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base Cabal containers directory filepath haskell-src-exts process
-         setlocale uniplate
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath process setlocale
        ];
+       executableHaskellDepends = [ base haskell-src-exts uniplate ];
        homepage = "https://github.com/vasylp/hgettext";
        description = "Bindings to libintl.h (gettext, bindtextdomain)";
        license = stdenv.lib.licenses.bsd3;
@@ -65614,10 +67258,11 @@ self: {
        sha256 = "05dxbz9z457b5nl0wsv95pgah9b74agdfwziqf7x79j5q2qqjc2l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring case-insensitive
-         cmdargs directory http-enumerator text
+         http-enumerator text
        ];
+       executableHaskellDepends = [ base cmdargs directory ];
        jailbreak = true;
        homepage = "https://github.com/noteed/hgithub";
        description = "Haskell bindings to the GitHub API";
@@ -65633,7 +67278,9 @@ self: {
        sha256 = "0bigji3i3311wlphxa0g8lkls0i4cn05d2m57fcrdfan8rayjwxr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base HGL HTam random utility-ht ];
+       executableHaskellDepends = [
+         array base HGL HTam random utility-ht
+       ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/hgl-example/";
        description = "Various animations generated using HGL";
@@ -65651,7 +67298,7 @@ self: {
        sha256 = "0amdfdp1xmh506lgfbb4war2spfb4gqls864q18psmvshcwlpsmv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath mtl parsec wl-pprint
        ];
        homepage = "http://github.com/polux/hgom";
@@ -65666,7 +67313,7 @@ self: {
        pname = "hgopher";
        version = "0.1.0.0";
        sha256 = "0j6ybi8f5csa9rpbpy8dc9p6l6vf2qh2zk589a9nqj2phllz7mwf";
-       buildDepends = [ base bytestring network ];
+       libraryHaskellDepends = [ base bytestring network ];
        jailbreak = true;
        description = "Gopher server";
        license = stdenv.lib.licenses.bsd3;
@@ -65678,8 +67325,8 @@ self: {
        pname = "hharp";
        version = "0.1.1.0";
        sha256 = "1f7k1jlc2ncxyxmc6rl603nw0lynqwv0dmj11hrcdmv282h4ff6s";
-       buildDepends = [ base ];
-       extraLibraries = [ harp ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ harp ];
        jailbreak = true;
        homepage = "http://www.harphttp.org";
        description = "Binding to libharp";
@@ -65698,12 +67345,17 @@ self: {
        sha256 = "16c3j7pc87mxk9rgk98bicl9jhvnyj2d9spfjvhiknpsixb847h9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base bytestring directory filepath
          optparse-applicative parsec process split template temporary text
          time
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         ansi-wl-pprint base bytestring directory filepath
+         optparse-applicative parsec process split template temporary text
+         time
+       ];
+       testHaskellDepends = [
          ansi-wl-pprint base bytestring directory doctest filepath hspec
          HUnit optparse-applicative parsec process silently split template
          temporary text time
@@ -65723,7 +67375,7 @@ self: {
        sha256 = "1skzr5ipxz61zrndwifkngw70zdf2yh5f8qpbmfzaq0bscrzdxg5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers haskell98 HUnit mtl parsec random
          readline time
        ];
@@ -65741,7 +67393,7 @@ self: {
        sha256 = "1f5cqqw9zn1nji0k2vp0ln1fdbzv9iwjqiaw9vd77kz9pz7p0kvq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base bytestring mtl network ];
+       executableHaskellDepends = [ array base bytestring mtl network ];
        description = "haskell robot for IChat protocol";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65755,9 +67407,9 @@ self: {
        pname = "hid";
        version = "0.2.1";
        sha256 = "18svis0bs4cilks71rih9m89mcdrll5hnjy18ccw81wj32cw9mdh";
-       buildDepends = [ base bytestring transformers ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ hidapi-libusb ];
+       libraryHaskellDepends = [ base bytestring transformers ];
+       libraryPkgconfigDepends = [ hidapi-libusb ];
+       libraryToolDepends = [ c2hs ];
        description = "Interface to hidapi library";
        license = stdenv.lib.licenses.bsd3;
      }) { hidapi-libusb = null;};
@@ -65768,8 +67420,8 @@ self: {
        pname = "hidapi";
        version = "0.1.3";
        sha256 = "0ql6avpwi2m89rrglj9zk3fyi8vl91xswagqv8h24b2xgm7pw5i0";
-       buildDepends = [ base bytestring deepseq-generics ];
-       extraLibraries = [ systemd ];
+       libraryHaskellDepends = [ base bytestring deepseq-generics ];
+       librarySystemDepends = [ systemd ];
        homepage = "https://github.com/vahokif/haskell-hidapi";
        description = "Haskell bindings to HIDAPI";
        license = stdenv.lib.licenses.mit;
@@ -65781,7 +67433,7 @@ self: {
        pname = "hieraclus";
        version = "0.1.2.1";
        sha256 = "11fjfmdjzvid0352d346p5xf44bl7dn8bd8pms5pi34xysdyr7pg";
-       buildDepends = [ base containers HUnit mtl multiset ];
+       libraryHaskellDepends = [ base containers HUnit mtl multiset ];
        description = "Automated clustering of arbitrary elements in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65794,11 +67446,10 @@ self: {
        pname = "hierarchical-clustering";
        version = "0.4.6";
        sha256 = "1cfcrnxqczqzqgpyipsw9dwfw1j75zd11vpd12i533f3p44pzwbm";
-       buildDepends = [ array base containers ];
-       testDepends = [ base hspec HUnit QuickCheck ];
+       libraryHaskellDepends = [ array base containers ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Fast algorithms for single, average/UPGMA and complete linkage clustering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hierarchical-clustering-diagrams" = callPackage
@@ -65809,8 +67460,10 @@ self: {
        pname = "hierarchical-clustering-diagrams";
        version = "0.3.2";
        sha256 = "06ncyzhql74ni746a9hzma1v0grw99vas4xglmyvgd6yhdwl08sr";
-       buildDepends = [ base diagrams-lib hierarchical-clustering ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base diagrams-lib hierarchical-clustering
+       ];
+       testHaskellDepends = [
          base diagrams-cairo diagrams-lib hierarchical-clustering hspec
          HUnit
        ];
@@ -65826,7 +67479,7 @@ self: {
        pname = "hierarchical-exceptions";
        version = "1.0.1";
        sha256 = "1yzhw7kgz5iljm8ndh5kyr18367cl6l120m1gkn5x9hpsh9mlamm";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell functions to easily create exception hierarchies";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -65839,7 +67492,7 @@ self: {
        pname = "hiernotify";
        version = "2011.4.12";
        sha256 = "1imgwi6b0cn9y4y7vgqsyfgsyxjvsl1wkmqmrf51jkfqasnqsqh5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath mtl old-time stm timers-updatable
        ];
        homepage = "http://github.com/paolino/hiernotify";
@@ -65856,7 +67509,7 @@ self: {
        sha256 = "1bwvhrzvrf004lypf0zrx6q6k6fn5qwvlk45vppmnv65v9vq519p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ghc ];
+       executableHaskellDepends = [ base ghc ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Memory usage statistics";
        license = "GPL";
@@ -65872,11 +67525,11 @@ self: {
        pname = "higher-leveldb";
        version = "0.3.0.0";
        sha256 = "0lghf21l3s4fmwnp3dsndzxqhamgppczzydkvnqlmx1x9jk5g1b6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal data-default leveldb-haskell lifted-base
          monad-control mtl resourcet transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal hspec leveldb-haskell lifted-base
          monad-control mtl process resourcet transformers transformers-base
        ];
@@ -65890,10 +67543,10 @@ self: {
      mkDerivation {
        pname = "higherorder";
        version = "0.0";
-       revision = "1";
        sha256 = "06cqhk9jalyps4v9w6wmpy9jdj3piwsp0wl3fvkzwa5iydlyvisz";
+       revision = "1";
        editedCabalFile = "c587250ea9c4828876f3837e82e5b1543e0dc2cc59bb4ec59ce0d947bae3d459";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Some higher order functions for Bool and []";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65908,11 +67561,11 @@ self: {
        pname = "highjson";
        version = "0.2.0.2";
        sha256 = "07qz7zb53vbpb9ixrw0qwn5qhvgwzvrvfkp343a1cvbb42slpmkz";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base buffer-builder bytestring containers hashable hvect
          scientific text unordered-containers vector
        ];
-       testDepends = [ base hspec QuickCheck text ];
+       testHaskellDepends = [ base hspec QuickCheck text ];
        homepage = "https://github.com/agrafix/highjson";
        description = "Very fast JSON serialisation and parsing library";
        license = stdenv.lib.licenses.mit;
@@ -65927,7 +67580,9 @@ self: {
        sha256 = "0nk7kdzzlyq2ml30mj661616h23zar3kqq8xd36lqs1ssr7nqnj7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ ansi-terminal base Cabal containers hackage-db ];
+       executableHaskellDepends = [
+         ansi-terminal base Cabal containers hackage-db
+       ];
        description = "Highlight package versions which differ from the latest version on Hackage";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65942,7 +67597,10 @@ self: {
        sha256 = "1x381ngd2gg2ff2rj7dyqmhy1achly2wbssjhsrcm0p6sxqab21x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-html bytestring filepath mtl pcre-light text
+       ];
+       executableHaskellDepends = [
          base blaze-html bytestring filepath mtl pcre-light text
        ];
        description = "source code highlighting";
@@ -65959,7 +67617,10 @@ self: {
        sha256 = "1gndzxi2i9hybqj6v14wflw8335v09q832knbx61hq9wcgq1hxwi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-html bytestring containers filepath mtl pcre-light text
+       ];
+       executableHaskellDepends = [
          base blaze-html blaze-markup bytestring containers filepath mtl
          pcre-light text
        ];
@@ -65974,19 +67635,19 @@ self: {
      mkDerivation {
        pname = "highlighting-kate";
        version = "0.6";
-       revision = "1";
        sha256 = "16334fbiyq6017zbgc59qc00h0bk24xh4dcrbqx63dvf72ac37dk";
+       revision = "1";
        editedCabalFile = "7466b389fd27b0520d371b2b225cb6024e9b7dd371cffa78169c219ab449558b";
+       configureFlags = [ "-fpcre-light" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base blaze-html containers filepath mtl parsec pcre-light
-         utf8-string
+       libraryHaskellDepends = [
+         base blaze-html containers mtl parsec pcre-light utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [ base blaze-html containers filepath ];
+       testHaskellDepends = [
          base blaze-html containers Diff directory filepath process
        ];
-       configureFlags = [ "-fpcre-light" ];
        homepage = "http://github.com/jgm/highlighting-kate";
        description = "Syntax highlighting";
        license = "GPL";
@@ -66002,7 +67663,7 @@ self: {
        sha256 = "0fankar6p0m6n1ffis4ww5x9dqdbjh9py63jirbimpdcrzcxcym5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring directory filepath optparse-applicative text
          transformers
        ];
@@ -66021,7 +67682,7 @@ self: {
        sha256 = "0ivrl5wymqzwcn7vyr3anychlk35003ksxsvr463qz768vbcql00";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory glib gtk haskell98 mozembed old-time parallel
          process unix
        ];
@@ -66042,7 +67703,10 @@ self: {
        sha256 = "09ya9966fn3ss7xxc1cd0izb5js35gwr2r1km881w4455sknl093";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring directory gtk HTTP http-conduit network temporary
+       ];
+       executableHaskellDepends = [
          base bytestring directory gtk HTTP http-conduit network temporary
        ];
        jailbreak = true;
@@ -66064,7 +67728,7 @@ self: {
        sha256 = "0rpgvv9hq8ai6imhsbfw95igfyqnnzdgx9mw6cpd8ch5kb6wfqig";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base binary bytestring cereal containers MissingH
          NetSNMP network old-time protobuf regex-posix stm text type-level
          unordered-containers vector
@@ -66087,11 +67751,15 @@ self: {
        sha256 = "09pywkm5xjk6djfwml1frnl21zndw03wp47a30vcnqcqf2a3awi0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         applicative-quoters base data-default descriptive directory
-         ghc-prim haskell-src-exts monad-loops mtl text transformers
+       libraryHaskellDepends = [
+         base data-default haskell-src-exts monad-loops mtl text
+         transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         applicative-quoters base descriptive directory ghc-prim
+         haskell-src-exts text
+       ];
+       testHaskellDepends = [
          base data-default directory haskell-src-exts hspec monad-loops mtl
          text
        ];
@@ -66108,7 +67776,7 @@ self: {
        pname = "hinduce-associations-apriori";
        version = "0.0.0.0";
        sha256 = "002ca2mxrmyvg1w5rr1n7ksc89qxqznasq0cw5grfr5h22pxs57z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq hinduce-missingh parallel vector
        ];
        homepage = "https://github.com/roberth/hinduce-associations-apriori";
@@ -66122,7 +67790,7 @@ self: {
        pname = "hinduce-classifier";
        version = "0.0.0.1";
        sha256 = "1cdx916xkpsy2ilsmmdkyqax2gb0cx6sgkydvjbiw7qibd76ylza";
-       buildDepends = [ base hinduce-missingh layout ];
+       libraryHaskellDepends = [ base hinduce-missingh layout ];
        description = "Interface and utilities for classifiers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66136,7 +67804,7 @@ self: {
        pname = "hinduce-classifier-decisiontree";
        version = "0.0.0.1";
        sha256 = "1hdz4lbbpy2yc5j7chkagjvslsakmv3hbz2s7lpz0isfq7ls9idl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base convertible hinduce-classifier hinduce-missingh layout
        ];
        description = "Decision Tree Classifiers for hInduce";
@@ -66153,7 +67821,7 @@ self: {
        pname = "hinduce-examples";
        version = "0.0.0.2";
        sha256 = "17jnrc8iji5byqbd08llwk0mw9yi1dq3biaszqp9jyinf50hcb4w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers convertible csv hinduce-associations-apriori
          hinduce-classifier hinduce-classifier-decisiontree hinduce-missingh
          layout vector
@@ -66169,7 +67837,7 @@ self: {
        pname = "hinduce-missingh";
        version = "0.0.0.0";
        sha256 = "1606fz8qhvwqidi798y3mxlmbmwn8yp3a4cl59j4i8s05vgbaj9z";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/roberth/hinduce-missingh";
        description = "Utility functions";
        license = stdenv.lib.licenses.bsd3;
@@ -66181,7 +67849,7 @@ self: {
        pname = "hinotify";
        version = "0.3.7";
        sha256 = "0i7mxg9ilzcgijda6j3ya5xnpbxa3wm9xswdfif95jim9w82sw0b";
-       buildDepends = [ base containers directory unix ];
+       libraryHaskellDepends = [ base containers directory unix ];
        homepage = "https://github.com/kolmodin/hinotify.git";
        description = "Haskell binding to inotify";
        license = stdenv.lib.licenses.bsd3;
@@ -66195,11 +67863,11 @@ self: {
        pname = "hinquire";
        version = "0.1.1";
        sha256 = "1mm0qi1y2qkiknb5s2jbgc3zljda52mi4mmh0fh7z8ck5rnng1x1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bifunctors QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
@@ -66217,7 +67885,7 @@ self: {
        pname = "hinstaller";
        version = "2008.2.16";
        sha256 = "1ldfqx98w7inpj76xyi0drh2lykfjfq9r34hlbcw7mv4bgxp4l8c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal directory filepath process template-haskell
        ];
        homepage = "http://www.wellquite.org/hinstaller/";
@@ -66233,11 +67901,11 @@ self: {
        pname = "hint";
        version = "0.4.2.3";
        sha256 = "1ds09bd369qmy2672vkhll8igbp63q83wdzwkpky4ab9pac3yayg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory exceptions extensible-exceptions filepath ghc
          ghc-mtl ghc-paths mtl random unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory exceptions extensible-exceptions filepath HUnit mtl
        ];
        homepage = "http://hub.darcs.net/jcpetruzza/hint";
@@ -66252,10 +67920,11 @@ self: {
        pname = "hint-server";
        version = "1.4.2";
        sha256 = "1rv6b0vlqs855m3bv047pvdkycmx2mv049cnp9iw8b97d0fsfyf5";
-       buildDepends = [ base eprocess exceptions hint monad-loops mtl ];
+       libraryHaskellDepends = [
+         base eprocess exceptions hint monad-loops mtl
+       ];
        description = "A server process that runs hint";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinvaders" = callPackage
@@ -66266,7 +67935,7 @@ self: {
        sha256 = "01v5szci7kbp3w2jsdcnzv9j3lbcl5bvn9ipcvp3v2xvfjik110h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 random ];
+       executableHaskellDepends = [ base haskell98 random ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Space Invaders";
        license = "GPL";
@@ -66279,7 +67948,7 @@ self: {
        pname = "hinze-streams";
        version = "1.0";
        sha256 = "137jjwcs3a9n2zybkqqfdy2m1a2ahpdcmficwfmn7ykdz487xcsq";
-       buildDepends = [ base haskell98 Stream ];
+       libraryHaskellDepends = [ base haskell98 Stream ];
        homepage = "http://code.haskell.org/~dons/code/hinze-streams";
        description = "Streams and Unique Fixed Points";
        license = stdenv.lib.licenses.bsd3;
@@ -66296,10 +67965,10 @@ self: {
      mkDerivation {
        pname = "hipbot";
        version = "0.5";
-       revision = "1";
        sha256 = "0acy9bp2dwszd01l514nx2crdxgb356k18pm9ravddljxr24n1hs";
+       revision = "1";
        editedCabalFile = "6ac1673be45c18dc010eeeef508a021ec9fef4e0a4e05864733f91aec8508ab8";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors blaze-builder bytestring either exceptions
          http-client http-client-tls http-types jwt lens mtl network-uri
          postgresql-simple resource-pool safe stm text time transformers
@@ -66309,6 +67978,7 @@ self: {
        homepage = "https://github.com/purefn/hipbot";
        description = "A library for building HipChat Bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hipe" = callPackage
@@ -66319,7 +67989,7 @@ self: {
        pname = "hipe";
        version = "0.2.0.0";
        sha256 = "1y8awzmvrvixlba1ndvw5rwm8i38lj1yf4mcfm6h7pmmvpdvr5ah";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hgeometry hxt parsec split text text-format
        ];
        homepage = "http://fstaals.net/software/hipe";
@@ -66335,7 +68005,9 @@ self: {
        sha256 = "0m3ribabhpdkwavhywjpc8iqqa9bbdl19d7g3agm4f402gd3rmvr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring directory functors mtl ];
+       executableHaskellDepends = [
+         base bytestring directory functors mtl
+       ];
        homepage = "http://closure.ath.cx/hips";
        description = "an IPS patcher";
        license = stdenv.lib.licenses.bsd3;
@@ -66351,7 +68023,7 @@ self: {
        sha256 = "1i291m3i3c082nsgg7mx2xx2a0q97kdmyashz26i4varqkwhz7qx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory gtk mtl network old-locale old-time time
          utf8-string
        ];
@@ -66371,7 +68043,7 @@ self: {
        sha256 = "0scn4gljgx0ig2fr4rfavk6k3pcychpxlasffd6gp2k1v3sb850v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base cmdargs containers csv hlbfgsb hmatrix mwc-random
          numeric-extras random statistics text text-format vector
          vector-space
@@ -66391,7 +68063,7 @@ self: {
        pname = "hissmetrics";
        version = "0.5.1";
        sha256 = "1rz0yxng4szhmjj1n6d36ljv3388ch8nih09yjrxk4l83zd6hc6d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit http-conduit http-types text time
        ];
        jailbreak = true;
@@ -66412,10 +68084,13 @@ self: {
        sha256 = "01c6k3f432yhcvcz7k4w29z7kbvhxlcnh57z1m47qbkymm5b4y7b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty base bytestring cmdargs containers hist-pl-dawg
-         hist-pl-fusion hist-pl-lexicon hist-pl-lmf hist-pl-transliter
-         morfeusz pipes polimorf text
+       libraryHaskellDepends = [
+         aeson base containers hist-pl-lexicon hist-pl-transliter morfeusz
+         text
+       ];
+       executableHaskellDepends = [
+         aeson-pretty base bytestring cmdargs containers hist-pl-dawg
+         hist-pl-fusion hist-pl-lexicon hist-pl-lmf pipes polimorf
        ];
        jailbreak = true;
        homepage = "https://github.com/kawu/hist-pl/tree/master/umbrella";
@@ -66431,7 +68106,9 @@ self: {
        pname = "hist-pl-dawg";
        version = "0.2.1";
        sha256 = "1ghhwabi46dimzfk79nkcnk8s4rlcyvqfcpr8ay7sfy7xns2ahjg";
-       buildDepends = [ base binary containers dawg text text-binary ];
+       libraryHaskellDepends = [
+         base binary containers dawg text text-binary
+       ];
        homepage = "https://github.com/kawu/hist-pl/tree/master/dawg";
        description = "A generic, DAWG-based dictionary";
        license = stdenv.lib.licenses.bsd3;
@@ -66445,7 +68122,7 @@ self: {
        pname = "hist-pl-fusion";
        version = "0.5.3";
        sha256 = "0ism9qw3g0x0r40qm6v0gj1b2fj5zdnfik7b4h0b0dqyi08m6sq3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dawg hist-pl-dawg hist-pl-lexicon polimorf
          text text-binary
        ];
@@ -66463,7 +68140,7 @@ self: {
        pname = "hist-pl-lexicon";
        version = "0.6.1";
        sha256 = "1baq1a5l44q56msp2y2m9hyd5v841jkxm0cdlgi816fmc0768cqk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dawg directory filepath hist-pl-dawg
          hist-pl-types pipes text transformers
        ];
@@ -66479,7 +68156,7 @@ self: {
        pname = "hist-pl-lmf";
        version = "0.1.0";
        sha256 = "146vz15fig8k1wcvcw7fg64abxvg1nyarvhigz9jkzf5yngkzwvm";
-       buildDepends = [ base hist-pl-types polysoup text ];
+       libraryHaskellDepends = [ base hist-pl-types polysoup text ];
        jailbreak = true;
        homepage = "https://github.com/kawu/hist-pl/tree/master/lmf";
        description = "LMF parsing for the historical dictionary of Polish";
@@ -66493,7 +68170,7 @@ self: {
        pname = "hist-pl-transliter";
        version = "0.1.1";
        sha256 = "146ywyh67a0hasgcpfmffrj8w1kg6anksaa3mm9f80k83shqhvrb";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        homepage = "https://github.com/kawu/hist-pl/tree/master/transliter";
        description = "A simple EDSL for transliteration rules";
        license = stdenv.lib.licenses.bsd3;
@@ -66505,7 +68182,7 @@ self: {
        pname = "hist-pl-types";
        version = "0.1.0";
        sha256 = "0i13aj1xcwap0k3w48vyiiganbvj93zydawmw3gw7m0kr6nl5l9v";
-       buildDepends = [ base binary text text-binary ];
+       libraryHaskellDepends = [ base binary text text-binary ];
        jailbreak = true;
        homepage = "https://github.com/kawu/hist-pl/tree/master/types";
        description = "Types in the historical dictionary of Polish";
@@ -66520,7 +68197,7 @@ self: {
        pname = "histogram-fill";
        version = "0.8.4.1";
        sha256 = "0zamqza4ky90l27sjgv55rp7s1g4hs0k0qn2qza7lfwk991ijn9q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq ghc-prim monad-primitive primitive vector
        ];
        homepage = "https://github.com/Shimuuar/histogram-fill/";
@@ -66534,7 +68211,7 @@ self: {
        pname = "histogram-fill-binary";
        version = "0.6.2.1";
        sha256 = "0bv70h1q8h50x3sr8ia6855vw0rrbvnzlnnh45k4i1dfadj6zsi2";
-       buildDepends = [ base binary histogram-fill vector ];
+       libraryHaskellDepends = [ base binary histogram-fill vector ];
        homepage = "https://github.com/Shimuuar/histogram-fill/";
        description = "Binary instances for histogram-fill package";
        license = stdenv.lib.licenses.bsd3;
@@ -66546,7 +68223,7 @@ self: {
        pname = "histogram-fill-cereal";
        version = "0.6.2.0";
        sha256 = "17bnn6cb64333ak0qh841192jh2zwxg73rbc3zh5agp00wi23ism";
-       buildDepends = [ base cereal histogram-fill vector ];
+       libraryHaskellDepends = [ base cereal histogram-fill vector ];
        homepage = "http://bitbucket.org/Shimuuar/histogram-fill-cereal/";
        description = "Library for histograms creation";
        license = stdenv.lib.licenses.bsd3;
@@ -66562,7 +68239,7 @@ self: {
        sha256 = "1lgajnq092jk4izy86qcw71ghxz6b8mprm4ha3ybrm5i2rlh12r6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath process regex-compat regex-posix
        ];
        jailbreak = true;
@@ -66583,12 +68260,12 @@ self: {
        sha256 = "0wg44vgd5jzi0r0vg8k5zrvlr7rcrb4nrp862c6y991941qv71nv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base byteable bytestring containers cryptohash hourglass
          mtl parsec patience random system-fileio system-filepath
          unix-compat utf8-string vector zlib zlib-bindings
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytedump bytestring hourglass tasty tasty-quickcheck
        ];
        homepage = "http://github.com/vincenthz/hit";
@@ -66604,7 +68281,7 @@ self: {
        pname = "hjcase";
        version = "0.2.0.0";
        sha256 = "0d1pb24jqk2dj635hy1way9axr9719g1ppxmxr4jpbb0sj6xphjk";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring HUnit test-framework test-framework-hunit
          text unordered-containers vector
        ];
@@ -66620,7 +68297,7 @@ self: {
        pname = "hjpath";
        version = "3.0.1";
        sha256 = "0wmzxwi24q7r0yxnalzqnn3k0bzf7wc4ql26dv94pvzir156kahj";
-       buildDepends = [ base containers hjson parsec ];
+       libraryHaskellDepends = [ base containers hjson parsec ];
        homepage = "http://bitcheese.net/wiki/code/hjpath";
        description = "XPath-like syntax for querying JSON";
        license = stdenv.lib.licenses.bsd3;
@@ -66636,7 +68313,7 @@ self: {
        sha256 = "0gk4misxbkc2x8hh7ynrj1ma91fs0h6q702w6r0kjq136fh48zhi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory mtl parsec regex-compat
        ];
        homepage = "http://www.haskell.org/haskellwiki/Libraries_and_tools/HJS";
@@ -66656,11 +68333,14 @@ self: {
        sha256 = "1mzi7czzw1b8avkfzmsl79hqg57dcrcfp6klzx15drnbl7c1zn7l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers language-javascript text
+       ];
+       executableHaskellDepends = [
          base blaze-builder bytestring containers language-javascript
          optparse-applicative text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring Cabal containers HUnit
          language-javascript QuickCheck test-framework test-framework-hunit
          text
@@ -66676,7 +68356,7 @@ self: {
        pname = "hjson";
        version = "1.3.2";
        sha256 = "1r59g5ypqjsldflsddg7pzpa6j8jps5nwm4h9cwiw7qk734rjik8";
-       buildDepends = [ base containers parsec ];
+       libraryHaskellDepends = [ base containers parsec ];
        description = "JSON parsing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66687,7 +68367,7 @@ self: {
        pname = "hjson-query";
        version = "1.0.2";
        sha256 = "0sj86rm5pz0q9079f5kjnpz51dxvvq72waaf8h64jzrrhkpz8mlx";
-       buildDepends = [ base containers hjson ];
+       libraryHaskellDepends = [ base containers hjson ];
        description = "library for querying from JSON";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66700,8 +68380,10 @@ self: {
        pname = "hjsonpointer";
        version = "0.2.0.3";
        sha256 = "13n0fzhd2fmy7k5iafmg3cxd2lmpsfvvbg1a0q793wz5f3glw0l3";
-       buildDepends = [ aeson base text unordered-containers vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         aeson base text unordered-containers vector
+       ];
+       testHaskellDepends = [
          aeson base http-types HUnit test-framework test-framework-hunit
          text unordered-containers vector
        ];
@@ -66721,11 +68403,11 @@ self: {
        pname = "hjsonschema";
        version = "0.6.0.1";
        sha256 = "1m7fg179khkmyhnhqa32gbaf2dgg27i4n36fafqm60pyc5kzhz69";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring file-embed hashable hjsonpointer http-client
          http-types regexpr scientific text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async base bytestring directory filepath HUnit test-framework
          test-framework-hunit text unordered-containers vector
          wai-app-static warp
@@ -66747,10 +68429,12 @@ self: {
        sha256 = "03v8law4yfm63f44zyiqngjmpismk8clqisq4sl4gcp1yc1hn704";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base base-unicode-symbols containers derive directory filepath
-         frquotes mtl process template-haskell transformers uniplate
-         utf8-string
+       libraryHaskellDepends = [
+         base base-unicode-symbols containers derive directory filepath mtl
+         process template-haskell transformers uniplate utf8-string
+       ];
+       executableHaskellDepends = [
+         base base-unicode-symbols containers frquotes mtl transformers
        ];
        description = "A library to build valid LaTeX files";
        license = stdenv.lib.licenses.bsd3;
@@ -66765,12 +68449,12 @@ self: {
        pname = "hlbfgsb";
        version = "0.0.1.0";
        sha256 = "0nar59rbi5zr6gi2k0f49f09fnxcmshnq9bb2dh973a4y3gcw6dx";
-       buildDepends = [ base vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ gfortran ];
+       libraryToolDepends = [ gfortran ];
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit vector
        ];
-       buildTools = [ gfortran ];
-       extraLibraries = [ gfortran ];
        homepage = "http://people.ksp.sk/~ivan/hlbfgsb";
        description = "Haskell binding to L-BFGS-B version 3.0";
        license = stdenv.lib.licenses.bsd3;
@@ -66787,7 +68471,10 @@ self: {
        sha256 = "14yqc02kfp2c9i22inma29cprqz9k8yx6c7m90kwimv4psv8766a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring haskell98 parallel
+       ];
+       executableHaskellDepends = [
          array base bytestring bytestring-csv containers haskell98 parallel
        ];
        jailbreak = true;
@@ -66811,13 +68498,19 @@ self: {
        sha256 = "1gixj6i99rqbn6ziwpni2scgv9sdd3yvxj6d3i1ivirmsx2rd3bm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat cmdargs containers csv directory filepath
          haskeline hledger-lib HUnit mtl mtl-compat old-time parsec
          pretty-show process regex-tdfa safe shakespeare split tabular
          terminfo text time unordered-containers utf8-string wizards
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base base-compat cmdargs containers csv directory filepath
+         haskeline hledger-lib HUnit mtl mtl-compat old-time parsec
+         pretty-show process regex-tdfa safe shakespeare split tabular text
+         time unordered-containers utf8-string wizards
+       ];
+       testHaskellDepends = [
          base base-compat cmdargs containers csv directory filepath
          haskeline hledger-lib HUnit mtl mtl-compat old-time parsec
          pretty-show process regex-tdfa safe shakespeare split tabular
@@ -66838,7 +68531,7 @@ self: {
        sha256 = "1yk563032ir98gqdvxazjjl1alg6q1pflzawh11pr3zrdnriracn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Chart cmdargs colour containers hledger hledger-lib HUnit safe
          time
        ];
@@ -66857,7 +68550,7 @@ self: {
        sha256 = "1p0b2xc2axsigmbc5lhl12acsjjvn0j8gjlwp3v4ggyanwyj686r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hledger-lib time ];
+       executableHaskellDepends = [ base hledger-lib time ];
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
@@ -66871,7 +68564,9 @@ self: {
        sha256 = "16knk1cwrpg5jn6vgcab7hqpjzg33ysz57x1f2glrmhhv1slmbfn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal Decimal hledger-lib mtl time ];
+       executableHaskellDepends = [
+         base Cabal Decimal hledger-lib mtl time
+       ];
        homepage = "http://github.com/peti/hledger-interest";
        description = "computes interest for a given account";
        license = stdenv.lib.licenses.bsd3;
@@ -66887,7 +68582,9 @@ self: {
        sha256 = "1gi7v5xsx1hv4lljlx19v4rwvnh7raglxzh4mgyiwlnwqybc2cr4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal Decimal hledger-lib statistics time ];
+       executableHaskellDepends = [
+         base Cabal Decimal hledger-lib statistics time
+       ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66903,12 +68600,12 @@ self: {
        pname = "hledger-lib";
        version = "0.26";
        sha256 = "0cm5d65kfxha6280q9iibrj4a0p5g6srfl28x1f8vay41xjg80nh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base-compat blaze-markup bytestring cmdargs containers
          csv Decimal directory filepath HUnit mtl mtl-compat old-time parsec
          pretty-show regex-tdfa safe split time transformers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base base-compat blaze-markup cmdargs containers csv Decimal
          directory filepath HUnit mtl mtl-compat old-time parsec pretty-show
          regex-tdfa safe split test-framework test-framework-hunit time
@@ -66929,7 +68626,7 @@ self: {
        sha256 = "10aq9apxz6nrzvvynha0wkhy34dn8dybizr8assni6rns8ylh188";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs hledger hledger-lib HUnit safe time vty
        ];
        jailbreak = true;
@@ -66954,7 +68651,7 @@ self: {
        sha256 = "019r4jy0kss62ya883rgzkc6lkp14f0dfkdfiahpl4587fcvpxsi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat blaze-html blaze-markup bytestring clientsession
          cmdargs conduit-extra data-default directory filepath hjsmin
          hledger hledger-lib http-client http-conduit HUnit json parsec safe
@@ -66962,7 +68659,15 @@ self: {
          wai-handler-launch warp yaml yesod yesod-core yesod-form
          yesod-static
        ];
-       testDepends = [ base base-compat hspec yesod yesod-test ];
+       executableHaskellDepends = [
+         base base-compat blaze-html blaze-markup bytestring clientsession
+         cmdargs conduit-extra data-default directory filepath hjsmin
+         hledger hledger-lib http-client http-conduit HUnit json parsec safe
+         shakespeare template-haskell text time transformers wai wai-extra
+         wai-handler-launch warp yaml yesod yesod-core yesod-form
+         yesod-static
+       ];
+       testHaskellDepends = [ base base-compat hspec yesod yesod-test ];
        homepage = "http://hledger.org";
        description = "A web interface for the hledger accounting tool";
        license = "GPL";
@@ -66975,9 +68680,9 @@ self: {
        pname = "hlibBladeRF";
        version = "0.1.0.6";
        sha256 = "15k15afy04kld6ar317lk441js873fcyk8qh92r98hnhbpq3nrmw";
-       buildDepends = [ base bindings-DSL bytestring ];
-       testDepends = [ base hlint ];
-       pkgconfigDepends = [ libbladeRF ];
+       libraryHaskellDepends = [ base bindings-DSL bytestring ];
+       libraryPkgconfigDepends = [ libbladeRF ];
+       testHaskellDepends = [ base hlint ];
        jailbreak = true;
        homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF";
        description = "Haskell binding to libBladeRF SDR library";
@@ -66990,8 +68695,8 @@ self: {
        pname = "hlibev";
        version = "0.4.0";
        sha256 = "0416w0k5ahnj57gc6n15ihpsyznmm36s1sjkycl35l7s8bxdldyw";
-       buildDepends = [ base network ];
-       extraLibraries = [ ev ];
+       libraryHaskellDepends = [ base network ];
+       librarySystemDepends = [ ev ];
        homepage = "http://github.com/aycanirican/hlibev";
        description = "FFI interface to libev";
        license = stdenv.lib.licenses.bsd3;
@@ -67004,26 +68709,26 @@ self: {
        pname = "hlibfam";
        version = "0.2";
        sha256 = "10rxwfq2ppmqs3kjb8cq6l04g0qsxqy7w7ri7dj013kiz7rzk1yd";
-       buildDepends = [ base ];
-       extraLibraries = [ fam ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ fam ];
        description = "FFI interface to libFAM";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) fam;};
 
   "hlibgit2" = callPackage
-    ({ mkDerivation, base, bindings-DSL, git, openssl, process, zlib }:
+    ({ mkDerivation, base, bindings-DSL, openssl, process, zlib }:
      mkDerivation {
        pname = "hlibgit2";
        version = "0.18.0.14";
        sha256 = "0fxglcgi0iwj9xqgx1f3dixia9pqfzz0yq9iq7flaggpr9pvn3n0";
-       buildDepends = [ base bindings-DSL zlib ];
-       testDepends = [ base process ];
-       buildTools = [ git ];
-       extraLibraries = [ openssl ];
+       libraryHaskellDepends = [ base bindings-DSL zlib ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base process ];
        description = "Low-level bindings to libgit2";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) git;  inherit (pkgs) openssl;};
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) { inherit (pkgs) openssl;};
 
   "hlibsass" = callPackage
     ({ mkDerivation, base, hspec, sass }:
@@ -67031,13 +68736,12 @@ self: {
        pname = "hlibsass";
        version = "0.1.4.0";
        sha256 = "062qsg5mr0qsa5ah1d0xx7njkpn4j4g6x4sv3skgvgc9855gywr6";
-       buildDepends = [ base ];
-       testDepends = [ base hspec ];
-       extraLibraries = [ sass ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ sass ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/jakubfijalkowski/hlibsass";
        description = "Low-level bindings to Libsass";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { sass = null;};
 
   "hlint" = callPackage
@@ -67051,10 +68755,11 @@ self: {
        sha256 = "14v3rdjjlml9nimdk7d5dvir2bw78ai49yylvms9lnzmw29s3546";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base cmdargs containers cpphs directory extra
          filepath haskell-src-exts hscolour process transformers uniplate
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://community.haskell.org/~ndm/hlint/";
        description = "Source code suggestions";
        license = stdenv.lib.licenses.bsd3;
@@ -67066,7 +68771,7 @@ self: {
        pname = "hlogger";
        version = "0.0.3.0";
        sha256 = "1q3jsnxy7x0lv7wqfv9hlqnr22661k4agbb8yjbhj32fxyjqrn4f";
-       buildDepends = [ base old-locale time ];
+       libraryHaskellDepends = [ base old-locale time ];
        homepage = "http://www.pontarius.org/sub-projects/hlogger/";
        description = "Simple, concurrent, extendable and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
@@ -67083,8 +68788,9 @@ self: {
        sha256 = "1njj7cvj9zjy0gghkr33bzwsv6lj27xvf56kicsr0pyyn76wplv5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring curl json regex-base regex-posix
+       libraryHaskellDepends = [ base curl json ];
+       executableHaskellDepends = [
+         base bytestring curl regex-base regex-posix
        ];
        description = "Library and utility interfacing to longurl.org";
        license = stdenv.lib.licenses.bsd3;
@@ -67096,7 +68802,7 @@ self: {
        pname = "hls";
        version = "0.15";
        sha256 = "0h32fyvnqkxx8c9vfpdjvnqaxkvr8b15myjavxmnm6kwh7v2796l";
-       buildDepends = [ base containers hcg-minus hps ];
+       libraryHaskellDepends = [ base containers hcg-minus hps ];
        homepage = "http://rd.slavepianos.org/t/hls";
        description = "Haskell Lindenmayer Systems";
        license = "GPL";
@@ -67107,12 +68813,17 @@ self: {
      mkDerivation {
        pname = "hlwm";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "1vp21440v9gq4mvnqnsw1ha72ywgc4hmp137pkpvs5p13ixyfrgi";
+       revision = "1";
        editedCabalFile = "ce22b9186e03c83f13e56b33630f4af561b604c51374c23dc1ef4e24ced9a54e";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base monads-tf stm transformers unix X11 ];
+       libraryHaskellDepends = [
+         base monads-tf stm transformers unix X11
+       ];
+       executableHaskellDepends = [
+         base monads-tf stm transformers unix X11
+       ];
        jailbreak = true;
        description = "Bindings to the herbstluftwm window manager";
        license = stdenv.lib.licenses.bsd2;
@@ -67124,7 +68835,7 @@ self: {
        pname = "hly";
        version = "0.15";
        sha256 = "192szfq39g3fdcdsxj4bsi13bfha8gjbqbixav3iywmdsgxp1hj8";
-       buildDepends = [ base directory filepath hmt process ];
+       libraryHaskellDepends = [ base directory filepath hmt process ];
        homepage = "http://rd.slavepianos.org/t/hly";
        description = "Haskell LilyPond";
        license = "GPL";
@@ -67141,9 +68852,10 @@ self: {
        sha256 = "1s4ichb5dchcimcq9pvdddv2ibbdk2cb2b7p0l7p9s5lxn53bxgg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring random safe tokyocabinet-haskell utf8-string
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://bitcheese.net/wiki/code/hmark";
        description = "A tool and library for Markov chains based text generation";
        license = stdenv.lib.licenses.bsd3;
@@ -67156,7 +68868,9 @@ self: {
        pname = "hmarkup";
        version = "3000.0.1";
        sha256 = "0p6f1jd1b01dvzffiac17f8z0l403f54vrph8k9b3549lpjfh452";
-       buildDepends = [ base containers mtl network parsec xhtml ];
+       libraryHaskellDepends = [
+         base containers mtl network parsec xhtml
+       ];
        description = "Simple wikitext-like markup format implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67164,21 +68878,21 @@ self: {
 
   "hmatrix" = callPackage
     ({ mkDerivation, array, base, binary, blas, bytestring, deepseq
-     , liblapack, random, split, storable-complex, vector
+     , lapack, random, split, storable-complex, vector
      }:
      mkDerivation {
        pname = "hmatrix";
        version = "0.16.1.5";
        sha256 = "1da1iy2rzz51l69nixacsl7gqhkzld1w8z5h0klkha3mcnf1kkkq";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring deepseq random split storable-complex
          vector
        ];
-       extraLibraries = [ blas liblapack ];
+       librarySystemDepends = [ blas lapack ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numeric Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) blas;  inherit (pkgs) liblapack;};
+     }) { inherit (pkgs) blas;  lapack = null;};
 
   "hmatrix-banded" = callPackage
     ({ mkDerivation, base, hmatrix, lapack, transformers }:
@@ -67186,8 +68900,8 @@ self: {
        pname = "hmatrix-banded";
        version = "0.0";
        sha256 = "05jgm3hnlylnfhavcicjbhbxq929whm6mapggfwbxkzajhh0paaj";
-       buildDepends = [ base hmatrix transformers ];
-       extraLibraries = [ lapack ];
+       libraryHaskellDepends = [ base hmatrix transformers ];
+       librarySystemDepends = [ lapack ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/hmatrix-banded/";
        description = "HMatrix interface to LAPACK functions for banded matrices";
@@ -67201,7 +68915,7 @@ self: {
        pname = "hmatrix-csv";
        version = "0.1.0.2";
        sha256 = "0cbnxzl9ymqnyrikwk13d660l3hmi4ln5zdx0q814k8b7hyvsnkb";
-       buildDepends = [ base bytestring cassava hmatrix vector ];
+       libraryHaskellDepends = [ base bytestring cassava hmatrix vector ];
        homepage = "https://github.com/grtlr/hmatrix-csv";
        description = "CSV encoding and decoding for hmatrix";
        license = stdenv.lib.licenses.bsd3;
@@ -67213,8 +68927,8 @@ self: {
        pname = "hmatrix-glpk";
        version = "0.4.1.0";
        sha256 = "0jy00mblbqp7bx0nxmvzfpa94b21fbl4cam0mha673hzq11rfrxi";
-       buildDepends = [ base containers hmatrix ];
-       extraLibraries = [ glpk ];
+       libraryHaskellDepends = [ base containers hmatrix ];
+       librarySystemDepends = [ glpk ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Linear Programming based on GLPK";
        license = "GPL";
@@ -67227,8 +68941,10 @@ self: {
        pname = "hmatrix-gsl";
        version = "0.16.0.3";
        sha256 = "07hg9rfrr1029n9q8xyicyh4rr9x4c02cqn1xxnks9p9qyccf4kg";
-       buildDepends = [ array base hmatrix process random vector ];
-       pkgconfigDepends = [ gsl ];
+       libraryHaskellDepends = [
+         array base hmatrix process random vector
+       ];
+       libraryPkgconfigDepends = [ gsl ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numerical computation";
        license = "GPL";
@@ -67240,8 +68956,8 @@ self: {
        pname = "hmatrix-gsl-stats";
        version = "0.4.1";
        sha256 = "113gi92xdck75zrllpncrnm72fj8wd2wcbf237jflkpbqcmzf8zq";
-       buildDepends = [ base binary hmatrix storable-complex ];
-       pkgconfigDepends = [ gsl ];
+       libraryHaskellDepends = [ base binary hmatrix storable-complex ];
+       libraryPkgconfigDepends = [ gsl ];
        homepage = "http://code.haskell.org/hmatrix-gsl-stats";
        description = "GSL Statistics interface";
        license = stdenv.lib.licenses.bsd3;
@@ -67254,7 +68970,7 @@ self: {
        pname = "hmatrix-mmap";
        version = "0.0.5";
        sha256 = "03z1f1xqw4hqh41q6hh8p103cl7dg9hqcawqlinapfmkvw5mzy8d";
-       buildDepends = [ base hmatrix mmap ];
+       libraryHaskellDepends = [ base hmatrix mmap ];
        homepage = "http://github.com/alanfalloon/hmatrix-mmap";
        description = "Memory map Vector from disk into memory efficiently";
        license = stdenv.lib.licenses.bsd3;
@@ -67268,7 +68984,7 @@ self: {
        sha256 = "0afmpwfi4hqz5bpcsm579mcvz1dx7vxqmqj2rb6axnw9512xyarj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base hmatrix ];
+       libraryHaskellDepends = [ base hmatrix ];
        homepage = "http://github.com/alanfalloon/hmatrix-nipals";
        description = "NIPALS method for Principal Components Analysis on large data-sets";
        license = stdenv.lib.licenses.lgpl21;
@@ -67280,8 +68996,8 @@ self: {
        pname = "hmatrix-quadprogpp";
        version = "0.2.0.2";
        sha256 = "02ysxyy7ixpnrghl0ignfmjy6j358i5xbmklmpxykkg27jgzvic3";
-       buildDepends = [ base hmatrix vector ];
-       extraLibraries = [ QuadProgpp ];
+       libraryHaskellDepends = [ base hmatrix vector ];
+       librarySystemDepends = [ QuadProgpp ];
        description = "Bindings to the QuadProg++ quadratic programming library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67293,24 +69009,23 @@ self: {
        pname = "hmatrix-repa";
        version = "0.1.2.1";
        sha256 = "0xx02kll13c2zw5x13p9746av2yhgpybfxi508qgi84drfa8caa8";
-       buildDepends = [ base hmatrix repa vector ];
+       libraryHaskellDepends = [ base hmatrix repa vector ];
        homepage = "http://code.haskell.org/hmatrix-repa";
        description = "Adaptors for interoperability between hmatrix and repa";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hmatrix-special" = callPackage
-    ({ mkDerivation, base, gsl, hmatrix, hmatrix-gsl }:
+    ({ mkDerivation, base, hmatrix, hmatrix-gsl }:
      mkDerivation {
        pname = "hmatrix-special";
        version = "0.3.0.1";
        sha256 = "1ziqzbfrk7xyah5n0cys1ccnmj2z91wxdamanv3y5v717zhdrqix";
-       buildDepends = [ base hmatrix hmatrix-gsl ];
-       extraLibraries = [ gsl ];
+       libraryHaskellDepends = [ base hmatrix hmatrix-gsl ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Interface to GSL special functions";
        license = "GPL";
-     }) { inherit (pkgs) gsl;};
+     }) {};
 
   "hmatrix-static" = callPackage
     ({ mkDerivation, array, base, haskell-src-meta, hmatrix, parsec
@@ -67320,7 +69035,7 @@ self: {
        pname = "hmatrix-static";
        version = "0.3.0.2";
        sha256 = "1qjxj8k4cracinyyjpk0nr3c5n119v39kpxig78c11cjhvhm3zgi";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base haskell-src-meta hmatrix parsec template-haskell tfp
        ];
        jailbreak = true;
@@ -67338,7 +69053,8 @@ self: {
        sha256 = "0mi41n31i4bjnqjnsmqs4mbrprg3sx4vx4wqixgyp3qk0jm6lijm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base hmatrix ];
+       libraryHaskellDepends = [ base hmatrix ];
+       executableHaskellDepends = [ base hmatrix ];
        homepage = "http://github.com/bgamari/hmatrix-svdlibc";
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
@@ -67352,7 +69068,7 @@ self: {
        pname = "hmatrix-syntax";
        version = "0.1.2.1";
        sha256 = "0qy5dx480hf9i03d16kylg2l8dsj10lzwfbik5ijqa4x3h7h038b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts haskell-src-meta hmatrix template-haskell
        ];
        jailbreak = true;
@@ -67370,10 +69086,10 @@ self: {
        pname = "hmatrix-tests";
        version = "0.4.1.0";
        sha256 = "0jrq9719japf9a7v14xbwqj4fs8y14wkji13jhyn00x1xpp4nkh3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hmatrix hmatrix-gsl HUnit QuickCheck random
        ];
-       testDepends = [ base HUnit QuickCheck random ];
+       testHaskellDepends = [ base HUnit QuickCheck random ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
@@ -67388,7 +69104,7 @@ self: {
        pname = "hmeap";
        version = "0.15";
        sha256 = "19hip2xzlsgj1fd8y4l4zhn4lcj8n8qyrayn6idzvlskx4vca0bh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring bytestring-lexing delimited-text parsec
        ];
        homepage = "http://rd.slavepianos.org/t/hmeap";
@@ -67407,7 +69123,7 @@ self: {
        sha256 = "1dnmvzy7vkx2rfbkkqapfpql8h0gm9sq0333r90hy5nsyl9hhbq8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring bytestring-lexing delimited-text gnuplot
          hmatrix hmeap hosc hsc3 parsec
        ];
@@ -67426,7 +69142,7 @@ self: {
        pname = "hmemdb";
        version = "0.4.0.0";
        sha256 = "0zdz9nkianzviy0rn7fvzs01ymnz89p25kiis64rfvj3zwxk535w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers monad-stm stm transformers
        ];
        description = "In-memory relational database";
@@ -67441,10 +69157,11 @@ self: {
        sha256 = "0ym3nzyx1jwcc7m6qj8zchs2q73rj82d7f1r2rvykhns7ca20hrp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base MissingH process ];
+       executableHaskellDepends = [ base MissingH process ];
        jailbreak = true;
        description = "CLI fuzzy finder and launcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmidi" = callPackage
@@ -67453,7 +69170,7 @@ self: {
        pname = "hmidi";
        version = "0.2.2.0";
        sha256 = "1khqhw69c3bf3qj8pzxz876xisr099rgdgf2rr101x83h9hj8acb";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Binding to the OS level MIDI services";
        license = stdenv.lib.licenses.bsd3;
@@ -67469,7 +69186,8 @@ self: {
        sha256 = "08cq1lk1nkhkcjjjvkzy4xrr0gx6j2lpsv2vmj25kg6j9j33ilxh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [
          base bytestring containers directory filepath mtl parsec pcre-light
          process unix
        ];
@@ -67488,7 +69206,7 @@ self: {
        pname = "hmm";
        version = "0.2.1.1";
        sha256 = "08gdicnhls8y180il2k51zrcra1acw8m1qw0s2nz5w57mhfnxq31";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base data-memocombinators list-extras logfloat
        ];
        homepage = "https://github.com/mikeizbicki/hmm";
@@ -67505,7 +69223,7 @@ self: {
        pname = "hmm-hmatrix";
        version = "0.0.1";
        sha256 = "1kkikv3spnvqms59980p8aappw3wh26y9qs2c8ykia5fpz9zag4h";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers explicit-exception hmatrix lazy-csv non-empty
          random semigroups transformers utility-ht
        ];
@@ -67527,11 +69245,11 @@ self: {
        sha256 = "0kfqzydilajcpaazpbhmpv3h18n3lx839wxmcbjlzvjc78ajblb3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring containers directory mersenne-random
          old-time pcre-light process unix zlib
        ];
-       extraLibraries = [ ncurses ];
+       executableSystemDepends = [ ncurses ];
        homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html";
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
@@ -67544,8 +69262,8 @@ self: {
        pname = "hmpfr";
        version = "0.3.3.5";
        sha256 = "00gqrmfwg7hk21iyfbma8h4ahpxgj21wi9fcxjdms506ahk7rwf4";
-       buildDepends = [ base integer-gmp ];
-       extraLibraries = [ mpfr ];
+       libraryHaskellDepends = [ base integer-gmp ];
+       librarySystemDepends = [ mpfr ];
        homepage = "http://code.google.com/p/hmpfr/";
        description = "Haskell binding to the MPFR library";
        license = stdenv.lib.licenses.bsd3;
@@ -67562,7 +69280,7 @@ self: {
        pname = "hmt";
        version = "0.15";
        sha256 = "051kgsh9nl5f1nw8a24x7ds18g6ppzbhk3d9lf74nvvnccnzg3a9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring colour containers data-ordlist directory
          filepath lazy-csv logict multiset-comb parsec permutation primes
          safe split utf8-string
@@ -67580,7 +69298,7 @@ self: {
        pname = "hmt-diagrams";
        version = "0.15";
        sha256 = "1g64b31bz31x0kiivazn20s22y2w7dz9f2gw5cnfkcnjd20k7glm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo colour filepath hcg-minus hcg-minus-cairo hmt
          html-minimalist process xml
        ];
@@ -67599,7 +69317,7 @@ self: {
        sha256 = "06bixsd7vzfj0gwv0b2880p4xx3f9j7y1snindlnlcfr1qdp9jn2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers haskeline mtl parsec QuickCheck regex-compat syb
          text
        ];
@@ -67621,17 +69339,19 @@ self: {
        sha256 = "1309kzb5jrc9yy18bir3dy3r5xhmfnbd180ky9x4l3i1m4q5r31s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers either errors filepath hmatrix repa transformers
          vector
        ];
-       testDepends = [
+       librarySystemDepends = [ netcdf ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base containers hmatrix repa vector ];
+       testHaskellDepends = [
          base containers directory errors hmatrix HUnit QuickCheck repa
          test-framework test-framework-hunit test-framework-quickcheck2
          vector
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ netcdf ];
+       testSystemDepends = [ netcdf ];
        jailbreak = true;
        homepage = "https://github.com/ian-ross/hnetcdf";
        description = "Haskell NetCDF library";
@@ -67649,17 +69369,19 @@ self: {
        sha256 = "1y10w6ylgrdgy271a372f14rqdkvzlmpkjl08d5zg3r84jxhy6ia";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base containers data-fix parsers text transformers
          trifecta unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         ansi-wl-pprint base containers data-fix
+       ];
+       testHaskellDepends = [
          base containers data-fix tasty tasty-hunit tasty-th text
        ];
        homepage = "http://github.com/jwiegley/hnix";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hnn" = callPackage
@@ -67670,7 +69392,7 @@ self: {
        pname = "hnn";
        version = "0.2.0.0";
        sha256 = "13i2rs1ab7kh2mzf34hckkihpbrxpxzwfcdd529zd7dynhd3psjw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring hmatrix mwc-random random vector
          vector-binary-instances zlib
        ];
@@ -67688,7 +69410,7 @@ self: {
        sha256 = "0sfw9gmcn7qclgsgzqm9zalyxhz0mig91fabcfq3g0r98krgjnr2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        license = stdenv.lib.licenses.unfree;
      }) {};
 
@@ -67699,8 +69421,10 @@ self: {
        pname = "ho-rewriting";
        version = "0.1";
        sha256 = "1hmnqck385mhk140kgf8882lfa91bmip4pxbjnfpf62dwh0z39a3";
-       buildDepends = [ base compdata containers mtl patch-combinators ];
-       testDepends = [ base compdata patch-combinators ];
+       libraryHaskellDepends = [
+         base compdata containers mtl patch-combinators
+       ];
+       testHaskellDepends = [ base compdata patch-combinators ];
        homepage = "https://github.com/emilaxelsson/ho-rewriting";
        description = "Generic rewrite rules with safe treatment of variables and binders";
        license = stdenv.lib.licenses.bsd3;
@@ -67715,7 +69439,7 @@ self: {
        pname = "hoauth";
        version = "0.3.5";
        sha256 = "06vk3dv2dby7wadxg4qq2bzy10hl8ix2x4vpxggwd13xy3kpzjqp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring crypto-pubkey-types curl dataenc entropy mtl
          old-locale random RSA SHA time utf8-string
        ];
@@ -67734,7 +69458,10 @@ self: {
        sha256 = "14rhhk9667asdvdri9xm6jr4blrj5q1mb1g54mi94sz1vqh9hj3f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring http-conduit http-types text
+       ];
+       executableHaskellDepends = [
          aeson base bytestring http-conduit http-types text
        ];
        homepage = "https://github.com/freizl/hoauth2";
@@ -67753,12 +69480,15 @@ self: {
        sha256 = "1m2sxbw5il818g50b0650cm5vrb7njclk09m0na6i3amx3q10xjc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers directory filepath glib
-         gtk-largeTreeStore gtk3 gtksourceview3 mtl pango system-filepath
-         text transformers vector
+       libraryHaskellDepends = [
+         base containers filepath glib gtk-largeTreeStore gtk3
+         gtksourceview3 mtl pango system-filepath text transformers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring containers directory filepath gtk3 gtksourceview3
+         mtl text
+       ];
+       testHaskellDepends = [
          base containers gtk3 gtksourceview3 hspec mtl text
        ];
        jailbreak = true;
@@ -67778,13 +69508,14 @@ self: {
        sha256 = "1pri63d59q918jv1hdp2ib06m6lzw9a2b6bjyn86b2qrrx2512xd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base filemanip filepath fsnotify system-filepath text
        ];
        jailbreak = true;
        homepage = "http://github.com/jhickner/hobbes";
        description = "A small file watcher for OSX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hobbits" = callPackage
@@ -67796,7 +69527,7 @@ self: {
        pname = "hobbits";
        version = "1.1.1";
        sha256 = "0q668jvlpqs7y3l27fk9m96aa8rzhdkz8jf0whifdb2gahlhx9hs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq haskell-src-exts haskell-src-meta mtl syb tagged
          template-haskell th-expand-syns transformers type-equality
        ];
@@ -67816,7 +69547,7 @@ self: {
        sha256 = "0g8528jllh90f8zbrs229ms07lg7b397pm2zjccd6kriqpq1vfv0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base exceptions hint mtl optparse-declarative regex-posix split
          text time
        ];
@@ -67831,7 +69562,7 @@ self: {
        pname = "hofix-mtl";
        version = "1.0";
        sha256 = "1xlsddrdv56n7ww7a377jwz43xkkckl5zygghwxs9k88wxzskvvd";
-       buildDepends = [ base mtl star-to-star template-haskell ];
+       libraryHaskellDepends = [ base mtl star-to-star template-haskell ];
        jailbreak = true;
        description = "defining @mtl@-ready monads as * -> * fixed-points";
        license = "unknown";
@@ -67848,7 +69579,7 @@ self: {
        sha256 = "0mmp7ymmzvhpwmwjjnin9493a81vijai7hcyqwv9wrfhdjnykb1d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs filepath irc network old-locale time unix
        ];
        jailbreak = true;
@@ -67867,7 +69598,7 @@ self: {
        sha256 = "0djgbgahhrfdpxknqfjqkqwzy7ra3d7mnxyv6n76kpldalhihklw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers HUnit mtl old-locale random time
        ];
        homepage = "http://www.kfish.org/software/hogg/";
@@ -67882,10 +69613,10 @@ self: {
        pname = "hogre";
        version = "0.1.5";
        sha256 = "0ndgnflcj885ylxf8q8l71cykrpm4j6svzqxlpdynf054safq174";
-       buildDepends = [ base cgen ];
-       buildTools = [ cgen cgen-hs grgen ];
-       extraLibraries = [ OgreMain ];
-       pkgconfigDepends = [ OGRE ];
+       libraryHaskellDepends = [ base cgen ];
+       librarySystemDepends = [ OgreMain ];
+       libraryPkgconfigDepends = [ OGRE ];
+       libraryToolDepends = [ cgen cgen-hs grgen ];
        homepage = "http://anttisalonen.github.com/hogre";
        description = "Haskell binding to a subset of OGRE";
        license = stdenv.lib.licenses.mit;
@@ -67901,8 +69632,8 @@ self: {
        sha256 = "10zq4qch5bs0aawvs0zg3yyz41lykg1jrna5jqxlrvbq0wfz2s5g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hogre ];
-       extraLibraries = [ OgreMain ];
+       executableHaskellDepends = [ base hogre ];
+       executableSystemDepends = [ OgreMain ];
        homepage = "http://github.com/anttisalonen/hogre-examples";
        description = "Examples for using Hogre";
        license = stdenv.lib.licenses.mit;
@@ -67917,8 +69648,9 @@ self: {
        sha256 = "0awb7dfa77y7n88ljkcdxs63g37qyc5xkr0j7lqwzx23q83a5c4k";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base X11 ];
-       extraLibraries = [ OIS ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ OIS ];
+       executableHaskellDepends = [ base X11 ];
        jailbreak = true;
        description = "OIS bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -67930,10 +69662,10 @@ self: {
      mkDerivation {
        pname = "hoist-error";
        version = "0.1.0.2";
-       revision = "2";
        sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z";
+       revision = "2";
        editedCabalFile = "fca4ac245a1bddf638317290deb580d05d1539c6a700b02744ce61e259e2e879";
-       buildDepends = [ base either mtl ];
+       libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -67944,7 +69676,7 @@ self: {
        pname = "hold-em";
        version = "0.1.0.0";
        sha256 = "1j2ql6izsd85skd6l9j1qfg7pj5rf513096s9bkvqip9bb4ibr4r";
-       buildDepends = [ base random safe ];
+       libraryHaskellDepends = [ base random safe ];
        jailbreak = true;
        description = "An engine for Texas hold'em Poker";
        license = stdenv.lib.licenses.bsd3;
@@ -67956,7 +69688,7 @@ self: {
        pname = "hole";
        version = "0.1.1";
        sha256 = "05ba87wk9b5i5b4gsfvsj16rv91dqsmzyys6b5fkssrxh2ika36c";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Higher kinded type removal";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67986,13 +69718,18 @@ self: {
        sha256 = "05lns2xkw44g2jf2fbrpzdi5iqzq7hxkhhv86ah08hr14qiyp3sg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring directory filepath hastache
+         http-conduit lens lens-aeson process random split syb text time
+         unix
+       ];
+       executableHaskellDepends = [
          aeson ansi-terminal base bytestring Cabal directory filepath
          hastache http-conduit HUnit lens lens-aeson process QuickCheck
          random smallcheck split syb tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring Cabal HUnit QuickCheck smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
@@ -68007,7 +69744,7 @@ self: {
        pname = "homeomorphic";
        version = "0.1";
        sha256 = "1wm15bdz02sjgpz2n266xd50q3p6mncnv8mhimky6ps1kmzb5r6c";
-       buildDepends = [ base containers mtl QuickCheck ];
+       libraryHaskellDepends = [ base containers mtl QuickCheck ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/homeomorphic/";
        description = "Homeomorphic Embedding Test";
        license = stdenv.lib.licenses.bsd3;
@@ -68020,7 +69757,9 @@ self: {
        pname = "hommage";
        version = "0.0.6";
        sha256 = "053zv30ghm7c9idb6za44zasnn88g85z4bzbdpfpixlkvcm4sbck";
-       buildDepends = [ array base directory haskell98 random time ];
+       libraryHaskellDepends = [
+         array base directory haskell98 random time
+       ];
        description = "Haskell Offline Music Manipulation And Generation EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68032,7 +69771,9 @@ self: {
        pname = "hommage-ds";
        version = "0.0.5";
        sha256 = "0gnwpzs6kwhf2wm0nqcgwqa1pp7xwbnqh337pr62w40i76g252v4";
-       buildDepends = [ array base DirectSound haskell98 hommage ];
+       libraryHaskellDepends = [
+         array base DirectSound haskell98 hommage
+       ];
        jailbreak = true;
        homepage = "substitut-fuer-feinmotorik/projects/haskellommage";
        description = "DirectSound extension (Windows) for the Hommage sound library";
@@ -68051,12 +69792,12 @@ self: {
        sha256 = "0xw3fkbzb3jqi5sr28a69ga632c30g4xwykgd0cq8imrz70jlvam";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers cpphs deepseq directory filepath haskell-src-exts
          hflags template-haskell uniplate
        ];
-       testDepends = [ base haskell-src-exts uniplate ];
-       buildTools = [ happy ];
+       executableToolDepends = [ happy ];
+       testHaskellDepends = [ base haskell-src-exts uniplate ];
        homepage = "https://github.com/mgajda/homplexity";
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
@@ -68070,12 +69811,13 @@ self: {
        pname = "honi";
        version = "0.1.0.0";
        sha256 = "0g1w1i78a93d10zgdy9ixkflblx9xixa493hh2cc8jzznqsp5yfi";
-       buildDepends = [ base bytestring text ];
-       testDepends = [ base freenect hspec HUnit OpenNI2 ];
-       extraLibraries = [ freenect OpenNI2 ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ freenect OpenNI2 ];
+       testHaskellDepends = [ base hspec HUnit ];
+       testSystemDepends = [ freenect OpenNI2 ];
        description = "OpenNI 2 binding";
        license = stdenv.lib.licenses.mit;
-       broken = true;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { OpenNI2 = null;  freenect = null;};
 
   "honk" = callPackage
@@ -68084,7 +69826,7 @@ self: {
        pname = "honk";
        version = "1.3.0.0";
        sha256 = "102jw5j89amgvz3k3b05plpw9pjkhg1rjpjpcvpxq11x8mfdxyhf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://lambda.xyz/honk/";
        description = "Cross-platform interface to the PC speaker";
        license = stdenv.lib.licenses.asl20;
@@ -68100,7 +69842,7 @@ self: {
        sha256 = "0l1q6h0irfv3275jajvylajm2rhkfmvi1kpfan6n6z5adibh9and";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring Cabal directory filepath hoogle monad-loops
          mtl process yaml
        ];
@@ -68116,11 +69858,10 @@ self: {
        pname = "hood";
        version = "0.2.1";
        sha256 = "1f98v1bqrmh6cmmbsmcsdm3f250imp4rk0zi34di8fzlyqfcf2yh";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Hood";
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hood-off" = callPackage
@@ -68129,7 +69870,7 @@ self: {
        pname = "hood-off";
        version = "0.2";
        sha256 = "15rj6qfyhihzc5svl3dwkn387x7bbkl5am7h0kj5jjj8hv2q1pnc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Dummy package to disable Hood without having to remove all the calls to observe";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68141,7 +69882,7 @@ self: {
        pname = "hood2";
        version = "0.2.1";
        sha256 = "0iyi1zljywamfaqc0mbd1xw3gn1hq0lcdgx688rr8zliw23jix02";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Hood";
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
@@ -68157,7 +69898,7 @@ self: {
        sha256 = "1q3wpsqz833vypqnd7ljiraiyn1klxid35mh5vyizldk3i0qqf6w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array astar base containers hfov monad-loops mtl ncurses random
        ];
        jailbreak = true;
@@ -68176,10 +69917,11 @@ self: {
        sha256 = "0ygmizbhag16ifdyp8gcvs0m9vinvirn8v7jfbi2m457bllmbsmq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cmdargs configurator containers directory filepath hoodle-core
          mtl
        ];
+       executableHaskellDepends = [ base cmdargs hoodle-core ];
        homepage = "http://ianwookim.org/hoodle";
        description = "Executable for hoodle";
        license = stdenv.lib.licenses.gpl3;
@@ -68194,7 +69936,7 @@ self: {
        pname = "hoodle-builder";
        version = "0.3.0";
        sha256 = "0g4a3gf1mgf5gyniif0i2b89dz416h28171mwx7k7ivjw23gjvm7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring double-conversion hoodle-types lens
          strict text
        ];
@@ -68219,7 +69961,7 @@ self: {
        pname = "hoodle-core";
        version = "0.15.0";
        sha256 = "04007hbnv4n3dl2yngfjzl6vrqd40yk5h9lq0ws2z33k4xa3a3rk";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty array attoparsec base base64-bytestring binary
          bytestring cairo case-insensitive cereal configurator containers
          coroutine-object Diff directory either errors filepath fsnotify gd
@@ -68230,7 +69972,7 @@ self: {
          transformers-free unordered-containers uuid vector websockets
          xournal-parser
        ];
-       extraLibraries = [ libX11 libXi ];
+       librarySystemDepends = [ libX11 libXi ];
        homepage = "http://ianwookim.org/hoodle";
        description = "Core library for hoodle";
        license = stdenv.lib.licenses.bsd3;
@@ -68251,7 +69993,7 @@ self: {
        sha256 = "1mqx4qia457n8v4pdyd8mc8h7ybzx5asxm2d4p9ws5g2q4ybmshy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty attoparsec base base64-bytestring binary
          bytestring cmdargs conduit containers directory either filepath
          hoodle-parser hoodle-types http-conduit lens monad-loops mtl
@@ -68273,7 +70015,7 @@ self: {
        pname = "hoodle-parser";
        version = "0.3.0";
        sha256 = "0qp7x6csacf4w9crvmyrs7qsm9caici95qiwm11zyzyz2k9nm52g";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers either hoodle-types lens mtl
          strict text transformers xournal-types
        ];
@@ -68296,12 +70038,15 @@ self: {
        sha256 = "1nx2y4f000gid9mps0xxx4l6h0nh120568h9cl45gsp6qlw3sa5m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring cairo cmdargs containers directory
+       libraryHaskellDepends = [
+         attoparsec base bytestring cairo containers directory
          directory-tree filepath gtk hoodle-parser hoodle-render
          hoodle-types HTTP io-streams lens mtl network-uri pdf-toolbox-core
          pdf-toolbox-document process transformers unordered-containers uuid
        ];
+       executableHaskellDepends = [
+         base cmdargs directory directory-tree filepath gtk
+       ];
        homepage = "http://ianwookim.org/hoodle";
        description = "publish hoodle files as a static web site";
        license = stdenv.lib.licenses.bsd3;
@@ -68318,7 +70063,7 @@ self: {
        pname = "hoodle-render";
        version = "0.5.0";
        sha256 = "0460j9flj5cnvgv6cnchc6am0r5sw81lp67qf45rgcyjpz9q424i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cairo containers directory
          filepath gd gtk hashable hoodle-types lens monad-loops mtl poppler
          stm strict svgcairo time transformers unix unordered-containers
@@ -68337,7 +70082,7 @@ self: {
        pname = "hoodle-types";
        version = "0.3.0";
        sha256 = "0mkx3n1sni43665dk5ify890wdfxamxvkx1h61kzsk3c3bazngr5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers lens mtl strict text uuid
        ];
        description = "Data types for programs for hoodle file format";
@@ -68359,15 +70104,20 @@ self: {
        sha256 = "1gm1sw7d88vzh53myqjzls2sxc3cnk1ni31dcagkj54khh0h7f56";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base binary blaze-builder bytestring case-insensitive conduit
+         containers deepseq directory filepath haskell-src-exts http-types
+         parsec process QuickCheck random resourcet safe text transformers
+         uniplate unix vector vector-algorithms wai
+       ];
+       executableHaskellDepends = [
          aeson array base binary blaze-builder bytestring Cabal
          case-insensitive cmdargs conduit containers deepseq directory
          filepath haskell-src-exts http-types old-locale parsec process
          QuickCheck random resourcet safe shake tagsoup text time
          transformers uniplate unix vector vector-algorithms wai warp
        ];
-       testDepends = [ base directory filepath process temporary ];
-       testTarget = "--test-option=--no-net";
+       testHaskellDepends = [ base directory filepath process temporary ];
        homepage = "http://www.haskell.org/hoogle/";
        description = "Haskell API Search";
        license = stdenv.lib.licenses.bsd3;
@@ -68384,7 +70134,7 @@ self: {
        sha256 = "12hsajans11csbhiz7d187hx17h7s736g26cvmnahx9lgmgjgada";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers directory errors filepath hoogle
          optparse-applicative process temporary transformers
        ];
@@ -68399,7 +70149,7 @@ self: {
        pname = "hooks-dir";
        version = "0.1.1.0";
        sha256 = "0gwdqpml8kn8xxxaq628d4way29k2f31f5av49fx7qj150h5qs5b";
-       buildDepends = [ base directory process text ];
+       libraryHaskellDepends = [ base directory process text ];
        homepage = "https://github.com/ibotty/hooks-dir";
        description = "run executables in a directory as hooks";
        license = stdenv.lib.licenses.bsd3;
@@ -68411,7 +70161,7 @@ self: {
        pname = "hoopl";
        version = "3.10.1.0";
        sha256 = "1m62dcgzd17xay2nd87607ryb6hswzhsgr9irzf705h5skgibxks";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://ghc.cs.tufts.edu/hoopl/";
        description = "A library to support dataflow analysis and optimization";
        license = stdenv.lib.licenses.bsd3;
@@ -68430,7 +70180,7 @@ self: {
        sha256 = "1g486kj7pwfvdr0a0mpfjxv9hifrkbp7120hxcfyrhx2zjmmc449";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder bytestring configurator directory enumerator
          file-embed filepath HDBC HDBC-sqlite3 mtl network network-info
          network-multicast old-locale old-time process regex-compat
@@ -68451,10 +70201,10 @@ self: {
        pname = "hopencc";
        version = "0.1.0.0";
        sha256 = "1ygldh3r09qzpws28mnmhm3ai7h162gsafdc7nwl2f10kjnpjhyw";
-       buildDepends = [ base bytestring utf8-string ];
-       testDepends = [ base QuickCheck ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ opencc ];
+       libraryHaskellDepends = [ base bytestring utf8-string ];
+       libraryPkgconfigDepends = [ opencc ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/MnO2/hopencc";
        description = "Haskell binding to libopencc";
@@ -68470,13 +70220,13 @@ self: {
        pname = "hopencl";
        version = "0.2.1";
        sha256 = "1kdrjr1y5wfq8bb31bkh360pvgb7ryhn9awnqszbq5d4wdwplqk8";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ OpenCL ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ OpenCL ];
        homepage = "https://github.com/merijn/hopencl";
        description = "Haskell bindings for OpenCL";
        license = stdenv.lib.licenses.bsd3;
@@ -68498,7 +70248,7 @@ self: {
        sha256 = "1qzp1lhbg9v6q7f8yq0abfwak80krmsdih86fpmfc6riiamfin7g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson ansi-wl-pprint array attoparsec base base16-bytestring binary
          binary-conduit bytestring conduit conduit-extra containers
          crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP
@@ -68506,7 +70256,7 @@ self: {
          optparse-applicative resourcet text time transformers
          unordered-containers wl-pprint-extras yaml
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        homepage = "http://floss.scru.org/hopenpgp-tools";
        description = "hOpenPGP-based command-line tools";
        license = "unknown";
@@ -68518,8 +70268,8 @@ self: {
        pname = "hopenssl";
        version = "1.7";
        sha256 = "1zs69kxwz5fnm62mdscbpfz78vwnda75gyx1vxmmlisfhfslprly";
-       buildDepends = [ base bytestring mtl ];
-       extraLibraries = [ openssl ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       librarySystemDepends = [ openssl ];
        homepage = "http://github.com/peti/hopenssl";
        description = "FFI bindings to OpenSSL's EVP digest interface";
        license = stdenv.lib.licenses.bsd3;
@@ -68527,8 +70277,8 @@ self: {
 
   "hopfield" = callPackage
     ({ mkDerivation, array, base, deepseq, directory, erf
-     , exact-combinatorics, hmatrix, hspec, HUnit, JuicyPixels
-     , MagickCore, MagickWand, monad-loops, MonadRandom
+     , exact-combinatorics, hmatrix, hspec, HUnit, imagemagick
+     , JuicyPixels, MagickCore, monad-loops, MonadRandom
      , optparse-applicative, parallel, probability, QuickCheck, random
      , random-fu, rvar, split, vector
      }:
@@ -68538,21 +70288,25 @@ self: {
        sha256 = "1cpr3540fdrqr39p6xhb64iz2fz8mzryd19515c55522s7xjk1zw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base deepseq directory erf exact-combinatorics hmatrix
-         JuicyPixels monad-loops MonadRandom optparse-applicative parallel
-         probability QuickCheck random random-fu rvar split vector
+       libraryHaskellDepends = [
+         array base deepseq erf exact-combinatorics hmatrix monad-loops
+         MonadRandom parallel probability QuickCheck random random-fu rvar
+         split vector
        ];
-       testDepends = [
+       librarySystemDepends = [ imagemagick MagickCore ];
+       executableHaskellDepends = [
+         base directory JuicyPixels MonadRandom optparse-applicative random
+         vector
+       ];
+       testHaskellDepends = [
          base erf exact-combinatorics hspec HUnit MonadRandom parallel
          QuickCheck random vector
        ];
-       extraLibraries = [ MagickCore MagickWand ];
        homepage = "https://github.com/imperialhopfield/hopfield";
        description = "Hopfield Networks, Boltzmann Machines and Clusters";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { MagickCore = null;  MagickWand = null;};
+     }) { MagickCore = null;  inherit (pkgs) imagemagick;};
 
   "hopfield-networks" = callPackage
     ({ mkDerivation, base, matrix, MonadRandom, QuickCheck, split
@@ -68564,8 +70318,11 @@ self: {
        sha256 = "1d3jcjk6s7raack7rvm1jzyh2fvaha6xy7k97fmq4cx22fzb48sd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base matrix MonadRandom QuickCheck split vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base matrix MonadRandom split vector ];
+       executableHaskellDepends = [
+         base matrix MonadRandom QuickCheck split vector
+       ];
+       testHaskellDepends = [
          base matrix MonadRandom QuickCheck test-framework
          test-framework-quickcheck2 vector
        ];
@@ -68580,8 +70337,8 @@ self: {
        pname = "hopfli";
        version = "0.2.1.0";
        sha256 = "1rx5kvacnzm3qmc0z8n9fhrcrac059akzh9ccq0qswl7w9m4iby3";
-       buildDepends = [ base bytestring zlib ];
-       testDepends = [ base bytestring hspec QuickCheck zlib ];
+       libraryHaskellDepends = [ base bytestring zlib ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
        jailbreak = true;
        homepage = "https://github.com/ananthakumaran/hopfli";
        description = "zlib compatible compression using Zopfli Compression Algorithm";
@@ -68598,10 +70355,10 @@ self: {
        sha256 = "0h9cq1qzai1kbzc77bjlm0dbkrasfj0d21ydrh86kv9jd6gr7gb7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bifunctors bytestring filepath mtl pretty readline void
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        homepage = "http://github.com/valis/hoq";
        description = "A language based on homotopy type theory with an interval type";
        license = stdenv.lib.licenses.gpl2;
@@ -68614,7 +70371,7 @@ self: {
        pname = "horizon";
        version = "0.1.1";
        sha256 = "1qx27i0xlrgcrdzp6lc06skipj888cfdxwwfrd7fyig48jn3wyd4";
-       buildDepends = [ AC-Angle base time ];
+       libraryHaskellDepends = [ AC-Angle base time ];
        jailbreak = true;
        homepage = "https://github.com/intractable/horizon";
        description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates";
@@ -68630,11 +70387,11 @@ self: {
        pname = "hosc";
        version = "0.15";
        sha256 = "1yp25n159p69r32y3x7iwc55l5q9qaamj2vyl1473x8ras5afdcf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-builder bytestring data-binary-ieee754 network
          time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -68651,7 +70408,7 @@ self: {
        pname = "hosc-json";
        version = "0.15";
        sha256 = "0sask4nr5njf9grzigldflrbp7460z55fsam1pc3wcnsa575hxhi";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring hosc json text
          unordered-containers utf8-string vector
        ];
@@ -68671,7 +70428,7 @@ self: {
        sha256 = "0zk59ig52vqym4n47yl9jgv21gszcwwbc0qc9ff0080allp6ddml";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cgi haskeline hosc hosc-json hsc3 json text
          transformers utf8-string websockets www-minus
        ];
@@ -68688,7 +70445,7 @@ self: {
        pname = "hostname";
        version = "1.0";
        sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A very simple package providing a cross-platform means of determining the hostname";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68699,7 +70456,7 @@ self: {
        pname = "hostname-validate";
        version = "1.0.0";
        sha256 = "0my8g4kqf9mz7ii79ff53rwkx3yv9kkn4jbm60q4b7g1rzhb3bvz";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Validate hostnames e.g. localhost or foo.co.uk.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68714,7 +70471,7 @@ self: {
        sha256 = "1g5kga58c5iqm3svs2d0d2akkibxjnh0hc1jjhjf7dzxghg2paqy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base bytestring data-default dns iproute network
        ];
        jailbreak = true;
@@ -68734,7 +70491,7 @@ self: {
        sha256 = "0pnp0xkqk2l29p5kr3kjmxl7hb8g1qd198n36vmfx1x8kc8bahdy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers cpphs filepath haskell-src-exts
          optparse-applicative split
        ];
@@ -68749,7 +70506,7 @@ self: {
        pname = "hotswap";
        version = "0.1.9.13";
        sha256 = "1c614gvwypfqaj4gqsdimqq40i34w393vikq5hhy3d4qll2qp8hv";
-       buildDepends = [ base plugins ];
+       libraryHaskellDepends = [ base plugins ];
        jailbreak = true;
        homepage = "https://github.com/mikeplus64/hotswap";
        description = "Simple code hotswapping";
@@ -68765,8 +70522,8 @@ self: {
        pname = "hourglass";
        version = "0.2.9";
        sha256 = "1xha17nwzxdjizbcp63d2142c6q051y77facs7xribgcl5iz2m4v";
-       buildDepends = [ base deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
          base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
        ];
        homepage = "https://github.com/vincenthz/hs-hourglass";
@@ -68780,7 +70537,7 @@ self: {
        pname = "hourglass-fuzzy-parsing";
        version = "0.1.0.1";
        sha256 = "188mw1z8n650y3qik98x2m70sr8q66x4l4pg34mirk6kg4mgzy37";
-       buildDepends = [ base hourglass parsec ];
+       libraryHaskellDepends = [ base hourglass parsec ];
        homepage = "https://gitlab.com/doshitan/hourglass-fuzzy-parsing";
        description = "A small library for parsing more human friendly date/time formats";
        license = stdenv.lib.licenses.bsd3;
@@ -68794,7 +70551,7 @@ self: {
        pname = "hp2any-core";
        version = "0.11.2";
        sha256 = "1gmw9bggw8hsp6pi0xgrryf0sqjb1aaxbwh85q5h72h4ixskwn1y";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers directory filepath network
          old-locale process time
        ];
@@ -68815,11 +70572,12 @@ self: {
        sha256 = "1yj1miqn265pxq2dfhx87s20vjnnxmsl3d9xdy88cbzglpx2v9il";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base hp2any-core OpenGL ];
+       executableHaskellDepends = [
          base bytestring containers directory filepath GLUT hp2any-core
          network OpenGL parseargs process
        ];
-       extraLibraries = [ freeglut mesa ];
+       executableSystemDepends = [ freeglut mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
        license = stdenv.lib.licenses.bsd3;
@@ -68837,7 +70595,7 @@ self: {
        sha256 = "143j3ylvzyq1s2l357vzqrwdcgg6rqhnmv0awb3nvm66c9smaarv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring cairo containers directory filepath glade
          glib gtk gtkglext hp2any-core hp2any-graph OpenGL time
        ];
@@ -68855,7 +70613,7 @@ self: {
        sha256 = "11v0w5406d9lql5jaj2kwrvdgai9y76kbdlwpjnn2wjn36b8hdwa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers filepath ];
+       executableHaskellDepends = [ base containers filepath ];
        description = "A tool for converting GHC heap-profiles to HTML";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68870,7 +70628,7 @@ self: {
        sha256 = "1bma881ljhwhzirj2q9rqf0bxx9xfy0ng2z9mrhdnaywnw4d8v4c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array attoparsec base containers filepath floatshow mtl text
        ];
        homepage = "http://code.mathr.co.uk/hp2pretty";
@@ -68889,11 +70647,15 @@ self: {
        sha256 = "1ghj80w5hx736hkr9z827s4f2fli5r4y0q3ka9ay706k5lj0g9xa";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base-compat deepseq directory filepath Glob text
          unordered-containers yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base base-compat deepseq directory filepath Glob text
+         unordered-containers yaml
+       ];
+       testHaskellDepends = [
          aeson aeson-qq base base-compat deepseq directory filepath Glob
          hspec interpolate mockery text unordered-containers yaml
        ];
@@ -68912,7 +70674,7 @@ self: {
        sha256 = "03h634wwyj4d5ycvn7nmm94qcxwq9vayd7d9l44hqhka1ach4sx9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base cmdargs filepath hpaco-lib strict utf8-string yaml
        ];
        jailbreak = true;
@@ -68930,7 +70692,7 @@ self: {
        pname = "hpaco-lib";
        version = "0.28.0.5";
        sha256 = "1n6lmkip1is6y4x5vivqv30if5di8cy35l6fs2kyg8wjxcqcsyqm";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-variant file-embed filepath
          mtl parsec safe split strict transformers
        ];
@@ -68951,7 +70713,7 @@ self: {
        sha256 = "0sl2qh3l5vbijln2al7vmvxm4zhn3qsz8axvprs6jxjfbndmk78j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal cabal-macosx containers directory eprocess
          filepath FindBin haskell-src-exts hint hint-server monad-loops mtl
          process time wx wxcore
@@ -68969,8 +70731,8 @@ self: {
        pname = "hpapi";
        version = "0.0.1.0";
        sha256 = "0n07nr6mm9ssf632h30s6bqxsgvlfzpr39dhdl7vwrfyj2jvdg2s";
-       buildDepends = [ base ];
-       extraLibraries = [ papi ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ papi ];
        description = "Binding for the PAPI library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68991,7 +70753,7 @@ self: {
        sha256 = "1p8dfqm93598zcnz1ksj8px6l8i7kfn9514d68gx7qxvd4xw0fnm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring cgi
          ConfigFile containers css Diff directory download-curl feed
          filepath haskell-src-exts HJScript hlint hscolour mime-mail
@@ -69017,7 +70779,7 @@ self: {
        sha256 = "1jj5q1gpnajnafikwf9jmayvaimi5486fvi90fk8q4b3lg7z9awm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath http-conduit http-types
          lifted-base network optparse-applicative process safe utf8-string
        ];
@@ -69034,7 +70796,9 @@ self: {
        pname = "hpc";
        version = "0.6.0.2";
        sha256 = "1bqa9jmnjqk4jbvx2y90rz717hf2rhzbpmy9xqan97pyrkjz3rlm";
-       buildDepends = [ base containers directory filepath time ];
+       libraryHaskellDepends = [
+         base containers directory filepath time
+       ];
        description = "Code Coverage Library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69050,11 +70814,15 @@ self: {
        sha256 = "0ika073kkm8kivd0m2dhb7ysk5h7q9vsj02xf4azh3c4xpvw4086";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring cmdargs containers curl directory
+         directory-tree hpc process pureMD5 retry safe split
+       ];
+       executableHaskellDepends = [
          aeson async base bytestring cmdargs containers curl directory
          directory-tree hpc process pureMD5 regex-posix retry safe split
        ];
-       testDepends = [ base HUnit ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
        description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
@@ -69067,7 +70835,7 @@ self: {
        pname = "hpc-strobe";
        version = "0.1";
        sha256 = "1fgw4pf72684mi7s5pqvfj75s8y004rxf3ww377kyrlw1mb7405c";
-       buildDepends = [ base filepath hpc ];
+       libraryHaskellDepends = [ base filepath hpc ];
        description = "Hpc-generated strobes for a running Haskell program";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69082,7 +70850,7 @@ self: {
        sha256 = "1mahyall1p96nc8z270002cdk8is9ahrd0zn0663w36ic158i3li";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers haskell98 hpc network parsec pretty process
          unix
        ];
@@ -69099,7 +70867,7 @@ self: {
        pname = "hplayground";
        version = "0.1.3.1";
        sha256 = "15yri40046lap05b762k4nk9nly8k6cbypic790zfmhj9ljjq1bv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default haste-compiler haste-perch monads-tf
          transformers
        ];
@@ -69117,7 +70885,7 @@ self: {
        sha256 = "01xkpsb8fjlifdz6fckwfawj1s5c4rs4slizcdr1hpij6mcdcg6y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath process ];
+       executableHaskellDepends = [ base directory filepath process ];
        description = "Application for managing playlist files on a music player";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69134,7 +70902,7 @@ self: {
        sha256 = "0gi94phkqxffxf3sq5al3cmn3zhc9vz6jql4hjsvz5nbhpdjhwda";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile directory filepath HaXml HDBC HDBC-sqlite3 hslogger
          MissingH mtl network old-time parsec process unix
        ];
@@ -69158,13 +70926,18 @@ self: {
        sha256 = "0jmc7m47gidmhnf2dz7hqzlypw1l72n948naccab6j58hkn683kk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-default-class exceptions
-         HUnit lifted-base monad-control mtl QuickCheck random resource-pool
-         scientific test-framework test-framework-hunit text time
-         transformers transformers-base unordered-containers vector
+         lifted-base monad-control mtl resource-pool text time transformers
+         transformers-base vector
+       ];
+       librarySystemDepends = [ postgresql ];
+       executableHaskellDepends = [
+         aeson base bytestring exceptions HUnit lifted-base monad-control
+         mtl QuickCheck random scientific test-framework
+         test-framework-hunit text time transformers-base
+         unordered-containers vector
        ];
-       extraLibraries = [ postgresql ];
        homepage = "https://github.com/scrive/hpqtypes";
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
@@ -69181,16 +70954,21 @@ self: {
        sha256 = "01848yssmpi0fgkgnlgwmcrmkmpdqc6yc19z91kj46sl187k2k8j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory filepath
          haskell-src-exts mtl parsec protocol-buffers
          protocol-buffers-descriptor utf8-string
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         array base binary bytestring containers directory filepath
+         haskell-src-exts mtl parsec protocol-buffers
+         protocol-buffers-descriptor utf8-string
+       ];
+       executableToolDepends = [ alex ];
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hprotoc-fork" = callPackage
@@ -69205,12 +70983,18 @@ self: {
        sha256 = "1fbpdi4mcc66z3ina01dkqxhy8slcjs4irh03ll2msp6p5vdqw9r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory filepath
          haskell-src-exts mtl parsec protocol-buffers-descriptor-fork
          protocol-buffers-fork utf8-string
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         array base binary bytestring containers directory filepath
+         haskell-src-exts mtl parsec protocol-buffers-descriptor-fork
+         protocol-buffers-fork utf8-string
+       ];
+       executableToolDepends = [ alex ];
        jailbreak = true;
        homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
        description = "Parse Google Protocol Buffer specifications";
@@ -69226,7 +71010,10 @@ self: {
        sha256 = "0kmmrjg93rr6cjmg5n821p00qr4m3q46nnyfhql2s2nf20p7kprh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath hcg-minus random ];
+       libraryHaskellDepends = [ base hcg-minus ];
+       executableHaskellDepends = [
+         base directory filepath hcg-minus random
+       ];
        homepage = "http://rd.slavepianos.org/?t=hps";
        description = "Haskell Postscript";
        license = "GPL";
@@ -69240,7 +71027,8 @@ self: {
        sha256 = "1xyk0q6qiqcqd849km86jns4bcfmyrvikg0zw44929wlmlbf0hg7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cairo gtk hps random ];
+       libraryHaskellDepends = [ base cairo gtk hps ];
+       executableHaskellDepends = [ base cairo gtk hps random ];
        jailbreak = true;
        homepage = "http://slavepianos.org/rd/?t=hps-cairo";
        description = "Cairo rendering for the haskell postscript library";
@@ -69254,7 +71042,7 @@ self: {
        pname = "hps-kmeans";
        version = "0.1.0.0";
        sha256 = "0w1yyrv4k7fi016084j4k1lh6jgxg5502r83zszr9cjc6rraj8fc";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        jailbreak = true;
        homepage = "http://stathacking.com/hps-kmeans";
        description = "A nice implementation of the k-Means algorithm";
@@ -69267,8 +71055,8 @@ self: {
        pname = "hpuz";
        version = "1.1.2";
        sha256 = "04k9hdbc3ipn9z0qzzpm6xsiv0bkr1v48sfs2haapawd49bw7rhk";
-       buildDepends = [ array base bytestring parsec ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ array base bytestring parsec ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://github.com/ccasin/hpuz";
        description = "Haskell bindings for libpuz";
        license = "unknown";
@@ -69281,7 +71069,9 @@ self: {
        pname = "hpygments";
        version = "0.1.3";
        sha256 = "1hb9yslb94ynzlphsp0i4f547zqxblrj49hqy4d7zivdqp38lqla";
-       buildDepends = [ aeson base bytestring process process-extras ];
+       libraryHaskellDepends = [
+         aeson base bytestring process process-extras
+       ];
        jailbreak = true;
        homepage = "https://github.com/davidlazar/hpygments";
        description = "Highlight source code using Pygments";
@@ -69297,7 +71087,9 @@ self: {
        sha256 = "1vdpy9x3bg43zj9rcrnkz0jfsd9mrp4k5y2hn6jb2ar2bvq0iwha";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers EEConfig GLUT OpenGL ];
+       executableHaskellDepends = [
+         array base containers EEConfig GLUT OpenGL
+       ];
        homepage = "http://sourceforge.net/projects/hpylos/";
        description = "AI of Pylos game with GLUT interface";
        license = "GPL";
@@ -69312,7 +71104,9 @@ self: {
        sha256 = "00ddyiznx07qkh3s4qjls39x991fqxvdw2bj245ypbxpxsk9fvsw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base lens optparse-applicative parsec text ];
+       executableHaskellDepends = [
+         base lens optparse-applicative parsec text
+       ];
        description = "pyrg utility done right";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -69327,11 +71121,11 @@ self: {
        pname = "hquantlib";
        version = "0.0.2.5";
        sha256 = "1n84j2bha8cgv38rl8jxsjiybwws2sc60x8pjmnkn83jpscgcqv0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random
          parallel statistics time vector vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -69349,8 +71143,8 @@ self: {
        pname = "hquery";
        version = "0.1.1.0";
        sha256 = "0phlbbvkifw65ndjb4nc8ar0xx6z4sqn8xj41bg8qgr31ffpcjf8";
-       buildDepends = [ base containers parsec text xmlhtml ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers parsec text xmlhtml ];
+       testHaskellDepends = [
          base bytestring filepath HUnit parsec test-framework
          test-framework-hunit text xmlhtml
        ];
@@ -69366,7 +71160,7 @@ self: {
        sha256 = "0hg2qjjr5pcnx62382r3d3rqvb3z7h1926lpym68869n4s19wz7d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HCL NonEmpty ];
+       executableHaskellDepends = [ base HCL NonEmpty ];
        description = "Basic utility for ranking a list of items";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69380,7 +71174,7 @@ self: {
        pname = "hreader";
        version = "0.2.0";
        sha256 = "1a0zllljfjpz6fwq2h0l5wwl1wg1v68n6r84fs70vnny0c3wl6hg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exceptions hset mmorph monad-control mtl transformers-base
        ];
        homepage = "https://bitbucket.org/s9gf4ult/hreader";
@@ -69396,7 +71190,7 @@ self: {
        sha256 = "1zhp9w0rki3chb27jbzvwifsgcjxzczn3q7hh7g3d0akfbg1v47f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://github.com/Raynes/Hricket";
        description = "A Cricket scoring application";
@@ -69411,12 +71205,14 @@ self: {
        pname = "hruby";
        version = "0.3.1.5";
        sha256 = "1x9j3rc3kk64l8idkar35ap4y5kxh4abfssd2iphp8dqnjld3jxa";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
        ];
-       testDepends = [ aeson attoparsec base QuickCheck text vector ];
-       extraLibraries = [ ruby ];
+       librarySystemDepends = [ ruby ];
+       testHaskellDepends = [
+         aeson attoparsec base QuickCheck text vector
+       ];
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ruby;};
@@ -69427,8 +71223,8 @@ self: {
        pname = "hs-GeoIP";
        version = "0.3";
        sha256 = "135bl4cjijq6mr485waz7aaxgkaji2fsdjhdy4v4756q6ahzcpwf";
-       buildDepends = [ base bytestring deepseq ];
-       extraLibraries = [ GeoIP ];
+       libraryHaskellDepends = [ base bytestring deepseq ];
+       librarySystemDepends = [ GeoIP ];
        homepage = "http://github.com/ozataman/hs-GeoIP";
        description = "Haskell bindings to the MaxMind GeoIPCity database via the C library";
        license = stdenv.lib.licenses.bsd3;
@@ -69441,7 +71237,7 @@ self: {
        pname = "hs-bibutils";
        version = "5.5";
        sha256 = "0pf5lh179rw9jkmw16ss3kiwydlj6zgfk868mjl5s57kx55z7ycm";
-       buildDepends = [ base syb ];
+       libraryHaskellDepends = [ base syb ];
        homepage = "http://istitutocolli.org/repos/hs-bibutils/";
        description = "Haskell bindings to bibutils, the bibliography conversion utilities";
        license = "GPL";
@@ -69455,17 +71251,17 @@ self: {
        pname = "hs-blake2";
        version = "0.0.2";
        sha256 = "0i0yqci0z5gqmpgb0gk76grcd8mn7xql6gjalm78z6cl84vzsgh4";
-       buildDepends = [ base bytestring ];
-       testDepends = [
-         b2 base bytestring bytestring-arbitrary QuickCheck tasty
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ b2 ];
+       testHaskellDepends = [
+         base bytestring bytestring-arbitrary QuickCheck tasty
          tasty-quickcheck
        ];
-       extraLibraries = [ b2 ];
+       testSystemDepends = [ b2 ];
        jailbreak = true;
        homepage = "https://github.com/tsuraan/hs-blake2";
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
      }) { b2 = null;};
 
   "hs-captcha" = callPackage
@@ -69474,7 +71270,7 @@ self: {
        pname = "hs-captcha";
        version = "1.0";
        sha256 = "02dd7kli8nm01jxs0p8imqvbdr4yzqizi6bwyyr228p3wscbdsn8";
-       buildDepends = [ base bytestring gd random ];
+       libraryHaskellDepends = [ base bytestring gd random ];
        homepage = "http://www.dankna.com/software/";
        description = "Generate images suitable for use as CAPTCHAs in online web-form security";
        license = stdenv.lib.licenses.bsd3;
@@ -69486,11 +71282,10 @@ self: {
        pname = "hs-carbon";
        version = "0.1.1.0";
        sha256 = "0frip4q5vxvdkc4f8bigpp066i53f4786cj2znyq21h65zndaq53";
-       buildDepends = [ base deepseq mtl parallel random ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base deepseq mtl parallel random ];
+       testHaskellDepends = [ base HUnit ];
        description = "A Haskell framework for parallel monte carlo simulations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-carbon-examples" = callPackage
@@ -69503,7 +71298,7 @@ self: {
        sha256 = "1hcg6z3slzry4lkxnv5bllmlfsr50hcyxmpz3qhsb487j9r76c2z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base deepseq gloss hs-carbon monad-loops mtl tf-random
        ];
        description = "Example Monte Carlo simulations implemented with Carbon";
@@ -69519,7 +71314,7 @@ self: {
        pname = "hs-cdb";
        version = "0.1.1";
        sha256 = "07pkz35mmk7qaa9ahfxmj4dddja23ksn7dm1fp8g9v8z8d9r9zl0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring bytestring-mmap directory filepath mtl
        ];
        homepage = "http://github.com/adamsmasher/hs-cdb";
@@ -69534,8 +71329,8 @@ self: {
        pname = "hs-dotnet";
        version = "0.4.0";
        sha256 = "1l2h1zv63c25k80gljnan3vg2r25a4b7byf5yryj3cjwa9xcg457";
-       buildDepends = [ base ghc-prim ];
-       extraLibraries = [ ole32 oleaut32 ];
+       libraryHaskellDepends = [ base ghc-prim ];
+       librarySystemDepends = [ ole32 oleaut32 ];
        description = "Pragmatic .NET interop for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69549,7 +71344,7 @@ self: {
        pname = "hs-excelx";
        version = "0.6.0.0";
        sha256 = "12hpfad8wn4r811md6269w10inx6nbipryhn8vdhbbcj9mmda3l5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl text time xml-conduit zip-archive
        ];
        jailbreak = true;
@@ -69563,7 +71358,7 @@ self: {
        pname = "hs-ffmpeg";
        version = "0.3.4";
        sha256 = "0j52drd3pb6ssgngfqxdsvvjjnx11nsmxwjsin6cmbv0nifpyq51";
-       buildDepends = [ base bytestring haskell98 ];
+       libraryHaskellDepends = [ base bytestring haskell98 ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/VasylPasternak/hs-ffmpeg";
        description = "Bindings to FFMPEG library";
@@ -69577,8 +71372,8 @@ self: {
        pname = "hs-fltk";
        version = "0.2.5";
        sha256 = "0nbxfy219mz0k27d16r3ir7hk0j450gxba9wrvrz1j17mr3gvqzx";
-       buildDepends = [ base ];
-       extraLibraries = [ fltk fltk_images ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ fltk fltk_images ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hs-fltk/";
        description = "Binding to GUI library FLTK";
        license = stdenv.lib.licenses.bsd3;
@@ -69591,7 +71386,7 @@ self: {
        pname = "hs-gchart";
        version = "0.4.1";
        sha256 = "0nmykgdzkqidxv51bhlcn4zax4zfw26s4l65z3a3405si2s5x459";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://github.com/deepakjois/hs-gchart";
        description = "Haskell wrapper for the Google Chart API";
        license = stdenv.lib.licenses.bsd3;
@@ -69608,13 +71403,12 @@ self: {
        sha256 = "1mvzpn7zpk5ffyyqh214yd315dcis8zmm9p4m5099bqhfr735kws";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers filepath haskell-names haskell-packages
          haskell-src-exts hse-cpp mtl tagged
        ];
        description = "Utility to generate haskell-names interface files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-gizapp" = callPackage
@@ -69625,7 +71419,7 @@ self: {
        pname = "hs-gizapp";
        version = "0.1.0.3";
        sha256 = "1j7ws3jm52n910p08432k60w09971bpcz4j5w48a305nz1dbkscm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath parsec process
        ];
        jailbreak = true;
@@ -69639,8 +71433,8 @@ self: {
        pname = "hs-inspector";
        version = "0.5.2.0";
        sha256 = "0w9ijl56v0gnx6arz0vvrg740kkhw0vqgkzdvmgf22z9vn99fny8";
-       buildDepends = [ base haskell-src ];
-       testDepends = [ base haskell-src hspec ];
+       libraryHaskellDepends = [ base haskell-src ];
+       testHaskellDepends = [ base haskell-src hspec ];
        description = "Haskell source code analyzer";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -69655,7 +71449,7 @@ self: {
        pname = "hs-java";
        version = "0.3.4";
        sha256 = "1qv6zwp9fws9s6502d9afwwbsh025xfpw4vsq8wgh2i0gvlskzq7";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary binary-state bytestring containers
          control-monad-exception data-binary-ieee754 data-default directory
          filepath Glob LibZip MissingH mtl parsec utf8-string
@@ -69671,7 +71465,9 @@ self: {
        pname = "hs-json-rpc";
        version = "0.0.0.1";
        sha256 = "0qlzylkplcb0bvh7pd8mwmc0pg69jjh8229a1hg3rhaix08mmj3c";
-       buildDepends = [ aeson base bytestring HTTP network text ];
+       libraryHaskellDepends = [
+         aeson base bytestring HTTP network text
+       ];
        homepage = "http://patch-tag.com/r/Azel/hs-json-rpc";
        description = "JSON-RPC client library";
        license = stdenv.lib.licenses.bsd3;
@@ -69690,11 +71486,11 @@ self: {
        sha256 = "0ypr4jpc12f771g3gsahbj0yjzd0ns8mmwjl90knwg267d712i13";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs colour containers diagrams-core diagrams-lib
          diagrams-svg mtl parsec parsec-numbers random
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cmdargs colour containers diagrams-core diagrams-lib
          diagrams-svg HUnit mtl parsec parsec-numbers QuickCheck random
          test-framework test-framework-hunit test-framework-quickcheck2
@@ -69717,12 +71513,16 @@ self: {
        sha256 = "1d9mf35i5nwpnr5l5v75rrcwihfkpfy3ji9jwhk9k0g285bfr5dh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring lens managed template-haskell ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring lens managed template-haskell
+       ];
+       librarySystemDepends = [ mesos protobuf ];
+       executableHaskellDepends = [ base bytestring lens ];
+       executableSystemDepends = [ mesos ];
+       testHaskellDepends = [
          base bytestring lens managed QuickCheck tasty tasty-hunit
          tasty-quickcheck
        ];
-       extraLibraries = [ mesos protobuf ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) mesos;  inherit (pkgs) protobuf;};
@@ -69735,7 +71535,7 @@ self: {
        sha256 = "1bk278ni5bk8qcc8mbb7h26g9k5hcdl4h1ilrh8prc0kvngz8g4w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HandsomeSoup hxt random ];
+       executableHaskellDepends = [ base HandsomeSoup hxt random ];
        jailbreak = true;
        description = "Name generator";
        license = stdenv.lib.licenses.mit;
@@ -69752,7 +71552,8 @@ self: {
        sha256 = "064sk0g8mzkqm80hfxg03qn6g1awydlw15ylikk3rs4wf7fclw30";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ array base MonadPrompt mtl random ];
+       executableHaskellDepends = [
          array base directory glib gtk MonadPrompt mtl random
        ];
        description = "Programmer's Mine Sweeper in Haskell";
@@ -69766,7 +71567,7 @@ self: {
        pname = "hs-php-session";
        version = "0.0.9.3";
        sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/elblake/hs-php-session";
        description = "PHP session and values serialization";
        license = stdenv.lib.licenses.bsd3;
@@ -69777,10 +71578,10 @@ self: {
      mkDerivation {
        pname = "hs-pkg-config";
        version = "0.2.1.0";
-       revision = "1";
        sha256 = "09v2kp643asl3zpv8rbb8a7zv0h3bn5l4gxz44d71kly9qr3jkhh";
+       revision = "1";
        editedCabalFile = "9337acf593d6f7e1d54f81886cb3736001a127e3b75ba01bd97a99d77565f784";
-       buildDepends = [ base data-default-class text ];
+       libraryHaskellDepends = [ base data-default-class text ];
        homepage = "https://github.com/trskop/hs-pkg-config";
        description = "Create pkg-config configuration files";
        license = stdenv.lib.licenses.bsd3;
@@ -69796,7 +71597,7 @@ self: {
        pname = "hs-pkpass";
        version = "0.4";
        sha256 = "01jcl2ia8p29gg5yazpxm6cdxyskl6z895lmgh888qkf9jlzf5mf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit directory
          filesystem-conduit old-locale random shakespeare-text shelly
          system-filepath text time transformers unordered-containers uuid
@@ -69815,7 +71616,7 @@ self: {
        pname = "hs-re";
        version = "0.1.0";
        sha256 = "0rx7shfjyi9k910mvzskykqxnijl8rrh08c0bkqlmqwisyhl7wbb";
-       buildDepends = [ array base regex-base regex-posix ];
+       libraryHaskellDepends = [ array base regex-base regex-posix ];
        jailbreak = true;
        description = "Easy to use Regex";
        license = stdenv.lib.licenses.mit;
@@ -69830,11 +71631,11 @@ self: {
        pname = "hs-scrape";
        version = "0.1.0.0";
        sha256 = "0w5zrd7xj3ccw4xkdsq20j1ki2j8sy3glzijsq5m2227szwv7y6v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default exceptions hspec
          html-conduit lens retry safe text transformers url wreq xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec tasty tasty-hunit xml-conduit
        ];
        jailbreak = true;
@@ -69851,7 +71652,7 @@ self: {
        pname = "hs-twitter";
        version = "0.2.8";
        sha256 = "1r8bd5q7d5mxmd6012mpp1yx353wzib174xd9v0mvkbb009b4mph";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HTTP json mime network old-locale old-time random utf8-string
        ];
        description = "Haskell binding to the Twitter API";
@@ -69867,7 +71668,7 @@ self: {
        sha256 = "077mc8dn2f6x3s29pm80qi7mj6s2crdhky0vygzfqd8v23gmhqcg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HTTP json mtl network pretty ];
+       executableHaskellDepends = [ base HTTP json mtl network pretty ];
        homepage = "https://github.com/deepakjois/hs-twitterarchiver";
        description = "Commandline Twitter feed archiver";
        license = "GPL";
@@ -69880,7 +71681,7 @@ self: {
        pname = "hs-vcard";
        version = "0.1";
        sha256 = "0qb7gsbki3ciqddxp9j46rnx64vv622n2p9vidv1b000wbmmrz15";
-       buildDepends = [ base old-locale time ];
+       libraryHaskellDepends = [ base old-locale time ];
        homepage = "http://qrcard.us/";
        description = "Implements the RFC 2426 vCard 3.0 spec";
        license = stdenv.lib.licenses.bsd3;
@@ -69897,8 +71698,9 @@ self: {
        sha256 = "1hm9lwhq1b8i04gl3z2iw6g67slrjcrymp2fxxvykxgkff6dmkps";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base random ];
-       testDepends = [
+       libraryHaskellDepends = [ base random ];
+       executableHaskellDepends = [ base random ];
+       testHaskellDepends = [
          base doctest Glob hlint hspec HUnit process QuickCheck random
          regex-compat
        ];
@@ -69918,7 +71720,7 @@ self: {
        sha256 = "1lx0px0gicwry5i4rwgzz6jasjhp24f620w2iby9xpbvn6h3zflm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory filepath haskell-src mtl
        ];
        homepage = "http://www.xanxys.net/hs2bf/";
@@ -69937,7 +71739,7 @@ self: {
        sha256 = "0pfbclqpndlnxnvs630q8x272q13z9dfp35gp9dj6m527x78fapx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory haskell-src haskell-src-exts haskell98 split
        ];
        jailbreak = true;
@@ -69952,10 +71754,10 @@ self: {
      mkDerivation {
        pname = "hsConfigure";
        version = "0.1.0.2";
-       revision = "2";
        sha256 = "199sza2jh3d5046yyb141b0jwh1m1p68hv4x3b5xz6vw9dzfbw3c";
+       revision = "2";
        editedCabalFile = "ab3264ebf799e07e40fd913b9061197b346a7d84145908566155231e62a45c02";
-       buildDepends = [ base directory filepath process unix ];
+       libraryHaskellDepends = [ base directory filepath process unix ];
        homepage = "http://github.com/YoshikuniJujo/hsConfigure/wiki";
        description = "By using this package, you can make application configurable";
        license = "LGPL";
@@ -69969,7 +71771,7 @@ self: {
        pname = "hsSqlite3";
        version = "0.1";
        sha256 = "0wmsswccwcz2zd3zap0wsapzbya72cxdyzhlcch4akvwqcl9hz6a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-sqlite3 bytestring mtl utf8-string
        ];
        jailbreak = true;
@@ -69984,8 +71786,8 @@ self: {
        pname = "hsXenCtrl";
        version = "0.2.0";
        sha256 = "0zxmlyckp9c0i5s8vi62d3qvnilh8kl093ckqr7dchgmki4az7rp";
-       buildDepends = [ array base bytestring dlist mtl ];
-       extraLibraries = [ xenctrl ];
+       libraryHaskellDepends = [ array base bytestring dlist mtl ];
+       librarySystemDepends = [ xenctrl ];
        jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/HsXenCtrl";
        description = "FFI bindings to the Xen Control library";
@@ -70002,17 +71804,16 @@ self: {
        pname = "hsass";
        version = "0.3.0";
        sha256 = "15x5f8zcikg1bh10sk5b2gqjfldgp4jdgwhl2k20i6h8mxjkpmdf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class filepath hlibsass monad-loops
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring data-default-class hspec hspec-discover temporary
        ];
        homepage = "https://github.com/jakubfijalkowski/hsass";
        description = "Integrating Sass into Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsay" = callPackage
@@ -70023,7 +71824,7 @@ self: {
        sha256 = "0qar7y4190dfv63jmzx8saxqxzh73spc2q3i6pqywdbv7zb6zvrl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Hclip HTTP process unix ];
+       executableHaskellDepends = [ base Hclip HTTP process unix ];
        jailbreak = true;
        description = "(ab)Use Google Translate as a speech synthesiser";
        license = stdenv.lib.licenses.gpl3;
@@ -70039,7 +71840,7 @@ self: {
        sha256 = "1n7rj2q87j544d82alxhrsqhz4ix8qpwxpw3l2np7wjl0n101n4a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath preprocessor-tools
        ];
        description = "Preprocesses a file, adding blobs from files as string literals";
@@ -70056,7 +71857,7 @@ self: {
        sha256 = "1g1lb43f7cdm5fjmdd64n9vl2nxlm8jpng94hyyldwv8a6x7555z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs directory filepath hashed-storage
          old-locale strict time
        ];
@@ -70075,11 +71876,11 @@ self: {
        pname = "hsbencher";
        version = "1.20.0.5";
        sha256 = "1fqp0n106dnqik3p6fa60xkamls8wgg8c5sp2klgp36n3xflvy9h";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers data-default directory filepath
          GenericPretty io-streams mtl process random time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers directory HUnit test-framework
          test-framework-hunit text time
        ];
@@ -70096,7 +71897,7 @@ self: {
        pname = "hsbencher-codespeed";
        version = "0.1.0.1";
        sha256 = "1a3hac73mzd0q25b1xbdh121k33m12phpxfn6hh7qcg5yys2i8l5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default directory filepath
          hsbencher HTTP http-conduit http-types json mtl network resourcet
          time
@@ -70116,10 +71917,13 @@ self: {
        sha256 = "0xp2jm5zvrx5sz2mniachd7hjmhmf0sv9as3dzln8693n6l1ak4r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers criterion csv data-default directory
-         filepath handa-gdata hsbencher http-conduit mtl network split
-         statistics text time
+       libraryHaskellDepends = [
+         base bytestring containers data-default directory filepath
+         handa-gdata hsbencher http-conduit mtl network time
+       ];
+       executableHaskellDepends = [
+         base bytestring containers criterion csv handa-gdata hsbencher mtl
+         split statistics text
        ];
        description = "Backend for uploading benchmark data to Google Fusion Tables";
        license = stdenv.lib.licenses.bsd3;
@@ -70133,7 +71937,7 @@ self: {
        sha256 = "0kfvpsapgslxywpmqba5vcx79xmbj87dwg8fjjjk517x28wisivz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers directory process ];
+       executableHaskellDepends = [ base containers directory process ];
        jailbreak = true;
        description = "A preprocessor that helps with writing Haskell bindings to C code";
        license = stdenv.lib.licenses.bsd3;
@@ -70149,7 +71953,7 @@ self: {
        pname = "hsc3";
        version = "0.15.1";
        sha256 = "1ad5q4rq82v7l556rinaiikglr1kjswi5raw0dxqwsfjbp8imbha";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers data-default data-ordlist
          directory filepath hashable hosc network process random safe split
          transformers
@@ -70166,7 +71970,9 @@ self: {
        pname = "hsc3-auditor";
        version = "0.15";
        sha256 = "02p4y06p08mizdrbvl52364szksrwnx28s992prw8b2ilav11563";
-       buildDepends = [ base filepath hmt hosc hsc3 hsc3-sf-hsndfile ];
+       libraryHaskellDepends = [
+         base filepath hmt hosc hsc3 hsc3-sf-hsndfile
+       ];
        homepage = "http://rd.slavepianos.org/t/hsc3-auditor";
        description = "Haskell SuperCollider Auditor";
        license = "GPL";
@@ -70178,7 +71984,7 @@ self: {
        pname = "hsc3-cairo";
        version = "0.14";
        sha256 = "1f62mfjssky7igbp1nx2zf1azbih76m65xydnf5akp8pim7nzmis";
-       buildDepends = [ base cairo gtk hosc hsc3 split ];
+       libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/?t=hsc3-cairo";
        description = "haskell supercollider cairo drawing";
@@ -70194,7 +72000,7 @@ self: {
        pname = "hsc3-data";
        version = "0.15";
        sha256 = "0321rnajfiwldwwpns78im842hypykc1js7flnasld7al6m7487d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors Glob hcg-minus hmt hsc3-lang hsc3-plot
          hsc3-sf-hsndfile safe split SVGPath xml
        ];
@@ -70210,7 +72016,7 @@ self: {
        pname = "hsc3-db";
        version = "0.15";
        sha256 = "0sj3hq0d8dl4m6fn75lvyr78sg283p6y13lg8yi2yrgz74kn4zbl";
-       buildDepends = [ base hsc3 safe ];
+       libraryHaskellDepends = [ base hsc3 safe ];
        homepage = "http://rd.slavepianos.org/t/hsc3-db";
        description = "Haskell SuperCollider Unit Generator Database";
        license = "GPL";
@@ -70222,7 +72028,7 @@ self: {
        pname = "hsc3-dot";
        version = "0.15";
        sha256 = "1ck2g15zw23smry1xvn9ida8ln57vnvkxvr3khhp5didwisgm90m";
-       buildDepends = [ base directory filepath hsc3 process ];
+       libraryHaskellDepends = [ base directory filepath hsc3 process ];
        homepage = "http://rd.slavepianos.org/t/hsc3-dot";
        description = "haskell supercollider graph drawing";
        license = "GPL";
@@ -70238,7 +72044,7 @@ self: {
        sha256 = "0b3q6w1r12wv1fl05armkrprlkx2s7n08mimkxxndsd9kl6zl8lw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath hashable hosc hsc3 hsc3-db
          hsc3-dot mtl unix
        ];
@@ -70261,11 +72067,17 @@ self: {
        sha256 = "1d59gl0shwkwi9581j7x7yy1j63acns9ccpwin4y5lwk0k5x6s38";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring cairo containers data-default
-         directory filepath hashable hls hmt hosc hps hsc3 hsc3-cairo
-         hsc3-lang hsc3-sf hsc3-unsafe hsc3-utils hsharc MonadRandom primes
-         process random random-shuffle sc3-rdu she split
+         directory filepath hls hmt hosc hps hsc3 hsc3-cairo hsc3-lang
+         hsc3-sf hsc3-unsafe hsc3-utils hsharc MonadRandom primes random
+         random-shuffle sc3-rdu she split
+       ];
+       executableHaskellDepends = [
+         array base binary bytestring cairo containers directory filepath
+         hashable hls hmt hosc hps hsc3 hsc3-cairo hsc3-lang hsc3-sf
+         hsc3-unsafe hsharc MonadRandom primes process random random-shuffle
+         sc3-rdu split
        ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/t/hsc3-graphs";
@@ -70284,7 +72096,7 @@ self: {
        pname = "hsc3-lang";
        version = "0.15";
        sha256 = "09qn9kb8h40cwhnjf4pl70i2vi7cn4pa4wkdwjbn07hrdpvxgihf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bifunctors bytestring containers data-default
          data-ordlist dlist hashable hmatrix-special hosc hsc3 MonadRandom
          random random-shuffle split transformers vector
@@ -70305,7 +72117,7 @@ self: {
        sha256 = "1k45ipivvlfymvh6rzxsv1kfvd11spsn3skmsswg2vd76bcgh20x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath hashable hosc hsc3 hsc3-dot
          husk-scheme mtl safe unix
        ];
@@ -70323,7 +72135,7 @@ self: {
        pname = "hsc3-plot";
        version = "0.15";
        sha256 = "1v5n4k54qp8ifwka2bhrq9w1kfzd3ldzhqyhvkcgl0z46xcf7lk3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath hosc hsc3 hsc3-lang process split
          statistics vector
        ];
@@ -70344,10 +72156,11 @@ self: {
        sha256 = "1h769akpd5gsmmlzmhya3dh56rhpf4fkj0vl6zngahc5hl4s7qxc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default directory filepath hosc
          hsc3 process time time-compat transformers
        ];
+       executableHaskellDepends = [ base data-default hosc hsc3 ];
        homepage = "https://github.com/kaoskorobase/hsc3-process";
        description = "Create and control scsynth processes";
        license = "GPL";
@@ -70359,7 +72172,7 @@ self: {
        pname = "hsc3-rec";
        version = "0.14.1";
        sha256 = "0m814vr41i0mm0c001vbih9i93048niljv3z8czaz32wysa8xpfl";
-       buildDepends = [ base hsc3 ];
+       libraryHaskellDepends = [ base hsc3 ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/?t=hsc3-rec";
        description = "Haskell SuperCollider Record Variants";
@@ -70375,7 +72188,7 @@ self: {
        pname = "hsc3-rw";
        version = "0.15";
        sha256 = "1jcnw0a1nf4wwf5bz61bkpwd3jfgccfxmcqq06vy43pc98223z8p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory haskell-src-exts parsec polyparse split syb
          transformers
        ];
@@ -70397,12 +72210,15 @@ self: {
        sha256 = "00lw0mj76i2fqhx81d258mqdwqxy8313574i2i8vrjn0mn4bbg2p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bitset bytestring containers data-default failure hashtables
-         hosc hsc3 hsc3-process lifted-base ListZipper monad-control random
-         resourcet transformers transformers-base unix
+         hosc hsc3 hsc3-process lifted-base ListZipper monad-control
+         resourcet transformers transformers-base
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base hosc hsc3 random transformers unix
+       ];
+       testHaskellDepends = [
          base failure QuickCheck random test-framework
          test-framework-quickcheck2 transformers
        ];
@@ -70418,7 +72234,7 @@ self: {
        pname = "hsc3-sf";
        version = "0.15";
        sha256 = "1dg3gqhvi2rshfqnw7i89bd4bvqjvbk4f9g17x18swyrvgkz9wr7";
-       buildDepends = [ base bytestring hosc ];
+       libraryHaskellDepends = [ base bytestring hosc ];
        homepage = "http://rd.slavepianos.org/t/hsc3-sf";
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
@@ -70432,7 +72248,7 @@ self: {
        pname = "hsc3-sf-hsndfile";
        version = "0.15";
        sha256 = "11ksss2g8a7lqpjqvdwj4j9y3kdc8algc9mhlyjmj38mgg4raa2i";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base hsc3-sf hsndfile hsndfile-vector vector
        ];
        homepage = "http://rd.slavepianos.org/t/hsc3-sf-hsndfile";
@@ -70446,7 +72262,7 @@ self: {
        pname = "hsc3-unsafe";
        version = "0.14";
        sha256 = "0kywqx7x10hqzhq8by0f62aznrnq4y3013cxkccx1r0naajpz3yj";
-       buildDepends = [ base hsc3 ];
+       libraryHaskellDepends = [ base hsc3 ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/?t=hsc3-unsafe";
        description = "Unsafe Haskell SuperCollider";
@@ -70464,9 +72280,11 @@ self: {
        sha256 = "1pvg2z6n2r7jhwgwx9rv4q94jdj2ql3kgjh4smjq4xafnzzlyrix";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base directory filepath hashable hosc hsc3 hsc3-dot hsc3-rw hsc3-sf
-         process
+       libraryHaskellDepends = [
+         base directory filepath hashable hosc hsc3 hsc3-sf
+       ];
+       executableHaskellDepends = [
+         base filepath hsc3 hsc3-dot hsc3-rw process
        ];
        homepage = "http://rd.slavepianos.org/t/hsc3-utils";
        description = "Haskell SuperCollider Utilities";
@@ -70481,8 +72299,8 @@ self: {
        pname = "hscamwire";
        version = "0.2.1";
        sha256 = "0alnwc170hd2dyq718nvfq5dsbnyp29j3z49w2w5k59pi9pnqybc";
-       buildDepends = [ array base time unix ];
-       extraLibraries = [ camwire_1394 dc1394_control raw1394 ];
+       libraryHaskellDepends = [ array base time unix ];
+       librarySystemDepends = [ camwire_1394 dc1394_control raw1394 ];
        jailbreak = true;
        description = "Haskell bindings to IIDC1394 cameras, via Camwire";
        license = "LGPL";
@@ -70498,7 +72316,7 @@ self: {
        pname = "hscassandra";
        version = "0.0.7";
        sha256 = "06jr17karspq3qpan9iqh0zk2w3b2d7ghdvl8wd4hjz73yacw6f4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cassandra-thrift containers mtl network old-time
          Thrift
        ];
@@ -70516,7 +72334,8 @@ self: {
        sha256 = "1wjf3gba1gfbd54d0r4xpkfq7lyvyamhfw21wnsnqsl4hvp335jr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aeson base bytestring ghc-prim HTTP ];
+       libraryHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
+       executableHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
        jailbreak = true;
        homepage = "https://bitbucket.org/sebasmagri/hscd";
        description = "Command line client and library for SoundCloud.com";
@@ -70531,7 +72350,7 @@ self: {
        sha256 = "0g853fq9vv33nga05rhls6hk5h4gaby8mws0i8yq2iday6j576nf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cairo glib gtk old-time ];
+       executableHaskellDepends = [ base cairo glib gtk old-time ];
        homepage = "http://haskell.org/gtk2hs/archives/2006/01/26/cairo-eye-candy/";
        description = "An elegant analog clock using Haskell, GTK and Cairo";
        license = "GPL";
@@ -70546,7 +72365,8 @@ self: {
        sha256 = "1c4i2zpami8g3w9949nm3f92g7xwh5c94vkx658zz7ihrjp7w5lp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        homepage = "http://code.haskell.org/~malcolm/hscolour/";
        description = "Colourise Haskell code";
        license = "GPL";
@@ -70563,11 +72383,13 @@ self: {
        sha256 = "1m5mp45pvf64pnpc3lsig382177vfc232bbm9g3a8q58jrwridy7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cereal cpphs deepseq directory haskell-src-exts mtl
          process pure-cdb uniplate vector
        ];
-       testDepends = [ base directory mtl process test-simple Unixutils ];
+       testHaskellDepends = [
+         base directory mtl process test-simple Unixutils
+       ];
        jailbreak = true;
        homepage = "https://github.com/bosu/hscope";
        description = "cscope like browser for Haskell code";
@@ -70584,13 +72406,12 @@ self: {
        sha256 = "1az51cv6wqjdkw0fqgi5s75rmfka3sly85022rhvk44w1vd45iii";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory process regex-compat time time-locale-compat
        ];
        homepage = "http://hub.darcs.net/dino/hscrtmpl";
        description = "Haskell shell script template";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscuid" = callPackage
@@ -70601,10 +72422,10 @@ self: {
        pname = "hscuid";
        version = "1.2.0.0";
        sha256 = "01dmxckv9rlgb87ms5xbysw2cc7prmfww8g2n98ncgnc0lh3pc5l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base formatting hostname random text time transformers unix
        ];
-       testDepends = [ base containers ];
+       testHaskellDepends = [ base containers ];
        homepage = "https://github.com/eightyeight/hscuid";
        description = "Collision-resistant IDs";
        license = stdenv.lib.licenses.bsd3;
@@ -70617,11 +72438,12 @@ self: {
        pname = "hscurses";
        version = "1.4.2.0";
        sha256 = "0msf80475l3ncpnb1lcpnyscl1svmqg074ylb942rx7dbvck71bj";
-       buildDepends = [ base exceptions mtl old-locale old-time unix ];
+       libraryHaskellDepends = [
+         base exceptions mtl old-locale old-time unix
+       ];
        homepage = "https://github.com/skogsbaer/hscurses";
        description = "NCurses bindings for Haskell";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscurses-fish-ex" = callPackage
@@ -70632,7 +72454,7 @@ self: {
        sha256 = "1s7b2v3cl0nl2b55agn5wkvxn30f2bgp6mznkn33148vlbya1mzs";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hscurses random safe unix ];
+       executableHaskellDepends = [ base hscurses random safe unix ];
        homepage = "http://ui3.info/darcs/hscurses-fish-ex/";
        description = "hscurses swimming fish example";
        license = stdenv.lib.licenses.bsd3;
@@ -70656,7 +72478,7 @@ self: {
        sha256 = "180xrxamas2fg2366k3cpy7al8mq82d1hgjrs7i1r2s3gr877xz8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty array attoparsec base bin-package-db bytestring
          Cabal containers deepseq directory exceptions filepath fsnotify ghc
          ghc-mod ghc-paths haddock-api haskell-src-exts hdocs hlint HTTP
@@ -70666,7 +72488,12 @@ self: {
          transformers transformers-base uniplate unix unordered-containers
          vector
        ];
-       testDepends = [ base ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring containers deepseq directory
+         exceptions filepath ghc haskell-src-exts lens monad-loops mtl
+         network process text transformers unordered-containers vector
+       ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc";
@@ -70679,7 +72506,7 @@ self: {
        pname = "hsdif";
        version = "0.14";
        sha256 = "1wxms6z8mpyf4l1qqxi6gvscls3mwlj5aq6g3ldashzrmb7pcimm";
-       buildDepends = [ base bytestring hosc ];
+       libraryHaskellDepends = [ base bytestring hosc ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/?t=hsdif";
        description = "Haskell SDIF";
@@ -70694,7 +72521,7 @@ self: {
        sha256 = "0hqwpcf2bcrj36wg02mxd2zdg07dqh4b5mv9yn295xp64snrdw84";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cairo containers HUnit parsec ];
+       libraryHaskellDepends = [ base cairo containers HUnit parsec ];
        homepage = "http://neugierig.org/software/darcs/hsdip/";
        description = "hsdip - a Diplomacy parser/renderer";
        license = stdenv.lib.licenses.bsd3;
@@ -70707,8 +72534,8 @@ self: {
        pname = "hsdns";
        version = "1.6.1";
        sha256 = "0s63acjy1n75k7gjm4kam7v5d4a5kn0aw178mygkqwr5frflghb4";
-       buildDepends = [ base containers network ];
-       extraLibraries = [ adns ];
+       libraryHaskellDepends = [ base containers network ];
+       librarySystemDepends = [ adns ];
        homepage = "http://github.com/peti/hsdns";
        description = "Asynchronous DNS Resolver";
        license = stdenv.lib.licenses.gpl3;
@@ -70722,7 +72549,7 @@ self: {
        pname = "hsdns-cache";
        version = "1.0.4";
        sha256 = "1f0822kly602izwzxfi46w668k0jybn3khfacnxmc1744jpqr89i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hsdns network SafeSemaphore text time unordered-containers
        ];
        homepage = "https://github.com/bazqux/hsdns-cache";
@@ -70737,7 +72564,7 @@ self: {
        pname = "hse-cpp";
        version = "0.1";
        sha256 = "0f1bgi1hnpnry1pm7jhi626afdvymzy7k0a70n07n41js46pjxd0";
-       buildDepends = [ base cpphs haskell-src-exts ];
+       libraryHaskellDepends = [ base cpphs haskell-src-exts ];
        description = "Preprocess+parse haskell code";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -70750,7 +72577,7 @@ self: {
        pname = "hsebaysdk";
        version = "0.3.0.0";
        sha256 = "1bmkka53dxaizbiazici0i60qrqq2zbff95xqxlfp11v3cclcffg";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-client http-types text time transformers
          unordered-containers
        ];
@@ -70765,8 +72592,8 @@ self: {
        pname = "hsemail";
        version = "1.7.7";
        sha256 = "16wqrpzi5njv26za1rckn74jsqmyswndb6k38yz1567h1y4w7ai5";
-       buildDepends = [ base mtl old-time parsec ];
-       testDepends = [ base doctest hspec old-time parsec ];
+       libraryHaskellDepends = [ base mtl old-time parsec ];
+       testHaskellDepends = [ base doctest hspec old-time parsec ];
        homepage = "http://github.com/peti/hsemail";
        description = "Internet Message Parsers";
        license = stdenv.lib.licenses.bsd3;
@@ -70778,7 +72605,7 @@ self: {
        pname = "hsemail-ns";
        version = "1.3.2";
        sha256 = "03d0pnsba7yj5x7zrg8b80kxsnqn5g40vd2i717s1dnn3bd3vz4s";
-       buildDepends = [ base mtl old-time parsec ];
+       libraryHaskellDepends = [ base mtl old-time parsec ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/hsemail-ns/home";
        description = "Internet Message Parsers";
@@ -70796,7 +72623,7 @@ self: {
        sha256 = "1kjj9p8x6369g9ah9h86xlyvcm4jkahvlz2pvj1m73javbgyyf03";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal directory file-embed filepath http-streams
          io-streams mtl process safe split unix
        ];
@@ -70814,7 +72641,7 @@ self: {
        sha256 = "1dvnkd3nwgdz9hq8zafvmn75hczsiflbf05j10nmrj8imhyh70j3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cmdargs wai-app-static warp ];
+       executableHaskellDepends = [ base cmdargs wai-app-static warp ];
        homepage = "http://github.com/rejuvyesh/hserv";
        description = "Simple http server in haskell";
        license = stdenv.lib.licenses.mit;
@@ -70826,8 +72653,8 @@ self: {
        pname = "hset";
        version = "1.1.0";
        sha256 = "15ls3wkk29mf2nyrm80dcmg66q0dd0srgwyv46ix3zkaxs239mbl";
-       buildDepends = [ base mtl ];
-       testDepends = [ base HUnit mtl ];
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base HUnit mtl ];
        homepage = "https://bitbucket.org/s9gf4ult/hset";
        description = "Primitive heterogenous read-only set";
        license = stdenv.lib.licenses.bsd3;
@@ -70841,16 +72668,15 @@ self: {
        pname = "hsexif";
        version = "0.6.0.4";
        sha256 = "0k9a6d6c2n0x5g6vls4848gydnvw790lf1nyy5piz1rdzsd6bx3k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers iconv text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring containers hspec HUnit iconv text time
        ];
        homepage = "https://github.com/emmanueltouzery/hsexif";
        description = "EXIF handling library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsfacter" = callPackage
@@ -70859,7 +72685,7 @@ self: {
        pname = "hsfacter";
        version = "0.2.1";
        sha256 = "1j7pny0yjpx5qw2d9br723dyic4v09k1qbvrham57p9qxn9m5b0q";
-       buildDepends = [ base containers language-puppet text ];
+       libraryHaskellDepends = [ base containers language-puppet text ];
        homepage = "http://lpuppet.banquise.net";
        description = "A small and ugly library that emulates the output of the puppet facter program";
        license = stdenv.lib.licenses.gpl3;
@@ -70874,7 +72700,9 @@ self: {
        sha256 = "1fc1fk33wslfkpb83c3ax251h60d5zn2qiqyw81v19wd5r2a6kqc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hdaemonize hslogger network process ];
+       executableHaskellDepends = [
+         base hdaemonize hslogger network process
+       ];
        jailbreak = true;
        homepage = "https://github.com/Yuras/hsfcsh";
        description = "Incremental builder for flash";
@@ -70889,7 +72717,7 @@ self: {
        sha256 = "063k5f64734wvrl45nrp1yvh3bf51w3dzzf3jj4fmj1gjp07zy48";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ghc ];
+       executableHaskellDepends = [ base ghc ];
        jailbreak = true;
        description = "Z-decoder";
        license = stdenv.lib.licenses.mit;
@@ -70901,8 +72729,8 @@ self: {
        pname = "hsgnutls";
        version = "0.2.3.2";
        sha256 = "1nd3z8kb4qjaj0hic9b305c15a7g6sfx6dixz8pspvqg1x84cjnm";
-       buildDepends = [ base bytestring mtl old-time ];
-       extraLibraries = [ gcrypt gnutls ];
+       libraryHaskellDepends = [ base bytestring mtl old-time ];
+       librarySystemDepends = [ gcrypt gnutls ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls";
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
@@ -70915,8 +72743,8 @@ self: {
        pname = "hsgnutls-yj";
        version = "0.2.3.3";
        sha256 = "05dn7kvjxk2pnzv040hyw71nvr83jvdvajq4a9v76kcyjhhwiv0w";
-       buildDepends = [ base bytestring mtl old-time ];
-       extraLibraries = [ gcrypt gnutls ];
+       libraryHaskellDepends = [ base bytestring mtl old-time ];
+       librarySystemDepends = [ gcrypt gnutls ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls";
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
@@ -70929,7 +72757,7 @@ self: {
        pname = "hsgsom";
        version = "0.2.0";
        sha256 = "1043lavrimaxmscayg4knx7ly0yc0gsb729pg72g897hc455r2dn";
-       buildDepends = [ base containers random stm time ];
+       libraryHaskellDepends = [ base containers random stm time ];
        description = "An implementation of the GSOM clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70945,7 +72773,7 @@ self: {
        sha256 = "0rsi54zhznqdycjkbkdblbfcx7lbvwdwvw0zlxqspyiz2px6lqc6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base containers directory haskeline mtl
        ];
        homepage = "http://www.mlesniak.com/haskell/gettings-things-done-in-haskell/";
@@ -70959,7 +72787,7 @@ self: {
        pname = "hsharc";
        version = "0.14";
        sha256 = "1mzi074iiz48pcy6rvgqz6ckm0zx115kmvax60bx9bfcanw686vf";
-       buildDepends = [ base xml ];
+       libraryHaskellDepends = [ base xml ];
        homepage = "http://rd.slavepianos.org/?t=hsharc";
        description = "Haskell SHARC bindings";
        license = "GPL";
@@ -70974,12 +72802,12 @@ self: {
        pname = "hsignal";
        version = "0.2.7.1";
        sha256 = "1dzga1cgxrk7i65zrmpg22521islp4xzfc95ph7kla2acxzr6q0x";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats
          hstatistics mtl storable-complex
        ];
-       extraLibraries = [ blas lapack ];
-       pkgconfigDepends = [ gsl ];
+       librarySystemDepends = [ blas lapack ];
+       libraryPkgconfigDepends = [ gsl ];
        homepage = "http://code.haskell.org/hsignal";
        description = "Signal processing and EEG data analysis";
        license = stdenv.lib.licenses.bsd3;
@@ -70994,7 +72822,7 @@ self: {
        sha256 = "001wwlwxd3qb3mcpn0l5qmd7nvpy8qlrcr5j3s5111pgfi8ib0sn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskeline ];
+       executableHaskellDepends = [ base haskeline ];
        homepage = "https://github.com/Rnhmjoj/hsilop";
        description = "RPN calculator";
        license = stdenv.lib.licenses.mit;
@@ -71011,11 +72839,12 @@ self: {
        sha256 = "10h19rdzqskjvaax30znqpvx765x0lj58wp1zgf8dv6mgvaz77zy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base cmdargs directory dyre haskell-src-exts lens mtl
          split text
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base filepath haskell-src-exts tasty tasty-golden
        ];
        jailbreak = true;
@@ -71031,8 +72860,8 @@ self: {
        pname = "hsini";
        version = "0.4.2";
        sha256 = "1zkrfc2zyhcwy7l1k8kn0k2qv6jkxw0d6h6bifzh6d5h01ws72mr";
-       buildDepends = [ base bytestring containers mtl parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring containers mtl parsec ];
+       testHaskellDepends = [
          base bytestring containers HUnit mtl parsec QuickCheck tasty
          tasty-hunit tasty-quickcheck tasty-th
        ];
@@ -71046,7 +72875,7 @@ self: {
        pname = "hskeleton";
        version = "0.1.1";
        sha256 = "0f06xir28rzpwphk14gkpww8l7gbws4habhm26915idpnd4bva2w";
-       buildDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base Cabal ];
        description = "Skeleton for new Haskell programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71060,7 +72889,9 @@ self: {
        sha256 = "0j4wkw6hqajgwzik8flfzs2m5rlmy9blm98n5ym56svjypshl55q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath process unix ];
+       executableHaskellDepends = [
+         base Cabal directory filepath process unix
+       ];
        homepage = "http://code.haskell.org/~arossato/hslackbuilder";
        description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package";
        license = stdenv.lib.licenses.bsd3;
@@ -71073,8 +72904,8 @@ self: {
        pname = "hslibsvm";
        version = "2.89.0.1";
        sha256 = "00smw10j2ipw10133qc38famar5r6rkswj7bhvb9hdj2rrdyx6sf";
-       buildDepends = [ base containers ];
-       extraLibraries = [ svm ];
+       libraryHaskellDepends = [ base containers ];
+       librarySystemDepends = [ svm ];
        description = "A FFI binding to libsvm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71089,7 +72920,9 @@ self: {
        sha256 = "1dqicdvklkczn216qxb7gnjjgvgmr0s6iljyb33qhmmabrx5a7x1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal hint MemoTrie process regex-compat ];
+       executableHaskellDepends = [
+         base Cabal hint MemoTrie process regex-compat
+       ];
        description = "Resolves links to Haskell identifiers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71104,7 +72937,7 @@ self: {
        sha256 = "0xml1xgkj4hjjxypnjiia7y330a0nh5fcnkwhmnrwsw7hckwqqmy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory mtl network old-locale process time unix
        ];
        homepage = "http://software.complete.org/hslogger";
@@ -71118,7 +72951,7 @@ self: {
        pname = "hslogger-template";
        version = "2.0.3";
        sha256 = "1q5g2jgx4yjzvbrc22qcxrb3r9cma64jg90wzx9yc19yxq0fa95k";
-       buildDepends = [ base hslogger mtl template-haskell ];
+       libraryHaskellDepends = [ base hslogger mtl template-haskell ];
        description = "Automatic generation of hslogger functions";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -71129,7 +72962,7 @@ self: {
        pname = "hslogger4j";
        version = "0.2";
        sha256 = "0mypcdj8npygj9g8d276rhr2wagk96zc4rjimwx2ylw4qm0scv5n";
-       buildDepends = [ hslogger ];
+       libraryHaskellDepends = [ hslogger ];
        homepage = "http://hslogger4j.googlecode.com/";
        description = "DEPRECATED hslogger handlers for log4j's XMLLayout";
        license = "LGPL";
@@ -71148,13 +72981,13 @@ self: {
        pname = "hslogstash";
        version = "0.3.7.1";
        sha256 = "040564f4wxmdhglziahava5cbyhvwbiw1ifi1g3cfb9zna2xl8p6";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring conduit containers
          data-default hedis http-conduit http-types iconv lens network
          network-conduit parallel-io stm stm-chans stm-conduit stm-firehose
          text text-format time transformers unordered-containers vector wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit hspec QuickCheck split stm transformers
        ];
        jailbreak = true;
@@ -71171,13 +73004,15 @@ self: {
      mkDerivation {
        pname = "hslua";
        version = "0.4.0";
-       revision = "2";
        sha256 = "0l50ppvnavs3lc1vmrpxhlb3ffl772n1hk8mdi9w4ml64ninba3p";
+       revision = "2";
        editedCabalFile = "43f6956aba870857548523718d3d5645e422187964e5158d14a9c17d96671ccb";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base bytestring hspec hspec-contrib HUnit text ];
-       extraLibraries = [ lua ];
        configureFlags = [ "-fsystem-lua" ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ lua ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-contrib HUnit text
+       ];
        description = "A Lua language interpreter embedding in Haskell";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) lua;};
@@ -71191,11 +73026,15 @@ self: {
        pname = "hsmagick";
        version = "0.5";
        sha256 = "1bfzbwddss0m0z4jf7i0b06pmxy9rvknpqnzhf0v5jggv5nr442p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath pretty process
        ];
-       extraLibraries = [ bzip2 jasper libjpeg libpng tiff wmflite zlib ];
-       pkgconfigDepends = [ freetype2 GraphicsMagick lcms libxml2 ];
+       librarySystemDepends = [
+         bzip2 jasper libjpeg libpng tiff wmflite zlib
+       ];
+       libraryPkgconfigDepends = [
+         freetype2 GraphicsMagick lcms libxml2
+       ];
        homepage = "https://github.com/vincentg/hsmagick";
        description = "FFI bindings for the GraphicsMagick library";
        license = stdenv.lib.licenses.bsd3;
@@ -71214,12 +73053,13 @@ self: {
        pname = "hsmisc";
        version = "1.2";
        sha256 = "1n2na14a5qaph0f457zvkjwr2zkbgh3mfli2ir5wkm7m1bm671aj";
-       buildDepends = [ base containers mtl old-locale parsec time ];
-       testDepends = [ base containers HUnit mtl ];
+       libraryHaskellDepends = [
+         base containers mtl old-locale parsec time
+       ];
+       testHaskellDepends = [ base containers HUnit mtl ];
        homepage = "http://hub.darcs.net/dino/hsmisc";
        description = "A collection of miscellaneous modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsmtpclient" = callPackage
@@ -71228,7 +73068,7 @@ self: {
        pname = "hsmtpclient";
        version = "1.0";
        sha256 = "08gbrwrc85in34nrgjm0zr5sjz2zbjc7hk2zlpvk1dq8x62a6wsg";
-       buildDepends = [ array base directory network old-time ];
+       libraryHaskellDepends = [ array base directory network old-time ];
        homepage = "http://code.google.com/p/hsmtpclient/";
        description = "Simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
@@ -71241,9 +73081,9 @@ self: {
        pname = "hsndfile";
        version = "0.7.1";
        sha256 = "1254r811sspd7h8a4yr4ff3a6c39ywp1zjrkxbsczpxbyg9bdnv2";
-       buildDepends = [ base ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ libsndfile ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ libsndfile ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile";
        license = stdenv.lib.licenses.lgpl21;
@@ -71255,7 +73095,7 @@ self: {
        pname = "hsndfile-storablevector";
        version = "0.5.2";
        sha256 = "1n7jw14pnixiv1z50lb7yzwyyl3yd3gdfg5w0gx0m52pnmqiav9z";
-       buildDepends = [ base hsndfile storablevector ];
+       libraryHaskellDepends = [ base hsndfile storablevector ];
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile (Data.StorableVector interface)";
        license = stdenv.lib.licenses.lgpl2;
@@ -71268,7 +73108,7 @@ self: {
        pname = "hsndfile-vector";
        version = "0.5.2";
        sha256 = "1598bf87llbiri1qh8zirhbsd94c9vhd41lf9vialqrykbmi3zig";
-       buildDepends = [ base hsndfile vector ];
+       libraryHaskellDepends = [ base hsndfile vector ];
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile (Data.Vector interface)";
        license = stdenv.lib.licenses.lgpl2;
@@ -71284,8 +73124,9 @@ self: {
        sha256 = "1hh4lyrd2ki79q6pfz62icp3igzyljwa5bz8ba9vk4kxxawrnbhw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec readline ];
-       testDepends = [
+       libraryHaskellDepends = [ base parsec readline ];
+       executableHaskellDepends = [ base parsec readline ];
+       testHaskellDepends = [
          base HUnit parsec QuickCheck readline test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -71301,7 +73142,7 @@ self: {
        pname = "hsnoise";
        version = "0.0.2";
        sha256 = "0f8xpmzmg71l7qn1vjvzncsx8r7vfpzvlnlq0029ixf64gshbmzl";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        homepage = "https://github.com/colinhect/hsnoise";
        description = "A coherent 3d noise library";
        license = stdenv.lib.licenses.bsd3;
@@ -71315,7 +73156,7 @@ self: {
        sha256 = "0r3z9h5l4hxbjfcqsfk67jp2r964wgvrisk352lpx550vwd6chbf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base network pcap ];
+       executableHaskellDepends = [ base network pcap ];
        description = "a miniature network sniffer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71330,7 +73171,7 @@ self: {
        pname = "hsnsq";
        version = "0.1.2.0";
        sha256 = "0chmcyfar29rnsni47yx286a308rll098lxrr1zhyi7kxvh9j4fb";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec attoparsec-binary base bytestring containers
          hostname hslogger mtl network pipes pipes-attoparsec pipes-network
          stm stm-chans text
@@ -71350,7 +73191,8 @@ self: {
        sha256 = "0pw5l6z1yjjvcxgw71i00gfnjdqcvg09bsacazq9ahvnwsn4aayd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base mtl network old-time random unix ];
+       libraryHaskellDepends = [ array base mtl network old-time random ];
+       executableHaskellDepends = [ unix ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/util/";
        description = "Libraries to use SNTP protocol and small client/server implementations";
        license = stdenv.lib.licenses.bsd3;
@@ -71368,10 +73210,11 @@ self: {
        sha256 = "1c4sigmagwbs3g5pj3as4f930mvba090p7cjq4cy8hbmv6cz0fn1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory parsec regex-compat regex-posix
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base containers directory HUnit parsec QuickCheck regex-compat
          regex-posix test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -71389,7 +73232,7 @@ self: {
        pname = "hsp";
        version = "0.10.0";
        sha256 = "1ayfywgrlmzivsq6lirmgvl65x1shf8041lzw2yh245rkmd91lsf";
-       buildDepends = [ base mtl text ];
+       libraryHaskellDepends = [ base mtl text ];
        homepage = "http://hub.darcs.net/nibro/hsp";
        description = "Haskell Server Pages is a library for writing dynamic server-side web pages";
        license = stdenv.lib.licenses.bsd3;
@@ -71401,7 +73244,7 @@ self: {
        pname = "hsp-cgi";
        version = "0.4.4";
        sha256 = "0m1xylqzmi2c1c92zk5bq6232id9fmjlx4s88ic2fvf5a389n11n";
-       buildDepends = [ base containers harp hsp network ];
+       libraryHaskellDepends = [ base containers harp hsp network ];
        homepage = "http://code.google.com/p/hsp";
        description = "Facilitates running Haskell Server Pages web pages as CGI programs";
        license = stdenv.lib.licenses.bsd3;
@@ -71414,7 +73257,7 @@ self: {
        pname = "hsparklines";
        version = "0.1.0";
        sha256 = "10za4f07a5agg3zgy32fdz02vg9fl344qswhzj5mnx8wpnxmr3y6";
-       buildDepends = [ base bytestring dataenc gd ];
+       libraryHaskellDepends = [ base bytestring dataenc gd ];
        homepage = "http://www.jasani.org/search/label/hsparklines";
        description = "Sparklines for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -71429,11 +73272,11 @@ self: {
        pname = "hsparql";
        version = "0.2.6";
        sha256 = "1vgdp4gz7zwh1n3iilg6kwdasfy4w48pjjgj6swr17k37irwzal4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring HTTP MissingH mtl network network-uri rdf4h text
          xml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers http-types HUnit network-uri rdf4h test-framework
          test-framework-hunit text wai warp
        ];
@@ -71451,7 +73294,7 @@ self: {
        pname = "hspear";
        version = "0.14";
        sha256 = "1h3av9mpgsqfdrd817fz0isqrxn3lxmjyanw33dk9jax136ivi1h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-lexing split utf8-string zlib
        ];
        homepage = "http://rd.slavepianos.org/?t=hspear";
@@ -71469,11 +73312,11 @@ self: {
        pname = "hspec";
        version = "2.1.10";
        sha256 = "0m51afa2n187jjx0fwarg11chakhv3z7fbmqq5rr7j60d9ix9ypq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory hspec-core hspec-meta stringbuilder
        ];
        homepage = "http://hspec.github.io/";
@@ -71489,10 +73332,10 @@ self: {
        pname = "hspec-attoparsec";
        version = "0.1.0.2";
        sha256 = "0r7v6x0k5r8jxl0rnsq8h3gqhbiimsic3kiphn6dxaw954zqnypa";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring hspec-expectations text
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring hspec hspec-expectations text
        ];
        homepage = "http://github.com/alpmestan/hspec-attoparsec";
@@ -71506,8 +73349,8 @@ self: {
        pname = "hspec-checkers";
        version = "0.1.0";
        sha256 = "043qzgjp9ch9wqm269dd87jn8wk5c90q25098hnz8ilv5pnywk6d";
-       buildDepends = [ base checkers hspec ];
-       testDepends = [ base checkers hspec ];
+       libraryHaskellDepends = [ base checkers hspec ];
+       testHaskellDepends = [ base checkers hspec ];
        description = "Allows to use checkers properties from hspec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71518,8 +73361,8 @@ self: {
        pname = "hspec-contrib";
        version = "0.3.0";
        sha256 = "006syw8xagfhsx06ws9ywig1qx5lk4cgl7sq6pbid1s64c72mxn4";
-       buildDepends = [ base hspec-core HUnit ];
-       testDepends = [ base hspec hspec-core HUnit QuickCheck ];
+       libraryHaskellDepends = [ base hspec-core HUnit ];
+       testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
        homepage = "http://hspec.github.io/";
        description = "Contributed functionality for Hspec";
        license = stdenv.lib.licenses.mit;
@@ -71535,11 +73378,11 @@ self: {
        pname = "hspec-core";
        version = "2.1.10";
        sha256 = "1q0fnag7lw54zf6aj55cckcfzs5ykpc841bczap6q9gnwrvpwbk8";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal async base deepseq hspec-expectations HUnit
          QuickCheck quickcheck-io random setenv tf-random time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal async base deepseq hspec-expectations hspec-meta
          HUnit process QuickCheck quickcheck-io random setenv silently
          tf-random time transformers
@@ -71557,8 +73400,8 @@ self: {
        sha256 = "02qs0y7nn8wczjjs606d8ivixxib0024kny2al6mgvxyp524xcgg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath ];
-       testDepends = [ base directory filepath hspec-meta ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [ base directory filepath hspec-meta ];
        homepage = "http://hspec.github.io/";
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
@@ -71570,7 +73413,7 @@ self: {
        pname = "hspec-expectations";
        version = "0.7.1";
        sha256 = "0n52k7qwqc5awig08fvajvymb9bb235q6pp8w0cbcb9a96rwdjmg";
-       buildDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/sol/hspec-expectations#readme";
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
@@ -71584,8 +73427,10 @@ self: {
        pname = "hspec-expectations-lens";
        version = "0.4.0";
        sha256 = "17c9qn525bmg113mw30sc35gm207rl0d6h156c7c1npnkyp1pw0k";
-       buildDepends = [ base hspec hspec-expectations HUnit lens ];
-       testDepends = [ base hspec lens silently ];
+       libraryHaskellDepends = [
+         base hspec hspec-expectations HUnit lens
+       ];
+       testHaskellDepends = [ base hspec lens silently ];
        homepage = "http://supki.github.io/hspec-expectations-lens/";
        description = "Hspec expectations for the lens stuff";
        license = stdenv.lib.licenses.bsd2;
@@ -71596,11 +73441,11 @@ self: {
      mkDerivation {
        pname = "hspec-expectations-lifted";
        version = "0.5.0";
-       revision = "1";
        sha256 = "0c3fxgwxjwqgwpnlxlbp2amhk44m34iq2lxs1rxkp3vjwkqi2m8b";
+       revision = "1";
        editedCabalFile = "43e88e0e7587ba1965ba3f2416500c239ad44ba19043bb249c6f307665e85208";
-       buildDepends = [ base hspec-expectations transformers ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base hspec-expectations transformers ];
+       testHaskellDepends = [ base hspec ];
        description = "A version of hspec-expectations generalized to MonadIO";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -71613,7 +73458,7 @@ self: {
        pname = "hspec-expectations-pretty";
        version = "0.1";
        sha256 = "1x8xpc9b2m33sqwf7j643wjzja956m4vcdvaqrwlpxwqn887sxn5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq hspec-expectations wl-pprint-extras wl-pprint-terminfo
        ];
        jailbreak = true;
@@ -71628,8 +73473,8 @@ self: {
        pname = "hspec-experimental";
        version = "0.1.0";
        sha256 = "197c9x25r41xmaq84xqhi0kizxi7as7jn7k9klj7pq9fmd9hcg7m";
-       buildDepends = [ base hspec HUnit QuickCheck ];
-       testDepends = [ base hspec-meta ];
+       libraryHaskellDepends = [ base hspec HUnit QuickCheck ];
+       testHaskellDepends = [ base hspec-meta ];
        jailbreak = true;
        description = "An experimental DSL for testing on top of Hspec";
        license = stdenv.lib.licenses.mit;
@@ -71642,7 +73487,7 @@ self: {
        pname = "hspec-jenkins";
        version = "0.1.1";
        sha256 = "16aql0fyssc16z85isskccq93dj5i1pydblnf2q1np7z6pl1azy2";
-       buildDepends = [ base blaze-markup hspec ];
+       libraryHaskellDepends = [ base blaze-markup hspec ];
        homepage = "https://github.com/worksap-ate/hspec-jenkins";
        description = "Jenkins-friendly XML formatter for Hspec";
        license = stdenv.lib.licenses.mit;
@@ -71654,8 +73499,8 @@ self: {
        pname = "hspec-laws";
        version = "0.0.0";
        sha256 = "15mcspn20znjxjsjqivrfvpndjd2i3kic5nyij13lfwyd3p2al0j";
-       buildDepends = [ base hspec QuickCheck ];
-       testDepends = [ base hspec markdown-unlit QuickCheck ];
+       libraryHaskellDepends = [ base hspec QuickCheck ];
+       testHaskellDepends = [ base hspec markdown-unlit QuickCheck ];
        description = "Document and test laws for standard type classes";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -71671,11 +73516,11 @@ self: {
        sha256 = "0yh9yf9859cimd1qrh3bn65c89n16fpxzrcsily3xzr4miri7r7z";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ansi-terminal async base deepseq directory filepath
-         hspec-expectations HUnit QuickCheck quickcheck-io random setenv
-         time transformers
+       libraryHaskellDepends = [
+         ansi-terminal async base deepseq hspec-expectations HUnit
+         QuickCheck quickcheck-io random setenv time transformers
        ];
+       executableHaskellDepends = [ base directory filepath ];
        homepage = "http://hspec.github.io/";
        description = "A version of Hspec which is used to test Hspec itself";
        license = stdenv.lib.licenses.mit;
@@ -71689,7 +73534,7 @@ self: {
        pname = "hspec-monad-control";
        version = "0.1.0.0";
        sha256 = "07ry4nghrjbrlv6slv2a1m67r5ajdss7ifyzph0zwa96bjl1w124";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hspec-core monad-control transformers transformers-base
        ];
        description = "Orphan instances of MonadBase and MonadBaseControl for SpecM";
@@ -71705,11 +73550,11 @@ self: {
        pname = "hspec-server";
        version = "0.4.1";
        sha256 = "17bn5v3fqcmcd0qi4q9n9fj27kpw4iqyrjpjvvc4gwz1bc5bhf5q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hspec hspec-core hspec-expectations HUnit process
          regex-posix temporary transformers
        ];
-       testDepends = [ base hspec hspec-contrib transformers ];
+       testHaskellDepends = [ base hspec hspec-contrib transformers ];
        description = "Test Framework for checking server's status";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71720,7 +73565,7 @@ self: {
        pname = "hspec-shouldbe";
        version = "0.0.1";
        sha256 = "0b4y84vqyx22kihr0sbbxzr6sdz99hi2rhyl09r8ddzkzqadfii3";
-       buildDepends = [ hspec test-shouldbe ];
+       libraryHaskellDepends = [ hspec test-shouldbe ];
        description = "Convenience wrapper and utilities for hspec";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71732,8 +73577,8 @@ self: {
        pname = "hspec-smallcheck";
        version = "0.3.0";
        sha256 = "1yybyrbbj0fv62cf8nh851rgbb8phyhpsm57mzn7s5vqz7lf7dxw";
-       buildDepends = [ base hspec smallcheck ];
-       testDepends = [ base hspec QuickCheck smallcheck ];
+       libraryHaskellDepends = [ base hspec smallcheck ];
+       testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        homepage = "http://hspec.github.io/";
        description = "SmallCheck support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
@@ -71748,11 +73593,11 @@ self: {
        pname = "hspec-snap";
        version = "0.3.3.0";
        sha256 = "1ch58zz5yhvp4dq91ls05bgraf2p36aixl189zm3ipc9naidjrg4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers digestive-functors HandsomeSoup
          hspec hspec-core hxt lens mtl snap snap-core text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers digestive-functors directory
          HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text
          transformers
@@ -71760,7 +73605,6 @@ self: {
        homepage = "https://github.com/dbp/hspec-snap";
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-test-framework" = callPackage
@@ -71771,7 +73615,7 @@ self: {
        pname = "hspec-test-framework";
        version = "0.1.0";
        sha256 = "13rlyn4yibajj469hzvw6hmvm3lyra11fl73g49zc3nvcial5ldv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hspec hspec-contrib hspec-core HUnit QuickCheck
        ];
        homepage = "http://hspec.github.io/";
@@ -71787,10 +73631,10 @@ self: {
        pname = "hspec-test-framework-th";
        version = "0.1.0";
        sha256 = "1apzvrbyksz5jai0i6x5y8lz1rpi2px5x9rwirhm1flbzvpdypma";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hspec-test-framework language-haskell-extract template-haskell
        ];
-       testDepends = [ base hspec-test-framework HUnit ];
+       testHaskellDepends = [ base hspec-test-framework HUnit ];
        homepage = "http://hspec.github.io/";
        description = "Run test-framework tests with Hspec";
        license = stdenv.lib.licenses.mit;
@@ -71802,8 +73646,8 @@ self: {
        pname = "hspec-test-sandbox";
        version = "0.1.0";
        sha256 = "1kg7lpm1is5yxwcjhmdayxv8g52d2q215d9f8f8h33qvc7w0a8yp";
-       buildDepends = [ base hspec hspec-core test-sandbox ];
-       testDepends = [ base hspec test-sandbox ];
+       libraryHaskellDepends = [ base hspec hspec-core test-sandbox ];
+       testHaskellDepends = [ base hspec test-sandbox ];
        description = "Hspec convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71817,11 +73661,11 @@ self: {
        pname = "hspec-wai";
        version = "0.6.3";
        sha256 = "0vydfzpfwrld6wi47bk1d27hm5mz8hll3fc0ckzy7dyyzrgfnp4i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive hspec-core hspec-expectations
          http-types text transformers wai wai-extra
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring case-insensitive hspec hspec-core
          hspec-expectations http-types QuickCheck text transformers wai
          wai-extra
@@ -71838,11 +73682,11 @@ self: {
        pname = "hspec-wai-json";
        version = "0.6.1";
        sha256 = "0sbw6iddywxdg4n8npnz6m0lmcf9nrq3ib7kckpx7shpq9khwgih";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-qq base bytestring case-insensitive hspec-wai
          template-haskell
        ];
-       testDepends = [ base hspec hspec-wai ];
+       testHaskellDepends = [ base hspec hspec-wai ];
        homepage = "https://github.com/hspec/hspec-wai#readme";
        description = "Testing JSON APIs with hspec-wai";
        license = stdenv.lib.licenses.mit;
@@ -71857,7 +73701,7 @@ self: {
        pname = "hspec-webdriver";
        version = "1.0.2";
        sha256 = "1wkdv129arxbfby1214a93sfqbi1kvkgvqpp4z6qzh45q74hhd9c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default hashable hspec hspec-core HUnit lifted-base stm
          text transformers unordered-containers webdriver
        ];
@@ -71871,10 +73715,10 @@ self: {
      mkDerivation {
        pname = "hspec2";
        version = "0.6.1";
-       revision = "1";
        sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4";
+       revision = "1";
        editedCabalFile = "d41ebaf2f80c6ae149a944cd77e31fce98c0eea45cf47a561c5c25d48e03107f";
-       buildDepends = [ base hspec hspec-discover ];
+       libraryHaskellDepends = [ base hspec hspec-discover ];
        homepage = "http://hspec.github.io/";
        description = "Alpha version of Hspec 2.0";
        license = stdenv.lib.licenses.mit;
@@ -71886,7 +73730,7 @@ self: {
        pname = "hspr-sh";
        version = "0.3";
        sha256 = "1qnqg2gg93l5dp2nyvvaq7n58gsnljvbafbhfpvys48g5ry2dk7a";
-       buildDepends = [ base old-time ];
+       libraryHaskellDepends = [ base old-time ];
        homepage = "http://www.cs.chalmers.se/~d00nibro/hsp/";
        description = "Session handler for HSP";
        license = stdenv.lib.licenses.publicDomain;
@@ -71900,7 +73744,7 @@ self: {
        pname = "hspread";
        version = "0.3.3";
        sha256 = "1z7v5awagmhxyz4cl020s4gk4yxp0i62z3hqm9kwf73b3b69x2kf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers extensible-exceptions network
        ];
        description = "A client library for the spread toolkit";
@@ -71916,7 +73760,7 @@ self: {
        sha256 = "0x4f3y8l8vj1498bnw4fxw9nzf7q2y4vjys72j73h50c7hr83j07";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base bytestring vty ];
+       libraryHaskellDepends = [ array base bytestring vty ];
        jailbreak = true;
        description = "A terminal presentation tool";
        license = stdenv.lib.licenses.bsd3;
@@ -71935,11 +73779,12 @@ self: {
        sha256 = "1g47g3i8fgknzyf7pp7g1mk2bfn7r7igm0c6j2v9fnahhrpj4a5z";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base bytestring containers ];
+       executableHaskellDepends = [
          base bytestring containers directory easy-file filepath hint
          MonadCatchIO-mtl process stringsearch time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec HUnit QuickCheck test-framework
          test-framework-hunit
        ];
@@ -71954,7 +73799,7 @@ self: {
        pname = "hsql";
        version = "1.8.2";
        sha256 = "0i53n42ynq22fzlz4kpmri4q4abmi4dz8bz0izn307is1pmk4bby";
-       buildDepends = [ base old-time ];
+       libraryHaskellDepends = [ base old-time ];
        description = "Database access from Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71964,11 +73809,11 @@ self: {
      mkDerivation {
        pname = "hsql-mysql";
        version = "1.8.3";
-       revision = "1";
        sha256 = "0834jr5jrr1m7ap93wvmb5ir0906f7f7xx52x21i1l1jfpan34j9";
+       revision = "1";
        editedCabalFile = "e1bbb71ecb6e310acf23a93e4a5e0121c8bd332e7a81dfa5bfe27ae94cbf14ab";
-       buildDepends = [ base Cabal hsql ];
-       extraLibraries = [ mysqlclient ];
+       libraryHaskellDepends = [ base Cabal hsql ];
+       librarySystemDepends = [ mysqlclient ];
        description = "MySQL driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71980,8 +73825,8 @@ self: {
        pname = "hsql-odbc";
        version = "1.8.2";
        sha256 = "0lz9zjy1xgjjbabbi2hcrvsnfid6c78y2cb2703qjwr93xy54f1f";
-       buildDepends = [ base hsql old-time ];
-       extraLibraries = [ unixODBC ];
+       libraryHaskellDepends = [ base hsql old-time ];
+       librarySystemDepends = [ unixODBC ];
        description = "A Haskell Interface to ODBC";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) unixODBC;};
@@ -71992,8 +73837,8 @@ self: {
        pname = "hsql-postgresql";
        version = "1.8.2";
        sha256 = "0yj0jalpapjvpxmc79yd6bn93ax13pp87dipbg2c9mxf3p38jc9z";
-       buildDepends = [ base hsql old-time ];
-       extraLibraries = [ postgresql ];
+       libraryHaskellDepends = [ base hsql old-time ];
+       librarySystemDepends = [ postgresql ];
        description = "A Haskell Interface to PostgreSQL via the PQ library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) postgresql;};
@@ -72004,8 +73849,8 @@ self: {
        pname = "hsql-sqlite3";
        version = "1.8.2";
        sha256 = "15f7f4f4k1afrpmkw2k6lyx1b81hlwvwv660yh0vm2vz269mxycl";
-       buildDepends = [ base hsql ];
-       extraLibraries = [ sqlite ];
+       libraryHaskellDepends = [ base hsql ];
+       librarySystemDepends = [ sqlite ];
        description = "SQLite3 driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) sqlite;};
@@ -72018,12 +73863,14 @@ self: {
        pname = "hsqml";
        version = "0.3.3.0";
        sha256 = "0m0g822182q45cvl3k7ir1c6g5wzwb1c9137g1c62f3npinb0kmz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath tagged text transformers
        ];
-       testDepends = [ base containers directory QuickCheck tagged text ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ qt5 ];
+       libraryPkgconfigDepends = [ qt5 ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base containers directory QuickCheck tagged text
+       ];
        jailbreak = true;
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Haskell binding for Qt Quick";
@@ -72036,11 +73883,12 @@ self: {
        pname = "hsqml-datamodel";
        version = "0.0.0.1";
        sha256 = "16q92q00q96kyg41xh8smp5vvkvlfrps6nj7ds1y09msdqvihw9v";
-       buildDepends = [ base hsqml template-haskell text ];
-       pkgconfigDepends = [ qt5 ];
+       libraryHaskellDepends = [ base hsqml template-haskell text ];
+       libraryPkgconfigDepends = [ qt5 ];
        homepage = "https://github.com/marcinmrotek/hsqml-datamodel";
        description = "HsQML (Qt5) data model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { qt5 = null;};
 
   "hsqml-datamodel-vinyl" = callPackage
@@ -72051,7 +73899,9 @@ self: {
        pname = "hsqml-datamodel-vinyl";
        version = "0.1.0.0";
        sha256 = "0jg3jl1h4jf92vazyf7wb88dhrl89zm9hh21hymzy3pnc5kssd91";
-       buildDepends = [ base exceptions hsqml-datamodel type-list vinyl ];
+       libraryHaskellDepends = [
+         base exceptions hsqml-datamodel type-list vinyl
+       ];
        homepage = "https://github.com/marcinmrotek/hsqml-datamodel-vinyl";
        description = "HsQML DataModel instances for Vinyl Rec";
        license = stdenv.lib.licenses.bsd3;
@@ -72067,7 +73917,7 @@ self: {
        sha256 = "0zkjcll4hgsv1ji4rd48fx95hn90vl9vvdzxbirqfaf40xai58md";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers deepseq directory hsqml OddWord text
        ];
        jailbreak = true;
@@ -72087,7 +73937,7 @@ self: {
        sha256 = "0gjlsqlspchav6lvc4ld15192x70j8cyzw903dgla7g9sj8fg813";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers hsqml sqlite-simple text transformers
        ];
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
@@ -72103,7 +73953,7 @@ self: {
        sha256 = "072k2vc6wk8r2zn2isp37p9xhi8dbg15sy5hmpj868lzbq3mzyac";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hsqml OpenGL OpenGLRaw text ];
+       executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
        jailbreak = true;
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML sample programs";
@@ -72121,7 +73971,7 @@ self: {
        sha256 = "1qisi1r8lljgkwc9v5p3nqq6b78vdn9wyydsp31dxqnbd1lyg5ax";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers deepseq directory hsqml OddWord tagged
        ];
        jailbreak = true;
@@ -72139,14 +73989,14 @@ self: {
      mkDerivation {
        pname = "hsreadability";
        version = "1.0.0.0";
-       revision = "1";
        sha256 = "0q4sqx7xjsa8jplrdzirdlh6170ckqags02idjknwpc48plarnaw";
+       revision = "1";
        editedCabalFile = "e0b87a28497a4730024ce1459c7812d519027e8b90aa863dac85dd251558fa23";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring data-default http-conduit
          http-types text xsd
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base file-embed HUnit test-framework test-framework-hunit
          text
        ];
@@ -72162,8 +74012,8 @@ self: {
        pname = "hsshellscript";
        version = "3.3.3";
        sha256 = "0g8qm1nx2dzsmkn2rp1vwqgvgqpxgjambnmq81qyky66d83mgbz1";
-       buildDepends = [ base directory parsec random unix ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base directory parsec random unix ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://www.volker-wysk.de/hsshellscript/";
        description = "Haskell for Unix shell scripting tasks";
        license = "LGPL";
@@ -72177,7 +74027,9 @@ self: {
        sha256 = "07g1wsm4131ymp4ym33fx8yfs0bsqn9as65lkyg21ajc0dz2j1qa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers directory filepath regexpr ];
+       executableHaskellDepends = [
+         base containers directory filepath regexpr
+       ];
        description = "get haskell source code info";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72191,11 +74043,11 @@ self: {
        pname = "hssqlppp";
        version = "0.4.2";
        sha256 = "083mczqb5ca52ly88xhmd8244q8j1iyf0kkxmgp4w13w6sa5lwzl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl parsec pretty syb template-haskell transformers
          uniplate
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers groom HUnit mtl parsec pretty syb template-haskell
          test-framework test-framework-hunit transformers uniplate
        ];
@@ -72213,7 +74065,7 @@ self: {
        pname = "hstatistics";
        version = "0.2.5.2";
        sha256 = "08bkffx3d87c3cb3zp0gdj10cw1cb2m55lbqkh6b6lvxjy26igvp";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base hmatrix hmatrix-gsl-stats random vector
        ];
        homepage = "http://code.haskell.org/hstatistics";
@@ -72228,7 +74080,7 @@ self: {
        pname = "hstats";
        version = "0.3";
        sha256 = "04v03gha4p0i9ymjladmzpw8mwk72s60aihk50k2ixqja976y9hj";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://github.com/unmarshal/hstats/";
        description = "Statistical Computing in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -72241,7 +74093,7 @@ self: {
        pname = "hstatsd";
        version = "0.1";
        sha256 = "092q52yyb1xdji1y72bdcgvp8by2w1z9j717sl1gmh2p89cpjrs4";
-       buildDepends = [ base bytestring mtl network text ];
+       libraryHaskellDepends = [ base bytestring mtl network text ];
        homepage = "https://github.com/mokus0/hstatsd";
        description = "Quick and dirty statsd interface";
        license = stdenv.lib.licenses.publicDomain;
@@ -72257,7 +74109,7 @@ self: {
        sha256 = "0afvl5b82alnbdj0l26scg1qy7rln94qk9an252p83zlg5nd16gd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath ghc ghc-paths HUnit mtl QuickCheck random
        ];
        jailbreak = true;
@@ -72275,7 +74127,7 @@ self: {
        sha256 = "1hjsdxl0vn42n5kfiq42yvrr3j31sjy9g7iwjlnj2x72jff79vxs";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell-src-exts ];
+       executableHaskellDepends = [ base haskell-src-exts ];
        homepage = "http://code.haskell.org/~morrow/code/haskell/hstidy";
        description = "Takes haskell source on stdin, parses it, then prettyprints it to stdout";
        license = stdenv.lib.licenses.bsd3;
@@ -72294,11 +74146,14 @@ self: {
        sha256 = "1d87s6f6qgq7sbqzdgidnn3gxz9panhdk2mfhd7263hb9mrq1k3c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base containers hsqml network process random safecopy
-         socks tagged text
+       libraryHaskellDepends = [
+         attoparsec base containers hsqml network random safecopy socks
+         tagged text
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base containers hsqml network process text
+       ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -72320,10 +74175,13 @@ self: {
        sha256 = "10wyvfha6vngrj8h8i9dx1skyz3c4g1pcx13cafix5cpim6dr64w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring case-insensitive conduit
          configurator containers hoauth http-conduit lifted-base numbers
-         old-locale resourcet RSA safe text time transformers vector
+         old-locale resourcet RSA safe text time vector
+       ];
+       executableHaskellDepends = [
+         base bytestring conduit resourcet transformers
        ];
        jailbreak = true;
        description = "Tradeking API bindings for Haskell";
@@ -72341,7 +74199,7 @@ self: {
        sha256 = "1a63i54zd9ls1lii4p2qzpds3q8xbcl8w8b6m53ix3n6ikpa4n35";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs directory filepath haskell-src-exts syb text vector
        ];
        jailbreak = true;
@@ -72360,7 +74218,7 @@ self: {
        sha256 = "1hjf5n7m5d9bnj1rwnsf2pvs6vcfvv2hf53a6pbyb63c4rgqzk2m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo containers directory filepath glade gtk parallel
          QuickCheck random xml
        ];
@@ -72383,7 +74241,7 @@ self: {
        sha256 = "1sl7dxqi47x937wivdlx5yg6a4niczcz22xs3flvgsrxbx1ahy9w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs general-prelude gitlib hslogger lens mtl
          parallel-io regex-posix stringable svndump system-fileio
          system-filepath text text-format time transformers unix
@@ -72402,8 +74260,10 @@ self: {
        pname = "hsverilog";
        version = "0.1.0";
        sha256 = "1qk34zl1894ra9w0w2gzg8ivz230ymgyjghsd2cwn00fcsyafa7a";
-       buildDepends = [ base containers shakespeare text transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers shakespeare text transformers
+       ];
+       testHaskellDepends = [
          base containers hspec hspec-contrib hspec-expectations-lifted
          shakespeare text transformers
        ];
@@ -72417,8 +74277,8 @@ self: {
        pname = "hswip";
        version = "0.3";
        sha256 = "11nlpnfjnypz76m2padkz7ppjdir1vz3bp65s9wzphvnsmp3a681";
-       buildDepends = [ base haskell98 mtl ];
-       extraLibraries = [ ncurses readline swipl ];
+       libraryHaskellDepends = [ base haskell98 mtl ];
+       librarySystemDepends = [ ncurses readline swipl ];
        description = "embedding prolog in haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72433,7 +74293,7 @@ self: {
        sha256 = "046428y16h6za41lwqkp5pnqfd74zw8jiz8xw7j7sq0rhylg134v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskell-src-exts mtl utf8-string ];
+       libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/nibro/hsx";
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
@@ -72449,7 +74309,7 @@ self: {
        pname = "hsx-jmacro";
        version = "7.3.6";
        sha256 = "1fr60b57z2ri2pfs890xvrzrh4n75p2j4nmb7b819cf4rhgshgnh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base happstack-hsp hsp jmacro mtl text wl-pprint-text
        ];
        homepage = "http://www.happstack.com/";
@@ -72464,7 +74324,7 @@ self: {
        pname = "hsx-xhtml";
        version = "0.4.4";
        sha256 = "1051fh4yjnsax60v4rfh5r87n660ygq033gmg710nm3gw57ihkl2";
-       buildDepends = [ base hsx mtl ];
+       libraryHaskellDepends = [ base hsx mtl ];
        homepage = "http://code.google.com/hsp";
        description = "XHTML utilities to use together with HSX";
        license = stdenv.lib.licenses.bsd3;
@@ -72481,7 +74341,7 @@ self: {
        sha256 = "1vpq6a1379h7lmxcmwdb0r81gda2zn4lv02xslrixszsb757l1ck";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring haskell-src-exts haskell-src-meta mtl
          template-haskell utf8-string
        ];
@@ -72496,7 +74356,7 @@ self: {
        pname = "hsyscall";
        version = "0.4";
        sha256 = "0ysi317vwgksaq78k31sb8s34rjjhl4w8ncvycfsmmdnv7cdg2ld";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aycanirican/hsyscall";
        description = "FFI to syscalls";
        license = stdenv.lib.licenses.bsd3;
@@ -72509,8 +74369,8 @@ self: {
        pname = "hsyslog";
        version = "2.0";
        sha256 = "02v698grn43bvikqhqiz9ys8x2amngdmhvl3i0ar9203p2x8q3pq";
-       buildDepends = [ base ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/peti/hsyslog";
        description = "FFI interface to syslog(3) from POSIX.1-2001";
        license = stdenv.lib.licenses.bsd3;
@@ -72522,8 +74382,8 @@ self: {
        pname = "hszephyr";
        version = "0.1";
        sha256 = "0lgzricdq2vijmsqrwg93amxslmdwzj17c4ppmws3pcb54xj2fsr";
-       buildDepends = [ base bytestring mtl time ];
-       extraLibraries = [ com_err zephyr ];
+       libraryHaskellDepends = [ base bytestring mtl time ];
+       librarySystemDepends = [ com_err zephyr ];
        description = "Simple libzephyr bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72537,7 +74397,9 @@ self: {
        sha256 = "064ddzligzqimdhprgpgl1j0gf4xv53anaisx3fc88as104q8zjk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath haskell-src mtl ];
+       executableHaskellDepends = [
+         base directory filepath haskell-src mtl
+       ];
        description = "A Haskell98 parsing tags program similar to ctags";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72552,12 +74414,11 @@ self: {
        sha256 = "15m57vq0hcfk2dqamh2c624icv3smcqjgswy58glcclxz7f8ly3z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring bzlib directory filepath tar time zlib
        ];
        description = "Command-line tar archive utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htiled" = callPackage
@@ -72568,7 +74429,7 @@ self: {
        pname = "htiled";
        version = "0.1.2.0";
        sha256 = "1g0fak4iwjii5zvn79hcdydrp4vs5c0nwwbf7v2m2gajw1r34fg9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring containers filepath hxt split
          zlib
        ];
@@ -72585,7 +74446,7 @@ self: {
        sha256 = "14y7ipbc6ic1qraxnrs4k0hrqh5c8ks1fsm8af6wm9x762bcfaxr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process time ];
+       executableHaskellDepends = [ base process time ];
        description = "Timing utility for the command line";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72596,7 +74457,7 @@ self: {
        pname = "html";
        version = "1.0.1.2";
        sha256 = "0q9hmfii62kc82ijlg238fxrzxhsivn42x5wd6ffcr9xldg4jd8c";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "HTML combinator library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72610,11 +74471,11 @@ self: {
        pname = "html-conduit";
        version = "1.2.0";
        sha256 = "0jj02s71a9fk9mrk7bqms93y1m2zz96jg4rd7jn486ln1w49c43m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra containers resourcet
          tagstream-conduit text transformers xml-conduit xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec HUnit xml-conduit
        ];
        homepage = "https://github.com/snoyberg/xml";
@@ -72630,13 +74491,12 @@ self: {
        pname = "html-email-validate";
        version = "0.2.0.0";
        sha256 = "1bvdmaamxbldb8nndi5f330msj1d0mrj8lapvxqyr333bg3kwaix";
-       buildDepends = [ attoparsec base text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [
          attoparsec base hspec QuickCheck regex-pcre-builtin text
        ];
        description = "Validating an email address against HTML standard";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html-entities" = callPackage
@@ -72645,16 +74505,19 @@ self: {
      }:
      mkDerivation {
        pname = "html-entities";
-       version = "1.0.1.1";
-       sha256 = "13mavik2bl95dnisag9aqwjl9mdqq9vib8brmvldp74zijhfr1dx";
-       buildDepends = [
+       version = "1.1.0.0";
+       sha256 = "0zm0s5y875wp5mb3hrprrzfv5h7cs4zzxqv0y1dmrs3nk9yrah8n";
+       libraryHaskellDepends = [
          attoparsec base-prelude text unordered-containers
        ];
-       testDepends = [ base base-prelude directory doctest filepath ];
+       testHaskellDepends = [
+         base base-prelude directory doctest filepath
+       ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/html-entities";
        description = "A codec library for HTML-escaped text and HTML-entities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html-kure" = callPackage
@@ -72663,7 +74526,7 @@ self: {
        pname = "html-kure";
        version = "0.2.1";
        sha256 = "1x72f3r6nayv03y0a7x5dyj2lnbli14nmqi5i7i8isqbngsvca0l";
-       buildDepends = [ base hxt kure ];
+       libraryHaskellDepends = [ base hxt kure ];
        homepage = "www.ittc.ku.edu/csdl/fpg/software/html-kure";
        description = "HTML rewrite engine, using KURE";
        license = stdenv.lib.licenses.bsd3;
@@ -72675,7 +74538,7 @@ self: {
        pname = "html-minimalist";
        version = "0.15";
        sha256 = "06qhjb8c1x9wab77g493bbqqm068alkc4vn7c6dj810gdgxwgw5j";
-       buildDepends = [ base xml ];
+       libraryHaskellDepends = [ base xml ];
        homepage = "http://rd.slavepianos.org/t/html-minimalist";
        description = "Minimalist haskell html library";
        license = "GPL";
@@ -72687,7 +74550,7 @@ self: {
        pname = "html-rules";
        version = "0.1.0.1";
        sha256 = "1k0jqx1mlcar6z8ggrz3fv1nzilkwdxvg3gvsb3pg7nvbkhz5lpw";
-       buildDepends = [ base lens mtl tagsoup transformers ];
+       libraryHaskellDepends = [ base lens mtl tagsoup transformers ];
        jailbreak = true;
        homepage = "http://github.com/kylcarte/html-rules/";
        description = "Perform traversals of HTML structures using sets of rules";
@@ -72703,11 +74566,13 @@ self: {
        pname = "html-tokenizer";
        version = "0.3.0.3";
        sha256 = "0xdjjmpp1wh17cb4lnziglwhv7frr0y5v216s5ycy9lkby9r9fyv";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base-prelude case-insensitive conversion
          conversion-case-insensitive conversion-text text
        ];
-       testDepends = [ base base-prelude directory doctest filepath ];
+       testHaskellDepends = [
+         base base-prelude directory doctest filepath
+       ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/html-tokenizer";
        description = "An \"attoparsec\"-based HTML tokenizer";
@@ -72720,7 +74585,7 @@ self: {
        pname = "html-truncate";
        version = "0.3.0.0";
        sha256 = "1d66kdg81774b8isw1mfkl54sgmaz0n04n6shd5jjz18sjwyxp14";
-       buildDepends = [ base tagsoup ];
+       libraryHaskellDepends = [ base tagsoup ];
        homepage = "https://github.com/mruegenberg/html-truncate";
        description = "A HTML truncator";
        license = stdenv.lib.licenses.bsd3;
@@ -72737,14 +74602,13 @@ self: {
        sha256 = "1n49dz59nlkvb4ax1h9cfq7nqcwlxcrm372x4373ig6xdzbckdmz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers hamlet html-conduit http-conduit mtl
          optparse-declarative regex-tdfa text wl-pprint-text xml-conduit
        ];
        homepage = "http://github.com/tanakh/html2hamlet";
        description = "HTML to Hamlet converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html5-entity" = callPackage
@@ -72755,7 +74619,7 @@ self: {
        sha256 = "0bmmzshxanzw5y2y0hvgzz9yw18jqgv535i1xq2a5lf7w8wpj1if";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers text ];
+       libraryHaskellDepends = [ base containers text ];
        homepage = "https://github.com/zudov/html5-entity/";
        description = "A library for looking up and validating HTML5 entities";
        license = stdenv.lib.licenses.bsd3;
@@ -72769,7 +74633,7 @@ self: {
        sha256 = "0av34wypj47h4aifwqjjdwihb5b5jly5hcr32jq64ld94b7r4l2m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HDBC HDBC-sqlite3 ];
+       executableHaskellDepends = [ base HDBC HDBC-sqlite3 ];
        homepage = "http://github.com/pirapira/htodo";
        description = "A todo application";
        license = stdenv.lib.licenses.bsd3;
@@ -72786,11 +74650,15 @@ self: {
        sha256 = "0gv57isivg65wd05yxcyi2wv4ck2f153pkk2vblp6q1xh7d81asm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base bytestring Cabal containers file-embed old-locale parsec
-         tasty tasty-hspec tasty-hunit text time unordered-containers vector
+       libraryHaskellDepends = [
+         aeson base containers old-locale parsec text time
+         unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring Cabal containers file-embed parsec tasty
+         tasty-hspec tasty-hunit text time unordered-containers vector
+       ];
+       testHaskellDepends = [
          base bytestring Cabal containers file-embed parsec tasty
          tasty-hspec tasty-hunit text time unordered-containers vector
        ];
@@ -72806,7 +74674,7 @@ self: {
        pname = "htrace";
        version = "0.1";
        sha256 = "0ar1w9p6ppag2vp8kw6byirhfdfs4r639pjh5icnyiiliz6jkvlx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Hierarchical tracing for debugging of lazy evaluation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72817,7 +74685,7 @@ self: {
        pname = "hts";
        version = "0.15";
        sha256 = "0l09skjsds4p9kdwrwrxg8hdd1ja7m2zmggf23dfimzm1jsij6y2";
-       buildDepends = [ base hmt xml ];
+       libraryHaskellDepends = [ base hmt xml ];
        homepage = "http://rd.slavepianos.org/t/hts";
        description = "Haskell Music Typesetting";
        license = "GPL";
@@ -72834,11 +74702,11 @@ self: {
        sha256 = "123h3x22652xfnc1szvclnhfnr5wb5ndx8ahyvramvgjr1mmxpp5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs configurator directory filepath hdaemonize hslogger
          htsn-common hxt MissingH network tasty tasty-hunit unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cmdargs configurator directory filepath hdaemonize hslogger
          htsn-common hxt MissingH network process tasty tasty-hunit unix
        ];
@@ -72852,7 +74720,9 @@ self: {
        pname = "htsn-common";
        version = "0.0.2";
        sha256 = "0ywp0683mna16znsqn6h6k5iihpzhj909hivgmlvfzkrn6plvc15";
-       buildDepends = [ ansi-terminal base hslogger transformers ];
+       libraryHaskellDepends = [
+         ansi-terminal base hslogger transformers
+       ];
        description = "Display/logging facilities used by both htsn and htsn-import";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -72870,13 +74740,13 @@ self: {
        sha256 = "1mm098a748dmwzzak0ciam7dq80l3iv4hvk8c1crr03dbybr8rq3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs configurator containers directory filepath
          fixed-vector-hetero groundhog groundhog-postgresql groundhog-sqlite
          groundhog-th hslogger htsn-common hxt MissingH old-locale split
          tasty tasty-hunit time transformers tuple
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cmdargs configurator containers directory doctest filepath
          fixed-vector-hetero groundhog groundhog-postgresql groundhog-sqlite
          groundhog-th hslogger htsn-common hxt MissingH old-locale process
@@ -72893,7 +74763,7 @@ self: {
        pname = "http-accept";
        version = "0.2";
        sha256 = "1ivwkwr9jgbf6m2dv4gaw5vxrz2vm5wzz65ncl5jpma6wimwh4ii";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/singpolyma/http-accept";
        description = "Functions for working with HTTP Accept headers";
        license = "unknown";
@@ -72905,7 +74775,7 @@ self: {
        pname = "http-attoparsec";
        version = "0.1.1";
        sha256 = "12l892fix11mrvm10awwvv31y59q5rb6gb0sqjp6l4p4ym9ngqa3";
-       buildDepends = [ attoparsec base bytestring http-types ];
+       libraryHaskellDepends = [ attoparsec base bytestring http-types ];
        jailbreak = true;
        homepage = "https://github.com/tlaitinen/http-attoparsec";
        description = "Attoparsec parsers for http-types";
@@ -72924,13 +74794,13 @@ self: {
        pname = "http-client";
        version = "0.4.18.1";
        sha256 = "0v0mmsbh8hgzkxyg7gkn3dlq5l21ljzbxr9c3wmmz6viwhhabfv9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
          exceptions filepath ghc-prim http-types mime-types network
          network-uri random streaming-commons text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base base64-bytestring blaze-builder bytestring
          case-insensitive containers deepseq directory hspec http-types
          monad-control network network-uri streaming-commons text time
@@ -72950,7 +74820,7 @@ self: {
        pname = "http-client-auth";
        version = "0.1.0.1";
        sha256 = "07scawz138qffcgw5lyxbxmwdm0czhylqy1rzm0ff59n8amr46j4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-string blaze-builder bytestring case-insensitive
          conduit crypto-conduit http-client http-conduit pureMD5 resourcet
          transformers utf8-string
@@ -72965,7 +74835,7 @@ self: {
        pname = "http-client-conduit";
        version = "0.3.0";
        sha256 = "0k2vq9y7kfbkhcsszjr74ahq5nw5z7dbzjhw1ixbigcr56axsd19";
-       buildDepends = [ base http-client ];
+       libraryHaskellDepends = [ base http-client ];
        homepage = "https://github.com/snoyberg/http-client";
        description = "Frontend support for using http-client with conduit (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -72979,7 +74849,7 @@ self: {
        pname = "http-client-lens";
        version = "0.1.0";
        sha256 = "1n5q3wprhp8kwwq2n1v06l1a9k9p3z96rxv3kr6bbwga9lsb3jip";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-client http-types lens network
        ];
        jailbreak = true;
@@ -72994,7 +74864,7 @@ self: {
        pname = "http-client-multipart";
        version = "0.3.0.0";
        sha256 = "18za6s3658hgm95rrygghrz0b643c7nkzaimb14v2hv82w3k9crg";
-       buildDepends = [ base http-client ];
+       libraryHaskellDepends = [ base http-client ];
        homepage = "https://github.com/snoyberg/http-client";
        description = "Generate multipart uploads for http-client. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -73008,8 +74878,10 @@ self: {
        pname = "http-client-openssl";
        version = "0.2.0.1";
        sha256 = "1mg2gn51ixb68wd8mm66kcj4627q6gj64810wsa1axy3jmk5qym3";
-       buildDepends = [ base HsOpenSSL http-client network ];
-       testDepends = [ base HsOpenSSL hspec http-client http-types ];
+       libraryHaskellDepends = [ base HsOpenSSL http-client network ];
+       testHaskellDepends = [
+         base HsOpenSSL hspec http-client http-types
+       ];
        homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the OpenSSL library";
        license = stdenv.lib.licenses.mit;
@@ -73023,7 +74895,7 @@ self: {
        pname = "http-client-request-modifiers";
        version = "0.1";
        sha256 = "1bd6r24gh0nxfj040q3x39nqnpkdqkri1wdlg3jf2h61cb5gli5r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring exceptions http-client http-media http-types
          network network-uri
        ];
@@ -73042,7 +74914,7 @@ self: {
        pname = "http-client-streams";
        version = "0.3.1.0";
        sha256 = "1q9w0l89a599l4955kb3156ysmlg7il9pz0x7kfl3bxly4gadf8z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring HsOpenSSL http-client http-client-openssl
          io-streams mtl transformers
        ];
@@ -73059,11 +74931,11 @@ self: {
        pname = "http-client-tls";
        version = "0.2.2";
        sha256 = "0a01r05h5fxswyn6k6cgqgak4scqjan72hyy5wbdqzzhl4rmh7j5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring connection data-default-class http-client network
          tls
        ];
-       testDepends = [ base hspec http-client http-types ];
+       testHaskellDepends = [ base hspec http-client http-types ];
        homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the connection package and tls library";
        license = stdenv.lib.licenses.mit;
@@ -73078,7 +74950,7 @@ self: {
        pname = "http-common";
        version = "0.8.2.0";
        sha256 = "14s5a178sb2vm5k00rs21760mds5dz2gs10k9iyn22h01mxyf599";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring case-insensitive
          directory mtl network text transformers unordered-containers
        ];
@@ -73099,11 +74971,11 @@ self: {
        pname = "http-conduit";
        version = "2.1.7.2";
        sha256 = "0inw95a2vdmsffh3ns1kh8hr7xrx2pbgdrq0yv68bwf1v4sd1mfc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring case-insensitive conduit
          conduit-extra connection cookie data-default-class hspec
          http-client http-types HUnit lifted-base network streaming-commons
@@ -73125,12 +74997,12 @@ self: {
        pname = "http-conduit-browser";
        version = "2.0.0.0";
        sha256 = "1swgsb14mwsfrwhw2ggydi2wm24hrqlisslh5q46qll7rl2gx19q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers cookie data-default exceptions
          http-client http-conduit http-types lifted-base monad-control
          network-uri resourcet time transformers transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base64-bytestring blaze-builder bytestring case-insensitive
          conduit containers cookie data-default hspec http-client
          http-conduit http-types HUnit lifted-base monad-control network
@@ -73153,7 +75025,7 @@ self: {
        pname = "http-conduit-downloader";
        version = "1.0.25";
        sha256 = "0g393cmkbpb40in03zlyahxxwiy5i7zj7wg5zb92a0hkmjkgbrka";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit connection data-default HsOpenSSL
          http-client http-conduit http-types lifted-base mtl network
          network-uri old-locale resourcet time zlib
@@ -73172,8 +75044,10 @@ self: {
        pname = "http-date";
        version = "0.0.6.1";
        sha256 = "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj";
-       buildDepends = [ array attoparsec base bytestring ];
-       testDepends = [ base bytestring doctest hspec old-locale time ];
+       libraryHaskellDepends = [ array attoparsec base bytestring ];
+       testHaskellDepends = [
+         base bytestring doctest hspec old-locale time
+       ];
        description = "HTTP Date parser/formatter";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73185,17 +75059,16 @@ self: {
      mkDerivation {
        pname = "http-encodings";
        version = "0.9.3";
-       revision = "2";
        sha256 = "0b29zqa2ybja73jip83qn1xhiinn1k64b6dmc39ccp48ip1xdnvn";
+       revision = "2";
        editedCabalFile = "0370852e7250c2c2bb1575155286442cbfcdd03a7e494dcaa73305d4e84a6c76";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring HTTP iconv mime mtl parsec text utf8-string zlib
        ];
        jailbreak = true;
        homepage = "http://github.com/achudnov/http-encodings";
        description = "A library for encoding and decoding bodies of HTTP messages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-enumerator" = callPackage
@@ -73211,7 +75084,7 @@ self: {
        sha256 = "10w2ppgb4kjl3h77iq7j9qh3gcl6a0fvbpidi2njd4pfhrq4lgs6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-data attoparsec attoparsec-enumerator base base64-bytestring
          blaze-builder blaze-builder-enumerator bytestring case-insensitive
          certificate containers cprng-aes data-default enumerator failure
@@ -73233,8 +75106,10 @@ self: {
        pname = "http-kit";
        version = "0.5.1";
        sha256 = "1swnvsbaabk946pys9q9kr0bgdvalnznd59dw981sg7cywqdcz28";
-       buildDepends = [ base bytestring case-insensitive http-types ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring case-insensitive http-types
+       ];
+       testHaskellDepends = [
          base bytestring hspec http-types QuickCheck quickcheck-instances
        ];
        description = "A low-level HTTP library";
@@ -73249,10 +75124,12 @@ self: {
        pname = "http-link-header";
        version = "0.2.0";
        sha256 = "0vdmb0w7ppss8lffdghn9d2vjawn6nvhx7cx1dcvl4fllxfiaihc";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring-conversion errors network-uri text
        ];
-       testDepends = [ base hspec hspec-attoparsec QuickCheck text ];
+       testHaskellDepends = [
+         base hspec hspec-attoparsec QuickCheck text
+       ];
        homepage = "https://github.com/myfreeweb/http-link-header";
        description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\"";
        license = stdenv.lib.licenses.publicDomain;
@@ -73266,8 +75143,10 @@ self: {
        pname = "http-media";
        version = "0.6.2";
        sha256 = "0r3xghxhnwpc8gblcj6l5sq3lxzra7280vlph1s4xfqxknv69km7";
-       buildDepends = [ base bytestring case-insensitive containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers
+       ];
+       testHaskellDepends = [
          base bytestring case-insensitive containers QuickCheck
          test-framework test-framework-quickcheck2
        ];
@@ -73286,7 +75165,7 @@ self: {
        sha256 = "127fy54km9js02kp5ws9pyg2d1qc2ar1342g1w2p3h8086il6mp7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers explicit-exception HTTP lazyio network
          parsec transformers utility-ht
        ];
@@ -73306,7 +75185,7 @@ self: {
        pname = "http-proxy";
        version = "0.0.12";
        sha256 = "0k6qmr3xrky1w90if2jvzc9bgifxifxkwbymw8zndgxs976zpdig";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder blaze-builder-conduit
          bytestring bytestring-lexing case-insensitive conduit ghc-prim
          http-conduit http-types lifted-base network resourcet tls
@@ -73327,8 +75206,8 @@ self: {
        pname = "http-querystring";
        version = "1.0";
        sha256 = "0n21x8w9pggyp5lbgww70g7860k6n35csq669s9gvrmv1n22k7m6";
-       buildDepends = [ base bytestring containers http-types ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring containers http-types ];
+       testHaskellDepends = [
          base bytestring containers doctest hspec http-types QuickCheck
        ];
        homepage = "https://github.com/worksap-ate/http-querystring";
@@ -73346,16 +75225,16 @@ self: {
      mkDerivation {
        pname = "http-reverse-proxy";
        version = "0.4.2";
-       revision = "1";
        sha256 = "10cd6h1n1fp55jpwcp4nnk64yslxy2cnm7rhzd25xvi5fkhfl61i";
+       revision = "1";
        editedCabalFile = "3b7a6c0b55cd7eb98d3f020ac08cec7ca052b8ec716f76cfabdcbaef27645db7";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base blaze-builder bytestring case-insensitive conduit
          conduit-extra containers data-default-class http-client http-types
          lifted-base monad-control network resourcet streaming-commons text
          transformers wai wai-logger word8
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring conduit conduit-extra hspec
          http-conduit http-types lifted-base network resourcet
          streaming-commons transformers wai warp
@@ -73373,7 +75252,7 @@ self: {
        pname = "http-server";
        version = "1.0.6";
        sha256 = "1da385swv7x92d8cpdz28bdp38a8h058svbbpnkqpvrs0m0lgm2w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base HTTP mime network network-uri text unix url utf8-string
        ];
        homepage = "https://github.com/GaloisInc/http-server";
@@ -73389,7 +75268,7 @@ self: {
        sha256 = "0asb499rkxr3jzyv5abiqcjx7jdsxkqndcaiqrlx7sfb6f3rccdv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base network ];
+       libraryHaskellDepends = [ base network ];
        description = "A simple websever with an interact style API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73408,13 +75287,13 @@ self: {
        pname = "http-streams";
        version = "0.8.3.3";
        sha256 = "0cp2jdalg0vzikl6v4yhyflllv7yqskph5gp5ahirawhcj9rfi9z";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          case-insensitive directory HsOpenSSL http-common io-streams mtl
          network network-uri openssl-streams text transformers
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-pretty attoparsec base base64-bytestring blaze-builder
          bytestring case-insensitive directory ghc-prim HsOpenSSL hspec
          hspec-expectations http-common HUnit io-streams
@@ -73437,10 +75316,11 @@ self: {
        sha256 = "06y7nikmyr9jrcrnsqy63p1zv1nv0z1h1bmbryr4dkh5pisfmr83";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-client lens lens-aeson mtl tasty
          tasty-hunit text time wreq
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/openbrainsrc/http-test";
        description = "Test framework for HTTP APIs";
        license = stdenv.lib.licenses.bsd3;
@@ -73456,10 +75336,10 @@ self: {
        pname = "http-types";
        version = "0.8.6";
        sha256 = "1q1ni88rs8d79xnk1x2jaf3848ygxlfhpvv4gw46k08lw29ihfxh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base blaze-builder bytestring case-insensitive text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring doctest hspec QuickCheck
          quickcheck-instances text
        ];
@@ -73474,7 +75354,7 @@ self: {
        pname = "http-wget";
        version = "0.6.2.3";
        sha256 = "1sbg4gpx8ikaxb15wflm7fnjnkr32fj07bva62z54dsm630s37fx";
-       buildDepends = [ base failure process transformers ];
+       libraryHaskellDepends = [ base failure process transformers ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/http-wget/tree/master";
        description = "Provide a simple HTTP client interface by wrapping the wget command line tool. (deprecated)";
@@ -73493,12 +75373,16 @@ self: {
        sha256 = "075j4xhfmgiij431zn5mzmq6m40fj74l5f5wckqa22aq2ay19p8c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty array base bytestring bytestring-builder
-         containers directory filepath hex mwc-random stm text
-         unordered-containers vector word8
+       libraryHaskellDepends = [
+         array base bytestring bytestring-builder containers mwc-random stm
+         unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson aeson-pretty array base bytestring bytestring-builder
+         containers directory filepath hex text unordered-containers vector
+         word8
+       ];
+       testHaskellDepends = [
          aeson aeson-pretty array base bytestring bytestring-builder
          containers directory doctest filepath Glob hex hspec mwc-random stm
          text unordered-containers vector word8
@@ -73515,7 +75399,7 @@ self: {
        sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base network network-uri ];
+       libraryHaskellDepends = [ base network network-uri ];
        description = "A simple web-server with an interact style API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73529,12 +75413,12 @@ self: {
        pname = "https-everywhere-rules";
        version = "0.1.0";
        sha256 = "170ynbjv8dz221rs26i4d0kwkv3h4ljmx5azslc9jj9lzgb42knp";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base errors functor-infix http-client
          https-everywhere-rules-raw lens network pipes string-conversions
          taggy-lens text text-icu
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base errors functor-infix hspec http-client
          https-everywhere-rules-raw lens network pipes string-conversions
          taggy-lens text text-icu
@@ -73552,12 +75436,13 @@ self: {
        pname = "https-everywhere-rules-raw";
        version = "4.0";
        sha256 = "0zm3znn42nzh9dlpjjn38nsz8rsb0gzl5rv6ngii1vfq534sddy6";
-       buildDepends = [ base directory filepath functor-infix text ];
+       libraryHaskellDepends = [
+         base directory filepath functor-infix text
+       ];
        jailbreak = true;
        homepage = "https://github.com/fmap/https-everywhere-rules-raw";
        description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "httpspec" = callPackage
@@ -73569,7 +75454,7 @@ self: {
        pname = "httpspec";
        version = "0.3.0.1";
        sha256 = "1vghkrs72cja9x2lqshh6nhsdp8f68s3wh7zljn86011h4widd5v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bidispec bytestring cgi containers encoding filepath HTTP hxt
          hxthelper MissingH mtl network pretty safe
        ];
@@ -73586,7 +75471,7 @@ self: {
        sha256 = "1il1d8b7xyv59f7xim337zyh88s1qchsrdhrgmv322hqf73n6rh2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ alsa-pcm base carray fft gloss ];
+       executableHaskellDepends = [ alsa-pcm base carray fft gloss ];
        jailbreak = true;
        description = "harmonic analyser and tuner for musical instruments";
        license = stdenv.lib.licenses.bsd3;
@@ -73601,12 +75486,11 @@ self: {
        sha256 = "12g41q821yh43nslb96jpqyb58k1lz6g0a6vmqw202m0hv94npdb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base OpenGL random SDL ];
+       executableHaskellDepends = [ base OpenGL random SDL ];
        jailbreak = true;
        homepage = "http://tomahawkins.org";
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hub" = callPackage
@@ -73619,7 +75503,7 @@ self: {
        sha256 = "10hcaddk1mqzyl1fmzsvzqq141lg9a43295158ckmkbnx8i1rxv1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers directory fgl filepath hexpat
          process regex-compat unix utf8-string
        ];
@@ -73634,7 +75518,7 @@ self: {
        pname = "hubigraph";
        version = "0.3.2";
        sha256 = "19mxblqy3bchhrk725x4kmpa9hidjzj0d0sqhx34smqw7v36x814";
-       buildDepends = [ base containers haxr mtl ];
+       libraryHaskellDepends = [ base containers haxr mtl ];
        homepage = "http://ooxo.org/hubigraph/";
        description = "A haskell wrap for Ubigraph";
        license = stdenv.lib.licenses.bsd3;
@@ -73650,11 +75534,16 @@ self: {
        sha256 = "135q3nzchncbkx4bpx7p1glwnc9aw5j77f3xnr0d6llfba1bw79l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring Cabal containers ghc ghc-paths haskell98 hint
+         mtl old-time
+       ];
+       librarySystemDepends = [ ruby ];
+       executableHaskellDepends = [
          array base bytestring Cabal containers ghc ghc-paths haskell98 hint
          mtl old-time process
        ];
-       extraLibraries = [ ruby ];
+       executableSystemDepends = [ ruby ];
        jailbreak = true;
        description = "Support library for Hubris, the Ruby <=> Haskell bridge";
        license = "unknown";
@@ -73667,7 +75556,7 @@ self: {
        pname = "huffman";
        version = "1.0.1";
        sha256 = "191llv4s64jrh8cma43r5z740avd5picja5fr45l4mi2gwmkx4s3";
-       buildDepends = [ base containers fingertree ];
+       libraryHaskellDepends = [ base containers fingertree ];
        description = "Pure Haskell implementation of the Huffman encoding algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73680,7 +75569,7 @@ self: {
        pname = "hugs2yc";
        version = "0.1.1";
        sha256 = "1bmcdjwh08q84ijx7hdfraz0wqq0wwgf5pj0jlmdq5rbpb9c547a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath mtl parsec uniplate ycextra
          yhccore
        ];
@@ -73702,7 +75591,12 @@ self: {
        sha256 = "0vq0sb11kiiry67bh5ish1cwj8sf6rgf70p1zrm462zsqgv9wkk2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive cmdargs ConfigFile
+         containers Crypto directory fastirc filepath ghc-prim monad-extras
+         mtl network split strict text time unix utf8-string
+       ];
+       executableHaskellDepends = [
          aeson base bytestring case-insensitive cmdargs ConfigFile
          containers Crypto directory fastirc filepath ghc-prim monad-extras
          mtl network split strict text time unix utf8-string
@@ -73726,7 +75620,7 @@ self: {
        sha256 = "1wb9bn83lrn6cpp0gkpc7v40m9wlx8i8zqijm4dmd23zzmrlrxhr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder bytestring case-insensitive ConfigFile
          containers directory filepath HaXml http-types hxt MissingH mtl
          network system-fileio system-filepath system-uuid text transformers
@@ -73746,7 +75640,8 @@ self: {
        sha256 = "0wzy2gjxpqr0j2cfnl88ixccm8dv3z9cql1zpzr4ph6g37dc9w60";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cairo gtk haskell98 HUnit ];
+       libraryHaskellDepends = [ base cairo gtk haskell98 HUnit ];
+       executableHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/kwallmar/hunit_gui/home";
        description = "A GUI testrunner for HUnit";
@@ -73760,7 +75655,7 @@ self: {
        pname = "hunit-parsec";
        version = "0.3";
        sha256 = "089l8n1yjcf6sypr76r8p0djwpcqaa5xdk1d0m2k9piig9fnzr40";
-       buildDepends = [ base HUnit parsec ];
+       libraryHaskellDepends = [ base HUnit parsec ];
        description = "An HUnit Testable instance for Parsec parser unit tests";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73771,8 +75666,8 @@ self: {
        pname = "hunit-rematch";
        version = "0.1.0.1";
        sha256 = "1xj5f6l8nfanbf0xdwl2j2na45w5h0spi9a8pxqgpxx2rak145gs";
-       buildDepends = [ base HUnit rematch ];
-       testDepends = [ base hspec HUnit rematch ];
+       libraryHaskellDepends = [ base HUnit rematch ];
+       testHaskellDepends = [ base hspec HUnit rematch ];
        jailbreak = true;
        homepage = "github.com/tcrayford/rematch";
        description = "HUnit support for rematch";
@@ -73790,7 +75685,7 @@ self: {
        sha256 = "0k07dbqrlnhg3a4yk25gc665z43hcl57kblr20mzryw0cf9zdsci";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath monads-fd parsec pcre-light
          process split
        ];
@@ -73812,13 +75707,13 @@ self: {
        pname = "hunt-searchengine";
        version = "0.3.0.1";
        sha256 = "1y8pq158jwdl3zq5f0xdgszihp8z181lhwd92d66ckw9nh0sllw6";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base binary bytestring containers data-default
          data-r-tree data-stringmap deepseq dlist filepath hslogger
          hxt-regex-xmlschema monad-parallel mtl murmur-hash parsec text time
          transformers unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base binary containers data-default data-r-tree directory
          HUnit monad-parallel mtl old-locale QuickCheck random
          test-framework test-framework-hunit test-framework-quickcheck2 text
@@ -73844,7 +75739,7 @@ self: {
        sha256 = "19bbn97pj01sbqbjkgh82hiwzxfybnnm29wj4irgicab0d72jvg6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
          cmdargs containers data-default deepseq ekg-core hamlet hslogger
          http-types hunt-searchengine mtl scotty shakespeare-js text wai
@@ -73869,7 +75764,7 @@ self: {
        sha256 = "1pmlg06jipmc99v7clz2q7x3bh4ndar55595fx729khnjrbiy9bz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty base binary bytestring conduit conduit-extra
          containers csv-conduit data-default docopt hslogger http-types
          hunt-client hunt-searchengine mtl resourcet string-conversions text
@@ -73890,7 +75785,9 @@ self: {
        sha256 = "13hg6v7vk72yiy0qhwm1f3ksm85vf56a3g5mm62kpbb0lcxvvqwf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base bytestring containers kangaroo ];
+       executableHaskellDepends = [
+         array base bytestring containers kangaroo
+       ];
        jailbreak = true;
        homepage = "http://code.google.com/p/copperbox/";
        description = "Extract function names from Windows DLLs";
@@ -73909,9 +75806,13 @@ self: {
        sha256 = "1y8b15cgiky6kasx21q4gw4h40scyby4mkqynq96kaq2yrrayd5q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base bytestring containers directory filepath ghc-paths
-         haskeline knob mtl parsec process time transformers utf8-string
+       libraryHaskellDepends = [
+         array base bytestring containers directory haskeline knob mtl
+         parsec process time transformers utf8-string
+       ];
+       executableHaskellDepends = [
+         array base containers directory filepath ghc-paths haskeline mtl
+         parsec process transformers
        ];
        homepage = "http://justinethier.github.com/husk-scheme";
        description = "R5RS Scheme interpreter, compiler, and library";
@@ -73927,7 +75828,7 @@ self: {
        pname = "husk-scheme-libs";
        version = "0.0.1";
        sha256 = "18c8ww2f7bgxbh33agcrpb36xgjn7zs509ji7q968hnwqnx9vgcj";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers husk-scheme json mtl transformers
        ];
        homepage = "http://justinethier.github.com/husk-scheme";
@@ -73946,7 +75847,7 @@ self: {
        sha256 = "136sskjkb4nwsqdmgyly207zv4kv27bxf633p2wl869wcr6kkdbg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers mtl old-locale parsec readline time
        ];
        jailbreak = true;
@@ -73967,7 +75868,7 @@ self: {
        sha256 = "12rvlagd0n946x05wnyixd1b16ls9ynagccw2bc77fjqfb0d9shi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring connection flow http-client http-conduit
          http-types network rainbow regex-compat text time transformers
          websockets wuss
@@ -73986,7 +75887,7 @@ self: {
        sha256 = "1wwphyg2fm34gxn7s7a4q7p8fyab3c7am4fmw1x50gkrmkwgd72s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base parsec parsec-numbers ];
+       executableHaskellDepends = [ base parsec parsec-numbers ];
        homepage = "https://github.com/steshaw/huttons-razor";
        description = "Quick implemention of Hutton's Razor";
        license = stdenv.lib.licenses.bsd2;
@@ -73998,7 +75899,7 @@ self: {
        pname = "huzzy";
        version = "0.1.5.5";
        sha256 = "0i8h380nszd7hk7x6l7qx0ri6k12551li2m77gspzakcf47l6ldp";
-       buildDepends = [ base easyplot ];
+       libraryHaskellDepends = [ base easyplot ];
        jailbreak = true;
        description = "Fuzzy logic library with support for T1, IT2, GT2";
        license = stdenv.lib.licenses.mit;
@@ -74011,8 +75912,8 @@ self: {
        pname = "hvect";
        version = "0.2.0.0";
        sha256 = "01iarjnwm5syhmf6552g3p9dc05nqc74r4nfmagajgv7fnlsf3ri";
-       buildDepends = [ base ];
-       testDepends = [ base HTF ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base HTF ];
        homepage = "https://github.com/agrafix/hvect";
        description = "Simple strict heterogeneous lists";
        license = stdenv.lib.licenses.mit;
@@ -74028,7 +75929,7 @@ self: {
        sha256 = "0ibxdyg9r5n3dc8szhb8fvdjsbgpbwdah2aahn0kagi1zxw24fl2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring haskeline http-conduit http-types mtl regex-compat
          unix
        ];
@@ -74044,10 +75945,10 @@ self: {
        pname = "hweblib";
        version = "0.6.3";
        sha256 = "03dmx5irlsyb3b9zg2r6nz947sslizkn0nlk65ldb5n4m8my33hy";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers mtl text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers HUnit mtl transformers
        ];
        homepage = "http://github.com/aycanirican/hweblib";
@@ -74065,7 +75966,7 @@ self: {
        sha256 = "0d0f0bwbfcmbm1jx6m90qxxjad2adz5k0k51i4jh5ylrfa9xfs7r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory haskell98 html mtl network old-time
          regex-compat text unix
        ];
@@ -74083,8 +75984,8 @@ self: {
        pname = "hwsl2";
        version = "0.3.2.0";
        sha256 = "0y3k9xlhzvscbwzrhxgiqf9s3724zak1nbnf6lcaynpzk4p8jmm1";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring Cabal cabal-test-quickcheck QuickCheck
          quickcheck-properties
        ];
@@ -74100,7 +76001,7 @@ self: {
        pname = "hwsl2-bytevector";
        version = "0.1.0.0";
        sha256 = "0kfsc85k4vgdbkryrw80rgpjzzbavwqqzqylc95h80vm7xnlg2p9";
-       buildDepends = [ base bytestring fingertree hwsl2 ];
+       libraryHaskellDepends = [ base bytestring fingertree hwsl2 ];
        homepage = "https://github.com/srijs/hwsl2-haskell-bytevector";
        description = "A hashed byte-vector based on algebraic hashes and finger trees";
        license = stdenv.lib.licenses.mit;
@@ -74112,7 +76013,9 @@ self: {
        pname = "hwsl2-reducers";
        version = "0.1.0.0";
        sha256 = "1q7phb2v11gfwlvm0f0jrsm7gc7ga9awd9cp0kkxm2k20mggrg7x";
-       buildDepends = [ base bytestring hwsl2 reducers semigroups ];
+       libraryHaskellDepends = [
+         base bytestring hwsl2 reducers semigroups
+       ];
        homepage = "https://github.com/srijs/hwsl2-reducers";
        description = "Semigroup and Reducer instances for Data.Hash.SL2";
        license = stdenv.lib.licenses.mit;
@@ -74124,7 +76027,7 @@ self: {
        pname = "hx";
        version = "0.4";
        sha256 = "04wkgql6gs9glmp9kj5awis5b15vmwgkyqzi814k9514k3c7c1rb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell extras (missing utility functions)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -74139,7 +76042,7 @@ self: {
        sha256 = "1fri1xcs95ynkf471hrkai0k8kvxhx77ra07yripycnlpa9fcwj9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base fclabels network network-protocol-xmpp text transformers
          xml-types
        ];
@@ -74162,13 +76065,14 @@ self: {
        sha256 = "1fk4cgk4ncf5v7k8hankwb49ablfcxj1rcw64ka6pz3jrz4sablq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cairo cmdargs configurator containers Diff
          directory double-conversion dyre fclabels filepath gtk
          monad-coroutine mtl poppler strict template-haskell time
          transformers TypeCompose xournal-builder xournal-parser
          xournal-render xournal-types
        ];
+       executableHaskellDepends = [ base cmdargs ];
        jailbreak = true;
        homepage = "http://ianwookim.org/hxournal";
        description = "A pen notetaking program written in haskell";
@@ -74185,12 +76089,12 @@ self: {
        pname = "hxt";
        version = "9.3.1.15";
        sha256 = "0q35jqi3g5qfwzp2p2hm22lkmbmk08bx2qvpgq4731zm48y7ngkj";
-       buildDepends = [
+       configureFlags = [ "-fnetwork-uri" ];
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath HUnit
          hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri
          parsec
        ];
-       configureFlags = [ "-fnetwork-uri" ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "A collection of tools for processing XML with Haskell";
        license = stdenv.lib.licenses.mit;
@@ -74204,7 +76108,7 @@ self: {
        pname = "hxt-binary";
        version = "0.0.2";
        sha256 = "1hbby0lcb9kis05zsf5rgyisa1qwryvv8zf91q9fi0j0d7s3rasw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring bzlib deepseq haskell98 hxt
        ];
        jailbreak = true;
@@ -74222,7 +76126,7 @@ self: {
        pname = "hxt-cache";
        version = "9.1.0.1";
        sha256 = "1ki3h9x186c6p1c6hnczr0a1idil6kfvs2jl9d9hmzp9rlmh2w7l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath hxt
          SHA time unix
        ];
@@ -74237,7 +76141,7 @@ self: {
        pname = "hxt-charproperties";
        version = "9.2.0.1";
        sha256 = "1mml8wglvagqq891rchgli6r8rnkwrqhgsxfl6kb5403pzb18rp4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "Character properties and classes for XML and Unicode";
        license = stdenv.lib.licenses.mit;
@@ -74251,7 +76155,7 @@ self: {
        sha256 = "0z8qswykx0k965n2mfp87b6h8fixrydvjg98d8h37bclfsqzj15w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base hxt parsec split ];
+       libraryHaskellDepends = [ base hxt parsec split ];
        homepage = "https://github.com/redneb/hxt-css";
        description = "CSS selectors for HXT";
        license = stdenv.lib.licenses.bsd3;
@@ -74263,7 +76167,7 @@ self: {
        pname = "hxt-curl";
        version = "9.1.1.1";
        sha256 = "1sn5ngzz5qszdb3anbpqbjdijz29gmrwjrg9vsmrqsdqz65wrhfd";
-       buildDepends = [ base bytestring curl hxt parsec ];
+       libraryHaskellDepends = [ base bytestring curl hxt parsec ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "LibCurl interface for HXT";
        license = "unknown";
@@ -74275,7 +76179,7 @@ self: {
        pname = "hxt-expat";
        version = "9.1.1";
        sha256 = "1mi2f2i31nqjqzwl82iypm1qngrpxp7lz506pjgqfbn840yc9n8h";
-       buildDepends = [ base bytestring hexpat hxt ];
+       libraryHaskellDepends = [ base bytestring hexpat hxt ];
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "Expat parser for HXT";
        license = "unknown";
@@ -74287,7 +76191,7 @@ self: {
        pname = "hxt-extras";
        version = "0.4.1";
        sha256 = "1bv8kcra2vgjbp7k0yczlrfbjh7ib2xixaqpnnd60hq84878nzb1";
-       buildDepends = [ base hxt ];
+       libraryHaskellDepends = [ base hxt ];
        homepage = "http://code.google.com/p/hxt-extras/";
        description = "Extra functions for HXT";
        license = stdenv.lib.licenses.bsd3;
@@ -74301,7 +76205,7 @@ self: {
        pname = "hxt-filter";
        version = "8.4.2";
        sha256 = "0jxiph7c59dc2fy5c2ygii1xlcmh8s5zb8c0hwvjkj0hzfjznra0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath haskell98 HTTP HUnit hxt network
          parsec process
        ];
@@ -74320,7 +76224,7 @@ self: {
        pname = "hxt-http";
        version = "9.1.5.2";
        sha256 = "02yxvzczv89j518b94wh8m4dsmnymzxgv9158m7w6lqxk41rv8bg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring HTTP hxt network network-uri parsec
        ];
        homepage = "https://github.com/UweSchmidt/hxt";
@@ -74334,7 +76238,7 @@ self: {
        pname = "hxt-pickle-utils";
        version = "0.1.0.3";
        sha256 = "1id9459yphsbxqa0z89dhsmqqcgvk2axv91d05aw3n6r4ygs3nwx";
-       buildDepends = [ base hxt mtl ];
+       libraryHaskellDepends = [ base hxt mtl ];
        homepage = "https://github.com/silkapp/hxt-pickle-utils";
        description = "Utility functions for using HXT picklers";
        license = stdenv.lib.licenses.bsd3;
@@ -74348,8 +76252,10 @@ self: {
        pname = "hxt-regex-xmlschema";
        version = "9.2.0.2";
        sha256 = "1hkcd5p7rhv8z2vlcpd1gcdiyni28m8k8yd5fnxw8a9bvrnnfi27";
-       buildDepends = [ base bytestring hxt-charproperties parsec text ];
-       testDepends = [ base bytestring HUnit parsec text ];
+       libraryHaskellDepends = [
+         base bytestring hxt-charproperties parsec text
+       ];
+       testHaskellDepends = [ base bytestring HUnit parsec text ];
        homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
        description = "A regular expression library for W3C XML Schema regular expressions";
        license = stdenv.lib.licenses.mit;
@@ -74363,7 +76269,7 @@ self: {
        pname = "hxt-relaxng";
        version = "9.1.5.5";
        sha256 = "07s47z5xhd0pdzz8mr9vg78qxay450sm8ljycpprq7y7mgh2vzhf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hxt hxt-charproperties hxt-regex-xmlschema
          network-uri parsec
        ];
@@ -74380,7 +76286,9 @@ self: {
        pname = "hxt-tagsoup";
        version = "9.1.3";
        sha256 = "1rp499j6w3h9xfxqyw2fn05ffq3z0wg1r9h2c205m37mb8visq77";
-       buildDepends = [ base hxt hxt-charproperties hxt-unicode tagsoup ];
+       libraryHaskellDepends = [
+         base hxt hxt-charproperties hxt-unicode tagsoup
+       ];
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "TagSoup parser for HXT";
        license = "unknown";
@@ -74392,7 +76300,7 @@ self: {
        pname = "hxt-unicode";
        version = "9.0.2.4";
        sha256 = "0rj48cy8z4fl3zpg5bpa458kqr83adav6jnqv4i71dclpprj6n3v";
-       buildDepends = [ base hxt-charproperties ];
+       libraryHaskellDepends = [ base hxt-charproperties ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
        license = stdenv.lib.licenses.mit;
@@ -74405,7 +76313,9 @@ self: {
        pname = "hxt-xpath";
        version = "9.1.2.2";
        sha256 = "0wlq9s01icalnvjkkilx5zaqp3ff4v5limj1xy8i18qpzjspqdsh";
-       buildDepends = [ base containers directory filepath hxt parsec ];
+       libraryHaskellDepends = [
+         base containers directory filepath hxt parsec
+       ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "The XPath modules for HXT";
        license = "unknown";
@@ -74419,7 +76329,7 @@ self: {
        pname = "hxt-xslt";
        version = "9.1.1.1";
        sha256 = "020k7zjwbad5j2zbc0cgp8f5lggws5jijlcwmi71p510n0f51y9j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath hxt hxt-xpath parsec
        ];
        homepage = "https://github.com/UweSchmidt/hxt";
@@ -74433,7 +76343,7 @@ self: {
        pname = "hxthelper";
        version = "0.2.2";
        sha256 = "1il21mqmvvfdny5ksnyixj1wqhabvxqhccd6vj4dbzlvvf5yb6k1";
-       buildDepends = [ base bytestring encoding hxt mtl ];
+       libraryHaskellDepends = [ base bytestring encoding hxt mtl ];
        jailbreak = true;
        description = "Helper functions for HXT";
        license = "LGPL";
@@ -74446,7 +76356,7 @@ self: {
        pname = "hxweb";
        version = "0.1";
        sha256 = "0faiyflyhmn2y0bs920qgm9xkj9i69lzxhsg4rxffal989gi32z8";
-       buildDepends = [ base cgi fastcgi libxml mtl xslt ];
+       libraryHaskellDepends = [ base cgi fastcgi libxml mtl xslt ];
        description = "Minimal webframework using fastcgi, libxml2 and libxslt";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74460,7 +76370,7 @@ self: {
        sha256 = "0zv9ycgf9sii59q86s04m6krjyjgmrqaxz4lyvwa58b7a886wcmv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers HUnit random ];
+       executableHaskellDepends = [ base containers HUnit random ];
        homepage = "http://github.com/DamienCassou/HYahtzee";
        description = "A Yahtzee game implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -74477,7 +76387,7 @@ self: {
        sha256 = "1k81whay05mp9jb39gmb64l2xqxa90yrb7svbphj1cnsz0b76qwk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base blaze-html bytestring cmdargs directory filepath
          highlighting-kate mtl pandoc regex-pcre-builtin text
          unordered-containers
@@ -74486,7 +76396,6 @@ self: {
        homepage = "http://sourrust.github.io/hyakko/";
        description = "Literate-style Documentation Generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hybrid" = callPackage
@@ -74497,7 +76406,9 @@ self: {
        sha256 = "05v69csnz7g9ikymnrmzjqhdwlrfsb44pbv8mzddgk6my9ddlb9w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers haskell98 mtl parsec ];
+       executableHaskellDepends = [
+         base containers haskell98 mtl parsec
+       ];
        homepage = "http://repos.mine.nu/davve/darcs/hybrid";
        description = "A implementation of a type-checker for Lambda-H";
        license = stdenv.lib.licenses.bsd3;
@@ -74509,14 +76420,13 @@ self: {
      mkDerivation {
        pname = "hybrid-vectors";
        version = "0.2";
-       revision = "1";
        sha256 = "0xdrna6jgn4l0idhv0bn6ic8m7g8pps23ky2f75zwgpqrkflnb41";
+       revision = "1";
        editedCabalFile = "43a2c8cd2fa6abe7dc526dd99ef9d296394922a3d92ced8138072250fe75eb35";
-       buildDepends = [ base deepseq primitive vector ];
+       libraryHaskellDepends = [ base deepseq primitive vector ];
        homepage = "http://github.com/ekmett/hybrid-vectors";
        description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydra-hs" = callPackage
@@ -74525,9 +76435,9 @@ self: {
        pname = "hydra-hs";
        version = "1.0.0.2";
        sha256 = "18sxqangnl3gbb77dsg036ymsjj6w7zws2v43qnp3cfi0ksjxx8s";
-       buildDepends = [ base hmatrix ];
-       testDepends = [ base ];
-       extraLibraries = [ sixense_x64 ];
+       libraryHaskellDepends = [ base hmatrix ];
+       librarySystemDepends = [ sixense_x64 ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/mruegenberg/hydra-hs";
        description = "Haskell binding to the Sixense SDK for the Razer Hydra";
@@ -74548,11 +76458,15 @@ self: {
        sha256 = "16cgp3a475pzy0zasvfv3cvkvgc84g6p960sykk7y4aki0n3769i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         async base bytestring containers directory io-streams mtl ncurses
+         process random semigroups text time transformers unix
+       ];
+       executableHaskellDepends = [
          async base bytestring containers directory filepath io-streams mtl
          ncurses process random semigroups text time transformers unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring containers directory HUnit io-streams mtl
          ncurses process QuickCheck random semigroups test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
@@ -74562,7 +76476,6 @@ self: {
        homepage = "https://github.com/rrnewton/hydra-print";
        description = "NCurses interface to view multiple ByteString streams in parallel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen" = callPackage
@@ -74573,8 +76486,10 @@ self: {
        pname = "hydrogen";
        version = "0.3.0.0";
        sha256 = "0aq4svvwcys06mv172zz4yp624f6mnjg94lycj4r66xhm8m3fv4i";
-       buildDepends = [ base bytestring containers mtl pretty text ];
-       testDepends = [ base Cabal containers mtl QuickCheck ];
+       libraryHaskellDepends = [
+         base bytestring containers mtl pretty text
+       ];
+       testHaskellDepends = [ base Cabal containers mtl QuickCheck ];
        homepage = "https://www.github.com/ktvoelker/hydrogen";
        description = "An alternate Prelude";
        license = stdenv.lib.licenses.gpl3;
@@ -74591,7 +76506,7 @@ self: {
        sha256 = "03hz4z964zg1b5nzywymrd1m3ss081rq6nnbqwcgbwabx6wd209b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base hydrogen-cli-args hydrogen-data hydrogen-multimap
          hydrogen-parsing hydrogen-prelude hydrogen-syntax
        ];
@@ -74609,7 +76524,7 @@ self: {
        pname = "hydrogen-cli-args";
        version = "0.17";
        sha256 = "1wapq5lfyvm09sl9n7zhiaxpb8iapirvizq3ak9rl17vy4iz5xl4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hydrogen-multimap hydrogen-prelude
        ];
        jailbreak = true;
@@ -74625,7 +76540,7 @@ self: {
        pname = "hydrogen-data";
        version = "0.14";
        sha256 = "0d9457sarii5z1m2p1jzfk1g1ix2bm0s3ghfw7gab1w74i3hlh88";
-       buildDepends = [ base hydrogen-parsing hydrogen-prelude ];
+       libraryHaskellDepends = [ base hydrogen-parsing hydrogen-prelude ];
        jailbreak = true;
        homepage = "https://scravy.de/hydrogen-data/";
        description = "Hydrogen Data";
@@ -74639,7 +76554,7 @@ self: {
        pname = "hydrogen-multimap";
        version = "0.3";
        sha256 = "0ik68a85yxdz12sgfpqi7bagkhvm9qgvl2bgplm2anxjsxcqbi93";
-       buildDepends = [ base containers ghc-prim ];
+       libraryHaskellDepends = [ base containers ghc-prim ];
        homepage = "https://scravy.de/hydrogen-multimap/";
        description = "Hydrogen Multimap";
        license = stdenv.lib.licenses.mit;
@@ -74651,7 +76566,9 @@ self: {
        pname = "hydrogen-parsing";
        version = "0.17";
        sha256 = "0m9rliry031lr7bn4xkbjmar288zcrnpsbnjdyxs13v675bh7h29";
-       buildDepends = [ base containers hydrogen-prelude parsec ];
+       libraryHaskellDepends = [
+         base containers hydrogen-prelude parsec
+       ];
        jailbreak = true;
        homepage = "https://scravy.de/hydrogen-parsing/";
        description = "Hydrogen Parsing Utilities";
@@ -74669,7 +76586,7 @@ self: {
        pname = "hydrogen-prelude";
        version = "0.20";
        sha256 = "18g3r95ssg385zqzny3137ms0ppv7d33xgvc4gvxkijv8cgj1697";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring cereal containers directory filepath
          hashable hydrogen-multimap hydrogen-version network process random
          regex-base regex-tdfa strict text time transformers uuid
@@ -74686,7 +76603,7 @@ self: {
        pname = "hydrogen-prelude-parsec";
        version = "0.17";
        sha256 = "0hdvvp3kxc66y6bxzcrjqp7wc6s21isvfra0ps53j69jmnzqd2mh";
-       buildDepends = [ base hydrogen-prelude parsec ];
+       libraryHaskellDepends = [ base hydrogen-prelude parsec ];
        jailbreak = true;
        homepage = "http://scravy.de/hydrogen-prelude-parsec/";
        description = "Hydrogen Prelude /w Parsec";
@@ -74702,7 +76619,7 @@ self: {
        pname = "hydrogen-syntax";
        version = "0.17";
        sha256 = "17j6iq2fh1s3vwkzd5js786abk1zkmj4dfg425d290k4nvdl08dv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hydrogen-parsing hydrogen-prelude nicify parsec
          uuid
        ];
@@ -74719,7 +76636,9 @@ self: {
        pname = "hydrogen-util";
        version = "0.8";
        sha256 = "14z2nf2af0ydqr2sm4r4cn252qn0hbacdc4z1lhyjnin66djb1a8";
-       buildDepends = [ base containers hydrogen-prelude parsec time ];
+       libraryHaskellDepends = [
+         base containers hydrogen-prelude parsec time
+       ];
        jailbreak = true;
        homepage = "https://scravy.de/hydrogen-util/";
        description = "Hydrogen Tools";
@@ -74733,7 +76652,7 @@ self: {
        pname = "hydrogen-version";
        version = "1.4";
        sha256 = "04v39lvh0z0ig6igsz7ncfasag3j6pdbsa86gyp63n4g325fmf38";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://scravy.de/hydrogen-version/";
        description = "Hydrogen Version Type";
        license = stdenv.lib.licenses.mit;
@@ -74748,7 +76667,7 @@ self: {
        pname = "hyena";
        version = "0.1.0.1";
        sha256 = "0899lw0vyvcw03ph4w717rxach2ncb69xfn9387j7fl0s01ch0ji";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory extensible-exceptions filepath
          mtl network network-bytestring unix
        ];
@@ -74767,7 +76686,7 @@ self: {
        pname = "hylolib";
        version = "1.4.0";
        sha256 = "160k8lp6r2rbgj7qz3msa5sd5yxkdb5rjlhwd5lqbcxw2sry0vj2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers mtl pretty QuickCheck random uniplate
        ];
        jailbreak = true;
@@ -74784,7 +76703,7 @@ self: {
        sha256 = "0xynx72xpb84g19gnsgq00gwj3ycfgk5qgd9j949b6k3fqr3n71w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hylolib mtl ];
+       executableHaskellDepends = [ base hylolib mtl ];
        homepage = "http://www.glyc.dc.uba.ar/intohylo/hylotab.php";
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
@@ -74799,7 +76718,9 @@ self: {
        sha256 = "1pn14f3hjcxa5bww0pg2irqmbvfs7f3vfwl8z87jmxfyydgffgnh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers hylolib mtl uniplate ];
+       executableHaskellDepends = [
+         base containers hylolib mtl uniplate
+       ];
        description = "Very small programs for hybrid logics";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74815,7 +76736,7 @@ self: {
        sha256 = "0hvgxsrq1aws5c97w1lrk87d74kn8796vmclkdxhajfammj6ccz9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-lexing extensible-exceptions mtl network
          pipes pretty
        ];
@@ -74833,7 +76754,7 @@ self: {
        pname = "hyperfunctions";
        version = "0";
        sha256 = "0q452g2qzlw961zwkdihwi8d8hknxavfgd8vkjdhiazx5anbqzkm";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base distributive profunctors transformers
        ];
        homepage = "http://github.com/ekmett/hyperfunctions";
@@ -74852,19 +76773,18 @@ self: {
        pname = "hyperloglog";
        version = "0.3.4";
        sha256 = "122qdkg1xwyhbxll5zimp8w6j79i30102g3iqf41lrbrx0xllpag";
-       buildDepends = [
+       libraryHaskellDepends = [
          approximate base binary bits bytes cereal cereal-vector comonad
          deepseq distributive hashable hashable-extras lens reflection
          safecopy semigroupoids semigroups siphash tagged vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
        homepage = "http://github.com/analytics/hyperloglog";
        description = "An approximate streaming (constant space) unique object counter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyperpublic" = callPackage
@@ -74875,7 +76795,7 @@ self: {
        pname = "hyperpublic";
        version = "0.1.1";
        sha256 = "07jz89x0daps5rkmccjprrbkwn5mzdskp2yv8asfnmcyir36lmzd";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring http-enumerator http-types
        ];
        jailbreak = true;
@@ -74891,7 +76811,7 @@ self: {
        pname = "hyphenate";
        version = "0.1";
        sha256 = "0pnp5d1a0hwn6jm8v6i7yygd831q2bvsz6qb9n8db8n17lfxikx4";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://www.alpheccar.org";
        description = "Text hyphenation algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -74905,10 +76825,10 @@ self: {
        pname = "hyphenation";
        version = "0.6";
        sha256 = "1xqj4na1gm40ssirc4k70r27bzxhg2dkiipp48a5hqwgq5k3crrg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers unordered-containers zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory doctest filepath unordered-containers
        ];
        jailbreak = true;
@@ -74929,13 +76849,13 @@ self: {
        pname = "hypher";
        version = "0.1.5";
        sha256 = "0q5lpza6l4aqd85i1wxkkrdd3j9kk2k8xd0l6szpgkv87b41qfhk";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-default hashable HTTP
          http-conduit http-types lifted-base monad-control mtl resourcet
          scientific text transformers transformers-base unordered-containers
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring Cabal data-default hashable HTTP http-conduit
          http-types HUnit lifted-base monad-control mtl QuickCheck resourcet
          scientific test-framework test-framework-hunit
@@ -74957,12 +76877,12 @@ self: {
        pname = "hzk";
        version = "2.1.0";
        sha256 = "1jcvha3wzf6wka1zpmsvg1j48jl85v1s4p0mryfhjqz7l9h3wkac";
-       buildDepends = [ base bytestring resource-pool time ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring resource-pool time ];
+       librarySystemDepends = [ zookeeper_mt ];
+       testHaskellDepends = [
          base bytestring resource-pool tasty tasty-hunit time
        ];
-       buildTools = [ zookeeper_mt ];
-       extraLibraries = [ zookeeper_mt ];
+       testSystemDepends = [ zookeeper_mt ];
        homepage = "http://github.com/dgvncsz0f/hzk";
        description = "Haskell client library for Apache Zookeeper";
        license = stdenv.lib.licenses.bsd3;
@@ -74978,12 +76898,12 @@ self: {
        pname = "hzulip";
        version = "1.1.1.1";
        sha256 = "1gxywjng4mv0g13yap2a0i62l8wlbncj8ajj87ca6p8aikrd6cm1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit exceptions http-client
          http-client-tls http-types lens lens-aeson mtl stm stm-conduit text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async base bytestring conduit exceptions hspec http-client
          http-client-tls http-types lens lens-aeson mtl raw-strings-qq
          scotty stm stm-conduit text transformers
@@ -75002,7 +76922,7 @@ self: {
        pname = "i18n";
        version = "0.3";
        sha256 = "0l1z9acg1nnxs66w70vyhlj3wx2xg7w0lja59yp5awmh98815q1p";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath mtl old-locale old-time
          parsec utf8-string
        ];
@@ -75020,7 +76940,7 @@ self: {
        pname = "iCalendar";
        version = "0.4.0.3";
        sha256 = "0dbs9s68fpx67ngjnd1p8c9n421bzn6a034dr6i3bhg2cn0s01mw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring case-insensitive containers
          data-default mime mtl network network-uri old-locale parsec text
          time
@@ -75028,7 +76948,6 @@ self: {
        homepage = "http://github.com/chrra/iCalendar";
        description = "iCalendar data types, parser, and printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iException" = callPackage
@@ -75037,7 +76956,7 @@ self: {
        pname = "iException";
        version = "0.0.1";
        sha256 = "0g9hh7v5m194wyj9c5vzsjjc10fia60c9p8si778yky4chvfvj7p";
-       buildDepends = [ base interleavableIO mtl ];
+       libraryHaskellDepends = [ base interleavableIO mtl ];
        description = "Version of Control.Exception using InterleavableIO.";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75051,7 +76970,7 @@ self: {
        pname = "iap-verifier";
        version = "0.1.0.1";
        sha256 = "0mf55kx2y5q8qldgqcq805r3565nxngjm7nwq4q2xy54s7m2fsha";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring conduit http-conduit
          monads-tf text transformers
        ];
@@ -75069,7 +76988,10 @@ self: {
        sha256 = "0zswsb7mvbm8zycb14sks2kvg4jy2wn3vc7z6lb00s0alm1v0srk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base bytestring network unix ];
+       libraryHaskellDepends = [ attoparsec base bytestring network ];
+       executableHaskellDepends = [
+         attoparsec base bytestring network unix
+       ];
        jailbreak = true;
        homepage = "https://github.com/rbermani/ib-api";
        description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell";
@@ -75084,10 +77006,10 @@ self: {
        pname = "iban";
        version = "0.1.1.0";
        sha256 = "0rg4h2as5n324zf9y6jllz28s4wj687vdiqvrbnzlavl2kbx96vl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers iso3166-country-codes text unordered-containers
        ];
-       testDepends = [ base HUnit tasty tasty-hunit text ];
+       testHaskellDepends = [ base HUnit tasty tasty-hunit text ];
        jailbreak = true;
        homepage = "https://github.com/ibotty/iban";
        description = "Validate and generate IBANs";
@@ -75101,10 +77023,9 @@ self: {
        pname = "iconv";
        version = "0.4.1.3";
        sha256 = "0m5m0ph5im443xcz60wm1zp98bnmf8l1b5gfllxwhjriwdl52hin";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "String encoding conversion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ide-backend" = callPackage
@@ -75123,15 +77044,22 @@ self: {
        sha256 = "06ip0yq8vb8i0qcz2l7z4s1myxm6ix3l44gmjpvspj9vwlsrfxpp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         async attoparsec base binary bytestring Cabal-ide-backend
+         containers data-accessor data-accessor-mtl directory filemanip
+         filepath ghc-prim ide-backend-common mtl pretty-show process
+         pureMD5 template-haskell temporary text time transformers unix
+         utf8-string
+       ];
+       executableHaskellDepends = [
          aeson async attoparsec base binary bytestring bytestring-trie
          Cabal-ide-backend containers crypto-api data-accessor
          data-accessor-mtl directory executable-path filemanip filepath
          fingertree ghc-prim ide-backend-common mtl pretty-show process
          pureMD5 random tagged template-haskell temporary text time
-         transformers unix unordered-containers utf8-string
+         transformers unix unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async base binary bytestring Cabal-ide-backend containers
          deepseq directory executable-path filemanip filepath HUnit
          ide-backend-common process random regex-compat stm tagged tasty
@@ -75152,7 +77080,7 @@ self: {
        pname = "ide-backend-common";
        version = "0.9.1.3";
        sha256 = "11dnm1ibgibrjkxigzh9l442npb2br5rchahm6gza88imy3xcd96";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base binary bytestring bytestring-trie
          containers crypto-api data-accessor directory filepath fingertree
          mtl pretty-show pureMD5 tagged template-haskell temporary text
@@ -75168,7 +77096,7 @@ self: {
        pname = "ide-backend-rts";
        version = "0.1.3.1";
        sha256 = "1zj1glpyhmgpkxy4n96aqqf3s1gl2irl8ksnx4i9y4nwvs06qzj0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "RTS for the IDE backend";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -75185,7 +77113,7 @@ self: {
        sha256 = "0kljg5dpcxhk4dr8mi5ywb0ykygqm9p89rinyk1i2fqdcvza89rm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array async base bytestring Cabal containers data-accessor
          data-accessor-mtl directory filemanip filepath ghc haddock-api
          ide-backend-common mtl process temporary text time transformers
@@ -75193,6 +77121,7 @@ self: {
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ideas" = callPackage
@@ -75205,7 +77134,7 @@ self: {
        pname = "ideas";
        version = "1.3.1";
        sha256 = "1rwvnxih9lb8hw3wvnv377z78szdq80qsrspnxbdqf37kfdw3fx0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers Diff directory exceptions filepath
          mtl multipart network old-locale old-time parsec QuickCheck random
          time uniplate wl-pprint xhtml
@@ -75227,7 +77156,9 @@ self: {
        sha256 = "1s3pryjzc7dkmfdfrysag1w1j752y29cga4040a8fag10n9w7rr2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers ideas parsec QuickCheck random ];
+       executableHaskellDepends = [
+         base containers ideas parsec QuickCheck random
+       ];
        jailbreak = true;
        homepage = "http://ideas.cs.uu.nl/www/";
        description = "Interactive domain reasoner for logic and mathematics";
@@ -75241,8 +77172,8 @@ self: {
        pname = "idempotent";
        version = "0.1.2";
        sha256 = "18jwk65mm50lqnbx9px4c8aa2x7n5dkrazzpzvdwq7cy4q614bj0";
-       buildDepends = [ base containers ];
-       testDepends = [ base containers hspec QuickCheck ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/prophile/idempotent";
        description = "Idempotent monoids";
@@ -75258,11 +77189,11 @@ self: {
        pname = "identifiers";
        version = "0.4.0.0";
        sha256 = "0lk58c465a77mshz1b8rdgpidkgr73xbh9q0hij5dqw8d32h958f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary cereal containers deepseq hashable ListLike text
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -75281,11 +77212,12 @@ self: {
        sha256 = "11595aj56sjwk28grh6ldsbk5c6kgrirsc2xglfixw82vj7viw8h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-accessor MissingH polyparse text
          utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [ base containers ];
+       testHaskellDepends = [
          base bytestring containers data-accessor directory filepath HUnit
          MissingH polyparse process text utf8-string
        ];
@@ -75300,7 +77232,7 @@ self: {
        pname = "idna";
        version = "0.3.0";
        sha256 = "04w2mp9wa4mzdz4njx47j081jia8y000b46cw8vmx44fx8gv1zwp";
-       buildDepends = [ base punycode stringprep text ];
+       libraryHaskellDepends = [ base punycode stringprep text ];
        description = "Implements IDNA (RFC 3490)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75311,7 +77243,7 @@ self: {
        pname = "idna2008";
        version = "0.0.1.0";
        sha256 = "1pd62pr1hyk565mxc15f5lxyms58bywcqll5ya6cnzw20lv4lzlz";
-       buildDepends = [ base punycode split ];
+       libraryHaskellDepends = [ base punycode split ];
        jailbreak = true;
        description = "Converts Unicode hostnames into ASCII";
        license = stdenv.lib.licenses.bsd3;
@@ -75321,20 +77253,21 @@ self: {
   "idris" = callPackage
     ({ mkDerivation, annotated-wl-pprint, ansi-terminal, ansi-wl-pprint
      , base, base64-bytestring, binary, blaze-html, blaze-markup
-     , boehmgc, bytestring, cheapskate, containers, deepseq, directory
-     , filepath, fingertree, gmp, happy, haskeline, lens, libffi, mtl
-     , network, optparse-applicative, parsers, pretty, process, safe
-     , split, text, time, transformers, transformers-compat, trifecta
-     , uniplate, unix, unordered-containers, utf8-string, vector
+     , bytestring, cheapskate, containers, deepseq, directory, filepath
+     , fingertree, haskeline, lens, libffi, mtl, network
+     , optparse-applicative, parsers, pretty, process, safe, split, text
+     , time, transformers, transformers-compat, trifecta, uniplate, unix
+     , unordered-containers, utf8-string, vector
      , vector-binary-instances, xml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "idris";
        version = "0.9.18.1";
        sha256 = "0xd4kqnjdx427l26b07rrw9bnrxb8zrsqy93wayf4rmg6l8rymj8";
+       configureFlags = [ "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          annotated-wl-pprint ansi-terminal ansi-wl-pprint base
          base64-bytestring binary blaze-html blaze-markup bytestring
          cheapskate containers deepseq directory filepath fingertree
@@ -75343,14 +77276,14 @@ self: {
          transformers-compat trifecta uniplate unix unordered-containers
          utf8-string vector vector-binary-instances xml zip-archive zlib
        ];
-       buildTools = [ happy ];
-       extraLibraries = [ boehmgc gmp ];
-       configureFlags = [ "-fffi" "-fgmp" ];
+       executableHaskellDepends = [
+         base directory filepath haskeline transformers
+       ];
        jailbreak = true;
        homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) boehmgc;  inherit (pkgs) gmp;};
+     }) {};
 
   "ieee" = callPackage
     ({ mkDerivation, base }:
@@ -75358,7 +77291,7 @@ self: {
        pname = "ieee";
        version = "0.7";
        sha256 = "0ckhmy10l4kchr5bg1hlygrj86ij0wrj3r8in9g3c3jhh00dx3km";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/patperry/hs-ieee";
        description = "Utilities for dealing with IEEE floating point numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -75370,7 +77303,7 @@ self: {
        pname = "ieee-utils";
        version = "0.4.0";
        sha256 = "0548m1xjvzf65kkklmqjr2f5h85zdfpvxmdbx5rcg33zi8aiqfgk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "ieee-utils";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75382,7 +77315,7 @@ self: {
        pname = "ieee-utils-tempfix";
        version = "0.4.0.1";
        sha256 = "0x0mkvnf3q4yfh7bi7hv6364gy0l57syzy9xgzyax8z94zh465c3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "ieee-utils";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75393,7 +77326,7 @@ self: {
        pname = "ieee754";
        version = "0.7.6";
        sha256 = "03s56h82n7hcwcn2dhd646prcf9wxj5jq49xqsnl7cnvi9768h2q";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/patperry/hs-ieee754";
        description = "Utilities for dealing with IEEE floating point numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -75405,7 +77338,7 @@ self: {
        pname = "ieee754-parser";
        version = "0.1";
        sha256 = "06pyzjd9imcnrffc0h4dwq46llkb9cmfk1nygmjgfz0y0f9481iv";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        license = "GPL";
      }) {};
 
@@ -75415,7 +77348,7 @@ self: {
        pname = "iff";
        version = "0.0.5";
        sha256 = "1qy19d39zkf79z2j3mvimcnr48vpka5zj05g46fl4f9hz9xjiv16";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://code.haskell.org/~thielema/iff/";
        description = "Constructing and dissecting IFF files";
        license = "GPL";
@@ -75429,8 +77362,10 @@ self: {
        pname = "ifscs";
        version = "0.2.0.0";
        sha256 = "1675j66kmlfcwd8g0wanx4jfs3vnnvz8hpazskzng6ghvp4bam1q";
-       buildDepends = [ base containers failure ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base containers failure ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        description = "An inductive-form set constraint solver";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75446,7 +77381,7 @@ self: {
        pname = "ig";
        version = "0.3.1";
        sha256 = "0ggr6h5inwwxvqs9qywiagi1c5bx1vky5h0zvhz0df88nbfd3d21";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base16-bytestring bytestring conduit conduit-extra
          crypto-api cryptohash cryptohash-cryptoapi data-default
          http-conduit http-types lifted-base monad-control resourcet text
@@ -75455,7 +77390,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/ig";
        description = "Bindings to Instagram's API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ige-mac-integration" = callPackage
@@ -75466,9 +77400,11 @@ self: {
        pname = "ige-mac-integration";
        version = "0.1.0.1";
        sha256 = "1949c5v3157xlwcmddawc79iagxlgy4l08skpkldi45amyy3jqn6";
-       buildDepends = [ array base containers glib gtk haskell98 mtl ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ ige-mac-integration ];
+       libraryHaskellDepends = [
+         array base containers glib gtk haskell98 mtl
+       ];
+       libraryPkgconfigDepends = [ ige-mac-integration ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
@@ -75484,9 +77420,11 @@ self: {
        pname = "igraph";
        version = "0.1.1";
        sha256 = "098b1y1iwmlpi3kspq4cd82cs0bbxvygghssjr986664lgv06hsd";
-       buildDepends = [ base containers hashable unordered-containers ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ igraph ];
+       libraryHaskellDepends = [
+         base containers hashable unordered-containers
+       ];
+       librarySystemDepends = [ igraph ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://giorgidze.github.com/igraph/";
        description = "Bindings to the igraph C library";
        license = stdenv.lib.licenses.bsd3;
@@ -75498,10 +77436,10 @@ self: {
      mkDerivation {
        pname = "igrf";
        version = "0.2.0.0";
-       revision = "1";
        sha256 = "04ipbhry1v3cpkflshqa9sp46px0k6g67n8apvdqykk5fsssdpm1";
+       revision = "1";
        editedCabalFile = "7d616cb461fb1406310675937e1e761f2d09757824dce8a92d235b7ef6ce1e4f";
-       buildDepends = [ ad base polynomial ];
+       libraryHaskellDepends = [ ad base polynomial ];
        jailbreak = true;
        homepage = "https://github.com/dmcclean/igrf";
        description = "International Geomagnetic Reference Field";
@@ -75523,7 +77461,7 @@ self: {
        sha256 = "1jcksbc82csr11lpy5jakf7g6wj2w7mx27cp7knlbi65fsablsk5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bin-package-db bytestring cereal
          cmdargs containers directory filepath ghc ghc-parser ghc-paths
          haskeline haskell-src-exts here hlint http-client http-client-tls
@@ -75531,7 +77469,11 @@ self: {
          system-argv0 text transformers unix unordered-containers
          utf8-string uuid vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bin-package-db bytestring containers directory ghc here
+         ipython-kernel strict text transformers unix
+       ];
+       testHaskellDepends = [
          aeson base base64-bytestring bin-package-db bytestring cereal
          cmdargs containers directory filepath ghc ghc-parser ghc-paths
          haskeline haskell-src-exts here hlint hspec http-client
@@ -75554,7 +77496,7 @@ self: {
        pname = "ihaskell-aeson";
        version = "0.3.0.0";
        sha256 = "0h2bbkqwl8mdyn24n0lphcjfrvmfq8ckincv3rncspp9h0v705m7";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base bytestring here ihaskell text
        ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
@@ -75569,7 +77511,7 @@ self: {
        pname = "ihaskell-basic";
        version = "0.3.0.0";
        sha256 = "1vb4x6h6bs3liq1bbnhs3ns0zrk4czy63zmkp1q075g7fq1fh7hw";
-       buildDepends = [ base ihaskell ];
+       libraryHaskellDepends = [ base ihaskell ];
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
@@ -75582,7 +77524,7 @@ self: {
        pname = "ihaskell-blaze";
        version = "0.3.0.0";
        sha256 = "1il3iz1nksh5v753srvchrjdazf7dqsd3q59w7crzbyrlx81v97b";
-       buildDepends = [ base blaze-html blaze-markup ihaskell ];
+       libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for blaze-html types";
        license = stdenv.lib.licenses.mit;
@@ -75597,7 +77539,7 @@ self: {
        pname = "ihaskell-charts";
        version = "0.3.0.0";
        sha256 = "0nlimyx953v1s4xgzdb9987i9bw1bdralkg2x6cp41kzqd49i4f3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Chart Chart-cairo data-default-class directory
          ihaskell
        ];
@@ -75615,7 +77557,7 @@ self: {
        pname = "ihaskell-diagrams";
        version = "0.3.0.0";
        sha256 = "0w1jzsrn9lpgrwbr1wsy7kqvkdbq5v21fm67gxif0xrv6hgavzca";
-       buildDepends = [
+       libraryHaskellDepends = [
          active base bytestring diagrams diagrams-cairo diagrams-lib
          directory ihaskell text
        ];
@@ -75630,7 +77572,7 @@ self: {
        pname = "ihaskell-display";
        version = "0.1.0.0";
        sha256 = "1cbfhv9kg33dj28mn6mhhi363pz9jr2kw4ph64ga1fiawlj563l0";
-       buildDepends = [ base classy-prelude ihaskell ];
+       libraryHaskellDepends = [ base classy-prelude ihaskell ];
        jailbreak = true;
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for basic types";
@@ -75644,7 +77586,7 @@ self: {
        pname = "ihaskell-hatex";
        version = "0.2.0.0";
        sha256 = "02ynqhirz8bblcfaxksgxxqgnkmxqazj8imwxc2gbrw2v3p0i39s";
-       buildDepends = [ base HaTeX ihaskell text ];
+       libraryHaskellDepends = [ base HaTeX ihaskell text ];
        jailbreak = true;
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for hatex";
@@ -75659,7 +77601,9 @@ self: {
        pname = "ihaskell-juicypixels";
        version = "0.3.0.0";
        sha256 = "0apsll540z4hzzs39bqk14iadnr4rjp873q712la7lp2xnyf4k0y";
-       buildDepends = [ base bytestring directory ihaskell JuicyPixels ];
+       libraryHaskellDepends = [
+         base bytestring directory ihaskell JuicyPixels
+       ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
        license = stdenv.lib.licenses.mit;
@@ -75674,7 +77618,7 @@ self: {
        pname = "ihaskell-magic";
        version = "0.3.0.0";
        sha256 = "05jvyca163daqrmpb7fhk1wng04vk4bayffp0lp68sy3zskrjndl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring ihaskell ipython-kernel magic
          text utf8-string
        ];
@@ -75692,7 +77636,7 @@ self: {
        pname = "ihaskell-parsec";
        version = "0.3.0.0";
        sha256 = "0n1awvn81228cci1q1rvy7p91zfl29byp5imkiwqbxswzz5sq8n4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base here ihaskell parsec random text unordered-containers
        ];
        jailbreak = true;
@@ -75708,7 +77652,7 @@ self: {
        pname = "ihaskell-plot";
        version = "0.3.0.0";
        sha256 = "17qp2ln9v4sv9i3biyxgyq0csqikxwm5gs612fn5zsl1ixznj1h1";
-       buildDepends = [ base bytestring ihaskell plot ];
+       libraryHaskellDepends = [ base bytestring ihaskell plot ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
@@ -75724,7 +77668,7 @@ self: {
        pname = "ihaskell-rlangqq";
        version = "0.3.0.0";
        sha256 = "1w2ywl3m122d56cvgnhll6dpjw03y2jy3nc8v325291zhknrziaj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring directory filepath
          ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat
        ];
@@ -75743,10 +77687,10 @@ self: {
        sha256 = "1rcv92cdy3g9v3qgr3zvjjj0c4d7k99n7ya0mym0bjj79wj4r5zm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers contstuff enumerator netlines
-         network
        ];
+       executableHaskellDepends = [ base network ];
        description = "Incremental HTTP iteratee";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75762,11 +77706,12 @@ self: {
        sha256 = "16ijh2sadbayh3ldiagjq67xilhyv55qhqmmz8a73lbnlq3cphk5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base containers filemanip filepath hscolour html utf8-string
-         xhtml
+       libraryHaskellDepends = [
+         base containers filemanip filepath hscolour html utf8-string xhtml
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [ array base containers html xhtml ];
+       executableToolDepends = [ alex ];
        homepage = "http://github.com/jgm/illuminate";
        description = "A fast syntax highlighting library built with alex";
        license = stdenv.lib.licenses.bsd3;
@@ -75778,10 +77723,10 @@ self: {
      mkDerivation {
        pname = "image-type";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "0xr55c5g4jn1y83qy7bqa5ww9r73vw9clgln9ld893vypmb91wks";
+       revision = "1";
        editedCabalFile = "47033c893690f2cea85ba867343f277a8e2594f9010a5466a39dc7f3c4d682f2";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/Icelandjack/Image-type";
        description = "Determine the type of an image by reading the first bytes";
        license = stdenv.lib.licenses.bsd3;
@@ -75793,41 +77738,39 @@ self: {
        pname = "imagefilters";
        version = "0.1";
        sha256 = "1n7awx8wsm6z0sp54jri3sp403n14wzr08vjj4a422q1lf306l3y";
-       buildDepends = [ base gd ];
+       libraryHaskellDepends = [ base gd ];
        homepage = "https://github.com/tchannel/imagefilters";
        description = "Image Filters (contrast, brightness, gaussian blur, etc)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "imagemagick" = callPackage
-    ({ mkDerivation, base, bytestring, directory, HUnit, ImageMagick
-     , lifted-base, MagickWand, MonadCatchIO-transformers, QuickCheck
-     , resourcet, system-filepath, test-framework, test-framework-hunit
+    ({ mkDerivation, base, bytestring, directory, HUnit, imagemagick
+     , lifted-base, MonadCatchIO-transformers, QuickCheck, resourcet
+     , system-filepath, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, transformers, vector
      }:
      mkDerivation {
        pname = "imagemagick";
        version = "0.0.3.5";
-       revision = "1";
        sha256 = "0vwmx86wpxr1f5jrwlqpvrb94dbrm0jjdqq6bppfnfyppd3s1mmq";
+       revision = "1";
        editedCabalFile = "9666a02ba8aef32515f97734c86453b3b9759c46c6a9306be9f20dbdb6b98203";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring MonadCatchIO-transformers resourcet system-filepath
          text transformers vector
        ];
-       testDepends = [
-         base bytestring directory HUnit ImageMagick lifted-base MagickWand
-         QuickCheck resourcet system-filepath test-framework
-         test-framework-hunit test-framework-quickcheck2 text transformers
-         vector
+       libraryPkgconfigDepends = [ imagemagick ];
+       testHaskellDepends = [
+         base bytestring directory HUnit lifted-base QuickCheck resourcet
+         system-filepath test-framework test-framework-hunit
+         test-framework-quickcheck2 text transformers vector
        ];
-       pkgconfigDepends = [ ImageMagick MagickWand ];
        description = "bindings to imagemagick library";
        license = "unknown";
-       broken = true;
-     }) { ImageMagick = null;  MagickWand = null;};
+     }) { inherit (pkgs) imagemagick;};
 
   "imagepaste" = callPackage
     ({ mkDerivation, base, containers, HTTP, json, mtl, network
@@ -75840,7 +77783,7 @@ self: {
        sha256 = "1k512mw4a2hm6nzz2sn00rmkf7fb7mj4a2lk1klr1wmlchwimvpv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers HTTP json mtl network regex-posix tagsoup
          template-haskell transformers vcs-revision
        ];
@@ -75858,10 +77801,10 @@ self: {
        pname = "imagesize-conduit";
        version = "1.1";
        sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra exceptions
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit conduit-extra hspec resourcet
        ];
        homepage = "http://github.com/silkapp/imagesize-conduit";
@@ -75879,7 +77822,7 @@ self: {
        sha256 = "0h6kbh3z78xm1rjphyv7zkjc5knd7v9agss0b9rzarm1z4qd2q5v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory HaskellNet HsOpenSSL network text
        ];
        jailbreak = true;
@@ -75898,7 +77841,7 @@ self: {
        sha256 = "0x31wjd6maqixr3rbangaph0s5skp18fmb8xgm1a6jsky8k367vz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bibtex bytestring ConfigFile containers curl directory
          download-curl filepath glib gnomevfs gtk mtl parsec process split
          utf8-string
@@ -75919,7 +77862,12 @@ self: {
        sha256 = "156a3fq274112j3a6lqiprwhgrcrjp3izix2z1s9bbx3c04pwrjx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base curl directory haskell98 hxt hxt-xpath url ];
+       libraryHaskellDepends = [
+         base curl directory haskell98 hxt hxt-xpath url
+       ];
+       executableHaskellDepends = [
+         base curl directory haskell98 hxt hxt-xpath url
+       ];
        description = "Uploader for Imgur";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75936,18 +77884,19 @@ self: {
      mkDerivation {
        pname = "imm";
        version = "0.6.0.3";
-       revision = "1";
        sha256 = "0fhqb36xj2xr1hhfrhk1npms9lnvbh6fmvki9mmm3gqs06hb925l";
+       revision = "1";
        editedCabalFile = "c14d5caa0066c05d15589dfbb663c5397bcb6d12ab4477de1d7572e3a16b132d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring case-insensitive cond data-default directory
          dyre feed filepath hslogger http-conduit http-types lens mime-mail
          monad-control mtl network network-uri old-locale opml random
          resourcet text text-icu time timerep tls transformers
          transformers-base utf8-string xdg-basedir xml
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
        license = "unknown";
@@ -75962,10 +77911,10 @@ self: {
        pname = "immortal";
        version = "0.2";
        sha256 = "1si9zh309xh29qrxkhb0shwisjrsja2d9lpj17dwlzn0gv0i1672";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base lifted-base stm tasty tasty-hunit transformers
        ];
        homepage = "https://github.com/feuerbach/immortal";
@@ -75984,7 +77933,11 @@ self: {
        sha256 = "15bpz985d39az15jn8hd6wcil7ivsi3vcnxi5lcfs34i848rs9fg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         ascetic base compilation containers directory indents MissingH
+         parsec richreports split staticanalysis text uxadt
+       ];
+       executableHaskellDepends = [
          ascetic base compilation containers directory indents MissingH
          parsec richreports split staticanalysis text uxadt
        ];
@@ -76006,7 +77959,7 @@ self: {
        sha256 = "0zsd25gd0c4sp1ipjnsbn1gbdl6s0y2vy8n4nwn3dxgrv75cd1l9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-markup blaze-svg bytestring containers
          deepseq directory filepath JuicyPixels mtl optparse-applicative
          parallel parsec storable-endian text unordered-containers
@@ -76024,7 +77977,7 @@ self: {
        pname = "implicit-params";
        version = "0.2.1";
        sha256 = "1da01fnwxf1350ywawvl58qf479q2rz81wi9s8lvw2n3d75qpn8i";
-       buildDepends = [ base data-default-class ];
+       libraryHaskellDepends = [ base data-default-class ];
        homepage = "http://github.com/duairc/implicit-params";
        description = "Named and unnamed implicit parameters with defaults";
        license = stdenv.lib.licenses.bsd3;
@@ -76036,8 +77989,8 @@ self: {
        pname = "imports";
        version = "0.1.2.1";
        sha256 = "1hm4dg07mw8cihkqziz827kwa3qqvgjg1y45r2lg66crsaanprgz";
-       buildDepends = [ base directory filepath mtl ];
-       testDepends = [ base directory filepath mtl ];
+       libraryHaskellDepends = [ base directory filepath mtl ];
+       testHaskellDepends = [ base directory filepath mtl ];
        jailbreak = true;
        homepage = "https://github.com/CindyLinz/Haskell-imports";
        description = "Generate code for importing directories automatically";
@@ -76050,7 +78003,7 @@ self: {
        pname = "improve";
        version = "0.4.0";
        sha256 = "0z8w7lgk263ickb4l3ajhvy1bjq38bbiiw6c048a3yn4h8kpg67a";
-       buildDepends = [ base mtl yices ];
+       libraryHaskellDepends = [ base mtl yices ];
        jailbreak = true;
        homepage = "http://github.com/tomahawkins/improve/wiki/ImProve";
        description = "An imperative, verifiable programming language for high assurance applications";
@@ -76064,7 +78017,7 @@ self: {
        pname = "inc-ref";
        version = "0.3.0.0";
        sha256 = "0hr25bdwq2a1mj74wb8dvb95jyfqx13rz0h4makyb5kqlhxz40xl";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/jfischoff/inc-ref";
        description = "A STM reference useful for incremental computing";
        license = stdenv.lib.licenses.bsd3;
@@ -76080,10 +78033,10 @@ self: {
        sha256 = "05f25yza05ib0xnkpfimhrb3nqyp5km85r1j9n6yh9k0cwdagndi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers filepath IndentParser mtl parsec presburger pretty
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory filepath IndentParser mtl parsec
          presburger pretty
        ];
@@ -76100,8 +78053,8 @@ self: {
        pname = "include-file";
        version = "0.1.0.2";
        sha256 = "0yrqvdp37wjw9j7vknzyiw4954yskxh75z8r3sic6qdmz17zv8ba";
-       buildDepends = [ base bytestring template-haskell ];
-       testDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring template-haskell ];
+       testHaskellDepends = [ base bytestring ];
        description = "Inclusion of files in executables at compile-time";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76115,10 +78068,10 @@ self: {
        pname = "incremental-computing";
        version = "0.0.0.0";
        sha256 = "0zdq122m0nq18igvdxis7lqgdflf6sc94m1aqypjwfkxy4qfvvq3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dlist fingertree order-maintenance transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base Cabal cabal-test-quickcheck containers QuickCheck
        ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/incremental-computing";
@@ -76135,8 +78088,8 @@ self: {
        pname = "incremental-parser";
        version = "0.2.3.4";
        sha256 = "0n2318i4dzgcs9xcs80wcfbm9rc902w02nwqa30b3nrwl21cjag3";
-       buildDepends = [ base monoid-subclasses ];
-       testDepends = [
+       libraryHaskellDepends = [ base monoid-subclasses ];
+       testHaskellDepends = [
          base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
        ];
        homepage = "http://patch-tag.com/r/blamario/incremental-parser/wiki/";
@@ -76150,7 +78103,7 @@ self: {
        pname = "incremental-sat-solver";
        version = "0.1.7";
        sha256 = "1kic3q19lli8yd28szrngpfsqi50wc47k6597ay24zmiikhx4c2v";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://github.com/sebfisch/incremental-sat-solver";
        description = "Simple, Incremental SAT Solving as a Library";
        license = stdenv.lib.licenses.bsd3;
@@ -76165,8 +78118,10 @@ self: {
        pname = "increments";
        version = "0.1.0.4";
        sha256 = "0dsand1y9f215fsikwr2601zxrzxpv85aka6f0gaaf0657mr4x9i";
-       buildDepends = [ base beamable bytestring containers ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base beamable bytestring containers ghc-prim
+       ];
+       testHaskellDepends = [
          base beamable bytestring containers ghc-prim QuickCheck
          test-framework test-framework-quickcheck2
        ];
@@ -76184,8 +78139,8 @@ self: {
        pname = "indentation";
        version = "0.2.1.1";
        sha256 = "1wb5kv0wx25hhg08afsqpzkkc8c981pbhp8wrzdclb4105y4l4vj";
-       buildDepends = [ base mtl parsec parsers trifecta ];
-       testDepends = [ base parsec tasty tasty-hunit trifecta ];
+       libraryHaskellDepends = [ base mtl parsec parsers trifecta ];
+       testHaskellDepends = [ base parsec tasty tasty-hunit trifecta ];
        homepage = "https://bitbucket.org/mdmkolbe/indentation";
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
        license = stdenv.lib.licenses.bsd3;
@@ -76199,7 +78154,7 @@ self: {
        sha256 = "141bzmhdk5x2bzjx9g7hcf5p07h4q2vzzxlda8vf3dcgxgpdc7aw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl parsec ];
+       libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://www.cse.iitk.ac.in/users/ppk/code/HASKELL/indentparser";
        description = "A parser for indentation based structures";
        license = stdenv.lib.licenses.publicDomain;
@@ -76211,7 +78166,7 @@ self: {
        pname = "indents";
        version = "0.3.3";
        sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
-       buildDepends = [ base concatenative mtl parsec ];
+       libraryHaskellDepends = [ base concatenative mtl parsec ];
        homepage = "http://patch-tag.com/r/salazar/indents";
        description = "indentation sensitive parser-combinators for parsec";
        license = stdenv.lib.licenses.bsd3;
@@ -76222,10 +78177,10 @@ self: {
      mkDerivation {
        pname = "index-core";
        version = "1.0.2";
-       revision = "1";
        sha256 = "0sj69r9mavw1s17lhh7af9n5vrb60gk5lm6v593sp0rs77canldw";
+       revision = "1";
        editedCabalFile = "97808339bd2ac8a5c79ed99e716e2e8e941234421fde3930b370e0bbc734b063";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Indexed Types";
        license = stdenv.lib.licenses.bsd3;
@@ -76238,7 +78193,7 @@ self: {
        pname = "indexed";
        version = "0.1";
        sha256 = "1dx5pyi5psjd2l26hc3wfsapnywdl0kqpw98b3jwc0xq4406ax12";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/reinerp/indexed";
        description = "Haskell98 indexed functors, monads, comonads";
        license = stdenv.lib.licenses.bsd3;
@@ -76251,7 +78206,9 @@ self: {
        pname = "indexed-do-notation";
        version = "0.1";
        sha256 = "10yvbhjjzg19lyw9ynn2j1cyms2k4hxly5hmw0ad416f8zxmisf9";
-       buildDepends = [ base haskell-src-meta indexed template-haskell ];
+       libraryHaskellDepends = [
+         base haskell-src-meta indexed template-haskell
+       ];
        homepage = "https://github.com/fumieval/indexed-do-notation";
        description = "Do notation for indexed monads";
        license = stdenv.lib.licenses.bsd3;
@@ -76263,7 +78220,7 @@ self: {
        pname = "indexed-extras";
        version = "0.1.1";
        sha256 = "0mhzk2smcli5mk6ghcxpbnq58adryf42s50qmqrj72sxsfd7a09r";
-       buildDepends = [ base bifunctors indexed mtl pointed ];
+       libraryHaskellDepends = [ base bifunctors indexed mtl pointed ];
        jailbreak = true;
        homepage = "https://github.com/reinerp/indexed-extras";
        description = "Indexed functors, monads and comonads that require extensions to Haskell98";
@@ -76276,7 +78233,7 @@ self: {
        pname = "indexed-free";
        version = "0.3.1";
        sha256 = "1172vxhyzyf061mnlb8dndnvycjk3shxhiqd8hdz42ipv223admx";
-       buildDepends = [ base indexed ];
+       libraryHaskellDepends = [ base indexed ];
        homepage = "https://github.com/fumieval/indexed-free";
        description = "indexed monads for free";
        license = stdenv.lib.licenses.bsd3;
@@ -76288,7 +78245,7 @@ self: {
        pname = "indian-language-font-converter";
        version = "0.2";
        sha256 = "1dw0fy3v2hfvlaw371af2c288v4p0wyg43h88clswids3nh1lpn8";
-       buildDepends = [ base gtk HDBC HDBC-sqlite3 ];
+       libraryHaskellDepends = [ base gtk HDBC HDBC-sqlite3 ];
        description = "Indian Language Font Converter";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76299,8 +78256,8 @@ self: {
        pname = "indices";
        version = "1.7.1";
        sha256 = "1sy609gq9idk5x28wasd9i61jwhlpf9ls21jps1nw1dfymid41c5";
-       buildDepends = [ base tagged template-haskell ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base tagged template-haskell ];
+       testHaskellDepends = [ base QuickCheck ];
        description = "Multi-dimensional statically bounded indices";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76316,7 +78273,7 @@ self: {
        sha256 = "11v8njjinjqzqfa5hggj0r1gki3hz6y7cxj5qfnzxa77hdav10fa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base github optparse-applicative parsec process text
        ];
        jailbreak = true;
@@ -76337,10 +78294,11 @@ self: {
        sha256 = "0m4azl5pxypnf3q9riwf1gkwlfwrw5dswgrr2y9j1myb812ag5qn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers digits either fgl language-ecmascript mtl
          optparse-applicative parsec transformers
        ];
+       executableHaskellDepends = [ base optparse-applicative parsec ];
        homepage = "https://github.com/sinelaw/infernu";
        description = "Type inference and checker for JavaScript (experimental)";
        license = stdenv.lib.licenses.gpl2;
@@ -76352,7 +78310,7 @@ self: {
        pname = "infinite-search";
        version = "0.12";
        sha256 = "18sf9798nna155xix71lw68k19r7ayk9kmppjzd76yxa61r38g41";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/infinite-search";
        description = "Exhaustively searchable infinite sets";
        license = stdenv.lib.licenses.bsd3;
@@ -76367,7 +78325,9 @@ self: {
        sha256 = "1d2l6a4ngawm7zqgfwxd19rh3zwihivbgns39q44yjh1d5v0azab";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary Cabal filepath ghc irc plugins ];
+       executableHaskellDepends = [
+         base binary Cabal filepath ghc irc plugins
+       ];
        jailbreak = true;
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76379,7 +78339,7 @@ self: {
        pname = "infix";
        version = "0.1.1";
        sha256 = "156lcw4bvav9w41vggfjk84z41ppam31880wpislxwcsvc9jrd6q";
-       buildDepends = [ base containers haskell-src ];
+       libraryHaskellDepends = [ base containers haskell-src ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Infix expression re-parsing (for HsParser library)";
        license = "GPL";
@@ -76394,15 +78354,14 @@ self: {
        pname = "inflections";
        version = "0.2.0.0";
        sha256 = "16s2sj2417qmhdlzn7j51yf7fh50f5msgb50fsavw80845602x43";
-       buildDepends = [ base containers parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers parsec ];
+       testHaskellDepends = [
          base containers HUnit parsec QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
        homepage = "https://github.com/stackbuilders/inflections-hs";
        description = "Inflections library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inflist" = callPackage
@@ -76411,8 +78370,8 @@ self: {
        pname = "inflist";
        version = "0.0.1";
        sha256 = "0srw75ds7hic0sjs2fnj0hsqsygzvppgy17y8qmsjz9z14ryqncw";
-       buildDepends = [ base QuickCheck ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "https://bitbucket.org/eegg/inflist";
        description = "An infinite list type and operations thereon";
        license = stdenv.lib.licenses.bsd3;
@@ -76432,12 +78391,15 @@ self: {
        sha256 = "0v092i592j5n31fl0vc5750pqjbgaj10n3dm314bkll6ld0gdbwx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default-class
-         dlist exceptions http-client mtl mwc-random network-uri retry
-         scientific tagged template-haskell text time vector
+         dlist exceptions http-client mtl network-uri retry scientific
+         tagged template-haskell text vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring http-client mtl mwc-random text time
+       ];
+       testHaskellDepends = [
          base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
          tasty-th text vector
        ];
@@ -76458,7 +78420,12 @@ self: {
        sha256 = "1xglpqwr4bc7rqaspq7w6pc9g5ilzvxfb6lfkji3inagg5xksl7n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers csv highlighting-kate http-conduit monad-logger
+         pandoc persistent persistent-postgresql shakespeare text time
+         time-locale-compat yesod yesod-auth yesod-core yesod-form
+       ];
+       executableHaskellDepends = [
          base containers csv highlighting-kate http-conduit monad-logger
          pandoc persistent persistent-postgresql shakespeare text time
          time-locale-compat yesod yesod-auth yesod-core yesod-form
@@ -76476,7 +78443,9 @@ self: {
        pname = "ini";
        version = "0.3.1";
        sha256 = "01iwf4ifdx3mrw1rybj4crip4hmjxhab250rv995dgbwldh1iyqb";
-       buildDepends = [ attoparsec base text unordered-containers ];
+       libraryHaskellDepends = [
+         attoparsec base text unordered-containers
+       ];
        description = "Quick and easy configuration files in the INI format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76489,14 +78458,17 @@ self: {
        pname = "inilist";
        version = "0.2.0.0";
        sha256 = "1rr71yajc6j0idsqgna8mbnawiv6iw1x8kswkv7x2l0ih89r6y3a";
-       buildDepends = [ base bifunctors containers safe trifecta ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bifunctors containers safe trifecta
+       ];
+       testHaskellDepends = [
          base bifunctors containers deepseq HUnit safe tasty tasty-hunit
          testpack trifecta
        ];
        homepage = "https://chiselapp.com/user/mwm/repository/inilist";
        description = "Processing for .ini files with duplicate sections and options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inject" = callPackage
@@ -76509,8 +78481,9 @@ self: {
        sha256 = "0rm81xkxfwbm98ywcwjnh1l9qkah3xma59l8z5l37b458hayxjqq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base process text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base process text ];
+       executableHaskellDepends = [ base text ];
+       testHaskellDepends = [
          attoparsec base hspec hspec-expectations process text
        ];
        description = "A minimalistic template engine";
@@ -76523,7 +78496,7 @@ self: {
        pname = "inject-function";
        version = "0.2.1.0";
        sha256 = "1iw82rzw2w3y40zndz3mxpa7k5ds8zs87ccvp228s4zva0mp5ddl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/skypers/inject-function";
        description = "Monadic functions with injected parameters";
@@ -76543,17 +78516,17 @@ self: {
        sha256 = "03b15dz0bm26bv9jkpjdgmqii3fw1ifj6zwmysibir50jxlbx9pk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring containers cryptohash
          directory filepath hashable mtl parsec parsers QuickCheck
          template-haskell transformers unordered-containers vector
        ];
-       testDepends = [
+       executableSystemDepends = [ gsl gslcblas ];
+       testHaskellDepends = [
          ansi-wl-pprint base containers hashable hspec parsers QuickCheck
          raw-strings-qq regex-posix template-haskell transformers
          unordered-containers vector
        ];
-       extraLibraries = [ gsl gslcblas ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) gsl;  gslcblas = null;};
@@ -76564,8 +78537,8 @@ self: {
        pname = "inline-c-cpp";
        version = "0.1.0.0";
        sha256 = "0iba77p2ncxbg5sb4ks8f3lgp6zdnjhzvrr2ap3yg49is5b9f5rf";
-       buildDepends = [ base inline-c template-haskell ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base inline-c template-haskell ];
+       testHaskellDepends = [ base ];
        description = "Lets you embed C++ code into Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -76578,7 +78551,9 @@ self: {
        pname = "inline-c-win32";
        version = "0.1";
        sha256 = "14255dn7smmm1rpnjifn7gn2amcncnf3j45ah22bblyb4h27iikm";
-       buildDepends = [ base containers inline-c template-haskell Win32 ];
+       libraryHaskellDepends = [
+         base containers inline-c template-haskell Win32
+       ];
        homepage = "https://github.com/anton-dessiatov/inline-c-win32";
        description = "Win32 API Context for the inline-c library";
        license = stdenv.lib.licenses.mit;
@@ -76592,7 +78567,7 @@ self: {
        sha256 = "18qcjdwgn7a1lrdnqnh6sh1bzii0nvb5jv56qq5kri8m6qwc9wl8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ aether base text ];
+       executableHaskellDepends = [ aether base text ];
        jailbreak = true;
        description = "Console client for encyclopedias";
        license = stdenv.lib.licenses.gpl3;
@@ -76605,7 +78580,7 @@ self: {
        pname = "inserts";
        version = "0.1.2";
        sha256 = "1m72ysfd2g2jszvcihh7zbfxvpj2a8qjq3ra4vs4bjzpja4kh477";
-       buildDepends = [ attoparsec base bytestring dlist ];
+       libraryHaskellDepends = [ attoparsec base bytestring dlist ];
        jailbreak = true;
        homepage = "http://github.com/tel/inserts";
        description = "Stupid simple bytestring templates";
@@ -76622,7 +78597,7 @@ self: {
        sha256 = "09mk2wd4bs31zhz0x8z3ajlk734r0rp5k07g0mfdy4bsvi2hdqiy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          async base bytestring cmdargs pipes pipes-network
        ];
        description = "A simple proxy for debugging plaintext protocols communication";
@@ -76637,8 +78612,8 @@ self: {
        pname = "instant-aeson";
        version = "0.1.0.1";
        sha256 = "18zxvd4sw13j4gn2f7r2xdy6p0xayjv3ks8j97j7vi6cdw9aqw2z";
-       buildDepends = [ aeson base instant-generics ];
-       testDepends = [
+       libraryHaskellDepends = [ aeson base instant-generics ];
+       testHaskellDepends = [
          aeson base instant-generics tasty tasty-quickcheck
        ];
        description = "Generic Aeson instances through instant-generics";
@@ -76653,8 +78628,8 @@ self: {
        pname = "instant-bytes";
        version = "0.1.0.1";
        sha256 = "1g99yakjychx12amls2b6cfma0fzh0n9w4m2k03wqibk1aagl940";
-       buildDepends = [ base bytes instant-generics ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytes instant-generics ];
+       testHaskellDepends = [
          base bytes instant-generics tasty tasty-quickcheck
        ];
        description = "Generic Serial instances through instant-generics";
@@ -76667,7 +78642,7 @@ self: {
        pname = "instant-deepseq";
        version = "0.1.0.1";
        sha256 = "1yv5zqv2fqj8b7qzx2004sa287mrvrswmghl13vsbj2whmdh0kjz";
-       buildDepends = [ base deepseq instant-generics ];
+       libraryHaskellDepends = [ base deepseq instant-generics ];
        description = "Generic NFData instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76677,14 +78652,13 @@ self: {
      mkDerivation {
        pname = "instant-generics";
        version = "0.5";
-       revision = "1";
        sha256 = "174avn0jjxv4h04m6k85gvv6x3kvrlwhcbhqg9ih0ps5mp7crmvr";
+       revision = "1";
        editedCabalFile = "c69a74fef28272e5e46a0e37711bb980ac07d2f3feeed3513da1cc572a1ab6bc";
-       buildDepends = [ base containers syb template-haskell ];
+       libraryHaskellDepends = [ base containers syb template-haskell ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
        description = "Generic programming library with a sum of products view";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "instant-hashable" = callPackage
@@ -76693,7 +78667,7 @@ self: {
        pname = "instant-hashable";
        version = "0.1.0.1";
        sha256 = "1yaf24r68zh5vsp73747hbv2fdk9y9vgswj6lv22s52s8h6f1agj";
-       buildDepends = [ base hashable instant-generics ];
+       libraryHaskellDepends = [ base hashable instant-generics ];
        description = "Generic Hashable instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76703,10 +78677,10 @@ self: {
      mkDerivation {
        pname = "instant-zipper";
        version = "0.0.0";
-       revision = "1";
        sha256 = "0gd5hzlm5rlmzba2dl37al711vp1nn2b30d36rvb2j8y90y8c44c";
+       revision = "1";
        editedCabalFile = "a0e15510d3e3eefaa18d20fbfce7a1840519e160e2a8a8b36c498a3664b9c037";
-       buildDepends = [ base instant-generics mtl ];
+       libraryHaskellDepends = [ base instant-generics mtl ];
        jailbreak = true;
        description = "Heterogenous Zipper in Instant Generics";
        license = "GPL";
@@ -76719,7 +78693,7 @@ self: {
        pname = "instinct";
        version = "0.1.0";
        sha256 = "0wh95zjdv9j1n3ccg2j08av43qnb9vmiyvqvyi70p47dr481npl8";
-       buildDepends = [ base containers mersenne-random vector ];
+       libraryHaskellDepends = [ base containers mersenne-random vector ];
        description = "Fast artifical neural networks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76730,7 +78704,7 @@ self: {
        pname = "instrument-chord";
        version = "0.1.0.9";
        sha256 = "0gq79i1mqpbyvxm8cfpr2b8h0knbc6f2m3b3mnm0p3yvi2d642nb";
-       buildDepends = [ array base containers music-diatonic ];
+       libraryHaskellDepends = [ array base containers music-diatonic ];
        homepage = "https://github.com/xpika/chord";
        description = "Render Instrument Chords";
        license = stdenv.lib.licenses.gpl3;
@@ -76744,8 +78718,8 @@ self: {
        pname = "int-cast";
        version = "0.1.2.0";
        sha256 = "0gfx3pg0n1jyn8z2q804iyc24ahi41sjr3h7v5ivzc3g57vi1ykb";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -76759,10 +78733,10 @@ self: {
      mkDerivation {
        pname = "integer-gmp";
        version = "1.0.0.0";
-       revision = "1";
        sha256 = "0sh01sbib7z0bx934a7gq6583hdz8yncaxpfi9k8y4v18gm8j55f";
+       revision = "1";
        editedCabalFile = "5d63fab9a7c94b4e713d151bdc0c361228efbac2b7583dfa8e6c5370ecae5663";
-       buildDepends = [ ghc-prim ];
+       libraryHaskellDepends = [ ghc-prim ];
        description = "Integer library based on GMP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76785,7 +78759,7 @@ self: {
        pname = "integration";
        version = "0.2.1";
        sha256 = "0bsqad6q4kc0wykswwqykcn6nd4wj6yd9dzpg075h2n1mmg3h9qc";
-       buildDepends = [ base parallel ];
+       libraryHaskellDepends = [ base parallel ];
        homepage = "https://github.com/ekmett/integration";
        description = "Fast robust numeric integration via tanh-sinh quadrature";
        license = stdenv.lib.licenses.bsd3;
@@ -76800,11 +78774,11 @@ self: {
        pname = "intel-aes";
        version = "0.2.1.1";
        sha256 = "11cy9dlynlz9mgbs4w4xfjb9dx05dklfjl3gg2130si8q2kk3cm9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal crypto-api DRBG largeword process random
          rdtsc split tagged time unix
        ];
-       extraLibraries = [ intel_aes ];
+       librarySystemDepends = [ intel_aes ];
        homepage = "https://github.com/rrnewton/intel-aes/wiki";
        description = "Hardware accelerated AES encryption and Random Number Generation";
        license = stdenv.lib.licenses.bsd3;
@@ -76817,7 +78791,7 @@ self: {
        pname = "interchangeable";
        version = "0.2.0.0";
        sha256 = "1r0gxwbl2k4i9r7jlbmabr1088q8nk1an4nhf79gsx2ybfdzlndh";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/arowM/interchangeable";
        description = "A type class for interchangeable data";
        license = stdenv.lib.licenses.mit;
@@ -76831,7 +78805,7 @@ self: {
        sha256 = "10clafccpg8xciqhj2hzbi4kixzprgp733396qf531nwakvnqpp2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory haskell-src hint mtl ];
+       executableHaskellDepends = [ base directory haskell-src hint mtl ];
        description = "Generates a version of a module using InterleavableIO";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76843,7 +78817,7 @@ self: {
        pname = "interleavableIO";
        version = "0.0.1";
        sha256 = "19jdrfr6n6yzvj1i8r7hhr3k6zkkbrs6pizqcbzhb0nvzzshmqa8";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Use other Monads in functions that asks for an IO Monad";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76855,7 +78829,7 @@ self: {
        pname = "interleave";
        version = "1.0";
        sha256 = "062ixqbrrmamwv3fj6vpfcxy35p37i1wpmsxk1gl9n06n0lg9a8c";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Combinators for supporting interleaving of different behaviours";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76866,7 +78840,7 @@ self: {
        pname = "interlude";
        version = "0.1.2";
        sha256 = "1yiv24n0mfjzbpm9p6djllhwck3brjz9adzyp6k4fpk430304k7s";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://malde.org/~ketil/";
        description = "Replaces some Prelude functions for enhanced error reporting";
        license = "GPL";
@@ -76880,7 +78854,7 @@ self: {
        pname = "intern";
        version = "0.9.1.4";
        sha256 = "0snjar5mil9zsyy1ml13a8p1g2cvq62c5r8547i6z451w06j1zk0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring hashable text unordered-containers
        ];
        homepage = "http://github.com/ekmett/intern/";
@@ -76898,7 +78872,7 @@ self: {
        sha256 = "1gn6vvrnhck9f9hzs8igdg20gvrvjnba00bj191paw02kpzbgx7z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base explicit-exception HPDF parsec process transformers utility-ht
        ];
        jailbreak = true;
@@ -76918,8 +78892,11 @@ self: {
        sha256 = "11awkl6rgy33yl4qcnf7ns464c87xjk9hqcf10z8shjjbaadbz43";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskell-src-exts regex-posix syb ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base haskell-src-exts regex-posix syb
+       ];
+       testHaskellDepends = [
          base haskell-src-exts HUnit regex-posix syb test-framework
          test-framework-hunit
        ];
@@ -76936,8 +78913,8 @@ self: {
        pname = "interpolate";
        version = "0.1.0";
        sha256 = "0wlc10qd1bq3xj64a3yq2gzds9kas9zyylkm9kxd46gy35fns6id";
-       buildDepends = [ base haskell-src-meta template-haskell ];
-       testDepends = [
+       libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
+       testHaskellDepends = [
          base bytestring haskell-src-meta hspec QuickCheck
          quickcheck-instances template-haskell text
        ];
@@ -76953,7 +78930,7 @@ self: {
        pname = "interpolatedstring-perl6";
        version = "1.0.0";
        sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring haskell-src-meta template-haskell text
        ];
        description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
@@ -76967,7 +78944,9 @@ self: {
        pname = "interpolatedstring-qq";
        version = "0.2";
        sha256 = "1bqn9gqc43r158hyk35x8avsiqyd43vlpw2jkhpdfmr2wx29jprq";
-       buildDepends = [ base haskell-src-meta-mwotton template-haskell ];
+       libraryHaskellDepends = [
+         base haskell-src-meta-mwotton template-haskell
+       ];
        description = "QuasiQuoter for Ruby-style multi-line interpolated strings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76980,7 +78959,9 @@ self: {
        pname = "interpolatedstring-qq-mwotton";
        version = "0.1.1";
        sha256 = "1cwhy4jwbl50nglfw0wfmdr3rrg33dqskw0wq06prx14x22yshbk";
-       buildDepends = [ base haskell-src-meta-mwotton template-haskell ];
+       libraryHaskellDepends = [
+         base haskell-src-meta-mwotton template-haskell
+       ];
        jailbreak = true;
        description = "DO NOT USE THIS. interpolatedstring-qq works now.";
        license = stdenv.lib.licenses.bsd3;
@@ -76995,8 +78976,10 @@ self: {
        sha256 = "1yip0fjhmd9gf9w7qi4yfpq38m51jn0i52zxil2hfc49r5aydlya";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base utility-ht ];
-       testDepends = [ array base containers QuickCheck utility-ht ];
+       libraryHaskellDepends = [ base utility-ht ];
+       testHaskellDepends = [
+         array base containers QuickCheck utility-ht
+       ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/interpolation/";
        description = "piecewise linear and cubic Hermite interpolation";
@@ -77011,8 +78994,8 @@ self: {
        pname = "intervals";
        version = "0.7.1";
        sha256 = "03ra3jkch26x4crsq6nh2wnj51jrx7zmwafmq22xqrpsg7hpav92";
-       buildDepends = [ array base distributive ghc-prim ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ array base distributive ghc-prim ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/ekmett/intervals";
        description = "Interval Arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -77030,7 +79013,7 @@ self: {
        sha256 = "0jlqxd7nwh3yvy5pni3w4a19wvn2xdrhhhfm9xkf4cs2rqnz525q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring containers cryptohash directory
          filepath hscurses mtl network-fancy random safe SDL SDL-gfx
          SDL-mixer SDL-ttf stm time transformers vector
@@ -77049,8 +79032,8 @@ self: {
        pname = "intset";
        version = "0.1.1.0";
        sha256 = "044nw8z2ga46mal9pr64vsc714n4dibx0k2lwgnrkk49729c7lk0";
-       buildDepends = [ base bits-extras bytestring deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base bits-extras bytestring deepseq ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "https://github.com/pxqr/intset";
@@ -77069,12 +79052,12 @@ self: {
        pname = "invariant";
        version = "0.2";
        sha256 = "0zxzpbha3z4z23xmsbgajjxk477ad1v28ml3rry0102lpcpvl6j1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bifunctors containers contravariant ghc-prim profunctors
          semigroups stm tagged template-haskell transformers
          transformers-compat unordered-containers
        ];
-       testDepends = [ base hspec QuickCheck ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/nfrisby/invariant-functors";
        description = "Haskell 98 invariant functors";
        license = stdenv.lib.licenses.bsd3;
@@ -77086,7 +79069,7 @@ self: {
        pname = "invertible-syntax";
        version = "0.2.1";
        sha256 = "0kyi7gq0a792v4lwmpq8i56vzwk6g7cjc3lbpxch47jsqv8lfhbp";
-       buildDepends = [ base partial-isomorphisms ];
+       libraryHaskellDepends = [ base partial-isomorphisms ];
        homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse";
        description = "Invertible syntax descriptions for both parsing and pretty printing";
        license = stdenv.lib.licenses.bsd3;
@@ -77098,7 +79081,7 @@ self: {
        pname = "io-capture";
        version = "0.3";
        sha256 = "03kjjsz1i1viwngmq9mvkzd43490g93mbkcvgjvcway2z5prv06f";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "capture IO action's stdout and stderr";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77111,11 +79094,11 @@ self: {
        pname = "io-choice";
        version = "0.0.5";
        sha256 = "19nr8kxcg98510cqgjn4c9sd8i9yz8fv4ryqg6lzzgpwqzkvx5ph";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control template-haskell transformers
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec lifted-base monad-control transformers
        ];
        description = "Choice for IO and lifted IO";
@@ -77130,7 +79113,8 @@ self: {
        sha256 = "0f21h36z2ls0d6g31pcf4kcyfninaxws8w159zy33bwa19saf2mz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        description = "Skeleton library around the IO monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77141,7 +79125,7 @@ self: {
        pname = "io-memoize";
        version = "1.1.1.0";
        sha256 = "0ga85wdvz67jjx8qh6f687kfikcrfmp7winn13v6na7vlaqs2ly7";
-       buildDepends = [ async base ];
+       libraryHaskellDepends = [ async base ];
        homepage = "https://github.com/DanBurton/io-memoize";
        description = "Memoize IO actions";
        license = stdenv.lib.licenses.bsd3;
@@ -77155,7 +79139,8 @@ self: {
        sha256 = "09iq8c86ql0hmzdf7i82lpdqa6nn6r0zy9lgryd6chkxd0kcpgvn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "An API for generating TIMBER style reactive objects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77167,8 +79152,8 @@ self: {
        pname = "io-region";
        version = "0.1.1";
        sha256 = "1w8m21zkhbhqr9lsdzwxfpy0jhb2ciybn3bvhyp3zlxkq9k3yc7f";
-       buildDepends = [ base stm ];
-       testDepends = [ base hspec transformers ];
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [ base hspec transformers ];
        homepage = "https://github.com/Yuras/io-region/wiki";
        description = "Exception safe resource management with dynamic regions";
        license = stdenv.lib.licenses.bsd3;
@@ -77180,7 +79165,7 @@ self: {
        pname = "io-storage";
        version = "0.3";
        sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://github.com/willdonnelly/io-storage";
        description = "A key-value store in the IO monad";
        license = stdenv.lib.licenses.bsd3;
@@ -77197,17 +79182,17 @@ self: {
        pname = "io-streams";
        version = "1.3.2.0";
        sha256 = "0gqj2adc3zlwz81wy38y8x4rihvhk4zm9xb0rd04a77nn15xlc0y";
-       buildDepends = [
+       configureFlags = [ "-fnointeractivetests" ];
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder network primitive
          process text time transformers vector zlib-bindings
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring bytestring-builder deepseq directory
          filepath HUnit mtl network primitive process QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time transformers vector zlib zlib-bindings
        ];
-       configureFlags = [ "-fnointeractivetests" ];
        description = "Simple, composable, and easy-to-use stream I/O";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77220,7 +79205,7 @@ self: {
        pname = "io-streams-http";
        version = "0.2.1.2";
        sha256 = "0ra3z236d4mbw2vqlx4zxpa5z53a7k1j2pmkwf3075ghgdavrmk3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-client http-client-tls io-streams mtl
          transformers
        ];
@@ -77233,11 +79218,11 @@ self: {
      mkDerivation {
        pname = "io-throttle";
        version = "0.1.0";
-       revision = "1";
        sha256 = "043plb9n606hkbdjddgk9kg12fzzs7ry063ckiky4zymy2vprcj9";
+       revision = "1";
        editedCabalFile = "c3903532515f76e374229ea572d11f7ab02a560062425f33649399c5ac61a16e";
-       buildDepends = [ base SafeSemaphore threads ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base SafeSemaphore threads ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/rodrigosetti/io-throttle";
        description = "Limit number of IO actions started per second";
        license = stdenv.lib.licenses.mit;
@@ -77249,7 +79234,7 @@ self: {
        pname = "ioctl";
        version = "0.0.1";
        sha256 = "0rwh7mlwdd24ndzz4b4vd5b5daz9cga47m9nz6g75m03iyy237qs";
-       buildDepends = [ base network unix ];
+       libraryHaskellDepends = [ base network unix ];
        description = "Type-safe I/O control package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -77260,7 +79245,7 @@ self: {
        pname = "iothread";
        version = "0.1.0.0";
        sha256 = "1nvysb0nmx42q0ilr09nzbsmr7mbbclhgl0iikibhhfb34r2afx0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/tattsun/iothread";
        description = "run IOs in a single thread";
@@ -77273,7 +79258,7 @@ self: {
        pname = "iotransaction";
        version = "0.1";
        sha256 = "0ylwrim2wfx3v03syd8v0iwf9kbw9154wlxsp8wc1d3n6sz7p1cc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://bitbucket.org/dshearer/iotransaction/";
        description = "Supports the automatic undoing of IO operations when an exception is thrown";
        license = stdenv.lib.licenses.mit;
@@ -77288,8 +79273,8 @@ self: {
        pname = "ip-quoter";
        version = "1.0.1.1";
        sha256 = "1819742yjdl96k2z8s55a5x9xw9mg4lps1dq1f55zvc31afkdi4l";
-       buildDepends = [ base cpu network template-haskell ];
-       testDepends = [ base cpu network tasty tasty-hunit ];
+       libraryHaskellDepends = [ base cpu network template-haskell ];
+       testHaskellDepends = [ base cpu network tasty tasty-hunit ];
        homepage = "https://github.com/shlevy/ip-quoter";
        description = "Quasiquoter for IP addresses";
        license = stdenv.lib.licenses.mit;
@@ -77303,7 +79288,7 @@ self: {
        sha256 = "08nwzas5r3b47chldc3dmwmwxam5dlmsyqqqmql7rjm87h645di4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cmdargs IPv6Addr text ];
+       executableHaskellDepends = [ base cmdargs IPv6Addr text ];
        homepage = "https://github.com/MichelBoucey/ip6addr";
        description = "Commandline tool to generate IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
@@ -77319,7 +79304,7 @@ self: {
        sha256 = "19yf0b82ifplja05if38llfs38mzmxxald89jc2yzqzzkvws9ldq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring darcs directory filepath hashed-storage process
          unix
        ];
@@ -77337,7 +79322,7 @@ self: {
        pname = "ipc";
        version = "0.0.5";
        sha256 = "0d1w62181s21ks63548i3jdfk4k1rg0hssnhkm97ymkrlcz6w68d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring dlist mtl network network-bytestring stm
        ];
        jailbreak = true;
@@ -77353,8 +79338,8 @@ self: {
        pname = "ipcvar";
        version = "0.0.1";
        sha256 = "085p03xk29wk03yfshpjvzkf2z79byhp9yy81vra1aci9nkgjr3n";
-       buildDepends = [ base binary bytestring directory unix ];
-       testDepends = [ base hspec unix ];
+       libraryHaskellDepends = [ base binary bytestring directory unix ];
+       testHaskellDepends = [ base hspec unix ];
        description = "Simple inter-process communication through IPCVars";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -77370,12 +79355,12 @@ self: {
        sha256 = "03cpn73ybkifkbl8dxbpyh17gv71jx9x53pkhi9wbfpqqz2ail9c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ad ansi-wl-pprint base containers lens mtl template-haskell
          uu-parsinglib vector vector-space
        ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ ipopt nlopt ];
+       libraryPkgconfigDepends = [ ipopt nlopt ];
+       libraryToolDepends = [ c2hs ];
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77387,7 +79372,7 @@ self: {
        pname = "ipprint";
        version = "0.5";
        sha256 = "0h75k21blbnzvp5l20qsima557dx6zfrww79y7qsqf04pbd81j7s";
-       buildDepends = [ base Extra haskell-src ];
+       libraryHaskellDepends = [ base Extra haskell-src ];
        description = "Tiny helper for pretty-printing values in ghci console";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77399,11 +79384,13 @@ self: {
      mkDerivation {
        pname = "iproute";
        version = "1.5.0";
-       revision = "1";
        sha256 = "0mr5dwzvsik5v59fy5lpnj6qabgc8cwbybil5hb6gqqvd0y26fz3";
+       revision = "1";
        editedCabalFile = "f601b3319004e7b4a4636c89996ea78fd084e9b10d15d679d7ae58e822fe19b8";
-       buildDepends = [ appar base byteorder containers network ];
-       testDepends = [
+       libraryHaskellDepends = [
+         appar base byteorder containers network
+       ];
+       testHaskellDepends = [
          appar base byteorder containers doctest hspec network QuickCheck
          safe
        ];
@@ -77422,9 +79409,10 @@ self: {
        sha256 = "13xv7g349ssgbz9c0g8q77hf52gp0v7nw9q665l697237jbvl57j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers mtl parsec QuickCheck safe syb utf8-string
+       libraryHaskellDepends = [
+         base containers mtl parsec safe utf8-string
        ];
+       executableHaskellDepends = [ base QuickCheck syb ];
        jailbreak = true;
        description = "iptables rules parser/printer library";
        license = stdenv.lib.licenses.bsd3;
@@ -77444,7 +79432,7 @@ self: {
        sha256 = "1ksnypq95xaybsb3vvhmabrh8l3c2c3mcqz83a61md9c1vw3n94m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          augeas base blaze-html blaze-markup bytestring ConfigFile
          containers file-embed filepath happstack-server
          happstack-server-tls hdaemonize hsyslog iptables-helpers mtl
@@ -77469,9 +79457,12 @@ self: {
        sha256 = "1dmmrkph3myc67wp4ibx2l10dkxpkgzh7i4shbjbqag39ljb0q60";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base bytestring cereal containers directory filepath mtl
-         parsec SHA tar text transformers uuid zeromq4-haskell
+       libraryHaskellDepends = [
+         aeson base bytestring cereal containers directory filepath mtl SHA
+         tar text transformers uuid zeromq4-haskell
+       ];
+       executableHaskellDepends = [
+         base filepath mtl parsec text transformers
        ];
        jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
@@ -77487,8 +79478,8 @@ self: {
        pname = "irc";
        version = "0.6.1.0";
        sha256 = "1q9p2qwfy9rsfyaja4x3gjr8ql2ka2ja5qv56b062bdkvzafl5iq";
-       buildDepends = [ attoparsec base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base bytestring ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -77502,7 +79493,7 @@ self: {
        pname = "irc-bytestring";
        version = "0.1";
        sha256 = "09n4y93x74wblbz89s1hwzmanwwi72cj0baz72485svarg55kid7";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        homepage = "https://github.com/kallisti-dev/irc-bytestring";
        description = "serialization and parsing of IRC messages";
        license = stdenv.lib.licenses.bsd3;
@@ -77517,14 +79508,13 @@ self: {
        pname = "irc-client";
        version = "0.2.4.0";
        sha256 = "137ix1x2qy92v5naaq3lz3iyvbxvf32gnsq09flddadx88d51vv6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit data-default-class irc-conduit irc-ctcp
          old-locale stm stm-conduit text time transformers
        ];
        homepage = "https://github.com/barrucadu/irc-client";
        description = "An IRC client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-colors" = callPackage
@@ -77533,7 +79523,7 @@ self: {
        pname = "irc-colors";
        version = "0.1";
        sha256 = "1xl38bq1b6w7z8q0frra4h76lyk63bsy5i1qd34pdgwvikd2rkh0";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        description = "Colourize your IRC strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77547,7 +79537,7 @@ self: {
        pname = "irc-conduit";
        version = "0.1.2.0";
        sha256 = "1mw418frhbnk7gncilvb2c3cj4fvzm5fvafq0p28vggxisda9bkp";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring conduit conduit-extra connection irc irc-ctcp
          network-conduit-tls text time tls transformers x509-validation
        ];
@@ -77567,16 +79557,20 @@ self: {
      mkDerivation {
        pname = "irc-core";
        version = "1.1.0.1";
-       revision = "3";
        sha256 = "01n10wcnq4h2wpmxl1rh9zgqayk3mllbz563fg8qw1k01n7q9257";
+       revision = "3";
        editedCabalFile = "a2be33ee630d69381c0103cf25743005688f53220d02552cc99ed7131eefdadf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array attoparsec base base64-bytestring bytestring config-value
-         connection containers data-default-class deepseq directory filepath
-         free haskell-lexer lens network old-locale split stm text time tls
-         transformers vty x509 x509-store x509-system x509-validation
+       libraryHaskellDepends = [
+         array attoparsec base base64-bytestring bytestring containers free
+         lens text time transformers
+       ];
+       executableHaskellDepends = [
+         array base bytestring config-value connection containers
+         data-default-class deepseq directory filepath haskell-lexer lens
+         network old-locale split stm text time tls transformers vty x509
+         x509-store x509-system x509-validation
        ];
        homepage = "https://github.com/glguy/irc-core";
        description = "An IRC client library and text client";
@@ -77589,7 +79583,7 @@ self: {
        pname = "irc-ctcp";
        version = "0.1.3.0";
        sha256 = "16mp9dpp57id760zc932dszd5r1ncskwwxrp0djka5r1alddjz6n";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/barrucadu/irc-ctcp";
        description = "A CTCP encoding and decoding library for IRC clients";
        license = stdenv.lib.licenses.mit;
@@ -77601,8 +79595,8 @@ self: {
        pname = "irc-fun-color";
        version = "0.1.0.0";
        sha256 = "1zb3d3m17049g7cfnpnl8c1ldyhhwvxh99dbfx1xzyadg841i08a";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://rel4tion.org/projects/irc-fun-color/";
        description = "Add color and style decorations to IRC messages";
        license = stdenv.lib.licenses.publicDomain;
@@ -77616,14 +79610,13 @@ self: {
        pname = "ircbot";
        version = "0.6.4";
        sha256 = "024wmkp08rni9frflpjl0p30ql6k1kj956j5dysz40xygajk8fmd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath irc mtl network
          parsec random SafeSemaphore stm time unix
        ];
        homepage = "http://hub.darcs.net/stepcut/ircbot";
        description = "A library for writing irc bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ircbouncer" = callPackage
@@ -77643,7 +79636,7 @@ self: {
        pname = "ireal";
        version = "0.2.1";
        sha256 = "0i9850l0k1w7vmdx4cs35789rf6j4i1xalpyrinf8x85f6c8mfxa";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        description = "Real numbers and intervals with relatively efficient exact arithmetic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77655,7 +79648,7 @@ self: {
        pname = "iron-mq";
        version = "0.1.1.0";
        sha256 = "1yi1ia4ii6xg17ndp0v47cix0ds6bbrsbf0pghcmx3y4b55v0dlr";
-       buildDepends = [ aeson base http-client lens text wreq ];
+       libraryHaskellDepends = [ aeson base http-client lens text wreq ];
        jailbreak = true;
        homepage = "https://github.com/arnoblalam/iron_mq_haskell";
        description = "Iron.IO message queueing client library";
@@ -77672,7 +79665,10 @@ self: {
        sha256 = "1dx0ljvfll8vb9rjdvx41vm4mrybafjch83xk7xs5fpvijjfp47l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         antisplice base chatty chatty-utils mtl transformers
+       ];
+       executableHaskellDepends = [
          antisplice base chatty chatty-utils mtl transformers
        ];
        homepage = "http://doomanddarkness.eu/pub/antisplice";
@@ -77686,8 +79682,8 @@ self: {
        pname = "is";
        version = "0.2";
        sha256 = "1ihrrpypdjhsr42nd9chyq730kllx239igjpa12m14458lnrcb2h";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        description = "Pattern predicates using TH";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77702,8 +79698,9 @@ self: {
        sha256 = "05f99nv4ydals0x1y39mswm3437s6bisdk63bgfzb89sgh0p9w1p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath ];
-       testDepends = [
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/tonymorris/isdicom";
@@ -77717,7 +79714,7 @@ self: {
        pname = "isevaluated";
        version = "0.3.0.2";
        sha256 = "10f09br33xy5ldl924kfnnlc5ilwq44hd17s2qdf9jm75q4sa7d5";
-       buildDepends = [ base vacuum ];
+       libraryHaskellDepends = [ base vacuum ];
        jailbreak = true;
        description = "Check whether a value has been evaluated";
        license = stdenv.lib.licenses.mit;
@@ -77732,7 +79729,7 @@ self: {
        sha256 = "0k0nyiicz87lvay95vligf563k1dgx93zds0f0kzqxn20miq480s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gtk3 ];
+       executableHaskellDepends = [ base gtk3 ];
        description = "A program to show the size of image and whether suitable for wallpaper";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77743,7 +79740,7 @@ self: {
        pname = "islink";
        version = "0.1.0.0";
        sha256 = "1mxfs8k0znc7v2iynjnhr4k5c9as4ip37ybvxnvjfqy4dld9rgyg";
-       buildDepends = [ base unordered-containers ];
+       libraryHaskellDepends = [ base unordered-containers ];
        homepage = "https://github.com/redneb/islink";
        description = "Check if an HTML element is a link";
        license = stdenv.lib.licenses.bsd3;
@@ -77757,7 +79754,7 @@ self: {
        pname = "ismtp";
        version = "4.0.2";
        sha256 = "0skyrp497p0gfh39j1ng7ahpbzfykfvykq720akafgnapgsfxkhm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers contstuff dnscache enumerator
          lifted-base monad-control netlines network vector
        ];
@@ -77772,7 +79769,7 @@ self: {
        pname = "iso3166-country-codes";
        version = "0.20140203.7";
        sha256 = "1cfmrkrx5wdcr8rrwakhmv0a5bxipxc3l7p4z5nxzl5nrjrli79s";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A datatype for ISO 3166 country codes";
        license = "LGPL";
      }) {};
@@ -77783,7 +79780,7 @@ self: {
        pname = "iso639";
        version = "0.1.0.3";
        sha256 = "1s15vb00nqxnmm59axapipib1snh6q5qhfdw7pgb9vdsz8i86jqj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/HugoDaniel/iso639";
        description = "ISO-639-1 language codes";
        license = stdenv.lib.licenses.bsd3;
@@ -77797,7 +79794,7 @@ self: {
        pname = "iso8583-bitmaps";
        version = "0.1.0.0";
        sha256 = "0w6m8ygpy1g95zvmbzq9402rxh4dj48i5bhcdzc4s0kig239gzqd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers parsec syb template-haskell
          th-lift
        ];
@@ -77811,8 +79808,8 @@ self: {
        pname = "iso8601-time";
        version = "0.1.3";
        sha256 = "05qwpcj4whibj0bmdnq0wns9ks5v4fqnsyq7sl2v36pd11h9i9zv";
-       buildDepends = [ base time ];
-       testDepends = [ base hspec HUnit time ];
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base hspec HUnit time ];
        homepage = "https://github.com/nh2/iso8601-time";
        description = "Convert to/from the ISO 8601 time format";
        license = stdenv.lib.licenses.mit;
@@ -77826,7 +79823,7 @@ self: {
        pname = "isohunt";
        version = "0.1.3";
        sha256 = "189dmxczmr0kqh440ziyp6kxx6iza2yyq7cs05hic9w8lhpwa6pw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default ghc-prim http-conduit text
          unordered-containers uri vector
        ];
@@ -77844,10 +79841,10 @@ self: {
        pname = "itanium-abi";
        version = "0.1.0.0";
        sha256 = "19ywiim8jjkpj2f7agvq98j4p7l1bw8lp2lmgimwq3bz17nrawwk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base boomerang text transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit process test-framework test-framework-hunit
        ];
        description = "An implementation of name mangling/demangling for the Itanium ABI";
@@ -77863,8 +79860,8 @@ self: {
        pname = "iter-stats";
        version = "0.1.0.4";
        sha256 = "1pfvxxps319ynfpaqgkiyk7gbpi4l2rfqzqyw27jhzlxx860yq71";
-       buildDepends = [ base heap iteratee ListLike mtl ];
-       testDepends = [
+       libraryHaskellDepends = [ base heap iteratee ListLike mtl ];
+       testHaskellDepends = [
          base heap HUnit iteratee ListLike mtl statistics test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -77883,11 +79880,11 @@ self: {
        pname = "iterIO";
        version = "0.2.2";
        sha256 = "0cq0awzl249m9kzgs0hzs49r2v29q4dhq3sbd818izvyqzfzz4zm";
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base bytestring containers filepath HsOpenSSL
          ListLike mtl network old-locale process stringsearch time unix
        ];
-       extraLibraries = [ zlib ];
+       librarySystemDepends = [ zlib ];
        jailbreak = true;
        homepage = "http://www.scs.stanford.edu/~dm/iterIO";
        description = "Iteratee-based IO with pipe operators";
@@ -77901,7 +79898,9 @@ self: {
        pname = "iterable";
        version = "3.0";
        sha256 = "194718jpjwkv3ynlpgjlpvf0iqnj7dkd3zmci363gsa425i3vlbc";
-       buildDepends = [ base mtl tagged template-haskell vector ];
+       libraryHaskellDepends = [
+         base mtl tagged template-haskell vector
+       ];
        homepage = "https://github.com/BioHaskell/iterable";
        description = "API for hierarchical multilevel collections";
        license = stdenv.lib.licenses.bsd3;
@@ -77917,11 +79916,11 @@ self: {
        pname = "iteratee";
        version = "0.8.9.6";
        sha256 = "1yc5fqqb8warvgld3cymka7d2wmjydvfin5jy7zaazb7alf14q1p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers exceptions ListLike monad-control
          parallel transformers transformers-base unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring exceptions HUnit ListLike monad-control mtl
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers transformers-base unix
@@ -77939,8 +79938,8 @@ self: {
        pname = "iteratee-compress";
        version = "0.3.3.1";
        sha256 = "1j5w3pfi8mx88wfg6fwrj5jccfp8spw0jwb4zh3yyzg1jacrpal4";
-       buildDepends = [ base bytestring iteratee mtl ];
-       extraLibraries = [ bzip2 zlib ];
+       libraryHaskellDepends = [ base bytestring iteratee mtl ];
+       librarySystemDepends = [ bzip2 zlib ];
        description = "Enumeratees for compressing and decompressing streams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77956,9 +79955,10 @@ self: {
        sha256 = "0a3f0m9lgc4ks18891a689bbb1c1kdrxswj42s5syvcq73y7v2h0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers ListLike MonadCatchIO-mtl mtl unix
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://inmachina.net/~jwlato/haskell/iteratee";
        description = "Iteratee-based I/O";
@@ -77973,7 +79973,7 @@ self: {
        pname = "iteratee-parsec";
        version = "0.0.6";
        sha256 = "1saffq3pl20fph6jdss6yzdgfaqxwb2183gb3qxj6cwsrblzz628";
-       buildDepends = [
+       libraryHaskellDepends = [
          base iteratee ListLike parsec reference transformers
        ];
        jailbreak = true;
@@ -77988,7 +79988,9 @@ self: {
        pname = "iteratee-stm";
        version = "0.1.2";
        sha256 = "1916phr07ckvm571rspswqr93z22la0mkxghvzljr0vgd1zi4p0x";
-       buildDepends = [ base iteratee stm stm-chans transformers ];
+       libraryHaskellDepends = [
+         base iteratee stm stm-chans transformers
+       ];
        jailbreak = true;
        homepage = "http://www.tiresiaspress.us/~jwlato/haskell/iteratee-stm";
        description = "Concurrent iteratees using STM";
@@ -78004,7 +80006,7 @@ self: {
        pname = "iterio-server";
        version = "0.3";
        sha256 = "1yz05y6i036irdbnsmhhr9lpcfk56ii6ls1fqdgh80h9giyi6c0n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring filepath iterIO ListLike monadIO mtl network split
          transformers unix
        ];
@@ -78021,10 +80023,9 @@ self: {
        pname = "ivar-simple";
        version = "0.3.1";
        sha256 = "1zn3nr0qmrnpr7jnpwgb4sancflbp9xmk2qyahl0d9vw7agqhwlm";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Write once concurrency primitives";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivor" = callPackage
@@ -78035,7 +80036,7 @@ self: {
        pname = "ivor";
        version = "0.1.14.1";
        sha256 = "0r9ykfkxpwsrhsvv691r361pf79a7y511hxy2mvd6ysz1441mych";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers directory haskell98 mtl parsec
        ];
        homepage = "http://www.dcs.st-and.ac.uk/~eb/Ivor/";
@@ -78052,7 +80053,7 @@ self: {
        pname = "ivory";
        version = "0.1.0.0";
        sha256 = "1rn1akrsci0k5nbk4zipxznkdm0y3rvv9la5mnrr9mkj5zikj5sc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers monadLib parsec pretty template-haskell th-lift
        ];
        jailbreak = true;
@@ -78071,7 +80072,7 @@ self: {
        pname = "ivory-backend-c";
        version = "0.1.0.1";
        sha256 = "12rcaanxl86wna05x1gdkpfj90azn1z74cs3kfk9cp5g3g230ii4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cmdlib containers directory filepath ivory
          ivory-opts language-c-quote mainland-pretty monadLib process srcloc
          template-haskell
@@ -78092,9 +80093,10 @@ self: {
        sha256 = "03qqax98qr2qyidc71i81f70lbma1s2q5jikl3m4ni4wyj3gg1m3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base ivory ivory-backend-c monadLib parsec template-haskell
        ];
+       executableHaskellDepends = [ base ivory ivory-backend-c ];
        jailbreak = true;
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory bit-data support";
@@ -78112,7 +80114,7 @@ self: {
        sha256 = "0jjcr72s616y8g4288fz506p1swrv06c2fmds28yd1rqc57g1mrm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ivory ivory-backend-c ivory-opts ivory-quickcheck ivory-stdlib
          mainland-pretty monadLib pretty QuickCheck template-haskell
          wl-pprint
@@ -78131,7 +80133,7 @@ self: {
        pname = "ivory-hw";
        version = "0.1.0.0";
        sha256 = "1sa0ayym7ng5q7i356n59p18qqpy9cr2xcsmgh96a7ni4srbrbsy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base filepath ivory ivory-backend-c ivory-bitdata
        ];
        jailbreak = true;
@@ -78148,7 +80150,7 @@ self: {
        pname = "ivory-opts";
        version = "0.1.0.1";
        sha256 = "08ywjwkd37dld6h355r6a36h72s94gai7hs2r4hj5nk5pm7k4s5z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dlist fgl filepath ivory monadLib
        ];
        jailbreak = true;
@@ -78164,7 +80166,7 @@ self: {
        pname = "ivory-quickcheck";
        version = "0.1.0.0";
        sha256 = "0jbfpsmz8kq0h9gg5lm44pcdzhv8kv2rr554m4bic2bny94hnsjd";
-       buildDepends = [ base ivory monadLib QuickCheck random ];
+       libraryHaskellDepends = [ base ivory monadLib QuickCheck random ];
        jailbreak = true;
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "QuickCheck driver for Ivory";
@@ -78178,7 +80180,7 @@ self: {
        pname = "ivory-stdlib";
        version = "0.1.0.0";
        sha256 = "1a3d9916rgrznr5ci79ki918xg6xxd81krn8irv9wbp8h8ird2xq";
-       buildDepends = [ base filepath ivory ];
+       libraryHaskellDepends = [ base filepath ivory ];
        jailbreak = true;
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory standard library";
@@ -78194,7 +80196,7 @@ self: {
        pname = "ivy-web";
        version = "0.2";
        sha256 = "0m2wd8lh22nqyjiijw9ldl6l17fbkj7b4n0j5ymgrs3yx2mnnv1q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base invertible-syntax partial-isomorphisms snap snap-core
        ];
        homepage = "https://github.com/lilac/ivy-web/";
@@ -78209,7 +80211,7 @@ self: {
        pname = "ix-shapable";
        version = "0.1.0";
        sha256 = "08ljlzywnw0h8ijwb6yh4r8l6z7bbknwxv9cjq7lkfx7m2vgy1sh";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Reshape multi-dimensional arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78222,7 +80224,7 @@ self: {
        sha256 = "1vknwznk42b33q4pmh6z620g761yf3cmsmrmhilgq42i5qhll4d4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base preprocessor-tools syb ];
+       executableHaskellDepends = [ base preprocessor-tools syb ];
        jailbreak = true;
        homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
        description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
@@ -78236,7 +80238,7 @@ self: {
        pname = "ixmonad";
        version = "0.57";
        sha256 = "1k8qfx9p6jw6gb4jsgq6y2bc6y6ah4h44gdgs0fxkrg371wyym7k";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78249,7 +80251,7 @@ self: {
        pname = "ixset";
        version = "1.0.6";
        sha256 = "097f9fkm9a2n67bzagr9h2v7acdn8h1ayv9c83n7nv1dh157bpyv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers safecopy syb syb-with-class template-haskell
        ];
        homepage = "http://happstack.com";
@@ -78266,10 +80268,10 @@ self: {
        pname = "ixset-typed";
        version = "0.3";
        sha256 = "0m6k5n755pfkx1grd5rbp1a9vlps6fdm25l91aa0wp5af1sakjmk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq safecopy syb template-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Efficient relational queries on Haskell sets";
@@ -78288,7 +80290,7 @@ self: {
        sha256 = "1jb97jzm9w8z8jyswbcr3kdraam95by6bc1gpjddwn817dijf0q4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers directory filepath haskeline
          haskell98 hoauth mtl old-locale parsec time utf8-string xml
        ];
@@ -78308,7 +80310,7 @@ self: {
        sha256 = "0fls5krx9l0c7g755b4yyksiki45hbb6v7m0y6nsmpd217rggkb2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bimap containers directory filepath hx java-bridge
          java-bridge-extras java-reflect mtl named-records split strict
          strings syb transformers
@@ -78330,11 +80332,11 @@ self: {
        sha256 = "12ap7xcgzmp5zwmqkwsgxplh5li21m7xngijr4mhnn9y33xc1lrk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring enumset event-list explicit-exception midi
          non-negative transformers unix
        ];
-       pkgconfigDepends = [ libjack2 ];
+       libraryPkgconfigDepends = [ libjack2 ];
        homepage = "http://www.haskell.org/haskellwiki/JACK";
        description = "Bindings for the JACK Audio Connection Kit";
        license = "GPL";
@@ -78346,9 +80348,9 @@ self: {
        pname = "jack-bindings";
        version = "0.1.1";
        sha256 = "1gmz2qiz7wzydj0rhswbfhwi0zbdcbps29l1lryzqxm8chfc9mbm";
-       buildDepends = [ base mtl ];
-       buildTools = [ c2hs ];
-       pkgconfigDepends = [ libjack2 ];
+       libraryHaskellDepends = [ base mtl ];
+       libraryPkgconfigDepends = [ libjack2 ];
+       libraryToolDepends = [ c2hs ];
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78360,7 +80362,7 @@ self: {
        pname = "jackminimix";
        version = "0.1";
        sha256 = "03ysmgg5f3dsimskqw5vpnrv5jg4gf1gd0khmf0s1ilfm1jc1nfd";
-       buildDepends = [ base hosc ];
+       libraryHaskellDepends = [ base hosc ];
        jailbreak = true;
        homepage = "http://www.renickbell.net/doku.php?id=jackminimix";
        description = "control JackMiniMix";
@@ -78374,8 +80376,8 @@ self: {
        pname = "jacobi-roots";
        version = "0.2.0.4";
        sha256 = "1skpw2jm5g0lylc79n5fk37d3lrvhwb3cmn50wcy4i5nnjvfdijc";
-       buildDepends = [ base binary bytestring vector ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base binary bytestring vector ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/ghorn/jacobi-roots";
        description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision";
        license = stdenv.lib.licenses.bsd3;
@@ -78389,7 +80391,7 @@ self: {
        pname = "jail";
        version = "0.0.1.1";
        sha256 = "0wxz3w5r1zc571ibyqskwk27ba1dafwwpr10psbsg44fj7ii3vvz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory monads-fd transformers
        ];
        jailbreak = true;
@@ -78402,12 +80404,12 @@ self: {
      mkDerivation {
        pname = "jailbreak-cabal";
        version = "1.3";
-       revision = "2";
        sha256 = "1i4a8azbq74r3pb4hvb816amy13z03afpq4jvyps3s399id6zhx2";
+       revision = "2";
        editedCabalFile = "eb10d8166cc3a40e8d731ab1fba7d37ef57d155d6122c7234297ddbf776ec28a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal ];
+       executableHaskellDepends = [ base Cabal ];
        homepage = "http://github.com/peti/jailbreak-cabal";
        description = "Strip version restrictions from build dependencies in Cabal files";
        license = stdenv.lib.licenses.bsd3;
@@ -78419,8 +80421,8 @@ self: {
        pname = "jalaali";
        version = "0.2.0";
        sha256 = "025ryrz87bii3401nq0bhyigzrs6lkippds6r4h0qzpq4pg8l7m0";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/jalaali/jalaali-hs";
        description = "Convert Jalaali and Gregorian calendar systems to each other";
@@ -78436,15 +80438,15 @@ self: {
        pname = "jalla";
        version = "0.2.0.1";
        sha256 = "122lf1j9hs81yzj6hdv7a7q56846h1ggasbjgvjnk8r34d0xsl40";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-orphans convertible mtl QuickCheck random
        ];
-       testDepends = [
+       librarySystemDepends = [ blas cblas lapacke ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
          base HUnit QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ blas cblas lapacke ];
        homepage = "https://github.com/cgo/jalla";
        description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
@@ -78462,11 +80464,12 @@ self: {
        sha256 = "1qfa90hi0kcylfw3p4m2qx5n4ni14426ssffj63hixqrqcnz60gx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base boxes bytestring conduit conduit-audio containers directory
-         filepath HPDF JuicyPixels process resourcet temporary text
-         transformers vector xml
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-audio containers directory filepath
+         HPDF JuicyPixels process resourcet temporary text transformers
+         vector xml
        ];
+       executableHaskellDepends = [ base boxes directory filepath ];
        homepage = "https://github.com/mtolly/jammittools";
        description = "Export sheet music and audio from Windows/Mac app Jammit";
        license = "GPL";
@@ -78483,7 +80486,10 @@ self: {
        sha256 = "0cfxq8k0k8r3wf4siypb78rqx5c9m2cm899bpa0zz591hc0p6k0w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base binary bytestring regex-tdfa zip-archive
+       ];
+       executableHaskellDepends = [
          array base binary bytestring regex-tdfa zip-archive
        ];
        description = "Tool for searching java classes, members and fields in classfiles and JAR archives";
@@ -78502,10 +80508,13 @@ self: {
        sha256 = "16nm5jn5y3rs3g1m524gn8xqxw13973cmpllmylh6qdpqcz47457";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bimap containers cpphs directory filepath hinduce-missingh
-         hint mtl multimap named-records names split strings syb
-         transformers unix
+       libraryHaskellDepends = [
+         base containers cpphs directory filepath hinduce-missingh mtl
+         multimap strings syb transformers unix
+       ];
+       executableHaskellDepends = [
+         base bimap containers directory filepath hint multimap
+         named-records names split strings syb
        ];
        description = "Bindings to the JNI and a high level interface generator";
        license = stdenv.lib.licenses.mit;
@@ -78518,7 +80527,7 @@ self: {
        pname = "java-bridge-extras";
        version = "0.99";
        sha256 = "0wjxm0h5xlsab7iphcabb66c7gjxy7hyb502inlj5zxq1ic5ghzv";
-       buildDepends = [ base java-bridge transformers ];
+       libraryHaskellDepends = [ base java-bridge transformers ];
        jailbreak = true;
        description = "Utilities for working with the java-bridge package";
        license = stdenv.lib.licenses.mit;
@@ -78531,7 +80540,7 @@ self: {
        pname = "java-character";
        version = "0.0.4";
        sha256 = "1ms8m95mara3pp7qdg8jn2ajbq3zj8pnbs1b9jhpxbdkl5220768";
-       buildDepends = [ base diet ];
+       libraryHaskellDepends = [ base diet ];
        homepage = "https://github.com/tonymorris/java-character";
        description = "Functions to simulate Java's Character class";
        license = stdenv.lib.licenses.bsd3;
@@ -78543,7 +80552,7 @@ self: {
        pname = "java-reflect";
        version = "0.99";
        sha256 = "1vdfq3c8chqhss6jiy139yrm45mij4kjdwxf2wrsfm4064j0n3wc";
-       buildDepends = [ base containers hx java-bridge ];
+       libraryHaskellDepends = [ base containers hx java-bridge ];
        jailbreak = true;
        description = "Tools for reflecting on Java classes";
        license = stdenv.lib.licenses.mit;
@@ -78560,8 +80569,12 @@ self: {
        sha256 = "0k8si8rdhplfhfp5yq7rlkifj80401qyanfhv101h8amxg20m97w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring language-java-classfile ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       executableHaskellDepends = [
+         base binary bytestring language-java-classfile
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "https://github.com/tonymorris/javasf";
        description = "A utility to print the SourceFile attribute of one or more Java class files";
        license = stdenv.lib.licenses.bsd3;
@@ -78576,8 +80589,10 @@ self: {
        sha256 = "1kzhp9gim9jl78jw8gm9vzxciiz6m04pjamgx1pqbhkji3lkw55d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "https://github.com/tonymorris/javav";
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
@@ -78592,7 +80607,7 @@ self: {
        pname = "jcdecaux-vls";
        version = "0.1.0";
        sha256 = "11army6p19xmdils32nxf5zbjh4fcsp075x7h3v2hbc08n6fkj8s";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-conduit text transformers
        ];
        jailbreak = true;
@@ -78611,9 +80626,10 @@ self: {
        sha256 = "1jznizbnyg37lir155sq84dbsqcaavz061hj2a703w9x28s6pcnb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers mtl network transformers
        ];
+       executableHaskellDepends = [ base mtl network ];
        jailbreak = true;
        homepage = "https://github.com/VictorDenisov/jdi";
        description = "Implementation of Java Debug Interface";
@@ -78633,12 +80649,15 @@ self: {
        sha256 = "0wka2wq89x6vzhvr93wrlc8dp7shd8jic11camrgpqqsqk3j0pnd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         arrows base bytestring cmdargs data-default-class
+       libraryHaskellDepends = [
+         arrows base bytestring data-default-class
          data-default-instances-base HTTP http-encodings hxt hxt-tagsoup
          language-ecmascript network network-uri random
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base cmdargs HTTP network network-uri
+       ];
+       testHaskellDepends = [
          arrows base Diff directory filepath hxt tasty tasty-golden
          transformers
        ];
@@ -78661,11 +80680,12 @@ self: {
        sha256 = "0b7l4h3apkj41w69wg3ympflh2l53vbmyvs6xf20xn57d6p8lhn4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers haskell-src-exts haskell-src-meta
-         mtl parseargs parsec regex-posix safe syb template-haskell text
+         mtl parsec regex-posix safe syb template-haskell text
          unordered-containers vector wl-pprint-text
        ];
+       executableHaskellDepends = [ parseargs ];
        description = "QuasiQuotation library for programmatic generation of Javascript code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78679,7 +80699,7 @@ self: {
        pname = "jmacro-rpc";
        version = "0.3.2";
        sha256 = "1nf5f62s749xsji2rg25dgj7mc668l3n7i7l9n1pjkn8gfwm6bx3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-html bytestring containers
          contravariant jmacro mtl scientific split text unordered-containers
          vector
@@ -78697,7 +80717,7 @@ self: {
        pname = "jmacro-rpc-happstack";
        version = "0.3.2";
        sha256 = "0r5h8hlsjppnhqdxa0dsrjkpv3pldbkv5v4dryd4km2v38yfxkcr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-html bytestring containers happstack-server jmacro
          jmacro-rpc mtl
        ];
@@ -78714,7 +80734,7 @@ self: {
        pname = "jmacro-rpc-snap";
        version = "0.3";
        sha256 = "1syzx2lw4r8knsqhsvilp04wb8a718379cmn0nhjqlwhpaja9bj8";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers jmacro jmacro-rpc mtl snap-core
        ];
        homepage = "http://hub.darcs.net/gershomb/jmacro-rpc";
@@ -78733,13 +80753,13 @@ self: {
        pname = "jobqueue";
        version = "0.1.5";
        sha256 = "0zfdh559qyzflrnh0gg23zfpw4vkp8qsx6syrblq2d0iknfybhir";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default
          fast-logger HDBC HDBC-sqlite3 hslogger hzk lifted-base
          monad-control monad-logger mtl network regex-posix split stm
          template-haskell text text-format time transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring data-default directory hspec network
          QuickCheck stm
        ];
@@ -78756,7 +80776,7 @@ self: {
        pname = "join";
        version = "0.4";
        sha256 = "0bx9cvdhhw7z30qgxwpl0j23z18sx7xyin2y7bwxvg5ga737j8qx";
-       buildDepends = [ base haskell98 multisetrewrite stm ];
+       libraryHaskellDepends = [ base haskell98 multisetrewrite stm ];
        homepage = "http://sulzmann.blogspot.com/2008/12/parallel-join-patterns-with-guards-and.html";
        description = "Parallel Join Patterns with Guards and Propagation";
        license = stdenv.lib.licenses.bsd3;
@@ -78769,7 +80789,7 @@ self: {
        pname = "joinlist";
        version = "0.3.0";
        sha256 = "0hjlyyylbh471696v9b1jckm7d4gfp1ka978sr1j0005d03gwv35";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "Join list - symmetric list type";
        license = stdenv.lib.licenses.bsd3;
@@ -78784,7 +80804,7 @@ self: {
        pname = "jonathanscard";
        version = "0.1.1";
        sha256 = "0zwd5mdwamyl6xlflhj0yvp9k5yfrxggvv49d3hriz9z15f5v5g8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers HTTP json mtl network old-locale time
        ];
        jailbreak = true;
@@ -78802,7 +80822,7 @@ self: {
        sha256 = "1c1nr8pq4vyn4mvyqms2mq1sm42qgr2mrznn5rsv34rd1f75b2d3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base gtk ];
+       executableHaskellDepends = [ array base gtk ];
        jailbreak = true;
        description = "JP's own ray tracer";
        license = "unknown";
@@ -78821,14 +80841,14 @@ self: {
        pname = "jose";
        version = "0.3.41.2";
        sha256 = "0pamg1wkp85zpwnbsvmsszy7nxsifl3zhbxvfmh44n0b6d2wg4w5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bifunctors byteable
          bytestring crypto-pubkey crypto-pubkey-types crypto-random
          cryptohash data-default-class ghc-prim integer-gmp lens network-uri
          safe semigroups template-haskell text time unordered-containers
          vector x509
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base base64-bytestring bifunctors byteable
          bytestring crypto-pubkey crypto-pubkey-types crypto-random
          cryptohash data-default-class hspec lens network-uri safe
@@ -78839,7 +80859,6 @@ self: {
        homepage = "https://github.com/frasertweedale/hs-jose";
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jose-jwt" = callPackage
@@ -78853,16 +80872,16 @@ self: {
      mkDerivation {
        pname = "jose-jwt";
        version = "0.6.2";
-       revision = "1";
        sha256 = "0fw3b34ghpjpm56iln1i46kr8dcj1yv8gmalgdl7ym7n9bvgrfzq";
+       revision = "1";
        editedCabalFile = "5aa6637a051160937328c7ff477615ff8424212374f46e41386c705e4db425c0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring byteable bytestring cereal cipher-aes
          containers crypto-cipher-types crypto-numbers crypto-pubkey
          crypto-pubkey-types crypto-random cryptohash either mtl text time
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-qq base base64-bytestring bytestring cipher-aes
          cprng-aes crypto-cipher-types crypto-pubkey crypto-pubkey-types
          crypto-random cryptohash doctest either hspec HUnit mtl QuickCheck
@@ -78871,7 +80890,6 @@ self: {
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jpeg" = callPackage
@@ -78880,7 +80898,7 @@ self: {
        pname = "jpeg";
        version = "0.0.1.1";
        sha256 = "1hnfapr21zpfyiywa4zzmwa518jzg73dnmaakrbvvpcmr4fvh9qx";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "A library for decoding JPEG files written in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78891,8 +80909,8 @@ self: {
        pname = "js-flot";
        version = "0.8.3";
        sha256 = "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv";
-       buildDepends = [ base ];
-       testDepends = [ base HTTP ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base HTTP ];
        homepage = "https://github.com/ndmitchell/js-flot#readme";
        description = "Obtain minified flot code";
        license = stdenv.lib.licenses.mit;
@@ -78904,7 +80922,7 @@ self: {
        pname = "js-good-parts";
        version = "0.0.7";
        sha256 = "0i3r3xl8hi2a3d6hrj77vbfi54bkq4pidrjcz13vz4az9dvz6k75";
-       buildDepends = [ base wl-pprint ];
+       libraryHaskellDepends = [ base wl-pprint ];
        homepage = "https://github.com/sseefried/js-good-parts.git";
        description = "Javascript: The Good Parts -- AST & Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
@@ -78917,8 +80935,8 @@ self: {
        pname = "js-jquery";
        version = "1.11.3";
        sha256 = "0my2ncql2vkdhxcqiw4jly957zkjdvbbw9jhf2dk6ndfnp81jyrx";
-       buildDepends = [ base ];
-       testDepends = [ base HTTP ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base HTTP ];
        homepage = "https://github.com/ndmitchell/js-jquery#readme";
        description = "Obtain minified jQuery code";
        license = stdenv.lib.licenses.mit;
@@ -78932,11 +80950,11 @@ self: {
        pname = "jsaddle";
        version = "0.2.0.6";
        sha256 = "1ggnhv9lgsd330p1k6zvg20dbqb1ysh282nalxramqvn2yhmqsx4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens template-haskell text transformers webkitgtk3
          webkitgtk3-javascriptcore
        ];
-       testDepends = [
+       testHaskellDepends = [
          base glib gtk3 hslogger lens template-haskell text transformers
          webkitgtk3 webkitgtk3-javascriptcore
        ];
@@ -78952,7 +80970,7 @@ self: {
        sha256 = "07kgjp35vbwljhyz9i49fbvbj4d05gn8swzynb0hd02bbsl5i0dp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ghcjs-dom jsaddle lens ];
+       executableHaskellDepends = [ base ghcjs-dom jsaddle lens ];
        jailbreak = true;
        homepage = "https://github.com/ghcjs/jsaddle-hello";
        description = "JSaddle Hello World, an example package";
@@ -78968,11 +80986,11 @@ self: {
        pname = "jsc";
        version = "0.1.1.1";
        sha256 = "18mvpncvsfv4gv7lx00g8aixjmhzp0yklxaajx45v2hsx0azn8zc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base jmacro lens template-haskell text transformers webkitgtk3
          webkitgtk3-javascriptcore
        ];
-       testDepends = [
+       testHaskellDepends = [
          base glib gtk3 hslogger jmacro lens template-haskell text
          transformers webkitgtk3 webkitgtk3-javascriptcore
        ];
@@ -78988,7 +81006,7 @@ self: {
        pname = "jsmw";
        version = "0.1";
        sha256 = "1r36w2h5007qln56gnyyd7w6bcqiymn1jw287z0waf4fhpy02ygq";
-       buildDepends = [ base DOM mtl WebBits ];
+       libraryHaskellDepends = [ base DOM mtl WebBits ];
        jailbreak = true;
        description = "Javascript Monadic Writer base package";
        license = stdenv.lib.licenses.bsd3;
@@ -79003,7 +81021,7 @@ self: {
        pname = "json";
        version = "0.9.1";
        sha256 = "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers mtl parsec pretty syb text
        ];
        description = "Support for serialising Haskell to and from JSON";
@@ -79018,7 +81036,7 @@ self: {
        pname = "json-assertions";
        version = "1.0.7";
        sha256 = "1x73szyqb6w1hnhb4ab8dfc7hwn12avj4304jnr8lyxjg08hfaqa";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base indexed indexed-free lens lens-aeson text
        ];
        homepage = "http://github.com/ocharles/json-assertions.git";
@@ -79038,12 +81056,17 @@ self: {
        sha256 = "11x6am3hqzhai0dm02pk20l5pk5bpj434z8ic4b8lksnv8l5zq46";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers filepath GenericPretty hashable
          hflags hint lens mtl pretty process scientific text uniplate
          unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring containers filepath GenericPretty hashable
+         hflags hint lens mtl pretty process scientific text uniplate
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
          aeson base bytestring containers directory filepath GenericPretty
          hashable hflags lens mtl pretty process QuickCheck scientific
          smallcheck text uniplate unordered-containers vector
@@ -79063,7 +81086,11 @@ self: {
        sha256 = "0wcvaswgffzvhfq7v5lqxp6xhxajaabbxkqpqxp5vwcv5slkiags";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring bytestring-nums bytestring-trie
+         bytestringparser-temporary containers utf8-string
+       ];
+       executableHaskellDepends = [
          base bytestring bytestring-nums bytestring-trie
          bytestringparser-temporary containers utf8-string
        ];
@@ -79082,7 +81109,7 @@ self: {
        pname = "json-builder";
        version = "0.3";
        sha256 = "0k8b93bqi68c7nwq09cws8kfm84kd4k5lpy4z9ifks1jaiyj3vxm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-textual bytestring containers text
          unordered-containers utf8-string vector
        ];
@@ -79100,7 +81127,7 @@ self: {
        pname = "json-enumerator";
        version = "0.0.1.2";
        sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-builder-enumerator bytestring containers
          enumerator json-types text transformers
        ];
@@ -79118,10 +81145,10 @@ self: {
      mkDerivation {
        pname = "json-extra";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "1wqn68brkjmix7xidcb7170ydpxwq1p48qqmm4w9ak0zkvm70fks";
+       revision = "1";
        editedCabalFile = "76113c3d47cb5d8087ffe18e1b09eaa22cc8dcd07010537739c7f1e4dc6b0741";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default template-haskell
          unordered-containers yaml
        ];
@@ -79139,11 +81166,11 @@ self: {
        pname = "json-fu";
        version = "0.1.1";
        sha256 = "098ps56igr12wm9hai3agh2hdmvd00rzpdd5lw0ffjivjxxfh829";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers hashable mtl syb text
          time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring containers hashable hspec mtl syb
          text time unordered-containers vector
        ];
@@ -79159,10 +81186,10 @@ self: {
        pname = "json-python";
        version = "0.4.0.1";
        sha256 = "0ga3clvmq20xlyx47bril651xg8rhq77s7nj6r1v836m3xwcb0y9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers pureMD5 template-haskell
        ];
-       pkgconfigDepends = [ python ];
+       libraryPkgconfigDepends = [ python ];
        jailbreak = true;
        homepage = "http://stewart.guru";
        description = "Call python inline from haskell";
@@ -79176,7 +81203,9 @@ self: {
        pname = "json-qq";
        version = "0.4.1";
        sha256 = "0rpfv0i4jhjkq39xcs3b89ms0w4il4l7f385msqj93qzj76is7m6";
-       buildDepends = [ base haskell-src-meta parsec template-haskell ];
+       libraryHaskellDepends = [
+         base haskell-src-meta parsec template-haskell
+       ];
        homepage = "http://github.com/finnsson/json-qq";
        description = "Json Quasiquatation library for Haskell";
        license = "unknown";
@@ -79193,12 +81222,12 @@ self: {
        pname = "json-rpc";
        version = "0.2.1.6";
        sha256 = "1y9c95qbvkg0r75y4dd0fvcy5r0bj08pklf7hl052ncwm87l9hln";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base bytestring conduit conduit-extra
          deepseq hashable mtl stm stm-conduit text transformers
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson async base bytestring conduit conduit-extra deepseq hashable
          mtl QuickCheck stm stm-conduit test-framework
          test-framework-quickcheck2 text unordered-containers
@@ -79222,11 +81251,11 @@ self: {
        sha256 = "1ma5vahbcfarbvc0m8n88i0hn9szbvanmfd81jmvwkamkqxxgmis";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring json-rpc-server mtl text unordered-containers
          vector vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring HUnit json-rpc-server mtl QuickCheck
          scientific test-framework test-framework-hunit
          test-framework-quickcheck2 text unordered-containers vector
@@ -79247,10 +81276,10 @@ self: {
        sha256 = "1rbm8anj3lg3x7gky5nazxcsdwd5c48b1axphgcqzzy5hn8hsg2r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring deepseq mtl text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring HUnit mtl test-framework test-framework-hunit
          text unordered-containers vector
        ];
@@ -79268,14 +81297,14 @@ self: {
      mkDerivation {
        pname = "json-schema";
        version = "0.7.3.7";
-       revision = "1";
        sha256 = "0lrr5zhydb2g36xlpr3mhn0m6bz138gbm0zih3f3qamnsm21mjk5";
+       revision = "1";
        editedCabalFile = "94b50ebb4b1aa921270db172dbef2ed18c85846d147d1526ec9c85ea0be1705a";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-utils attoparsec base bytestring generic-aeson tasty
          tasty-hunit tasty-th text vector
        ];
@@ -79291,7 +81320,7 @@ self: {
        pname = "json-sop";
        version = "0.1.0.4";
        sha256 = "02x65fh0s3gl8adij8xg8mgqp7p3jj4yjhhvch51zgbhcflsb7cv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base generics-sop lens-sop tagged text time transformers
          unordered-containers vector
        ];
@@ -79308,10 +81337,10 @@ self: {
        pname = "json-stream";
        version = "0.3.0.4";
        sha256 = "01hmy7xxlh79mspcx3xgmqlndj8p2mqdjlakr3sl4p837xdkhv2d";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring scientific text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring hspec scientific text unordered-containers
          vector
        ];
@@ -79330,7 +81359,7 @@ self: {
        pname = "json-togo";
        version = "0.1.1.0";
        sha256 = "0aw0dkv1scllj56vj9q07a44vfs88f3k5x1m80y0mivlpz0280l3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-trans base bytestring scientific text
          transformers unordered-containers vector
        ];
@@ -79349,7 +81378,7 @@ self: {
        sha256 = "13iyhsq4010ypgmlsdkdk93w8dhg6v0cllsf0avfaxkdva9lrqkf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base bytestring containers process tar text
          unordered-containers vector
        ];
@@ -79364,7 +81393,7 @@ self: {
        pname = "json-types";
        version = "0.1";
        sha256 = "088if9qv0didjyb6y1583viihjgc4nwr61qfjqdg9rzc2ya6vqdn";
-       buildDepends = [ base containers text ];
+       libraryHaskellDepends = [ base containers text ];
        description = "Basic types for representing JSON";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -79377,7 +81406,7 @@ self: {
        pname = "json2";
        version = "0.8.3";
        sha256 = "1w7x67cykbnr2h8jjjqd5whf7pq7vwk7r9g1q1i9g25b9b49i7r8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers json2-types mtl old-locale
          parsec pretty time utf8-string
        ];
@@ -79394,7 +81423,7 @@ self: {
        pname = "json2-hdbc";
        version = "0.5.1";
        sha256 = "1flbh68ymm39ccw5h9fiwy35qarn8zkxljmnjgg6fd39j8zbc3dj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HDBC json2 json2-types time utf8-string
        ];
        description = "Support JSON for SQL Database";
@@ -79408,7 +81437,7 @@ self: {
        pname = "json2-types";
        version = "0.1";
        sha256 = "0gr5mfi68hvk8wajw6wbimmwxd0rgjwqrg3mjyfppkr1nwkyfzpr";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Defined JSON data types and function for renders JSON to string";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79421,7 +81450,7 @@ self: {
        sha256 = "1ip9qgrzr59v3zxcj6l1dys0zbfj9s8fgdj4lv1grh7wbzdfz9dn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ aeson base bytestring yaml ];
+       executableHaskellDepends = [ aeson base bytestring yaml ];
        homepage = "http://github.com/snoyberg/json2yaml/tree/master";
        description = "Utility to convert a file from JSON to YAML format. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -79435,7 +81464,7 @@ self: {
        pname = "jsonresume";
        version = "0.1.0.1";
        sha256 = "14kv1cbjh1m9ri0vjj015hx6bx6l7jv71gpfa6n0fg21hh5fl7a4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring old-locale text time unordered-containers
        ];
        jailbreak = true;
@@ -79455,7 +81484,11 @@ self: {
        sha256 = "08mjwic7qbp241ydxiy5lm782igwd4ba27sii3csv4wdgdxgd3vy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit conduit-extra mtl text
+         transformers unordered-containers
+       ];
+       executableHaskellDepends = [
          aeson attoparsec base bytestring conduit conduit-extra mtl text
          transformers unordered-containers
        ];
@@ -79472,11 +81505,11 @@ self: {
        pname = "jsonschema-gen";
        version = "0.3.0.1";
        sha256 = "18hc6a7ihjpnnnjsx4r403w2zx2nzxa4qvj4picdw83r4sgjvv2d";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers scientific tagged text time
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers process tagged text
        ];
        homepage = "https://github.com/yuga/jsonschema-gen";
@@ -79495,7 +81528,7 @@ self: {
        sha256 = "1mr4xdwspza87kvaq4337k6hwzvrjxsr5bybdp1sv3x3fdg481ir";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base bytestring containers HUnit
          optparse-applicative scientific string-qq text unordered-containers
          vector
@@ -79517,7 +81550,7 @@ self: {
        sha256 = "0qilhv14q51g3dzsxk0zp5fp2igy7m79lq1qsk1myrd6iyannxc5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base bytestring containers csv
          optparse-applicative scientific string-qq text unordered-containers
          vector
@@ -79536,7 +81569,7 @@ self: {
        pname = "jspath";
        version = "0.1";
        sha256 = "072q6mipfaqf33w806chf2226zpay124lgph0wlgfdbhfd5118n7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-trie JSONb utf8-string
        ];
        description = "Extract substructures from JSON by following a path";
@@ -79552,9 +81585,9 @@ self: {
        pname = "judy";
        version = "0.2.3";
        sha256 = "1acw072v0lj2jkc6lffcigl1miy1r4wv52qxk6qql0wdg5ydjcjh";
-       buildDepends = [ base bytestring ghc-prim ];
-       testDepends = [ base hspec QuickCheck ];
-       extraLibraries = [ Judy ];
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       librarySystemDepends = [ Judy ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "http://github.com/mwotton/judy";
        description = "Fast, scalable, mutable dynamic arrays, maps and hashes";
        license = stdenv.lib.licenses.bsd3;
@@ -79572,11 +81605,16 @@ self: {
        sha256 = "07galk5i5lq4dx1njd5851c7jz4qwhw8da76ggxd91f9xpvkmf9y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory filepath hashable
          minisat mtl pretty process unordered-containers
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         array base binary bytestring containers directory filepath hashable
+         minisat mtl pretty process unordered-containers
+       ];
+       executableToolDepends = [ alex ];
        description = "A first-order reasoning toolbox";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79589,7 +81627,8 @@ self: {
        sha256 = "0ymp7hkkla7jxn3c7prsrcdl0mzkpqdm6ivq599qwx39rcnq6dpl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parallel ];
+       libraryHaskellDepends = [ base parallel ];
+       executableHaskellDepends = [ base parallel ];
        description = "an elementary symmetric chiffre for pragmatically protecting one's effects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79602,7 +81641,7 @@ self: {
        pname = "jvm-parser";
        version = "0.2.1";
        sha256 = "0rhixf1syrnhql3aqlvl9hcylaiyhca1yvismdzalkhbz0qdgvir";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers data-binary-ieee754 fgl
          fingertree pretty zlib
        ];
@@ -79621,12 +81660,12 @@ self: {
        pname = "jwt";
        version = "0.6.0";
        sha256 = "02nb1nz7rrgqgr9dg01gi2kh29hpy4mlwpvk5ziqcg3zkb0gl60w";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring containers cryptohash
          data-default http-types network network-uri scientific semigroups
          text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base64-bytestring bytestring containers cryptohash
          data-default http-types HUnit lens lens-aeson network network-uri
          QuickCheck scientific semigroups tasty tasty-hunit tasty-quickcheck
@@ -79646,11 +81685,11 @@ self: {
        pname = "kademlia";
        version = "1.1.0.0";
        sha256 = "0wjyslrhbms6cnm495g40yl6365h3vgjcka12lka8xdy89v3c0yy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl network stm transformers
          transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers HUnit mtl network QuickCheck stm tasty
          tasty-hunit tasty-quickcheck transformers transformers-compat
        ];
@@ -79668,10 +81707,10 @@ self: {
        pname = "kafka-client";
        version = "0.7.0.1";
        sha256 = "1577s3s9lf3rdw7xf7snfhiw53h6pg85l5h9l29av5fsg051ifai";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal digest dlist network snappy time zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal containers hspec hspec-discover network
          process QuickCheck temporary time
        ];
@@ -79689,7 +81728,7 @@ self: {
        pname = "kan-extensions";
        version = "4.2.2";
        sha256 = "0dqqlrzrhz8di5hp4kby3205inpj2r30bl75zyy24nq4hgans7g5";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions array base comonad containers contravariant
          distributive free mtl semigroupoids tagged transformers
        ];
@@ -79704,7 +81743,7 @@ self: {
        pname = "kangaroo";
        version = "0.4.0";
        sha256 = "1l7b71dhrxd2g3nbqg3h0n5dvgxr23av1cy1f0mvw347y91rx36x";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        jailbreak = true;
        homepage = "http://code.google.com/p/copperbox/";
        description = "Binary parsing with random access";
@@ -79720,7 +81759,7 @@ self: {
        pname = "kansas-comet";
        version = "0.3.1";
        sha256 = "0xbapi4clmkighxh0jb12zpzgrz9sqyfpwdkvrj6cdq6i6a22qx1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers data-default scotty stm text time
          transformers unordered-containers
        ];
@@ -79740,16 +81779,17 @@ self: {
      mkDerivation {
        pname = "kansas-lava";
        version = "0.2.4.3";
-       revision = "1";
        sha256 = "0i2k5jzirgn68g685azyjp2x96fd2mif56ghxvi566aa1qs5gw1v";
+       revision = "1";
        editedCabalFile = "7b1860125ab2958d3831cb2536a6b939879f09951199649182bb848e70b583eb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cmdargs containers data-default data-reify
          directory dotgen filepath netlist netlist-to-vhdl process random
          sized-types strict template-haskell
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "Kansas Lava is a hardware simulator and VHDL generator";
@@ -79767,10 +81807,11 @@ self: {
        sha256 = "076hd8c59hivdirpf4y5vgdlvhq74lfd5zm6np34y8hblq6jyl0m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava network sized-types
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "FPGA Cores Written in Kansas Lava";
        license = stdenv.lib.licenses.bsd3;
@@ -79786,7 +81827,7 @@ self: {
        pname = "kansas-lava-papilio";
        version = "0.3.1";
        sha256 = "0n8ffiygl72cbqza0whmkhsqyg6d7flfdz1jvr22g68x3005r00y";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava kansas-lava-cores netlist network sized-types
        ];
@@ -79803,7 +81844,7 @@ self: {
        pname = "kansas-lava-shake";
        version = "0.1.2";
        sha256 = "00xkrm724d7q5dmdgz41gm5s058b75rr4pgv3f6qkkx7g9qbd6d7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath hastache kansas-lava shake
          temporary text
        ];
@@ -79820,7 +81861,7 @@ self: {
        pname = "karakuri";
        version = "0.1.1";
        sha256 = "0ys4kx4pq9xrb4gjg6syyim8mpfy3yzyyiw2mdc4vh9hmsny373c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers minioperational mtl transformers
        ];
        jailbreak = true;
@@ -79837,10 +81878,10 @@ self: {
        pname = "karver";
        version = "0.1.2";
        sha256 = "0rbxhwxajcv8y6m0pz316r431jh5k8w3bcxqw117cnv6xkwgxpi1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base hspec text unordered-containers vector
        ];
        description = "A simple template engine, inspired by jinja2";
@@ -79858,11 +81899,12 @@ self: {
        sha256 = "1hvi23r9wgz77w6wl9nhpvkcbajm5m8kmy87pjmfgifj60d9cmhg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring ConfigFile containers directory errors
          filepath lens mtl parsec text url wreq zip-archive
        ];
-       testDepends = [ base bytestring directory mtl ];
+       executableHaskellDepends = [ base bytestring mtl ];
+       testHaskellDepends = [ base bytestring directory mtl ];
        jailbreak = true;
        homepage = "https://github.com/davnils/katt";
        description = "Client for the Kattis judge system";
@@ -79878,7 +81920,7 @@ self: {
        sha256 = "1skz1yllkwbpx4wd8w8q4zmqd3f62baaj5pja6dpqr2xviiv0j6g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://tcana.info/rpoku";
        description = "Rpoku spoken word programming language";
        license = "GPL";
@@ -79890,7 +81932,9 @@ self: {
        pname = "kd-tree";
        version = "0.1.0";
        sha256 = "0j9wlap9gx2szb5saa4pxm7mp2w132ki1p6mlcv0s0wy9rv6dnm7";
-       buildDepends = [ base lens linear vector vector-algorithms ];
+       libraryHaskellDepends = [
+         base lens linear vector vector-algorithms
+       ];
        jailbreak = true;
        homepage = "http://github.com/bgamari/kd-tree";
        description = "A simple k-d tree implementation";
@@ -79907,7 +81951,7 @@ self: {
        sha256 = "1n19jika26wgv7nhbbwnjjhmcbgqqag06k467r6q0s16ilp1p5nr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring cmdargs directory MissingH parsec
          process
        ];
@@ -79923,8 +81967,8 @@ self: {
        pname = "kdt";
        version = "0.2.3";
        sha256 = "0chxxl53jnnhfs02gxr2a3kzppmsnwrrfr1fjyx71lkvigwy71yk";
-       buildDepends = [ base deepseq deepseq-generics heap ];
-       testDepends = [ base deepseq deepseq-generics QuickCheck ];
+       libraryHaskellDepends = [ base deepseq deepseq-generics heap ];
+       testHaskellDepends = [ base deepseq deepseq-generics QuickCheck ];
        homepage = "https://github.com/giogadi/kdt";
        description = "Fast and flexible k-d trees for various types of point queries";
        license = stdenv.lib.licenses.mit;
@@ -79936,7 +81980,7 @@ self: {
        pname = "keera-callbacks";
        version = "0.1";
        sha256 = "1xgxg30za69nfk8y83bmskjq2w3r3afg4gc507wkn91xdah93niq";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Mutable memory locations with callbacks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79949,7 +81993,7 @@ self: {
        pname = "keera-hails-i18n";
        version = "0.0.3.3";
        sha256 = "0aih2mxgyfnrfnvqqsdv5g7r4jgjg5cfqykgalcsb9wqv0gq6d4i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath glib hgettext MissingK setlocale
          utf8-string
        ];
@@ -79964,7 +82008,7 @@ self: {
        pname = "keera-hails-mvc-controller";
        version = "0.0.3.3";
        sha256 = "00qr5czm0hq3jxwp42fc50v6r458rm9qq9fpri4rhnc41il79nzb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Gtk-based controller for MVC applications";
        license = stdenv.lib.licenses.bsd3;
@@ -79978,7 +82022,7 @@ self: {
        pname = "keera-hails-mvc-environment-gtk";
        version = "0.0.3.3";
        sha256 = "0bk3191x8bsvmmnqyf7jzmrlg71q26z2kn4xfahdnpgxw3qskwmr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base keera-hails-mvc-model-protectedmodel keera-hails-mvc-view
          keera-hails-mvc-view-gtk
        ];
@@ -79995,7 +82039,7 @@ self: {
        pname = "keera-hails-mvc-model-lightmodel";
        version = "0.0.3.4";
        sha256 = "085qppi68qf8jbkp674ldikhr5z4nrffzqa9kgdm1dngrgsib190";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers keera-hails-reactivevalues MissingK stm
          template-haskell
        ];
@@ -80013,7 +82057,7 @@ self: {
        pname = "keera-hails-mvc-model-protectedmodel";
        version = "0.0.3.5";
        sha256 = "14jm1116j3plzglxygjdymfy8z3p5k8zinnh8wazkxgc5y9kkcsx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers keera-hails-reactivevalues MissingK stm
          template-haskell
        ];
@@ -80028,7 +82072,7 @@ self: {
        pname = "keera-hails-mvc-solutions-config";
        version = "0.0.3.3";
        sha256 = "16c6nh5fqw2r42nxs3x27rqbpscypjzgqnprl99241giwcvy98x1";
-       buildDepends = [ base directory filepath MissingK ];
+       libraryHaskellDepends = [ base directory filepath MissingK ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Easy handling of configuration files";
        license = stdenv.lib.licenses.bsd3;
@@ -80045,7 +82089,7 @@ self: {
        pname = "keera-hails-mvc-solutions-gtk";
        version = "0.0.3.4";
        sha256 = "01sksznn8rxv4ww3p99qm8dhjlpy03ygavp512zmyrpvydhp86mm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gtk hslogger HTTP keera-hails-mvc-environment-gtk
          keera-hails-mvc-model-protectedmodel keera-hails-mvc-view
          keera-hails-mvc-view-gtk keera-hails-reactivevalues MissingK mtl
@@ -80062,7 +82106,7 @@ self: {
        pname = "keera-hails-mvc-view";
        version = "0.0.3.3";
        sha256 = "0jkwbpw23ba5z83nfk51hp8wsfkrbbiwr0f6bvx39wzz1v81n58p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Generic View for MVC applications";
        license = stdenv.lib.licenses.bsd3;
@@ -80074,7 +82118,9 @@ self: {
        pname = "keera-hails-mvc-view-gtk";
        version = "0.0.3.3";
        sha256 = "1yz4drm0r1831acg9y8glg7hgiqwgc5nqkz4hfgqgfngqs94jx4z";
-       buildDepends = [ base gtk gtk-helpers keera-hails-mvc-view ];
+       libraryHaskellDepends = [
+         base gtk gtk-helpers keera-hails-mvc-view
+       ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Gtk-based View for MVC applications";
        license = stdenv.lib.licenses.bsd3;
@@ -80088,12 +82134,13 @@ self: {
        pname = "keera-hails-reactive-fs";
        version = "0.0.3.4";
        sha256 = "1yinlhp08xxdlbnm90gnwbr1h9sp8r741ihd8kihy1yfqzkp85cy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory fsnotify keera-hails-reactivevalues system-filepath
        ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Files as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-gtk" = callPackage
@@ -80104,13 +82151,12 @@ self: {
        pname = "keera-hails-reactive-gtk";
        version = "0.0.3.6";
        sha256 = "1i7l330y10vf35b61y9r5wij0gm871n4bc6lij56nx20msi66ch4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gtk gtk-helpers keera-hails-reactivevalues mtl transformers
        ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-network" = callPackage
@@ -80119,7 +82165,9 @@ self: {
        pname = "keera-hails-reactive-network";
        version = "0.0.3.3";
        sha256 = "1379djvy5nn6k67ds7mk9jjh03zd6sj0v8sf5agmk3pf5cyp0xa3";
-       buildDepends = [ base keera-hails-reactivevalues network ];
+       libraryHaskellDepends = [
+         base keera-hails-reactivevalues network
+       ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Sockets as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
@@ -80132,7 +82180,9 @@ self: {
        pname = "keera-hails-reactive-polling";
        version = "0.0.3.3";
        sha256 = "1khkbhj94y6y5s2d56h718c8kh3y698wdryi2369mrw755dy6qh8";
-       buildDepends = [ base keera-callbacks keera-hails-reactivevalues ];
+       libraryHaskellDepends = [
+         base keera-callbacks keera-hails-reactivevalues
+       ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Polling based Readable RVs";
        license = stdenv.lib.licenses.bsd3;
@@ -80144,7 +82194,9 @@ self: {
        pname = "keera-hails-reactive-wx";
        version = "0.0.3.3";
        sha256 = "02ikqqfgwr3nrr18qdd1jshqm0dlnwbybqpzpj2ba7zbwpabd5bw";
-       buildDepends = [ base keera-hails-reactivevalues wx wxcore ];
+       libraryHaskellDepends = [
+         base keera-hails-reactivevalues wx wxcore
+       ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Fields for WX widgets";
        license = stdenv.lib.licenses.bsd3;
@@ -80158,7 +82210,7 @@ self: {
        pname = "keera-hails-reactive-yampa";
        version = "0.0.3.3";
        sha256 = "1n1xyr9pc1sw9gypwhh1rfdjshg7x1kvwr6v3hp0837zvdcz8gw1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base keera-callbacks keera-hails-reactivevalues time Yampa
        ];
        homepage = "http://www.keera.es/blog/community/";
@@ -80172,7 +82224,7 @@ self: {
        pname = "keera-hails-reactivevalues";
        version = "0.0.3.4";
        sha256 = "0qqp4ss0prl3z4bwrsd5jmbvdmhh7x3m846b58dd7ibb0bycp1pb";
-       buildDepends = [ base contravariant ];
+       libraryHaskellDepends = [ base contravariant ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Values";
        license = stdenv.lib.licenses.bsd3;
@@ -80195,7 +82247,7 @@ self: {
        sha256 = "0nlq68da3yfmp058j637xy25jjdwia8b1z49zf70rhdmyh8kvh60";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          allocated-processor base bytestring cmdargs containers
          cv-combinators directory filepath gio glib gtk gtk-helpers hgettext
          HOpenCV HTTP IfElse keera-hails-i18n keera-hails-mvc-controller
@@ -80224,7 +82276,7 @@ self: {
        sha256 = "0bwwsxav04dnipg5xvb8j4ncxbd5mw6r5gisn5avqjm34wr8y2b9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson ansi-terminal async base bytestring conduit conduit-extra
          directory filepath hslogger network optparse-applicative process
          text unix unordered-containers yaml
@@ -80251,7 +82303,7 @@ self: {
        sha256 = "0bsq6z7krisshcrkb528kixiw6liabb7chgk87088vn3gpwx048i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array async attoparsec base blaze-builder bytestring
          case-insensitive conduit conduit-extra containers data-default
          directory filepath fsnotify http-client http-conduit
@@ -80260,7 +82312,8 @@ self: {
          unix unix-compat unordered-containers vector wai wai-app-static
          wai-extra warp warp-tls yaml zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [ base data-default filepath ];
+       testHaskellDepends = [
          base bytestring conduit hspec HUnit transformers unix
        ];
        homepage = "http://www.yesodweb.com/";
@@ -80279,7 +82332,7 @@ self: {
        sha256 = "00hghd44h8d87kbf0j8ns78syz79a9sdwl454sb5n6ynq62fgwr1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base bytestring containers cprng-aes damnpacket
          data-default exceptions HTTP lens mtl network regex-pcre-builtin
          stm text time tls tls-extra
@@ -80295,7 +82348,7 @@ self: {
        pname = "keycode";
        version = "0.1";
        sha256 = "1cwj96mzxqagim3bcshzsrm2mxgmm8rrawy6hkvki9l55cggwbpv";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/RyanGlScott/keycode";
        description = "Maps web browser keycodes to their corresponding keyboard keys";
        license = stdenv.lib.licenses.bsd3;
@@ -80309,7 +82362,8 @@ self: {
        sha256 = "1j7nynr7sksrqdn4zfp9ikwx6vvlimlhwhifbs68igfdn03gxnrd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base udbus ];
+       libraryHaskellDepends = [ base udbus ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/lunaryorn/haskell-keyring";
        description = "Keyring access";
        license = stdenv.lib.licenses.mit;
@@ -80324,7 +82378,7 @@ self: {
        pname = "keys";
        version = "3.10.2";
        sha256 = "1xmyhsqpz4rvm2i8f8xgd1wpj8qlps0lvbif1li73lzg13jiwps2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base comonad containers free hashable semigroupoids
          semigroups transformers unordered-containers
        ];
@@ -80347,12 +82401,17 @@ self: {
        sha256 = "0hswqspbb0lmr33bz1d5f12fhs66i2ynynxii6qwcsrzjn77ps8j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty ansi-wl-pprint api-tools asn1-encoding
          asn1-types base base64-bytestring byteable bytestring cipher-aes
          containers crypto-pubkey crypto-random directory filepath lens mtl
-         old-locale optparse-applicative pbkdf process raw-strings-qq
-         regex-compat-tdfa safe setenv text time unordered-containers vector
+         old-locale optparse-applicative pbkdf regex-compat-tdfa safe setenv
+         text time unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint api-tools base bytestring directory filepath
+         mtl optparse-applicative process raw-strings-qq setenv text
+         unordered-containers
        ];
        homepage = "http://github.com/cdornan/keystore";
        description = "Managing stores of secret things";
@@ -80368,7 +82427,7 @@ self: {
        pname = "keyvaluehash";
        version = "0.3.1.2";
        sha256 = "1gph4cfx1xqjzhzx6nl2sfgqa6mk6a272a65gk5j43yjfh4s17gl";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring derive directory filepath hashable
          mmap storable-record
        ];
@@ -80386,8 +82445,13 @@ self: {
        sha256 = "18cj2l804d77mxzmdl2mai1a157yljskadqdlinmc9w9krhcx4jx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cassava containers parsec ];
-       testDepends = [ base containers hspec parsec parseerror-eq ];
+       libraryHaskellDepends = [ base containers parsec ];
+       executableHaskellDepends = [
+         base bytestring cassava containers parsec
+       ];
+       testHaskellDepends = [
+         base containers hspec parsec parseerror-eq
+       ];
        homepage = "https://github.com/stackbuilders/keyword-args";
        description = "Extract data from a keyword-args config file format";
        license = stdenv.lib.licenses.mit;
@@ -80413,10 +82477,10 @@ self: {
        pname = "kicad-data";
        version = "0.1.0.0";
        sha256 = "02bgz21jw76kzn57z2a7njbwz366j5hpjimyn7dw05h3c64gf8h1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ieee754 lens-family parsec parsec-numbers pretty-compact
        ];
-       testDepends = [
+       testHaskellDepends = [
          base ieee754 lens-family parsec parsec-numbers pretty-compact
          QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -80435,8 +82499,8 @@ self: {
        pname = "kickass-torrents-dump-parser";
        version = "0.0.1";
        sha256 = "1bqv07v5sx0jaalnzyk703g08js6sb2snvpsk6ld5zr6iqm7k4wk";
-       buildDepends = [ base bytestring cassava text vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring cassava text vector ];
+       testHaskellDepends = [
          base bytestring cassava hspec hspec-expectations string-qq text
          vector
        ];
@@ -80455,8 +82519,8 @@ self: {
        pname = "kickchan";
        version = "0.1.0.4";
        sha256 = "1gmp8d2gm275mc379rhyhyfk7r2z8d1mhaz0nikbg4wpczhqf0n7";
-       buildDepends = [ base containers primitive vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers primitive vector ];
+       testHaskellDepends = [
          base containers HUnit primitive QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -80475,7 +82539,7 @@ self: {
        sha256 = "1d8abd4l8mcgcfqmm06zmd7yxvfls1kqkphx64bi6mmqzy8lcx3k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs hostname old-time parsec twine
        ];
        description = "Process KIF iOS test logs";
@@ -80489,7 +82553,7 @@ self: {
        pname = "kinds";
        version = "0.0.1.5";
        sha256 = "169f2b0nn7mkjws6c5sb3mih2p6snhfq42bkfds3zxz01y53v2g5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/kinds";
        description = "Emulation of subkinds and subkind polymorphism";
        license = stdenv.lib.licenses.bsd3;
@@ -80506,7 +82570,7 @@ self: {
        sha256 = "0557v1js7bzd9a00lq078csr66pdrr4kr9qiign2zwz03rrcaviw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal attoparsec base cabal-file-th cmdargs containers
          directory errors filepath Glob mtl process text unix
          unordered-containers yaml
@@ -80523,7 +82587,7 @@ self: {
        pname = "kmeans";
        version = "0.1.3";
        sha256 = "02rc3bd2cp1fp0fxbzqiy34s5gn38j8hgviilz1584z05jhj97ix";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "K-means clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80536,8 +82600,8 @@ self: {
        pname = "kmeans-par";
        version = "1.5.1";
        sha256 = "087z1r9fljvysgl940qpnrf7any80fy33shmn8hbmn2kwgczn69c";
-       buildDepends = [ base metric parallel semigroups vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base metric parallel semigroups vector ];
+       testHaskellDepends = [
          base hspec metric normaldistribution parallel QuickCheck semigroups
          vector
        ];
@@ -80554,7 +82618,8 @@ self: {
        sha256 = "1ckw3dmwwqzgbl0wcd6h435afjddqmim3y19p2wqcghxd2rk8bdv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl probable vector ];
+       libraryHaskellDepends = [ base mtl vector ];
+       executableHaskellDepends = [ base probable vector ];
        homepage = "http://github.com/alpmestan/kmeans-vector";
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
        license = stdenv.lib.licenses.bsd3;
@@ -80566,7 +82631,7 @@ self: {
        pname = "knob";
        version = "0.1.1";
        sha256 = "05qj7s04p5pbasivyxc06l0jbii250zjnvb3l1y2sfhglb7q8b4c";
-       buildDepends = [ base bytestring transformers ];
+       libraryHaskellDepends = [ base bytestring transformers ];
        homepage = "https://john-millikin.com/software/knob/";
        description = "Memory-backed handles";
        license = stdenv.lib.licenses.mit;
@@ -80582,9 +82647,10 @@ self: {
        sha256 = "1yv26gnf8aipjh6d6apszbx4jwvfa7cafnjz0frw73xagnd1z084";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers data-default deepseq mtl parallel vector yap
        ];
+       executableHaskellDepends = [ base containers parallel ];
        jailbreak = true;
        description = "Khovanov homology computations";
        license = stdenv.lib.licenses.mit;
@@ -80596,8 +82662,8 @@ self: {
        pname = "koellner-phonetic";
        version = "0.0";
        sha256 = "0r7gbgvs49y1nyq5z5f2sb4sjfr847l1vrbih2f5975i3hd9c9kg";
-       buildDepends = [ base HUnit ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base HUnit ];
+       testHaskellDepends = [ base HUnit ];
        description = "\"map German words to code representing pronunciation\"";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80613,11 +82679,11 @@ self: {
        pname = "kontrakcja-templates";
        version = "0.1";
        sha256 = "020vcd04dxaxcd3bb9vwgw1qvxnz5gx590mjkbnnxrcjhl9yd9j8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory HStringTemplate html MissingH
          mtl old-time parsec transformers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory hslogger HStringTemplate HUnit MissingH
          mtl old-time string-templates syb test-framework
          test-framework-hunit test-framework-quickcheck2 time
@@ -80636,7 +82702,7 @@ self: {
        pname = "koofr-client";
        version = "1.0.0.3";
        sha256 = "1bz7akd7sssn1gzqfvr0y343771zk7dn1n3as0m93wg4ifpz1dia";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring filepath http-client http-client-tls
          http-types mtl
        ];
@@ -80653,7 +82719,9 @@ self: {
        sha256 = "1mwndf83yl57bawc6vk8983qca3yhcdiczj6q7n1rgv8qphnw0wz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bio bytestring haskell98 simpleargs ];
+       executableHaskellDepends = [
+         base bio bytestring haskell98 simpleargs
+       ];
        homepage = "http://blog.malde.org/";
        description = "The Korfu ORF Utility";
        license = "GPL";
@@ -80667,8 +82735,8 @@ self: {
        pname = "kqueue";
        version = "0.1.2.6";
        sha256 = "1q25ahsxsxrj8l99skymzssklj11d5prsa09b23dmbgc4qw28lg8";
-       buildDepends = [ base directory filepath mtl time unix ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base directory filepath mtl time unix ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "http://github.com/hesselink/kqueue";
        description = "A binding to the kqueue event library";
@@ -80684,7 +82752,7 @@ self: {
        pname = "kraken";
        version = "0.0.1";
        sha256 = "1df6g65wrhzfz3kj9n4bcja09adr4qhl3kzv5vaxl37lbr9nwzr2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls mtl
        ];
        description = "Kraken.io API client";
@@ -80701,11 +82769,11 @@ self: {
        pname = "krpc";
        version = "0.6.1.0";
        sha256 = "0ldhg4ahhfp4jy3ijssfmcwfg68dggw3biqmc4my2qrcgd2mvx29";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bencoding bytestring containers data-default-class lifted-base
          monad-control monad-logger mtl network text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bencoding bytestring hspec monad-logger mtl network QuickCheck
          quickcheck-instances
        ];
@@ -80720,7 +82788,7 @@ self: {
        pname = "ks-test";
        version = "0.1";
        sha256 = "1xj9bnwiws3rnax3rlf67p8dh487w07xl99h81a9j1wjkqysldym";
-       buildDepends = [ base gamma random-fu roots vector ];
+       libraryHaskellDepends = [ base gamma random-fu roots vector ];
        description = "Kolmogorov distribution and Kolmogorov-Smirnov test";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -80731,8 +82799,8 @@ self: {
        pname = "ktx";
        version = "0.2";
        sha256 = "1s7jw27p96spksja6ks2xdnhyds8diwc5y7h22bj6cq5kglskvxf";
-       buildDepends = [ base bytestring OpenGL ];
-       pkgconfigDepends = [ egl glew ];
+       libraryHaskellDepends = [ base bytestring OpenGL ];
+       libraryPkgconfigDepends = [ egl glew ];
        homepage = "https://github.com/corngood/ktx";
        description = "A binding for libktx from Khronos";
        license = stdenv.lib.licenses.mit;
@@ -80744,7 +82812,7 @@ self: {
        pname = "kure";
        version = "2.16.10";
        sha256 = "0xfnrp39w2ip9744898mfd63sbya8an72fx3nwj1s3vzdb1h3lhm";
-       buildDepends = [ base dlist transformers ];
+       libraryHaskellDepends = [ base dlist transformers ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html";
        description = "Combinators for Strategic Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -80756,7 +82824,7 @@ self: {
        pname = "kure-your-boilerplate";
        version = "0.1.3";
        sha256 = "0bfcmx1fz521vkc2lrbpyvaqcy4c29h5xp6wmyxvgrjjnq32ld1b";
-       buildDepends = [ base kure template-haskell ];
+       libraryHaskellDepends = [ base kure template-haskell ];
        jailbreak = true;
        homepage = "http://ittc.ku.edu/~andygill/kure.php";
        description = "Generator for Boilerplate KURE Combinators";
@@ -80770,8 +82838,8 @@ self: {
        pname = "kyotocabinet";
        version = "0.1.3";
        sha256 = "1wzwmfmh2cx3c9blnhk7ibsimwsnnxz9jpcdfdkgy5rb28wvvkyz";
-       buildDepends = [ base bytestring cereal ];
-       extraLibraries = [ kyotocabinet ];
+       libraryHaskellDepends = [ base bytestring cereal ];
+       librarySystemDepends = [ kyotocabinet ];
        description = "Mid level bindings to Kyoto Cabinet";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) kyotocabinet;};
@@ -80782,8 +82850,8 @@ self: {
        pname = "l-bfgs-b";
        version = "0.1.0.1";
        sha256 = "0ypzkq2rpbmdjfqba72pl3wf6d4wz0z5vmy84dq5m38ij5mlb4y7";
-       buildDepends = [ base vector ];
-       extraLibraries = [ lbfgsb ];
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ lbfgsb ];
        homepage = "http://nonempty.org/software/haskell-l-bfgs-b";
        description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization";
        license = stdenv.lib.licenses.bsd3;
@@ -80796,7 +82864,7 @@ self: {
        pname = "labeled-graph";
        version = "1.0.0.0";
        sha256 = "060nvnlh1h8vxi6k2hsz79fn4xypangdj5v4q0kc6abyf9garf7r";
-       buildDepends = [ base labeled-tree ];
+       libraryHaskellDepends = [ base labeled-tree ];
        description = "Labeled graph structure";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80808,7 +82876,7 @@ self: {
        pname = "labeled-tree";
        version = "1.0.0.0";
        sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Labeled tree structure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80824,10 +82892,14 @@ self: {
        sha256 = "18bgd9v4bh3wfh7p7xjzrsj130cppm6x55vzagcpn10cwqag41cs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async base bytestring cmdlib containers directory hslogger
          mtl old-locale parsec random split text time transformers uuid
        ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdlib containers directory hslogger mtl
+         random split text transformers uuid
+       ];
        jailbreak = true;
        homepage = "https://github.com/lucasdicioccio/laborantin-hs";
        description = "an experiment management framework";
@@ -80843,11 +82915,11 @@ self: {
        pname = "labyrinth";
        version = "0.5.0.0";
        sha256 = "1yi53vg248j8ww08z2a5v3agci84q3m2d37h9mdbprciryh3hfcl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers derive lens monad-loops MonadRandom mtl parsec
          random safecopy template-haskell transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers derive HTF HUnit lens monad-loops MonadRandom mtl
          parsec QuickCheck random safecopy template-haskell transformers
        ];
@@ -80872,14 +82944,14 @@ self: {
        sha256 = "00mx8zmwqawp2hh1a0v4r26w7wsji0iz7jwsh83742wimir316aw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          acid-state aeson base bytestring containers derive filepath hamlet
          labyrinth lens mtl parsec random safecopy shakespeare-css
          shakespeare-js template-haskell text transformers
          unordered-containers utf8-string vector wai-websockets warp
          websockets yesod yesod-static
        ];
-       testDepends = [
+       testHaskellDepends = [
          acid-state aeson base bytestring containers derive directory
          filepath hamlet HTF http-types HUnit labyrinth lens mtl parsec
          QuickCheck random safecopy shakespeare-css shakespeare-js
@@ -80903,8 +82975,10 @@ self: {
        pname = "lagrangian";
        version = "0.6.0.1";
        sha256 = "07jlmfynnq42syim9k7hks6zmkzq2i62slvwwik8w2rg07ran72v";
-       buildDepends = [ ad base hmatrix nonlinear-optimization vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         ad base hmatrix nonlinear-optimization vector
+       ];
+       testHaskellDepends = [
          ad base hmatrix HUnit nonlinear-optimization test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -80924,7 +82998,7 @@ self: {
        sha256 = "0brysrzz0cci6hqm5ldl7fk5zqhcjp7naifabks1zk3mzg8kr1x1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base-prelude either record system-fileio system-filepath
          template-haskell text transformers
        ];
@@ -80941,7 +83015,7 @@ self: {
        pname = "lambda-ast";
        version = "0.0.12";
        sha256 = "07i0fw7hvkzky9rwrnh4b3i35crbv4mkj0w001dwkgsh1flzh95f";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Lambda Calculi Abstract Syntax Trees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80954,7 +83028,8 @@ self: {
        sha256 = "0qiqw4av62fdf2b1qc64lvj84lkzcfpik7lvq81qk015pz58cbs3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/LambdaBridge";
        description = "A bridge from Haskell (on a CPU) to VHDL on a FPGA";
        license = stdenv.lib.licenses.bsd3;
@@ -80967,7 +83042,7 @@ self: {
        pname = "lambda-canvas";
        version = "0.1";
        sha256 = "14wl1w1sc0j1yjfad5v00346ccxp0grfs1677hnjqwisashdac92";
-       buildDepends = [ base GLUT mtl OpenGL time ];
+       libraryHaskellDepends = [ base GLUT mtl OpenGL time ];
        jailbreak = true;
        description = "Educational drawing canvas for FP explorers";
        license = stdenv.lib.licenses.mit;
@@ -80984,10 +83059,13 @@ self: {
        sha256 = "1j2j6clm35ffvdjlh7apydir06g7az40gsqvlcw8p4qbdk2z2vrh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base binary containers dimensional distributed-process
+       ];
+       executableHaskellDepends = [
          base binary containers dimensional distributed-process numtype
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary containers dimensional distributed-process HUnit
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -81004,7 +83082,7 @@ self: {
        pname = "lambda-options";
        version = "0.8.0.0";
        sha256 = "1z9gmps06w458v8i3zpkalby83p367r3z9i0c312jxl0zp51q891";
-       buildDepends = [ base containers mtl read-bounded ];
+       libraryHaskellDepends = [ base containers mtl read-bounded ];
        jailbreak = true;
        homepage = "https://github.com/thomaseding/lambda-options";
        description = "A modern command-line parser for Haskell";
@@ -81017,7 +83095,7 @@ self: {
        pname = "lambda-placeholders";
        version = "0.0.0.0";
        sha256 = "0s3y55yqa5js1q3rfq8dgdip6rnjag4w5j5vdldghq9ax5yph3gd";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mmirman/lambda-placeholders";
        description = "A library to emulate laceholders similar to Scala";
        license = stdenv.lib.licenses.bsd3;
@@ -81031,7 +83109,7 @@ self: {
        sha256 = "1m11gdwq4nma3231043h5szplmask5152y2r9ayyrpacczddcbim";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://scravy.de/blog/2012-02-20/a-lambda-toolbox-in-haskell.htm";
        description = "An application to work with the lambda calculus (for learning)";
        license = stdenv.lib.licenses.bsd3;
@@ -81046,7 +83124,7 @@ self: {
        sha256 = "0490yswk7zsyc2lskyqkwa98xsaj5a2cgw4pyxbg5920lyjqb3n8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ haskell2010 parsec ];
+       executableHaskellDepends = [ haskell2010 parsec ];
        homepage = "https://patch-tag.com/r/mkollar/lambda2js/";
        description = "Untyped Lambda calculus to JavaScript compiler";
        license = stdenv.lib.licenses.gpl3;
@@ -81059,8 +83137,8 @@ self: {
        pname = "lambdaBase";
        version = "0.0.2.0";
        sha256 = "19c2bxipilb2lag7qzk4ajlzqch574dbhqk9cna13ijsjiyq24nd";
-       buildDepends = [ base parsec ];
-       testDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
+       testHaskellDepends = [ base parsec ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -81073,7 +83151,7 @@ self: {
        sha256 = "0gji0jix99qbldqkclymnwf5pnmiszy0qka9m2wq8kyi09f3y4h8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 html ];
+       executableHaskellDepends = [ base haskell98 html ];
        homepage = "http://www.cse.unsw.edu.au/~chak/haskell/lambdaFeed/";
        description = "RSS 2.0 feed generator";
        license = "GPL";
@@ -81090,7 +83168,7 @@ self: {
        sha256 = "1xw1496q84wrzy1r3dwvwy04sb3184namnmdj5kspc5pmd8ipx0h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring haskeline lambdaBase mtl network
        ];
        description = "...";
@@ -81110,7 +83188,7 @@ self: {
        sha256 = "1kbrmxz5604jzcx9l6j4lmbb0xqz2cmj0f30nmpzdkmzsqv1hfj2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base lambdabot-core lambdabot-haskell-plugins lambdabot-irc-plugins
          lambdabot-misc-plugins lambdabot-novelty-plugins
          lambdabot-reference-plugins lambdabot-social-plugins
@@ -81118,7 +83196,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-core" = callPackage
@@ -81133,7 +83210,7 @@ self: {
        pname = "lambdabot-core";
        version = "5.0.3";
        sha256 = "12gawsimdqch61rh4zwvzrx6pqx8yd645wqpki8dr56wnmbhbr03";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dependent-map dependent-sum
          dependent-sum-template directory edit-distance filepath haskeline
          hslogger HTTP lifted-base monad-control mtl network parsec random
@@ -81159,7 +83236,7 @@ self: {
        pname = "lambdabot-haskell-plugins";
        version = "5.0.3";
        sha256 = "0iya4zipjjaqrld0a1v334praw1vnw186scfsi6inqdg314jc7x1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array arrows base bytestring containers data-memocombinators
          directory filepath haskell-src-exts hoogle HTTP IOSpec
          lambdabot-core lambdabot-reference-plugins lambdabot-trusted
@@ -81170,7 +83247,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -81182,7 +83258,7 @@ self: {
        pname = "lambdabot-irc-plugins";
        version = "5.0.3";
        sha256 = "1v4zh2yjdgy9ix6dmxdh8j5iqyrixaln78c5jgpiyjcwgi17blrw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath lambdabot-core
          lifted-base mtl network SafeSemaphore split time
        ];
@@ -81202,7 +83278,7 @@ self: {
        pname = "lambdabot-misc-plugins";
        version = "5.0.1";
        sha256 = "08dhwls7lgwrpyqzjxpg95cn80mqf3izrwnzbmygkp3my8xqxakp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers filepath hstatsd lambdabot-core
          lifted-base mtl network network-uri parsec process random random-fu
          random-source regex-tdfa SafeSemaphore split tagsoup
@@ -81223,14 +83299,13 @@ self: {
        pname = "lambdabot-novelty-plugins";
        version = "5.0.3";
        sha256 = "086y8p92a8g2zjjkxj1ny4s1dlza2dz1v64g3jg7p0dz1n1s1jpy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary brainfuck bytestring containers dice directory
          lambdabot-core misfortune process random-fu regex-tdfa unlambda
        ];
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-reference-plugins" = callPackage
@@ -81242,7 +83317,7 @@ self: {
        pname = "lambdabot-reference-plugins";
        version = "5.0.3";
        sha256 = "1yw1l0jl4iym2q2lfgzcmxm8865av37kf7zji0f7in2phqs3r1zz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers HTTP lambdabot-core mtl network
          network-uri oeis process regex-tdfa split tagsoup utf8-string
        ];
@@ -81259,7 +83334,7 @@ self: {
        pname = "lambdabot-social-plugins";
        version = "5.0.1";
        sha256 = "0ylp40j54whn4fsgxi0843mvs0gx286c5fm127ja1h7j6c74svkc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers lambdabot-core mtl split time
        ];
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
@@ -81273,7 +83348,7 @@ self: {
        pname = "lambdabot-trusted";
        version = "5.0.2.1";
        sha256 = "078yhq9d0vxgnc01hfa25kf4kdg4mymg9678jqmyk8csjy5gjw0h";
-       buildDepends = [ base oeis QuickCheck QuickCheck-safe ];
+       libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ];
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot trusted code";
        license = "GPL";
@@ -81287,10 +83362,10 @@ self: {
      mkDerivation {
        pname = "lambdabot-utils";
        version = "4.2.2";
-       revision = "3";
        sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7";
+       revision = "3";
        editedCabalFile = "f54d43d6964d63f1d8796606419b512a6e7b87b1defe960748c27c7417f59a08";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers haskell-src mtl network old-time
          process random regex-compat regex-posix syb tagsoup unix
          utf8-string zlib
@@ -81312,7 +83387,7 @@ self: {
        sha256 = "18m7z0lmi26ib1n1wrql96wb5i229k8fk3iw4vavs9j59b4pz1br";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cmdargs containers dyre glade gtk mtl network webkit
        ];
        jailbreak = true;
@@ -81333,19 +83408,18 @@ self: {
        pname = "lambdacms-core";
        version = "0.3.0.2";
        sha256 = "0m8piymzcciy4dqhxqxslpm1rbzasm1diasr8ab05r9lcrs1dn76";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring containers data-default esqueleto
          file-embed friendly-time gravatar lists mime-mail old-locale
          persistent shakespeare template-haskell text time uuid wai yesod
          yesod-auth yesod-core yesod-form
        ];
-       testDepends = [
+       testHaskellDepends = [
          base classy-prelude classy-prelude-yesod hspec yesod yesod-core
        ];
        homepage = "http://lambdacms.org";
        description = "LambdaCms 'core' subsite for Yesod apps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacms-media" = callPackage
@@ -81356,14 +83430,13 @@ self: {
        pname = "lambdacms-media";
        version = "0.4.0.0";
        sha256 = "0vq32qppnasc24jrjh6c19hr2pxby65c5m5k90fk7afyms307b5c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath lambdacms-core persistent shakespeare text
          time yesod yesod-form
        ];
        homepage = "http://lambdacms.org";
        description = "LambdaCms \"media\" extension";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube" = callPackage
@@ -81374,7 +83447,7 @@ self: {
        sha256 = "1qwwcbs7slddpjlz3dlyjr32xk66clcbxbnb6j1d5v5dz9mvjh3b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base editline mtl pretty ];
+       executableHaskellDepends = [ base editline mtl pretty ];
        description = "A simple lambda cube type checker";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81386,7 +83459,9 @@ self: {
        pname = "lambdacube-bullet";
        version = "0.2.1";
        sha256 = "1wnv8vgp100fdnx4g80d3gshbba9jni7rbjhhj8rx1mi0wcc1bcv";
-       buildDepends = [ base bullet lambdacube-engine mtl vector ];
+       libraryHaskellDepends = [
+         base bullet lambdacube-engine mtl vector
+       ];
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "Example for combining LambdaCube and Bullet";
        license = stdenv.lib.licenses.bsd3;
@@ -81401,7 +83476,7 @@ self: {
        pname = "lambdacube-core";
        version = "0.2.0";
        sha256 = "001nw31h61dawh036yk4w9b35aha6c6xdmsl4vdipnr3kwykgk9l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-trie containers mtl vector
        ];
        homepage = "http://lambdacube3d.wordpress.com/";
@@ -81417,7 +83492,7 @@ self: {
        pname = "lambdacube-edsl";
        version = "0.2.0";
        sha256 = "18lbkshc9wh7scb2bbvl565w6yryz7n1iy14r81cahnj7m68fj8m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-trie containers ghc-prim lambdacube-core
          mtl vector
        ];
@@ -81436,7 +83511,7 @@ self: {
        pname = "lambdacube-engine";
        version = "0.2.4";
        sha256 = "1xdp10nylndmfw16dywqrxj30g99rf9qbcx5qiglvzm1c1kxid3f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bitmap bytestring bytestring-trie containers
          directory filepath mtl OpenGLRaw stb-image uulib vect vector
          vector-algorithms xml zip-archive
@@ -81455,7 +83530,9 @@ self: {
        sha256 = "14l40ncbkblphmyn4prqiy2w70agcw830bpyawfdilf93bs340b9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base elerea GLFW-b lambdacube-engine mtl ];
+       executableHaskellDepends = [
+         base elerea GLFW-b lambdacube-engine mtl
+       ];
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "Examples for LambdaCube";
        license = stdenv.lib.licenses.bsd3;
@@ -81471,7 +83548,7 @@ self: {
        pname = "lambdacube-gl";
        version = "0.2.0";
        sha256 = "1r26gvpyfvk87wx1fpp6y5687q5y7pxzmjvm55r96m976200lz50";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bitmap bytestring bytestring-trie containers
          lambdacube-core lambdacube-edsl language-glsl mtl OpenGLRaw
          prettyclass vector
@@ -81480,7 +83557,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "OpenGL backend for LambdaCube graphics language (main package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-samples" = callPackage
@@ -81494,7 +83570,7 @@ self: {
        sha256 = "0zl9d524a81vg3h7f9cbfi34b0hw452bd30xmgvg9ayfwxa842d1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring bytestring-trie elerea GLFW-b lambdacube-core
          lambdacube-edsl lambdacube-gl mtl OpenGLRaw stb-image time vect
          vector
@@ -81520,7 +83596,7 @@ self: {
        sha256 = "01mqmhnq70k3yg29z492x7d6mzpwlijdrrgf0zbz8c8mlgnm4ljx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          acid-state authenticate-oauth base bytestring case-insensitive
          conduit containers data-default exceptions hint http-conduit
          http-types lens MissingH monad-control monad-logger mtl mueval
@@ -81544,7 +83620,7 @@ self: {
        sha256 = "0xlvz4r09vn1vdvs5wykry626hwcsg2zvdvl6jf6zrsq9331zcwy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring enumerator gtk mtl
        ];
        jailbreak = true;
@@ -81562,10 +83638,10 @@ self: {
        pname = "lame-tester";
        version = "1.2";
        sha256 = "1wa7h48a7hfb748i4chl2lpizrqmsdydg9vbwjf8gmy5cwlh816y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors containers semigroups validation
        ];
-       testDepends = [ base containers tasty tasty-hunit ];
+       testHaskellDepends = [ base containers tasty tasty-hunit ];
        homepage = "http://github.com/TheBizzle";
        description = "A strange and unnecessary selective test-running library";
        license = stdenv.lib.licenses.bsd3;
@@ -81580,7 +83656,7 @@ self: {
        sha256 = "14aiqk1l1d3bh7dcml4a85xg81583h3r30h5splw0lvcxmbggzp3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec syb ];
+       libraryHaskellDepends = [ base parsec syb ];
        homepage = "http://patch-tag.com/r/adept/language-asn1";
        description = "Parsing of ASN1 definitions";
        license = stdenv.lib.licenses.bsd3;
@@ -81592,7 +83668,7 @@ self: {
        pname = "language-bash";
        version = "0.6.0";
        sha256 = "07hb9hg4grmf01zlvfm583q9km4dxfgm4pkb9glihl3v7iqz21vs";
-       buildDepends = [ base parsec pretty transformers ];
+       libraryHaskellDepends = [ base parsec pretty transformers ];
        jailbreak = true;
        homepage = "http://github.com/knrafto/language-bash/";
        description = "Parsing and pretty-printing Bash shell scripts";
@@ -81611,7 +83687,11 @@ self: {
        sha256 = "166n9x3gil42w26r7p9d1jq6iy0yi9zacijkfmxj2gkkswyyb91x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers lens mtl parsec pretty random stream-monad
+         transformers
+       ];
+       executableHaskellDepends = [
          ansi-terminal base cmdargs containers filepath HUnit lens mtl
          parsec pretty random stream-monad time transformers
        ];
@@ -81630,11 +83710,11 @@ self: {
        pname = "language-c";
        version = "0.4.7";
        sha256 = "1r0jlncv6d6ai8kblrdq9gz8abx57b24y6hfh30xx20zdgccjvaz";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath pretty process
          syb
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        homepage = "http://www.sivity.net/projects/language.c/";
        description = "Analysis and generation of C code";
        license = stdenv.lib.licenses.bsd3;
@@ -81646,8 +83726,8 @@ self: {
        pname = "language-c-comments";
        version = "0.3";
        sha256 = "1rmciff72zpcq7pvbbxlsg2339dbk00k18vxp35sz8haql0jnrf2";
-       buildDepends = [ array base language-c ];
-       buildTools = [ alex ];
+       libraryHaskellDepends = [ array base language-c ];
+       libraryToolDepends = [ alex ];
        homepage = "http://github.com/ghulette/language-c-comments";
        description = "Extracting comments from C code";
        license = stdenv.lib.licenses.bsd3;
@@ -81662,11 +83742,11 @@ self: {
        pname = "language-c-inline";
        version = "0.7.9.1";
        sha256 = "0apxv1mcmglb3m06dchs25sc7bhgz6v4gv098yfb79qmjmsxpc33";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers filepath language-c-quote mainland-pretty
          template-haskell
        ];
-       testDepends = [ base language-c-quote ];
+       testHaskellDepends = [ base language-c-quote ];
        jailbreak = true;
        homepage = "https://github.com/mchakravarty/language-c-inline/";
        description = "Inline C & Objective-C code in Haskell for language interoperability";
@@ -81684,16 +83764,16 @@ self: {
        pname = "language-c-quote";
        version = "0.11";
        sha256 = "1v55pmzrsd7nvxdkik0fh5psbycx9cv4j5zwzlv872lzhfsr3lc7";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers exception-mtl
          exception-transformers filepath haskell-src-meta mainland-pretty
          mtl srcloc syb symbol template-haskell
        ];
-       testDepends = [
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
          base bytestring HUnit mainland-pretty srcloc symbol test-framework
          test-framework-hunit
        ];
-       buildTools = [ alex happy ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
        license = stdenv.lib.licenses.bsd3;
@@ -81705,7 +83785,7 @@ self: {
        pname = "language-cil";
        version = "0.2.2";
        sha256 = "0b3yapn53bwaxia7b59kizzcxh1d3842as1cbkyzd096v8wsgwfa";
-       buildDepends = [ base bool-extras ];
+       libraryHaskellDepends = [ base bool-extras ];
        jailbreak = true;
        homepage = "https://github.com/tomlokhorst/language-cil";
        description = "Manipulating Common Intermediate Language AST";
@@ -81718,7 +83798,7 @@ self: {
        pname = "language-css";
        version = "0.0.3";
        sha256 = "1g0mh08rz44533473isrqbfn6hp12np9dxm85cn5xpx68jl9ni9g";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        description = "CSS 2.1 syntax";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81731,7 +83811,7 @@ self: {
        sha256 = "0cjjfm7mcsl0x5by7gvbsdrr92x88i8sadb4pz6qh618sgrci7ax";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl parsec pretty ];
+       libraryHaskellDepends = [ base mtl parsec pretty ];
        description = "A library for the analysis and creation of Graphviz DOT files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81746,11 +83826,11 @@ self: {
        pname = "language-ecmascript";
        version = "0.17.0.1";
        sha256 = "1yawnk6ylx7g9fgx2ib11dgkwkpaz2cy3iph84pxzgqw30yh9q4l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default-class Diff mtl parsec QuickCheck
          template-haskell testing-feat uniplate wl-pprint
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers data-default-class Diff directory filepath HUnit
          mtl parsec QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 uniplate wl-pprint
@@ -81768,7 +83848,7 @@ self: {
        pname = "language-ecmascript-analysis";
        version = "0.9.1";
        sha256 = "04zc3iwls4hxlsa2c77an5q1h0xylndld02sn38sgykx6ibmmy9n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers language-ecmascript parsec uniplate
        ];
        homepage = "http://github.com/jswebtools/language-ecmascript-analysis";
@@ -81785,11 +83865,11 @@ self: {
        pname = "language-eiffel";
        version = "0.1.2";
        sha256 = "1v3m31ffx4pmgq92ahvlyzsh9hjvrdsmyzhd61qxzgpn3z9zzlcm";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers deepseq derive ghc-prim
          hashable lens mtl parsec pretty text unordered-containers
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
        homepage = "https://github.com/scottgw/language-eiffel";
        description = "Parser and pretty printer for the Eiffel language";
        license = stdenv.lib.licenses.bsd3;
@@ -81803,8 +83883,8 @@ self: {
        pname = "language-fortran";
        version = "0.3";
        sha256 = "0csp0nmiwb2kflahhnnjxa7gmam3k9c4ivvh2wg919x85yp7v40z";
-       buildDepends = [ array base haskell-src parsec syb ];
-       buildTools = [ alex happy ];
+       libraryHaskellDepends = [ array base haskell-src parsec syb ];
+       libraryToolDepends = [ alex happy ];
        description = "Fortran lexer and parser, language support, and extensions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81815,7 +83895,7 @@ self: {
        pname = "language-gcl";
        version = "0.2";
        sha256 = "12yh49zh9wissms20rbvgzw5i5wlc8m1iqwkxg68f52g7mk6clrf";
-       buildDepends = [ base bifunctors parsers ];
+       libraryHaskellDepends = [ base bifunctors parsers ];
        jailbreak = true;
        description = "Something similar to Dijkstra's guarded command language";
        license = stdenv.lib.licenses.mit;
@@ -81831,8 +83911,9 @@ self: {
        sha256 = "1wmfzif1cc3a8sls3swms9x54hm9ic8y301zav6fg4mr7xa4hqr3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec prettyclass ];
-       testDepends = [
+       libraryHaskellDepends = [ base parsec prettyclass ];
+       executableHaskellDepends = [ base parsec prettyclass ];
+       testHaskellDepends = [
          base HUnit parsec prettyclass test-framework test-framework-hunit
        ];
        description = "GLSL abstract syntax tree, parser, and pretty-printer";
@@ -81845,7 +83926,7 @@ self: {
        pname = "language-go";
        version = "0.8";
        sha256 = "1p545115x73q4mzfja50f4lxal97ydvz9r3wq6pvcqls2xgvxzvc";
-       buildDepends = [ array base parsec utf8-string ];
+       libraryHaskellDepends = [ array base parsec utf8-string ];
        jailbreak = true;
        description = "A library for analysis and synthesis of Go code";
        license = "GPL";
@@ -81858,7 +83939,7 @@ self: {
        pname = "language-guess";
        version = "0.1.2";
        sha256 = "0gdnkc1hb0mcn494vk9r7fw19hvaba807brwh6fna0sxyh2nx3p0";
-       buildDepends = [ base bytestring cereal containers ];
+       libraryHaskellDepends = [ base bytestring cereal containers ];
        description = "Guess at which language a text is written in using trigrams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81869,7 +83950,7 @@ self: {
        pname = "language-haskell-extract";
        version = "0.2.4";
        sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl";
-       buildDepends = [ base regex-posix template-haskell ];
+       libraryHaskellDepends = [ base regex-posix template-haskell ];
        homepage = "http://github.com/finnsson/template-helper";
        description = "Module to automatically extract functions from the local code";
        license = stdenv.lib.licenses.bsd3;
@@ -81877,19 +83958,19 @@ self: {
 
   "language-java" = callPackage
     ({ mkDerivation, alex, array, base, cpphs, directory, filepath
-     , HUnit, mtl, parsec, pretty, QuickCheck, syb, test-framework
+     , HUnit, mtl, parsec, pretty, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "language-java";
        version = "0.2.7";
        sha256 = "1519grsjw0f4skldxs563qz07mmj1cg72ma0plmvzpas7inkikyf";
-       buildDepends = [ array base cpphs parsec pretty syb ];
-       testDepends = [
+       libraryHaskellDepends = [ array base cpphs parsec pretty ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [
          base directory filepath HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       buildTools = [ alex ];
        homepage = "http://github.com/vincenthz/language-java";
        description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
@@ -81904,7 +83985,7 @@ self: {
        pname = "language-java-classfile";
        version = "0.2.0";
        sha256 = "0pzlvzx5rv006mn88b15zvvrhf7h681xpl166368b92dc0x85gcf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers data-binary-ieee754
          data-flags deepseq language-java LibZip mtl parsec utf8-string
        ];
@@ -81922,15 +84003,15 @@ self: {
        pname = "language-javascript";
        version = "0.5.14.2";
        sha256 = "0inm6yncl5dv9ij3fyk38c6mad8fm1vqs70rpqi1a7w2n5cbv1ia";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base blaze-builder bytestring containers mtl utf8-string
        ];
-       testDepends = [
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
          array base blaze-builder bytestring Cabal containers HUnit mtl
          QuickCheck test-framework test-framework-hunit utf8-light
          utf8-string
        ];
-       buildTools = [ alex happy ];
        homepage = "http://github.com/erikd/language-javascript";
        description = "Parser for JavaScript";
        license = stdenv.lib.licenses.bsd3;
@@ -81945,12 +84026,12 @@ self: {
        pname = "language-kort";
        version = "0.1.0.0";
        sha256 = "0dhrzd470hfvkjpizgg9czgyz80nc9sq86r2zcimsch6rxmid0i0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring random razom-text-util
          regex-applicative smaoin text text-position utf8-string
          vocabulary-kadma
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring QuickCheck smaoin text vocabulary-kadma
        ];
        homepage = "http://rel4tion.org/projects/language-kort/";
@@ -81967,12 +84048,12 @@ self: {
        pname = "language-lua";
        version = "0.6.3.2";
        sha256 = "0wnmybaqiwwxg8xcs7g1ffsmv8kmld7m6s0a8wp0lvhdil7d9xq6";
-       buildDepends = [ array base deepseq mtl parsec safe ];
-       testDepends = [
+       libraryHaskellDepends = [ array base deepseq mtl parsec safe ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [
          base deepseq directory filepath parsec QuickCheck tasty tasty-hunit
          tasty-quickcheck
        ];
-       buildTools = [ alex ];
        homepage = "http://github.com/osa1/language-lua";
        description = "Lua parser and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
@@ -81986,7 +84067,8 @@ self: {
        sha256 = "0fgjkx003bn0bi4z6rgg8yvsl8k8almydh2lajkyp6zi5348vcv5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl parsec pretty ];
+       libraryHaskellDepends = [ base mtl parsec pretty ];
+       executableHaskellDepends = [ base pretty ];
        homepage = "http://github.com/jtdaugherty/language-mixal/";
        description = "Parser, pretty-printer, and AST types for the MIXAL assembly language";
        license = stdenv.lib.licenses.bsd3;
@@ -82001,11 +84083,11 @@ self: {
        pname = "language-objc";
        version = "0.4.2.8";
        sha256 = "0dqx8fzbh53kakbh62zmq3x4gx4p5zfwisi3z6n03mjyfv3wv6jv";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath newtype pretty
          process syb
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        jailbreak = true;
        homepage = "http://www.tiresiaspress.us/haskell/language-objc";
        description = "Analysis and generation of Objective C code";
@@ -82021,7 +84103,8 @@ self: {
        sha256 = "0xbwd0arsxinszlmdql5d61w33mpqya8gybkllyb1v7xhqskjasr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
+       executableHaskellDepends = [ attoparsec base bytestring ];
        jailbreak = true;
        homepage = "http://www.github.com/bgamari/language-openscad";
        description = "A simple parser for OpenSCAD";
@@ -82037,8 +84120,10 @@ self: {
        pname = "language-pig";
        version = "0.3.0.1";
        sha256 = "1lv8zm352him9rby1k0n90bklx8wlvr1w8anzmr54fmbd9ibx0f2";
-       buildDepends = [ base Cabal containers parsec pretty-tree ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base Cabal containers parsec pretty-tree
+       ];
+       testHaskellDepends = [
          base Cabal HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
@@ -82064,16 +84149,22 @@ self: {
        sha256 = "1h6zsslp3szc3m2ki273a6w47gf9fizyjh0xxby694cmhspknn90";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         case-insensitive containers cryptohash Diff directory either
-         exceptions filecache Glob hashable hruby hslogger hslua hspec 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 text
-         time transformers unix unordered-containers vector yaml
+         case-insensitive containers cryptohash directory either exceptions
+         filecache hashable hruby hslogger hslua lens lens-aeson luautils
+         mtl operational parsec parsers pcre-utils process
+         regex-pcre-builtin scientific servant servant-client split stm
+         strict-base-types text time transformers unix unordered-containers
+         vector yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint base bytestring containers Diff either Glob
+         hslogger hspec lens mtl optparse-applicative parallel-io parsec
+         regex-pcre-builtin servant-client strict-base-types text
+         unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
          ansi-wl-pprint base either Glob hspec HUnit lens parsec parsers
          strict-base-types temporary text unix unordered-containers vector
        ];
@@ -82092,10 +84183,10 @@ self: {
        pname = "language-python";
        version = "0.5.0";
        sha256 = "1z0m0lbvrcjyh04zr52wi1zhmb28m4s67zlvf2wc6qh0z9y4l7wy";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers monads-tf pretty transformers utf8-string
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        homepage = "http://github.com/bjpop/language-python";
        description = "Parsing and pretty printing of Python code";
        license = stdenv.lib.licenses.bsd3;
@@ -82109,7 +84200,9 @@ self: {
        sha256 = "1cspr1v0dm4lbjrb654n8lax9nvmj94a89cp3vqir8xccaxhggpz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 language-python xhtml ];
+       executableHaskellDepends = [
+         base haskell98 language-python xhtml
+       ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/";
        description = "Generate coloured XHTML for Python code";
        license = stdenv.lib.licenses.bsd3;
@@ -82124,7 +84217,7 @@ self: {
        sha256 = "0sxl2snzwi4v3fzfgdwy2fx1pih4qvh1z8s1qkkq346x76n4rgnv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base language-python ];
+       executableHaskellDepends = [ base language-python ];
        homepage = "http://github.com/bjpop/language-python-test";
        description = "testing code for the language-python library";
        license = stdenv.lib.licenses.bsd3;
@@ -82137,7 +84230,9 @@ self: {
        pname = "language-sh";
        version = "0.0.3.1";
        sha256 = "12yjynd1sib1mxx4jc28gs1k3r7kl1qv7xhanvn635dkcmswsd5k";
-       buildDepends = [ base directory filepath mtl parsec pcre-light ];
+       libraryHaskellDepends = [
+         base directory filepath mtl parsec pcre-light
+       ];
        jailbreak = true;
        homepage = "http://code.haskell.org/shsh/";
        description = "A package for parsing shell scripts";
@@ -82154,8 +84249,8 @@ self: {
        pname = "language-slice";
        version = "0.3.0.0";
        sha256 = "1d9g41z1nw327z5n7hj8gj0yfvmkj7hz7cpwhi4r32xa7x98hdzy";
-       buildDepends = [ base bytestring parsec transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring parsec transformers ];
+       testHaskellDepends = [
          base bytestring HUnit parsec QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
@@ -82173,11 +84268,13 @@ self: {
        pname = "language-spelling";
        version = "0.3.2";
        sha256 = "05jgx1rcfb9aidrim2h9vr72c3m9hak2njkh04hkf4q3v1pv03ym";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bk-tree bytestring containers ListLike
          listlike-instances text tst vector
        ];
-       testDepends = [ base bytestring criterion random-shuffle time ];
+       testHaskellDepends = [
+         base bytestring criterion random-shuffle time
+       ];
        homepage = "https://github.com/bitonic/language-spelling";
        description = "Various tools to detect/correct mistakes in words";
        license = stdenv.lib.licenses.publicDomain;
@@ -82192,7 +84289,7 @@ self: {
        pname = "language-sqlite";
        version = "1.1";
        sha256 = "1mpbp56xgqx6j4mfla00kvr9q6mysncjw57mphvrz86ificjw93m";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers mtl template-haskell utf8-string
        ];
        homepage = "http://dankna.com/software/";
@@ -82209,8 +84306,10 @@ self: {
        pname = "language-thrift";
        version = "0.4.0.0";
        sha256 = "0al6a9j9hwla8kyfw30m9ylw4wzxv0nr3nvri8w9wnh6ckaf5j2w";
-       buildDepends = [ base mtl parsers text trifecta wl-pprint ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base mtl parsers text trifecta wl-pprint
+       ];
+       testHaskellDepends = [
          base hspec hspec-discover QuickCheck text trifecta wl-pprint
        ];
        homepage = "https://github.com/abhinav/language-thrift";
@@ -82225,7 +84324,7 @@ self: {
        pname = "language-typescript";
        version = "0.0.4";
        sha256 = "07lm3d4m7c6j2b5gywqm05189iwkh2zjiv5xwwmcw1fm2a63r2zd";
-       buildDepends = [ base containers parsec pretty ];
+       libraryHaskellDepends = [ base containers parsec pretty ];
        homepage = "http://github.com/paf31/language-typescript";
        description = "A library for working with TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
@@ -82239,8 +84338,8 @@ self: {
        pname = "largeword";
        version = "1.2.3";
        sha256 = "1ldcsnnji6p84sn03j17pdcpg7vqn1xrhyn4wys0v5fyy0d383ln";
-       buildDepends = [ base binary ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary ];
+       testHaskellDepends = [
          base binary bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -82260,7 +84359,7 @@ self: {
        sha256 = "0snzcck07v3w1qcgw2j6w7g4ydm59cprf3cqivl9qbgsjljl3zxn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base cmdargs directory filepath haskell98 haxr HDBC
          HDBC-sqlite3 hsini HTTP mtl old-locale regex-compat tagsoup time
        ];
@@ -82281,12 +84380,17 @@ self: {
        sha256 = "0z6jl0i9d9r4nifyn2h6pk8s3ni5zfmbc4gpaqim3hzzbh6kqrn0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base http-client http-types lens network pipes
+         pipes-attoparsec pipes-bytestring pipes-http text text-format
+         transformers
+       ];
+       executableHaskellDepends = [
          aeson base cmdargs http-client http-types lens network pipes
          pipes-attoparsec pipes-bytestring pipes-http text text-format
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base hspec http-client http-types lens network pipes
          pipes-attoparsec pipes-bytestring pipes-http text text-format
          transformers
@@ -82304,7 +84408,7 @@ self: {
        pname = "latex";
        version = "0.1.0.3";
        sha256 = "1linwqab6z2s91vdxr874vk7rg7gv1ckabsxwmlr80gnhdfgyhmp";
-       buildDepends = [ base containers utility-ht ];
+       libraryHaskellDepends = [ base containers utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/LaTeX";
        description = "Parse, format and process LaTeX files";
        license = stdenv.lib.licenses.bsd3;
@@ -82318,7 +84422,7 @@ self: {
        pname = "lattices";
        version = "1.3";
        sha256 = "1jp63rh1girf9ka0lfi219wlisni8dsckf67h6413ihdxdh2mp3l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq hashable unordered-containers
        ];
        homepage = "http://github.com/phadej/lattices/";
@@ -82335,7 +84439,10 @@ self: {
        sha256 = "0lbrrm5wfi3vgmvba9rvbzq78idq6z98psjfh5scjp8hg0qbf8q2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers hmidi mtl transformers ];
+       libraryHaskellDepends = [
+         array base containers hmidi mtl transformers
+       ];
+       executableHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "High and low-level interface to the Novation Launchpad midi controller";
        license = stdenv.lib.licenses.bsd3;
@@ -82347,7 +84454,7 @@ self: {
        pname = "lax";
        version = "0.1.0.3";
        sha256 = "12f0k2545nk50cvs3gd41dhsfls19xkhvn3avhmgx69y57mhalcy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/lax";
        description = "Lax arrows";
        license = stdenv.lib.licenses.bsd3;
@@ -82359,7 +84466,7 @@ self: {
        pname = "layers";
        version = "0.1";
        sha256 = "1yn8swgxb908wslcnh04919m9rzy47dxgawns89zw5v1gbq3wmdf";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/duairc/layers";
        description = "Modular type class machinery for monad transformer stacks";
@@ -82377,7 +84484,7 @@ self: {
        sha256 = "01j1gq3jd8mm519p3drxfpd32mm1qmik39vijncrx64p7wii73k8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs composition data-lens Gamgine GLFW-b ListZipper mtl
          OpenGLRaw pretty-show
        ];
@@ -82392,7 +84499,7 @@ self: {
        pname = "layout";
        version = "0.0.0.1";
        sha256 = "04075x2f646ifaw9pxi5s6avp1vis1j524w9a2m3apyrz583cj0g";
-       buildDepends = [ base convertible hinduce-missingh ];
+       libraryHaskellDepends = [ base convertible hinduce-missingh ];
        description = "Turn values into pretty text or markup";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82404,7 +84511,7 @@ self: {
        pname = "layout-bootstrap";
        version = "0.2.2";
        sha256 = "0rm0w5l4g865ais4rg3vdfx6fyzp1dginlhlabvqclbjwwzkiyqi";
-       buildDepends = [ base blaze-html containers text ];
+       libraryHaskellDepends = [ base blaze-html containers text ];
        homepage = "https://bitbucket.org/dpwiz/layout-bootstrap";
        description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5";
        license = stdenv.lib.licenses.mit;
@@ -82419,7 +84526,8 @@ self: {
        sha256 = "17v495xnv38bx9zfjfa8dl3prj94lg74dhn1jzqrjq488gfwp2w8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/lazy-csv";
        description = "Efficient lazy parsers for CSV (comma-separated values)";
        license = stdenv.lib.licenses.bsd3;
@@ -82431,7 +84539,7 @@ self: {
        pname = "lazy-io";
        version = "0.1.0";
        sha256 = "0fbvm8wwvp4xm4rq2mdfnrra7c88dps91j7ay2vn7iqmpdkcwly9";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kawu/lazy-io";
        description = "Lazy IO";
        license = stdenv.lib.licenses.bsd3;
@@ -82443,7 +84551,7 @@ self: {
        pname = "lazyarray";
        version = "0.1.3";
        sha256 = "0bc2n7x8fydmzc84yb5zbdaca1r4qwpk7zlvbgcycycr87fk7p7n";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82457,7 +84565,7 @@ self: {
        sha256 = "16cl1yifcmfywqc7kgz9kmp0x6s4300ccgmcrzr4j4jgwcgl38bc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base transformers unsafe ];
+       libraryHaskellDepends = [ base transformers unsafe ];
        homepage = "http://www.haskell.org/haskellwiki/Lazy_IO";
        description = "Run IO actions lazily while respecting their order";
        license = stdenv.lib.licenses.bsd3;
@@ -82469,7 +84577,7 @@ self: {
        pname = "lazysmallcheck";
        version = "0.6";
        sha256 = "0lqggm75m1qd34lzqj3ibvnjwhjqvq16cab8zxm4yzn7j2sxzm4x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.york.ac.uk/~mfn/lazysmallcheck/";
        description = "A library for demand-driven testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -82481,7 +84589,7 @@ self: {
        pname = "lazysplines";
        version = "0.2";
        sha256 = "0r6z3b6yaxsnz8cbfr815q97jlzsjrqszb2vvzwjyqbh6qqw006y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Differential solving with lazy splines";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82493,7 +84601,7 @@ self: {
        pname = "lbfgs";
        version = "0.0.5";
        sha256 = "0j69hq053ksypb5a3dcvnfa5pscvxhsnby1p5pj4bw6c209g8a06";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "L-BFGS optimization";
        license = "unknown";
      }) {};
@@ -82504,8 +84612,8 @@ self: {
        pname = "lca";
        version = "0.3";
        sha256 = "081fk0ci5vb84w4zwah6qwbr0i78v2pr6m6nn1y226vv5w3kakza";
-       buildDepends = [ base ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/ekmett/lca/";
        description = "O(log n) persistent on-line lowest common ancestor calculation without preprocessing";
        license = stdenv.lib.licenses.bsd3;
@@ -82517,7 +84625,7 @@ self: {
        pname = "lcs";
        version = "0.2";
        sha256 = "1w8z80vqb86zl6ap4nd87kpl91qms8310k1d8r6qrxg2skm6gnxl";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://urchin.earth.li/~ian/cabal/lcs/";
        description = "Find longest common sublist of two lists";
        license = "unknown";
@@ -82532,7 +84640,7 @@ self: {
        pname = "lda";
        version = "0.0.2";
        sha256 = "125y7syfpwg6356h4rq34k45h115ywbz9yisvd741jf6aij23is2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim mtl random-fu random-source rvar vector
        ];
        homepage = "https://bitbucket.org/gchrupala/colada";
@@ -82549,11 +84657,11 @@ self: {
        pname = "ldap-client";
        version = "0.1.0";
        sha256 = "18c33jfgwa7vdickxshyhmrqdpndy7ayjd3z0zqkjqa7awd0zcf4";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types async base bytestring connection
          containers network semigroups stm text
        ];
-       testDepends = [ base bytestring hspec process semigroups ];
+       testHaskellDepends = [ base bytestring hspec process semigroups ];
        homepage = "https://supki.github.io/ldap-client";
        description = "Pure Haskell LDAP Client Library";
        license = stdenv.lib.licenses.bsd2;
@@ -82570,11 +84678,14 @@ self: {
        sha256 = "0mf0cvjzgimrqf80g6hg75azv18930g5mrvjjxw70116mdpp718a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cmdargs containers directory filepath parsec
          rosezipper
        ];
-       testDepends = [ base HUnit ];
+       executableHaskellDepends = [
+         base bytestring cmdargs containers filepath
+       ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "http://rampa.sk/static/ldif.html";
        description = "The LDAP Data Interchange Format (LDIF) tools";
        license = stdenv.lib.licenses.bsd3;
@@ -82591,7 +84702,9 @@ self: {
        sha256 = "1czk4d2xa2g7djdz669h1q6ciflzwxm4n05m9jv3d3z7r6fcch6z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base blaze-html directory filepath pandoc split ];
+       executableHaskellDepends = [
+         base blaze-html directory filepath pandoc split
+       ];
        jailbreak = true;
        homepage = "https://github.com/skypers/leaf";
        description = "A simple portfolio generator";
@@ -82609,7 +84722,7 @@ self: {
        sha256 = "17cs1mszcfibfkcbwxdcn4pi3n6b84a23szv548vqxwypyrzlbf0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cpphs deepseq-bounded deepseq-generics generics-sop random
          seqaid template-haskell
        ];
@@ -82625,7 +84738,9 @@ self: {
        pname = "leankit-api";
        version = "0.4";
        sha256 = "14ax9w72cdmbsgy879mwwi2g0345xzfvivrq8b7ngkr8dyfp72r7";
-       buildDepends = [ aeson base bytestring colour curl split ];
+       libraryHaskellDepends = [
+         aeson base bytestring colour curl split
+       ];
        description = "LeanKit API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -82636,8 +84751,8 @@ self: {
        pname = "leapseconds-announced";
        version = "2015.0.0.1";
        sha256 = "0k8khjfq1cr8wb2wgwwk7yv6461h7z6wf6qn21qd9zq9i22bpyhm";
-       buildDepends = [ base time ];
-       testDepends = [ base QuickCheck time ];
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base QuickCheck time ];
        homepage = "https://github.com/bjornbm/leapseconds-announced";
        description = "Leap seconds announced at library release time";
        license = stdenv.lib.licenses.bsd3;
@@ -82649,7 +84764,7 @@ self: {
        pname = "learn";
        version = "0.1.1";
        sha256 = "1i2rn4pmgbqxj0xsjqp5rh50lv6zgnblbjgwmqh5cxb3dsillvpj";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Learning Algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82662,7 +84777,7 @@ self: {
        pname = "learn-physics";
        version = "0.5";
        sha256 = "0bh7p0pp4pspb5m4bfab5z3sfrywlw59yc7w11sa6ax29q9r9faq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base gloss gnuplot not-gloss spatial-math vector-space
        ];
        jailbreak = true;
@@ -82681,7 +84796,7 @@ self: {
        sha256 = "0fwmc7q59srasciijd7ws1bqay4cc7jhi1469my67kchg0n45q3k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base gloss gnuplot learn-physics not-gloss spatial-math
        ];
        jailbreak = true;
@@ -82698,7 +84813,7 @@ self: {
        pname = "learning-hmm";
        version = "0.3.2.2";
        sha256 = "1a2a97cflnlalcqr54ssbmy047i6y1xgswssy64hsr36g2lhywrs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq hmatrix random-fu random-source vector
        ];
        homepage = "https://github.com/mnacamura/learning-hmm";
@@ -82714,7 +84829,7 @@ self: {
        sha256 = "106pr7rlma67dqqyfhknh9fb6r37lsj00qjx1dq3xx7yxp368nvr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://github.com/phaazon/leetify";
        description = "Leetify text";
@@ -82738,17 +84853,21 @@ self: {
        sha256 = "0gjgaigkd34gzfvqhlxqqxcydh12064prnn0x653kb5ks8bq4qml";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary binary-shared blaze-html bytestring Cabal conduit
          containers cpphs deepseq directory executable-path filepath ghc
-         ghcjs-codemirror ghcjs-dom gio glib gtk3 gtksourceview3 hamlet
+         ghcjs-codemirror gio glib gtk3 gtksourceview3 hamlet
          haskell-src-exts hlint hslogger jsaddle leksah-server lens ltk mtl
          network network-uri old-time parsec pretty pretty-show QuickCheck
          regex-base regex-tdfa regex-tdfa-text shakespeare stm strict text
          time transformers unix utf8-string vado vcsgui vcswrapper
          webkitgtk3 webkitgtk3-javascriptcore
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base ghcjs-dom gtk3 gtksourceview3 jsaddle stm webkitgtk3
+         webkitgtk3-javascriptcore
+       ];
+       testHaskellDepends = [
          base Cabal containers glib gtk3 gtksourceview3 hslogger
          leksah-server ltk monad-loops QuickCheck stm text transformers
          webkitgtk3
@@ -82774,21 +84893,27 @@ self: {
        sha256 = "1pcf42hipc5q3n61pbd2sdgvhshl2ri261i94myb3fc13kbi90hb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-conduit base bin-package-db binary
          binary-shared bytestring Cabal conduit conduit-extra containers
          deepseq directory executable-path filepath ghc haddock-api
          haddock-library hslogger HTTP ltk network network-uri parsec pretty
          process resourcet strict text time transformers unix
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         attoparsec attoparsec-conduit base bin-package-db binary
+         binary-shared bytestring Cabal conduit conduit-extra containers
+         deepseq directory executable-path filepath ghc haddock-api
+         haddock-library hslogger HTTP ltk network network-uri parsec pretty
+         process resourcet strict text time transformers unix
+       ];
+       testHaskellDepends = [
          base conduit conduit-extra hslogger HUnit process resourcet
          transformers
        ];
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lendingclub" = callPackage
@@ -82799,7 +84924,7 @@ self: {
        pname = "lendingclub";
        version = "0.1.1";
        sha256 = "1r40qm7f45vgzdxnzlhpqhsi81rbwa2nss3gf1d5mqz32dscjwfx";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring HsOpenSSL http-streams
          io-streams mtl scientific text vector
        ];
@@ -82823,14 +84948,14 @@ self: {
        pname = "lens";
        version = "4.12.3";
        sha256 = "0898z1ws9sy77yfhvx5did0pibpp81yxz0jg418gdx3znd39vyj8";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
          hashable kan-extensions mtl parallel profunctors reflection
          semigroupoids semigroups tagged template-haskell text transformers
          transformers-compat unordered-containers vector void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers deepseq directory doctest filepath
          generic-deriving hlint HUnit mtl nats parallel QuickCheck
          semigroups simple-reflect test-framework test-framework-hunit
@@ -82851,15 +84976,14 @@ self: {
        pname = "lens-action";
        version = "0.2.0.1";
        sha256 = "164fka3krz32zhxnhkylnkmgnx2qj4qvn6y1hfwwla4ddn0axm9n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad contravariant lens mtl profunctors semigroupoids
          semigroups transformers
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/ekmett/lens-action/";
        description = "Monadic Getters and Folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-aeson" = callPackage
@@ -82870,14 +84994,14 @@ self: {
      mkDerivation {
        pname = "lens-aeson";
        version = "1.0.0.4";
-       revision = "2";
        sha256 = "0zjl645y4bwg3pvld8z4vj9rdpdy6fja2cx63d85k37zp5n98y7v";
+       revision = "2";
        editedCabalFile = "f9ddeac68a237cb5dbe8ab7457fb7529bdeeb675c5e80bc122e196255072393d";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring lens scientific text
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
@@ -82892,7 +85016,7 @@ self: {
        pname = "lens-datetime";
        version = "0.2.1";
        sha256 = "1wqks7ynw3njlizdd9hvgrc1xjxcgcfck9ppj1lgg8wr3l2myi72";
-       buildDepends = [ base lens time ];
+       libraryHaskellDepends = [ base lens time ];
        homepage = "http://github.com/nilcons/lens-datetime";
        description = "Lenses for Data.Time.* types";
        license = stdenv.lib.licenses.bsd3;
@@ -82906,7 +85030,7 @@ self: {
        pname = "lens-family";
        version = "1.2.0";
        sha256 = "0pbyx43ajx96nhcw4brml1r5azs1041k7nv4m94ak6x77n5sr4mb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers lens-family-core mtl transformers
        ];
        description = "Lens Families";
@@ -82919,7 +85043,7 @@ self: {
        pname = "lens-family-core";
        version = "1.2.0";
        sha256 = "0hxrbbc4azfafnr4ab2zxgic093wwg6gx5h1ggp4xks55d8rhraz";
-       buildDepends = [ base containers transformers ];
+       libraryHaskellDepends = [ base containers transformers ];
        description = "Haskell 98 Lens Families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82929,10 +85053,10 @@ self: {
      mkDerivation {
        pname = "lens-family-th";
        version = "0.4.1.0";
-       revision = "1";
        sha256 = "084yng26xyhw6c6hij3p70zvjpvm1dlw6klphw51car9gi6dqkvm";
+       revision = "1";
        editedCabalFile = "13c96ddf2d410ec4e6671c8412710b7cdbbfc837ff5be1d09a6dbb9ecdb9285d";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/DanBurton/lens-family-th#readme";
        description = "Generate lens-family style lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -82944,7 +85068,7 @@ self: {
        pname = "lens-properties";
        version = "4.11";
        sha256 = "0cg0n75ss5ayy31igwyz9yz2sh0smcaiidbbm1wkrk1krzbws31w";
-       buildDepends = [ base lens QuickCheck transformers ];
+       libraryHaskellDepends = [ base lens QuickCheck transformers ];
        homepage = "http://github.com/ekmett/lens/";
        description = "QuickCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
@@ -82960,8 +85084,12 @@ self: {
        sha256 = "0hjizjmvdngxn63gs7x87qidh71aqhvyigrnqlbfjqan76pb6m29";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base lens regex-base template-haskell ];
-       testDepends = [ base directory doctest filepath regex-posix ];
+       libraryHaskellDepends = [
+         array base lens regex-base template-haskell
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath regex-posix
+       ];
        homepage = "https://github.com/himura/lens-regex";
        description = "Lens powered regular expression";
        license = stdenv.lib.licenses.bsd3;
@@ -82975,7 +85103,7 @@ self: {
        pname = "lens-simple";
        version = "0.1.0.7";
        sha256 = "08ynx0zhll603srdmgqf9pgdbzn4i9ry99hs7m35kwaj21whrq5q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens-family lens-family-core lens-family-th mtl transformers
        ];
        homepage = "https://github.com/michaelt/lens-simple";
@@ -82989,7 +85117,9 @@ self: {
        pname = "lens-sop";
        version = "0.1.0.2";
        sha256 = "1b56q8qsg3w5gzra7bjf76mqinv8vpjrb6any7c3wdpjgvssly56";
-       buildDepends = [ base fclabels generics-sop transformers ];
+       libraryHaskellDepends = [
+         base fclabels generics-sop transformers
+       ];
        description = "Computing lenses generically using generics-sop";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83000,7 +85130,7 @@ self: {
        pname = "lens-text-encoding";
        version = "0.1.0.0";
        sha256 = "1yxab87ci6gl0c5gsdd8pb780ai8lmxxa3fxkpl1shv1pw124fsv";
-       buildDepends = [ base bytestring lens text ];
+       libraryHaskellDepends = [ base bytestring lens text ];
        jailbreak = true;
        homepage = "http://github.com/iand675/text-lens-encoding";
        description = "Isomorphisms and prisms for text <=> bytestring conversions";
@@ -83013,7 +85143,7 @@ self: {
        pname = "lens-time";
        version = "0.1.0.0";
        sha256 = "1hrp9d6qja7yc3zj68w3hylgflyfsvh79m8daw9030yjdxm525za";
-       buildDepends = [ base lens time ];
+       libraryHaskellDepends = [ base lens time ];
        jailbreak = true;
        description = "lens for Data.Time";
        license = stdenv.lib.licenses.mit;
@@ -83025,7 +85155,7 @@ self: {
        pname = "lenses";
        version = "0.1.7";
        sha256 = "09p1ph5ih2dzrbn7h9wjnf4xch04g0amf8cc3q64g5a2clg3vjx4";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "http://github.com/jvranish/Lenses/tree/master";
        description = "Simple Functional Lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -83037,8 +85167,8 @@ self: {
        pname = "lensref";
        version = "0.2";
        sha256 = "0dj43hqrv198dgfnngq4l8kwnksqcm6nydcr1z1a5gqz5s99m4bn";
-       buildDepends = [ base monad-control mtl transformers ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base monad-control mtl transformers ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/LGtk";
        description = "References which can be joined and on which lenses can be applied";
@@ -83056,11 +85186,11 @@ self: {
        sha256 = "19zjwkj9is5fdayvwf6w8r42z0lyrbj2lqqw822zr87xaq96r2g2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base csv directory filemanip filepath natural-sort
          optparse-applicative parsec regex-tdfa
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-wl-pprint base csv directory filemanip filepath hspec
          natural-sort optparse-applicative parsec regex-tdfa
        ];
@@ -83075,7 +85205,7 @@ self: {
        pname = "level-monad";
        version = "0.4.1";
        sha256 = "1l5jyhpvbcj4fmyggp8bjy4gx9igcydply3yb1s23fxdcz0b638a";
-       buildDepends = [ base fmlist ];
+       libraryHaskellDepends = [ base fmlist ];
        homepage = "http://github.com/sebfisch/level-monad";
        description = "Non-Determinism Monad for Level-Wise Search";
        license = stdenv.lib.licenses.publicDomain;
@@ -83092,19 +85222,21 @@ self: {
        sha256 = "0vljwjcd9m63wk7zmkl2s6b6kpjn7hqmwwg0p2bjm0d7ras69pk5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base bytestring data-default exceptions filepath resourcet
+       libraryHaskellDepends = [
+         base bytestring data-default exceptions filepath resourcet
          transformers
        ];
-       testDepends = [
+       librarySystemDepends = [ leveldb ];
+       executableHaskellDepends = [
+         async base bytestring data-default resourcet transformers
+       ];
+       testHaskellDepends = [
          base bytestring data-default directory exceptions mtl QuickCheck
          tasty tasty-quickcheck temporary transformers
        ];
-       extraLibraries = [ leveldb ];
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
@@ -83118,14 +85250,17 @@ self: {
        sha256 = "021ckykw5wwkm8gpbqq1znis4rakqmri8bz8ldmm8cmlb3v3b6aq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base bytestring data-default filepath resourcet transformers
+       libraryHaskellDepends = [
+         base bytestring data-default filepath resourcet transformers
        ];
-       testDepends = [
+       librarySystemDepends = [ leveldb ];
+       executableHaskellDepends = [
+         async base bytestring data-default resourcet transformers
+       ];
+       testHaskellDepends = [
          base bytestring data-default hspec hspec-expectations mtl process
          QuickCheck transformers
        ];
-       extraLibraries = [ leveldb ];
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
@@ -83138,11 +85273,10 @@ self: {
        pname = "levmar";
        version = "1.2.1.5";
        sha256 = "09ambniwcvrss8s3f9rvgrq204d9y7baxiw52r3pp693spmwazkj";
-       buildDepends = [ base bindings-levmar hmatrix vector ];
+       libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
        homepage = "https://github.com/basvandijk/levmar";
        description = "An implementation of the Levenberg-Marquardt algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "levmar-chart" = callPackage
@@ -83154,7 +85288,10 @@ self: {
        sha256 = "0ws9d2ipk67ir4b31rd7vakyglhrr290k400zpb24ny3vvdgcwaj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Chart colour data-accessor levmar random ];
+       libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
+       executableHaskellDepends = [
+         base Chart colour data-accessor levmar random
+       ];
        jailbreak = true;
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
        license = stdenv.lib.licenses.bsd3;
@@ -83169,8 +85306,8 @@ self: {
        pname = "lexer-applicative";
        version = "2.1";
        sha256 = "1xryc4nnfs7vzvmdszksmzjmz0pi1gpip0qr3gf2lv0baayma7zj";
-       buildDepends = [ base regex-applicative srcloc ];
-       testDepends = [
+       libraryHaskellDepends = [ base regex-applicative srcloc ];
+       testHaskellDepends = [
          base deepseq regex-applicative srcloc tasty tasty-hunit
        ];
        homepage = "https://github.com/feuerbach/lexer-applicative";
@@ -83191,11 +85328,15 @@ self: {
        sha256 = "1bph09i8znzv3c8sqbg2xbrdlpvlnx52psgyybwn0imqip81lmv5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base cairo colour containers diagrams-cairo diagrams-lib
-         directory filepath fsnotify GLFW-b groups lens lensref
-         monad-control mtl OpenGLRaw operational random random-shuffle
-         semigroups system-filepath transformers vector
+       libraryHaskellDepends = [
+         base cairo colour containers diagrams-cairo diagrams-lib directory
+         filepath fsnotify GLFW-b groups lens lensref monad-control mtl
+         OpenGLRaw operational semigroups system-filepath transformers
+         vector
+       ];
+       executableHaskellDepends = [
+         array base containers diagrams-lib lens mtl random random-shuffle
+         vector
        ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/LGtk";
@@ -83210,7 +85351,7 @@ self: {
        pname = "lha";
        version = "0.1.2";
        sha256 = "0a5h1d0sdnpy209k4zkmcrrxl4b000226hif098bqs9pngpbgki1";
-       buildDepends = [ haskell2010 ];
+       libraryHaskellDepends = [ haskell2010 ];
        homepage = "https://github.com/bytbox/lha.hs";
        description = "Data structures for the Les Houches Accord";
        license = stdenv.lib.licenses.mit;
@@ -83228,7 +85369,7 @@ self: {
        sha256 = "120g8x0wbd5va2gqvkr5mx643g8r4hrfyqa68nm3apvfc9z7f8g3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory filepath hgettext mtl parsec
          process setlocale utf8-string wx wxcore
        ];
@@ -83253,7 +85394,7 @@ self: {
        sha256 = "1x50k6lx9p36qxl0qn9zfyqlkgsq3wdzvcv7l6sn920hg5scvcr3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base binary bytestring bytestring-trie Cabal
          containers core derive digest directory extensible-exceptions
          filepath haskell98 HUnit mtl parallel pretty process QuickCheck
@@ -83271,7 +85412,7 @@ self: {
        pname = "lhe";
        version = "0.5";
        sha256 = "08725r5i71ni9ip4qbc5fr111j256rsii936yvxbd7kbbw4ap2a9";
-       buildDepends = [ bytestring haskell2010 HaXml lha ];
+       libraryHaskellDepends = [ bytestring haskell2010 HaXml lha ];
        description = "Parser and writer for Les-Houches event files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83287,7 +85428,7 @@ self: {
        sha256 = "1mm6ikiv6zj025yh5abq3f8mqkw9302mfzd01xcihbh74bsdpi9l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs filepath haskell-src-exts syb uu-parsinglib
        ];
        jailbreak = true;
@@ -83304,14 +85445,14 @@ self: {
        sha256 = "1cwvpn6cl0d5rs5x6q3c2pw4l4hpxz20sr717mggafzsj6j7cccv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath Glob ];
+       executableHaskellDepends = [ base directory filepath Glob ];
        description = "Compile lhs in bird style to md, html, hs";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "lhs2tex" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl, process
-     , regex-compat, texLive
+     , regex-compat
      }:
      mkDerivation {
        pname = "lhs2tex";
@@ -83319,19 +85460,13 @@ self: {
        sha256 = "03mhhkrqjjqmmh18im8di1cl6wqv30lsib5hv73f0wsnv5bhbbi4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath mtl process regex-compat
        ];
-       extraLibraries = [ texLive ];
-       postInstall = ''
-         mkdir -p "$out/share/doc/$name"
-         cp doc/Guide2.pdf $out/share/doc/$name
-         mkdir -p "$out/nix-support"
-       '';
        homepage = "http://www.andres-loeh.de/lhs2tex/";
        description = "Preprocessor for typesetting Haskell sources with LaTeX";
        license = "GPL";
-     }) { inherit (pkgs) texLive;};
+     }) {};
 
   "lhslatex" = callPackage
     ({ mkDerivation, base, directory, filepath, process, regex-posix }:
@@ -83341,7 +85476,9 @@ self: {
        sha256 = "0kgmx160i1rylgzh23qlg8ds0sq64yk1i3rah8kmgwabpnvds7f7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath process regex-posix ];
+       executableHaskellDepends = [
+         base directory filepath process regex-posix
+       ];
        jailbreak = true;
        homepage = "https://github.com/tvh/lhslatex";
        description = "Tool for using pdflatex with .lhs files";
@@ -83356,7 +85493,7 @@ self: {
        pname = "libGenI";
        version = "0.16.1";
        sha256 = "1n37pccmx0466425zcbdfpgivsrnqzwsm0nwcjv8lkg8jxjxrwmz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers HUnit mtl parsec process QuickCheck
        ];
        homepage = "http://trac.loria.fr/~geni";
@@ -83373,8 +85510,10 @@ self: {
        pname = "libarchive-conduit";
        version = "0.1.0.0";
        sha256 = "022fnxxwz44cjzcldk3yg1xs77xqnrvkr9bv6hi7kdy120dk4p04";
-       buildDepends = [ base bytestring conduit resourcet transformers ];
-       extraLibraries = [ archive ];
+       libraryHaskellDepends = [
+         base bytestring conduit resourcet transformers
+       ];
+       librarySystemDepends = [ archive ];
        description = "Read many archive formats with libarchive and conduit";
        license = stdenv.lib.licenses.bsd3;
      }) { archive = null;};
@@ -83388,13 +85527,13 @@ self: {
        pname = "libconfig";
        version = "0.3.0.0";
        sha256 = "152rvfyc6y9waxic9fw4hfb7w5qfcrr23hdv9jlvksg9yw8mnq12";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary cereal cereal-text deepseq hashable text text-binary
          transformers transformers-compat
        ];
-       testDepends = [ base doctest doctest-prop ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ config ];
+       librarySystemDepends = [ config ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base doctest doctest-prop ];
        homepage = "https://github.com/peddie/libconfig-haskell";
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
@@ -83409,11 +85548,13 @@ self: {
        pname = "libcspm";
        version = "1.0.0";
        sha256 = "1v8w8i871a0fjyjqb8hr4yk9wli5v7djfpyjgg14rjb26v6yq79v";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath
          graph-wrapper hashable hashtables mtl pretty text value-supply
        ];
-       testDepends = [ base directory filepath mtl test-framework ];
+       testHaskellDepends = [
+         base directory filepath mtl test-framework
+       ];
        jailbreak = true;
        homepage = "https://github.com/tomgr/libcspm";
        description = "A library providing a parser, type checker and evaluator for CSPM";
@@ -83427,24 +85568,25 @@ self: {
        pname = "libexpect";
        version = "0.3.2";
        sha256 = "0xpsc9a16biqg4z9b9wk9wqz6ypshw99xrksnxi8nlh3qn98lrsc";
-       buildDepends = [ base unix ];
-       extraLibraries = [ expect tcl ];
+       libraryHaskellDepends = [ base unix ];
+       librarySystemDepends = [ expect tcl ];
        description = "Library for interacting with console applications via pseudoterminals";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) expect;  inherit (pkgs) tcl;};
 
   "libffi" = callPackage
-    ({ mkDerivation, base, bytestring, libffi }:
+    ({ mkDerivation, base, bytestring, ffi, libffi }:
      mkDerivation {
        pname = "libffi";
        version = "0.1";
        sha256 = "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28";
-       buildDepends = [ base bytestring ];
-       pkgconfigDepends = [ libffi ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ ffi ];
+       libraryPkgconfigDepends = [ libffi ];
        description = "A binding to libffi";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libffi;};
+     }) { ffi = null;  inherit (pkgs) libffi;};
 
   "libgit" = callPackage
     ({ mkDerivation, base, mtl, process }:
@@ -83452,7 +85594,7 @@ self: {
        pname = "libgit";
        version = "0.3.1";
        sha256 = "08km9y2wqz426c5c6r49ar5snl8ss1w7d55yqivksdkwk3fn0k0x";
-       buildDepends = [ base mtl process ];
+       libraryHaskellDepends = [ base mtl process ];
        homepage = "https://github.com/vincenthz/hs-libgit";
        description = "Simple Git Wrapper";
        license = stdenv.lib.licenses.bsd3;
@@ -83466,7 +85608,7 @@ self: {
        pname = "libgraph";
        version = "1.5";
        sha256 = "0pyync48lr2silvm3cdmn11zmv355hcmmaj6rm7lb365mqv444i1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers monads-tf process union-find
        ];
        homepage = "http://maartenfaddegon.nl";
@@ -83485,11 +85627,14 @@ self: {
        sha256 = "17wycfnp1f288fxq3vd9c206gcard3n59s0a0myy0hkl6xy281s8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring directory filepath ghc ghc-paths mtl process
          syb text time unordered-containers
        ];
-       testDepends = [ base bytestring ghc ghc-paths hspec mtl syb ];
+       executableHaskellDepends = [ base bytestring directory ];
+       testHaskellDepends = [
+         base bytestring ghc ghc-paths hspec mtl syb
+       ];
        homepage = "https://bitbucket.org/bhris/libhbb";
        description = "Backend for text editors to provide better Haskell editing support";
        license = stdenv.lib.licenses.lgpl21;
@@ -83508,12 +85653,12 @@ self: {
        pname = "libjenkins";
        version = "0.8.1";
        sha256 = "00h4wzzs6b3s9cv4bw2slj3c0ckb6p8gph7wzx8cgrxjyjqqx85z";
-       buildDepends = [
+       libraryHaskellDepends = [
          async attoparsec base bytestring conduit containers free
          http-client http-conduit http-types monad-control mtl network
          network-uri profunctors resourcet text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          async attoparsec base bytestring conduit containers directory
          doctest filepath free hspec hspec-expectations-lens http-client
          http-conduit http-types lens lifted-async lifted-base monad-control
@@ -83536,12 +85681,12 @@ self: {
        pname = "liblastfm";
        version = "0.5.1";
        sha256 = "1bf508a1rqjb486wcwn0n36bm8lwnj3b4bg0826lp92zmaxiyxpy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring cereal containers crypto-api http-client
          http-client-tls network-uri profunctors pureMD5 semigroups text
          xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring cereal containers crypto-api hspec
          hspec-expectations-lens http-client http-client-tls HUnit lens
          lens-aeson network-uri profunctors pureMD5 text xml-conduit
@@ -83557,7 +85702,9 @@ self: {
        pname = "liblinear-enumerator";
        version = "0.1.2";
        sha256 = "19x0y70fn2pr06qsz4z6s67sym7dw5x3qa3z6jf3nmwncsy64qi2";
-       buildDepends = [ base bindings-DSL enumerator mtl vector ];
+       libraryHaskellDepends = [
+         base bindings-DSL enumerator mtl vector
+       ];
        jailbreak = true;
        homepage = "http://github.com/NathanHowell/liblinear-enumerator";
        description = "liblinear iteratee";
@@ -83572,7 +85719,8 @@ self: {
        sha256 = "05a4l841w20l4a0wmbp93bb1vc4kmnbcv7pmnym5hrrd7daj2vzr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.eecs.harvard.edu/~mainland/projects/libffi";
        description = "FFI interface to libltdl";
        license = stdenv.lib.licenses.bsd3;
@@ -83588,11 +85736,11 @@ self: {
        pname = "libmpd";
        version = "0.9.0.2";
        sha256 = "1q6lcp9gfzvzcsigv6958ng9c44kq68qh4amnszjjji0jq0lvdjz";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class filepath
          mtl network old-locale text time utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers data-default-class filepath
          hspec mtl network old-locale QuickCheck text time unix utf8-string
        ];
@@ -83607,8 +85755,8 @@ self: {
        pname = "libnotify";
        version = "0.1.1.0";
        sha256 = "1wc19v14agadj7dzi81lm3qzk2x33apaj5ylmg7x232k56xzfvr0";
-       buildDepends = [ base bytestring glib gtk ];
-       extraLibraries = [ libnotify ];
+       libraryHaskellDepends = [ base bytestring glib gtk ];
+       librarySystemDepends = [ libnotify ];
        description = "Bindings to libnotify library";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) libnotify;};
@@ -83621,12 +85769,12 @@ self: {
        pname = "libnvvm";
        version = "1.0.0";
        sha256 = "00vblp869zyk8gr33b846rnvn9axlsbldhx1gkj14xgrlyambdmx";
-       buildDepends = [ base bytestring cuda ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring cuda ];
+       librarySystemDepends = [ nvvm ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
          base bytestring Cabal HUnit test-framework test-framework-hunit
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ nvvm ];
        homepage = "https://github.com/nvidia-compiler-sdk/hsnvvm";
        description = "FFI binding to libNVVM, a compiler SDK component from NVIDIA";
        license = stdenv.lib.licenses.mit;
@@ -83640,7 +85788,7 @@ self: {
        pname = "liboleg";
        version = "2010.1.10.0";
        sha256 = "1lv0il1psy8bfdxc76ivc5nlwga4m475gys1g0ia3wacdksgs7a6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base CC-delcont containers mtl template-haskell unix
        ];
        homepage = "http://okmij.org/ftp/";
@@ -83655,9 +85803,9 @@ self: {
        pname = "libpafe";
        version = "0.1.1.0";
        sha256 = "1l2s98y805mgxnwy2jvrab65gz1aq5zf48rqk88nclb97w04lnws";
-       buildDepends = [ base transformers ];
-       testDepends = [ base bytestring iconv transformers ];
-       extraLibraries = [ pafe ];
+       libraryHaskellDepends = [ base transformers ];
+       librarySystemDepends = [ pafe ];
+       testHaskellDepends = [ base bytestring iconv transformers ];
        jailbreak = true;
        description = "Wrapper for libpafe";
        license = stdenv.lib.licenses.gpl2;
@@ -83670,8 +85818,8 @@ self: {
        pname = "libpq";
        version = "0.4.1";
        sha256 = "11s8zaxq7qwzqdgyfd3v7sk6vf5cq3wzv2j02g0gnri9w45wf2i7";
-       buildDepends = [ base bytestring unix ];
-       extraLibraries = [ postgresql ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       librarySystemDepends = [ postgresql ];
        homepage = "http://github.com/tnarg/haskell-libpq";
        description = "libpq binding for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -83684,7 +85832,7 @@ self: {
        pname = "librandomorg";
        version = "0.0.1.0";
        sha256 = "07xg59f48jw78mjbx83bz1rc2fxvdnlb08cdfd7hwkj43a127kxn";
-       buildDepends = [ base bytestring curl ];
+       libraryHaskellDepends = [ base bytestring curl ];
        jailbreak = true;
        homepage = "https://github.com/supki/haskell-random.org";
        description = "Wrapper to Random.org API";
@@ -83700,7 +85848,7 @@ self: {
        pname = "librato";
        version = "0.2.0.1";
        sha256 = "1l0q8kx0v563glplz5blg5scnvwf1aak04w08abxkrbfdjq6a8z4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring either http-client http-conduit
          http-types mtl resourcet text unordered-containers uri-templater
          vector
@@ -83718,7 +85866,7 @@ self: {
        pname = "libravatar";
        version = "0.1.0.1";
        sha256 = "00rdnhxwp1h4ax3cwlmqa6digzl1b8br5ajg7k0dsydb9ik171x5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-api dns network-uri pureMD5 random SHA url
          utf8-string
        ];
@@ -83737,10 +85885,10 @@ self: {
        sha256 = "0xfdhszz4j98spmzwxwcjnm3kzjkg76bwszmky0lmx9zmqirzakw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring network syb time ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ ssh2 ];
-       pkgconfigDepends = [ libssh2 ];
+       libraryHaskellDepends = [ base bytestring network syb time ];
+       librarySystemDepends = [ ssh2 ];
+       libraryPkgconfigDepends = [ libssh2 ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://github.com/portnov/libssh2-hs";
        description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
        license = stdenv.lib.licenses.bsd3;
@@ -83754,7 +85902,7 @@ self: {
        pname = "libssh2-conduit";
        version = "0.1";
        sha256 = "1zpcj6qwc4kpdcgdqlzspzwz99a990f3r5wpl13l54j8c1g0kc8h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit libssh2 monad-control stm transformers
        ];
        homepage = "http://redmine.iportnov.ru/projects/libssh2-hs";
@@ -83771,7 +85919,7 @@ self: {
        pname = "libstackexchange";
        version = "0.3.0.0";
        sha256 = "00v8hmk67dsb0j1bncc06fh46jkz4raf5a796l223mg6x0l3a828";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default
          http-conduit profunctors text
        ];
@@ -83781,24 +85929,22 @@ self: {
      }) {};
 
   "libsystemd-daemon" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, libsystemd-daemon
-     , network, systemd-daemon, test-framework, test-framework-hunit
-     , utf8-string
+    ({ mkDerivation, base, bytestring, HUnit, network, systemd-daemon
+     , test-framework, test-framework-hunit, utf8-string
      }:
      mkDerivation {
        pname = "libsystemd-daemon";
        version = "0.1.0.1";
        sha256 = "1rmzyca7ry30d6wvhv3k30jaksa3iw8kzk1rwp6gwclxizsvwgf0";
-       buildDepends = [ base bytestring network utf8-string ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring network utf8-string ];
+       librarySystemDepends = [ systemd-daemon ];
+       testHaskellDepends = [
          base HUnit network test-framework test-framework-hunit
        ];
-       extraLibraries = [ systemd-daemon ];
-       pkgconfigDepends = [ libsystemd-daemon ];
        description = "Haskell bindings for libsystemd-daemon";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { libsystemd-daemon = null;  systemd-daemon = null;};
+     }) { systemd-daemon = null;};
 
   "libsystemd-journal" = callPackage
     ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes
@@ -83809,11 +85955,11 @@ self: {
        pname = "libsystemd-journal";
        version = "1.3.3";
        sha256 = "02d1zpmimmisjngkx9l23af51v18pdbc5mh7yljyw81lm39yzvfn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring hashable hsyslog pipes pipes-safe text transformers
          uniplate unix-bytestring unordered-containers uuid vector
        ];
-       pkgconfigDepends = [ systemd ];
+       libraryPkgconfigDepends = [ systemd ];
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
@@ -83825,9 +85971,9 @@ self: {
        pname = "libtagc";
        version = "0.12.0";
        sha256 = "1f7r82cfrkxrqcrxk92y6zhk79qwpack2g67crww5q8hs7438vja";
-       buildDepends = [ base bytestring glib ];
-       extraLibraries = [ taglib ];
-       pkgconfigDepends = [ taglib ];
+       libraryHaskellDepends = [ base bytestring glib ];
+       librarySystemDepends = [ taglib ];
+       libraryPkgconfigDepends = [ taglib ];
        jailbreak = true;
        homepage = "https://patch-tag.com/r/AndyStewart/libtagc/home";
        description = "Binding to TagLib C library";
@@ -83840,9 +85986,9 @@ self: {
        pname = "libvirt-hs";
        version = "0.1";
        sha256 = "0fgxvzzfw52s4hs838l0sr6lxln4bhqqhzzy6grww2fs27gjpb4c";
-       buildDepends = [ base syb ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ virt ];
+       libraryHaskellDepends = [ base syb ];
+       librarySystemDepends = [ virt ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://redmine.iportnov.ru/projects/libvirt-hs";
        description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
        license = stdenv.lib.licenses.bsd3;
@@ -83855,7 +86001,7 @@ self: {
        pname = "libvorbis";
        version = "0.1.0.1";
        sha256 = "0ykv2jv559yalypadwnvpzv87rksn24b4h8qi9x1x6r2x4kbwvrl";
-       buildDepends = [ base bytestring cpu ];
+       libraryHaskellDepends = [ base bytestring cpu ];
        homepage = "https://github.com/the-real-blackh/libvorbis";
        description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files";
        license = stdenv.lib.licenses.bsd3;
@@ -83867,8 +86013,8 @@ self: {
        pname = "libxml";
        version = "0.1.1";
        sha256 = "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi";
-       buildDepends = [ base bytestring mtl ];
-       extraLibraries = [ libxml2 ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       librarySystemDepends = [ libxml2 ];
        description = "Binding to libxml2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83882,7 +86028,7 @@ self: {
        pname = "libxml-enumerator";
        version = "0.5";
        sha256 = "0mqh454w1f3k75kcshdn848ynva938q6xm3a5yzcyf7nflzw75pg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator libxml-sax text transformers xml-types
        ];
        jailbreak = true;
@@ -83897,9 +86043,9 @@ self: {
        pname = "libxml-sax";
        version = "0.7.5";
        sha256 = "0lbdq6lmiyrnzk6gkx09vvp928wj8qnqnqfzy14mfv0drj21f54r";
-       buildDepends = [ base bytestring text xml-types ];
-       extraLibraries = [ libxml2 ];
-       pkgconfigDepends = [ libxml2 ];
+       libraryHaskellDepends = [ base bytestring text xml-types ];
+       librarySystemDepends = [ libxml2 ];
+       libraryPkgconfigDepends = [ libxml2 ];
        homepage = "https://john-millikin.com/software/haskell-libxml/";
        description = "Bindings for the libXML2 SAX interface";
        license = stdenv.lib.licenses.mit;
@@ -83911,8 +86057,8 @@ self: {
        pname = "libxslt";
        version = "0.1";
        sha256 = "1szz8zkm1w8dbfgix3ii896sc4vljgivcgx8j7vpny4ci9sfmn5a";
-       buildDepends = [ base bytestring libxml ];
-       extraLibraries = [ xslt ];
+       libraryHaskellDepends = [ base bytestring libxml ];
+       librarySystemDepends = [ xslt ];
        jailbreak = true;
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
@@ -83927,7 +86073,7 @@ self: {
        sha256 = "0drsv1d0318yr7a0aa2j6kvsiyl8jj8h4z6wpdnrcyxw6z4qlssq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base GLUT OpenGL random ];
+       executableHaskellDepends = [ array base GLUT OpenGL random ];
        homepage = "http://github.com/sproingie/haskell-cells/";
        description = "Conway's Life cellular automaton";
        license = stdenv.lib.licenses.bsd3;
@@ -83942,10 +86088,10 @@ self: {
        pname = "lifted-async";
        version = "0.7.0.1";
        sha256 = "0skfpgqlxni3bdn7pdg2732xkijmwsz655962wrbmflh987ms8y3";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base constraints lifted-base monad-control transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base HUnit lifted-base monad-control mtl tasty tasty-hunit
          tasty-th
        ];
@@ -83963,8 +86109,8 @@ self: {
        pname = "lifted-base";
        version = "0.2.3.6";
        sha256 = "1yz14a1rsgknwyl08n4kxrlc26hfwmb95a3c2drbnsgmhdyq7iap";
-       buildDepends = [ base monad-control transformers-base ];
-       testDepends = [
+       libraryHaskellDepends = [ base monad-control transformers-base ];
+       testHaskellDepends = [
          base HUnit monad-control test-framework test-framework-hunit
          transformers transformers-base transformers-compat
        ];
@@ -83979,7 +86125,9 @@ self: {
        pname = "lifted-threads";
        version = "1.0";
        sha256 = "1sq071bn5z8ks2qj52bfx6n8bdx2chijh62ai3rz6lmjai6dazbz";
-       buildDepends = [ base monad-control threads transformers-base ];
+       libraryHaskellDepends = [
+         base monad-control threads transformers-base
+       ];
        homepage = "https://github.com/scrive/lifted-threads";
        description = "lifted IO operations from the threads library";
        license = stdenv.lib.licenses.bsd3;
@@ -83995,7 +86143,7 @@ self: {
        sha256 = "11c0j2mdrp4rvinl4iym9mfsqzh101yb5sf710vm8n7qih1fzcpc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bitmap bytestring directory filepath gloss mtl stb-image
        ];
        homepage = "http://icfpcontest2012.wordpress.com/";
@@ -84010,7 +86158,7 @@ self: {
        pname = "ligature";
        version = "0.1.0.0";
        sha256 = "03h30lbhppi9hmpsc8fhsrsad6w9sjs9n53lz76czz3iqaknkcrb";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        jailbreak = true;
        description = "Expand ligatures in unicode text";
        license = stdenv.lib.licenses.mit;
@@ -84022,7 +86170,7 @@ self: {
        pname = "ligd";
        version = "0.2";
        sha256 = "1hxfx514ar9hr9gqzzdgd7avfvlsvr7lv6hgza5k04b2xm73ysrp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/spl/ligd";
        description = "Lightweight Implementation of Generics and Dynamics";
        license = stdenv.lib.licenses.bsd3;
@@ -84036,10 +86184,10 @@ self: {
        pname = "lighttpd-conf";
        version = "0.4";
        sha256 = "085msb62wpqyc1sp4zbwbyn70k48p9k9cky9rxn93xm0gjsaydf8";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring packedstring pretty template-haskell
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        description = "Lighttpd configuration file tools";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84053,7 +86201,7 @@ self: {
        pname = "lighttpd-conf-qq";
        version = "0.5";
        sha256 = "1nd30inhh6wzq34rg76lq6m3wp0x3sc0l7jv37gw6dk3dnkwqh6q";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring haskell-src-exts lighttpd-conf
          template-haskell
        ];
@@ -84070,7 +86218,7 @@ self: {
        pname = "lilypond";
        version = "1.9.0";
        sha256 = "1nb6kkp5gbsbkjbbicyd49ckg2j9dm4a1l9ya4vp38br5j7dn4gw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default music-dynamics-literal music-pitch-literal
          prettify process semigroups vector-space
        ];
@@ -84087,15 +86235,14 @@ self: {
        pname = "limp";
        version = "0.3.2.1";
        sha256 = "0fx8q7ll47qc06laagiap0z4b5mbp958r3b9mc6qm1h9rhksimjk";
-       buildDepends = [ base containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck tasty-th
        ];
        jailbreak = true;
        homepage = "https://github.com/amosr/limp";
        description = "representation of Integer Linear Programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "limp-cbc" = callPackage
@@ -84104,9 +86251,9 @@ self: {
        pname = "limp-cbc";
        version = "0.3.2.1";
        sha256 = "0q4az96nbwvm7jhrwvbjp87vzkb5nlp739jhkya6z0iq340cjxjy";
-       buildDepends = [ base containers limp vector ];
-       testDepends = [ base limp ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base containers limp vector ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base limp ];
        homepage = "https://github.com/amosr/limp-cbc";
        description = "bindings for integer linear programming solver Coin/CBC";
        license = stdenv.lib.licenses.mit;
@@ -84119,7 +86266,7 @@ self: {
        pname = "lin-alg";
        version = "0.1.0.2";
        sha256 = "19123k967mql69my6c19mnvp4qwa4b3bgimmlbhipqdljykj7pqc";
-       buildDepends = [ base NumInstances vector ];
+       libraryHaskellDepends = [ base NumInstances vector ];
        description = "Low-dimensional matrices and vectors for graphics and physics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84131,7 +86278,7 @@ self: {
        pname = "linda";
        version = "0.1.2";
        sha256 = "0d58i69hvry9vzr4i7f1yhhm99808vqw238hfjc3sr51plc1is45";
-       buildDepends = [ base hmatrix HUnit ];
+       libraryHaskellDepends = [ base hmatrix HUnit ];
        description = "LINear Discriminant Analysis";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84142,7 +86289,7 @@ self: {
        pname = "lindenmayer";
        version = "0.1.0.1";
        sha256 = "07gz4lbvyzahffcp6f1f87zl20kf834iswh671vb8vxffigrz5y1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/reinh/hs-lindenmayer";
        description = "L-systems in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -84156,7 +86303,7 @@ self: {
        sha256 = "01w5bk58n14vni6cb8rc4ri3hpgism1c78jk605927yf2llxnc14";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Convert newlines in text";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -84169,7 +86316,8 @@ self: {
        sha256 = "0x8kbjjd9i6gp0agdfsfgicj2z1g4jwj7axj4hq01c31wrzb6g95";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
+       executableHaskellDepends = [ base bytestring containers ];
        description = "Simple command-line utility to convert text into PDF";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84187,13 +86335,13 @@ self: {
        pname = "linear";
        version = "1.19.1.3";
        sha256 = "1hprmhs1nm6l81kpnnznz92l66j10z4asn3g3l9c47165q881592";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base binary bytes cereal containers deepseq
          distributive ghc-prim hashable lens reflection semigroupoids
          semigroups tagged template-haskell transformers transformers-compat
          unordered-containers vector void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring directory doctest filepath HUnit lens
          simple-reflect test-framework test-framework-hunit
        ];
@@ -84208,7 +86356,7 @@ self: {
        pname = "linear-accelerate";
        version = "0.2";
        sha256 = "0433mzw2cswk86nmj3gnygn3d07yq0sbmv2ylxbw8ri35yddjap6";
-       buildDepends = [ accelerate base lens linear ];
+       libraryHaskellDepends = [ accelerate base lens linear ];
        homepage = "http://github.com/ekmett/linear-accelerate/";
        description = "Instances to use linear vector spaces on accelerate backends";
        license = stdenv.lib.licenses.bsd3;
@@ -84224,9 +86372,11 @@ self: {
        sha256 = "1wsan17zrlg4kr9dwk23ggfvylignnmg4sa62krri45s925kvh3i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base ieee754 QuickCheck storable-complex test-framework
-         test-framework-quickcheck2 vector
+       libraryHaskellDepends = [
+         base ieee754 QuickCheck storable-complex vector
+       ];
+       executableHaskellDepends = [
+         QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "http://github.com/cartazio/hs-cblas";
        description = "A linear algebra library with bindings to BLAS and LAPACK";
@@ -84240,8 +86390,8 @@ self: {
        pname = "linear-grammar";
        version = "0.0.2.1";
        sha256 = "00vfhcqhg6azb1ay12n248l0bjg5g0c5y5ybz5rqf2jdlab7fg97";
-       buildDepends = [ base containers QuickCheck ];
-       testDepends = [ base containers hspec QuickCheck ];
+       libraryHaskellDepends = [ base containers QuickCheck ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A simple grammar for building linear equations and inclusive inequalities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84254,7 +86404,7 @@ self: {
        sha256 = "0671px94wvqg2yyc8qhjcwrv5k2ifwp5mrj7fkcwlwvg8w1bp19k";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers HUnit ];
+       libraryHaskellDepends = [ base containers HUnit ];
        jailbreak = true;
        description = "Finite maps for linear use";
        license = stdenv.lib.licenses.bsd3;
@@ -84269,7 +86419,7 @@ self: {
        pname = "linear-opengl";
        version = "0.2.0.8";
        sha256 = "18yy35pcl4jg0albh9dhngi7q4ak40fzr6ypa2piz2di4zqhfqp6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base distributive lens linear OpenGL OpenGLRaw tagged
        ];
        jailbreak = true;
@@ -84284,7 +86434,7 @@ self: {
        pname = "linear-vect";
        version = "0.1.1.0";
        sha256 = "0i6z10pgqcykkygl6kq63phx5hvwi2d84j2f5vw4nrnic59sm9jy";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        jailbreak = true;
        homepage = "https://github.com/capsjac/linear-vect";
        description = "A low-dimensional linear algebra library, operating on the Num typeclass";
@@ -84297,7 +86447,7 @@ self: {
        pname = "linearEqSolver";
        version = "1.3";
        sha256 = "0bszi1k27ag4yk31zxkn3jk3cqh1xzdcscm4nb6k4n0psf0qm2rp";
-       buildDepends = [ base sbv ];
+       libraryHaskellDepends = [ base sbv ];
        homepage = "http://github.com/LeventErkok/linearEqSolver";
        description = "Use SMT solvers to solve linear systems over integers and rationals";
        license = stdenv.lib.licenses.bsd3;
@@ -84309,7 +86459,9 @@ self: {
        pname = "linearscan";
        version = "0.7.0";
        sha256 = "13sfwkjg94q47lfxw5zddi8xpf4az07g88yq5pvgnh3vs5xggwip";
-       buildDepends = [ base containers ghc-prim mtl transformers ];
+       libraryHaskellDepends = [
+         base containers ghc-prim mtl transformers
+       ];
        homepage = "http://github.com/jwiegley/linearscan";
        description = "Linear scan register allocator, formally verified in Coq";
        license = stdenv.lib.licenses.bsd3;
@@ -84325,10 +86477,10 @@ self: {
        pname = "linearscan-hoopl";
        version = "0.7.0";
        sha256 = "1zvzgcj5yln6g3mqljgcyjpjj2visiigd7qwl70l1zclz5zcfynv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers free hoopl linearscan QuickCheck transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers deepseq fuzzcheck hoopl hspec hspec-expectations
          lens-family-core linearscan QuickCheck transformers
        ];
@@ -84345,7 +86497,7 @@ self: {
        pname = "linebreak";
        version = "1.0.0.3";
        sha256 = "1fds2mgsijfsc96dq95skn562iv2r341zr7v0qsz48y9fh97s3p7";
-       buildDepends = [ base hyphenation ];
+       libraryHaskellDepends = [ base hyphenation ];
        homepage = "http://ariis.it/static/articles/linebreak/page.html";
        description = "breaks strings to fit width";
        license = stdenv.lib.licenses.bsd3;
@@ -84357,7 +86509,7 @@ self: {
        pname = "linguistic-ordinals";
        version = "0.1.0.0";
        sha256 = "0adcdxf0lxc372j12fk87klyrgr3b42sas6f1smiyza4wicjp9h3";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        jailbreak = true;
        homepage = "http://github.com/argiopetech/linguistic-ordinals";
        description = "Express Integral types as linguistic ordinals (1st, 2nd, 3rd, etc)";
@@ -84373,7 +86525,9 @@ self: {
        sha256 = "0fzszn8nb5kglg4s5hk9k51vdkarlc08bdp67rbrj0cwfxpkn6wd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gtk haskell98 popenhs regex-compat unix ];
+       executableHaskellDepends = [
+         base gtk haskell98 popenhs regex-compat unix
+       ];
        homepage = "http://www.haskell.org/~petersen/haskell/linkchk/";
        description = "linkchk is a network interface link ping monitor";
        license = "GPL";
@@ -84388,7 +86542,9 @@ self: {
        sha256 = "0m1jwqa3vbiyzcdrn1h63dm0709j5xijm00j2x7dpwgn8k92iq81";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers extcore filepath process ];
+       executableHaskellDepends = [
+         base containers extcore filepath process
+       ];
        description = "Combines multiple GHC Core modules into a single module";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84402,10 +86558,10 @@ self: {
        pname = "linkedhashmap";
        version = "0.4.0.0";
        sha256 = "1bv39g9vivr3j8arnpla39dhnwaja5l9da2yw580pzmw5bqi0wyq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq hashable unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers deepseq hashable mtl tasty tasty-hunit
          unordered-containers
        ];
@@ -84422,7 +86578,7 @@ self: {
        pname = "linklater";
        version = "3.2.0.0";
        sha256 = "15c6p63yd1g5if2nz9pig6kc0rvqpjixjs6zr2j9m16q0h6kgrfr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base-prelude bytestring containers http-types text wai
          wreq
        ];
@@ -84439,10 +86595,10 @@ self: {
        pname = "linux-blkid";
        version = "0.2.0.0";
        sha256 = "06f7zwb40zgps6503cyp65c68181gj3s9q1s6vh43y6najiimzqx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-control transformers transformers-base
        ];
-       pkgconfigDepends = [ blkid ];
+       libraryPkgconfigDepends = [ blkid ];
        jailbreak = true;
        description = "Linux libblkid";
        license = stdenv.lib.licenses.lgpl21;
@@ -84455,7 +86611,7 @@ self: {
        pname = "linux-cgroup";
        version = "0.1.1.2";
        sha256 = "0dd1ii1n6y9frilnkxikzahp9xrh3i334i7syvd8fyxp51dpzgy1";
-       buildDepends = [ base filepath ];
+       libraryHaskellDepends = [ base filepath ];
        jailbreak = true;
        description = "Very basic interface to the Linux CGroup Virtual Filesystem";
        license = stdenv.lib.licenses.mit;
@@ -84467,7 +86623,7 @@ self: {
        pname = "linux-evdev";
        version = "0.3.1";
        sha256 = "1zx5m0446rkbbj43m1f110a7jvl7vd7wkhikqql608a0jzqr7bk0";
-       buildDepends = [ base bytestring time unix ];
+       libraryHaskellDepends = [ base bytestring time unix ];
        homepage = "http://github.com/bgamari/linux-evdev";
        description = "Bindings to Linux evdev input device interface";
        license = stdenv.lib.licenses.bsd3;
@@ -84481,7 +86637,7 @@ self: {
        sha256 = "1l4vznam1a8vf3nixhbmw38rpzkvmbka0cbdfdsgfrpn03kxjz3c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "https://github.com/redneb/linux-file-extents";
        description = "Retrieve file fragmentation information under Linux";
        license = stdenv.lib.licenses.bsd3;
@@ -84493,7 +86649,7 @@ self: {
        pname = "linux-inotify";
        version = "0.2.0.1";
        sha256 = "1970v1zkbp45amylmg79bbdfhk8kg6vzxjznd76gfl5kff2cv12r";
-       buildDepends = [ base bytestring hashable unix ];
+       libraryHaskellDepends = [ base bytestring hashable unix ];
        description = "Thinner binding to the Linux Kernel's inotify interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84504,8 +86660,8 @@ self: {
        pname = "linux-kmod";
        version = "0.1.0.1";
        sha256 = "1vqbibp93fw6r03v5q2cisya6m12xb12rad11myxrkbn29rjmhws";
-       buildDepends = [ base directory ];
-       pkgconfigDepends = [ libkmod ];
+       libraryHaskellDepends = [ base directory ];
+       libraryPkgconfigDepends = [ libkmod ];
        homepage = "https://github.com/tensor5/linux-kmod";
        description = "Linux kernel modules support";
        license = stdenv.lib.licenses.bsd3;
@@ -84518,7 +86674,7 @@ self: {
        pname = "linux-mount";
        version = "0.2.0.1";
        sha256 = "12bwrniaxg6gm347jdgbf535pdz4z57pkyiwa98c903y9q9ssnyi";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/tensor5/linux-mount";
        description = "Mount and unmount filesystems";
        license = stdenv.lib.licenses.bsd3;
@@ -84530,7 +86686,7 @@ self: {
        pname = "linux-namespaces";
        version = "0.1.2.0";
        sha256 = "0yznnp9rdz15drm79pvbqbrbk2nczbkmlf00pb7rki7w1l9njp2q";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "https://github.com/redneb/hs-linux-namespaces";
        description = "Create new or enter an existing linux namespaces";
        license = stdenv.lib.licenses.bsd3;
@@ -84546,9 +86702,12 @@ self: {
        sha256 = "18akjagbqw2fswrnp4ifzivwdwsbny28kvnm0hfc1ysyy9id8511";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring containers directory filepath ghc-events mtl
-         pretty process unix
+       libraryHaskellDepends = [
+         base binary bytestring containers mtl pretty
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory filepath ghc-events process
+         unix
        ];
        jailbreak = true;
        homepage = "https://github.com/bjpop/haskell-linux-perf";
@@ -84565,7 +86724,7 @@ self: {
        pname = "linux-ptrace";
        version = "0.1.2";
        sha256 = "0hzniy9vlycbsqkrr9xxdgnx070h5v6jz4gqx7rc60a3q0hqn43m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring mmap posix-waitpid process template-haskell unix
        ];
        jailbreak = true;
@@ -84580,7 +86739,7 @@ self: {
        pname = "linux-xattr";
        version = "0.1.1.0";
        sha256 = "0rpq5sm557gm227id2rfsffgr47lrj4d4kpzh194d74dx2qkg5g6";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/tensor5/linux-xattr";
        description = "Read, set and list extended attributes";
        license = stdenv.lib.licenses.bsd3;
@@ -84596,8 +86755,9 @@ self: {
        sha256 = "0diacwvxpq2iyfzlcmdqrbfndhmlmgzq9hvxlyp12idlzwa9p1cq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring network time ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring network ];
+       executableHaskellDepends = [ base binary bytestring network time ];
+       testHaskellDepends = [
          base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -84613,7 +86773,7 @@ self: {
        pname = "lio";
        version = "0.11.5.0";
        sha256 = "10miy18x1898dcq58bnk0md3ymw9ckh9j26grsr6w3jqnvw69712";
-       buildDepends = [ base bytestring containers hashable ];
+       libraryHaskellDepends = [ base bytestring containers hashable ];
        description = "Labeled IO Information Flow Control Library";
        license = "GPL";
      }) {};
@@ -84626,7 +86786,7 @@ self: {
        pname = "lio-eci11";
        version = "0.2";
        sha256 = "11vl27kn0wdxndkwn3yvxd6kg9jv0lilxpvx2hkax37lq3x15rc8";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers dclabel-eci11 directory filepath
          mtl old-time SHA time unix
        ];
@@ -84643,7 +86803,7 @@ self: {
        pname = "lio-fs";
        version = "0.0.1.2";
        sha256 = "1zzxsr0kg3bxm2wzhsqw2irk5myzshgqhr3fxi062hzw2rh0nqn9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath lio SHA unix xattr
        ];
        description = "Labeled File System interface for LIO";
@@ -84661,10 +86821,13 @@ self: {
        sha256 = "1nddiakk6b9biay6ijnc48dxcfgpi9vx4g6a8r9vz6cjh6mh0154";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson attoparsec base base64-bytestring bytestring cmdargs conduit
-         directory filepath http-types lio simple simple-templates text wai
-         wai-extra warp
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring conduit filepath http-types lio
+         simple simple-templates text wai wai-extra warp
+       ];
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring cmdargs directory filepath
+         simple-templates text
        ];
        jailbreak = true;
        homepage = "http://simple.cx";
@@ -84679,7 +86842,7 @@ self: {
        pname = "lipsum-gen";
        version = "0.1.0.2";
        sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        description = "Generators for random sequences of English-like nonsense text";
        license = stdenv.lib.licenses.bsd3;
@@ -84688,9 +86851,9 @@ self: {
   "liquid-fixpoint" = callPackage
     ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors
      , bytestring, cmdargs, containers, deepseq, directory, filemanip
-     , filepath, ghc-prim, hashable, intern, mtl, ocaml, parsec, pretty
+     , filepath, ghc-prim, hashable, intern, mtl, parsec, pretty
      , process, syb, tasty, tasty-hunit, tasty-rerun, text, text-format
-     , transformers, unordered-containers, z3
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "liquid-fixpoint";
@@ -84698,22 +86861,25 @@ self: {
        sha256 = "00s5ch8i96nqjy2kq6y3i25mji3ld6z8121ngpbz87zbgp3zwhaw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal array attoparsec base bifunctors bytestring cmdargs
          containers deepseq directory filemanip filepath ghc-prim hashable
          intern mtl parsec pretty process syb text text-format transformers
          unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         ansi-terminal array base bifunctors bytestring cmdargs containers
+         deepseq directory filepath hashable mtl parsec pretty process syb
+         text text-format unordered-containers
+       ];
+       testHaskellDepends = [
          base directory filepath process tasty tasty-hunit tasty-rerun text
        ];
-       buildTools = [ ocaml z3 ];
-       configureFlags = [ "-fbuild-external" ];
        homepage = "https://github.com/ucsd-progsys/liquid-fixpoint";
        description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ocaml;  inherit (pkgs) z3;};
+     }) {};
 
   "liquidhaskell" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base, bifunctors
@@ -84722,7 +86888,7 @@ self: {
      , hashable, hpc, hscolour, intern, liquid-fixpoint, mtl
      , optparse-applicative, parsec, pretty, process, syb, tagged, tasty
      , tasty-hunit, tasty-rerun, template-haskell, text, time
-     , unordered-containers, vector, z3
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "liquidhaskell";
@@ -84730,23 +86896,29 @@ self: {
        sha256 = "1yxg6zii0mbsri5j37k2s976nyglijyjfgz9vwafiqdrca328z4s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-terminal array base bifunctors bytestring cmdargs
          containers cpphs data-default deepseq Diff directory filemanip
          filepath fingertree ghc ghc-paths hashable hpc hscolour intern
          liquid-fixpoint mtl parsec pretty process syb template-haskell text
          time unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson ansi-terminal array base bifunctors bytestring cmdargs
+         containers cpphs data-default deepseq Diff directory filemanip
+         filepath fingertree ghc ghc-paths hashable hpc hscolour
+         liquid-fixpoint mtl parsec pretty process syb template-haskell text
+         time unordered-containers vector
+       ];
+       testHaskellDepends = [
          base directory filepath optparse-applicative process tagged tasty
          tasty-hunit tasty-rerun
        ];
-       buildTools = [ z3 ];
        homepage = "http://goto.ucsd.edu/liquidhaskell";
        description = "Liquid Types for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) z3;};
+     }) {};
 
   "lispparser" = callPackage
     ({ mkDerivation, base, parsec }:
@@ -84754,7 +86926,7 @@ self: {
        pname = "lispparser";
        version = "0.3.1";
        sha256 = "1hj5fwmzxp2gw2gx86wa1fy36jmmh3sf8kd4acc8x0rghpmlw0w8";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Simple parser for LISP S-expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84765,7 +86937,7 @@ self: {
        pname = "list-extras";
        version = "0.4.1.4";
        sha256 = "15vjk6y3zwiffm1x8wlzv6203ykzm2phalqlq4zhmhcj2wd70viw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Common not-so-common functions for lists";
        license = stdenv.lib.licenses.bsd3;
@@ -84777,8 +86949,8 @@ self: {
        pname = "list-fusion-probe";
        version = "0.1.0.3";
        sha256 = "1djmh6bwnmp64vwq5f5j4f54ygrjkl56gp0la06yxknyvyn9k8jp";
-       buildDepends = [ base ];
-       testDepends = [ base tasty tasty-hunit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        description = "testing list fusion for success";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84789,7 +86961,7 @@ self: {
        pname = "list-grouping";
        version = "0.1.1";
        sha256 = "0w9f68cr4k0p8zl81y8ax19i6ypzks0y27hdlz71wwmgn5v2y63l";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://coder.bsimmons.name/blog/2009/08/list-grouping-module-released/";
        description = "Functions for grouping a list into sublists";
        license = stdenv.lib.licenses.bsd3;
@@ -84801,7 +86973,7 @@ self: {
        pname = "list-mux";
        version = "1.0";
        sha256 = "147zb156g79a5p1w0b9vcvjy5x7nsrhng5rgjqq3cy3xpbam4nys";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/hellertime/list-mux";
        description = "List Multiplexing";
@@ -84820,12 +86992,12 @@ self: {
        sha256 = "1bq5244ys4xy3pfj72dq399x0g57q41lrllbd5hgvk9z0j92lxys";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs configurator containers directory dns
          filepath HDBC HDBC-postgresql HDBC-sqlite3 MissingH tasty
          tasty-hunit tasty-quickcheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cmdargs configurator containers directory dns
          doctest filemanip filepath HDBC HDBC-postgresql HDBC-sqlite3
          MissingH tasty tasty-hunit tasty-quickcheck
@@ -84842,11 +87014,11 @@ self: {
        pname = "list-t";
        version = "0.4.5.1";
        sha256 = "0mf1dv0pcbc2sgnimjkhmivl32ivjck7arhkq679s1ba5hc6np3a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude mmorph monad-control mtl transformers
          transformers-base
        ];
-       testDepends = [ base-prelude HTF mmorph mtl-prelude ];
+       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t";
        description = "ListT done right";
@@ -84861,10 +87033,10 @@ self: {
        pname = "list-t-attoparsec";
        version = "0.4.0.2";
        sha256 = "02sr57qpw8r38s9hb0wj0pik7x4rqgs51hl4s1mmnihgdflm0jb1";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base-prelude either list-t text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base-prelude either hspec list-t list-t-text text
        ];
        homepage = "https://github.com/nikita-volkov/list-t-attoparsec";
@@ -84882,12 +87054,12 @@ self: {
        pname = "list-t-html-parser";
        version = "0.4.0.0";
        sha256 = "1i243xa52ljqr79zccybx3x5nb58lvsfq4q99n2kk2qyhwyv7wb5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude case-insensitive conversion
          conversion-case-insensitive conversion-text either html-entities
          html-tokenizer list-t mtl-prelude text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base-prelude conversion conversion-text hspec html-tokenizer
          list-t-attoparsec list-t-text text
        ];
@@ -84906,7 +87078,7 @@ self: {
        pname = "list-t-http-client";
        version = "0.1.0.1";
        sha256 = "02wxqsfixzv7ccznydp3vij7maqvxhsbailakij2fcfrf2acw3g2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude bytestring http-client list-t mtl-prelude
        ];
        homepage = "https://github.com/nikita-volkov/list-t-http-client";
@@ -84922,7 +87094,7 @@ self: {
        pname = "list-t-libcurl";
        version = "0.3.0.0";
        sha256 = "1hcgxr87q7k6ixisj4p4gghm7nqb1l7bg361rcnqxf1145xmyyr5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude bytestring curlhs either list-t mtl-prelude
          resource-pool stm
        ];
@@ -84939,8 +87111,10 @@ self: {
        pname = "list-t-text";
        version = "0.2.0.2";
        sha256 = "1hsbisvmjprfzhqlhzmicxzyv67ylik0dazl4yjyilh8frjd7qlm";
-       buildDepends = [ base-prelude bytestring list-t mtl-prelude text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base-prelude bytestring list-t mtl-prelude text
+       ];
+       testHaskellDepends = [
          base base-prelude bytestring hspec list-t QuickCheck
          quickcheck-instances text transformers
        ];
@@ -84957,7 +87131,8 @@ self: {
        sha256 = "06li8zwhy3i3shgqrq4505af1b1dz9xpzx2lpx2has4p79bgd1mq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary containers dlist ];
+       libraryHaskellDepends = [ base binary containers dlist ];
+       executableHaskellDepends = [ base binary containers dlist ];
        homepage = "http://iki.fi/matti.niemenmaa/list-tries/";
        description = "Tries and Patricia tries: finite sets and maps for list keys";
        license = stdenv.lib.licenses.bsd3;
@@ -84969,7 +87144,7 @@ self: {
        pname = "listlike-instances";
        version = "0.2.3.1";
        sha256 = "0mkhnqn7wxspzxvivhaksxmxp7d6x9bazhl28nl9gck56bpa90sm";
-       buildDepends = [ base bytestring ListLike text vector ];
+       libraryHaskellDepends = [ base bytestring ListLike text vector ];
        jailbreak = true;
        homepage = "http://jwlato.webfactional.com/haskell/listlike-instances";
        description = "Extra instances of the ListLike class";
@@ -84983,7 +87158,7 @@ self: {
        pname = "lists";
        version = "0.4.2";
        sha256 = "0qjziksh6gl6v8rzvqajkcbakbby5j3i4z2jk6w6zs89b93rwnln";
-       buildDepends = [ base list-extras split ];
+       libraryHaskellDepends = [ base list-extras split ];
        description = "Functions for dealing with lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84994,7 +87169,7 @@ self: {
        pname = "listsafe";
        version = "0.1.0.1";
        sha256 = "0scd74fv6gzl7yi5ssb1z9kwwfyx9p39yqprnzbpvspvxm3k41qs";
-       buildDepends = [ base exceptions ];
+       libraryHaskellDepends = [ base exceptions ];
        homepage = "https://github.com/ombocomp/listsafe";
        description = "Safe wrappers for partial list functions, supporting MonadThrow";
        license = stdenv.lib.licenses.asl20;
@@ -85011,7 +87186,7 @@ self: {
        sha256 = "0xnbifi0g1kmxi88l9f77ypkgmdvhi69vy3fycbxwn926gc12v1r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html blaze-markup cheapskate directory filepath
          highlighting-kate parsec text time unordered-containers
        ];
@@ -85027,7 +87202,7 @@ self: {
        pname = "literals";
        version = "1.0";
        sha256 = "06n4svp0qss78l8827qmppmd63877wq01d6w9xagd10vn3c4hs2j";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Non-overloaded functions for concrete literals";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85047,12 +87222,13 @@ self: {
        sha256 = "04n8s2p772ylzfjpclbrq01im0j9rlp0xd37i8jshll7r51iz66l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base event-list non-negative ];
+       executableHaskellDepends = [
          alsa-core alsa-seq base bytestring cgi concurrent-split containers
-         data-accessor data-accessor-transformers directory event-list
+         data-accessor data-accessor-transformers directory
          explicit-exception filepath html httpd-shed midi midi-alsa network
-         non-empty non-negative parsec pretty process stm stm-split strict
-         transformers unix utility-ht wx wxcore
+         non-empty parsec pretty process stm stm-split strict transformers
+         unix utility-ht wx wxcore
        ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer";
@@ -85067,8 +87243,8 @@ self: {
        pname = "ll-picosat";
        version = "0.1.0.0";
        sha256 = "0393ccnlink30492aw1gyv4jzd7rsckd8ymkm1wgbpma13vkf67h";
-       buildDepends = [ base ];
-       extraLibraries = [ picosat ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ picosat ];
        jailbreak = true;
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85080,7 +87256,7 @@ self: {
        pname = "llrbtree";
        version = "0.1.1";
        sha256 = "057bp1f1mpzlgg408b02x1bdzsixrrkcl1536nyvhp43rvxmgj61";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Purely functional sets and heaps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85096,7 +87272,7 @@ self: {
        sha256 = "1v1yaaj02qk6z58kiz3g7dr9cik8141vv409cyxlzqv1k79rpzrg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal containers dataenc ghc-prim hexpat
          mtl network old-locale parsec pretty random template-haskell text
          time utf8-string uuid
@@ -85116,7 +87292,7 @@ self: {
        pname = "llvm";
        version = "3.2.0.2";
        sha256 = "11k1m80vg9x6fgiyh9gxzl1i2i0l0jw9hbn3gs1d1dd7avzl9mrr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory llvm-base mtl process
          type-level
        ];
@@ -85137,14 +87313,14 @@ self: {
        pname = "llvm-analysis";
        version = "0.3.0";
        sha256 = "0jck1c9wy11wjss6aji64jw927mrncwd2nmnq65zq85r5hha3m8k";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base boomerang bytestring containers deepseq directory
          failure fgl filemanip filepath GenericPretty graphviz hashable
          hoopl HUnit ifscs itanium-abi lens llvm-base-types monad-par
          process temporary test-framework test-framework-hunit text
          transformers uniplate unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers filepath HUnit itanium-abi
          llvm-data-interop transformers uniplate unordered-containers
        ];
@@ -85153,17 +87329,16 @@ self: {
      }) {};
 
   "llvm-base" = callPackage
-    ({ mkDerivation, base, llvm, mtl }:
+    ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "llvm-base";
        version = "3.2.0.2";
        sha256 = "1f76nb85hnidp06v6lbl4aasac4h7ff9r8i054m8cnby2vc59r4n";
-       buildDepends = [ base mtl ];
-       extraLibraries = [ llvm ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/bos/llvm";
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (self.llvmPackages) llvm;};
+     }) {};
 
   "llvm-base-types" = callPackage
     ({ mkDerivation, base, c2hs, containers, deepseq, dwarf, failure
@@ -85174,12 +87349,12 @@ self: {
        pname = "llvm-base-types";
        version = "0.3.0";
        sha256 = "142xc7w250y0nx60qnm4gc5hrqjm1bxk0nhgsp669g5kvxqcd3bn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq dwarf failure GenericPretty graphviz
          hashable pretty regex-tdfa text transformers unordered-containers
          vector
        ];
-       buildTools = [ c2hs ];
+       libraryToolDepends = [ c2hs ];
        description = "The base types for a mostly pure Haskell LLVM analysis library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85190,7 +87365,7 @@ self: {
        pname = "llvm-base-util";
        version = "3.0.1.0";
        sha256 = "07q6dvwkg7h6qkwq0a7719g82anipj2pk0xid5p24pvzssa9z22w";
-       buildDepends = [ base llvm-base ];
+       libraryHaskellDepends = [ base llvm-base ];
        homepage = "https://github.com/bos/llvm";
        description = "Utilities for bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -85206,12 +87381,12 @@ self: {
        pname = "llvm-data-interop";
        version = "0.3.0";
        sha256 = "08kflxb0qannp6nb2sizz0bhl850dl1sszl1hk9l28m21r2akdy1";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers data-default deepseq dwarf
          hashable hashtables llvm-base-types loch-th mtl text transformers
          unification-fd unordered-containers vector
        ];
-       buildTools = [ c2hs ];
+       libraryToolDepends = [ c2hs ];
        description = "A low-level data interoperability binding for LLVM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85226,7 +87401,7 @@ self: {
        sha256 = "0nlh5l070zc7y1jpwnyxnc0223w8xaw0z92agmigiw6bm8vcs568";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers cpuid llvm-tf non-empty tfp transformers unsafe
          utility-ht
        ];
@@ -85243,8 +87418,8 @@ self: {
        sha256 = "07hb4n7wk0gmprjps045cvhcyvmis0jp5f11jbk55y4mgn4jy0cv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       pkgconfigDepends = [ llvm ];
+       libraryHaskellDepends = [ base ];
+       libraryPkgconfigDepends = [ llvm ];
        homepage = "http://haskell.org/haskellwiki/LLVM";
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -85262,18 +87437,17 @@ self: {
        pname = "llvm-general";
        version = "3.4.5.3";
        sha256 = "03rps9ga20cdqfh2khqnahwrkljs714ac7yx9x7krb3dngf83zsm";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers llvm-general-pure mtl parsec
          setenv template-haskell transformers transformers-compat
          utf8-string
        ];
-       testDepends = [
+       libraryToolDepends = [ llvm-config ];
+       testHaskellDepends = [
          base containers HUnit llvm-general-pure mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
          transformers transformers-compat
        ];
-       buildTools = [ llvm-config ];
-       doCheck = false;
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
      }) { llvm-config = null;};
@@ -85287,15 +87461,14 @@ self: {
        pname = "llvm-general-pure";
        version = "3.4.5.3";
        sha256 = "1b3zh2y3b3jj5sg6421wv2qsrhyjs23qdzrk693r7mpj10rd258k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl parsec setenv template-haskell transformers
          transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       doCheck = false;
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85310,15 +87483,15 @@ self: {
        pname = "llvm-general-quote";
        version = "0.2.0.0";
        sha256 = "02j3npamy5s6ircfd9njg0y25asbpxl6fpsxjpxy7k4v1y6c3b75";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers haskell-src-meta llvm-general-pure
          mainland-pretty mtl split srcloc syb symbol template-haskell
          th-lift
        ];
-       testDepends = [
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
          base containers HUnit llvm-general-pure tasty tasty-hunit
        ];
-       buildTools = [ alex happy ];
        jailbreak = true;
        homepage = "https://github.com/tvh/llvm-general-quote";
        description = "QuasiQuoting llvm code for llvm-general";
@@ -85334,7 +87507,7 @@ self: {
        pname = "llvm-ht";
        version = "0.7.0.0";
        sha256 = "1yn8wyp2jjjdggvf1jz7iras4f7fg2dq57ramr5prvcapc6r5yn6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory mtl process type-level
        ];
        homepage = "http://darcs.serpentine.com/llvm/";
@@ -85353,7 +87526,7 @@ self: {
        sha256 = "1sfw901bhnwiam8mm7h50fb6rpqv7vs8j7bxdx6azcf02cmivx6w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal explicit-exception process transformers utility-ht
        ];
        jailbreak = true;
@@ -85367,7 +87540,7 @@ self: {
        pname = "llvm-pretty";
        version = "0.3.1.1";
        sha256 = "1qk3dlinhic9m8ahynqqi90y7ai728p10c4mkmj2w135wp8a8ran";
-       buildDepends = [ base containers monadLib pretty ];
+       libraryHaskellDepends = [ base containers monadLib pretty ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85383,11 +87556,15 @@ self: {
        sha256 = "15h66zdkisjg1mrrchkyzknj0mq5xybjn41mrnfs3pzalnffsfqs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring cereal containers fgl llvm-pretty monadLib
+         pretty
+       ];
+       executableHaskellDepends = [
          array base bytestring cereal containers fgl fgl-visualize
          llvm-pretty monadLib pretty
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath llvm-pretty process
        ];
        description = "LLVM bitcode parsing library";
@@ -85404,7 +87581,7 @@ self: {
        sha256 = "0bkx86gv5f7w14hxny6h36balsklscxzm3qakv8f2ana0bk1sv09";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers llvm-ffi non-empty process storable-record tfp
          transformers utility-ht
        ];
@@ -85425,11 +87602,14 @@ self: {
        sha256 = "1nyp0sgdqsaa2f2v7xgmm3s8mf2a170mzz2h3wwsi163ggvxwvhd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec attoparsec-conduit base blaze-html blaze-markup
-         bytestring conduit containers directory filemanip filepath graphviz
-         llvm-analysis llvm-data-interop optparse-applicative parallel-io
-         process-conduit unordered-containers xml
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup bytestring directory filemanip
+         filepath graphviz llvm-analysis llvm-data-interop parallel-io xml
+       ];
+       executableHaskellDepends = [
+         attoparsec attoparsec-conduit base bytestring conduit containers
+         graphviz llvm-analysis llvm-data-interop optparse-applicative
+         process-conduit unordered-containers
        ];
        jailbreak = true;
        description = "Useful tools built on llvm-analysis";
@@ -85442,8 +87622,8 @@ self: {
        pname = "lmdb";
        version = "0.2.5";
        sha256 = "0z8wj06b5ii0w6pls2jlqmd3mhyrplhxd1c6h1my1p0w45b2hmc0";
-       buildDepends = [ array base ];
-       extraLibraries = [ lmdb ];
+       libraryHaskellDepends = [ array base ];
+       librarySystemDepends = [ lmdb ];
        homepage = "http://github.com/dmbarbour/haskell-lmdb";
        description = "Lightning MDB bindings";
        license = stdenv.lib.licenses.bsd2;
@@ -85455,8 +87635,8 @@ self: {
        pname = "load-env";
        version = "0.1.1";
        sha256 = "05pxxplp96pcnzk61xcckxnxljl3hjl13ckn4xrr93zmlw49rqwg";
-       buildDepends = [ base directory parsec ];
-       testDepends = [ base directory hspec HUnit parsec ];
+       libraryHaskellDepends = [ base directory parsec ];
+       testHaskellDepends = [ base directory hspec HUnit parsec ];
        description = "Load environment variables from a file";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85467,7 +87647,7 @@ self: {
        pname = "loadavg";
        version = "0.1";
        sha256 = "13q2yxqyzkh099jwz32plmdc71p4w2gkajx5bbi3fkvl2gylqlk6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Load average parsing from /proc/loadavg and bindings to getloadavg (3)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85478,7 +87658,7 @@ self: {
        pname = "local-address";
        version = "0.0.1";
        sha256 = "1846lhs0jc8finxcp1hfgifzs7hwzzxvmmv03laxzl63p5h2k8x9";
-       buildDepends = [ base network ];
+       libraryHaskellDepends = [ base network ];
        homepage = "http://bitbucket.org/khibino/haskell-local-address";
        description = "Functions to get local interface address";
        license = stdenv.lib.licenses.bsd3;
@@ -85492,7 +87672,7 @@ self: {
        pname = "local-search";
        version = "0.0.7";
        sha256 = "0xrp34m2qfbz458g7bxdkp2lvsm0hskwxfcrm1d8n8g150ddn2xf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base combinatorial-problems containers erf random
        ];
        homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellLocalSearch";
@@ -85507,8 +87687,7 @@ self: {
        pname = "located-base";
        version = "0.1.0.0";
        sha256 = "0jb4ziagvbvgaihgw9ajsni0nylqbh5hw3q4dw561qmx2msjjfpj";
-       buildDepends = [ base ];
-       jailbreak = true;
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/gridaphobe/located-base";
        description = "Location-aware variants of partial functions";
        license = stdenv.lib.licenses.bsd3;
@@ -85522,8 +87701,10 @@ self: {
        pname = "locators";
        version = "0.2.4.2";
        sha256 = "172fbxb51p09afsgp9g28zpbisxnf0wxdr3bwi6hwp40ac3363g4";
-       buildDepends = [ base bytestring cereal containers cryptohash ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring cereal containers cryptohash
+       ];
+       testHaskellDepends = [
          base bytestring cereal containers cryptohash hspec
          hspec-expectations HUnit QuickCheck
        ];
@@ -85539,7 +87720,8 @@ self: {
        sha256 = "1dwv4v76i1fd60rrr0bla3wjz62x9dcgpd48p8z11lsjgpqarld3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Support for precise error locations in source files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85551,7 +87733,7 @@ self: {
        pname = "loch-th";
        version = "0.2.1";
        sha256 = "1kfrjsgzq6wl749n2wm1fhwwigjxcd9lww7whiwjrbmhiz5ism3p";
-       buildDepends = [ base pretty template-haskell ];
+       libraryHaskellDepends = [ base pretty template-haskell ];
        homepage = "https://github.com/liskin/loch-th";
        description = "Support for precise error locations in source files (Template Haskell version)";
        license = stdenv.lib.licenses.bsd3;
@@ -85566,11 +87748,11 @@ self: {
        pname = "lock-file";
        version = "0.5.0.2";
        sha256 = "1l4slkykw59p20kw9iqaa4pjczqx701a9z14nvbzwrmgs2acnki7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class directory exceptions tagged-exception-core
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base data-default-class directory exceptions filepath HUnit
          tagged-exception-core test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
@@ -85578,7 +87760,6 @@ self: {
        homepage = "https://github.com/trskop/lock-file";
        description = "Provide exclusive access to a resource using lock file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lockfree-queue" = callPackage
@@ -85590,10 +87771,10 @@ self: {
        pname = "lockfree-queue";
        version = "0.2.3.1";
        sha256 = "131s1w6bdd958pg42s2i62xvw4basagir45y3vhbvsp8p9a6lmra";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-deque atomic-primops base bytestring ghc-prim
        ];
-       testDepends = [
+       testHaskellDepends = [
          abstract-deque abstract-deque-tests atomic-primops base bytestring
          ghc-prim HUnit test-framework test-framework-hunit
        ];
@@ -85611,7 +87792,7 @@ self: {
        pname = "log";
        version = "0.2.2";
        sha256 = "05izcd3qwwfwj5kl2k2pzjs8fk14hq10qls3a8m057gg4pd6nw1n";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base bytestring deepseq exceptions hpqtypes
          monad-control monad-time mtl old-locale split stm text time
          transformers-base unordered-containers
@@ -85631,11 +87812,11 @@ self: {
        pname = "log-domain";
        version = "0.10.2";
        sha256 = "0v91xilbgw0cym43fn5abz5ljrxz8anfj1w5x6nzp1qcqcwgwcg4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq distributive hashable
          hashable-extras safecopy semigroupoids semigroups vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
@@ -85652,7 +87833,7 @@ self: {
        pname = "log-effect";
        version = "0.4.0.1";
        sha256 = "05rx54bsypisw6k8xm87a4rssyb0lwx7xavwamb1ciiwmvg3j14m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring extensible-effects fast-logger time
        ];
        jailbreak = true;
@@ -85670,7 +87851,7 @@ self: {
        sha256 = "0cidi9zkvqvdqpibr0jpnlk33kprmxwh016w0f86zg9cm3dfb5zf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers json parsec ];
+       executableHaskellDepends = [ base containers json parsec ];
        jailbreak = true;
        homepage = "https://github.com/haroldl/log2json";
        description = "Turn log file records into JSON";
@@ -85684,7 +87865,7 @@ self: {
        pname = "logfloat";
        version = "0.13.3.1";
        sha256 = "0rqnp2zkp247sb3parn3ywsk9clasy4l906a1wyrrybc3p72126s";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Log-domain floating point numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -85698,7 +87879,7 @@ self: {
        pname = "logger";
        version = "0.1.0.0";
        sha256 = "1v264iv34k13lz63ajci03iikc7ajqcl3dvcaxcv7m3h538km8vm";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base containers lens mtl template-haskell time
          transformers unagi-chan
        ];
@@ -85717,11 +87898,11 @@ self: {
        pname = "logging";
        version = "2.2.0";
        sha256 = "0awcaj88754bppjmaay6lwmrmv0n53fppn2sjrnyi876r1ibr4qp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring fast-logger lifted-base monad-control
          monad-logger old-locale pcre-light text time transformers
        ];
-       testDepends = [ base hspec monad-logger unix ];
+       testHaskellDepends = [ base hspec monad-logger unix ];
        description = "Simplified logging in IO for application writers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -85731,11 +87912,11 @@ self: {
      mkDerivation {
        pname = "logging-facade";
        version = "0.0.0";
-       revision = "1";
        sha256 = "0i7m4dpj7b556bfiahisvxcvdb1lv352zggjyrcr69iqnrac30z8";
+       revision = "1";
        editedCabalFile = "18d32076d981102462c3f24c95c6d9dc2470be80f5f36f99759cb23cc3db2d24";
-       buildDepends = [ base template-haskell transformers ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base template-haskell transformers ];
+       testHaskellDepends = [ base hspec ];
        description = "Simple logging abstraction that allows multiple backends";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -85748,10 +87929,10 @@ self: {
        pname = "logging-facade-journald";
        version = "0.0.0";
        sha256 = "151p7574v9mxiniwxa4lngm5g4viznw4kg9adnngc3pi5nnh1z7l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base libsystemd-journal logging-facade text unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec libsystemd-journal logging-facade text
          unordered-containers
        ];
@@ -85768,11 +87949,11 @@ self: {
        pname = "logic-TPTP";
        version = "0.4.3.0";
        sha256 = "0hjznn92ippwgrsmklj02w2pf6dfylyiw1kifa4svjqwa9mx4hpv";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint array base containers mtl pointed QuickCheck syb
          transformers transformers-compat
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        description = "Import, export etc. for TPTP, a syntax for first-order logic";
        license = "GPL";
      }) {};
@@ -85785,11 +87966,11 @@ self: {
        pname = "logic-classes";
        version = "1.5.2";
        sha256 = "05p291y7hw8cfp0s0pb2vm9zpfs092nr92axwz6f74bkfdhrafwj";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base containers HUnit mtl pretty PropLogic
          safecopy set-extra syb template-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          applicative-extras base containers HUnit mtl pretty PropLogic
          set-extra syb
        ];
@@ -85805,7 +87986,7 @@ self: {
        pname = "logicst";
        version = "0.1.0.0";
        sha256 = "061x6g92334m2776xclh8mcbjind3l595pggc0g7yi4qzs31zbdc";
-       buildDepends = [ base logict transformers ];
+       libraryHaskellDepends = [ base logict transformers ];
        homepage = "http://github.com/sonyandy/logicst";
        description = "Backtracking mutable references in the ST and IO monads";
        license = stdenv.lib.licenses.bsd3;
@@ -85817,7 +87998,7 @@ self: {
        pname = "logict";
        version = "0.6.0.2";
        sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://code.haskell.org/~dolio/";
        description = "A backtracking logic-programming monad";
        license = stdenv.lib.licenses.bsd3;
@@ -85829,8 +88010,8 @@ self: {
        pname = "logsink";
        version = "0.1.0";
        sha256 = "1yxzqx47017z0djm8bymz43pc8cccnpkawaisvvzb646j6nbrw93";
-       buildDepends = [ base hsyslog logging-facade time ];
-       testDepends = [ base hspec logging-facade ];
+       libraryHaskellDepends = [ base hsyslog logging-facade time ];
+       testHaskellDepends = [ base hspec logging-facade ];
        description = "A logging framework for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -85843,15 +88024,16 @@ self: {
      mkDerivation {
        pname = "lojban";
        version = "0.3";
-       revision = "1";
        sha256 = "0pd31g21db8yh1mrnmy7r60lr0dbpwlxpwc0hli3y1wcr4fisnx6";
+       revision = "1";
        editedCabalFile = "9d30c9c8f1aa80aea24ca606d74ee1b3a9af0ecde15a0e65b1150d483d6b1cfc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers curl directory haskell98 HTTP markov-chain mtl
-         parsec process random regex-compat strict tagsoup xml
+       libraryHaskellDepends = [
+         base containers curl directory HTTP markov-chain mtl parsec process
+         random regex-compat strict tagsoup xml
        ];
+       executableHaskellDepends = [ haskell98 ];
        jailbreak = true;
        description = "Useful utilities for the Lojban language";
        license = stdenv.lib.licenses.bsd3;
@@ -85866,7 +88048,8 @@ self: {
        sha256 = "0axi63dvls9k87samaa0jihisfqyl92jbhmx1j9q73yjrn5wsk8j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "lojban parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85880,7 +88063,8 @@ self: {
        sha256 = "1h7jmhs38v6mfas4nj22shm2dwphx46247sv3mia28xlzim3xdsp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "lojban to xiragan";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85894,7 +88078,7 @@ self: {
        sha256 = "0c571fk7kz4szpba85d7bf5awak5bc25r59kyx3xvyvk011y9hhd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base lojbanParser yjtools ];
+       executableHaskellDepends = [ base lojbanParser yjtools ];
        homepage = "http://homepage3.nifty.com/salamander/myblog/lojysamban.html";
        description = "Prolog with lojban";
        license = stdenv.lib.licenses.bsd3;
@@ -85909,7 +88093,7 @@ self: {
        pname = "loli";
        version = "2011.6.24";
        sha256 = "1m23dkxh2vah7d47arpqx5zdpwczm8k4jixzslmqbdizm9h933ja";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default hack hack-contrib mps mtl
          template utf8-string
        ];
@@ -85926,8 +88110,8 @@ self: {
        pname = "loop";
        version = "0.2.0";
        sha256 = "11ifqahlg9ky5klid1fhsyfvfb6w8yb0dsy43s0cxcmldbw3qv5x";
-       buildDepends = [ base ];
-       testDepends = [ base hspec mtl ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec mtl ];
        homepage = "https://github.com/nh2/loop";
        description = "Fast loops (for when GHC can't optimize forM_)";
        license = stdenv.lib.licenses.mit;
@@ -85939,7 +88123,7 @@ self: {
        pname = "loop-effin";
        version = "0.1.1.0";
        sha256 = "02x02m98ka1y8f1jjqwfwmsyx29g583gnr4jdm5syqxfr0dz6c52";
-       buildDepends = [ base effin ];
+       libraryHaskellDepends = [ base effin ];
        jailbreak = true;
        homepage = "https://github.com/konn/loop-effin";
        description = "control-monad-loop port for effin";
@@ -85953,7 +88137,7 @@ self: {
        pname = "loop-while";
        version = "1.0.0";
        sha256 = "1yvw91gn1iyw72rbq455zzrbb3pq8ph9cv1c6800qzjyxx0694bd";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "A monad transformer supporting various styles of while loop";
        license = stdenv.lib.licenses.bsd3;
@@ -85967,8 +88151,8 @@ self: {
        pname = "loops";
        version = "0.2.0.2";
        sha256 = "1syx22gp2zra2dhwvmm2np6c1lvqk622a62k4xxjd8y1fs2ckks7";
-       buildDepends = [ base primitive transformers vector ];
-       testDepends = [ base tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base primitive transformers vector ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Fast imperative-style loops";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85983,7 +88167,7 @@ self: {
        sha256 = "0gyd7l4i3vzv7swyqfywzwhsdxq3j5869c2id6hz6nm7db47wyy6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers directory filepath GoogleChart hmatrix
          process random
        ];
@@ -86007,14 +88191,21 @@ self: {
        sha256 = "0kzvi4310mbz51zkgmm84qyxxpi4m5ww2bsrfkj73a45bn7z198j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson ansi-terminal attoparsec-conduit base bytestring
+         case-insensitive conduit conduit-extra data-default directory
+         fast-logger html-conduit HTTP http-conduit http-types libmpd
+         process resourcet text transformers unix unordered-containers
+         utf8-string wai-logger xml-conduit yaml
+       ];
+       executableHaskellDepends = [
          aeson ansi-terminal attoparsec-conduit base bytestring
          case-insensitive conduit conduit-extra daemons data-default
          directory fast-logger html-conduit HTTP http-conduit http-types
          libmpd optparse-applicative process resourcet text transformers
          unix unordered-containers utf8-string wai-logger xml-conduit yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson ansi-terminal attoparsec-conduit base bytestring
          case-insensitive conduit daemons data-default directory fast-logger
          hspec html-conduit HTTP http-conduit http-types HUnit libmpd
@@ -86035,7 +88226,8 @@ self: {
        sha256 = "1fx7z90k9y12rii0yxk58159paiix1qi8y4j0za4k4szylr8f5ni";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/sfischer13/haskell-lorem";
        description = "Library for generating filler text";
@@ -86048,9 +88240,9 @@ self: {
        pname = "loris";
        version = "0.3.1";
        sha256 = "19w1c3gsmy03y4a238yp844wgqcv9s53cwrcapv2yvn9xpchm2gq";
-       buildDepends = [ base vector ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ loris ];
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ loris ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://www.tiresiaspress.us/haskell/loris";
        description = "interface to Loris API";
        license = stdenv.lib.licenses.gpl2;
@@ -86067,7 +88259,7 @@ self: {
        sha256 = "01jjbcgzpkh3mp729xahy2437hrg6wc2l1qnwcm069zrs3c1bdny";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base binary bytestring cryptohash directory hex network
          process split
        ];
@@ -86087,7 +88279,9 @@ self: {
        sha256 = "1avlq28k0jcfbnd0pfww80ixz5lvpp4jkf20dybjl7pfqyhj3s9p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers haskell98 mtl wx wxcore ];
+       executableHaskellDepends = [
+         array base containers haskell98 mtl wx wxcore
+       ];
        jailbreak = true;
        homepage = "http://www.ncc.up.pt/~pbv/stuff/lostcities";
        description = "An implementation of an adictive two-player card game";
@@ -86101,7 +88295,7 @@ self: {
        pname = "lowgl";
        version = "0.3.1.1";
        sha256 = "1c354ddx9niimfnppbg43d0v2dfr5s9s5dkppi0sld06jxaakxc5";
-       buildDepends = [ base data-default gl linear vector ];
+       libraryHaskellDepends = [ base data-default gl linear vector ];
        jailbreak = true;
        description = "Basic gl wrapper and reference";
        license = stdenv.lib.licenses.bsd2;
@@ -86113,7 +88307,7 @@ self: {
        pname = "lrucache";
        version = "1.2.0.0";
        sha256 = "05knlckzx261yxbz38rqq8vy86zj1np0w2l32cnib6714vhaj5sz";
-       buildDepends = [ base containers contravariant ];
+       libraryHaskellDepends = [ base containers contravariant ];
        homepage = "http://github.com/chowells79/lrucache";
        description = "a simple, pure LRU cache";
        license = stdenv.lib.licenses.bsd3;
@@ -86129,7 +88323,7 @@ self: {
        sha256 = "08xaf27iirdxax7gjjjzvw4nv0qya6vz46826bzmp7f0i0rn88qk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint base base-unicode-symbols cmdtheline text usb
          usb-id-database vector
        ];
@@ -86150,7 +88344,7 @@ self: {
        sha256 = "14j19jcmx20nhvb9a7im81j3wwkkx6lkb6b1kfizv8qkgnp0jd5j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal containers directory filepath pretty process
        ];
        homepage = "http://code.haskell.org/~dons/code/lscabal";
@@ -86167,11 +88361,11 @@ self: {
        pname = "lss";
        version = "0.1.0.0";
        sha256 = "1r890sya0db0xvs9cm5ghhr6x55hkqplirv95km6y7py7hj69cjr";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base containers directory filepath language-css
          language-css-attoparsec text xmlhtml
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base containers hspec2 language-css
          language-css-attoparsec text
        ];
@@ -86190,7 +88384,9 @@ self: {
        sha256 = "1wk41hsr7pp9azac3449xp0xv8kd31bwif3yw6cfw9jfg3g498xg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 uu-parsinglib wx wxcore ];
+       executableHaskellDepends = [
+         base haskell98 uu-parsinglib wx wxcore
+       ];
        description = "Paint an L-System Grammar";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86207,12 +88403,16 @@ self: {
        sha256 = "0dr99prlsbzisaz8jbiw297fw1fysr9zq0g5ywc959ar3nki039f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers deepseq mtl mtl-compat parsec pretty
+         template-haskell text transformers
+       ];
+       executableHaskellDepends = [
          aeson base containers data-default deepseq directory mtl mtl-compat
          optparse-applicative parsec pretty template-haskell text
          transformers yaml
        ];
-       testDepends = [ base hspec mtl ];
+       testHaskellDepends = [ base hspec mtl ];
        description = "Higher-order file applicator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86225,7 +88425,7 @@ self: {
        pname = "ltk";
        version = "0.15.0.2";
        sha256 = "19wnkl9acibs6kcnm0m02jhjxrn19sanf5z2w0kqwjbqlfcrcc4a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text
          transformers
        ];
@@ -86241,7 +88441,7 @@ self: {
        pname = "ltl";
        version = "0.0.0";
        sha256 = "0h3jxngsdmakcr35zapxjaykjsqs44lxxk86d5i4rg0gi0i9qw3g";
-       buildDepends = [ base vcd ];
+       libraryHaskellDepends = [ base vcd ];
        homepage = "http://tomahawkins.org";
        description = "Using linear temporal logic (LTL) to verify embedded software and hardware";
        license = stdenv.lib.licenses.bsd3;
@@ -86255,7 +88455,7 @@ self: {
        pname = "lua-bytecode";
        version = "0.1.0.0";
        sha256 = "1cwpixaxxkfd8n714c8w82z97h3h8bqqqnh2wsn22cll168rb6zl";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal containers hashable numeric-extras
          vector
        ];
@@ -86271,7 +88471,7 @@ self: {
        pname = "luachunk";
        version = "0.1.0.0";
        sha256 = "03a8adaz3m93wnfmrvsqbmc57h1d8h0a90spfj1cb7yrpz0pr3ck";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary bytestring custom-prelude ghc-prim pretty
          text
        ];
@@ -86290,10 +88490,10 @@ self: {
        pname = "luautils";
        version = "0.1.4";
        sha256 = "176szfrz1ydnin1zi50235j4f4l87j516yjddmqbmd834dzvk20d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers hslua monad-loops text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary containers hslua QuickCheck quickcheck-instances
          test-framework test-framework-quickcheck2 test-framework-th text
          text-binary
@@ -86309,7 +88509,7 @@ self: {
        pname = "lub";
        version = "0.1.7";
        sha256 = "1dsm7cg0i930r5dn8591aabkl0p8b5l348pccdvi7p0g7asx451h";
-       buildDepends = [ base unamb ];
+       libraryHaskellDepends = [ base unamb ];
        homepage = "http://haskell.org/haskellwiki/lub";
        description = "information operators: least upper bound (lub) and greatest lower bound (glb)";
        license = stdenv.lib.licenses.bsd3;
@@ -86323,14 +88523,16 @@ self: {
      mkDerivation {
        pname = "lucid";
        version = "2.9.2";
-       revision = "1";
        sha256 = "0r3bzh9pmcqsac5id064jcscn9x2pyfhpazdzvz0666smf4b9jah";
+       revision = "1";
        editedCabalFile = "62ded561d5846fbcbe77e7f491c5fed2f4beddbf5cda336685f3d980df525218";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers hashable mtl text
          transformers unordered-containers
        ];
-       testDepends = [ base bifunctors hspec HUnit mtl parsec text ];
+       testHaskellDepends = [
+         base bifunctors hspec HUnit mtl parsec text
+       ];
        homepage = "https://github.com/chrisdone/lucid";
        description = "Clear to write, read and edit DSL for HTML";
        license = stdenv.lib.licenses.bsd3;
@@ -86344,8 +88546,10 @@ self: {
        pname = "lucid-foundation";
        version = "0.0.2.1";
        sha256 = "10l6xvb3kmkjb9sq92ijwnnbpm3rmp6j8r8vf00kdxkgx84n1zqd";
-       buildDepends = [ base lucid text ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       libraryHaskellDepends = [ base lucid text ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances
+       ];
        description = "Basic Zurb Foundation API in Lucid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86356,7 +88560,9 @@ self: {
        pname = "lucid-svg";
        version = "0.5.0.0";
        sha256 = "1p7ipdy0nmqfg1b038a1b5nd3xh2779d2gnw4h683mm5jcbf0mvj";
-       buildDepends = [ base blaze-builder lucid text transformers ];
+       libraryHaskellDepends = [
+         base blaze-builder lucid text transformers
+       ];
        homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git";
        description = "DSL for SVG using lucid for HTML";
        license = stdenv.lib.licenses.bsd3;
@@ -86373,7 +88579,7 @@ self: {
        sha256 = "1dcvax756cqpqg6rrrjrd4sfr3ggvqdiwp42rb8fdrsi3v2skwrj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base64-bytestring blaze-html bson bytestring
          compact-string-fix feed happstack happstack-server HTTP mongoDB mtl
          network SHA text time
@@ -86391,7 +88597,7 @@ self: {
        pname = "luhn";
        version = "0.2";
        sha256 = "0ix7x28kmd3iarydl709vqd041h0qx6kv582c8ca54z8ag7lzynz";
-       buildDepends = [ base digits QuickCheck ];
+       libraryHaskellDepends = [ base digits QuickCheck ];
        description = "An implementation of Luhn's check digit algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86404,7 +88610,7 @@ self: {
        pname = "lui";
        version = "0.0.6";
        sha256 = "081451gpm20z8zl3y1mjy9015a461g7q99w7sjnr8alvd3pbhd6v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell98 haskgame MaybeT mtl SDL
        ];
        description = "Purely FunctionaL User Interface";
@@ -86418,8 +88624,8 @@ self: {
        pname = "luka";
        version = "2012.8.29";
        sha256 = "00g7a80nlw1bgw6x2pqg1qn4786ra3bwbwbfm9b7iyhb101b7s9s";
-       buildDepends = [ air base bytestring libffi ];
-       extraLibraries = [ objc ];
+       libraryHaskellDepends = [ air base bytestring libffi ];
+       librarySystemDepends = [ objc ];
        homepage = "https://github.com/nfjinjing/luka";
        description = "Simple ObjectiveC runtime binding";
        license = stdenv.lib.licenses.bsd3;
@@ -86434,7 +88640,7 @@ self: {
        sha256 = "0325c064nsczypapvwdchx7x5n69jxjbyjs90ah7q5ydxbjl6w9c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell-src-exts text vector ];
+       executableHaskellDepends = [ base haskell-src-exts text vector ];
        jailbreak = true;
        homepage = "https://github.com/bitc/lushtags";
        description = "Create ctags compatible tags files for Haskell programs";
@@ -86447,8 +88653,8 @@ self: {
        pname = "luthor";
        version = "0.0.1";
        sha256 = "023kckpcdn6n5dyq0dip0132jp1w30hdx1qb5hbsd3js86j52a12";
-       buildDepends = [ base mtl parsec ];
-       testDepends = [ base mtl parsec ];
+       libraryHaskellDepends = [ base mtl parsec ];
+       testHaskellDepends = [ base mtl parsec ];
        jailbreak = true;
        homepage = "https://github.com/Zankoku-Okuno/luthor";
        description = "Tools for lexing and utilizing lexemes that integrate with Parsec";
@@ -86466,14 +88672,14 @@ self: {
      mkDerivation {
        pname = "lvish";
        version = "1.1.4";
-       revision = "2";
        sha256 = "1s7i1jxb6m7ivk4nd60dy8hn4wgfhv1gcamvv6hgjvcw6rxn4k44";
+       revision = "2";
        editedCabalFile = "bb376e7ac0598a623c8222824a2ace2649a395be610f81912eb7193450aa3e7e";
-       buildDepends = [
+       libraryHaskellDepends = [
          async atomic-primops base bits-atomic containers deepseq ghc-prim
          lattices missing-foreign random transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          async atomic-primops base bits-atomic containers deepseq ghc-prim
          HUnit lattices missing-foreign QuickCheck random test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
@@ -86495,7 +88701,10 @@ self: {
        sha256 = "1lr2qr817mb8qb7b3wvry9jpj3wjphj5s60rn3dyqibx8gny36bg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base containers directory filepath parsec wl-pprint
+       ];
+       executableHaskellDepends = [
          array base containers directory filepath parsec wl-pprint
        ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
@@ -86523,7 +88732,7 @@ self: {
        pname = "lxc";
        version = "0.3.1.1";
        sha256 = "1mksram2nlb611b81yh5smvgr3dqxyabphrrpimspixwwl8173zr";
-       buildDepends = [ base bindings-lxc mtl transformers ];
+       libraryHaskellDepends = [ base bindings-lxc mtl transformers ];
        jailbreak = true;
        homepage = "https://github.com/fizruk/lxc";
        description = "High level Haskell bindings to LXC (Linux containers)";
@@ -86540,7 +88749,7 @@ self: {
        sha256 = "1pmlxvnlwdsb51pjrkak1sakfh3nyk5lia5pqmr7larlm1n3dx9m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers free HCodecs lens parsers transformers trifecta
        ];
        description = "A Lilypond-compiling music box";
@@ -86555,8 +88764,8 @@ self: {
        pname = "lz4";
        version = "0.2.3.1";
        sha256 = "1wck0sl7m873pqnpmn95vrp9jbr7awjdp9rrkqgj0nd3l6z65k4q";
-       buildDepends = [ base bytestring cereal ];
-       testDepends = [ base bytestring hspec HUnit QuickCheck ];
+       libraryHaskellDepends = [ base bytestring cereal ];
+       testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ];
        homepage = "http://github.com/mwotton/lz4hs";
        description = "LZ4 compression for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -86571,14 +88780,14 @@ self: {
        pname = "lzma-conduit";
        version = "1.1.3";
        sha256 = "01pf7q56y4m377qcbfwdv767dhlvkhd4cs01bqcg9k667iy21fr4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL bytestring conduit resourcet transformers
        ];
-       testDepends = [
+       librarySystemDepends = [ lzma ];
+       testHaskellDepends = [
          base bytestring conduit HUnit QuickCheck resourcet test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       extraLibraries = [ lzma ];
        homepage = "http://github.com/alphaHeavy/lzma-conduit";
        description = "Conduit interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
@@ -86593,12 +88802,14 @@ self: {
        pname = "lzma-enumerator";
        version = "0.1.3";
        sha256 = "0pzz8bf6310p23pmsa013i8vib0xsfvlkj7zp0w9xs2xsi4j7jk1";
-       buildDepends = [ base bindings-DSL bytestring enumerator mtl ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bindings-DSL bytestring enumerator mtl
+       ];
+       librarySystemDepends = [ lzma ];
+       testHaskellDepends = [
          base bytestring enumerator HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       extraLibraries = [ lzma ];
        jailbreak = true;
        homepage = "http://github.com/alphaHeavy/lzma-enumerator";
        description = "Enumerator interface for lzma/xz compression";
@@ -86614,12 +88825,12 @@ self: {
        pname = "lzma-streams";
        version = "0.0.0.0";
        sha256 = "0klgi097b8mky989hfzn3kk3r25yq1p0sjna4r68k7z9y143yzm2";
-       buildDepends = [ base bytestring io-streams ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring io-streams ];
+       librarySystemDepends = [ lzma ];
+       testHaskellDepends = [
          base bytestring HUnit io-streams QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       extraLibraries = [ lzma ];
        homepage = "https://github.com/hvr/lzma-streams";
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
@@ -86635,7 +88846,7 @@ self: {
        sha256 = "1r6vp774gjb52bd1lmjx6xzh0pw82b060pl7bh8n0z58i67bvm9q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers directory ghc template-haskell text
        ];
        jailbreak = true;
@@ -86650,7 +88861,7 @@ self: {
        pname = "mac";
        version = "0.1.0.0";
        sha256 = "1ym5hk774y65mjxhp1vwa40ji2yjf4abqrpf3v9dknc28r64v8bi";
-       buildDepends = [ base network transformers ];
+       libraryHaskellDepends = [ base network transformers ];
        description = "Static Mandatory Access Control in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86663,7 +88874,7 @@ self: {
        sha256 = "0z56rbfr8vijhjf3dcqd4kaxgx9bf3qgi9sm61yc3i6ra60w7byb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary parsec process ];
+       libraryHaskellDepends = [ base binary parsec process ];
        description = "Obtain the host MAC address on *NIX and Windows";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86675,17 +88886,18 @@ self: {
      mkDerivation {
        pname = "machinecell";
        version = "2.0.1";
-       revision = "1";
        sha256 = "0gl207a97zcs48k6pdr82x9ckg1bc2vn6wachc57gmnspk3j43xd";
+       revision = "1";
        editedCabalFile = "5470f26ae4ebbbe5f88e6c70d3193a28ce9e5f94fd48b76c4ef576fcac92ac7d";
-       buildDepends = [ arrows base free mtl profunctors semigroups ];
-       testDepends = [
+       libraryHaskellDepends = [
+         arrows base free mtl profunctors semigroups
+       ];
+       testHaskellDepends = [
          arrows base hspec mtl profunctors QuickCheck semigroups
        ];
        homepage = "http://github.com/as-capabl/machinecell";
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines" = callPackage
@@ -86696,14 +88908,14 @@ self: {
      mkDerivation {
        pname = "machines";
        version = "0.5.1";
-       revision = "1";
        sha256 = "1dyvyy0yv9qha1ff2nfrl304vmmbi4hd881jyj3xpqhgc3zz8ab2";
+       revision = "1";
        editedCabalFile = "c50d5fcc8b1b5635539169a5da097a25c7a7b7e9b8cc582abba3703014ba2d1d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers free mtl pointed profunctors semigroups
          transformers void
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/machines/";
        description = "Networked stream transducers";
@@ -86718,7 +88930,7 @@ self: {
        pname = "machines-directory";
        version = "0.2.0.6";
        sha256 = "03faha5zbxikbrz40wb0qar8qyjkzaylnk78ba925vms57dwwxva";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath machines machines-io transformers
        ];
        homepage = "http://github.com/aloiscochard/machines-directory";
@@ -86734,7 +88946,7 @@ self: {
        pname = "machines-io";
        version = "0.2.0.6";
        sha256 = "19xi9ia2f18nwqx58qb4l1hc2cv25jwcsl4qxd7snp4ynjyy6ln1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring chunked-data machines transformers
        ];
        homepage = "http://github.com/aloiscochard/machines-io";
@@ -86749,7 +88961,9 @@ self: {
        pname = "machines-process";
        version = "0.2.0.4";
        sha256 = "1v0jskb8m1s7cd51672v4fj9sjy5l1q01vm6qyvkrsabjp04lq4l";
-       buildDepends = [ base chunked-data machines machines-io process ];
+       libraryHaskellDepends = [
+         base chunked-data machines machines-io process
+       ];
        homepage = "http://github.com/aloiscochard/machines-process";
        description = "Process (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
@@ -86762,7 +88976,9 @@ self: {
        pname = "machines-zlib";
        version = "0.1.0";
        sha256 = "0ajdc7878vzam5zphdaw8zn8knzk8kq80y3yf84jwlakb6ihrv6d";
-       buildDepends = [ base basic-prelude machines streaming-commons ];
+       libraryHaskellDepends = [
+         base basic-prelude machines streaming-commons
+       ];
        jailbreak = true;
        homepage = "https://github.com/lshift/machines-zlib";
        description = "Decompression support for machines";
@@ -86775,7 +88991,7 @@ self: {
        pname = "macho";
        version = "0.22";
        sha256 = "13i8bap38ha8j0259kw4gfx18jxc4860awp3s9rz16i4q2vik0v2";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://github.com/erikcharlebois/macho";
        description = "Parser for Mach-O object format";
        license = stdenv.lib.licenses.bsd3;
@@ -86792,10 +89008,13 @@ self: {
        sha256 = "0qf44jza8avq2yfsx2f0bdxbnda4lm3xq9qaivmslfbdfjy3mxv3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base filemanip filepath optparse-applicative parsec strict
+       libraryHaskellDepends = [ base filemanip filepath parsec strict ];
+       executableHaskellDepends = [
+         base filemanip filepath optparse-applicative strict
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
        ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
        homepage = "http://github.com/tych0/maclight";
        description = "Control screen and keyboard backlights on MACs under Linux";
        license = stdenv.lib.licenses.mit;
@@ -86812,7 +89031,7 @@ self: {
        sha256 = "04j5fpj4758bl8ksaqn4zz6dl8pg24ih65k1b0pg8qrar4275r14";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers data-lens data-lens-template deepseq directory
          filepath graph-visit mtl process transformers unix
        ];
@@ -86829,8 +89048,8 @@ self: {
        sha256 = "0fknvy48sanvq7vg5pxwbjsahpiby1hba5wf8w6rq2g3d0a1cjwz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers mtl random ];
-       extraLibraries = [ ncurses ];
+       executableHaskellDepends = [ array base containers mtl random ];
+       executableSystemDepends = [ ncurses ];
        homepage = "http://www.scannedinavian.com/~shae/mage-1.0pre35.tar.gz";
        description = "Rogue-like";
        license = stdenv.lib.licenses.bsd3;
@@ -86843,8 +89062,8 @@ self: {
        pname = "magic";
        version = "1.1";
        sha256 = "10p0gjjjwr1dda7hahwrwn5njbfhl67arq3v3nf1jr3vymlkn75j";
-       buildDepends = [ base ];
-       extraLibraries = [ magic ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ magic ];
        description = "Interface to C file/magic library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86856,7 +89075,7 @@ self: {
        pname = "magma";
        version = "0.3.0.0";
        sha256 = "0bk4a9kw2jxvvz81ppj6qh3kk8cbknnqmg6vvkd0kpn70rcx0hnv";
-       buildDepends = [ base deepseq profunctors semigroups ];
+       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";
@@ -86875,7 +89094,7 @@ self: {
        sha256 = "0fmhms0415wawd539ipdj47gf27h2jjq2gpzhb0s21r6z63ayp7f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile containers curl directory happstack-state MissingH
          mtl network old-time regex-posix tagsoup utf8-string XMPP
        ];
@@ -86896,7 +89115,7 @@ self: {
        sha256 = "1gss86263pzwvm14yx5lqzskrwc3z6521z9yp0mg8780qgr8h9sr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          air air-th base bytestring containers data-default directory
          filepath hack2 hack2-contrib hack2-handler-snap-server moe process
          text
@@ -86917,11 +89136,11 @@ self: {
        sha256 = "1zd3vd0sj4pq8nhjn768rpfyn9a06a9c3j2fnhxsb9d800ilpvvf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs configurator containers directory filepath HDBC
          HDBC-postgresql HDBC-sqlite3 MissingH tasty tasty-hunit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cmdargs configurator containers directory doctest filemanip
          filepath HDBC HDBC-postgresql HDBC-sqlite3 MissingH tasty
          tasty-hunit
@@ -86940,7 +89159,7 @@ self: {
        sha256 = "0c6sn7bpzw82iarpw40l88f58xrjl9gzdqx1xnbafzdyfhbrnzbi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base http-client http-client-tls http-types reflection scotty
          text transformers wai-extra
        ];
@@ -86961,11 +89180,12 @@ self: {
        sha256 = "01xcr0dwbkpryavk054y52fdk9qis4s6df8d0yxz05kdl8b5nczq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit exceptions failure http-client
          http-client-multipart http-conduit monad-control network text
          transformers
        ];
+       executableHaskellDepends = [ base http-conduit text transformers ];
        jailbreak = true;
        homepage = "https://github.com/AndrewRademacher/mailgun";
        description = "Connector to Rackspace's Mailgun Service";
@@ -86978,7 +89198,7 @@ self: {
        pname = "mainland-pretty";
        version = "0.4.1.0";
        sha256 = "0r8xhlbpws6wq305dv3z074d7492jif9dsscz4sjbwvh5dk4x1zl";
-       buildDepends = [ base containers srcloc text ];
+       libraryHaskellDepends = [ base containers srcloc text ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Pretty printing designed for printing source code";
        license = stdenv.lib.licenses.bsd3;
@@ -86994,9 +89214,11 @@ self: {
        sha256 = "1rjarfwjqlrq9cdgjv93v6jwg58984c0dwjk506svsr29ll0p1b1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring cmdargs monad-loops old-locale threads time unix
-         zeromq-haskell
+       libraryHaskellDepends = [
+         base bytestring monad-loops old-locale time zeromq-haskell
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs threads unix
        ];
        jailbreak = true;
        description = "Majordomo protocol for ZeroMQ";
@@ -87010,7 +89232,7 @@ self: {
        pname = "majority";
        version = "1.1";
        sha256 = "1442xw8i9jgk3hqavqikks98qs9l3i37lk63xyzpdgnlkfqapzka";
-       buildDepends = [ haskell2010 ];
+       libraryHaskellDepends = [ haskell2010 ];
        homepage = "https://github.com/niswegmann/majority";
        description = "Boyer-Moore Majority Vote Algorithm";
        license = stdenv.lib.licenses.publicDomain;
@@ -87027,7 +89249,7 @@ self: {
        sha256 = "0bynbrn7fnnw7s6wafaji5yf21zjsrdmdfyb7m97bk77ss0gprq2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath unix
        ];
        description = "Change duplicated files into hard-links";
@@ -87045,7 +89267,7 @@ self: {
        sha256 = "1502pggc0gcmsj6fhzkjcrbqydaxz4qivsmv57jm6cxpbypkyin3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          async base bytestring configurator containers directory filepath
          github haskeline lens lens-datetime mtl process text time
        ];
@@ -87060,7 +89282,7 @@ self: {
        pname = "makedo";
        version = "0.1";
        sha256 = "0sc2fa45a046lw5x5z839gb1zk0d5nj663ghxajiclm6iw65kl2n";
-       buildDepends = [ base directory filepath HSH process ];
+       libraryHaskellDepends = [ base directory filepath HSH process ];
        jailbreak = true;
        homepage = "http://darcsden.com/kowey/makedo";
        description = "Helper for writing redo scripts in Haskell";
@@ -87073,7 +89295,7 @@ self: {
        pname = "managed";
        version = "1.0.0";
        sha256 = "06nb71pd68m5l6a48sz5kkrdif74phbg3y6bn9ydd00y515b9gn5";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "A monad for managed values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87089,7 +89311,7 @@ self: {
        sha256 = "1v44kml92i426hbinjmx00znyp7dwxa8qj0bmhb3hz0fwmgck1c3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary cairo containers dbus-client dbus-core derive directory
          filepath gtk gtk-serialized-event manatee-core mtl stm
          template-haskell text unix utf8-string
@@ -87113,7 +89335,7 @@ self: {
        sha256 = "1l3s22svds27q8hyh9nsawpc11crcll3vrcbfy6dvk64s04mwr21";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base manatee manatee-browser manatee-core manatee-curl
          manatee-editor manatee-filemanager manatee-imageviewer
          manatee-ircclient manatee-mplayer manatee-pdfviewer
@@ -87135,7 +89357,7 @@ self: {
        sha256 = "1ag0272cv700yi7y539hz3r04hqfqq9mx3cacp4hix4wag25f0n8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers dataenc dbus-client dbus-core filepath
          gio GoogleSuggest gtk manatee-core mtl network proc regex-tdfa
          split stm text unix utf8-string
@@ -87156,7 +89378,7 @@ self: {
        sha256 = "01blfcfynfbshznrz4arn89j7s063s7xhlkqnzbv42wqk04i083h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gtk manatee-core
          mtl stm text utf8-string webkit
        ];
@@ -87178,7 +89400,7 @@ self: {
        pname = "manatee-core";
        version = "0.1.1";
        sha256 = "05s5cd43a395jgyh4i01wzzzwha9rx9vrflwyr6lpz5nqnfp755v";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring Cabal cairo containers dataenc
          dbus-client dbus-core derive directory filepath gconf ghc ghc-paths
          gio glib gtk gtk-serialized-event gtksourceview2 haskell-src-exts
@@ -87203,7 +89425,7 @@ self: {
        sha256 = "0v525dcg6cs8mfrcbaxk9vx86gnd37c2z8gp9q8fck11616vckvn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers curl dbus-client dbus-core derive
          directory filepath gio glib gtk manatee-core mtl network old-locale
          old-time regex-tdfa stm template-haskell text utf8-string
@@ -87225,7 +89447,7 @@ self: {
        sha256 = "0rd6xjc1hmvfchwjh32ij4sa36z0v6b1k81gnx7278qqsscmgl9y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dbus-client dbus-core derive
          filepath gtk gtksourceview2 manatee-core regex-tdfa stm text
        ];
@@ -87246,7 +89468,7 @@ self: {
        sha256 = "06zrhycpsnfi8r3a071p6qlrqidddv004h10zcglb9ryhw0sh2p1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gio glib gtk
          manatee-core mtl old-locale old-time stm text utf8-string
        ];
@@ -87267,7 +89489,7 @@ self: {
        sha256 = "0yn32xsckvw96kxskfhgcqg98rffl07hkwfjzyd7cm221hwd9s0g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gio glib gtk
          gtkimageview manatee-core regex-tdfa stm text utf8-string
        ];
@@ -87290,7 +89512,7 @@ self: {
        sha256 = "0l14r4mw5bwyjzs5m49sp3vdi2lzfgyjwhsb0q94l3937wb4abgy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring Cabal containers curl dbus-client
          dbus-core derive fastirc filepath ghc GoogleTranslate groom gtk
          gtksourceview2 manatee-core MorseCode mtl nano-md5 network
@@ -87312,7 +89534,7 @@ self: {
        sha256 = "1jg9ikshscpjyq73g125acqndd049ry8zw7h0gglsi63xbqpldz4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dbus-client dbus-core derive
          filepath gio gtk libtagc manatee-core process random regex-tdfa stm
          text time unix utf8-string
@@ -87334,7 +89556,7 @@ self: {
        sha256 = "0k00drrk7mpbc8ak5cwzx245xf968186dkc12cxp7n2h2mccb456";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary cairo containers dbus-client derive filepath gtk
          manatee-core mtl poppler stm text utf8-string
        ];
@@ -87354,7 +89576,7 @@ self: {
        sha256 = "1zxkfil6anh2v692ky9l6gf40784y2czbx8853xmypnhnvgr95ll";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gtk manatee-core
          proc stm text
        ];
@@ -87375,7 +89597,7 @@ self: {
        sha256 = "07zkjg1q3gdqiw1pp0325pyvh84740mxvlf8k6sc6l1l258zpk90";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers curl dbus-client derive download-curl feed
          filepath gtk manatee-core stm text utf8-string webkit
        ];
@@ -87396,7 +89618,7 @@ self: {
        sha256 = "0lcd3g7gp3fl4xpc51wgk0q9q1lijgnfdla521h7nqz84wcdfbcy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dbus-client dbus-core derive
          filepath gtk gtksourceview2 manatee-core regex-tdfa stm text
        ];
@@ -87416,7 +89638,7 @@ self: {
        sha256 = "1aj1pghad0jdm3biy9f4caahvpyby0ia3clrl8lg2rmp2j703wkd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dbus-client derive filepath gtk manatee-core
          stm text unix vte
        ];
@@ -87437,7 +89659,7 @@ self: {
        sha256 = "1vwj91i05rwgqmral4v2mmcmlrqy54h816j8vi6d0ivs1693p308";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dbus-client dbus-core derive
          filepath gtk manatee-core regex-tdfa stm text
        ];
@@ -87455,7 +89677,7 @@ self: {
        sha256 = "1vsrp69qhndagzlw5fg9chi0hhphfbjmlvarypqi3g9fgrdghn46";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/julianalucena/mancala";
        description = "Simple mancala game";
        license = stdenv.lib.licenses.gpl3;
@@ -87471,12 +89693,12 @@ self: {
        pname = "mandrill";
        version = "0.2.2.1";
        sha256 = "0fs9fid7d87cnx5wi513xjqkgq425pfd4v9dx82x2c0pvnyfdvhk";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
          email-validate http-client http-client-tls http-types lens mtl
          old-locale QuickCheck text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
          tasty-quickcheck text
        ];
@@ -87494,7 +89716,7 @@ self: {
        sha256 = "1wrpzai3482c9g7zfacmjszi6h073ip00fbq17nyc22z2zw4908s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers directory filepath GLUT hslua time
        ];
        homepage = "http://gitorious.org/maximus/mandulia";
@@ -87518,7 +89740,7 @@ self: {
        sha256 = "0yb6i97ihcywbgzqkrad72q33m7fgx903rqizlhb4nz4bkl8793d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base base16-bytestring base64-bytestring
          blaze-builder bytestring case-insensitive conduit conduit-extra
          connection country-codes data-default http-conduit http-types HUnit
@@ -87526,7 +89748,10 @@ self: {
          text time tls transformers transformers-base unordered-containers
          utf8-string vector wai warp x509-system
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring http-conduit monad-logger text transformers
+       ];
+       testHaskellDepends = [
          aeson async attoparsec base base16-bytestring base64-bytestring
          blaze-builder bytestring case-insensitive conduit conduit-extra
          connection country-codes data-default HTF http-conduit http-types
@@ -87549,7 +89774,7 @@ self: {
        pname = "manifolds";
        version = "0.1.0.2";
        sha256 = "05ysr2rmjc0rqgy409qcga8j748l0w322vxbjdw9yyhcp2kbrv14";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad constrained-categories containers MemoTrie MonadRandom
          random semigroups tagged transformers vector vector-algorithms
          vector-space void
@@ -87568,8 +89793,8 @@ self: {
        pname = "map-syntax";
        version = "0.2";
        sha256 = "02v1dvq86qzbfbwbza4myj3a6a6a5p059fi5m3g548hmqk3v2p1r";
-       buildDepends = [ base containers mtl ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers mtl ];
+       testHaskellDepends = [
          base containers deepseq HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
@@ -87587,7 +89812,7 @@ self: {
        sha256 = "0k25m5q8p592xrg2qa0mvm3749gllrj4cmmx2h1k5hssan68bk9g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers gloss mtl splines vector vector-space
        ];
        jailbreak = true;
@@ -87606,11 +89831,11 @@ self: {
        pname = "markdown";
        version = "0.1.13.2";
        sha256 = "15aiwjs006g8aajw88rgfvrpcwaxml9hnpz7jrhmdm2pqxfrkb8z";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-html blaze-markup conduit conduit-extra
          containers data-default text transformers xss-sanitize
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-html conduit conduit-extra containers directory filepath
          hspec text transformers
        ];
@@ -87629,11 +89854,11 @@ self: {
        pname = "markdown-kate";
        version = "0.1.2.1";
        sha256 = "0zjqy163rxpjy0w3bn21j193qp04f7sdc8mfskaddqfks402h4i0";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-conduit base blaze-html conduit containers
          data-default highlighting-kate text transformers xss-sanitize
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-html conduit containers hspec markdown system-fileio
          system-filepath text transformers
        ];
@@ -87649,7 +89874,7 @@ self: {
        pname = "markdown-pap";
        version = "0.0.1.10";
        sha256 = "0cq0s9yixkg98vhsgiv1xjia2cn0b4q6gjl1wv0q7yrm26anaqcq";
-       buildDepends = [ base monads-tf papillon ];
+       libraryHaskellDepends = [ base monads-tf papillon ];
        description = "markdown parser with papillon";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87665,8 +89890,9 @@ self: {
        sha256 = "1bc3vcifv2xcddh8liq380c6sxarrs5pf21pfs9i4dx9rfl3hvhq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base directory hspec QuickCheck silently stringbuilder
        ];
        description = "Literate Haskell support for Markdown";
@@ -87683,7 +89909,7 @@ self: {
        sha256 = "0sman1849sfr0d56kifpyb0ba9pqghvmyhr3gchcd13qimp80395";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary-file Cabal directory filepath markdown-pap monads-tf
          papillon png-file yjsvg
        ];
@@ -87698,8 +89924,8 @@ self: {
        pname = "marked-pretty";
        version = "1.1.2.1";
        sha256 = "01dsqdckrm93ydc5frsxj55vgj238213qr31n1iybjdmw5x2r0dl";
-       buildDepends = [ base deepseq ghc-prim ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base deepseq ghc-prim ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/ku-fpg/marked-pretty";
        description = "Pretty-printing library, with scoping, based on pretty";
        license = stdenv.lib.licenses.bsd3;
@@ -87711,7 +89937,7 @@ self: {
        pname = "markov";
        version = "0.1";
        sha256 = "1ka44rvrl9ppshbjmk95997cna670bqwjsharcr9qsalp6pchmdf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Simple interpreter for Markov's normal algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87722,7 +89948,7 @@ self: {
        pname = "markov-chain";
        version = "0.0.3.3";
        sha256 = "1y9fjsf6dg6a9ha75w2szq4gi5fhq89l1r7wqb20hmadkcjjplx8";
-       buildDepends = [ base containers random transformers ];
+       libraryHaskellDepends = [ base containers random transformers ];
        homepage = "http://code.haskell.org/~thielema/markov-chain/";
        description = "Markov Chains for generating random sequences with a user definable behaviour";
        license = "GPL";
@@ -87736,8 +89962,10 @@ self: {
        pname = "markov-processes";
        version = "0.0.2";
        sha256 = "1pd09fdy05l3drmpdd3rbid6g2vdyalrpc704xmacbp186hmnf38";
-       buildDepends = [ base bifunctors memoize MonadRandom random ];
-       testDepends = [ assertions base bifunctors memoize random ];
+       libraryHaskellDepends = [
+         base bifunctors memoize MonadRandom random
+       ];
+       testHaskellDepends = [ assertions base bifunctors memoize random ];
        description = "Hidden Markov processes";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87751,11 +89979,11 @@ self: {
        pname = "markup";
        version = "1.1.0";
        sha256 = "0p037nq20vdbrvn29n3xlaval98fs0lml3y5h0j9fy04x6zcdkz8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup comonad lucid mtl text transformers
          urlpath
        ];
-       testDepends = [ base hspec ];
+       testHaskellDepends = [ base hspec ];
        description = "Abstraction for markup languages";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -87771,7 +89999,7 @@ self: {
        sha256 = "09gfmh9hdzyjijkv2h5a6gfa9rfmba2642rhhh80wsw9y4rg8ns1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs directory glib gtk gtk2hs-buildtools MissingH mtl
          pandoc temporary text transformers webkit
        ];
@@ -87793,13 +90021,16 @@ self: {
        sha256 = "0643l0xnm4rq6zfbbd01ps3z7qnw7crvpblg7n5rwigi0m1zl4n9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base bytestring Cabal data-default directory exceptions
-         filepath http-client http-client-tls http-types keyring mtl network
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions http-client http-client-tls
+         http-types mtl network text transformers
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring Cabal data-default directory filepath keyring
          optparse-applicative process shake split text transformers
          zip-archive
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base exceptions tasty tasty-hunit text transformers
        ];
        jailbreak = true;
@@ -87825,16 +90056,20 @@ self: {
        sha256 = "1w2lvns840hdzyismdwv70s70qd2af2ms14y58nhp24yf6h58j7b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async attoparsec base binary bytestring containers cryptohash
-         data-binary-ieee754 directory either errors fast-logger filepath
-         hashable hslogger lifted-async mmorph monad-control monad-logger
-         mtl old-locale optparse-applicative packer pipes pipes-attoparsec
-         pipes-bytestring pipes-group semigroups siphash text time
-         transformers transformers-base unix unordered-containers
+         directory either errors fast-logger filepath hashable hslogger
+         lifted-async mmorph monad-control monad-logger mtl packer pipes
+         pipes-attoparsec pipes-bytestring pipes-group semigroups siphash
+         text time transformers transformers-base unix unordered-containers
          vaultaire-common zeromq4-haskell
        ];
-       testDepends = [ base bytestring hspec ];
+       executableHaskellDepends = [
+         async attoparsec base bytestring containers data-binary-ieee754
+         hslogger old-locale optparse-applicative packer pipes text time
+         unix unordered-containers vaultaire-common
+       ];
+       testHaskellDepends = [ base bytestring hspec ];
        description = "Client library for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87852,10 +90087,13 @@ self: {
        sha256 = "01yz9ry25k6kq1r8z3dbqj2xqm95wssfh2jhwarv3w3z65wa6x8n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base configurator containers cubicbezier directory dlist filepath
-         glpk-hs graphviz labeled-tree lens mtl parsek polynomials-bernstein
-         pretty process text typography-geometry vector
+       libraryHaskellDepends = [
+         base containers cubicbezier directory filepath glpk-hs graphviz
+         labeled-tree lens mtl polynomials-bernstein process text
+         typography-geometry vector
+       ];
+       executableHaskellDepends = [
+         base configurator dlist parsek pretty
        ];
        jailbreak = true;
        description = "Markup language preprocessor for Haskell";
@@ -87875,7 +90113,7 @@ self: {
        sha256 = "1p9d2vy3c7yh1w1aczh3f4886q0hldrpisnkk40w62cqvjg7sig7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          authenticate-oauth base bytestring conduit datetime lens
          monad-logger parsers persistent persistent-sqlite
          persistent-template regex-posix text transformers twitter-conduit
@@ -87896,7 +90134,7 @@ self: {
        sha256 = "0bxzjs19n2c7xd1v2hrzx6h1rrw6m8yax7kbcar0q766bv36qfmy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base random ];
+       executableHaskellDepends = [ base random ];
        homepage = "http://wiki.github.com/paolino/mastermind";
        description = "console mastermind decypher";
        license = stdenv.lib.licenses.bsd3;
@@ -87908,8 +90146,8 @@ self: {
        pname = "matchers";
        version = "0.24.0.0";
        sha256 = "171ncbch38nzy46lb6p9navaar1b492hgf4b9kbd3g6fsldvny64";
-       buildDepends = [ base bytestring prednote text ];
-       extraLibraries = [ pcre ];
+       libraryHaskellDepends = [ base bytestring prednote text ];
+       librarySystemDepends = [ pcre ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/matchers";
        description = "Text matchers";
@@ -87926,8 +90164,10 @@ self: {
        pname = "math-functions";
        version = "0.1.5.2";
        sha256 = "12cznf7gwia1ki7xhvlhk5p8d09zrdvfgn07pkp4sfrwsc4vijcy";
-       buildDepends = [ base deepseq erf vector vector-th-unbox ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base deepseq erf vector vector-th-unbox
+       ];
+       testHaskellDepends = [
          base HUnit ieee754 QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector
        ];
@@ -87947,7 +90187,7 @@ self: {
        sha256 = "01iyzrwscqirhcr4622d0n16mr4p54qbvg5m2a0ns36j59xfd79g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring ConfigFile directory filepath HStringTemplate HUnit
          old-locale pandoc pandoc-types process SHA test-framework
          test-framework-hunit time unix
@@ -87969,7 +90209,7 @@ self: {
        sha256 = "1gbk1bv5v7s4mbs3cr30zhfnm3zrhxhly3791mar5807bqw86q5v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring cmdargs containers directory fgl filepath
          graphviz HTTP process safe tagsoup text
        ];
@@ -87987,8 +90227,10 @@ self: {
        pname = "mathlink";
        version = "2.0.1.1";
        sha256 = "1agqbhl6r40swsvsllyx9vf9hc9a709wvg546rh6fn315waifqqk";
-       buildDepends = [ array base containers haskell98 ix-shapable mtl ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [
+         array base containers haskell98 ix-shapable mtl
+       ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "http://community.haskell.org/~TracyWadleigh/mathlink";
        description = "Write Mathematica packages in Haskell";
@@ -88002,8 +90244,8 @@ self: {
        pname = "matlab";
        version = "0.2.0.0";
        sha256 = "08kalclinzqxy5l7j115hz6h9nw1g7mf9rzmpz8dblbhbwvj4l7x";
-       buildDepends = [ array base Cabal filepath ];
-       extraLibraries = [ eng mat mx ];
+       libraryHaskellDepends = [ array base Cabal filepath ];
+       librarySystemDepends = [ eng mat mx ];
        jailbreak = true;
        description = "Matlab bindings and interface";
        license = stdenv.lib.licenses.bsd3;
@@ -88017,11 +90259,13 @@ self: {
      mkDerivation {
        pname = "matrices";
        version = "0.4.2";
-       revision = "1";
        sha256 = "1mcv3ihaf15biai6m98jfgv31whgmwbzgagxyj3bfpnilslp98l6";
+       revision = "1";
        editedCabalFile = "6aabde42e016b428562ed0e983444308c23d79837f04453fe57f60a6cbc02fe4";
-       buildDepends = [ base primitive vector ];
-       testDepends = [ base tasty tasty-hunit tasty-quickcheck vector ];
+       libraryHaskellDepends = [ base primitive vector ];
+       testHaskellDepends = [
+         base tasty tasty-hunit tasty-quickcheck vector
+       ];
        description = "native matrix based on vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88034,8 +90278,8 @@ self: {
        pname = "matrix";
        version = "0.3.4.4";
        sha256 = "03aaw60x8849rsrcqc8n0d3k8a6dp8naxnqfq2xq776q5zbbcrpv";
-       buildDepends = [ base deepseq loop primitive vector ];
-       testDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base deepseq loop primitive vector ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A native implementation of matrix operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88046,7 +90290,7 @@ self: {
        pname = "matrix-market";
        version = "1.2";
        sha256 = "1hzpjkmwr24073mf9i13rx3n23ri0b5vmvwx8k9lxbrg1821hy28";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://stat.stanford.edu/~patperry/code/matrix-market";
        description = "Read and write NIST Matrix Market files";
        license = stdenv.lib.licenses.bsd3;
@@ -88058,7 +90302,7 @@ self: {
        pname = "matrix-market-pure";
        version = "0.2";
        sha256 = "05jjf5wnxhbafrca1qfzlrxvysy5bff22mzk45pia5b9gwdhygn1";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        homepage = "http://bitbucket.org/jetxee/hs-matrix-market";
        description = "Pure and composable reader and writer of the Matrix Market format";
        license = stdenv.lib.licenses.bsd3;
@@ -88074,7 +90318,7 @@ self: {
        sha256 = "15pjqyy9qs9bn2vfayl73h5maf01snv7rvq1acb3ly8pain36lh4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile containers directory MissingH mtl network
          old-locale split time vty vty-ui XMPP
        ];
@@ -88092,7 +90336,7 @@ self: {
        pname = "maude";
        version = "0.6.1";
        sha256 = "0qadqpj5vzg84mqh29p6vr2ffih7y69ds0jdpxmr17am5bh3mhql";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath process process-extras temporary text xml
        ];
        homepage = "https://github.com/davidlazar/maude-hs";
@@ -88110,10 +90354,10 @@ self: {
        pname = "maxent";
        version = "0.7";
        sha256 = "0vxfxlvcrmqcxplw6f2r7nljcam9iv92jy2nxa7x67ldyj7yxk28";
-       buildDepends = [
+       libraryHaskellDepends = [
          ad base lagrangian nonlinear-optimization vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          ad base hmatrix lagrangian nonlinear-optimization QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
          vector
@@ -88130,7 +90374,7 @@ self: {
        pname = "maximal-cliques";
        version = "0.1.1";
        sha256 = "1sbmykgb5lrd32rih09d8d0r5isz4nh5slfyd93dgln7ag3hb7bh";
-       buildDepends = [ base containers vector ];
+       libraryHaskellDepends = [ base containers vector ];
        description = "Enumerate all maximal cliques of a graph";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88146,7 +90390,7 @@ self: {
        sha256 = "1a9z3bmdjl5mhn718bj8h95m4xlhiyimkz7z54d0dmcv6ryld4wx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-unicode-symbols boxes containers
          containers-unicode-symbols HaLeX IndentParser mtl parsec process
          uuagc uuagc-cabal
@@ -88164,8 +90408,8 @@ self: {
        pname = "maybe-justify";
        version = "0.1.0.0";
        sha256 = "0zgc3niz0vz4b3xcxj6s4fpxzizgkimllyd0r6vcafbl9ffv2a38";
-       buildDepends = [ base ];
-       testDepends = [ base tasty tasty-hunit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Simple higher order function for Maybe";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -88180,8 +90424,9 @@ self: {
        sha256 = "1iqfmvj9maa0f4gk66g0j1dv1prhac3vb0b225d9sw9bliwnb1br";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base benchpress Cabal directory filepath mtl old-time process time
+       libraryHaskellDepends = [ base benchpress old-time process ];
+       executableHaskellDepends = [
+         base benchpress Cabal directory filepath mtl process time
        ];
        jailbreak = true;
        homepage = "http://code.google.com/p/maybench/";
@@ -88196,7 +90441,7 @@ self: {
        pname = "mbox";
        version = "0.3.1";
        sha256 = "13hq6h280wbc9xwbvdcq4qqrhbjnnzg824lk4zxkh4bvqpabjwni";
-       buildDepends = [ base safe text time time-locale-compat ];
+       libraryHaskellDepends = [ base safe text time time-locale-compat ];
        description = "Read and write standard mailbox files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88211,7 +90456,7 @@ self: {
        sha256 = "1j0dl97skgbxq2gcd3w6jzsdd2yv1mw6z4fz61akcimzyn8c2lvh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring codec-mbox containers fclabels hsemail mtl parsec
          process pureMD5 random
        ];
@@ -88229,7 +90474,7 @@ self: {
        sha256 = "178f2n2r7m4jznkzhnqqslqf0czvz9h7cifhbdmvr1nihhgb532q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gloss ];
+       executableHaskellDepends = [ base gloss ];
        jailbreak = true;
        homepage = "http://www.cas.mcmaster.ca/~anand/";
        license = stdenv.lib.licenses.mit;
@@ -88243,7 +90488,7 @@ self: {
        pname = "mcmc-samplers";
        version = "0.1.1.1";
        sha256 = "0pqc6i86b5vdhfw93x220k0x7dcfs77s7az6avaw7fn2q6xl1qli";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hakaru hmatrix mwc-random primitive statistics
        ];
        jailbreak = true;
@@ -88258,7 +90503,7 @@ self: {
        pname = "mcmc-synthesis";
        version = "0.1.2.2";
        sha256 = "14z1x9dqnjj391nrlngs9s887yqh3arc7kfgk0m3d89vrkc185vq";
-       buildDepends = [ base MonadRandom ];
+       libraryHaskellDepends = [ base MonadRandom ];
        jailbreak = true;
        description = "MCMC applied to probabilistic program synthesis";
        license = stdenv.lib.licenses.gpl3;
@@ -88272,7 +90517,8 @@ self: {
        sha256 = "15ab4fl49nq398q49wz5fgphfb7xzbrf4j51rnd80qb30rm6xfl6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base network pipes split transformers ];
+       libraryHaskellDepends = [ base network split transformers ];
+       executableHaskellDepends = [ base network pipes transformers ];
        jailbreak = true;
        homepage = "https://github.com/DougBurke/hmcpi";
        description = "Connect to MineCraft running on a Raspberry PI";
@@ -88288,7 +90534,12 @@ self: {
        sha256 = "0jynmcawrxwv6xfbwvz3915rsp2ssx9s8h7i3pgd5adlzqpws19l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ ansi-terminal base directory pandoc terminfo ];
+       libraryHaskellDepends = [
+         ansi-terminal base directory pandoc terminfo
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base directory pandoc terminfo
+       ];
        jailbreak = true;
        homepage = "https://github.com/dorafmon/mdcat";
        description = "Markdown viewer in your terminal";
@@ -88304,7 +90555,7 @@ self: {
        sha256 = "13i4lb74m69k6ij3rq0dqwghdazwmc60fs55prc1h3p7b0rz15mv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        description = "Command-line tool to run a command on each of the items";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88315,8 +90566,8 @@ self: {
        pname = "mecab";
        version = "0.4.0";
        sha256 = "0z650y4fnxr4mk0i5s8axjbq14dcpgnrzkafbpg17vfhl2v5a3z3";
-       buildDepends = [ base bytestring text ];
-       extraLibraries = [ mecab ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ mecab ];
        jailbreak = true;
        homepage = "http://github.com/tanakh/hsmecab";
        description = "A Haskell binding to MeCab";
@@ -88332,7 +90583,7 @@ self: {
        sha256 = "0y3rzif667kjaxmnf9d382lcbxf27y4ik02kisij125kc7yi6d21";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://tomahawkins.org";
        description = "A constructive solid geometry (CSG) modeling language";
        license = stdenv.lib.licenses.bsd3;
@@ -88348,7 +90599,10 @@ self: {
        sha256 = "1wfrhii7zqrw6rmskab40h9zliidi34kd4n07rdkvf8f8nypwg1r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base HTTP mime network pretty utf8-string xml ];
+       libraryHaskellDepends = [ base HTTP mime network utf8-string xml ];
+       executableHaskellDepends = [
+         base HTTP mime network pretty utf8-string xml
+       ];
        description = "Interfacing with the MediaWiki API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88367,7 +90621,7 @@ self: {
        sha256 = "0q708hh5280k5hknf1mh3nza7qvpszplcis90y0i78a2jd0x2r3w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base blaze-html bytestring containers directory
          directory-tree file-embed filepath happstack-server
          highlighting-kate HTTP http-conduit hxt hxt-http mtl network parsec
@@ -88389,8 +90643,10 @@ self: {
        pname = "meep";
        version = "0.1.2.0";
        sha256 = "1jr3zgja3m40ajygi1jqsxfwhsf7yf0lwblffd8z096w67pn4idr";
-       buildDepends = [ base bifunctors lens semigroupoids semigroups ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bifunctors lens semigroupoids semigroups
+       ];
+       testHaskellDepends = [
          base bifunctors doctest hspec hspec-expectations-lens lens
          QuickCheck semigroupoids semigroups
        ];
@@ -88409,7 +90665,7 @@ self: {
        sha256 = "0x85l77q9zzi1gmcl9h3rrjbgyfynxqcczl636iah88wvdg7lplg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring conduit containers directory http-conduit
          http-types network shelly system-fileio system-filepath tar text
          transformers zlib-conduit
@@ -88426,7 +90682,7 @@ self: {
        pname = "meldable-heap";
        version = "2.0.3";
        sha256 = "1p75zjlls38sd1lma7w95mpmb9kdff19s2as6pz1ki1g20nnxdk3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/priority-queues/";
        description = "Asymptotically optimal, Coq-verified meldable heaps, AKA priority queues";
        license = stdenv.lib.licenses.bsd3;
@@ -88442,10 +90698,11 @@ self: {
        sha256 = "1sbwd1xmgh94ll3xm7ancjsaalk2mphnr1l331zix5s3kqvy6g6p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers either lens mtl parsec ParsecTools
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base containers HUnit mtl test-framework test-framework-hunit
        ];
        jailbreak = true;
@@ -88461,14 +90718,14 @@ self: {
      mkDerivation {
        pname = "memcache";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "1x2lw802m02p9z28rsmvwczsax9f6vl16p9kwjq4zmn8ak0s74m5";
+       revision = "1";
        editedCabalFile = "6e2508fa18aae99fee1c0aa41cc86e97d73ff504647b5265e54adf3566ca81e7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-builder bytestring hashable network resource-pool
          time vector vector-algorithms
        ];
-       testDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/dterei/memcache-hs";
        description = "A memcached client library";
        license = stdenv.lib.licenses.bsd3;
@@ -88485,10 +90742,14 @@ self: {
        sha256 = "1y1jysshvwddr3rymbzr9s6bq4pg7rd0bkk7ip4xwa8kpzf8k3pj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-binary base bytestring conduit conduit-extra
-         containers hashtables memcache-haskell monad-control mtl network
-         resourcet split stm transformers
+         memcache-haskell mtl network resourcet split
+       ];
+       executableHaskellDepends = [
+         base bytestring conduit conduit-extra containers hashtables
+         memcache-haskell monad-control mtl network resourcet stm
+         transformers
        ];
        description = "Conduit library for memcache procotol";
        license = stdenv.lib.licenses.mit;
@@ -88506,11 +90767,14 @@ self: {
        sha256 = "0j3fn59nz4iynlmhv3hxbfqip0rjj94fkb3kx8jax90jbnf7s6sc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring conduit-extra containers hashable
-         hashtables mtl network resourcet split stm transformers
+       libraryHaskellDepends = [
+         attoparsec base bytestring hashable network split transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring conduit-extra containers hashtables mtl resourcet
+         stm transformers
+       ];
+       testHaskellDepends = [
          base bytestring HUnit network QuickCheck split test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
        ];
@@ -88524,7 +90788,7 @@ self: {
        pname = "memcached";
        version = "0.2.1";
        sha256 = "1a6wzznhpz06c0y3wrjf5bskdd8myild8v0p0x1h0swhmy6di2yd";
-       buildDepends = [ base bytestring network utf8-light ];
+       libraryHaskellDepends = [ base bytestring network utf8-light ];
        jailbreak = true;
        homepage = "http://github.com/olegkat/haskell-memcached";
        description = "haskell bindings for memcached";
@@ -88539,14 +90803,14 @@ self: {
      mkDerivation {
        pname = "memcached-binary";
        version = "0.2.0";
-       revision = "2";
        sha256 = "137vb065f744jq3avpraqryzspch78vc5krp0fw2zzcbk5cm92ad";
+       revision = "2";
        editedCabalFile = "663a104dc09413397f9640534b6d1a743835a395598f641d02ef0dbd44093530";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class network resource-pool
          storable-endian time unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring data-default-class hspec HUnit network process
        ];
        homepage = "https://github.com/philopon/memcached-binary";
@@ -88559,10 +90823,10 @@ self: {
      mkDerivation {
        pname = "memexml";
        version = "0.0.2";
-       revision = "1";
        sha256 = "07cmjx10wbpfcblnd23rzdkma04nyjcpd1g58gp0phajj6xj4i7a";
+       revision = "1";
        editedCabalFile = "a1712ea7643a27f1fb40a771fdae76282818b5d317fe8da6a22e705b06bc3b3e";
-       buildDepends = [ base hxt ];
+       libraryHaskellDepends = [ base hxt ];
        jailbreak = true;
        homepage = "https://github.com/eggzilla/memexml";
        description = "Library for reading Meme XML output";
@@ -88575,7 +90839,7 @@ self: {
        pname = "memo-ptr";
        version = "0.1.0.0";
        sha256 = "1vy3673dvf0crs384vhi56i7bir9k8yk3cjcrcc7bn15qyclif19";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Pointer equality memoization";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -88586,7 +90850,7 @@ self: {
        pname = "memo-sqlite";
        version = "0.1";
        sha256 = "1gijza29wj79k8czfg4mghq7nqsbpyf1scnm9hmg2ykhnllpzvy3";
-       buildDepends = [ base direct-sqlite ];
+       libraryHaskellDepends = [ base direct-sqlite ];
        jailbreak = true;
        homepage = "https://gitorious.org/memo-sqlite";
        description = "memoize functions using SQLite3 database";
@@ -88600,7 +90864,7 @@ self: {
        pname = "memoize";
        version = "0.7";
        sha256 = "1sqi9n9r2q3sh00isgj3rmayrlm970a2g9x389rlfb0kczixdnq4";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "A memoization library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88613,12 +90877,11 @@ self: {
        pname = "memory";
        version = "0.7";
        sha256 = "1yj1v4xr3y3inrn1rzlh1lfmgxi8p15k4qm48bac76qg3a2wh8z1";
-       buildDepends = [ base bytestring deepseq ghc-prim ];
-       testDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
        description = "memory and related abtraction stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memscript" = callPackage
@@ -88629,7 +90892,7 @@ self: {
        sha256 = "0vbmgvdjq4mxax39zr6anmb96pr2pgqlwmc4qbkrz2c7v8hg2mjb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base readline ];
+       executableHaskellDepends = [ base readline ];
        homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/memscript";
        description = "Command line utility for memorizing scriptures or any other text";
        license = "GPL";
@@ -88641,7 +90904,7 @@ self: {
        pname = "mersenne-random";
        version = "1.0.0.1";
        sha256 = "193qz3wn7lz18aywddr9qyn8v08ifv2yxwr68c67p5mn8vr8mvmw";
-       buildDepends = [ base old-time ];
+       libraryHaskellDepends = [ base old-time ];
        homepage = "http://code.haskell.org/~dons/code/mersenne-random";
        description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
@@ -88653,7 +90916,7 @@ self: {
        pname = "mersenne-random-pure64";
        version = "0.2.0.4";
        sha256 = "0qh72ynfg1k4c70qxdzsa6f1x9wyxil2d9gi85c879wrc41k899h";
-       buildDepends = [ base old-time random ];
+       libraryHaskellDepends = [ base old-time random ];
        homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/";
        description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
@@ -88667,8 +90930,8 @@ self: {
        pname = "messagepack";
        version = "0.4.0";
        sha256 = "198rd9yy99zsgp48gmz3kxzljcpmbqh2gghzndn3q0n7cv0lls0i";
-       buildDepends = [ base bytestring cereal containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring cereal containers ];
+       testHaskellDepends = [
          base bytestring cereal containers QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
@@ -88685,7 +90948,7 @@ self: {
        pname = "messagepack-rpc";
        version = "0.2.0.0";
        sha256 = "0lx0qyv41pylbz2580zvw4qw07pih4l9sbdd2h99gwkqjpjnc8x8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers messagepack network-simple
        ];
        homepage = "http://github.com/rodrigosetti/messagepack-rpc";
@@ -88699,7 +90962,9 @@ self: {
        pname = "messente";
        version = "0.1.0.1";
        sha256 = "1yv2dspkn34yf61z8c09aijngjr96w30s2sjmhyv9c2c48ys6jc5";
-       buildDepends = [ base bytestring HTTP http-conduit network ];
+       libraryHaskellDepends = [
+         base bytestring HTTP http-conduit network
+       ];
        homepage = "http://github.com/kaiko/messente-haskell";
        description = "Messente SMS Gateway";
        license = stdenv.lib.licenses.mit;
@@ -88711,7 +90976,7 @@ self: {
        pname = "meta-misc";
        version = "0.1.0.3";
        sha256 = "0pxsg67r2z0f9zxr8m98sndlii0bixyxwgjkc31z5743ciw9ch0c";
-       buildDepends = [ base loch-th template-haskell ];
+       libraryHaskellDepends = [ base loch-th template-haskell ];
        homepage = "https://github.com/bairyn/meta-misc";
        description = "Utility library providing miscellaneous meta-programming utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -88725,7 +90990,7 @@ self: {
        pname = "meta-par";
        version = "0.3";
        sha256 = "012blwbwxac2wikiydvjsa4b7f866wws3g33bczv8dzcx3123ljn";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-deque abstract-par base bytestring containers deepseq mtl
          mwc-random transformers vector
        ];
@@ -88743,7 +91008,7 @@ self: {
        pname = "meta-par-accelerate";
        version = "0.3.5";
        sha256 = "0gl6bh2jqf697vl4cg88z39g6180bbha01h67qz46f1vcyvi0lwq";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-deque abstract-par abstract-par-accelerate accelerate
          array base meta-par QuickCheck transformers vector
        ];
@@ -88759,7 +91024,7 @@ self: {
        pname = "metadata";
        version = "0.2.0.0";
        sha256 = "148c7vgh8zxgy5fb0xflk0lzm5d233d1ynjncpiwi1bb9jzbdm3r";
-       buildDepends = [ base text time ];
+       libraryHaskellDepends = [ base text time ];
        jailbreak = true;
        homepage = "http://github.com/cutsea110/metadata";
        description = "metadata library for semantic web";
@@ -88772,7 +91037,7 @@ self: {
        pname = "metamorphic";
        version = "0.1.2.3";
        sha256 = "0pazw2kdsl8g4dax6bg0hfg7vp2nna6lrsnzdkixpins7ac95078";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/technogeeky/metamorphic";
        description = "metamorphisms: ana . cata or understanding folds and unfolds";
        license = "unknown";
@@ -88784,7 +91049,7 @@ self: {
        pname = "metaplug";
        version = "0.1.1";
        sha256 = "086n9kqyi2jqki31jgylm0r63ahgvw3pf7mi5hln2m86a5x4ij4n";
-       buildDepends = [ base Cabal filepath ghc haskell98 ];
+       libraryHaskellDepends = [ base Cabal filepath ghc haskell98 ];
        description = "a tiny ghc api wrapper";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88798,8 +91063,10 @@ self: {
        pname = "metric";
        version = "0.2.0";
        sha256 = "172drfn8p5yqyvka2jphhi1lfj5msv2xssa271lfb3w757br452d";
-       buildDepends = [ base data-default edit-distance hmatrix vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base data-default edit-distance hmatrix vector
+       ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2 vector
        ];
        description = "Metric spaces";
@@ -88816,17 +91083,16 @@ self: {
        pname = "metrics";
        version = "0.3.0.2";
        sha256 = "00iwairgi9lvb4f8iz4d834v8vq1f4awr34nl72fbkqgccdq1whd";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring containers lens mtl mwc-random
          primitive text time unix unordered-containers vector
          vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base lens mwc-random primitive QuickCheck unix
        ];
        description = "High-performance application metric tracking";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "metricsd-client" = callPackage
@@ -88835,7 +91101,7 @@ self: {
        pname = "metricsd-client";
        version = "0.1";
        sha256 = "1q807wvmj1q605257jj60h0j2wal6ypjiad9wkjmv836p3mis5q9";
-       buildDepends = [ base network ];
+       libraryHaskellDepends = [ base network ];
        jailbreak = true;
        description = "Client for the metrics aggregator Metricsd";
        license = stdenv.lib.licenses.bsd3;
@@ -88847,7 +91113,9 @@ self: {
        pname = "metronome";
        version = "0.1";
        sha256 = "0gx0g8s5w99mhvip1v1kj03dhij3fhig1b8myha0zdssf2x6vjwc";
-       buildDepends = [ base data-lens data-lens-template hosc stm ];
+       libraryHaskellDepends = [
+         base data-lens data-lens-template hosc stm
+       ];
        description = "Time Synchronized execution";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88861,8 +91129,8 @@ self: {
        pname = "mfsolve";
        version = "0.1.0";
        sha256 = "1lvx3nlxhfmvh9xbi62hik8ypv4n28ax86nqzwkchb60k1djnagg";
-       buildDepends = [ base hashable unordered-containers ];
-       testDepends = [ base tasty tasty-hunit ];
+       libraryHaskellDepends = [ base hashable unordered-containers ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Equation solver and calculator à la metafont";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88873,7 +91141,9 @@ self: {
        pname = "mgeneric";
        version = "0.0.0.2";
        sha256 = "1pgmgssysl0nv9z4vvlmxjijl6y7jvy1b7ph30jnj3fmcrwdf6w3";
-       buildDepends = [ base containers lens mtl template-haskell ];
+       libraryHaskellDepends = [
+         base containers lens mtl template-haskell
+       ];
        homepage = "http://github.com/RafaelBocquet/haskell-mgeneric/";
        description = "Generics with multiple parameters";
        license = stdenv.lib.licenses.mit;
@@ -88887,7 +91157,7 @@ self: {
        pname = "mi";
        version = "0.0.1";
        sha256 = "03virg707xxy330xq4g60fy1rvs1rq9w5p08yc5khzh64v1g3i2b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta parsec split template-haskell
        ];
        jailbreak = true;
@@ -88902,7 +91172,7 @@ self: {
        pname = "microbench";
        version = "0.1";
        sha256 = "05yphn77rxg7zqpn27292yvmah2634hqfx2mgfyp5yws5ickrvkg";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        homepage = "http://neugierig.org/software/darcs/browse/?r=microbench;a=summary";
        description = "Microbenchmark Haskell code";
        license = stdenv.lib.licenses.bsd3;
@@ -88921,19 +91191,22 @@ self: {
        sha256 = "0n4clyzaw2a9vi0qcf6f2pdp7wckl3z84sfjqdj8k4dbp1qnwl55";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base blaze-html blaze-markup containers data-default either
-         html-conduit microformats2-types network options pcre-heavy safe
-         scotty streaming-commons stringable text time wai-extra warp
-         xml-lens xss-sanitize
+       libraryHaskellDepends = [
+         base blaze-markup containers data-default either html-conduit
+         microformats2-types pcre-heavy safe text time xml-lens xss-sanitize
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base blaze-html blaze-markup microformats2-types network options
+         scotty streaming-commons stringable text wai-extra warp
+       ];
+       testHaskellDepends = [
          base data-default hspec html-conduit microformats2-types
          raw-strings-qq template-haskell time xml-lens
        ];
        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
@@ -88944,7 +91217,7 @@ self: {
        pname = "microformats2-types";
        version = "0.4.1";
        sha256 = "1p2s2g78bnqbcf0www0x11pz5nyxjfac7q7sbd2qfn1v777ylv7b";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base data-default-class pandoc-types setters text time
        ];
        homepage = "https://github.com/myfreeweb/microformats2-types";
@@ -88958,7 +91231,7 @@ self: {
        pname = "microlens";
        version = "0.1.3.0";
        sha256 = "1ryjxc3qa583ryp9sig3rjjr3dpv9sx2ybag4qrlkwja1dz8r2dm";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library which you can depend upon";
        license = stdenv.lib.licenses.bsd3;
@@ -88970,7 +91243,7 @@ self: {
        pname = "microlens-each";
        version = "0.1.0.0";
        sha256 = "00bk2vriwh8aj2c6n5g2w84pfq0nssfa62iw97dm9c3zkp558wxj";
-       buildDepends = [ base microlens ];
+       libraryHaskellDepends = [ base microlens ];
        homepage = "http://github.com/aelve/microlens";
        description = "'each' for microlens";
        license = stdenv.lib.licenses.bsd3;
@@ -88984,7 +91257,7 @@ self: {
        pname = "microlens-mtl";
        version = "0.1.2.0";
        sha256 = "1jvw9pspnr24rh7bvl6q7hv7x0g6vwy2a5xl19pxf36rl8wlfm9v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base microlens mtl transformers transformers-compat
        ];
        homepage = "http://github.com/aelve/microlens";
@@ -88998,7 +91271,9 @@ self: {
        pname = "microlens-th";
        version = "0.2.0.0";
        sha256 = "048q6ridxvg7zi272q01k6ds0f411kg27p5whgj63qgg3k9w72sp";
-       buildDepends = [ base containers microlens template-haskell ];
+       libraryHaskellDepends = [
+         base containers microlens template-haskell
+       ];
        homepage = "http://github.com/aelve/microlens";
        description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
@@ -89010,7 +91285,7 @@ self: {
        pname = "microtimer";
        version = "0.0.1.2";
        sha256 = "09w8jn6g8fq3zsp2ahdrzv33mvayh8vladmc2wf8pbmpmdii0kap";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        homepage = "http://thoughtpolice.github.com/hs-microtimer";
        description = "A tiny library for benchmarking IO actions";
        license = stdenv.lib.licenses.bsd3;
@@ -89028,12 +91303,16 @@ self: {
        sha256 = "0x71qih8r48kp2anvdnwfkja3sz8iigzprsqkaqi259mn58qd9ch";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers HCodecs mersenne-random-pure64 mtl parsec text
+         transformers
+       ];
+       executableHaskellDepends = [
          base containers directory filepath haskeline HCodecs
          mersenne-random-pure64 mtl optparse-applicative parsec process text
          text-format transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HCodecs mersenne-random-pure64 mtl parsec
          QuickCheck test-framework test-framework-quickcheck2 text
          transformers
@@ -89053,12 +91332,12 @@ self: {
        pname = "midi";
        version = "0.2.1.5";
        sha256 = "0vi9pslbix7wcbciv3nlk1v6v6f45xf1lq85nl8awhs488fhbl3z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring event-list explicit-exception
          monoid-transformer non-negative QuickCheck random transformers
          utility-ht
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring event-list explicit-exception non-negative
          QuickCheck transformers utility-ht
        ];
@@ -89073,7 +91352,9 @@ self: {
        pname = "midi-alsa";
        version = "0.2.1";
        sha256 = "13dc299d252nrll1vzp7pl1ncv0qw3xhz5b3kqnc8hb0g4mkkgpc";
-       buildDepends = [ alsa-seq base data-accessor midi utility-ht ];
+       libraryHaskellDepends = [
+         alsa-seq base data-accessor midi utility-ht
+       ];
        homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Convert between datatypes of the midi and the alsa packages";
        license = stdenv.lib.licenses.bsd3;
@@ -89090,7 +91371,7 @@ self: {
        sha256 = "0hnlnjgn378mkrhky8fvpzs6i34s3n6lx81mf3hnxmb1vgwy2nmf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers diagrams-lib diagrams-postscript event-list midi
          non-empty optparse-applicative utility-ht
        ];
@@ -89105,10 +91386,12 @@ self: {
      mkDerivation {
        pname = "midi-util";
        version = "0.1.1.1";
-       revision = "1";
        sha256 = "1g8rhx1n6rhyi49x6rkim1bnv7rg6wc0x89dzkrbzyxm28hkvjfk";
+       revision = "1";
        editedCabalFile = "2c42b8e0940125f6354a9174ad5cb19da6fc0122b4947576e28abb753a7cff14";
-       buildDepends = [ base containers event-list midi non-negative ];
+       libraryHaskellDepends = [
+         base containers event-list midi non-negative
+       ];
        homepage = "http://github.com/mtolly/midi-util";
        description = "Utility functions for processing MIDI files";
        license = "GPL";
@@ -89124,7 +91407,7 @@ self: {
        sha256 = "13bfb2s6ybvspmmq427v55nb2csvcp4ijfgm9fvfh6cab2pm1dyz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          alsa-core alsa-seq base containers random transformers wx wxcore
        ];
        jailbreak = true;
@@ -89143,7 +91426,9 @@ self: {
        sha256 = "0i1g1hqr1jjjnrrkfgp0i9zm5cm6aza1kzqy2z8hmbqjdvyv21fz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ alsa-core alsa-seq base containers gtk mtl stm ];
+       executableHaskellDepends = [
+         alsa-core alsa-seq base containers gtk mtl stm
+       ];
        jailbreak = true;
        description = "A control midi surface";
        license = stdenv.lib.licenses.bsd3;
@@ -89161,7 +91446,7 @@ self: {
        sha256 = "0xl6x4755x8sz2igqfp3mr5n29q7hb4v5b1mycah9vffk1bhi0yf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring c10k directory filepath haskell98 hdaemonize
          hslogger network parsec time unix webserver
        ];
@@ -89185,14 +91470,18 @@ self: {
        sha256 = "0gxdf9xkw1w4cdb8cdq1slj5x1ch39kxrqhnaxdkb8w4jdxqbj5p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array async auto-update base blaze-builder byteorder bytestring
-         case-insensitive conduit conduit-extra directory filepath
-         http-client http-date http-types io-choice network old-locale
-         parsec resourcet streaming-commons time transformers unix unix-time
-         unordered-containers wai wai-app-file-cgi wai-logger warp
+         case-insensitive conduit conduit-extra directory filepath http-date
+         http-types io-choice network parsec resourcet streaming-commons
+         unix unix-time unordered-containers wai wai-app-file-cgi warp
        ];
-       testDepends = [ base hspec http-client ];
+       executableHaskellDepends = [
+         base bytestring conduit-extra directory filepath http-client
+         http-date http-types network old-locale streaming-commons time
+         transformers unix wai wai-app-file-cgi wai-logger warp
+       ];
+       testHaskellDepends = [ base hspec http-client ];
        homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "High performance web server on WAI/warp";
        license = stdenv.lib.licenses.bsd3;
@@ -89204,7 +91493,7 @@ self: {
        pname = "mikmod";
        version = "0.2.0.0";
        sha256 = "0wr671a7r20ysnry92qimdsdnf5gijbxzv382mb7w8fav88v5kvv";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "https://github.com/evanrinehart/mikmod";
        description = "MikMod bindings";
@@ -89219,14 +91508,13 @@ self: {
        pname = "miku";
        version = "2014.11.17";
        sha256 = "1zfvi7v05cdp94cdrwxxhwkzqyliaakl16klk9zb0byvsg32ns3n";
-       buildDepends = [
+       libraryHaskellDepends = [
          air air-th base bytestring containers data-default hack2
          hack2-contrib mtl
        ];
        homepage = "https://github.com/nfjinjing/miku";
        description = "A minimum web dev DSL in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "milena" = callPackage
@@ -89238,11 +91526,11 @@ self: {
        pname = "milena";
        version = "0.2.0.0";
        sha256 = "08nfjd1jn9cniksj8zrifaz3fjgnhzgydlswbz2h4lqv9kyqvvrm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers digest either lens mtl network
          random resource-pool transformers
        ];
-       testDepends = [ base bytestring hspec network QuickCheck ];
+       testHaskellDepends = [ base bytestring hspec network QuickCheck ];
        jailbreak = true;
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -89255,7 +91543,7 @@ self: {
        pname = "mime";
        version = "0.4.0.2";
        sha256 = "0x9qx8adradc5irfwfn4xs4j9pd228j1b3lpngap2qxabhz2iyp7";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        homepage = "https://github.com/GaloisInc/mime";
        description = "Working with MIME types";
        license = stdenv.lib.licenses.bsd3;
@@ -89269,7 +91557,7 @@ self: {
        pname = "mime-directory";
        version = "0.5.1";
        sha256 = "1f54rbznv52m4h72yazr397k1d9jyb1i524pfl3d494swvn9b05r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-string bytestring containers old-locale regex-pcre time
        ];
        homepage = "http://code.haskell.org/~mboes/mime-directory.git";
@@ -89286,11 +91574,11 @@ self: {
        pname = "mime-mail";
        version = "0.4.9";
        sha256 = "1l638jr7914227mg8854i6xgyhq403kb1zc2py77yb0xifm20534";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
        ];
-       testDepends = [ base blaze-builder bytestring hspec text ];
+       testHaskellDepends = [ base blaze-builder bytestring hspec text ];
        homepage = "http://github.com/snoyberg/mime-mail";
        description = "Compose MIME email messages";
        license = stdenv.lib.licenses.mit;
@@ -89306,7 +91594,7 @@ self: {
        pname = "mime-mail-ses";
        version = "0.3.2.2";
        sha256 = "1dzlfrpqw3bdqkwgp5i52azkp8lv2cgvrdvl1w39q484ra4by2y1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring byteable bytestring conduit cryptohash
          http-client http-conduit http-types mime-mail old-locale text time
          transformers xml-conduit xml-types
@@ -89324,7 +91612,7 @@ self: {
        pname = "mime-string";
        version = "0.4";
        sha256 = "0v028cgqll918zdaa95myazlg7dnvb2cvvvm1iyyqw81grza3r61";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-string bytestring iconv mtl network old-time
        ];
        description = "MIME implementation for String's";
@@ -89338,7 +91626,7 @@ self: {
        pname = "mime-types";
        version = "0.1.0.6";
        sha256 = "090z3dp928243amnc6s8g10rk2h2bprk9y138q6wj3cpflzr72pw";
-       buildDepends = [ base bytestring containers text ];
+       libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "https://github.com/yesodweb/wai";
        description = "Basic mime-type handling types and functions";
        license = stdenv.lib.licenses.mit;
@@ -89352,7 +91640,7 @@ self: {
        sha256 = "16s98hwskycl2bqv1n2bnivh8w8q3xhhj687hk8flcg9s9ny4s8k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory mtl random ];
+       executableHaskellDepends = [ base directory mtl random ];
        homepage = "http://finder.homelinux.org/haskell/Mines";
        description = "Minesweeper simulation using neural networks";
        license = "unknown";
@@ -89368,7 +91656,7 @@ self: {
        sha256 = "1cbw136wl9rdcl4vbbz9i5w1mw33qhr0gzbww0qf63zfz2lg4gs2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary binary-generic bytestring cairo containers directory
          filepath glade gtk random time
        ];
@@ -89384,7 +91672,7 @@ self: {
        pname = "miniball";
        version = "0.1.0.2";
        sha256 = "16fdzbfspxqi0h7v6gn25n065anvk9zm28236qvfwbvr9l2ki172";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        homepage = "http://nonempty.org/software/haskell-miniball";
        description = "Bindings to Miniball, a smallest enclosing ball library";
        license = stdenv.lib.licenses.gpl3;
@@ -89401,9 +91689,12 @@ self: {
        sha256 = "1f2scxg7j6zifqj6q2khxb8s49ilnk4r9qms72vysp1s5p76zk0g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers lens MonadRandom mtl mtl-compat parsec
-         parsec3-numbers readline
+         parsec3-numbers
+       ];
+       executableHaskellDepends = [
+         base containers lens mtl parsec readline
        ];
        jailbreak = true;
        description = "Miniature FORTH-like interpreter";
@@ -89416,10 +91707,12 @@ self: {
      mkDerivation {
        pname = "minimal-configuration";
        version = "0.1.1";
-       revision = "1";
        sha256 = "06r710l30kf5aaz2k446z9fhc6zshdsssp1zwri0572r1jryzd43";
+       revision = "1";
        editedCabalFile = "12049d8491610c2789c61e4736586d3fa8b1122c5c7657647c3de8d21073ef80";
-       buildDepends = [ base containers directory filepath tconfig ];
+       libraryHaskellDepends = [
+         base containers directory filepath tconfig
+       ];
        jailbreak = true;
        description = "Minimal ini like configuration library with a few extras";
        license = stdenv.lib.licenses.bsd3;
@@ -89433,8 +91726,8 @@ self: {
        pname = "minimorph";
        version = "0.1.6.0";
        sha256 = "17ds0bjpyz7ngsq7nnlqix6yjfr6clr7xkwgpg4fysii7qvymbkz";
-       buildDepends = [ base text ];
-       testDepends = [
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit text
        ];
        homepage = "https://github.com/Mikolaj/minimorph";
@@ -89450,7 +91743,7 @@ self: {
        sha256 = "0i825bd751adfj22lkgc929jlgxjj16i81k8qqkhqh7ib131kqlf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT haskell98 unix ];
+       executableHaskellDepends = [ base GLUT haskell98 unix ];
        description = "Shows how to run grabber on Mac OS X";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89464,7 +91757,9 @@ self: {
        sha256 = "1r7c07pa9lr7h32y1mgxrlrj6a4sf8kfwc7vvvrr6bjfwr3m54vl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ ansi-terminal base MissingH process time ];
+       executableHaskellDepends = [
+         ansi-terminal base MissingH process time
+       ];
        jailbreak = true;
        homepage = "http://github.com/jhickner/minions";
        description = "A fast parallel ssh tool";
@@ -89479,7 +91774,7 @@ self: {
        pname = "minioperational";
        version = "0.4.9";
        sha256 = "0kbfk3gpgzxi84kyjf7awdc2x579339zd7c42khlflhk6y88j95m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers elevator extensible mtl template-haskell
          transformers
        ];
@@ -89498,7 +91793,9 @@ self: {
        sha256 = "15rsg617wmh8cb0f2pkd5hyzrj96qjvar4p6nx21vlxr3b2plcg4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base colock directory mtl network stm unix ];
+       libraryHaskellDepends = [
+         base colock directory mtl network stm unix
+       ];
        jailbreak = true;
        description = "simple 1-to-N interprocess communication";
        license = "LGPL";
@@ -89516,7 +91813,7 @@ self: {
        sha256 = "15hgag1r0w6smilab7059z7bsn9i1czhdknma53rmj1ma2pd148y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base data-accessor data-accessor-template directory filepath mtl
          old-locale old-time process safe split template-haskell
        ];
@@ -89533,7 +91830,7 @@ self: {
        pname = "minisat";
        version = "0.1.2";
        sha256 = "089jam2cbwf4m16sgb9wh4zkgbmpfsg647lng3kyjs5d3m02i5dd";
-       buildDepends = [ async base ];
+       libraryHaskellDepends = [ async base ];
        description = "A Haskell bundle of the Minisat SAT solver";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -89548,7 +91845,7 @@ self: {
        sha256 = "05ddhr50pbqy0yjgcw0wgfjxlkgapg0zppqqyxfy5apr68zd02mm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath monads-tf parsec pretty
          transformers xhtml
        ];
@@ -89566,8 +91863,10 @@ self: {
        pname = "miniutter";
        version = "0.4.4.2";
        sha256 = "1nr08cm6qrww01sqxvr4bmkhxxihcl9sm8077gl25alj1s3gq21s";
-       buildDepends = [ base binary containers ghc-prim minimorph text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base binary containers ghc-prim minimorph text
+       ];
+       testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit text
        ];
        homepage = "https://github.com/Mikolaj/miniutter";
@@ -89582,8 +91881,8 @@ self: {
        pname = "minst-idx";
        version = "0.1.2.2";
        sha256 = "06ixg6bm55h1mjym3qp667gddy7f32inaxgyfbrh918zl283briv";
-       buildDepends = [ base binary bytestring vector ];
-       testDepends = [ base binary directory hspec vector ];
+       libraryHaskellDepends = [ base binary bytestring vector ];
+       testHaskellDepends = [ base binary directory hspec vector ];
        homepage = "https://github.com/kryoxide/minst-idx/";
        description = "Read and write IDX data that is used in e.g. the MINST database.";
        license = stdenv.lib.licenses.gpl3;
@@ -89599,7 +91898,7 @@ self: {
        sha256 = "07dz0c65xkb7kgr2rby7m3g5893rqsbyl2nmjhf4q2wqsypmiipa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          authenticate-oauth base bytestring conduit lens monad-logger text
          transformers twitter-conduit
        ];
@@ -89621,14 +91920,14 @@ self: {
        sha256 = "0j93zqgqskrj2zc0vwsmwldidr6nkcxq2v3mmzv7l7l1bwhl8jxf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring cereal directory filepath knob monad-loops
-         random-fu regex-base regex-pcre semigroups text utf8-string vector
+       libraryHaskellDepends = [
+         base bytestring cereal directory filepath knob random-fu semigroups
+         text utf8-string vector
        ];
+       executableHaskellDepends = [ monad-loops regex-base regex-pcre ];
        homepage = "https://github.com/mokus0/misfortune";
        description = "fortune-mod clone";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "missing-foreign" = callPackage
@@ -89637,7 +91936,7 @@ self: {
        pname = "missing-foreign";
        version = "0.1.1";
        sha256 = "11f8pknbarlj956nmalqhd2v704z7d7xbi61hs1q8vb2p36kc6wy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Convenience functions for FFI work";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -89648,8 +91947,10 @@ self: {
        pname = "missing-py2";
        version = "1.0.1";
        sha256 = "0daa310acml90r4f4qdjf3qns70gvx08mpjzw2h3v46vrwlacrmj";
-       buildDepends = [ anydbm base MissingH ];
-       testDepends = [ anydbm base Cabal directory HUnit MissingH ];
+       libraryHaskellDepends = [ anydbm base MissingH ];
+       testHaskellDepends = [
+         anydbm base Cabal directory HUnit MissingH
+       ];
        homepage = "https://github.com/domdere/missing-py2";
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.gpl2;
@@ -89662,7 +91963,7 @@ self: {
        pname = "mix-arrows";
        version = "1.2";
        sha256 = "0m70l09bmr8b95d87rpz4vdircdar2rsvnamr2g07542wx024931";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Mixing effects of one arrow into another one";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89676,7 +91977,10 @@ self: {
        sha256 = "0vsldq2j2avj98fcz2lbydf4y23iwydr4jsvpbcvwlvqavgz1rkc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers simple-tabular ];
+       libraryHaskellDepends = [ array base containers simple-tabular ];
+       executableHaskellDepends = [
+         array base containers simple-tabular
+       ];
        jailbreak = true;
        homepage = "http://wiki.cs.pdx.edu/bartforge/oms";
        description = "Find optimal mixed strategies for two-player games";
@@ -89691,7 +91995,7 @@ self: {
        sha256 = "1qzfmf92sx5vq5jxrqhln1a6y8kayrip36izf5m8hryymxd4dard";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath haskell98 ];
+       executableHaskellDepends = [ base directory filepath haskell98 ];
        description = "Makes an OS X .app bundle from a binary.";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89707,7 +92011,7 @@ self: {
        sha256 = "1cmawm49i01xxvzgf67cin6s9hihfc3ihr6s5hn2makasfxbnryc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory extensible-exceptions mtl old-locale old-time
          pcre-light pretty readline
        ];
@@ -89724,7 +92028,8 @@ self: {
        sha256 = "04d0drqyaz075y6fs3rj6c2sp8ns1x4rfxqf1dbm2b31q09ycnl1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl parsec pretty ];
+       libraryHaskellDepends = [ base mtl parsec pretty ];
+       executableHaskellDepends = [ base mtl parsec pretty ];
        description = "Minimal ML language to to demonstrate the W type infererence algorithm";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89736,7 +92041,7 @@ self: {
        pname = "mlist";
        version = "0.0.2";
        sha256 = "06mwmahyp781wigjva12kz7w75vjkkprl8k1yiqd1yd0162vp31k";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://haskell.org/haskellwiki/mlist";
        description = "Monadic List alternative to lazy I/O";
        license = stdenv.lib.licenses.bsd3;
@@ -89751,7 +92056,7 @@ self: {
        sha256 = "1y5mk3yf4b8r6rzmlx1xqn4skaigrqnv08sqq0v7r3nbw42bpz2q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Memory mapped files for POSIX and Windows";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -89762,7 +92067,7 @@ self: {
        pname = "mmorph";
        version = "1.0.4";
        sha256 = "0k5zlzmnixfwcjrqvhgi3i6xg532b0gsjvc39v5jigw69idndqr2";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Monad morphisms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -89773,7 +92078,7 @@ self: {
        pname = "mmtl";
        version = "0.1";
        sha256 = "0bb19l52s56y2dwyskvjwdal7387ii2dg9cc1l6f341y3695nj7l";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Modular Monad transformer library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89785,7 +92090,7 @@ self: {
        pname = "mmtl-base";
        version = "15321.1";
        sha256 = "13hdaxpb9zds3yc2l3pl60h26541yvswprdc43swn05hzf6p01nq";
-       buildDepends = [ base mmtl ];
+       libraryHaskellDepends = [ base mmtl ];
        description = "MonadBase type-class for mmtl";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89799,7 +92104,7 @@ self: {
        pname = "moan";
        version = "0.2.0.2";
        sha256 = "0fb0z3v4a8kblwx4xjs7xdkczpvcyz9la7071kz7q6cjl6w49i30";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers dawg regex-tdfa regex-tdfa-text
          tagset-positional text zlib
        ];
@@ -89818,10 +92123,10 @@ self: {
        pname = "mockery";
        version = "0.3.0";
        sha256 = "1k9ywdamdl1c8nvp4yrjmqpbis1nqj9p9cim5rh72n9w5h3qaa6x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath logging-facade temporary
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath hspec logging-facade temporary
        ];
        description = "Support functions for automated testing";
@@ -89836,7 +92141,7 @@ self: {
        pname = "modbus-tcp";
        version = "0.1";
        sha256 = "1j0gkc6vrvydz0vcdm8bpiarl75zqh4k5z18s4903b6mqwpscslr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bytestring cereal network
        ];
        jailbreak = true;
@@ -89853,8 +92158,8 @@ self: {
        pname = "modelicaparser";
        version = "0.1.0.0";
        sha256 = "0ifsgdqi3376z7xspjlx62hh3dah3dskqrar3s63pmw1cf9b6qfl";
-       buildDepends = [ base containers parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers parsec ];
+       testHaskellDepends = [
          ansi-terminal base containers filepath parsec QuickCheck
        ];
        jailbreak = true;
@@ -89873,7 +92178,10 @@ self: {
        sha256 = "0xm9vj78clawys9ascgm2fl8kqg5zmdfbkkb42d1d1h5z72cc55p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory filepath haskell98 mtl utf8-string
+       ];
+       executableHaskellDepends = [
          base directory filepath haskell98 mtl utf8-string
        ];
        description = "Haskell source splitter driven by special comments";
@@ -89887,8 +92195,8 @@ self: {
        pname = "modular-arithmetic";
        version = "1.2.1.1";
        sha256 = "005pbkrszgkbm0qx9hzn1f72l9z07qhqypmcw72fi5i5hppr45av";
-       buildDepends = [ base ];
-       testDepends = [ base doctest Glob ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest Glob ];
        jailbreak = true;
        homepage = "https://github.com/TikhonJelvis/modular-arithmetic";
        description = "A type for integers modulo some constant";
@@ -89904,7 +92212,7 @@ self: {
        pname = "modular-prelude";
        version = "0.3.0.0";
        sha256 = "0hlmxm9xfnf55qz1nrljm0s4bhpa6x973h3qi2b7bl8pil423rkf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base basic-prelude bytestring containers data-default hashable
          system-filepath text transformers unordered-containers vector
        ];
@@ -89921,7 +92229,7 @@ self: {
        pname = "modular-prelude-classy";
        version = "0.1.0.0";
        sha256 = "1izinrgd9a6sm57isg8jgs4wjidczwqcxl6vg5h4gy5zz9dg8xnx";
-       buildDepends = [ base classy-prelude modular-prelude ];
+       libraryHaskellDepends = [ base classy-prelude modular-prelude ];
        jailbreak = true;
        homepage = "https://github.com/DanBurton/modular-prelude#readme";
        description = "Reifying ClassyPrelude a la ModularPrelude";
@@ -89942,13 +92250,16 @@ self: {
        sha256 = "1lj2jhlpn1ywq60q4ph9fbmjn6rjd8wqkj2lrdgscagcvryh9ad2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         applicative-extras base bytestring Cabal cmdargs containers
-         data-default directory filepath haskeline haskell-src-exts HUnit
-         lens lifted-base monad-control mtl pretty process pureMD5 set-extra
-         syb system-fileio temporary transformers-base
+       libraryHaskellDepends = [
+         applicative-extras base bytestring Cabal containers data-default
+         directory filepath haskell-src-exts HUnit lifted-base monad-control
+         mtl pretty process pureMD5 set-extra syb system-fileio temporary
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base Cabal cmdargs containers directory haskeline lens
+         monad-control mtl set-extra transformers-base
+       ];
+       testHaskellDepends = [
          base containers filepath haskell-src-exts HUnit process
        ];
        homepage = "https://github.com/seereason/module-management";
@@ -89965,7 +92276,7 @@ self: {
        pname = "modulespection";
        version = "0.1.2.2";
        sha256 = "00172s9v4823q4f8mvln2v3m7zcri8vp2b7b8j1ank0sb9lbyjlf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base exceptions filepath ghc ghc-paths template-haskell temporary
          transformers
        ];
@@ -89986,7 +92297,7 @@ self: {
        sha256 = "1dxvfd8f7zx43zm9h5dd71ci768khhmh8660h3abazqhm7ws367c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          atto-lisp base data-default directory haskell-src language-c mtl
          nats pandoc-types parsec prettify process semigroups text
        ];
@@ -90003,7 +92314,9 @@ self: {
        pname = "moe";
        version = "2015.5.4";
        sha256 = "0yiyr8n0bw5wcc8jyrah2kf9jnj3x4h5kl3qprysx8ffhc6dx3r9";
-       buildDepends = [ air base bytestring data-default dlist mtl text ];
+       libraryHaskellDepends = [
+         air base bytestring data-default dlist mtl text
+       ];
        homepage = "https://github.com/nfjinjing/moe";
        description = "html with style";
        license = stdenv.lib.licenses.bsd3;
@@ -90021,7 +92334,7 @@ self: {
        sha256 = "1f09sf41kbza3mci2yps0b38xi2j5gakjqx9hmi7lfzga4dkqgg0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base binary bytestring containers cryptohash
          hslogger HsOpenSSL lens mtl network optparse-applicative random
          safe text transformers unix unordered-containers
@@ -90043,7 +92356,7 @@ self: {
        sha256 = "1na585nc16s3giq88kr5i8wlqc03i29blqsgqp40da6dyqiihqwf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-accessor directory
          explicit-exception filepath html HTTP network old-locale old-time
          parsec process transformers unix utility-ht
@@ -90063,7 +92376,7 @@ self: {
        pname = "monad-abort-fd";
        version = "0.4";
        sha256 = "01ny9pq66cma3wai48mhzijk465h7ssrj253npyy2myxnj0y93zr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default monad-control mtl transformers transformers-abort
          transformers-base
        ];
@@ -90079,7 +92392,7 @@ self: {
        pname = "monad-atom";
        version = "0.4.1";
        sha256 = "16dnp6wz0s56gm58k6m5cv5c47hb2vz1m4a3pqvrg3j97y344c3q";
-       buildDepends = [ base containers ghc-prim mtl ];
+       libraryHaskellDepends = [ base containers ghc-prim mtl ];
        homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "Monadically convert object to unique integers and back";
        license = stdenv.lib.licenses.bsd3;
@@ -90092,7 +92405,7 @@ self: {
        pname = "monad-atom-simple";
        version = "0.0.2";
        sha256 = "1k4rcrdjjs52p9mnsbwp0gmb2inivhcqw044l56dbc080yxrk32j";
-       buildDepends = [ base containers ghc-prim mtl ];
+       libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically map objects to unique ints";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90104,7 +92417,7 @@ self: {
        pname = "monad-bool";
        version = "0.2.0";
        sha256 = "1f3n2wbd3lbsp2snsf9x4h09apw62hayhzjibakp6mqw6174444h";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "This package has been removed";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90119,11 +92432,11 @@ self: {
        pname = "monad-classes";
        version = "0.3.1.1";
        sha256 = "1n0ry7lq0vh9siaqxfdfavg67a99zmws5nvr1hjq8k212v36v40c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ghc-prim mmorph monad-control peano reflection transformers
          transformers-base transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit data-lens-light ghc-prim mmorph tasty tasty-hunit
          transformers
        ];
@@ -90138,7 +92451,7 @@ self: {
        pname = "monad-codec";
        version = "0.2.0";
        sha256 = "0jim6hk891jby2gch6f1k4262jm8fl9jgl808dj204ylz8w1475l";
-       buildDepends = [ base binary containers data-lens mtl ];
+       libraryHaskellDepends = [ base binary containers data-lens mtl ];
        homepage = "https://github.com/kawu/monad-codec";
        description = "Monadic conversion between complex data structures and unique integers";
        license = stdenv.lib.licenses.bsd3;
@@ -90152,7 +92465,7 @@ self: {
        pname = "monad-control";
        version = "1.0.0.4";
        sha256 = "07pn1p4m80wdd7gw62s4yny8rbvm60ka1q8qx5y1plznd8sbg179";
-       buildDepends = [
+       libraryHaskellDepends = [
          base stm transformers transformers-base transformers-compat
        ];
        homepage = "https://github.com/basvandijk/monad-control";
@@ -90168,7 +92481,7 @@ self: {
        pname = "monad-coroutine";
        version = "0.9.0.1";
        sha256 = "10b98w0xr7hbnawfz93qqkbcpvklgkpljxmv9drr40bd9bv33wij";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-parallel transformers transformers-compat
        ];
        homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine";
@@ -90184,7 +92497,7 @@ self: {
        pname = "monad-exception";
        version = "0.1";
        sha256 = "1mh19mxi6mlkvd083vjjdmdimdnk6n5yaj7v7xxgqycl5sazqkh8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-control mtl-evil-instances transformers
          transformers-base
        ];
@@ -90202,7 +92515,7 @@ self: {
        pname = "monad-extras";
        version = "0.5.11";
        sha256 = "0rq44dk1fvfqkhng2yczyyz7jh6d6m0kjy58k02ady28f7j2r5vn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mmorph monad-control stm transformers transformers-base
        ];
        homepage = "http://github.com/jwiegley/monad-extras";
@@ -90216,7 +92529,7 @@ self: {
        pname = "monad-fork";
        version = "0.1";
        sha256 = "15xwavq4yc3xfif4isjh9m0q9h1bh7pmv2i3rh99sndmd34cdpwc";
-       buildDepends = [ base monad-control ];
+       libraryHaskellDepends = [ base monad-control ];
        jailbreak = true;
        description = "Type class for monads which support a fork operation";
        license = stdenv.lib.licenses.publicDomain;
@@ -90228,7 +92541,7 @@ self: {
        pname = "monad-gen";
        version = "0.3.0.1";
        sha256 = "0rc4r6sg29sjgh9xsk7q80h0lixhyxs60bszj5dnn8yf7w18b15y";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        description = "A simple monad for generating fresh integers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -90239,7 +92552,7 @@ self: {
        pname = "monad-interleave";
        version = "0.1";
        sha256 = "09hpl7ah5ivsrx4xlk96d129n1j4wpx7kj6l95zwadyaz7rj9fp7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/patperry/monad-interleave";
        description = "Monads with an unsaveInterleaveIO-like operation";
        license = stdenv.lib.licenses.bsd3;
@@ -90254,7 +92567,7 @@ self: {
        pname = "monad-journal";
        version = "0.7.1";
        sha256 = "1bfj9yy7hkixii31fbxdydjwx9ln6snm40w6l5vph2skcrms9bvr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base either monad-control mtl transformers transformers-base
        ];
        homepage = "http://github.com/phaazon/monad-journal";
@@ -90270,7 +92583,7 @@ self: {
        pname = "monad-levels";
        version = "0.1.0.1";
        sha256 = "1v3i12h4c788yz93a2c9nxcczrhz8nwpq0057q7b1nad74g70lan";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints transformers transformers-compat
        ];
        jailbreak = true;
@@ -90291,7 +92604,7 @@ self: {
        pname = "monad-logger";
        version = "0.3.13.2";
        sha256 = "1cp2npa5mzn3yss1di151ikw7hx4slc99cvx8gipdwp1696kqf61";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring conduit conduit-extra exceptions
          fast-logger lifted-base monad-control monad-loops mtl resourcet stm
          stm-chans template-haskell text transformers transformers-base
@@ -90309,7 +92622,9 @@ self: {
        pname = "monad-logger-json";
        version = "0.1.0.0";
        sha256 = "1ap98487lwgvgrrxkjskga86ckbv6rhn2n6pzp403343xx51r1qh";
-       buildDepends = [ aeson base monad-logger template-haskell text ];
+       libraryHaskellDepends = [
+         aeson base monad-logger template-haskell text
+       ];
        homepage = "http://github.com/fpco/monad-logger-json";
        description = "JSON-friendly Logging APIs";
        license = stdenv.lib.licenses.mit;
@@ -90323,7 +92638,7 @@ self: {
        pname = "monad-logger-syslog";
        version = "0.1.1.1";
        sha256 = "0hdm495knrdrl76xlsdp0sk6n0v6qnl9b6r6x9ac6s1p7j1w66vf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring fast-logger hsyslog monad-logger text transformers
        ];
        homepage = "https://github.com/fpco/monad-logger-syslog";
@@ -90337,8 +92652,8 @@ self: {
        pname = "monad-loops";
        version = "0.4.3";
        sha256 = "062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky";
-       buildDepends = [ base ];
-       testDepends = [ base tasty tasty-hunit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/mokus0/monad-loops";
        description = "Monadic loops";
        license = stdenv.lib.licenses.publicDomain;
@@ -90350,7 +92665,7 @@ self: {
        pname = "monad-loops-stm";
        version = "0.4";
        sha256 = "0y7j2xpr1s7ggwm3vvpb5mlagsnxhq9qpncapibhk2pbf2d5r7as";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/mokus0/monad-loops-stm";
        description = "Monadic loops for STM";
        license = stdenv.lib.licenses.publicDomain;
@@ -90363,11 +92678,11 @@ self: {
      mkDerivation {
        pname = "monad-lrs";
        version = "0.0.2.1";
-       revision = "1";
        sha256 = "01i8hz50r3lf8r3rasl96blr6br3p1x6hvckhbi8aw61x507jmcg";
+       revision = "1";
        editedCabalFile = "dd714797826911e564a0e418307530fa99a8ba9ea91400517be2bb78b4e695c1";
-       buildDepends = [ base containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -90386,10 +92701,10 @@ self: {
        pname = "monad-memo";
        version = "0.4.1";
        sha256 = "07gid18rsja7gvk2ccsbwvpz223x59mdk9x9w36bz18cy2pw802c";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers mtl primitive transformers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base containers mtl primitive QuickCheck random
          test-framework test-framework-quickcheck2 transformers vector
        ];
@@ -90405,7 +92720,7 @@ self: {
        pname = "monad-mersenne-random";
        version = "0.1";
        sha256 = "03kbqbgv4npzfzn90jk4p17y8kb62sslby6q36819qkif1j76lq6";
-       buildDepends = [ base mersenne-random-pure64 ];
+       libraryHaskellDepends = [ base mersenne-random-pure64 ];
        homepage = "http://code.haskell.org/~dons/code/monad-mersenne-random";
        description = "An efficient random generator monad, based on the Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
@@ -90418,7 +92733,7 @@ self: {
        pname = "monad-open";
        version = "0.1.0.0";
        sha256 = "18h24zdvbffnwr2xh4qahakr80z8ly65pmksmk3ngjykxrvif2vx";
-       buildDepends = [ base exceptions mtl transformers ];
+       libraryHaskellDepends = [ base exceptions mtl transformers ];
        jailbreak = true;
        description = "Open recursion for when you need it";
        license = stdenv.lib.licenses.mit;
@@ -90430,7 +92745,7 @@ self: {
        pname = "monad-ox";
        version = "0.3.0";
        sha256 = "1x65jvh816a296y2ds8vysfzl83am4pwwrnap4zdg0prpcxfpwl8";
-       buildDepends = [ base containers mtl text vector ];
+       libraryHaskellDepends = [ base containers mtl text vector ];
        homepage = "https://github.com/kawu/monad-ox";
        description = "Monad for observation extraction";
        license = stdenv.lib.licenses.bsd3;
@@ -90446,11 +92761,11 @@ self: {
        pname = "monad-par";
        version = "0.3.4.7";
        sha256 = "12n27hs274nrfkpa6hx0gdkrc76wxzliqf53x6689idl363sdf13";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-deque abstract-par array base containers deepseq
          monad-par-extras mtl mwc-random parallel
        ];
-       testDepends = [
+       testHaskellDepends = [
          abstract-deque abstract-par array base containers deepseq HUnit
          monad-par-extras mtl mwc-random QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
@@ -90469,7 +92784,7 @@ self: {
        pname = "monad-par-extras";
        version = "0.3.3";
        sha256 = "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2";
-       buildDepends = [
+       libraryHaskellDepends = [
          abstract-par base cereal deepseq mtl random transformers
        ];
        homepage = "https://github.com/simonmar/monad-par";
@@ -90484,7 +92799,9 @@ self: {
        pname = "monad-parallel";
        version = "0.7.1.4";
        sha256 = "01sadhl3kv7gsx1m90fb76n2xh7b9awjc9071gzn0ab26d67a98b";
-       buildDepends = [ base parallel transformers transformers-compat ];
+       libraryHaskellDepends = [
+         base parallel transformers transformers-compat
+       ];
        homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
        description = "Parallel execution of monadic computations";
        license = stdenv.lib.licenses.bsd3;
@@ -90498,7 +92815,7 @@ self: {
        pname = "monad-parallel-progressbar";
        version = "0.1.0.1";
        sha256 = "1pqi2alyvsflwy5ygp4cl5g90jg50ix61plqxvsldpdkzncmmk84";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-parallel monadIO terminal-progress-bar
        ];
        homepage = "https://github.com/mnacamura/monad-parallel-progressbar";
@@ -90512,7 +92829,7 @@ self: {
        pname = "monad-param";
        version = "0.0.4";
        sha256 = "08rm902kclapqh1iafjrsqspf0szhbx5jaqv6hh9p5zbg8ipdkhc";
-       buildDepends = [ base mtl stm ];
+       libraryHaskellDepends = [ base mtl stm ];
        homepage = "http://hackage.haskell.org/package/monad-param";
        description = "Parameterized monads";
        license = stdenv.lib.licenses.bsd3;
@@ -90524,11 +92841,12 @@ self: {
        pname = "monad-peel";
        version = "0.2";
        sha256 = "1cg6j2qhh14ryn4766dwx57g50qalzcv79rx9ysdgkskkjs6fiix";
-       buildDepends = [ base extensible-exceptions transformers ];
+       libraryHaskellDepends = [
+         base extensible-exceptions transformers
+       ];
        homepage = "http://andersk.mit.edu/haskell/monad-peel/";
        description = "Lift control operations like exception catching through monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-primitive" = callPackage
@@ -90537,7 +92855,7 @@ self: {
        pname = "monad-primitive";
        version = "0.1";
        sha256 = "1vi6g65hdyq5vq78mfag0qljxgzb6vq83m82x3cpgjl7dr9k5h1x";
-       buildDepends = [ base primitive transformers ];
+       libraryHaskellDepends = [ base primitive transformers ];
        homepage = "http://bitbucket.org/Shimuuar/monad-primitive";
        description = "Type class for monad transformers stack with pirimitive base monad";
        license = stdenv.lib.licenses.bsd3;
@@ -90548,10 +92866,10 @@ self: {
      mkDerivation {
        pname = "monad-products";
        version = "4.0.0.1";
-       revision = "1";
        sha256 = "017cxiavxfw0f08sr0d6m3avla1lplmdj51rxpf1103ripq20r53";
+       revision = "1";
        editedCabalFile = "fb4d07af0ad3081f3f2a252c99b777fafa6b3ece61ca81642f8a889ef370710e";
-       buildDepends = [ base semigroupoids ];
+       libraryHaskellDepends = [ base semigroupoids ];
        homepage = "http://github.com/ekmett/monad-products";
        description = "Monad products";
        license = stdenv.lib.licenses.bsd3;
@@ -90563,7 +92881,7 @@ self: {
        pname = "monad-ran";
        version = "0.1.0";
        sha256 = "04y9s2b4hz2f8khr0q62xy0f6l2v896s7x03i3s18i14bwscqlax";
-       buildDepends = [ base ghc-prim mtl ];
+       libraryHaskellDepends = [ base ghc-prim mtl ];
        jailbreak = true;
        description = "Fast monads and monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -90576,7 +92894,7 @@ self: {
        pname = "monad-resumption";
        version = "0.1.1.5";
        sha256 = "08h750qbvzvlw5hyp1d44rkhiqlhgnsfy8sya2ya7p62l80w96sf";
-       buildDepends = [ base mmorph mtl transformers ];
+       libraryHaskellDepends = [ base mmorph mtl transformers ];
        homepage = "https://github.com/igraves/resumption_monads";
        description = "Resumption and reactive resumption monads for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -90588,7 +92906,7 @@ self: {
        pname = "monad-skeleton";
        version = "0.1.2.1";
        sha256 = "0sg1yj4cp7ac26ydwhpc05j9bs3scaj25b9sb0xr1gw1qasnyi76";
-       buildDepends = [ base containers ghc-prim ];
+       libraryHaskellDepends = [ base containers ghc-prim ];
        homepage = "https://github.com/fumieval/monad-skeleton";
        description = "An undead monad";
        license = stdenv.lib.licenses.bsd3;
@@ -90600,7 +92918,7 @@ self: {
        pname = "monad-st";
        version = "0.2.4";
        sha256 = "1j67s07p5lsr81cjl0ch5d1q7zarmpak5kmnwckhavihg3l5m3bi";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/ekmett/monad-st";
        description = "Provides a MonadST class";
        license = stdenv.lib.licenses.bsd3;
@@ -90614,7 +92932,7 @@ self: {
        pname = "monad-state";
        version = "0.2.0.3";
        sha256 = "1dh1dw7n39rb85wk4zq0hw2g9x81zyha033awv81l6xl8pjdxqxv";
-       buildDepends = [
+       libraryHaskellDepends = [
          AbortT-transformers base fclabels monads-tf transformers
        ];
        homepage = "https://github.com/bairyn/monad-state";
@@ -90628,8 +92946,8 @@ self: {
        pname = "monad-statevar";
        version = "0.1";
        sha256 = "08sr29qr02kfqja51ciqcpsf95wp3bypx64f4cwgpwh23xapr1fx";
-       buildDepends = [ base transformers ];
-       testDepends = [ base stm ];
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base stm ];
        homepage = "http://github.com/joeyadams/hs-monad-statevar";
        description = "Concise, overloaded accessors for IORef, STRef, TVar";
        license = stdenv.lib.licenses.bsd3;
@@ -90642,7 +92960,9 @@ self: {
        pname = "monad-stlike-io";
        version = "0.2.2";
        sha256 = "1lizwf31d8ha0xq644cfcn91l8sz8i4ldy12ig4ajfghxj2x4ad5";
-       buildDepends = [ base bytestring containers deepseq monads-tf ];
+       libraryHaskellDepends = [
+         base bytestring containers deepseq monads-tf
+       ];
        homepage = "http://github.com/taruti/monad-stlike-io";
        description = "ST-like monad capturing variables to regions and supporting IO";
        license = stdenv.lib.licenses.bsd3;
@@ -90655,7 +92975,7 @@ self: {
        pname = "monad-stlike-stm";
        version = "0.1.1";
        sha256 = "007rsq9x0dq8xmiimgqb0v8k15xizx63qmc76b1b8a66nfsd9w56";
-       buildDepends = [ base monad-stlike-io stm ];
+       libraryHaskellDepends = [ base monad-stlike-io stm ];
        homepage = "http://github.com/taruti/monad-stlike-stm";
        description = "ST-like monad capturing variables to regions and supporting STM";
        license = stdenv.lib.licenses.bsd3;
@@ -90668,7 +92988,7 @@ self: {
        pname = "monad-stm";
        version = "0.1.0.2";
        sha256 = "09bbhbj9zg928j3dnvvxsrv8hw1c7s0vj0wffrhs810aqlf1m9xp";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        description = "MonadSTM class analogous to MonadIO";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90679,7 +92999,7 @@ self: {
        pname = "monad-supply";
        version = "0.6";
        sha256 = "1gg4r7fwaq2fa0lz8pz301mk3q16xpbs7qv54hhggxrv3i1h33ir";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Stateful supply monad";
        license = "unknown";
      }) {};
@@ -90690,7 +93010,7 @@ self: {
        pname = "monad-task";
        version = "0.1.0";
        sha256 = "01w3wqmsfl9w96kfpdiwfyghm2zjn70x78l436bzxfrcm1d3ayi8";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "http://github.com/ninegua/monad-task";
        description = "A monad transformer that turns event processing into co-routine programming";
@@ -90703,7 +93023,7 @@ self: {
        pname = "monad-time";
        version = "0.1";
        sha256 = "1g3dqfwwmqwdpr3dcixxyw5akbdicx53i6d2s8921l2zbkm0hfnj";
-       buildDepends = [ base mtl time ];
+       libraryHaskellDepends = [ base mtl time ];
        homepage = "https://github.com/scrive/monad-time";
        description = "Type class for monads which carry the notion of the current time";
        license = stdenv.lib.licenses.bsd3;
@@ -90715,7 +93035,7 @@ self: {
        pname = "monad-tx";
        version = "0.0.1";
        sha256 = "0jv3pcmbm3bph42hhr4i0l3dchapixf5j5gd7ybs9j3bbk3yydk9";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A transactional state monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90726,10 +93046,10 @@ self: {
      mkDerivation {
        pname = "monad-unify";
        version = "0.2.2";
-       revision = "1";
        sha256 = "1icl4jaa4vc4lb75m6wv4vjvf8b2xx7aziqhsg2pshizdkfxmgwp";
+       revision = "1";
        editedCabalFile = "7d585b29bfa558cf59d169421d1ec3363b6ef56b88cf6a9a082192d609676ce2";
-       buildDepends = [ base mtl unordered-containers ];
+       libraryHaskellDepends = [ base mtl unordered-containers ];
        jailbreak = true;
        description = "Generic first-order unification";
        license = stdenv.lib.licenses.mit;
@@ -90745,7 +93065,7 @@ self: {
        pname = "monad-unlift";
        version = "0.1.1.0";
        sha256 = "1x86xpgirp97rda1y22129xf3fbkyb442jndpjsb9j1k4lplh7y2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints exceptions monad-control mtl mutable-containers
          resourcet stm transformers transformers-base
        ];
@@ -90760,7 +93080,7 @@ self: {
        pname = "monad-wrap";
        version = "0.1";
        sha256 = "1hmigg0cbrsdvf6s0z2wn3s81q12qg3c30jjlsrw4jdfwv1qn13f";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Wrap functions such as catch around different monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90771,7 +93091,7 @@ self: {
        pname = "monadIO";
        version = "0.10.1.4";
        sha256 = "08158j978h69knbnzxkzv856sjhhw24h5lh7d8hx2lyhzbpnfarl";
-       buildDepends = [ base mtl stm ];
+       libraryHaskellDepends = [ base mtl stm ];
        description = "Overloading of concurrency variables";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90782,7 +93102,7 @@ self: {
        pname = "monadLib";
        version = "3.7.3";
        sha256 = "17m9rj6spr5n9jlhwwvk8p40yrpwgz3j9kj3pjq7mpyrc1ssfd0q";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://wiki.github.com/yav/monadlib";
        description = "A collection of monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -90794,7 +93114,7 @@ self: {
        pname = "monadLib-compose";
        version = "0.2";
        sha256 = "14byhdcby094qpgmkblysnplz5r88xnfk7rnfddihzz4jgjzlvy1";
-       buildDepends = [ base monadLib ];
+       libraryHaskellDepends = [ base monadLib ];
        jailbreak = true;
        homepage = "http://github.com/aristidb/monadLib-compose";
        description = "Arrow-like monad composition for monadLib";
@@ -90807,7 +93127,7 @@ self: {
        pname = "monadacme";
        version = "0.0.2";
        sha256 = "1qam6k3gax2kf9zbf0q2mbsknkmx8y73i9qshbylj8wrpf896y97";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "The Acme and AcmeT monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90819,7 +93139,7 @@ self: {
        pname = "monadbi";
        version = "0.1";
        sha256 = "0r5hja34nalhvlc4x2rmhk9j1rsd363ilfjkd7y7cv4l8yzvifq7";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/ajnsit/monadbi";
        description = "Extract underlying monads from monad transformers";
        license = "GPL";
@@ -90833,7 +93153,7 @@ self: {
        pname = "monadcryptorandom";
        version = "0.6.1";
        sha256 = "0j99j0f2qwhslimfgslsdlv0xihsddas3i69pfnjwnsd9zg5pgj2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-api mtl tagged transformers
        ];
        homepage = "https://github.com/TomMD/monadcryptorandom";
@@ -90847,7 +93167,7 @@ self: {
        pname = "monadfibre";
        version = "0.1.2.1";
        sha256 = "0vj84g5y0k903pz4lk12sa6l6c0f26dc42x62f1mqny8457r3ds6";
-       buildDepends = [ base monadbi ];
+       libraryHaskellDepends = [ base monadbi ];
        homepage = "https://github.com/ajnsit/monadfibre";
        description = "Monadic functions which provide Choice and Parallelism";
        license = "GPL";
@@ -90859,7 +93179,7 @@ self: {
        pname = "monadic-arrays";
        version = "0.2.1.4";
        sha256 = "1vlqh0mqfkg1f47dhl5lw49b7xawlbyjmq7xpmmf16q3idxnkahh";
-       buildDepends = [ array base stm transformers ];
+       libraryHaskellDepends = [ array base stm transformers ];
        homepage = "http://github.com/ekmett/monadic-arrays/";
        description = "Boxed and unboxed arrays for monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -90871,7 +93191,9 @@ self: {
        pname = "monadiccp";
        version = "0.7.6";
        sha256 = "083ppr53ac85r5ybndngsfwxgalj63giz32aa7wpcm629b9g4lxc";
-       buildDepends = [ base containers mtl parsec pretty random ];
+       libraryHaskellDepends = [
+         base containers mtl parsec pretty random
+       ];
        homepage = "http://users.ugent.be/~tschrijv/MCP/";
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -90886,8 +93208,8 @@ self: {
        pname = "monadiccp-gecode";
        version = "0.1.2";
        sha256 = "1ylyzklcb37khrq8a11fzlyd0sa1nrhpd7cv470m23v7l1hc1wg0";
-       buildDepends = [ base containers monadiccp mtl ];
-       extraLibraries = [
+       libraryHaskellDepends = [ base containers monadiccp mtl ];
+       librarySystemDepends = [
          gecodeint gecodekernel gecodesearch gecodeset gecodesupport
        ];
        homepage = "http://users.ugent.be/~tschrijv/MCP/";
@@ -90903,7 +93225,7 @@ self: {
        pname = "monadio-unwrappable";
        version = "0.3";
        sha256 = "18hbi4vxj9lfcla11b17sb88ysskxavq00zmrjx62cpyzkp85yxh";
-       buildDepends = [ base monads-tf transformers ];
+       libraryHaskellDepends = [ base monads-tf transformers ];
        description = "Reversibly allow monad transformer stacks to run in IO";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90914,7 +93236,7 @@ self: {
        pname = "monadlist";
        version = "0.0.2";
        sha256 = "1zpxqp5zhcpk4358xqrapvkcfyazpdsdlrw3g14518y2kwnfifq6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Monadic versions of list functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90925,7 +93247,7 @@ self: {
        pname = "monadloc";
        version = "0.7.1";
        sha256 = "1a773nysrsj61ka7bdacb0i7dxlgb1fjz3x5w9c1w1dv7rmhynmj";
-       buildDepends = [ base template-haskell transformers ];
+       libraryHaskellDepends = [ base template-haskell transformers ];
        homepage = "http://github.com/pepeiborra/monadloc";
        description = "A class for monads which can keep a monadic call trace";
        license = stdenv.lib.licenses.publicDomain;
@@ -90941,7 +93263,7 @@ self: {
        sha256 = "0ch25kcz63xhinwd6mjqbhm282hfh280s3z910wnvdp3krgx0mpc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base filepath haskell-src-exts monadloc pretty syb
        ];
        jailbreak = true;
@@ -90956,7 +93278,7 @@ self: {
        pname = "monadplus";
        version = "1.4.2";
        sha256 = "15b5320wdpmdp5slpphnc1x4rhjch3igw245dp2jxbqyvchdavin";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell98 partial maps and filters over MonadPlus";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90967,7 +93289,7 @@ self: {
        pname = "monads-fd";
        version = "0.2.0.0";
        sha256 = "1iqr5p3va5sxmpvydwqz2src54j5njcyrzn9p5apc60nv7yv6x4c";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -90979,7 +93301,7 @@ self: {
        pname = "monads-tf";
        version = "0.1.0.2";
        sha256 = "0z07z2lfm3l93fx0qhfd98j76d1rksi5llq67l5v09pm8da4jvyb";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Monad classes, using type families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90990,7 +93312,7 @@ self: {
        pname = "monadtransform";
        version = "0.0.2";
        sha256 = "0i586zh6247jfmkw2x27j0aq47yz1c71irj9iwrlx1zrmvzak1yv";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "https://github.com/tonymorris/monadtransform";
        description = "A type-class for transforming monads (homomorphism) in a transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -91005,11 +93327,13 @@ self: {
        pname = "monarch";
        version = "0.10.0.0";
        sha256 = "1a47hhlmllrm3k4ssr8rr3bgq1w7i6jpx07nyf0k8k9x5sgi1siv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers lifted-base monad-control mtl
          network pool-conduit stm transformers transformers-base
        ];
-       testDepends = [ base bytestring doctest hspec transformers ];
+       testHaskellDepends = [
+         base bytestring doctest hspec transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/notogawa/monarch";
        description = "Monadic interface for TokyoTyrant";
@@ -91027,12 +93351,12 @@ self: {
        pname = "mongoDB";
        version = "2.0.5";
        sha256 = "09ysw5sp7x8pyfsjj1qgfq3wm8l0cpxkv9g9x117iss04bfk0p3h";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bson bytestring containers cryptohash hashtables
          lifted-base monad-control mtl network parsec random random-shuffle
          text transformers-base
        ];
-       testDepends = [ base hspec mtl old-locale time ];
+       testHaskellDepends = [ base hspec mtl old-locale time ];
        homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = "unknown";
@@ -91046,11 +93370,11 @@ self: {
        pname = "mongodb-queue";
        version = "0.4.0.1";
        sha256 = "1y3c5ydf7595ai3h6iapc0dmls348vv1jmy4g8n5wfmwzy4li22s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default lifted-base monad-control mongoDB network text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base data-default hspec lifted-base monad-control mongoDB network
          text transformers
        ];
@@ -91070,7 +93394,7 @@ self: {
        pname = "mongrel2-handler";
        version = "0.3.2";
        sha256 = "1bv9i2b0pb50r7l7l43h26ng5rcs1iyymwndcwxji8dnmbnr4jdf";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring
          case-insensitive containers http-types text zeromq-haskell
        ];
@@ -91088,7 +93412,7 @@ self: {
        sha256 = "06p9xj5y3xl4hcl57afqz4m4yc2vaah8i6f4smmhwmkzslg7svbs";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base filepath hinotify process ];
+       executableHaskellDepends = [ base filepath hinotify process ];
        description = "Do things when files change";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -91099,7 +93423,7 @@ self: {
        pname = "mono-foldable";
        version = "0.1.0.2";
        sha256 = "1qnbw9pd06czwyj2xcsjdigg7bj8d23p3ljnnkgd3d0r67qxxlxm";
-       buildDepends = [ base bytestring text vector ];
+       libraryHaskellDepends = [ base bytestring text vector ];
        jailbreak = true;
        homepage = "http://github.com/JohnLato/mono-foldable";
        description = "Folds for monomorphic containers";
@@ -91117,12 +93441,12 @@ self: {
        pname = "mono-traversable";
        version = "0.9.2.1";
        sha256 = "1vs2nl3c0gdhaxxh013ri3l9n13yl9nawiynpsyq6zp495xq5hrl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups text transformers unordered-containers
          vector vector-algorithms vector-instances
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers foldl hspec HUnit QuickCheck semigroups
          text transformers unordered-containers vector
        ];
@@ -91137,7 +93461,7 @@ self: {
        pname = "monoid-extras";
        version = "0.4.0.1";
        sha256 = "0jcyjqmk4s64j05qisvibmy87m5xi5n837wsivq7lml8lfyrj7yf";
-       buildDepends = [ base groups semigroupoids semigroups ];
+       libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91148,7 +93472,7 @@ self: {
        pname = "monoid-owns";
        version = "2010.5.29";
        sha256 = "1n05f95yhn6jp7rdnlx686k1lsls4iilxdxnp41ds4afsypaclfk";
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://github.com/nfjinjing/monoid-owns";
        description = "a practical monoid implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -91161,7 +93485,7 @@ self: {
        pname = "monoid-record";
        version = "0.1";
        sha256 = "14xs1nvf0ngx4jvinkhzq3ainhs159zx0396z88y21vvc8kw42i5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Support for modifying record fields of monoidal type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91172,7 +93496,7 @@ self: {
        pname = "monoid-statistics";
        version = "0.3.1";
        sha256 = "0gfdjmx457r580lc40vpg8fkzd8n971b5vam96v6kzssg2cznqy3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://bitbucket.org/Shimuuar/monoid-statistics";
        description = "Monoids for calculation of statistics of sample";
        license = stdenv.lib.licenses.bsd3;
@@ -91186,8 +93510,10 @@ self: {
        pname = "monoid-subclasses";
        version = "0.4.1.2";
        sha256 = "0j9an1zq3dg02jz8skqkch01kg2ha59zja2729v8lpwxsd4sbi9x";
-       buildDepends = [ base bytestring containers primes text vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers primes text vector
+       ];
+       testHaskellDepends = [
          base bytestring containers primes QuickCheck quickcheck-instances
          tasty tasty-quickcheck text vector
        ];
@@ -91202,7 +93528,7 @@ self: {
        pname = "monoid-transformer";
        version = "0.0.3";
        sha256 = "1f06ppvv50w5pacm4bs89zwkydih626cgbd2z6xqbp8cmhg6dj4l";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Monoid counterparts to some ubiquitous monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91215,7 +93541,7 @@ self: {
        pname = "monoidal-containers";
        version = "0.1.2.2";
        sha256 = "06yam4ljp4lm2rjaccykg8zx4hnmn0ly3fs24xjm4q45ldz7gwyb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq hashable lens newtype unordered-containers
        ];
        homepage = "http://github.com/bgamari/monoidal-containers";
@@ -91229,7 +93555,9 @@ self: {
        pname = "monoidplus";
        version = "0.1.0.1";
        sha256 = "1klgwv3sd9zmqpj157rypln51kcwml9b1fyaxnip0a1525h6c2s9";
-       buildDepends = [ base contravariant semigroups transformers ];
+       libraryHaskellDepends = [
+         base contravariant semigroups transformers
+       ];
        jailbreak = true;
        description = "Extra classes/functions about monoids";
        license = stdenv.lib.licenses.publicDomain;
@@ -91244,7 +93572,7 @@ self: {
        pname = "monoids";
        version = "0.3.2";
        sha256 = "0yn15q0569mdm20wdbwydbb1vdzfdh1ismhwplwbvi2989h78kca";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers fingertree parallel text
        ];
        jailbreak = true;
@@ -91260,11 +93588,10 @@ self: {
        pname = "monomorphic";
        version = "0.0.3.3";
        sha256 = "0x7fig4ms5qqiah4847ghl13s2r1xv2372hj6xrhjw6bdfh85cln";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/konn/monomorphic";
        description = "Library to convert polymorphic datatypes to/from its monomorphic represetation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "montage" = callPackage
@@ -91277,7 +93604,7 @@ self: {
        pname = "montage";
        version = "0.1.1";
        sha256 = "1yx2aagfxjgs9jwipbwa05aiqkm1xgxd0gwnc4qj6mwz9913zsl7";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers ListLike old-locale pool-conduit
          protocol-buffers protocol-buffers-descriptor riak-bump safe
          stats-web stm system-uuid text time unordered-containers
@@ -91301,7 +93628,7 @@ self: {
        pname = "montage-client";
        version = "0.1.1";
        sha256 = "18bgaw0i7zllabq8ys6p6qd8qga3xgxsfmgn88g4dijh6v6zf7pf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers ListLike mtl old-locale
          pool-conduit protocol-buffers protocol-buffers-descriptor riak-bump
          safe stats-web stm system-uuid text text-format time
@@ -91323,8 +93650,10 @@ self: {
        pname = "monte-carlo";
        version = "0.6.1";
        sha256 = "1zk8wyf9bzarnvsxh9a6diyssb78sfq1pl729gq113j0vibs8f0x";
-       buildDepends = [ base gsl-random primitive transformers vector ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base gsl-random primitive transformers vector
+       ];
+       testHaskellDepends = [
          base gsl-random ieee754 primitive QuickCheck random test-framework
          test-framework-quickcheck2 transformers vector
        ];
@@ -91344,11 +93673,11 @@ self: {
        pname = "moo";
        version = "1.0";
        sha256 = "02ah9v6h4ansd8kz76jnrx0yra9nz6ql92p5rm01pxri1gc7kn6w";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base gray-code mersenne-random-pure64 monad-mersenne-random
          mtl random random-shuffle time
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base containers gray-code HUnit mersenne-random-pure64
          monad-mersenne-random mtl random random-shuffle time
        ];
@@ -91366,14 +93695,13 @@ self: {
        pname = "moonshine";
        version = "2.0.0.0";
        sha256 = "1b8b7h9nk5nzk9q5ysg57q1rain36bxhvx4l7qwidsx30rdfs6qs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring canteven-config ekg ekg-core hslogger snap
          text time transformers yaml
        ];
        homepage = "https://github.com/SumAll/moonshine";
        description = "A web service framework for Haskell, similar in purpose to dropwizard";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "morfette" = callPackage
@@ -91387,7 +93715,7 @@ self: {
        sha256 = "149jp0s5nsa02zivlp868qqvvam59wwf6nkq79ynlqjsa4lanvay";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring containers directory filepath mtl
          pretty QuickCheck text utf8-string vector
        ];
@@ -91406,8 +93734,10 @@ self: {
        pname = "morfeusz";
        version = "0.4.2";
        sha256 = "1lzl5ks7px1xibfa6y0wnfv2mk2w39hscrrynqn7a3gjnca00sx0";
-       buildDepends = [ base bytestring containers directory mtl text ];
-       extraLibraries = [ morfeusz ];
+       libraryHaskellDepends = [
+         base bytestring containers directory mtl text
+       ];
+       librarySystemDepends = [ morfeusz ];
        homepage = "https://github.com/kawu/morfeusz";
        description = "Bindings to the morphological analyser Morfeusz";
        license = stdenv.lib.licenses.bsd3;
@@ -91426,12 +93756,13 @@ self: {
        sha256 = "15zvk50qpp3ywkwqgpm4phdcspfszzwipxcf07lnxpk98i7ybc4g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary containers deepseq http-client http-client-tls
-         lens-family-core managed optparse-applicative pipes system-fileio
-         system-filepath text text-format transformers
+         lens-family-core managed pipes system-fileio system-filepath text
+         text-format transformers
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [ base optparse-applicative text ];
        jailbreak = true;
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
@@ -91446,7 +93777,7 @@ self: {
        pname = "mosaico-lib";
        version = "0.1.1.0";
        sha256 = "1qcr3l1a422fh5226443dc8p6hvrr9wbhri6mk2pcw7zyfd5xr0b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols colour diagrams-cairo diagrams-core
          diagrams-gtk diagrams-lib glib gtk JuicyPixels mtl split stm
          stm-chans transformers
@@ -91464,7 +93795,7 @@ self: {
        pname = "mount";
        version = "0.2.1";
        sha256 = "0rdlnz0xk6mil79a8ygfrwgdychsn6h1gbv6qn2nybzaw1zjf4z3";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Mounts and umounts filesystems";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91479,12 +93810,12 @@ self: {
      mkDerivation {
        pname = "mp";
        version = "0.2.2";
-       revision = "1";
        sha256 = "1klz2ykglgkvxs66j5iacjbx5cv5gq0y4d12g68ng2pcmpwc93ir";
+       revision = "1";
        editedCabalFile = "8c578611352448e5aea9a082fb0696e7bb890397214631a009351925db2f88b1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring ConfigFile daemons directory filepath glib
          gstreamer hgettext MissingH mtl network random setlocale text unix
          unordered-containers utf8-string vty vty-ui
@@ -91503,7 +93834,9 @@ self: {
        sha256 = "0kwjnbrmlp9a5wz3mgf76nd2ar32d3n1f4jmbfpsggcm7jdp1rmv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary-strict bytestring haskell98 mtl ];
+       executableHaskellDepends = [
+         base binary-strict bytestring haskell98 mtl
+       ];
        homepage = "http://www.bjrn.se/mp3dec";
        description = "MP3 decoder for teaching";
        license = "unknown";
@@ -91518,7 +93851,9 @@ self: {
        sha256 = "02p6g8wgmmzxl3dnrvbj1msg972c40s300rfykqsg1g5wiqbllf2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory network powermate unix ];
+       executableHaskellDepends = [
+         base directory network powermate unix
+       ];
        homepage = "http://neugierig.org/software/darcs/powermate/";
        description = "MPD/PowerMate executable";
        license = stdenv.lib.licenses.bsd3;
@@ -91531,7 +93866,9 @@ self: {
        pname = "mpppc";
        version = "0.1.3";
        sha256 = "1zcilskpslpqyrbwpabwbry4p3kpcfca94wchh9dkq9g8pg8laxi";
-       buildDepends = [ ansi-terminal base bytestring split text ];
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring split text
+       ];
        jailbreak = true;
        description = "Multi-dimensional parametric pretty-printer with color";
        license = "GPL";
@@ -91546,7 +93883,7 @@ self: {
        pname = "mpretty";
        version = "0.1.0.0";
        sha256 = "0q4fi7jmdf3bvcqk6fc7194h59sjwf76ld8niwqczc30v8lyjq2n";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base containers data-lens-fd data-lens-template mtl
          orders text transformers
        ];
@@ -91566,7 +93903,7 @@ self: {
        sha256 = "1b5vzhbn5jnpxc0bzbhdak51qhzv5hif0300jsrbi5ffyvcjqkss";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers haskell98 mtl parsec pretty transformers unbound
        ];
        description = "Simple equational reasoning for a Haskell-ish language";
@@ -91583,7 +93920,7 @@ self: {
        pname = "mps";
        version = "2010.11.28";
        sha256 = "1xhflvgwrjzj7qb69dn149lh32c7q9161zrzfs07ncs233y0w4lg";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath monoid-owns
          old-locale old-time parallel parsec regexpr template-haskell time
          utf8-string
@@ -91604,7 +93941,7 @@ self: {
        sha256 = "1nmc03s8h3khmvajyhwaniczq0r4wrinq2sjjp1c6gyc2nggxzyx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath gtk mtl process template-haskell unix
        ];
        jailbreak = true;
@@ -91621,10 +93958,10 @@ self: {
      mkDerivation {
        pname = "mqtt-hs";
        version = "0.2.0";
-       revision = "1";
        sha256 = "0jvzr6qbmdxl11j8fwnbasgqgdfm395lm2gh2va9zfpk5xpx0mjg";
+       revision = "1";
        editedCabalFile = "aa0a2e9ea99cfbed4646ac02625b66361f8175ae2d70efc041dc517119706439";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring monad-loops mtl network singletons text
        ];
        jailbreak = true;
@@ -91643,11 +93980,11 @@ self: {
        pname = "ms";
        version = "0.2.1";
        sha256 = "0h70dkgzybbjm48ay9xqbvydf13a6q1zy99ln8kx4qlfdi4gsrnp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base contravariant edit-distance lens profunctors semigroupoids
          semigroups vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base doctest profunctors tasty tasty-quickcheck vector
        ];
        homepage = "https://github.com/relrod/ms";
@@ -91665,11 +94002,11 @@ self: {
        pname = "msgpack";
        version = "1.0.0";
        sha256 = "0kk6nqn290sh0l0hhglccs0cqgk0fb3xdjzqz19yw9wb8aw01xh8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-builder bytestring containers data-binary-ieee754
          deepseq hashable mtl text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-quickcheck
        ];
        homepage = "http://msgpack.org/";
@@ -91686,11 +94023,11 @@ self: {
        pname = "msgpack-aeson";
        version = "0.1.0.0";
        sha256 = "1ygnki55cj6951y75snc4gnv4vsjp9pgwqg3jp7cy9bcss3msq3j";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring deepseq msgpack scientific text
          unordered-containers vector
        ];
-       testDepends = [ aeson base msgpack tasty tasty-hunit ];
+       testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ];
        homepage = "http://msgpack.org/";
        description = "Aeson adapter for MessagePack";
        license = stdenv.lib.licenses.bsd3;
@@ -91707,11 +94044,12 @@ self: {
        sha256 = "0z28qikcfvfkj9xr87g13jlm2blqfxj3rfrg7hm2hfgv3qz4gkfz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base blaze-builder bytestring cmdargs containers directory filepath
-         msgpack peggy shakespeare-text template-haskell text
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers directory filepath msgpack
+         peggy shakespeare-text template-haskell text
        ];
-       testDepends = [ base hspec ];
+       executableHaskellDepends = [ base cmdargs directory peggy ];
+       testHaskellDepends = [ base hspec ];
        jailbreak = true;
        homepage = "http://msgpack.org/";
        description = "An IDL Compiler for MessagePack";
@@ -91728,11 +94066,11 @@ self: {
        pname = "msgpack-rpc";
        version = "1.0.0";
        sha256 = "00m5hpj5cd521j3jzsaw49asbpxvka0x1zi2qs26si82wxgnpjkn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
          exceptions monad-control msgpack mtl network random text
        ];
-       testDepends = [ async base mtl network tasty tasty-hunit ];
+       testHaskellDepends = [ async base mtl network tasty tasty-hunit ];
        homepage = "http://msgpack.org/";
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -91746,7 +94084,7 @@ self: {
        sha256 = "1lq1a13h74dkhmh6mkg9mzksvzc2mjb8ynsbs9856z7079ifsdw4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring hid split ];
+       executableHaskellDepends = [ base bytestring hid split ];
        description = "A command line tool to change backlit colors of your MSI keyboards";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91757,10 +94095,9 @@ self: {
        pname = "mstate";
        version = "0.2.7";
        sha256 = "05rcpfang0biy16aglf6da44zp9zqy2x0zdsfl75mv1drkky6225";
-       buildDepends = [ base monad-peel mtl stm ];
+       libraryHaskellDepends = [ base monad-peel mtl stm ];
        description = "MState: A consistent State monad for concurrent applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "msu" = callPackage
@@ -91773,7 +94110,7 @@ self: {
        sha256 = "0bqzzk7y3dj60r02xn3cjlq955jzsrvcbq63pvav0w952bvxvx5c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath mtl parsec process xdg-basedir
        ];
        homepage = "http://github.com/pbrisbin/msu";
@@ -91792,12 +94129,12 @@ self: {
        pname = "mtgoxapi";
        version = "0.5.0.2";
        sha256 = "1iyn2mq0fql952phmbs8578awrv5l6q9iqkmsaby2jp48mnwizji";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring curl either errors hashable HTTP ixset network SHA text
          time transformers unordered-containers vector watchdog
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring curl errors hashable HTTP HUnit ixset network QuickCheck
          SHA test-framework test-framework-hunit test-framework-quickcheck2
@@ -91815,7 +94152,7 @@ self: {
        pname = "mtl";
        version = "2.1.3.1";
        sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/mtl";
        description = "Monad classes, using functional dependencies";
@@ -91828,7 +94165,7 @@ self: {
        pname = "mtl";
        version = "2.2.1";
        sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/ekmett/mtl";
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -91840,7 +94177,7 @@ self: {
        pname = "mtl-c";
        version = "0.1";
        sha256 = "0n91jh07v87j2rbilyrip3inixb9a95i2j61g5hz42kiq5wj71gb";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/fumieval/mtl-c";
        description = "Very strict CPS'd transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -91851,10 +94188,10 @@ self: {
      mkDerivation {
        pname = "mtl-compat";
        version = "0.2.1.3";
-       revision = "1";
        sha256 = "15388p9ybdn6digk6cpdsw6havd0yva8vvwl3p7fnc9sb59wln34";
+       revision = "1";
        editedCabalFile = "b4d1feef302a6fe59e77e822e61261eeaec449a6b56560ea8429bb1bc7dbccc6";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/haskell-compat/mtl-compat";
        description = "Backported Control.Monad.Except module from mtl";
        license = stdenv.lib.licenses.bsd3;
@@ -91868,7 +94205,7 @@ self: {
        pname = "mtl-evil-instances";
        version = "0.1";
        sha256 = "1z10p0dmvjyadjc46nkzyqicfk0097ff2ni3fiypw9z5knsxhym4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-control mtl transformers transformers-base
        ];
        jailbreak = true;
@@ -91882,7 +94219,7 @@ self: {
        pname = "mtl-prelude";
        version = "1.0.3";
        sha256 = "1qr0bwcg9rlj53gbnji969s86qh8laaiibkfy2msziqnp011108x";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        homepage = "https://github.com/nikita-volkov/mtl-prelude";
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
        license = stdenv.lib.licenses.mit;
@@ -91894,7 +94231,7 @@ self: {
        pname = "mtl-prelude";
        version = "2.0.2";
        sha256 = "1j42pdkiiqjkdmidgmgpfbwh2i8dwsc40labw4pm86qzsi0r8m2v";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        homepage = "https://github.com/nikita-volkov/mtl-prelude";
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
        license = stdenv.lib.licenses.mit;
@@ -91906,7 +94243,7 @@ self: {
        pname = "mtl-tf";
        version = "0.1";
        sha256 = "0qfmswdkj95bh6wkic8hh002wsxqlrylw45k6w9iyzv4saqnl22f";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Monad transformer library using type families";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91918,7 +94255,7 @@ self: {
        pname = "mtl-unleashed";
        version = "0.2.2";
        sha256 = "0ih03zznq8mf8c76ic43j3vana6127bh6hxfz549g5kv9h54y83h";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/seereason/mtl-unleashed";
        description = "MTL classes without the functional dependency";
        license = stdenv.lib.licenses.bsd3;
@@ -91930,7 +94267,7 @@ self: {
        pname = "mtlparse";
        version = "0.1.4.0";
        sha256 = "1fl5rvmgk37bqgjzs3c2wh80pfhr0i4yakxbsaryg7piws7j6ygc";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://homepage3.nifty.com/salamander/second/projects/mtlparse/";
        description = "parse library using mtl package";
        license = "LGPL";
@@ -91942,7 +94279,7 @@ self: {
        pname = "mtlx";
        version = "0.1.6";
        sha256 = "0s0cniqn1fb7rq14w3wjh7mkzkxpndj1h1wrgssxds6cs3vkk4dn";
-       buildDepends = [ base mtl QuickCheck ];
+       libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Monad transformer library with type indexes, providing 'free' copies";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91954,8 +94291,8 @@ self: {
        pname = "mtp";
        version = "0.1.1.1";
        sha256 = "164q7p81c5an4w3pqpfk94rgn0banfs2yp7fhbbckdyb2qymsbww";
-       buildDepends = [ base filepath unix ];
-       extraLibraries = [ mtp ];
+       libraryHaskellDepends = [ base filepath unix ];
+       librarySystemDepends = [ mtp ];
        jailbreak = true;
        description = "Bindings to libmtp";
        license = "LGPL";
@@ -91968,7 +94305,7 @@ self: {
        pname = "mtree";
        version = "0.1";
        sha256 = "1l4kjrmr5v8pkhf48w0ym6dlrsvaf21p3x5sykq1rxwp821cqglv";
-       buildDepends = [ base bifunctors ];
+       libraryHaskellDepends = [ base bifunctors ];
        description = "Tree with Meta and Content parameters";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -91979,7 +94316,7 @@ self: {
        pname = "mucipher";
        version = "0.6.0";
        sha256 = "0bmdri4bni9whjgz4mxvkk9jbxkscci38l06gk2n5xiwyg1hwg0y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library to produce simple ciphers for use with lambdabot";
        license = "GPL";
      }) {};
@@ -91995,7 +94332,7 @@ self: {
        sha256 = "1bfsgsl09aajxa8ajps63zj348ccr8pswppj0dar5k8mr6nr6n3q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring cryptohash directory github-types
          http-conduit http-types process random snap-core snap-server stm
          text transformers
@@ -92013,7 +94350,7 @@ self: {
        pname = "muesli";
        version = "0.1.1.0";
        sha256 = "0cysqy3g9zgvbzj9gnwlpqk63inkm26dvhhqx8qlzp1lan6f125w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers directory filepath hashable mtl
          psqueues time
        ];
@@ -92030,19 +94367,19 @@ self: {
      mkDerivation {
        pname = "mueval";
        version = "0.9.1.1.2";
-       revision = "1";
        sha256 = "1h8a0lfbpgx9pjsmb0yld4n12z2nia5kkikjq1qqzk4m8rsknk70";
+       revision = "1";
        editedCabalFile = "5c6cf1e221928e15536f1dfa46942293acf7b470a442c619ef66529b78c59596";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers directory extensible-exceptions filepath hint
          mtl process QuickCheck show simple-reflect unix
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/gwern/mueval";
        description = "Safely evaluate pure Haskell expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multext-east-msd" = callPackage
@@ -92051,7 +94388,7 @@ self: {
        pname = "multext-east-msd";
        version = "0.1.0.4";
        sha256 = "1if1ip22y7w59lkyshn4ic4p46zrfs4kcdzzjai9l8xbscavgdl6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/jsnajder/multex-east-msd";
        description = "MULTEXT-East morphosyntactic descriptors";
@@ -92060,7 +94397,7 @@ self: {
 
   "multiarg" = callPackage
     ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck
-     , tasty-th, utf8-string
+     , tasty-th
      }:
      mkDerivation {
        pname = "multiarg";
@@ -92068,8 +94405,10 @@ self: {
        sha256 = "18lq0q76a4vx5r28wrxwa3cb2gdx6hv8vylkky07dqccqgxdg5ss";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base utf8-string ];
-       testDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-quickcheck tasty-th
+       ];
        homepage = "https://github.com/massysett/multiarg";
        description = "Command lines for options that take multiple arguments";
        license = stdenv.lib.licenses.bsd3;
@@ -92086,7 +94425,12 @@ self: {
        sha256 = "0w47ffx8f8hw2a35kxjwi16l9bfgc0k2ac7r844123anmgv2wcfm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base containers haskell-src-exts HaXml hxt hxt-xpath mtl
+         parsec pointless-haskell pointless-lenses pointless-rewrite pretty
+         process syb
+       ];
+       executableHaskellDepends = [
          array base containers haskell-src-exts HaXml hxt hxt-xpath mtl
          parsec pointless-haskell pointless-lenses pointless-rewrite pretty
          process syb
@@ -92107,9 +94451,13 @@ self: {
        sha256 = "09yjr7whddn60kyn25hzjjls1m5xi87nqzbkrb6vp4hlvmzm0b1g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base base58-bytestring base64-bytestring byteable
-         bytestring cryptohash hex io-streams optparse-applicative
+       libraryHaskellDepends = [
+         attoparsec base base58-bytestring base64-bytestring bytestring
+         cryptohash hex io-streams
+       ];
+       executableHaskellDepends = [
+         base base58-bytestring base64-bytestring byteable bytestring
+         cryptohash hex io-streams optparse-applicative
        ];
        jailbreak = true;
        homepage = "https://github.com/LukeHoersten/multihash";
@@ -92123,7 +94471,7 @@ self: {
        pname = "multimap";
        version = "1.2.1";
        sha256 = "0d3l5q4yvmywl6i9ip96zz0fvhjdh00mfbbniphbjxsi8wlwack3";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://hub.darcs.net/scravy/multimap";
        description = "A multimap";
        license = stdenv.lib.licenses.mit;
@@ -92135,7 +94483,7 @@ self: {
        pname = "multipart";
        version = "0.1.2";
        sha256 = "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5";
-       buildDepends = [ base bytestring parsec ];
+       libraryHaskellDepends = [ base bytestring parsec ];
        homepage = "http://www.github.com/silkapp/multipart";
        description = "HTTP multipart split out of the cgi package";
        license = stdenv.lib.licenses.bsd3;
@@ -92149,8 +94497,8 @@ self: {
        pname = "multipart-names";
        version = "0.0.1";
        sha256 = "17cw9lg1qi3rm38yh13n6gkb0grld4gc003hz49vdz8bx4gzfqxc";
-       buildDepends = [ base case-insensitive lens parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base case-insensitive lens parsec ];
+       testHaskellDepends = [
          base HUnit lens test-framework test-framework-hunit
        ];
        homepage = "http://github.com/nedervold/multipart-names";
@@ -92166,7 +94514,7 @@ self: {
        pname = "multipass";
        version = "0.1.0.2";
        sha256 = "0zs5sw9m5r8g9p29knrihqsvihwihr1ca28vb0283k5jik18aifm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers ghc-prim hashable keys math-functions
          newtype unordered-containers
        ];
@@ -92183,7 +94531,7 @@ self: {
        pname = "multiplate";
        version = "0.0.2";
        sha256 = "02pqfkdcv4fn0pmxphg19b3fiazn4hpphfj8xgp77vpy2lczndsw";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Multiplate";
        description = "Lightweight generic library for mutually recursive data types";
@@ -92196,7 +94544,7 @@ self: {
        pname = "multiplate-simplified";
        version = "0.0.0.2";
        sha256 = "0xzjl3nsm6wgbqd6rjn0bf9jhiw6l6ql5gj5m8xqccv8363i5v2r";
-       buildDepends = [ base multiplate transformers ];
+       libraryHaskellDepends = [ base multiplate transformers ];
        jailbreak = true;
        description = "Shorter, more generic functions for Multiplate";
        license = stdenv.lib.licenses.mit;
@@ -92211,7 +94559,9 @@ self: {
        sha256 = "1y0v06qnpna8sa0aw24i4s29yc49m3a7d8yrl6xiv1jrgycjcafc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers fez-conf mtl process ];
+       executableHaskellDepends = [
+         base containers fez-conf mtl process
+       ];
        homepage = "http://ui3.info/d/proj/multiplicity.html";
        description = "Wrapper program for duplicity, adding config files";
        license = stdenv.lib.licenses.bsd3;
@@ -92223,7 +94573,7 @@ self: {
        pname = "multirec";
        version = "0.7.5";
        sha256 = "164a0rbka606d7d0l2p11j0zry0dlwkymig10wrkvckj7mh5yydz";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
        description = "Generic programming for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
@@ -92237,7 +94587,7 @@ self: {
        pname = "multirec-alt-deriver";
        version = "0.1.3";
        sha256 = "0hrzrzmgj1y784dvwiz20y842m4kk9rd9vhbwz8cazafs8gindfc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl multirec syb template-haskell th-expand-syns
        ];
        jailbreak = true;
@@ -92252,7 +94602,7 @@ self: {
        pname = "multirec-binary";
        version = "0.0.1";
        sha256 = "1cj1rfjqxwc06vr5w12fqbcpjb0fjsphf8vp40sp2naizpvvnmzs";
-       buildDepends = [ base binary multirec ];
+       libraryHaskellDepends = [ base binary multirec ];
        jailbreak = true;
        description = "Generic Data.Binary instances using MultiRec.";
        license = stdenv.lib.licenses.bsd3;
@@ -92265,7 +94615,7 @@ self: {
        pname = "multiset";
        version = "0.3.0";
        sha256 = "0wpc2v55q6gwn70nlk2x5xd4dk9a8aw2ivl1gr0xhdp1dnn5dhcb";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "The Data.MultiSet container type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92275,10 +94625,10 @@ self: {
      mkDerivation {
        pname = "multiset-comb";
        version = "0.2.4";
-       revision = "1";
        sha256 = "0j7vxm67aws7dzlmdkvx2aja888jp22qdzz8hgmhvbpcr4p7lz99";
+       revision = "1";
        editedCabalFile = "b6ecbed315e0578b665644b8a73ed1e348968e5a93bb1d491fb5a6faf79d7545";
-       buildDepends = [ base containers transformers ];
+       libraryHaskellDepends = [ base containers transformers ];
        description = "Combinatorial algorithms over multisets";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92289,7 +94639,7 @@ self: {
        pname = "multisetrewrite";
        version = "0.6";
        sha256 = "1chgdikgp70rkzw2k3wy7i276j5vb435vq26yl37lkh0im1bg5ay";
-       buildDepends = [ base haskell98 stm ];
+       libraryHaskellDepends = [ base haskell98 stm ];
        homepage = "http://sulzmann.blogspot.com/2008/10/multi-set-rewrite-rules-with-guards-and.html";
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
        license = stdenv.lib.licenses.bsd3;
@@ -92304,8 +94654,8 @@ self: {
        sha256 = "0s8x0gb332724sd3vcp5yimxpbf85kvg327lg3bb77jvy6cfdzvj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl tagged transformers ];
-       testDepends = [ base hspec transformers ];
+       libraryHaskellDepends = [ base mtl tagged transformers ];
+       testHaskellDepends = [ base hspec transformers ];
        homepage = "https://github.com/lspitzner/multistate";
        description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
        license = stdenv.lib.licenses.bsd3;
@@ -92322,7 +94672,7 @@ self: {
        sha256 = "0s11xvhawwrcr31f0khp0q6fimwjps12n992z35ldnh0kk3dmk9z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html ConfigFile directory Glob happstack-server
          HStringTemplate markdown MissingH process text
        ];
@@ -92340,7 +94690,7 @@ self: {
        pname = "murder";
        version = "1.3.4";
        sha256 = "0pr77j3br8knk26iknsa6hy076bx2bb6jgii3v6aqhv40ykcrv15";
-       buildDepends = [
+       libraryHaskellDepends = [
          AspectAG base containers HList ListLike template-haskell TTTAS
          uu-parsinglib uulib
        ];
@@ -92357,7 +94707,7 @@ self: {
        pname = "murmur-hash";
        version = "0.1.0.8";
        sha256 = "01isk1gy1x75zksdmddcpp7mnx69wb96g1xv8gl3anvx9bfg9fbc";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/nominolo/murmur-hash";
        description = "MurmurHash2 implementation for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -92372,8 +94722,8 @@ self: {
        pname = "murmur3";
        version = "1.0.0";
        sha256 = "1rdnfy37dmmrqpapdv9h22ki94mxrz1xdk5ibcj833q35868kjmq";
-       buildDepends = [ base binary bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring ];
+       testHaskellDepends = [
          base base16-bytestring bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -92388,7 +94738,7 @@ self: {
        pname = "murmurhash3";
        version = "1.0";
        sha256 = "1hz6rf1qrzgixx19bn9hnp07jfb61wnrjq5bgqnd3px569afwdb2";
-       buildDepends = [ haskell2010 ];
+       libraryHaskellDepends = [ haskell2010 ];
        homepage = "https://github.com/niswegmann/murmurhash3";
        description = "32-bit non-cryptographic hashing";
        license = stdenv.lib.licenses.publicDomain;
@@ -92401,7 +94751,7 @@ self: {
        pname = "music-articulation";
        version = "1.9.0";
        sha256 = "0cxbhk25kn3hpkmb6h0brcf03yyi6kaz3i3l3lv2rzgfxv14a2pg";
-       buildDepends = [ average base semigroups ];
+       libraryHaskellDepends = [ average base semigroups ];
        description = "Abstract representation of musical articulation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92412,7 +94762,7 @@ self: {
        pname = "music-diatonic";
        version = "0.1.1";
        sha256 = "19sflj0b5qslclqjwyacgc2pdplwr3mimmhf8ka7bbs70r557wbs";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Implementation of basic western musical theory objects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92424,7 +94774,9 @@ self: {
        pname = "music-dynamics";
        version = "1.9.0";
        sha256 = "12a11qrdy4p0bczpg2zp8yqw4wdmgfhq5z9ffajlsib2xcs6y8s4";
-       buildDepends = [ average base music-dynamics-literal semigroups ];
+       libraryHaskellDepends = [
+         average base music-dynamics-literal semigroups
+       ];
        description = "Abstract representation of musical dynamics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92435,7 +94787,7 @@ self: {
        pname = "music-dynamics-literal";
        version = "1.9.0";
        sha256 = "19bql45aqjfkhvpkfbvfcsc8p1mzg93n966r1yv5rwps6s2x86d5";
-       buildDepends = [ base semigroups ];
+       libraryHaskellDepends = [ base semigroups ];
        description = "Overloaded dynamics literals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92448,7 +94800,7 @@ self: {
        pname = "music-graphics";
        version = "1.8.1";
        sha256 = "1764qmb8pafddsclr5gl5ibqpi9wvwa96idn6iqx8d3jbpqc4fam";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-svg bytestring lens music-pitch music-preludes
          music-score process
        ];
@@ -92468,7 +94820,7 @@ self: {
        pname = "music-parts";
        version = "1.9.0";
        sha256 = "1kiz968kcwcyczxg5gl40c7bwgkn86l7qi0ak8p68bm4rmsw9id4";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions aeson base bytestring cassava containers data-default
          lens monadplus music-dynamics music-pitch roman-numerals semigroups
          vector-space vector-space-points
@@ -92487,13 +94839,12 @@ self: {
        pname = "music-pitch";
        version = "1.9.0";
        sha256 = "1w5b62il0n8147a3sdvx9ndykfp56nf0kabwpw8khd29cmpff0bz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers data-interval lens music-pitch-literal nats
          positive semigroups type-unary vector-space vector-space-points
        ];
        description = "Musical pitch representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-pitch-literal" = callPackage
@@ -92502,7 +94853,7 @@ self: {
        pname = "music-pitch-literal";
        version = "1.9.0";
        sha256 = "0vsvw7c29qvi69z9gy2zzq9bpajmjd5vs1kll7jw0qbsh28jsqql";
-       buildDepends = [ base semigroups ];
+       libraryHaskellDepends = [ base semigroups ];
        description = "Overloaded pitch literals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92521,14 +94872,15 @@ self: {
        sha256 = "1fqw3rz0zrwa5a0l639b0bd6qxiq4zmqcrf0vkrgh03n65r2901q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async average base containers filepath lens lilypond monadplus
          music-articulation music-dynamics music-dynamics-literal
          music-parts music-pitch music-pitch-literal music-score musicxml2
          optparse-applicative process semigroups split temporary unix
          vector-space vector-space-points
        ];
-       testDepends = [ base process tasty tasty-golden ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base process tasty tasty-golden ];
        description = "Some useful preludes for the Music Suite";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92546,7 +94898,7 @@ self: {
        pname = "music-score";
        version = "1.9.0";
        sha256 = "10cysii04njrjd0qx14fwsjn91ycvfxcs3kvwnb8j24v3svcha10";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions aeson average base base-orphans bifunctors colour
          comonad containers contravariant distributive HCodecs lens lilypond
          monadplus mtl music-dynamics-literal music-pitch-literal musicxml2
@@ -92569,7 +94921,7 @@ self: {
        pname = "music-sibelius";
        version = "1.9.0";
        sha256 = "1yahz8z81ggcg303i2syzf6bsxq8dmzzzqs3fj89r5kq766275kz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring lens monadplus music-articulation
          music-dynamics music-parts music-pitch music-pitch-literal
          music-preludes music-score semigroups unordered-containers
@@ -92588,7 +94940,7 @@ self: {
        pname = "music-suite";
        version = "1.9.0";
        sha256 = "1nss12cad2vjq2whz5kxsr1r63iwc4pnza0nnf2h2zai3gxzsnn6";
-       buildDepends = [
+       libraryHaskellDepends = [
          abcnotation lilypond music-articulation music-dynamics
          music-dynamics-literal music-parts music-pitch music-pitch-literal
          music-preludes music-score musicxml2
@@ -92608,7 +94960,7 @@ self: {
        sha256 = "0pv6mwdrk2kz3lr8r3jkc368zch46w4rn5dmqbjqm0ykfw1n3bqf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory fgl process shelly split text unix
        ];
        description = "Utility for developing the Music Suite";
@@ -92630,12 +94982,15 @@ self: {
        sha256 = "10salrdl4vfdy3x26564i8kdv6lx8py697v5n8q9ywqsd05dcrv2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson amqp base blaze-builder errors ghc-prim heist HTTP mime-mail
-         mtl network network-metrics optparse-applicative postgresql-simple
-         text time transformers xmlhtml
+       libraryHaskellDepends = [
+         aeson amqp base ghc-prim mime-mail optparse-applicative text
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson amqp base blaze-builder errors heist HTTP mime-mail mtl
+         network network-metrics optparse-applicative postgresql-simple text
+         time transformers xmlhtml
+       ];
+       testHaskellDepends = [
          aeson amqp base blaze-builder bytestring configurator errors
          ghc-prim heist HTTP HUnit mime-mail mtl postgresql-simple
          smallcheck stm test-framework test-framework-hunit
@@ -92656,7 +95011,9 @@ self: {
        pname = "musicxml";
        version = "0.1.2";
        sha256 = "0sn8gzymf6xpdksd7v2xyb4y2iks2l09hyw0rch109lgrnsy5gp8";
-       buildDepends = [ base containers directory HaXml old-time pretty ];
+       libraryHaskellDepends = [
+         base containers directory HaXml old-time pretty
+       ];
        jailbreak = true;
        homepage = "https://troglodita.di.uminho.pt/svn/musica/work/MusicXML";
        description = "MusicXML format encoded as Haskell type and functions of reading and writting";
@@ -92673,7 +95030,7 @@ self: {
        pname = "musicxml2";
        version = "1.9.0";
        sha256 = "07axlifkqf0dcqnxfb62x829ygc2y7didsh60x081zw429853fy8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default music-dynamics-literal music-pitch-literal nats
          reverse-apply semigroups type-unary xml
        ];
@@ -92692,7 +95049,11 @@ self: {
        sha256 = "0mkj5ngcblm949wkxiq2qck3zak93r5zipppwgis59yg01cp79v2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring directory parsec pretty-show scientific text
+         transformers unordered-containers vector
+       ];
+       executableHaskellDepends = [
          aeson base bytestring directory optparse-applicative parsec
          pretty-show scientific text transformers unordered-containers
          vector
@@ -92713,7 +95074,7 @@ self: {
        sha256 = "1m15q6dy3hbbf5q302gw3y2znxf2mfz9pwbdyawg8bqiw81zahis";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder bytestring filepath haskell-src parsec text
          transformers utf8-string
        ];
@@ -92731,10 +95092,10 @@ self: {
        pname = "mutable-containers";
        version = "0.3.0";
        sha256 = "1xsz214z5z1qrl5xy5gyq97bsh8b1li3kaz7cp6zm955bz43rv6c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim mono-traversable primitive vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec primitive QuickCheck vector
        ];
        homepage = "https://github.com/fpco/mutable-containers";
@@ -92750,7 +95111,7 @@ self: {
        pname = "mutable-iter";
        version = "0.6.1";
        sha256 = "08fqfkzb6b0pzzffkfcwigcm0s4hgadh7jl4pg6smjcyfjz9572f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base iteratee MonadCatchIO-transformers transformers vector
        ];
        jailbreak = true;
@@ -92770,7 +95131,7 @@ self: {
        sha256 = "0nd1c4l2z7bflnghz7bbbahpfl2jj9mygpygxc7028axrrxj09af";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath hslogger hslogger-template mtl network-dbus
          process
        ];
@@ -92788,7 +95149,7 @@ self: {
        pname = "mvc";
        version = "1.1.0";
        sha256 = "115cg7xlkk0zj3qdhwm35397vbp1s28h3j0ipw2a9i9ap16d7x1i";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base contravariant foldl managed mmorph pipes
          pipes-concurrency transformers
        ];
@@ -92802,7 +95163,7 @@ self: {
        pname = "mvc-updates";
        version = "1.2.0";
        sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6";
-       buildDepends = [ async base foldl mvc ];
+       libraryHaskellDepends = [ async base foldl mvc ];
        jailbreak = true;
        description = "Concurrent and combinable updates";
        license = stdenv.lib.licenses.bsd3;
@@ -92818,7 +95179,7 @@ self: {
        pname = "mvclient";
        version = "0.4";
        sha256 = "12ckzfb6wwa3865isxnzw7xmwh9f43ali0ab5mal6brs33zz0z53";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols binary bytestring containers
          control-event Crypto data-binary-ieee754 hexpat http-enumerator
          maccatcher mtl network parsec time uuid
@@ -92838,8 +95199,8 @@ self: {
        pname = "mwc-random";
        version = "0.13.3.2";
        sha256 = "01jqmq52knlwskgyx7940c81dmgdivrj0sbi2h6l0ccbxiaf7c9c";
-       buildDepends = [ base primitive time vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base primitive time vector ];
+       testHaskellDepends = [
          base HUnit QuickCheck statistics test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -92856,12 +95217,11 @@ self: {
        pname = "mwc-random-monad";
        version = "0.7.3.1";
        sha256 = "0h4ljwwhqg4yy513lqk2ix0m9q2hmk276hgfrc6n3ja6wqbpkwyh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-primitive mwc-random primitive transformers vector
        ];
        description = "Monadic interface for mwc-random";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "myTestlll" = callPackage
@@ -92873,15 +95233,17 @@ self: {
      mkDerivation {
        pname = "myTestlll";
        version = "1.0.0";
-       revision = "4";
        sha256 = "1rd3pxc20xwb3j0q9ckygy59mks8p38vzmi4wfg8zp1dq92jmhy0";
+       revision = "4";
        editedCabalFile = "e554b67c3f8efd73e028328341e3b535dc4898b3d476524a40c236c4c2871e43";
-       buildDepends = [
+       libraryHaskellDepends = [
          array arrows base bytestring CCA containers deepseq ghc-prim
          HCodecs heap markov-chain monadIO mtl PortMidi pure-fft random stm
          syb template-haskell UISF
        ];
-       testDepends = [ ansi-terminal base Cabal Euterpea QuickCheck ];
+       testHaskellDepends = [
+         ansi-terminal base Cabal Euterpea QuickCheck
+       ];
        jailbreak = true;
        homepage = "http://haskell.cs.yale.edu/";
        description = "None";
@@ -92895,7 +95257,9 @@ self: {
        pname = "mybitcoin-sci";
        version = "0.3";
        sha256 = "1iy84z13i98wbkman7yp2y2821yzf3xxpcy10rh9bdskjijvgjnq";
-       buildDepends = [ base cgi curl directory mtl process split ];
+       libraryHaskellDepends = [
+         base cgi curl directory mtl process split
+       ];
        description = "Binding to mybitcoin.com's Shopping Cart Interface.";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -92911,14 +95275,16 @@ self: {
        sha256 = "0sn3ic3h94ff57igs61l2cq82y6xxz87qflm8dykwwy721swq1qn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers inline-c lens-family lens-family-th
          scientific template-haskell text vector websockets
        ];
-       testDepends = [ base tasty tasty-hunit ];
+       executableHaskellDepends = [ aeson base lens-family websockets ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "http://github.com/adinapoli/myo";
        description = "Haskell binding to the Myo armband";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysnapsession" = callPackage
@@ -92929,7 +95295,7 @@ self: {
        pname = "mysnapsession";
        version = "0.4.1";
        sha256 = "0871nq9nhpslni5kfldwiswhvpk1aajj7ikyiy9ikmcq16fb1z9m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal clientsession containers mtl random
          regex-posix snap snap-core time
        ];
@@ -92949,7 +95315,7 @@ self: {
        sha256 = "0lxzn8fn97f1j3fx97f46m16y25w7m1w84l59r75xisr662gc9lz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring clientsession heist mtl mysnapsession snap
          snap-core snap-server text time
        ];
@@ -92960,19 +95326,17 @@ self: {
      }) {};
 
   "mysql" = callPackage
-    ({ mkDerivation, base, bytestring, containers, mysql, openssl, zlib
-     }:
+    ({ mkDerivation, base, bytestring, containers, mysql }:
      mkDerivation {
        pname = "mysql";
        version = "0.1.1.8";
        sha256 = "115xz4khg4klrgjvv9dy83pv197b4y1zgw6fbpv8j88yr3qjmw4h";
-       buildDepends = [ base bytestring containers ];
-       buildTools = [ mysql ];
-       extraLibraries = [ openssl zlib ];
+       libraryHaskellDepends = [ base bytestring containers ];
+       librarySystemDepends = [ mysql ];
        homepage = "https://github.com/bos/mysql";
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-     }) { mysql = null;  inherit (pkgs) openssl;  inherit (pkgs) zlib;};
+     }) { mysql = null;};
 
   "mysql-effect" = callPackage
     ({ mkDerivation, base, bytestring, extensible-effects, mysql
@@ -92981,10 +95345,10 @@ self: {
      mkDerivation {
        pname = "mysql-effect";
        version = "0.2.0.3";
-       revision = "1";
        sha256 = "11fpsh4w2zlqdqhk5snb276pcbx4p9g1igs94fympa9asfr2rxm3";
+       revision = "1";
        editedCabalFile = "d4474591079b806b8e26d102824d46c7e4c239afb3479ea8d1e8cbd39f015718";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring extensible-effects mysql mysql-simple
        ];
        jailbreak = true;
@@ -93002,7 +95366,7 @@ self: {
        pname = "mysql-simple";
        version = "0.2.2.5";
        sha256 = "132igmgrgkpc0g9063d593ha3iv40k5dd017nlb07sz0qs9hi8w6";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring blaze-builder blaze-textual
          bytestring mysql old-locale pcre-light text time
        ];
@@ -93019,7 +95383,7 @@ self: {
        pname = "mysql-simple-quasi";
        version = "1.0.0.2";
        sha256 = "1ggqqjn83rx23qk7lzrcgj1arjhmhi85xfl7d2pz27rrjx2ywpn8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta mysql-simple template-haskell
        ];
        description = "Quasi-quoter for use with mysql-simple";
@@ -93035,7 +95399,7 @@ self: {
        pname = "mysql-simple-typed";
        version = "0.1.1.2";
        sha256 = "19wnvmrb523n8xl5cp9kypcqcrs0xs8pwdk771y1bdin5ds9j095";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mysql mysql-simple template-haskell typedquery utf8-string
        ];
        homepage = "https://github.com/tolysz/mysql-simple-typed";
@@ -93050,7 +95414,7 @@ self: {
        pname = "mzv";
        version = "0.1.0.2";
        sha256 = "044x87jzyqsg5npp3s0mncgcl0gv26h6hzhc7bbgjja95x16ma2l";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/ifigueroap/mzv";
        description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)";
@@ -93066,7 +95430,8 @@ self: {
        sha256 = "189ybl8fb70cf24zhnjcmgrgkshrf2ziacklg9ixgvnbdp3abb7m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base HSH mtl process ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base HSH mtl process ];
        description = "Utility to call iwconfig";
        license = "unknown";
      }) {};
@@ -93079,10 +95444,10 @@ self: {
        pname = "nagios-check";
        version = "0.3.1";
        sha256 = "17ww3n2y6cmjc3n05cra43csk60sm5s07q2mn3zq1sjiiq2cw82c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors exceptions mtl nagios-perfdata text
        ];
-       testDepends = [ base hspec QuickCheck text ];
+       testHaskellDepends = [ base hspec QuickCheck text ];
        homepage = "https://github.com/fractalcat/haskell-nagios-check";
        description = "Package for writing monitoring plugins";
        license = stdenv.lib.licenses.mit;
@@ -93096,10 +95461,10 @@ self: {
        pname = "nagios-perfdata";
        version = "0.2.2";
        sha256 = "159m45fvxgdabh7n24bkmg2901y3792afcrccqna1in3ha9vxd22";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bifunctors bytestring containers mtl
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec HUnit MissingH transformers
        ];
        homepage = "https://github.com/anchor/nagios-perfdata";
@@ -93118,11 +95483,12 @@ self: {
        sha256 = "1rk6sphxn93kmayjs0y386g1llhgbw8jpwhfkhlrbv9c395gxkrh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers lens nagios-check
          optparse-applicative text transformers unordered-containers wreq
        ];
-       testDepends = [
+       executableHaskellDepends = [ base nagios-check text ];
+       testHaskellDepends = [
          base bytestring hspec HUnit nagios-check text transformers
        ];
        homepage = "https://github.com/fractalcat/nagios-plugin-ekg";
@@ -93139,7 +95505,7 @@ self: {
        pname = "named-formlet";
        version = "0.2";
        sha256 = "0wpjxn03cnxnn5x1706byl9d1129g9p1vkl1a1v9qw0afgzlj8y7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring containers mtl text transformers
        ];
        description = "A simple formlet library with named formlets";
@@ -93152,7 +95518,7 @@ self: {
        pname = "named-lock";
        version = "0.1";
        sha256 = "1db12f2q395yk6pwz5gnb2q0kf4s868z8d1vvwa7vngnfc1h924i";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/named-lock";
        description = "A named lock that is created on demand";
@@ -93166,7 +95532,7 @@ self: {
        pname = "named-records";
        version = "0.5";
        sha256 = "0ykcmmnns63zjfd00kd9941c33l19n9c5b5xkin4n7r9v0qvirwr";
-       buildDepends = [ base binary names template-haskell ];
+       libraryHaskellDepends = [ base binary names template-haskell ];
        description = "Flexible records with named fields";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93179,8 +95545,10 @@ self: {
        pname = "namelist";
        version = "0.1.0";
        sha256 = "0sfiqd1dh3frzwnqz4fjh0wg8m55cprqw8ywvcaszrp5gq3mj74s";
-       buildDepends = [ base case-insensitive data-default-class parsec ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base case-insensitive data-default-class parsec
+       ];
+       testHaskellDepends = [
          base case-insensitive QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/philopon/namelist-hs";
@@ -93194,7 +95562,7 @@ self: {
        pname = "names";
        version = "0.3.1";
        sha256 = "0sjjp90zfrkjavj8fqyscnvc9d72mkvv8f7ajd47jba92mhwzr5g";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "Type level names";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93205,7 +95573,7 @@ self: {
        pname = "names-th";
        version = "0.1.0.1";
        sha256 = "1bqbh6751lmiiwvdvry796lzzbjkk8x1lhylkh61l6ycdib2qxjq";
-       buildDepends = [ base containers template-haskell ];
+       libraryHaskellDepends = [ base containers template-haskell ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Manipulate name strings for TH";
        license = stdenv.lib.licenses.bsd3;
@@ -93217,7 +95585,7 @@ self: {
        pname = "nano-cryptr";
        version = "0.1.1.3";
        sha256 = "1pqwzl8l48c4q83jhjj11jd3kwwa0ail2c6kv3k38kig9yvj7ff8";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/chowells79/nano-cryptr";
        description = "A threadsafe binding to glibc's crypt_r function";
        license = stdenv.lib.licenses.bsd3;
@@ -93230,8 +95598,8 @@ self: {
        pname = "nano-hmac";
        version = "0.2.0";
        sha256 = "0rrwa1c3mval1jm4siqyx1vk14ibifya62hni13cimcdafj35fnq";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ openssl ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ openssl ];
        homepage = "http://www.jasani.org/search/label/nano-hmac";
        description = "Bindings to OpenSSL HMAC";
        license = stdenv.lib.licenses.bsd3;
@@ -93244,8 +95612,8 @@ self: {
        pname = "nano-md5";
        version = "0.1.2";
        sha256 = "18db3y76w0kv2m7h3lrqxcag4lc7519b2j80113g6hhm1wxkpabk";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ openssl ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ openssl ];
        homepage = "http://code.haskell.org/~dons/code/nano-md5";
        description = "Efficient, ByteString bindings to OpenSSL";
        license = stdenv.lib.licenses.bsd3;
@@ -93262,7 +95630,7 @@ self: {
        sha256 = "034mwssj296xn7j123sqvfl9rv1bwnj1v5sw5l34481dk5zsi9sm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base BNFC-meta cmdargs containers mtl parsec pretty transformers
        ];
        jailbreak = true;
@@ -93277,8 +95645,8 @@ self: {
        pname = "nanocurses";
        version = "1.5.2";
        sha256 = "04kgf3vvjdx6d1fmfzp0xy5x42zlg0ij59ayi1zhz8hkwsfn5g1m";
-       buildDepends = [ base bytestring unix ];
-       extraLibraries = [ ncurses ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       librarySystemDepends = [ ncurses ];
        homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html";
        description = "Simple Curses binding";
        license = stdenv.lib.licenses.bsd3;
@@ -93291,8 +95659,8 @@ self: {
        pname = "nanomsg";
        version = "0.1.1";
        sha256 = "06jb8s3jxjiz7r6dn8xx33xqd76f2r5q1mshsz41z4q0khf4wdp3";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ nanomsg ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ nanomsg ];
        jailbreak = true;
        description = "nanomsg - scalability protocols library";
        license = stdenv.lib.licenses.publicDomain;
@@ -93306,12 +95674,12 @@ self: {
        pname = "nanomsg-haskell";
        version = "0.2.2";
        sha256 = "1p4d0qdyqfg4qidcdcddjnyw4x2q8551ka6bsryz9b6dpj6kywch";
-       buildDepends = [ base binary bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring ];
+       librarySystemDepends = [ nanomsg ];
+       testHaskellDepends = [
          base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
-       extraLibraries = [ nanomsg ];
        homepage = "https://github.com/ivarnymoen/nanomsg-haskell";
        description = "Bindings to the nanomsg library";
        license = stdenv.lib.licenses.mit;
@@ -93324,7 +95692,7 @@ self: {
        pname = "nanoparsec";
        version = "0.1.1";
        sha256 = "00ghdzkzshk24g7v42hq7zq0dxsq8vjpkslj41dxdnx0zizwbn3m";
-       buildDepends = [ base bytestring ListLike ];
+       libraryHaskellDepends = [ base bytestring ListLike ];
        jailbreak = true;
        description = "An implementation of attoparsec-like parser around list-like";
        license = stdenv.lib.licenses.bsd3;
@@ -93336,8 +95704,8 @@ self: {
        pname = "nanospec";
        version = "0.2.1";
        sha256 = "0jq2l1lmy4hcl6r975xcg86xr1y7jfxr3qn27ibsmjbzlnxdkjyv";
-       buildDepends = [ base ];
-       testDepends = [ base hspec silently ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec silently ];
        description = "A lightweight implementation of a subset of Hspec's API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93348,7 +95716,7 @@ self: {
        pname = "narc";
        version = "0.1.3";
        sha256 = "1ng1rzj1lf6h9g3pk8gsz05bnck72rp5j62iwn82vlcw8pyk0fsc";
-       buildDepends = [ base HDBC HUnit mtl QuickCheck random ];
+       libraryHaskellDepends = [ base HDBC HUnit mtl QuickCheck random ];
        homepage = "http://ezrakilty.net/projects/narc";
        description = "Query SQL databases using Nested Relational Calculus embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -93361,7 +95729,7 @@ self: {
        pname = "nat";
        version = "0.3";
        sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Lazy binary natural numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93374,7 +95742,7 @@ self: {
        pname = "nationstates";
        version = "0.2.0.0";
        sha256 = "07rs7c5pvq6x8icg5pzk613vazcnnl3rfrcsf3zw6i8gaxh0dq48";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring clock containers http-client http-client-tls
          http-types multiset transformers xml
        ];
@@ -93402,11 +95770,11 @@ self: {
        pname = "nats-queue";
        version = "0.1.2.0";
        sha256 = "0gqgqf87dzja0yhfpazqbdpvia1jisarhnph9bxvb3mfl4is9sgf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async base bytestring containers dequeue network network-uri
          random text
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers dequeue hspec network network-uri
          random text
        ];
@@ -93423,7 +95791,7 @@ self: {
        pname = "natural-number";
        version = "1.0";
        sha256 = "1n8qgjbi4c50pwynlya4bjxd6lpwj00257drqk04mlrr3nw3gp5x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base type-equality type-level-natural-number
          type-level-natural-number-induction
        ];
@@ -93439,7 +95807,7 @@ self: {
        pname = "natural-numbers";
        version = "0.1.2.0";
        sha256 = "0cj9lnnlvry425bkixqv9fh5b9xhy7dmwcqsxprj6lamccvxspwn";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/natural-numbers";
        description = "Natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -93451,7 +95819,7 @@ self: {
        pname = "natural-sort";
        version = "0.1.2";
        sha256 = "0l3bkbqzrlpdhzazqqlx71ah0m13ypa0981qvw3sn9q8d0sbfwkv";
-       buildDepends = [ base bytestring parsec text ];
+       libraryHaskellDepends = [ base bytestring parsec text ];
        homepage = "https://john-millikin.com/software/natural-sort/";
        description = "User-friendly text collation";
        license = stdenv.lib.licenses.bsd3;
@@ -93465,8 +95833,8 @@ self: {
        pname = "natural-transformation";
        version = "0.2";
        sha256 = "1fxgbjf74kdag42hscplc5sn63z0idz2z2yykk1jz4zp71wa0wdp";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
        ];
        homepage = "https://github.com/ku-fpg/natural-transformation";
@@ -93480,7 +95848,7 @@ self: {
        pname = "naturalcomp";
        version = "0.0.3";
        sha256 = "1l594lkd3yb52lhh0raygvk3jlzwkcc2pmcqjmg02dmd6j6mw42x";
-       buildDepends = [ base text utf8-string ];
+       libraryHaskellDepends = [ base text utf8-string ];
        homepage = "not yet available";
        description = "Natural-order string comparison";
        license = stdenv.lib.licenses.bsd3;
@@ -93492,7 +95860,7 @@ self: {
        pname = "naturals";
        version = "0.2.0.2";
        sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "frigidcode.com";
        description = "Constructors and related functions for natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -93507,8 +95875,8 @@ self: {
        pname = "nbt";
        version = "0.5.1";
        sha256 = "08184rn4mwxd2m2fnqvja23jpkzlkvb8d2vn8i4rqcil136wb6q0";
-       buildDepends = [ array base bytestring cereal text ];
-       testDepends = [
+       libraryHaskellDepends = [ array base bytestring cereal text ];
+       testHaskellDepends = [
          array base bytestring cereal HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text zlib
        ];
@@ -93528,7 +95896,7 @@ self: {
        sha256 = "0w5nddirsib9vz96dpan9bgdg1mag9gaz7w7ix51l44ls9r8yn3m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array attoparsec base bytestring containers gtk hflags lens pipes
          stm unix
        ];
@@ -93545,10 +95913,9 @@ self: {
        pname = "ncurses";
        version = "0.2.11";
        sha256 = "08jr224i37jxrprka9c276sid6mw001m8r2krd6g8jscshwd5nzk";
-       buildDepends = [ base containers text transformers ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ ncurses ];
-       patchPhase = "find . -type f -exec sed -i -e 's|ncursesw/||' {} \\;";
+       libraryHaskellDepends = [ base containers text transformers ];
+       librarySystemDepends = [ ncurses ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://john-millikin.com/software/haskell-ncurses/";
        description = "Modernised bindings to GNU ncurses";
        license = stdenv.lib.licenses.gpl3;
@@ -93560,7 +95927,9 @@ self: {
        pname = "ndjson-conduit";
        version = "0.1.0.2";
        sha256 = "0fxxnbccasyhxd5yykzkvrj09zci8is7yqfjw0wg11n1p00hzahj";
-       buildDepends = [ aeson attoparsec base bytestring conduit ];
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit
+       ];
        homepage = "https://github.com/srijs/haskell-ndjson-conduit";
        description = "Conduit-based parsing and serialization for newline delimited JSON";
        license = stdenv.lib.licenses.mit;
@@ -93574,7 +95943,8 @@ self: {
        sha256 = "0lh5clnlfkzd5d9zmm9r92wpzrp8g7x6ndml7wajr882s53dv6jk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base filepath parsec ];
+       libraryHaskellDepends = [ base filepath parsec ];
+       executableHaskellDepends = [ base filepath parsec ];
        homepage = "https://github.com/ajg/neat";
        description = "A Fast Retargetable Template Engine";
        license = stdenv.lib.licenses.mit;
@@ -93588,8 +95958,10 @@ self: {
        pname = "neat-interpolation";
        version = "0.2.2.1";
        sha256 = "00xkhc25s675pcg5s3fiq3l57zsslc0vps44gmwwas4gnz27wdfy";
-       buildDepends = [ base base-prelude parsec template-haskell ];
-       testDepends = [ base-prelude HTF ];
+       libraryHaskellDepends = [
+         base base-prelude parsec template-haskell
+       ];
+       testHaskellDepends = [ base-prelude HTF ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/neat-interpolation";
        description = "A quasiquoter for neat and simple multiline text interpolation";
@@ -93604,7 +95976,7 @@ self: {
        pname = "needle";
        version = "0.1.0.1";
        sha256 = "1p7hmja7mvdbd10jv7bzr5b9i18l9nghdcvvxpn9xvfm8ycz7yg2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src-meta mtl parsec parsec-extra
          template-haskell text vector
        ];
@@ -93623,7 +95995,7 @@ self: {
        pname = "neet";
        version = "0.4.0.0";
        sha256 = "1x0l6cpjc9pjirjndh47asmva8jx5wc6gq8vab1ik2090ph0w1v5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cereal containers graphviz MonadRandom multimap parallel
          random transformers
        ];
@@ -93643,7 +96015,7 @@ self: {
        sha256 = "00zll88gk44l22lqxv47v4j5ipfapy5599ld8fcsvhk57nfcm2r0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring cereal directory GLFW-b GLURaw OpenGLRaw
          random
        ];
@@ -93661,7 +96033,7 @@ self: {
        sha256 = "0cg4x4b2x81d3mbk8nhwqib3pr154hd0snh160bfbm3b31yfr19k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers directory extra filepath GoogleChart json
          old-time process time
        ];
@@ -93676,7 +96048,7 @@ self: {
        pname = "neither";
        version = "0.3.1.1";
        sha256 = "192l840yb1pprfjjq7ax5xaraagl1pbmsidkg1yibp6r4azd61yf";
-       buildDepends = [ base failure transformers ];
+       libraryHaskellDepends = [ base failure transformers ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/neither";
        description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
@@ -93691,7 +96063,7 @@ self: {
        pname = "nemesis";
        version = "2015.5.4";
        sha256 = "149fx29818cf9rxp1gp64w5l288l4whij7im5rfms3rlgj95w6ji";
-       buildDepends = [
+       libraryHaskellDepends = [
          air air-th base containers directory dlist Glob mtl process time
        ];
        homepage = "http://github.com/nfjinjing/nemesis";
@@ -93707,14 +96079,13 @@ self: {
        pname = "nemesis-titan";
        version = "2014.5.19";
        sha256 = "183m6wz52lrf5kfwxz11ad7v5zazv4gcf1c2rcylh2ys6zda4xmd";
-       buildDepends = [
+       libraryHaskellDepends = [
          air air-th base bytestring directory filepath hspec HStringTemplate
          nemesis random uuid
        ];
        homepage = "http://github.com/nfjinjing/nemesis-titan";
        description = "A collection of Nemesis tasks to bootstrap a Haskell project with a focus on continuous integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nerf" = callPackage
@@ -93729,11 +96100,12 @@ self: {
        sha256 = "18rkjgk2r6784mjbdd2lydv9yac252xvj18m78bbaplnac1504ak";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cmdargs containers crf-chain1 data-named
-         dawg directory filepath IntervalMap monad-ox mtl network polimorf
-         polysoup sgd tagsoup temporary text text-binary tokenize vector
+         dawg IntervalMap monad-ox mtl network polimorf polysoup sgd tagsoup
+         text text-binary tokenize vector
        ];
+       executableHaskellDepends = [ directory filepath temporary ];
        jailbreak = true;
        homepage = "https://github.com/kawu/nerf";
        description = "Nerf, the named entity recognition tool based on linear-chain CRFs";
@@ -93749,8 +96121,10 @@ self: {
        pname = "nero";
        version = "0.3.1";
        sha256 = "1nmikqdxih91xhppn72a4xsrszj4050xl9winjsm62k5wdm9ld50";
-       buildDepends = [ base bifunctors bytestring containers lens text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bifunctors bytestring containers lens text
+       ];
+       testHaskellDepends = [
          base bytestring doctest Glob lens tasty tasty-hunit text
        ];
        homepage = "https://github.com/plutonbrb/nero";
@@ -93767,7 +96141,7 @@ self: {
        pname = "nero-wai";
        version = "0.3";
        sha256 = "1jz2was51lfqiq1krrjljy7yl2z49nlj72x9dspc748dznizb8aw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-types lens nero text wai wai-extra
        ];
        homepage = "https://github.com/plutonbrb/nero-wai";
@@ -93782,7 +96156,7 @@ self: {
        pname = "nero-warp";
        version = "0.3";
        sha256 = "1ddr0hs9x7r74f5bb00fbi0z87cfkxp21m5ikp5qgyblqb09940s";
-       buildDepends = [ base nero nero-wai warp ];
+       libraryHaskellDepends = [ base nero nero-wai warp ];
        homepage = "https://github.com/plutonbrb/nero-warp";
        description = "Run Nero server applications with Warp";
        license = stdenv.lib.licenses.bsd3;
@@ -93800,13 +96174,13 @@ self: {
        pname = "nested-routes";
        version = "3.2.0";
        sha256 = "02mj54a797h9ywa0985xw8pspl953xgn813r6mz2apx0mk6gp1xg";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-html bytestring clay composition
          constraints containers http-media http-types lucid mtl poly-arity
          pred-trie regex-compat semigroups shakespeare text transformers wai
          wai-extra wai-util witherable
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base blaze-html bytestring composition constraints
          containers hspec hspec-wai http-media http-types lucid mtl
          poly-arity pred-trie regex-compat semigroups shakespeare text
@@ -93822,8 +96196,8 @@ self: {
        pname = "nested-sets";
        version = "0.0.1.1";
        sha256 = "0a3ppsl6x9yh2pvx7fyir1khdg99wlx9d9zjflamv3gcck3d8p4i";
-       buildDepends = [ base containers ];
-       testDepends = [ base containers hspec ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers hspec ];
        description = "Nested set model implementation";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -93836,8 +96210,8 @@ self: {
        pname = "nestedmap";
        version = "0.1.0.3";
        sha256 = "1his95sqzyr5xb7iihz62vp9y32smf5wy4ck81yrxdvkn6zvhajl";
-       buildDepends = [ base base-unicode-symbols containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base base-unicode-symbols containers ];
+       testHaskellDepends = [
          base base-unicode-symbols containers data-ordlist hspec QuickCheck
        ];
        jailbreak = true;
@@ -93853,7 +96227,7 @@ self: {
        pname = "net-concurrent";
        version = "0.1.0";
        sha256 = "0ar5y38nqgh10y23yxjcz0vlvdj2hcp2b2kq0srmbh17iw8d8906";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers ghc-binary hslogger monad-loops network
        ];
        jailbreak = true;
@@ -93869,7 +96243,7 @@ self: {
        pname = "netclock";
        version = "0.6";
        sha256 = "0vskyczfhv9bszl2hnr6j9cvhkfampja5s41kh6i9wk8j9kpf9p8";
-       buildDepends = [ base bytestring hosc network ];
+       libraryHaskellDepends = [ base bytestring hosc network ];
        homepage = "http://netclock.slab.org/";
        description = "Netclock protocol";
        license = stdenv.lib.licenses.gpl3;
@@ -93886,12 +96260,12 @@ self: {
        pname = "netcore";
        version = "1.0.0";
        sha256 = "0biqhmfvszwmmnpgja6qk3k2s5ynx4l659zq9awrxr0637dc19a5";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base bimap binary binary-strict bytestring
          containers fgl HList hslogger mtl multiset network parsec process
          random syb
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-wl-pprint base bimap binary binary-strict bytestring
          containers fgl HList hslogger HUnit mtl multiset network parsec
          process QuickCheck random syb test-framework test-framework-hunit
@@ -93914,9 +96288,10 @@ self: {
        sha256 = "006ca49rhh09lz8did0sil2f0xp1ggk69d4dqb2kx12drijp1jgj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring contstuff enumerator HTF random text time
+       libraryHaskellDepends = [
+         base bytestring contstuff enumerator text time
        ];
+       executableHaskellDepends = [ base HTF random ];
        description = "Enumerator tools for text-based network protocols";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93930,10 +96305,10 @@ self: {
        pname = "netlink";
        version = "0.1";
        sha256 = "0w2iyxmmk53k8gg0i8g3339dkdlpjgj39ar0kmsrzhxa6nakclwn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers monad-loops unix
        ];
-       buildTools = [ c2hs ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        homepage = "http://netlink-hs.googlecode.com/";
        description = "Netlink communication for Haskell";
@@ -93946,7 +96321,7 @@ self: {
        pname = "netlist";
        version = "0.3.1";
        sha256 = "0f3fwgpg0p3ajgxfzbqr4z04ly5cdbhjxms5xbd0k2ixdwgyxm67";
-       buildDepends = [ base binary containers syb ];
+       libraryHaskellDepends = [ base binary containers syb ];
        description = "Netlist AST";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93957,7 +96332,7 @@ self: {
        pname = "netlist-to-vhdl";
        version = "0.3.2";
        sha256 = "107pkkihj62qjkfwrnhwfscpph5r76lx6r3s0m3b0dbsf1jy2a61";
-       buildDepends = [ base netlist pretty ];
+       libraryHaskellDepends = [ base netlist pretty ];
        description = "Convert a Netlist AST to VHDL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93971,11 +96346,11 @@ self: {
        pname = "netpbm";
        version = "1.0.1";
        sha256 = "02gj7m7gmislrkpk0mn5qb66z77zqy2k3py5c965bcjm086pk3fc";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-binary base bytestring storable-record
          unordered-containers vector vector-th-unbox
        ];
-       testDepends = [ base bytestring hspec HUnit vector ];
+       testHaskellDepends = [ base bytestring hspec HUnit vector ];
        homepage = "https://github.com/nh2/haskell-netpbm";
        description = "Loading PBM, PGM, PPM image files";
        license = stdenv.lib.licenses.mit;
@@ -93988,11 +96363,11 @@ self: {
      mkDerivation {
        pname = "netrc";
        version = "0.2.0.0";
-       revision = "1";
        sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls";
+       revision = "1";
        editedCabalFile = "55e4e8785866fa2145f9b4de21522d4092a7c486845062915704b2917b8c4fbd";
-       buildDepends = [ base bytestring deepseq parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq parsec ];
+       testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-quickcheck
        ];
        homepage = "https://github.com/hvr/netrc";
@@ -94008,7 +96383,7 @@ self: {
        pname = "netspec";
        version = "0.2.0.0";
        sha256 = "0qmca5pf6r0zam86a8wghs3ylsmvd4cxk9g3nlv2gc3vl3fb8caq";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary bytestring mtl network template-haskell text
          transformers
        ];
@@ -94025,7 +96400,9 @@ self: {
        pname = "netstring-enumerator";
        version = "0.1.1";
        sha256 = "1n1g8d8507i0k4i93wb4i6yh7j7l3r0d9dfgxwl02hsk1svk5hkm";
-       buildDepends = [ base bytestring enumerator transformers ];
+       libraryHaskellDepends = [
+         base bytestring enumerator transformers
+       ];
        jailbreak = true;
        homepage = "https://john-millikin.com/software/netstring-enumerator/";
        description = "Enumerator-based netstring parsing";
@@ -94034,28 +96411,27 @@ self: {
 
   "nettle" = callPackage
     ({ mkDerivation, array, base, byteable, bytestring
-     , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle
-     , QuickCheck, securemem, tagged, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
+     , crypto-cipher-tests, crypto-cipher-types, HUnit, QuickCheck
+     , securemem, tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "nettle";
        version = "0.1.1";
        sha256 = "1l9515ks41b9rkcxv91d391lwl87k2ipl3j5qfjcdz1qaxrnjkyr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem tagged
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring crypto-cipher-tests crypto-cipher-types HUnit
          QuickCheck tagged test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       pkgconfigDepends = [ nettle ];
        homepage = "https://github.com/stbuehler/haskell-nettle";
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) nettle;};
+     }) {};
 
   "nettle-frp" = callPackage
     ({ mkDerivation, base, bimap, binary, bytestring, containers, mtl
@@ -94065,7 +96441,7 @@ self: {
        pname = "nettle-frp";
        version = "0.1.1";
        sha256 = "0jkb9a3vci91gx1rj81jbanhf0xw7n4xk69a5nhy7b55vclv8lcr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bimap binary bytestring containers mtl nettle-openflow network
          network-data random time
        ];
@@ -94083,7 +96459,7 @@ self: {
        pname = "nettle-netkit";
        version = "0.2.0";
        sha256 = "152i4mdmqfrbvzq4nfzl8vy2n3jczbn18wd2mjxng1130l86cylp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath mtl nettle-openflow unix
        ];
        description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs";
@@ -94099,7 +96475,7 @@ self: {
        pname = "nettle-openflow";
        version = "0.2.0";
        sha256 = "1jc9dpsz8s6ivmkmddxy7i8kyiqf93x8rhnxly357nxlgmsn5dgk";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bimap binary binary-strict bytestring containers HList
          mtl network parsec syb
        ];
@@ -94118,10 +96494,11 @@ self: {
        sha256 = "1izl4iarcc6z2j0d6gkcygpp63asajikn1p44p8ixwzx96xx578r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq parallel profunctors random semigroups time
          transformers
        ];
+       executableHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://hub.darcs.net/ertes/netwire";
        description = "Functional reactive programming library";
@@ -94134,7 +96511,7 @@ self: {
        pname = "netwire-input";
        version = "0.0.4";
        sha256 = "1f0dczgnc1fibq5ypdzi1hgsahmbfmv783bliwh5x4j4vm81k0h6";
-       buildDepends = [ base netwire ];
+       libraryHaskellDepends = [ base netwire ];
        homepage = "https://www.github.com/Mokosha/netwire-input";
        description = "Input handling abstractions for netwire";
        license = stdenv.lib.licenses.mit;
@@ -94149,7 +96526,9 @@ self: {
        sha256 = "163jd8bb0msy9r51s8qb6ypk25lax46kkbzq9wh2s4kvzribmdlg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers GLFW-b mtl netwire-input stm ];
+       libraryHaskellDepends = [
+         base containers GLFW-b mtl netwire-input stm
+       ];
        homepage = "https://www.github.com/Mokosha/netwire-input-glfw";
        description = "GLFW instance of netwire-input";
        license = stdenv.lib.licenses.mit;
@@ -94163,8 +96542,8 @@ self: {
        pname = "network";
        version = "2.6.2.1";
        sha256 = "1yhvpd4wigz165jvyvw9zslx7lgqdj63jh3zv5s74b5ykdfa3zd3";
-       buildDepends = [ base bytestring unix ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit
        ];
        homepage = "https://github.com/haskell/network";
@@ -94182,8 +96561,9 @@ self: {
        sha256 = "0pz6x11naxzby14jxrm31j2jdd6gwqspbrx1hv5204rbf7lifib1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal criterion ];
-       testDepends = [
+       libraryHaskellDepends = [ base Cabal ];
+       executableHaskellDepends = [ base Cabal criterion ];
+       testHaskellDepends = [
          base Cabal QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -94202,11 +96582,11 @@ self: {
        pname = "network-anonymous-i2p";
        version = "0.10.0";
        sha256 = "0b7z7w105l1yd3xpnnl2z779m5zknf756cslksbbpsy16rn7kxfg";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring exceptions mtl network
          network-attoparsec network-simple text transformers uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring exceptions hspec hspec-attoparsec
          hspec-expectations mtl network network-simple transformers uuid
        ];
@@ -94228,12 +96608,14 @@ self: {
        sha256 = "1zssb8npwnzj8mra8pkvshni7h36wqhddva9rrwbq480492sck1w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base32string bytestring exceptions hexstring
-         network network-attoparsec network-simple socks splice text
-         transformers
+         network network-attoparsec network-simple socks text transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base exceptions network network-simple splice
+       ];
+       testHaskellDepends = [
          attoparsec base base32string bytestring exceptions hspec
          hspec-attoparsec hspec-expectations network network-simple socks
          text transformers
@@ -94252,7 +96634,7 @@ self: {
        pname = "network-api-support";
        version = "0.2.0";
        sha256 = "01ambd53cf2n4y3c1j62wav3jz09s5vml87gkg69bl6h1g63zls1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring case-insensitive http-client
          http-client-tls http-types text time tls
        ];
@@ -94271,11 +96653,11 @@ self: {
        pname = "network-attoparsec";
        version = "0.12.2";
        sha256 = "1w08py367mmwfg5lff6y9s6hdpg1nbjf7v6vv9s19aw6saxak44p";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring enclosed-exceptions exceptions
          lifted-base monad-control mtl network transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring exceptions hspec mtl network
          network-simple transformers
        ];
@@ -94295,7 +96677,11 @@ self: {
        sha256 = "0gw04wh24j4vpyvx0wy0bdhh3dkwdxrg2laq7vsvwlpzwgcny99h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring cookie HTTP http-client http-types
+         network text time unordered-containers vector
+       ];
+       executableHaskellDepends = [
          aeson attoparsec base bytestring cookie HTTP http-client http-types
          network QuickCheck text time unordered-containers vector
        ];
@@ -94315,10 +96701,13 @@ self: {
        sha256 = "0faa3clz80158m9cy4mblnszla6k9hbf8bdwp5cam05dwmvsdcyw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ aeson base bytestring shelly text yaml ];
+       executableHaskellDepends = [
          aeson base bytestring optparse-applicative shelly text yaml
        ];
-       testDepends = [ base cabal-test-bin hspec hspec-server process ];
+       testHaskellDepends = [
+         base cabal-test-bin hspec hspec-server process
+       ];
        description = "Linux NetworkNameSpace Builder";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94330,7 +96719,7 @@ self: {
        pname = "network-bytestring";
        version = "0.1.3.4";
        sha256 = "19m10mj9nqsa7s0syv9dyhqkhvmf2h7yna8n7bq0xkdp8m9l0g96";
-       buildDepends = [ base bytestring network unix ];
+       libraryHaskellDepends = [ base bytestring network unix ];
        jailbreak = true;
        homepage = "http://github.com/tibbe/network-bytestring";
        description = "Fast, memory-efficient, low-level networking";
@@ -94344,7 +96733,9 @@ self: {
        pname = "network-carbon";
        version = "1.0.5";
        sha256 = "0kb3gz8545dgi93ys9pk240vap7zjnl2npn1xryng2ijl7ssn9li";
-       buildDepends = [ base bytestring network text time vector ];
+       libraryHaskellDepends = [
+         base bytestring network text time vector
+       ];
        homepage = "http://github.com/ocharles/network-carbon";
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
@@ -94356,7 +96747,7 @@ self: {
        pname = "network-conduit";
        version = "1.1.0";
        sha256 = "06amxl8rg4zfnmgc1iyq5mxy9qihcqddqgqkbfvaf25mwr43992p";
-       buildDepends = [ base conduit ];
+       libraryHaskellDepends = [ base conduit ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Stream socket data using conduits. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -94371,12 +96762,12 @@ self: {
        pname = "network-conduit-tls";
        version = "1.2.0.1";
        sha256 = "17d267sg74snq626kk8n9yy9njspjzivwjg60l69879z4nsvp200";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra connection cprng-aes
          data-default monad-control network streaming-commons tls
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit conduit-extra connection HUnit mtl
        ];
        homepage = "https://github.com/snoyberg/conduit";
@@ -94392,7 +96783,7 @@ self: {
        pname = "network-connection";
        version = "0.1.1";
        sha256 = "0v3dwq5vxmgknsiq2nddfj3gvvvaxdlfsnk0bxrqw9zzzdkpi0q1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers network network-bytestring stm
        ];
        homepage = "http://darcs.imperialviolet.org/network-connection";
@@ -94407,7 +96798,7 @@ self: {
        pname = "network-data";
        version = "0.5.3";
        sha256 = "0zbwplzrr899lj0ig2nyq58cayy6f8pkn4wnqbrd1i50lhq61szz";
-       buildDepends = [ base bytestring cereal pretty ];
+       libraryHaskellDepends = [ base bytestring cereal pretty ];
        description = "Library for network data structures and their serialization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94420,7 +96811,7 @@ self: {
        pname = "network-dbus";
        version = "0.0";
        sha256 = "024h0gfgn7hmfh90y74nf03kpvj5mg74a54lgb6clvxxfp8j64w9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers mtl network parsec unix
          utf8-string
        ];
@@ -94438,7 +96829,7 @@ self: {
        pname = "network-dns";
        version = "1.0.0.1";
        sha256 = "0gg1g1gnbi6dzw5anz3dam2gh09q948d3k7q84agkswa64c0azn8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal containers data-textual hashable
          network-ip parsers tagged text-latin1 text-printer
        ];
@@ -94455,7 +96846,9 @@ self: {
        pname = "network-enumerator";
        version = "0.1.5";
        sha256 = "11hwgdw03a39k3akjy5qlg9zsb7z8qiikvdmcqr2dhj6ykmfwsvk";
-       buildDepends = [ base bytestring enumerator network transformers ];
+       libraryHaskellDepends = [
+         base bytestring enumerator network transformers
+       ];
        homepage = "https://john-millikin.com/software/network-enumerator/";
        description = "Enumerators for network sockets";
        license = stdenv.lib.licenses.mit;
@@ -94467,7 +96860,7 @@ self: {
        pname = "network-fancy";
        version = "0.2.3";
        sha256 = "1b4hbwqbir3qw3hs1mxdqdz0lnagyqrp5r383b6cm7yvjy3q3if5";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/taruti/network-fancy";
        description = "Networking support with a cleaner API";
        license = stdenv.lib.licenses.bsd3;
@@ -94479,7 +96872,7 @@ self: {
        pname = "network-house";
        version = "0.1.0.1";
        sha256 = "0s9ysp28nd29q2g62w7ch5h7l2kxdjfqqbz4h70vg8py3zs5gfqn";
-       buildDepends = [ array base containers mtl ];
+       libraryHaskellDepends = [ array base containers mtl ];
        homepage = "https://github.com/nh2/network-house";
        description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP";
        license = stdenv.lib.licenses.gpl2;
@@ -94492,7 +96885,7 @@ self: {
        pname = "network-info";
        version = "0.2.0.7";
        sha256 = "0pa0051ji3sr8ax8z1gfgj8x0wvvr20i1zkxs28hq4hdsv1y4dpg";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/jystic/network-info";
        description = "Access the local computer's basic network configuration";
        license = stdenv.lib.licenses.bsd3;
@@ -94504,7 +96897,7 @@ self: {
        pname = "network-interfacerequest";
        version = "0.0.1";
        sha256 = "0qa5rbbcw9axg7mj4kjj027hfsclnw85cj8nmi6jvrzq2yhhk56c";
-       buildDepends = [ base bytestring ioctl network ];
+       libraryHaskellDepends = [ base bytestring ioctl network ];
        jailbreak = true;
        description = "Haskell bindings for the ifreq structure";
        license = stdenv.lib.licenses.bsd3;
@@ -94519,11 +96912,11 @@ self: {
        pname = "network-ip";
        version = "0.2.1.1";
        sha256 = "0abc07pi39drsldhk4znlq1j6cv0vxm7y8yyg2z4qanb3sy990iy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary cereal data-default-class data-dword data-endian
          data-textual hashable parsers text-printer type-hint
        ];
-       testDepends = [
+       testHaskellDepends = [
          base data-dword data-textual parsers tasty tasty-quickcheck
          text-printer
        ];
@@ -94540,7 +96933,7 @@ self: {
        pname = "network-metrics";
        version = "0.4";
        sha256 = "0dvrjf84pdm42pxwc7fm4gvswc5nzmdsq7cr7ab8jyzvjqb8684c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-default network random time
        ];
        homepage = "http://github.com/brendanhay/network-metrics";
@@ -94558,7 +96951,7 @@ self: {
        pname = "network-minihttp";
        version = "0.2";
        sha256 = "104jfksb0xagd8am3h390avqqr3k7qgxcd0znppz4hr0p9d681f5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary binary-strict bytestring containers filepath HsOpenSSL
          mtl network network-bytestring network-connection network-dns
          old-locale stm tagsoup time unix
@@ -94575,7 +96968,7 @@ self: {
        pname = "network-msg";
        version = "0.5";
        sha256 = "0ykphm5xljxml4ifx2v2f7f51kny170k552sy5l4f5paciv47a1g";
-       buildDepends = [ base binary bytestring network unix ];
+       libraryHaskellDepends = [ base binary bytestring network unix ];
        description = "Recvmsg and sendmsg bindings";
        license = "unknown";
      }) {};
@@ -94586,7 +96979,7 @@ self: {
        pname = "network-multicast";
        version = "0.0.11";
        sha256 = "0fgscv9crk2lx99rh234ipgl5psbrjili95inxj23drvwmsj3135";
-       buildDepends = [ base network ];
+       libraryHaskellDepends = [ base network ];
        description = "Simple multicast library";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -94599,7 +96992,7 @@ self: {
        pname = "network-netpacket";
        version = "0.0.1";
        sha256 = "12q3bqy57lj46m3l44zdk3sqkhbnqfd5cjp3qy1m5m5wxfdnmx56";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring foreign-storable-asymmetric ioctl network
          network-interfacerequest
        ];
@@ -94616,7 +97009,7 @@ self: {
        pname = "network-pgi";
        version = "0.0.1";
        sha256 = "0s0rk3q1nlic2ibcpr0px0kb8gwp2hbnra5109l71q3dr713n2yw";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring enumerator tnet
        ];
        description = "Library for writing PGI applications";
@@ -94631,7 +97024,7 @@ self: {
        pname = "network-protocol-xmpp";
        version = "0.4.8";
        sha256 = "07hy8byhaakjwfidrvkjp07jn25aw21g8wcs93ni3njj0kh2jxza";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring gnuidn gnutls gsasl libxml-sax monads-tf network
          text transformers xml-types
        ];
@@ -94649,7 +97042,7 @@ self: {
        pname = "network-rpca";
        version = "0.0.1";
        sha256 = "1dhy4n0502rx66pansmgmjv8avwwbhvf23afhb98zqksqlkavdir";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary binary-strict bytestring codec-libevent
          containers control-timeout network network-bytestring stm
        ];
@@ -94666,7 +97059,8 @@ self: {
        sha256 = "0iijgw07b5g3rcd4va98pb4hdkk912c67y2d1lkz03bfyq75b6xk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base network unix ];
+       libraryHaskellDepends = [ base network unix ];
+       executableHaskellDepends = [ base network unix ];
        description = "A light abstraction over sockets & co. for servers";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94682,14 +97076,16 @@ self: {
        sha256 = "1js0p0i27fj8rjnq54pcq97bgvhdx7jpwj1ghqmdwpvhn8ds07p4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring network
+       ];
+       executableHaskellDepends = [
          base base64-bytestring bytestring network network-simple
        ];
        jailbreak = true;
        homepage = "https://github.com/angerman/network-service";
        description = "Provide a service at the data type level";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-simple" = callPackage
@@ -94700,7 +97096,9 @@ self: {
        pname = "network-simple";
        version = "0.4.0.4";
        sha256 = "0qa3ax29ci7m01af0d2rvnx9m24q1d9zw727bzhc88k2g6k2xzah";
-       buildDepends = [ base bytestring exceptions network transformers ];
+       libraryHaskellDepends = [
+         base bytestring exceptions network transformers
+       ];
        homepage = "https://github.com/k0001/network-simple";
        description = "Simple network sockets usage patterns";
        license = stdenv.lib.licenses.bsd3;
@@ -94714,7 +97112,7 @@ self: {
        pname = "network-simple-sockaddr";
        version = "0.2";
        sha256 = "0c7jjdpzvbpg29njr1w0kn26m3pxa8q1z3sh7bfh933spnvqm52x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory exceptions network transformers
        ];
        homepage = "https://github.com/jdnavarro/network-simple-sockaddr";
@@ -94730,7 +97128,7 @@ self: {
        pname = "network-simple-tls";
        version = "0.2.1";
        sha256 = "0hbpxbs357bxifksbqrlrdkwkkfaydxcf9wdla6kafaymhrxhc0k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring certificate cprng-aes exceptions network
          network-simple tls tls-extra transformers
        ];
@@ -94747,7 +97145,7 @@ self: {
        pname = "network-socket-options";
        version = "0.2.0.1";
        sha256 = "00qf22nwzsv8229gb7yqaaafiz573xl4v78mn1zf9ajvwzvwb63r";
-       buildDepends = [ base network ];
+       libraryHaskellDepends = [ base network ];
        homepage = "https://github.com/joeyadams/haskell-network-socket-options";
        description = "Type-safe, portable alternative to getSocketOption/setSocketOption";
        license = stdenv.lib.licenses.bsd3;
@@ -94761,7 +97159,7 @@ self: {
        pname = "network-stream";
        version = "0.1.0";
        sha256 = "1y7c2m8yrkb67iqqv6sjbxxmhlnv0s6k82lv9f6wk4mhckcsc5n1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal enumerator network stm text
          transformers
        ];
@@ -94782,7 +97180,7 @@ self: {
        sha256 = "1l5m9f08aizrxxkv2dspv8swf558cch6vx4gyzs6qs6826v9q32b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bayes-stack bimap bytestring cereal containers deepseq
          directory filepath logfloat mwc-random optparse-applicative
          random-fu statistics stm text transformers vector
@@ -94802,7 +97200,7 @@ self: {
        pname = "network-transport";
        version = "0.4.2.0";
        sha256 = "0arwy5csrm33217rmnip6b0x61b6am1db6mj5phfysj0pz30viqf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring deepseq hashable transformers
        ];
        homepage = "http://haskell-distributed.github.com";
@@ -94819,15 +97217,15 @@ self: {
      mkDerivation {
        pname = "network-transport-amqp";
        version = "0.1.0.0";
-       revision = "2";
        sha256 = "1165xl5g8m423y4nvzwpihzrv6nc9y2dyr6dm4sqp6n1bw4dqqdq";
+       revision = "2";
        editedCabalFile = "724410b5035d55d170110908838d023a675306faf5fc056ed2a8d68beeb112d4";
-       buildDepends = [
+       libraryHaskellDepends = [
          amqp async base bytestring cereal containers exceptions lens-family
          lens-family-th network-transport stm stm-chans string-conv text
          uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          amqp base network-transport network-transport-tests tasty
          tasty-hunit
        ];
@@ -94845,10 +97243,12 @@ self: {
        pname = "network-transport-inmemory";
        version = "0.5.0";
        sha256 = "1znc4xk6arzi6vr8pfv2vyvak377jpxzzq82r17kz4csdrbnbfw6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-accessor network-transport stm
        ];
-       testDepends = [ base network-transport network-transport-tests ];
+       testHaskellDepends = [
+         base network-transport network-transport-tests
+       ];
        homepage = "http://haskell-distributed.github.com";
        description = "In-memory instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
@@ -94862,10 +97262,10 @@ self: {
        pname = "network-transport-tcp";
        version = "0.4.2";
        sha256 = "0wh3d37cfmqbxa0x9c56miki7m9mpg0xv5rrn8fh562lfvcn89ls";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-accessor network network-transport
        ];
-       testDepends = [
+       testHaskellDepends = [
          base network network-transport network-transport-tests
        ];
        homepage = "http://haskell-distributed.github.com";
@@ -94881,7 +97281,7 @@ self: {
        pname = "network-transport-tests";
        version = "0.2.2.0";
        sha256 = "0914sj3884sp5sxbm460x5frvl0ipn8v1jpkskhc9ajjx4v0s106";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring containers mtl network-transport
          random
        ];
@@ -94903,12 +97303,15 @@ self: {
        sha256 = "0bfznyxf893k0yf4cm53bmmcpyrs7llpf6fd077rccn37x1kj0ih";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base binary bytestring containers criterion data-accessor
-         distributed-process exceptions network-transport random semigroups
-         stm stm-chans transformers zeromq4-haskell
+       libraryHaskellDepends = [
+         async base binary bytestring containers data-accessor exceptions
+         network-transport random semigroups stm stm-chans transformers
+         zeromq4-haskell
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base binary bytestring criterion distributed-process
+       ];
+       testHaskellDepends = [
          base bytestring containers distributed-process-tests network
          network-transport network-transport-tests stm stm-chans tasty
          tasty-hunit test-framework zeromq4-haskell
@@ -94917,7 +97320,6 @@ self: {
        homepage = "https://github.com/tweag/network-transport-zeromq";
        description = "ZeroMQ backend for network-transport";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-uri" = callPackage
@@ -94928,8 +97330,8 @@ self: {
        pname = "network-uri";
        version = "2.6.0.3";
        sha256 = "1pwbqb2rk4rnvllvdch42p5368xcvpkanp7bxckdhxya8zzwvhhg";
-       buildDepends = [ base deepseq parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq parsec ];
+       testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -94944,8 +97346,8 @@ self: {
        pname = "network-uri-static";
        version = "0.1.0.0";
        sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9";
-       buildDepends = [ base network-uri template-haskell ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base network-uri template-haskell ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/snakamura/network-uri-static";
        description = "A small utility to declare type-safe static URIs";
        license = stdenv.lib.licenses.mit;
@@ -94957,7 +97359,7 @@ self: {
        pname = "network-wai-router";
        version = "0.3.0.1";
        sha256 = "1fnqc1vbahy6zy632s9kam8bv7108bhmynyh2iwkqb7ybkkj37i9";
-       buildDepends = [ base wai ];
+       libraryHaskellDepends = [ base wai ];
        description = "A routing library for wai";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -94970,7 +97372,7 @@ self: {
        sha256 = "053qrlm2bd14mlcvlh64awsqsgn355nkr13k9h4dnfabafymkkbm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base haskell98 network webserver ];
+       libraryHaskellDepends = [ base haskell98 network webserver ];
        jailbreak = true;
        homepage = "http://github.com/michaelmelanson/network-websocket";
        description = "WebSocket library";
@@ -94986,7 +97388,7 @@ self: {
        pname = "networked-game";
        version = "0.1.0.1";
        sha256 = "12sy97cgqrsmqywh0cznp8wbsw8z2yahlfalsjy32qarcz44banz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers network time transformers
        ];
        jailbreak = true;
@@ -95002,7 +97404,7 @@ self: {
        sha256 = "1paxqr8rm8lbp0896qsd7v76c0kahkk6fngpcdzswbrqpyqhwjwc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory old-time ];
+       executableHaskellDepends = [ base directory old-time ];
        homepage = "http://www.b7j0c.org/content/haskell-newports.html";
        description = "List ports newer than N days on a FreeBSD system";
        license = stdenv.lib.licenses.bsd3;
@@ -95019,7 +97421,10 @@ self: {
        sha256 = "1c65s4nwxzlmix0549chhvm5wj4rvxq92y5kfzd9h11jc4hxl7xs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers fixedprec random superdoc time ];
+       libraryHaskellDepends = [
+         base containers fixedprec random superdoc
+       ];
+       executableHaskellDepends = [ base random superdoc time ];
        jailbreak = true;
        homepage = "http://www.mathstat.dal.ca/~selinger/newsynth/";
        description = "Exact and approximate synthesis of quantum circuits";
@@ -95039,10 +97444,14 @@ self: {
        sha256 = "0amhpvqqy8pan3vihjvpkd25jz3m4syavw4l15cvqny8mhrxbvpj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cmdargs containers directory filemanip
-         filepath HUnit mtl process QuickCheck safe test-framework
-         test-framework-hunit test-framework-quickcheck2 text Unixutils uuid
+         filepath mtl process safe text Unixutils
+       ];
+       executableHaskellDepends = [
+         base cmdargs containers directory filepath HUnit mtl process
+         QuickCheck safe test-framework test-framework-hunit
+         test-framework-quickcheck2 Unixutils uuid
        ];
        jailbreak = true;
        description = "A trivially simple app to create things from simple templates";
@@ -95056,7 +97465,7 @@ self: {
        pname = "newtype";
        version = "0.2";
        sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A typeclass and set of functions for working with newtypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95069,7 +97478,7 @@ self: {
        pname = "newtype-deriving";
        version = "0.1.2";
        sha256 = "15ajk0vbh4habil8339naajy7l086cryqw52ifv1agjyn9kmlixa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude monad-control template-haskell transformers
          transformers-base
        ];
@@ -95084,8 +97493,8 @@ self: {
        pname = "newtype-generics";
        version = "0.4.1";
        sha256 = "1qjzcmx5yj85cvdgglyg9f9ff7k9gvnyrb85n6bjzyh10q9n7vd5";
-       buildDepends = [ base ];
-       testDepends = [ base hspec HUnit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec HUnit ];
        description = "A typeclass and set of functions for working with newtypes, with generics support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95098,7 +97507,7 @@ self: {
        pname = "newtype-th";
        version = "0.3.3";
        sha256 = "1slgphymjxzbxxgsilfijkhiwapfy2gkhkby2dxqj107v4s0788k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta newtype syb template-haskell
        ];
        jailbreak = true;
@@ -95114,7 +97523,7 @@ self: {
        pname = "newtyper";
        version = "0.1";
        sha256 = "1s1mzy1m3wpawv1ci85dl02105v550l1fdi5rxi5gqnxb0jrg4fs";
-       buildDepends = [ base Kleislify newtype ];
+       libraryHaskellDepends = [ base Kleislify newtype ];
        homepage = "https://github.com/techtangents/Newtyper";
        description = "Extra functions for the Control.Newtype typeclass";
        license = stdenv.lib.licenses.bsd3;
@@ -95126,7 +97535,7 @@ self: {
        pname = "nextstep-plist";
        version = "0.0.1";
        sha256 = "0wld4nc6hcv642km60vvjyclsfwnpfavq59mqm8fm3a73al4csyw";
-       buildDepends = [ base parsec pretty QuickCheck ];
+       libraryHaskellDepends = [ base parsec pretty QuickCheck ];
        description = "NextStep style plist parser and printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95137,7 +97546,7 @@ self: {
        pname = "nf";
        version = "1.0.1.0";
        sha256 = "1yrw6skp2n8fd874481bfalli8lcglakhdggdsj8dm036wpm935a";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/ezyang/nf";
        description = "NF data type to statically enforce normal form";
        license = stdenv.lib.licenses.bsd3;
@@ -95153,9 +97562,10 @@ self: {
        sha256 = "0z26mpk1q7hnx4vkcyfwy6pbm7nm76ydm04z3vk598q2ifq5vmpd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base machines mtl parseargs resourcet sqlite-simple text
+       libraryHaskellDepends = [
+         attoparsec base machines mtl resourcet sqlite-simple text
        ];
+       executableHaskellDepends = [ base parseargs ];
        jailbreak = true;
        homepage = "http://github.com/YoEight/ngrams-loader";
        description = "Ngrams loader based on http://www.ngrams.info format";
@@ -95171,10 +97581,10 @@ self: {
        pname = "nibblestring";
        version = "0.0.3";
        sha256 = "0ijcv7ph09mmllly09jgigwiq64m05c7qkq2riki3mbza2skxbrr";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base base16-bytestring bytestring
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base16-bytestring bytestring containers HUnit test-framework
          test-framework-hunit
        ];
@@ -95191,7 +97601,7 @@ self: {
        sha256 = "0qpm18md4jmfznfxqbi9aqvlqrgmiab7b477s11hwcb6y00kyfwk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base nicify-lib ];
+       executableHaskellDepends = [ base nicify-lib ];
        description = "Pretty print the standard output of default `Show` instances";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95202,7 +97612,7 @@ self: {
        pname = "nicify-lib";
        version = "1.0.1";
        sha256 = "0cp76s0msf1i8a7pkzjl6qgi18n7zdya3pg90ml1dnidg5nzh9kx";
-       buildDepends = [ base parsec transformers ];
+       libraryHaskellDepends = [ base parsec transformers ];
        description = "Pretty print the standard output of default `Show` instances";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95218,11 +97628,11 @@ self: {
        sha256 = "01qbmkr9h78iwyrgdijqyf06xl8wk2z9nn4v8dc5pb1gknlbp8wh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base bytestring case-insensitive containers dns http-client
-         http-types iso639 lens lens-aeson random setlocale text wai warp
-         wreq xml-conduit
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-types iso639 lens lens-aeson random text wai wreq xml-conduit
        ];
+       executableHaskellDepends = [ base dns iso639 setlocale text warp ];
        jailbreak = true;
        homepage = "https://github.com/dahlia/nicovideo-translator";
        description = "Nico Nico Douga (ニコニコ動画) Comment Translator";
@@ -95240,7 +97650,7 @@ self: {
        sha256 = "1w7cvkh36p7i9n62rvfh6nlr8z16hds06fbr1lpvbc84ymci75v0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers filepath GoogleChart haskell98 haxr hs-twitter
          HStringTemplate HTTP hxt json network old-locale old-time
          regex-compat regex-posix syb time
@@ -95257,7 +97667,7 @@ self: {
        pname = "nimber";
        version = "0.1.3";
        sha256 = "0350fmddnfp09051i89fl5ibrxqy36cx5560l00cjssx2gs2dh8w";
-       buildDepends = [ arithmoi base ];
+       libraryHaskellDepends = [ arithmoi base ];
        homepage = "http://andersk.mit.edu/haskell/nimber/";
        description = "Finite nimber arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -95269,7 +97679,7 @@ self: {
        pname = "nitro";
        version = "0.2.2.5";
        sha256 = "17aqzk1kq670fwawia0qjmd8ld1b0h8zh0w8j8x4y48hlzyb75xb";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "http://haskell.gonitro.io";
        description = "Haskell bindings for Nitro";
@@ -95290,12 +97700,17 @@ self: {
        sha256 = "0pl00kiirpmhzsyr96gzkjrzps69vycpabrjjdq31ngckwqvjib1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring classy-prelude containers data-default
+         directory error-list filepath hnix MissingH mtl network-uri parsec
+         shelly system-filepath text text-render unordered-containers
+       ];
+       executableHaskellDepends = [
          aeson base bytestring classy-prelude containers data-default
          directory docopt error-list filepath hnix MissingH mtl network-uri
          parsec shelly system-filepath text text-render unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring classy-prelude containers data-default
          directory error-list filepath github hnix hspec hspec-expectations
          http-client-streams io-streams MissingH mtl network-uri parsec
@@ -95303,7 +97718,6 @@ self: {
        ];
        description = "Generate nix expressions from npm packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nixos-types" = callPackage
@@ -95328,7 +97742,7 @@ self: {
        sha256 = "1i9q0xyfqi3cv29k8yflrg34hgblxfyj2dqr1zjg20jpymsfi06l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-named filepath polysoup tar text
          zlib
        ];
@@ -95344,7 +97758,7 @@ self: {
        pname = "nlp-scores";
        version = "0.7.0";
        sha256 = "0cxa6f4y3416hlal4wnqf0qpq82zj9x58nprnaw3s2kdxxav0d9m";
-       buildDepends = [ base containers strict ];
+       libraryHaskellDepends = [ base containers strict ];
        homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "Scoring functions commonly used for evaluation in NLP and IR";
        license = stdenv.lib.licenses.bsd3;
@@ -95358,7 +97772,9 @@ self: {
        sha256 = "02jisx8slzzljv77d931b169hxq6i6ajg5ly9a37g13q9h75gd2c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers nlp-scores split text ];
+       executableHaskellDepends = [
+         base containers nlp-scores split text
+       ];
        jailbreak = true;
        homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "NLP scoring command-line programs";
@@ -95373,9 +97789,10 @@ self: {
        sha256 = "028p25pb2cqlvrydy87y26rinvypbq0lnphd59k3zaxvxxikqwf1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base vector ];
-       extraLibraries = [ g nm-glib ];
-       pkgconfigDepends = [ glib libnm-glib ];
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ g nm-glib ];
+       libraryPkgconfigDepends = [ glib libnm-glib ];
+       executableHaskellDepends = [ base ];
        description = "Network Manager, binding to libnm-glib";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95388,7 +97805,7 @@ self: {
        pname = "nme";
        version = "0.2";
        sha256 = "14qzc4af1pm1myjdfs7z4b1jxxj0gz9c4cl9qgpm06hjzvjjf8wm";
-       buildDepends = [ base bytestring utf8-string ];
+       libraryHaskellDepends = [ base bytestring utf8-string ];
        homepage = "https://github.com/singpolyma/NME-Haskell";
        description = "Bindings to the Nyctergatis Markup Engine";
        license = "unknown";
@@ -95403,7 +97820,7 @@ self: {
        pname = "nntp";
        version = "0.0.4";
        sha256 = "1yg91zai4krxx7yqzskss19jjgh4nvc2vqzddvpwsdm07lri8g35";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring monad-loops mtl network old-locale parsec time
        ];
        description = "Library to connect to an NNTP Server";
@@ -95417,8 +97834,8 @@ self: {
        pname = "no-role-annots";
        version = "1.1";
        sha256 = "1kk9ii5w40di3azlqzbz4vkvwdz8apca0lh4jn94nvr3hns6l5s7";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/goldfirere/no-role-annots";
        description = "Role annotations without -XRoleAnnotations";
        license = stdenv.lib.licenses.bsd3;
@@ -95432,7 +97849,7 @@ self: {
        sha256 = "04n056gsxv61igdvdysqkxbsz1a5bvkzfnsbrz03ixjgaqg2whfl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers regex-compat ];
+       executableHaskellDepends = [ array base containers regex-compat ];
        homepage = "https://ghc.haskell.org/trac/ghc/wiki/Building/RunningNoFib";
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
@@ -95449,11 +97866,14 @@ self: {
        sha256 = "0h9aq4f8n1acmzhdq185y0adl35cf7avms6zvgsyf9lkx2msja0q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-markup blaze-svg bytestring containers cryptohash
          network parsec
        ];
-       testDepends = [ base HTF HUnit parsec QuickCheck string-qq ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HTF HUnit parsec QuickCheck string-qq
+       ];
        jailbreak = true;
        homepage = "http://github.com/brow/noise";
        description = "A friendly language for graphic design";
@@ -95467,7 +97887,7 @@ self: {
        pname = "non-empty";
        version = "0.2.1";
        sha256 = "1p0jp44xlc77da5g5fq78vvgfv8r9z4m0axm36qbliv609rnp5g3";
-       buildDepends = [ base containers QuickCheck utility-ht ];
+       libraryHaskellDepends = [ base containers QuickCheck utility-ht ];
        homepage = "http://code.haskell.org/~thielema/non-empty/";
        description = "List-like structures with static restrictions on the number of elements";
        license = stdenv.lib.licenses.bsd3;
@@ -95479,8 +97899,8 @@ self: {
        pname = "non-negative";
        version = "0.1.1";
        sha256 = "163g3j3xrx1jkrbg2wnha3yyxyg1mn7kabmbpg82y3rbl3ihy1p7";
-       buildDepends = [ base QuickCheck utility-ht ];
-       testDepends = [ base QuickCheck utility-ht ];
+       libraryHaskellDepends = [ base QuickCheck utility-ht ];
+       testHaskellDepends = [ base QuickCheck utility-ht ];
        homepage = "http://code.haskell.org/~thielema/non-negative/";
        description = "Non-negative numbers";
        license = "GPL";
@@ -95494,7 +97914,7 @@ self: {
        pname = "nonce";
        version = "1.0.2";
        sha256 = "1l4w6bdrwa42r90n6xzwr8lz2fdrn3m763ls311pnygajr4ih10h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cprng-aes crypto-random text
          transformers
        ];
@@ -95509,7 +97929,7 @@ self: {
        pname = "nondeterminism";
        version = "1.0";
        sha256 = "0hxfqrm51svmr9lk1i8l5ib5bi5zlc92q6k3qwnvkqz8qgb4w8i0";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "A monad and monad transformer for nondeterministic computations";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95521,7 +97941,7 @@ self: {
        pname = "nonfree";
        version = "0.1.0.1";
        sha256 = "05jf3i9m58lwixd3mnj9ikgkrg1gdcxz7d8m5k5k5j3fdbbgbmqi";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Free structures sans laws";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95532,7 +97952,7 @@ self: {
        pname = "nonlinear-optimization";
        version = "0.3.10";
        sha256 = "11dq7fvysdb0szkg58f2wmx2vg6sa9qfj9kfv7wv6fl3386dnp7f";
-       buildDepends = [ base primitive vector ];
+       libraryHaskellDepends = [ base primitive vector ];
        description = "Various iterative algorithms for optimization of nonlinear functions";
        license = "GPL";
      }) {};
@@ -95547,9 +97967,10 @@ self: {
        sha256 = "0k3iynppdvmm9asy1wddp8n3gmskh40dmcngqv8pgy5qx0bnx8jd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         ad base csv nonlinear-optimization primitive reflection vector
+       libraryHaskellDepends = [
+         ad base nonlinear-optimization primitive reflection vector
        ];
+       executableHaskellDepends = [ base csv ];
        homepage = "https://github.com/msakai/nonlinear-optimization-ad";
        description = "Wrapper of nonlinear-optimization package for using with AD package";
        license = stdenv.lib.licenses.gpl3;
@@ -95563,7 +97984,8 @@ self: {
        sha256 = "08v5rz5skmaqxqj85l76kjxqmlhnf3vapgfdqd042cmh41zwznx0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath ];
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
        homepage = "https://github.com/jessopher/noodle";
        description = "the noodle programming language";
        license = "unknown";
@@ -95576,7 +97998,7 @@ self: {
        pname = "normaldistribution";
        version = "1.1.0.3";
        sha256 = "1q7p0bx435amqb7r9qksix0mrbpnqsyfb44chjyz6xkgjj0s6yvd";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        homepage = "https://github.com/bjornbm/normaldistribution";
        description = "Minimum fuss normally distributed random values";
        license = stdenv.lib.licenses.bsd3;
@@ -95591,7 +98013,7 @@ self: {
        pname = "not-gloss";
        version = "0.7.5.0";
        sha256 = "1r0mycb3ilz2k89vab08c1diz18mp03b5sds4ixmxfb0zqaz68lb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
          spatial-math time vector vector-binary-instances
        ];
@@ -95609,7 +98031,7 @@ self: {
        sha256 = "0dszimvwb78ac1zfp25iy8lhnsq0grjs6zrsiyr1d80fj9kmg49y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers GLUT linear not-gloss spatial-math X11
        ];
        description = "examples for not-gloss";
@@ -95623,7 +98045,7 @@ self: {
        pname = "not-in-base";
        version = "0.1.1";
        sha256 = "1mm1j0l3h8qxpk0bis4g1f6zp5407rkq2z5ldyr036frbvfwqaj5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/finnsson/not-in-base";
        description = "Useful utility functions that only depend on base";
        license = "unknown";
@@ -95635,8 +98057,8 @@ self: {
        pname = "notcpp";
        version = "0.2.0.3";
        sha256 = "15aa96zdz60x9wc9k8ad5qkc4bs5rbgm9xvsykf3ppyys2z449ca";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        description = "Avoiding the C preprocessor via cunning use of Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95651,10 +98073,10 @@ self: {
        sha256 = "0znbsvbjj3995mn04zaxgv0q90qplwjkwhwjkmz1k5jxajxgwwzj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers filepath old-locale parseargs time
-       ];
-       extraLibraries = [ notmuch ];
+       libraryHaskellDepends = [ base containers filepath time ];
+       librarySystemDepends = [ notmuch ];
+       executableHaskellDepends = [ base old-locale parseargs ];
+       executableSystemDepends = [ notmuch ];
        description = "Binding for notmuch MUA library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95678,7 +98100,7 @@ self: {
        sha256 = "1jjk3fhzhpf9wrgk980rgp55kji5zjzdl0xyi4wgz3xvn1k8hrhs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder blaze-html
          blaze-markup bytestring case-insensitive conduit containers
          data-default directory email-validate filepath hamlet hashable
@@ -95688,7 +98110,8 @@ self: {
          unordered-containers vector wai wai-extra warp xss-sanitize yaml
          yesod yesod-auth yesod-static
        ];
-       testDepends = [
+       executableHaskellDepends = [ base pwstore-fast text yesod ];
+       testHaskellDepends = [
          base hspec HUnit mime-mail text yesod yesod-core yesod-test
        ];
        jailbreak = true;
@@ -95707,10 +98130,10 @@ self: {
        pname = "notzero";
        version = "0.0.10";
        sha256 = "0g4l4b5f6m3da172k9n49zkcisbv88b3601zabb474l6a80zrz8p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors lens mtl semigroupoids semigroups transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/notzero";
@@ -95724,7 +98147,7 @@ self: {
        pname = "np-extras";
        version = "0.3.0.1";
        sha256 = "19mj868qpvaqmv8j83hcfyrspbg24bc2vdad3gp1wcrrpbj7ib0m";
-       buildDepends = [ base containers numeric-prelude primes ];
+       libraryHaskellDepends = [ base containers numeric-prelude primes ];
        description = "NumericPrelude extras";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95737,7 +98160,7 @@ self: {
        pname = "np-linear";
        version = "0.3.0.2";
        sha256 = "00rmm36is8i6k1a0xyri61v09asc54fanlp5nai7k7vhp0wyfzz1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers numeric-prelude reflection tagged
        ];
        jailbreak = true;
@@ -95756,7 +98179,7 @@ self: {
        sha256 = "1zipawfk8l98bszi1yviv7ph96x1z715d3nlzs3w2mzahir57h3d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal array base bytestring colour containers HSH
          old-locale process split time unix
        ];
@@ -95772,8 +98195,10 @@ self: {
        pname = "nsis";
        version = "0.3";
        sha256 = "0w7mip0dxpzdfdxj8gdk58zfz5n4aasd60ql546hx3yv5r65dbq3";
-       buildDepends = [ base transformers uniplate ];
-       testDepends = [ base directory process transformers uniplate ];
+       libraryHaskellDepends = [ base transformers uniplate ];
+       testHaskellDepends = [
+         base directory process transformers uniplate
+       ];
        homepage = "https://github.com/ndmitchell/nsis#readme";
        description = "DSL for producing Windows Installer using NSIS";
        license = stdenv.lib.licenses.bsd3;
@@ -95787,8 +98212,12 @@ self: {
        sha256 = "0iq1658jfywni2yhk3aa1d4bnjjp8c9288bqfqxd8ayv87bvpirh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base opentheory-prime opentheory-primitive ];
-       testDepends = [ base opentheory-prime opentheory-primitive ];
+       executableHaskellDepends = [
+         base opentheory-prime opentheory-primitive
+       ];
+       testHaskellDepends = [
+         base opentheory-prime opentheory-primitive
+       ];
        description = "Computing the nth prime";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95799,7 +98228,7 @@ self: {
        pname = "nthable";
        version = "0.1";
        sha256 = "1qi1wq7wbnp3sv3c2v4185mnq80646vcsnqq16mqlshiy164wsly";
-       buildDepends = [ base type-level ];
+       libraryHaskellDepends = [ base type-level ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -95812,10 +98241,10 @@ self: {
        pname = "ntp-control";
        version = "0.1";
        sha256 = "14ns5lbvbdn0yrmfjp9rb4id19fxfd6dp68pgzm4lkh0xk0qnc4y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-lexing cereal network old-locale time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring bytestring-lexing cereal network old-locale time
        ];
        description = "Client library for NTP control messaging";
@@ -95830,7 +98259,7 @@ self: {
        pname = "null-canvas";
        version = "0.2.7";
        sha256 = "1i6krgxlbdmv5md1p3n5mcw3sk24f5sk6y7yiznx8glxncxmfdll";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers filepath scotty split stm text transformers
          wai-extra warp
        ];
@@ -95847,7 +98276,7 @@ self: {
        pname = "number";
        version = "0.1.0.0";
        sha256 = "1cl9s5qf7i0kixwqg27znmx4rvnckggpghs3hls77mq22igskd8p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library for real numbers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95858,7 +98287,7 @@ self: {
        pname = "numbering";
        version = "0.2.1";
        sha256 = "0hh4km2zbvs7rsb142f1rifqvwzajh0grgky2vyyyf48dk5plrlv";
-       buildDepends = [ base containers vector ];
+       libraryHaskellDepends = [ base containers vector ];
        homepage = "https://github.com/DanielSchuessler/numbering";
        description = "Combinators for creating bijections from some type to the natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -95872,8 +98301,8 @@ self: {
        pname = "numbers";
        version = "3000.2.0.1";
        sha256 = "10z1bi5qbc81z5xx2v1ylwcpmcfl1ci7lxrswkgi0dd1wi8havbk";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "https://github.com/jwiegley/numbers#readme";
@@ -95891,11 +98320,11 @@ self: {
        pname = "numerals";
        version = "0.4";
        sha256 = "1fkxlwf68bn353hs3622yqvlbndjnf263jbnh4q2rkj4xiirn4qm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols containers containers-unicode-symbols
          fingertree integer-gmp text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-unicode-symbols HUnit integer-gmp QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
@@ -95915,11 +98344,11 @@ self: {
        pname = "numerals-base";
        version = "0.3";
        sha256 = "0qp9xhsqvs22siyfwjzffqc1kbpsanbxks3pbjfdcmbcwlq7hpg8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols containers containers-unicode-symbols
          fingertree
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-unicode-symbols containers containers-unicode-symbols
          fingertree HUnit test-framework test-framework-hunit
        ];
@@ -95936,7 +98365,7 @@ self: {
        pname = "numeric-extras";
        version = "0.0.3";
        sha256 = "18jyjrk6iizz3sgkwgbh1rxf6zdf166bkgs7wia8b4z7f6261nzg";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/numeric-extras";
        description = "Useful tools from the C standard library";
        license = stdenv.lib.licenses.bsd3;
@@ -95948,7 +98377,7 @@ self: {
        pname = "numeric-limits";
        version = "0.1.0.0";
        sha256 = "0lsi0my45lpd30vjbwdbzhisz8r3lryvg1c80qcmwipnxklnr5cb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Various floating point limit related constants";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95960,12 +98389,12 @@ self: {
      mkDerivation {
        pname = "numeric-prelude";
        version = "0.4.2";
-       revision = "1";
        sha256 = "1i6qavz3av3dbf70li7yqsh184bl618l1sm9s9ia15srrkzsj9sk";
+       revision = "1";
        editedCabalFile = "acbf128b14ff1177ed767ec9ebb89b1c3c0e998d5d031fdd0e4bc64ebc6bffe2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers deepseq non-negative parsec QuickCheck random
          storable-record utility-ht
        ];
@@ -95982,8 +98411,10 @@ self: {
        pname = "numeric-qq";
        version = "0.1.2";
        sha256 = "0zxiaiqzcg4z354wyvxl672ffswvhbqk6h6nvpgmydw84akpimcm";
-       buildDepends = [ base loch-th placeholders template-haskell ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [
+         base loch-th placeholders template-haskell
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/numeric-qq";
        description = "Quasi-quoters for numbers of different bases";
@@ -95996,10 +98427,10 @@ self: {
      mkDerivation {
        pname = "numeric-quest";
        version = "0.2.0.1";
-       revision = "1";
        sha256 = "110v2frn085pggjzl3l8wqgr4vcdd5h29x2wak2a59x16ngjg7ga";
+       revision = "1";
        editedCabalFile = "aae9d00f380bf447af5575311f566cd6960aafb7eec8c30abbab09a2fcff092e";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://www.haskell.org/haskellwiki/Numeric_Quest";
        description = "Math and quantum mechanics";
        license = "GPL";
@@ -96011,8 +98442,8 @@ self: {
        pname = "numeric-tools";
        version = "0.2.0.1";
        sha256 = "0frdsj90gqpa55ybjfkzfcda43bbwkqd2v26l6w35kyq1snqyhd3";
-       buildDepends = [ base ieee754 primitive vector ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base ieee754 primitive vector ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "https://bitbucket.org/Shimuuar/numeric-tools";
        description = "Collection of numerical tools for integration, differentiation etc";
        license = stdenv.lib.licenses.bsd3;
@@ -96024,7 +98455,7 @@ self: {
        pname = "numericpeano";
        version = "0.2.0.0";
        sha256 = "1f9ar8kdwzi8xarzb7mrq204v1n3n8kh0fbqv06l9677vv1pc19v";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ombocomp/numericpeano/";
        description = "Peano numbers with attendant bells and whistles";
        license = stdenv.lib.licenses.asl20;
@@ -96047,7 +98478,7 @@ self: {
        pname = "numtype";
        version = "1.1";
        sha256 = "1az10xcfl6qpyy9qnh8g2iqx53rxnjxzc1h8kl1gira6yv7g6857";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Type-level (low cardinality) integers";
        license = stdenv.lib.licenses.bsd3;
@@ -96059,7 +98490,7 @@ self: {
        pname = "numtype-dk";
        version = "0.5";
        sha256 = "0gd1a5hf0bw4vc56f1n7y143bsjkdc97pysv4q1gxpwrnj1sgbxd";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/bjornbm/numtype-dk";
        description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families";
        license = stdenv.lib.licenses.bsd3;
@@ -96071,7 +98502,7 @@ self: {
        pname = "numtype-tf";
        version = "0.1.2";
        sha256 = "00bnz9k4nq21z4vax37qjv6ra2jvlshk0jlici1w8y9rx39zrjyx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Type-level (low cardinality) integers, implemented using type families";
        license = stdenv.lib.licenses.bsd3;
@@ -96092,7 +98523,7 @@ self: {
        sha256 = "0f551qr7dgn6p4slr0yyfw7v2c6j6w1haqzgc7n7phrgmnhvrhzp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal cereal-conduit conduit conduit-extra
          containers data-default directory dyre filepath hslogger
          lifted-base messagepack monad-control mtl network
@@ -96100,7 +98531,8 @@ self: {
          template-haskell text time transformers transformers-base
          utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [ base data-default ];
+       testHaskellDepends = [
          base bytestring cereal cereal-conduit conduit conduit-extra
          containers data-default directory dyre filepath hslogger hspec
          hspec-discover HUnit lifted-base messagepack mtl network
@@ -96111,6 +98543,7 @@ self: {
        homepage = "https://github.com/saep/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nyan" = callPackage
@@ -96121,10 +98554,9 @@ self: {
        sha256 = "02bcyb6ibb6m84d2r6pp05vbv9jv09v1lp35n18mn2vkrgwls649";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring mtl ncurses text ];
+       executableHaskellDepends = [ base bytestring mtl ncurses text ];
        description = "Bored? Nyan cat!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nymphaea" = callPackage
@@ -96137,7 +98569,7 @@ self: {
        sha256 = "1nlnz7mvdkhcqp4v1fyfb6r6v18xpxi0ddqqp84dsqg6ahdypc13";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo containers glade glib gtk mtl parsec random
        ];
        jailbreak = true;
@@ -96156,7 +98588,7 @@ self: {
        pname = "oauthenticated";
        version = "0.1.3.4";
        sha256 = "1l6qir6qnipq8295cljl66mhlws2rrqjvz9nsl7rq2ldqv711bbm";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring
          case-insensitive crypto-random cryptohash either exceptions
          http-client http-types mtl network network-uri text time
@@ -96173,7 +98605,7 @@ self: {
        pname = "obdd";
        version = "0.3.2";
        sha256 = "0dck1jaw2smvnc1cdjmxjchsxsjw14h98y58lm5z0ccl3rfjr1hw";
-       buildDepends = [ array base containers mtl random ];
+       libraryHaskellDepends = [ array base containers mtl random ];
        homepage = "https://github.com/jwaldmann/haskell-obdd";
        description = "Ordered Reduced Binary Decision Diagrams";
        license = "GPL";
@@ -96190,10 +98622,14 @@ self: {
        sha256 = "0w8ygppqr1mjklc0545z2n503ap5xzxmjw2xsmb0i85nmh6f95hv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array AspectAG base containers ghc-prim HList language-c mtl murder
+       libraryHaskellDepends = [
+         array AspectAG base containers ghc-prim HList mtl murder
          template-haskell transformers uu-parsinglib uulib
        ];
+       executableHaskellDepends = [
+         AspectAG base containers HList language-c murder uu-parsinglib
+         uulib
+       ];
        homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo";
        description = "Oberon0 Compiler";
        license = "LGPL";
@@ -96210,7 +98646,7 @@ self: {
        pname = "obj";
        version = "0.1.2";
        sha256 = "0w9yyyd2i88lkhqlghnf7zkrx0sql5w8vwx67j9j1jr7d5zrad4z";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring checkers Codec-Image-DevIL containers
          directory filepath graphicsFormats haskell98 InfixApplicative
          OpenGL OpenGLCheck QuickCheck
@@ -96229,8 +98665,10 @@ self: {
        pname = "objectid";
        version = "0.1.0.2";
        sha256 = "1cr9hzrkj8a6ggym8d6gyy0rmric93x8xwdjqfal10bg5s6d6vgs";
-       buildDepends = [ base blaze-builder bytestring cereal cryptohash ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base blaze-builder bytestring cereal cryptohash
+       ];
+       testHaskellDepends = [
          base bytestring bytestring-arbitrary cereal QuickCheck tasty
          tasty-quickcheck
        ];
@@ -96250,7 +98688,7 @@ self: {
        pname = "objective";
        version = "1.0.5";
        sha256 = "07v1srbzd2sxwfwi1jrq63jycr46hwq4wh6wi7sgdpla5m28mhyh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers either exceptions free hashable monad-skeleton
          monad-stm mtl profunctors stm template-haskell transformers
          transformers-compat unordered-containers void witherable
@@ -96266,7 +98704,7 @@ self: {
        pname = "observable-sharing";
        version = "0.2.1.2";
        sha256 = "0f2da4bxid9ap21p0l6vf8czg84ifnzq1ljj1h4qy95ydv2bc0za";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/atzeus/observable-sharing";
        description = "Simple observable sharing";
        license = stdenv.lib.licenses.bsd3;
@@ -96286,13 +98724,16 @@ self: {
        sha256 = "0say5682zqv4ss6q9v4p171vprdl6aa7aaack1y0526qq7gj05l2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base-compat base16-bytestring base64-bytestring
          bytestring containers cryptohash dotenv either errors ghc-prim
-         http-client http-types lens mtl optparse-applicative text time
-         transformers unordered-containers utf8-string wreq-sb xmlhtml yaml
+         http-client http-types lens mtl text time transformers
+         unordered-containers wreq-sb xmlhtml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base optparse-applicative text utf8-string yaml
+       ];
+       testHaskellDepends = [
          base base-compat dotenv hspec hspec-expectations text transformers
        ];
        jailbreak = true;
@@ -96311,7 +98752,10 @@ self: {
        sha256 = "1p1sf694a5zryvb2i38ygd7fby54pqi0v5r3b24wcpwj43dy57ca";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring containers hexpr mtl parsec symbol text
+       ];
+       executableHaskellDepends = [
          array base bytestring containers hexpr mtl parsec symbol text
        ];
        jailbreak = true;
@@ -96329,10 +98773,10 @@ self: {
        pname = "oculus";
        version = "0.1.0.2";
        sha256 = "04015wbh5j36gd66k7fn12nl92lq68d0c9dia8fz0pr8y3b7ims4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base either monads-tf transformers vect-floating
        ];
-       extraLibraries = [ libX11 libXinerama mesa ovr systemd ];
+       librarySystemDepends = [ libX11 libXinerama mesa ovr systemd ];
        jailbreak = true;
        homepage = "http://github.com/cpdurham/oculus";
        description = "Oculus Rift ffi providing head tracking data";
@@ -96350,8 +98794,10 @@ self: {
        pname = "oeis";
        version = "0.3.6";
        sha256 = "1q7ywczm2d5inrjqgz3j8vfk5sj2yixvwdkzlfs2whd0gadbcfa0";
-       buildDepends = [ base HTTP network network-uri ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base HTTP network network-uri ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96362,7 +98808,7 @@ self: {
        pname = "off-simple";
        version = "0.1";
        sha256 = "03sb2bmjw8v01908zkzmw8njsmqy5k2hcnv6ajbia7n8qawyhivj";
-       buildDepends = [ base parsec3 vector ];
+       libraryHaskellDepends = [ base parsec3 vector ];
        jailbreak = true;
        homepage = "https://github.com/acfoltzer/off-simple";
        description = "A parser for simplified-syntax OFF files";
@@ -96375,7 +98821,7 @@ self: {
        pname = "ofx";
        version = "0.4.0.2";
        sha256 = "0vhr2pydnfc0ma7w1qdn5p5yylzlj3n47fnm16mlbhlb5ydnjshg";
-       buildDepends = [ base parsec pretty time ];
+       libraryHaskellDepends = [ base parsec pretty time ];
        homepage = "http://www.github.com/massysett/ofx";
        description = "Parser for OFX data";
        license = stdenv.lib.licenses.bsd3;
@@ -96393,10 +98839,11 @@ self: {
        sha256 = "0nbk24ymkkjrapxa83qzhzl1m7zi3bxdc9jsjkbqvb7r9nz3jhyj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base data-lens hxt text-format-simple ];
+       executableHaskellDepends = [
          base cmdargs data-lens hxt hxt-curl pretty-show text-format-simple
        ];
-       testDepends = [
+       testHaskellDepends = [
          base data-lens hxt QuickCheck test-framework
          test-framework-quickcheck2 text-format-simple
        ];
@@ -96414,7 +98861,7 @@ self: {
        pname = "oi";
        version = "0.3.1";
        sha256 = "14q8map7r2cc8jcfhczyb16br553h2m9xf40qm34l6pb9l1bzn2p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad directory filepath parallel SafeSemaphore
        ];
        description = "Library for purely functional lazy interactions with the outer world";
@@ -96428,8 +98875,8 @@ self: {
        pname = "ois-input-manager";
        version = "0.1.0.1";
        sha256 = "1p34xybkf5079pq5hkildaz6skx06f6s3qg0k2i73jhh93q3ckiq";
-       buildDepends = [ base hogre ];
-       extraLibraries = [ OIS ];
+       libraryHaskellDepends = [ base hogre ];
+       librarySystemDepends = [ OIS ];
        jailbreak = true;
        description = "wrapper for OIS input manager for use with hogre";
        license = stdenv.lib.licenses.bsd3;
@@ -96442,7 +98889,7 @@ self: {
        pname = "old-locale";
        version = "1.0.0.7";
        sha256 = "0l3viphiszvz5wqzg7a45zp40grwlab941q5ay29iyw8p3v8pbyv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "locale library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96453,7 +98900,7 @@ self: {
        pname = "old-time";
        version = "1.1.0.3";
        sha256 = "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw";
-       buildDepends = [ base old-locale ];
+       libraryHaskellDepends = [ base old-locale ];
        description = "Time library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96464,7 +98911,8 @@ self: {
        pname = "old-version";
        version = "1.4.2";
        sha256 = "1sqga2fmrc702k2grv2kw32wg0yy8qy94cs1jl6112xk6lb79qb3";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       jailbreak = true;
        description = "Basic versioning library";
        license = "unknown";
      }) {};
@@ -96477,19 +98925,22 @@ self: {
      mkDerivation {
        pname = "olwrapper";
        version = "0.4.1";
-       revision = "1";
        sha256 = "0cnkanaxsrsshk2y37sbvyyzc40k61r57zb0c3jarz583h3yzlai";
+       revision = "1";
        editedCabalFile = "44d11ed6751baf0383e968d36adca3c1ab49450cb0e147c1496feba468087e90";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring fay fay-jquery fay-text lens mtl snap snap-core
          snap-loader-dynamic snap-loader-static snap-server snaplet-fay text
        ];
+       executableHaskellDepends = [
+         base bytestring fay fay-jquery fay-text lens mtl snap snap-core
+         snap-loader-static snap-server snaplet-fay text
+       ];
        jailbreak = true;
        description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omaketex" = callPackage
@@ -96502,7 +98953,7 @@ self: {
        sha256 = "0kq2j8pndzn3fjdklyh22vcg8am48i29gx4jq2i74p4gmdryavn9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base optparse-applicative shakespeare-text shelly text
        ];
        jailbreak = true;
@@ -96522,7 +98973,7 @@ self: {
        sha256 = "0v11j2gz98g5ng9dsfbr7k3a2xhw2xqa1qi1q8ad53sx2yhjv0ly";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory filepath pretty time
        ];
        homepage = "http://code.google.com/p/omega/";
@@ -96541,7 +98992,7 @@ self: {
        sha256 = "18xkwsinfjvd20249bm3z0qvsi51j776ifqa6vkrrl186pwa8im7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs conduit sandi transformers
        ];
        jailbreak = true;
@@ -96559,7 +99010,7 @@ self: {
        pname = "on-a-horse";
        version = "0.3";
        sha256 = "18nbvdbdg05fmymbvvhig6invr6ald0gdadl666m4axc8m9n6pvg";
-       buildDepends = [
+       libraryHaskellDepends = [
          arrows base bytestring case-insensitive containers cookie
          http-types mtl random safe split text time transformers utf8-string
          wai wai-extra warp
@@ -96580,7 +99031,10 @@ self: {
        sha256 = "0pmkaw3w69nf928z263my7q0l2zi2v4yx5w49warbgv66h00wgkz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring GenericPretty network process random
+       ];
+       executableHaskellDepends = [
          base bytestring GenericPretty network process random
        ];
        homepage = "https://github.com/crackleware/on-demand-ssh-tunnel";
@@ -96594,7 +99048,9 @@ self: {
        pname = "one-liner";
        version = "0.5.1";
        sha256 = "0nb3cix82nvs06v5mv1xa6076j5cvwyx2jrn7dmyrpf67a76kfh0";
-       buildDepends = [ base contravariant ghc-prim transformers ];
+       libraryHaskellDepends = [
+         base contravariant ghc-prim transformers
+       ];
        homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
        license = stdenv.lib.licenses.bsd3;
@@ -96609,8 +99065,10 @@ self: {
        pname = "one-time-password";
        version = "1.0.0.1";
        sha256 = "1kpwx8lpk764qva536v9x7xskjy94rj8xwwnhsqakps6r29c7qa0";
-       buildDepends = [ base byteable bytestring cereal cryptohash time ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base byteable bytestring cereal cryptohash time
+       ];
+       testHaskellDepends = [
          base bytestring cryptohash tasty tasty-hunit time
        ];
        homepage = "https://github.com/s9gf4ult/one-time-password";
@@ -96624,7 +99082,7 @@ self: {
        pname = "oneOfN";
        version = "0.1.0.1";
        sha256 = "05gycp2zvq08bjl9dx1lm3cjr12i50k3cwq4al34y1rlp2r531lk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mokus0/oneOfN";
        description = "Anonymous coproduct type";
        license = stdenv.lib.licenses.publicDomain;
@@ -96636,7 +99094,7 @@ self: {
        pname = "oneormore";
        version = "0.1.0.3";
        sha256 = "1lz429abk7qqwfya3wa1m5pcyyldagcmmc0ghjfbl8byhkaax63p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/thinkpad20/oneormore";
        description = "A never-empty list type";
@@ -96652,7 +99110,7 @@ self: {
        sha256 = "17c9yy0fshxhpdfqb6hi23kvnvvckcdmlr2dffpgx4cg9znh62s1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base parsec regex-compat ];
+       executableHaskellDepends = [ base parsec regex-compat ];
        description = "A grep-like tool for filtering on words or lines";
        license = "GPL";
      }) {};
@@ -96663,7 +99121,7 @@ self: {
        pname = "onu-course";
        version = "1";
        sha256 = "1d0yn5bj04ircxbi12rx80kds54zssmq4j9kqyk05nmv506x76k0";
-       buildDepends = [ base smallcheck ];
+       libraryHaskellDepends = [ base smallcheck ];
        description = "Code for the Haskell course taught at the Odessa National University in 2012";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96675,7 +99133,7 @@ self: {
        pname = "oo-prototypes";
        version = "0.1.0.0";
        sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/yi-editor/oo-prototypes";
        description = "Support for OO-like prototypes";
        license = stdenv.lib.licenses.gpl2;
@@ -96691,13 +99149,13 @@ self: {
        pname = "opaleye";
        version = "0.4.0.0";
        sha256 = "1dzfxy5r2phqcnijvq74ardjg9p2mlkpidg95dd3v9qiz1ls71rk";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
          profunctors semigroups text time time-locale-compat transformers
          uuid void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers contravariant postgresql-simple product-profunctors
          profunctors QuickCheck semigroups time
        ];
@@ -96717,12 +99175,12 @@ self: {
        pname = "opaleye-sqlite";
        version = "0.0.1.0";
        sha256 = "0r3ij02wkxq50hl70wn53fdr1qi5gigg4x3y0vabm53gabgxdbxq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring bytestring case-insensitive contravariant
          direct-sqlite pretty product-profunctors profunctors semigroups
          sqlite-simple text time time-locale-compat transformers uuid void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers contravariant product-profunctors profunctors
          QuickCheck semigroups sqlite-simple time
        ];
@@ -96739,7 +99197,8 @@ self: {
        sha256 = "093i475l9gyb5jyk2m6fdz1dw2jm545rlrbmwqz3vfdfy2ikcks3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
+       executableHaskellDepends = [ base ];
        description = "Open a web browser from Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96756,7 +99215,7 @@ self: {
        sha256 = "1k9d1r1z7q6lm8fha630rg2qfmwwnr9dv2ajvqwvrki2m6i9sczn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory extensible-exceptions filepath
          HTTP mtl network old-time parsec pretty process syb texmath
          utf8-string xhtml xml zip-archive
@@ -96773,8 +99232,8 @@ self: {
        pname = "open-typerep";
        version = "0.3.1";
        sha256 = "1wx3rh7fzq5d4g45k4fjwv0yh5grcqpvzlf2ixkni20d9rhb0yzs";
-       buildDepends = [ base constraints mtl syntactic tagged ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base constraints mtl syntactic tagged ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/emilaxelsson/open-typerep";
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
@@ -96788,7 +99247,8 @@ self: {
        sha256 = "1dkz7a5k86r74lnf891grn48q8agkmd81czfp1g4l4dnxslldsqw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/RobotGymnast/open-union";
        description = "Extensible, type-safe unions";
        license = stdenv.lib.licenses.mit;
@@ -96801,7 +99261,7 @@ self: {
        pname = "open-witness";
        version = "0.1.1";
        sha256 = "1i38lhy1wla0xqgcbyf06179r1hs6194wqd8gg26q491ddc0vp3l";
-       buildDepends = [ base mtl witness ];
+       libraryHaskellDepends = [ base mtl witness ];
        jailbreak = true;
        description = "open witnesses";
        license = stdenv.lib.licenses.bsd3;
@@ -96814,8 +99274,8 @@ self: {
        pname = "opencv-raw";
        version = "0.1.0.0";
        sha256 = "040hjkqd2zqkd8zbnfv8wmyzkfgckiv4njryilx1gpyp7c6qxpwn";
-       buildDepends = [ base bindings-DSL Cabal vector ];
-       pkgconfigDepends = [ opencv ];
+       libraryHaskellDepends = [ base bindings-DSL Cabal vector ];
+       libraryPkgconfigDepends = [ opencv ];
        jailbreak = true;
        homepage = "www.github.com/arjuncomar/opencv-raw.git";
        description = "Raw Haskell bindings to OpenCV >= 2.0";
@@ -96829,7 +99289,7 @@ self: {
        pname = "opendatatable";
        version = "0.0.0";
        sha256 = "1bv729ljw07arz9fzg0nqj6fkpwkxkjds073cz3zr9in0a5b1531";
-       buildDepends = [ base hxt template-haskell th-lift ];
+       libraryHaskellDepends = [ base hxt template-haskell th-lift ];
        jailbreak = true;
        homepage = "https://github.com/fabianbergmark/OpenDataTable";
        description = "A library for working with Open Data Tables";
@@ -96844,7 +99304,7 @@ self: {
        pname = "openexchangerates";
        version = "0.1.0.0";
        sha256 = "0ci1hfdcf0msn3j5l42z4pnn9sw77r0a4anlqsrnl2vrcpfs3j8l";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers currency errors HTTP network text
        ];
        homepage = "https://github.com/singpolyma/openexchangerates-haskell";
@@ -96861,7 +99321,7 @@ self: {
        pname = "openflow";
        version = "0.3.0";
        sha256 = "0dhg34s4imr1v6wlc567qg5929wa82my7jbhxm9hqq0882vb0sb2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bimap binary bytestring containers deepseq-generics
          hashable network
        ];
@@ -96869,6 +99329,7 @@ self: {
        homepage = "https://github.com/AndreasVoellmy/openflow";
        description = "OpenFlow";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opengles" = callPackage
@@ -96879,11 +99340,11 @@ self: {
        pname = "opengles";
        version = "0.7.0";
        sha256 = "0vzd1dfg772947h4wny1fsskgdfxk31q86n0p507vmd7pxz6m5dj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring distributive future-resource ghc-prim lens linear
          packer vector
        ];
-       extraLibraries = [ EGL GLESv2 ];
+       librarySystemDepends = [ EGL GLESv2 ];
        jailbreak = true;
        description = "OpenGL ES 2.0 and 3.0 with EGL 1.4";
        license = stdenv.lib.licenses.gpl3;
@@ -96900,7 +99361,7 @@ self: {
        sha256 = "0rhd2hz3ls9ifcrifxhd4qvd7axydnlk5gckxay55dp2lcfc4css";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers HsOpenSSL HTTP monadLib network time xml
        ];
        homepage = "http://github.com/elliottt/hsopenid";
@@ -96918,8 +99379,10 @@ self: {
        pname = "openpgp";
        version = "0.6.1";
        sha256 = "03sdl0nzxnqbg8cnkglxkbz5xh5s57n6qgdjdnd82sdz139ia69s";
-       buildDepends = [ base binary bytestring bzlib utf8-string zlib ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring bzlib utf8-string zlib
+       ];
+       testHaskellDepends = [
          base binary bytestring bzlib HUnit QuickCheck quickcheck-instances
          test-framework test-framework-hunit test-framework-quickcheck2
          utf8-string zlib
@@ -96938,10 +99401,10 @@ self: {
        pname = "openpgp-Crypto";
        version = "0.5";
        sha256 = "0gsdzfg378j7s2kpryg43ajxcdk8s5szk0yq48qfvnlsbgrxz07r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring Crypto openpgp utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring Crypto HUnit openpgp QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
          utf8-string
@@ -96961,10 +99424,10 @@ self: {
        pname = "openpgp-asciiarmor";
        version = "0.1";
        sha256 = "1xrv0n7n1n8izvxvqm8wmj6mkn5l6wcq18bxs9zd1q5riynmmm2w";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring cereal
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base base64-bytestring bytestring cereal HUnit
          test-framework test-framework-hunit
        ];
@@ -96984,11 +99447,11 @@ self: {
        pname = "openpgp-crypto-api";
        version = "0.6.3";
        sha256 = "18grb5jzf7n4670xww3ca2l05ck3lj2msynl57y5fjia8gfr8ijm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal crypto-api cryptocipher cryptohash
          openpgp tagged transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring cereal crypto-api cryptocipher cryptohash
          HUnit openpgp QuickCheck quickcheck-instances tagged test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
@@ -97009,7 +99472,7 @@ self: {
        pname = "opensoundcontrol-ht";
        version = "0.3";
        sha256 = "154bviaqkh9a02li6f2351764wgy0b0lh4a4s0wg8ql7ml0fykza";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring hosc process random transformers utility-ht
        ];
        homepage = "http://www.haskell.org/haskellwiki/SuperCollider";
@@ -97027,11 +99490,12 @@ self: {
        sha256 = "0a7vfbw84p3iyggq92yhw2dcsmk1cycxaq3v1104i7ipr2kdm36a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base octohat text ];
+       executableHaskellDepends = [
          base directory dotenv filepath keyword-args octohat
          optparse-applicative parsec text unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec keyword-args octohat optparse-applicative parsec text
        ];
        homepage = "https://github.com/stackbuilders/openssh-github-keys";
@@ -97046,7 +99510,7 @@ self: {
        pname = "openssl-createkey";
        version = "0.1";
        sha256 = "1p59wlkirz4dwyhsnzzzbvy2cwfizn2zky5sxrsmnrzfkbpx1ig5";
-       buildDepends = [ base directory HsOpenSSL time unix ];
+       libraryHaskellDepends = [ base directory HsOpenSSL time unix ];
        description = "Create OpenSSL keypairs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97059,8 +99523,10 @@ self: {
        pname = "openssl-streams";
        version = "1.2.1.0";
        sha256 = "1jqrc9wxvw196vgcbhpazi9vldqs31jb6jxc529iy9k7vh4mk5m9";
-       buildDepends = [ base bytestring HsOpenSSL io-streams network ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring HsOpenSSL io-streams network
+       ];
+       testHaskellDepends = [
          base bytestring HsOpenSSL HUnit io-streams network test-framework
          test-framework-hunit
        ];
@@ -97074,8 +99540,8 @@ self: {
        pname = "opentheory";
        version = "1.200";
        sha256 = "0fdxrpsw3c4p1y80xfab0cl5zhkjcp9dlylgxywzq5kcpqv07ifh";
-       buildDepends = [ base opentheory-primitive QuickCheck ];
-       testDepends = [ base opentheory-primitive QuickCheck ];
+       libraryHaskellDepends = [ base opentheory-primitive QuickCheck ];
+       testHaskellDepends = [ base opentheory-primitive QuickCheck ];
        homepage = "http://opentheory.gilith.com/?pkg=base";
        description = "The standard theory library";
        license = stdenv.lib.licenses.mit;
@@ -97089,7 +99555,7 @@ self: {
        pname = "opentheory-bits";
        version = "1.66";
        sha256 = "1qjgrmi05ay4qss6w5ld4pmksb3lsscqpw0x2dcdkja1i5hfpwfj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base opentheory opentheory-primitive opentheory-probability
          QuickCheck
        ];
@@ -97107,7 +99573,7 @@ self: {
        pname = "opentheory-byte";
        version = "1.126";
        sha256 = "0zlfik0irikrwk706fdjqb10z5jck3ldlsw269mfwlz6s1d5j2qz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base opentheory opentheory-bits opentheory-primitive
          opentheory-probability QuickCheck
        ];
@@ -97127,7 +99593,11 @@ self: {
        sha256 = "0z0dg3bgck8yjn45a7i5ymx2gm9i5m9skmg0n1cg7p6hgdka9j9i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base opentheory opentheory-parser opentheory-primitive QuickCheck
+         random
+       ];
+       executableHaskellDepends = [
          base opentheory opentheory-parser opentheory-primitive QuickCheck
          random
        ];
@@ -97144,8 +99614,12 @@ self: {
        pname = "opentheory-divides";
        version = "1.63";
        sha256 = "1jax8103yhgmbwfzbpnis4nj6f90n3wizb2znvafd4pw2afs5mkv";
-       buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
-       testDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       libraryHaskellDepends = [
+         base opentheory opentheory-primitive QuickCheck
+       ];
+       testHaskellDepends = [
+         base opentheory opentheory-primitive QuickCheck
+       ];
        homepage = "http://opentheory.gilith.com/?pkg=natural-divides";
        description = "The divides relation on natural numbers";
        license = stdenv.lib.licenses.mit;
@@ -97159,10 +99633,10 @@ self: {
        pname = "opentheory-fibonacci";
        version = "1.69";
        sha256 = "09rqz7fixh1k4ya1aci7v0wy0sz2m7j5cj66plcbvpv6p03yq1vv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base opentheory opentheory-primitive opentheory-stream QuickCheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base opentheory opentheory-primitive opentheory-stream QuickCheck
        ];
        description = "Fibonacci numbers";
@@ -97176,8 +99650,12 @@ self: {
        pname = "opentheory-parser";
        version = "1.158";
        sha256 = "0325g7m5z64dg8sihmcgi9rmkms6r76hf1d7927v08dl5xh4dlhi";
-       buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
-       testDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       libraryHaskellDepends = [
+         base opentheory opentheory-primitive QuickCheck
+       ];
+       testHaskellDepends = [
+         base opentheory opentheory-primitive QuickCheck
+       ];
        jailbreak = true;
        homepage = "http://opentheory.gilith.com/?pkg=parser";
        description = "Stream parsers";
@@ -97192,11 +99670,11 @@ self: {
        pname = "opentheory-prime";
        version = "1.82";
        sha256 = "1x6sir4abr34cghmhbyv5qfd847xbbxg88qaw1vs3sa5lhb5dm8s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base opentheory opentheory-divides opentheory-primitive
          opentheory-stream QuickCheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base opentheory opentheory-divides opentheory-primitive
          opentheory-stream QuickCheck
        ];
@@ -97212,8 +99690,8 @@ self: {
        pname = "opentheory-primitive";
        version = "1.7";
        sha256 = "02lg02w4sds1489bfz4hwgnhd9l6a1l7r9pwjd3s16yj2hbmr6jn";
-       buildDepends = [ base QuickCheck random ];
-       testDepends = [ base QuickCheck random ];
+       libraryHaskellDepends = [ base QuickCheck random ];
+       testHaskellDepends = [ base QuickCheck random ];
        homepage = "http://www.gilith.com/research/opentheory/";
        description = "Haskell primitives used by OpenTheory packages";
        license = stdenv.lib.licenses.mit;
@@ -97226,7 +99704,9 @@ self: {
        pname = "opentheory-probability";
        version = "1.49";
        sha256 = "0dszjszjdabgafpvxiailpgzm7y96f4a8zhjfhin3m36f3lb0dmy";
-       buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       libraryHaskellDepends = [
+         base opentheory opentheory-primitive QuickCheck
+       ];
        jailbreak = true;
        homepage = "http://opentheory.gilith.com/?pkg=probability";
        description = "Probability";
@@ -97240,7 +99720,9 @@ self: {
        pname = "opentheory-stream";
        version = "1.46";
        sha256 = "0p27hvxxxl6x6g97llls8kry5vlmpi5b02x9x96v24m4clxj55wa";
-       buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       libraryHaskellDepends = [
+         base opentheory opentheory-primitive QuickCheck
+       ];
        homepage = "http://opentheory.gilith.com/?pkg=stream";
        description = "Infinite stream types";
        license = stdenv.lib.licenses.mit;
@@ -97255,11 +99737,11 @@ self: {
        pname = "opentheory-unicode";
        version = "1.140";
        sha256 = "1w916hc6qn8bf5z95b43aqm25mbivlg7b4q91g5s6gy3q1f4iqna";
-       buildDepends = [
+       libraryHaskellDepends = [
          base opentheory opentheory-bits opentheory-byte opentheory-parser
          opentheory-primitive opentheory-probability QuickCheck
        ];
-       testDepends = [
+       testHaskellDepends = [
          base opentheory opentheory-bits opentheory-byte opentheory-parser
          opentheory-primitive opentheory-probability QuickCheck
        ];
@@ -97277,7 +99759,8 @@ self: {
        sha256 = "1aj3jhiyz4190b0qmyp684b8lbzrp8jn56s898892rvbp0hxa0pd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl random ];
+       libraryHaskellDepends = [ base mtl ];
+       executableHaskellDepends = [ random ];
        homepage = "http://haskell.org/haskellwiki/Operational";
        description = "Implementation of difficult monads made easy with operational semantics";
        license = stdenv.lib.licenses.bsd3;
@@ -97289,7 +99772,7 @@ self: {
        pname = "operational-class";
        version = "0.3.0.0";
        sha256 = "02z766b5a6fa7dgmw3qa1xryijf2im9n79gnjq0m5pd2hv5vja4b";
-       buildDepends = [ base operational transformers ];
+       libraryHaskellDepends = [ base operational transformers ];
        homepage = "https://github.com/srijs/haskell-operational-class";
        description = "MonadProgram typeclass for the operational package";
        license = stdenv.lib.licenses.mit;
@@ -97301,7 +99784,7 @@ self: {
        pname = "opml";
        version = "0.4";
        sha256 = "1bnr6lkcf2qs7pvrmd8a5xmklcg67l64b776hzclfvxqy1qil29x";
-       buildDepends = [ base directory xml ];
+       libraryHaskellDepends = [ base directory xml ];
        description = "Representing and handling OPML subscription information";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97319,14 +99802,14 @@ self: {
        pname = "opml-conduit";
        version = "0.3.0.0";
        sha256 = "00kknysgzv1cbrgx1sgb2qg99lr3715mhdx2wcjsi65msk67ngiz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base case-insensitive conduit conduit-parse containers data-default
          exceptions hashable hashable-time lens mono-traversable
          monoid-subclasses network-uri parsers QuickCheck
          quickcheck-instances semigroups text time timerep
          unordered-containers xml-conduit xml-conduit-parse xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit conduit-combinators conduit-parse containers
          data-default exceptions hlint lens mtl network-uri parsers
          resourcet tasty tasty-hunit tasty-quickcheck xml-conduit-parse
@@ -97334,7 +99817,6 @@ self: {
        homepage = "https://github.com/k0ral/opml-conduit";
        description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opn" = callPackage
@@ -97347,7 +99829,7 @@ self: {
        sha256 = "0x53kvcpbd9fh00zs8wdkb3xsl8hf1bsqgl83ci17di1jyg3m4ch";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath ini network-uri optparse-applicative
          process text unordered-containers
        ];
@@ -97366,8 +99848,11 @@ self: {
        sha256 = "1863sh22yfy7i5ibqjsp3bzbaxjd7vwhy2j3r523qrcci0xs8n9b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cryptohash deepseq hex vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq vector ];
+       executableHaskellDepends = [
+         base bytestring cryptohash deepseq hex vector
+       ];
+       testHaskellDepends = [
          base bytestring bytestring-arbitrary deepseq QuickCheck vector
        ];
        jailbreak = true;
@@ -97384,10 +99869,10 @@ self: {
        pname = "optimization";
        version = "0.1.6";
        sha256 = "182dwjs24m60waqqhvq42l9hpshwzr07bbb87jjpmhfjrlxf4xly";
-       buildDepends = [
+       libraryHaskellDepends = [
          ad base distributive linear semigroupoids vector
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/bgamari/optimization";
        description = "Numerical optimization";
@@ -97404,7 +99889,7 @@ self: {
        sha256 = "0642f9vv08qyqk3pjgin5k2sfv2ffhah9h9rc2xw6ahnygqbpbmf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers fgl flite graphviz haskell98 mtl parsec
          uniplate wl-pprint
        ];
@@ -97421,8 +99906,10 @@ self: {
        pname = "optional";
        version = "0.0.1";
        sha256 = "1i1nl81gg5fndf3vafirpmklikn4xpy791is6ff8j7pzys0qfj8g";
-       buildDepends = [ base ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "https://github.com/tonymorris/optional";
        description = "Using type-classes for optional function arguments";
        license = stdenv.lib.licenses.bsd3;
@@ -97434,7 +99921,7 @@ self: {
        pname = "optional-args";
        version = "1.0.0";
        sha256 = "0j49cp5y7gp9acvhw315lq92mgr35fwaw90vpxy0n9g541ls350z";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Optional function arguments";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97447,8 +99934,8 @@ self: {
        pname = "options";
        version = "1.2.1.1";
        sha256 = "0qjs0v1ny52w51n5582d4z8wy9h6n0zw1xb5dh686ff5wadflgi8";
-       buildDepends = [ base containers monads-tf transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers monads-tf transformers ];
+       testHaskellDepends = [
          base chell chell-quickcheck containers monads-tf transformers
        ];
        homepage = "https://john-millikin.com/software/haskell-options/";
@@ -97462,8 +99949,8 @@ self: {
        pname = "options-time";
        version = "1.0.1";
        sha256 = "0rsmwalmnry71w23k6sg0a307xgb2s71j9s12zqqq380fw6c1bhm";
-       buildDepends = [ base options time ];
-       testDepends = [ base chell options time ];
+       libraryHaskellDepends = [ base options time ];
+       testHaskellDepends = [ base chell options time ];
        homepage = "https://john-millikin.com/software/haskell-options/";
        description = "Command-line option types for dates and times";
        license = stdenv.lib.licenses.mit;
@@ -97476,10 +99963,10 @@ self: {
      mkDerivation {
        pname = "optparse-applicative";
        version = "0.10.0";
-       revision = "1";
        sha256 = "04hr6rzgc8h0c8fy748as3q7sc8vm94gvk0rw4gdj605z8hvaxcb";
+       revision = "1";
        editedCabalFile = "20d6ce280b028a493a1920dcc22bb39bee10e9c788a58e03dcaeecba97afffb0";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base process transformers transformers-compat
        ];
        jailbreak = true;
@@ -97496,7 +99983,7 @@ self: {
        pname = "optparse-applicative";
        version = "0.11.0.2";
        sha256 = "0ni52ii9555jngljvzxn1ngicr6i2w647ww3rzhdrmng04y95iii";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base process transformers transformers-compat
        ];
        homepage = "https://github.com/pcapriotti/optparse-applicative";
@@ -97510,7 +99997,7 @@ self: {
        pname = "optparse-declarative";
        version = "0.3.0";
        sha256 = "1avy0g6jk34jbfp1xzqcyhb4j53knsbzx1pssl4b5f6nn981mbj8";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/tanakh/optparse-declarative";
        description = "Declarative command line option parser";
        license = stdenv.lib.licenses.mit;
@@ -97524,7 +100011,7 @@ self: {
        pname = "optparse-simple";
        version = "0.0.3";
        sha256 = "0zlcvxhx98k1akbv5fzsvwcrmb1rxsmmyaiwkhfrp5dxq6kg0is5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base either gitrev optparse-applicative template-haskell
          transformers
        ];
@@ -97541,7 +100028,10 @@ self: {
        sha256 = "0zl456v2mwa68k2lq7fx3ds6xr9vbrijq8q8ma5mm1kk9p9znr0x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base deepseq monadIO mtl process random stm ];
+       libraryHaskellDepends = [ base deepseq monadIO mtl process stm ];
+       executableHaskellDepends = [
+         base deepseq monadIO mtl process random stm
+       ];
        description = "Orchestration-style co-ordination EDSL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97556,12 +100046,12 @@ self: {
        pname = "orchestrate";
        version = "0.2.0.2";
        sha256 = "09h9jqni25ysalw747xbf532m0gvy8najjwbn3jj7d3z50s0vf8z";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring case-insensitive data-default either errors
          http-client http-types lens mtl text transformers
          unordered-containers wreq
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring errors hspec lens QuickCheck smallcheck text
          wreq
        ];
@@ -97579,7 +100069,7 @@ self: {
        pname = "orchid";
        version = "0.0.8";
        sha256 = "1d3cfhhsv1qpiiin4cs9wxx2a6vwcj0iad746z7l1qzyxrhg4dkm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers encoding extensible-exceptions fclabels
          filestore hscolour mtl nano-md5 parsec process QuickCheck salvia
          salvia-extras stm time unix xml
@@ -97600,7 +100090,7 @@ self: {
        sha256 = "1gfjmakfx8244q1yqbgp2ji9bh45ll8ixvxbdd961my30j7gh29z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base extensible-exceptions mtl network orchid Pipe salvia
          salvia-extras stm
        ];
@@ -97616,7 +100106,7 @@ self: {
        pname = "ord-adhoc";
        version = "0.0.0.1";
        sha256 = "062wkfpww1ic3xiy26k22369azk5wjlpn5wm5xh1w75kc9crv263";
-       buildDepends = [ base void ];
+       libraryHaskellDepends = [ base void ];
        homepage = "https://github.com/fumieval/ord-adhoc/";
        description = "Creating Ord instances instantly";
        license = stdenv.lib.licenses.bsd3;
@@ -97630,8 +100120,8 @@ self: {
        pname = "order-maintenance";
        version = "0.0.1.0";
        sha256 = "01j8caxlmzz04qabinq5kcjdsr1855lmcdsi9sqn9zf79s16q97k";
-       buildDepends = [ base containers transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers transformers ];
+       testHaskellDepends = [
          base Cabal cabal-test-quickcheck containers QuickCheck transformers
        ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/order-maintenance";
@@ -97648,7 +100138,7 @@ self: {
        pname = "order-statistics";
        version = "0.1.1";
        sha256 = "1df9b0q4rmgnd74q7pckcppyiygzba6f39vajkwb2pmxlfafcy7a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers math-functions statistics vector vector-space
        ];
        jailbreak = true;
@@ -97663,7 +100153,7 @@ self: {
        pname = "ordered";
        version = "0.1";
        sha256 = "0s0g5kgzdw7qjsdcddszjclamx9bi0369pkwhh0wncjg68a7mq69";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A definition of Posets";
        license = "unknown";
      }) {};
@@ -97674,7 +100164,7 @@ self: {
        pname = "orders";
        version = "0.1.0.0";
        sha256 = "1ry6flg5sh3hl1xpkqk67ayd4y0xx3j2pwcz26q1pgqn6m84plzr";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "basic orders";
        license = stdenv.lib.licenses.bsd3;
@@ -97688,8 +100178,8 @@ self: {
        pname = "ordrea";
        version = "0.3.0.0";
        sha256 = "067nf69diqi00vswd7xarl55ps9v5cwqmph1w6nzjylnl0pjh811";
-       buildDepends = [ base containers transformers vector ];
-       testDepends = [ base directory process split ];
+       libraryHaskellDepends = [ base containers transformers vector ];
+       testHaskellDepends = [ base directory process split ];
        description = "Push-pull implementation of discrete-time FRP";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -97702,7 +100192,7 @@ self: {
        sha256 = "04d56k6x6psynk8lddbawc3kfa4yc66w4qgjag20grm4zd7y45ax";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ attoparsec base text ];
+       executableHaskellDepends = [ attoparsec base text ];
        jailbreak = true;
        description = "Organize scala imports";
        license = stdenv.lib.licenses.gpl3;
@@ -97716,10 +100206,10 @@ self: {
        pname = "orgmode";
        version = "0.1.0.0";
        sha256 = "084dzafa8pm2hs346zk3x3agzzcxay7ca9r40s6sh61vfc6hbwg0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HStringTemplate parsec regex-posix syb text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec HStringTemplate network network-uri parsec
          QuickCheck random regex-posix syb text
        ];
@@ -97737,11 +100227,11 @@ self: {
        pname = "orgmode-parse";
        version = "0.1.1.2";
        sha256 = "1ys9gcydipjxn5ba7ndmz70ri218d6wivxrd7xvcsf4kncfks3xi";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable
          old-locale text thyme unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring containers hashable HUnit
          old-locale tasty tasty-hunit text thyme unordered-containers
        ];
@@ -97758,10 +100248,12 @@ self: {
        pname = "origami";
        version = "0.0.4";
        sha256 = "0q0dsyhpp63kkpjqvjksy1xnwp1f9yilgxrxgwcqrzdjzmgg4rzw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors containers lens mtl pretty template-haskell
        ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        homepage = "http://github.com/nedervold/origami";
        description = "An un-SYB framework for transforming heterogenous data through folds";
        license = stdenv.lib.licenses.bsd3;
@@ -97776,8 +100268,8 @@ self: {
        pname = "os-release";
        version = "0.2.1";
        sha256 = "0ij6i1yp2rmbkr9jhr8i969xajw3kbfx0yb44s51gm3mcjb3g4la";
-       buildDepends = [ base containers parsec transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers parsec transformers ];
+       testHaskellDepends = [
          base containers hlint hspec parsec process regex-compat temporary
          transformers
        ];
@@ -97794,7 +100286,7 @@ self: {
        pname = "osc";
        version = "1.0.0.2";
        sha256 = "0f7diw6nna7mq5rsn63jk9n230pnrr5ppi5dp8rcpniqry2gs1q3";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary bytestring data-binary-ieee754 network
        ];
        jailbreak = true;
@@ -97813,10 +100305,11 @@ self: {
        sha256 = "18pc2r5acb3b6dr7niib4fn8x2la6y3f5zlj3ibrxhl5c1q35j6y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring conduit conduit-extra containers libnotify process
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-extra containers libnotify
          resourcet time transformers
        ];
+       executableHaskellDepends = [ base process ];
        description = "Show keys pressed with an on-screen display (Linux only)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97832,7 +100325,7 @@ self: {
        pname = "osm-download";
        version = "0.4";
        sha256 = "056ggv31nycgz59gkmibzmx0k5x8klb5bwlnbhdih8d71larbsb3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers data-default directory gps
          http-conduit http-types monad-control monadIO mtl persistent
          persistent-sqlite persistent-template pool-conduit stm stm-chans
@@ -97850,7 +100343,7 @@ self: {
        pname = "osx-ar";
        version = "0.11";
        sha256 = "1d2lna7gvygiq062p2y1zy182wv3vkr0lda49y502ad6jf483xdn";
-       buildDepends = [ base binary bytestring containers ];
+       libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for OS X static archive format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97864,10 +100357,10 @@ self: {
        pname = "ot";
        version = "0.2.0.0";
        sha256 = "0vf4lqc0mffnhz4a03jvs35rl1ygp2ipdmn3dyb5darsg941gsd3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base binary either ghc mtl QuickCheck text
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base binary HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
@@ -97886,7 +100379,9 @@ self: {
        sha256 = "1dwl9jbrhw5b7z2imlnkn8qjk36z06gqca4y9h8r85phsdkyzbm4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers parsec split uniplate ];
+       executableHaskellDepends = [
+         base containers parsec split uniplate
+       ];
        description = "Pretty-printer for Ott parse trees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97897,8 +100392,8 @@ self: {
        pname = "overture";
        version = "0.0.5";
        sha256 = "0mv9iakq1yjawf7f0zckmxbzlcv2rlqngsllfsrcydi6lxazznzw";
-       buildDepends = [ base ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
        jailbreak = true;
        description = "An alternative to some of the Prelude";
        license = stdenv.lib.licenses.mit;
@@ -97912,7 +100407,9 @@ self: {
        pname = "pack";
        version = "0.4.0";
        sha256 = "19ps1dk855br5h9x72f26sjx8xnh4gmqb0cf5mi65jpp5zvp0zj9";
-       buildDepends = [ array base bytestring lens transformers vector ];
+       libraryHaskellDepends = [
+         array base bytestring lens transformers vector
+       ];
        jailbreak = true;
        homepage = "https://github.com/capsjac/pack";
        description = "Bidirectional fast ByteString packer/unpacker";
@@ -97929,7 +100426,8 @@ self: {
        sha256 = "0r4zksyszbhywyyayjs1cn8d69cnm0p4y9xqir9nw1g4gkl23df8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base filemanip filepath groom process ];
+       executableHaskellDepends = [
          base Cabal filemanip filepath groom packdeps process
        ];
        description = "Utilities for working with cabal packages and your package database";
@@ -97944,7 +100442,9 @@ self: {
        sha256 = "0rsv60n6fd9kkjihdjzi7hadxj8yd6bd640w92y2wx1y9qxl8lhm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal Diff filepath haskell-src-exts ];
+       executableHaskellDepends = [
+         base Cabal Diff filepath haskell-src-exts
+       ];
        jailbreak = true;
        description = "Haskell Package Versioning Tool";
        license = stdenv.lib.licenses.bsd3;
@@ -97961,10 +100461,11 @@ self: {
        sha256 = "08an9nwg448d3w4yds67l02mgikmjmn52pvva3i386fv4hfkabhp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal containers directory filepath split tar text
          time
        ];
+       executableHaskellDepends = [ base Cabal ];
        homepage = "http://packdeps.haskellers.com/";
        description = "Check your cabal packages for lagging dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -97979,11 +100480,11 @@ self: {
        pname = "packed-dawg";
        version = "0.2.0.7";
        sha256 = "03wf6pnv2l7aydxzv0gx073324iy5j7pbfh5nl3p5xdpr8y8il7y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary deepseq mtl unordered-containers vector
          vector-binary-instances
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary deepseq HUnit mtl QuickCheck tasty tasty-hunit
          tasty-quickcheck unordered-containers vector
          vector-binary-instances
@@ -97997,10 +100498,10 @@ self: {
      mkDerivation {
        pname = "packedstring";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "1x78pzzdlnpcmh9p37rlf8m5cxf3yqm2alf3whl4zpr9w25r0qj8";
+       revision = "1";
        editedCabalFile = "cbc334ff8e721fb18b6799b28dc3e77addc7234aa553725b0af68375f75e0bcf";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        jailbreak = true;
        description = "(Deprecated) Packed Strings";
        license = stdenv.lib.licenses.bsd3;
@@ -98015,8 +100516,8 @@ self: {
        pname = "packer";
        version = "0.1.8";
        sha256 = "1r7q54a1c6yb0gjd8hvxq1jw2fmgbhf5anfw47nzibs1bywjjgbi";
-       buildDepends = [ base bytestring ghc-prim transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ghc-prim transformers ];
+       testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "http://github.com/vincenthz/hs-packer";
@@ -98031,12 +100532,12 @@ self: {
      mkDerivation {
        pname = "packunused";
        version = "0.1.1.4";
-       revision = "1";
        sha256 = "1ahb8wq7yxnfzwcvppk8cyhj9r51fz9ci1pwy0h4ql7iyc3z0vy8";
+       revision = "1";
        editedCabalFile = "5ddb122ff2a1ac4e79226f31b4d8f7dab67bb5501d0e715d84dbfe36c845b772";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal directory filepath haskell-src-exts optparse-applicative
          split
        ];
@@ -98053,7 +100554,7 @@ self: {
        sha256 = "04jlfinds38kjy0qrk00a7ik5x7mkdwkb0cwmlzlif45x4zrhwfv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base deepseq directory-tree ];
+       executableHaskellDepends = [ base deepseq directory-tree ];
        jailbreak = true;
        homepage = "https://github.com/Tener/archlinux-utils";
        description = "Read whole Pacman database which pushes it into the memory cache";
@@ -98068,7 +100569,7 @@ self: {
        pname = "padKONTROL";
        version = "0.1";
        sha256 = "1sv7124ms2msqb2wb361xshykmh8cr4i85qayjak8y8q7bpzkdfd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hmidi minioperational transformers
        ];
        jailbreak = true;
@@ -98087,7 +100588,10 @@ self: {
        sha256 = "1zkh8cx4bdgsyra7x9kzzdcckg65y1hacwq90w36gdl6i4hs7nj0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ aeson base bytestring containers lens text wreq ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers lens text wreq
+       ];
+       executableHaskellDepends = [ base text wreq ];
        jailbreak = true;
        homepage = "https://github.com/diogob/pagarme_haskell";
        description = "Pagarme API wrapper";
@@ -98105,10 +100609,11 @@ self: {
        sha256 = "1wzfsindjxx61nca36hhldy0y33pgagg506ls9ldvrkvl4n4y7iy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra directory process resourcet
          safe terminfo text transformers unix
        ];
+       executableHaskellDepends = [ base bytestring conduit-extra text ];
        homepage = "https://github.com/pharpend/pager";
        description = "Open up a pager, like 'less' or 'more'";
        license = stdenv.lib.licenses.bsd2;
@@ -98125,10 +100630,10 @@ self: {
      mkDerivation {
        pname = "pagerduty";
        version = "0.0.3.2";
-       revision = "1";
        sha256 = "0cdn5xmqpfl85nair2ns3dv690wgyfiapks0lnc3aqi8nnly7bws";
+       revision = "1";
        editedCabalFile = "016fff9ce8abfc6dec19a84ed7043a2d6f6692f2b0f20a845e98a347a1bc48ba";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors bytestring bytestring-conversion conduit
          data-default-class exceptions generics-sop http-client http-types
          lens lens-aeson mmorph monad-control mtl template-haskell text time
@@ -98148,7 +100653,7 @@ self: {
        pname = "pagure-hook-receiver";
        version = "0.1.0.0";
        sha256 = "0qnnkxcad4843v6c1fqqkiip6cv82q5fckpn5v40sw2p9xk3lkcl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers scotty shelly text transformers unix
        ];
        homepage = "https://pagure.io/pagure-hook-receiver";
@@ -98162,7 +100667,7 @@ self: {
        pname = "palette";
        version = "0.1.0.2";
        sha256 = "1snhn4mz58ax5sd77kh1m4jicwdmlrf89j612rkz5bkavvks6rrr";
-       buildDepends = [ array base colour containers ];
+       libraryHaskellDepends = [ array base colour containers ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Utilities for choosing and creating color schemes";
        license = stdenv.lib.licenses.bsd3;
@@ -98176,7 +100681,7 @@ self: {
        sha256 = "1k0kvd8p1ivwmpmf8khwmb4vyk8z0di74xn5840zy9jhf1cwx4kn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base bytestring containers ];
+       executableHaskellDepends = [ array base bytestring containers ];
        homepage = "http://www.jeuring.net/homepage/palindromes/index.html";
        description = "Finding palindromes in strings";
        license = stdenv.lib.licenses.bsd3;
@@ -98188,9 +100693,9 @@ self: {
        pname = "pam";
        version = "0.1";
        sha256 = "1lmkq12p18qavx2c7xrnha56017y0f21ri4l3cqal4fb8zy0g5nj";
-       buildDepends = [ base ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ pam ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ pam ];
+       libraryToolDepends = [ c2hs ];
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) pam;};
@@ -98205,7 +100710,7 @@ self: {
        pname = "panda";
        version = "2009.4.1";
        sha256 = "0yn6ia1pql5fvj784a57ym74n5sd08n1g9djgapllw9lkf6r7hv7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cgi containers data-default directory filepath gravatar
          haskell98 hcheat kibro MissingH mps network old-locale old-time
          pandoc parsec parsedate process rss utf8-string xhtml
@@ -98217,11 +100722,11 @@ self: {
      }) {};
 
   "pandoc" = callPackage
-    ({ mkDerivation, aeson, alex, ansi-terminal, array, base
+    ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq-generics, Diff
      , directory, executable-path, extensible-exceptions, filemanip
-     , filepath, haddock-library, happy, highlighting-kate, hslua, HTTP
+     , 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
@@ -98233,25 +100738,29 @@ self: {
        pname = "pandoc";
        version = "1.15.0.6";
        sha256 = "0ipdy5wl2qb8nvmdka9si17hvxn38xmv5pzpb9v5lvaj8a0rcl6r";
+       configureFlags = [ "-fhttps" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson alex array base base64-bytestring binary blaze-html
-         blaze-markup bytestring cmark containers data-default
-         deepseq-generics directory extensible-exceptions filemanip filepath
-         haddock-library happy 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
+       libraryHaskellDepends = [
+         aeson array base base64-bytestring binary blaze-html blaze-markup
+         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
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring containers directory extensible-exceptions
+         filepath highlighting-kate HTTP network network-uri pandoc-types
+         text yaml
+       ];
+       testHaskellDepends = [
          ansi-terminal base bytestring containers Diff directory
          executable-path filepath highlighting-kate HUnit pandoc-types
          process QuickCheck syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
-       configureFlags = [ "-fhttps" ];
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
@@ -98270,13 +100779,16 @@ self: {
        sha256 = "0dpr74alkz9vy5yc09bnqb968hcrqys2xlydjda1g3qsarjg7p9y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers
-         data-default directory filepath hs-bibutils mtl old-locale pandoc
-         pandoc-types parsec process rfc5051 setenv split syb tagsoup
-         temporary text time vector xml-conduit yaml
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time vector xml-conduit yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath pandoc pandoc-types process syb temporary text vector yaml
+       ];
+       testHaskellDepends = [
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
@@ -98294,11 +100806,11 @@ self: {
        sha256 = "1ay54zkxxa22nz5sr40d6k4bam81hxh19583kffwqdcp0af23d7l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers data-default mtl pandoc pandoc-types
          yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers data-default hspec mtl pandoc
          pandoc-types process yaml
        ];
@@ -98312,16 +100824,16 @@ self: {
      mkDerivation {
        pname = "pandoc-csv2table";
        version = "1.0.1";
-       revision = "1";
        sha256 = "0b4xszf9bzfhrjgy2cymryab58zhh4jwv9p8g2hiqgrxix8jr1qb";
+       revision = "1";
        editedCabalFile = "0924cc418394f855f93486ee6fb3bae991112c3e63df74f95afa6c2d62b09299";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base csv pandoc pandoc-types text ];
+       libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
+       executableHaskellDepends = [ base csv pandoc pandoc-types ];
        homepage = "https://github.com/baig/pandoc-csv2table-filter";
        description = "Convert CSV to Pandoc Table Markdown";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-lens" = callPackage
@@ -98330,7 +100842,7 @@ self: {
        pname = "pandoc-lens";
        version = "0.3.2";
        sha256 = "1n0h3cf2yb5rmlfd0bbxlj3r8bm4h8yffd76fqsbw3s5jm0df4wb";
-       buildDepends = [ base containers lens pandoc-types ];
+       libraryHaskellDepends = [ base containers lens pandoc-types ];
        jailbreak = true;
        homepage = "http://github.com/bgamari/pandoc-lens";
        description = "Lenses for Pandoc documents";
@@ -98347,7 +100859,7 @@ self: {
        sha256 = "0vq94j5jsq60p0wbml50hwqa2zpidbzx92cbb7d2ialqj7816zwb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring explicit-exception http-conduit pandoc-types
          spreadsheet
        ];
@@ -98364,7 +100876,7 @@ self: {
        pname = "pandoc-types";
        version = "1.12.4.5";
        sha256 = "0yw7mkhx63320vqabql2iqnmkrwh1qs670sicqpcvv73dchdp8c7";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers deepseq-generics ghc-prim syb
        ];
        homepage = "http://johnmacfarlane.net/pandoc";
@@ -98380,7 +100892,7 @@ self: {
        sha256 = "0jdlfqhp7h6jsp9qq2ndnm8fs96m19cmmd5rnjpqb76ilg6kn7l9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base pandoc ];
+       executableHaskellDepends = [ base pandoc ];
        description = "Literate Haskell support for GitHub's Markdown flavor";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98394,11 +100906,11 @@ self: {
        pname = "pango";
        version = "0.13.1.0";
        sha256 = "0s69ga5gn9grdqcfxkbnvk0f3malql3fnhzh9cwvpfzqk3hxn4hn";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cairo containers directory glib mtl pretty process text
        ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ pango ];
+       libraryPkgconfigDepends = [ pango ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Pango text rendering engine";
        license = stdenv.lib.licenses.lgpl21;
@@ -98414,9 +100926,11 @@ self: {
        sha256 = "02j3bydxzs39ljfnx1sgsn9ppw1cah81dfbws57yp9vdrcyq2ipf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring directory filepath monads-tf template-haskell
-         transformers
+       libraryHaskellDepends = [
+         base bytestring monads-tf template-haskell transformers
+       ];
+       executableHaskellDepends = [
+         base directory filepath monads-tf template-haskell transformers
        ];
        homepage = "https://skami.iocikun.jp/haskell/packages/papillon";
        description = "packrat parser";
@@ -98432,7 +100946,7 @@ self: {
        sha256 = "14f4mv9xgqwmmyy3fg1miqdmi7a6bs3hixqk4z46r0pz44w6nlxd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://pdos.csail.mit.edu/~baford/packrat/thesis/";
        description = "Packrat parsing; linear-time parsers for grammars in TDPL";
        license = stdenv.lib.licenses.bsd3;
@@ -98445,7 +100959,7 @@ self: {
        pname = "para";
        version = "1.1";
        sha256 = "0l5abmqi548s10f87m124ld4hhphhl1szljyc04a13fah4dsqjbh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Text paragraph formatting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98461,12 +100975,18 @@ self: {
        sha256 = "1iz7fg7ziq3ffq1wac0z2m151rn4xmvd5kig04fdw1cy0x487c9c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers cpphs directory filepath
          haskell-src-meta parsec pretty syb template-haskell th-lift
          uniplate
        ];
-       buildTools = [ alex ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         array base bytestring containers cpphs directory filepath
+         haskell-src-meta parsec pretty syb template-haskell th-lift
+         uniplate
+       ];
+       executableToolDepends = [ alex ];
        jailbreak = true;
        description = "Paragon";
        license = stdenv.lib.licenses.bsd3;
@@ -98479,7 +100999,7 @@ self: {
        pname = "parallel";
        version = "3.2.0.3";
        sha256 = "1kbdzdz9s8jq0xysqgvxx1zvzqlxgj1sk476mciwcn327kpl0fhn";
-       buildDepends = [ array base containers deepseq ];
+       libraryHaskellDepends = [ array base containers deepseq ];
        jailbreak = true;
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
@@ -98491,7 +101011,7 @@ self: {
        pname = "parallel";
        version = "3.2.0.6";
        sha256 = "0hp6vf4zxsw6vz6lj505xihmnfhgjp39c9q7nyzlgcmps3xx6a5r";
-       buildDepends = [ array base containers deepseq ];
+       libraryHaskellDepends = [ array base containers deepseq ];
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98501,12 +101021,14 @@ self: {
      mkDerivation {
        pname = "parallel-io";
        version = "0.3.3";
-       revision = "1";
        sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s";
+       revision = "1";
        editedCabalFile = "75eeeb51593fa2771c8dbc965ca09d830d62e08135870188a10446f842178bee";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers extensible-exceptions random ];
+       libraryHaskellDepends = [
+         base containers extensible-exceptions random
+       ];
        homepage = "http://batterseapower.github.com/parallel-io";
        description = "Combinators for executing IO actions in parallel on a thread pool";
        license = stdenv.lib.licenses.bsd3;
@@ -98520,7 +101042,7 @@ self: {
        pname = "parallel-tasks";
        version = "4.0.1.0";
        sha256 = "0cng14pivk0cw3xax0z4j59s0vpbkm7hjycsb3cif6pfjbypsm3x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal deepseq here old-locale stm time
          transformers vector vector-algorithms
        ];
@@ -98535,7 +101057,7 @@ self: {
        pname = "parallel-tree-search";
        version = "0.4.1";
        sha256 = "1x2k649q6gqz9z16vwg1j59ajf2wp59lfwb65g8819fz4rwimncr";
-       buildDepends = [ base parallel tree-monad ];
+       libraryHaskellDepends = [ base parallel tree-monad ];
        homepage = "http://github.com/sebfisch/parallel-tree-search";
        description = "Parallel Tree Search";
        license = stdenv.lib.licenses.publicDomain;
@@ -98547,7 +101069,7 @@ self: {
        pname = "parameterized-data";
        version = "0.1.5";
        sha256 = "1zcfpapbgmzfrrwn8bq829scb89b52p1567xaw45d77z3hw24cq1";
-       buildDepends = [ base template-haskell type-level ];
+       libraryHaskellDepends = [ base template-haskell type-level ];
        homepage = "http://code.haskell.org/parameterized-data";
        description = "Parameterized data library implementing lightweight dependent types";
        license = stdenv.lib.licenses.bsd3;
@@ -98560,7 +101082,7 @@ self: {
        pname = "parco";
        version = "0.1";
        sha256 = "0598hz6zqcn4lh5y3vr54z4jh4ampxnh8rq29k6p5vnmrpvn4lq4";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Generalised parser combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98572,7 +101094,7 @@ self: {
        pname = "parco-attoparsec";
        version = "0.1";
        sha256 = "0bc2gyvc1i3l3p702zs6hfkab7fmc7li5kh4mdzy3a91gzgsl3jh";
-       buildDepends = [ attoparsec base mtl parco ];
+       libraryHaskellDepends = [ attoparsec base mtl parco ];
        description = "Generalised parser combinators - Attoparsec interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98584,7 +101106,7 @@ self: {
        pname = "parco-parsec";
        version = "0.1";
        sha256 = "0m3dsjay3av4y0v4j76wxybmk4mkjdhqq81w1wsfr173d4blgxf3";
-       buildDepends = [ base mtl parco parsec ];
+       libraryHaskellDepends = [ base mtl parco parsec ];
        description = "Generalised parser combinators - Parsec interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98598,7 +101120,7 @@ self: {
        pname = "parcom-lib";
        version = "0.8.0.3";
        sha256 = "0xkxkqswpkqr9xcpg52v845kkxg8z20r26yih8l2vwkym5cj49ab";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl text transformers utf8-string word8
        ];
        homepage = "https://bitbucket.org/tdammers/parcom-lib";
@@ -98620,7 +101142,7 @@ self: {
        sha256 = "05id69rb2cdzs1jf7zgv0gxgvbwm6x83s6ihdh9w1wnnpa7ykpap";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          abstract-par accelerate accelerate-io array async base binary
          bytestring containers deepseq directory distributed-process
          distributed-process-simplelocalnet distributed-static fclabels
@@ -98639,7 +101161,7 @@ self: {
        pname = "parport";
        version = "0.0.0";
        sha256 = "1d4fq67179n6flmi4ll0341cnnx6p7v44sj5xkk5vknm7qv1p5nx";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Simply interfacing the parallel port on linux";
        license = "GPL";
      }) {};
@@ -98650,7 +101172,7 @@ self: {
        pname = "parse-dimacs";
        version = "1.3";
        sha256 = "0amh3h49xi65kx8l34cy5jkai1f0d9l1qxp4937f3cjf7afif0pj";
-       buildDepends = [ array base bytestring parsec ];
+       libraryHaskellDepends = [ array base bytestring parsec ];
        description = "DIMACS CNF parser library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98663,11 +101185,11 @@ self: {
        pname = "parse-help";
        version = "0.0";
        sha256 = "1vy7v49nh60gkb7vsig87hv11cxn19xs2jjvd0xnnhdz0zm4z7yf";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base containers data-default file-location
          template-haskell text th-lift
        ];
-       testDepends = [ cmdargs ];
+       testHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "http://github.com/gregwebs/cmdargs-help";
        description = "generate command line arguments from a --help output";
@@ -98683,7 +101205,8 @@ self: {
        sha256 = "0pzw7w1kr2rv6ffqgn93rypn37wy2r5k01p3y5256laaplm575am";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base ];
        homepage = "http://github.com/BartMassey/parseargs";
        description = "Command-line argument parsing library for Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -98697,8 +101220,10 @@ self: {
        pname = "parsec";
        version = "3.1.9";
        sha256 = "1ja20cmj6v336jy87c6h3jzjp00sdbakwbdwp11iln499k913xvi";
-       buildDepends = [ base bytestring mtl text ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base bytestring mtl text ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        homepage = "https://github.com/aslatter/parsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -98710,7 +101235,7 @@ self: {
        pname = "parsec-extra";
        version = "0.1.0.5";
        sha256 = "0x5lpkly8z26ygp0k8ddkybgmfi5n2vnf6sv3sjn3xm531xf6qy4";
-       buildDepends = [ base monads-tf parsec transformers ];
+       libraryHaskellDepends = [ base monads-tf parsec transformers ];
        description = "Some miscellaneous basic string parsers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98721,7 +101246,7 @@ self: {
        pname = "parsec-numbers";
        version = "0.1.0";
        sha256 = "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Utilities for parsing numbers from strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98734,8 +101259,8 @@ self: {
        pname = "parsec-parsers";
        version = "0.2";
        sha256 = "1knmcciyq07vp06s3xh4hwz654n017863dh9hdp1mwm57vc43s3j";
-       buildDepends = [ base parsec parsers ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ base parsec parsers ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/parsec-parsers/";
        description = "Parsing instances for Parsec";
@@ -98748,8 +101273,8 @@ self: {
        pname = "parsec-permutation";
        version = "0.1.2.0";
        sha256 = "0yfdgvw093kk5id9h6b566zniss26kw6rxnvsni6dgr4knzyx1xi";
-       buildDepends = [ base parsec ];
-       testDepends = [ base parsec QuickCheck ];
+       libraryHaskellDepends = [ base parsec ];
+       testHaskellDepends = [ base parsec QuickCheck ];
        description = "Applicative permutation parser for Parsec intended as a replacement for Text.Parsec.Perm.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98760,7 +101285,7 @@ self: {
        pname = "parsec-tagsoup";
        version = "0.1";
        sha256 = "1pzspf5fimjlki5fn3lxz1kdpd9pf2ww8z9sf08zaiyfp4ms15n1";
-       buildDepends = [ base parsec tagsoup ];
+       libraryHaskellDepends = [ base parsec tagsoup ];
        description = "Parsec parsers for Tagsoup tag streams";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -98771,7 +101296,7 @@ self: {
        pname = "parsec-utils";
        version = "0.1.0.0";
        sha256 = "0pfdl9zsdzxcbjh37234djcbg6sdhqzx3fnin0b55hxn78k26ivi";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Utility functions and combinators for Text.Parsec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98782,7 +101307,7 @@ self: {
        pname = "parsec1";
        version = "1.0.0.6";
        sha256 = "0wwmghla8cqmmpwx9wwcmh39d9np9cgc1d0w3xf18k4adb1sg636";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/~daan/parsec.html";
        description = "Portable monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -98794,7 +101319,7 @@ self: {
        pname = "parsec2";
        version = "1.0.0";
        sha256 = "0iq5b5d0pdm49qnigss29vnxj3yjqa5rllp29dxl8df6393k6sk9";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/~daan/parsec.html";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -98807,7 +101332,7 @@ self: {
        pname = "parsec3";
        version = "1.0.1.8";
        sha256 = "00p3kffqmsi6lvxbpa60nql3lgm9vnxsspp8m0jz2d2hfl7hadqf";
-       buildDepends = [ base bytestring mtl text ];
+       libraryHaskellDepends = [ base bytestring mtl text ];
        homepage = "http://www.cs.uu.nl/~daan/parsec.html";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -98819,7 +101344,7 @@ self: {
        pname = "parsec3-numbers";
        version = "0.1.0";
        sha256 = "0i7fvbhvvmf5nld51kv9v0vpb42dlnpivxcl7ll0zwa3gzks2cm5";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Utilities for parsing numbers from Char sequences";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98830,7 +101355,7 @@ self: {
        pname = "parsedate";
        version = "3000.0.0";
        sha256 = "0gsylvm8srddmh3g3ysjgqqmgp0ddg6pdi2sz15v6nrvsqfabiip";
-       buildDepends = [ base old-locale old-time parsec ];
+       libraryHaskellDepends = [ base old-locale old-time parsec ];
        homepage = "http://www.cs.chalmers.se/~bringert/darcs/parsedate/doc/";
        description = "Data and time parsing for CalendarTime";
        license = stdenv.lib.licenses.bsd3;
@@ -98842,8 +101367,8 @@ self: {
        pname = "parseerror-eq";
        version = "0.1.0.1";
        sha256 = "1w5hn50gwyq2qcax869nplmhrclpsxfy0ckij6ydlhmq22zh0l03";
-       buildDepends = [ base parsec ];
-       testDepends = [ base hspec parsec ];
+       libraryHaskellDepends = [ base parsec ];
+       testHaskellDepends = [ base hspec parsec ];
        homepage = "https://github.com/stackbuilders/parseerror-eq";
        description = "Adds and Eq instance for Parsec's ParseError if needed";
        license = stdenv.lib.licenses.mit;
@@ -98855,10 +101380,9 @@ self: {
        pname = "parsek";
        version = "1.0.1.3";
        sha256 = "184cbw9gz3vv2jbr2wzkygv25y70jayxd8d76pgpvjcaps4qqxp7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Parallel Parsing Processes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsely" = callPackage
@@ -98867,7 +101391,7 @@ self: {
        pname = "parsely";
        version = "0.1";
        sha256 = "16sg32qs1kq184wk6d83z20b9firh1kjmysqwd2aqaiyq37zjyyb";
-       buildDepends = [ base mtl parsec ];
+       libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://naesten.dyndns.org:8080/repos/parsely";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98881,7 +101405,9 @@ self: {
        sha256 = "0cvdvphxlbyv5l9q5yc4b4kb59ghar2pmqx8pk387ffgz71r7ppb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ aeson base bytestring haskell-src-exts text ];
+       executableHaskellDepends = [
+         aeson base bytestring haskell-src-exts text
+       ];
        jailbreak = true;
        description = "Prints Haskell parse trees in JSON";
        license = stdenv.lib.licenses.asl20;
@@ -98897,10 +101423,10 @@ self: {
        pname = "parsergen";
        version = "0.2.0.7";
        sha256 = "01yx4pa5x87nqz8k999jr7bnyfkjlgk660c53xkj5ipcvl4b9mfi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath parsec template-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath HUnit parsec QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -98920,11 +101446,11 @@ self: {
        pname = "parsers";
        version = "0.12.2.1";
        sha256 = "0wrzqx282ygc3m05nff2zkshgnx4lkws8d54qhkd9pjxja0fbjn7";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base charset containers parsec scientific text
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring containers directory doctest filepath
          parsec QuickCheck quickcheck-instances
        ];
@@ -98944,11 +101470,14 @@ self: {
        sha256 = "0prbn7vi2bp66x4fs5cm8lz9qv4d1kpcd20mf24zwpa9siwyf4aq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring bytestring-mmap bytestring-nums
          bytestring-show containers deepseq derive mtl zlib
        ];
-       buildTools = [ happy ];
+       libraryToolDepends = [ happy ];
+       executableHaskellDepends = [
+         array base binary bytestring containers deepseq mtl
+       ];
        jailbreak = true;
        description = "NMR-STAR file format parser";
        license = stdenv.lib.licenses.bsd3;
@@ -98961,7 +101490,7 @@ self: {
        pname = "parsimony";
        version = "1.3";
        sha256 = "0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        description = "Monadic parser combinators derived from Parsec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98971,10 +101500,10 @@ self: {
      mkDerivation {
        pname = "partial";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "0ybh0yz68gawbfswk1s498asc1z7qw6b8qys7rasw5i5iw6vjvr8";
+       revision = "1";
        editedCabalFile = "f49cbb0cfb2f101a006bb54ada3982ae85b6413d019fd92927ce259b3666e172";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/paf31/partial";
        description = "A nullary type class for partial functions";
        license = stdenv.lib.licenses.mit;
@@ -98985,10 +101514,10 @@ self: {
      mkDerivation {
        pname = "partial-handler";
        version = "1.0.0.0";
-       revision = "1";
        sha256 = "1fmfiw38v77anh20xh5zzqxm2dcryyyismsagn09sc27jdgnnrzl";
+       revision = "1";
        editedCabalFile = "2e1042c8b036ba686e544bfdd1302fd9f66f377010fa05739e7fc000d97fa597";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nikita-volkov/partial-handler";
        description = "A composable exception handler";
        license = stdenv.lib.licenses.mit;
@@ -99000,7 +101529,7 @@ self: {
        pname = "partial-isomorphisms";
        version = "0.2";
        sha256 = "0wmlx1dp7i9rp3s5028gvqa7z0g1dkzlyd134kh04s1lx2hb94px";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse";
        description = "Partial isomorphisms";
        license = stdenv.lib.licenses.bsd3;
@@ -99014,7 +101543,7 @@ self: {
        pname = "partial-lens";
        version = "0.0.1";
        sha256 = "0s7p69fl1a3q4x2n9hf4540dcxjxjsj4knf2nal3wl1djh067ja8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad-transformers data-lens transformers
        ];
        jailbreak = true;
@@ -99029,7 +101558,7 @@ self: {
        pname = "partial-uri";
        version = "0.2";
        sha256 = "0n3rmajbmnydqk6jk36n83a6ra5p1dkdbd592ywjfq4jhmh98333";
-       buildDepends = [ base network-uri ];
+       libraryHaskellDepends = [ base network-uri ];
        homepage = "https://github.com/singpolyma/partial-uri";
        description = "Datatype for passing around unresolved URIs";
        license = "unknown";
@@ -99045,11 +101574,12 @@ self: {
        sha256 = "0s5cr0ysxv74dlziyf2ga29wawwlikqgb2njv8g1f1rb8i5n97gv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base binary bytestring ];
+       executableHaskellDepends = [
          aeson aeson-pretty base base64-bytestring binary bytestring
          optparse-applicative vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base64-bytestring binary bytestring QuickCheck vector
        ];
        homepage = "https://github.com/startling/partly";
@@ -99067,7 +101597,7 @@ self: {
        pname = "passage";
        version = "0.1";
        sha256 = "11qrm27a1fn8p8z0q1400nd30sblm8pcn6znz4syg9jkmqhpn8ig";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath GraphSCC monadLib
          mwc-random pretty primitive process random
        ];
@@ -99082,7 +101612,7 @@ self: {
        pname = "passwords";
        version = "0.1.0.6";
        sha256 = "0x345pfa28abj152kkr1afnaraf4r8pj0216ack79brxvdhlk6li";
-       buildDepends = [ base containers MonadRandom random ];
+       libraryHaskellDepends = [ base containers MonadRandom random ];
        description = "Password generation/validation library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -99093,7 +101623,7 @@ self: {
        pname = "pastis";
        version = "0.1.2";
        sha256 = "1425gzss5maqzrphrvvsw60lkapwg3wfjx10c59qkylx63k5ixjl";
-       buildDepends = [ base HTTP network ];
+       libraryHaskellDepends = [ base HTTP network ];
        description = "Interface to the past.is URL shortening service";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99107,7 +101637,7 @@ self: {
        sha256 = "12pmqcpqa6gjph40w4ga53ij8b989igaf3r6jwxng67kmddkq22z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring mtl ];
+       executableHaskellDepends = [ base bytestring mtl ];
        homepage = "http://github.com/markusle/pasty/tree/master";
        description = "A simple command line pasting utility";
        license = "GPL";
@@ -99120,7 +101650,7 @@ self: {
        pname = "patch-combinators";
        version = "0.2.2";
        sha256 = "007bxr6xfqjmbx4b9k3n3qw7jmrn298v8cqxvycfhy5924l9jyi6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library for patching functions and data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99136,7 +101666,7 @@ self: {
        sha256 = "0ls3dlwgki483l1raaqb247by0kpzvqc54g1gmvr71zfgbfxrjl2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-cuda accelerate-fft
          accelerate-io accelerate-utility base Cabal filepath gnuplot
          hmatrix JuicyPixels utility-ht vector
@@ -99155,8 +101685,10 @@ self: {
        pname = "path";
        version = "0.5.2";
        sha256 = "10ai0ygal1pipdi6221nhv0apgv8hzrra7jpgkn7nl62dbj2sl34";
-       buildDepends = [ base exceptions filepath template-haskell ];
-       testDepends = [ base hspec HUnit mtl ];
+       libraryHaskellDepends = [
+         base exceptions filepath template-haskell
+       ];
+       testHaskellDepends = [ base hspec HUnit mtl ];
        description = "Path";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99167,8 +101699,8 @@ self: {
        pname = "path-pieces";
        version = "0.2.0";
        sha256 = "116zx2ryzywh2rd4q16a5vh04gw92as9vgfvraw3a66xn0m6g5y0";
-       buildDepends = [ base text time ];
-       testDepends = [ base hspec HUnit QuickCheck text ];
+       libraryHaskellDepends = [ base text time ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck text ];
        description = "Components of paths";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99179,7 +101711,7 @@ self: {
        pname = "pathfinding";
        version = "0.1.0.0";
        sha256 = "1d1vpkx4gl438b71mni80n46yrhz57z2hq2p9j2fkkpxj3k72y80";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/rvion/pathfinding";
        description = "pathfinding in grid and graphs";
        license = stdenv.lib.licenses.mit;
@@ -99191,8 +101723,8 @@ self: {
        pname = "pathfindingcore";
        version = "1.2";
        sha256 = "0x2bw79ym5rndhy5qd50gqv6fkqvp2zby4af2d5gdvsbm9fhv6c8";
-       buildDepends = [ array base split ];
-       testDepends = [ array base HUnit tasty tasty-hunit ];
+       libraryHaskellDepends = [ array base split ];
+       testHaskellDepends = [ array base HUnit tasty tasty-hunit ];
        homepage = "http://github.com/TheBizzle";
        description = "A toy pathfinding library";
        license = stdenv.lib.licenses.bsd3;
@@ -99205,7 +101737,7 @@ self: {
        pname = "pathtype";
        version = "0.5.4";
        sha256 = "1ns5q3nrkl99xp4mrmk8wpvb9qzyvnw5cyjwh5rh76ykm2d5dbg7";
-       buildDepends = [ base directory QuickCheck time ];
+       libraryHaskellDepends = [ base directory QuickCheck time ];
        homepage = "http://code.haskell.org/pathtype";
        description = "Type-safe replacement for System.FilePath etc";
        license = stdenv.lib.licenses.bsd3;
@@ -99217,7 +101749,7 @@ self: {
        pname = "patience";
        version = "0.1.1";
        sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Patience diff and longest increasing subsequence";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99230,7 +101762,7 @@ self: {
        sha256 = "0agmgp3qvd710fcrqyfyvhck6yd311wxmmh5qd8lfgdm6597lhvi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HandsomeSoup hxt ];
+       executableHaskellDepends = [ base HandsomeSoup hxt ];
        jailbreak = true;
        description = "A webpage scraper for Patreon which dumps a list of patrons to a text file";
        license = stdenv.lib.licenses.mit;
@@ -99242,7 +101774,7 @@ self: {
        pname = "pattern-arrows";
        version = "0.0.2";
        sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://blog.functorial.com/posts/2013-10-27-Pretty-Printing-Arrows.html";
        description = "Arrows for Pretty Printing";
        license = stdenv.lib.licenses.mit;
@@ -99256,7 +101788,7 @@ self: {
        pname = "patterns";
        version = "0.1.1";
        sha256 = "176si32zbrklf7wsspg0qdswd85ah0gl9k25ylx9qi2rr1vp18pv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers mtl time utf8-string
          zeromq-haskell
        ];
@@ -99272,8 +101804,8 @@ self: {
        pname = "paymill";
        version = "0.0.0";
        sha256 = "1gw3mxh766wf5anyn84qcf8nn96fzd1ibcjg55bk9b1yw6dc1va0";
-       buildDepends = [ base ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        description = "This is an unofficial client for the Paymill API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99289,11 +101821,12 @@ self: {
        sha256 = "0z71j79wqxnixadpy47n30nrwhqya6qaadlwvrk9q60vrqvd21rm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring errors http-client lens lens-aeson text time
          transformers vector wreq
        ];
-       testDepends = [
+       executableHaskellDepends = [ base text ];
+       testHaskellDepends = [
          aeson base bytestring HUnit test-framework test-framework-hunit
          text unordered-containers
        ];
@@ -99310,7 +101843,7 @@ self: {
        pname = "paypal-api";
        version = "0.2";
        sha256 = "0im96yxvbb78sb0b83yypcwsa27gnjbjxbfki5rdnpgbf2yr8k9h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers failure http-conduit http-types
          mtl old-locale text time wai
        ];
@@ -99329,7 +101862,9 @@ self: {
        sha256 = "03cb5diy7wvcd0gm09r4172mck0n4v5hxyc622r8k3phzvzq9zdf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers HTTP network process ];
+       executableHaskellDepends = [
+         base containers HTTP network process
+       ];
        description = "pastebin command line application";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99341,7 +101876,7 @@ self: {
        pname = "pbc4hs";
        version = "0.1.1.5";
        sha256 = "16dki82d9x6rpkbax090ax8ynwjxv31cvpzpy51ynq83kjg3v2z9";
-       buildDepends = [ base hslua string-qq ];
+       libraryHaskellDepends = [ base hslua string-qq ];
        jailbreak = true;
        homepage = "https://github.com/DavidFeng/pbc4hs";
        description = "pbc for HsLua";
@@ -99356,10 +101891,10 @@ self: {
        pname = "pbkdf";
        version = "1.1.1.1";
        sha256 = "1nbn8kan43i00g23g8aljxjpaxm9q1qhzxxdgks0mc4mr1f7bifx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary byteable bytedump bytestring cryptohash utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary byteable bytedump bytestring cryptohash utf8-string
        ];
        homepage = "https://github.com/cdornan/pbkdf";
@@ -99368,17 +101903,16 @@ self: {
      }) {};
 
   "pcap" = callPackage
-    ({ mkDerivation, base, bytestring, libpcap, network, time }:
+    ({ mkDerivation, base, bytestring, network, time }:
      mkDerivation {
        pname = "pcap";
        version = "0.4.5.2";
        sha256 = "0pydw62qqw61sxfd8x9vvwgpgl3zp6mqv8rm4c825ymzyipjxsg7";
-       buildDepends = [ base bytestring network time ];
-       extraLibraries = [ libpcap ];
+       libraryHaskellDepends = [ base bytestring network time ];
        homepage = "https://github.com/bos/pcap";
        description = "A system-independent interface for user-level packet capture";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libpcap;};
+     }) {};
 
   "pcap-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, pcap, transformers }:
@@ -99386,7 +101920,9 @@ self: {
        pname = "pcap-conduit";
        version = "0.1";
        sha256 = "07a6cwaq668a948njjybj9clbswmhz88xrwjkb42jg9gm1nh46kz";
-       buildDepends = [ base bytestring conduit pcap transformers ];
+       libraryHaskellDepends = [
+         base bytestring conduit pcap transformers
+       ];
        homepage = "http://github.com/thoughtpolice/pcap-conduit";
        description = "Conduit <-> libpcap";
        license = stdenv.lib.licenses.bsd3;
@@ -99399,7 +101935,9 @@ self: {
        pname = "pcap-enumerator";
        version = "0.5";
        sha256 = "0v7ar3jbs54ibhrbbzmvajc7pc8h8dv56wr77w4vsbyz6xq4sqdb";
-       buildDepends = [ base bytestring enumerator pcap transformers ];
+       libraryHaskellDepends = [
+         base bytestring enumerator pcap transformers
+       ];
        homepage = "http://github.com/cutsea110/pcap-enumerator";
        description = "Convert a pcap into an enumerator";
        license = stdenv.lib.licenses.bsd3;
@@ -99416,11 +101954,12 @@ self: {
        sha256 = "1nwyv5c0x262b4j73560bnxhab07ky0cba8nrzdbmmwl2g72c8m7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary bytestring deepseq lens linear mtl text
          vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base directory HUnit lens string-qq test-framework
          test-framework-hunit text vector
        ];
@@ -99436,7 +101975,7 @@ self: {
        pname = "pcf";
        version = "0.1.0.1";
        sha256 = "1dmp9afylsf4n7gxa23wn25w8h89lqyhjlxa5g7gshrbwxkx7c55";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bound c-dsl containers monad-gen mtl prelude-extras
          transformers void
        ];
@@ -99452,8 +101991,10 @@ self: {
        pname = "pcg-random";
        version = "0.1.3.1";
        sha256 = "02sx8l51dks316n0df7h75igynb56ms8gs8siczbl5zrlrgycywi";
-       buildDepends = [ base bytestring entropy primitive random time ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [
+         base bytestring entropy primitive random time
+       ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/cchalmers/pcg-random";
        description = "Haskell bindings to the PCG random number generator";
        license = stdenv.lib.licenses.bsd3;
@@ -99467,10 +102008,10 @@ self: {
        pname = "pcre-heavy";
        version = "0.2.2";
        sha256 = "08cv6vmf5qpjky8zfrz3c5cczn5vrf30p5masyb3m625wm2sjjw3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring pcre-light stringable template-haskell
        ];
-       testDepends = [ base doctest Glob ];
+       testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/myfreeweb/pcre-heavy";
        description = "A regexp library on top of pcre-light you can actually use";
        license = "unknown";
@@ -99482,7 +102023,7 @@ self: {
        pname = "pcre-less";
        version = "0.2.1";
        sha256 = "1widnpz4r2az96lwxrq21vm21j9j7b4sn86kqn2iih3xs2dpwqf9";
-       buildDepends = [ array base regex-pcre ];
+       libraryHaskellDepends = [ array base regex-pcre ];
        description = "Nicer interface to regex-pcre";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99493,8 +102034,8 @@ self: {
        pname = "pcre-light";
        version = "0.4.0.3";
        sha256 = "0l1df2sk5qwf424bvb8mbdkr2xjg43fi92n5r22yd7vm1zz0jqvf";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ pcre ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ pcre ];
        homepage = "https://github.com/Daniel-Diaz/pcre-light";
        description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -99506,7 +102047,7 @@ self: {
        pname = "pcre-light-extra";
        version = "0.0.0";
        sha256 = "1kjh36gglszd16rsh0rm2q5fxjlfipzld4hw0l2r23y0flbqkbvx";
-       buildDepends = [ base bytestring pcre-light ];
+       libraryHaskellDepends = [ base bytestring pcre-light ];
        jailbreak = true;
        homepage = "http://github.com/urso/pcre-light-extra";
        description = "pcre-light extra functionality";
@@ -99521,10 +102062,10 @@ self: {
        pname = "pcre-utils";
        version = "0.1.5";
        sha256 = "0b6n3sls6r65kn7i9z607ck99sxw2xxh7frljc09cx73iy71ml69";
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base bytestring mtl regex-pcre-builtin vector
        ];
-       testDepends = [ base bytestring HUnit regex-pcre-builtin ];
+       testHaskellDepends = [ base bytestring HUnit regex-pcre-builtin ];
        description = "Perl-like substitute and split for PCRE regexps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99537,7 +102078,7 @@ self: {
        pname = "pdf-toolbox-content";
        version = "0.0.3.3";
        sha256 = "03kyp3nnbg4gchc4g9biavlf0hdjv77pc66jqngzjzmk8rh03k9c";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring containers io-streams
          pdf-toolbox-core text
        ];
@@ -99554,7 +102095,7 @@ self: {
        pname = "pdf-toolbox-core";
        version = "0.0.3.3";
        sha256 = "006fp7cvq8r4l0iif2ihi0cq8pxl5mm8vf7ny4zhaniyyf52g68m";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers errors io-streams scientific
          transformers zlib-bindings
        ];
@@ -99572,7 +102113,7 @@ self: {
        pname = "pdf-toolbox-document";
        version = "0.0.5.1";
        sha256 = "0qcnhdhxvrj9ypwyb3h7q7w6yn9jpzzrqrlhnas40lvjb9rc2yws";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cipher-aes cipher-rc4 containers crypto-api
          cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text
          transformers
@@ -99593,7 +102134,7 @@ self: {
        sha256 = "02nnxvbd5l2wni9djqmdmqagb5k10dnc1k4crlkvrc8fa9rlajz2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cairo containers directory filepath gtk io-streams
          pdf-toolbox-content pdf-toolbox-document process random text
          transformers
@@ -99613,7 +102154,7 @@ self: {
        sha256 = "07a9ddr4j5f4vhv1md32f0d3mwhx5p9lw0bwjikfhhqq49jvrpa5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers filepath FindBin process
        ];
        description = "Simple command-line utility to convert PDF into text";
@@ -99628,7 +102169,7 @@ self: {
        pname = "pdfinfo";
        version = "1.5.4";
        sha256 = "04894cwvcn910j2b0j95dc6i9v6xriqa0v97z3vyi9dhi9yiysls";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl old-locale process-extras text time time-locale-compat
        ];
        homepage = "https://github.com/chrisdone/pdfinfo";
@@ -99644,7 +102185,9 @@ self: {
        sha256 = "00bnbfy3awl9vd9vvmh6ylfn2d882r3r1am6b6788b78lvznypxa";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory pdfinfo process temporary ];
+       executableHaskellDepends = [
+         base directory pdfinfo process temporary
+       ];
        jailbreak = true;
        homepage = "http://dmwit.com/pdfsplit";
        description = "split two-column PDFs, so there is one column per page";
@@ -99659,7 +102202,7 @@ self: {
        pname = "pdynload";
        version = "0.0.3";
        sha256 = "0949nzk85fp9vs6v90cd6kxgg52pcaz2mfahv7416qpgp65hpw93";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath ghc ghc-paths old-time process
        ];
        description = "pdynload is polymorphic dynamic linking library";
@@ -99675,7 +102218,7 @@ self: {
        pname = "peakachu";
        version = "0.3.1";
        sha256 = "1wmlainnbrzpwrsr4qhw7m39s4crhc67xg1mxam0rfj9c1cnimxp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base derive GLUT List template-haskell time TypeCompose
        ];
        description = "Experiemental library for composable interactive programs";
@@ -99689,7 +102232,7 @@ self: {
        pname = "peano";
        version = "0.1.0.1";
        sha256 = "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Peano numbers";
        license = "unknown";
      }) {};
@@ -99700,7 +102243,7 @@ self: {
        pname = "peano-inf";
        version = "0.6.5";
        sha256 = "1w8rvlckqcy41ciq2csb2nf83l969nwvvrrlm0x1yzf5i6ibg33b";
-       buildDepends = [ base containers lazysmallcheck ];
+       libraryHaskellDepends = [ base containers lazysmallcheck ];
        description = "Lazy Peano numbers including observable infinity value";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99716,9 +102259,13 @@ self: {
        sha256 = "110i4y93gm6b76and12vra8nr5q2dz20dvgpbpdgic3sv2ds16k0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base Cabal cmdargs containers deepseq derive directory
-         filepath grm mtl old-time process shake syb uniplate wl-pprint
+       libraryHaskellDepends = [
+         array base Cabal cmdargs containers deepseq derive grm mtl shake
+         syb uniplate wl-pprint
+       ];
+       executableHaskellDepends = [
+         base Cabal cmdargs deepseq derive directory filepath grm mtl
+         old-time process shake syb uniplate wl-pprint
        ];
        description = "pec embedded compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -99731,7 +102278,7 @@ self: {
        pname = "pecoff";
        version = "0.11";
        sha256 = "0vb22jfl309k4a6b80015cyrs5cxls7vyf8faz7lrm7i0vj0vz1q";
-       buildDepends = [ base binary bytestring containers ];
+       libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for PE/COFF format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99746,7 +102293,7 @@ self: {
        sha256 = "0mh56nkn31dwpyrl238b06gyfwy3p7y90b9y6k639vpqkn9nnzcd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers filepath haskeline logict mtl parsec
        ];
        homepage = "http://github.com/HackerFoo/peg";
@@ -99765,10 +102312,11 @@ self: {
        sha256 = "1km847arc193wq6cdr38xvz1znbdmrgdyji2p9rs4j2p35rr6s6y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base hashtables haskell-src-meta ListLike monad-control mtl
          template-haskell
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://tanakh.github.com/Peggy";
        description = "The Parser Generator for Haskell";
@@ -99783,8 +102331,8 @@ self: {
        pname = "pell";
        version = "0.1.0.0";
        sha256 = "0sxgliwhd0iplv3xd44a40vz8i2kmzvsq1a3zvbz4j77611hmnxd";
-       buildDepends = [ arithmoi base containers ];
-       testDepends = [
+       libraryHaskellDepends = [ arithmoi base containers ];
+       testHaskellDepends = [
          arithmoi base Cabal cabal-test-quickcheck containers primes
          QuickCheck
        ];
@@ -99803,8 +102351,8 @@ self: {
        pname = "pem";
        version = "0.2.2";
        sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p";
-       buildDepends = [ base base64-bytestring bytestring mtl ];
-       testDepends = [
+       libraryHaskellDepends = [ base base64-bytestring bytestring mtl ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -99819,7 +102367,7 @@ self: {
        pname = "penn-treebank";
        version = "0.1.0.1";
        sha256 = "12c5bzn3ac8783lny56n7rd8a1ik4ayfm1pr5v7gm7z53f7iz0qy";
-       buildDepends = [ base containers parsec ];
+       libraryHaskellDepends = [ base containers parsec ];
        description = "Tools for manipulating the Penn TreeBank";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99837,13 +102385,14 @@ self: {
        sha256 = "0bzxihhi7cs8cqbnz7mf6sj12dyr267265asc010pgyffpjc22qi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          action-permutations anonymous-sums base bytestring cereal
          containers contravariant either matchers multiarg ofx old-locale
          parsec prednote rainbow rainbox semigroups split text time
          transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          anonymous-sums base parsec QuickCheck random-shuffle semigroups
          tasty tasty-quickcheck text time transformers
        ];
@@ -99864,7 +102413,7 @@ self: {
        sha256 = "0mdl8wpcy2yzscpww6vv5vhgiwy5xi0js1yxd7y4h5dmvhxsrr9l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers explicit-exception multiarg parsec penny-lib
          pretty-show semigroups text transformers
        ];
@@ -99887,7 +102436,7 @@ self: {
        sha256 = "0fy671xvia7kjlcrwpsv93gsnyz5wvcajlva98ykbh7cdkf56b17";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          action-permutations base binary bytestring cereal containers
          explicit-exception matchers multiarg ofx old-locale parsec prednote
          pretty-show rainbow semigroups split text time transformers
@@ -99905,7 +102454,7 @@ self: {
        pname = "peparser";
        version = "0.21";
        sha256 = "1qy8hghpvp9idiq4ksn55n1dpx7823s7mjfvqfgrmhj0xl1b1y54";
-       buildDepends = [ base binary bytestring haskell98 ];
+       libraryHaskellDepends = [ base binary bytestring haskell98 ];
        homepage = "https://github.com/igraves/peparser-haskell";
        description = "A parser for PE object files";
        license = stdenv.lib.licenses.bsd3;
@@ -99918,7 +102467,7 @@ self: {
        pname = "perceptron";
        version = "0.1.0.3";
        sha256 = "0w1vrsv43z92y6vsv9nzs2pjlqkhrxvzh53r2722530lzff34m78";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "The perceptron learning algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -99937,13 +102486,17 @@ self: {
        sha256 = "04vj8kva5qmrf8r93xyf0qw8nx64j241pdc19s2ddvd21lq5wqkz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring cognimeta-utils collections-api
          comonad-transformers containers cryptohash data-binary-ieee754
          data-lens data-lens-fd data-lens-template filepath ghc-prim
          MonadRandom mtl primitive QuickCheck stm strict tagged
          template-haskell time transformers unix
        ];
+       executableHaskellDepends = [
+         base bytestring cognimeta-utils containers MonadRandom mtl
+         QuickCheck template-haskell transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/Cognimeta/perdure";
        description = "Robust persistence for acyclic immutable data";
@@ -99959,8 +102512,8 @@ self: {
        pname = "perm";
        version = "0.4.0.0";
        sha256 = "0lf6smw3m32vwrga5y671z355w0vphp3n63cfnsirk1kiz5ik5rx";
-       buildDepends = [ base catch-fd mtl transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base catch-fd mtl transformers ];
+       testHaskellDepends = [
          base HUnit mtl test-framework test-framework-hunit
        ];
        jailbreak = true;
@@ -99976,7 +102529,7 @@ self: {
        pname = "permutation";
        version = "0.5.0.5";
        sha256 = "005737s6k9dfpjmjf41m3k1wc31c2kql08ig7fd6npk22nhwmdai";
-       buildDepends = [ base ghc-prim QuickCheck ];
+       libraryHaskellDepends = [ base ghc-prim QuickCheck ];
        homepage = "https://github.com/spacekitteh/permutation";
        description = "A library for permutations and combinations";
        license = stdenv.lib.licenses.bsd3;
@@ -99988,7 +102541,7 @@ self: {
        pname = "permute";
        version = "1.0";
        sha256 = "03g1d9h26f1id0pnaigy9xy1cv5pvzqcjrwgzn75xnnbm5c3y9ch";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        description = "Generalised permutation parser combinator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100002,7 +102555,9 @@ self: {
        sha256 = "096gjkmw06crywwwydyr67447xmp8x967dwh1gavlr0061skb72p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base optparse-applicative persistent text ];
+       executableHaskellDepends = [
+         base optparse-applicative persistent text
+       ];
        jailbreak = true;
        description = "Transforms persist's quasi-quoted syntax into ER format";
        license = stdenv.lib.licenses.gpl3;
@@ -100016,7 +102571,7 @@ self: {
        pname = "persistable-record";
        version = "0.1.0.0";
        sha256 = "1z03rixy03zp4l4ygb9jlj4p4x5vp20r5qq39hi8vn1x37j39x26";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers dlist names-th template-haskell transformers
        ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
@@ -100029,33 +102584,32 @@ self: {
      , blaze-html, blaze-markup, bytestring, conduit, containers
      , exceptions, fast-logger, hspec, lifted-base, monad-control
      , monad-logger, mtl, old-locale, path-pieces, resource-pool
-     , resourcet, scientific, silently, sqlite, tagged, template-haskell
-     , text, time, transformers, transformers-base, unordered-containers
+     , resourcet, scientific, silently, tagged, template-haskell, text
+     , time, transformers, transformers-base, unordered-containers
      , vector
      }:
      mkDerivation {
        pname = "persistent";
        version = "2.2";
        sha256 = "04l5394yrnm0d5cz7nq2phmsbm5vxbggn4wp8n0i0ms0y7blfh0p";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
          bytestring conduit containers exceptions fast-logger lifted-base
          monad-control monad-logger mtl old-locale path-pieces resource-pool
          resourcet scientific silently tagged template-haskell text time
          transformers transformers-base unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html bytestring
          conduit containers fast-logger hspec lifted-base monad-control
          monad-logger mtl old-locale path-pieces resource-pool resourcet
          scientific tagged template-haskell text time transformers
          unordered-containers vector
        ];
-       extraLibraries = [ sqlite ];
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) sqlite;};
+     }) {};
 
   "persistent-cereal" = callPackage
     ({ mkDerivation, base, cereal, persistent, text }:
@@ -100063,7 +102617,7 @@ self: {
        pname = "persistent-cereal";
        version = "0.1.0";
        sha256 = "09akf8vpkn2jskf1vf9mq96sakqzr7mfs8hhri8qlbkwx3i5nr6f";
-       buildDepends = [ base cereal persistent text ];
+       libraryHaskellDepends = [ base cereal persistent text ];
        jailbreak = true;
        homepage = "http://hub.darcs.net/co-dan/persistent-cereal";
        description = "Helper functions for writing Persistent instances";
@@ -100076,7 +102630,7 @@ self: {
        pname = "persistent-equivalence";
        version = "0.3";
        sha256 = "14nn01bbwskllbccgcnwnjwzyws6vppqv4l51n6pcvhwbphn18qz";
-       buildDepends = [ array base diffarray ];
+       libraryHaskellDepends = [ array base diffarray ];
        jailbreak = true;
        description = "Persistent equivalence relations (aka union-find)";
        license = stdenv.lib.licenses.bsd3;
@@ -100090,7 +102644,7 @@ self: {
        pname = "persistent-hssqlppp";
        version = "0.1";
        sha256 = "1p4fpa5qlkn2jmggszzmzg0bva8r8j0x7b2bidqyzlw2i9332ba2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring hssqlppp monad-control mtl persistent
          persistent-template template-haskell text th-lift
        ];
@@ -100105,7 +102659,7 @@ self: {
        pname = "persistent-instances-iproute";
        version = "0.1.0.1";
        sha256 = "0nmk138kv020aa0pw29l177rb6rji4rnmw4ndnkn1xvp8gh3w0yn";
-       buildDepends = [ base bytestring iproute persistent ];
+       libraryHaskellDepends = [ base bytestring iproute persistent ];
        description = "Persistent instances for types in iproute";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -100118,7 +102672,7 @@ self: {
        pname = "persistent-map";
        version = "0.3.5";
        sha256 = "0an0j6xkxygxlvjj50fq356sc4njbniz9jzv6v2h9pihsmcckhvq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers directory EdisonAPI EdisonCore filepath LRU
          mtl stm-io-hooks
        ];
@@ -100138,7 +102692,7 @@ self: {
        pname = "persistent-mongoDB";
        version = "2.1.2.2";
        sha256 = "1ppjywipfp48dsahc4mf8p9vx99937yh552kq7dhalnd1yfcbcik";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bson bytestring cereal conduit containers
          monad-control mongoDB network path-pieces persistent resource-pool
          resourcet text time transformers
@@ -100157,7 +102711,7 @@ self: {
        pname = "persistent-mysql";
        version = "2.2";
        sha256 = "09hajfvwgjkrmk1qmjfx3z6qkisv4gj0qjcmd1m8n9nb76bmdfz9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger mysql mysql-simple persistent resourcet
          text transformers
@@ -100179,7 +102733,7 @@ self: {
        sha256 = "0rvcjl9p7pj0hrf0ghhj96ib2knhxnfi9nhc7cppn7gnja1x8ldp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit containers convertible HDBC HDBC-odbc
          monad-control monad-logger persistent persistent-template resourcet
          text time transformers
@@ -100199,7 +102753,7 @@ self: {
        pname = "persistent-postgresql";
        version = "2.2";
        sha256 = "0ydwc2jb8w3wma8f0v7i16pzglx0gv1ffikfvislw3c6wkangwby";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger persistent postgresql-libpq
          postgresql-simple resourcet text time transformers
@@ -100217,7 +102771,7 @@ self: {
        pname = "persistent-protobuf";
        version = "0.1.5";
        sha256 = "046dpasgv6bwcm17w0z9dz4bvaa622cdb8paj7j6accmsc4rvs9z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring persistent protocol-buffers
          protocol-buffers-descriptor template-haskell text
        ];
@@ -100234,7 +102788,7 @@ self: {
        pname = "persistent-ratelimit";
        version = "0.1.0.1";
        sha256 = "13mvf0k4nkcdcz7gcvqsw3mrnbpvw0lvs94rff0y9q50cc6y36xd";
-       buildDepends = [ base time yesod ];
+       libraryHaskellDepends = [ base time yesod ];
        jailbreak = true;
        homepage = "https://github.com/jprider63/persistent-ratelimit";
        description = "A library for rate limiting activities with a persistent backend";
@@ -100251,12 +102805,12 @@ self: {
        pname = "persistent-redis";
        version = "0.3.2";
        sha256 = "0p5wjf4f201mpdwry188v1h9wf3fh1pvfsm663x4ipy3b1yc8b1k";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base binary bytestring hedis monad-control mtl
          path-pieces persistent scientific text time transformers
          utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base binary bytestring hedis monad-control mtl
          path-pieces persistent persistent-template scientific
          template-haskell text time transformers utf8-string
@@ -100272,7 +102826,9 @@ self: {
        pname = "persistent-refs";
        version = "0.4";
        sha256 = "1lyhz0cywls91a6crjq5v8x4h4740s73h3blvbkr6fg26kh11cs6";
-       buildDepends = [ base containers mtl ref-fd transformers ];
+       libraryHaskellDepends = [
+         base containers mtl ref-fd transformers
+       ];
        homepage = "https://github.com/acfoltzer/persistent-refs";
        description = "Haskell references backed by an IntMap for persistence and reversibility";
        license = stdenv.lib.licenses.bsd3;
@@ -100289,11 +102845,12 @@ self: {
        sha256 = "1567ja3f87syw6x6x6gl6xzdl3pl8ammlrqy2500gbgr7ni0a47i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          old-locale persistent resourcet text time transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base hspec persistent persistent-template time transformers
        ];
        homepage = "http://www.yesodweb.com/book/persistent";
@@ -100311,12 +102868,12 @@ self: {
        pname = "persistent-template";
        version = "2.1.3.4";
        sha256 = "0wi1mrcilz66jnlgz16crqlh4bibb03mj460bgg3af4f8zpwja2g";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers ghc-prim monad-control
          monad-logger path-pieces persistent tagged template-haskell text
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring hspec persistent QuickCheck text transformers
        ];
        homepage = "http://www.yesodweb.com/book/persistent";
@@ -100332,8 +102889,8 @@ self: {
        pname = "persistent-vector";
        version = "0.1.1";
        sha256 = "1l5v02pjb24gk4hw28knjp55l7z6jzcfiklfikd2nqbl7866c2j2";
-       buildDepends = [ base deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "https://github.com/travitch/persistent-vector";
@@ -100352,14 +102909,14 @@ self: {
        pname = "persistent-zookeeper";
        version = "0.2.0";
        sha256 = "11s99wrxhyzyfg657dqma1v1vvdadskvrjybrya2zm8lp675ri9z";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring binary bytestring conduit
          containers hzk monad-control mtl path-pieces persistent
          persistent-template resource-pool resourcet scientific
          template-haskell text time transformers transformers-base
          utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base base64-bytestring binary bytestring conduit
          containers hspec hzk monad-control mtl path-pieces persistent
          persistent-template resource-pool resourcet scientific
@@ -100379,14 +102936,13 @@ self: {
        pname = "persona";
        version = "0.1.0.0";
        sha256 = "1w1m1m3kybk8cg8qn44l04i19i0zqgaz1i1k6666gvvrzk2rh7nh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base data-default-class jose lens network-uri text time
          unordered-containers
        ];
        homepage = "https://github.com/frasertweedale/hs-persona";
        description = "Persona (BrowserID) library";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persona-idp" = callPackage
@@ -100401,7 +102957,7 @@ self: {
        sha256 = "082ly9m0m0g9brgzma489i4b4pkqqy50gv0a6hn7pvyhpr901b6n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson asn1-types base blaze-markup bytestring crypto-random
          directory filepath hamlet http-types jose lens optparse-applicative
          pem persona scotty shakespeare text time transformers unix wai x509
@@ -100409,7 +102965,6 @@ self: {
        homepage = "https://github.com/frasertweedale/hs-persona-idp";
        description = "Persona (BrowserID) Identity Provider";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pesca" = callPackage
@@ -100420,7 +102975,7 @@ self: {
        sha256 = "12cwmjszbbqrd1f21jvwvp026ja3377c3p0wfrbrl34g23gnysgp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        homepage = "http://www.cs.chalmers.se/~aarne/pesca/";
        description = "Proof Editor for Sequent Calculus";
        license = "GPL";
@@ -100438,13 +102993,13 @@ self: {
        pname = "peyotls";
        version = "0.1.6.5";
        sha256 = "0dy641izw76cn1rslf7mbmbwhl5ajxjll95w4rg7pyvq2lq2qk9f";
-       buildDepends = [
+       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
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring crypto-random handle-like network random stm x509
          x509-store
        ];
@@ -100463,8 +103018,8 @@ self: {
        pname = "pez";
        version = "0.1.0";
        sha256 = "0w2m8i1h87v9l5lhz8mdllnrx62fk3isqhw3cvnv9rf6rk3zhv74";
-       buildDepends = [ base failure fclabels thrist ];
-       testDepends = [
+       libraryHaskellDepends = [ base failure fclabels thrist ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -100484,9 +103039,9 @@ self: {
        sha256 = "0ax6ch87jqbcy5il17n0kppy8pn44rj6ljksamh61sg438vcdhqf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base bytestring HTTP ini postgresql-simple random scotty text
-         transformers
+       libraryHaskellDepends = [ base bytestring HTTP ];
+       executableHaskellDepends = [
+         async base ini postgresql-simple random scotty text transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/BardurArantsson/pg-harness";
@@ -100501,7 +103056,7 @@ self: {
        pname = "pg-harness-client";
        version = "0.3.1";
        sha256 = "12z5354in4zswn219cvxhqbva76p2jsccmzdn5iyw5g401546lr2";
-       buildDepends = [ base bytestring HTTP ];
+       libraryHaskellDepends = [ base bytestring HTTP ];
        homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "Client library for pg-harness-server";
        license = stdenv.lib.licenses.bsd2;
@@ -100517,7 +103072,7 @@ self: {
        sha256 = "0459i1x5hsxkihyb5a8ca947ngs0gg8866s77bcdsifjw6b3cb4a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          async base ini postgresql-simple random scotty text transformers
        ];
        jailbreak = true;
@@ -100535,17 +103090,18 @@ self: {
      mkDerivation {
        pname = "pgdl";
        version = "8.3";
-       revision = "2";
        sha256 = "0kbx9dgmy9pvcgcpsjplrpnqlk8x3icfpr0flincmzqkzxxzcaq5";
+       revision = "2";
        editedCabalFile = "9d6e976e130869b6761d870380b867c2501c43a1318a5f385687608c13a0ef72";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring Cabal configurator directory filepath HTTP
          network-uri process tagsoup text vty vty-ui
        ];
        description = "simply download a video (or a file) from a webpage and xdg-open it";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pgm" = callPackage
@@ -100554,7 +103110,7 @@ self: {
        pname = "pgm";
        version = "0.1.4";
        sha256 = "1s3kch1qsxrfzk9sa4b0jn9vzjhw7dvh1sajgnnz97gl5y0gydmv";
-       buildDepends = [ array base bytestring parsec ];
+       libraryHaskellDepends = [ array base bytestring parsec ];
        homepage = "https://github.com/astanin/haskell-pgm";
        description = "Pure Haskell implementation of PGM image format";
        license = stdenv.lib.licenses.bsd3;
@@ -100568,8 +103124,8 @@ self: {
        pname = "pgp-wordlist";
        version = "0.1.0.1";
        sha256 = "123d8fh1bd78iq4n00xc873zsnizczzdl372vkl87z4lpivfkpd3";
-       buildDepends = [ base bytestring containers text vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring containers text vector ];
+       testHaskellDepends = [
          base bytestring HUnit tasty tasty-hunit tasty-quickcheck text
        ];
        homepage = "https://github.com/quchen/pgp-wordlist";
@@ -100587,7 +103143,7 @@ self: {
        pname = "pgsql-simple";
        version = "0.1.2";
        sha256 = "1z39g6bp748ya54in48vcg8z20c3skza82cv203rqy192nj01km5";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring binary blaze-builder
          blaze-textual bytestring containers MonadCatchIO-transformers mtl
          network old-locale pcre-light text time utf8-string
@@ -100610,7 +103166,7 @@ self: {
        pname = "pgstream";
        version = "0.1.0.3";
        sha256 = "0zbasvi8392pa7ibd0q5072f1i7h0114v46rwhdfczsk1qzlnscg";
-       buildDepends = [
+       libraryHaskellDepends = [
          async attoparsec base blaze-builder bytestring conduit
          conduit-extra deepseq mtl parallel postgresql-binary
          postgresql-libpq resource-pool resourcet scientific stm stm-chans
@@ -100629,7 +103185,7 @@ self: {
        pname = "phantom-state";
        version = "0.2.0.2";
        sha256 = "04fg0j79nkajsiw8n2yy62mwiw1r4fjy2jln5ng07h64pwyncdnm";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Phantom State Transformer. Like State Monad, but without values.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -100641,7 +103197,9 @@ self: {
        pname = "phasechange";
        version = "0.1";
        sha256 = "0i54myn9abrpzrs58llqgii9fhd9ns9hipnaj00dnqx2mfbg7pan";
-       buildDepends = [ array base ghc-prim monad-st primitive vector ];
+       libraryHaskellDepends = [
+         array base ghc-prim monad-st primitive vector
+       ];
        jailbreak = true;
        homepage = "http://github.com/glehel/phasechange";
        description = "Freezing, thawing, and copy elision";
@@ -100657,16 +103215,16 @@ self: {
        pname = "phash";
        version = "0.0.5";
        sha256 = "1bndzncy52swvfk2p1imvxlbiv01qx9qi5mb68jmc22b1d99s6bv";
-       buildDepends = [ base ];
-       testDepends = [
-         base doctest HUnit pHash smallcheck tasty tasty-hunit
-         tasty-smallcheck
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ pHash ];
+       testHaskellDepends = [
+         base doctest HUnit smallcheck tasty tasty-hunit tasty-smallcheck
        ];
-       extraLibraries = [ pHash ];
+       testSystemDepends = [ pHash ];
        homepage = "http://github.com/michaelxavier/phash";
        description = "Haskell bindings to pHash, the open source perceptual hash library";
        license = stdenv.lib.licenses.gpl3;
-       broken = true;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { pHash = null;};
 
   "phone-push" = callPackage
@@ -100678,7 +103236,7 @@ self: {
        pname = "phone-push";
        version = "0.1.3";
        sha256 = "0ndaddj3ssrdclzigdj0q04pwpdkbmhfc3rz8j7q9f4l7iv6yshi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring binary bytestring conduit convertible
          HsOpenSSL http-conduit network time transformers
        ];
@@ -100694,7 +103252,7 @@ self: {
        pname = "phonetic-code";
        version = "0.1.1.1";
        sha256 = "0pjvjqxp37n901s16ys5qq5rzblamz8izvsd1992w06bcyrs36cw";
-       buildDepends = [ array base containers regex-compat ];
+       libraryHaskellDepends = [ array base containers regex-compat ];
        homepage = "http://wiki.cs.pdx.edu/bartforge/phonetic-code";
        description = "Phonetic codes: Soundex and Phonix";
        license = stdenv.lib.licenses.bsd3;
@@ -100708,7 +103266,9 @@ self: {
        pname = "phooey";
        version = "2.0.0.1";
        sha256 = "0aa0s7qmy78s4q1mjcnw0qiqlbmdmkmk2nbn6hkmw5fn29iq0iwj";
-       buildDepends = [ array base mtl reactive TypeCompose wx wxcore ];
+       libraryHaskellDepends = [
+         array base mtl reactive TypeCompose wx wxcore
+       ];
        jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Phooey";
        description = "Functional user interfaces";
@@ -100726,10 +103286,10 @@ self: {
        sha256 = "0d44fzflpyw94rfyn9nw9pqklm01vw6nczava2kfj68sq12m94rp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory exif filepath mtl old-locale parsec time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory exif filepath HUnit mtl old-locale parsec process
          regex-posix time unix
        ];
@@ -100747,7 +103307,7 @@ self: {
        sha256 = "1bczvnmbgc7qcpmlhrnmql4yn2grry2ys7hcg06sqzwr5qhl1k9k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl SDL transformers ];
+       executableHaskellDepends = [ base mtl SDL transformers ];
        jailbreak = true;
        homepage = "https://github.com/skypers/phraskell";
        description = "A fractal viewer";
@@ -100767,12 +103327,17 @@ self: {
        sha256 = "1v6zcyfjnkgwc9kffi7lf15qb3j4wq2kclx26i1k9ssf6h7cs5g9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers directory fgl filepath graphviz
          hierarchical-clustering HUnit parsec prettyclass process split text
          time vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         async base bytestring containers directory fgl filepath graphviz
+         hierarchical-clustering HUnit parsec prettyclass process split text
+         time vector
+       ];
+       testHaskellDepends = [
          async base bytestring containers directory fgl filepath graphviz
          hierarchical-clustering HUnit parsec prettyclass process split
          test-framework test-framework-hunit test-framework-th text time
@@ -100796,7 +103361,7 @@ self: {
        sha256 = "1w5krkss2qzzcqqmgqs369p5xnqyrm76vvsxd7mlhcdqaaj06n2q";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          AES base binary byteable bytestring containers cryptohash HTTP
          io-streams mtl network parsec RSA transformers
        ];
@@ -100815,12 +103380,12 @@ self: {
      mkDerivation {
        pname = "pia-forward";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "02ryfiibkbfx6zg1n0h8kvb4mkiai57cvllqcwp815x50rsrpd2r";
+       revision = "1";
        editedCabalFile = "7ace7bfcb4b05c4099a28ec12b7e12682669ddfe6d4e5f68c4d74c05914b7582";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring data-default directory filepath http-client
          http-client-tls network-info process random text text-format time
          xdg-basedir
@@ -100841,12 +103406,12 @@ self: {
        pname = "pianola";
        version = "0.1.1";
        sha256 = "02y630yskx139l5yii45rf47w2a2v3x0pad59ac9qzjalv7s68aq";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-iteratee base bytestring comonad
          comonad-transformers containers either errors filepath free
          iteratee logict msgpack mtl network pipes streams text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers errors filepath network streams text transformers
        ];
        description = "Remotely controlling Java Swing applications";
@@ -100862,7 +103427,9 @@ self: {
        sha256 = "14wil9fqx7n7zk7ldhk336g9mbybcf0gljvwjrnra3r01yiz7f20";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers mtl parsec picosat pretty ];
+       libraryHaskellDepends = [
+         base containers mtl parsec picosat pretty
+       ];
        jailbreak = true;
        homepage = "https://github.com/sdiehl/picologic";
        description = "Utilities for symbolic predicate logic expressions";
@@ -100880,11 +103447,11 @@ self: {
        pname = "picoparsec";
        version = "0.1.2.2";
        sha256 = "1gf51clsfllfpmpm4bfzyicwk1zz3kymyi8zcdfm5y5rhg1yjcg9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers deepseq monoid-subclasses
          scientific text
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring deepseq monoid-subclasses QuickCheck
          quickcheck-instances quickcheck-unicode scientific tasty
          tasty-quickcheck text vector
@@ -100900,7 +103467,7 @@ self: {
        pname = "picosat";
        version = "0.1.3";
        sha256 = "1ljgarjvhw7qi06bjykgbd17s27h73gdj21rpi5x4ddv9fb68k9p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/sdiehl/haskell-picosat";
        description = "Bindings to the PicoSAT solver";
        license = stdenv.lib.licenses.mit;
@@ -100914,7 +103481,7 @@ self: {
        sha256 = "0ab0msb12cj38qimxllwk0p0g9aggfxhgvdp2b5znxpixlr39cz9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers Imlib mtl ];
+       libraryHaskellDepends = [ array base containers Imlib mtl ];
        description = "A Piet interpreter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100928,7 +103495,7 @@ self: {
        sha256 = "0rsc2anh20hlr2dfyh07dyrrfns0l1pibz6w129fp5l8m6h3xjin";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl parsec text ];
+       executableHaskellDepends = [ base mtl parsec text ];
        homepage = "http://www.mew.org/~kazu/proj/piki/";
        description = "Yet another text-to-html converter";
        license = stdenv.lib.licenses.bsd3;
@@ -100945,7 +103512,7 @@ self: {
        pname = "pinboard";
        version = "0.6.5";
        sha256 = "0xnxdnr2ifn0z78jzibg64znki2jppfy13fsl7s8vwrw0i5ys7a8";
-       buildDepends = [
+       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
@@ -100961,7 +103528,7 @@ self: {
        pname = "pipe-enumerator";
        version = "0.3.0.2";
        sha256 = "0h6k00k85pn0jajk3rvvfnrfwlkllprhv00x0qd9zg9gg7lf7zkc";
-       buildDepends = [ base enumerator pipes transformers ];
+       libraryHaskellDepends = [ base enumerator pipes transformers ];
        homepage = "https://github.com/zadarnowski/pipe-enumerator";
        description = "A bidirectional bridge between pipes and iteratees";
        license = stdenv.lib.licenses.bsd3;
@@ -100975,7 +103542,9 @@ self: {
        sha256 = "1hmbhgnrq894jnm7gy6yc812nysvkrbjk6qqjmk7g7fsj46xpdfg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring editor-open Hclip safe ];
+       executableHaskellDepends = [
+         base bytestring editor-open Hclip safe
+       ];
        homepage = "https://github.com/pharpend/pipeclip";
        description = "Open your editor, pipe the output to the system clipboard";
        license = stdenv.lib.licenses.bsd2;
@@ -100989,8 +103558,8 @@ self: {
        pname = "pipes";
        version = "4.1.6";
        sha256 = "0dbl9sa0ryclyxwm0zfmqvpx7ljmpnfccmnihxia35q471h50sid";
-       buildDepends = [ base mmorph mtl transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base mmorph mtl transformers ];
+       testHaskellDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
          transformers
        ];
@@ -101006,7 +103575,7 @@ self: {
        pname = "pipes-aeson";
        version = "0.4.1.3";
        sha256 = "0c95fm4bj4y0dsar4r7n9irvhrcihylcp8k40khm2bqcad14pjjc";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring pipes pipes-attoparsec
          pipes-bytestring pipes-parse transformers
        ];
@@ -101024,11 +103593,11 @@ self: {
        pname = "pipes-async";
        version = "0.1.1";
        sha256 = "1b0l3fnblfgwgcbd5brs5iwix4wix1ijx10ppwb8yb1wbqbmh8z2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-async lifted-base monad-control pipes pipes-safe stm
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec lifted-async lifted-base monad-control pipes pipes-safe
          stm transformers-base
        ];
@@ -101045,10 +103614,10 @@ self: {
        pname = "pipes-attoparsec";
        version = "0.5.1.2";
        sha256 = "1qhhy86c89j6ial5y1j2lhgqx225qr33777jk8sxv021gkabsmlv";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring pipes pipes-parse text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base HUnit mmorph pipes pipes-parse tasty tasty-hunit
          text transformers
        ];
@@ -101067,7 +103636,10 @@ self: {
        sha256 = "0alr94jjh583cdi19zrlacrc71dspy12lhq8h24hqiar6l2lr1d7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base bytestring pipes-core transformers
+       ];
+       executableHaskellDepends = [
          attoparsec base bytestring pipes-core transformers
        ];
        jailbreak = true;
@@ -101083,7 +103655,7 @@ self: {
        pname = "pipes-bgzf";
        version = "0.2.0.1";
        sha256 = "04y0wzy8982g64xyxq6rl9xc63n0c8xl8mhyf0x4ivqxnn49iv23";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring mtl parallel pipes streaming-commons
        ];
        description = "Blocked GZip";
@@ -101099,11 +103671,11 @@ self: {
        pname = "pipes-binary";
        version = "0.4.0.4";
        sha256 = "1c90vvdzbrp5x73iwpdcsi701v4krmqqxj0l9kyzfygvd242i56i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring ghc-prim pipes pipes-bytestring pipes-parse
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring ghc-prim lens-family-core pipes pipes-parse
          smallcheck tasty tasty-hunit tasty-smallcheck transformers
        ];
@@ -101120,7 +103692,7 @@ self: {
        pname = "pipes-bytestring";
        version = "2.1.1";
        sha256 = "1zn8vbsq214x1dswaz1sb7vjjvwxjy5sg8cv67cdmac0l1rw5dmz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring pipes pipes-group pipes-parse transformers
        ];
        description = "ByteString support for pipes";
@@ -101133,7 +103705,7 @@ self: {
        pname = "pipes-cellular";
        version = "0.0.0.1";
        sha256 = "0j0ayzvc9k3fmd9j37p41z50nqp4hwyywashcvng23qgp7m4ahdc";
-       buildDepends = [ base bytestring data-cell pipes ];
+       libraryHaskellDepends = [ base bytestring data-cell pipes ];
        homepage = "https://github.com/zadarnowski/pipes-cellular";
        description = "Pipes-based combinators for cellular data processing";
        license = stdenv.lib.licenses.bsd3;
@@ -101146,7 +103718,9 @@ self: {
        pname = "pipes-cellular-csv";
        version = "1.0.0.0";
        sha256 = "1lzism9rrs1569lhbjl6b49c461igmpgvxq6pnnpfvnqbps56vc9";
-       buildDepends = [ base bytestring data-cell pipes pipes-cellular ];
+       libraryHaskellDepends = [
+         base bytestring data-cell pipes pipes-cellular
+       ];
        homepage = "https://github.com/zadarnowski/pipes-cellular-csv";
        description = "Efficient pipes-based cellular CSV codec";
        license = stdenv.lib.licenses.bsd3;
@@ -101160,7 +103734,7 @@ self: {
        pname = "pipes-cereal";
        version = "0.1.0.0";
        sha256 = "04f538gyzvwxhqscsj9sywi6hz5k1fabjaga0vf861hlmv9agaa8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal mtl pipes pipes-bytestring pipes-parse
        ];
        description = "Encode and decode binary streams using the pipes and cereal libraries";
@@ -101175,7 +103749,7 @@ self: {
        pname = "pipes-cereal-plus";
        version = "0.4.0";
        sha256 = "1x1qfl8s0lhvcz2hqh5dl5ilyixar995bqqzas721ni2skflbhqr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal-plus errors mtl pipes pipes-bytestring text
        ];
        jailbreak = true;
@@ -101195,7 +103769,7 @@ self: {
        sha256 = "0czgzmfl5rs0p63x24zr4pcl01a0wy93hx8wpin9k61yfx7bb4ix";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring pipes pipes-safe process stm
        ];
        homepage = "http://www.github.com/massysett/pipes-cliff";
@@ -101209,8 +103783,8 @@ self: {
        pname = "pipes-concurrency";
        version = "2.0.3";
        sha256 = "0jsfnlzl6yvhikgn6v361ld9aypv2h2nsz1q24dxfk953zvm2sp5";
-       buildDepends = [ base pipes stm ];
-       testDepends = [ async base pipes stm ];
+       libraryHaskellDepends = [ base pipes stm ];
+       testHaskellDepends = [ async base pipes stm ];
        description = "Concurrency for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101221,7 +103795,7 @@ self: {
        pname = "pipes-conduit";
        version = "0.0.1";
        sha256 = "1nzylhmi3f2m0xnqgx0m9g0p5pwl6xnidsz8ykzmv8wafrh60dh8";
-       buildDepends = [ base conduit mtl pipes-core ];
+       libraryHaskellDepends = [ base conduit mtl pipes-core ];
        jailbreak = true;
        homepage = "https://github.com/pcapriotti/pipes-extra";
        description = "Conduit adapters";
@@ -101237,7 +103811,7 @@ self: {
        pname = "pipes-core";
        version = "0.1.0";
        sha256 = "1abzy45bjiy8lijg4a5xkwdh1k37c6m921y2s31x0yqgq79qlgyp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base categories lifted-base monad-control transformers void
        ];
        jailbreak = true;
@@ -101252,7 +103826,7 @@ self: {
        pname = "pipes-courier";
        version = "0.1.0.0";
        sha256 = "1v2bm2cmzb6a7bmpv8byrb5x4k5pivp3s8ma6r6dwhldic294jgf";
-       buildDepends = [ base courier pipes ];
+       libraryHaskellDepends = [ base courier pipes ];
        jailbreak = true;
        homepage = "http://github.com/kvanberendonck/pipes-courier";
        description = "Pipes utilities for interfacing with the courier message-passing framework";
@@ -101268,11 +103842,11 @@ self: {
        pname = "pipes-csv";
        version = "1.4.0";
        sha256 = "1q1gnfnkvlkk8lwllhyar7323k3jynh9rl6x9yks7lc3nqr1n16j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring cassava pipes unordered-containers
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cassava HUnit pipes pipes-bytestring test-framework
          test-framework-hunit vector
        ];
@@ -101287,7 +103861,7 @@ self: {
        pname = "pipes-errors";
        version = "0.3";
        sha256 = "1vbpchs3v08sc1rfa9fl89wzxg9ak823xjbkl0k37ycwwc36fn76";
-       buildDepends = [ base errors pipes ];
+       libraryHaskellDepends = [ base errors pipes ];
        jailbreak = true;
        homepage = "https://github.com/jdnavarro/pipes-errors";
        description = "Integration between pipes and errors";
@@ -101305,8 +103879,10 @@ self: {
        sha256 = "0yrbjs9y9s9a1q59138f7m0fsp8vsg0a31sfzgwfrg9pm2sfivfr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring pipes-core transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring pipes-core transformers
+       ];
+       testHaskellDepends = [
          base bytestring HUnit mtl pipes-core test-framework
          test-framework-hunit test-framework-th-prime
        ];
@@ -101324,8 +103900,8 @@ self: {
        pname = "pipes-extras";
        version = "1.0.0";
        sha256 = "1dwqvbmngiprdffi9l0vhrlchfrr8cl0dvzlb34pmczkm9rvq8xk";
-       buildDepends = [ base foldl pipes transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base foldl pipes transformers ];
+       testHaskellDepends = [
          base HUnit pipes test-framework test-framework-hunit transformers
        ];
        jailbreak = true;
@@ -101341,7 +103917,7 @@ self: {
        pname = "pipes-fastx";
        version = "0.3.0.0";
        sha256 = "0xds11gfacj7m5lz6cssaj4v5z73ycrdmn57f0qxzqdsc2kln9ii";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring
        ];
        description = "Streaming parsers for Fasta and Fastq";
@@ -101354,7 +103930,9 @@ self: {
        pname = "pipes-group";
        version = "1.0.2";
        sha256 = "01k1j0b7rg39lfh2zhxxnj1bclmaas69b9wiai89h5i1m6aanmp0";
-       buildDepends = [ base free pipes pipes-parse transformers ];
+       libraryHaskellDepends = [
+         base free pipes pipes-parse transformers
+       ];
        description = "Group streams into substreams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101367,7 +103945,7 @@ self: {
        pname = "pipes-http";
        version = "1.0.2";
        sha256 = "0hqab1pzcj11qwvc4dznis0qsyn1zc1d0riqxy6b5k04p9i2jbzk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-client http-client-tls pipes
        ];
        description = "HTTP client with pipes interface";
@@ -101382,7 +103960,7 @@ self: {
        pname = "pipes-illumina";
        version = "0.1.0.0";
        sha256 = "19s6rkrfvmni914flq37fkbfs6angzl3c40bzg0ddivn4ada7jvn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath pipes pipes-bgzf
        ];
        homepage = "http://github.com/rcallahan/pipes-illumina";
@@ -101396,7 +103974,7 @@ self: {
        pname = "pipes-interleave";
        version = "0.2.1";
        sha256 = "1xs48bxr4qjnwcmaajl3av4db87bxwm6nyffk3k5rks47lqmra3r";
-       buildDepends = [ base containers pipes ];
+       libraryHaskellDepends = [ base containers pipes ];
        homepage = "http://github.com/bgamari/pipes-interleave";
        description = "Interleave and merge streams of elements";
        license = stdenv.lib.licenses.bsd3;
@@ -101408,8 +103986,8 @@ self: {
        pname = "pipes-mongodb";
        version = "0.1.0.0";
        sha256 = "0h4334fajrza7r8jrr78nqhs522kxnbzdj0gnbp7ndvzvx5ij888";
-       buildDepends = [ base monad-control mongoDB pipes ];
-       testDepends = [ base monad-control mongoDB pipes text ];
+       libraryHaskellDepends = [ base monad-control mongoDB pipes ];
+       testHaskellDepends = [ base monad-control mongoDB pipes text ];
        homepage = "http://github.com/jb55/pipes-mongodb";
        description = "Stream results from MongoDB";
        license = stdenv.lib.licenses.mit;
@@ -101423,7 +104001,7 @@ self: {
        pname = "pipes-network";
        version = "0.6.4";
        sha256 = "1wabyv5j4q0wxiz8ry7dq3amlvfh4r0721pd2lksx7hj3a5qzm2p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring network network-simple pipes pipes-safe
          transformers
        ];
@@ -101441,7 +104019,7 @@ self: {
        pname = "pipes-network-tls";
        version = "0.2.1";
        sha256 = "0k3w13s3vasd85mapa594xhi31mhdwqycxqnadidqy24q5s6zdhc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring network network-simple network-simple-tls pipes
          pipes-network pipes-safe tls transformers
        ];
@@ -101461,7 +104039,7 @@ self: {
        pname = "pipes-p2p";
        version = "0.4";
        sha256 = "1ls89dnz0aibmyy4mky7jl4ibirpfrs12yxmflarghv3j6rn0wnc";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base binary bytestring errors exceptions mtl network
          network-simple-sockaddr pipes pipes-concurrency pipes-network
        ];
@@ -101480,7 +104058,7 @@ self: {
        sha256 = "08fdk005yrmr8mz3qlsfjys3pz9iidk53maylbgdk3nixk8plwwm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers errors mtl network
          network-simple-sockaddr pipes pipes-network pipes-p2p
        ];
@@ -101497,7 +104075,7 @@ self: {
        pname = "pipes-parse";
        version = "3.0.3";
        sha256 = "00sslgh1h1n114adc0k2w23wk19pzmf2mh5zn37w40jdganrhlpm";
-       buildDepends = [ base pipes transformers ];
+       libraryHaskellDepends = [ base pipes transformers ];
        description = "Parsing infrastructure for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101511,7 +104089,7 @@ self: {
        pname = "pipes-postgresql-simple";
        version = "0.1.2.0";
        sha256 = "12ij2msdwjzzc93mlvvizh6amam5ld9j1a0b9xsa2awdjd21mwc1";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring exceptions mtl pipes pipes-concurrency
          pipes-safe postgresql-simple stm text transformers
        ];
@@ -101527,7 +104105,8 @@ self: {
        sha256 = "1wlgwil8ag6ax0kvammbqk7v2d8k6ygdqpjpys97zxrvy47dfc6r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mwc-random pipes time ];
+       libraryHaskellDepends = [ base mwc-random pipes time ];
+       executableHaskellDepends = [ base pipes time ];
        homepage = "http://github.com/ImAlsoGreg/pipes-rt";
        description = "A few pipes to control the timing of yields";
        license = stdenv.lib.licenses.bsd3;
@@ -101541,7 +104120,7 @@ self: {
        pname = "pipes-safe";
        version = "2.2.3";
        sha256 = "19wr3q6skwdyd68k1r33w2mipfsgsg2982027faq7rnfw9lq2yyi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers exceptions monad-control mtl pipes transformers
          transformers-base
        ];
@@ -101557,11 +104136,11 @@ self: {
        pname = "pipes-shell";
        version = "0.1.3";
        sha256 = "0w49il312ns8pyl05144gznxfdchd0rnq8hprmjrgy8yp3v8j4v1";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring pipes pipes-bytestring pipes-safe process stm
          stm-chans text
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring directory hspec pipes pipes-bytestring
          pipes-safe process stm stm-chans text
        ];
@@ -101579,7 +104158,7 @@ self: {
        pname = "pipes-text";
        version = "0.0.0.16";
        sha256 = "0db6xh10g4h1zy62aamcz59hykhlnq8d7qs24yp7lva8g0ymapyv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring pipes pipes-bytestring pipes-group pipes-parse
          pipes-safe streaming-commons text transformers
        ];
@@ -101596,7 +104175,7 @@ self: {
        pname = "pipes-vector";
        version = "0.6.2";
        sha256 = "11nibsshxgnr2jw8lh8q9aygbmpfsq7mf7kdvaqzyggmrdsns2wn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-primitive pipes primitive transformers vector
        ];
        description = "Various proxies for streaming data into vectors";
@@ -101611,7 +104190,7 @@ self: {
        pname = "pipes-wai";
        version = "3.0.2";
        sha256 = "0wfab4nln9v91qprwm2ik9cz27m2qdhcw7qnndg4dhq47m7kvaw8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring http-types pipes transformers wai
        ];
        homepage = "http://github.com/brewtown/pipes-wai";
@@ -101627,8 +104206,8 @@ self: {
        pname = "pipes-websockets";
        version = "0.0.0.0";
        sha256 = "176gp747anh6a4wghkcj3jblb7ywhrp8c5wc7wrain77vn1sihk6";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -101648,7 +104227,10 @@ self: {
        sha256 = "1zlj7vcn3ng11n80a9m37al7y322ph9grq5qxn022vpb82baxwr4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring pipes pipes-safe semigroups zeromq4-haskell
+       ];
+       executableHaskellDepends = [
          base bytestring pipes pipes-safe semigroups zeromq4-haskell
        ];
        homepage = "https://github.com/peddie/pipes-zeromq4";
@@ -101664,7 +104246,7 @@ self: {
        pname = "pipes-zlib";
        version = "0.4.3";
        sha256 = "04iiw0r1mnxl4myyp87wqhff6jm0g2246gwismi7jnwy7xmllsmc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring pipes transformers zlib zlib-bindings
        ];
        homepage = "https://github.com/k0001/pipes-zlib";
@@ -101682,7 +104264,7 @@ self: {
        sha256 = "1mz4cfhg8y7cv38ir2lzl7b2p1nfm8c4syvgzz4b9j98dxg694xz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers haskeline haskeline-class mpppc
          mtl parsec text utf8-string
        ];
@@ -101703,9 +104285,12 @@ self: {
        sha256 = "10qrhpxk8v5qrs4pq4ghj0dj3brsbiv61pb5vakpq031h7grfg8p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring directory filepath optparse-applicative process
-         temporary text unordered-containers yaml
+       libraryHaskellDepends = [
+         base bytestring directory filepath process temporary text
+         unordered-containers yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring optparse-applicative text unordered-containers yaml
        ];
        jailbreak = true;
        homepage = "https://github.com/chiro/haskell-pit";
@@ -101720,7 +104305,7 @@ self: {
        pname = "pkcs1";
        version = "1.0.2";
        sha256 = "1598gj6r6mv3z68qir1rgjk4p73w0k2fwkkban04s97xf86a0669";
-       buildDepends = [ base bytestring random ];
+       libraryHaskellDepends = [ base bytestring random ];
        homepage = "http://sep07.mroot.net/";
        description = "RSA encryption with PKCS1 padding";
        license = "GPL";
@@ -101734,7 +104319,7 @@ self: {
        sha256 = "019mli0g65g7k4rsp2myxc7g6p6wykj85amvb2g2ipw117zpzkfz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal split ];
+       executableHaskellDepends = [ base Cabal split ];
        description = "Package dependency graph for installed packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101746,7 +104331,7 @@ self: {
        pname = "pktree";
        version = "0.2";
        sha256 = "172dsg1krxqamq8ids9xwyfqidr9z0qq4nmbq4rk2x62g4q0960c";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/singpolyma/pktree-haskell";
        description = "Implementation of the PKTree spatial index data structure";
        license = "unknown";
@@ -101758,7 +104343,7 @@ self: {
        pname = "placeholders";
        version = "0.1";
        sha256 = "0ih35n2pw5gr9ggj2xz5zfcs4bdk200fdw6q9hdy3xna7maphak5";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ahammar/placeholders";
        description = "Placeholders for use while developing Haskell code";
        license = stdenv.lib.licenses.bsd3;
@@ -101770,7 +104355,7 @@ self: {
        pname = "plailude";
        version = "0.6.0";
        sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i";
-       buildDepends = [ base bytestring mtl time unix ];
+       libraryHaskellDepends = [ base bytestring mtl time unix ];
        jailbreak = true;
        homepage = "https://secure.plaimi.net/works/plailude";
        description = "plaimi's prelude";
@@ -101785,7 +104370,7 @@ self: {
        pname = "planar-graph";
        version = "1.0.0.0";
        sha256 = "1c7a168wkym50nh6a0vqfnqgj4hsk91d4x3w84ip0phcnig65iip";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers data-clist
          deepseq
        ];
@@ -101801,7 +104386,9 @@ self: {
        pname = "plat";
        version = "0.1.0.1";
        sha256 = "06syff2yzrs7qvj8m1f7bgzd6qc834zl9qphv67q3ps5r2hy09qd";
-       buildDepends = [ base bytestring containers mtl utf8-string ];
+       libraryHaskellDepends = [
+         base bytestring containers mtl utf8-string
+       ];
        description = "Simple templating library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101817,10 +104404,13 @@ self: {
        sha256 = "1g49w0h3fms4ihxwbaq0bg0dzgqa1k83zrbnnd57svcr5qgi9clb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring filepath optparse-applicative text word8
+       libraryHaskellDepends = [
+         attoparsec base bytestring filepath text word8
        ];
-       testDepends = [ base bytestring doctest hlint hspec ];
+       executableHaskellDepends = [
+         base bytestring optparse-applicative text
+       ];
+       testHaskellDepends = [ base bytestring doctest hlint hspec ];
        homepage = "https://github.com/pjones/playlists";
        description = "Library and executable for working with playlist files";
        license = stdenv.lib.licenses.bsd3;
@@ -101832,7 +104422,7 @@ self: {
        pname = "plist";
        version = "0.0.6";
        sha256 = "0xsx1pvlnqyidpvswisir9p9054r7fczi81nccflazijn3pr9rgb";
-       buildDepends = [ base base64-bytestring bytestring hxt ];
+       libraryHaskellDepends = [ base base64-bytestring bytestring hxt ];
        description = "Generate and parse Mac OS X property list format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101845,10 +104435,10 @@ self: {
      mkDerivation {
        pname = "plivo";
        version = "0.2.0.0";
-       revision = "1";
        sha256 = "16q6jwnbzxhapmkzi2sn1k02z8gq11s9wp555fv7msv2if5axrp0";
+       revision = "1";
        editedCabalFile = "7ef78cd34067e8d72872b32bcad9d01537710c11efce159c990aeb4670e4efb3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring errors http-streams http-types
          io-streams network-uri old-locale time unexceptionalio
        ];
@@ -101867,7 +104457,7 @@ self: {
        pname = "plot";
        version = "0.2.3.4";
        sha256 = "1dclv0z94xpxmx80yzzppahq92cqjwaqr0g1ama0spywxhz6l7h3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base cairo colour hmatrix mtl pango transformers
        ];
        homepage = "http://github.com/amcphail/plot";
@@ -101881,7 +104471,7 @@ self: {
        pname = "plot-gtk";
        version = "0.2.0.2";
        sha256 = "18p3jjrs1asd35q3fykfsrwx22d7rqczymbyxsaqwya5y0nv3ymn";
-       buildDepends = [ base glib gtk hmatrix mtl plot process ];
+       libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ];
        homepage = "http://code.haskell.org/plot";
        description = "GTK plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
@@ -101895,7 +104485,7 @@ self: {
        pname = "plot-gtk-ui";
        version = "0.1.0.0";
        sha256 = "0q3f1rm1s22vrk19yzbflr1pwbl094lx5j8zbyhqqjvhpz491dx7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo colour fixed-vector gtk hmatrix plot text vector
        ];
        homepage = "https://github.com/sumitsahrawat/plot-gtk-ui";
@@ -101909,7 +104499,9 @@ self: {
        pname = "plot-gtk3";
        version = "0.1.0.1";
        sha256 = "0x7s9wb8r2sds25q9k6h8mvpfzgi90v497ccxskvb3qd0a1jv24f";
-       buildDepends = [ base glib gtk3 hmatrix mtl plot process ];
+       libraryHaskellDepends = [
+         base glib gtk3 hmatrix mtl plot process
+       ];
        homepage = "http://code.haskell.org/plot";
        description = "GTK3 plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
@@ -101923,7 +104515,9 @@ self: {
        sha256 = "1qa5mxq9j5m5zbvzsmrzg8jb9w9v8ik50c8w5ffddcrrqb9b8mcq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base colour gtk hmatrix plot text vector ];
+       executableHaskellDepends = [
+         base colour gtk hmatrix plot text vector
+       ];
        jailbreak = true;
        homepage = "https://github.com/sumitsahrawat/plot-lab";
        description = "A plotting tool with Mathematica like Manipulation abilities";
@@ -101936,7 +104530,7 @@ self: {
        pname = "plotserver-api";
        version = "0.22";
        sha256 = "17vr3c9dnd1jabx66qih7z19mk0irrxzab51gl5gifcgdxlf4s3x";
-       buildDepends = [ base curl split ];
+       libraryHaskellDepends = [ base curl split ];
        description = "Plotserver API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -101949,7 +104543,7 @@ self: {
        pname = "plugins";
        version = "1.5.4.0";
        sha256 = "126lp2bbz9aa3pfi5dmbbzgsancdj1m26k7man96avixb21mzbi8";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base Cabal containers directory filepath ghc ghc-paths
          ghc-prim haskell-src process random
        ];
@@ -101967,10 +104561,10 @@ self: {
        pname = "plugins-auto";
        version = "0.0.4";
        sha256 = "1gia9d45d7rb658wm6ihkfz36l4ph7w0hr0vnfw42s035aj5shy4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath hinotify mtl plugins template-haskell
        ];
-       testDepends = [ base directory process ];
+       testHaskellDepends = [ base directory process ];
        description = "Automatic recompilation and reloading of haskell modules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101984,10 +104578,10 @@ self: {
        pname = "plugins-multistage";
        version = "0.6.1";
        sha256 = "0kwibjp9r9gwkmi8i79cc217jhnqljcgdkvpsk7hclmaa7ir3caq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory ghc process template-haskell th-desugar
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th template-haskell
        ];
        description = "Dynamic linking for embedded DSLs with staged compilation";
@@ -102001,7 +104595,7 @@ self: {
        pname = "plumbers";
        version = "0.0.3";
        sha256 = "1grw827jhxwka1zl0n5ycgrpc4ljw8bxg3psms8lsxfiiz6mwmq9";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "Pointless plumbing combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102017,10 +104611,11 @@ self: {
        sha256 = "0hi32n4gjvydahlclzc47qsnwqhzxxa7irc4qv6qbgpra4j6zqg1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring cereal directory filepath lens linear
          parallel-io transformers vector
        ];
+       executableHaskellDepends = [ base bytestring linear vector ];
        description = "PLY file loader";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102033,7 +104628,7 @@ self: {
        pname = "png-file";
        version = "0.0.1.1";
        sha256 = "18m5pqf2dx26spwjav9b67plha9f3bgn4wl6g6pckl0mmym3zm10";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary-file bytestring monads-tf template-haskell zlib
        ];
        homepage = "https://skami.iocikun.jp/haskell/packages/png-file";
@@ -102050,7 +104645,9 @@ self: {
        pname = "pngload";
        version = "0.1";
        sha256 = "1j8zagi5xcb4spvq1r0wcnn211y2pryzf0r8z7h70ypqak7sy6ps";
-       buildDepends = [ array base bytestring haskell98 mtl parsec zlib ];
+       libraryHaskellDepends = [
+         array base bytestring haskell98 mtl parsec zlib
+       ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102062,7 +104659,7 @@ self: {
        pname = "pngload-fixed";
        version = "1.0";
        sha256 = "02ikfn7kl8jx5iffa2pv0n1z1c75qcg9aq94nrccfdp532wxr7bx";
-       buildDepends = [ array base bytestring mtl parsec zlib ];
+       libraryHaskellDepends = [ array base bytestring mtl parsec zlib ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102074,7 +104671,7 @@ self: {
        pname = "pnm";
        version = "0.1.0.0";
        sha256 = "0h6wsqv6c36cmk30gs3rjdjbxxq9zih49pmzhj2dh9nyxsqbj2yw";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "PNM image format header parsing and pretty printing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102093,13 +104690,19 @@ self: {
        sha256 = "1736gj66ljgarmdxwzc9m5aa9inkmgzfmn9sjcqlcs0kpp5faqsh";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring data-default dns iproute monad-control
+         network optparse-applicative persistent persistent-sqlite
+         persistent-template persistent-zookeeper text transformers
+         unordered-containers yaml
+       ];
+       executableHaskellDepends = [
          aeson base bytestring data-default dns http-conduit iproute
          monad-control network optparse-applicative persistent
          persistent-sqlite persistent-template persistent-zookeeper shelly
-         text transformers unordered-containers yaml
+         text unordered-containers yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cabal-test-bin hspec hspec-contrib hspec-server
          hspec-test-sandbox shakespeare test-sandbox text transformers
        ];
@@ -102117,7 +104720,7 @@ self: {
        pname = "pointed";
        version = "4.2.0.2";
        sha256 = "0ynswx6ybl7b6vbrm2bd2zj2sbvsclhdi440lpv1aix5smd8m2jb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers data-default-class hashable kan-extensions
          semigroupoids semigroups stm tagged transformers
          transformers-compat unordered-containers
@@ -102133,7 +104736,7 @@ self: {
        pname = "pointedlist";
        version = "0.6.1";
        sha256 = "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l";
-       buildDepends = [ base binary ];
+       libraryHaskellDepends = [ base binary ];
        description = "A zipper-like comonad which works as a list, tracking a position";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102148,10 +104751,13 @@ self: {
        sha256 = "0lkwan8vi86jl72wfpdi0saac6rbx8z270r2nf3vp0468dqk25cf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers haskell-src-exts transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base containers haskell-src-exts transformers
+       ];
+       testHaskellDepends = [
          array base containers haskell-src-exts HUnit QuickCheck
          transformers
        ];
@@ -102169,7 +104775,10 @@ self: {
        sha256 = "151cyy324g6cl5bdwcpbvcvpavj3x2592jbic1jq5q3fgahf5wqk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers haskell-src-exts mtl syb transformers
+       ];
+       executableHaskellDepends = [
          base containers haskell-src-exts mtl syb transformers
        ];
        homepage = "http://github.com/23Skidoo/pointful";
@@ -102183,7 +104792,7 @@ self: {
        pname = "pointless-fun";
        version = "1.1.0.6";
        sha256 = "0m5hwd0mr7bmb2sbs1qa7l65xrr5h2wjznknsrk1ga08qkd5jp6h";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Some common point-free combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -102195,7 +104804,7 @@ self: {
        pname = "pointless-haskell";
        version = "0.0.9";
        sha256 = "0f0bnd6dyi1ancdxd2hkszshws9d8jz8iamz5pir0i4nsj69mqyx";
-       buildDepends = [ base GHood process syb ];
+       libraryHaskellDepends = [ base GHood process syb ];
        homepage = "http://haskell.di.uminho.pt/wiki/Pointless+Haskell";
        description = "Pointless Haskell library";
        license = stdenv.lib.licenses.bsd3;
@@ -102210,7 +104819,7 @@ self: {
        pname = "pointless-lenses";
        version = "0.0.9";
        sha256 = "1z09wbx9nrlpg0msq69zyaypp28rfm653l22g7q5xcn0wn4hfs0b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers derive pointless-haskell process QuickCheck
        ];
        homepage = "http://haskell.di.uminho.pt/wiki/Pointless+Lenses";
@@ -102227,7 +104836,7 @@ self: {
        pname = "pointless-rewrite";
        version = "0.0.3";
        sha256 = "0dc37gw8p5zyi23g94llbq7vb5n09rgznjf24nhg28jw2vmf3f0n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl pointless-haskell pointless-lenses process
        ];
        description = "Pointless Rewrite library";
@@ -102241,8 +104850,8 @@ self: {
        pname = "poker-eval";
        version = "0.3.1";
        sha256 = "0v1is9jnpw1ij3b7h9figkjqk58dzc44v6vpdmxfmb80w0myihrv";
-       buildDepends = [ array base mtl random vector ];
-       extraLibraries = [ poker-eval ];
+       libraryHaskellDepends = [ array base mtl random vector ];
+       librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
        license = stdenv.lib.licenses.publicDomain;
      }) { inherit (pkgs) poker-eval;};
@@ -102256,7 +104865,7 @@ self: {
        pname = "pokitdok";
        version = "4.1.0.2";
        sha256 = "08pknbn79hihkil1vcpr7a8ilah3i5b6lnlc41bmprycyqz5vj1w";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-string bytestring case-insensitive directory hex
          HTTP http-client http-conduit http-types strict text time
        ];
@@ -102272,7 +104881,7 @@ self: {
        pname = "polar";
        version = "0.0.1";
        sha256 = "1f0anpxc57vxa5z0x4wrfay0g1sw2qwnz5nkz74y9vmh8vd99kkh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://space.k-hornz.de/polar";
        description = "Complex numbers in polar form";
        license = stdenv.lib.licenses.bsd3;
@@ -102288,7 +104897,7 @@ self: {
        sha256 = "0mnccx3xj568s3q82achf1pj57zqdpj9iskgh62w39xbqm7spivl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers dawg directory filepath mtl polysoup text
          text-binary transformers
        ];
@@ -102305,7 +104914,9 @@ self: {
        pname = "polimorf";
        version = "0.7.3";
        sha256 = "0vv7j1l0wnjwpd3hpxswq0k33izl0ck2njspcga885bkrd45lzdr";
-       buildDepends = [ base binary containers text text-binary ];
+       libraryHaskellDepends = [
+         base binary containers text text-binary
+       ];
        jailbreak = true;
        homepage = "https://github.com/kawu/polimorf";
        description = "Working with the PoliMorf dictionary";
@@ -102318,7 +104929,7 @@ self: {
        pname = "poll";
        version = "0.0";
        sha256 = "0v4cyrr506zqvxqbxkncss2pl2j38skl02p1vj6cjxcvlzb2y43p";
-       buildDepends = [ base enumset utility-ht ];
+       libraryHaskellDepends = [ base enumset utility-ht ];
        description = "Bindings to poll.h";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102330,11 +104941,13 @@ self: {
      mkDerivation {
        pname = "poly-arity";
        version = "0.0.4.1";
-       revision = "2";
        sha256 = "15yl8mqwahbrwl0hmz6lb4k7i48qgnxhav7xalj4q541ghd7cnwp";
+       revision = "2";
        editedCabalFile = "0bce1ff7388433830c7824530bb9c4fe3f4545bad44683dec2a5780028d870af";
-       buildDepends = [ base constraints HList ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       libraryHaskellDepends = [ base constraints HList ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances
+       ];
        description = "Tools for working with functions of undetermined arity";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102345,7 +104958,7 @@ self: {
        pname = "polyToMonoid";
        version = "0.1";
        sha256 = "068acarrpd66682yjscm6l5k9kj9p8zxbf3hi76kz7gvkhkbsjj8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Polyvariadic functions mapping to a given monoid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102358,7 +104971,7 @@ self: {
        pname = "polynomial";
        version = "0.7.2";
        sha256 = "1w1zpa2l7l7yzqdgr142mqhf73mq8kiz7h3ydpd84n4vawjzz7z1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq pretty vector vector-space vector-th-unbox
        ];
        homepage = "https://github.com/mokus0/polynomial";
@@ -102372,7 +104985,7 @@ self: {
        pname = "polynomials-bernstein";
        version = "1.1.1";
        sha256 = "0pjdwi84gz5j1rij4m89nyljjafzjnakmf4yd6vj4xz54nmmygg6";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        description = "A solver for systems of polynomial equations in bernstein form";
        license = "GPL";
      }) {};
@@ -102383,7 +104996,7 @@ self: {
        pname = "polyparse";
        version = "1.11";
        sha256 = "1z417f80b0jm4dgv25fk408p3d9mmcd1dlbya3ry0zdx4md09vrh";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "http://code.haskell.org/~malcolm/polyparse/";
        description = "A variety of alternative parser combinator libraries";
        license = "LGPL";
@@ -102400,10 +105013,11 @@ self: {
        sha256 = "1l31ynlkjkk2zzpsv194gv3pbl55liizvq4x16m5z52vzgszb570";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cgi containers free-theorems haskell-src mtl
          network old-locale old-time parsec pretty syb utf8-string xhtml
        ];
+       executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102415,7 +105029,9 @@ self: {
        pname = "polysoup";
        version = "0.6";
        sha256 = "1c7lmx7waj2p9gn9k0hsvnmzrxf3ryz5q7zr4770g3nj8yvbpyp2";
-       buildDepends = [ base containers deepseq polyparse tagsoup ];
+       libraryHaskellDepends = [
+         base containers deepseq polyparse tagsoup
+       ];
        jailbreak = true;
        homepage = "https://github.com/kawu/polysoup";
        description = "Online XML parsing with polyparse and tagsoup";
@@ -102428,7 +105044,7 @@ self: {
        pname = "polytypeable";
        version = "0.1.0.0";
        sha256 = "0vb2adm97ypi553lsjz7333q3dg9fmi0incrxlikqixk0f3ajaq8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Typeable for polymorphic types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102440,7 +105056,7 @@ self: {
        pname = "polytypeable-utils";
        version = "0.1.0.0";
        sha256 = "1hbpamgqsmsjkzjjva15f566yra77hwasp88b6y68nx9qa36a821";
-       buildDepends = [ base haskell98 polytypeable ];
+       libraryHaskellDepends = [ base haskell98 polytypeable ];
        description = "Utilities for polytypeable";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102452,7 +105068,7 @@ self: {
        pname = "ponder";
        version = "0.0.1";
        sha256 = "1nq4z063g429hxwf4vbyyr2b2s7sn325m0h6ggf793inlj48ci0h";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        homepage = "https://gihub.com/matt76k/ponder";
        description = "PEG parser combinator";
@@ -102469,7 +105085,7 @@ self: {
        sha256 = "00qyrbibav26x5ycipnyypybgjms2kxn38s3iy9gqzv0kmgsdxna";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base HDBC HDBC-sqlite3 hlogger pontarius-xmpp pontarius-xpmn
          xml-types
        ];
@@ -102497,7 +105113,7 @@ self: {
        pname = "pontarius-xmpp";
        version = "0.4.2.2";
        sha256 = "1krbr0vdza3s6w4sa119x591i5ryq9bmqfnacy665xr5si4bkzcv";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
          data-default dns exceptions hslogger iproute lens-family
@@ -102506,7 +105122,7 @@ self: {
          unbounded-delays void x509-system xml-conduit xml-picklers
          xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base Cabal conduit configurator containers data-default
          derive directory doctest filepath hslogger hspec hspec-expectations
          HUnit lens mtl network QuickCheck quickcheck-instances ranges
@@ -102528,7 +105144,7 @@ self: {
        pname = "pontarius-xpmn";
        version = "0.0.1.0";
        sha256 = "1nd228fgsxlqxql38wkvhq8k5d04bgknpx7i83qxrzj8kb6890dy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers pontarius-xmpp random text xml-types
        ];
        jailbreak = true;
@@ -102546,7 +105162,7 @@ self: {
        sha256 = "0a8bya0kwk9d965awpg881bgzy9z1szcwsqqr0lfkd6bw3cb9fyy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.ascii-art.de/ascii/uvw/unicorn.txt";
        description = "Can I have a pony?";
        license = stdenv.lib.licenses.bsd3;
@@ -102557,10 +105173,10 @@ self: {
      mkDerivation {
        pname = "pool";
        version = "0.1.2.1";
-       revision = "1";
        sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c";
+       revision = "1";
        editedCabalFile = "c79e139723764f4d4ba584c6cf6f73174700271910b15ed0f25a150a53a8c951";
-       buildDepends = [ base monad-control transformers ];
+       libraryHaskellDepends = [ base monad-control transformers ];
        jailbreak = true;
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Thread-safe resource pools. (deprecated)";
@@ -102575,10 +105191,10 @@ self: {
      mkDerivation {
        pname = "pool-conduit";
        version = "0.1.2.3";
-       revision = "1";
        sha256 = "1myjbmbh0jm89ycx9d961mpgw8hp7al8wgnsls4p19gvr73gcbfv";
+       revision = "1";
        editedCabalFile = "b894f71054b3824a0a05753e8273efbc7c1dc48efa9c6d56625ba4411a74afa5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base monad-control resource-pool resourcet transformers
        ];
        jailbreak = true;
@@ -102598,7 +105214,7 @@ self: {
        sha256 = "0v7l0jvk2acqslb1inw6lgwbjraj73s396r160hw56slqxh5sgxl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base concurrent-split containers deepseq transformers unsafe
          utility-ht
        ];
@@ -102613,7 +105229,7 @@ self: {
        pname = "pop3-client";
        version = "0.1.4";
        sha256 = "0kfcfxfwg5rjm7qx9r0ssdvkrvca95hflahrip1hi5wbplf224xv";
-       buildDepends = [ base mtl network ];
+       libraryHaskellDepends = [ base mtl network ];
        homepage = "https://github.com/tmrudick/haskell-pop3-client/";
        description = "POP3 Client Library";
        license = stdenv.lib.licenses.bsd3;
@@ -102625,7 +105241,7 @@ self: {
        pname = "popenhs";
        version = "1.0.0";
        sha256 = "01pb8g5zl99zccnjnkwklfgaz1pqjp1xrgz5b3qy45nclyln0bm4";
-       buildDepends = [ base directory haskell98 unix ];
+       libraryHaskellDepends = [ base directory haskell98 unix ];
        homepage = "http://www.haskell.org/~petersen/haskell/popenhs/";
        description = "popenhs is a popen-like library for Haskell";
        license = "GPL";
@@ -102640,11 +105256,11 @@ self: {
        pname = "poppler";
        version = "0.13";
        sha256 = "1fv0h2ixanzv5vy4l2ln23f9n8ghmgdxzlyx54hh69bwhrcg049s";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cairo containers glib gtk mtl
        ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gdk_pixbuf pango poppler ];
+       libraryPkgconfigDepends = [ gdk_pixbuf pango poppler ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
@@ -102658,7 +105274,7 @@ self: {
        pname = "populate-setup-exe-cache";
        version = "1.0";
        sha256 = "06z723fgqwvcxgxy63pqwmjb6xkcl69xmdry117f0i5rhy0aix3y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mietek/populate-setup-exe-cache/";
        description = "Empty Cabal package";
        license = stdenv.lib.licenses.mit;
@@ -102670,7 +105286,7 @@ self: {
        pname = "portable-lines";
        version = "0.1";
        sha256 = "1l94p3s56a3kfqc8fzqc52z12rhg3c8xsmgcw1i20dnl8aygalsh";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Alternative 'lines' implementation that understands CR-LF and CR";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102681,8 +105297,8 @@ self: {
        pname = "portaudio";
        version = "0.2.4";
        sha256 = "0vxlfn2462fmknj94sd5ajbm3lydy3z8mrqb3vgh47wwn0sq8sk3";
-       buildDepends = [ base containers ];
-       extraLibraries = [ portaudio ];
+       libraryHaskellDepends = [ base containers ];
+       librarySystemDepends = [ portaudio ];
        homepage = "http://code.haskell.org/portaudio";
        description = "Haskell bindings for the PortAudio library";
        license = "unknown";
@@ -102698,7 +105314,7 @@ self: {
        sha256 = "1cc7kbbz0vqh60acaxyn8b8pdmwx2w022sgvk1mw7p60s8jhng2d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers extensible-exceptions stringsearch
        ];
        description = "FreeBSD ports index search and analysis tool";
@@ -102712,7 +105328,7 @@ self: {
        pname = "porter";
        version = "0.1";
        sha256 = "0aw1gq7z3h5ag5vzl6crw7vijg9w25s0jvxr4rkniv4jk0wlfmnk";
-       buildDepends = [ haskell2010 ];
+       libraryHaskellDepends = [ haskell2010 ];
        description = "Implementation of the Porter stemming algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102724,7 +105340,7 @@ self: {
        pname = "ports";
        version = "0.4.3.2";
        sha256 = "1ixyrg4k1f91v2r485r2fs8bgq373bhvg02mza5jdcb1amyfi7rm";
-       buildDepends = [ base haskell98 unix ];
+       libraryHaskellDepends = [ base haskell98 unix ];
        homepage = "http://www.cse.unsw.edu.au/~chak/haskell/ports/";
        description = "The Haskell Ports Library";
        license = "LGPL";
@@ -102737,7 +105353,7 @@ self: {
        pname = "ports-tools";
        version = "0.0.1";
        sha256 = "0bs7b88qiczf59dliqhbxbzciv4xi07b6djspgpydigyrf5maac6";
-       buildDepends = [ base directory process ];
+       libraryHaskellDepends = [ base directory process ];
        homepage = "http://github.com/ppenzin/hs-ports-tools/";
        description = "Library to interact with port tools on FreeBSD";
        license = "unknown";
@@ -102749,10 +105365,9 @@ self: {
        pname = "positive";
        version = "0.4.1";
        sha256 = "034vlx889sgwvn7g2s1vl3w0nf1vs0c2c1gc0vn77wd9l1vw0hfg";
-       buildDepends = [ base nats semigroups ];
+       libraryHaskellDepends = [ base nats semigroups ];
        description = "Positive integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "posix-acl" = callPackage
@@ -102763,11 +105378,11 @@ self: {
        pname = "posix-acl";
        version = "0.2.0.0";
        sha256 = "1qiq5bqq6bwdxrxc3i27jiq1ic5pn0309453a0y6vjwamrc8h7rv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers lifted-base monad-control transformers
          transformers-base unix
        ];
-       extraLibraries = [ acl ];
+       librarySystemDepends = [ acl ];
        jailbreak = true;
        homepage = "https://github.com/tensor5/posix-acl";
        description = "Support for Posix ACL";
@@ -102781,7 +105396,7 @@ self: {
        pname = "posix-escape";
        version = "0.1";
        sha256 = "0yrx8cr6qximfy0vh7qqljlkj27q9gksrnqmqbnj2hk5bsa5l48w";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Quote arguments to be passed through the Unix shell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102792,7 +105407,7 @@ self: {
        pname = "posix-filelock";
        version = "0.1";
        sha256 = "106rrbw4d0f13wcj19m6h0vy3v53j11bawqd3q4r0pcsypk53qmk";
-       buildDepends = [ base transformers unix ];
+       libraryHaskellDepends = [ base transformers unix ];
        homepage = "https://github.com/singpolyma/posix-filelock-haskell";
        description = "Nice wrapper around POSIX fcntl advisory locks";
        license = "unknown";
@@ -102805,8 +105420,10 @@ self: {
        pname = "posix-paths";
        version = "0.2.1.0";
        sha256 = "187sq0rcdg06h64kkjdgqg32s8s51hd4cgf6hvajj1pgd9pyd1i0";
-       buildDepends = [ base bytestring unix ];
-       testDepends = [ base bytestring doctest HUnit QuickCheck unix ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [
+         base bytestring doctest HUnit QuickCheck unix
+       ];
        description = "POSIX filepath/directory functionality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102817,8 +105434,8 @@ self: {
        pname = "posix-pty";
        version = "0.2.0.1";
        sha256 = "1f0jyhfl41fvnjc290lm7x4dik2bhymcfxzf0il1iza5rpcjabxa";
-       buildDepends = [ base bytestring process unix ];
-       extraLibraries = [ util ];
+       libraryHaskellDepends = [ base bytestring process unix ];
+       librarySystemDepends = [ util ];
        homepage = "https://bitbucket.org/merijnv/posix-pty";
        description = "Pseudo terminal interaction with subprocesses";
        license = stdenv.lib.licenses.bsd3;
@@ -102830,7 +105447,7 @@ self: {
        pname = "posix-realtime";
        version = "0.0.0.3";
        sha256 = "0g7mflyvhrypr8a5795vnqb5qlkg3w4nd3j8pnqql9dbmcbqc2aq";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "POSIX Realtime functionality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102841,7 +105458,7 @@ self: {
        pname = "posix-timer";
        version = "0.3";
        sha256 = "0z4j98pb46gzhi5i5pvxxm7an7am5i757p43cp2jv8pirx33k8zd";
-       buildDepends = [ base transformers-base unix ];
+       libraryHaskellDepends = [ base transformers-base unix ];
        homepage = "https://github.com/mvv/posix-timer";
        description = "Bindings to POSIX clock and timer functions";
        license = stdenv.lib.licenses.bsd3;
@@ -102853,7 +105470,7 @@ self: {
        pname = "posix-waitpid";
        version = "0.1";
        sha256 = "1v3y3pg3gv0s26hdqc5fsar2j3vk4kpldkr23zxm14ncpz2w2dhk";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "Low-level wrapping of POSIX waitpid(2)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102865,7 +105482,7 @@ self: {
        pname = "possible";
        version = "0.1.0.5";
        sha256 = "1iiyz3yf5rwcdawrbawdrx3fwrhb1s62ram6yavfwkvc7j9rfvzx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/tolysz/possible";
        description = "Three valued Data.Maybe";
        license = stdenv.lib.licenses.bsd3;
@@ -102877,7 +105494,7 @@ self: {
        pname = "post-mess-age";
        version = "0.1.0.0";
        sha256 = "1rl7i37szwnqs6slhha3wv45mw9w9x6yxcrkbdcfvdc63x8nh74w";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Send messages to a Handle concurrently without getting them mixed";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102888,7 +105505,7 @@ self: {
        pname = "postcodes";
        version = "0.1.1";
        sha256 = "1z0d5pl11jymd0jj1k50si35lq2af3y0apiyz6mbi25zl5x49bi8";
-       buildDepends = [ aeson base bytestring HTTP ];
+       libraryHaskellDepends = [ aeson base bytestring HTTP ];
        homepage = "https://github.com/mattyhall/haskell-postcodes";
        description = "A library that gets postcode information from the uk-postcodes.com";
        license = stdenv.lib.licenses.bsd3;
@@ -102903,11 +105520,11 @@ self: {
        pname = "postgresql-binary";
        version = "0.5.2.1";
        sha256 = "02dzsh9d62pgrqsvjmdxyffr4cryk3sd2dg12jmygg94q5dfkm0m";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base-prelude bytestring loch-th placeholders scientific
          text time transformers uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          base-prelude bytestring HTF postgresql-libpq QuickCheck
          quickcheck-instances scientific text time uuid
        ];
@@ -102925,7 +105542,7 @@ self: {
        pname = "postgresql-config";
        version = "0.1.0";
        sha256 = "1p5kzj2wsd3kigi9qavsqkxv9kfk4qbl809wqbdk4pd7y34ajab4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring monad-control mtl postgresql-simple
          resource-pool time
        ];
@@ -102940,7 +105557,7 @@ self: {
        pname = "postgresql-copy-escape";
        version = "0.1";
        sha256 = "063phxj8r3vy25awwwn47k9ac0s8z59igpgqrhb9gbfdq4ldrlpm";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/joeyadams/hs-postgresql-copy-escape";
        description = "Format data to feed to a PostgreSQL COPY FROM statement";
        license = stdenv.lib.licenses.bsd3;
@@ -102952,7 +105569,7 @@ self: {
        pname = "postgresql-cube";
        version = "0.1.0.0";
        sha256 = "0jla8rxnrk995qxyp5dgwm2d6yrcafyz5mj7yqr6v5jyzh6b59c3";
-       buildDepends = [ base bytestring postgresql-simple ];
+       libraryHaskellDepends = [ base bytestring postgresql-simple ];
        description = "Cube support for postgresql-simple";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -102963,8 +105580,8 @@ self: {
        pname = "postgresql-libpq";
        version = "0.9.1.1";
        sha256 = "0waqg245ly017j1qml4sc24896ax645bv8a2fghwwa46zvbsx0z4";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ postgresql ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ postgresql ];
        homepage = "http://github.com/lpsmith/postgresql-libpq";
        description = "low-level binding to libpq";
        license = stdenv.lib.licenses.bsd3;
@@ -102981,11 +105598,15 @@ self: {
        sha256 = "1a81wrqzhpgdhs7i0znamkrrra2bksfwsh22yxv94qg6r7c2qp2p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring 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
+       ];
        jailbreak = true;
        description = "An ORM (Object Relational Mapping) and migrations DSL for PostgreSQL";
        license = "GPL";
@@ -103005,14 +105626,14 @@ self: {
        pname = "postgresql-query";
        version = "1.4.0";
        sha256 = "0ba5sslcjmfvjm1s3sf1ym7lgzgxx0p5gzdgby1r2y20i5cswfsr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default either exceptions file-embed haskell-src-meta hreader
          hset monad-control monad-logger mtl postgresql-simple resource-pool
          semigroups template-haskell text time transformers
          transformers-base transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base QuickCheck quickcheck-assertions
          quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th
          text
@@ -103029,14 +105650,16 @@ self: {
      mkDerivation {
        pname = "postgresql-schema";
        version = "0.1.3";
-       revision = "1";
        sha256 = "17i4xpal7cf7km3p59p7m1cbc39rgkjwg6dkmhswnr669v40r350";
+       revision = "1";
        editedCabalFile = "48c36bad1c6796bd2c7211e0002d2aafc5bb0c8dedde4ec9f8ece597335096ce";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base base-prelude formatting old-locale optparse-applicative shelly
-         text time
+       libraryHaskellDepends = [
+         base base-prelude formatting shelly text
+       ];
+       executableHaskellDepends = [
+         base base-prelude old-locale optparse-applicative shelly text time
        ];
        jailbreak = true;
        homepage = "https://github.com/mfine/postgresql-schema";
@@ -103056,12 +105679,12 @@ self: {
        pname = "postgresql-simple";
        version = "0.4.10.0";
        sha256 = "0ar8rjd3fsk56ykf7ys3f14ld3771dknhvkfk08fq7054rilrir0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-textual bytestring
          case-insensitive containers hashable postgresql-libpq scientific
          template-haskell text time transformers uuid vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base16-bytestring bytestring containers cryptohash HUnit
          text time vector
        ];
@@ -103079,11 +105702,15 @@ self: {
        sha256 = "0qz75dgp346q6sbxwlfrqd9hpkh14krij2r8440nhb9qs4ccl2jz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cryptohash directory
          postgresql-simple time
        ];
-       testDepends = [ base bytestring hspec postgresql-simple ];
+       executableHaskellDepends = [
+         base base64-bytestring bytestring cryptohash directory
+         postgresql-simple time
+       ];
+       testHaskellDepends = [ base bytestring hspec postgresql-simple ];
        jailbreak = true;
        homepage = "https://github.com/ameingast/postgresql-simple-migration";
        description = "PostgreSQL Schema Migrations";
@@ -103096,7 +105723,7 @@ self: {
        pname = "postgresql-simple-sop";
        version = "0.1.0.7";
        sha256 = "1hbfh4rp40h1h4m8dzr70zrfb24fckqwp5s6a7kc2fa7a9lw9g8r";
-       buildDepends = [ base generics-sop postgresql-simple ];
+       libraryHaskellDepends = [ base generics-sop postgresql-simple ];
        homepage = "https://github.com/openbrainsrc/postgresql-simple-sop";
        description = "Generic functions for postgresql-simple";
        license = stdenv.lib.licenses.mit;
@@ -103110,7 +105737,7 @@ self: {
        pname = "postgresql-simple-typed";
        version = "0.1.0.1";
        sha256 = "0rgy0sx4fwcsr8ln14vhrp23hc1b67c07gw0hj5csrsjn40s0c2c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base postgresql-libpq postgresql-simple template-haskell
          transformers typedquery utf8-string
        ];
@@ -103128,8 +105755,12 @@ self: {
        pname = "postgresql-simple-url";
        version = "0.1.0.1";
        sha256 = "1878zcfgis931nn5pnbixzfj2sbp790rxq294cwjy6g1ab35w5ng";
-       buildDepends = [ base network-uri postgresql-simple split ];
-       testDepends = [ base postgresql-simple tasty tasty-quickcheck ];
+       libraryHaskellDepends = [
+         base network-uri postgresql-simple split
+       ];
+       testHaskellDepends = [
+         base postgresql-simple tasty tasty-quickcheck
+       ];
        homepage = "https://github.com/futurice/postgresql-simple-url";
        description = "PostgreSQL";
        license = stdenv.lib.licenses.mit;
@@ -103145,12 +105776,12 @@ self: {
        pname = "postgresql-typed";
        version = "0.4.0";
        sha256 = "0w3fbxwiqsl32g4hmkdxyw821nd14dv3i2pwykpx68c9w6vvlmx9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson array attoparsec base binary bytestring containers cryptohash
          haskell-src-meta network old-locale postgresql-binary scientific
          template-haskell text time utf8-string uuid
        ];
-       testDepends = [ base bytestring network time ];
+       testHaskellDepends = [ base bytestring network time ];
        homepage = "https://github.com/dylex/postgresql-typed";
        description = "A PostgreSQL access library with compile-time SQL type inference";
        license = stdenv.lib.licenses.bsd3;
@@ -103175,7 +105806,7 @@ self: {
        sha256 = "0s1nmdpdjylqb6lmb9ijh83pfjyf8j6dkagl3rzl4dxc97w6fbpy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-string bcrypt blaze-builder bytestring
          case-insensitive cassava containers convertible hasql hasql-backend
          hasql-postgres HTTP http-types jwt MissingH mtl network network-uri
@@ -103184,7 +105815,16 @@ self: {
          stringsearch text time transformers unordered-containers vector wai
          wai-cors wai-extra wai-middleware-static warp
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base base64-string bcrypt blaze-builder bytestring
+         case-insensitive cassava containers convertible hasql hasql-backend
+         hasql-postgres HTTP http-types jwt MissingH mtl network network-uri
+         optparse-applicative Ranged-sets regex-base regex-tdfa
+         regex-tdfa-text resource-pool scientific split string-conversions
+         stringsearch text time transformers unordered-containers vector wai
+         wai-cors wai-extra wai-middleware-static warp
+       ];
+       testHaskellDepends = [
          aeson base base64-string bcrypt blaze-builder bytestring
          case-insensitive cassava containers convertible hasql hasql-backend
          hasql-postgres heredoc hlint hspec hspec-wai hspec-wai-json HTTP
@@ -103213,10 +105853,12 @@ self: {
        sha256 = "1iqg7wirdcysjq4i7ah3lkzc2rzlbgvc7asq953zdir21g9jpqwk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring cprng-aes data-default-class mtl network
-         pipes pipes-bytestring pipes-parse stringsearch tls transformers
-         uuid
+         pipes pipes-parse stringsearch tls transformers uuid
+       ];
+       executableHaskellDepends = [
+         base bytestring data-default-class pipes pipes-bytestring tls
        ];
        description = "SMTP server library to receive emails from within Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -103233,10 +105875,11 @@ self: {
        sha256 = "1jh1byixnc8mh3g4xb1w0nx9ghh5dchhqf1nxji869kbim2lqgaw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers http-client-tls
          http-types network-api-support text
        ];
+       executableHaskellDepends = [ base text ];
        homepage = "https://github.com/apiengine/postmark";
        description = "Library for postmarkapp.com HTTP Api";
        license = stdenv.lib.licenses.bsd3;
@@ -103253,11 +105896,11 @@ self: {
        sha256 = "1yzhblrqnd94gvcl4dzxx6glx1qyyvjy7gqa6ymqahcy8kh1v7ki";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory hopenssl hsdns hsemail hsyslog
          mtl network old-time parsec unix
        ];
-       extraLibraries = [ adns openssl ];
+       executableSystemDepends = [ adns openssl ];
        homepage = "http://github.com/peti/postmaster";
        description = "Postmaster ESMTP Server";
        license = "GPL";
@@ -103272,7 +105915,7 @@ self: {
        sha256 = "1d95y8nchzzy3zaq1dsm94b7nhrlxhwpq7yn9dr1nisz43f4j7bx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring split ];
+       executableHaskellDepends = [ base binary bytestring split ];
        homepage = "https://github.com/RossMeikleham/Potato_Tool";
        description = "Command line Dreamcast VMU filesystem toolset";
        license = stdenv.lib.licenses.gpl2;
@@ -103286,7 +105929,7 @@ self: {
        pname = "potrace";
        version = "0.1.0.0";
        sha256 = "1frxf3jzjyyp3bfj6b2mi29fxwcml4bya6sn4c5aizg741dhphng";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-potrace bytestring containers data-default
          JuicyPixels vector
        ];
@@ -103300,7 +105943,7 @@ self: {
        pname = "potrace-diagrams";
        version = "0.1.0.0";
        sha256 = "0ys70a5k384czz0c6bpyy0cqrk35wa1yg6ph19smhm3ag9d8161v";
-       buildDepends = [ base diagrams-lib JuicyPixels potrace ];
+       libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Potrace bindings for the diagrams library";
        license = stdenv.lib.licenses.gpl2;
@@ -103312,7 +105955,7 @@ self: {
        pname = "powermate";
        version = "0.1";
        sha256 = "19qsi4g4v2dwagps3gq9grbin44rzk9ydpkpbwysc4gbizh1lrs0";
-       buildDepends = [ base directory network unix ];
+       libraryHaskellDepends = [ base directory network unix ];
        homepage = "http://neugierig.org/software/darcs/powermate/";
        description = "PowerMate bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -103325,7 +105968,7 @@ self: {
        pname = "powerpc";
        version = "0.0.1";
        sha256 = "0z3nqv8l9h0kwdaqb2vnk7vx5d0hmx02giv2k01llk7vznlkqqny";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://tomahawkins.org";
        description = "Tools for PowerPC programs";
        license = stdenv.lib.licenses.bsd3;
@@ -103338,7 +105981,7 @@ self: {
        pname = "ppm";
        version = "2009.5.13";
        sha256 = "0nzvxi1ybfxb1zqkbfqfic8j3mf3r6i2zdyjf7x41rz6m6lhqfcy";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://github.com/nfjinjing/ppm/tree/master";
        description = "a tiny PPM image generator";
        license = stdenv.lib.licenses.bsd3;
@@ -103350,8 +105993,8 @@ self: {
        pname = "pqc";
        version = "0.8";
        sha256 = "1n71qhlxn9js5cizyqdq9f7m08m5j0354871r8b47bnzdi2kqkc4";
-       buildDepends = [ base QuickCheck random stm ];
-       testDepends = [ base ChasingBottoms ];
+       libraryHaskellDepends = [ base QuickCheck random stm ];
+       testHaskellDepends = [ base ChasingBottoms ];
        homepage = "http://hub.darcs.net/shelarcy/pqc";
        description = "Parallel batch driver for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -103364,10 +106007,9 @@ self: {
        pname = "pqueue";
        version = "1.3.0";
        sha256 = "0nandznr9dmyvxxb4pfrcc21zyhbkn2q6ny0m60943kdmisf4401";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        description = "Reliable, persistent, fast priority queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pqueue-mtl" = callPackage
@@ -103378,7 +106020,7 @@ self: {
        pname = "pqueue-mtl";
        version = "1.0.7";
        sha256 = "0ikg11klbq25fjcbpyb7i7z9wyx9mf4hv262m14j741x4dk9ib6g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim MaybeT mtl stateful-mtl uvector
        ];
        jailbreak = true;
@@ -103397,7 +106039,9 @@ self: {
        sha256 = "071arrk0wir2lwziw6p3cbq6ybjdf3gfc4d25sh21gpnk10ighp2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring data-default directory json mps ];
+       executableHaskellDepends = [
+         base bytestring data-default directory json mps
+       ];
        homepage = "http://github.com/nfjinjing/practice-room";
        description = "Practice Room";
        license = stdenv.lib.licenses.bsd3;
@@ -103414,7 +106058,7 @@ self: {
        sha256 = "0d0cl60p58i8w2ll8z826r94zx0svm7v578fy70r7i19pn64l6bd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers cpphs directory filepath haskell-src-exts
          xhtml
        ];
@@ -103433,8 +106077,10 @@ self: {
        pname = "pred-trie";
        version = "0.2.0";
        sha256 = "11d0673jhz8vb271wf0qsl8a480hzrghly07iqcmckybalr17ibs";
-       buildDepends = [ base semigroups ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       libraryHaskellDepends = [ base semigroups ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances
+       ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103445,7 +106091,7 @@ self: {
        pname = "predicates";
        version = "0.1";
        sha256 = "0ly64xml5gbazyq07s409swgysvlwjc19w4x46yp1684ifv0gghf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A couple of convenience functions for forming predicates";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103459,11 +106105,11 @@ self: {
        pname = "prednote";
        version = "0.36.0.2";
        sha256 = "1nm6r448vzl1gkkasjihaf31i57lx7pi627dxwf73slwxfz4j0wb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers contravariant rainbow split text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers contravariant QuickCheck rainbow split
          tasty tasty-quickcheck tasty-th text transformers
        ];
@@ -103482,7 +106128,11 @@ self: {
        sha256 = "0amx13lnbx6x37adpjrxjac23qbx1xvsk82pn572kyp7pshn7ijj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         barecheck base containers prednote QuickCheck quickpull rainbow
+         rainbow-tests text
+       ];
+       executableHaskellDepends = [
          barecheck base containers prednote QuickCheck quickpull rainbow
          rainbow-tests text
        ];
@@ -103499,11 +106149,11 @@ self: {
      mkDerivation {
        pname = "prefix-units";
        version = "0.1.0.2";
-       revision = "1";
        sha256 = "07b5s2bsqlaad06dgr5psidfgi1nmgc5c16j6kzayw9f4najjrav";
+       revision = "1";
        editedCabalFile = "492d6b953a52678e44a880c5272c30175eed27c3f2bd4de82fc29eee4b4db00a";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base Cabal HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -103524,12 +106174,15 @@ self: {
        sha256 = "0zraxygc8ybf93sw7lq60nynd5k1q65dns5kl4mdyflv3in8cfw8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base blaze-builder bytestring cmdargs containers data-default
-         http-types network process stm system-argv0 system-filepath unix
-         wai warp
+       libraryHaskellDepends = [
+         base containers data-default process stm system-argv0
+         system-filepath unix
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         async base blaze-builder bytestring cmdargs containers http-types
+         network stm unix wai warp
+       ];
+       testHaskellDepends = [
          base cab containers directory filepath hspec process stm unix
        ];
        jailbreak = true;
@@ -103547,7 +106200,7 @@ self: {
        pname = "pregame";
        version = "0.1.4.3";
        sha256 = "0ls2fmg1xm10njwzz7nifndggq4bpi7ylx3n9aah8bn1hqwf8sy4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cmdargs containers data-default lens mtl parallel
          safe stm text transformers tuple vector
        ];
@@ -103564,7 +106217,7 @@ self: {
        pname = "prelude-extras";
        version = "0.4";
        sha256 = "0mzsc9pzcamaa7i3g9hkajy35sbpqdjrflv6r98r8hhlr0yrdjan";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/prelude-extras";
        description = "Haskell 98 - higher order versions of Prelude classes";
        license = stdenv.lib.licenses.bsd3;
@@ -103576,7 +106229,7 @@ self: {
        pname = "prelude-generalize";
        version = "0.4";
        sha256 = "0h452pn7zs97z5gv2p3x9pg61phphwcw5y5g1w38k3gihdvym8jl";
-       buildDepends = [ base comonad logict transformers ];
+       libraryHaskellDepends = [ base comonad logict transformers ];
        jailbreak = true;
        description = "Another kind of alternate Prelude file";
        license = stdenv.lib.licenses.publicDomain;
@@ -103591,7 +106244,7 @@ self: {
        sha256 = "139b0580f1gx4hj211c7lwcq5y6a0qpdzsaidvqbfq36h04w8kjv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base utf8-string ];
+       libraryHaskellDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103603,7 +106256,7 @@ self: {
        pname = "prelude-prime";
        version = "0.1";
        sha256 = "1avj11a5bqn8sxizzh1fxhw3dvd55xsimbbhdwymxfn45vvfswr7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A slightly better (but conservative) Prelude";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -103614,7 +106267,7 @@ self: {
        pname = "prelude-safeenum";
        version = "0.1.1.2";
        sha256 = "09wp6b7bvnp2wz0kigwm4vfca74phh3bbpqybqdgm60isfaz3yfl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "A redefinition of the Prelude's Enum class in order to render it safe";
        license = stdenv.lib.licenses.bsd3;
@@ -103630,7 +106283,7 @@ self: {
        pname = "preprocess-haskell";
        version = "0.0.1.1";
        sha256 = "1jglriabjw44f9phx7ah87wwmri64a61v236dzs58snagzdiq84r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols basic-prelude bytestring Cabal containers
          cpphs deepseq directory file-embed foldl haskell-src-exts here
          system-filepath temporary text turtle unix
@@ -103647,7 +106300,7 @@ self: {
        pname = "preprocessor-tools";
        version = "1.0.1";
        sha256 = "0ngfmvw6hvbr52i01n180ls4c8rx2wk2rka6g6igpvy9x2gwjin9";
-       buildDepends = [ base mtl parsec syb ];
+       libraryHaskellDepends = [ base mtl parsec syb ];
        homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
        description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
        license = stdenv.lib.licenses.bsd3;
@@ -103658,11 +106311,11 @@ self: {
      mkDerivation {
        pname = "presburger";
        version = "1.3.1";
-       revision = "1";
        sha256 = "15yhqc6gk14dsqr4b0x87i1xw0sc3iscw28grg4vmcspsjxil0l6";
+       revision = "1";
        editedCabalFile = "7c88061e13bab0e63240c05dad36b9518ad50d7ad4ade0f8911efa7826eb4b5d";
-       buildDepends = [ base containers pretty ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base containers pretty ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://github.com/yav/presburger";
        description = "A decision procedure for quantifier-free linear arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -103676,7 +106329,7 @@ self: {
        pname = "present";
        version = "2.2";
        sha256 = "1z9zvmszda7h1h4inq4b6ig9bd205mskqq85ns3rzsffxaj471p4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson atto-lisp base bytestring data-default mtl semigroups text
        ];
        description = "Make presentations for data types";
@@ -103689,7 +106342,7 @@ self: {
        pname = "press";
        version = "0.1.2";
        sha256 = "0aa3079az8bazyzqxxhx575vxr4a0p3wvlgh765w3k01vh6dkzgf";
-       buildDepends = [ base containers json mtl parsec ];
+       libraryHaskellDepends = [ base containers json mtl parsec ];
        homepage = "http://github.com/bickfordb/text-press";
        description = "Text template library targeted at the web / HTML generation";
        license = "GPL";
@@ -103706,7 +106359,7 @@ self: {
        pname = "presto-hdbc";
        version = "0.1.0.3";
        sha256 = "1353nh8pq3ja4pw1fps0a46rfizph47l7k5gqlnkbz8w8b41miap";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty base bytestring convertible either either-unwrap
          errors HDBC HTTP http-streams io-streams lens mtl network-uri safe
          scientific text transformers
@@ -103722,7 +106375,7 @@ self: {
        pname = "prettify";
        version = "1.0";
        sha256 = "18bwgz2cgkd6n9gwpwipv2bc6d5501mflmr0r2akwy98q2gb9qg8";
-       buildDepends = [ base containers semigroups ];
+       libraryHaskellDepends = [ base containers semigroups ];
        description = "Haskell2010 structured text formatting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103733,8 +106386,8 @@ self: {
        pname = "pretty";
        version = "1.1.3.2";
        sha256 = "0k61v71c40dy4whvy1q1n3hs0xnhscg4svp0prcihn7s57j2spvi";
-       buildDepends = [ base deepseq ghc-prim ];
-       testDepends = [ base deepseq ghc-prim QuickCheck ];
+       libraryHaskellDepends = [ base deepseq ghc-prim ];
+       testHaskellDepends = [ base deepseq ghc-prim QuickCheck ];
        homepage = "http://github.com/haskell/pretty";
        description = "Pretty-printing library";
        license = stdenv.lib.licenses.bsd3;
@@ -103746,7 +106399,7 @@ self: {
        pname = "pretty-class";
        version = "1.0.1.1";
        sha256 = "1qdfp2kpahzflq9a3idwmb0pqs4l7almxn5rbw5gp2pmdx81p3am";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        homepage = "https://github.com/ddssff/pretty-class";
        description = "Pretty printing class similar to Show";
        license = stdenv.lib.licenses.bsd3;
@@ -103758,7 +106411,7 @@ self: {
        pname = "pretty-compact";
        version = "1.0";
        sha256 = "0k6yvdwcfhjp0dbfmc55xfncfry7b69hrp5rsaqm2iia3ahx0nan";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Pretty-printing library";
        license = "GPL";
      }) {};
@@ -103769,7 +106422,7 @@ self: {
        pname = "pretty-hex";
        version = "1.0";
        sha256 = "0ylwkvvjvmpprha9nx83xb8gkhyanhk5fffc0r7lb96n4ch5z6pz";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "A library for hex dumps of ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103780,7 +106433,7 @@ self: {
        pname = "pretty-ncols";
        version = "0.1";
        sha256 = "0bvd8wgjrj9g86b1z8m9mjzswibrmhasgajnkgr2dlizl5lg7faq";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        description = "A implementation of multi-column layout w/ Text.PrettyPrint";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103792,15 +106445,16 @@ self: {
      mkDerivation {
        pname = "pretty-show";
        version = "1.6.8.2";
-       revision = "1";
        sha256 = "1s95nzjkmqb747s50i68c9s8p91cxgydzqkd2l5yjzdaygrvrhqv";
+       revision = "1";
        editedCabalFile = "3454673131f18cc65fb3fbca43d5d010f6b228abc0b7e501e67ef90ffded4218";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base filepath ghc-prim haskell-lexer pretty
        ];
-       buildTools = [ happy ];
+       libraryToolDepends = [ happy ];
+       executableHaskellDepends = [ base ];
        homepage = "http://wiki.github.com/yav/pretty-show";
        description = "Tools for working with derived `Show` instances and generic inspection of values";
        license = stdenv.lib.licenses.mit;
@@ -103812,7 +106466,7 @@ self: {
        pname = "pretty-sop";
        version = "0.1.0.1";
        sha256 = "1sv6lwzgj9jv7lx3lb868md5w93p77mzspgxgqcss1kr9q5xyfvm";
-       buildDepends = [ base generics-sop pretty-show ];
+       libraryHaskellDepends = [ base generics-sop pretty-show ];
        description = "A generic pretty-printer using generics-sop";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103823,7 +106477,7 @@ self: {
        pname = "pretty-tree";
        version = "0.1.0.0";
        sha256 = "0cf856qjacc0lmiina44s00i17ga2qrfr7wdlxhwiqdmpsh5g3fw";
-       buildDepends = [ base boxes containers ];
+       libraryHaskellDepends = [ base boxes containers ];
        description = "Pretty-print trees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103834,7 +106488,7 @@ self: {
        pname = "prettyFunctionComposing";
        version = "1.0.1";
        sha256 = "0c39dyjlcrah1aq2rkk7zqysmzxqym6chv8x9zmifclvn5a4j98b";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "prettier function composition by (°)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103845,7 +106499,7 @@ self: {
        pname = "prettyclass";
        version = "1.0.0.0";
        sha256 = "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        description = "Pretty printing class similar to Show";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103856,7 +106510,7 @@ self: {
        pname = "prim-uniq";
        version = "0.1.0.1";
        sha256 = "1zssi4zaihjaf3an10ar39d4qb155wcl1j66aymfrr9z2f2rf1gv";
-       buildDepends = [ base dependent-sum primitive ];
+       libraryHaskellDepends = [ base dependent-sum primitive ];
        homepage = "https://github.com/mokus0/prim-uniq";
        description = "Opaque unique identifiers in primitive state monads";
        license = stdenv.lib.licenses.publicDomain;
@@ -103868,7 +106522,7 @@ self: {
        pname = "primes";
        version = "0.2.1.0";
        sha256 = "0ny6fzr967d1fifk050k95j9snnbjjif2bxf3v9s93k3zdc6bmkl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/sebfisch/primes";
        description = "Efficient, purely functional generation of prime numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -103879,10 +106533,10 @@ self: {
      mkDerivation {
        pname = "primitive";
        version = "0.5.1.0";
-       revision = "1";
        sha256 = "0a8mf8k62xga5r5dd0fna1swqbx2r94c0mvqnc4mfq640zrsa5w8";
+       revision = "1";
        editedCabalFile = "ee8bf53215343bfc18dc8d310fd0e03ad3eaab8b85afdbc97dea3b047e0d98ec";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "https://github.com/haskell/primitive";
        description = "Primitive memory-related operations";
@@ -103895,8 +106549,8 @@ self: {
        pname = "primitive";
        version = "0.6";
        sha256 = "08lpsvrgdvqh8xw7f1wzkvwdnkizblbym8y2xpknk0y62f9g799l";
-       buildDepends = [ base ghc-prim transformers ];
-       testDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim transformers ];
+       testHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/haskell/primitive";
        description = "Primitive memory-related operations";
        license = stdenv.lib.licenses.bsd3;
@@ -103914,7 +106568,7 @@ self: {
        sha256 = "0hh13i0idpwv509zavg92wwvp3s20vc1ivz7vfwa4kxp0h21phs9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile containers directory happstack happstack-helpers
          happstack-server happstack-state hsp MissingH mtl old-locale
          old-time random regex-posix split time
@@ -103935,7 +106589,7 @@ self: {
        sha256 = "0j3xjlwvix81zxd38540jwb3vp438d72gmfxdhbypyi5f1qgx01x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base ConfigFile directory HTTP mtl network parsec utf8-string XMPP
        ];
        jailbreak = true;
@@ -103953,7 +106607,7 @@ self: {
        pname = "printf-mauke";
        version = "0.6.0";
        sha256 = "1fyxm4bdhv27g83q21d0j59p7da8kgi8sfnsp39xb8gl4k0gd80z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default template-haskell
          utf8-string
        ];
@@ -103970,7 +106624,7 @@ self: {
        sha256 = "1myn6bp28d8nf92v9xf3iw5jvzwmrxbzf8px254hmzv8zvd5ki1i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base xosd ];
+       executableHaskellDepends = [ base xosd ];
        homepage = "http://code.haskell.org/~dons/code/printxosd";
        description = "Simple tool to display some text on an on-screen display";
        license = stdenv.lib.licenses.bsd3;
@@ -103982,7 +106636,7 @@ self: {
        pname = "priority-queue";
        version = "0.2.2";
        sha256 = "0nsiil0yl32m80a1kpg3z0wd5fxwkpz2lzf66pa06iy24q0rz5lf";
-       buildDepends = [ base containers queue reord stateref ];
+       libraryHaskellDepends = [ base containers queue reord stateref ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~mokus/priority-queue";
        description = "Simple implementation of a priority queue";
@@ -103999,7 +106653,10 @@ self: {
        sha256 = "1ffg3ba6wfd72r2d86hq28y83qx80pdza939knay9hsnyw84vd6g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers parallel PSQueue random stm ];
+       libraryHaskellDepends = [
+         base containers parallel PSQueue random stm
+       ];
+       executableHaskellDepends = [ base ];
        description = "Cooperative task prioritization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104010,7 +106667,7 @@ self: {
        pname = "privileged-concurrency";
        version = "0.3";
        sha256 = "0r345189lympvin6xw6r8s04dldj94kv2703ilcazm0a6mgf0q67";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "Provides privilege separated versions of the concurrency primitives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104023,8 +106680,8 @@ self: {
        pname = "prizm";
        version = "0.3.1.2";
        sha256 = "0n0pihi8f8y349lmy6hcv2z728isvwjlcggv9pnhm8d0k97la2b9";
-       buildDepends = [ base text ];
-       testDepends = [
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -104040,7 +106697,9 @@ self: {
        pname = "probability";
        version = "0.2.4.1";
        sha256 = "0nh73l03d7niz3a3h2y4i80mlp64ilfkx7krn57skzfi8drwnjvc";
-       buildDepends = [ base containers random transformers utility-ht ];
+       libraryHaskellDepends = [
+         base containers random transformers utility-ht
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming";
        description = "Probabilistic Functional Programming";
@@ -104055,7 +106714,7 @@ self: {
        pname = "probable";
        version = "0.1.1";
        sha256 = "1n6p7pharcq2cmfabh2ngfsy9mfqqs6qh57m0kygq13lbzwyy8wr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl mwc-random primitive statistics transformers vector
        ];
        homepage = "http://github.com/alpmestan/probable";
@@ -104071,7 +106730,7 @@ self: {
        pname = "proc";
        version = "0.0.9";
        sha256 = "0p3cr4q34h81g77psypja4m0mgs9mwl51mfb5kdxj5xrsf2nd3la";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath process regex-tdfa split strict
          xformat
        ];
@@ -104086,8 +106745,8 @@ self: {
        pname = "process";
        version = "1.2.3.0";
        sha256 = "1ib01nkh513v5ab7wa255jqpsnqjsjdmh8d9dz8inqw3f4ah97k1";
-       buildDepends = [ base deepseq directory filepath unix ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base deepseq directory filepath unix ];
+       testHaskellDepends = [ base ];
        description = "Process libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104101,11 +106760,11 @@ self: {
        pname = "process-conduit";
        version = "1.2.0.1";
        sha256 = "0hnbywmjvk3y26sc9a0jfqzm04pg08zd2bflld1mvni02s89lvc8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit control-monad-loop mtl process resourcet
          shakespeare shakespeare-text template-haskell text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit conduit-extra hspec resourcet
        ];
        homepage = "http://github.com/snoyberg/process-conduit";
@@ -104120,7 +106779,9 @@ self: {
        pname = "process-extras";
        version = "0.3.3.5";
        sha256 = "18fyv47xhvw5881is2hk9a1x35fr21jvw36irlc5cxc3vfmnym6s";
-       buildDepends = [ base bytestring deepseq ListLike process text ];
+       libraryHaskellDepends = [
+         base bytestring deepseq ListLike process text
+       ];
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
@@ -104134,10 +106795,10 @@ self: {
        pname = "process-iterio";
        version = "0.0.0";
        sha256 = "18kdj70fv4y5fnw7d8pd0mbvlwca1pm1f88z4ibpji0n4dja332z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cpphs iterIO process transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cpphs iterIO process transformers
        ];
        homepage = "https://github.com/garious/process-iterio";
@@ -104152,7 +106813,7 @@ self: {
        pname = "process-leksah";
        version = "1.0.1.4";
        sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv";
-       buildDepends = [ base directory filepath unix ];
+       libraryHaskellDepends = [ base directory filepath unix ];
        jailbreak = true;
        description = "Process libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -104165,10 +106826,12 @@ self: {
      mkDerivation {
        pname = "process-listlike";
        version = "1.0";
-       revision = "3";
        sha256 = "0yaz90pfpx9kahwbvbvl2ir62imxxsq7v72i67ac2zv3585c427r";
+       revision = "3";
        editedCabalFile = "75f8f07195965b0a2ca36725792b095896801d4e4133c7c67a72600bdbeb63b1";
-       buildDepends = [ base bytestring deepseq ListLike process text ];
+       libraryHaskellDepends = [
+         base bytestring deepseq ListLike process text
+       ];
        jailbreak = true;
        homepage = "https://github.com/ddssff/process-listlike";
        description = "Process extras";
@@ -104184,7 +106847,7 @@ self: {
        pname = "process-progress";
        version = "0.14";
        sha256 = "0kdzb8m6fx0ah9i15fpcz6phzqd88g4djf0a5h0vi4d4qkib6kin";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring deepseq HUnit ListLike mtl process process-listlike
          text time unix utf8-string
        ];
@@ -104202,7 +106865,7 @@ self: {
        pname = "process-qq";
        version = "0.2.0";
        sha256 = "1495dc39kjf9mjvn7ag8hb95bsmhb18sd0ykg4mz7rrl0q03ig2a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator mtl process shakespeare-text
          template-haskell text
        ];
@@ -104225,13 +106888,13 @@ self: {
        pname = "process-streaming";
        version = "0.7.2.2";
        sha256 = "0jmhl7jdrznbf9w9cpwh98apghhcnb9vadj94sjxfh288k21ckb3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring conceit containers contravariant foldl
          free pipes pipes-bytestring pipes-concurrency pipes-parse
          pipes-safe pipes-text process semigroups text transformers
          transformers-compat void
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bifunctors bytestring containers directory doctest
          exceptions filepath free lens pipes pipes-attoparsec
          pipes-bytestring pipes-concurrency pipes-group pipes-parse
@@ -104251,7 +106914,7 @@ self: {
        pname = "processing";
        version = "1.2.0.1";
        sha256 = "1axryd8453b2l4hbhqy5vkj29hqppsvk1sqxbawdhk3d3hs705pa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html containers directory filepath mainland-pretty
          multiset QuickCheck quickcheck-instances template-haskell text
          transformers
@@ -104270,7 +106933,7 @@ self: {
        pname = "processor-creative-kit";
        version = "0.1.0.1";
        sha256 = "1jshzych1vbb24bm219sdpxkb2amvv11fbhqwf7iy4l1prg248h7";
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base bytestring containers deepseq mtl
        ];
        homepage = "https://github.com/takenobu-hs/processor-creative-kit";
@@ -104284,7 +106947,7 @@ self: {
        pname = "procrastinating-structure";
        version = "1.0.1";
        sha256 = "126mp2mfmy9xg1kichl19ga6j3w1s0qpk3hqh47x5x5120qh63l3";
-       buildDepends = [ base procrastinating-variable ];
+       libraryHaskellDepends = [ base procrastinating-variable ];
        description = "Pure structures that can be incrementally created in impure code";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104296,7 +106959,7 @@ self: {
        pname = "procrastinating-variable";
        version = "1.0.2";
        sha256 = "12px0nk7j74hyfzcvxacd9020gk3cd3ijqb7fjmmg8y33354jkc4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/gcross/procrastinating-variable";
        description = "Haskell values that cannot be evaluated immediately";
        license = stdenv.lib.licenses.bsd3;
@@ -104309,7 +106972,7 @@ self: {
        pname = "procstat";
        version = "0.1.0.1";
        sha256 = "1md75jc32nfnvs7ygf1mna00gl0wmimp2lkdcs9r9v0iy4b1hr5m";
-       buildDepends = [ attoparsec base bytestring ];
+       libraryHaskellDepends = [ attoparsec base bytestring ];
        jailbreak = true;
        homepage = "http://closure.ath.cx/procstat";
        description = "get information on processes in Linux";
@@ -104327,7 +106990,8 @@ self: {
        sha256 = "02iz323arx9zwclvspgaaqz81bp6jdnj89pjm08n2gamg39zsbdn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base bytestring HUnit process text ];
+       executableHaskellDepends = [
          base bytestring hspec HUnit process QuickCheck text
        ];
        homepage = "https://github.com/nh2/proctest";
@@ -104342,8 +107006,10 @@ self: {
        pname = "product-profunctors";
        version = "0.6.3";
        sha256 = "0mkir3anyccjzcqjybnmx4ijz2h0qnps48pc5giaszmfs9nv7p18";
-       buildDepends = [ base contravariant profunctors template-haskell ];
-       testDepends = [ base profunctors ];
+       libraryHaskellDepends = [
+         base contravariant profunctors template-haskell
+       ];
+       testHaskellDepends = [ base profunctors ];
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -104357,7 +107023,9 @@ self: {
        sha256 = "1cf1ysnfpng7ijgsbnly5878wg7cp907cqpvf4yq9sd6nym8hcng";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers filepath haskell98 parsec ];
+       executableHaskellDepends = [
+         base containers filepath haskell98 parsec
+       ];
        homepage = "http://antiope.com/downloads.html";
        description = "Convert GHC profiles into GraphViz's dot format";
        license = stdenv.lib.licenses.bsd3;
@@ -104374,7 +107042,7 @@ self: {
        sha256 = "104frg0czfk4rgjxyf0xz7100j3y9ndvf01jgv3yibaq98v2h64r";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers filepath haskell-src-exts semigroups uniplate zenc
        ];
        homepage = "https://gitorious.org/prof2pretty";
@@ -104392,7 +107060,7 @@ self: {
        sha256 = "17h690m78xsvbcxms2yxq7g9d1w5dx31q1m3a2m3i4gfwby1ndnf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base bytestring filepath text unordered-containers
          vector
        ];
@@ -104407,7 +107075,7 @@ self: {
        pname = "profunctor-extras";
        version = "4.0";
        sha256 = "10j458liqlyz5s9gkg95c6aq7ap5fa7d8pc7hygy71nn87pm2g4a";
-       buildDepends = [ base profunctors ];
+       libraryHaskellDepends = [ base profunctors ];
        homepage = "http://github.com/ekmett/profunctor-extras/";
        description = "This package has been absorbed into profunctors 4.0";
        license = stdenv.lib.licenses.bsd3;
@@ -104421,7 +107089,9 @@ self: {
        pname = "profunctors";
        version = "5.1.1";
        sha256 = "0lw2ipacpnp9yqmi8zsp01pzpn5hwj8af3y0f3079mddrmw48gw7";
-       buildDepends = [ base comonad distributive tagged transformers ];
+       libraryHaskellDepends = [
+         base comonad distributive tagged transformers
+       ];
        homepage = "http://github.com/ekmett/profunctors/";
        description = "Profunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -104433,7 +107103,7 @@ self: {
        pname = "progress";
        version = "1.0";
        sha256 = "0cac4v6k2nrpglnf3680y334kw4k0s6xfm86wrfyszl5sq2a7w94";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        description = "Simple progress tracking & projection library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104447,7 +107117,8 @@ self: {
        sha256 = "09yfspxcdp4y5chim2qmylfmjp0kdg4qg2w54kg3hir8f7kih3ns";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base io-reactive ];
+       libraryHaskellDepends = [ base io-reactive ];
+       executableHaskellDepends = [ base ];
        description = "Progressbar API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104461,7 +107132,7 @@ self: {
        pname = "progression";
        version = "0.5.0.2";
        sha256 = "01s01v59hjy5i8dd9a1gxjpyw2qq3r81np7acn94wjh64c8rrmpa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers criterion directory filepath haskeline process
          txt-sushi
        ];
@@ -104482,7 +107153,7 @@ self: {
        sha256 = "1psbgl19x2wwh4rcd4nsayrc1bq2g27qywr1m9jgmshcz1cinpbh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers directory filepath ghc-prim
          process text
        ];
@@ -104499,8 +107170,8 @@ self: {
        pname = "proj4-hs-bindings";
        version = "0.1";
        sha256 = "0cwkjg1bm1swl103nsziyc71yqgvdq82ywgi2jnn7cj9lk4ihrah";
-       buildDepends = [ base ghc-prim ];
-       extraLibraries = [ proj ];
+       libraryHaskellDepends = [ base ghc-prim ];
+       librarySystemDepends = [ proj ];
        description = "Haskell bindings for the Proj4 C dynamic library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104515,11 +107186,11 @@ self: {
        pname = "project-template";
        version = "0.2.0";
        sha256 = "0433a2cmximz2jbg0m97h80pvmb7vafjvw3qzjpsncavg38xgaxf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring conduit conduit-extra containers
          directory filepath mtl resourcet text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base64-bytestring bytestring conduit containers hspec
          QuickCheck resourcet text transformers
        ];
@@ -104533,10 +107204,10 @@ self: {
      mkDerivation {
        pname = "projection";
        version = "0.1";
-       revision = "1";
        sha256 = "0g9zrdp92w8ygrsmbw4600xaf8d17sm4pq68qd6z7hnf8zps22c1";
+       revision = "1";
        editedCabalFile = "805db4a9404200c6d8c00b7e96f95c9c71e3595b6601f75efed7237ad5bed30b";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Projection function for arbitrarily nested binary product types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104549,7 +107220,7 @@ self: {
        pname = "prolog";
        version = "0.2.0.1";
        sha256 = "073sd3rhcfqw9csm0qsbc57ix57dv3k5yjr9hcc33b9zq5y10sp0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl parsec syb template-haskell th-lift
          transformers
        ];
@@ -104570,7 +107241,7 @@ self: {
        sha256 = "1w3wz0sn1qhw286g3arin30jvlldadw976xr7hp0afdvqicl3892";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs fgl graphviz mtl prolog prolog-graph-lib text
        ];
        jailbreak = true;
@@ -104586,7 +107257,7 @@ self: {
        pname = "prolog-graph-lib";
        version = "0.2.0.1";
        sha256 = "02xa4hqmhmsv7vkdy3m3dr1w3z88kc8ly0jjn7q6pba5yarci7nr";
-       buildDepends = [ base fgl graphviz mtl prolog text ];
+       libraryHaskellDepends = [ base fgl graphviz mtl prolog text ];
        homepage = "https://github.com/Erdwolf/prolog";
        description = "Generating images of resolution trees for Prolog queries";
        license = stdenv.lib.licenses.publicDomain;
@@ -104602,11 +107273,11 @@ self: {
        pname = "prometheus-client";
        version = "0.1.0.1";
        sha256 = "0bvp40rdlq8f6rh5v75pgqnmiwz85j960sfi22y7s0r5vykbgh5x";
-       buildDepends = [
+       libraryHaskellDepends = [
          atomic-primops base bytestring containers mtl stm time transformers
          utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          atomic-primops base bytestring containers doctest hspec mtl
          QuickCheck random-shuffle stm time transformers utf8-string
        ];
@@ -104621,8 +107292,8 @@ self: {
        pname = "prometheus-metrics-ghc";
        version = "0.1.0.1";
        sha256 = "15a7hli2fsjmgjnvhdsv1572nqj3i214b0r9bygdang4cjrjv10p";
-       buildDepends = [ base prometheus-client utf8-string ];
-       testDepends = [ base doctest prometheus-client ];
+       libraryHaskellDepends = [ base prometheus-client utf8-string ];
+       testHaskellDepends = [ base doctest prometheus-client ];
        homepage = "https://github.com/fimad/prometheus-haskell";
        description = "Metrics exposing GHC runtime information for use with prometheus-client";
        license = stdenv.lib.licenses.asl20;
@@ -104634,7 +107305,7 @@ self: {
        pname = "promise";
        version = "0.1.0.0";
        sha256 = "1hzsprmw15apc654n77ima1pgs9nj6287d412jb5z37154bd0nfg";
-       buildDepends = [ async base ];
+       libraryHaskellDepends = [ async base ];
        jailbreak = true;
        homepage = "http://github.com/jfischoff/promise";
        description = "A monadic interface for async";
@@ -104647,7 +107318,7 @@ self: {
        pname = "promises";
        version = "0.2";
        sha256 = "0fgczzjf93fvrfh9sgy49072c6qw27626qwla0qwl0wvfhaal7ah";
-       buildDepends = [ base primitive ];
+       libraryHaskellDepends = [ base primitive ];
        homepage = "http://github.com/ekmett/promises/";
        description = "Lazy demand-driven promises";
        license = stdenv.lib.licenses.bsd3;
@@ -104659,7 +107330,9 @@ self: {
        pname = "prompt";
        version = "0.1.1.0";
        sha256 = "13ayvs1irsa1hqy6y6ca99dr20vwvy9g10zjrqshvj48i5ra2j4g";
-       buildDepends = [ base mtl transformers transformers-compat ];
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compat
+       ];
        homepage = "https://github.com/mstksg/prompt";
        description = "Monad (and transformer) for deferred-effect pure prompt-response queries";
        license = stdenv.lib.licenses.mit;
@@ -104673,7 +107346,7 @@ self: {
        pname = "propane";
        version = "0.1";
        sha256 = "1kzlwsxka72h3a612xi2s741hdx88qsib07kcralv2k76krqxlj4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base colour containers directory filepath repa repa-devil spawn
        ];
        description = "Functional synthesis of images and animations";
@@ -104693,7 +107366,12 @@ self: {
        sha256 = "12pfrv6n61bsg4cyylfr0kw82x36mwvnyvzdkr2lrka79i5l9a5w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring containers directory exceptions
+         filepath hslogger IfElse MissingH mtl network process QuickCheck
+         time transformers unix unix-compat
+       ];
+       executableHaskellDepends = [
          ansi-terminal async base bytestring containers directory exceptions
          filepath hslogger IfElse MissingH mtl network process QuickCheck
          time transformers unix unix-compat
@@ -104709,7 +107387,7 @@ self: {
        pname = "properties";
        version = "0.0.2";
        sha256 = "04a35zxgps9rn6y86x3jf6gma6kjl8izmnyl45hz64cl9yb5dwwi";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "check quickCheck properties in real time";
        license = stdenv.lib.licenses.bsd3;
@@ -104725,7 +107403,7 @@ self: {
        pname = "property-list";
        version = "0.1.0.5";
        sha256 = "0wv97v6b7yfkwaz6mpw3l12q34k620jb1clz0j9a1kvysm1r005k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cereal containers free oneOfN
          recursion-schemes syb template-haskell text time time-locale-compat
          transformers vector xml
@@ -104733,7 +107411,6 @@ self: {
        homepage = "https://github.com/mokus0/property-list";
        description = "Apple property list parser";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proplang" = callPackage
@@ -104742,7 +107419,7 @@ self: {
        pname = "proplang";
        version = "0.1";
        sha256 = "1vm01qvd0jgcdpqx3p2h6gafhxi5x7bs8r5a6xsk4zz6cc1cbw4m";
-       buildDepends = [ base glade glib gtk ];
+       libraryHaskellDepends = [ base glade glib gtk ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/proplang/";
        description = "A library for functional GUI development";
        license = stdenv.lib.licenses.bsd3;
@@ -104755,8 +107432,8 @@ self: {
        pname = "props";
        version = "0.1.2";
        sha256 = "10bkbqhl15xgc9iglx0f9h218a2hcfg0wali2c6a17wvlpfcwjbx";
-       buildDepends = [ base ];
-       testDepends = [ base doctest QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck ];
        homepage = "http://github.com/deviant-logic/props";
        description = "Reusable quickcheck properties";
        license = stdenv.lib.licenses.bsd3;
@@ -104771,7 +107448,7 @@ self: {
        pname = "prosper";
        version = "0.1.1";
        sha256 = "006h3i316s85f3d6qmwm9kajbxil1xcnqp11jfvv5ypnx2gdyhgb";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring cereal containers HsOpenSSL http-streams
          io-streams mtl text transformers vector
        ];
@@ -104786,9 +107463,9 @@ self: {
        pname = "proteaaudio";
        version = "0.6.2";
        sha256 = "10ayg0pr7vjffk8l114gwf098kpmamirk6cknw1xhpnr7hwr1mln";
-       buildDepends = [ base ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ alsaLib ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ alsaLib ];
+       libraryToolDepends = [ c2hs ];
        description = "A wrapper for the proteaaudio library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) alsaLib;};
@@ -104802,11 +107479,11 @@ self: {
        pname = "protobuf";
        version = "0.2.1.0";
        sha256 = "0i8hjrj6jycqmq7i1wl0kr9s17g4qfyc0gfwcbhbv70yxwf499di";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal data-binary-ieee754 deepseq mtl text
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal containers hex HUnit mtl QuickCheck tagged
          tasty tasty-hunit tasty-quickcheck text unordered-containers
        ];
@@ -104826,14 +107503,15 @@ self: {
        sha256 = "0k3cljm4r3jxlklkmfhv0362hg8095f1cq73mgdqkbqa5gwrk86r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cplusplus-th template-haskell text
        ];
-       testDepends = [
+       librarySystemDepends = [ protobuf ];
+       executableHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring cereal cplusplus-th criterion hprotoc-fork protobuf
          protocol-buffers-fork QuickCheck text utf8-string
        ];
-       extraLibraries = [ protobuf ];
        jailbreak = true;
        homepage = "https://github.com/nicta/protobuf-native";
        description = "Protocol Buffers via C++";
@@ -104849,14 +107527,13 @@ self: {
        pname = "protocol-buffers";
        version = "2.1.4";
        sha256 = "0sn92mf0dl7w6cg25rhm492sl58pssshjyipadis4w4ww0kyp4md";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory filepath mtl
          parsec syb utf8-string
        ];
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
@@ -104865,11 +107542,12 @@ self: {
        pname = "protocol-buffers-descriptor";
        version = "2.1.4";
        sha256 = "1m07l890465ks53acmk9g3fzbm2h5l2pdfhp16hcmvvzxlaz2zvy";
-       buildDepends = [ base bytestring containers protocol-buffers ];
+       libraryHaskellDepends = [
+         base bytestring containers protocol-buffers
+       ];
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor-fork" = callPackage
@@ -104880,7 +107558,7 @@ self: {
        pname = "protocol-buffers-descriptor-fork";
        version = "2.0.16";
        sha256 = "1wn6yqs70n26j6z44yfmz4j4rwj2h1zfpysn56wzaq7bwsdb0bqb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers protocol-buffers-fork
        ];
        homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
@@ -104897,7 +107575,7 @@ self: {
        pname = "protocol-buffers-fork";
        version = "2.0.16";
        sha256 = "061kc43dg3xdv81wmj4yjm1s6amrd8ql59nj7vff4vdb87v9nriz";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory filepath mtl syb
          utf8-string
        ];
@@ -104915,8 +107593,8 @@ self: {
        pname = "proton-haskell";
        version = "0.7";
        sha256 = "1gn4h8xprq8gkngccyqbbqn8nidwlczlwckxzjgnb190yy3kd7hi";
-       buildDepends = [ base containers directory filepath ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers directory filepath ];
+       testHaskellDepends = [
          base containers directory filepath HUnit test-framework
          test-framework-hunit
        ];
@@ -104931,7 +107609,7 @@ self: {
        pname = "prototype";
        version = "0.5.3";
        sha256 = "1kzinhdy622gzg3mzfln15vgi890i2l3lkrgrw0n0yb08r2n53i7";
-       buildDepends = [ base monads-tf ];
+       libraryHaskellDepends = [ base monads-tf ];
        description = "prototype-based programming on Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104947,7 +107625,7 @@ self: {
        sha256 = "127ky7rj9d2bqaddcg99azm18m65ksxr26amq0r5prhym8kmc3jx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring case-insensitive http-types
          optparse-applicative parsec parsers process safe text time
          unordered-containers wai warp
@@ -104965,7 +107643,7 @@ self: {
        pname = "proxy-kindness";
        version = "0.1";
        sha256 = "0wpzj6hnlxvgd7lfd2921mrk97aw7ljf77jry3my97zdapkxz8i7";
-       buildDepends = [ base tagged ];
+       libraryHaskellDepends = [ base tagged ];
        jailbreak = true;
        homepage = "https://github.com/jberryman/proxy-kindness";
        description = "A library for kind-polymorphic manipulation and inspection of Proxy values";
@@ -104982,18 +107660,17 @@ self: {
        pname = "pseudo-boolean";
        version = "0.1.2.0";
        sha256 = "13bgv7kkglajrvng7vcy7qv9x8xlm0nrv8in8zh5w5m6xl7i5wkz";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder containers deepseq
          dlist hashable parsec
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
          tasty-th temporary
        ];
        homepage = "https://github.com/msakai/pseudo-boolean";
        description = "Reading/Writing OPB/WBO files used in pseudo boolean competition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pseudo-trie" = callPackage
@@ -105002,7 +107679,7 @@ self: {
        pname = "pseudo-trie";
        version = "0.0.4.3";
        sha256 = "020jkgr6h1f4z14xbrl6zsqjqflkps03lh5102742bfsd58d9hvb";
-       buildDepends = [ base semigroups ];
+       libraryHaskellDepends = [ base semigroups ];
        description = "A tagged rose-tree with short circuited unique leaves";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105013,7 +107690,7 @@ self: {
        pname = "pseudomacros";
        version = "0.0.2";
        sha256 = "112g7qxn7vl5702gzx2kdg55rvvp9g0gc50dvcwlrgvrsvsdy6c9";
-       buildDepends = [ base template-haskell time ];
+       libraryHaskellDepends = [ base template-haskell time ];
        description = "cpp-style built-in macros using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105027,8 +107704,8 @@ self: {
        pname = "psqueues";
        version = "0.2.0.2";
        sha256 = "1mv86li4acx7jchlbh1nfyqyy9wqf7nifzmlph06wd1kvcs0cj73";
-       buildDepends = [ base deepseq ghc-prim hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
+       testHaskellDepends = [
          array base deepseq ghc-prim hashable HUnit QuickCheck tagged
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -105047,7 +107724,7 @@ self: {
        sha256 = "0ps4i5q4kzkla6gzr8amf2bql2y5g0gb4dbjf9w0q58yzzvpp2c8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs ConfigFile containers groom hedis hslogger
          mtl network pipes pipes-bytestring safe system-filepath text time
          transformers
@@ -105064,8 +107741,8 @@ self: {
        pname = "publicsuffix";
        version = "0.20150804";
        sha256 = "06b311vdwihqhdwf2zr0akndgyaxycli7lymzzyfbn0rhhx1g2kn";
-       buildDepends = [ base filepath template-haskell ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base filepath template-haskell ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
@@ -105079,10 +107756,10 @@ self: {
        pname = "publicsuffixlist";
        version = "0.1";
        sha256 = "0mbrmhgyjp8jms3fd3nq4knc4j97sw8ijrmnlfjs7qj8jw4vwzxk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers data-default text utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal containers data-default HUnit idna text
          utf8-string
        ];
@@ -105099,11 +107776,11 @@ self: {
        pname = "publicsuffixlistcreate";
        version = "0.0.2";
        sha256 = "0v4arfixnfzpsi3hvik2s2lqqp61324bd98wc8ympqxlmldpbri3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers data-default idna
          publicsuffixlist text
        ];
-       testDepends = [ base cereal HUnit publicsuffixlist ];
+       testHaskellDepends = [ base cereal HUnit publicsuffixlist ];
        jailbreak = true;
        homepage = "https://github.com/litherum/publicsuffixlist";
        description = "Create the publicsuffixlist package";
@@ -105125,14 +107802,17 @@ self: {
        sha256 = "0clcf5gsw34gpqycw652wq8ndmlzz48mf2gla0g7j815j21hrhv8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson async base base64-bytestring bytestring Cabal cipher-aes
-         conduit conduit-extra crypto-api crypto-cipher-types data-default
-         http-client http-conduit http-types HUnit lifted-base mtl
-         QuickCheck SHA smallcheck tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck text time transformers uuid vector
+       libraryHaskellDepends = [
+         aeson async base base64-bytestring bytestring cipher-aes conduit
+         conduit-extra crypto-api crypto-cipher-types data-default
+         http-client http-conduit http-types lifted-base mtl SHA text time
+         transformers uuid vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson async base bytestring Cabal HUnit QuickCheck smallcheck tasty
+         tasty-hunit tasty-quickcheck tasty-smallcheck text
+       ];
+       testHaskellDepends = [
          base Cabal HUnit QuickCheck smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
@@ -105153,9 +107833,10 @@ self: {
        sha256 = "09xaycbzq50q1299r4s84nb8wjhqalimvipv8z135fifvgdsjpm8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base fastcgi feed HTTP json mime network random utf8-string xml
+       libraryHaskellDepends = [
+         base feed HTTP json mime network random utf8-string xml
        ];
+       executableHaskellDepends = [ fastcgi ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/pubsub/";
        description = "A library for Google/SixApart pubsub hub interaction";
@@ -105175,11 +107856,15 @@ self: {
        sha256 = "0pqqcs3plrhq6474j29lnwvc6fhr1wskb0ph8x64gzv9ly52dc9i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty base bytestring console-program containers
-         directory MissingH old-locale random-fu safe text time vector
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring containers directory MissingH
+         random-fu safe text time vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring console-program directory old-locale text time
+         vector
+       ];
+       testHaskellDepends = [
          aeson base bytestring QuickCheck test-framework
          test-framework-quickcheck2 text time vector
        ];
@@ -105198,10 +107883,10 @@ self: {
        pname = "pugixml";
        version = "0.3.2";
        sha256 = "0pvvx7cd16a7cjp991l487p0vgpkdyv7ic64brz92bkjxgrpw94i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default-class template-haskell
        ];
-       testDepends = [ base bytestring tasty tasty-hunit ];
+       testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        homepage = "https://github.com/philopon/pugixml-hs";
        description = "pugixml binding";
        license = stdenv.lib.licenses.mit;
@@ -105217,7 +107902,11 @@ self: {
        sha256 = "0c5h829zh8clggf53byng4gh5g0zxk3763w1nk0ihf2laak238c6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers HsSyck mtl old-time pretty random stm
+         utf8-string
+       ];
+       executableHaskellDepends = [
          base bytestring containers HsSyck mtl old-time pretty random stm
          utf8-string
        ];
@@ -105233,7 +107922,7 @@ self: {
        pname = "pugs-HsSyck";
        version = "0.41";
        sha256 = "108dfhd83yzmlhbgff6j0a40r6vx9aq9dcdd8swk4yib9gbvsrp1";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Fast, lightweight YAML loader and dumper";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105248,7 +107937,7 @@ self: {
        pname = "pugs-compat";
        version = "0.0.6.20130611.0";
        sha256 = "15pgg4z6clqgazi70jac280ib0d4rhz1hdqbg5i4kffziv2q6jsm";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory mtl network process
          random regex-base regex-pcre-builtin stm stringtable-atom syb time
          unix utf8-string
@@ -105264,7 +107953,7 @@ self: {
        pname = "pugs-hsregex";
        version = "1.0";
        sha256 = "1px8qvz7afws2w8scplxs4zm628anvh5ssbf0ba9hajh686h133i";
-       buildDepends = [ array base haskell98 ];
+       libraryHaskellDepends = [ array base haskell98 ];
        homepage = "http://repetae.net/john/computer/haskell/hsregex/";
        description = "Haskell PCRE binding";
        license = stdenv.lib.licenses.bsd3;
@@ -105277,8 +107966,8 @@ self: {
        pname = "pulse-simple";
        version = "0.1.14";
        sha256 = "1as1cnx50mqmib5llzy2w218rg7dxmhz6nfa9kryfjzk0n5rshl4";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ libpulseaudio ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ libpulseaudio ];
        description = "binding to Simple API of pulseaudio";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) libpulseaudio;};
@@ -105291,10 +107980,10 @@ self: {
        pname = "punkt";
        version = "0.1.1";
        sha256 = "0hhrpkbgm56zs1ynd0ba37fv1vg2bxr79kfb2myjfxsnc6gr4h9b";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base mtl regex-tdfa regex-tdfa-text text unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base mtl regex-tdfa tasty tasty-hunit tasty-quickcheck text
        ];
        homepage = "https://github.com/bryant/punkt";
@@ -105311,8 +108000,8 @@ self: {
        pname = "punycode";
        version = "2.0";
        sha256 = "192jgfixnpxdj6jiiz92kx5bi6ij3c389b76q9f4vyfmvcajj1sr";
-       buildDepends = [ base bytestring cereal mtl text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring cereal mtl text ];
+       testHaskellDepends = [
          base bytestring cereal encoding HUnit mtl QuickCheck text
        ];
        homepage = "https://github.com/litherum/punycode";
@@ -105330,7 +108019,7 @@ self: {
        sha256 = "064swfpxk7jhb81bi0v9l0r1hn0z2cafnzx7ijdr33xhikyc92rb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers Diff hsfacter hslogger language-puppet
          mtl text
        ];
@@ -105348,10 +108037,10 @@ self: {
        pname = "pure-cdb";
        version = "0.1.1";
        sha256 = "1yjh7h02hkhx2vgvn7qfmfd3bp12ibpkf4znybsd2bfh0i1pzn0n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory mtl vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers mtl test-simple Unixutils vector
        ];
        homepage = "https://github.com/bosu/pure-cdb";
@@ -105365,7 +108054,7 @@ self: {
        pname = "pure-fft";
        version = "0.2.0";
        sha256 = "1zzravfgxbx07c38pf0p73a9nzjk2pbq3hzfw8v9zkqj95b3l94i";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Fast Fourier Transform";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105376,7 +108065,7 @@ self: {
        pname = "pure-io";
        version = "0.2.1";
        sha256 = "0pzvkd8jxw859s187n972yaq5wmwi00cxwhivgffr7z29hr0zvx9";
-       buildDepends = [ base containers mtl safe ];
+       libraryHaskellDepends = [ base containers mtl safe ];
        description = "Pure IO monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105387,7 +108076,7 @@ self: {
        pname = "pure-priority-queue";
        version = "0.14";
        sha256 = "125vnkjx6n7pgflk9iqg7b6daw55a1rdfi9pfgp39ikfcx9vhb3p";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "A pure priority queue";
        license = stdenv.lib.licenses.bsd3;
@@ -105403,7 +108092,7 @@ self: {
        sha256 = "17x2drpmdppzxp3nnxq0vajxrzdnhpapk9rz9qcqaxbg934c7h3d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers pure-priority-queue QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -105421,8 +108110,10 @@ self: {
        pname = "pure-zlib";
        version = "0.3";
        sha256 = "1in93rx2y3zaahzpblwybskjrbwc0zrzh792ibi64jxvkrxjkyxn";
-       buildDepends = [ base bytestring containers fingertree monadLib ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers fingertree monadLib
+       ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -105439,7 +108130,9 @@ self: {
        pname = "pureMD5";
        version = "2.1.2.1";
        sha256 = "1zsn949qk95bwx1fbyv84q0lhb4k18bgixl7nivfzsnmhr31fs37";
-       buildDepends = [ base binary bytestring cereal crypto-api tagged ];
+       libraryHaskellDepends = [
+         base binary bytestring cereal crypto-api tagged
+       ];
        description = "A Haskell-only implementation of the MD5 digest (hash) algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105448,8 +108141,8 @@ self: {
     ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base
      , bower-json, boxes, bytestring, containers, directory, dlist
      , filepath, Glob, haskeline, HUnit, language-javascript, mtl
-     , nodejs, optparse-applicative, parsec, pattern-arrows, process
-     , safe, semigroups, split, syb, text, time, transformers
+     , optparse-applicative, parsec, pattern-arrows, process, safe
+     , semigroups, split, syb, text, time, transformers
      , transformers-compat, unordered-containers, utf8-string, vector
      }:
      mkDerivation {
@@ -105458,25 +108151,29 @@ self: {
        sha256 = "0drx0n1ac0sjnma7c15hsld1n6rwwl7r8fzcdibk73k5pfyz9a6k";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-better-errors ansi-wl-pprint base bower-json boxes
-         bytestring containers directory dlist filepath Glob haskeline
-         language-javascript mtl optparse-applicative parsec pattern-arrows
-         process safe semigroups split syb text time transformers
-         transformers-compat unordered-containers utf8-string vector
+       libraryHaskellDepends = [
+         aeson aeson-better-errors base bower-json boxes bytestring
+         containers directory dlist filepath Glob language-javascript mtl
+         parsec pattern-arrows process safe semigroups split syb text time
+         transformers transformers-compat unordered-containers utf8-string
+         vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint base bytestring containers directory filepath
+         Glob haskeline mtl optparse-applicative parsec process split time
+         transformers transformers-compat
+       ];
+       testHaskellDepends = [
          base containers directory filepath Glob haskeline HUnit mtl
          optparse-applicative parsec process time transformers
          transformers-compat
        ];
-       buildTools = [ nodejs ];
        jailbreak = true;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) nodejs;};
+     }) {};
 
   "purescript-bundle-fast" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
@@ -105488,7 +108185,7 @@ self: {
        sha256 = "0s9db4nb5ppr3yznay7jlgydq68hcdn525cwnxkj41h8fv9sflfw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath optparse-applicative text vector
        ];
        homepage = "https://github.com/bitc/purescript-bundle-fast";
@@ -105508,7 +108205,7 @@ self: {
        pname = "push-notify";
        version = "0.1.0.1";
        sha256 = "1ca9cs55yj1960cx7vha2w33nvqj89rhkdji555aaac3z302jgjs";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec-conduit base base16-bytestring bytestring
          cereal certificate conduit connection containers convertible
          cprng-aes data-default http-client http-conduit http-types
@@ -105531,7 +108228,7 @@ self: {
        pname = "push-notify-ccs";
        version = "0.1.0.1";
        sha256 = "1fgpzcbkcsb03lysml28a8w3c9l3nx4mirrn287g7y1kb4kx3bw0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base bytestring cprng-aes crypto-random
          data-default hslogger mtl network pontarius-xmpp push-notify retry
          stm text tls tls-extra unordered-containers xml-types
@@ -105551,7 +108248,7 @@ self: {
        pname = "push-notify-general";
        version = "0.1.0.1";
        sha256 = "0vyw3733xm2s3nxybav8an68mlagk8v3bb43qlz71hkjgjddvpdh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-default hashable http-client
          http-conduit http-types push-notify push-notify-ccs text
          unordered-containers xml-conduit yesod
@@ -105570,10 +108267,10 @@ self: {
        pname = "pusher-haskell";
        version = "0.1.0.0";
        sha256 = "0ymj27a3kmaddydd5zshj108fmzhlxasn9i4igzjaj308f1ygki6";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring HTTP MissingH mtl SHA time
        ];
-       testDepends = [ base hspec ];
+       testHaskellDepends = [ base hspec ];
        jailbreak = true;
        homepage = "http://www.github.com/sidraval/pusher-haskell";
        description = "A Pusher.com client written in Haskell";
@@ -105593,7 +108290,7 @@ self: {
        sha256 = "0cn350p0v6wb6c1n589c2l460c8pac41c645fja5xqxyyiiyni4d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring containers deepseq hslogger io-storage lens
          old-locale optparse-applicative parallel-io pointless-fun
          regex-posix shelly system-fileio system-filepath text text-format
@@ -105613,7 +108310,7 @@ self: {
        pname = "putlenses";
        version = "0.1.3";
        sha256 = "153hxffd1rg3m73kss0j3s7102lj6p84c95gvzyl0gmjpljfxffp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim lens mtl QuickCheck random safe split
          template-haskell transformers
        ];
@@ -105635,12 +108332,16 @@ self: {
        sha256 = "0jbc24a959klaf3niri5ilq0jdqpxdg4fg79bjfdpg51na4xr3hi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers diagrams-lib diagrams-svg filepath hashable
          mtl optparse-applicative parsec SVGFonts text unordered-containers
          vector-space yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base diagrams-lib diagrams-svg filepath optparse-applicative
+         yaml
+       ];
+       testHaskellDepends = [
          base blaze-svg bytestring containers deepseq diagrams-lib
          diagrams-svg tasty tasty-hunit text yaml
        ];
@@ -105659,7 +108360,7 @@ self: {
        sha256 = "0jv0gai689ba5f4c6kdfdlfx5dz000zzk0gdwlz5d9n9pxxfgzxf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base diagrams-lib diagrams-svg filepath optparse-applicative
          puzzle-draw yaml
        ];
@@ -105679,11 +108380,11 @@ self: {
        sha256 = "18hlsh3ndlybkiblcfqzjm1pa4myc01yzr9hx7p48yp86q519hvr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base Codec-Image-DevIL containers haskell98 mtl network stm
          X11
        ];
-       extraLibraries = [ libdevil ];
+       executableSystemDepends = [ libdevil ];
        homepage = "http://code.haskell.org/pvd";
        description = "A photo viewer daemon application with remote controlling abilities";
        license = stdenv.lib.licenses.bsd3;
@@ -105700,8 +108401,10 @@ self: {
        sha256 = "1cwb214bifiql2d4jacjl93swhy8yigzj72wbhv213c593bxg8jr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring cmdargs pwstore-fast text ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring cmdargs pwstore-fast text
+       ];
+       testHaskellDepends = [
          base bytestring HUnit process pwstore-fast test-framework
          test-framework-hunit
        ];
@@ -105718,7 +108421,7 @@ self: {
        pname = "pwstore-fast";
        version = "2.4.4";
        sha256 = "1cpvlwzg3qznhygrr78f75p65mnljd9v5cvnagfxjqppnrkay6bj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring binary byteable bytestring cryptohash random
        ];
        homepage = "https://github.com/PeterScott/pwstore";
@@ -105734,7 +108437,7 @@ self: {
        pname = "pwstore-purehaskell";
        version = "2.1.4";
        sha256 = "1g7lmlgw8iscbbs96r3a534cf46fyks49b1f9y7hv25ny4wp1p9c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring byteable bytestring random SHA
        ];
        homepage = "https://github.com/PeterScott/pwstore";
@@ -105750,7 +108453,7 @@ self: {
        sha256 = "1q45l1grcja0mf1g90yxsdlr49gqrx27ycr6vln4hsqb5c0iqcfw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl parsec ];
+       executableHaskellDepends = [ base containers mtl parsec ];
        homepage = "http://community.moertel.com/ss/space/PXSL";
        description = "Parsimonious XML Shorthand Language--to-XML compiler";
        license = "GPL";
@@ -105764,10 +108467,10 @@ self: {
        pname = "pyffi";
        version = "0.4.0.2";
        sha256 = "0cpzl0d0hsdlm1786s75xsq3c93mm1sp7alr6xhihmnrsj71d58h";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers pureMD5 template-haskell
        ];
-       pkgconfigDepends = [ python ];
+       libraryPkgconfigDepends = [ python ];
        jailbreak = true;
        homepage = "http://github.com/Russell91/json-python";
        description = "Call python inline from haskell";
@@ -105782,10 +108485,10 @@ self: {
        pname = "pyfi";
        version = "0.4.0.4";
        sha256 = "0xq5nhc11dkf2yvzcd129n0r7vpias091lzkll4f4cjsmljbxigw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers pureMD5 template-haskell
        ];
-       pkgconfigDepends = [ python ];
+       libraryPkgconfigDepends = [ python ];
        jailbreak = true;
        homepage = "http://github.com/Russell91/pyfi";
        description = "Call python inline from haskell";
@@ -105802,9 +108505,10 @@ self: {
        sha256 = "0p7pmwqs9jfv6464106j0k22x6lij5rc5v74aqbfclx7iwp6lh75";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring cereal cmdargs containers mtl
+       libraryHaskellDepends = [
+         attoparsec base bytestring cereal containers mtl
        ];
+       executableHaskellDepends = [ base bytestring cmdargs ];
        jailbreak = true;
        description = "Serialization/deserialization using Python Pickle format";
        license = stdenv.lib.licenses.bsd3;
@@ -105817,7 +108521,9 @@ self: {
        pname = "qc-oi-testgenerator";
        version = "1.2.0.3";
        sha256 = "13rga5haz26qvx3hznbl6ik55s8g7qi3nj7a6vhyx46vjhzwnsvg";
-       buildDepends = [ base fclabels QuickCheck template-haskell ];
+       libraryHaskellDepends = [
+         base fclabels QuickCheck template-haskell
+       ];
        jailbreak = true;
        homepage = "http://www.iai.uni-bonn.de/~jv/GV14.html";
        description = "Compile time generation of operation invariance tests for QuickCheck";
@@ -105830,8 +108536,8 @@ self: {
        pname = "qd";
        version = "1.0.2.1";
        sha256 = "0dhvdrpcbc6qiqna2kiaa0zbz7cgq7ziy2my6k85cbgv6k77p918";
-       buildDepends = [ base floatshow ];
-       extraLibraries = [ qd ];
+       libraryHaskellDepends = [ base floatshow ];
+       librarySystemDepends = [ qd ];
        description = "double-double and quad-double number type via libqd";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105843,7 +108549,7 @@ self: {
        pname = "qd-vec";
        version = "1.1";
        sha256 = "0lj5kg0sjkck89phvi239xb2k7hxmxg9dh7yg2df2iaj4c2m2ync";
-       buildDepends = [ base qd Vec ];
+       libraryHaskellDepends = [ base qd Vec ];
        description = "'Vec' instances for 'qd' types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105855,8 +108561,8 @@ self: {
        pname = "qhull-simple";
        version = "0.1";
        sha256 = "0g0abqc5z9nysm21c77kylkka1bvyn16ycinws1lcrjy53cb82sw";
-       buildDepends = [ base vector ];
-       extraLibraries = [ qhull ];
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ qhull ];
        homepage = "http://nonempty.org/software/haskell-qhull-simple";
        description = "Simple bindings to Qhull, a library for computing convex hulls";
        license = stdenv.lib.licenses.bsd3;
@@ -105869,7 +108575,7 @@ self: {
        pname = "qrcode";
        version = "0.1.2";
        sha256 = "1wfnxlz6rqjcgnkaqq0wdn75jsh3b9hagb84c1ljnwqaw98n3a9d";
-       buildDepends = [ array base containers mtl vector ];
+       libraryHaskellDepends = [ array base containers mtl vector ];
        description = "QR Code library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105883,8 +108589,10 @@ self: {
        pname = "quadratic-irrational";
        version = "0.0.5";
        sha256 = "1z9a1q8px4sx7fq9i1lwfx98kz0nv8zhkz5vsfn31krvd4xvkndz";
-       buildDepends = [ arithmoi base containers mtl transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         arithmoi base containers mtl transformers
+       ];
+       testHaskellDepends = [
          base directory doctest filepath mtl numbers QuickCheck tasty
          tasty-quickcheck
        ];
@@ -105903,7 +108611,7 @@ self: {
        pname = "quandl-api";
        version = "0.2.1.0";
        sha256 = "01mjwg7myal3hc98s7v582ycabv7qx2j6lcsyvhxbmhzs1wl8sqf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring http-conduit http-types syb
          text time time-locale-compat unordered-containers
        ];
@@ -105922,10 +108630,11 @@ self: {
        sha256 = "0s9wmkngz31wrllffk3i8y66f60liajwhapih7mnriyfvqqsb6ra";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mersenne-random-pure64 mtl random random-fu
          random-source rvar transformers vector
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/boundedvariation/quantfin";
        description = "Quant finance library in pure Haskell";
@@ -105940,8 +108649,8 @@ self: {
        pname = "quantities";
        version = "0.3.0";
        sha256 = "1c9ll27qwmzz8rfy7jlknzg56r0z2hij9aha3vwylv6iaynl4fr9";
-       buildDepends = [ base containers mtl parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers mtl parsec ];
+       testHaskellDepends = [
          base containers doctest Glob hlint hspec mtl parsec process
          regex-compat
        ];
@@ -105957,7 +108666,7 @@ self: {
        pname = "quantum-arrow";
        version = "0.0.5";
        sha256 = "19z5b0jwnz20g0203xd78cv8rgm92diyxard4mbj6dyrj2kkfgww";
-       buildDepends = [ base MonadRandom mtl QuickCheck random ];
+       libraryHaskellDepends = [ base MonadRandom mtl QuickCheck random ];
        jailbreak = true;
        homepage = "http://github.com/luqui/quantum-arrow";
        description = "An embedding of quantum computation as a Haskell arrow";
@@ -105975,8 +108684,10 @@ self: {
        sha256 = "0cpvik35qv587k2qsd2rh7awlwll1gciv0nr7wjr79bn0q9df0cq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base bytestring directory mtl snappy ];
-       buildTools = [ alex happy ];
+       executableHaskellDepends = [
+         array base bytestring directory mtl snappy
+       ];
+       executableToolDepends = [ alex happy ];
        homepage = "https://github.com/jstepien/qudb";
        description = "Quite Useless DB";
        license = stdenv.lib.licenses.gpl3;
@@ -105994,11 +108705,12 @@ self: {
        sha256 = "0zw15qym8r00m7kir9h9cys1rmszdqihfcvy6dw52f1pb6cp5vsx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring cmdargs cond containers directory iproute
          MissingH network safe scotty text transformers wai wai-extra
          wai-middleware-static warp
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        description = "Quenya verb conjugator";
        license = stdenv.lib.licenses.agpl3;
@@ -106013,8 +108725,8 @@ self: {
        pname = "querystring-pickle";
        version = "0.2.0";
        sha256 = "18by7671q3sp38cii7j8b0jvdbbix4wyaa3wan77s0mfkdxzicrf";
-       buildDepends = [ base bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -106031,7 +108743,10 @@ self: {
        sha256 = "05q64mslkbg017fpjx7ma2al6iz5zjrkyzipm8p86n8zcx3l1aw3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ ansi-terminal base readline terminal-size ];
+       libraryHaskellDepends = [
+         ansi-terminal base readline terminal-size
+       ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/yamadapc/haskell-questioner.git";
        description = "A package for prompting values from the command-line";
        license = stdenv.lib.licenses.mit;
@@ -106043,7 +108758,7 @@ self: {
        pname = "queue";
        version = "0.1.2";
        sha256 = "0fx2svkj2sy2wd056lha9h20hy2z6gjspzl11jmv7i3rdwwfr6f7";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "http://code.haskell.org/~mokus/queue";
        description = "Abstraction typeclasses for queue-like things";
        license = stdenv.lib.licenses.bsd3;
@@ -106055,7 +108770,7 @@ self: {
        pname = "queuelike";
        version = "1.0.9";
        sha256 = "0nvs9ln55wrczpn948i4z110rbfp0rv2wv8iz94lbyxhilhyjf1z";
-       buildDepends = [ array base containers mtl stateful-mtl ];
+       libraryHaskellDepends = [ array base containers mtl stateful-mtl ];
        description = "A library of queuelike data structures, both functional and stateful";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106067,7 +108782,7 @@ self: {
        pname = "quick-generator";
        version = "0.3";
        sha256 = "1bccyvm300bkm3n98ayjc3syfcakjnf26bs2mdqdjimdfw2f0g6n";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        description = "Generator random test data for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106078,8 +108793,8 @@ self: {
        pname = "quickcheck-assertions";
        version = "0.2.0";
        sha256 = "0h7pa84hzy3bhv1acf1rvvw3lza0m8shd8a0vykzpx8lnkxbl3v0";
-       buildDepends = [ base ieee754 QuickCheck ];
-       testDepends = [ base hspec ieee754 QuickCheck ];
+       libraryHaskellDepends = [ base ieee754 QuickCheck ];
+       testHaskellDepends = [ base hspec ieee754 QuickCheck ];
        homepage = "https://github.com/s9gf4ult/quickcheck-assertions";
        description = "HUnit like assertions for QuickCheck";
        license = stdenv.lib.licenses.gpl3;
@@ -106093,7 +108808,7 @@ self: {
        pname = "quickcheck-instances";
        version = "0.3.11";
        sha256 = "041s6963czs1pz0fc9cx17lgd6p83czqy2nxji7bhxqxwl2j15h2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers hashable old-time QuickCheck text
          time unordered-containers
        ];
@@ -106108,7 +108823,7 @@ self: {
        pname = "quickcheck-io";
        version = "0.1.1";
        sha256 = "16q3sqvxnaqmbb1zbda8f61mdlmmzxhrznqxab113lmg380nwfm2";
-       buildDepends = [ base HUnit QuickCheck ];
+       libraryHaskellDepends = [ base HUnit QuickCheck ];
        description = "Use HUnit assertions as QuickCheck properties";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -106121,7 +108836,7 @@ self: {
        pname = "quickcheck-poly";
        version = "0.2.0.1";
        sha256 = "0imigjsb6jy1k9xipi5b4b300cpv2l7hhd2iiqpn80dp10v7y5na";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell98 hint MonadCatchIO-mtl QuickCheck regex-compat
          regex-tdfa
        ];
@@ -106136,7 +108851,7 @@ self: {
        pname = "quickcheck-properties";
        version = "0.1";
        sha256 = "0hr61w1wpah1p4h87iz17aby53ysa8waqsl0als8b69in0zyv29w";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "QuickCheck properties for standard type classes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106147,7 +108862,7 @@ self: {
        pname = "quickcheck-property-comb";
        version = "0.1.0.2";
        sha256 = "0wqz2amhwf1djbwwdin142mzp94mxbzb12khznijissjdz38knp5";
-       buildDepends = [ base mtl QuickCheck ];
+       libraryHaskellDepends = [ base mtl QuickCheck ];
        jailbreak = true;
        homepage = "http://www.github.com/jfeltz/quickcheck-property-comb";
        description = "Combinators for Quickcheck Property construction and diagnostics";
@@ -106162,8 +108877,10 @@ self: {
        pname = "quickcheck-property-monad";
        version = "0.2.3";
        sha256 = "12vg14xwhhsqwygrs5lylsg514am5sslqc15nbl8mwzzxix1w8xb";
-       buildDepends = [ base either QuickCheck transformers ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       libraryHaskellDepends = [ base either QuickCheck transformers ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        jailbreak = true;
        homepage = "http://github.com/bennofs/quickcheck-property-monad/";
        description = "quickcheck-property-monad";
@@ -106178,7 +108895,7 @@ self: {
        pname = "quickcheck-regex";
        version = "0.0.3";
        sha256 = "00h08l3qabj140zzcpj87hy9zb6cw1xj5w6xv6sq2m8yc3pdwi8n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers QuickCheck regex-genex regex-tdfa
        ];
        homepage = "http://github.com/audreyt/quickcheck-regex/";
@@ -106195,7 +108912,7 @@ self: {
        pname = "quickcheck-relaxng";
        version = "0.0.2";
        sha256 = "1wrndgvza9610ai02gkwab30hp8ngdknw8n2lx0mg6qajsiiy949";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hxt hxt-relaxng QuickCheck quickcheck-regex
        ];
        homepage = "http://github.com/audreyt/quickcheck-relaxng/";
@@ -106210,8 +108927,8 @@ self: {
        pname = "quickcheck-rematch";
        version = "0.1.0.0";
        sha256 = "0pmw9441l36sprw9ngq6gn2yi4v427zd5n22s9zicfyiwi4qf5ba";
-       buildDepends = [ base QuickCheck rematch ];
-       testDepends = [ base hspec HUnit QuickCheck rematch ];
+       libraryHaskellDepends = [ base QuickCheck rematch ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck rematch ];
        jailbreak = true;
        homepage = "http://github.com/tcrayford/rematch";
        description = "QuickCheck support for rematch";
@@ -106227,7 +108944,7 @@ self: {
        sha256 = "157v4qcyk5c6hnmhmy5rsrfsj46m343nn2bvrqyb6r92wh70is5g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory process QuickCheck ];
+       executableHaskellDepends = [ base directory process QuickCheck ];
        homepage = "http://www.cs.chalmers.se/~rjmh/QuickCheck/";
        description = "Automated test tool for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -106239,7 +108956,7 @@ self: {
        pname = "quickcheck-simple";
        version = "0.1.0.0";
        sha256 = "0vnxyb3qz8i1rpmkga6151cld1jr3kiyv3xrhg814mhf1fmhb8xl";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        description = "Test properties and default-mains for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106250,7 +108967,7 @@ self: {
        pname = "quickcheck-unicode";
        version = "1.0.0.1";
        sha256 = "1a8nl6x7l9b22yx61wm0bh2n1xzb1hd5i5zgg1w4fpaivjnrrhi4";
-       buildDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
        homepage = "https://github.com/bos/quickcheck-unicode";
        description = "Generator and shrink functions for testing Unicode-related software";
        license = stdenv.lib.licenses.bsd3;
@@ -106262,11 +108979,10 @@ self: {
        pname = "quickcheck-webdriver";
        version = "0.1.0.7";
        sha256 = "12jkj8jy4f0mix658pd8jfgwx268fs3bbqz90mac1vvag4c72i0h";
-       buildDepends = [ base QuickCheck transformers webdriver ];
+       libraryHaskellDepends = [ base QuickCheck transformers webdriver ];
        jailbreak = true;
        description = "Utilities for using WebDriver with QuickCheck";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quicklz" = callPackage
@@ -106277,8 +108993,8 @@ self: {
        pname = "quicklz";
        version = "1.5.0.11";
        sha256 = "17v9bfdp4ib9258r7001naqwss7l6v83by40va3gm3l418vj62qd";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -106296,8 +109012,11 @@ self: {
        sha256 = "0vy5s3qa67kwj68rxqc0zhqizqpvqa1x0bg3dakq5pimrqhmb7d4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ barecheck base directory filepath QuickCheck ];
-       testDepends = [ base directory filepath QuickCheck ];
+       libraryHaskellDepends = [ base directory filepath QuickCheck ];
+       executableHaskellDepends = [
+         barecheck base directory filepath QuickCheck
+       ];
+       testHaskellDepends = [ base directory filepath QuickCheck ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/quickpull";
        description = "Generate Main module with QuickCheck tests";
@@ -106311,7 +109030,7 @@ self: {
        pname = "quickset";
        version = "0.1.0";
        sha256 = "0xiw57wi9z567nmp4h0vfcw3sr9dciy29jadn47bvi3q278v7zdy";
-       buildDepends = [ base vector vector-algorithms ];
+       libraryHaskellDepends = [ base vector vector-algorithms ];
        description = "Very fast and memory-compact query-only set and map structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106325,7 +109044,7 @@ self: {
        pname = "quickspec";
        version = "0.9.6";
        sha256 = "0prwzxsrvfqryl75rmma229d4y7ra61vc3d72kyqi4l44ga2ay21";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ghc-prim QuickCheck random spoon transformers
        ];
        homepage = "https://github.com/nick8325/quickspec";
@@ -106341,7 +109060,9 @@ self: {
        sha256 = "0nvh6jd155xrjzkkbsz5q8d08z50881vkdhmprm7fdxax1gvjc95";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory haskell98 mtl process ];
+       executableHaskellDepends = [
+         base directory haskell98 mtl process
+       ];
        homepage = "https://github.com/davidsiegel/quicktest";
        description = "A reflective batch tester for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -106354,7 +109075,7 @@ self: {
        pname = "quickwebapp";
        version = "2.1.0.0";
        sha256 = "0zwqfwwna1d588yk2i20nzryl56k2bh4nyg03ljszyhna16iclij";
-       buildDepends = [ base bytestring http-types scotty text ];
+       libraryHaskellDepends = [ base bytestring http-types scotty text ];
        jailbreak = true;
        description = "A quick webapp generator for any file processing tool";
        license = stdenv.lib.licenses.gpl3;
@@ -106366,7 +109087,7 @@ self: {
        pname = "quiver";
        version = "0.0.0.11";
        sha256 = "1pxnxdm84fqmxvv0l312q8nynpaiyf43jksa2qg1wkl53n0mm2fa";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/zadarnowski/quiver";
        description = "Quiver finite stream processing library";
        license = stdenv.lib.licenses.bsd3;
@@ -106378,7 +109099,7 @@ self: {
        pname = "quiver-bytestring";
        version = "0.0.0.2";
        sha256 = "17wjj1fg60g3km9d4kxfz7lk9bf4sfz0brsg8pb0h2xlw0zvm3wl";
-       buildDepends = [ base bytestring quiver ];
+       libraryHaskellDepends = [ base bytestring quiver ];
        homepage = "https://github.com/zadarnowski/quiver-bytestring";
        description = "Quiver combinators for bytestring streaming";
        license = stdenv.lib.licenses.bsd3;
@@ -106390,7 +109111,7 @@ self: {
        pname = "quiver-cell";
        version = "0.0.0.2";
        sha256 = "10p11ljmwp7szw46saxa972xpjiyr5r19kia6ivaq98jqwcvi5af";
-       buildDepends = [ base data-cell quiver ];
+       libraryHaskellDepends = [ base data-cell quiver ];
        homepage = "https://github.com/zadarnowski/quiver-cell";
        description = "Quiver combinators for cellular data processing";
        license = stdenv.lib.licenses.bsd3;
@@ -106404,13 +109125,12 @@ self: {
        pname = "quiver-csv";
        version = "0.0.0.3";
        sha256 = "19wb16lbv0wr7w2qba6g2cdmzdhpyyjx1bjvrnz0cqbb4di9yscj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-cell quiver quiver-bytestring
        ];
        homepage = "https://github.com/zadarnowski/quiver-csv";
        description = "Quiver combinators for cellular CSV data processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quiver-enumerator" = callPackage
@@ -106419,7 +109139,7 @@ self: {
        pname = "quiver-enumerator";
        version = "0.0.0.1";
        sha256 = "0k0822yzlxkb6b46834hm3bad3x1gma1gqcjl9ryxpqsl73nc4mp";
-       buildDepends = [ base enumerator quiver ];
+       libraryHaskellDepends = [ base enumerator quiver ];
        homepage = "https://github.com/zadarnowski/quiver-enumerator";
        description = "Bridge between Quiver and Iteratee paradigms";
        license = stdenv.lib.licenses.bsd3;
@@ -106437,12 +109157,13 @@ self: {
        sha256 = "1yha2rsphq2ar8c7p15dlg621d4ym46xgv70fga9mlq2r4zwy2lv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal async base bytestring containers directory dlist
          exceptions filepath hex mtl network network-simple parsec process
          snap-core snap-server stm websockets websockets-snap
        ];
-       testDepends = [ base HUnit mtl ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base HUnit mtl ];
        jailbreak = true;
        homepage = "https://github.com/talw/quoridor-hs";
        description = "A Quoridor implementation in Haskell";
@@ -106458,7 +109179,8 @@ self: {
        sha256 = "1vb9r2nmkhybx1ra2jpzfz5i6klgz2jz09zhg5wi95dnml82p33g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base old-locale split time ];
+       libraryHaskellDepends = [ base old-locale split time ];
+       executableHaskellDepends = [ base ];
        description = "A library and program to create QIF files from Rabobank CSV exports";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106470,7 +109192,7 @@ self: {
        pname = "rad";
        version = "0.1.6.3";
        sha256 = "19g2lc3vmnapccdxf390cmkfl9bd3agcn01kk8ccd4lmaqn2c12d";
-       buildDepends = [ array base containers data-reify ];
+       libraryHaskellDepends = [ array base containers data-reify ];
        jailbreak = true;
        homepage = "http://comonad.com/reader/";
        description = "Reverse Automatic Differentiation";
@@ -106486,8 +109208,8 @@ self: {
        pname = "radian";
        version = "0.0.4";
        sha256 = "1f53h9gcbmfga5khc67z81aysibcj5pqgi3iwa2shy5mfd10a86a";
-       buildDepends = [ base lens ];
-       testDepends = [
+       libraryHaskellDepends = [ base lens ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/radian";
@@ -106502,8 +109224,10 @@ self: {
        pname = "radium";
        version = "0.4.2";
        sha256 = "1kwbv7qvpjwdcnj6l26dpyw0xl3irhd5igwda4xx509llc8j8n3s";
-       buildDepends = [ base containers parsec ];
-       testDepends = [ base Cabal containers hspec parsec QuickCheck ];
+       libraryHaskellDepends = [ base containers parsec ];
+       testHaskellDepends = [
+         base Cabal containers hspec parsec QuickCheck
+       ];
        jailbreak = true;
        homepage = "https://github.com/klangner/radium";
        description = "Chemistry";
@@ -106518,8 +109242,10 @@ self: {
        pname = "radium-formula-parser";
        version = "0.2";
        sha256 = "1b2gmc27dj9fanbjh7h0902jjh3jz1ydc6qvp9p3rfskaf6854bf";
-       buildDepends = [ base containers parsec ];
-       testDepends = [ base Cabal containers hspec parsec QuickCheck ];
+       libraryHaskellDepends = [ base containers parsec ];
+       testHaskellDepends = [
+         base Cabal containers hspec parsec QuickCheck
+       ];
        jailbreak = true;
        homepage = "https://github.com/klangner/radium-formula-parser";
        description = "Chemistry";
@@ -106535,7 +109261,7 @@ self: {
        sha256 = "1hkz0fd1w72g6wnx9dq7z249195kjlhalcd1y8z13gj6yqn1sl9s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base filepath ];
+       executableHaskellDepends = [ base filepath ];
        jailbreak = true;
        homepage = "https://github.com/thomaseding/radix";
        description = "Command-line tool for emitting numbers in various bases";
@@ -106550,13 +109276,18 @@ self: {
        pname = "rados-haskell";
        version = "3.1.0";
        sha256 = "0xffgf95dss442sf6adh7yys39i0z64w155akjyzr9dp2jzr6f2k";
-       buildDepends = [ async base bytestring containers mtl uuid ];
-       testDepends = [ async base bytestring hspec HUnit mtl rados uuid ];
-       extraLibraries = [ rados ];
+       libraryHaskellDepends = [
+         async base bytestring containers mtl uuid
+       ];
+       librarySystemDepends = [ rados ];
+       testHaskellDepends = [
+         async base bytestring hspec HUnit mtl uuid
+       ];
+       testSystemDepends = [ rados ];
        homepage = "github";
        description = "librados haskell bindings";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { rados = null;};
 
   "rail-compiler-editor" = callPackage
@@ -106569,11 +109300,13 @@ self: {
        sha256 = "0jjsa21a7f4hysbk9qvcxyyc2ncrmmjh02n7yyhjnfjgdp4sclwb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base cairo containers gtk llvm-general llvm-general-pure mtl
-         process transformers
+       libraryHaskellDepends = [
+         base containers llvm-general llvm-general-pure mtl
        ];
-       testDepends = [ base containers HUnit process ];
+       executableHaskellDepends = [
+         base cairo containers gtk mtl process transformers
+       ];
+       testHaskellDepends = [ base containers HUnit process ];
        jailbreak = true;
        homepage = "https://github.com/SWP-Ubau-SoSe2014-Haskell/SWPSoSe14";
        description = "Compiler and editor for the esolang rail";
@@ -106588,8 +109321,10 @@ self: {
        pname = "rainbow";
        version = "0.26.0.6";
        sha256 = "1v0za967cp1205fkbwglf28yn2pslp7dvyqb3rbym3j7r3pby3zc";
-       buildDepends = [ base bytestring lens process text ];
-       testDepends = [ base bytestring lens process QuickCheck text ];
+       libraryHaskellDepends = [ base bytestring lens process text ];
+       testHaskellDepends = [
+         base bytestring lens process QuickCheck text
+       ];
        homepage = "https://www.github.com/massysett/rainbow";
        description = "Print text to terminal with colors and effects";
        license = stdenv.lib.licenses.bsd3;
@@ -106603,7 +109338,9 @@ self: {
        pname = "rainbow-tests";
        version = "0.20.0.4";
        sha256 = "0cjq2m2zpk4j2f7gw65yqqvyc4kng1rsnq48fs4xcs6bdzw0zhlg";
-       buildDepends = [ barecheck base QuickCheck rainbow terminfo text ];
+       libraryHaskellDepends = [
+         barecheck base QuickCheck rainbow terminfo text
+       ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/rainbow";
        description = "Tests and QuickCheck generators to accompany rainbow";
@@ -106619,8 +109356,10 @@ self: {
        pname = "rainbox";
        version = "0.18.0.2";
        sha256 = "1dczbs4y8yzvp132cfy0fl1jv2zf2nm6d3zn4j4pmy2p8cxs1g4v";
-       buildDepends = [ base bytestring containers lens rainbow text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers lens rainbow text
+       ];
+       testHaskellDepends = [
          base bytestring containers lens QuickCheck rainbow tasty
          tasty-quickcheck text
        ];
@@ -106635,7 +109374,7 @@ self: {
        pname = "rake";
        version = "0.0.1";
        sha256 = "0cn22xg7r80f61z8pf7i0rqqag4qx43rhlfpncgkv5b6vcrsafpn";
-       buildDepends = [ base containers text ];
+       libraryHaskellDepends = [ base containers text ];
        homepage = "http://github.com/toschoo/Haskell-Libs";
        description = "Rapid Automatic Keyword Extraction (RAKE)";
        license = "LGPL";
@@ -106649,7 +109388,7 @@ self: {
        pname = "rakhana";
        version = "0.2.0.2";
        sha256 = "10gk2wk8495y1zk148sqsm993dzi4z6a49nn717qccpc2qi4lw6k";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers lens mtl pipes scientific
          transformers vector zlib
        ];
@@ -106666,7 +109405,7 @@ self: {
        pname = "ralist";
        version = "0.1.0.0";
        sha256 = "0v2cg1d2wzjcygk78qcz1yfy9rcqw8yrplnnk6cax41qifhr5z5i";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Random access list with a list compatible interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106678,7 +109417,7 @@ self: {
        pname = "rallod";
        version = "0.0.1";
        sha256 = "14fnk2q702qm0mh30r9kznbh4ikpv4fsd5mrnwphm5d06vmq6hq9";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://github.com/moonmaster9000/rallod";
        description = "'$' in reverse";
        license = stdenv.lib.licenses.bsd3;
@@ -106693,7 +109432,7 @@ self: {
        pname = "raml";
        version = "0.1.0";
        sha256 = "02c1rki7azfwfiawi29z5gp1zwfdx46rw17bifpklw7zya525pr9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring text unordered-containers yaml
        ];
        homepage = "https://github.com/fnoble/raml";
@@ -106707,7 +109446,7 @@ self: {
        pname = "rand-vars";
        version = "0.1";
        sha256 = "165jvx59vzmpxp7gw60ivfka77kgc1irwijikkwja7jb4dm4ay3x";
-       buildDepends = [ array base IntervalMap mtl random ];
+       libraryHaskellDepends = [ array base IntervalMap mtl random ];
        description = "Random variable library, with Functor, Applicative and Monad instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106723,7 +109462,7 @@ self: {
        sha256 = "11f72kfya4l41dihjvaz15hzipry281r8i6k6dzp5q3gq4valgyz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base crypto-api directory filepath monadcryptorandom transformers
          unix
        ];
@@ -106737,8 +109476,8 @@ self: {
        pname = "random";
        version = "1.1";
        sha256 = "0nis3lbkp8vfx8pkr6v7b7kr5m334bzb0fk9vxqklnp2aw8a865p";
-       buildDepends = [ base time ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base ];
        description = "random number library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106749,7 +109488,7 @@ self: {
        pname = "random-access-list";
        version = "0.2";
        sha256 = "1ymbs3f38l6ch0nphsy9pi32yb1a4hazn3grm9fl0dvgqw28xl8r";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        description = "Random-access lists in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106761,7 +109500,7 @@ self: {
        pname = "random-derive";
        version = "0.1.0.0";
        sha256 = "08irzyg8cgigj009zp5hg33gdwranrdyyzrxhmwyib6fm5bmsj8p";
-       buildDepends = [ base random template-haskell ];
+       libraryHaskellDepends = [ base random template-haskell ];
        homepage = "https://github.com/frerich/random-derive";
        description = "A Template Haskell helper for deriving Random instances";
        license = stdenv.lib.licenses.bsd3;
@@ -106773,7 +109512,7 @@ self: {
        pname = "random-eff";
        version = "0.1.0.1";
        sha256 = "1m28np0zfabp1n1d08przh35bxfr1l7d39kj4a5z61jkchmsaxyf";
-       buildDepends = [ base extensible-effects random ];
+       libraryHaskellDepends = [ base extensible-effects random ];
        jailbreak = true;
        description = "A simple random generator library for extensible-effects";
        license = stdenv.lib.licenses.bsd3;
@@ -106786,7 +109525,7 @@ self: {
        pname = "random-effin";
        version = "0.1.1.0";
        sha256 = "0p1n5dfdsp00q9mlhd7xcl93k5d0wji91p59858gmfx9xf8j0p0h";
-       buildDepends = [ base effin random ];
+       libraryHaskellDepends = [ base effin random ];
        jailbreak = true;
        description = "A simple random generator library for effin";
        license = stdenv.lib.licenses.bsd3;
@@ -106800,7 +109539,9 @@ self: {
        pname = "random-extras";
        version = "0.19";
        sha256 = "1b45s314rqkk0np460p3p0wrqvkv9dczifny8pp76ikksalfvgn0";
-       buildDepends = [ array base containers random-fu random-source ];
+       libraryHaskellDepends = [
+         array base containers random-fu random-source
+       ];
        homepage = "http://github.com/aristidb/random-extras";
        description = "Additional functions for random values";
        license = stdenv.lib.licenses.bsd3;
@@ -106815,7 +109556,7 @@ self: {
        pname = "random-fu";
        version = "0.2.6.2";
        sha256 = "1j7zr7h860vjwlh9d9sj319xs44ly2vyzn3s72c5qc39r0yv00ng";
-       buildDepends = [
+       libraryHaskellDepends = [
          base erf log-domain math-functions monad-loops mtl random-shuffle
          random-source rvar syb template-haskell transformers vector
        ];
@@ -106832,8 +109573,8 @@ self: {
        pname = "random-hypergeometric";
        version = "0.1.0.0";
        sha256 = "0jg4j2nwijb5ic9zl5y9miqhn881dmf0s49gj8f818as3mhvqlgh";
-       buildDepends = [ base math-functions random-fu ];
-       testDepends = [
+       libraryHaskellDepends = [ base math-functions random-fu ];
+       testHaskellDepends = [
          base Cabal cabal-test-quickcheck math-functions mwc-random
          QuickCheck random-fu vector
        ];
@@ -106850,7 +109591,7 @@ self: {
        pname = "random-shuffle";
        version = "0.0.4";
        sha256 = "0586bnlh0g2isc44jbjvafkcl4yw6lp1db8x6vr0pza0y08l8w2j";
-       buildDepends = [ base MonadRandom random ];
+       libraryHaskellDepends = [ base MonadRandom random ];
        description = "Random shuffle implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106864,7 +109605,7 @@ self: {
        pname = "random-source";
        version = "0.3.0.6";
        sha256 = "0wsv41kpswqml04ym5bq2nan4i637f7h3fmvda2zy506xwxfrpzk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base flexible-defaults mersenne-random-pure64 mtl mwc-random random
          stateref syb template-haskell th-extras
        ];
@@ -106879,7 +109620,7 @@ self: {
        pname = "random-stream";
        version = "0.1.1";
        sha256 = "0q191kz3hmjzrgs143nja5gcis07igb38f51mwqw64zx7vjqvx66";
-       buildDepends = [ base binary bytestring random ];
+       libraryHaskellDepends = [ base binary bytestring random ];
        description = "An infinite stream of random data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106895,8 +109636,10 @@ self: {
        sha256 = "0y7yvsach0c27ahscxr36avjrq281pmg7w6cv2yj5kmbk7ddwlyi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring mersenne-random-pure64 ];
-       extraLibraries = [ openssl ];
+       executableHaskellDepends = [
+         base binary bytestring mersenne-random-pure64
+       ];
+       executableSystemDepends = [ openssl ];
        homepage = "http://galois.com";
        description = "A fast, SMP parallel random data generator";
        license = stdenv.lib.licenses.bsd3;
@@ -106908,7 +109651,7 @@ self: {
        pname = "randproc";
        version = "0.4";
        sha256 = "0fb0239fwvn1n3rbdr03k4kx1igzbb638a1iq0ln1k1i1fpaayd7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.haskell.org/haskellwiki/Random_Processes";
        description = "Data structures and support functions for working with random processes";
        license = stdenv.lib.licenses.bsd3;
@@ -106922,7 +109665,7 @@ self: {
        sha256 = "0v7j6qqs16j281hn0330vcpkriqgyvl7087ll665c7dcqqh2bswk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base random X11 ];
+       executableHaskellDepends = [ base random X11 ];
        description = "Set the background of your root window to a random colour";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -106935,15 +109678,14 @@ self: {
        pname = "range";
        version = "0.1.2.0";
        sha256 = "028bigaq4vk5ykzf04f5hi3g37gxzzp6q24bjcb3gjfzcgy7z6ab";
-       buildDepends = [ base free parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base free parsec ];
+       testHaskellDepends = [
          base Cabal free QuickCheck random test-framework
          test-framework-quickcheck2
        ];
        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
@@ -106952,8 +109694,8 @@ self: {
        pname = "range-set-list";
        version = "0.0.7";
        sha256 = "1qgw95gvbxar13ia6562ddz9zqd14ffyxwp9qi41w859prfc1728";
-       buildDepends = [ base ];
-       testDepends = [ base containers tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        jailbreak = true;
        homepage = "https://github.com/phadej/range-set-list";
        description = "Memory efficient sets with continuous ranges of elements";
@@ -106969,10 +109711,10 @@ self: {
        pname = "range-space";
        version = "0.1.1.2";
        sha256 = "06cl5kgyl1lccr78galqxp21nli2vkvlywy6394cnp14wqfz8r94";
-       buildDepends = [
+       libraryHaskellDepends = [
          base semigroups vector-space vector-space-points
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck semigroups test-framework
          test-framework-quickcheck2 time vector-space vector-space-points
        ];
@@ -106989,7 +109731,7 @@ self: {
        pname = "rangemin";
        version = "2.2.2";
        sha256 = "01n1m3ibi44pjg04mg16j751fjzkspmnq8bzxz55qbyi22wshnwc";
-       buildDepends = [ base containers primitive vector ];
+       libraryHaskellDepends = [ base containers primitive vector ];
        description = "Linear range-min algorithms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107001,7 +109743,7 @@ self: {
        pname = "ranges";
        version = "0.2.4";
        sha256 = "1ymvmvfvzkdxblg691g9n5y94gpiz782jgyvaisg5mydzj1s1fyv";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Ranges and various functions on them";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107014,12 +109756,13 @@ self: {
        pname = "rank1dynamic";
        version = "0.3.1.0";
        sha256 = "0klfwglssp782p1brbfgjm30d2s3lpgd75iv7jq1pih598kkjsd5";
-       buildDepends = [ base binary ghc-prim ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       libraryHaskellDepends = [ base binary ghc-prim ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        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;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rascal" = callPackage
@@ -107033,11 +109776,15 @@ self: {
        sha256 = "0q7afppkm5jd1p13fszzsfjpdz6g6bw1vd6wigcy3janxn5686rs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-terminal base containers curl curl-aeson directory
          filepath mtl process vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson ansi-terminal base containers curl curl-aeson directory
+         filepath mtl process vector
+       ];
+       testHaskellDepends = [
          aeson ansi-terminal base containers curl curl-aeson directory
          filepath HUnit mtl process QuickCheck tasty tasty-hunit
          tasty-quickcheck vector
@@ -107060,10 +109807,14 @@ self: {
        sha256 = "00p3l8czj7l9jm6ibn9c6wb99v5j5x9ivgh3pamznqcri3lqy7kk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory filepath FontyFruity
-         JuicyPixels lens linear mtl optparse-applicative Rasterific
-         scientific svg-tree text transformers vector
+         JuicyPixels lens linear mtl Rasterific scientific svg-tree text
+         transformers vector
+       ];
+       executableHaskellDepends = [
+         base directory filepath FontyFruity JuicyPixels
+         optparse-applicative Rasterific svg-tree
        ];
        description = "SVG renderer based on Rasterific";
        license = stdenv.lib.licenses.bsd3;
@@ -107075,7 +109826,7 @@ self: {
        pname = "rate-limit";
        version = "1.1.1";
        sha256 = "1d1dfj05vi8jr2cfy42a58wnm84zm6cmx7fabp2rb83qqm4l2riz";
-       buildDepends = [ base time-units ];
+       libraryHaskellDepends = [ base time-units ];
        homepage = "http://github.com/acw/rate-limit";
        description = "A basic library for rate-limiting IO actions";
        license = stdenv.lib.licenses.bsd3;
@@ -107087,7 +109838,7 @@ self: {
        pname = "ratio-int";
        version = "0.1.2";
        sha256 = "06kqr4iyi184sa8y2vdkw5h0pvh5f8lwcqb8mbcn34lpqm961s7g";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/RaphaelJ/ratio-int";
        description = "Fast specialisation of Data.Ratio for Int.";
        license = stdenv.lib.licenses.bsd3;
@@ -107102,11 +109853,13 @@ self: {
        pname = "raven-haskell";
        version = "0.1.0.0";
        sha256 = "06pa03g9pxxv1qk34ckcgwp5wirj5ag1akml48k18la6p0a2r3mx";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-conduit network old-locale random text
          time unordered-containers uuid
        ];
-       testDepends = [ aeson base bytestring hspec unordered-containers ];
+       testHaskellDepends = [
+         aeson base bytestring hspec unordered-containers
+       ];
        homepage = "https://bitbucket.org/dpwiz/raven-haskell";
        description = "Haskell client for Sentry logging service";
        license = stdenv.lib.licenses.mit;
@@ -107121,7 +109874,7 @@ self: {
        pname = "raven-haskell-scotty";
        version = "0.1.0.3";
        sha256 = "0vllfasn4rky8r8fg3mpln8pdkxbcvrvx8wamn0xswfwf1rvcf6k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive mtl raven-haskell scotty text wai
        ];
        homepage = "http://bitbucket.org/dpwiz/raven-haskell";
@@ -107136,7 +109889,7 @@ self: {
        pname = "raw-strings-qq";
        version = "1.0.2";
        sha256 = "0wnifa97am2s9bqixlidw3nf8w14h2qkg3sn1rxzgvc3fws57jg9";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/23Skidoo/raw-strings-qq";
        description = "Raw string literals for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -107148,7 +109901,7 @@ self: {
        pname = "rawstring-qm";
        version = "0.2.2.2";
        sha256 = "0h3s62sn84skwx3p9lcycswydvg6rijig7pk3g7v4rvypfdlybz6";
-       buildDepends = [ base bytestring template-haskell text ];
+       libraryHaskellDepends = [ base bytestring template-haskell text ];
        homepage = "https://github.com/tolysz/rawstring-qm";
        description = "Simple raw string quotation and dictionary interpolation";
        license = stdenv.lib.licenses.bsd3;
@@ -107162,10 +109915,10 @@ self: {
        pname = "razom-text-util";
        version = "0.1.2.0";
        sha256 = "0sfqc222pplsdmbrhwvbdf6pmqa18vgjd83rk7hqixzp6rk9h7pg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base regex-applicative smaoin text text-position
        ];
-       testDepends = [ base QuickCheck regex-applicative smaoin ];
+       testHaskellDepends = [ base QuickCheck regex-applicative smaoin ];
        homepage = "http://rel4tion.org/projects/razom-text-util/";
        description = "Common text/parsing tools for Razom language packages";
        license = stdenv.lib.licenses.publicDomain;
@@ -107179,7 +109932,7 @@ self: {
        sha256 = "0q7b990k3ijjjwhnm1283k9vzmvypyg7mhvbzagvi74q0sgwyac7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bio bytestring containers ];
+       executableHaskellDepends = [ base bio bytestring containers ];
        homepage = "http://malde.org/~ketil/";
        description = "Mask nucleotide (EST) sequences in Fasta format";
        license = "GPL";
@@ -107194,7 +109947,7 @@ self: {
        pname = "rclient";
        version = "0.1.0.0";
        sha256 = "1hdcbnkb184a1zfxsh4fxgff9znc5sw6503qbix67c45qiw25zhn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 network QuickCheck split
        ];
        description = "Haskell client for Rserve";
@@ -107214,12 +109967,16 @@ self: {
        sha256 = "09ya3d1svg6fj7jdm408gisv0cnn0c2i2c3pn07xggnn882s93bw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq directory fgl hashable
          HTTP hxt network network-uri parsec text text-binary
          unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base binary bytestring containers deepseq hashable HTTP hxt network
+         network-uri parsec text text-binary
+       ];
+       testHaskellDepends = [
          base binary bytestring containers deepseq fgl hashable HTTP HUnit
          hxt knob network network-uri parsec QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text text-binary
@@ -107241,7 +109998,11 @@ self: {
        sha256 = "1k0djlhabycj4q7x85bj7n3k0rcyxn9b3k3ijb4za2vxj081qdj0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring containers hoauth json MissingH mtl
+         transformers urlencoded
+       ];
+       executableHaskellDepends = [
          aeson base bytestring containers hoauth hspec json MissingH mtl
          transformers urlencoded
        ];
@@ -107256,7 +110017,7 @@ self: {
        pname = "rdtsc";
        version = "1.3.0.1";
        sha256 = "0l6r5v6bgqf7lq9j6bf7w362bz7bv4xrsbz90ns60v4dyqjskjal";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mgrabmueller/rdtsc";
        description = "Binding for the rdtsc machine instruction";
        license = stdenv.lib.licenses.bsd3;
@@ -107268,7 +110029,7 @@ self: {
        pname = "rdtsc-enolan";
        version = "0.1";
        sha256 = "0v3x7ga4gx5q4gwh8xdhb2arlmjyilr9igz28wysy9qqlcdw775q";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/rdtsc";
        description = "Binding to sources of high-efficiency, high-precision, monotonically increasing relative time";
        license = stdenv.lib.licenses.bsd3;
@@ -107280,8 +110041,8 @@ self: {
        pname = "re2";
        version = "0.1";
        sha256 = "08mmbxj9dpnb56b6vh0lz7nimp3w3v9g2c6ypxgz8ahvlia0a4f5";
-       buildDepends = [ base bytestring vector ];
-       testDepends = [ base bytestring chell vector ];
+       libraryHaskellDepends = [ base bytestring vector ];
+       testHaskellDepends = [ base bytestring chell vector ];
        homepage = "https://john-millikin.com/software/haskell-re2/";
        description = "Bindings to the re2 regular expression library";
        license = stdenv.lib.licenses.mit;
@@ -107295,14 +110056,13 @@ self: {
        pname = "react-haskell";
        version = "2.0.1";
        sha256 = "0kjbicrvriliy50gy82b7rsrfk5p3iv20wwnhiaq9i16mbh2zj8j";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base deepseq lens-family monads-tf text transformers
          unordered-containers void
        ];
        homepage = "https://github.com/joelburget/react-haskell";
        description = "Haskell React bindings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reaction-logic" = callPackage
@@ -107313,7 +110073,8 @@ self: {
        sha256 = "0g1lbr0lsx71ddmd64q9lxx3gj63ncc7nqd12l4739wq495q57r0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl QuickCheck ];
+       libraryHaskellDepends = [ base mtl QuickCheck ];
+       executableHaskellDepends = [ base mtl QuickCheck ];
        homepage = "http://wiki.github.com/paolino/realogic";
        description = "pluggable pure logic serializable reactor";
        license = stdenv.lib.licenses.bsd3;
@@ -107328,7 +110089,7 @@ self: {
        pname = "reactive";
        version = "0.11.5";
        sha256 = "1axhgggl1g8yjdvp817bnkj4xc23scc3i2k224k43942255sf71j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base category-extras checkers old-time QuickCheck random Stream
          TypeCompose unamb vector-space
        ];
@@ -107344,8 +110105,8 @@ self: {
        pname = "reactive-bacon";
        version = "0.4.1";
        sha256 = "0cic01yikwgalbprz8y0fs7i7c0pynxl7aivsfjgsl75wdpjsj3m";
-       buildDepends = [ base old-time stm ];
-       testDepends = [ base containers HUnit old-time stm ];
+       libraryHaskellDepends = [ base old-time stm ];
+       testHaskellDepends = [ base containers HUnit old-time stm ];
        homepage = "http://github.com/raimohanska/reactive-bacon";
        description = "FRP (functional reactive programming) framework";
        license = stdenv.lib.licenses.bsd3;
@@ -107362,7 +110123,7 @@ self: {
        pname = "reactive-balsa";
        version = "0.1.1";
        sha256 = "14k65rjvyxwb4psa53qcz89jllabqv76vh4xwx2k6k5ssl6qfr3n";
-       buildDepends = [
+       libraryHaskellDepends = [
          alsa-core alsa-seq base containers data-accessor
          data-accessor-transformers event-list extensible-exceptions midi
          midi-alsa non-negative random reactive-banana transformers
@@ -107384,11 +110145,11 @@ self: {
        pname = "reactive-banana";
        version = "0.8.1.2";
        sha256 = "1ak3i0r7y9d5pyb4q6jag804bkgiqj3az7cckj50ffvra2v37nga";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hashable psqueues transformers unordered-containers
          vault
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hashable HUnit psqueues test-framework
          test-framework-hunit transformers unordered-containers vault
        ];
@@ -107405,7 +110166,7 @@ self: {
        pname = "reactive-banana-sdl";
        version = "0.2.0";
        sha256 = "067g8v7xhll416f47prifv0l2i8vr6aywbahhci8kwci75a1al6m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-lens data-lens-template reactive-banana SDL SDL-image
          SDL-ttf
        ];
@@ -107423,7 +110184,7 @@ self: {
        sha256 = "1fb0bq7rcxsnga2hxh94h2rpp4kjh383z06qgk36m49pyvnbnl9a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base reactive-banana threepenny-gui ];
+       libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
        jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using threepenny-gui";
@@ -107437,10 +110198,12 @@ self: {
        pname = "reactive-banana-wx";
        version = "0.8.0.4";
        sha256 = "1r000r9svkf1sqxhg5mpawg9a7dkfndsyz242sbmfaxf94nrrscg";
+       configureFlags = [ "-f-buildexamples" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cabal-macosx reactive-banana wx wxcore ];
-       configureFlags = [ "-f-buildexamples" ];
+       libraryHaskellDepends = [
+         base cabal-macosx reactive-banana wx wxcore
+       ];
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
@@ -107454,7 +110217,7 @@ self: {
        pname = "reactive-fieldtrip";
        version = "0.0.9";
        sha256 = "092bxjnhbcyqlij8jc014c56k67ncp5wjm8kmwvn8argfplyscxg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base FieldTrip InfixApplicative reactive reactive-glut unamb
          vector-space
        ];
@@ -107472,7 +110235,9 @@ self: {
        pname = "reactive-glut";
        version = "0.1.10";
        sha256 = "164ivzgrnvqvx7r1jagsng9m47ql0jkayzahhcvs8wd78ksbbsfh";
-       buildDepends = [ base GLUT old-time OpenGL reactive vector-space ];
+       libraryHaskellDepends = [
+         base GLUT old-time OpenGL reactive vector-space
+       ];
        homepage = "http://haskell.org/haskellwiki/reactive-glut";
        description = "Connects Reactive and GLUT";
        license = stdenv.lib.licenses.bsd3;
@@ -107485,7 +110250,7 @@ self: {
        pname = "reactive-haskell";
        version = "0.0.1";
        sha256 = "115zjaymcx1dm7lwdqjq810j664a2kj8phrvjkhfkdsl95srqc85";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "minimal fork of io-reactive";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107496,7 +110261,7 @@ self: {
        pname = "reactive-io";
        version = "0.1";
        sha256 = "0s7a29cfzb2j5xvqykx1n5naci2np36zjs3qyq0i4yzjf3qprr63";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "IO-oriented FRP library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -107509,7 +110274,10 @@ self: {
        sha256 = "1mydwb3p2c4xm7zfv7cwcyscq1wdcvs2az743s3j8gl8ggc1zs50";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base monad-parallel SDL stm transformers ];
+       libraryHaskellDepends = [ base monad-parallel stm transformers ];
+       executableHaskellDepends = [
+         base monad-parallel SDL stm transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/strager/reactive-thread";
        description = "Reactive programming via imperative threads";
@@ -107525,7 +110293,7 @@ self: {
        pname = "reactor";
        version = "0.1.3";
        sha256 = "0g57vkq8cgigy6383p5jk6bbp3l1vcihryz8sjwvr8hs4y96642f";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bits-atomic comonad contravariant mtl semigroupoids
          transformers
        ];
@@ -107542,7 +110310,7 @@ self: {
        pname = "read-bounded";
        version = "0.1.1.0";
        sha256 = "19ynv5vxa5dnphv9kby0nfvq3wn6qpk7n5qv1x22ipkfxnxdw47k";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/thomaseding/read-bounded";
        description = "Class for reading bounded values";
@@ -107555,7 +110323,7 @@ self: {
        pname = "readable";
        version = "0.3.1";
        sha256 = "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/mightybyte/readable";
        description = "Reading from Text and ByteString";
        license = stdenv.lib.licenses.bsd3;
@@ -107567,8 +110335,8 @@ self: {
        pname = "readline";
        version = "1.0.3.0";
        sha256 = "1sszlx34qa88fad3wlhd4rkb1my1nrpzvyd8vq7dn806j5sf3ff0";
-       buildDepends = [ base process ];
-       extraLibraries = [ ncurses readline ];
+       libraryHaskellDepends = [ base process ];
+       librarySystemDepends = [ ncurses readline ];
        description = "An interface to the GNU readline library";
        license = "GPL";
      }) { inherit (pkgs) ncurses;  inherit (pkgs) readline;};
@@ -107579,7 +110347,7 @@ self: {
        pname = "readline-statevar";
        version = "1.0.1.0";
        sha256 = "1gfxs3wfdkkarxil2an5l58syrm2vajj0qpshzabzchni32yxic8";
-       buildDepends = [ base readline StateVar ];
+       libraryHaskellDepends = [ base readline StateVar ];
        jailbreak = true;
        description = "Readline with variables (setX/getY) wrapped in state vars";
        license = stdenv.lib.licenses.bsd3;
@@ -107593,7 +110361,7 @@ self: {
        sha256 = "1icb7w3hgfczrr48x48lwvln05yaw3c9bxwrrfxc92h3q73v1rpp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bliplib parseargs ];
+       executableHaskellDepends = [ base bliplib parseargs ];
        homepage = "https://github.com/bjpop/blip";
        description = "Read and pretty print Python bytecode (.pyc) files.";
        license = stdenv.lib.licenses.bsd3;
@@ -107605,7 +110373,7 @@ self: {
        pname = "really-simple-xml-parser";
        version = "0.4.0.0";
        sha256 = "1qmrfisnvm9a25a9ssg4r466yna69vzbwn7s7f4zql28cndg3syy";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        jailbreak = true;
        homepage = "http://website-ckkashyap.rhcloud.com";
        description = "A really simple XML parser";
@@ -107619,7 +110387,7 @@ self: {
        pname = "reasonable-lens";
        version = "0.2.1.1";
        sha256 = "0ic239ikxqsk4qjnyraka3jn4pjmmsgwqyga6zmqlw7z1kpgaxam";
-       buildDepends = [ base mtl split template-haskell ];
+       libraryHaskellDepends = [ base mtl split template-haskell ];
        homepage = "https://github.com/tokiwoousaka/reasonable-lens";
        description = "Lens implementation. It is more small but adequately.";
        license = stdenv.lib.licenses.mit;
@@ -107631,10 +110399,10 @@ self: {
      mkDerivation {
        pname = "reasonable-operational";
        version = "0.1.0.1";
-       revision = "1";
        sha256 = "18d49rzpygbsd17d9hz79bbgj6jznlx2jzhkw43gzw3rhvklwyh9";
+       revision = "1";
        editedCabalFile = "963ed294ec0f951858022c25b9713b06e65d2a05098068a1183110e298b5c8cf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/tokiwoousaka/reasonable-operational";
        description = "Just size Operational Monad implementation";
        license = stdenv.lib.licenses.mit;
@@ -107646,7 +110414,7 @@ self: {
        pname = "recaptcha";
        version = "0.1.0.3";
        sha256 = "18rqsqzni11nr2cvs7ah9k87w493d92c0gmc0n6fhfq6gay9ia19";
-       buildDepends = [ base HTTP network network-uri xhtml ];
+       libraryHaskellDepends = [ base HTTP network network-uri xhtml ];
        homepage = "http://github.com/jgm/recaptcha/tree/master";
        description = "Functions for using the reCAPTCHA service in web applications";
        license = stdenv.lib.licenses.bsd3;
@@ -107660,7 +110428,7 @@ self: {
        pname = "record";
        version = "0.4.0.2";
        sha256 = "18j30j7dppm0lqf9p345bfz65cls15ka6jyflamwgig5h0dzz5mw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude basic-lens template-haskell transformers
        ];
        homepage = "https://github.com/nikita-volkov/record";
@@ -107676,8 +110444,10 @@ self: {
        pname = "record-aeson";
        version = "0.1.0.0";
        sha256 = "023g63y478k7mq8kk5xcxa3civs3hdhlvdb0qh3amvvybpj3g4av";
-       buildDepends = [ aeson base base-prelude record template-haskell ];
-       testDepends = [ aeson base-prelude hspec record ];
+       libraryHaskellDepends = [
+         aeson base base-prelude record template-haskell
+       ];
+       testHaskellDepends = [ aeson base-prelude hspec record ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/record-aeson";
        description = "Instances of \"aeson\" classes for the \"record\" types";
@@ -107693,14 +110463,14 @@ self: {
      mkDerivation {
        pname = "record-gl";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "0z0qwnzayarwlamig9g4zngq3mcddhl3pgalir811lxf3a3g1dqq";
+       revision = "1";
        editedCabalFile = "6d2017f9112690ce717a1bb7dad9d2d4272b01b4bce8ee3ae79247f97f277d85";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude containers GLUtil linear OpenGL record tagged
          template-haskell vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit linear OpenGL record tagged test-framework
          test-framework-hunit
        ];
@@ -107719,7 +110489,7 @@ self: {
        sha256 = "0vfij2kj4lg9pvyrcq3x33vnibq441fc80cpd67c9ik9axgf0r3y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-prelude conversion conversion-text record-syntax text
        ];
        homepage = "https://github.com/nikita-volkov/record-preprocessor";
@@ -107737,18 +110507,17 @@ self: {
        pname = "record-syntax";
        version = "0.1.0.2";
        sha256 = "177zy0j05yvpalflja5wpp0a45nplhpa9vq8ssfxw2nw9ydam637";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude conversion conversion-text haskell-src-exts
          parsec record template-haskell text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-prelude directory doctest filepath hspec record
        ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/record-syntax";
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "records" = callPackage
@@ -107757,7 +110526,7 @@ self: {
        pname = "records";
        version = "0.1.1.6";
        sha256 = "1nzqqbqwgsr066ykmanyzmlv5nzdzpkkcla0lg8klyw6ck9ddk69";
-       buildDepends = [ base kinds type-functions ];
+       libraryHaskellDepends = [ base kinds type-functions ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/records";
        description = "A flexible record system";
        license = stdenv.lib.licenses.bsd3;
@@ -107772,7 +110541,7 @@ self: {
        pname = "records-th";
        version = "0.1.1.0";
        sha256 = "1m6v52kmh1clcgah07jjjxvsfpbp6z8lkdd78wap0v3mqiv8mdcg";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base data-default kinds records template-haskell text
          type-functions unordered-containers
        ];
@@ -107789,11 +110558,10 @@ self: {
        pname = "recursion-schemes";
        version = "4.1.2";
        sha256 = "1z64r20qgf7n5c2529cpwhklb3nkmw01p2llq903dqkplmbi7z9n";
-       buildDepends = [ base comonad free transformers ];
+       libraryHaskellDepends = [ base comonad free transformers ];
        homepage = "http://github.com/ekmett/recursion-schemes/";
        description = "Generalized bananas, lenses and barbed wire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "recursive-line-count" = callPackage
@@ -107806,7 +110574,7 @@ self: {
        sha256 = "0iyacn4gb7v6ly0bdci34mrjkjc29mbplqc6bhfv8ksz74aaafyn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers filepath gtk mtl process
        ];
        homepage = "https://github.com/joeyadams/haskell-recursive-line-count";
@@ -107823,7 +110591,7 @@ self: {
        pname = "redHandlers";
        version = "0.1";
        sha256 = "1llb81aqr0jlsajsmy20br5vqd6ap54bk17ipg8z3gmzd0wcf9c9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cgi containers haskell98 MaybeT mtl network
          old-time parsec stm unix xhtml
        ];
@@ -107842,12 +110610,12 @@ self: {
        pname = "reddit";
        version = "0.1.1.0";
        sha256 = "1flsawdld5a4bs5crs352zc1r9ag3yn1indbzw7vgs2mmyiavg7k";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson api-builder base bytestring data-default http-conduit
          http-types network stm text time transformers unordered-containers
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          api-builder base bytestring Cabal hspec http-conduit text time
          transformers
        ];
@@ -107865,7 +110633,7 @@ self: {
        pname = "redis";
        version = "0.14.1";
        sha256 = "02r97k08n9gyrfmbm6qgb8dddivaiprp50hs79a5bnxvvl6vmq9b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring concurrent-extra containers exceptions mtl network
          old-time utf8-string
        ];
@@ -107880,7 +110648,7 @@ self: {
        pname = "redis-hs";
        version = "0.1.2";
        sha256 = "1irayxwkdksc9v70g7il7zl7pmkrim2admcgjwcm9inyca7618wg";
-       buildDepends = [ base bytestring network utf8-string ];
+       libraryHaskellDepends = [ base bytestring network utf8-string ];
        homepage = "http://ohloh.net/p/redis-hs";
        description = "A simple Redis library for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -107897,13 +110665,13 @@ self: {
        pname = "redis-io";
        version = "0.5.1";
        sha256 = "13zj3d89drqdfq8202y982l7jp0nc3mmnmhwpxxfap0pb69n2s5m";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec auto-update base bytestring containers exceptions
          iproute monad-control mtl network operational redis-resp
          resource-pool semigroups stm time tinylog transformers
          transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring bytestring-conversion containers redis-resp
          tasty tasty-hunit tinylog transformers
        ];
@@ -107920,10 +110688,10 @@ self: {
      mkDerivation {
        pname = "redis-resp";
        version = "0.3.2";
-       revision = "2";
        sha256 = "07lvgq2l2fahhc9z3hjjjpx3n4rzdxl2l2ww9brxnv23432xpz97";
+       revision = "2";
        editedCabalFile = "6375e871f3ad78efa6e4780c4e5c026fa4694f27e32f3837679fff42f488877f";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-conversion containers dlist
          double-conversion operational semigroups split transformers
        ];
@@ -107938,7 +110706,7 @@ self: {
        pname = "redis-simple";
        version = "0.1.1";
        sha256 = "0kzs5lc2y40dzx57k0klz0k9zijhi7mh0awi6rzhzd3h5z1gdr43";
-       buildDepends = [ base binary bytestring redis ];
+       libraryHaskellDepends = [ base binary bytestring redis ];
        homepage = "http://github.com/jaspervdj/redis-simple";
        description = "Simple redis bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -107954,7 +110722,7 @@ self: {
        sha256 = "18951sri8wix8aazd8hy8g2gzcpxw2x1ihzmn2prlf10zy1jcy4d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory filepath process pureMD5
        ];
        homepage = "https://github.com/jekor/redo";
@@ -107971,7 +110739,7 @@ self: {
        pname = "reducers";
        version = "3.10.3.2";
        sha256 = "1zfryrmz5ajahs4d6dj3fzzkqbgdzqz358jvj4rhqiwa61ylhb42";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers fingertree hashable semigroupoids
          semigroups text transformers unordered-containers
        ];
@@ -107986,7 +110754,9 @@ self: {
        pname = "reenact";
        version = "0.9";
        sha256 = "19xw0w15ja8h5wxpz4x65vzvc7qxpn3k33p82pa2g3w9l9hlj2xw";
-       buildDepends = [ base hamid HCodecs stm time vector-space ];
+       libraryHaskellDepends = [
+         base hamid HCodecs stm time vector-space
+       ];
        description = "A reimplementation of the Reactive library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107997,7 +110767,7 @@ self: {
        pname = "reexport-crypto-random";
        version = "0.1.0.0";
        sha256 = "0lraykl190x0cj65z495c11vi4pcg3g8gz1bdgdndf6662lp56x9";
-       buildDepends = [ base crypto-api ];
+       libraryHaskellDepends = [ base crypto-api ];
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
@@ -108007,7 +110777,7 @@ self: {
        pname = "ref";
        version = "0.1.1.2";
        sha256 = "109illgbz4g4a6qavgc4wvyxfjvjhyrxa2gpps67avmr1v90gihr";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "https://bitbucket.org/carter/ref";
        description = "Generic Mutable Ref Abstraction Layer";
@@ -108021,7 +110791,7 @@ self: {
        pname = "ref-fd";
        version = "0.4";
        sha256 = "1r8cj6v798chr3bp7x6qvsiz04xsj2iicpa6824b4fzzy5ixkj96";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "A type class for monads with references using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -108033,7 +110803,7 @@ self: {
        pname = "ref-mtl";
        version = "0.3";
        sha256 = "0wijkaf3qyp6qjz0cwyhb89z5jrcz792hx8m9a43xrp7v2f84080";
-       buildDepends = [ base mtl stm transformers ];
+       libraryHaskellDepends = [ base mtl stm transformers ];
        jailbreak = true;
        homepage = "http://www.eecs.harvard.edu/~mainland/";
        description = "A type class for monads with references compatible with the mtl2 library";
@@ -108046,7 +110816,7 @@ self: {
        pname = "ref-tf";
        version = "0.4";
        sha256 = "049xpdn14py3r7hs4ikqdz7jgfsxi6vdsxgq0jfz69gzg4binc25";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "A type class for monads with references using type families";
        license = stdenv.lib.licenses.bsd3;
@@ -108058,7 +110828,7 @@ self: {
        pname = "refact";
        version = "0.3.0.1";
        sha256 = "0nmlhx35g3kb5if6qnkmabgi5dj4b446vkd1n5df1vsiyaf65w11";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Specify refactorings to perform with apply-refact";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108072,8 +110842,10 @@ self: {
        pname = "refcount";
        version = "0.1.2";
        sha256 = "1h1gprc4c784pf3wi2ri2hxk7pbh9y8bqc0xcryjcyjk3519ig16";
-       buildDepends = [ base hashable QuickCheck unordered-containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base hashable QuickCheck unordered-containers
+       ];
+       testHaskellDepends = [
          base Cabal hashable HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
          unordered-containers
@@ -108090,7 +110862,7 @@ self: {
        pname = "reference";
        version = "0.1";
        sha256 = "1gqbbiwhx5wq1g73m3apwyrrpapqzimincmw2b64fpkkykq66dq1";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "A class for references in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -108104,7 +110876,7 @@ self: {
        pname = "references";
        version = "0.3.0.0";
        sha256 = "0rw3r9sz39f3pw2zxq7n9ca9jccfrj6lnjs3frimh0xrmdi9bmjk";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory either filepath instance-control
          mtl template-haskell text transformers
        ];
@@ -108125,7 +110897,7 @@ self: {
        sha256 = "1fhvn4cjfq92hi422mcdq4xwb405cc4pvlax0bqvyw3bg9ngqz9m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base clippard cmdargs directory filepath haskheap network
        ];
        jailbreak = true;
@@ -108141,7 +110913,7 @@ self: {
        pname = "refined";
        version = "0.1.0.0";
        sha256 = "0072zc4x8v6b8vdfgxnm1k6hbhzvf1m4cdb65v8df3qngb603r5n";
-       buildDepends = [ base base-prelude template-haskell ];
+       libraryHaskellDepends = [ base base-prelude template-haskell ];
        homepage = "https://github.com/nikita-volkov/refined";
        description = "Refinement types with static and runtime checking";
        license = stdenv.lib.licenses.mit;
@@ -108153,7 +110925,7 @@ self: {
        pname = "reflection";
        version = "2";
        sha256 = "1hlrji6wyqr892a78px7wilhywyiqdfdmnr7zp4c641qks4rw6gf";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/reflection";
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
        license = stdenv.lib.licenses.bsd3;
@@ -108166,7 +110938,9 @@ self: {
        pname = "reflection-extras";
        version = "0.1.1.0";
        sha256 = "1cnqd8hrcvjvcdrida0q3dxkkmp36qsfqhv0a5zr94b1y5zfrj4k";
-       buildDepends = [ aeson base constraints lens reflection tagged ];
+       libraryHaskellDepends = [
+         aeson base constraints lens reflection tagged
+       ];
        jailbreak = true;
        homepage = "http://github.com/jfischoff/reflection-extras";
        description = "Utilities for the reflection package";
@@ -108180,7 +110954,7 @@ self: {
        pname = "reflection-without-remorse";
        version = "0.9.5";
        sha256 = "1iz4k42hc8f11a6kg2db847zmq5qpfiwns1448s62jswc2xm0x0r";
-       buildDepends = [ base type-aligned ];
+       libraryHaskellDepends = [ base type-aligned ];
        homepage = "https://github.com/atzeus/reflection-without-remorse";
        description = "Efficient free and operational monads";
        license = stdenv.lib.licenses.bsd3;
@@ -108196,12 +110970,12 @@ self: {
        pname = "reflex";
        version = "0.3";
        sha256 = "1aw4pz0y0rpf7klsb232q0zi4zqcpkwrw0s3zrkq5iyhzaswfnyd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dependent-map dependent-sum exception-transformers
          mtl primitive ref-tf semigroups template-haskell these transformers
          transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers dependent-map MemoTrie mtl ref-tf
        ];
        homepage = "https://github.com/ryantrinkle/reflex";
@@ -108221,7 +110995,7 @@ self: {
        pname = "reflex-dom";
        version = "0.2";
        sha256 = "1pc6mz9c6nr4s5b2mhlyxjzzffh85cv1bgvyycmq04s6dmg0ndgx";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-default
          dependent-map dependent-sum dependent-sum-template directory
          exception-transformers ghcjs-dom glib gtk3 lens mtl ref-tf reflex
@@ -108242,7 +111016,7 @@ self: {
        pname = "reflex-dom-contrib";
        version = "0.1";
        sha256 = "1xqw1i5wldfamjyav7fbw3001hdnbj4x3phlr216ybw3ndxrjklc";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-default ghcjs-base
          ghcjs-dom http-types lens mtl readable reflex reflex-dom
          string-conv text time
@@ -108261,7 +111035,9 @@ self: {
        pname = "reflex-gloss";
        version = "0.1.0.2";
        sha256 = "18sbqryf6kxadgbvr6nh0f07897fq9fjj0h2w07xcdpp1ygg1nfg";
-       buildDepends = [ base dependent-sum gloss reflex transformers ];
+       libraryHaskellDepends = [
+         base dependent-sum gloss reflex transformers
+       ];
        homepage = "https://github.com/reflex-frp/reflex-gloss";
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
@@ -108273,7 +111049,7 @@ self: {
        pname = "reform";
        version = "0.2.7";
        sha256 = "0jjbcc88ffv6nqj0jbgb54bin0k5hh4w1i44xh3vdv00s7aj3abm";
-       buildDepends = [ base containers mtl text ];
+       libraryHaskellDepends = [ base containers mtl text ];
        homepage = "http://www.happstack.com/";
        description = "reform is an HTML form generation and validation library";
        license = stdenv.lib.licenses.bsd3;
@@ -108285,7 +111061,9 @@ self: {
        pname = "reform-blaze";
        version = "0.2.4";
        sha256 = "124hvgjhb2x6769qnwwjw30qmramh54pmggpqmj0dc8m473psfjy";
-       buildDepends = [ base blaze-html blaze-markup reform text ];
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup reform text
+       ];
        homepage = "http://www.happstack.com/";
        description = "Add support for using blaze-html with Reform";
        license = stdenv.lib.licenses.bsd3;
@@ -108297,7 +111075,9 @@ self: {
        pname = "reform-hamlet";
        version = "0.0.4";
        sha256 = "1f8rh9wiax6g7kh1j0j2zmqr7n1ll9ijn2xqp1shhsq8vp30f8fg";
-       buildDepends = [ base blaze-markup reform shakespeare text ];
+       libraryHaskellDepends = [
+         base blaze-markup reform shakespeare text
+       ];
        jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Add support for using Hamlet with Reform";
@@ -108312,7 +111092,7 @@ self: {
        pname = "reform-happstack";
        version = "0.2.5";
        sha256 = "12asmp1bklk33rpbhwhpbvmnkssjll92l47qxywibnpdf0zc6xsc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring happstack-server mtl random reform text utf8-string
        ];
        homepage = "http://www.happstack.com/";
@@ -108326,7 +111106,7 @@ self: {
        pname = "reform-hsp";
        version = "0.2.6";
        sha256 = "0aigsrax7s5ys0w2kd52jqi3453q81f4yp6c1s84a383yqndyq1j";
-       buildDepends = [ base hsp hsx2hs reform text ];
+       libraryHaskellDepends = [ base hsp hsx2hs reform text ];
        homepage = "http://www.happstack.com/";
        description = "Add support for using HSP with Reform";
        license = stdenv.lib.licenses.bsd3;
@@ -108340,8 +111120,8 @@ self: {
        pname = "regex-applicative";
        version = "0.3.2.1";
        sha256 = "19swnf6mqjxg7d1wxr4h9drjm51af4hj4ax712n8702xfvfb4jmz";
-       buildDepends = [ base containers transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers transformers ];
+       testHaskellDepends = [
          base containers smallcheck tasty tasty-hunit tasty-smallcheck
          transformers
        ];
@@ -108356,7 +111136,7 @@ self: {
        pname = "regex-base";
        version = "0.93.2";
        sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10";
-       buildDepends = [ array base bytestring containers mtl ];
+       libraryHaskellDepends = [ array base bytestring containers mtl ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108368,7 +111148,7 @@ self: {
        pname = "regex-compat";
        version = "0.95.1";
        sha256 = "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m";
-       buildDepends = [ array base regex-base regex-posix ];
+       libraryHaskellDepends = [ array base regex-base regex-posix ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108380,7 +111160,7 @@ self: {
        pname = "regex-compat-tdfa";
        version = "0.95.1.4";
        sha256 = "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg";
-       buildDepends = [ array base regex-base regex-tdfa ];
+       libraryHaskellDepends = [ array base regex-base regex-tdfa ];
        homepage = "http://hub.darcs.net/shelarcy/regex-compat-tdfa";
        description = "Unicode Support version of Text.Regex, using regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
@@ -108395,7 +111175,7 @@ self: {
        pname = "regex-deriv";
        version = "0.0.4";
        sha256 = "0anj0az7q3fzdxknc83vci3nm5w0wj54w77xz2jphcbmn9ix9s4c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bitset bytestring containers deepseq dequeue ghc-prim hashable
          hashtables mtl parallel parsec regex-base
        ];
@@ -108411,7 +111191,7 @@ self: {
        pname = "regex-dfa";
        version = "0.91";
        sha256 = "1f846d86wg7yha29qinchpi3r5gv9795f384pqahbyc13wfky7dp";
-       buildDepends = [ base mtl parsec regex-base ];
+       libraryHaskellDepends = [ base mtl parsec regex-base ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108426,7 +111206,7 @@ self: {
        pname = "regex-easy";
        version = "0.1.0.0";
        sha256 = "1062h3zd0bxak7rins7kk8n95ic04z5l9zqhg22h0iq5csapllf9";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring regex-pcre string-conversions
        ];
        homepage = "https://github.com/zerobuzz/regex-easy";
@@ -108444,9 +111224,10 @@ self: {
        sha256 = "1816zmlh1bmxykvjp1q2viqckjvcj2g9b11ggz31ja5xi2mwc9iq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers logict mtl regex-tdfa sbv stream-monad text
        ];
+       executableHaskellDepends = [ base containers mtl regex-tdfa sbv ];
        jailbreak = true;
        homepage = "https://github.com/audreyt/regex-genex";
        description = "From a regex, generate all possible strings it can match";
@@ -108460,7 +111241,7 @@ self: {
        pname = "regex-parsec";
        version = "0.90";
        sha256 = "0zf5cr10mxlxxd8fp4q4ix6ibxc5xx3ml3k043kx28f9vfdh2xnx";
-       buildDepends = [ base parsec regex-base ];
+       libraryHaskellDepends = [ base parsec regex-base ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108475,8 +111256,10 @@ self: {
        pname = "regex-pcre";
        version = "0.94.4";
        sha256 = "1h16w994g9s62iwkdqa7bar2n9cfixmkzz2rm8svm960qr57valf";
-       buildDepends = [ array base bytestring containers regex-base ];
-       extraLibraries = [ pcre ];
+       libraryHaskellDepends = [
+         array base bytestring containers regex-base
+       ];
+       librarySystemDepends = [ pcre ];
        homepage = "http://hackage.haskell.org/package/regex-pcre";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108488,7 +111271,9 @@ self: {
        pname = "regex-pcre-builtin";
        version = "0.94.4.8.8.35";
        sha256 = "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b";
-       buildDepends = [ array base bytestring containers regex-base ];
+       libraryHaskellDepends = [
+         array base bytestring containers regex-base
+       ];
        homepage = "http://hackage.haskell.org/package/regex-pcre";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108502,7 +111287,7 @@ self: {
        pname = "regex-pderiv";
        version = "0.1.3";
        sha256 = "1jh7ksv3cgsjd0f51yyrs2kvji1wyi9qk2ysavh3w34nkgyxmg55";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bitset bytestring containers deepseq ghc-prim mtl parallel
          parsec regex-base
        ];
@@ -108518,7 +111303,9 @@ self: {
        pname = "regex-posix";
        version = "0.95.2";
        sha256 = "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an";
-       buildDepends = [ array base bytestring containers regex-base ];
+       libraryHaskellDepends = [
+         array base bytestring containers regex-base
+       ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108534,7 +111321,7 @@ self: {
        sha256 = "0kcxsdn5lgmpfrkpkygr54jrnjqd93b12shb00n6j00rg7p755vx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers mtl regex-base regex-posix
        ];
        description = "Unit tests for the plaform's Posix regex library";
@@ -108548,10 +111335,10 @@ self: {
      mkDerivation {
        pname = "regex-tdfa";
        version = "1.2.0";
-       revision = "1";
        sha256 = "00gl9sx3hzd83lp38jlcj7wvzrda8kww7njwlm1way73m8aar0pw";
+       revision = "1";
        editedCabalFile = "5489b69b9f0e8e181ee5134fd500bb0e2b4f914234c5223c59186035fb50478e";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
        homepage = "http://hackage.haskell.org/package/regex-tdfa";
@@ -108567,7 +111354,7 @@ self: {
        pname = "regex-tdfa-rc";
        version = "1.1.8.3";
        sha256 = "1vi11i23gkkjg6193ak90g55akj69bhahy542frkwb68haky4pp3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
        homepage = "http://hackage.haskell.org/package/regex-tdfa";
@@ -108580,13 +111367,12 @@ self: {
      mkDerivation {
        pname = "regex-tdfa-text";
        version = "1.0.0.2";
-       revision = "2";
        sha256 = "1p17xv3j2xd74iilyqwlqhkmyp26asq4k1pb0h2f0wdqqfr87bfd";
+       revision = "2";
        editedCabalFile = "4b0e54f79540143c88adb071ea8e0aa3734a625db026a6a44ca2ef45b870b07c";
-       buildDepends = [ array base regex-base regex-tdfa text ];
+       libraryHaskellDepends = [ array base regex-base regex-tdfa text ];
        description = "Text interface for regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-tdfa-unittest" = callPackage
@@ -108599,7 +111385,7 @@ self: {
        sha256 = "1b9cca3l46qxvc5ck3z27dg6w1888pabkk0q752bzjqr3fc4nidc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers mtl regex-base regex-tdfa
        ];
        description = "Unit tests for the regex-tdfa";
@@ -108614,7 +111400,7 @@ self: {
        pname = "regex-tdfa-utf8";
        version = "1.0";
        sha256 = "0i5di03v9dsvvhz8mdfx5qba8zcpim0fpx1cjg9gvz4gh0yhqf4k";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring regex-base regex-tdfa utf8-string
        ];
        description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings";
@@ -108628,8 +111414,8 @@ self: {
        pname = "regex-tre";
        version = "0.91";
        sha256 = "1b7x0y8q1fvipnzh06by48f8l9l5ypm6yblpl35fzf641z3m9b7j";
-       buildDepends = [ base regex-base ];
-       extraLibraries = [ tre ];
+       libraryHaskellDepends = [ base regex-base ];
+       librarySystemDepends = [ tre ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
@@ -108642,7 +111428,7 @@ self: {
        pname = "regex-xmlschema";
        version = "0.1.5";
        sha256 = "1dmhvnz6sj80kdnm2v7n0lvx8g9arhf9pqqzkn0rwzfhr2by0ss4";
-       buildDepends = [ base haskell98 parsec ];
+       libraryHaskellDepends = [ base haskell98 parsec ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
        description = "A regular expression library for W3C XML Schema regular expressions";
@@ -108660,9 +111446,11 @@ self: {
        sha256 = "1f1yb3h43pr38c7j3zs2jmph33arc828q1hbsmlz2xh4krdrc0vc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base Cabal containers parallel parsec QuickCheck regex-base
-         regex-posix regexdot toolshed
+       libraryHaskellDepends = [
+         base containers parsec regexdot toolshed
+       ];
+       executableHaskellDepends = [
+         array Cabal parallel QuickCheck regex-base regex-posix
        ];
        homepage = "http://functionalley.eu";
        description = "A POSIX, extended regex-engine";
@@ -108675,7 +111463,7 @@ self: {
        pname = "regexdot";
        version = "0.11.1.1";
        sha256 = "1nrbqlxlkppi6q7w7ypq47saskxdx9a127dcwkl2azzz5082yf8j";
-       buildDepends = [ base deepseq parallel parsec toolshed ];
+       libraryHaskellDepends = [ base deepseq parallel parsec toolshed ];
        homepage = "http://functionalley.eu";
        description = "A polymorphic, POSIX, extended regex-engine";
        license = "GPL";
@@ -108689,7 +111477,7 @@ self: {
        pname = "regexp-tries";
        version = "0.2";
        sha256 = "16spdq22dsblksvpd85cm6bmjd9053znphw6na1iy9pkmc491v1l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers derive-trie template-haskell weighted-regexp
        ];
        jailbreak = true;
@@ -108705,7 +111493,7 @@ self: {
        pname = "regexpr";
        version = "0.5.4";
        sha256 = "0136wp6hrnmj6pbdhp3a131dzz8bp1pbd92bpagpv1r6gwj16y5z";
-       buildDepends = [ base HUnit mtl mtlparse ];
+       libraryHaskellDepends = [ base HUnit mtl mtlparse ];
        homepage = "http://homepage3.nifty.com/salamander/second/projects/regexpr/";
        description = "regular expression like Perl/Ruby in Haskell";
        license = "LGPL";
@@ -108717,7 +111505,7 @@ self: {
        pname = "regexpr-symbolic";
        version = "0.5";
        sha256 = "1cpwvb5mmcaqwy617m6cr25pcb4v4yxwzxng82bcrwkhjfdklsdr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://sulzmann.blogspot.com/2008/12/equality-containment-and-intersection.html";
        description = "Regular expressions via symbolic manipulation";
@@ -108730,7 +111518,9 @@ self: {
        pname = "regexqq";
        version = "0.6";
        sha256 = "10vh4i7q9vf6b716hf2i9pv1dy6vlyrh8bybqh91i704a55m40f3";
-       buildDepends = [ base bytestring pcre-light template-haskell ];
+       libraryHaskellDepends = [
+         base bytestring pcre-light template-haskell
+       ];
        homepage = "http://code.haskell.org/~morrow/code/haskell/regexqq";
        description = "A quasiquoter for PCRE regexes";
        license = stdenv.lib.licenses.bsd3;
@@ -108744,7 +111534,9 @@ self: {
        pname = "regional-pointers";
        version = "0.7";
        sha256 = "1v71k64is86yc19n96062wl8f382xna1vnm0spcmr9jx6x3wyqv2";
-       buildDepends = [ base base-unicode-symbols regions transformers ];
+       libraryHaskellDepends = [
+         base base-unicode-symbols regions transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/regional-pointers/";
        description = "Regional memory pointers";
@@ -108760,7 +111552,7 @@ self: {
        pname = "regions";
        version = "0.11";
        sha256 = "1l4wi4vziw0d0vaagbknf8bsvh4irqxls6qbhcg8ngpn62a0fa7p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols monad-control transformers
        ];
        jailbreak = true;
@@ -108778,7 +111570,7 @@ self: {
        pname = "regions-monadsfd";
        version = "0.3.1.3";
        sha256 = "13xyigw1f92bzppqrl96wbz36j9cwrsaxdb2vkg8sjjvnirly3h9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-unicode-symbols monads-fd regions transformers
        ];
        jailbreak = true;
@@ -108795,7 +111587,7 @@ self: {
        pname = "regions-monadstf";
        version = "0.3.1.7";
        sha256 = "0r4fr3p2k4k8r1lw6la7h4al068xf5kzb8cgq5864rlkrgf53fxb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-unicode-symbols monads-tf regions transformers
        ];
        jailbreak = true;
@@ -108811,7 +111603,7 @@ self: {
        pname = "regions-mtl";
        version = "0.3.1.7";
        sha256 = "1s0sr42k1kmwgmrnj5zcan0j9br8xrrm1vdnj6yhliqdfz41ifc0";
-       buildDepends = [ base-unicode-symbols mtl regions ];
+       libraryHaskellDepends = [ base-unicode-symbols mtl regions ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/regions-mtl/";
        description = "mtl instances for the RegionT monad transformer";
@@ -108825,7 +111617,7 @@ self: {
        pname = "regress";
        version = "0.1.1";
        sha256 = "00b4n4gw5y0mpayb0zlkvz91nfrpbspz22kqhpvdnxbb4zcz7pnj";
-       buildDepends = [ ad base vector ];
+       libraryHaskellDepends = [ ad base vector ];
        homepage = "https://github.com/alpmestan/regress";
        description = "Linear and logistic regression through automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
@@ -108837,7 +111629,7 @@ self: {
        pname = "regular";
        version = "0.3.4.4";
        sha256 = "112n3j27ac9lzs0lc3q12r6wmpkmfgdalv18h1qklhd5nh4j9wl5";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "Generic programming library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108848,7 +111640,7 @@ self: {
        pname = "regular-extras";
        version = "0.2.3";
        sha256 = "0x1sbps0ccwpvf6fx1jnbjxylqsvvfzkkynliip9jyh6gkhm44vx";
-       buildDepends = [ base binary deepseq QuickCheck regular ];
+       libraryHaskellDepends = [ base binary deepseq QuickCheck regular ];
        jailbreak = true;
        description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put";
        license = stdenv.lib.licenses.bsd3;
@@ -108863,7 +111655,7 @@ self: {
        pname = "regular-web";
        version = "0.1.1";
        sha256 = "0f4lsly4497p7szibasin27hf2xy5cs8gp87vsbg6mlkk07bvysz";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-extras base fclabels formlets json mtl regular xhtml
        ];
        jailbreak = true;
@@ -108879,7 +111671,7 @@ self: {
        pname = "regular-xmlpickler";
        version = "0.2";
        sha256 = "1qjx4xsidnpr2as3m2ir97ap5vc9cw6a0z332g53ifx9gskjli9f";
-       buildDepends = [ base hxt regular text ];
+       libraryHaskellDepends = [ base hxt regular text ];
        homepage = "http://github.com/silkapp/regular-xmlpickler";
        description = "Generic generation of HXT XmlPickler instances using Regular";
        license = stdenv.lib.licenses.bsd3;
@@ -108893,8 +111685,8 @@ self: {
        sha256 = "0m6s6r2d39g3qkjylsrhixk9l9sb2jv0ihxwjn7b0wz7585g2bdv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory text vty vty-ui ];
-       testDepends = [ base directory QuickCheck text vty vty-ui ];
+       executableHaskellDepends = [ base directory text vty vty-ui ];
+       testHaskellDepends = [ base directory QuickCheck text vty vty-ui ];
        homepage = "https://github.com/mrVanDalo/reheat";
        description = "to make notes and reduce impact on idle time on writing other programms";
        license = "GPL";
@@ -108911,7 +111703,7 @@ self: {
        sha256 = "0pwmz1q2866yj8hxbvha4v1smhppkd3jsrrhbhmbxw137l54ijgf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs parallel-io shelly split system-filepath text
        ];
        homepage = "https://github.com/jwiegley/rehoo";
@@ -108929,13 +111721,14 @@ self: {
        sha256 = "17ldmx351b54fxmiw3z89v7cs6p33x09k2aav7jphqgv2520phyv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base bytestring containers directory regex-posix split
        ];
        jailbreak = true;
        homepage = "https://github.com/kerkomen/rei";
        description = "Process lists easily";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reified-records" = callPackage
@@ -108944,7 +111737,7 @@ self: {
        pname = "reified-records";
        version = "0.2.2";
        sha256 = "0vg05idyiy3havw8rlsky7x4y34mpk6by9500r7rb921xgpdq70a";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        jailbreak = true;
        homepage = "http://bitbucket.org/jozefg/reified-records";
        description = "Reify records to Maps and back again";
@@ -108960,7 +111753,8 @@ self: {
        sha256 = "1bl4yv77i8c4w1y5lqr6b8xi1m4ym2phvdjwc9l95rx1vrxkqpk1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ghc ];
+       libraryHaskellDepends = [ base ghc ];
+       executableHaskellDepends = [ base ghc ];
        jailbreak = true;
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Serialize data";
@@ -108974,8 +111768,8 @@ self: {
        pname = "reinterpret-cast";
        version = "0.1.0";
        sha256 = "1r2k2fyfm5lknfdfs282l274bgaxf4j4dikk4hpwchjbj0n64m2n";
-       buildDepends = [ array base ];
-       testDepends = [ base data-binary-ieee754 hspec loop ];
+       libraryHaskellDepends = [ array base ];
+       testHaskellDepends = [ base data-binary-ieee754 hspec loop ];
        homepage = "https://github.com/nh2/reinterpret-cast";
        description = "Memory reinterpretation casts for Float/Double and Word32/Word64";
        license = stdenv.lib.licenses.mit;
@@ -108987,7 +111781,7 @@ self: {
        pname = "relacion";
        version = "0.1";
        sha256 = "1jq3ii9j8s7q8fr7ac2pdr2l33jvzsyyq70cjd9q1spqa1v6k976";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        homepage = "not available";
        description = "A relation data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -108999,7 +111793,7 @@ self: {
        pname = "relation";
        version = "0.2.1";
        sha256 = "03h6l8v3ppxbwg9ddgg121yx3i2v4vbcpwrv1vg3mgbw5pwq7x4c";
-       buildDepends = [ array base containers groom ];
+       libraryHaskellDepends = [ array base containers groom ];
        jailbreak = true;
        homepage = "https://www.github.com/d-day/relation/";
        description = "A data structure representing Relations on Sets";
@@ -109015,14 +111809,13 @@ self: {
        pname = "relational-postgresql8";
        version = "0.1.0.0";
        sha256 = "1fmgb7qbcbyr5simy5x6fqnib3v3cq0vsz9i720snszs7a2k1z8f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers HDBC names-th persistable-record relational-query
          relational-query-HDBC template-haskell time
        ];
        homepage = "https://github.com/yuga/haskell-relational-record-driver-postgresql8";
        description = "PostgreSQL v8.x driver for haskell-relational-record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-query" = callPackage
@@ -109034,16 +111827,17 @@ self: {
        pname = "relational-query";
        version = "0.5.1.1";
        sha256 = "1gs2ip483paqw01wipd5x5vf27l1w887dv7ah0icgjshwg84ff1p";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
          transformers
        ];
-       testDepends = [ base containers quickcheck-simple transformers ];
+       testHaskellDepends = [
+         base containers quickcheck-simple transformers
+       ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Typeful, Modular, Relational, algebraic query engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-query-HDBC" = callPackage
@@ -109055,7 +111849,7 @@ self: {
        pname = "relational-query-HDBC";
        version = "0.1.0.0";
        sha256 = "1r5lj96w8cqcmma2kh46g8xyw0zz161nv1h9bwqia21vvis396vj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers convertible HDBC HDBC-session names-th
          persistable-record relational-query relational-schemas
          template-haskell
@@ -109063,7 +111857,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "HDBC instance of relational join and typed query for HDBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-record" = callPackage
@@ -109072,11 +111865,12 @@ self: {
        pname = "relational-record";
        version = "0.1.2.0";
        sha256 = "00cb3yb4gin6kq7yz3jbkhm372z3vhq97h2l1xk0xja8xi8mfhn6";
-       buildDepends = [ base relational-query relational-query-HDBC ];
+       libraryHaskellDepends = [
+         base relational-query relational-query-HDBC
+       ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Meta package of Relational Record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-record-examples" = callPackage
@@ -109090,13 +111884,12 @@ self: {
        sha256 = "0jpzn739xl1ylz6aja1czvkg4gjbgkag56pcja31mfx9xiv5jnmf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base HDBC HDBC-session HDBC-sqlite3 names-th persistable-record
          relational-query relational-query-HDBC template-haskell time
        ];
        description = "Examples of Haskell Relationa Record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-schemas" = callPackage
@@ -109107,14 +111900,13 @@ self: {
        pname = "relational-schemas";
        version = "0.1.0.2";
        sha256 = "1267bv92z2k8s2cmn8sgw0i0vs3y2m8jyvnv969v15lrpsid1vvw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers persistable-record relational-query
          template-haskell time
        ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "RDBMSs' schema templates for relational-query";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relative-date" = callPackage
@@ -109124,11 +111916,12 @@ self: {
        pname = "relative-date";
        version = "0.0.1";
        sha256 = "052rk17flm5zp70wcl7ki3ys47hnaa2d5c1vjsap7bfkcg4lff66";
-       buildDepends = [ base concatenative datetime mtl parsec time ];
+       libraryHaskellDepends = [
+         base concatenative datetime mtl parsec time
+       ];
        jailbreak = true;
        description = "Durations and generalized time parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relit" = callPackage
@@ -109137,7 +111930,7 @@ self: {
        pname = "relit";
        version = "0.1.3";
        sha256 = "03cnra0yfpijp65p1x0wv4fvc1p1l27lcb00k22ijrcy2mxqr9cg";
-       buildDepends = [ base regex-base template-haskell ];
+       libraryHaskellDepends = [ base regex-base template-haskell ];
        description = "Literal for regular expression";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -109148,8 +111941,8 @@ self: {
        pname = "rematch";
        version = "0.2.0.0";
        sha256 = "0law4al9hzn9qljfm8rwgmb15pzpcs8i44v1l6279977q0lxx5pr";
-       buildDepends = [ base ];
-       testDepends = [ base hspec HUnit ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec HUnit ];
        description = "A simple api for matchers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -109160,8 +111953,8 @@ self: {
        pname = "rematch-text";
        version = "0.1.0.2";
        sha256 = "0q8jf7128360waq6k369ykp0hfjwydkm7f8ykwzd8xflmgfiywfd";
-       buildDepends = [ base rematch text ];
-       testDepends = [ base hspec HUnit rematch text ];
+       libraryHaskellDepends = [ base rematch text ];
+       testHaskellDepends = [ base hspec HUnit rematch text ];
        description = "`rematch` matchers for Data.Text";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -109175,7 +111968,7 @@ self: {
        pname = "remote";
        version = "0.1.1";
        sha256 = "14awzhpc21pp4iq53vz4ib81ygxsnlnfppv723zy77z6jja08gf0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory filepath mtl network
          pureMD5 stm syb template-haskell time utf8-string
        ];
@@ -109192,7 +111985,9 @@ self: {
        sha256 = "0mgq2n92d4xk6yqzrbghlp0h18nmkyhxnv5zynrqykfw5h9xl0f8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base ghc ghc-paths json network ];
+       executableHaskellDepends = [
+         array base ghc ghc-paths json network
+       ];
        jailbreak = true;
        homepage = "https://github.com/octomarat/HaskellDebugger";
        description = "Interface to ghci debugger";
@@ -109213,14 +112008,14 @@ self: {
        pname = "remotion";
        version = "0.2.0";
        sha256 = "0m7x5i00i6ai39yii6h5vzlsp1rnmprmddqllqja57kdy3q7v7na";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring concurrent-extra containers directory errors
          filelock hashable hashtables lifted-async loch-th monad-control mtl
          network network-simple old-locale pipes pipes-bytestring
          pipes-cereal-plus pipes-network pipes-parse placeholders stm
          system-fileio system-filepath text time transformers-base
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring concurrent-extra containers directory errors
          filelock hashable hashtables HTF HUnit lifted-async loch-th
          monad-control mtl network network-simple old-locale pipes
@@ -109241,7 +112036,7 @@ self: {
        pname = "reord";
        version = "0.0.0.2";
        sha256 = "07lxnfj0q565ydjzgcnb9dhjlrs7s1h6ybam7aic68lfd4p0hr7y";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Ad-hoc Ord instances";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -109254,7 +112049,7 @@ self: {
        pname = "reorderable";
        version = "0.3.1";
        sha256 = "1i81yran553jdsyx0bx5g72dg6v24yk3g6l40m1cd430f8yy8a6f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints haskell-src-exts haskell-src-meta template-haskell
        ];
        jailbreak = true;
@@ -109271,7 +112066,7 @@ self: {
        pname = "repa";
        version = "3.4.0.1";
        sha256 = "197ab7z0fi50n3i8lkcxqazgnv39dv8dhndzihppsmfkil5y58l4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
        homepage = "http://repa.ouroborus.net";
@@ -109280,17 +112075,16 @@ self: {
      }) {};
 
   "repa-algorithms" = callPackage
-    ({ mkDerivation, base, llvm, repa, vector }:
+    ({ mkDerivation, base, repa, vector }:
      mkDerivation {
        pname = "repa-algorithms";
        version = "3.4.0.1";
        sha256 = "0q8jwp1msg5icvcqxszh5c1190llwz17gxc7nmd1bkyca59j8w0l";
-       buildDepends = [ base repa vector ];
-       extraLibraries = [ llvm ];
+       libraryHaskellDepends = [ base repa vector ];
        homepage = "http://repa.ouroborus.net";
        description = "Algorithms using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (self.llvmPackages) llvm;};
+     }) {};
 
   "repa-array" = callPackage
     ({ mkDerivation, base, bytestring, double-conversion, mtl
@@ -109300,7 +112094,7 @@ self: {
        pname = "repa-array";
        version = "4.1.0.1";
        sha256 = "04bi2j2y5rrpkfzys6ma0d5fhsrapip0xb43gqsgcqz3rk89lank";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring double-conversion mtl primitive repa-convert
          repa-eval repa-stream text vector
        ];
@@ -109317,7 +112111,7 @@ self: {
        pname = "repa-bytestring";
        version = "3.0.0.1";
        sha256 = "1q7kvm39iqabanrgyi438n8mfn1ikvpygralyakfc02rm2gpl0gb";
-       buildDepends = [ base repa ];
+       libraryHaskellDepends = [ base repa ];
        jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "(deprecated)";
@@ -109333,7 +112127,7 @@ self: {
        pname = "repa-convert";
        version = "4.2.0.1";
        sha256 = "0y7xjcbrm2g3rgppb9lqbj4m1l7bvir12gjg11a18fkl1mzdh89l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring double-conversion primitive repa-scalar vector
        ];
        homepage = "http://repa.ouroborus.net";
@@ -109347,8 +112141,8 @@ self: {
        pname = "repa-devil";
        version = "0.3.2.6";
        sha256 = "0f7xawg4qlfbf24lrjbpqzl3f3zf63f8g5b2gi17h0rpyw3cxhzy";
-       buildDepends = [ base repa transformers ];
-       extraLibraries = [ libdevil ];
+       libraryHaskellDepends = [ base repa transformers ];
+       librarySystemDepends = [ libdevil ];
        homepage = "https://github.com/RaphaelJ/repa-devil";
        description = "Support for image reading and writing of Repa arrays using in-place FFI calls";
        license = stdenv.lib.licenses.bsd3;
@@ -109360,7 +112154,7 @@ self: {
        pname = "repa-eval";
        version = "4.0.0.1";
        sha256 = "0vng0y835gma937q1996qghfzx06wabxf7ln8ckrwy5djzza8h9y";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Low-level parallel operators on bulk random-accessble arrays";
@@ -109368,8 +112162,8 @@ self: {
      }) {};
 
   "repa-examples" = callPackage
-    ({ mkDerivation, base, llvm, QuickCheck, random, repa
-     , repa-algorithms, repa-io, template-haskell, vector
+    ({ mkDerivation, base, QuickCheck, random, repa, repa-algorithms
+     , repa-io, template-haskell, vector
      }:
      mkDerivation {
        pname = "repa-examples";
@@ -109377,15 +112171,14 @@ self: {
        sha256 = "00v1z4kscvmnd4k7lsswzaxafkk7mbsy4ghdd503wpvr4fvslgaz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base QuickCheck random repa repa-algorithms repa-io
          template-haskell vector
        ];
-       extraLibraries = [ llvm ];
        homepage = "http://repa.ouroborus.net";
        description = "Examples using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (self.llvmPackages) llvm;};
+     }) {};
 
   "repa-fftw" = callPackage
     ({ mkDerivation, base, carray, fft, repa, storable-complex, tasty
@@ -109395,8 +112188,10 @@ self: {
        pname = "repa-fftw";
        version = "3.2.3.2";
        sha256 = "0y05hjysf484nfdr2qs1mbs7znxi58q9f0kxfnkcbskijwxnj320";
-       buildDepends = [ base carray fft repa storable-complex ];
-       testDepends = [ base repa tasty tasty-hunit tasty-quickcheck ];
+       libraryHaskellDepends = [ base carray fft repa storable-complex ];
+       testHaskellDepends = [
+         base repa tasty tasty-hunit tasty-quickcheck
+       ];
        description = "Perform fft with repa via FFTW";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -109409,7 +112204,7 @@ self: {
        pname = "repa-flow";
        version = "4.1.0.1";
        sha256 = "0d3j4wc3f0rbxmmj2hq9m8m9hjnad6siard279xs7sd4qzwkcpg7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath primitive repa-array
          repa-eval repa-stream text vector
        ];
@@ -109428,7 +112223,9 @@ self: {
        pname = "repa-io";
        version = "3.4.0.1";
        sha256 = "06ks4gxsajnalxh9mpnl4pckxnyfc59823war3m74anb0pqcrbbl";
-       buildDepends = [ base binary bmp bytestring old-time repa vector ];
+       libraryHaskellDepends = [
+         base binary bmp bytestring old-time repa vector
+       ];
        homepage = "http://repa.ouroborus.net";
        description = "Read and write Repa arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
@@ -109440,7 +112237,7 @@ self: {
        pname = "repa-linear-algebra";
        version = "0.0.0.0";
        sha256 = "1y16rmdygxay46xbm617g944aazml48izzmkx46avvqvjyql96w1";
-       buildDepends = [ base hmatrix repa vector ];
+       libraryHaskellDepends = [ base hmatrix repa vector ];
        homepage = "https://github.com/marcinmrotek/repa-linear-algebra";
        description = "HMatrix operations for Repa";
        license = stdenv.lib.licenses.bsd3;
@@ -109454,7 +112251,7 @@ self: {
        pname = "repa-plugin";
        version = "1.0.0.1";
        sha256 = "0s644rlk6sqz8sb2rwak42153xxsp5vjpqhlxnmbic0b7r67s8y9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ddc-base ddc-core ddc-core-flow ddc-core-simpl ghc
          mtl
        ];
@@ -109472,7 +112269,7 @@ self: {
        pname = "repa-scalar";
        version = "4.2.0.1";
        sha256 = "1mby4xa0i2jrzhiyvayif6bwxsmfz1ibvigxw8kwxjd5hqc0y6f6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring double-conversion primitive vector
        ];
        homepage = "http://repa.ouroborus.net";
@@ -109486,7 +112283,7 @@ self: {
        pname = "repa-series";
        version = "1.0.0.1";
        sha256 = "1kldz4d4cv0vliqw78ywbcfgh0mw4i5cd93j0jdagvhsbhlxlp5k";
-       buildDepends = [ base ghc ghc-prim vector ];
+       libraryHaskellDepends = [ base ghc ghc-prim vector ];
        jailbreak = true;
        description = "Series Expressionss API";
        license = stdenv.lib.licenses.bsd3;
@@ -109503,8 +112300,11 @@ self: {
        sha256 = "0pgrdhi7s1capainmd6hq1h8wjzppyr8fn93fzygwjpvnnhfggk8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base hsndfile hsndfile-vector repa vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base hsndfile repa ];
+       executableHaskellDepends = [
+         base hsndfile hsndfile-vector repa vector
+       ];
+       testHaskellDepends = [
          base directory filepath hsndfile hsndfile-vector repa vector
        ];
        description = "Reading and writing sound files with repa arrays";
@@ -109517,7 +112317,7 @@ self: {
        pname = "repa-stream";
        version = "4.1.0.1";
        sha256 = "17n48ixypx5a3anj212h4vxa6sqwk5yssjqyprb8lb3mnqfdlxmm";
-       buildDepends = [ base mtl primitive vector ];
+       libraryHaskellDepends = [ base mtl primitive vector ];
        jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Stream functions not present in the vector library";
@@ -109534,10 +112334,11 @@ self: {
        sha256 = "1d8spppfjbcb9smk735zxgpz1v1f5p1sm50nfzry68bdb1p29xnz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bmp bytestring containers deepseq gloss mtl repa transformers
-         v4l2 vector
+       libraryHaskellDepends = [
+         base bmp bytestring containers deepseq mtl repa transformers v4l2
+         vector
        ];
+       executableHaskellDepends = [ base gloss repa ];
        homepage = "https://github.com/cgo/hsimage";
        description = "Provides high-level access to webcams";
        license = "LGPL";
@@ -109550,7 +112351,9 @@ self: {
        pname = "repl";
        version = "1.1";
        sha256 = "0q9gk76r9n8gyn8fwqfmywbrjhyqy0gz8blmmvrvwghyfscabnh9";
-       buildDepends = [ base ghc ghc-paths haskell-src-exts parsec ];
+       libraryHaskellDepends = [
+         base ghc ghc-paths haskell-src-exts parsec
+       ];
        jailbreak = true;
        homepage = "https://github.com/mikeplus64/repl";
        description = "IRC friendly REPL library";
@@ -109568,7 +112371,7 @@ self: {
        pname = "repl-toolkit";
        version = "0.5.0.0";
        sha256 = "0m0jh734zfmxc2bfilb1ka12y3nhsm94hxcg0q6wwf6bxkl564vq";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default directory exceptions filepath
          functor-monadic ListLike listsafe monad-loops mtl numericpeano
          parsec semigroupoids text transformers
@@ -109586,7 +112389,8 @@ self: {
        sha256 = "16qi3lpgymn61nssv9k21v889xszycimp6i5602llnry6ks77bij";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers haskeline mtl process ];
+       libraryHaskellDepends = [ base containers haskeline mtl ];
+       executableHaskellDepends = [ base containers mtl process ];
        description = "Haskeline wrapper for GHCi-like REPL interfaces";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -109603,12 +112407,13 @@ self: {
        sha256 = "0ada0xqpkp6ch71sizf8fscvz6rjq95asmfgdvg8jj8gwpzvlncs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html containers data-default directory dyre filepath
          filestore ixset lens mtl old-locale pandoc parsec stm text time
          transformers transformers-base transformers-compat
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base blaze-html containers directory filepath filestore hspec
          hspec-discover ixset lens mtl old-locale parsec QuickCheck stm text
          time transformers transformers-base transformers-compat
@@ -109627,7 +112432,7 @@ self: {
        pname = "repr";
        version = "0.4.1.3";
        sha256 = "1y1zl81yjc9jrci83bm6bn8hrfqf6x25vxzkhrkydhhwcwqfqaj5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols dstring random string-combinators
        ];
        jailbreak = true;
@@ -109643,7 +112448,7 @@ self: {
        pname = "repr-tree-syb";
        version = "0.1.0";
        sha256 = "1kpxfvbmfv3zhn0fx7fznnppqxjz2f70g5n89hzkiqjz2am0ls5s";
-       buildDepends = [ base containers syb text ];
+       libraryHaskellDepends = [ base containers syb text ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/repr-tree-syb";
        description = "Tree representation and pretty-printing of data structures based on SYB";
@@ -109659,7 +112464,7 @@ self: {
        pname = "representable-functors";
        version = "3.2.0.2";
        sha256 = "156rhm9hqxkwpv4ppg6647gz2q95mp61rx6ii0nk6i0ygmjvw1l2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base comonad comonad-transformers comonads-fd containers
          contravariant distributive free keys mtl semigroupoids semigroups
          transformers
@@ -109677,7 +112482,7 @@ self: {
        pname = "representable-profunctors";
        version = "3.2";
        sha256 = "0bly94xix00krgl7iaxwb0l0bvykrm0zqz57m78p8j7pdmkr89wc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/representable-profunctors/";
        description = "This package has been absorbed into profunctor-extras";
        license = stdenv.lib.licenses.bsd3;
@@ -109693,7 +112498,7 @@ self: {
        pname = "representable-tries";
        version = "3.0.2";
        sha256 = "07qjm04xf9qndyybph4mhjp65yjvz54pia4y8kj7wps75gjail2m";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base bifunctors comonad comonad-transformers containers
          distributive keys mtl representable-functors semigroupoids
          semigroups transformers
@@ -109711,7 +112516,7 @@ self: {
        pname = "request-monad";
        version = "0.3.0.1";
        sha256 = "1aqcsm9a3zd11k7d4nbvxsy7l35fr77z7gyhrl7rvflnixid29ws";
-       buildDepends = [ base free mtl transformers ];
+       libraryHaskellDepends = [ base free mtl transformers ];
        jailbreak = true;
        homepage = "http://github.com/nahiluhmot/request-monad";
        description = "A transformer for generic requests";
@@ -109727,11 +112532,11 @@ self: {
        pname = "reroute";
        version = "0.3.0.2";
        sha256 = "14xkkcgqbg7bddln849h2k0xrrj9hfvw2ikai81snz7dsf3mcnb8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq graph-core hashable hvect mtl path-pieces regex-compat
          text transformers unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec hvect mtl text unordered-containers vector
        ];
        homepage = "http://github.com/agrafix/reroute";
@@ -109750,11 +112555,11 @@ self: {
        sha256 = "152pngw3xrlyrq905a231hi9hg3pf5ddpcihwic496rng5hd5hj2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base base-compat bytestring directory http-kit http-types network
          process unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-compat bytestring directory hspec http-conduit http-kit
          http-types network process QuickCheck unix warp
        ];
@@ -109772,7 +112577,7 @@ self: {
        sha256 = "1d64hg2nwhqzm720w25xgb4wv2akg0kv3iwwh2ivc57zp525xpcq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base Diff directory filepath mtl process unix
        ];
        homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
@@ -109789,8 +112594,8 @@ self: {
        pname = "resource-effect";
        version = "0.1.1";
        sha256 = "085ila27irk7pflx4kgn1p364wx2hj9wlm2lvdq0ix25hv8afxnb";
-       buildDepends = [ base containers extensible-effects ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers extensible-effects ];
+       testHaskellDepends = [
          base containers extensible-effects HUnit mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -109808,7 +112613,7 @@ self: {
        sha256 = "1i33z3rr72s5z2k6j5c10vjy7nslgfn3xqgwf8w05n9m2pwhn2fv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring directory ];
+       executableHaskellDepends = [ base bytestring directory ];
        homepage = "https://bitbucket.org/tdammers/resource-embed";
        description = "Embed data files via C and FFI";
        license = stdenv.lib.licenses.mit;
@@ -109823,7 +112628,7 @@ self: {
        pname = "resource-pool";
        version = "0.2.3.2";
        sha256 = "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hashable monad-control stm time transformers transformers-base
          vector
        ];
@@ -109840,7 +112645,7 @@ self: {
        pname = "resource-pool-catchio";
        version = "0.2.1.0";
        sha256 = "0g9r6hnn01n3p2ikcfkfc4afh83pzam29zal3k2ivajpl3kramsw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hashable MonadCatchIO-transformers stm time transformers
          transformers-base vector
        ];
@@ -109857,7 +112662,7 @@ self: {
        pname = "resource-simple";
        version = "0.2";
        sha256 = "0m6jdhnq0f9anjm9bqmz3v8d0k12nkp4nks7mvhw7hjbjnkgscni";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers monad-control monad-fork mtl-evil-instances
          transformers transformers-base
        ];
@@ -109876,11 +112681,11 @@ self: {
        pname = "resourcet";
        version = "1.1.6";
        sha256 = "0zhsaaa4n8ry76vjih519a8npm2hrzk10d5asrgllcwpzmifl41y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers exceptions lifted-base mmorph monad-control mtl
          transformers transformers-base transformers-compat
        ];
-       testDepends = [ base hspec lifted-base transformers ];
+       testHaskellDepends = [ base hspec lifted-base transformers ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
@@ -109900,13 +112705,16 @@ self: {
        sha256 = "0j2xafk6rrspffmd0fxsmmz8gnmxxn3dxngh684nwj4030cg9m3r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-default-class
          exceptions fast-logger formatting HList http-media http-types lens
          monad-control monad-logger mtl path-pieces safe scientific
          template-haskell text time transformers transformers-base
          unordered-containers vector wai wai-extra warp
        ];
+       executableHaskellDepends = [
+         aeson base fast-logger http-types text wai
+       ];
        jailbreak = true;
        homepage = "https://github.com/raptros/respond";
        description = "process and route HTTP requests and generate responses on top of WAI";
@@ -109925,7 +112733,7 @@ self: {
        pname = "rest-client";
        version = "0.5.0.3";
        sha256 = "02lgdjn4800301w8cki2wyl65jzc4yp4gxrhz5lwv9jcy69gbkkb";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson-utils base bytestring case-insensitive data-default
          exceptions http-conduit http-types hxt hxt-pickle-utils
          monad-control mtl resourcet rest-types tostring transformers
@@ -109947,14 +112755,14 @@ self: {
        pname = "rest-core";
        version = "0.36.0.5";
        sha256 = "1xvhhj03kyv39w8s330gn3pxz4431xmcbiacf6y8a4d0nd6fw8qf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-utils base bytestring case-insensitive errors fclabels
          hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random
          rest-stringmap rest-types safe split text transformers
          transformers-compat unordered-containers uri-encode utf8-string
          uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit mtl test-framework test-framework-hunit
          transformers transformers-compat unordered-containers
        ];
@@ -109974,11 +112782,14 @@ self: {
        sha256 = "13mq7zhjwp57rials06kkj8aq400wapldl5mc35h1xynm396xmpi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers filepath generic-aeson generic-xmlpickler hxt
-         json-schema mtl rest-core rest-gen safe stm text time transformers
+         json-schema mtl rest-core safe stm text time transformers
          transformers-base transformers-compat unordered-containers
        ];
+       executableHaskellDepends = [
+         base mtl rest-core rest-gen transformers-compat
+       ];
        jailbreak = true;
        homepage = "http://www.github.com/silkapp/rest";
        description = "Example project for rest";
@@ -109997,13 +112808,13 @@ self: {
        pname = "rest-gen";
        version = "0.17.1.2";
        sha256 = "05imgbal0b6ab1i8b1896y1qm956ci7r0xx3qnkjbb6vxdl51vaa";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
          pretty process rest-core safe scientific semigroups split text
          uniplate unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base fclabels haskell-src-exts HUnit rest-core test-framework
          test-framework-hunit
        ];
@@ -110019,7 +112830,7 @@ self: {
        pname = "rest-happstack";
        version = "0.2.10.8";
        sha256 = "0n1rc1b9vdq83ilm2s9ac96jln89g0g0img1pwg991dbm30k3v7y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers happstack-server mtl rest-core rest-gen utf8-string
        ];
        description = "Rest driver for Happstack";
@@ -110034,7 +112845,7 @@ self: {
        pname = "rest-snap";
        version = "0.1.17.18";
        sha256 = "0g8srn4b7nxyi98vn28q27li4mk7ypdgg9l66ba7z5h0bg8w2766";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive rest-core safe snap-core
          unordered-containers uri-encode utf8-string
        ];
@@ -110050,7 +112861,7 @@ self: {
        pname = "rest-stringmap";
        version = "0.2.0.6";
        sha256 = "0jjj0yam4d4w36lnxk0ci7ylb9ya48y0ag3b54k9ikyg0hps7rb6";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers hashable hxt json-schema tostring
          unordered-containers
        ];
@@ -110066,7 +112877,7 @@ self: {
        pname = "rest-types";
        version = "1.14.0.1";
        sha256 = "0chb91gb3xvfp7k4sbsp07ri2m5x26qj4q2bq0ldkxpk06jicmb4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base case-insensitive generic-aeson generic-xmlpickler hxt
          json-schema rest-stringmap text uuid
        ];
@@ -110083,7 +112894,7 @@ self: {
        pname = "rest-wai";
        version = "0.1.0.8";
        sha256 = "0r11y2rl0h2axnlqcqhdy7w0b3c207qbyhg60rr0rnm9vsqj5l5d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types mime-types
          mtl rest-core text unordered-containers wai
        ];
@@ -110101,7 +112912,7 @@ self: {
        pname = "restful-snap";
        version = "0.2";
        sha256 = "16gqbk9wl2a1ivhq30yh584h7p2vd7qvwx1rprin47amqzn5b6gc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers data-default
          digestive-functors errors heist lens mtl old-locale readable snap
          snap-core snap-extras template-haskell text time xmlhtml
@@ -110121,7 +112932,7 @@ self: {
        pname = "restricted-workers";
        version = "0.1.1";
        sha256 = "0lxipqp8nsgw07hmb4b8rfxlfmfhj0l7sg8k0042qscys92rzg9l";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring cereal data-default directory either filepath
          monad-control mtl network selinux stm text transformers
          transformers-base unix
@@ -110141,7 +112952,8 @@ self: {
        sha256 = "0hzkdg4f5h96zqznnrbjbxrzv17gz1zvd5g4a51rrpsgpngkax7x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath utf8-string ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base directory filepath utf8-string ];
        jailbreak = true;
        description = "Convert between camel case and separated words style";
        license = stdenv.lib.licenses.mit;
@@ -110154,7 +112966,7 @@ self: {
        pname = "resumable-exceptions";
        version = "0.0.0.20100920";
        sha256 = "06lzjf8dcbxks57x434n27146whryzzpwcn8bq2mclwfcrv9g3gs";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "A monad transformer for resumable exceptions";
        license = "unknown";
@@ -110172,16 +112984,16 @@ self: {
        sha256 = "09digdn4a9vsmanpj6d2wn6kh59r05cfwjk4xq22iszzjrxami6d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson attoparsec base base64-bytestring binary bytestring
-         containers data-default mtl network scientific text time
-         unordered-containers utf8-string vector
+       libraryHaskellDepends = [
+         aeson base base64-bytestring binary bytestring containers
+         data-default mtl network scientific text time unordered-containers
+         utf8-string vector
        ];
-       testDepends = [ base doctest ];
+       executableHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 2.0";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rethinkdb-client-driver" = callPackage
@@ -110194,11 +113006,11 @@ self: {
        pname = "rethinkdb-client-driver";
        version = "0.0.19";
        sha256 = "0yzmypflg133dzy5yj2jmdk450zmr237prjvnaf9343jiy143nyi";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary bytestring hashable mtl network old-locale
          scientific template-haskell text time unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec hspec-smallcheck smallcheck text time
          unordered-containers vector
        ];
@@ -110216,7 +113028,7 @@ self: {
        pname = "rethinkdb-model";
        version = "0.1.0.2";
        sha256 = "15993912bw3v09c6fiqnjcjcpd77px61kq276v1aaqdbahzpzw2q";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base mtl rethinkdb text transformers unordered-containers
        ];
        jailbreak = true;
@@ -110236,7 +113048,7 @@ self: {
        pname = "rethinkdb-wereHamster";
        version = "1.8.0.5";
        sha256 = "0wkxf1iixy9rnl2rawima61qpjz77g4w08dd13q004g6c1n0h6kq";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default ghc-prim
          mtl network protocol-buffers protocol-buffers-descriptor text time
          unordered-containers utf8-string vector
@@ -110244,7 +113056,6 @@ self: {
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "RethinkDB driver for Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "retry" = callPackage
@@ -110255,8 +113066,10 @@ self: {
        pname = "retry";
        version = "0.6";
        sha256 = "1ry2zqs5361mg5ibnd6awjpl3nl3a6ha18m0v2f28hs9kw6dnsgj";
-       buildDepends = [ base data-default-class exceptions transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base data-default-class exceptions transformers
+       ];
+       testHaskellDepends = [
          base data-default-class exceptions hspec HUnit QuickCheck time
          transformers
        ];
@@ -110274,7 +113087,7 @@ self: {
        sha256 = "1rvblmzlsyfvvvjz71ngb8l412rrr943s7pp75gqjcxnklnlc97j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base optparse-applicative process ];
+       executableHaskellDepends = [ base optparse-applicative process ];
        jailbreak = true;
        homepage = "https://github.com/dgonyeo/retryer";
        description = "Retry failed commands";
@@ -110287,7 +113100,7 @@ self: {
        pname = "rev-state";
        version = "0.1";
        sha256 = "1lsq7b225v86rwm2rnrnhn28asjh6r3zwbvdm5vl4sp46cr5i4cf";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/DanBurton/rev-state#readme";
        description = "Reverse State monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -110301,7 +113114,7 @@ self: {
        sha256 = "0lbf7dclcdvy56b7wjyq3iam757wf4vic4b5qyxd4bffk66q3asm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base old-time ];
+       executableHaskellDepends = [ base old-time ];
        description = "A French revolutionary decimal time (metric) clock";
        license = "GPL";
      }) {};
@@ -110312,7 +113125,7 @@ self: {
        pname = "reverse-apply";
        version = "2.0.1";
        sha256 = "0iw1j2xr5dy29a1bwcg7fqk3lv72izr0nhj31rn45w53py1367nb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Standard version of the reverse apply operator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110325,7 +113138,7 @@ self: {
        pname = "reverse-geocoding";
        version = "0.2.1";
        sha256 = "089p1fv1ghznfsnhw1bdnwna3hcxmmqakw2qgzg91w5gifzaf18s";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
        jailbreak = true;
@@ -110342,7 +113155,7 @@ self: {
        sha256 = "1dddlldp55c6l7g5n2gi8r1r0f8r6r3ipq9mlx11d54j8wmvvlnz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base process ];
+       executableHaskellDepends = [ array base process ];
        jailbreak = true;
        description = "Text-only reversi (aka othelo) game";
        license = stdenv.lib.licenses.gpl3;
@@ -110356,7 +113169,9 @@ self: {
        sha256 = "10cbsjilc4nv4hi4ipb078hiy7afnjl20f9kcda15pmpmqxxywjg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring directory multiarg process ];
+       executableHaskellDepends = [
+         base bytestring directory multiarg process
+       ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/rewrite";
        description = "open file and rewrite it with new contents";
@@ -110370,7 +113185,7 @@ self: {
        pname = "rewriting";
        version = "0.2.2";
        sha256 = "0gnd8awqjnm905m29yldy3z7w7jvilj5svijz63lzmwbjknfh6bs";
-       buildDepends = [ base containers regular ];
+       libraryHaskellDepends = [ base containers regular ];
        description = "Generic rewriting library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110384,7 +113199,7 @@ self: {
        pname = "rex";
        version = "0.5.1";
        sha256 = "18g09pg7hhj052v72vncjvy900h3xhza8hl2g3akad8asn9k6jl6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers haskell-src-exts haskell-src-meta
          pcre-light template-haskell
        ];
@@ -110403,7 +113218,7 @@ self: {
        sha256 = "122hca6whzxqk3x7207k4clrrl2awy96pafq0gjwddqicny41jza";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers datetime HTTP json mtl nano-md5 xhtml
        ];
        jailbreak = true;
@@ -110418,7 +113233,7 @@ self: {
        pname = "rfc3339";
        version = "1.0.5";
        sha256 = "1p3nahcmsikrc5maf7qz45042h80m6xszx70154yq169rsqkvav0";
-       buildDepends = [ base timerep ];
+       libraryHaskellDepends = [ base timerep ];
        description = "Parse and display time according to RFC3339 (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110432,7 +113247,8 @@ self: {
        sha256 = "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
+       executableHaskellDepends = [ base bytestring containers ];
        description = "Simple unicode collation as per RFC5051";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110447,7 +113263,9 @@ self: {
        sha256 = "08ddm1pxi7qdjz2mgvjvwdgxyskvac4ahi3jp2fd8z1sh68c7x7s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base call containers lens mtl objective split ];
+       executableHaskellDepends = [
+         base call containers lens mtl objective split
+       ];
        homepage = "https://github.com/fumieval/rhythm-game-tutorial";
        description = "Haskell rhythm game tutorial";
        license = stdenv.lib.licenses.bsd3;
@@ -110464,12 +113282,12 @@ self: {
        pname = "riak";
        version = "0.8.0.0";
        sha256 = "16ncq22vhg62p1v1ch1jc1z3xds1qsr536fg3awvp7a0a8vyq528";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base binary blaze-builder bytestring containers
          monad-control network protocol-buffers-fork pureMD5 random
          resource-pool riak-protobuf text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
@@ -110487,7 +113305,7 @@ self: {
        pname = "riak-protobuf";
        version = "0.19.0.0";
        sha256 = "1954f8hgibmilqpf72pp2yf8nx9cm60gfk1ypmb99h69lf8d5x1y";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base parsec protocol-buffers-descriptor-fork
          protocol-buffers-fork
        ];
@@ -110503,7 +113321,7 @@ self: {
        pname = "richreports";
        version = "0.0.3.0";
        sha256 = "0mik0m6nziwm6z517wkxdmjp92nh3qz1m8yk3x5897zafgs1y5kk";
-       buildDepends = [ ascetic base MissingH ];
+       libraryHaskellDepends = [ ascetic base MissingH ];
        description = "Integrated pretty-printing and error/static analysis reporting";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -110518,11 +113336,11 @@ self: {
        pname = "riemann";
        version = "0.1.0.1";
        sha256 = "0d36ff839g7y1lm8dg5j5s1vdxr1hqbyjxh7gsfjca00a0cgy5xa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cereal containers data-default either errors lens network
          protobuf text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base either errors HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
@@ -110542,9 +113360,10 @@ self: {
        sha256 = "1970bsg1ngc6mzsyj8mapzar0h1wkdb4skfz64d0ccdfpipp5hdb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring either filepath transformers
+       libraryHaskellDepends = [
+         base binary bytestring either transformers
        ];
+       executableHaskellDepends = [ base bytestring filepath ];
        jailbreak = true;
        homepage = "https://bitbucket.org/robertmassaioli/riff/overview";
        description = "RIFF parser for Haskell";
@@ -110557,7 +113376,7 @@ self: {
        pname = "ring-buffer";
        version = "0.1.1";
        sha256 = "03v2xxj1gd35738qrhxcl0d3bx6pps4l1singb0yg1smrx5nkpp7";
-       buildDepends = [ base mtl primitive vector ];
+       libraryHaskellDepends = [ base mtl primitive vector ];
        homepage = "http://github.com/bgamari/ring-buffer";
        description = "A concurrent, mutable ring-buffer";
        license = stdenv.lib.licenses.bsd3;
@@ -110573,11 +113392,11 @@ self: {
        sha256 = "1dgdwr9d0jl3r78f4shx0ff22vqlq72n5w5whw3ppirm8ccxf0ms";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory haskell98 mtl old-locale packedstring
          process unix
        ];
-       extraLibraries = [ ncurses ];
+       executableSystemDepends = [ ncurses ];
        homepage = "http://modeemi.fi/~tuomov/riot/";
        description = "Riot is an Information Organisation Tool";
        license = "GPL";
@@ -110594,7 +113413,7 @@ self: {
        pname = "ripple";
        version = "0.3";
        sha256 = "1y19kp63chg4ljcccq6cp9n3g26x6jyyhch3jqj04ya9c16cbypw";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base58address binary bytestring cereal
          crypto-api crypto-pubkey-types cryptohash-cryptoapi ecdsa errors
          largeword text time transformers utility-ht websockets
@@ -110614,7 +113433,7 @@ self: {
        pname = "ripple-federation";
        version = "0.3";
        sha256 = "0m7mlv8qmw257hnk9lngxvq3nskninl88f5hl77r7w8r5hbymf0s";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base58address blaze-builder bytestring errors
          http-streams http-types io-streams network-uri text unexceptionalio
        ];
@@ -110633,8 +113452,8 @@ self: {
        sha256 = "0i0fkg4vys3n31jwazrajirywxmk7idjv2kz3nlb8kwriqc6d723";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers mtl pretty ];
-       buildTools = [ alex happy ];
+       executableHaskellDepends = [ array base containers mtl pretty ];
+       executableToolDepends = [ alex happy ];
        jailbreak = true;
        homepage = "http://www2.tcs.ifi.lmu.de/~abel/";
        description = "Reduced instruction set i386 simulator";
@@ -110648,7 +113467,7 @@ self: {
        pname = "rivers";
        version = "0.1.0";
        sha256 = "0x7r04mwxwnqckfk865dckml4am11zx80a9k5kc91kz5ikq1ns64";
-       buildDepends = [ base lazysmallcheck oeis QuickCheck ];
+       libraryHaskellDepends = [ base lazysmallcheck oeis QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/d-rive/rivers";
        description = "Rivers are like Streams, but different";
@@ -110664,7 +113483,7 @@ self: {
        sha256 = "1hiwgn0xyl42y9cmmc25464y42w7grf68xv8cvjznwzv0v1v63cg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base rivet-core rivet-simple-deploy ];
+       executableHaskellDepends = [ base rivet-core rivet-simple-deploy ];
        homepage = "https://github.com/dbp/rivet";
        description = "A project management tool for Haskell applications";
        license = stdenv.lib.licenses.bsd3;
@@ -110679,7 +113498,7 @@ self: {
        pname = "rivet-core";
        version = "0.1.0.1";
        sha256 = "102zgb1ryfl341h8r9hxm9zbmg8jq67bkn57hxhnfsjxv7952x21";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator directory directory-tree filepath
          postgresql-simple process shake template-haskell text time
          unordered-containers
@@ -110695,7 +113514,7 @@ self: {
        pname = "rivet-migration";
        version = "0.1.0.1";
        sha256 = "1vg6ns5scq5nqyj2w070hswynji8pqfh654qa3zjda2xhna5mnbd";
-       buildDepends = [ base postgresql-simple text ];
+       libraryHaskellDepends = [ base postgresql-simple text ];
        homepage = "https://github.com/dbp/rivet";
        description = "Postgresql migration support for project management tool";
        license = stdenv.lib.licenses.bsd3;
@@ -110707,7 +113526,7 @@ self: {
        pname = "rivet-simple-deploy";
        version = "0.1.0.0";
        sha256 = "1003sm8mpnc7l7fbp1j08cvc55va54arp6j0qdg2cc2m8cy5bpxf";
-       buildDepends = [ base configurator mtl rivet-core text ];
+       libraryHaskellDepends = [ base configurator mtl rivet-core text ];
        homepage = "https://github.com/dbp/rivet";
        description = "Basic deployment support for project management tool";
        license = stdenv.lib.licenses.bsd3;
@@ -110723,9 +113542,13 @@ self: {
        sha256 = "0672j0xjlhyyfq2fbvnfc0gahihpkkcfh7nnbwh1salgy0ykzhq0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 exceptions network
-         network-simple parsec random transformers
+         network-simple parsec transformers
+       ];
+       executableHaskellDepends = [
+         base binary bytestring data-binary-ieee754 exceptions network
+         network-simple random transformers
        ];
        jailbreak = true;
        description = "A Haskell codec for RL-Glue";
@@ -110740,8 +113563,8 @@ self: {
        pname = "rmonad";
        version = "0.8.0.2";
        sha256 = "1pamp8n88f1y4q0q83vmvbqbfva03prcfdqfj3x888mjwxgh6h8l";
-       buildDepends = [ base containers suitable transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers suitable transformers ];
+       testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
        description = "Restricted monad library";
@@ -110759,10 +113582,13 @@ self: {
        sha256 = "086cq7b7x0l98q5di2bpbv9vjrhl7b62nlzwchdl8pqb5w83345m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cipher-aes io-streams mtl pbkdf QuickCheck random
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring cipher-aes io-streams
+       ];
+       testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        jailbreak = true;
@@ -110776,7 +113602,7 @@ self: {
        pname = "rng-utils";
        version = "0.2.1";
        sha256 = "11yy6v0dbdf0cn823vlyd90zc5q5aw0zjzylpz5s9c94wsd4pjfa";
-       buildDepends = [ base bytestring mwc-random vector ];
+       libraryHaskellDepends = [ base bytestring mwc-random vector ];
        description = "RNG within an MVar for convenient concurrent use";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110787,11 +113613,12 @@ self: {
        pname = "robot";
        version = "1.4";
        sha256 = "1vac4ks3kdyf9wdiiw224rz2nm5859np7cqjpl5mrb2h27bycv5c";
-       buildDepends = [ base containers exceptions transformers xhb ];
+       libraryHaskellDepends = [
+         base containers exceptions transformers xhb
+       ];
        homepage = "https://github.com/lfairy/robot";
        description = "Simulate keyboard and mouse events";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "robots-txt" = callPackage
@@ -110802,8 +113629,10 @@ self: {
        pname = "robots-txt";
        version = "0.4.1.3";
        sha256 = "051ibkbhqlpimajj8gl0m468rs6qhlgs15f5bcrhlngfs20jbfkq";
-       buildDepends = [ attoparsec base bytestring old-locale time ];
-       testDepends = [
+       libraryHaskellDepends = [
+         attoparsec base bytestring old-locale time
+       ];
+       testHaskellDepends = [
          attoparsec base bytestring directory heredoc hspec QuickCheck
          transformers
        ];
@@ -110821,10 +113650,10 @@ self: {
        pname = "rocksdb-haskell";
        version = "0.1.0";
        sha256 = "1wi8mc0xzdd47r2vxa1x4gmbm4yikp4pyfj00ycnydvs4b2n3iad";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default filepath resourcet transformers
        ];
-       extraLibraries = [ rocksdb ];
+       librarySystemDepends = [ rocksdb ];
        homepage = "http://github.com/agrafix/rocksdb-haskell";
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
@@ -110840,7 +113669,7 @@ self: {
        sha256 = "0xnpji131pva54drxjqra5nkciqljf4x6zylm3snzs8s4c7klak6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath old-time process
        ];
        homepage = "http://roguestar.downstairspeople.org/";
@@ -110860,7 +113689,7 @@ self: {
        sha256 = "056080bzdmrn6k0c9lx2d69l2ygal275xlkd6y31sj2ax9yizqkv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring containers data-memocombinators hslogger
          MaybeT MonadRandom mtl old-time parallel priority-sync PSQueue
          random stm
@@ -110881,7 +113710,7 @@ self: {
        pname = "roguestar-gl";
        version = "0.6.0.1";
        sha256 = "1lajrc6ay1vk9rbi3x8mx56rrsxkihmapzfm7l8aav2jx0wwryzs";
-       buildDepends = [
+       libraryHaskellDepends = [
          arrows base bytestring containers filepath GLUT MonadRandom mtl
          OpenGL priority-sync random rsagl rsagl-frp rsagl-math stm
        ];
@@ -110900,7 +113729,7 @@ self: {
        sha256 = "13kg8mabh0y1a48zjx9f9k207i5qn0hkabjyg10ha5d0kf36xbyh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT roguestar-gl rsagl ];
+       executableHaskellDepends = [ base GLUT roguestar-gl rsagl ];
        jailbreak = true;
        homepage = "http://roguestar.downstairspeople.org/";
        description = "Sci-fi roguelike game. GLUT front-end.";
@@ -110916,7 +113745,7 @@ self: {
        pname = "rollbar";
        version = "0.3.1";
        sha256 = "0hv9i38c0c1bv36xy4inq6dghn79bmjw1x0xgi5mlwf5lzzp2fv1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base basic-prelude http-conduit monad-control network text
          vector
        ];
@@ -110935,7 +113764,10 @@ self: {
        sha256 = "07bicx83h66xmy3i2jszl5awkxw6fvy9y5r3v4hq2rz86z09zw0s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base optparse-applicative random regex-applicative
+       ];
+       executableHaskellDepends = [
          base optparse-applicative random regex-applicative
        ];
        jailbreak = true;
@@ -110950,7 +113782,7 @@ self: {
        pname = "rolling-queue";
        version = "0.1";
        sha256 = "1l39dlq8pn38b48iwqgrnh83h74qkmm34l5m9a0rbg76s2z04c43";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/joeyadams/haskell-rolling-queue";
        description = "Bounded channel for STM that discards old entries when full";
        license = stdenv.lib.licenses.bsd3;
@@ -110962,7 +113794,9 @@ self: {
        pname = "roman-numerals";
        version = "0.5.1.5";
        sha256 = "10da5vls9l5i255bapms4b2r7dnwmxgsaa1cdll2lrmid5dikixr";
-       buildDepends = [ base base-unicode-symbols bytestring text ];
+       libraryHaskellDepends = [
+         base base-unicode-symbols bytestring text
+       ];
        homepage = "https://github.com/roelvandijk/roman-numerals";
        description = "Parsing and pretty printing of Roman numerals";
        license = stdenv.lib.licenses.bsd3;
@@ -110976,8 +113810,8 @@ self: {
        pname = "romkan";
        version = "0.1.0.0";
        sha256 = "094z59jbkpy6gv51kf990q4fgmjyylifc63ij4kcdm0hlhmrmdc8";
-       buildDepends = [ attoparsec base containers text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base containers text ];
+       testHaskellDepends = [
          attoparsec base containers HUnit test-framework
          test-framework-hunit text
        ];
@@ -110992,7 +113826,7 @@ self: {
        pname = "roots";
        version = "0.1.1.2";
        sha256 = "0xzsz4w153mbkkkv07558xkv83fph4g98hvjf6iljwvbbp47l0j9";
-       buildDepends = [ base tagged ];
+       libraryHaskellDepends = [ base tagged ];
        homepage = "/dev/null";
        description = "Root-finding algorithms (1-dimensional)";
        license = stdenv.lib.licenses.publicDomain;
@@ -111004,7 +113838,9 @@ self: {
        pname = "rope";
        version = "0.6.4";
        sha256 = "1g77bv2mmfhy2mkb08k92m3f2jab6p2la2s7rfib2r1jy6lq5vhb";
-       buildDepends = [ base bytestring fingertree mtl utf8-string ];
+       libraryHaskellDepends = [
+         base bytestring fingertree mtl utf8-string
+       ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/rope";
        description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
@@ -111022,7 +113858,7 @@ self: {
        sha256 = "0qnvv8vyijjgb51pw5zfcmxy96nnnfrsvbg8xrnmq3p34xc168gb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson argparser base bytestring lens process text
          unordered-containers vector wreq
        ];
@@ -111039,10 +113875,12 @@ self: {
        pname = "rose-trees";
        version = "0.0.1.1";
        sha256 = "0ii9jxyd7q0x30zyp1gal29msd81n5vj613mkxxavjlz9ar9gvgx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default pseudo-trie semigroups transformers
        ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances
+       ];
        description = "A collection of rose tree structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111053,7 +113891,7 @@ self: {
        pname = "rosezipper";
        version = "0.2";
        sha256 = "1g6ppa8cappdbq9923lsac504dfjh0ks64gbm6qbihrc34f4zavc";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Generic zipper implementation for Data.Tree";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111072,14 +113910,17 @@ self: {
        sha256 = "12sa8ir9cl2gygayk3vhd00shv3wy3sqyhf4hh6arml5q7wz1f3m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base binary BoundedChan bytestring Cabal containers
-         data-default-generics deepseq directory filemanip filepath haxr mtl
-         network parsec process pureMD5 SafeSemaphore snap-core snap-server
-         stm storable-tuple template-haskell time transformers unix uri
-         utf8-string vector vector-space xml
+       libraryHaskellDepends = [
+         base binary BoundedChan bytestring Cabal containers directory
+         filemanip filepath haxr mtl network parsec process SafeSemaphore
+         snap-core snap-server stm storable-tuple template-haskell time
+         transformers unix uri utf8-string vector vector-space xml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         attoparsec base binary bytestring containers data-default-generics
+         deepseq directory filemanip filepath mtl process pureMD5 vector xml
+       ];
+       testHaskellDepends = [
          attoparsec base bytestring containers data-default-generics
          filepath mtl pureMD5 tasty tasty-hunit testpack transformers
        ];
@@ -111095,7 +113936,7 @@ self: {
        pname = "rosso";
        version = "1.0";
        sha256 = "0cz5kqpvq9qjkdy2x3y6aqia3armawjjsnv2pxifl0l6f9hhrvis";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        description = "General purpose utility library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111107,8 +113948,8 @@ self: {
        pname = "rot13";
        version = "0.1.0.2";
        sha256 = "0d9c0zfc92xfp5v5dp83w2897pg2gyz9n14xpggakwk6ynfmf6hd";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base hspec QuickCheck ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/kvanberendonck/codec-rot13";
        description = "Fast ROT13 cipher for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -111122,10 +113963,10 @@ self: {
        pname = "rotating-log";
        version = "0.2";
        sha256 = "1gqdfzdz3nwp6mjy61a49kwhcrykjl00aq9gq1v68li6z75zf85k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath old-locale time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring directory filepath old-locale time
        ];
        license = stdenv.lib.licenses.bsd3;
@@ -111138,7 +113979,7 @@ self: {
        pname = "rounding";
        version = "0.3.0";
        sha256 = "1d2vaijcna8gwcrhsjpclqw4gjdvdpmnrlyszqzcxnqf0l206a6y";
-       buildDepends = [ array base numeric-extras ];
+       libraryHaskellDepends = [ array base numeric-extras ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/ekmett/rounding";
        description = "Explicit floating point rounding mode wrappers";
@@ -111154,7 +113995,7 @@ self: {
        pname = "roundtrip";
        version = "0.2.0.3";
        sha256 = "1q7n8fnlf9kg4647pm2a3s347dzj7qp29f6hkr0rqfmzp774zwhi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers pretty safe template-haskell text xml-types
        ];
        description = "Bidirectional (de-)serialization";
@@ -111171,17 +114012,18 @@ self: {
        pname = "roundtrip-aeson";
        version = "0.2.0.0";
        sha256 = "0m96447l2m0y4aapil077xpnzlkjla0yp2bzajfijik9gkjbiih4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers lens lens-aeson roundtrip
          scientific text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring lens-aeson roundtrip text vector
        ];
        jailbreak = true;
        homepage = "https://github.com/anchor/roundtrip-aeson";
        description = "Un-/parse JSON with roundtrip invertible syntax definitions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-string" = callPackage
@@ -111190,7 +114032,7 @@ self: {
        pname = "roundtrip-string";
        version = "0.1.0.1";
        sha256 = "1lad64y877rf36dgldkc7qcg5xagjc00z4cf2r1ahamv379df8d7";
-       buildDepends = [ base mtl parsec roundtrip ];
+       libraryHaskellDepends = [ base mtl parsec roundtrip ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111208,7 +114050,7 @@ self: {
        sha256 = "1gl649saiaj1biqda64wmpbnv5f3njm3rmfgvf1iavyliqgrwn9m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-builder-enumerator bytestring containers
          enumerator mtl pretty reference roundtrip roundtrip-string safe
          text xml-enumerator xml-types
@@ -111226,7 +114068,9 @@ self: {
        sha256 = "0bfrb3mz9nxrl4l5pikrp3x4igq4w9jlmvwikyc71ph8ks6rghc6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ attoparsec base network text yesod-routes ];
+       executableHaskellDepends = [
+         attoparsec base network text yesod-routes
+       ];
        homepage = "http://github.com/singpolyma/route-generator";
        description = "Utility to generate routes for use with yesod-routes";
        license = "unknown";
@@ -111241,10 +114085,12 @@ self: {
        pname = "route-planning";
        version = "0.0.3";
        sha256 = "0l3z9hjd8xqnahffg930qi13pf8cpiq44diqmpmh1narcllcbgj7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers coordinate lens semigroupoids semigroups text xsd
        ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "https://github.com/tonymorris/route";
        description = "A library and utilities for creating a route";
        license = stdenv.lib.licenses.bsd3;
@@ -111257,7 +114103,7 @@ self: {
        pname = "rowrecord";
        version = "0.1";
        sha256 = "0gcrdy75f0rqfayn37frwcixb086x4s7dygphxhxbpvyl8sjnl0l";
-       buildDepends = [ base containers template-haskell ];
+       libraryHaskellDepends = [ base containers template-haskell ];
        description = "Build records from lists of strings, as from CSV files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111271,7 +114117,7 @@ self: {
        pname = "rpc";
        version = "0.0.1";
        sha256 = "0bw92pmnkfq1azw08ygpmp1z856l3ybhmxkfhy4sfds769k2s4j9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers derive network-fancy
          template-haskell th-lift
        ];
@@ -111290,9 +114136,10 @@ self: {
        sha256 = "0avjbw9zsa6nsjlwmb1lll0n80j9ggniwpy9sllaam83r6jpxhqq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl network template-haskell transformers
        ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/mmirman/rpc-framework";
        description = "a remote procedure call framework";
@@ -111310,7 +114157,7 @@ self: {
        sha256 = "0x40j5rk8v61wzhcj730g75a97ikki7j22dfrh4z873b6mxwfh4k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          appar base blaze-builder bytestring c10k containers dns domain-auth
          hslogger iproute parsec unix
        ];
@@ -111327,7 +114174,7 @@ self: {
        sha256 = "1wvaf1llcw4xcp8hmd80scqlk490qfiv5sqncpjmafw7zanrab4z";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath HaXml process ];
+       libraryHaskellDepends = [ base directory filepath HaXml process ];
        description = "Cozy little project to question unruly rpm packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111343,7 +114190,7 @@ self: {
        pname = "rsagl";
        version = "0.6.0.1";
        sha256 = "0f1f6kksrz1ghn6jhbdqsh4rhpkp65ccc4ci2fn5kmmw7qxzal59";
-       buildDepends = [
+       libraryHaskellDepends = [
          array arrows base containers data-memocombinators deepseq mtl
          old-time OpenGL OpenGLRaw parallel parsec random rsagl-frp
          rsagl-math stm Vec Vec-OpenGLRaw
@@ -111363,7 +114210,7 @@ self: {
        pname = "rsagl-frp";
        version = "0.6.0.1";
        sha256 = "0lim4slnhy1sq449kmvs489xy4axryn6qkk32hkzmlwvw8hqpl01";
-       buildDepends = [
+       libraryHaskellDepends = [
          array arrows base containers mtl old-time random rsagl-math stm
        ];
        jailbreak = true;
@@ -111381,7 +114228,7 @@ self: {
        pname = "rsagl-math";
        version = "0.6.0.1";
        sha256 = "04i1l6zb1jm784gdr86jrfm5m999px7ymzwwr5nyh69dk1730znn";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers deepseq OpenGL OpenGLRaw parallel parsec
          random Vec Vec-OpenGLRaw
        ];
@@ -111398,7 +114245,7 @@ self: {
        pname = "rspp";
        version = "0.1.0.0";
        sha256 = "1rlx6hzw987jng2wmm2igfqlfym06wk8wxvqpb4v1zgqb00rabpc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/AJChapman/rspp";
        description = "A Rational Street Performer Protocol solver";
@@ -111413,7 +114260,9 @@ self: {
        pname = "rss";
        version = "3000.2.0.5";
        sha256 = "0ydr6wqmac6bk3bn69fgay66rc2xap99jgz1gg5z09mhhv3bjmb1";
-       buildDepends = [ base HaXml network network-uri old-locale time ];
+       libraryHaskellDepends = [
+         base HaXml network network-uri old-locale time
+       ];
        homepage = "https://github.com/basvandijk/rss";
        description = "A library for generating RSS 2.0 feeds.";
        license = stdenv.lib.licenses.publicDomain;
@@ -111431,7 +114280,7 @@ self: {
        sha256 = "0gflfr97y2ypm9h5alm5c851pc0171p8wckdqdhr4wb6r844g8dw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cabal-file-th cmdargs containers deepseq feed
          http-client http-conduit http-types io-storage irc network
          old-locale parsec regexpr resourcet safe split text time
@@ -111450,7 +114299,7 @@ self: {
        pname = "rtld";
        version = "0.0.2";
        sha256 = "18y55lv3vyl4kpwzphw5gb1jsvp1f6i4dqh9rs6i9fyvabndvfik";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kkardzis/rtld";
        description = "dynamic linker tools for Haskell";
        license = "unknown";
@@ -111462,9 +114311,9 @@ self: {
        pname = "rtlsdr";
        version = "0.1.0.4";
        sha256 = "090m8qsj9g0xr8ybyiik6vrc9j7bvgmgp42vznank3nklrmkxbgz";
-       buildDepends = [ base ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ rtl-sdr ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ rtl-sdr ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://github.com/adamwalker/hrtlsdr";
        description = "Bindings to librtlsdr";
        license = stdenv.lib.licenses.bsd3;
@@ -111478,7 +114327,7 @@ self: {
        pname = "rtorrent-rpc";
        version = "0.2.2.0";
        sha256 = "0k14m4r0zsalngb6c4dckr7z521mymabc0ihk0zz402l7s13n68s";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring deepseq haxr
          mtl network split utf8-string
        ];
@@ -111496,11 +114345,11 @@ self: {
        pname = "rtorrent-state";
        version = "0.1.0.1";
        sha256 = "0lh7plp9qwlya0dnfvz2sg8nhg42vnrypi2p8rh6i278glniwn90";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bencoding bytestring containers directory filepath lens
          utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bencoding bytestring containers directory filepath hspec
          QuickCheck temporary utf8-string
        ];
@@ -111515,11 +114364,10 @@ self: {
        pname = "rubberband";
        version = "0.1.0.2";
        sha256 = "15j402a7vwrx6sjn29jrby4qxc27c1aa4mkbalssn8jlpjhlpffm";
-       buildDepends = [ base vector ];
-       testDepends = [ base ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ rubberband ];
-       pkgconfigDepends = [ rubberband ];
+       libraryHaskellDepends = [ base vector ];
+       librarySystemDepends = [ rubberband ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
@@ -111534,10 +114382,10 @@ self: {
        pname = "ruby-marshal";
        version = "0.1.0";
        sha256 = "1dmlgks7wfs82k9dxkgi35q4sa0a7ljpcw86j25k85vbclzpyp7j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers mtl string-conv vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal containers hspec mtl string-conv vector
        ];
        homepage = "https://github.com/filib/ruby-marshal";
@@ -111553,7 +114401,7 @@ self: {
        pname = "ruby-qq";
        version = "0.1.0.0";
        sha256 = "1d2a31kiiv0p8d2yygpg8mgrz0xy6zh5qnf49hz70yk2vavkcac1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring haskell-src-exts haskell-src-meta pcre-light
          process template-haskell trifecta
        ];
@@ -111569,7 +114417,7 @@ self: {
        pname = "ruff";
        version = "0.4";
        sha256 = "09gj31p5cbjdns7d2xs2s08kpaks0bqnhzbf93xypci6zr6gxvyl";
-       buildDepends = [ array base mtl parsec safe strict Vec ];
+       libraryHaskellDepends = [ array base mtl parsec safe strict Vec ];
        homepage = "https://gitorious.org/ruff";
        description = "relatively useful fractal functions";
        license = stdenv.lib.licenses.bsd3;
@@ -111586,7 +114434,7 @@ self: {
        sha256 = "1kcca2h3gvp63s9frnq4dmhaiw5pxhk5ji86bar0cwyrc9all8v5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers mtl shuffle uhc-util uuagc uuagc-cabal uulib
        ];
        homepage = "https://github.com/UU-ComputerScience/ruler";
@@ -111604,7 +114452,7 @@ self: {
        sha256 = "06c55pdfkh9vcmmzlf485d0qxczgd2xj1ajkz277df72p29xvrgd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory fgl filepath haskell98 mtl uuagc
          uulib
        ];
@@ -111619,7 +114467,7 @@ self: {
        pname = "rungekutta";
        version = "1.0.2";
        sha256 = "07drd0xvkg06p2fsbncafnr7wzkrs4m6sfs1szbbscggw3pxh4fp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A collection of explicit Runge-Kutta methods of various orders";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111635,7 +114483,7 @@ self: {
        sha256 = "1vn08xdisdf5l3ps6bcpg3rvl89209f3ig504w7ysqbjgdib96n0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs directory filepath old-time process
        ];
        homepage = "https://github.com/bacchanalia/runghc";
@@ -111649,7 +114497,7 @@ self: {
        pname = "runmemo";
        version = "1.0.0.1";
        sha256 = "12fn0lsil0rj0pj0ixzppsdw2fmj0cnzci4fh11z9rcggwbz6pms";
-       testDepends = [ base data-memocombinators time ];
+       testHaskellDepends = [ base data-memocombinators time ];
        homepage = "https://github.com/DanBurton/runmemo";
        description = "A simple memoization helper library";
        license = stdenv.lib.licenses.bsd3;
@@ -111663,7 +114511,9 @@ self: {
        pname = "rvar";
        version = "0.2.0.2";
        sha256 = "1n24fl27mrm7cndp8b646b9c5hjm3hf5m12y9ni0f850dd739jm4";
-       buildDepends = [ base MonadPrompt mtl random-source transformers ];
+       libraryHaskellDepends = [
+         base MonadPrompt mtl random-source transformers
+       ];
        homepage = "https://github.com/mokus0/random-fu";
        description = "Random Variables";
        license = stdenv.lib.licenses.publicDomain;
@@ -111675,7 +114525,7 @@ self: {
        pname = "rwlock";
        version = "0.0.0.3";
        sha256 = "0isx32ayaqh7vhcyl11ykdy8f1chs1fdw73h3c2r53k989yfkmba";
-       buildDepends = [ base monad-loops-stm stm syb ];
+       libraryHaskellDepends = [ base monad-loops-stm stm syb ];
        homepage = "https://github.com/mokus0/rwlock";
        description = "Multiple-read / single-write locks";
        license = stdenv.lib.licenses.publicDomain;
@@ -111691,8 +114541,8 @@ self: {
        sha256 = "1ildbmnpdh8x25m6kjdc6506cjgngjmjhvrdfkrcwg5cdqcqs266";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring parsec ];
-       testDepends = [
+       executableHaskellDepends = [ base binary bytestring parsec ];
+       testHaskellDepends = [
          base binary bytestring parsec QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -111710,7 +114560,7 @@ self: {
        pname = "s3-signer";
        version = "0.3.0.0";
        sha256 = "15647fs38blg37s0407ybxlmzwdhmxz3sk914p21g90i2bw5gsc9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring cryptohash http-types time utf8-string
        ];
        homepage = "https://github.com/dmjio/s3-signer";
@@ -111724,7 +114574,7 @@ self: {
        pname = "safe";
        version = "0.3.9";
        sha256 = "1jdnp5zhvalf1xy8i872n29nljfjz6lnl9ghj80ffisrnnkrwcfh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ndmitchell/safe#readme";
        description = "Library of safe (exception free) functions";
        license = stdenv.lib.licenses.bsd3;
@@ -111736,7 +114586,7 @@ self: {
        pname = "safe-access";
        version = "0.2.1.1";
        sha256 = "0pijjy8ilq0spmanilmhqxkkrky7ldacxphz5ci8pvnw4g6y40z8";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "http://hub.darcs.net/thoferon/safe-access";
        description = "A simple environment to control access to data";
@@ -111749,7 +114599,7 @@ self: {
        pname = "safe-failure";
        version = "0.5.0.2";
        sha256 = "102fjardfdf9zy0vyalgq6m1l64356b0a0xaam49j31lqgfldaw7";
-       buildDepends = [ base failure ];
+       libraryHaskellDepends = [ base failure ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/safe/";
        description = "Library for safe functions (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -111761,7 +114611,9 @@ self: {
        pname = "safe-failure-cme";
        version = "0.1.0";
        sha256 = "0np0gq6f9xvywdf2fz5cb43ji0r4c9aqk6gb5w80hwklxdy553gk";
-       buildDepends = [ base control-monad-exception safe-failure ];
+       libraryHaskellDepends = [
+         base control-monad-exception safe-failure
+       ];
        description = "control-monad-exception Instances for safe-failure";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -111772,7 +114624,7 @@ self: {
        pname = "safe-freeze";
        version = "0.2.1";
        sha256 = "12mqgak0rla20n9b4m6ynx64bwr06njcr849csc0z0r573xw2v33";
-       buildDepends = [ base indexed mtl vector ];
+       libraryHaskellDepends = [ base indexed mtl vector ];
        jailbreak = true;
        homepage = "https://github.com/reinerp/safe-freeze";
        description = "Support for safely freezing multiple arrays in the ST monad";
@@ -111786,7 +114638,7 @@ self: {
        pname = "safe-globals";
        version = "0.1.1";
        sha256 = "0an3hy28fpdw3v5gjx13fbszzp4r2p65l8mgks0pdflscf2cwwv5";
-       buildDepends = [ base stm template-haskell ];
+       libraryHaskellDepends = [ base stm template-haskell ];
        description = "Safe top-level mutable variables which scope like ordinary values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111799,7 +114651,9 @@ self: {
        pname = "safe-lazy-io";
        version = "0.1";
        sha256 = "1hqw4i814sz94iqyj79jai8aa2mwmv0mrnfk8ggb0sdx4xqn784c";
-       buildDepends = [ base extensible-exceptions parallel strict-io ];
+       libraryHaskellDepends = [
+         base extensible-exceptions parallel strict-io
+       ];
        description = "A library providing safe lazy IO features";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111813,7 +114667,7 @@ self: {
        pname = "safe-plugins";
        version = "0.1";
        sha256 = "1nxy70iig54098pzbi8mwc8412fj759y6ihmsdjsk6xlpy6bwx65";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath haskell-src-exts plugins Unixutils
        ];
        description = "A small wrapper over hs-plugins to allow loading safe plugins";
@@ -111829,8 +114683,10 @@ self: {
        pname = "safe-printf";
        version = "0.1.0.0";
        sha256 = "19nw306q7xlj6s132qxlfskg67x6rx3zhsk2n6lbz2kryr7v99g6";
-       buildDepends = [ base haskell-src-meta template-haskell th-lift ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base haskell-src-meta template-haskell th-lift
+       ];
+       testHaskellDepends = [
          base doctest haskell-src-meta hspec QuickCheck template-haskell
          th-lift
        ];
@@ -111847,14 +114703,14 @@ self: {
      mkDerivation {
        pname = "safecopy";
        version = "0.8.5";
-       revision = "1";
        sha256 = "1r0v2276hynxkysyrdmy2334gwxgaz2v6j8g0hd5jzfj2kmnnmk9";
+       revision = "1";
        editedCabalFile = "9b7af1be25774add78e43c0f9a4f1fe55ce2a98fb00738400661835adf1672c0";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base cereal containers lens lens-action quickcheck-instances
          tasty tasty-quickcheck template-haskell time vector
        ];
@@ -111871,8 +114727,8 @@ self: {
        pname = "safeint";
        version = "0.5.3";
        sha256 = "1xrdqylf4f6nk2rnpp0zyaj562cdn2wmf9skir21fbzkw1lzvq7j";
-       buildDepends = [ base ghc-prim ];
-       testDepends = [
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
@@ -111889,7 +114745,7 @@ self: {
        pname = "safer-file-handles";
        version = "0.11";
        sha256 = "1jqw13drzj36gjvlaf9fqd4cj1dpy8psmgsdykag6krxvhq6p639";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols explicit-iomodes pathtype
          regional-pointers regions transformers
        ];
@@ -111908,7 +114764,7 @@ self: {
        pname = "safer-file-handles-bytestring";
        version = "0.3.0.1";
        sha256 = "1fbhk5hmq9bpw556vz6w3vq5j380n5pzfgby6w4vrmwnn93y12b9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring explicit-iomodes-bytestring regions
          safer-file-handles transformers
        ];
@@ -111927,7 +114783,7 @@ self: {
        pname = "safer-file-handles-text";
        version = "0.2.0.2";
        sha256 = "14x0kig9dnjrksh7b4gmwdwqr045cqcqjgicvjckhf85jc8bcanm";
-       buildDepends = [
+       libraryHaskellDepends = [
          explicit-iomodes-text regions safer-file-handles text transformers
        ];
        jailbreak = true;
@@ -111943,7 +114799,7 @@ self: {
        pname = "saferoute";
        version = "0.2.0.0";
        sha256 = "00ykmy44paghgc3m731p1hh00zv11416pl2xil4cav7vrr43nb6h";
-       buildDepends = [ base blaze-html containers text ];
+       libraryHaskellDepends = [ base blaze-html containers text ];
        jailbreak = true;
        description = "A simple type-safe routing library";
        license = stdenv.lib.licenses.bsd3;
@@ -111956,8 +114812,11 @@ self: {
        pname = "sai-shape-syb";
        version = "0.3.4";
        sha256 = "07g7qpf7avv5hnxykrh4x7qr8sx9mwwv4hbavnsqi1n7zy2z91a3";
-       buildDepends = [ base containers ghc ghc-syb-utils syb ];
-       testDepends = [ base containers ghc ghc-syb-utils HUnit syb ];
+       libraryHaskellDepends = [ base containers ghc ghc-syb-utils syb ];
+       testHaskellDepends = [
+         base containers ghc ghc-syb-utils HUnit syb
+       ];
+       jailbreak = true;
        homepage = "http://fremissant.net/shape-syb";
        description = "Obtain homogeneous values from arbitrary values, transforming or culling data";
        license = stdenv.lib.licenses.bsd3;
@@ -111972,36 +114831,36 @@ self: {
        pname = "saltine";
        version = "0.0.0.4";
        sha256 = "1n74qk8yb0ylj6gns68rak5g030yjsaycn96x0hvk1cx7qwym887";
-       buildDepends = [ base bytestring profunctors ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring profunctors ];
+       librarySystemDepends = [ libsodium ];
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2 vector
        ];
-       extraLibraries = [ libsodium ];
        description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) libsodium;};
 
   "saltine-quickcheck" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex
-     , QuickCheck, saltine, sodium, tasty, tasty-quickcheck
+     , libsodium, QuickCheck, saltine, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "saltine-quickcheck";
        version = "0.1.0.1";
        sha256 = "041286rsyzv67qqbbbd38fc9qqzmml0js4qr0rqhaljv8cf1sxnj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-arbitrary hex QuickCheck saltine
        ];
-       testDepends = [
+       librarySystemDepends = [ libsodium ];
+       testHaskellDepends = [
          base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck
        ];
-       extraLibraries = [ sodium ];
        jailbreak = true;
        homepage = "https://github.com/tsuraan/saltine-quickcheck";
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
-     }) { sodium = null;};
+     }) { inherit (pkgs) libsodium;};
 
   "salvia" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, fclabels
@@ -112013,7 +114872,7 @@ self: {
        pname = "salvia";
        version = "1.0.0";
        sha256 = "1qcnhj3ifjqrkaw1ixqkwmv2br9w5dlk1mrrwgl73c3wxgin7gni";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory fclabels MaybeT-transformers
          monads-fd network old-locale process pureMD5 random safe
          salvia-protocol split stm text threadmanager time transformers unix
@@ -112036,7 +114895,7 @@ self: {
        sha256 = "0sfvx7hj0z2g57gs6l1s078z3a34hfgm4pfcb1qr1pvbc8lj3f1h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base c10k fclabels filestore monads-fd network salvia salvia-extras
          salvia-protocol salvia-sessions salvia-websocket stm threadmanager
          transformers
@@ -112057,7 +114916,7 @@ self: {
        pname = "salvia-extras";
        version = "1.0.0";
        sha256 = "1nfiak4nabxm27ddksaif1jdpwn7drbz25jrqk0bmyr5q6q70a51";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring c10k clevercss fclabels filestore hscolour
          HStringTemplate monads-fd network old-locale pureMD5 salvia
          salvia-protocol sendfile split stm text threadmanager time
@@ -112077,7 +114936,7 @@ self: {
        pname = "salvia-protocol";
        version = "1.0.1";
        sha256 = "0a49wjjhdhhlnrwfi6l2zn6jl7vynwyil6s6qzp1za7s5vji48vb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bimap bytestring containers fclabels parsec safe split
          utf8-string
        ];
@@ -112096,7 +114955,7 @@ self: {
        pname = "salvia-sessions";
        version = "1.0.0";
        sha256 = "0cfl9xhawg16gkl18wfxpjysn312yb3q9bagmclrhqk3qzwxgb0h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers fclabels MaybeT-transformers monads-fd pureMD5
          random safe salvia salvia-protocol stm time utf8-string
        ];
@@ -112114,7 +114973,7 @@ self: {
        pname = "salvia-websocket";
        version = "1.0.0";
        sha256 = "14sr5z5z9xjkf18z1srz6cgciyrhhs4zyl7a8pffxmb893a2gngl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring fclabels monads-fd salvia salvia-protocol stm
          utf8-string
        ];
@@ -112132,7 +114991,7 @@ self: {
        sha256 = "0ivj0bcnqqc805np62bdpvh8v4ykmw86ph5rp7k54bbv9wd31bsv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base QuickCheck storable-record ];
+       libraryHaskellDepends = [ base QuickCheck storable-record ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Handling of samples in an (audio) signal";
        license = stdenv.lib.licenses.bsd3;
@@ -112144,7 +115003,7 @@ self: {
        pname = "sample-frame-np";
        version = "0.0.4";
        sha256 = "1l7447xjxj98jx99b75hdfdjps6mcm293yhx0fjrqwxkz6anxv6d";
-       buildDepends = [ base numeric-prelude sample-frame ];
+       libraryHaskellDepends = [ base numeric-prelude sample-frame ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Orphan instances for types from sample-frame and numericprelude";
        license = stdenv.lib.licenses.bsd3;
@@ -112160,9 +115019,14 @@ self: {
        sha256 = "00hm12wz6sqv0jn9v7vqxzvq1m7k8d4fdaw25x928ck7g95gk9id";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring filepath process seqloc vector ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ zlib ];
+       libraryHaskellDepends = [ base bytestring seqloc vector ];
+       librarySystemDepends = [ zlib ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
+         base bytestring filepath process seqloc vector
+       ];
+       executableSystemDepends = [ zlib ];
+       executableToolDepends = [ c2hs ];
        homepage = "http://www.ingolia-lab.org/samtools-tutorial.html";
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
@@ -112178,7 +115042,10 @@ self: {
        sha256 = "0s59ds9s8ghj8wq2cfnh2s865v8bmga53aqvcqf781iv9zvxbqmw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring conduit filepath resourcet samtools transformers
+       ];
+       executableHaskellDepends = [
          base bytestring conduit filepath resourcet samtools transformers
        ];
        jailbreak = true;
@@ -112195,7 +115062,7 @@ self: {
        pname = "samtools-enumerator";
        version = "0.1.2.1";
        sha256 = "0wk2m2av9fd5zvx29my4llbc8zqk1hrczfvnhrvd90qmw8p33r5m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator samtools transformers
        ];
        description = "Enumerator interface to SamTools library";
@@ -112212,7 +115079,10 @@ self: {
        sha256 = "139cp03lm05s536gsf03in7lrsmiprs2x6vpr9vci4k0pq2pd06l";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring iteratee samtools transformers
+       ];
+       executableHaskellDepends = [
          base bytestring iteratee monads-tf samtools transformers
        ];
        description = "Iteratee interface to SamTools library";
@@ -112228,8 +115098,8 @@ self: {
        pname = "sandi";
        version = "0.3.5";
        sha256 = "19dfiph5rrxs4shpw286r4agcz739f6afw2wyrlkl66lpaaxjvl5";
-       buildDepends = [ base bytestring conduit exceptions ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring conduit exceptions ];
+       testHaskellDepends = [
          base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
        ];
        homepage = "http://hackage.haskell.org/package/sandi";
@@ -112243,7 +115113,7 @@ self: {
        pname = "sandlib";
        version = "0.0.2";
        sha256 = "07wh6va4rpf6vvxnjqbmwfna3rg20ysjh2pnzylz6xzlayzq0pkx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/regularlambda/sandlib";
        description = "SAND data serialization and manipulation library";
@@ -112260,7 +115130,7 @@ self: {
        sha256 = "184gsdrw10h345ic1bdcdnfaac5fhr6dx77db790fl1lff7z5s1g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory filepath optparse-applicative
          process text unix-compat
        ];
@@ -112275,7 +115145,7 @@ self: {
        pname = "sarasvati";
        version = "0.3.0.0";
        sha256 = "0x8d5n2mydhwl9h7vzk7nr58b2aym9xb21p4m21rfa6vy6r2n438";
-       buildDepends = [ base deepseq portaudio ];
+       libraryHaskellDepends = [ base deepseq portaudio ];
        jailbreak = true;
        homepage = "https://github.com/tokiwoousaka/Sarasvati";
        description = "audio library";
@@ -112290,7 +115160,7 @@ self: {
        pname = "sasl";
        version = "0.0.0.2";
        sha256 = "02cv19vi8wfwzxhi33f32zihjqypxjz1x6j7ff70my2wffw95w26";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cryptohash monads-tf papillon
          simple-pipe
        ];
@@ -112308,7 +115178,7 @@ self: {
        sha256 = "1ia2asqnxzpyr9s4n488yy00388x0bfy8kwqjx17fap33jkjfi6p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://tcana.info/sat.html";
        description = "CNF SATisfier";
        license = "GPL";
@@ -112325,7 +115195,7 @@ self: {
        sha256 = "1w09ccky9rhp1l5g3rxjp9ydfyn0cc7kxmhz922ngls4ywd1hbc4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers haskell98 mtl parse-dimacs pretty
        ];
        description = "A minimal SAT solver";
@@ -112342,15 +115212,14 @@ self: {
        pname = "satchmo";
        version = "2.9.9";
        sha256 = "134i2xd7fvdhx43a51486mb3szi6c604pqc6w3cxsic1ngm30jbw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array async base bytestring containers deepseq directory hashable
          lens memoize minisat mtl process transformers
        ];
-       testDepends = [ array base ];
+       testHaskellDepends = [ array base ];
        homepage = "https://github.com/jwaldmann/satchmo";
        description = "SAT encoding monad";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo-backends" = callPackage
@@ -112361,7 +115230,7 @@ self: {
        pname = "satchmo-backends";
        version = "1.9.1";
        sha256 = "1hyzwmhy0f4k60hqjbh9jl3qr4xw3rjgl8nz2gfcdvm5ad91bfdf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers process satchmo timeit
        ];
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
@@ -112380,7 +115249,7 @@ self: {
        sha256 = "1xvgamq53yfzcl1p9wbfyy7dlhxsnbj6pjpxgjkyycndgszc84w3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers process satchmo satchmo-backends
        ];
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
@@ -112397,7 +115266,7 @@ self: {
        pname = "satchmo-funsat";
        version = "1.4";
        sha256 = "0nx0xlbwwcdhdd608akmiwzx8abrd5v4b411221rdl8fshqrbv34";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers funsat parse-dimacs satchmo
        ];
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
@@ -112412,7 +115281,7 @@ self: {
        pname = "satchmo-minisat";
        version = "1.3";
        sha256 = "1dwgj16l2zjqfmf92kpr695ycliwki6a38sxc06scvs6sv6wkc56";
-       buildDepends = [ base containers process satchmo ];
+       libraryHaskellDepends = [ base containers process satchmo ];
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "minisat driver as backend for satchmo";
        license = "GPL";
@@ -112425,12 +115294,13 @@ self: {
        pname = "satchmo-toysat";
        version = "0.2.1.0";
        sha256 = "1g6hzgdiiczwk87928xi42lv2swm218i9hs39f3zqpcp8r7fxh61";
-       buildDepends = [ array base containers satchmo toysolver ];
+       libraryHaskellDepends = [
+         array base containers satchmo toysolver
+       ];
        jailbreak = true;
        homepage = "https://github.com/msakai/satchmo-toysat";
        description = "toysat driver as backend for satchmo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbv" = callPackage
@@ -112444,12 +115314,15 @@ self: {
        sha256 = "1914695yxyd3ag1z56dd88kz0p0zvl63255psd4bilzvdwlys6ls";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
-         directory filepath HUnit mtl old-time pretty process QuickCheck
-         random syb
+         directory filepath mtl old-time pretty process QuickCheck random
+         syb
        ];
-       testDepends = [ base directory filepath HUnit syb ];
+       executableHaskellDepends = [
+         base directory filepath HUnit process syb
+       ];
+       testHaskellDepends = [ base directory filepath HUnit syb ];
        homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
@@ -112461,7 +115334,7 @@ self: {
        pname = "sc3-rdu";
        version = "0.15";
        sha256 = "0zrd9w3s535b2dpnmmrfg4i6jd9f4nh338x1cbggcw3pjyv8gk30";
-       buildDepends = [ base hsc3 hsc3-db ];
+       libraryHaskellDepends = [ base hsc3 hsc3-db ];
        homepage = "http://rd.slavepianos.org/t/sc3-rdu";
        description = "Haskell bindings to sc3-rdu (sc3 rd ugens)";
        license = "GPL";
@@ -112476,7 +115349,7 @@ self: {
        pname = "scalable-server";
        version = "0.2.2";
        sha256 = "066ncvz6zid1j6d6j89m4k2hywq58p73z30dkqn2l1svlic7dmx6";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base blaze-builder BoundedChan
          bytestring enumerator mtl network network-enumerator
        ];
@@ -112494,7 +115367,7 @@ self: {
        sha256 = "0alhi0zr2n97942wpnyzq8q62nd4nzjl0rdxaarr7psx6dd3h3nn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base filepath gd ];
+       executableHaskellDepends = [ base filepath gd ];
        homepage = "http://code.haskell.org/~dons/code/scaleimage";
        description = "Scale an image to a new geometry";
        license = stdenv.lib.licenses.bsd3;
@@ -112509,10 +115382,10 @@ self: {
        pname = "scalpel";
        version = "0.2.1";
        sha256 = "0lva7pi78ksbxcjd19dycn4ayxcma28wrjmx3x31hn01nvhsnqg0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring curl regex-base regex-tdfa tagsoup text
        ];
-       testDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
+       testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
        homepage = "https://github.com/fimad/scalpel";
        description = "A high level web scraping library for Haskell";
        license = stdenv.lib.licenses.asl20;
@@ -112526,7 +115399,7 @@ self: {
        sha256 = "0imc8zmg0d42pzbrxiyi8lqx5q24i73ajj3pmb3kqinfhm465jgv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base parsec ];
+       executableHaskellDepends = [ base parsec ];
        homepage = "http://projects.haskell.org/style-scanner";
        description = "lexical style suggestions for source code";
        license = stdenv.lib.licenses.bsd3;
@@ -112538,8 +115411,8 @@ self: {
        pname = "scan-vector-machine";
        version = "0.2.7";
        sha256 = "112ibzc205pjcmjiwbknw7pdh0c5fyq6i4sqk97jfdr0ynb72vvc";
-       buildDepends = [ accelerate array base dph-base HUnit ];
-       testDepends = [ array base HUnit ];
+       libraryHaskellDepends = [ accelerate array base dph-base HUnit ];
+       testHaskellDepends = [ array base HUnit ];
        description = "An implementation of the Scan Vector Machine instruction set in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112555,11 +115428,11 @@ self: {
        sha256 = "18sn7dg2pc5wx73gxs6036fxp8yal95pfh336llvmn3azmkd6n95";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring mtl optparse-applicative scrypt
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base bytestring mtl optparse-applicative scrypt
          vector
        ];
@@ -112583,12 +115456,17 @@ self: {
        sha256 = "0rsx9h0y5g2sgwg47lzdzpmx5nfnpb033fyzz5xkxnc5k4bllad5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers incremental-parser monad-coroutine
+         monad-parallel monoid-subclasses text transformers
+         transformers-compat
+       ];
+       executableHaskellDepends = [
          base bytestring containers haskeline incremental-parser
          monad-coroutine monad-parallel monoid-subclasses parsec process
          text transformers transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers incremental-parser monad-coroutine
          monad-parallel monoid-subclasses QuickCheck test-framework
          test-framework-quickcheck2 text transformers transformers-compat
@@ -112607,7 +115485,7 @@ self: {
        pname = "scenegraph";
        version = "0.1.0.2";
        sha256 = "1l946h6sggg2n8ldx34v2sx4dyjqxd7i34wrsllz88iiy4qd90yw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers fgl GLUT haskell98 hmatrix mtl old-time
          OpenGL process
        ];
@@ -112626,7 +115504,7 @@ self: {
        pname = "scgi";
        version = "0.3.3";
        sha256 = "0zmn5w5vwxv8slnydbrj1jfhmbvsyars2wf9bbrbgvwsfd40zd2m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cgi extensible-exceptions network
        ];
        description = "A Haskell library for writing SCGI programs";
@@ -112643,7 +115521,9 @@ self: {
        sha256 = "1ggywgyfpdza1fk66ixj8z3a1nv1r64dmw7l4d1m3h65yzxx9jcb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath old-locale time xturtle ];
+       executableHaskellDepends = [
+         base directory filepath old-locale time xturtle
+       ];
        jailbreak = true;
        description = "Marge schedules and show EVR";
        license = stdenv.lib.licenses.bsd3;
@@ -112661,7 +115541,7 @@ self: {
        sha256 = "1x42jm9fciwdp1khlvcw5vl748pw12n8xk4phbnd6iwqaazf9wv8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring composition containers HTTP http-types mtl
          options text text-icu transformers wai warp
        ];
@@ -112675,7 +115555,7 @@ self: {
        pname = "schedyield";
        version = "1.0";
        sha256 = "0lzhxlfxa660vx4y49gbg2q76v8dda00h3rznj5fhdjj29pkypgp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Exposes standard POSIX function sched_yield";
        license = stdenv.lib.licenses.bsd3;
@@ -112696,12 +115576,12 @@ self: {
      mkDerivation {
        pname = "scholdoc";
        version = "0.1.3";
-       revision = "1";
        sha256 = "0dsbr4nk56cmbgdnk91s39lc4qp2wb39hkyisaf4f1n6nmx8zmn4";
+       revision = "1";
        editedCabalFile = "bbe7070ca2ca48d86095c9a45120d2bfbf6a480b3894117d70e0f8e3ccabb435";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring binary blaze-html blaze-markup
          bytestring containers data-default directory extensible-exceptions
          filepath highlighting-kate hslua HTTP http-client http-client-tls
@@ -112710,7 +115590,11 @@ self: {
          SHA syb tagsoup temporary text time unordered-containers vector xml
          yaml zip-archive zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base bytestring containers directory extensible-exceptions
+         filepath highlighting-kate network-uri scholdoc-types text yaml
+       ];
+       testHaskellDepends = [
          base bytestring containers Diff directory executable-path filepath
          HUnit process QuickCheck scholdoc-types syb test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -112732,18 +115616,22 @@ self: {
      mkDerivation {
        pname = "scholdoc-citeproc";
        version = "0.6";
-       revision = "1";
        sha256 = "0wy8cwr933zcqb85qscj9l9qcl2xv8mkbd2g9b4gs7c1k5b6khll";
+       revision = "1";
        editedCabalFile = "33a066de8000d8bdb0a8f04f71baca64e27f4a2bb2d2a330f6d5a7f81090b118";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson aeson-pretty attoparsec base bytestring containers
-         data-default directory filepath hs-bibutils mtl old-locale parsec
-         process rfc5051 scholdoc scholdoc-types split syb tagsoup temporary
-         text time vector xml-conduit yaml
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale parsec rfc5051 scholdoc scholdoc-types
+         split syb tagsoup text time vector xml-conduit yaml
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath process scholdoc scholdoc-types syb temporary text vector
+         yaml
+       ];
+       testHaskellDepends = [
          aeson base bytestring directory filepath process scholdoc
          scholdoc-types temporary text yaml
        ];
@@ -112765,10 +115653,11 @@ self: {
        sha256 = "05yb55df33v357khdkr95ghmxqzikvq8gxqkh143zc8fi43gjf99";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers mtl network-uri parsec scholdoc-types syb xml
+       libraryHaskellDepends = [
+         base containers mtl parsec scholdoc-types syb xml
        ];
-       testDepends = [
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
        ];
@@ -112785,7 +115674,7 @@ self: {
        pname = "scholdoc-types";
        version = "0.1.3.1";
        sha256 = "02335isa6w7mxjziiwsdm2883b778v0y0ayzxpha9p0xr5nlkbar";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers deepseq-generics ghc-prim syb
        ];
        jailbreak = true;
@@ -112800,7 +115689,7 @@ self: {
        pname = "schonfinkeling";
        version = "0.1.0.0";
        sha256 = "1wwbalfkfg66azr9zizscvdc2csi9q73d6wq5bwbiq33z522nwxy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Transformation of n-ary functions to unary functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -112811,8 +115700,8 @@ self: {
        pname = "sci-ratio";
        version = "0.2.1.0";
        sha256 = "1qddamwk2fzakixx9f0y0r3z9z6kmyyxgpb3dhiiiza6krnf8r9k";
-       buildDepends = [ base hashable ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base hashable ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/Rufflewind/sci-ratio";
        description = "Rational numbers in scientific notation";
        license = stdenv.lib.licenses.mit;
@@ -112824,7 +115713,7 @@ self: {
        pname = "science-constants";
        version = "0.2.0.0";
        sha256 = "0qp3d9la929kks2b2pyylgznl86gy91lp3zgpb9bn7gas3wll9vy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Mathematical/physical/chemical constants";
        license = "unknown";
@@ -112836,7 +115725,9 @@ self: {
        pname = "science-constants-dimensional";
        version = "0.1.0.1";
        sha256 = "0n39pfs7kfhy62vl9q2ka5f9bfckncpssjsdx71d1hrld0jcq2g8";
-       buildDepends = [ base dimensional numtype science-constants ];
+       libraryHaskellDepends = [
+         base dimensional numtype science-constants
+       ];
        jailbreak = true;
        description = "Mathematical/physical/chemical constants";
        license = stdenv.lib.licenses.bsd3;
@@ -112852,10 +115743,10 @@ self: {
        pname = "scientific";
        version = "0.3.3.8";
        sha256 = "0k6f9g3jpwhm52af4zayhdby8xibarn60mpxbb8xxgm78hmdw373";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring deepseq ghc-prim hashable integer-gmp text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring QuickCheck smallcheck tasty tasty-ant-xml
          tasty-hunit tasty-quickcheck tasty-smallcheck text
        ];
@@ -112875,10 +115766,14 @@ self: {
        sha256 = "1ihq538ym6hh099p0h9p1ngjsq3a9h9k5ssnwyr4bqhlmv8xam0i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath ghc ghc-paths ghc-syb
+         hslogger json multiset time uniplate
+       ];
+       executableHaskellDepends = [
          base bytestring Cabal containers directory filepath ghc ghc-paths
          ghc-syb hslogger json multiset network network-bytestring time
-         uniplate utf8-string
+         utf8-string
        ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/scion";
@@ -112902,7 +115797,14 @@ self: {
        sha256 = "1nf4rvy8szxjra6l20jxd0v2f6zf985jiz2d1y5rkfvrqx1pwqnc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring Cabal conduit containers deepseq
+         derive directory filepath ghc ghc-paths ghc-pkg-lib
+         haskell-src-exts http-conduit monad-logger mtl parallel-io parsec
+         persistent persistent-sqlite persistent-template process resourcet
+         tar text transformers unix unordered-containers utf8-string zlib
+       ];
+       executableHaskellDepends = [
          aeson attoparsec base bytestring Cabal conduit containers deepseq
          derive directory filepath ghc ghc-paths ghc-pkg-lib haskeline
          haskell-src-exts HTTP http-conduit monad-logger mtl parallel-io
@@ -112925,7 +115827,7 @@ self: {
        sha256 = "1c9akvpvwakdnqciz57bwjhqkdfkky43wmj7rx9fsk552pamzijk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring containers process ];
+       executableHaskellDepends = [ base bytestring containers process ];
        jailbreak = true;
        description = "Generates graphviz file of scons dependency information";
        license = "GPL";
@@ -112940,7 +115842,7 @@ self: {
        pname = "scope";
        version = "0.8.0.1";
        sha256 = "1ks66paa30xwqgrllkyz0phh73pc0d2f6aq474cpz7gdb7zyrkzi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers iteratee MonadCatchIO-transformers mtl
          mwc-random time unix zoom-cache
        ];
@@ -112959,7 +115861,11 @@ self: {
        sha256 = "0dhpyf0kh6qrrcyr3iwp3i3rkj5vcl7k7aa9qmxq2qq1f6dhw4p6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base cairo gtk MonadCatchIO-transformers mtl old-locale scope time
+         zoom-cache
+       ];
+       executableHaskellDepends = [
          base cairo gtk MonadCatchIO-transformers mtl old-locale scope time
          zoom-cache
        ];
@@ -112977,7 +115883,7 @@ self: {
        pname = "scottish";
        version = "0.1.0.1";
        sha256 = "01874r5r6lzwa7w0pa5i0ymnxb5vpkpxyfnf3knlyblv9b5j82nx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default enclosed-exceptions http-types lens mtl
          persistent resource-pool scotty stm text transformers wai warp
        ];
@@ -112998,16 +115904,16 @@ self: {
      mkDerivation {
        pname = "scotty";
        version = "0.10.2";
-       revision = "1";
        sha256 = "0jlw82brnvc4cbpws0dq3qxn4rnb3z6rx6cfiarqwas14x4k3kl6";
+       revision = "1";
        editedCabalFile = "e0ab23342583c37af1a5422fad9a64926e54cad208dbcac75c70b3db40bf9e99";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class http-types monad-control mtl nats network
          regex-compat text transformers transformers-base
          transformers-compat wai wai-extra warp
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base data-default-class directory hspec hspec-wai http-types
          lifted-base network text wai
        ];
@@ -113024,10 +115930,10 @@ self: {
        pname = "scotty-binding-play";
        version = "1.3";
        sha256 = "0k9ylywhvb4nfnm304zlan0bzdx8rxcwnvip8assz80kz47zvjp9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring mtl scotty template-haskell text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec http-client HUnit scotty text transformers
        ];
        homepage = "https://github.com/welmo/scotty-binding-play";
@@ -113042,7 +115948,9 @@ self: {
        pname = "scotty-blaze";
        version = "0.1.3";
        sha256 = "0bl37bplal6y6ma0ba8llypsrx11959vcq04s8x6642hzk0cgid7";
-       buildDepends = [ base blaze-builder blaze-html mtl scotty wai ];
+       libraryHaskellDepends = [
+         base blaze-builder blaze-html mtl scotty wai
+       ];
        description = "blaze-html integration for Scotty";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113056,7 +115964,7 @@ self: {
        pname = "scotty-cookie";
        version = "0.1.0.3";
        sha256 = "0wyvx30889lbbgq7dmjfldlbnyg1b8b3zh1py5lis59mwz6r3w9l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers cookie scotty text time
          transformers
        ];
@@ -113074,11 +115982,11 @@ self: {
        pname = "scotty-fay";
        version = "0.1.1";
        sha256 = "13ksxw2v6gac3r368ifnbrrgmmafr2fyki63ws4qxw415fwnqa82";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default directory fay fay-jquery filepath
          http-types scotty text transformers wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring data-default directory fay fay-jquery filepath
          http-types HUnit scotty test-framework test-framework-hunit text
          transformers wai wai-test
@@ -113097,7 +116005,7 @@ self: {
        pname = "scotty-hastache";
        version = "0.2.1";
        sha256 = "1yyip8iq1n71iidmpbfs7rifxvpphyrcaf4z394rx36hq72ka8dn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath hastache http-types mtl scotty text wai
          warp
        ];
@@ -113116,7 +116024,7 @@ self: {
        pname = "scotty-session";
        version = "0.0.5";
        sha256 = "1jvxzsnprfp2k9svkzxykmpc3qs6dvzc0wnnircyimha4gca6qh7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring crypto-api
          http-types scotty stm text time transformers unordered-containers
          wai
@@ -113133,11 +116041,12 @@ self: {
        pname = "scotty-tls";
        version = "0.4.0";
        sha256 = "1axr54s8zi9jw5y6yl2izjx4xvd25y18nh4fw7asq9fz0nwjb45a";
-       buildDepends = [ base scotty transformers wai warp warp-tls ];
+       libraryHaskellDepends = [
+         base scotty transformers wai warp warp-tls
+       ];
        homepage = "https://github.com/dmjio/scotty-tls.git";
        description = "TLS for Scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scp-streams" = callPackage
@@ -113150,11 +116059,13 @@ self: {
        sha256 = "1wi860cl9dsq6hfhyas3dk0gcjyd8hx62k3fjwgr5x56ps5fp6ry";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring cmdargs io-streams process SHA
-         sha-streams unix
+       libraryHaskellDepends = [
+         attoparsec base bytestring io-streams process
        ];
-       testDepends = [ base bytestring io-streams ];
+       executableHaskellDepends = [
+         base bytestring cmdargs io-streams SHA sha-streams unix
+       ];
+       testHaskellDepends = [ base bytestring io-streams ];
        jailbreak = true;
        homepage = "https://github.com/noteed/scp-streams";
        description = "An SCP protocol implementation";
@@ -113171,7 +116082,7 @@ self: {
        sha256 = "035jpwp58l70jd0dklx5rg0sm8b2bd5r1m726dbhhlv60w6bdfn3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary containers deepseq directory mtl packed-dawg
          parallel split
        ];
@@ -113191,10 +116102,14 @@ self: {
        sha256 = "161l75bni4fxmh35dfz8r2vgllmmf0s55j9y2xpyskqfj3xc85a7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers curl MissingH network network-uri old-locale
          pureMD5 time url
        ];
+       executableHaskellDepends = [
+         base containers curl MissingH network network-uri old-locale time
+         url
+       ];
        description = "Scrobbling server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113211,7 +116126,7 @@ self: {
        sha256 = "06nzvvqn592jgf93zck74w1nhzjq0llzypsy7x575ljvprb3ph0d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring case-insensitive containers data-default IfElse
          monad-loops mtl ncurses optparse-applicative random text unix
          vector
@@ -113231,8 +116146,10 @@ self: {
        pname = "scrypt";
        version = "0.5.0";
        sha256 = "1cnrjdq1ncv224dlk236a7w29na8r019d2acrsxlsaiy74iadh1y";
-       buildDepends = [ base base64-bytestring bytestring entropy ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring entropy
+       ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -113254,7 +116171,7 @@ self: {
        sha256 = "1j5mvvrk1647qfqdl4q6ywnx7l9bgnqp6rsjr1l8bynikfm0ghcg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base base16-bytestring bytestring conduit containers
          cryptohash directory filepath friendly-time hashable http-conduit
          http-types MonadRandom mtl network old-locale process random stm
@@ -113277,14 +116194,13 @@ self: {
        sha256 = "0c4djdr2lq6kbi726zmjicscsc2ksj4l787pzyj5lfbl9c11fb6j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base cmdargs containers directory filepath json mtl parsec
          pretty process safe tagsoup time uniplate utf8-string
        ];
-       buildTools = [ alex ];
+       executableToolDepends = [ alex ];
        description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sde-solver" = callPackage
@@ -113296,7 +116212,7 @@ self: {
        pname = "sde-solver";
        version = "0.1.0.0";
        sha256 = "0sp12fcf1h4qs0l5iblf3kl6nv1sb4ff49p2ybmrx7jifiwqxma6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cereal cereal-vector ghc-prim haskell-mpi
          mersenne-random-pure64 mtl mwc-random normaldistribution parallel
          vector
@@ -113314,8 +116230,8 @@ self: {
        pname = "sdf2p1-parser";
        version = "0.1.1";
        sha256 = "1az42i4ridb4xza6zyg2mrsfv7gjp61727cmnfcy5x5b55nl3ahz";
-       buildDepends = [ base bytestring parsec transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring parsec transformers ];
+       testHaskellDepends = [
          base bytestring Cabal HUnit parsec test-framework
          test-framework-hunit transformers
        ];
@@ -113330,9 +116246,9 @@ self: {
        pname = "sdl2";
        version = "1.3.1";
        sha256 = "17d3nmiz32hccbbxx55wa2zca8xn7mq3f02rcarzynqczvi5hlyv";
-       buildDepends = [ base transformers ];
-       extraLibraries = [ SDL2 ];
-       pkgconfigDepends = [ SDL2 ];
+       libraryHaskellDepends = [ base transformers ];
+       librarySystemDepends = [ SDL2 ];
+       libraryPkgconfigDepends = [ SDL2 ];
        description = "Low-level bindings to SDL2";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) SDL2;};
@@ -113343,12 +116259,11 @@ self: {
        pname = "sdl2-image";
        version = "0.1.3.2";
        sha256 = "0gps89yy4jzmlh5cdvs94mhmqlakqb99ldall3rirqdfhdv2wysj";
-       buildDepends = [ base sdl2 ];
-       extraLibraries = [ SDL2 ];
-       pkgconfigDepends = [ SDL2 SDL2_image ];
+       libraryHaskellDepends = [ base sdl2 ];
+       librarySystemDepends = [ SDL2 ];
+       libraryPkgconfigDepends = [ SDL2 SDL2_image ];
        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
@@ -113357,9 +116272,9 @@ self: {
        pname = "sdl2-ttf";
        version = "0.2.1";
        sha256 = "0w760xsb02n0j4bv7iigc810mwasgjf8lckrjqbipqvvq1am3l56";
-       buildDepends = [ base sdl2 ];
-       testDepends = [ base sdl2 ];
-       extraLibraries = [ SDL2 SDL2_ttf ];
+       libraryHaskellDepends = [ base sdl2 ];
+       librarySystemDepends = [ SDL2 SDL2_ttf ];
+       testHaskellDepends = [ base sdl2 ];
        description = "Binding to libSDL2-ttf";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) SDL2;  inherit (pkgs) SDL2_ttf;};
@@ -113370,7 +116285,7 @@ self: {
        pname = "sdnv";
        version = "0.1.0.0";
        sha256 = "07d7989v4a8dz5jqrhz56ki9wkngaf1d0153271lylj015y00rmc";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        description = "Self-delimiting numeric values encoding library";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -113387,13 +116302,13 @@ self: {
        pname = "sdr";
        version = "0.1.0.3";
        sha256 = "1whw45vnns0f5iw9vlmfxw90y3l0gp0q5yar6p6dp1dn57gyrdkc";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cairo cereal Chart Chart-cairo colour
          containers Decimal dynamic-graph either fftwRaw GLFW-b OpenGL
          optparse-applicative pango pipes pipes-bytestring pipes-concurrency
          primitive pulse-simple rtlsdr storable-complex time tuple vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base primitive QuickCheck storable-complex test-framework
          test-framework-quickcheck2 vector
        ];
@@ -113415,7 +116330,7 @@ self: {
        pname = "seacat";
        version = "1.0.0.3";
        sha256 = "0iyl7mp0vpxy4kqr7qqqz642zxpla3ydlbdzmw4ipjmg5gwjr7pm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-html bytestring ConfigFile data-default
          directory filepath http-types mime-types MissingH monad-control mtl
          network persistent persistent-postgresql persistent-sqlite
@@ -113435,7 +116350,7 @@ self: {
        pname = "seal-module";
        version = "0.1.0.1";
        sha256 = "0x2m280qbfaswr2gk26d26dwg2s3v1nk4n93zh2fh1ikpkw13dfq";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell support for global configuration data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113448,10 +116363,10 @@ self: {
        pname = "search";
        version = "0.1.0.1";
        sha256 = "0w9pfyw33zrfjy70bwslbgyns1jswshzxcz71cgbfl4q5hjbmvkw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ghc-prim profunctors semigroupoids tagged transformers
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/search/";
        description = "Infinite search in finite time with Hilbert's epsilon";
@@ -113465,7 +116380,7 @@ self: {
        pname = "sec";
        version = "0.0.1";
        sha256 = "1ryl0nm1a37r606xhxy6ykf3c8c1gml6gdqna428w8y3a2vg5q2v";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/urso/sec";
        description = "Semantic Editor Combinators";
@@ -113480,7 +116395,8 @@ self: {
        sha256 = "0qrb2g7dfhh2m3hwp39xlimbc3kinww279a58pah738gqnhmayrs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        homepage = "http://github.com/pgavin/secdh";
        description = "SECDH Machine Simulator";
        license = stdenv.lib.licenses.bsd3;
@@ -113493,7 +116409,7 @@ self: {
        pname = "seclib";
        version = "1.1.0.2";
        sha256 = "0jbgdd3mh126c3n0sblvd7rbcnnzrfyfajrj9xcsj7zi7jqvs8nw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "A simple library for static information-flow security in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -113510,20 +116426,21 @@ self: {
        pname = "second-transfer";
        version = "0.6.0.0";
        sha256 = "1w726qfbz86sicpg5apx5n767av61l3kn8fra7ban8f67amg3z7w";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring binary bytestring clock conduit
          containers deepseq exceptions hashable hashtables hslogger http2
          lens network network-uri pqueue SafeSemaphore stm text time
          transformers
        ];
-       testDepends = [
+       librarySystemDepends = [ openssl ];
+       libraryToolDepends = [ cpphs ];
+       testHaskellDepends = [
          attoparsec base base16-bytestring binary bytestring clock conduit
-         containers cpphs deepseq exceptions hashable hashtables hslogger
-         http2 HUnit lens network network-uri pqueue SafeSemaphore stm text
-         time transformers unordered-containers
+         containers deepseq exceptions hashable hashtables hslogger http2
+         HUnit lens network network-uri pqueue SafeSemaphore stm text time
+         transformers unordered-containers
        ];
-       buildTools = [ cpphs ];
-       extraLibraries = [ openssl ];
+       testToolDepends = [ cpphs ];
        homepage = "https://www.httptwo.com/second-transfer/";
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
@@ -113540,7 +116457,7 @@ self: {
        sha256 = "0qrc1jk2hhhhq0cq9h9g8pc2frjsb1m96h6sdj79m7km5dc2slm8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers diagrams-cairo diagrams-lib haskell-qrencode random
        ];
        jailbreak = true;
@@ -113559,11 +116476,11 @@ self: {
        pname = "secret-sharing";
        version = "1.0.0.3";
        sha256 = "0q315gmfnhpzgi4r0p3li8vvrdl2a0xgh0gxdin6s3nkh6hjpbv2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring dice-entropy-conduit finite-field polynomial
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "http://monoid.at/code";
@@ -113580,7 +116497,7 @@ self: {
        sha256 = "0hcf8mxl1br27764ha0gdf7jdl7zlxknbspqijw0jr6ws7hshxg9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 ];
+       executableHaskellDepends = [ base haskell98 ];
        jailbreak = true;
        description = "Example of writing \"secure\" file removal in Haskell rather than C";
        license = stdenv.lib.licenses.publicDomain;
@@ -113595,7 +116512,7 @@ self: {
        pname = "secure-sockets";
        version = "1.2.9.2";
        sha256 = "0ijizi76fzqamynwhyd3ppzy90bfvypmzbjr0v63ng2w0mwnrjlz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory HsOpenSSL network process transformers
        ];
        homepage = "http://code.google.com/p/secure-hs/";
@@ -113609,7 +116526,9 @@ self: {
        pname = "securemem";
        version = "0.1.9";
        sha256 = "0dkhhjxa7njc3qbgvd5a23rkvr39vj2kn2a9nk6yjg7a8b2hvdpy";
-       buildDepends = [ base byteable bytestring ghc-prim memory ];
+       libraryHaskellDepends = [
+         base byteable bytestring ghc-prim memory
+       ];
        homepage = "http://github.com/vincenthz/hs-securemem";
        description = "abstraction to an auto scrubbing and const time eq, memory chunk";
        license = stdenv.lib.licenses.bsd3;
@@ -113623,10 +116542,10 @@ self: {
        pname = "sednaDBXML";
        version = "0.1.2.5";
        sha256 = "068yl4z0wb5kr7a7c7haah3z391mjqdzgxh5rg68rrjgvf7dczky";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL bytestring containers iteratee mtl text
        ];
-       extraLibraries = [ sedna ];
+       librarySystemDepends = [ sedna ];
        description = "Sedna C API XML Binding";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113638,7 +116557,7 @@ self: {
        pname = "select";
        version = "0.4.0.1";
        sha256 = "180cj5m0bap1lb19s68icpn1dvk2s395cmlcc6dnwz3mpbj5alj0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://nonempty.org/software/haskell-select";
        description = "Wrap the select(2) POSIX function";
        license = stdenv.lib.licenses.bsd3;
@@ -113652,10 +116571,10 @@ self: {
        pname = "selectors";
        version = "0.0.3.0";
        sha256 = "1chs2d1j58y4r01231hh50gr4h0wnwsg9mardzq8ybqc6z6l32pr";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers template-haskell text xml-conduit
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
        homepage = "http://github.com/rcallahan/selectors";
        description = "CSS Selectors for DOM traversal";
        license = stdenv.lib.licenses.bsd3;
@@ -113668,7 +116587,7 @@ self: {
        pname = "selenium";
        version = "0.2.5";
        sha256 = "0vr3d891pj947lv2grgbc83nm828gz9bbz6dp8mnf9bsji3ih7l7";
-       buildDepends = [ base HTTP HUnit mtl network pretty ];
+       libraryHaskellDepends = [ base HTTP HUnit mtl network pretty ];
        description = "Test web applications through a browser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113683,12 +116602,12 @@ self: {
        pname = "selenium-server";
        version = "0.1.0.0";
        sha256 = "13bqzhia3z35174hzf2ipl4ga62mcvh7whvhwj5b8rsazgi259qf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit directory filepath http-conduit
          http-conduit-downloader network process random regex-tdfa
          utf8-string
        ];
-       testDepends = [ base hspec text webdriver ];
+       testHaskellDepends = [ base hspec text webdriver ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/selenium-server.git";
        description = "Run the selenium standalone server for usage with webdriver";
@@ -113702,7 +116621,7 @@ self: {
        pname = "selfrestart";
        version = "0.1.0";
        sha256 = "100a427r8xjfv7fsh7khj3db9klqwnalfy33w23khxqp7k1bkq3n";
-       buildDepends = [ base directory executable-path unix ];
+       libraryHaskellDepends = [ base directory executable-path unix ];
        homepage = "https://github.com/nh2/selfrestart";
        description = "Restarts the current executable (on binary change)";
        license = stdenv.lib.licenses.mit;
@@ -113714,8 +116633,8 @@ self: {
        pname = "selinux";
        version = "0.1.1";
        sha256 = "1r0lwah32y3cza5jnihzwkl4wdk23qh7sgw6yzcajq7rjnzrf8qw";
-       buildDepends = [ base unix ];
-       extraLibraries = [ selinux ];
+       libraryHaskellDepends = [ base unix ];
+       librarySystemDepends = [ selinux ];
        homepage = "https://github.com/luite/selinux";
        description = "SELinux bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -113728,7 +116647,7 @@ self: {
        pname = "semaphore-plus";
        version = "0.1";
        sha256 = "1349pzjs91xayx4dib520037mmgh4lvyc0wjx8h8yf492dvfbdkr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Various concurrency abstractions built on top of semaphores";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113741,7 +116660,7 @@ self: {
        pname = "semi-iso";
        version = "1.0.0.0";
        sha256 = "09hcg6hkyd4bnk0586gk4dzc76g64sx37jg0pz3jq87lrq8dzm5g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens profunctors semigroupoids transformers tuple-morph
        ];
        description = "Weakened partial isomorphisms, reversible computations";
@@ -113755,7 +116674,7 @@ self: {
        pname = "semigroupoid-extras";
        version = "5";
        sha256 = "0ciq1jnc0d9d8jph9103v04vphiz7xqa69a8f4dmmcf3bjsk6bhh";
-       buildDepends = [ base profunctors semigroupoids ];
+       libraryHaskellDepends = [ base profunctors semigroupoids ];
        homepage = "http://github.com/ekmett/semigroupoid-extras";
        description = "Semigroupoids that depend on PolyKinds";
        license = stdenv.lib.licenses.bsd3;
@@ -113770,11 +116689,11 @@ self: {
        pname = "semigroupoids";
        version = "5.0.0.2";
        sha256 = "14q7284gq44h86j6jxi7pz1hxwfal0jgv6i2j1v2hdzqfnd8z5sw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-orphans bifunctors comonad containers contravariant
          distributive semigroups tagged transformers transformers-compat
        ];
-       testDepends = [ base directory doctest filepath ];
+       testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
@@ -113790,11 +116709,11 @@ self: {
        pname = "semigroupoids-syntax";
        version = "0.0.1";
        sha256 = "1r3byywgbcn82dq9xw4k9m5lgmhsgj02rxwmkrp4jwrjaax8v4zh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad containers contravariant distributive semigroupoids
          semigroups transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        jailbreak = true;
@@ -113811,7 +116730,7 @@ self: {
        pname = "semigroups";
        version = "0.16.2.2";
        sha256 = "0mzdv05yhrvnib62mwfwwj66fmyzs3axm0y5sn374ig2r113wzni";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers deepseq hashable nats text
          unordered-containers
        ];
@@ -113826,7 +116745,7 @@ self: {
        pname = "semigroups-actions";
        version = "0.1";
        sha256 = "0vns2vdchszw34i12s9rfl4cm76ympfrivpb397j2vzg2i7bghqb";
-       buildDepends = [ base containers semigroups ];
+       libraryHaskellDepends = [ base containers semigroups ];
        jailbreak = true;
        homepage = "http://github.com/ppetr/semigroups-actions/";
        description = "Semigroups actions";
@@ -113845,7 +116764,8 @@ self: {
        sha256 = "1b56y5a45fha07rbqqjl6f5i2bw9pji97pagyjcn9bprzqfbiymy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base Boolean containers monoids ];
+       executableHaskellDepends = [
          base Boolean containers HUnit monoids QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -113862,7 +116782,7 @@ self: {
        pname = "semiring-simple";
        version = "0.2.1.0";
        sha256 = "074wp8bn6jhx8jjp78dzjpy9bdwc2i1a1sp6qkqj689zvrhwfman";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A module for dealing with semirings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113875,8 +116795,8 @@ self: {
        pname = "semver";
        version = "0.3.3.1";
        sha256 = "1cf8dcxq4s479f826drncqc4hd07hv330zsipkrn0vc30sbkdlrn";
-       buildDepends = [ attoparsec base deepseq text ];
-       testDepends = [ base tasty tasty-hunit text ];
+       libraryHaskellDepends = [ attoparsec base deepseq text ];
+       testHaskellDepends = [ base tasty tasty-hunit text ];
        homepage = "https://github.com/brendanhay/semver";
        description = "Representation, manipulation, and de/serialisation of Semantic Versions";
        license = "unknown";
@@ -113888,7 +116808,7 @@ self: {
        pname = "sendfile";
        version = "0.7.9";
        sha256 = "0hnw1ym81cff49dwww19kgbs4s0kpandbvn6h5cml3y0p1nxybqh";
-       buildDepends = [ base bytestring network ];
+       libraryHaskellDepends = [ base bytestring network ];
        homepage = "http://hub.darcs.net/stepcut/sendfile";
        description = "A portable sendfile library";
        license = stdenv.lib.licenses.bsd3;
@@ -113902,7 +116822,7 @@ self: {
        pname = "sendgrid-haskell";
        version = "1.0";
        sha256 = "0k5sbc4j9palfsp7ryap79scb50jhm0kzzq0lfa0r7py1pkx2ylp";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers exceptions http-conduit
          monad-control text transformers
        ];
@@ -113921,7 +116841,7 @@ self: {
        sha256 = "1yzh1ngfddybxwqybvdg7l5lgg85kmhqhdl3mzsnndvz2labphp1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring containers process stm zeromq3-haskell
        ];
        jailbreak = true;
@@ -113942,10 +116862,11 @@ self: {
        sha256 = "1kv4ldms739x4b2fbs6hjwy8bssrwv0kavn4jqdc2svzlfqxqsqx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring cereal cmdargs directory filepath
          old-locale old-time process safecopy time unix
        ];
+       executableHaskellDepends = [ base directory filepath unix ];
        jailbreak = true;
        homepage = "https://github.com/noteed/sentry";
        description = "Process monitoring tool written and configured in Haskell";
@@ -113972,8 +116893,10 @@ self: {
        pname = "separated";
        version = "0.1.0";
        sha256 = "18kb9c6l0ikhzy3kiw4pg5b7vcm42hhbkp693qyygpr74hzpi2h2";
-       buildDepends = [ base bifunctors lens semigroupoids semigroups ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bifunctors lens semigroupoids semigroups
+       ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/tonymorris/separated";
@@ -113993,10 +116916,13 @@ self: {
        sha256 = "0kmzzxk1z10lqjawl0yqbv1n35b0bx41ikgiqii202m73khbg9qn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base Cabal containers cpphs deepseq-bounded directory
-         exceptions filepath ghc ghc-paths mtl process regex-base regex-pcre
-         syb template-haskell temporary transformers
+       libraryHaskellDepends = [
+         array base containers cpphs deepseq-bounded exceptions filepath ghc
+         ghc-paths mtl regex-pcre syb template-haskell temporary
+         transformers
+       ];
+       executableHaskellDepends = [
+         base Cabal cpphs directory process regex-base regex-pcre temporary
        ];
        jailbreak = true;
        homepage = "http://fremissant.net/seqaid";
@@ -114011,7 +116937,7 @@ self: {
        pname = "seqalign";
        version = "0.2.0.4";
        sha256 = "01a3fhymyp7279hym03zzz6qkh5h47nq5y1xglar0n46imjr98af";
-       buildDepends = [ base bytestring vector ];
+       libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114022,7 +116948,7 @@ self: {
        pname = "seqid";
        version = "0.1.0";
        sha256 = "0q5vs8kravhiq906rrzi5iw5837bb8s6fibycgdracyfwrzvxly0";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
@@ -114034,7 +116960,7 @@ self: {
        pname = "seqid";
        version = "0.4.1";
        sha256 = "0lfgw2fwizhid58aj4ncia8pqldzmkpzrmpgmvw51pgd0c25wjz0";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114045,7 +116971,7 @@ self: {
        pname = "seqid-streams";
        version = "0.1.0";
        sha256 = "13g0c76lyl3b4qdznpyr2a3szjb1dch2bsvgyv68br94045fk6d2";
-       buildDepends = [ base io-streams seqid ];
+       libraryHaskellDepends = [ base io-streams seqid ];
        jailbreak = true;
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
@@ -114057,7 +116983,7 @@ self: {
        pname = "seqid-streams";
        version = "0.4.0";
        sha256 = "05h2878dlrnlv66lsf41bngk4w9nwqviq4jl3bj0wdhcdvy9d9il";
-       buildDepends = [ base io-streams seqid ];
+       libraryHaskellDepends = [ base io-streams seqid ];
        jailbreak = true;
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
@@ -114071,11 +116997,11 @@ self: {
        pname = "seqloc";
        version = "0.6.1.1";
        sha256 = "1hsm9y6q0g7ixnqj562a33lmyka4k7f778fndcmn25v4m1myfda4";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base biocore bytestring hashable unordered-containers
          vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base biocore bytestring hashable QuickCheck random
          unordered-containers vector
        ];
@@ -114097,13 +117023,18 @@ self: {
        sha256 = "175nifix2vax5xsinz604mm3nid7krh5a9d7gqpy02wh4f5qdrja";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base biocore bytestring conduit conduit-extra hashable
+         iteratee lifted-base resourcet seqloc transformers-base
+         unordered-containers
+       ];
+       executableHaskellDepends = [
          attoparsec base biocore bytestring cmdtheline conduit conduit-extra
          filepath hashable iteratee lifted-base monads-tf pretty QuickCheck
          random resourcet seqloc transformers transformers-base
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base biocore bytestring conduit conduit-extra directory
          hashable iteratee lifted-base process QuickCheck random seqloc
          transformers transformers-base unordered-containers vector
@@ -114120,7 +117051,7 @@ self: {
        pname = "sequence";
        version = "0.9.8";
        sha256 = "0ayxy0lbkah90kpyjac0llv6lrbwymvfz2d3pdfrz1079si65jsh";
-       buildDepends = [ base containers transformers ];
+       libraryHaskellDepends = [ base containers transformers ];
        homepage = "https://github.com/atzeus/sequence";
        description = "A type class for sequences and various sequence data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -114134,7 +117065,10 @@ self: {
        sha256 = "1q9rrr0nrnnhdv2jwpwjs1r98g3xdbqi7sfj7zsv1dykzalmc2nd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers ghc transformers ];
+       libraryHaskellDepends = [
+         base bytestring containers ghc transformers
+       ];
+       executableHaskellDepends = [ base bytestring containers ];
        homepage = "https://github.com/lukemaurer/sequent-core";
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -114147,7 +117081,7 @@ self: {
        pname = "sequential-index";
        version = "0.2.0.1";
        sha256 = "0vd7nrkx59vsxrhpb46kgzbvz7v830wh5zx3vg9494wvski983y6";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/aristidb/sequential-index";
        description = "Sequential numbers that allow arbitrarily inserting numbers - for containers";
        license = stdenv.lib.licenses.bsd3;
@@ -114163,7 +117097,11 @@ self: {
        sha256 = "1m41yk7bgazl9g30im8qvnvzjh4f4kvrd6jhk1wz2r31xxlxp7ms";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base binary bytestring containers mtl nlp-scores pretty split
+         text vector
+       ];
+       executableHaskellDepends = [
          array base binary bytestring containers mtl nlp-scores pretty split
          text vector
        ];
@@ -114181,14 +117119,13 @@ self: {
        pname = "serf";
        version = "0.1.1.0";
        sha256 = "0ry0shqmazxcsjxsh6amvz2fky2fy3wwlck7d331j8csz7fwdjfn";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base conduit conduit-extra mtl operational process
          resourcet text
        ];
        homepage = "http://github.com/sanetracker/serf";
        description = "Interact with Serf via Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serial" = callPackage
@@ -114197,7 +117134,7 @@ self: {
        pname = "serial";
        version = "0.2.7";
        sha256 = "1h52h8i28bhamp57q57ih1w9h26ih9g1l25gg9rhiwv5ykhy2vfq";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "POSIX serial port wrapper";
        license = "LGPL";
      }) {};
@@ -114210,8 +117147,10 @@ self: {
        pname = "serial-test-generators";
        version = "0.1.3";
        sha256 = "0crivy8j3jnlm2vpbvfqgvmr6afwyg3lkzaj7jl0j6vgvq16xyas";
-       buildDepends = [ aeson base binary bytestring cereal here ];
-       testDepends = [
+       libraryHaskellDepends = [
+         aeson base binary bytestring cereal here
+       ];
+       testHaskellDepends = [
          aeson base binary bytestring cereal here hspec QuickCheck
          system-fileio transformers
        ];
@@ -114225,8 +117164,8 @@ self: {
        pname = "serialport";
        version = "0.4.7";
        sha256 = "1z2drw7ighyws72wqms015n5hy0zxbrphdca7ldn34pz28122z07";
-       buildDepends = [ base bytestring unix ];
-       testDepends = [ base bytestring HUnit ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [ base bytestring HUnit ];
        homepage = "https://github.com/jputcu/serialport";
        description = "Cross platform serial port library";
        license = stdenv.lib.licenses.bsd3;
@@ -114243,12 +117182,12 @@ self: {
        pname = "servant";
        version = "0.4.4";
        sha256 = "1v0n194gj2cy16scfgs94q2vcb2baryp0rl1s21zwww1kfgmpffj";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
          string-conversions text
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring directory doctest filemanip
          filepath hspec parsec QuickCheck quickcheck-instances
          string-conversions text url
@@ -114268,9 +117207,11 @@ self: {
        sha256 = "1fnlyk6848nzby0nxdrvm4d0vvisdx6pmlzjnh6y1q5q8wq4m48j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring http-media JuicyPixels servant servant-server wai
-         warp
+       libraryHaskellDepends = [
+         base bytestring http-media JuicyPixels servant
+       ];
+       executableHaskellDepends = [
+         base JuicyPixels servant servant-server wai warp
        ];
        homepage = "https://github.com/tvh/servant-JuicyPixels";
        description = "servant-JuicyPixels";
@@ -114283,7 +117224,7 @@ self: {
        pname = "servant-blaze";
        version = "0.4.4";
        sha256 = "140sgy7hcp6pxjrh7zk5i59sq79swqgg76gakgdnvkg7zz0a150s";
-       buildDepends = [ base blaze-html http-media servant ];
+       libraryHaskellDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
        license = stdenv.lib.licenses.bsd3;
@@ -114300,12 +117241,12 @@ self: {
        pname = "servant-client";
        version = "0.4.4";
        sha256 = "0m5aw8pb6iga2rf8m3mnx58xh6jnh33rvvkdzbmb3s6vplsqh6vz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring either exceptions http-client
          http-client-tls http-media http-types network-uri safe servant
          string-conversions text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring deepseq either hspec http-client http-media
          http-types HUnit network QuickCheck servant servant-server text wai
          warp
@@ -114326,12 +117267,18 @@ self: {
        sha256 = "0kp5346jxakjz8x92wvayz7c3f2xcvnpsgg9dxgb41imvww2pyfc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base bytestring bytestring-conversion case-insensitive
-         hashable http-media http-types lens servant string-conversions text
+       libraryHaskellDepends = [
+         base bytestring bytestring-conversion case-insensitive hashable
+         http-media http-types lens servant string-conversions text
          unordered-containers
        ];
-       testDepends = [ aeson base hspec lens servant string-conversions ];
+       executableHaskellDepends = [
+         aeson base bytestring-conversion lens servant string-conversions
+         text
+       ];
+       testHaskellDepends = [
+         aeson base hspec lens servant string-conversions
+       ];
        homepage = "http://haskell-servant.github.io/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
@@ -114349,10 +117296,13 @@ self: {
        sha256 = "0lq9kd96lzkyx35n46q0yxk44lirpnh9gv4wji8i8qjqf18fkg6c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring ede either filepath http-media http-types
-         semigroups servant servant-server text transformers
-         unordered-containers vector wai warp xss-sanitize
+         semigroups servant text transformers unordered-containers vector
+         wai xss-sanitize
+       ];
+       executableHaskellDepends = [
+         base ede http-media servant-server warp
        ];
        homepage = "http://github.com/alpmestan/servant-ede";
        description = "Combinators for rendering EDE templates in servant web applications";
@@ -114371,7 +117321,7 @@ self: {
        sha256 = "1qzrlkqwfv4w7d3sjbvz3s4kgx0x6zn0hh07hm955vvlfksgwjym";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring directory either http-types js-jquery lucid
          random servant servant-client servant-docs servant-jquery
          servant-lucid servant-server text time transformers wai wai-extra
@@ -114393,11 +117343,11 @@ self: {
        sha256 = "04j2cnxrx2hljxnha94nbmql61zw3apz7n32mf23vf749svjcmvd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base charset filepath lens servant servant-server stm text
-         transformers warp
+       libraryHaskellDepends = [ base charset lens servant text ];
+       executableHaskellDepends = [
+         aeson base filepath servant servant-server stm transformers warp
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec hspec-expectations language-ecmascript lens servant
        ];
        homepage = "http://haskell-servant.github.io/";
@@ -114411,7 +117361,7 @@ self: {
        pname = "servant-lucid";
        version = "0.4.4";
        sha256 = "1vy9vdd1jkvx7nzcw6a83az4p351ds98x7wasn496h3bwk23bbhr";
-       buildDepends = [ base http-media lucid servant ];
+       libraryHaskellDepends = [ base http-media lucid servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Servant support for lucid";
        license = stdenv.lib.licenses.bsd3;
@@ -114424,16 +117374,15 @@ self: {
      mkDerivation {
        pname = "servant-pandoc";
        version = "0.4.1.1";
-       revision = "1";
        sha256 = "00clyv651fyz0dx9b4g5c0z5z3bgybgg93x4s1b1lciwsin8i6nk";
+       revision = "1";
        editedCabalFile = "ee2eff37865c8a5c246021f6d05aae5f075ba5910cac6d650312aafb2f4bf091";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-media lens pandoc-types servant-docs text
          unordered-containers
        ];
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-pool" = callPackage
@@ -114442,7 +117391,7 @@ self: {
        pname = "servant-pool";
        version = "0.1";
        sha256 = "0if4lxb0fpdd4lnkz9j7z6vhjbrcc80pvz9jb6sdb9p6sbbgqf69";
-       buildDepends = [ base resource-pool servant time ];
+       libraryHaskellDepends = [ base resource-pool servant time ];
        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;
@@ -114457,7 +117406,7 @@ self: {
        pname = "servant-postgresql";
        version = "0.1";
        sha256 = "1svy1v6sl5pq0zs8ms4qf7wn6zar63bqmfiyfqgz84ryli0wxrhj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring postgresql-simple servant servant-pool
          servant-response
        ];
@@ -114473,7 +117422,7 @@ self: {
        pname = "servant-response";
        version = "0.1";
        sha256 = "0vgzi6nm3f1vjbnvhzcr6v2fh75fsl18wsps54ya0mbmfn2v6chy";
-       buildDepends = [ aeson base http-types text ];
+       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";
        license = stdenv.lib.licenses.bsd3;
@@ -114487,7 +117436,7 @@ self: {
        pname = "servant-scotty";
        version = "0.1.1";
        sha256 = "0d3yc7aa2p1izizqnj81iscj9hbgbkpyav1ncmxzkr48svr6h783";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base http-types scotty servant servant-response text
          transformers
        ];
@@ -114511,12 +117460,13 @@ self: {
        sha256 = "0byxply71jv558bs33i1j9whrfgfa1iygdjsxap7wiq9f27iyaa9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring either filepath http-types mmorph
          mtl network-uri safe servant split string-conversions
          system-filepath text transformers wai wai-app-static warp
        ];
-       testDepends = [
+       executableHaskellDepends = [ aeson base servant text wai warp ];
+       testHaskellDepends = [
          aeson base bytestring bytestring-conversion directory doctest
          either exceptions filemanip filepath hspec hspec-wai http-types mtl
          network parsec QuickCheck servant string-conversions temporary text
@@ -114536,11 +117486,11 @@ self: {
        pname = "serversession";
        version = "1.0.1";
        sha256 = "08j8v6a2018bmvwsb7crdg0ajak74jggb073pdpx9s0pf3cfzyrz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring data-default hashable nonce
          path-pieces text time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base64-bytestring bytestring containers data-default
          hspec nonce path-pieces QuickCheck text time transformers
          unordered-containers
@@ -114558,11 +117508,11 @@ self: {
        pname = "serversession-backend-acid-state";
        version = "1.0.1";
        sha256 = "1hc5vpy82pxd0wlzabw3md4gvhxbnvs8wsa0wammni2a1pf123a7";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state base containers mtl safecopy serversession
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          acid-state base containers hspec mtl safecopy serversession
          unordered-containers
        ];
@@ -114582,12 +117532,12 @@ self: {
        pname = "serversession-backend-persistent";
        version = "1.0.1";
        sha256 = "0n4l2hgfzlg1ra4blq6dcp61mvcfm6k8cwafi6rrzid67amr022k";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring cereal path-pieces
          persistent serversession tagged text time transformers
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base base64-bytestring bytestring cereal hspec monad-logger
          path-pieces persistent persistent-postgresql persistent-sqlite
          persistent-template QuickCheck resource-pool serversession text
@@ -114596,7 +117546,6 @@ self: {
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using persistent and an RDBMS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-backend-redis" = callPackage
@@ -114608,18 +117557,17 @@ self: {
        pname = "serversession-backend-redis";
        version = "1.0";
        sha256 = "0r1zr25zw80s4psscdwscf7wlm8qfw4dyk0kkczzvj5434jnxnj2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring hedis path-pieces serversession tagged text time
          transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hedis hspec path-pieces serversession text time
          transformers unordered-containers
        ];
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using Redis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-frontend-snap" = callPackage
@@ -114631,14 +117579,13 @@ self: {
        pname = "serversession-frontend-snap";
        version = "1.0";
        sha256 = "1n29c3jfv61fz9kfc4zjwj7df1fll74l2kqccxmg4id8jpsrywci";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring nonce path-pieces serversession snap snap-core text
          time transformers unordered-containers
        ];
        homepage = "https://github.com/yesodweb/serversession";
        description = "Snap bindings for serversession";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-frontend-wai" = callPackage
@@ -114650,14 +117597,13 @@ self: {
        pname = "serversession-frontend-wai";
        version = "1.0";
        sha256 = "0rxifhjirhmhk1x14m6lvpv6dl32g179i4i3xi3dq59r7l716j0b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cookie data-default path-pieces serversession text
          time transformers unordered-containers vault wai wai-session
        ];
        homepage = "https://github.com/yesodweb/serversession";
        description = "wai-session bindings for serversession";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-frontend-yesod" = callPackage
@@ -114669,7 +117615,7 @@ self: {
        pname = "serversession-frontend-yesod";
        version = "1.0";
        sha256 = "0lv7gkj4inks98g44n5kqvx5s4c66lmxf7gqfdly54znggglcf86";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers cookie data-default path-pieces
          serversession text time transformers unordered-containers wai
          yesod-core
@@ -114691,7 +117637,7 @@ self: {
        sha256 = "02c570ghvrp0qw2s6k30548k619424p77bpi1mfh02yrv1a45jdk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder blaze-html bytestring cmdargs containers
          directory hamlet http-types mime-types shakespeare-css text
          transformers wai wai-app-static wai-extra warp
@@ -114711,13 +117657,12 @@ self: {
        pname = "ses-html";
        version = "0.3.0.0";
        sha256 = "1clf24kyyp9b8r22bacp44q0gf83zr6k1b33dz4bfy935wbnlshy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-html byteable bytestring cryptohash
          HsOpenSSL http-streams tagsoup time
        ];
        description = "Send HTML formatted emails using Amazon's SES REST API with blaze";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ses-html-snaplet" = callPackage
@@ -114728,7 +117673,7 @@ self: {
        pname = "ses-html-snaplet";
        version = "0.1.0.0";
        sha256 = "1lrr321gk7djyzv9yb7x967d53azxflh4jkf9zlkpxh3p7rz6793";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring configurator ses-html snap text
          transformers
        ];
@@ -114745,7 +117690,9 @@ self: {
        pname = "sessions";
        version = "2008.7.18";
        sha256 = "0zijfbakj3fh052b8nvaddg1xy87ysfbm3qnibisam93lx0agp2s";
-       buildDepends = [ base binary bytestring containers mtl network ];
+       libraryHaskellDepends = [
+         base binary bytestring containers mtl network
+       ];
        homepage = "http://www.wellquite.org/sessions/";
        description = "Session Types for Haskell";
        license = "GPL";
@@ -114760,7 +117707,7 @@ self: {
        sha256 = "0323l2jnk5caa3wsxqxgsdkvnfs9llb4yh13c0rx55q0is8a203j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers utility-ht ];
+       libraryHaskellDepends = [ base containers utility-ht ];
        homepage = "http://code.haskell.org/~thielema/set-cover/";
        description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
        license = stdenv.lib.licenses.bsd3;
@@ -114772,7 +117719,7 @@ self: {
        pname = "set-extra";
        version = "1.3.2";
        sha256 = "0lyxz1mnslsq8crc0vnvygz8r5r3iqyl457sjvg2j6lnz132917p";
-       buildDepends = [ base containers mtl syb ];
+       libraryHaskellDepends = [ base containers mtl syb ];
        homepage = "https://github.com/ddssff/set-extra";
        description = "Functions that could be added to Data.Set.";
        license = stdenv.lib.licenses.bsd3;
@@ -114784,7 +117731,7 @@ self: {
        pname = "set-monad";
        version = "0.2.0.0";
        sha256 = "1nxgn8d0qff4s66gcvfrnxjh0aq5q5jk0s453km28457qh946azb";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        description = "Set monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114797,13 +117744,14 @@ self: {
        pname = "set-with";
        version = "0.0.1";
        sha256 = "0mkc44gkhjibq3zhxgiw3c7nfy03jmjmrafdr8x9f5ak4l9ns0h4";
-       buildDepends = [ base containers invariant ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers invariant ];
+       testHaskellDepends = [
          base QuickCheck quickcheck-instances tasty tasty-hunit
          tasty-quickcheck
        ];
        description = "Set of elements sorted by a different data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setdown" = callPackage
@@ -114816,11 +117764,11 @@ self: {
        sha256 = "1007cb1p8ymnm39cbk423jfgzvdk7yip54yy3ydiiqwkfy2rxs5g";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring cmdargs containers directory filepath mtl
          split text uuid
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        jailbreak = true;
        homepage = "http://bitbucket.org/robertmassaioli/setdown";
        description = "Treating files as sets to perform rapid set manipulation";
@@ -114832,10 +117780,10 @@ self: {
      mkDerivation {
        pname = "setenv";
        version = "0.1.1.3";
-       revision = "1";
        sha256 = "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73";
+       revision = "1";
        editedCabalFile = "c5916ac0d2a828473cd171261328a290afe0abd799db1ac8c310682fe778c45b";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "A cross-platform library for setting environment variables";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114846,7 +117794,7 @@ self: {
        pname = "setlocale";
        version = "1.0.0.3";
        sha256 = "17n173byca8k5cmqmnzgjk7772ibhg5am5sd1adfp0zd0rcqnqsd";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
        description = "Haskell bindings to setlocale";
        license = stdenv.lib.licenses.bsd3;
@@ -114858,7 +117806,7 @@ self: {
        pname = "setops";
        version = "0.1.2";
        sha256 = "1mja48p8g9prfk53218qbv83ks6rs63s0n6jad0jgrj1221afpvg";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Uniform names (and Unicode operators) for set operations on data structures";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -114869,7 +117817,7 @@ self: {
        pname = "setters";
        version = "0.1";
        sha256 = "0rw9m9f7cqi0kvjcq81b7qrn3v672d4w0ch1k377m1151vg20a2z";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Small (TH) library to declare setters for typical `record' data type fields";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114885,11 +117833,11 @@ self: {
        sha256 = "19blk6nzbsm9syx45zzlmqxq1mi2prv0jq12cf83b4kf4pvwk32n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring cmdargs containers dlist ghc-prim mtl
-         vector
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers dlist ghc-prim mtl vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ base bytestring cmdargs ];
+       testHaskellDepends = [
          base bytestring containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -114904,12 +117852,12 @@ self: {
      mkDerivation {
        pname = "sexp-show";
        version = "0.1.1.0";
-       revision = "1";
        sha256 = "1ip1y1y2z2d6ib3ihq18j93081cp2lkwjm27bc0d0ihixd154gy5";
+       revision = "1";
        editedCabalFile = "314f05a4542c657517d485faa31ec23324458782cf0112acda948fb7092a154c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base pretty-show ];
+       executableHaskellDepends = [ base pretty-show ];
        description = "Produce a s-expression representation of Show values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114924,9 +117872,10 @@ self: {
        sha256 = "1ffs5r065zkipsa3y4v14if45fqjbzgksj3r40qci453kc3xq93p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base base64-string binary bytestring pretty QuickCheck random
+       libraryHaskellDepends = [
+         base base64-string binary bytestring pretty
        ];
+       executableHaskellDepends = [ QuickCheck random ];
        description = "S-expression printer and parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114938,7 +117887,7 @@ self: {
        pname = "sext";
        version = "0.1.0.0";
        sha256 = "0vq7fbm8gm7fym9qjaxsy2mk89rn2pjfkbhv3ym94xslcybwrwpy";
-       buildDepends = [ base bytestring template-haskell text ];
+       libraryHaskellDepends = [ base bytestring template-haskell text ];
        jailbreak = true;
        homepage = "http://github.com/dzhus/sext/";
        description = "Lists, Texts and ByteStrings with type-encoded length";
@@ -114952,8 +117901,8 @@ self: {
        pname = "sfml-audio";
        version = "0.7.1.1816";
        sha256 = "057z0z2xbls1p43k0kixbw26v0pv6lsvfh5ycjx37r8xw8ks31ba";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ libsndfile openal ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ libsndfile openal ];
        homepage = "http://patch-tag.com/r/shahn/sfml-audio";
        description = "minimal bindings to the audio module of sfml";
        license = "unknown";
@@ -114965,7 +117914,7 @@ self: {
        pname = "sfmt";
        version = "0.1.1";
        sha256 = "1jwzsk43kkvlmw551z46bhbvccf9yn1ncrhd27lm4pn93as2v1p6";
-       buildDepends = [ base bytestring entropy primitive ];
+       libraryHaskellDepends = [ base bytestring entropy primitive ];
        homepage = "https://github.com/philopon/sfmt-hs";
        description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding";
        license = stdenv.lib.licenses.bsd3;
@@ -114980,7 +117929,7 @@ self: {
        pname = "sgd";
        version = "0.3.7";
        sha256 = "1z4w81mbk2syrxacfrjb690ik6lcsh1fb7m3d65zlz37y3pk5q04";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq filepath lazy-io logfloat
          monad-par mtl primitive random temporary vector
        ];
@@ -114998,7 +117947,7 @@ self: {
        pname = "sgf";
        version = "0.1.3.1";
        sha256 = "1bwfphbbkkwi2q8l0916yvpl58j7fb0nr144w582vpsq3wfvgiwc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers encoding extensible-exceptions mtl parsec split
          time transformers
        ];
@@ -115015,7 +117964,7 @@ self: {
        sha256 = "0ai9j735wj5lclixwlki5g2s50g2mscglfrir2q7bj0lwg76dygi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bio regex-compat ];
+       executableHaskellDepends = [ base bio regex-compat ];
        homepage = "http://blog.malde.org/";
        description = "Sgrep - grep Fasta files for sequences matching a regular expression";
        license = "GPL";
@@ -115030,7 +117979,8 @@ self: {
        sha256 = "1qasdpm244dr7zh3hnr51jbp1b8qnrwbxvm3nnrbaf7bah1y4d2i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base binary bytestring io-streams SHA ];
+       libraryHaskellDepends = [ base binary bytestring io-streams SHA ];
+       executableHaskellDepends = [ base io-streams SHA ];
        jailbreak = true;
        homepage = "https://github.com/noteed/sha-streams";
        description = "SHA hashes for io-streams";
@@ -115047,17 +117997,18 @@ self: {
        sha256 = "1m0zxnmxn536jnaj5l4qpj5k7xshffsbca0cl53y3dnb6ssq9fni";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base doctest filemanip fsnotify MissingH mtl process safe
          system-filepath text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base doctest filemanip fsnotify MissingH mtl process safe
          system-filepath text
        ];
        homepage = "http://github.com/karun012/shadower";
        description = "An automated way to run doctests in files that are changing";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shadowsocks" = callPackage
@@ -115071,11 +118022,11 @@ self: {
        sha256 = "1630lfspy8fnsi9j2np9sygdng59bxx1q54kcr7cx7rgq434s5ys";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base binary bytestring containers cryptohash HsOpenSSL
          network optparse-applicative unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary bytestring containers cryptohash HUnit process
        ];
        homepage = "https://github.com/rnons/shadowsocks-haskell";
@@ -115092,7 +118043,7 @@ self: {
        pname = "shady-gen";
        version = "0.5.1";
        sha256 = "1vsk0ah6ngcgn5i6xda9j400xan1y843v25hc4lqcql37mg3ifn8";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-numbers base Boolean containers data-treify MemoTrie
          mtl ty TypeCompose vector-space wl-pprint
        ];
@@ -115111,7 +118062,7 @@ self: {
        pname = "shady-graphics";
        version = "0.5.0";
        sha256 = "1wzlygmpjfys4ijyqh8ymv2f75swy9zd0g05gxpqhxkvlrw3jdk4";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-numbers base Boolean containers data-treify MemoTrie
          mtl shady-gen ty TypeCompose vector-space wl-pprint
        ];
@@ -115133,12 +118084,17 @@ self: {
        sha256 = "18vkyc8h7dpz5d3snfdssfqd1cfp22wnpv63ckrik9p8r4j6i01c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring deepseq directory extra filepath hashable
          js-flot js-jquery old-time process random time transformers unix
          unordered-containers utf8-string
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery old-time process random time transformers unix
+         unordered-containers utf8-string
+       ];
+       testHaskellDepends = [
          base binary bytestring deepseq directory extra filepath hashable
          js-flot js-jquery old-time process QuickCheck random time
          transformers unix unordered-containers utf8-string
@@ -115156,7 +118112,9 @@ self: {
        sha256 = "1ql2w164f2sfmbcqk2da00nihwfr6a85f99apx5dwpbkfbc53n8l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal directory filepath process ];
+       executableHaskellDepends = [
+         base Cabal directory filepath process
+       ];
        jailbreak = true;
        homepage = "https://github.com/samplecount/shake-cabal-build";
        description = "Utility for building Shake build systems using Cabal sandboxes";
@@ -115171,7 +118129,7 @@ self: {
        pname = "shake-extras";
        version = "0.1.1";
        sha256 = "0qqzdhd6q8hhix7lx4j1v4j37b8jnv710clilk2wxbyvz03rbblz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cmdargs directory filepath shake
        ];
        jailbreak = true;
@@ -115189,11 +118147,11 @@ self: {
        pname = "shake-language-c";
        version = "0.8.0";
        sha256 = "1b7yi1cprgiyx06dnhc94shmfx5n1am7zhgiwg6g0bk2gg20im35";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class fclabels process shake split
          unordered-containers
        ];
-       testDepends = [ base directory doctest hspec shake ];
+       testHaskellDepends = [ base directory doctest hspec shake ];
        homepage = "https://github.com/samplecount/shake-language-c";
        description = "Utilities for cross-compiling with Shake";
        license = stdenv.lib.licenses.asl20;
@@ -115205,7 +118163,9 @@ self: {
        pname = "shake-minify";
        version = "0.1.4";
        sha256 = "17q0xzjj6xl9h3s6dlxgkxxz2dd4ycbh918ali1lrq2dq9gig3ir";
-       buildDepends = [ base bytestring css-text hjsmin shake text ];
+       libraryHaskellDepends = [
+         base bytestring css-text hjsmin shake text
+       ];
        homepage = "https://github.com/LukeHoersten/shake-minify";
        description = "Shake Minify Rules";
        license = stdenv.lib.licenses.bsd3;
@@ -115217,7 +118177,7 @@ self: {
        pname = "shake-pack";
        version = "0.1.2";
        sha256 = "0iy2n7cg7fm0by479s1hm5w2jzzfdavjlyq6nf2sh6qlkc6w2ga1";
-       buildDepends = [ base bytestring bzlib shake tar ];
+       libraryHaskellDepends = [ base bytestring bzlib shake tar ];
        homepage = "https://github.com/LukeHoersten/shake-pack";
        description = "Shake File Pack Rule";
        license = stdenv.lib.licenses.bsd3;
@@ -115235,7 +118195,13 @@ self: {
        sha256 = "1m4b7pvpr5mg6g5sc9xhnn7i9lx65vb3ass38zkyrfgksg65lwhf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring Cabal containers directory filepath ghc ghc-paths
+         haskeline haskell-src HUnit mtl old-time parsec3 QuickCheck
+         regex-posix template-haskell test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       executableHaskellDepends = [
          base bytestring Cabal containers directory filepath ghc ghc-paths
          haskeline haskell-src HUnit mtl old-time parsec3 QuickCheck
          regex-posix template-haskell test-framework test-framework-hunit
@@ -115256,15 +118222,15 @@ self: {
      mkDerivation {
        pname = "shakespeare";
        version = "2.0.5";
-       revision = "1";
        sha256 = "0jdmmrglzqzpj4cfiyab3kfr0vlz1rfc893nrq94b1rg4vwh1zzh";
+       revision = "1";
        editedCabalFile = "c3cde3794b87e5f99500aac7199a66ad95985ba716170551fe40e82452a61ebc";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers directory
          exceptions ghc-prim parsec process template-haskell text time
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers directory
          exceptions ghc-prim hspec HUnit parsec process template-haskell
          text time transformers
@@ -115280,7 +118246,7 @@ self: {
        pname = "shakespeare-css";
        version = "1.1.0";
        sha256 = "18d0kxfrs0aj9pfd9p1j7w5amch1hvsww3xycgn5qk6i0z7l4ywz";
-       buildDepends = [ base shakespeare ];
+       libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Stick your haskell variables into css at compile time. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -115293,7 +118259,7 @@ self: {
        pname = "shakespeare-i18n";
        version = "1.1.0";
        sha256 = "0ahhg9r7d8kdxn0x33bp5p8wmwkh1yvdqhw05yjwif0ky5y9h625";
-       buildDepends = [ base shakespeare ];
+       libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A type-based approach to internationalization. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -115306,7 +118272,7 @@ self: {
        pname = "shakespeare-js";
        version = "1.3.0";
        sha256 = "0hihcrgvzf4nsrgw6vqpkzbgskq01yc1mnvp7g2wy7vq0dv4pjp4";
-       buildDepends = [ base shakespeare ];
+       libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -115318,7 +118284,7 @@ self: {
        pname = "shakespeare-text";
        version = "1.1.0";
        sha256 = "18ixixb9aqn630s9wblxcki1gggm4i0fj9752c55p3b42q8h86rc";
-       buildDepends = [ base shakespeare ];
+       libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Interpolation with quasi-quotation: put variables strings (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -115330,7 +118296,7 @@ self: {
        pname = "shana";
        version = "2009.12.1";
        sha256 = "0fg16nbi0r0pdd3sfabzdz1f4595x3hz3b4pxfwy8l78p8lppv0y";
-       buildDepends = [ base directory regex-posix ];
+       libraryHaskellDepends = [ base directory regex-posix ];
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "treat haskell functions as unix pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -115344,7 +118310,7 @@ self: {
        pname = "shapefile";
        version = "0.0.0.1";
        sha256 = "0j6c01igj767ab3pd5yzkjkd8374rmjr57f2gw5c69qnh288c6w6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 dbf filepath rwlock
        ];
        homepage = "http://code.haskell.org/~mokus/shapefile";
@@ -115360,8 +118326,10 @@ self: {
        pname = "shapely-data";
        version = "0.1";
        sha256 = "1yn1rim4y6j834ngpz47wsi5pyhbi2gaznj0pyrqrmallzv0zin8";
-       buildDepends = [ base proxy-kindness tagged template-haskell ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base proxy-kindness tagged template-haskell
+       ];
+       testHaskellDepends = [
          base containers proxy-kindness QuickCheck tagged template-haskell
        ];
        homepage = "http://github.com/jberryman/shapely-data";
@@ -115371,16 +118339,16 @@ self: {
      }) {};
 
   "shared-buffer" = callPackage
-    ({ mkDerivation, base, bytestring, hsc2hs, QuickCheck
-     , test-framework, test-framework-quickcheck2, unix
+    ({ mkDerivation, base, bytestring, QuickCheck, test-framework
+     , test-framework-quickcheck2, unix
      }:
      mkDerivation {
        pname = "shared-buffer";
        version = "0.2.2";
        sha256 = "031aabqynp5d4k47rjjwyx3xjzh4f1k4csfgdnnhsf45xv5nc3kc";
-       buildDepends = [ base bytestring unix ];
-       testDepends = [
-         base bytestring hsc2hs QuickCheck test-framework
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [
+         base bytestring QuickCheck test-framework
          test-framework-quickcheck2 unix
        ];
        jailbreak = true;
@@ -115396,8 +118364,8 @@ self: {
        pname = "shared-fields";
        version = "0.2.0.0";
        sha256 = "107n6w4dn0n4iv7qmfm1d9y04rgj3ab3qc8kyqqddnbnfa44y157";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base Cabal hspec lens text ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base Cabal hspec lens text ];
        homepage = "http://github.com/intolerable/shared-fields";
        description = "a tiny library for using shared lens fields";
        license = stdenv.lib.licenses.bsd3;
@@ -115409,8 +118377,8 @@ self: {
        pname = "shared-memory";
        version = "0.1.0.0";
        sha256 = "15h4j81q2v97dx61pnpaqs99z4vvlw7xl1dxbh878imxj8zn4z84";
-       buildDepends = [ base unix ];
-       testDepends = [ base bytestring unix ];
+       libraryHaskellDepends = [ base unix ];
+       testHaskellDepends = [ base bytestring unix ];
        homepage = "https://github.com/nh2/shared-memory";
        description = "POSIX shared memory";
        license = stdenv.lib.licenses.mit;
@@ -115422,7 +118390,7 @@ self: {
        pname = "sharedio";
        version = "0.1.0";
        sha256 = "08hmmb2nn2lpirdnpp928m6xadzkv8k90x1nycw2b58vp1rpk7zv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nh2/haskell-sharedio";
        description = "Bundles shared calls to IO functions to perform them only once";
        license = stdenv.lib.licenses.mit;
@@ -115436,7 +118404,8 @@ self: {
        sha256 = "0x3jc2c4j0b8xavap7hj4673zb89zgww1pv13sddkn6p49pk1zvc";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base filepath mtl ];
+       libraryHaskellDepends = [ base filepath mtl ];
+       executableHaskellDepends = [ base filepath mtl ];
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she";
        description = "A Haskell preprocessor adding miscellaneous features";
        license = stdenv.lib.licenses.publicDomain;
@@ -115453,7 +118422,7 @@ self: {
        pname = "shell-conduit";
        version = "4.5.2";
        sha256 = "04kc9gzlqbw3d2pj6qn13pnmmrlmx8nmmj5bvxn7zdmh25nw6ys2";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring conduit conduit-extra control-monad-loop
          directory filepath monad-control monads-tf process resourcet
          semigroups split template-haskell text transformers
@@ -115470,7 +118439,9 @@ self: {
        pname = "shell-escape";
        version = "0.2.0";
        sha256 = "0jms5hdl8zrpxwypq9998798krspclivprirrcq59r179alrng72";
-       buildDepends = [ base binary bytestring containers vector ];
+       libraryHaskellDepends = [
+         base binary bytestring containers vector
+       ];
        homepage = "http://github.com/solidsnack/shell-escape";
        description = "Shell escaping library";
        license = stdenv.lib.licenses.bsd3;
@@ -115482,10 +118453,9 @@ self: {
        pname = "shell-monad";
        version = "0.6.4";
        sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13";
-       buildDepends = [ base containers text unix ];
+       libraryHaskellDepends = [ base containers text unix ];
        description = "shell monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shell-pipe" = callPackage
@@ -115496,7 +118466,8 @@ self: {
        sha256 = "0xyarxm2hs8yypmz8w4zbnjvv5xl9dd657j7j3a82gbghsb93vyy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://gnu.rtin.bz/directory/devel/prog/other/shell-haskell.html";
        description = "Pipe streams through external shell commands";
        license = "GPL";
@@ -115511,7 +118482,7 @@ self: {
        pname = "shellish";
        version = "0.1.4";
        sha256 = "1ldwid270mwyky6zmggbvn72hvs4s39hhf2zj8r0jahxnwlpbfan";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath mtl process strict time
          unix-compat
        ];
@@ -115529,7 +118500,7 @@ self: {
        pname = "shellmate";
        version = "0.1.6";
        sha256 = "17fpl0h58cw5hp6jzrajkl629mw2c6x15cmlcbdxqk9xlxqrg4hr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath process temporary time transformers
        ];
        homepage = "http://github.com/valderman/shellmate";
@@ -115548,7 +118519,7 @@ self: {
        sha256 = "0ad8sc4md8mp0l0s40yx7qbgaabqzd4nz8lx15ajcdbwr2ffnra2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs Diff directory filemanip filepath HUnit parsec
          pretty-show process regex-tdfa safe test-framework
          test-framework-hunit utf8-string
@@ -115571,13 +118542,13 @@ self: {
        sha256 = "173aypf9dcrkhnaz5gfcpicw9ha6cgs7javds3s7m2qr2vdj8rhs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
          system-fileio system-filepath text time transformers
          transformers-base unix-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions hspec HUnit lifted-async lifted-base monad-control mtl
          process system-fileio system-filepath text time transformers
@@ -115596,14 +118567,13 @@ self: {
        pname = "shelly-extra";
        version = "0.3.0.1";
        sha256 = "1mc55m10s89mp2fz267sqhayaj0igj27kwyx7hnk5h23w0nhc0h5";
-       buildDepends = [ async base mtl SafeSemaphore shelly ];
-       testDepends = [
+       libraryHaskellDepends = [ async base mtl SafeSemaphore shelly ];
+       testHaskellDepends = [
          async base hspec HUnit mtl SafeSemaphore shelly text
        ];
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shelly features that require extra dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shivers-cfg" = callPackage
@@ -115614,7 +118584,7 @@ self: {
        pname = "shivers-cfg";
        version = "0.1";
        sha256 = "1jrf9l25lcmqh55zy3g2nbi60ph9m0ycvjz1q0qvpb403kqhd0wa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory HPDF language-dot mtl pretty process
        ];
        description = "Implementation of Shivers' Control-Flow Analysis";
@@ -115628,7 +118598,7 @@ self: {
        pname = "shoap";
        version = "0.2";
        sha256 = "0ywb8bfkdpqqv2spb92j9rzx4fv5k1c7b65wj0zwnn9rp7ckq59v";
-       buildDepends = [ base curl ];
+       libraryHaskellDepends = [ base curl ];
        jailbreak = true;
        homepage = "http://richardfergie.com/shoap";
        description = "A very basic SOAP package";
@@ -115641,7 +118611,7 @@ self: {
        pname = "shortcircuit";
        version = "0.1";
        sha256 = "02gcr6glp1kjs4l7ds8487dbblr1pw8nyq34i3rg1hskz0b83l6z";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aristidb/shortcircuit";
        description = "Short-circuit values and expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -115653,7 +118623,7 @@ self: {
        pname = "shortcut-links";
        version = "0.4.0.0";
        sha256 = "1i9a5hgzw9w9fqg7vjixc90ck49ag0ikm9bjl2xc30gvjslpy3r8";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        homepage = "http://github.com/aelve/shortcut-links";
        description = "Link shortcuts for use in text markup";
        license = stdenv.lib.licenses.bsd3;
@@ -115665,7 +118635,7 @@ self: {
        pname = "shorten-strings";
        version = "0.1.0.1";
        sha256 = "1srqbc2kx1zn0xlzv94y7kqdrflmdck3jy6d2fl75zhf11wilxw3";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        jailbreak = true;
        homepage = "https://github.com/Tarrasch/shorten-strings";
        description = "Shorten a variety of string-like types adding ellipsis";
@@ -115678,8 +118648,10 @@ self: {
        pname = "should-not-typecheck";
        version = "2.0";
        sha256 = "0869dgn7xccnzxhzbjl150x0sdwwgppk06nq448i9xlnhhrk6dkc";
-       buildDepends = [ base deepseq HUnit ];
-       testDepends = [ base deepseq hspec hspec-expectations HUnit ];
+       libraryHaskellDepends = [ base deepseq HUnit ];
+       testHaskellDepends = [
+         base deepseq hspec hspec-expectations HUnit
+       ];
        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;
@@ -115691,7 +118663,7 @@ self: {
        pname = "show";
        version = "0.6";
        sha256 = "15bvfffnr034z8wbmhxa8h5qskbxwbflk434dx023l1qlm3sjmsg";
-       buildDepends = [ base syb ];
+       libraryHaskellDepends = [ base syb ];
        description = "'Show' instances for Lambdabot";
        license = "GPL";
      }) {};
@@ -115702,7 +118674,7 @@ self: {
        pname = "show-type";
        version = "0.1.1";
        sha256 = "1sppi8vj1cg7gwz7vagc1cry22b814wlwbm6jjj1c4d5f4kmpyyv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Kinokkory/show-type";
        description = "convert types into string values in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -115716,7 +118688,7 @@ self: {
        sha256 = "1gpjb8lw5zmnsd8ic739j91iqsv9a707nd9j5mbnhq6gilk61nrh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base glade gtk random ];
+       executableHaskellDepends = [ base glade gtk random ];
        jailbreak = true;
        description = "A simple gtk based Russian Roulette game";
        license = stdenv.lib.licenses.bsd3;
@@ -115731,7 +118703,7 @@ self: {
        pname = "shpider";
        version = "0.2.1.1";
        sha256 = "19741zlma2fp3jbfsmqgl0004bvfpizbjljg2k5xam1k4v144kwd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers curl mtl regex-posix tagsoup
          tagsoup-parsec time url web-encodings
        ];
@@ -115749,7 +118721,7 @@ self: {
        sha256 = "0wml7x8843ib8jmwq6xz9q011hz4vpd7zmnvbc8h2zdql6p6lqxr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl ];
+       executableHaskellDepends = [ base mtl ];
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/shplit";
        description = "A Haskell pattern splitter with emacs attachments";
        license = stdenv.lib.licenses.publicDomain;
@@ -115763,7 +118735,7 @@ self: {
        pname = "shqq";
        version = "0.1";
        sha256 = "08mdnlnq001slxml0y1rg7nry2fz8qcf1cw0q22j84gx3csrfhcm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base parsec posix-escape process template-haskell unix
        ];
        description = "Embed shell commands with interpolated Haskell variables, and capture output";
@@ -115781,10 +118753,11 @@ self: {
        sha256 = "0ngva3p3838xay3zz442n99ilhk5d9majg342x6y7hs796lqbrrd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base Cabal containers directory filepath network network-uri
          process uhc-util uuagc uuagc-cabal uulib
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/UU-ComputerScience/shuffle";
        description = "Shuffle tool for UHC";
        license = stdenv.lib.licenses.bsd3;
@@ -115796,7 +118769,7 @@ self: {
        pname = "sieve";
        version = "0.1.0.1";
        sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.the-singleton.com";
        description = "Sieve is an implementation of the Sieve abstract data type";
        license = stdenv.lib.licenses.gpl2;
@@ -115812,7 +118785,7 @@ self: {
        sha256 = "0xahs91s1kvb2vrdr6xwg4nrm3d4pfz807rnb7dj9rfj1knlaw4j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo containers directory fgl filepath glib gtk hxt mtl
          parsec process sifflet-lib unix
        ];
@@ -115831,11 +118804,11 @@ self: {
        pname = "sifflet-lib";
        version = "2.2.1";
        sha256 = "1snaq0vlsk4r2lbg2sk389ppwnz22mqwhf1lgwjh3cg91ab905n4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers directory fgl filepath glib gtk hxt mtl
          parsec process unix
        ];
-       extraLibraries = [ gdk_x11 gtk_x11 ];
+       librarySystemDepends = [ gdk_x11 gtk_x11 ];
        jailbreak = true;
        homepage = "http://mypage.iu.edu/~gdweber/software/sifflet/";
        description = "Library of modules shared by sifflet and its tests and its exporters";
@@ -115852,8 +118825,10 @@ self: {
        pname = "sign";
        version = "0.4.1";
        sha256 = "1d7hxvvmbbv8izr74l4ah1q50fwmmgman90rhjixkvppkq8fwjhz";
-       buildDepends = [ base containers deepseq hashable lattices ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers deepseq hashable lattices
+       ];
+       testHaskellDepends = [
          base containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
        ];
@@ -115870,7 +118845,7 @@ self: {
        pname = "signals";
        version = "0.0.0.1";
        sha256 = "12l5vixyv6j3fz8j9rwahf5ifvibqb38kc9j7xg36akc5v2n11s2";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base constraints containers data-reify exception-mtl
          exception-transformers language-c-quote mainland-pretty mtl
          operational
@@ -115888,7 +118863,7 @@ self: {
        pname = "signed-multiset";
        version = "0.4";
        sha256 = "0pxi6g095axf9x6hsiqf0ilsjlws4zvl0pjfjamjyyl1wj82h747";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "Multisets with negative membership";
        license = stdenv.lib.licenses.bsd3;
@@ -115900,8 +118875,8 @@ self: {
        pname = "silently";
        version = "1.2.5";
        sha256 = "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf";
-       buildDepends = [ base deepseq directory ];
-       testDepends = [ base deepseq directory nanospec temporary ];
+       libraryHaskellDepends = [ base deepseq directory ];
+       testHaskellDepends = [ base deepseq directory nanospec temporary ];
        homepage = "https://github.com/hspec/silently";
        description = "Prevent or capture writing to stdout and other handles";
        license = stdenv.lib.licenses.bsd3;
@@ -115913,7 +118888,7 @@ self: {
        pname = "simd";
        version = "0.1.0.1";
        sha256 = "0rmp715k7k41h7nnfg3ik28pf602jvh5wb23yzbpz0j8vkfysn8m";
-       buildDepends = [ base ghc-prim primitive vector ];
+       libraryHaskellDepends = [ base ghc-prim primitive vector ];
        jailbreak = true;
        homepage = "http://github.com/mikeizbicki/simd";
        description = "simple interface to GHC's SIMD instructions";
@@ -115931,7 +118906,7 @@ self: {
        sha256 = "1yqd9799ys8y4n325mayq8qps99ajv1r4j8h6r16l5n94wvyw1ba";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers haskell98 mersenne-random-pure64 mtl parsec random
        ];
        jailbreak = true;
@@ -115954,13 +118929,17 @@ self: {
        sha256 = "1s75cr2fjgicgf6mndaf659xrp0dga68i2ii8l5dbjz0b2sbhhm7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson attoparsec base base64-bytestring blaze-builder bytestring
-         cmdargs directory filepath http-types mime-types monad-control mtl
-         process setenv simple-templates text transformers transformers-base
-         unordered-containers vector wai wai-extra
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring directory
+         filepath http-types mime-types monad-control mtl simple-templates
+         text transformers transformers-base unordered-containers vector wai
+         wai-extra
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring cmdargs directory filepath process
+         setenv simple-templates text unordered-containers vector
+       ];
+       testHaskellDepends = [
          base hspec HUnit monad-control mtl transformers wai
        ];
        jailbreak = true;
@@ -115977,7 +118956,9 @@ self: {
        pname = "simple-actors";
        version = "0.4.0";
        sha256 = "13xjyr6gf55yxinaah4c8fx56a9fyr191v4lwycnlkdz8vvizw25";
-       buildDepends = [ base chan-split contravariant mtl transformers ];
+       libraryHaskellDepends = [
+         base chan-split contravariant mtl transformers
+       ];
        homepage = "http://brandon.si/code/simple-actors-0-1-0-released/";
        description = "A library for more structured concurrent programming, based on the Actor Model";
        license = stdenv.lib.licenses.bsd3;
@@ -115989,7 +118970,7 @@ self: {
        pname = "simple-atom";
        version = "0.2";
        sha256 = "1kqkaay3r03plxvvyan3hdgj2rfynygnisi6hrsjwqgj4nw6va17";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/simple-atom";
        description = "Atom (or symbol) datatype for fast comparision and sorting";
@@ -116002,8 +118983,8 @@ self: {
        pname = "simple-bluetooth";
        version = "0.1.0.0";
        sha256 = "1qrlvqy2vcl36db3403nb1c0sx233d3vwxrbqb7jip13hy0h6jf4";
-       buildDepends = [ base bytestring network ];
-       extraLibraries = [ bluetooth ];
+       libraryHaskellDepends = [ base bytestring network ];
+       librarySystemDepends = [ bluetooth ];
        description = "Simple Bluetooth API for Windows and Linux (bluez)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116019,8 +119000,10 @@ self: {
        pname = "simple-c-value";
        version = "0.0.0.1";
        sha256 = "0ky0yilcc54hx8sl11z4dl14n6k9wfz0w9bwv3pbgyi44ravr8gs";
-       buildDepends = [ base DebugTraceHelpers dlist ghc-prim tuple ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base DebugTraceHelpers dlist ghc-prim tuple
+       ];
+       testHaskellDepends = [
          base checkers DebugTraceHelpers derive dlist ghc-prim HUnit mtl
          QuickCheck template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 tuple uniplate
@@ -116042,7 +119025,7 @@ self: {
        pname = "simple-conduit";
        version = "0.5.1";
        sha256 = "1jy70cdw2h6fd2618dczajml5k82kkjmd2n0mgbby2mr6r3sk5zr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring chunked-data containers either
          exceptions filepath free lifted-async lifted-base mmorph
          monad-control mono-traversable mtl mwc-random primitive semigroups
@@ -116062,11 +119045,11 @@ self: {
        pname = "simple-config";
        version = "1.2.2.1";
        sha256 = "1ndczlpqycrmyjm8v3gpsw1f946lfvc70kzmipli4ir9cbqh5d5k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default network-uri parsec template-haskell
          transformers
        ];
-       testDepends = [ base hspec ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/yunomu/simple-config";
        description = "Simple config file parser generator";
        license = stdenv.lib.licenses.bsd3;
@@ -116080,7 +119063,7 @@ self: {
        pname = "simple-css";
        version = "0.0.4";
        sha256 = "19a2yfp9gji7w5ps5lh8jwvnhma21d83v4fm2hrc92490fpq9aid";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html hashable language-css unordered-containers
        ];
        description = "simple binding of css and html";
@@ -116096,7 +119079,8 @@ self: {
        sha256 = "185dgpfc7b1ayw0ajfdnf28fy1a87b3kqn4fh9y5l9krzlqs2lfl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base parsec text transformers ];
+       libraryHaskellDepends = [ base parsec text transformers ];
+       executableHaskellDepends = [ base text ];
        jailbreak = true;
        homepage = "https://github.com/gitfoxi/Language.Eval";
        description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2";
@@ -116109,7 +119093,7 @@ self: {
        pname = "simple-firewire";
        version = "0.1.3.4";
        sha256 = "14fh3z3vqkmfgvgxja431ivm3lk1ksgrxaqjzz25wdc493j640ka";
-       buildDepends = [ base bindings-dc1394 CV ];
+       libraryHaskellDepends = [ base bindings-dc1394 CV ];
        homepage = "https://github.com/aleator/simple-firewire";
        description = "Simplified interface for firewire cameras";
        license = stdenv.lib.licenses.bsd3;
@@ -116124,7 +119108,7 @@ self: {
        pname = "simple-form";
        version = "0.5.0";
        sha256 = "01pqp7593vxf32fw18g7351qblj4lxvbgvs0psgb9aghsw3dss53";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html digestive-functors email-validate network-uri
          old-locale text time transformers
        ];
@@ -116142,7 +119126,8 @@ self: {
        sha256 = "14gy8bmkvv81zd1hmdzmmdzf4pspn4nymfpjx07jxcgm5isn49qi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base deepseq parallel random ];
+       libraryHaskellDepends = [ base parallel random ];
+       executableHaskellDepends = [ base deepseq parallel random ];
        jailbreak = true;
        homepage = "http://eax.me/haskell-genetic-algorithm/";
        description = "Simple parallel genetic algorithm implementation";
@@ -116159,7 +119144,10 @@ self: {
        sha256 = "193n24n5dpmdha85h4vn0kx846hppyzbc9f75wgndc7y7vm1qagy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base MonadRandom parallel random transformers
+       ];
+       executableHaskellDepends = [
          base deepseq MonadRandom parallel random transformers
        ];
        homepage = "http://eax.me/haskell-genetic-algorithm/";
@@ -116173,7 +119161,7 @@ self: {
        pname = "simple-get-opt";
        version = "0.1.0.0";
        sha256 = "1hia6kjx3nnv6i5wrkmvj6vz52pw12fwsz48gkz7049ygpa5jnl5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A simple library for processing command-line options";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116186,7 +119174,7 @@ self: {
        pname = "simple-index";
        version = "0.1.0.1";
        sha256 = "0w5nqhabv1rdbgnjw5vgx6p19dhqiq6xn5ljld3s7ndfk8nfddgy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hashable safecopy unordered-containers
        ];
        jailbreak = true;
@@ -116203,7 +119191,7 @@ self: {
        pname = "simple-log";
        version = "0.3.2";
        sha256 = "1nlnxjv2p6fkk069480czn0wg1m2jcw1g2sb38cb524kv0qn1kr0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq directory filepath
          MonadCatchIO-transformers mtl SafeSemaphore text time transformers
        ];
@@ -116218,7 +119206,7 @@ self: {
        pname = "simple-log-syslog";
        version = "0.2.0";
        sha256 = "1619jsxgz5afmwhjcixg54i7dhh8jl29cmziifjrg60mm4rf2c34";
-       buildDepends = [ base hsyslog simple-log text ];
+       libraryHaskellDepends = [ base hsyslog simple-log text ];
        jailbreak = true;
        homepage = "http://github.com/mvoidex/simple-log-syslog";
        description = "Syslog backend for simple-log";
@@ -116235,7 +119223,12 @@ self: {
        sha256 = "07brvfs19qprbpiys38gw3ypkwyx8y31fdil3kkzc9gszvcfi7vy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers deepseq parallel random split ];
+       libraryHaskellDepends = [
+         base containers deepseq parallel random split
+       ];
+       executableHaskellDepends = [
+         base containers deepseq parallel random split
+       ];
        jailbreak = true;
        homepage = "http://eax.me/haskell-neural-networks/";
        description = "Simple parallel neural networks implementation";
@@ -116251,11 +119244,11 @@ self: {
        pname = "simple-nix";
        version = "0.1.0.4";
        sha256 = "1kyarxkp9zdf6k1jpx9a5yjrjghbr52ranfzrbcnb8kdnzi0mh0f";
-       buildDepends = [
+       libraryHaskellDepends = [
          base classy-prelude error-list MissingH mtl parsec system-filepath
          text text-render unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base classy-prelude error-list hspec hspec-expectations MissingH
          mtl parsec system-filepath text text-render unordered-containers
        ];
@@ -116270,7 +119263,7 @@ self: {
        pname = "simple-observer";
        version = "0.0.1";
        sha256 = "1njzw6zjarlpjrmbkxwivr9azj8v1298bsd1ai3ddlmylwyhn24r";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/gimbo/observer.hs";
        description = "The Observer pattern";
        license = stdenv.lib.licenses.bsd3;
@@ -116286,7 +119279,7 @@ self: {
        sha256 = "1nrm52agsgr2gxljv14l7f713jvbfa99qnzkcni2s7777xc33dkk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath mtl parsec simple-stacked-vm
        ];
        description = "Simplified Pascal language to SSVM compiler";
@@ -116302,7 +119295,7 @@ self: {
        pname = "simple-pipe";
        version = "0.0.0.28";
        sha256 = "11bvk1dwi6anmnsvv3hi7ii60yy3d64g38vfmxhabh93sjr4b4nm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring lifted-base monad-control monads-tf stm
          transformers-base
        ];
@@ -116321,7 +119314,7 @@ self: {
        pname = "simple-postgresql-orm";
        version = "0.9.0.1";
        sha256 = "0j1v64ywfchxjdidy5pb1dzab0qhn516vcy580incw1bminyh3rz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory filepath postgresql-orm postgresql-simple
          resource-pool simple transformers
        ];
@@ -116337,7 +119330,7 @@ self: {
        pname = "simple-reflect";
        version = "0.3.2";
        sha256 = "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
        description = "Simple reflection of expressions containing variables";
        license = stdenv.lib.licenses.bsd3;
@@ -116349,7 +119342,7 @@ self: {
        pname = "simple-rope";
        version = "0.1";
        sha256 = "187ghgn8nivvn5m8nsn0vrjh8mr6h7n6r1p1119gr4h3m2hpmrpl";
-       buildDepends = [ base bytestring QuickCheck ];
+       libraryHaskellDepends = [ base bytestring QuickCheck ];
        homepage = "http://github.com/jkff/haskell-rope";
        description = "Memory-efficient strings with concatenation and splitting";
        license = stdenv.lib.licenses.bsd3;
@@ -116363,8 +119356,8 @@ self: {
        pname = "simple-sendfile";
        version = "0.2.21";
        sha256 = "0xzxcz60gl22w3rxjvw0s6js0g5mi6as1n48gl37dv4lbrn9s8v1";
-       buildDepends = [ base bytestring network unix ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring network unix ];
+       testHaskellDepends = [
          base bytestring conduit conduit-extra directory hspec HUnit network
          process resourcet unix
        ];
@@ -116380,7 +119373,7 @@ self: {
        pname = "simple-server";
        version = "0.0.3";
        sha256 = "0qmqkcyikyjcfsq82w0i54ydizfnp72h0qfsbjw5qjizf4l3awcr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring concurrent-extra containers hashtables network time
          unbounded-delays
        ];
@@ -116397,7 +119390,7 @@ self: {
        pname = "simple-session";
        version = "0.10.0.0";
        sha256 = "1vqpikn6ml4fmz9pg29blw1c5ck8d4xx1qrb388jw57x24gknp0k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder byteable bytestring containers
          cookie cryptohash http-types simple transformers wai
        ];
@@ -116413,11 +119406,10 @@ self: {
        pname = "simple-sessions";
        version = "0.1.3";
        sha256 = "08abag1im9gp2jpndd12sv911ca2qwh6frrz6qr87mj11xfhbky5";
-       buildDepends = [ base indexed synchronous-channels ];
+       libraryHaskellDepends = [ base indexed synchronous-channels ];
        homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
        description = "A simple implementation of session types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-smt" = callPackage
@@ -116426,7 +119418,7 @@ self: {
        pname = "simple-smt";
        version = "0.6.0";
        sha256 = "15dnd6vjf8zl0bi5r4pczxdns8614rvdq1f44sgrmy8crc4x9d0c";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        description = "A simple way to interact with an SMT solver process";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116441,8 +119433,9 @@ self: {
        sha256 = "0hz5acbkn9i46c8hpx258vkyj0q9ii4kh5wsjjj79avlnal2gz8q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl parsec pretty ];
-       testDepends = [
+       libraryHaskellDepends = [ base mtl parsec pretty ];
+       executableHaskellDepends = [ base mtl parsec pretty ];
+       testHaskellDepends = [
          base HUnit mtl parsec pretty test-framework test-framework-hunit
        ];
        homepage = "http://jakewheat.github.io/simple-sql-parser/";
@@ -116460,7 +119453,7 @@ self: {
        sha256 = "1grhdaf6z6illki5km1glliaaqlyvskwjvvcqz2vh8467arsy2pd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary-state containers filepath mtl parsec
        ];
        description = "Simple stacked virtual machine: assembler, disassembler, bytecode interpreter";
@@ -116473,7 +119466,7 @@ self: {
        pname = "simple-tabular";
        version = "0.1.0.0";
        sha256 = "0p7rd8y6rhwg0ap6cib7l32bglvfkvbzg938pdwpb2ss6cv8b9zs";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/BartMassey/simple-tabular";
        description = "Simple tabular-text formatter";
@@ -116488,10 +119481,10 @@ self: {
        pname = "simple-templates";
        version = "0.8.0.0";
        sha256 = "1lmls90fbd18bklhhblfm0983w9bk66jj8iad3jzi5gd2injwj78";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base scientific text unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base hspec HUnit scientific vector
        ];
        homepage = "http://simple.cx";
@@ -116506,7 +119499,7 @@ self: {
        pname = "simple-vec3";
        version = "0.1.0.1";
        sha256 = "1vzx88drwg40a9b7dzz4nbd5faawrc15wgyd1b12zmrsysn0h6s4";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        jailbreak = true;
        homepage = "http://github.com/dzhus/simple-vec3/";
        description = "Three-dimensional vectors of doubles with basic operations";
@@ -116520,7 +119513,7 @@ self: {
        pname = "simpleargs";
        version = "0.2.1";
        sha256 = "1grjjpb3397wnr6sd0bn679k9pfg1zlm61350zd2gj5yq6pshl6p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://malde.org/~ketil/simpleargs";
        description = "Provides a more flexible getArgs function with better error reporting";
        license = "LGPL";
@@ -116534,10 +119527,10 @@ self: {
        pname = "simpleirc";
        version = "0.3.1";
        sha256 = "1mwhqa5gby38hlbq0shjbff4whhblw00x8wksqbh47jd6i6ihww5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring connection containers network old-locale time
        ];
-       testDepends = [ base bytestring hspec HUnit knob ];
+       testHaskellDepends = [ base bytestring hspec HUnit knob ];
        homepage = "http://github.com/dom96/SimpleIRC";
        description = "Simple IRC Library";
        license = stdenv.lib.licenses.bsd3;
@@ -116549,10 +119542,10 @@ self: {
      mkDerivation {
        pname = "simpleirc-lens";
        version = "0.1.0.0";
-       revision = "2";
        sha256 = "0lr4zrp8h7xgg8zsznawqkkzh3pvlzfw5hl6n0hss5ramb71ccy5";
+       revision = "2";
        editedCabalFile = "618750d5b230316747d59d784bd40481a4404443316fc9c3a73e1349e3d10975";
-       buildDepends = [ base bytestring simpleirc ];
+       libraryHaskellDepends = [ base bytestring simpleirc ];
        homepage = "https://github.com/relrod/simpleirc-lens";
        description = "Lenses for simpleirc types";
        license = stdenv.lib.licenses.bsd2;
@@ -116567,7 +119560,7 @@ self: {
        pname = "simplenote";
        version = "1.0";
        sha256 = "0kggnvbhvzrsqj387vqq2xpspk4xn3830k65g4cc642gmw4l803v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring curl dataenc download-curl HTTP json time
          utf8-string
        ];
@@ -116586,7 +119579,8 @@ self: {
        sha256 = "0qlhh9m455fh8w9hdzykgxbw699mkd926ar031j99dhimca2d4hj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
          base ghc-paths haskell-src-exts process uniplate
        ];
        jailbreak = true;
@@ -116600,10 +119594,10 @@ self: {
      mkDerivation {
        pname = "simplesmtpclient";
        version = "0.2";
-       revision = "1";
        sha256 = "0z8g82222nvh3yhn8qisr8qqnsv02zxjyzs32qrcg2pshbd5mdj8";
+       revision = "1";
        editedCabalFile = "e6021c7bbf5e50c15433dca491f4618483229203c810a7b71e7c42094e13ad25";
-       buildDepends = [ array base directory network old-time ];
+       libraryHaskellDepends = [ array base directory network old-time ];
        description = "Very simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116614,8 +119608,8 @@ self: {
        pname = "simplessh";
        version = "0.2.0.5";
        sha256 = "1f0rck8shcm69bg2n2ijjad6dzrybfyrjqpsx5qh333mmz0q7bbq";
-       buildDepends = [ base bytestring mtl ];
-       extraLibraries = [ ssh2 ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       librarySystemDepends = [ ssh2 ];
        homepage = "http://hub.darcs.net/thoferon/simplessh";
        description = "Simple wrapper around libssh2";
        license = stdenv.lib.licenses.bsd3;
@@ -116632,7 +119626,7 @@ self: {
        sha256 = "0z8ysg43dydij5l271ary8g5l26k0fvsymi99ycyjnl2ij1sg482";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath mtl process random regex-compat split time
        ];
        homepage = "http://github.com/scravy/simplex";
@@ -116648,10 +119642,10 @@ self: {
        pname = "simplex-basic";
        version = "0.0.0.1";
        sha256 = "180bnrka1id16scz4zzi60m8692b7pyicfzfbzvi8rz1shl038zq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors linear-grammar mtl QuickCheck transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bifunctors containers hspec linear-grammar mtl QuickCheck
          transformers
        ];
@@ -116667,7 +119661,7 @@ self: {
        sha256 = "0i60ksi5xc0d0rg5xzhbdjv2f3b5jr6rl9khn9i2b1n9sh1lv36m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bio bytestring random ];
+       executableHaskellDepends = [ base bio bytestring random ];
        homepage = "http://malde.org/~ketil/";
        description = "Simulate sequencing with different models for priming and errors";
        license = "GPL";
@@ -116680,7 +119674,7 @@ self: {
        pname = "simtreelo";
        version = "0.1.1.0";
        sha256 = "1j7q2mld8np16nmq8w3lx87j1f530jpxv4jlpf038k42pf4p23l2";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Loader for data organized in a tree";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -116696,12 +119690,18 @@ self: {
        sha256 = "0p76rsk02p6rw51ppbr3j7ydk57k34684qf50nrz5qd0jrnapjm2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base bytestring containers mtl parsec permute
          process regex-pcre setlocale text unix utf8-string X11 X11-rm
          x11-xim X11-xshape
        ];
-       pkgconfigDepends = [ libXft ];
+       libraryPkgconfigDepends = [ libXft ];
+       executableHaskellDepends = [
+         array attoparsec base bytestring containers mtl parsec permute
+         process regex-pcre setlocale text unix utf8-string X11 X11-rm
+         x11-xim X11-xshape
+       ];
+       executablePkgconfigDepends = [ libXft ];
        jailbreak = true;
        homepage = "http://sigkill.dk/programs/sindre";
        description = "A programming language for simple GUIs";
@@ -116715,7 +119715,7 @@ self: {
        pname = "singleton-nats";
        version = "0.3.0.1";
        sha256 = "1zgrvpszlvbq3mhfrs50dz2wd3bx6zxpyh0cj1zlwbn62psbdqxm";
-       buildDepends = [ base singletons ];
+       libraryHaskellDepends = [ base singletons ];
        description = "Unary natural numbers relying on the singletons infrastructure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116728,8 +119728,10 @@ self: {
        pname = "singletons";
        version = "1.1.2.1";
        sha256 = "1lxbajfwq65bkl73cr3zqzcqy67vqbq9sf8w9ckrik4713sx0mhb";
-       buildDepends = [ base containers mtl template-haskell th-desugar ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers mtl template-haskell th-desugar
+       ];
+       testHaskellDepends = [
          base Cabal constraints filepath process tasty tasty-golden
        ];
        homepage = "http://www.cis.upenn.edu/~eir/packages/singletons";
@@ -116743,7 +119745,7 @@ self: {
        pname = "sink";
        version = "0.1.0.1";
        sha256 = "04ny9450h2mlw1j0gn6a1vvgwsk3gbhhzshqv2sbcg5pwkzkdrzp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "An alternative to lazy I/O that doesn't conflate execution with evaluation";
        license = stdenv.lib.licenses.mit;
@@ -116757,8 +119759,8 @@ self: {
        pname = "siphash";
        version = "1.0.3";
        sha256 = "1wq5dan30ggjgmravy92ylqjvjv1q7mxrmddr7zc8h6aqr0wx0fg";
-       buildDepends = [ base bytestring cpu ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring cpu ];
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -116775,7 +119777,7 @@ self: {
        pname = "sirkel";
        version = "0.1";
        sha256 = "0hhphhdvzcq9az5zriip7sgypfwbf5plx65s96nvrm2lznw4pzan";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers hashtables haskell98 random
          remote SHA transformers
        ];
@@ -116790,11 +119792,10 @@ self: {
        pname = "sitemap";
        version = "0.1.2";
        sha256 = "0njb20w6kazsqgw61ykvfx3syqywv9frs7ch9bf2sr0i1d3b61bd";
-       buildDepends = [ base lens taggy taggy-lens text ];
+       libraryHaskellDepends = [ base lens taggy taggy-lens text ];
        homepage = "http://github.com/alpmestan/sitemap";
        description = "Sitemap parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sized" = callPackage
@@ -116805,7 +119806,7 @@ self: {
        pname = "sized";
        version = "0.1.0.0";
        sha256 = "00n9fb7kk3c6dy4j19d9ikmynllpxc7yd51sign0rhvnasmyrghl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints containers ListLike monomorphic type-natural
          vector
        ];
@@ -116825,8 +119826,11 @@ self: {
        sha256 = "1nwr92gy8031f18w367ys0l27q4qvpkrkikbj03m93q2i7y74ry7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base base-compat containers singletons ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [
+         array base base-compat containers singletons
+       ];
+       executableHaskellDepends = [ base base-compat ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools";
        description = "Sized types in Haskell using the GHC Nat kind";
        license = stdenv.lib.licenses.bsd3;
@@ -116841,7 +119845,7 @@ self: {
        pname = "sized-vector";
        version = "1.4.2.0";
        sha256 = "0lz1fr2n5x7xfb6y8l7prnawj1p3fp79bbgi98w1n22wazcy9jkm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints deepseq equational-reasoning hashable monomorphic
          singletons type-natural
        ];
@@ -116862,7 +119866,7 @@ self: {
        sha256 = "0xns0xl3khks1jvsmxh0nqf1saxs7qscvkbcg4270pp7n6lziqdg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs deepseq dlist lens parallel-io regex-posix
          system-fileio system-filepath text unix
        ];
@@ -116878,16 +119882,16 @@ self: {
      mkDerivation {
        pname = "sjsp";
        version = "0.1.0";
-       revision = "1";
        sha256 = "0x76hrzm0ikijsf5n425bagzin2x463mcmlnjqvinrb6ni47f4bl";
+       revision = "1";
        editedCabalFile = "309e00100db2c1bae2d292c485f2dc1a68e1c72a848a2142c3f0637c494dd727";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder bytestring filepath ghc-prim language-javascript
          syb unordered-containers
        ];
-       buildTools = [ alex happy ];
+       executableToolDepends = [ alex happy ];
        description = "Simple JavaScript Profiler";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -116900,8 +119904,10 @@ self: {
        pname = "skein";
        version = "1.0.9.3";
        sha256 = "0k7ibm4ykvypz6dm6jgqx0aj7qlg34cg841vipyjkbykp8nv3fn7";
-       buildDepends = [ base bytestring cereal crypto-api tagged ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring cereal crypto-api tagged
+       ];
+       testHaskellDepends = [
          base bytestring cereal crypto-api filepath hspec tagged
        ];
        homepage = "https://github.com/meteficha/skein";
@@ -116919,7 +119925,7 @@ self: {
        sha256 = "10bcw4l4w7myrbpmalg4mvpcyzbrnr8dafsplxkjlb6bnhc33scb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          argparser attoparsec base bytestring filepath hex posix-escape
          process time
        ];
@@ -116936,7 +119942,7 @@ self: {
        pname = "skell";
        version = "0.1.0.0";
        sha256 = "0lnlqcw5slv5gshdq35il16pm57fh07hkd7zx95gfxx1aipyr4lp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring containers http-types text wai
        ];
        jailbreak = true;
@@ -116954,7 +119960,7 @@ self: {
        pname = "skype4hs";
        version = "0.0.0.0";
        sha256 = "0mrd63yfmxxmv3l5v5i01rh4lyl831pfb06k9bxvc6m5q88fxglp";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring lifted-base monad-control mtl stm text
          time transformers-base word8 X11
        ];
@@ -116975,7 +119981,7 @@ self: {
        sha256 = "0rk9m9fw6as7zzjkm4jhwgw7nbs05ky1s556xmjbnkh6l9xp2chw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base bytestring containers directory filepath ghc-binary
          haskell98 IfElse old-locale regex-pcre time utf8-string
        ];
@@ -116994,7 +120000,7 @@ self: {
        pname = "slack";
        version = "0.1.0.0";
        sha256 = "0sqi4g8wavxdd98cnv869qx2p9g77f6dznxlfmgv1jlvd4a1ya67";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers either http-conduit mtl old-locale text time
          transformers
        ];
@@ -117014,12 +120020,12 @@ self: {
        pname = "slack-api";
        version = "0.5";
        sha256 = "1jjm7qzb1s2z8c7ikwsvz2bp7f3dx3qcqw7kcas42xp0ziwnl50m";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers errors HsOpenSSL io-streams lens
          lens-aeson monad-loops mtl network network-uri openssl-streams text
          time time-locale-compat transformers websockets wreq
        ];
-       testDepends = [ base ];
+       testHaskellDepends = [ base ];
        description = "Bindings to the Slack RTM API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -117034,10 +120040,11 @@ self: {
        sha256 = "0sz05v40b78qdpz8cqpnblhjy4dxqsz5175hq5083j7iv3xi3kc7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers HTTP http-client http-client-tls network
          text
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/tattsun/slack-notify-haskell";
        description = "Slack notifier for Haskell project";
        license = stdenv.lib.licenses.mit;
@@ -117052,11 +120059,11 @@ self: {
        pname = "slave-thread";
        version = "1.0.0.0";
        sha256 = "0snk0v126a79q2blddbznz50l89jfap4y4xs9i76pk0b0dcik319";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-prelude list-t mmorph partial-handler stm-containers
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore
        ];
        jailbreak = true;
@@ -117075,7 +120082,7 @@ self: {
        sha256 = "0mvjj8hs8837dby54ii71wd1sg2z3r14sr7w2hnj2nhnjy7c23yy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs containers directory filepath
          language-slice MissingH
        ];
@@ -117094,7 +120101,7 @@ self: {
        sha256 = "0x6blvdqwf9sqspwj48drasizx1pb1i92a0lp06szwa2nszdvzf0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring MonadCatchIO-transformers mtl pandoc
          snap-core snap-server utf8-string
        ];
@@ -117114,15 +120121,11 @@ self: {
        sha256 = "1jmnyw5n2k9c0bsdgna7hxc6yxjrycss02wjwsavbq13i7amq8i9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring cereal containers directory
          download-curl filepath HTTP network optparse-applicative
          stringsearch terminal-size text zlib
        ];
-       postInstall = ''
-         mkdir -p $out/share/man/man1
-         cp sloane.1 $out/share/man/man1/
-       '';
        homepage = "http://github.com/akc/sloane";
        description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences";
        license = stdenv.lib.licenses.bsd3;
@@ -117136,7 +120139,7 @@ self: {
        pname = "slot-lambda";
        version = "0.1.0.3";
        sha256 = "1npin7yaharbi5nzwksj1j7rf2k1nvmr1jgcf2xpnvvbcga7l69i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src-exts haskell-src-meta syb
          template-haskell vector
        ];
@@ -117151,7 +120154,7 @@ self: {
        pname = "sloth";
        version = "0.0.2";
        sha256 = "0x3iw1mqbl3q723kkxr6b0i1hxcfb4sink4kmg6xnpzd3hwaspq9";
-       buildDepends = [ base mtl process ];
+       libraryHaskellDepends = [ base mtl process ];
        description = "Testing for minimal strictness";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117163,7 +120166,7 @@ self: {
        pname = "smallarray";
        version = "0.2.2.4";
        sha256 = "16fgxsg8grxhqx6d4s3mm89qbkw2k72qvr4r701ih1i8gmf1ms1z";
-       buildDepends = [ base bytestring deepseq hashable ];
+       libraryHaskellDepends = [ base bytestring deepseq hashable ];
        jailbreak = true;
        homepage = "http://community.haskell.org/~aslatter/code/bytearray";
        description = "low-level unboxed arrays, with minimal features";
@@ -117181,11 +120184,12 @@ self: {
        sha256 = "1vjzvsvci8zn4y2lh7s2kh6v1c6447nfksqxcv468zz8d1mflsfi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base containers data-default directory filepath parsec
          text transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base containers data-default text ];
+       testHaskellDepends = [
          attoparsec base containers data-default parsec text
        ];
        jailbreak = true;
@@ -117199,12 +120203,30 @@ self: {
        pname = "smallcheck";
        version = "1.1.1";
        sha256 = "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd";
-       buildDepends = [ base ghc-prim logict mtl pretty ];
+       libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
        homepage = "https://github.com/feuerbach/smallcheck";
        description = "A property-based testing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smallcheck-laws" = callPackage
+    ({ mkDerivation, base, smallcheck, smallcheck-series, tasty
+     , tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "smallcheck-laws";
+       version = "0.1";
+       sha256 = "11b1fmbksw7z7inn9as73vjplm39d8kwmq10v8gj0yfw1g872xh0";
+       revision = "1";
+       editedCabalFile = "ff6bf8f4f1f7b95550c9adc53125bfb25dc665260f5121eaf811ca3a08e386a1";
+       libraryHaskellDepends = [
+         base smallcheck smallcheck-series tasty tasty-smallcheck
+       ];
+       testHaskellDepends = [ base smallcheck tasty ];
+       description = "SmallCheck properties for standard type classes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smallcheck-lens" = callPackage
     ({ mkDerivation, base, lens, smallcheck, smallcheck-series, tasty
      , tasty-smallcheck, transformers
@@ -117213,11 +120235,13 @@ self: {
        pname = "smallcheck-lens";
        version = "0.1";
        sha256 = "19awz3gphvkmb54j3mqqmqjzdjywdrrvsb9lp46gbhjazn94sxdl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens smallcheck smallcheck-series tasty tasty-smallcheck
          transformers
        ];
-       testDepends = [ base lens smallcheck tasty tasty-smallcheck ];
+       testHaskellDepends = [
+         base lens smallcheck tasty tasty-smallcheck
+       ];
        homepage = "https://github.com/jdnavarro/smallcheck-lens";
        description = "SmallCheck lens laws";
        license = stdenv.lib.licenses.bsd3;
@@ -117231,10 +120255,10 @@ self: {
        pname = "smallcheck-series";
        version = "0.3";
        sha256 = "1vdwafwdv38n1bvjf1rybfhh42a0q0g0g4wmw0v4fgxh73qndfdv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers logict smallcheck text transformers
        ];
-       testDepends = [ base doctest Glob ];
+       testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/jdnavarro/smallcheck-series";
        description = "Extra SmallCheck series and utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -117248,7 +120272,7 @@ self: {
        sha256 = "1g4g2sgj39pkm3ll4yv0q9dcmq2lyd26qkr1gir1svmxs6hdwp59";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base vector ];
+       executableHaskellDepends = [ base vector ];
        jailbreak = true;
        homepage = "http://github.com/noteed/smallpt-hs";
        description = "A Haskell port of the smallpt path tracer";
@@ -117264,7 +120288,7 @@ self: {
        pname = "smallstring";
        version = "0.3.3";
        sha256 = "1wkgbnknx9k56ikl6hpv91r9sav8v5qvl2w7z2jadgrlj29fy755";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring deepseq hashable smallarray text utf8-string
        ];
        jailbreak = true;
@@ -117281,8 +120305,8 @@ self: {
        pname = "smaoin";
        version = "0.3.0.0";
        sha256 = "0j18pdpywgb01679b4f2aj7pzna1njh45giw1b1dsqqdp45gz2rp";
-       buildDepends = [ base bytestring random text uuid ];
-       testDepends = [ base bytestring QuickCheck ];
+       libraryHaskellDepends = [ base bytestring random text uuid ];
+       testHaskellDepends = [ base bytestring QuickCheck ];
        homepage = "http://rel4tion.org/projects/smaoin-hs/";
        description = "Utilities for the Smaoin semantic information model";
        license = stdenv.lib.licenses.publicDomain;
@@ -117294,7 +120318,9 @@ self: {
        pname = "smartGroup";
        version = "0.3.0";
        sha256 = "10wb5v87xl54bsl2xxsh1fh54bgqbhmmkhyaa3ly23nm2f01cpnp";
-       buildDepends = [ base bytestring containers template-haskell ];
+       libraryHaskellDepends = [
+         base bytestring containers template-haskell
+       ];
        homepage = "http://patch-tag.com/r/salazar/smartGroup";
        description = "group strings or bytestrings by words in common";
        license = stdenv.lib.licenses.bsd3;
@@ -117311,7 +120337,10 @@ self: {
        sha256 = "1rkw4fhiidn9rfq4dvik58zr453jsh2l8xpswas2rsv6k5w0909r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers generic-deriving ghc-prim mtl QuickCheck random
+       ];
+       executableHaskellDepends = [
          base containers generic-deriving ghc-prim mtl QuickCheck random
        ];
        homepage = "https://github.com/leepike/SmartCheck";
@@ -117326,7 +120355,7 @@ self: {
        pname = "smartconstructor";
        version = "0.2.0.0";
        sha256 = "1082siphwd4xx9akqip78kzpqi19i3l53h0s2vghhdm5lwplcvlv";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/frerich/smartconstructor";
        description = "A package exposing a helper function for generating smart constructors";
        license = stdenv.lib.licenses.bsd3;
@@ -117340,7 +120369,9 @@ self: {
        sha256 = "0dxw4jgmwcz92n2rymdrfaz1v8lc2wknql9ca5p98jc14l8c2bl3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 pretty unix utf8-string ];
+       executableHaskellDepends = [
+         base haskell98 pretty unix utf8-string
+       ];
        homepage = "http://kyagrd.dyndns.org/~kyagrd/project/smartword/";
        description = "Web based flash card for Word Smart I and II vocabularies";
        license = stdenv.lib.licenses.bsd3;
@@ -117353,7 +120384,7 @@ self: {
        pname = "sme";
        version = "0.1";
        sha256 = "1d3kjyskwzc7p5bi6pv9yxfa6l6dqkkqc24dmmxl5wx7vmbfma25";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library for Secure Multi-Execution in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117365,7 +120396,7 @@ self: {
        pname = "smoothie";
        version = "0.4.0.2";
        sha256 = "1g2lk58p8rbhi45j6q3r0w4103bxi6pn9i3c5i3525s8brl4y8ni";
-       buildDepends = [ aeson base linear text vector ];
+       libraryHaskellDepends = [ aeson base linear text vector ];
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
@@ -117377,7 +120408,7 @@ self: {
        pname = "smt-lib";
        version = "0.0.2";
        sha256 = "1phm50pabahrpxrzp25mfhpafzhp4hz8cxp6fp93rwh4cl7cckky";
-       buildDepends = [ array base directory polyparse ];
+       libraryHaskellDepends = [ array base directory polyparse ];
        jailbreak = true;
        homepage = "http://tomahawkins.org";
        description = "Parsing and printing SMT-LIB";
@@ -117391,7 +120422,7 @@ self: {
        pname = "smtLib";
        version = "1.0.7";
        sha256 = "1jn2790x7g7n6jm5cfgd692n3l6iafyv0zyz40hx8ykcs4jh2rkf";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        description = "A library for working with the SMTLIB format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117405,7 +120436,7 @@ self: {
        pname = "smtlib2";
        version = "0.2";
        sha256 = "1xkbsqhfjsnf3qx9x7n7hqp3l769k4bbrp1274sf9cqqgbcs2ny6";
-       buildDepends = [
+       libraryHaskellDepends = [
          array atto-lisp attoparsec base blaze-builder bytestring
          constraints containers data-fix mtl process tagged text
          transformers
@@ -117423,7 +120454,7 @@ self: {
        pname = "smtp-mail";
        version = "0.1.4.5";
        sha256 = "010fbrcbypajwd9fjjc35br9p5axl1pqd0n1v51585ncrlv2icyw";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base16-bytestring base64-bytestring bytestring
          cryptohash filepath mime-mail network text
        ];
@@ -117442,7 +120473,7 @@ self: {
        pname = "smtp-mail-ng";
        version = "0.1.0.2";
        sha256 = "0jvjb3ps22p71b0vq7lgfyxmhjbzhsc3crs0cv3qsnkhz4ghvgbh";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base16-bytestring base64-bytestring bytestring
          crypto-random cryptohash filepath haskeline mime-mail mtl network
          stringsearch text tls transformers transformers-compat x509-store
@@ -117462,7 +120493,7 @@ self: {
        sha256 = "0z36zvrh6xhg8s7wai65d2y6hz0qz016ick9a4yrjpqxxk78h902";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 network process ];
+       executableHaskellDepends = [ base haskell98 network process ];
        homepage = "https://github.com/singpolyma/sock2stream";
        description = "Listen for SMTP traffic and send it to an MTA script";
        license = "unknown";
@@ -117479,7 +120510,7 @@ self: {
        pname = "smtps-gmail";
        version = "1.3.0";
        sha256 = "0vbykxqrw0gdhxwgchvgvkxwh7pwyrc1wvl26x5wqlkmkalmkvv9";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring conduit conduit-extra
          cprng-aes data-default filepath mime-mail network resourcet
          stringsearch text tls transformers
@@ -117497,7 +120528,7 @@ self: {
        pname = "snake-game";
        version = "1.2";
        sha256 = "1iy3m20ldc98agdi7n71ik8k2f62ybfg719z79lcf8pzynbfsrbd";
-       buildDepends = [ base GLUT OpenGL random ];
+       libraryHaskellDepends = [ base GLUT OpenGL random ];
        description = "Snake Game Using OpenGL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117518,18 +120549,21 @@ self: {
        sha256 = "05xnil6kfxwrnbvg7sigzh7hl8jsfr8cvbjd41z9ywn6ymxzr7zs";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession comonad
          configurator containers directory directory-tree dlist either
          filepath hashable heist lens logict MonadCatchIO-transformers mtl
-         mwc-random old-time pwstore-fast regex-posix snap-core snap-server
-         stm template-haskell text time transformers unordered-containers
-         vector vector-algorithms xmlhtml
+         mwc-random pwstore-fast regex-posix snap-core snap-server stm text
+         time transformers unordered-containers vector vector-algorithms
+         xmlhtml
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory directory-tree filepath
+         hashable old-time snap-server template-haskell text
        ];
        homepage = "http://snapframework.com/";
        description = "Top-level package for the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-accept" = callPackage
@@ -117538,7 +120572,7 @@ self: {
        pname = "snap-accept";
        version = "0.1.0";
        sha256 = "19sn7q9avb7y9j46fk7iga237qgcdm69sanb351c5s0lfgcpnf1m";
-       buildDepends = [ base http-media snap-core ];
+       libraryHaskellDepends = [ base http-media snap-core ];
        jailbreak = true;
        homepage = "http://github.com/zimothy/snap-accept";
        description = "Accept header branching for the Snap web framework";
@@ -117568,7 +120602,7 @@ self: {
        sha256 = "0spdn7zazd17yrcx004m4yag8vy4bac4997f81nfvy25jvg87hhl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson aeson-pretty base bytestring clientsession cmdargs snap text
          unordered-containers utf8-string
        ];
@@ -117576,7 +120610,6 @@ self: {
        homepage = "https://github.com/dzhus/snap-auth-cli";
        description = "Command-line tool to manage Snap AuthManager database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-blaze" = callPackage
@@ -117585,7 +120618,7 @@ self: {
        pname = "snap-blaze";
        version = "0.2.1.3";
        sha256 = "0jpiykqgvdbhk1wk37qgfxmyrnx8553wnnmn7a4b3mq8zx8fzmlm";
-       buildDepends = [ base blaze-html snap-core ];
+       libraryHaskellDepends = [ base blaze-html snap-core ];
        homepage = "http://github.com/jaspervdj/snap-blaze";
        description = "blaze-html integration for Snap";
        license = stdenv.lib.licenses.bsd3;
@@ -117597,7 +120630,7 @@ self: {
        pname = "snap-blaze-clay";
        version = "0.1.0.0";
        sha256 = "05zi9rjd37xznjj8yhm5har12mfrclsrwd9fbcwh5ngccd7h7fiy";
-       buildDepends = [ base blaze-html clay snap-core ];
+       libraryHaskellDepends = [ base blaze-html clay snap-core ];
        jailbreak = true;
        homepage = "http://github.com/deckool/snap-blaze-clay";
        description = "blaze-html-clay integration for Snap";
@@ -117610,7 +120643,9 @@ self: {
        pname = "snap-configuration-utilities";
        version = "0.1.0.0";
        sha256 = "07cm60v7bz585fawfc8mml178z54zqfg8kb7ldln5bsa0ggpha2z";
-       buildDepends = [ base configurator text unordered-containers ];
+       libraryHaskellDepends = [
+         base configurator text unordered-containers
+       ];
        jailbreak = true;
        description = "Methods to manipulate Configurator objects for Snap & Snaplets";
        license = stdenv.lib.licenses.bsd3;
@@ -117627,10 +120662,10 @@ self: {
      mkDerivation {
        pname = "snap-core";
        version = "0.9.7.2";
-       revision = "1";
        sha256 = "0lgnflwcjyiinrm75dy1flr37bvjn3yljx53cvlsb3ccfnxqwsjj";
+       revision = "1";
        editedCabalFile = "d39520edcc970d9d1f683af9631ccbcad39536b9f88040b93efb66cbe7aefc55";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base blaze-builder
          blaze-builder-enumerator bytestring bytestring-mmap
          case-insensitive containers deepseq directory enumerator filepath
@@ -117652,14 +120687,13 @@ self: {
        pname = "snap-cors";
        version = "1.2.9";
        sha256 = "0s6bl9nldr96l0zjx1qh3zq9fs5wlrmagaalxsppjsln456gzjcd";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive hashable network
          network-uri snap text transformers unordered-containers
        ];
        homepage = "http://github.com/ocharles/snap-cors";
        description = "Add CORS headers to Snap applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-elm" = callPackage
@@ -117670,7 +120704,7 @@ self: {
        pname = "snap-elm";
        version = "0.1.1.2";
        sha256 = "1lp76s5yqgw5zvkv13b4552zq9f2mrngp5l5vd8kwz9rhawgl6kr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory Elm filepath process snap-core text
          transformers
        ];
@@ -117687,14 +120721,13 @@ self: {
        pname = "snap-error-collector";
        version = "1.1.1";
        sha256 = "1b0wsbk01zjxqmilan94h0dprnvnq4j8rhair54ra2lzyqsbdbcx";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base containers monad-loops MonadCatchIO-transformers snap
          stm time transformers
        ];
        homepage = "http://github.com/ocharles/snap-error-collector";
        description = "Collect errors in batches and dispatch them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-extras" = callPackage
@@ -117712,14 +120745,14 @@ self: {
        sha256 = "1747qvwbn1rlrjk085rj1780nrsqw4ps78c13si3kkk697k4wcbm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring case-insensitive
          configurator containers data-default digestive-functors
          digestive-functors-heist digestive-functors-snap directory-tree
          filepath heist jmacro lens mtl pcre-light readable safe snap
          snap-core text time transformers wl-pprint-text xmlhtml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers QuickCheck snap-core tasty tasty-hunit
          tasty-quickcheck
        ];
@@ -117737,7 +120770,7 @@ self: {
        pname = "snap-loader-dynamic";
        version = "0.10.0.3";
        sha256 = "0nk4knkxnfffs5pgf6x3ld83l174aymqlyasxbf7j10w0w8srmvw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory directory-tree hint mtl snap-core template-haskell
          time unix
        ];
@@ -117751,10 +120784,10 @@ self: {
      mkDerivation {
        pname = "snap-loader-static";
        version = "0.9.0.2";
-       revision = "1";
        sha256 = "0d6s7n6yryfs2jkw0hxvhvc79fhbj256askb1c6ksqhscxxxwz1m";
+       revision = "1";
        editedCabalFile = "c927448783c28f56bd57c7b09d147965b96e7b4c7320524b26c83bf10ab89c21";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://snapframework.com/";
        description = "Snap: A Haskell Web Framework: static loader";
        license = stdenv.lib.licenses.bsd3;
@@ -117770,11 +120803,11 @@ self: {
        pname = "snap-predicates";
        version = "0.3.1";
        sha256 = "02rksb2p8wgpla86313z6lwqli5f4ryv4wr95s61kamcpbmf18y5";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive containers monads-tf
          snap-core text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring case-insensitive containers HUnit
          monads-tf QuickCheck snap-core test-framework test-framework-hunit
          test-framework-quickcheck2 text transformers
@@ -117794,16 +120827,16 @@ self: {
      mkDerivation {
        pname = "snap-server";
        version = "0.9.5.1";
-       revision = "1";
        sha256 = "18ryin6f315picrs2159sn2668266l3xchs7jb8isw0gp52273xg";
+       revision = "1";
        editedCabalFile = "7909ad539e7d3f23f3c799d736d1a54d0a9098dd55fd6be75c13b57794bfaa5c";
-       buildDepends = [
+       configureFlags = [ "-fopenssl" ];
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base blaze-builder
          blaze-builder-enumerator bytestring case-insensitive containers
          enumerator HsOpenSSL MonadCatchIO-transformers mtl network
          old-locale snap-core text time unix unix-compat
        ];
-       configureFlags = [ "-fopenssl" ];
        homepage = "http://snapframework.com/";
        description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -117818,12 +120851,12 @@ self: {
        pname = "snap-testing";
        version = "0.6.0.0";
        sha256 = "1kzcdlfahhrpczihbr4f41p4ijps27lhghrh29csl6jl7n71lvqk";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers digestive-functors HandsomeSoup
          hxt io-streams mtl process QuickCheck snap snap-core text
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base bytestring containers digestive-functors HandsomeSoup
          hxt io-streams lens mtl process QuickCheck snap snap-core text
          transformers
@@ -117843,7 +120876,7 @@ self: {
        pname = "snap-utils";
        version = "0.1.2";
        sha256 = "1kr09fj1jfs6sfmca51k0gwn4acya70s9irzay9yf5b9yyvka391";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring heist http-types MonadCatchIO-transformers mtl snap
          snap-core text xmlhtml
        ];
@@ -117862,14 +120895,13 @@ self: {
        pname = "snap-web-routes";
        version = "0.5.0.0";
        sha256 = "1ml0b759k2n9bd2x4akz4dfyk8ywnpgrdlcymng4vhjxbzngnniv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring heist mtl snap snap-core text web-routes xmlhtml
        ];
        jailbreak = true;
        homepage = "https://github.com/lukerandall/snap-web-routes";
        description = "Type safe URLs for Snap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-acid-state" = callPackage
@@ -117878,11 +120910,12 @@ self: {
        pname = "snaplet-acid-state";
        version = "0.2.7";
        sha256 = "0vjqcmcp0p8vmh7vzwv62bigbx1ck2vnaxlkqmg5wddn0mhfm6gx";
-       buildDepends = [ acid-state base mtl snap text transformers ];
+       libraryHaskellDepends = [
+         acid-state base mtl snap text transformers
+       ];
        homepage = "https://github.com/mightybyte/snaplet-acid-state";
        description = "acid-state snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-actionlog" = callPackage
@@ -117897,7 +120930,7 @@ self: {
        pname = "snaplet-actionlog";
        version = "0.2.0.1";
        sha256 = "177a1b9fvlqh59hd9b5y92lq8yxv14jh79aadkyhxb4i0l5rl9vv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring digestive-functors
          digestive-functors-heist digestive-functors-snap errors heist
          persistent persistent-postgresql persistent-template readable
@@ -117919,7 +120952,7 @@ self: {
        pname = "snaplet-amqp";
        version = "1.1.0.0";
        sha256 = "01qw28paifysk402lpb7y8dyhf401ls1l0dcn6fiigvczwxzmk91";
-       buildDepends = [
+       libraryHaskellDepends = [
          amqp base bytestring configurator lens monad-control mtl network
          resource-pool snap transformers
        ];
@@ -117927,7 +120960,6 @@ self: {
        homepage = "https://github.com/ixmatus/snaplet-amqp";
        description = "Snap framework snaplet for the AMQP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-auth-acid" = callPackage
@@ -117940,7 +120972,7 @@ self: {
        pname = "snaplet-auth-acid";
        version = "0.1.0";
        sha256 = "0i0py2rj2vkivl97fxnv87bpbsbms2ncdqbq4zs0777nbr717swm";
-       buildDepends = [
+       libraryHaskellDepends = [
          acid-state aeson attoparsec base cereal clientsession directory
          errors filepath hashable lens MonadCatchIO-transformers mtl
          safecopy scientific snap snap-core text time unordered-containers
@@ -117949,7 +120981,6 @@ self: {
        jailbreak = true;
        description = "Provides an Acid-State backend for the Auth Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-coffee" = callPackage
@@ -117960,14 +120991,13 @@ self: {
        pname = "snaplet-coffee";
        version = "0.1.0.2";
        sha256 = "1kxxnk8m9154sallhy3rf8nmz0qkvchh8m761jgzhfbnnwlznpnf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring configurator directory filepath haskell-coffee mtl
          snap snap-core
        ];
        homepage = "https://github.com/AtticHacker/snaplet-coffee";
        description = "CoffeeScript for Snap, auto-compilation and pre-compilation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-css-min" = callPackage
@@ -117978,7 +121008,7 @@ self: {
        pname = "snaplet-css-min";
        version = "0.1.2";
        sha256 = "1bp6y0x03dpflbp4b1kkbxnqwsgnynbbpdgcpswwxz48xkpcp0ij";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring css-text directory filepath lens snap text
          utf8-string
        ];
@@ -117997,7 +121027,7 @@ self: {
        pname = "snaplet-environments";
        version = "0.1.1";
        sha256 = "1kk2ry19z73cmmwh3hmg87n00hqhzpmdvnb36b7yf9ck4zkhgy3h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bson configurator mtl regex-tdfa snap snap-core text
          unordered-containers
        ];
@@ -118015,14 +121045,13 @@ self: {
        pname = "snaplet-fay";
        version = "0.3.3.12";
        sha256 = "1j9khzd1zalzkli0p139fx48dljn76f4g851k889q3zq5lriihps";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
        ];
        homepage = "https://github.com/faylang/snaplet-fay";
        description = "Fay integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-hasql" = callPackage
@@ -118033,14 +121062,13 @@ self: {
        pname = "snaplet-hasql";
        version = "1.0.2";
        sha256 = "08gx096vg0swjc7z10nzlqsnjlr43cp190q4krkf08jb54ln3kcv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring clientsession configurator hasql
          hasql-backend lens mtl snap text time
        ];
        homepage = "https://github.com/mikeplus64/snaplet-hasql";
        description = "A Hasql snaplet";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-haxl" = callPackage
@@ -118051,7 +121079,7 @@ self: {
        pname = "snaplet-haxl";
        version = "0.0.0.2";
        sha256 = "0xqz62qrhzr0ik60055w7jawxkps6cn5k6v1g7nx2zzhyvg1w4wl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haxl MonadCatchIO-transformers snap transformers
        ];
        jailbreak = true;
@@ -118071,7 +121099,7 @@ self: {
        pname = "snaplet-hdbc";
        version = "0.9.1";
        sha256 = "17r7ailc2cnfny1ki7b027b5xipg2nvgr2yxvfh0sfzq8xkqa8ym";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring clientsession containers convertible data-lens
          data-lens-template HDBC MonadCatchIO-transformers mtl
          resource-pool-catchio snap text time transformers
@@ -118092,14 +121120,13 @@ self: {
        pname = "snaplet-hslogger";
        version = "1.0.0.2";
        sha256 = "15cvpiz3p1qhb80sgz61mabvkb8h6j713jrny6mbg6qj945jbb0x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator hslogger mtl snap transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/ixmatus/snaplet-logger";
        description = "Snap framework snaplet for the Logger API library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-i18n" = callPackage
@@ -118112,7 +121139,11 @@ self: {
        sha256 = "0yl28vvk5p1qazcvb3ca3748cqzr45x9274ifcidcn13p327kck2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base configurator filepath heist lens snap snap-loader-static text
+         xmlhtml
+       ];
+       executableHaskellDepends = [
          base bytestring configurator filepath heist lens snap
          snap-loader-static text xmlhtml
        ];
@@ -118132,7 +121163,7 @@ self: {
        pname = "snaplet-influxdb";
        version = "1.0.1.1";
        sha256 = "1dv800rclzl0b251bixksfl7jf28z82ql7nikf5dvginfpm71j7j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring configurator http-client influxdb lens
          monad-control mtl network snap text transformers
        ];
@@ -118140,7 +121171,6 @@ self: {
        homepage = "https://github.com/ixmatus/snaplet-influxdb";
        description = "Snap framework snaplet for the InfluxDB library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-lss" = callPackage
@@ -118151,10 +121181,10 @@ self: {
        pname = "snaplet-lss";
        version = "0.1.0.0";
        sha256 = "0gll9r65xahx5vai4pbi0nrvscg6z964m30s58kkzy3898j000gx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath heist lss snap text xmlhtml
        ];
-       testDepends = [ base hspec-snap hspec2 lens snap text ];
+       testHaskellDepends = [ base hspec-snap hspec2 lens snap text ];
        jailbreak = true;
        homepage = "https://github.com/dbp/lss";
        description = "Lexical Style Sheets - Snap Web Framework adaptor";
@@ -118169,14 +121199,13 @@ self: {
        pname = "snaplet-mandrill";
        version = "0.1.0.3";
        sha256 = "0yyb0qbd14v6xw5vix08pv40w9l8p2vwvmh67sa9b4q9wkvwv962";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator mandrill mtl network snap transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/ixmatus/snaplet-mandrill";
        description = "Snap framework snaplet for the Mandrill API library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-mongoDB" = callPackage
@@ -118189,7 +121218,7 @@ self: {
        pname = "snaplet-mongoDB";
        version = "0.2";
        sha256 = "0hpm2bhvb8gh4sz4dfx53s24gkkk2c234szhwbrn10bmd7hrapaw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bson bytestring compact-string-fix containers haskell-src-exts
          MonadCatchIO-transformers mongoDB mtl parsec regular safe snap
          snap-core template-haskell text time
@@ -118207,7 +121236,9 @@ self: {
        pname = "snaplet-mongodb-minimalistic";
        version = "0.0.6.12";
        sha256 = "0d0hnn0qp4zd453wzh1d3adls68gpv28dnkr7dcmjfl4f5igdran";
-       buildDepends = [ base lens mongoDB mtl snap text transformers ];
+       libraryHaskellDepends = [
+         base lens mongoDB mtl snap text transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/Palmik/snaplet-mongodb-minimalistic";
        description = "Minimalistic MongoDB Snaplet";
@@ -118225,7 +121256,7 @@ self: {
        pname = "snaplet-mysql-simple";
        version = "0.2.1.0";
        sha256 = "0hq58xsk5089kcdv2pby7dd71nb3nqzxrpppzb9qyqfz7pf45nr1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring clientsession configurator containers errors lens
          MonadCatchIO-transformers mtl mysql mysql-simple
          resource-pool-catchio snap text transformers unordered-containers
@@ -118248,13 +121279,13 @@ self: {
        pname = "snaplet-oauth";
        version = "0.0.6";
        sha256 = "177yspz91nlzz9pw9x9zh4s4q7z7w9kl8gg5fd285xbadxazp3yl";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring bytestring-show data-lens data-lens-template
          failure hashable heist hoauth2 http-conduit http-types
          MonadCatchIO-mtl snap snap-core snap-loader-dynamic
          snap-loader-static text unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring bytestring-show HUnit test-framework
          test-framework-hunit text
        ];
@@ -118276,7 +121307,7 @@ self: {
        pname = "snaplet-persistent";
        version = "0.5";
        sha256 = "1zbxknmsg9q6jwbxr4nh8nkfgkjmxb7pr2wwqa7rgr0wvh8ipx5k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring clientsession configurator errors heist lens
          monad-logger MonadCatchIO-transformers mtl persistent
          persistent-postgresql persistent-template readable resource-pool
@@ -118286,7 +121317,6 @@ self: {
        homepage = "https://github.com/soostone/snaplet-persistent";
        description = "persistent snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-postgresql-simple" = callPackage
@@ -118298,10 +121328,10 @@ self: {
      mkDerivation {
        pname = "snaplet-postgresql-simple";
        version = "0.6.0.2";
-       revision = "2";
        sha256 = "0xx69x9mkv6xyd7arnip12zzyq7hdcqbypgypalgsj6vcjb8i4mp";
+       revision = "2";
        editedCabalFile = "cfc56ee20478bf05a650bdcb457b606a640daa71b84a3a2a3bdb8930dcbbeb7b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring clientsession configurator errors lens
          MonadCatchIO-transformers mtl postgresql-simple
          resource-pool-catchio snap text transformers unordered-containers
@@ -118310,7 +121340,6 @@ self: {
        homepage = "https://github.com/mightybyte/snaplet-postgresql-simple";
        description = "postgresql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-postmark" = callPackage
@@ -118321,14 +121350,13 @@ self: {
        pname = "snaplet-postmark";
        version = "0.2.0";
        sha256 = "0006i88ssgh6z9g967wlw0km8abxmxdjjs7aalsddzla6xdp8wnx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator mtl postmark snap text transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/LukeHoersten/snaplet-postmark";
        description = "Postmark snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-purescript" = callPackage
@@ -118339,13 +121367,12 @@ self: {
        pname = "snaplet-purescript";
        version = "0.3.0.0";
        sha256 = "1dapzqyxj7s6j4drp0szldjxrhm77r4yvbjxs79155a58mj9p1wn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator mtl raw-strings-qq shelly snap snap-core text
          transformers
        ];
        description = "Automatic (re)compilation of purescript projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-recaptcha" = callPackage
@@ -118357,14 +121384,13 @@ self: {
        pname = "snaplet-recaptcha";
        version = "1.0.3";
        sha256 = "02f5fv70r7zjzycrrqsd1jwgpa7sq1m6rci74dlcbnms7z9cpv26";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring configurator heist http-conduit
          lens MonadCatchIO-transformers mtl snap text transformers
        ];
        homepage = "http://github.com/mikeplus64/snaplet-recaptcha";
        description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-redis" = callPackage
@@ -118375,14 +121401,13 @@ self: {
        pname = "snaplet-redis";
        version = "0.1.4.2";
        sha256 = "0ri5cj3gjz5c1snh7kbncb08ijs1551ixr06v3nxjsb03hrl4hhh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator hedis lens mtl network snap text transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/dzhus/snaplet-redis/";
        description = "Redis support for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-redson" = callPackage
@@ -118395,7 +121420,7 @@ self: {
        pname = "snaplet-redson";
        version = "0.1.0.0";
        sha256 = "0pvan8fnddn27cps5x8gyrwmm88z96jjh124i9g3mi9aqpyx8z5d";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring configurator containers data-lens
          data-lens-template easy-file hedis mtl snap snap-core snaplet-redis
          text utf8-string websockets websockets-snap
@@ -118416,7 +121441,7 @@ self: {
        pname = "snaplet-rest";
        version = "0.1.0";
        sha256 = "1w1cy5zisn0mxj6rrz7wrw31ariia006cjxqwh9ahds6iwqh40y1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive http-media
          lens mtl snap snap-accept snap-core text utf8-string xmlhtml
        ];
@@ -118436,7 +121461,7 @@ self: {
        pname = "snaplet-riak";
        version = "0.2.0.0";
        sha256 = "0q0mnk0cl31xidax6bahvwabm9341p5852939yzgbam72mcv8jh0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers data-lens data-lens-template mtl riak
          riak-protobuf snap snap-core time transformers
        ];
@@ -118455,14 +121480,13 @@ self: {
        pname = "snaplet-sass";
        version = "0.1.2.0";
        sha256 = "1aiznsi54lxzwxnilckspvp6rdfmksxppa3964kqxh93a9gvkr9z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring configurator directory filepath mtl process snap
          snap-core transformers
        ];
        homepage = "https://github.com/lukerandall/snaplet-sass";
        description = "Sass integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-sedna" = callPackage
@@ -118473,7 +121497,7 @@ self: {
        pname = "snaplet-sedna";
        version = "0.0.1.0";
        sha256 = "1rd0ymsnanf3nk02cim8lm9gppm739jfi2x6fzmp10xs9wmlhqab";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers monad-control mtl resource-pool
          sednaDBXML snap
        ];
@@ -118491,13 +121515,12 @@ self: {
        pname = "snaplet-ses-html";
        version = "0.1.1.0";
        sha256 = "1s5pyhwdnpw1ijy67h4kw052jz4pp73bpjcqii31passybvfd7k6";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base blaze-html bytestring configurator lens ses-html
          snap text transformers
        ];
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-sqlite-simple" = callPackage
@@ -118512,12 +121535,12 @@ self: {
        pname = "snaplet-sqlite-simple";
        version = "0.4.8.3";
        sha256 = "0nc0kv9s3c4wc3xb6jggx9v4p141c3af07x8vda18c7qlfif5nx3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring clientsession configurator direct-sqlite lens
          MonadCatchIO-transformers mtl snap sqlite-simple text transformers
          unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring clientsession configurator containers
          directory errors HUnit lens MonadCatchIO-transformers mtl
          SafeSemaphore snap snap-core sqlite-simple stm test-framework
@@ -118526,7 +121549,6 @@ self: {
        homepage = "https://github.com/nurpax/snaplet-sqlite-simple";
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-stripe" = callPackage
@@ -118538,7 +121560,7 @@ self: {
        pname = "snaplet-stripe";
        version = "0.3.0";
        sha256 = "0j85vzfmw6skag8rfww4gsg1lyfc7qbxiqhmwbsh4vfjiagrc9wp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring configurator heist lens-family-core mtl snap stripe
          text text-format transformers xmlhtml
        ];
@@ -118546,7 +121568,6 @@ self: {
        homepage = "https://github.com/LukeHoersten/snaplet-stripe";
        description = "Stripe snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-tasks" = callPackage
@@ -118557,7 +121578,7 @@ self: {
        pname = "snaplet-tasks";
        version = "0.1.2";
        sha256 = "0wkhjjjmd08jbhp41j6xvcvg3g7c74cz18mm89k8alwfc50krvc0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers curl data-hash haskell98 MissingH mtl
          network snap snap-core
        ];
@@ -118576,7 +121597,7 @@ self: {
        pname = "snaplet-typed-sessions";
        version = "0.5";
        sha256 = "0gc6vnxsbwgciv281p6jff8ylcni4qpkmak2zqz710in86grjbgw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal clientsession containers hashtables mtl
          PSQueue random regex-posix snap snap-core time
        ];
@@ -118597,13 +121618,13 @@ self: {
        pname = "snaplet-wordpress";
        version = "0.1.1.2";
        sha256 = "1vmkywrd0vfyd028d0pvfglywgbv1m26j1shwy9wmnr581vx9pab";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base blaze-builder bytestring configurator
          containers data-default either hedis heist hspec hspec-snap lens
          map-syntax mtl snap snap-core snaplet-redis text time
          unordered-containers vector wreq xmlhtml
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base blaze-builder containers data-default either hedis heist
          hspec hspec-core hspec-snap lens mtl snap snaplet-redis text
          unordered-containers xmlhtml
@@ -118622,12 +121643,12 @@ self: {
        pname = "snappy";
        version = "0.2.0.2";
        sha256 = "14fdx0fikkd9krpzqrvas6mjqmmhmh0qwqzvz1kymil7d8rdyr85";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ snappy ];
+       testHaskellDepends = [
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       extraLibraries = [ snappy ];
        homepage = "http://github.com/bos/snappy";
        description = "Bindings to the Google Snappy library for fast compression/decompression";
        license = stdenv.lib.licenses.bsd3;
@@ -118639,7 +121660,7 @@ self: {
        pname = "snappy-conduit";
        version = "0.1.0.0";
        sha256 = "0k93v3dyv7818xy45l7i5wykfmnwyqkykxjh6xr937zh8a4qapfi";
-       buildDepends = [ base bytestring conduit snappy ];
+       libraryHaskellDepends = [ base bytestring conduit snappy ];
        jailbreak = true;
        homepage = "http://github.com/tatac1/snappy-conduit/";
        description = "Conduit bindings for Snappy (see snappy package)";
@@ -118652,7 +121673,7 @@ self: {
        pname = "snappy-framing";
        version = "0.1.0";
        sha256 = "1m7zk4ns8igh2717d77k4zvf06byp35dly3ykawaz9hxwsxn1jb2";
-       buildDepends = [ array base binary bytestring snappy ];
+       libraryHaskellDepends = [ array base binary bytestring snappy ];
        homepage = "https://github.com/kim/snappy-framing";
        description = "Snappy Framing Format in Haskell";
        license = "unknown";
@@ -118664,7 +121685,7 @@ self: {
        pname = "snappy-iteratee";
        version = "0.1";
        sha256 = "17jwsvw7ik2bjanmzw4h72mdjaz031b5a6hi7cjz4ba1yjkiqnmk";
-       buildDepends = [ base bytestring iteratee snappy ];
+       libraryHaskellDepends = [ base bytestring iteratee snappy ];
        jailbreak = true;
        homepage = "http://github.com/iand675/snappy-iteratee";
        description = "An enumeratee that uses Google's snappy compression library";
@@ -118681,7 +121702,7 @@ self: {
        pname = "sndfile-enumerators";
        version = "0.10.0.0";
        sha256 = "1nnlbhnm88xy462sh3d54b751ndl0r2qggbxn2irrwqdnhc21v4r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers filepath iteratee
          listlike-instances MonadCatchIO-transformers transformers vector
          word24
@@ -118699,11 +121720,12 @@ self: {
        pname = "sneathlane-haste";
        version = "1";
        sha256 = "0m6281a1hvwbhv02vpdd01vm0jvccvq1kvy26dfncv0a8158y6wj";
-       buildDepends = [ base haste-compiler ];
+       libraryHaskellDepends = [ base haste-compiler ];
        jailbreak = true;
        homepage = "http://sneathlane.com";
        description = "A compositional web UI library, which draws to a Canvas element";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snippet-extractor" = callPackage
@@ -118714,7 +121736,7 @@ self: {
        sha256 = "0iyya6p5i5jrhvah45bcvqgldfx49qv8393vwi5k413vxjr7c3zm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base parsec ];
+       executableHaskellDepends = [ base parsec ];
        description = "Extracts labeled snippets of code to files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118729,10 +121751,13 @@ self: {
        sha256 = "1n2cj35qrp6a766w29qrqcpcrv81xcpk9agkbibxngxh03abyhji";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath HsSyck parsec safe spoonutil
          xhtml
        ];
+       executableHaskellDepends = [
+         base containers directory filepath HsSyck parsec safe spoonutil
+       ];
        homepage = "http://github.com/elginer/snm";
        description = "The Simple Nice-Looking Manual Generator";
        license = stdenv.lib.licenses.gpl3;
@@ -118749,7 +121774,7 @@ self: {
        pname = "snmp";
        version = "0.2.0.0";
        sha256 = "0vjbpjsa4ivsjzvfc9sr457pms2rw1zpb92d971n0yccl0bxmf67";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types async base binary bytestring
          cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl
          network network-info random securemem text time
@@ -118764,7 +121789,7 @@ self: {
        pname = "snow-white";
        version = "2009.12.1";
        sha256 = "007hzr8dpj0mhvmnpdg0gi296q3mlicnx36s6hmgifzmyaa8kssi";
-       buildDepends = [ base binary bytestring mps ];
+       libraryHaskellDepends = [ base binary bytestring mps ];
        homepage = "http://github.com/nfjinjing/snow-white";
        description = "encode any binary instance to white space";
        license = stdenv.lib.licenses.bsd3;
@@ -118780,8 +121805,8 @@ self: {
        pname = "snowball";
        version = "1.0.0.1";
        sha256 = "0fvxzm14ffjqq6n51bi5cmq5yrlggpkbb9rbbw522l6cjgv0apbx";
-       buildDepends = [ base bytestring text text-icu ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring text text-icu ];
+       testHaskellDepends = [
          base HUnit QuickCheck quickcheck-instances test-framework-hunit
          test-framework-quickcheck2 test-framework-th text
        ];
@@ -118796,7 +121821,7 @@ self: {
        pname = "snowflake";
        version = "0.1.1.1";
        sha256 = "1pfd8lqwv0504hli6fhwiqckcca0x9pnfzmy3kz36w7138rclmpi";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers.";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -118811,7 +121836,7 @@ self: {
        sha256 = "0l6hy0mza344k7m9skb6v9al611zgrrknhjdzx4ipqdd9zky9p23";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers gl-capture GLUT OpenGL OpenGLRaw random
        ];
        jailbreak = true;
@@ -118830,19 +121855,18 @@ self: {
        pname = "soap";
        version = "0.2.2.7";
        sha256 = "02yirl0pr680pbwbh9z0awyk4blgdd0rir8x1gyydyn6v5dg736i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit configurator data-default exceptions
          http-client http-types iconv mtl resourcet text
          unordered-containers xml-conduit xml-conduit-writer xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec HUnit text unordered-containers xml-conduit
          xml-conduit-writer
        ];
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "SOAP client tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap-openssl" = callPackage
@@ -118853,14 +121877,13 @@ self: {
        pname = "soap-openssl";
        version = "0.1.0.2";
        sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator data-default HsOpenSSL http-client
          http-client-openssl soap text
        ];
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "TLS-enabled SOAP transport (using openssl bindings)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap-tls" = callPackage
@@ -118872,14 +121895,13 @@ self: {
        pname = "soap-tls";
        version = "0.1.1.2";
        sha256 = "0xnzwzmhh2i5nci7xbnkr28hxm376fbmgjcwz7svk46k1vxvlfp4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base configurator connection data-default http-client
          http-client-tls soap text tls x509 x509-store x509-validation
        ];
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "TLS-enabled SOAP transport (using tls package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sock2stream" = callPackage
@@ -118892,7 +121914,7 @@ self: {
        sha256 = "1vnrjza4x4jqlvz7mmihrjbdf4ngw02fkkn1j768w81m814vny7h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bytestring containers directory haskell98 network
        ];
        homepage = "https://github.com/singpolyma/sock2stream";
@@ -118907,7 +121929,7 @@ self: {
        pname = "sockaddr";
        version = "0.0.0";
        sha256 = "1h74k5pipv9314y1d2wgpwgvyxfp6pcnq5051fdqr1shqlkpwbs2";
-       buildDepends = [ base byteorder bytestring network ];
+       libraryHaskellDepends = [ base byteorder bytestring network ];
        description = "Printing SockAddr";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118918,12 +121940,11 @@ self: {
        pname = "socket";
        version = "0.5.2.0";
        sha256 = "0mika886mqzjzm14sby3qdlwdlnd20xwl2d2n1faalgimjl1149y";
-       buildDepends = [ base bytestring ];
-       testDepends = [ async base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ async base bytestring ];
        homepage = "https://github.com/lpeterse/haskell-socket";
        description = "A portable and extensible sockets library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-activation" = callPackage
@@ -118932,7 +121953,7 @@ self: {
        pname = "socket-activation";
        version = "0.1.0.1";
        sha256 = "109zxc16zlp98ggc99ap7wbzaa40yg34v3abn2nfs0w49dvh1zma";
-       buildDepends = [ base network transformers unix ];
+       libraryHaskellDepends = [ base network transformers unix ];
        homepage = "https://github.com/sakana/haskell-socket-activation";
        description = "systemd socket activation library";
        license = stdenv.lib.licenses.bsd3;
@@ -118946,7 +121967,7 @@ self: {
        pname = "socket-io";
        version = "1.3.3";
        sha256 = "1gy8g8bxjjj1hifkhvid6v8amml0gpp6gbfpih3v0grbi5aci0w7";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
        ];
@@ -118960,9 +121981,9 @@ self: {
        pname = "socket-sctp";
        version = "0.1.0.0";
        sha256 = "1xdrc3d31xzi0q8arh8liv1h9xqinscaa5ip2xs6dvf4gap7rvs8";
-       buildDepends = [ base bytestring socket ];
-       testDepends = [ base bytestring socket ];
-       extraLibraries = [ sctp ];
+       libraryHaskellDepends = [ base bytestring socket ];
+       librarySystemDepends = [ sctp ];
+       testHaskellDepends = [ base bytestring socket ];
        homepage = "https://github.com/lpeterse/haskell-socket-sctp";
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
@@ -118981,12 +122002,12 @@ self: {
        pname = "socketio";
        version = "0.1.3";
        sha256 = "19rwkix7fjj3znd7z5bzknnpcfkmkmpcmrksv3q51b9fwph8gwrq";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-terminal attoparsec base blaze-builder bytestring
          conduit conduit-extra http-types lifted-base monad-control mtl
          random text transformers-base unordered-containers vector wai warp
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson ansi-terminal attoparsec base blaze-builder bytestring
          conduit conduit-extra http-types HUnit lifted-base monad-control
          mtl QuickCheck random scientific test-framework
@@ -119005,7 +122026,7 @@ self: {
        pname = "socks";
        version = "0.5.4";
        sha256 = "1nmldlwxqasmg359i2aa3a903gi3lmnlspvf12xk49jrg3mf3dg9";
-       buildDepends = [ base bytestring cereal network ];
+       libraryHaskellDepends = [ base bytestring cereal network ];
        homepage = "http://github.com/vincenthz/hs-socks";
        description = "Socks proxy (version 5) implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -119017,7 +122038,7 @@ self: {
        pname = "sodium";
        version = "0.11.0.3";
        sha256 = "00qs1calial08a185ma5hm17lmmzig0yjf3710d5ikq1bmrgcqga";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Sodium Reactive Programming (FRP) System";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119028,7 +122049,7 @@ self: {
        pname = "soegtk";
        version = "0.12.1";
        sha256 = "01f49hwxc5h85iwzgnddxlh1lmb3s27zddmghxrlq958gcrr2iar";
-       buildDepends = [ base cairo gtk old-time stm ];
+       libraryHaskellDepends = [ base cairo gtk old-time stm ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "GUI functions as used in the book \"The Haskell School of Expression\"";
@@ -119045,7 +122066,10 @@ self: {
        sha256 = "0gihsk7szq27ihhy9idiaslv164by23c9c70fhzwyqx3wk7z1aip";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base bytestring bzlib containers mtl pretty utf8-string xml
+       ];
+       executableHaskellDepends = [
          array base bytestring bzlib containers mtl pretty utf8-string xml
        ];
        homepage = "http://darcs.k-hornz.de/cgi-bin/darcsweb.cgi?r=sonic-visualiser;a=summary";
@@ -119062,8 +122086,8 @@ self: {
        pname = "sophia";
        version = "0.1.2";
        sha256 = "18svfy0ald8cz03vfv3m43w777rxksmaz0713a1vzcmyfb6h5iwg";
-       buildDepends = [ base bindings-sophia bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bindings-sophia bytestring ];
+       testHaskellDepends = [
          base bindings-sophia bytestring directory tasty tasty-hunit
        ];
        jailbreak = true;
@@ -119079,7 +122103,7 @@ self: {
        pname = "sort-by-pinyin";
        version = "2014.5.19";
        sha256 = "1ksfx5zhagg2y8virg8am1w8ljrzc9ddmf7xgvi5gx88zibi32fd";
-       buildDepends = [
+       libraryHaskellDepends = [
          air air-extra air-th base bytestring containers text
        ];
        homepage = "https://github.com/nfjinjing/sort-by-pinyin";
@@ -119093,7 +122117,7 @@ self: {
        pname = "sorted";
        version = "0.0.1";
        sha256 = "0rzcxhzc4s4sbdnysmjh1i8pd39jyx7a4hbhkarsp2qbx29s4h03";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Efficient, type-safe sorted sequences";
        license = stdenv.lib.licenses.mit;
@@ -119106,7 +122130,7 @@ self: {
        pname = "sorted-list";
        version = "0.1.4.2";
        sha256 = "1prfxpfvsx03lvk5q33azpcif2a3j80v4naw2kn48r1kb84r60m1";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
        description = "Type-enforced sorted lists and related functions";
        license = stdenv.lib.licenses.bsd3;
@@ -119118,7 +122142,7 @@ self: {
        pname = "sorting";
        version = "1.0.0.1";
        sha256 = "1i2vbmq7p7rja9rnhalyrspc2p5nc8yg6mfj9ia89j55vkc6225n";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/joneshf/sorting";
        description = "Utils for sorting";
        license = stdenv.lib.licenses.bsd3;
@@ -119132,7 +122156,7 @@ self: {
        sha256 = "04bripdlc90rlkv5q6p44j10n7c1zdwv0ibiq5p365xijgribfaq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring ];
+       executableHaskellDepends = [ base bytestring ];
        jailbreak = true;
        description = "Sort lines per file size";
        license = stdenv.lib.licenses.bsd3;
@@ -119150,7 +122174,7 @@ self: {
        sha256 = "11zwhq5r21phgadfvxxmvz7gcz3vhyrqw2rmwnkxz0n65p5az15m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base carray directory fft filepath numeric-prelude
          optparse-applicative sample-frame soxlib storablevector
          storablevector-carray synthesizer-core temporary transformers
@@ -119170,7 +122194,7 @@ self: {
        sha256 = "1mqa70zbhpw860hclns4y8pri6d9swahzbhac7jhzrwq4vyia9xj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers parseargs WAVE ];
+       executableHaskellDepends = [ base containers parseargs WAVE ];
        homepage = "http://github.com/BartMassey/sounddelay";
        description = "Audio delay line";
        license = stdenv.lib.licenses.bsd3;
@@ -119188,7 +122212,7 @@ self: {
        sha256 = "1934awipc837mdhkfa3ghmljxk0vb16wd4f31qdl4q9nxgwfv6c8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers curl data-default directory filepath
          hack hack-contrib hack-handler-happstack haskell98 HDBC
          HDBC-sqlite3 json loli mps mtl process safe StateVar stm
@@ -119207,10 +122231,10 @@ self: {
      mkDerivation {
        pname = "sourcemap";
        version = "0.1.3.0";
-       revision = "1";
        sha256 = "1flfsjs2z2zjzqwvmc2vcibvxh19s89ah4s560xr2s5mhdqwbkk5";
+       revision = "1";
        editedCabalFile = "aa8b674ddb6f30642da0a391ad3481b44241f9f1cb2ee661503e59dac3ca2053";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring process text unordered-containers
          utf8-string
        ];
@@ -119227,10 +122251,10 @@ self: {
        pname = "sousit";
        version = "0.4";
        sha256 = "0vfgl4l3zwfsb2p5fds47bikyvfcsypmbjd1yvkjvi36x2g3pzwr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal mtl resourcet stm transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "https://github.com/msiegenthaler/SouSiT";
@@ -119248,7 +122272,7 @@ self: {
        pname = "sox";
        version = "0.2.2.5";
        sha256 = "19jczxackqhbi85i0i3jl26ng34a9hkfw73jlfscfl8xjqc0j99n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers explicit-exception extensible-exceptions process
          sample-frame transformers unix utility-ht
        ];
@@ -119268,11 +122292,11 @@ self: {
        sha256 = "1d82sqihmx3ymgyahbnjlzmam4pj4rwyp956p74fpl0gsmqphmr8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers explicit-exception extensible-exceptions
          sample-frame storablevector transformers utility-ht
        ];
-       pkgconfigDepends = [ sox ];
+       libraryPkgconfigDepends = [ sox ];
        homepage = "http://www.haskell.org/haskellwiki/Sox";
        description = "Write, read, convert audio signals using libsox";
        license = stdenv.lib.licenses.bsd3;
@@ -119289,7 +122313,7 @@ self: {
        sha256 = "1w8adkrics3jp8lc1gwjiwn4i94yfzxba13wf65qywhmdr9lcy3p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal cmdargs containers pretty QuickCheck
          trifecta uniplate vector
        ];
@@ -119305,8 +122329,8 @@ self: {
        pname = "spacefill";
        version = "0.1";
        sha256 = "0md1ygps2y2ri49g012xj5vv9iglixw06sicl685k60h4sskiqsk";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/knz/spacefill";
        description = "Generators for space-filling curves";
        license = stdenv.lib.licenses.publicDomain;
@@ -119318,7 +122342,7 @@ self: {
        pname = "spacepart";
        version = "0.1.0.0";
        sha256 = "118wch92ix54jp1hi4qw9mk46571lnak4df8ji83bs2vz3vax6jp";
-       buildDepends = [ base vector-space ];
+       libraryHaskellDepends = [ base vector-space ];
        jailbreak = true;
        homepage = "http://code.haskell.org/data-spacepart";
        description = "Space partition data structures. Currently only a QuadTree.";
@@ -119333,8 +122357,8 @@ self: {
        pname = "spaceprobe";
        version = "0.3.0";
        sha256 = "09vpnq5mfdzr132cqm5i4xkxmpg2035pbs64a56lgq0asdzlhfmy";
-       buildDepends = [ base clock containers erf mtl ];
-       testDepends = [
+       libraryHaskellDepends = [ base clock containers erf mtl ];
+       testHaskellDepends = [
          base clock containers erf mtl QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -119353,13 +122377,14 @@ self: {
        sha256 = "0qi1pm46fyrn4vv1b5kcwhd8im59nz5qil6z33r8wq16vv151qb4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers gloss lens linear MonadRandom mtl netwire
        ];
        jailbreak = true;
        homepage = "https://github.com/vtan/spanout";
        description = "A breakout clone written in netwire and gloss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparse" = callPackage
@@ -119373,11 +122398,11 @@ self: {
        pname = "sparse";
        version = "0.9.2";
        sha256 = "0ckjmpnav3rd40ylksrwc0awy4pigv6ngm15z1k6sicw73iyl3pd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base contravariant deepseq hybrid-vectors lens primitive
          transformers vector vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers deepseq directory doctest filepath hlint
          hybrid-vectors lens linear mtl QuickCheck semigroups simple-reflect
          test-framework test-framework-quickcheck2 test-framework-th
@@ -119398,8 +122423,8 @@ self: {
        pname = "sparse-lin-alg";
        version = "0.4.3";
        sha256 = "1255q13mb6196i3hv1i41agifg1x1840z535mx48jjkln297gmc9";
-       buildDepends = [ base containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -119414,7 +122439,7 @@ self: {
        pname = "sparsebit";
        version = "0.5";
        sha256 = "1a4gsnmr1y8b05iws2vrmjqbs5y9svfsz0jb3k19dddn1aszzm07";
-       buildDepends = [ base haskell98 ];
+       libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://kyagrd.dyndns.org/wiki/SparseBitmapsForPatternMatchCoverage";
        description = "Sparse bitmaps for pattern match coverage";
        license = stdenv.lib.licenses.bsd3;
@@ -119427,7 +122452,7 @@ self: {
        pname = "sparsecheck";
        version = "0.1.0.3";
        sha256 = "19h9vy7arhi35rqafbq3nf9a50vnlw5mbfwvl6sp1j61w0yxai95";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://www.cs.york.ac.uk/~mfn/sparsecheck/";
        description = "A Logic Programming Library for Test-Data Generation";
        license = stdenv.lib.licenses.bsd3;
@@ -119442,7 +122467,7 @@ self: {
        pname = "sparser";
        version = "0.6.1";
        sha256 = "1mhnjlsqmvvwnh35dzrms9vsdvr563aq49qhwg35pvscsia2fpr2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default monadplus nats pointed semigroups
        ];
        description = "Lightweight parsing library based on partial functions";
@@ -119455,7 +122480,7 @@ self: {
        pname = "spata";
        version = "2010.10.10";
        sha256 = "1cr0d82l2b96jvszca4yavdgwq450yzigcyrrlddrf9m9908kkzy";
-       buildDepends = [ base dlist mps mtl ];
+       libraryHaskellDepends = [ base dlist mps mtl ];
        homepage = "http://github.com/nfjinjing/spata";
        description = "brainless form validation";
        license = stdenv.lib.licenses.bsd3;
@@ -119470,8 +122495,10 @@ self: {
        pname = "spatial-math";
        version = "0.2.4.0";
        sha256 = "0aysc8r9ry7ii76d6522ja4pjwrfl3m212mbrimbdrh20ykirjvv";
-       buildDepends = [ base binary cereal ghc-prim lens linear ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [
+         base binary cereal ghc-prim lens linear
+       ];
+       testHaskellDepends = [ base doctest ];
        description = "3d math including quaternions/euler angles/dcms and utility functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119482,7 +122509,7 @@ self: {
        pname = "spawn";
        version = "0.3";
        sha256 = "0xkkl0w30rqif2jwdzjv239raly4yaf0116vkqcwh1i41jqn7ij8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Tiny library for concurrent computations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119493,8 +122520,8 @@ self: {
        pname = "spdx";
        version = "0.2.0.0";
        sha256 = "0hxzkmyi90cbr7w8mjlp2azbkyp8gvjpv28c57lpvxw2xvyavgjq";
-       buildDepends = [ base transformers ];
-       testDepends = [ base tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/phadej/spdx";
        description = "SPDX license expression language";
        license = stdenv.lib.licenses.bsd3;
@@ -119506,8 +122533,8 @@ self: {
        pname = "spe";
        version = "0.6.3";
        sha256 = "02cq8f9yz5z3rwkcj4nj8dgzwnn2w3b1jpndmmcqwsjymmivy8fr";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/akc/spe";
        description = "Combinatorial species lite";
        license = stdenv.lib.licenses.bsd3;
@@ -119519,7 +122546,7 @@ self: {
        pname = "special-functors";
        version = "1.0.0.1";
        sha256 = "0c68af104qxn9lhzshcy9s466q10n3ic7q4navqi53mmmmznivrd";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
@@ -119535,7 +122562,7 @@ self: {
        pname = "special-keys";
        version = "0.1.0.3";
        sha256 = "0r66rzyh9m9wsy8mhyq09ar0zbalfyr627z9xrxny8242nbsygpy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-markup bytestring cereal deepseq hashable
          mwc-random path-pieces primitive safecopy text uuid
        ];
@@ -119554,12 +122581,12 @@ self: {
        pname = "specialize-th";
        version = "0.0.0.8";
        sha256 = "1b9bs08zja8id739zf0q47y91aq10gjr1ikbf7rvzav9i3w6djnc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base composition derive MissingH mtl newtype newtype-th
          template-haskell th-expand-syns tuple type-sub-th uniplate
          universe-th
        ];
-       testDepends = [
+       testHaskellDepends = [
          base checkers composition DebugTraceHelpers derive HUnit MissingH
          mtl newtype newtype-th QuickCheck template-haskell test-framework
          test-framework-hunit test-framework-quickcheck2 th-expand-syns
@@ -119579,7 +122606,7 @@ self: {
        pname = "species";
        version = "0.3.4.2";
        sha256 = "07xixq45wbfqmdiykra2fpsfjv1n5s1zn0jvqrhja5d2i92865ly";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers multiset-comb np-extras numeric-prelude
          template-haskell
        ];
@@ -119593,7 +122620,7 @@ self: {
        pname = "speculation";
        version = "1.5.0.2";
        sha256 = "11d4v3x9phayx29lxl4na0b940ax27rjd867f7l9jb284p1rvhp5";
-       buildDepends = [ base ghc-prim stm transformers ];
+       libraryHaskellDepends = [ base ghc-prim stm transformers ];
        homepage = "http://github.com/ekmett/speculation";
        description = "A framework for safe, programmable, speculative parallelism";
        license = stdenv.lib.licenses.bsd3;
@@ -119605,7 +122632,7 @@ self: {
        pname = "speculation-transformers";
        version = "0.1.2";
        sha256 = "0050iy5q9m1ylkhbbnpff7yl99917pa46pgvj76isij4lvdl4f5a";
-       buildDepends = [ speculation ];
+       libraryHaskellDepends = [ speculation ];
        homepage = "http://github.com/ekmett/speculation/";
        description = "Merged into 'speculation'. Use that instead.";
        license = stdenv.lib.licenses.bsd3;
@@ -119622,7 +122649,10 @@ self: {
        sha256 = "0n0b2lbvj3pjg841pdw7pb09cpkz2d186dd4pmabjnm6r6wabm2n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base edit-distance phonetic-code sqlite
+       ];
+       executableHaskellDepends = [
          base edit-distance parseargs phonetic-code sqlite
        ];
        homepage = "https://github.com/gregwebs/haskell-spell-suggest";
@@ -119638,7 +122668,7 @@ self: {
        pname = "sphero";
        version = "0.1.0.0";
        sha256 = "1b5i6zpp3xz8jcvs44g97iyam5vcig3fpy0hcsldg51cm762sv48";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers mtl simple-bluetooth
        ];
        jailbreak = true;
@@ -119655,7 +122685,7 @@ self: {
        pname = "sphinx";
        version = "0.6.0.1";
        sha256 = "1pcm4y9k5lc00805ddv519cx4j3qld2v1dnbckg38n9dyp96wj98";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 network text text-icu
          xml
        ];
@@ -119672,7 +122702,7 @@ self: {
        sha256 = "08fqfmd6462skjywv2j4ilnmpbzr28d6vwmb187w3sv0byvvjzw3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base sphinx ];
+       executableHaskellDepends = [ base sphinx ];
        description = "Sphinx CLI and demo of Haskell Sphinx library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119686,7 +122716,7 @@ self: {
        pname = "spice";
        version = "0.5.0.0";
        sha256 = "1xs09ipg9l38nq3kxpdyv6643ywivhw87w6il0q9bzhng4rpfj6g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default elerea GLFW JuicyPixels
          JuicyPixels-repa OpenGL
        ];
@@ -119708,11 +122738,11 @@ self: {
        sha256 = "11xr80fmbd6ps79fyzb40ha1gw4crxr8gff2nk39spj0sj64jqdn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath glib global-variables gtk mtl
          process random rosezipper stm webkit
        ];
-       pkgconfigDepends = [ libsoup ];
+       executablePkgconfigDepends = [ libsoup ];
        jailbreak = true;
        homepage = "http://github.com/Tener/spike";
        description = "Experimental web browser";
@@ -119726,7 +122756,7 @@ self: {
        pname = "spine";
        version = "0.1";
        sha256 = "1sk2vkslcbmr4z87xc7q38ywbj118bcgqrkz9fqsp7jffxvy4bgv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/spl/spine";
        description = "Simple implementation of the generic spine view";
        license = stdenv.lib.licenses.bsd3;
@@ -119738,7 +122768,7 @@ self: {
        pname = "spir-v";
        version = "0.0.0.1";
        sha256 = "1aazv418dd4kgpm8kq7n1cfm0gwcr0amsfdks0n1d9mn1rvz7b9p";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/expipiplus1/spir-v";
        description = "Some utilities for reading and writing SPIR-V files";
@@ -119751,7 +122781,7 @@ self: {
        pname = "splay";
        version = "0.0.6";
        sha256 = "1mq5n62lg2jbhzbl1py7yhnhdyxa0gn2xmihb9cm5r7p75p5wacl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Generic splay-based sequence representation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119764,8 +122794,8 @@ self: {
        pname = "splaytree";
        version = "0.1.5";
        sha256 = "0jilqkgp1mk6sllxhigp1sidnp7amgsfdmxf23r0l69hp0w4dcm7";
-       buildDepends = [ base deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
@@ -119781,7 +122811,7 @@ self: {
        pname = "splice";
        version = "0.6.1.1";
        sha256 = "0lsfkm4vfipzbnqpf3yli6fwrv5a5mwbs149dfzhs7spa9kbxyl1";
-       buildDepends = [ base network ];
+       libraryHaskellDepends = [ base network ];
        homepage = "http://corsis.github.com/splice/";
        description = "Cross-platform Socket to Socket Data Splicing";
        license = stdenv.lib.licenses.bsd3;
@@ -119798,11 +122828,11 @@ self: {
        sha256 = "112agbhn11wpy4dn0g3j9mrqcja5hhql55swmwh3lbm26hcvwjpq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs filepath MissingH repa repa-algorithms repa-io tasty
          tasty-hunit tasty-quickcheck vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cmdargs doctest filepath MissingH repa repa-algorithms repa-io
          tasty tasty-hunit tasty-quickcheck vector
        ];
@@ -119820,8 +122850,10 @@ self: {
        pname = "splines";
        version = "0.5.0.1";
        sha256 = "1bq5m8izvkrw21v9anp381rrq41svsmkxa0fk86ncm0lkaj09l5b";
-       buildDepends = [ base containers polynomial vector vector-space ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers polynomial vector vector-space
+       ];
+       testHaskellDepends = [
          base containers polynomial QuickCheck test-framework
          test-framework-quickcheck2 vector vector-space
        ];
@@ -119836,7 +122868,7 @@ self: {
        pname = "split";
        version = "0.1.4.3";
        sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~byorgey/code/split";
        description = "Combinator library for splitting lists";
@@ -119848,11 +122880,11 @@ self: {
      mkDerivation {
        pname = "split";
        version = "0.2.2";
-       revision = "1";
        sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr";
+       revision = "1";
        editedCabalFile = "9098e40414e8491b0a400f5874408e577a444c4eadf1e03fb4ea6dfcc32e30c4";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
        description = "Combinator library for splitting lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119863,7 +122895,7 @@ self: {
        pname = "split-channel";
        version = "0.2.0.1";
        sha256 = "0w2sgj1f5ydfvhm80d3pbka9988jwl80n14bp5nisawpd2glxvak";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Control.Concurrent.Chan split into sending and receiving halves.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -119878,7 +122910,7 @@ self: {
        sha256 = "0d53npfi3mba83vpjkq59ga51nxqvkvv7gr0mj1jb8kj8i4jjw7v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base numeric-prelude soxlib storablevector synthesizer-core
          transformers utility-ht
        ];
@@ -119894,7 +122926,7 @@ self: {
        pname = "split-tchan";
        version = "0.1.0.0";
        sha256 = "0qwcbvnm2vlr4bmn8r1q3ycamvgs0nfap4dkyzgp54f9rrl73x2p";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "STM's TChan split into sending and receiving halves";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119907,12 +122939,13 @@ self: {
        sha256 = "1nibmm0ab7a2j9rdmnphzz2svc3xfq268jbn23a403465s0v6sq6";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath parsec range ];
+       executableHaskellDepends = [
+         base directory filepath parsec range
+       ];
        jailbreak = true;
        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
@@ -119926,7 +122959,7 @@ self: {
        sha256 = "0xk5p2ikrzrmhvl69cl36sskcqgfnhxbbdlyp7bzl5pny0l0h9in";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring bytestring-lexing cairo colour containers HUnit mtl
          strptime template-haskell time vcs-revision
        ];
@@ -119942,7 +122975,7 @@ self: {
        pname = "spool";
        version = "0.1";
        sha256 = "1svkz3cxkyi6f3akakjfk1cvij85xy69v52d88gh97xgiawp5346";
-       buildDepends = [ base bytestring vector ];
+       libraryHaskellDepends = [ base bytestring vector ];
        description = "Convert between ByteString and Vector.Storable without copying";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119952,10 +122985,10 @@ self: {
      mkDerivation {
        pname = "spoon";
        version = "0.3.1";
-       revision = "1";
        sha256 = "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr";
+       revision = "1";
        editedCabalFile = "e46c5e919cc9d0c7b0f671cddb631ef0979622a1e2250c59c7e491a799944527";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        description = "Catch errors thrown from pure computations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119970,7 +123003,7 @@ self: {
        sha256 = "0xkarfm0c0931dz6yjs7pb5s2zizz1psnx9gfri5jq16skxk2nhd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory extensible-exceptions filepath parsec
        ];
        homepage = "http://github.com/elginer/SpoonUtilities";
@@ -119987,7 +123020,7 @@ self: {
        pname = "spoty";
        version = "0.1.0.2";
        sha256 = "0p1mn8yixlyj2al98mxzs10m0klqqmmdfjcwc9xax97xp4ixjcm3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring lens lens-aeson pipes text
          unordered-containers wreq
        ];
@@ -120007,7 +123040,9 @@ self: {
        sha256 = "1q6cdgn1bf6dz6brd237ypw3cn0arbf9sm8ghzfngz20k0rbgcj1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base explicit-exception transformers utility-ht ];
+       libraryHaskellDepends = [
+         base explicit-exception transformers utility-ht
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Spreadsheet";
        description = "Read and write spreadsheets from and to CSV files in a lazy way";
        license = stdenv.lib.licenses.bsd3;
@@ -120019,7 +123054,7 @@ self: {
        pname = "spritz";
        version = "0.1.0.0";
        sha256 = "1syv2l0z7c2s6bbi5103i4var40j8pavahiic813v8m9s6waa4fk";
-       buildDepends = [ base lens mtl vector ];
+       libraryHaskellDepends = [ base lens mtl vector ];
        homepage = "https://github.com/relrod/spritz";
        description = "An implementation of the Spritz RC4-like stream cipher in Haskell";
        license = stdenv.lib.licenses.bsd2;
@@ -120033,8 +123068,8 @@ self: {
        pname = "spsa";
        version = "0.2.0.0";
        sha256 = "0jj08bkvmg8cj0lp7j8sd2ksanyrr5i2xxcz4kfwkrlyf8zhqxrh";
-       buildDepends = [ base hmatrix mtl random ];
-       testDepends = [
+       libraryHaskellDepends = [ base hmatrix mtl random ];
+       testHaskellDepends = [
          base hmatrix HUnit QuickCheck random test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -120055,11 +123090,11 @@ self: {
        sha256 = "1b3nhx009mzwl7n9d1bka4i9mwdh1gq08bsfmcnw9s7527nhn0ph";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs directory filemanip filepath fsnotify json process
          system-filepath time unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base cmdargs directory filemanip filepath fsnotify HUnit json
          process QuickCheck system-filepath test-framework
          test-framework-hunit test-framework-quickcheck2 time unix
@@ -120067,6 +123102,7 @@ self: {
        homepage = "https://bitbucket.org/ssaasen/spy";
        description = "A compact file system watcher for Mac OS X, Linux and Windows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-simple" = callPackage
@@ -120077,7 +123113,7 @@ self: {
        pname = "sql-simple";
        version = "0.3.1";
        sha256 = "1vhg8ijpa64qalgza5sr3j8y1ihk6ys5lyf34vwcmjv8nlpyhpwh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers exceptions monad-control text transformers
          transformers-base
        ];
@@ -120096,7 +123132,7 @@ self: {
        pname = "sql-simple-mysql";
        version = "0.3.0";
        sha256 = "1i9xgzl3pjxii4mgx8az5gmygxq2vn1km7kmndwy07qkh26ynd7p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class mysql mysql-simple sql-simple text
        ];
        jailbreak = true;
@@ -120114,7 +123150,7 @@ self: {
        pname = "sql-simple-pool";
        version = "0.3.0";
        sha256 = "14pradqy01vsd2cngvcbwvrwq5r3c5a00awi6j5vmkb51dycizh9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class monad-control resource-pool sql-simple text
          time
        ];
@@ -120133,7 +123169,7 @@ self: {
        pname = "sql-simple-postgresql";
        version = "0.3.0";
        sha256 = "0dk2829zkcwxyqw0p2nsrm9gw527cmggdslhflrylg8xr1ag6zs1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class postgresql-simple sql-simple text
        ];
        jailbreak = true;
@@ -120149,7 +123185,7 @@ self: {
        pname = "sql-simple-sqlite";
        version = "0.3.0";
        sha256 = "07ji17b4q9b8w9q9r8digb218qkjcrxfc24113p0f3pmgbwci3f1";
-       buildDepends = [ base sql-simple sqlite-simple ];
+       libraryHaskellDepends = [ base sql-simple sqlite-simple ];
        jailbreak = true;
        homepage = "https://github.com/philopon/sql-simple";
        description = "sqlite backend for sql-simple";
@@ -120163,12 +123199,11 @@ self: {
        pname = "sql-words";
        version = "0.1.3.1";
        sha256 = "17dma51naynrxhvljwp7s3sadnmfqgallxsq7l763z6d0a25zkn9";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck quickcheck-simple ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Simple idea SQL keywords data constructor into OverloadedString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlite" = callPackage
@@ -120179,10 +123214,10 @@ self: {
        pname = "sqlite";
        version = "0.5.2.2";
        sha256 = "1hlyv2w4q2dlcsz18fqbmqf7nwsbzyh184ynzfnz5svvc8j9hbrp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory pretty time utf8-string
        ];
-       extraLibraries = [ sqlite ];
+       librarySystemDepends = [ sqlite ];
        description = "Haskell binding to sqlite3";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) sqlite;};
@@ -120196,11 +123231,11 @@ self: {
        pname = "sqlite-simple";
        version = "0.4.9.0";
        sha256 = "18v03yqq9jxyvxq93rh20sxak4ffsshhpq9v9lrz1lk9vnhy9pw1";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          direct-sqlite text time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base16-bytestring bytestring direct-sqlite HUnit text time
        ];
        homepage = "http://github.com/nurpax/sqlite-simple";
@@ -120216,7 +123251,7 @@ self: {
        pname = "sqlite-simple-typed";
        version = "0.1.0.0";
        sha256 = "00flij4wv8ga0bpnnai6gwwga1fkra9kr3y9yw30j7czwl5r2h0r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta sqlite sqlite-simple template-haskell
          typedquery utf8-string
        ];
@@ -120233,7 +123268,7 @@ self: {
        pname = "sqlvalue-list";
        version = "0.2";
        sha256 = "1r9y3p355rl57pnm84flx734zzjxnnc53fkcfdkykxi5wi5j05v0";
-       buildDepends = [ base convertible HDBC template-haskell ];
+       libraryHaskellDepends = [ base convertible HDBC template-haskell ];
        description = "Class and instances for conversion to list of SqlValue";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120248,7 +123283,7 @@ self: {
        sha256 = "18nia9c5zvcwd3sbj1h53kfcfa2ihfmff74ab2lfi97dgrq5p1n4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal directory factory filepath mtl QuickCheck random
          toolshed unix
        ];
@@ -120267,7 +123302,7 @@ self: {
        pname = "sr-extra";
        version = "1.46.3.1";
        sha256 = "0ssrv6h50kycxzb84s5j61mg78xyb4hyda2zxshnlqz0gbq134sr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bzlib containers directory filepath HUnit mtl
          network-uri old-locale old-time pretty process pureMD5 QuickCheck
          random regex-compat time unix Unixutils zlib
@@ -120287,7 +123322,7 @@ self: {
        sha256 = "05ydsh4ippapxcx7j3fq8s64qiskcrmndgvilxkdp4qhxyi80gj9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory hslogger MissingH network parsec process
          regex-compat unix
        ];
@@ -120302,7 +123337,7 @@ self: {
        pname = "srcloc";
        version = "0.5.1.0";
        sha256 = "1zssd6jxdhzl5wcygbmzq1s82i7m7rav6nm1m6kl5b68g77gc7g6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Data types for managing source code locations";
        license = stdenv.lib.licenses.bsd3;
@@ -120314,7 +123349,7 @@ self: {
        pname = "srec";
        version = "0.1.0";
        sha256 = "028sb4znvdqsygipcsf44j0xazk03pdfkirzrczmxcd11srh3h1k";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://tomahawkins.org";
        description = "Parsing and processing s-records";
        license = stdenv.lib.licenses.bsd3;
@@ -120329,7 +123364,7 @@ self: {
        pname = "sscgi";
        version = "0.3.0";
        sha256 = "0pkhk6xhh1404yncyl62mjyp7mc2i06ihy243r0mq7qyy7ak417r";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive containers Glob
          MonadCatchIO-mtl mtl transformers utf8-string
        ];
@@ -120352,13 +123387,13 @@ self: {
        pname = "ssh";
        version = "0.3.1";
        sha256 = "1v4xrnc7h5r0nlcv3m129phf6qpp48fvkgv9yxf0fy1i3lp52krj";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types base base64-string binary bytestring
          cereal containers crypto-api crypto-pubkey-types
          cryptohash-cryptoapi HsOpenSSL integer-gmp network process random
          RSA SHA SimpleAES split transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers directory filepath HUnit libssh2
          pseudomacros QuickCheck tasty tasty-hunit tasty-quickcheck
          template-haskell th-lift-instances
@@ -120380,10 +123415,10 @@ self: {
        sha256 = "0q34zx8cn0gs91c4x4bicmygfaary5kk42ib62jk0hlrh3rzdi7c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers keyword-args nagios-check parsec
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec keyword-args nagios-check parsec
        ];
        jailbreak = true;
@@ -120401,7 +123436,7 @@ self: {
        sha256 = "0794vsv043ppydzyjxnh06m4l3gbnga7x8nwsamh8skrzjfwn6jq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers curl directory hdaemonize hslogger mtl process
          regex-compat stm unix
        ];
@@ -120422,7 +123457,13 @@ self: {
        sha256 = "1nr30nrldjd3q1iw3l967x3v1rvl9afz1p87hhhkvpy60gri8m7c";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attempt attoparsec aws base base64-bytestring blaze-builder
+         bytestring case-insensitive cereal conduit containers cryptohash
+         data-default http-conduit http-types mtl network-conduit text wai
+         wai-extra warp
+       ];
+       executableHaskellDepends = [
          attempt attoparsec aws base base64-bytestring blaze-builder
          bytestring case-insensitive cereal conduit containers cryptohash
          data-default http-conduit http-types mtl network-conduit text wai
@@ -120445,10 +123486,10 @@ self: {
        sha256 = "1siyjj75k1nsncpqwz53algbnvgbmr4syw45rfj1cpq4qbfwlcgm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base binary bytestring cmdargs containers deepseq directory
-         iteratee
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory iteratee
        ];
+       executableHaskellDepends = [ cmdargs ];
        description = "SSTables in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120462,7 +123503,8 @@ self: {
        sha256 = "1z01611d380rgn64b0sbwxfbz7m8lgwhkc3lljpih6nsdn9hwrq5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
        homepage = "https://github.com/BartMassey/ssv";
        description = "Comma-separated-value (CSV) read, show and write routines";
        license = stdenv.lib.licenses.mit;
@@ -120474,7 +123516,7 @@ self: {
        pname = "stable-heap";
        version = "0.1.0.0";
        sha256 = "14wx42lmk2vd6v356q5cbd78y9xdnmkwcn6ddpnkyzq331hk23s1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://hub.darcs.net/jmcarthur/stable-heap";
        description = "Purely functional stable heaps (fair priority queues)";
        license = stdenv.lib.licenses.mit;
@@ -120486,7 +123528,7 @@ self: {
        pname = "stable-maps";
        version = "0.0.5";
        sha256 = "1sjidykbj5f692di93nml0frazvyw9kxyhjwbyyvrb9gwgc2ms3w";
-       buildDepends = [ base containers ghc-prim ];
+       libraryHaskellDepends = [ base containers ghc-prim ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/stable-maps";
        description = "Heterogeneous maps keyed by StableNames";
@@ -120499,7 +123541,7 @@ self: {
        pname = "stable-memo";
        version = "0.3.1";
        sha256 = "1rv578311cvn7ym08vxxi18dhic50w7ms6cjn77vh032b8fxr3gx";
-       buildDepends = [ base ghc-prim hashtables ];
+       libraryHaskellDepends = [ base ghc-prim hashtables ];
        description = "Memoization based on argument identity";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -120515,11 +123557,12 @@ self: {
        sha256 = "0mcb983sdwfsf39gd8zsls7pgndqrnnzvxsz8kn9c5nqjxwdll4p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-builder bytestring cereal containers mtl objectid
          text
        ];
-       testDepends = [
+       executableHaskellDepends = [ base containers mtl objectid text ];
+       testHaskellDepends = [
          base bytestring bytestring-arbitrary cereal containers mtl objectid
          QuickCheck tasty tasty-quickcheck text
        ];
@@ -120548,26 +123591,31 @@ self: {
      mkDerivation {
        pname = "stack";
        version = "9.9.9";
-       revision = "4";
        sha256 = "1kpsza23b22mg970c2qs943khzad38imzsa1xzki2a3xvfiadana";
+       revision = "4";
        editedCabalFile = "5ff7356010e14ec43684d11fcec6e34f47f794cc48a258919568cc27c72ffd34";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async attoparsec base base16-bytestring base64-bytestring
-         bifunctors binary blaze-builder bytestring Cabal conduit
-         conduit-combinators conduit-extra containers cryptohash
-         cryptohash-conduit deepseq directory either enclosed-exceptions
-         exceptions fast-logger file-embed filepath hashable http-client
-         http-client-tls http-conduit http-types lifted-base monad-control
-         monad-logger monad-loops mtl old-locale optparse-applicative
-         optparse-simple path persistent persistent-sqlite
-         persistent-template pretty process resourcet safe split stm
+         bifunctors binary bytestring Cabal conduit conduit-combinators
+         conduit-extra containers cryptohash cryptohash-conduit deepseq
+         directory enclosed-exceptions exceptions fast-logger file-embed
+         filepath hashable http-client http-client-tls http-conduit
+         http-types lifted-base monad-control monad-logger monad-loops mtl
+         old-locale optparse-applicative path persistent persistent-sqlite
+         persistent-template pretty process resourcet safe stm
          streaming-commons tar template-haskell temporary text time
          transformers transformers-base unix unordered-containers vector
          vector-binary-instances void word8 yaml zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base blaze-builder bytestring conduit containers directory either
+         exceptions filepath hashable http-client http-conduit monad-logger
+         mtl old-locale optparse-applicative optparse-simple path process
+         resourcet split text transformers unordered-containers
+       ];
+       testHaskellDepends = [
          async base bytestring Cabal conduit conduit-extra containers
          cryptohash directory exceptions filepath hspec http-conduit
          monad-logger path process resourcet temporary text transformers
@@ -120587,10 +123635,10 @@ self: {
        pname = "stack-prism";
        version = "0.1.4";
        sha256 = "1lw42nkbzsc7mg8fnspjsply67ashrnbkml797fz2nvic84l8820";
-       buildDepends = [
+       libraryHaskellDepends = [
          base profunctors tagged template-haskell transformers
        ];
-       testDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/MedeaMelana/stack-prism";
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
@@ -120606,7 +123654,7 @@ self: {
        pname = "stackage";
        version = "0.7.3.2";
        sha256 = "0npry3yxbfyz97q19b405h40mb4rypgkhlp78hgl7zqbxk28ysza";
-       buildDepends = [
+       libraryHaskellDepends = [
          base stackage-build-plan stackage-cabal stackage-cli
          stackage-install stackage-sandbox stackage-setup stackage-update
          stackage-upload
@@ -120628,10 +123676,13 @@ self: {
        sha256 = "1slqkcmvnrbbg50qdf368q5h7svngw77b984mpg39p44mc7ghwyg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring Cabal containers directory exceptions
-         filepath http-client http-client-tls mtl optparse-applicative
-         stackage-cli stackage-types text time yaml
+         filepath http-client http-client-tls mtl stackage-types text time
+         yaml
+       ];
+       executableHaskellDepends = [
+         aeson base optparse-applicative stackage-cli text
        ];
        homepage = "https://github.com/fpco/stackage-build-plan";
        description = "Calculate and print (in different formats) Stackage build plans";
@@ -120649,7 +123700,8 @@ self: {
        sha256 = "0797izw5451mqr41a22xvv5c6c0936hi44cfmp9rzhj6mh92iwzj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
          base bytestring exceptions http-client http-client-tls http-types
          optparse-applicative parsec process stackage-cli system-fileio text
        ];
@@ -120669,11 +123721,12 @@ self: {
        sha256 = "10asq1zg7b4zqsn51ap03809j0bxrwh1gacc387wdi1p3zakn88n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit directory either exceptions filepath hashable
          optparse-applicative optparse-simple process split text
          transformers unordered-containers
        ];
+       executableHaskellDepends = [ base text ];
        homepage = "https://www.stackage.org/package/stackage-cli";
        description = "A CLI library for stackage commands";
        license = stdenv.lib.licenses.mit;
@@ -120699,20 +123752,23 @@ self: {
        sha256 = "0dlsgm9bbib45591m7kj9vai48r4n0zvkwm4vd4c78rj54qhnq9n";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 async base
          base16-bytestring blaze-html byteable bytestring Cabal
          classy-prelude-conduit conduit conduit-extra containers cryptohash
          cryptohash-conduit data-default-class directory filepath
          html-conduit http-client http-client-tls http-conduit mime-types
-         monad-unlift mono-traversable mtl old-locale optparse-applicative
-         optparse-simple process resourcet semigroups stackage-cli
-         stackage-install stackage-metadata stackage-types stackage-update
-         stm streaming-commons system-fileio system-filepath tar temporary
-         text time transformers unix-compat utf8-string xml-conduit
-         xml-types yaml zlib
+         monad-unlift mono-traversable mtl old-locale process resourcet
+         semigroups stackage-install stackage-metadata stackage-types stm
+         streaming-commons system-fileio system-filepath tar temporary text
+         time transformers unix-compat utf8-string xml-conduit xml-types
+         yaml zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base http-client http-client-tls optparse-applicative
+         optparse-simple stackage-cli stackage-update system-filepath text
+       ];
+       testHaskellDepends = [
          base Cabal classy-prelude-conduit containers hspec http-client
          http-client-tls QuickCheck text yaml
        ];
@@ -120734,11 +123790,12 @@ self: {
        sha256 = "0xdqd1q1xy0qax4c2dn1qa0qphvq01xy3wzdp7rr2xnd23ikmbs6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async base bytestring containers cryptohash directory
          filepath http-client http-client-tls http-types process stm tar
          text
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/fpco/stackage-install";
        description = "Secure download of packages for cabal-install";
        license = stdenv.lib.licenses.mit;
@@ -120756,11 +123813,14 @@ self: {
        sha256 = "08hs6gnya0ci07gsacc01hvjamwh9xnfni9ihg7wf77w4vrncssx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base base16-bytestring bytestring Cabal conduit containers
-         cryptohash directory filepath http-client http-client-tls pretty
-         resourcet stackage-install stackage-update tar text transformers
-         yaml zlib
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal conduit containers directory filepath
+         pretty resourcet tar text transformers zlib
+       ];
+       executableHaskellDepends = [
+         base base16-bytestring bytestring Cabal conduit containers
+         cryptohash directory filepath http-client http-client-tls resourcet
+         stackage-install stackage-update tar text transformers yaml
        ];
        homepage = "https://github.com/commercialhaskell/all-cabal-metadata-tool";
        description = "Grab current metadata for all packages";
@@ -120778,7 +123838,8 @@ self: {
        sha256 = "0d5i2wszn4sv797gzdv84abvdm3nzaa1lgn2gp4ywj1iqbbszbns";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
          attoparsec base bytestring conduit-combinators conduit-extra
          directory filepath optparse-applicative process stackage-cli text
        ];
@@ -120799,7 +123860,8 @@ self: {
        sha256 = "1101sb822v42zjjgabn4s80qyvn6nvzkfagaxpzjm6dp5svl3biv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
          aeson base bytestring classy-prelude-conduit cryptohash
          cryptohash-conduit directory filepath http-client-tls http-conduit
          http-types optparse-applicative process stackage-cli text
@@ -120819,7 +123881,7 @@ self: {
        pname = "stackage-types";
        version = "1.1.0";
        sha256 = "0ynfnkpzvgd54x294w4ga8nyg8lrmcwg3bhlwdlxs2fcffaazi81";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base Cabal containers exceptions hashable safe semigroups
          text time unordered-containers vector
        ];
@@ -120836,7 +123898,8 @@ self: {
        sha256 = "1lw30fvscnb3n29lavw16am41adrvby1v2vbh7yykbr80pkb3hvj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath process ];
+       libraryHaskellDepends = [ base directory filepath process ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/fpco/stackage-update";
        description = "Update your package index incrementally (requires git)";
        license = stdenv.lib.licenses.mit;
@@ -120853,10 +123916,12 @@ self: {
        sha256 = "0fxkscyzpl6ph28100b0l663rjny9vp2jrhcca19dc0jzj0kfdgi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring directory filepath http-client
-         http-client-tls http-types optparse-applicative process
-         stackage-cli temporary text
+         http-client-tls http-types process temporary text
+       ];
+       executableHaskellDepends = [
+         base optparse-applicative stackage-cli
        ];
        homepage = "https://github.com/fpco/stackage-upload";
        description = "A more secure version of cabal upload which uses HTTPS";
@@ -120873,7 +123938,7 @@ self: {
        sha256 = "02j10ws9n7xc2gvmpd146vrg7khawll9y3904h28k5d6ffk6qr14";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Cabal containers directory filepath optparse-applicative
        ];
        homepage = "http://documentup.com/feuerbach/standalone-haddock";
@@ -120887,7 +123952,7 @@ self: {
        pname = "star-to-star";
        version = "1.0";
        sha256 = "1nxkb1rdw6lhka49r6xdjskipyig09jzrvp82hx8a1xnqb9cyrrj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "the * -> * types, operators, and covariant instances";
        license = "unknown";
      }) {};
@@ -120898,7 +123963,7 @@ self: {
        pname = "star-to-star-contra";
        version = "1.0";
        sha256 = "1kmpjm51jzk4pv6qggvwjvfqvqnr5z7znfbhiscvcq89j1842x53";
-       buildDepends = [ base star-to-star ];
+       libraryHaskellDepends = [ base star-to-star ];
        description = "contravariant instances for * -> * types and operators";
        license = "unknown";
      }) {};
@@ -120909,7 +123974,9 @@ self: {
        pname = "starling";
        version = "0.3.0";
        sha256 = "0i0f19k2b5y6vb0jngqwnf035csgiaqjgiw37wvj8vs2lbh907bp";
-       buildDepends = [ base binary bytestring failure transformers ];
+       libraryHaskellDepends = [
+         base binary bytestring failure transformers
+       ];
        jailbreak = true;
        homepage = "http://community.haskell.org/~aslatter/starling";
        description = "A memcached client";
@@ -120926,7 +123993,7 @@ self: {
        sha256 = "0rdkxyhy62h87vdq08znqpjhg4wriwvbmn0pwak9nqsd5xk6slka";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory EdisonCore FTGL haskell98 mtl OpenGL
          random SDL
        ];
@@ -120944,7 +124011,7 @@ self: {
        pname = "stash";
        version = "0.1";
        sha256 = "01h3s19agw2aa6a0hw8f9k2qibmckqllvnx2yy2w2p1xlw8g9jwm";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring directory hashable text vector
        ];
        description = "To be written";
@@ -120957,7 +124024,7 @@ self: {
        pname = "state";
        version = "0.1";
        sha256 = "0j5hbh0rkcwfigvskmgb0hql95qs0cjbys61c6sni2hc719bshx6";
-       buildDepends = [ arrows base mtl ];
+       libraryHaskellDepends = [ arrows base mtl ];
        jailbreak = true;
        description = "Data.State";
        license = "LGPL";
@@ -120969,8 +124036,8 @@ self: {
        pname = "state-plus";
        version = "0.1.1";
        sha256 = "09zc4rymzvpq12mgl59h069m418qr43myhsj8dlf62g477wyx4g1";
-       buildDepends = [ base mtl ];
-       testDepends = [ base checkers mtl QuickCheck ];
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base checkers mtl QuickCheck ];
        jailbreak = true;
        description = "MonadPlus for StateT";
        license = stdenv.lib.licenses.bsd3;
@@ -120982,7 +124049,7 @@ self: {
        pname = "state-record";
        version = "0.0.1";
        sha256 = "1y9ql1dlv2kf564x153gyw5h967pjn5zilfq88px8rqmkydqix7g";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/ktvoelker/state-record";
        description = "Better records for State monad states";
        license = "GPL";
@@ -120995,8 +124062,8 @@ self: {
        pname = "stateWriter";
        version = "0.2.3";
        sha256 = "19rhkl39mlkyrj0i1qsmncnlj5nsvp8vp1vjhl43qmcbxfxflc0l";
-       buildDepends = [ base mtl transformers ];
-       testDepends = [ base free hspec mtl QuickCheck ];
+       libraryHaskellDepends = [ base mtl transformers ];
+       testHaskellDepends = [ base free hspec mtl QuickCheck ];
        description = "A faster variant of the RWS monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121009,7 +124076,7 @@ self: {
        sha256 = "122vv9h3rxn126chm5bj4rkxd7mbzndy73ck5nlmnhhxyks25d26";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base polyparse ];
+       executableHaskellDepends = [ base polyparse ];
        homepage = "http://tomahawkins.org";
        description = "Compiles Rhapsody statecharts to C";
        license = stdenv.lib.licenses.bsd3;
@@ -121021,7 +124088,7 @@ self: {
        pname = "stateful-mtl";
        version = "1.0.7";
        sha256 = "19645rqfqbcvngq8hj7bryl35lgx7p5k55vgsxa1a2hm2kq8vm5h";
-       buildDepends = [ base MaybeT mtl ];
+       libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121033,7 +124100,7 @@ self: {
        pname = "stateref";
        version = "0.3";
        sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx";
-       buildDepends = [ base mtl stm ];
+       libraryHaskellDepends = [ base mtl stm ];
        homepage = "http://code.haskell.org/~mokus/stateref/";
        description = "Abstraction for things that work like IORef";
        license = stdenv.lib.licenses.publicDomain;
@@ -121045,7 +124112,9 @@ self: {
        pname = "statestack";
        version = "0.2.0.4";
        sha256 = "0swj3f2vc56a5y2qxp2pq8nxkwngcw2lm87dmaikymchbqb832hd";
-       buildDepends = [ base mtl transformers transformers-compat ];
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compat
+       ];
        description = "Simple State-like monad transformer with saveable and restorable state";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121056,7 +124125,7 @@ self: {
        pname = "statethread";
        version = "0.1.1";
        sha256 = "05clniwqk4i3zz22jzbjj2x9cgkxb2ks7mccjyp3gyy4zbm2xlmz";
-       buildDepends = [ applicative base transformers ];
+       libraryHaskellDepends = [ applicative base transformers ];
        jailbreak = true;
        description = "The ST monad and STRefs";
        license = stdenv.lib.licenses.bsd3;
@@ -121071,8 +124140,10 @@ self: {
        pname = "statgrab";
        version = "0.1.3";
        sha256 = "1rckyxg1px6v69rbr1ldy107b1q5rrh89dawlrdjzwbnmxjgbvj5";
-       buildDepends = [ async base bytestring time transformers ];
-       extraLibraries = [ statgrab ];
+       libraryHaskellDepends = [
+         async base bytestring time transformers
+       ];
+       librarySystemDepends = [ statgrab ];
        homepage = "http://github.com/brendanhay/statgrab";
        description = "Collect system level metrics and statistics";
        license = "unknown";
@@ -121085,7 +124156,7 @@ self: {
        pname = "static-canvas";
        version = "0.2.0.2";
        sha256 = "1lphx10wljylsbjwlw5p7bsjh5gf2fj1sl09556y814r11a6rjff";
-       buildDepends = [ base double-conversion free mtl text ];
+       libraryHaskellDepends = [ base double-conversion free mtl text ];
        homepage = "https://github.com/jeffreyrosenbluth/static-canvas";
        description = "DSL to generate HTML5 Canvas javascript";
        license = stdenv.lib.licenses.bsd3;
@@ -121097,7 +124168,7 @@ self: {
        pname = "static-hash";
        version = "0.0.1";
        sha256 = "0nkgx4s389027zi23wmbc6wqnmplvjvbrsbyzy7zn41mbwmzqz8l";
-       buildDepends = [ array base containers hashable primes ];
+       libraryHaskellDepends = [ array base containers hashable primes ];
        description = "Immutable hash";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121111,11 +124182,11 @@ self: {
        pname = "static-resources";
        version = "0.1.7";
        sha256 = "0wf9kpn1l2iq00m1ms46vn2lrnyy8ip1z54ya2h4kqarcy5sr8m9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory filepath hslogger MissingH mtl old-time process syb
          time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory hslogger HUnit MissingH mtl old-time syb
          test-framework test-framework-hunit test-framework-quickcheck2 time
        ];
@@ -121129,7 +124200,7 @@ self: {
        pname = "staticanalysis";
        version = "0.0.0.3";
        sha256 = "0b6y8yi0cfisi58pxxx1gnd1vab2i8f5wb3gzv1dfsxx5hl6jlwf";
-       buildDepends = [ base MissingH ];
+       libraryHaskellDepends = [ base MissingH ];
        description = "Reusable static analysis interfaces and modules";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -121144,11 +124215,11 @@ self: {
        pname = "statistics";
        version = "0.13.2.3";
        sha256 = "1gbghzbacfrm7vn24ssx7wz9sycafxk9b306zm6cdlsr954v296n";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary deepseq erf math-functions monad-par mwc-random
          primitive vector vector-algorithms vector-binary-instances
        ];
-       testDepends = [
+       testHaskellDepends = [
          base binary erf HUnit ieee754 math-functions mwc-random primitive
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector vector-algorithms
@@ -121166,7 +124237,7 @@ self: {
        pname = "statistics-dirichlet";
        version = "0.6.3";
        sha256 = "1sx7hxv5gvzr270h4lb76dihcqcqwgdm6mq2394s407iipb2clbw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq hmatrix-special nonlinear-optimization vector
        ];
        description = "Functions for working with Dirichlet densities and mixtures on vectors";
@@ -121180,7 +124251,7 @@ self: {
        pname = "statistics-fusion";
        version = "1.0.1";
        sha256 = "17w7vz0jarbyf9y72bn9yg134q6ja5ymfyl1v9nx94glbhbybrlf";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        homepage = "http://code.haskell.org/~dons/code/statistics-fusion";
        description = "An implementation of high performance, minimal statistics functions";
        license = stdenv.lib.licenses.bsd3;
@@ -121195,7 +124266,7 @@ self: {
        pname = "statistics-hypergeometric-genvar";
        version = "0.1.0.0";
        sha256 = "05j83vaklwi73yr4q4yq5f36wzmbas73lxkj0dkg0w1ss97syv7m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base math-functions mwc-random primitive statistics
        ];
        jailbreak = true;
@@ -121212,7 +124283,7 @@ self: {
        pname = "statistics-linreg";
        version = "0.3";
        sha256 = "02c9xrd3b8iy7bwgsf1r06smi88k3sgpqv2ivr782wl0dcbc4wv2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base MonadRandom random random-shuffle safe statistics vector
        ];
        homepage = "http://github.com/alpmestan/statistics-linreg";
@@ -121228,7 +124299,7 @@ self: {
        sha256 = "08ig4nrlqshxmiar739zfbs95hlrp8l212hszh4zs0w2x4i3s17f";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base statistics text vector ];
+       executableHaskellDepends = [ base statistics text vector ];
        jailbreak = true;
        homepage = "http://github.com/cheecheeo/stats/";
        description = "command line statistics";
@@ -121243,7 +124314,7 @@ self: {
        pname = "statsd";
        version = "0.1.0.1";
        sha256 = "13bcqms31rvzs3lfbmx43wqkmp21jbzj326yn971334cf722f0a1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring monad-control mtl network random
        ];
        jailbreak = true;
@@ -121260,7 +124331,7 @@ self: {
        pname = "statsd-datadog";
        version = "0.2.0.0";
        sha256 = "1c9kgyzfk5xdxsjkjhs6vbiz03mqm41qr0ycyfxc11v0wl78yazk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring monad-control network text transformers-base
        ];
        homepage = "https://bitbucket.org/dpwiz/statsd-datadog";
@@ -121274,7 +124345,7 @@ self: {
        pname = "statvfs";
        version = "0.2";
        sha256 = "16z9fddgvf5sl7zy7p74fng9lkdw5m9i5np3q4s2h8jdi43mwmg1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Get unix filesystem statistics with statfs, statvfs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121285,11 +124356,10 @@ self: {
        pname = "stb-image";
        version = "0.2.1";
        sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52";
-       buildDepends = [ base bitmap bytestring ];
+       libraryHaskellDepends = [ base bitmap bytestring ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A wrapper around Sean Barrett's JPEG/PNG decoder";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stb-truetype" = callPackage
@@ -121298,7 +124368,7 @@ self: {
        pname = "stb-truetype";
        version = "0.1.2";
        sha256 = "1hbbi7hax5fw5zb7ashfs5paixqzqrrr64lwisda80dskdazld4m";
-       buildDepends = [ array base bytestring containers ];
+       libraryHaskellDepends = [ array base bytestring containers ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A wrapper around Sean Barrett's TrueType rasterizer library";
        license = stdenv.lib.licenses.publicDomain;
@@ -121311,7 +124381,7 @@ self: {
        pname = "stdata";
        version = "0.0.4";
        sha256 = "0ijir2knl4vc1cpzzmf32wcjfdc958li1wd7w5vdmgk4bx45kybf";
-       buildDepends = [ base parsec syb template-haskell ];
+       libraryHaskellDepends = [ base parsec syb template-haskell ];
        jailbreak = true;
        description = "Structure Data Library";
        license = stdenv.lib.licenses.bsd3;
@@ -121328,10 +124398,13 @@ self: {
        sha256 = "1blwf18qvsrhkxfakyznr3ljr35dw6d027jybr2hh4a5yfqn6zyd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring containers
          data-binary-ieee754 split text time unix-time zlib
        ];
+       executableHaskellDepends = [
+         aeson base base64-bytestring binary bytestring split text
+       ];
        jailbreak = true;
        homepage = "https://github.com/gitfoxi/Stdf";
        description = "Parse Structured Test Data Format (STDF)";
@@ -121346,7 +124419,7 @@ self: {
        sha256 = "071ial002ip6lsm422wf9xzq7ka70h4va67382smkbgiinbma5g4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory parsec transformers ];
+       executableHaskellDepends = [ base directory parsec transformers ];
        jailbreak = true;
        description = "List and launch steam games from the cli";
        license = stdenv.lib.licenses.mit;
@@ -121362,12 +124435,13 @@ self: {
        sha256 = "1wqhjg6xw2k863fkfhq0i706c399xsv7z7gaf61x7l9wrc91pcbn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base fsnotify process regex-tdfa system-filepath text time unix
        ];
        homepage = "https://github.com/schell/steeloverseer";
        description = "A file watcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stemmer" = callPackage
@@ -121376,7 +124450,7 @@ self: {
        pname = "stemmer";
        version = "0.5.1";
        sha256 = "0jiwwhwyqnbwzfn0vhd6d4f2zq6aazh18fbhm8w7zjc3cz0cr4m0";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.github.com/bgamari/stemmer";
        description = "Haskell bindings to the Snowball stemming library";
        license = stdenv.lib.licenses.bsd3;
@@ -121388,8 +124462,10 @@ self: {
        pname = "step-function";
        version = "0.1.1.0";
        sha256 = "03pdpm1glmaqhqzr2cp08iy84c1vjhq0fq7yavmcrx94hxfw1zfd";
-       buildDepends = [ base ];
-       testDepends = [ base Cabal cabal-test-quickcheck QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base Cabal cabal-test-quickcheck QuickCheck
+       ];
        homepage = "https://github.com/jonpetterbergman/step-function";
        description = "Step functions, staircase functions or piecewise constant functions";
        license = stdenv.lib.licenses.bsd3;
@@ -121402,7 +124478,7 @@ self: {
        pname = "stepwise";
        version = "1.0.2";
        sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121414,7 +124490,7 @@ self: {
        pname = "stickyKeysHotKey";
        version = "0.1.0.1";
        sha256 = "18p0yxfw9wnzk0yxdvlm3g23k8zq5nb707411i92z5m82l6pkpmi";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "get and set STICKYKEYS.SKF_HOTKEYACTIVE";
        license = stdenv.lib.licenses.bsd3;
@@ -121427,8 +124503,8 @@ self: {
        pname = "stitch";
        version = "0.3.2.0";
        sha256 = "1h8n7ry8wmzvz4bjfg6vsd7ssy17y54h2pzgjdlfam8yfcly2bb7";
-       buildDepends = [ base containers text transformers ];
-       testDepends = [ base Cabal hspec text ];
+       libraryHaskellDepends = [ base containers text transformers ];
+       testHaskellDepends = [ base Cabal hspec text ];
        description = "lightweight CSS DSL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121439,7 +124515,7 @@ self: {
        pname = "stm";
        version = "2.4.4";
        sha256 = "0gc8zvdijp3rwmidkpxv76b4i0dc8dw6nbd92rxl4vxl0655iysx";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Software Transactional Memory";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121450,7 +124526,7 @@ self: {
        pname = "stm-channelize";
        version = "0.1.1";
        sha256 = "1aj4zibq54ssbb7smkxjrjl24d9vccgjpl2b9261yqyg692cz9hm";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "Transactional I/O for duplex streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121461,7 +124537,7 @@ self: {
        pname = "stm-chans";
        version = "3.0.0.4";
        sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Additional types of channels for STM";
        license = stdenv.lib.licenses.bsd3;
@@ -121473,8 +124549,8 @@ self: {
        pname = "stm-chunked-queues";
        version = "0.1.0.0";
        sha256 = "0264air2mhwbya2sxskrh4z1bs8il7d9iv4vm6wyz8zxxc95v1nj";
-       buildDepends = [ async base stm ];
-       testDepends = [ async base HUnit stm tasty tasty-hunit ];
+       libraryHaskellDepends = [ async base stm ];
+       testHaskellDepends = [ async base HUnit stm tasty tasty-hunit ];
        homepage = "http://github.com/kholdstare/stm-chunked-queues/";
        description = "Chunked Communication Queues";
        license = stdenv.lib.licenses.bsd3;
@@ -121493,12 +124569,12 @@ self: {
        pname = "stm-conduit";
        version = "2.6.1";
        sha256 = "0cd99aj9azlr6d9bayjyrbigbzll9yfny7qan1wnrh413i1z1x0p";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base cereal cereal-conduit conduit conduit-combinators
          conduit-extra directory ghc-prim lifted-async lifted-base
          monad-control monad-loops resourcet stm stm-chans transformers void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit conduit-combinators directory doctest HUnit QuickCheck
          resourcet stm stm-chans test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
@@ -121517,11 +124593,11 @@ self: {
        pname = "stm-containers";
        version = "0.2.9";
        sha256 = "0p2lyz1s98cxdcqfamqyx7dxxa4fzxr0a93cbm7lnmzfjvk48p52";
-       buildDepends = [
+       libraryHaskellDepends = [
          base-prelude focus hashable list-t loch-th placeholders primitive
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base-prelude focus free hashable HTF list-t loch-th mtl mtl-prelude
          placeholders primitive QuickCheck transformers unordered-containers
        ];
@@ -121537,8 +124613,8 @@ self: {
        pname = "stm-delay";
        version = "0.1.1.1";
        sha256 = "0cla21v89gcvmr1iwzibq13v1yq02xg4h6k9l6kcprj7mhd5hcmi";
-       buildDepends = [ base stm ];
-       testDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [ base stm ];
        homepage = "https://github.com/joeyadams/haskell-stm-delay";
        description = "Updatable one-shot timer polled with STM";
        license = stdenv.lib.licenses.bsd3;
@@ -121553,11 +124629,11 @@ self: {
        pname = "stm-firehose";
        version = "0.2.1";
        sha256 = "0y4q3qj3ih2xcn0mhd4jszb1d5l87abkvlmhdvx9d1407bw9j99r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder conduit http-types network-conduit stm stm-chans
          stm-conduit transformers wai warp
        ];
-       testDepends = [ base hspec HUnit stm ];
+       testHaskellDepends = [ base hspec HUnit stm ];
        jailbreak = true;
        description = "Conduits and STM operations for fire hoses";
        license = stdenv.lib.licenses.bsd3;
@@ -121570,10 +124646,9 @@ self: {
        pname = "stm-io-hooks";
        version = "1.1.0";
        sha256 = "0dg2za2p7h9wb9lbs2yb07pdhq9sn4mdxxfmq179d9kinq94009m";
-       buildDepends = [ array base containers mtl stm ];
+       libraryHaskellDepends = [ array base containers mtl stm ];
        description = "STM with IO hooks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-lifted" = callPackage
@@ -121581,10 +124656,10 @@ self: {
      mkDerivation {
        pname = "stm-lifted";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "1x3yxxyik0vyh3p530msxh2a1aylmh8zab05qpq7nfl5m9v6v090";
+       revision = "1";
        editedCabalFile = "d313721a31d8e7ccc725c3a1542f4ac3f8c84fbcad10094cd1067c133edc6c54";
-       buildDepends = [ base stm transformers ];
+       libraryHaskellDepends = [ base stm transformers ];
        description = "Software Transactional Memory lifted to MonadIO";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121595,7 +124670,7 @@ self: {
        pname = "stm-linkedlist";
        version = "0.1.0.0";
        sha256 = "1x65z38dx0qi55fmbarc1827wpl4j08m23nklq8854y7kqznf9kr";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "Mutable, doubly linked lists for STM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121606,7 +124681,7 @@ self: {
        pname = "stm-orelse-io";
        version = "0.1";
        sha256 = "11v0xc5zlw641mf6r5k8lqhzxc4y9bsx3xivwmbkfniph0x7g5m4";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "http://nonempty.org/software/stm-orelse-io";
        description = "Choose between the return value of an STM operation and an IO action";
        license = stdenv.lib.licenses.bsd3;
@@ -121618,8 +124693,8 @@ self: {
        pname = "stm-promise";
        version = "0.0.3.1";
        sha256 = "07wrbj88gwdbsczjr225g0z1ai1v13mdg71gl9qsmipqs0s0pfwc";
-       buildDepends = [ base mtl process stm unix ];
-       testDepends = [ base QuickCheck stm ];
+       libraryHaskellDepends = [ base mtl process stm unix ];
+       testHaskellDepends = [ base QuickCheck stm ];
        homepage = "http://www.github.com/danr/stm-promise";
        description = "Simple STM Promises for IO computations and external processes";
        license = stdenv.lib.licenses.gpl3;
@@ -121631,7 +124706,7 @@ self: {
        pname = "stm-queue-extras";
        version = "0.2.0.0.1";
        sha256 = "1zb6i8dg11pshvb6rm5sqdsbq547h4ys6wlmh2ywcmks2ss7q100";
-       buildDepends = [ base stm stm-chans ];
+       libraryHaskellDepends = [ base stm stm-chans ];
        description = "Extra queue utilities for STM";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -121642,7 +124717,7 @@ self: {
        pname = "stm-sbchan";
        version = "0.1";
        sha256 = "0fz4vfbyr848b32vbdm3pjj9gwi7wj39l3vsqmdpjnbfwvkw0y0s";
-       buildDepends = [ base stm stm-tlist ];
+       libraryHaskellDepends = [ base stm stm-tlist ];
        homepage = "https://github.com/joeyadams/haskell-stm-sbchan";
        description = "Bounded channel for STM where item sizes can vary";
        license = stdenv.lib.licenses.bsd3;
@@ -121654,7 +124729,7 @@ self: {
        pname = "stm-split";
        version = "0.0.0.1";
        sha256 = "05338nbfhwmyy8njynznmbv0lddqs4kzs5x132992xq346dvvww8";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "TMVars, TVars and TChans with distinguished input and output side";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121665,7 +124740,9 @@ self: {
        pname = "stm-stats";
        version = "0.2.0.0";
        sha256 = "0i8ky2l8lvh7nymxglvbifp0ylbyjw20p75avzb51zpzx6qkjkqa";
-       buildDepends = [ base containers stm template-haskell time ];
+       libraryHaskellDepends = [
+         base containers stm template-haskell time
+       ];
        description = "retry statistics for STM transactions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121676,7 +124753,7 @@ self: {
        pname = "stm-tlist";
        version = "0.1.1";
        sha256 = "0ssr8phmm9m93kcp045jr0rcn1dxzz202cgyw1vzjl2ch55bcsy6";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/joeyadams/haskell-stm-tlist";
        description = "Mutable, singly-linked list in STM";
        license = stdenv.lib.licenses.bsd3;
@@ -121688,7 +124765,7 @@ self: {
        pname = "stmcontrol";
        version = "0.1";
        sha256 = "0m42pgnvzqadqycq0qbml5da0zw7myc24y5vka1qydz7rdfyaa24";
-       buildDepends = [ base haskell98 mtl stm ];
+       libraryHaskellDepends = [ base haskell98 mtl stm ];
        homepage = "http://sulzmann.blogspot.com/2008/12/stm-with-control-communication-for.html";
        description = "Control communication among retrying transactions";
        license = stdenv.lib.licenses.bsd3;
@@ -121703,7 +124780,7 @@ self: {
        pname = "stomp-conduit";
        version = "0.1.0";
        sha256 = "1qzr5fkffs96clxkvm7lf7kfafijv8fsri6k0j85wrarx3qdgapa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit mime mtl resourcet stomp-queue stompl
        ];
        homepage = "http://github.com/toschoo/mom";
@@ -121719,7 +124796,7 @@ self: {
        pname = "stomp-patterns";
        version = "0.1.0";
        sha256 = "0rdk9h7blj7j5kiwy7zq2kb4wxxs19xk3lg73c0srrvbclb0qgbw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mime mtl split stomp-queue stompl time
        ];
        homepage = "http://github.com/toschoo/mom";
@@ -121736,7 +124813,7 @@ self: {
        pname = "stomp-queue";
        version = "0.2.2";
        sha256 = "1kymwwj7yjdsyykqdqcnvgphbb1ypx7hi5a2wvx1wzv53lrspa9c";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring conduit conduit-extra mime mtl
          network-conduit-tls split stompl time utf8-string
        ];
@@ -121753,7 +124830,7 @@ self: {
        pname = "stompl";
        version = "0.3.0";
        sha256 = "1ip50w8f26362h1s3kb0qzv15dq264j0vbmqw5v0s40gbwmpv2aj";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring mime split text utf8-string
        ];
        homepage = "http://github.com/toschoo/mom";
@@ -121767,7 +124844,7 @@ self: {
        pname = "storable";
        version = "0.1";
        sha256 = "10289mf3fskfpg0jwgzyhvg4arb0hcj3r94jngb3hlbidvf8k1jg";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "http://anna.fi.muni.cz/~xjanous3/gitweb/?p=storable.git;a=summary";
        description = "Storable type class for variable-sized data";
        license = stdenv.lib.licenses.bsd3;
@@ -121779,7 +124856,7 @@ self: {
        pname = "storable-complex";
        version = "0.2.2";
        sha256 = "01kwwkpbfjrv26vj83cd92px5qbq1bpgxj0r45534aksqhany1xb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/cartazio/storable-complex";
        description = "Storable instance for Complex";
        license = stdenv.lib.licenses.bsd3;
@@ -121791,7 +124868,7 @@ self: {
        pname = "storable-endian";
        version = "0.2.5";
        sha256 = "04j1nk0wga4dqrqvhm8yd9h9194db1n3yrnhg8s3gsc0jk7yw1p2";
-       buildDepends = [ base byteorder ];
+       libraryHaskellDepends = [ base byteorder ];
        description = "Storable instances with endianness";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121804,7 +124881,7 @@ self: {
        sha256 = "1mv2s4r7dqkl2fy0wjnywyr2zi2g53nkn0z72mgr8drkzdszzxx1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base transformers utility-ht ];
+       libraryHaskellDepends = [ base transformers utility-ht ];
        homepage = "http://code.haskell.org/~thielema/storable-record/";
        description = "Elegant definition of Storable instances for records";
        license = stdenv.lib.licenses.bsd3;
@@ -121816,7 +124893,7 @@ self: {
        pname = "storable-static-array";
        version = "0.6.1.0";
        sha256 = "0akdh6v2cdq38jw8v69bn3m50g6wxanh0plikq4hj5mfrkg6xsxm";
-       buildDepends = [ array base tagged vector ];
+       libraryHaskellDepends = [ array base tagged vector ];
        jailbreak = true;
        description = "Statically-sized array wrappers with Storable instances for FFI marshaling";
        license = stdenv.lib.licenses.bsd3;
@@ -121829,7 +124906,7 @@ self: {
        pname = "storable-tuple";
        version = "0.0.2";
        sha256 = "03qls46rwc3za730r6pv63rrnjq4vkh3h2vjhx9082dqa9q7vqqd";
-       buildDepends = [ base storable-record utility-ht ];
+       libraryHaskellDepends = [ base storable-record utility-ht ];
        homepage = "http://code.haskell.org/~thielema/storable-tuple/";
        description = "Storable instance for pairs and triples";
        license = stdenv.lib.licenses.bsd3;
@@ -121843,10 +124920,12 @@ self: {
        pname = "storablevector";
        version = "0.2.10";
        sha256 = "0195j9b0p5217jdai4lwyhfwihnxgsqxcbzpa375wsa66kxjk7bl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base non-negative QuickCheck syb transformers unsafe utility-ht
        ];
-       testDepends = [ base bytestring QuickCheck random utility-ht ];
+       testHaskellDepends = [
+         base bytestring QuickCheck random utility-ht
+       ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Fast, packed, strict storable arrays with a list interface like ByteString";
@@ -121860,7 +124939,7 @@ self: {
        pname = "storablevector-carray";
        version = "0.0";
        sha256 = "1cqgfddaldxj2yig39fr2smm23nfz52dvh5grf4zr222djm7043i";
-       buildDepends = [ base carray storablevector utility-ht ];
+       libraryHaskellDepends = [ base carray storablevector utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Conversion between storablevector and carray";
        license = stdenv.lib.licenses.bsd3;
@@ -121877,9 +124956,11 @@ self: {
        sha256 = "1qgnakr01f28iarq1qd5x86919fj7zwf19nb80w7757l0dhdjb6m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring old-time storablevector stream-fusion
-         utility-ht
+       libraryHaskellDepends = [
+         base storablevector stream-fusion utility-ht
+       ];
+       executableHaskellDepends = [
+         base binary bytestring old-time stream-fusion
        ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
@@ -121896,7 +124977,7 @@ self: {
        pname = "str";
        version = "0.1.0.0";
        sha256 = "093bgzjj183g48gapmjvbrbp7ns7wfcf94ishgwy84gajpkyb6sr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring bytestring Crypto hashable MissingH text
          utf8-string
        ];
@@ -121917,7 +124998,7 @@ self: {
        sha256 = "02m8znx5spg8mjphbqw4kw5mavjki8hjfqf6x9j9i0xsja88958p";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson async base bytestring bytestring-builder cmdargs connection
          containers curl curl-aeson network stm text time
          unordered-containers vector
@@ -121932,7 +125013,7 @@ self: {
        pname = "stream-fusion";
        version = "0.1.2.5";
        sha256 = "006fz03jdwd9d0kwf8ma3077xxmg6zym94pwbb4sx1xcn7zf4yc6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://hackage.haskell.org/trac/ghc/ticket/915";
        description = "Faster Haskell lists using stream fusion";
        license = stdenv.lib.licenses.bsd3;
@@ -121947,7 +125028,7 @@ self: {
        sha256 = "0311j6a378pm26g9qqfjpnjq7909qj69fhiw253ln603z5q5gkc6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base logict ];
+       libraryHaskellDepends = [ base logict ];
        jailbreak = true;
        homepage = "http://github.com/sebfisch/stream-monad";
        description = "Simple, Fair and Terminating Backtracking Monad";
@@ -121963,7 +125044,7 @@ self: {
        pname = "streamed";
        version = "0.2";
        sha256 = "0dql0vxw28nr60979zhhc9frwqhg6cmj8g03r4m8zlb6anqwv7xa";
-       buildDepends = [
+       libraryHaskellDepends = [
          alsa-core alsa-seq base containers data-accessor
          data-accessor-transformers event-list midi midi-alsa non-negative
          random transformers utility-ht
@@ -121984,11 +125065,11 @@ self: {
        pname = "streaming-commons";
        version = "0.1.12.1";
        sha256 = "1msg18bvz1cxfh745m3jgxf65x7jncqwwpfi538x24qsn788vgfm";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base blaze-builder bytestring directory network process
          random stm text transformers unix zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          array async base blaze-builder bytestring deepseq hspec network
          QuickCheck text unix zlib
        ];
@@ -122005,8 +125086,8 @@ self: {
        pname = "streaming-histogram";
        version = "0.1.0.0";
        sha256 = "1sm05hx5llab6ng6d27rz44kd6njk85axkn3bs3nm03pr85c9xq7";
-       buildDepends = [ base containers criterion ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers criterion ];
+       testHaskellDepends = [
          base containers tasty tasty-hunit tasty-quickcheck
        ];
        license = stdenv.lib.licenses.asl20;
@@ -122018,7 +125099,7 @@ self: {
        pname = "streamproc";
        version = "1.6.2";
        sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/peti/streamproc";
        description = "Stream Processer Arrow";
        license = stdenv.lib.licenses.bsd3;
@@ -122032,13 +125113,12 @@ self: {
        pname = "streams";
        version = "3.2.1";
        sha256 = "1xyrsb55dg7v3pris0hc0yqdlqaymxb6g286wrbc7h2lva5wrva4";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base comonad distributive semigroupoids semigroups
        ];
        homepage = "http://github.com/ekmett/streams/issues";
        description = "Various Haskell 2010 stream comonads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict" = callPackage
@@ -122047,7 +125127,7 @@ self: {
        pname = "strict";
        version = "0.3.2";
        sha256 = "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://www.cse.unsw.edu.au/~rl/code/strict.html";
        description = "Strict data types and String IO";
        license = stdenv.lib.licenses.bsd3;
@@ -122061,7 +125141,7 @@ self: {
        pname = "strict-base-types";
        version = "0.3.0";
        sha256 = "03z38yxig43qq4xw9hinzzfarzy7176s5gfv8rsjnild8sa0bsvb";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors binary deepseq ghc-prim lens QuickCheck
          strict
        ];
@@ -122075,10 +125155,10 @@ self: {
      mkDerivation {
        pname = "strict-concurrency";
        version = "0.2.4.1";
-       revision = "1";
        sha256 = "128sbh5fnv02v2xdjlk7cb525bfckqyj7fyz5399nfycs0nj2f89";
+       revision = "1";
        editedCabalFile = "e9b8d4599f2eae037bb3b6008284513dbb50af7d3ab42e617b76577bdea656a1";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~dons/code/strict-concurrency";
        description = "Strict concurrency abstractions";
@@ -122092,7 +125172,7 @@ self: {
        pname = "strict-ghc-plugin";
        version = "0.1.1";
        sha256 = "0hx1zp99npwdp5w3q93xfidcw59lxskilmbqc80xi97d4w4h8jrb";
-       buildDepends = [ base ghc syb ];
+       libraryHaskellDepends = [ base ghc syb ];
        homepage = "http://thoughtpolice.github.com/strict-ghc-plugin";
        description = "Compiler plugin for making Haskell strict";
        license = stdenv.lib.licenses.bsd3;
@@ -122104,7 +125184,7 @@ self: {
        pname = "strict-identity";
        version = "0.1.0.0";
        sha256 = "1fzcim7baycdb60z5icdw5flj1a3dfn6xscpyif6l94c1538g3i1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/cartazio/strict-identity";
        description = "Strict Identity Monad, handy for writing fast code!";
@@ -122117,7 +125197,7 @@ self: {
        pname = "strict-io";
        version = "0.2.1";
        sha256 = "003pfzjixa04qyx4db0rgk7y72nk2xwlb29aigmdmfn80xbmw9md";
-       buildDepends = [ base deepseq extensible-exceptions ];
+       libraryHaskellDepends = [ base deepseq extensible-exceptions ];
        jailbreak = true;
        description = "A library wrapping standard IO modules to provide strict IO";
        license = stdenv.lib.licenses.bsd3;
@@ -122131,7 +125211,9 @@ self: {
        sha256 = "0z28ifg21xgzh75ird41mp40a4rrc5p0wrnbhrxv92ih6pf5zmah";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath process unix ];
+       executableHaskellDepends = [
+         base directory filepath process unix
+       ];
        description = "Find a local optimum of strictness annotations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122142,7 +125224,7 @@ self: {
        pname = "strictly";
        version = "1.0.0.0";
        sha256 = "1a3azrg9ksb4kmbckjqw3krxj0app6q19ighd6k3z7xpf682qx3c";
-       buildDepends = [ base deepseq ];
+       libraryHaskellDepends = [ base deepseq ];
        jailbreak = true;
        homepage = "https://github.com/DanBurton/strictly#readme";
        description = "Combinators for strictifying functions";
@@ -122166,7 +125248,7 @@ self: {
        pname = "string-class";
        version = "0.1.6.4";
        sha256 = "0hh2xcbf7sjsv15jgldpy5njjvkkkxwlg2g9961z9fn94zyi7854";
-       buildDepends = [ base bytestring tagged text ];
+       libraryHaskellDepends = [ base bytestring tagged text ];
        jailbreak = true;
        homepage = "https://github.com/bairyn/string-class";
        description = "String class library";
@@ -122179,7 +125261,7 @@ self: {
        pname = "string-combinators";
        version = "0.6.0.5";
        sha256 = "07ky2z5f1l5mb7r3rvyraak0bzciq4krkg5lv8g0a5vxpnzlm4cl";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/basvandijk/string-combinators";
        description = "Polymorphic functions to build and combine stringlike values";
        license = stdenv.lib.licenses.bsd3;
@@ -122191,7 +125273,7 @@ self: {
        pname = "string-conv";
        version = "0.1";
        sha256 = "0zjmlkjmdiqnfnb9qqam6bkipwqz5iwy4bjy9xcs20ljf01586l6";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        description = "Standardized conversion between string types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122202,7 +125284,7 @@ self: {
        pname = "string-conversions";
        version = "0.4";
        sha256 = "1bi4mjnz0srb01n0k73asizp5h2ir7j3whxai9wprqvz7kdscr0s";
-       buildDepends = [ base bytestring text utf8-string ];
+       libraryHaskellDepends = [ base bytestring text utf8-string ];
        description = "Simplifies dealing with different types for strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122213,7 +125295,7 @@ self: {
        pname = "string-convert";
        version = "2.0.1";
        sha256 = "0lx9bc7czwzbf8rky8k02kgi6w3pjfz6ydig9i9ll83zy70l9208";
-       buildDepends = [ base bytestring text utf8-string ];
+       libraryHaskellDepends = [ base bytestring text utf8-string ];
        homepage = "https://bitbucket.org/tdammers/string-convert";
        description = "Provide universal string conversions between any two string-like types";
        license = stdenv.lib.licenses.bsd3;
@@ -122225,7 +125307,7 @@ self: {
        pname = "string-qq";
        version = "0.0.2";
        sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -122236,7 +125318,7 @@ self: {
        pname = "string-quote";
        version = "0.0.1";
        sha256 = "1pfkd3lwdphvl00gly7zbpvsmlw6b2d5568rxyqmq2qw6vzf9134";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122247,8 +125329,8 @@ self: {
        pname = "string-similarity";
        version = "0.1.0.0";
        sha256 = "0k03krg3m03bxk9i5ph5ipks9b0j8yqsal0haf8fyjq83xs1hbmv";
-       buildDepends = [ base suffixtree ];
-       testDepends = [ base bytestring hspec QuickCheck ];
+       libraryHaskellDepends = [ base suffixtree ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "http://github.com/mwotton/string-similarity";
        description = "longest common substring";
        license = stdenv.lib.licenses.bsd3;
@@ -122260,7 +125342,7 @@ self: {
        pname = "stringable";
        version = "0.1.3";
        sha256 = "10jsvbiqbmnbipv1566k5mqkpgfyrzbk8m7b18rqjb5m3qg9dbz7";
-       buildDepends = [ base bytestring system-filepath text ];
+       libraryHaskellDepends = [ base bytestring system-filepath text ];
        description = "A Stringable type class, in the spirit of Foldable and Traversable";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -122271,8 +125353,8 @@ self: {
        pname = "stringbuilder";
        version = "0.5.0";
        sha256 = "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9";
-       buildDepends = [ base ];
-       testDepends = [ base hspec QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        description = "A writer monad for multi-line string literals";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -122285,8 +125367,8 @@ self: {
        pname = "stringlike";
        version = "0.0.0";
        sha256 = "0wrhma5g73lnyazbb11z2xhd7fdz93mb1kgbqxjn1prhlc3j7ahy";
-       buildDepends = [ base bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
          base bytestring QuickCheck quickcheck-instances test-framework
          test-framework-quickcheck2 text
        ];
@@ -122305,8 +125387,8 @@ self: {
        pname = "stringprep";
        version = "1.0.0";
        sha256 = "0ha4cvzdppd514xh9315v3nvrn1q4xd74gifdqpszw98hj2mw0b0";
-       buildDepends = [ base containers text text-icu ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers text text-icu ];
+       testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck tasty-th text
          text-icu
        ];
@@ -122320,7 +125402,7 @@ self: {
        pname = "strings";
        version = "1.1";
        sha256 = "1xz9v3w5s13yhk7iy9dw6i8s2jc6c0b1ci96dwmcq9a1n3l3ng4v";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "http://hub.darcs.net/scravy/strings";
        description = "Functions for working with strings, including Text, ByteString, etc";
        license = stdenv.lib.licenses.mit;
@@ -122332,7 +125414,7 @@ self: {
        pname = "stringsearch";
        version = "0.3.6.6";
        sha256 = "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9";
-       buildDepends = [ array base bytestring containers ];
+       libraryHaskellDepends = [ array base bytestring containers ];
        homepage = "https://bitbucket.org/dafis/stringsearch";
        description = "Fast searching, splitting and replacing of ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -122344,7 +125426,7 @@ self: {
        pname = "stringtable-atom";
        version = "0.0.7";
        sha256 = "1wp6w12bflrqcwi09y7s1crj72n4pbj8bkpwj2ia5gaqn5x56wjs";
-       buildDepends = [ base binary bytestring containers syb ];
+       libraryHaskellDepends = [ base binary bytestring containers syb ];
        homepage = "http://github.com/audreyt/stringtable-atom/";
        description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets";
        license = stdenv.lib.licenses.bsd3;
@@ -122358,7 +125440,7 @@ self: {
        pname = "stripe";
        version = "0.8.3";
        sha256 = "1lqz116lvj2444sf2j58dg1nkjwaxm9abrizp1zqkmixbl7ykaqh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types mtl text time
          unordered-containers utf8-string
        ];
@@ -122377,18 +125459,17 @@ self: {
        pname = "stripe-haskell";
        version = "0.1.4.1";
        sha256 = "066jcinjg430p4mwy1wdc5pkp3y43isv3z70w2lqdsyl2q3cgzx0";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring either HsOpenSSL hspec http-streams
          io-streams mtl random text time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring either HsOpenSSL hspec http-streams random
          text time transformers
        ];
        homepage = "https://github.com/dmjio/stripe";
        description = "Stripe API for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strive" = callPackage
@@ -122400,15 +125481,14 @@ self: {
        pname = "strive";
        version = "2.1.0";
        sha256 = "08jirx24wnfpknlgkcz605sn9nwb0g5hv75vgrms5gbq65gkg9s2";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default gpolyline http-conduit
          http-types template-haskell text time transformers
        ];
-       testDepends = [ base bytestring hlint markdown-unlit time ];
+       testHaskellDepends = [ base bytestring hlint markdown-unlit time ];
        homepage = "http://taylor.fausak.me/strive/";
        description = "A Haskell client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strptime" = callPackage
@@ -122417,7 +125497,7 @@ self: {
        pname = "strptime";
        version = "1.0.10";
        sha256 = "1f42yf49fqr2fyjfakscmmlnmw3w5rg7wyy6gjyrf0gcgsh0h9fd";
-       buildDepends = [ base bytestring text time ];
+       libraryHaskellDepends = [ base bytestring text time ];
        description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122431,20 +125511,21 @@ self: {
        pname = "structural-induction";
        version = "0.3";
        sha256 = "1wykd33phjmz2aky2dynsxmrmxqpkh4h41majq57lh3dag87cwax";
-       buildDepends = [ base containers genifunctors mtl pretty safe ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base containers genifunctors mtl pretty safe
+       ];
+       testHaskellDepends = [
          base geniplate language-haskell-extract mtl pretty QuickCheck safe
          testing-feat
        ];
        homepage = "http://www.github.com/danr/structural-induction";
        description = "Instantiate structural induction schemas for algebraic data types";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "structured-haskell-mode" = callPackage
-    ({ mkDerivation, applicative-quoters, base, descriptive, emacs
-     , ghc-prim, haskell-src-exts, text
+    ({ mkDerivation, applicative-quoters, base, descriptive, ghc-prim
+     , haskell-src-exts, text
      }:
      mkDerivation {
        pname = "structured-haskell-mode";
@@ -122452,19 +125533,13 @@ self: {
        sha256 = "1pcy83ic95l7k3839py4m10zlx4s4pk4n3bsx3mb7n8rp8zngcv2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          applicative-quoters base descriptive ghc-prim haskell-src-exts text
        ];
-       buildTools = [ emacs ];
-       postInstall = ''
-         emacs -L elisp --batch -f batch-byte-compile "elisp/"*.el
-         install -d $out/share/emacs/site-lisp
-         install "elisp/"*.el "elisp/"*.elc  $out/share/emacs/site-lisp
-       '';
        homepage = "https://github.com/chrisdone/structured-haskell-mode";
        description = "Structured editing Emacs mode for Haskell";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) emacs;};
+     }) {};
 
   "structured-mongoDB" = callPackage
     ({ mkDerivation, array, base, bson, bytestring, compact-string-fix
@@ -122475,7 +125550,7 @@ self: {
        pname = "structured-mongoDB";
        version = "0.3";
        sha256 = "0f4s4zi6h53jhcj3f43a2arra02fk1i2almdm6x2mjy1mzhdkjdx";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bson bytestring compact-string-fix containers
          monad-control mongoDB mtl old-time template-haskell transformers
          transformers-base
@@ -122498,12 +125573,12 @@ self: {
        pname = "structures";
        version = "0.2";
        sha256 = "000misbp9fsnmzhqi7na9b56h45c18ac86j7gfaxv7fgqz82zis8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers contravariant deepseq free ghc ghc-prim hashable
          hybrid-vectors lens monad-st parallel primitive semigroups
          transformers vector vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers deepseq directory doctest filepath hlint
          QuickCheck semigroups tasty tasty-quickcheck tasty-th
          unordered-containers
@@ -122525,11 +125600,11 @@ self: {
        pname = "stunclient";
        version = "0.1.0.1";
        sha256 = "0i9sbicwx6d3vsp2fxjr31msd1n5nqh1vxb2hn4in5n8y6d32qlx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal crypto-api cryptohash cryptohash-cryptoapi
          digest network random stringprep text transformers unbounded-delays
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal digest network QuickCheck random
          test-framework test-framework-quickcheck2 text transformers
          unbounded-delays
@@ -122549,7 +125624,7 @@ self: {
        sha256 = "075rbdhlrz88qkwx54jrmb4h4jq8q5wk4ncb858llaswcbsfgl8w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary bullet bytestring containers directory elerea GLFW-b
          lambdacube-bullet lambdacube-engine mtl random vector
        ];
@@ -122570,11 +125645,15 @@ self: {
        sha256 = "055kvwf158m91kx2y3ysiqpjgf15w6r8ryzm4yj0jhy48ymgil5j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl syb yaml
+       ];
+       executableHaskellDepends = [
          aeson base bytestring cmdargs containers directory filepath
          haskell-src-exts mtl strict syb yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring cmdargs containers directory filepath
          haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
          yaml
@@ -122590,7 +125669,7 @@ self: {
        pname = "stylized";
        version = "0.1.3";
        sha256 = "09gacqlq3vlnsnbjjr44pjypw9v3amg8sqsxg0xwl8ricxpww774";
-       buildDepends = [ ansi-terminal base ];
+       libraryHaskellDepends = [ ansi-terminal base ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/lucid/Stylized";
        description = "Ways to output stylized text on ANSI consoles";
@@ -122608,13 +125687,15 @@ self: {
        pname = "subhask";
        version = "0.1.0.1";
        sha256 = "17r26mccarr9m7wxvax3bmwz94gcaxg732797js1qa12fdnbsn8m";
-       buildDepends = [
+       libraryHaskellDepends = [
          approximate base bloomfilter bytes bytestring cassava containers
          deepseq erf gamma ghc-prim hmatrix hyperloglog lens monad-primitive
          MonadRandom mtl parallel pipes primitive QuickCheck semigroups
          template-haskell vector
        ];
-       testDepends = [ base test-framework test-framework-quickcheck2 ];
+       testHaskellDepends = [
+         base test-framework test-framework-quickcheck2
+       ];
        jailbreak = true;
        homepage = "http://github.com/mikeizbicki/subhask";
        description = "Type safe interface for programming in subcategories of Hask";
@@ -122628,7 +125709,7 @@ self: {
        pname = "subnet";
        version = "0.0.1.2";
        sha256 = "199kslgxlhxv8zx3mj5pxgicjxyff7vzjhw13fwfxcf9pa9289nv";
-       buildDepends = [ base split ];
+       libraryHaskellDepends = [ base split ];
        homepage = "https://github.com/gcganley/subnet";
        description = "subnetting calculator";
        license = stdenv.lib.licenses.mit;
@@ -122640,7 +125721,7 @@ self: {
        pname = "subtitleParser";
        version = "0.5";
        sha256 = "1kkr6zbnv777gnv2lwq3pyxq3vv5r24f4avwv5g4dds3y8d8mv3q";
-       buildDepends = [ attoparsec base containers text ];
+       libraryHaskellDepends = [ attoparsec base containers text ];
        homepage = "https://patch-tag.com/r/rubenAst/subtitleParser/home";
        description = "A parser for .srt and .sub files";
        license = stdenv.lib.licenses.bsd3;
@@ -122654,7 +125735,7 @@ self: {
        sha256 = "0pvcwwz6i4mpmir0s2xnjy27j2cnbi4l9lxhlmxcsw4yz4spdgcl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base split ];
+       executableHaskellDepends = [ base split ];
        description = "Modify SRT subtitle files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122667,7 +125748,8 @@ self: {
        sha256 = "0wa2yfz5y90dq9mf3xyl7126rvjldnaa32gmg253bfv6hjvk4hhp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base HUnit vector ];
+       libraryHaskellDepends = [ base vector ];
+       executableHaskellDepends = [ base HUnit ];
        jailbreak = true;
        homepage = "https://github.com/VictorDenisov/suffixarray";
        description = "n log n implementation of suffix array";
@@ -122680,7 +125762,7 @@ self: {
        pname = "suffixtree";
        version = "0.2.2.1";
        sha256 = "1ddk2hp27al9jzcgkrhv7v1i7knci4l22flkgb2r94h96z5nhfq6";
-       buildDepends = [ base bytestring containers ];
+       libraryHaskellDepends = [ base bytestring containers ];
        homepage = "https://github.com/bos/suffixtree";
        description = "Efficient, lazy suffix tree implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -122694,7 +125776,7 @@ self: {
        sha256 = "1hlzckm5c1dih79nmwy2gk4fjnn4kxzp3pk0adfyhldapkq6wpmq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        homepage = "http://sugarj.org";
        description = "Library-based syntactic extensibility for Haskell";
        license = "GPL";
@@ -122706,7 +125788,7 @@ self: {
        pname = "suitable";
        version = "0.1.1";
        sha256 = "1pvw7zgvfr0z2gjy224gd92ayh20j3v97rdlqmq6k6g4yabdpgci";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Abstract over the constraints on the parameters to type constructors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122718,7 +125800,7 @@ self: {
        pname = "sundown";
        version = "0.6";
        sha256 = "09xh3pbyarflfjk17bn2isgpmsq49d6gmq7z918kf4c32fc7x6yb";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/bitonic/sundown";
        description = "Bindings to the sundown markdown library";
        license = stdenv.lib.licenses.publicDomain;
@@ -122732,7 +125814,7 @@ self: {
        pname = "sunlight";
        version = "0.6.0.0";
        sha256 = "1q90fxv40jz5ngh6xi1n6xjx6hh1as223wjjhchk6k0y0frdg55x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring Cabal directory old-locale process random time
          tuple
        ];
@@ -122752,7 +125834,7 @@ self: {
        pname = "sunroof-compiler";
        version = "0.2";
        sha256 = "1r03aw55s4vnpbfk0n39li0aai3wvm209pqdimfkkk3kkan648cz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Boolean containers data-default data-reify mtl operational
          semigroups tagged template-haskell transformers vector-space
        ];
@@ -122774,7 +125856,7 @@ self: {
        sha256 = "0bcxai3gq1akbcxqkkj0n52a43zqcnw865bnngy9b4z26b43kj5k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base Boolean containers data-default directory filepath parallel-io
          process QuickCheck random semigroups shake stm sunroof-compiler
          sunroof-server
@@ -122797,7 +125879,7 @@ self: {
        pname = "sunroof-server";
        version = "0.2.1";
        sha256 = "11acyb846wga6g6zcvlaffh299qn0l8jic8syg76cchm3l3348d5";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers data-default filepath kansas-comet scientific
          scotty semigroups stm sunroof-compiler tagged text time
          transformers unordered-containers vector vector-space
@@ -122820,7 +125902,7 @@ self: {
        sha256 = "1v8nqcfdn2dasiv24lny73bc0xz2d26wvvybhxw6s7dz4bkb9kiw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base hosc hsc3 opensoundcontrol-ht process random transformers
        ];
        homepage = "http://www.haskell.org/haskellwiki/SuperCollider";
@@ -122840,7 +125922,7 @@ self: {
        sha256 = "1m3h6d49bjwhldbf4khyp6p8k4vr05m5392nk3d33x3d9pfhl20k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          alsa-seq array base containers data-accessor
          data-accessor-transformers event-list hosc hsc3 midi midi-alsa
          non-negative opensoundcontrol-ht random supercollider-ht
@@ -122861,7 +125943,12 @@ self: {
        sha256 = "1fjy25fm7hz495dnxl9jw0asfhl23ykyax1w4q4yvkpmx8ars9wd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal containers directory filepath ];
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath
+       ];
+       executableHaskellDepends = [
+         base Cabal containers directory filepath
+       ];
        jailbreak = true;
        homepage = "http://www.mathstat.dal.ca/~selinger/superdoc/";
        description = "Additional documentation markup and Unicode support";
@@ -122879,7 +125966,7 @@ self: {
        sha256 = "0jnip7wahy4z1jiablqzvmbk40as1ala65m7da7gsp0xvf2q7hwf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers cpphs directory filepath haskell-src-exts mtl
          process time uniplate
        ];
@@ -122896,7 +125983,9 @@ self: {
        pname = "supervisor";
        version = "0.1.1.0";
        sha256 = "1gdgqm89ig236hkrz8sjgy3shqnl961401qgavs4qpqw7r2xk8vx";
-       buildDepends = [ base containers exceptions monadloc mtl ];
+       libraryHaskellDepends = [
+         base containers exceptions monadloc mtl
+       ];
        homepage = "http://github.com/agocorona/supervisor";
        description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes";
        license = stdenv.lib.licenses.bsd3;
@@ -122909,7 +125998,7 @@ self: {
        pname = "suspend";
        version = "0.2.0.0";
        sha256 = "0wphk3dabba6rgd9lkxbsmq5vivvyy6b4jfxfndqb53yhdj5nkrg";
-       buildDepends = [ base lifted-base transformers-base ];
+       libraryHaskellDepends = [ base lifted-base transformers-base ];
        description = "Simple package that allows for long thread suspensions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122923,7 +126012,7 @@ self: {
        pname = "svg-tree";
        version = "0.3.1";
        sha256 = "1fnj7d2nw4p9m46wp64gz99ssggxd0rz4737732hpk9vr5xq78lc";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers JuicyPixels lens linear mtl
          scientific text transformers vector xml
        ];
@@ -122941,7 +126030,7 @@ self: {
        sha256 = "0bkhh1klwp3lgsx0s62bpdhsw9sa1cdw8gjijj9npnygznbi7jhj";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base haskell98 language-c pretty svgutils syb xml
        ];
        jailbreak = true;
@@ -122959,9 +126048,9 @@ self: {
        pname = "svgcairo";
        version = "0.13.0.3";
        sha256 = "0jbcz46n5324vf9i05y8zdjp4ayid2frggsadm5nr8h9mnd4vncz";
-       buildDepends = [ base cairo glib mtl text ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ librsvg ];
+       libraryHaskellDepends = [ base cairo glib mtl text ];
+       libraryPkgconfigDepends = [ librsvg ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the libsvg-cairo library";
        license = stdenv.lib.licenses.bsd3;
@@ -122975,7 +126064,8 @@ self: {
        sha256 = "131mic1c09adcphry7153bviiib59avxrd7dgwny0vdmw23cgfs1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base filepath xml ];
+       libraryHaskellDepends = [ base xml ];
+       executableHaskellDepends = [ base filepath xml ];
        jailbreak = true;
        homepage = "https://patch-tag.com/r/twistedsquare/svgutils/home";
        description = "Helper functions for dealing with SVG files";
@@ -122988,7 +126078,7 @@ self: {
        pname = "svm";
        version = "1.0.0.1";
        sha256 = "19fr1lzp8j0hmqqy1hyx85gmkgxc2hy8cz5zv6jlvni0qqibiksz";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        homepage = "http://github.com/andrewdougherty/svm";
        description = "A support vector machine written in Haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -123000,7 +126090,7 @@ self: {
        pname = "svm-light-utils";
        version = "0.1.2";
        sha256 = "1p2rnx045zw9qqd88m5ldx5p3xmbsi6rkdh1bfk6ab1a0krjiifa";
-       buildDepends = [ attoparsec base bytestring containers ];
+       libraryHaskellDepends = [ attoparsec base bytestring containers ];
        jailbreak = true;
        homepage = "http://github.com/bgamari/svm-light-utils";
        description = "Parsers and formatters for the SVMlight input file format";
@@ -123015,7 +126105,7 @@ self: {
        pname = "svm-simple";
        version = "0.2.7.1";
        sha256 = "07s9mly01ar6c3p4fdl7wsi5j4bziagjjlbssr7x6s3ab5r8k9vd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bindings-svm bytestring containers deepseq directory
          monad-par mwc-random vector
        ];
@@ -123034,10 +126124,10 @@ self: {
        pname = "svndump";
        version = "0.4.5";
        sha256 = "0m6agn9riamsadf13w1g6i0nx59xl812112xdkqh0zl34rf5hkwp";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers filepath old-locale text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring directory doctest filepath zlib
        ];
        homepage = "http://github.com/jwiegley/svndump/";
@@ -123054,8 +126144,10 @@ self: {
        pname = "swagger";
        version = "0.2.2";
        sha256 = "1hpc569n34kr1nkrwlx76pc0yp9icr8j5cxliwjqffnh7x2czzqr";
-       buildDepends = [ aeson base bytestring text time transformers ];
-       testDepends = [ aeson base bytestring tasty tasty-hunit ];
+       libraryHaskellDepends = [
+         aeson base bytestring text time transformers
+       ];
+       testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
        description = "Implementation of swagger data model";
        license = "unknown";
      }) {};
@@ -123068,11 +126160,11 @@ self: {
        pname = "swapper";
        version = "0.1";
        sha256 = "0a9g6cv7pvwna11cz1xc274rs0dgyhb84hqqdg5zyga7kkx0i06l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring deepseq happstack-data happstack-state
          parallel
        ];
-       extraLibraries = [ tokyocabinet ];
+       librarySystemDepends = [ tokyocabinet ];
        homepage = "http://github.com/roman-smrz/swapper/";
        description = "Transparently swapping data from in-memory structures to disk";
        license = stdenv.lib.licenses.bsd3;
@@ -123090,7 +126182,7 @@ self: {
        sha256 = "0g3xq3abwkv6rs7kvv6niwdhx50c90ys1zrrzspx2g47c9fbs2iq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base containers fixplate mtl pretty random
          random-shuffle readline system-fileio system-filepath text
        ];
@@ -123107,7 +126199,7 @@ self: {
        pname = "swf";
        version = "1.0.1";
        sha256 = "1jx5941kb97w4zpgz7m1r2x2lxllmi1i9a9nmwflinyj74xxg1rl";
-       buildDepends = [ base mtl pretty ];
+       libraryHaskellDepends = [ base mtl pretty ];
        homepage = "http://www.n-heptane.com/nhlab";
        description = "A library for creating Shockwave Flash (SWF) files";
        license = stdenv.lib.licenses.bsd3;
@@ -123122,7 +126214,7 @@ self: {
        pname = "swift-lda";
        version = "0.7.0.0";
        sha256 = "0cjvj7v8kjabv6a146hwgyk8k6b4z7gz4yrhz3d0nxa86ilvjl9q";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers ghc-prim mwc-random primitive vector
        ];
        homepage = "https://bitbucket.org/gchrupala/colada";
@@ -123142,11 +126234,12 @@ self: {
        sha256 = "07h5677d1liap81z3gvjab5yjib2vbmzvhfzqqmkjg7grk1dblld";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath hashable intern mtl network-uri
          old-locale polyparse semigroups text time
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base containers hashable HUnit network-uri old-locale semigroups
          test-framework test-framework-hunit text time
        ];
@@ -123167,7 +126260,7 @@ self: {
        sha256 = "0anl5h5lwc6b7whkg83ziyizq5w2mlcpv0akcl0ahgjl4mxnmiwd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          asn1-encoding asn1-types base bytestring crypto-pubkey
          crypto-random directory filepath hourglass http-types network pem
          resourcet transformers wai wai-extra wai-middleware-static warp
@@ -123185,8 +126278,8 @@ self: {
        pname = "syb";
        version = "0.5.1";
        sha256 = "0iiqz5mamk1nsij99rypms7dhx5flm2n02k1x6miqgnhg075zc41";
-       buildDepends = [ base ];
-       testDepends = [ base containers HUnit mtl ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base containers HUnit mtl ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
        description = "Scrap Your Boilerplate";
        license = stdenv.lib.licenses.bsd3;
@@ -123198,7 +126291,7 @@ self: {
        pname = "syb-extras";
        version = "0.3";
        sha256 = "1l1637kf1f7n5nvcp2hv516qah7baykh5w2wmil2b909k75iq2x9";
-       buildDepends = [ base eq prelude-extras ];
+       libraryHaskellDepends = [ base eq prelude-extras ];
        homepage = "http://github.com/ekmett/syb-extras/";
        description = "Higher order versions of the Scrap Your Boilerplate classes";
        license = stdenv.lib.licenses.bsd3;
@@ -123212,10 +126305,10 @@ self: {
      mkDerivation {
        pname = "syb-with-class";
        version = "0.6.1.6";
-       revision = "1";
        sha256 = "1c61hig293lxyr2kdri3rp6wkns921fiwwmml9zhrhrrryfr0p2n";
+       revision = "1";
        editedCabalFile = "e894d322dfc9c36c33058bfcbecbe6d36e620556a9713108b008120f7981cd7c";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers template-haskell
        ];
        description = "Scrap Your Boilerplate With Class";
@@ -123228,7 +126321,7 @@ self: {
        pname = "syb-with-class-instances-text";
        version = "0.0.1";
        sha256 = "0vnpqk89nxs0anx62mzasl9wrcscw18vwc284y067ryb086aj2hf";
-       buildDepends = [ base syb-with-class text ];
+       libraryHaskellDepends = [ base syb-with-class text ];
        description = "Scrap Your Boilerplate With Class Text instance";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123245,12 +126338,12 @@ self: {
        sha256 = "1yjvjfkg623kpnzpkknljfgcizyf3jsvkncz49yjsy9j2iklqg2k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cairo comonad-transformers data-default data-lens
          data-lens-template gtk optparse-applicative parsec transformers
          void
        ];
-       testDepends = [
+       testHaskellDepends = [
          base parsec smallcheck test-framework test-framework-smallcheck
          void
        ];
@@ -123267,7 +126360,9 @@ self: {
        pname = "sym";
        version = "0.11.1";
        sha256 = "140wy1l2y71v70fhl1z4sa5dvasz5f98w2knayhd7lvw15cglmbj";
-       buildDepends = [ array base containers hashable QuickCheck ];
+       libraryHaskellDepends = [
+         array base containers hashable QuickCheck
+       ];
        homepage = "https://github.com/akc/sym";
        description = "Permutations, patterns, and statistics";
        license = stdenv.lib.licenses.bsd3;
@@ -123279,7 +126374,7 @@ self: {
        pname = "sym-plot";
        version = "0.2.0";
        sha256 = "0186i6c3dyvs5pa4fh0b284wgpm10pgwax9prahirnq8whph94p2";
-       buildDepends = [ base diagrams-cairo diagrams-lib sym ];
+       libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ];
        jailbreak = true;
        homepage = "http://github.com/akc/sym-plot";
        description = "Plot permutations; an addition to the sym package";
@@ -123293,7 +126388,7 @@ self: {
        pname = "symbol";
        version = "0.2.4";
        sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h";
-       buildDepends = [ base containers deepseq ];
+       libraryHaskellDepends = [ base containers deepseq ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "A 'Symbol' type for fast symbol comparison";
        license = stdenv.lib.licenses.bsd3;
@@ -123305,7 +126400,7 @@ self: {
        pname = "sync";
        version = "0.1";
        sha256 = "10c2divizmjij5w7x2ky6dzhq6y6wr6qq1pwl7wlhgv663y9yalk";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        description = "A fast implementation of synchronous channels with a CML-like API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123323,13 +126418,13 @@ self: {
        sha256 = "1mkrap2qhfhnisz28vb4hjl5fmfi8r48n1igvv4c0qf9nclhfbhd";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base base16-bytestring byteable bytestring Cabal cereal
          containers cryptohash directory exceptions filepath io-streams mtl
          process random regex-compat temporary text time transformers unix
          zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base base16-bytestring byteable bytestring Cabal cereal
          containers cryptohash directory exceptions filepath io-streams mtl
          process random regex-compat temporary text time transformers unix
@@ -123339,6 +126434,7 @@ self: {
        homepage = "https://github.com/ekarayel/sync-mht";
        description = "Fast incremental file transfer using Merkle-Hash-Trees";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synchronous-channels" = callPackage
@@ -123347,10 +126443,9 @@ self: {
        pname = "synchronous-channels";
        version = "0.2";
        sha256 = "0xzpjq3h3mqdi553v7p6xm3i74nvbhz5igjlhfh6snlmr7p1cdvb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Synchronous communication channels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syncthing-hs" = callPackage
@@ -123365,12 +126460,12 @@ self: {
        pname = "syncthing-hs";
        version = "0.3.0.0";
        sha256 = "0mancdrf3miicjcsrszxgv5bnka9nvbcsynyw4ljn19c2mk2628r";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring connection containers either exceptions
          http-client http-client-tls lens regex-posix text time
          time-locale-compat transformers unordered-containers vector wreq
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers data-default derive either
          exceptions http-client http-types lens quickcheck-instances
          scientific tasty tasty-hunit tasty-quickcheck text transformers
@@ -123379,7 +126474,6 @@ self: {
        homepage = "https://github.com/jetho/syncthing-hs";
        description = "Haskell bindings for the Syncthing REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synt" = callPackage
@@ -123392,8 +126486,13 @@ self: {
        sha256 = "12d9ilb81vcm24s8whk2cbq1nxlrzdsr7049962q6b0vkrk64v5v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ argparser base haskell-src-exts regexpr split ];
-       testDepends = [
+       libraryHaskellDepends = [
+         argparser base haskell-src-exts regexpr split
+       ];
+       executableHaskellDepends = [
+         argparser base haskell-src-exts regexpr split
+       ];
+       testHaskellDepends = [
          argparser base haskell-src-exts hpc hspec regexpr split Synt
        ];
        jailbreak = true;
@@ -123413,11 +126512,11 @@ self: {
        pname = "syntactic";
        version = "2.1";
        sha256 = "1r2b11xw235qsv6z6qqssrmgd1wcbr28vmlqs7vlb4h0yhpkd1i3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints containers data-hash deepseq mtl safe tagged
          template-haskell tree-view
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers QuickCheck tagged tasty tasty-golden
          tasty-quickcheck tasty-th utf8-string
        ];
@@ -123432,7 +126531,7 @@ self: {
        pname = "syntactical";
        version = "0.1";
        sha256 = "1sqnmarmdm4mha28h8gbp3jddlig84v7zqn53a29047w3877g3gw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Distfix expression parsing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123444,10 +126543,10 @@ self: {
      mkDerivation {
        pname = "syntax";
        version = "1.0.0.0";
-       revision = "1";
        sha256 = "1dhbzbf1zlpfjhnacqfhzvjznwlzv39c12a3y8ivqhplnkmqsm7x";
+       revision = "1";
        editedCabalFile = "7f3d7f3a8c8aedb78145f4d8a992815cdb644d839a5431b23e5fad0a62d7dd5c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens mono-traversable scientific semi-iso text vector
        ];
        description = "Reversible parsing and pretty-printing";
@@ -123463,7 +126562,7 @@ self: {
        pname = "syntax-attoparsec";
        version = "1.0.0.0";
        sha256 = "1ygikzc7s967bh9yz19r9zd2r1jychlf04cylbigaakrxnnkj4hi";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring scientific semi-iso syntax text vector
        ];
        description = "Syntax instances for Attoparsec";
@@ -123481,7 +126580,7 @@ self: {
        sha256 = "1szfapnlcgr19cipm4q68w7p52sw2hapks63vcnn9qfjnav17ljr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base lens scientific semi-iso syntax syntax-attoparsec
          syntax-printer text
        ];
@@ -123500,7 +126599,7 @@ self: {
        sha256 = "1bgv2y97rk5jr2gkl4d1pm19v3pl1gziz4sxnlv9w539dna0dwim";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          attoparsec base containers lens scientific semi-iso syntax
          syntax-attoparsec syntax-printer text
        ];
@@ -123516,7 +126615,9 @@ self: {
        pname = "syntax-pretty";
        version = "0.2.0.0";
        sha256 = "1dyv0d998lbjndiw05hz9rmiazzz3rvw8hqdx5npb6yjmq237zmf";
-       buildDepends = [ base pretty scientific semi-iso syntax text ];
+       libraryHaskellDepends = [
+         base pretty scientific semi-iso syntax text
+       ];
        description = "Syntax instance for pretty, the pretty printing library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123530,7 +126631,7 @@ self: {
        pname = "syntax-printer";
        version = "1.0.0.0";
        sha256 = "051gkxj9qgrmjp8jl48nb7487y2hd6ymrzjl62k2faa0cfz6sbqz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring scientific semi-iso semigroupoids syntax
          text vector
        ];
@@ -123548,7 +126649,7 @@ self: {
        pname = "syntax-trees";
        version = "0.1.2";
        sha256 = "19lgaiql3d8v6w8dl0a7adrfw63ch5376dz6y4jzndrwzi43p9sb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts hint mtl template-haskell uniplate
        ];
        description = "Convert between different Haskell syntax trees";
@@ -123564,7 +126665,7 @@ self: {
        pname = "syntax-trees-fork-bairyn";
        version = "0.1.2.5";
        sha256 = "1n4k8m4zl5phxyrh6s46ijxcba9iljyh7zvhrrzzaw3d00nfvqg6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts hint mtl template-haskell uniplate
        ];
        description = "Convert between different Haskell syntax trees. Bairyn's fork.";
@@ -123585,12 +126686,12 @@ self: {
        sha256 = "1n5r7061x8212a8wfv0j9g28l79lxgbymr1f0m1qgzkhqf80gz3d";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base binary bytestring containers directory event-list
-         filepath gnuplot non-negative numeric-prelude numeric-quest
-         old-time process QuickCheck random sox storable-record
-         storablevector transformers utility-ht
+       libraryHaskellDepends = [
+         array base binary bytestring containers event-list filepath gnuplot
+         non-negative numeric-prelude numeric-quest process QuickCheck
+         random sox storable-record storablevector transformers utility-ht
        ];
+       executableHaskellDepends = [ directory old-time ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell";
@@ -123610,7 +126711,7 @@ self: {
        sha256 = "0k4hnhldrqjxz391p45rc125d2v8pbx23qxsvfs4hwra886imny3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          alsa-core alsa-pcm alsa-seq base event-list midi midi-alsa
          non-negative numeric-prelude old-time random sox storablevector
          synthesizer-core synthesizer-dimensional synthesizer-midi
@@ -123634,14 +126735,14 @@ self: {
        pname = "synthesizer-core";
        version = "0.7.1";
        sha256 = "0h3dj4j9ha1db2lw3vd7zai05ivm9lfydaynq2bxqhz77s07skzf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers deepseq event-list
          explicit-exception filepath non-empty non-negative numeric-prelude
          numeric-quest process QuickCheck random sample-frame-np sox
          storable-record storable-tuple storablevector stream-fusion
          transformers utility-ht
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers event-list non-empty non-negative numeric-prelude
          QuickCheck random storable-tuple storablevector utility-ht
        ];
@@ -123662,7 +126763,7 @@ self: {
        sha256 = "1y3jnlzpgs0n42vf5ami98c3nc1kz645spxirdaqn60f3ig4bvzb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring event-list non-negative numeric-prelude random sox
          storable-record storablevector synthesizer-core transformers
          utility-ht
@@ -123683,7 +126784,7 @@ self: {
        sha256 = "07jhdd73vrhlvx6aq6rdd78qk8vfy2jcc9vrdrf8y6ikq6ir99rb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base event-list non-negative numeric-prelude random
          synthesizer-core transformers UniqueLogicNP utility-ht
        ];
@@ -123707,13 +126808,13 @@ self: {
        sha256 = "04mzsdwf8n31nqjlv7ryylx64mvhcfkx6r8jq1yijvnb1pih4vk2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers event-list filepath llvm-extra llvm-tf midi
          non-empty non-negative numeric-prelude random sox storable-record
          storable-tuple storablevector synthesizer-core synthesizer-midi tfp
          transformers unsafe utility-ht vault
        ];
-       testDepends = [
+       testHaskellDepends = [
          base llvm-extra llvm-tf numeric-prelude QuickCheck random
          storablevector synthesizer-core tfp utility-ht
        ];
@@ -123736,7 +126837,7 @@ self: {
        sha256 = "0xsfjgh82nxpwrhpllhjxxzaj42cxb5cbbpgwd1b1bsv67441h2x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers data-accessor data-accessor-transformers
          deepseq event-list midi non-negative numeric-prelude sox
          storable-record storablevector synthesizer-core
@@ -123755,8 +126856,8 @@ self: {
        pname = "sys-auth-smbclient";
        version = "2.0.0.0";
        sha256 = "00j1ss8xsnd8m0v0p9r9mampbczclzanzcli2qrxcl4j9vkp2mb7";
-       buildDepends = [ base process text ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [ base process text ];
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/kkazuo/sys-auth-smbclient";
        description = "Auth with smbclient command";
        license = stdenv.lib.licenses.mit;
@@ -123771,11 +126872,11 @@ self: {
        pname = "sys-process";
        version = "0.1.6";
        sha256 = "04f6mbkc61qx8wjf95kwxhrqhv2qprl2wa73rkgsq8nc18gicf3q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors directory filepath lens mtl notzero process
          semigroupoids semigroups transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/sys-process";
@@ -123789,7 +126890,7 @@ self: {
        pname = "system-argv0";
        version = "0.1.1";
        sha256 = "1ijfry2r3cypp3zmws6dczk21m4n86fkxjld7yl19gjp46fxllbd";
-       buildDepends = [ base bytestring system-filepath text ];
+       libraryHaskellDepends = [ base bytestring system-filepath text ];
        homepage = "https://john-millikin.com/software/haskell-filesystem/";
        description = "Get argv[0] as a FilePath";
        license = stdenv.lib.licenses.mit;
@@ -123803,10 +126904,10 @@ self: {
        pname = "system-canonicalpath";
        version = "0.3.2.0";
        sha256 = "031m5j7xglxdgp3rkgf2v37jya1a3hhjp3mxbfyyjl27wv7pzhjy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base basic-prelude directory system-filepath text
        ];
-       testDepends = [ base basic-prelude chell system-filepath ];
+       testHaskellDepends = [ base basic-prelude chell system-filepath ];
        homepage = "https://github.com/d12frosted/CanonicalPath";
        description = "Abstract data type for canonical paths with some utilities";
        license = stdenv.lib.licenses.mit;
@@ -123821,8 +126922,12 @@ self: {
        pname = "system-command";
        version = "0.0.10";
        sha256 = "11lfr6xm5xpvq4244pc7a0psy2m1krz0b1jd9pdw6kzn5ammi1b2";
-       buildDepends = [ base directory filepath process transformers ];
-       testDepends = [ base directory doctest filepath QuickCheck ];
+       libraryHaskellDepends = [
+         base directory filepath process transformers
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "https://github.com/tonymorris/system-command";
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
@@ -123836,8 +126941,10 @@ self: {
        pname = "system-fileio";
        version = "0.3.16.3";
        sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i";
-       buildDepends = [ base bytestring system-filepath text time unix ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base bytestring system-filepath text time unix
+       ];
+       testHaskellDepends = [
          base bytestring chell system-filepath temporary text time
          transformers unix
        ];
@@ -123854,8 +126961,8 @@ self: {
        pname = "system-filepath";
        version = "0.4.13.4";
        sha256 = "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l";
-       buildDepends = [ base bytestring deepseq text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq text ];
+       testHaskellDepends = [
          base bytestring chell chell-quickcheck QuickCheck text
        ];
        homepage = "https://github.com/fpco/haskell-filesystem";
@@ -123869,7 +126976,7 @@ self: {
        pname = "system-gpio";
        version = "0.0.2";
        sha256 = "1i718k96xvsfl9rh1x4n5ra88838wd6rzmj3p70bfkxxrsvv1zi4";
-       buildDepends = [ array base ghc-prim ];
+       libraryHaskellDepends = [ array base ghc-prim ];
        homepage = "https://github.com/luzhuomi/system-gpio/";
        description = "GPIO wrapper libary for Raspberry Pi";
        license = stdenv.lib.licenses.bsd3;
@@ -123881,7 +126988,7 @@ self: {
        pname = "system-inotify";
        version = "0.1";
        sha256 = "0ndw4vcvvf7p6nb5vn91mhbj4w9lmgm4cl0jzsks4mxs625bv4lg";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://darcs.imperialviolet.org/system-inotify";
        description = "Binding to Linux's inotify interface";
        license = stdenv.lib.licenses.bsd3;
@@ -123897,7 +127004,11 @@ self: {
        sha256 = "1c27y14867dd6706kp9n9y287vi7vqfzd2qr9365mk2854zvqifw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory either haskell-src-meta template-haskell text time
+         transformers unix
+       ];
+       executableHaskellDepends = [
          base directory either haskell-src-meta template-haskell text time
          transformers unix
        ];
@@ -123914,7 +127025,7 @@ self: {
        pname = "system-posix-redirect";
        version = "1.1.0.1";
        sha256 = "1wkfz898d3607xnx779l1k1qc8i2k63ixg47542r45scwq8m0lsk";
-       buildDepends = [ base bytestring unix ];
+       libraryHaskellDepends = [ base bytestring unix ];
        description = "A toy module to temporarily redirect a program's stdout";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123929,12 +127040,12 @@ self: {
        pname = "system-random-effect";
        version = "0.4.1.3";
        sha256 = "1gfzyjap173brh0i4plgad0409hpah98wsf9w0n7mcr2ysrvjdmb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-api extensible-effects
          mersenne-random-pure64 primitive statistics vector
          vector-algorithms
        ];
-       testDepends = [
+       testHaskellDepends = [
          base extensible-effects HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -123951,7 +127062,7 @@ self: {
        pname = "system-time-monotonic";
        version = "0.2";
        sha256 = "0f5grhh6x2fbawmdk0gq1nsjz47iz8f8r2592d1l69fqddwdhc3v";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        homepage = "https://github.com/joeyadams/haskell-system-time-monotonic";
        description = "Simple library for using the system's monotonic clock";
        license = stdenv.lib.licenses.bsd3;
@@ -123966,11 +127077,11 @@ self: {
        pname = "system-util";
        version = "0.2";
        sha256 = "0sjgsm4n3imnl45zgpvs1vd10wmgci2am03kpjphbqgi5bdywzqk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory either filepath semigroups system-lifted
          template-haskell transformers unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory easy-data either filepath hspec quickcheck-instances
          semigroups system-lifted template-haskell transformers
        ];
@@ -123991,11 +127102,16 @@ self: {
        sha256 = "12c05aqgxfqfsc5hbwlfwy6rhcx29ywz6ai86009y45hx9iii4cb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers murmur-hash parsec
          template-haskell
        ];
-       extraLibraries = [ libossp_uuid ];
+       librarySystemDepends = [ libossp_uuid ];
+       executableHaskellDepends = [
+         base binary bytestring containers murmur-hash parsec
+         template-haskell
+       ];
+       executableSystemDepends = [ libossp_uuid ];
        homepage = "http://github.com/solidsnack/system-uuid/";
        description = "Bindings to system UUID functions";
        license = stdenv.lib.licenses.bsd3;
@@ -124007,8 +127123,10 @@ self: {
        pname = "systemd";
        version = "1.0.0";
        sha256 = "10iyiw0m543bx9j9vdnz2lpnc3944i7ff9vbpdivvgv5z7gd17yn";
-       buildDepends = [ base bytestring network transformers unix ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [
+         base bytestring network transformers unix
+       ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/erebe/systemd";
        description = "Systemd facilities (Socket activation, Notify)";
@@ -124021,7 +127139,7 @@ self: {
        pname = "syz";
        version = "0.2.0.0";
        sha256 = "1m5395937yyxsa1bmlfn1dxa1jr15yjhlz9s15bpwapshcd8119y";
-       buildDepends = [ base syb ];
+       libraryHaskellDepends = [ base syb ];
        homepage = "http://www.cs.indiana.edu/~adamsmd/papers/scrap_your_zippers/";
        description = "Scrap Your Zippers";
        license = stdenv.lib.licenses.bsd3;
@@ -124036,13 +127154,12 @@ self: {
        pname = "t-regex";
        version = "0.1.0.0";
        sha256 = "0g1sv92cglcvdcq320rwdndmq80nyy1yljl6hm86mjppha20dnxl";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers haskell-src-exts haskell-src-meta lens mtl
          QuickCheck recursion-schemes template-haskell transformers
        ];
        description = "Matchers and grammars using tree regular expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ta" = callPackage
@@ -124053,7 +127170,7 @@ self: {
        pname = "ta";
        version = "0.1";
        sha256 = "1i9d34gdxrc0gnny5zgp73m0si9583i8w0gw97mqpyha4pzz6hxx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers ghc-prim mtl Takusen template-haskell time
        ];
        jailbreak = true;
@@ -124071,7 +127188,9 @@ self: {
        sha256 = "1aqi8ivmlzi5j8kxjcwyd2nbz9jpp6q3xya8acsni5fis9l4757w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base csv optparse-applicative process split ];
+       executableHaskellDepends = [
+         base csv optparse-applicative process split
+       ];
        jailbreak = true;
        homepage = "https://github.com/danchoi/table";
        description = "Simple tool to generate tables from DSV input";
@@ -124084,7 +127203,7 @@ self: {
        pname = "table-tennis";
        version = "0.1.0.3";
        sha256 = "1v5g4fbbspgm4smjxk499a0grh5xsr18688kmivql8knhxh1351k";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "A table tennis game tracking engine";
        license = stdenv.lib.licenses.mit;
@@ -124100,7 +127219,9 @@ self: {
        sha256 = "0dc1qdjlwxqjfb286knmbam6y9w9wlr6ah7l2ndq33yia4n2jp8b";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cgi containers html mtl parsec QuickCheck ];
+       executableHaskellDepends = [
+         base cgi containers html mtl parsec QuickCheck
+       ];
        description = "An interactive theorem prover based on semantic tableaux";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124115,12 +127236,12 @@ self: {
        pname = "tables";
        version = "0.4.1.1";
        sha256 = "1bv51i0bn0nlgi0zj8sjdch6m9dd8ncmnksz699fa28cn57ln64p";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary cereal comonad containers deepseq hashable lens
          profunctors safecopy template-haskell transformers
          transformers-compat unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory doctest filepath lens transformers
          unordered-containers
        ];
@@ -124140,7 +127261,7 @@ self: {
        pname = "tablestorage";
        version = "0.2.1.0";
        sha256 = "03j8cqq85i9wikw772swazbvyv1dcw0mnhmqq3slydl0axi12yr8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring conduit crypto-api cryptohash
          HTTP http-conduit http-types mtl network old-locale resourcet SHA
          time transformers utf8-string xml
@@ -124161,7 +127282,7 @@ self: {
        sha256 = "1qcay15g6g2c9h6vfc7pi7rl4d8fsl09vrq33pdqvgg2fp2xclh3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers gtk hint parallel process regex-base
          regex-posix
        ];
@@ -124176,7 +127297,7 @@ self: {
        pname = "tabular";
        version = "0.2.2.7";
        sha256 = "1ysgq7rrks7f98nnvxil8xz1q27hxdgz4szbjhqwzbwd209dmy0k";
-       buildDepends = [ base csv html mtl ];
+       libraryHaskellDepends = [ base csv html mtl ];
        homepage = "http://hub.darcs.net/kowey/tabular";
        description = "Two-dimensional data tables with rendering functions";
        license = stdenv.lib.licenses.bsd3;
@@ -124196,13 +127317,16 @@ self: {
        sha256 = "0igwq5gmfki61igrs6v51pm8r3wz8pzv6iz8dw30nmqgr3ypddlw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo containers dbus dyre enclosed-exceptions filepath gtk
          gtk-traymanager HStringTemplate HTTP mtl network network-uri
          old-locale parsec process safe split stm text time
          time-locale-compat transformers utf8-string X11 xdg-basedir xmonad
          xmonad-contrib
        ];
+       executableHaskellDepends = [
+         base dyre filepath gtk safe xdg-basedir
+       ];
        homepage = "http://github.com/travitch/taffybar";
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
@@ -124214,7 +127338,7 @@ self: {
        pname = "tag-bits";
        version = "0.1.1.2";
        sha256 = "0crn1g3dh97s3b55z0pkvjm9h89kq99c2agk687vr0vij6r5di65";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/tag-bits";
        description = "Provides access to the dynamic pointer tagging bits used by GHC";
@@ -124229,7 +127353,7 @@ self: {
        pname = "tag-stream";
        version = "0.2.1";
        sha256 = "160kyp1w3y3zg0hj198v5a3jvhpfdy0y0lfz4r2d8azay4f1pkmn";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring enumerator
        ];
        homepage = "http://github.com/yihuang/tag-stream";
@@ -124247,7 +127371,7 @@ self: {
        sha256 = "143bnz73fyy8swm37p0pjg9zagpgzi8mcvixvswla6fiszgc203p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-accessor explicit-exception
          transformers utility-ht xml-basic
        ];
@@ -124262,7 +127386,7 @@ self: {
        pname = "tagged";
        version = "0.8.1";
        sha256 = "1hc2qzhhz5p1xd8k03sklrdnhcflkwhgpl82k6fam8yckww9ipav";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/tagged";
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
        license = stdenv.lib.licenses.bsd3;
@@ -124274,7 +127398,7 @@ self: {
        pname = "tagged-binary";
        version = "0.2.0.0";
        sha256 = "0ibp4hmzg4c4dn88ws7x1j5wc6cbz3j2hymyaw2qkac3j4phzqrm";
-       buildDepends = [ base binary bytestring pureMD5 ];
+       libraryHaskellDepends = [ base binary bytestring pureMD5 ];
        description = "Provides tools for serializing data tagged with type information";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -124284,14 +127408,15 @@ self: {
      mkDerivation {
        pname = "tagged-exception-core";
        version = "2.1.0.0";
-       revision = "1";
        sha256 = "1w4020qb6f5vnym13a4jrha62vj7rqz3nfsrsxa34dl04y63jcax";
+       revision = "1";
        editedCabalFile = "8f3f0eba857169c03927f8605ed326b7a4a5395582aeac4edcee44369b4c9689";
-       buildDepends = [ base exceptions mmorph mtl transformers ];
+       libraryHaskellDepends = [
+         base exceptions mmorph mtl transformers
+       ];
        homepage = "https://github.com/trskop/tagged-exception";
        description = "Reflect exceptions using phantom types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged-list" = callPackage
@@ -124304,7 +127429,7 @@ self: {
        pname = "tagged-list";
        version = "1.1";
        sha256 = "1gdkq9d6hc25z9y8wcsjq10vz25fw40hz2hbp8jfwczhchdxy35s";
-       buildDepends = [
+       libraryHaskellDepends = [
          AbortT-transformers base binary natural-number type-equality
          type-level-natural-number type-level-natural-number-induction
          type-level-natural-number-operations
@@ -124321,7 +127446,9 @@ self: {
        pname = "tagged-th";
        version = "0.1";
        sha256 = "1qqysn5zrkx2q3rv8ynf6nmy5rwdqk6niw0fphg5kyrg72h31s69";
-       buildDepends = [ base tagged template-haskell type-spine ];
+       libraryHaskellDepends = [
+         base tagged template-haskell type-spine
+       ];
        jailbreak = true;
        description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds";
        license = stdenv.lib.licenses.bsd3;
@@ -124336,7 +127463,7 @@ self: {
        pname = "tagged-transformer";
        version = "0.8";
        sha256 = "13jzfrzcgbh3g3qssv08r8i8j2l5c5y84blc1m90rhyyvx2zizn7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad contravariant distributive exceptions mtl reflection
          semigroupoids tagged
        ];
@@ -124352,7 +127479,7 @@ self: {
        pname = "tagging";
        version = "0.1";
        sha256 = "012lcbp2c9a38s4l2i9jaiqcxaidk93v7gxcnf9lplixrnzczy93";
-       buildDepends = [ base bytestring pcre-light ];
+       libraryHaskellDepends = [ base bytestring pcre-light ];
        homepage = "git://github.com/jre2/HaskellTagging.git";
        description = "Library for tagging data";
        license = stdenv.lib.licenses.bsd3;
@@ -124366,23 +127493,23 @@ self: {
      mkDerivation {
        pname = "taggy";
        version = "0.2.0";
-       revision = "1";
        sha256 = "01q2ccf3a8akaifh79ajnfr5yrjsq4xihq0pl7lsz173n7mhnsy3";
+       revision = "1";
        editedCabalFile = "0343ad030ba4e9fd651b383e92c213c6c4a6560ec33f561cfcfa9c5493deb50b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-html blaze-markup text unordered-containers
          vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [
          attoparsec base blaze-html blaze-markup directory hspec
          hspec-attoparsec text unordered-containers vector
        ];
        homepage = "http://github.com/alpmestan/taggy";
        description = "Efficient and simple HTML/XML parsing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "taggy-lens" = callPackage
@@ -124393,14 +127520,15 @@ self: {
        pname = "taggy-lens";
        version = "0.1.2";
        sha256 = "05m2c9q0rz4y0zz6n3dqf0hhzfvk0mp1692jxykg86c802d7pkib";
-       buildDepends = [ base lens taggy text unordered-containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base lens taggy text unordered-containers
+       ];
+       testHaskellDepends = [
          base doctest hspec lens taggy text unordered-containers
        ];
        homepage = "http://github.com/alpmestan/taggy-lens";
        description = "Lenses for the taggy html/xml parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "taglib" = callPackage
@@ -124409,9 +127537,9 @@ self: {
        pname = "taglib";
        version = "0.1.1";
        sha256 = "16qyfy8rxaab0q9j2v00h4j5d3la95acfhmp32x1hdxz1rwr6zfp";
-       buildDepends = [ base bytestring utf8-string ];
-       extraLibraries = [ taglib ];
-       pkgconfigDepends = [ taglib ];
+       libraryHaskellDepends = [ base bytestring utf8-string ];
+       librarySystemDepends = [ taglib ];
+       libraryPkgconfigDepends = [ taglib ];
        description = "Binding to TagLib (ID3 tag library)";
        license = "LGPL";
      }) { inherit (pkgs) taglib;};
@@ -124424,10 +127552,10 @@ self: {
        pname = "taglib-api";
        version = "0.1.1.3";
        sha256 = "1ahbwi28yjigbkgfv52iaaqalmmlc4d09fa65l0yczxrs7rzchmj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl text transformers
        ];
-       pkgconfigDepends = [ taglib ];
+       libraryPkgconfigDepends = [ taglib ];
        jailbreak = true;
        description = "An FFI layer over TagLib's C bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -124441,7 +127569,9 @@ self: {
        pname = "tagset-positional";
        version = "0.3.0";
        sha256 = "0x1mwwlwhka12bzshy0j0w7iq9ka6kn1jgsifi26jmg7zf79zydf";
-       buildDepends = [ base binary containers parsec text text-binary ];
+       libraryHaskellDepends = [
+         base binary containers parsec text text-binary
+       ];
        jailbreak = true;
        homepage = "https://github.com/kawu/tagset-positional";
        description = "Positional tags and tagsets";
@@ -124454,7 +127584,7 @@ self: {
        pname = "tagshare";
        version = "0.0";
        sha256 = "1q3chp1rmwmxa8rxv7548wsvbqbng6grrnv1587p08385sp4ncfj";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "TagShare - explicit sharing with tags";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124467,7 +127597,7 @@ self: {
        sha256 = "13b6zy6346r3cxhaivys84fnxarg8wbv7r2znazfjdkqil8n5a1j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring containers text ];
+       libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "http://community.haskell.org/~ndm/tagsoup/";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
        license = stdenv.lib.licenses.bsd3;
@@ -124484,7 +127614,11 @@ self: {
        sha256 = "1yxb1lmayqqlnxx4jgcbvya8llfgdbbr8rvcxwicwjrq3xsjl8km";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers data-accessor explicit-exception tagsoup
+         transformers utility-ht xml-basic
+       ];
+       executableHaskellDepends = [
          base bytestring containers data-accessor explicit-exception
          old-time tagsoup transformers utility-ht xml-basic
        ];
@@ -124501,7 +127635,7 @@ self: {
        pname = "tagsoup-parsec";
        version = "0.0.8";
        sha256 = "0h62kqls8nrq5wqxbzvxav4kfn1lxc6qm5vg8dhkvqdp5z6xnkzk";
-       buildDepends = [ base parsec tagsoup ];
+       libraryHaskellDepends = [ base parsec tagsoup ];
        homepage = "http://www.killersmurf.com";
        description = "Tokenizes Tag, so [ Tag ] can be used as parser input";
        license = stdenv.lib.licenses.bsd3;
@@ -124517,11 +127651,11 @@ self: {
        pname = "tagstream-conduit";
        version = "0.5.5.3";
        sha256 = "1arlf7qil9bzcqykda8yyrnncm29jsfjvz5kbcdrbbhqpbqfi5mj";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring case-insensitive conduit
          conduit-extra data-default resourcet text transformers xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit hspec HUnit QuickCheck resourcet text
        ];
        homepage = "http://github.com/yihuang/tagstream-conduit";
@@ -124535,10 +127669,9 @@ self: {
        pname = "takahashi";
        version = "0.2.2.0";
        sha256 = "0flr87m1yjxcv1r64bvrx1gm9dpp6xvj2lj14pi99pipywgw4kgs";
-       buildDepends = [ base lens monad-skeleton mtl ];
+       libraryHaskellDepends = [ base lens monad-skeleton mtl ];
        description = "create slide for presentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "takusen-oracle" = callPackage
@@ -124551,9 +127684,12 @@ self: {
        sha256 = "1d57zcv409d3w6qz8n1c8k93wqrqvgynm327vx3w8p7kqs20yaad";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl old-time QuickCheck random time ];
-       buildTools = [ sqlplus ];
-       extraLibraries = [ clntsh ];
+       libraryHaskellDepends = [ base mtl old-time time ];
+       librarySystemDepends = [ clntsh ];
+       libraryToolDepends = [ sqlplus ];
+       executableHaskellDepends = [
+         base mtl old-time QuickCheck random time
+       ];
        homepage = "https://github.com/paulrzcz/takusen-oracle.git";
        description = "Database library with left-fold interface for Oracle";
        license = stdenv.lib.licenses.bsd3;
@@ -124576,7 +127712,7 @@ self: {
        sha256 = "0g7gwqaykvn2r7zbddcvcr4qjs78n0w0cvzk9sfm51i0xgmx3llg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson array base binary blaze-builder blaze-html bytestring cmdargs
          conduit containers deepseq derive directory dlist fclabels filepath
          hamlet http-types HUnit lifted-base monad-control mtl old-locale
@@ -124600,7 +127736,7 @@ self: {
        pname = "tamarin-prover-term";
        version = "0.8.5.1";
        sha256 = "17wq4hr7wfxw5x52jzk8882197zq1lwdqk5yr9wagsbn7hldmaa5";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary bytestring containers deepseq derive
          directory dlist HUnit mtl parsec process safe split syb
          tamarin-prover-utils
@@ -124623,7 +127759,7 @@ self: {
        pname = "tamarin-prover-theory";
        version = "0.8.6.0";
        sha256 = "1xc11mrzfg1v8ilp7yb1zlg2359w14szhbdy86pbfzbjl31852l3";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring cmdargs containers deepseq derive
          directory dlist fclabels filepath HUnit mtl parallel parsec process
          safe syb tamarin-prover-term tamarin-prover-utils time transformers
@@ -124645,7 +127781,7 @@ self: {
        pname = "tamarin-prover-utils";
        version = "0.8.5.1";
        sha256 = "11phn05fb8s80g6zk6sly8wi1rl8i3rnymkr99la8abr8yw12j3c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring binary blaze-builder bytestring containers
          deepseq dlist fclabels mtl parsec pretty SHA syb time transformers
        ];
@@ -124662,7 +127798,7 @@ self: {
        pname = "tamper";
        version = "0.4.1";
        sha256 = "1nkfcai9l6z6hvjixq8nny1466f8shc5432hr8l17llqcwpbzv5p";
-       buildDepends = [ base containers mtl safe text ];
+       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;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124674,7 +127810,9 @@ self: {
        pname = "tar";
        version = "0.4.1.0";
        sha256 = "05875pc5ns1fsbl9qgr8sqh29xl4mhvj0pwsa9z4afxv6h6328bm";
-       buildDepends = [ base bytestring directory filepath time ];
+       libraryHaskellDepends = [
+         base bytestring directory filepath time
+       ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124687,8 +127825,10 @@ self: {
        pname = "tar";
        version = "0.4.2.1";
        sha256 = "102hjlrqfb9d0mvz2bdrj0wg7hvhvzbv4f8gsvxz0wfnq7k0mb9g";
-       buildDepends = [ array base bytestring directory filepath time ];
-       testDepends = [
+       libraryHaskellDepends = [
+         array base bytestring directory filepath time
+       ];
+       testHaskellDepends = [
          array base bytestring directory filepath old-time QuickCheck tasty
          tasty-quickcheck time
        ];
@@ -124702,7 +127842,7 @@ self: {
        pname = "tardis";
        version = "0.3.0.0";
        sha256 = "15f88b5qg4v1ah60y0jxkww9n6z7gvnkslx4inckh6m6c7yvj8k6";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/DanBurton/tardis";
        description = "Bidirectional state monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -124713,28 +127853,27 @@ self: {
      , exceptions, filepath, ghc, ghc-paths, ghc-prim, liquid-fixpoint
      , liquidhaskell, mtl, pretty, process, syb, tagged, tasty
      , tasty-hunit, template-haskell, text, text-format, th-lift
-     , transformers, unordered-containers, vector, z3
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "target";
        version = "0.1.3.0";
        sha256 = "0przmavzzcbyxkqj1wffiissxz9fdlrx2q8lpxgmsamadd46xq66";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory exceptions filepath ghc ghc-paths
          liquid-fixpoint liquidhaskell mtl pretty process syb tagged
          template-haskell text text-format th-lift transformers
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base containers deepseq ghc ghc-prim liquid-fixpoint
          liquidhaskell mtl tagged tasty tasty-hunit template-haskell
          unordered-containers
        ];
-       buildTools = [ z3 ];
        description = "Generate test-suites from refinement types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) z3;};
+     }) {};
 
   "task" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
@@ -124747,7 +127886,7 @@ self: {
        sha256 = "0z4f4hs2c7xl6c134bqhk81wzxhb6yf7fsar2fnqvahviaqqgzqn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base bytestring containers csv-enumerator
          directory filepath old-locale random text time unix
        ];
@@ -124765,8 +127904,12 @@ self: {
        pname = "taskpool";
        version = "0.1.0";
        sha256 = "02r7y882sfj7m3yaj68v40f4065ajiig2b25v55svh13jars7c3n";
-       buildDepends = [ async base containers fgl stm transformers ];
-       testDepends = [ async base containers fgl hspec stm transformers ];
+       libraryHaskellDepends = [
+         async base containers fgl stm transformers
+       ];
+       testHaskellDepends = [
+         async base containers fgl hspec stm transformers
+       ];
        description = "Manage pools of possibly interdependent tasks using STM and async";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -124780,7 +127923,7 @@ self: {
        pname = "tasty";
        version = "0.10.1.2";
        sha256 = "0c5p86ljqa7id6rlkj4p4wy53m9p77f6nayr8ybhcqsjprpb5q4i";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal async base containers deepseq mtl
          optparse-applicative regex-tdfa-rc stm tagged time unbounded-delays
        ];
@@ -124797,7 +127940,7 @@ self: {
        pname = "tasty-ant-xml";
        version = "1.0.1";
        sha256 = "1wb9lm9rbk46g9cm2lpcrzh59zpcy270p824agg61bj1xb9jymsc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers generic-deriving ghc-prim mtl stm tagged tasty
          transformers xml
        ];
@@ -124815,11 +127958,11 @@ self: {
        pname = "tasty-golden";
        version = "2.3.0.1";
        sha256 = "19jlfxhgrphsv7nfwsfil5ci2snlm9qsqwswnzn68pa3440zqiji";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers deepseq directory filepath mtl
          optparse-applicative process tagged tasty temporary-rc
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory filepath process tasty tasty-hunit temporary-rc
        ];
        homepage = "https://github.com/feuerbach/tasty-golden";
@@ -124835,7 +127978,7 @@ self: {
        pname = "tasty-hspec";
        version = "1.1";
        sha256 = "15ly6jf4kgdc15k6b584d99j18xb41alas62gyakw5sf8y0y02i6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hspec hspec-core QuickCheck random tasty tasty-quickcheck
          tasty-smallcheck
        ];
@@ -124852,7 +127995,7 @@ self: {
        pname = "tasty-html";
        version = "0.4.1";
        sha256 = "0a4j8w4gm8wr9pgmkkahadl5k2sd19za9f6x323f01v4ff455hwg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring containers filepath generic-deriving mtl
          stm tagged tasty text transformers
        ];
@@ -124867,7 +128010,7 @@ self: {
        pname = "tasty-hunit";
        version = "0.9.2";
        sha256 = "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf";
-       buildDepends = [ base tasty ];
+       libraryHaskellDepends = [ base tasty ];
        homepage = "http://documentup.com/feuerbach/tasty";
        description = "HUnit support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
@@ -124879,7 +128022,7 @@ self: {
        pname = "tasty-hunit-adapter";
        version = "1.0";
        sha256 = "0626islqqkncdma8790z2z47r8x90y9v7fj0p5nhkw6mpy6p0ifg";
-       buildDepends = [ base HUnit tasty tasty-hunit ];
+       libraryHaskellDepends = [ base HUnit tasty tasty-hunit ];
        jailbreak = true;
        homepage = "https://github.com/jstolarek/tasty-hunit-adapter";
        description = "Use existing HUnit tests with tasty";
@@ -124900,13 +128043,13 @@ self: {
        sha256 = "0zjbs7ax5nrxcg1njnrliavablda5rgjciq2h3nycvic8r1g9p7x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base bytestring cmdargs containers directory either
          haskell-src-exts language-haskell-extract lens mtl parsec
          regex-posix split system-filepath tasty tasty-quickcheck text
          transformers unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers deepseq directory haskell-src-exts lens
          mtl QuickCheck quickcheck-property-comb regex-posix split stm
          stringbuilder system-filepath tasty tasty-quickcheck text
@@ -124926,8 +128069,8 @@ self: {
        pname = "tasty-kat";
        version = "0.0.3";
        sha256 = "14yvlpli6cv6bn3kh8mlfp4x1l6ns4fvmfv6hmj75cvxyzq029d7";
-       buildDepends = [ base bytestring tasty ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring tasty ];
+       testHaskellDepends = [
          base bytestring mtl tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/vincenthz/tasty-kat";
@@ -124942,7 +128085,9 @@ self: {
        pname = "tasty-program";
        version = "1.0.3";
        sha256 = "18q6b8z5hh1jybr9i72ark95hwz8kg6zbh40ghgwsf6n3ijyfn8n";
-       buildDepends = [ base deepseq directory filepath process tasty ];
+       libraryHaskellDepends = [
+         base deepseq directory filepath process tasty
+       ];
        homepage = "https://github.com/jstolarek/tasty-program";
        description = "Use tasty framework to test whether a program executes correctly";
        license = stdenv.lib.licenses.bsd3;
@@ -124956,8 +128101,8 @@ self: {
        pname = "tasty-quickcheck";
        version = "0.8.3.2";
        sha256 = "1q1fghmsjrdl6jkcnajmsvw4d893m6cyhzpai9vvrhxy9vdy0l1v";
-       buildDepends = [ base QuickCheck tagged tasty ];
-       testDepends = [ base pcre-light tasty tasty-hunit ];
+       libraryHaskellDepends = [ base QuickCheck tagged tasty ];
+       testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
        homepage = "http://documentup.com/feuerbach/tasty";
        description = "QuickCheck support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
@@ -124971,7 +128116,7 @@ self: {
        pname = "tasty-rerun";
        version = "1.1.4";
        sha256 = "1c0mbjfgg0s2p1cmlyd8gnmmc6wk5ih5v9jr11bln54myyjywq8m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl optparse-applicative reducers split stm tagged
          tasty transformers
        ];
@@ -124990,12 +128135,12 @@ self: {
        pname = "tasty-silver";
        version = "3.1.7";
        sha256 = "1mplisyhps9n3kw2w3fjanc14cr6vbyr4xdydq76za9dmx07kd3l";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal async base bytestring containers deepseq directory
          filepath mtl optparse-applicative process process-extras regex-tdfa
          stm tagged tasty temporary text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory filepath process tasty tasty-hunit temporary
          transformers
        ];
@@ -125010,7 +128155,7 @@ self: {
        pname = "tasty-smallcheck";
        version = "0.8.0.1";
        sha256 = "0yckfbz8na8ccyw2911i3a4hd3fdncclk3ng5343hs5cylw6y4sm";
-       buildDepends = [ async base smallcheck tagged tasty ];
+       libraryHaskellDepends = [ async base smallcheck tagged tasty ];
        homepage = "http://documentup.com/feuerbach/tasty";
        description = "SmallCheck support for the Tasty test framework";
        license = stdenv.lib.licenses.bsd3;
@@ -125024,7 +128169,7 @@ self: {
        pname = "tasty-th";
        version = "0.1.3";
        sha256 = "1fl5pagm9bdqvp7v54ilkr91m667rxw1jifwfdhrikr938aqrzx3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base language-haskell-extract tasty template-haskell
        ];
        homepage = "http://github.com/bennofs/tasty-th";
@@ -125038,7 +128183,7 @@ self: {
        pname = "tau";
        version = "6.2831";
        sha256 = "10vw3y3vimqpb22amhk7n0d0jni46j60iva1gqa28ky8lhqq8ssz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Tau, the ratio between any circle's circumference and radius";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125052,7 +128197,7 @@ self: {
        pname = "tbox";
        version = "0.1.0";
        sha256 = "0qsc4mdiryrf3pqzzjvx57iz92xagp7692h312q2pm412zg6p1vy";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary cautious-file containers directory filepath
          IfElse monad-loops mtl random safe-failure stm-io-hooks
        ];
@@ -125071,7 +128216,7 @@ self: {
        pname = "tcache-AWS";
        version = "0.0.1";
        sha256 = "18hi8jvc117pxjhpb891hqlsbi4wvmd6nr3vwnqqr7rcw2dsmnwv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aws base bytestring conduit http-conduit network TCache text
        ];
        description = "tcache using Amazon Web Services as default persistence mechanism";
@@ -125088,7 +128233,7 @@ self: {
        sha256 = "0ljfn9dvyncl205mrnpic5j0633gnzka03gjc4dmccsqq0c1wjm7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring tokyocabinet-haskell utf8-string
        ];
        homepage = "http://bitcheese.net/wiki/code/tccli";
@@ -125103,8 +128248,8 @@ self: {
        pname = "tce-conf";
        version = "1.1";
        sha256 = "1c3wr9rab7835dfg9qmxhprb2r21iyig1wkvwl49h7brhmhxzpnh";
-       buildDepends = [ base containers ];
-       testDepends = [ base containers HUnit ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers HUnit ];
        homepage = "http://hub.darcs.net/dino/tce-conf";
        description = "Very simple config file reading";
        license = stdenv.lib.licenses.bsd3;
@@ -125116,7 +128261,7 @@ self: {
        pname = "tconfig";
        version = "0.5.2";
        sha256 = "05cnlbrdddbrdwlm8s7b76ydwrn49vaifdgaklfhv8rzz9dfpvbr";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "Simple text configuration file parser library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125127,7 +128272,7 @@ self: {
        pname = "tcp";
        version = "0.0.2";
        sha256 = "1wqkfnkd2di9a6h0br33fd7jaf1yqpaf7kjnpjwp52l4xv04ajlv";
-       buildDepends = [ base containers old-time ];
+       libraryHaskellDepends = [ base containers old-time ];
        homepage = "http://www.cl.cam.ac.uk/~pes20/Netsem/";
        description = "A purely functional TCP implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -125145,13 +128290,13 @@ self: {
        pname = "tdd-util";
        version = "0.3.0.1";
        sha256 = "1d9avxpj2d90agd2pvc905j7jfa4rssl7bnrp2fmky4hfcbqa8ly";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring HUnit lens MonadCatchIO-transformers parallel-io
          process QuickCheck random system-posix-redirect tagged
          test-framework test-framework-hunit test-framework-quickcheck2 time
          transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit lens MonadCatchIO-transformers parallel-io
          process QuickCheck random string-class system-posix-redirect tagged
          test-framework test-framework-hunit test-framework-quickcheck2 time
@@ -125170,7 +128315,7 @@ self: {
        pname = "tdoc";
        version = "0.4.6";
        sha256 = "0gslj3z3lnh2wl7ljg8rza6kmmgfmgv94hgla75nblirvyka8v48";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring template-haskell transformers xhtml
        ];
        homepage = "https://github.com/np/tdoc";
@@ -125184,7 +128329,7 @@ self: {
        pname = "teams";
        version = "0.0.2.3";
        sha256 = "04jq7qdh0kr55a7a3gkjc8dgn130bp0kqh8qcmf284wz981vj9gd";
-       buildDepends = [ base containers fgl graphviz ];
+       libraryHaskellDepends = [ base containers fgl graphviz ];
        description = "Graphical modeling tools for sequential teams";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125195,10 +128340,10 @@ self: {
      mkDerivation {
        pname = "teeth";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "1hxii574qdxcbh10f4bgwyaxf83inqj9vrcwk7vkffv6pg349xcl";
+       revision = "1";
        editedCabalFile = "84bb818fc4cb06bf91450e31e9a023926449a6157ce1e5de60649cda931db416";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/expipiplus1/teeth";
        description = "Dental data types";
@@ -125213,11 +128358,12 @@ self: {
        pname = "telegram";
        version = "0.1.0.0";
        sha256 = "1ci6606fx5cisb9yrjh0mkd549w2j3h1vzj3zm2zsl9gr7agvh4n";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default http-conduit url utf8-string
        ];
        description = "Telegram API client";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tellbot" = callPackage
@@ -125231,7 +128377,7 @@ self: {
        sha256 = "0mm7yyyxs3dvqsrs1xd4mq7byfn55rwri26k9xq3l4k9v7sxbgx8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bifunctors bytestring containers errors http-conduit mtl
          network regex-posix split tagsoup text time transformers
        ];
@@ -125246,7 +128392,7 @@ self: {
        pname = "template";
        version = "0.2.0.10";
        sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg";
-       buildDepends = [ base mtl text ];
+       libraryHaskellDepends = [ base mtl text ];
        description = "Simple string substitution";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125257,7 +128403,7 @@ self: {
        pname = "template-default";
        version = "0.1.1";
        sha256 = "07b8j11v0247fwaf3mv72m7aaq3crbsyrxmxa352vn9h2g6l1jsd";
-       buildDepends = [ base data-default template-haskell ];
+       libraryHaskellDepends = [ base data-default template-haskell ];
        jailbreak = true;
        homepage = "https://github.com/haskell-pkg-janitors/template-default";
        description = "declaring Default instances just got even easier";
@@ -125271,7 +128417,7 @@ self: {
        pname = "template-haskell";
        version = "2.10.0.0";
        sha256 = "1y0dikbpy98n9g1rwb6swng86cch815x5ipj8kfjgpjgs0c3i2im";
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        description = "Support library for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125282,7 +128428,9 @@ self: {
        pname = "template-haskell-util";
        version = "0.1.1.0";
        sha256 = "032gkb6pgd5l8ih48971ckiy7spvvr6fcmjx4ysiyyaj7hra174f";
-       buildDepends = [ base GenericPretty ghc-prim template-haskell ];
+       libraryHaskellDepends = [
+         base GenericPretty ghc-prim template-haskell
+       ];
        homepage = "https://github.com/HaskellZhangSong/TemplateHaskellUtils";
        description = "Some utilities for template Haskell";
        license = stdenv.lib.licenses.mit;
@@ -125298,11 +128446,11 @@ self: {
        pname = "template-hsml";
        version = "0.2.0.3";
        sha256 = "1lnw1rhxj66zn34p8ca2dx98326l40w8kj6nrxxhff0v30myxa1g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-markup haskell-src-exts haskell-src-meta parsec
          template-haskell
        ];
-       testDepends = [
+       testHaskellDepends = [
          base parsec QuickCheck test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
@@ -125320,7 +128468,7 @@ self: {
        pname = "templatepg";
        version = "0.2.6";
        sha256 = "1i5ais5nlga3qv0w2fg5fdkfxikks9yg6fgwqx7agcrxp4wpqcb7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring haskell-src-meta mtl network old-locale
          parsec regex-compat regex-posix template-haskell time utf8-string
        ];
@@ -125338,8 +128486,8 @@ self: {
        pname = "templater";
        version = "0.0.3.0";
        sha256 = "0j00bb915j5d9a416gjqng08zcqfwbv24k2rqmb0mbmzz768viz4";
-       buildDepends = [ attoparsec base text ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base text ];
+       testHaskellDepends = [
          base hspec hspec-attoparsec HUnit QuickCheck text
        ];
        homepage = "https://github.com/geraud/templater";
@@ -125356,7 +128504,7 @@ self: {
        pname = "tempodb";
        version = "0.2.2.5";
        sha256 = "00z02hl31ad497rvxjxx5khb20ql6irkgpdvsg5m7axq8bi3d5fl";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers HsOpenSSL HTTP
          http-streams io-streams mtl old-locale text time
        ];
@@ -125376,7 +128524,7 @@ self: {
        pname = "temporal-csound";
        version = "0.4.3.1";
        sha256 = "1c7difs3svrq1ka8bdf61vvg9b29baqd086l19a84f0734q5ph19";
-       buildDepends = [
+       libraryHaskellDepends = [
          base csound-catalog csound-expression temporal-media
          temporal-music-notation temporal-music-notation-western
        ];
@@ -125392,7 +128540,7 @@ self: {
        pname = "temporal-media";
        version = "0.6.0";
        sha256 = "0mpi97lqh4mqv6flgcrwzbv8ihlxhxzf5z2xd87wxpzvcglx2n0n";
-       buildDepends = [ base Boolean ];
+       libraryHaskellDepends = [ base Boolean ];
        homepage = "https://github.com/anton-k/temporal-media";
        description = "data types for temporal media";
        license = stdenv.lib.licenses.bsd3;
@@ -125404,7 +128552,9 @@ self: {
        pname = "temporal-music-notation";
        version = "0.4.1";
        sha256 = "09mx6bfz0lxyy7z0srl4372qv42fyymc5pqxkyxj7mhf872y4biv";
-       buildDepends = [ base data-default temporal-media vector ];
+       libraryHaskellDepends = [
+         base data-default temporal-media vector
+       ];
        homepage = "https://github.com/anton-k/temporal-music-notation";
        description = "music notation";
        license = stdenv.lib.licenses.bsd3;
@@ -125418,7 +128568,7 @@ self: {
        pname = "temporal-music-notation-demo";
        version = "0.4.0";
        sha256 = "1jd9yd9ay9xmlmpm4wnkpd0ic69xlg8igqbagrycc6kv4zf1p20z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary data-default HCodecs temporal-music-notation
        ];
        homepage = "https://github.com/anton-k/temporal-music-notation-demo";
@@ -125432,7 +128582,7 @@ self: {
        pname = "temporal-music-notation-western";
        version = "0.4.0";
        sha256 = "012pv4l5r3ijnyid7b8h1lpifjs7cf3k4a13f6773r93qfgvxpkc";
-       buildDepends = [ base temporal-music-notation ];
+       libraryHaskellDepends = [ base temporal-music-notation ];
        homepage = "https://github.com/anton-k/temporal-music-notation-western";
        description = "western music notation";
        license = stdenv.lib.licenses.bsd3;
@@ -125446,7 +128596,7 @@ self: {
        pname = "temporary";
        version = "1.2.0.3";
        sha256 = "0is67bmsjmbbw6wymhis8wyq9gax3sszm573p5719fx2c9z9r24a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory exceptions filepath transformers unix
        ];
        homepage = "http://www.github.com/batterseapower/temporary";
@@ -125462,7 +128612,7 @@ self: {
        pname = "temporary-rc";
        version = "1.2.0.3";
        sha256 = "1nqih0qks439k3pr5kmbbc8rjdw730slrxlflqb27fbxbzb8skqs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory exceptions filepath transformers unix
        ];
        homepage = "http://www.github.com/feuerbach/temporary";
@@ -125478,10 +128628,10 @@ self: {
        pname = "temporary-resourcet";
        version = "0.1.0.0";
        sha256 = "1nxl8ivp5sd250w7pwm4f1kas5g1ikij3z39px717ys1xvk1r81h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory exceptions filepath resourcet transformers unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory resourcet tasty tasty-hunit transformers
        ];
        homepage = "http://www.github.com/ttuegel/temporary-resourcet";
@@ -125499,11 +128649,11 @@ self: {
        sha256 = "0hv5b09vly9zakjfgi4bnjx503ny334dhg13g5ma85rp3dbsjvsn";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base directory executable-path filepath haskeline mtl
          uniplate utf8-string
        ];
-       buildTools = [ happy ];
+       executableToolDepends = [ happy ];
        jailbreak = true;
        description = "Interpreter for the FRP language Tempus";
        license = stdenv.lib.licenses.bsd3;
@@ -125516,8 +128666,8 @@ self: {
        pname = "tensor";
        version = "0.3.0.1";
        sha256 = "03m612xvx3p44za0g291xir89lcgm4pk885lpy3wshp0987ij1nf";
-       buildDepends = [ base ghc-prim random vector ];
-       testDepends = [ base QuickCheck random ];
+       libraryHaskellDepends = [ base ghc-prim random vector ];
+       testHaskellDepends = [ base QuickCheck random ];
        homepage = "http://noaxiom.org/tensor";
        description = "A completely type-safe library for linear algebra";
        license = stdenv.lib.licenses.gpl3;
@@ -125532,11 +128682,11 @@ self: {
        pname = "term-rewriting";
        version = "0.2";
        sha256 = "07axcgr8llrj8icaysi1awq29p8vgpakvv56shvjrcgjf9ar0m11";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint array base containers mtl multiset parsec
          union-find-array
        ];
-       testDepends = [ base containers HUnit QuickCheck ];
+       testHaskellDepends = [ base containers HUnit QuickCheck ];
        jailbreak = true;
        homepage = "http://cl-informatik.uibk.ac.at/software/haskell-rewriting/";
        description = "Term Rewriting Library";
@@ -125552,8 +128702,9 @@ self: {
        sha256 = "0hv72kkpx6narykfbf6m59gq4l8gym6fm52n1zzazac1802zw0dv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/luciferous/termbox-bindings";
        description = "Bindings to the Termbox library";
        license = stdenv.lib.licenses.bsd3;
@@ -125568,8 +128719,10 @@ self: {
        pname = "terminal-progress-bar";
        version = "0.0.1.4";
        sha256 = "0ldvii23ks446xrd27aklh8s8pn1yi3dzhhzl05gipjqbhq3lsx3";
-       buildDepends = [ base base-unicode-symbols stm stm-chans ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base base-unicode-symbols stm stm-chans
+       ];
+       testHaskellDepends = [
          base base-unicode-symbols HUnit test-framework test-framework-hunit
        ];
        homepage = "https://github.com/roelvandijk/terminal-progress-bar";
@@ -125583,7 +128736,7 @@ self: {
        pname = "terminal-size";
        version = "0.3.2";
        sha256 = "0vm6xrm5j60h01lgn7srhsx2698aq6k5jkbc84bi5zh5w63fsdyp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Get terminal window height and width";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125594,7 +128747,7 @@ self: {
        pname = "termination-combinators";
        version = "0.1";
        sha256 = "1k32s5vzkxnsawj8vdscyfc96hk0s97zpj1mgw1hk93hwcrxn9wh";
-       buildDepends = [ base containers contravariant ];
+       libraryHaskellDepends = [ base containers contravariant ];
        jailbreak = true;
        homepage = "http://www.github.com/batterseapower/termination-combinators";
        description = "Termination combinators for forcing non-terminating algorithms to terminate";
@@ -125607,8 +128760,8 @@ self: {
        pname = "terminfo";
        version = "0.4.0.1";
        sha256 = "1qsspg1kqk68ja217fn3anv1j8arr1pwzzb5m74zpxpjaqb02153";
-       buildDepends = [ base ];
-       extraLibraries = [ ncurses ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ ncurses ];
        homepage = "https://github.com/judah/terminfo";
        description = "Haskell bindings to the terminfo library";
        license = stdenv.lib.licenses.bsd3;
@@ -125622,10 +128775,10 @@ self: {
        pname = "terminfo-hs";
        version = "0.1.0.1";
        sha256 = "1bbf37c34l8q12hy9yhw1jcjzcb1g87r850pxhwyzsikwhf75g81";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers directory errors filepath
        ];
-       testDepends = [ base directory errors filepath QuickCheck ];
+       testHaskellDepends = [ base directory errors filepath QuickCheck ];
        description = "A pure-Haskell (no FFI) module for accessing terminfo databases";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125636,8 +128789,8 @@ self: {
        pname = "terrahs";
        version = "0.9";
        sha256 = "0gciz8nvn7x1lclzihvwy8v1c53p6frb1q32ckpmsqw7xiasqlhb";
-       buildDepends = [ base haskell98 old-time ];
-       extraLibraries = [ terralib4c translib ];
+       libraryHaskellDepends = [ base haskell98 old-time ];
+       librarySystemDepends = [ terralib4c translib ];
        jailbreak = true;
        homepage = "http://lucc.ess.inpe.br/doku.php?id=terrahs";
        description = "A Haskell GIS Programming Environment";
@@ -125654,7 +128807,9 @@ self: {
        sha256 = "064s43a7iq2rr643x4ahibgjanyq3v5h6qcgvc68j1dycq56snnl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers mtl process syb transformers ];
+       executableHaskellDepends = [
+         base containers mtl process syb transformers
+       ];
        homepage = "http://mbays.freeshell.org/tersmu";
        description = "A semantic parser for lojban";
        license = stdenv.lib.licenses.gpl3;
@@ -125671,7 +128826,7 @@ self: {
        sha256 = "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers hostname old-locale
          random regex-posix time xml
        ];
@@ -125688,10 +128843,10 @@ self: {
        pname = "test-framework-doctest";
        version = "0.2.1.2";
        sha256 = "01k0kcsbc41zaric5zgnhfnrp9dd19brv4d3p22vly7a7bmn6n0q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base doctest test-framework test-framework-hunit
        ];
-       testDepends = [ base test-framework ];
+       testHaskellDepends = [ base test-framework ];
        jailbreak = true;
        description = "Test.Framework wrapper for DocTest";
        license = stdenv.lib.licenses.bsd3;
@@ -125706,7 +128861,7 @@ self: {
        pname = "test-framework-golden";
        version = "1.1.3.3";
        sha256 = "1sfgr91zn7iwgj1p1s3298mswv29rbxz4x4086r8mav7prd0ww36";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring filepath mtl process temporary test-framework
        ];
        homepage = "https://github.com/feuerbach/test-framework-golden";
@@ -125721,7 +128876,9 @@ self: {
        pname = "test-framework-hunit";
        version = "0.3.0.1";
        sha256 = "1h0h55kf6ff25nbfx1mhliwyknc0glwv3zi78wpzllbjbs7gvyfk";
-       buildDepends = [ base extensible-exceptions HUnit test-framework ];
+       libraryHaskellDepends = [
+         base extensible-exceptions HUnit test-framework
+       ];
        homepage = "https://batterseapower.github.io/test-framework/";
        description = "HUnit support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
@@ -125733,7 +128890,7 @@ self: {
        pname = "test-framework-program";
        version = "1.1";
        sha256 = "10p6xxxbfx3yr71wdbvk7qhm3xkxq3a1dv4hgcirzynsdfk36s3z";
-       buildDepends = [ base directory process test-framework ];
+       libraryHaskellDepends = [ base directory process test-framework ];
        description = "Test framework support for running simple test programs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125746,7 +128903,7 @@ self: {
        pname = "test-framework-quickcheck";
        version = "0.3.0";
        sha256 = "0g8sh3x3mhns03svccgbdbw8crzpzmahp1hr1fs6ag66fqr8p9mv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq extensible-exceptions QuickCheck random test-framework
        ];
        jailbreak = true;
@@ -125763,10 +128920,10 @@ self: {
      mkDerivation {
        pname = "test-framework-quickcheck2";
        version = "0.3.0.3";
-       revision = "1";
        sha256 = "12p1zwrsz35r3j5gzbvixz9z1h5643rhihf5gqznmc991krwd5nc";
+       revision = "1";
        editedCabalFile = "14fdf07c345e9460882b975851739afc2cf62f0c9930c38d0fee5b0943351638";
-       buildDepends = [
+       libraryHaskellDepends = [
          base extensible-exceptions QuickCheck random test-framework
        ];
        homepage = "https://batterseapower.github.io/test-framework/";
@@ -125783,11 +128940,11 @@ self: {
        pname = "test-framework-sandbox";
        version = "0.1.0";
        sha256 = "0bfj0l189dh52dipdnxcqllk2h6g4dwcwcw5pll2my3n7r78pn7v";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base lifted-base mtl temporary test-framework
          test-sandbox transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit test-framework test-sandbox test-sandbox-hunit
        ];
        homepage = "http://gree.github.io/haskell-test-sandbox/";
@@ -125804,8 +128961,8 @@ self: {
        pname = "test-framework-skip";
        version = "1.0";
        sha256 = "1avs36j6a846a3qiy0f23qnld1swgpngidb3098dcib2rbw4p3n9";
-       buildDepends = [ base test-framework ];
-       testDepends = [
+       libraryHaskellDepends = [ base test-framework ];
+       testHaskellDepends = [
          base HUnit QuickCheck smallcheck test-framework
          test-framework-hunit test-framework-quickcheck2
          test-framework-smallcheck
@@ -125821,7 +128978,9 @@ self: {
        pname = "test-framework-smallcheck";
        version = "0.2";
        sha256 = "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0";
-       buildDepends = [ base smallcheck test-framework transformers ];
+       libraryHaskellDepends = [
+         base smallcheck test-framework transformers
+       ];
        homepage = "https://github.com/feuerbach/smallcheck";
        description = "Support for SmallCheck tests in test-framework";
        license = stdenv.lib.licenses.bsd3;
@@ -125833,8 +128992,8 @@ self: {
        pname = "test-framework-testing-feat";
        version = "0.1.0.1";
        sha256 = "0pf07psqc4ihg0wrqqm127hd9qjbllmqw9lzf1ridg6r3xs63994";
-       buildDepends = [ base test-framework testing-feat ];
-       testDepends = [ base test-framework testing-feat ];
+       libraryHaskellDepends = [ base test-framework testing-feat ];
+       testHaskellDepends = [ base test-framework testing-feat ];
        homepage = "http://github.com/jfischoff/test-framework-testing-feat";
        description = "A test framework provider for testing-feat";
        license = stdenv.lib.licenses.bsd3;
@@ -125848,7 +129007,7 @@ self: {
        pname = "test-framework-th";
        version = "0.2.4";
        sha256 = "12lw7yj02jb9s0i7rb98jjam43j2h0gzmnbj9zi933fx7sg0sy4b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-exts language-haskell-extract regex-posix
          template-haskell test-framework
        ];
@@ -125865,7 +129024,7 @@ self: {
        pname = "test-framework-th-prime";
        version = "0.0.8";
        sha256 = "0gb7bpdxzsd8fnh4ck4p1ks7nxrk7fsw97x90d4zjds5hnw3hchr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cpphs haskell-src-exts template-haskell test-framework
        ];
        description = "Template Haskell for test framework";
@@ -125878,8 +129037,8 @@ self: {
        pname = "test-invariant";
        version = "0.4.5.0";
        sha256 = "0ck3kk7pmj1679ddmrysx5j3y27619ar1b2pny45mskz3g6vyvrh";
-       buildDepends = [ base QuickCheck ];
-       testDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       libraryHaskellDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        homepage = "https://github.com/knupfer/test-invariant";
        description = "Provide common invariants to be checked with QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -125891,7 +129050,7 @@ self: {
        pname = "test-pkg";
        version = "0.3.0.0";
        sha256 = "0fncybd3sxrbnrd4l1hri18rhfg9h0fm3k4305iwh4l65fbwg2n8";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Just tests Hackage";
        license = stdenv.lib.licenses.bsd3;
@@ -125909,13 +129068,13 @@ self: {
        pname = "test-sandbox";
        version = "0.1.5";
        sha256 = "1cknqblzf2wqq46casmfq00lx4zh3y9g07bqsbchxbq4xmd000js";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers data-default directory filepath
          lifted-base monad-control monad-loops mtl network process random
          random-shuffle regex-posix temporary transformers transformers-base
          transformers-compat unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers directory hastache heredoc hspec
          hspec-expectations-lifted mtl process QuickCheck regex-posix
          template-haskell text transformers transformers-compat unix
@@ -125938,12 +129097,17 @@ self: {
        sha256 = "1yqh5b3gzmwqf0wj491pmkvbn9jzpg36bh427vkl1w6yj5c4ha7x";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory hastache http-conduit
+         lifted-base network process shelly test-sandbox text unix wai
+         wai-extra warp yaml yesod yesod-core
+       ];
+       executableHaskellDepends = [
          aeson base bytestring containers directory hastache http-conduit
          lifted-base network optparse-applicative process shelly
          test-sandbox text unix wai wai-extra warp yaml yesod yesod-core
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cabal-test-bin hspec hspec-test-sandbox process
          shakespeare test-sandbox text unix
        ];
@@ -125957,7 +129121,7 @@ self: {
        pname = "test-sandbox-hunit";
        version = "0.1.1";
        sha256 = "1pdxwbs3508s9j1409bvpjipbqz8ymch633r6gyrirmr1r1zp3dy";
-       buildDepends = [ base HUnit lifted-base test-sandbox ];
+       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;
@@ -125971,7 +129135,7 @@ self: {
        pname = "test-sandbox-quickcheck";
        version = "0.1.0";
        sha256 = "0gijq6qwcljq2kvh08nffb6d9qblwpj4hw2jlxidvxy1hzbsgiyi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl QuickCheck random test-sandbox transformers
        ];
        homepage = "http://gree.github.io/haskell-test-sandbox/";
@@ -125985,8 +129149,8 @@ self: {
        pname = "test-shouldbe";
        version = "0.2.1.1";
        sha256 = "0wagfhljym2mnwpxld8dcf4qcdbp3d9liyf9mcigd4kiy5sdhfx4";
-       buildDepends = [ base HUnit ];
-       testDepends = [ base hspec hspec-discover silently ];
+       libraryHaskellDepends = [ base HUnit ];
+       testHaskellDepends = [ base hspec hspec-discover silently ];
        jailbreak = true;
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
@@ -126000,8 +129164,12 @@ self: {
        pname = "test-simple";
        version = "0.1.7";
        sha256 = "1p9y15vv23j1qn3shxl2wqb8skh0n53vrb39qv1nvff9bclxldka";
-       buildDepends = [ base mtl QuickCheck state-plus template-haskell ];
-       testDepends = [ base executable-path mtl process QuickCheck ];
+       libraryHaskellDepends = [
+         base mtl QuickCheck state-plus template-haskell
+       ];
+       testHaskellDepends = [
+         base executable-path mtl process QuickCheck
+       ];
        jailbreak = true;
        description = "Simple Perl inspired testing";
        license = stdenv.lib.licenses.bsd3;
@@ -126015,7 +129183,7 @@ self: {
        sha256 = "0lppzyh0qxqry8a2d1yqrin51kizw2hl937pxg2a6pi34grlhdd0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        description = "Small test package";
        license = "unknown";
@@ -126028,10 +129196,12 @@ self: {
      mkDerivation {
        pname = "testing-feat";
        version = "0.4.0.2";
-       revision = "1";
        sha256 = "15gi6w7p4alnih9grklhhr8338y1aal07admbz4n2f724hnhyb2j";
+       revision = "1";
        editedCabalFile = "0168dde1e9ac0e7a1f80a33c12a6c5d2b7c5e59e4dcd060ffb8d82f100c4dd3f";
-       buildDepends = [ base mtl QuickCheck tagshare template-haskell ];
+       libraryHaskellDepends = [
+         base mtl QuickCheck tagshare template-haskell
+       ];
        description = "Functional Enumeration of Algebraic Types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126042,7 +129212,7 @@ self: {
        pname = "testing-type-modifiers";
        version = "0.1.0.1";
        sha256 = "1wh2n95n39ivv6kbqn42vbzrj8zagsmk6f2al2qj40bg5kgdl2q5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Data type modifiers for property based testing";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -126055,7 +129225,7 @@ self: {
        pname = "testloop";
        version = "0.1.1.0";
        sha256 = "1bygfdcnd0y60jhyp34zkss2cxr3s2jq6ysxm0w9c4vhl361ib7z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal directory filepath fsnotify hint mtl system-filepath
          time unix
        ];
@@ -126073,7 +129243,9 @@ self: {
        pname = "testpack";
        version = "2.1.3.0";
        sha256 = "1rq5d64d7j3gpgbfxmfr4xmzizjy0ricw5ghrakv8gzvxmi2bn4p";
-       buildDepends = [ base containers HUnit mtl QuickCheck random ];
+       libraryHaskellDepends = [
+         base containers HUnit mtl QuickCheck random
+       ];
        jailbreak = true;
        homepage = "https://github.com/jgoerzen/testpack";
        description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)";
@@ -126088,7 +129260,7 @@ self: {
        sha256 = "0a0kw5546z5jydk6dq2p16p2kpwv7fnmy1m907m3x6n580i1vh3l";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base filepath gtk ];
+       executableHaskellDepends = [ base filepath gtk ];
        homepage = "http://code.haskell.org/~dons/code/testpattern";
        description = "Display a monitor test pattern";
        license = stdenv.lib.licenses.bsd3;
@@ -126102,7 +129274,9 @@ self: {
        pname = "testrunner";
        version = "0.9.1";
        sha256 = "1887g3wn5mnlbxj4vbzv0zm3gwaj9ycr9sk7hy27qbb2x7c30iaw";
-       buildDepends = [ base HUnit QuickCheck random regex-compat stm ];
+       libraryHaskellDepends = [
+         base HUnit QuickCheck random regex-compat stm
+       ];
        description = "Easy unit test driver framework";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126116,7 +129290,7 @@ self: {
        sha256 = "10wlw1frkaa3j8mb8lxgpvxcx87m8wdpca3mli9c5kirdm51vjgw";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT random ];
+       executableHaskellDepends = [ base GLUT random ];
        homepage = "http://d.hatena.ne.jp/mokehehe/20080921/tetris";
        description = "A 2-D clone of Tetris";
        license = stdenv.lib.licenses.bsd3;
@@ -126131,7 +129305,8 @@ self: {
        sha256 = "1q41kphll7xhbccwyvlsvk5vxisig23ipmcqf7v9qc3rx1hb0p0w";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers deepseq parsec ];
+       libraryHaskellDepends = [ base containers deepseq parsec ];
+       executableHaskellDepends = [ base containers deepseq parsec ];
        jailbreak = true;
        homepage = "http://textmining.lt/tex2txt/";
        description = "LaTeX to plain-text conversion";
@@ -126150,10 +129325,11 @@ self: {
        sha256 = "1wy2rr18wsn9q06arrxibahpsnr8bqrzsimmpgwji6nxpzc95x51";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers mtl network-uri pandoc-types parsec syb xml
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
        ];
-       testDepends = [
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
        ];
@@ -126171,11 +129347,11 @@ self: {
        pname = "texrunner";
        version = "0.0.1.0";
        sha256 = "1p7q9fz6f56wcm9q0xap17xc2r9a01qf8gdlrbdgryv25fp0lhcs";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring directory filepath io-streams mtl
          process temporary
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit lens test-framework test-framework-hunit
        ];
        description = "Functions for running Tex from Haskell";
@@ -126193,10 +129369,10 @@ self: {
        pname = "text";
        version = "1.2.1.3";
        sha256 = "0gzqx5cpkdhshbz9xss51mpyq23pnf8dwjz4h3irbv2ryaa4qdlq";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring deepseq ghc-prim integer-gmp
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base binary bytestring deepseq directory ghc-prim HUnit
          integer-gmp QuickCheck quickcheck-unicode random test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -126214,7 +129390,7 @@ self: {
        pname = "text-and-plots";
        version = "0.2.1.0";
        sha256 = "0fjwjdr6pbqfzlyi75apfclsq07qld4yj4h574pgyc22lnk2z9z8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring containers markdown text
          unordered-containers
        ];
@@ -126229,7 +129405,7 @@ self: {
        pname = "text-binary";
        version = "0.2.1";
        sha256 = "00paqwnngd9l88zhah9wqg4wr41mrs30xm49w8xq337yxcvz48nz";
-       buildDepends = [ base binary text ];
+       libraryHaskellDepends = [ base binary text ];
        homepage = "https://github.com/kawu/text-binary";
        description = "Binary instances for text types";
        license = stdenv.lib.licenses.bsd3;
@@ -126243,7 +129419,7 @@ self: {
        pname = "text-format";
        version = "0.3.1.1";
        sha256 = "02zfgzfjvkaxbma1h2gr95h10c8q9gyaadag41q579j68iv15qbd";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base double-conversion ghc-prim integer-gmp old-locale text
          time transformers
        ];
@@ -126258,7 +129434,7 @@ self: {
        pname = "text-format-simple";
        version = "1.1.0";
        sha256 = "0iqs3v03kirjczlp7jpqdqzrfvqsbm260g110abkbpbxws3szqhk";
-       buildDepends = [ base MissingH ];
+       libraryHaskellDepends = [ base MissingH ];
        description = "Simple text formatting library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126272,13 +129448,13 @@ self: {
        pname = "text-icu";
        version = "0.7.0.1";
        sha256 = "0y3z5jda7v2iyll2148ivxfd2yhp27d3ryxrspp0cdq394klqxp2";
-       buildDepends = [ base bytestring deepseq text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring deepseq text ];
+       librarySystemDepends = [ icu ];
+       testHaskellDepends = [
          array base bytestring deepseq directory ghc-prim HUnit QuickCheck
          random test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
-       extraLibraries = [ icu ];
        homepage = "https://github.com/bos/text-icu";
        description = "Bindings to the ICU library";
        license = stdenv.lib.licenses.bsd3;
@@ -126292,12 +129468,12 @@ self: {
        pname = "text-icu-translit";
        version = "0.1.0.7";
        sha256 = "1qfmkydayqj1knlvfs1l6nq42a4y81k5z2g87lvzafrylyjjd002";
-       buildDepends = [ base text ];
-       testDepends = [
+       libraryHaskellDepends = [ base text ];
+       librarySystemDepends = [ icu ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2 text
          text-icu
        ];
-       extraLibraries = [ icu ];
        description = "ICU transliteration";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) icu;};
@@ -126310,7 +129486,7 @@ self: {
        pname = "text-json-qq";
        version = "0.4.1";
        sha256 = "137m593yz5gl6jj7mi1f9kjsgi1np4n6707aqp94iw0qzxj8hdhg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base haskell-src-meta json json-qq parsec template-haskell
        ];
        homepage = "http://github.com/finnsson/text-json-qq";
@@ -126327,7 +129503,7 @@ self: {
        pname = "text-latin1";
        version = "0.3";
        sha256 = "1cs09qwkcljbnckakzr1wnpclkzjb0in3nnz6fpjyl4mxp5bqaw9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive data-checked hashable text
        ];
        homepage = "https://github.com/mvv/text-latin1";
@@ -126346,16 +129522,16 @@ self: {
        sha256 = "12r0bcj83qfaaj6q1sw21dh3y4c82rxas1s5nzyn650pfnpvv2mq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring containers dlist
          semigroups transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
          base bytestring QuickCheck quickcheck-simple random semigroups
        ];
        description = "Parser and Printer for LDAP text data stream";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-locale-encoding" = callPackage
@@ -126364,7 +129540,7 @@ self: {
        pname = "text-locale-encoding";
        version = "0.1.0.2";
        sha256 = "1ls41s45qwrmmac8k1gryvxbhhczqy2wanwanw48m7xnbv52p9fg";
-       buildDepends = [ base bytestring bytestring-handle text ];
+       libraryHaskellDepends = [ base bytestring bytestring-handle text ];
        homepage = "https://github.com/exbb2/text-locale-encoding";
        description = "Encode and decode Text to/from ByteString using TextEncoding";
        license = stdenv.lib.licenses.bsd3;
@@ -126376,8 +129552,8 @@ self: {
        pname = "text-manipulate";
        version = "0.2.0.1";
        sha256 = "0bwxyjj3ll45srxhsp2ihikgqglvjc6m02ixr8xpvyqwkcfwgsg0";
-       buildDepends = [ base text ];
-       testDepends = [ base tasty tasty-hunit text ];
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base tasty tasty-hunit text ];
        homepage = "https://github.com/brendanhay/text-manipulate";
        description = "Case conversion, word boundary manipulation, and textual subjugation";
        license = "unknown";
@@ -126391,8 +129567,10 @@ self: {
        pname = "text-normal";
        version = "0.2.1.0";
        sha256 = "10cxvn450q2fdjxly72m20x2yikkvwx3dvyqs7b992c2dr1zc1iv";
-       buildDepends = [ base deepseq text text-icu ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       libraryHaskellDepends = [ base deepseq text text-icu ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances
+       ];
        homepage = "https://github.com/joelteon/text-normal.git";
        description = "Unicode-normalized text";
        license = stdenv.lib.licenses.mit;
@@ -126404,11 +129582,11 @@ self: {
      mkDerivation {
        pname = "text-position";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "0cdi5kwpwvzmadhgkgnwax4jhllm6gjrsg1y3f3fp12x28nml1g8";
+       revision = "1";
        editedCabalFile = "45fd633a94e0a13dbaeeb1791725a72d185f54027569e967f8006f07df67d586";
-       buildDepends = [ base regex-applicative ];
-       testDepends = [ base QuickCheck regex-applicative ];
+       libraryHaskellDepends = [ base regex-applicative ];
+       testHaskellDepends = [ base QuickCheck regex-applicative ];
        jailbreak = true;
        homepage = "http://rel4tion.org/projects/text-position/";
        description = "Handling positions in text and position-tagging it";
@@ -126423,10 +129601,10 @@ self: {
        pname = "text-printer";
        version = "0.4";
        sha256 = "0jcixgxln4c12nzmj50g3mmslki6f083xjrm9hr6hqvqzffxny5q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring pretty semigroups text text-latin1
        ];
-       testDepends = [
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "https://github.com/mvv/text-printer";
@@ -126442,8 +129620,10 @@ self: {
        pname = "text-regex-replace";
        version = "0.1.1.0";
        sha256 = "0p8xjw6srlb23giqrb3qay1hd1jq3gd9im0v7fnr8yifc0ri6piz";
-       buildDepends = [ attoparsec base text text-icu ];
-       testDepends = [ base hspec QuickCheck smallcheck text text-icu ];
+       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;
@@ -126455,7 +129635,7 @@ self: {
        pname = "text-register-machine";
        version = "0.4.0";
        sha256 = "0g0iihfin5vjfk69r7jjw4vs3l1k3f0kkg3bbc4xqm274vd72bph";
-       buildDepends = [ base containers mtl vector ];
+       libraryHaskellDepends = [ base containers mtl vector ];
        jailbreak = true;
        homepage = "https://github.com/acfoltzer/text-register-machine";
        description = "A Haskell implementation of the 1# Text Register Machine";
@@ -126469,7 +129649,7 @@ self: {
        pname = "text-render";
        version = "0.1.0.2";
        sha256 = "17fgnddp4cfh9l6vlwyq4fnrws56gxxgdvq06fnvz0x8rd0c72wp";
-       buildDepends = [ base classy-prelude mtl parsec text ];
+       libraryHaskellDepends = [ base classy-prelude mtl parsec text ];
        homepage = "http://github.com/thinkpad20/text-render";
        description = "A type class for rendering objects as text, pretty-printing, etc";
        license = stdenv.lib.licenses.mit;
@@ -126486,12 +129666,12 @@ self: {
        pname = "text-show";
        version = "2";
        sha256 = "152nccaz9m337rrv7i6z1vjj73xdcp410fgxcs8imhr125fs6r2z";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base base-compat bytestring bytestring-builder containers
          generic-deriving ghc-prim integer-gmp nats semigroups tagged
          template-haskell text transformers void
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base base-compat base-orphans bytestring bytestring-builder
          generic-deriving ghc-prim hspec nats QuickCheck
          quickcheck-instances tagged text transformers transformers-compat
@@ -126514,13 +129694,13 @@ self: {
        pname = "text-show-instances";
        version = "2.0.1";
        sha256 = "1k5lwkfg8vrrmhm0xir1shplygvh2xki2dw13z56xrkkm8ygv3cx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          haskeline hoopl hpc old-locale old-time pretty random semigroups
          tagged template-haskell terminfo text text-show time transformers
          transformers-compat unix unordered-containers vector xhtml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          ghc-prim haskeline hoopl hpc hspec old-locale old-time pretty
          QuickCheck quickcheck-instances random semigroups tagged
@@ -126537,11 +129717,11 @@ self: {
      mkDerivation {
        pname = "text-stream-decode";
        version = "0.1.0.5";
-       revision = "1";
        sha256 = "1s2lncs5k8rswg1bpf4vz5p1maj46bsgf7ar4lzcla9bf3f4bppy";
+       revision = "1";
        editedCabalFile = "d4ea8ff401a3ccbd8a6ce2918385bac4859150047ce9b7f752ff5575db71e9fd";
-       buildDepends = [ base bytestring text ];
-       testDepends = [ base bytestring deepseq hspec text ];
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [ base bytestring deepseq hspec text ];
        homepage = "http://github.com/fpco/text-stream-decode";
        description = "Streaming decoding functions for UTF encodings. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -126555,8 +129735,8 @@ self: {
        pname = "text-utf7";
        version = "0.1.0.0";
        sha256 = "0kcbw9gb8mwvc4p10m0g5gplgi38qlnnc0plaw22l1qdkx0k8ilv";
-       buildDepends = [ base bytestring text ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
          base bytestring quickcheck-instances tasty tasty-hunit
          tasty-quickcheck text
        ];
@@ -126573,7 +129753,7 @@ self: {
        pname = "text-xml-generic";
        version = "0.1.1";
        sha256 = "1w3gqv94yj1j71qhs1s6sxnxax8ahxwsz7brv0w79sg3r9akl31h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers haskell98 mtl not-in-base split syb
          template-haskell xml
        ];
@@ -126589,7 +129769,7 @@ self: {
        pname = "text-xml-qq";
        version = "0.1";
        sha256 = "0311in43n89bk1fg4y9qglvbbl47ygvcvr0f7zpr8bpaqbb1ard5";
-       buildDepends = [ base parsec template-haskell xml ];
+       libraryHaskellDepends = [ base parsec template-haskell xml ];
        homepage = "http://www.github.com/finnsson/text-xml-qq";
        description = "Quasiquoter for xml. XML DSL in Haskell.";
        license = stdenv.lib.licenses.bsd3;
@@ -126602,7 +129782,7 @@ self: {
        pname = "text-zipper";
        version = "0.2.1";
        sha256 = "1a4kzn2s0ah1sizbdj6fks8zb4wmsx8cqjml4id9xj94zp4akq2r";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        description = "A text editor zipper library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126615,8 +129795,8 @@ self: {
        pname = "text1";
        version = "0.0.3";
        sha256 = "0l3xh8hv5xwfib63llikhnp4w3jx8nwc2rmj4sy7yd5acxgj39sc";
-       buildDepends = [ base binary lens semigroups text ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary lens semigroups text ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/text1";
@@ -126630,7 +129810,7 @@ self: {
        pname = "textPlot";
        version = "0.2";
        sha256 = "0sy5lf5aa3yl3wy199ifb14cnkq5xghcv8m9ny9vzhyyk00h0j6y";
-       buildDepends = [ array base ];
+       libraryHaskellDepends = [ array base ];
        description = "Plot functions in text";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126644,7 +129824,7 @@ self: {
        sha256 = "1q47s8z6igi21m4gqbyizlgiq1z7frk9pi4jppckxmpcjs5xd0gk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskell98 process ];
+       executableHaskellDepends = [ base haskell98 process ];
        homepage = "https://github.com/spockz/Haskell-Code-Completion-for-TextMate";
        description = "A simple Haskell program to provide tags for Haskell code completion in TextMate";
        license = stdenv.lib.licenses.mit;
@@ -126659,11 +129839,11 @@ self: {
        pname = "textocat-api";
        version = "0.1.0.0";
        sha256 = "0cljy3s13xqdvxffpp74iwamfvkmq7s49vpc8vpxnq2fvh6bmkx9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit http-conduit http-types resourcet
          text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring conduit http-conduit http-types resourcet
          tasty tasty-hunit text transformers
        ];
@@ -126690,7 +129870,7 @@ self: {
        pname = "tf-random";
        version = "0.5";
        sha256 = "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f";
-       buildDepends = [ base primitive random time ];
+       libraryHaskellDepends = [ base primitive random time ];
        description = "High-quality splittable pseudorandom number generator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126701,8 +129881,8 @@ self: {
        pname = "tfp";
        version = "1.0";
        sha256 = "03jf2dk7sgggnr72wk6chxs3l4aycpmnapdjfm5f9i8wr0spga4l";
-       buildDepends = [ base utility-ht ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base utility-ht ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic";
        description = "Type-level integers, booleans, lists using type families";
        license = stdenv.lib.licenses.bsd3;
@@ -126714,7 +129894,7 @@ self: {
        pname = "tfp-th";
        version = "0.8";
        sha256 = "139dcwvik8yfpl3i71ddjml1xn126qrx1mbxa4mcwfm6q81fvkzm";
-       buildDepends = [ base template-haskell tfp ];
+       libraryHaskellDepends = [ base template-haskell tfp ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic";
        description = "Template-Haskell code for tfp";
@@ -126732,11 +129912,14 @@ self: {
        sha256 = "0d95nhz5z0zi665h3npcags71zgprgrh7rq86yzn3wamnavlvswn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory hslogger mtl network
          transformers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base binary bytestring directory hslogger mtl network transformers
+       ];
+       testHaskellDepends = [
          base hslogger mtl network QuickCheck transformers
        ];
        jailbreak = true;
@@ -126751,7 +129934,7 @@ self: {
        pname = "tga";
        version = "0.2";
        sha256 = "0lpc5z575y7cq03ww2knr5qdkfb36qnim5y1gkh552r9k3pfdjhf";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        description = "Reading and writing of tga image files";
        license = stdenv.lib.licenses.bsd3;
@@ -126766,10 +129949,10 @@ self: {
        pname = "th-alpha";
        version = "0.2.0.2";
        sha256 = "1syp28514wwj2c66jcx89zl5ax311jhywqgpcpqlfapfwqphysgk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mmorph mtl template-haskell th-desugar transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base derive tasty tasty-hunit tasty-quickcheck template-haskell
        ];
        homepage = "https://github.com/jkarni/th-alpha";
@@ -126783,7 +129966,7 @@ self: {
        pname = "th-build";
        version = "0.4.0.0";
        sha256 = "0f16cgwkmqhkm5nxyic0f56swzm96yqmagmbh7vjd203mn9zv9z6";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        homepage = "https://github.com/DanielSchuessler/th-build";
        description = "More convenient construction of TH ASTs";
@@ -126800,12 +129983,12 @@ self: {
        pname = "th-context";
        version = "0.22";
        sha256 = "0zzrb5dzxcn2dxhqniv3nx4kasgpx7mck730y9hgjink58wqsdx4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default haskell-src-exts lens mtl
          mtl-unleashed syb template-haskell th-desugar th-orphans
          th-typegraph
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring containers deepseq ghc-prim hspec hspec-core
          lens mtl mtl-unleashed syb template-haskell text th-desugar
          th-orphans th-reify-many th-typegraph
@@ -126813,7 +129996,6 @@ self: {
        homepage = "https://github.com/seereason/th-context";
        description = "Test instance context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-desugar" = callPackage
@@ -126824,10 +130006,10 @@ self: {
        pname = "th-desugar";
        version = "1.5.4";
        sha256 = "1dwp77gys84bb0v2af33knhwnj37rg5r662d9kcvhvqk5z4i6c68";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl syb template-haskell th-lift th-orphans
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec HUnit mtl syb template-haskell th-lift
          th-orphans
        ];
@@ -126842,8 +130024,8 @@ self: {
        pname = "th-expand-syns";
        version = "0.3.0.6";
        sha256 = "03qv93pyqk8all39knsf0mzmbfdck5x61kqnyn8rbisw5c1ymx6j";
-       buildDepends = [ base containers syb template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base containers syb template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        description = "Expands type synonyms in Template Haskell ASTs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126854,7 +130036,7 @@ self: {
        pname = "th-extras";
        version = "0.0.0.2";
        sha256 = "15sqf2jjnqcssq8hp80fk0ysgwqykjjc31gvvmzg4sypskpjs8cl";
-       buildDepends = [ base syb template-haskell ];
+       libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "https://github.com/mokus0/th-extras";
        description = "A grab bag of functions for use with Template Haskell";
        license = stdenv.lib.licenses.publicDomain;
@@ -126866,7 +130048,7 @@ self: {
        pname = "th-fold";
        version = "0.0.0.1";
        sha256 = "10n1aw74xi5gzs1847dhiv6yjxcz99idw91hvf34zhhs8hp8zf2z";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://code.haskell.org/~mokus/th-fold";
        description = "TH fold generator";
        license = stdenv.lib.licenses.publicDomain;
@@ -126878,7 +130060,7 @@ self: {
        pname = "th-inline-io-action";
        version = "0.1.0.0";
        sha256 = "1yvxi3n1nafr37zmj0dd83sf2jq4c0sss34k4q5f64vrai8a6zwg";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/tolysz/inline-io-action";
        description = "Simple inline IO action into compiled code using TH";
        license = stdenv.lib.licenses.bsd3;
@@ -126892,11 +130074,11 @@ self: {
        pname = "th-instance-reification";
        version = "0.1.4";
        sha256 = "0cnq7qxqpc58a59iv8sfqrkhx9wkzpgn9l7r84kh0xa21w16inki";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers list-extras loch-th placeholders template-haskell
          th-expand-syns
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HTF list-extras loch-th placeholders
          template-haskell th-expand-syns
        ];
@@ -126916,11 +130098,11 @@ self: {
        pname = "th-instances";
        version = "0.1.0.14";
        sha256 = "1izamc2j1zjyrvzns7kj1mcma4bbmyd3sagbzxsyi4ja8kszcy0v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base checkers derive mtl QuickCheck template-haskell th-kinds
          th-lift
        ];
-       testDepends = [
+       testHaskellDepends = [
          base checkers DebugTraceHelpers derive HUnit mtl QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 th-kinds th-lift
@@ -126936,7 +130118,7 @@ self: {
        pname = "th-kinds";
        version = "0.1.1";
        sha256 = "0d8n0wnygdyi9qhkr7418f0227r3dcjwvmfhpw0kslryz0vqyf5b";
-       buildDepends = [ base containers mtl template-haskell ];
+       libraryHaskellDepends = [ base containers mtl template-haskell ];
        jailbreak = true;
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -126949,8 +130131,8 @@ self: {
        pname = "th-lift";
        version = "0.7.2";
        sha256 = "0jl2x09mh9frsx5bccw8m4m3h72bncjaix9ylyfpvizisivj8p3m";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/mboes/th-lift";
        description = "Derive Template Haskell's Lift class for datatypes";
        license = stdenv.lib.licenses.bsd3;
@@ -126964,10 +130146,10 @@ self: {
        pname = "th-lift-instances";
        version = "0.1.5";
        sha256 = "1j9j70344mi77923v78v3hfhwn72cpq92i87rqd7alvbhkhcny8z";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers template-haskell text th-lift vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers directory doctest filepath QuickCheck
          template-haskell text vector
        ];
@@ -126985,10 +130167,10 @@ self: {
        pname = "th-orphans";
        version = "0.12.2";
        sha256 = "0435l20vzsr6p4app6riyf242hcqizbypf4f5v17wjy3ihw0jddb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl nats template-haskell th-lift th-reify-many
        ];
-       testDepends = [ base hspec template-haskell ];
+       testHaskellDepends = [ base hspec template-haskell ];
        description = "Orphan instances for TH datatypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127001,16 +130183,15 @@ self: {
        pname = "th-printf";
        version = "0.3.1";
        sha256 = "089grlpavvqv90graa9rdwg9x1ph484g5bj7sfjklqy8mgwwqg7a";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring template-haskell text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec HUnit QuickCheck template-haskell text
        ];
        homepage = "https://github.com/joelteon/th-printf";
        description = "Compile-time printf";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-reify-many" = callPackage
@@ -127021,10 +130202,10 @@ self: {
        pname = "th-reify-many";
        version = "0.1.3";
        sha256 = "00hryljcs434wcv1vaamfdbjk857f46djxv7mlwplkl3zsmfhlfx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl safe template-haskell th-expand-syns
        ];
-       testDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/mgsloan/th-reify-many";
        description = "Recurseively reify template haskell datatype info";
        license = stdenv.lib.licenses.bsd3;
@@ -127036,7 +130217,7 @@ self: {
        pname = "th-sccs";
        version = "0.0.0.20110723";
        sha256 = "0vrjqwdjv2922kqmh57ypbslbv1m829wag78addqsr4vjd9b3zl6";
-       buildDepends = [ base containers template-haskell ];
+       libraryHaskellDepends = [ base containers template-haskell ];
        description = "Binding group analysis in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127051,11 +130232,11 @@ self: {
        pname = "th-typegraph";
        version = "0.27";
        sha256 = "1v7vic9kfig9flcnqcpzazd1s4wgqiz3mj9gcyc1ijkrd4y83cdr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-compat containers data-default haskell-src-exts lens mtl
          mtl-unleashed set-extra syb template-haskell th-desugar th-orphans
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring containers data-default deepseq ghc-prim
          hspec hspec-core lens mtl mtl-unleashed syb template-haskell text
          th-desugar th-orphans th-reify-many
@@ -127076,16 +130257,20 @@ self: {
        sha256 = "1859hbhznmp7x8kbqzrpyhndfy69jg01qrp1vh67557mznari6d8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary bytestring either http-client http-client-tls
          http-types mtl text text-binary time time-locale-compat
          transformers
        ];
-       testDepends = [ base bytestring tasty tasty-hunit text time ];
+       executableHaskellDepends = [
+         base text time time-locale-compat transformers
+       ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit text time
+       ];
        homepage = "http://github.com/pjones/themoviedb";
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "themplate" = callPackage
@@ -127096,12 +130281,12 @@ self: {
      mkDerivation {
        pname = "themplate";
        version = "1.2";
-       revision = "1";
        sha256 = "0ingf6f4d2a93jdcw0lij7l02gr7mfk97svhda94wx0k1lmj2li3";
+       revision = "1";
        editedCabalFile = "9562873914a204ed7daf91844f70592385a93b6c348798dc8772b439436ca109";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base configurator directory either errors filepath
          optparse-applicative text transformers transformers-compat
        ];
@@ -127118,7 +130303,7 @@ self: {
        pname = "theoremquest";
        version = "0.0.0";
        sha256 = "05z0jppjbw70rlyh2qis27xp8vdx9fgn7i22ckxb0m2y75gffq61";
-       buildDepends = [ base HTTP json utf8-string ];
+       libraryHaskellDepends = [ base HTTP json utf8-string ];
        jailbreak = true;
        description = "A common library for TheoremQuest, a theorem proving game";
        license = stdenv.lib.licenses.bsd3;
@@ -127132,7 +130317,7 @@ self: {
        sha256 = "0kdfbz5sa2gcy9znz4c2hnyni01vpabixrclg2gs7awysw8hiy3a";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base HTTP network theoremquest ];
+       executableHaskellDepends = [ base HTTP network theoremquest ];
        jailbreak = true;
        description = "A simple client for the TheoremQuest theorem proving game";
        license = stdenv.lib.licenses.bsd3;
@@ -127146,10 +130331,10 @@ self: {
      mkDerivation {
        pname = "these";
        version = "0.4.2";
-       revision = "1";
        sha256 = "0hs59i07k1lkynvdpymjvl1va2frc3aq6wyrmbi7mz3vmz0bjcp7";
+       revision = "1";
        editedCabalFile = "02eb71fed8c848cc4f94f1181f09a6f9667caac38746f757bd57ca881aa47629";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors containers mtl profunctors semigroupoids semigroups
          transformers vector
        ];
@@ -127165,7 +130350,7 @@ self: {
        pname = "thespian";
        version = "0.999";
        sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://bitbucket.org/alinabi/thespian";
        description = "Lightweight Erlang-style actors for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -127177,7 +130362,7 @@ self: {
        pname = "theta-functions";
        version = "1.0.1";
        sha256 = "0m9k1b75ja5a6vq7jdqzsbqjc4fh1kzy29rzss08ph6700bm6z8f";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/hijarian/theta-functions";
        description = "Theta-functions implemented as trigonometric series";
        license = stdenv.lib.licenses.publicDomain;
@@ -127191,7 +130376,7 @@ self: {
        sha256 = "0ir8z7al3fxjwq5nb05l136k7vp82ag6khcyf9bvjcymlra4cs0m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base pretty ];
+       libraryHaskellDepends = [ base pretty ];
        homepage = "http://web.cecs.pdx.edu/~mpj/thih/";
        description = "Typing Haskell In Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -127208,7 +130393,7 @@ self: {
        sha256 = "1pjz6rnbm1llxgp47fasv40w2vg197z582vf9mm7rhm5qjp25zi0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base edit-distance parseargs phonetic-code sqlite
        ];
        homepage = "http://wiki.cs.pdx.edu/bartforge/thimk";
@@ -127224,10 +130409,10 @@ self: {
      mkDerivation {
        pname = "thorn";
        version = "0.2";
-       revision = "1";
        sha256 = "1krxfsgj4ciifg76khsl4lw1nb40xx4gs07nwd84ail85s394h1h";
+       revision = "1";
        editedCabalFile = "d19e959e95f55075f6f4f0013cbc980e2c351c871e3d9d5bbe2febafb7711b9a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors containers contravariant mtl profunctors random
          template-haskell
        ];
@@ -127243,8 +130428,8 @@ self: {
        pname = "thread-local-storage";
        version = "0.1.0.3";
        sha256 = "0ka6xrxzsw2z95qcc4v2hh4ldb22zkd5s62lns3v1853g4dw7k3l";
-       buildDepends = [ base containers ];
-       testDepends = [ atomic-primops base containers ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ atomic-primops base containers ];
        description = "Several options for thread-local-storage (TLS) in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127257,7 +130442,7 @@ self: {
        sha256 = "18zr8k9sldbkvs5yw0ann92amri6dv2n8wws87lcqxgs52sw6pwi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        homepage = "http://bjaress.blogspot.com/";
        description = "Runs other programs in the manner of a thread pool";
        license = "GPL";
@@ -127269,7 +130454,7 @@ self: {
        pname = "threadmanager";
        version = "0.1.7";
        sha256 = "17s26hlailbr8c9d3dv1pwiy81m3nzr3sw0v9y716rmhldf7k09f";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "(deprecated in favor of 'threads') Simple thread management";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127282,8 +130467,8 @@ self: {
        pname = "threads";
        version = "0.5.1.3";
        sha256 = "04b4hjwv38iv48hdaxrw8ngrid6pgia32h6vci80szgpjxslrg82";
-       buildDepends = [ base stm ];
-       testDepends = [
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [
          base concurrent-extra HUnit stm test-framework test-framework-hunit
        ];
        homepage = "https://github.com/basvandijk/threads";
@@ -127297,7 +130482,7 @@ self: {
        pname = "threads-pool";
        version = "0.1";
        sha256 = "1x1yafxaaf8r02cqipqnm9shj74kja1bqdp0d1cq5kdhcnh22xkz";
-       buildDepends = [ base containers mtl stm ];
+       libraryHaskellDepends = [ base containers mtl stm ];
        description = "A library to operate with pool of haskell's IO threads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127313,8 +130498,11 @@ self: {
        sha256 = "1iipljryqj1g06bqmlyvkxagq7l3rfx7w5d1ci5dw22qsrijnkmn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base retry stm time unordered-containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base retry stm time unordered-containers
+       ];
+       executableHaskellDepends = [ base stm time unordered-containers ];
+       testHaskellDepends = [
          base bytestring QuickCheck retry stm tasty tasty-hunit
          tasty-quickcheck time transformers
        ];
@@ -127332,11 +130520,10 @@ self: {
        sha256 = "1dpxgzm29p07iy17hkfzki4c9ckhwx4acvjhlwxmpmaj2a1m6mnc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary cairo containers deepseq filepath ghc-events glib
          gtk mtl pango text time unix
        ];
-       configureFlags = [ "--ghc-options=-rtsopts" ];
        homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -127350,7 +130537,7 @@ self: {
        pname = "threefish";
        version = "0.2.6";
        sha256 = "1v4vxm2yb7wmzkh9rsf5b6m04wjmy7yr7jq49b5msddjdzhfmf91";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring cereal crypto-api data-default entropy random
          tagged
        ];
@@ -127371,7 +130558,7 @@ self: {
        sha256 = "04qrwvzz705s8aqb8f5vgakh78rv1w64ldv2mvm6fg3llfl5nlfd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson async base bytestring containers data-default deepseq
          filepath hashable network-uri safe snap-core snap-server stm
          template-haskell text transformers unordered-containers vault
@@ -127392,7 +130579,7 @@ self: {
        pname = "thrift";
        version = "0.9.2";
        sha256 = "1c8x66agbbrcsk08i9ha3h9kdq97lnz8sby7xsjx84v5f6kmd7a4";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base binary bytestring containers ghc-prim hashable HTTP
          network network-uri QuickCheck split text unordered-containers
          vector
@@ -127409,7 +130596,7 @@ self: {
        pname = "thrist";
        version = "0.3.0.2";
        sha256 = "01y4s5mpk7d0y878fr40j9k19dryj37am9g86v2s9lr5d0q2nnqp";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://heisenbug.blogspot.com/search/label/thrist";
        description = "Type-threaded list";
        license = stdenv.lib.licenses.bsd3;
@@ -127432,7 +130619,7 @@ self: {
        pname = "through-text";
        version = "0.1.0.0";
        sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk";
-       buildDepends = [ base bytestring case-insensitive text ];
+       libraryHaskellDepends = [ base bytestring case-insensitive text ];
        homepage = "https://www.github.com/bergmark/through-text";
        description = "Convert textual types through Text without needing O(n^2) instances";
        license = stdenv.lib.licenses.bsd3;
@@ -127444,7 +130631,7 @@ self: {
        pname = "thumbnail";
        version = "0.8.0";
        sha256 = "1ms7pzw4lrpkpv6sb0l7jvw5a0n5j7fc9wyi28bq7ik22d4sc8kd";
-       buildDepends = [ base bytestring gd ];
+       libraryHaskellDepends = [ base bytestring gd ];
        homepage = "https://github.com/cutsea110/thumbnail";
        description = "generate thumbnail image";
        license = stdenv.lib.licenses.bsd3;
@@ -127459,11 +130646,11 @@ self: {
        pname = "thumbnail-plus";
        version = "1.0.5";
        sha256 = "0320yfgnsazl7bxm9zf077mi4dgfmlcfnzy1qpdl9w3jl5i7z441";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra data-default directory either
          gd imagesize-conduit resourcet temporary transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit conduit-extra data-default directory hspec resourcet
          transformers
        ];
@@ -127474,7 +130661,7 @@ self: {
 
   "thyme" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , containers, cpphs, deepseq, directory, filepath, mtl, old-locale
+     , containers, deepseq, directory, filepath, mtl, old-locale
      , profunctors, QuickCheck, random, system-posix-redirect, text
      , time, vector, vector-space, vector-th-unbox
      }:
@@ -127482,17 +130669,16 @@ self: {
        pname = "thyme";
        version = "0.3.5.5";
        sha256 = "0v3rbjl92bqggsdra72zdq6rxzb2qf1268424p94225lnwgp1il4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring containers deepseq mtl old-locale
          profunctors QuickCheck random text time vector vector-space
          vector-th-unbox
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring Cabal containers directory filepath mtl
          old-locale profunctors QuickCheck random system-posix-redirect text
          time vector-space
        ];
-       buildTools = [ cpphs ];
        homepage = "https://github.com/liyang/thyme";
        description = "A faster time library";
        license = stdenv.lib.licenses.bsd3;
@@ -127511,11 +130697,13 @@ self: {
        sha256 = "1ns1gsjqq1xcdxqw7xplcax88ydfx8pn6id42n5idmcbgxkjzm9p";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson base blaze-html blaze-markup containers dbus directory gtk
-         gtk-traymanager happstack-server network network-uri process random
-         split text transformers utf8-string webkit xdg-basedir xmonad
-         xmonad-contrib
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup dbus utf8-string xmonad xmonad-contrib
+       ];
+       executableHaskellDepends = [
+         aeson base containers dbus directory gtk gtk-traymanager
+         happstack-server network network-uri process random split text
+         transformers webkit xdg-basedir
        ];
        homepage = "https://github.com/koterpillar/tianbar";
        description = "A desktop bar based on WebKit";
@@ -127531,7 +130719,7 @@ self: {
        sha256 = "0bdls2xz281zdxq5z6vbkahmf6bpiqr0ra823j21783jwiyh8j01";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base glade gtk haskell98 ];
+       executableHaskellDepends = [ base glade gtk haskell98 ];
        homepage = "http://ecks.homeunix.net";
        description = "Useful if reading \"Why FP matters\" by John Hughes";
        license = stdenv.lib.licenses.bsd3;
@@ -127547,11 +130735,11 @@ self: {
        pname = "tickle";
        version = "0.0.4";
        sha256 = "11zm6fwnykp6hlfp9d4xcvcvmczj5x77sfkkx6v1gwz3qfkf2qcj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors bytestring lens mtl semigroupoids semigroups
          transformers validation
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/nicta/tickle";
@@ -127568,7 +130756,7 @@ self: {
        pname = "tidal";
        version = "0.5.3";
        sha256 = "09bq5ng0wvl1rcaaaw0p2b84f9sddpmabaf9c72ifw3z9k35cfyw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring colour containers hashable hmt hosc
          mersenne-random-pure64 mtl parsec process text time transformers
          websockets
@@ -127586,7 +130774,7 @@ self: {
        pname = "tidal-midi";
        version = "0.0.2";
        sha256 = "0q3g4qgzpd8p4z3l1npcs0gy14967l3yn4xqingdbcq22xasim6q";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers hashable hosc PortMidi process tidal
          time
        ];
@@ -127601,7 +130789,7 @@ self: {
        pname = "tidal-vis";
        version = "0.1.8";
        sha256 = "1j9a4sgvji2wc9kq9xf0ja45b9md4v1xlanh6cfqk8p0b2qgmcrw";
-       buildDepends = [ base cairo colour tidal ];
+       libraryHaskellDepends = [ base cairo colour tidal ];
        homepage = "http://yaxu.org/tidal/";
        description = "Visual rendering for Tidal patterns";
        license = stdenv.lib.licenses.gpl3;
@@ -127613,12 +130801,11 @@ self: {
        pname = "tie-knot";
        version = "0.2";
        sha256 = "1iksr5h6cyyl88z35fbaskriv4vhc1696d3i1i3c171c0vq0hwg4";
-       buildDepends = [ base containers mtl recursion-schemes ];
+       libraryHaskellDepends = [ base containers mtl recursion-schemes ];
        jailbreak = true;
        homepage = "https://github.com/ppetr/tie-knot";
        description = "\"Ties the knot\" on a given set of structures that reference each other by keys";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tiempo" = callPackage
@@ -127627,7 +130814,7 @@ self: {
        pname = "tiempo";
        version = "0.0.1.0";
        sha256 = "1gmaiiwcbn3z3zmhgii7q3922c2rwdgkjsc4104gyzjm2m08998r";
-       buildDepends = [ base deepseq time ];
+       libraryHaskellDepends = [ base deepseq time ];
        jailbreak = true;
        homepage = "http://github.com/HaskVan/tiempo";
        description = "Specify time intervals in different units (secs, mins, hours, etc.)";
@@ -127643,7 +130830,9 @@ self: {
        sha256 = "1llmizacz4sg77l5yi3f9m9xkckl1mpjh0ly20cbqf5747q354q1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ array base containers uuagc uuagc-cabal uulib ];
+       executableHaskellDepends = [
+         array base containers uuagc uuagc-cabal uulib
+       ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        description = "Tiger Compiler of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
@@ -127658,7 +130847,7 @@ self: {
        pname = "tightrope";
        version = "0.2.0.0";
        sha256 = "1vvzfsl166qhg0ykq71rzavllid216f6fg5xrk2454z9zskc9n60";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers http-types lens mtl text wai
          wai-extra wreq
        ];
@@ -127675,7 +130864,7 @@ self: {
        pname = "tighttp";
        version = "0.0.0.8";
        sha256 = "0xbipgy79pivy69a84lrriw7ams60r1a2rrkqy6llhsw4v2qk497";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring handle-like monads-tf old-locale papillon
          simple-pipe time
        ];
@@ -127692,7 +130881,7 @@ self: {
        pname = "tilings";
        version = "0.1";
        sha256 = "03a9bc4zbfb3c0dd75rxj7h9pj3sc23l9a9gmabcww5nsx8kpjys";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://gitorious.org/tilings";
        description = "substitution tilings";
        license = stdenv.lib.licenses.bsd3;
@@ -127708,10 +130897,10 @@ self: {
        sha256 = "0x2yc57g9g5ii14l65xkly55rhx44nfjqnbl4bqf286mqsgz191j";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base binary bytestring bzlib filepath haskell98 mtl pretty
        ];
-       buildTools = [ happy ];
+       executableToolDepends = [ happy ];
        homepage = "http://www.timber-lang.org";
        description = "The Timber Compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -127726,8 +130915,8 @@ self: {
        pname = "time";
        version = "1.5.0.1";
        sha256 = "0knixcmdsl2jhjw0x6is02yrw6dhjn4gr3fh06adc003gc3wr894";
-       buildDepends = [ base deepseq ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
          base deepseq QuickCheck test-framework test-framework-quickcheck2
          unix
        ];
@@ -127742,7 +130931,7 @@ self: {
        pname = "time-compat";
        version = "0.1.0.3";
        sha256 = "0zqgzr8yjn36rn6gflwh5s0c92vl44xzxiw0jz8d5h0h8lhi21sr";
-       buildDepends = [ base old-time time ];
+       libraryHaskellDepends = [ base old-time time ];
        homepage = "http://hub.darcs.net/dag/time-compat";
        description = "Compatibility with old-time for the time package";
        license = stdenv.lib.licenses.bsd3;
@@ -127754,7 +130943,7 @@ self: {
        pname = "time-extras";
        version = "1.1.4";
        sha256 = "1k9adm922l431gyk8figx5df1n2xk5awir2fpijnvvyphrwk5p3l";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        jailbreak = true;
        homepage = "http://semantic.org/TimeLib/";
        description = "Data instances for the time package";
@@ -127773,7 +130962,12 @@ self: {
        sha256 = "0y73axrlm6lh8150i4av0jza18zpd5fiiqv9y5m8a7xx11a386bm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson attoparsec base bindings-DSL containers convertible
+         data-default deepseq fclabels mtl old-locale QuickCheck random text
+         time timezone-olson
+       ];
+       executableHaskellDepends = [
          aeson attoparsec base bindings-DSL containers convertible
          data-default deepseq fclabels mtl old-locale QuickCheck random text
          time timezone-olson
@@ -127792,12 +130986,12 @@ self: {
        pname = "time-http";
        version = "0.5";
        sha256 = "0jbiawi14p8cgcxvr5b38kyjdmhq1lagr1dqnlpymlv7d7pcxljd";
-       buildDepends = [
+       libraryHaskellDepends = [
          ascii attempt attoparsec base base-unicode-symbols blaze-builder
          blaze-textual bytestring convertible-text data-default failure
          tagged time
        ];
-       testDepends = [
+       testHaskellDepends = [
          ascii attempt attoparsec base base-unicode-symbols blaze-builder
          blaze-textual bytestring convertible-text data-default failure
          QuickCheck tagged time
@@ -127815,7 +131009,7 @@ self: {
        pname = "time-io-access";
        version = "0.1.0.0";
        sha256 = "0n05lw6zpcfr3lwy2qn7v0j3ym1la9x0mak8szaxc2nbkyc8drrb";
-       buildDepends = [ base base-io-access time ];
+       libraryHaskellDepends = [ base base-io-access time ];
        jailbreak = true;
        description = "IO Access for time";
        license = stdenv.lib.licenses.gpl2;
@@ -127827,7 +131021,7 @@ self: {
        pname = "time-lens";
        version = "0.4.0.1";
        sha256 = "0916qfan93aq91icf87ifvskrq6s6s75rhkajvl8pxp74j28hlwz";
-       buildDepends = [ base data-lens-light time ];
+       libraryHaskellDepends = [ base data-lens-light time ];
        description = "Lens-based interface to Data.Time data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127838,7 +131032,7 @@ self: {
        pname = "time-locale-compat";
        version = "0.1.1.0";
        sha256 = "0mdl1i17hcbka8miq1n6mscrr84vnmx5a3mqgwv2yb28k404v815";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        homepage = "http://twitter.com/khibino/";
        description = "Compatibility of TimeLocale between old-locale and time-1.5";
        license = stdenv.lib.licenses.bsd3;
@@ -127850,7 +131044,7 @@ self: {
        pname = "time-patterns";
        version = "0.1.3.1";
        sha256 = "17gfin2bd6zsk3ij4hdh5xddlki0kb05mq9xkmvly9ka39gsr82n";
-       buildDepends = [ base intervals lens thyme vector-space ];
+       libraryHaskellDepends = [ base intervals lens thyme vector-space ];
        jailbreak = true;
        homepage = "https://bitbucket.org/jfmueller/time-patterns";
        description = "Patterns for recurring events";
@@ -127866,8 +131060,10 @@ self: {
        pname = "time-qq";
        version = "0.0.0.2";
        sha256 = "0zpgs5xmjq4fk5djg438fpyh3582v22rjrpqhdr3qy81gcqbgaz7";
-       buildDepends = [ base template-haskell time time-locale-compat ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [
+         base template-haskell time time-locale-compat
+       ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/christian-marie/time-qq";
        description = "Quasi-quoter for UTCTime times";
        license = stdenv.lib.licenses.bsd3;
@@ -127880,11 +131076,11 @@ self: {
      mkDerivation {
        pname = "time-recurrence";
        version = "0.9.2";
-       revision = "1";
        sha256 = "1arqmkagmswimbh78qfz5bcilk9i14w29j4vf4i89d00vac3vrzm";
+       revision = "1";
        editedCabalFile = "7f1fe44ec61160e3fba86a04942d056ac91faa0002817e107e3d8399b71fe427";
-       buildDepends = [ base data-ordlist mtl time ];
-       testDepends = [
+       libraryHaskellDepends = [ base data-ordlist mtl time ];
+       testHaskellDepends = [
          base data-ordlist HUnit mtl old-locale test-framework
          test-framework-hunit time
        ];
@@ -127902,7 +131098,8 @@ self: {
        sha256 = "1j6xrf45i4japgr35kzqcawlhdn13k3fbsjfmm2j3j92skwra095";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers mtl ];
+       libraryHaskellDepends = [ array base containers mtl ];
+       executableHaskellDepends = [ base ];
        description = "Time series analysis";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127914,7 +131111,7 @@ self: {
        pname = "time-units";
        version = "1.0.0";
        sha256 = "16g0i6r6vj9w4lbn12jqrhgbbjjca8wbzq6546dz08aks1yrk0g1";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/acw/time-units";
        description = "A basic library for defining units of time as types";
        license = stdenv.lib.licenses.bsd3;
@@ -127928,7 +131125,7 @@ self: {
        sha256 = "12hnvhcv18kv1djqn5dqv8i1rrzsxlvnsjyjsy9m1ngmr9nvvfbg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base convertible parsec time ];
+       libraryHaskellDepends = [ base convertible parsec time ];
        jailbreak = true;
        homepage = "http://cielonegro.org/W3CDateTime.html";
        description = "Parse, format and convert W3C Date and Time";
@@ -127944,7 +131141,7 @@ self: {
        sha256 = "05nzfydzn9nmjfmdnpf5jl238kdixbwwqkyrax89i4anmpxv1v9s";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base haskeline uu-parsinglib ];
+       executableHaskellDepends = [ base haskeline uu-parsinglib ];
        homepage = "https://github.com/chriseidhof/TimeCalc";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127958,7 +131155,7 @@ self: {
        sha256 = "0zmrysri8hxxvr4dffmawv5cb8lyz92w8ixfj5kah8ya2p422yc0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process time ];
+       executableHaskellDepends = [ base process time ];
        jailbreak = true;
        description = "Time commands by lines of STDOUT";
        license = stdenv.lib.licenses.gpl2;
@@ -127970,7 +131167,7 @@ self: {
        pname = "timeit";
        version = "1.0.0.0";
        sha256 = "0dkjbp636dp882zlbwvvz76k4g7ga28wksd41w6mh0k8z45xjj5x";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Time a computation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127983,8 +131180,8 @@ self: {
        pname = "timeout";
        version = "0.1.1";
        sha256 = "1jddkkmc3d8ysh8rnlpkzvlg67if8c71wqmjdsysddpwwm3wbgjn";
-       buildDepends = [ base exceptions mtl time ];
-       testDepends = [
+       libraryHaskellDepends = [ base exceptions mtl time ];
+       testHaskellDepends = [
          base exceptions mtl QuickCheck tasty tasty-quickcheck time
        ];
        homepage = "https://github.com/lambda-llama/timeout";
@@ -128001,7 +131198,7 @@ self: {
        pname = "timeout-control";
        version = "0.1";
        sha256 = "1w2y39699zsxv43w53q8qbi1wfvg14kqvxqfp92pisvxnrwpcisp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base ghc-prim lifted-base monad-control mtl transformers-base
        ];
        jailbreak = true;
@@ -128017,7 +131214,7 @@ self: {
        pname = "timeout-with-results";
        version = "0.2";
        sha256 = "1y5mc1awahcp9xpmmwqc74cfn7g0zm1cyxi396xirll8nk335nd0";
-       buildDepends = [ base deepseq mtl parallel ];
+       libraryHaskellDepends = [ base deepseq mtl parallel ];
        homepage = "https://github.com/ppetr/timeout-with-results";
        description = "Runs a time-limited computation alowing it to return intermediate results";
        license = "LGPL";
@@ -128031,7 +131228,7 @@ self: {
        pname = "timeparsers";
        version = "0.3.2";
        sha256 = "1dicp58f2amn5rgmnlfjpv4aj7ak6jrdlba2marglddvj4ycq1h7";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers convertible mtl time
        ];
        jailbreak = true;
@@ -128051,7 +131248,7 @@ self: {
        sha256 = "01px3hyl5hb114jibjr3p6pda6ppvxv2alk31wwc82dywnjp1srx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring bytestring-lexing cairo Chart Chart-cairo colour
          containers data-default lens regex-tdfa strptime template-haskell
          time transformers vcs-revision
@@ -128071,14 +131268,15 @@ self: {
        pname = "timerep";
        version = "2.0.0.1";
        sha256 = "0rk3svwx7axp77v92j1gpmnni0jlniw3sz55q5hpa6k43d2jr4b8";
-       buildDepends = [ attoparsec base monoid-subclasses text time ];
-       testDepends = [
+       libraryHaskellDepends = [
+         attoparsec base monoid-subclasses text time
+       ];
+       testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck text time
        ];
        homepage = "https://github.com/HugoDaniel/timerep";
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timers" = callPackage
@@ -128089,7 +131287,7 @@ self: {
        pname = "timers";
        version = "0.2.0.3";
        sha256 = "0q4w41jdhf5ildcdl94lgfn06fg275hf04dpah3l6vva24d8alj5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lifted-base monad-control suspend transformers-base
        ];
        description = "Simple package that implements timers";
@@ -128102,7 +131300,7 @@ self: {
        pname = "timers-updatable";
        version = "0.2.0.2";
        sha256 = "1naw59xvbfhgz49qhvgzng4xjf4fzi59gl996pcp5l6s2sbpx4mw";
-       buildDepends = [ base stm ];
+       libraryHaskellDepends = [ base stm ];
        homepage = "http://github.com/paolino/timers-updatable";
        description = "timers which are updatable in the remaining time";
        license = stdenv.lib.licenses.bsd3;
@@ -128118,7 +131316,7 @@ self: {
        sha256 = "1vn947bbfh7awmz2rxzn2rya439ljjm83rggp6g9v178hxff5aim";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring old-locale process split time transformers
        ];
        homepage = "https://github.com/Peaker/timestamp-subprocess-lines";
@@ -128135,11 +131333,10 @@ self: {
        sha256 = "1qpzk3047ky0lx5riivv9fa418qhwsa5iyy1fb9l7az6ri094qys";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base old-locale time ];
+       executableHaskellDepends = [ base old-locale time ];
        homepage = "https://github.com/kisom/timestamper";
        description = "Read standard input and prepend each line with a timestamp";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timezone-olson" = callPackage
@@ -128149,10 +131346,10 @@ self: {
      mkDerivation {
        pname = "timezone-olson";
        version = "0.1.7";
-       revision = "1";
        sha256 = "1am6vqq3zxrnb444waqfajk3s1wpynw9fszqnk9ww7akf2v5abr3";
+       revision = "1";
        editedCabalFile = "cdd67661d2460ceb1720bcbb194726a57c21b113b9383cd1f1dca91e8e71d652";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring extensible-exceptions time timezone-series
        ];
        homepage = "http://projects.haskell.org/time-ng/";
@@ -128168,7 +131365,7 @@ self: {
        pname = "timezone-olson-th";
        version = "0.1.0.1";
        sha256 = "1xqy4bbkwn03ynvk8dhcmrp37rj1swaskh2si9adb9d5prcibsv1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base template-haskell time timezone-olson timezone-series
        ];
        homepage = "http://github.com/jonpetterbergman/timezone-olson-th";
@@ -128182,7 +131379,7 @@ self: {
        pname = "timezone-series";
        version = "0.1.5.1";
        sha256 = "0mks5s5wdw8fi5hjhf6zbs3pfgy4gsysd1369s41kw4h7aidsi6j";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        homepage = "http://projects.haskell.org/time-ng/";
        description = "Enhanced timezone handling for Data.Time";
        license = stdenv.lib.licenses.bsd3;
@@ -128194,7 +131391,7 @@ self: {
        pname = "timing-convenience";
        version = "0.1";
        sha256 = "078p6gzzb7f9g68lm3q5806azhrs6li35ras9jnb9gs2r6i0w83j";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        description = "Convenient functions for getting times";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128207,7 +131404,9 @@ self: {
        pname = "tinyMesh";
        version = "0.1.0.0";
        sha256 = "19jpwnk7hmi0mg46nqhyiipz085dkakqwgh17lv9ccvvcirpclm3";
-       buildDepends = [ attoparsec base bytestring hex serialport unix ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring hex serialport unix
+       ];
        jailbreak = true;
        homepage = "http://github.com/mgajda/tinyMesh";
        description = "TinyMesh - communicating with auto-meshing sensor network";
@@ -128221,10 +131420,10 @@ self: {
      mkDerivation {
        pname = "tinylog";
        version = "0.12.1";
-       revision = "1";
        sha256 = "1hh70788d0rd35raybix383s6bb3mnibmmpdxwbqybv2dgmm4jq9";
+       revision = "1";
        editedCabalFile = "b0e1cd3e83f3745355d1183935660d4b02ed152083da7af0ea4f386e155db04d";
-       buildDepends = [
+       libraryHaskellDepends = [
          auto-update base bytestring containers double-conversion
          fast-logger text transformers unix-time
        ];
@@ -128239,8 +131438,8 @@ self: {
        pname = "tinytemplate";
        version = "0.1.1.0";
        sha256 = "19i5vs2kb24hahwahfvn6bldzpcw68lpjlw37yvf2n8s5sq1fibc";
-       buildDepends = [ base text ];
-       testDepends = [ base mtl QuickCheck text ];
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [ base mtl QuickCheck text ];
        jailbreak = true;
        homepage = "http://github.com/dicomgrid/tinytemplate";
        description = "A tiny text templating library";
@@ -128258,10 +131457,11 @@ self: {
        sha256 = "0za8ls980f98qj3k6pgmzaidmnrlk0nzg1r7skif6jmhh1snqc5h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath geniplate-mirror ghc
-         ghc-paths mtl pretty pretty-show QuickCheck split tip-lib
+         ghc-paths mtl pretty QuickCheck split tip-lib
        ];
+       executableHaskellDepends = [ base pretty pretty-show tip-lib ];
        homepage = "http://tip-org.github.io";
        description = "Convert from Haskell to Tip";
        license = stdenv.lib.licenses.bsd3;
@@ -128277,11 +131477,14 @@ self: {
        sha256 = "01x8hpijgx3fd0svp0di02470xnhq1gaa6k2fxjph9g5rzmx076b";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers geniplate-mirror mtl optparse-applicative
-         pretty pretty-show split
+         pretty split
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         base optparse-applicative pretty pretty-show
        ];
-       buildTools = [ alex happy ];
        homepage = "http://tip-org.github.io";
        description = "tons of inductive problems - support library and tools";
        license = stdenv.lib.licenses.bsd3;
@@ -128295,8 +131498,8 @@ self: {
        pname = "titlecase";
        version = "0.1.0.1";
        sha256 = "0qwlcfr7fb5nr9vmfjfdlm3bz65jil8xnxmd54zksp1z3sxz5fhf";
-       buildDepends = [ base blaze-markup semigroups text ];
-       testDepends = [
+       libraryHaskellDepends = [ base blaze-markup semigroups text ];
+       testHaskellDepends = [
          base semigroups tasty tasty-hunit tasty-quickcheck text
        ];
        homepage = "https://github.com/nkaretnikov/titlecase";
@@ -128314,8 +131517,10 @@ self: {
        sha256 = "1svsdjb1ac5mb9zcx3wqmxdjfmf99ph94v616scya5f7lqkjcfgp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base mtl parsec pretty utf8-string vty ];
-       testDepends = [ HUnit test-framework test-framework-hunit ];
+       executableHaskellDepends = [
+         base mtl parsec pretty utf8-string vty
+       ];
+       testHaskellDepends = [ HUnit test-framework test-framework-hunit ];
        homepage = "http://patch-tag.com/r/nonowarn/tkhs/snapshot/current/content/pretty/README";
        description = "Simple Presentation Utility";
        license = stdenv.lib.licenses.bsd3;
@@ -128336,7 +131541,7 @@ self: {
        sha256 = "1xyy1aagbjyjs9d52jmf7xch0831v7hvsb0mfrxpahvqsdac6h7a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring cmdargs conduit
          conduit-extra containers data-default directory exceptions filepath
          http-types mtl resourcet rosezipper shakespeare stm
@@ -128359,7 +131564,7 @@ self: {
        pname = "tld";
        version = "0.1.0.1";
        sha256 = "1lda1h8ibkmnhxhnkfd1kj6aybk5w4s3hzhh379zrqbckdl0vfxb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers network-uri template-haskell text
        ];
        jailbreak = true;
@@ -128377,12 +131582,12 @@ self: {
        pname = "tls";
        version = "1.3.1";
        sha256 = "1l6maasf4pr70cxasn6bwcy2aydlmiadmd28ymz0fp8ifw388zvl";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types async base byteable bytestring cereal
          cryptonite data-default-class memory mtl network transformers x509
          x509-store x509-validation
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring cereal cryptonite data-default-class hourglass mtl
          QuickCheck tasty tasty-quickcheck x509 x509-validation
        ];
@@ -128401,7 +131606,7 @@ self: {
        sha256 = "06hvnyg89n4zplw2p4rnqwyyqc5r204pfdmpvim8y119pllg3mij";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cryptonite data-default-class network pem time tls
          x509 x509-system x509-validation
        ];
@@ -128421,7 +131626,7 @@ self: {
        sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring certificate cipher-aes cipher-rc4 crypto-pubkey
          crypto-random cryptohash mtl network pem time tls vector
        ];
@@ -128440,7 +131645,9 @@ self: {
        sha256 = "101q4f51am8722b0b2d9hk84iqfg1z1shzrbikya63jpf3s6jrvg";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring directory template text ];
+       executableHaskellDepends = [
+         base bytestring directory template text
+       ];
        homepage = "https://www.github.com/michelk/tmpl";
        description = "simple executable for templating";
        license = stdenv.lib.licenses.gpl3;
@@ -128456,7 +131663,7 @@ self: {
        sha256 = "07jhbg8b33h9b0x94di5x8dskm4mq6r7mkjcx6zzcvr26ymmyrmy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers directory process safe text time yaml
        ];
        jailbreak = true;
@@ -128470,7 +131677,7 @@ self: {
        pname = "tnet";
        version = "0.0.1";
        sha256 = "1hxka8jfybq72isicvav81f4l9hjxhmzx4i4znkqbwzkarg2gsw9";
-       buildDepends = [ attoparsec base bytestring utf8-string ];
+       libraryHaskellDepends = [ attoparsec base bytestring utf8-string ];
        description = "Library for encoding/decoding TNET strings for PGI";
        license = "unknown";
      }) {};
@@ -128482,7 +131689,9 @@ self: {
        pname = "to-haskell";
        version = "0.3.0";
        sha256 = "0glf7m0r9gpab2pg1bq9qa37mrzpjwvqr3xsws6w53qqlcaw54qk";
-       buildDepends = [ base containers haskell-src-exts transformers ];
+       libraryHaskellDepends = [
+         base containers haskell-src-exts transformers
+       ];
        homepage = "https://github.com/conal/to-haskell";
        description = "A type class and some utilities for generating Haskell code";
        license = stdenv.lib.licenses.bsd3;
@@ -128495,7 +131704,7 @@ self: {
        pname = "to-string-class";
        version = "0.1.2";
        sha256 = "0l2hj0cbc0dhd7m5bn6xqgzkdf2z4knirmv8c65hsjig9mpsvsxf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Converting string-like types to Strings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128507,7 +131716,7 @@ self: {
        pname = "to-string-instances";
        version = "0.2";
        sha256 = "1h5aq3shagzgh1j8sbslvi2rrkqv1djm595d522ci8hpj6h8vxl9";
-       buildDepends = [ to-string-class ];
+       libraryHaskellDepends = [ to-string-class ];
        description = "Instances for the ToString class";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128524,7 +131733,12 @@ self: {
        sha256 = "1wgnxg9kndijm8faxsy48qznjzfcwqgjxgyff6x9c9h2fayvl719";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         ansi-terminal base base-unicode-symbols containers data-hash dates
+         directory dyre filepath Glob mtl parsec process regex-pcre syb time
+         utf8-string
+       ];
+       executableHaskellDepends = [
          ansi-terminal base base-unicode-symbols containers data-hash dates
          directory dyre filepath Glob mtl parsec process regex-pcre syb time
          utf8-string
@@ -128543,10 +131757,10 @@ self: {
        pname = "tofromxml";
        version = "0.1.0.2";
        sha256 = "0wqdxr6fijbdzq0767cvi7yf07q6dcv1anzmsv7ms2apcyag63qh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers hexpat hexpat-pickle
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring containers filepath hexpat hexpat-pickle
        ];
        description = "Reading and writing Haskell data from and to XML";
@@ -128563,7 +131777,7 @@ self: {
        sha256 = "09j6h4rwb6i87223zhbzclns12iyrbdmv0kawd27any5r2hkz63x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers old-locale strict time transformers utility-ht
        ];
        jailbreak = true;
@@ -128579,8 +131793,8 @@ self: {
        pname = "token-bucket";
        version = "0.1.0.1";
        sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii";
-       buildDepends = [ base ];
-       testDepends = [ base time ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base time ];
        homepage = "https://github.com/hvr/token-bucket";
        description = "Rate limiter using lazy bucket algorithm";
        license = stdenv.lib.licenses.gpl3;
@@ -128592,7 +131806,7 @@ self: {
        pname = "tokenify";
        version = "0.1.2.0";
        sha256 = "1fyf1ym91dbhiw7hybzhllc375v4pizl058qazfdyw6cymqm4rch";
-       buildDepends = [ base containers text ];
+       libraryHaskellDepends = [ base containers text ];
        homepage = "https://github.com/AKST/tokenify";
        description = "A regex lexer";
        license = stdenv.lib.licenses.mit;
@@ -128604,7 +131818,7 @@ self: {
        pname = "tokenize";
        version = "0.3.0";
        sha256 = "1dcimgwy6ik5l6f98b0w6sc7pf06qazckfwf2cbmrd7g0q7lk20f";
-       buildDepends = [ base split text ];
+       libraryHaskellDepends = [ base split text ];
        homepage = "https://bitbucket.org/gchrupala/lingo/overview";
        description = "Simple tokenizer for English text";
        license = stdenv.lib.licenses.bsd3;
@@ -128620,9 +131834,10 @@ self: {
        sha256 = "0y4s68gnp4xw0x22w3kdcr5wnkqygv6ajwkhb8apphja268np98v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring containers criterion filepath gf haskell98 HUnit
-         iconv progression QuickCheck
+       libraryHaskellDepends = [ base containers haskell98 ];
+       executableHaskellDepends = [
+         base bytestring criterion filepath gf HUnit iconv progression
+         QuickCheck
        ];
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128634,8 +131849,8 @@ self: {
        pname = "tokyocabinet-haskell";
        version = "0.0.5";
        sha256 = "1v6s39q8a6cnc0ggpspz9i0xw6aih4ixn9bhn4hwf9kwgcspardg";
-       buildDepends = [ base bytestring mtl ];
-       extraLibraries = [ tokyocabinet ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       librarySystemDepends = [ tokyocabinet ];
        homepage = "http://tom-lpsd.github.com/tokyocabinet-haskell/";
        description = "Haskell binding of Tokyo Cabinet";
        license = stdenv.lib.licenses.bsd3;
@@ -128649,8 +131864,8 @@ self: {
        pname = "tokyotyrant-haskell";
        version = "1.0.1";
        sha256 = "1xz8n3hgkhrdabwc8hsqj3yf5x112palzz192f6pkl07vi8yz1ph";
-       buildDepends = [ base bytestring mtl ];
-       extraLibraries = [ tokyocabinet tokyotyrant ];
+       libraryHaskellDepends = [ base bytestring mtl ];
+       librarySystemDepends = [ tokyocabinet tokyotyrant ];
        homepage = "http://www.polarmobile.com/";
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
@@ -128662,7 +131877,7 @@ self: {
        pname = "tomato-rubato-openal";
        version = "0.1.0.3";
        sha256 = "0dk7s5fng3vybdqgqn9vqg7k6sjw4zgqld51i926lgqnixgpmw8z";
-       buildDepends = [ base OpenAL stm vector ];
+       libraryHaskellDepends = [ base OpenAL stm vector ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/tomato-rubato";
        description = "Easy to use library for audio programming";
@@ -128677,7 +131892,7 @@ self: {
        pname = "toml";
        version = "0.1.3";
        sha256 = "0wby1jas854niwyac95n39liqc874xcd1ahqpw6ksi2nhv2ld6f2";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers old-locale time
        ];
        jailbreak = true;
@@ -128695,10 +131910,10 @@ self: {
        sha256 = "034npn24nk07hkc6wnfqsxn8msqkgfi8zwvj0yb4rmpgmxq73v60";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base Cabal containers deepseq directory filepath QuickCheck
-         random
+       libraryHaskellDepends = [
+         array base containers deepseq directory filepath QuickCheck random
        ];
+       executableHaskellDepends = [ Cabal ];
        homepage = "http://functionalley.eu";
        description = "Utilities used by other packages";
        license = "GPL";
@@ -128714,7 +131929,7 @@ self: {
        sha256 = "06b938i2362c4jcd0923lwrcf6hqgxdscizj91ns51wx73nm8fxi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ALUT array base filepath GLFW-b OpenAL OpenGL parseargs random
        ];
        homepage = "http://home.arcor.de/chr_bauer/topkata.html";
@@ -128729,7 +131944,7 @@ self: {
        pname = "torch";
        version = "0.1";
        sha256 = "1bai1vxd2vfxl9zn37dvrb05yh4knr5gw5syqpi6lxxd3lf0ngzc";
-       buildDepends = [ base mtl parallel QuickCheck ];
+       libraryHaskellDepends = [ base mtl parallel QuickCheck ];
        homepage = "http://patch-tag.com/repo/torch/home";
        description = "Simple unit test library (or framework)";
        license = stdenv.lib.licenses.bsd3;
@@ -128744,7 +131959,7 @@ self: {
        pname = "torrent";
        version = "10000.0.0";
        sha256 = "030ll4m80ljkvq72n1aa8a2ygqa56ykkndzy5g40vh9j9j5vq52r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bencode binary bytestring containers filepath syb
        ];
        description = "BitTorrent file parser and generater";
@@ -128757,7 +131972,7 @@ self: {
        pname = "tostring";
        version = "0.2.1.1";
        sha256 = "0c95a1vjnnn3bwdz8v5hv7q2sbzn23ban3hcwqmwhmzc9ba019zg";
-       buildDepends = [ base case-insensitive text utf8-string ];
+       libraryHaskellDepends = [ base case-insensitive text utf8-string ];
        description = "The ToString class";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128768,7 +131983,7 @@ self: {
        pname = "total";
        version = "1.0.4";
        sha256 = "0zl02pznpgg719d2639491cy4df2amj7rmwfdy9dz9cksm029pga";
-       buildDepends = [ base void ];
+       libraryHaskellDepends = [ base void ];
        description = "Exhaustive pattern matching using lenses, traversals, and prisms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128779,7 +131994,7 @@ self: {
        pname = "total-map";
        version = "0.0.4";
        sha256 = "1gjwviqhxm3zavmb9yd14rv66qhw9cf0r6n8mdg1lkmkqi1ycb98";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://github.com/conal/total-map/";
        description = "Finitely represented /total/ maps";
        license = stdenv.lib.licenses.bsd3;
@@ -128793,7 +132008,7 @@ self: {
        pname = "total-maps";
        version = "1.0.0.2";
        sha256 = "0i5xr0xnqazjk5j9lzhdcxlaarij1jwbfih4plfa3kpqygz5s6ps";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base base-compat bytes containers distributive keys
          linear reflection semigroups vector
        ];
@@ -128810,7 +132025,8 @@ self: {
        sha256 = "0lik2glqynjwcd64bdla2jsfy4yqqk4aap5f0c9zkqv9g916bxgi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs directory process time ];
+       libraryHaskellDepends = [ base directory process time ];
+       executableHaskellDepends = [ base cmdargs ];
        description = "Library (and cli) to execute a procedure on file change";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -128832,7 +132048,7 @@ self: {
        sha256 = "01rhq7mz20bjzqpvwwf7z4v77p9kvwgk4pv7gr6264ha30sygbr8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring bytestring-builder containers
          data-default-class data-interval deepseq exceptions extended-reals
          filepath finite-field ghc-prim hashable heaps intern loop mtl
@@ -128841,7 +132057,12 @@ self: {
          type-level-numbers unbounded-delays unordered-containers
          vector-space
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         array base bytestring containers data-default-class filepath OptDir
+         parse-dimacs parsec process pseudo-boolean random time
+         unbounded-delays vector-space
+       ];
+       testHaskellDepends = [
          array base containers data-interval finite-field HUnit mtl OptDir
          prettyclass QuickCheck random stm tasty tasty-hunit
          tasty-quickcheck tasty-th vector-space
@@ -128849,7 +132070,6 @@ self: {
        jailbreak = true;
        description = "Assorted decision procedures for SAT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tpdb" = callPackage
@@ -128860,15 +132080,14 @@ self: {
        pname = "tpdb";
        version = "1.2.0";
        sha256 = "12l4a6p8jn03q71d3qi2zkv63k53brmha5hm6dwrp0sb8bv3qmb0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers filepath hashable HaXml hxt mtl parsec text time
          wl-pprint-text
        ];
-       testDepends = [ base bytestring HaXml pretty ];
+       testHaskellDepends = [ base bytestring HaXml pretty ];
        homepage = "https://github.com/jwaldmann/haskell-tpdb";
        description = "Data Type for Rewriting Systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trace" = callPackage
@@ -128879,7 +132098,7 @@ self: {
        pname = "trace";
        version = "0.2.0.0";
        sha256 = "14kzdd62gci1f1wskvvwai9wprkn8mq5wsdz4d5mw6kf7dcxbz41";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers deepseq monad-control mtl transformers
          transformers-base
        ];
@@ -128893,7 +132112,7 @@ self: {
        pname = "trace-call";
        version = "0.1";
        sha256 = "1fiz1v9d4ck8na68cywha53vgbgdk6iqad1zv6pj3lq0pwvkx6aw";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        jailbreak = true;
        description = "functions for logging the arguments and results of function calls";
        license = stdenv.lib.licenses.bsd3;
@@ -128905,7 +132124,7 @@ self: {
        pname = "trace-function-call";
        version = "0.1";
        sha256 = "0c5nsq9x59rmdkyvcrr1v94kjya48nhl9pnsad6xdmh77msf33xy";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Easy lightweight tracing of function arguments and results for ad hoc debugging";
        license = stdenv.lib.licenses.bsd3;
@@ -128917,7 +132136,7 @@ self: {
        pname = "traced";
        version = "3000";
        sha256 = "1pniabsbybhjvlq4dmys8sxc1r8rhalsahdr3hbvif287h610hi9";
-       buildDepends = [ base containers mtl pretty ];
+       libraryHaskellDepends = [ base containers mtl pretty ];
        description = "Simple evaluation trace";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128928,8 +132147,8 @@ self: {
        pname = "tracer";
        version = "0.1";
        sha256 = "1rgnls2zry29zrnvxv700bljdf7iqkkyzayr4lan0qvhv1bcs5jm";
-       buildDepends = [ base mtl transformers ];
-       testDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
+       testHaskellDepends = [ base mtl transformers ];
        homepage = "https://github.com/knz/hs-tracer";
        description = "Tracing utilities for Functor/Applicative/Monad types";
        license = stdenv.lib.licenses.bsd3;
@@ -128941,7 +132160,7 @@ self: {
        pname = "tracker";
        version = "0.1";
        sha256 = "1jkcwkkzg3hkvffg6y2vz2c8y0iypij4ngryc4bca9q3g4zvxzs2";
-       buildDepends = [ base containers glib ];
+       libraryHaskellDepends = [ base containers glib ];
        description = "Client library for Tracker metadata database, indexer and search tool";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128958,7 +132177,10 @@ self: {
        sha256 = "1n7vl903p5yg2xcyfxbxj45yd7ayd7p63fr9qfahlb0pgfl32s7h";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring http-enumerator http-types uri
+       ];
+       executableHaskellDepends = [
          aeson attoparsec base bytestring cmdargs containers http-enumerator
          http-types regexpr text unordered-containers uri
        ];
@@ -128975,7 +132197,7 @@ self: {
        pname = "transactional-events";
        version = "0.1.0.0";
        sha256 = "0jb3cf4bn007x3by70piwcvcb216kvav4xzrqr1k5v483jaj2zml";
-       buildDepends = [ base ListZipper MonadPrompt stm ];
+       libraryHaskellDepends = [ base ListZipper MonadPrompt stm ];
        description = "Transactional events, based on Concurrent ML semantics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128991,7 +132213,7 @@ self: {
        sha256 = "1p9nrs7a96n53cmmrv107kvwjm27gj45m9b4vj23dsvk5lsx7wil";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async base containers data-default filepath hashable hint monadplus
          mtl process semigroups
        ];
@@ -129009,9 +132231,11 @@ self: {
        sha256 = "0nmzsd8q01ixfgqfgymbjwa5c8msq7chi16n4dwdf8x68mah7lam";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers criterion mtl multirec parsec QuickCheck regular
-         template-haskell
+       libraryHaskellDepends = [
+         base containers mtl multirec regular template-haskell
+       ];
+       executableHaskellDepends = [
+         base containers criterion mtl multirec parsec QuickCheck
        ];
        description = "Generic representation of tree transformations";
        license = stdenv.lib.licenses.gpl3;
@@ -129023,7 +132247,7 @@ self: {
        pname = "transformers";
        version = "0.4.3.0";
        sha256 = "179sbhvc9dghyw58hz80109pbrzgh7vh437227a51jhmx2bsgl5k";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129036,7 +132260,7 @@ self: {
        pname = "transformers-abort";
        version = "0.5.0.1";
        sha256 = "0s0vvjii3h7vw8kg3xf1ig6fkxdw7z69czwdyg6nvsrcc9kbs9gm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default-class monad-control pointed semigroupoids
          transformers transformers-base
        ];
@@ -129050,10 +132274,12 @@ self: {
      mkDerivation {
        pname = "transformers-base";
        version = "0.4.4";
-       revision = "1";
        sha256 = "11r3slgpgpra6zi2kjg3g60gvv17b1fh6qxipcpk8n86qx7lk8va";
+       revision = "1";
        editedCabalFile = "fb1a305f29cbf6ac182af7e67efaae9fcb9664d8d9606bb8a7f3414ad4c8d7a4";
-       buildDepends = [ base stm transformers transformers-compat ];
+       libraryHaskellDepends = [
+         base stm transformers transformers-compat
+       ];
        homepage = "https://github.com/mvv/transformers-base";
        description = "Lift computations from the bottom of a transformer stack";
        license = stdenv.lib.licenses.bsd3;
@@ -129065,7 +132291,7 @@ self: {
        pname = "transformers-compat";
        version = "0.4.0.4";
        sha256 = "0lmg8ry6bgigb0v2lg0n74lxi8z5m85qq0qi4h1k9llyjb4in8ym";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/ekmett/transformers-compat/";
        description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
@@ -129077,7 +132303,7 @@ self: {
        pname = "transformers-compose";
        version = "0.1";
        sha256 = "0kvhl5s1js6i639hc6c4ib9jmgy4l1503ifs30a9ajrk97nagp6d";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/aristidb/transformers-compose";
        description = "Arrow-like / category-like composition for transformers";
@@ -129093,8 +132319,8 @@ self: {
        pname = "transformers-convert";
        version = "0.2.0.0";
        sha256 = "0nx99jygbg5jlvb1sbgb9kz84af9861nkjdcshvfhlq8w069z737";
-       buildDepends = [ base data-easy either transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base data-easy either transformers ];
+       testHaskellDepends = [
          base data-easy directory either errors haskell-src-exts hlint hspec
          HUnit QuickCheck text transformers unix
        ];
@@ -129111,7 +132337,7 @@ self: {
        pname = "transformers-free";
        version = "1.0.1";
        sha256 = "0fbzkr7ifvqng8wqi3332vwvmx36f8z167angyskfdd0a5rik2z0";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Free monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129122,7 +132348,7 @@ self: {
        pname = "transformers-lift";
        version = "0.1.0.0";
        sha256 = "0fmd6v8a5r1x66v4cyb0adbajddm3mn1k43ryks01x1c3yw0p0sj";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        description = "Ad-hoc type classes for lifting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129133,7 +132359,7 @@ self: {
        pname = "transformers-runnable";
        version = "0.1.0.0";
        sha256 = "0m1vvdfi661mmxm5rghsfnwcjd2r0r7ryc3jk0nwlzs0kaw5xi1s";
-       buildDepends = [ base transformers ];
+       libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "https://github.com/JanBessai/transformers-runnable";
        description = "A unified interface for the run operation of monad transformers";
@@ -129147,7 +132373,7 @@ self: {
        pname = "transformers-supply";
        version = "0.1.0";
        sha256 = "09f9n3cxi3sjmd8yscvcyahvdsqa5db5bckj9ryaflswsdm0ximq";
-       buildDepends = [ base mtl transformers ];
+       libraryHaskellDepends = [ base mtl transformers ];
        description = "Supply applicative, monad, applicative transformer and monad transformer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129160,7 +132386,7 @@ self: {
        sha256 = "0pv81l5q46a4f2dxps7fdzvmnphydgw7xz3xsi5cjad2kw0dsmkm";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base fingertree ];
+       libraryHaskellDepends = [ base fingertree ];
        jailbreak = true;
        description = "Integer sets with a constant time translate operation";
        license = stdenv.lib.licenses.mit;
@@ -129172,7 +132398,7 @@ self: {
        pname = "translate";
        version = "2010.1.24";
        sha256 = "0vcqw0x7c9nb8yigvk35x72rds50kvma02rwkb757y1sk80q0mzf";
-       buildDepends = [ base curl json network utf8-string ];
+       libraryHaskellDepends = [ base curl json network utf8-string ];
        homepage = "http://github.com/nfjinjing/translate";
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
        license = stdenv.lib.licenses.bsd3;
@@ -129185,7 +132411,7 @@ self: {
        pname = "traverse-with-class";
        version = "0.2.0.3";
        sha256 = "0snms19w3n9ni1wmf4ikwpp298nc6qk6phrjxi5g023ihqqdvr6g";
-       buildDepends = [ base template-haskell transformers ];
+       libraryHaskellDepends = [ base template-haskell transformers ];
        description = "Generic applicative traversals";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -129198,7 +132424,7 @@ self: {
        sha256 = "0g7x1jj3x58jgbg6zcakyakc5jskcas03jakj7v5pfwdmk8kbc4m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gtk process ];
+       executableHaskellDepends = [ base gtk process ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/traypoweroff";
        description = "Tray Icon application to PowerOff / Reboot computer";
@@ -129212,7 +132438,7 @@ self: {
        pname = "tree-monad";
        version = "0.3";
        sha256 = "1zs1qgp908d0y7dm9mhzwl529z2aw24zr8balsvn1lzl1aynzslm";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://sebfisch.github.com/tree-monad";
        description = "Non-Determinism Monad for Tree Search";
        license = stdenv.lib.licenses.bsd3;
@@ -129224,7 +132450,7 @@ self: {
        pname = "tree-view";
        version = "0.4";
        sha256 = "0mzywp6nipc6zs98dy4ny2s3r9d745lqpjazfnj5y4hx8swyckgn";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Render trees as foldable HTML and Unicode art";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129237,7 +132463,7 @@ self: {
        pname = "treemap-html";
        version = "0.1";
        sha256 = "0jqjwg3z528z4wchpmi208lazd1nazqdai327lwxvznzjcq1m385";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers filepath ghc html parsec regex-posix
        ];
        jailbreak = true;
@@ -129256,7 +132482,7 @@ self: {
        sha256 = "0a7im8v118plxpi9dcgr1jhdlgj4f2a015dngyzfxqi7ij3cy6bf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers directory filepath ghc parsec regex-posix
          split treemap-html xml
        ];
@@ -129275,8 +132501,11 @@ self: {
        sha256 = "0nz93fn5k5fc9748h60a12j9gsl4ldm11a8y431mrm45jf8hnzq2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers mtl QuickCheck random ];
-       testDepends = [ base containers mtl QuickCheck random ];
+       libraryHaskellDepends = [ base containers mtl QuickCheck random ];
+       executableHaskellDepends = [
+         base containers mtl QuickCheck random
+       ];
+       testHaskellDepends = [ base containers mtl QuickCheck random ];
        homepage = "http://www.haskell.org/haskellwiki/Treeviz";
        description = "Visualization of computation decomposition trees";
        license = stdenv.lib.licenses.bsd3;
@@ -129291,7 +132520,7 @@ self: {
        pname = "tremulous-query";
        version = "1.0.7";
        sha256 = "0vf6fh0p9ng2f0qqac8bqp259hfmv0bg146idm2pv668l1pkr7bx";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq mtl network
        ];
        description = "Library for polling Tremulous servers";
@@ -129318,7 +132547,7 @@ self: {
        pname = "triangulation";
        version = "0.3";
        sha256 = "0lx9y54n6p3xf3z6dzw0b2p87hwb1rrcgzilnl51fwvcs1m0fgdf";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base collada-types haskell98 tuple vector vector-algorithms
        ];
        homepage = "http://www.dinkla.net/";
@@ -129338,16 +132567,16 @@ self: {
      mkDerivation {
        pname = "trifecta";
        version = "1.5.1.3";
-       revision = "1";
        sha256 = "1yd55bfhdn8ckkf2c5084fsnfwhib229xw9bn2a4lwpkzbbpflxw";
+       revision = "1";
        editedCabalFile = "4aef1e889929b131bcfbc3b111cc865b1c31f86be983aee768adbfeadee03f2a";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
          blaze-markup bytestring charset comonad containers deepseq
          fingertree ghc-prim hashable lens mtl parsers reducers semigroups
          transformers unordered-containers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath parsers QuickCheck
        ];
        homepage = "http://github.com/ekmett/trifecta/";
@@ -129363,7 +132592,7 @@ self: {
        sha256 = "1y559q5p0pzlr468224c6m5859z72gg0sk2vrgl82ilwkjn08i9i";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bio bytestring simpleargs ];
+       executableHaskellDepends = [ base bio bytestring simpleargs ];
        jailbreak = true;
        description = "Search for, annotate and trim poly-A tail";
        license = "GPL";
@@ -129376,7 +132605,7 @@ self: {
        pname = "trivia";
        version = "0.0";
        sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78";
-       buildDepends = [ base comonad distributive ];
+       libraryHaskellDepends = [ base comonad distributive ];
        homepage = "https://github.com/fumieval/trivia";
        description = "The trivial monad and comonad";
        license = stdenv.lib.licenses.bsd3;
@@ -129387,10 +132616,10 @@ self: {
      mkDerivation {
        pname = "trivial-constraint";
        version = "0.3.0.0";
-       revision = "1";
        sha256 = "0fl72wai6yj5wflhx3cbvi3ixcfrc73217skncyb9b1ai7vg3x3y";
+       revision = "1";
        editedCabalFile = "c2fb0af78c16b340f5dfeb5bf5935250a7f70b72b9b5c07416aee2c8b9138b4b";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/leftaroundabout/trivial-constraint";
        description = "Constraints that any type, resp. no type fulfills";
        license = stdenv.lib.licenses.gpl3;
@@ -129402,7 +132631,7 @@ self: {
        pname = "tropical";
        version = "0.0.0.2";
        sha256 = "1in9jjfzbqws4bk83082yra2gcb5b095948qyji63ckbz3igp0k2";
-       buildDepends = [ base semiring-simple ];
+       libraryHaskellDepends = [ base semiring-simple ];
        jailbreak = true;
        description = "A library for tropical mathematics";
        license = stdenv.lib.licenses.bsd3;
@@ -129414,8 +132643,8 @@ self: {
        pname = "true-name";
        version = "0.0.0.1";
        sha256 = "1qp70i08hf7w90zyc4kz9hnyx8qaf925sy8x01r1z3dbxd473dgm";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base containers template-haskell time ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base containers template-haskell time ];
        homepage = "https://github.com/liyang/true-name";
        description = "Template Haskell hack to violate another module's abstractions";
        license = stdenv.lib.licenses.bsd3;
@@ -129430,7 +132659,7 @@ self: {
        sha256 = "0q5civsnjwwhdkb16h8jak7prkfwvhds1p3xzzhwqk2p8dxf6jij";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers parseargs WAVE ];
+       executableHaskellDepends = [ base containers parseargs WAVE ];
        homepage = "http://github.com/BartMassey/truelevel";
        description = "Audio file compressor-limiter";
        license = stdenv.lib.licenses.bsd3;
@@ -129447,11 +132676,12 @@ self: {
        sha256 = "0byg9gp6xgdy30mrjdlsijr87d6ivhj35baz5zpjxi6vgn8pa87v";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring directory filemanip hastache http-conduit
          MissingH safe scientific tar text unordered-containers
        ];
-       testDepends = [ base hastache tasty tasty-hunit ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hastache tasty tasty-hunit ];
        homepage = "http://github.com/dbushenko/trurl";
        description = "Haskell template code generator";
        license = stdenv.lib.licenses.bsd3;
@@ -129462,10 +132692,10 @@ self: {
      mkDerivation {
        pname = "tsession";
        version = "0.1";
-       revision = "2";
        sha256 = "1rj11vyd272h66cjx8pq6smcpi65n3vlfv4g7indcnpcz4w5l6rk";
+       revision = "2";
        editedCabalFile = "afd89984a633388a2db5ad107968c92693527eb6f746318c4752993633705e57";
-       buildDepends = [ base containers mtl time transformers ];
+       libraryHaskellDepends = [ base containers mtl time transformers ];
        description = "A Transaction Framework for Web Applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129477,7 +132707,9 @@ self: {
        pname = "tsession-happstack";
        version = "0.1";
        sha256 = "1sv62iqrlvzx95g6nd307y8zknp2h3ir06zc6qw4y221wz21rfyz";
-       buildDepends = [ base happstack-server transformers tsession ];
+       libraryHaskellDepends = [
+         base happstack-server transformers tsession
+       ];
        description = "A Transaction Framework for Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129489,7 +132721,7 @@ self: {
        pname = "tskiplist";
        version = "1.0.0";
        sha256 = "0bayh8fl3wb98mifdiss8crb17jfqxxj0f1va5c2h4l7qwizh85a";
-       buildDepends = [ array base containers random stm ];
+       libraryHaskellDepends = [ array base containers random stm ];
        homepage = "https://github.com/thaldyron/tskiplist";
        description = "A Skip List Implementation in Software Transactional Memory (STM)";
        license = "LGPL";
@@ -129502,7 +132734,7 @@ self: {
        pname = "tslogger";
        version = "0.1.0.0";
        sha256 = "1xybllaxakzlai0ja93fyw8yr0p56g58f5akc5z9pi4w4493c7dl";
-       buildDepends = [ async base containers random ];
+       libraryHaskellDepends = [ async base containers random ];
        jailbreak = true;
        description = "Thread-safe logging";
        license = stdenv.lib.licenses.bsd3;
@@ -129516,7 +132748,7 @@ self: {
        sha256 = "0wrnpmvds2amm85a5j1c1nqffy6vj4y6xq21w5ia1051wrxzrbjk";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gloss stm vector ];
+       executableHaskellDepends = [ base gloss stm vector ];
        jailbreak = true;
        homepage = "https://github.com/davnils/tsp-viz";
        description = "Real time TSP tour visualization";
@@ -129534,7 +132766,10 @@ self: {
        sha256 = "0s5vlpvi1w6q2zxv586plvhs9p6rlc7653x7jzygfir70754n6si";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Decimal parsec pretty process split time
+       ];
+       executableHaskellDepends = [
          base Decimal parsec pretty process random split time
        ];
        jailbreak = true;
@@ -129549,7 +132784,7 @@ self: {
        pname = "tst";
        version = "0.1.1";
        sha256 = "1vr1l4pm02pwr8238qd9j0drkildns8m79qyq0lbzll30gc12vhx";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/bitonic/language-spelling";
        description = "BK-tree implementation";
        license = stdenv.lib.licenses.publicDomain;
@@ -129563,11 +132798,13 @@ self: {
      mkDerivation {
        pname = "ttrie";
        version = "0.1.2";
-       revision = "2";
        sha256 = "09nbba623nxnlg1957sgcrrva3ycwb31asxnxihwjh0wxrqhh1k0";
+       revision = "2";
        editedCabalFile = "f517a1ee4ab2eeefe39ec336a793845f84333835c59c3e90f885dd0711f8fbc0";
-       buildDepends = [ atomic-primops base hashable primitive stm ];
-       testDepends = [
+       libraryHaskellDepends = [
+         atomic-primops base hashable primitive stm
+       ];
+       testHaskellDepends = [
          base containers hashable QuickCheck stm test-framework
          test-framework-quickcheck2
        ];
@@ -129589,7 +132826,7 @@ self: {
        sha256 = "0mypgqgqaf2c74vka1pmqzrvz1kwl8pjm1llh4bflizfzrxq3s9d";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base binary bytestring containers directory executable-path
          filepath hashable haskeline JuicyPixels mtl parsec process random
          template-haskell time vector yaml
@@ -129605,7 +132842,7 @@ self: {
        pname = "tubes";
        version = "0.2.2.3";
        sha256 = "0qmg2w4sjm0q1h6ajkv3i576zsi2ndbacjsn5sibcwjbdpkpwmdr";
-       buildDepends = [ base comonad free mtl transformers ];
+       libraryHaskellDepends = [ base comonad free mtl transformers ];
        homepage = "https://github.com/gatlin/tubes";
        description = "Effectful, iteratee-inspired stream processing based on a free monad";
        license = stdenv.lib.licenses.gpl3;
@@ -129617,7 +132854,7 @@ self: {
        pname = "tuntap";
        version = "0.0.2";
        sha256 = "0q6g2wcjddb9r1l9fxpn2qcssw5gyfwsam15rc3q6xjqbwz7fm41";
-       buildDepends = [ base bytestring unix ];
+       libraryHaskellDepends = [ base bytestring unix ];
        jailbreak = true;
        description = "Interface to TUN/TAP drivers";
        license = stdenv.lib.licenses.bsd3;
@@ -129632,7 +132869,8 @@ self: {
        sha256 = "1kj68g5g9m46dpncbrisl19gah8pzac33iyr09ym1pqk3x6jh9ix";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cpphs haskell-src-exts parsec2 ];
+       libraryHaskellDepends = [ base cpphs ];
+       executableHaskellDepends = [ base haskell-src-exts parsec2 ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Homogeneous tuples";
        license = stdenv.lib.licenses.bsd3;
@@ -129645,7 +132883,7 @@ self: {
        pname = "tuple";
        version = "0.3.0.2";
        sha256 = "094nx29aahyrvbcn7yca9zs2a5rxz1is7510w1q43rpvza7hdjrg";
-       buildDepends = [ base OneTuple ];
+       libraryHaskellDepends = [ base OneTuple ];
        description = "Various functions on tuples";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129656,7 +132894,7 @@ self: {
        pname = "tuple-gen";
        version = "2.0";
        sha256 = "0bgwsxq8wrh76hhbwadv0rag4c7dx3644zrh2aflnsych0rncvd7";
-       buildDepends = [ base combinat ];
+       libraryHaskellDepends = [ base combinat ];
        jailbreak = true;
        description = "Enum instances for tuples where the digits increase with the same speed";
        license = stdenv.lib.licenses.bsd3;
@@ -129669,7 +132907,7 @@ self: {
        pname = "tuple-generic";
        version = "0.5.0.0";
        sha256 = "0cbmiwmwav0g9di1s0sdry9shijqzpb9zaag9dz95w65wgqkfzbw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/tuple-generic";
        description = "Generic operations on tuples";
        license = stdenv.lib.licenses.publicDomain;
@@ -129681,7 +132919,7 @@ self: {
        pname = "tuple-hlist";
        version = "0.2.0.0";
        sha256 = "0z1mmm6gnhv3c4hn60v1yasvr9j5rakvyma4c535s51hk5s7g7bl";
-       buildDepends = [ base HList OneTuple ];
+       libraryHaskellDepends = [ base HList OneTuple ];
        jailbreak = true;
        homepage = "http://github.com/dudebout/tuple-hlist";
        description = "Functions to convert between tuples and HLists";
@@ -129694,12 +132932,11 @@ self: {
        pname = "tuple-lenses";
        version = "0.1.0.2";
        sha256 = "1qq1sla89410wr9pnkmj100izkraad1gr163815p3dvh7qi04c7w";
-       buildDepends = [ base lens template-haskell ];
+       libraryHaskellDepends = [ base lens template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/jfischoff/tuple-lenses";
        description = "Stock FieldN combos and generators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tuple-morph" = callPackage
@@ -129707,10 +132944,10 @@ self: {
      mkDerivation {
        pname = "tuple-morph";
        version = "0.1.0.0";
-       revision = "4";
        sha256 = "1zi6nh1z7z2jz5h0pvdm2czfy1rx7ixnnvp9akcpas19npgyfk94";
+       revision = "4";
        editedCabalFile = "835c4661ff3b962ec5fa6f1899c6cb0d241362f06636478935fd5475c684eada";
-       buildDepends = [ base HList template-haskell ];
+       libraryHaskellDepends = [ base HList template-haskell ];
        description = "Morph between tuples, or convert them from and to HLists";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129722,7 +132959,7 @@ self: {
        pname = "tuple-th";
        version = "0.2.5";
        sha256 = "1mrl4vvxmby7sf1paf7hklzidnr6wq55822i73smqyz0xpf3gsjn";
-       buildDepends = [ base containers template-haskell ];
+       libraryHaskellDepends = [ base containers template-haskell ];
        description = "Generate (non-recursive) utility functions for tuples of statically known size";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129733,7 +132970,7 @@ self: {
        pname = "tupleinstances";
        version = "0.0.1";
        sha256 = "0kcmcg1fxsslpzpg766r9hr8aysg0s5fyang2xc0aa77zi71qyi3";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/diegoeche/tupleinstances";
        description = "Functor, Applicative and Monad for n-ary tuples";
@@ -129747,7 +132984,7 @@ self: {
        pname = "tuples-homogenous-h98";
        version = "0.1.1.0";
        sha256 = "0fhz246wh6x0s0sjkmd3qcylsx2gfrmgmvgb7js2zjg91y7zqnh2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ppetr/tuples-homogenous-h98";
        description = "Wrappers for n-ary tuples with Traversable and Applicative/Monad instances";
        license = stdenv.lib.licenses.bsd3;
@@ -129761,7 +132998,7 @@ self: {
        sha256 = "163fggvjixs6m2rwc3gd3s9703r2mnz3bknii1aagwzvw5kczky3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ ALUT base ];
+       executableHaskellDepends = [ ALUT base ];
        description = "Plays music generated by Turing machines with 5 states and 2 symbols";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129774,8 +133011,9 @@ self: {
        sha256 = "0dk63dknwxi7v67jn9b747mkyiz2af4b76a9q1ynn16xva2qsh93";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers vector ];
-       testDepends = [ base HUnit ];
+       libraryHaskellDepends = [ base containers vector ];
+       executableHaskellDepends = [ base containers vector ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "http://github.com/joom/turkish-deasciifier.hs";
        description = "Haskell port of Deniz Yuret's Turkish deasciifier";
        license = stdenv.lib.licenses.mit;
@@ -129789,7 +133027,7 @@ self: {
        sha256 = "0152xhvm0x1ncjdib0bckhywgpzm4f1qj1ghs0jn84cz562ddwnl";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base containers MonadRandom random ];
+       executableHaskellDepends = [ base containers MonadRandom random ];
        homepage = "http://wiki.github.com/paolino/turni";
        description = "shifts scheduling tool";
        license = stdenv.lib.licenses.bsd3;
@@ -129803,14 +133041,14 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.2.0";
-       sha256 = "0324bh4kb7xqdzvgqr6hbm7cna4a4d6x907l73sx63j87hqiwah4";
-       buildDepends = [
+       version = "1.2.1";
+       sha256 = "01l4gnl5qyvi7kwn0yzhkrs0yawm5ncqbbb150nxm5r3zky8cn4w";
+       libraryHaskellDepends = [
          async base clock directory foldl hostname managed optional-args
          optparse-applicative process system-fileio system-filepath
          temporary text time transformers unix
        ];
-       testDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129821,7 +133059,7 @@ self: {
        pname = "tweak";
        version = "0.1.0.1";
        sha256 = "1l5y94gac9s55wgn6w610pqb63c8l20vmlpsnmgbzw1f9vbnzgiw";
-       buildDepends = [ base containers lens stm transformers ];
+       libraryHaskellDepends = [ base containers lens stm transformers ];
        jailbreak = true;
        homepage = "http://github.com/jfischoff/tweak";
        description = "A library for incremental computing";
@@ -129834,7 +133072,7 @@ self: {
        pname = "twentefp";
        version = "0.4.2";
        sha256 = "1kmf907i6g6lfhw8g403b6701srrd298n4r53dvcqzy72c5qaixl";
-       buildDepends = [ base gloss parsec time ];
+       libraryHaskellDepends = [ base gloss parsec time ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129846,10 +133084,10 @@ self: {
      mkDerivation {
        pname = "twentefp-eventloop-graphics";
        version = "0.1.0.4";
-       revision = "1";
        sha256 = "086vx0849c7kmsz5pa4jwzp24cwaf4482bq37dr7jrqx22hvk4lm";
+       revision = "1";
        editedCabalFile = "2a887ef5e938d11f5944ea59ced4cf4bd22930b452f6e6b884f58031761cf817";
-       buildDepends = [
+       libraryHaskellDepends = [
          base network text twentefp-number twentefp-websockets
        ];
        jailbreak = true;
@@ -129863,7 +133101,7 @@ self: {
        pname = "twentefp-eventloop-trees";
        version = "0.1.1.0";
        sha256 = "1zn3bz2119jcyangs7mi2s9wcjkqgk54vwg6rfcbfg37m1v1ixy4";
-       buildDepends = [ base eventloop ];
+       libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129874,7 +133112,7 @@ self: {
        pname = "twentefp-graphs";
        version = "0.1.0.4";
        sha256 = "0g0py8cb4z9i9pjhka2pyjm8vfai9x3k0vmlb06g157ish97qvir";
-       buildDepends = [ base twentefp-eventloop-graphics ];
+       libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129885,7 +133123,7 @@ self: {
        pname = "twentefp-number";
        version = "0.1.0.2";
        sha256 = "1kh0a6h4syx98ygwidw6cc24ci91v1blshpfcczx96z850x1h6xf";
-       buildDepends = [ base parsec ];
+       libraryHaskellDepends = [ base parsec ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129897,7 +133135,7 @@ self: {
        pname = "twentefp-rosetree";
        version = "0.1.0.1";
        sha256 = "1dy4hmwciaglz2kfdk9fxf6hik7pgr4a4xj9y9l7s7p4k35r5bd7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base twentefp-eventloop-graphics twentefp-number
        ];
        jailbreak = true;
@@ -129912,7 +133150,7 @@ self: {
        pname = "twentefp-trees";
        version = "0.1.0.2";
        sha256 = "0mmj96xbqjzm4cylk39pib9jfwh6m350q1cwf6ij8pl0swab3b0g";
-       buildDepends = [ base twentefp-eventloop-graphics ];
+       libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129926,7 +133164,7 @@ self: {
        pname = "twentefp-websockets";
        version = "0.1.0.1";
        sha256 = "08227phlyvvg01n7zqyivx2f3dpfbipxaajqz4fc07zhkpmxy8h4";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive concurrent-extra containers entropy io-streams mtl
          network random SHA text
@@ -129949,13 +133187,19 @@ self: {
        sha256 = "0d06bv26lvr4va431h2146v88bqcxvfr0wp36f7l4a6xqgghf2l1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal authenticate-oauth base bytestring case-insensitive
          conduit containers data-default http-conduit lens monad-control
          monad-logger network resourcet text transformers transformers-base
          twitter-conduit
        ];
-       testDepends = [ base hspec QuickCheck ];
+       executableHaskellDepends = [
+         ansi-terminal authenticate-oauth base bytestring case-insensitive
+         conduit containers data-default http-conduit lens monad-control
+         monad-logger network resourcet text transformers transformers-base
+         twitter-conduit
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/suzuki-shin/twhs";
        description = "CLI twitter client";
@@ -129974,7 +133218,7 @@ self: {
        sha256 = "162n5w4z3a1qyasd39q7751z872v31njzyhrnjfjxhsni3kif8b1";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base binary bytestring ConfigFile curl directory hoauth HSH
          hslogger MissingH mtl network old-locale parsec regex-posix text
          time unix utf8-string
@@ -129992,7 +133236,7 @@ self: {
        pname = "twilight-stm";
        version = "1.2";
        sha256 = "1hp9mkfasjyh1ji6gfmdpmx3nm9g22ag3y47nva7i30bjrs65cdr";
-       buildDepends = [ base containers haskell98 mtl ];
+       libraryHaskellDepends = [ base containers haskell98 mtl ];
        homepage = "http://proglang.informatik.uni-freiburg.de/projects/twilight/";
        description = "STM library with safe irrevocable I/O and inconsistency repair";
        license = "LGPL";
@@ -130009,12 +133253,12 @@ self: {
        pname = "twilio";
        version = "0.1.2.0";
        sha256 = "05qhg9djp71xdwzb88xdnrg3zjbd6p8xb4gwzp0l6m3gc9wi7nvp";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bifunctors bytestring containers errors exceptions free
          http-client http-client-tls http-types mtl network-uri old-locale
          text time transformers unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring Cabal http-client http-client-tls network-uri
          text transformers
        ];
@@ -130034,7 +133278,7 @@ self: {
        pname = "twill";
        version = "0.1.0.3";
        sha256 = "0wkcxjfpd5fz72hwg8spxjqk8b6axm51zppld00q9f3dzagsbwx6";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring cryptohash data-default datetime errors old-locale
          QuickCheck text time
@@ -130051,8 +133295,8 @@ self: {
        pname = "twiml";
        version = "0.1.0.0";
        sha256 = "0ipc8i1hbsjdz6rp7ks25w0zbrcv4byp0791aw9rrdpyqzdir0zx";
-       buildDepends = [ base network xml ];
-       testDepends = [ base Cabal lens ];
+       libraryHaskellDepends = [ base network xml ];
+       testHaskellDepends = [ base Cabal lens ];
        jailbreak = true;
        homepage = "https://github.com/markandrus/twiml-haskell";
        description = "TwiML library for Haskell";
@@ -130068,7 +133312,7 @@ self: {
        pname = "twine";
        version = "0.1.2";
        sha256 = "0q4dsh6x1w1indsx070rqayvjlzdk2nznvh0cjxd5f3jn5ggwwb1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers convertible filepath mtl parsec
        ];
        homepage = "http://twine.james-sanders.com";
@@ -130085,7 +133329,7 @@ self: {
        pname = "twisty";
        version = "0.1.0";
        sha256 = "02w8763m6gm9wj035s62ydg63iv7wa2cbjq2g1jd283vf2djsjyj";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers data-memocombinators MonadRandom parallel
        ];
        jailbreak = true;
@@ -130103,11 +133347,11 @@ self: {
        pname = "twitch";
        version = "0.1.6.1";
        sha256 = "0hvwcnkjma3ib00qa7ymiyrvspa7ixxp0w3wgs9zjrs49j36dmak";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default directory fsnotify Glob optparse-applicative
          system-fileio system-filepath time transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base data-default directory fsnotify Glob hspec
          optparse-applicative QuickCheck system-fileio system-filepath time
          transformers
@@ -130128,7 +133372,7 @@ self: {
        sha256 = "12q5w9wfnrzh2gjmq66qhwy6i6wixfb805jg2cbphxrjjnc2v9gx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base curl directory filepath json mtl old-locale readline time xml
        ];
        description = "A Haskell-based CLI Twitter client";
@@ -130151,13 +133395,14 @@ self: {
        sha256 = "0rair336wjgg5pd0vh3g3nlc64f5sw2sg60jj2sjaxv296jvr3xx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring conduit
          conduit-extra containers data-default http-client http-conduit
-         http-types lens lens-aeson network-uri resourcet template-haskell
-         text time transformers twitter-types twitter-types-lens
+         http-types lens lens-aeson resourcet template-haskell text time
+         transformers twitter-types twitter-types-lens
        ];
-       testDepends = [
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring
          case-insensitive conduit conduit-extra containers data-default
          directory doctest filepath hlint hspec http-client http-conduit
@@ -130180,7 +133425,7 @@ self: {
        pname = "twitter-enumerator";
        version = "0.0.3";
        sha256 = "1c8y7kq0x7lnq7x7ah8c78q6cy2963nz6y83klzh2jgmr8rma6q4";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-enumerator authenticate base bytestring
          containers enumerator http-enumerator http-types text tls-extra
          transformers
@@ -130201,16 +133446,15 @@ self: {
        pname = "twitter-feed";
        version = "0.2.0.2";
        sha256 = "19kwhk0bvwnyhychvfzc09w00ix7z9fmvrb4vv56vxdg20rni3fk";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
        homepage = "https://github.com/stackbuilders/twitter-feed";
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-types" = callPackage
@@ -130224,8 +133468,10 @@ self: {
        pname = "twitter-types";
        version = "0.7.0";
        sha256 = "0smzz3y6xgb0yddp62bvw4j278fw5dnjffrjfxz3dc6hd602cvlh";
-       buildDepends = [ aeson base text time unordered-containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         aeson base text time unordered-containers
+       ];
+       testHaskellDepends = [
          aeson attoparsec base bytestring derive directory filepath HUnit
          old-locale QuickCheck template-haskell test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -130245,7 +133491,7 @@ self: {
        pname = "twitter-types-lens";
        version = "0.7.0";
        sha256 = "1775ydjpv0rii3zbz60xl8dz3537fcid3j4867ynw0zvk1sl01wc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens template-haskell text time twitter-types
        ];
        homepage = "https://github.com/himura/twitter-types-lens";
@@ -130262,7 +133508,7 @@ self: {
        pname = "tx";
        version = "0.1.0.0";
        sha256 = "18fpkpri2g93vxw3qdk94nc4zlh5kqgfbvdmzkwqjadkck39alsy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal safecopy stm transformers
        ];
        jailbreak = true;
@@ -130282,7 +133528,7 @@ self: {
        sha256 = "0375q8qcirkalz6n48rkylkx1j8z5gvjhh8n2fdvvjqvn064q1s6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers directory parsec regex-posix
        ];
        homepage = "http://keithsheppard.name/txt-sushi";
@@ -130298,7 +133544,7 @@ self: {
        sha256 = "0vn01ppcmdfi9n9f8h62ll9f08nda2pcrxvck0lgkwzky54v19s4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://github.com/jgoerzen/txt2rtf";
        description = "Filter to convert plain text files to RTF";
        license = "GPL";
@@ -130310,7 +133556,7 @@ self: {
        pname = "txtblk";
        version = "0.2.0.1";
        sha256 = "08qpdyb1dbkif4zwrap6478fsf7lha6hk18wm0r4803avrr5w2bb";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Deprecated in favor of eros";
        license = stdenv.lib.licenses.bsd3;
@@ -130322,7 +133568,7 @@ self: {
        pname = "ty";
        version = "0.1.6";
        sha256 = "0i18c293f6dz7qgr5z4x6rzndhqv5q7myw1wvs8i9ld23d87fjhy";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/conal/ty";
        description = "Typed type representations and equality proofs";
        license = stdenv.lib.licenses.bsd3;
@@ -130338,7 +133584,9 @@ self: {
        sha256 = "1wc1z7ps1rcbws2snci64hxddjd3bi3kbi4iwvbfaac0dz52085m";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring directory filepath ghc process ];
+       executableHaskellDepends = [
+         base bytestring directory filepath ghc process
+       ];
        homepage = "http://www.decidable.org/haskell/typalyze";
        description = "Analyzes Haskell source files for easy reference";
        license = stdenv.lib.licenses.bsd3;
@@ -130351,7 +133599,7 @@ self: {
        pname = "type-aligned";
        version = "0.9.6";
        sha256 = "0mfyd9w13kd3ha43220p9qabw828xv19sxywy9imadpwrdqp51qv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/atzeus/type-aligned";
        description = "Various type-aligned sequence data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -130363,7 +133611,7 @@ self: {
        pname = "type-booleans";
        version = "0.1";
        sha256 = "11kbnfbvclkdwirnnpdi4f20pibdar4l47anvnkaxxl330zi7yfh";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Type-level booleans via type-families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130376,7 +133624,7 @@ self: {
        pname = "type-cereal";
        version = "0.3";
        sha256 = "1w1s1c7f2q5zwc9fghbbd1nhavh0mzzndh0mdxr7sy88a523svcv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal data-hash template-haskell type-digits
          type-spine
        ];
@@ -130391,7 +133639,7 @@ self: {
        pname = "type-digits";
        version = "0.3";
        sha256 = "0rmqy3wcypyq09gnfz0xvkr2ly9gnpsjnil2n981ajfxsk2shi58";
-       buildDepends = [ base template-haskell type-spine ];
+       libraryHaskellDepends = [ base template-haskell type-spine ];
        description = "Arbitrary-base type-level digits";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130403,8 +133651,8 @@ self: {
        pname = "type-eq";
        version = "0.5";
        sha256 = "007srln0xxi27wca8dk72xp3cdwnk8iqmlqgbxi17c9l2x7lrkwz";
-       buildDepends = [ base ];
-       buildTools = [ cpphs ];
+       libraryHaskellDepends = [ base ];
+       libraryToolDepends = [ cpphs ];
        homepage = "http://github.com/glaebhoerl/type-eq";
        description = "Type equality evidence you can carry around";
        license = stdenv.lib.licenses.bsd3;
@@ -130416,7 +133664,7 @@ self: {
        pname = "type-equality";
        version = "0.1.2";
        sha256 = "06acqpkvyvalv5knjzzbgm40hzas6cdfsypvjxsbb0mhq4d80xwr";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/hesselink/type-equality/";
        description = "Type equality, coercion/cast and other operations";
        license = stdenv.lib.licenses.bsd3;
@@ -130428,7 +133676,7 @@ self: {
        pname = "type-equality-check";
        version = "0.0.0.3";
        sha256 = "0fsj2mbsbhiqlv6dlkkwh3af5kx8qcif9374wiy7zf62pz4bry67";
-       buildDepends = [ base type-level ];
+       libraryHaskellDepends = [ base type-level ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-equality-check";
        description = "Type equality check";
        license = stdenv.lib.licenses.bsd3;
@@ -130441,7 +133689,7 @@ self: {
        pname = "type-functions";
        version = "0.2.0.3";
        sha256 = "1vs6wk1z3zp3s1fxbz6bnfjlkdrcs6v4ihdnr504z9qklwb91vam";
-       buildDepends = [ base kinds ];
+       libraryHaskellDepends = [ base kinds ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-functions";
        description = "Emulation of type-level functions";
        license = stdenv.lib.licenses.bsd3;
@@ -130453,7 +133701,7 @@ self: {
        pname = "type-hint";
        version = "0.1";
        sha256 = "1fcrma7m6y7i1y42rzhv7qch8xkk93lkh1767saw4hsb9fzwsq8i";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mvv/type-hint";
        description = "Guide type inference with proxy values";
        license = stdenv.lib.licenses.bsd3;
@@ -130465,7 +133713,7 @@ self: {
        pname = "type-int";
        version = "0.5.0.2";
        sha256 = "1lakw4mvkii32a570zain510n9x7b2ka2r3qj5rpil1j4bpc662w";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/type-int";
        description = "Type Level 2s- and 16s- Complement Integers";
        license = stdenv.lib.licenses.bsd3;
@@ -130478,7 +133726,9 @@ self: {
        pname = "type-iso";
        version = "0.1.0.0";
        sha256 = "03qs8frsj0a2jxpk1rrmhaivf68hg8dhjn4s3q85h4zrsxwfskjx";
-       buildDepends = [ base data-default nats numericpeano text ];
+       libraryHaskellDepends = [
+         base data-default nats numericpeano text
+       ];
        homepage = "https://github.com/ombocomp/type-iso";
        description = "Typeclasses for injective relations and isomorphisms between types";
        license = stdenv.lib.licenses.asl20;
@@ -130490,7 +133740,7 @@ self: {
        pname = "type-level";
        version = "0.2.4";
        sha256 = "1cgph4y6j7wnzglzz89zd60f1mv8v82vp0n1bmkp4yqq0w2wmg9v";
-       buildDepends = [ base syb template-haskell ];
+       libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "http://code.haskell.org/type-level";
        description = "Type-level programming library";
        license = stdenv.lib.licenses.bsd3;
@@ -130503,7 +133753,7 @@ self: {
        pname = "type-level-bst";
        version = "0.1";
        sha256 = "0c51p6dy84ddikj6jch5hljn1i37q38wbak3chbc3ds5r674y5hk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Kinokkory/type-level-bst";
        description = "type-level binary search trees in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -130516,7 +133766,7 @@ self: {
        pname = "type-level-natural-number";
        version = "2.0";
        sha256 = "17zgm5ys1z61kxxczz3bzi9m3c48py6pvyx3cqk3xlh1w7n58ryk";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Simple type level natural numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130527,7 +133777,9 @@ self: {
        pname = "type-level-natural-number-induction";
        version = "1.0.0.1";
        sha256 = "1mwnsz5rbqnwskzf4cyv05zxha86afqh68b5ppwvizrvwf4jav2r";
-       buildDepends = [ base transformers type-level-natural-number ];
+       libraryHaskellDepends = [
+         base transformers type-level-natural-number
+       ];
        jailbreak = true;
        description = "High-level combinators for performing inductive operations";
        license = stdenv.lib.licenses.bsd3;
@@ -130539,7 +133791,7 @@ self: {
        pname = "type-level-natural-number-operations";
        version = "1.0";
        sha256 = "0vql5q5zhbhmwv0wqqb0xi4ayqdsz149rymhs730c583pq0h9r3w";
-       buildDepends = [ base type-level-natural-number ];
+       libraryHaskellDepends = [ base type-level-natural-number ];
        jailbreak = true;
        description = "Basic operations on type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -130551,8 +133803,8 @@ self: {
        pname = "type-level-numbers";
        version = "0.1.1.1";
        sha256 = "12iiyaqi60fpds7fv1qvphy84rwyj71maq54mfwpcr0bdrgyymjv";
-       buildDepends = [ base template-haskell ];
-       testDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
        description = "Type level numbers implemented using type families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130563,7 +133815,7 @@ self: {
        pname = "type-level-sets";
        version = "0.5";
        sha256 = "1mrrwyvpjywnv2vd1nzzk0vnzsnjvbxiyxp03n9djsgwnfslzxbj";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        description = "Type-level sets (with value-level counterparts and various operations)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130575,7 +133827,7 @@ self: {
        pname = "type-level-tf";
        version = "0.2.1";
        sha256 = "07q69219yvf7rpfwilp70hvx2fzsxklvld7j3gayj17l9wp23g2m";
-       buildDepends = [ base syb template-haskell ];
+       libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "https://github.com/coreyoconnor/type-level-tf";
        description = "Type-level programming library (type families)";
        license = stdenv.lib.licenses.bsd3;
@@ -130587,7 +133839,7 @@ self: {
        pname = "type-list";
        version = "0.1.0.0";
        sha256 = "0y5qa882rcrlq13mfsp8yzbn6fqsc2clii2qjhk1nmg8ivqf026v";
-       buildDepends = [ base singletons ];
+       libraryHaskellDepends = [ base singletons ];
        description = "Operations on type-level lists and tuples";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130601,7 +133853,7 @@ self: {
        pname = "type-natural";
        version = "0.2.3.2";
        sha256 = "0qydsrksg9rasv90d4ivjgf1sdwfzjg0xf1wimfkhva545mray7h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints equational-reasoning monomorphic singletons
          template-haskell
        ];
@@ -130617,7 +133869,9 @@ self: {
        pname = "type-ord";
        version = "0.3";
        sha256 = "16nfnxh0klxx1f2mj1hc5blcm259b664w3l4frx4bksdavhnkmg5";
-       buildDepends = [ base template-haskell type-digits type-spine ];
+       libraryHaskellDepends = [
+         base template-haskell type-digits type-spine
+       ];
        description = "Type-level comparison operator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130631,7 +133885,7 @@ self: {
        pname = "type-ord-spine-cereal";
        version = "0.2";
        sha256 = "1gwchzi4l7a0jm11paxz959mv9a5pbga86fyyjyglypd1988rvrb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base template-haskell type-cereal type-ord type-spine
        ];
        description = "Generic type-level comparison of types";
@@ -130645,7 +133899,7 @@ self: {
        pname = "type-prelude";
        version = "0.1";
        sha256 = "1ygg511j0av1g94mclrsf3p0qb2kc89jcz9nfr5fm073a2jlzlih";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        homepage = "http://code.atnnn.com/projects/type-prelude";
        description = "Partial port of prelude to the type level. Requires GHC 7.6.1.";
        license = stdenv.lib.licenses.bsd3;
@@ -130660,7 +133914,7 @@ self: {
        pname = "type-settheory";
        version = "0.1.3.1";
        sha256 = "1b4p9f03diq2mlp2mb39qrm095731i35q8k783bkq2knzlq01dsi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers syb template-haskell transformers type-equality
        ];
        description = "Sets and functions-as-relations in the type system";
@@ -130674,7 +133928,7 @@ self: {
        pname = "type-spine";
        version = "0.2.20120924";
        sha256 = "0vy9ixmz1xm3dd0376s0h66q7qi64jqc5kqsqjpcg7akxidl03hi";
-       buildDepends = [ base template-haskell ];
+       libraryHaskellDepends = [ base template-haskell ];
        description = "A spine-view on types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130691,12 +133945,12 @@ self: {
        pname = "type-structure";
        version = "0.1.1";
        sha256 = "0y2360llc41772ybjj3dcsk1r81js3yqsxww1w0j62gsdp6g9wfv";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers hashable loch-th mtl placeholders
          template-haskell text th-instance-reification time transformers
          unordered-containers vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          array base bytestring containers hashable HTF HUnit loch-th mtl
          placeholders QuickCheck QuickCheck-GenT quickcheck-instances
          template-haskell text th-instance-reification time transformers
@@ -130719,12 +133973,12 @@ self: {
        pname = "type-sub-th";
        version = "0.1.0.6";
        sha256 = "11aycmbvqlrsd4kzm9m5smg7ghqz8kn3i62b19acnlpmrlr5v497";
-       buildDepends = [
+       libraryHaskellDepends = [
          base DebugTraceHelpers HUnit QuickCheck template-haskell
          test-framework test-framework-hunit test-framework-quickcheck2
          tuple uniplate
        ];
-       testDepends = [
+       testHaskellDepends = [
          base checkers DebugTraceHelpers HUnit QuickCheck template-haskell
          test-framework test-framework-hunit test-framework-quickcheck2
          th-instances tuple uniplate
@@ -130743,7 +133997,7 @@ self: {
        pname = "type-unary";
        version = "0.2.16";
        sha256 = "1pn65smi07gwd4h46irjawh1dnjnizs9ag0cyv55i0mjg8plyzvj";
-       buildDepends = [
+       libraryHaskellDepends = [
          applicative-numbers base newtype ty vector-space
        ];
        homepage = "https://github.com/conal/type-unary";
@@ -130757,8 +134011,8 @@ self: {
        pname = "typeable-th";
        version = "0.1.5";
        sha256 = "1ps9rkysx7zbcqkz51ahayg2jivlihiqdlb27iq7bf9aa7383k6v";
-       buildDepends = [ base template-haskell transformers ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base template-haskell transformers ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/bennofs/typeable-th";
        description = "Automatic deriving of TypeableN instances with Template Haskell";
@@ -130774,7 +134028,7 @@ self: {
        pname = "typedquery";
        version = "0.1.0.2";
        sha256 = "0l0fxhh1mq0801gb73pv531943i0iy5lm58hwyf5g6x6l50lj660";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring haskell-src-meta parsec template-haskell text
          transformers
        ];
@@ -130790,7 +134044,7 @@ self: {
        pname = "typehash";
        version = "1.4.0.4";
        sha256 = "11s10arrbri1f71jfpynhmwh53cgkrfxsrqch1f02j0aii7n0lpv";
-       buildDepends = [ base binary bytestring mtl pureMD5 syb ];
+       libraryHaskellDepends = [ base binary bytestring mtl pureMD5 syb ];
        jailbreak = true;
        description = "Create a unique hash value for a type";
        license = stdenv.lib.licenses.bsd3;
@@ -130805,8 +134059,8 @@ self: {
        pname = "typelevel-tensor";
        version = "0.2.1";
        sha256 = "174f6xh3znf45w94xkhqwnxnzw6crpb13zff57svnj2dqvpf00gd";
-       buildDepends = [ base numeric-prelude QuickCheck ];
-       testDepends = [
+       libraryHaskellDepends = [ base numeric-prelude QuickCheck ];
+       testHaskellDepends = [
          array base HUnit numeric-prelude QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -130824,7 +134078,7 @@ self: {
        sha256 = "1mnzkj5dp4rc4anaqxc6ia88wgrjhxwacxpqw8vp6pjqxbhhq92n";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base process ];
+       executableHaskellDepends = [ base process ];
        description = "Small script for inferring types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130837,7 +134091,7 @@ self: {
        pname = "typeparams";
        version = "0.0.6";
        sha256 = "1blhqm8ba37mqp2ziipm0igyccyrqlwcink5xbz0m56ca7lid0vb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base constraints deepseq ghc-prim primitive reflection tagged
          template-haskell vector
        ];
@@ -130852,10 +134106,10 @@ self: {
      mkDerivation {
        pname = "types-compat";
        version = "0.1.1";
-       revision = "2";
        sha256 = "1fl3ddsz9m0s0mnd7wq6lqkkmpq0dz83aisqgs1cpg91xlllghby";
+       revision = "2";
        editedCabalFile = "8fbb17ec66d4bf5f2fffdb2327647b44292253822c9623a06b489ff547a71041";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/philopon/types-compat";
        description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy.";
        license = stdenv.lib.licenses.mit;
@@ -130867,7 +134121,7 @@ self: {
        pname = "typesafe-endian";
        version = "0.1.0.1";
        sha256 = "1kg4pvrnf7vwvrcb998l9w08dpdy9hg7x2d9h5s3lqpnvvxfgcfj";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Ericson2314/typesafe-endian";
        description = "Enforce endianness with types";
        license = stdenv.lib.licenses.bsd3;
@@ -130884,7 +134138,7 @@ self: {
        sha256 = "12axp6y652zlv9c9m0n5m4allpy23x0bk274gy78csrqp26akq3k";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html cmdtheline containers filemanip filepath
          language-typescript parsec split syb utf8-string
        ];
@@ -130900,7 +134154,7 @@ self: {
        pname = "typical";
        version = "0.0.1";
        sha256 = "0dw6mwppbhcblnr03qgavhx27l9dl6gd981afgg4spi8avfzgh4q";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Type level numbers, vectors, list. This lib needs to be extended.";
        license = "GPL";
      }) {};
@@ -130913,7 +134167,7 @@ self: {
        pname = "typography-geometry";
        version = "1.0.0";
        sha256 = "1vvqch3pdwymjbmir7b208qyzdzljsw1gf8icmzw5pi3vn6wkihf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers parallel polynomials-bernstein vector
        ];
        description = "Drawings for printed text documents";
@@ -130931,10 +134185,10 @@ self: {
        pname = "tz";
        version = "0.0.0.10";
        sha256 = "15j0ai0i4savvvhd8b7f9mrm1kwdmvjrphyjclmlj1k65c6ap5qm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq time tzdata vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bindings-posix HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
          time tzdata unix vector
@@ -130953,8 +134207,8 @@ self: {
        pname = "tzdata";
        version = "0.1.20150129.1";
        sha256 = "167ik26nsq2v6xqfk0rljp4p4g3r35rkvsza7cvi8qdak96dc4ay";
-       buildDepends = [ base bytestring containers vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring containers vector ];
+       testHaskellDepends = [
          base bytestring directory filemanip filepath HUnit MissingH
          test-framework test-framework-hunit test-framework-th unix
        ];
@@ -130973,7 +134227,7 @@ self: {
        sha256 = "01a1h6pflvid5zcd8wy3px7cz4pxwy5pw354v9rp8k7sx4q82am8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base BNFC-meta cmdargs containers mtl parsec pretty split
          transformers
        ];
@@ -130993,11 +134247,11 @@ self: {
        pname = "ua-parser";
        version = "0.5";
        sha256 = "0fljfvs9gzqyn01sw57s738jazki839grff43n09bqf7nk1janbf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default file-embed pcre-light syb text
          yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring criterion data-default deepseq derive
          file-embed filepath HUnit pcre-light syb test-framework
          test-framework-hunit test-framework-quickcheck2 text yaml
@@ -131018,14 +134272,13 @@ self: {
        sha256 = "1ml02xap95vxvzwqlqp68hfk7yjncf3xc1h13gga0nlhby9rjv14";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath hslogger mtl network process
          regex-compat time time-locale-compat unix
        ];
        homepage = "http://hub.darcs.net/dino/uacpid";
        description = "Userspace Advanced Configuration and Power Interface event daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uberlast" = callPackage
@@ -131034,7 +134287,7 @@ self: {
        pname = "uberlast";
        version = "0.0";
        sha256 = "12p948706scjiazlwv0x1afl3v8fhv4a3l8yqn1x4y9xnr4pfmc9";
-       buildDepends = [ base lens tagged template-haskell ];
+       libraryHaskellDepends = [ base lens tagged template-haskell ];
        homepage = "https:/github.com/fumieval/uberlast";
        description = "Generate overloaded lenses from plain data declaration";
        license = stdenv.lib.licenses.bsd3;
@@ -131047,8 +134300,8 @@ self: {
        pname = "uconv";
        version = "0.0.3";
        sha256 = "0v71qw494klyh3ar8qdp7wx7kn7629iy83xham9b7jpmvk2p76bv";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ icu ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ icu ];
        description = "String encoding conversion with ICU";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131064,7 +134317,7 @@ self: {
        sha256 = "0a7kksh99nll91q41z4xgrcwc8pnfm0p71bxw6yymcd7yb0v09fk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cereal containers ghc-prim mtl network unix
          utf8-string
        ];
@@ -131082,7 +134335,7 @@ self: {
        sha256 = "0xiz3z0x7p9agj14j9lm8njfqiqpyif0m2fn7lppi3w482ssfzji";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring udbus xml ];
+       libraryHaskellDepends = [ base bytestring udbus xml ];
        homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Model API for udbus introspection and definitions";
        license = stdenv.lib.licenses.bsd3;
@@ -131095,7 +134348,7 @@ self: {
        pname = "udcode";
        version = "0.2.0.0";
        sha256 = "1namnm91divk1x8ki7wfbd79f4nrym58r4ki9yamj2giv4nxda36";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Does a set of code words form a uniquely decodable code?";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131110,8 +134363,9 @@ self: {
        sha256 = "1a5i57f50scxbv5snn4xd953bx98qq3cgzhxjnqvxyazqz3h1fx2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring posix-paths select unix ];
-       pkgconfigDepends = [ libudev ];
+       libraryHaskellDepends = [ base bytestring posix-paths unix ];
+       libraryPkgconfigDepends = [ libudev ];
+       executableHaskellDepends = [ base bytestring select ];
        homepage = "https://github.com/pxqr/udev";
        description = "libudev bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -131124,7 +134378,7 @@ self: {
        pname = "uglymemo";
        version = "0.1.0.1";
        sha256 = "0ixqg5d0ly1r18jbgaa89i6kjzgi6c5hanw1b1y8c5fbq14yz2gy";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "A simple (but internally ugly) memoization function";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -131137,12 +134391,17 @@ self: {
      mkDerivation {
        pname = "uhc-light";
        version = "1.1.9.0";
-       revision = "1";
        sha256 = "0dqb0054nbl5qfxrg7g4yvmiawp9ladlws26cdf32jxrm31wgmkj";
+       revision = "1";
        editedCabalFile = "8847b4a41a2f6c9be09cf7b4835f53219522da9ef0ca26b918159fec747bd938";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory fgl filepath
+         hashable mtl network old-locale primitive process syb transformers
+         uhc-util uulib vector
+       ];
+       executableHaskellDepends = [
          array base binary bytestring containers directory fgl filepath
          hashable mtl network old-locale primitive process syb transformers
          uhc-util uulib vector
@@ -131161,7 +134420,7 @@ self: {
        pname = "uhc-util";
        version = "0.1.5.6";
        sha256 = "1axg2apkvg3xk1cq78shbnc68i0h6fqcpjg8z3l4nc49kl5dywwz";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers directory fclabels fgl
          hashable ListLike mtl process syb time time-compat uulib
        ];
@@ -131178,7 +134437,7 @@ self: {
        sha256 = "064cm531yci41jf14k177w7j4zy8dfjwrpjcrwf7kpz2rhx1djyi";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring split ];
+       executableHaskellDepends = [ base bytestring split ];
        jailbreak = true;
        description = "hex dumper for UTF-8 text";
        license = stdenv.lib.licenses.bsd3;
@@ -131194,14 +134453,16 @@ self: {
        sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         async base bytestring bytestring-lexing deepseq network network-uri
+       libraryHaskellDepends = [
+         base bytestring bytestring-lexing deepseq network network-uri
+       ];
+       executableHaskellDepends = [
+         async base bytestring bytestring-lexing deepseq network
          optparse-applicative
        ];
        homepage = "https://github.com/hvr/uhttpc";
        description = "Minimal HTTP client library optimized for benchmarking";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ui-command" = callPackage
@@ -131212,7 +134473,7 @@ self: {
        sha256 = "1qq902p5q6z1m0556bdc6brads7m2qrhrwnzd8k8c4jynzc829w7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base data-default mtl old-locale time ];
+       libraryHaskellDepends = [ base data-default mtl old-locale time ];
        description = "A framework for friendly commandline programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131226,7 +134487,9 @@ self: {
        pname = "uid";
        version = "0.1.0.1";
        sha256 = "11v67dbanw9gmy9rbfln3ma87a9hkwvc5bwzdx840ngij5gh559b";
-       buildDepends = [ aeson base bytestring cereal dataenc text uuid ];
+       libraryHaskellDepends = [
+         aeson base bytestring cereal dataenc text uuid
+       ];
        homepage = "http://github.com/hargettp/uid.git";
        description = "Simple unique identifier datatype, serializable and encodable as base32";
        license = stdenv.lib.licenses.mit;
@@ -131242,7 +134505,7 @@ self: {
        sha256 = "0gpycwd0dgnw7cdicpn19wv1xb4jq3j9dfzry2ilv85h02zkwfvh";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs directory filepath io-storage process
        ];
        homepage = "https://github.com/jwiegley/una";
@@ -131258,8 +134521,8 @@ self: {
        pname = "unagi-chan";
        version = "0.4.0.0";
        sha256 = "04m1ns6jc1yb1i9pmqmi8k21mwgkrq4q9fbcj4af1a9khxrjxcny";
-       buildDepends = [ atomic-primops base ghc-prim primitive ];
-       testDepends = [
+       libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ];
+       testHaskellDepends = [
          atomic-primops base containers ghc-prim primitive
        ];
        description = "Fast concurrent queues with a Chan-like API, and more";
@@ -131272,7 +134535,7 @@ self: {
        pname = "unagi-streams";
        version = "0.1.3";
        sha256 = "0m8x1sw925xwj2yd2ji0nk54gw1gqqz1zy0bk9z3c3sgbcy364m6";
-       buildDepends = [ base io-streams unagi-chan ];
+       libraryHaskellDepends = [ base io-streams unagi-chan ];
        description = "Unagi Chan IO-Streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131285,7 +134548,7 @@ self: {
        sha256 = "12cbqlc7qf2sf2m4zmisx06bcc104bwivnzq2df0jqdf09bg0n9k";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/unamb";
        description = "Unambiguous choice";
        license = stdenv.lib.licenses.bsd3;
@@ -131297,7 +134560,7 @@ self: {
        pname = "unamb-custom";
        version = "0.13";
        sha256 = "0r694wi9xg8brgcwl2kyv5amp6v539l121s9bpmd5lhjdnrvqjwk";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://github.com/luqui/unamb-custom";
        description = "Functional concurrency with unamb using a custom scheduler";
        license = stdenv.lib.licenses.bsd3;
@@ -131312,7 +134575,9 @@ self: {
        pname = "unbound";
        version = "0.4.3.1";
        sha256 = "1xkp47y7yg8dl95gf4w3iwddc3yivrhcxj184cfhrx6a9rbsflpz";
-       buildDepends = [ base binary containers mtl RepLib transformers ];
+       libraryHaskellDepends = [
+         base binary containers mtl RepLib transformers
+       ];
        homepage = "http://code.google.com/p/replib/";
        description = "Generic support for programming with names and binders";
        license = stdenv.lib.licenses.bsd3;
@@ -131328,11 +134593,11 @@ self: {
        pname = "unbound-generics";
        version = "0.2";
        sha256 = "0wmr7ylczkaqyf1yrcp9d9gmw8hv7v2yip9v96zlqx02m9j57s99";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers contravariant deepseq mtl profunctors
          template-haskell transformers transformers-compat
        ];
-       testDepends = [
+       testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "http://github.com/lambdageek/unbound-generics";
@@ -131346,7 +134611,7 @@ self: {
        pname = "unbounded-delays";
        version = "0.1.0.9";
        sha256 = "1f4h87503m3smhip432q027wj3zih18pmz2rnafh60589ifcl420";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/basvandijk/unbounded-delays";
        description = "Unbounded thread delays and timeouts";
        license = stdenv.lib.licenses.bsd3;
@@ -131358,7 +134623,7 @@ self: {
        pname = "unbounded-delays-units";
        version = "0.4";
        sha256 = "02j4i2dms15vb87ar3m99hvpxrjdakljyql708zs716k1jdm7614";
-       buildDepends = [ base unbounded-delays units units-defs ];
+       libraryHaskellDepends = [ base unbounded-delays units units-defs ];
        jailbreak = true;
        homepage = "https://github.com/jcristovao/unbouded-delays-units";
        description = "Thread delays and timeouts using proper time units";
@@ -131372,7 +134637,7 @@ self: {
        pname = "unboxed-containers";
        version = "0.0.2.4";
        sha256 = "0yahavqjjnlf4ps8kd41s9s64nbhx2hf7qzk2xxkmq0i3b91d123";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        homepage = "http://github.com/ekmett/unboxed-containers";
        description = "Self-optimizing unboxed sets using view patterns and data families";
        license = stdenv.lib.licenses.bsd3;
@@ -131385,7 +134650,7 @@ self: {
        pname = "unexceptionalio";
        version = "0.2.0";
        sha256 = "1p1han6027n6d9cx0cqrfrpwqlhkainj7xi839swqj1k6d4n022n";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/singpolyma/unexceptionalio";
        description = "IO without any non-error, synchronous exceptions";
        license = "unknown";
@@ -131398,7 +134663,9 @@ self: {
        pname = "unfoldable";
        version = "0.8.2";
        sha256 = "0r6jffm2i2la70xzqsribfbsa84ha5g4zfqphp9gqkvr1x2jmr2i";
-       buildDepends = [ base ghc-prim QuickCheck random transformers ];
+       libraryHaskellDepends = [
+         base ghc-prim QuickCheck random transformers
+       ];
        homepage = "https://github.com/sjoerdvisscher/unfoldable";
        description = "Class of data structures that can be unfolded";
        license = stdenv.lib.licenses.bsd3;
@@ -131410,7 +134677,7 @@ self: {
        pname = "ungadtagger";
        version = "1.0.0";
        sha256 = "1hn30p9vpsvkph54grzwdrca5vh9grpa7d0w1zlvim1mnvqxmn4b";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/andriyp/ungadtagger";
        description = "Abstract GADTs from typelevel tags";
        license = stdenv.lib.licenses.bsd3;
@@ -131422,7 +134689,7 @@ self: {
        pname = "uni-events";
        version = "2.2.2.0";
        sha256 = "1damlhi56xfp4xvdk2ijxjx7vxywhhbi4hiprdx09b5ipblrfpqz";
-       buildDepends = [ base containers uni-util ];
+       libraryHaskellDepends = [ base containers uni-util ];
        homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
        description = "Event handling for the uniform workbench";
        license = "LGPL";
@@ -131436,7 +134703,7 @@ self: {
        pname = "uni-graphs";
        version = "2.2.1.0";
        sha256 = "1vwm0gmgj8c7qdildplr3jng5gj9q6b669vgmnxw4v514y529bz5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl uni-events uni-htk uni-reactor uni-util
        ];
        homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
@@ -131452,7 +134719,7 @@ self: {
        pname = "uni-htk";
        version = "2.2.1.2";
        sha256 = "1zdbg2jz6dgw4jvicl2vgnnnz2mmq8r9cabfgzw7zyc6ycp5hmyk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory uni-events uni-posixutil uni-reactor
          uni-util
        ];
@@ -131469,7 +134736,9 @@ self: {
        pname = "uni-posixutil";
        version = "2.2.1.1";
        sha256 = "0wh3ni6l1x7rxn5yppva1xs0yb6z5hxfmzxxrnh6hbcq1pa62m5d";
-       buildDepends = [ base directory process uni-events uni-util unix ];
+       libraryHaskellDepends = [
+         base directory process uni-events uni-util unix
+       ];
        homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
        description = "Posix utilities for the uniform workbench";
        license = "LGPL";
@@ -131482,7 +134751,9 @@ self: {
        pname = "uni-reactor";
        version = "2.2.1.0";
        sha256 = "147nizw920xbbj5b8kqrgri1r9wpx3qddspnryxhdxq10q1xlyh2";
-       buildDepends = [ base containers directory uni-events uni-util ];
+       libraryHaskellDepends = [
+         base containers directory uni-events uni-util
+       ];
        homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
        description = "Reactors for the uniform workbench";
        license = "LGPL";
@@ -131496,7 +134767,7 @@ self: {
        pname = "uni-uDrawGraph";
        version = "2.2.1.3";
        sha256 = "1gblb969s9al67srxf7rd9dajy6hji91aw5zaxxhaj0vgqsdb90j";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers uni-events uni-graphs uni-posixutil uni-reactor
          uni-util
        ];
@@ -131513,7 +134784,7 @@ self: {
        pname = "uni-util";
        version = "2.3.0.1";
        sha256 = "0simxjsd0qi8yxnpiq88zy3bsrrw5rxfpfknr8yaf4xhc7vv39nh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory ghc-prim mtl network
          old-time parsec
        ];
@@ -131530,8 +134801,8 @@ self: {
        sha256 = "0fy89j864dy5dzfj15aavm8bqpv2f51zf42dyjvs50qah3shh5yl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ];
-       testDepends = [ base containers utility-ht ];
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers utility-ht ];
        homepage = "http://code.haskell.org/~thielema/unicode/";
        description = "Construct and transform unicode characters";
        license = stdenv.lib.licenses.bsd3;
@@ -131543,10 +134814,11 @@ self: {
        pname = "unicode-names";
        version = "3.2.0.0";
        sha256 = "15088dbmhvw118p3w08wxpsx41gzi0wqinqyg143225pp07aa5gc";
-       buildDepends = [ array base containers unicode-properties ];
+       libraryHaskellDepends = [
+         array base containers unicode-properties
+       ];
        description = "Unicode 3.2.0 character names";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unicode-normalization" = callPackage
@@ -131555,8 +134827,8 @@ self: {
        pname = "unicode-normalization";
        version = "0.1";
        sha256 = "1smfc7a62xi6y4sc0vai2l0nljxl9dr9l5zkqi17n14cq36ppfwb";
-       buildDepends = [ base bytestring compact-string ];
-       extraLibraries = [ icu ];
+       libraryHaskellDepends = [ base bytestring compact-string ];
+       librarySystemDepends = [ icu ];
        homepage = "http://sloompie.reinier.de/unicode-normalization/";
        description = "Unicode normalization using the ICU library";
        license = stdenv.lib.licenses.bsd3;
@@ -131569,7 +134841,7 @@ self: {
        pname = "unicode-prelude";
        version = "0.1.1";
        sha256 = "05zakihlk06wckzgm43f3g26fjdn4gb3d1ypw4vcwqmipq2dbfsw";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Unicode notation for some definitions in Prelude";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131580,10 +134852,9 @@ self: {
        pname = "unicode-properties";
        version = "3.2.0.0";
        sha256 = "06zrr2z9irbsxwf7fbnhp2sg36ykb2amfys2y78nzn0mw63xb3q1";
-       buildDepends = [ array base containers ];
+       libraryHaskellDepends = [ array base containers ];
        description = "Unicode 3.2.0 character properties";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unicode-symbols" = callPackage
@@ -131592,7 +134863,7 @@ self: {
        pname = "unicode-symbols";
        version = "0.1.1.2";
        sha256 = "0y1awqrf1x2in158linszma69zyz3zp14h3rmdx3vmbmif9fvbyv";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
@@ -131606,8 +134877,9 @@ self: {
        sha256 = "17a2rxq5b4a66ia4jm1g0lmkvsanfc477567wygq9kz4w9q4xwc3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base directory text ];
-       testDepends = [ attoparsec base text ];
+       libraryHaskellDepends = [ attoparsec base text ];
+       executableHaskellDepends = [ attoparsec base directory text ];
+       testHaskellDepends = [ attoparsec base text ];
        jailbreak = true;
        homepage = "https://github.com/Zankoku-Okuno/unicoder";
        description = "Make writing in unicode easy";
@@ -131621,7 +134893,7 @@ self: {
        pname = "unification-fd";
        version = "0.10.0.1";
        sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v";
-       buildDepends = [ base containers logict mtl ];
+       libraryHaskellDepends = [ base containers logict mtl ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Simple generic unification algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -131635,18 +134907,19 @@ self: {
      mkDerivation {
        pname = "uniform-io";
        version = "0.1.1.0";
-       revision = "1";
        sha256 = "0i9sdf2nnaf099r79mdrqa1hbbqyb874fk8dsqqzb1582m6czikk";
+       revision = "1";
        editedCabalFile = "4f0651eff7cbdde40b49b5fcf90e8adf5c403a7c150ac318f0f5280b454b19f9";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring data-default-class iproute network
          transformers word8
        ];
-       testDepends = [ base Cabal ];
-       extraLibraries = [ openssl ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base Cabal ];
        homepage = "https://sealgram.com/git/haskell/uniform-io";
        description = "Uniform IO over files, network, watever";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) openssl;};
 
   "uniform-pair" = callPackage
@@ -131655,7 +134928,7 @@ self: {
        pname = "uniform-pair";
        version = "0.1.5";
        sha256 = "0zkkhxmhx7xpi0fjxks435z5p52f2jvw8fvp0z2qi81a18v8fh81";
-       buildDepends = [ base ShowF ];
+       libraryHaskellDepends = [ base ShowF ];
        homepage = "https://github.com/conal/uniform-pair/";
        description = "Uniform pairs with class instances";
        license = stdenv.lib.licenses.bsd3;
@@ -131667,7 +134940,7 @@ self: {
        pname = "union-find";
        version = "0.2";
        sha256 = "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6";
-       buildDepends = [ base containers transformers ];
+       libraryHaskellDepends = [ base containers transformers ];
        homepage = "http://github.com/nominolo/union-find";
        description = "Efficient union and equivalence testing of sets";
        license = stdenv.lib.licenses.bsd3;
@@ -131679,7 +134952,7 @@ self: {
        pname = "union-find-array";
        version = "0.1.0.2";
        sha256 = "1pxb1v2k04i8ds2n8zqra74gacry6dj5p87sxgkf4fazx4s316dk";
-       buildDepends = [ array base mtl ];
+       libraryHaskellDepends = [ array base mtl ];
        homepage = "https://github.com/haskell-rewriting/union-find-array";
        description = "union find data structure";
        license = stdenv.lib.licenses.mit;
@@ -131691,7 +134964,7 @@ self: {
        pname = "union-map";
        version = "0.1";
        sha256 = "0q1qg0vg01ypjlb90xq8zl3zc53b3yn23vgpnzv92q7xmc46gb5l";
-       buildDepends = [ base containers extensible ];
+       libraryHaskellDepends = [ base containers extensible ];
        homepage = "http://github.com/minpou/union-map";
        description = "Heterogeneous map by open unions";
        license = stdenv.lib.licenses.bsd3;
@@ -131706,7 +134979,7 @@ self: {
        pname = "uniplate";
        version = "1.6.12";
        sha256 = "1dx8f9aw27fz8kw0ad1nm6355w5rdl7bjvb427v2bsgnng30pipw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers hashable syb unordered-containers
        ];
        homepage = "http://community.haskell.org/~ndm/uniplate/";
@@ -131722,8 +134995,8 @@ self: {
        pname = "unique-logic";
        version = "0.3";
        sha256 = "0pjkqvam73d6xy528r9zf75km2yr997in902174raj6kw3kgdl41";
-       buildDepends = [ base transformers utility-ht ];
-       testDepends = [
+       libraryHaskellDepends = [ base transformers utility-ht ];
+       testHaskellDepends = [
          base non-empty QuickCheck transformers utility-ht
        ];
        jailbreak = true;
@@ -131740,10 +135013,10 @@ self: {
        pname = "unique-logic-tf";
        version = "0.4.1.1";
        sha256 = "0gc41whidll04fgzjydcxgxvq270ncvqcamsd3b3qd4hfn3v9qv8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers explicit-exception transformers utility-ht
        ];
-       testDepends = [
+       testHaskellDepends = [
          base non-empty QuickCheck transformers utility-ht
        ];
        jailbreak = true;
@@ -131759,7 +135032,7 @@ self: {
        pname = "uniqueid";
        version = "0.1.1";
        sha256 = "0s1jw29g5s9ll8hbfkyalhdjpsv54w1n63mz4jph36dbq68zb7g6";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/sebfisch/uniqueid/wikis";
        description = "Splittable Unique Identifier Supply";
        license = stdenv.lib.licenses.bsd3;
@@ -131775,11 +135048,11 @@ self: {
        pname = "units";
        version = "2.3";
        sha256 = "14h5566b68wr5qln3x4a862j0zmfdlishipbj9mhd2wmpri6bmzj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers mtl multimap singletons syb template-haskell
          th-desugar units-parser vector-space
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers HUnit-approx mtl multimap singletons syb tasty
          tasty-hunit template-haskell th-desugar units-parser vector-space
        ];
@@ -131797,7 +135070,7 @@ self: {
        pname = "units-attoparsec";
        version = "1.0";
        sha256 = "11saazsgx7gpbfhwwgvrp3zwirkvv8h8c61rrsczfq1qmsljxxiz";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base template-haskell text units units-defs
        ];
        homepage = "https://github.com/jcristovao/units-attoparsec";
@@ -131811,7 +135084,7 @@ self: {
        pname = "units-defs";
        version = "2.0.0.1";
        sha256 = "04k9wjyq23ml89nnjx2lwxiik54wc4rcbmpvvr7fh9wgsl74k6pv";
-       buildDepends = [ base template-haskell units ];
+       libraryHaskellDepends = [ base template-haskell units ];
        homepage = "http://github.com/goldfirere/units-defs";
        description = "Definitions for use with the units package";
        license = stdenv.lib.licenses.bsd3;
@@ -131826,8 +135099,8 @@ self: {
        pname = "units-parser";
        version = "0.1.0.0";
        sha256 = "0ha1saapphk15xk10a36k5qmn01nqpz10f8gi35ra9zqlhv8amfq";
-       buildDepends = [ base containers mtl multimap parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers mtl multimap parsec ];
+       testHaskellDepends = [
          base containers mtl multimap parsec syb tasty tasty-hunit
          template-haskell
        ];
@@ -131841,8 +135114,8 @@ self: {
        pname = "unittyped";
        version = "0.1";
        sha256 = "1ab27rwnp8ncfn5sm4llxjxx7fbp495sl1838g8z9hishr5dgddl";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://bitbucket.org/xnyhps/haskell-unittyped/";
        description = "An extendable library for type-safe computations including units";
@@ -131856,7 +135129,7 @@ self: {
        pname = "universal-binary";
        version = "0.11";
        sha256 = "1gnrq6s7pipjqfyispkxib3xfzii1ss6a9iwv07mvb5a93hc45cw";
-       buildDepends = [ base binary bytestring ];
+       libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for OS X Universal Binary format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131870,7 +135143,7 @@ self: {
        pname = "universe";
        version = "1.0";
        sha256 = "19zr9zcqc5sfp5qfn8slkk2732j1814m3j1jkbim739limwf900z";
-       buildDepends = [
+       libraryHaskellDepends = [
          universe-instances-base universe-instances-extended
          universe-instances-trans universe-reverse-instances
        ];
@@ -131885,7 +135158,7 @@ self: {
        pname = "universe-base";
        version = "1.0";
        sha256 = "1bhgmikh876bda37a79iapzp58ssgfx6n57gpblyd1fprxnwqxc4";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/dmwit/universe";
        description = "A class for finite and recursively enumerable types and some helper functions for enumerating them";
        license = stdenv.lib.licenses.bsd3;
@@ -131897,7 +135170,7 @@ self: {
        pname = "universe-instances-base";
        version = "1.0";
        sha256 = "04njgl32lk5a0masjdjkm4l2wsyrr29g0fsp599864mp7gp504d2";
-       buildDepends = [ base containers universe-base ];
+       libraryHaskellDepends = [ base containers universe-base ];
        homepage = "https://github.com/dmwit/universe";
        description = "Universe instances for types from the base package";
        license = stdenv.lib.licenses.bsd3;
@@ -131911,7 +135184,7 @@ self: {
        pname = "universe-instances-extended";
        version = "1.0";
        sha256 = "0cla7n6id0v2pphmzsc8cbghvhyjjx9720gmxdqch8ysrfknkbgi";
-       buildDepends = [
+       libraryHaskellDepends = [
          adjunctions base comonad universe-instances-base void
        ];
        jailbreak = true;
@@ -131928,7 +135201,7 @@ self: {
        pname = "universe-instances-trans";
        version = "1.0.0.1";
        sha256 = "03iix0bdhfi4qlgwr8sl3gsqck6lsbkqgx245w2z5yaaxgqpq10d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base mtl transformers universe-base universe-instances-base
        ];
        homepage = "https://github.com/dmwit/universe";
@@ -131942,7 +135215,9 @@ self: {
        pname = "universe-reverse-instances";
        version = "1.0";
        sha256 = "0jcd7qyvzq8xxv9d3hfi0f1h48xdsy9r9xnxgxc7ggga4szirm79";
-       buildDepends = [ base containers universe-instances-base ];
+       libraryHaskellDepends = [
+         base containers universe-instances-base
+       ];
        homepage = "https://github.com/dmwit/universe";
        description = "instances of standard classes that are made possible by enumerations";
        license = stdenv.lib.licenses.bsd3;
@@ -131958,10 +135233,10 @@ self: {
        pname = "universe-th";
        version = "0.0.0.6";
        sha256 = "143kcgv4lp9266d8za878l343j6g97mxc3z7gj348jjamvpyg9wx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base composition mtl template-haskell tuple uniplate
        ];
-       testDepends = [
+       testHaskellDepends = [
          base checkers composition DebugTraceHelpers HUnit mtl QuickCheck
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 th-instances tuple uniplate
@@ -131978,7 +135253,7 @@ self: {
        pname = "unix";
        version = "2.7.1.0";
        sha256 = "0p74ljsl1zgwnyl69pg4l15z5rqidam9fw9il4siam2m700ydm3b";
-       buildDepends = [ base bytestring time ];
+       libraryHaskellDepends = [ base bytestring time ];
        homepage = "https://github.com/haskell/unix";
        description = "POSIX functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -131990,7 +135265,7 @@ self: {
        pname = "unix-bytestring";
        version = "0.3.7.3";
        sha256 = "1340zxy9w8nmmhhwgg9rznvz8iyfhinpycdpkryqp60ilhyjgv53";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Unix/Posix-specific functions for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -132002,7 +135277,7 @@ self: {
        pname = "unix-compat";
        version = "0.4.1.4";
        sha256 = "0jxk7j5pz2kgfpqr4hznndjg31pqj5xg2qfc5308fcn9xyg1myps";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "http://github.com/jystic/unix-compat";
        description = "Portable POSIX-compatibility layer";
        license = stdenv.lib.licenses.bsd3;
@@ -132016,7 +135291,8 @@ self: {
        sha256 = "18rjz14x1mbwdppf18gv3x4jwvz68bb2n1b11ygck60yl4pqbhb9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base foreign-var unix ];
+       libraryHaskellDepends = [ base foreign-var ];
+       executableHaskellDepends = [ base foreign-var unix ];
        homepage = "https://github.com/maoe/unix-fcntl";
        description = "Comprehensive bindings to fcntl(2)";
        license = stdenv.lib.licenses.bsd3;
@@ -132028,7 +135304,7 @@ self: {
        pname = "unix-handle";
        version = "0.0.0";
        sha256 = "07ysmd9ks5lm2lg1dik75m509ryn5azw28j9hcisknf5bmrfy9li";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        description = "POSIX operations on Handles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132039,7 +135315,7 @@ self: {
        pname = "unix-io-extra";
        version = "0.1";
        sha256 = "1qy28y1apm2dxp47v0ngxj4ww3iyq4lj0n0i4z9phyr1122fglig";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Support for writev, pwrite and pread";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132052,8 +135328,8 @@ self: {
        pname = "unix-memory";
        version = "0.1.2";
        sha256 = "1r8s7z39d31h1n7rcincy156lbsvamr6jicx52kv8simb9gvarpp";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck unix
        ];
        homepage = "http://github.com/vincenthz/hs-unix-memory";
@@ -132069,11 +135345,13 @@ self: {
        pname = "unix-process-conduit";
        version = "0.2.2.3";
        sha256 = "0ldgjwdvshggygxn9fpnxvb01dba0q0bn9f7iiw5xgqhli46nvcy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit directory filepath process stm time
          transformers unix
        ];
-       testDepends = [ base bytestring conduit hspec transformers unix ];
+       testHaskellDepends = [
+         base bytestring conduit hspec transformers unix
+       ];
        jailbreak = true;
        homepage = "https://github.com/snoyberg/conduit";
        description = "Run processes on Unix systems, with a conduit interface (deprecated)";
@@ -132087,7 +135365,7 @@ self: {
        pname = "unix-pty-light";
        version = "0.1";
        sha256 = "1n21cd6chih86g6kfl6b0x4k533ykzz93anhf6wga3033rvy09wj";
-       buildDepends = [ base unix ];
+       libraryHaskellDepends = [ base unix ];
        homepage = "http://code.haskell.org/~scook0/unix-pty-light";
        description = "POSIX pseudo-terminal support";
        license = stdenv.lib.licenses.bsd3;
@@ -132101,8 +135379,8 @@ self: {
        pname = "unix-time";
        version = "0.3.5";
        sha256 = "0pk7046lmvl7dw6g7508xsixwi3gpiq5dw0a0lfwpfr80g6mh73z";
-       buildDepends = [ base binary bytestring old-time ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary bytestring old-time ];
+       testHaskellDepends = [
          base bytestring doctest hspec old-locale old-time QuickCheck time
        ];
        description = "Unix time parser/formatter and utilities";
@@ -132117,7 +135395,8 @@ self: {
        sha256 = "01v0cl540gwc8j3x6q9gc7bvdcm9f843qbbk15llw9ik2dfm5987";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base mtl unix ];
+       libraryHaskellDepends = [ array base mtl ];
+       executableHaskellDepends = [ base unix ];
        description = "Unlambda interpreter";
        license = "GPL";
      }) {};
@@ -132130,7 +135409,8 @@ self: {
        sha256 = "0nwd4cm3licmdx06cmq42ig7r0iirw2s3ifnna4yzxpysj2aapnf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory text ];
+       libraryHaskellDepends = [ base directory text ];
+       executableHaskellDepends = [ base directory text ];
        description = "Tool to convert literate code between styles or to code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132144,7 +135424,9 @@ self: {
        pname = "unm-hip";
        version = "0.3.1.6";
        sha256 = "170ivv689jg2k9p8czp6miq3samjbdwanh3vh9csm8iq88yrzry5";
-       buildDepends = [ array base bytestring containers process vector ];
+       libraryHaskellDepends = [
+         array base bytestring containers process vector
+       ];
        description = "A Library for the manipulation of images";
        license = "GPL";
      }) {};
@@ -132158,8 +135440,8 @@ self: {
        pname = "unordered-containers";
        version = "0.2.5.1";
        sha256 = "06l1xv7vhpxly75saxdrbc6p2zlgz1az278arfkz4rgawfnphn3f";
-       buildDepends = [ base deepseq hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq hashable ];
+       testHaskellDepends = [
          base ChasingBottoms containers hashable HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
@@ -132176,8 +135458,10 @@ self: {
        pname = "unordered-containers-rematch";
        version = "0.1.0.0";
        sha256 = "13ld8whx1m5xglaj2adsn0qb1x00p6ir8l9kz7fv815n6ahgcii8";
-       buildDepends = [ base hashable rematch unordered-containers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base hashable rematch unordered-containers
+       ];
+       testHaskellDepends = [
          base hashable hspec HUnit rematch unordered-containers
        ];
        jailbreak = true;
@@ -132195,7 +135479,7 @@ self: {
        pname = "unpack-funcs";
        version = "0.3.1";
        sha256 = "0ha8xbg1a560rd5grg6i2acg3nzq6f4d6qa7i6vrbnz7bqbg77q3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring primitive template-haskell transformers vector
        ];
        description = "Monad transformers that mirror worker-wrapper transformations";
@@ -132209,7 +135493,7 @@ self: {
        pname = "unroll-ghc-plugin";
        version = "0.1.1";
        sha256 = "0n05777fqqpbgnh9jab04ayw1j1as4wkkbrjixi1288fhi44m87p";
-       buildDepends = [ base ghc ];
+       libraryHaskellDepends = [ base ghc ];
        homepage = "http://thoughtpolice.github.com/unroll-ghc-plugin";
        description = "Compiler plugin for loop unrolling";
        license = stdenv.lib.licenses.bsd3;
@@ -132221,7 +135505,7 @@ self: {
        pname = "unsafe";
        version = "0.0";
        sha256 = "0hc6xr1i3hkz25gdgfx1jqgpsc9mwa05bkfynp0mcfdlyz6782nz";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~thielema/unsafe/";
        description = "Unified interface to unsafe functions";
        license = stdenv.lib.licenses.bsd3;
@@ -132233,7 +135517,7 @@ self: {
        pname = "unsafe-promises";
        version = "0.0.1.3";
        sha256 = "1018c3q0aq6l0011az661dvlibiv6jvwdv4c40bi8pwapri66k70";
-       buildDepends = [ base threads ];
+       libraryHaskellDepends = [ base threads ];
        homepage = "https://github.com/kallisti-dev/unsafe-promises";
        description = "Create pure futures using lazy IO";
        license = stdenv.lib.licenses.bsd3;
@@ -132247,12 +135531,12 @@ self: {
        sha256 = "10v50bzd7ccjs0d1spvyl6awhwdhxmkcacm2lkillk9f7myild0r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/konn/unsafely";
        description = "Flexible access control for unsafe operations and instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unsafeperformst" = callPackage
@@ -132261,7 +135545,7 @@ self: {
        pname = "unsafeperformst";
        version = "0.9.2";
        sha256 = "0l268mzlmswm0p9cybjvi6krsgic706av9kf90fx3ylyvhgzygvc";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/atzeus/unsafeperformst";
        description = "Like unsafeperformIO, but for the ST monad";
        license = stdenv.lib.licenses.bsd3;
@@ -132277,7 +135561,7 @@ self: {
        sha256 = "1zlf9dw3yid6s9p0q837h3qs2wnd9wr9kh282j4j4m0gpv9dcrrf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base optparse-applicative stream-fusion unordered-containers
        ];
        description = "Solve Boggle-like word games";
@@ -132293,7 +135577,7 @@ self: {
        sha256 = "102dzsa64vnbhx2pnnh6q0vn7wag9bd8pmmag3i2yl68iqaqlvpm";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Utility construction of the graph depending unusable packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132308,7 +135592,7 @@ self: {
        sha256 = "1w37jmnmx2vrdwbdcnhb29bvy4857pzcx4gdavmcp598lsfj34vy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base directory filepath lambda-options mtl split
        ];
        jailbreak = true;
@@ -132326,7 +135610,7 @@ self: {
        sha256 = "1njmx622ghpzgnwm4wykzjj1ixpalbj21hs7nkbwpmljniakp2fb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ports-tools process ];
+       executableHaskellDepends = [ base ports-tools process ];
        homepage = "http://github.com/ppenzin/up/";
        description = "Software management tool";
        license = "unknown";
@@ -132340,7 +135624,7 @@ self: {
        pname = "uploadcare";
        version = "0.1";
        sha256 = "1lm7mp8djhxylavihaljqjfsgzpn747plkq6f7yd2dk32xlsb5bz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring cryptohash hex http-conduit
          http-types old-locale time
        ];
@@ -132356,7 +135640,7 @@ self: {
        pname = "upskirt";
        version = "0.0.4";
        sha256 = "0528345xiq2xmi9fwzv0rvbjqfhcvyhkik8c453yr2nr03k0zs4c";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        description = "Binding to upskirt";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132375,7 +135659,7 @@ self: {
        sha256 = "11zgs8mmmkvddyq6s0x98gdqbdaj6n3rxf6ab3xf1ap2cd4siwb8";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-wl-pprint async base bytestring containers curl data-default
          deepseq directory download-curl feed filepath implicit-params
          network old-locale opml optparse-applicative parallel-io split
@@ -132399,7 +135683,7 @@ self: {
        sha256 = "0fnr3xskzwxxxk7iv5bmqa18zbr612pn27jjiac0l4wzv33lisik";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cake3 directory filepath language-javascript
          mime-types mtl optparse-applicative process syb text
        ];
@@ -132416,7 +135700,7 @@ self: {
        pname = "uri";
        version = "0.1.6.3";
        sha256 = "1dhmrn4mq3ia0iv3y2k5pw71a6677q3vdqqf2w4b3aksi6wna49j";
-       buildDepends = [ base parsec safe utf8-string ];
+       libraryHaskellDepends = [ base parsec safe utf8-string ];
        homepage = "http://gitorious.org/uri";
        description = "Library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
@@ -132431,15 +135715,16 @@ self: {
        pname = "uri-bytestring";
        version = "0.1.6";
        sha256 = "0wz45jrxrj2mqx26nv39hy962acmzchp97lbf3d2mjna9zcd1ij6";
-       buildDepends = [ attoparsec base blaze-builder bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring
+       ];
+       testHaskellDepends = [
          attoparsec base blaze-builder bytestring derive HUnit lens
          QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-conduit" = callPackage
@@ -132451,7 +135736,7 @@ self: {
        pname = "uri-conduit";
        version = "1.1.1.2";
        sha256 = "0bmq241in1x0bjffp6nmbz8lf324q926mcddpvmzn2j1ipy7fvg6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers deepseq failure monad-control
          network system-fileio system-filepath text transformers
        ];
@@ -132471,7 +135756,9 @@ self: {
        sha256 = "10pmg48h1az474qsr951inyvkm5y9xqwrdzyvxf83k53i07kijpp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring network-uri text utf8-string ];
+       libraryHaskellDepends = [
+         base bytestring network-uri text utf8-string
+       ];
        description = "Unicode aware uri-encoding";
        license = "unknown";
      }) {};
@@ -132484,7 +135771,7 @@ self: {
        pname = "uri-enumerator";
        version = "0.1.0.1";
        sha256 = "164yzmx18ykkf2vbl9zhqmbvb80dig8bx3pfadw23a6wyvigmhw5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers enumerator failure network text
          transformers
        ];
@@ -132504,7 +135791,7 @@ self: {
        pname = "uri-enumerator-file";
        version = "0.1.1.1";
        sha256 = "15ycv01kmwnwq3qkjjcl8ayal0p4klhflzkykm2rlq1d8mi2vmd6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers enumerator lifted-base monad-control
          network system-fileio system-filepath text transformers
          uri-enumerator
@@ -132524,7 +135811,8 @@ self: {
        sha256 = "1y1jqymjbawwdywk770j4rk8sy7p1plvfliwcmqr0h16y31kzlpl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers utf8-string ];
+       libraryHaskellDepends = [ base containers utf8-string ];
+       executableHaskellDepends = [ base ];
        description = "URI template library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132538,11 +135826,13 @@ self: {
        pname = "uri-templater";
        version = "0.2.0.0";
        sha256 = "0ypyi5vz7fjgvw1xicjksjfbpvm472dif2jw6pn09jfgqkal075s";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-wl-pprint base charset containers dlist HTTP mtl parsers
          template-haskell text trifecta unordered-containers vector
        ];
-       testDepends = [ ansi-wl-pprint base HUnit mtl template-haskell ];
+       testHaskellDepends = [
+         ansi-wl-pprint base HUnit mtl template-haskell
+       ];
        homepage = "http://github.com/sanetracker/uri-templater";
        description = "Parsing & Quasiquoting for RFC 6570 URI Templates";
        license = stdenv.lib.licenses.mit;
@@ -132554,7 +135844,7 @@ self: {
        pname = "url";
        version = "2.1.3";
        sha256 = "0qag18wbrq9jjk1444mjigz1xl7xl03fz66b1lnya9qaihzpxwjs";
-       buildDepends = [ base utf8-string ];
+       libraryHaskellDepends = [ base utf8-string ];
        homepage = "http://www.haskell.org/haskellwiki/Url";
        description = "A library for working with URLs";
        license = stdenv.lib.licenses.bsd3;
@@ -132565,10 +135855,10 @@ self: {
      mkDerivation {
        pname = "url-generic";
        version = "0.1";
-       revision = "1";
        sha256 = "0yfcy2nhc67kxb7n9mjxi4z5jcq4iz4kq80fb9lbi461vijhmw5m";
+       revision = "1";
        editedCabalFile = "d9926e2ce6433a73b2ba940d476f7046890752c8a1145b42a78561e8d3ff6fb9";
-       buildDepends = [ base mtl syb ];
+       libraryHaskellDepends = [ base mtl syb ];
        description = "Parse/format generic key/value URLs from record data types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132584,7 +135874,9 @@ self: {
        sha256 = "1mddlppdb0c9pxvjfm40i0bcrg7wbc61hzlrlv6kir0n1j9yb8ri";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring containers mtl network old-time ];
+       executableHaskellDepends = [
+         base bytestring containers mtl network old-time
+       ];
        homepage = "http://code.haskell.org/~dons/code/urlcheck";
        description = "Parallel link checker";
        license = stdenv.lib.licenses.bsd3;
@@ -132599,7 +135891,7 @@ self: {
        sha256 = "13fip41s78qcnrg4zccd5lk3qbsaax7h5sspc0xjzlaca664hq3y";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base network ];
+       executableHaskellDepends = [ base network ];
        homepage = "https://github.com/beastaugh/urldecode";
        description = "Decode percent-encoded strings";
        license = stdenv.lib.licenses.bsd3;
@@ -132612,7 +135904,7 @@ self: {
        pname = "urldisp-happstack";
        version = "0.1";
        sha256 = "1kg25w5pnmsnjwycnf0q6d65cqfw5d0xn9rwyn4ybhh3a8q2yaa8";
-       buildDepends = [ base bytestring happstack-server mtl ];
+       libraryHaskellDepends = [ base bytestring happstack-server mtl ];
        description = "Simple, declarative, expressive URL routing -- on happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132626,11 +135918,10 @@ self: {
        sha256 = "16b7jxkfva8dyvl4fdg337jmv08aicycj041s79ak9r6zh41hhwi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl network network-uri split ];
+       libraryHaskellDepends = [ base mtl network network-uri split ];
        homepage = "https://github.com/pheaver/urlencoded";
        description = "Generate or process x-www-urlencoded data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urlpath" = callPackage
@@ -132640,11 +135931,13 @@ self: {
      mkDerivation {
        pname = "urlpath";
        version = "2.1.0";
-       revision = "1";
        sha256 = "1q8zj228ln9xmr3r0ggv6pi074l8ixchn81mw8664jikf2pjcqq9";
+       revision = "1";
        editedCabalFile = "a342b25d9ea3984cf20025d421f59629d7abdf4bd2b42a4e9ef53ba5729f13e1";
-       buildDepends = [ base monoid-subclasses mtl transformers ];
-       testDepends = [
+       libraryHaskellDepends = [
+         base monoid-subclasses mtl transformers
+       ];
+       testHaskellDepends = [
          base hspec monoid-subclasses mtl QuickCheck quickcheck-instances
          text transformers
        ];
@@ -132658,8 +135951,8 @@ self: {
        pname = "urn";
        version = "0.1.0.0";
        sha256 = "1wxgq445nzfly9773bjx3mr15l8ga4840d2q1zw50kk07fwxx6h7";
-       buildDepends = [ base parsec ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base parsec ];
+       testHaskellDepends = [ base hspec ];
        jailbreak = true;
        homepage = "https://github.com/pxqr/urn";
        description = "Universal Resource Names";
@@ -132676,7 +135969,7 @@ self: {
        sha256 = "141b2dhqpbirqlv53rm3xsl14mq0vxw96r3qhygraw5gp5vlvgl9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base filepath mtl optparse-applicative parsec process syb
        ];
        jailbreak = true;
@@ -132694,7 +135987,7 @@ self: {
        pname = "usb";
        version = "1.3.0.3";
        sha256 = "0wn17x61pnckrxn4gba7fdk1phjm82dc2wiblm2wc36xf6mw16yf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-libusb bytestring containers ghc-prim text vector
        ];
        homepage = "http://basvandijk.github.com/usb";
@@ -132710,7 +136003,7 @@ self: {
        pname = "usb-enumerator";
        version = "0.3";
        sha256 = "1gd132pshcqa8539g1dmx1hpzfdd33x7vpi9d3hrc6q6l6312nfs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bindings-libusb iteratee monad-control
          transformers usb
        ];
@@ -132725,10 +136018,10 @@ self: {
      mkDerivation {
        pname = "usb-hid";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "0mx4f1zrk098c9isczni66i8qisx54r85kwyk2s238dznlys39gh";
+       revision = "1";
        editedCabalFile = "3fe150e203f72b72c425bef276254a2ca91ca40cab21f6088838bb32c806e8dc";
-       buildDepends = [ attoparsec base bytestring usb ];
+       libraryHaskellDepends = [ attoparsec base bytestring usb ];
        jailbreak = true;
        homepage = "https://github.com/mapinguari/usb-hid";
        description = "Parser and request Library for USB HIDs";
@@ -132745,7 +136038,7 @@ self: {
        sha256 = "1ji6zrglmlkhv743w4d4lrqvhva4yl5kqxb420z44l1wymvgg1s1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bytestring containers
          containers-unicode-symbols parsimony
        ];
@@ -132762,7 +136055,7 @@ self: {
        pname = "usb-iteratee";
        version = "0.5";
        sha256 = "04kv2pfw24d46b135p6mwgf40wb9q43lcy66cbczh4lz0630j771";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bindings-libusb iteratee monad-control
          usb vector
        ];
@@ -132781,7 +136074,7 @@ self: {
        pname = "usb-safe";
        version = "0.14";
        sha256 = "1dhx7y74f2c04dmlsx0i80ar31d6k2qsgh7432c8k0y29iwhdzfm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-unicode-symbols bindings-libusb bytestring iteratee
          regions text transformers usb
        ];
@@ -132798,7 +136091,9 @@ self: {
        pname = "users";
        version = "0.3.0.0";
        sha256 = "1f63223fxrcyp3gz63viqncqs7yln0mifcnh123172rnfhn61zka";
-       buildDepends = [ aeson base bcrypt path-pieces text time ];
+       libraryHaskellDepends = [
+         aeson base bcrypt path-pieces text time
+       ];
        homepage = "https://github.com/agrafix/users";
        description = "A library simplifying user management for web applications";
        license = stdenv.lib.licenses.mit;
@@ -132813,11 +136108,11 @@ self: {
        pname = "users-persistent";
        version = "0.3.0.0";
        sha256 = "0hdvsnjciw3a6gsz5lv5q6m5fs3hd60gmgfbzgx5n7md2ya5jimr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring mtl persistent persistent-template text time
          users uuid
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec monad-logger persistent-sqlite temporary text users-test
        ];
        homepage = "https://github.com/agrafix/users";
@@ -132833,10 +136128,10 @@ self: {
        pname = "users-postgresql-simple";
        version = "0.3.0.0";
        sha256 = "039da6rvjcdjg5lpd5hqkxcb9vgdcd7ppjiqk3gn6jl5q1gn1yzr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring mtl postgresql-simple text time users uuid
        ];
-       testDepends = [ base hspec postgresql-simple users-test ];
+       testHaskellDepends = [ base hspec postgresql-simple users-test ];
        homepage = "https://github.com/agrafix/users";
        description = "A PostgreSQL backend for the users package";
        license = stdenv.lib.licenses.mit;
@@ -132848,7 +136143,7 @@ self: {
        pname = "users-test";
        version = "0.3.0.0";
        sha256 = "1cmrd0igkidmv8jfb3dv3g49i1k71rh3i4v3dksql18g7472cnxh";
-       buildDepends = [ aeson base hspec text users ];
+       libraryHaskellDepends = [ aeson base hspec text users ];
        homepage = "https://github.com/agrafix/users";
        description = "Library to test backends for the users library";
        license = stdenv.lib.licenses.mit;
@@ -132863,10 +136158,10 @@ self: {
        pname = "utc";
        version = "0.2.0.1";
        sha256 = "0vnydjjvv0kh1mww9vb9l90crl9ddd5n63dwpjjs8ln56b5yvv5h";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring clock exceptions text
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring Cabal clock exceptions QuickCheck
          test-framework test-framework-quickcheck2 text
        ];
@@ -132882,7 +136177,7 @@ self: {
        pname = "utf8-env";
        version = "0.1";
        sha256 = "0ls2ls2n12igm1day730sp1gfcwxvkkqd2xdp2lmyp2ldp0d72zp";
-       buildDepends = [ base mtl utf8-string ];
+       libraryHaskellDepends = [ base mtl utf8-string ];
        description = "UTF-8 aware substitutes for functions in System.Environment";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132893,7 +136188,7 @@ self: {
        pname = "utf8-light";
        version = "0.4.2";
        sha256 = "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q";
-       buildDepends = [ base bytestring ghc-prim ];
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
        description = "Unicode";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132906,7 +136201,7 @@ self: {
        sha256 = "156kjn3da02z060srlsm8kqwbxzcscjzxdkp4lmv8zq5zscha5v6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base utf8-string ];
+       libraryHaskellDepends = [ base utf8-string ];
        jailbreak = true;
        description = "Variants of Prelude and System.IO with UTF8 text I/O operations";
        license = stdenv.lib.licenses.bsd3;
@@ -132918,7 +136213,7 @@ self: {
        pname = "utf8-string";
        version = "1";
        sha256 = "025snarzyk4kkw1dk3i8dsxilvxh4kazl6nwq61w9q49y39qiwvr";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/glguy/utf8-string/";
        description = "Support for reading and writing UTF8 Strings";
        license = stdenv.lib.licenses.bsd3;
@@ -132930,8 +136225,8 @@ self: {
        pname = "utility-ht";
        version = "0.0.10";
        sha256 = "17ydzb0p8xhddvfvm4wjv5yjmy0v7nj6fsj11srnnpj91wc9k0xd";
-       buildDepends = [ base ];
-       testDepends = [ base QuickCheck ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
        description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132942,7 +136237,7 @@ self: {
        pname = "uu-cco";
        version = "0.1.0.3";
        sha256 = "0na2gd82z7llrppaskfkrqj3lbl0k6kvb62n4qhpqgsyz001fi8j";
-       buildDepends = [ ansi-terminal base ];
+       libraryHaskellDepends = [ ansi-terminal base ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: core functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -132956,7 +136251,7 @@ self: {
        sha256 = "1i8idcbq602hl1il326lq9b5gcjm9qn00wpragr1kj676g615024";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base uu-cco uuagc uuagc-cabal ];
+       executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: example programs";
        license = stdenv.lib.licenses.bsd3;
@@ -132968,7 +136263,7 @@ self: {
        pname = "uu-cco-hut-parsing";
        version = "0.1.0.1";
        sha256 = "06ddh2fcvy0zbzzdgpcx8kvlssrcmxx4swgkl8iy7223llanx0px";
-       buildDepends = [ base uu-cco uulib ];
+       libraryHaskellDepends = [ base uu-cco uulib ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: Feedback wrapper around parser in uulib";
        license = stdenv.lib.licenses.bsd3;
@@ -132980,7 +136275,7 @@ self: {
        pname = "uu-cco-uu-parsinglib";
        version = "0.1.0.1";
        sha256 = "1sshnlqb0ydxgrhm0i1c3mpnixfsqwrf3gl59yz4rhiw5hy33z71";
-       buildDepends = [ base ListLike uu-cco uu-parsinglib ];
+       libraryHaskellDepends = [ base ListLike uu-cco uu-parsinglib ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib";
        license = stdenv.lib.licenses.bsd3;
@@ -132992,7 +136287,7 @@ self: {
        pname = "uu-interleaved";
        version = "0.2.0.0";
        sha256 = "1rysap86jrq43b99ay52nrmbdpcba7cl0ac85nsb7gll1rbyr59i";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
        description = "Providing an interleaving combinator for use with applicative/alternative style implementations";
        license = stdenv.lib.licenses.mit;
@@ -133006,7 +136301,7 @@ self: {
        pname = "uu-options";
        version = "0.2.0.0";
        sha256 = "11gixk6lxsakcdxir9jla5nk71phmlzd9hxp8wq23n550xw91ij6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lenses mtl template-haskell transformers uu-interleaved
          uu-parsinglib
        ];
@@ -133021,7 +136316,7 @@ self: {
        pname = "uu-parsinglib";
        version = "2.9.1";
        sha256 = "0cic0f689a6n2si43ijyvkp174y1yfppqv64dicwxz6rm2jhz70d";
-       buildDepends = [ base ListLike time uu-interleaved ];
+       libraryHaskellDepends = [ base ListLike time uu-interleaved ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
        description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, interleaving, idiomatic parser combinators";
        license = stdenv.lib.licenses.mit;
@@ -133033,7 +136328,7 @@ self: {
        pname = "uu-tc";
        version = "2009.2.2";
        sha256 = "0s7b23r7gnavwnvzpi25mc0hyg605ms249k5i4661nqpfiwn7zry";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133049,10 +136344,11 @@ self: {
        sha256 = "1191a1jr1s76wjdrfzafy1ibf7a7xpg54dvwhwz4kr1jrc9jn2cq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base containers directory filepath ghc-prim haskell-src-exts
          mtl uuagc-cabal uulib
        ];
+       executableHaskellDepends = [ base uuagc-cabal ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
@@ -133068,7 +136364,11 @@ self: {
        sha256 = "0zsb8pz2zx7y8sjp392hpdk30dzzmppjizcnlgd1wvq2csacnfxq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         array base containers directory filepath ghc-prim haskell-src-exts
+         mtl uulib
+       ];
+       executableHaskellDepends = [
          array base containers directory filepath ghc-prim haskell-src-exts
          mtl uulib
        ];
@@ -133085,7 +136385,7 @@ self: {
        pname = "uuagc-cabal";
        version = "1.0.6.0";
        sha256 = "02xqj4vz7hir0llxl8n517qv22jlmilknhqzx4l55gccffg7zj6w";
-       buildDepends = [
+       libraryHaskellDepends = [
          base Cabal containers directory filepath mtl process uulib
        ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
@@ -133099,7 +136399,7 @@ self: {
        pname = "uuagc-diagrams";
        version = "0.1.1.0";
        sha256 = "16sf4kbjgxsi3amdpr3nqg15f2gmjvf3w2wh6pn72zhjqsbnfnmz";
-       buildDepends = [ base diagrams-lib SVGFonts ];
+       libraryHaskellDepends = [ base diagrams-lib SVGFonts ];
        jailbreak = true;
        description = "Utility for drawing attribute grammar pictures with the diagrams package";
        license = stdenv.lib.licenses.bsd3;
@@ -133114,7 +136414,8 @@ self: {
        sha256 = "1gcznzb8hr2x5mr5pgfqhnvjjrll96g855g4niacw5bd52wdvsla";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base blaze-html process ];
+       libraryHaskellDepends = [ base blaze-html ];
+       executableHaskellDepends = [ base process ];
        homepage = "https://github.com/matthijssteen/uuagd";
        description = "A debugger for the UUAG system";
        license = "unknown";
@@ -133129,11 +136430,11 @@ self: {
        pname = "uuid";
        version = "1.3.11";
        sha256 = "1m8lk12ls4c5xx1y3wm2n2spm2c5slwb27k6zrdibja8z397c637";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring cryptohash network-info random text time
          uuid-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck random tasty tasty-hunit
          tasty-quickcheck
        ];
@@ -133148,7 +136449,7 @@ self: {
        pname = "uuid-aeson";
        version = "0.1.0.0";
        sha256 = "0nd2xm908zycrbmrayi6d4c9p9rfplsjkwnz43nrq94xjn1dp2yg";
-       buildDepends = [ aeson base text uuid ];
+       libraryHaskellDepends = [ aeson base text uuid ];
        description = "Aeson types for UUID instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133159,7 +136460,7 @@ self: {
        pname = "uuid-le";
        version = "0.2014.1";
        sha256 = "1gfm7bxmr2b5hn4x3dr231ra0b1nwp36x2808w3l43yglz8zwp74";
-       buildDepends = [ base bytestring uuid ];
+       libraryHaskellDepends = [ base bytestring uuid ];
        description = "Universally Unique Identifiers with little-endian-ish encoding tools";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -133170,7 +136471,7 @@ self: {
        pname = "uuid-quasi";
        version = "0.1.0.1";
        sha256 = "09ijnbj2znaqanaxghql3yy1fqb0nsjhrwi6kfzg4h8nrw1ir2pj";
-       buildDepends = [ base template-haskell uuid ];
+       libraryHaskellDepends = [ base template-haskell uuid ];
        homepage = "http://github.com/lpeterse/uuid-quasi";
        description = "Supplemental package for 'uuid' allowing quasiquotation";
        license = stdenv.lib.licenses.bsd3;
@@ -133184,10 +136485,10 @@ self: {
        pname = "uuid-types";
        version = "1.0.2";
        sha256 = "019f9w1jvqacbxmq828wsn6zpwp5yw7bkhyj34a4cc2zq3bfkijn";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring deepseq hashable random text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/aslatter/uuid";
@@ -133201,7 +136502,7 @@ self: {
        pname = "uulib";
        version = "0.9.20";
        sha256 = "1qz73rjxywc9mf54d2j4xv9m7d15gnfmi1c1fj3yklx059xlvfz2";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/UU-ComputerScience/uulib";
        description = "Haskell Utrecht Tools Library";
        license = stdenv.lib.licenses.bsd3;
@@ -133212,10 +136513,10 @@ self: {
      mkDerivation {
        pname = "uvector";
        version = "0.1.1.1";
-       revision = "1";
        sha256 = "1psbdsq20nr28cr9ni2mwzwkpz3p20n1xqp0m0m9qafz66d2vi08";
+       revision = "1";
        editedCabalFile = "e289ff93c365248deb93e6268b57be8a47d724a39702887979fd842c80577508";
-       buildDepends = [ base ghc-prim ];
+       libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~dons/code/uvector";
        description = "Fast unboxed arrays with a flexible interface";
@@ -133229,7 +136530,7 @@ self: {
        pname = "uvector-algorithms";
        version = "0.2";
        sha256 = "0jzlirrar7grq3h02k22zxyvy1wmfrjw9lscnhpjqmsxjli1jh81";
-       buildDepends = [ base uvector ];
+       libraryHaskellDepends = [ base uvector ];
        homepage = "http://code.haskell.org/~dolio/";
        description = "Efficient algorithms for uvector unboxed arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -133242,7 +136543,7 @@ self: {
        pname = "uxadt";
        version = "0.0.16.0";
        sha256 = "0qmp5k4wg5ja2382cwarf8fwjval2a5wdwvz32f965hvwgc9cd43";
-       buildDepends = [ base json MissingH mtl ];
+       libraryHaskellDepends = [ base json MissingH mtl ];
        description = "Cross-language extensible representation for algebraic data type instances";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -133253,7 +136554,7 @@ self: {
        pname = "uzbl-with-source";
        version = "0.1.0.0";
        sha256 = "0q6n18kqga839gkdgdwsfbnbpfm4hh1qjln17qnmfxm3ylh2l9la";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        homepage = "http://github.com/Fuuzetsu/uzbl-with-source";
        description = "Utility function for reading a source of loaded uzbl pages";
        license = stdenv.lib.licenses.gpl3;
@@ -133267,7 +136568,7 @@ self: {
        pname = "v4l2";
        version = "0.1.0.3";
        sha256 = "1hhdpljlic1kyz0pgnv9a04z6prv7rl3x5bam5j0yhm5vijrisgp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bindings-DSL bindings-libv4l2 bindings-linux-videodev2
          bindings-posix containers ioctl
        ];
@@ -133285,7 +136586,7 @@ self: {
        sha256 = "1knn4cbvvk1vsn9if87hqfg761n4410p08g7vlav900svfm8i1l5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base GLUT v4l2 ];
+       executableHaskellDepends = [ base GLUT v4l2 ];
        jailbreak = true;
        homepage = "https://gitorious.org/hsv4l2";
        description = "video for linux two examples";
@@ -133294,18 +136595,17 @@ self: {
      }) {};
 
   "vacuum" = callPackage
-    ({ mkDerivation, array, base, containers, ghc-paths, ghc-prim }:
+    ({ mkDerivation, array, base, containers, ghc-prim }:
      mkDerivation {
        pname = "vacuum";
        version = "2.2.0.0";
        sha256 = "157wjx2shzfh6dfl6h8x017cn9ji3ql1p0gpi79ginz4s81f2ny1";
-       buildDepends = [ array base containers ghc-prim ];
-       extraLibraries = [ ghc-paths ];
+       libraryHaskellDepends = [ array base containers ghc-prim ];
        homepage = "http://thoughtpolice.github.com/vacuum";
        description = "Graph representation of the GHC heap";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ghc-paths = null;};
+     }) {};
 
   "vacuum-cairo" = callPackage
     ({ mkDerivation, base, cairo, deepseq, directory, gtk, pretty
@@ -133315,7 +136615,7 @@ self: {
        pname = "vacuum-cairo";
        version = "0.5";
        sha256 = "0jp3xn1h28igcg3xb97ifawx11i7adnyi0ff264w0fril9b8ylwc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base cairo deepseq directory gtk pretty process strict-concurrency
          svgcairo vacuum
        ];
@@ -133331,7 +136631,7 @@ self: {
        pname = "vacuum-graphviz";
        version = "2.1.0.1";
        sha256 = "093ba6n30a6gyifnk3bd50rkx8qldjqq9vsk92pnq152ibs36b2m";
-       buildDepends = [ base filepath graphviz vacuum ];
+       libraryHaskellDepends = [ base filepath graphviz vacuum ];
        jailbreak = true;
        description = "A library for transforming vacuum graphs into GraphViz output";
        license = stdenv.lib.licenses.gpl3;
@@ -133348,9 +136648,10 @@ self: {
        sha256 = "1dxw3apbf59b7vi4a1gnp29ia1s2q9vx79ns7257cg9cazb01z7j";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base network pretty vacuum ];
+       executableHaskellDepends = [
          base bitmap bitmap-opengl directory filepath GLUT network OpenGL
-         pretty process stb-image vacuum
+         process stb-image
        ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL";
@@ -133364,7 +136665,7 @@ self: {
        pname = "vacuum-ubigraph";
        version = "0.2.0.2";
        sha256 = "0zpag42dr2763ddrwdy7744lqkd6207ljfw3bqm6db3a1128861z";
-       buildDepends = [ base containers hubigraph vacuum ];
+       libraryHaskellDepends = [ base containers hubigraph vacuum ];
        jailbreak = true;
        description = "Visualize Haskell data structures using vacuum and Ubigraph";
        license = stdenv.lib.licenses.bsd3;
@@ -133381,8 +136682,13 @@ self: {
        sha256 = "07bqcp58hqyh5zvi6zpwwpppfzj30j60ryf6k0wqzckklibffqkj";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ attoparsec base directory filepath process text ];
-       testDepends = [
+       libraryHaskellDepends = [
+         attoparsec base directory filepath process text
+       ];
+       executableHaskellDepends = [
+         attoparsec base directory filepath process text
+       ];
+       testHaskellDepends = [
          attoparsec base directory filepath process QuickCheck text
        ];
        homepage = "https://github.com/hamishmack/vado";
@@ -133396,7 +136702,7 @@ self: {
        pname = "valid-names";
        version = "0.1.0.1";
        sha256 = "14gpkb6pbkvmny17g2gpq6i6kq7ahmcnkgrcrwm72vda12wxsl78";
-       buildDepends = [ base containers MonadRandom ];
+       libraryHaskellDepends = [ base containers MonadRandom ];
        jailbreak = true;
        homepage = "https://i.joelt.io/symbols.html";
        description = "Valid operator/module characters";
@@ -133422,10 +136728,10 @@ self: {
        pname = "validate-input";
        version = "0.2.0.0";
        sha256 = "0ijlkfizxpjy7r0bh59zfj1jyn77gqd0ryz8k19v7znckq7bxgls";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring either mtl pcre-heavy stringable text
        ];
-       testDepends = [ base hspec QuickCheck ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/agrafix/validate-input";
        description = "Input validation combinator library";
        license = stdenv.lib.licenses.mit;
@@ -133440,10 +136746,10 @@ self: {
        pname = "validation";
        version = "0.5.1";
        sha256 = "09fx4aa9jlyd59qyx0p6wpvzf9kr29j7xb10nsq61pxjbs1hn5qb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors lens mtl semigroupoids semigroups transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/validation";
@@ -133460,10 +136766,10 @@ self: {
        pname = "validations";
        version = "0.1.0.2";
        sha256 = "0nviyyp0nlpilp2byckrcmbd2n6wp40pq7m10da9b24hmwajkdwk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers digestive-functors mtl text transformers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers digestive-functors HUnit mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
          transformers
@@ -133480,7 +136786,7 @@ self: {
        pname = "value-supply";
        version = "0.6";
        sha256 = "0fd6rk46sgdbdmfdr9wy0f3qzwaymgd9hl9v735g2a4bqiqanmb5";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "A library for generating values without having to thread state";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133495,7 +136801,10 @@ self: {
        sha256 = "16f1mdsyyfdgjcp3rzf3p1qj3d6la01i9y1yyp97m5nmd2jxsn1q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base deepseq dlist fgl graphviz haskell-src-exts mtl uniplate
+       ];
+       executableHaskellDepends = [
          base deepseq directory dlist fgl graphviz haskell-src-exts mtl
          optparse-applicative process uniplate
        ];
@@ -133514,8 +136823,8 @@ self: {
        pname = "var";
        version = "0.2.0.0";
        sha256 = "1vc36yy8mvzy14jj8ly8ldc4d9vrcgyjfq3dpnzp6fhycg5kkv2i";
-       buildDepends = [ base transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "http://github.com/sonyandy/var";
@@ -133534,7 +136843,7 @@ self: {
        sha256 = "1hvpx4jw0lwcnc4x8vwdqp7rv8779p7xaw57cphkax13f3rwm372";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring cmdargs mtl parallel random
          statistics
        ];
@@ -133550,7 +136859,7 @@ self: {
        pname = "variable-precision";
        version = "0.4";
        sha256 = "1qd6mnbg06fn31vp9d4yan8rqxyymjljrlr7m4yvn2ppw560p564";
-       buildDepends = [
+       libraryHaskellDepends = [
          base complex-generic floatshow integer-gmp
          type-level-natural-number
        ];
@@ -133566,8 +136875,8 @@ self: {
        pname = "variables";
        version = "0.1.1";
        sha256 = "0garxmxm11qhp2wm7xib4nrlkfiqbyzf3glkdbqb582nip0sb1rp";
-       buildDepends = [ base mtl stm ];
-       testDepends = [ base hspec mtl QuickCheck stm ];
+       libraryHaskellDepends = [ base mtl stm ];
+       testHaskellDepends = [ base hspec mtl QuickCheck stm ];
        jailbreak = true;
        homepage = "https://github.com/prophile/variables";
        description = "Monads with variables, without deep magic";
@@ -133582,7 +136891,8 @@ self: {
        sha256 = "1y7mf2q1lawx3f8hdd9b70fa3hrmabm9lmi2rhxvr1dq5r5yh5q7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
+       executableHaskellDepends = [ base time ];
        homepage = "https://github.com/schell/varying";
        description = "Automaton based varying values, event streams and tweening";
        license = stdenv.lib.licenses.mit;
@@ -133595,7 +136905,9 @@ self: {
        pname = "vault";
        version = "0.3.0.4";
        sha256 = "0ah6qrg71krc87f4vjy4b4shdd0mgyil8fikb3j6fl4kfwlg67jn";
-       buildDepends = [ base containers hashable unordered-containers ];
+       libraryHaskellDepends = [
+         base containers hashable unordered-containers
+       ];
        homepage = "https://github.com/HeinrichApfelmus/vault";
        description = "a persistent store for values of arbitrary types";
        license = stdenv.lib.licenses.bsd3;
@@ -133611,12 +136923,12 @@ self: {
        pname = "vaultaire-common";
        version = "2.9.1";
        sha256 = "178lh1cxk6ayb4918xas0g7zlan8282vjflm220pzymnxz07chsr";
-       buildDepends = [
+       libraryHaskellDepends = [
          async attoparsec base blaze-builder bytestring cereal containers
          hashable hslogger locators old-locale packer QuickCheck siphash
          text time transformers unix unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec locators mtl QuickCheck text
          unordered-containers
        ];
@@ -133633,7 +136945,7 @@ self: {
        pname = "vcache";
        version = "0.2.6";
        sha256 = "08vg106dhzam5h0a6pzz4cbyzfg6pfgcgvn6xm1266kj1ipla18d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers direct-murmur-hash easy-file filelock
          lmdb random stm transformers
        ];
@@ -133650,7 +136962,9 @@ self: {
        pname = "vcache-trie";
        version = "0.2.0";
        sha256 = "0d56l8339ak9my6c37j3mykmfzz67405xyb90pl0i5lf35mbff32";
-       buildDepends = [ array base bytestring bytestring-builder vcache ];
+       libraryHaskellDepends = [
+         array base bytestring bytestring-builder vcache
+       ];
        homepage = "http://github.com/dmbarbour/haskell-vcache-trie";
        description = "patricia tries modeled above VCache";
        license = stdenv.lib.licenses.bsd3;
@@ -133662,7 +136976,9 @@ self: {
        pname = "vcard";
        version = "0.1.4";
        sha256 = "1wa1pdfw7ykmq72af63fh999il5nighf7689265hn3i5awm1m16p";
-       buildDepends = [ base bytestring containers mime-directory ];
+       libraryHaskellDepends = [
+         base bytestring containers mime-directory
+       ];
        homepage = "http://github.com/mboes/vCard";
        description = "A library for parsing/printing vCards from/to various formats";
        license = "LGPL";
@@ -133675,7 +136991,7 @@ self: {
        pname = "vcd";
        version = "0.2.2";
        sha256 = "0x0smhllghzn0xjfk5cwxaf1vnd2yp3saxw92ylyws8a546mzhzm";
-       buildDepends = [ base polyparse ];
+       libraryHaskellDepends = [ base polyparse ];
        homepage = "http://tomahawkins.org";
        description = "Reading and writing VCD files";
        license = stdenv.lib.licenses.bsd3;
@@ -133687,7 +137003,7 @@ self: {
        pname = "vcs-revision";
        version = "0.0.2";
        sha256 = "1lp1wf440n7kinmxz7la0gyfqfdlip6f0bn8pmwkxd1dqyrvg5cg";
-       buildDepends = [ base process ];
+       libraryHaskellDepends = [ base process ];
        description = "Facilities for accessing the version control revision of the current directory";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133702,7 +137018,10 @@ self: {
        sha256 = "0wqvd57n74fps2cybn970fgag2bxz8y8wwx4hb3dz7znpqzlp7y8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base directory filepath gtk mtl process text vcswrapper
+       ];
+       executableHaskellDepends = [
          base directory filepath gtk mtl process text vcswrapper
        ];
        homepage = "https://github.com/forste/haskellVCSGUI";
@@ -133720,7 +137039,11 @@ self: {
        sha256 = "1rbmlfg6kf7b1njfwnd85shlhw8b65j53zsrcn250baj8z0x0p9s";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers directory filepath hxt mtl parsec process split
+         text
+       ];
+       executableHaskellDepends = [
          base containers directory filepath hxt mtl parsec process split
          text
        ];
@@ -133735,7 +137058,7 @@ self: {
        pname = "vect";
        version = "0.4.7";
        sha256 = "1049jh8rcxfnyckz5m5asdlyafqszlig96k387raldyfzbrf8f4d";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A low-dimensional linear algebra library, tailored to computer graphics";
        license = stdenv.lib.licenses.bsd3;
@@ -133747,7 +137070,7 @@ self: {
        pname = "vect-floating";
        version = "0.1.0.4";
        sha256 = "1kxsjsiqqpi7k0xz597z7r2fd45s38plgk6jplzxagg0i3bm0q4g";
-       buildDepends = [ base random ];
+       libraryHaskellDepends = [ base random ];
        jailbreak = true;
        homepage = "http://github.com/cpdurham/vect-floating";
        description = "A low-dimensional linear algebra library, operating on the Floating typeclass";
@@ -133759,10 +137082,10 @@ self: {
      mkDerivation {
        pname = "vect-floating-accelerate";
        version = "0.1.0.4";
-       revision = "1";
        sha256 = "10mn2gvpkp14j7rc7cc66x30k7xh56xpp04ak1aj8p46rsy75s4x";
+       revision = "1";
        editedCabalFile = "af7a5778a0ab8e79fdd4d535aeda7dba18ead15ea3f0b5ae87c3b17c5a076216";
-       buildDepends = [ accelerate base vect-floating ];
+       libraryHaskellDepends = [ accelerate base vect-floating ];
        jailbreak = true;
        homepage = "http://github.com/cpdurham/vect-floating-accelerate";
        description = "Accelerate instances for vect-floating types";
@@ -133775,7 +137098,7 @@ self: {
        pname = "vect-opengl";
        version = "0.4.6.1";
        sha256 = "1qp98j6bgldjcs71pd7iqc5sjf1ixb1jj0l267hw532j4yf81dig";
-       buildDepends = [ base OpenGL vect ];
+       libraryHaskellDepends = [ base OpenGL vect ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
        license = stdenv.lib.licenses.bsd3;
@@ -133787,7 +137110,7 @@ self: {
        pname = "vector";
        version = "0.10.9.3";
        sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx";
-       buildDepends = [ base deepseq ghc-prim primitive ];
+       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
        jailbreak = true;
        homepage = "https://github.com/haskell/vector";
        description = "Efficient Arrays";
@@ -133803,8 +137126,8 @@ self: {
        pname = "vector";
        version = "0.10.12.3";
        sha256 = "16p8i0gvc9d4n9mxlhlnvrl2s0gmgd7kcsk5czdzz2cd4gh5qxhg";
-       buildDepends = [ base deepseq ghc-prim primitive ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
+       testHaskellDepends = [
          base QuickCheck random template-haskell test-framework
          test-framework-quickcheck2 transformers
        ];
@@ -133823,8 +137146,8 @@ self: {
        pname = "vector";
        version = "0.11.0.0";
        sha256 = "1r1jlksy7b0kb0fy00g64isk6nyd9wzzdq31gx5v1wn38knj0lqa";
-       buildDepends = [ base deepseq ghc-prim primitive ];
-       testDepends = [
+       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
+       testHaskellDepends = [
          base QuickCheck random template-haskell test-framework
          test-framework-quickcheck2 transformers
        ];
@@ -133841,13 +137164,16 @@ self: {
      mkDerivation {
        pname = "vector-algorithms";
        version = "0.7";
-       revision = "1";
        sha256 = "1ijnmgvdhj2qi5rsq4b1ffci47inck9arrcan5jzfkvzr54fvzcx";
+       revision = "1";
        editedCabalFile = "ba3ba4dbfe97dc45be68d13c51ba4425900b186a46cdf3eceaafb746030c1b95";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring mtl mwc-random primitive vector ];
-       testDepends = [ base bytestring containers QuickCheck vector ];
+       libraryHaskellDepends = [ base bytestring primitive vector ];
+       executableHaskellDepends = [ base mtl mwc-random vector ];
+       testHaskellDepends = [
+         base bytestring containers QuickCheck vector
+       ];
        homepage = "http://code.haskell.org/~dolio/";
        description = "Efficient algorithms for vector arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -133859,7 +137185,7 @@ self: {
        pname = "vector-binary";
        version = "0.1.1";
        sha256 = "1qdjibh3ywfa0lvawdahnr9qhh2qy6899lm5inbzmksjpykgbazz";
-       buildDepends = [ base binary vector ];
+       libraryHaskellDepends = [ base binary vector ];
        homepage = "https://github.com/kawu/vector-binary";
        description = "Binary instances for vector types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -133871,7 +137197,7 @@ self: {
        pname = "vector-binary-instances";
        version = "0.2.1.0";
        sha256 = "028rsf2w193rhs1gic5yvvrwidw9sblczcn10aw64npfc6502l4l";
-       buildDepends = [ base binary cereal vector ];
+       libraryHaskellDepends = [ base binary cereal vector ];
        homepage = "https://github.com/bos/vector-binary-instances";
        description = "Instances of Data.Binary and Data.Serialize for vector";
        license = stdenv.lib.licenses.bsd3;
@@ -133883,7 +137209,7 @@ self: {
        pname = "vector-buffer";
        version = "0.4.1";
        sha256 = "16zxc2d25qd15nankhc974ax7q3y72mg5a77v5jsfrw291brnnlv";
-       buildDepends = [ base deepseq vector ];
+       libraryHaskellDepends = [ base deepseq vector ];
        description = "A buffer compatible with Data.Vector.*";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133898,10 +137224,11 @@ self: {
        sha256 = "0xiksm1136azrcidcsi9g59i1nb9r8lhzsn1fhnp830sr63fy7k4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base bytestring criterion deepseq ghc-prim primitive vector
+       libraryHaskellDepends = [
+         base bytestring deepseq ghc-prim primitive vector
        ];
-       testDepends = [ base directory QuickCheck random ];
+       executableHaskellDepends = [ base bytestring criterion deepseq ];
+       testHaskellDepends = [ base directory QuickCheck random ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/vector-bytestring";
        description = "ByteStrings as type synonyms of Storable Vectors of Word8s";
@@ -133918,8 +137245,8 @@ self: {
        pname = "vector-clock";
        version = "0.2.2";
        sha256 = "0ndp25w61rcj4sadvhxlirrk1dhk7rmdzv9kha7kyqa41whr9629";
-       buildDepends = [ base binary ghc-prim hashable ];
-       testDepends = [
+       libraryHaskellDepends = [ base binary ghc-prim hashable ];
+       testHaskellDepends = [
          array base binary ghc-prim HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
@@ -133938,8 +137265,8 @@ self: {
        pname = "vector-conduit";
        version = "0.5.0.0";
        sha256 = "10mqmxfqzqcgxf0isv611ailq03smdfybviamxpskncbf15sc6g1";
-       buildDepends = [ base conduit primitive vector ];
-       testDepends = [
+       libraryHaskellDepends = [ base conduit primitive vector ];
+       testHaskellDepends = [
          base conduit HUnit primitive QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
@@ -133955,8 +137282,8 @@ self: {
        pname = "vector-fftw";
        version = "0.1.3.2";
        sha256 = "0rfvr86yiwp4wb9qjggbbacmgkfj6xrk6h7xb4xmhmk88slvifm0";
-       buildDepends = [ base primitive storable-complex vector ];
-       extraLibraries = [ fftw ];
+       libraryHaskellDepends = [ base primitive storable-complex vector ];
+       librarySystemDepends = [ fftw ];
        jailbreak = true;
        homepage = "http://hackage.haskell.org/package/vector-fftw";
        description = "A binding to the fftw library for one-dimensional vectors";
@@ -133971,7 +137298,9 @@ self: {
        pname = "vector-functorlazy";
        version = "0.0.1";
        sha256 = "0ysic3f5xw675bk095pby9ihbgcxpkj4pgp61dwr354w28l0yc03";
-       buildDepends = [ base ghc-prim primitive vector vector-th-unbox ];
+       libraryHaskellDepends = [
+         base ghc-prim primitive vector vector-th-unbox
+       ];
        homepage = "http://github.com/mikeizbicki/vector-functorlazy/";
        description = "vectors that perform the fmap operation in constant time";
        license = stdenv.lib.licenses.bsd3;
@@ -133984,7 +137313,7 @@ self: {
        pname = "vector-heterogenous";
        version = "0.2.0";
        sha256 = "14v0qj2r484pwbjhdymvdqjnsbqszl9wr71hv6wsvs2d8ja1bajl";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        homepage = "http://github.com/mikeizbicki/vector-heterogenous/";
        description = "A type-safe library for vectors whose elements can be of any type, or any type satisfying some constraints";
        license = stdenv.lib.licenses.bsd3;
@@ -133998,7 +137327,7 @@ self: {
        pname = "vector-instances";
        version = "3.3.0.1";
        sha256 = "1npgvnv8pw5xcax57cam9n5j9ra9phm4b5jj26hbpzwnlh0rkcc4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base comonad keys pointed semigroupoids semigroups vector
        ];
        homepage = "http://github.com/ekmett/vector-instances";
@@ -134012,7 +137341,9 @@ self: {
        pname = "vector-instances-collections";
        version = "0.1.0.1";
        sha256 = "13xk2iwdwrnmdm33z0fmj4sg3irih4ayl3q5pgz31qs9kcsbhi0s";
-       buildDepends = [ base collections-api template-haskell vector ];
+       libraryHaskellDepends = [
+         base collections-api template-haskell vector
+       ];
        jailbreak = true;
        homepage = "http://github.com/kreuzschlitzschraubenzieher/vector-instances-collections";
        description = "Instances of the Data.Collections classes for Data.Vector.*";
@@ -134026,7 +137357,7 @@ self: {
        pname = "vector-mmap";
        version = "0.0.2";
        sha256 = "03hczjc7j1hxnny912cblxdwn908gwm012w03zgj2v9avldp0gmr";
-       buildDepends = [ base mmap primitive vector ];
+       libraryHaskellDepends = [ base mmap primitive vector ];
        homepage = "http://github.com/pumpkin/vector-mmap";
        description = "Memory map immutable and mutable vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -134038,7 +137369,7 @@ self: {
        pname = "vector-random";
        version = "0.2";
        sha256 = "1f74q4bs5mbcw8xg4sxb46ks5x121lbbr6cl09ssr09cpykkbdvb";
-       buildDepends = [ base mersenne-random-pure64 vector ];
+       libraryHaskellDepends = [ base mersenne-random-pure64 vector ];
        homepage = "http://code.haskell.org/~dons/code/vector-random";
        description = "Generate vectors filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -134051,7 +137382,7 @@ self: {
        pname = "vector-read-instances";
        version = "0.0.2.0";
        sha256 = "1k30n5qh16sdfxy77vp10bx52lb1ffmjn70vg87hx12j8wg9vbv6";
-       buildDepends = [ base vector ];
+       libraryHaskellDepends = [ base vector ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "(deprecated) Read instances for 'Data.Vector'";
        license = stdenv.lib.licenses.bsd3;
@@ -134064,7 +137395,7 @@ self: {
        pname = "vector-space";
        version = "0.10.2";
        sha256 = "0n78g23jw6pcilkssnkqvnq1z8ram1al6cbas24ziacdwjbw6zah";
-       buildDepends = [ base Boolean MemoTrie NumInstances ];
+       libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134075,7 +137406,7 @@ self: {
        pname = "vector-space-map";
        version = "0.1.0.1";
        sha256 = "1s5hh7dlbw1ai3nqqcavrqgidddfj99mi0gmhf2x2zn6ag86xr8b";
-       buildDepends = [ base containers vector-space ];
+       libraryHaskellDepends = [ base containers vector-space ];
        jailbreak = true;
        homepage = "https://github.com/conklech/vector-space-map";
        description = "vector-space operations for finite maps using Data.Map";
@@ -134090,8 +137421,8 @@ self: {
        pname = "vector-space-opengl";
        version = "0.2";
        sha256 = "17rczadmjiblh96r7bfcxy53m7ig534qqcf35i7w6x90354dyiaw";
-       buildDepends = [ base OpenGL vector-space ];
-       testDepends = [
+       libraryHaskellDepends = [ base OpenGL vector-space ];
+       testHaskellDepends = [
          base ieee754 OpenGL QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th vector-space
        ];
@@ -134106,7 +137437,7 @@ self: {
        pname = "vector-space-points";
        version = "0.2.1.1";
        sha256 = "0d5k7wmwhm9y2jif4fy71bnp8nwbfnkh033nzhiw36wfl35aaznp";
-       buildDepends = [ base vector-space ];
+       libraryHaskellDepends = [ base vector-space ];
        description = "A type for points, as distinct from vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134117,7 +137448,7 @@ self: {
        pname = "vector-static";
        version = "0.3.0.1";
        sha256 = "19spzrk64j2rgyi15dvs8gfbx3nc79ybssaxkv8dn9df4fwksv91";
-       buildDepends = [ base primitive vector ];
+       libraryHaskellDepends = [ base primitive vector ];
        jailbreak = true;
        homepage = "http://github.com/geezusfreeek/vector-static";
        description = "Statically checked sizes on Data.Vector";
@@ -134131,7 +137462,7 @@ self: {
        pname = "vector-strategies";
        version = "0.4";
        sha256 = "04vaizcc78q94vpaly28iwhlwk6nwrsa6jmcq2afdl6yqp63njc6";
-       buildDepends = [ base deepseq parallel vector ];
+       libraryHaskellDepends = [ base deepseq parallel vector ];
        description = "A parallel evaluation strategy for boxed vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134142,8 +137473,8 @@ self: {
        pname = "vector-th-unbox";
        version = "0.2.1.2";
        sha256 = "01admr0akldwwmzmc465f5dbqmq03ldvma67kibanjs25m39dxhd";
-       buildDepends = [ base template-haskell vector ];
-       testDepends = [ base data-default vector ];
+       libraryHaskellDepends = [ base template-haskell vector ];
+       testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134154,7 +137485,7 @@ self: {
        pname = "verbalexpressions";
        version = "1.0.0.0";
        sha256 = "0wai72bqb1vp4p7ml1yj2jdmkjglihai9vhmgj7ri6y2qgzkpwly";
-       buildDepends = [ base regex-pcre ];
+       libraryHaskellDepends = [ base regex-pcre ];
        jailbreak = true;
        homepage = "https://github.com/VerbalExpressions/HaskellVerbalExpressions";
        description = "Regular expressions made easy";
@@ -134167,7 +137498,7 @@ self: {
        pname = "verbosity";
        version = "0.2.0.0";
        sha256 = "0vwv4f5ni6dzvj3jbgxcy8b2hmal6c8xbdin16pifqrn55d52pa9";
-       buildDepends = [ base binary data-default-class deepseq ];
+       libraryHaskellDepends = [ base binary data-default-class deepseq ];
        homepage = "https://github.com/trskop/verbosity";
        description = "Simple enum that encodes application verbosity";
        license = stdenv.lib.licenses.bsd3;
@@ -134179,8 +137510,8 @@ self: {
        pname = "verilog";
        version = "0.0.11";
        sha256 = "0lhl6zcf8f8ndyqx7ksj1qy4a5wnhvphsawb944d5rynrnj8fd46";
-       buildDepends = [ array base ];
-       buildTools = [ alex happy ];
+       libraryHaskellDepends = [ array base ];
+       libraryToolDepends = [ alex happy ];
        homepage = "http://github.com/tomahawkins/verilog";
        description = "Verilog preprocessor, parser, and AST";
        license = stdenv.lib.licenses.bsd3;
@@ -134199,11 +137530,11 @@ self: {
        sha256 = "0z7a17j0rd06kvn3v4qr0fhxg0xw6n3579477y2lvx4mcc3qyrvw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base byteable bytestring cereal cipher-aes cryptohash directory
          filepath mmap random storable-endian text time
        ];
-       testDepends = [
+       testHaskellDepends = [
          base byteable bytestring cereal cryptohash filepath mmap QuickCheck
          random test-framework test-framework-quickcheck2 text time
        ];
@@ -134218,7 +137549,7 @@ self: {
        pname = "vhdl";
        version = "0.1.2.1";
        sha256 = "1bi8n8m9an1hcj4c6i2ifqyadg32nq4viffi1kiihaw3j7dh552b";
-       buildDepends = [ base mtl pretty regex-posix ];
+       libraryHaskellDepends = [ base mtl pretty regex-posix ];
        description = "VHDL AST and pretty printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134229,7 +137560,7 @@ self: {
        pname = "views";
        version = "1.0";
        sha256 = "0kzwp58lki3jvx09n6w8rc97idhy947xqik72p2fqjyigkymv04h";
-       buildDepends = [ base mtl ];
+       libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "Views allow you to run a State monad on part of a state";
        license = stdenv.lib.licenses.bsd3;
@@ -134253,7 +137584,7 @@ self: {
        sha256 = "1qmwqc2cgrmcjcdfwz0hmfn1irzrwbb7mybrl7myf711sri9ng45";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          acid-state aeson async attoparsec base blaze-builder bytestring
          classy-prelude configurator containers data-store directory either
          entropy errors fast-logger http-streams http-types
@@ -134262,7 +137593,7 @@ self: {
          text time transformers unix unordered-containers vector wai
          wai-extra warp yesod yesod-core yesod-platform
        ];
-       testDepends = [
+       testHaskellDepends = [
          acid-state aeson async attoparsec base blaze-builder bytestring
          classy-prelude configurator containers data-store derive directory
          entropy errors fast-logger hspec hspec-expectations http-streams
@@ -134291,12 +137622,13 @@ self: {
        sha256 = "0sc5mlv4d9srgv6rj43ddn27rindpyrz2mwz2i5rmm8y4ixn7jrq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base byline bytestring containers directory either filepath
          http-client http-client-tls http-types mtl old-locale
          optparse-applicative parsec process temporary text themoviedb time
          time-locale-compat transformers xdg-basedir yaml
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://github.com/pjones/vimeta";
        description = "Frontend for video metadata tagging tools";
        license = stdenv.lib.licenses.bsd2;
@@ -134314,17 +137646,18 @@ self: {
        sha256 = "0j4j4rsngp76pvssg6kisqqwr9d95fcmxp21yq4483vvc1cv78g2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers data-default deepseq directory filepath
          libmpd mtl old-locale process template-haskell time
          time-locale-compat utf8-string wcwidth
        ];
-       testDepends = [
+       librarySystemDepends = [ ncurses ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base data-default hspec hspec-expectations mtl QuickCheck
          transformers wcwidth
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ ncurses ];
        description = "An MPD client with vim-like key bindings";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) ncurses;};
@@ -134339,7 +137672,7 @@ self: {
        sha256 = "0hmnkmg6sz702nplh7indlzmv7bb36fmaglf9lw0fziabaj9kk25";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base directory filepath HUnit mtl parsec process random
          regex-base regex-posix time
        ];
@@ -134355,8 +137688,8 @@ self: {
        pname = "vinyl";
        version = "0.5.1";
        sha256 = "026h8lgz487d9xhfjscnfpykgv1ppk944hl8mb6z7y3c1vh4g63b";
-       buildDepends = [ base ghc-prim ];
-       testDepends = [ base doctest lens singletons ];
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base doctest lens singletons ];
        jailbreak = true;
        description = "Extensible Records";
        license = stdenv.lib.licenses.mit;
@@ -134372,11 +137705,11 @@ self: {
        pname = "vinyl-gl";
        version = "0.3.0.1";
        sha256 = "182ipz8znzk5fi7mpy3m1nbsyqq54p8y0hqycnnbmaxqsmhy6z5a";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers GLUtil linear OpenGL tagged transformers vector
          vinyl
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit linear OpenGL tagged test-framework test-framework-hunit
          vinyl
        ];
@@ -134393,10 +137726,10 @@ self: {
        pname = "vinyl-json";
        version = "0.1.0.0";
        sha256 = "07rjlwalpq67hc4pha6x02qbw5pxaz4yimx8sclps9dl7r76xi5c";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring template-haskell text vinyl
        ];
-       testDepends = [ base hlint ];
+       testHaskellDepends = [ base hlint ];
        jailbreak = true;
        description = "Provide json instances automagically to vinyl types";
        license = stdenv.lib.licenses.mit;
@@ -134409,7 +137742,7 @@ self: {
        pname = "vinyl-utils";
        version = "0.1.0.1";
        sha256 = "07clcs7rmzbwn4w9xzbiwc3flrcn2l5p0k5isapis803fpzdq2p0";
-       buildDepends = [ base contravariant transformers vinyl ];
+       libraryHaskellDepends = [ base contravariant transformers vinyl ];
        homepage = "http://hub.darcs.net/mjm/vinyl-utils";
        description = "Utilities for vinyl";
        license = stdenv.lib.licenses.bsd3;
@@ -134426,7 +137759,7 @@ self: {
        sha256 = "08z6dvhv4k6a71dvqhvcfl8s5aq7qcg8aj5xbym3931yykl0gxc2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring Cabal directory file-embed filepath mtl process
          safe split
        ];
@@ -134448,7 +137781,7 @@ self: {
        sha256 = "1235zclhg4nkd387df4gg3q88hvsqwsdj1j20lnfnclxfah0qxa2";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory filepath glib gtk json
          MonadCatchIO-transformers mtl parsec PSQueue stm url utf8-string
          xmms2-client xmms2-client-glib
@@ -134470,7 +137803,12 @@ self: {
        sha256 = "0myppx9bd8bfhii91lqdp00ckp20bq82754mr01s87l1d01gb4wp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base cairo containers directory fgl glade graphviz gtk haskell-src
+         ipprint isevaluated lazysmallcheck parallel pretty process
+         strict-concurrency svgcairo value-supply
+       ];
+       executableHaskellDepends = [
          base cairo containers directory fgl glade graphviz gtk haskell-src
          ipprint isevaluated lazysmallcheck parallel pretty process
          strict-concurrency svgcairo value-supply
@@ -134492,7 +137830,7 @@ self: {
        sha256 = "00wvxsq6yaidiv2izdxsvvfzj8ksrq8y3fky9y68k82ivh7r2y39";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath haskell-src-exts mtl pretty
          process regexpr split uniplate
        ];
@@ -134510,10 +137848,10 @@ self: {
      mkDerivation {
        pname = "vivid";
        version = "0.1.0.3";
-       revision = "1";
        sha256 = "034kjk2lxfbb4hd8z1axccz9alfkm76mpgw39nisvxngjs6si158";
+       revision = "1";
        editedCabalFile = "de2442ab5d53f8044c99cd0489281bf902ef6615028be780e0df937ae60266da";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers deepseq hashable mtl network
          split stm
        ];
@@ -134530,7 +137868,7 @@ self: {
        pname = "vk-aws-route53";
        version = "0.1.2";
        sha256 = "0sblvj89bb7vxgy09m88gcphqc9w2mpawg8kdz0r77y7db0vzb4x";
-       buildDepends = [
+       libraryHaskellDepends = [
          aws base bytestring containers http-conduit http-types old-locale
          resourcet text time xml-conduit xml-hamlet
        ];
@@ -134547,7 +137885,8 @@ self: {
        sha256 = "1kj06niwcsb4lyhppv5bs67cf8frcs4g8fyyzv3cpipn0xdhsr97";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring process unix ];
+       libraryHaskellDepends = [ base bytestring process unix ];
+       executableHaskellDepends = [ base bytestring process unix ];
        homepage = "https://github.com/proger/posix-pty/tree/fork";
        description = "Pseudo terminal interaction with subprocesses";
        license = stdenv.lib.licenses.bsd3;
@@ -134559,7 +137898,7 @@ self: {
        pname = "vocabulary-kadma";
        version = "0.1.0.0";
        sha256 = "1qzx1kl93ic68rvpwf1y9q3gn5c2zf5536ajp6l4xh75dykl8mpb";
-       buildDepends = [ base smaoin ];
+       libraryHaskellDepends = [ base smaoin ];
        homepage = "http://rel4tion.org/projects/vocabularies-hs/";
        description = "Smaoin vocabulary definitions of the base framework";
        license = stdenv.lib.licenses.publicDomain;
@@ -134571,7 +137910,7 @@ self: {
        pname = "void";
        version = "0.7";
        sha256 = "0ivgr4minxb5v56v4kbd045iwqk1c2w89c830731l75mkg8qa6wq";
-       buildDepends = [ base ghc-prim hashable semigroups ];
+       libraryHaskellDepends = [ base ghc-prim hashable semigroups ];
        homepage = "http://github.com/ekmett/void";
        description = "A Haskell 98 logically uninhabited data type";
        license = stdenv.lib.licenses.bsd3;
@@ -134584,7 +137923,9 @@ self: {
        pname = "vorbiscomment";
        version = "0.0.2";
        sha256 = "12kfih0marcrpw9y6wvxgqy6w73f62yhy02c05wcpwxww5cg9iwx";
-       buildDepends = [ base binary-strict bytestring mtl utf8-string ];
+       libraryHaskellDepends = [
+         base binary-strict bytestring mtl utf8-string
+       ];
        description = "Reading of Vorbis comments from Ogg Vorbis files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134596,7 +137937,7 @@ self: {
        pname = "vowpal-utils";
        version = "0.1.2";
        sha256 = "09z6nbsj4rqzhksk75glrsrmcs21p8x0jmcpqs6rc9iizz79db8g";
-       buildDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "https://github.com/cartazio/Vowpal-Utils";
        description = "Vowpal Wabbit utilities";
@@ -134610,7 +137951,7 @@ self: {
        pname = "voyeur";
        version = "0.1.0.1";
        sha256 = "117xvh6llh3aw8nxrvvqyjaflq35l69b7s4j1sc79p8r972mdwff";
-       buildDepends = [ base bytestring process utf8-string ];
+       libraryHaskellDepends = [ base bytestring process utf8-string ];
        jailbreak = true;
        homepage = "https://github.com/sethfowler/hslibvoyeur";
        description = "Haskell bindings for libvoyeur";
@@ -134624,9 +137965,9 @@ self: {
        pname = "vte";
        version = "0.13.0.2";
        sha256 = "1w3y88rqkxx3pmcx73kmihivk2k4ywm7jnb9lvmvkgj4bqggis3h";
-       buildDepends = [ base glib gtk pango ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ vte ];
+       libraryHaskellDepends = [ base glib gtk pango ];
+       libraryPkgconfigDepends = [ vte ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
@@ -134638,9 +137979,9 @@ self: {
        pname = "vtegtk3";
        version = "0.13.0.2";
        sha256 = "0dkmp6s58nmc4qvhmxpn91b1zxf0ard33dkbh4426086k1zkcfzg";
-       buildDepends = [ base glib gtk3 pango ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ vte ];
+       libraryHaskellDepends = [ base glib gtk3 pango ];
+       libraryPkgconfigDepends = [ vte ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
@@ -134662,12 +138003,15 @@ self: {
        sha256 = "0wl4qfag8hkhsbm66cgxs55nq3fgmxdxzcvjvcbcm42pcyikvx9y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers data-default deepseq
          directory filepath hashable lens mtl parallel parsec terminfo text
          transformers unix utf8-string vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base containers data-default lens mtl
+       ];
+       testHaskellDepends = [
          base blaze-builder bytestring Cabal containers data-default deepseq
          HUnit lens mtl QuickCheck quickcheck-assertions random smallcheck
          string-qq terminfo test-framework test-framework-hunit
@@ -134690,7 +138034,7 @@ self: {
        sha256 = "1iyygg5sy59f586d31zxdaz1jnpwrir6bfissarb0ag55dhl1j8x";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bytestring Cabal containers data-default deepseq lens
          mtl parallel parsec QuickCheck random string-qq terminfo text unix
          utf8-string vector vty
@@ -134710,7 +138054,7 @@ self: {
        sha256 = "1ak6k43w381qg41mc5k5shbkwzg35kvh89yldimwk5a5sc08sqbi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base vty ];
+       libraryHaskellDepends = [ base vty ];
        jailbreak = true;
        description = "A lib for displaying a menu and getting a selection using VTY";
        license = stdenv.lib.licenses.gpl3;
@@ -134728,14 +138072,18 @@ self: {
        sha256 = "1mvs2224slnkswcag6knnj9ydkfgvw6nhaiy71bijjd2wwln4fq2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         array base bytestring containers data-default directory filepath
-         mtl QuickCheck random regex-base stm text time unix vector vty
+       libraryHaskellDepends = [
+         array base containers data-default directory filepath mtl
+         regex-base stm text unix vector vty
+       ];
+       executableHaskellDepends = [
+         base bytestring mtl QuickCheck random text time vty
        ];
        jailbreak = true;
        homepage = "http://jtdaugherty.github.com/vty-ui/";
        description = "An interactive terminal user interface library for Vty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-ui-extras" = callPackage
@@ -134744,7 +138092,7 @@ self: {
        pname = "vty-ui-extras";
        version = "0.1";
        sha256 = "1c60bvhk1riilj7sl7x7nw4d9yg56f2k0ps1aivmjm0q4brhgnx7";
-       buildDepends = [ base regex-base regex-pcre vty vty-ui ];
+       libraryHaskellDepends = [ base regex-base regex-pcre vty vty-ui ];
        jailbreak = true;
        description = "Extra vty-ui functionality not included in the core library";
        license = stdenv.lib.licenses.bsd3;
@@ -134761,7 +138109,11 @@ self: {
        sha256 = "0v4qhr01bqz7hb5q8hf2rdk8fxrbbmvsighi5wv2gv5b3cwh28cv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base binary bytestring case-insensitive containers directory
+         JuicyPixels
+       ];
+       executableHaskellDepends = [
          base binary bytestring case-insensitive containers directory
          JuicyPixels
        ];
@@ -134779,10 +138131,10 @@ self: {
        pname = "wai";
        version = "3.0.3.0";
        sha256 = "044djv5r10g92cg7wvz8zlxsyjhnr2mqb1gf3gr9a1rjlcsv8zn4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring http-types network text vault
        ];
-       testDepends = [ base blaze-builder bytestring hspec ];
+       testHaskellDepends = [ base blaze-builder bytestring hspec ];
        homepage = "https://github.com/yesodweb/wai";
        description = "Web Application Interface";
        license = stdenv.lib.licenses.mit;
@@ -134801,7 +138153,7 @@ self: {
        pname = "wai-app-file-cgi";
        version = "3.0.8";
        sha256 = "0adj4s8hxr9rpmqf6899cjaw6axwzw5jvw325wv2qxv3yp4x3w5x";
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec attoparsec-conduit base blaze-builder blaze-html
          bytestring case-insensitive conduit conduit-extra containers
          data-default-class directory filepath http-client http-conduit
@@ -134809,7 +138161,7 @@ self: {
          process sockaddr static-hash text transformers unix wai wai-conduit
          word8
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit conduit-extra directory doctest filepath
          hspec HTTP http-types unix wai warp
        ];
@@ -134832,7 +138184,7 @@ self: {
        sha256 = "0aiywk7a25fpk9fwm6fmibi4zvg5kynnjs6syfxyzfw4hl1dazjv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder blaze-html blaze-markup
          byteable bytestring containers cryptohash cryptohash-conduit
          directory file-embed filepath http-date http-types mime-types
@@ -134840,7 +138192,10 @@ self: {
          transformers unix-compat unordered-containers wai wai-extra warp
          zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base bytestring containers directory mime-types text
+       ];
+       testHaskellDepends = [
          base bytestring hspec http-date http-types mime-types network
          old-locale text time transformers unix-compat wai wai-extra zlib
        ];
@@ -134857,7 +138212,7 @@ self: {
        pname = "wai-conduit";
        version = "3.0.0.2";
        sha256 = "1wqn8biq0ghz7ikmlq7x7vpdq2yc7mk9rnz9vlng7vcm7wpqilj7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring conduit http-types transformers wai
        ];
        homepage = "https://github.com/yesodweb/wai";
@@ -134875,11 +138230,11 @@ self: {
        pname = "wai-cors";
        version = "0.2.3";
        sha256 = "1mnybcf50d0ijbg2a40kf4sl55rb1m4p02nqqid4g7vcanmfjw92";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base-unicode-symbols bytestring case-insensitive
          charset http-types mtl parsers transformers wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base-unicode-symbols directory filepath http-types network
          process text wai wai-websockets warp websockets
        ];
@@ -134897,7 +138252,7 @@ self: {
        pname = "wai-digestive-functors";
        version = "0.3";
        sha256 = "04l9m43gm1zcgq32c70870kygy87p44zb4kvqcvi86zcspqdgpld";
-       buildDepends = [
+       libraryHaskellDepends = [
          base digestive-functors http-types resourcet text transformers wai
          wai-extra wai-util
        ];
@@ -134912,7 +138267,7 @@ self: {
        pname = "wai-dispatch";
        version = "0.1";
        sha256 = "1qyarjbpnngb2x272gkmvrhy3f8kqygxj4nvi6giz09rdx9pfrza";
-       buildDepends = [ base text wai yesod-routes ];
+       libraryHaskellDepends = [ base text wai yesod-routes ];
        homepage = "https://github.com/singpolyma/wai-dispatch";
        description = "Nice wrapper around yesod-routes for use with WAI";
        license = "unknown";
@@ -134924,7 +138279,7 @@ self: {
        pname = "wai-eventsource";
        version = "3.0.0";
        sha256 = "1h5zlqky7ldqbmiaixizhk1s8ghf5i3ha1xfz8flxgzr7gr0al3q";
-       buildDepends = [ wai ];
+       libraryHaskellDepends = [ wai ];
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI support for server-sent events (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -134943,14 +138298,14 @@ self: {
        pname = "wai-extra";
        version = "3.0.10";
        sha256 = "0dqvfwqzkr3g030s24lzy9l9vaws27m0cs0aq771p7f22w9g6fjh";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
          directory fast-logger http-types lifted-base network old-locale
          resourcet streaming-commons stringsearch text time transformers
          unix unix-compat vault void wai wai-logger word8
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring case-insensitive cookie fast-logger
          hspec http-types HUnit resourcet text time transformers wai zlib
        ];
@@ -134967,7 +138322,7 @@ self: {
        pname = "wai-frontend-monadcgi";
        version = "3.0.0.1";
        sha256 = "0g0lkkfcfi9vldl0g4r6qy8an1hsd4xnqw9z8d66mw696ydynvsj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive cgi containers http-types
          transformers wai
        ];
@@ -134981,7 +138336,7 @@ self: {
        pname = "wai-graceful";
        version = "0.1.0.1";
        sha256 = "0a06yrakg9gwjjj4f9nr474j8i8xz642aj56m8vaq621i1kn7jaq";
-       buildDepends = [ base http-types mtl resourcet unix wai ];
+       libraryHaskellDepends = [ base http-types mtl resourcet unix wai ];
        jailbreak = true;
        homepage = "https://bitbucket.org/dpwiz/wai-graceful";
        description = "Graceful shutdown for WAI applications";
@@ -135000,10 +138355,11 @@ self: {
        sha256 = "13f3w31kr3zinll76i6y3walpyqz3i1rlbsh3d7c5p8hp2d88bzy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         attoparsec base bytestring cmdargs directory hint http-types
-         network old-time text time transformers wai wai-extra warp
+       libraryHaskellDepends = [
+         attoparsec base bytestring directory hint http-types network
+         old-time text time transformers wai wai-extra warp
        ];
+       executableHaskellDepends = [ cmdargs ];
        jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "WAI server that automatically reloads code after modification. (deprecated)";
@@ -135017,8 +138373,8 @@ self: {
        pname = "wai-handler-fastcgi";
        version = "3.0.0.1";
        sha256 = "14lm9vbh213jxd1nkxcipisja90h3ay6mi6iiim65k7snm3b7w1v";
-       buildDepends = [ base bytestring wai wai-extra ];
-       extraLibraries = [ fcgi ];
+       libraryHaskellDepends = [ base bytestring wai wai-extra ];
+       librarySystemDepends = [ fcgi ];
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "Wai handler to fastcgi";
        license = stdenv.lib.licenses.mit;
@@ -135032,7 +138388,7 @@ self: {
        pname = "wai-handler-launch";
        version = "3.0.0.4";
        sha256 = "1qfisa19rhlx241jr90mz8x844pp5yx1z8xbmflvj81gpnvsgh7i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring http-types process streaming-commons
          transformers wai warp
        ];
@@ -135046,7 +138402,7 @@ self: {
        pname = "wai-handler-scgi";
        version = "2.0.0.2";
        sha256 = "0h7d78d641bjsnmxsnz4b7s9pw4x0y0xi8bld51y4nqnbjl8gvac";
-       buildDepends = [ base bytestring wai wai-extra ];
+       libraryHaskellDepends = [ base bytestring wai wai-extra ];
        jailbreak = true;
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "Wai handler to SCGI (deprecated)";
@@ -135061,7 +138417,7 @@ self: {
        pname = "wai-handler-snap";
        version = "0.1.1";
        sha256 = "0akk9h7m1hhdggbhj0grss94jzm13fmcmgj51nvh7mfj6f5kj31l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers enumerator snap-core snap-server
          transformers wai
        ];
@@ -135078,8 +138434,8 @@ self: {
        pname = "wai-handler-webkit";
        version = "3.0.0.1";
        sha256 = "1fm985jq1sa8v3vj850cpcjl6kcyq2kgq6xwpb1rmzi8zmb80kpc";
-       buildDepends = [ base wai warp ];
-       pkgconfigDepends = [ QtWebKit ];
+       libraryHaskellDepends = [ base wai warp ];
+       libraryPkgconfigDepends = [ QtWebKit ];
        jailbreak = true;
        homepage = "https://github.com/yesodweb/wai/tree/master/wai-handler-webkit";
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
@@ -135095,7 +138451,7 @@ self: {
        pname = "wai-hastache";
        version = "0.1";
        sha256 = "1kkn8n33cm5r7hw0xxf815nx1ixg09r7ckspq228j1syq5j1lzq8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring hastache http-types transformers wai
        ];
        homepage = "https://github.com/singpolyma/wai-hastache";
@@ -135113,11 +138469,11 @@ self: {
        pname = "wai-hmac-auth";
        version = "1.0.0";
        sha256 = "1hjzwh9hzy29y617faa94428s7ja2ri0bggqxwmf27a0r4qpf1r4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bifunctors byteable bytestring containers
          cryptohash http-types monad-loops mtl transformers wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base base64-bytestring bifunctors byteable bytestring containers
          cryptohash hspec http-types monad-loops mtl transformers wai
          wai-extra
@@ -135136,7 +138492,7 @@ self: {
        pname = "wai-lens";
        version = "0.1";
        sha256 = "05vd7pjw6jgbb11yln4h2lbyr5pr471040p51pj7iy2m65s42v4x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-types lens network text vault wai
        ];
        homepage = "https://github.com/webcrank/wai-lens";
@@ -135152,7 +138508,7 @@ self: {
        pname = "wai-lite";
        version = "0.2.0.0";
        sha256 = "1ghxna51m304x5yvgfdgpml0yf6jqhfkixlxxnflg7z34h6wjzz4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit http-types text transformers wai wai-extra
        ];
        jailbreak = true;
@@ -135170,12 +138526,12 @@ self: {
        pname = "wai-logger";
        version = "2.2.4.1";
        sha256 = "1s6svvy3ci4j1dj1jaw8hg628miwj8f5gpy9n8d8hpsaxav6nzgk";
-       buildDepends = [
+       libraryHaskellDepends = [
          auto-update base blaze-builder byteorder bytestring
          case-insensitive easy-file fast-logger http-types network unix
          unix-time wai
        ];
-       testDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest ];
        description = "A logging system for WAI";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135188,7 +138544,7 @@ self: {
        pname = "wai-logger-prefork";
        version = "0.3.0";
        sha256 = "0cfslqr2zdj0x83dbscafhdljrn2xswym7hpf23zlrsrnpz71qy4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring date-cache fast-logger http-types unix wai
          wai-logger
        ];
@@ -135206,11 +138562,11 @@ self: {
        pname = "wai-middleware-cache";
        version = "0.3.6";
        sha256 = "1kqrqjsmnwwavcyhwx6m2x3qk7qbd0h60817ai61dz3aprwc8hdw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-builder-conduit bytestring conduit crypto-conduit
          http-types pureMD5 wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring http-types HUnit test-framework
          test-framework-hunit wai wai-test
        ];
@@ -135230,7 +138586,7 @@ self: {
        pname = "wai-middleware-cache-redis";
        version = "0.4.3";
        sha256 = "1vd81jcisav6jyqzwa0qn35xarm21bjrw0qps9qbbq56svkh1lw9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary blaze-builder-conduit bytestring case-insensitive
          conduit hedis hedis-pile http-types transformers wai
          wai-middleware-cache
@@ -135248,7 +138604,9 @@ self: {
        pname = "wai-middleware-catch";
        version = "0.3.6";
        sha256 = "1vh5sad3zhdwxqbmivmy9hkbnq9vrv4k6k17rjk4f79lv2xcq56h";
-       buildDepends = [ base bytestring http-types lifted-base wai ];
+       libraryHaskellDepends = [
+         base bytestring http-types lifted-base wai
+       ];
        jailbreak = true;
        homepage = "https://github.com/akaspin/wai-middleware-catch";
        description = "Wai error catching middleware";
@@ -135269,11 +138627,15 @@ self: {
        sha256 = "0qq7kilp9a4qjja337saqccn250s6mnf3n80sgyg935hy1dmm7fq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          async base base-prelude bytestring conduit conduit-extra
          consul-haskell enclosed-exceptions http-client http-types
          monad-control monad-logger network process resourcet text
-         transformers void wai wai-app-static wai-conduit wai-extra warp
+         transformers void wai wai-conduit
+       ];
+       executableHaskellDepends = [
+         async base base-prelude monad-logger transformers wai
+         wai-app-static wai-extra warp
        ];
        homepage = "https://github.com/fpco/wai-middleware-consul";
        description = "Wai Middleware for Consul";
@@ -135295,12 +138657,16 @@ self: {
        sha256 = "039vqcy16ww7cigzppl0lnmjwbvxdv0z0zq3rnklh334lyh5jfay";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          authenticate base base64-bytestring binary blaze-builder bytestring
-         case-insensitive clientsession containers cookie gitrev http-client
-         http-client-tls http-reverse-proxy http-types optparse-applicative
-         resourcet template-haskell text time transformers unix-compat vault
-         wai wai-app-static warp
+         case-insensitive clientsession containers cookie http-client
+         http-client-tls http-types resourcet text time unix-compat vault
+         wai
+       ];
+       executableHaskellDepends = [
+         base clientsession gitrev http-client http-client-tls
+         http-reverse-proxy optparse-applicative template-haskell text
+         transformers wai wai-app-static warp
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
        license = stdenv.lib.licenses.mit;
@@ -135315,7 +138681,7 @@ self: {
        pname = "wai-middleware-etag";
        version = "0.1.0.0";
        sha256 = "0mcqnzvxx671awr2szyfpm6jskily9zxvmg61zz430km4i2q3wj8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring cryptohash filepath http-date
          http-types unix-compat unordered-containers wai
        ];
@@ -135334,7 +138700,7 @@ self: {
        pname = "wai-middleware-gunzip";
        version = "0.0.2";
        sha256 = "0rbvpw4y4qr2mhijlybzwwd12mkhrwmxlrhj2q0mq9diwhp597dx";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-types streaming-commons wai
        ];
        homepage = "https://github.com/twittner/wai-middleware-gunzip";
@@ -135348,7 +138714,7 @@ self: {
        pname = "wai-middleware-headers";
        version = "0.1";
        sha256 = "10ap355j4dx42y7ycf1plpbg04wazv0q62mi3ibza8sb33hiiprh";
-       buildDepends = [ base bytestring http-types wai ];
+       libraryHaskellDepends = [ base bytestring http-types wai ];
        homepage = "http://github.com/seanhess/wai-middleware-headers";
        description = "cors and addHeaders for WAI";
        license = stdenv.lib.licenses.bsd3;
@@ -135365,11 +138731,11 @@ self: {
        pname = "wai-middleware-hmac";
        version = "0.1.0.0";
        sha256 = "01xd1nhi96lflh6ssaz3m5dkacrp2b2kwk611jc8q5j3kmyc0zqs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring byteable bytestring case-insensitive
          cryptohash http-types transformers wai word8
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring doctest Glob hlint hspec http-types HUnit process
          regex-compat wai wai-extra
        ];
@@ -135390,11 +138756,14 @@ self: {
        sha256 = "1jmfmcdv1js6rgadfhwb071qp418440ij0hm0fmyf03dk879qhds";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring byteable bytestring case-insensitive
          cryptohash http-client http-types mtl old-locale time transformers
          word8
        ];
+       executableHaskellDepends = [
+         base bytestring http-client transformers
+       ];
        description = "WAI HMAC Authentication Middleware Client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135409,8 +138778,8 @@ self: {
        pname = "wai-middleware-metrics";
        version = "0.2.1";
        sha256 = "0aiig72r72vykd1f1871458d4glnqsrs7rr402jv5ka05d1rg6y0";
-       buildDepends = [ base ekg-core http-types time wai ];
-       testDepends = [
+       libraryHaskellDepends = [ base ekg-core http-types time wai ];
+       testHaskellDepends = [
          base bytestring ekg-core http-types QuickCheck scotty tasty
          tasty-hunit tasty-quickcheck time transformers wai wai-extra
        ];
@@ -135428,10 +138797,10 @@ self: {
        pname = "wai-middleware-preprocessor";
        version = "0.2.0.0";
        sha256 = "1n9z00v5a75pas22cdm26hj888s6kc98bddh2gfs3ffrazdmgbj1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory mtl split text wai wai-middleware-static
        ];
-       testDepends = [
+       testHaskellDepends = [
          base Cabal directory mtl split text wai wai-middleware-static warp
        ];
        jailbreak = true;
@@ -135449,11 +138818,11 @@ self: {
        pname = "wai-middleware-prometheus";
        version = "0.1.0.1";
        sha256 = "0drhprxja1pp0mibs2f4asl4mycy91pvyanxa0h364k9v6fwp93d";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default http-types prometheus-client text time
          wai
        ];
-       testDepends = [ base doctest prometheus-client ];
+       testHaskellDepends = [ base doctest prometheus-client ];
        homepage = "https://github.com/fimad/prometheus-haskell";
        description = "WAI middlware for exposing http://prometheus.io metrics.";
        license = stdenv.lib.licenses.asl20;
@@ -135468,10 +138837,10 @@ self: {
        pname = "wai-middleware-route";
        version = "0.7.3";
        sha256 = "0zgiaxc5rqjlkfwkb11a5zkmbybrfcqr74mq5vpj03mqz1q0lmx7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-types text wai yesod-routes
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring http-types HUnit test-framework
          test-framework-hunit text wai wai-test
        ];
@@ -135491,7 +138860,7 @@ self: {
        pname = "wai-middleware-static";
        version = "0.7.0.1";
        sha256 = "0kvs3bv5yyg1j7zghl91gi12g7k20vwbbk0ag9clmq3zn33i46iw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash directory
          expiring-cache-map filepath http-types mtl old-locale text time wai
        ];
@@ -135509,7 +138878,7 @@ self: {
        pname = "wai-middleware-static-caching";
        version = "0.6.0.1";
        sha256 = "0xj4r1fr1g0fybgsq65gxcvh5zn9hafvm0f73p6dnj6jhz6dryhk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash directory
          expiring-cache-map filepath http-types mtl old-locale text time
          unix wai
@@ -135530,11 +138899,11 @@ self: {
        pname = "wai-middleware-throttle";
        version = "0.2.0.1";
        sha256 = "08qxdcbn1lg9rd2rcp10iri1maamn5cily9mbg1r65h8ivdmrdan";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers http-types network stm token-bucket transformers
          wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hlint hspec http-types HUnit stm transformers wai
          wai-extra
        ];
@@ -135552,11 +138921,11 @@ self: {
        pname = "wai-predicates";
        version = "0.8.4";
        sha256 = "06ib359k8amh15qmmv6rdmicak1rrx758xfrf75nni03z9k9rby5";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-conversion case-insensitive
          cookie http-types singletons transformers vault vector wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring case-insensitive http-types tasty
          tasty-hunit tasty-quickcheck wai
        ];
@@ -135574,7 +138943,7 @@ self: {
        pname = "wai-request-spec";
        version = "0.10.0.1";
        sha256 = "13s86z82rcsy3ai4qzjbxinwxzd81zhsvf589mhn2fhfk8qm7wdg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types text wai
        ];
        homepage = "https://gitlab.com/cpp.cabrera/wai-request-spec";
@@ -135588,7 +138957,7 @@ self: {
        pname = "wai-responsible";
        version = "0.0.0.0";
        sha256 = "0qf64g11113gl45bfn12j2ikdjwrdxg9r8cicfs4pmh0dq5vj0va";
-       buildDepends = [ base bytestring http-types wai ];
+       libraryHaskellDepends = [ base bytestring http-types wai ];
        jailbreak = true;
        homepage = "https://github.com/pharpend/wai-responsible";
        description = "Response interface for WAI";
@@ -135603,10 +138972,10 @@ self: {
        pname = "wai-route";
        version = "0.3";
        sha256 = "1gmadxdki64x2r7931vsgzzb1hkk03a1virkjmnfm3i7kz5dp4kp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring http-types unordered-containers wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring http-types mtl QuickCheck tasty tasty-quickcheck
          wai
        ];
@@ -135620,7 +138989,7 @@ self: {
        pname = "wai-router";
        version = "1.0.0.1";
        sha256 = "1827mk64vyivdc12z4h230c4b993i6g8wl4sl0364jda586z58p7";
-       buildDepends = [ base text wai ];
+       libraryHaskellDepends = [ base text wai ];
        jailbreak = true;
        homepage = "http://github.com/mdmarek/wai-router";
        description = "Provides basic routing on URL paths for WAI";
@@ -135636,14 +139005,13 @@ self: {
        pname = "wai-routes";
        version = "0.7.2";
        sha256 = "05f8524q9rb5y4d8fryhv4jjkcgqygbckg4pkklvs86s5zlg9nsa";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers http-types
          monad-loops mtl path-pieces random template-haskell text wai
        ];
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-routing" = callPackage
@@ -135656,11 +139024,11 @@ self: {
        pname = "wai-routing";
        version = "0.12.1";
        sha256 = "01bs5mmycn7dkvnp01mh226iy1b419amab83fmgk0asd2f3jsfn5";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base bytestring bytestring-conversion case-insensitive
          cookie http-types transformers wai wai-predicates wai-route
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder bytestring bytestring-conversion
          case-insensitive containers http-types tasty tasty-hunit
          tasty-quickcheck wai wai-predicates
@@ -135679,14 +139047,13 @@ self: {
        pname = "wai-session";
        version = "0.3.2";
        sha256 = "09l3gj8l127iybr8h4xcjxxcgz5b1mcy5iyyaidixnzi7jlrqww3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers cookie http-types StateVar
          time transformers vault wai
        ];
        homepage = "https://github.com/singpolyma/wai-session";
        description = "Flexible session middleware for WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-session-clientsession" = callPackage
@@ -135697,14 +139064,13 @@ self: {
        pname = "wai-session-clientsession";
        version = "0.1";
        sha256 = "0kczhsmkv88g0x8mk4cfy5z9wv3fzv8v3r4z0q7jkyda0grx3gwf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal clientsession errors transformers
          wai-session
        ];
        homepage = "https://github.com/singpolyma/wai-session-clientsession";
        description = "Session store based on clientsession";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-session-tokyocabinet" = callPackage
@@ -135715,7 +139081,7 @@ self: {
        pname = "wai-session-tokyocabinet";
        version = "0.1";
        sha256 = "0cd4x3byc8kaarjpfczqaiv5y3ixrdcilnnypkhcavk3vj7w7pmr";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal errors tokyocabinet-haskell transformers
          wai-session
        ];
@@ -135735,7 +139101,7 @@ self: {
        pname = "wai-static-cache";
        version = "0.1.0.1";
        sha256 = "0vlkh9izxx1qsb61fak57kk9k35i3vph8qbyvlmgwcw7nplagq6l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cityhash conduit conduit-combinators containers
          http-types resourcet system-filepath text transformers vector
          vector-algorithms wai
@@ -135753,7 +139119,7 @@ self: {
        pname = "wai-static-pages";
        version = "0.3";
        sha256 = "0xam283gvcjryq541dzrymv9qy7asyfz8k44b6dwrvm5bqphjz9h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring conduit directory http-types text wai
          wai-extra
        ];
@@ -135768,7 +139134,7 @@ self: {
        pname = "wai-test";
        version = "3.0.0";
        sha256 = "0xys01jniib0pnhadcm7s0v5z0wcxfgi0bf5ax808zm9qzvl3xfx";
-       buildDepends = [ wai ];
+       libraryHaskellDepends = [ wai ];
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "Unit test framework (built on HUnit) for WAI applications. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -135782,7 +139148,9 @@ self: {
        pname = "wai-throttler";
        version = "0.1.0.5";
        sha256 = "1jh53ac1q4zksxdrmwjgsyidvx8zlhx57nnf3ca4spa3paz9n9g6";
-       buildDepends = [ base bytestring containers http-types time wai ];
+       libraryHaskellDepends = [
+         base bytestring containers http-types time wai
+       ];
        jailbreak = true;
        description = "Wai middleware for request throttling";
        license = stdenv.lib.licenses.mit;
@@ -135798,7 +139166,7 @@ self: {
        pname = "wai-util";
        version = "0.8";
        sha256 = "10rkrhs7xv6qmx31ll891c2nnaqpblyfxqmn8xwjhafp7ks1wqjm";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit http-accept http-types
          network-uri text transformers wai wai-extra
        ];
@@ -135818,7 +139186,11 @@ self: {
        sha256 = "0i8r5r8l3z6fk7a466n48ralq33kdihc8g91ia4z22cqhl0zkizy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-builder bytestring case-insensitive http-types network
+         transformers wai websockets
+       ];
+       executableHaskellDepends = [
          base blaze-builder bytestring case-insensitive file-embed
          http-types network text transformers wai wai-app-static warp
          websockets
@@ -135834,7 +139206,7 @@ self: {
        pname = "wait-handle";
        version = "0.1.1";
        sha256 = "09080zx6m4lqli85867ilck82gvgnz4vkq9nxx5f1v5fli1i0n7m";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://www.github.com/fmap/waithandle";
        description = "Wait handles are MVars which can only be written to once, and from which values can never be removed";
        license = stdenv.lib.licenses.bsd3;
@@ -135846,7 +139218,7 @@ self: {
        pname = "waitfree";
        version = "0.1.5";
        sha256 = "09hlqli7zpcxfa8w7vh937gc3rxp7s8q8v1zs8ciwnmh6ca4i8rq";
-       buildDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers ];
        description = "A wrapping library for waitfree computation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -135860,11 +139232,11 @@ self: {
        pname = "waitra";
        version = "0.0.3.0";
        sha256 = "0yismhhgwzrssla2bcg44jy0fdwwxh2szypyjn8wfjvmkfhzshvn";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring directory filepath http-types
          regex-applicative template-haskell text wai
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base http-types regex-applicative tasty tasty-hunit wai
          wai-extra
        ];
@@ -135886,13 +139258,13 @@ self: {
        pname = "warp";
        version = "3.1.2";
        sha256 = "1ya8mfvb18p9d5bj0ijnlbd7m04mj7f1z9ld82a8vry37sdifidq";
-       buildDepends = [
+       libraryHaskellDepends = [
          array auto-update base blaze-builder bytestring case-insensitive
          containers ghc-prim hashable http-date http-types http2 iproute
          network simple-sendfile stm streaming-commons text unix unix-compat
          vault wai word8
        ];
-       testDepends = [
+       testHaskellDepends = [
          array async auto-update base blaze-builder bytestring
          case-insensitive containers directory doctest ghc-prim hashable
          hspec HTTP http-date http-types http2 HUnit iproute lifted-base
@@ -135913,7 +139285,10 @@ self: {
        sha256 = "1kmmy2av0ikr6mb8g7ffqmf505ha4201qv7y48fyc9p8j0p6lk6g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base data-default dyre http-types wai warp ];
+       libraryHaskellDepends = [
+         base data-default dyre http-types wai warp
+       ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://tanakh.jp";
        description = "Dynamic configurable warp HTTP server";
@@ -135931,7 +139306,7 @@ self: {
        sha256 = "181z8cr55qngy6jyqzqz5wcgiyip4rn3q1am0hkcxvmdnif2w2km";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring cmdargs containers directory mime-types text
          wai-app-static wai-extra warp
        ];
@@ -135939,6 +139314,7 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Static file server based on Warp and wai-app-static (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-tls" = callPackage
@@ -135949,7 +139325,7 @@ self: {
        pname = "warp-tls";
        version = "3.1.0";
        sha256 = "1790hl3a327fv01w2shdslylmhp5zv0bh7ljhymipr5vpjwjknrz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
        ];
@@ -135969,7 +139345,11 @@ self: {
        sha256 = "11av9jkf8z2xcpwg3nyx018qwpdrm0cs79qj14z93ah1yxbavb5y";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring certificate conduit crypto-random network
+         network-conduit pem tls tls-extra unix wai warp
+       ];
+       executableHaskellDepends = [
          base bytestring certificate conduit crypto-random http-types
          network network-conduit pem tls tls-extra unix wai warp
        ];
@@ -135985,7 +139365,7 @@ self: {
        pname = "watchdog";
        version = "0.2.2.1";
        sha256 = "06b93cqn6rbl6jbjyawzqmrx80h0dbcks7ia6l3wzdqpic8yjj6v";
-       buildDepends = [ base mtl time ];
+       libraryHaskellDepends = [ base mtl time ];
        jailbreak = true;
        description = "Simple control structure to re-try an action with exponential backoff";
        license = stdenv.lib.licenses.bsd3;
@@ -136000,7 +139380,7 @@ self: {
        pname = "watcher";
        version = "0.0.3.0";
        sha256 = "1c6025zpghqvw5xlapnfk8nwf32iq6dkpnpzi65pm5l5f5npwwgs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base basic-prelude containers hinotify system-fileio
          system-filepath
        ];
@@ -136022,16 +139402,21 @@ self: {
        sha256 = "134b9nrl2lmcr80hxmf72la220plh48vdl0r2la3c3k6qimsd276";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base fsnotify optparse-applicative process resource-pool
          streaming-commons system-filepath text
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base fsnotify optparse-applicative process resource-pool
+         streaming-commons system-filepath text
+       ];
+       testHaskellDepends = [
          async base bytestring HUnit QuickCheck smallcheck system-fileio
          system-filepath tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        description = "File change watching utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wavconvert" = callPackage
@@ -136042,7 +139427,7 @@ self: {
        sha256 = "028qx9b4z2gr4nc6hid0phdrysvhfqswj64s71pw2grqw4f8ddkx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath process ];
+       executableHaskellDepends = [ base directory filepath process ];
        description = "Command-line tool for converting audio files and filling in ID3 tags";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136055,7 +139440,7 @@ self: {
        pname = "wavesurfer";
        version = "0.0.6";
        sha256 = "1f9hsmvwdgrib44sj1rnkm4hv92iad27xg75n2y2qdq1a8giazn5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring bytestring-lexing bytestring-show
          delimited-text
        ];
@@ -136076,9 +139461,11 @@ self: {
        sha256 = "0rvzsmd7lzimyphc2yscadwkanqpi8wnmdk5hrzwpcm6dcavyj9q";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base binary bytestring containers filepath pretty-show riff split
-         vector
+       libraryHaskellDepends = [
+         base binary bytestring containers riff split vector
+       ];
+       executableHaskellDepends = [
+         base bytestring filepath pretty-show split vector
        ];
        jailbreak = true;
        homepage = "http://bitbucket.org/robertmassaioli/wavy";
@@ -136096,7 +139483,8 @@ self: {
        sha256 = "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [
          attoparsec base bytestring containers setlocale utf8-string
        ];
        homepage = "http://github.com/solidsnack/wcwidth/";
@@ -136112,7 +139500,7 @@ self: {
        pname = "weather-api";
        version = "0.4.3";
        sha256 = "0wlh3p5z2vivhn9pgqzjhczrb7jyfzkz889fmwnvm7h87440jnyj";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring HTTP network utf8-string vector
        ];
        jailbreak = true;
@@ -136128,7 +139516,7 @@ self: {
        pname = "web-browser-in-haskell";
        version = "1.0";
        sha256 = "1y674dw8slz0m7i23j7p1qykdci2wssmx6x0yf23cf0nywz1py5k";
-       buildDepends = [ base gtk webkit ];
+       libraryHaskellDepends = [ base gtk webkit ];
        description = "Web Browser In Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136140,7 +139528,7 @@ self: {
        pname = "web-css";
        version = "0.1.0";
        sha256 = "1havyvd6f0xagynxpar2jsmx5x1izwl7wgxia0wbwbzaj0fzn2k2";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        jailbreak = true;
        description = "Simple functions for CSS";
        license = stdenv.lib.licenses.bsd3;
@@ -136156,7 +139544,7 @@ self: {
        sha256 = "0lg9vbsmg9nfs2440ab2srhhawg1xfi5lnhxzd9rj7kab460w2x3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory failure old-locale text time
        ];
        jailbreak = true;
@@ -136174,13 +139562,12 @@ self: {
        pname = "web-fpco";
        version = "0.1.1.0";
        sha256 = "1iizmg1syjywd5hs9swcqxxzmix04hwa86p8c246xybwcklf667n";
-       buildDepends = [
+       libraryHaskellDepends = [
          base happstack-server safe snap snap-core snap-server
        ];
        homepage = "https://github.com/fpco/web-fpco";
        description = "Wrappers for web frameworks to ease usage with the FP Complete environment";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-mongrel2" = callPackage
@@ -136192,7 +139579,7 @@ self: {
        pname = "web-mongrel2";
        version = "0.0.3";
        sha256 = "1j2pq3kzmk2gibrr4jcm5gksz9pk9shjqqpwc85ygb2mpf5yc1gw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default file-embed haskell98 HStringTemplate
          json mtl old-time parsec system-uuid template-haskell text
          zeromq-haskell
@@ -136214,7 +139601,7 @@ self: {
        sha256 = "1hzqwp67pj1xvhmdaxmij08820ffxf559d7jgr8037zzm7j02cql";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-html bytestring clay containers jmacro
          lens mtl Stream text vector wl-pprint-text
        ];
@@ -136229,11 +139616,10 @@ self: {
        pname = "web-plugins";
        version = "0.2.8";
        sha256 = "00w0v0q2i0jxwlav1qb967nf35bxbr6vwacs5mqficzg2d4pz969";
-       buildDepends = [ base containers mtl stm text ];
+       libraryHaskellDepends = [ base containers mtl stm text ];
        homepage = "http://www.happstack.com/";
        description = "dynamic plugin system for web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes" = callPackage
@@ -136245,14 +139631,14 @@ self: {
      mkDerivation {
        pname = "web-routes";
        version = "0.27.9";
-       revision = "2";
        sha256 = "1azccgcnksz4c4pm1nayvjiq3m192zz21cnc0fm89hdixvqck346";
+       revision = "2";
        editedCabalFile = "542f5d20616359b0897018bbd347ce7f0dc948c4e031e8a5383ed85cb931406b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring exceptions ghc-prim http-types mtl
          parsec split text utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th
        ];
@@ -136266,7 +139652,9 @@ self: {
        pname = "web-routes-boomerang";
        version = "0.28.4";
        sha256 = "0ailw4s0c1f054q58dwylq1g1f043vw4ywk0spg5d3sk9asy8bxh";
-       buildDepends = [ base boomerang mtl parsec text web-routes ];
+       libraryHaskellDepends = [
+         base boomerang mtl parsec text web-routes
+       ];
        description = "Library for maintaining correctness and composability of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136279,7 +139667,7 @@ self: {
        pname = "web-routes-happstack";
        version = "0.23.9";
        sha256 = "0vsjm979z21858wk9z1b855jqmr4apm35b5ff8x6nynq6kiflrzw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring happstack-server text web-routes
        ];
        description = "Adds support for using web-routes with Happstack";
@@ -136292,7 +139680,7 @@ self: {
        pname = "web-routes-hsp";
        version = "0.24.6";
        sha256 = "048dxx5cjdm7v0340p9x3s73a6y7fldykzkwkpb12bb926bir3fl";
-       buildDepends = [ base hsp text web-routes ];
+       libraryHaskellDepends = [ base hsp text web-routes ];
        description = "Adds XMLGenerator instance for RouteT monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136303,7 +139691,7 @@ self: {
        pname = "web-routes-mtl";
        version = "0.20.1";
        sha256 = "1k35ch294p2pkf7mbip8wy9rin956y31sq68b4cdrj9sj9891rx5";
-       buildDepends = [ base web-routes ];
+       libraryHaskellDepends = [ base web-routes ];
        description = "Extends web-routes with mtl-based MonadIO / MonadTrans RouteT instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136316,7 +139704,7 @@ self: {
        sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base path-pieces template-haskell text ];
+       libraryHaskellDepends = [ base path-pieces template-haskell text ];
        jailbreak = true;
        homepage = "http://docs.yesodweb.com/web-routes-quasi/";
        description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
@@ -136330,7 +139718,7 @@ self: {
        pname = "web-routes-regular";
        version = "0.19.0";
        sha256 = "0qllws4mzmmc6fh4hcvj3zp7kk8pwap59yq6wy0zx7mx0ac7015r";
-       buildDepends = [ base parsec regular text web-routes ];
+       libraryHaskellDepends = [ base parsec regular text web-routes ];
        description = "Library for maintaining correctness of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136344,10 +139732,10 @@ self: {
        pname = "web-routes-th";
        version = "0.22.3";
        sha256 = "0ccv1mzisd0fnhbl776i0fhavjazm0l3b4ycnbdzgs1kh4w8gzfp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base parsec split template-haskell text web-routes
        ];
-       testDepends = [
+       testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th web-routes
        ];
@@ -136361,7 +139749,7 @@ self: {
        pname = "web-routes-transformers";
        version = "0.19.1";
        sha256 = "0pm1v9wqlzi6cg92lajbwbnhsdm509371i8mvyvvj6qa5m58cdib";
-       buildDepends = [ base transformers web-routes ];
+       libraryHaskellDepends = [ base transformers web-routes ];
        jailbreak = true;
        description = "Extends web-routes with some transformers instances for RouteT";
        license = stdenv.lib.licenses.bsd3;
@@ -136376,7 +139764,9 @@ self: {
        pname = "web-routes-wai";
        version = "0.24.1";
        sha256 = "13mwfyafpk29c8bbx48vhbxsgk28fmh579gjn6gjlhvkisc45q1b";
-       buildDepends = [ base bytestring http-types text wai web-routes ];
+       libraryHaskellDepends = [
+         base bytestring http-types text wai web-routes
+       ];
        description = "Library for maintaining correctness of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136388,13 +139778,13 @@ self: {
      mkDerivation {
        pname = "web-routing";
        version = "0.6.2";
-       revision = "1";
        sha256 = "1x7imgnpq3998fk4pi2z5ba0r9xc7blf61rn1i51yqqd24la887f";
+       revision = "1";
        editedCabalFile = "4aa263239149f8ef52999fdc29c8e90c552081672a4476adedce903248e15524";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring primitive text types-compat unordered-containers
        ];
-       testDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/philopon/web-routing";
        description = "simple routing library";
        license = stdenv.lib.licenses.mit;
@@ -136410,15 +139800,15 @@ self: {
      mkDerivation {
        pname = "webcrank";
        version = "0.2.2";
-       revision = "1";
        sha256 = "1rgvpp2526lmly2fli65mygplfc6wzqcw5fkn7gq4fcrmql2cisj";
+       revision = "1";
        editedCabalFile = "487831902c68484790108f97e32098dad9711eb15e0729b9ab1ba009e8fd5747";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring case-insensitive either
          exceptions http-date http-media http-types lens mtl semigroups text
          transformers unordered-containers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base bytestring case-insensitive exceptions http-date
          http-media http-types lens mtl tasty tasty-hunit tasty-quickcheck
          unordered-containers
@@ -136435,16 +139825,17 @@ self: {
      mkDerivation {
        pname = "webcrank-dispatch";
        version = "0.1";
-       revision = "1";
        sha256 = "1w4kfcm2d6iw4d45ywg2g6iysxl2iywk3nbk5ac6p6500y6hh97k";
+       revision = "1";
        editedCabalFile = "50b6b56e1fccc20a2986ea93b04410b8131ea5f2f4df94df538c6b2369400fa8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring mtl path-pieces reroute text unordered-containers
        ];
        jailbreak = true;
        homepage = "https://github.com/webcrank/webcrank-dispatch.hs";
        description = "A simple request dispatcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webcrank-wai" = callPackage
@@ -136456,13 +139847,14 @@ self: {
        pname = "webcrank-wai";
        version = "0.2.1";
        sha256 = "13db2hpyvzpx9i43d8pryq7f87zlajpfpf0h6biva28l9qamy1yv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring exceptions lens mtl unix-compat
          unordered-containers wai wai-lens webcrank webcrank-dispatch
        ];
        homepage = "https://github.com/webcrank/webcrank-wai";
        description = "Build a WAI Application from Webcrank Resources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver" = callPackage
@@ -136477,19 +139869,18 @@ self: {
        pname = "webdriver";
        version = "0.6.2";
        sha256 = "1cr668vn51bsdwxk6az4dk8zcsgy1y5vhb7xb9mahhbv1anpnzgr";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring cond
          data-default directory directory-tree exceptions filepath
          http-client http-types lifted-base monad-control mtl network
          network-uri scientific temporary text time transformers
          transformers-base unordered-containers vector zip-archive
        ];
-       testDepends = [ base parallel text ];
+       testHaskellDepends = [ base parallel text ];
        jailbreak = true;
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver-angular" = callPackage
@@ -136501,18 +139892,17 @@ self: {
        pname = "webdriver-angular";
        version = "0.1.7";
        sha256 = "18lyw9qasg9ynsa9yg90121h6z5h7kl6lzw7q5zqgkwpm1xr1p21";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base language-javascript template-haskell text transformers
          unordered-containers webdriver
        ];
-       testDepends = [
+       testHaskellDepends = [
          base hspec hspec-webdriver transformers wai-app-static warp
          webdriver
        ];
        homepage = "https://bitbucket.org/wuzzeb/webdriver-utils";
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver-snoy" = callPackage
@@ -136526,17 +139916,17 @@ self: {
      mkDerivation {
        pname = "webdriver-snoy";
        version = "0.6.0.4";
-       revision = "1";
        sha256 = "02c2ihqk5gsgnv61rj14rdd76r2nhmxacml3z9krrgxgn326hrbk";
+       revision = "1";
        editedCabalFile = "7cc952e84c8ff09b8d032df7d8089bd4d5167b32834bda67c79c62a34b12d52a";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring cond
          data-default directory directory-tree exceptions filepath
          http-client http-types lifted-base monad-control mtl network
          scientific temporary text time transformers transformers-base
          unordered-containers vector zip-archive
        ];
-       testDepends = [ base parallel text ];
+       testHaskellDepends = [ base parallel text ];
        jailbreak = true;
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol (deprecated)";
@@ -136554,7 +139944,10 @@ self: {
        sha256 = "05l4y7y171g41dlzfgd25ww59r4ajqbj9jpzrsmq5zpazx6p6gzy";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring HSFFIG LEXER parsec pretty utf8-env utf8-string
+       ];
+       executableHaskellDepends = [
          base bytestring HSFFIG LEXER parsec pretty utf8-env utf8-string
        ];
        jailbreak = true;
@@ -136574,7 +139967,7 @@ self: {
        sha256 = "16fsk6x875bmnqng5mfkxcxrkp3dcs3lkmsnds5fm416x4iw1sql";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base binary binary-strict blaze-builder bytestring containers
          filepath hopfli optparse-applicative text vector xmlgen zlib
        ];
@@ -136593,13 +139986,14 @@ self: {
        pname = "webkit";
        version = "0.13.1.3";
        sha256 = "00h9465xl6rfnd72cmn68z3mpany63dxl6fm2gqjbdzbrssj7306";
-       buildDepends = [ base bytestring cairo glib gtk mtl pango text ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ webkit ];
+       libraryHaskellDepends = [
+         base bytestring cairo glib gtk mtl pango text
+       ];
+       libraryPkgconfigDepends = [ webkit ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) webkit;};
 
   "webkit-javascriptcore" = callPackage
@@ -136608,8 +140002,8 @@ self: {
        pname = "webkit-javascriptcore";
        version = "0.13.0.4";
        sha256 = "1gj40kdll7pd84graxcrc327za6kgp453zh48srmzvrk9yvnj67x";
-       buildDepends = [ base glib gtk webkit ];
-       buildTools = [ gtk2hs-buildtools ];
+       libraryHaskellDepends = [ base glib gtk webkit ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136623,9 +140017,11 @@ self: {
        pname = "webkitgtk3";
        version = "0.13.1.3";
        sha256 = "0gfznb6n46576im72m6k9wrwc2n9f48nk4dsaz2llvzlzlzx4zfk";
-       buildDepends = [ base bytestring cairo glib gtk3 mtl pango text ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ webkit ];
+       libraryHaskellDepends = [
+         base bytestring cairo glib gtk3 mtl pango text
+       ];
+       libraryPkgconfigDepends = [ webkit ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
@@ -136640,9 +140036,9 @@ self: {
        pname = "webkitgtk3-javascriptcore";
        version = "0.13.0.4";
        sha256 = "0lq6n1bhvg9rf48scc5ss299dil205y23r9qzl1ls4g4msv6k25c";
-       buildDepends = [ base glib gtk3 webkitgtk3 ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ webkit ];
+       libraryHaskellDepends = [ base glib gtk3 webkitgtk3 ];
+       libraryPkgconfigDepends = [ webkit ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
        jailbreak = true;
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
@@ -136655,10 +140051,10 @@ self: {
      mkDerivation {
        pname = "webpage";
        version = "0.0.3.1";
-       revision = "1";
        sha256 = "1s9q44wvkc60g1117c3c4klf9pc92x7rpgvb7pwyhbbkvshmnirj";
+       revision = "1";
        editedCabalFile = "1829b0f7db8745498bee16ed1d70917aa781fd14ab8f8032b51472cfc3cd6787";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html data-default hastache lucid text
        ];
        description = "Organized and simple web page scaffold for blaze and lucid";
@@ -136674,7 +140070,7 @@ self: {
        pname = "webserver";
        version = "0.7.1.1";
        sha256 = "0mjbw1v0xy3ji6y0wdiv77y7bc4r5z7jk67gzzgny2cx1vx3c973";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring c10k containers directory filepath network
          old-locale parsec process stm time unix zlib
        ];
@@ -136691,7 +140087,7 @@ self: {
        sha256 = "05favr2lpc8y3qy7wahcriq8qhvzvr3ngvrgdyjcvf5bvyfwlp84";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base filepath gtk webkit ];
+       executableHaskellDepends = [ base filepath gtk webkit ];
        homepage = "https://github.com/jrb/websnap";
        description = "Transforms URLs to PNGs";
        license = stdenv.lib.licenses.bsd3;
@@ -136708,11 +140104,11 @@ self: {
        pname = "websockets";
        version = "0.9.5.0";
        sha256 = "016h213sk3n662ri8ns1sswcnaml61qckprdgxdp0m2a77amivmy";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy mtl network random SHA text
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy HUnit mtl network QuickCheck
          random SHA test-framework test-framework-hunit
@@ -136731,7 +140127,7 @@ self: {
        pname = "websockets-snap";
        version = "0.9.2.0";
        sha256 = "03szycdvygw1zkv2s090wn2jii9sqbplgbycmpm5mfm3r0jhbhxp";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator mtl snap-core snap-server websockets
        ];
        description = "Snap integration for the websockets library";
@@ -136748,7 +140144,7 @@ self: {
        pname = "webwire";
        version = "0.1.0";
        sha256 = "0m2wl7cfg67yyj2bbn811g6gsvzj7sw1sb3y2zanc0dxjd4cr4r2";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring blaze-builder blaze-html bytestring
          case-insensitive containers cookie cprng-aes hamlet http-types
          netwire shakespeare-css shakespeare-js text time transformers wai
@@ -136767,7 +140163,7 @@ self: {
        sha256 = "0rwbckf5h68170jrs1m70kgqf9h43vypj65wcw390w0xc7kmyv49";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://web.mornfall.net";
        description = "a wedding announcement";
        license = stdenv.lib.licenses.publicDomain;
@@ -136780,12 +140176,12 @@ self: {
      mkDerivation {
        pname = "wedged";
        version = "0";
-       revision = "1";
        sha256 = "1sdnqc40qg5pv0kj4qw33vk5cy3yym60csh3iwmpm7pzpray7511";
+       revision = "1";
        editedCabalFile = "64bac15c983cf83ab2b05b002439b8f125b9c942ae46ed75a187f7e2dc68dba5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base colour containers diagrams-cairo diagrams-lib
          MonadRandom strict
        ];
@@ -136803,8 +140199,8 @@ self: {
        sha256 = "0r765ppzazdsm5i3prgf6a405f88xi8sx79jdz9mck4584w7fqzr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base ];
-       buildTools = [ happy ];
+       libraryHaskellDepends = [ array base ];
+       libraryToolDepends = [ happy ];
        jailbreak = true;
        homepage = "http://sebfisch.github.com/haskell-regexp";
        description = "Weighted Regular Expression Matcher";
@@ -136818,7 +140214,7 @@ self: {
        pname = "weighted-search";
        version = "0.1.0.1";
        sha256 = "1va2b10g3h2wfl9d7f27d55z5c93fvz41sb023l4c2ym1w9kw8zv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/weighted-search";
        description = "A weighted nondeterministic search monad";
        license = stdenv.lib.licenses.bsd3;
@@ -136832,10 +140228,10 @@ self: {
      mkDerivation {
        pname = "welshy";
        version = "0.1.0.0";
-       revision = "1";
        sha256 = "08pgns5irmvh9c12lxq2x72ql8ggzd3npfqnrphba3l171380gki";
+       revision = "1";
        editedCabalFile = "ff6973a67b742efb8d7c1d542ba9f27056de3e547ade96d33e9b68314afec22c";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit http-types lifted-base
          resourcet text transformers unordered-containers wai warp
        ];
@@ -136852,7 +140248,7 @@ self: {
        pname = "wheb-mongo";
        version = "0.0.3.0";
        sha256 = "1xxks0jxjwph7372jqnscm6z0b28zz3dvb49b2aw37jmnvwrfdcy";
-       buildDepends = [ base bson mongoDB mtl text Wheb ];
+       libraryHaskellDepends = [ base bson mongoDB mtl text Wheb ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "MongoDB plugin for Wheb";
@@ -136866,7 +140262,7 @@ self: {
        pname = "wheb-redis";
        version = "0.0.1.0";
        sha256 = "025chjp41qbjr9m6c3pd9v510h4aac1rvbyrki3c7617sca8a45h";
-       buildDepends = [ base bytestring hedis mtl text Wheb ];
+       libraryHaskellDepends = [ base bytestring hedis mtl text Wheb ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "Redis connection for Wheb";
@@ -136880,7 +140276,7 @@ self: {
        pname = "wheb-strapped";
        version = "0.1.0.0";
        sha256 = "1wykpp325336kk7a1vnnjffankcw0kaw3jcfin53cp8hsx4bwfdp";
-       buildDepends = [ base mtl StrappedTemplates text Wheb ];
+       libraryHaskellDepends = [ base mtl StrappedTemplates text Wheb ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "Strapped templates for Wheb";
@@ -136894,7 +140290,7 @@ self: {
        pname = "while-lang-parser";
        version = "0.1.0.0";
        sha256 = "0dlq2rldak4lb0w8hcx7aigdj7b59crp1k130p36cha7zpqdixll";
-       buildDepends = [ base indents parsec ];
+       libraryHaskellDepends = [ base indents parsec ];
        homepage = "https://github.com/davnils/while-lang-parser";
        description = "Parser for the While language";
        license = stdenv.lib.licenses.bsd3;
@@ -136910,7 +140306,7 @@ self: {
        sha256 = "0fgasnviqmz8ifkb8ikvj721f9j1xzvix5va0jxi81gh6f400ij6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers GLUT mtl OpenGL process random X11
        ];
        jailbreak = true;
@@ -136926,7 +140322,7 @@ self: {
        pname = "whiskers";
        version = "0.1.0.3";
        sha256 = "0kbyv0q6z2d2plblafqcmwcfiyhdbijqnqg2w7qxr7dklka8245v";
-       buildDepends = [ base parsec template-haskell ];
+       libraryHaskellDepends = [ base parsec template-haskell ];
        jailbreak = true;
        description = "Mustache templates with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -136940,7 +140336,7 @@ self: {
        sha256 = "1y89bayaccz8qqzsfmpr917dczgbn5srskja6f2dab3ipxhk24z9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ haskell98 random ];
+       executableHaskellDepends = [ haskell98 random ];
        homepage = "https://github.com/haroldl/whitespace-nd";
        description = "Whitespace, an esoteric programming language";
        license = "GPL";
@@ -136952,10 +140348,10 @@ self: {
      mkDerivation {
        pname = "whois";
        version = "1.2.2";
-       revision = "1";
        sha256 = "199fd710zicx7ijyvipc7p0d3yg18f6nppcln2wz38hl9kfv0iv0";
+       revision = "1";
        editedCabalFile = "c11f42da958683ffb7a2e958dcefe2ef1a3e732732010f44facfbb0fffd7571e";
-       buildDepends = [ base network network-uri split ];
+       libraryHaskellDepends = [ base network network-uri split ];
        homepage = "http://github.com/relrod/whois-hs";
        description = "WHOIS client library";
        license = stdenv.lib.licenses.bsd3;
@@ -136972,7 +140368,7 @@ self: {
        sha256 = "089mmwrknghkliakni3wmwrd0hcngg3kqkijfmmky4bxni6w39bd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory epub filepath haskell98 HTTP network
          regex-base regex-posix tagsoup url xml zip-archive zlib
        ];
@@ -136990,7 +140386,8 @@ self: {
        sha256 = "131hr8c4q7fwqmwzyp1fwnz349h6103v5gjvzjpbhb7ngki38nfq";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base process split ];
+       libraryHaskellDepends = [ base split ];
+       executableHaskellDepends = [ base process split ];
        homepage = "http://github.com/ygale/win-hp-path";
        description = "Work with multiple Haskell Platform versions on Windows";
        license = stdenv.lib.licenses.bsd3;
@@ -137006,7 +140403,7 @@ self: {
        sha256 = "15dk3wdv99ggxwypgnv8hs5ygn5bzqml9jhhz6l9kgnc0rrn3jbz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base Crypto dataenc mtl network parsec pretty split time urlencoded
        ];
        jailbreak = true;
@@ -137035,10 +140432,10 @@ self: {
        pname = "winio";
        version = "0.1";
        sha256 = "0f13x6fcb7cb4rfza5vp1dfxx3rcggh5rgw05lkqx9jwvnqcnjwm";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring extensible-exceptions network winerror
        ];
-       extraLibraries = [ kernel32 ws2_32 ];
+       librarySystemDepends = [ kernel32 ws2_32 ];
        homepage = "http://github.com/felixmar/winio";
        description = "I/O library for Windows";
        license = stdenv.lib.licenses.bsd3;
@@ -137053,8 +140450,8 @@ self: {
        pname = "wiring";
        version = "0.3.0";
        sha256 = "0c7xg6xq5bmb0qc2f9509sx5yrnngp4q5v1bgxl636qp9mhck68x";
-       buildDepends = [ base mtl template-haskell transformers ];
-       testDepends = [
+       libraryHaskellDepends = [ base mtl template-haskell transformers ];
+       testHaskellDepends = [
          base hspec mtl QuickCheck template-haskell transformers
        ];
        homepage = "http://github.com/seanparsons/wiring/";
@@ -137070,7 +140467,7 @@ self: {
        pname = "witherable";
        version = "0.1.3";
        sha256 = "0n0l169xh23925blgzy2i90gz8lsa0176dp49bl6cncq362bqcn8";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base-orphans containers hashable transformers
          unordered-containers vector
        ];
@@ -137085,7 +140482,9 @@ self: {
        pname = "witness";
        version = "0.3";
        sha256 = "0r0395blixr5g3s2dm4x4mj93yjk4zlig0b5acbnnr7yimjmnd11";
-       buildDepends = [ base categories constraints transformers ];
+       libraryHaskellDepends = [
+         base categories constraints transformers
+       ];
        homepage = "https://github.com/AshleyYakeley/witness";
        description = "values that witness types";
        license = stdenv.lib.licenses.bsd3;
@@ -137099,7 +140498,7 @@ self: {
        sha256 = "1k8c74j28nji46gib7r2ivfbvvzmkka9qnyf8hh7cyjgsmxxvq83";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring network unix ];
+       executableHaskellDepends = [ base bytestring network unix ];
        homepage = "https://github.com/kazu-yamamoto/witty/blob/master/README.md";
        description = "A network server to show bottlenecks of GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -137113,7 +140512,7 @@ self: {
        pname = "wizards";
        version = "1.0.2";
        sha256 = "02yk9d01d39c3hpvlh2c6v35fzyf3nm92f6vff0qns30dmr2r8ab";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers control-monad-free haskeline mtl transformers
        ];
        description = "High level, generic library for interrogative user interfaces";
@@ -137126,7 +140525,7 @@ self: {
        pname = "wkt";
        version = "0.2.5";
        sha256 = "02r453wx1kv50lw0hx4nvzzv5wjfsy16gyjqphc25aq45rl5hr8g";
-       buildDepends = [ base lens linear parsec parsec-numbers ];
+       libraryHaskellDepends = [ base lens linear parsec parsec-numbers ];
        jailbreak = true;
        homepage = "http://github.com/bgamari/wkt";
        description = "Parsec parsers and types for geographic data in well-known text (WKT) format";
@@ -137139,7 +140538,7 @@ self: {
        pname = "wl-pprint";
        version = "1.2";
        sha256 = "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "The Wadler/Leijen Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137152,7 +140551,7 @@ self: {
        pname = "wl-pprint-ansiterm";
        version = "0.2.0.0";
        sha256 = "02s47f58ah08fvjqpdscxqiq9609agi5iplczrdkgxrv1vj8vkpz";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base bytestring containers mtl nats semigroups text
          transformers wl-pprint-extras
        ];
@@ -137170,10 +140569,12 @@ self: {
        pname = "wl-pprint-extras";
        version = "3.5.0.5";
        sha256 = "13wdx7l236yyv9wqsgcjlbrm5gk1bmw1z2lk4b21y699ly2imhm9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers nats semigroupoids semigroups text utf8-string
        ];
-       testDepends = [ base HUnit test-framework test-framework-hunit ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
        homepage = "http://github.com/ekmett/wl-pprint-extras/";
        description = "A free monad based on the Wadler/Leijen pretty printer";
        license = stdenv.lib.licenses.bsd3;
@@ -137187,7 +140588,7 @@ self: {
        pname = "wl-pprint-terminfo";
        version = "3.7.1.3";
        sha256 = "19z5cr1wqc3xcy39dswx78b6fpxhb41798zkiwkmb97nnvzwbdmv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers nats semigroups terminfo text
          transformers wl-pprint-extras
        ];
@@ -137202,7 +140603,7 @@ self: {
        pname = "wl-pprint-text";
        version = "1.1.0.4";
        sha256 = "1xgizzimfw17mpmw2afvmnvyag976j8ggn7k5r564rkw9f0m6bgz";
-       buildDepends = [ base text ];
+       libraryHaskellDepends = [ base text ];
        description = "A Wadler/Leijen Pretty Printer for Text values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137215,12 +140616,12 @@ self: {
        pname = "wlc-hs";
        version = "0.1.0.0";
        sha256 = "0z553h86dznsf2wagbfhh8p27aa20jm3wmxkklr51al35xralvv9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-default lens pretty process transformers
          xkbcommon
        ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ wlc ];
+       librarySystemDepends = [ wlc ];
+       libraryToolDepends = [ c2hs ];
        jailbreak = true;
        description = "Haskell bindings for the wlc library";
        license = stdenv.lib.licenses.isc;
@@ -137242,14 +140643,18 @@ self: {
        sha256 = "1w2j7xr4f0a63bwz96js8wrdpfw73qzdg6d607lx2526yrq8xlh2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         aeson attoparsec base-prelude bytestring hastache http-types
+       libraryHaskellDepends = [
+         attoparsec base-prelude bytestring hastache http-types
          monad-control network network-simple old-locale pipes
          pipes-bytestring pipes-network pipes-parse pipes-safe pipes-text
-         safe stm stm-containers system-fileio system-filepath text time
-         transformers unordered-containers yaml
+         stm stm-containers system-fileio system-filepath text time
+         transformers unordered-containers
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson base-prelude bytestring network safe system-fileio
+         system-filepath text unordered-containers yaml
+       ];
+       testHaskellDepends = [
          base-prelude bytestring HTF http-client http-types HUnit
          lifted-async mwc-random network QuickCheck quickcheck-instances
          safe system-fileio system-filepath text transformers
@@ -137269,7 +140674,9 @@ self: {
        sha256 = "0b83s5q4i3f4l45dklp1xgrlcpzrsdbd16fvlpazlcglzxk81xmv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base binary bytestring filepath zlib ];
+       executableHaskellDepends = [
+         base binary bytestring filepath zlib
+       ];
        jailbreak = true;
        description = "Web Open Font Format (WOFF) unpacker";
        license = stdenv.lib.licenses.bsd3;
@@ -137284,7 +140691,8 @@ self: {
        sha256 = "0w0m91srvgbj3qcxw2djpb482qlinsi2dyyb76qksdd2gw0jm57i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base network split ];
+       libraryHaskellDepends = [ base network split ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://tom.lokhorst.eu/wol";
        description = "Send a Wake on LAN Magic Packet";
@@ -137304,12 +140712,15 @@ self: {
        sha256 = "1g98xjl8qpayj8ynz0391cqhfagaxa03hxqaz2wvyppalqdp44k9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson amazonka amazonka-s3 amazonka-swf base bytestring conduit
          conduit-extra cryptohash exceptions fast-logger http-conduit lens
          monad-control monad-logger mtl mtl-compat optparse-applicative safe
-         shelly text transformers transformers-base unordered-containers
-         uuid yaml
+         text transformers transformers-base unordered-containers uuid yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring cryptohash optparse-applicative shelly text
+         transformers yaml
        ];
        jailbreak = true;
        homepage = "https://github.com/swift-nav/wolf";
@@ -137323,11 +140734,11 @@ self: {
      mkDerivation {
        pname = "word-trie";
        version = "0.3.0";
-       revision = "1";
        sha256 = "10ljyb1hl4awg2c3wq5shdqj2s53q5fklf7p6np1jhn6i30c5wx3";
+       revision = "1";
        editedCabalFile = "85582eefb0020e6e35a0e2588e1dd647fb20bb7f70108f29493f994af5b74a05";
-       buildDepends = [ base binary containers ];
-       testDepends = [ base binary containers hspec QuickCheck ];
+       libraryHaskellDepends = [ base binary containers ];
+       testHaskellDepends = [ base binary containers hspec QuickCheck ];
        homepage = "https://github.com/yi-editor/word-trie";
        description = "Implementation of a finite trie over words";
        license = stdenv.lib.licenses.gpl2;
@@ -137339,8 +140750,8 @@ self: {
        pname = "word12";
        version = "1.0.0";
        sha256 = "19a22vs314bps0fq7md9jv43xzrya28mmfxi39zd8a1d8h99yd5c";
-       buildDepends = [ base bytestring ];
-       testDepends = [ base bytestring hspec QuickCheck ];
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "http://github.com/minpou/word12";
        description = "Word12 library";
        license = stdenv.lib.licenses.bsd3;
@@ -137354,8 +140765,8 @@ self: {
        pname = "word24";
        version = "1.0.7";
        sha256 = "1rh766jrmfw1hy1p4xllfq2ygxpm3zyglw4vcjainajn2r7whnhi";
-       buildDepends = [ base ];
-       testDepends = [
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "http://www.tiresiaspress.us/haskell/word24";
@@ -137370,8 +140781,8 @@ self: {
        pname = "word8";
        version = "0.1.2";
        sha256 = "1pbn8ra3qhwvw07p375cdmp7jzlg07hgdcr4cpscz3h7b9sy7fiw";
-       buildDepends = [ base ];
-       testDepends = [ base hspec ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        description = "Word8 library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137393,8 +140804,8 @@ self: {
        pname = "wordexp";
        version = "0.2.0.0";
        sha256 = "1hfpvzbyyh47ai166xyrhmhvg2shrqcswsfalwa16wab6hcg32ki";
-       buildDepends = [ array base semigroups ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ array base semigroups ];
+       libraryToolDepends = [ c2hs ];
        description = "wordexp(3) wrappers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137409,7 +140820,11 @@ self: {
        sha256 = "0plyggai2mq38bmmgc92gd0n3q4dlsywh44yflradg50aslqw0vv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers deepseq directory filepath random-fu random-source
+         text unix-compat vector
+       ];
+       executableHaskellDepends = [
          base containers deepseq directory filepath hflags random-fu
          random-source text unix-compat vector
        ];
@@ -137424,7 +140839,7 @@ self: {
        pname = "words";
        version = "0.1.2";
        sha256 = "0najaqi9fkqdkfks1c6w3fz4qf7dnr4h4brzgglg1h9ik8x5a910";
-       buildDepends = [ base directory text ];
+       libraryHaskellDepends = [ base directory text ];
        description = "Cross-platform access to a list of words";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137437,7 +140852,8 @@ self: {
        sha256 = "0jq1aiw35xiklc9asa1pgw2rn6i8q17fq780chqpqz0ryq0iv4x2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base containers fclabels ];
+       libraryHaskellDepends = [ array base containers fclabels ];
+       executableHaskellDepends = [ base containers fclabels ];
        description = "A word search solver library and executable";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137453,7 +140869,7 @@ self: {
        sha256 = "0kzbs1ps8fxdsjcpyvccgpw1y6i1q5gw6brgf6j1vv6r24wsh00w";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          ansi-terminal base bytestring containers directory filepath hashmap
          process
        ];
@@ -137470,7 +140886,9 @@ self: {
        sha256 = "04aq760z5jn81z03yi9l0d0w034qjiqiwb702lkvk2002b61mk5z";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base feed HTTP network parallel tagsoup ];
+       executableHaskellDepends = [
+         base feed HTTP network parallel tagsoup
+       ];
        jailbreak = true;
        description = "Subscribe to a wiki's RSS feed and archive external links";
        license = stdenv.lib.licenses.bsd3;
@@ -137483,7 +140901,7 @@ self: {
        pname = "wrap";
        version = "0.0.0";
        sha256 = "03pmfwwx2ykjglzrc4k09q2lv8piq107j32dg0r1aadj2ysc9fzq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Wrap a function's return value with another function";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137494,7 +140912,7 @@ self: {
        pname = "wraparound";
        version = "0.0.2";
        sha256 = "161mz5bfmx13s9azh3dss64fw98vbaab8krysr9pbbp9dh79i1cf";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://frigidcode.com";
        description = "Convenient handling of points on a seamless 2-dimensional plane";
        license = stdenv.lib.licenses.bsd3;
@@ -137511,7 +140929,7 @@ self: {
        sha256 = "1h8lqav0q6vka8yr64032yh3ncjvz6fxp1j9q5jqhzm0ai34air3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-accessor explicit-exception HaXml hxt
          hxt-filter polyparse tagchup tagsoup transformers utility-ht
          xml-basic
@@ -137540,13 +140958,13 @@ self: {
        sha256 = "15vjamr3sain8cdgqhg0jfy0rz3bbb6chrivyzvki5rs2g6pzrja";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring byteable bytestring
          case-insensitive containers cryptohash exceptions ghc-prim hashable
          http-client http-client-tls http-types lens lens-aeson mime-types
          old-locale psqueues template-haskell text time unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring
          case-insensitive containers directory doctest filepath hashable
          http-client http-types HUnit lens lens-aeson network-info
@@ -137577,14 +140995,14 @@ self: {
        sha256 = "0m0vjykj1wqv07xxy2r7xz68syx5r3chni4x399f5fwn6shw1jfz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base base16-bytestring byteable
          bytestring case-insensitive containers cryptohash exceptions
          ghc-prim hashable http-client http-client-tls http-types lens
          lens-aeson mime-types old-locale psqueues template-haskell text
          time unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring
          case-insensitive containers directory doctest filepath hashable
          http-client http-types HUnit lens lens-aeson network-info
@@ -137605,8 +141023,8 @@ self: {
        pname = "wright";
        version = "0.1.0.2";
        sha256 = "180012vyslprj06npavh44fmii1813w22sws9zwxzlb4r4jdm4zi";
-       buildDepends = [ base bed-and-breakfast containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bed-and-breakfast containers ];
+       testHaskellDepends = [
          assertions base bed-and-breakfast containers filepath lens
        ];
        jailbreak = true;
@@ -137625,7 +141043,7 @@ self: {
        sha256 = "1035v9c22pngk2r3yisr2vvnfdjgynlgq8adj8z50xak998x22ri";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bencode bytestring containers directory safe utf8-string
        ];
        jailbreak = true;
@@ -137639,7 +141057,7 @@ self: {
        pname = "wtk";
        version = "0.2.1";
        sha256 = "080y0ks5q6bv7dvla08x4cvcmzd13b5v1c5p5336k0vkg2c3fq79";
-       buildDepends = [ base old-locale time transformers ];
+       libraryHaskellDepends = [ base old-locale time transformers ];
        description = "Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137653,7 +141071,7 @@ self: {
        pname = "wtk-gtk";
        version = "0.2";
        sha256 = "0n9fvp83z71jvv67zjpz34r427s898shns00v84kfjjklhd61q5y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers gtk lenses mtl old-locale parsec time wtk
        ];
        description = "GTK tools within Wojcik Tool Kit";
@@ -137669,7 +141087,7 @@ self: {
        pname = "wumpus-basic";
        version = "0.24.0";
        sha256 = "1mahlvja39jc6zvm32n23p8ya2pfwwawbyawx8srds0bsfyqqmng";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath vector-space wumpus-core
        ];
        homepage = "http://code.google.com/p/copperbox/";
@@ -137684,7 +141102,7 @@ self: {
        pname = "wumpus-core";
        version = "0.52.1";
        sha256 = "10q991xb9v2r3z7q53rwrqcqd4m6qazvdibrxsn2620l2zbjxnd8";
-       buildDepends = [ base containers time vector-space ];
+       libraryHaskellDepends = [ base containers time vector-space ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "Pure Haskell PostScript and SVG generation";
        license = stdenv.lib.licenses.bsd3;
@@ -137699,7 +141117,7 @@ self: {
        pname = "wumpus-drawing";
        version = "0.9.0";
        sha256 = "1y9j2d3k862zi8681q3b2pl4nx4vyazdfwx5ji4mfgy73z62lbxw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers vector-space wumpus-basic wumpus-core
        ];
        homepage = "http://code.google.com/p/copperbox/";
@@ -137716,7 +141134,7 @@ self: {
        pname = "wumpus-microprint";
        version = "0.14.0";
        sha256 = "1rrw8hzns7qa9jyzhbal0x0xbi5wa99afixs0cxqk0kgm6sar9cz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base vector-space wumpus-basic wumpus-core wumpus-drawing
        ];
        jailbreak = true;
@@ -137734,7 +141152,7 @@ self: {
        pname = "wumpus-tree";
        version = "0.20.0";
        sha256 = "1xndkri4ayxb12xhik77r59qlg05nhibc8b257csrw9br7xkk8ja";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers vector-space wumpus-basic wumpus-core
          wumpus-drawing
        ];
@@ -137752,12 +141170,13 @@ self: {
        pname = "wuss";
        version = "1.0.2";
        sha256 = "0i4ln8pvjv1cgqcwid111azrls00g1jdhls3wrhnkw8wjcbiiqps";
-       buildDepends = [ base bytestring connection network websockets ];
-       testDepends = [ base doctest ];
+       libraryHaskellDepends = [
+         base bytestring connection network websockets
+       ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://taylor.fausak.me/wuss/";
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wx" = callPackage
@@ -137766,7 +141185,7 @@ self: {
        pname = "wx";
        version = "0.91.0.0";
        sha256 = "133cjc3vfqxyw71a5x99flzg23qa2k28p2zajw6vp0z7qhv8kfjy";
-       buildDepends = [ base stm wxcore ];
+       libraryHaskellDepends = [ base stm wxcore ];
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell";
        license = "unknown";
@@ -137780,7 +141199,7 @@ self: {
        sha256 = "0mwsh9bhzhnf8la5khy17j2brbphvkicqg0yd0y9ymnn6bgnq4br";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory random wx wxcore ];
+       executableHaskellDepends = [ base directory random wx wxcore ];
        homepage = "http://www.haskell.org/haskellwiki/wxAsteroids";
        description = "Try to avoid the asteroids with your space ship";
        license = stdenv.lib.licenses.bsd3;
@@ -137795,7 +141214,8 @@ self: {
        sha256 = "09n0b8znrwa65z1cjfizxkxj2rlsp56akagih5cycxpwivj1d7p9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base old-time wx wxcore Yampa ];
+       libraryHaskellDepends = [ base old-time wx wxcore Yampa ];
+       executableHaskellDepends = [ base wx wxcore Yampa ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/WxFruit";
        description = "An implementation of Fruit using wxHaskell";
@@ -137809,11 +141229,12 @@ self: {
        pname = "wxc";
        version = "0.91.0.0";
        sha256 = "0siab2h28dlyliznydxll22l9hdgwbmgddj01k1xw8hj4g7b53sa";
-       buildDepends = [ base wxdirect ];
-       extraLibraries = [ libX11 mesa wxGTK ];
-       postInstall = ''
-         cp -v dist/build/libwxc.so.0.91.0.0 $out/lib/libwxc.so
-       '';
+       libraryHaskellDepends = [ base wxdirect ];
+       librarySystemDepends = [ libX11 mesa ];
+       libraryPkgconfigDepends = [ wxGTK ];
+       doHaddock = false;
+       postInstall = "cp -v dist/build/libwxc.so.0.91.0.0 $out/lib/libwxc.so";
+       postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs";
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell C++ wrapper";
        license = "unknown";
@@ -137822,22 +141243,21 @@ self: {
 
   "wxcore" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
-     , filepath, libX11, mesa, parsec, stm, time, wxc, wxdirect, wxGTK
+     , filepath, parsec, stm, time, wxc, wxdirect, wxGTK
      }:
      mkDerivation {
        pname = "wxcore";
        version = "0.91.0.0";
        sha256 = "01pvaysihyijklyw129vcafjqyh8bpafjzvscxvzll1g86qbqlkz";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers directory filepath parsec stm time
          wxc wxdirect
        ];
-       extraLibraries = [ libX11 mesa wxGTK ];
+       libraryPkgconfigDepends = [ wxGTK ];
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell core";
        license = "unknown";
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;
-          inherit (pkgs) wxGTK;};
+     }) { inherit (pkgs) wxGTK;};
 
   "wxdirect" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, parsec
@@ -137849,7 +141269,7 @@ self: {
        sha256 = "17xlviyyagcvmc7m1f4djnsw0wdakirarmv12j4fmwbnfnbryp27";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath parsec process strict time
        ];
        jailbreak = true;
@@ -137866,7 +141286,7 @@ self: {
        sha256 = "10897yb7mkc9hy2037r9yb4192n65lz997fd5apksra1rifrazyp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base wx wxcore ];
+       executableHaskellDepends = [ base wx wxcore ];
        jailbreak = true;
        homepage = "http://github.com/elbrujohalcon/wxhnotepad";
        description = "An example of how to implement a basic notepad with wxHaskell";
@@ -137882,7 +141302,9 @@ self: {
        sha256 = "0sdbi9dfja2ia0n3kggvqc3n3c5rgw096d767yvyzc52k5caakn7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base convertible Imlib wx yjsvg yjtools ];
+       libraryHaskellDepends = [
+         base convertible Imlib wx yjsvg yjtools
+       ];
        description = "turtle like LOGO with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137897,11 +141319,11 @@ self: {
        pname = "wybor";
        version = "0.1.0";
        sha256 = "0cyfhjpb775891qbfc3y15y16mx2hraavgvsrvqkb701rh5vngf6";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal base conduit containers lens resourcet semigroups
          terminal-size text transformers unix
        ];
-       testDepends = [
+       testHaskellDepends = [
          ansi-terminal base conduit containers hspec lens process resourcet
          semigroups terminal-size text transformers unix
        ];
@@ -137920,7 +141342,7 @@ self: {
        sha256 = "147v55c1ravnb769sjw2c8i4qw0gxh3scvx5cvb1fa6nng4x0hnq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring ConfigFile containers dgs directory filepath mtl
          parsec process sgf split
        ];
@@ -137939,7 +141361,7 @@ self: {
        pname = "x-dsp";
        version = "0.2.3.1";
        sha256 = "12l3zy9lmg7sf4q8b3yz2cb9pj9n0sgjglnqhcfkzzdg6pb0g4hj";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base bytestring containers monads-tf text transformers
          type-level
        ];
@@ -137955,10 +141377,10 @@ self: {
      mkDerivation {
        pname = "x11-xim";
        version = "0.0.9.0";
-       revision = "1";
        sha256 = "0sn789j0kz891l9p0srx6537yq44b5jlyph9vc3xdb3ygy20bjrw";
+       revision = "1";
        editedCabalFile = "4404aa037f4df2ef8cd16834c8149d596f09b30379f0b85a3b8db9ddd30fa6b0";
-       buildDepends = [ base utf8-string X11 ];
+       libraryHaskellDepends = [ base utf8-string X11 ];
        homepage = "https://github.com/YoshikuniJujo/x11-xim_haskell/wiki/";
        description = "A binding to the xim of X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
@@ -137970,9 +141392,9 @@ self: {
        pname = "x11-xinput";
        version = "0.1.0.0";
        sha256 = "15ij6yfjjyqgzka1163a08ngrraxa4jpbwjq2izdl2l44k0mw29v";
-       buildDepends = [ base containers mtl X11 ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ libXi ];
+       libraryHaskellDepends = [ base containers mtl X11 ];
+       librarySystemDepends = [ libXi ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://redmine.iportnov.ru/projects/x11-xinput";
        description = "Haskell FFI bindings for X11 XInput library (-lXi)";
        license = stdenv.lib.licenses.bsd3;
@@ -137988,11 +141410,11 @@ self: {
        pname = "x509";
        version = "1.6.0";
        sha256 = "0fy2jyqkz6qi4x5x9hipnkwqcp3iqyb8h3cj23b69mqx98bfr7lk";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
          cryptonite directory filepath hourglass memory mtl pem process
        ];
-       testDepends = [
+       testHaskellDepends = [
          asn1-types base bytestring cryptonite hourglass mtl tasty
          tasty-quickcheck
        ];
@@ -138010,7 +141432,7 @@ self: {
        pname = "x509-store";
        version = "1.6.0";
        sha256 = "08ifb2gy2ssq7ci1rlmxvm344rvcil8418ymj95l5c361nl4gcym";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types base bytestring containers cryptonite
          directory filepath mtl pem process x509
        ];
@@ -138027,7 +141449,7 @@ self: {
        pname = "x509-system";
        version = "1.6.0";
        sha256 = "0d8ppvszc1xlvz7ixb8bbqmvhv2d9yyrrh51f5yng8mb2d2w5yah";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers directory filepath mtl pem process x509
          x509-store
        ];
@@ -138047,7 +141469,7 @@ self: {
        sha256 = "12nhxi1lqr5arlj586ai6n86n226iz6k4gbnm0dq07dwgky4j0iy";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          asn1-encoding asn1-types base bytestring crypto-pubkey
          crypto-pubkey-types cryptohash directory pem x509 x509-store
          x509-system x509-validation
@@ -138068,7 +141490,7 @@ self: {
        pname = "x509-validation";
        version = "1.6.0";
        sha256 = "07lz6klfslrlkc5zn8x4ynkpa9vfbn19vz7i67ygm1g608jcj1yc";
-       buildDepends = [
+       libraryHaskellDepends = [
          asn1-encoding asn1-types base byteable bytestring containers
          cryptonite data-default-class directory filepath hourglass memory
          mtl network pem process x509 x509-store
@@ -138086,12 +141508,12 @@ self: {
        pname = "xattr";
        version = "0.6.2";
        sha256 = "02vbxxn0qvkxvfxv1zgr95bvdzx14fp9h7s27wbz6mjfkfgvc39q";
-       buildDepends = [ base bytestring unix ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring unix ];
+       librarySystemDepends = [ attr ];
+       testHaskellDepends = [
          base bytestring containers directory filepath HUnit test-framework
          test-framework-hunit unix
        ];
-       extraLibraries = [ attr ];
        description = "Haskell extended file attributes interface";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) attr;};
@@ -138104,7 +141526,7 @@ self: {
        sha256 = "1hc3k3w5x1c027jj4lgpwl4cxvy01sx78sc560fdfj6bpsqlcln0";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base old-time select X11 ];
+       executableHaskellDepends = [ base old-time select X11 ];
        homepage = "https://github.com/polachok/xbattbar";
        description = "Simple battery indicator";
        license = stdenv.lib.licenses.mit;
@@ -138116,7 +141538,7 @@ self: {
        pname = "xcb-types";
        version = "0.7.0";
        sha256 = "1kzqsd85zp937yna2yfpc3jy0hba92h2fp6j0a6r8r7zz5l8yk3k";
-       buildDepends = [ base containers mtl pretty xml ];
+       libraryHaskellDepends = [ base containers mtl pretty xml ];
        homepage = "http://community.haskell.org/~aslatter/code/xcb-types";
        description = "Parses XML files used by the XCB project";
        license = stdenv.lib.licenses.bsd3;
@@ -138134,11 +141556,15 @@ self: {
        sha256 = "03z31c5gnybpfvh3idqimnz90pzbijhrqa8hlikryab148gp1gzn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers filemanip filepath
+         language-python mtl split xcb-types
+       ];
+       executableHaskellDepends = [
          attoparsec base bytestring containers directory filemanip filepath
          language-python mtl optparse-applicative split xcb-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base filepath HUnit language-python test-framework
          test-framework-hunit xcb-types
        ];
@@ -138155,7 +141581,10 @@ self: {
        sha256 = "0rjpj6i4fn504m7s3hwqbydn0m0ryih0hw4xnc409338sval6xj6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory filepath process unix ];
+       libraryHaskellDepends = [ base directory filepath process unix ];
+       executableHaskellDepends = [
+         base directory filepath process unix
+       ];
        description = "XChat";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138169,7 +141598,7 @@ self: {
        pname = "xcp";
        version = "0.1.0.1";
        sha256 = "1hx9avr6zinrqar0c1zh0l49gy0d61gch8ff12am7zjxk7lbmmzs";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers mtl network transformers
        ];
        description = "Partial implementation of the XCP protocol with ethernet as transport layer";
@@ -138182,7 +141611,7 @@ self: {
        pname = "xdg-basedir";
        version = "0.2.2";
        sha256 = "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4";
-       buildDepends = [ base directory filepath ];
+       libraryHaskellDepends = [ base directory filepath ];
        homepage = "http://github.com/willdonnelly/xdg-basedir";
        description = "A basic implementation of the XDG Base Directory specification";
        license = stdenv.lib.licenses.bsd3;
@@ -138195,7 +141624,9 @@ self: {
        pname = "xdg-userdirs";
        version = "0.1.0.2";
        sha256 = "0vh4m385a828qb61845bb7zfcqfm000g4fjkmmlvdrfyh35vpal8";
-       buildDepends = [ base containers directory filepath xdg-basedir ];
+       libraryHaskellDepends = [
+         base containers directory filepath xdg-basedir
+       ];
        homepage = "http://redmine.iportnov.ru/projects/xdg-userdirs";
        description = "Basic implementation of XDG user directories specification";
        license = stdenv.lib.licenses.bsd3;
@@ -138210,7 +141641,10 @@ self: {
        sha256 = "1izf892748g7f1h4m49d52zkbzfv164r4zyqss5lsbh3brh15v3g";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cairo graphviz gtk mtl polyparse text ];
+       libraryHaskellDepends = [
+         base cairo graphviz gtk mtl polyparse text
+       ];
+       executableHaskellDepends = [ base cairo graphviz gtk text ];
        description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -138223,7 +141657,7 @@ self: {
        sha256 = "0x788lpkkxg7ds1bgnw0kvkf6pkfbknn7jy0njhz85k7rv4kidf2";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring cereal mtl network ];
+       libraryHaskellDepends = [ base bytestring cereal mtl network ];
        description = "Xenstore client access";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -138236,9 +141670,11 @@ self: {
        sha256 = "0q63zavh3fz03dmky42gafypd0gpn8fs0nb9qn2a2zzj961vzswz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base glib ];
-       buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ libxfconf-0 ];
+       libraryHaskellDepends = [ base glib ];
+       libraryPkgconfigDepends = [ libxfconf-0 ];
+       libraryToolDepends = [ gtk2hs-buildtools ];
+       executablePkgconfigDepends = [ libxfconf-0 ];
+       executableToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://patch-tag.com/r/obbele/xfconf/home";
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
@@ -138251,8 +141687,8 @@ self: {
        pname = "xformat";
        version = "0.1.2.1";
        sha256 = "1q2wm0wffvppbv5rd16z367yfkx2sq7j0i5dkfwpawf859c9pz7x";
-       buildDepends = [ base ];
-       testDepends = [ base ];
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "http://github.com/spl/xformat";
        description = "Extensible, type-safe formatting with scanf- and printf-like functions";
        license = stdenv.lib.licenses.bsd3;
@@ -138266,7 +141702,7 @@ self: {
        pname = "xhaskell-library";
        version = "0.0.6";
        sha256 = "13nnlaw56izwy0m7k4kh4g75sa5pvxn0pf9h3w8l9hnjcpv4l2ya";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers ghc-prim mtl parsec regex-base
        ];
        jailbreak = true;
@@ -138284,14 +141720,13 @@ self: {
        pname = "xhb";
        version = "0.6.2015.8.1";
        sha256 = "1rq6g96v1fs66kdmnkvlkcxrv614ha77czclm3sfw274f7q2r2kb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary byteorder bytestring containers network parsec stm
          Xauth
        ];
        homepage = "https://github.com/aslatter/xhb";
        description = "X Haskell Bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xhb-atom-cache" = callPackage
@@ -138302,14 +141737,13 @@ self: {
        pname = "xhb-atom-cache";
        version = "0.1.0.2";
        sha256 = "113yff75i5pc0kcz4w7npbp34bl92aibpvj2cgg30f66nml61xg9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hashable mtl transformers unordered-containers xhb
        ];
        jailbreak = true;
        homepage = "http://github.com/jotrk/xhb-atom-cache/";
        description = "Atom cache for XHB";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xhb-ewmh" = callPackage
@@ -138320,7 +141754,7 @@ self: {
        pname = "xhb-ewmh";
        version = "0.1.3.1";
        sha256 = "02qfpwa9558svk0481dxjchr9h0phacsyqzail94kmzkhnnly64l";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring dlist hashable mtl transformers xhb
          xhb-atom-cache
        ];
@@ -138337,7 +141771,7 @@ self: {
        pname = "xhtml";
        version = "3000.2.1";
        sha256 = "1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/haskell/xhtml";
        description = "An XHTML combinator library";
        license = stdenv.lib.licenses.bsd3;
@@ -138350,7 +141784,9 @@ self: {
        pname = "xhtml-combinators";
        version = "0.3";
        sha256 = "06bmdl34kly965qj7phw1hm7p7siwjprflr72n7ck32lrknmy2hk";
-       buildDepends = [ base containers random text transformers xml ];
+       libraryHaskellDepends = [
+         base containers random text transformers xml
+       ];
        homepage = "http://www.dcs.shef.ac.uk/~aca08aa/xhtmlc.html";
        description = "Fast and easy to use XHTML combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -138364,7 +141800,10 @@ self: {
        sha256 = "13g44483bcgbfi3366m7l49z40prvr2abml6h6vcjbjnc575cs37";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ array base directory mtl old-time process ];
+       libraryHaskellDepends = [
+         array base directory mtl old-time process
+       ];
+       executableHaskellDepends = [ base directory process ];
        description = "The Lava system for Xilinx FPGA design with layout combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -138375,10 +141814,10 @@ self: {
        pname = "xine";
        version = "0.0.0.4";
        sha256 = "1mvi486vjf4brg6iks24wvb7gr5n7gdcqzdvv9xnncmxrscr6x36";
-       buildDepends = [ base containers ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ xine ];
-       pkgconfigDepends = [ libxine ];
+       libraryHaskellDepends = [ base containers ];
+       librarySystemDepends = [ xine ];
+       libraryPkgconfigDepends = [ libxine ];
+       libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/joachifm/hxine";
        description = "Bindings to xine-lib";
        license = "LGPL";
@@ -138396,12 +141835,14 @@ self: {
        sha256 = "1z135lcyyq7as166k3vhkqa75a555wbmfhpsdr4rsvpliq4ipqmk";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring containers http-conduit
          http-types lifted-base monad-control resourcet text time
          transformers
        ];
-       testDepends = [ aeson base bytestring containers HTF text time ];
+       testHaskellDepends = [
+         aeson base bytestring containers HTF text time
+       ];
        jailbreak = true;
        homepage = "http://github.com/JanAhrens/xing-api-haskell";
        description = "Wrapper for the XING API, v1";
@@ -138417,7 +141858,7 @@ self: {
        pname = "xinput-conduit";
        version = "0.0.0";
        sha256 = "05pcaakqc6krv13480dp7ygr8s2k5wdwr6kixmc9fcp6baa1zkn4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra transformers
        ];
        description = "Conduit of keys pressed by xinput";
@@ -138433,12 +141874,12 @@ self: {
        pname = "xkbcommon";
        version = "0.0.1";
        sha256 = "1chv156z6208jypl2grjjgbyja4ai3acx65rfyfpqb30987yf0r5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cpphs data-flags filepath process storable-record
          template-haskell text transformers
        ];
-       testDepends = [ base unix ];
-       extraLibraries = [ libxkbcommon ];
+       librarySystemDepends = [ libxkbcommon ];
+       testHaskellDepends = [ base unix ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) libxkbcommon;};
@@ -138453,7 +141894,7 @@ self: {
        sha256 = "15zwx7rkxm52pnxjhx3p979h48cls1ipb7hmryxll5rcxz9aga29";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring directory filepath HTTP network tagsoup
        ];
        homepage = "http://github.com/sellweek/xkcd";
@@ -138472,12 +141913,12 @@ self: {
        pname = "xlsior";
        version = "0.1.0.1";
        sha256 = "0dkb3dkc2srvc1951hv6m69z3d7xprsaj7lsdkj9npykqpv6nkgk";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-markup bytestring conduit conduit-extra
          data-default exceptions mtl resourcet scientific text time
          time-locale-compat vector xml-conduit xml-types zip-archive
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-markup bytestring text time time-locale-compat
          zip-archive
        ];
@@ -138499,12 +141940,17 @@ self: {
        sha256 = "0zd3p0dkb4v9gcd3mvp6g64z1gr1m5x0pf2zyj3w7ab0dgz4gzsz";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary-search bytestring conduit containers data-default
          digest lens old-locale old-time text time transformers utf8-string
          vector xml-conduit xml-types zip-archive zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base binary-search bytestring conduit containers data-default
+         digest lens old-locale old-time text time transformers utf8-string
+         vector xml-conduit xml-types zip-archive zlib
+       ];
+       testHaskellDepends = [
          base containers HUnit old-time smallcheck tasty tasty-hunit
          tasty-smallcheck time
        ];
@@ -138523,7 +141969,7 @@ self: {
        sha256 = "00m5x9vhl0rf8azwgin6a75xpj74gybn757021z9dkn1qy35zjwr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring conduit containers data-default parsec text time
          transformers xlsx
        ];
@@ -138540,7 +141986,7 @@ self: {
        pname = "xml";
        version = "1.3.14";
        sha256 = "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j";
-       buildDepends = [ base bytestring text ];
+       libraryHaskellDepends = [ base bytestring text ];
        homepage = "http://code.galois.com";
        description = "A simple XML library";
        license = stdenv.lib.licenses.bsd3;
@@ -138554,7 +142000,7 @@ self: {
        pname = "xml-basic";
        version = "0.1.1.3";
        sha256 = "0m3pwg8b9pvqh9559p7nq39vnkklmf9gcay8vpvrkh17p8n14z6c";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers data-accessor explicit-exception utility-ht
        ];
        homepage = "http://www.haskell.org/haskellwiki/XML-Basic";
@@ -138570,7 +142016,7 @@ self: {
        pname = "xml-catalog";
        version = "1.1.0.2";
        sha256 = "0jzi63v8v2ksrqrk13pcl10awx57i2vm0k8xgi01rr1ncmlrnyfc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit containers text transformers uri-conduit
          xml-conduit
        ];
@@ -138591,12 +142037,12 @@ self: {
        pname = "xml-conduit";
        version = "1.3.1";
        sha256 = "094gkf3j7xk42km9zlkjdz0bicwxcf4207q1yalwi69zfnqmprhr";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          conduit conduit-extra containers data-default deepseq monad-control
          resourcet text transformers xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-markup bytestring conduit containers hspec HUnit
          resourcet text transformers xml-types
        ];
@@ -138614,18 +142060,17 @@ self: {
        pname = "xml-conduit-parse";
        version = "0.3.0.0";
        sha256 = "0dhg2wgb7gbyn5h1z8fq813l158c49lazfxp1kx9p5jfbc12kk7s";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit conduit-parse containers exceptions parsers text
          xml-conduit xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base conduit conduit-parse data-default hlint parsers resourcet
          tasty tasty-hunit
        ];
        homepage = "https://github.com/k0ral/xml-conduit-parse";
        description = "Streaming XML parser based on conduits";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-conduit-writer" = callPackage
@@ -138636,10 +142081,10 @@ self: {
        pname = "xml-conduit-writer";
        version = "0.1.1.1";
        sha256 = "1ibiqxjr63gb3v0h9fdfzm205sqjixb5vm5y6413yn4scbf7qm2b";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers dlist mtl text xml-conduit xml-types
        ];
-       testDepends = [ base text ];
+       testHaskellDepends = [ base text ];
        homepage = "https://bitbucket.org/dpwiz/xml-conduit-writer";
        description = "Warm and fuzzy creation of XML documents";
        license = stdenv.lib.licenses.mit;
@@ -138655,12 +142100,12 @@ self: {
        pname = "xml-enumerator";
        version = "0.4.4.1";
        sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base blaze-builder
          blaze-builder-enumerator bytestring containers data-default
          enumerator failure text transformers xml-types
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers enumerator hspec HUnit text transformers
          xml-types
        ];
@@ -138681,7 +142126,7 @@ self: {
        sha256 = "1n2lywzbbjkpccpgwlj8ycf4p5wlhjs60hgqzwb33j7qiraf5jb3";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers enumerator xml-enumerator xml-types
        ];
        jailbreak = true;
@@ -138696,7 +142141,7 @@ self: {
        pname = "xml-extractors";
        version = "0.4.0.0";
        sha256 = "02380x94zvm736lj2j02926xn8asc6bq4hbhm3nshh9iw8x4phwq";
-       buildDepends = [ base mtl safe transformers xml ];
+       libraryHaskellDepends = [ base mtl safe transformers xml ];
        jailbreak = true;
        homepage = "https://github.com/holmisen/xml-extractors";
        description = "Wrapper over xml to extract data from parsed xml";
@@ -138711,11 +142156,11 @@ self: {
        pname = "xml-hamlet";
        version = "0.4.0.11";
        sha256 = "128ypil2c86zpkivrla031hn4rmhbpisy4zj0xmff473hz9qln9x";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers parsec shakespeare template-haskell text
          xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base containers hspec HUnit parsec shakespeare template-haskell
          text xml-conduit
        ];
@@ -138730,7 +142175,7 @@ self: {
        pname = "xml-helpers";
        version = "1.0.0";
        sha256 = "0rrk0j7m8ws86hbjw0l4ryq4m9i8llhsag2sfisy5r1iv2zwa0lv";
-       buildDepends = [ base xml ];
+       libraryHaskellDepends = [ base xml ];
        homepage = "http://github.com/acw/xml-helpers";
        description = "Some useful helper functions for the xml library";
        license = stdenv.lib.licenses.bsd3;
@@ -138743,13 +142188,13 @@ self: {
      mkDerivation {
        pname = "xml-html-conduit-lens";
        version = "0.3.2.1";
-       revision = "2";
        sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12";
+       revision = "2";
        editedCabalFile = "6c3305bb07c0fd40c933640ebe9e6114a798115cfb2f3cb976e40f1ece955132";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers html-conduit lens text xml-conduit
        ];
-       testDepends = [
+       testHaskellDepends = [
          base doctest hspec hspec-expectations-lens lens xml-conduit
        ];
        jailbreak = true;
@@ -138765,10 +142210,10 @@ self: {
      mkDerivation {
        pname = "xml-lens";
        version = "0.1.6.3";
-       revision = "1";
        sha256 = "1s5ivi3caz56g5yyg3pharshs3wcygcssjx1sm9aw4mv3ylz3msd";
+       revision = "1";
        editedCabalFile = "1a0768a259fb0aeaaecc092c6a9777c4d498d2695b0385a0e620e47f362773b9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base case-insensitive containers lens text xml-conduit
        ];
        homepage = "https://github.com/fumieval/xml-lens";
@@ -138783,7 +142228,9 @@ self: {
        pname = "xml-monad";
        version = "0.5";
        sha256 = "17axppy0xzshmvw8y23hxcj2ixm2fqw3hqrjk90qmpkjcv4nk44r";
-       buildDepends = [ base mtl transformers transformers-compose xml ];
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compose xml
+       ];
        jailbreak = true;
        homepage = "http://github.com/aristidb/xml-monad";
        description = "Monadic extensions to the xml package";
@@ -138796,7 +142243,7 @@ self: {
        pname = "xml-parsec";
        version = "1.0.3";
        sha256 = "1zcmiqyw6bs50kl2417ygvnpsk9wy025ls5ck8cd863x47bqpdn2";
-       buildDepends = [ base HaXml parsec ];
+       libraryHaskellDepends = [ base HaXml parsec ];
        homepage = "http://sep07.mroot.net/";
        description = "Parsing XML with Parsec";
        license = "GPL";
@@ -138811,8 +142258,8 @@ self: {
        pname = "xml-picklers";
        version = "0.3.6";
        sha256 = "196iy4z58x58bjk5jy4fpmn8zhiramlyca4rd732i8j3jp6h5f6i";
-       buildDepends = [ base containers text xml-types ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers text xml-types ];
+       testHaskellDepends = [
          base Cabal QuickCheck tasty tasty-hunit tasty-quickcheck text
          xml-types
        ];
@@ -138826,7 +142273,7 @@ self: {
        pname = "xml-pipe";
        version = "0.0.0.11";
        sha256 = "0j5fjnf6r7cagcl1ni5idwj1k5q6vjp6c59ajwsx39iqx1kdmly4";
-       buildDepends = [ base bytestring papillon simple-pipe ];
+       libraryHaskellDepends = [ base bytestring papillon simple-pipe ];
        homepage = "https://github.com/YoshikuniJujo/xml-pipe/wiki";
        description = "XML parser which uses simple-pipe";
        license = stdenv.lib.licenses.bsd3;
@@ -138841,7 +142288,8 @@ self: {
        sha256 = "1abjmxihh0ldlh8k4mp922s0h39303farmdbm08qn909pbrzm0f0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs unix ];
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base cmdargs unix ];
        homepage = "http://github.com/rosenbergdm/xml-prettify";
        description = "Pretty print XML";
        license = stdenv.lib.licenses.bsd3;
@@ -138858,7 +142306,7 @@ self: {
        pname = "xml-push";
        version = "0.0.0.18";
        sha256 = "1i8qmz7mr8rfspkn4wwyq7f7fi1grpggmqmfsmx6l7bjsjv15n3y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring crypto-random handle-like monad-control monads-tf
          peyotls random sasl simple-pipe stm tighttp transformers-base uuid
          x509 x509-store x509-validation xml-pipe xmpipe
@@ -138881,11 +142329,12 @@ self: {
        sha256 = "0brfdlarr4yyfsfawkfjdbk4z3lvi9ihkhvqh5ws2ll0h80ja6md";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers curl hashable hxt hxt-curl
          hxt-expat hxt-tagsoup regex-posix tagsoup text unordered-containers
          vector
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/sinelaw/xml-to-json";
        description = "Library and command line tool for converting XML files to json";
        license = stdenv.lib.licenses.mit;
@@ -138899,7 +142348,8 @@ self: {
        sha256 = "0gsn8wdiwmvr7nvxbfj9vpzlxwdh8m9lprx2hxnkrnslmbhjz1fx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory process tagsoup text ];
+       libraryHaskellDepends = [ base tagsoup text ];
+       executableHaskellDepends = [ base directory process ];
        homepage = "https://github.com/sinelaw/xml-to-json-fast";
        description = "Fast, light converter of xml to json capable of handling huge xml files";
        license = stdenv.lib.licenses.mit;
@@ -138911,7 +142361,7 @@ self: {
        pname = "xml-types";
        version = "0.3.6";
        sha256 = "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr";
-       buildDepends = [ base deepseq text ];
+       libraryHaskellDepends = [ base deepseq text ];
        homepage = "https://john-millikin.com/software/haskell-xml/";
        description = "Basic types for representing XML";
        license = stdenv.lib.licenses.mit;
@@ -138923,7 +142373,7 @@ self: {
        pname = "xml2html";
        version = "0.2.0";
        sha256 = "1kf4vjg4cfkd4vx8jpikbb0ib4pglmyf5vqrg3j0yllmycj22ska";
-       buildDepends = [ base xml-conduit ];
+       libraryHaskellDepends = [ base xml-conduit ];
        homepage = "http://github.com/snoyberg/xml";
        description = "blaze-html instances for xml-conduit types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -138941,12 +142391,17 @@ self: {
        sha256 = "15x3339qqy75qyj97dc7qbw7fs5dw4xvcslfrjpi36yd2596hamx";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder
          blaze-builder-conduit bytestring case-insensitive conduit
          tagstream-conduit text transformers unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         aeson attoparsec attoparsec-conduit base blaze-builder
+         blaze-builder-conduit bytestring case-insensitive conduit
+         tagstream-conduit text transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
          aeson base bytestring hspec resourcet text transformers
        ];
        jailbreak = true;
@@ -138966,7 +142421,7 @@ self: {
        sha256 = "0cp21xzzqczb49mpnsxlgc4fyhmmgyy4mfczqnz85h383js5sbia";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base bio bytestring containers directory xhtml
        ];
        jailbreak = true;
@@ -138983,10 +142438,10 @@ self: {
        pname = "xmlgen";
        version = "0.6.2.1";
        sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers mtl text
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers filepath HUnit hxt process QuickCheck
          text unix
        ];
@@ -139001,10 +142456,10 @@ self: {
      mkDerivation {
        pname = "xmlhtml";
        version = "0.2.3.4";
-       revision = "1";
        sha256 = "0cv5jqzbq7mi5lcrnaxr5qaprp8biv1jlyzpjhwnwqzla6fqamfr";
+       revision = "1";
        editedCabalFile = "17e37eb81bbdd03eea4b12e65bd4a00e789bc7a04b792f138dc9056c488443a9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring containers
          parsec text unordered-containers
        ];
@@ -139023,7 +142478,8 @@ self: {
        sha256 = "15i0a28svafjsziz1h3px0qys81xw0bs5bpq66hcwzxdv3s15lv9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [ base old-locale time xml ];
+       executableHaskellDepends = [
          base bytestring configurator filepath http-client network-uri
          old-locale split terminfo time unix wl-pprint-extras
          wl-pprint-terminfo xdg-basedir xml
@@ -139042,8 +142498,10 @@ self: {
        pname = "xmms2-client";
        version = "0.0.7.0";
        sha256 = "0ahsxah1irfsbgkkr4vnvasb7shk4b5iyjhgpj2dc9vi26p6y5dz";
-       buildDepends = [ base containers haskell98 mtl utf8-string ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [
+         base containers haskell98 mtl utf8-string
+       ];
+       libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139055,8 +142513,8 @@ self: {
        pname = "xmms2-client-glib";
        version = "0.0.7.0";
        sha256 = "1rrc8w9nrmxl8kzjkbmdxh0j1krvai396mx50wsnlqn1cxgb54h3";
-       buildDepends = [ base haskell98 xmms2-client ];
-       buildTools = [ c2hs ];
+       libraryHaskellDepends = [ base haskell98 xmms2-client ];
+       libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library — GLib integration";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139073,16 +142531,18 @@ self: {
        pname = "xmobar";
        version = "0.23.1";
        sha256 = "0yjnymiw518pjcks0kvpbj73kf0dvl1aj3a40qgmdf5xff1mac9v";
+       configureFlags = [ "-fall_extensions" ];
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          alsa-core alsa-mixer base bytestring containers dbus directory
          filepath hinotify HTTP libmpd mtl old-locale parsec process
          regex-compat stm time timezone-olson timezone-series transformers
          unix utf8-string X11 X11-xft
        ];
-       extraLibraries = [ libXpm libXrandr wirelesstools Xrender ];
-       configureFlags = [ "-fall_extensions" ];
+       executableSystemDepends = [
+         libXpm libXrandr wirelesstools Xrender
+       ];
        homepage = "http://xmobar.org";
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
@@ -139099,16 +142559,11 @@ self: {
        sha256 = "1pfjssamiwpwjp1qqkm9m9p9s35pv381m0cwg6jxg0ppglibzq1r";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory extensible-exceptions filepath mtl
          process unix utf8-string X11
        ];
        jailbreak = true;
-       postInstall = ''
-         shopt -s globstar
-         mkdir -p $out/share/man/man1
-         mv "$out/"**"/man/"*.1 $out/share/man/man1/
-       '';
        homepage = "http://xmonad.org";
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
@@ -139124,7 +142579,7 @@ self: {
        sha256 = "1ymn56rc9kkzvdla9bpj3aq2z6rnz669xbj7n87z1b42aj74s8gn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory extensible-exceptions filepath mtl
          process unix X11
        ];
@@ -139144,7 +142599,7 @@ self: {
        pname = "xmonad-contrib";
        version = "0.11.4";
        sha256 = "1g5cw9vvnfbiyi599fngk02zlmdhrf82x0bndhypkn6kybab6yd3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory extensible-exceptions mtl old-locale
          old-time process random unix utf8-string X11 X11-xft xmonad
        ];
@@ -139162,7 +142617,7 @@ self: {
        pname = "xmonad-contrib-bluetilebranch";
        version = "0.9.1.4";
        sha256 = "1ysf8yp8jwf7a1am83w5q66ys3j6kn7ss0i86n9dmfmkc3rms6l7";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory extensible-exceptions mtl old-locale
          old-time process random unix utf8-string X11 X11-xft
          xmonad-bluetilebranch
@@ -139180,7 +142635,7 @@ self: {
        pname = "xmonad-contrib-gpl";
        version = "0.12.1";
        sha256 = "1xs9qwzq9x552jw9wxdaddk2w1m5kc060mqahhk2f2q3zs9nk2n9";
-       buildDepends = [ base mtl xmonad xmonad-contrib ];
+       libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ];
        homepage = "http://xmonad.org/";
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.gpl3;
@@ -139194,7 +142649,7 @@ self: {
        pname = "xmonad-entryhelper";
        version = "0.1.0.0";
        sha256 = "1xwjdy7swc4bqqx0y7bny7rci4wpq2318m9nbz365x2r7i379v9h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory extensible-exceptions filepath mtl process unix X11
          xmonad xmonad-contrib
        ];
@@ -139211,7 +142666,7 @@ self: {
        pname = "xmonad-eval";
        version = "0.1";
        sha256 = "0k0lb4z50kj4q3dzmii4pd8lbdnlxh5l91fx4f90a35hl3v9zggk";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory hint mtl old-locale old-time process
          random unix X11 xmonad xmonad-contrib
        ];
@@ -139231,14 +142686,14 @@ self: {
        pname = "xmonad-extras";
        version = "0.12.1";
        sha256 = "14g8i3rvfiqp6mq1xhw8f9q0svcfz5nhlsgbz20zlk1az7673z55";
-       buildDepends = [
+       configureFlags = [
+         "-f-with_hlist" "-fwith_parsec" "-fwith_split"
+       ];
+       libraryHaskellDepends = [
          base containers directory hint mtl network old-locale old-time
          parsec process random regex-posix split unix X11 xmonad
          xmonad-contrib
        ];
-       configureFlags = [
-         "-f-with_hlist" "-fwith_parsec" "-fwith_split"
-       ];
        homepage = "http://projects.haskell.org/xmonad-extras";
        description = "Third party extensions for xmonad with wacky dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -139250,7 +142705,7 @@ self: {
        pname = "xmonad-screenshot";
        version = "0.1.2";
        sha256 = "1m7bmdhc1nlwflli1ymnjlmysg9d54w0shpxq05xwmiycg4jbwr1";
-       buildDepends = [ base gtk xmonad ];
+       libraryHaskellDepends = [ base gtk xmonad ];
        homepage = "https://github.com/supki/xmonad-screenshot";
        description = "Workspaces screenshooting utility for XMonad";
        license = stdenv.lib.licenses.mit;
@@ -139264,7 +142719,7 @@ self: {
        sha256 = "1y72f8dnjbpf4kmg0fp8rfbvhwshkp10g4cj3yhy9z78w84dp9a5";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base ghc random unix X11 ];
+       executableHaskellDepends = [ base ghc random unix X11 ];
        homepage = "https://github.com/LeifW/xmonad-utils";
        description = "A small collection of X utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -139278,7 +142733,7 @@ self: {
        pname = "xmonad-windownames";
        version = "0.1.0.0";
        sha256 = "1w1f0v81dnbxkmavk5d3hbnanx24yzrqacg4m8j4w36k041w7zn9";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers utf8-string xmonad xmonad-contrib
        ];
        jailbreak = true;
@@ -139295,7 +142750,7 @@ self: {
        pname = "xmpipe";
        version = "0.0.0.4";
        sha256 = "09g11mfq93w3097rzydva8qwq1sjq0hwi11lg1x1yshwcb1if2iw";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring handle-like monads-tf sasl
          simple-pipe uuid xml-pipe
        ];
@@ -139311,7 +142766,7 @@ self: {
        pname = "xorshift";
        version = "2.0.1";
        sha256 = "1pgkcnsgir8ci3hm3s5w3lk5dy7219242g9njx9cxb1m1cz5v5rf";
-       buildDepends = [ base random time ];
+       libraryHaskellDepends = [ base random time ];
        description = "Haskell implementation of the xorshift random generator";
        license = "LGPL";
      }) {};
@@ -139322,8 +142777,8 @@ self: {
        pname = "xosd";
        version = "0.2.1";
        sha256 = "1j0j64668vi0jxrzxrwyp8gwcz5zpaiai2r5k5rfsfrglhrhvhrv";
-       buildDepends = [ base ];
-       extraLibraries = [ xosd ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ xosd ];
        homepage = "http://code.haskell.org/~dons/code/xosd";
        description = "A binding to the X on-screen display";
        license = stdenv.lib.licenses.bsd3;
@@ -139337,7 +142792,7 @@ self: {
        pname = "xournal-builder";
        version = "0.1.1.1";
        sha256 = "0v7lfhyr28gmsbzizhbw4lddhhhv74y3vb8kb9z06b32lg5wm591";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring double-conversion strict
          xournal-types
        ];
@@ -139358,10 +142813,11 @@ self: {
        sha256 = "1vyykx5kbq8jja6cxy38j905b23ndj73xsg0hirz0sq4pw36shmi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cairo cmdargs directory filepath HStringTemplate
          mtl xournal-parser xournal-render xournal-types
        ];
+       executableHaskellDepends = [ base cmdargs ];
        jailbreak = true;
        homepage = "http://ianwookim.org/hxournal";
        description = "convert utility for xoj files";
@@ -139379,7 +142835,7 @@ self: {
        pname = "xournal-parser";
        version = "0.5.1";
        sha256 = "07b1gflqsjsydn304vw6zwgwlc0g7riv0b80lr165mw6c2fkmx78";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec attoparsec-conduit base bytestring conduit conduit-extra
          containers exceptions lens mtl strict text transformers xml-conduit
          xml-types xournal-types zlib-conduit
@@ -139398,7 +142854,7 @@ self: {
        pname = "xournal-render";
        version = "0.6.0";
        sha256 = "0fsijjzxizhb7dx1pc83rsini8xzqj21mmkqj1x0ysyzh78siaf3";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cairo containers fclabels mtl poppler strict
          TypeCompose xournal-types
        ];
@@ -139416,7 +142872,7 @@ self: {
        pname = "xournal-types";
        version = "0.5.1";
        sha256 = "1ii4d560wvy6iky09wbz2kdf370y87ldgr0ymsv50d7cqxfgbjap";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal containers lens strict TypeCompose
        ];
        description = "Data types for programs for xournal file format";
@@ -139434,7 +142890,7 @@ self: {
        sha256 = "180svhrkj3fp69abg0ichgc9l6iv760j302bb612qzxkpyjsyz0h";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory process random unix
        ];
        jailbreak = true;
@@ -139452,8 +142908,8 @@ self: {
        pname = "xsd";
        version = "0.5.0.1";
        sha256 = "1a5i2idpkm5i70jpp2kjglpylja4b9cd0nklgvl6lm8cpjn2j0k0";
-       buildDepends = [ attoparsec base lens text time ];
-       testDepends = [
+       libraryHaskellDepends = [ attoparsec base lens text time ];
+       testHaskellDepends = [
          base directory doctest filepath QuickCheck quickcheck-instances
        ];
        homepage = "https://github.com/tonymorris/xsd";
@@ -139467,7 +142923,7 @@ self: {
        pname = "xsha1";
        version = "0.0.0";
        sha256 = "0xljcmc8rsvkpchrdam3lpp4igq1gmym9v3drp15a9k8rfa8irmi";
-       buildDepends = [ base HUnit QuickCheck uniplate vector ];
+       libraryHaskellDepends = [ base HUnit QuickCheck uniplate vector ];
        description = "cryptanalysis of Blizzard's broken SHA-1 implementation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -139478,8 +142934,8 @@ self: {
        pname = "xslt";
        version = "0.1";
        sha256 = "0i03ihk0rjj6vk2blqdhqqqk6qqrrkxx2ckigwd5mgvp3jp64648";
-       buildDepends = [ base libxml ];
-       extraLibraries = [ xslt ];
+       libraryHaskellDepends = [ base libxml ];
+       librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139493,11 +142949,11 @@ self: {
        pname = "xss-sanitize";
        version = "0.3.5.6";
        sha256 = "1j2qrn2dbfx01m7zyk9ilgnp9zjwq9mk62b0rdal4zkg4vh212h0";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base containers css-text network-uri tagsoup text
          utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          attoparsec base containers css-text hspec HUnit network-uri tagsoup
          text utf8-string
        ];
@@ -139512,7 +142968,7 @@ self: {
        pname = "xtc";
        version = "1.0.1";
        sha256 = "0jfs3qbcx5h26irkq73dyc2m84qyrlj5dvy6d1s6p6520vhnqfal";
-       buildDepends = [ base wx wxcore ];
+       libraryHaskellDepends = [ base wx wxcore ];
        homepage = "http://github.com/alanz/xtc";
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
@@ -139524,8 +142980,8 @@ self: {
        pname = "xtest";
        version = "0.2";
        sha256 = "118xxx7sydpsvdqz0x107ngb85fggn630ysw6d2ckky75fmhmxk7";
-       buildDepends = [ base X11 ];
-       extraLibraries = [ libXtst ];
+       libraryHaskellDepends = [ base X11 ];
+       librarySystemDepends = [ libXtst ];
        description = "Thin FFI bindings to X11 XTest library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs.xlibs) libXtst;};
@@ -139538,7 +142994,7 @@ self: {
        pname = "xturtle";
        version = "0.1.25";
        sha256 = "161fpfvzbz2kks5pxmq3wrkgfkrfjvqrl4izlq0v7sicqphfkgmd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base convertible Imlib setlocale X11 X11-xft x11-xim yjsvg yjtools
        ];
        description = "turtle like LOGO";
@@ -139552,11 +143008,11 @@ self: {
      mkDerivation {
        pname = "xxhash";
        version = "0.0.1";
-       revision = "1";
        sha256 = "0crmvkvk2604a06jjsn613bxx0n1lv59picl2656rx2pc7wbyidn";
+       revision = "1";
        editedCabalFile = "1d641797e9e431c6152dc41cbe72551bb2f91cec8265d3a5e3b2b9718764d274";
-       buildDepends = [ base bytestring crypto-api tagged ];
-       testDepends = [ base bytestring hspec QuickCheck ];
+       libraryHaskellDepends = [ base bytestring crypto-api tagged ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck ];
        jailbreak = true;
        description = "A Haskell implementation of the xxHash algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -139572,7 +143028,7 @@ self: {
        sha256 = "0gjvnl5px7ir2lf7arpiji324n32mc1a90x3w6vh5xcyb13wvkv9";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers mtl network old-locale old-time safe
          split text time
        ];
@@ -139590,7 +143046,7 @@ self: {
        sha256 = "05avn1m1mmgvzx9vkjy0fyyy38vmz39km0b190lz7lhy9qrwa2bb";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base word8 ];
+       executableHaskellDepends = [ base word8 ];
        homepage = "https://github.com/fgaz/yabi";
        description = "Yet Another Brainfuck Interpreter";
        license = stdenv.lib.licenses.mit;
@@ -139606,9 +143062,10 @@ self: {
        sha256 = "169ndqawpkaj43iq6mbddqxprc7w6lsv3ws8a7cq7nmyn7n3r0jg";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring containers lens mtl mtl-compat parsec
        ];
+       executableHaskellDepends = [ base containers mtl parsec ];
        jailbreak = true;
        description = "Yet Another Brainfuck Interpreter";
        license = stdenv.lib.licenses.mit;
@@ -139626,7 +143083,7 @@ self: {
        sha256 = "1wp7vqlnwxiq4fi0dly25n9jxqi1rpgngd5dn4w4gqla1mqpb43c";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-builder blaze-html bytestring Cabal cmdargs conduit
          containers directory http-conduit http-types shakespeare tar text
          transformers unordered-containers vector wai warp yaml yesod-core
@@ -139635,6 +143092,7 @@ self: {
        homepage = "http://github.com/snoyberg/yackage";
        description = "Personal Hackage replacement for testing new packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yahoo-finance-conduit" = callPackage
@@ -139645,7 +143103,7 @@ self: {
        pname = "yahoo-finance-conduit";
        version = "0.1.0.0";
        sha256 = "1kvs12l84lgs26knrqv5f354a3bql3fg54wgnmsfcjli1vvnn1di";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base cassava conduit lens mtl text vector wreq
        ];
        jailbreak = true;
@@ -139659,7 +143117,7 @@ self: {
        pname = "yahoo-web-search";
        version = "0.2";
        sha256 = "064qakx4khzz9ih9isw46c8pm8wpg662fwnis4d64nszy6y9yfck";
-       buildDepends = [ base HTTP network xml ];
+       libraryHaskellDepends = [ base HTTP network xml ];
        homepage = "http://www.people.fas.harvard.edu/~stewart5/code/yahoo-web-search";
        description = "Yahoo Web Search Services";
        license = stdenv.lib.licenses.bsd3;
@@ -139672,9 +143130,9 @@ self: {
        pname = "yajl";
        version = "0.3.2";
        sha256 = "07186ilac22zym1jlgl915k2a82k418xa5z9h40ss62dgmaz2xkk";
-       buildDepends = [ base bytestring text ];
-       buildTools = [ c2hs ];
-       extraLibraries = [ yajl ];
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ yajl ];
+       libraryToolDepends = [ c2hs ];
        homepage = "https://john-millikin.com/software/haskell-yajl/";
        description = "Bindings for YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
@@ -139689,7 +143147,7 @@ self: {
        pname = "yajl-enumerator";
        version = "0.4.1";
        sha256 = "0dz81l58qpm3gk7zmvb702qwgq79j7d0dnyimqi6k3fp0byb5wdj";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator json-types text transformers yajl
        ];
        jailbreak = true;
@@ -139705,7 +143163,7 @@ self: {
        pname = "yall";
        version = "0.2.1";
        sha256 = "131x7hl309zpwl31k6mwqd4fdrhkcwxvn4dvlky9bh3prc8kdm2s";
-       buildDepends = [ base categories transformers ];
+       libraryHaskellDepends = [ base categories transformers ];
        homepage = "http://brandon.si/code/yall/";
        description = "Lenses with a southern twang";
        license = stdenv.lib.licenses.bsd3;
@@ -139717,7 +143175,7 @@ self: {
        pname = "yamemo";
        version = "0.6.0";
        sha256 = "12qh9fi5dj4i5lprm24gc2b66qzc3mf59m22sxf93sx3dsf7rygn";
-       buildDepends = [ base containers mtl ];
+       libraryHaskellDepends = [ base containers mtl ];
        description = "Simple memoisation function";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -139734,12 +143192,13 @@ self: {
        sha256 = "0nmpc1n80sv2bjqhzq5jdhd0zxzz9vka31y7k54fmdwr2jbg879i";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit containers directory
          enclosed-exceptions filepath resourcet scientific text transformers
          unordered-containers vector
        ];
-       testDepends = [
+       executableHaskellDepends = [ aeson base bytestring ];
+       testHaskellDepends = [
          aeson aeson-qq base base-compat bytestring conduit hspec HUnit
          mockery resourcet text transformers unordered-containers vector
        ];
@@ -139756,10 +143215,10 @@ self: {
        pname = "yaml-config";
        version = "0.2.2";
        sha256 = "1a6n18q6sy5sfw4r8j42d4vhcmvjggi2ax4i89ap2gmnah53jm50";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq failure text unordered-containers yaml
        ];
-       testDepends = [
+       testHaskellDepends = [
          base deepseq failure hashable QuickCheck tasty tasty-quickcheck
          text unordered-containers yaml
        ];
@@ -139774,7 +143233,7 @@ self: {
        pname = "yaml-light";
        version = "0.1.4";
        sha256 = "05pxkqp91l275n48p1aqijzh34vvzi7cx2nls879b95fz2dr8lhk";
-       buildDepends = [ base bytestring containers HsSyck ];
+       libraryHaskellDepends = [ base bytestring containers HsSyck ];
        description = "A light-weight wrapper with utility functions around HsSyck";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -139787,13 +143246,12 @@ self: {
        pname = "yaml-light-lens";
        version = "0.3.3";
        sha256 = "0apl8j5i8mbn1rqmv4wk5rhhh2zcpfqsh2q6d1sl798x96c72v8y";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring bytestring-lexing containers lens yaml-light
        ];
-       testDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest ];
        description = "Lens interface to yaml-light";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-rpc" = callPackage
@@ -139805,7 +143263,7 @@ self: {
        pname = "yaml-rpc";
        version = "1.0.3";
        sha256 = "01ir8yh7g3xvybg2nyfnzci0xlqpizkdkyhd8jfhyk8yka6jbr9g";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers http-client http-types lens
          template-haskell text th-lift transformers unordered-containers
          vector wreq yaml
@@ -139824,7 +143282,7 @@ self: {
        pname = "yaml-rpc-scotty";
        version = "1.0.2";
        sha256 = "1kbvziqd78fr47m3w86hc6pxa6jy3ljjwc0s2ga0d8zrh0irf3b3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers http-types mmorph scotty text transformers
          yaml yaml-rpc
        ];
@@ -139842,7 +143300,7 @@ self: {
        pname = "yaml-rpc-snap";
        version = "1.0.3";
        sha256 = "17csdfr4g0vb46yi2jhf6phin17rcn9arc71kmgdgx0xh2hrfin9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers http-types snap text transformers
          yaml yaml-rpc
        ];
@@ -139862,7 +143320,7 @@ self: {
        sha256 = "1yz7cq6xbxjh3j5hljrzla7dpgsa2ag4ywbvc6ynf7bpikdymq65";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath network swish text xml yaml
        ];
        homepage = "http://github.com/leifw/yaml2owl";
@@ -139881,7 +143339,7 @@ self: {
        sha256 = "13s5qiydxcwpp0j8xap556yrlmqs7bsi62ql2c9clr4hpbw8may7";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers parsec text unordered-containers yaml
        ];
        jailbreak = true;
@@ -139898,7 +143356,10 @@ self: {
        sha256 = "16plby17rnr4c25sdacqx4vlyx338gbmadp1c6mr4c67zx76bi4a";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base blank-canvas stm text time Yampa ];
+       libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
+       executableHaskellDepends = [
+         base blank-canvas stm text time Yampa
+       ];
        jailbreak = true;
        description = "blank-canvas frontend for yampa";
        license = stdenv.lib.licenses.bsd3;
@@ -139914,7 +143375,10 @@ self: {
        sha256 = "133nz8916c99bby6ikkh4kplx4hbwmqhdg0h2g5vsp25w67ndmjr";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base GLFW-b newtype OpenGL vector-space Yampa ];
+       libraryHaskellDepends = [ base GLFW-b newtype OpenGL Yampa ];
+       executableHaskellDepends = [
+         base GLFW-b newtype OpenGL vector-space Yampa
+       ];
        jailbreak = true;
        homepage = "https://github.com/deepfire/yampa-glfw";
        description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library";
@@ -139932,7 +143396,10 @@ self: {
        sha256 = "0163whn909s4zzmhgnbs0x90ky6kxvr6630g650i69hhqapbihpp";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base GLUT newtype OpenGL vector-space Yampa-core
+       ];
+       executableHaskellDepends = [
          base GLUT newtype OpenGL vector-space vector-space-opengl
          Yampa-core
        ];
@@ -139950,7 +143417,7 @@ self: {
        sha256 = "03plrnzxsci4fk23h8a992n5al1jc93igf61pskmhx8zgl3j3qmz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base gloss random Yampa ];
+       executableHaskellDepends = [ base gloss random Yampa ];
        jailbreak = true;
        homepage = "https://github.com/ksaveljev/yampa-2048";
        description = "2048 game clone using Yampa/Gloss";
@@ -139962,10 +143429,10 @@ self: {
      mkDerivation {
        pname = "yaop";
        version = "0.1.2.1";
-       revision = "1";
        sha256 = "0z66ffxb89bksgqfji9x8msch9yk7nmbzm2qrcn5j3w4ylg7dpdr";
+       revision = "1";
        editedCabalFile = "5333f04af0a27a0197004dc2e686dbbf29e5e2dc248277eb2afcb7587092a55c";
-       buildDepends = [ base mtl template-haskell ];
+       libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/esmolanka/yaop";
        description = "Yet another option parser";
        license = stdenv.lib.licenses.bsd3;
@@ -139978,7 +143445,7 @@ self: {
        pname = "yap";
        version = "0.2";
        sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "yet another prelude - a simplistic refactoring with algebraic classes";
        license = stdenv.lib.licenses.bsd3;
@@ -139992,7 +143459,7 @@ self: {
        pname = "yarr";
        version = "1.4.0.1";
        sha256 = "0kk2yhhh6cjbav30sh68fg880kgdpks018c9gmn4gw98621nc6al";
-       buildDepends = [
+       libraryHaskellDepends = [
          base deepseq fixed-vector ghc-prim missing-foreign primitive
          template-haskell
        ];
@@ -140008,8 +143475,8 @@ self: {
        pname = "yarr-image-io";
        version = "1.3.2.1";
        sha256 = "1wmmzw62wb5hz4qavy51wb3wwqn07zd6iiwsrzcck1jdxwy0p81x";
-       buildDepends = [ base yarr ];
-       extraLibraries = [ libdevil ];
+       libraryHaskellDepends = [ base yarr ];
+       librarySystemDepends = [ libdevil ];
        jailbreak = true;
        description = "Image IO for Yarr library";
        license = stdenv.lib.licenses.mit;
@@ -140026,10 +143493,10 @@ self: {
        sha256 = "0h2gd0k8vbz8rl34j42ayvcqp0ksz6642k9pznrd28h145wk8gz5";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base Cabal directory event-driven filepath monads-tf process
-         regexpr
+       libraryHaskellDepends = [
+         base event-driven filepath monads-tf regexpr
        ];
+       executableHaskellDepends = [ base Cabal directory process ];
        description = "yet another visual editor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140041,7 +143508,9 @@ self: {
        pname = "ycextra";
        version = "0.1";
        sha256 = "0aa0g2r7ck052wqkqqxzvkdqv9d7x3v7rqqd8iajwys9cvqny4m5";
-       buildDepends = [ base containers csv mtl uniplate yhccore ];
+       libraryHaskellDepends = [
+         base containers csv mtl uniplate yhccore
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Additional utilities to work with Yhc Core";
        license = stdenv.lib.licenses.bsd3;
@@ -140058,7 +143527,7 @@ self: {
        sha256 = "1bgw5v1g5n06jj0lyxpf48mdpaa2s49g0lbagf3jf9q01rb92bvf";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base containers directory filepath process strict time unix
          xdg-basedir
        ];
@@ -140076,11 +143545,11 @@ self: {
        pname = "yeller";
        version = "0.1.0.4";
        sha256 = "0r9kcjax591v366m5nrm75cy97wr4ykzb7kj1bwsgss21k185a3j";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers http-client http-client-tls
          http-types network stm text unordered-containers
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers hspec http-client http-client-tls
          http-types network stm text unordered-containers
        ];
@@ -140100,8 +143569,13 @@ self: {
        sha256 = "0a5qiz0sx8kbi1ijq8lqjfszp5cvqnq1jpxx18wqndfkscjfsjbd";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base Cabal containers mtl parsec random ];
-       testDepends = [ base containers hspec QuickCheck ];
+       libraryHaskellDepends = [
+         base Cabal containers mtl parsec random
+       ];
+       executableHaskellDepends = [
+         base Cabal containers mtl parsec random
+       ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
        homepage = "https://github.com/igrep/yes-precure5-command/";
        description = "Extended yes command to reproduce phrases in Yes! Precure 5";
        license = stdenv.lib.licenses.mit;
@@ -140119,7 +143593,7 @@ self: {
        pname = "yesod";
        version = "1.4.1.5";
        sha256 = "0sr9z3lxnwn5bdfwja97jsya3j0y0i8z5j6mph11bjgjdhv0s5m1";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring conduit-extra
          data-default directory fast-logger monad-control monad-logger safe
          semigroups shakespeare streaming-commons template-haskell text
@@ -140139,7 +143613,7 @@ self: {
        pname = "yesod-angular";
        version = "0.1.0.1";
        sha256 = "1f2aghs78jc3v2raq2f07mrcpmkc4jjp2vvpal4bh4qq6jnyigzd";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base containers shakespeare template-haskell text
          transformers yesod
        ];
@@ -140157,7 +143631,7 @@ self: {
        pname = "yesod-angular-ui";
        version = "0.1.1.0";
        sha256 = "08rr8w4bibjjchgfp1j9gywldr8v10vg8ddmkxj6dx5b6w2kvm8k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html containers directory hjsmin mtl resourcet
          shakespeare template-haskell text transformers yesod yesod-core
        ];
@@ -140182,7 +143656,7 @@ self: {
        pname = "yesod-auth";
        version = "1.4.6";
        sha256 = "0c0h1pivqk276l0l7nlrwpswvg72x39ikyfzbdnmxgmain878v2x";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson authenticate base base16-bytestring base64-bytestring binary
          blaze-builder blaze-html blaze-markup byteable bytestring conduit
          conduit-extra containers cryptohash data-default email-validate
@@ -140206,11 +143680,11 @@ self: {
        pname = "yesod-auth-account";
        version = "1.4.1";
        sha256 = "18bi75kx89gfzh7vi5p8pcqwip1qfpkab415bmn6pcqrlh3jd90i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring mtl nonce persistent pwstore-fast text
          yesod-auth yesod-core yesod-form yesod-persistent
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec monad-logger mtl persistent-sqlite resourcet
          text xml-conduit yesod yesod-auth yesod-test
        ];
@@ -140230,12 +143704,12 @@ self: {
        pname = "yesod-auth-account-fork";
        version = "2.0";
        sha256 = "0y3xd8iw15il05bpnkicnlv9xznqlirapbr6gmr7lxzjhgddrzyn";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-html bytestring email-validate http-types mtl
          nonce persistent pwstore-fast random tagged text yesod-auth
          yesod-core yesod-form yesod-persistent
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring hspec monad-logger mtl persistent-sqlite resourcet
          text xml-conduit yesod yesod-auth yesod-auth-account yesod-test
        ];
@@ -140254,10 +143728,10 @@ self: {
        pname = "yesod-auth-basic";
        version = "0.1.0.2";
        sha256 = "0b4vyf731wb7idmbqz7n8zm4p7i7y66x94ph7kaxv1jvq05k7bxa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base64-bytestring bytestring exceptions text wai word8 yesod
        ];
-       testDepends = [ base hlint hspec text yesod yesod-test ];
+       testHaskellDepends = [ base hlint hspec text yesod yesod-test ];
        description = "Yesod Middleware for HTTP Basic Authentication";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140270,7 +143744,7 @@ self: {
        pname = "yesod-auth-bcrypt";
        version = "0.2.0";
        sha256 = "06pbzk09zfnr290sczjpqjrfbbz1c6qig402siakp7lnizav4xz5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bcrypt bytestring text yesod-auth yesod-core yesod-form
          yesod-persistent
        ];
@@ -140290,7 +143764,7 @@ self: {
        pname = "yesod-auth-deskcom";
        version = "1.4.0";
        sha256 = "17lpkwrfc10rdmvkjg6qmbi7gysjjhqyh7n5d1mxgxhzxzqbi06w";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring byteable bytestring cipher-aes
          cprng-aes crypto-api crypto-random cryptohash data-default
          http-conduit http-types template-haskell text time transformers
@@ -140310,7 +143784,7 @@ self: {
        pname = "yesod-auth-fb";
        version = "1.7";
        sha256 = "1kp4vka9sjij8zyp15vj1jkaqwgy483q2gjb5wmhlqwcyp843h02";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit fb http-conduit lifted-base
          shakespeare text time transformers wai yesod-auth yesod-core
          yesod-fb
@@ -140329,11 +143803,11 @@ self: {
        pname = "yesod-auth-hashdb";
        version = "1.4.2.2";
        sha256 = "0s2qmpn4iwzdpps7yqcwb63cp8v1za9fp4amg0qc6b0pllzr616r";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cryptohash persistent pwstore-fast text yesod-auth
          yesod-core yesod-form yesod-persistent
        ];
-       testDepends = [ base hspec text ];
+       testHaskellDepends = [ base hspec text ];
        homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
@@ -140348,7 +143822,7 @@ self: {
        pname = "yesod-auth-kerberos";
        version = "1.4.2";
        sha256 = "1q25p6kzk4xksi64gl2k4vdnfiw2pmqmca1w5zwzvdr4zzgkmx18";
-       buildDepends = [
+       libraryHaskellDepends = [
          authenticate-kerberos base bytestring shakespeare text transformers
          yesod-auth yesod-core yesod-form
        ];
@@ -140367,7 +143841,7 @@ self: {
        pname = "yesod-auth-ldap";
        version = "0.0.3";
        sha256 = "1ps2vk2pvni3h4pk4v2siqb3a714r09ahgr5d1l89hspb9fbzfyk";
-       buildDepends = [
+       libraryHaskellDepends = [
          authenticate-ldap base bytestring hamlet LDAP text transformers
          yesod-auth yesod-core yesod-form
        ];
@@ -140386,7 +143860,7 @@ self: {
        pname = "yesod-auth-ldap-mediocre";
        version = "0.1.0.0";
        sha256 = "03pij218i9lk79n02c2pfrxsxyqi6lzjn5bzg7zgk5a87b6b57jh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base LDAP text yesod-auth yesod-core yesod-form
        ];
        jailbreak = true;
@@ -140402,7 +143876,7 @@ self: {
        pname = "yesod-auth-oauth";
        version = "1.4.0.2";
        sha256 = "0vwp08rx4bnqx9mr6ixq15s334cdjadhl9n84rs3n1xd94sj1p6l";
-       buildDepends = [
+       libraryHaskellDepends = [
          authenticate-oauth base bytestring lifted-base text transformers
          yesod-auth yesod-core yesod-form
        ];
@@ -140420,7 +143894,7 @@ self: {
        pname = "yesod-auth-oauth2";
        version = "0.1.2";
        sha256 = "1bprc8n2f591igm5yfrxga7zim5vyib07h413ainhfc7g8pbaky9";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson authenticate base bytestring hoauth2 http-conduit http-types
          lifted-base network-uri random text transformers yesod-auth
          yesod-core yesod-form
@@ -140439,7 +143913,7 @@ self: {
        pname = "yesod-auth-pam";
        version = "1.0.0.0";
        sha256 = "02cpg67ldjvv9sb6jr7liq3ac20rqc6lq1wjybii5vsah8hmvkhy";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hamlet pam text yesod-auth yesod-core yesod-form
        ];
        description = "Provides PAM authentication module";
@@ -140455,7 +143929,7 @@ self: {
        pname = "yesod-auth-smbclient";
        version = "2.0.0.0";
        sha256 = "108bmfb68rvmx3q21hz55jbic331fnplcx062vlbk6sx3jyjqgaa";
-       buildDepends = [
+       libraryHaskellDepends = [
          base hamlet sys-auth-smbclient text yesod-auth yesod-core
          yesod-form
        ];
@@ -140474,7 +143948,7 @@ self: {
        pname = "yesod-auth-zendesk";
        version = "1.2.1";
        sha256 = "0jjfydbgjcymd9x47g0acjdml55f3n40193lvl4l9l02q54g9qnb";
-       buildDepends = [
+       libraryHaskellDepends = [
          base base16-bytestring bytestring cryptohash data-default
          http-conduit http-types template-haskell text time transformers wai
          yesod-auth yesod-core
@@ -140503,7 +143977,7 @@ self: {
        sha256 = "1vnqiibdjvkja80b8i352afrhphx8v6nihylgxaywch20b2fbkrc";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          async attoparsec base base64-bytestring blaze-builder bytestring
          Cabal conduit conduit-extra containers data-default-class deepseq
          directory file-embed filepath fsnotify ghc ghc-paths http-client
@@ -140529,7 +144003,7 @@ self: {
        pname = "yesod-bootstrap";
        version = "0.1.0.0";
        sha256 = "19hzc1k0ssmsi9k4r5bxmngr1h8a42qhaxcl5y99fbf6khpndxzg";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup conduit conduit-extra containers
          either email-validate lens-family-core lens-family-th MonadRandom
          mtl persistent shakespeare text time transformers yesod-core
@@ -140537,6 +144011,7 @@ self: {
        ];
        description = "Bootstrap widgets for yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-comments" = callPackage
@@ -140548,7 +144023,7 @@ self: {
        pname = "yesod-comments";
        version = "0.9.2";
        sha256 = "1isw8cwzwwsm7p3hqj0ynwncsdfg7x0ihphyv02awchqbgc2c87i";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring directory friendly-time gravatar old-locale
          persistent template-haskell text time wai yesod yesod-auth
          yesod-form yesod-markdown
@@ -140570,7 +144045,7 @@ self: {
        sha256 = "1pzc0v18fapfbwd4pn4nchmsp4nvnrkm33av83zqfb5gyzhlk1in";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base datetime hashable hashmap stm system-uuid template-haskell
          yesod
        ];
@@ -140597,7 +144072,7 @@ self: {
        pname = "yesod-core";
        version = "1.4.12";
        sha256 = "1sdp2lg88c9gnwr3ffa8kj2vdd3y2kd7ark4qrm4gab07x2qflq3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          bytestring case-insensitive cereal clientsession conduit
          conduit-extra containers cookie data-default deepseq directory
@@ -140607,7 +144082,7 @@ self: {
          time transformers transformers-base unix-compat
          unordered-containers vector wai wai-extra wai-logger warp word8
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base blaze-builder bytestring clientsession conduit
          conduit-extra containers cookie hspec hspec-expectations http-types
          HUnit lifted-base mwc-random network path-pieces QuickCheck random
@@ -140628,7 +144103,7 @@ self: {
        pname = "yesod-crud";
        version = "0.1.2";
        sha256 = "0krjhskrjgymgp0nclggnivy03hmlvfy8c9d9ks4s14jw82rnhf1";
-       buildDepends = [
+       libraryHaskellDepends = [
          base classy-prelude containers MissingH monad-control persistent
          random safe stm uuid yesod-core yesod-form yesod-persistent
        ];
@@ -140646,14 +144121,13 @@ self: {
        pname = "yesod-crud-persist";
        version = "0.1.1";
        sha256 = "171papb9hns62jswqxkg4q41wb8sb72714i4wghx7g8svh17lv28";
-       buildDepends = [
+       libraryHaskellDepends = [
          base lens persistent text transformers wai yesod-core yesod-form
          yesod-persistent
        ];
        homepage = "https://github.com/andrewthad/yesod-crud-persist";
        description = "Flexible CRUD subsite usable with Yesod and Persistent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-datatables" = callPackage
@@ -140668,11 +144142,11 @@ self: {
        pname = "yesod-datatables";
        version = "0.1.1";
        sha256 = "0yn6fky83069pp4i13dlx9dlk4ck2k4c6sizgnrwqcjhm39m1bz6";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base bytestring data-default persistent text yesod
          yesod-auth yesod-core yesod-default yesod-form yesod-static
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring HUnit monad-control persistent
          persistent-sqlite persistent-template QuickCheck resourcet
          template-haskell test-framework test-framework-hunit
@@ -140691,7 +144165,7 @@ self: {
        pname = "yesod-default";
        version = "1.2.0";
        sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk";
-       buildDepends = [ base yesod-core ];
+       libraryHaskellDepends = [ base yesod-core ];
        homepage = "http://www.yesodweb.com/";
        description = "Default config and main functions for your yesod application (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -140708,12 +144182,16 @@ self: {
        sha256 = "0pr5z3kg27j4fgyzs7ac263wd0qxfa3m45b6fn9hg18lwjb0fgd7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson aeson-pretty array base bytestring Cabal containers directory
          filepath MissingH mtl shakespeare strict syb text transformers
          uniplate vector
        ];
-       buildTools = [ alex happy ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         array base Cabal containers directory filepath MissingH mtl
+         shakespeare strict text
+       ];
        description = "DSL for generating Yesod subsite to manage an RDBMS;";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140727,7 +144205,7 @@ self: {
        pname = "yesod-eventsource";
        version = "1.4.0.1";
        sha256 = "0j2x2zfr1s5a8m22kf27r6bdw041vmgf9b4v2ylc89n4m0f0dv55";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder conduit transformers wai wai-eventsource
          wai-extra yesod-core
        ];
@@ -140748,12 +144226,12 @@ self: {
        sha256 = "1ikrx9ys8civmf1m12fbms258xa7aj55rr02x3rjwchykmzianp4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base blaze-html bytestring data-object data-object-yaml hamlet
          persistent-sqlite persistent-template stm text transformers yesod
          yesod-core yesod-static
        ];
-       extraLibraries = [ sqlite ];
+       executableSystemDepends = [ sqlite ];
        jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "Example programs using the Yesod Web Framework. (deprecated)";
@@ -140771,7 +144249,7 @@ self: {
        pname = "yesod-fay";
        version = "0.8.0";
        sha256 = "0inx11w4wdgnbxqghm9738qs19519dcdgyjmm3aah12wzv4i68gf";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring data-default directory fay fay-dom filepath
          monad-loops process pureMD5 shakespeare template-haskell text
          transformers utf8-string yesod-core yesod-form yesod-static
@@ -140789,7 +144267,7 @@ self: {
        pname = "yesod-fb";
        version = "0.3.4";
        sha256 = "09cymp9y21vawbgr6gcj41s5xkq6j22mvk0vgl3pnyq382j33rmp";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit crypto-api fb http-conduit text wai
          yesod-core
        ];
@@ -140809,14 +144287,14 @@ self: {
        pname = "yesod-form";
        version = "1.4.4.1";
        sha256 = "14v4vhrbca0281im2bnvk36bm7i1r8yanxhv7lvrq5y5nqbc5bl3";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html blaze-markup
          byteable bytestring containers data-default email-validate
          network-uri persistent resourcet semigroups shakespeare
          template-haskell text time transformers wai xss-sanitize yesod-core
          yesod-persistent
        ];
-       testDepends = [ base hspec text time ];
+       testHaskellDepends = [ base hspec text time ];
        homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
@@ -140830,7 +144308,7 @@ self: {
        pname = "yesod-form-json";
        version = "0.0.1";
        sha256 = "1hr53p4sp0zm7l1ap07kv2q6hi1xli74k13h0df4cmf9y2xn7bxz";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers text unordered-containers
          yesod-core yesod-form
        ];
@@ -140846,7 +144324,7 @@ self: {
        pname = "yesod-gitrepo";
        version = "0.2.1.0";
        sha256 = "1v47d6gvw3d19mqip36y54c4d84f48jgybdwgdl8r20zfwvhyvkf";
-       buildDepends = [
+       libraryHaskellDepends = [
          base directory enclosed-exceptions http-types lifted-base process
          temporary text wai yesod-core
        ];
@@ -140862,7 +144340,9 @@ self: {
        pname = "yesod-gitrev";
        version = "0.1.0.0";
        sha256 = "0jcgc8l2gh6ahxwddra0jyf78bi4rzff9nfi1knjxixfll73rrih";
-       buildDepends = [ aeson base gitrev template-haskell yesod-core ];
+       libraryHaskellDepends = [
+         aeson base gitrev template-haskell yesod-core
+       ];
        description = "A subsite for displaying git information";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140875,7 +144355,7 @@ self: {
        pname = "yesod-goodies";
        version = "0.0.5";
        sha256 = "0wxdwyb5dg00ycb09kbl1m12w2bzi6kxbjr4dqgrwfd3dgypcjdz";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html bytestring directory HTTP old-locale pandoc pureMD5
          text time yesod yesod-form
        ];
@@ -140892,7 +144372,7 @@ self: {
        pname = "yesod-json";
        version = "1.2.0";
        sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw";
-       buildDepends = [ base yesod-core ];
+       libraryHaskellDepends = [ base yesod-core ];
        homepage = "http://www.yesodweb.com/";
        description = "Generate content for Yesod using the aeson package. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -140904,7 +144384,7 @@ self: {
        pname = "yesod-links";
        version = "0.3.0";
        sha256 = "0i1b4lgwv98pp7251fm3h4cdb1d868fqwm6175rk7zg699g2v61y";
-       buildDepends = [ base text yesod-core ];
+       libraryHaskellDepends = [ base text yesod-core ];
        jailbreak = true;
        homepage = "http://github.com/pbrisbin/yesod-goodies/yesod-links";
        description = "A typeclass which simplifies creating link widgets throughout your site";
@@ -140918,7 +144398,7 @@ self: {
        pname = "yesod-lucid";
        version = "0.1";
        sha256 = "1ymmpi9g3pjl23ymdjwiv748lnq1hyjq24la2ffgwrm4b6f41xip";
-       buildDepends = [ base lucid monads-tf text yesod-core ];
+       libraryHaskellDepends = [ base lucid monads-tf text yesod-core ];
        description = "Lucid support for Yesod";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140939,14 +144419,18 @@ self: {
        sha256 = "0syg5a0xihrdbclsrbgqgf6llhji7zdn1g50fbvlklfpw4dkb1f7";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base containers http-conduit http-types lifted-base mangopay
+         persistent-template text time yesod yesod-core
+       ];
+       executableHaskellDepends = [
          aeson base bytestring conduit conduit-extra containers
          country-codes data-default directory fast-logger hamlet hjsmin
-         http-conduit http-types lifted-base mangopay monad-control
-         monad-logger persistent persistent-postgresql persistent-template
-         resourcet shakespeare template-haskell text time wai wai-extra
-         wai-logger warp yaml yesod yesod-auth yesod-core yesod-form
-         yesod-persistent yesod-static
+         http-conduit lifted-base mangopay monad-control monad-logger
+         persistent persistent-postgresql persistent-template resourcet
+         shakespeare template-haskell text time wai wai-extra wai-logger
+         warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent
+         yesod-static
        ];
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
@@ -140963,15 +144447,14 @@ self: {
        pname = "yesod-markdown";
        version = "0.10.0";
        sha256 = "0n9rcpf8s89swj0pz86xddl5zjbkkw1fa1h292wvs15y77lrl0zi";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare texmath text xss-sanitize yesod-core yesod-form
        ];
-       testDepends = [ base blaze-html hspec text ];
+       testHaskellDepends = [ base blaze-html hspec text ];
        homepage = "http://github.com/pbrisbin/yesod-markdown";
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-media-simple" = callPackage
@@ -140982,7 +144465,7 @@ self: {
        pname = "yesod-media-simple";
        version = "0.1.0.1";
        sha256 = "1ajlrqsq7x83vc67xqb4r3328akwjp0a0vwf7nvqj3bsjqg5af76";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring diagrams-cairo diagrams-core diagrams-lib directory
          JuicyPixels vector yesod
        ];
@@ -140999,7 +144482,7 @@ self: {
        pname = "yesod-newsfeed";
        version = "1.4.0.1";
        sha256 = "02ydkri23vrm7mak2b1ybfhkdgc2dmv9vq3ki2d7sd005sp3zdly";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring containers shakespeare text
          time xml-conduit yesod-core
        ];
@@ -141014,7 +144497,7 @@ self: {
        pname = "yesod-paginate";
        version = "0.1";
        sha256 = "088m7prg774wdh8fp7zljxj65zj5krl4pggl63anv2wk7nlw27py";
-       buildDepends = [ base template-haskell yesod ];
+       libraryHaskellDepends = [ base template-haskell yesod ];
        description = "Pagination for Yesod sites";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141029,8 +144512,8 @@ self: {
        pname = "yesod-pagination";
        version = "2.0.0";
        sha256 = "0d42b8y7zpl624d7wa2caarni9g10hg14xsbamlkykki3bl197m1";
-       buildDepends = [ base esqueleto yesod ];
-       testDepends = [
+       libraryHaskellDepends = [ base esqueleto yesod ];
+       testHaskellDepends = [
          base hspec monad-logger persistent persistent-sqlite resource-pool
          resourcet shakespeare utf8-string wai-test yesod yesod-test
        ];
@@ -141048,7 +144531,7 @@ self: {
        pname = "yesod-paginator";
        version = "0.9.1";
        sha256 = "0xi19gf6vdna3nwwmciypqgaprzb7gdjpwvfrpj82gr6yar1va5m";
-       buildDepends = [
+       libraryHaskellDepends = [
          base persistent resourcet text transformers yesod
        ];
        jailbreak = true;
@@ -141067,11 +144550,11 @@ self: {
        pname = "yesod-persistent";
        version = "1.4.0.3";
        sha256 = "0prvrz52c2pr4qsanjzndviyq4f6zc49in69xz5153h2vagbfmb4";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder conduit persistent persistent-template
          resource-pool resourcet transformers yesod-core
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder conduit hspec persistent persistent-sqlite text
          wai-extra yesod-core
        ];
@@ -141116,7 +144599,7 @@ self: {
        pname = "yesod-platform";
        version = "1.2.13.3";
        sha256 = "1j71m9bqam7dl1ghhwvkw5ispp8z06hbkvdxslx5sca998vx9awv";
-       buildDepends = [
+       libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint asn1-encoding asn1-parse asn1-types
          attoparsec-conduit authenticate auto-update base base16-bytestring
          base64-bytestring blaze-builder blaze-builder-conduit blaze-html
@@ -141160,7 +144643,7 @@ self: {
        pname = "yesod-pnotify";
        version = "0.5.0";
        sha256 = "05ic4n6g8jp575qj8mq9lbnhvmdm5zwxn3wf8f1blgigqimamsps";
-       buildDepends = [
+       libraryHaskellDepends = [
          base shakespeare text transformers yesod yesod-form
        ];
        jailbreak = true;
@@ -141175,7 +144658,7 @@ self: {
        pname = "yesod-pure";
        version = "0.1.0.2";
        sha256 = "0v3xvhk5nxc2y3c21y6h7w6lg5vm1s2vzf9f02qw8gj928vsidzg";
-       buildDepends = [ base fast-logger text yesod yesod-core ];
+       libraryHaskellDepends = [ base fast-logger text yesod yesod-core ];
        jailbreak = true;
        homepage = "https://github.com/snoyberg/yesod-pure";
        description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)";
@@ -141193,7 +144676,7 @@ self: {
        pname = "yesod-purescript";
        version = "0.0.5";
        sha256 = "0arij86cfzy5hh82gc5l4i3s3z4qa9rfrnj9nrp6q25qhvgiclmy";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring containers data-default formatting fsnotify
          mtl purescript regex-tdfa regex-tdfa-text shakespeare system-fileio
          system-filepath template-haskell text time transformers yesod-core
@@ -141216,12 +144699,16 @@ self: {
        sha256 = "1vcllxsyqvr26a27l9vfi76kpdzld3ws1i0q6g9jnwhkr16bmc3f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         aeson base bytestring containers network-uri regex-posix
+         template-haskell text unordered-containers yaml yesod-core
+       ];
+       executableHaskellDepends = [
          aeson base bytestring containers network-uri optparse-applicative
          regex-posix template-haskell text unordered-containers yaml
          yesod-core
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base bytestring containers hspec network-uri regex-posix
          template-haskell text unordered-containers yaml yesod-core
        ];
@@ -141239,7 +144726,7 @@ self: {
        pname = "yesod-recaptcha";
        version = "1.4";
        sha256 = "1dvbpzcfwmjv836i8g0gv80dj1iwb9gnvgwg3m5h2hi95249m471";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring data-default http-conduit http-types lifted-base
          network network-info resourcet text wai yesod-auth yesod-core
          yesod-form
@@ -141256,13 +144743,13 @@ self: {
      mkDerivation {
        pname = "yesod-routes";
        version = "1.2.0.7";
-       revision = "1";
        sha256 = "00i2nysbhmxnq0dvfdjx6nhxy680ya38nx8gcgm13fv2xwdd2p6j";
+       revision = "1";
        editedCabalFile = "0d622fd91f5c82a3ae54849a9f55e15b39dcc6240f9f2119151362255cd7334e";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers path-pieces template-haskell text vector
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec HUnit path-pieces template-haskell
          text
        ];
@@ -141280,12 +144767,13 @@ self: {
        pname = "yesod-routes-flow";
        version = "1.0";
        sha256 = "1bb0w1910mnzci4mi6r2zxhjy4wsridi5h2g97nqhd65qncq4km0";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base classy-prelude system-fileio text yesod-core
        ];
        homepage = "https://github.com/frontrowed/yesod-routes-flow";
        description = "Generate Flow routes for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-routes-typescript" = callPackage
@@ -141296,7 +144784,7 @@ self: {
        pname = "yesod-routes-typescript";
        version = "0.3.0.0";
        sha256 = "1gn0fvspgwhzpg7pfaj029vdhlm8ypx9kyn2wdz2wzm5jkl7bnn9";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base classy-prelude system-fileio text yesod-core
          yesod-routes
        ];
@@ -141314,7 +144802,7 @@ self: {
        pname = "yesod-rst";
        version = "0.2.3";
        sha256 = "1dv8xq7hndpk3d86dxwjjplv0la8fn32pwzb5l00db9cg420jp71";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-html directory hamlet pandoc persistent text
          xss-sanitize yesod-core yesod-form
        ];
@@ -141333,7 +144821,7 @@ self: {
        pname = "yesod-s3";
        version = "0.1.1";
        sha256 = "0vl24qa2aidrr7a082yhnscava06x6jf5y5x9fi9jdry3rnkhzbv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit conduit-extra gd hS3 mtl network resourcet
          text yesod-core
        ];
@@ -141351,7 +144839,7 @@ self: {
        pname = "yesod-sass";
        version = "0.1.2.0";
        sha256 = "0mxk007csmzbrx169jlbg07vqm7ixjrfvjy6xa2lfd5g1xpc7s94";
-       buildDepends = [
+       libraryHaskellDepends = [
          base data-default hsass shakespeare template-haskell text
          yesod-core
        ];
@@ -141368,7 +144856,7 @@ self: {
        pname = "yesod-session-redis";
        version = "0.1.0";
        sha256 = "06ilc1xjic66xj46nib8y6cq7n8hyc27kzz9zd001d12qh342brv";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring containers cookie hedis mtl network
          pool-conduit random text time wai yesod-core
        ];
@@ -141386,7 +144874,7 @@ self: {
        pname = "yesod-sitemap";
        version = "1.4.0.1";
        sha256 = "0ri67r3yjngn4m2lj071n2v3r9w7pvsl24rayf41k7w9j3ylk100";
-       buildDepends = [
+       libraryHaskellDepends = [
          base conduit containers data-default text time xml-conduit
          xml-types yesod-core
        ];
@@ -141409,7 +144897,7 @@ self: {
        pname = "yesod-static";
        version = "1.5.0.1";
        sha256 = "1yda1m7dafcmq9s2gv0cdq3kphl5gg1279crqjgf3x57dyrypjpl";
-       buildDepends = [
+       libraryHaskellDepends = [
          async attoparsec base base64-bytestring blaze-builder byteable
          bytestring conduit conduit-extra containers cryptohash
          cryptohash-conduit css-text data-default directory file-embed
@@ -141417,7 +144905,7 @@ self: {
          resourcet template-haskell text transformers unix-compat
          unordered-containers wai wai-app-static yesod-core
        ];
-       testDepends = [
+       testHaskellDepends = [
          async base base64-bytestring byteable bytestring conduit
          conduit-extra containers cryptohash cryptohash-conduit data-default
          directory file-embed filepath hjsmin hspec http-types HUnit
@@ -141443,19 +144931,21 @@ self: {
        sha256 = "17dqk60076la64n4j6bndg9ya16q764j2cl07s2dlldw4z1g4sn1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base blaze-builder blaze-markup bytestring data-default
          directory filepath hamlet language-javascript mime-types
-         shakespeare template-haskell text yesod yesod-core yesod-static
+         shakespeare template-haskell text yesod-core yesod-static
        ];
-       testDepends = [
+       executableHaskellDepends = [
+         base data-default shakespeare yesod yesod-static
+       ];
+       testHaskellDepends = [
          base bytestring hamlet hspec HUnit shakespeare template-haskell
          text yesod-core yesod-static yesod-test
        ];
        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
@@ -141465,11 +144955,12 @@ self: {
        pname = "yesod-table";
        version = "1.0.3";
        sha256 = "02w7ddyi0zzcvhlj1b01p3zjii2g7bn2f7wcgrdidk8dlg9hrgj5";
-       buildDepends = [ base containers contravariant text yesod-core ];
+       libraryHaskellDepends = [
+         base containers contravariant text yesod-core
+       ];
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-tableview" = callPackage
@@ -141478,7 +144969,7 @@ self: {
        pname = "yesod-tableview";
        version = "0.2.1";
        sha256 = "1qf7439c31a8xi0qs8fn2xdlrldi42n1k25lj6vn061lm8wg35yy";
-       buildDepends = [ base hamlet persistent yesod ];
+       libraryHaskellDepends = [ base hamlet persistent yesod ];
        description = "Table view for Yesod applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141495,13 +144986,13 @@ self: {
        pname = "yesod-test";
        version = "1.4.3.1";
        sha256 = "150kzp8h9wl3c1diz6h6m62qd6w0qz4drgrm095amb0sndrh37m2";
-       buildDepends = [
+       libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          case-insensitive containers cookie hspec-core html-conduit
          http-types HUnit monad-control network persistent text time
          transformers wai wai-extra xml-conduit xml-types yesod-core
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring containers hspec html-conduit HUnit text wai
          xml-conduit yesod-core yesod-form
        ];
@@ -141519,7 +145010,7 @@ self: {
        pname = "yesod-test-json";
        version = "0.2.0.0";
        sha256 = "1z6cps85fypgymfmq0z67f1z5cr2x9l9hf4wrkncvkivbcb330bh";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring conduit hspec http-types HUnit text
          transformers wai wai-test yesod-default
        ];
@@ -141538,7 +145029,7 @@ self: {
        pname = "yesod-text-markdown";
        version = "0.1.8";
        sha256 = "1k48wjnn4vvlh9cvh8p3yanjmr772vqz4jbz9nxk0vv9ab9dns81";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base markdown persistent shakespeare text yesod-core
          yesod-form yesod-persistent
        ];
@@ -141554,13 +145045,14 @@ self: {
        pname = "yesod-tls";
        version = "1.4.1";
        sha256 = "0zvhchiky51pwhbcj4c86xsa98nwfw86188jxhnk2jwdgpdb9j68";
-       buildDepends = [
+       libraryHaskellDepends = [
          base fast-logger monad-logger template-haskell unix wai wai-extra
          warp warp-tls yesod
        ];
        homepage = "http://github.com/netom/yesod-tls";
        description = "Provides main functions using warp-tls for yesod projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-transloadit" = callPackage
@@ -141573,12 +145065,12 @@ self: {
        pname = "yesod-transloadit";
        version = "0.3.0.0";
        sha256 = "0p2npza0clflh1vswyjr4gxx5fxggzv1x61x7c7d79jadq88bi4m";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base byteable bytestring cryptohash lens lens-aeson
          old-locale shakespeare text time transformers unordered-containers
          yesod yesod-core yesod-form
        ];
-       testDepends = [
+       testHaskellDepends = [
          aeson base containers hspec lens old-locale text time yesod
          yesod-form yesod-test
        ];
@@ -141596,7 +145088,10 @@ self: {
        sha256 = "163ah4g6k62hypm2kj1aiwnzfjx1ngss6iqfg467vjhg71s5l1j9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-html hamlet persistent text yesod yesod-form
+       ];
+       executableHaskellDepends = [
          base blaze-html hamlet monad-logger persistent persistent-sqlite
          resourcet text yesod yesod-form
        ];
@@ -141616,7 +145111,7 @@ self: {
        pname = "yesod-websockets";
        version = "0.2.3";
        sha256 = "15kklk4wkxclrmsvwzjcy8ggal14c6nrckfn0kqcrfp0hbxzj09m";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base conduit enclosed-exceptions monad-control transformers
          wai wai-websockets websockets yesod-core
        ];
@@ -141633,7 +145128,7 @@ self: {
        pname = "yesod-websockets-extra";
        version = "0.1.0.0";
        sha256 = "042gl7w8cipjhqfl5h933b0p3j9d5m58v91p1rylz4mjgvhxpk5g";
-       buildDepends = [
+       libraryHaskellDepends = [
          base enclosed-exceptions transformers websockets yesod-websockets
        ];
        description = "Extension to yesod-websockets";
@@ -141649,7 +145144,7 @@ self: {
        pname = "yesod-worker";
        version = "0.0.1";
        sha256 = "1rwmw1hhx2mm6ikmqcfjg9vgi95mjhv2w5r4dwn8796jkkw8zpkd";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers fast-logger monad-control monad-logger persistent
          resourcet stm template-haskell transformers transformers-base yesod
          yesod-core
@@ -141675,14 +145170,15 @@ self: {
        sha256 = "1m9sb4kshdvr4nd4dsd6ss2f4dfhxnbs9g1xd9rmzrd7bw9k5am0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson ansi-terminal async base base-unicode-symbols bytestring
-         Cabal case-insensitive clock configuration-tools deepseq either
+         case-insensitive clock configuration-tools deepseq either
          enclosed-exceptions lens lifted-base monad-control mtl
          optparse-applicative stm stm-chans text time trace transformers
          transformers-base void
        ];
-       testDepends = [
+       executableHaskellDepends = [ base Cabal ];
+       testHaskellDepends = [
          async base base-unicode-symbols configuration-tools
          enclosed-exceptions lens lifted-base tagged tasty tasty-hunit text
          transformers transformers-base void
@@ -141690,7 +145186,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-yet-another-logger";
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yhccore" = callPackage
@@ -141699,7 +145194,7 @@ self: {
        pname = "yhccore";
        version = "0.9.1";
        sha256 = "18gjzlpxn0hp723ybjgq1zdbpl35iqphs7b8r5x9ddbkm435sw93";
-       buildDepends = [ base containers mtl pretty uniplate ];
+       libraryHaskellDepends = [ base containers mtl pretty uniplate ];
        homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Yhc's Internal Core language";
        license = stdenv.lib.licenses.bsd3;
@@ -141720,9 +145215,10 @@ self: {
        pname = "yi";
        version = "0.12.0";
        sha256 = "167x1zmkhrh7s4wjvvpp0pydgif1yl05by8j6wimi79wwvnkiyi7";
+       configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring Cabal containers data-default
          directory dlist dynamic-state dyre exceptions filepath glib gtk
          hashable lens mtl old-locale oo-prototypes pango parsec pointedlist
@@ -141730,11 +145226,11 @@ self: {
          template-haskell text time transformers-base unix unix-compat
          unordered-containers vty word-trie xdg-basedir yi-language yi-rope
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          base directory filepath HUnit lens QuickCheck semigroups tasty
          tasty-hunit tasty-quickcheck text yi-language yi-rope
        ];
-       configureFlags = [ "-fpango" "-fvty" ];
        homepage = "https://yi-editor.github.io";
        description = "The Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
@@ -141749,7 +145245,7 @@ self: {
        pname = "yi-contrib";
        version = "0.10.1";
        sha256 = "053hsahkxwg2mnf3h4j95gj18x5791dqqji43l310i4l7mliw91k";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers directory filepath lens mtl old-locale
          oo-prototypes split text time transformers-base yi yi-language
          yi-rope
@@ -141767,7 +145263,7 @@ self: {
        pname = "yi-emacs-colours";
        version = "0.1.0.1";
        sha256 = "1kbds9s0r67bdvigjk0c58slbifnddp6ppv4jrgv6493pylp78qv";
-       buildDepends = [ base containers split yi-language ];
+       libraryHaskellDepends = [ base containers split yi-language ];
        homepage = "https://github.com/Fuuzetsu/yi-emacs-colours";
        description = "Simple mapping from colour names used in emacs to Color";
        license = stdenv.lib.licenses.gpl2;
@@ -141782,7 +145278,7 @@ self: {
        pname = "yi-fuzzy-open";
        version = "0.1.0";
        sha256 = "03y7ddas8w380asx4ldafp1r3h4nlyjky7n4n5sdyvwbi0rix1gc";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary containers data-default directory filepath mtl text
          transformers-base vector yi yi-language yi-rope
        ];
@@ -141814,17 +145310,17 @@ self: {
        pname = "yi-language";
        version = "0.2.0";
        sha256 = "1a0lvddn35q9jqr0w7g2m268dy8s9dwsss7sf4460rvkg1xvkvvh";
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary containers data-default hashable lens
          oo-prototypes pointedlist regex-base regex-tdfa template-haskell
          transformers-base unordered-containers
        ];
-       testDepends = [
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [
          array base binary containers data-default filepath hashable hspec
          lens pointedlist QuickCheck regex-base regex-tdfa template-haskell
          transformers-base unordered-containers
        ];
-       buildTools = [ alex ];
        homepage = "https://github.com/yi-editor/yi-language";
        description = "Collection of language-related Yi libraries";
        license = stdenv.lib.licenses.gpl2;
@@ -141836,7 +145332,7 @@ self: {
        pname = "yi-monokai";
        version = "0.1.1.2";
        sha256 = "1nghfyiy8jdz144nbw0c2cdy8n6xyjmk31g6z24jk8dij7iwb60l";
-       buildDepends = [ base yi ];
+       libraryHaskellDepends = [ base yi ];
        homepage = "https://github.com/Fuuzetsu/yi-monokai";
        description = "Monokai colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
@@ -141851,11 +145347,13 @@ self: {
        pname = "yi-rope";
        version = "0.7.0.1";
        sha256 = "190rb5rbvdzy4d52dj3ih0kwzigh7v0fg412p3848pkv3836vmg0";
-       buildDepends = [
+       libraryHaskellDepends = [
          base binary bytestring charsetdetect-ae data-default deepseq
          fingertree text text-icu
        ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances text ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances text
+       ];
        description = "A rope data structure used by Yi";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -141866,7 +145364,7 @@ self: {
        pname = "yi-snippet";
        version = "0.1.0.0";
        sha256 = "0qbn5x7lbvb9h6gdqgvldzyy7z5y5aa9a02ss48zkccss5p6939d";
-       buildDepends = [ base containers yi yi-rope ];
+       libraryHaskellDepends = [ base containers yi yi-rope ];
        homepage = "https://github.com/yi-editor/yi-snippet";
        description = "Snippet support for Yi";
        license = stdenv.lib.licenses.gpl2;
@@ -141878,7 +145376,7 @@ self: {
        pname = "yi-solarized";
        version = "0.1.1";
        sha256 = "17ifjm9vgrhv00bll5zj9siz08fng1626bff9q5sfbvzd7y6i9nc";
-       buildDepends = [ base yi ];
+       libraryHaskellDepends = [ base yi ];
        homepage = "https://github.com/NorfairKing/yi-solarized";
        description = "Solarized colour theme for the Yi text editor";
        license = stdenv.lib.licenses.mit;
@@ -141890,7 +145388,7 @@ self: {
        pname = "yi-spolsky";
        version = "0.1";
        sha256 = "152ys2x416322c13nxmi25wpilq0ddd6hj36mr25jaacf1qszv6q";
-       buildDepends = [ base yi ];
+       libraryHaskellDepends = [ base yi ];
        jailbreak = true;
        homepage = "https://github.com/melrief/yi-spolsky";
        description = "Spolsky colour theme for the Yi text editor";
@@ -141915,7 +145413,7 @@ self: {
        pname = "yices";
        version = "0.0.0.12";
        sha256 = "1k3q789dapk0c311x72w4r008rnbfz3cvajahxq208gy8iyjx9iz";
-       buildDepends = [ base parsec process ];
+       libraryHaskellDepends = [ base parsec process ];
        description = "Haskell programming interface to Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -141926,7 +145424,9 @@ self: {
        pname = "yices-easy";
        version = "0.1";
        sha256 = "13nl3isf8npqmgsa7mc7713g7y0nk33a654rm1qnn1s6zyz41v70";
-       buildDepends = [ base bindings-yices containers transformers ];
+       libraryHaskellDepends = [
+         base bindings-yices containers transformers
+       ];
        homepage = "http://www.ugcs.caltech.edu/~keegan/haskell/yices-easy/";
        description = "Simple interface to the Yices SMT (SAT modulo theories) solver";
        license = stdenv.lib.licenses.bsd3;
@@ -141940,10 +145440,10 @@ self: {
        pname = "yices-painless";
        version = "0.1.2";
        sha256 = "1q0hxzvhd9p0qb0fyps6hn06nhqcwldxyfljk8880il17ky92p3h";
-       buildDepends = [
+       libraryHaskellDepends = [
          base containers pretty strict-concurrency vector
        ];
-       extraLibraries = [ gmp yices ];
+       librarySystemDepends = [ gmp yices ];
        homepage = "http://code.haskell.org/~dons/code/yices-painless";
        description = "An embedded language for programming the Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
@@ -141959,9 +145459,10 @@ self: {
        sha256 = "11iwz7mrx3f72i3d4l9zvqb8g0722aj00s7h7wa06y4l69rfnj6m";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base directory ftphs haskeline hsConfigure mtl process unix
+       libraryHaskellDepends = [
+         base directory ftphs haskeline mtl process unix
        ];
+       executableHaskellDepends = [ hsConfigure ];
        jailbreak = true;
        homepage = "http://homepage3.nifty.com/salamander/second/projects/yjftp/index.xhtml";
        description = "CUI FTP client like 'ftp', 'ncftp'";
@@ -141977,7 +145478,7 @@ self: {
        sha256 = "1rlw9i1a034lg7gc60fkxjh6kc5yrbapc745gwl1ddi2wisy3h24";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base directory ftphs mtl process unix ];
+       libraryHaskellDepends = [ base directory ftphs mtl process unix ];
        jailbreak = true;
        homepage = "http://homepage3.nifty.com/salamander/second/projects/yjftp/index.xhtml";
        description = "CUI FTP client like 'ftp', 'ncftp'";
@@ -141990,7 +145491,7 @@ self: {
        pname = "yjsvg";
        version = "0.1.18";
        sha256 = "1k9shfj53vqg1wgm06k2729md0q5y252sypjkx245sn3x0a7ffji";
-       buildDepends = [ base HaXml ];
+       libraryHaskellDepends = [ base HaXml ];
        description = "make SVG string from Haskell data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142001,7 +145502,7 @@ self: {
        pname = "yjtools";
        version = "0.9.18";
        sha256 = "13zbq37p2prbyxq1wply7qqpc2wwsic78wzcgbc430nfrrpiq4lv";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        homepage = "http://homepage3.nifty.com/salamander/second/projects/yjtools/index.xhtml";
        description = "some tools for Monad, List, Tuple and so on";
        license = "LGPL";
@@ -142015,8 +145516,8 @@ self: {
        pname = "yocto";
        version = "1.0.1";
        sha256 = "0i92yraawhn6qkw23wm5vmgwcjgy9pis684jyq8mkawbw0nv3q9a";
-       buildDepends = [ base containers parsec ];
-       testDepends = [
+       libraryHaskellDepends = [ base containers parsec ];
+       testHaskellDepends = [
          base containers parsec QuickCheck quickcheck-instances
        ];
        homepage = "https://github.com/ajg/yocto";
@@ -142034,7 +145535,7 @@ self: {
        pname = "yoko";
        version = "2.0";
        sha256 = "07ivcx6xbmjpyj7053fp151k47y7pllwjddxxrwayrlx2qx456z6";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bifunctors containers invariant kinds mtl records semigroups
          template-haskell th-sccs type-cereal type-digits type-equality
          type-functions type-ord type-ord-spine-cereal type-spine
@@ -142050,7 +145551,7 @@ self: {
        pname = "york-lava";
        version = "0.2";
        sha256 = "1rpkxlfvk84zl965ik5bpplzcskd96wsnicp66ixnfs9bkqfj7qb";
-       buildDepends = [ base containers haskell98 ];
+       libraryHaskellDepends = [ base containers haskell98 ];
        homepage = "http://www.cs.york.ac.uk/fp/reduceron/";
        description = "A library for digital circuit description";
        license = stdenv.lib.licenses.bsd3;
@@ -142065,7 +145566,7 @@ self: {
        sha256 = "0n33778aflcdzdkc6p0qaxdqvmyzdyg0r6rg4q2wh0g74m6pl2m4";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base bytestring process utility-ht ];
+       executableHaskellDepends = [ base bytestring process utility-ht ];
        description = "Upload video to YouTube via YouTube API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142083,12 +145584,15 @@ self: {
        sha256 = "1qwk78adndk2m48inxklqj1rc58wx4jrdim60gwy7ax2d3w92pg6";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base base64-bytestring bytestring containers cryptohash
          data-default ecma262 exceptions hslogger http-conduit http-types
-         hxt lens opendatatable parsec SHA text transformers
+         lens opendatatable parsec SHA text transformers
          unordered-containers uri-template utf8-string uuid vector zlib
        ];
+       executableHaskellDepends = [
+         base containers ecma262 exceptions hxt opendatatable
+       ];
        jailbreak = true;
        homepage = "https://github.com/fabianbergmark/YQL";
        description = "A YQL engine to execute Open Data Tables";
@@ -142108,7 +145612,7 @@ self: {
        sha256 = "1bnmh7caj9s6sfj2hhfwdnsg75wci1qw8c3pwryqy57knwcwbvkz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          aeson base containers csv directory filepath HDBC HDBC-sqlite3
          HStringTemplate lucid old-locale old-time pandoc parsec scientific
          split text time unordered-containers yaml
@@ -142116,7 +145620,6 @@ self: {
        homepage = "http://github.com/jgm/yst";
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yuiGrid" = callPackage
@@ -142125,7 +145628,7 @@ self: {
        pname = "yuiGrid";
        version = "0.1";
        sha256 = "005l0rr9l0l81706drq57nww4h0j4rw8n0ncpnkdb139941gywzq";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "Grids defined by layout hints and implemented on top of Yahoo grids";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142141,7 +145644,11 @@ self: {
        sha256 = "01pf0mg6lgm34src1mfz3qj41vyhmvi50yjyv72zwamd0g7sx374";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base bytestring containers curl deepseq directory filepath
+         haskell98 mtl network parsec
+       ];
+       executableHaskellDepends = [
          base bytestring containers curl deepseq directory filepath
          haskell98 mtl network parsec
        ];
@@ -142167,7 +145674,7 @@ self: {
        sha256 = "05aba4fdpqx7sar7yrw4gg341wzfhhlbvx7453ns8mccqhx9dag8";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array attoparsec base bimap binary binary-conduit bytestring
          Codec-Compression-LZF conduit conduit-combinators conduit-extra
          containers csv-conduit Decimal directory exceptions ghc-prim lens
@@ -142175,7 +145682,8 @@ self: {
          reinterpret-cast resourcet text text-binary time transformers
          vector xml-conduit
        ];
-       testDepends = [
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
          array attoparsec base bimap binary binary-conduit bytestring
          Codec-Compression-LZF conduit conduit-combinators conduit-extra
          containers csv-conduit Decimal directory exceptions ghc-prim HUnit
@@ -142197,10 +145705,9 @@ self: {
        sha256 = "1vpmwizxcab1mlz7vp3hp72ddla7805jn0lq60fmkjgmj95ryvq9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers mtl ];
-       testDepends = [ base hspec QuickCheck ];
-       extraLibraries = [ gomp z3 ];
-       preBuild = stdenv.lib.optionalString stdenv.isDarwin "export DYLD_LIBRARY_PATH=${z3}/lib";
+       libraryHaskellDepends = [ base containers mtl ];
+       librarySystemDepends = [ gomp z3 ];
+       testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "http://bitbucket.org/iago/z3-haskell";
        description = "Bindings for the Z3 Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
@@ -142216,7 +145723,7 @@ self: {
        sha256 = "1bhp98bn41lqxdl48xxcb4b4fknva2aigq5gxffcha535igdmdy3";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base cmdargs containers directory filepath HSH MissingH old-locale
          parsec time
        ];
@@ -142232,7 +145739,7 @@ self: {
        pname = "zasni-gerna";
        version = "0.0.7";
        sha256 = "1zl2kcd0hr021xl6pjvvxwxvmpb02cq04ck39qkwil56vannnksw";
-       buildDepends = [ base papillon ];
+       libraryHaskellDepends = [ base papillon ];
        homepage = "https://skami.iocikun.jp/haskell/packages/zasni-gerna";
        description = "lojban parser (zasni gerna)";
        license = stdenv.lib.licenses.bsd3;
@@ -142245,7 +145752,9 @@ self: {
        pname = "zcache";
        version = "0.0.0";
        sha256 = "10j0fwf58ig0j44f7p57zr8by6i9j1agnjzk6cs65iimm79m9avb";
-       buildDepends = [ array base containers mersenne-random-pure64 ];
+       libraryHaskellDepends = [
+         array base containers mersenne-random-pure64
+       ];
        homepage = "https://patch-tag.com/r/salazar/zcache/";
        description = "Zobrist keys for game state tracking";
        license = stdenv.lib.licenses.bsd3;
@@ -142257,7 +145766,7 @@ self: {
        pname = "zenc";
        version = "0.1.1";
        sha256 = "0p0h7vz14k9v8gsnpkb9ca61i1k67vvsjg0bzy0ag4m20k94zlb2";
-       buildDepends = [ base ];
+       libraryHaskellDepends = [ base ];
        description = "GHC style name Z-encoding and Z-decoding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142273,7 +145782,7 @@ self: {
        pname = "zendesk-api";
        version = "0.1.0.0";
        sha256 = "1x6801i5rw6a0nfdihi04bmka8qww9c77r7ygbhp3zx1hqdpdmmc";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring case-insensitive conduit connection
          data-default failure http-client http-client-tls http-conduit
          http-types monad-logger mtl pem template-haskell text time tls
@@ -142296,7 +145805,7 @@ self: {
        sha256 = "03jwhgi9n9iv7zpn8nwkdyvsybsksnhsji8k2ma9rzayk36aba6v";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers directory ghc ghc-paths mtl parallel process
          random text transformers
        ];
@@ -142311,7 +145820,7 @@ self: {
        pname = "zero";
        version = "0.1.2";
        sha256 = "01hfsi29g42b4jj3ahddv1ry7qgav17pwpngipz8igq2w81v1y9p";
-       buildDepends = [ base semigroups ];
+       libraryHaskellDepends = [ base semigroups ];
        homepage = "https://github.com/phaazon/zero";
        description = "Semigroups with absorption";
        license = stdenv.lib.licenses.bsd3;
@@ -142325,12 +145834,12 @@ self: {
        pname = "zeromq-haskell";
        version = "0.8.4";
        sha256 = "0lvjszi08r5wm5ch03153y7lir6cdgqr2gnhq45j4b0kid6gkpv3";
-       buildDepends = [ base bytestring containers ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring containers ];
+       librarySystemDepends = [ zeromq ];
+       testHaskellDepends = [
          base bytestring containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       extraLibraries = [ zeromq ];
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 2.1.x";
        license = stdenv.lib.licenses.mit;
@@ -142345,7 +145854,7 @@ self: {
        pname = "zeromq3-conduit";
        version = "0.1.0.0";
        sha256 = "1n6xl5izdkbl2mb4msryrcasg08prjbgzwilz4b7yi1g79y1yf77";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring conduit lifted-base monad-control mtl resourcet
          transformers zeromq3-haskell
        ];
@@ -142364,15 +145873,15 @@ self: {
        pname = "zeromq3-haskell";
        version = "0.5.2";
        sha256 = "1ky92qwyk27qsxnvaj0mc9yyhk7g19ry2nq55666ayahc899z213";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers MonadCatchIO-transformers
          semigroups transformers
        ];
-       testDepends = [
+       libraryPkgconfigDepends = [ zeromq ];
+       testHaskellDepends = [
          ansi-terminal async base bytestring checkers containers
          MonadCatchIO-transformers QuickCheck transformers
        ];
-       pkgconfigDepends = [ zeromq ];
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 3.x";
        license = stdenv.lib.licenses.mit;
@@ -142388,13 +145897,13 @@ self: {
        pname = "zeromq4-haskell";
        version = "0.6.3";
        sha256 = "0yrwqxm208n9k76i9aby5hiv55kd1p27pq6hyry5ngw95fh95p67";
-       buildDepends = [
+       libraryHaskellDepends = [
          async base bytestring containers exceptions semigroups transformers
        ];
-       testDepends = [
+       libraryPkgconfigDepends = [ zeromq ];
+       testHaskellDepends = [
          async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
-       pkgconfigDepends = [ zeromq ];
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 4.x";
        license = stdenv.lib.licenses.mit;
@@ -142411,7 +145920,11 @@ self: {
        sha256 = "10ilsxlha4l7c4z3jl6lykcjns6igyk2qma2a03yzpvgz7ijy4c0";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base Cabal derive directory filepath haskell-src-exts hskeleton
+         monoid-record process syb template-haskell
+       ];
+       executableHaskellDepends = [
          base Cabal derive directory filepath haskell-src-exts hskeleton
          monoid-record process syb template-haskell
        ];
@@ -142429,10 +145942,10 @@ self: {
        pname = "zigbee-znet25";
        version = "0.1.1.0";
        sha256 = "0kv52f7zhgd2x44a2dg89jrsxiis73m8884f4zmxdbznhq1prqf5";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal MissingH mtl transformers
        ];
-       testDepends = [ base bytestring mtl QuickCheck random ];
+       testHaskellDepends = [ base bytestring mtl QuickCheck random ];
        homepage = "https://github.com/djoyner/zigbee-znet25";
        description = "XBee ZNet 2.5 (ZigBee) wireless modem communications";
        license = stdenv.lib.licenses.bsd3;
@@ -142449,14 +145962,15 @@ self: {
        sha256 = "169nkxr5zlbymiz1ydlhlqr66vqiycmg85xh559phpkr64w3nqj1";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          array base binary bytestring containers digest directory filepath
          mtl old-time pretty text time unix zlib
        ];
-       testDepends = [
+       executableHaskellDepends = [ base bytestring directory ];
+       testHaskellDepends = [
          base bytestring directory HUnit old-time process time
        ];
-       buildTools = [ zip ];
+       testToolDepends = [ zip ];
        homepage = "http://github.com/jgm/zip-archive";
        description = "Library for creating and modifying zip archives";
        license = stdenv.lib.licenses.bsd3;
@@ -142472,11 +145986,11 @@ self: {
        pname = "zip-conduit";
        version = "0.2.2.2";
        sha256 = "0spb6b1mwcqwzrr231i5s6hcln9jck0z03jdfh1zlm87mvp8670v";
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra digest directory
          filepath mtl old-time resourcet time transformers utf8-string
        ];
-       testDepends = [
+       testHaskellDepends = [
          base bytestring conduit directory filepath hpc HUnit mtl resourcet
          temporary test-framework test-framework-hunit time
        ];
@@ -142492,7 +146006,7 @@ self: {
        pname = "zipedit";
        version = "0.2.3";
        sha256 = "17msh3gwylmsiabyz5x05ir2xh8h904kbp5isnvbf0z4kzfv33cr";
-       buildDepends = [ base directory mtl process ];
+       libraryHaskellDepends = [ base directory mtl process ];
        homepage = "http://code.haskell.org/~byorgey/code/zipedit";
        description = "Create simple list editor interfaces";
        license = stdenv.lib.licenses.bsd3;
@@ -142505,7 +146019,7 @@ self: {
        pname = "zipper";
        version = "0.4.2";
        sha256 = "1r8092amq5w9gl5szycl1r7wx87xnmkcapdzcwfa4c3pvxrhjy44";
-       buildDepends = [ base multirec ];
+       libraryHaskellDepends = [ base multirec ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
        description = "Generic zipper for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
@@ -142518,11 +146032,11 @@ self: {
      mkDerivation {
        pname = "zippers";
        version = "0.2";
-       revision = "1";
        sha256 = "1rlf01dc6dcy9sx89npsisdz1yg9v4h2byd6ms602bxnmjllm1ls";
+       revision = "1";
        editedCabalFile = "3e27022f7ed27e35e73ed36f3aa6b396c7e7b52e864965b8d3cd4dab8394e960";
-       buildDepends = [ base lens profunctors semigroupoids ];
-       testDepends = [ base directory doctest filepath ];
+       libraryHaskellDepends = [ base lens profunctors semigroupoids ];
+       testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/ekmett/zippers/";
        description = "Traversal based zippers";
        license = stdenv.lib.licenses.bsd3;
@@ -142534,7 +146048,7 @@ self: {
        pname = "zippo";
        version = "0.3";
        sha256 = "1ihdird5yryfb2ki9bwwchj8bxjcmmgjkp3hl605zzhi2lz3awx2";
-       buildDepends = [ base mtl yall ];
+       libraryHaskellDepends = [ base mtl yall ];
        homepage = "http://brandon.si/code/zippo/";
        description = "A simple lens-based, generic, heterogenous, type-checked zipper library";
        license = stdenv.lib.licenses.bsd3;
@@ -142546,8 +146060,8 @@ self: {
        pname = "zlib";
        version = "0.5.4.2";
        sha256 = "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm";
-       buildDepends = [ base bytestring ];
-       extraLibraries = [ zlib ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ zlib ];
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) zlib;};
@@ -142560,11 +146074,11 @@ self: {
        pname = "zlib";
        version = "0.6.1.1";
        sha256 = "0dd79dxf56d8f6ad9if3j87s9gg7yd17ckypjxwplrbkahlb9xf5";
-       buildDepends = [ base bytestring ];
-       testDepends = [
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ zlib ];
+       testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
-       extraLibraries = [ zlib ];
        jailbreak = true;
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
@@ -142576,10 +146090,12 @@ self: {
        pname = "zlib-bindings";
        version = "0.1.1.5";
        sha256 = "02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8";
-       buildDepends = [ base bytestring zlib ];
-       testDepends = [ base bytestring hspec QuickCheck zlib ];
-       homepage = "http://github.com/snoyberg/zlib-bindings";
-       description = "Low-level bindings to the zlib package. (deprecated)";
+       revision = "2";
+       editedCabalFile = "0c6f9f81832af2473281fd58631aff8c6bbad24191e00d2a5a6ae2479249043b";
+       libraryHaskellDepends = [ base bytestring zlib ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
+       homepage = "http://github.com/snapframework/zlib-bindings";
+       description = "Low-level bindings to the zlib package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -142589,7 +146105,7 @@ self: {
        pname = "zlib-conduit";
        version = "1.1.0";
        sha256 = "1b22mca8bbg7f84h8y0qsb5ckzg2dw1b26y27x7b7xdxqbwpz93a";
-       buildDepends = [ base conduit ];
+       libraryHaskellDepends = [ base conduit ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming compression/decompression via conduits. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -142605,7 +146121,7 @@ self: {
        sha256 = "1nfczminxafzk69ry1sqkj1ha0jlv3l9ak10yk205snfhpmcjgg4";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
          base bytestring enumerator transformers zlib-bindings
        ];
        homepage = "http://github.com/maltem/zlib-enum";
@@ -142618,10 +146134,10 @@ self: {
      mkDerivation {
        pname = "zlib-lens";
        version = "0.1.2";
-       revision = "1";
        sha256 = "1vm12sm9ypik5qnnizmwx56fmpjghldzb06kn020hwlabz8c4j8n";
+       revision = "1";
        editedCabalFile = "353e3ef6e0281894cd494b95563bb93a30ec0ff96e309a173c36bddfc4069e66";
-       buildDepends = [ base bytestring profunctors zlib ];
+       libraryHaskellDepends = [ base bytestring profunctors zlib ];
        homepage = "http://lens.github.io/";
        description = "Lenses for zlib";
        license = stdenv.lib.licenses.bsd3;
@@ -142635,7 +146151,8 @@ self: {
        sha256 = "0lg5fn89wj5blbp2gh760ibxb2zz9f11jnwicfsmsayra51micip";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring zeromq3-haskell ];
+       libraryHaskellDepends = [ base bytestring zeromq3-haskell ];
+       executableHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/lucasdicioccio/zmcat";
        description = "Command-line tool for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
@@ -142648,7 +146165,7 @@ self: {
        pname = "zmidi-core";
        version = "0.7.0";
        sha256 = "0v8zcybr46rcdpvsji0dzr78skj79jp8l9sd49z6c7s5sddzjm9l";
-       buildDepends = [ base binary bytestring containers ];
+       libraryHaskellDepends = [ base binary bytestring containers ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "Read and write MIDI files";
        license = stdenv.lib.licenses.bsd3;
@@ -142663,7 +146180,7 @@ self: {
        pname = "zmidi-score";
        version = "0.3.0.0";
        sha256 = "0zhh6bdpbng69sajxdvj2mnd385gc8yyli3jzyjfxp0wr0hv3biv";
-       buildDepends = [
+       libraryHaskellDepends = [
          aeson base binary containers data-ordlist deepseq deepseq-generics
          directory filepath mtl parallel-io text zmidi-core
        ];
@@ -142683,7 +146200,7 @@ self: {
        sha256 = "1k10wflfsivq792jvl3bhb8nkpx6m3z8qzarz6q8aw5hs2wslvrv";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base classy-prelude optparse-applicative semigroups zeromq4-haskell
        ];
        description = "A socat-like tool for zeromq library";
@@ -142697,7 +146214,7 @@ self: {
        pname = "zoneinfo";
        version = "0.5";
        sha256 = "1n27j8ca79a1ijn7k7dp61kjz62i6zfzlns8n0kwgyvpx413ws8y";
-       buildDepends = [ base time ];
+       libraryHaskellDepends = [ base time ];
        jailbreak = true;
        description = "ZoneInfo library";
        license = stdenv.lib.licenses.bsd3;
@@ -142714,8 +146231,9 @@ self: {
        sha256 = "0zsr3k4c6da1l5cw3laj2snfszm4g0bz76hj2bjj61yrwmc99vnl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base directory filepath ghc hamlet hint mtl template-haskell text
+       libraryHaskellDepends = [ base ghc hamlet template-haskell text ];
+       executableHaskellDepends = [
+         base directory filepath ghc hint mtl
        ];
        jailbreak = true;
        homepage = "http://github.com/iand675/Zoom";
@@ -142737,12 +146255,17 @@ self: {
        sha256 = "0761xpfmmm309r6r44ax7x2zs49dskygl2c09x2kpxpfr7rr3k5f";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers data-default iteratee
+         iteratee-compress ListLike MonadCatchIO-transformers mtl old-locale
+         QuickCheck time transformers type-level unix zlib
+       ];
+       executableHaskellDepends = [
          base blaze-builder bytestring containers data-default iteratee
          iteratee-compress ListLike MonadCatchIO-transformers mtl old-locale
          QuickCheck time transformers type-level ui-command unix zlib
        ];
-       testDepends = [
+       testHaskellDepends = [
          base blaze-builder iteratee QuickCheck random test-framework
          test-framework-quickcheck2 transformers type-level unix
        ];
@@ -142760,7 +146283,7 @@ self: {
        pname = "zoom-cache-pcm";
        version = "0.3.0.1";
        sha256 = "0r676wb4q7wmin3liqh525w43pgdf0gmcfx2ccpbvc4ahain9vyq";
-       buildDepends = [
+       libraryHaskellDepends = [
          base blaze-builder bytestring containers iteratee ListLike mtl
          type-level zoom-cache
        ];
@@ -142781,7 +146304,7 @@ self: {
        sha256 = "0722wy6rqbx4gajn3sp946scganr2arhinxrqyq5fvvsbdxacwhz";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          base bytestring containers data-default hsndfile hsndfile-vector
          mtl ui-command vector zoom-cache zoom-cache-pcm
        ];
@@ -142797,7 +146320,7 @@ self: {
        pname = "zoom-refs";
        version = "0.0.0.0";
        sha256 = "0pbnwgsfl4rgmgsq30snki34xh9iaky01jnxycppf0h93mbdv01p";
-       buildDepends = [ base lens stm ];
+       libraryHaskellDepends = [ base lens stm ];
        description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142807,12 +146330,12 @@ self: {
      mkDerivation {
        pname = "zot";
        version = "0.0.2";
-       revision = "1";
        sha256 = "12wgkrlvhby0gy6kngjwyx468yarpgkiwy51v6zb8jhx79mhidq3";
+       revision = "1";
        editedCabalFile = "325ccedb3426935b4a56f838f3d05fc914b72729a2b80d6c804bec5657593a40";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base monads-tf ];
+       executableHaskellDepends = [ base monads-tf ];
        description = "Zot language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142826,7 +146349,7 @@ self: {
        sha256 = "04d812dcvkbjg2y0q4q855r6g9nr2k54k2jhnbksbpnxkz0cmaxr";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory filepath mtl ];
+       executableHaskellDepends = [ base directory filepath mtl ];
        homepage = "https://github.com/MasseR/zsh-battery";
        description = "Ascii bars representing battery status";
        license = stdenv.lib.licenses.bsd3;
@@ -142843,7 +146366,7 @@ self: {
        sha256 = "11x6whwyfgdgda5bhdck0k12inzix8cjfm42hh09p703nalk07nq";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [
+       executableHaskellDepends = [
          array base containers filepath hinotify old-locale process
          regex-compat time unix
        ];

From 7bcc1bfc117cde0c5780ec63512d01494331c497 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 12:37:46 +0200
Subject: [PATCH 0865/2016] haskell: add 'addPkgconfigDepend' combinator to
 lib.nix

---
 pkgs/development/haskell-modules/lib.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 9ee12cdde37..526bb5c3248 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -31,6 +31,9 @@ rec {
   addBuildDepend = drv: x: addBuildDepends drv [x];
   addBuildDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.buildDepends or []) ++ xs; });
 
+  addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x];
+  addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.pkgconfigDepends or []) ++ xs; });
+
   enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}";
   disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}";
 

From a7cb42e1c2f73bce0cb9bfad8fa728f52fe30c34 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Jul 2015 14:51:09 +0200
Subject: [PATCH 0866/2016] haskell-wx: clean up overrides

---
 .../haskell-modules/configuration-common.nix           |  8 ++------
 .../haskell-modules/patches/wxc-no-ldconfig.patch      | 10 ----------
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/patches/wxc-no-ldconfig.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5e412dab8d4..20dbe979f78 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -631,12 +631,8 @@ self: super: {
   # https://github.com/vincenthz/hs-asn1/issues/12
   asn1-encoding = dontCheck super.asn1-encoding;
 
-  # wxc needs help deciding which version of GTK to use.
-  wxc = overrideCabal (super.wxc.override { wxGTK = pkgs.wxGTK29; }) (drv: {
-    patches = [ ./patches/wxc-no-ldconfig.patch ];
-    doHaddock = false;
-    postInstall = "cp -v dist/build/libwxc.so.${drv.version} $out/lib/libwxc.so";
-  });
+  # wxc supports wxGTX >= 2.9, but our current default version points to 2.8.
+  wxc = super.wxc.override { wxGTK = pkgs.wxGTK29; };
   wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; };
 
   # Depends on QuickCheck 1.x.
diff --git a/pkgs/development/haskell-modules/patches/wxc-no-ldconfig.patch b/pkgs/development/haskell-modules/patches/wxc-no-ldconfig.patch
deleted file mode 100644
index 72a8648cab6..00000000000
--- a/pkgs/development/haskell-modules/patches/wxc-no-ldconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Only in wxc-0.91.0.0: dist
-diff -ubr wxc-0.91.0.0-orig/Setup.hs wxc-0.91.0.0/Setup.hs
---- wxc-0.91.0.0-orig/Setup.hs	2014-10-31 13:30:15.514809137 +0100
-+++ wxc-0.91.0.0/Setup.hs	2014-10-31 13:33:53.606372005 +0100
-@@ -507,5 +507,3 @@
-         inst_lib_dir = libdir $ absoluteInstallDirs pkg_descr local_bld_info NoCopyDest
- 
-     installOrdinaryFile (verbosity flags) (bld_dir </> lib_name) (inst_lib_dir </> lib_name)
--    ldconfig inst_lib_dir
--

From 8db23bc08f7da2d3a21367d2303c248912dd9f43 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 14:02:12 +0200
Subject: [PATCH 0867/2016] haskell-ghc-paths: register Nixpkgs-specific patch

This used to be added by cabal2nix, but now the tool no longer does because
there's no reliable way to refer to the patch file in the generated build
expression.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 20dbe979f78..65298b9dd02 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -14,6 +14,9 @@ self: super: {
   # Link statically to avoid runtime dependency on GHC.
   jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal;
 
+  # Apply NixOS-specific patches.
+  ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;
+
   # Break infinite recursions.
   Dust-crypto = dontCheck super.Dust-crypto;
   hasql-postgres = dontCheck super.hasql-postgres;

From c79879b9556843a764e0a07c4585e50783c4c336 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jul 2015 18:19:48 +0200
Subject: [PATCH 0868/2016] haskell-hs-blake2 depends on broken llvm-base
 library.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 65298b9dd02..789eb953175 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -529,6 +529,7 @@ self: super: {
   stable-tree = dontDistribute super.stable-tree;
   synthesizer-llvm = dontDistribute super.synthesizer-llvm;
   optimal-blocks = dontDistribute super.optimal-blocks;
+  hs-blake2 = dontDistribute super.hs-blake2;
 
   # https://ghc.haskell.org/trac/ghc/ticket/9625
   vty = dontCheck super.vty;

From 8459ea641f73777fd07108455742fa119188be77 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 12:15:31 +0200
Subject: [PATCH 0869/2016] haskell-diagrams-lib: broken because it can't cope
 with recent versions of fsnotify and system-filepath

---
 .../haskell-modules/configuration-common.nix  | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 789eb953175..8608b2392db 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -253,9 +253,6 @@ self: super: {
   # https://github.com/tibbe/ekg/commit/95018646f48f60d9ccf6209cc86747e0f132e737, not yet in hackage
   ekg = doJailbreak super.ekg;
 
-  # https://github.com/diagrams/diagrams-rasterific/commit/2758e5760c64f8ca2528628bd11de502f354ab15, not yet in hackage
-  diagrams-rasterific = doJailbreak super.diagrams-rasterific;
-
   # https://github.com/NixOS/cabal2nix/issues/136
   glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib];
   gtk3 = super.gtk3.override { inherit (pkgs) gtk3; };
@@ -903,4 +900,21 @@ self: super: {
   # https://github.com/hspec/mockery/issues/6
   mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; });
 
+  # https://github.com/diagrams/diagrams-lib/issues/258
+  # https://github.com/diagrams/diagrams-lib/issues/259
+  diagrams-lib = markBroken super.diagrams-lib;
+  diagrams-cairo = dontDistribute super.diagrams-cairo;
+  diagrams-gtk = dontDistribute super.diagrams-gtk;
+  diagrams-html5 = dontDistribute super.diagrams-html5;
+  diagrams-pandoc = dontDistribute super.diagrams-pandoc;
+  diagrams-postscript = dontDistribute super.diagrams-postscript;
+  diagrams-rasterific = dontDistribute super.diagrams-rasterific;
+  diagrams-rubiks-cube = dontDistribute super.diagrams-rubiks-cube;
+  diagrams-svg = dontDistribute super.diagrams-svg;
+  halma = dontDistribute super.halma;
+  midi-music-box = dontDistribute super.midi-music-box;
+  potrace-diagrams = dontDistribute super.potrace-diagrams;
+  SVGFonts = dontDistribute super.SVGFonts;
+  yesod-media-simple = dontDistribute super.yesod-media-simple;
+
 }

From feee20e226e7cb8f17d4e6f0b2c621f0beb0e889 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 6 Aug 2015 06:12:30 -0400
Subject: [PATCH 0870/2016] haskell-zip-archive: remove obsolete override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8608b2392db..2b25a980011 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -265,9 +265,6 @@ self: super: {
   webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
   websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };
 
-  # https://github.com/jgm/zip-archive/issues/21
-  zip-archive = addBuildTool super.zip-archive pkgs.zip;
-
   # https://github.com/mvoidex/hsdev/issues/11
   hsdev = dontHaddock super.hsdev;
 

From d968321e4b243fbf04434e61477085cab0d9f019 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 12:42:19 +0200
Subject: [PATCH 0871/2016] haskell-wiring: build has been fixed upstream

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2b25a980011..f6748619454 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -614,9 +614,6 @@ self: super: {
   # https://github.com/NixOS/nixpkgs/issues/6350
   paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; });
 
-  # https://github.com/seanparsons/wiring/issues/1
-  wiring = markBrokenVersion super.wiring;
-
   # https://github.com/jwiegley/simple-conduit/issues/2
   simple-conduit = markBroken super.simple-conduit;
 

From 807c0c2029ab50a412c7dcf67dad079ead56f9df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 13:42:57 +0200
Subject: [PATCH 0872/2016] haskell-webkit no longer compiles; the package
 doesn't find its system library build input anymore

@abbradar, maybe you know how to fix this?
---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f6748619454..cb806dc6d69 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -259,8 +259,14 @@ self: super: {
   gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk];
   gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
 
+  # webkit does not recognize its system library build input any more.
+  webkit = markBroken super.webkit; # http://hydra.cryp.to/build/1041942/nixlog/1/raw
+  ghcjs-dom-hello = dontDistribute super.ghcjs-dom-hello;       # depends on broken webkit
+  ghcjs-dom = dontDistribute super.ghcjs-dom;                   # depends on broken webkit
+  jsaddle-hello = dontDistribute super.jsaddle-hello;           # depends on broken webkit
+  reflex-dom = dontDistribute super.reflex-dom;                 # depends on broken webkit
+
   # Need WebkitGTK, not just webkit.
-  webkit = super.webkit.override { webkit = pkgs.webkitgtk24x; };
   webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; };
   webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
   websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };

From efdaac847b9be4bf38df3bb32c7c2ba57e39c5f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 13:43:51 +0200
Subject: [PATCH 0873/2016] haskell-lzma-conduit: disable test suite to fix the
 build

Honestly, this package seems unmaintained, and we should probably
disable the build altogether.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cb806dc6d69..522eb47d257 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -917,4 +917,7 @@ self: super: {
   SVGFonts = dontDistribute super.SVGFonts;
   yesod-media-simple = dontDistribute super.yesod-media-simple;
 
+  # https://github.com/alphaHeavy/lzma-conduit/issues/5
+  lzma-conduit = dontCheck super.lzma-conduit;
+
 }

From c67aaca6d99498d1c71b53732cfab82240672f3b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 14:16:54 +0200
Subject: [PATCH 0874/2016] emacs-haskell-mode: switch default to git version

We track the git version, because haskell-mode does not provide regular
releases except via MELPA, which our Emacs infrastructure does not support yet.
---
 .../editors/emacs-modes/haskell/default.nix   | 19 ++++++---
 .../editors/emacs-modes/haskell/git.nix       | 39 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 13 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/haskell/git.nix

diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 7f4373c41ba..2f8848ca0dd 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchurl, emacs, texinfo }:
+{ stdenv, fetchFromGitHub, emacs, texinfo }:
 
 let
-  version = "13.10";
+  version = "13.14-130-ga03bd9b";      # git describe --tags
 in
 stdenv.mkDerivation {
   name = "haskell-mode-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/haskell/haskell-mode/archive/v${version}.tar.gz";
-    sha256 = "0hcg7wpalcdw8j36m8vd854zrrgym074r7m903rpwfrhx9mlg02b";
+  src = fetchFromGitHub {
+    owner = "haskell";
+    repo = "haskell-mode";
+    rev = "v${version}";
+    sha256 = "0k4jfixzsvwpsz37f2pvbr9slz8fpcd9nwddcv2bvi4x20jp11ma";
   };
 
   buildInputs = [ emacs texinfo ];
 
-  makeFlags = "VERSION=${version} GIT_VERSION=${version}";
+  makeFlags = "VERSION=v${version} GIT_VERSION=v${version}";
 
   installPhase = ''
     mkdir -p $out/share/emacs/site-lisp
@@ -22,6 +24,11 @@ stdenv.mkDerivation {
     cp -v *.info* $out/share/info/
   '';
 
+  # The test suite must run *after* copying the generated files to $out
+  # because "make check" implies "make clean".
+  doInstallCheck = true;
+  installCheckTarget = "check";
+
   meta = {
     homepage = "http://github.com/haskell/haskell-mode";
     description = "Haskell mode for Emacs";
diff --git a/pkgs/applications/editors/emacs-modes/haskell/git.nix b/pkgs/applications/editors/emacs-modes/haskell/git.nix
deleted file mode 100644
index 20de1cae4d3..00000000000
--- a/pkgs/applications/editors/emacs-modes/haskell/git.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs, texinfo }:
-
-let
-  version = "13.10-361-gfa09425";      # git describe --tags
-in
-stdenv.mkDerivation {
-  name = "haskell-mode-${version}";
-
-  src = fetchFromGitHub {
-    owner = "haskell";
-    repo = "haskell-mode";
-    rev = "v${version}";
-    sha256 = "1bq4gddzwjy2w1hbsmwxcamcy87amz7ksy1vmpwg0qij88fk4av9";
-  };
-
-  buildInputs = [ emacs texinfo ];
-
-  makeFlags = "VERSION=v${version} GIT_VERSION=v${version}";
-
-  installPhase = ''
-    mkdir -p $out/share/emacs/site-lisp
-    cp *.el *.elc *.hs $out/share/emacs/site-lisp/
-    mkdir -p $out/share/info
-    cp -v *.info* $out/share/info/
-  '';
-
-  # The test suite must run *after* copying the generated files to $out
-  # because "make check" implies "make clean".
-  doInstallCheck = true;
-  installCheckTarget = "check";
-
-  meta = {
-    homepage = "http://github.com/haskell/haskell-mode";
-    description = "Haskell mode for Emacs";
-
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b079bdbc011..8ca0f13c24f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11146,7 +11146,6 @@ let
     gitModes = callPackage ../applications/editors/emacs-modes/git-modes { };
 
     haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
-    haskellModeGit = lowPrio (callPackage ../applications/editors/emacs-modes/haskell/git.nix { });
 
     hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { };
 

From 961011aea152020d986fcf7109cc30347f45b2c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 14:26:18 +0200
Subject: [PATCH 0875/2016] haskell-logger: we cannot easily build the test
 suite due to cyclic dependencies

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 522eb47d257..8a99abf512b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -920,4 +920,7 @@ self: super: {
   # https://github.com/alphaHeavy/lzma-conduit/issues/5
   lzma-conduit = dontCheck super.lzma-conduit;
 
+  # https://github.com/kazu-yamamoto/logger/issues/42
+  logger = dontCheck super.logger;
+
 }

From fcb8d47fcd3398132da439f601f449fd9c7e9f05 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 15:28:40 +0200
Subject: [PATCH 0876/2016] Switch ghcjs to ghc 7.10.2.

---
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 +-
 pkgs/top-level/haskell-packages.nix                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 1e56981fe8f..48e7c14f317 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-ng.packages.ghc7101) jailbreak-cabal alex happy;
+  inherit (pkgs.haskell.packages.ghc7102) jailbreak-cabal alex happy;
 
   # Many packages fail with:
   #   haddock: internal error: expectJust getPackageDetails
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5e3c6d6f0e0..43fc9976ec7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -44,8 +44,8 @@ rec {
       libiconv = pkgs.darwin.libiconv;
     });
 
-    ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs {
-      ghc = compiler.ghc7101;
+    ghcjs = packages.ghc7102.callPackage ../development/compilers/ghcjs {
+      ghc = compiler.ghc7102;
     };
 
     jhc = callPackage ../development/compilers/jhc {

From 7064e4fb46d7e5f699630edc6f9f1360057aa92b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 15:30:46 +0200
Subject: [PATCH 0877/2016] haskell-generic-builder: add support for
 build-tools in the test suite stanza

---
 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 26643f075b0..83978e3bf21 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -111,7 +111,7 @@ let
   otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      buildTools ++ libraryToolDepends ++ executableToolDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
-                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends);
+                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends);
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 
   haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;

From 848472baaae35a6f6274d716d552b72c8b972e7b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 15:34:08 +0200
Subject: [PATCH 0878/2016] haskell-epic: add override to include missing
 dependencies

---
 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 8a99abf512b..193bc6d2dfb 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -923,4 +923,8 @@ self: super: {
   # https://github.com/kazu-yamamoto/logger/issues/42
   logger = dontCheck super.logger;
 
+  # https://github.com/edwinb/EpiVM/issues/13
+  # https://github.com/edwinb/EpiVM/issues/14
+  epic = addExtraLibraries (addBuildTool super.epic self.happy) [pkgs.boehmgc pkgs.gmp];
+
 }

From 78dcbd3cc683b98cde9116a70aba29952638417d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 15:45:42 +0200
Subject: [PATCH 0879/2016] haskell-dpkg: the build is broken

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 193bc6d2dfb..644181db69f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -927,4 +927,7 @@ self: super: {
   # https://github.com/edwinb/EpiVM/issues/14
   epic = addExtraLibraries (addBuildTool super.epic self.happy) [pkgs.boehmgc pkgs.gmp];
 
+  # Upstream has no issue tracker.
+  dpkg = markBroken super.dpkg;
+
 }

From 849d61803560af2f68e4523b55cea962940466e5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 16:48:13 +0200
Subject: [PATCH 0880/2016] haskell-wl-pprint-terminfo: override to add
 undeclared/missing 'ncurses' dependency

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 644181db69f..a236c03cdf2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -930,4 +930,7 @@ self: super: {
   # Upstream has no issue tracker.
   dpkg = markBroken super.dpkg;
 
+  # https://github.com/ekmett/wl-pprint-terminfo/issues/7
+  wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses;
+
 }

From 61b44f4ef70df9629f273929f0e5021d1a0105c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 17:13:48 +0200
Subject: [PATCH 0881/2016] haskell-pcap: override to fix undeclared dependency

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a236c03cdf2..8ab277414d1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -933,4 +933,7 @@ self: super: {
   # https://github.com/ekmett/wl-pprint-terminfo/issues/7
   wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses;
 
+  # https://github.com/bos/pcap/issues/5
+  pcap = addExtraLibrary super.pcap pkgs.libpcap;
+
 }

From 504aa843a1d9e48a57864b429441bf42391b1c1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 17:14:50 +0200
Subject: [PATCH 0882/2016] haddock: disable test suite for GHC 7.10.x to avoid
 known failure

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++
 1 file changed, 3 insertions(+)

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 5ae71325a9f..4039de13f78 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -267,4 +267,7 @@ self: super: {
   # GHC 7.10.1 is affected by https://github.com/srijs/hwsl2/issues/1.
   hwsl2 = dontCheck super.hwsl2;
 
+  # https://github.com/haskell/haddock/issues/427
+  haddock = dontCheck super.haddock;
+
 }

From 5154f5cb02b8e7e1d93a27788aac76f7ace81f30 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 17:18:45 +0200
Subject: [PATCH 0883/2016] haskell-llvm-general-pure: disable broken test
 suite

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8ab277414d1..415349c8d30 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -936,4 +936,7 @@ self: super: {
   # https://github.com/bos/pcap/issues/5
   pcap = addExtraLibrary super.pcap pkgs.libpcap;
 
+  # https://github.com/bscarlet/llvm-general/issues/143
+  llvm-general-pure = dontCheck super.llvm-general-pure;
+
 }

From 1d889d92da7f49a8383370350ad6521dc492ceda Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 17:23:38 +0200
Subject: [PATCH 0884/2016] haskell-hoogle: don't run the part of the test
 suite that requires network access

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 415349c8d30..a3f6f3fb358 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -334,6 +334,7 @@ self: super: {
   hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
   hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
   holy-project = dontCheck super.holy-project;          # http://hydra.cryp.to/build/502002/nixlog/1/raw
+  hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; });
   http-client = dontCheck super.http-client;            # http://hydra.cryp.to/build/501430/nixlog/1/raw
   http-conduit = dontCheck super.http-conduit;          # http://hydra.cryp.to/build/501966/nixlog/1/raw
   js-jquery = dontCheck super.js-jquery;

From 03f9f0f8015df96f2b1f2674e25066127d2e43c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 17:29:03 +0200
Subject: [PATCH 0885/2016] haskell-getopt-generics: don't run broken test
 suite

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a3f6f3fb358..d2b99ea77f8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -303,6 +303,7 @@ self: super: {
   dbmigrations = dontCheck super.dbmigrations;
   euler = dontCheck super.euler;                        # https://github.com/decomputed/euler/issues/1
   filestore = dontCheck super.filestore;
+  getopt-generics = dontCheck super.getopt-generics;
   graceful = dontCheck super.graceful;
   hakyll = dontCheck super.hakyll;
   Hclip = dontCheck super.Hclip;

From 89ca308517d32dfa882ccbe43f765ac97885ec39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 17:36:29 +0200
Subject: [PATCH 0886/2016] haskell-distributed-process-*: remove overrides --
 these packages are utterly broken

---
 .../haskell-modules/configuration-common.nix  | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d2b99ea77f8..7a13c8c1a7f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -588,31 +588,6 @@ self: super: {
   # no haddock since this is an umbrella package.
   cloud-haskell = dontHaddock super.cloud-haskell;
 
-  # Disable tests which couldn't be built.
-  distributed-process-async = dontCheck super.distributed-process-async;
-
-  # Disable tests which couldn't be built.
-  distributed-process-client-server = dontCheck super.distributed-process-client-server;
-
-  # Disable tests which couldn't be built.
-  distributed-process-extras = dontCheck super.distributed-process-extras;
-
-  # Make distributed-process-platform compile until next version
-  distributed-process-platform = overrideCabal super.distributed-process-platform (drv: {
-    patchPhase = "mv Setup.hs Setup.lhs";
-    doCheck = false;
-    doHaddock = false;
-  });
-
-  # Disable tests due to a failure (Sequential Shutdown Ordering test.)
-  distributed-process-supervisor = dontCheck super.distributed-process-supervisor;
-
-  # Disable network test and errorneous haddock.
-  distributed-process-tests = overrideCabal super.distributed-process-tests (drv: {
-    doCheck = false;
-    doHaddock = false;
-  });
-
   # This packages compiles 4+ hours on a fast machine. That's just unreasonable.
   CHXHtml = dontDistribute super.CHXHtml;
 

From 50483ce1009e3d2f0dac3ec28409889ecfe48713 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 18:45:29 +0200
Subject: [PATCH 0887/2016] haskell-idris: override to add undeclared libgmp
 build input

---
 .../haskell-modules/configuration-ghc-7.10.x.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 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 4039de13f78..903e92e770a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -49,9 +49,9 @@ self: super: {
       # "idris" binary cannot find Idris library otherwise while building.
       # After installing it's completely fine though.
       # Seems like Nix-specific issue so not reported.
-      preBuild = ''
-        export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH
-      '';
+      preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
+      # add missing libgmp build input
+      librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
     });
     in idris'.overrideScope (self: super: {
       zlib = self.zlib_0_5_4_2;

From 60d5d37f2a85dbc7e93f560a06c8fb56c7f2c98d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 18:53:19 +0200
Subject: [PATCH 0888/2016] haskell-idris: add missing libgmp build input

---
 .../haskell-modules/configuration-ghc-7.10.x.nix           | 7 ++++---
 1 file changed, 4 insertions(+), 3 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 903e92e770a..88edc88b3f9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -47,13 +47,14 @@ self: super: {
   idris =
     let idris' = overrideCabal super.idris (drv: {
       # "idris" binary cannot find Idris library otherwise while building.
-      # After installing it's completely fine though.
-      # Seems like Nix-specific issue so not reported.
+      # After installing it's completely fine though. Seems like Nix-specific
+      # issue so not reported.
       preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
-      # add missing libgmp build input
+      # https://github.com/idris-lang/Idris-dev/issues/2499
       librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
     });
     in idris'.overrideScope (self: super: {
+      # https://github.com/idris-lang/Idris-dev/issues/2500
       zlib = self.zlib_0_5_4_2;
     });
 

From 2f03c4273629893ace4fa931c701e120f2950b7d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 18:55:24 +0200
Subject: [PATCH 0889/2016] haskell-hscurses does not compile.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7a13c8c1a7f..631ce15fb64 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -916,4 +916,7 @@ self: super: {
   # https://github.com/bscarlet/llvm-general/issues/143
   llvm-general-pure = dontCheck super.llvm-general-pure;
 
+  # https://github.com/skogsbaer/hscurses/issues/24
+  hscurses = markBroken super.hscurses;
+
 }

From fd53387bbaffcab7b6a8db083a92220238a1ef38 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Aug 2015 19:00:53 +0200
Subject: [PATCH 0890/2016] haskell-imagemagick: test suite is broken

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 631ce15fb64..c8a5377b090 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -919,4 +919,7 @@ self: super: {
   # https://github.com/skogsbaer/hscurses/issues/24
   hscurses = markBroken super.hscurses;
 
+  # https://github.com/qnikst/imagemagick/issues/34
+  imagemagick = dontCheck super.imagemagick;
+
 }

From 256c4996c4178695115995204af64f4297f1cace Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 2 Aug 2015 21:37:03 +0200
Subject: [PATCH 0891/2016] freeciv: 2.4.0 -> 2.5.0

---
 pkgs/games/freeciv/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index ac1fc7395ae..9c7b41abd87 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -1,32 +1,38 @@
 { stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext
-, sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype
+, sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth
 , gtkClient ? false, gtk
 , server ? true, readline }:
 
 let
   inherit (stdenv.lib) optional optionals;
-  client = sdlClient || gtkClient;
 
   sdlName = if sdlClient then "-sdl" else "";
   gtkName = if gtkClient then "-gtk" else "";
 
-  baseName = "freeciv-2.4.0";
+  baseName = "freeciv-2.5.0";
 in
 stdenv.mkDerivation {
   name = baseName + sdlName + gtkName;
 
   src = fetchurl {
     url = "mirror://sourceforge/freeciv/${baseName}.tar.bz2";
-    sha256 = "1bc01pyihsrby6w95n49gi90ggp40dyxsy4kmlmwcakxfxprwakv";
+    sha256 = "bd9f7523ea79b8d2806d0c1844a9f48506ccd18276330580319913c43051210b";
+    # sha1 = "477b60e02606e47b31a019b065353c1a6da6c305";
+    # md5 = "8a61ecd986853200326711446c573f1b";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ zlib bzip2 curl lzma gettext ]
-    ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype ]
-    ++ optional gtkClient gtk
+    ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ]
+    ++ optionals gtkClient [ gtk ]
     ++ optional server readline;
 
+  configureFlags = []
+    ++ optional sdlClient "--enable-client=sdl"
+    ++ optional (!gtkClient) "--enable-fcmp=cli"
+    ++ optional (!server) "--disable-server";
+
   meta = with stdenv.lib; {
     description = "Multiplayer (or single player), turn-based strategy game";
 

From 45c284c9554ba50ca009007ac708d7d3b6c04077 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 7 Aug 2015 18:12:52 +0200
Subject: [PATCH 0892/2016] org: update from 8.3 to 8.3.1

---
 pkgs/applications/editors/emacs-modes/org/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index b447b235bfa..1276e4754eb 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -2,11 +2,11 @@
 , texLiveAggregationFun }:
 
 stdenv.mkDerivation rec {
-  name = "org-8.3";
+  name = "org-8.3.1";
 
   src = fetchurl {
     url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "0yqbl232hfppljz545jbjawwaw7qjdjsq97c0wf0cbkghgpln3wy";
+    sha256 = "0cn3k02b2dhp489rrlaz4g91h0ph99a7721gm8x7axicqhpv04rx";
   };
 
   buildInputs = [ emacs ];

From 590e11bc534b90ce8de3eb27753761f2d5af1612 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 7 Aug 2015 18:13:27 +0200
Subject: [PATCH 0893/2016] mesos: fix build by applying patch from
 review.apache.org

---
 .../applications/networking/cluster/mesos/default.nix |  5 +++++
 .../networking/cluster/mesos/rb36610.patch            | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/mesos/rb36610.patch

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index f9c34fdd29d..6f92ca5a6b7 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -19,6 +19,11 @@ in stdenv.mkDerivation rec {
     sha256 = "1v5xpn4wal4vcrvcklchx9slkpa8xlwqkdbnxzy9zkzpq5g3arxr";
   };
 
+  patches = [
+    # https://reviews.apache.org/r/36610/
+    ./rb36610.patch
+  ];
+
   buildInputs = [
     makeWrapper autoconf automake114x libtool curl sasl jdk maven
     python wrapPython boto distutils-cfg setuptools leveldb
diff --git a/pkgs/applications/networking/cluster/mesos/rb36610.patch b/pkgs/applications/networking/cluster/mesos/rb36610.patch
new file mode 100644
index 00000000000..c3b1b290422
--- /dev/null
+++ b/pkgs/applications/networking/cluster/mesos/rb36610.patch
@@ -0,0 +1,11 @@
+diff --git a/src/linux/fs.cpp b/src/linux/fs.cpp
+index ea0891e320154b85a21ed2d138c192821efae9cd..7b24c377c9a28cad91738305c273fb53a4dc7365 100644
+--- a/src/linux/fs.cpp
++++ b/src/linux/fs.cpp
+@@ -19,6 +19,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <syscall.h>
+
+ #include <linux/limits.h>

From 825a8a86234aa69acf31d5ec69d2e18f8d311fb1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Aug 2015 15:33:19 +0200
Subject: [PATCH 0894/2016] jailbreak-cabal: build ghc-7.10.x version from
 source again

https://github.com/peti/jailbreak-cabal/issues/9 forced us to use a
binary version of jailbreak-cabal built with ghc 7.8.x in the 7.10.x
package set, which is awkward. Upstream fixed the underlying issue
in https://github.com/haskell/cabal/issues/2598, but unfortunately
that fix didn't make it into the Cabal 1.22.4.0 release shipped by
ghc 7.10.2.

Now, we work around that issue by building jailbreak-cabal with an
unreleased development snapshot of Cabal in the ghc 7.10.x package
set.

Closes https://github.com/NixOS/nixpkgs/issues/8901.
---
 .../configuration-ghc-7.10.x.nix                | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

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 88edc88b3f9..e78aa0e9839 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -42,7 +42,22 @@ self: super: {
   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.
-  jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal;
+  Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: {
+    version = "1.23.0.0";
+    src = pkgs.fetchFromGitHub {
+      owner = "haskell";
+      repo = "cabal";
+      rev = "fe7b8784ac0a5848974066bdab76ce376ba67277";
+      sha256 = "1d70ryz1l49pkr70g8r9ysqyg1rnx84wwzx8hsg6vwnmg0l5am7s";
+    };
+    jailbreak = false;
+    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";
+  });
 
   idris =
     let idris' = overrideCabal super.idris (drv: {

From 66a2dbbd77e6b90f6533359b34cd0e7681305b39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Aug 2015 20:01:32 +0200
Subject: [PATCH 0895/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/1f18eb65463817b88fed29ee1560a3ec95a562a4
 with hackage2nix revision v20150807-5-g2b9cf46

---
 .../haskell-modules/hackage-packages.nix      | 382 +++++++++++-------
 1 file changed, 247 insertions(+), 135 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9c95632413e..9b04ebd424a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7157,8 +7157,8 @@ self: {
     ({ mkDerivation, allocated-processor, base, opencv, vector-space }:
      mkDerivation {
        pname = "HOpenCV";
-       version = "0.1.2.4";
-       sha256 = "1q32rcrzv79z125sbjlzhd4sl1pl8if01vrwd7y18s3acs3aqr4b";
+       version = "0.3.0.1";
+       sha256 = "0v9pcbbfj254n6mryb16rplh6mgjizdm4c8qqdsb41gdpx1h59n6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ allocated-processor base vector-space ];
@@ -7166,7 +7166,7 @@ self: {
        executableHaskellDepends = [ base ];
        executablePkgconfigDepends = [ opencv ];
        description = "A binding for the OpenCV computer vision library";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.gpl2;
      }) { inherit (pkgs) opencv;};
 
   "HPDF" = callPackage
@@ -29555,8 +29555,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.3.7.0";
-       sha256 = "1lq8i45wvk8rqilay7j9i9iv5irhqvdg3bp96mj2xxaxrpfi7l20";
+       version = "0.3.8.0";
+       sha256 = "1l2ign8q4kdsnypqvjl8x152lkb0s1zfn08vshirz2qf4v5wxs3n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -31042,6 +31042,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "casing" = callPackage
+    ({ mkDerivation, base, split }:
+     mkDerivation {
+       pname = "casing";
+       version = "0.1.0.0";
+       sha256 = "0d7frpz512gig2crpx3kxsnfwf3kbcklkann158wrzg8q02jhjhi";
+       libraryHaskellDepends = [ base split ];
+       description = "Convert between various source code casing conventions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cassandra-cql" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, cryptohash
      , Decimal, hslogger, MonadCatchIO-transformers, mtl, network
@@ -36133,8 +36144,8 @@ self: {
     ({ mkDerivation, base, tagged, void }:
      mkDerivation {
        pname = "constrained-categories";
-       version = "0.2.0.0";
-       sha256 = "1mh61gfydh068qws3r52rbnw30ihi9k88wklx8p18j43c7jngamx";
+       version = "0.2.1.1";
+       sha256 = "0m4c2kva0djxhiqnbxbnlrkq10wvzpbjbbvjv3mz9b550sxr6azy";
        libraryHaskellDepends = [ base tagged void ];
        homepage = "https://github.com/leftaroundabout/constrained-categories";
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
@@ -39111,24 +39122,22 @@ self: {
      }) {};
 
   "cv-combinators" = callPackage
-    ({ mkDerivation, allocated-processor, base
-     , graphics-drawingcombinators, HOpenCV, SDL, vector-space
+    ({ mkDerivation, allocated-processor, base, HOpenCV, vector-space
      }:
      mkDerivation {
        pname = "cv-combinators";
-       version = "0.1.2.3";
-       sha256 = "1bdhs4dy9yfgc9j281rxiiy9md3s27yy44scz86s29vbm7prccvp";
+       version = "0.1.3";
+       sha256 = "1lak96kr1fpsrqcvgv9k0igd5w2f42hv20f2mw8cvr0q0xwzc9zb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          allocated-processor base HOpenCV vector-space
        ];
        executableHaskellDepends = [
-         allocated-processor base graphics-drawingcombinators HOpenCV SDL
-         vector-space
+         allocated-processor base HOpenCV vector-space
        ];
        description = "Functional Combinators for Computer Vision";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.gpl2;
      }) {};
 
   "cyclotomic" = callPackage
@@ -44260,6 +44269,7 @@ self: {
          network network-multicast network-transport network-transport-tcp
          transformers
        ];
+       jailbreak = true;
        homepage = "http://haskell-distributed.github.com";
        description = "Simple zero-configuration backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -52533,6 +52543,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "formattable" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class
+     , double-conversion, hspec, HUnit, lens, old-locale, QuickCheck
+     , text, time
+     }:
+     mkDerivation {
+       pname = "formattable";
+       version = "0.1.1";
+       sha256 = "0brp1j21ll6g266zyzknqc20k5nf3na97fjbh66hjbsw6yxah5x7";
+       libraryHaskellDepends = [
+         base bytestring data-default-class old-locale text time
+       ];
+       testHaskellDepends = [
+         base bytestring data-default-class double-conversion hspec HUnit
+         lens old-locale QuickCheck text time
+       ];
+       homepage = "https://github.com/Soostone/formattable";
+       description = "Business-quality formatting of numbers, dates, and other things";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "formatting" = callPackage
     ({ mkDerivation, base, clock, old-locale, scientific, text
      , text-format, time
@@ -56194,8 +56225,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-backup";
-       version = "1.20150618";
-       sha256 = "110nivss9436ls2mr5bl0m6fzg6ds5m0ams803zq60b8dya96wic";
+       version = "1.20150807";
+       sha256 = "19x8716wdhrj3nv4pgz4ncmnfnids8wjirkp3jkw5sd6fnx6q8sj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60467,10 +60498,11 @@ self: {
        pname = "hadoop-formats";
        version = "0.2.1.1";
        sha256 = "1w3869jz3mxhzdik5fwaha7dn9rhjg5w8g0qnznd4x45cnzxv5ga";
+       revision = "1";
+       editedCabalFile = "59248cb9b3f28b9f003d694ee356a13ff1313c8edd3bf2963c154ce7e1de0553";
        libraryHaskellDepends = [ attoparsec base bytestring text vector ];
        librarySystemDepends = [ snappy ];
        testHaskellDepends = [ base bytestring filepath text vector ];
-       jailbreak = true;
        homepage = "http://github.com/jystic/hadoop-formats";
        description = "Read/write file formats commonly used by Hadoop";
        license = stdenv.lib.licenses.asl20;
@@ -64615,8 +64647,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-postgres";
-       version = "0.10.3.3";
-       sha256 = "0xwc1r7jirscsn1f11s7hkhc5knzzhb5l6if7c5w4skfx0vla7rh";
+       version = "0.10.4.0";
+       sha256 = "0s2ng84m7mals3wm3lzmhfd9xlh8fm231gklzjyh6q7z5yw4yszf";
        libraryHaskellDepends = [
          aeson attoparsec base-prelude bytestring either free hashable
          hashtables hasql-backend list-t loch-th mmorph placeholders
@@ -64722,8 +64754,8 @@ self: {
      }:
      mkDerivation {
        pname = "haste-compiler";
-       version = "0.5.0";
-       sha256 = "18n9sl9m2fpzshpj3gqvd7wlmvz5mrgsz8awcd3imcb7136qa9s9";
+       version = "0.5.0.1";
+       sha256 = "14kqrkjhfxzg0gv4v2kzxh938085bmzg426vp2jrhzvf5dzypkh0";
        configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
@@ -67847,9 +67879,10 @@ self: {
     ({ mkDerivation, base, containers, directory, unix }:
      mkDerivation {
        pname = "hinotify";
-       version = "0.3.7";
-       sha256 = "0i7mxg9ilzcgijda6j3ya5xnpbxa3wm9xswdfif95jim9w82sw0b";
+       version = "0.3.8";
+       sha256 = "13xjhbx3b6icqf7451dzknxz41lb874a9s3zs0h0c19p902ii9ff";
        libraryHaskellDepends = [ base containers directory unix ];
+       testHaskellDepends = [ base directory ];
        homepage = "https://github.com/kolmodin/hinotify.git";
        description = "Haskell binding to inotify";
        license = stdenv.lib.licenses.bsd3;
@@ -68727,7 +68760,6 @@ self: {
        testHaskellDepends = [ base process ];
        description = "Low-level bindings to libgit2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) openssl;};
 
   "hlibsass" = callPackage
@@ -72465,28 +72497,27 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base
      , bin-package-db, bytestring, Cabal, containers, deepseq, directory
      , exceptions, filepath, fsnotify, ghc, ghc-mod, ghc-paths
-     , haddock-api, haskell-src-exts, hdocs, hlint, HTTP, lens
-     , lifted-base, monad-control, monad-loops
+     , ghc-syb-utils, haddock-api, haskell-src-exts, hdocs, hlint, HTTP
+     , lens, lifted-base, monad-control, monad-loops
      , MonadCatchIO-transformers, mtl, network, process
-     , regex-pcre-builtin, scientific, simple-log, system-filepath
-     , template-haskell, text, time, transformers, transformers-base
-     , uniplate, unix, unordered-containers, vector
+     , regex-pcre-builtin, scientific, simple-log, syb, template-haskell
+     , text, time, transformers, transformers-base, uniplate, unix
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.4.1";
-       sha256 = "180xrxamas2fg2366k3cpy7al8mq82d1hgjrs7i1r2s3gr877xz8";
+       version = "0.1.4.2";
+       sha256 = "1l2pm2p0k2m8aln6an3kxswcalc7w72v7mxs5fzq0nfy60iphcys";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty array attoparsec base bin-package-db bytestring
          Cabal containers deepseq directory exceptions filepath fsnotify ghc
-         ghc-mod ghc-paths haddock-api haskell-src-exts hdocs hlint HTTP
-         lens lifted-base monad-control monad-loops
+         ghc-mod ghc-paths ghc-syb-utils haddock-api haskell-src-exts hdocs
+         hlint HTTP lens lifted-base monad-control monad-loops
          MonadCatchIO-transformers mtl network process regex-pcre-builtin
-         scientific simple-log system-filepath template-haskell text time
-         transformers transformers-base uniplate unix unordered-containers
-         vector
+         scientific simple-log syb template-haskell text time transformers
+         transformers-base uniplate unix unordered-containers vector
        ];
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring containers deepseq directory
@@ -74564,8 +74595,8 @@ self: {
      }:
      mkDerivation {
        pname = "html-tokenizer";
-       version = "0.3.0.3";
-       sha256 = "0xdjjmpp1wh17cb4lnziglwhv7frr0y5v216s5ycy9lkby9r9fyv";
+       version = "0.4.0.0";
+       sha256 = "0a44jxw90hk1i3h8j1vk8rjz3z91z9gdszyjbkngnpnfwrdhfrw7";
        libraryHaskellDepends = [
          attoparsec base-prelude case-insensitive conversion
          conversion-case-insensitive conversion-text text
@@ -74573,7 +74604,6 @@ self: {
        testHaskellDepends = [
          base base-prelude directory doctest filepath
        ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/html-tokenizer";
        description = "An \"attoparsec\"-based HTML tokenizer";
        license = stdenv.lib.licenses.mit;
@@ -75135,6 +75165,24 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "http-listen" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, HTTP, network
+     , transformers
+     }:
+     mkDerivation {
+       pname = "http-listen";
+       version = "0.1.0.0";
+       sha256 = "1ccm4lzlngcw7hp4rvk2d85zg5725pj01mzavl3zx140i6w0psz0";
+       revision = "1";
+       editedCabalFile = "3fcb0a5c155c41513cf81c4cd5058be331d56aed083a3f42892feef452a0cd8b";
+       libraryHaskellDepends = [
+         base bytestring exceptions HTTP network transformers
+       ];
+       homepage = "http://rel4tion.org/projects/http-listen/";
+       description = "Listen to HTTP requests and handle them in arbitrary ways";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "http-media" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , QuickCheck, test-framework, test-framework-quickcheck2
@@ -77033,15 +77081,15 @@ self: {
      , bytestring-trie, Cabal-ide-backend, containers, crypto-api
      , data-accessor, data-accessor-mtl, deepseq, directory
      , executable-path, filemanip, filepath, fingertree, ghc-prim, HUnit
-     , ide-backend-common, mtl, pretty-show, process, pureMD5, random
-     , regex-compat, stm, tagged, tasty, template-haskell, temporary
-     , test-framework, test-framework-hunit, text, time, transformers
-     , unix, unordered-containers, utf8-string
+     , ide-backend-common, monads-tf, mtl, parallel, pretty-show
+     , process, pureMD5, random, regex-compat, stm, tagged, tasty
+     , template-haskell, temporary, test-framework, test-framework-hunit
+     , text, time, transformers, unix, unordered-containers, utf8-string
      }:
      mkDerivation {
        pname = "ide-backend";
-       version = "0.9.0.11";
-       sha256 = "06ip0yq8vb8i0qcz2l7z4s1myxm6ix3l44gmjpvspj9vwlsrfxpp";
+       version = "0.10.0";
+       sha256 = "18p079m9hfi4mbhyp8fhlhzlvhdpr9v82ih49s1630rxaf15z8r6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77062,9 +77110,9 @@ self: {
        testHaskellDepends = [
          aeson async base binary bytestring Cabal-ide-backend containers
          deepseq directory executable-path filemanip filepath HUnit
-         ide-backend-common process random regex-compat stm tagged tasty
-         template-haskell temporary test-framework test-framework-hunit text
-         unix utf8-string
+         ide-backend-common monads-tf parallel process random regex-compat
+         stm tagged tasty template-haskell temporary test-framework
+         test-framework-hunit text unix utf8-string
        ];
        description = "An IDE backend library";
        license = stdenv.lib.licenses.mit;
@@ -77073,18 +77121,18 @@ self: {
   "ide-backend-common" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , bytestring-trie, containers, crypto-api, data-accessor, directory
-     , filepath, fingertree, mtl, pretty-show, pureMD5, tagged
-     , template-haskell, temporary, text, transformers, unix
+     , filepath, fingertree, monad-logger, mtl, pretty-show, pureMD5
+     , tagged, template-haskell, temporary, text, transformers, unix
      }:
      mkDerivation {
        pname = "ide-backend-common";
-       version = "0.9.1.3";
-       sha256 = "11dnm1ibgibrjkxigzh9l442npb2br5rchahm6gza88imy3xcd96";
+       version = "0.10.0";
+       sha256 = "1x230hvxr5n8d04q9cdjryalrp47q9vsamgd0qafw1x25ar1fxwl";
        libraryHaskellDepends = [
          aeson async attoparsec base binary bytestring bytestring-trie
          containers crypto-api data-accessor directory filepath fingertree
-         mtl pretty-show pureMD5 tagged template-haskell temporary text
-         transformers unix
+         monad-logger mtl pretty-show pureMD5 tagged template-haskell
+         temporary text transformers unix
        ];
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
@@ -77103,21 +77151,22 @@ self: {
 
   "ide-backend-server" = callPackage
     ({ mkDerivation, array, async, base, bytestring, Cabal, containers
-     , data-accessor, data-accessor-mtl, directory, filemanip, filepath
-     , ghc, haddock-api, ide-backend-common, mtl, process, temporary
-     , text, time, transformers, unix, unordered-containers
+     , data-accessor, data-accessor-mtl, directory, file-embed
+     , filemanip, filepath, ghc, haddock-api, ide-backend-common, mtl
+     , process, tar, temporary, text, time, transformers, unix
+     , unordered-containers, zlib
      }:
      mkDerivation {
        pname = "ide-backend-server";
-       version = "0.9.0";
-       sha256 = "0kljg5dpcxhk4dr8mi5ywb0ykygqm9p89rinyk1i2fqdcvza89rm";
+       version = "0.10.0";
+       sha256 = "1kahc57f5jrz7869phzlbk6y3apwyh3j6k8b7xbyfcc4qwq6jgry";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          array async base bytestring Cabal containers data-accessor
-         data-accessor-mtl directory filemanip filepath ghc haddock-api
-         ide-backend-common mtl process temporary text time transformers
-         unix unordered-containers
+         data-accessor-mtl directory file-embed filemanip filepath ghc
+         haddock-api ide-backend-common mtl process tar temporary text time
+         transformers unix unordered-containers zlib
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
@@ -81213,26 +81262,26 @@ self: {
      }) {};
 
   "json-rpc" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, bytestring
-     , conduit, conduit-extra, deepseq, hashable, mtl, QuickCheck, stm
-     , stm-conduit, test-framework, test-framework-quickcheck2, text
-     , transformers, unordered-containers
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
+     , conduit-extra, deepseq, hashable, lifted-async, monad-control
+     , monad-logger, mtl, QuickCheck, stm, stm-conduit, test-framework
+     , test-framework-quickcheck2, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "json-rpc";
-       version = "0.2.1.6";
-       sha256 = "1y9c95qbvkg0r75y4dd0fvcy5r0bj08pklf7hl052ncwm87l9hln";
+       version = "0.6.0.0";
+       sha256 = "0ld8r5zln9a18vzgpiylifzbpiivv8icalqg1l1863kgirgsz2hg";
        libraryHaskellDepends = [
-         aeson async attoparsec base bytestring conduit conduit-extra
-         deepseq hashable mtl stm stm-conduit text transformers
-         unordered-containers
+         aeson attoparsec base bytestring conduit conduit-extra deepseq
+         hashable lifted-async monad-control monad-logger mtl QuickCheck stm
+         stm-conduit text transformers unordered-containers
        ];
        testHaskellDepends = [
-         aeson async base bytestring conduit conduit-extra deepseq hashable
-         mtl QuickCheck stm stm-conduit test-framework
+         aeson base bytestring conduit lifted-async monad-logger mtl
+         QuickCheck stm stm-conduit test-framework
          test-framework-quickcheck2 text unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/xenog/json-rpc";
        description = "Fully-featured JSON-RPC 2.0 library";
        license = stdenv.lib.licenses.publicDomain;
@@ -81296,10 +81345,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-schema";
-       version = "0.7.3.7";
-       sha256 = "0lrr5zhydb2g36xlpr3mhn0m6bz138gbm0zih3f3qamnsm21mjk5";
-       revision = "1";
-       editedCabalFile = "94b50ebb4b1aa921270db172dbef2ed18c85846d147d1526ec9c85ea0be1705a";
+       version = "0.7.4.0";
+       sha256 = "073hs9wmpmv7b07s7by9r6hjcwn7bjhwyf256f2xiz4y355zljf5";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -82258,6 +82305,7 @@ self: {
          keera-hails-reactivevalues MissingK mtl network process SDL
          SDL-mixer setlocale time utf8-string
        ];
+       jailbreak = true;
        homepage = "http://keera.co.uk/projects/keera-posture";
        description = "Get notifications when your sitting posture is inappropriate";
        license = "unknown";
@@ -87435,8 +87483,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-general";
-       version = "3.4.5.3";
-       sha256 = "03rps9ga20cdqfh2khqnahwrkljs714ac7yx9x7krb3dngf83zsm";
+       version = "3.4.5.4";
+       sha256 = "1zfixhvwagvznrvnxzrb9fzkswa43mj1nmbpmx87888q8z9m31j0";
        libraryHaskellDepends = [
          array base bytestring containers llvm-general-pure mtl parsec
          setenv template-haskell transformers transformers-compat
@@ -87459,8 +87507,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-general-pure";
-       version = "3.4.5.3";
-       sha256 = "1b3zh2y3b3jj5sg6421wv2qsrhyjs23qdzrk693r7mpj10rd258k";
+       version = "3.4.5.4";
+       sha256 = "0kc4f431j65qfsa54a17y3m82a8xf3dmd3hzr8mj514jz4wv6jn5";
        libraryHaskellDepends = [
          base containers mtl parsec setenv template-haskell transformers
          transformers-compat
@@ -87863,8 +87911,8 @@ self: {
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "logfloat";
-       version = "0.13.3.1";
-       sha256 = "0rqnp2zkp247sb3parn3ywsk9clasy4l906a1wyrrybc3p72126s";
+       version = "0.13.3.2";
+       sha256 = "092c9xviq9gsr3q25q254x9kdl80lfssbwjyvi8rrv1300nw7h4c";
        libraryHaskellDepends = [ array base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Log-domain floating point numbers";
@@ -87911,13 +87959,11 @@ self: {
     ({ mkDerivation, base, hspec, template-haskell, transformers }:
      mkDerivation {
        pname = "logging-facade";
-       version = "0.0.0";
-       sha256 = "0i7m4dpj7b556bfiahisvxcvdb1lv352zggjyrcr69iqnrac30z8";
-       revision = "1";
-       editedCabalFile = "18d32076d981102462c3f24c95c6d9dc2470be80f5f36f99759cb23cc3db2d24";
+       version = "0.1.0";
+       sha256 = "0zhdbjyj0j9by19rma9alxysrxnnl3s4kks4zk4bx0dg5xa0264y";
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [ base hspec ];
-       description = "Simple logging abstraction that allows multiple backends";
+       description = "Simple logging abstraction that allows multiple back-ends";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -89767,18 +89813,22 @@ self: {
 
   "manifolds" = callPackage
     ({ mkDerivation, base, comonad, constrained-categories, containers
-     , MemoTrie, MonadRandom, random, semigroups, tagged, transformers
+     , deepseq, hmatrix, MemoTrie, semigroups, tagged, transformers
      , vector, vector-algorithms, vector-space, void
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.1.0.2";
-       sha256 = "05ysr2rmjc0rqgy409qcga8j748l0w322vxbjdw9yyhcp2kbrv14";
+       version = "0.1.3.0";
+       sha256 = "17i77nhp65ikgyz0yif6i1pnj65da38mnx87yy96wkcdlad3zivj";
+       revision = "1";
+       editedCabalFile = "2495967b40c73a494475058072f59fc2c730c655bfb6861c5d0c2f51531a0060";
        libraryHaskellDepends = [
-         base comonad constrained-categories containers MemoTrie MonadRandom
-         random semigroups tagged transformers vector vector-algorithms
+         base comonad constrained-categories containers deepseq hmatrix
+         MemoTrie semigroups tagged transformers vector vector-algorithms
          vector-space void
        ];
+       jailbreak = true;
+       homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Working with manifolds in a direct, embedding-free way";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91229,8 +91279,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.1.3.0";
-       sha256 = "1ryjxc3qa583ryp9sig3rjjr3dpv9sx2ybag4qrlkwja1dz8r2dm";
+       version = "0.2.0.0";
+       sha256 = "08m0qcsazq690w1k6hd2h3z8w47bqc01s53j6qbf3jbfin28axbg";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library which you can depend upon";
@@ -91244,19 +91294,34 @@ self: {
        version = "0.1.0.0";
        sha256 = "00bk2vriwh8aj2c6n5g2w84pfq0nssfa62iw97dm9c3zkp558wxj";
        libraryHaskellDepends = [ base microlens ];
+       jailbreak = true;
        homepage = "http://github.com/aelve/microlens";
        description = "'each' for microlens";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-ghc" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, microlens }:
+     mkDerivation {
+       pname = "microlens-ghc";
+       version = "0.1.0.1";
+       sha256 = "17kkh6dnxhr2j1a9nll5ia0y5rd68icxjjk4kqs0wml1whmhhg55";
+       libraryHaskellDepends = [
+         array base bytestring containers microlens
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "Orphan instances of microlens classes for packages coming with GHC (array, bytestring, containers)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "microlens-mtl" = callPackage
     ({ mkDerivation, base, microlens, mtl, transformers
      , transformers-compat
      }:
      mkDerivation {
        pname = "microlens-mtl";
-       version = "0.1.2.0";
-       sha256 = "1jvw9pspnr24rh7bvl6q7hv7x0g6vwy2a5xl19pxf36rl8wlfm9v";
+       version = "0.1.3.1";
+       sha256 = "118ym5n1c6b2lg815hikzbwc4bnz8kz3j4flfxwq3m50dbn29vzc";
        libraryHaskellDepends = [
          base microlens mtl transformers transformers-compat
        ];
@@ -91269,8 +91334,8 @@ self: {
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
        pname = "microlens-th";
-       version = "0.2.0.0";
-       sha256 = "048q6ridxvg7zi272q01k6ds0f411kg27p5whgj63qgg3k9w72sp";
+       version = "0.2.1.0";
+       sha256 = "1l4hxkq8z8h6pvld54bjlnzy5g30wr0akv1xjrjyk552mfi9gwvl";
        libraryHaskellDepends = [
          base containers microlens template-haskell
        ];
@@ -92323,21 +92388,21 @@ self: {
      }) {};
 
   "moesocks" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+    ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , containers, cryptohash, hslogger, HsOpenSSL, lens, mtl, network
-     , optparse-applicative, random, safe, text, transformers, unix
+     , optparse-applicative, random, safe, stm, text, transformers, unix
      , unordered-containers
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.8";
-       sha256 = "1f09sf41kbza3mci2yps0b38xi2j5gakjqx9hmi7lfzga4dkqgg0";
+       version = "0.1.0.10";
+       sha256 = "0cv741gcbjcd4gvqbiys40dh8y553cy6rxhpz0bvdv8xv4qfsz47";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson attoparsec base binary bytestring containers cryptohash
+         aeson async attoparsec base binary bytestring containers cryptohash
          hslogger HsOpenSSL lens mtl network optparse-applicative random
-         safe text transformers unix unordered-containers
+         safe stm text transformers unix unordered-containers
        ];
        homepage = "https://github.com/nfjinjing/moesocks";
        description = "moe for all";
@@ -92892,8 +92957,8 @@ self: {
     ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "monad-resumption";
-       version = "0.1.1.5";
-       sha256 = "08h750qbvzvlw5hyp1d44rkhiqlhgnsfy8sya2ya7p62l80w96sf";
+       version = "0.1.2.0";
+       sha256 = "09yz5cbvjlmqdlr25adxggpdz52jxyryyyrzix1pkdjr6aqpidkr";
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        homepage = "https://github.com/igraves/resumption_monads";
        description = "Resumption and reactive resumption monads for Haskell";
@@ -94250,12 +94315,19 @@ self: {
      }) {};
 
   "mtl-unleashed" = callPackage
-    ({ mkDerivation, base, mtl }:
+    ({ mkDerivation, base, contravariant, hspec, hspec-core, lens, mtl
+     , profunctors
+     }:
      mkDerivation {
        pname = "mtl-unleashed";
-       version = "0.2.2";
-       sha256 = "0ih03zznq8mf8c76ic43j3vana6127bh6hxfz549g5kv9h54y83h";
-       libraryHaskellDepends = [ base mtl ];
+       version = "0.3";
+       sha256 = "1rirgbs4b7q7yjnvdw1j2y6nmym47adm8lcl0xysxi2hhhvs8r9c";
+       libraryHaskellDepends = [
+         base contravariant lens mtl profunctors
+       ];
+       testHaskellDepends = [
+         base contravariant hspec hspec-core lens mtl profunctors
+       ];
        homepage = "https://github.com/seereason/mtl-unleashed";
        description = "MTL classes without the functional dependency";
        license = stdenv.lib.licenses.bsd3;
@@ -94395,6 +94467,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "multi-cabal" = callPackage
+    ({ mkDerivation, AAI, aeson, base, bytestring, directory, filepath
+     , HUnit, mtl, process, strict, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "multi-cabal";
+       version = "0.1.0.0";
+       sha256 = "0qzphh4pmrdqanv9sjy0ipf3z775xvrvdyagd0291vv1mqkbbz3g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ aeson base filepath mtl ];
+       executableHaskellDepends = [
+         AAI aeson base bytestring directory filepath process strict
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/aka-bash0r/multi-cabal";
+       description = "A tool supporting multi cabal project builds";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "multiarg" = callPackage
     ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck
      , tasty-th
@@ -96977,8 +97071,8 @@ self: {
     ({ mkDerivation, base, network }:
      mkDerivation {
        pname = "network-multicast";
-       version = "0.0.11";
-       sha256 = "0fgscv9crk2lx99rh234ipgl5psbrjili95inxj23drvwmsj3135";
+       version = "0.1.0";
+       sha256 = "12kswjqg4xv7gdjqabbyr7wvqkkzsyga3fjxnv9z9fdmil7xphhq";
        libraryHaskellDepends = [ base network ];
        description = "Simple multicast library";
        license = stdenv.lib.licenses.publicDomain;
@@ -98508,6 +98602,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nurbs" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, hspec, lens, linear
+     , mtl
+     }:
+     mkDerivation {
+       pname = "nurbs";
+       version = "0.1.0.0";
+       sha256 = "1rxg0d8j6srhw5mq0i6ma9dyqrx3h1c15pv3gj8brh8ghjw9z1wi";
+       libraryHaskellDepends = [
+         base base-unicode-symbols lens linear mtl
+       ];
+       testHaskellDepends = [
+         base base-unicode-symbols hspec lens linear
+       ];
+       homepage = "https://github.com/mvoidex/nurbs";
+       description = "NURBS";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nvim-hs" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
      , conduit-extra, containers, data-default, directory, dyre
@@ -111717,8 +111830,8 @@ self: {
      }:
      mkDerivation {
        pname = "rei";
-       version = "0.2.0.0";
-       sha256 = "17ldmx351b54fxmiw3z89v7cs6p33x09k2aav7jphqgv2520phyv";
+       version = "0.3.0.0";
+       sha256 = "03dd4miy0r2mkh603f1p7f93mgxqhfkz8gfk6b4macqcw5pvi3vf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -111981,14 +112094,13 @@ self: {
     ({ mkDerivation, array, base, ghc, ghc-paths, json, network }:
      mkDerivation {
        pname = "remote-debugger";
-       version = "0.2.1";
-       sha256 = "0mgq2n92d4xk6yqzrbghlp0h18nmkyhxnv5zynrqykfw5h9xl0f8";
+       version = "0.2.2";
+       sha256 = "1c6xh390963hk7q2qvhqb6yma5ma7hk39nxjikizwh7s2h9vi9k4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          array base ghc ghc-paths json network
        ];
-       jailbreak = true;
        homepage = "https://github.com/octomarat/HaskellDebugger";
        description = "Interface to ghci debugger";
        license = stdenv.lib.licenses.bsd3;
@@ -120253,8 +120365,8 @@ self: {
      }:
      mkDerivation {
        pname = "smallcheck-series";
-       version = "0.3";
-       sha256 = "1vdwafwdv38n1bvjf1rybfhh42a0q0g0g4wmw0v4fgxh73qndfdv";
+       version = "0.4";
+       sha256 = "05iixqnq9mfqc2gbwxnhx640apbppck8zb8akkwz1linlypvym60";
        libraryHaskellDepends = [
          base bytestring containers logict smallcheck text transformers
        ];
@@ -125246,10 +125358,9 @@ self: {
     ({ mkDerivation, base, bytestring, tagged, text }:
      mkDerivation {
        pname = "string-class";
-       version = "0.1.6.4";
-       sha256 = "0hh2xcbf7sjsv15jgldpy5njjvkkkxwlg2g9961z9fn94zyi7854";
+       version = "0.1.6.5";
+       sha256 = "0yi3fagwqkgr8pf6wnl360qikyvfb649qs2y6gp0n7jjw0zc27c2";
        libraryHaskellDepends = [ base bytestring tagged text ];
-       jailbreak = true;
        homepage = "https://github.com/bairyn/string-class";
        description = "String class library";
        license = stdenv.lib.licenses.bsd3;
@@ -130230,8 +130341,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-typegraph";
-       version = "0.27";
-       sha256 = "1v7vic9kfig9flcnqcpzazd1s4wgqiz3mj9gcyc1ijkrd4y83cdr";
+       version = "0.28";
+       sha256 = "0dwkhrrcb5n3n06dr0ck613yr3j6f05sldnvrkb654xm69pw1qfc";
        libraryHaskellDepends = [
          base base-compat containers data-default haskell-src-exts lens mtl
          mtl-unleashed set-extra syb template-haskell th-desugar th-orphans
@@ -130661,7 +130772,7 @@ self: {
 
   "thyme" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , containers, deepseq, directory, filepath, mtl, old-locale
+     , containers, cpphs, deepseq, directory, filepath, mtl, old-locale
      , profunctors, QuickCheck, random, system-posix-redirect, text
      , time, vector, vector-space, vector-th-unbox
      }:
@@ -130674,6 +130785,7 @@ self: {
          profunctors QuickCheck random text time vector vector-space
          vector-th-unbox
        ];
+       libraryToolDepends = [ cpphs ];
        testHaskellDepends = [
          attoparsec base bytestring Cabal containers directory filepath mtl
          old-locale profunctors QuickCheck random system-posix-redirect text
@@ -130682,7 +130794,6 @@ self: {
        homepage = "https://github.com/liyang/thyme";
        description = "A faster time library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tianbar" = callPackage
@@ -130772,8 +130883,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal-midi";
-       version = "0.0.2";
-       sha256 = "0q3g4qgzpd8p4z3l1npcs0gy14967l3yn4xqingdbcq22xasim6q";
+       version = "0.1";
+       sha256 = "04d5xfr57rw22jq62iil6sa9drya6z545hcm1fx98jrkcyglb10c";
        libraryHaskellDepends = [
          base bytestring containers hashable hosc PortMidi process tidal
          time
@@ -134418,8 +134529,8 @@ self: {
      }:
      mkDerivation {
        pname = "uhc-util";
-       version = "0.1.5.6";
-       sha256 = "1axg2apkvg3xk1cq78shbnc68i0h6fqcpjg8z3l4nc49kl5dywwz";
+       version = "0.1.6.0";
+       sha256 = "1ndnmk8rfa8hwp72hgh6xx043lf59a8k50cqjm8bibfpd7fl31hj";
        libraryHaskellDepends = [
          array base binary bytestring containers directory fclabels fgl
          hashable ListLike mtl process syb time time-compat uulib
@@ -138432,11 +138543,10 @@ self: {
     ({ mkDerivation, base, QtWebKit, wai, warp }:
      mkDerivation {
        pname = "wai-handler-webkit";
-       version = "3.0.0.1";
-       sha256 = "1fm985jq1sa8v3vj850cpcjl6kcyq2kgq6xwpb1rmzi8zmb80kpc";
+       version = "3.0.0.2";
+       sha256 = "0y7di5pnrri4dkqi8lx4gfksfpbqfwax1wjp1ijc5cw6p34mmzcs";
        libraryHaskellDepends = [ base wai warp ];
        libraryPkgconfigDepends = [ QtWebKit ];
-       jailbreak = true;
        homepage = "https://github.com/yesodweb/wai/tree/master/wai-handler-webkit";
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
        license = stdenv.lib.licenses.mit;
@@ -142599,6 +142709,8 @@ self: {
        pname = "xmonad-contrib";
        version = "0.11.4";
        sha256 = "1g5cw9vvnfbiyi599fngk02zlmdhrf82x0bndhypkn6kybab6yd3";
+       revision = "1";
+       editedCabalFile = "0280216420efaa06de7080d5998a24e27166e8b2c3d8a012846d004799c5edf2";
        libraryHaskellDepends = [
          base containers directory extensible-exceptions mtl old-locale
          old-time process random unix utf8-string X11 X11-xft xmonad

From e7084d1a8215e73285cdef68a8497bbf1ea008da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Aug 2015 19:53:16 +0200
Subject: [PATCH 0896/2016] haskell-thyme can't compile its test suite.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c8a5377b090..88d661b1c25 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -922,4 +922,7 @@ self: super: {
   # https://github.com/qnikst/imagemagick/issues/34
   imagemagick = dontCheck super.imagemagick;
 
+  # https://github.com/liyang/thyme/issues/36
+  thyme = dontCheck super.thyme;
+
 }

From 1ab9c7d7e095ea8707e63b074bad26f1b2c8b84b Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 6 Aug 2015 06:15:30 -0400
Subject: [PATCH 0897/2016] Add build-tool override for hlibgit2.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 88d661b1c25..3d3a02db066 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -271,6 +271,9 @@ self: super: {
   webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
   websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };
 
+  # While waiting for https://github.com/jwiegley/gitlib/pull/53 to be merged
+  hlibgit2 = addBuildTool super.hlibgit2 pkgs.git;
+
   # https://github.com/mvoidex/hsdev/issues/11
   hsdev = dontHaddock super.hsdev;
 

From fe0499899466c8bff223779600c0386f8d0fe353 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Aug 2015 21:08:57 +0200
Subject: [PATCH 0898/2016] haskell-llvm-general-pure has been fixed upstream.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3d3a02db066..bfd3bd04df1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -916,9 +916,6 @@ self: super: {
   # https://github.com/bos/pcap/issues/5
   pcap = addExtraLibrary super.pcap pkgs.libpcap;
 
-  # https://github.com/bscarlet/llvm-general/issues/143
-  llvm-general-pure = dontCheck super.llvm-general-pure;
-
   # https://github.com/skogsbaer/hscurses/issues/24
   hscurses = markBroken super.hscurses;
 

From 13dc24f5c3d855c5fdd6fbbdd331ae78df9eb0e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Aug 2015 22:25:03 +0200
Subject: [PATCH 0899/2016] cabal2nix: update to version 20150807-6-g9f58996

The generated shell.nix file accepts a string argument called "compiler" that
determines the package set used to instantiate the generated expression. For
example, running "nix-shell --argstr compiler ghc7102" would evaluate the build
inside of "pkgs.haskell.packages.ghc7102". Earlier versions of cabal2nix had the
current default compiler hard-coded in the expression, but after this change this
is no longer the case. When "compiler" remains unspecified, it defaults to
"default", and this value causes evaluation in "pkgs.haskellPackages", which is
the package set most people would like to use by default. That change has to
benefits:

 1) Generated expression no longer contain any particular compiler version. The
    choice of the default compiler depends on the version of Nixpkgs that's used
    to build the expression.

 2) When the default compiler is used, overrides configured for the default
    package set apply, which was not the case in earlier versions.
---
 pkgs/development/tools/haskell/cabal2nix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index b56dc6bdd89..4a234cbc1e8 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -8,11 +8,11 @@
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150807";
+  version = "20150807-6-g9f58996";
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
-    rev = "796dabfc3fb0a98174b680c5d722954096465103";
-    sha256 = "1blyjq80w9534ap4cg0m6awks0zj2135kxld1i9d2z88x1ijzx9v";
+    rev = "9f589961fba9fa6a92900c37cf1ab16c597b0c69";
+    sha256 = "1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d";
     deepClone = true;
   };
   isLibrary = true;

From 3dbfcdc3d4148f4094bcd50973b8008f62c0c6c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Aug 2015 22:59:45 +0200
Subject: [PATCH 0900/2016] cabal2nix: make the package visible from the
 top-level

This means that "nix-env -i cabal2nix" suffices to install this package.
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 pkgs/development/tools/haskell/cabal2nix/default.nix      | 2 +-
 pkgs/top-level/all-packages.nix                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index bfd3bd04df1..7a972ee1f21 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -766,7 +766,7 @@ self: super: {
   zlib = dontCheck super.zlib;
 
   # Override the obsolete version from Hackage with our more up-to-date copy.
-  cabal2nix = pkgs.cabal2nix;
+  cabal2nix = self.callPackage ../tools/haskell/cabal2nix {};
 
   # https://github.com/urs-of-the-backwoods/HGamer3D/issues/7
   HGamer3D-Bullet-Binding = dontDistribute super.HGamer3D-Bullet-Binding;
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 4a234cbc1e8..cf0cfd64e8f 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
     sha256 = "1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d";
     deepClone = true;
   };
-  isLibrary = true;
+  isLibrary = false;
   isExecutable = true;
   libraryHaskellDepends = [
     aeson ansi-wl-pprint base bytestring Cabal containers
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ca0f13c24f..3f7e25d6314 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -788,7 +788,7 @@ let
 
   byobu = callPackage ../tools/misc/byobu { };
 
-  cabal2nix = haskellPackages.callPackage ../development/tools/haskell/cabal2nix {};
+  cabal2nix = haskellPackages.cabal2nix;
 
   capstone = callPackage ../development/libraries/capstone { };
 

From 2f620f57675f3117b013d9e4ef51adab73b049fa Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 7 Aug 2015 14:18:26 -0700
Subject: [PATCH 0901/2016] ceph-git: 2015-08-05 -> 2015-08-07

---
 pkgs/tools/filesystems/ceph/generic.nix | 1 +
 pkgs/tools/filesystems/ceph/git.nix     | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 8b9cefdbf23..77d24766f13 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -213,6 +213,7 @@ stdenv.mkDerivation {
     (mkWith   true                         "rgw-user"             "rgw")
     (mkWith   true                         "rgw-group"            "rgw")
     (mkWith   true                         "systemd-unit-dir"     "\${out}/etc/systemd/system")
+    (mkWith   false                        "selinux"              null)  # TODO: Implement
   ];
 
   preBuild = optionalString (versionAtLeast version "9.0.0") ''
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index 9343d2cdf33..c71ad134222 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-08-05";
+  version = "2015-08-07";
 
   src = fetchgit {
-    url = "git://github.com/wkennington/ceph.git";
-    rev = "043a780feb973b7ad571bb696437476da3260133";
-    sha256 = "02kk24wm6mxsclklsz5zzpj3wm6f341blj2anx3v5x20cixzdnhp";
+    url = "git://github.com/ceph/ceph.git";
+    rev = "dcd6e96495d949066962d1c7e18a9d4188b0fa37";
+    sha256 = "1w62xfbcdx2q5wjz2bqlhn4bb1iag8xyhgjc2nklqk7py9lif16m";
   };
 
   patches = [ ./fix-pythonpath.patch ];

From 6aa550212901485062446a563b7cfed6e60b044c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 7 Aug 2015 14:19:15 -0700
Subject: [PATCH 0902/2016] mariadb: 10.0.20 -> 10.0.21

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

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index e407ba92222..90372142704 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "mariadb-${version}";
-  version = "10.0.20";
+  version = "10.0.21";
 
   src = fetchurl {
     url    = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz";
-    sha256 = "0ywb730l68mxvmpik1x2ndbdaaks6dmc17pxspspm5wlqxinjkrs";
+    sha256 = "0i9mzbn35f4lj4y1lqzgbavh5xyx18zfn0ks0nqzvppabkhk56jb";
   };
 
   buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ]

From 5b6db8f1dfdb12e83533ec43f90d87dc87f4e034 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 7 Aug 2015 14:23:09 -0700
Subject: [PATCH 0903/2016] mongodb: 3.0.4 -> 3.0.5

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

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 81205c92d4c..43ab075090c 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 
-let version = "3.0.4";
+let version = "3.0.5";
     system-libraries = [
       "pcre"
       "wiredtiger"
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "0q23hvi0axc14s1ah1p67rxvi36skw34kj9ahpijx2dd2a5smrvd";
+    sha256 = "1nvzbxgyjsp72w4fvfd8zxpj38zv0whn5p53jv9v2rdaj5wnmc85";
   };
 
   nativeBuildInputs = [ scons ];

From 8dd3ee6bae4c5ec3af0b26416d688e42b32337d5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 7 Aug 2015 14:42:45 -0700
Subject: [PATCH 0904/2016] jsoncpp: 1.6.2 -> 1.6.5

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

diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index 8bb1d40b2a9..923d8af59bf 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "jsoncpp-${version}";
-  version = "1.6.2";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "open-source-parsers";
     repo = "jsoncpp";
     rev = version;
-    sha256 = "0p92i0hx2k3g8mwrcy339b56bfq8qgpb65id8xllkgd2ns4wi9zi";
+    sha256 = "08y54n4v3q18ik8iv8zyziava3x130ilzf1l3qli3vjwf6l42fm0";
   };
 
   /* During darwin bootstrap, we have a cp that doesn't understand the

From 46acdd1608630a9b6db0551cf6e96b5fb8b959f2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 7 Aug 2015 14:42:57 -0700
Subject: [PATCH 0905/2016] rocksdb: 3.11.2 -> 3.12.1

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

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 004e5e57de4..78623503794 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "rocksdb-${version}";
-  version = "3.11.2";
+  version = "3.12.1";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
     rev = "rocksdb-${version}";
-    sha256 = "0cjwr7n5l2wdzdv4b0p90k0ijg9ka28akpq2aqa8lknsa1kb1cyv";
+    sha256 = "0692jlnakwd5c1h6czd3l7rxhz514whpixyd8y805bnkj2ag61sa";
   };
 
   buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ];

From 6f5c2ec3113157ac5c207973d9b2729ff2590be1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 7 Aug 2015 18:16:14 +0200
Subject: [PATCH 0906/2016] checksyle: update from 6.8.2 to 6.9

---
 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 f0698de5c7e..5817edbf2e3 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.8.2";
+  version = "6.9";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "1r0wb8iqvmhvgxk1ya39x8b4ayd549bfxmnw26i84870hnqr179c";
+    sha256 = "122lzqai6nb1wx9z9hc92sld9ghrynywf4f4lz6wk50kywcp0p70";
   };
 
   installPhase = ''

From f5c2cd8059961eb2ef8a775184ef92b5cc2ada96 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 8 Aug 2015 00:07:26 +0200
Subject: [PATCH 0907/2016] pdf2djvu: update from 0.7.21 to 0.8

---
 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 a85aa045b66..942f40a0cf0 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.7.21";
+  version = "0.8";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz";
-    sha256 = "1fc7nrc8z5z66ifjjqbqn3c52hxlzgkgbdrr3cgrwdp27k681m0j";
+    sha256 = "0xdxx5c7hvhzfmi37cf9p17smm2y55wc8z1vsncqqvf1sxqpjmbn";
   };
 
   buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];

From ad4adbdcb2f321a4a74fecea4ef108b9b19b488c Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 7 Aug 2015 23:42:20 +0200
Subject: [PATCH 0908/2016] rustc: rename beta.patch to stable.patch

---
 pkgs/development/compilers/rustc/default.nix                    | 2 +-
 .../compilers/rustc/patches/{beta.patch => stable.patch}        | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/compilers/rustc/patches/{beta.patch => stable.patch} (100%)

diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix
index b61a407223c..9b0cac9a578 100644
--- a/pkgs/development/compilers/rustc/default.nix
+++ b/pkgs/development/compilers/rustc/default.nix
@@ -27,7 +27,7 @@ callPackage ./generic.nix {
   snapshotRev = "857ef6e";
 
   patches = [
-    ./patches/beta.patch
+    ./patches/stable.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
   configureFlags = [ "--release-channel=stable" ];
 }
diff --git a/pkgs/development/compilers/rustc/patches/beta.patch b/pkgs/development/compilers/rustc/patches/stable.patch
similarity index 100%
rename from pkgs/development/compilers/rustc/patches/beta.patch
rename to pkgs/development/compilers/rustc/patches/stable.patch

From f49da34d827c39c0320bce03852e77b217d73015 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 7 Aug 2015 23:46:13 +0200
Subject: [PATCH 0909/2016] rustc: 1.1.0 -> 1.2.0

---
 pkgs/development/compilers/rustc/default.nix  | 16 ++---
 pkgs/development/compilers/rustc/generic.nix  |  4 --
 .../compilers/rustc/patches/stable.patch      | 69 ++++++++-----------
 3 files changed, 35 insertions(+), 54 deletions(-)

diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix
index 9b0cac9a578..a4f70172e1f 100644
--- a/pkgs/development/compilers/rustc/default.nix
+++ b/pkgs/development/compilers/rustc/default.nix
@@ -1,8 +1,8 @@
 { stdenv, callPackage }:
 callPackage ./generic.nix {
-  shortVersion = "1.1.0";
+  shortVersion = "1.2.0";
   isRelease = true;
-  srcSha = "0lsfrclj5imxy6129ggya7rb2h04cgqq53f75z2jv40y5xk25sy8";
+  srcSha = "1zq2nhgaxkv1ghi3z2qgff6cylqirn33nphvkjiczlkjfi0pyw16";
 
   /* Rust is bootstrapped from an earlier built version. We need
   to fetch these earlier versions, which vary per platform.
@@ -12,19 +12,19 @@ callPackage ./generic.nix {
   */
 
   # linux-i386
-  snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16";
+  snapshotHashLinux686 = "a6f22e481eabf098cc65bda97bf7e434a1fcc20b";
 
   # linux-x86_64
-  snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f";
+  snapshotHashLinux64 = "5fd8698fdfe953e6c4d86cf4fa1d5f3a0053248c";
 
   # macos-i386
-  snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb";
+  snapshotHashDarwin686 = "9a273324a6b63a40f67a553029c0a9fb692ffd1f";
 
   # macos-x86_64
-  snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f";
+  snapshotHashDarwin64 = "e5b12cb7c179fc98fa905a3c84803645d946a6ae";
 
-  snapshotDate = "2015-04-27";
-  snapshotRev = "857ef6e";
+  snapshotDate = "2015-05-24";
+  snapshotRev = "ba0e1cd";
 
   patches = [
     ./patches/stable.patch
diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index da72495ee7a..6bb60c6dc69 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -123,10 +123,6 @@ stdenv.mkDerivation {
   inherit patches;
 
   postPatch = ''
-    substituteInPlace src/librustc_trans/back/link.rs \
-      --subst-var-by "ccPath" "${stdenv.cc}/bin/cc"
-    substituteInPlace src/librustc_back/archive.rs \
-      --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"
     substituteInPlace src/librustc_back/target/mod.rs \
       --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" \
       --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"
diff --git a/pkgs/development/compilers/rustc/patches/stable.patch b/pkgs/development/compilers/rustc/patches/stable.patch
index cffc773dd3e..e927d7a742a 100644
--- a/pkgs/development/compilers/rustc/patches/stable.patch
+++ b/pkgs/development/compilers/rustc/patches/stable.patch
@@ -1,43 +1,28 @@
-diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh
-index ca59b1c..65ee7bf 100755
---- a/src/etc/local_stage0.sh
-+++ b/src/etc/local_stage0.sh
-@@ -50,11 +50,6 @@ if [ -z $TARG_DIR ]; then
- fi
- 
- cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/
--cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/
--cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
--cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
--cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
--cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
- 
- # do not fail if one of the above fails, as all we need is a working rustc!
- exit 0
-diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
-index ed44bf8..2b84627 100644
---- a/src/librustc_back/archive.rs
-+++ b/src/librustc_back/archive.rs
-@@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
-           paths: &[&Path]) -> Output {
-     let ar = match *maybe_ar_prog {
-         Some(ref ar) => &ar[..],
--        None => "ar"
-+        None => "@arPath@"
-     };
-     let mut cmd = Command::new(ar);
- 
-diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
-index 3087a8e..578448f 100644
---- a/src/librustc_trans/back/link.rs
-+++ b/src/librustc_trans/back/link.rs
-@@ -352,7 +352,7 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
- 
- pub fn get_cc_prog(sess: &Session) -> String {
-     match sess.opts.cg.linker {
--        Some(ref linker) => return linker.to_string(),
--        None => sess.target.target.options.linker.clone(),
-+        Some(ref linker) => linker.to_string(),
-+        None => "@ccPath@".to_string(),
-     }
+diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
+index 402fbcd..8fe2de2 100644
+--- a/src/librustc_back/target/mod.rs
++++ b/src/librustc_back/target/mod.rs
+@@ -172,8 +172,8 @@ impl Default for TargetOptions {
+     /// incomplete, and if used for compilation, will certainly not work.
+     fn default() -> TargetOptions {
+         TargetOptions {
+-            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
++++ b/src/test/run-pass/issue-20797.rs
+@@ -97,7 +97,7 @@ impl<S: Strategy> Iterator for Subpaths<S> {
  }
+ 
+ fn _foo() {
+-    let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/home")).unwrap();
++    let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/tmp")).unwrap();
+ }
+ 
+ fn main() {}

From 7151c0be17bfd8babb9db49ece63016c926e7830 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 01:21:55 +0200
Subject: [PATCH 0910/2016] haskell-mockery: disable the failing test suite
 altogether

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7a972ee1f21..c9b976448d8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -878,7 +878,7 @@ self: super: {
   vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
 
   # https://github.com/hspec/mockery/issues/6
-  mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; });
+  mockery = dontCheck (overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; }));
 
   # https://github.com/diagrams/diagrams-lib/issues/258
   # https://github.com/diagrams/diagrams-lib/issues/259

From d708a73e46684624713e463ffe4b135065ea043f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 8 Aug 2015 03:20:56 +0200
Subject: [PATCH 0911/2016] dfasma: 1.0.1 -> 1.1.2

To quote upstream: many bug fix.
---
 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 0dda6e3dabd..065374d876b 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, fftw, libsndfile, qt5 }:
 
-let version = "1.0.1"; in
+let version = "1.1.2"; in
 stdenv.mkDerivation {
   name = "dfasma-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "16m6jnr49j525xxqiwmwni07rcdg92p0dcznd5bmzz34xsm0cbiz";
+    sha256 = "0xqam5hm4kvfksdlyz1rviijv386fk3px4lhz6glfsimbcvvzl0r";
     rev = "v${version}";
     repo = "dfasma";
     owner = "gillesdegottex";

From 4ed5b4c7fdedaf05ad1f1da79a9f4ada9147161a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 8 Aug 2015 04:03:50 +0200
Subject: [PATCH 0912/2016] dfasma: patch around broken version detection

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

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 065374d876b..2f236eab4e1 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -30,6 +30,10 @@ stdenv.mkDerivation {
 
   buildInputs = [ fftw libsndfile qt5.base qt5.multimedia ];
 
+  postPatch = ''
+    substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
+  '';
+
   configurePhase = ''
     qmake DESTDIR=$out/bin dfasma.pro
   '';

From ffa58ba098e065abe38ab4fb017e578c7e7ff9bc Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 8 Aug 2015 08:22:07 +0200
Subject: [PATCH 0913/2016] Update Pharo VM and Launcher

---
 pkgs/development/pharo/launcher/default.nix | 4 ++--
 pkgs/development/pharo/vm/default.nix       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
index e88e82845b9..4c46a9d13b4 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.7-2015.04.20";
+  version = "0.2.8-2015.08.08";
   name = "pharo-launcher-${version}";
   src = fetchurl {
     url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip";
-    sha256 = "0qz8469hadlv6mj8b0hp0jas153alwmja7fr4099jv1b0sx4s0kf";
+    sha256 = "1cpjihdkywlqvjsvrpkkx7fx14wxi6yhymmayjbl0l7bpci0l7qm";
   };
 
   executable-name = "pharo-launcher";
diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index 8fa1bc12646..b98d1f2385d 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
 
-  version = "2015.04.30";
+  version = "2015.08.06";
 
   name = "pharo-vm-core-i386-${version}";
   system = "x86_32-linux";
   src = fetchurl {
     url = "http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-${version}.tar.bz2";
-    sha256 = "0lg9ahqfrwbn3srxbbvr1vhjnx267chbs1la0nrc2ivpd55iwjgv";
+    sha256 = "1kmb6phxb94d37awwldwbkj704l6m0c6sv0m54mcz6d4rx41fqgp";
   };
 
   sources10Zip = fetchurl {

From e75e0d9aa472de61dce14b100ba5d0d3cb9c0a68 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 09:35:26 +0200
Subject: [PATCH 0914/2016] haskell-hinotify: test suite won't compile

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c9b976448d8..57b44f9d92f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -191,8 +191,9 @@ self: super: {
   vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector;
 
   # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
-  # on darwin: https://github.com/NixOS/cabal2nix/issues/146
-  hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
+  # on darwin: https://github.com/NixOS/cabal2nix/issues/146.
+  # hinotify's test suite is broken: https://github.com/kolmodin/hinotify/issues/15.
+  hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else dontCheck super.hinotify;
 
   # hfsevents needs CoreServices in scope
   hfsevents = if pkgs.stdenv.isDarwin

From c25d82f64fcefe6cbdd7462c55261f10c64a2c8d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 09:48:17 +0200
Subject: [PATCH 0915/2016] haskell-ide-backend: test suite depends on external
 processes

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 57b44f9d92f..cca7b7771fa 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -325,6 +325,7 @@ self: super: {
   wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1
   xkbcommon = dontCheck super.xkbcommon;
   xmlgen = dontCheck super.xmlgen;
+  ide-backend = dontCheck super.ide-backend;
 
   # These packages try to access the network.
   amqp = dontCheck super.amqp;

From 711d7a87baecc884992b3fe90f6130819221f840 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 10:54:00 +0200
Subject: [PATCH 0916/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/886308a014aa439967b0eaac1dd52bfa3ea8a952
 with hackage2nix revision v20150807-9-gbccef2c

---
 .../haskell-modules/hackage-packages.nix      | 84 +++++++++++--------
 1 file changed, 48 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9b04ebd424a..f21e78a642e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -55681,8 +55681,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcjs-websockets";
-       version = "0.3.0.4";
-       sha256 = "03ycfbp756hiivbynfsmkn4ddh5gj82dswzkj3cm8dwq94m8wd16";
+       version = "0.3.0.5";
+       sha256 = "1km7hdpa036hqxzddwxw23zaq1sjvbmjmqdp4fzdz62azp6g4ygq";
        libraryHaskellDepends = [
          base base64-bytestring binary bytestring text
        ];
@@ -61083,19 +61083,18 @@ self: {
 
   "halive" = callPackage
     ({ mkDerivation, base, bin-package-db, containers, directory
-     , filepath, foreign-store, fsnotify, ghc, ghc-paths
-     , system-filepath, transformers
+     , filepath, foreign-store, fsnotify, ghc, ghc-paths, transformers
      }:
      mkDerivation {
        pname = "halive";
-       version = "0.1.0.5";
-       sha256 = "0rxcklxmfk6z9f3alvzszq7g5wik7x9nj43m4vvf6iw1nsjvk580";
+       version = "0.1.0.6";
+       sha256 = "0mwj3d45dynsygmblr2h8dj9bkl581zjxc66871rd02c7rj914ng";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers foreign-store ];
        executableHaskellDepends = [
          base bin-package-db directory filepath fsnotify ghc ghc-paths
-         system-filepath transformers
+         transformers
        ];
        homepage = "https://github.com/lukexi/halive";
        description = "A live recompiler";
@@ -61999,6 +61998,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) openssl;};
 
+  "happstack-server-tls-cryptonite" = callPackage
+    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
+     , extensible-exceptions, happstack-server, hslogger, network
+     , sendfile, time, tls, unix
+     }:
+     mkDerivation {
+       pname = "happstack-server-tls-cryptonite";
+       version = "0.1.1";
+       sha256 = "1y450dvdswkqcaqillrzlpizss9hlk2q61x1p715wfhrlmizlrjq";
+       libraryHaskellDepends = [
+         base bytestring cryptonite data-default-class extensible-exceptions
+         happstack-server hslogger network sendfile time tls unix
+       ];
+       description = "Extend happstack-server with native HTTPS support (TLS/SSL)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "happstack-state" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , extensible-exceptions, filepath, happstack-data, happstack-util
@@ -67879,8 +67895,8 @@ self: {
     ({ mkDerivation, base, containers, directory, unix }:
      mkDerivation {
        pname = "hinotify";
-       version = "0.3.8";
-       sha256 = "13xjhbx3b6icqf7451dzknxz41lb874a9s3zs0h0c19p902ii9ff";
+       version = "0.3.8.1";
+       sha256 = "03c1f4d7x805zdiq2w26kl09xrfjw19saycdkhnixzv2qcr6xm1p";
        libraryHaskellDepends = [ base containers directory unix ];
        testHaskellDepends = [ base directory ];
        homepage = "https://github.com/kolmodin/hinotify.git";
@@ -81270,8 +81286,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc";
-       version = "0.6.0.0";
-       sha256 = "0ld8r5zln9a18vzgpiylifzbpiivv8icalqg1l1863kgirgsz2hg";
+       version = "0.6.1.0";
+       sha256 = "1vm6x08xqsw7sd3s0cq8i4hxagyxxc5jwypc80nv2rcdnyyhdmf7";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit conduit-extra deepseq
          hashable lifted-async monad-control monad-logger mtl QuickCheck stm
@@ -88931,10 +88947,8 @@ self: {
      }:
      mkDerivation {
        pname = "machinecell";
-       version = "2.0.1";
-       sha256 = "0gl207a97zcs48k6pdr82x9ckg1bc2vn6wachc57gmnspk3j43xd";
-       revision = "1";
-       editedCabalFile = "5470f26ae4ebbbe5f88e6c70d3193a28ce9e5f94fd48b76c4ef576fcac92ac7d";
+       version = "2.1.0";
+       sha256 = "10ywc93sihag844ifsimxz0vmr34i3a7rjpy63gs0ikkvr4vxs1g";
        libraryHaskellDepends = [
          arrows base free mtl profunctors semigroups
        ];
@@ -89818,16 +89832,13 @@ self: {
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.1.3.0";
-       sha256 = "17i77nhp65ikgyz0yif6i1pnj65da38mnx87yy96wkcdlad3zivj";
-       revision = "1";
-       editedCabalFile = "2495967b40c73a494475058072f59fc2c730c655bfb6861c5d0c2f51531a0060";
+       version = "0.1.3.1";
+       sha256 = "1d1hcdv76bzw2pl6ik2kdprdjdv7nmbbxs31rgz93lzhpkn8dlpj";
        libraryHaskellDepends = [
          base comonad constrained-categories containers deepseq hmatrix
          MemoTrie semigroups tagged transformers vector vector-algorithms
          vector-space void
        ];
-       jailbreak = true;
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Working with manifolds in a direct, embedding-free way";
        license = stdenv.lib.licenses.gpl3;
@@ -92186,8 +92197,8 @@ self: {
      }:
      mkDerivation {
        pname = "mockery";
-       version = "0.3.0";
-       sha256 = "1k9ywdamdl1c8nvp4yrjmqpbis1nqj9p9cim5rh72n9w5h3qaa6x";
+       version = "0.3.2";
+       sha256 = "0m0lp2z63sgkylz5318j53r5hnrkp705qh7nqbb149ir4gy7g1bg";
        libraryHaskellDepends = [
          base bytestring directory filepath logging-facade temporary
        ];
@@ -92306,13 +92317,13 @@ self: {
     ({ mkDerivation, applicative-extras, base, bytestring, Cabal
      , cmdargs, containers, data-default, directory, filepath, haskeline
      , haskell-src-exts, HUnit, lens, lifted-base, monad-control, mtl
-     , pretty, process, pureMD5, set-extra, syb, system-fileio
-     , temporary, transformers-base
+     , pretty, process, pureMD5, regex-compat, set-extra, syb
+     , system-fileio, template-haskell, temporary, transformers-base
      }:
      mkDerivation {
        pname = "module-management";
-       version = "0.20.3";
-       sha256 = "1lj2jhlpn1ywq60q4ph9fbmjn6rjd8wqkj2lrdgscagcvryh9ad2";
+       version = "0.20.4";
+       sha256 = "185vky00i0cm7rd019xa87x1rld4j92fqcm4a4igpn13lh2y4nzq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92321,8 +92332,9 @@ self: {
          mtl pretty process pureMD5 set-extra syb system-fileio temporary
        ];
        executableHaskellDepends = [
-         base Cabal cmdargs containers directory haskeline lens
-         monad-control mtl set-extra transformers-base
+         base Cabal cmdargs containers directory haskeline haskell-src-exts
+         lens monad-control mtl regex-compat set-extra template-haskell
+         transformers-base
        ];
        testHaskellDepends = [
          base containers filepath haskell-src-exts HUnit process
@@ -92395,8 +92407,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.10";
-       sha256 = "0cv741gcbjcd4gvqbiys40dh8y553cy6rxhpz0bvdv8xv4qfsz47";
+       version = "0.1.0.11";
+       sha256 = "1qmgsps9c6hcpb1y1z6jb0bjl51apll8s1vg6arz8kma98dkd79d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -92405,7 +92417,7 @@ self: {
          safe stm text transformers unix unordered-containers
        ];
        homepage = "https://github.com/nfjinjing/moesocks";
-       description = "moe for all";
+       description = "A functional firewall killer";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -134101,15 +134113,15 @@ self: {
      }) {};
 
   "type-unary" = callPackage
-    ({ mkDerivation, applicative-numbers, base, newtype, ty
-     , vector-space
+    ({ mkDerivation, applicative-numbers, base, constraints, newtype
+     , ty, vector-space
      }:
      mkDerivation {
        pname = "type-unary";
-       version = "0.2.16";
-       sha256 = "1pn65smi07gwd4h46irjawh1dnjnizs9ag0cyv55i0mjg8plyzvj";
+       version = "0.2.19";
+       sha256 = "04hpqmppwv6cs8vnf3whvmp1x4sqhirlkxcr2fjzcr1ji1gfchvr";
        libraryHaskellDepends = [
-         applicative-numbers base newtype ty vector-space
+         applicative-numbers base constraints newtype ty vector-space
        ];
        homepage = "https://github.com/conal/type-unary";
        description = "Type-level and typed unary natural numbers, inequality proofs, vectors";

From 102c690ee90cfe4d1194571c301da48f35f756fe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 10:54:37 +0200
Subject: [PATCH 0917/2016] haskell-hinotify: test suite 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 cca7b7771fa..be5c8cdabff 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -192,8 +192,7 @@ self: super: {
 
   # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
   # on darwin: https://github.com/NixOS/cabal2nix/issues/146.
-  # hinotify's test suite is broken: https://github.com/kolmodin/hinotify/issues/15.
-  hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else dontCheck super.hinotify;
+  hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
 
   # hfsevents needs CoreServices in scope
   hfsevents = if pkgs.stdenv.isDarwin

From cfaa75a7c98e6f2f78d46baafc8349622081084f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 10:55:49 +0200
Subject: [PATCH 0918/2016] haskell-mockery: test suite fixed upstream

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index be5c8cdabff..ed23b190ec6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -879,7 +879,7 @@ self: super: {
   vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
 
   # https://github.com/hspec/mockery/issues/6
-  mockery = dontCheck (overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; }));
+  mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; });
 
   # https://github.com/diagrams/diagrams-lib/issues/258
   # https://github.com/diagrams/diagrams-lib/issues/259

From f3cb7010855972002431f8d97d73d40c016cf173 Mon Sep 17 00:00:00 2001
From: "Desmond O. Chang" <dochang@gmail.com>
Date: Sat, 8 Aug 2015 01:15:39 +0800
Subject: [PATCH 0919/2016] git-crypt: init at 0.5.0

---
 .../git-and-tools/default.nix                 |  2 +
 .../git-and-tools/git-crypt/default.nix       | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-crypt/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 a73d1637417..b8bce1c9eb5 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -105,4 +105,6 @@ rec {
   git-cola = callPackage ./git-cola { };
 
   git-imerge = callPackage ./git-imerge { };
+
+  git-crypt = callPackage ./git-crypt { };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
new file mode 100644
index 00000000000..c13c5e07001
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, openssl }:
+
+stdenv.mkDerivation rec {
+
+  name = "git-crypt-${meta.version}";
+
+  src = fetchFromGitHub {
+    owner = "AGWA";
+    repo = "git-crypt";
+    rev = meta.version;
+    sha256 = "4fe45f903a4b3cc06a5fe11334b914c225009fe8440d9e91a54fdf21cf4dcc4d";
+    inherit name;
+  };
+
+  buildInputs = [ openssl ];
+
+  installPhase = ''
+    make install PREFIX=$out
+  '';
+
+  meta = {
+    homepage = "https://www.agwa.name/projects/git-crypt";
+    description = "transparent file encryption in git";
+    longDescription = ''
+      git-crypt enables transparent encryption and decryption of files in a git
+      repository. Files which you choose to protect are encrypted when
+      committed, and decrypted when checked out. git-crypt lets you freely
+      share a repository containing a mix of public and private
+      content. git-crypt gracefully degrades, so developers without the secret
+      key can still clone and commit to a repository with encrypted files. This
+      lets you store your secret material (such as keys or passwords) in the
+      same repository as your code, without requiring you to lock down your
+      entire repository.
+    '';
+    downloadPage = "https://github.com/AGWA/git-crypt/releases";
+    license = stdenv.lib.licenses.gpl3;
+    version = "0.5.0";
+    maintainers = [ "Desmond O. Chang <dochang@gmail.com>" ];
+  };
+
+}

From 08f2c9e0a57c9aaad4a1cc9e21e9ece131146e8e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 7 Aug 2015 18:43:56 +0200
Subject: [PATCH 0920/2016] pecita: fix changed sha256 (close #9161)

---
 pkgs/data/fonts/pecita/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index a64512af845..e28ac6c2618 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://pecita.eu/b/Pecita.otf";
-    sha256 = "1smf1mqciwavf29lwgzjam3xb37bwxp6wf6na4c9xv6islidsrd9";
+    sha256 = "11v5yzxa38fxpz8j3fc0v3l7py4i12avjnwrgkmd9clq9jhzk78s";
   };
 
   phases = ["installPhase"];

From 24517d331ae69583a454f7a6f9ef4637629ee543 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 10:20:01 +0300
Subject: [PATCH 0921/2016] Update LibreOffice sources for 5.0.0.

---
 .../office/libreoffice/default.nix            | 14 ++--
 .../office/libreoffice/libreoffice-srcs.nix   | 71 +++++++------------
 2 files changed, 34 insertions(+), 51 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index c053c886e92..5c2772ea303 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -22,10 +22,10 @@
 
 let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
-  major = "4";
-  minor = "4";
-  patch = "4";
-  tweak = "3";
+  major = "5";
+  minor = "0";
+  patch = "0";
+  tweak = "5";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
@@ -80,14 +80,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1zyfpbdsx0kjkabdpkf0lg7hjnvxsf6hj9ljs8v9iqw3x3b7llib";
+      sha256 = "0x86vf1fhgnjgkj25rqcfgrvid6smikmb96121sasydmg0jcsypm";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "1jbbbv63p63mwby52ynz2yk79pb32wsnakhxfhc75ng1br6cpll0";
+      sha256 = "18wqmbm3yvjz6pfnz5qfklwv4d53vrv2npiz3796d4d1j245ylcv";
     };
 
   };
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "0wns7ny19bsl5ar1rq7n4033rfijl2cjn9l8bj1gwhpqlkd8db1i";
+    sha256 = "046f5lakw2rygs5qjmhsxmdw7pa9gwcamavnyqpk1rfbis2ga5wv";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 2cb20027b4c..20619c90d0f 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -29,16 +29,6 @@
   md5 = "8ab049135b2d15313da5d9f0656894a1";
   brief = false;
 }
-{
-  name = "commons-logging-1.1.3-src.tar.gz";
-  md5 = "e8e197d628436490886d17cffa108fe3";
-  brief = false;
-}
-{
-  name = "commons-httpclient-3.1-src.tar.gz";
-  md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
-  brief = false;
-}
 {
   name = "commons-logging-1.2-src.tar.gz";
   md5 = "ce977548f1cbf46918e93cd38ac35163";
@@ -60,8 +50,8 @@
   brief = false;
 }
 {
-  name = "bsh-2.0b1-src.tar.gz";
-  md5 = "ea570af93c284aa9e5621cd563f54f4d";
+  name = "bsh-2.0b5-src.zip";
+  md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
   brief = false;
 }
 {
@@ -105,8 +95,8 @@
   brief = false;
 }
 {
-  name = "curl-7.36.0.tar.bz2";
-  md5 = "e6d1f9d1b59da5062109ffe14e0569a4";
+  name = "curl-7.43.0.tar.bz2";
+  md5 = "11bddbb452a8b766b932f859aaeeed39";
   brief = true;
 }
 {
@@ -120,8 +110,8 @@
   brief = false;
 }
 {
-  name = "libetonyek-0.1.1.tar.bz2";
-  md5 = "805f941b06448212a988cb65f0691a7a";
+  name = "libetonyek-0.1.3.tar.bz2";
+  md5 = "e5947373dd7834f27e93f1636faa419f";
   brief = true;
 }
 {
@@ -195,8 +185,8 @@
   brief = false;
 }
 {
-  name = "libfreehand-0.1.0.tar.bz2";
-  md5 = "5f029fef73e42a2c2ae4524a7513f97d";
+  name = "libfreehand-0.1.1.tar.bz2";
+  md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7";
   brief = true;
 }
 {
@@ -220,8 +210,8 @@
   brief = true;
 }
 {
-  name = "harfbuzz-0.9.23.tar.bz2";
-  md5 = "a4a9b548577e2ee22f0887937da5fd6c";
+  name = "harfbuzz-0.9.40.tar.bz2";
+  md5 = "0e27e531f4c4acff601ebff0957755c2";
   brief = true;
 }
 {
@@ -240,8 +230,8 @@
   brief = false;
 }
 {
-  name = "icu4c-53_1-src.tgz";
-  md5 = "b73baa6fbdfef197608d1f69300919b9";
+  name = "icu4c-54_1-src.tgz";
+  md5 = "e844caed8f2ca24c088505b0d6271bc0";
   brief = false;
 }
 {
@@ -310,8 +300,8 @@
   brief = true;
 }
 {
-  name = "language-subtag-registry-2014-12-03.tar.bz2";
-  md5 = "0f2677ec23bb43ddc7355d1b4cc8ed45";
+  name = "language-subtag-registry-2015-06-08.tar.bz2";
+  md5 = "d431bd8a70455be1fa8523fa633c005b";
   brief = true;
 }
 {
@@ -343,7 +333,6 @@
   name = "libgltf-0.0.2.tar.bz2";
   md5 = "d63a9f47ab048f5009d90693d6aa6424";
   brief = true;
-  subDir = "libgltf/";
 }
 {
   name = "liblangtag-0.5.1.tar.bz2";
@@ -376,9 +365,9 @@
   brief = false;
 }
 {
-  name = "mdds_0.11.2.tar.bz2";
-  md5 = "cb4207cb913c7a5a8bfa5b91234618ee";
-  brief = false;
+  name = "mdds_0.12.1.tar.bz2";
+  md5 = "ef2560ed5416652a7fe195305b14cebe";
+  brief = true;
 }
 {
   name = "libmspub-0.1.2.tar.bz2";
@@ -386,8 +375,8 @@
   brief = true;
 }
 {
-  name = "libmwaw-0.3.1.tar.bz2";
-  md5 = "6f1ac4a0e24131c422e1e91f07718fb6";
+  name = "libmwaw-0.3.5.tar.bz2";
+  md5 = "bdc58bbf89aaaf6d29b3516d96830a06";
   brief = true;
 }
 {
@@ -406,13 +395,13 @@
   brief = false;
 }
 {
-  name = "nss-3.16.5-with-nspr-4.10.6.tar.gz";
-  md5 = "b279551b7638d0e36d1199548124c247";
+  name = "nss-3.19.2-with-nspr-4.10.8.tar.gz";
+  md5 = "2100bc5a7ea9685928ff68cda2e60569";
   brief = false;
 }
 {
-  name = "libodfgen-0.1.1.tar.bz2";
-  md5 = "c22c83c17cda0754382ada4e116594b7";
+  name = "libodfgen-0.1.4.tar.bz2";
+  md5 = "8716be5c22ae8353f9aaa380d74840dc";
   brief = true;
 }
 {
@@ -426,8 +415,8 @@
   brief = false;
 }
 {
-  name = "openssl-1.0.1j.tar.gz";
-  md5 = "f7175c9cd3c39bb1907ac8bba9df8ed3";
+  name = "openssl-1.0.2a.tar.gz";
+  md5 = "a06c547dac9044161a477211049f60ef";
   brief = true;
 }
 {
@@ -526,8 +515,8 @@
   brief = true;
 }
 {
-  name = "libwps-0.3.1.tar.bz2";
-  md5 = "a111d9ef5a0dab564e9aec0f2cf8d218";
+  name = "libwps-0.4.0.tar.bz2";
+  md5 = "e9162d2566421d9d71b3ad2377a68fd5";
   brief = true;
 }
 {
@@ -540,10 +529,4 @@
   md5 = "44d667c142d7cda120332623eab69f40";
   brief = true;
 }
-{
-  name = "libgltf-0.0.0.tar.bz2";
-  md5 = "ca5436e916bfe70694adfe2607782786";
-  brief = true;
-  subDir = "libgltf/";
-}
 ]

From 93dc62187b2d484852d57fe4cf2771876ca573bd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 10:27:45 +0300
Subject: [PATCH 0922/2016] Update MDDS homepage and version, needed for
 LibreOffice 5.0.0

---
 pkgs/development/libraries/mdds/default.nix      | 6 +++---
 pkgs/development/libraries/mdds/default.upstream | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index bc8f91dcb93..f379d8c4e32 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.12.0";
+  version = "0.12.1";
   name = "mdds-${version}";
 
   src = fetchurl {
     url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2";
-    sha256 = "10ar7r0gkdl2r7916jlkl5c38cynrh7x9s90a5i8d242r8ixw8ia";
+    sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
   };
 
   postInstall = ''
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    homepage = https://code.google.com/p/multidimalgorithm/;
+    homepage = "https://gitlab.com/mdds/mdds";
     description = "A collection of multi-dimensional data structure and indexing algorithm";
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/mdds/default.upstream b/pkgs/development/libraries/mdds/default.upstream
index 5c07878fdf2..94b6c78b06b 100644
--- a/pkgs/development/libraries/mdds/default.upstream
+++ b/pkgs/development/libraries/mdds/default.upstream
@@ -1,4 +1,4 @@
-url https://code.google.com/p/multidimalgorithm/wiki/Downloads
+url https://gitlab.com/mdds/mdds
 version_link '[.]tar[.][a-z0-9]+$'
 version '.*_([0-9.]+)[.]tar[.].*' '\1'
 

From db9679259a92dc77d86ee52288114e3b0ecd1362 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 16:18:38 +0300
Subject: [PATCH 0923/2016] LibreOffice: Kill one failing test which is fragile
 elsewhere, too

---
 pkgs/applications/office/libreoffice/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 5c2772ea303..d603bf86537 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -17,6 +17,7 @@
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
+, gdb
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ]
 }:
 
@@ -148,6 +149,11 @@ stdenv.mkDerivation rec {
   postConfigure = ''
     sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
     sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
+
+    # unit test sd_tiledrendering seems to be fragile
+    # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
+    echo > ./sd/CppunitTest_sd_tiledrendering.mk
+    sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
   '';
 
   makeFlags = "SHELL=${bash}/bin/bash";
@@ -255,10 +261,10 @@ stdenv.mkDerivation rec {
       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 /*libixion*/
+      mdds bluez5 glibc
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew
-      /*liborcus*/ libodfgen
+      libodfgen
     ];
 
   meta = with stdenv.lib; {

From f059656ef2e665d6a8ee41a6215ec2c7e969d390 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 8 Aug 2015 10:16:32 +0900
Subject: [PATCH 0924/2016] thunderbird: 31.7.0 -> 38.1.0

---
 .../networking/mailreaders/thunderbird/default.nix   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index f2a088164d2..5d6e0faad4a 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -13,15 +13,17 @@
   enableOfficialBranding ? false
 }:
 
-let version = "31.7.0"; in
+let version = "38.1.0"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {
   name = "thunderbird-${verName}";
 
   src = fetchurl {
-    url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
-    sha1 = "90e18f8ecccdaf1ee39493223a7e3ad8b3b7bede";
+    url = "http://archive.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
+
+    # https://archive.mozilla.org/pub/thunderbird/releases/${verName}/SHA1SUMS
+    sha1 = "7bb0c85e889e397e53dcbcbd36957dbd7c8c10bd";
   };
 
   buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx
@@ -75,6 +77,10 @@ stdenv.mkDerivation rec {
     cd objdir
     echo '${stdenv.lib.concatMapStrings (s : "ac_add_options ${s}\n") configureFlags}' > .mozconfig
     echo 'ac_add_options --prefix="'"$out"'"' >> .mozconfig
+    # From version 38, we need to specify the source directory to build
+    # Thunderbird. Refer to mozilla/configure and search a line with
+    # "checking for application to build" and "# Support comm-central".
+    echo 'ac_add_options --with-external-source-dir="'`realpath ..`'"' >> .mozconfig
     echo 'mk_add_options MOZ_MAKE_FLAGS="-j'"$NIX_BUILD_CORES"'"' >> .mozconfig
     echo 'mk_add_options MOZ_OBJDIR="'`pwd`'"' >> .mozconfig
 

From d460e1b5c26570d3e124ab9a5bd04764610cff6c Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sat, 8 Aug 2015 16:54:28 +0200
Subject: [PATCH 0925/2016] freeciv: change the naming scheme to add build
 annotations before the version number.

---
 pkgs/games/freeciv/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index 9c7b41abd87..1ad9685a505 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -9,13 +9,14 @@ let
   sdlName = if sdlClient then "-sdl" else "";
   gtkName = if gtkClient then "-gtk" else "";
 
-  baseName = "freeciv-2.5.0";
+  name = "freeciv";
+  version = "2.5.0";
 in
 stdenv.mkDerivation {
-  name = baseName + sdlName + gtkName;
+  name = "${name}${sdlName}${gtkName}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/freeciv/${baseName}.tar.bz2";
+    url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2";
     sha256 = "bd9f7523ea79b8d2806d0c1844a9f48506ccd18276330580319913c43051210b";
     # sha1 = "477b60e02606e47b31a019b065353c1a6da6c305";
     # md5 = "8a61ecd986853200326711446c573f1b";

From 4f700948578c10c7371e10f4d65889fec369c577 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Sat, 8 Aug 2015 11:07:12 -0400
Subject: [PATCH 0926/2016] chrony: 1.31 -> 2.1.1

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

diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index e11fb377c21..3acf921cd79 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null;
 stdenv.mkDerivation rec {
   name = "chrony-${version}";
 
-  version = "1.31";
+  version = "2.1.1";
   
   src = fetchurl {
     url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
-    sha256 = "0vcr4hr1a01l5c3z0rgzna8rbmq35aklgfr342pi9gpc8sp1qpm3";
+    sha256 = "b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4";
   };
   
   buildInputs = [ readline texinfo ] ++ stdenv.lib.optional stdenv.isLinux libcap;

From a04b6f729a7be3c26f4f26f5a29754f13902ed6f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:10:33 +0300
Subject: [PATCH 0927/2016] SBCL: 1.2.13 -> 1.2.14

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 96843abbd45..2d6a3a45147 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.2.13";
+  version = "1.2.14";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "018jxd7f39a5aimjzfjdj739m3jq82k0qi59032v48gqrfa3mng6";
+    sha256 = "01jw1w5siv6q16y1vmgd7s1i22aq0cqaipgn12jvq18c8vb6s55r";
   };
 
   buildInputs = [ which ]

From 6863fde51574e794d23b6906aab4fa720cec59bd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:12:42 +0300
Subject: [PATCH 0928/2016] E prover: 1.8 -> 1.9

---
 pkgs/applications/science/logic/eprover/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index c04cfffbb14..97fe7065b85 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="eprover";
-    version="1.8";
+    version="1.9";
     name="${baseName}-${version}";
-    hash="0bl4dr7k6simwdvdyxhnjkiz4nm5y0nr8bfhc34zk0360i9m6sk3";
-    url="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_1.8/E.tgz";
-    sha256="0bl4dr7k6simwdvdyxhnjkiz4nm5y0nr8bfhc34zk0360i9m6sk3";
+    hash="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4";
+    url="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_1.9/E.tgz";
+    sha256="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4";
   };
 in
 stdenv.mkDerivation {

From f89b651008a6ed0585b63fc74d33e1d970446410 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:15:12 +0300
Subject: [PATCH 0929/2016] Botan: stable: 1.10.9 -> 1.10.10; unstable: 1.11.16
 -> 1.11.19

---
 pkgs/development/libraries/botan/default.nix  | 4 ++--
 pkgs/development/libraries/botan/unstable.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 3006a5a456d..6eba16847f8 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -2,7 +2,7 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.10";
-  revision = "9";
-  sha256 = "1wldp9py3qcdgswgxya83c03y6345a6cf3vwz0y41bl1l39jfza8";
+  revision = "10";
+  sha256 = "0qs1ps25k79jnzm31zjl6hj8kxzfwwjsdrlc9bz621218r3v2rvb";
   extraConfigureFlags = "--with-gnump";
 })
diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index cc2a5ebaa31..5685d261829 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -2,7 +2,7 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.11";
-  revision = "16";
-  sha256 = "0z3a7jp10w9ipmbzhc2xazd2savxmns57ca2a8d6vvjahxg4w6m3";
+  revision = "19";
+  sha256 = "0a1hgd3w2pyn6yx89bal61bkxxazv0p8x8x4kri73p1b4vj3n3sb";
   openssl = null;
 })

From 9786c74792a8fcbe2e84a548c81b9bf3d0a12af0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:16:14 +0300
Subject: [PATCH 0930/2016] libgphoto2: 2.5.7 -> 2.5.8

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

diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 9583696df43..2fdf3d5e69b 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "154qs3j1k72xn8p5vgjcwvywkskxz0j145cgvlcw7d5xfwr1jq3j";
+    sha256 = "1di7iv2r5ghzrylfbpvp694gpqbwjj3ngrmg4kvl7big6hp2c6h3";
   };
 
   nativeBuildInputs = [ pkgconfig gettext ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       MTP, and other vendor specific protocols for controlling and transferring data
       from digital cameras.
     '';
-    version = "2.5.7";
+    version = "2.5.8";
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = with stdenv.lib.platforms; unix;

From 081dff71be60cf92c55ad84b14f53fedb126a74f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:32:01 +0300
Subject: [PATCH 0931/2016] baresip: 0.4.13 -> 0.4.14

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

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 5dde5b62dda..d41ba5fcdb3 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,11 +4,11 @@
 , gsm, speex, portaudio, spandsp, libuuid
 }:
 stdenv.mkDerivation rec {
-  version = "0.4.13";
+  version = "0.4.14";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "1mndpcclp5cqlm5jfbh37ig8dmga75qxqfinp4dyd1c0wnd0f0jg";
+    sha256 = "19vn63j6dpybjy14mgnwf0yk2jbcbfdjs50whzwyrrkcv6ipj6hc";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
     cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good

From f383b2971cf52e194b1908a52cb14be4daf423b0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:40:07 +0300
Subject: [PATCH 0932/2016] python-nbxmpp: 0.5.2 -> 0.5.3; needed for fresher
 Gajim

---
 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 cf0140a25d3..247955e9765 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8163,12 +8163,12 @@ let
   };
 
   nbxmpp = buildPythonPackage rec {
-    name = "nbxmpp-0.5.2";
+    name = "nbxmpp-0.5.3";
 
     src = pkgs.fetchurl {
       name = "${name}.tar.gz";
-      url = "https://python-nbxmpp.gajim.org/downloads/7";
-      sha256 = "0q2iph07aahwn6hlr38v0cvzlfc9hrf5mz6qs1kp4b4x9l8x5mqn";
+      url = "https://python-nbxmpp.gajim.org/downloads/8";
+      sha256 = "0dcr786dyips1fdvgsn8yvpgcz5j7217fi05c29cfypdl8jnp6mp";
     };
 
     meta = {

From e346b417d3092b6bb959d776da98ff390d871bcb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:40:25 +0300
Subject: [PATCH 0933/2016] gajim: 0.16.1 -> 0.16.3

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

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index fbd9954d3aa..69497f87c6b 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -22,11 +22,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gajim-${version}";
-  version = "0.16.1";
+  version = "0.16.3";
 
   src = fetchurl {
     url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2";
-    sha256 = "1gp8mdn6sz2pks5irsf563zbz98ldqksfky84ga9fzqndmq35bi6";
+    sha256 = "05a59hf9wna6n9fi0a4bhz1hifqj21bwb4ff9rd0my23rdwmij51";
   };
 
   patches = [

From bd09d75b96d830c82bb4b640062a376b8c7e609a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:41:56 +0300
Subject: [PATCH 0934/2016] CL-Launch: 4.1.3.3 -> 4.1.4

---
 pkgs/development/tools/misc/cl-launch/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index 40c4085adab..17b1f3382cc 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="cl-launch";
-    version="4.1.3.3";
+    version="4.1.4";
     name="${baseName}-${version}";
-    hash="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl";
-    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.3.tar.gz";
-    sha256="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl";
+    hash="0j3lapjsqzdkc7ackqdk13li299lp706gdc9bh28kvs0diyamjiv";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.4.tar.gz";
+    sha256="0j3lapjsqzdkc7ackqdk13li299lp706gdc9bh28kvs0diyamjiv";
   };
   buildInputs = [
   ];

From eee6f2801fcf58950f7b32f4b98d240728e8a70b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 20:09:45 +0300
Subject: [PATCH 0935/2016] sysdig: 0.1.101 -> 0.1.102

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 9478e07468e..e2758e7c2b6 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,10 +3,10 @@ let
   inherit (stdenv.lib) optional optionalString;
   s = rec {
     baseName="sysdig";
-    version = "0.1.101";
+    version = "0.1.102";
     name="${baseName}-${version}";
     url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "1dlx1v7wr0i36sbybr4kj8sziyrfxs4pcn6bnl0ljlb5wndy75b9";
+    sha256 = "0mrz14wvcb8m8idr4iqbr3jmxfs7dlmh06n0q9fcfph75wkc5fp0";
   };
   buildInputs = [
     cmake zlib luajit ncurses

From 462ce2a65ec50e6434cdb1ba40a693f4d8fb09a6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 20:10:20 +0300
Subject: [PATCH 0936/2016] GlusterFS: 3.7.2 -> 3.7.3

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

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 55e4e17fa1f..062f27e286f 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -6,11 +6,11 @@ let
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.7.2";
+    version="3.7.3";
     name="${baseName}-${version}";
-    hash="0cw6p21nnxcvzd8rymd5q0ydlaz4hx4rmv22hwbb39h7a2rvfv79";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.2/glusterfs-3.7.2.tar.gz";
-    sha256="0cw6p21nnxcvzd8rymd5q0ydlaz4hx4rmv22hwbb39h7a2rvfv79";
+    hash="0xdzxprsi0gybv6jdp0ycfpsxzijwfrm3217fk3fnixcs92frshv";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.3/glusterfs-3.7.3.tar.gz";
+    sha256="0xdzxprsi0gybv6jdp0ycfpsxzijwfrm3217fk3fnixcs92frshv";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline

From 1caa629b331f87d7b3fa3f3b9808ac6f400065c0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 20:56:16 +0300
Subject: [PATCH 0937/2016] Apache Jena: 2.13.0 -> 3.0.0

---
 pkgs/servers/nosql/apache-jena/binary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index 8c4db178e78..9b4e19b3270 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="apache-jena";
-    version = "2.13.0";
+    version = "3.0.0";
     name="${baseName}-${version}";
     url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
-    sha256 = "0fb5f2rv7rgi60r4b80r1wzap1rngmajv378mdkcyhm7bj4ba31d";
+    sha256 = "1pqg27m295v7v456pidb0fq5120blkc466pdzksqxqcjrwivq4kb";
   };
   buildInputs = [
     makeWrapper

From 3e86c32254128d4bc02b329ebc1f7978842e28ad Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 21:01:19 +0300
Subject: [PATCH 0938/2016] ASDF: 3.1.4 -> 3.1.5

---
 pkgs/development/lisp-modules/asdf/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 33cd07b4807..6b7b88469b1 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -1,16 +1,16 @@
-{stdenv, fetchurl, texinfo, texLive}:
+{stdenv, fetchurl, texinfo, texLive, perl}:
 let
   s = # Generated upstream information
   rec {
     baseName="asdf";
-    version="3.1.4";
+    version="3.1.5";
     name="${baseName}-${version}";
-    hash="0hyc2g22khcmvxmlcaq0xbxqhq59spgc2nc1s0gz1r9mcgrzm2xw";
-    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.4.tar.gz";
-    sha256="0hyc2g22khcmvxmlcaq0xbxqhq59spgc2nc1s0gz1r9mcgrzm2xw";
+    hash="1barrkj549d24pyh86gdc8v3vvsv4w7k0kkfg0zzrvhg8x8al19h";
+    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.5.tar.gz";
+    sha256="1barrkj549d24pyh86gdc8v3vvsv4w7k0kkfg0zzrvhg8x8al19h";
   };
   buildInputs = [
-    texinfo texLive
+    texinfo texLive perl
   ];
 in
 stdenv.mkDerivation {
@@ -19,7 +19,6 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
-  sourceRoot=".";
   buildPhase = ''
     make build/asdf.lisp
     make -C doc asdf.info asdf.html

From 6542c344bcf0077e7530a0e8f02034aa92b52b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 8 Aug 2015 19:55:40 +0200
Subject: [PATCH 0939/2016] ngspice: rename pkgname
 (s/ng-spice-rework/ngspice/)

I think the previous name comes from the fact that some older versions
were distributed in tarballs named ng-spice-rework-<version>. But now
the "rework" name seems odd; most references I found on the internet
calls the package "ngspice". Fix it.
---
 pkgs/applications/science/electronics/ngspice/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index e64ea909cbb..4f887f511ae 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}:
 
 stdenv.mkDerivation {
-  name = "ng-spice-rework-25";
+  name = "ngspice-25";
 
   src = fetchurl {
     url = "mirror://sourceforge/ngspice/ngspice-25.tar.gz";

From 062cdfb3a17e13b476d41de09ba3eaa2652cf402 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 7 Aug 2015 18:46:23 +0200
Subject: [PATCH 0940/2016] sbt: add JAVA_HOME to sbt script

---
 pkgs/development/tools/build-managers/sbt/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 01a3b740e6e..a273ea75087 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cat > $out/bin/sbt << EOF
     #! ${stdenv.shell}
+    if [ ! -v JAVA_HOME ]; then
+        export JAVA_HOME="${jre.home}"
+    fi
     ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@"
     EOF
     chmod +x $out/bin/sbt

From 715e7726672f32698c9ccec66d079a28f778204a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sat, 8 Aug 2015 19:49:38 +0000
Subject: [PATCH 0941/2016] Add initial Brightbox expression.

(cherry picked from commit 55d97862890350a3cc069d547114c1a880f2e583)
---
 .../virtualisation/brightbox-config.nix       |   5 +
 .../virtualisation/brightbox-image.nix        | 166 ++++++++++++++++++
 2 files changed, 171 insertions(+)
 create mode 100644 nixos/modules/virtualisation/brightbox-config.nix
 create mode 100644 nixos/modules/virtualisation/brightbox-image.nix

diff --git a/nixos/modules/virtualisation/brightbox-config.nix b/nixos/modules/virtualisation/brightbox-config.nix
new file mode 100644
index 00000000000..528ffecc0bf
--- /dev/null
+++ b/nixos/modules/virtualisation/brightbox-config.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, modulesPath, ... }:
+
+{
+  imports = [ "${modulesPath}/virtualisation/brightbox-image.nix" ];
+}
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix
new file mode 100644
index 00000000000..3a956caca0c
--- /dev/null
+++ b/nixos/modules/virtualisation/brightbox-image.nix
@@ -0,0 +1,166 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  diskSize = "20G";
+in
+{
+  imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];
+
+  system.build.brightboxImage =
+    pkgs.vmTools.runInLinuxVM (
+      pkgs.runCommand "brightbox-image"
+        { preVM =
+            ''
+              mkdir $out
+              diskImage=$out/$diskImageBase
+              truncate $diskImage --size ${diskSize}
+              mv closure xchg/
+            '';
+
+          postVM =
+            ''
+              PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin
+              pushd $out
+              ${pkgs.qemu_kvm}/bin/qemu-img convert -c -O qcow2 $diskImageBase nixos.qcow2
+              rm $diskImageBase
+              popd
+            '';
+          diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
+          buildInputs = [ pkgs.utillinux pkgs.perl ];
+          exportReferencesGraph =
+            [ "closure" config.system.build.toplevel ];
+        }
+        ''
+          # Create partition table
+          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
+          ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}
+          ${pkgs.parted}/sbin/parted /dev/vda print
+          . /sys/class/block/vda1/uevent
+          mknod /dev/vda1 b $MAJOR $MINOR
+
+          # Create an empty filesystem and mount it.
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
+          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
+
+          mkdir /mnt
+          mount /dev/vda1 /mnt
+
+          # The initrd expects these directories to exist.
+          mkdir /mnt/dev /mnt/proc /mnt/sys
+
+          mount --bind /proc /mnt/proc
+          mount --bind /dev /mnt/dev
+          mount --bind /sys /mnt/sys
+
+          # Copy all paths in the closure to the filesystem.
+          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+
+          mkdir -p /mnt/nix/store
+          echo "copying everything (will take a while)..."
+          cp -prd $storePaths /mnt/nix/store/
+
+          # Register the paths in the Nix database.
+          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
+              chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""
+
+          # Create the system profile to allow nixos-rebuild to work.
+          chroot /mnt ${config.nix.package}/bin/nix-env \
+              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \
+              --option build-users-group ""
+
+          # `nixos-rebuild' requires an /etc/NIXOS.
+          mkdir -p /mnt/etc
+          touch /mnt/etc/NIXOS
+
+          # `switch-to-configuration' requires a /bin/sh
+          mkdir -p /mnt/bin
+          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
+
+          # Install a configuration.nix.
+          mkdir -p /mnt/etc/nixos /mnt/boot/grub
+          cp ${./brightbox-config.nix} /mnt/etc/nixos/configuration.nix
+
+          # Generate the GRUB menu.
+          ln -s vda /dev/sda
+          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
+
+          umount /mnt/proc /mnt/dev /mnt/sys
+          umount /mnt
+        ''
+    );
+
+  fileSystems."/".label = "nixos";
+
+  # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
+  boot.loader.grub.device = "/dev/vda";
+  boot.loader.grub.timeout = 0;
+
+  # Don't put old configurations in the GRUB menu.  The user has no
+  # way to select them anyway.
+  boot.loader.grub.configurationLimit = 0;
+
+  # Allow root logins only using the SSH key that the user specified
+  # at instance creation time.
+  services.openssh.enable = true;
+  services.openssh.permitRootLogin = "without-password";
+
+  # Force getting the hostname from Google Compute.
+  networking.hostName = mkDefault "";
+
+  # Always include cryptsetup so that NixOps can use it.
+  environment.systemPackages = [ pkgs.cryptsetup ];
+
+  systemd.services."fetch-ec2-data" =
+    { description = "Fetch EC2 Data";
+
+      wantedBy = [ "multi-user.target" "sshd.service" ];
+      before = [ "sshd.service" ];
+      wants = [ "ip-up.target" ];
+      after = [ "ip-up.target" ];
+
+      path = [ pkgs.wget pkgs.iproute ];
+
+      script =
+        ''
+          wget="wget -q --retry-connrefused -O -"
+
+          ${optionalString (config.networking.hostName == "") ''
+            echo "setting host name..."
+            ${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/latest/meta-data/hostname)
+          ''}
+
+          # Don't download the SSH key if it has already been injected
+          # into the image (a Nova feature).
+          if ! [ -e /root/.ssh/authorized_keys ]; then
+              echo "obtaining SSH key..."
+              mkdir -m 0700 -p /root/.ssh
+              $wget http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /root/key.pub
+              if [ $? -eq 0 -a -e /root/key.pub ]; then
+                  if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
+                      cat /root/key.pub >> /root/.ssh/authorized_keys
+                      echo "new key added to authorized_keys"
+                  fi
+                  chmod 600 /root/.ssh/authorized_keys
+                  rm -f /root/key.pub
+              fi
+          fi
+
+          # Extract the intended SSH host key for this machine from
+          # the supplied user data, if available.  Otherwise sshd will
+          # generate one normally.
+          $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
+          key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)"
+          key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)"
+          if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then
+              mkdir -m 0755 -p /etc/ssh
+              (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
+              echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
+          fi
+        '';
+
+      serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = true;
+    };
+
+}

From bdb24b90c8cd6faaac4b4b18d0268354bb0298e4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 8 Aug 2015 15:23:05 -0500
Subject: [PATCH 0942/2016] qt53: gdb required only for developerBuild

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

diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
index 14675af48fb..595bb5bb10b 100644
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@@ -176,7 +176,9 @@ stdenv.mkDerivation rec {
   ++ optional (postgresql != null) postgresql
   ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
-  buildInputs = [ gdb bison flex gperf ruby ];
+  buildInputs =
+    [ bison flex gperf ruby ]
+    ++ optional developerBuild gdb;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From 28f0eb5af8867a476abf395aeab9added9dc4d84 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 8 Aug 2015 15:23:48 -0500
Subject: [PATCH 0943/2016] qt54: gdb required only for developerBuild

---
 pkgs/development/libraries/qt-5/5.4/qtbase.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index ecefa891332..780f1b60f7c 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -174,7 +174,9 @@ stdenv.mkDerivation {
   ++ optional (postgresql != null) postgresql
   ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
-  buildInputs = [ gdb bison flex gperf ruby ];
+  buildInputs =
+    [ bison flex gperf ruby ]
+    ++ optional developerBuild gdb;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From 2104e01ec76b058ff5bd9cc84a39f79c447dd07b Mon Sep 17 00:00:00 2001
From: hiberno <mail@elfsechsundzwanzig.de>
Date: Sat, 8 Aug 2015 23:55:28 +0200
Subject: [PATCH 0944/2016] bar: 1.0 -> 1.1

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

diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix
index 46a19b90b8b..964390d3b59 100644
--- a/pkgs/applications/window-managers/bar/default.nix
+++ b/pkgs/applications/window-managers/bar/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, perl, libxcb }:
 
 let
-  version = "1.0";
+  version = "1.1";
 in
   stdenv.mkDerivation rec {
     name = "bar-${version}";
   
     src = fetchurl {
       url = "https://github.com/LemonBoy/bar/archive/v${version}.tar.gz";
-      sha256 = "1n2vak2acs37sslxl250cnz9c3irif5z4s54wi9qjyxbfzr2h2nc";
+      sha256 = "171ciw676cvj80zzbqfbg9nwix36zph0683zmqf279q9b9bmayan";
     };
   
     buildInputs = [ libxcb perl ];

From a73336ad67b4c41b5c67af8d9a730d6bd899c706 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 8 Aug 2015 19:51:18 +0200
Subject: [PATCH 0945/2016] pencil 2.0.11 -> 2.0.13

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

diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index 19c6334d1d6..94ab1b76cda 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, xulrunner }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.11";
+  version = "2.0.13";
   name = "pencil-${version}";
 
   src = fetchurl {
     url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz";
-    sha256 = "a35d1353de6665cbd4a5bd821dcdf7439f2a3c1fcbccee0f01ec8dd1bb67c4f3";
+    sha256 = "150jsaq27n01l0vf10jiyrlfm0canqhphdxi42di96b9zsfkphpk";
 
   };
 

From 70ae60feb15f1ff12d6351a70ed2716ffba4943a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 9 Aug 2015 01:36:29 +0200
Subject: [PATCH 0946/2016] i2p: 0.9.20 -> 0.9.21

See https://geti2p.net/en/blog/post/2015/07/31/0.9.21-Release
---
 pkgs/tools/networking/i2p/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index 1ef159131af..cbfedab0faf 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,10 +1,10 @@
 { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
 
 stdenv.mkDerivation rec {
-  name = "i2p-0.9.20";
+  name = "i2p-0.9.21";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "10rynkl9dbnfl67ck3d7wdwz52h7354r7nbwcypsjnng4f1dmj5s";
+    sha256 = "1cgki9sg0pc4d66rr556lw0682c4mmdvmr6awvsn7ch0rp4zav9f";
   };
   buildInputs = [ jdk ant gettext which ];
   patches = [ ./i2p.patch ];
@@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with stdenv.lib; {
-    homepage = "https://geti2p.net";
+    homepage = https://geti2p.net;
     description = "Applications and router for I2P, anonymity over the Internet";
-    maintainers = [ stdenv.lib.maintainers.joelmo ];
+    maintainers = [ maintainers.joelmo ];
     license = licenses.gpl2;
     # TODO: support other systems, just copy appropriate lib/wrapper.. to $out
     platforms = [ "x86_64-linux" ];

From 2c5775b141372fc87da66c405dda473f4679f11c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 9 Aug 2015 02:24:58 +0200
Subject: [PATCH 0947/2016] i2p service: use mkEnableOption

---
 nixos/modules/services/networking/i2p.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/i2p.nix b/nixos/modules/services/networking/i2p.nix
index bad22c79138..e6ee5fd1f95 100644
--- a/nixos/modules/services/networking/i2p.nix
+++ b/nixos/modules/services/networking/i2p.nix
@@ -7,15 +7,7 @@ let
   homeDir = "/var/lib/i2p";
 in {
   ###### interface
-  options.services.i2p = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enables i2p as a running service upon activation.
-        '';
-      };
-  };
+  options.services.i2p.enable = mkEnableOption "I2P router";
 
   ###### implementation
   config = mkIf cfg.enable {

From b2baad78e65abbcd8abd9cf493a8279f39b1f0b1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 9 Aug 2015 11:10:30 +0200
Subject: [PATCH 0948/2016] fira: 4.104 -> 4.105

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

diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix
index b8db1132b7c..18373439ab0 100644
--- a/pkgs/data/fonts/fira/default.nix
+++ b/pkgs/data/fonts/fira/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "fira-4.104";
+  name = "fira-4.105";
 
   src = fetchurl {
-    url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4104.zip;
-    sha256 = "1i8l0x2wdx4pw7j52lgy8qcx0wqj0azwjiq0wa9kg26x78bdfk2d";
+    url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4105.zip;
+    sha256 = "1857kpn7p7fc1xsmqx9589hk396ggwzd167yc3dmn1mh5dixibfz";
   };
 
   buildInputs = [unzip];
   phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraFonts4104";
+  sourceRoot = "FiraFonts4105";
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype

From 5c0d80f14b34823add1eb03f24dbc9b9a76efde3 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 9 Aug 2015 11:10:53 +0200
Subject: [PATCH 0949/2016] fira-mono: 3.204 -> 3.205

---
 pkgs/data/fonts/fira-mono/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix
index 976fb68d79f..8299153aa2c 100644
--- a/pkgs/data/fonts/fira-mono/default.nix
+++ b/pkgs/data/fonts/fira-mono/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "fira-mono-3.204";
+  name = "fira-mono-3.205";
 
   src = fetchurl {
-    url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3204.zip;
-    sha256 = "0pnsw7b1i5vkwq0kny4lxzly4h8rlwkj610rykhax6zayfbnz62a";
+    url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3205.zip;
+    sha256 = "0zd4wy8ksbz0qiiqgl9w7zyh34q8n983dyb44g5dfdcjakj09qlz";
   };
 
   buildInputs = [ unzip ];
   phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraMonoFonts3204";
+  sourceRoot = "FiraMonoFonts3205";
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype

From 306575d95cb2eb621c3e4d833329d3903867a5c9 Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Sun, 9 Aug 2015 12:05:25 +0200
Subject: [PATCH 0950/2016] gpodder: 3.8.3 -> 3.8.4

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

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 853cdff4a51..58b9be41545 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -7,11 +7,11 @@ let
   inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3;
 
 in buildPythonPackage rec {
-  name = "gpodder-3.8.3";
+  name = "gpodder-3.8.4";
 
   src = fetchurl {
     url = "http://gpodder.org/src/${name}.tar.gz";
-    sha256 = "8ac120a6084bded6bc88ecadbbc9df54a85f44ef4507f73a76de1d7a5574303c";
+    sha256 = "0cjpk92qjsws7ddbnq0r2h7vm5019zlpafgbxwsgllmjzkknj6pn";
   };
 
   buildInputs = [

From fb0ea4122fa22be6c7c6210e1aeb754d4d4cb116 Mon Sep 17 00:00:00 2001
From: Andreas Baldeau <andreas@baldeau.net>
Date: Sun, 9 Aug 2015 14:17:29 +0200
Subject: [PATCH 0951/2016] Font Awesome updated => 4.4.0

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

diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix
index ed91713d03a..992b87b8ec7 100644
--- a/pkgs/data/fonts/font-awesome-ttf/default.nix
+++ b/pkgs/data/fonts/font-awesome-ttf/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "font-awesome-4.3.0";
+  name = "font-awesome-4.4.0";
 
   src = fetchurl {
     url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip";
-    sha256 = "0wg9q6mq026jjw1bsyj9b5dgba7bb4h7i9xiwgsfckd412xpsbzd";
+    sha256 = "1bmjh3j533awihdxihvlk2d1ypzs9q7azj0viqbm0df8jj2v4rwq";
   };
 
   buildCommand = ''

From 4f47002352328306dc64b1e0ab02564bfee0c643 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 9 Aug 2015 13:23:29 +0200
Subject: [PATCH 0952/2016] python-packages pyusb: 1.0.0b1 -> 1.0.0b2

Small update. Tested succesfully with `nox-review wip`

cc maintainer @bjornfor
---
 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 247955e9765..818bdba09e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15636,7 +15636,7 @@ let
 
 
   pyusb = buildPythonPackage rec {
-    name = "pyusb-1.0.0b1";
+    name = "pyusb-1.0.0b2";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pyusb/${name}.tar.gz";
@@ -15653,7 +15653,7 @@ let
     meta = {
       description = "Python USB access module (wraps libusb 1.0)";  # can use other backends
       homepage = http://pyusb.sourceforge.net/;
-      license = "BSD";
+      license = licenses.bsd3;
       maintainers = with maintainers; [ bjornfor ];
     };
   };

From b92259d68fe42ac0c5ed01044cbcdd676012afa9 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 9 Aug 2015 15:13:50 +0200
Subject: [PATCH 0953/2016] fix $out creation of ir.lv2

---
 pkgs/applications/audio/ir.lv2/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix
index 804d6e7d4e4..d6dbc4c55a9 100644
--- a/pkgs/applications/audio/ir.lv2/default.nix
+++ b/pkgs/applications/audio/ir.lv2/default.nix
@@ -17,10 +17,9 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir "$out/bin"
+    mkdir -p "$out/bin"
     mkdir "$out/include"
-    mkdir "$out/share"
-    mkdir "$out/share/doc"
+    mkdir -p "$out/share/doc"
 
     make PREFIX="$out" install
     install -Dm755 convert4chan "$out/bin/convert4chan"

From 61e804a35f06c5cd7c6207302e12ef75c3d11a52 Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Thu, 6 Aug 2015 23:04:44 +0200
Subject: [PATCH 0954/2016] cataclysm-dda: init at 0.C

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

diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix
new file mode 100644
index 00000000000..c8d69d3078d
--- /dev/null
+++ b/pkgs/games/cataclysm-dda/default.nix
@@ -0,0 +1,71 @@
+{ fetchFromGitHub, stdenv, makeWrapper, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf,
+SDL2_mixer, freetype, gettext }:
+
+let architecture =
+      if stdenv.system == "i686-linux" then
+        "linux32"
+      else if stdenv.system == "x86_64-linux" then
+        "linux64"
+      else
+        abort "currently only linux 32-bit and 64-bit are supported";
+
+in stdenv.mkDerivation rec {
+  version = "0.C";
+  name = "cataclysm-dda-${version}";
+
+  src = fetchFromGitHub {
+    owner = "CleverRaven";
+    repo = "Cataclysm-DDA";
+    rev = "${version}";
+    sha256 = "03sdzsk4qdq99qckq0axbsvg1apn6xizscd8pwp5w6kq2fyj5xkv";
+  };
+
+  buildInputs = [ makeWrapper pkgconfig ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ];
+
+  patchPhase = ''
+    patchShebangs .
+    substituteAllInPlace lang/compile_mo.sh \
+      --replace msgfmt ${gettext}/msgfmt
+    sed -i -e 's|DATA_PREFIX=$(PREFIX)/share/cataclysm-dda/|DATA_PREFIX=$(PREFIX)/share/|g' Makefile
+  '';
+
+  makeFlags = "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1";
+
+  postInstall = ''
+    wrapProgram $out/bin/cataclysm-tiles \
+      --add-flags "--datadir $out/share/"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A free, post apocalyptic, zombie infested rogue-like";
+    longDescription = ''
+      Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world.
+      Surviving is difficult: you have been thrown, ill-equipped, into a
+      landscape now riddled with monstrosities of which flesh eating zombies are
+      neither the strangest nor the deadliest.
+
+      Yet with care and a little luck, many things are possible. You may try to
+      eke out an existence in the forests silently executing threats and
+      providing sustenance with your longbow. You can ride into town in a
+      jerry-rigged vehicle, all guns blazing, to settle matters in a fug of
+      smoke from your molotovs. You could take a more measured approach and
+      construct an impregnable fortress, surrounded by traps to protect you from
+      the horrors without. The longer you survive, the more skilled and adapted
+      you will get and the better equipped and armed to deal with the threats
+      you are presented with.
+
+      In the course of your ordeal there will be opportunities and temptations
+      to improve or change your very nature. There are tales of survivors fitted
+      with extraordinary cybernetics giving great power and stories too of
+      gravely mutated survivors who, warped by their ingestion of exotic
+      substances or radiation, now more closely resemble insects, birds or fish
+      than their original form.
+    '';
+    homepage = http://en.cataclysmdda.com/;
+    license = licenses.cc-by-sa-30;
+    maintainers = [ maintainers.skeidel ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f7e25d6314..9bf619201af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13572,6 +13572,8 @@ let
 
   castle_combat = callPackage ../games/castle-combat { };
 
+  cataclysm-dda = callPackage ../games/cataclysm-dda { };
+
   chessdb = callPackage ../games/chessdb { };
 
   construoBase = lowPrio (callPackage ../games/construo {

From d3ac5c534de18caa487ab3ee341f24a452027294 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 9 Aug 2015 15:17:58 +0200
Subject: [PATCH 0955/2016] ghc: patch start scripts to add 'readelf' and 'cat'
 into $PATH

Fixes https://github.com/NixOS/nixpkgs/issues/8192.
---
 pkgs/development/compilers/ghc/7.10.2.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index f71cd922c10..064610c3557 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv }:
+{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils }:
 
 let
 
@@ -46,6 +46,15 @@ stdenv.mkDerivation rec {
   # that in turn causes GHCi to abort
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
 
+  postInstall = ''
+    # Patch scripts to include "readelf" and "cat" in $PATH.
+    for i in "$out/bin/"*; do
+      test ! -h $i || continue
+      egrep --quiet '^#!' <(head -n 1 $i) || continue
+      sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
+    done
+  '';
+
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";

From b568ca5c9d492cb7f2003a24e74f2fb6c0b9b99e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 9 Aug 2015 16:13:25 +0200
Subject: [PATCH 0956/2016] apcu: init at 4.0.7

closes #6334
---
 pkgs/top-level/php-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index bfd741ccb4b..9fc605be1e3 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -6,6 +6,12 @@ let self = with self; {
     inherit (pkgs) stdenv autoreconfHook fetchurl;
   };
 
+  apcu = buildPecl {
+    name = "apcu-4.0.7";
+
+    sha256 = "1mhbz56mbnq7dryf2d64l84lj3fpr5ilmg2424glans3wcg772hp";
+  };
+
   memcache = buildPecl {
     name = "memcache-3.0.8";
 

From 2c9c135ee23f831960a5ae234196aa8c5332c75e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 9 Aug 2015 16:14:52 +0200
Subject: [PATCH 0957/2016] calibre: update from 2.33.0 to 2.34.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 4c15ccc0428..8cad0a95ec9 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.33.0";
-  version = "2.33.0";
+  name = "calibre-${version}";
+  version = "2.34.0";
 
   src = fetchurl {
     url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "0j1micmjffi6rsn3ayblnz0wq648v05ckbn1qsiz086iaj2285q9";
+    sha256 = "04khi2jz7jrp6ppax57648sjkczvcxfqyzlyvhw155ggmpg8fiki";
   };
 
   inherit python;

From c47e89623b168bc4058e10f08bf8ebd71cab366e Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 9 Aug 2015 14:40:01 +0200
Subject: [PATCH 0958/2016] Update option-usages.nix expression to work with
 newer version of the module system.

---
 lib/modules.nix                     |   2 +-
 nixos/lib/eval-config.nix           |   4 +-
 nixos/maintainers/option-usages.nix | 174 +++++++++++++++++++++-------
 3 files changed, 138 insertions(+), 42 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index a40f02dcc3d..3e4d0547ecc 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -55,7 +55,7 @@ rec {
         };
       };
 
-      closed = closeModules (modules ++ [ internalModule ]) (specialArgs // { inherit config options; lib = import ./.; });
+      closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options; lib = import ./.; } // specialArgs);
 
       # Note: the list of modules is reversed to maintain backward
       # compatibility with the old module system.  Not sure if this is
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 97cb85a957f..3e07df6c086 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -17,6 +17,8 @@
   baseModules ? import ../modules/module-list.nix
 , # !!! See comment about args in lib/modules.nix
   extraArgs ? {}
+, # !!! See comment about args in lib/modules.nix
+  specialArgs ? {}
 , modules
 , # !!! See comment about check in lib/modules.nix
   check ? true
@@ -47,7 +49,7 @@ in rec {
     inherit prefix check;
     modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
     args = extraArgs;
-    specialArgs = { modulesPath = ../modules; };
+    specialArgs = { modulesPath = ../modules; } // specialArgs;
   }) config options;
 
   # These are the extra arguments passed to every module.  In
diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix
index 7413b9e18ce..854ecf7eac5 100644
--- a/nixos/maintainers/option-usages.nix
+++ b/nixos/maintainers/option-usages.nix
@@ -1,59 +1,125 @@
 { configuration ? import ../lib/from-env.nix "NIXOS_CONFIG" <nixos-config>
 
-# []: display all options
-# [<option names>]: display the selected options
-, displayOptions ? [
-    "hardware.pcmcia.enable"
-    "environment.systemPackages"
-    "boot.kernelModules"
-    "services.udev.packages"
-    "jobs"
-    "environment.etc"
-    "system.activationScripts"
-  ]
+# provide an option name, as a string literal.
+, testOption ? null
+
+# provide a list of option names, as string literals.
+, testOptions ? [ ]
 }:
 
-# This file is used to generate a dot graph which contains all options and
-# there dependencies to track problems and their sources.
+# This file is made to be used as follow:
+#
+#   $ nix-instantiate ./option-usage.nix --argstr testOption service.xserver.enable -A txtContent --eval
+#
+# or
+#
+#   $ nix-build ./option-usage.nix --argstr testOption service.xserver.enable -A txt -o service.xserver.enable._txt
+#
+# otther target exists such as, `dotContent`, `dot`, and `pdf`.  If you are
+# looking for the option usage of multiple options, you can provide a list
+# as argument.
+#
+#   $ nix-build ./option-usage.nix --arg testOptions \
+#      '["boot.loader.gummiboot.enable" "boot.loader.gummiboot.timeout"]' \
+#      -A txt -o gummiboot.list
+#
+# Note, this script is slow as it has to evaluate all options of the system
+# once per queried option.
+#
+# This nix expression works by doing a first evaluation, which evaluates the
+# result of every option.
+#
+# Then, for each queried option, we evaluate the NixOS modules a second
+# time, except that we replace the `config` argument of all the modules with
+# the result of the original evaluation, except for the tested option which
+# value is replaced by a `throw` statement which is caught by the `tryEval`
+# evaluation of each option value.
+#
+# We then compare the result of the evluation of the original module, with
+# the result of the second evaluation, and consider that the new failures are
+# caused by our mutation of the `config` argument.
+#
+# Doing so returns all option results which are directly using the
+# tested option result.
+
+with import ../../lib;
 
 let
 
   evalFun = {
-    extraArgs ? {}
+    specialArgs ? {}
   }: import ../lib/eval-config.nix {
        modules = [ configuration ];
-       inherit extraArgs;
+       inherit specialArgs;
      };
 
   eval = evalFun {};
   inherit (eval) pkgs;
 
-  reportNewFailures = old: new: with pkgs.lib;
+  excludedTestOptions = [
+    # We cannot evluate _module.args, as it is used during the computation
+    # of the modules list.
+    "_module.args"
+
+    # For some reasons which we yet have to investigate, some options cannot
+    # be replaced by a throw without cuasing a non-catchable failure.
+    "networking.bonds"
+    "networking.bridges"
+    "networking.interfaces"
+    "networking.macvlans"
+    "networking.sits"
+    "networking.vlans"
+    "services.openssh.startWhenNeeded"
+  ];
+
+  # for some reasons which we yet have to investigate, some options are
+  # time-consuming to compute, thus we filter them out at the moment.
+  excludedOptions = [
+    "boot.systemd.services"
+    "systemd.services"
+    "environment.gnome3.packageSet"
+    "kde.extraPackages"
+  ];
+  excludeOptions = list:
+    filter (opt: !(elem (showOption opt.loc) excludedOptions)) list;
+
+
+  reportNewFailures = old: new:
     let
       filterChanges =
         filter ({fst, snd}:
-          !(fst.config.success -> snd.config.success)
+          !(fst.success -> snd.success)
         );
 
       keepNames =
         map ({fst, snd}:
-          assert fst.name == snd.name; snd.name
+          /* assert fst.name == snd.name; */ snd.name
         );
+
+      # Use  tryEval (strict ...)  to know if there is any failure while
+      # evaluating the option value.
+      #
+      # Note, the `strict` function is not strict enough, but using toXML
+      # builtins multiply by 4 the memory usage and the time used to compute
+      # each options.
+      tryCollectOptions = moduleResult:
+        flip map (excludeOptions (collect isOption moduleResult)) (opt:
+          { name = showOption opt.loc; } // builtins.tryEval (strict opt.value));
      in
        keepNames (
          filterChanges (
-           zipLists (collect isOption old) (collect isOption new)
+           zipLists (tryCollectOptions old) (tryCollectOptions new)
          )
        );
 
 
   # Create a list of modules where each module contains only one failling
   # options.
-  introspectionModules = with pkgs.lib;
+  introspectionModules =
     let
       setIntrospection = opt: rec {
-        name = opt.name;
-        path = splitString "." opt.name;
+        name = showOption opt.loc;
+        path = opt.loc;
         config = setAttrByPath path
           (throw "Usage introspection of '${name}' by forced failure.");
       };
@@ -61,39 +127,67 @@ let
       map setIntrospection (collect isOption eval.options);
 
   overrideConfig = thrower:
-    pkgs.lib.recursiveUpdateUntil (path: old: new:
+    recursiveUpdateUntil (path: old: new:
       path == thrower.path
     ) eval.config thrower.config;
 
 
-  graph = with pkgs.lib;
+  graph =
     map (thrower: {
       option = thrower.name;
-      usedBy = reportNewFailures eval.options (evalFun {
-        extraArgs = {
-          config = overrideConfig thrower;
-        };
-      }).options;
+      usedBy = assert __trace "Investigate ${thrower.name}" true;
+        reportNewFailures eval.options (evalFun {
+          specialArgs = {
+            config = overrideConfig thrower;
+          };
+        }).options;
     }) introspectionModules;
 
-  graphToDot = graph: with pkgs.lib; ''
+  displayOptionsGraph =
+     let
+       checkList =
+         if !(isNull testOption) then [ testOption ]
+         else testOptions;
+       checkAll = checkList == [];
+     in
+       flip filter graph ({option, usedBy}:
+         (checkAll || elem option checkList)
+         && !(elem option excludedTestOptions)
+       );
+
+  graphToDot = graph: ''
     digraph "Option Usages" {
       ${concatMapStrings ({option, usedBy}:
-          assert __trace option true;
-          if displayOptions == [] || elem option displayOptions then
-            concatMapStrings (user: ''
-              "${option}" -> "${user}"''
-            ) usedBy
-          else ""
-        ) graph}
+          concatMapStrings (user: ''
+            "${option}" -> "${user}"''
+          ) usedBy
+        ) displayOptionsGraph}
     }
   '';
 
+  graphToText = graph:
+    concatMapStrings ({option, usedBy}:
+        concatMapStrings (user: ''
+          ${user}
+        '') usedBy
+      ) displayOptionsGraph;
+
 in
 
-pkgs.texFunctions.dot2pdf {
-  dotGraph = pkgs.writeTextFile {
+rec {
+  dotContent = graphToDot graph;
+  dot = pkgs.writeTextFile {
     name = "option_usages.dot";
-    text = graphToDot graph;
+    text = dotContent;
+  };
+
+  pdf = pkgs.texFunctions.dot2pdf {
+    dotGraph = dot;
+  };
+
+  txtContent = graphToText graph;
+  txt = pkgs.writeTextFile {
+    name = "option_usages.txt";
+    text = txtContent;
   };
 }

From 201650325c74484c01a10d4737d5b1e9d36e0e2e Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 9 Aug 2015 18:37:08 +0200
Subject: [PATCH 0959/2016] ardour: 4.0 -> 4.1

---
 pkgs/applications/audio/ardour/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 5327b6b77d7..2338af6ec99 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
+{ stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
 , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
@@ -15,24 +15,25 @@ let
   # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
 
   # Version to build.
-  tag = "4.0";
+  tag = "4.1";
 
   # Version info that is built into the binary. Keep in sync with 'tag'. The
   # last 8 digits is a (fake) commit id.
-  revision = "4.0-e1aa66cb3f";
+  revision = "4.1-fe672c8";
 
 in
 
 stdenv.mkDerivation rec {
   name = "ardour-${tag}";
 
-  src = fetchgit {
-    url = git://git.ardour.org/ardour/ardour.git;
-    rev = "e1aa66cb3f";
-    sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c";
+  src = fetchFromGitHub {
+    owner = "Ardour";
+    repo = "ardour";
+    rev = "fe672c827cb2c08c94b1fa7e527d884c522a1af7";
+    sha256 = "12yfy9l5mnl96ix4s2qicp3m2zscli1a4bd50nk9v035pgf77s3f";
   };
 
-  buildInputs = 
+  buildInputs =
     [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
       glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo
       libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate

From fa2ee81a92f808cfa93e35339344747dd2f2a38a Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Sun, 9 Aug 2015 20:58:39 +0300
Subject: [PATCH 0960/2016] xpra: 0.14.19 -> 0.15.3

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

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index a18ee18668b..ef8b224c612 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -6,12 +6,12 @@
 , libfakeXinerama }:
 
 buildPythonPackage rec {
-  name = "xpra-0.14.19";
+  name = "xpra-0.15.3";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://www.xpra.org/src/${name}.tar.xz";
-    sha256 = "0jifaysz4br1v0zibnzgd0k02rgybbsysvwrgbar1452sjb3db5m";
+    sha256 = "1671r4ah2h0i3qbp27csck506n5y1zr9fv0869cv09knspa358i4";
   };
 
   buildInputs = [

From 230a448fe6b4b5dcfdccb1ad9a7490a2d1a9954b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 14:58:45 +0200
Subject: [PATCH 0961/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/5d8c308f9f1b9cd67d32bdd83903d65ce6a41d00
 with hackage2nix revision v20150807-15-ge2a125b

---
 .../haskell-modules/hackage-packages.nix      | 94 +++++++++----------
 1 file changed, 46 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f21e78a642e..27345770034 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -15448,8 +15448,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "TypeNat";
-       version = "0.2.1.0";
-       sha256 = "01dsw64zzwbkvm7q4jwyidjvxbkx6fvx8hhn70d2bpdxxammnxry";
+       version = "0.4.0.0";
+       sha256 = "0v6xd98nwl7zg5q5xmlrgzsb3219vcwj8rfacdyzdb9xpq5l9dnv";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/avieth/TypeNat";
@@ -29334,8 +29334,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "0.9.4";
-       sha256 = "1l1nqf8878kmmdc5ssrpn52cszn9w0ym70pjjbaprpa1c7mdbziy";
+       version = "0.9.5";
+       sha256 = "0l4s0j75ianggpl3hbqrr3zp7v9jjgd5646ydqbcg040win20lzh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29420,8 +29420,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.30";
-       sha256 = "07wv05fi9sgh8v9239c4rvwrxrmwk7awmk5hpcnpyx8yj8z9z7q5";
+       version = "4.30.2";
+       sha256 = "1vafxq1h2nispc7jdckxy2c746ikh60cscg9rrrbvs01wvjam9xw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42863,8 +42863,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-hsqml";
-       version = "0.1.0.0";
-       sha256 = "1j1n9bamb1fyfgbmiyqssyzh93fahmg48yb7z3z18rrxmn04rnax";
+       version = "0.2.0.0";
+       sha256 = "0f84919h7k93nnzgr2k9jp08qsgs2dgzihavmz2g9q1c6d53q6v0";
        libraryHaskellDepends = [
          base colour containers diagrams-core diagrams-lib hsqml lens text
          transformers
@@ -55649,18 +55649,17 @@ self: {
      }) {};
 
   "ghcjs-dom" = callPackage
-    ({ mkDerivation, base, glib, gtk, mtl, text, transformers, webkit
-     }:
+    ({ mkDerivation, base, ghcjs-base, mtl, text }:
      mkDerivation {
        pname = "ghcjs-dom";
        version = "0.1.1.3";
        sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly";
-       libraryHaskellDepends = [
-         base glib gtk mtl text transformers webkit
-       ];
+       libraryHaskellDepends = [ base ghcjs-base mtl text ];
+       jailbreak = true;
        description = "DOM library that supports both GHCJS and WebKitGTK";
        license = stdenv.lib.licenses.mit;
-     }) {};
+       broken = true;
+     }) { ghcjs-base = null;};
 
   "ghcjs-dom-hello" = callPackage
     ({ mkDerivation, base, ghcjs-dom, mtl }:
@@ -81008,21 +81007,20 @@ self: {
      }) {};
 
   "jsaddle" = callPackage
-    ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell
-     , text, transformers, webkitgtk3, webkitgtk3-javascriptcore
+    ({ mkDerivation, base, hslogger, lens, template-haskell, text
+     , transformers
      }:
      mkDerivation {
        pname = "jsaddle";
        version = "0.2.0.6";
        sha256 = "1ggnhv9lgsd330p1k6zvg20dbqb1ysh282nalxramqvn2yhmqsx4";
        libraryHaskellDepends = [
-         base lens template-haskell text transformers webkitgtk3
-         webkitgtk3-javascriptcore
+         base lens template-haskell text transformers
        ];
        testHaskellDepends = [
-         base glib gtk3 hslogger lens template-haskell text transformers
-         webkitgtk3 webkitgtk3-javascriptcore
+         base hslogger lens template-haskell text transformers
        ];
+       jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -81286,8 +81284,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc";
-       version = "0.6.1.0";
-       sha256 = "1vm6x08xqsw7sd3s0cq8i4hxagyxxc5jwypc80nv2rcdnyyhdmf7";
+       version = "0.6.2.0";
+       sha256 = "1d9w18x9l0iyq5br1xgjaxkclcmrw56nlkifqkcv9fgsividhyw3";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit conduit-extra deepseq
          hashable lifted-async monad-control monad-logger mtl QuickCheck stm
@@ -92402,19 +92400,19 @@ self: {
   "moesocks" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , containers, cryptohash, hslogger, HsOpenSSL, lens, mtl, network
-     , optparse-applicative, random, safe, stm, text, transformers, unix
-     , unordered-containers
+     , optparse-applicative, random, safe, stm, text, time, transformers
+     , unix, unordered-containers
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.11";
-       sha256 = "1qmgsps9c6hcpb1y1z6jb0bjl51apll8s1vg6arz8kma98dkd79d";
+       version = "0.1.0.12";
+       sha256 = "1f31qd4lgc2li9q7cf7zx700v23sln9wxfd7yaw0d2q0qmqj2zvi";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson async attoparsec base binary bytestring containers cryptohash
          hslogger HsOpenSSL lens mtl network optparse-applicative random
-         safe stm text transformers unix unordered-containers
+         safe stm text time transformers unix unordered-containers
        ];
        homepage = "https://github.com/nfjinjing/moesocks";
        description = "A functional firewall killer";
@@ -94328,14 +94326,14 @@ self: {
 
   "mtl-unleashed" = callPackage
     ({ mkDerivation, base, contravariant, hspec, hspec-core, lens, mtl
-     , profunctors
+     , profunctors, tagged
      }:
      mkDerivation {
        pname = "mtl-unleashed";
-       version = "0.3";
-       sha256 = "1rirgbs4b7q7yjnvdw1j2y6nmym47adm8lcl0xysxi2hhhvs8r9c";
+       version = "0.3.1";
+       sha256 = "04kbm0lxfwv34991384blz8a4qjwl32jv0d3x6rvgpjlidphfi2l";
        libraryHaskellDepends = [
-         base contravariant lens mtl profunctors
+         base contravariant lens mtl profunctors tagged
        ];
        testHaskellDepends = [
          base contravariant hspec hspec-core lens mtl profunctors
@@ -107864,8 +107862,8 @@ self: {
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20150804";
-       sha256 = "06b311vdwihqhdwf2zr0akndgyaxycli7lymzzyfbn0rhhx1g2kn";
+       version = "0.20150808";
+       sha256 = "1dcmi45vz9m4asf7i8bw6qigdcd2f7f48dmm2bq4w4dsjrp247dk";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -112359,8 +112357,8 @@ self: {
     ({ mkDerivation, base, hmatrix, repa, vector }:
      mkDerivation {
        pname = "repa-linear-algebra";
-       version = "0.0.0.0";
-       sha256 = "1y16rmdygxay46xbm617g944aazml48izzmkx46avvqvjyql96w1";
+       version = "0.1.0.0";
+       sha256 = "06lvp3sj6w4kvw6qhn5wcy2c2v7w15jaicw1pm14ssxhs4xl866g";
        libraryHaskellDepends = [ base hmatrix repa vector ];
        homepage = "https://github.com/marcinmrotek/repa-linear-algebra";
        description = "HMatrix operations for Repa";
@@ -133960,8 +133958,8 @@ self: {
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "type-list";
-       version = "0.1.0.0";
-       sha256 = "0y5qa882rcrlq13mfsp8yzbn6fqsc2clii2qjhk1nmg8ivqf026v";
+       version = "0.2.0.0";
+       sha256 = "19akcmjn1jgcxfsyw49pfydil47vh5zp99rb8qsyhmlv7x9czc03";
        libraryHaskellDepends = [ base singletons ];
        description = "Operations on type-level lists and tuples";
        license = stdenv.lib.licenses.bsd3;
@@ -140102,14 +140100,14 @@ self: {
 
   "webkit" = callPackage
     ({ mkDerivation, base, bytestring, cairo, glib, gtk
-     , gtk2hs-buildtools, mtl, pango, text, webkit
+     , gtk2hs-buildtools, mtl, pango, text, transformers, webkit
      }:
      mkDerivation {
        pname = "webkit";
-       version = "0.13.1.3";
-       sha256 = "00h9465xl6rfnd72cmn68z3mpany63dxl6fm2gqjbdzbrssj7306";
+       version = "0.14.1.0";
+       sha256 = "1mmlsdnq9pws3jhk0gzqdhy8b7zwm80g2cmygahqagvyh7jvb7r4";
        libraryHaskellDepends = [
-         base bytestring cairo glib gtk mtl pango text
+         base bytestring cairo glib gtk mtl pango text transformers
        ];
        libraryPkgconfigDepends = [ webkit ];
        libraryToolDepends = [ gtk2hs-buildtools ];
@@ -140126,6 +140124,7 @@ self: {
        sha256 = "1gj40kdll7pd84graxcrc327za6kgp453zh48srmzvrk9yvnj67x";
        libraryHaskellDepends = [ base glib gtk webkit ];
        libraryToolDepends = [ gtk2hs-buildtools ];
+       jailbreak = true;
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140133,18 +140132,17 @@ self: {
 
   "webkitgtk3" = callPackage
     ({ mkDerivation, base, bytestring, cairo, glib, gtk2hs-buildtools
-     , gtk3, mtl, pango, text, webkit
+     , gtk3, mtl, pango, text, transformers, webkit
      }:
      mkDerivation {
        pname = "webkitgtk3";
-       version = "0.13.1.3";
-       sha256 = "0gfznb6n46576im72m6k9wrwc2n9f48nk4dsaz2llvzlzlzx4zfk";
+       version = "0.14.1.0";
+       sha256 = "16dypc71xh223746cgwa143vqyxymx6dqxk01j3ixpx7ybzr7lnm";
        libraryHaskellDepends = [
-         base bytestring cairo glib gtk3 mtl pango text
+         base bytestring cairo glib gtk3 mtl pango text transformers
        ];
        libraryPkgconfigDepends = [ webkit ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
@@ -141674,8 +141672,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.3.4";
-       sha256 = "03z31c5gnybpfvh3idqimnz90pzbijhrqa8hlikryab148gp1gzn";
+       version = "0.3.5";
+       sha256 = "0ri50cbsh8a67q3frsz6214b73ahmga348my5x5bp6w7likiqnly";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From eb5f4d3d36199d48cd2cf6a5cb0fe2da569e489b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 9 Aug 2015 16:28:12 +0200
Subject: [PATCH 0962/2016] ghc: make sure the HEAD version is built with a
 deterministic version number

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

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index c92f002a026..6c3041f2943 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
 
   postUnpack = ''
     pushd ghc-${builtins.substring 0 7 rev}
+    echo ${version} >VERSION
+    echo ${rev} >GIT_COMMIT_ID
     patchShebangs .
     ./boot
     popd

From bfa187de6821a64efa93c4398fa57c01f63dc739 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 9 Aug 2015 17:52:13 +0200
Subject: [PATCH 0963/2016] ghc-head: bump version to current git HEAD

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

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 6c3041f2943..65d52c1a3e5 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -17,14 +17,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "7.11.20150705";
+  version = "7.11.20150809";
   name = "ghc-${version}";
-  rev = "3fabb71a559b493efdfb5bb91907f6a0f696a114";
+  rev = "a40ec755d8e020cd4b87975f5a751f1e35c36977";
 
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
     inherit rev;
-    sha256 = "1c0fsk2yk08x02n6s722d36igc9prrql4wcnr8m8c62wp4yrf25z";
+    sha256 = "1hh1p9vrd1nrfi56jan4bnlczld2qzx85v7lfb6nara2bhcgqa1l";
   };
 
   postUnpack = ''

From 11f638506a1466455232057c74da3dd171b3dd99 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 9 Aug 2015 21:23:20 +0200
Subject: [PATCH 0964/2016] x42-plugins : 2014-11-01 -> 2015-07-02

---
 pkgs/applications/audio/x42-plugins/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index 5603bc2fefc..1090ee4a61e 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -3,22 +3,17 @@
 , lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:
 
 stdenv.mkDerivation rec {
-  version = "2014-11-01";
+  version = "2015-07-02";
   name = "x42-plugins-${version}";
 
   src = fetchurl {
-    url = "http://gareus.org/misc/x42-plugins/x42-plugins-20141101.tar.xz";
-    sha256 = "0pjdhj58hb4n2053v92l7v7097fjm4xzrl8ks4g1hc7miy98ymdk";
+    url = "http://gareus.org/misc/x42-plugins/x42-plugins-20150702.tar.xz";
+    sha256 = "1mq0grabzbl9xsd53v2qajhr8nngk0d4lx9n0n3nwy95y2gmy6sm";
   };
 
   buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig  zita-convolver];
 
-  makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];
-
-  # remove check for zita-convolver in /usr/
-  patchPhase = ''
-    sed -i "38,42d" convoLV2/Makefile
-  '';
+  makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h" ];
 
   meta = with stdenv.lib;
     { description = "Collection of LV2 plugins by Robin Gareus";

From 417dd5528e8f3afbc8f8cf139699dfe420407bc7 Mon Sep 17 00:00:00 2001
From: Alexei Robyn <shados@shados.net>
Date: Mon, 10 Aug 2015 13:23:26 +1000
Subject: [PATCH 0965/2016] pidgin-opensteamworks: init at v1.5.1 Adds
 pidgin-opensteamworks, a Pidgin plugin to add support for the Steam
 Friends/Steam IM service

---
 .../pidgin-opensteamworks/default.nix         | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
new file mode 100644
index 00000000000..30d90ba302d
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json_glib, nss, nspr, libgnome_keyring } :
+
+stdenv.mkDerivation rec {
+  name = "pidgin-opensteamworks-1.5.1";
+
+  # Temporarily sourcing this from a mirror in my github account, until such time as the project is officially migrated away from the deprecated google code service
+  src = fetchFromGitHub {
+    owner = "Shados";
+    repo = "pidgin-opensteamworks";
+    rev = "4f0ea110a5bdba9d2b18ec8785b2edb276f0cccd";
+    sha256 = "0gcrc1yaf29yjfhpflpn451i7isw8zc7maw77g604815myc5k025";
+  };
+
+  preConfigure = "cd steam-mobile";
+  postInstall = ''
+    mkdir -p $out/lib/pidgin/
+    mkdir -p $out/share/pixmaps/pidgin/protocols/
+    cp libsteam.so $out/lib/pidgin/
+    unzip releases/icons.zip -d $out/share/pixmaps/pidgin/protocols/
+  '';
+
+  buildInputs = [ pidgin unzip glib json_glib nss nspr libgnome_keyring ];
+
+  meta = with stdenv.lib; {
+    homepage = https://code.google.com/p/pidgin-opensteamworks;
+    description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainters = with maintainers; [ arobyn ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bf619201af..a4c13aa8cfe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12396,6 +12396,8 @@ let
 
   toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { };
 
+  pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { };
+
   pithos = callPackage ../applications/audio/pithos {
     pythonPackages = python34Packages;
   };

From 5ad448df3a8848ed870b1efafefd5166eaacd2c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Aug 2015 09:10:35 +0200
Subject: [PATCH 0966/2016] enableDebugging: use more suitable gcc flags

-ggdb is supposed to provide better symbol information when used with gdb
-Og is the recommended optimization level for debugging purposes
---
 pkgs/stdenv/adapters.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 480801d0d01..836dedf1cb1 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -224,7 +224,7 @@ rec {
   keepDebugInfo = stdenv: stdenv //
     { mkDerivation = args: stdenv.mkDerivation (args // {
         dontStrip = true;
-        NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -g -O0";
+        NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -ggdb -Og";
       });
     };
 

From b8c77ce372c692268e98367f83bfc2c80d9ac5af Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 10 Aug 2015 11:36:08 +0200
Subject: [PATCH 0967/2016] pecita: fix sha256 changed upstream

---
 pkgs/data/fonts/pecita/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index e28ac6c2618..3e5ad1655be 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://pecita.eu/b/Pecita.otf";
-    sha256 = "11v5yzxa38fxpz8j3fc0v3l7py4i12avjnwrgkmd9clq9jhzk78s";
+    sha256 = "0agml1886jvb0j6jar8hjx4hfbz3n0msszyp625b96ilv09qrcyz";
   };
 
   phases = ["installPhase"];

From 2c2a4cd099329c99736b6a5cf9733d9d661b8b9e Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@daemon.hole.ru>
Date: Mon, 10 Aug 2015 14:18:15 +0300
Subject: [PATCH 0968/2016] Revert "vault: init at v0.1.2"

This reverts commit 41bbb904ebc930cd35558b299519a3c963b62929.
---
 pkgs/servers/vault/default.nix  | 48 ---------------------------------
 pkgs/top-level/all-packages.nix |  2 --
 2 files changed, 50 deletions(-)
 delete mode 100644 pkgs/servers/vault/default.nix

diff --git a/pkgs/servers/vault/default.nix b/pkgs/servers/vault/default.nix
deleted file mode 100644
index ddaaca8083b..00000000000
--- a/pkgs/servers/vault/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchgit, go, gox }:
-
-let
-  name = "vault";
-  version = "0.1.2";
-  namespace = "github.com/hashicorp/vault";
-in
-stdenv.mkDerivation rec {
-  name = "vault-${version}";
-  rev = "v${version}";
-
-  src = fetchgit {
-    url = "https://github.com/hashicorp/vault";
-    sha256 = "a4267105dab56c6d0571f69ea0abc167c5debd3b6c0795b8b69e15a285e12f01";
-    rev = "refs/tags/${rev}";
-  };
-
-  buildInputs = [ go gox ];
-
-  buildPhase = ''
-    mkdir -p "$(dirname Godeps/_workspace/src/${namespace})"
-    ln -sf $src "Godeps/_workspace/src/${namespace}"
-    export GOPATH=$PWD/Godeps/_workspace
-    XC_OS=$(go env GOOS)
-    XC_ARCH=$(go env GOARCH)
-    mkdir -p bin/
-    gox \
-      -os "$XC_OS" \
-      -arch "$XC_ARCH" \
-      -ldflags "-X github.com/hashicorp/vault/cli.GitCommit ${rev}" \
-      -output $PWD/bin/vault \
-      -verbose \
-      .
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/vault $out/bin/vault
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "https://www.vaultproject.io";
-    description = "A tool for securely accessing secrets";
-    maintainers = with maintainers; [ avnik ];
-    license     = licenses.mit ;
-    platforms   = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4c13aa8cfe..1b7a41250de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15032,8 +15032,6 @@ let
 
   utf8proc = callPackage ../development/libraries/utf8proc { };
 
-  vault = callPackage ../servers/vault {};
-
   vbam = callPackage ../misc/emulators/vbam {
     inherit (xlibs) libpthreadstubs;
   };

From 2d0286f8f25e0df8eded78ee1da39bef95b2059d Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@daemon.hole.ru>
Date: Mon, 10 Aug 2015 14:18:40 +0300
Subject: [PATCH 0969/2016] vault: Propagate from goPackages to top-level

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b7a41250de..913949edea2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15032,6 +15032,8 @@ let
 
   utf8proc = callPackage ../development/libraries/utf8proc { };
 
+  vault = goPackages.vault;
+
   vbam = callPackage ../misc/emulators/vbam {
     inherit (xlibs) libpthreadstubs;
   };

From cf1b771b2e2de259ad42c4e9da44fde462770c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 10 Aug 2015 15:57:24 +0200
Subject: [PATCH 0970/2016] lyx: maintenance update

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

diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 27830b9baee..fcde5ed3abd 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.1.3";
+  version = "2.1.4";
   name = "lyx-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${name}.tar.xz";
-    sha256 = "10jnqz7ilxppv60h0hpkq7wgc3fbcm3z19xhnqz9hwp3brz2xm9g";
+    sha256 = "0apkir1rw3msdpps0y0c8skr293h6c4l48c1vx0w4brz337lhdfi";
   };
 
   configureFlags = [

From 4af085c4d2152fb4469ffed5b12ff5f9a9aea296 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 10 Aug 2015 13:37:12 +0200
Subject: [PATCH 0971/2016] rustcMaster: 2015-07-28 -> 2015-08-09

---
 pkgs/development/compilers/rustc/head.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 9d415eed0b4..d65258a3a08 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -1,16 +1,16 @@
 { stdenv, callPackage }:
 callPackage ./generic.nix {
-  shortVersion = "2015-07-28";
+  shortVersion = "2015-08-09";
   isRelease = false;
-  # src rev for 2015-07-28's nightly channel
-  srcRev = "8b835572b";
-  srcSha = "1qrw0vszr1zipsbp7gcm8kik73d2bfxwv6mniv81ygn9i7v76wfz";
-  snapshotHashLinux686 = "93f6216a35d3bed3cedf244c9aff4cd716336bd9";
-  snapshotHashLinux64 = "d8f4967fc71a153c925faecf95a7feadf7e463a4";
-  snapshotHashDarwin686 = "29852c4d4b5a851f16d627856a279cae5bf9bd01";
-  snapshotHashDarwin64 = "1a20259899321062a0325edb1d22990f05d18708";
-  snapshotDate = "2015-07-17";
-  snapshotRev = "d4432b3";
+  # 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;

From 8b91812de6c61ab79eef8c33f2900969ccfb5a63 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 10 Aug 2015 15:01:34 -0400
Subject: [PATCH 0972/2016] pipework: init at 2015-07-30

Pipework lets you connect together containers in arbitrarily complex
scenarios. Pipework uses cgroups and namespace and works with "plain"
LXC containers (created with lxc-start), and with the awesome Docker.
---
 pkgs/os-specific/linux/pipework/default.nix | 28 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/os-specific/linux/pipework/default.nix

diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix
new file mode 100644
index 00000000000..225515cb70a
--- /dev/null
+++ b/pkgs/os-specific/linux/pipework/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper
+, bridge-utils, iproute, lxc, openvswitch, docker, busybox, dhcpcd, dhcp
+}:
+
+stdenv.mkDerivation rec {
+  name = "pipework-${version}";
+  version = "2015-07-30";
+  src = fetchFromGitHub {
+    owner = "jpetazzo";
+    repo = "pipework";
+    rev = "5a46ecb5f8f933fd268ef315f58a1eb1c46bd93d";
+    sha256 = "02znyg5ir37s8xqjcqqz6xnwyqxapn7c4scyqkcapxr932hf1frh";
+  };
+  buildInputs = [ makeWrapper ];
+  installPhase = ''
+    mkdir -p $out/bin
+    cp pipework $out/bin
+    wrapProgram $out/bin/pipework --prefix PATH : \
+      ${lib.makeSearchPath "bin" [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]};
+  '';
+  meta = with lib; {
+    description = "Software-Defined Networking tools for LXC";
+    homepage = "https://github.com/jpetazzo/pipework";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 913949edea2..f3e5d961dbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10064,6 +10064,8 @@ let
 
   perf-tools = callPackage ../os-specific/linux/perf-tools { };
 
+  pipework = callPackage ../os-specific/linux/pipework { };
+
   plymouth = callPackage ../os-specific/linux/plymouth { };
 
   pmount = callPackage ../os-specific/linux/pmount { };

From c2f5d1abed7429c0ba321522e0e71bb8bc676ebe Mon Sep 17 00:00:00 2001
From: Boris Sukholitko <boriss@gmail.com>
Date: Mon, 10 Aug 2015 20:34:09 +0300
Subject: [PATCH 0973/2016] nsjail: init at 8b951e6

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

diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix
new file mode 100644
index 00000000000..f2ec3af139f
--- /dev/null
+++ b/pkgs/tools/security/nsjail/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "nsjail-git-2015-08-10";
+
+  src = fetchgit {
+    url = https://github.com/google/nsjail;
+    rev = "8b951e6c2827386786cde4a124cd1846d25b9404";
+    sha256 = "b3b863423cc676111d2d1afbac524eee6fa824588cafccb7c42ff470508a13b1";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp nsjail $out/bin
+  '';
+
+  meta = {
+    description = ''
+      A light-weight process isolation tool, making use of Linux namespaces
+      and seccomp-bpf syscall filters
+      '';
+    homepage = http://google.github.io/nsjail;
+
+    license = stdenv.lib.licenses.apsl20;
+
+    maintainers = [ stdenv.lib.maintainers.bosu ];
+
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 913949edea2..c9b0009373d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2417,6 +2417,8 @@ let
     pythonPackages = python3Packages;
   };
 
+  nsjail = callPackage ../tools/security/nsjail {};
+
   nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {};
 
   ntfs3g = callPackage ../tools/filesystems/ntfs-3g { };

From 4da188cf540e0e8e5d3b6adf9a2ca070e7a511bb Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 10 Aug 2015 22:02:51 +0200
Subject: [PATCH 0974/2016] openxpki: init at git 2015/08/07

---
 pkgs/servers/openxpki/default.nix           | 77 +++++++++++++++++++++
 pkgs/servers/openxpki/vergen_revision_state | 12 ++++
 pkgs/top-level/all-packages.nix             |  2 +
 3 files changed, 91 insertions(+)
 create mode 100644 pkgs/servers/openxpki/default.nix
 create mode 100644 pkgs/servers/openxpki/vergen_revision_state

diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix
new file mode 100644
index 00000000000..b26c4f12456
--- /dev/null
+++ b/pkgs/servers/openxpki/default.nix
@@ -0,0 +1,77 @@
+{ stdenv, buildPerlPackage, fetchgit, perl, openssl, perlPackages, gettext, python34Packages
+# TODO: Remove extra dependencies once it is clear that they are NOT needed somewhere.
+, extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }:
+
+buildPerlPackage {
+  name = "openxpki-git20150807";
+
+  src = fetchgit {
+    url = "https://github.com/openxpki/openxpki";
+    rev = "5cb76c553b6b1a81ede380857700628a7521f6e3";
+    sha256 = "7c93bdce7a205c58b08c91c249e566e885ed08f9d43cc2ac652c705c1f7e4490";
+  };
+
+  buildInputs = [ perl openssl gettext python34Packages.sphinx ];
+  propagatedBuildInputs = with perlPackages;
+    [ # dependencies from Makefile.PL
+      libintlperl ConfigVersioned LWP TestSimple ClassAccessorChained IOSocketSSL ClassStd
+      CGISession ConfigStd ConfigMerge Connector CryptCBC CryptOpenSSLAES CryptPKCS10
+      DBDMock DataPassword DataSerializer DateTimeFormatDateParse IOPrompt
+      IPCShareLite JSON Log4Perl LWPProtocolconnect LWPProtocolhttps MailRFC822Address
+      Moose NetAddrIP NetDNS NetIP NetLDAP NetHTTP NetServer NetSSLeay ParamsValidate PathClass
+      ProcProcessTable ProcSafeExec RegexpCommon SOAPLite Switch SysSigAction TemplateToolkit
+      TestPod TestPodCoverage TextCSV_XS TimeHiRes Workflow XMLFilterXInclude XMLParser
+      XMLSAX XMLSAXWriter XMLSimple XMLValidatorSchema ]
+    ++ stdenv.lib.optionals extraDependencies1
+    [ # dependencies from parsing through core/server
+      ClassAccessor Carp PathTools DataDumper DateTime DateTimeFormatStrptime DBI DigestMD5
+      DigestSHA Encode ExceptionClass Exporter FilePath FileTemp Filter GetoptLong HTMLParser
+      ScalarListUtils MathBigInt Memoize MIMEBase64 NetSMTP PodUsage RTClientREST Socket
+      Storable XSLoader ]
+    ++ stdenv.lib.optionals extraDependencies2
+    [ # dependencies taken from Debian
+      MooseXTypesPathClass DataStreamBulk MooseXStrictConstructor NamespaceAutoclean GitPurePerl
+      ConfigGitLike DevelStackTrace TreeDAGNode ClassObservable ClassFactory TimeDate ConfigAny
+      CGIFast ClassISA YAML YAMLLibYAML AuthenSASL TextCSV FileFindRulePerl IODigest ]
+    ++ stdenv.lib.optionals extraDependencies3
+    [ # dependencies taken from http://search.cpan.org/~alech/Bundle-OpenXPKI-0.06/lib/Bundle/OpenXPKI.pm
+      AttributeHandlers AttributeParamsValidate AutoLoader BC CGI CPAN CacheCache ClassClassgenclassgen
+      ClassContainer ClassDataInheritable ClassSingleton ConvertASN1 DBDSQLite DBIxHTMLViewLATEST
+      DBFile DataPage DataSpreadPagination DateTimeLocale DateTimeTimeZone DevelPPPort DevelSelfStubber
+      DevelSymdump Digest DigestSHA1 Env Error ExtUtilsCommand ExtUtilsConstant ExtUtilsInstall
+      ExtUtilsMakeMaker FileCheckTree FilterSimple GoferTransporthttp HTMLMason HTMLTagset
+      HTTPServerSimpleMason I18NCollate IO IPCSysV LocaleCodes LocaleMaketext LogDispatch MathBigRat
+      MathComplex MathRound ModuleBuild ModuleBuildDeprecated NetPing PerlIOviaQuotedPrint PodChecker
+      PodCoverage PodEscapes PodLaTeX PodParser PodPerldoc PodPlainer PodSimple Safe SearchDict SelfLoader
+      SubUplevel SysSyslog TemplatePluginAutoformat TermANSIColor TermCap TermReadKey Test TestException
+      TestHTTPServerSimple TestHarness TestHarnessStraps TextAbbrev TextBalanced TextIconv TextSoundex
+      TextTabsWrap ThreadQueue ThreadSemaphore TieFile TieRefHash TimeLocal URI UnicodeCollate
+      UnicodeNormalize WWWMechanize Want XMLFilterBufferText XMLNamespaceSupport autodie base bignum if_
+      lib libapreq2 libnet podlators threads threadsshared version ];
+
+  preConfigure = ''
+    export OPENSSL_PREFIX=${openssl}
+    substituteInPlace tools/vergen --replace "#!/usr/bin/perl" "#!${perl}/bin/perl"
+    cp ${./vergen_revision_state} .vergen_revision_state
+    cd core/server
+    '';
+
+  postInstall = ''
+    mkdir -p $out/share/openxpki
+    cp -r ../htdocs_source $out/share/openxpki/.
+    cp -r ../../config $out/share/openxpki/.
+    cp -r ../../qatest $out/share/openxpki/.
+    (cd ../i18n; make scan; make; make install PREFIX=$out)
+    (cd ../../clients/perl/OpenXPKI-Client-Enrollment; perl Makefile.PL PREFIX=$out; make; make install PREFIX=$out)
+    (cd ../../doc; make html man; cp _build/man/* $out/share/man/man1/.; mkdir -p $out/share/openxpki/doc; cp -r _build/{html,doctrees} $out/share/openxpki/doc/.)
+    '';
+
+  doCheck = false;
+
+  meta = {
+    homepage = "http://www.openxpki.org";
+    description = "Enterprise-grade PKI/Trustcenter software";
+    license = stdenv.lib.licences.apache20;
+    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+  };
+}
diff --git a/pkgs/servers/openxpki/vergen_revision_state b/pkgs/servers/openxpki/vergen_revision_state
new file mode 100644
index 00000000000..9a5d7b531de
--- /dev/null
+++ b/pkgs/servers/openxpki/vergen_revision_state
@@ -0,0 +1,12 @@
+$revision_info = {
+                   'git-tag' => 'v0.33.0',
+                   'git-tags' => 'v0.33.0',
+                   'git-branch' => 'master',
+                   'git-description-root' => undef,
+                   'git-description' => 'v0.33.0',
+                   'revision' => '1591',
+                   'last-changed-revision' => '1591',
+                   'git-abbreviated-commit-hash' => '5cb76c5',
+                   'git-commit-hash' => '5cb76c553b6b1a81ede380857700628a7521f6e3',
+                   'git-commit-date' => 'Tue, 4 Aug 2015 12:47:29 +0200'
+                 };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cbc36213d2..a0ada98f1bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9030,6 +9030,8 @@ let
 
   opensmtpd = callPackage ../servers/mail/opensmtpd { };
 
+  openxpki = callPackage ../servers/openxpki { };
+
   osrm-backend = callPackage ../servers/osrm-backend { };
 
   osrm-backend_luajit = callPackage ../servers/osrm-backend { luabind = luabind_luajit; };

From 032f0ffdd03fa4d836825bcbb7e89f1abcf7e57f Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 10 Aug 2015 22:01:14 +0200
Subject: [PATCH 0975/2016] perl-packages: add a few new ones

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8f1b0bf3c48..c9b26985780 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -168,6 +168,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ApacheTest = buildPerlPackage {
+    name = "Apache-Test-1.38";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PH/PHRED/Apache-Test-1.38.tar.gz;
+      sha256 = "321717f58636ed0aa85cba6d69fc01e2ccbc90ba71ec2dcc2134d8401af65145";
+    };
+  };
+
   AppCLI = buildPerlPackage {
     name = "App-CLI-0.313";
     src = fetchurl {
@@ -259,6 +267,34 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  AttributeHandlers = buildPerlPackage {
+    name = "Attribute-Handlers-0.99";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Attribute-Handlers-0.99.tar.gz;
+      sha256 = "937ea3ebfc9b14f4a4148bf3c32803709edbd12a387137a26370b38ee1fc9835";
+    };
+    meta = {
+      description = "Simpler definition of attribute handlers";
+      license = "perl";
+    };
+  };
+
+  AttributeParamsValidate = buildPerlPackage {
+    name = "Attribute-Params-Validate-1.21";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/Attribute-Params-Validate-1.21.tar.gz;
+      sha256 = "586b939ceffdb37188b7c461dd1a8f9f35695184c8703b05c35f6d508c8090f5";
+    };
+    buildInputs = [ TestFatal ];
+    propagatedBuildInputs = [ ParamsValidate ];
+    doCheck = false;
+    meta = {
+      homepage = http://metacpan.org/release/Attribute-Params-Validate;
+      description = "Define validation through subroutine attributes";
+      license = "artistic_2";
+    };
+  };
+
   ArrayCompare = buildPerlPackage {
     name = "Array-Compare-1.18";
     src = fetchurl {
@@ -392,6 +428,18 @@ let self = _self // overrides; _self = with self; {
 
   autodie = null; # part of Perl
 
+  AutoLoader = buildPerlPackage {
+    name = "AutoLoader-5.74";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SM/SMUELLER/AutoLoader-5.74.tar.gz;
+      sha256 = "2fac75b05309f71a6871804cd25e1a3ba0a28f43f294fb54528077558da3aff4";
+    };
+    meta = {
+      description = "Load subroutines only on demand";
+      license = "perl";
+    };
+  };
+
   autovivification = buildPerlPackage {
     name = "autovivification-0.12";
     src = fetchurl {
@@ -405,6 +453,39 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  base = buildPerlPackage {
+    name = "base-2.18";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RG/RGARCIA/base-2.18.tar.gz;
+      sha256 = "55b0d21f8edb5ef6dddcb1fd2457acb19c7584f2dfdea614685cd8ea62a1c306";
+    };
+  };
+
+  BC = buildPerlPackage {
+    name = "B-C-1.52";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RU/RURBAN/B-C-1.52.tar.gz;
+      sha256 = "072b4b9e39431ad8ef5173557c26ade97f985cf150f6580a20f42dd9fc3651a7";
+    };
+    propagatedBuildInputs = [ BFlags IPCRun Opcodes ];
+    meta = {
+      homepage = http://www.perl-compiler.org;
+      description = "Perl compiler";
+      license = "perl";
+    };
+  };
+
+  BFlags = buildPerlPackage {
+    name = "B-Flags-0.13";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RU/RURBAN/B-Flags-0.13.tar.gz;
+      sha256 = "6d00f08681772d0abec3aeedb5584910a6df5ced230c1525403a1c7da42f1352";
+    };
+    meta = {
+      description = "Friendlier flags for B";
+    };
+  };
+
   BerkeleyDB = import ../development/perl-modules/BerkeleyDB {
     inherit buildPerlPackage fetchurl;
     inherit (pkgs) db;
@@ -439,6 +520,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  bignum = buildPerlPackage {
+    name = "bignum-0.37";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PJ/PJACKLAM/bignum-0.37.tar.gz;
+      sha256 = "9d2e035222d8b00d062959cb5ae491cb6ce80b7ea0ea8c05e53c415022e4f871";
+    };
+    meta = {
+      description = "Transparent BigNumber support for Perl";
+      license = "perl";
+    };
+  };
+
   BitVector = buildPerlPackage {
     name = "Bit-Vector-7.3";
     src = fetchurl {
@@ -652,6 +745,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Carp = buildPerlPackage {
+    name = "Carp-1.36";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Carp-1.36.tar.gz;
+      sha256 = "dcc789935126461c80df0653f98c1d8d0b936dcc3d04174287cb02767eca123c";
+    };
+    meta = {
+      description = "Alternative warn and die for modules";
+      license = "perl";
+    };
+  };
+
   CarpAlways = buildPerlPackage rec {
     name = "Carp-Always-0.13";
     src = fetchurl {
@@ -1172,6 +1277,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CGI = buildPerlPackage {
+    name = "CGI-4.21";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.21.tar.gz;
+      sha256 = "340d20a2b67211752d7c270c589e463d71aea8b8d75d9417250618219d3cf884";
+    };
+    propagatedBuildInputs = [ HTMLParser if_ ];
+    doCheck = false;
+    meta = {
+      homepage = https://metacpan.org/module/CGI;
+      description = "Handle Common Gateway Interface requests and responses";
+    };
+  };
+
   CGICookieXS = buildPerlPackage rec {
     name = "CGI-Cookie-XS-0.18";
     src = fetchurl {
@@ -1194,6 +1313,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CGIFast = buildPerlPackage {
+    name = "CGI-Fast-2.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.10.tar.gz;
+      sha256 = "98263afcc9f5d88c7cbbd39651c5431b434c1c815fe284962d887ed7be3a1dd3";
+    };
+    propagatedBuildInputs = [ FCGI if_ ];
+    doCheck = false;
+    meta = {
+      homepage = https://metacpan.org/module/CGI::Fast;
+      license = "perl";
+    };
+  };
+
   CGIFormBuilder = buildPerlPackage rec {
     name = "CGI-FormBuilder-3.09";
     src = fetchurl {
@@ -1341,6 +1474,27 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ClassClassgenclassgen = buildPerlPackage {
+    name = "Class-Classgen-classgen-3.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MS/MSCHLUE/Class-Classgen-classgen-3.03.tar.gz;
+      sha256 = "9b65d41b991538992e816b32cc4fa9b4a4a0bb3e9c10e7eebeff82658dbbc8f6";
+    };
+  };
+
+  ClassContainer = buildPerlPackage {
+    name = "Class-Container-0.12";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Class-Container-0.12.tar.gz;
+      sha256 = "771206f2b7a916ce0dfb93d82200472beaeb910248482734179bf36808e486b1";
+    };
+    propagatedBuildInputs = [ ParamsValidate ];
+    meta = {
+      description = "Glues object frameworks together transparently";
+      license = "perl";
+    };
+  };
+
   ClassDataAccessor = buildPerlPackage {
     name = "Class-Data-Accessor-0.04004";
     src = fetchurl {
@@ -1357,6 +1511,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ClassFactory = buildPerlPackage {
+    name = "Class-Factory-1.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PH/PHRED/Class-Factory-1.06.tar.gz;
+      sha256 = "c37a2d269eb935f36a23e113480ae0946fa7c12a12781396a1226c8e435f30f5";
+    };
+  };
+
   ClassFactoryUtil = buildPerlPackage rec {
     name = "Class-Factory-Util-1.7";
     src = fetchurl {
@@ -1487,6 +1649,27 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ClassObservable = buildPerlPackage {
+    name = "Class-Observable-1.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CW/CWINTERS/Class-Observable-1.04.tar.gz;
+      sha256 = "3ef18733a0f03c113f3bcf8ac50476e09ca1fe6234f4aaacaa24dfca95168094";
+    };
+    propagatedBuildInputs = [ ClassISA ];
+  };
+
+  ClassStd = buildPerlPackage {
+    name = "Class-Std-0.013";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CH/CHORNY/Class-Std-0.013.tar.gz;
+      sha256 = "bcd6d82f6c8af0fe069fced7dd165a4795b0b6e92351c7d4e5a1ab9a14fc35c6";
+    };
+    meta = {
+      description = "Support for creating standard 'inside-out' classes";
+      license = "perl";
+    };
+  };
+
   ClassUnload = buildPerlPackage rec {
     name = "Class-Unload-0.08";
     src = fetchurl {
@@ -1531,6 +1714,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CompressBzip2 = buildPerlPackage {
+    name = "Compress-Bzip2-2.22";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.22.tar.gz;
+      sha256 = "1603e284e07953415b8eaa132698db8b03f46383f883c0902926f36eecb7e895";
+    };
+    meta = {
+      description = "Interface to Bzip2 compression library";
+      license = "perl";
+    };
+  };
+
   CompressRawBzip2 = buildPerlPackage {
     name = "Compress-Raw-Bzip2-2.064";
     src = fetchurl {
@@ -1631,6 +1826,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ConfigMerge = buildPerlPackage {
+    name = "Config-Merge-1.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DR/DRTECH/Config-Merge-1.04.tar.gz;
+      sha256 = "a932477b43ae5fb04a16f071a891da7bd2086c10c680592f2888fa9d9972cccf";
+    };
+    buildInputs = [ ConfigAny YAML ];
+    propagatedBuildInputs = [ ConfigAny ];
+    meta = {
+      description = "Load a configuration directory tree containing YAML, JSON, XML, Perl, INI or Config::General files";
+      license = "perl";
+    };
+  };
+
   ConfigMVP = buildPerlPackage {
     name = "Config-MVP-2.200010";
     src = fetchurl {
@@ -1661,6 +1870,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ConfigStd = buildPerlPackage {
+    name = "Config-Std-0.901";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BR/BRICKER/Config-Std-0.901.tar.gz;
+      sha256 = "c5c57eb82a37cc41ea152098fc8e5548acfea8861140fbac8fc3beccbb09c243";
+    };
+    propagatedBuildInputs = [ ClassStd ];
+    meta = {
+      description = "Load and save configuration files in a standard format";
+    };
+  };
+
   ConfigTiny = buildPerlPackage rec {
     name = "Config-Tiny-2.20";
     src = fetchurl {
@@ -1669,6 +1890,30 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ConfigVersioned = buildPerlPackage {
+    name = "Config-Versioned-1.01";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Config-Versioned-1.01.tar.gz;
+      sha256 = "bc9a4ae3738bd89f86a07bca673627ca3c92ba969737cd6dbc7ab7ad17cd2348";
+    };
+    buildInputs = [ DateTime PathClass ];
+    propagatedBuildInputs = [ ConfigStd GitPurePerl Moose ];
+    doCheck = false;
+    meta = {
+      description = "Simple, versioned access to configuration data";
+      license = "perl";
+    };
+  };
+
+  Connector = buildPerlPackage {
+    name = "Connector-1.15";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.15.tar.gz;
+      sha256 = "1p64gnkrik7f21jj0x5di0inmb4s1p33g0mxyk5gvwchkf43pyn4";
+    };
+    doCheck = false;
+  };
+
   ConvertASN1 = buildPerlPackage rec {
     name = "Convert-ASN1-0.26";
     src = fetchurl {
@@ -1740,6 +1985,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CPAN = buildPerlPackage {
+    name = "CPAN-2.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.10.tar.gz;
+      sha256 = "090e9e3d9fca83b89341a75c514c7411b743c887743723dbfe80f30d4ee5f3ad";
+    };
+    propagatedBuildInputs = [ ArchiveZip CompressBzip2 Expect FileHomeDir FileWhich JSONPP LWP ModuleSignature TermReadKey TextGlob YAML YAMLLibYAML YAMLSyck ];
+    meta = {
+      description = "Query, download and build perl modules from CPAN sites";
+      license = "perl";
+    };
+  };
+
   CPANChanges = buildPerlPackage {
     name = "CPAN-Changes-0.27";
     src = fetchurl {
@@ -1912,6 +2170,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CryptPKCS10 = buildPerlPackage {
+    name = "Crypt-PKCS10-1.0";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GK/GKNOCKE/Crypt-PKCS10-1.0.zip;
+      sha256 = "08de199411056df1a1e6374b503574d21089913daa3823ebb21aa399dc59bdb6";
+    };
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ ConvertASN1 ];
+    meta = {
+      license = "perl";
+    };
+  };
+
   CryptRandomSource = buildPerlPackage {
     name = "Crypt-Random-Source-0.07";
     src = fetchurl {
@@ -2083,6 +2354,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DataDumper = buildPerlPackage {
+    name = "Data-Dumper-2.154";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SM/SMUELLER/Data-Dumper-2.154.tar.gz;
+      sha256 = "e30fcb6dea290cda85b67fc46d227a2ea890a8bd36c213557adec9c99ebd212f";
+    };
+  };
+
   DataDumperConcise = buildPerlPackage rec {
     name = "Data-Dumper-Concise-2.020";
     src = fetchurl {
@@ -2148,6 +2427,14 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [TestException ClassAccessorChained];
   };
 
+  DataPassword = buildPerlPackage {
+    name = "Data-Password-1.12";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RA/RAZINF/Data-Password-1.12.tar.gz;
+      sha256 = "830cde81741ff384385412e16faba55745a54a7cc019dd23d7ed4f05d551a961";
+    };
+  };
+
   DataSection = buildPerlPackage {
     name = "Data-Section-0.101622";
     src = fetchurl {
@@ -2174,6 +2461,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DataSpreadPagination = buildPerlPackage {
+    name = "Data-SpreadPagination-0.1.2";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KN/KNEW/Data-SpreadPagination-0.1.2.tar.gz;
+      sha256 = "74ebfd847132c38cc9e835e14e82c43f1809a95cbc98bb84d1f7ce2e4ef487e3";
+    };
+    propagatedBuildInputs = [ DataPage MathRound ];
+    meta = {
+      license = "perl";
+    };
+  };
+
   DataStreamBulk = buildPerlPackage {
     name = "Data-Stream-Bulk-0.11";
     src = fetchurl {
@@ -2320,6 +2619,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DateTimeFormatDateParse = buildPerlPackage {
+    name = "DateTime-Format-DateParse-0.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-0.05.tar.gz;
+      sha256 = "f6eca4c8be66ce9992ee150932f8fcf07809fd3d1664caf200b8a5fd3a7e5ebc";
+    };
+    propagatedBuildInputs = [ DateTime DateTimeTimeZone TimeDate ];
+    meta = {
+      description = "Parses Date::Parse compatible formats";
+      license = "perl";
+    };
+  };
+
   DateTimeFormatFlexible = buildPerlPackage {
     name = "DateTime-Format-Flexible-0.26";
     src = fetchurl {
@@ -2507,6 +2819,19 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ IOCaptureOutput ];
   };
 
+  DevelDProf = buildPerlPackage {
+    name = "Devel-DProf-20110802.00";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FL/FLORA/Devel-DProf-20110802.00.tar.gz;
+      sha256 = "b9eec466ab77aa9f6ab48d33134694d1aa5a8cd221b1aa0a00d09c93ab69643c";
+    };
+    meta = {
+      homepage = http://search.cpan.org/dist/Devel-DProf;
+      description = "A B<DEPRECATED> Perl code profiler";
+      license = "perl";
+    };
+  };
+
   DevelPatchPerl = buildPerlPackage {
     name = "Devel-PatchPerl-1.28";
     src = fetchurl {
@@ -2521,6 +2846,31 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DevelPPPort = buildPerlPackage {
+    name = "Devel-PPPort-3.31";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/W/WO/WOLFSAGE/Devel-PPPort-3.31.tar.gz;
+      sha256 = "ead2c49f0442a26890723231a92d3c0ac6ac297b814839e421a77d7889a2471d";
+    };
+    meta = {
+      description = "Perl/Pollution/Portability";
+      license = "perl";
+    };
+  };
+
+  DevelSelfStubber = buildPerlPackage {
+    name = "Devel-SelfStubber-1.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FL/FLORA/Devel-SelfStubber-1.05.tar.gz;
+      sha256 = "b7bd750e41ec2dbca3f2f1d48e5e8ba594dcc8bc7a923a2565611ab8d0846bf8";
+    };
+    meta = {
+      homepage = http://search.cpan.org/dist/Devel-SelfStubber;
+      description = "Generate stubs for a SelfLoading module";
+      license = "perl";
+    };
+  };
+
   DevelSizeMe = buildPerlPackage {
     name = "Devel-SizeMe-0.19";
     src = fetchurl {
@@ -2547,6 +2897,15 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DBDMock = buildPerlPackage {
+    name = "DBD-Mock-1.45";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DI/DICHI/DBD-Mock/DBD-Mock-1.45.tar.gz;
+      sha256 = "40a80c37b31ef14536b58b4a8b483e65953b00b8fa7397817c7eb76d540bd00f";
+    };
+    propagatedBuildInputs = [ DBI TestException ];
+  };
+
   DBDSQLite = import ../development/perl-modules/DBD-SQLite {
     inherit stdenv fetchurl buildPerlPackage DBI;
     inherit (pkgs) sqlite;
@@ -2689,6 +3048,15 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DBIxHTMLViewLATEST = buildPerlPackage {
+    name = "DBIx-HTMLView-LATEST";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/H/HA/HAKANARDO/DBIx-HTMLView-LATEST.tar.gz;
+      sha256 = "b1af44cba329a8f583d174c5e82a7a2e91fe4f3a35cc38cbf028449578114dfa";
+    };
+    doCheck = false;
+  };
+
   DBIxSimple = buildPerlPackage {
     name = "DBIx-Simple-1.35";
     src = fetchurl {
@@ -2817,6 +3185,18 @@ let self = _self // overrides; _self = with self; {
     ];
   };
 
+  Digest = buildPerlPackage {
+    name = "Digest-1.17";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GA/GAAS/Digest-1.17.tar.gz;
+      sha256 = "2f6a54459fc7f37c0669d548bb224b695eb8d2ddc089aa5547645ce1f5fd86f7";
+    };
+    meta = {
+      description = "Modules that calculate message digests";
+      license = "perl";
+    };
+  };
+
   DigestCRC = buildPerlPackage rec {
     name = "Digest-CRC-0.18";
     src = fetchurl {
@@ -2859,6 +3239,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DigestMD5 = buildPerlPackage {
+    name = "Digest-MD5-2.54";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GA/GAAS/Digest-MD5-2.54.tar.gz;
+      sha256 = "90de11e3743ef1c753a5c2032b434e09472046fbcf346996cbe5d135b217f390";
+    };
+    meta = {
+      description = "Perl interface to the MD-5 algorithm";
+      license = "perl";
+    };
+  };
+
   DigestMD5File = buildPerlPackage {
     name = "Digest-MD5-File-0.08";
     src = fetchurl {
@@ -3414,6 +3806,19 @@ let self = _self // overrides; _self = with self; {
     '' else null;
   };
 
+  Env = buildPerlPackage {
+    name = "Env-1.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FL/FLORA/Env-1.04.tar.gz;
+      sha256 = "d94a3d412df246afdc31a2199cbd8ae915167a3f4684f7b7014ce1200251ebb0";
+    };
+    meta = {
+      homepage = http://search.cpan.org/dist/Env;
+      description = "Perl module that imports environment variables as scalars or arrays";
+      license = "perl";
+    };
+  };
+
   EnvPath = buildPerlPackage {
     name = "Env-Path-0.19";
     src = fetchurl {
@@ -3540,6 +3945,45 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ExtUtilsCommand = buildPerlPackage {
+    name = "ExtUtils-Command-1.20";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Command-1.20.tar.gz;
+      sha256 = "740cccc93ba851aae803695b7a5b65ccbaa78bf4e96aa2e54f3f632c87a98c98";
+    };
+    meta = {
+      homepage = http://search.cpan.org/dist/ExtUtils-Command;
+      description = "Utilities to replace common UNIX commands in Makefiles etc";
+      license = "perl";
+    };
+  };
+
+  Expect = buildPerlPackage {
+    name = "Expect-1.32";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SZ/SZABGAB/Expect-1.32.tar.gz;
+      sha256 = "d1f96842a5c7dd8516b202b530d87a70b65e7054d3bf975c34f6a42084e54e25";
+    };
+    buildInputs = [ TestException ];
+    propagatedBuildInputs = [ IOTty ];
+    meta = {
+      description = "Automate interactions with command line programs that expose a text terminal interface";
+      license = "perl";
+    };
+  };
+
+  Exporter = buildPerlPackage {
+    name = "Exporter-5.72";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TO/TODDR/Exporter-5.72.tar.gz;
+      sha256 = "cd13b7a0e91e8505a0ce4b25f40fab2c92bb28a99ef0d03da1001d95a32f0291";
+    };
+    meta = {
+      description = "Implements default import method for modules";
+      license = "perl";
+    };
+  };
+
   ExtUtilsCBuilder = buildPerlPackage rec {
     name = "ExtUtils-CBuilder-0.280216";
     src = fetchurl {
@@ -3561,6 +4005,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ExtUtilsConstant = buildPerlPackage {
+    name = "ExtUtils-Constant-0.23";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.23.tar.gz;
+      sha256 = "23b77025c8a5d3b93c586d4f0e712bcca3ef934edbee00a78c3fad4285f48eab";
+    };
+  };
+
   ExtUtilsCppGuess = buildPerlModule rec {
     name = "ExtUtils-CppGuess-0.07";
     src = fetchurl {
@@ -3595,6 +4047,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ExtUtilsInstall = buildPerlPackage {
+    name = "ExtUtils-Install-2.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.04.tar.gz;
+      sha256 = "1b2e5370bc63d93cf99a75feb2b9b67227b693d16ebfb730ca90a483145de3b6";
+    };
+    meta = {
+      homepage = https://metacpan.org/release/ExtUtils-Install;
+      description = "Install files from here to there";
+      license = "perl";
+    };
+  };
+
   ExtUtilsInstallPaths = buildPerlPackage {
     name = "ExtUtils-InstallPaths-0.010";
     src = fetchurl {
@@ -3693,6 +4158,15 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ExtUtilsTypemap ExtUtilsParseXS ];
   };
 
+  ExtUtilsXSBuilder = buildPerlPackage {
+    name = "ExtUtils-XSBuilder-0.28";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.28.tar.gz;
+      sha256 = "8cced386e3d544c5ec2deb3aed055b72ebcfc2ea9a6c807da87c4245272fe80a";
+    };
+    propagatedBuildInputs = [ ParseRecDescent TieIxHash ];
+  };
+
   ExtUtilsXSpp = buildPerlModule rec {
     name = "ExtUtils-XSpp-0.1700";
     src = fetchurl {
@@ -3777,6 +4251,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  FileCheckTree = buildPerlPackage {
+    name = "File-CheckTree-4.42";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/File-CheckTree-4.42.tar.gz;
+      sha256 = "66fb417f8ff8a5e5b7ea25606156e70e204861c59fa8c3831925b4dd3f155f8a";
+    };
+    propagatedBuildInputs = [ if_ ];
+    meta = {
+      homepage = http://search.cpan.org/dist/File-CheckTree;
+      description = "Run many filetest checks on a tree";
+      license = "perl";
+    };
+  };
+
   FileCopyRecursive = buildPerlPackage rec {
     name = "File-Copy-Recursive-0.38";
     src = fetchurl {
@@ -3903,6 +4391,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  FilePath = buildPerlPackage {
+    name = "File-Path-2.11";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RI/RICHE/File-Path-2.11.tar.gz;
+      sha256 = "d94492c072d08bdbbd40fd75a1010ff279e99333b63b4308b1f818fe6309dd0f";
+    };
+    meta = {
+      description = "Create or remove directory trees";
+      license = "perl";
+    };
+  };
+
   Filepushd = buildPerlPackage {
     name = "File-pushd-1.005";
     src = fetchurl {
@@ -4005,6 +4505,30 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ TestScript ];
   };
 
+  Filter = buildPerlPackage {
+    name = "Filter-1.55";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.55.tar.gz;
+      sha256 = "7855f5f5f16777c14614b5d907794a170ed4cdeb4382bf03ffca825c8c6bc4a0";
+    };
+    meta = {
+      description = "Source Filters";
+      license = "perl";
+    };
+  };
+
+  FilterSimple = buildPerlPackage {
+    name = "Filter-Simple-0.91";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SM/SMUELLER/Filter-Simple-0.91.tar.gz;
+      sha256 = "c75a4945e94ecfe97e1409f49df036700d2e072e288497e205c4d319a80f694d";
+    };
+    meta = {
+      description = "Simplified source filtering";
+      license = "perl";
+    };
+  };
+
   FinanceQuote = buildPerlPackage rec {
     name = "Finance-Quote-1.37";
     src = fetchurl {
@@ -4142,6 +4666,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  GitPurePerl = buildPerlPackage {
+    name = "Git-PurePerl-0.51";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BR/BROQ/Git-PurePerl-0.51.tar.gz;
+      sha256 = "3775f385ae566ea392ece0913a06ffec46441a1273c19ba9a6d990574ec34d00";
+    };
+    buildInputs = [ Testutf8 ];
+    propagatedBuildInputs = [ ConfigGitLike DataStreamBulk DateTime FileFindRule IODigest Moose MooseXStrictConstructor MooseXTypesPathClass namespaceautoclean ];
+    doCheck = false;
+    meta = {
+      description = "A Pure Perl interface to Git repositories";
+      license = "perl";
+    };
+  };
+
   Glib = buildPerlPackage rec {
     name = "Glib-1.312";
     src = fetchurl {
@@ -4170,6 +4709,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  GoferTransporthttp = buildPerlPackage {
+    name = "GoferTransport-http-1.017";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TI/TIMB/GoferTransport-http-1.017.tar.gz;
+      sha256 = "f73effe3ea7afa1907ce8977c87387abb0d4404f85a724ae2637b29a73154a9b";
+    };
+    propagatedBuildInputs = [ mod_perl2 DBI HTTPMessage LWP URI ];
+    doCheck = false; # no make target 'test'
+    meta = {
+      description = "HTTP transport for DBI stateless proxy driver DBD::Gofer";
+    };
+  };
+
   GoogleProtocolBuffers = buildPerlPackage rec {
     name = "Google-ProtocolBuffers-0.11";
     src = fetchurl {
@@ -4401,6 +4953,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  HTMLMason = buildPerlPackage {
+    name = "HTML-Mason-1.56";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.56.tar.gz;
+      sha256 = "84ac24fb1d551f998145435265e5b6fd4a52ec61e4fadd3d7755eb648be2c4b2";
+    };
+    buildInputs = [ TestDeep ];
+    propagatedBuildInputs = [ CacheCache ClassContainer ExceptionClass HTMLParser LogAny ParamsValidate ];
+    meta = {
+      homepage = http://metacpan.org/release/HTML-Mason;
+      description = "High-performance, dynamic web site authoring system";
+      license = "perl";
+    };
+  };
+
   HTMLParser = buildPerlPackage {
     name = "HTML-Parser-3.71";
     src = fetchurl {
@@ -4659,6 +5226,32 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  HTTPServerSimpleMason = buildPerlPackage {
+    name = "HTTP-Server-Simple-Mason-0.14";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JE/JESSE/HTTP-Server-Simple-Mason-0.14.tar.gz;
+      sha256 = "b7a49d8e6e55bff0b1f0278d951685466b143243b6f9e59e071f5472ca2a025a";
+    };
+    propagatedBuildInputs = [ HTMLMason HTTPServerSimple HookLexWrap ];
+    meta = {
+      description = "A simple mason server";
+      license = "perl";
+    };
+  };
+
+  I18NCollate = buildPerlPackage {
+    name = "I18N-Collate-1.02";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FL/FLORA/I18N-Collate-1.02.tar.gz;
+      sha256 = "9174506bc903eda89690394e3f45558ab7e013114227896d8569d6164648fe37";
+    };
+    meta = {
+      homepage = http://search.cpan.org/dist/I18N-Collate;
+      description = "Compare 8-bit scalar data according to the current locale";
+      license = "perl";
+    };
+  };
+
   I18NLangTags = buildPerlPackage {
     name = "I18N-LangTags-0.35";
     src = fetchurl {
@@ -4712,6 +5305,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  IO = buildPerlPackage {
+    name = "IO-1.25";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GB/GBARR/IO-1.25.tar.gz;
+      sha256 = "89790db8b9281235dc995c1a85d532042ff68a90e1504abd39d463f05623e7b5";
+    };
+    doCheck = false;
+    meta = {
+      description = "Perl core IO modules";
+      license = "perl";
+    };
+  };
+
   IOAll = buildPerlPackage {
     name = "IO-All-0.60";
     src = fetchurl {
@@ -4802,6 +5408,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  IOPrompt = buildPerlPackage {
+    name = "IO-Prompt-0.997002";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DC/DCONWAY/IO-Prompt-0.997002.tar.gz;
+      sha256 = "08ad24f58335ce9696666e4411b2f3cd9c2e1fb72b306b6018c1a13971361ced";
+    };
+    propagatedBuildInputs = [ TermReadKey Want ];
+    doCheck = false; # needs access to /dev/tty
+    meta = {
+      description = "Interactively prompt for user input";
+    };
+  };
+
   IOSocketInet6 = buildPerlPackage rec {
     name = "IO-Socket-INET6-2.72";
     src = fetchurl {
@@ -4911,6 +5530,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  IPCSysV = buildPerlPackage {
+    name = "IPC-SysV-2.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.04.tar.gz;
+      sha256 = "93248930e667034899bf2b09b9a23348e2b800a5437fbb9b4f34c37316da3fcc";
+    };
+    meta = {
+      description = "System V IPC constants and system calls";
+      license = "perl";
+    };
+  };
+
   ImageExifTool = buildPerlPackage rec {
     name = "Image-ExifTool-9.27";
 
@@ -5108,6 +5739,47 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  lib = buildPerlPackage {
+    name = "lib-0.63";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SM/SMUELLER/lib-0.63.tar.gz;
+      sha256 = "72f63db9220098e834d7a38231626bd0c9b802c1ec54a628e2df35f3818e5a00";
+    };
+    meta = {
+      description = "Manipulate @INC at compile time";
+      license = "perl";
+    };
+  };
+
+  libapreq2 = buildPerlPackage {
+    name = "libapreq2-2.13";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/I/IS/ISAAC/libapreq2-2.13.tar.gz;
+      sha256 = "5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e";
+    };
+    buildInputs = [ ApacheTest ExtUtilsXSBuilder mod_perl2 pkgs.apacheHttpd pkgs.apr pkgs.aprutil ];
+    propagatedBuildInputs = [ mod_perl2 ];
+    makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd} --with-apache2-apxs=${pkgs.apacheHttpd}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd}/bin/httpd --with-apr-config=${pkgs.apr}/bin/apr-1-config --with-apu-config=${pkgs.aprutil}/bin/apu-1-config";
+    preConfigure = ''
+      # override broken prereq check
+      substituteInPlace configure --replace "prereq_check=\"\$PERL \$PERL_OPTS build/version_check.pl\"" "prereq_check=\"echo\""
+      '';
+    preBuild = ''
+      substituteInPlace apreq2-config --replace "dirname" "${pkgs.coreutils}/bin/dirname"
+      '';
+    installPhase = ''
+      mkdir $out
+      make install DESTDIR=$out
+      cp -r $out/${pkgs.apacheHttpd}/. $out/.
+      cp -r $out/$out/. $out/.
+      rm -r $out/nix
+      '';
+    doCheck = false; # test would need to start apache httpd
+    meta = {
+      license = "open_source";
+    };
+  };
+
   libintlperl = pkgs.perlPackages.libintl_perl;
 
   libintl_perl = buildPerlPackage rec {
@@ -5122,6 +5794,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  libnet = buildPerlPackage {
+    name = "libnet-3.07";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SH/SHAY/libnet-3.07.tar.gz;
+      sha256 = "d9a23d8907e681e788a6f1a71915b1d37d057091e88049e5a4064c99ca2c9cd7";
+    };
+    meta = {
+      description = "Collection of network protocol modules";
+      license = "perl";
+    };
+  };
+
   libxml_perl = buildPerlPackage rec {
     name = "libxml-perl-0.08";
     src = fetchurl {
@@ -5286,6 +5970,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  LocaleCodes = buildPerlPackage {
+    name = "Locale-Codes-3.35";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.35.tar.gz;
+      sha256 = "b1a2f944b03972d2b7282767cf88100e3c0d7daa3f4ca7aef8460c1c5e246480";
+    };
+    meta = {
+      description = "A distribution of modules to handle locale codes";
+      license = "perl";
+    };
+  };
+
   LocaleGettext = buildPerlPackage {
     name = "LocaleGettext-1.05";
     buildInputs = stdenv.lib.optional (stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext;
@@ -5357,6 +6053,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  LogAny = buildPerlPackage {
+    name = "Log-Any-1.032";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Log-Any-1.032.tar.gz;
+      sha256 = "808558fa42aa96365ed0af773973a5618b4ad50511d81fc7548f67133efdb956";
+    };
+    meta = {
+      homepage = https://github.com/dagolden/Log-Any;
+      description = "Bringing loggers and listeners together";
+      license = "perl";
+    };
+  };
+
   LogContextual = buildPerlPackage {
     name = "Log-Contextual-0.006003";
     src = fetchurl {
@@ -5474,6 +6183,22 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  LWPProtocolconnect = pkgs.perlPackages.LWPProtocolConnect;
+
+  LWPProtocolConnect = buildPerlPackage {
+    name = "LWP-Protocol-connect-6.09";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BE/BENNING/LWP-Protocol-connect-6.09.tar.gz;
+      sha256 = "9f252394775e23aa42c3176611e5930638ab528d5190110b4731aa5b0bf35a15";
+    };
+    buildInputs = [ TestException ];
+    propagatedBuildInputs = [ HTTPMessage IOSocketSSL LWP LWPProtocolhttps URI ];
+    meta = {
+      description = "Provides HTTP/CONNECT proxy support for LWP::UserAgent";
+      license = "perl";
+    };
+  };
+
   LWPProtocolhttps = pkgs.perlPackages.LWPProtocolHttps;
 
   LWPProtocolHttps = buildPerlPackage rec {
@@ -5568,6 +6293,14 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ParseRecDescent];
   };
 
+  MailRFC822Address = buildPerlPackage {
+    name = "Mail-RFC822-Address-0.3";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PD/PDWARREN/Mail-RFC822-Address-0.3.tar.gz;
+      sha256 = "351ef4104ecb675ecae69008243fae8243d1a7e53c681eeb759e7b781684c8a7";
+    };
+  };
+
   MailTools = buildPerlPackage {
     name = "MailTools-2.13";
     src = fetchurl {
@@ -5605,6 +6338,17 @@ let self = _self // overrides; _self = with self; {
     NIX_CFLAGS_LINK = "-L${pkgs.gmp}/lib -lgmp";
   };
 
+  MathBigRat = buildPerlPackage {
+    name = "Math-BigRat-0.2606";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigRat-0.2606.tar.gz;
+      sha256 = "a69506468dd3067249e6ba9ce35eb9d5509471d939c1efae8283cbd038ca7e28";
+    };
+    meta = {
+      description = "Arbitrary big rational numbers";
+      license = "perl";
+    };
+  };
 
   MathClipper = buildPerlModule rec {
     name = "Math-Clipper-1.23";
@@ -5615,6 +6359,14 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsXSpp ExtUtilsTypemapsDefault TestDeep ];
   };
 
+  MathComplex = buildPerlPackage {
+    name = "Math-Complex-1.59";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Math-Complex-1.59.tar.gz;
+      sha256 = "f35eb4987512c51d2c47294a008ede210d8dd759b90b887d04847c69b42dd6d1";
+    };
+  };
+
   MathConvexHullMonotoneChain = buildPerlPackage rec {
     name = "Math-ConvexHull-MonotoneChain-0.01";
     src = fetchurl {
@@ -5696,6 +6448,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Memoize = buildPerlPackage {
+    name = "Memoize-1.03.tgz";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MJ/MJD/Memoize-1.03.tgz;
+      sha256 = "5239cc5f644a50b0de9ffeaa51fa9991eb06ecb1bf4678873e3ab89af9c0daf3";
+    };
+  };
+
   MetaBuilder = buildPerlModule {
     name = "Meta-Builder-0.003";
     src = fetchurl {
@@ -5828,6 +6588,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ModuleBuildDeprecated = buildPerlModule {
+    name = "Module-Build-Deprecated-0.4210";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Deprecated-0.4210.tar.gz;
+      sha256 = "be089313fc238ee2183473aca8c86b55fb3cf44797312cbe9b892d6362621703";
+    };
+    doCheck = false;
+    meta = {
+      description = "A collection of modules removed from Module-Build";
+      license = "perl";
+    };
+  };
+
   ModuleBuildTiny = buildPerlModule {
     name = "Module-Build-Tiny-0.039";
     src = fetchurl {
@@ -6063,6 +6836,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ModuleSignature = buildPerlPackage {
+    name = "Module-Signature-0.79";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.79.tar.gz;
+      sha256 = "22df2ce097fb5d176efa951c782633d8debe594924a25ca66666252512ce462c";
+    };
+    buildInputs = [ IPCRun ];
+    meta = {
+      description = "Module signature file manipulation";
+      license = "cc0";
+    };
+  };
+
   ModuleUtil = buildPerlPackage {
     name = "Module-Util-1.09";
     src = fetchurl {
@@ -6089,6 +6875,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  mod_perl2 = buildPerlPackage {
+    name = "mod_perl-2.0.9";
+    src = fetchurl {
+      url = http://apache.mirror.iphh.net/perl/mod_perl-2.0.9.tar.gz;
+      sha256 = "0azmir4hbb825mfmcxwa1frhnhhf82rl8xf6mmgwkhbinxmg4q02";
+    };
+    makeMakerFlags = "MP_AP_DESTDIR=$out";
+    buildInputs = [ pkgs.apacheHttpd ];
+    doCheck = false; # would try to start Apache HTTP server
+    meta = {
+      description = "Embed a Perl interpreter in the Apache HTTP server";
+    };
+  };
+
   Mojolicious = buildPerlPackage {
     name = "Mojolicious-4.63";
     src = fetchurl {
@@ -6228,8 +7028,7 @@ let self = _self // overrides; _self = with self; {
       license = "perl";
     };
   };
-  
-    
+
   TestUseAllModules = buildPerlPackage {
     name = "Test-UseAllModules-0.17";
     src = fetchurl {
@@ -6241,7 +7040,7 @@ let self = _self // overrides; _self = with self; {
       license = "perl";
     };
   };
-  
+
   MouseXTypesPathClass = buildPerlPackage {
     name = "MouseX-Types-Path-Class-0.07";
     src = fetchurl {
@@ -6919,6 +7718,35 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  NamespaceAutoclean = buildPerlPackage {
+    name = "namespace-autoclean-0.26";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.26.tar.gz;
+      sha256 = "c0f805acd3b565c611324b7bde20d32f6ffc31afefc5b8e52f54994802594d43";
+    };
+    buildInputs = [ ModuleBuildTiny TestRequires ];
+    propagatedBuildInputs = [ BHooksEndOfScope SubIdentify NamespaceClean ];
+    meta = {
+      homepage = https://github.com/moose/namespace-autoclean;
+      description = "Keep imports out of your namespace";
+      license = "perl";
+    };
+  };
+
+  NamespaceClean = buildPerlPackage {
+    name = "namespace-clean-0.25";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.25.tar.gz;
+      sha256 = "946a2b7b8219562818867ad915cd493637e2639f901db050b835500c8e6ecd04";
+    };
+    propagatedBuildInputs = [ BHooksEndOfScope PackageStash ];
+    meta = {
+      homepage = http://search.cpan.org/dist/namespace-clean;
+      description = "Keep imports and functions out of your namespace";
+      license = "perl";
+    };
+  };
+
   NetAddrIP = buildPerlPackage rec {
     name = "NetAddr-IP-4.075";
     src = fetchurl {
@@ -7123,6 +7951,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  NetPing = buildPerlPackage {
+    name = "Net-Ping-2.41";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SM/SMPETERS/Net-Ping-2.41.tar.gz;
+      sha256 = "cbff21a8d323f235b70237c7ee56ffa5f22e87511e70608c027e2ec27fce47e0";
+    };
+    meta = {
+      description = "Check a remote host for reachability";
+    };
+  };
+
   NetRabbitFoot = buildPerlPackage {
     name = "Net-RabbitFoot-1.03";
     src = fetchurl {
@@ -7286,6 +8125,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Opcodes = buildPerlPackage {
+    name = "Opcodes-0.14";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RU/RURBAN/Opcodes-0.14.tar.gz;
+      sha256 = "7f7365447e4d1c5b87b43091448f0488e67c9f036b26c022a5409cd73d343893";
+    };
+    meta = {
+      description = "More Opcodes information from opnames.h and opcode.h";
+      license = "perl";
+    };
+  };
+
   OpenGL = buildPerlPackage rec {
     name = "OpenGL-0.6703";
     src = fetchurl {
@@ -7529,6 +8380,14 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;
   };
 
+  PathTools = buildPerlPackage {
+    name = "PathTools-3.47";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SM/SMUELLER/PathTools-3.47.tar.gz;
+      sha256 = "caa8d4b45372b8cb0ef0f6f696efa3a60b0fd394b115cad39a7fbb8f6bd38026";
+    };
+  };
+
   Perl5lib = buildPerlPackage rec {
     name = "perl5lib-1.02";
     src = fetchurl {
@@ -7582,6 +8441,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  PerlIOviaQuotedPrint = buildPerlPackage {
+    name = "PerlIO-via-QuotedPrint-0.08";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SH/SHAY/PerlIO-via-QuotedPrint-0.08.tar.gz;
+      sha256 = "9b999a54134816de5217f7a8cac69fa5d89ab32dc589fcd5c9e84902f608cb9c";
+    };
+    meta = {
+      description = "PerlIO Layer for quoted-printable encoding";
+    };
+  };
+
   PerlIOviasymlink = buildPerlPackage {
     name = "PerlIO-via-symlink-0.05";
     src = fetchurl {
@@ -7781,6 +8651,26 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ProcProcessTable = buildPerlPackage {
+    name = "Proc-ProcessTable-0.51";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.51.tar.gz;
+      sha256 = "66636e102985a2a05ef4334b53a7893d627c192fac5dd7ff37dd1a0a50c0128d";
+    };
+    meta = {
+      description = "Perl extension to access the unix process table";
+      license = "perl";
+    };
+  };
+
+  ProcSafeExec = buildPerlPackage {
+    name = "Proc-SafeExec-1.5";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BI/BILBO/Proc-SafeExec-1.5.tar.gz;
+      sha256 = "1b4d0908bcac563d34a7e5be61c5da3eee98e4a6c7fa68c2670cc5844b5a2d78";
+    };
+  };
+
   ProcWaitStat = buildPerlPackage rec {
     name = "Proc-WaitStat-1.00";
     src = fetchurl {
@@ -7858,6 +8748,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  PodChecker = buildPerlPackage {
+    name = "Pod-Checker-1.71";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.71.tar.gz;
+      sha256 = "4b90e745f4d6357bb7e8999e0e7d192216b98e3f3c8a86fa6ed446f8c36601df";
+    };
+  };
+
   PodCoverage = buildPerlPackage rec {
     name = "Pod-Coverage-0.23";
     src = fetchurl {
@@ -7933,6 +8831,44 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  PodParser = buildPerlPackage {
+    name = "Pod-Parser-1.63";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Parser-1.63.tar.gz;
+      sha256 = "dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd";
+    };
+    meta = {
+      description = "Modules for parsing/translating POD format documents";
+      license = "unknown";
+    };
+  };
+
+  PodLaTeX = buildPerlModule {
+    name = "Pod-LaTeX-0.61";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz;
+      sha256 = "15a840ea1c8a76cd3c865fbbf2fec33b03615c0daa50f9c800c54e0cf0659d46";
+    };
+    propagatedBuildInputs = [ if_ ];
+    meta = {
+      homepage = http://github.com/timj/perl-Pod-LaTeX/tree/master;
+      description = "Convert Pod data to formatted Latex";
+      license = "perl";
+    };
+  };
+
+  podlators = buildPerlPackage {
+    name = "podlators-2.5.3";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RR/RRA/podlators-2.5.3.tar.gz;
+      sha256 = "c80d6d65a8694720deff1c6b2067d7564727db713b6d6b536afbad70299647d1";
+    };
+    meta = {
+      description = "Convert POD data to various other formats";
+      license = "perl";
+    };
+  };
+
   podlinkcheck = buildPerlPackage {
     name = "podlinkcheck-12";
     src = fetchurl {
@@ -7947,6 +8883,30 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  PodPerldoc = buildPerlPackage {
+    name = "Pod-Perldoc-3.25";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MA/MALLEN/Pod-Perldoc-3.25.tar.gz;
+      sha256 = "f1a4b3ac7aa244485456b0e8733c773bbb39ae35b01a59515f6cba6bbe293a84";
+    };
+    meta = {
+      description = "Look up Perl documentation in Pod format";
+      license = "perl";
+    };
+  };
+
+  PodPlainer = buildPerlPackage {
+    name = "Pod-Plainer-1.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RM/RMBARKER/Pod-Plainer-1.04.tar.gz;
+      sha256 = "1bbfbf7d1d4871e5a83bab2137e22d089078206815190eb1d5c1260a3499456f";
+    };
+    meta = {
+      description = "Perl extension for converting Pod to old-style Pod";
+      license = "perl";
+    };
+  };
+
   PodMarkdown = buildPerlPackage {
     name = "Pod-Markdown-2.000";
     src = fetchurl {
@@ -7978,6 +8938,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  PodUsage = buildPerlPackage {
+    name = "Pod-Usage-1.67";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Usage-1.67.tar.gz;
+      sha256 = "c8be6d29b0dfe304c4ddfcc140f93d4c4de7a8362ea6e2651611c288b53cc68a";
+    };
+    propagatedBuildInputs = [ perl ];
+    meta = {
+      description = "Pod::Usage extracts POD documentation and shows usage information";
+    };
+  };
+
   PodWeaver = buildPerlPackage {
     name = "Pod-Weaver-4.004";
     src = fetchurl {
@@ -8166,6 +9138,28 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  RTClientREST = buildPerlPackage {
+    name = "RT-Client-REST-0.49";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DM/DMITRI/RT-Client-REST-0.49.tar.gz;
+      sha256 = "832c84b4f19e97781e8902f123a659fdcfef68e0ed9cfe09055852e9d68f7afc";
+    };
+    buildInputs = [ TestException ];
+    propagatedBuildInputs = [ DateTime DateTimeFormatDateParse Error ExceptionClass HTTPCookies HTTPMessage LWP ParamsValidate URI ];
+    meta = {
+      description = "Talk to RT installation using REST protocol";
+      license = "perl";
+    };
+  };
+
+  Safe = buildPerlPackage {
+    name = "Safe-2.35";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RG/RGARCIA/Safe-2.35.tar.gz;
+      sha256 = "e5d09756580287d7dc183ddaf26e4b2467e6f75b52ad73decdbe62d0750979b1";
+    };
+  };
+
   SafeIsa = buildPerlPackage {
     name = "Safe-Isa-1.000004";
     src = fetchurl {
@@ -8224,6 +9218,30 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  SearchDict = buildPerlPackage {
+    name = "Search-Dict-1.07";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Search-Dict-1.07.tar.gz;
+      sha256 = "b128cdae4712fe53e83a219ca65478a84c1b128a2c6c86933e47923cf19c6554";
+    };
+    meta = {
+      description = "Look - search for key in dictionary file";
+      license = "perl";
+    };
+  };
+
+  SelfLoader = buildPerlPackage {
+    name = "SelfLoader-1.20";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SM/SMUELLER/SelfLoader-1.20.tar.gz;
+      sha256 = "79b1e2b8e4081854fba666441287c18b6bd822defb5bbee79067370edba1a042";
+    };
+    meta = {
+      description = "Load functions only on demand";
+      license = "perl";
+    };
+  };
+
   SetInfinite = buildPerlPackage {
     name = "Set-Infinite-0.65";
     src = fetchurl {
@@ -8279,6 +9297,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Socket = buildPerlPackage {
+    name = "Socket-2.020";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PE/PEVANS/Socket-2.020.tar.gz;
+      sha256 = "9ad4174c45b4c31d5e0b8019ada1fc767093849e77f268f0d1831eeb891dfdd7";
+    };
+    meta = {
+      description = "Networking constants and support functions";
+      license = "perl";
+    };
+  };
+
   Socket6 = buildPerlPackage rec {
     name = "Socket6-0.25";
     src = fetchurl {
@@ -8474,6 +9504,17 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ StatisticsDescriptive StatisticsDistributions ];
   };
 
+  Storable = buildPerlPackage {
+    name = "Storable-2.51";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AM/AMS/Storable-2.51.tar.gz;
+      sha256 = "a566b792112bbba21131ec1d7a2bf78170c648484895283ae53c7f0c3dc2f0be";
+    };
+    meta = {
+      license = "unknown";
+    };
+  };
+
   StreamBuffered = buildPerlPackage {
     name = "Stream-Buffered-0.02";
     src = fetchurl {
@@ -8886,6 +9927,30 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  SysSigAction = buildPerlPackage {
+    name = "Sys-SigAction-0.21";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.21.tar.gz;
+      sha256 = "e144207a6fd261eb9f98554c76bea66d95870ee1f62d2d346a1ea95fdccf80db";
+    };
+    meta = {
+      description = "Perl extension for Consistent Signal Handling";
+      license = "perl";
+    };
+  };
+
+  SysSyslog = buildPerlPackage {
+    name = "Sys-Syslog-0.33";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SA/SAPER/Sys-Syslog-0.33.tar.gz;
+      sha256 = "d5d901d9d9333a66db95fb1c7692ff457f7c7ad17287b51a87e40734f7c2741d";
+    };
+    meta = {
+      description = "Perl interface to the UNIX syslog(3) calls";
+      license = "perl";
+    };
+  };
+
   SysVirt = buildPerlPackage rec {
     name = "Sys-Virt-1.2.9";
     src = fetchurl {
@@ -8959,6 +10024,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TemplatePluginAutoformat = buildPerlPackage {
+    name = "Template-Plugin-Autoformat-2.77";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KA/KARMAN/Template-Plugin-Autoformat-2.77.tar.gz;
+      sha256 = "bddfb4919f0abb2a2be7a9665333e0d4e098032f0e383dbaf04c4d896c7486ed";
+    };
+    propagatedBuildInputs = [ TemplateToolkit TextAutoformat ];
+    meta = {
+      homepage = https://github.com/karpet/template-plugin-autoformat;
+      description = "TT plugin for Text::Autoformat";
+      license = "perl";
+    };
+  };
+
   TemplatePluginClass = buildPerlPackage {
     name = "Template-Plugin-Class-0.14";
     src = fetchurl {
@@ -9050,6 +10129,30 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TermANSIColor = buildPerlPackage {
+    name = "Term-ANSIColor-4.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RR/RRA/Term-ANSIColor-4.03.tar.gz;
+      sha256 = "e89b6992030fa713f928f653dcdb71d66fa2493f873bacf5653aa121ca862450";
+    };
+    meta = {
+      description = "Color output using ANSI escape sequences";
+      license = "perl";
+    };
+  };
+
+  TermCap = buildPerlPackage {
+    name = "Term-Cap-1.16";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JS/JSTOWE/Term-Cap-1.16.tar.gz;
+      sha256 = "b99728ac19b740b43e6a8d3c749c336f4a5d59ffd684c42c222681ee924e4a20";
+    };
+    meta = {
+      description = "Perl termcap interface";
+      license = "perl";
+    };
+  };
+
   TermEncoding = buildPerlPackage {
     name = "Term-Encoding-0.02";
     src = fetchurl {
@@ -9185,6 +10288,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Test = buildPerlPackage {
+    name = "Test-1.26";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JE/JESSE/Test-1.26.tar.gz;
+      sha256 = "f7701bd28e05e7f82fe9a181bbab38f53fa6aeae48d2a810da74d1b981d4f392";
+    };
+    meta = {
+      description = "Provides a simple framework for writing test scripts";
+    };
+  };
+
   TestAssert = buildPerlPackage {
     name = "Test-Assert-0.0504";
     src = fetchurl {
@@ -9420,6 +10534,30 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestHarnessStraps = buildPerlModule {
+    name = "Test-Harness-Straps-0.30";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Harness-Straps-0.30.tar.gz;
+      sha256 = "8b00efaa35723c1a35c8c8f5fa46a99e4bc528dfa520352b54ac418ef6d1cfa8";
+    };
+    meta = {
+      description = "Detailed analysis of test results";
+      license = "perl";
+    };
+  };
+
+  TestHTTPServerSimple = buildPerlPackage {
+    name = "Test-HTTP-Server-Simple-0.11";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AL/ALEXMV/Test-HTTP-Server-Simple-0.11.tar.gz;
+      sha256 = "85c97ebd4deb805291b17277032da48807228f24f89b1ce2fb3c09f7a896bb78";
+    };
+    propagatedBuildInputs = [ HTTPServerSimple ];
+    meta = {
+      description = "Test::More functions for HTTP::Server::Simple";
+    };
+  };
+
   TestJSON = buildPerlPackage {
     name = "Test-JSON-0.11";
     src = fetchurl {
@@ -9906,6 +11044,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TextAbbrev = buildPerlPackage {
+    name = "Text-Abbrev-1.02";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FL/FLORA/Text-Abbrev-1.02.tar.gz;
+      sha256 = "9cfb8bea2d5806b72fa1a0e1a3367ce662262eaa2701c6a3143a2a8076917433";
+    };
+    meta = {
+      homepage = http://search.cpan.org/dist/Text-Abbrev;
+      description = "Abbrev - create an abbreviation table from a list";
+      license = "perl";
+    };
+  };
+
   TextAligner = buildPerlPackage {
     name = "Text-Aligner-0.10";
     src = fetchurl {
@@ -9917,6 +11068,32 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TextAutoformat = buildPerlPackage {
+    name = "Text-Autoformat-1.72";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.72.tar.gz;
+      sha256 = "b541152699fcd0f026322f283b7d9184839742aee0edb317a014c195ea26ae51";
+    };
+    propagatedBuildInputs = [ TextReform ];
+    meta = {
+      homepage = https://github.com/neilbowers/Text-Autoformat;
+      description = "Automatic text wrapping and reformatting";
+      license = "perl";
+    };
+  };
+
+  TextBalanced = buildPerlPackage {
+    name = "Text-Balanced-2.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SH/SHAY/Text-Balanced-2.03.tar.gz;
+      sha256 = "057753f8f0568b53921f66a60a89c30092b73329bcc61a2c43339ab70c9792c8";
+    };
+    meta = {
+      description = "Extract delimited text sequences from strings";
+      license = "perl";
+    };
+  };
+
   TextBibTeX = buildPerlModule {
     name = "Text-BibTeX-0.69";
     buildInputs = [ ConfigAutoConf ExtUtilsLibBuilder ];
@@ -9938,6 +11115,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TextCSV_XS = buildPerlPackage {
+    name = "Text-CSV_XS-1.19.tgz";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.19.tgz;
+      sha256 = "bcde887f613c6a50b0ce8f714cd2463570f5809f26581615690cfb424d2a7c16";
+    };
+    meta = {
+      homepage = https://metacpan.org/pod/Text::CSV_XS;
+      description = "Comma-Separated Values manipulation routines";
+      license = "perl";
+    };
+  };
+
   TextDiff = buildPerlPackage {
     name = "Text-Diff-1.41";
     src = fetchurl {
@@ -9959,6 +11149,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TextIconv = buildPerlPackage {
+    name = "Text-Iconv-1.7";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz;
+      sha256 = "5b80b7d5e709d34393bcba88971864a17b44a5bf0f9e4bcee383d029e7d2d5c3";
+    };
+  };
+
   TestInter = buildPerlPackage {
     name = "Test-Inter-1.05";
     src = fetchurl {
@@ -10048,6 +11246,18 @@ let self = _self // overrides; _self = with self; {
                               TestPod TestPodCoverage GraphViz ReadonlyXS TextTabularDisplay];
   };
 
+  TextReform = buildPerlPackage {
+    name = "Text-Reform-1.20";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CH/CHORNY/Text-Reform-1.20.tar.gz;
+      sha256 = "a8792dd8c1aac97001032337b36a356be96e2d74c4f039ef9a363b641db4ae61";
+    };
+    meta = {
+      description = "Manual text wrapping and reformatting";
+      license = "perl";
+    };
+  };
+
   TextSimpleTable = buildPerlPackage {
     name = "Text-SimpleTable-2.03";
     src = fetchurl {
@@ -10060,6 +11270,15 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TextSoundex = buildPerlPackage {
+    name = "Text-Soundex-3.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.04.tar.gz;
+      sha256 = "2e56bb4324ee0186b908b3bd78463643affe7295624af0628e81491e910283d9";
+    };
+    propagatedBuildInputs = [ if_ ];
+  };
+
   TextTable = buildPerlPackage {
     name = "Text-Table-1.129";
     src = fetchurl {
@@ -10076,6 +11295,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TextTabsWrap = buildPerlPackage {
+    name = "Text-Tabs+Wrap-2013.0523";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MU/MUIR/modules/Text-Tabs+Wrap-2013.0523.tar.gz;
+      sha256 = "b9cb056fffb737b9c12862099b952bf4ab4b1f599fd34935356ae57dab6f655f";
+    };
+    meta = {
+      description = "Expand tabs and do simple line wrapping";
+    };
+  };
+
   TextTabularDisplay = buildPerlPackage rec {
     name = "Text-TabularDisplay-1.35";
     src = fetchurl {
@@ -10211,6 +11441,43 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  threadsshared = buildPerlPackage {
+    name = "threads-shared-1.48";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JD/JDHEDDEN/threads-shared-1.48.tar.gz;
+      sha256 = "7378a72bae424705e354476da69995fb8f62432bca8e98eab0fb9842da5120f8";
+    };
+    meta = {
+      description = "Perl extension for sharing data structures between threads";
+      license = "perl";
+    };
+  };
+
+  ThreadQueue = buildPerlPackage {
+    name = "Thread-Queue-3.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Queue-3.05.tar.gz;
+      sha256 = "36bc1e50b5de47ff827fbaa1d7f028016e3ef115972cac84ed8cd73a0ef95300";
+    };
+    meta = {
+      description = "Thread-safe queues";
+      license = "perl";
+    };
+  };
+
+  ThreadSemaphore = buildPerlPackage {
+    name = "Thread-Semaphore-2.12";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Semaphore-2.12.tar.gz;
+      sha256 = "e0f8e7057b073003e5a96a55b778abb8ee1cc1b279febedce0166526f2988965";
+    };
+    meta = {
+      description = "Thread-safe semaphores";
+      license = "perl";
+    };
+  };
+
+
   Throwable = buildPerlPackage rec {
     name = "Throwable-0.200010";
     src = fetchurl {
@@ -10232,6 +11499,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TieFile = buildPerlPackage {
+    name = "Tie-File-1.00";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TO/TODDR/Tie-File-1.00.tar.gz;
+      sha256 = "7ca9c8a957cf743d3a98d0eb5deb767b1e14b4f00bc9d03da83d466fcb76bd44";
+    };
+    meta = {
+      description = "Access the lines of a disk file via a Perl array";
+    };
+  };
+
   TieIxHash = buildPerlPackage {
     name = "Tie-IxHash-1.23";
     src = fetchurl {
@@ -10256,6 +11534,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TieRefHash = buildPerlPackage {
+    name = "Tie-RefHash-1.39";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FL/FLORA/Tie-RefHash-1.39.tar.gz;
+      sha256 = "b0b80ef571e7dadb726b8214f7352a932a8fa82af29072895aa1aadc89f48bec";
+    };
+  };
+
   TieToObject = buildPerlPackage {
     name = "Tie-ToObject-0.03";
     src = fetchurl {
@@ -10308,6 +11594,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TimeLocal = buildPerlPackage {
+    name = "Time-Local-1.2300";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.2300.tar.gz;
+      sha256 = "b2acca03700a09f8ae737d3084f3f6287e983da9ab7b537c6599c291b669fb49";
+    };
+    meta = {
+      description = "Efficiently compute time from local and GMT time";
+      license = "perl";
+    };
+  };
+
   Tk = buildPerlPackage rec {
     name = "Tk-804.032_501";
     src = fetchurl {
@@ -10480,6 +11778,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  UnicodeNormalize = buildPerlPackage {
+    name = "Unicode-Normalize-1.19";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SA/SADAHIRO/Unicode-Normalize-1.19.tar.gz;
+      sha256 = "ab16467692cb78ced706fb7bee4145ac09d9f14d9eed92be4a305de3172ce6c4";
+    };
+    meta = {
+      description = "Unicode Normalization Forms";
+      license = "perl";
+    };
+  };
+
   UnixGetrusage = buildPerlPackage {
     name = "Unix-Getrusage-0.03";
     src = fetchurl {
@@ -10674,6 +11984,29 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Want = buildPerlPackage {
+    name = "Want-0.26";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RO/ROBIN/Want-0.26.tar.gz;
+      sha256 = "4951675e13de2b0b9792be2827b8ef46ef25a0b9a2d3e9132143444dac28e17c";
+    };
+  };
+
+  Workflow = buildPerlPackage {
+    name = "Workflow-1.41";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.41.tar.gz;
+      sha256 = "639fd428ddf186fdc7cad517cb7522b2bf092df26ef48470b2e8f747c4e8286e";
+    };
+    buildInputs = [ DBDMock ListMoreUtils TestException ];
+    propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI DateTime DateTimeFormatStrptime ExceptionClass FileSlurp LogDispatch Log4Perl XMLSimple ];
+    meta = {
+      homepage = https://github.com/jonasbn/perl-workflow;
+      description = "Simple, flexible system to implement workflows";
+      license = "perl";
+    };
+  };
+
   Wx = buildPerlPackage rec {
     name = "Wx-0.9923";
     src = fetchurl {
@@ -10776,6 +12109,24 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [XMLRegExp XMLParser LWP libxml_perl];
   };
 
+  XMLFilterBufferText = buildPerlPackage {
+    name = "XML-Filter-BufferText-1.01";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RB/RBERJON/XML-Filter-BufferText-1.01.tar.gz;
+      sha256 = "8fd2126d3beec554df852919f4739e689202cbba6a17506e9b66ea165841a75c";
+    };
+    doCheck = false;
+  };
+
+  XMLFilterXInclude = buildPerlPackage {
+    name = "XML-Filter-XInclude-1.0";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Filter-XInclude-1.0.tar.gz;
+      sha256 = "98746f3c1f6f049491fec203d455bb8f8c9c6e250f041904dda5d78e21187f93";
+    };
+    doCheck = false;
+  };
+
   XMLLibXML = buildPerlPackage rec {
     name = "XML-LibXML-2.0121";
     src = fetchurl {
@@ -10867,6 +12218,36 @@ let self = _self // overrides; _self = with self; {
       sha256 = "024fbjgg6s87j0y3yik55plzf7d6qpn7slwd03glcb54mw9zdglv";
     };
     propagatedBuildInputs = [XMLNamespaceSupport];
+    postInstall = ''
+      perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::SAX::PurePerl))->save_parsers()"
+      '';
+  };
+
+  XMLSAXBase = buildPerlPackage {
+    name = "XML-SAX-Base-1.08";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.08.tar.gz;
+      sha256 = "666270318b15f88b8427e585198abbc19bc2e6ccb36dc4c0a4f2d9807330219e";
+    };
+    meta = {
+      description = "Base class for SAX Drivers and Filters";
+      homepage = http://github.com/grantm/XML-SAX-Base;
+      license = "perl";
+    };
+  };
+
+  XMLSAXWriter = buildPerlPackage {
+    name = "XML-SAX-Writer-0.56";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.56.tar.gz;
+      sha256 = "d073f7a25072c8150317b86b99d07031316a15bffab99e63e5afe591c8217d03";
+    };
+    propagatedBuildInputs = [ XMLFilterBufferText XMLNamespaceSupport XMLSAXBase ];
+    meta = {
+      homepage = https://github.com/perigrin/xml-sax-writer;
+      description = "SAX2 XML Writer";
+      license = "perl";
+    };
   };
 
   XMLSemanticDiff = buildPerlPackage {
@@ -10914,6 +12295,18 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;  # requires lots of extra packages
   };
 
+  XMLValidatorSchema = buildPerlPackage {
+    name = "XML-Validator-Schema-1.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SA/SAMTREGAR/XML-Validator-Schema-1.10.tar.gz;
+      sha256 = "6142679580150a891f7d32232b5e31e2b4e5e53e8a6fa9cbeecb5c23814f1422";
+    };
+    propagatedBuildInputs = [ TreeDAGNode XMLFilterBufferText XMLSAX ];
+    meta = {
+      description = "Validate XML against a subset of W3C XML Schema";
+    };
+  };
+
   XMLWriter = buildPerlPackage rec {
     name = "XML-Writer-0.625";
     src = fetchurl {
@@ -10922,6 +12315,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  XSLoader = buildPerlPackage {
+    name = "XSLoader-0.16";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.16.tar.gz;
+      sha256 = "96de61bad187919bf632cfa657f1b9957ad47defcc90dad8ee1f50c955eedb86";
+    };
+    meta = {
+      homepage = https://metacpan.org/module/Math::BigInt;
+      description = "Dynamically load C libraries into Perl code";
+      license = "perl";
+    };
+  };
+
   XSObjectMagic = buildPerlPackage rec {
     name = "XS-Object-Magic-0.04";
     src = fetchurl {

From 9c20b9c779d94af1b18c0c86d7aff6a31ae142c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 10 Aug 2015 23:10:43 +0200
Subject: [PATCH 0976/2016] openxpki: fix license attribute (unbreak nixpkgs
 tarball job)

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

diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix
index b26c4f12456..dd1ed7c473b 100644
--- a/pkgs/servers/openxpki/default.nix
+++ b/pkgs/servers/openxpki/default.nix
@@ -71,7 +71,7 @@ buildPerlPackage {
   meta = {
     homepage = "http://www.openxpki.org";
     description = "Enterprise-grade PKI/Trustcenter software";
-    license = stdenv.lib.licences.apache20;
+    license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [ tstrobel ];
   };
 }

From 3310ebe993affad7c91eb912985c16be452ee86f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 26 Jul 2015 10:33:10 +0200
Subject: [PATCH 0977/2016] eclipses: add function eclipseWithPlugins

This function allows installation of a given Eclipse with a given list
of Eclipse plugins.
---
 pkgs/applications/editors/eclipse/default.nix | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 3ec49897321..f53cf891011 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -2,6 +2,7 @@
 , freetype, fontconfig, libX11, libXext, libXrender, zlib
 , glib, gtk, libXtst, jre
 , webkitgtk2 ? null  # for internal web browser
+, buildEnv, writeText, runCommand
 }:
 
 assert stdenv ? glibc;
@@ -334,4 +335,38 @@ in {
         };
     };
   };
+
+  eclipseWithPlugins = { eclipse, plugins ? [], jvmArgs ? [] }:
+    let
+      # Gather up the desired plugins.
+      pluginEnv = buildEnv {
+        name = "eclipse-plugins";
+        paths = plugins;
+      };
+
+      # Prepare the JVM arguments to add to the ini file. We here also
+      # add the property indicating the plugin directory.
+      dropinPropName = "org.eclipse.equinox.p2.reconciler.dropins.directory";
+      dropinProp = "-D${dropinPropName}=${pluginEnv}/eclipse/dropins";
+      jvmArgsText = stdenv.lib.concatStringsSep "\n" (jvmArgs ++ [dropinProp]);
+
+      # Prepare an eclipse.ini with the plugin directory.
+      origEclipseIni = builtins.readFile "${eclipse}/eclipse/eclipse.ini";
+      eclipseIniFile = writeText "eclipse.ini" ''
+        ${origEclipseIni}
+        ${jvmArgsText}
+      '';
+
+      # Base the derivation name on the name of the underlying
+      # Eclipse.
+      name = (stdenv.lib.meta.appendToName "with-plugins" eclipse).name;
+    in
+      runCommand name { buildInputs = [ makeWrapper ]; } ''
+        mkdir -p $out/bin
+        makeWrapper ${eclipse}/bin/eclipse $out/bin/eclipse \
+          --add-flags "--launcher.ini ${eclipseIniFile}"
+
+        ln -s ${eclipse}/share $out/
+      '';
+
 }

From 733d9022993277dd5ef3b352244631c32c24f09a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 26 Jul 2015 10:38:04 +0200
Subject: [PATCH 0978/2016] eclipse-anyedittools: init at 2.4.15.201504172030

This commit also introduces some infrastructure surrounding Eclipse
plugins.
---
 pkgs/applications/editors/eclipse/default.nix |  3 ++
 pkgs/applications/editors/eclipse/plugins.nix | 54 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/applications/editors/eclipse/plugins.nix

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index f53cf891011..bde88681ba1 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -3,6 +3,7 @@
 , glib, gtk, libXtst, jre
 , webkitgtk2 ? null  # for internal web browser
 , buildEnv, writeText, runCommand
+, recurseIntoAttrs, callPackage
 }:
 
 assert stdenv ? glibc;
@@ -369,4 +370,6 @@ in {
         ln -s ${eclipse}/share $out/
       '';
 
+  plugins = recurseIntoAttrs (callPackage ./plugins.nix { });
+
 }
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
new file mode 100644
index 00000000000..a280df08f15
--- /dev/null
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, unzip }:
+
+let
+
+  # Helper for the common case where we have separate feature and
+  # plugin JARs.
+  buildEclipsePlugin = { name, version, javaName, srcFeature, srcPlugin, meta }:
+    stdenv.mkDerivation {
+      name = "eclipse-" + name;
+      inherit meta;
+
+      srcs = [ srcFeature srcPlugin ];
+
+      buildInputs = [ unzip ];
+      phases = [ "installPhase" ];
+
+      installPhase = ''
+        dropinDir="$out/eclipse/dropins/${name}"
+        mkdir -p $dropinDir/features/${javaName}_${version}
+        unzip ${srcFeature} -d $dropinDir/features/${javaName}_${version}
+
+        mkdir -p $dropinDir/plugins
+        cp -v ${srcPlugin} $dropinDir/plugins/${javaName}_${version}.jar
+      '';
+
+    };
+
+in {
+
+  anyedittools = buildEclipsePlugin rec {
+    name = "anyedit-${version}";
+    version = "2.4.15.201504172030";
+    javaName = "de.loskutov.anyedit.AnyEditTools";
+
+    srcFeature = fetchurl {
+      url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
+      sha256 = "19hbwgqn02ghflbcp5cw3qy203mym5kwgzq4xrn0xcl8ckl5s2pp";
+    };
+
+    srcPlugin = fetchurl {
+      url = "http://dl.bintray.com/iloveeclipse/plugins/${javaName}_${version}.jar";
+      sha256 = "1i3ghf2mhdfhify30hlyxqmyqcp40pkd5zhsiyg6finn4w81sxv2";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = http://andrei.gmxhome.de/anyedit/;
+      description = "Adds new tools to the context menu of text-based editors";
+      license = licenses.epl10;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
+}

From 90edb9e5ae0289469aa4628743f35a36f4d7710d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 26 Jul 2015 10:51:20 +0200
Subject: [PATCH 0979/2016] eclipse-emacsplus: init at 4.2.0

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index a280df08f15..95e8d1f3316 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -51,4 +51,28 @@ in {
     };
   };
 
+  emacsplus = buildEclipsePlugin rec {
+    name = "emacsplus-${version}";
+    version = "4.2.0";
+    javaName = "com.mulgasoft.emacsplus";
+
+    srcFeature = fetchurl {
+      url = "http://www.mulgasoft.com/emacsplus/e4/update-site/features/${javaName}.feature_${version}.jar";
+      sha256 = "0wja3cd7gq8w25797fxnafvcncjnmlv8qkl5iwqj7zja2f45vka8";
+    };
+
+    srcPlugin = fetchurl {
+      url = "http://www.mulgasoft.com/emacsplus/e4/update-site/plugins/${javaName}_${version}.jar";
+      sha256 = "08yw45nr90mlpdzim74vsvdaxj41sgpxcrqk5ia6l2dzvrqlsjs1";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = http://www.mulgasoft.com/emacsplus/;
+      description = "Provides a more Emacs-like experience in the Eclipse text editors";
+      license = licenses.epl10;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
 }

From 543da4e00fb379d2b2bbd0c58cd7d5b3f736a16f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 26 Jul 2015 10:53:31 +0200
Subject: [PATCH 0980/2016] eclipse-findbugs: init at 3.0.1.20150306-5afe4d1

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 95e8d1f3316..5d912803792 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -75,4 +75,28 @@ in {
     };
   };
 
+  findbugs = buildEclipsePlugin rec {
+    name = "findbugs-${version}";
+    version = "3.0.1.20150306-5afe4d1";
+    javaName = "edu.umd.cs.findbugs.plugin.eclipse";
+
+    srcFeature = fetchurl {
+      url = "http://findbugs.cs.umd.edu/eclipse/features/${javaName}_${version}.jar";
+      sha256 = "1m9fav2xlb9wrx2d00lpnh2sy0w5yzawynxm6xhhbfdzd0vpfr9v";
+    };
+
+    srcPlugin = fetchurl {
+      url = "http://findbugs.cs.umd.edu/eclipse/plugins/${javaName}_${version}.jar";
+      sha256 = "10p3mrbp9wi6jhlmmc23qv7frh605a23pqsc7w96569bsfb5wa8q";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = http://findbugs.sourceforge.net/;
+      description = "Plugin that uses static analysis to look for bugs in Java code";
+      license = licenses.epl10;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
 }

From 28bb4e4018115b6e35801876de135e526db663b3 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 26 Jul 2015 21:04:32 +0200
Subject: [PATCH 0981/2016] eclipse-color-theme: init at 1.0.0.201410260308

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 5d912803792..1f851815858 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -51,6 +51,30 @@ in {
     };
   };
 
+  color-theme = buildEclipsePlugin rec {
+    name = "color-theme-${version}";
+    version = "1.0.0.201410260308";
+    javaName = "com.github.eclipsecolortheme";
+
+    srcFeature = fetchurl {
+      url = "https://eclipse-color-theme.github.io/update/features/${javaName}.feature_${version}.jar";
+      sha256 = "128b9b1cib5ff0w1114ns5mrbrhj2kcm358l4dpnma1s8gklm8g2";
+    };
+
+    srcPlugin = fetchurl {
+      url = "https://eclipse-color-theme.github.io/update/plugins/${javaName}_${version}.jar";
+      sha256 = "0wz61909bhqwzpqwll27ia0cn3anyp81haqx3rj1iq42cbl42h0y";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = http://eclipsecolorthemes.org/;
+      description = "Plugin to switch color themes conveniently and without side effects";
+      license = licenses.epl10;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   emacsplus = buildEclipsePlugin rec {
     name = "emacsplus-${version}";
     version = "4.2.0";

From d16bb1af3da9686ca48120bafb7e049d2ab60dc4 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 27 Jul 2015 21:49:52 +0200
Subject: [PATCH 0982/2016] eclipse-checkstyle: init at 6.5.0.201504121610

Also add helper function for building packages from downloaded Eclipse
update site.
---
 pkgs/applications/editors/eclipse/plugins.nix | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 1f851815858..d65d1a48b88 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl, fetchzip, unzip }:
 
 let
 
@@ -25,6 +25,32 @@ let
 
     };
 
+  # Helper for the case where we have a ZIP file containing an Eclipse
+  # update site.
+  buildEclipseUpdateSite = { name, version, src, meta }:
+    stdenv.mkDerivation {
+      name = "eclipse-" + name;
+      inherit meta src;
+
+      buildInputs = [ unzip ];
+      phases = [ "unpackPhase" "installPhase" ];
+
+      installPhase = ''
+        dropinDir="$out/eclipse/dropins/${name}"
+
+        cd features
+        for feature in *.jar; do
+          feat=''${feature%.jar}
+          mkdir -p $dropinDir/features/$feat
+          unzip $feature -d $dropinDir/features/$feat
+        done
+        cd ..
+
+        mkdir -p $dropinDir/plugins
+        cp -v "plugins/"*.jar $dropinDir/plugins/
+      '';
+    };
+
 in {
 
   anyedittools = buildEclipsePlugin rec {
@@ -51,6 +77,26 @@ in {
     };
   };
 
+  checkstyle = buildEclipseUpdateSite rec {
+    name = "checkstyle-${version}";
+    version = "6.5.0.201504121610";
+
+    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";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = http://eclipse-cs.sourceforge.net/;
+      description = "Checkstyle integration into the Eclipse IDE";
+      license = licenses.lgpl21;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+
+  };
+
   color-theme = buildEclipsePlugin rec {
     name = "color-theme-${version}";
     version = "1.0.0.201410260308";

From 95cb770b53586a8cbc642e392eb4f051d3b76fcf Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 27 Jul 2015 22:38:25 +0200
Subject: [PATCH 0983/2016] eclipse-eclemma: init at 2.3.2.201409141915

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index d65d1a48b88..f1b5001b015 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -121,6 +121,25 @@ in {
     };
   };
 
+  eclemma = buildEclipseUpdateSite rec {
+    name = "eclemma-${version}";
+    version = "2.3.2.201409141915";
+
+    src = fetchzip {
+      stripRoot = false;
+      url = "mirror://sourceforge/project/eclemma/01_EclEmma_Releases/2.3.2/eclemma-2.3.2.zip";
+      sha256 = "0w1kwcjh45p7msv5vpc8i6dsqwrnfmjama6vavpnxlji56jd3c43";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = http://www.eclemma.org/;
+      description = "EclEmma is a free Java code coverage tool for Eclipse";
+      license = licenses.epl10;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   emacsplus = buildEclipsePlugin rec {
     name = "emacsplus-${version}";
     version = "4.2.0";

From 35a24a797730c463c2da598b51ae0c2e683facfd Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 27 Jul 2015 22:51:33 +0200
Subject: [PATCH 0984/2016] eclipse-testng: init at 6.9.5.201506120235

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index f1b5001b015..71c16e69382 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -188,4 +188,28 @@ in {
     };
   };
 
+  testng = buildEclipsePlugin rec {
+    name = "testng-${version}";
+    version = "6.9.5.201506120235";
+    javaName = "org.testng.eclipse";
+
+    srcFeature = fetchurl {
+      url = "http://beust.com/eclipse/features/org.testng.eclipse_6.9.5.201506120235.jar";
+      sha256 = "02imv0rw10pik55a7p00jin65shvhfpzgna02ky94yx7dlf9fyy9";
+    };
+
+    srcPlugin = fetchurl {
+      url = "http://beust.com/eclipse/plugins/org.testng.eclipse_6.9.5.201506120235.jar";
+      sha256 = "0ni1ky4p5l1qzph0np1qw9pcyhrvy6zmn9c8q1b5rm5xv1fcvji4";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = http://testng.org/;
+      description = "Eclipse plugin for the TestNG testing framework";
+      license = licenses.asl20;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
 }

From 89dd33190662ed5af266535a78e4f2ddca7d920d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 29 Jul 2015 00:08:26 +0200
Subject: [PATCH 0985/2016] eclipse-jdt: init at 4.5

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 71c16e69382..872815395de 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -188,6 +188,25 @@ in {
     };
   };
 
+  jdt = buildEclipseUpdateSite rec {
+    name = "jdt-${version}";
+    version = "4.5";
+
+    src = fetchzip {
+      stripRoot = false;
+      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/org.eclipse.jdt-4.5.zip";
+      sha256 = "0zrdn26f7qsms2xfiyc049bhhh0czsbf989pgyq736b8hfmmh9iy";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://www.eclipse.org/jdt/;
+      description = "Eclipse Java development tools";
+      license = licenses.epl10;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   testng = buildEclipsePlugin rec {
     name = "testng-${version}";
     version = "6.9.5.201506120235";

From 35eade30ffb915f1c190fc129f0869edf774715e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 29 Jul 2015 00:13:00 +0200
Subject: [PATCH 0986/2016] eclipse-scala: init at 4.1.0

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 872815395de..cba556074a1 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -207,6 +207,24 @@ in {
     };
   };
 
+  scala = buildEclipseUpdateSite rec {
+    name = "scala-${version}";
+    version = "4.1.0";
+
+    src = fetchzip {
+      url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip";
+      sha256 = "1z3pl88kw9qyhhsi8sqwz30c12l7zg8jiz6bz1js7jzpjbs8v70f";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "http://scala-ide.org/";
+      description = "The Scala IDE for Eclipse";
+      license = licenses.bsd3;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   testng = buildEclipsePlugin rec {
     name = "testng-${version}";
     version = "6.9.5.201506120235";

From 2fca9e09c411577f0ab1129dc8140e31c8a8d098 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 29 Jul 2015 00:21:51 +0200
Subject: [PATCH 0987/2016] eclipse-platform: init at 4.5

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

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index bde88681ba1..5f3d4eb18f7 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -337,6 +337,22 @@ in {
     };
   };
 
+  eclipse-platform = buildEclipse {
+    name = "eclipse-platform-4.5";
+    description = "Eclipse platform";
+    sources = {
+      "x86_64-linux" = fetchurl {
+          url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk-x86_64.tar.gz";
+          sha256 = "1510j41yr86pbzwf48kjjdd46nkpkh8zwn0hna0cqvsw1gk2vqcg";
+
+        };
+      "i686-linux" = fetchurl {
+          url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk.tar.gz";
+          sha256 = "1f97jd3qbi3830y3djk8bhwzd9whsq8gzfdk996chxc55prn0qbd";
+        };
+    };
+  };
+
   eclipseWithPlugins = { eclipse, plugins ? [], jvmArgs ? [] }:
     let
       # Gather up the desired plugins.

From c24e01665b72a537c6ff3623439a676e4c6d0ca9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 29 Jul 2015 23:29:38 +0200
Subject: [PATCH 0988/2016] eclipses.plugins: add `buildEclipsePluginBase`

This function provides functionality common to all Eclipse plugin
builders. In particular, it sets a package name and flags the derivation
as an Eclipse plugin.
---
 pkgs/applications/editors/eclipse/default.nix |  4 ++-
 pkgs/applications/editors/eclipse/plugins.nix | 31 +++++++++++++------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 5f3d4eb18f7..b3b9d273257 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -358,7 +358,9 @@ in {
       # Gather up the desired plugins.
       pluginEnv = buildEnv {
         name = "eclipse-plugins";
-        paths = plugins;
+        paths =
+          with stdenv.lib;
+            filter (x: x ? isEclipsePlugin) (closePropagation plugins);
       };
 
       # Prepare the JVM arguments to add to the ini file. We here also
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index cba556074a1..88ebaa4c4a5 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -2,20 +2,33 @@
 
 let
 
+  buildEclipsePluginBase =  { name
+                            , buildInputs ? []
+                            , passthru ? {}
+                            , ... } @ attrs:
+    stdenv.mkDerivation (attrs // {
+      name = "eclipse-" + name;
+
+      buildInputs = buildInputs ++ [ unzip ];
+
+      passthru = {
+        isEclipsePlugin = true;
+      } // passthru;
+    });
+
   # Helper for the common case where we have separate feature and
   # plugin JARs.
-  buildEclipsePlugin = { name, version, javaName, srcFeature, srcPlugin, meta }:
-    stdenv.mkDerivation {
-      name = "eclipse-" + name;
-      inherit meta;
+  buildEclipsePlugin = { name, version, javaName, srcFeature, srcPlugin, meta, propagatedBuildInputs ? [] }:
+    buildEclipsePluginBase {
+      inherit name meta propagatedBuildInputs;
 
       srcs = [ srcFeature srcPlugin ];
 
-      buildInputs = [ unzip ];
       phases = [ "installPhase" ];
 
       installPhase = ''
         dropinDir="$out/eclipse/dropins/${name}"
+
         mkdir -p $dropinDir/features/${javaName}_${version}
         unzip ${srcFeature} -d $dropinDir/features/${javaName}_${version}
 
@@ -27,12 +40,10 @@ let
 
   # Helper for the case where we have a ZIP file containing an Eclipse
   # update site.
-  buildEclipseUpdateSite = { name, version, src, meta }:
-    stdenv.mkDerivation {
-      name = "eclipse-" + name;
-      inherit meta src;
+  buildEclipseUpdateSite = { name, version, src, meta, propagatedBuildInputs ? [] }:
+    buildEclipsePluginBase {
+      inherit name meta src propagatedBuildInputs;
 
-      buildInputs = [ unzip ];
       phases = [ "unpackPhase" "installPhase" ];
 
       installPhase = ''

From b253f95529daf82a81aab046a3781d3748499211 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 30 Jul 2015 23:27:57 +0200
Subject: [PATCH 0989/2016] eclipses.plugins: put standard builders in set

This makes these builder functions available for use outside the file.
That is, plugins can be defined out-of-tree.
---
 pkgs/applications/editors/eclipse/plugins.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 88ebaa4c4a5..1bd8b39ec62 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchzip, unzip }:
 
-let
+rec {
 
   buildEclipsePluginBase =  { name
                             , buildInputs ? []
@@ -62,8 +62,6 @@ let
       '';
     };
 
-in {
-
   anyedittools = buildEclipsePlugin rec {
     name = "anyedit-${version}";
     version = "2.4.15.201504172030";

From 4134d6b5b96355cb07848ea5aba5558a72b415df Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 30 Jul 2015 23:31:57 +0200
Subject: [PATCH 0990/2016] eclipse-acejump: init at 1.0.0.201501181511

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 1bd8b39ec62..0f2c37b9b6a 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -62,6 +62,30 @@ rec {
       '';
     };
 
+  acejump = buildEclipsePlugin rec {
+    name = "acejump-${version}";
+    version = "1.0.0.201501181511";
+    javaName = "acejump";
+
+    srcFeature = fetchurl {
+      url = "https://tobiasmelcher.github.io/acejumpeclipse/features/${javaName}.feature_${version}.jar";
+      sha256 = "127xqrnns4h96g21c9zg0iblxprx3fg6fg0w5f413rf84415z884";
+    };
+
+    srcPlugin = fetchurl {
+      url = "https://tobiasmelcher.github.io/acejumpeclipse/plugins/${javaName}_${version}.jar";
+      sha256 = "0mz79ca32yryidd1wijirvnmfg4j5q4g84vdspdi56z0r4xrja13";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/tobiasmelcher/EclipseAceJump;
+      description = "Provides fast jumps to text based on initial letter";
+      license = licenses.mit;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   anyedittools = buildEclipsePlugin rec {
     name = "anyedit-${version}";
     version = "2.4.15.201504172030";

From 0bbaba47e9a45d7cb802031461be8caaf0f3a03d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 30 Jul 2015 23:36:14 +0200
Subject: [PATCH 0991/2016] eclipses: do not recurse into plugins.nix

It does not really make sense to install the plugin packages directly as
they are intended for use with `eclipseWithPlugins`. Therefore it is
best not to present them to users as such.
---
 pkgs/applications/editors/eclipse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index b3b9d273257..7d543c4ed55 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -3,7 +3,7 @@
 , glib, gtk, libXtst, jre
 , webkitgtk2 ? null  # for internal web browser
 , buildEnv, writeText, runCommand
-, recurseIntoAttrs, callPackage
+, callPackage
 }:
 
 assert stdenv ? glibc;
@@ -388,6 +388,6 @@ in {
         ln -s ${eclipse}/share $out/
       '';
 
-  plugins = recurseIntoAttrs (callPackage ./plugins.nix { });
+  plugins = callPackage ./plugins.nix { };
 
 }

From d0bbbd42f01964649d4783021202adcf4778d0ae Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 1 Aug 2015 10:43:58 +0200
Subject: [PATCH 0992/2016] eclipse.plugins: remove useless function arguments

Simplifies `buildEclipsePlugin` and `buildEclipseUpdateSite` functions
such that they require only absolutely necessary arguments. Also
add/expand comments slightly.
---
 pkgs/applications/editors/eclipse/plugins.nix | 54 +++++++++----------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 0f2c37b9b6a..0a3391b289d 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -2,6 +2,8 @@
 
 rec {
 
+  # A primitive builder of Eclipse plugins. This function is intended
+  # to be used when building more advanced builders.
   buildEclipsePluginBase =  { name
                             , buildInputs ? []
                             , passthru ? {}
@@ -18,10 +20,8 @@ rec {
 
   # Helper for the common case where we have separate feature and
   # plugin JARs.
-  buildEclipsePlugin = { name, version, javaName, srcFeature, srcPlugin, meta, propagatedBuildInputs ? [] }:
-    buildEclipsePluginBase {
-      inherit name meta propagatedBuildInputs;
-
+  buildEclipsePlugin = { name, srcFeature, srcPlugin, ... } @ attrs:
+    buildEclipsePluginBase (attrs // {
       srcs = [ srcFeature srcPlugin ];
 
       phases = [ "installPhase" ];
@@ -29,21 +29,21 @@ rec {
       installPhase = ''
         dropinDir="$out/eclipse/dropins/${name}"
 
-        mkdir -p $dropinDir/features/${javaName}_${version}
-        unzip ${srcFeature} -d $dropinDir/features/${javaName}_${version}
+        mkdir -p $dropinDir/features
+        unzip ${srcFeature} -d $dropinDir/features/
 
         mkdir -p $dropinDir/plugins
-        cp -v ${srcPlugin} $dropinDir/plugins/${javaName}_${version}.jar
+        cp -v ${srcPlugin} $dropinDir/plugins/${name}.jar
       '';
 
-    };
-
-  # Helper for the case where we have a ZIP file containing an Eclipse
-  # update site.
-  buildEclipseUpdateSite = { name, version, src, meta, propagatedBuildInputs ? [] }:
-    buildEclipsePluginBase {
-      inherit name meta src propagatedBuildInputs;
+    });
 
+  # Helper for the case where the build directory has the layout of an
+  # Eclipse update site, that is, it contains the directories
+  # `features` and `plugins`. All features and plugins inside these
+  # directories will be installed.
+  buildEclipseUpdateSite = { name, ... } @ attrs:
+    buildEclipsePluginBase (attrs // {
       phases = [ "unpackPhase" "installPhase" ];
 
       installPhase = ''
@@ -60,20 +60,19 @@ rec {
         mkdir -p $dropinDir/plugins
         cp -v "plugins/"*.jar $dropinDir/plugins/
       '';
-    };
+    });
 
   acejump = buildEclipsePlugin rec {
     name = "acejump-${version}";
     version = "1.0.0.201501181511";
-    javaName = "acejump";
 
     srcFeature = fetchurl {
-      url = "https://tobiasmelcher.github.io/acejumpeclipse/features/${javaName}.feature_${version}.jar";
+      url = "https://tobiasmelcher.github.io/acejumpeclipse/features/acejump.feature_${version}.jar";
       sha256 = "127xqrnns4h96g21c9zg0iblxprx3fg6fg0w5f413rf84415z884";
     };
 
     srcPlugin = fetchurl {
-      url = "https://tobiasmelcher.github.io/acejumpeclipse/plugins/${javaName}_${version}.jar";
+      url = "https://tobiasmelcher.github.io/acejumpeclipse/plugins/acejump_${version}.jar";
       sha256 = "0mz79ca32yryidd1wijirvnmfg4j5q4g84vdspdi56z0r4xrja13";
     };
 
@@ -89,7 +88,6 @@ rec {
   anyedittools = buildEclipsePlugin rec {
     name = "anyedit-${version}";
     version = "2.4.15.201504172030";
-    javaName = "de.loskutov.anyedit.AnyEditTools";
 
     srcFeature = fetchurl {
       url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
@@ -97,7 +95,7 @@ rec {
     };
 
     srcPlugin = fetchurl {
-      url = "http://dl.bintray.com/iloveeclipse/plugins/${javaName}_${version}.jar";
+      url = "http://dl.bintray.com/iloveeclipse/plugins/de.loskutov.anyedit.AnyEditTools_${version}.jar";
       sha256 = "1i3ghf2mhdfhify30hlyxqmyqcp40pkd5zhsiyg6finn4w81sxv2";
     };
 
@@ -133,15 +131,14 @@ rec {
   color-theme = buildEclipsePlugin rec {
     name = "color-theme-${version}";
     version = "1.0.0.201410260308";
-    javaName = "com.github.eclipsecolortheme";
 
     srcFeature = fetchurl {
-      url = "https://eclipse-color-theme.github.io/update/features/${javaName}.feature_${version}.jar";
+      url = "https://eclipse-color-theme.github.io/update/features/com.github.eclipsecolortheme.feature_${version}.jar";
       sha256 = "128b9b1cib5ff0w1114ns5mrbrhj2kcm358l4dpnma1s8gklm8g2";
     };
 
     srcPlugin = fetchurl {
-      url = "https://eclipse-color-theme.github.io/update/plugins/${javaName}_${version}.jar";
+      url = "https://eclipse-color-theme.github.io/update/plugins/com.github.eclipsecolortheme_${version}.jar";
       sha256 = "0wz61909bhqwzpqwll27ia0cn3anyp81haqx3rj1iq42cbl42h0y";
     };
 
@@ -176,15 +173,14 @@ rec {
   emacsplus = buildEclipsePlugin rec {
     name = "emacsplus-${version}";
     version = "4.2.0";
-    javaName = "com.mulgasoft.emacsplus";
 
     srcFeature = fetchurl {
-      url = "http://www.mulgasoft.com/emacsplus/e4/update-site/features/${javaName}.feature_${version}.jar";
+      url = "http://www.mulgasoft.com/emacsplus/e4/update-site/features/com.mulgasoft.emacsplus.feature_${version}.jar";
       sha256 = "0wja3cd7gq8w25797fxnafvcncjnmlv8qkl5iwqj7zja2f45vka8";
     };
 
     srcPlugin = fetchurl {
-      url = "http://www.mulgasoft.com/emacsplus/e4/update-site/plugins/${javaName}_${version}.jar";
+      url = "http://www.mulgasoft.com/emacsplus/e4/update-site/plugins/com.mulgasoft.emacsplus_${version}.jar";
       sha256 = "08yw45nr90mlpdzim74vsvdaxj41sgpxcrqk5ia6l2dzvrqlsjs1";
     };
 
@@ -200,15 +196,14 @@ rec {
   findbugs = buildEclipsePlugin rec {
     name = "findbugs-${version}";
     version = "3.0.1.20150306-5afe4d1";
-    javaName = "edu.umd.cs.findbugs.plugin.eclipse";
 
     srcFeature = fetchurl {
-      url = "http://findbugs.cs.umd.edu/eclipse/features/${javaName}_${version}.jar";
+      url = "http://findbugs.cs.umd.edu/eclipse/features/edu.umd.cs.findbugs.plugin.eclipse_${version}.jar";
       sha256 = "1m9fav2xlb9wrx2d00lpnh2sy0w5yzawynxm6xhhbfdzd0vpfr9v";
     };
 
     srcPlugin = fetchurl {
-      url = "http://findbugs.cs.umd.edu/eclipse/plugins/${javaName}_${version}.jar";
+      url = "http://findbugs.cs.umd.edu/eclipse/plugins/edu.umd.cs.findbugs.plugin.eclipse_${version}.jar";
       sha256 = "10p3mrbp9wi6jhlmmc23qv7frh605a23pqsc7w96569bsfb5wa8q";
     };
 
@@ -261,7 +256,6 @@ rec {
   testng = buildEclipsePlugin rec {
     name = "testng-${version}";
     version = "6.9.5.201506120235";
-    javaName = "org.testng.eclipse";
 
     srcFeature = fetchurl {
       url = "http://beust.com/eclipse/features/org.testng.eclipse_6.9.5.201506120235.jar";

From 7d60bb48eba26a768cf0985e2da0b8c4b6ec3e0c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 1 Aug 2015 10:47:21 +0200
Subject: [PATCH 0993/2016] scala-eclipse: 4.1.0 -> 4.1.1

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 0a3391b289d..c79b85b74bd 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -237,11 +237,11 @@ rec {
 
   scala = buildEclipseUpdateSite rec {
     name = "scala-${version}";
-    version = "4.1.0";
+    version = "4.1.1";
 
     src = fetchzip {
       url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip";
-      sha256 = "1z3pl88kw9qyhhsi8sqwz30c12l7zg8jiz6bz1js7jzpjbs8v70f";
+      sha256 = "0p2dbf56rw733dhsxy9hdwmbzqlk01j8f2hci21bsipq5w2144x6";
     };
 
     meta = with stdenv.lib; {

From 24a5d478837f6e845ca9128f23cc672b78a3eaf3 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 1 Aug 2015 15:16:17 +0200
Subject: [PATCH 0994/2016] eclipse.plugins: unpack plugins when required

Some plugin bundles must be unpacked when used in Eclipse. With this
change the plugin manifest is checked for the setting indicating that
unpacking should happen.
---
 pkgs/applications/editors/eclipse/plugins.nix | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index c79b85b74bd..f0de68a1a2b 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -49,16 +49,35 @@ rec {
       installPhase = ''
         dropinDir="$out/eclipse/dropins/${name}"
 
+        # Install features.
         cd features
         for feature in *.jar; do
-          feat=''${feature%.jar}
-          mkdir -p $dropinDir/features/$feat
-          unzip $feature -d $dropinDir/features/$feat
+          featureName=''${feature%.jar}
+          mkdir -p $dropinDir/features/$featureName
+          unzip $feature -d $dropinDir/features/$featureName
         done
         cd ..
 
+        # Install plugins.
         mkdir -p $dropinDir/plugins
-        cp -v "plugins/"*.jar $dropinDir/plugins/
+
+        # A bundle should be unpacked if the manifest matches this
+        # pattern.
+        unpackPat="Eclipse-BundleShape:\\s*dir"
+
+        cd plugins
+        for plugin in *.jar ; do
+          pluginName=''${plugin%.jar}
+          manifest=$(unzip -p $plugin META-INF/MANIFEST.MF)
+
+          if [[ $manifest =~ $unpackPat ]] ; then
+            mkdir $dropinDir/plugins/$pluginName
+            unzip $plugin -d $dropinDir/plugins/$pluginName
+          else
+            cp -v $plugin $dropinDir/plugins/
+          fi
+        done
+        cd ..
       '';
     });
 

From c71d44c724be7ca87c5e426bab350b7261678430 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 7 Aug 2015 18:31:12 +0200
Subject: [PATCH 0995/2016] nixpkgs doc: add package notes for Eclipse

---
 doc/package-notes.xml | 126 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 126 insertions(+)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index ecaf619472d..266a8092216 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -219,5 +219,131 @@ you should modify
 </section>
 -->
 
+<!--============================================================-->
+
+<section xml:id="sec-eclipse">
+
+  <title>Eclipse</title>
+
+  <para>
+    The Nix expressions related to the Eclipse platform and IDE are in
+    <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/eclipse"><filename>pkgs/applications/editors/eclipse</filename></link>.
+  </para>
+
+  <para>
+    Nixpkgs provides a number of packages that will install Eclipse in
+    its various forms, these range from the bare-bones Eclipse
+    Platform to the more fully featured Eclipse SDK or Scala-IDE
+    packages and multiple version are often available. It is possible
+    to list available Eclipse packages by issuing the command:
+
+<screen>
+$ nix-env -f '&lt;nixpkgs&gt;' -qaP -A eclipses --description
+</screen>
+
+    Once an Eclipse variant is installed it can be run using the
+    <command>eclipse</command> command, as expected. From within
+    Eclipse it is then possible to install plugins in the usual manner
+    by either manually specifying an Eclipse update site or by
+    installing the Marketplace Client plugin and using it to discover
+    and install other plugins. This installation method provides an
+    Eclipse installation that closely resemble a manually installed
+    Eclipse.
+  </para>
+
+  <para>
+    If you prefer to install plugins in a more declarative manner then
+    Nixpkgs also offer a number of Eclipse plugins that can be
+    installed in an <emphasis>Eclipse environment</emphasis>. This
+    type of environment is created using the function
+    <varname>eclipseWithPlugins</varname> found inside the
+    <varname>nixpkgs.eclipses</varname> attribute set. This function
+    takes as argument <literal>{ eclipse, plugins ? [], jvmArgs ? []
+    }</literal> where <varname>eclipse</varname> is a one of the
+    Eclipse packages described above, <varname>plugins</varname> is a
+    list of plugin derivations, and <varname>jvmArgs</varname> is a
+    list of arguments given to the JVM running the Eclipse. For
+    example, say you wish to install the latest Eclipse Platform with
+    the popular Eclipse Color Theme plugin and also allow Eclipse to
+    use more RAM. You could then add
+
+<screen>
+packageOverrides = pkgs: {
+  myEclipse = with pkgs.eclipses; eclipseWithPlugins {
+    eclipse = eclipse-platform;
+    jvmArgs = [ "-Xmx2048m" ];
+    plugins = [ plugins.color-theme ];
+  };
+}
+</screen>
+
+    to your Nixpkgs configuration
+    (<filename>~/.nixpkgs/config.nix</filename>) and install it by
+    running <command>nix-env -f '&lt;nixpkgs&gt;' -iA
+    myEclipse</command> and afterward run Eclipse as usual. It is
+    possible to find out which plugins are available for installation
+    using <varname>eclipseWithPlugins</varname> by running
+
+<screen>
+$ nix-env -f '&lt;nixpkgs&gt;' -qaP -A eclipses.plugins --description
+</screen>
+  </para>
+
+  <para>
+    If there is a need to install plugins that are not available in
+    Nixpkgs then it may be possible to define these plugins outside
+    Nixpkgs using the <varname>buildEclipseUpdateSite</varname> and
+    <varname>buildEclipsePlugin</varname> functions found in the
+    <varname>nixpkgs.eclipses.plugins</varname> attribute set. Use the
+    <varname>buildEclipseUpdateSite</varname> function to install a
+    plugin distributed as an Eclipse update site. This function takes
+    <literal>{ name, src }</literal> as argument where
+    <literal>src</literal> indicates the Eclipse update site archive.
+    All Eclipse features and plugins within the downloaded update site
+    will be installed. When an update site archive is not available
+    then the <varname>buildEclipsePlugin</varname> function can be
+    used to install a plugin that consists of a pair of feature and
+    plugin JARs. This function takes an argument <literal>{ name,
+    srcFeature, srcPlugin }</literal> where
+    <literal>srcFeature</literal> and <literal>srcPlugin</literal> are
+    the feature and plugin JARs, respectively.
+  </para>
+
+  <para>
+    Expanding the previous example with two plugins using the above
+    functions we have
+<screen>
+packageOverrides = pkgs: {
+  myEclipse = with pkgs.eclipses; eclipseWithPlugins {
+    eclipse = eclipse-platform;
+    jvmArgs = [ "-Xmx2048m" ];
+    plugins = [
+      plugins.color-theme
+      (plugins.buildEclipsePlugin {
+        name = "myplugin1-1.0";
+        srcFeature = fetchurl {
+          url = "http://…/features/myplugin1.jar";
+          sha256 = "123…";
+        };
+        srcPlugin = fetchurl {
+          url = "http://…/plugins/myplugin1.jar";
+          sha256 = "123…";
+        };
+      });
+      (plugins.buildEclipseUpdateSite {
+        name = "myplugin2-1.0";
+        src = fetchurl {
+          stripRoot = false;
+          url = "http://…/myplugin2.zip";
+          sha256 = "123…";
+        };
+      });
+    ];
+  };
+}
+</screen>
+  </para>
+
+</section>
 
 </chapter>

From 50a58458557712ab8eec07ad591737fe3f6873ad Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 10 Aug 2015 23:06:13 +0200
Subject: [PATCH 0996/2016] xpra: fix rencode dependency

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

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index ef8b224c612..5ef80e887cf 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage
+{ stdenv, fetchurl, buildPythonPackage, pythonPackages
 , python, cython, pkgconfig
 , xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo
 , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    pil pygtk pygobject
+    pil pygtk pygobject pythonPackages.rencode
   ];
 
   postPatch = ''

From 0bc1d0503772c4993fadd95ad51995b713675c84 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 10 Aug 2015 23:03:33 +0200
Subject: [PATCH 0997/2016] rencode python package: init at git 2015/08/10

---
 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 818bdba09e5..15938e0ad07 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11496,6 +11496,26 @@ let
     };
   };
 
+  rencode = buildPythonPackage rec {
+    name = "rencode-${version}";
+    version = "git20150810";
+    disabled = isPy33;
+
+    src = pkgs.fetchgit {
+      url = https://github.com/aresch/rencode;
+      rev = "b45e04abdca0dea36e383a8199783269f186c99e";
+      sha256 = "b4bd82852d4220e8a9493d3cfaecbc57b1325708a2d48c0f8acf262edb10dc40";
+    };
+
+    buildInputs = with self; [ cython ];
+
+    meta = {
+      homepage = https://github.com/aresch/rencode;
+      description = "Fast (basic) object serialization similar to bencode";
+      license = licenses.gpl3;
+    };
+  };
+
 
   reportlab =
    let freetype = overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; });

From fb24c7c95b586678c2b65e6751a7797844c44e28 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 11 Aug 2015 03:14:09 +0200
Subject: [PATCH 0998/2016] nixos/testing: Don't shadow "lib" in makePerlPath.

Regression introduced by 032f0ffdd03fa4d836825bcbb7e89f1abcf7e57f.

The change doesn't look obvious at the first sight why it may cause
problems with lib.makePerlPath, but it introduces a Perl package called
"lib".

And using "with perlPackages;" uses the Perl library "lib" instead of
the lib attribute set from pkgs.

So let's use pkgs.lib.makePerlPath directly in hope that there won't be
a Perl package anytime soon which is called "pkgs".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/lib/testing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 59d05f87d5f..d9b4ec89ce7 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -28,7 +28,7 @@ rec {
 
         wrapProgram $out/bin/nixos-test-driver \
           --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \
-          --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
+          --prefix PERL5LIB : "${with perlPackages; pkgs.lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
       '';
   };
 

From 5fe578d706c87519659adf0b8bf2331f27dea34d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 10 Aug 2015 23:30:59 -0700
Subject: [PATCH 0999/2016] kernel: 3.10.85 -> 3.10.86

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 0d3bfbefcca..909535c5225 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.85";
+  version = "3.10.86";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1zn8113m6y1wqmnr6gjzrr7ly2l8860fp2kr4q9di3c2vmnmd9v9";
+    sha256 = "1kax24y6xa49n4wc74qg503pbg0rd2imx5npyfp1wcnc6p68w0mr";
   };
 
   features.iwlwifi = true;

From 5e33890995e0f22cf7fff48a1f934bca8bd2b38e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 10 Aug 2015 23:31:07 -0700
Subject: [PATCH 1000/2016] kernel: 3.12.45 -> 3.12.46

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index e6e04b7db53..904aebd75be 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.45";
+  version = "3.12.46";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "01p3zbhngqnkmzw38xmxd0lf97kf2h7ihgss6bgdnkpqrbzb1pqf";
+    sha256 = "01w0b1sifzivbagm724bz0mlfrm7hpbj5a3lx1yrv8xg64gni3m1";
   };
 
   features.iwlwifi = true;

From 9f79c1e6ebff9f7376027a234df7ab34f53217f6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 10 Aug 2015 23:31:23 -0700
Subject: [PATCH 1001/2016] kernel: 3.18.19 -> 3.18.20

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 527ded2db94..05c4b989f39 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.19";
+  version = "3.18.20";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1jdp4mixggzjy1v806v5q7qqimkm6pbjav3gwbcl2cccv6wd701x";
+    sha256 = "1mwm9xgilsqnj95v3jn94dz9a108ggfm4ifb3kxsfsx5rcl5yy8d";
   };
 
   features.iwlwifi = true;

From 974b9cc8ccfbf3f704e331dc9070b5a9566d7201 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 10 Aug 2015 23:31:31 -0700
Subject: [PATCH 1002/2016] kernel: 4.1.4 -> 4.1.5

---
 pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index e8534656349..6c0ba082e36 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1.4";
+  version = "4.1.5";
   # Remember to update grsecurity!
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "17whsim5l9i486y5kchfpm9jhbr9lak4a1gdqygp5kwfrfyz5qiy";
+    sha256 = "0v40vhcs3hkjw7gl71jq03ziz93cfh3vlpn686kc9y1nnbcxks5j";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index f3e33047e8b..8603ccb82c7 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -72,10 +72,10 @@ rec {
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "4.1.4";
-      revision  = "201508032312";
+    { kversion  = "4.1.5";
+      revision  = "201508102129";
       branch    = "test";
-      sha256    = "16p1wq98qgwksav0ry6b5jyyi26s404v1k0cwpj7l7n86hxig67i";
+      sha256    = "1pc40xd7k0fzzd99lshy58gnapv701hjvc4bm0slfzagh241545a";
     };
 
   grsec_fix_path =

From 2cec29f646cbbeaee7ecddee6800ee1fad985c5e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 10 Aug 2015 23:34:20 -0700
Subject: [PATCH 1003/2016] linux-3.19: Remove stale nix file

---
 pkgs/os-specific/linux/kernel/linux-3.19.nix | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.19.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix
deleted file mode 100644
index 90c5f9e31d3..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.19.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "3.19.8";
-  extraMeta.branch = "3.19";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0yg2mlq0h9my6k1bg3b255w4qnyx609ngh1nhssx3gbzslwf0jyg";
-  };
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
-  features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))

From 52e55d85cb42a32aeceb9da89bad00be006be042 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 10 Aug 2015 23:31:15 -0700
Subject: [PATCH 1004/2016] kernel: 3.14.49 -> 3.14.50

---
 pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index c4171948436..569c05fa283 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.49";
+  version = "3.14.50";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1x9p6z195c0nv7hsjcwzmr89yag35v3pyrs0081k2d8dykbl70zs";
+    sha256 = "1bc0g8a707sfqhi9yifaijxzmfrqgry7l1j9473376q0f8pkwjvy";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 8603ccb82c7..4ae1a4e4189 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -65,10 +65,10 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.49";
-      revision  = "201508032312";
+    { kversion  = "3.14.50";
+      revision  = "201508102128";
       branch    = "stable";
-      sha256    = "09x0rb4pgmghcp6sdz57lwhawlb3bzrc3rg372xknhv6993ainjc";
+      sha256    = "0inp0ab8pcjfj1wnrkyiwb6cxjp2ymqcjv7lq30a4ij6qcvmfb5s";
     };
 
   grsecurity_unstable = grsecPatch

From b1ed04ad1d56f882b6187ad75be6151535742a52 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 10 Aug 2015 23:42:17 -0700
Subject: [PATCH 1005/2016] texinfo: 5.2 -> 6.0

---
 pkgs/development/tools/misc/texinfo/6.0.nix | 44 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  5 ++-
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/misc/texinfo/6.0.nix

diff --git a/pkgs/development/tools/misc/texinfo/6.0.nix b/pkgs/development/tools/misc/texinfo/6.0.nix
new file mode 100644
index 00000000000..ffeae17eb57
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/6.0.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }:
+
+stdenv.mkDerivation rec {
+  name = "texinfo-6.0";
+
+  src = fetchurl {
+    url = "mirror://gnu/texinfo/${name}.tar.xz";
+    sha256 = "1r3i6jyynn6ab45fxw5bms8mflk9ry4qpj6gqyry72vfd5c47fhi";
+  };
+
+  buildInputs = [ perl xz ]
+    ++ stdenv.lib.optional interactive ncurses;
+
+  preInstall = ''
+    installFlags="TEXMF=$out/texmf-dist";
+    installTargets="install install-tex";
+  '';
+
+  doCheck = !stdenv.isDarwin;
+
+  meta = {
+    homepage = "http://www.gnu.org/software/texinfo/";
+    description = "The GNU documentation system";
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.all;
+
+    longDescription = ''
+      Texinfo is the official documentation format of the GNU project.
+      It was invented by Richard Stallman and Bob Chassell many years
+      ago, loosely based on Brian Reid's Scribe and other formatting
+      languages of the time.  It is used by many non-GNU projects as
+      well.
+
+      Texinfo uses a single source file to produce output in a number
+      of formats, both online and printed (dvi, html, info, pdf, xml,
+      etc.).  This means that instead of writing different documents
+      for online information and another for a printed manual, you
+      need write only one document.  And when the work is revised, you
+      need revise only that one document.  The Texinfo system is
+      well-integrated with GNU Emacs.
+    '';
+    branch = "5.2";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6181925a507..2dd01957be7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5811,9 +5811,10 @@ let
   teensy-loader = callPackage ../development/tools/misc/teensy { };
 
   texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
-  texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
   texinfo4 = texinfo413;
-  texinfo = texinfo5;
+  texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
+  texinfo6 = callPackage ../development/tools/misc/texinfo/6.0.nix { };
+  texinfo = texinfo6;
   texinfoInteractive = appendToName "interactive" (
     texinfo.override { interactive = true; }
   );

From b9d8c720987b587040e2efe9f18b1216aa294586 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 11 Aug 2015 10:48:58 +0200
Subject: [PATCH 1006/2016] gjs: 1.42 -> 1.43

---
 pkgs/desktops/gnome-3/3.16/core/gjs/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
index 2bb4364a19e..b736e1cd812 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
@@ -1,22 +1,23 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_24, pango }:
+{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
+, spidermonkey_24, pango, readline, glib }:
 
 let
-  majorVersion = "1.42";
+  majorVersion = "1.43";
 in
 stdenv.mkDerivation rec {
-  name = "gjs-${majorVersion}.0";
+  name = "gjs-${majorVersion}.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${majorVersion}/${name}.tar.xz";
-    sha256 = "0c9afb7d5be6ead5b68059596f08eb7c3902b1676ee9c8846aa8df09647dba13";
+    sha256 = "0khwm8l6m6x71rwf3q92d6scbhmrpiw7kqmj34nn588fb7a4vdc2";
   };
 
-  buildInputs = with gnome3;
-    [ gobjectIntrospection pkgconfig glib pango ];
+  buildInputs = [ gobjectIntrospection pkgconfig gtk3 glib pango readline ];
 
   propagatedBuildInputs = [ spidermonkey_24 ];
 
   meta = with stdenv.lib; {
+    maintainers = gnome3.maintainers;
     platforms = platforms.linux;
   };
 

From 6a56ac18ad66634cc65989514ecd8e19ee14b203 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 11 Aug 2015 10:49:20 +0200
Subject: [PATCH 1007/2016] polari: init at 3.16.1

---
 .../gnome-3/3.16/apps/polari/default.nix      | 27 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/polari/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix
new file mode 100644
index 00000000000..21ba8db37d4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
+, telepathy_glib, gjs, itstool, telepathy_idle
+, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "polari-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/polari/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0w7hc5i78kq4dkyzpdb9byk4rhqa569cmbg09nh3qxn8ninscdqx";
+  };
+
+  propagatedUserEnvPkgs = [ telepathy_idle ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook
+                  telepathy_glib gjs gdk_pixbuf librsvg ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Polari;
+    description = "IRC chat client designed to integrate with the GNOME desktop";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 8be88e42db9..46542e53f74 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -276,6 +276,8 @@ let
 
   nautilus-sendto = callPackage ./apps/nautilus-sendto { };
 
+  polari = callPackage ./apps/polari { };
+
   # scrollkeeper replacement
   rarian = callPackage ./desktop/rarian { };
 

From a6f466065cf19ef682134b960b5f6a5842a05668 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2015 11:46:31 +0200
Subject: [PATCH 1008/2016] mysql: Update to 5.4.45

---
 pkgs/servers/sql/mysql/5.5.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index 0a95db91d87..03a7840677b 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.5.44";
+  version = "5.5.45";
 
   src = fetchurl {
-    url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz";
-    sha256 = "1pp5ngm4ibnp8xnn9haz1db0favd1i7cxdgl5z4677mkgljmpw45";
+    url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
+    sha256 = "0clkr3r44j8nsgmjzv6r09pb0vjangn5hpyjxgg5ynr674ygskkl";
   };
 
   patches = if stdenv.isCygwin then [

From a5645c589644a19ee45201e22fa39cdba637560e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2015 11:52:13 +0200
Subject: [PATCH 1009/2016] Let's not have a package named "lib"

See https://github.com/NixOS/nixpkgs/commit/fb24c7c95b586678c2b65e6751a7797844c44e28.

The "_" suffix follows the convention of the "if" package.
---
 nixos/lib/testing.nix            | 2 +-
 pkgs/top-level/perl-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index d9b4ec89ce7..59d05f87d5f 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -28,7 +28,7 @@ rec {
 
         wrapProgram $out/bin/nixos-test-driver \
           --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \
-          --prefix PERL5LIB : "${with perlPackages; pkgs.lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
+          --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
       '';
   };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c9b26985780..d8d66ff1cd4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5739,7 +5739,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  lib = buildPerlPackage {
+  lib_ = buildPerlPackage {
     name = "lib-0.63";
     src = fetchurl {
       url = mirror://cpan/authors/id/S/SM/SMUELLER/lib-0.63.tar.gz;

From 471cdd15e2dd6ac1c20aa18e177e590d67de2c44 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 4 Aug 2015 13:07:31 +0200
Subject: [PATCH 1010/2016] chromium: Update beta and dev channels.

Overview of the updated versions:

beta: 45.0.2454.15 -> 45.0.2454.26
dev:  45.0.2454.15 -> 46.0.2471.2

Changes for getting beta and dev channel to build:

 * The reference for chrome::FILE_FLASH_PLUGIN doesn't exist anymore in
   version 46, because it has been dropped upstream, see the following
   review URL:

   https://codereview.chromium.org/1255943002

   We set the PPAPI Flash path using a command line flag anyway, so it
   doesn't hurt us if we don't patch that path (which was an old
   artifact from the NSAPI->PPAPI conversion anyway).

Changes for the dev channel only:

 * It seems that in the SCM, chrome/test/data/webui/ contains a lot of
   files, however they are missing in the tarball.

   This has been reported upstream at: https://crbug.com/515917

   Our fix is to just not include webui/i18n_process_css_test.html at
   all, to avoid the configure (gyp) phase to fail, because we're not
   building tests anyway.

All channels built and tested by my Hydra instance at:

https://headcounter.org/hydra/eval/218978

Test reports:

x86:    https://headcounter.org/hydra/build/723341/download/1/log.html
x86_64: https://headcounter.org/hydra/build/723342/download/1/log.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../chromium/source/build_fixes_46.patch      | 14 ++++
 .../browsers/chromium/source/default.nix      |  6 +-
 .../chromium/source/nix_plugin_paths_46.patch | 75 +++++++++++++++++++
 .../browsers/chromium/source/sources.nix      | 16 ++--
 4 files changed, 102 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/source/build_fixes_46.patch
 create mode 100644 pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_46.patch

diff --git a/pkgs/applications/networking/browsers/chromium/source/build_fixes_46.patch b/pkgs/applications/networking/browsers/chromium/source/build_fixes_46.patch
new file mode 100644
index 00000000000..c0aeb5d3a56
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/source/build_fixes_46.patch
@@ -0,0 +1,14 @@
+diff --git a/chrome/test/data/webui_test_resources.grd b/chrome/test/data/webui_test_resources.grd
+index 6f8530d..f92a76a 100644
+--- a/chrome/test/data/webui_test_resources.grd
++++ b/chrome/test/data/webui_test_resources.grd
+@@ -6,9 +6,4 @@
+     </output>
+     <output filename="webui_test_resources.pak" type="data_package" />
+   </outputs>
+-  <release seq="1">
+-    <includes>
+-      <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST" file="webui/i18n_process_css_test.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+-    </includes>
+-  </release>
+ </grit>
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index 98445cedfdc..732568291d3 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -44,7 +44,11 @@ in stdenv.mkDerivation {
     done
   '';
 
-  patches = singleton ./nix_plugin_paths_44.patch;
+  patches =
+    if versionOlder version "45.0.0.0"
+    then singleton ./nix_plugin_paths_44.patch
+    else singleton ./nix_plugin_paths_46.patch ++
+         optional (!versionOlder version "46.0.0.0") ./build_fixes_46.patch;
 
   patchPhase = let
     diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}";
diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_46.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_46.patch
new file mode 100644
index 00000000000..7482be7062d
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_46.patch
@@ -0,0 +1,75 @@
+diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
+index 74bf041..5f34198 100644
+--- a/chrome/common/chrome_paths.cc
++++ b/chrome/common/chrome_paths.cc
+@@ -66,21 +66,14 @@ static base::LazyInstance<base::FilePath>
+     g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
+ 
+ // Gets the path for internal plugins.
+-bool GetInternalPluginsDirectory(base::FilePath* result) {
+-#if defined(OS_MACOSX) && !defined(OS_IOS)
+-  // If called from Chrome, get internal plugins from a subdirectory of the
+-  // framework.
+-  if (base::mac::AmIBundled()) {
+-    *result = chrome::GetFrameworkBundlePath();
+-    DCHECK(!result->empty());
+-    *result = result->Append("Internet Plug-Ins");
+-    return true;
+-  }
+-  // In tests, just look in the module directory (below).
+-#endif
+-
+-  // The rest of the world expects plugins in the module directory.
+-  return PathService::Get(base::DIR_MODULE, result);
++bool GetInternalPluginsDirectory(base::FilePath* result,
++                                 const std::string& ident) {
++  std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
++  const char* value = getenv(full_env.c_str());
++  if (value == NULL)
++      return PathService::Get(base::DIR_MODULE, result);
++  else
++      *result = base::FilePath(value);
+ }
+ 
+ #if defined(OS_WIN)
+@@ -253,11 +246,11 @@ bool PathProvider(int key, base::FilePath* result) {
+       create_dir = true;
+       break;
+     case chrome::DIR_INTERNAL_PLUGINS:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "ALL"))
+         return false;
+       break;
+     case chrome::DIR_PEPPER_FLASH_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
+         return false;
+       cur = cur.Append(kPepperFlashBaseDirectory);
+       break;
+@@ -314,7 +307,7 @@ bool PathProvider(int key, base::FilePath* result) {
+     // We currently need a path here to look up whether the plugin is disabled
+     // and what its permissions are.
+     case chrome::FILE_NACL_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "NACL"))
+         return false;
+       cur = cur.Append(kInternalNaClPluginFileName);
+       break;
+@@ -349,7 +342,7 @@ bool PathProvider(int key, base::FilePath* result) {
+         cur = cur.DirName();
+       }
+ #else
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "PNACL"))
+         return false;
+ #endif
+       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
+@@ -366,7 +359,7 @@ bool PathProvider(int key, base::FilePath* result) {
+     // In the component case, this is the source adapter. Otherwise, it is the
+     // actual Pepper module that gets loaded.
+     case chrome::FILE_WIDEVINE_CDM_ADAPTER:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "WIDEVINE"))
+         return false;
+       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
+       break;
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index c3cc9c3ed18..e3c07acd08b 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 = "45.0.2454.15";
-    sha256 = "1zg562cpn9ddai92jdjg3frhmvbhbkf71ysprwqa3rgbg6w8ipzj";
-    sha256bin32 = "1fcwzwb6zq7ld7fs0iws0d9jmxhjhdax4y744dx4d7bc77357x3m";
-    sha256bin64 = "0273dy5b1r9s9g8ixrafnxm8jnn4ha36r3b3ckdabm9y4pqwx54s";
+    version = "46.0.2471.2";
+    sha256 = "1gmdcb4sjc2l9y46ybpr64gnzjg3bi93x4f42bssrb3nzhpjpmgg";
+    sha256bin32 = "11rg4rkw89zvvxlpil680n59y49w9msxg4qp93iilq0n7ppk5qx9";
+    sha256bin64 = "1xqibl37mr6xvqqd1ainvkv11shirxb7ay9sfjgq8k72xk7wdx8k";
   };
   beta = {
-    version = "45.0.2454.15";
-    sha256 = "1zg562cpn9ddai92jdjg3frhmvbhbkf71ysprwqa3rgbg6w8ipzj";
-    sha256bin32 = "1scjirp54z08h36zs9z9yq4pxcximf00krlip9dkvxsxh65qiw5w";
-    sha256bin64 = "14l8lka8jci1d90vbz5kpl20mk98n1ak4mw667dkz89cch5gal4s";
+    version = "45.0.2454.26";
+    sha256 = "0ghgvll1q6nw1ds139nmabbilagffyln7k313w1yvn707wp7yg33";
+    sha256bin32 = "0611ad202vck0zi0jcldcr4j81kd9cnabsc9kssc6m46fy5rhhbk";
+    sha256bin64 = "0bwmpl7rq2nj0jf1xqx7n1mvx9kigbvpz2f8v0azwv4nb56p9c2q";
   };
   stable = {
     version = "44.0.2403.130";

From 43c3664ec606cbc533ed1b7f8aea3204776b08f9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 11 Aug 2015 12:19:13 +0200
Subject: [PATCH 1011/2016] vanubi: 0.0.14 -> 0.0.16

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

diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix
index 189682ec4e3..de0236a50e8 100644
--- a/pkgs/applications/editors/vanubi/default.nix
+++ b/pkgs/applications/editors/vanubi/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "vanubi-${version}";
-  version = "0.0.14";
+  version = "0.0.16";
 
   src = fetchurl {
     url = "https://github.com/vanubi/vanubi/archive/v${version}.tar.gz";
-    sha256 = "0cd45zm54j6xz1a31qllg2w7l77sncv7mrpfx9bjzdiqpmzsdypl";
+    sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq";
   };
 
   buildInputs = [ pkgconfig vala which autoconf automake

From f91dacdd07731e06cec80b727b28b749e64f60e8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 11 Aug 2015 12:38:27 +0200
Subject: [PATCH 1012/2016] synergy: Update from version 1.6.3 to 1.7.4.

Quite a lot of upstream changes happened in between, so here are the
upstream changes:

https://github.com/synergy/synergy/releases/tag/1.7.0
https://github.com/synergy/synergy/releases/tag/v1.7.1-stable
https://github.com/synergy/synergy/releases/tag/v1.7.2-stable
https://github.com/synergy/synergy/releases/tag/v1.7.3-stable
https://github.com/synergy/synergy/releases/tag/v1.7.4-stable

The upstream project has stopped using cryptopp
(synergy/synergy@80343c4) and now uses OpenSSL instead (see issue
synergy/synergy#4313) so we no longer need our patch.

Also, the issue for the 'install' target has been closed as obsolete and
although they had such a target in the meantime, it has been removed
again in synergy/synergy@d1eb7a6, so let's not rely on it anymore and
remove the comment on the closed/obsolete issue.

Forcing support for XRandR in the CMakeLists.txt file isn't needed
anymore, because the issues mentioned in ea4afb7 have been fixed
upstream.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: devhell <"^"@regexmail.net>
---
 pkgs/applications/misc/synergy/cryptopp.patch | 45 -------------------
 pkgs/applications/misc/synergy/default.nix    | 27 ++++-------
 2 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/applications/misc/synergy/cryptopp.patch

diff --git a/pkgs/applications/misc/synergy/cryptopp.patch b/pkgs/applications/misc/synergy/cryptopp.patch
deleted file mode 100644
index 1c296423acd..00000000000
--- a/pkgs/applications/misc/synergy/cryptopp.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -urN synergy-1.4.17-Source/CMakeLists.txt synergy-1.4.17-Source-fix/CMakeLists.txt
---- synergy-1.4.17-Source/CMakeLists.txt	2014-03-14 21:34:19.000000000 +0100
-+++ synergy-1.4.17-Source-fix/CMakeLists.txt	2014-04-11 13:37:18.839338710 +0200
-@@ -145,6 +145,9 @@
- 	check_type_size(long SIZEOF_LONG)
- 	check_type_size(short SIZEOF_SHORT)
- 
-+	# let's just assume cryptopp exists (provided by the Nix expression)
-+	list(APPEND libs cryptopp)
-+
- 	# pthread is used on both Linux and Mac
- 	check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
- 	if (HAVE_PTHREAD)
-@@ -317,7 +320,6 @@
- endif()
- 
- add_subdirectory(src)
--add_subdirectory(ext)
- 
- if (WIN32)
- 	# TODO:	consider using /analyze to uncover potential bugs in the source code.
-diff -urN synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h synergy-1.4.17-Source-fix/src/lib/io/CryptoMode_cryptopp.h
---- synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h	2014-02-28 13:36:45.000000000 +0100
-+++ synergy-1.4.17-Source-fix/src/lib/io/CryptoMode_cryptopp.h	2014-04-11 13:36:01.111985556 +0200
-@@ -25,6 +25,6 @@
- #	pragma GCC system_header
- #endif 
- 
--#include <cryptopp562/gcm.h>
--#include <cryptopp562/modes.h>
--#include <cryptopp562/aes.h>
-+#include <cryptopp/gcm.h>
-+#include <cryptopp/modes.h>
-+#include <cryptopp/aes.h>
-diff -urN synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h synergy-1.4.17-Source-fix/src/lib/io/CryptoStream_cryptopp.h
---- synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h	2014-02-28 13:36:45.000000000 +0100
-+++ synergy-1.4.17-Source-fix/src/lib/io/CryptoStream_cryptopp.h	2014-04-11 13:36:07.173013005 +0200
-@@ -25,5 +25,5 @@
- #	pragma GCC system_header
- #endif
- 
--#include <cryptopp562/osrng.h>
--#include <cryptopp562/sha.h>
-+#include <cryptopp/osrng.h>
-+#include <cryptopp/sha.h>
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 0d3337b478f..1c97223a955 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,38 +1,27 @@
 { stdenv, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr
-, xinput, curl, cryptopp ? null, unzip }:
-
-assert stdenv.isLinux -> cryptopp != null;
+, xinput, curl, openssl, unzip }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "synergy-${version}";
-  version = "1.6.3";
+  version = "1.7.4";
 
   src = fetchFromGitHub {
     owner = "synergy";
     repo = "synergy";
-    rev = version;
-    sha256 = "0n4zvz669vi2wyn6i6xhxp0j3nvjl4yzm441cqv6hb0d5k26wbcn";
+    rev = "v${version}-stable";
+    sha256 = "0pxj0qpnsaffpaxik8vc5rjfinmx8ab3b2lssrxkfbs7isskvs33";
   };
 
-  patches = optional stdenv.isLinux ./cryptopp.patch;
-
-  postPatch = (if stdenv.isLinux then ''
-    sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \
-      set(HAVE_X11_EXTENSIONS_XRANDR_H true)' CMakeLists.txt
-  '' else ''
-    ${unzip}/bin/unzip -d ext/cryptopp562 ext/cryptopp562.zip
-  '') + ''
+  postPatch = ''
     ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip
     ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip
   '';
 
-  buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr xinput curl ]
-             ++ optional stdenv.isLinux cryptopp;
-
-  # At this moment make install doesn't work for synergy
-  # http://synergy-foss.org/spit/issues/details/3317/
+  buildInputs = [
+    cmake x11 libX11 libXi libXtst libXrandr xinput curl openssl
+  ];
 
   installPhase = ''
     mkdir -p $out/bin

From 5c7f05c1be02eab48016909a02d20bae28e66f15 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 11 Aug 2015 13:13:13 +0200
Subject: [PATCH 1013/2016] synergy: Update meta.description + meta.homepage.

I don't know what a "mouse keyboard" is, but instead of fixing the
description, let's use the one from the upstream README file, which is
also shorter than what we previously had.

The homepage http://synergy-foss.org/ is outdate since ages, so let's
point to the new site.

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

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 1c97223a955..30b0c5d183c 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
   checkPhase = "../bin/unittests";
 
   meta = {
-    description = "Tool to share the mouse keyboard and the clipboard between computers";
-    homepage = http://synergy-foss.org;
+    description = "Share one mouse and keyboard between multiple computers";
+    homepage = "http://synergy-project.org/";
     license = licenses.gpl2;
     maintainers = [ maintainers.aszlig ];
     platforms = platforms.all;

From b84ca35fe181fdaef933a0070a5267b8b90000bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2015 13:00:22 +0200
Subject: [PATCH 1014/2016] php-7: Mark as low priority

---
 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 a0ada98f1bb..672ef3aea83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5023,7 +5023,7 @@ let
 
   php56 = callPackage ../development/interpreters/php/5.6.nix { };
 
-  php70 = callPackage ../development/interpreters/php/7.0.nix { };
+  php70 = lowPrio (callPackage ../development/interpreters/php/7.0.nix { });
 
   picoc = callPackage ../development/interpreters/picoc {};
 

From e7504ebf716796ba6db9f1461869728213504caf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2015 13:00:43 +0200
Subject: [PATCH 1015/2016] php: Update to 5.4.44, 5.5.28, 5.6.12

---
 pkgs/development/interpreters/php/5.4.nix | 4 ++--
 pkgs/development/interpreters/php/5.5.nix | 4 ++--
 pkgs/development/interpreters/php/5.6.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index c9391a4e24f..f9f13b73ae2 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -1,6 +1,6 @@
 { callPackage, apacheHttpd }:
 callPackage ./generic.nix {
-  phpVersion = "5.4.43";
-  sha = "0sydirpwg150wxsjrpp3m38564832wviglmsylhbbl8an17p5mr5";
+  phpVersion = "5.4.44";
+  sha = "0vc5lf0yjk1fs7inri76mh0lrcmq32ji4m6yqdmg7314x5f9xmcd";
   apacheHttpd = apacheHttpd;
 }
diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix
index 18dfde4ae67..26041934650 100644
--- a/pkgs/development/interpreters/php/5.5.nix
+++ b/pkgs/development/interpreters/php/5.5.nix
@@ -1,6 +1,6 @@
 { callPackage, apacheHttpd  }:
 callPackage ./generic.nix {
-  phpVersion = "5.5.27";
-  sha = "0w0zgqria3i3mrp03p9m0613xlaj3vsw9girmslngjn06jjwdd64";
+  phpVersion = "5.5.28";
+  sha = "1wy2v5rmbiia3v6fc8nwg1y3sdkdmicksxnkadz1f3035rbjqz8r";
   apacheHttpd = apacheHttpd;
 }
diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix
index 51ba06b2922..bc9d5a90c31 100644
--- a/pkgs/development/interpreters/php/5.6.nix
+++ b/pkgs/development/interpreters/php/5.6.nix
@@ -1,6 +1,6 @@
 { callPackage, apacheHttpd  }:
 callPackage ./generic.nix {
-  phpVersion = "5.6.11";
-  sha = "0riq0c8s8anb1nxvn3ljs7wdn811903sv7kl8ir2ck3n2q42csxx";
+  phpVersion = "5.6.12";
+  sha = "0fl5r0lzav7icg97p7gkvbxk0xk2mh7i1r45dycjlyxgf91109vg";
   apacheHttpd = apacheHttpd;
 }

From 64b3974d1361cdc436d13b624b69b0e7cc1014e9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2015 13:13:28 +0200
Subject: [PATCH 1016/2016] php: Use callPackages

---
 pkgs/development/interpreters/php/5.4.nix     |   6 -
 pkgs/development/interpreters/php/5.5.nix     |   6 -
 pkgs/development/interpreters/php/5.6.nix     |   6 -
 pkgs/development/interpreters/php/7.0.nix     |   8 -
 pkgs/development/interpreters/php/default.nix | 308 ++++++++++++++++++
 pkgs/development/interpreters/php/generic.nix | 291 -----------------
 pkgs/top-level/all-packages.nix               |  12 +-
 7 files changed, 313 insertions(+), 324 deletions(-)
 delete mode 100644 pkgs/development/interpreters/php/5.4.nix
 delete mode 100644 pkgs/development/interpreters/php/5.5.nix
 delete mode 100644 pkgs/development/interpreters/php/5.6.nix
 delete mode 100644 pkgs/development/interpreters/php/7.0.nix
 create mode 100644 pkgs/development/interpreters/php/default.nix
 delete mode 100644 pkgs/development/interpreters/php/generic.nix

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
deleted file mode 100644
index f9f13b73ae2..00000000000
--- a/pkgs/development/interpreters/php/5.4.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, apacheHttpd }:
-callPackage ./generic.nix {
-  phpVersion = "5.4.44";
-  sha = "0vc5lf0yjk1fs7inri76mh0lrcmq32ji4m6yqdmg7314x5f9xmcd";
-  apacheHttpd = apacheHttpd;
-}
diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix
deleted file mode 100644
index 26041934650..00000000000
--- a/pkgs/development/interpreters/php/5.5.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, apacheHttpd  }:
-callPackage ./generic.nix {
-  phpVersion = "5.5.28";
-  sha = "1wy2v5rmbiia3v6fc8nwg1y3sdkdmicksxnkadz1f3035rbjqz8r";
-  apacheHttpd = apacheHttpd;
-}
diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix
deleted file mode 100644
index bc9d5a90c31..00000000000
--- a/pkgs/development/interpreters/php/5.6.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, apacheHttpd  }:
-callPackage ./generic.nix {
-  phpVersion = "5.6.12";
-  sha = "0fl5r0lzav7icg97p7gkvbxk0xk2mh7i1r45dycjlyxgf91109vg";
-  apacheHttpd = apacheHttpd;
-}
diff --git a/pkgs/development/interpreters/php/7.0.nix b/pkgs/development/interpreters/php/7.0.nix
deleted file mode 100644
index 1369cf4a219..00000000000
--- a/pkgs/development/interpreters/php/7.0.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, apacheHttpd  }:
-callPackage ./generic.nix {
-  phpVersion = "7.0.0beta1";
-  url = "https://downloads.php.net/~ab/php-7.0.0beta1.tar.bz2";
-  sha = "1pj3ysfhswg2r370ivp33fv9zbcl3yvhmxgnc731k08hv6hmd984";
-  apacheHttpd = apacheHttpd;
-  php7 = true;
-}
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
new file mode 100644
index 00000000000..2d1fd454c0f
--- /dev/null
+++ b/pkgs/development/interpreters/php/default.nix
@@ -0,0 +1,308 @@
+{ lib, stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
+, mysql, libxml2, readline, zlib, curl, postgresql, gettext
+, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype
+, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
+, uwimap, pam, gmp, apacheHttpd }:
+
+let
+
+  generic =
+    { version, sha256, url ? "http://www.php.net/distributions/php-${version}.tar.bz2" }:
+
+    let php7 = lib.versionAtLeast version "7.0"; in
+
+    composableDerivation.composableDerivation {} (fixed: {
+
+      inherit version;
+
+      name = "php-${version}";
+
+      enableParallelBuilding = true;
+
+      buildInputs = [ flex bison pkgconfig ];
+
+      flags = {
+
+        # much left to do here...
+
+        # SAPI modules:
+
+        apxs2 = {
+          configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
+          buildInputs = [apacheHttpd];
+        };
+
+        # Extensions
+        imap = {
+          configureFlags = [
+            "--with-imap=${uwimap}"
+            "--with-imap-ssl"
+            ];
+          buildInputs = [ uwimap openssl pam ];
+        };
+
+        ldap = {
+          configureFlags = ["--with-ldap=${openldap}"];
+          buildInputs = [openldap cyrus_sasl openssl];
+        };
+
+        mhash = {
+          configureFlags = ["--with-mhash"];
+          buildInputs = [libmhash];
+        };
+
+        curl = {
+          configureFlags = ["--with-curl=${curl}"];
+          buildInputs = [curl openssl];
+        };
+
+        curlWrappers = {
+          configureFlags = ["--with-curlwrappers"];
+        };
+
+        zlib = {
+          configureFlags = ["--with-zlib=${zlib}"];
+          buildInputs = [zlib];
+        };
+
+        libxml2 = {
+          configureFlags = [
+            "--with-libxml-dir=${libxml2}"
+            ];
+          buildInputs = [ libxml2 ];
+        };
+
+        pcntl = {
+          configureFlags = [ "--enable-pcntl" ];
+        };
+
+        readline = {
+          configureFlags = ["--with-readline=${readline}"];
+          buildInputs = [ readline ];
+        };
+
+        sqlite = {
+          configureFlags = ["--with-pdo-sqlite=${sqlite}"];
+          buildInputs = [ sqlite ];
+        };
+
+        postgresql = {
+          configureFlags = ["--with-pgsql=${postgresql}"];
+          buildInputs = [ postgresql ];
+        };
+
+        pdo_pgsql = {
+          configureFlags = ["--with-pdo-pgsql=${postgresql}"];
+          buildInputs = [ postgresql ];
+        };
+
+        mysql = {
+          configureFlags = ["--with-mysql=${mysql.lib}"];
+          buildInputs = [ mysql.lib ];
+        };
+
+        mysqli = {
+          configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
+          buildInputs = [ mysql.lib ];
+        };
+
+        mysqli_embedded = {
+          configureFlags = ["--enable-embedded-mysqli"];
+          depends = "mysqli";
+          assertion = fixed.mysqliSupport;
+        };
+
+        pdo_mysql = {
+          configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
+          buildInputs = [ mysql.lib ];
+        };
+
+        bcmath = {
+          configureFlags = ["--enable-bcmath"];
+        };
+
+        gd = {
+          # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
+          configureFlags = [
+            "--with-gd"
+            "--with-freetype-dir=${freetype}"
+            "--with-png-dir=${libpng}"
+            "--with-jpeg-dir=${libjpeg}"
+          ];
+          buildInputs = [ libpng libjpeg freetype ];
+        };
+
+        gmp = {
+          configureFlags = ["--with-gmp=${gmp}"];
+          buildInputs = [ gmp ];
+        };
+
+        soap = {
+          configureFlags = ["--enable-soap"];
+        };
+
+        sockets = {
+          configureFlags = ["--enable-sockets"];
+        };
+
+        openssl = {
+          configureFlags = ["--with-openssl=${openssl}"];
+          buildInputs = [openssl];
+        };
+
+        mbstring = {
+          configureFlags = ["--enable-mbstring"];
+        };
+
+        gettext = {
+          configureFlags = ["--with-gettext=${gettext}"];
+          buildInputs = [gettext];
+        };
+
+        intl = {
+          configureFlags = ["--enable-intl"];
+          buildInputs = [icu];
+        };
+
+        exif = {
+          configureFlags = ["--enable-exif"];
+        };
+
+        xsl = {
+          configureFlags = ["--with-xsl=${libxslt}"];
+          buildInputs = [libxslt];
+        };
+
+        mcrypt = let libmcrypt' = libmcrypt.override { disablePosixThreads = true; }; in {
+          configureFlags = ["--with-mcrypt=${libmcrypt'}"];
+          buildInputs = [libmcrypt'];
+        };
+
+        bz2 = {
+          configureFlags = ["--with-bz2=${bzip2}"];
+          buildInputs = [bzip2];
+        };
+
+        zip = {
+          configureFlags = ["--enable-zip"];
+        };
+
+        ftp = {
+          configureFlags = ["--enable-ftp"];
+        };
+
+        fpm = {
+          configureFlags = ["--enable-fpm"];
+        };
+
+        mssql = stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
+          configureFlags = ["--with-mssql=${freetds}"];
+          buildInputs = [freetds];
+        };
+
+        zts = {
+          configureFlags = ["--enable-maintainer-zts"];
+        };
+
+        calendar = {
+          configureFlags = ["--enable-calendar"];
+        };
+      };
+
+      cfg = {
+        imapSupport = config.php.imap or true;
+        ldapSupport = config.php.ldap or true;
+        mhashSupport = config.php.mhash or true;
+        mysqlSupport = (!php7) && (config.php.mysql or true);
+        mysqliSupport = config.php.mysqli or true;
+        pdo_mysqlSupport = config.php.pdo_mysql or true;
+        libxml2Support = config.php.libxml2 or true;
+        apxs2Support = config.php.apxs2 or true;
+        bcmathSupport = config.php.bcmath or true;
+        socketsSupport = config.php.sockets or true;
+        curlSupport = config.php.curl or true;
+        curlWrappersSupport = (!php7) && (config.php.curlWrappers or true);
+        gettextSupport = config.php.gettext or true;
+        pcntlSupport = config.php.pcntl or true;
+        postgresqlSupport = config.php.postgresql or true;
+        pdo_pgsqlSupport = config.php.pdo_pgsql or true;
+        readlineSupport = config.php.readline or true;
+        sqliteSupport = config.php.sqlite or true;
+        soapSupport = config.php.soap or true;
+        zlibSupport = config.php.zlib or true;
+        opensslSupport = config.php.openssl or true;
+        mbstringSupport = config.php.mbstring or true;
+        gdSupport = config.php.gd or true;
+        intlSupport = config.php.intl or true;
+        exifSupport = config.php.exif or true;
+        xslSupport = config.php.xsl or false;
+        mcryptSupport = config.php.mcrypt or true;
+        bz2Support = config.php.bz2 or false;
+        zipSupport = config.php.zip or true;
+        ftpSupport = config.php.ftp or true;
+        fpmSupport = config.php.fpm or true;
+        gmpSupport = config.php.gmp or true;
+        mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin));
+        ztsSupport = config.php.zts or false;
+        calendarSupport = config.php.calendar or true;
+      };
+
+      configurePhase = ''
+        # Don't record the configure flags since this causes unnecessary
+        # runtime dependencies.
+        for i in main/build-defs.h.in scripts/php-config.in; do
+          substituteInPlace $i \
+            --replace '@CONFIGURE_COMMAND@' '(omitted)' \
+            --replace '@CONFIGURE_OPTIONS@' "" \
+            --replace '@PHP_LDFLAGS@' ""
+        done
+
+        iniFile=$out/etc/php-recommended.ini
+        [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
+        ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
+      '';
+
+      installPhase = ''
+        unset installPhase; installPhase;
+        cp php.ini-production $iniFile
+      '';
+
+      src = fetchurl {
+        inherit url sha256;
+      };
+
+      meta = with stdenv.lib; {
+        description = "An HTML-embedded scripting language";
+        homepage = http://www.php.net/;
+        license = stdenv.lib.licenses.php301;
+        maintainers = with maintainers; [ globin ];
+      };
+
+      patches = if !php7 then [ ./fix-paths.patch ] else [ ./fix-paths-php7.patch ];
+
+    });
+
+in {
+
+  php54 = generic {
+    version = "5.4.44";
+    sha256 = "0vc5lf0yjk1fs7inri76mh0lrcmq32ji4m6yqdmg7314x5f9xmcd";
+  };
+
+  php55 = generic {
+    version = "5.5.28";
+    sha256 = "1wy2v5rmbiia3v6fc8nwg1y3sdkdmicksxnkadz1f3035rbjqz8r";
+  };
+
+  php56 = generic {
+    version = "5.6.12";
+    sha256 = "0fl5r0lzav7icg97p7gkvbxk0xk2mh7i1r45dycjlyxgf91109vg";
+  };
+
+  php70 = lib.lowPrio (generic {
+    version = "7.0.0beta1";
+    url = "https://downloads.php.net/~ab/php-7.0.0beta1.tar.bz2";
+    sha256 = "1pj3ysfhswg2r370ivp33fv9zbcl3yvhmxgnc731k08hv6hmd984";
+  });
+
+}
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix
deleted file mode 100644
index e71b6238173..00000000000
--- a/pkgs/development/interpreters/php/generic.nix
+++ /dev/null
@@ -1,291 +0,0 @@
-{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
-, mysql, libxml2, readline, zlib, curl, postgresql, gettext
-, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype
-, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
-, uwimap, pam, gmp
-
-, phpVersion, apacheHttpd, sha
-, php7 ? false, url ? null }:
-
-let
-  libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
-in
-
-composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
-
-  version = "${phpVersion}";
-
-  name = "php-${version}";
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ flex bison pkgconfig ];
-
-  flags = {
-
-    # much left to do here...
-
-    # SAPI modules:
-
-    apxs2 = {
-      configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
-      buildInputs = [apacheHttpd];
-    };
-
-    # Extensions
-    imap = {
-      configureFlags = [
-        "--with-imap=${uwimap}"
-        "--with-imap-ssl"
-        ];
-      buildInputs = [ uwimap openssl pam ];
-    };
-
-    ldap = {
-      configureFlags = ["--with-ldap=${openldap}"];
-      buildInputs = [openldap cyrus_sasl openssl];
-    };
-
-    mhash = {
-      configureFlags = ["--with-mhash"];
-      buildInputs = [libmhash];
-    };
-
-    curl = {
-      configureFlags = ["--with-curl=${curl}"];
-      buildInputs = [curl openssl];
-    };
-
-    curlWrappers = {
-      configureFlags = ["--with-curlwrappers"];
-    };
-
-    zlib = {
-      configureFlags = ["--with-zlib=${zlib}"];
-      buildInputs = [zlib];
-    };
-
-    libxml2 = {
-      configureFlags = [
-        "--with-libxml-dir=${libxml2}"
-        ];
-      buildInputs = [ libxml2 ];
-    };
-
-    pcntl = {
-      configureFlags = [ "--enable-pcntl" ];
-    };
-
-    readline = {
-      configureFlags = ["--with-readline=${readline}"];
-      buildInputs = [ readline ];
-    };
-
-    sqlite = {
-      configureFlags = ["--with-pdo-sqlite=${sqlite}"];
-      buildInputs = [ sqlite ];
-    };
-
-    postgresql = {
-      configureFlags = ["--with-pgsql=${postgresql}"];
-      buildInputs = [ postgresql ];
-    };
-
-    pdo_pgsql = {
-      configureFlags = ["--with-pdo-pgsql=${postgresql}"];
-      buildInputs = [ postgresql ];
-    };
-
-    mysql = {
-      configureFlags = ["--with-mysql=${mysql.lib}"];
-      buildInputs = [ mysql.lib ];
-    };
-
-    mysqli = {
-      configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
-      buildInputs = [ mysql.lib ];
-    };
-
-    mysqli_embedded = {
-      configureFlags = ["--enable-embedded-mysqli"];
-      depends = "mysqli";
-      assertion = fixed.mysqliSupport;
-    };
-
-    pdo_mysql = {
-      configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
-      buildInputs = [ mysql.lib ];
-    };
-
-    bcmath = {
-      configureFlags = ["--enable-bcmath"];
-    };
-
-    gd = {
-      # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
-      configureFlags = [
-        "--with-gd"
-        "--with-freetype-dir=${freetype}"
-        "--with-png-dir=${libpng}"
-        "--with-jpeg-dir=${libjpeg}"
-      ];
-      buildInputs = [ libpng libjpeg freetype ];
-    };
-
-    gmp = {
-      configureFlags = ["--with-gmp=${gmp}"];
-      buildInputs = [ gmp ];
-    };
-
-    soap = {
-      configureFlags = ["--enable-soap"];
-    };
-
-    sockets = {
-      configureFlags = ["--enable-sockets"];
-    };
-
-    openssl = {
-      configureFlags = ["--with-openssl=${openssl}"];
-      buildInputs = [openssl];
-    };
-
-    mbstring = {
-      configureFlags = ["--enable-mbstring"];
-    };
-
-    gettext = {
-      configureFlags = ["--with-gettext=${gettext}"];
-      buildInputs = [gettext];
-    };
-
-    intl = {
-      configureFlags = ["--enable-intl"];
-      buildInputs = [icu];
-    };
-
-    exif = {
-      configureFlags = ["--enable-exif"];
-    };
-
-    xsl = {
-      configureFlags = ["--with-xsl=${libxslt}"];
-      buildInputs = [libxslt];
-    };
-
-    mcrypt = {
-      configureFlags = ["--with-mcrypt=${libmcryptOverride}"];
-      buildInputs = [libmcryptOverride];
-    };
-
-    bz2 = {
-      configureFlags = ["--with-bz2=${bzip2}"];
-      buildInputs = [bzip2];
-    };
-
-    zip = {
-      configureFlags = ["--enable-zip"];
-    };
-
-    ftp = {
-      configureFlags = ["--enable-ftp"];
-    };
-
-    fpm = {
-      configureFlags = ["--enable-fpm"];
-    };
-
-    mssql = stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
-      configureFlags = ["--with-mssql=${freetds}"];
-      buildInputs = [freetds];
-    };
-
-    zts = {
-      configureFlags = ["--enable-maintainer-zts"];
-    };
-
-    calendar = {
-      configureFlags = ["--enable-calendar"];
-    };
-  };
-
-  cfg = {
-    imapSupport = config.php.imap or true;
-    ldapSupport = config.php.ldap or true;
-    mhashSupport = config.php.mhash or true;
-    mysqlSupport = (!php7) && (config.php.mysql or true);
-    mysqliSupport = config.php.mysqli or true;
-    pdo_mysqlSupport = config.php.pdo_mysql or true;
-    libxml2Support = config.php.libxml2 or true;
-    apxs2Support = config.php.apxs2 or true;
-    bcmathSupport = config.php.bcmath or true;
-    socketsSupport = config.php.sockets or true;
-    curlSupport = config.php.curl or true;
-    curlWrappersSupport = (!php7) && (config.php.curlWrappers or true);
-    gettextSupport = config.php.gettext or true;
-    pcntlSupport = config.php.pcntl or true;
-    postgresqlSupport = config.php.postgresql or true;
-    pdo_pgsqlSupport = config.php.pdo_pgsql or true;
-    readlineSupport = config.php.readline or true;
-    sqliteSupport = config.php.sqlite or true;
-    soapSupport = config.php.soap or true;
-    zlibSupport = config.php.zlib or true;
-    opensslSupport = config.php.openssl or true;
-    mbstringSupport = config.php.mbstring or true;
-    gdSupport = config.php.gd or true;
-    intlSupport = config.php.intl or true;
-    exifSupport = config.php.exif or true;
-    xslSupport = config.php.xsl or false;
-    mcryptSupport = config.php.mcrypt or true;
-    bz2Support = config.php.bz2 or false;
-    zipSupport = config.php.zip or true;
-    ftpSupport = config.php.ftp or true;
-    fpmSupport = config.php.fpm or true;
-    gmpSupport = config.php.gmp or true;
-    mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin));
-    ztsSupport = config.php.zts or false;
-    calendarSupport = config.php.calendar or true;
-  };
-
-  configurePhase = ''
-    # Don't record the configure flags since this causes unnecessary
-    # runtime dependencies.
-    for i in main/build-defs.h.in scripts/php-config.in; do
-      substituteInPlace $i \
-        --replace '@CONFIGURE_COMMAND@' '(omitted)' \
-        --replace '@CONFIGURE_OPTIONS@' "" \
-        --replace '@PHP_LDFLAGS@' ""
-    done
-
-    iniFile=$out/etc/php-recommended.ini
-    [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
-    ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
-  '';
-
-  installPhase = ''
-    unset installPhase; installPhase;
-    cp php.ini-production $iniFile
-  '';
-
-  src = fetchurl {
-    url = if url == null then
-      "http://www.php.net/distributions/php-${version}.tar.bz2"
-    else
-      url;
-    sha256 = sha;
-  };
-
-  meta = with stdenv.lib; {
-    description = "An HTML-embedded scripting language";
-    homepage = http://www.php.net/;
-    license = stdenv.lib.licenses.php301;
-    maintainers = with maintainers; [ globin ];
-  };
-
-  patches = if !php7 then
-    [ ./fix-paths.patch ]
-  else
-    [ ./fix-paths-php7.patch ]
-  ;
-
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 672ef3aea83..a342d7ab72a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5017,13 +5017,11 @@ let
     php = php55;
   });
 
-  php54 = callPackage ../development/interpreters/php/5.4.nix { };
-
-  php55 = callPackage ../development/interpreters/php/5.5.nix { };
-
-  php56 = callPackage ../development/interpreters/php/5.6.nix { };
-
-  php70 = lowPrio (callPackage ../development/interpreters/php/7.0.nix { });
+  inherit (callPackages ../development/interpreters/php { })
+    php54
+    php55
+    php56
+    php70;
 
   picoc = callPackage ../development/interpreters/picoc {};
 

From 3607cf316e2712d9bcd2c6d463b5e4fefc99f9a6 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 11 Aug 2015 12:13:33 +0200
Subject: [PATCH 1017/2016] openpts: init at 0.2.6

---
 pkgs/servers/openpts/bugs.patch  | 12 ++++++++
 pkgs/servers/openpts/default.nix | 53 ++++++++++++++++++++++++++++++++
 pkgs/servers/openpts/ptsc.patch  | 28 +++++++++++++++++
 pkgs/servers/openpts/tboot.patch | 21 +++++++++++++
 pkgs/servers/openpts/zlib.patch  | 12 ++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 6 files changed, 128 insertions(+)
 create mode 100644 pkgs/servers/openpts/bugs.patch
 create mode 100644 pkgs/servers/openpts/default.nix
 create mode 100644 pkgs/servers/openpts/ptsc.patch
 create mode 100644 pkgs/servers/openpts/tboot.patch
 create mode 100644 pkgs/servers/openpts/zlib.patch

diff --git a/pkgs/servers/openpts/bugs.patch b/pkgs/servers/openpts/bugs.patch
new file mode 100644
index 00000000000..d818bafbc9f
--- /dev/null
+++ b/pkgs/servers/openpts/bugs.patch
@@ -0,0 +1,12 @@
+diff -urNp openpts-0.2.6-cvs-patched/src/fsm.c openpts-0.2.6-current/src/fsm.c
+--- openpts-0.2.6-cvs-patched/src/fsm.c	2012-01-05 03:49:15.000000000 -0500
++++ openpts-0.2.6-current/src/fsm.c	2012-01-09 12:11:17.338706205 -0500
+@@ -934,7 +934,7 @@ char *getEventString(OPENPTS_PCR_EVENT_W
+     /* event */
+     event = eventWrapper->event;
+     if (event != NULL) {
+-        // len = snprintf(buf, size, "PCR[%d],TYPE=%d", (int)event->ulPcrIndex, event->eventType);
++        snprintf(buf, size, "PCR[%d],TYPE=%d", (int)event->ulPcrIndex, event->eventType);
+     } else {
+         LOG(LOG_ERR, "NULL event\n");  // TODO(munetoh)
+         xfree(buf);
diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix
new file mode 100644
index 00000000000..7d82af72b55
--- /dev/null
+++ b/pkgs/servers/openpts/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, trousers, openssl, libxml2, libuuid, gettext, perl }:
+
+stdenv.mkDerivation rec {
+  name = "openpts-${version}";
+  version = "0.2.6";
+
+  src = fetchurl {
+    url = "http://jaist.dl.osdn.jp/openpts/54410/openpts-${version}.tar.gz";
+    sha256 = "1b5phshl49fxr5y3g5zz75gm0n4cw8i7n29x5f1a95xkwrjpazi0";
+  };
+
+  # patches from https://apps.fedoraproject.org/packages/openpts/sources/patches/
+  patches = [ ./bugs.patch ./zlib.patch ./tboot.patch ./ptsc.patch ];
+
+  buildInputs = [ autoconf automake pkgconfig libtool trousers openssl libxml2 libuuid gettext ];
+
+  preConfigure = ''
+    substituteInPlace include/Makefile.am --replace "./cvs2msg.pl" "${perl}/bin/perl cvs2msg.pl";
+    $SHELL bootstrap.sh
+    '';
+
+  configureFlags = [ "--with-tss" "--with-aru" "--with-tboot" "--enable-tnc" "--with-aide" ];
+
+  NIX_CFLAGS_COMPILE = "-I${trousers}/include/trousers -I${trousers}/include/tss";
+
+  preInstall = ''
+    mkdir -p $out
+    mkdir -p $out/etc
+    cp -p dist/ptsc.conf.in $out/etc/ptsc.conf
+    cp -p dist/ptsv.conf.in $out/etc/ptsv.conf
+    mkdir -p $out/share/openpts/models
+    cp -p models/*.uml $out/share/openpts/models/
+
+    mkdir -p $out/share/openpts/tpm_emulator
+    cp dist/tpm_emulator/README.rhel $out/share/openpts/tpm_emulator/README
+    cp dist/tpm_emulator/binary_bios_measurements $out/share/openpts/tpm_emulator/
+    cp dist/tpm_emulator/tcsd $out/share/openpts/tpm_emulator/
+
+    mkdir -p $out/share/openpts/tboot
+    cp dist/tboot/README.fedora15 $out/share/openpts/tboot/README
+    cp dist/tboot/ptsc.conf.fedora15 $out/share/openpts/tboot/ptsc.conf
+    cp dist/tboot/tcsd.conf.fedora15 $out/share/openpts/tboot/tcsd.conf
+    cp dist/tboot/tcsd.fedora15 $out/share/openpts/tboot/tcsd
+    '';
+
+  meta = {
+    description = "TCG Platform Trust Service (PTS)";
+    homepage = "ttp://sourceforge.jp/projects/openpts";
+    license = stdenv.lib.licenses.cpl10;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+  };
+}
diff --git a/pkgs/servers/openpts/ptsc.patch b/pkgs/servers/openpts/ptsc.patch
new file mode 100644
index 00000000000..b6fcde74074
--- /dev/null
+++ b/pkgs/servers/openpts/ptsc.patch
@@ -0,0 +1,28 @@
+diff -urNp openpts-0.2.6-patched/src/ptsc.c openpts-0.2.6-current/src/ptsc.c
+--- openpts-0.2.6-patched/src/ptsc.c	2012-08-21 15:57:07.733841433 -0400
++++ openpts-0.2.6-current/src/ptsc.c	2012-08-21 16:13:26.479732504 -0400
+@@ -457,7 +457,10 @@ void ptsc_lock(void) {
+             exit(1);
+         }
+         oldgrp = getegid();
+-        setegid(grp.gr_gid);
++        if(setegid(grp.gr_gid) != 0){
++		LOG(LOG_ERR, "setegid fail");
++		exit(1);
++	}
+     }
+ 
+     oldmask = umask(0);
+@@ -467,7 +470,10 @@ void ptsc_lock(void) {
+     }
+     if (grpent) {
+         chmod(LOCK_DIR, 02775);
+-        setegid(oldgrp);
++	if(setegid(oldgrp) != 0){
++		LOG(LOG_ERR, "setegid fail");
++		exit(1);
++        }
+     }
+     fd = open(LOCK_FILE, O_RDWR | O_CREAT | O_TRUNC, 0660);
+     if (fd < 0) {
+
diff --git a/pkgs/servers/openpts/tboot.patch b/pkgs/servers/openpts/tboot.patch
new file mode 100644
index 00000000000..6ecee583920
--- /dev/null
+++ b/pkgs/servers/openpts/tboot.patch
@@ -0,0 +1,21 @@
+diff -urNp openpts-0.2.6-patched/src/tboot2iml.c openpts-0.2.6-current/src/tboot2iml.c
+--- openpts-0.2.6-patched/src/tboot2iml.c	2012-07-23 16:30:12.381361421 -0400
++++ openpts-0.2.6-current/src/tboot2iml.c	2012-07-23 17:25:59.053945778 -0400
+@@ -531,7 +531,7 @@ int sinit_acm_hash(char *filename, int s
+ 
+ 
+ int sha1sum_unzip(char *filename, int *filesize, BYTE *digest) {
+-    FILE *fp;
++    gzFile fp;
+     char buf[2048];
+     SHA_CTX sha_ctx;
+     int len;
+@@ -541,7 +541,7 @@ int sha1sum_unzip(char *filename, int *f
+ 
+     /* open */
+     fp = gzopen(filename, "rb");
+-    if (fp == NULL) {
++    if (fp == Z_NULL) {
+         LOG(LOG_ERR, "File %s does not exist\n", filename);
+         return 0;
+     }
diff --git a/pkgs/servers/openpts/zlib.patch b/pkgs/servers/openpts/zlib.patch
new file mode 100644
index 00000000000..7fa3fce10fe
--- /dev/null
+++ b/pkgs/servers/openpts/zlib.patch
@@ -0,0 +1,12 @@
+diff -urNp openpts-0.2.6-cvs-patched/src/Makefile.am openpts-0.2.6-current/src/Makefile.am
+--- openpts-0.2.6-cvs-patched/src/Makefile.am	2012-01-05 03:49:15.000000000 -0500
++++ openpts-0.2.6-current/src/Makefile.am	2012-01-09 14:12:02.507361732 -0500
+@@ -30,7 +30,7 @@ localedir = $(datadir)/locale
+ 
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/include $(LIBXML2_CFLAGS) $(TSS_CFLAGS) -I../include -DLOCALEDIR=\"$(localedir)\"
+-AM_LDFLAGS = $(LIBXML2_LIBS) $(LIBCRYPTO_LIBS) $(TSS_LIBS) -lopenpts
++AM_LDFLAGS = $(LIBXML2_LIBS) $(LIBCRYPTO_LIBS) $(TSS_LIBS) -lz -lopenpts
+ # $(LIBINTL) -lopenpts
+ 
+ if HAVE_LIBUUID
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0ada98f1bb..7950f8af69d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9026,6 +9026,8 @@ let
 
   nsq = callPackage ../servers/nsq { };
 
+  openpts = callPackage ../servers/openpts { };
+
   openresty = callPackage ../servers/http/openresty { };
 
   opensmtpd = callPackage ../servers/mail/opensmtpd { };

From 9f7cfea070a79c9ef2a3c868443b9a938b071d56 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 11 Aug 2015 13:44:35 +0200
Subject: [PATCH 1018/2016] bosun: Update from 0.2.0 to 0.3.0

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

diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
index dfb2ffbb838..15cdc52fb86 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/pkgs/servers/monitoring/bosun/default.nix
@@ -3,14 +3,14 @@
 with goPackages;
 
 buildGoPackage rec {
-  rev = "0.2.0";
+  rev = "0.3.0";
   name = "bosun-${rev}";
   goPackagePath = "bosun.org";
   src = fetchFromGitHub {
     inherit rev;
     owner = "bosun-monitor";
     repo = "bosun";
-    sha256 = "146k37zg4l01l10vwhnhjs6jv8d35zf5l5rljmvy9ydq2npadsjd";
+    sha256 = "05qfhm5ipdry0figa0rhmg93c45dzh2lwpia73pfxp64l1daqa3a";
   };
   subPackages = [ "cmd/bosun" ];
 

From 3afc387b4ab84d48140461254015106bedad8599 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 11 Aug 2015 13:45:10 +0200
Subject: [PATCH 1019/2016] scollector: Update from 20150506172827 to 0.3.0

---
 .../modules/services/monitoring/scollector.nix | 18 ++++++++++++++----
 pkgs/servers/monitoring/bosun/scollector.nix   |  4 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index 179c587431e..8b97daf8881 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -20,9 +20,11 @@ let
           cfg.collectors)}
     '';
 
-  cmdLineOpts = concatStringsSep " " (
-    [ "-h=${cfg.bosunHost}" "-c=${collectors}" ] ++ cfg.extraOpts
-  );
+  conf = pkgs.writeText "scollector.toml" ''
+    Host = "${cfg.bosunHost}"
+    ColDir = "${collectors}"
+    ${cfg.extraConfig}
+  '';
 
 in {
 
@@ -92,6 +94,14 @@ in {
         '';
       };
 
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra scollector configuration added to the end of scollector.toml
+        '';
+      };
+
     };
 
   };
@@ -108,7 +118,7 @@ in {
         PermissionsStartOnly = true;
         User = cfg.user;
         Group = cfg.group;
-        ExecStart = "${cfg.package}/bin/scollector ${cmdLineOpts}";
+        ExecStart = "${cfg.package}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";
       };
     };
 
diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix
index bd4a5cb1047..d55a68ebdeb 100644
--- a/pkgs/servers/monitoring/bosun/scollector.nix
+++ b/pkgs/servers/monitoring/bosun/scollector.nix
@@ -3,14 +3,14 @@
 with goPackages;
 
 buildGoPackage rec {
-  rev = "20150506172827";
+  rev = "0.3.0";
   name = "scollector-${rev}";
   goPackagePath = "bosun.org";
   src = fetchFromGitHub {
     inherit rev;
     owner = "bosun-monitor";
     repo = "bosun";
-    sha256 = "0rnfiv9b835b8j8r9qh9j2mz9mm9q45vfg9cqa4nngrgfd0cqvl8";
+    sha256 = "05qfhm5ipdry0figa0rhmg93c45dzh2lwpia73pfxp64l1daqa3a";
   };
   subPackages = [ "cmd/scollector" ];
 

From 30e90ca1febe2180dd9a0a0bae9b941a74fc5d81 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2015 13:49:58 +0200
Subject: [PATCH 1020/2016] release-small.nix: Drop the grub1 test

See 606d34e45aeedc843f0ddb375e1fb1aa9be429fd.
---
 nixos/release-small.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 8e53064f99d..08ca4cfb3e4 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -43,7 +43,6 @@ in rec {
         simple;
       installer = {
         inherit (nixos'.tests.installer)
-          grub1
           lvm
           separateBoot
           simple;

From 36ab9c695a202c6040793d7943a99c668ea735b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2015 14:26:01 +0200
Subject: [PATCH 1021/2016] nss: Update to 3.19.3

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

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index b9c737e231b..5c73f5db26f 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.19.2";
+  version = "3.19.3";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_2_RTM/src/${name}.tar.gz";
-    sha256 = "1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_3_RTM/src/${name}.tar.gz";
+    sha256 = "c56bdad20736a8227afb3c97b25d6d2eb3982e979ddc9be1d66cb7199ae8ca8f";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

From 18b2a21583fe7c7025f9caec0b4348e203535a0e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 11 Aug 2015 14:09:26 +0200
Subject: [PATCH 1022/2016] synergy: Fix support for XRandR again.

Regression introduced by f91dacdd07731e06cec80b727b28b749e64f60e8.

Accidentally thought that it's compiling with XRandR support enabled,
because the cmake output said so:

Looking for XRRQueryExtension in Xrandr - found

Unfortunately, despite this message, the relevant part is:

Looking for XRRNotifyEvent - not found

So, ea4afb7 still holds true and I've added a small comment to avoid
this from happening in the future.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/misc/synergy/default.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 30b0c5d183c..c010047845f 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -17,6 +17,23 @@ stdenv.mkDerivation rec {
   postPatch = ''
     ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip
     ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip
+  ''
+    # We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt
+    # it's not able to find it (it's trying to search the store path of libX11
+    # instead) and we don't get XRandR support, even though the CMake output
+    # _seems_ to say so:
+    #
+    #   Looking for XRRQueryExtension in Xrandr - found
+    #
+    # The relevant part however is:
+    #
+    #   Looking for XRRNotifyEvent - not found
+    #
+    # So let's force it:
+  + optionalString stdenv.isLinux ''
+    sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \
+      set(HAVE_X11_EXTENSIONS_XRANDR_H true)
+    ' CMakeLists.txt
   '';
 
   buildInputs = [

From 81230e0b447a24efcddb46981695b5f0a2667189 Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Tue, 11 Aug 2015 16:09:13 +0200
Subject: [PATCH 1023/2016] gtkpod: 2.1.4 -> 2.1.5

This fixes some issues with libanjuta. The previous version spitted out hundrets
of error messages whenever gtkpod changed the progressbar. This issue is fixed
in 2.1.5.
---
 pkgs/applications/audio/gtkpod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index f01abb13e67..1b1bf437ce9 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -3,12 +3,12 @@
   libvorbis, hicolor_icon_theme, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  version = "2.1.4";
+  version = "2.1.5";
   name = "gtkpod-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/gtkpod/${name}.tar.gz";
-    sha256 = "ba12b35f3f24a155b68f0ffdaf4d3c5c7d1b8df04843a53306e1c83fc811dfaa";
+    sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
   };
 
   propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ];

From 8f2be7122c990ec4b44be49412e078c1139b214d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 11 Aug 2015 17:25:46 +0200
Subject: [PATCH 1024/2016] emacs24: style fixups

Unused gtk parameter, "incorrect" usage of optional.
---
 pkgs/applications/editors/emacs-24/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 487fccfa90d..178b2a306af 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
-, pkgconfig, gettext, gtk, libXft, dbus, libpng, libjpeg, libungif
+, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
 , alsaLib, cairo, acl, gpm
 , withX ? !stdenv.isDarwin
@@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals withX
       [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
         imagemagick gconf ]
-    ++ stdenv.lib.optional (withX && withGTK2) [ gtk2 ]
-    ++ stdenv.lib.optional (withX && withGTK3) [ gtk3 ]
+    ++ stdenv.lib.optional (withX && withGTK2) gtk2
+    ++ stdenv.lib.optional (withX && withGTK3) gtk3
     ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
 
   configureFlags =

From 8e9d8d23bcd56f7c6f42e184c49e9f9d3cd24d3f Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Tue, 11 Aug 2015 17:06:52 +0100
Subject: [PATCH 1025/2016] tibia: update to 10.81

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

diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 03729cfae3b..dc4a8ac3692 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 assert stdenv.isi686;
 stdenv.mkDerivation {
-  name = "tibia-10.80";
+  name = "tibia-10.81";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1080.tgz;
-    sha256 = "0ng7gi64lsda8k3674nc2gwnr8si648nmwgghrjrcwyybgsyzfvl";
+    url = http://static.tibia.com/download/tibia1081.tgz;
+    sha256 = "19p102fg31slrwg09q8dzhvz48qp8yrkpq69djn0jb9hrs7k7fpr";
   };
 
   shell = stdenv.shell;

From c36c7fe33d86218a2d5a541f6271e1b9aee06f56 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Tue, 11 Aug 2015 18:10:50 +0200
Subject: [PATCH 1026/2016] backintime: 1.1.4 -> 1.1.6

---
 pkgs/applications/networking/sync/backintime/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index b6535ad7310..14fa69974e8 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, makeWrapper, gettext, python3, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.4";
+  version = "1.1.6";
 
   name = "backintime-common-${version}";
 
   src = fetchurl {
     url = "https://launchpad.net/backintime/1.1/${version}/+download/backintime-${version}.tar.gz";
-    sha256 = "0w57b7xygwx83azz463fd4y7fxz0z6dy74f70ixhvhlsdpxw2ks3";
+    sha256 = "04yw1v6h959mmvc67mhh0km7vkxjzb7j1mniv5xfjdy27ryii1ig";
   };
 
   buildInputs = [ makeWrapper gettext python3 python3Packages.dbus python3Packages.keyring openssh cron rsync sshfsFuse encfs ];

From 57f40853ae40dc9b480c245c7bc320d832be21af Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 11 Aug 2015 19:10:15 +0200
Subject: [PATCH 1027/2016] zim: 0.62 -> 0.63

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

diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index ac8059fc1d1..84a5680b1f4 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   name = "zim-${version}";
-  version = "0.62";
+  version = "0.63";
   namePrefix = "";
   
   src = fetchurl {
     url = "http://zim-wiki.org/downloads/${name}.tar.gz";
-    sha256 = "1hmx24jjazqvs3z6h10jl8wrqxyvvk0wc807v222vaf1sbmjmmhr";
+    sha256 = "077vf4h0hjmbk8bxj9l0z9rxcb3dw642n32lvfn6vjdna1qm910m";
   };
 
   propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk /*pythonPackages.pyxdg*/ pygobject ];

From a8eb2a6a81524f3be0c8886f6d06090b50b0a513 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 11 Aug 2015 10:59:12 -0700
Subject: [PATCH 1028/2016] openssh: 6.9p1 -> 7.0p1

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

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 357ee2b9f21..57bbf1da22e 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -17,11 +17,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "openssh-6.9p1";
+  name = "openssh-7.0p1";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1zkci5nbpb4frmzj2vr3kv9j47x2h72kvybcpr0d8mzk73sls1vf";
+    sha256 = "1rc52jyc5v5b8j9kvasrnz9vnj9b0i7fw4nqac8wix0r794k4ngx";
   };
 
   prePatch = optionalString hpnSupport

From 30f1d5b3cf876f63c026fd576eb762c004b4eea9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 11 Aug 2015 11:26:46 -0700
Subject: [PATCH 1029/2016] firefox: 39.0.3 -> 40.0

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index c11eef3189b..171925169f3 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -16,14 +16,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "39.0.3"; in
+let version = "40.0"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "e024e528317d6c531fb36a26d2ce3317d3510b42";
+    sha1 = "48483e5738182f8567e2b6d2e29bd6bc1812d3eb";
   };
 
   buildInputs =

From a9fc51968f33b543f0eb20a544963640ee48ea87 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 11 Aug 2015 01:29:30 +0200
Subject: [PATCH 1030/2016] man-pages: 4.01 -> 4.02

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

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 71fca096c58..db1c16e4633 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
-let version = "4.01"; in
+let version = "4.02"; in
 stdenv.mkDerivation rec {
   name = "man-pages-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "116jp2rnsdlnb3cwnbfp0g053frcmchndwyrj714swl1lgabb56i";
+    sha256 = "1lqdzw6n3rqhd097lk5w16jcjhwfqs5zvi42hsbk3p92smswpaj8";
   };
 
   makeFlags = "MANDIR=$(out)/share/man";

From ea3cd87383dee1ee4da8df19e133407dfd15c8a6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 11 Aug 2015 01:31:04 +0200
Subject: [PATCH 1031/2016] geolite-legacy: 2015-08-05 -> 2015-08-11

---
 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 65339574dfb..6dccfa69638 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-08-05";
+  version = "2015-08-11";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
     "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "04qlh6zr8m5qxl2gcysb721bqlnqrxhngh128zj1w8rhqckjndgj";
+    "1h4wpqs16a1w16znbr2h15b16p5y43vp6qhj0bc7krq5qa484y2k";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "06p9wnypnffsmqg5bszwygb73in4gc0h5l26wk0s43pdaldrdrx0";
+    "09qiy2grxnakapvz5xjw3ivbxc0id6srqyd46p68mcy7gwrggcv7";
 
   meta = with stdenv.lib; {
     inherit version;

From ffec002c68f14e7eb0e26bc41328a17e7d6b7171 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 11 Aug 2015 01:55:18 +0200
Subject: [PATCH 1032/2016] rsstail: 1.9.1 -> 2.0

---
 .../networking/feedreaders/rsstail/default.nix      | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index 2d4b9741375..e6f6c162067 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, cppcheck, libmrss }:
 
-let version = "1.9.1"; in
+let version = "2.0"; in
 stdenv.mkDerivation rec {
   name = "rsstail-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0jhf7vr7y56r751wy4ix80iwhgxhk6mbbin8gnx59i457gf6sjl1";
-    rev = "1220d63aaa233961636f859d9a406536fffb64f4";
+    sha256 = "0fbsyl5bdxr2g25ps7kd34sa0mzggklbg4v7qss68gh82zdp16ch";
+    rev = "69dc5e30439b89c037aa49c5af861f28df607c72";
     repo = "rsstail";
     owner = "flok99";
   };
@@ -28,14 +28,11 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional doCheck cppcheck;
 
   postPatch = ''
-    substituteInPlace Makefile --replace /usr $out
+    substituteInPlace Makefile --replace -liconv ""
   '';
 
+  makeFlags = "prefix=$(out)";
   enableParallelBuilding = true;
 
   doCheck = true;
-
-  preInstall = ''
-    mkdir -p $out/{bin,share/man/man1}
-  '';
 }

From ab139b39a507c71a5e8d180ec731deeb5918da2e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 11 Aug 2015 01:58:44 +0200
Subject: [PATCH 1033/2016] perl-packages: Glib 1.312 -> 1.313

---
 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 d8d66ff1cd4..90fd8b8370a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4682,10 +4682,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Glib = buildPerlPackage rec {
-    name = "Glib-1.312";
+    name = "Glib-1.313";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
-      sha256 = "1aqww3ncaxiclfiqvl81hx7k3w4pri3k52rrar0hpzcasics5zr3";
+      sha256 = "162g342bhzy2ca4xwk63j10q9jycsps0s8l8y8pda70m7zcmr7xj";
     };
     buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.glib ];
     meta = {

From 6a0dd91e020927fc2240750c216d14d2c6985ad0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 11 Aug 2015 02:21:10 +0200
Subject: [PATCH 1034/2016] libpsl: list 2015-08-03 -> 2015-08-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 753577a2918..883ba807eda 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -5,11 +5,11 @@ let
 
   version = "${libVersion}-list-${listVersion}";
 
-  listVersion = "2015-08-03";
+  listVersion = "2015-08-07";
   listArchive = let
-    rev = "447962d71bf512fe41e828afc7fa66a1701c7c3c";
+    rev = "de9af76664aa5fd89dfee3c44c56ba91c03eefab";
   in fetchurl {
-    sha256 = "0gp0cb6p8yvyy5kvgdwg45ian9rb07bb0a9ibdj58g21l54mx3r2";
+    sha256 = "007yxs92dffgapkqik6rfrng5af8hjzf8wd7hlff91q836k40abi";
     url = "https://codeload.github.com/publicsuffix/list/tar.gz/${rev}";
   };
 

From e2379d66298c8fdef04231f21192d4123a209e30 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 11 Aug 2015 02:23:48 +0200
Subject: [PATCH 1035/2016] fmit: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 011f4f15f5d..f310130be5a 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -7,12 +7,12 @@
 assert alsaSupport -> alsaLib != null;
 assert jackSupport -> libjack2 != null;
 
-let version = "1.0.5"; in
+let version = "1.0.6"; in
 stdenv.mkDerivation {
   name = "fmit-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1p49ykg7mf62xrn08fqss8yr1nf53mm8w9zp2sgcy48bfsa9xbpy";
+    sha256 = "1ls6pcal5vimr3syz4ih06s1j746z63hgj5wbg5z349gy6zl43fh";
     rev = "v${version}";
     repo = "fmit";
     owner = "gillesdegottex";

From 97141604e34c69b2a08be5a97c1237c57cb59c54 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 11 Aug 2015 20:38:19 +0200
Subject: [PATCH 1036/2016] fmit: follow upstream installation guidelines

...now that they finally work.
---
 pkgs/applications/audio/fmit/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index f310130be5a..7c4952e76aa 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -26,24 +26,23 @@ stdenv.mkDerivation {
     substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
     substituteInPlace distrib/fmit.desktop \
       --replace "Icon=fmit" "Icon=$out/share/pixmaps/fmit.svg"
-    substituteInPlace src/main.cpp --replace "PREFIX" "\"$out\""
   '';
 
   configurePhase = ''
+    mkdir build
+    cd build
     qmake \
       CONFIG+=${stdenv.lib.optionalString alsaSupport "acs_alsa"} \
       CONFIG+=${stdenv.lib.optionalString jackSupport "acs_jack"} \
-      fmit.pro
+      PREFIX="$out" PREFIXSHORTCUT="$out" \
+      ../fmit.pro
   '';
 
   enableParallelBuilding = true;
 
-  installPhase = ''
-    install -D fmit $out/bin/fmit
-    install -Dm644 distrib/fmit.desktop $out/share/applications/fmit.desktop
-    install -Dm644 ui/images/fmit.svg $out/share/pixmaps/fmit.svg
-    mkdir -p $out/share/fmit
-    cp -R tr $out/share/fmit
+  postInstall = ''
+    cd ..
+    install -Dm644 {ui/images,$out/share/pixmaps}/fmit.svg
   '';
 
   meta = with stdenv.lib; {

From c5db72671cea28d6a0531bc46d3466f8afac9b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 11 Aug 2015 21:06:54 +0200
Subject: [PATCH 1037/2016] libgsf: small update 1.14.32 -> 1.14.34

This is needed to update gnumeric.
/cc #9206, maintainer @lovek323.
---
 pkgs/development/libraries/libgsf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index d08e4c231f5..b7e774b5223 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -4,11 +4,11 @@
 with { inherit (stdenv.lib) optionals; };
 
 stdenv.mkDerivation rec {
-  name = "libgsf-1.14.32";
+  name = "libgsf-1.14.34";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
-    sha256 = "13bf38b848c01e20eb89a48150b6f864434ee4dfbb6301ddf6f4080a36cd99e9";
+    sha256 = "f0fea447e0374a73df45b498fd1701393f8e6acb39746119f8a292fb4a0cb528";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From 6c4364041052bc49195e47cb55983a741b644934 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 11 Aug 2015 12:16:10 -0700
Subject: [PATCH 1038/2016] ghc: Fix compatability with new versions of ncurses

---
 pkgs/development/compilers/ghc/7.4.2-binary.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
index 25c9dd0a65a..88db6738ca0 100644
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -60,9 +60,11 @@ stdenv.mkDerivation rec {
     # On Linux, use patchelf to modify the executables so that they can
     # find editline/gmp.
     stdenv.lib.optionalString stdenv.isLinux ''
+      mkdir -p "$out/lib"
+      ln -sv "${ncurses}/lib/libncurses.so" "$out/lib/libncursesw.so.5"
       find . -type f -perm +100 \
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "${ncurses}/lib:${gmp}/lib" {} \;
+          --set-rpath "$out/lib:${gmp}/lib" {} \;
       sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
       sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
       for prog in ld ar gcc strip ranlib; do

From 62074ab09a6dab1b8cd0b18f32be4383529945a7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 11 Aug 2015 21:34:31 +0200
Subject: [PATCH 1039/2016] gnumeric: 1.12.20 -> 1.12.23 (close #9206)

Adds python support
---
 pkgs/applications/office/gnumeric/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index e54dd591cfd..8e01d30c44f 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -1,21 +1,23 @@
 { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
 , goffice, gnome3, makeWrapper, gtk3
+, python, pygobject3
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnumeric-1.12.20";
+  name = "gnumeric-1.12.23";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
-    sha256 = "1k915ks55a32fpqrr0rx6j8ml9bw0a07f11350qc1bvkx53i2jad";
+    sha256 = "0lcmw4jrfg9y2fhx13xw8w85vi7bcmgyn2sdjxi21xkh3szlqiq0";
   };
 
   configureFlags = "--disable-component";
 
-  # ToDo: optional libgda, python, introspection?
+  # ToDo: optional libgda, introspection?
   buildInputs = [
     pkgconfig intltool perl perlXMLParser
     goffice gtk3 makeWrapper gnome3.defaultIconTheme
+    python pygobject3
   ];
 
   enableParallelBuilding = true;

From 963e70a7e838449030668b554cce69b5c9cdf72e Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 11 Aug 2015 17:44:04 -0400
Subject: [PATCH 1040/2016] iproute: remove unused patch

In f18efaf26e8, the "patches" attribute was erroneously renamed to
"patch". If you follow the original bug report[1], you'll see that this
has long since been fixed upstream (using a different patch).

1: https://bugs.gentoo.org/show_bug.cgi?id=331447
---
 pkgs/os-specific/linux/iproute/default.nix |  2 --
 pkgs/os-specific/linux/iproute/vpnc.patch  | 15 ---------------
 2 files changed, 17 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/iproute/vpnc.patch

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index f7ca0481a31..6fea4ba05e0 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "0vz6m2k6hdrjlg4x0r3cd75lg9ysmndbsp35pm8494zvksc7l1vk";
   };
 
-  patch = [ ./vpnc.patch ];
-
   preConfigure = ''
     patchShebangs ./configure
     sed -e '/ARPDDIR/d' -i Makefile
diff --git a/pkgs/os-specific/linux/iproute/vpnc.patch b/pkgs/os-specific/linux/iproute/vpnc.patch
deleted file mode 100644
index 0a65f3e5df5..00000000000
--- a/pkgs/os-specific/linux/iproute/vpnc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-vpnc fails with "RTNETLINK answers: No such device"
-Patch from: https://bugs.gentoo.org/attachment.cgi?id=245736
-In reference to: https://bugs.gentoo.org/show_bug.cgi?id=331447
-
---- iproute2-2.6.35.old/ip/iproute.c	2010-09-02 16:00:21.805000124 +0200
-+++ iproute2-2.6.35/ip/iproute.c	2010-09-02 16:00:40.782000125 +0200
-@@ -160,7 +160,7 @@
- 	if (r->rtm_family == AF_INET6 && table != RT_TABLE_MAIN)
- 		ip6_multiple_tables = 1;
- 
--	if (filter.cloned == !(r->rtm_flags&RTM_F_CLONED))
-+	if (filter.cloned && !(r->rtm_flags&RTM_F_CLONED))
- 		return 0;
- 
- 	if (r->rtm_family == AF_INET6 && !ip6_multiple_tables) {

From 6783f1b4401b1068c5b062238128b3b4d8835ad6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 11 Aug 2015 22:16:53 +0200
Subject: [PATCH 1041/2016] tzdata: 2015e -> 2015f

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

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 6d10fe68a09..8789316ccdc 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-let version = "2015e"; in
+let version = "2015f"; in
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "0vxs6j1i429vxz4a1lbwjz81k236lxdggqvrlix2ga5xib9vbjgz";
+        sha256 = "07ak8ai5skgjpj6lg74pawxg0bz998k7s2ah7jqyqhp086sq37wm";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "185db6789kygcpcl48y1dh6m4fkgqcwqjwx7f3s5dys7b2sig8mm";
+        sha256 = "1bl4vqw6yp9199clm9aai566bmslp42g5xglj3vl24dn5fjf158c";
       })
     ];
 

From 65ad1a27a4639f6c1a62f6742ea8a6f7aec046c3 Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Wed, 12 Aug 2015 00:58:17 +0200
Subject: [PATCH 1042/2016] keepassx: 2.0alpha6 -> 2.0beta1

Builds and tested on my machine.
---
 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 1c5f2c6e781..ff61ea5d010 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.0alpha6";
+  name = "keepassx2-2.0beta1";
   src = fetchurl {
-    url = "https://github.com/keepassx/keepassx/archive/2.0-alpha6.tar.gz";
-    sha256 = "592f9995b13c4f84724fb24a0078162246397eedccd467daaf0fd3608151f2b0";
+    url = "https://github.com/keepassx/keepassx/archive/2.0-beta1.tar.gz";
+    sha256 = "1wnbk9laixz16lmchr1lnv8m9i6rkxv6slnx8f0fyczx90y97qdw";
   };
 
   buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ];

From 6a3b25dbd3e1f3a7257bc34e97d51254392484c2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 11 Aug 2015 16:08:34 -0700
Subject: [PATCH 1043/2016] chromium: 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 e3c07acd08b..141b1635c4f 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,10 +1,10 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "46.0.2471.2";
-    sha256 = "1gmdcb4sjc2l9y46ybpr64gnzjg3bi93x4f42bssrb3nzhpjpmgg";
-    sha256bin32 = "11rg4rkw89zvvxlpil680n59y49w9msxg4qp93iilq0n7ppk5qx9";
-    sha256bin64 = "1xqibl37mr6xvqqd1ainvkv11shirxb7ay9sfjgq8k72xk7wdx8k";
+    version = "46.0.2478.0";
+    sha256 = "15h6gq9vzycamdx01cyz3dv8raprdrd4k97c8pigxbli3n18b41k";
+    sha256bin32 = "0q10zacsl82nadfvp59ppidai74pc53000qsh4ixdji3xqcbisk4";
+    sha256bin64 = "1v57w8n7dxw1yb20710f0mzkvil7apyikvfp0174xb2rbr1ipwng";
   };
   beta = {
     version = "45.0.2454.26";
@@ -13,9 +13,9 @@
     sha256bin64 = "0bwmpl7rq2nj0jf1xqx7n1mvx9kigbvpz2f8v0azwv4nb56p9c2q";
   };
   stable = {
-    version = "44.0.2403.130";
-    sha256 = "055lccfiqdqwcjnx9l9xgzcilm2m341rg66nfnnadqa490prnxrp";
-    sha256bin32 = "0yzjhqyw2aaiwfv395c75avizcg28f3bn9zkqk2p3ifcv231w15v";
-    sha256bin64 = "1dzwlrdvnqyz6rpcl3pavpvqsx6la1d04cvgca3iaanq5xcana8b";
+    version = "44.0.2403.155";
+    sha256 = "0g4z46vbqwnsbmhlbyqm3lm5dz6sxjz0m51cnxhxs850231738pb";
+    sha256bin32 = "11f8224b8p14py5abi78m74l5hsrhdhipcf2dw7bgqddhykzr4h6";
+    sha256bin64 = "1mhbga7s43qg13rv6ss0xsn8hkf9fdmgd293ymj564ih39l9bnbm";
   };
 }

From b3fbd7701e3cf10a80fd8445722142e8ff14b145 Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Wed, 12 Aug 2015 11:34:11 +1000
Subject: [PATCH 1044/2016] keepass: update 2.29 -> 2.30

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

diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index f659e4f6c2d..950d16eeac8 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -2,11 +2,11 @@
 
 buildDotnetPackage rec {
   baseName = "keepass";
-  version = "2.29";
+  version = "2.30";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
-    sha256 = "051s0aznyyhbpdbly6h5rs0ax0zvkp45dh93nmq6lwhicswjwn5m";
+    sha256 = "1r792cikgvzj4hrxiv7xd3gx2zmn16dbh4inj2zi6ny0gchkqg2a";
   };
 
   sourceRoot = ".";

From 26b5776cd7d86c5e1cb5b2ddb19b70791103dd64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 12 Aug 2015 05:35:00 +0200
Subject: [PATCH 1045/2016] virt-manager: fix gschemas problems (fixes #9208)

Also fix missing icons, at least in combo-boxes.
/cc maintainers: @offlinehacker, @qknight.
---
 .../virtualization/virt-manager/default.nix       | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 604cad4c066..a98ebe424c6 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl, python
-, makeWrapper, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte
+, wrapGAppsHook, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte
 , gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
-, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo
+, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3
 }:
 
 with stdenv.lib;
@@ -35,6 +35,8 @@ buildPythonPackage rec {
       glib
       gobjectIntrospection
       gsettings_desktop_schemas
+      gnome3.defaultIconTheme
+      wrapGAppsHook
     ];
 
   configurePhase = ''
@@ -46,15 +48,6 @@ buildPythonPackage rec {
   buildPhase = "true";
 
   postInstall = ''
-    # GI_TYPELIB_PATH is needed at runtime for GObject stuff to work
-    for file in "$out"/bin/*; do
-        wrapProgram "$file" \
-            --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \
-            --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
-            --prefix GSETTINGS_SCHEMA_DIR : $out/share/glib-2.0/schemas \
-            --prefix XDG_DATA_DIRS : "$out/share:${gtk3}/share:$GSETTINGS_SCHEMAS_PATH:\$XDG_DATA_DIRS"
-    done
-
     ${glib}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas
   '';
 

From c55e634f9a4f70146e5d4e6e49daa9e8d5dbce53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 12 Aug 2015 05:37:36 +0200
Subject: [PATCH 1046/2016] wrapGAppsHook: fix a typo

It would only matter in (some) multiple-output derivations.
/cc @lethalman.
---
 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index e9fc7f7062d..3445c4b9cc1 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -22,7 +22,7 @@ wrapGAppsHook() {
   fi
 
   if [ -d "$prefix/share" ]; then
-    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$out/share")
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
   fi
 
   for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do

From 2bdd4aa1cb7e705c2af4c050325abd0ccfa9c43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 12 Aug 2015 06:41:55 +0200
Subject: [PATCH 1047/2016] nixos/release-notes: move "new services" section

It seems much less important than incompatible changes (though it's shorter).
---
 nixos/doc/manual/release-notes/rl-unstable.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index c50df94bfd8..0c84069a650 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -36,14 +36,6 @@
 
 </para>
 
-<para>The following new services were added since the last release:
-
-<itemizedlist>
-<listitem><para><literal>brltty</literal></para></listitem>
-<listitem><para><literal>marathon</literal></para></listitem>
-<listitem><para><literal>tvheadend</literal></para></listitem>
-</itemizedlist>
-</para>
 
 <para>When upgrading from a previous release, please be aware of the
 following incompatible changes:
@@ -200,4 +192,14 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
 </itemizedlist>
 </para>
 
+
+<para>The following new services were added since the last release:
+
+<itemizedlist>
+<listitem><para><literal>brltty</literal></para></listitem>
+<listitem><para><literal>marathon</literal></para></listitem>
+<listitem><para><literal>tvheadend</literal></para></listitem>
+</itemizedlist>
+</para>
+
 </section>

From f4dc055689e68600033b960ff892edca213253e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 12 Aug 2015 06:54:37 +0200
Subject: [PATCH 1048/2016] nixos/release-notes: mention unification of
 channels

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 0c84069a650..db20831ead8 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -202,4 +202,16 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
 </itemizedlist>
 </para>
 
+
+<para>Other notable improvements:
+
+<itemizedlist>
+  <listitem><para>The nixos and nixpkgs channels were unified,
+    so one <emphasis>can</emphasis> use <literal>nix-env -iA nixos.bash</literal>
+    instead of <literal>nix-env -iA nixos.pkgs.bash</literal>.
+    See <link xlink:href="https://github.com/NixOS/nixpkgs/commit/2cd7c1f198">the commit</link> for details.
+  </para></listitem>
+</itemizedlist>
+</para>
+
 </section>

From 5e7d2e20038531eae3a5e3d211a3231426537ecd Mon Sep 17 00:00:00 2001
From: j-keck <jhyphenkeck@gmail.com>
Date: Wed, 12 Aug 2015 07:45:25 +0200
Subject: [PATCH 1049/2016] sbt: 0.13.8 -> 0.13.9

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

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 01a3b740e6e..c9470063779 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "0.13.8";
+  version = "0.13.9";
 
   src = fetchurl {
     url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar";
-    sha256 = "0n4ivla8s8ygfnf95dj624nhcyganigf7fy0gamgyf31vw1vnw35";
+    sha256 = "04k411gcrq35ayd2xj79bcshczslyqkicwvhkf07hkyr4j3blxda";
   };
 
   phases = [ "installPhase" ];

From 9bafea0f6dddabe41e1df2f93421e2c71059bef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 12 Aug 2015 09:33:58 +0200
Subject: [PATCH 1050/2016] mesa: maintenance update 10.6.3 -> 10.6.4

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index a457807aa9f..66b984ee9f3 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -22,7 +22,7 @@ else
 */
 
 let
-  version = "10.6.3";
+  version = "10.6.4";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d";
+    sha256 = "8f5ac103f0f503de2f7a985b0df349bd4ecdfe7f51c714be146fa5a9a3c07b77";
   };
 
   prePatch = "patchShebangs .";

From 587f4f022e80804dc1e99e795b13d9ebcbe4547a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 12 Aug 2015 10:16:12 +0200
Subject: [PATCH 1051/2016] Making openimageio use parallel building.

(cherry picked from commit ff31b14cc51d3f493c62fb3074edc0c57fe8b7ce)
---
 pkgs/applications/graphics/openimageio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index de37482d51e..6bffa834ae0 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
     "-DUSE_PYTHON=OFF"
   ];
 
-  buildPhase = ''
-    make ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0 \
-      INSTALLDIR=$out dist_dir=
+  preBuild = ''
+    makeFlags="ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0
+      INSTALLDIR=$out dist_dir="
   '';
 
   enableParallelBuilding = true;

From 5a0f0bc0ca4002619ff4ef8c7d71f418d148f01b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Aug 2015 08:47:06 +0200
Subject: [PATCH 1052/2016] ghc: make sure the nokinds version is built with a
 deterministic version number

---
 pkgs/development/compilers/ghc/nokinds.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix
index 98e18706a16..2bd3fb55b70 100644
--- a/pkgs/development/compilers/ghc/nokinds.nix
+++ b/pkgs/development/compilers/ghc/nokinds.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
 
   postUnpack = ''
     pushd ghc-${builtins.substring 0 7 rev}
+    echo ${version} >VERSION
+    echo ${rev} >GIT_COMMIT_ID
     patchShebangs .
     ./boot
     popd

From dc74a811291ea5e29e47f7dcc01bdac118f492fb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Aug 2015 13:25:15 +0200
Subject: [PATCH 1053/2016] Revert "texinfo: 5.2 -> 6.0"

This reverts commit b1ed04ad1d56f882b6187ad75be6151535742a52. It breaks gcc:

http://hydra.nixos.org/build/24651204
---
 pkgs/development/tools/misc/texinfo/6.0.nix | 44 ---------------------
 pkgs/top-level/all-packages.nix             |  5 +--
 2 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/texinfo/6.0.nix

diff --git a/pkgs/development/tools/misc/texinfo/6.0.nix b/pkgs/development/tools/misc/texinfo/6.0.nix
deleted file mode 100644
index ffeae17eb57..00000000000
--- a/pkgs/development/tools/misc/texinfo/6.0.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }:
-
-stdenv.mkDerivation rec {
-  name = "texinfo-6.0";
-
-  src = fetchurl {
-    url = "mirror://gnu/texinfo/${name}.tar.xz";
-    sha256 = "1r3i6jyynn6ab45fxw5bms8mflk9ry4qpj6gqyry72vfd5c47fhi";
-  };
-
-  buildInputs = [ perl xz ]
-    ++ stdenv.lib.optional interactive ncurses;
-
-  preInstall = ''
-    installFlags="TEXMF=$out/texmf-dist";
-    installTargets="install install-tex";
-  '';
-
-  doCheck = !stdenv.isDarwin;
-
-  meta = {
-    homepage = "http://www.gnu.org/software/texinfo/";
-    description = "The GNU documentation system";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.all;
-
-    longDescription = ''
-      Texinfo is the official documentation format of the GNU project.
-      It was invented by Richard Stallman and Bob Chassell many years
-      ago, loosely based on Brian Reid's Scribe and other formatting
-      languages of the time.  It is used by many non-GNU projects as
-      well.
-
-      Texinfo uses a single source file to produce output in a number
-      of formats, both online and printed (dvi, html, info, pdf, xml,
-      etc.).  This means that instead of writing different documents
-      for online information and another for a printed manual, you
-      need write only one document.  And when the work is revised, you
-      need revise only that one document.  The Texinfo system is
-      well-integrated with GNU Emacs.
-    '';
-    branch = "5.2";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2dd01957be7..6181925a507 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5811,10 +5811,9 @@ let
   teensy-loader = callPackage ../development/tools/misc/teensy { };
 
   texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
-  texinfo4 = texinfo413;
   texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
-  texinfo6 = callPackage ../development/tools/misc/texinfo/6.0.nix { };
-  texinfo = texinfo6;
+  texinfo4 = texinfo413;
+  texinfo = texinfo5;
   texinfoInteractive = appendToName "interactive" (
     texinfo.override { interactive = true; }
   );

From 687caebfcb571bb45a6f7858c0969eee7e63505b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Aug 2015 14:11:03 +0200
Subject: [PATCH 1054/2016] Rename services.virtualboxHost ->
 programs.virtualbox

VirtualBox is an application, not a system service.
---
 nixos/modules/rename.nix                         | 2 ++
 nixos/modules/virtualisation/virtualbox-host.nix | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index a928f47f439..7874c8462ca 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -144,6 +144,8 @@ in zipModules ([]
 # DNSCrypt-proxy
 ++ obsolete [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ]
 
+++ obsolete [ "services" "virtualboxHost" ] [ "programs" "virtualbox" ]
+
 # Options that are obsolete and have no replacement.
 ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ]
 ++ obsolete' [ "boot" "initrd" "luks" "enable" ]
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index fc113a08a35..b8b3d62a031 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  cfg = config.services.virtualboxHost;
+  cfg = config.programs.virtualbox;
   virtualbox = config.boot.kernelPackages.virtualbox.override {
     inherit (cfg) enableHardening;
   };
@@ -11,12 +11,12 @@ let
 in
 
 {
-  options.services.virtualboxHost = {
+  options.programs.virtualbox = {
     enable = mkOption {
       type = types.bool;
       default = false;
       description = ''
-        Whether to enable host-side support for VirtualBox.
+        Whether to enable VirtualBox.
 
         <note><para>
           In order to pass USB devices from the host to the guests, the user

From 1ce6590bad07ceee56a44bd2cd272dd4b29b007e Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Wed, 12 Aug 2015 13:49:07 +0200
Subject: [PATCH 1055/2016] libchamplain: Enable gobject introspection

---
 pkgs/development/libraries/libchamplain/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 1a3c33eb80a..f0b4a1064fe 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ];
 
-  configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
-
   meta = {
     homepage = http://projects.gnome.org/libchamplain/;
     license = stdenv.lib.licenses.lgpl2Plus;

From 5343f1fab1401f4fe2401e395840f440046c0aae Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Wed, 12 Aug 2015 15:44:55 +0200
Subject: [PATCH 1056/2016] gnome-maps: init at 3.16.2

---
 .../gnome-3/3.16/apps/gnome-maps/default.nix  | 26 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  3 +++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix
new file mode 100644
index 00000000000..fe710e33fa9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3, gobjectIntrospection
+, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-maps-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-maps/${gnome3.version}/${name}.tar.xz";
+    sha256 = "15kwy2fy9v4zzjaqcifv4jaqcx1227bcdxgd6916ghrdzgj93mx7";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook
+                  gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
+                  gnome3.geocode_glib libchamplain file libsoup
+                  gnome3.gnome_online_accounts ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Maps;
+    description = "A map application for GNOME 3";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 46542e53f74..7b3703b3307 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -40,6 +40,7 @@ let
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
   inherit (pkgs.gnome2) ORBit2;
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
+  libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
   orbit = ORBit2;
   gnome3 = self // { recurseForDerivations = false; };
   clutter = pkgs.clutter_1_22;
@@ -268,6 +269,8 @@ let
 
   gnome-documents = callPackage ./apps/gnome-documents { };
 
+  gnome-maps = callPackage ./apps/gnome-maps { };
+
   gnome-music = callPackage ./apps/gnome-music { };
 
   gnome-photos = callPackage ./apps/gnome-photos {

From 43d5ab09266c8cef96b35ddd7bbedc939428062f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 12 Aug 2015 17:05:06 +0200
Subject: [PATCH 1057/2016] gnome-maps: fix icons

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

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix
index fe710e33fa9..7ee2275df5a 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3, gobjectIntrospection
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
+, gobjectIntrospection, gdk_pixbuf, librsvg
 , geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +15,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook
                   gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
                   gnome3.geocode_glib libchamplain file libsoup
-                  gnome3.gnome_online_accounts ];
+                  gdk_pixbuf librsvg
+                  gnome3.gnome_online_accounts gnome3.defaultIconTheme ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Maps;

From a7648a2226ed1d513b4b3d1c37b88023bcde7eea Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Wed, 12 Aug 2015 17:23:21 +0200
Subject: [PATCH 1058/2016] sundtek: 30-06-2015 -> 28-07-2015

Tested on local machine.
---
 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 0ad313a7233..c3b0711f23d 100644
--- a/pkgs/misc/drivers/sundtek/default.nix
+++ b/pkgs/misc/drivers/sundtek/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let
-  version = "30-06-2015";
+  version = "28-07-2015";
   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 = "304d2785b5e9046c78fc092341721fdc404074105e63dd635e838559d42313c3";
+      sha256 = "1gpz42rwxm76fzq6088gjzbfl82mhapc34c0ms7vphrhra6yw19h";
     };
     name = "sundtek-${version}";
 

From 0b6a75dc1a1006740b03d7805aee0afab66dd34b Mon Sep 17 00:00:00 2001
From: Mabry Cervin <mpcervin@uncg.edu>
Date: Wed, 12 Aug 2015 11:28:36 -0400
Subject: [PATCH 1059/2016] bspwm: 0.8.9 -> 0.9

---
 lib/maintainers.nix                                 | 1 +
 pkgs/applications/window-managers/bspwm/default.nix | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index c490b9ee979..5c0846fdc96 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -83,6 +83,7 @@
   eikek = "Eike Kettner <eike.kettner@posteo.de>";
   ellis = "Ellis Whitehead <nixos@ellisw.net>";
   emery = "Emery Hemingway <emery@vfemail.net>";
+  epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
   ericbmerritt = "Eric Merritt <eric@afiniate.com>";
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
   exlevan = "Alexey Levan <exlevan@gmail.com>";
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index c17107ae97b..fbe7e33baad 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }:
 
 stdenv.mkDerivation rec {
-  name = "bspwm-0.8.9";
+  name = "bspwm-0.9";
   
 
   src = fetchurl {
-    url = "https://github.com/baskerville/bspwm/archive/0.8.9.tar.gz";
-    sha256 = "750c76132914661d8d5edf7809e9b601977215d31e747dd780c60fd562913d55";
+    url = "https://github.com/baskerville/bspwm/archive/0.9.tar.gz";
+    sha256 = "1efb2db7b8a251bcc006d66a050cf66e9d311761c94890bebf91a32905042fde";
   };
 
   buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A tiling window manager based on binary space partitioning";
     homepage = http://github.com/baskerville/bspwm;
-    maintainers = [ stdenv.lib.maintainers.meisternu ];
+    maintainers = [ stdenv.lib.maintainers.meisternu stdenv.lib.maintainers.epitrochoid ];
     license = stdenv.lib.licenses.bsd2;
     platforms = stdenv.lib.platforms.linux;
   };

From acd7ec8c22faa2dddf9c20ca19c7a4b149f1d1a1 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Wed, 12 Aug 2015 17:15:32 +0200
Subject: [PATCH 1060/2016] qqwing: init at 1.3.4

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

diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix
new file mode 100644
index 00000000000..30c9ca66d10
--- /dev/null
+++ b/pkgs/games/qqwing/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, perl, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "qqwing-${version}";
+  version = "1.3.4";
+
+  src = fetchFromGitHub {
+    owner = "stephenostermiller";
+    repo = "qqwing";
+    rev = "v${version}";
+    sha256 = "1qq0vi4ch4y3a5fb1ncr0yzkj3mbvdiwa3d51qpabq94sh0cz09i";
+  };
+
+  postPatch = ''
+    for file in "src-first-comment.pl" "src_neaten.pl"; do
+      substituteInPlace "build/$file" \
+        --replace "#!/usr/bin/perl" "#!${perl}/bin/perl"
+    done
+
+    substituteInPlace "build/cpp_install.sh" \
+      --replace "sudo " ""
+  '';
+
+  buildInputs = [ perl autoconf automake libtool ];
+
+  makeFlags = [ "prefix=$(out)" "tgz" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://qqwing.com;
+    description = "Sudoku generating and solving software";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jgeerds ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53f2197069a..b4543f056dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13733,6 +13733,8 @@ let
 
   prboom = callPackage ../games/prboom { };
 
+  qqwing = callPackage ../games/qqwing { };
+
   quake3demo = callPackage ../games/quake3/wrapper {
     name = "quake3-demo-${quake3game.name}";
     description = "Demo of Quake 3 Arena, a classic first-person shooter";

From 214c26bfa18648d21bc63155049c041d5fe1d8b0 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Wed, 12 Aug 2015 17:33:29 +0200
Subject: [PATCH 1061/2016] gnome-sudoku: init at 3.16.0

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 +++-
 .../3.16/games/gnome-sudoku/default.nix       | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 7b3703b3307..f2c2fa0b1f0 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -34,7 +34,7 @@ let
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
-    tali quadrapassel
+    tali quadrapassel gnome-sudoku
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -296,6 +296,8 @@ let
 
 #### Games
 
+  gnome-sudoku = callPackage ./games/gnome-sudoku { };
+
   iagno = callPackage ./games/iagno { };
 
   lightsoff = callPackage ./games/lightsoff { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix
new file mode 100644
index 00000000000..eda3cf1f84e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook
+, json_glib, qqwing, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-sudoku-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-sudoku/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1b9xwldzjjpkwb2na9cbs8z4gv8dlj9dm574gybdz466190lrsxv";
+  };
+
+  buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee
+                  json_glib qqwing itstool libxml2 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Sudoku;
+    description = "Test your logic skills in this number grid puzzle";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From aed29abec7a940d33832f3b6651ede8657a63bbf Mon Sep 17 00:00:00 2001
From: Badi' Abdul-Wahid <abdulwahidc@gmail.com>
Date: Wed, 12 Aug 2015 10:29:30 -0400
Subject: [PATCH 1062/2016] keychain: support Darwin as a platform

This change provides support for Darwin as a platform by making the
`procps` parameter optional. If the platform is linux, then
`procps`/bin is added to the wrapped keychain's PATH, else not.
---
 pkgs/tools/misc/keychain/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix
index 0892061a50d..6ffd36312a3 100644
--- a/pkgs/tools/misc/keychain/default.nix
+++ b/pkgs/tools/misc/keychain/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg
-, perl, procps, gnugrep, gawk, findutils, gnused }:
+, perl, procps, gnugrep, gawk, findutils, gnused
+, withProcps ? stdenv.isLinux }:
 
 stdenv.mkDerivation rec {
   name = "keychain-${version}";
@@ -26,12 +27,16 @@ stdenv.mkDerivation rec {
       --prefix PATH ":" "${gnused}/bin" \
       --prefix PATH ":" "${findutils}/bin" \
       --prefix PATH ":" "${gawk}/bin" \
-      --prefix PATH ":" "${procps}/bin"
+      ${if withProcps then ("--prefix PATH \":\" ${procps}/bin") else ""}
   '';
 
   meta = {
     description = "Keychain management tool";
     homepage = "http://www.funtoo.org/Keychain";
     license = stdenv.lib.licenses.gpl2;
+    # other platforms are untested (AFAIK)
+    platforms =
+      with stdenv.lib;
+      platforms.linux ++ platforms.darwin;
   };
 }

From 80c137c7a2cb817834bbed60fab6c040ad11a218 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Aug 2015 18:38:16 +0200
Subject: [PATCH 1063/2016] Add cbc, a mixed ILP solver

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

diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix
new file mode 100644
index 00000000000..aa749a25889
--- /dev/null
+++ b/pkgs/applications/science/math/cbc/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchurl, zlib, bzip2 }:
+
+stdenv.mkDerivation {
+  name = "cbc-2.9.5";
+
+  src = fetchurl {
+    url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.5.tgz";
+    sha256 = "0kmsg9qpajh5jhnql04m6akpdjzlppxfz99q320vw5bkzgl3i18w";
+  };
+
+  configureFlags = "-C";
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ zlib bzip2 ];
+
+  # FIXME: move share/coin/Data to a separate output?
+
+  meta = {
+    homepage = https://projects.coin-or.org/Cbc;
+    license = lib.licenses.epl10;
+    maintainers = [ lib.maintainers.eelco ];
+    platforms = lib.platforms.linux;
+    description = "A mixed integer programming solver";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4543f056dd..5d595020df4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10850,6 +10850,8 @@ let
 
   cava = callPackage ../applications/audio/cava { };
 
+  cbc = callPackage ../applications/science/math/cbc { };
+
   cc1394 = callPackage ../applications/video/cc1394 { };
 
   cddiscid = callPackage ../applications/audio/cd-discid { };

From b48640c5a5c628a29faddaef8b10c3391f0cd084 Mon Sep 17 00:00:00 2001
From: hiberno <mail@elfsechsundzwanzig.de>
Date: Wed, 12 Aug 2015 19:05:19 +0200
Subject: [PATCH 1064/2016] bar-xft: init at version 2015-07-23

This a fork of the `bar` by lemonboy with support for xft.
---
 pkgs/applications/window-managers/bar/xft.nix | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/window-managers/bar/xft.nix

diff --git a/pkgs/applications/window-managers/bar/xft.nix b/pkgs/applications/window-managers/bar/xft.nix
new file mode 100644
index 00000000000..c671f1a4e03
--- /dev/null
+++ b/pkgs/applications/window-managers/bar/xft.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, perl, libxcb, libXft }:
+
+let
+  version = "2015-07-23";
+in
+  stdenv.mkDerivation rec {
+    name = "bar-xft-git-${version}";
+
+    src = fetchgit {
+      url = "https://github.com/krypt-n/bar";
+      rev = "020a3e1848ce03287886e9ff80b0b443e9aed543";
+      sha256 = "1xzs37syhlwyjfxnk36qnij5bqa0mi53lf1k851viw4qai2bfkgr";
+    };
+
+    buildInputs = [ libxcb libXft perl ];
+
+    prePatch = ''sed -i "s@/usr@$out@" Makefile'';
+
+    meta = {
+      description = "A lightweight xcb based bar with XFT-support";
+      homepage = https://github.com/krypt-n/bar;
+      maintainers = [ stdenv.lib.maintainers.hiberno ];
+      license = "Custom";
+      platforms = stdenv.lib.platforms.linux;
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bf619201af..ebc0403a234 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10769,6 +10769,8 @@ let
 
   bar = callPackage ../applications/window-managers/bar { };
 
+  bar-xft = callPackage ../applications/window-managers/bar/xft.nix { };
+
   baresip = callPackage ../applications/networking/instant-messengers/baresip {
     ffmpeg = ffmpeg_1;
   };

From 7a0980e5dce32e918711231d38c19460a0a98f4e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 12 Aug 2015 11:16:26 -0700
Subject: [PATCH 1065/2016] nixos/tests/openssh: Fix test by using safe public
 keys

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

diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index 34f9fccb79b..390363b88e2 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -43,7 +43,7 @@ in {
   testScript = ''
     startAll;
 
-    my $key=`${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`;
+    my $key=`${pkgs.openssh}/bin/ssh-keygen -t ed25519 -f key -N ""`;
 
     $server->waitForUnit("sshd");
 
@@ -52,8 +52,8 @@ in {
       $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
 
       $client->succeed("mkdir -m 700 /root/.ssh");
-      $client->copyFileFromHost("key", "/root/.ssh/id_dsa");
-      $client->succeed("chmod 600 /root/.ssh/id_dsa");
+      $client->copyFileFromHost("key", "/root/.ssh/id_ed25519");
+      $client->succeed("chmod 600 /root/.ssh/id_ed25519");
 
       $client->waitForUnit("network.target");
       $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");

From ef95107ddcd3fb587aabcec5936ad83c3a731df2 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 4 Aug 2015 09:55:29 -0700
Subject: [PATCH 1066/2016] make isClang work the way a user might expect

---
 pkgs/build-support/cc-wrapper/default.nix                    | 2 +-
 pkgs/development/libraries/ffmpeg-full/default.nix           | 2 +-
 pkgs/development/libraries/iniparser/default.nix             | 4 +---
 pkgs/os-specific/darwin/apple-source-releases/CF/default.nix | 3 +++
 pkgs/stdenv/pure-darwin/default.nix                          | 1 +
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 57607ba25b9..8965fc6bef0 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -9,7 +9,7 @@
 , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
 , zlib ? null, extraPackages ? [], extraBuildCommands ? ""
 , dyld ? null # TODO: should this be a setup-hook on dyld?
-, isGNU ? false, isClang ? false
+, isGNU ? false, isClang ? cc.isClang or false
 }:
 
 with stdenv.lib;
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 555576d3a36..263943411e8 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -253,7 +253,7 @@ stdenv.mkDerivation rec {
     # On some ARM platforms --enable-thumb
     "--enable-shared --disable-static"
     (enableFeature true "pic")
-    (if (stdenv.cc.cc.isClang or false) then "--cc=clang" else null)
+    (if stdenv.cc.isClang then "--cc=clang" else null)
     (enableFeature smallBuild "small")
     (enableFeature runtimeCpuDetectBuild "runtime-cpudetect")
     (enableFeature grayBuild "gray")
diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index 8d6e0b91ca0..bd2f328e257 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -2,7 +2,6 @@
 
 let
   inherit (stdenv.lib) optional;
-  isClang = (stdenv.cc.cc.isClang or false);
 in
 stdenv.mkDerivation rec{
   name = "iniparser-3.1";
@@ -15,8 +14,7 @@ stdenv.mkDerivation rec{
   patches = ./no-usr.patch;
 
   # TODO: Build dylib on Darwin
-  buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ])
-    ++ optional isClang "CC=clang";
+  buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ]) ++ [ "CC=cc" ];
 
   installPhase = ''
     mkdir -p $out/lib
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
index f919dde7f69..2aca836ba48 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
@@ -1,5 +1,8 @@
 { stdenv, appleDerivation, icu, dyld, libdispatch, launchd, libclosure }:
 
+# this project uses blocks, a clang-only extension
+assert stdenv.cc.isClang;
+
 appleDerivation {
   buildInputs = [ dyld icu libdispatch launchd libclosure ];
 
diff --git a/pkgs/stdenv/pure-darwin/default.nix b/pkgs/stdenv/pure-darwin/default.nix
index b40fbd8d446..2f31144a11e 100644
--- a/pkgs/stdenv/pure-darwin/default.nix
+++ b/pkgs/stdenv/pure-darwin/default.nix
@@ -81,6 +81,7 @@ in rec {
           nativePrefix = bootstrapTools;
           nativeLibc   = false;
           libc         = last.pkgs.darwin.Libsystem;
+          isClang      = true;
           cc           = { name = "clang-9.9.9"; outPath = bootstrapTools; };
         };
 

From 71756e741b677ff36239eb4e51c22d170362a780 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 6 Aug 2015 13:46:11 -0700
Subject: [PATCH 1067/2016] update ZNC version

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

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index 11681cfefd0..ca4c6d24315 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -7,11 +7,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "znc-1.6.0";
+  name = "znc-1.6.1";
 
   src = fetchurl {
     url = "http://znc.in/releases/${name}.tar.gz";
-    sha256 = "df622aeae34d26193c738dff6499e56ad669ec654484e19623738d84cc80aba7";
+    sha256 = "0h61nv5kx9k8prmhsffxhlprf7gjcq8vqhjjmqr6v3glcirkjjds";
   };
 
   buildInputs = [ openssl pkgconfig ]

From 9c153e2227d3c66c645718355b0ed381f664afa5 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 6 Aug 2015 13:46:49 -0700
Subject: [PATCH 1068/2016] add binutils to bash build for `size`

---
 pkgs/shells/bash/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index ea65e1f63c8..60504ecaa9b 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison }:
+{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, binutils ? null, bison }:
 
 assert interactive -> readline != null;
+assert stdenv.isDarwin -> binutils != null;
 
 let
   version = "4.3";
@@ -59,7 +60,8 @@ stdenv.mkDerivation rec {
   # Note: Bison is needed because the patches above modify parse.y.
   nativeBuildInputs = [bison]
     ++ stdenv.lib.optional (texinfo != null) texinfo
-    ++ stdenv.lib.optional interactive readline;
+    ++ stdenv.lib.optional interactive readline
+    ++ stdenv.lib.optional stdenv.isDarwin binutils;
 
   # Bash randomly fails to build because of a recursive invocation to
   # build `version.h'.

From a8d69a7153951dd85fa163699e329fe07b6bd608 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 6 Aug 2015 13:47:01 -0700
Subject: [PATCH 1069/2016] disable haskell-mockery check on Darwin

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ed23b190ec6..40428c94797 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -206,6 +206,9 @@ self: super: {
   # the system-fileio tests use canonicalizePath, which fails in the sandbox
   system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
 
+  # same as above
+  mockery = if pkgs.stdenv.isDarwin then dontCheck super.mockery else super.mockery;
+
   # Prevents needing to add security_tool as a build tool to all of x509-system's
   # dependencies.
   x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc

From 6cd4dacebe0c26352f6649e9cd8f0a953ff7b512 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 12 Aug 2015 11:45:12 -0700
Subject: [PATCH 1070/2016] fix some broken haskell packages

---
 pkgs/development/haskell-modules/configuration-common.nix     | 3 ---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 40428c94797..ed23b190ec6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -206,9 +206,6 @@ self: super: {
   # the system-fileio tests use canonicalizePath, which fails in the sandbox
   system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
 
-  # same as above
-  mockery = if pkgs.stdenv.isDarwin then dontCheck super.mockery else super.mockery;
-
   # Prevents needing to add security_tool as a build tool to all of x509-system's
   # dependencies.
   x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc
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 e78aa0e9839..9cdb088a48a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -111,6 +111,10 @@ self: super: {
   # Test suite has stricter version bounds
   retry = dontCheck super.retry;
 
+  # test/System/Posix/Types/OrphansSpec.hs:19:13:
+  #    Not in scope: type constructor or class ‘Int32’
+  base-orphans = dontCheck super.base-orphans;
+
   # Test suite fails with time >= 1.5
   http-date = dontCheck super.http-date;
 

From b56e9bc92afb81dadb7f870abc15e6bcd429ba96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 12 Aug 2015 23:07:13 +0200
Subject: [PATCH 1071/2016] eclipse-cdt (plugin): init at 8.7.0

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index f0de68a1a2b..f449b192ac1 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -127,6 +127,25 @@ rec {
     };
   };
 
+  cdt = buildEclipseUpdateSite rec {
+    name = "cdt-${version}";
+    version = "8.7.0";
+
+    src = fetchzip {
+      stripRoot = false;
+      url = "http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/8.7/${name}.zip";
+      sha256 = "0qpcjcl6n98x7ys4qz8p1x5hhk2ydrgh8w3r1kqk0zc7liqrx7vg";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://eclipse.org/cdt/;
+      description = "C/C++ development tooling";
+      license = licenses.epl10;
+      platforms = platforms.all;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
   checkstyle = buildEclipseUpdateSite rec {
     name = "checkstyle-${version}";
     version = "6.5.0.201504121610";

From 55d93854cedbf5599a8d472ac20582c74b43c875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 12 Aug 2015 23:07:44 +0200
Subject: [PATCH 1072/2016] eclipse-gnuarmeclipse (plugin): init at
 2.8.1-201504061754

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index f449b192ac1..284ea911724 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -254,6 +254,25 @@ rec {
     };
   };
 
+  gnuarmeclipse = buildEclipseUpdateSite rec {
+    name = "gnuarmeclipse-${version}";
+    version = "2.8.1-201504061754";
+
+    src = fetchzip {
+      stripRoot = false;
+      url = "mirror://sourceforge/project/gnuarmeclipse/Current%20Releases/2.x/ilg.gnuarmeclipse.repository-${version}.zip";
+      sha256 = "08jsnyis1ry62cidr9sl11ylyxbkwh834nlhx6qp31gh1l439px9";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = http://gnuarmeclipse.livius.net/;
+      description = "GNU ARM Eclipse Plug-ins";
+      license = licenses.epl10;
+      platforms = platforms.all;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
   jdt = buildEclipseUpdateSite rec {
     name = "jdt-${version}";
     version = "4.5";

From 1ff4589fd304c3a7a2e9fb2ef6816342f7c44c47 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Wed, 12 Aug 2015 23:49:25 +0200
Subject: [PATCH 1073/2016] gnome3.aisleriot: init at 3.16.2

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++-
 .../gnome-3/3.16/games/aisleriot/default.nix  | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index f2c2fa0b1f0..8ec4c87b82d 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -34,7 +34,7 @@ let
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
-    tali quadrapassel gnome-sudoku
+    tali quadrapassel gnome-sudoku aisleriot
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -296,6 +296,8 @@ let
 
 #### Games
 
+  aisleriot = callPackage ./games/aisleriot { };
+
   gnome-sudoku = callPackage ./games/gnome-sudoku { };
 
   iagno = callPackage ./games/iagno { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix
new file mode 100644
index 00000000000..94f4e5e4d04
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3
+, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils
+, guile, libcanberra_gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "aisleriot-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/aisleriot/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0rncdg21ys7ik971yw75qbawq89mikbh4dq5mg2msmrl6xsgv0zl";
+  };
+
+  configureFlags = [ "--with-card-theme-formats=svg" ];
+
+  buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf
+                  librsvg libxml2 desktop_file_utils guile libcanberra_gtk3 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Aisleriot;
+    description = "A collection of patience games written in guile scheme";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}

From 36f4e0e2e725f0c495cc00b41df4ed8f92fe098b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 13 Aug 2015 01:39:11 +0200
Subject: [PATCH 1074/2016] gnome3: set desktopManagerHandlesLidAndPower to
 false

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index fdee5fbc6c5..507c2d2da13 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -99,6 +99,7 @@ in {
     networking.networkmanager.enable = mkDefault true;
     services.upower.enable = config.powerManagement.enable;
     hardware.bluetooth.enable = mkDefault true;
+    services.xserver.displayManager.desktopManagerHandlesLidAndPower = false; # true doesn't make sense here, GNOME just doesn't handle it anymore
 
     fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];
 

From 73f0cfdc7bc705c1f82add5246f123b537bc7ad0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 12 Aug 2015 14:49:53 -0700
Subject: [PATCH 1075/2016] libassuan: 2.2.0 -> 2.2.1

---
 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 5202ad83605..d874d1e9ef5 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.0";
+  name = "libassuan-2.2.1";
 
   src = fetchurl {
     url = "mirror://gnupg/libassuan/${name}.tar.bz2";
-    sha256 = "1ikf9whfi7rg71qa610ynyv12qrw20zkn7zxgvvr9dp41gbqxxbx";
+    sha256 = "1pp2kl5gc2vja41g3wk03h1hgh7gxy6pj354fb5n4lrlg6xqb4ll";
   };
 
   buildInputs = [ libgpgerror pth ];

From 997b9bc8c6191cf37169847af2c4c23a5d198fb9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 12 Aug 2015 14:50:08 -0700
Subject: [PATCH 1076/2016] gnupg21: 2.1.6 -> 2.1.7

---
 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 8ef96d4d14e..bc7c5f85751 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.6";
+  name = "gnupg-2.1.7";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1zcj5vsrc64zyq7spnx2xlxlq6wxaf5bilpf6gbkp7qr8barlnay";
+    sha256 = "0vl4wzraln0h4db0kfza4l5by5pgfijqplji5n4riv3zsiv3g2n1";
   };
 
   postPatch = stdenv.lib.optionalString stdenv.isLinux ''

From 78377e02c53e7c6bb1ffebe9e74bce6d1929df0f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 12 Aug 2015 17:01:29 -0700
Subject: [PATCH 1077/2016] autogen: 5.18 -> 5.18.5

---
 .../tools/misc/autogen/default.nix            | 73 ++++++-------------
 1 file changed, 24 insertions(+), 49 deletions(-)

diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 01c5fd7dcba..71ea938ea78 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -1,55 +1,30 @@
-{ fetchurl, stdenv, guile, which, libffi }:
+{ stdenv, fetchurl, which, pkgconfig, perl, guile, libxml2 }:
 
-let version = "5.18"; in
+stdenv.mkDerivation rec {
+  name = "autogen-${version}";
+  version = "5.18.5";
 
-  stdenv.mkDerivation {
-    name = "autogen-${version}";
+  src = fetchurl {
+    url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz";
+    sha256 = "1flnbnmkbqmbfgammkl8m36wrlk6rhpgnf9pdm6gdfhqalxvggbv";
+  };
 
-    src = fetchurl {
-      url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz";
-      sha256 = "1h2d3wpzkla42igxyisaqh2nwpq01vwad1wp9671xmm5ahvkw5f7";
-    };
+  nativeBuildInputs = [ which pkgconfig perl ];
+  buildInputs = [ guile libxml2 ];
 
-    buildInputs = [ guile which libffi ];
+  postPatch = ''
+    # Fix a broken sed expression used for detecting the minor
+    # version of guile we are using
+    sed -i "s,sed '.*-I.*',sed 's/\\\(^\\\| \\\)-I/\\\1/g',g" configure
+  '';
 
-    patchPhase =
-      '' for i in $(find -name \*.in)
-         do
-           sed -i "$i" -e's|/usr/bin/||g'
-         done
-      '';
+  #doCheck = true; # 2 tests fail because of missing /dev/tty
 
-    # The tests rely on being able to find `libopts.a'.
-    configureFlags = "--enable-static";
-
-    #doCheck = true; # 2 tests fail because of missing /dev/tty
-
-    meta = with stdenv.lib; {
-      description = "Automated text and program generation tool";
-
-      longDescription = ''
-        AutoGen is a tool designed to simplify the creation and maintenance
-        of programs that contain large amounts of repetitious text.  It is
-        especially valuable in programs that have several blocks of text that
-        must be kept synchronized.
-
-        AutoGen can now accept XML files as definition input, in addition to
-        CGI data (for producing dynamic HTML) and traditional AutoGen
-        definitions.
-
-        A common example where this would be useful is in creating and
-        maintaining the code required for processing program options.
-        Processing options requires multiple constructs to be maintained in
-        parallel in different places in your program.  Options maintenance
-        needs to be done countless times.  So, AutoGen comes with an add-on
-        package named AutoOpts that simplifies the maintenance and
-        documentation of program options.
-      '';
-
-      license = with licenses; [ gpl3Plus lgpl3Plus ];
-
-      homepage = http://www.gnu.org/software/autogen/;
-
-      maintainers = [ ];
-    };
-  }
+  meta = with stdenv.lib; {
+    description = "Automated text and program generation tool";
+    license = with licenses; [ gpl3Plus lgpl3Plus ];
+    homepage = http://www.gnu.org/software/autogen/;
+    platforms = platforms.all;
+    maintainers = [ ];
+  };
+}

From 31a128b32bd12b5ebae0d0e8dcb4a0880b4ac587 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 12 Aug 2015 17:01:53 -0700
Subject: [PATCH 1078/2016] gnutls: Security Fixes

3.3.16 -> 3.3.17
3.4.3 -> 3.4.4
---
 pkgs/development/libraries/gnutls/3.3.nix     | 4 ++--
 pkgs/development/libraries/gnutls/3.4.nix     | 4 ++--
 pkgs/development/libraries/gnutls/generic.nix | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix
index bd95ce07254..1359980e19d 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.16";
+  version = "3.3.17";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.lz";
-    sha256 = "1jl5n02mh83ygrrk7rq8vwylv5gdr3wccqs1ynvzr749fd2wq637";
+    sha256 = "00zrwqvy054fymb6j04xfr583javfjxsid2rbmyk63qrbqzm61v7";
   };
 })
diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
index 0558e4127c4..d5f74802fa5 100644
--- a/pkgs/development/libraries/gnutls/3.4.nix
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.4.3";
+  version = "3.4.4";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
-    sha256 = "1q4adb1xi9pl00iy3cqs4r1qmwllv1g1r44p6xsg6n65dpyf53q2";
+    sha256 = "17xazr0fdhlkr13bwiy52xq6z6mssml7q1ydyj8s1hwh68703c75";
   };
 })
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 436f6beb54e..59bb99d9399 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -1,5 +1,5 @@
-{ lib, fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
-, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound
+{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound
 , tpmSupport ? false, trousers
 
 # Version dependent args
@@ -27,12 +27,12 @@ stdenv.mkDerivation rec {
   # for the actual fix.
   enableParallelBuilding = !guileBindings;
 
-  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp ]
+  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ]
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
     ++ [ unbound ]
     ++ lib.optional guileBindings guile;
 
-  nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ perl pkgconfig ];
 
   # XXX: Gnulib's `test-select' fails on FreeBSD:
   # http://hydra.nixos.org/build/2962084/nixlog/1/raw .

From aec624a72e8d925f824fb68ace7dd38948180a49 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 12 Aug 2015 17:13:27 -0700
Subject: [PATCH 1079/2016] pinentry: 0.9.4 -> 0.9.5

---
 pkgs/tools/security/pinentry/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 7b8e2fe2761..30d717c7bc1 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig
-, libcap ? null, ncurses ? null, gtk2 ? null, qt4 ? null
+, libgpgerror, libassuan, libcap ? null, ncurses ? null, gtk2 ? null, qt4 ? null
 }:
 
 let
@@ -10,14 +10,14 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "pinentry-0.9.4";
+  name = "pinentry-0.9.5";
 
   src = fetchurl {
     url = "mirror://gnupg/pinentry/${name}.tar.bz2";
-    sha256 = "1q72ir9r9j70px61rdpd80an56k4ixmzy810nr14aildffxkb22b";
+    sha256 = "1338hj1h3sh34897120y30x12b64wyj3xjzzk5asm2hdzhxgsmva";
   };
 
-  buildInputs = [ libcap gtk2 ncurses qt4 ];
+  buildInputs = [ libgpgerror libassuan libcap gtk2 ncurses qt4 ];
 
   prePatch = ''
     substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses

From 466e9cc50d5acc26e5fe43dee17ec3a5185097b0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 12 Aug 2015 21:01:27 -0400
Subject: [PATCH 1080/2016] Add nipype and needed deps

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 15938e0ad07..fa31cef3b70 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8316,6 +8316,57 @@ let
     };
   });
 
+  nibabel = buildPythonPackage rec {
+    version = "2.0.1";
+    name = "nibabel-${version}";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/n/nibabel/${name}.tar.gz";
+      md5 = "3be518fde5ec5b09483d4f28c81dc974";
+    };
+
+    propagatedBuildInputs = with self; [
+      numpy
+      nose
+      modules.sqlite3
+    ];
+
+    meta = {
+      homepage = http://nipy.org/nibabel/;
+      description = "Access a multitude of neuroimaging data formats";
+      license = "BSD";
+    };
+  };
+
+  nipype = buildPythonPackage rec {
+    version = "0.10.0";
+    name = "nipype-${version}";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/n/nipype/${name}.tar.gz";
+      md5 = "480013709633a6d292e2ef668443e0c9";
+    };
+
+    # Tests fail due to getcwd returning ENOENT???
+    doCheck = false;
+
+    propagatedBuildInputs = with self; [
+     numpy
+     dateutil
+     nose
+     traits
+     scipy
+     nibabel
+     networkx
+   ];
+
+    meta = {
+      homepage = http://nipy.org/nipype/;
+      description = "Neuroimaging in Python: Pipelines and Interfaces";
+      license = "BSD";
+    };
+  };
+
   nose = buildPythonPackage rec {
     version = "1.3.4";
     name = "nose-${version}";
@@ -13740,6 +13791,24 @@ let
     };
   };
 
+  traits = buildPythonPackage rec {
+    name = "traits-${version}";
+    version = "4.5.0";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/t/traits/${name}.tar.gz";
+      md5 = "3ad558eebaedc63c29c80183c0371d2f";
+    };
+
+    propagatedBuildInputs = with self; [ numpy ];
+
+    meta = {
+      description = "explicitly typed attributes for Python";
+      homepage = http://pypi.python.org/pypi/traits;
+      license = "BSD";
+    };
+  };
+
 
   transaction = buildPythonPackage rec {
     name = "transaction-${version}";

From 3059362c74fadd64d1292ca61330778059af7f91 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 12 Aug 2015 10:28:44 +0200
Subject: [PATCH 1081/2016] dropbear: 2015.67 -> 2015.68

Changes: https://matt.ucc.asn.au/dropbear/CHANGES
---
 pkgs/tools/networking/dropbear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index 0cbf41754c3..79a23ae3832 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -2,11 +2,11 @@
 sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }:
 
 stdenv.mkDerivation rec {
-  name = "dropbear-2015.67";
+  name = "dropbear-2015.68";
 
   src = fetchurl {
     url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
-    sha256 = "1rf8k3v0bklp04a6x85zpa4f45ad5rfqmiv5f1wfbzaxcja0asby";
+    sha256 = "0ii4lq19b3k06fn25zc5sbbk698s56ldrbg1vcf4pzjgj0g7rsjm";
   };
 
   dontDisableStatic = enableStatic;

From 2f62815520906bf3e5118137f5ec90e9032268b2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 12 Aug 2015 11:40:32 +0200
Subject: [PATCH 1082/2016] fmit: 1.0.6 -> 1.0.7

---
 pkgs/applications/audio/fmit/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 7c4952e76aa..f2328410be8 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -7,12 +7,12 @@
 assert alsaSupport -> alsaLib != null;
 assert jackSupport -> libjack2 != null;
 
-let version = "1.0.6"; in
+let version = "1.0.7"; in
 stdenv.mkDerivation {
   name = "fmit-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1ls6pcal5vimr3syz4ih06s1j746z63hgj5wbg5z349gy6zl43fh";
+    sha256 = "14dzrrxjskhqamhfqhzp6napvc1vyjxcc0v8id1iqzsfdn86xqm9";
     rev = "v${version}";
     repo = "fmit";
     owner = "gillesdegottex";
@@ -24,8 +24,6 @@ stdenv.mkDerivation {
 
   postPatch = ''
     substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
-    substituteInPlace distrib/fmit.desktop \
-      --replace "Icon=fmit" "Icon=$out/share/pixmaps/fmit.svg"
   '';
 
   configurePhase = ''
@@ -40,11 +38,6 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  postInstall = ''
-    cd ..
-    install -Dm644 {ui/images,$out/share/pixmaps}/fmit.svg
-  '';
-
   meta = with stdenv.lib; {
     inherit version;
     description = "Free Musical Instrument Tuner";

From 1d78f31b765f8e3fe81d79f5bc9ae381271094da Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Thu, 13 Aug 2015 04:02:30 +0200
Subject: [PATCH 1083/2016] qBittorrent: 3.1.11 -> 3.2.3

---
 .../networking/p2p/qbittorrent/default.nix            | 11 +++++------
 pkgs/top-level/all-packages.nix                       |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index f0e5a1c13e1..8ff11dba905 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "3.1.11";
+  version = "3.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "0qvz8ifk01b9sw9x5yh3b5kmssx5yi026zvgvabdvfaqkvcmw43i";
+    sha256 = "05590ak4nnqkah8dy71cxf7mqv6phw0ih1719dm761mxf8vrz9w6";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
@@ -23,14 +23,13 @@ stdenv.mkDerivation rec {
     ++ optional guiSupport dbus_libs;
 
   configureFlags = [
-    "--with-libboost-lib=${boost.lib}/lib"
-    "--with-libboost-inc=${boost.dev}/include"
+    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost=${boost.dev}"
     (if guiSupport then "" else "--disable-gui")
     (if webuiSupport then "" else "--disable-webui")
   ] ++ optional debugSupport "--enable-debug";
 
-  # https://github.com/qbittorrent/qBittorrent/issues/1992 
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   meta = {
     description = "Free Software alternative to µtorrent";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95152c65de9..ed6d9a0f92c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12466,8 +12466,8 @@ let
   pythonmagick = callPackage ../applications/graphics/PythonMagick { };
 
   qbittorrent = callPackage ../applications/networking/p2p/qbittorrent {
-    boost = boost156;
-    libtorrentRasterbar = libtorrentRasterbar_0_16;
+    boost = boost;
+    libtorrentRasterbar = libtorrentRasterbar;
   };
 
   eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; };

From 1fa791a24357371b4c9f57f6cb63a8cbbfaf0dfe Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Thu, 13 Aug 2015 04:04:40 +0200
Subject: [PATCH 1084/2016] libtorrent-rasterbar: 0.16.17 -> 0.16.19 + 1.0.2 ->
 1.0.6

---
 .../libraries/libtorrent-rasterbar/0.16.nix        |  4 ++--
 .../libraries/libtorrent-rasterbar/default.nix     |  4 ++--
 .../libraries/libtorrent-rasterbar/generic.nix     | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix b/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix
index 6298f2f0c0f..985c570a34e 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "0.16.17";
-  sha256 = "1w5gcizd6jlvzwgy0307az856h0cly685yf275p1v6bdcafd58b7";
+  version = "0.16.19";
+  sha256 = "1nlrivhnshn4wd9m5dsbjmq84731z9f9glj5q3vxz0c01s1lv7vw";
 })
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index e1f1fc179d6..725b98cdae6 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "1.0.2";
-  sha256 = "1ph4cb6nrk2hiy89j3kz1wj16ph0b9yixrf4f4935rnzhha8x31w";
+  version = "1.0.6";
+  sha256 = "1qypc5lx82vlqm9016knxx8khxpc9dy78a0q2x5jmxjk8v6g994r";
 })
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
index b866f66dbfa..a5bb258af1a 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
@@ -1,18 +1,26 @@
-{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconv, geoip
+{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip
 # Version specific options
 , version, sha256
 , ... }:
 
+let formattedVersion = lib.replaceChars ["."] ["_"] version;
+
+in
+
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
   
   src = fetchurl {
-    url = "mirror://sourceforge/libtorrent/${name}.tar.gz";
+    url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz";
     inherit sha256;
   };
 
+  nativeBuildInputs = [automake autoconf libtool ];
+
   buildInputs = [ boost pkgconfig openssl zlib python libiconv geoip ];
 
+  preConfigure = "./autotool.sh";
+
   configureFlags = [ 
     "--enable-python-binding"
     "--with-libgeoip=system"
@@ -21,6 +29,8 @@ stdenv.mkDerivation rec {
     "--with-boost-libdir=${boost.lib}/lib"
     "--with-libiconv=yes"
   ];
+
+  enableParallelBuilding = true;
   
   meta = with stdenv.lib; {
     homepage = http://www.rasterbar.com/products/libtorrent/;

From 4ddb8b18e0f6c27631d4ed24fd1799c81b189b26 Mon Sep 17 00:00:00 2001
From: Rehno Lindeque <errantkid@gmail.com>
Date: Thu, 13 Aug 2015 04:02:07 +0000
Subject: [PATCH 1085/2016] pymysql: 0.6.3 -> 0.6.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa31cef3b70..3485503eddc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8038,11 +8038,11 @@ let
 
   pymysql = buildPythonPackage rec {
     name = "pymysql-${version}";
-    version = "0.6.3";
+    version = "0.6.6";
     src = pkgs.fetchgit {
       url = https://github.com/PyMySQL/PyMySQL.git;
       rev = "refs/tags/pymysql-${version}";
-      sha256 = "1m9fr2x49s3aixlmccr3w80skl19dya9h3x69wgl6ly1z27iyg24";
+      sha256 = "12v8bw7pp455zqkwraxk69qycz2ngk18bbz60v72kdbp6kssnqhz";
     };
   };
 

From 9109015990d0271a0bd00f552c800bc51aef5460 Mon Sep 17 00:00:00 2001
From: Rehno Lindeque <errantkid@gmail.com>
Date: Thu, 13 Aug 2015 04:26:02 +0000
Subject: [PATCH 1086/2016] pgcli: github owner changed from amjith to dbcli

The new location for pgcli is https://github.com/dbcli/pgcli (moved from https://github.com/amjith/pgcli)
---
 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 fa31cef3b70..e5216ed776c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9359,7 +9359,7 @@ let
       sha256 = "1r34bbqbd4h72cl0cxi9w6q2nwx806wpxq220mzyiy8g45xv0ghj";
       rev = "v${version}";
       repo = "pgcli";
-      owner = "amjith";
+      owner = "dbcli";
     };
 
     propagatedBuildInputs = with self; [

From 7dd58b645a2c628f1b1f1d13d57f55a7001992f2 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 09:44:06 +0200
Subject: [PATCH 1087/2016] gnome3.five-or-more: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 +++-
 .../3.16/games/five-or-more/default.nix       | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 8ec4c87b82d..58cf642c69d 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -34,7 +34,7 @@ let
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
-    tali quadrapassel gnome-sudoku aisleriot
+    tali quadrapassel gnome-sudoku aisleriot five-or-more
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -298,6 +298,8 @@ let
 
   aisleriot = callPackage ./games/aisleriot { };
 
+  five-or-more = callPackage ./games/five-or-more { };
+
   gnome-sudoku = callPackage ./games/gnome-sudoku { };
 
   iagno = callPackage ./games/iagno { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
new file mode 100644
index 00000000000..26af4d7286a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "five-or-more-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/five-or-more/${gnome3.version}/${name}.tar.xz";
+    sha256 = "018723w2q0fijvxs1kafrxg39f6ank6x51nfbf3mhn9q7jz9k2g3";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Five_or_more;
+    description = "Remove colored balls from the board by forming lines";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From d167418c7e8146db3267413d81635054893d2d0f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 9 Aug 2015 20:21:38 +0200
Subject: [PATCH 1088/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/610dc41e6141b8c7849a5c4af1e7a85346b99dce
 with hackage2nix v20150807-25-gce03fdf

---
 .../haskell-modules/hackage-packages.nix      | 17943 ++++++++--------
 1 file changed, 9205 insertions(+), 8738 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 27345770034..11f0fd12969 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -9,7 +9,7 @@ self: {
      mkDerivation {
        pname = "3d-graphics-examples";
        version = "0.0.0.1";
-       sha256 = "13b7n9mdx7f6a2ghikc7xvscbj8wp0dxcbm5alinnic433sandy5";
+       sha256 = "c537abf41884456b2355a52ed61bb81cc9c5f4ee87cd089f50c69dde6ab2678d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT OpenGL random ];
@@ -24,7 +24,7 @@ self: {
      mkDerivation {
        pname = "3dmodels";
        version = "0.3.0";
-       sha256 = "00pp8g1b59950i5ik9ycimxd284vsv1hnfgxgg1mjvxwaj2pbyhr";
+       sha256 = "19fa758554bc6f59c37bfd390bc3d69b20d17a8dcca7194b0425a5b2c243f702";
        libraryHaskellDepends = [
          attoparsec base bytestring linear packer
        ];
@@ -40,7 +40,7 @@ self: {
      mkDerivation {
        pname = "4Blocks";
        version = "0.2";
-       sha256 = "1lya7320jf2cvd69prvjfwdlci2j17m21qcqaqxaczlrv4aykg6w";
+       sha256 = "dcbce915d9997ea63a5698e120ea095244461b7772e79b4cdb4c3809c438cad3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -58,7 +58,7 @@ self: {
      mkDerivation {
        pname = "AAI";
        version = "0.2.0.1";
-       sha256 = "0vdq0hscpbl5a9bpf8fiykmyg2c3yvivb0mzcdy99ha0j1p4rwfh";
+       sha256 = "d0f14c6e9040c1947c63bf82b5e3f68389e7ebf4d12177575285aecb3404b86d";
        libraryHaskellDepends = [ base ];
        description = "Abstract Application Interface";
        license = stdenv.lib.licenses.mit;
@@ -71,7 +71,7 @@ self: {
      mkDerivation {
        pname = "ABList";
        version = "0.0.3";
-       sha256 = "06hj35k3lbcxh9yn70sa4bw0jafxmxyi2237d6r48dznk4a5fvq1";
+       sha256 = "016f571499f63744b2696708117dafdd2909f8224a83637d829d2d3a6619121a";
        libraryHaskellDepends = [ base linear newtype ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -86,7 +86,7 @@ self: {
      mkDerivation {
        pname = "AC-Angle";
        version = "1.0";
-       sha256 = "0ra97a4im3w2cq3mf17j8skn6bajs7rw7d0mmvcwgb9jd04b0idm";
+       sha256 = "b545b0086832adc7d9ae15b4c3f3d1522d63a746f204570766828f1a893a4965";
        libraryHaskellDepends = [ base ];
        description = "Angles in degrees and radians";
        license = stdenv.lib.licenses.bsd3;
@@ -97,7 +97,7 @@ self: {
      mkDerivation {
        pname = "AC-Boolean";
        version = "1.1.0";
-       sha256 = "0id19wgp2jg2pf1gdhfzkyknjj19jii3pz0lva29x3lcck38rw2b";
+       sha256 = "4bf08cc6648c8e9e84da14fc3b6294294869a79fdfc1f682bbe249711f4fa145";
        libraryHaskellDepends = [ base ];
        description = "Handle Boolean values generatically";
        license = stdenv.lib.licenses.bsd3;
@@ -108,7 +108,7 @@ self: {
      mkDerivation {
        pname = "AC-BuildPlatform";
        version = "1.1.0";
-       sha256 = "0vlhakc6mc4zzyvb54rgmskkj8hp43zy35giimk0g7i5068r2czh";
+       sha256 = "f033919101259e07668df195e1ff20172239a7ae2f93b2b6ff9fb06ad854906e";
        libraryHaskellDepends = [ base ];
        description = "Detect which OS you're running on";
        license = stdenv.lib.licenses.bsd3;
@@ -120,7 +120,7 @@ self: {
      mkDerivation {
        pname = "AC-Colour";
        version = "1.1.6";
-       sha256 = "02v3b1pfhwnf3cl8kbxfkk0a7hdp0gqq5v4w9ka32zl1p007rz19";
+       sha256 = "29fc7c00b8817e31d44c9cec82f103b7c1a3c09caeaf89281bce72e86e58630b";
        libraryHaskellDepends = [ base ];
        description = "Efficient RGB colour types";
        license = stdenv.lib.licenses.bsd3;
@@ -131,7 +131,7 @@ self: {
      mkDerivation {
        pname = "AC-EasyRaster-GTK";
        version = "1.1.3";
-       sha256 = "082il76032biyan170p4qp13154nmkzil4v2wv7fmjn9z7v8w49b";
+       sha256 = "2b118ef6f9c9caeacee662131affac969430c2c5e48213acf2718901cca15120";
        libraryHaskellDepends = [ array base gtk ];
        description = "GTK+ pixel plotting";
        license = stdenv.lib.licenses.bsd3;
@@ -143,7 +143,7 @@ self: {
      mkDerivation {
        pname = "AC-HalfInteger";
        version = "1.2.1";
-       sha256 = "0wwnb7a6dmzgh122qg322mi3vpyk93xw52cql6dx18sqdbxyxdbb";
+       sha256 = "6bb5eefb6a58a3d09ba19889c2fb48d3df3d6215623c2c4480efd766d4599673";
        libraryHaskellDepends = [ base ];
        description = "Efficient half-integer type";
        license = stdenv.lib.licenses.bsd3;
@@ -155,7 +155,7 @@ self: {
      mkDerivation {
        pname = "AC-MiniTest";
        version = "1.1.1";
-       sha256 = "0ish59q50npljgmfrcffcyx6scf99xdncmy1kpwy1i5622r1kcps";
+       sha256 = "fab219b210a6c4e0f99dc157665b4fc9316dba67ceb1ecea93f45a50702a5047";
        libraryHaskellDepends = [ base transformers ];
        description = "A simple test framework";
        license = stdenv.lib.licenses.bsd3;
@@ -167,7 +167,7 @@ self: {
      mkDerivation {
        pname = "AC-PPM";
        version = "1.1.1";
-       sha256 = "0y2wzwfnlx50rzkdigmjy3dg5f91pmkf4gmnzjhs3r916d296gkq";
+       sha256 = "783e93443321e5a1a1fcb63ee266bd21b9f2daf0b2bed8e6cfa0746a1dff5c78";
        libraryHaskellDepends = [ base bytestring ];
        description = "Trivial package for writing PPM images";
        license = stdenv.lib.licenses.bsd3;
@@ -178,7 +178,7 @@ self: {
      mkDerivation {
        pname = "AC-Random";
        version = "0.1";
-       sha256 = "1c00pcz0c4l2sdaj61zcmw68ckmqb7xlfykv489xms7ak4xl8nc1";
+       sha256 = "8159443b99eae8da13227b7a47fb59b84e860cafec072355d38212063ebb00b0";
        libraryHaskellDepends = [ base ];
        description = "A pure Haskell PRNG";
        license = stdenv.lib.licenses.bsd3;
@@ -189,7 +189,7 @@ self: {
      mkDerivation {
        pname = "AC-Terminal";
        version = "1.0";
-       sha256 = "0d0vdqf7i49d2hsdm7x9ad88l7kfc1wvkzppzhs8k9xf4gbrvl43";
+       sha256 = "83d09dd723aea78934fcf7feb979606e1e8a5053a99fda34142d91781c6e1b34";
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Trivial wrapper over ansi-terminal";
        license = stdenv.lib.licenses.bsd3;
@@ -201,7 +201,7 @@ self: {
      mkDerivation {
        pname = "AC-VanillaArray";
        version = "1.1.2";
-       sha256 = "044kiwc5g2irky0k3fg9l2qqnvcnh9vdx0yz8m1awnkab6mk0i3v";
+       sha256 = "7b4430ab596a5aae4245df83de7682966d8bb1a0e9b931819f398a57188f9310";
        libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        description = "Immutable arrays with plain integer indicies";
@@ -214,7 +214,7 @@ self: {
      mkDerivation {
        pname = "AC-Vector";
        version = "2.3.2";
-       sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay";
+       sha256 = "5e51ff6779a3803ce1009c9dffd13a3022fb3cbddeb49e685d7f43d7a8715011";
        libraryHaskellDepends = [ base ];
        description = "Efficient geometric vectors and transformations";
        license = stdenv.lib.licenses.bsd3;
@@ -225,7 +225,7 @@ self: {
      mkDerivation {
        pname = "AC-Vector-Fancy";
        version = "2.4.0";
-       sha256 = "0wcan2s75c89s1mxhcvvjgbpn8xqrhmwnfbsrszkzydw3x46465y";
+       sha256 = "be1862481fbcf93fbfce7a39cb2bccb8237bd7937b33d86bd009b172b4b08a71";
        libraryHaskellDepends = [ AC-Angle AC-Vector base ];
        description = "Fancy type-system stuff for AC-Vector";
        license = stdenv.lib.licenses.bsd3;
@@ -238,7 +238,7 @@ self: {
      mkDerivation {
        pname = "ACME";
        version = "0.0.0.1";
-       sha256 = "103mil8lixg0v2wjizy0pqyy9ywbmrk56mc0n37wwvz0qkjaqnds";
+       sha256 = "ba59ace4c4e06fcecfb080555366ae8bfbe43dbec0ff28b9d8e0f548118d7580";
        libraryHaskellDepends = [
          base list-extras mtl random random-shuffle void
        ];
@@ -258,7 +258,7 @@ self: {
      mkDerivation {
        pname = "ADPfusion";
        version = "0.4.1.1";
-       sha256 = "06ff9f4wdf7dr0v2cwhzsjn00bmaijgqznhnyf5fp9jyw8ffbbzp";
+       sha256 = "f7afe51ce25ea6eb8af316da8f9f8caa2e00acd41f722636c8edb8c6894bce19";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -282,7 +282,7 @@ self: {
      mkDerivation {
        pname = "AERN-Basics";
        version = "2011.1.0.1";
-       sha256 = "1zzm6974mfwzswhx9dfh4w1qrlk44w5k8pajqmrgs8hwnx3k8awa";
+       sha256 = "8a2b3447b71c22fd72c5525d340b2764d28c0327d0b5d421d79fbb4a4e32f5ff";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -304,7 +304,7 @@ self: {
      mkDerivation {
        pname = "AERN-Net";
        version = "0.2.1.1";
-       sha256 = "1h7yw85zp8dlyjfi5mr3zvb8cn3xbfxw19nqkz6r7v6s5hfg50qg";
+       sha256 = "0f83f21c2cdaec93cd9fd8a6c0bb5b7d5886d6fe23d7129df4b4a1fb0be2fec0";
        libraryHaskellDepends = [
          AERN-Real AERN-RnToRm base binary containers html stm time
        ];
@@ -322,7 +322,7 @@ self: {
      mkDerivation {
        pname = "AERN-Real";
        version = "2011.1.0.1";
-       sha256 = "1m8fc3agvm5r5vgzsxhjdmmxl679n68isa5cwbbfrv38c20s2p6v";
+       sha256 = "db5ca1816068ececd6e2ac281d91b1e918da6b6d1276fddf2eb9d4fdd4600ed5";
        libraryHaskellDepends = [
          AERN-Basics base criterion QuickCheck test-framework
          test-framework-quickcheck2
@@ -342,7 +342,7 @@ self: {
      mkDerivation {
        pname = "AERN-Real-Double";
        version = "2011.1.0.2";
-       sha256 = "0hwbw2nibgfddqfhbq8fcm1anibdfa9kgbbxnsbxvkkl6l52cbg2";
+       sha256 = "e22d260a3574cedd97b67dad3793726d45ab42650ee1051d6ecdbd15ade08b43";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -367,7 +367,7 @@ self: {
      mkDerivation {
        pname = "AERN-Real-Interval";
        version = "2011.1.0.1";
-       sha256 = "1myh6r2cg4sg7k21y3p415pwm2vjfggi92631wzcjxk8ygcafbwv";
+       sha256 = "9b2fa7d8f36876c93e0fc38814df73728bca6f09e40e1fc43c4f93c74436d0d7";
        libraryHaskellDepends = [
          AERN-Basics AERN-Real base deepseq QuickCheck test-framework
          test-framework-quickcheck2
@@ -386,7 +386,7 @@ self: {
      mkDerivation {
        pname = "AERN-RnToRm";
        version = "0.5.0.1";
-       sha256 = "0rx93h1h303r4gf9jq32gl08lg4jkfc12kzjnjxampwx75b4lgjv";
+       sha256 = "5b3e4a56399ddfaabab4f24f11989b923c8a007d626099dc23798001031ca967";
        libraryHaskellDepends = [
          AERN-Real base binary containers directory filepath html QuickCheck
          time
@@ -406,7 +406,7 @@ self: {
      mkDerivation {
        pname = "AERN-RnToRm-Plot";
        version = "0.2.0.3";
-       sha256 = "0zpp0s90q2jhpagf6iswbmm6hyi0x2hns8vqd5swwa8d258avrbq";
+       sha256 = "78e5ad50110d29ce756978236da1e8207a686a5d5c47e39eba500a0c9206f77e";
        libraryHaskellDepends = [
          AERN-Real AERN-RnToRm base binary containers directory filepath
          glade glib gtk gtkglext mtl OpenGL stm time
@@ -425,7 +425,7 @@ self: {
      mkDerivation {
        pname = "AES";
        version = "0.2.9";
-       sha256 = "12n484dpjr08910ni1vvw030g9p37lz68l5lw0212rvklkva6wzc";
+       sha256 = "ec73a3f6a473671104e0b450643e3de3a60706e07b876841480864791b41c48a";
        revision = "1";
        editedCabalFile = "9e51c1b1687fe35ccd0f2983e861b5b0441399803ff76b192530984724a68d6f";
        libraryHaskellDepends = [
@@ -440,7 +440,7 @@ self: {
      mkDerivation {
        pname = "AGI";
        version = "1.3";
-       sha256 = "1h0hcdvdjs635inq96fpyh2g3d482ilpqn474vk1xkycww0xgsnv";
+       sha256 = "dbead701e7cccf1ee62687587c691488b4f104f4d799846d2cc368d9766310c0";
        libraryHaskellDepends = [
          base mtl network parsec random syb unix
        ];
@@ -455,7 +455,7 @@ self: {
      mkDerivation {
        pname = "ALUT";
        version = "2.4.0.0";
-       sha256 = "0g8rzzk54y8d567dvj32bq0h409ag0am196kkirsjd6f58vgjp0g";
+       sha256 = "0f5cf9362ace34a9739cd3a45015782a0102015e62c8dd8e290d7952e6ff193d";
        libraryHaskellDepends = [ base OpenAL StateVar transformers ];
        librarySystemDepends = [ freealut ];
        homepage = "https://github.com/haskell-openal/ALUT";
@@ -470,7 +470,7 @@ self: {
      mkDerivation {
        pname = "AMI";
        version = "0.1";
-       sha256 = "00w6kcikc5ac26786fwshwbh8ndj9aq1w7wz263j5rnhdf12irky";
+       sha256 = "7ee628826bd0e62287119f1f1eb04ab2590417879a3b838e114c1536239b8603";
        libraryHaskellDepends = [
          base bytestring containers mtl network pureMD5 stm
        ];
@@ -485,7 +485,7 @@ self: {
      mkDerivation {
        pname = "ANum";
        version = "0.1.1.0";
-       sha256 = "0ilgz1akz66cwwvxd8dkz2fq9gyplc4m206jpmp380ys5n37b4q9";
+       sha256 = "099375862dda03346ebdd2005109a3d7bf849df8b3a1d637e7cc983f55f88f46";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/DanBurton/ANum#readme";
        description = "Num instance for Applicatives provided via the ANum newtype";
@@ -499,7 +499,7 @@ self: {
      mkDerivation {
        pname = "ASN1";
        version = "0.0.1.1";
-       sha256 = "188mf1k8p4h8ryngpcs6ldz9n2590h9wfxzxsj396is5r8rxscmh";
+       sha256 = "b032dd33ca45479386d4fd77c71304a9089b7ea346b3fbaccf08928b667015a1";
        libraryHaskellDepends = [
          base containers HUnit mtl NewBinary old-time pretty QuickCheck
        ];
@@ -513,7 +513,7 @@ self: {
      mkDerivation {
        pname = "AVar";
        version = "0.0.5.1";
-       sha256 = "0jggzjyms1w4p1ynv8m5yvya64kbxkjdis7wvy3lildmp0w0x0c7";
+       sha256 = "87810e38b8b5d14887dffce8d8e4ec6b12a3fcf6a5a26d7db884075dbdfcef49";
        libraryHaskellDepends = [ base ];
        description = "Mutable variables with Exception handling and concurrency support";
        license = stdenv.lib.licenses.bsd3;
@@ -524,7 +524,7 @@ self: {
      mkDerivation {
        pname = "AWin32Console";
        version = "1.1";
-       sha256 = "0il5bngj4919mmpm0rwmbx74ih3sfbqkaph6w12p49fs466sxkh1";
+       sha256 = "01ceae8d21da257245e0065e35f1727ac0484e5f9567506fad2924229f5d8546";
        libraryHaskellDepends = [ base regex-compat Win32 ];
        description = "A binding to a part of the ANSI escape code for the console";
        license = stdenv.lib.licenses.bsd3;
@@ -536,7 +536,7 @@ self: {
      mkDerivation {
        pname = "AbortT-monadstf";
        version = "1.0";
-       sha256 = "1ijv4bs299ijqbkspbg1kry627ra6p6qlkd74q4y2pvamrm4dn6f";
+       sha256 = "ced8466aae6a5fe10926a74d8acd352a1f617c9ee1adabe7c232a624f4225bc6";
        libraryHaskellDepends = [ AbortT-transformers base monads-tf ];
        homepage = "http://github.com/gcross/AbortT-transformers";
        description = "Monads-tf instances for the AbortT monad transformer";
@@ -548,7 +548,7 @@ self: {
      mkDerivation {
        pname = "AbortT-mtl";
        version = "1.0";
-       sha256 = "17rp4v5ibna9fplm526x31k8df8zwkm1imv71yqzpgcqcn48pps2";
+       sha256 = "42df8b886598bdfbb10f67d718eae41fb9866618dd8852e97549d915cb26379f";
        libraryHaskellDepends = [ AbortT-transformers base mtl ];
        jailbreak = true;
        homepage = "http://github.com/gcross/AbortT-mtl";
@@ -563,7 +563,7 @@ self: {
      mkDerivation {
        pname = "AbortT-transformers";
        version = "1.0.1.1";
-       sha256 = "00q3c2pr9rl2110624rndn7j2843rl62vh5569q96l2vzfpccgbp";
+       sha256 = "773dc6aefb5b50937032a5c02d0ccd8320218f6d361361400882e694af600303";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -582,7 +582,7 @@ self: {
      mkDerivation {
        pname = "ActionKid";
        version = "0.1.1.0";
-       sha256 = "0dsfgclgx4kqjnvn54vvxcbn8l8jyy9gb06qp13hfm5l7lxfjzxq";
+       sha256 = "b87fe93a3db4540747b8d880f592f712516417eb7b9362b7957892fe287b4e37";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -606,7 +606,7 @@ self: {
      mkDerivation {
        pname = "Adaptive";
        version = "0.23";
-       sha256 = "0n27d8dvk0qq68zp4l5bsj5y9xqmrk9d25psrrf29mmw1f43wp8c";
+       sha256 = "0c5d3e880bbcd6245ccefa16d1d2cc15f7e48bd4ab50723f321883b91b6a4758";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -620,7 +620,7 @@ self: {
      mkDerivation {
        pname = "Adaptive-Blaisorblade";
        version = "0.23";
-       sha256 = "08iblifpyi569zh55ha5bi0nfibz0zlqiibwaimx2k1nd6n6yv5a";
+       sha256 = "aa6c6fac69364cd16b547cc588e9077f4567415c45c152e04fa6447f5da42b22";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -634,7 +634,7 @@ self: {
      mkDerivation {
        pname = "Advgame";
        version = "0.1.2";
-       sha256 = "16grzya42pzn3zaahs77lw5n2ka138bs0g3vgi0qbxlvxwy5ikyy";
+       sha256 = "decf583cef9bf685417c7b3ca0171a414d610ba7e768a8d41ff65f4194fff999";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 mtl ];
@@ -651,7 +651,7 @@ self: {
      mkDerivation {
        pname = "AesonBson";
        version = "0.2.2";
-       sha256 = "1p7636bjczcwwi2c0cdzvpj95vx2fr27qnmh8pcs8hqgmisagq8s";
+       sha256 = "1ae1a774ac0f43a4d945b05a7c4476a2ef92e4ddbf31c044e49c7d269719e6dc";
        libraryHaskellDepends = [
          aeson attoparsec base bson unordered-containers vector
        ];
@@ -670,7 +670,7 @@ self: {
      mkDerivation {
        pname = "Agata";
        version = "0.2.1.1";
-       sha256 = "0v8gy2gdbn9133yki7s71a7ph50xzawdvciiahr463apbn6439hm";
+       sha256 = "15a6418c5d570d43325431b2ddb8fa1d14788f0a479f38fd1821d9d59ef00f6d";
        libraryHaskellDepends = [
          base containers mtl QuickCheck tagged template-haskell
        ];
@@ -692,9 +692,9 @@ self: {
      mkDerivation {
        pname = "Agda";
        version = "2.4.2.3";
-       sha256 = "09vvipvab6bys8g7cdka1iirs0wc0jzcyynncccgb614wd2yyvdw";
-       revision = "1";
-       editedCabalFile = "25fe17a2302a30f23a57bedf6bc66a8966f4d5f6b10353e2502e18ba98f80eeb";
+       sha256 = "bc6def45e32498f51863d67acfbe048c039d630c6a36761ed27e99a5f68d7b27";
+       revision = "2";
+       editedCabalFile = "b5ad21731b7a6ce714d403a5edb0b53951fe61926d47f7a21e29548602c0d763";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -707,6 +707,7 @@ self: {
        libraryToolDepends = [ alex cpphs happy ];
        executableHaskellDepends = [ base directory filepath process ];
        executableToolDepends = [ emacs ];
+       jailbreak = true;
        postInstall = ''
          $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)
          $out/bin/agda-mode compile
@@ -721,7 +722,7 @@ self: {
      mkDerivation {
        pname = "Agda-executable";
        version = "2.3.0.1";
-       sha256 = "156nzvpmqi7yizjr4yym2ybc0iv4nqfp84qrpdxcha682k298ib1";
+       sha256 = "614594c414c828c87abb1913741db66447c09617d57b92e58ffe445ceffed694";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ Agda base ];
@@ -737,7 +738,7 @@ self: {
      mkDerivation {
        pname = "AhoCorasick";
        version = "0.0.3";
-       sha256 = "171im3xhrgdzhpxmi1350323apy58pisap0dskcibd3g4jmzslza";
+       sha256 = "ea53fdab246fb415d9d40d5ca5e345c55f35c400658458fb85bfbd0cfba8319c";
        libraryHaskellDepends = [
          array base hashable mtl unordered-containers
        ];
@@ -752,7 +753,7 @@ self: {
      mkDerivation {
        pname = "AlgorithmW";
        version = "0.1.1.0";
-       sha256 = "0avkxhw5hp00znhmqw3kqxx165ba5y5kgq8b9ahp679p0qf84a3c";
+       sha256 = "6c28821c06371d73a14a0be1378b2f6a15137ac773705ca1fd005c5838ec732b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl pretty ];
@@ -768,7 +769,7 @@ self: {
      mkDerivation {
        pname = "AlignmentAlgorithms";
        version = "0.0.2.0";
-       sha256 = "110vhp7kdg9l5j3w19wbimmfpq4c05xgx680vb938r1pgpx9s76r";
+       sha256 = "d91c9dfa7d376434d2da0099fe7a018ce0eb6a8d8ba7c0872c34bd36cf851b84";
        libraryHaskellDepends = [
          ADPfusion base containers fmlist FormalGrammars GrammarProducts
          PrimitiveArray vector
@@ -785,7 +786,7 @@ self: {
      mkDerivation {
        pname = "Allure";
        version = "0.5.0.0";
-       sha256 = "0lmkfa6wk0hqin43lf6ll3227c4h7qvya7s6k6sfz8syy51ggqx7";
+       sha256 = "a7e3f742f15ea3efb499461fe5373e90b023c4a0d4383a888d1882c98d72b352";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -809,7 +810,7 @@ self: {
      mkDerivation {
        pname = "AndroidViewHierarchyImporter";
        version = "0.1.0.1";
-       sha256 = "1ksmxhriqy8z3fymnvhg7bwaj032nrsvq3gygfwkg3m8538v9xyc";
+       sha256 = "ccf7b4d128a88e37b97bfe0dbc75b66200a9f83a0f6e5bbd1b1f791c33ec55cf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -827,7 +828,7 @@ self: {
      mkDerivation {
        pname = "Animas";
        version = "0.2";
-       sha256 = "01vpw9s93qq8c0zymp4qzv0ljn9jrnwi3x68qx9lcjr6spa0rkvm";
+       sha256 = "75cf0cd4d5264b4653c7c8f411b9cd325949c1fe98dcea3f6008e39174e27707";
        libraryHaskellDepends = [ base random ];
        homepage = "https://github.com/eamsden/Animas";
        description = "Updated version of Yampa: a library for programming hybrid systems";
@@ -840,7 +841,7 @@ self: {
      mkDerivation {
        pname = "Annotations";
        version = "0.2.1";
-       sha256 = "1iqcg47rklibps6xjs7zw76npycpa1jj3x68zz75np3r0fnwiqhj";
+       sha256 = "12e2c8ad03795c5bceffc8f421655097f96bcde1ff68d98dbe2bd2990f790cc7";
        libraryHaskellDepends = [ base mtl multirec parsec ];
        testHaskellDepends = [ base mtl multirec parsec ];
        description = "Constructing, analyzing and destructing annotated trees";
@@ -852,7 +853,7 @@ self: {
      mkDerivation {
        pname = "Ansi2Html";
        version = "0.9";
-       sha256 = "1dqq1rnx1w0cn4w11knmxvn7qy4lg4m39dgw4rs6r2pjqzgrwarh";
+       sha256 = "302b9edfc7f28a6c7426fcb5342a7994787ceceed5ce1038b10cf0d06d0e18b7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl parsec xhtml ];
@@ -868,7 +869,7 @@ self: {
      mkDerivation {
        pname = "ApplePush";
        version = "0.1";
-       sha256 = "0dw52pj17fggi605zf4px852479yc6m6ksbidyw84lkys5dyll3r";
+       sha256 = "7950ea5bd17e5282b86f71e969aa613e1d220aea97b85f8089efb913e4158537";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -885,7 +886,7 @@ self: {
      mkDerivation {
        pname = "AppleScript";
        version = "0.2.0.1";
-       sha256 = "1jmwixyv5msb3lmza7dljvm3l0x5mx8r93zr607sx9m5x9yhlsvr";
+       sha256 = "796b0a7deaa5a6ae0f30f98f9451afa5033aea96b41df52b1d4bd7b27d8fbcca";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/reinerp/haskell-AppleScript";
        description = "Call AppleScript from Haskell, and then call back into Haskell";
@@ -898,7 +899,7 @@ self: {
      mkDerivation {
        pname = "ApproxFun-hs";
        version = "0.1.0.0";
-       sha256 = "1s7amy8ij5bgv8afbjdzqd3lflvhzrrh3cs3krl1rf73y8b1nqpy";
+       sha256 = "fe621b16f2e3b81c689e43b30173fe70534747c3bfc9e514da6f151991afeae8";
        libraryHaskellDepends = [ base vector ];
        jailbreak = true;
        homepage = "https://github.com/idontgetoutmuch/ApproxFun.hs";
@@ -911,7 +912,7 @@ self: {
      mkDerivation {
        pname = "ArrayRef";
        version = "0.1.3.1";
-       sha256 = "1yb209v3lab3knggplmwih1ww6qalf8v86j8ggv1gkhm5jkwz1yq";
+       sha256 = "d887cfa72c15ce17f67b481ab491a30a1bce038cbcd2fb9e9d63293a760262f9";
        libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/Library/ArrayRef";
        description = "Unboxed references, dynamic arrays and more";
@@ -924,7 +925,7 @@ self: {
      mkDerivation {
        pname = "ArrowVHDL";
        version = "1.1";
-       sha256 = "1lv76m4qc1sabagllaagi7bpqf1mnmzsra333a77b6134mk2f9hb";
+       sha256 = "0b262766252398758e1a63a8ac7fb535387cd7894f294a9f5a4a0786493567d3";
        libraryHaskellDepends = [ base process ];
        jailbreak = true;
        homepage = "https://github.com/frosch03/arrowVHDL";
@@ -938,7 +939,7 @@ self: {
      mkDerivation {
        pname = "AspectAG";
        version = "0.3.6.1";
-       sha256 = "01pglvf38v5ii2w03kdlgngxbb3ih0j5bsilv5qwc9vrh2iwirhf";
+       sha256 = "0ee6c8a3807927c671d934ea55248071acd59f7db4cd01b888b16c34dca6ef06";
        revision = "1";
        editedCabalFile = "d5b68030eaf2111998f6d5774a1d26d5afb685fe6b087fe1aed7ef90084a0070";
        libraryHaskellDepends = [
@@ -959,7 +960,7 @@ self: {
      mkDerivation {
        pname = "AttoBencode";
        version = "0.3.1.0";
-       sha256 = "0rzzi4asfmkg8nqlxdyq3gwg0q10hqrnvlmq4fjcxvxgvz1ys9hb";
+       sha256 = "0b26edc3dfafefcea423b8d26d33862060f0f81bd8b74eb1456f56a71589ff67";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
        ];
@@ -980,7 +981,7 @@ self: {
      mkDerivation {
        pname = "AttoJson";
        version = "0.5.10";
-       sha256 = "0mavq6akhx7pjdz15ckgnmgf8z9zhi5fm97lvjpjdfiggfy191d2";
+       sha256 = "a28514bc7b2fba26afdcf4a4ea4a843f7de45eb56fb2127e93f7743895c15b55";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-show containers mtl
          utf8-string
@@ -995,7 +996,7 @@ self: {
      mkDerivation {
        pname = "Attrac";
        version = "0.1.3";
-       sha256 = "0spvvgkf33km969l524580kwn7y43rjm2k0lqp9bl60nbvlsw760";
+       sha256 = "c01caee95e1618bad2c5144c51651ec41fcb27408588429349758ee1e6dbfb6a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -1013,7 +1014,7 @@ self: {
      mkDerivation {
        pname = "Aurochs";
        version = "0.1";
-       sha256 = "0n51j50qlpkgkq64n7w96qkv270lwxac1h7ariqq7w70zgdgiqf5";
+       sha256 = "c5e1f8dafbe0f08371cceac0c054e7141cb12736891f4b0c9e6f5e8a4191a158";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers parsec pretty ];
@@ -1029,7 +1030,7 @@ self: {
      mkDerivation {
        pname = "AutoForms";
        version = "0.4.2";
-       sha256 = "14dd6s3j9w738dvhyhxb9q8w9m0xhd6fm0d40b3gzl5sjb6g16zf";
+       sha256 = "ee9bf0cc92bad0ffc602a481ea4c831dd4c4114eab430f7743e3f0248736ad91";
        libraryHaskellDepends = [
          array base haskell98 mtl syb-with-class template-haskell wx wxcore
        ];
@@ -1044,7 +1045,7 @@ self: {
      mkDerivation {
        pname = "AvlTree";
        version = "4.2";
-       sha256 = "0bw6856h75wks0mfvvqqm5i31sici1hacyl5zfj225jf9gn5q7dx";
+       sha256 = "bd1d5cec4b4e1621a4fb857aa660882cea3062a918efed2ad09397034d41862f";
        libraryHaskellDepends = [ base COrdering ];
        description = "Balanced binary trees using the AVL algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -1056,7 +1057,7 @@ self: {
      mkDerivation {
        pname = "BASIC";
        version = "0.1.5.0";
-       sha256 = "1ypq7m09ki5wbwkvmqdl7ch40cbdfhb91kq8n17im184r5liyxlc";
+       sha256 = "8c761f69c904851a4fb008cf9016746d3140203bb4e1ba275fbcc499403df8fa";
        libraryHaskellDepends = [ base containers llvm random timeit ];
        description = "Embedded BASIC";
        license = stdenv.lib.licenses.bsd3;
@@ -1071,7 +1072,7 @@ self: {
      mkDerivation {
        pname = "BCMtools";
        version = "0.1.1";
-       sha256 = "1693kg8hxr1jl8h0ri11dbrbyhyznipkvcp0cvvx9chn97761ys4";
+       sha256 = "44fb60ce4916b2d4f766e0b23d6fb4df43bff26a21c40c20a232e40ed19b2399";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1097,7 +1098,7 @@ self: {
      mkDerivation {
        pname = "BNFC";
        version = "2.8";
-       sha256 = "0d3zcxspxcpnifv3kqg8d6gp01wxybakcbw7jh69gqg8rzfmzgi1";
+       sha256 = "21be5fddcfe8e1970c94872f36d5f29d07709f69e8e139b68bf6b27e75677f34";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
@@ -1121,7 +1122,7 @@ self: {
      mkDerivation {
        pname = "BNFC-meta";
        version = "0.4.0.3";
-       sha256 = "10rfljhygdl75ibmj0xqj7qwdk0ppjr8iw4wmvzdpl28mqjshny2";
+       sha256 = "c25ba825ae48d0dbfeae9cf088b2bc17ccc6f191b80359572c87b6e7a1a42e83";
        libraryHaskellDepends = [
          alex-meta array base happy-meta haskell-src-meta syb
          template-haskell
@@ -1135,7 +1136,7 @@ self: {
      mkDerivation {
        pname = "Baggins";
        version = "1.0";
-       sha256 = "0mgxq8zqyfmwkvn91y91c2vjhrni3br0vgiih2ynlafnas1ji0bc";
+       sha256 = "6c81288356d6296abd8031be0df21ad16628b76021f990ec9ebc3a8f3fc2fd55";
        revision = "1";
        editedCabalFile = "654cbc7a4109bf3baaa2491f10a7f49d1831008129d4d5ef9e0e558a5a374098";
        libraryHaskellDepends = [ base cairo containers mtl ];
@@ -1153,7 +1154,7 @@ self: {
      mkDerivation {
        pname = "Bang";
        version = "0.1.1.0";
-       sha256 = "1y68k1xsx2fksz70z5b8wdf5brk3vqsc6sih2asp4f97nwlkm5fw";
+       sha256 = "dc953a29b7273972b512306ac334de63e6555ce368950fced7d389ae7b98c8f8";
        libraryHaskellDepends = [
          base bifunctors hmidi mtl stm time transformers
        ];
@@ -1172,7 +1173,7 @@ self: {
      mkDerivation {
        pname = "Barracuda";
        version = "1.0.2";
-       sha256 = "0i8b6g2jvwg5r5gi1q3fgckh675pc6viqdvncl4ycr4zf72r4jj3";
+       sha256 = "434a92c5719f64e6096576371cb761b71c03277b6ee0105fc9e5f12dc5330b45";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1198,7 +1199,7 @@ self: {
      mkDerivation {
        pname = "Befunge93";
        version = "0.1";
-       sha256 = "1hs4p5s30ml97yrr91ahy7275jh4vyvh2l5p0p3jvpfysvg9sl6l";
+       sha256 = "d4509dded6dedd2dc705b75001b7df04ca72c4f1508594b33f89563074b944c3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base mtl random ];
@@ -1216,7 +1217,7 @@ self: {
      mkDerivation {
        pname = "BenchmarkHistory";
        version = "0.0.0.1";
-       sha256 = "07qdadcs76h7yd0k4hn3x3yqdiq7hp5lflxbxxlicx76k20fgl99";
+       sha256 = "29d1e78098e6741669efab5347cb8507c786fde8c3423241f3079aa359530d1f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1232,7 +1233,7 @@ self: {
      mkDerivation {
        pname = "BerkeleyDB";
        version = "0.8.7";
-       sha256 = "0q1qc6rds05bkxl2m3anp7x75cwinp9nhy8j0g1vaj2scasvki62";
+       sha256 = "c2c4b9b5625a48b5c303127968d3b591b372fab9568d2a689fab00ddb2613860";
        libraryHaskellDepends = [ base bytestring extensible-exceptions ];
        librarySystemDepends = [ db ];
        homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML";
@@ -1247,7 +1248,7 @@ self: {
      mkDerivation {
        pname = "BerkeleyDBXML";
        version = "0.7.2";
-       sha256 = "1ymdi5qi4hxaikqf8min830r1rs1z4bvy9bdybsq378v7mrgfihp";
+       sha256 = "1746f7723d1b9d81f5f26d25bf17f941e790c1403656e4f08caa43127189adfa";
        libraryHaskellDepends = [ base BerkeleyDB bytestring ];
        librarySystemDepends = [ db dbxml xercesc xqilla ];
        homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML";
@@ -1262,7 +1263,7 @@ self: {
      mkDerivation {
        pname = "BerlekampAlgorithm";
        version = "0.1.0.0";
-       sha256 = "14wjpfr9d8fpgl1jkpm2123lprr3hf3a6smkaflzkgxqlgcrkmyr";
+       sha256 = "d9d799d9a3b8bff9a953b36aa3868323e74b8708a2de29037dd7a196b2bb9293";
        libraryHaskellDepends = [ base besout ];
        jailbreak = true;
        description = "Factorization of polynomials over finite field";
@@ -1274,7 +1275,7 @@ self: {
      mkDerivation {
        pname = "BigPixel";
        version = "1.3.0";
-       sha256 = "19fxxbgj67rz2fpxd6f307xd6p7blwynq6gcakjnc7kdq8ghfrgz";
+       sha256 = "ff65071fc26d1e66e554ec196c3da7eb5cd3fa01c399d6af133f1f23dfeadda5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base bmp bytestring gloss ];
@@ -1288,7 +1289,7 @@ self: {
      mkDerivation {
        pname = "Binpack";
        version = "0.4.1";
-       sha256 = "0am0487l7njngp2k6h3qfbhjs61d9ir9rp8iw1r5448b20n4fxas";
+       sha256 = "5a75472c100b115272e011dd9c724c2d182de172784033c57d56da430f22a02a";
        libraryHaskellDepends = [ base ];
        description = "Common bin-packing heuristics";
        license = stdenv.lib.licenses.bsd3;
@@ -1304,7 +1305,7 @@ self: {
      mkDerivation {
        pname = "Biobase";
        version = "0.3.1.1";
-       sha256 = "1zrslhf3aiwc3y0b628j1w93z78v9apcjm2sxyw5qcq6r48zrmcc";
+       sha256 = "8cd5fc11c906335cb8ef5a54c9ae4a1b9d3f120f1209b3801f8c47351ca43aff";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory either-unwrap
          file-embed filemanip filepath ghc-prim HsTools mtl parsec
@@ -1323,7 +1324,7 @@ self: {
      mkDerivation {
        pname = "BiobaseBlast";
        version = "0.0.0.1";
-       sha256 = "1p7f2azq92shmxvs3n683mr5965qkmijbj4ya6333cd7nilwgl0f";
+       sha256 = "0ed0c769b4a7b13186519ec825639db89854721dc8d8a177af508b84bf12eedc";
        libraryHaskellDepends = [ array base BiobaseXNA containers ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "BLAST-related tools";
@@ -1336,7 +1337,7 @@ self: {
      mkDerivation {
        pname = "BiobaseDotP";
        version = "0.1.0.0";
-       sha256 = "0m7n3c2ly6kly146xrxzx41g3pv0cylrmzpdgv5c54x9gvb1hg7w";
+       sha256 = "fc3c18d67ea993c2ca7eedfe9aa96760dff102e9bfe76e48f0741a4f051bf654";
        libraryHaskellDepends = [ base bytestring iteratee ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Vienna / DotBracket / ExtSS parsers";
@@ -1351,7 +1352,7 @@ self: {
      mkDerivation {
        pname = "BiobaseFR3D";
        version = "0.2.3.0";
-       sha256 = "1y8aqxb8gq4k4l0i2wcrn2yi6f7lcmbhbvs4n063r4hgda6xfgch";
+       sha256 = "903dd78d6a0f923c0cb044ef055765f43813bdb0997111012593e08756c70af9";
        libraryHaskellDepends = [
          base BiobaseXNA bytestring containers filemanip iteratee tuple
        ];
@@ -1369,7 +1370,7 @@ self: {
      mkDerivation {
        pname = "BiobaseFasta";
        version = "0.0.1.0";
-       sha256 = "035pr31mrmfhmpja8llw81jyxy11aba62bfph34gf3rsi96iylnw";
+       sha256 = "dc521f4d8a3a0ff7c880d72d61d45221f8ee65409c52a4e4add0d55cc3c8b70c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1392,7 +1393,7 @@ self: {
      mkDerivation {
        pname = "BiobaseInfernal";
        version = "0.7.1.0";
-       sha256 = "19ga8qaqfp3jkd3mn8p1qrxv0frp4f4qkzhn0p0n8as6dlsifd2s";
+       sha256 = "5a3417356d462b64c10516fe898923373bb07bc6e1225b479b725c871546eaa5";
        libraryHaskellDepends = [
          attoparsec attoparsec-conduit base BiobaseXNA biocore bytestring
          bytestring-lexing conduit containers either-unwrap lens primitive
@@ -1410,7 +1411,7 @@ self: {
      mkDerivation {
        pname = "BiobaseMAF";
        version = "0.5.0.0";
-       sha256 = "0mwyyb7n232wgjipn9jsbqpcbxqms07adi5a6v14qaiynsjz4n1r";
+       sha256 = "3958f2a5b63e2a4cc236aac4a60ed015f7c52e5e5a267ba37c5c0c61cff29e57";
        libraryHaskellDepends = [ base bytestring containers iteratee ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Multiple Alignment Format";
@@ -1425,7 +1426,7 @@ self: {
      mkDerivation {
        pname = "BiobaseTrainingData";
        version = "0.1.2.3";
-       sha256 = "0qqyj3y2ivxj4d1c4bl5mdi7xm649dvksl57ba0wl0awimi5xn2s";
+       sha256 = "5ad85e628d5c01ca815aa7503d774bc4d47e62ab852ec24223b2ef28fc901e63";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1448,7 +1449,7 @@ self: {
      mkDerivation {
        pname = "BiobaseTurner";
        version = "0.3.1.1";
-       sha256 = "1h6yn6nwl8ifbz8y1rq5xklhmnbbjibfi9qz4n79xmv7y9bgkbxf";
+       sha256 = "aeaff956f267d79e8e251fa7e856946bd90ae9ec05e7e0d15f2e22caadb1dec0";
        libraryHaskellDepends = [
          base BiobaseXNA bytestring bytestring-lexing conduit containers
          filepath lens primitive PrimitiveArray repa split vector
@@ -1469,7 +1470,7 @@ self: {
      mkDerivation {
        pname = "BiobaseTypes";
        version = "0.1.1.0";
-       sha256 = "1z3vhxqqyc1bn1byvld21psi7am8zwmxsa7aiqshppw5hqyslwvl";
+       sha256 = "7473aa3d8685df0b358eea28dd2bffa8aa13f50da2d1ed57b02b308f71877bfc";
        libraryHaskellDepends = [
          aeson base binary cereal cereal-text data-default deepseq hashable
          log-domain primitive PrimitiveArray QuickCheck stringable text
@@ -1491,7 +1492,7 @@ self: {
      mkDerivation {
        pname = "BiobaseVienna";
        version = "0.3.0.0";
-       sha256 = "0bv100rmr04w8wbzabihv43lxilr0b2rm97rx54bhln1sy0ih1wj";
+       sha256 = "92071881d7c152b848e9f9a49ac50299c64e07d9302ef517479c805c3300612f";
        libraryHaskellDepends = [
          base BiobaseTurner BiobaseXNA primitive PrimitiveArray vector
        ];
@@ -1510,7 +1511,7 @@ self: {
      mkDerivation {
        pname = "BiobaseXNA";
        version = "0.9.2.0";
-       sha256 = "1ck6yba372w3cbzgifcbfdd2m4nfyy7zd8zygkji3zbxymz2ak18";
+       sha256 = "284c257ef57dfd11e57cfea3f68ff7ce922a5a738bb9f8fe62838b33d4f266b2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1530,7 +1531,7 @@ self: {
      mkDerivation {
        pname = "BirdPP";
        version = "1.1";
-       sha256 = "14wbnxjyg75vc7zwg42cpk8a1cb7gm4881c52yaq1bq053g5dsz2";
+       sha256 = "e2eb56de2800af809517850584487d67b1a0d0bc4c90c7ff61bb9ce765b78b93";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 ];
@@ -1547,7 +1548,7 @@ self: {
      mkDerivation {
        pname = "BitSyntax";
        version = "0.3.2";
-       sha256 = "1kz9s9g05b5qzw9p7vvyw8zmy9sx1wzn83ay6prdyv74x0wycjbl";
+       sha256 = "7449e639e8e46cdff2355e0d643f0f5d275f3fe27eef7313ffb8ac025ed2e9cf";
        libraryHaskellDepends = [
          base bytestring haskell98 QuickCheck template-haskell
        ];
@@ -1562,7 +1563,7 @@ self: {
      mkDerivation {
        pname = "Bitly";
        version = "0.1.0";
-       sha256 = "1pmmgg6n6pc0qvp5r4qxan32887132si0cayd0xh1g5v98fa9ari";
+       sha256 = "31aba41c4abbbc003b685e3110b518e1202486551d935ceec6805d63cd7bb5de";
        libraryHaskellDepends = [ base HTTP json2 ];
        homepage = "http://bitbucket.org/jetxee/hs-bitly/";
        description = "A library to access bit.ly URL shortener.";
@@ -1577,7 +1578,7 @@ self: {
      mkDerivation {
        pname = "BlastHTTP";
        version = "1.2.0";
-       sha256 = "0vhnwjgamc1zry8w7m6jb7ambz3lqqr00j05xymzwcapgwg8v9b5";
+       sha256 = "65a58d1e7f5731feabef05480032c674fc55d559d2d4c391cf3fb0aa9ee4166e";
        revision = "1";
        editedCabalFile = "7076650ad04d2c5945b96ec1a8d5db8ee680314d4dc4cff54f264316e7f69bba";
        libraryHaskellDepends = [
@@ -1596,7 +1597,7 @@ self: {
      mkDerivation {
        pname = "Blobs";
        version = "0.3";
-       sha256 = "09mpf3qwr38x0ljz4ziyhdcwl5j37i353wc2dkpc6hjki9p08rgl";
+       sha256 = "f465046e8a5342c3ee6c82f151463c4316ca59833e7ef225051d8dccf170b726";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1621,7 +1622,7 @@ self: {
      mkDerivation {
        pname = "BlogLiterately";
        version = "0.8.1.1";
-       sha256 = "02q0i2p892adpmi7p4hh8666qzrpi76bxwljf575hiaz018yixlb";
+       sha256 = "8bf6e851005f45584e7192f2becc89377f6c8c4110927b62bd4d8984ae88000b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1644,7 +1645,7 @@ self: {
      mkDerivation {
        pname = "BlogLiterately-diagrams";
        version = "0.2.0.1";
-       sha256 = "190wny2ggqahsiv5ar23pndf3ngparb5mrrjp7his5crp6xvk66m";
+       sha256 = "d598b9bbb999151de1b932e75a5656f7d9e19abd43645576d450e1f784b71ca4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1662,7 +1663,7 @@ self: {
      mkDerivation {
        pname = "BluePrintCSS";
        version = "0.1";
-       sha256 = "0ryjgi70isgfv3nw3djzvb1saky40xqy536h6sr3mfpy2iqnim0c";
+       sha256 = "0cd4687114feba3ab236d08ce27107c44fa5c3da5fb6c1edd8eee9084e7cd267";
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://git.ierton.ru/?p=BluePrint.git;a=summary";
        description = "Html document layout library";
@@ -1674,7 +1675,7 @@ self: {
      mkDerivation {
        pname = "Blueprint";
        version = "0.1";
-       sha256 = "16cfmy4ndc15p6jdmyy08nqgv143dvs9xf4qg4mxa6x5r326pi94";
+       sha256 = "24c56bc4c8a51bd52b7998b89ef46e8384fdb045c0fbdaa4b925b06689af8e99";
        homepage = "http://github.com/gcross/Blueprint";
        description = "Preview of a new build system";
        license = stdenv.lib.licenses.bsd3;
@@ -1688,7 +1689,7 @@ self: {
      mkDerivation {
        pname = "Bookshelf";
        version = "0.4";
-       sha256 = "1h23ncphq717xqvg3bhij0ypmi6whm0aibhmiwak71sjkzv604in";
+       sha256 = "361260f69f528733158f15aea84085dcc47a3d9011aef136ee271c0c2fb343c0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -1707,7 +1708,7 @@ self: {
      mkDerivation {
        pname = "Boolean";
        version = "0.2.3";
-       sha256 = "1lsm06y7hgjp9qmlr6csf24x3wgna7sbf8dgh6sfl2rhs7fn8kgn";
+       sha256 = "f64d64ddd1300beab481af21b7f451f6f1d189709a994c2b4e573e78bc0155d3";
        libraryHaskellDepends = [ base ];
        description = "Generalized booleans and numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -1718,7 +1719,7 @@ self: {
      mkDerivation {
        pname = "BoundedChan";
        version = "1.0.3.0";
-       sha256 = "0vf4mlw08n056g5256cf46m5xsijng5gvjx7ccm4r132gznyl72k";
+       sha256 = "531ceaed7f62844c2a63a7cbfdcab332ea5eaa218e9922ca3305580438adc46d";
        libraryHaskellDepends = [ array base ];
        description = "Implementation of bounded channels";
        license = stdenv.lib.licenses.bsd3;
@@ -1731,7 +1732,7 @@ self: {
      mkDerivation {
        pname = "Bravo";
        version = "0.1.0.1";
-       sha256 = "16li42rl77jvhyp14fjic66c7d6qm2fjln93gyw4bqbykai291in";
+       sha256 = "368624a29a7ee145b87f23592a9da8d8b4c38c61513a12ae875b9e43b320919a";
        libraryHaskellDepends = [
          base haskell-src-exts haskell-src-meta mtl parsec syb
          template-haskell
@@ -1748,7 +1749,7 @@ self: {
      mkDerivation {
        pname = "BufferedSocket";
        version = "0.2.0.0";
-       sha256 = "0sgwglnzsqwz1k11jbzp7lpb29h9ap2mny2lv9m9nrlr0ydhcdqf";
+       sha256 = "0e37069b0799669b6ada54785bc5550926b12e3df72f19c20c9f63fd2d7dfc69";
        libraryHaskellDepends = [ base bytestring network text ];
        jailbreak = true;
        description = "A socker wrapper that makes the IO of sockets much cleaner";
@@ -1764,7 +1765,7 @@ self: {
      mkDerivation {
        pname = "Buster";
        version = "0.1.1";
-       sha256 = "12zchy3sqdcqdgbb7d29jrsqifz4hfdx94s514v2mmyzzr0m8xqd";
+       sha256 = "0d775441fedfd72a36094593d49b83e4bb88759649b4b3d66b9835ac8787ec8b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -1790,7 +1791,7 @@ self: {
      mkDerivation {
        pname = "CBOR";
        version = "0.1.0.1";
-       sha256 = "03h8lp5sm8prbphq98c7ar93rl9yfy29pvwrkrskdjhx79pd1w6q";
+       sha256 = "d8f0d06e3a1dca36759e99ef9b84773ed13c525687a184e15df9a2aacba5080e";
        libraryHaskellDepends = [
          base binary binary-bits bytestring data-binary-ieee754
        ];
@@ -1809,7 +1810,7 @@ self: {
      mkDerivation {
        pname = "CC-delcont";
        version = "0.2";
-       sha256 = "0bl71vj1ypzplx92kz27hhbpnwnxkz5g2q86m4fcmjmp4fym8kc1";
+       sha256 = "814d54bd23b7caca1ca90661f1ca9fdd727b178447fc2952a7f75f1fe40e872e";
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://code.haskell.org/~dolio/CC-delcont";
        description = "Delimited continuations and dynamically scoped variables";
@@ -1824,7 +1825,7 @@ self: {
      mkDerivation {
        pname = "CC-delcont-alt";
        version = "0.1.1.1";
-       sha256 = "0s6z5bcxmcx1vzgjc6r2i4898j6s3ngjjdqhggp893hmhpxlbgsv";
+       sha256 = "5bbf45fb85158e84ee7b1037299f1dda48941089221b26dfdfa1b3dad92adf68";
        libraryHaskellDepends = [
          base CC-delcont-cxe CC-delcont-exc CC-delcont-ref mtl
        ];
@@ -1839,7 +1840,7 @@ self: {
      mkDerivation {
        pname = "CC-delcont-cxe";
        version = "0.1.0.2";
-       sha256 = "1s6bql9r78yfzgarm3i4f2glhc5w8qq91adhs15cnqj6h7768a5c";
+       sha256 = "ac2864ce814662cb4ad0b0a9903046bc30489f70248e9ad5fbcea39313c5cbe8";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
@@ -1851,7 +1852,7 @@ self: {
      mkDerivation {
        pname = "CC-delcont-exc";
        version = "0.1.0.0";
-       sha256 = "07v388bzs8x9k1p677310rbh8baj1fdq3bhbqyvxqzx93kv8g381";
+       sha256 = "018d87f61ca97fdcb7c70bae819b0b522d045706619c636e98a923fd1742631f";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
@@ -1863,7 +1864,7 @@ self: {
      mkDerivation {
        pname = "CC-delcont-ref";
        version = "0.1.0.0";
-       sha256 = "0fzjr73id8rlrcmf0j3y1qn4jnc8incqhhkp9wl35lig20kqy82m";
+       sha256 = "55208f27102fd232284f774288998d8859492c0e7e48e02acb34a316c7c9f23b";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
@@ -1875,7 +1876,7 @@ self: {
      mkDerivation {
        pname = "CC-delcont-ref-tf";
        version = "0.1.0.2";
-       sha256 = "0zavw824xcr1jhmlpz9hmabhhi459y0s7z434lxalzha01j1wfih";
+       sha256 = "303a1e64000a7eaa3a2583fca3814f85440897aa30fd4b2b9421b34e04e25b7d";
        libraryHaskellDepends = [ base ref-tf transformers ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
@@ -1889,7 +1890,7 @@ self: {
      mkDerivation {
        pname = "CCA";
        version = "0.1.5.3";
-       sha256 = "05zv1vha31fgw4ddvrnbvk5pzhq8lkvfx1xrgja5ggy451zrs6aw";
+       sha256 = "5c199d7f28c4bf57947cb987eef6a408c37fcbdccbe6dd1ae1cf85a1e00efb17";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ghc-prim syb template-haskell ];
@@ -1906,7 +1907,7 @@ self: {
      mkDerivation {
        pname = "CHXHtml";
        version = "0.2.0";
-       sha256 = "0pr2mvcnrz3240wnpd44g3pz9x8am6vhhfvl0lyl129kvc33v99q";
+       sha256 = "38a53d06db3389403d05743b08b7a90af5f4ef7884b46b392062fc6cd9ae225f";
        libraryHaskellDepends = [
          base bytestring hxt-regex-xmlschema utf8-string
        ];
@@ -1922,7 +1923,7 @@ self: {
      mkDerivation {
        pname = "CLASE";
        version = "2009.2.11";
-       sha256 = "10jab7jxlhppmqqw31g653l8jmz4vz8f9h9wr2i9fjf6bipvgfi3";
+       sha256 = "23bab76f5cc64997a2c83cc1e4d0dfe45789e828e685c131aef742dae5594a82";
        libraryHaskellDepends = [
          base containers filepath mtl parsec template-haskell
        ];
@@ -1937,7 +1938,7 @@ self: {
      mkDerivation {
        pname = "CLI";
        version = "0.1.0.0";
-       sha256 = "1g271n7z6xndqylwxwcaa1xscgd36wzb2apbmrilv42v7ii4aall";
+       sha256 = "942a45623c5b904d63aeeb2ab13e37a33da67b508af1cea9c7cd76f38f0d47bc";
        libraryHaskellDepends = [ base directory split time ];
        testHaskellDepends = [ base doctest ];
        jailbreak = true;
@@ -1952,7 +1953,7 @@ self: {
      mkDerivation {
        pname = "CMCompare";
        version = "0.0.1.5";
-       sha256 = "1ccjyn0cc8yx7fgnvsjap0swlxql3gdygb5mabzvkgk84zc3bh2b";
+       sha256 = "4bc035d82768beb9ff52b5ace7db1b1477ca35b84aea6d9f3bdd23c680f592b1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1973,7 +1974,7 @@ self: {
      mkDerivation {
        pname = "CMQ";
        version = "0.0.12";
-       sha256 = "0zskbcjdd4s8bkll7jvb8qzyq8pa52li4db9r5wg16pd2l3m0fpb";
+       sha256 = "eb3a500715ed9af078c9693512a928ea22ec3f466bcb43e95c4893d6245b537f";
        libraryHaskellDepends = [
          base bytestring cereal containers iproute mtl network PSQueue stm
          time
@@ -1988,7 +1989,7 @@ self: {
      mkDerivation {
        pname = "COrdering";
        version = "2.3";
-       sha256 = "1lkav4wkyrraq1f6kyqfyjrxasgkayg4hmyv8a1gkr4h484b1cx8";
+       sha256 = "a8b3b0082290e4f98242db57489e57f369d5b3f40efb695cc02a673f39d96ad2";
        libraryHaskellDepends = [ base ];
        description = "An algebraic data type similar to Prelude Ordering";
        license = stdenv.lib.licenses.bsd3;
@@ -2000,7 +2001,7 @@ self: {
      mkDerivation {
        pname = "CPBrainfuck";
        version = "1.1";
-       sha256 = "041bm02xar8g6ppz6g0fdgs4ywavlcn4pqkncydx0lw5wp9ygwwn";
+       sha256 = "96f3e7d3e58553d09b6776e24b2ca35b714ff46b0e3cf3ef350f65d505a82b10";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 ];
@@ -2014,7 +2015,7 @@ self: {
      mkDerivation {
        pname = "CPL";
        version = "0.0.7";
-       sha256 = "1hm2slnvcp1fqdrgx505wkj3w511x9896h2hj9riyky6vg2mzgr7";
+       sha256 = "27bf5fc5dbc64f1f739250409350ea21143ee4e40594fe72c32e5cb62dd5a2c2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -2030,7 +2031,7 @@ self: {
      mkDerivation {
        pname = "CSPM-CoreLanguage";
        version = "0.3.0.3";
-       sha256 = "0vr6zpdz5lnpkyzwhig72pv8ncvqdjyp1nn76zpx3v6xlpzrs3q2";
+       sha256 = "020f9dffa5ddecd1ef37c7da70bd6c78338bf615e745c8bf9fd7d2f2dbfd266f";
        libraryHaskellDepends = [ base ];
        description = "Definition of a FDR-compatible CSP core-language";
        license = stdenv.lib.licenses.bsd3;
@@ -2043,7 +2044,7 @@ self: {
      mkDerivation {
        pname = "CSPM-FiringRules";
        version = "0.4.3.0";
-       sha256 = "0rdggf00zq51j4af6rhk4ix8rbpd82piy2al4m6ymziwflv3b70m";
+       sha256 = "159c3536753cfeea4d2554091faf40edae8c7a241366e31491a1e00f807baf65";
        libraryHaskellDepends = [
          base containers CSPM-CoreLanguage mtl parallel-tree-search
          QuickCheck random tree-monad
@@ -2061,7 +2062,7 @@ self: {
      mkDerivation {
        pname = "CSPM-Frontend";
        version = "0.10.0.0";
-       sha256 = "0wmfk9givv604ajzkg60586lz08xqcx60bnqgslpfzkh458mz9z3";
+       sha256 = "e3a75f5121707e77a97ed82e603ac31d814f0d2ac0bcf9a522c0ec1d5f9aae72";
        libraryHaskellDepends = [
          array base containers dlist either ghc-prim mtl parsec2 prettyclass
          syb transformers
@@ -2080,7 +2081,7 @@ self: {
      mkDerivation {
        pname = "CSPM-Interpreter";
        version = "0.7.0.0";
-       sha256 = "0shf0bb4zqnxvclsavvxnsy697xbl5q1xjqww8makps6dirwk0qn";
+       sha256 = "1683c9736c46dfa92ae21ccb1e70a1ab9f64bcb67d6fa529dbdde24fd6020e6a";
        libraryHaskellDepends = [
          array base containers CSPM-CoreLanguage CSPM-Frontend mtl
          prettyclass syb
@@ -2098,7 +2099,7 @@ self: {
      mkDerivation {
        pname = "CSPM-ToProlog";
        version = "0.5.2.0";
-       sha256 = "0qy2zdxgdm9vacm2ickf1lvyj6wrcnpifaxgh25apg9j9v6g0h12";
+       sha256 = "2240f0cc4e32bdab8a80af2b17af65991be9370d6eb2282a533bd5f67afbc263";
        libraryHaskellDepends = [
          array base containers CSPM-Frontend ghc-prim pretty
        ];
@@ -2116,7 +2117,7 @@ self: {
      mkDerivation {
        pname = "CSPM-cspm";
        version = "0.8.0.0";
-       sha256 = "1lhfq8gjls2g3xwskwa7vx1kj6n83b4msx4fc6769li4r2xn1bc9";
+       sha256 = "89ad60bbc824d2648e618e745dc91ac81a3943df47f1a9791f4f682a1fc20ed2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -2142,7 +2143,7 @@ self: {
      mkDerivation {
        pname = "CTRex";
        version = "0.6";
-       sha256 = "0cjinznkvdrswbqrsha49b6hch7sjv2qq9xllx780klf01kdahi6";
+       sha256 = "2642d566008e4e804ea7b4278cc596fa4006cd4a44419df1e23ab73dedb75132";
        libraryHaskellDepends = [
          base containers hashable mtl unordered-containers
        ];
@@ -2163,7 +2164,7 @@ self: {
      mkDerivation {
        pname = "CV";
        version = "0.3.7";
-       sha256 = "0c200jn6q4y744k39jll7xw418js7y86vvihz49i8kk2316vakmr";
+       sha256 = "b94eb54d18624e1413f930ee6d903f5aa240783f94ca342621c7136cac044030";
        libraryHaskellDepends = [
          array base binary bindings-DSL carray containers deepseq directory
          filepath lazysmallcheck mtl mwc-random parallel parallel-io
@@ -2195,7 +2196,7 @@ self: {
      mkDerivation {
        pname = "Cabal";
        version = "1.18.1.6";
-       sha256 = "15nn6f8bnqzy7pqxb45hdf30qid2hw608dcqgmwrcfrd8zrrvylw";
+       sha256 = "9cfa9df3472d3b96797d9835040c87a2450c866bb090d5f13dfe63bb9033d696";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath pretty
          process time unix
@@ -2220,7 +2221,7 @@ self: {
      mkDerivation {
        pname = "Cabal";
        version = "1.20.0.3";
-       sha256 = "0vq1xcwvvk74jkzp7386ldyrls8qszg3rj4l37fyq3fvjkqnx80v";
+       sha256 = "1ba06ef194db0decdd1994c83cded718699a7da3068d73ff94e4ccbd39eb016f";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath pretty
          process time unix
@@ -2246,7 +2247,7 @@ self: {
      mkDerivation {
        pname = "Cabal";
        version = "1.22.4.0";
-       sha256 = "19nwapy5rvsrk8jc75ql5klp8hikzrwd3c5x07nisl73d2r8ssmr";
+       sha256 = "b96a8db268e3501ded01bdb0d178fe334274e92c1497c3249a59ef5cfc55dca6";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          pretty process time unix
@@ -2272,7 +2273,7 @@ self: {
      mkDerivation {
        pname = "Cabal-ide-backend";
        version = "1.23.0.0";
-       sha256 = "07s9gkq2d4sz8nrjayrnb3gbjm58sp7gfl3hnl8n1gsxsfbl2cgw";
+       sha256 = "fc314197d35dbf6011b57050f7ced5a854b9de58367b25b3455f9326f07c491f";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          pretty process time unix
@@ -2295,7 +2296,7 @@ self: {
      mkDerivation {
        pname = "CabalSearch";
        version = "0.0.2";
-       sha256 = "181k2rybbyhjmwf1fq69hiaf14a0rzcvnv4j9w03n2v7cal4k08b";
+       sha256 = "0b8149a862670b3b004f926cbbd9cf4091e05484c960171caf12fab57c1633a0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -2312,7 +2313,7 @@ self: {
      mkDerivation {
        pname = "Capabilities";
        version = "0.1.0.0";
-       sha256 = "0nd5yvhbxmabs0890y9gjjiq37h8c3blpplv2m13k29zkijwad04";
+       sha256 = "0434c5659c3f893942159bde4bd760089e81a3942f799010d04bd5bee0f6a559";
        libraryHaskellDepends = [ base compdata directory free unix ];
        jailbreak = true;
        homepage = "https://github.com/Icelandjack/Capabilities";
@@ -2326,7 +2327,7 @@ self: {
      mkDerivation {
        pname = "Cardinality";
        version = "0.2";
-       sha256 = "01bp045vl08sixvi6h0i21vvmjirnyzlmwxx8yq5njbcxrgbq6dn";
+       sha256 = "b619bc5eee6c495bb047bdf34abfb739caba7710114013778f1a01ba0b017705";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Measure container capacity. Use it to safely change container.";
        license = "LGPL";
@@ -2337,7 +2338,7 @@ self: {
      mkDerivation {
        pname = "CarneadesDSL";
        version = "1.3";
-       sha256 = "06ri47cfskvpm65zb63kjrwwhzlmcp2f0z99hqkfw216p85648a3";
+       sha256 = "4321620aba2608ee2686297de0c465957ec879967398f58ba9774fedd821311b";
        libraryHaskellDepends = [ base containers fgl parsec ];
        homepage = "http://www.cs.nott.ac.uk/~bmv/CarneadesDSL/";
        description = "An implementation and DSL for the Carneades argumentation model";
@@ -2350,7 +2351,7 @@ self: {
      mkDerivation {
        pname = "CarneadesIntoDung";
        version = "1.0";
-       sha256 = "0gmrc778zan5rrkb7rip61736rzx13abfzyjcj4bgdvc3fhih1rx";
+       sha256 = "3d0718a11b6cb7b78864d27fb7d408fd67334e3037e6b366cec5aa8fce61b93e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -2366,7 +2367,7 @@ self: {
      mkDerivation {
        pname = "Cascade";
        version = "0.1.0.0";
-       sha256 = "1ih8ydc29axckgidc5xvsdac5558gprscw667msh8qh41j9sshng";
+       sha256 = "cf42ad930c046204753dc670a6f37da894c254d3bb17d6e29bacab2458f308c6";
        libraryHaskellDepends = [ base comonad ghc-prim mtl void ];
        jailbreak = true;
        homepage = "http://github.com/rampion/Cascade";
@@ -2380,7 +2381,7 @@ self: {
      mkDerivation {
        pname = "Catana";
        version = "0.3";
-       sha256 = "10m7l701p3a2w0kxi2b93g2ii6s4s71zyjypqk3mi79siv8yilif";
+       sha256 = "2ed2e8d18e3a9d58c7c4d74bffc3d1449b18c51b6989d827e0428d1bc0a1a782";
        libraryHaskellDepends = [ base mtl ];
        description = "A monad for complex manipulation of a stream";
        license = stdenv.lib.licenses.bsd3;
@@ -2394,7 +2395,7 @@ self: {
      mkDerivation {
        pname = "Chart";
        version = "1.5.1";
-       sha256 = "0jm1wr2nb1r8rxqc564nmnclns160y7girc7j2ihvyhm0v34p59g";
+       sha256 = "2f954bc60615fa0da39087e5f88e0726684b99ad9698c270cf28876545e6a14a";
        libraryHaskellDepends = [
          array base colour data-default-class lens mtl old-locale
          operational time vector
@@ -2411,7 +2412,7 @@ self: {
      mkDerivation {
        pname = "Chart-cairo";
        version = "1.5.1";
-       sha256 = "1fwjgms76z2spgfw3kfmzivkgp6gdkx24mp5nb562kza4y6yjz7f";
+       sha256 = "ee7ce98d27ea4f61cab2e55622fa6ccfdc3777fcd5cdc1ddbb5a7c73747d92bb";
        libraryHaskellDepends = [
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
@@ -2430,7 +2431,7 @@ self: {
      mkDerivation {
        pname = "Chart-diagrams";
        version = "1.5.1";
-       sha256 = "1slsq9p9mq9jxlyhpd90bh32s6fqvy149p4cb7ckygzd77r1aqxz";
+       sha256 = "bf6315f239ed3f3fd9598cdc4482dfd8192d065c20b50b3ded32e19a6ec29aea";
        libraryHaskellDepends = [
          base blaze-markup bytestring Chart colour containers
          data-default-class diagrams-core diagrams-lib diagrams-postscript
@@ -2450,7 +2451,7 @@ self: {
      mkDerivation {
        pname = "Chart-gtk";
        version = "1.5.1";
-       sha256 = "025snbbsnd2gsldw2j8r3vxh94jrv57h8z4qvkq3dwyh2mvq21lw";
+       sha256 = "9c06817715d0f336f0dc987c044fd9599204fb1e1949c11bd54f34abd7b2ba08";
        libraryHaskellDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
@@ -2467,7 +2468,7 @@ self: {
      mkDerivation {
        pname = "Chart-simple";
        version = "1.3.3";
-       sha256 = "0kk81jz4lciga8qc78gm9khw02n84snyclzf5lcmlz9rs50z3v5r";
+       sha256 = "b9ecf141d1397d5a192dee53e6ad26c80ac0e14cf5a1c330522f324abe0c684e";
        libraryHaskellDepends = [
          array base cairo Chart Chart-cairo Chart-gtk colour
          data-default-class gtk mtl old-locale time
@@ -2485,7 +2486,7 @@ self: {
      mkDerivation {
        pname = "ChasingBottoms";
        version = "1.3.0.13";
-       sha256 = "1fb86jd6cdz4rx3fj3r9n8d60kx824ywwy7dw4qnrdran46ja3pl";
+       sha256 = "f40e250db12ab76c31e1ed78ce3d11a84f601ab2290fe946cfe437669a3468b9";
        libraryHaskellDepends = [
          base containers mtl QuickCheck random syb
        ];
@@ -2501,7 +2502,7 @@ self: {
      mkDerivation {
        pname = "CheatSheet";
        version = "2.9";
-       sha256 = "1pw6sssdmxpsjclkhsaf1b06vlimi4w11rxy65ccyj8c9zgs2g23";
+       sha256 = "433ca1df4f0c49cf5831bee710388935d26dc00a4e69382993faf6dab4d686df";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers directory ];
@@ -2515,7 +2516,7 @@ self: {
      mkDerivation {
        pname = "Checked";
        version = "0.0.0.2";
-       sha256 = "1mr323rhh3lr6a5ni60n2kxz2k57763a3rrf7c6i18hxs9d4w2s4";
+       sha256 = "440b4e5ad21da2100d3b2ee7a18639a74cf1fb141698688b32990e08f31023d7";
        libraryHaskellDepends = [ base text ];
        jailbreak = true;
        description = "Inbuilt checking for ultra reliable computing";
@@ -2527,7 +2528,7 @@ self: {
      mkDerivation {
        pname = "Chitra";
        version = "0.2.2";
-       sha256 = "0qf6a1xmpv29hpwcrn3acfvpcx0f95dq980mv5mijzfsznz4d43k";
+       sha256 = "739046befdda7d196bd915a0845b490e7476b7636ad8ccf88549ec5b7b50c661";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base binary bytestring mtl network ];
@@ -2544,7 +2545,7 @@ self: {
      mkDerivation {
        pname = "ChristmasTree";
        version = "0.2.1.1";
-       sha256 = "1xng99msiyck127zv12cbksgyprwr6i6nwwjplc9c0jdfiisa9n8";
+       sha256 = "c826a563744d029618bd92736ba2c93c5ffff45c4c84fd8f0893f9a86b4acff6";
        libraryHaskellDepends = [
          base containers fgl template-haskell TTTAS uulib
        ];
@@ -2560,7 +2561,7 @@ self: {
      mkDerivation {
        pname = "CirruParser";
        version = "0.0.1";
-       sha256 = "111ccwiszrjy54y5hincyvjj97kmar9n26bbn902qa9jd9y9k3g9";
+       sha256 = "e98d997c6a32292c40b26b19615356759e24e5f6cc46583c295ee6af23672c84";
        libraryHaskellDepends = [ aeson base text vector ];
        homepage = "https://github.com/Cirru/parser.hs";
        description = "Cirru Parser in Haskell";
@@ -2572,7 +2573,7 @@ self: {
      mkDerivation {
        pname = "ClassLaws";
        version = "0.3.1.0";
-       sha256 = "1277vn384hpxd7xnzg0gpr7ilnw5cqhsi11c24g9zsfqa36llwgk";
+       sha256 = "f3714acd50d8e99f1e112c84a82166855b1a4fbe0fbc6ffb69fd428286dde788";
        libraryHaskellDepends = [ base ChasingBottoms mtl QuickCheck ];
        jailbreak = true;
        homepage = "http://wiki.portal.chalmers.se/cse/pmwiki.php/FP/ClassLaws";
@@ -2586,7 +2587,7 @@ self: {
      mkDerivation {
        pname = "ClassyPrelude";
        version = "0.1";
-       sha256 = "1yvkrzd3l7ijh3fqvkbzqv5vp4nv5z26fbxy91sfwh3zqlscpim9";
+       sha256 = "a9c6cb34c57f40ee7448be2f67c42fdb92bbcbc67fcd8ddd80321e3adacf73fb";
        libraryHaskellDepends = [ base strict ];
        description = "Prelude replacement using classes instead of concrete types where reasonable";
        license = stdenv.lib.licenses.bsd3;
@@ -2598,7 +2599,7 @@ self: {
      mkDerivation {
        pname = "Clean";
        version = "0.6";
-       sha256 = "0kr9i13ch2wbcnxchrnx562r8ar7kb84gmk3cqxc40x5w416205f";
+       sha256 = "ae006102e1a503c23a6663d647d09a272b948529dd66c8ba658b0bc84688294f";
        libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "A light, clean and powerful utility library";
@@ -2611,7 +2612,7 @@ self: {
      mkDerivation {
        pname = "Clipboard";
        version = "2.2.0.3";
-       sha256 = "0qpcfgpfgw426v4040ch63pc2zl7amd2ljapx4xv0j4hwc4rsqz3";
+       sha256 = "e3639d09e39048b03be957492a5a55877ec1ee30900102c83682f0e7ee73ec62";
        libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/Clipboard";
        description = "System clipboard interface";
@@ -2625,7 +2626,7 @@ self: {
      mkDerivation {
        pname = "ClustalParser";
        version = "1.1.3";
-       sha256 = "1xblyxmwbhmfkm2d2a87qnryk6mg5n1zarzr9d3xjh9qx3mbbclb";
+       sha256 = "8bb2b5eae83841d9474bf967f5832daf9ae9b3c50729d1449daec2c56bf774f5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec vector ];
@@ -2643,7 +2644,7 @@ self: {
      mkDerivation {
        pname = "Coadjute";
        version = "0.1.1";
-       sha256 = "1crbs8dk93cff252c3nj2brdbjbfygpvlrm4lrp7vpnwfz2709b3";
+       sha256 = "632570c477dcde7d6ea6a466baeff36ec9d5f212d20e268a708e8d341bd22bb3";
        libraryHaskellDepends = [
          array base bytestring bytestring-csv containers directory fgl
          filepath mtl old-time pretty pureMD5 safe utf8-string
@@ -2660,7 +2661,7 @@ self: {
      mkDerivation {
        pname = "Codec-Compression-LZF";
        version = "0.2";
-       sha256 = "0jj2iaa632s60dckj8s46g4vrlqc8x9fndkq0kzk8rk4jzwlbwsn";
+       sha256 = "56f345f997646634ff047836eb52470cd3bcc9334423395903468b61948a424a";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/Codec-Compression-LZF/";
        description = "LZF compression bindings";
@@ -2672,7 +2673,7 @@ self: {
      mkDerivation {
        pname = "Codec-Image-DevIL";
        version = "0.2.3";
-       sha256 = "1kv3hns9f0bhfb723nj9szyz3zfqpvy02azzsiymzjz4ajhqmrsz";
+       sha256 = "5fe78aa154e4cb5f7dd4ff2b01fcbed8fdf1fdd749da21ce72700197b48563cf";
        libraryHaskellDepends = [ array base ];
        librarySystemDepends = [ libdevil ];
        description = "An FFI interface to the DevIL library";
@@ -2690,7 +2691,7 @@ self: {
      mkDerivation {
        pname = "Combinatorrent";
        version = "0.3.2";
-       sha256 = "0dx5pysxyk5c0fa33khjr86zgm43jz7nwhgl0w8jngyai8b1rbra";
+       sha256 = "2aaf1c168aca3f2b1107f4416ecf9783d4f70dca12ce319403ac4cdfb5bfa537";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -2710,7 +2711,7 @@ self: {
      mkDerivation {
        pname = "Command";
        version = "0.0.7";
-       sha256 = "043dwvjkc1m2cz0rgiib7gv19ds1vn4cmf27lyw68nmc0lcm2v3d";
+       sha256 = "6d6c511905ac5a64b8a747b8ca88dd41b714f63b2bc697c167a20636e5e66d10";
        libraryHaskellDepends = [ base directory process ];
        homepage = "https://github.com/tonymorris/command";
        description = "A replacement for System.Exit and System.Process";
@@ -2724,7 +2725,7 @@ self: {
      mkDerivation {
        pname = "Commando";
        version = "1.0.0.4";
-       sha256 = "1wfpxaj9j68knf1fp3zngxrc1acqvhzrzbblar4ckq9y5kxjwwsj";
+       sha256 = "52732efb2c3ee1c9485674ad9f3fdc98a9c0727ff68feb82b3131999a4ead7f1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -2750,7 +2751,7 @@ self: {
      mkDerivation {
        pname = "ComonadSheet";
        version = "0.3.0.0";
-       sha256 = "1jpxc5ymhjdk18nggw9fjr6dmqhlz0jwwailyw9i8yzs5dzbn67z";
+       sha256 = "ff18bb7e2bfa7b1413f7342ace25f814e2da4c962ef1f72c0ab349587d61fdca";
        libraryHaskellDepends = [
          applicative-numbers base comonad containers distributive
          IndexedList NestedFunctor PeanoWitnesses Stream Tape transformers
@@ -2769,7 +2770,7 @@ self: {
      mkDerivation {
        pname = "ConcurrentUtils";
        version = "0.4.2.0";
-       sha256 = "1bxw8jrniczwc0pprva7zp6kzzrp5cj05r19j024fbgfw6vq9xz4";
+       sha256 = "e4f784b7e1ee2d47049029e402242b37ff3fcdfd47ed7c2f60fcb368b344bcaf";
        libraryHaskellDepends = [
          array base binary bytestring containers crypto-random cryptohash
          network parallel process reexport-crypto-random RSA securemem
@@ -2786,7 +2787,7 @@ self: {
      mkDerivation {
        pname = "Concurrential";
        version = "0.5.0.0";
-       sha256 = "1fcl1ckinzv9c0iyfvhh3sm649jn7q8yv2r9vz99l139dw25l5vb";
+       sha256 = "6b175a046f69049ad2df298bed113e562662aa1e106ee72360697f1b270b94b9";
        libraryHaskellDepends = [ async base ];
        jailbreak = true;
        homepage = "http://github.com/avieth/Concurrential";
@@ -2801,7 +2802,7 @@ self: {
      mkDerivation {
        pname = "Condor";
        version = "0.3";
-       sha256 = "0vrflmjyc1h0mfvc07p3p3wqfscyza7pyxxp7bn1glprg6c9ph5p";
+       sha256 = "b7c09b9879f9d217ec3ab7777f8ffa9e6987f9b8e31ec0b6ab0006e665a52e6f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base binary containers glider-nlp text ];
@@ -2823,7 +2824,7 @@ self: {
      mkDerivation {
        pname = "ConfigFile";
        version = "1.1.4";
-       sha256 = "057mw146bip9wzs7j4b5xr1x24d8w0kr4i3inri5m57jkwspn25f";
+       sha256 = "ae087b359ff2945a62b671449227e0a811d143ee651179f4e7e9c66548e0f514";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl parsec ];
@@ -2837,7 +2838,7 @@ self: {
      mkDerivation {
        pname = "ConfigFileTH";
        version = "0.2";
-       sha256 = "1349vkrnl2z0cfcvdalqf77jajhz0izmnlsbiv84vvj23n04rj9h";
+       sha256 = "30c94c801d42ee4dd08e4b535b7f041f4a25cf7198aab69963e00b6af3dc898c";
        libraryHaskellDepends = [
          base ConfigFile parsec template-haskell
        ];
@@ -2850,7 +2851,7 @@ self: {
      mkDerivation {
        pname = "Configger";
        version = "0.1";
-       sha256 = "0fk7165abh4rw4jk6wy4f6y0qpakxlrs4mwrs3r2q7lz03jsyig2";
+       sha256 = "e245afe5009f1e2cf2d09957a233ed535d0cbc71c4733325e199c0a58a09673a";
        libraryHaskellDepends = [ base Dangerous MissingH mtl parsec ];
        description = "Parse config files";
        license = stdenv.lib.licenses.mit;
@@ -2862,7 +2863,7 @@ self: {
      mkDerivation {
        pname = "Configurable";
        version = "0.1.0.0";
-       sha256 = "1if0hff6fn7zjj1vh16gxf2kldibh1dkscm8n33d1admvpjpw9sb";
+       sha256 = "4b277ee5ddb5a9d0c6b0a8323d5b802b363a85ebcf04b88394ff58679c83c0c5";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/tel/Configurable";
@@ -2875,7 +2876,7 @@ self: {
      mkDerivation {
        pname = "ConsStream";
        version = "0.1";
-       sha256 = "1ywhrj2wq24my4cji5fm5cwb3j4yjwzch9hxncr7k989smjdmjpz";
+       sha256 = "ffcada64d509a57932b31d26c83e979ec8b1382bd5952819f19508cc85cc90fb";
        libraryHaskellDepends = [ base Stream ];
        homepage = "github";
        description = "Trivial re-export of Wouter Swierstra's Stream package, avoiding module name clash";
@@ -2887,7 +2888,7 @@ self: {
      mkDerivation {
        pname = "Conscript";
        version = "0.1.0.0";
-       sha256 = "0hiz3wjnvfp9n440kmwq7a88k7m7vq5s49nq85v520j7qnf4y82n";
+       sha256 = "56204f9cc54702517641d826a20bdea79e89903a98d70908b1e9ba6d251f3f42";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process ];
@@ -2902,7 +2903,7 @@ self: {
      mkDerivation {
        pname = "ConstraintKinds";
        version = "1.3.0";
-       sha256 = "0rhy5wq3v5hdryjn8pcsgqy4k772agj1rgq3021pjki7n3zm3dza";
+       sha256 = "eab751ffb0274e79830003bf1ce453e29c493c7e9a5d64a5cf0d963d302f1e66";
        libraryHaskellDepends = [ base dlist ghc-prim vector ];
        jailbreak = true;
        description = "Repackages standard type classes with the ConstraintKinds extension";
@@ -2914,7 +2915,7 @@ self: {
      mkDerivation {
        pname = "Consumer";
        version = "1.2";
-       sha256 = "03ham35vh49h780h7dxb6zs85rkdlry0nwi8wp6p9iamw952xi6i";
+       sha256 = "d1c42e4ae255c574cde528720b7ca66de682f437abb703013a3011b8cba80a0e";
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://src.seereason.com/ghc6103/haskell-consumer";
        description = "A monad and monad transformer for consuming streams";
@@ -2927,7 +2928,7 @@ self: {
      mkDerivation {
        pname = "ContArrow";
        version = "0.0.5";
-       sha256 = "1paj8wx2k86i5xb11scbyca4fb2fnxgln5d661mcwxvs0i91jj1b";
+       sha256 = "2b481952047a77ce6a30a6154b5fb74e2c4714f38be910562fd1a0293a4752dd";
        libraryHaskellDepends = [ arrows base ];
        jailbreak = true;
        description = "Control.Arrow.Transformer.Cont";
@@ -2939,7 +2940,7 @@ self: {
      mkDerivation {
        pname = "Contract";
        version = "0.1";
-       sha256 = "027dv53jrfk46dmiidnnrrdvhyin60i862znp414213w72yjrbhh";
+       sha256 = "10ae2cbd387c044102b9f60b832230367ab85bced6b6186b3364ba2c47d9ed08";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://www.cs.kent.ac.uk/~oc/contracts.html";
        description = "Practical typed lazy contracts";
@@ -2952,7 +2953,7 @@ self: {
      mkDerivation {
        pname = "Control-Engine";
        version = "1.1.0.1";
-       sha256 = "1jyj42xrja8ic3lajgrfmign9n2bdfkaplnlhzcifd5wf30qj6fa";
+       sha256 = "ca1989c170bc3417d987d4d2aba66b4bd8645fac2e3fa9e860112999bb20d2cb";
        libraryHaskellDepends = [ base BoundedChan stm ];
        homepage = "http://www.haskell.org/haskellwiki/Control-Engine";
        description = "A parallel producer/consumer engine (thread pool)";
@@ -2967,7 +2968,7 @@ self: {
      mkDerivation {
        pname = "Control-Monad-MultiPass";
        version = "0.1.0.0";
-       sha256 = "0pdayn1v9dw5600fgzlag2bqy1p68i4yzpxzqna9p7jk0iyvfy0i";
+       sha256 = "1178b77d04539e9b94c5bfdfef4944e6068f97788afee7003085b7b483f5aa5d";
        libraryHaskellDepends = [
          array base containers Control-Monad-ST2 mtl
        ];
@@ -2988,7 +2989,7 @@ self: {
      mkDerivation {
        pname = "Control-Monad-ST2";
        version = "0.1.0.1";
-       sha256 = "02nl4dbh7lk2gx5vacnn9mlcbs5j4b68jj0db94j51mqwj22y0zk";
+       sha256 = "f3032f84e4b88622495a0d4889cc22b2e8c5684dd632b54b7f62d2035723d40a";
        libraryHaskellDepends = [ array base QuickCheck SafeSemaphore ];
        testHaskellDepends = [
          array base mtl QuickCheck SafeSemaphore test-framework
@@ -3005,7 +3006,7 @@ self: {
      mkDerivation {
        pname = "CoreErlang";
        version = "0.0.2";
-       sha256 = "1wiwk4947h5x2swi9k6bh4zyhp849ibxhc5458kn5vipngrp4k78";
+       sha256 = "e84c72f3b337ee62272aa430d8574c045de83f81cbcc14b916bdc04312993cf2";
        libraryHaskellDepends = [ base parsec pretty ];
        homepage = "http://github.com/amtal/CoreErlang";
        description = "Manipulating Core Erlang source code";
@@ -3021,7 +3022,7 @@ self: {
      mkDerivation {
        pname = "CoreFoundation";
        version = "0.1";
-       sha256 = "0mra2aswl0gfic19l55i63a6il6i13caph56fdk8g7shcw3j605l";
+       sha256 = "b400230767509f876673a6c0abd808d1d068d430b1149a028bee01cab5122a57";
        libraryHaskellDepends = [
          base bytestring containers deepseq filepath network property-list
          tagged text time transformers vector
@@ -3039,7 +3040,7 @@ self: {
      mkDerivation {
        pname = "Coroutine";
        version = "0.1.0.0";
-       sha256 = "1cad9j7ivd6mfcff44773v8z3z2ilparxfikbnv0gab6csc9p1nw";
+       sha256 = "dc869b986666a907b65d33ba9ed5a551fcf1d11ee710e21c73d5b41d8f4c4db1";
        libraryHaskellDepends = [ base ];
        description = "Type-safe coroutines using lightweight session types";
        license = stdenv.lib.licenses.bsd3;
@@ -3053,7 +3054,7 @@ self: {
      mkDerivation {
        pname = "CouchDB";
        version = "1.2.2";
-       sha256 = "0imzpwrynr54as3bzx2222vqcnmmrzx6dis5qa2vmclf6yd8q1z8";
+       sha256 = "e8078c9a378eb2ba85c245c766facfb55a86b71042f4bf8656a464eb33bfbf46";
        libraryHaskellDepends = [
          base bytestring containers HTTP json mtl network network-uri
          utf8-string
@@ -3073,7 +3074,7 @@ self: {
      mkDerivation {
        pname = "Craft3e";
        version = "0.1.0.10";
-       sha256 = "1qrsjkwr1njdsyiryskdjmy6nhbbzin4r0ja7mib26injzmrx45p";
+       sha256 = "b7909eeb97361ab1623d4a824c6cfc6b416b7c956d6a9fa3d74dda90f9943ae3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -3091,7 +3092,7 @@ self: {
      mkDerivation {
        pname = "Crypto";
        version = "4.2.5.1";
-       sha256 = "0rmgl0a4k6ys2lc6d607g28c2p443a46dla903rz5aha7m9y1mba";
+       sha256 = "6ad5e0533d0aaaf2f30049d166881a845cc190780798661815da9b4914a0af66";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -3113,7 +3114,7 @@ self: {
      mkDerivation {
        pname = "CurryDB";
        version = "0.1.1.0";
-       sha256 = "1mjgxbmwf37wqbdbhfbq3pj4mmgkf1w0lv49gagx1m5yny21q3l3";
+       sha256 = "830e1c84b7bed4d09f7a896c0a7870f3d54ae41d7839b8dac2fc0cc7ebea4fd6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -3142,7 +3143,7 @@ self: {
      mkDerivation {
        pname = "DAG-Tournament";
        version = "0.1";
-       sha256 = "1yyr63r6ziljvcxacs7zn66lnkzgmlvcr36ic60c3z1r2rd2nflk";
+       sha256 = "933a2b5a1639fcc18061d18ccc36adef4f4b8db1ff68a63adb92c66ff230d9fb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -3163,7 +3164,7 @@ self: {
      mkDerivation {
        pname = "DAV";
        version = "1.0.7";
-       sha256 = "0bkwcgxisp1ipnc1v63z16mcw40dy6fxszjrr2b251sfah5h1ad8";
+       sha256 = "a8a9000b544e872296c8597edd9df10d10ceaa097f981d98bd315c1dfb637c2e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -3187,7 +3188,7 @@ self: {
      mkDerivation {
        pname = "DBlimited";
        version = "0.1.1";
-       sha256 = "1lic2ml1q16idg9rk2ky2xi030kln4m8nz1vyvy7w37qxhddvl2f";
+       sha256 = "4ed0dd1aecf80c7efcf63b7c8b2ab174820162177e8a99d36bd1041c68152cd2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers parsec ];
@@ -3202,7 +3203,7 @@ self: {
      mkDerivation {
        pname = "DBus";
        version = "0.5.1";
-       sha256 = "0l212yy40w8sjkv5m7rnd24fkihvnadv7szf10g9n5r34m4jb6lh";
+       sha256 = "909a25492523179b1e08eeebb39bb21bc6e98868369f5af6941a7140bc174150";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/alexkay/hdbus";
        description = "D-Bus bindings";
@@ -3215,7 +3216,7 @@ self: {
      mkDerivation {
        pname = "DCFL";
        version = "0.1.6.0";
-       sha256 = "10f0c3y0y39rmvvvrvz426srb18wsv4qfzzx9r9zjac2m14b96jx";
+       sha256 = "5d9ab448a88229f9534efd7f87c9d61c8595b511e4efbcf7ae390d0ffc60c081";
        libraryHaskellDepends = [ base deepseq HUnit parallel random ];
        homepage = "https://github.com/Poincare/DCFL";
        description = "Communication Free Learning-based constraint solver";
@@ -3230,7 +3231,7 @@ self: {
      mkDerivation {
        pname = "DMuCheck";
        version = "0.3.0.2";
-       sha256 = "00dhky0hnda85lvrs155jgwxnpqfm36cqakj3wp0yrn2xlz383ad";
+       sha256 = "4d0d343eedc2660f2e1f722acccca80e5fdbf993a5049d372d48350b819fb001";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -3249,7 +3250,7 @@ self: {
      mkDerivation {
        pname = "DOM";
        version = "2.0.1";
-       sha256 = "13zj4jg78y5s05gfi3j83izxw6d2csbvznd7mq900zlv4xwddw2b";
+       sha256 = "4bf0d678279b7e0012aea7d9bf9766a219de7f1c488ee85e01ba78749e24f28f";
        libraryHaskellDepends = [ base mtl WebBits ];
        jailbreak = true;
        description = "DOM Level 2 bindings for the WebBits package";
@@ -3264,7 +3265,7 @@ self: {
      mkDerivation {
        pname = "DP";
        version = "0.1.1";
-       sha256 = "03gjwkzna2mf0a103g0kiwnbd9ra6hss6vm73i7vhl87zgrwsh8z";
+       sha256 = "1f41cdf3fb0751b84f1ca76ea335342aa7b62c8f13bc018202ae0a65ffe4f20d";
        libraryHaskellDepends = [
          array base containers list-tries mtl QuickCheck safe semiring
        ];
@@ -3284,7 +3285,7 @@ self: {
      mkDerivation {
        pname = "DPM";
        version = "0.3.0.0";
-       sha256 = "03rf2s9qinfahqsc870cxv5117g4hmqza2dbj7s5hi50sh32xkjc";
+       sha256 = "4cce2e06d4a04458f491ab09f57185e49d10caee0c1cc43486cad98893162e0f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -3309,7 +3310,7 @@ self: {
      mkDerivation {
        pname = "DRBG";
        version = "0.5.4";
-       sha256 = "03nkcrjkaj36bs4sasf1286ca3wam1ndahq3y88bib2q0h5psqdx";
+       sha256 = "bd617d0b0458acb810f20343d56ca88a0fc50c12c169a5895e6648356566d30e";
        libraryHaskellDepends = [
          base bytestring cereal cipher-aes128 crypto-api
          cryptohash-cryptoapi entropy mtl parallel prettyclass tagged
@@ -3332,7 +3333,7 @@ self: {
      mkDerivation {
        pname = "DSA";
        version = "1";
-       sha256 = "0js67dj7dls7ivvdw1hvxc1cw0rl4bvnfip16ygmgwg98344bfwl";
+       sha256 = "94bb45c840e9f1579f37e14667f7223403ce02eb1b06def68e47d376643b464b";
        libraryHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types ghc-prim
          integer-gmp SHA tagged
@@ -3357,7 +3358,7 @@ self: {
      mkDerivation {
        pname = "DSH";
        version = "0.12.0.1";
-       sha256 = "1m69phqjrb4wg6fji5plw1mghyz7jzzqixljaa5gb5s0cy5gfkfy";
+       sha256 = "de4df78a674097f58a5292f688ff97e77bf86ae0f496289d799cac2c31bcc9d4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -3381,7 +3382,7 @@ self: {
      mkDerivation {
        pname = "DSTM";
        version = "0.1.2";
-       sha256 = "084yscqbwypkb32avjm2b92a7s4qpvps3pjfgpy14sligww3hifb";
+       sha256 = "cb4538387f916a12fc7d4edea1efbe98e8a3445aa2caadc458f37abe30d39e20";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -3400,7 +3401,7 @@ self: {
      mkDerivation {
        pname = "DTC";
        version = "1.1.0.1";
-       sha256 = "0m3697zw0j2l9fxx8flr83n8x03pva1hn74rgilgxdrsrifhds5l";
+       sha256 = "b4e8065dcc3ab7fe687c991c0b83da77808eec40993ad4bb4b5448c0ff496654";
        libraryHaskellDepends = [ base haskell-src-exts ];
        homepage = "https://github.com/Daniel-Diaz/DTC";
        description = "Data To Class transformation";
@@ -3413,7 +3414,7 @@ self: {
      mkDerivation {
        pname = "Dangerous";
        version = "0.3.2";
-       sha256 = "0pnywhva7s5xp9xlxk6h56n3fjflna6zhk5qdb8wax7i1qbp85vs";
+       sha256 = "7a1774170ef174c5d16ab84cf88db2d44937ac29d0cc4e7bbabde8a336e4de5e";
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Monads for operations that can exit early and produce warnings";
        license = stdenv.lib.licenses.mit;
@@ -3428,7 +3429,7 @@ self: {
      mkDerivation {
        pname = "Dao";
        version = "0.1.0.2";
-       sha256 = "1f7svqvlywj0jgzssdgrhvbbfm0yjnq0qr2c7xqc501y6wr3msym";
+       sha256 = "d5eb3a32373e80c2703f4c640cb0951e54b7d686f935adff9340724f37defab8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -3456,7 +3457,7 @@ self: {
      mkDerivation {
        pname = "DarcsHelpers";
        version = "0.1";
-       sha256 = "02nqaphxd3xlh191wxpx3rcixms70v8d6h4a3lxg24d7lcyf82n3";
+       sha256 = "c30ae43ca3a711f13a1d8a40d3d00647d71e591efd761e5280b48fd6e155d80a";
        libraryHaskellDepends = [ base HaXml mtl parsec safe xml-parsec ];
        jailbreak = true;
        description = "Code used by Patch-Shack that seemed sensible to open for reusability";
@@ -3471,7 +3472,7 @@ self: {
      mkDerivation {
        pname = "Data-Hash-Consistent";
        version = "0.1.1";
-       sha256 = "1vblfzndfzb458j6ygfcq0mfzzc5c87gwpmcx31v10fxpqnfmm65";
+       sha256 = "c5d4ea2cbedd81b0c3e8ac5efe0e6285fdef2ac0cc3d6f242a647dd7ec7774ed";
        libraryHaskellDepends = [
          base bytestring digest utf8-string vector vector-algorithms
        ];
@@ -3485,7 +3486,7 @@ self: {
      mkDerivation {
        pname = "Data-Rope";
        version = "0.2";
-       sha256 = "0zvp9h06f2ylkn325d35cap3y67zpfyc70nqad3426p64p1xmnrw";
+       sha256 = "3cdbdac325e61a414653d882c3bcbbff183fae6265b422869dd40b67004c777f";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
@@ -3500,7 +3501,7 @@ self: {
      mkDerivation {
        pname = "DataTreeView";
        version = "0.1.1";
-       sha256 = "0z54kr79bjv8w1gnsrxq9vkwdhasdwzrsi48q7ndsg8x7k30gpdj";
+       sha256 = "b2dd07c63c1d3dddecc188449d3f6f5ac1c6e74eb8676d5fe068cb954e9ea47c";
        libraryHaskellDepends = [
          base bytestring containers deepseq glib gtk lifted-base ListLike
          MissingH monad-control mtl syb transformers-base
@@ -3519,7 +3520,7 @@ self: {
      mkDerivation {
        pname = "Deadpan-DDP";
        version = "0.9.3.0";
-       sha256 = "03vs4pvca80wwgfgm1a6hbincvsmlxyyz319ihk9pw22zqiq5qvs";
+       sha256 = "7ae38223fe42f09b268c298cef7da7556f66e3824685fadce31c20c5f6257a0f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -3544,7 +3545,7 @@ self: {
      mkDerivation {
        pname = "DebugTraceHelpers";
        version = "0.12";
-       sha256 = "0yjv3awhp3jsfqqn36xc0jpisp4hfypx3hkibad3yqrrn61bkzy8";
+       sha256 = "c8ffb982b139633f9a5a71c2d1af77905c1daf04ac9b6131765a8e0bb91a5b7a";
        libraryHaskellDepends = [ base mtl ];
        description = "Convenience functions and instances for Debug.Trace";
        license = "GPL";
@@ -3557,7 +3558,7 @@ self: {
      mkDerivation {
        pname = "Decimal";
        version = "0.4.2";
-       sha256 = "0qa2z2lq1hrvakhyhj624mg8sd05ikhb66zwpa6x9vcyji93dxf5";
+       sha256 = "c5f53652949eedd48dbafc1bb3e08c05348d5e25c248e8e1543bc380a9f84261";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base deepseq HUnit QuickCheck test-framework test-framework-hunit
@@ -3573,7 +3574,7 @@ self: {
      mkDerivation {
        pname = "DecisionTree";
        version = "0.0";
-       sha256 = "14yprfh2b5x7dswp6kyaym3z2f32nqvgrfhvwsiv7brxq80cfvbd";
+       sha256 = "6d6dc700c23dafb3a3e61bbafc36b66238f147f5ca4f73b96ea79725a0cbd793";
        libraryHaskellDepends = [ base containers ];
        homepage = "http://page.mi.fu-berlin.de/~aneumann/decisiontree.html";
        description = "A very simple implementation of decision trees for discrete attributes";
@@ -3586,7 +3587,7 @@ self: {
      mkDerivation {
        pname = "DeepArrow";
        version = "0.4.0";
-       sha256 = "1jbvb8yk291iimpqi8h302r8554k4j2p3k42znzppv1wqrbhvjyc";
+       sha256 = "cccb0d57c63cec7bbffd82cc718524939482b20003a2886f8d3124313d5a7bc9";
        libraryHaskellDepends = [ base haskell-src mtl TypeCompose ];
        homepage = "http://haskell.org/haskellwiki/DeepArrow";
        description = "Arrows for \"deep application\"";
@@ -3600,7 +3601,7 @@ self: {
      mkDerivation {
        pname = "DefendTheKing";
        version = "0.3.1";
-       sha256 = "09wzab0343m55xq4dxfv0f9lwpd5v97mymd6408s6p82xa2vqlzw";
+       sha256 = "fc53bc85ea025da31120a6555f4fdaa55d4e9303dbf546702fa50e32c0529f27";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -3618,7 +3619,7 @@ self: {
      mkDerivation {
        pname = "DescriptiveKeys";
        version = "0.0.4";
-       sha256 = "0ywipcmnr3ysmx8m61yrymyn10lnizjfkk2q2scdfkrkgh7ayj7v";
+       sha256 = "fb48af0e7c334fd7981658cce9e48f9682607df5d9075351afda8f6c2bbb917b";
        libraryHaskellDepends = [ base containers xmonad xmonad-contrib ];
        homepage = "https://bitbucket.org/dibblego/descriptive-keys/";
        description = "A library for specifying xmonad key bindings with functionality";
@@ -3632,7 +3633,7 @@ self: {
      mkDerivation {
        pname = "Dflow";
        version = "0.0.1";
-       sha256 = "00gzs5fdybfrvqidw4qzk6i69qzq4jaljzhb49ah2hsv3gqjr1iq";
+       sha256 = "38862cf11b5b430155220b7e499524f8e364a2991f13de22ded92ddf5cd1ff01";
        libraryHaskellDepends = [ base containers QuickCheck stm time ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-quickcheck2
@@ -3647,7 +3648,7 @@ self: {
      mkDerivation {
        pname = "Diff";
        version = "0.3.2";
-       sha256 = "13iqqmpadcm7fvqwbfrz94w030rvjh66w2bdls1253128ac2n0vz";
+       sha256 = "7f032b9842228c2282a66d096e0c943b830138493fbbc5f176a7b2a66ec5388e";
        revision = "1";
        editedCabalFile = "86ab9f6bcb253cabff2673437995faa4c130be7c3898df778b27a801c5361328";
        libraryHaskellDepends = [ array base pretty ];
@@ -3660,7 +3661,7 @@ self: {
      mkDerivation {
        pname = "DifferenceLogic";
        version = "0.1.0.4";
-       sha256 = "0ylpn6bksf6alxzk45cg88ff8xgffh88x3csvjlhb6zn8ik0w99a";
+       sha256 = "2a250e6644f69b05a9dc9a8d8e1074ee75e41c428f15327fa7ca383d97b1977a";
        libraryHaskellDepends = [
          base containers fgl FirstOrderTheory HUnit
        ];
@@ -3678,7 +3679,7 @@ self: {
      mkDerivation {
        pname = "DifferentialEvolution";
        version = "0.0.2";
-       sha256 = "0z16g40n369d2wqljnrkmpd18149ny8nh2pd13hkkjnq5n6k209w";
+       sha256 = "3c01318d2dd8ca39e108ed0a6891b7890414daad335b4931172d99610179267c";
        libraryHaskellDepends = [
          base deepseq fclabels mtl mwc-random parallel primitive vector
        ];
@@ -3696,7 +3697,7 @@ self: {
      mkDerivation {
        pname = "Digit";
        version = "0.0.3";
-       sha256 = "0cdsmy9km9wpywqprdymn9bd982ba859px2giswz41xh6pbjri8w";
+       sha256 = "1cc52cd735b007f2b98e4ff49b0a524ba0d456b2d5b77c31f797a73a93afba31";
        libraryHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
@@ -3714,7 +3715,7 @@ self: {
      mkDerivation {
        pname = "DigitalOcean";
        version = "0.1.1.0";
-       sha256 = "09sh0j1dk366nkq3pwgsxi8zcka9p3f38bsw6nfzr7q4chjjblz4";
+       sha256 = "e4d3252564049ffc9d355c2f34dcb8494df651ecfaf13bf0b4c68cd982045027";
        libraryHaskellDepends = [
          aeson base bytestring containers exceptions lens mtl text
          transformers unordered-containers vector wreq
@@ -3730,7 +3731,7 @@ self: {
      mkDerivation {
        pname = "DimensionalHash";
        version = "0.1.5.2";
-       sha256 = "0bbg9w5n3b296g884y8qvgzsndqhzwh0mkn3dlp9nx4a7i321c97";
+       sha256 = "27b120463c8a749b2e6dc3ce0a20ff1037abffdb187982d03349ac610b4f6f2d";
        libraryHaskellDepends = [ base ];
        description = "An n-dimensional hash using Morton numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -3742,7 +3743,7 @@ self: {
      mkDerivation {
        pname = "DirectSound";
        version = "0.0.0";
-       sha256 = "1x78y1na375nwgk4izsjprj3yrg0xbrhqv6nrzfbvbfdyqlf5kyz";
+       sha256 = "dfcfe228f6cdadbddccfd66c0cf3eae0653f64be52ff48e6e3b69ca16cf0e8f4";
        libraryHaskellDepends = [ base Win32 ];
        librarySystemDepends = [ dsound ];
        homepage = "http://code.haskell.org/~bkomuves/";
@@ -3759,7 +3760,7 @@ self: {
      mkDerivation {
        pname = "DisTract";
        version = "0.2.5";
-       sha256 = "0pnlk09jsallyparwdfcy7jmqjjiprp2pqlg9agp6xbw5xmnkzwb";
+       sha256 = "8bff696b2f7c75739f4a8fe22b6ebe514a5ce5f1cc359ed5f5942a2d1398d45e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -3779,7 +3780,7 @@ self: {
      mkDerivation {
        pname = "DiscussionSupportSystem";
        version = "0.11.0.3";
-       sha256 = "0iqcv3b06r9sqj1adxfq08vq5mlq4b7z88c2cw4qa7l9xw2p2js3";
+       sha256 = "434b7105ef891e8509678221f4cf2298d6823702d8f5a682c43a6503d6d80c47";
        libraryHaskellDepends = [
          base blaze-html blaze-markup html parsers
        ];
@@ -3795,7 +3796,7 @@ self: {
      mkDerivation {
        pname = "Dish";
        version = "0.0.0.5";
-       sha256 = "1xhz0yb8xrjdznvx5prpl7r8k73n78n6gmshqbraq5jdh3vcnisx";
+       sha256 = "5d47cbf6804d16acf2c250d7672c3a769c89f2a137dfd2b7fd4de68e96071ff6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -3811,7 +3812,7 @@ self: {
      mkDerivation {
        pname = "Dist";
        version = "0.3.0.0";
-       sha256 = "00h0cxlxk72k829w8cf2gi2y4v4qj9bdzdmvnphnvc9wz5pyiz26";
+       sha256 = "46fce86ff93cb16de1b5bbb6df5692986ce2457cc231c49340539cd969670002";
        libraryHaskellDepends = [ base containers MonadRandom ];
        testHaskellDepends = [ base containers MonadRandom ];
        homepage = "https://github.com/wyager/Dist";
@@ -3826,7 +3827,7 @@ self: {
      mkDerivation {
        pname = "DistanceTransform";
        version = "0.1.2";
-       sha256 = "0c77sbx6qls8wfhv0wbappbkgfab046ls8mqs32qj02k549s6fk5";
+       sha256 = "653aa31329530089c5d0b8224d0d014bb937d7bd6a71b0a1e348536cfad2e730";
        libraryHaskellDepends = [ base primitive vector ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit vector
@@ -3840,7 +3841,7 @@ self: {
      mkDerivation {
        pname = "DistanceUnits";
        version = "0.1.0.1";
-       sha256 = "0ls6rq4nqn3z9h9lagl8sff9q94zfm6gssa2jj1zfyfxl5869bas";
+       sha256 = "5aad6450a1dd79f783944269fd4c759f249c9cd3883e45134c7f586c09ce4653";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/gambogi/DistanceUnits";
        description = "A comprehensive distance library";
@@ -3856,7 +3857,7 @@ self: {
      mkDerivation {
        pname = "DnaProteinAlignment";
        version = "0.0.0.1";
-       sha256 = "00c74anpm3varyf0man1i213dksxvh2p32xsp4rqijkbnxpkjbx3";
+       sha256 = "a32f396fb76bca8833b9ba8b7105dc5dcf368288c1aa0a9ccf6a8f7aad228701";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -3882,7 +3883,7 @@ self: {
      mkDerivation {
        pname = "DocTest";
        version = "0.2.0.1";
-       sha256 = "1w9r50cyiz31fn4dmlh3qmmpv9qapxgg70c10a86m6sxdl75q827";
+       sha256 = "47205c0e6d5d9b6a90028181f35ebf0aa77d6bc503d2da887561fce8192839f1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -3900,7 +3901,7 @@ self: {
      mkDerivation {
        pname = "Docs";
        version = "1.0.0";
-       sha256 = "1hjdznp29kwj9cca0jxr3dds9cnfbss6sgn52wym2380az3jcvnz";
+       sha256 = "df6e26c757000d513d17c53e6db45eceb2a45b1bb94ba0184b92cf24aefd4dc2";
        libraryHaskellDepends = [ base html ];
        homepage = "http://ddiaz.asofilak.es/packages/Docs.html";
        description = "Documentation types library";
@@ -3914,7 +3915,7 @@ self: {
      mkDerivation {
        pname = "DrHylo";
        version = "0.0.2";
-       sha256 = "1cs7zqz0yzdyj3vn38cfh1lj90xnxm24q8lml457f2yia4z7l6h7";
+       sha256 = "071a7a3e51d10b770aa195224c44edb6832469808ea161f790be7d0f3efe47b3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -3933,7 +3934,7 @@ self: {
      mkDerivation {
        pname = "DrIFT";
        version = "2.4.2";
-       sha256 = "1w0wfmrjifidl2qz998ig07afd4p6yp890lwl8as57bay490nakl";
+       sha256 = "742a0b12f16a9da215a29c8284ae379734a70e7811a5f4b1a02dba2873751cf0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -3951,7 +3952,7 @@ self: {
      mkDerivation {
        pname = "DrIFT-cabalized";
        version = "2.3.0";
-       sha256 = "0jk7qmlgjw69w38hm91bnyp8gyi1mjmrq4vyv7jv3y69rk0fi6wl";
+       sha256 = "949be8c0ccc9f8b1e5d97e139cabac21fa87aeb72ba40ad1e0c970f968c5674a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base old-time process random ];
@@ -3966,7 +3967,7 @@ self: {
      mkDerivation {
        pname = "Dung";
        version = "1.1";
-       sha256 = "1higdpqg599lfc92m7dd4zy98l9vjg5xr4n4qjv0wifszj8lrsgb";
+       sha256 = "ebe94c91fcda450eb6c4c492dccb933b5194fc27ad9d2a127334a5f2f06d2fc2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cmdargs containers parsec ];
@@ -3985,7 +3986,7 @@ self: {
      mkDerivation {
        pname = "Dust";
        version = "2.3.1";
-       sha256 = "0j2pm2ram7idh46mi6jv0whk4rx0bicvsvayrn3arnq65zk2mavj";
+       sha256 = "72ab2ae62f06dbac86cd5e6dbd595ca0673221075b9a580d812d9eaab2a85748";
        libraryHaskellDepends = [
          base binary bytestring cereal containers crypto-api directory
          Dust-crypto entropy ghc-prim network random random-extras random-fu
@@ -4011,7 +4012,7 @@ self: {
      mkDerivation {
        pname = "Dust-crypto";
        version = "0.1";
-       sha256 = "112prydwsjd32aiv3kg8wsxwaj95p6x7jhxcf118fxgrrg202z9w";
+       sha256 = "3c7d01c4cbf975874270ac4379bab92549c5bbe6e8cdb1a312a349cd9bcf5784";
        libraryHaskellDepends = [
          base binary bytestring cereal containers crypto-api cryptohash
          directory entropy ghc-prim network random random-extras random-fu
@@ -4036,7 +4037,7 @@ self: {
      mkDerivation {
        pname = "Dust-tools";
        version = "1.3.2";
-       sha256 = "1g1l7h5400f9qckhj4yw2zwwjjkqz5w1fgnc9gxa7rdl37wgxwn4";
+       sha256 = "c4f2fef819b4e5a3fa4bcc3e1778f9784ac9f917dc130927c3c901400a3c34bc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -4062,7 +4063,7 @@ self: {
      mkDerivation {
        pname = "Dust-tools-pcap";
        version = "1.3.1";
-       sha256 = "1swykscl17qy17qy38y6zc47sbiyaszh9m4qwn7d9sckfa6azsdr";
+       sha256 = "b9e9af8c7293e9d48ee598d404bf563e2e7d08fbc6a3e1f1091e9f40999e9eeb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -4081,7 +4082,7 @@ self: {
      mkDerivation {
        pname = "DynamicTimeWarp";
        version = "0.1.0.0";
-       sha256 = "0m58bq2jvnr17kdapfydd063af6w5vdyzxad5izk0cj0gids5hk7";
+       sha256 = "67c2a25b7c4032307f2c4df5efdb2edc38350c68cdbbabda3c21db2d055ea854";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base vector ];
@@ -4100,7 +4101,7 @@ self: {
      mkDerivation {
        pname = "DysFRP";
        version = "0.1";
-       sha256 = "1jw1s2imd2qhh9i0m7sm1zhy876bgp1pcrh4jcf5dilvqnhvv4j1";
+       sha256 = "4192bda1c59bc6561c93046676c37dcb1ce4e10f559f0a6282108b56a3d081cb";
        libraryHaskellDepends = [
          base contravariant mtl time transformers
        ];
@@ -4114,7 +4115,7 @@ self: {
      mkDerivation {
        pname = "DysFRP-Cairo";
        version = "0.1";
-       sha256 = "1pg6gwyrlvp6z08ab1qp783z9gm0xhnh337shf443f1bwbcz9m7f";
+       sha256 = "eed4f4d9e22bb8418883fa8c012deca0bef4073a1787a510f8e66e9a3d7fe6dd";
        libraryHaskellDepends = [ base cairo DysFRP gtk mtl ];
        homepage = "https://github.com/tilk/DysFRP";
        description = "dysFunctional Reactive Programming on Cairo";
@@ -4129,7 +4130,7 @@ self: {
      mkDerivation {
        pname = "DysFRP-Craftwerk";
        version = "0.1";
-       sha256 = "0rhm7ya1h43dwa83fcvnc8nd9da7ji6qlwzsa9ngv7pqvs7aamy1";
+       sha256 = "c157a58edef89efd6c52fa738a4d9447b5d42c6276333790e26d1018943f1566";
        libraryHaskellDepends = [
          base cairo containers craftwerk craftwerk-gtk DysFRP DysFRP-Cairo
          gtk
@@ -4145,7 +4146,7 @@ self: {
      mkDerivation {
        pname = "EEConfig";
        version = "1.0";
-       sha256 = "1bkkzj1d0j4nisdl9jfmadjx32w35ipdw3k12krhzzlf5aiwnrf1";
+       sha256 = "c165cba32a8efe0ff314610ede6e2c838bd16553d5c9449b8e9648d082fc73ae";
        libraryHaskellDepends = [ base containers ];
        description = "ExtremlyEasyConfig - Extremly Simple parser for config files";
        license = stdenv.lib.licenses.bsd3;
@@ -4158,8 +4159,8 @@ self: {
      }:
      mkDerivation {
        pname = "Earley";
-       version = "0.8.3";
-       sha256 = "0czdpgyxw3n0603hmd8kl8dnz9800df1lnkkf8a95cjd8nx3k8fv";
+       version = "0.9.0";
+       sha256 = "5ec955f00c872cc585bc2dd82fec137f53b095fde73a498e2a0ca7e0eb8140aa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
@@ -4176,7 +4177,7 @@ self: {
      mkDerivation {
        pname = "Ebnf2ps";
        version = "1.0.14";
-       sha256 = "0dv7lbw3nb3wyrrq8q4wd26i445ylwiixhhzdl574sw58mw60rk3";
+       sha256 = "6366607845856b720a6d1fc21e23a7be10128d689c608473f67c2c3bf8a26737";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -4193,7 +4194,7 @@ self: {
      mkDerivation {
        pname = "EdisonAPI";
        version = "1.2.2.1";
-       sha256 = "1r8xfsqz58s6x7026yrjafcbjkwsjg6fpcj6gbcpidw5hymymqfp";
+       sha256 = "d7e1eaab8785b778d97a46b2ebcc939a4fb99853327b23c0e946a3f2b1761de5";
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://rwd.rdockins.name/edison/home/";
        description = "A library of efficent, purely-functional data structures (API)";
@@ -4207,7 +4208,7 @@ self: {
      mkDerivation {
        pname = "EdisonCore";
        version = "1.2.2.1";
-       sha256 = "0yj68glq50qkn2ckhhq7q5y5kbwb5lh08z1kgksc61wds22a87pz";
+       sha256 = "ff1ea484d08d07c3f47c337c04202d8baf597cc107433899b0138382e943467a";
        libraryHaskellDepends = [
          array base containers EdisonAPI mtl QuickCheck
        ];
@@ -4224,7 +4225,7 @@ self: {
      mkDerivation {
        pname = "EditTimeReport";
        version = "1.0";
-       sha256 = "11a922535h6jvg79cv03jz6sn93h7jhqfrf9wi9x8arak9l06j70";
+       sha256 = "e04803689a2a2bd453e4c96587a13c7024abcd97036c96cedbd2c0328a104985";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -4244,7 +4245,7 @@ self: {
      mkDerivation {
        pname = "EitherT";
        version = "0.2.0";
-       sha256 = "1vry479zdq1fw7bd4d373c7wf2gg0aibkyb03710w7z2x86chssw";
+       sha256 = "5c6bc80ceae21f0ec21960f9b9a202ef09c70f1b6734d2d6e12ee0f6d3213eef";
        revision = "1";
        editedCabalFile = "a1c6f78c9a4379af0738a6d4dee5d1781099c5c56acb0b39c45ad23b256e8c6e";
        libraryHaskellDepends = [
@@ -4268,7 +4269,7 @@ self: {
      mkDerivation {
        pname = "Elm";
        version = "0.13";
-       sha256 = "1l6p00h0717blwvia0gvqpsakq8jy44fxc6brr4qxs5g4yjcjnmh";
+       sha256 = "b05ac9a427afe88e49cecbb0ee08f112e1a9f4c5fb011537a7eb84032000d7d0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -4303,7 +4304,7 @@ self: {
      mkDerivation {
        pname = "Emping";
        version = "0.6";
-       sha256 = "131h71fgn0zbsmbqmvbfl57is0dbm37xsi5g87gpjgq0k2cq0nkr";
+       sha256 = "795a809998003f79df41af44ddcfa8ab011d4fa16eed8a57d5eb03fb5c38308c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -4320,7 +4321,7 @@ self: {
      mkDerivation {
        pname = "Encode";
        version = "1.3.7";
-       sha256 = "141iddlpvjp6hqjx5c5dm3ldf7yk64iqbhaiv51np27y6pazfgb5";
+       sha256 = "653df7d535fe886b43d951c1852331d31fd7e8a8adb0d22586e6ca7d696b3190";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal containers mtl ];
@@ -4336,7 +4337,7 @@ self: {
      mkDerivation {
        pname = "EnumContainers";
        version = "0.1";
-       sha256 = "14ckpgaviny3c0d1jn3blkkpri0cm8ac264y7kak965knjccq0k8";
+       sha256 = "6802cc98b4b39834d53c9e18c114aa0cc47ce7a46b58191a60c3dbb8d5bb9391";
        libraryHaskellDepends = [ base containers deepseq ];
        jailbreak = true;
        description = "Simple Enum-class-based int containers";
@@ -4348,7 +4349,7 @@ self: {
      mkDerivation {
        pname = "EnumMap";
        version = "0.0.2";
-       sha256 = "1v3jp1l95kybvdlpvp6bd0ryihxrvlnpkqz7fl1n4vazhkqk6zjz";
+       sha256 = "5f7e33f1845f6d620375e7e3792dddb9c3e83368cbdc7d69dbcbcf9268b872ec";
        libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "More general IntMap replacement";
@@ -4363,7 +4364,7 @@ self: {
      mkDerivation {
        pname = "Eq";
        version = "1.1.3";
-       sha256 = "0hcfjzlirw11jl752g2jncb71i8sk2w3nqjm4ykc64f5awj1hi23";
+       sha256 = "4344182457c511c3a62755623bb8981ac57016b3523c510e9521f01ce9978e41";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -4381,7 +4382,7 @@ self: {
      mkDerivation {
        pname = "EqualitySolver";
        version = "0.1.0.2";
-       sha256 = "0ynzzl9mmn5hxkcndx60lnxn455nm065v7nk7rhpq1yigwz0cl1g";
+       sha256 = "2f50063e7fd1077c613ed39e5d0ca8b61462bba5c0f466d9ecb0d85a13fddf7a";
        libraryHaskellDepends = [
          base containers HUnit mtl union-find-array
        ];
@@ -4398,7 +4399,7 @@ self: {
      mkDerivation {
        pname = "EsounD";
        version = "0.2";
-       sha256 = "1d22k3836c92xd6qg5pvjhgrhbajd438z3pfjvi0bl2wdrkzddjr";
+       sha256 = "59b6f6676e5cd005e296ee8e8f0669522d981f94fb96874deb223133d09842b4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -4413,12 +4414,12 @@ self: {
      }) {};
 
   "EstProgress" = callPackage
-    ({ mkDerivation, base, mtl }:
+    ({ mkDerivation, ansi-terminal, base, mtl }:
      mkDerivation {
        pname = "EstProgress";
-       version = "0.2.0.0";
-       sha256 = "0xq2r7mbgs00hf1c8c2ffgsk7jjzd932br59rgkg06qym14dp3b3";
-       libraryHaskellDepends = [ base mtl ];
+       version = "0.3.0.0";
+       sha256 = "2371b9ee209aa190a95125fcd1a14a6d1e60d986c2554c149f0aeb21d894b197";
+       libraryHaskellDepends = [ ansi-terminal base mtl ];
        homepage = "http://alkalisoftware.net";
        description = "Methods for estimating the progress of functions";
        license = stdenv.lib.licenses.bsd3;
@@ -4434,7 +4435,7 @@ self: {
      mkDerivation {
        pname = "EtaMOO";
        version = "0.2.0.0";
-       sha256 = "0v7qq4d6zd3nr0856q3crivqqfq5q0rdppzf48jgzc9fzas6jl9n";
+       sha256 = "365169b4fa2eb1ff2422eedfdb32c0053b8c77cc6c605310c876b46f1ac1f86c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -4457,7 +4458,7 @@ self: {
      mkDerivation {
        pname = "Etage";
        version = "0.1.12";
-       sha256 = "1ik8j7s1z64dpdg251m8dr7k7llkhxydlf6l6dhyv9ra55dg4n20";
+       sha256 = "4058f25a292aa7ed6133d438da7c8793d2334f6ea886225ebb8d981ff49168c6";
        libraryHaskellDepends = [
          base containers ghc mtl operational random SafeSemaphore time unix
        ];
@@ -4474,7 +4475,7 @@ self: {
      mkDerivation {
        pname = "Etage-Graph";
        version = "0.1.8";
-       sha256 = "0xzsvah4nhxv5hw8p0sv1pjy4p30xa3f2afs8jncx20n918mk9l2";
+       sha256 = "82a65951481688ceac44da29e186ea605ce2e50d5b838b382cbb434ba0dafa77";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers Etage fgl mtl ];
@@ -4493,7 +4494,7 @@ self: {
      mkDerivation {
        pname = "Eternal10Seconds";
        version = "0.2";
-       sha256 = "0kh1zjqr9cmx7xyfk2y3iwr3x3zvh3pb4ghfjz3xr2wwg2rmymxp";
+       sha256 = "b7575fb3789c8bdcc7970e3eb2ee80fb8f3e328fc38be97c3fbdb294b1fc014e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 SDL SDL-mixer ];
@@ -4510,7 +4511,7 @@ self: {
      mkDerivation {
        pname = "Etherbunny";
        version = "0.3";
-       sha256 = "0cm98x626cqwri9qsfhwi6s50kg433a1p78y9na70z868p6n27nj";
+       sha256 = "d21e61cd45067d70944d1e9d1bd418e44d50b4891c3a8d53cc1c33234c47a932";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -4531,7 +4532,7 @@ self: {
      mkDerivation {
        pname = "EuroIT";
        version = "2010.2.5";
-       sha256 = "1a6bvi0y1pnzpx0x3arrardgkbs0m8ssfwcyxf6fim87wcb0jcgv";
+       sha256 = "fb310916e307d5e88ceb9e71a735aa40aff95a5639abd141bfdfdee041dccba8";
        libraryHaskellDepends = [ base ];
        description = "Library for using euro currency, italian language";
        license = stdenv.lib.licenses.bsd3;
@@ -4546,7 +4547,7 @@ self: {
      mkDerivation {
        pname = "Euterpea";
        version = "1.0.0";
-       sha256 = "0cfcsrm47sb1z4zdmipipg9p31hzicwzpqdpa2m985j3hwm42vds";
+       sha256 = "ba6d412a87431694aa50b7e1fb398b1f8671d3bbf1c6da3ef961e9436ad6cc31";
        revision = "1";
        editedCabalFile = "61d418cc49621a3373fd25f547d2dd6b76b700dcc4b7e38b2f055b5c6f781afd";
        libraryHaskellDepends = [
@@ -4569,7 +4570,7 @@ self: {
      mkDerivation {
        pname = "EventSocket";
        version = "0.1";
-       sha256 = "03wf8msjcpj8bpnjr7f1wcbag018kap544jwz9a7vnllamps92xd";
+       sha256 = "ad8ba46f5594da7d54fa5c1252ae9a2880a716e3c19d2ced5d485e2675458e0f";
        libraryHaskellDepends = [
          base bytestring containers haskell98 mtl network
        ];
@@ -4587,7 +4588,7 @@ self: {
      mkDerivation {
        pname = "Extra";
        version = "1.46.3";
-       sha256 = "1xmwp9cp905nzx5x858wyacjpppn76mkfpkxksdhlq9zhmkp5yyh";
+       sha256 = "d0fb7267853f610a9b9e7d5e37ab39f6de2b99f21c15d44bffb6807459babcf6";
        libraryHaskellDepends = [
          base bytestring bzlib containers directory filepath HUnit mtl
          network-uri old-locale old-time pretty process pureMD5 QuickCheck
@@ -4606,7 +4607,7 @@ self: {
      mkDerivation {
        pname = "FComp";
        version = "1.0.2";
-       sha256 = "0hkmh3vjibbzkh004b4zig2rvvnh6l2cdqsmxbpyjbwqryzraxrn";
+       sha256 = "367795bfcf982fe9efea55e3c60435d0ee9dc58b9f2c02009c7fad28f7807542";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -4630,7 +4631,7 @@ self: {
      mkDerivation {
        pname = "FM-SBLEX";
        version = "3.0.1";
-       sha256 = "1cb3qq8yqn19xpsjbczxs8rablkczaigs6hp2vypsjyw5s8sqza8";
+       sha256 = "487dac912edc4b7dfd16171afda2fa6cd2a532d2fdb325f5ed2958ec11c663b1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers haskell98 ];
@@ -4645,7 +4646,7 @@ self: {
      mkDerivation {
        pname = "FModExRaw";
        version = "0.2.0.0";
-       sha256 = "0l2zhlxh88wy9y9gk1aa03yy65iw8zigr4pgp63mn2mqcrskfszl";
+       sha256 = "f46b377566b80a5b87b9ef92fce2473c16e3fd004a85f9924f9e23043b855f50";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fmodex64 ];
        homepage = "https://github.com/skypers/hsFModEx";
@@ -4659,7 +4660,7 @@ self: {
      mkDerivation {
        pname = "FPretty";
        version = "1.0";
-       sha256 = "1lc31mid1a9pqb9py9f6nvzvlixhngpficczvhpdxlws3fn9drga";
+       sha256 = "eae596ac1b9ad3de2edc9fb1e8eeb3b047baffb6c6257fd3c237a9d0620d83d1";
        libraryHaskellDepends = [ base containers ];
        homepage = "http://www.cs.kent.ac.uk/~oc/pretty.html";
        description = "Efficient simple pretty printing combinators";
@@ -4672,7 +4673,7 @@ self: {
      mkDerivation {
        pname = "FTGL";
        version = "2.1";
-       sha256 = "0b76798bxxivjrjx92qiv8ghsg3j8rhvfms8sl19ji6fip2h3fw2";
+       sha256 = "82bb01c58dce449902d54857b76146723c0d1fda118bd465963bf6be503ae62c";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
@@ -4686,7 +4687,7 @@ self: {
      mkDerivation {
        pname = "FTGL-bytestring";
        version = "2.0";
-       sha256 = "11y8g2gi4g6x639c9wfj2224f9vgaf88hdd1f981al53kzf7y2y2";
+       sha256 = "c20b7fdc9fa350155072a1358890536f27478410d2f1c4d230dd3c129f78c887";
        libraryHaskellDepends = [
          base bytestring StateVar-transformer transformers
        ];
@@ -4702,7 +4703,7 @@ self: {
      mkDerivation {
        pname = "FTPLine";
        version = "1.4.0.0";
-       sha256 = "0nnwfn4jxnxfr8q8gq16xn0ixjmw7dnxznsh8lbk41lwfsr9j4n5";
+       sha256 = "c51299b2769c0632174550dbdf6d3bbcca1e81ed26e08730caaedb2e8975dc5a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -4720,7 +4721,7 @@ self: {
      mkDerivation {
        pname = "Facts";
        version = "0.1.2";
-       sha256 = "018g9qj6nmabjbl4rakqjp32vwfyak1wk5cx3s0amm53wnf2mz75";
+       sha256 = "e5fc2a9ce5a3d4aa801e9d95c9c354def12dc69578aa4ce8924b556b244e0f05";
        libraryHaskellDepends = [
          AC-Angle base containers digits QuickCheck template-haskell
        ];
@@ -4734,7 +4735,7 @@ self: {
      mkDerivation {
        pname = "FailureT";
        version = "15778.1";
-       sha256 = "1qhjqswx4qyfan3rpvvl1hgmf369krqprlr6x20hp34r2qw9s135";
+       sha256 = "65049d3816998c0b81e826d37c719ec90c571f0c74ef9b8755ce63d2b9c612e2";
        libraryHaskellDepends = [ base base-unicode-symbols mmtl ];
        description = "Failure Monad Transformer";
        license = stdenv.lib.licenses.publicDomain;
@@ -4748,7 +4749,7 @@ self: {
      mkDerivation {
        pname = "FastxPipe";
        version = "0.2.0.0";
-       sha256 = "1img1aivadrdljsixzll3qpdzvbjqy18mcwanli6w70ch556jsa9";
+       sha256 = "4969694a810c1c6e22b58ab38a82c772eddf2e1e94fe1eb5a42d37b5a30aafc6";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring pipes pipes-attoparsec
          pipes-bytestring
@@ -4763,7 +4764,7 @@ self: {
      mkDerivation {
        pname = "FenwickTree";
        version = "0.1.2.1";
-       sha256 = "0g7hhkim16wsjf8l79hqkiv1lain6jm8wpiml1iycra3n9i2s5ww";
+       sha256 = "9c172d62b24365e663a0355e8eaa34362a1a769c18a64391939a9b50e384f03c";
        libraryHaskellDepends = [ base QuickCheck template-haskell ];
        testHaskellDepends = [ base QuickCheck template-haskell ];
        homepage = "https://github.com/mgajda/FenwickTree";
@@ -4779,7 +4780,7 @@ self: {
      mkDerivation {
        pname = "FermatsLastMargin";
        version = "0.1";
-       sha256 = "07sryfn26afisrsgnzrp0vjshspa40pvl4214mzb5mdm9h5c63f8";
+       sha256 = "c80dc30a4cb5d5b27e254110ba2f20ea6aa8e506377ffb74d6d12923acf3591f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -4799,7 +4800,7 @@ self: {
      mkDerivation {
        pname = "FerryCore";
        version = "0.4.6.4";
-       sha256 = "1dxhbrmcl36dg14lyihpy8fd8sdsmawh70fykllcjk3fh7a11wgp";
+       sha256 = "f7f110d4816e4cc9289dde8103b9aaba69d41cf217464f4978cd0cca6a5eb0b7";
        libraryHaskellDepends = [
          base containers HaXml mtl parsec pretty TableAlgebra
          template-haskell
@@ -4816,7 +4817,7 @@ self: {
      mkDerivation {
        pname = "FieldTrip";
        version = "0.2.7";
-       sha256 = "1161mz8443j1jr8pnkh6gz6w99cd16hk94ypsh8vzmpbfp40i5rb";
+       sha256 = "2b9708c875ebd6bf11d4d79334a1098da5c4cd7f064e7b5196410e42d0afc184";
        libraryHaskellDepends = [
          base GLUT graphicsFormats MemoTrie old-time OpenGL TypeCompose
          vector-space
@@ -4834,7 +4835,7 @@ self: {
      mkDerivation {
        pname = "FileManip";
        version = "0.3.3.1";
-       sha256 = "0dhl7zkyy4p0pgmraci82krph6hqrq1bwmx7wgm9agrnpdyg4dxi";
+       sha256 = "b137f27cbb363f95eae3a757be02ce181a78f314283295ebbbe012efe73f1436";
        libraryHaskellDepends = [
          base bytestring directory extensible-exceptions filepath mtl unix
        ];
@@ -4850,7 +4851,7 @@ self: {
      mkDerivation {
        pname = "FileManipCompat";
        version = "0.18";
-       sha256 = "0c017r7bzgf1mdbk0iyr2amhm41q89mcq69fkszskjhy4z9wl6v0";
+       sha256 = "601bcad3271ecaa9bf9e2e19cc6a4238900aab12d9473057abc1bdbf4e3e0130";
        libraryHaskellDepends = [
          base bytestring directory filepath mtl unix-compat
        ];
@@ -4866,7 +4867,7 @@ self: {
      mkDerivation {
        pname = "FilePather";
        version = "0.2.0";
-       sha256 = "1rwj8hqys01cn14d754wyl2vr19mvh4vsg2f3hrqjqiafkij90xd";
+       sha256 = "ad8324e3742a6289331c4e3cbd09dc3585bc05f59c94d348b02c00ed314492e7";
        libraryHaskellDepends = [
          base comonad comonad-transformers data-lens directory filepath mtl
          transformers
@@ -4883,7 +4884,7 @@ self: {
      mkDerivation {
        pname = "FileSystem";
        version = "1.0.0";
-       sha256 = "0qyzwpvajvqywbnfhj3vzb5xl4wjjywyqr4szywd8qwb7kly29w6";
+       sha256 = "8627e1e93c8b63d4b8ff9a64ecb9979213dacbfa7b48e8ece21e6fa9f6e5df63";
        libraryHaskellDepends = [
          base binary bytestring directory filepath mtl old-time
        ];
@@ -4901,7 +4902,7 @@ self: {
      mkDerivation {
        pname = "Finance-Quote-Yahoo";
        version = "0.8.0";
-       sha256 = "1d786xkrj0h270mfwxxkfxysmk78xkz2jdj8w1iin3hgy3ramifz";
+       sha256 = "dfc5aaf2f00f0e1b63e0483629feece8ccaa7d77b377ee2a380202996737e8b4";
        libraryHaskellDepends = [
          base bytestring http-conduit network old-locale time
        ];
@@ -4918,7 +4919,7 @@ self: {
      mkDerivation {
        pname = "Finance-Treasury";
        version = "0.1.2";
-       sha256 = "17wxdwj8162c0yawz4anjs6d3fjbhs3b05wk319acblksjx60sal";
+       sha256 = "546960bad4932ea652189317b086864bbad18c965691cf95074c9880246f9d9f";
        libraryHaskellDepends = [
          base containers HTTP HTTP-Simple hxt hxt-filter network old-locale
          time
@@ -4934,7 +4935,7 @@ self: {
      mkDerivation {
        pname = "FindBin";
        version = "0.0.5";
-       sha256 = "197xvn05yysmibm1p5wzxfa256lvpbknr5d1l2ws6g40w1kpk717";
+       sha256 = "279c7967e0803ca3b9a0a1956ce7ba9b9a2294eb9f971bea8a557b5f80ddfda4";
        libraryHaskellDepends = [ base directory filepath ];
        homepage = "https://github.com/audreyt/findbin";
        description = "Locate directory of original program";
@@ -4946,7 +4947,7 @@ self: {
      mkDerivation {
        pname = "FiniteMap";
        version = "0.1";
-       sha256 = "1kf638h5gsc8fklhaw2jiad1r0ssgj8zkfmzywp85lrx5z529gky";
+       sha256 = "7ebe24ca2f3dd3822ef7bfbaf9917c5a831c9a8a527005e97488e957201ac6cd";
        libraryHaskellDepends = [ base haskell98 ];
        description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562";
        license = stdenv.lib.licenses.bsdOriginal;
@@ -4958,7 +4959,7 @@ self: {
      mkDerivation {
        pname = "FirstOrderTheory";
        version = "0.1.0.6";
-       sha256 = "1941ickx8aj3qbkry4gz8ni6snh26gkdrgabpx9z588518q4x27i";
+       sha256 = "f1884e300a05a1f253bf4bbddce633025a6da245ff119fe7c2432ad4278b81a4";
        libraryHaskellDepends = [ base containers Proper ];
        jailbreak = true;
        description = "Grammar and typeclass for first order theories";
@@ -4971,7 +4972,7 @@ self: {
      mkDerivation {
        pname = "FixedPoint-simple";
        version = "0.6.1";
-       sha256 = "0qfys17q3i56l20wzkpr8inq130j67kya022ynf0sgbc86avlrcn";
+       sha256 = "9665ba95416c3d0d9cf54200e5e731128c806d44f9cecf81a0a6c4814fd0de61";
        libraryHaskellDepends = [ base deepseq template-haskell ];
        homepage = "https://github.com/TomMD/FixedPoint";
        description = "Fixed point, large word, and large int numerical representations (types and common class instances)";
@@ -4985,7 +4986,7 @@ self: {
      mkDerivation {
        pname = "Flippi";
        version = "0.0.5";
-       sha256 = "1w25h3n3cnsl9dvr5s94jzf5qxyx0dl0v8dmqv2rkwwm7s2hdbl9";
+       sha256 = "89ae06853e95f399c5c6b5a10d6803dd775cdc9724e992774b545b36ec8045f0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -5002,7 +5003,7 @@ self: {
      mkDerivation {
        pname = "Focus";
        version = "0.1.2";
-       sha256 = "1f1ch6mxgaam1i4ryd1av879y2f8wn3wmg47h23w2l0pvgmxgrj1";
+       sha256 = "41e6d7ebdb1750c1878087bcca87e5c8099f0eda2a349f490c55a9d7ab812cb8";
        libraryHaskellDepends = [ base MissingH split ];
        description = "Tools for focusing in on locations within numbers";
        license = stdenv.lib.licenses.mit;
@@ -5013,7 +5014,7 @@ self: {
      mkDerivation {
        pname = "Folly";
        version = "0.1.3.0";
-       sha256 = "0ygxgshgaddxfibl0paqm9sm4cq47247hr43awq8gib8zyg3amgi";
+       sha256 = "f155359eff68c5873057836478883804335275aa585d405774bd35f5a07efd79";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -5031,7 +5032,7 @@ self: {
      mkDerivation {
        pname = "FontyFruity";
        version = "0.5.1.1";
-       sha256 = "064c9qq82r2kmsabciigyzp04hjqmpnc52xfshgiy77jq7k0jk2y";
+       sha256 = "5e4c09e6c1f21c1f1fd4ae8bc2ecad584202eef72f46b694ae536481304e8c18";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath text
          vector
@@ -5048,7 +5049,7 @@ self: {
      mkDerivation {
        pname = "ForSyDe";
        version = "3.1.1";
-       sha256 = "0ggwskyxpdrjny0rz61zdp20r5vzig8ggmqxf0qa8gljvvfp6bhp";
+       sha256 = "172e73ddde923ea430701dd7f7d08b7f970cc46d3f989f81b732b7dbfdd4fc3d";
        libraryHaskellDepends = [
          array base containers directory filepath mtl old-time
          parameterized-data pretty process random regex-posix
@@ -5065,7 +5066,7 @@ self: {
      mkDerivation {
        pname = "ForkableT";
        version = "0.1.0.2";
-       sha256 = "0lzrggy1j15cajb6k5qhz2s8ddngr3hhhsj781ya45fcx82mngvj";
+       sha256 = "723f5b05eacc15a27c40476a08e1c8cfb686b4f81097699654ac0419fc7bf953";
        libraryHaskellDepends = [ base monad-control mtl resourcet ];
        homepage = "https://github.com/exFalso/ForkableT/";
        description = "Forkable monad transformers";
@@ -5081,7 +5082,7 @@ self: {
      mkDerivation {
        pname = "FormalGrammars";
        version = "0.2.1.0";
-       sha256 = "10b7hcwzxnl31wdfdbakcaapihhnwx8lwj0znidvgkk7hyirnx2n";
+       sha256 = "56749ba38767ceb75bb41f484e51e716c278956253ade61a0f83dafe39836781";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -5102,7 +5103,7 @@ self: {
      mkDerivation {
        pname = "Foster";
        version = "1.1.2";
-       sha256 = "0w4jnxk32c0pvrh2k7y93fckvrkcj3q8w4yi12zsgj9k1ic7yb6a";
+       sha256 = "ca2c7f580c33c9a7bf08d1138ef0906ce63d991bc99f2960de17303166b79270";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -5119,7 +5120,7 @@ self: {
      mkDerivation {
        pname = "FpMLv53";
        version = "0.1";
-       sha256 = "0h7vi940zrl2fqv8c2g0vj0gh9qfm2jf8c2drclx37zax5kb0r6p";
+       sha256 = "d764b066e9ea9fd129cb4d30e4a4a80e27f880dce00986367682e60f488afb40";
        libraryHaskellDepends = [ base HaXml ];
        homepage = "http://www.fpml.org/";
        description = "A binding for the Financial Products Markup Language (v5.3)";
@@ -5133,7 +5134,7 @@ self: {
      mkDerivation {
        pname = "Frames";
        version = "0.1.2.1";
-       sha256 = "0vw1fh0nqk3s5p08j4cnwb95jgzxk140wvszjlmr3ms9m0xcx61y";
+       sha256 = "3e98ce3aa849d7912b955f6f0e4898fd3f59d2e2961189c02d7a4c6c0174816f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -5149,7 +5150,7 @@ self: {
      mkDerivation {
        pname = "Frank";
        version = "0.3";
-       sha256 = "1p99ab5qgvyh13iy9wgv0a8lqx6s2mygx0s6z51m5mzi9nxf0qw1";
+       sha256 = "8163e0ba4df1d75243f94683fe7c15da744c9102fbf1e4e308d0ef87cb5229dd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl newtype she void ];
@@ -5164,7 +5165,7 @@ self: {
      mkDerivation {
        pname = "FreeTypeGL";
        version = "0.0.4";
-       sha256 = "10sivjxppn138805iwka54cfby59nc39ja30nx2w3762fybz71af";
+       sha256 = "4e85f39777c29cc145b760289906b3a9f8e518296af258004223d87bbbdc5183";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base freetype2 OpenGL ];
@@ -5179,7 +5180,7 @@ self: {
      mkDerivation {
        pname = "FunGEn";
        version = "0.4.6.1";
-       sha256 = "0v9y9a82d2h34ai5hhwnalgfs5m2s909blr4f30dawgryn8gnbfp";
+       sha256 = "d72dfb90f5f971d5c07024d39540d2a216ed1e55964358a222038a26904a3e6d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base GLUT OpenGL random ];
@@ -5198,7 +5199,7 @@ self: {
      mkDerivation {
        pname = "Fungi";
        version = "1.0.6";
-       sha256 = "181m78c0m1ldnkpng0sps9fbkpq5j4p57j0km34g5kwasxhmwfcc";
+       sha256 = "8c395e61d78acff2c8a813c8532e9105dfb95cd2578367efb48d860a183a35a0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -5216,7 +5217,7 @@ self: {
      mkDerivation {
        pname = "GA";
        version = "1.0";
-       sha256 = "1nsmpph27yv0anrhhfqbpdqs2rrdbhm0jxzs3kk6ab32zb3ivhp2";
+       sha256 = "e2c21dc7fa622c65e61cfa77092a5c2d67a171bb0b3b08b35560fb23e0bd55db";
        libraryHaskellDepends = [ base directory random transformers ];
        homepage = "http://boegel.kejo.be";
        description = "Genetic algorithm library";
@@ -5228,7 +5229,7 @@ self: {
      mkDerivation {
        pname = "GGg";
        version = "0.1.0.2";
-       sha256 = "129z0391zm7v4ixwwq2irqhpb43s5pd0imgh3i9i5l9ahq9lk1h7";
+       sha256 = "07864913862ad112531cf0d508da2d7a907521ce5160ce7b24fbd41fd2003f89";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bimap ];
@@ -5243,7 +5244,7 @@ self: {
      mkDerivation {
        pname = "GHood";
        version = "0.0.4";
-       sha256 = "0ab6dngl8gjkj8wvjvrjijgqb59aq88c1ra2z92iqky2d0plrfca";
+       sha256 = "8ab94c2f68c24f1c45fa42e5c010c22a95859f8c326fb93992533e449f6d6629";
        libraryHaskellDepends = [ array base process ];
        homepage = "http://www.cs.kent.ac.uk/people/staff/cr3/toolbox/haskell/GHood";
        description = "A graphical viewer for Hood";
@@ -5256,7 +5257,7 @@ self: {
      mkDerivation {
        pname = "GLFW";
        version = "0.5.2.4";
-       sha256 = "1aac9xz943h3jjbx22kmvzmbzqw7k6cl2qsh1kr4nnx83pxrxz28";
+       sha256 = "48fc9efb1da85b4bf20c506341999987e3bfeadf750ad19794030e927e4f4ca9";
        libraryHaskellDepends = [ base OpenGL ];
        librarySystemDepends = [ libX11 mesa ];
        homepage = "http://haskell.org/haskellwiki/GLFW";
@@ -5269,7 +5270,7 @@ self: {
      mkDerivation {
        pname = "GLFW-OGL";
        version = "0.0";
-       sha256 = "118hpgdp8rb0jlvlibxcaia4jjjdrn8xpzyvj109piw63g44n910";
+       sha256 = "20244bc81b86c79b4090dbffdb91cd4d4a495454acaf483795606574dbbb1085";
        libraryHaskellDepends = [ base mtl OGL ];
        librarySystemDepends = [ libX11 libXrandr ];
        homepage = "http://haskell.org/haskellwiki/GLFW-OGL";
@@ -5286,7 +5287,7 @@ self: {
      mkDerivation {
        pname = "GLFW-b";
        version = "1.4.7.2";
-       sha256 = "1hjsv6yqkwqi18c1vha105jl56xjvb5dqwqs4bgjkk99qcqq70rd";
+       sha256 = "2d838331c329cd29df221a73dccadab29b42650141c11d180a11f389bdd95ac2";
        libraryHaskellDepends = [ base bindings-GLFW ];
        testHaskellDepends = [
          base bindings-GLFW HUnit test-framework test-framework-hunit
@@ -5302,7 +5303,7 @@ self: {
      mkDerivation {
        pname = "GLFW-b-demo";
        version = "1.0.6";
-       sha256 = "01qf0bsv3q60m3as763q49hd3nm5lkady48nc214zjsx31x8by59";
+       sha256 = "a9f8857a185dcb4f82601611dfd4a4a5dad160227898a3d5a8c0e0b1f5020e07";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -5318,7 +5319,7 @@ self: {
      mkDerivation {
        pname = "GLFW-task";
        version = "0.2.0";
-       sha256 = "110iwxp6xs3wj4bva8m6mgz7iq90zrcz2dnjlq3s2x3in2m4818p";
+       sha256 = "170544aab07174a107a6d236f159fe20e178feaba622b517917ce86e6ee71184";
        libraryHaskellDepends = [
          base GLFW monad-task OpenGL transformers
        ];
@@ -5333,7 +5334,7 @@ self: {
      mkDerivation {
        pname = "GLHUI";
        version = "1.1.0";
-       sha256 = "043xw36hrwzc6xdr5vlydbsv5m8675vnk8pfxycr7qixzwljn0aa";
+       sha256 = "4a012b29ff3de29399efeea269773906d5b2f56a9eee925b37ecf30ccde07d10";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ libX11 mesa ];
        description = "Open OpenGL context windows in X11 with libX11";
@@ -5345,7 +5346,7 @@ self: {
      mkDerivation {
        pname = "GLMatrix";
        version = "0.1.0.1";
-       sha256 = "13n80rplyl73ahk8cxgvs9gf655l063sd55spx0zvhw774vvxwv4";
+       sha256 = "64f3be373987c3fd41bfba94a68701b414e35ed2fb75862654e3504f6f06c88e";
        libraryHaskellDepends = [ base OpenGLRaw ];
        jailbreak = true;
        homepage = "https://github.com/fiendfan1/GLMatrix";
@@ -5358,7 +5359,7 @@ self: {
      mkDerivation {
        pname = "GLURaw";
        version = "1.5.0.1";
-       sha256 = "1wf8nav298wsjl417vgp94wdvh38g8hxvb20iyivxhi0g1iw4lhv";
+       sha256 = "1b52c2637820c2bea38f40acdd217a68c0dd3849f7ed1308959aa324b6b2c8f1";
        libraryHaskellDepends = [ base OpenGLRaw transformers ];
        librarySystemDepends = [ freeglut mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
@@ -5373,7 +5374,7 @@ self: {
      mkDerivation {
        pname = "GLUT";
        version = "2.7.0.1";
-       sha256 = "0kcw8nf0k0ql220yy6sp3cf0vhij378j94l3ffrz3nynxq5xh7pv";
+       sha256 = "fb1ed80beed6dbf1b373839224d11932c20d1c1b571bef81101483099c459c4d";
        libraryHaskellDepends = [
          array base containers OpenGL OpenGLRaw StateVar transformers
        ];
@@ -5391,7 +5392,7 @@ self: {
      mkDerivation {
        pname = "GLUtil";
        version = "0.8.6";
-       sha256 = "15z6l1r4dn8jp5b7awzw16zxd3lh297iwab712ah0dx8m3hk0df3";
+       sha256 = "c33530e1a8a83700950867291e4f12908ed6bf09fc737556b912d94672a0e697";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath JuicyPixels
          linear OpenGL OpenGLRaw transformers vector
@@ -5408,7 +5409,7 @@ self: {
      mkDerivation {
        pname = "GPX";
        version = "0.8.0";
-       sha256 = "08qvl4l81bgjx40nmlrmb0csxa3xjj4l0dbq9bzcq65p403xs1pk";
+       sha256 = "f306dd0720b718ccfe4a78354089947da8ae195835d36a01e9f2ad8028a11b23";
        libraryHaskellDepends = [
          base comonad comonad-transformers containers data-lens hxt newtype
          xsd
@@ -5427,7 +5428,7 @@ self: {
      mkDerivation {
        pname = "GPipe";
        version = "1.4.1";
-       sha256 = "0w1xgn7pmz9pgpimsmy3fx66dax37qkd5a5q0yk1fh396dxsybx3";
+       sha256 = "a32faf7b33694017a607b8a8d2263ea3ab664c77c3575de37d37fd7a8f7d3d70";
        libraryHaskellDepends = [
          base Boolean containers GLUT list-tries OpenGL transformers Vec
          Vec-Boolean
@@ -5444,7 +5445,7 @@ self: {
      mkDerivation {
        pname = "GPipe-Collada";
        version = "0.1.4";
-       sha256 = "0aqvyv50gx0qx7icp70pw73gr3p6y05dkn347nqx82jc9dyxjghw";
+       sha256 = "1c3ed97d4b4c0ad4b13d64d8d90af0e68efcc6e1179ccbe2e918f407caf61b2b";
        libraryHaskellDepends = [
          array base containers GPipe HaXml mtl Vec
        ];
@@ -5462,7 +5463,7 @@ self: {
      mkDerivation {
        pname = "GPipe-Examples";
        version = "0.1";
-       sha256 = "0ir32fx0mk5hmmqilv6z89453rqcsgbs13a6ln4cydlkw5lbgv1k";
+       sha256 = "33ecb768e19336cf88a5468da0d7d30ce7514842df6c1a71adb0cc0aba132347";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -5478,7 +5479,7 @@ self: {
      mkDerivation {
        pname = "GPipe-TextureLoad";
        version = "1.0.4";
-       sha256 = "1yf74k3yvpj42ynivlkacp5zwxwsx3yyfxb2436ljrv3339kjkb4";
+       sha256 = "644d39d318636749cd206275e7fde89a77fecb656ad21dad1744deedc724c7f9";
        libraryHaskellDepends = [ base bitmap GPipe stb-image ];
        homepage = "http://www.haskell.org/haskellwiki/GPipe";
        description = "Load GPipe textures from filesystem";
@@ -5493,7 +5494,7 @@ self: {
      mkDerivation {
        pname = "GTALib";
        version = "0.0.6";
-       sha256 = "10l72wn8wdgcvpbcj10hmib6z0175ihsgvmwpp9akx4d6vpf2dz8";
+       sha256 = "e837e1ee368df4a9d2bdbceea7612c27806f56ac1004c9d6ddec358e2c178782";
        libraryHaskellDepends = [
          base containers deepseq parallel template-haskell
        ];
@@ -5516,7 +5517,7 @@ self: {
      mkDerivation {
        pname = "Gamgine";
        version = "0.5";
-       sha256 = "131pgif3x61agk6an27p33bnqi45zlyiwxivxkxdbzi82wckr0w0";
+       sha256 = "80833c191728fed5faec3b761e3dfd85446cd718f708abcc7c2a983e5c7c378c";
        libraryHaskellDepends = [
          array base bytestring composition cpphs data-lens directory
          filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show
@@ -5534,7 +5535,7 @@ self: {
      mkDerivation {
        pname = "Ganymede";
        version = "0.0.0.5";
-       sha256 = "1fmb6fpdfk21yxrvlgdg32qymzirfbygsq6p4jvm925kvpwqbcwk";
+       sha256 = "93b385f9ddb38854b724d760fdfc7239feeab118af3dba73f7414cd7ae33abba";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -5552,7 +5553,7 @@ self: {
      mkDerivation {
        pname = "GaussQuadIntegration";
        version = "0.1";
-       sha256 = "0v91q0m90338qpxg4hnvb7n6vm1jap3y1rvn9kyzmnxh03rarpx2";
+       sha256 = "a2dfacf200b0dbfafd4c76e7e0c75532d46dec59db42f2fac5680c902ac0216d";
        libraryHaskellDepends = [ base ];
        description = "Non-adaptive Gaussian quadrature for numeric integraton";
        license = stdenv.lib.licenses.bsd3;
@@ -5563,7 +5564,7 @@ self: {
      mkDerivation {
        pname = "GeBoP";
        version = "1.7.4.1";
-       sha256 = "0cldjrk26p2llyhsp1rcvzbgz5qg8k898fvmdxkfc9ihc5lsxxf5";
+       sha256 = "c5f5ae69613026e6666f753b94d0440f97ffd6df2c87aba1a7545c2366968d32";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -5584,7 +5585,7 @@ self: {
      mkDerivation {
        pname = "GenI";
        version = "0.24.3";
-       sha256 = "0gmig362ayxxqgj4m6g1r1i6q5zfg6j8bmvsd7i9kmqn12nl3l0p";
+       sha256 = "17d041ad0816d799e2697ad785a479ee176c62c8e1994ae4c3bd7b25cc78b13e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -5614,7 +5615,7 @@ self: {
      mkDerivation {
        pname = "GenSmsPdu";
        version = "0.1";
-       sha256 = "1vs1m78lp87mccqs3i80zpl121yb063vqxx6a4sqzkfxzhvjvcbz";
+       sha256 = "7fb12d37fcddcd8f3551a677bc8701cb0711e8fd00c5a13163f5a04bd1a941ef";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 QuickCheck random ];
@@ -5630,7 +5631,7 @@ self: {
      mkDerivation {
        pname = "Genbank";
        version = "1.0.3";
-       sha256 = "14rbknlc1bxrld04i7dc5dklng5sp0b1rbiilndw5cair0d67brb";
+       sha256 = "2baf631ac851b1c29ba531ae1c16b8ba3c4b672bac9d4840a3b9afc0a89d2b93";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -5646,7 +5647,7 @@ self: {
      mkDerivation {
        pname = "GeneralTicTacToe";
        version = "0.1.0.1";
-       sha256 = "0dng5shk5zs4j6lyjz971axrqziv6davpcyv509mz8fvdjn8q4kg";
+       sha256 = "6f128cac6cdba15f1328dbb3bb55333b7e9cbb0a277de9a99144ff32a12ecf36";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -5662,7 +5663,7 @@ self: {
      mkDerivation {
        pname = "GenericPretty";
        version = "1.2.1";
-       sha256 = "0bb70mic7srr7x8k83d1i0m0a32gm72zr78ccdf3ckchj9136php";
+       sha256 = "175e334292904d365c630c9dfcc5a94f0c052a88a10d34513f39ebc36205672d";
        libraryHaskellDepends = [ base ghc-prim pretty ];
        homepage = "https://github.com/RazvanRanca/GenericPretty";
        description = "A generic, derivable, haskell pretty printer";
@@ -5679,7 +5680,7 @@ self: {
      mkDerivation {
        pname = "GenussFold";
        version = "0.0.0.2";
-       sha256 = "1byshl3wa637nnvwxa80r9p1azgvgbczp5j77hpqaxacxkx1q0sm";
+       sha256 = "55031cfaec4c75852f3c4796fbd97afb7d156eca00a9ceb7b56718c50785daaf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -5702,7 +5703,7 @@ self: {
      mkDerivation {
        pname = "GeoIp";
        version = "0.3";
-       sha256 = "1q3km52w7qcrawbgaxvglb3x6rgc8f22c8rw8705lgcxxn9pjxm1";
+       sha256 = "a1767993ed9d3d5ac0413c23268443ec65d3c7a26f77f5165799e1c345a973e0";
        libraryHaskellDepends = [ base bytestring bytestring-mmap syb ];
        description = "Pure bindings for the MaxMind IP database";
        license = "unknown";
@@ -5714,7 +5715,7 @@ self: {
      mkDerivation {
        pname = "Geodetic";
        version = "0.4";
-       sha256 = "1nb0q5hs9qqgygw35rbvanbjf9l6vjxrl6l4jp9dqwlnl1kdd88q";
+       sha256 = "18a1d666a09672dcd295841a9abbdc86262797557be532f8f30fe3a461c160d9";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/geodetic/";
        description = "Geodetic calculations";
@@ -5726,7 +5727,7 @@ self: {
      mkDerivation {
        pname = "GeomPredicates";
        version = "0.1";
-       sha256 = "19scirh2hy9y9kv16pcp44v31cs3868ig28r8blj39gdv4wqxwcy";
+       sha256 = "9ef18e39d9eda521e942198917914143b3303621975d13f64c3e7928608e4ca7";
        libraryHaskellDepends = [ base ];
        description = "Geometric predicates";
        license = stdenv.lib.licenses.bsd3;
@@ -5737,7 +5738,7 @@ self: {
      mkDerivation {
        pname = "GeomPredicates-SSE";
        version = "0.2";
-       sha256 = "18mdaf2j1svklka5ms9ihj07d9l92ivqjk0y8jv0l9ni44hrhxcq";
+       sha256 = "9875982121d1260ab6441e4c89771489a676808431e95ad4a473eb208553ada2";
        libraryHaskellDepends = [ base GeomPredicates ];
        description = "Geometric predicates (Intel SSE)";
        license = stdenv.lib.licenses.bsd3;
@@ -5749,7 +5750,7 @@ self: {
      mkDerivation {
        pname = "GiST";
        version = "0.0.1";
-       sha256 = "0ykvsjqpi7pd81857n2gqycgpnm0j8dxnpf345h7pgzrkz10qi9f";
+       sha256 = "2e450cc29ff9bf7b6021c35ddb1b92a0dafb98c74fd8535040ed9e78b1d47b7a";
        libraryHaskellDepends = [ base text ];
        jailbreak = true;
        description = "A Haskell implementation of a Generalized Search Tree (GiST)";
@@ -5761,7 +5762,7 @@ self: {
      mkDerivation {
        pname = "GiveYouAHead";
        version = "0.2.2.3";
-       sha256 = "10f9yl62gwnjmb0mbfffdzhwscpwpvq9gj52zsrz8w6z6sbkijbf";
+       sha256 = "6ec9389736df70f4b3fea2c897f0befc32cde16fceb955c1aad2f2270cf5c981";
        libraryHaskellDepends = [ base directory extra old-time process ];
        homepage = "https://github.com/Qinka/GiveYouAHead/";
        description = "to auto-do somethings";
@@ -5775,7 +5776,7 @@ self: {
      mkDerivation {
        pname = "Glob";
        version = "0.7.5";
-       sha256 = "0hdyi49zp2yr4h4wgngl8ajrss1p309c3pn0alj543yrh33bnqq0";
+       sha256 = "0063bbc680d90f522455c0dec1121837689da542f4d9c70924d98bfb1389be41";
        revision = "1";
        editedCabalFile = "219b9caf1aaf9c2ab69ac75242f6017f0cd804a3370e0d63ac48777888fd909b";
        libraryHaskellDepends = [
@@ -5791,7 +5792,7 @@ self: {
      mkDerivation {
        pname = "GlomeTrace";
        version = "0.3";
-       sha256 = "0n1290ls68fsky3a80fvfdq6bycvmpn3i3kmflq6yn45qa959f0k";
+       sha256 = "13b85492c285586f3075758e38ecad9bf9657073db01a4869fda21a329482258";
        libraryHaskellDepends = [ array base GlomeVec ];
        homepage = "http://www.haskell.org/haskellwiki/Glome";
        description = "Ray Tracing Library";
@@ -5804,7 +5805,7 @@ self: {
      mkDerivation {
        pname = "GlomeVec";
        version = "0.2";
-       sha256 = "08hyiadkbkmcsd1g51xvxqzp6l94hnqqbz4r6yk0zk29iawq8610";
+       sha256 = "201884b98a49cc0fa63799fc85b1852451733feebb87f242d3acce359b8a1e22";
        libraryHaskellDepends = [ array base ];
        libraryPkgconfigDepends = [ llvm ];
        homepage = "http://www.haskell.org/haskellwiki/Glome";
@@ -5819,7 +5820,7 @@ self: {
      mkDerivation {
        pname = "GlomeView";
        version = "0.3";
-       sha256 = "0plglb289gadk8mqxgqj8n25xa6dql2jl0b8cm9v7q5rwykx0kbq";
+       sha256 = "784dd0a7e7b9e0b3536568012a05c5cda85e844512bf8e2b9a4dbd84c4a28f5e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -5836,7 +5837,7 @@ self: {
      mkDerivation {
        pname = "GoogleChart";
        version = "0.2";
-       sha256 = "0wfabsdn4agmg459srnknkwqb7ri5knj9npzgzhilybwrrqq46v9";
+       sha256 = "691b8271ce7c791ae17fffda24ed2c319f85f9b4d3669d0a79f529629b5eca71";
        libraryHaskellDepends = [ base ];
        homepage = "http://neugierig.org/software/darcs/browse/?r=google-chart;a=summary";
        description = "Generate web-based charts using the Google Chart API";
@@ -5850,7 +5851,7 @@ self: {
      mkDerivation {
        pname = "GoogleDirections";
        version = "0.3.0.1";
-       sha256 = "1x7k72iy8aa6r60p3hrqb8a4p5avyjh8czymrkarc3wpkc73bjb3";
+       sha256 = "63c9350e9b970f96d5ccd57f86a0f45b954b145a38c37181c94629e4a338f3f4";
        libraryHaskellDepends = [
          AttoJson base bytestring containers dataenc download-curl
        ];
@@ -5866,7 +5867,7 @@ self: {
      mkDerivation {
        pname = "GoogleSB";
        version = "0.1";
-       sha256 = "1gfjpxcjr9xqinha3wzdk101avjzyvji2xs5abkj9pj8lsrbh2w8";
+       sha256 = "880bb8b2a648de24e752457711e5f65f6e154098edf3a1a08db8a72c59bfd2bd";
        libraryHaskellDepends = [
          base binary Crypto haskell98 HTTP mtl network split
        ];
@@ -5880,7 +5881,7 @@ self: {
      mkDerivation {
        pname = "GoogleSuggest";
        version = "0.0.4";
-       sha256 = "1jqfd9zi4yp0kr506v71dlg5zgmvzqbxdsfjr2574ajx5xp2fjrb";
+       sha256 = "2b4b276e2f5d2a728ac8d2e9d617febbbe5f1e6de16c034a9ee07a127f6a0ecb";
        libraryHaskellDepends = [
          base dataenc download-curl utf8-string xml
        ];
@@ -5894,7 +5895,7 @@ self: {
      mkDerivation {
        pname = "GoogleTranslate";
        version = "0.0.5";
-       sha256 = "0hr0rjz7nx5rcy4h5pcbvh8sh9v4qvl9ffrqhnrcslh7ibvwbca6";
+       sha256 = "46b1c5f78a0752cdb285383b97e8c66427a811dc8bdd028967b9747bbecc2043";
        libraryHaskellDepends = [
          AttoJson base bytestring dataenc download-curl
        ];
@@ -5907,7 +5908,7 @@ self: {
      mkDerivation {
        pname = "GotoT-transformers";
        version = "1.0.0.1";
-       sha256 = "1w1w1p2cpndiilr002whm58bzqjh9cp9lw3jl7khdxh20c1dfzhy";
+       sha256 = "1e7ed7020302f606e7a172709a2e4b50e2bf50a9900b00328db1d9cbc40d3cf0";
        libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/gcross/GotoT-transformers";
@@ -5924,7 +5925,7 @@ self: {
      mkDerivation {
        pname = "GrammarProducts";
        version = "0.1.1.0";
-       sha256 = "026sjppwk0g10zyw64rds1fifdi7d6p7jzri35cl6hxc33fqdiy3";
+       sha256 = "c3c786dd18ac43435919317f79ae692736175dd02d13c3fd07e181c9ef95da08";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -5944,7 +5945,7 @@ self: {
      mkDerivation {
        pname = "Graph500";
        version = "0.4.0";
-       sha256 = "0lhn2r54488949gh5m5fgwrj2z30r9pf34860sikb6zq07gjz759";
+       sha256 = "a99c2fdf01f89b35a3060691e16eca607c21337faed4025f220921424a161652";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -5962,7 +5963,7 @@ self: {
      mkDerivation {
        pname = "GraphHammer";
        version = "0.3";
-       sha256 = "0fga3g2y38ylvmkgi57h4j5brc7gjxh8d183qfa2vhx8i4sr3pzm";
+       sha256 = "f5df913589a8c32d94c30385866097efb0bc8a24f094f866ddd4a3e1c51bea39";
        libraryHaskellDepends = [
          array base containers Graph500 mtl stm time
        ];
@@ -5978,7 +5979,7 @@ self: {
      mkDerivation {
        pname = "GraphHammer-examples";
        version = "0.3";
-       sha256 = "18p1dr08nq8dnvghkshihzra0p9ja0qa9bxbkm561jkrdpk3zndv";
+       sha256 = "bbd93fe66d79ca604a9dabafa43050325da0f28711ea09dfb60d618b406ee1a2";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -5994,7 +5995,7 @@ self: {
      mkDerivation {
        pname = "GraphSCC";
        version = "1.0.4";
-       sha256 = "1wbcx3wb02adb7l4nchxla3laliz0h5q074vfw4z0ic833k977bq";
+       sha256 = "789d93e6188845f009779b1c800b043f524587a21d324be8594d09b0f8e86cf1";
        libraryHaskellDepends = [ array base containers ];
        description = "Tarjan's algorithm for computing the strongly connected components of a graph";
        license = stdenv.lib.licenses.bsd3;
@@ -6008,7 +6009,7 @@ self: {
      mkDerivation {
        pname = "Graphalyze";
        version = "0.14.1.0";
-       sha256 = "0pyrhpl06lsppr8ch21crinkax7fh0k18wfvgjinc8phkk6j5hz3";
+       sha256 = "e3c322cd9cf02266a37cdb71142680ee74356dcc2c08c850be575303e885d95f";
        libraryHaskellDepends = [
          array base bktrees containers directory fgl filepath graphviz
          old-locale pandoc process random text time
@@ -6025,7 +6026,7 @@ self: {
      mkDerivation {
        pname = "Grempa";
        version = "0.2.2";
-       sha256 = "0w0apbk8hw555cbpprvxpnxviyzmbsxzlc6qpf6w0cfsybkkiv1f";
+       sha256 = "2eec38e7f2da31c08dbbd830fabb5ef5fbb8bbbd7de77b172ba57088e6ba0a70";
        libraryHaskellDepends = [
          array base containers mtl QuickCheck template-haskell th-lift
        ];
@@ -6039,7 +6040,7 @@ self: {
      mkDerivation {
        pname = "GroteTrap";
        version = "0.5.1";
-       sha256 = "131i63paaapdbdnqvmacsfqbg1719xlbx8phjchw6zlh9njn727k";
+       sha256 = "f38863a54d907ec32193f0a2be684fe184b7b0d34cd58d6d5bed2aa5ee30318c";
        libraryHaskellDepends = [ base mtl parsec QuickCheck syb ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/GroteTrap";
@@ -6056,7 +6057,7 @@ self: {
      mkDerivation {
        pname = "Grow";
        version = "1.1.0.3";
-       sha256 = "1vc4ln5fzvcv68qlanyw8mc6qchnjn1kj9rpz661n8ia1x8gkb3l";
+       sha256 = "74acf9500f2a221b8cf9372739839516326c5845dc5b4531329bedef8aa584ed";
        revision = "3";
        editedCabalFile = "e599aab8eefc612bbf1dbae0b60308305a9d3009dda186b228e4e8aeeda1f36a";
        libraryHaskellDepends = [
@@ -6078,7 +6079,7 @@ self: {
      mkDerivation {
        pname = "GrowlNotify";
        version = "0.4";
-       sha256 = "13m213d6l81k0iwjbbwg8n2xz960dhfnrs1il48xvlc8z25y6nh5";
+       sha256 = "055ae38bf888d1dd11a131e86c1d6cc0a4df85458faf25790433206ada08a28e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -6099,7 +6100,7 @@ self: {
      mkDerivation {
        pname = "Gtk2hsGenerics";
        version = "0.1";
-       sha256 = "1gj775yny73qvi3inc38c6yy1av503m5ilbz7ch0xx4a3ywnw5l9";
+       sha256 = "89166eb91f8af40e203b7fd158ea0065abe0bd6168301b47dc781c6f7d3947be";
        libraryHaskellDepends = [
          array base cairo containers glib gtk haskell98 mtl
        ];
@@ -6115,7 +6116,7 @@ self: {
      mkDerivation {
        pname = "GtkGLTV";
        version = "0.2.0";
-       sha256 = "1xkc3ga65prffjzlymimwmfnmvf0lc42h2rm4b72rlmm8316kmp2";
+       sha256 = "e2d669c240b5d22cce22350b2808a3c0ed6a5de535564fbf742edf62d41b6cf6";
        libraryHaskellDepends = [
          base bitmap bitmap-opengl gtk gtkglext GtkTV OpenGL stb-image time
        ];
@@ -6129,7 +6130,7 @@ self: {
      mkDerivation {
        pname = "GtkTV";
        version = "0.2.0";
-       sha256 = "0jxx8lgg533kjvq1sxr4jvqvxj9pcpabsy2mvbpsd2lwv2ffr618";
+       sha256 = "2898ec9cd89c8aa6efda5578bdd46537c9bef19624771df096738cf21e45bd4b";
        libraryHaskellDepends = [
          base gtk time TV TypeCompose vector-space
        ];
@@ -6145,7 +6146,7 @@ self: {
      mkDerivation {
        pname = "GuiHaskell";
        version = "0.1.1";
-       sha256 = "1rgyrbnlbvsqgd8m36fccq7qzxj2n682lz2rdq04j35zsgajyk11";
+       sha256 = "214c2fd5d3bf0c49006e597c2a90b142f68f0f66cc9951517b58ef45edcafee5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -6163,7 +6164,7 @@ self: {
      mkDerivation {
        pname = "GuiTV";
        version = "0.4";
-       sha256 = "15mndbxm83q0d8ci3vj51zwrmzl0f5i5yqv0caw05vlzfsr4ib5i";
+       sha256 = "b1ac48b2769fee02b86260635f627180fe9af90f45ee11196a000f54fb6ab696";
        libraryHaskellDepends = [ base DeepArrow phooey TV TypeCompose ];
        homepage = "http://haskell.org/haskellwiki/GuiTV";
        description = "GUIs for Tangible Values";
@@ -6176,7 +6177,7 @@ self: {
      mkDerivation {
        pname = "HARM";
        version = "0.1.4";
-       sha256 = "0mld40jm0qnsr9flbip3s2lxwd43nhzs11v23bm5m2s83y6j33jn";
+       sha256 = "568e218d1f488b5aea1a6287a03fb48334dea9d0e3c6455dcada625025208d56";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
@@ -6194,7 +6195,7 @@ self: {
      mkDerivation {
        pname = "HAppS-Data";
        version = "0.9.3";
-       sha256 = "0df3bcvqpmjrg2c28jny20r52f3x7gf1wy7r8x71j9wrji56yg5j";
+       sha256 = "b23c6f4a949927194e47f9781edc3b7d38513210de4a24987859d68b375bc335";
        libraryHaskellDepends = [
          base binary bytestring containers HAppS-Util HaXml mtl pretty syb
          syb-with-class template-haskell
@@ -6212,7 +6213,7 @@ self: {
      mkDerivation {
        pname = "HAppS-IxSet";
        version = "0.9.3";
-       sha256 = "0wm3apqsqb2p9cqxikz9j6lzi66ya1sn1yplifqszg1v2lpdgb7b";
+       sha256 = "ebacd72e153bbcafb18bf4fa607550de98f8a991e9cfd8314b572cacf155a372";
        libraryHaskellDepends = [
          base containers HAppS-Data HAppS-State HAppS-Util hslogger mtl syb
          syb-with-class template-haskell
@@ -6230,7 +6231,7 @@ self: {
      mkDerivation {
        pname = "HAppS-Server";
        version = "0.9.3.1";
-       sha256 = "0f10qp2aiv036izzdpfpgmja5kqx68kccazkn1cdap636brjjcdh";
+       sha256 = "b03129f332c35cd558b0f32bc626321dcfa2647dd7ddf67f3403eca8c4c52038";
        libraryHaskellDepends = [
          base bytestring containers directory HAppS-Data HAppS-IxSet
          HAppS-State HAppS-Util HaXml hslogger html HTTP mtl network
@@ -6252,7 +6253,7 @@ self: {
      mkDerivation {
        pname = "HAppS-State";
        version = "0.9.3";
-       sha256 = "1r1ing4c8s91d9p41q7yv6v6xaqs9si438j7b5vnzxgwz0syd6ah";
+       sha256 = "5099e635f8fcf56f775947a241a24e1aab6eb6d9fee0406e6a2169c4c8b331e4";
        libraryHaskellDepends = [
          base binary bytestring containers directory filepath HAppS-Data
          HAppS-Util HaXml hslogger hspread mtl network old-locale old-time
@@ -6271,7 +6272,7 @@ self: {
      mkDerivation {
        pname = "HAppS-Util";
        version = "0.9.3";
-       sha256 = "0mg6p14xv6f9b1rb77mvadzchf6limcypi6z0di1n49pdqjhs4pr";
+       sha256 = "f9120d256e37111b6203dfc4eb598dd438c87e53bb9eb37258c999dd49b8e655";
        libraryHaskellDepends = [
          array base bytestring directory hslogger mtl old-time process
          template-haskell
@@ -6286,7 +6287,7 @@ self: {
      mkDerivation {
        pname = "HAppSHelpers";
        version = "0.11";
-       sha256 = "1hwxh60b26chcd466vlpxc7hx3smdnfl40mfxpyh8j1597v2aqa3";
+       sha256 = "436125f649254804fdedae02429d6d558f0e0feb976e6348639019b180819dc3";
        description = "OBSOLETE. Please use happstack-helpers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6297,7 +6298,7 @@ self: {
      mkDerivation {
        pname = "HCL";
        version = "1.4";
-       sha256 = "0dzfnvdc1nm4f7q759xnq1lavi90axc7b6jd39sl898jbjg8wrrl";
+       sha256 = "34678e9e5c122544751a4d9a75585720c5ad68c0b6a772f071a4dac0dab6ee37";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl QuickCheck random ];
@@ -6316,7 +6317,7 @@ self: {
      mkDerivation {
        pname = "HCard";
        version = "0.0";
-       sha256 = "0bvj1vc8m69bsnjz8xb4nbbpbd4xbqp4kfab0bmk6a4ixgnqk14b";
+       sha256 = "8b8489edeb912833eb024bb9492e5e9db475d7b26475f4a5d52b998ad80e722f";
        libraryHaskellDepends = [
          base mtl QuickCheck random random-shuffle
        ];
@@ -6331,7 +6332,7 @@ self: {
      mkDerivation {
        pname = "HCodecs";
        version = "0.5";
-       sha256 = "0mhp1alx0p9lzq3vm0k802f8ndm2386sshprn9zb8xq8bsd11gxi";
+       sha256 = "b1bf109a5e0877b47eb2f942ad0d1aa2368b9c006882ba07fe345dd0a90a1756";
        libraryHaskellDepends = [
          array base bytestring QuickCheck random
        ];
@@ -6348,7 +6349,7 @@ self: {
      mkDerivation {
        pname = "HDBC";
        version = "2.4.0.1";
-       sha256 = "1bfjffn44n8w0bvznjiqm4ckfs28nipachip98f125p784ff4gks";
+       sha256 = "7a3ee21c41e716111c4a3742a66eb448683719a9384afbf7021c5942ac73d2ad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -6365,7 +6366,7 @@ self: {
      mkDerivation {
        pname = "HDBC-mysql";
        version = "0.6.6.1";
-       sha256 = "1q50xynasb2h65g14ycz4s38fyz185yz1sp9rl02h4p940pz7w9m";
+       sha256 = "35f1f32f20e9122800cde9eaf07d41e17b8786269f79125e31502cadacefa0e0";
        libraryHaskellDepends = [ base bytestring HDBC time utf8-string ];
        homepage = "http://github.com/bos/hdbc-mysql";
        description = "MySQL driver for HDBC";
@@ -6380,7 +6381,7 @@ self: {
      mkDerivation {
        pname = "HDBC-odbc";
        version = "2.4.0.1";
-       sha256 = "1sdf5llz40q9cg0gi0rglnz6agamb7z4n5c6dhwwly902b6fxinv";
+       sha256 = "dbc6eecc122079ca396c86154bfe59553d65bea52f83f8c0630903f2292daee9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -6400,7 +6401,7 @@ self: {
      mkDerivation {
        pname = "HDBC-postgresql";
        version = "2.3.2.3";
-       sha256 = "1jv43rv3a0x7b7q5vzp07xffaf690gijx3rqnfv19fk63a7075j3";
+       sha256 = "4396038e1a66ba14b6b3388f2ee303c938e55c3fe0fe5df059a70335761e64cb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -6419,7 +6420,7 @@ self: {
      mkDerivation {
        pname = "HDBC-postgresql-hstore";
        version = "0.0.1.2";
-       sha256 = "0657a1qy51bihh9gvpwpqpm4gch68rw32plnjcfdbc37yjq5dj1d";
+       sha256 = "2dc856b0f467b0d51c93965e31784606b247eac597dffd12847185e27150a718";
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        jailbreak = true;
        homepage = "https://bitbucket.org/dpwiz/hdbc-postgresql-hstore";
@@ -6432,7 +6433,7 @@ self: {
      mkDerivation {
        pname = "HDBC-session";
        version = "0.1.0.0";
-       sha256 = "1fxx0q9hnxwsivsg2qinm0n3lvf89r9b72cnhipjlpf36nin5x5w";
+       sha256 = "bcf462a335c35d2a6f849689b3524ec86d3a2ca83662f1f48e9a770b1306bdbb";
        libraryHaskellDepends = [ base HDBC ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Bracketed connection for HDBC";
@@ -6445,7 +6446,7 @@ self: {
      mkDerivation {
        pname = "HDBC-sqlite3";
        version = "2.3.3.1";
-       sha256 = "1spbhvwwyj4q7li33kvw1bsr6m1xbnxipga67s7cdgvyf2mxk0x7";
+       sha256 = "a783d9ab707ebfc68e3e46bd1bbb5d3d5493f50a7ccf31223d9848cff986ebea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring HDBC mtl utf8-string ];
@@ -6463,7 +6464,7 @@ self: {
      mkDerivation {
        pname = "HDRUtils";
        version = "1.0.2";
-       sha256 = "0rkykxmqpqiclvxlvfd0v9rrvkkb25shyajdmajxisfqxl684y0g";
+       sha256 = "0f78820cedd8e9d8a5aa4d2a0f75116bce9d73daa0b94dfba62ce28b6b9f7e66";
        libraryHaskellDepends = [ array base colour containers mtl unix ];
        librarySystemDepends = [ pfstools ];
        jailbreak = true;
@@ -6478,7 +6479,7 @@ self: {
      mkDerivation {
        pname = "HERA";
        version = "0.2";
-       sha256 = "08lry7w4zb7j81q9d7rjpz0chcbr9laxi4h9dz327pfcgmy083sy";
+       sha256 = "5e0f047c7dccdd23c66f0992d8154d7931c8c0bf329f967040f2ac4ff8f19922";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ mpfr ];
        license = stdenv.lib.licenses.bsd3;
@@ -6490,7 +6491,7 @@ self: {
      mkDerivation {
        pname = "HFuse";
        version = "0.2.4.5";
-       sha256 = "1894dk7flfdblyyrx0d1acznrdbjw41dnal45cqvrxz5vy4hd3p2";
+       sha256 = "e28e0689dfe5f7bc312b842adb02e172b56c3f53a1819ebda7ab39eace6c24a1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring unix ];
@@ -6508,7 +6509,7 @@ self: {
      mkDerivation {
        pname = "HGL";
        version = "3.2.0.5";
-       sha256 = "0z8dfxg2x530lawx7gyv9d25wcfpwvbfmknq17d5wgkxz47j95wb";
+       sha256 = "8b97240ff97d3e5eda09d8ceead6e6d7315e444bdbbfd3b9a260942e5e770d7d";
        libraryHaskellDepends = [ array base X11 ];
        description = "A simple graphics library based on X11 or Win32";
        license = stdenv.lib.licenses.bsd3;
@@ -6523,7 +6524,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D";
        version = "0.5.0";
-       sha256 = "00mkjpmygz3h7rq1y4b8r8gpg4qk52dah1q0h14f50cr2lxvq3b7";
+       sha256 = "670dbc3b159981e248800007a89a281393771fca68111f703e70fce7eb95b302";
        libraryHaskellDepends = [
          base HGamer3D-Audio HGamer3D-Common HGamer3D-Data
          HGamer3D-Graphics3D HGamer3D-InputSystem HGamer3D-Network
@@ -6541,7 +6542,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-API";
        version = "0.1.6";
-       sha256 = "14wji303z3frjr4rc675pcispbpbpm1ilj6g3cb1fxm5wmi30q5l";
+       sha256 = "b4603062e5a57617161bcf481a43bdebaeab23bbe518964996d98d3fc0889293";
        libraryHaskellDepends = [
          base haskell98 HGamer3D-Data HGamer3D-Ogre-Binding
          HGamer3D-SFML-Binding
@@ -6560,7 +6561,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-Audio";
        version = "0.5.0";
-       sha256 = "0zfzk0vjn2w127dxcsg64d8j6jw1an3i0a2v32sx05l6whrnhabd";
+       sha256 = "6d296833e48616d0b5185b28108755814b235123e669d6db11810b2b3798df7d";
        libraryHaskellDepends = [
          base containers HGamer3D-Common HGamer3D-Data HGamer3D-SFML-Binding
        ];
@@ -6575,7 +6576,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-Bullet-Binding";
        version = "0.2.1";
-       sha256 = "1ilj8p1gm56dffics90qj6gspnam56s84wvaig9s0cwjbwxqi4hy";
+       sha256 = "1e92883b5f9233a0d38b6a7382b42955d9ab9f911824cda273cd94fac24592c6";
        libraryHaskellDepends = [ base HGamer3D-Data ];
        homepage = "http://www.hgamer3d.org";
        description = "Windows Game Engine for the Haskell Programmer - Bullet Bindings";
@@ -6588,7 +6589,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-CAudio-Binding";
        version = "0.1.5";
-       sha256 = "1q69ffhnnh4iaghb1g8s6bqlsry7jy5sbp5vpg4lprnr4wna5ya1";
+       sha256 = "41f9a22c27d9e64bc9bbbbdca58b97c7674df1321abdb0e05391406ba173c9e0";
        libraryHaskellDepends = [ base haskell98 HGamer3D-Data ];
        librarySystemDepends = [ HGamer3DCAudio015 ];
        jailbreak = true;
@@ -6605,7 +6606,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-CEGUI-Binding";
        version = "0.5.0";
-       sha256 = "1lh7gajn69l8yh2lvv552spf31g4br05cvpb2cwrpkijcnq6x8d0";
+       sha256 = "a0a16eb06532ce9b3913eb6e56405ee485e1ae16a5ec4d05f4882663a57a07d2";
        libraryHaskellDepends = [ base HGamer3D-Data ];
        librarySystemDepends = [
          CEGUIBase CEGUIOgreRenderer hg3dcegui050
@@ -6624,7 +6625,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-Common";
        version = "0.5.0";
-       sha256 = "1klb8974hlsbjg06jwg1akl3pvbp6wr17apmdn69x8zarmb84skh";
+       sha256 = "706a8256cdeaa39e8c6df5aa13323777ed3be854e17169c0934b53484e428bce";
        libraryHaskellDepends = [
          base clock containers directory filepath FindBin HGamer3D-Data stm
          vect
@@ -6641,7 +6642,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-Data";
        version = "0.5.0";
-       sha256 = "0361153939v63qy204fxpajkgij7f8kfcz93y38jikqcz6nh7bgz";
+       sha256 = "ffad03adf90ccf28d1f0237de6267247c637a5badd11203c1e66a7914609c10c";
        libraryHaskellDepends = [
          base clock containers directory filepath FindBin stm vect
        ];
@@ -6655,7 +6656,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-Enet-Binding";
        version = "0.5.0";
-       sha256 = "0a5na073ysmcvr9nkbg7jgrkapzbd22wn7p09s2kpxzl9fr8axwd";
+       sha256 = "8d7785b24bf4f73b854ee01ecb8568eb5f35f393e7ad6953deac6a3f0e50b628";
        libraryHaskellDepends = [ base HGamer3D-Data ];
        librarySystemDepends = [ enet hg3denet050 ];
        homepage = "http://www.hgamer3d.org";
@@ -6671,7 +6672,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-GUI";
        version = "0.4.0";
-       sha256 = "006j6g6w990il30kgpwvls77hsmlbg2haiwckrpq3mcywxrhrbsd";
+       sha256 = "4daf0c73e79ed5816f9e8c4705c55bb46a788ea69bdf37c1a011a4c4cd33d200";
        libraryHaskellDepends = [
          base HGamer3D-CEGUI-Binding HGamer3D-Data HGamer3D-WinEvent split
        ];
@@ -6691,7 +6692,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-Graphics3D";
        version = "0.5.0";
-       sha256 = "1a6fizaf0l6271407z8kzlzd8yhh9ky2l9n10xcns0a1asvdkj5y";
+       sha256 = "bec8d9b65641016d5907c1262afc4c107ad43efd13fd034838c250e0d48fcea8";
        libraryHaskellDepends = [
          base containers directory filepath HGamer3D-CEGUI-Binding
          HGamer3D-Common HGamer3D-Data HGamer3D-Ogre-Binding
@@ -6710,7 +6711,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-InputSystem";
        version = "0.5.0";
-       sha256 = "1dpc5zncc9fayf3gqqpki7chimq5cjpvnpjswapllsmykginlyfh";
+       sha256 = "d0796ae39bbe6a4aafe25a5ebbaf6405d708d989f362fc86f3ca25c6ec2fecb6";
        libraryHaskellDepends = [
          base HGamer3D-Common HGamer3D-Data HGamer3D-SDL2-Binding
          HGamer3D-SFML-Binding
@@ -6728,7 +6729,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-Network";
        version = "0.5.0";
-       sha256 = "105m6k112qs96cih9jp0s9l24s671a3hlnsv4jm893mdk28zvznl";
+       sha256 = "d4fefd9198ad8e84aa245b5b0a870ac7682268d2e0ca042333496311c234b580";
        libraryHaskellDepends = [
          base HGamer3D-Common HGamer3D-Data HGamer3D-Enet-Binding
        ];
@@ -6745,7 +6746,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-OIS-Binding";
        version = "0.1.5";
-       sha256 = "1n00s6vpwyw8zcasqzg6ycgc98w6hh3sylxjh05w1pya9v853syf";
+       sha256 = "ceeb51d04ecadfc00b80b253af078486a3c41ef3e67dac15fb887b7eb7d100d8";
        libraryHaskellDepends = [
          base haskell98 HGamer3D-Data HGamer3D-Ogre-Binding
        ];
@@ -6765,7 +6766,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-Ogre-Binding";
        version = "0.5.0";
-       sha256 = "1m2mgqky2bswwskgkmp7xmnm4df5i3rdkshlxkhihglgx3z1wy1w";
+       sha256 = "3c781efee88f3e18e1ec14ead9f288c535526dede7d6f9a6e65c2fe1277e55d4";
        libraryHaskellDepends = [ base HGamer3D-Data mtl transformers ];
        librarySystemDepends = [
          hg3dogre050 OgreMain OgrePaging OgreProperty OgreRTShaderSystem
@@ -6786,7 +6787,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-SDL2-Binding";
        version = "0.5.0";
-       sha256 = "11j9gysd6sc8wvia7hgf3qvzbxmpqkj7hv65iza474yig2dcr5hh";
+       sha256 = "1096cc9a78d19343d48fc56c78e4c4b7f6f5371eeec1a3e2e68869d3b47f4986";
        libraryHaskellDepends = [
          base bytestring HGamer3D-Data utf8-string
        ];
@@ -6805,7 +6806,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-SFML-Binding";
        version = "0.5.0";
-       sha256 = "1087g60dxg8pzxvx7bh72ws5slf4mfqmya8cnv11vxl6hk04vc4v";
+       sha256 = "9bb04dc08486f61dc2b60c295fb1abc4515d341707aed377ff17bdde80790781";
        libraryHaskellDepends = [ base HGamer3D-Data ];
        librarySystemDepends = [
          hg3dsfml050 sfml-audio sfml-network sfml-system sfml-window
@@ -6823,7 +6824,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-WinEvent";
        version = "0.4.0";
-       sha256 = "0d3vjlgpzzb473dmhllxvi05lnh010vgfdbizlj4yxywrp6aas9a";
+       sha256 = "2a69a5cccddc774f24fd7135f73608005a5a40dc9d5258db3864fd7f1f957b34";
        libraryHaskellDepends = [
          base HGamer3D-Data HGamer3D-SDL2-Binding text
        ];
@@ -6842,7 +6843,7 @@ self: {
      mkDerivation {
        pname = "HGamer3D-Wire";
        version = "0.3.3";
-       sha256 = "0w5iafs9ldafc3kzq13alnk1ng766p9w97nak3aijpxfrc4m6z77";
+       sha256 = "e77c5309cbae5f19d598ca9ec4d335e63c1ba6a56a04fce7604e359ab453b170";
        libraryHaskellDepends = [
          base containers HGamer3D HGamer3D-Audio HGamer3D-Data HGamer3D-GUI
          HGamer3D-InputSystem HGamer3D-WinEvent mtl netwire transformers
@@ -6863,7 +6864,7 @@ self: {
      mkDerivation {
        pname = "HGraphStorage";
        version = "0.0.3";
-       sha256 = "1qbhzrw8sjxaz95b34w3w71dv79wlkmqjgvcsr79vxxfn4c83dfc";
+       sha256 = "ccb58118b1aef79d4ed66c3f89eba43c9dddc2e18393b14afaaa4b8d78fe70e1";
        libraryHaskellDepends = [
          base binary bytestring containers data-default directory filepath
          lifted-base monad-control monad-logger resourcet text transformers
@@ -6885,7 +6886,7 @@ self: {
      mkDerivation {
        pname = "HHDL";
        version = "0.1.0.0";
-       sha256 = "1215nz6l3bbkld2fqqsc494xw4qw4vqavznaqxgja2p60w9mwg0q";
+       sha256 = "183c5e1307e60a255fc7cafeadf0261c13de49224c63ec44a373ad41cdb72588";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        jailbreak = true;
        homepage = "http://thesz.mskhug.ru/svn/hhdl/hackage/hhdl/";
@@ -6899,7 +6900,7 @@ self: {
      mkDerivation {
        pname = "HJScript";
        version = "0.7.0";
-       sha256 = "0xvhzmsl1z6im36svjhcl4zlbnmpknlfn0m426cj5l06a3c5mfa8";
+       sha256 = "48b95ad85006d0229911a402eba89db7da453fa10ccaadcda8d1fc4075fd7077";
        libraryHaskellDepends = [ base HJavaScript hsp mtl text ];
        homepage = "http://patch-tag.com/r/nibro/hjscript";
        description = "HJScript is a Haskell EDSL for writing JavaScript programs";
@@ -6914,7 +6915,7 @@ self: {
      mkDerivation {
        pname = "HJVM";
        version = "0.1";
-       sha256 = "0ixzhgrb2jj7np8gmfwca724w5n26i5xalppm5idnhxw6k4jbklr";
+       sha256 = "99ce25c934bc43db62a9f752d54b34c2164ec4518cbbfad0b5474ab1f283bf47";
        libraryHaskellDepends = [
          base containers filepath haskell-src-exts mtl parsec process
          transformers
@@ -6935,7 +6936,7 @@ self: {
      mkDerivation {
        pname = "HJavaScript";
        version = "0.4.7";
-       sha256 = "0sb2wqbf6kml5d414xi6jk0gr31673djqxa5wg1mxl40vwn14pvh";
+       sha256 = "705f122cdf80d05ec3e345752cdb38268cfcc094267612482bb44ee316e66269";
        libraryHaskellDepends = [ base pretty ];
        description = "HJavaScript is an abstract syntax for a typed subset of JavaScript";
        license = stdenv.lib.licenses.bsd3;
@@ -6949,7 +6950,7 @@ self: {
      mkDerivation {
        pname = "HLearn-algebra";
        version = "1.1.0.1";
-       sha256 = "1k0a01cqaay4wp6i603yvcjpmap7inyjxiblqkbpifk9mwjxf15a";
+       sha256 = "aa04d725af69ba78d7c474c52ebd8de7aa7a25db7e0013cde5c42b8559000acc";
        libraryHaskellDepends = [
          base ConstraintKinds containers deepseq hashable MonadRandom
          parallel random template-haskell vector vector-heterogenous
@@ -6969,7 +6970,7 @@ self: {
      mkDerivation {
        pname = "HLearn-approximation";
        version = "1.1.0";
-       sha256 = "1gqrpnliy4jqjlhdhi7vygvq2lnfgwl2hr5hlkzgqmz2gjyib8vn";
+       sha256 = "76a315bd7ce257fcfea4b06428287fce5281f7f3fb44d8209558121fa9bd19bf";
        libraryHaskellDepends = [
          base ConstraintKinds containers heap HLearn-algebra
          HLearn-datastructures HLearn-distributions list-extras vector
@@ -6987,7 +6988,7 @@ self: {
      mkDerivation {
        pname = "HLearn-classification";
        version = "1.0.1.3";
-       sha256 = "11c1016nhhckmdrzlazz5b7iabl0iz0g2245bwws3alnnn74svhd";
+       sha256 = "0d6e4d8eb596aaa1395f8508f1c08f802e15cf2aff2bfa73ab9341684d008185";
        libraryHaskellDepends = [
          base binary bytestring ConstraintKinds containers deepseq dlist
          hashable HLearn-algebra HLearn-distributions list-extras logfloat
@@ -7006,7 +7007,7 @@ self: {
      mkDerivation {
        pname = "HLearn-datastructures";
        version = "1.1.0";
-       sha256 = "06kbscd7nbbb6dlsgyigyag851bbvhiz6p05gdawpb7y0fh8f3wb";
+       sha256 = "8b0f87a003feaccb557b055cf323dc6b85829ef22ffaa769336b2d7b1ad36b1a";
        libraryHaskellDepends = [
          base ConstraintKinds containers deepseq HLearn-algebra list-extras
          MonadRandom QuickCheck vector
@@ -7025,7 +7026,7 @@ self: {
      mkDerivation {
        pname = "HLearn-distributions";
        version = "1.1.0.2";
-       sha256 = "19v9askkccbv405bchq5h72jahsbivj2s31ajwi316kksan2iwzf";
+       sha256 = "eef328acd2739a3022972a0c2de48e4b4325c5810543b60a207b3136a75669a7";
        libraryHaskellDepends = [
          array base ConstraintKinds containers deepseq erf gamma graphviz
          HLearn-algebra HLearn-datastructures hmatrix list-extras
@@ -7045,7 +7046,7 @@ self: {
      mkDerivation {
        pname = "HList";
        version = "0.4.1.0";
-       sha256 = "0vbfq2jfdm3dn059flyzxrlhcw7hkni75fpi2gqcl5s6ha95ak10";
+       sha256 = "204c5592824617caf013f1ba72a29df0700669eedf53970ab06dd4e6a4c06e6d";
        libraryHaskellDepends = [
          array base ghc-prim mtl profunctors tagged template-haskell
        ];
@@ -7062,7 +7063,7 @@ self: {
      mkDerivation {
        pname = "HListPP";
        version = "0.2";
-       sha256 = "0jq2sdfg47dqf8gmmzm0049x4hsfh9prgfvxzplhrxsisknyhfr8";
+       sha256 = "283be8edd451f70ce9fd7dbb976f824e43d21301a0fe5a1f72b81df25cd3024b";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -7080,7 +7081,7 @@ self: {
      mkDerivation {
        pname = "HLogger";
        version = "0.0.1.0";
-       sha256 = "0amxyg9j6fh58g2wh9k0231mxmvi6j96z7ykd3rm3jzs96fhlncp";
+       sha256 = "97590a9d49facb51f368d39f6f923471d75ec3106026c8c543053a23d3f3bd2a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base old-locale time ];
@@ -7097,7 +7098,7 @@ self: {
      mkDerivation {
        pname = "HMM";
        version = "0.2.1";
-       sha256 = "01y8l76c56gysynbilp32yq0wfc129hl24siw8s9fmpn98qa71s6";
+       sha256 = "4687a3304af6569734e2511341611281390eb017e3d2b8acd7fe99c2cca1c807";
        homepage = "https://github.com/mikeizbicki/hmm";
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
@@ -7109,7 +7110,7 @@ self: {
      mkDerivation {
        pname = "HMap";
        version = "1.2.4";
-       sha256 = "087a7ykk84lxa0c75wid6bkjmd89krgyrilxgps1fzl142hyvl13";
+       sha256 = "23d0eda120817e17f47d9dc6ec5f9e09b52ae7322df27218509d1234a73fea20";
        libraryHaskellDepends = [ base hashable mtl unordered-containers ];
        homepage = "https://github.com/atzeus/HMap";
        description = "Fast heterogeneous maps and unconstrained typeable like functionality";
@@ -7124,7 +7125,7 @@ self: {
      mkDerivation {
        pname = "HNM";
        version = "0.1.2";
-       sha256 = "04325gwmlrx4iy9609vzaw2dhs4kg3ydr4r6af6rllrf500f6w9j";
+       sha256 = "3271e300282e539a8d532693dcfc789368d804577f2760928fa4675af92b6210";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7145,7 +7146,7 @@ self: {
      mkDerivation {
        pname = "HODE";
        version = "2008.10.27";
-       sha256 = "0fr3bivmlciicba1brhm86l8diadb765ff1s8g6ylygs8l7lingv";
+       sha256 = "fbd9480f45fa79eacd433a3857cc594dc586a84115e615d46231325a775c233b";
        libraryHaskellDepends = [ array base ];
        librarySystemDepends = [ ode ];
        description = "Binding to libODE";
@@ -7157,8 +7158,8 @@ self: {
     ({ mkDerivation, allocated-processor, base, opencv, vector-space }:
      mkDerivation {
        pname = "HOpenCV";
-       version = "0.3.0.1";
-       sha256 = "0v9pcbbfj254n6mryb16rplh6mgjizdm4c8qqdsb41gdpx1h59n6";
+       version = "0.4.0.1";
+       sha256 = "7e7be492466e675ceb60b823252fcb0e8a5d0847a76c680c2dfa2ea7e59cbec7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ allocated-processor base vector-space ];
@@ -7176,7 +7177,7 @@ self: {
      mkDerivation {
        pname = "HPDF";
        version = "1.4.6";
-       sha256 = "15v1mf58fqa25higf52jqlf3fw2fbggfm5v8a8v00zz6q0f3lzn9";
+       sha256 = "c97e3a1cc0e67f0036526897eade5b4e70371cc55214f7222c4261878aab6197";
        libraryHaskellDepends = [
          array base binary bytestring containers mtl random vector zlib
        ];
@@ -7193,7 +7194,7 @@ self: {
      mkDerivation {
        pname = "HPath";
        version = "0.0.2";
-       sha256 = "10hlqyhcpgnkiqwjwb3d10wrhzc82jcbz1qvxa0mzzif36rys1wk";
+       sha256 = "9307edb3192efe5f81ea1b87bf9814887d9839086d2c2e398ed3becba0c71482";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7216,7 +7217,7 @@ self: {
      mkDerivation {
        pname = "HPi";
        version = "0.4.0";
-       sha256 = "0d0r89a92lavbaf6svkqwd7fvc1q4kwbdvr0jvxarx2xgrhl342a";
+       sha256 = "4a9041617e5df4acfa9620efb6f82438b0ed4ee3786e6d9c5a5b519154421934";
        libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "https://github.com/WJWH/HPi";
@@ -7229,7 +7230,7 @@ self: {
      mkDerivation {
        pname = "HPlot";
        version = "0.3";
-       sha256 = "022642xp13fl34y854n4j7kxn0nyxhrz4gxgn3nfqs67m13bcsqy";
+       sha256 = "1e6bb646a8c768ececb0af3ff233ecde02dbe791c492823c19d48d70bb204608";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base glade glib gtk ];
@@ -7251,7 +7252,7 @@ self: {
      mkDerivation {
        pname = "HPong";
        version = "0.1.2";
-       sha256 = "0dzzq4ksny537b151g6c1jgj2ns143klhdjfbq84srs026pvpvzi";
+       sha256 = "f1efbbaf1140674d105e4e3648e720415b219f0cccbc50c23aa378ab27c1ff37";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -7270,7 +7271,7 @@ self: {
      mkDerivation {
        pname = "HROOT";
        version = "0.8";
-       sha256 = "0q6n5j1hzl8fk6a0ziqjzfi1515shqzqxx0argbvnhw85vjajvqf";
+       sha256 = "0e6fa9e42e8843bbd7cb0af48e3f86ba8412a2fb12c70f94990ed10f832cd660";
        revision = "1";
        editedCabalFile = "43058ba39e0517740c45b1087a39e4f84912c1a3c500504850395d4f2fda0917";
        libraryHaskellDepends = [
@@ -7288,7 +7289,7 @@ self: {
      mkDerivation {
        pname = "HROOT-core";
        version = "0.8";
-       sha256 = "1f40n224r640dp3g4x9kwnpcjpll3axs3pc71nqcch748bh0f60n";
+       sha256 = "161807e042e440c6b00d87dda1bb1a945ec9aee53375f2c66d80984c84b080b8";
        libraryHaskellDepends = [ base fficxx-runtime ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Core modules";
@@ -7301,7 +7302,7 @@ self: {
      mkDerivation {
        pname = "HROOT-graf";
        version = "0.8";
-       sha256 = "1jh2c6wrzajrzbkw77fsvjnj7nhrfx192hs9vlkd0aja2xy7z0bw";
+       sha256 = "7c817f7c174a2ad026dd494391427719da23addcda9dc3e7fa59aa9fb96102ca";
        libraryHaskellDepends = [
          base fficxx-runtime HROOT-core HROOT-hist
        ];
@@ -7316,7 +7317,7 @@ self: {
      mkDerivation {
        pname = "HROOT-hist";
        version = "0.8";
-       sha256 = "0yzlqg2nzw26j1a2i8zaihwd22bl7y9cbxxps99vy7fxph81ikh1";
+       sha256 = "01ce1810bcdd1dbf53d2b7f7c5923f7409d1388ceaa328549046f06fc5c3f47b";
        libraryHaskellDepends = [ base fficxx-runtime HROOT-core ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Hist modules";
@@ -7329,7 +7330,7 @@ self: {
      mkDerivation {
        pname = "HROOT-io";
        version = "0.8";
-       sha256 = "0sbh6jz24xv2pvh0m2f26aqj3fzkmyiqp8p4g1vcnh8jlisdn6k2";
+       sha256 = "621adb74a41241cb7678e4a28ba3aff3bb21b132c2890ae0be627722be347069";
        libraryHaskellDepends = [ base fficxx-runtime HROOT-core ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT IO modules";
@@ -7342,7 +7343,7 @@ self: {
      mkDerivation {
        pname = "HROOT-math";
        version = "0.8";
-       sha256 = "0qmsvrhxzdw2n0lw8x06l2sbx36xm77nv55kpps1h60l4l0nmzwm";
+       sha256 = "95ff6a0125141818f4bdb3946dcfa9dd8cbeb4a00674c429b082b7df61deba62";
        libraryHaskellDepends = [ base fficxx-runtime HROOT-core ];
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Math modules";
@@ -7355,7 +7356,7 @@ self: {
      mkDerivation {
        pname = "HRay";
        version = "1.2.3";
-       sha256 = "0bg0b8260cd2l8q7ccijwqg1yz49mkifv1r0a5q1hrbsagvac4nf";
+       sha256 = "ce12a6f6537a651870512087ede2ac897c1f1ee632327630a2a23160045ae02d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base directory haskell98 ];
@@ -7372,7 +7373,7 @@ self: {
      mkDerivation {
        pname = "HSFFIG";
        version = "1.1.3";
-       sha256 = "10zkg2lhvzxi6csyrah8kw3xd1da60im0whpg884hpnf5h220086";
+       sha256 = "060120042cce5e48107a1772502330aa85d6079f08aaec3533b1ff0da978f383";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7395,7 +7396,7 @@ self: {
      mkDerivation {
        pname = "HSGEP";
        version = "0.1.5";
-       sha256 = "16k853180smf2smw8ch3mzjv14imj9w2ssh61hcc23carhrsbg9p";
+       sha256 = "37bda533cc8a0dc1180c066a2d78923592b0e5af0332c4ab16ae6a80c228689a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7416,7 +7417,7 @@ self: {
      mkDerivation {
        pname = "HSH";
        version = "2.1.2";
-       sha256 = "17ysn131xskx4s1g5kg08zy141q3q16bns4bsg3yjzvf6cjpz2kq";
+       sha256 = "788a7f25336e7fe9c7d38b68bb4cc0030712fc47e0cdf282267dea1e46b0da9f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7436,7 +7437,7 @@ self: {
      mkDerivation {
        pname = "HSHHelpers";
        version = "0.24";
-       sha256 = "0mz25xak9fkircdxcpzrf3rym9l5ivhifk7dqm2xki3mv6fw214d";
+       sha256 = "8d04c19dd975c4d945c5ed4c17e18e85a6eaf370f95fd61bcb71ba34552fe257";
        libraryHaskellDepends = [
          base bytestring DebugTraceHelpers directory filepath HSH
          HStringTemplateHelpers MissingH mtl regex-pcre unix
@@ -7452,7 +7453,7 @@ self: {
      mkDerivation {
        pname = "HSlippyMap";
        version = "2.2";
-       sha256 = "17n1kpva97lwhwg2vs7875bfqlwcq6xpl2agqc53qb7j4153p559";
+       sha256 = "a9943b4a20f22c3c0ac34f097abbc18c53ec5639e8e82d1e879c9ea4f69dc19e";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/j4/HSlippyMap";
@@ -7467,7 +7468,7 @@ self: {
      mkDerivation {
        pname = "HSmarty";
        version = "0.2.0.3";
-       sha256 = "07m7xpwv565cf78qyqkd6babpl2b7jnq88psv55jclzdqlsvv0rq";
+       sha256 = "3883bd35c5ed53264bd9fa2284ad3c4bd0bbd4326d628fd171ac98b2f9eda71e";
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-expr base HTTP mtl scientific text
          unordered-containers vector
@@ -7486,7 +7487,7 @@ self: {
      mkDerivation {
        pname = "HSoundFile";
        version = "0.2.2";
-       sha256 = "0qlz17dzlysj36zz3s8dzwvfdr9rdfp6gnabc262iraidqapshzb";
+       sha256 = "eb437d156e51e5288c604bd967ae6b39e5e636ff0de9f1bf19527bfadb099f62";
        libraryHaskellDepends = [
          base binary bytestring filepath haskell98 mtl parallel
        ];
@@ -7504,7 +7505,7 @@ self: {
      mkDerivation {
        pname = "HStringTemplate";
        version = "0.8.3";
-       sha256 = "064x4d9vhzln1c8ka3saqdz6a8skn3xbhaxrf3rjwqgmjg4v3mk3";
+       sha256 = "63d6b1c993f5612ef370b92bb8fab05323657ec34a0f35110b967eb853239d18";
        libraryHaskellDepends = [
          array base blaze-builder bytestring containers deepseq directory
          filepath mtl old-locale parsec pretty syb template-haskell text
@@ -7521,7 +7522,7 @@ self: {
      mkDerivation {
        pname = "HStringTemplateHelpers";
        version = "0.0.14";
-       sha256 = "1dgr28hxm9zlxl13ms9mn63rbm5ya6bkyys6q0kbns2y2zwmkswh";
+       sha256 = "90eb59f9175e68bb26c0467b3f9751bed49587b135e93a02edf4a7da2112f9b5";
        libraryHaskellDepends = [
          base containers directory FileManipCompat filepath HSH
          HStringTemplate mtl safe strict
@@ -7537,7 +7538,7 @@ self: {
      mkDerivation {
        pname = "HSvm";
        version = "0.1.0.2.89";
-       sha256 = "1mb8kclb7631ihj356g5ddf758cnwz9y6r5ck72daa7vndz01aa9";
+       sha256 = "49a9007eb3fb28d5c499ac64e3d3e796a1725c6be59932248c6198b3289b68d5";
        libraryHaskellDepends = [ base containers ];
        description = "Haskell Bindings for libsvm";
        license = stdenv.lib.licenses.bsd3;
@@ -7555,7 +7556,7 @@ self: {
      mkDerivation {
        pname = "HTF";
        version = "0.13.0.0";
-       sha256 = "0lrc60ydqsizz3rdyijqywncr1bcj3b95mgn99bz5q4yb3l6dc54";
+       sha256 = "a4b066e8589ee0f2574af6d592d6906c85cc2cf75846dff2f83f6adc3c302c53";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7586,7 +7587,7 @@ self: {
      mkDerivation {
        pname = "HTTP";
        version = "4000.2.20";
-       sha256 = "0nyqdxr5ls2dxkf4a1f3x15xzwdm46ppn99nkcbhswlr6s3cq1s4";
+       sha256 = "4407cc863699720d179b36257baf21b5f1df4be8c30545dcec4d685a726fd85b";
        libraryHaskellDepends = [
          array base bytestring mtl network network-uri old-time parsec
        ];
@@ -7606,7 +7607,7 @@ self: {
      mkDerivation {
        pname = "HTTP-Simple";
        version = "0.2";
-       sha256 = "1294pn82fbskgfw2mh3ri31wab5l9y3j0g50dcx5sqbhz79pnj9w";
+       sha256 = "3c497bd3f970615d3a6ba03c20874fb42cc5c38879c02ab87b532f2790bd2489";
        libraryHaskellDepends = [ base HTTP network ];
        homepage = "http://www.b7j0c.org/content/haskell-http.html";
        description = "DEPRECATED Enable simple wrappers to Network.HTTP";
@@ -7621,7 +7622,7 @@ self: {
      mkDerivation {
        pname = "HTab";
        version = "1.6.3";
-       sha256 = "0c0igscng6gqhabmvvgappsbzbhkpybcx7vr8yd72pqh988ml4zv";
+       sha256 = "fb135a114a105f719a47799fce96bf13aebff4bdeaed5d9782f89967997e1130";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -7639,7 +7640,7 @@ self: {
      mkDerivation {
        pname = "HTicTacToe";
        version = "0.2";
-       sha256 = "0h3pr4lyx14zndwbas5ba8sg3s84sq19qhh6pcqpy4v2ajfyyfqc";
+       sha256 = "0c3bef9d5462137f31bb06429c02d604e9f13452ab68b578b39f84ee29c97740";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -7656,7 +7657,7 @@ self: {
      mkDerivation {
        pname = "HUnit";
        version = "1.2.5.2";
-       sha256 = "0hcs6qh8bqhip1kkjjnw7ccgcsmawdz5yvffjj5y8zd2vcsavx8a";
+       sha256 = "0af5ad34dba27de48b94ce6d5f7ee3aa6af6183bdc4a3967b811e28520369a41";
        libraryHaskellDepends = [ base deepseq ];
        homepage = "http://hunit.sourceforge.net/";
        description = "A unit testing framework for Haskell";
@@ -7668,7 +7669,7 @@ self: {
      mkDerivation {
        pname = "HUnit-Diff";
        version = "0.1";
-       sha256 = "0dlsx6qicnrqkhb52jbgh31f0y6lxh32yl5gr6bg3fnqr36vc6x6";
+       sha256 = "a61bb6cdc8d8baf196c9af502f06ecd478e0c2806f4951169c385b16b1e99a36";
        libraryHaskellDepends = [ ansi-terminal base Diff groom HUnit ];
        jailbreak = true;
        homepage = "https://github.com/dag/HUnit-Diff";
@@ -7685,7 +7686,7 @@ self: {
      mkDerivation {
        pname = "HUnit-Plus";
        version = "1.0.1";
-       sha256 = "0ph4560i8nb4ggbfc2yfam0mgfl21pnpgj0x0v9dh86lbfj9p4ki";
+       sha256 = "71929ba45bd420d8d2061dc877ed0d82ba574155ce0be6d67b6459148129045e";
        libraryHaskellDepends = [
          base bytestring Cabal cmdargs containers hashable hexpat hostname
          old-locale parsec time timeit
@@ -7705,7 +7706,7 @@ self: {
      mkDerivation {
        pname = "HUnit-approx";
        version = "1.0";
-       sha256 = "0svkjvcanjsi5bhn9b91jhig36np5imr3qyj6b1s5msm7wmlk3v1";
+       sha256 = "618f492b3f55d7a2c332d2e3916b2cd79af1229421ad64e12a514babd896736b";
        libraryHaskellDepends = [ base HUnit ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/goldfirere/HUnit-approx";
@@ -7722,7 +7723,7 @@ self: {
      mkDerivation {
        pname = "HXMPP";
        version = "0.0.1.0";
-       sha256 = "094j5bafrwr0d5sz3fidz7k328w6f4nqhja2c9gf89759nc470ss";
+       sha256 = "5a8343984de524e45e624249882d71862331e6f92dbaf1756920f3ecd42a9224";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7749,7 +7750,7 @@ self: {
      mkDerivation {
        pname = "HXQ";
        version = "0.19.0";
-       sha256 = "1k2lway8nfy6vwsxq7kmjh25q5diw8sy4hrqzn3irk6rlg7zh77l";
+       sha256 = "f41cf8cfa3d9cc1c87fd3843e235e2b1155c0494751edc35dfc63b8bbce254cc";
        libraryHaskellDepends = [
          array base haskeline haskell98 HTTP mtl regex-base regex-compat
          template-haskell
@@ -7765,7 +7766,7 @@ self: {
      mkDerivation {
        pname = "HaLeX";
        version = "1.2.1";
-       sha256 = "029khjgyay3pzydq7bj6rvlglmm66wj728y4fadqvh6yxr7ddc0s";
+       sha256 = "1ab0d64eeedec08d9b72c423712437a656fae8ce46ae839bff7778e59f843309";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl ];
@@ -7780,7 +7781,7 @@ self: {
      mkDerivation {
        pname = "HaMinitel";
        version = "0.1.0.0";
-       sha256 = "0q7fq5z0wrk2qg9n715033yp25dpl73g6iqkbvxbg2ahp9caq458";
+       sha256 = "a810ac58ba5089b7fa5e1347f3c6a1b71571fd18a08463d3c362660e7ec1ee60";
        libraryHaskellDepends = [ base bytestring serialport stm ];
        jailbreak = true;
        homepage = "https://github.com/Zigazou/HaMinitel";
@@ -7793,7 +7794,7 @@ self: {
      mkDerivation {
        pname = "HaPy";
        version = "0.1.1.1";
-       sha256 = "0li04k27pkq7ci1dfx4sl022ivl4gjqy5ny25jszifwrx4n4pmwz";
+       sha256 = "9fd74b2ce999bbf8b52cc2dbe2b17c84ee2804a09a74d7426407cf7bc4242052";
        libraryHaskellDepends = [ base template-haskell th-lift ];
        homepage = "https://github.com/sakana/HaPy";
        description = "Haskell bindings for Python";
@@ -7811,7 +7812,7 @@ self: {
      mkDerivation {
        pname = "HaRe";
        version = "0.7.2.8";
-       sha256 = "19vldhyl1636g05yc1kg9ih3z9rlcvcl596slc1hqwkd564nld36";
+       sha256 = "66346a89296d720c03a3daa442d96634a73f604c6f06e60b786698403d6c74a7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7847,7 +7848,7 @@ self: {
      mkDerivation {
        pname = "HaTeX";
        version = "3.16.1.1";
-       sha256 = "0xi89wclnkrl17jl3ymvsvg802aj201m4lp0rg9adgmrrdgz042p";
+       sha256 = "5710f05fcbb9bea6d2cbe052520310520980ded6bbfa41e509344f4b194f2876";
        libraryHaskellDepends = [
          base bytestring containers matrix parsec QuickCheck text
          transformers wl-pprint-extras
@@ -7867,7 +7868,7 @@ self: {
      mkDerivation {
        pname = "HaTeX-meta";
        version = "1.2.1";
-       sha256 = "1cfn823xfp4962x4ww3dawm017nkg00wxa20b8nbq3pmjjnpb2xl";
+       sha256 = "b48b75ad94f50ebc2c5a40a8ce0178d39e002a576d704eba30895cd78740d6b1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -7887,7 +7888,7 @@ self: {
      mkDerivation {
        pname = "HaTeX-qq";
        version = "0.0.1.1";
-       sha256 = "1kjhdg9vm7n07zxgdkmqkgwpf2204hrjwslnyhg8i7f07cd3pdrl";
+       sha256 = "34b73b1a3bc09d881ef4966a2e3324400877f99bb8cef6fa3fc09ebad36b50ce";
        libraryHaskellDepends = [
          antiquoter base haskell-src-meta HaTeX template-haskell text
          uniplate
@@ -7904,7 +7905,7 @@ self: {
      mkDerivation {
        pname = "HaVSA";
        version = "0.1.0.2";
-       sha256 = "1hh324i7gvazlkm3vfmzah41h2hlxwb2k8g1z8dmfbif6pmp0apk";
+       sha256 = "f32a70eb352e2e571bfae1a12916ef140a180854bfba3deaa45fed77221103c2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base logict ];
@@ -7925,7 +7926,7 @@ self: {
      mkDerivation {
        pname = "HaXml";
        version = "1.25.3";
-       sha256 = "1iq74dnxvannx9x1whqc3ixn93r4v5z7b4yv21n9q5963kpafj34";
+       sha256 = "6448a7ee1c26159c6c10db93757ed9248f647b1c0c431e7aead6aadd6d2307c7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7944,7 +7945,7 @@ self: {
      mkDerivation {
        pname = "Hach";
        version = "0.1.2";
-       sha256 = "1bp7ngsh655x0iamb8bhn2sqkpg3p6mhg0n0fgqz5k4pjskjyavy";
+       sha256 = "7e2b2fa79697ccf2f173c08207abb9e3dd89b5b070a1555504bd1403f5b3e7ae";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers network old-locale ];
@@ -7962,7 +7963,7 @@ self: {
      mkDerivation {
        pname = "HackMail";
        version = "0.0.1";
-       sha256 = "1j8lw1c5asx40fag9gd6ni19c0z0q46f55yry5cj94v4s5m2gzbw";
+       sha256 = "7cfd276ad164932459f1d997e20cc1e0039642b4a6bdf49403a46b5558e014c9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7984,7 +7985,7 @@ self: {
      mkDerivation {
        pname = "Haggressive";
        version = "0.1.0.4";
-       sha256 = "08f8i8bmnjv255xzpasa7drd83fh82qjm49mscn6dmiw6yp47vz1";
+       sha256 = "e1ef43ae373cd6662cd335912ab140d00dd4723b4aabfb7b29624b5b178ac821";
        libraryHaskellDepends = [
          base bytestring Cabal cassava containers directory HUnit PSQueue
          text tokenize tuple vector
@@ -8001,7 +8002,7 @@ self: {
      mkDerivation {
        pname = "HandlerSocketClient";
        version = "0.0.5";
-       sha256 = "1jp8cwlp6h1wvvkh71813i3lzxc7ckxzc7nvvcsjvcz0apxcl7vv";
+       sha256 = "7b1fcafa55e0b32d35dbdb1ef6fb6487f54f471c018503e7de3c40732967e8ca";
        libraryHaskellDepends = [ base bytestring network ];
        homepage = "https://github.com/wuxb45/HandlerSocket-Haskell-Client";
        description = "Haskell implementation of a HandlerSocket client (API)";
@@ -8015,7 +8016,7 @@ self: {
      mkDerivation {
        pname = "HandsomeSoup";
        version = "0.4.2";
-       sha256 = "1yzfrvivvxwlaiqwbjx27rxwq9mmnnpb512vwklzw7nyzg9xmqha";
+       sha256 = "0ae2dad3fbde1efee9e45b84b2aeb5b526cc7b3ea2cbc5715494f7bde3ceeefb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -8038,7 +8039,7 @@ self: {
      mkDerivation {
        pname = "HarmTrace";
        version = "2.2.0";
-       sha256 = "1l2w53ispw7sg1daxnynfc94njzm6w838a8ij7rpzd3nxa2b596v";
+       sha256 = "dba4b284ea76b47ff3911129341037f54b4b1273d6dbae5a78faf0abe3285cd0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -8066,7 +8067,7 @@ self: {
      mkDerivation {
        pname = "HarmTrace-Base";
        version = "1.4.0.1";
-       sha256 = "174a05473577vyyf6rz5bq3b9wrgmsbz23xdg945pfc78lb6n70j";
+       sha256 = "121c6b164587b95b487aad0ff197ae2ff3b4065ee567e3bcdfe7947148018a9c";
        libraryHaskellDepends = [
          base binary containers ghc-prim ListLike uu-parsinglib
        ];
@@ -8087,7 +8088,7 @@ self: {
      mkDerivation {
        pname = "HasGP";
        version = "0.1";
-       sha256 = "1sw5l74p2md4whq0c1xifcnwbb525i84n1razjxs7cpf8gicgggx";
+       sha256 = "fdbdc7e243eeb2a3bbfc2a074b502ca2acc52d73b1070630e4a45571c9a185eb";
        libraryHaskellDepends = [
          base haskell98 hmatrix hmatrix-special mtl parsec random
        ];
@@ -8105,7 +8106,7 @@ self: {
      mkDerivation {
        pname = "Haschoo";
        version = "0.1.2";
-       sha256 = "0jh506p0clwyb5wwrhlgbc5xp7w6smz5vky3lc8vhnwvwk324qcj";
+       sha256 = "926122c6e49b5bb811a3c3cf5d7ed5869fdb0b5b8fc2cc79599e5306ae01054a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -8125,7 +8126,7 @@ self: {
      mkDerivation {
        pname = "Hashell";
        version = "1.0";
-       sha256 = "0yn525sr7i2nwf4y44va00aswnphn89072zaqjr2i0f1n1jjaxpl";
+       sha256 = "f4762565b0c18128b2c4ea8b0312b2f05aae15006a13e289e356c4937511c57a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -8143,7 +8144,7 @@ self: {
      mkDerivation {
        pname = "HaskellForMaths";
        version = "0.4.8";
-       sha256 = "0yn2nj6irmj24j1djvnnq26i2lbf9g9x1wdhmcrk519glcn5k64j";
+       sha256 = "9298592ca32f853233abb0f1d0d34b6e51118dc0d66ed9822442d61c8db4c27a";
        libraryHaskellDepends = [ array base containers random ];
        homepage = "http://haskellformaths.blogspot.com/";
        description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
@@ -8155,7 +8156,7 @@ self: {
      mkDerivation {
        pname = "HaskellLM";
        version = "0.1.2";
-       sha256 = "0baqn15zdhlinf4v3c244005nb3wm63gpr0w6fy7g9gmn8a00scq";
+       sha256 = "98690014b2f5a577bc331ce4fb86a97c2c5b002044b0b189b391c2f64bb0582d";
        libraryHaskellDepends = [ base hmatrix ];
        description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm";
        license = "GPL";
@@ -8166,7 +8167,7 @@ self: {
      mkDerivation {
        pname = "HaskellNN";
        version = "0.1.3";
-       sha256 = "0i5jqhkxna1kq361hh66830x4z5m782pp898g9ggfvdiwpp8phmr";
+       sha256 = "b9c28beee5b16df75e7a28a17b053ab57cd2c140c64018ccc03328db27c4b244";
        libraryHaskellDepends = [ base hmatrix random ];
        description = "High Performance Neural Network in Haskell";
        license = "GPL";
@@ -8180,7 +8181,7 @@ self: {
      mkDerivation {
        pname = "HaskellNet";
        version = "0.4.5";
-       sha256 = "1d34zknk8knjsw1w3bl91z8qc47vqb6mhfh6rq1rm93na616i3p5";
+       sha256 = "e58e68825176a49a03ce063a58cdc2fb1086d10f89aec103d7d24e34edfc64b4";
        libraryHaskellDepends = [
          array base base64-string bytestring cryptohash mime-mail mtl
          network old-time pretty text
@@ -8197,7 +8198,7 @@ self: {
      mkDerivation {
        pname = "HaskellNet-SSL";
        version = "0.3.0.0";
-       sha256 = "1n1jlnxp16dmfkw4yh1bsbylsk5c1kyixh3gi81202fjx3q9z2pf";
+       sha256 = "ee8a9ff0e8d20920028a6fc01efd0cac4c4dfdd22b404ff874b59970bba532d8";
        libraryHaskellDepends = [
          base bytestring connection data-default HaskellNet network tls
        ];
@@ -8215,7 +8216,7 @@ self: {
      mkDerivation {
        pname = "HaskellTorrent";
        version = "0.1.1";
-       sha256 = "0dy9irl085jw7wz6y50566rwsj05ymp8g2xp2444vg12ryd5dra1";
+       sha256 = "41e5569acf22bc4d0811b78b876ef50548cdb33105146f3e3f5c1604688ec937";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -8234,7 +8235,7 @@ self: {
      mkDerivation {
        pname = "HaskellTutorials";
        version = "0.0.0.1";
-       sha256 = "0gnf8x4dqz3bwyhrcn17qci2rzmms3r0cyr7cgf593jlkxiq287q";
+       sha256 = "f82081639f548e54dc63277b06f2d0b5fe2c22c3275896a1e76b7cdc4847ce3e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs text ];
@@ -8251,7 +8252,7 @@ self: {
      mkDerivation {
        pname = "Haskelloids";
        version = "0.1.1";
-       sha256 = "0v171rzpbh4w5kxzbc9h2x4kha1ykw4vk69scfpmdz5iqih2bqz8";
+       sha256 = "e8e32560c4b1fc56af633a99b9099f3e2838491730b1f5fb2c9cc0757f0e276c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -8274,7 +8275,7 @@ self: {
      mkDerivation {
        pname = "Hawk";
        version = "0.0.2";
-       sha256 = "0g7dgj3asxwcjg43nzhjp7agvnzv882xhgbrr7jnpdckywkgacgq";
+       sha256 = "f831f526f793b56be5c9793dd80542fbdbfdd4b9127e3bc8938c77ad867ced3c";
        libraryHaskellDepends = [
          base bytestring bytestring-trie cgi containers convertible
          data-default dataenc directory filepath hack HDBC HDBC-sqlite3
@@ -8299,7 +8300,7 @@ self: {
      mkDerivation {
        pname = "Hayoo";
        version = "1.2.3";
-       sha256 = "0bpkkdwgwf7xagp4rda1g07mdglzvl4hzq2jif7c3s8j7f6zq48c";
+       sha256 = "0c11fc8d3b12e9c18e8b52e00f09dd9fbe560f7841b54cee53fd38fe789bf32e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -8321,7 +8322,7 @@ self: {
      mkDerivation {
        pname = "Hclip";
        version = "3.0.0.3";
-       sha256 = "0h6q44yv4m325gdwpvkxz31syy6qwdsixfanzr3fx1v5nbhm22af";
+       sha256 = "4e0951e1b26587ee46fe56b91e75e3d878afc3f87deecbdb2b6254b23d21d840";
        libraryHaskellDepends = [ base mtl process strict ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/jetho/Hclip";
@@ -8336,7 +8337,7 @@ self: {
      mkDerivation {
        pname = "Hedi";
        version = "0.1.1";
-       sha256 = "0z0sa658fngv68611k76ncf5j59v517xchhw2y84blj97fl6jkn9";
+       sha256 = "c94e69a83b49d24590171c42d64f283b15591cb3e6cc100c32fb59878a511a7c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -8358,7 +8359,7 @@ self: {
      mkDerivation {
        pname = "Hermes";
        version = "0.0.4";
-       sha256 = "0j5vg3rvf4hbvg6jan4im7ijqffy6k9dvijfwxjcn164qjzh6xb3";
+       sha256 = "637503bfc4c404cb64e74ec6ddd234de392ce3a9915825cddb0b12b7f378bb48";
        libraryHaskellDepends = [
          AES base bytestring cereal containers hslogger monads-tf network
          old-time random random-shuffle RSA SHA2 stm syb time transformers
@@ -8378,7 +8379,7 @@ self: {
      mkDerivation {
        pname = "Hieroglyph";
        version = "3.89";
-       sha256 = "0dkvvk3qwn72vn4kc0q2iv6raxslrxf0ypr0sn7i0fjds3cjxs6s";
+       sha256 = "dae82ed9d04d3a108fd5205f0f5ccf547795cd8e02033689dde2588ec7dc7b36";
        libraryHaskellDepends = [
          array base buster bytestring cairo colour containers glib GLUT gtk
          gtkglext IfElse mtl OpenGL parallel pretty random
@@ -8397,7 +8398,7 @@ self: {
      mkDerivation {
        pname = "HiggsSet";
        version = "0.1.1";
-       sha256 = "1k0qlpm4akzx820b0j3g3f562ailxa56sa41268xyq3046xdpyl1";
+       sha256 = "81fadbba216060df911181286d8aea342a618a1b6f48b08040fd4f45eaa518cc";
        libraryHaskellDepends = [
          base bytestring containers deepseq mtl text th-expand-syns TrieMap
          vector
@@ -8413,7 +8414,7 @@ self: {
      mkDerivation {
        pname = "Hipmunk";
        version = "5.2.0.17";
-       sha256 = "1yxs1v9pzb35g3zlvycsx762dk8swrbry7ajr50zlq667j20n4a8";
+       sha256 = "48110b843cc660fa41c9521d9f57e61acd26cce99af94dff7865ac7fd30ebafb";
        libraryHaskellDepends = [
          array base containers StateVar transformers
        ];
@@ -8429,7 +8430,7 @@ self: {
      mkDerivation {
        pname = "HipmunkPlayground";
        version = "5.2.1.1";
-       sha256 = "075am1d0hjbhnibk2x56fbh4ybw5pavfmqk2dz4yjw7yh264vcs7";
+       sha256 = "47b34d8c80fe70e9c96f62e2eab6ba852f4fe072a6743157b47049085aa8aa1c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -8446,7 +8447,7 @@ self: {
      mkDerivation {
        pname = "Histogram";
        version = "0.1.0.2";
-       sha256 = "00f0a3lbpc7s70lzmnf9a7hjzc3yv8nfxcvz5nparr34x585zbxl";
+       sha256 = "b4af5f50e964e4acae2d7fb3ee2cda7eb02fe151c9d9fa2938fab0bbe850c001";
        libraryHaskellDepends = [ base containers gnuplot ];
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8458,7 +8459,7 @@ self: {
      mkDerivation {
        pname = "Hmpf";
        version = "0.1";
-       sha256 = "0lw2d9yv3zxqv20v96czx0msahbyk0rc5d68gj567dxnyb377yx7";
+       sha256 = "a7fb73c6f2b6b7638a7cc8b4c232987e41a52be89f99b481d8b8ffb17d6a8253";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -8477,7 +8478,7 @@ self: {
      mkDerivation {
        pname = "Hoed";
        version = "0.2.2";
-       sha256 = "0b6jljwn8dq2szhz3k9axfphv3yi0zq7rhligvlwa5p8hr49wblx";
+       sha256 = "9d2e9e4886e816c5e97e91c27cf007d18f0dafeb2acdf1e1d7023764b9a4d22c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -8494,7 +8495,7 @@ self: {
      mkDerivation {
        pname = "HoleyMonoid";
        version = "0.1.1";
-       sha256 = "1z3d80r6w8n7803q52xlp8mzpk87q1pr3mnz6dswp39q3gygr9fr";
+       sha256 = "d9a5fcfc1b388dcb7533dfd6916fc007cdfb2bbab48b820740c7226e32406dfc";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/MedeaMelana/HoleyMonoid";
        description = "Monoids with holes";
@@ -8509,7 +8510,7 @@ self: {
      mkDerivation {
        pname = "Holumbus-Distribution";
        version = "0.1.1";
-       sha256 = "1mhljxyfv02pfy2lyh10nlv5x05qvv37ij9i6c8c17f5b5qcgc78";
+       sha256 = "e8b0c77059c59dc0103331c978c6deb8805e36b520404f85775780ed7c9714d6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -8531,7 +8532,7 @@ self: {
      mkDerivation {
        pname = "Holumbus-MapReduce";
        version = "0.1.1";
-       sha256 = "0dqwj7xpw1lidv7ixfm1wzfx6psrzl2q08x3scyiskpm3a2l67q8";
+       sha256 = "081f43851af54e1d3dd3a3238005fd595fd3dde7a1ba1ecf6e91067efb911c37";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -8554,7 +8555,7 @@ self: {
      mkDerivation {
        pname = "Holumbus-Searchengine";
        version = "1.2.3";
-       sha256 = "1kx0j4f13fj6k3xlhh5cmlb7lz35vyqd0sp913yy8yc2h56ybbqq";
+       sha256 = "18afe54d818279e4fd08e96ad0b0df657c7a16adac4048fb9846ba111c91a0cf";
        libraryHaskellDepends = [
          base binary bytestring bzlib containers deepseq directory
          enummapset filepath hslogger hxt hxt-cache hxt-curl
@@ -8575,7 +8576,7 @@ self: {
      mkDerivation {
        pname = "Holumbus-Storage";
        version = "0.1.0";
-       sha256 = "1zs6m3rsxh3886idcn0qm056bzv9yllgf3n2qsfa97cpbzhah54q";
+       sha256 = "9814a8e05f979da49cc6c20ef728f569ff650aa81858d6a24168c0aef3a846ff";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -8593,7 +8594,7 @@ self: {
      mkDerivation {
        pname = "Homology";
        version = "0.1.1";
-       sha256 = "12cqfy2vpshly1rgjclzpnhb094s5wr038ahh5agsx03x6mnsr9n";
+       sha256 = "36656dabe90374fd548150a101322f9a24b0a0bd9f32f972f014eabb85779889";
        libraryHaskellDepends = [ base containers vector ];
        homepage = "http://www.math.ucla.edu/~damek";
        description = "Compute the homology of a chain complex";
@@ -8608,7 +8609,7 @@ self: {
      mkDerivation {
        pname = "HongoDB";
        version = "0.0.1";
-       sha256 = "19dwxv7fjk2k55mxgsc2gjx5jp9vr77yg01292gdj1piwmxx459v";
+       sha256 = "3b15d27be5f106d99e482280e7cfc93b5d59ba7c82e9d76b29534ce9ceeebca5";
        libraryHaskellDepends = [
          attoparsec attoparsec-binary base blaze-builder bytestring
          directory enumerator hashable monad-control mtl unix
@@ -8626,7 +8627,7 @@ self: {
      mkDerivation {
        pname = "HostAndPort";
        version = "0.2.0";
-       sha256 = "1rjv6c7j6fdy6gnn1zr5jnfmiqiamsmjfw9h3bx119giw3sjb9hm";
+       sha256 = "15a625f5e0f1a510fa1a307127abae2ae2589d9525ff60ed33be39230f335be6";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base doctest hspec ];
        homepage = "https://github.com/bacher09/hostandport";
@@ -8639,7 +8640,7 @@ self: {
      mkDerivation {
        pname = "Hricket";
        version = "0.1";
-       sha256 = "0cmmhljlgb23kr6v8as2cma3cpgr6zpkb11qg6hmq1ilbi363282";
+       sha256 = "028961465c34065ca179388435ef37f95d365465422bb44d9e43ac472585b532";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers ];
@@ -8658,7 +8659,7 @@ self: {
      mkDerivation {
        pname = "Hs2lib";
        version = "0.6.3";
-       sha256 = "0yjkghshbdbajib35hy3qr8x608i9qi2pgffpi59118krcw6k8mn";
+       sha256 = "b6a26938cb1385904abccebd2b224e1101d351c6c3c33256946ab505357c537a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -8684,7 +8685,7 @@ self: {
      mkDerivation {
        pname = "HsASA";
        version = "0.2";
-       sha256 = "1kdf2yq3v8lr84h2pf1ydi6vrqfr685vbkxjz4ai5wd2mij8i361";
+       sha256 = "c18c8864aca2f11215f9b2cfb50b32d9e1bc4d6c3eb82b204199a23db017aecd";
        libraryHaskellDepends = [ array base random ];
        homepage = "http://repetae.net/recent/out/HsASA.html";
        description = "A haskell interface to Lester Ingber's adaptive simulating annealing code";
@@ -8696,7 +8697,7 @@ self: {
      mkDerivation {
        pname = "HsHaruPDF";
        version = "0.0.0";
-       sha256 = "1yifhxk1m3z2i7gaxgwlmk6cv2spbpx8fny4sn59ybca8wd9z7ps";
+       sha256 = "fa9e9f1a478a2d9f8ad5c45b87fa5d578bcdccac94bfaede89e28f1a66872efa";
        libraryHaskellDepends = [ base ];
        description = "Haskell binding to libharu (http://libharu.sourceforge.net/)";
        license = stdenv.lib.licenses.bsd3;
@@ -8710,7 +8711,7 @@ self: {
      mkDerivation {
        pname = "HsHyperEstraier";
        version = "0.4";
-       sha256 = "0q7nngghplw97q5cmayqkkixa5lbprilvkcv0260yaz7wg5xpqk8";
+       sha256 = "68e2dbcbe3e72b0f8c009bcd4d63be8b16d5e39cd8abca0a3e89d30bdfb3f660";
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring network text
        ];
@@ -8727,7 +8728,7 @@ self: {
      mkDerivation {
        pname = "HsJudy";
        version = "0.2";
-       sha256 = "1ypdsjy7gn6b3ynn17fcpirgwq3017jahm3pj5fh4qr6zr1cljkh";
+       sha256 = "704aca42fe2663025d917754a8e4096060fe72bccc9d60ad1fcbd877bcd4edfa";
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ Judy ];
        homepage = "http://www.pugscode.org/";
@@ -8743,7 +8744,7 @@ self: {
      mkDerivation {
        pname = "HsOpenSSL";
        version = "0.11.1.1";
-       sha256 = "1hf4xgc2488hm0y9isrl7mxlacf1iazb6h1l1wz8dab8x5sf0qaa";
+       sha256 = "4a61e074e968a9863e0f3440b3be8ac131457b3d34eb983ca8102122d8ebc4c1";
        libraryHaskellDepends = [
          base bytestring network old-locale time
        ];
@@ -8761,7 +8762,7 @@ self: {
      mkDerivation {
        pname = "HsOpenSSL-x509-system";
        version = "0.1.0.2";
-       sha256 = "16r82d6mk5l1pb0vvc16d1cn5pi4wg9k83y7vr9gl9ackz345jgc";
+       sha256 = "ecc942c69f4c25fa52dec70f34d3e324de62596826b0bdc1ba8196594d13289b";
        libraryHaskellDepends = [ base bytestring HsOpenSSL unix ];
        homepage = "https://github.com/redneb/HsOpenSSL-x509-system";
        description = "Use the system's native CA certificate store with HsOpenSSL";
@@ -8773,7 +8774,7 @@ self: {
      mkDerivation {
        pname = "HsParrot";
        version = "0.0.2.20120717";
-       sha256 = "19f95cyxcyhsk2x13l7csahgnn8rs029s3hdlxp5z0d3a9vb41gd";
+       sha256 = "ed05b27652a3815f6ea70d0e9d04d01959fba0d2ecd011ba981a7ad63d2bc9a5";
        libraryHaskellDepends = [
          base bytestring HsSyck pretty pugs-DrIFT
        ];
@@ -8787,7 +8788,7 @@ self: {
      mkDerivation {
        pname = "HsPerl5";
        version = "0.0.6";
-       sha256 = "0czhibr8lw4mjinwszjp4nh1ifi1xgkynwbjs6l3k97dqfd8bw4v";
+       sha256 = "9bf0859ac3eda439a8d17271ebe7eb21ba18a025577ecd6d9495708af28af033";
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to embedded Perl 5 interpreter";
        license = stdenv.lib.licenses.bsd3;
@@ -8799,7 +8800,7 @@ self: {
      mkDerivation {
        pname = "HsSVN";
        version = "0.4.3.3";
-       sha256 = "1yx4dzcjmykk4nzrh888jhikb8x635dpx7g27rgnlaiy5nid3pc7";
+       sha256 = "87ddd1a22d3e2a6a5f3ee29d7e5b19a6a3352394082198bf2573fa2ad96fa4fb";
        libraryHaskellDepends = [ base bytestring mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/phonohawk/HsSVN";
@@ -8813,7 +8814,7 @@ self: {
      mkDerivation {
        pname = "HsSyck";
        version = "0.53";
-       sha256 = "17r4jwnkjinmzpw9m2crjwccdyv9wmpljnv1ldgljkr9p9mb5ywf";
+       sha256 = "8efbb26aba294f495fa3615b496fe569fbc6189799899af8fdd546392d97249f";
        libraryHaskellDepends = [
          base bytestring hashtables syb utf8-string
        ];
@@ -8826,7 +8827,7 @@ self: {
      mkDerivation {
        pname = "HsTools";
        version = "0.0.1.1";
-       sha256 = "0banfivx4xc0j3c1qmda31gvvrqqsg12fzizcpman2fvdlk7kn5l";
+       sha256 = "b4d879266ddb09abea653f7e27c2d318e7bd5f18aa551cd8908075d27774562d";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Haskell helper functions";
        license = stdenv.lib.licenses.bsd3;
@@ -8841,7 +8842,7 @@ self: {
      mkDerivation {
        pname = "Hsed";
        version = "0.2.2";
-       sha256 = "09v2gcazqlmw7j7sqzzzmsz1jr3mrnfy3p30w9hnp2g430w10r2a";
+       sha256 = "4a64103818e4896b61e260dce19dcd756419beaeff7fac8f3cbc52fc157b6227";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -8863,7 +8864,7 @@ self: {
      mkDerivation {
        pname = "Hsmtlib";
        version = "2.8.8.8";
-       sha256 = "1zb5s5rwcqc90c3zv332k44p7l13ngp9nqci8qalnlbxbypx3hab";
+       sha256 = "4bc1d1af5f7d514b154691619beeb323d0730999628cfd07038961c673d165fd";
        revision = "1";
        editedCabalFile = "01f30561cce8648a656f075ba1e1f8c23144e7f10c6377a7949881dc513f8a89";
        libraryHaskellDepends = [
@@ -8883,7 +8884,7 @@ self: {
      mkDerivation {
        pname = "HueAPI";
        version = "0.2.5";
-       sha256 = "1yz0cjacywrv72hj9dqf9c3zqslhcfz68z149hhv49f7g7k5m64i";
+       sha256 = "91985ae679c725b2214c247c64be63906afc074b0eb724a1383b73cf9464e0fb";
        libraryHaskellDepends = [
          aeson base containers lens lens-aeson mtl transformers wreq
        ];
@@ -8899,7 +8900,7 @@ self: {
      mkDerivation {
        pname = "Hungarian-Munkres";
        version = "0.1.5";
-       sha256 = "0g2hgcrsfwqp4w3mzg6vwi7lypgqd0b6axaff81wbi27h9n8q4qd";
+       sha256 = "0d138c6c8247c4c503724e75651668f85d4f4fe4dbbc5f07271773a7337b503c";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          array base Munkres random tasty tasty-quickcheck
@@ -8913,7 +8914,7 @@ self: {
      mkDerivation {
        pname = "IDynamic";
        version = "0.1";
-       sha256 = "1p4h2hxwzp0bxkzh864vkqbwychi0j2c3rqck9vk5kfax5i1jfz8";
+       sha256 = "e83b1962e9cacd32779a0ce7c184041132cf179e9b1804ffec0bdccf3b1490dc";
        libraryHaskellDepends = [ base containers directory ];
        jailbreak = true;
        description = "Indexable, serializable form of Data.Dynamic";
@@ -8926,7 +8927,7 @@ self: {
      mkDerivation {
        pname = "IFS";
        version = "0.1.1";
-       sha256 = "1r2dbpsmmsgxb43ycsz54zxcyfwanp72r9ry645mjlshg4q360xr";
+       sha256 = "b9033330795053590b313ea72cceb58a3bcffa27e56be60759fde95af55d4de4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -8945,7 +8946,7 @@ self: {
      mkDerivation {
        pname = "INblobs";
        version = "0.1.1";
-       sha256 = "04il63xafq20jn3m4hahn93xxfrp6whrjvsz974zczxqm41ygb10";
+       sha256 = "20ace703a9b87ff6c9495f6f99213737bbde47b250415287954060a7fa303412";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -8963,7 +8964,7 @@ self: {
      mkDerivation {
        pname = "IOR";
        version = "0.1";
-       sha256 = "0iinsva0pwparpg4lkgx8mw8l49rnl1h3zzblp89nkqk5i7qhq8a";
+       sha256 = "0a61884f2c134f9bd0a5ebff0103b539118a7845fd4d4adecdeaf20bd4d63646";
        libraryHaskellDepends = [ base mtl ];
        description = "Region based resource management for the IO monad";
        license = stdenv.lib.licenses.bsd3;
@@ -8977,7 +8978,7 @@ self: {
      mkDerivation {
        pname = "IORefCAS";
        version = "0.2.0.1";
-       sha256 = "06vfck59x30mqa9h2ljd4r2cx1ks91b9gwcr928brp7filsq9fdb";
+       sha256 = "abb984358deedcbc904899f19756487a86ce44264d520193c2158c9eca646e1b";
        libraryHaskellDepends = [ base bits-atomic ghc-prim ];
        testHaskellDepends = [
          base bits-atomic ghc-prim HUnit QuickCheck time
@@ -8993,7 +8994,7 @@ self: {
      mkDerivation {
        pname = "IOSpec";
        version = "0.3";
-       sha256 = "0dwl2nx8fisl1syggwd3060wa50lj5nl9312x4q7pq153cxjppyy";
+       sha256 = "dedf2b3b1b25e07b30e9228c446d911414c58101a3f1f7bc0e544787ba159437";
        libraryHaskellDepends = [ base mtl QuickCheck Stream ];
        description = "A pure specification of the IO monad";
        license = stdenv.lib.licenses.bsd3;
@@ -9006,7 +9007,7 @@ self: {
      mkDerivation {
        pname = "IPv6Addr";
        version = "0.6.0.2";
-       sha256 = "0qzrida38n92ngrrnmjpdg3vinjjscijz8fsfr7lyffaw55k6pld";
+       sha256 = "8d5e334be1ca394f4f76daa12f23d352dab8c76b57569bf3b3225934548bf963";
        libraryHaskellDepends = [
          attoparsec base iproute network network-info random text
        ];
@@ -9023,7 +9024,7 @@ self: {
      mkDerivation {
        pname = "IcoGrid";
        version = "0.1.2";
-       sha256 = "0ryb2q5xfddcx2qg019jajac7xvaw2ci5wi094gbrqhhflj7wc8n";
+       sha256 = "16317e247510e2bc1e4920f21299e06af7c394543205f0b0e8ac35d70b16cb67";
        libraryHaskellDepends = [ array base GlomeVec ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/IcoGrid";
@@ -9036,7 +9037,7 @@ self: {
      mkDerivation {
        pname = "IfElse";
        version = "0.85";
-       sha256 = "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa";
+       sha256 = "8ad3bfc3e2c867e6330d9bff874b3105476c35b2e1638fd448f233e9f80addcd";
        libraryHaskellDepends = [ base mtl ];
        description = "Anaphoric and miscellaneous useful control-flow";
        license = stdenv.lib.licenses.bsd3;
@@ -9047,7 +9048,7 @@ self: {
      mkDerivation {
        pname = "Imlib";
        version = "0.1.2";
-       sha256 = "075x1vcrxdwknzbad05l08i5c79svf714yvv6990ffvsfykiilry";
+       sha256 = "3ed318a7777a3b0752327b7b128edb3a1d562202b480a6d6b793b79ed90ebd1c";
        libraryHaskellDepends = [ array base X11 ];
        librarySystemDepends = [ imlib2 ];
        license = stdenv.lib.licenses.bsd3;
@@ -9058,7 +9059,7 @@ self: {
      mkDerivation {
        pname = "ImperativeHaskell";
        version = "2.0.0.1";
-       sha256 = "06px87hc6gz7n372lvpbq0g2v2s0aghd3k5a1ajgn5hbxirhnpwb";
+       sha256 = "8b5f0b73ec0b16fba40aaaccd1e053408b2d1ec0eb6e2aceb0e73fc3e041fd1a";
        libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/mmirman/ImperativeHaskell";
        description = "A library for writing Imperative style haskell";
@@ -9071,7 +9072,7 @@ self: {
      mkDerivation {
        pname = "IndentParser";
        version = "0.2.1";
-       sha256 = "0l9k8md2n0vhjqlvxcaf43i4cv09lnbbbw8vfz7bkbzhbwirs32j";
+       sha256 = "520c9d235ff0afb9ce771bf1b596a5096c46e2204eb1be299670032b5a453351";
        libraryHaskellDepends = [ base parsec ];
        homepage = "http://www.cse.iitk.ac.in/~ppk";
        description = "Combinators for parsing indentation based syntatic structures";
@@ -9083,7 +9084,7 @@ self: {
      mkDerivation {
        pname = "IndexedList";
        version = "0.1.0.1";
-       sha256 = "1i7gv3iqjj4j026k0ywmksbpjyqxlgb0f6bq2v0p9pkrj5q3jxfm";
+       sha256 = "d57539709179de74c116781907d6a31d7b79979e957b308d00924889e3d8efc4";
        libraryHaskellDepends = [ base PeanoWitnesses ];
        jailbreak = true;
        homepage = "https://github.com/kwf/IndexedList";
@@ -9096,7 +9097,7 @@ self: {
      mkDerivation {
        pname = "InfixApplicative";
        version = "1.1";
-       sha256 = "03c0jlnlnqm6faiandfg0kzajffk03aazkrqwav3g4vc3cdqwfgp";
+       sha256 = "f7398e1b1b6c9337b6e238cfafd400d339a9fe04cf35aba272a6624b2d95800d";
        libraryHaskellDepends = [ base haskell98 ];
        description = "liftA2 for infix operators";
        license = stdenv.lib.licenses.bsd3;
@@ -9108,7 +9109,7 @@ self: {
      mkDerivation {
        pname = "Interpolation";
        version = "0.3.0";
-       sha256 = "046bx18mlgicp26391gvgzbi0wfwl9rddam3jdfz4lpxva4q9xhv";
+       sha256 = "1bf68489dafd52f25d93a3aad672a2dc7110d77ffb85348cb82c3e5a51e8cb10";
        libraryHaskellDepends = [
          base haskell-src-meta syb template-haskell
        ];
@@ -9121,7 +9122,7 @@ self: {
      mkDerivation {
        pname = "Interpolation-maxs";
        version = "0.3.0";
-       sha256 = "0dh8d681h47jngan89vxnf8yhm31vjv8ysf21w6gclzfcl521vgn";
+       sha256 = "f6ed200a65ee53f60c0fc2698fb6dc6154e891b37d2764d5b3f2101890690836";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Multiline strings, interpolation and templating";
        license = "unknown";
@@ -9132,7 +9133,7 @@ self: {
      mkDerivation {
        pname = "IntervalMap";
        version = "0.4.0.1";
-       sha256 = "0cq0dmmawrss4jjkz3br0lhp37d4k7rd3cinbcyf0bf39dfk6mrf";
+       sha256 = "2e57335d4bc32de03c5b36b2d1f299a49d712105798d3fa5245a67ae6a6d0033";
        libraryHaskellDepends = [ base containers deepseq ];
        testHaskellDepends = [ base Cabal containers deepseq QuickCheck ];
        homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
@@ -9147,7 +9148,7 @@ self: {
      mkDerivation {
        pname = "Irc";
        version = "0.1.0.2";
-       sha256 = "0qh1j9zy0yfpzdjxn6mypsw555pq2gm5nzys08zj5ilqn5z2r2pi";
+       sha256 = "f18a2c7eb198c6223f02da7f5bea13f89652b8bebe1adb65fbd779e07f920162";
        libraryHaskellDepends = [
          base data-default mtl network transformers
        ];
@@ -9164,7 +9165,7 @@ self: {
      mkDerivation {
        pname = "IrrHaskell";
        version = "0.2";
-       sha256 = "1j0m4ib2r84kb7c0s3qpmv3cziq3a2mql4ga9rnqi5pqkqpz2xcc";
+       sha256 = "8c75f12f9ef896886d4eea118aab5003c7cfc6ae170f0dd85993a02c562415c8";
        libraryHaskellDepends = [ base random time ];
        description = "Haskell FRP binding to the Irrlicht game engine";
        license = "LGPL";
@@ -9179,7 +9180,7 @@ self: {
      mkDerivation {
        pname = "IsNull";
        version = "0.4.0.0";
-       sha256 = "06f03b9my7hix5fvcv9cc0saf9zfwgkvn3210vymlyc1rj450ykm";
+       sha256 = "757a5088cc81795afd06410cbbe7e3ee27a734602c6db65de9111e5fd31ac019";
        libraryHaskellDepends = [ base bytestring containers text ];
        testHaskellDepends = [
          base bytestring containers hspec HUnit QuickCheck
@@ -9200,7 +9201,7 @@ self: {
      mkDerivation {
        pname = "JSON-Combinator";
        version = "0.2.8";
-       sha256 = "0rdiva15wspaz33dh1g7x6llswsx1l4j51wqyvszzcjzifx2ly6q";
+       sha256 = "d8782aba8b5fb2fff5f6988722090d5d734da9e9e705d8c6f8ea6a5e82dab165";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-trie containers failure
          hjson json JSONb parsec text vector
@@ -9215,7 +9216,7 @@ self: {
      mkDerivation {
        pname = "JSON-Combinator-Examples";
        version = "0.0.1";
-       sha256 = "1s5grfgnklnwh55yn5mlg2ibdm7mx2i7hwqs7649gkapda054ywg";
+       sha256 = "8f7b52806a57cd9788391a7378a2e8f5d4b6a278b416eb4b81dcd2699fcbafe8";
        libraryHaskellDepends = [
          base bytestring json JSON-Combinator JSONb
        ];
@@ -9231,7 +9232,7 @@ self: {
      mkDerivation {
        pname = "JSONb";
        version = "1.0.8";
-       sha256 = "16gjdlajqvwvq1znyq3vqxfa9vq4xs0ywxpm93v0y1rgmzcfqzj7";
+       sha256 = "477eecd8af2f070ff648f576ee81ee04efa45cc77b606f7fc09b6f2c156df299";
        revision = "1";
        editedCabalFile = "47b2855a9c5769eadfdbb4eaddca6c66e6de21432d555162f2cc4dcde6e0861a";
        isLibrary = true;
@@ -9260,7 +9261,7 @@ self: {
      mkDerivation {
        pname = "JYU-Utils";
        version = "0.1.1.2";
-       sha256 = "1c3cxdzbdvmvy1qvy4xvg10zijm8vw48pgh9c8a6mykgncwq6pw9";
+       sha256 = "895f8339b36ffa6a146209be8b08dfa8caf84178bb13bf71f0bbeeb67eeb6cb0";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
          lazysmallcheck mtl mwc-random parallel process QuickCheck random
@@ -9277,7 +9278,7 @@ self: {
      mkDerivation {
        pname = "JackMiniMix";
        version = "0.1";
-       sha256 = "0ivqfk1rac1hv5j6nlsbpcm5yjqwpic34mdq9gf2m63lygqkbwqp";
+       sha256 = "17f335f1f374982adc4bb8553258bc1c4b5f2abb4b536b64d9303095c3747847";
        libraryHaskellDepends = [ base hosc ];
        homepage = "http://www.renickbell.net/doku.php?id=jackminimix";
        description = "control JackMiniMix";
@@ -9291,7 +9292,7 @@ self: {
      mkDerivation {
        pname = "Javasf";
        version = "0.0.1";
-       sha256 = "14v0skqf1s54jkscgdcxjh1yv5lcrc5ni44bizx0kw35vf07faah";
+       sha256 = "50297780db65f009fa8f8b90680bcb8c96ed03949db5c7f494a4e8e0f0d46093";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -9307,7 +9308,7 @@ self: {
      mkDerivation {
        pname = "Javav";
        version = "0.0.4";
-       sha256 = "06aiiq1bhl8gvhk2agk2rsmqrqf6ac5ym194bm5aq47hmdwi33h9";
+       sha256 = "098e1179abf010ac4a5d2485ea0b53c6e18cabce623e2526dc0f51b8028e5119";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -9323,7 +9324,7 @@ self: {
      mkDerivation {
        pname = "JsContracts";
        version = "0.5.3";
-       sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589";
+       sha256 = "0915ab4d92f72c4148bc1f1a2f19d494dd49e7364b342253bb991ed66e9b869e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -9349,7 +9350,7 @@ self: {
      mkDerivation {
        pname = "JsonGrammar";
        version = "1.0.2";
-       sha256 = "0baywdqdj0r73rfxm5zk51bgsl014s19j01wnzarfbhak8cpwcdf";
+       sha256 = "ae317e199a0a2e97d5b73c009982260150fd5628f397da5d1e2703d970e35e2d";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers hashable
          language-typescript mtl semigroups stack-prism template-haskell
@@ -9372,7 +9373,7 @@ self: {
      mkDerivation {
        pname = "JuicyPixels";
        version = "3.2.5.3";
-       sha256 = "1knq5jbwggf59h8a6aa758387q71fpzcvssg8dsr84bqwqqg2dpw";
+       sha256 = "fc36f130e678119475434febcdfe75e1e083062a4729a3104cc5bdc7972cd8ce";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -9387,7 +9388,7 @@ self: {
      mkDerivation {
        pname = "JuicyPixels-canvas";
        version = "0.1.0.0";
-       sha256 = "0y791kwg9gc3nlz5sbpszd7wiqr5b5bwmgvafyjzk9xnlxlc7xcm";
+       sha256 = "95f5c368a7b6a7f9a5776abfca575925e3c84ffbfa2e5d3eb583bdf4f80ce978";
        libraryHaskellDepends = [ base containers JuicyPixels ];
        jailbreak = true;
        homepage = "http://eax.me/";
@@ -9400,7 +9401,7 @@ self: {
      mkDerivation {
        pname = "JuicyPixels-repa";
        version = "0.7";
-       sha256 = "0fn9i3w8s2ifyg0zsdryyw1nm0c5ybaq0c6jxcggs79x0ngi0mm5";
+       sha256 = "a556109f053d1dfd1eebd23080d5f285816a03f73e37fdc1f32e0a8df888c93a";
        libraryHaskellDepends = [
          base bytestring JuicyPixels repa vector
        ];
@@ -9414,7 +9415,7 @@ self: {
      mkDerivation {
        pname = "JuicyPixels-util";
        version = "0.2";
-       sha256 = "1b2rx5g8kd83hl50carr02mz21gvkasnsddw1f3pfvfsyfv3yyrc";
+       sha256 = "2c7b3fb6f3da6d77870bbc356db59afb05f1ab00392b060a8503b5895ee959ac";
        libraryHaskellDepends = [ base JuicyPixels vector ];
        homepage = "https://github.com/fumieval/JuicyPixels-util";
        description = "Convert JuicyPixel images into RGBA format, flip, trim and so on";
@@ -9428,7 +9429,7 @@ self: {
      mkDerivation {
        pname = "JunkDB";
        version = "0.1.1.0";
-       sha256 = "0g68khpfiwknqwwa7hv7db0563hsnd3hczfd0p4nx777xqrkh2dx";
+       sha256 = "bd093833eee79c6ec905cd7d0647b31a0e53c06a67c3a338c776f2e82e9cc83c";
        libraryHaskellDepends = [
          aeson base binary bytestring conduit data-default directory
          filepath mtl network resourcet
@@ -9444,7 +9445,7 @@ self: {
      mkDerivation {
        pname = "JunkDB-driver-gdbm";
        version = "0.1.1.0";
-       sha256 = "1q8sa4w60pv7mgf17zg8yjpjvbzrg2xlpn30myp66vq2kdv293jj";
+       sha256 = "528e24769b026f63aeaf60d84bbb78f9af2daff4e8fd13dcab675f6038511ae1";
        libraryHaskellDepends = [
          base bytestring conduit directory filepath JunkDB mtl resourcet
        ];
@@ -9460,7 +9461,7 @@ self: {
      mkDerivation {
        pname = "JunkDB-driver-hashtables";
        version = "0.1.1.0";
-       sha256 = "0385f0vpp4dy9r9cqh2rr7gpx07fazzqjk9bwrbs4nka4wfnqbv0";
+       sha256 = "602f6c1d276a5aa257e62b4d89ff57ee807edfc95940cc524ebe917b3770050d";
        libraryHaskellDepends = [
          base bytestring conduit hashable hashtables JunkDB mtl resourcet
        ];
@@ -9473,7 +9474,7 @@ self: {
      mkDerivation {
        pname = "JustParse";
        version = "2.1";
-       sha256 = "16il25s1fb4b6ih6njsqxx7p7x0fc0kcwa5vqn7n7knqph6vvjaa";
+       sha256 = "4ac9bd0dbcd8ce638fc5bb28ce26600ef4734fef584b6b60348b2c177411349a";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/grantslatton/JustParse";
        description = "A simple and comprehensive Haskell parsing library";
@@ -9485,7 +9486,7 @@ self: {
      mkDerivation {
        pname = "KMP";
        version = "0.1.0.2";
-       sha256 = "14dpqfji00jq2rc09l8d1ivphpiwkryjk5sn6lrwxv8mcly3pvhn";
+       sha256 = "16ee3b3c6515edce33355697297d9e3c5e78770c0dd1045816580210a5c3b791";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [ base Cabal ];
        homepage = "https://github.com/CindyLinz/Haskell-KMP";
@@ -9498,7 +9499,7 @@ self: {
      mkDerivation {
        pname = "KSP";
        version = "0.1";
-       sha256 = "19sjr9vavxnbv5yp2c01gy6iz1q2abllcsf378n15f3z064ffqn6";
+       sha256 = "c662e788017fb8122c3ac36946e95202871f8d7f0130717dd9cbf6ad76ca52a7";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/frosch03/kerbal";
@@ -9511,7 +9512,7 @@ self: {
      mkDerivation {
        pname = "Kalman";
        version = "0.1.0.1";
-       sha256 = "1mzdaj6h21is3fwnckzq5zcxd4zqahsdppsx65bv5vdplsiadrw5";
+       sha256 = "85e7a6a2a6b7edb257315ddfdb3454f893d6d92ff84f66b91b3a06018d54edd7";
        libraryHaskellDepends = [ base hmatrix ];
        jailbreak = true;
        homepage = "https://github.com/idontgetoutmuch/Kalman";
@@ -9524,7 +9525,7 @@ self: {
      mkDerivation {
        pname = "KdTree";
        version = "0.2.1";
-       sha256 = "1vj1kbhyqh0xzwyr9v6fdyakx508vbf6n494z81yndisp115qi61";
+       sha256 = "c1445c42b83a36eb03fa24116bdcda08943e956fceec943dff1d40ece19a41ee";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -9541,7 +9542,7 @@ self: {
      mkDerivation {
        pname = "Ketchup";
        version = "0.4.3";
-       sha256 = "1f5dnxfch3xrhxbgn74adzj7lalx1fpz3cicnhvvxj2aay62a7d1";
+       sha256 = "a11d258c574ac8be37b42cb2f1af0b9d2a7ae46f8a1cfb5687b90fc85cb7adb8";
        libraryHaskellDepends = [
          base base64-bytestring bytestring directory mime-types network text
        ];
@@ -9560,7 +9561,7 @@ self: {
      mkDerivation {
        pname = "KiCS";
        version = "0.9.3";
-       sha256 = "0z5ps5apr436dbm5wkfnpqksnqi3jsqmp2zkmy37crzzinlilzvn";
+       sha256 = "767f1aa98dff677686aff38b5bb1962362ab27bed64d5eea6a66907c55d1b77c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -9585,7 +9586,7 @@ self: {
      mkDerivation {
        pname = "KiCS-debugger";
        version = "0.1.1";
-       sha256 = "1hvdqil8lfybcp2j04ig03270q5fy29cbmg8jmv38dpcgjsx6mk1";
+       sha256 = "6156d3b57cec36347695e8d5c592f0ae6070c4002f1220c565cb3b8a68c46dc3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -9606,7 +9607,7 @@ self: {
      mkDerivation {
        pname = "KiCS-prophecy";
        version = "0.1.1";
-       sha256 = "0l278x2gavm0ndbm4k0197cwyvamz37vzy7nz35lb7n5sc5b2gsr";
+       sha256 = "593fb10ad3c59e45cbf8f6f8bfcff8556dcfd949014c5257b3a06ef544474750";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base filepath KiCS ];
@@ -9623,7 +9624,7 @@ self: {
      mkDerivation {
        pname = "Kleislify";
        version = "0.0.4";
-       sha256 = "0f7f6sxb774h9dx6xy6wbcrc5b2i27k9m5ay3hq9hqsjg86qmxyl";
+       sha256 = "d4f78a0d7a526398301c5e959ae61151acc2325bdcf86e7a4b909cb3ba36ee38";
        libraryHaskellDepends = [ base ];
        description = "Variants of Control.Arrow functions, specialised to kleislis.";
        license = stdenv.lib.licenses.bsd3;
@@ -9634,7 +9635,7 @@ self: {
      mkDerivation {
        pname = "Konf";
        version = "0.1.0.0";
-       sha256 = "113jxbaw8b17j91aakxli3r3zdvnx3gvf2m57sx5d7mfk2qx28r6";
+       sha256 = "2623d1b198ae9e56ba3ea50ab7dfe876b73ff288b44fa54292272cc4d5ea7284";
        libraryHaskellDepends = [ base containers parsec ];
        jailbreak = true;
        homepage = "http://www.gkayaalp.com/p/konf.html";
@@ -9650,7 +9651,7 @@ self: {
      mkDerivation {
        pname = "KyotoCabinet";
        version = "0.1";
-       sha256 = "1l7cpppjfz5nd8k67ss959g8sg5kbsfl4zy80a3yrlwbivyrg58n";
+       sha256 = "169597fd8e8bd3ec8702c87f429d5eb33c8d5e2a49eb63266ab67c27efbdecd0";
        libraryHaskellDepends = [ base bytestring extensible-exceptions ];
        librarySystemDepends = [ kyotocabinet ];
        homepage = "https://code.google.com/p/kyotocabinet-hs/";
@@ -9666,7 +9667,7 @@ self: {
      mkDerivation {
        pname = "L-seed";
        version = "0.2";
-       sha256 = "1dj4320fpwmlqv5jzzi7x218mrsacdmmk3czb1szzq44pmfmpy32";
+       sha256 = "62f85b5dbd84e0ff75589f8d596b634ae78a82e827fe2fcbc6b4f2eb801844b6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -9684,7 +9685,7 @@ self: {
      mkDerivation {
        pname = "LDAP";
        version = "0.6.10";
-       sha256 = "10lzag91slnkd1nnh0vs9nxwrsd1k5a05c2bw4fdfzqmyrfqfl20";
+       sha256 = "4050875df6157fd71ce14bb0025499a1e9ccbb4d7a03686d68d3521dd2539f82";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -9701,7 +9702,7 @@ self: {
      mkDerivation {
        pname = "LRU";
        version = "0.1.1";
-       sha256 = "0yppxz78y5myh9f53yqz6naqj15vk2h7fl3h8h8dps72zw9c5aqn";
+       sha256 = "16abc212ffe2e8db1044705077a098bb048995351ffb515c82be168fceeff77a";
        libraryHaskellDepends = [ base containers QuickCheck ];
        homepage = "http://www.imperialviolet.org/lru";
        description = "Implements an LRU data structure";
@@ -9713,7 +9714,7 @@ self: {
      mkDerivation {
        pname = "LTree";
        version = "0.1";
-       sha256 = "0liqz3n2ycidwmg8iz7mbm0d087fcfgphvbip8bsn0hpwlf10dvw";
+       sha256 = "7c37101ce51702ab17ba716d789f63ee20d0405df5fc885ee52d322fecf83852";
        libraryHaskellDepends = [ base transformers ];
        description = "Tree with only leaves carrying the data";
        license = stdenv.lib.licenses.publicDomain;
@@ -9726,7 +9727,7 @@ self: {
      mkDerivation {
        pname = "LambdaCalculator";
        version = "0.1";
-       sha256 = "0b4na8jsiwjnvyg1pl356ryffk2sj0l5f2dsivn71ii1qqblagcz";
+       sha256 = "9f3d4517c621c670ec8eba095728905a4ce77c3665d01b9edf56f2a82552962c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -9748,7 +9749,7 @@ self: {
      mkDerivation {
        pname = "LambdaHack";
        version = "0.5.0.0";
-       sha256 = "0vzra6020jmir6pqs26fnw2pgap7l10160v5admk7wnrrnfr91r5";
+       sha256 = "2587949dcdd9f2336b5365031340a0e7aa7705b7ce088dafc9b14a208051f96f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -9784,7 +9785,7 @@ self: {
      mkDerivation {
        pname = "LambdaINet";
        version = "0.2.0.0";
-       sha256 = "1hdl25dzv19gjr8dzpq1r267v3jj2c2yiskbg0kzdcrh4cj7jcwk";
+       sha256 = "933379242330b3f627786beae80513528e7d8cc801dfdf50962f85fd5b11b4c1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -9804,7 +9805,7 @@ self: {
      mkDerivation {
        pname = "LambdaNet";
        version = "0.2.0.0";
-       sha256 = "06sg360vbayz1314djlg6z885yrknd7gz15s355kna21xjqydmz4";
+       sha256 = "e4d7e6b1ec41283b4b19ba84ff4eb333fb82d0378fca46c208dfabb581194f1b";
        libraryHaskellDepends = [
          base binary bytestring hmatrix random random-shuffle split
        ];
@@ -9822,7 +9823,7 @@ self: {
      mkDerivation {
        pname = "LambdaPrettyQuote";
        version = "0.0.0.8";
-       sha256 = "0rxh9gxsd0qh76nzib9pqgzh10gdc629ypnhbg8fjgdiaza7hyal";
+       sha256 = "547978d457b13de9d05bd05e9f8461ed8100ffc337adf8ad391083a6fb4bb067";
        libraryHaskellDepends = [
          base DebugTraceHelpers HUnit lambda-ast mtl parsec QuickCheck syb
          template-haskell test-framework test-framework-hunit
@@ -9846,7 +9847,7 @@ self: {
      mkDerivation {
        pname = "LambdaShell";
        version = "0.9.3";
-       sha256 = "1nqzlnw3fchgqn9bvlvbjma1m0wwssrip2mwb2kiv4rbhqdbfijv";
+       sha256 = "5b46b71a862b931da758bc8a1bb3d69c831a54956bd3bd92c50f3237b8a51fdb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -9863,7 +9864,7 @@ self: {
      mkDerivation {
        pname = "LargeCardinalHierarchy";
        version = "0.0.1";
-       sha256 = "0agq2593h5yb9r3jqnycis9fdizwij3and61ljc4prnhhyxv48g2";
+       sha256 = "e221b2bb87d0e64b98a4c134ab868cfcc7e6928ecc5b2c474ecb17385211f829";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "A transfinite cardinal arithmetic library including all known large cardinals";
@@ -9877,7 +9878,7 @@ self: {
      mkDerivation {
        pname = "Lastik";
        version = "0.7.0";
-       sha256 = "1bq8az2lrdqszn1aicvxj0spmwpxphvcvgkl6p0mnz8878hyxsdm";
+       sha256 = "b5e9ee213a087d5bc13574becd36bcfdf27a35907db3a882fd1ab74cc55708af";
        libraryHaskellDepends = [
          base bytestring containers directory filemanip filepath process
          pureMD5 SHA zip-archive
@@ -9895,7 +9896,7 @@ self: {
      mkDerivation {
        pname = "Lattices";
        version = "0.0.1";
-       sha256 = "1x1rxl1pc64ifjrlmqqgs0p71bqymc17ls7wlj6skk1sy7kys2f5";
+       sha256 = "c509ede7f13acca98da4fc687a02ab1eaf702ed00fe34ab37491187603ed39f4";
        libraryHaskellDepends = [ array base HaskellForMaths ];
        testHaskellDepends = [
          array base HaskellForMaths HUnit test-framework
@@ -9911,7 +9912,7 @@ self: {
      mkDerivation {
        pname = "LazyVault";
        version = "0.0.1";
-       sha256 = "1y80bzcjyk5gkzkgyn8h7sf0bg11qn4qr0qgvi640spppxqfqkjq";
+       sha256 = "584eec70bff76a404cdc0f838c89c521bc059c3e1059ffe69faf4c2fd95f00f9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath unix ];
@@ -9926,7 +9927,7 @@ self: {
      mkDerivation {
        pname = "Level0";
        version = "1.0";
-       sha256 = "1kpz8qpm2xj5nm0sav5439flyj3zdx6ha9lgg3c7ky4sjqvwwzxv";
+       sha256 = "bb7fce37969af879d8788f26054d6f7f484f5d1aa46ca541b54576512f46ffce";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory random SDL SDL-ttf ];
@@ -9942,7 +9943,7 @@ self: {
      mkDerivation {
        pname = "LibClang";
        version = "0.1.0";
-       sha256 = "12bbmgd9xh6l9c9z3r82j2csksbplha1zzzzzb8338kj81wp1pjb";
+       sha256 = "4bde70794072a231d0faffff1f14a477e9a9999002e5f1134bd4c09edaab6b89";
        libraryHaskellDepends = [ base greencard time ];
        homepage = "https://github.com/chetant/LibClang/issues";
        description = "Haskell bindings for libclang (a C++ parsing library)";
@@ -9957,7 +9958,7 @@ self: {
      mkDerivation {
        pname = "LibZip";
        version = "0.11.1";
-       sha256 = "04nzh9gqji20qhiiyy8i23cb4gy9qbdza5pkwicgghiqbyfrpk6f";
+       sha256 = "cecc9b9d5f38c2f758e4f316f5dbc2c93fb2d81011791f23c44044895f82df12";
        libraryHaskellDepends = [
          base bindings-libzip bytestring filepath mtl time utf8-string
        ];
@@ -9975,7 +9976,7 @@ self: {
      mkDerivation {
        pname = "Limit";
        version = "1.0";
-       sha256 = "1yd8c443ql17daicn3r9jiwxxjlpqnpnvkbxcszjha4i4ar94zq1";
+       sha256 = "017f92b222912828bf667dcd6dafc597cade7994290fcba26a27503c0861a8f9";
        libraryHaskellDepends = [ base ];
        description = "Wrapper for data that can be unbounded";
        license = stdenv.lib.licenses.mit;
@@ -9987,7 +9988,7 @@ self: {
      mkDerivation {
        pname = "LinearSplit";
        version = "0.2.1";
-       sha256 = "05rdlxsl5zpnczahaw2fdycqyryd3y7bccizjbn5sap23spwd7di";
+       sha256 = "b19dc6af1ee22a5dec923f32b68e1fcd678f996f4e7005d567f6fe4275a72d17";
        libraryHaskellDepends = [
          array base cmdargs haskell98 QuickCheck
        ];
@@ -10004,7 +10005,7 @@ self: {
      mkDerivation {
        pname = "LinkChecker";
        version = "0.1";
-       sha256 = "00wlyqclmzn03y86ba64pkc85kndnakgj8spv4vm7z0k8dsphnfq";
+       sha256 = "d85978754313fc5337d95723f9a6b2cdce82d8bcc4a865901fc0fe4a19f69403";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -10021,7 +10022,7 @@ self: {
      mkDerivation {
        pname = "List";
        version = "0.5.2";
-       sha256 = "1b7ar17d2sq6ibgbiqbsrhk2zlxcxiwfv2xsfbya5hs8nflzkp97";
+       sha256 = "27ddf9a9b348c3a2fc72ba8bed78ecacd32f26cc7ae1b8de8a066bd14ec8eaac";
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/yairchu/generator/tree";
        description = "List monad transformer and class";
@@ -10035,7 +10036,7 @@ self: {
      mkDerivation {
        pname = "ListLike";
        version = "4.2.0";
-       sha256 = "1ih0kjr3n576l6abasa8pnjajml27rj8h7nx3kqv2fdm7l6lk6zg";
+       sha256 = "ef9b490d3db539b1f11cdd1e88643e8256a9a4bd4869b594a1e6143bb29c00c6";
        libraryHaskellDepends = [
          array base bytestring containers dlist fmlist text vector
        ];
@@ -10053,7 +10054,7 @@ self: {
      mkDerivation {
        pname = "ListTree";
        version = "0.2.1";
-       sha256 = "1ril13w2n1sgl44qwm1ydg94cvkm2qk55hsfv5bxbb6r99xc645m";
+       sha256 = "b510c37a4ad9acd557d94ec3522616756e46d26b3e548e09a14f072bf80834e6";
        libraryHaskellDepends = [
          base directory filepath List transformers
        ];
@@ -10068,7 +10069,7 @@ self: {
      mkDerivation {
        pname = "ListZipper";
        version = "1.2.0.2";
-       sha256 = "0z3izxpl21fxz43jpx7zqs965anb3gp5vidv3pwwznr88ss2j6a9";
+       sha256 = "491929b44628dbcff91dbbc55dee1bcbaa6292c6fff42b07f9dd05416fff717c";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Simple zipper for lists";
        license = stdenv.lib.licenses.bsd3;
@@ -10079,7 +10080,7 @@ self: {
      mkDerivation {
        pname = "Logic";
        version = "0.1.0.0";
-       sha256 = "0jplyy09i2rr5l8qzkyd41wwi7yj3sxlrz8f36ygdwxnwqfk2w01";
+       sha256 = "0170311de6b6f3f6bc190efd4cbb1ed29fc87920cdcf8f112d398b9880f7f44a";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://gogotanaka.me/";
@@ -10101,7 +10102,7 @@ self: {
      mkDerivation {
        pname = "LogicGrowsOnTrees";
        version = "1.1.0.2";
-       sha256 = "1yqnrzcmx8ch9xcpg07if9cs4z1sdpyjfpgzkqkhv9i263pfgxpk";
+       sha256 = "f3f6e7ee3022a60d279eff5d27fd6d3a7ca25972f18077594f90a15ed9cf16fb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10135,7 +10136,7 @@ self: {
      mkDerivation {
        pname = "LogicGrowsOnTrees-MPI";
        version = "1.0.0.1.1";
-       sha256 = "0sqlx06i9f3wxzpk7mivbnn2k4z5n141vbkn1bj886bk5srbrx92";
+       sha256 = "22f5bcb22e731984e40a76ae1d48b0e59329ac5d3bd633efef7cb8140de8146b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10163,7 +10164,7 @@ self: {
      mkDerivation {
        pname = "LogicGrowsOnTrees-network";
        version = "1.0.0.3";
-       sha256 = "0r66pb35fpmgvkf41kxz289c9ylwv7jdf9bxbsrv7p4ylg83x2dn";
+       sha256 = "b6893ed0a39edcb3b35e7d25d7e4d99cfac41212bfcf40dcdcaf5e57c6bac664";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10193,7 +10194,7 @@ self: {
      mkDerivation {
        pname = "LogicGrowsOnTrees-processes";
        version = "1.0.0.2";
-       sha256 = "0d1kz5d83frn1591vgk33d0rw2s4z98lp993rnvhl3k5zqpr2svn";
+       sha256 = "766b912ffe650e0ab7cd23a54b51fa440b9e411b63be1d520936bb815af93334";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10222,7 +10223,7 @@ self: {
      mkDerivation {
        pname = "LslPlus";
        version = "0.4.3";
-       sha256 = "0dwsx23fibgj36181rfwfj1kl6sgdkf8bk4dd9cwia0rbjrl4qyk";
+       sha256 = "d36342b35c19a8c8596a8dcc85dc6c4f1b3a8374dce5808219f2ade886e89a37";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -10245,7 +10246,7 @@ self: {
      mkDerivation {
        pname = "Lucu";
        version = "0.7.0.3";
-       sha256 = "09vhz5gc9nmlwlxn6vk5whq6lpqbidqifx4i4lvp4n21gib64v9b";
+       sha256 = "2b6d62567c4158723725917417718b0b5f6a30e4656e633be5b4dac45ef97027";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10267,7 +10268,7 @@ self: {
      mkDerivation {
        pname = "MC-Fold-DP";
        version = "0.1.1.0";
-       sha256 = "0h76xsh4p4zbxnbk7hszwm1gj44p6349d4bkbixn7fyiyp4f0pvh";
+       sha256 = "705fe0c8f5d1bb637b5c739196c8309710f942e55fc33397edeb934ba0eee640";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10291,7 +10292,7 @@ self: {
      mkDerivation {
        pname = "MFlow";
        version = "0.4.5.9";
-       sha256 = "0mqsyx7wkfgvpppqgpjpvzwx79vj7lh4c8afzzj1hgh8z0ilb4ik";
+       sha256 = "33924523f8083e18e4ff4e2146203d72a7d3f9df57de87efbdfbb9c94ff71a57";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring case-insensitive
          clientsession conduit conduit-extra containers directory
@@ -10310,7 +10311,7 @@ self: {
      mkDerivation {
        pname = "MHask";
        version = "0.3.0.0";
-       sha256 = "0nlj914ahipyfqv1l7qr66pa0a8g4g6ks6mipc38z5f1jy0kjrva";
+       sha256 = "6a67398197c1958f06bbb11a3dcd230f29a0ae31191f1a3676fe46a84848925a";
        libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "https://github.com/DanBurton/MHask#readme";
@@ -10324,7 +10325,7 @@ self: {
      mkDerivation {
        pname = "MSQueue";
        version = "0.0.1";
-       sha256 = "04yvf4a07cy47qzl9p8x45qbk2i6yapfps7hx85p589338s8b72y";
+       sha256 = "5e9c85341a23a1720beaf0e8ebaef2268ab970211ddd443f3ec4b3031471db13";
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/Julek";
@@ -10340,7 +10341,7 @@ self: {
      mkDerivation {
        pname = "MagicHaskeller";
        version = "0.9.1";
-       sha256 = "1rr1gp808qwi0i84l6hmm03b8khnawz8qq606p5a351pd0mbxkak";
+       sha256 = "53cdbe2a683794a1ca35c0608c3e57164eb406a8151a4a5004916304d07d21e7";
        libraryHaskellDepends = [
          array base bytestring containers directory ghc ghc-paths
          haskell-src html mtl network old-time pretty random syb
@@ -10352,12 +10353,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "MailchimpSimple" = callPackage
+    ({ mkDerivation, aeson, aeson-lens, base, bytestring, directory
+     , filepath, http-conduit, http-types, lens, text, time
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "MailchimpSimple";
+       version = "0.1.0.0";
+       sha256 = "56d883bca6efde9bd9fd776d9bcf88a4f4cfba562a79687fed2bb47ea2a8eb78";
+       libraryHaskellDepends = [
+         aeson aeson-lens base bytestring directory filepath http-conduit
+         http-types lens text time transformers vector
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/Dananji/MailchimpSimple";
+       description = "A Haskell library to handle mailing lists in MailchimpSimple using its JSON API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "MaybeT" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "MaybeT";
        version = "0.1.2";
-       sha256 = "0cmnfs22ldai0z172rdsvryzsh33a70yax21v03nhr92a4b62plr";
+       sha256 = "995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632";
        revision = "1";
        editedCabalFile = "399ec60488680853ace716790b8ebaeee1a74da8a24ced5b5caaea4341b88580";
        libraryHaskellDepends = [ base mtl ];
@@ -10371,7 +10391,7 @@ self: {
      mkDerivation {
        pname = "MaybeT-monads-tf";
        version = "0.2.0.1";
-       sha256 = "034v9n6ldjn1hsv4rphvysbykm8x0jqa2prbw7k28fkp6m30j74x";
+       sha256 = "9d1c094635773a24e6e12b5fa1b0041dd5e997f61bde4cb686c1ca468d4d9b0c";
        libraryHaskellDepends = [ base monads-tf transformers ];
        jailbreak = true;
        description = "MaybeT monad transformer compatible with monads-tf (deprecated)";
@@ -10384,7 +10404,7 @@ self: {
      mkDerivation {
        pname = "MaybeT-transformers";
        version = "0.2";
-       sha256 = "189w8dpxyq7gksca6k08hb4vpanpz06c99akgzpcpjy0i7k22ily";
+       sha256 = "9e4621e689c0cbcbee7f53a5c40cf8d7aabbc982084ca3989eef60df6f433ca1";
        libraryHaskellDepends = [ base monads-fd transformers ];
        jailbreak = true;
        description = "MaybeT monad transformer using transformers instead of mtl";
@@ -10399,7 +10419,7 @@ self: {
      mkDerivation {
        pname = "MazesOfMonad";
        version = "1.0.9";
-       sha256 = "041kqz5j8xaa2ciyrfnwz6p9gcx4il5s6f34kzv9kp0s07hmn1q2";
+       sha256 = "02075be1011adc99f69f6438a30b8da4b397aef9dcbaec23134a7524cbc73310";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -10416,7 +10436,7 @@ self: {
      mkDerivation {
        pname = "MeanShift";
        version = "0.1";
-       sha256 = "0rnbg7w3qc3xsbzpw5is7w7qdjl2kqbr1acc744aggwlibazl59w";
+       sha256 = "3c15fad58a94bfa708398ca990179e82ca860f3f3a167effd27d303cf879cb66";
        libraryHaskellDepends = [ base vector ];
        jailbreak = true;
        description = "Mean shift algorithm";
@@ -10428,7 +10448,7 @@ self: {
      mkDerivation {
        pname = "Measure";
        version = "0.0.2";
-       sha256 = "1vy8ykjy9cpv661byqv21775zbyciqx2hf77c1nl58nn34x0s2ds";
+       sha256 = "ba090d3a19d6a2426d60e738283a8eccaf5fce096263bf8231fbb2e4e5f4c8ef";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "A library for units of measurement";
@@ -10441,7 +10461,7 @@ self: {
      mkDerivation {
        pname = "MemoTrie";
        version = "0.6.2";
-       sha256 = "1g4b82s30bqkfids3iywf873nyn8h7l8rp8l3xl58smj5lbi3p4x";
+       sha256 = "9ddc11172db26a54681f14dd8ce881c87a3b0e72dcc7a15b74132f30b4408bbc";
        libraryHaskellDepends = [ base void ];
        homepage = "http://haskell.org/haskellwiki/MemoTrie";
        description = "Trie-based memo functions";
@@ -10455,7 +10475,7 @@ self: {
      mkDerivation {
        pname = "MetaHDBC";
        version = "0.1.4";
-       sha256 = "0l47v2cpbngxrq1r6p95rfcs16jqwr8l1sy4bcg9liazz50i8lyr";
+       sha256 = "d9531441f95f459a1e5bc4eb4051e6589aa099cb255d9303cefdd97599d88750";
        libraryHaskellDepends = [
          base convertible hashtables HDBC HDBC-odbc mtl template-haskell
        ];
@@ -10469,7 +10489,7 @@ self: {
      mkDerivation {
        pname = "MetaObject";
        version = "0.0.6.20110925";
-       sha256 = "0cgn13rpbqkywpiki6fcl76iwmc74d0f9ixki6dg7lrg49lhb67r";
+       sha256 = "f9980569222fd3f39a89b3c7e4402387551ecda1cc9938e3e57ee275f308f631";
        libraryHaskellDepends = [ base containers stringtable-atom ];
        description = "A meta-object system for Haskell based on Perl 6";
        license = stdenv.lib.licenses.bsd3;
@@ -10481,7 +10501,7 @@ self: {
      mkDerivation {
        pname = "Metrics";
        version = "0.1.2";
-       sha256 = "1ks5h3vlla2d86wvf2a4z1qifsinya2skq8ygdk45ynnwk735y4x";
+       sha256 = "9df832cee4d6fa42667b1ee1a985f2366a1771f84409b7b9414d284af78045cf";
        libraryHaskellDepends = [ base hstats ];
        homepage = "http://github.com/benhamner/Metrics/";
        description = "Evaluation metrics commonly used in supervised machine learning";
@@ -10496,7 +10516,7 @@ self: {
      mkDerivation {
        pname = "Mhailist";
        version = "0.0";
-       sha256 = "1vxsaw2kfrx6g5y57lchcs1xwj0jnanw9svg59mjnasw53z674ck";
+       sha256 = "939163fe285c2b2b6b2a6febc4adb21248de836690d1537c79a667370557baef";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -10516,7 +10536,7 @@ self: {
      mkDerivation {
        pname = "MiniAgda";
        version = "0.2014.9.12";
-       sha256 = "14h7ksd95wiixfmvrkxw3l13qdxhrhgkhmz00mcw04bdyzfmgr0n";
+       sha256 = "16e457ddf76d11c05905e057381fccb0373c021dbccfbcabeb31f2929a9e0792";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -10539,7 +10559,7 @@ self: {
      mkDerivation {
        pname = "MissingH";
        version = "1.3.0.1";
-       sha256 = "1cwdhgqqv2riqwhsgyrpmqyzvg19lx6zp1g7xdp4rikh7rkn03ds";
+       sha256 = "ba0d60673e70c64c6eebe785fb4da729bcfd3dae37fba721c7318b8df1838db3";
        libraryHaskellDepends = [
          array base containers directory filepath hslogger HUnit mtl network
          old-locale old-time parsec process random regex-compat time unix
@@ -10559,7 +10579,7 @@ self: {
      mkDerivation {
        pname = "MissingK";
        version = "0.0.0.2";
-       sha256 = "0cynzg5piy14g5j576kf79dh4zqa5pcpwnpfl0fdkyy1rqm50q03";
+       sha256 = "0360502acec1fbd91ca0ee5a7ed92d0a7f025b3a6e9a53647924f878cbfbd633";
        libraryHaskellDepends = [ base glib template-haskell ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Useful types and definitions missing from other libraries";
@@ -10573,7 +10593,7 @@ self: {
      mkDerivation {
        pname = "MissingM";
        version = "0.0.4";
-       sha256 = "19kijf02jq8w3n2fvisb8xrws524sa690lbp9di6499xakkzyqxs";
+       sha256 = "ba63ffe7543d2562624b7751908cd24414cd73474bc7ed841d1c6129809371a6";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -10588,7 +10608,7 @@ self: {
      mkDerivation {
        pname = "MissingPy";
        version = "0.10.6";
-       sha256 = "0390ap25qj6a37jllsih39q5apgvwdjdw5m7jgfrllkp5bng6yj6";
+       sha256 = "467af3ec2a77529add93a716de64e3fb5d55701a306a4ae519ca485cc455200d";
        libraryHaskellDepends = [ anydbm base MissingH ];
        homepage = "http://github.com/softmechanics/missingpy";
        description = "Haskell interface to Python";
@@ -10601,7 +10621,7 @@ self: {
      mkDerivation {
        pname = "Modulo";
        version = "0.2.0.1";
-       sha256 = "1n90lfrvfr1ni7ninlxbs4wk0m7mibdpi9sy26ifih51nmk8nziq";
+       sha256 = "387e8b66b5a1c0e8a2115ea778db8af5543039d1ab531bed893664b7b3a320d9";
        libraryHaskellDepends = [ base numeric-prelude ];
        description = "Modular arithmetic via Numeric-Prelude";
        license = stdenv.lib.licenses.gpl2;
@@ -10612,7 +10632,7 @@ self: {
      mkDerivation {
        pname = "Moe";
        version = "0.1";
-       sha256 = "1nk767nywssg5p50wd6czcbhi61v5gcncyy3d59a90slzic8n5b3";
+       sha256 = "63158b58fc5483a45269c37b66d92b3b980817fbcc340eca2d4f6beeed3167da";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base GLUT random ];
@@ -10628,7 +10648,7 @@ self: {
      mkDerivation {
        pname = "MoeDict";
        version = "0.0.3";
-       sha256 = "0sf7qhw3z984mnprgq2jxqsx9z5v2q36hdb84fdn34rgjzrv3z9a";
+       sha256 = "2afdb1f3972f93619b236835680616bbfcd435ee52e097afad04a53f38c4c769";
        libraryHaskellDepends = [
          aeson base bytestring containers text unordered-containers
        ];
@@ -10644,7 +10664,7 @@ self: {
      mkDerivation {
        pname = "MonadCatchIO-mtl";
        version = "0.3.1.0";
-       sha256 = "0qarf73c8zq8dgvxdiwqybpjfy8gba9vf4k0skiwyk5iphilxhhq";
+       sha256 = "18c24e23bcb14ccfe3d46012b7935a0f7927eff298c7d6f76b087fc4c6715961";
        libraryHaskellDepends = [
          base extensible-exceptions MonadCatchIO-transformers
        ];
@@ -10659,7 +10679,7 @@ self: {
      mkDerivation {
        pname = "MonadCatchIO-mtl-foreign";
        version = "0.1";
-       sha256 = "0jfq5v1jigxl9mnnvpqph9ayq840s9nyb5srym04mbicri4gbjan";
+       sha256 = "56c9f548cc2cae4a40f55997e56dd28020ec558217df6d6d4db4bf28c32ed849";
        libraryHaskellDepends = [ base MonadCatchIO-mtl mtl primitive ];
        jailbreak = true;
        description = "Polymorphic combinators for working with foreign functions";
@@ -10674,7 +10694,7 @@ self: {
      mkDerivation {
        pname = "MonadCatchIO-transformers";
        version = "0.3.1.3";
-       sha256 = "1g840h7whsvgyrh4v58mdmsb7hinq785irbz6x9y08r1q8r9r90h";
+       sha256 = "10a49c32c22123e053377fe558d0c136c2b3746d15954d60f66f6bc80f0404bd";
        libraryHaskellDepends = [
          base extensible-exceptions monads-tf transformers
        ];
@@ -10689,7 +10709,7 @@ self: {
      mkDerivation {
        pname = "MonadCatchIO-transformers-foreign";
        version = "0.1";
-       sha256 = "070ifw78z2si3l1hqqvx236spdf61p3bf1qspd54fzq2dm89i1yw";
+       sha256 = "dc8798506d027f474abb1a07b7c60dc6b5abcd107d630c031d518b8f0e77111c";
        libraryHaskellDepends = [
          base MonadCatchIO-transformers primitive transformers
        ];
@@ -10707,7 +10727,7 @@ self: {
      mkDerivation {
        pname = "MonadCompose";
        version = "0.8.3.1";
-       sha256 = "0njvbz2cwc3339h87wxhl5kzb2v1ny5skqvhrsdzp95f1k8chnxa";
+       sha256 = "aa5bc8d00caea4fb9bce70e3a98bb7618bf567a1b0f383601a6330cec45f5b5a";
        libraryHaskellDepends = [
          base data-default ghc-prim mmorph monad-loops monad-products mtl
          parallel random transformers transformers-compat
@@ -10723,7 +10743,7 @@ self: {
      mkDerivation {
        pname = "MonadLab";
        version = "0.0.2";
-       sha256 = "1p8xhxxjhwr93as98pvp1z25ypgj7arka8bw75r0q46948h7nxf7";
+       sha256 = "c7757b2022c9100c72397c2135b33af25d5fc40f775f94b41a2973287b871ddd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec template-haskell ];
@@ -10739,7 +10759,7 @@ self: {
      mkDerivation {
        pname = "MonadPrompt";
        version = "1.0.0.5";
-       sha256 = "1nmy7dfzrkd8yfv5i9vlmjq9khnyi76ayvkzgcf783v5hfzcn4mh";
+       sha256 = "b012cbbe83650f741c7b7f6eafcc89dec299b0ac74a758b6f3a8cdfc5d3bbeda";
        libraryHaskellDepends = [ base mtl ];
        description = "MonadPrompt, implementation & examples";
        license = stdenv.lib.licenses.bsd3;
@@ -10752,7 +10772,7 @@ self: {
      mkDerivation {
        pname = "MonadRandom";
        version = "0.4";
-       sha256 = "14vgp2sml9jsras9l0488gy2siamcqf78y3vlr1my4lhhdx3ybyk";
+       sha256 = "d32f3f7a8390125f43a67b78741c6655452dfc4388009ab4ca5a265ab5b86f93";
        libraryHaskellDepends = [
          base mtl random transformers transformers-compat
        ];
@@ -10765,7 +10785,7 @@ self: {
      mkDerivation {
        pname = "MonadRandomLazy";
        version = "0.1";
-       sha256 = "1nsnv47mwka4bsmv7hvsx96s6w6qrzvfsn47fvcfy4fi88b56p2j";
+       sha256 = "525c531642d111efd8768758edf6cfd870a34dea7ac3b3ab5e444d5e0fd956db";
        libraryHaskellDepends = [ base MonadRandom mtl random ];
        description = "Lazy monad for psuedo random-number generation";
        license = stdenv.lib.licenses.bsd3;
@@ -10777,7 +10797,7 @@ self: {
      mkDerivation {
        pname = "MonadStack";
        version = "0.1.0.3";
-       sha256 = "0fsnc17dxmv3qnmz54gw3wy2camgp23ip9jfi543xqks0l8n7gcz";
+       sha256 = "9fbd6311057ae23e48894ea61b87b8af2a263c1ffc91f2abc563d7de4e60563b";
        libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/bhurt/MonadStack";
        description = "Generalizing lift to monad stacks";
@@ -10789,7 +10809,7 @@ self: {
      mkDerivation {
        pname = "Monadius";
        version = "0.99";
-       sha256 = "0jq59nnnydllqpvg3h2d1ylz3g58hwi0m08lmw2bv0ajzgn5mc8x";
+       sha256 = "1db15aecfb5281bd04af14810a2287a8bcf1a90f4dc0f1f6c594366fad4d054b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base directory GLUT OpenGL ];
@@ -10805,7 +10825,7 @@ self: {
      mkDerivation {
        pname = "Monaris";
        version = "0.1.8";
-       sha256 = "0myghw0w122n1czpaaqmpiyv0nragjkwnja8kb4agrwhcjfk3icb";
+       sha256 = "8bc5319d6490e7a7c89a4849cba77c2a5bb07dbc152b753f0b5688c00187cf57";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -10822,7 +10842,7 @@ self: {
      mkDerivation {
        pname = "Monatron";
        version = "0.3.1";
-       sha256 = "0250xqc5fgl8mg9yb0ykbfmxnyxacqbvi692irgfw89gf9vkh886";
+       sha256 = "06213877722f21ee5e8e2299b81766aa7bdbab5bd383e5d3ab883e5718eea008";
        libraryHaskellDepends = [ base ];
        description = "Monad transformer library with uniform liftings";
        license = stdenv.lib.licenses.bsd3;
@@ -10834,7 +10854,7 @@ self: {
      mkDerivation {
        pname = "Monatron-IO";
        version = "1.0";
-       sha256 = "0svdyfzv4xlwjnc61wwik8a60a5667lhsys49sgry65a1v2csnv0";
+       sha256 = "605bcdc40eaa189f9f4e447b0de931a62860149a91f36098959c76b2bff36d6b";
        libraryHaskellDepends = [ base Monatron transformers ];
        jailbreak = true;
        homepage = "https://github.com/kreuzschlitzschraubenzieher/Monatron-IO";
@@ -10848,7 +10868,7 @@ self: {
      mkDerivation {
        pname = "Monocle";
        version = "0.0.4";
-       sha256 = "1p8s2agsni56h7vlydbhy7qhi0qkwafpcrsfafrlg44gvpwff15y";
+       sha256 = "be04e7f8dd8f9047b3534e67769de2138308f1f170354ff781a644ab9f121add";
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "Symbolic computations in strict monoidal categories with LaTeX output";
        license = stdenv.lib.licenses.bsd3;
@@ -10860,7 +10880,7 @@ self: {
      mkDerivation {
        pname = "MorseCode";
        version = "0.0.5";
-       sha256 = "1dglyak17db7q9nd6s255w2zh8lh192vidyjvgvh53vbybymb20z";
+       sha256 = "1f8855fdf26b8f02f7dbd2b7b8450a9022f8052f4568d36cc267b513a6f2f4b5";
        libraryHaskellDepends = [ base containers split ];
        description = "Morse code";
        license = stdenv.lib.licenses.gpl3;
@@ -10873,7 +10893,7 @@ self: {
      mkDerivation {
        pname = "MuCheck";
        version = "0.3.0.4";
-       sha256 = "183p3fmzz5d67g8wmzgv8c8yyhs0cp7x3xig4cm9s98nhrsm1j0r";
+       sha256 = "19c850758616259d2a232ff6d1cf654043ef1143fbfdcad13ba695ffab1b77a0";
        libraryHaskellDepends = [
          base directory hashable haskell-src-exts hint mtl random syb
          temporary time
@@ -10892,7 +10912,7 @@ self: {
      mkDerivation {
        pname = "MuCheck-HUnit";
        version = "0.3.0.4";
-       sha256 = "05x5sfwlzzis29sps93ypsn53y2vs4cjmxifjqn7wd5lmhaxjbhj";
+       sha256 = "122ed915acb4347e2c962ef62a19d15bf851acbe7e247d75123afe4fb9d3a517";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base HUnit MuCheck ];
@@ -10907,7 +10927,7 @@ self: {
      mkDerivation {
        pname = "MuCheck-Hspec";
        version = "0.3.0.4";
-       sha256 = "0c8sd6ns8hnhc7577j0y7iqyhf7ld51zmrr3jgpckgpcghycw5mw";
+       sha256 = "bc16ce3c7cecbec9ee9323e7fa4369f438e8713c1ec873ca61d042a4ad691a31";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hspec hspec-core MuCheck ];
@@ -10922,7 +10942,7 @@ self: {
      mkDerivation {
        pname = "MuCheck-QuickCheck";
        version = "0.3.0.4";
-       sha256 = "1q242vw70jccfj19jn6wx1fm74mshd60lay9ql4379mgcl2lf6qk";
+       sha256 = "131b470565afa63308c5c92b0a4c83ba92535de8dc589982748c4970f81644e0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base MuCheck QuickCheck ];
@@ -10937,7 +10957,7 @@ self: {
      mkDerivation {
        pname = "MuCheck-SmallCheck";
        version = "0.3.0.4";
-       sha256 = "19brgllnbsbbg57jgwgd745iial53ykn7c329x9lq6gd82siavii";
+       sha256 = "316e15b540ed194c534f62b063a71f85aa180b39edf1274f796be965297d79a5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base MuCheck smallcheck ];
@@ -10952,7 +10972,7 @@ self: {
      mkDerivation {
        pname = "Munkres";
        version = "0.1";
-       sha256 = "169mgcyls0dsifnbp615r4i3g64ga2vbczsiv4aq17d1nma8sw19";
+       sha256 = "29708d54b5a19d8015d9517fb6b6508f983722c92598bbac8bba014d3d7b3599";
        libraryHaskellDepends = [ array base ];
        description = "Munkres' assignment algorithm (hungarian method)";
        license = stdenv.lib.licenses.bsd3;
@@ -10963,7 +10983,7 @@ self: {
      mkDerivation {
        pname = "Munkres-simple";
        version = "0.1.0.1";
-       sha256 = "0k5v37qrhb8i5hfx9jvkggjmry2jrzw967s17l2x561qmm59c2rb";
+       sha256 = "2b0b964aad3898d2053d411f93f8cf52f85ce57b73cbd41d2c112d98f119bb4c";
        libraryHaskellDepends = [ array base bimap containers Munkres ];
        jailbreak = true;
        description = "Simple and typesafe layer over the Munkres package";
@@ -10979,7 +10999,7 @@ self: {
      mkDerivation {
        pname = "MusicBrainz";
        version = "0.2.4";
-       sha256 = "1f1x3iivxkn5d7w3xyh2q8mpn1mg24c1n6v8dvdsph745xszh8fj";
+       sha256 = "d221f8752fe4c0abdb6e681b1b1811af067b2bc202fa3ef869c5cebe631c3db8";
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra HTTP http-conduit
          http-types monad-control resourcet text time time-locale-compat
@@ -10995,7 +11015,7 @@ self: {
      mkDerivation {
        pname = "MusicBrainz-libdiscid";
        version = "0.5.0.0";
-       sha256 = "15fwpbh8yxv41k73j9q4v5d5c5rh3q2xfp7pc7b5mc3rxipw4pa5";
+       sha256 = "455dc26fec79b05ad661f75cd7051e3017565ad9042739ce0c64778fe0badc95";
        libraryHaskellDepends = [ base containers vector ];
        homepage = "https://github.com/atwupack/MusicBrainz-libdiscid";
        description = "Binding to libdiscid by MusicBrainz";
@@ -11007,7 +11027,7 @@ self: {
      mkDerivation {
        pname = "MyPrimes";
        version = "0.1.0.0";
-       sha256 = "1bwq0fwhkw4i2kjx9xbdfn0y86j9s78kyrw9vlxq7zmv4pddazly";
+       sha256 = "9e7ed5da25bbfe833bdd89673fd1d1491ae481756df5d4e51491f009b90398af";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -11023,7 +11043,7 @@ self: {
      mkDerivation {
        pname = "NGrams";
        version = "1.1";
-       sha256 = "1niwh0ndkzgd38phx5527i14nb9swvybdjwjwbndkpb21x5j82nc";
+       sha256 = "cc0a244b0f62ddd9ece292cbb6fce63a2d4b423ca2940e2f1aedfdd92c803cda";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base HCL HTTP network regex-compat ];
@@ -11039,7 +11059,7 @@ self: {
      mkDerivation {
        pname = "NTRU";
        version = "1.0.0.0";
-       sha256 = "0n96hxzv5b1zs0xkq5ksh0hp075ca46l8xd7cs2hdnmkmi6rwvha";
+       sha256 = "0a6e9e4dacb3da068566a775440d51ac1c7021807a163c3bd03facb27f872659";
        libraryHaskellDepends = [
          arithmoi base bytestring containers crypto-api polynomial random
          SHA split
@@ -11057,7 +11077,7 @@ self: {
      mkDerivation {
        pname = "NXT";
        version = "0.2.3";
-       sha256 = "1ka1k9dww84rxx8c45dab6f92cb8mx3fy3sskw07p3f4ahv9whi3";
+       sha256 = "23429e3654c48d7b009f5a0fef46af6831919c59aa15c250ef9920ce5b9a41cd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -11082,7 +11102,7 @@ self: {
      mkDerivation {
        pname = "NXTDSL";
        version = "0.4";
-       sha256 = "117ngz15j5chnyrhj1da3r4z11vqx5g70wan7zblwr3s6n006485";
+       sha256 = "05110380357a644ed73f5671705ee97887f0491eaa0509b3b7901559c27ff684";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -11100,7 +11120,7 @@ self: {
      mkDerivation {
        pname = "NanoProlog";
        version = "0.3";
-       sha256 = "0wjjwzzc78sj7nsaq1hgxiwv0pc069mxns425lhmrlxcm0vf8fmn";
+       sha256 = "b63ae436a8acd35c212d8268db6b32805db079ec0f06acb43d52a3c3fee75272";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ListLike uu-parsinglib ];
@@ -11119,7 +11139,7 @@ self: {
      mkDerivation {
        pname = "NaturalLanguageAlphabets";
        version = "0.0.1.0";
-       sha256 = "0s2dv9vsfy1j3v7n0j35y69sjmsjcps88idd7b3f6fnxbmwms3z2";
+       sha256 = "e20f5d795ddd3ae3c63aad4584f4655257a993f1654860cf1e3278a777da4d68";
        libraryHaskellDepends = [
          array attoparsec base bimaps bytestring deepseq file-embed hashable
          hashtables intern stringable system-filepath text
@@ -11136,7 +11156,7 @@ self: {
      mkDerivation {
        pname = "NaturalSort";
        version = "0.2.1";
-       sha256 = "1xjhmjxp7w0nxvphnfh2phfpg4aqhjyg2f8q99qqavf8cq2k3za9";
+       sha256 = "49fd310566c86d85714a1839f1bc845891771dbc023a0befee16f073bbac50f6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring strict ];
@@ -11153,7 +11173,7 @@ self: {
      mkDerivation {
        pname = "Neks";
        version = "0.5.0.0";
-       sha256 = "083hkcgmrk42pyjm1xz1amdjpmccw0c72axmkk163ar6ir7aznc8";
+       sha256 = "88d9af4e8e26ab61c29cb52b7118e08cd52b5b55e1f750a5bf82cc5c1f9b7020";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -11173,7 +11193,7 @@ self: {
      mkDerivation {
        pname = "NestedFunctor";
        version = "0.2.0.2";
-       sha256 = "1kmv20haxkqn1cwy9g59nmjpn5x1rng2rrd8y3gwxfdwn8blc735";
+       sha256 = "651c4617b2bcb9cedff0a8e52c9ecda1177b65b5a9bce4390b16cfae2010bbce";
        libraryHaskellDepends = [ base comonad distributive ];
        jailbreak = true;
        homepage = "https://github.com/kwf/NestedFunctor";
@@ -11186,7 +11206,7 @@ self: {
      mkDerivation {
        pname = "NestedSampling";
        version = "0.1.4";
-       sha256 = "1sdlnjnlbk5b04zyhr7574g2ghcivzvkxnm2aak4h9bik00gb1lv";
+       sha256 = "9b86f50098712548a652a2da3ef7df91c1271e39e564e83f01abcc45adb4b4e9";
        libraryHaskellDepends = [ base random vector ];
        homepage = "https://github.com/ijt/haskell_nested_sampling";
        description = "A port of John Skilling's nested sampling C code to Haskell";
@@ -11200,7 +11220,7 @@ self: {
      mkDerivation {
        pname = "NetSNMP";
        version = "0.3.2.0";
-       sha256 = "1z3d4qmwzg3hkx78z4fbdsdh6vxnw95fkvfxgzng4bq10y6d2bb8";
+       sha256 = "682dd18c07012ff2ec7fddede94ae2b66f039b6ecb918f4e9f70bccf2b266dfc";
        libraryHaskellDepends = [ base bytestring utf8-string ];
        librarySystemDepends = [ net_snmp ];
        testHaskellDepends = [ base bytestring HUnit process utf8-string ];
@@ -11218,7 +11238,7 @@ self: {
      mkDerivation {
        pname = "Network-NineP";
        version = "0.4.0";
-       sha256 = "1h6p1p16wvsi6pjpz2xdvbljd394bzpqqfiah7aq9d7f7zh7hzid";
+       sha256 = "2d7e78e03feeb484d5812a3a8cef5f248d26e9daad8b7fe535516f6ec20dd7c0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -11235,7 +11255,7 @@ self: {
      mkDerivation {
        pname = "NewBinary";
        version = "0.2.1";
-       sha256 = "0cp71hkx8cccx7jxf5qw1bxdylcc56v68mvjp0dn9hkh1idxplzq";
+       sha256 = "f8d3db5b0c70c2641bb8725764b6298c51dffa0a1c17d7e5e98c31d4270ce732";
        libraryHaskellDepends = [ array base integer ];
        jailbreak = true;
        description = "A binary I/O library";
@@ -11248,7 +11268,7 @@ self: {
      mkDerivation {
        pname = "NineP";
        version = "0.0.2.1";
-       sha256 = "1k6qdp4zmqjl2f6cqy1zzzl6ncb2m9r0qgh4c24i2h5kkxmm3cab";
+       sha256 = "4bb1516b9fb340118960043e0c72aa62316be8ff3f78cc8c1354e2fac96dd8cc";
        libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://9ph.googlecode.com";
        description = "9P2000 in pure Haskell";
@@ -11262,7 +11282,7 @@ self: {
      mkDerivation {
        pname = "Ninjas";
        version = "0.1.0.0";
-       sha256 = "0wz80cv7m7m4q6y6rd07y422b97hyhnb9yl6bj68pi1nxmjzcjhm";
+       sha256 = "154af665ed36c48b8c5c86fab42cf4f0a42504f107b46cbcc1a49e7a3603e873";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -11284,7 +11304,7 @@ self: {
      mkDerivation {
        pname = "NoSlow";
        version = "0.2";
-       sha256 = "1pr1v8xxnhd7yxbhjqhlkwlsfzbk425bmxn99d80w8p4biag104x";
+       sha256 = "9d80f0545ce4220e504bc9f6ba8a20737da7299f14620957f7a741db3bda21df";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -11303,7 +11323,7 @@ self: {
      mkDerivation {
        pname = "NoTrace";
        version = "0.2.0.1";
-       sha256 = "053w0j90sf16by9pqllgjxy6r57vzlq33fgwz4ywjn6bypw6009d";
+       sha256 = "2d0160f8f5cb58c93df9fcb93130fdfb946c7c978f527c935f26380d92047c14";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        jailbreak = true;
@@ -11317,7 +11337,7 @@ self: {
      mkDerivation {
        pname = "Noise";
        version = "1.0.6";
-       sha256 = "0sjyq8nilqhmlhbagi1ms2zh7fyhzci9w5hj3dyxpd2ccq1bbvyq";
+       sha256 = "d8efb502664cb4db7d1b12169e22fbd0bb03bfd035c4a716a415621a2dc25e6a";
        libraryHaskellDepends = [ array base data-default vector ];
        description = "A Haskell coherent noise generator based on libnoise";
        license = stdenv.lib.licenses.bsd3;
@@ -11331,7 +11351,7 @@ self: {
      mkDerivation {
        pname = "Nomyx";
        version = "0.7.6";
-       sha256 = "1zbrirplcgff9z75lmamh0i5749m22kvnwcr3s51wajnvh982qi3";
+       sha256 = "23628112dc562a1e8a1e9971bba710359153228055555ace4fce3d466f8e79fd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -11357,7 +11377,7 @@ self: {
      mkDerivation {
        pname = "Nomyx-Core";
        version = "0.7.6";
-       sha256 = "16s60gap32kjs62zxjddppxyg9jhamzgm4d41mfg3vviadlacdrq";
+       sha256 = "3837a6685371eff15c0da491fa7e5550a6e7fbbdadc9fe85d1728a71d503469b";
        libraryHaskellDepends = [
          acid-state aeson base blaze-html blaze-markup bytestring data-lens
          data-lens-fd data-lens-template DebugTraceHelpers deepseq directory
@@ -11381,7 +11401,7 @@ self: {
      mkDerivation {
        pname = "Nomyx-Language";
        version = "0.7.6";
-       sha256 = "0na9nm6qnayip2lx3nd3if4c1iyp7zs89jp2dgb7zkmbiwvax3l9";
+       sha256 = "898eae368fabce7fd66be2ca84f43fd7c7c0888ba3d9d1a9b8d12b8b4db54959";
        libraryHaskellDepends = [
          base Boolean containers data-lens data-lens-fd data-lens-template
          DebugTraceHelpers ghc mtl old-locale random safe time
@@ -11401,7 +11421,7 @@ self: {
      mkDerivation {
        pname = "Nomyx-Rules";
        version = "0.1.0";
-       sha256 = "16kzpdvn57sdmpqkwswgixm6pnyi01vj44yvzczn9sy4azwd10q5";
+       sha256 = "0583d0f857c4eb643ffbdb13227700d1db6b6a8f8f6b3ef1ad4d9f6277bb7f9a";
        libraryHaskellDepends = [
          base containers ghc hint-server hslogger mtl old-locale safe stm
          time time-recurrence
@@ -11422,7 +11442,7 @@ self: {
      mkDerivation {
        pname = "Nomyx-Web";
        version = "0.7.6";
-       sha256 = "193v967bzhs0linqvh93w7viwdrlmsbdpnr8asigqhp5905zdjb7";
+       sha256 = "67c9f60b48e542fca25628dbdb96ae34371ef7e123c18d6da440c3bf8e497ba4";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring data-lens data-lens-fd fb
          filepath happstack-authenticate happstack-server hscolour mtl
@@ -11442,7 +11462,7 @@ self: {
      mkDerivation {
        pname = "NonEmpty";
        version = "0.1";
-       sha256 = "0nycv791c6b5bcaz5y9wm3wxn1p930p163qs1rpdiix04fnaxgxl";
+       sha256 = "b4bfaeac23a0c7d86e0e1a0f132e18e906dbf9a83cf9f2155b651916d2d9cc5b";
        libraryHaskellDepends = [ base ];
        description = "Library providing a non-empty list datatype, and total functions operating on it";
        license = stdenv.lib.licenses.bsd3;
@@ -11455,7 +11475,7 @@ self: {
      mkDerivation {
        pname = "NonEmptyList";
        version = "0.0.9";
-       sha256 = "09515y7ax4vndsj1828b6xxnnkml4vg9x29rn3lrw3rc65fi11x2";
+       sha256 = "a287105d312c0f9ee9b039899ede26b44e6b7b370b0914a46e7693ae8e2fa124";
        libraryHaskellDepends = [
          base category-extras QuickCheck Semigroup test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -11471,7 +11491,7 @@ self: {
      mkDerivation {
        pname = "NumInstances";
        version = "1.4";
-       sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb";
+       sha256 = "cbdb2a49346f59ceb5ab38592d7bc52e5205580d431d0ac6d852fd9880e59679";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/conal/NumInstances";
        description = "Instances of numeric classes for functions and tuples";
@@ -11483,7 +11503,7 @@ self: {
      mkDerivation {
        pname = "NumLazyByteString";
        version = "0.0.0.1";
-       sha256 = "17ca34hxaz9xk3ykkzp14n7wb31aiza12859k3rmvwhnq4j89jqs";
+       sha256 = "1acb8424c116f25df398a92011d48f2a8cc58f25e1fe39fd983d7dd521198a9d";
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Num, Enum, Eq, Integral, Ord, Real, and Show instances for Lazy ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -11494,7 +11514,7 @@ self: {
      mkDerivation {
        pname = "NumberSieves";
        version = "0.1.2";
-       sha256 = "1w8y46ivli37rlhkdrnw13qv6f0m13a88w0qkfw949b09vdp2nw2";
+       sha256 = "825b71db4e602592b89b187084d4081538b3f108dce63621cd6744baa3211ef1";
        libraryHaskellDepends = [ array base ];
        homepage = "http://patch-tag.com/r/lpsmith/NumberSieves";
        description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient";
@@ -11507,7 +11527,7 @@ self: {
      mkDerivation {
        pname = "Numbers";
        version = "0.2.1";
-       sha256 = "1z1v396lar6b0lyis3k5gn5kn17ndggm8j7qxnhirlpgm831fgg7";
+       sha256 = "e73d1706aaefd21ca1edf84854df6bf6043b8b7d650e1d3d05cb64454d1a3bfc";
        libraryHaskellDepends = [ base random ];
        homepage = "http://page.mi.fu-berlin.de/aneumann/numbers/index.html";
        description = "An assortment of number theoretic functions";
@@ -11521,7 +11541,7 @@ self: {
      mkDerivation {
        pname = "Nussinov78";
        version = "0.1.0.0";
-       sha256 = "1j9qmin7fqwfy69f7wi1is1nawhh46phda6na20am7r8cjzdnjsh";
+       sha256 = "504bdbbe64289faa8050d6a806af21107265838e21f2e392f18e63776cac38c9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -11539,7 +11559,7 @@ self: {
      mkDerivation {
        pname = "Nutri";
        version = "0.1";
-       sha256 = "1m7qx5zydz5jpk6a55k7rzchlwmkd91gsiqmn26qqn50ab3di35j";
+       sha256 = "b28cd8c652a0588c8db01547fd426ab3720ad9cf6796a2ccbcb2fce67fe9f8d4";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/frosch03/Nutri";
@@ -11552,7 +11572,7 @@ self: {
      mkDerivation {
        pname = "OGL";
        version = "0.0.3";
-       sha256 = "1w8lpi2r315b4ry234gi4rq09j92zvhr9ibxwsig6544cbb5g8qm";
+       sha256 = "15a357d6628414f3a2e67dc594e1fe22c9047026f191217c26ab849145bc14f1";
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://haskell.org/haskellwiki/OGL";
        description = "A context aware binding for the OpenGL graphics system";
@@ -11567,7 +11587,7 @@ self: {
      mkDerivation {
        pname = "OSM";
        version = "0.6.4";
-       sha256 = "1m606r0lc0hsniqn7krm2hpvhj7y6sq4qbjjj4g8n4hap6v4syr9";
+       sha256 = "297b4db6b90a128b1e91522e4cb036fe48b82f1435cf6371b41a02464136c0d4";
        libraryHaskellDepends = [
          base comonad-transformers containers data-lens hxt newtype
        ];
@@ -11582,7 +11602,7 @@ self: {
      mkDerivation {
        pname = "OTP";
        version = "0.0.0.1";
-       sha256 = "0vcxyfk1vx30cfngq5cv3lc34x0sxsirykhbi4ygw5pvd9ylzadb";
+       sha256 = "aba94f7d6afb16fe3c890b4e9fa3ee1a7432181d9b15fcac6360f41da6f39d6d";
        libraryHaskellDepends = [ base Crypto time ];
        testHaskellDepends = [ base Crypto time ];
        homepage = "https://github.com/matshch/OTP";
@@ -11595,7 +11615,7 @@ self: {
      mkDerivation {
        pname = "Object";
        version = "1.0";
-       sha256 = "05lrqq4008vnfs2x8kxlyrgdvxmzk04rqvn0w65b691bp3vwnbf9";
+       sha256 = "c92dcbf7b82b24b38ae1c06e9c0998bff6dd5ef6b44fd4857676230008c69916";
        libraryHaskellDepends = [ base containers ghc template-haskell ];
        homepage = "https://github.com/yokto/object";
        description = "Object oriented programming for haskell using multiparameter typeclasses";
@@ -11610,7 +11630,7 @@ self: {
      mkDerivation {
        pname = "ObjectIO";
        version = "1.0.1.1";
-       sha256 = "1f8ac7dk1ls6xla3w0wy2qr164kv67k5ilj7niakfr9x74mpp6jy";
+       sha256 = "5e9a7b2b393d653755b447d258e6317b121332169e033e14ed46d330db610ab9";
        librarySystemDepends = [
          comctl32 comdlg32 gdi32 kernel32 ole32 shell32 user32 winmm
          winspool
@@ -11626,7 +11646,7 @@ self: {
      mkDerivation {
        pname = "ObjectName";
        version = "1.1.0.0";
-       sha256 = "0kh5fb9ykag6rfsm3f0bx3w323s18w2cyry34w5xgli5ncqimadg";
+       sha256 = "afa91a31b325d2d70b27c367cf0447410f31f8e80bb851b5cbe6a9e9d372054e";
        libraryHaskellDepends = [ base transformers ];
        homepage = "https://github.com/svenpanne/ObjectName";
        description = "Explicitly handled object names";
@@ -11641,7 +11661,7 @@ self: {
      mkDerivation {
        pname = "Obsidian";
        version = "0.1.0.0";
-       sha256 = "14dbaj54i4li4hbc2bhl19ma9vgs97mfz8xfwvlndldb2kac4x01";
+       sha256 = "0174c2d414abd166e9e6aea3efea49faeda46a0a142ec116249192488a54ab91";
        libraryHaskellDepends = [
          base containers cuda language-c-quote mainland-pretty mtl
          mwc-random process rdtsc text value-supply vector
@@ -11657,7 +11677,7 @@ self: {
      mkDerivation {
        pname = "Octree";
        version = "0.5.4.2";
-       sha256 = "0q07jylv5ggvnp32h3b63pk1rcvvxh7bzi3dyx4ga2s0zwfaq1q2";
+       sha256 = "0207ac1cff400bf548f76dc4bf0eec7bb31ce61d660d28c6b5fbbdb2a9970760";
        libraryHaskellDepends = [ AC-Vector base QuickCheck ];
        testHaskellDepends = [ AC-Vector base markdown-unlit QuickCheck ];
        homepage = "https://github.com/mgajda/octree";
@@ -11670,7 +11690,7 @@ self: {
      mkDerivation {
        pname = "OddWord";
        version = "1.0.0.2";
-       sha256 = "1c4xbfkikyn1jh3qz0ycxzmx0zqfg5gliafb764942dvd851hljv";
+       sha256 = "5b52180a6abb09928839cba9485f790e7fd0ebefcc838f0794c1fa19a75b9db0";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
@@ -11684,7 +11704,7 @@ self: {
      mkDerivation {
        pname = "Omega";
        version = "1.0.3";
-       sha256 = "05dax2r7rrdbsvxszxn13xcf24zq87xq8scxzvl2ccr2y29n0f5j";
+       sha256 = "b2386093f0223326e8fe9d6984fb41f813e1581fc1f6affbd6abe57cb2e8aa15";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers HUnit ];
        description = "Integer sets and relations using Presburger arithmetic";
@@ -11697,7 +11717,7 @@ self: {
      mkDerivation {
        pname = "OneTuple";
        version = "0.2.1";
-       sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb";
+       sha256 = "4b6f74b6d92df112b0f4eaf15ccdc5fbb763d59f07e9a2afa5690ef89159a2f4";
        libraryHaskellDepends = [ base ];
        description = "Singleton Tuple";
        license = stdenv.lib.licenses.bsd3;
@@ -11710,7 +11730,7 @@ self: {
      mkDerivation {
        pname = "OpenAFP";
        version = "1.4.2";
-       sha256 = "0x8yrxyfwgzgp7158nrk4y3wzpfm9bnww0nfbbi9hajiqfd8ymc0";
+       sha256 = "80558f9ac3512a98e25ace02ceed4ad5ddcf8727335b54c2b9ef3fee7ccf1e75";
        libraryHaskellDepends = [
          array base binary bytestring containers directory hashable
          hashtables mtl process regex-compat
@@ -11729,7 +11749,7 @@ self: {
      mkDerivation {
        pname = "OpenAFP-Utils";
        version = "1.4.1.3";
-       sha256 = "160qlcjh0pgslql9f4zv2asw8kb9kl7wd6dk5958dv0n9p96pay0";
+       sha256 = "c0ab6bd24d16ec864a2ab399c60f9d694dc4b512fb139728a6fa5d0025a31898";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -11749,7 +11769,7 @@ self: {
      mkDerivation {
        pname = "OpenAL";
        version = "1.7.0.0";
-       sha256 = "111r78zx39nyfnpq2pmy440bi4ymr6i2difwfaislvmjq43plhjw";
+       sha256 = "5c427a07c1b26eaaa372dcc526a2c9d593b80021be5e81af75dea6d13f3a3984";
        libraryHaskellDepends = [
          base ObjectName OpenGL StateVar transformers
        ];
@@ -11764,7 +11784,7 @@ self: {
      mkDerivation {
        pname = "OpenCL";
        version = "1.0.3.4";
-       sha256 = "04cqddhn4b5m0rj2f6i3gr62yhlfgffmkplb4599sd3qbgx0g27x";
+       sha256 = "fd8807fa5b78349d52218bde599d7b8e422f4c7e231a276406b52c62616b9811";
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ OpenCL ];
        libraryToolDepends = [ c2hs ];
@@ -11781,7 +11801,7 @@ self: {
      mkDerivation {
        pname = "OpenCLRaw";
        version = "1.0.1001";
-       sha256 = "1a9nlrmxp3jwc3hbj79xm35aypfby04qy01fk4vyrp19diiinl07";
+       sha256 = "07501b636c29dcec37992e008f09f0cb5dafcaa83d1db9e0605c8edb6ba636a9";
        libraryHaskellDepends = [ base bytestring mtl ];
        jailbreak = true;
        homepage = "http://vis.renci.org/jeff/opencl";
@@ -11795,7 +11815,7 @@ self: {
      mkDerivation {
        pname = "OpenCLWrappers";
        version = "0.1.0.3";
-       sha256 = "0xlm26jksp4jf1dhkpg4708r1ak5mjdc5x5fjp4fhizmzlk3348s";
+       sha256 = "1a913126fdf547e8c895aef4c29aac65aa901138e4dd095b70925c3da5119576";
        libraryHaskellDepends = [ base bytestring mtl ];
        jailbreak = true;
        homepage = "https://github.com/jkarlson/OpenCLWrappers";
@@ -11810,7 +11830,7 @@ self: {
      mkDerivation {
        pname = "OpenGL";
        version = "2.12.0.1";
-       sha256 = "1mcfb167jl75qc2hgylh83vf2jqizvyvkvhhb72adi2crc3zqz4b";
+       sha256 = "8b7cfc07cb4cc4a6c45910eeb9fdfe114be1f64090fa0705c3e550794c588ed5";
        libraryHaskellDepends = [
          base bytestring GLURaw ObjectName OpenGLRaw StateVar text
          transformers
@@ -11825,7 +11845,7 @@ self: {
      mkDerivation {
        pname = "OpenGLCheck";
        version = "1.0";
-       sha256 = "0zjgwd9h6jncvp7x4nn049878jagcajsc63ch5i1ynndnrr1cfar";
+       sha256 = "59391672b6cd5a1f62816c18a6a5624f49745022c05ad2cfddcc4a0353e34f7e";
        libraryHaskellDepends = [
          base checkers haskell98 OpenGL QuickCheck
        ];
@@ -11839,7 +11859,7 @@ self: {
      mkDerivation {
        pname = "OpenGLRaw";
        version = "2.5.1.0";
-       sha256 = "1kfq24mxg922ml3kkmym2qfpc56jbmrfbiix4rc2cxlwv05i191k";
+       sha256 = "33a4100bd89c762658263dc6e5725dd214761d16d5d73907ad42a4d72b11d8cd";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
@@ -11852,7 +11872,7 @@ self: {
      mkDerivation {
        pname = "OpenGLRaw21";
        version = "2.0.0.2";
-       sha256 = "1kfgwwjnwl5dzwf8bpxcs4q241zap29pjhh4ih5k2cdrnbbn1bz1";
+       sha256 = "e1af60d7b2b931310b8c04427993b8ea072230d1acdf851cffad506e25e7cfcd";
        libraryHaskellDepends = [ OpenGLRaw ];
        description = "The intersection of OpenGL 2.1 and OpenGL 3.1 Core";
        license = "unknown";
@@ -11865,7 +11885,7 @@ self: {
      mkDerivation {
        pname = "OpenSCAD";
        version = "0.3.0.2";
-       sha256 = "04b7n6905qvvz8az8zhsjjg8jcf71y5yby7svy2mqzavq2azjm8x";
+       sha256 = "1d55f995c05b7d5c85dffaf8e58b0fc731899e941a7ef415fa7be30292b16711";
        libraryHaskellDepends = [
          base colour containers filepath semigroups
        ];
@@ -11884,7 +11904,7 @@ self: {
      mkDerivation {
        pname = "OpenVG";
        version = "0.7.0";
-       sha256 = "0ad96lbwcwl7vvk5vx1mmb0wj28c541jwd9nsm7l5na9qdxfhzvj";
+       sha256 = "727fe87ac349d9424fd536352e03290c09c9c1aa35f45de6de8772c61735a929";
        libraryHaskellDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "OpenVG (ShivaVG-0.2.1) binding";
@@ -11897,7 +11917,7 @@ self: {
      mkDerivation {
        pname = "OpenVGRaw";
        version = "0.4.0";
-       sha256 = "1fdg5b8f2x36x6gmdkazkmhqgknagd0kzr70hydygsmqbf2im5x2";
+       sha256 = "a2971a855bb8eae79b87e0e43f417bcace87619d5fcd569fe96674e1d02aafb9";
        libraryHaskellDepends = [ base OpenGLRaw ];
        jailbreak = true;
        homepage = "http://code.google.com/p/copperbox/";
@@ -11911,7 +11931,7 @@ self: {
      mkDerivation {
        pname = "Operads";
        version = "1.0";
-       sha256 = "1b880lrzdxww3j19zspnj49ifsn89n0ac1h5xf7nn83847k8q2qk";
+       sha256 = "130b8ce62168206b8feb0506a6804dc86a171391f6ea9f821c9cf7f6330508ad";
        libraryHaskellDepends = [ array base containers mtl ];
        jailbreak = true;
        homepage = "http://math.stanford.edu/~mik/operads";
@@ -11925,7 +11945,7 @@ self: {
      mkDerivation {
        pname = "OptDir";
        version = "0.0.3";
-       sha256 = "1bb5s57d3wyr9rd275jl0sk85yisl1dpbz042yg7pksv5l0xal0q";
+       sha256 = "1850d5012d5bcf7b9e1704fc755ba03afa82a6065496235a4ed9f3d14ed165ad";
        libraryHaskellDepends = [ base hashable syb ];
        description = "The OptDir type for representing optimization directions";
        license = stdenv.lib.licenses.bsd3;
@@ -11938,7 +11958,7 @@ self: {
      mkDerivation {
        pname = "OrPatterns";
        version = "0.1";
-       sha256 = "0fkg2bnk7gh8lzf8i0bffj6qbbpq15sf8yw88rqpzghsz7xrr111";
+       sha256 = "21849cfbf91abe7f7146887be47409f8ae858d746e8188dca708be33ed126f3a";
        libraryHaskellDepends = [
          base containers haskell-src-exts haskell-src-meta mtl split syb
          template-haskell
@@ -11955,7 +11975,7 @@ self: {
      mkDerivation {
        pname = "OrchestrateDB";
        version = "1.0.0.3";
-       sha256 = "0d12jbdgpfkzax5c8djab6n611hcwi1bkphwmn5qmny43fb3wsaz";
+       sha256 = "5f693e961bc4db8a8bad1cdeb942e40c8660ac594a36c44a577fbafbda922234";
        libraryHaskellDepends = [
          aeson base bytestring HTTP http-conduit http-types lifted-base
        ];
@@ -11977,7 +11997,7 @@ self: {
      mkDerivation {
        pname = "OrderedBits";
        version = "0.0.0.2";
-       sha256 = "10scfjvng05vsx4clvzkfq128vf1qwwvc0zikkzx4b96pjxf80i2";
+       sha256 = "2202e4babc262dd2ff9cf103b639c7c16d240276f36fca48d7bb8067b7744c83";
        libraryHaskellDepends = [
          base bits primitive QuickCheck vector vector-algorithms
        ];
@@ -11995,7 +12015,7 @@ self: {
      mkDerivation {
        pname = "Ordinals";
        version = "0.0.0.2";
-       sha256 = "04xk74rl2d6vp1kn197hsbkkwdvwvqpjqg3kgkpkl2i0r90y8lsi";
+       sha256 = "5153e441ca200a3aef7c733c2c2fde7c373ee7d2f0a46067b8db34413339b313";
        libraryHaskellDepends = [ base ];
        homepage = "http://patch-tag.com/r/kyagrd/Ordinals/";
        description = "Ordinal arithmetic";
@@ -12007,7 +12027,7 @@ self: {
      mkDerivation {
        pname = "PArrows";
        version = "0.1.1";
-       sha256 = "08mkq72zv9ywp002vwjk7gl6pq6915zdd06sp4ap935aqdjrhn0p";
+       sha256 = "17589865c3aa8c7415b9da80d67e09c9e06be83b53f22d00b8dca7fdc5c1b322";
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/PArrows/";
        description = "Arrow parser combinators similar to Parsec";
@@ -12019,7 +12039,7 @@ self: {
      mkDerivation {
        pname = "PBKDF2";
        version = "0.3.1.5";
-       sha256 = "0ljacj31pmcwk4lk24p37761sb60ncwjnjbqhnfrgdjqnyj2bd62";
+       sha256 = "c2b425a4b758b6979d8578492b39b3c02c1dcc39e3123129999cd51b86644a52";
        revision = "1";
        editedCabalFile = "6e8829aa00d16484705a23417f548b237aa1bd152c864a7cfa6948996584db3e";
        libraryHaskellDepends = [ base binary bytestring Crypto random ];
@@ -12032,7 +12052,7 @@ self: {
      mkDerivation {
        pname = "PCLT";
        version = "0.1";
-       sha256 = "0k5abpdz066dsszkj39fd03slb279ddj4i8clnq4gafpa90xbg9q";
+       sha256 = "38bdd54152d7a947b0a50c45225b4b472caa07682e0d39bfd6cd18f0db5daa4c";
        libraryHaskellDepends = [
          base bytestring containers mtl utf8-string
        ];
@@ -12049,7 +12069,7 @@ self: {
      mkDerivation {
        pname = "PCLT-DB";
        version = "0.1.1";
-       sha256 = "0nb5mijpkbllrs9034d3a24drd95lvrhlx60ahcd73kmagh9rfqf";
+       sha256 = "0ebb9ce053758ed31854c0740af3a625b5dc8850a3910192ce94ae7965ac6559";
        libraryHaskellDepends = [
          base bytestring containers convertible HDBC HDBC-postgresql mtl
          PCLT
@@ -12065,7 +12085,7 @@ self: {
      mkDerivation {
        pname = "PDBtools";
        version = "0.0.3";
-       sha256 = "1i5hixmywy63pnh15zl7npfiwc7dvlnz6izjxg08cnvn8jyi026q";
+       sha256 = "d80810bd44765b86c0ebf247f32ddded301eddb587fe12a0bdc378ee6b8fb0c4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
@@ -12079,7 +12099,7 @@ self: {
      mkDerivation {
        pname = "PSQueue";
        version = "1.1";
-       sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58";
+       sha256 = "a8e0871ad10f916f55c3b9baec53eff23c4e97e09cf96d6c66771789e00a49cc";
        libraryHaskellDepends = [ base ];
        description = "Priority Search Queue";
        license = stdenv.lib.licenses.bsd3;
@@ -12091,7 +12111,7 @@ self: {
      mkDerivation {
        pname = "PTQ";
        version = "0.0.7";
-       sha256 = "0pfd5y8plxicdchkbij0nqj6zwxw3fcy5cz1ji5bky9g3bmz9mhm";
+       sha256 = "15d6f4eb1a2ff9b94a94e1b3e2991bbcf36f24b640c635216b2c767a912fcd5d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -12111,7 +12131,7 @@ self: {
      mkDerivation {
        pname = "PageIO";
        version = "0.0.3";
-       sha256 = "0pnnhwmlhjvpb3g94p2asbhy9arvlvcbch11m0hmy7w9m3zj9wjk";
+       sha256 = "53f224ffa8891f5f21a82140b6d8a63babe4e1d24a5c92de58774b482b87d65e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -12137,7 +12157,7 @@ self: {
      mkDerivation {
        pname = "Paillier";
        version = "0.1.0.3";
-       sha256 = "0jcb72shia5p0lpnr3qz57jlzjvnwh4642zwys5d3rg0rwnxigz2";
+       sha256 = "e2bfd82dcfe0e5d18af6fc0b6208e476cb4fe5291f8f6c2f05b7a808b5388b49";
        libraryHaskellDepends = [ base crypto-numbers crypto-random ];
        testHaskellDepends = [
          base crypto-numbers crypto-random HUnit QuickCheck test-framework
@@ -12155,7 +12175,7 @@ self: {
      mkDerivation {
        pname = "PandocAgda";
        version = "2.3.3.0.2";
-       sha256 = "1g39mxrfii8vm40cbb7vdfrx2rx9gm4s1xhp3zjkiyi7f979cbk0";
+       sha256 = "602e964e7227fa38e51f17f6a0497da967d1b36bfbacc500a91bc5e872af69bc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -12179,7 +12199,7 @@ self: {
      mkDerivation {
        pname = "Paraiso";
        version = "0.3.1.3";
-       sha256 = "177sinj5il7azsajf9fl65lml7pq792lnvwb07vln5my250ibwi9";
+       sha256 = "29f2154111be164bf7018b6f4b453af81e5a6931d4252795feead058a48dfa9c";
        libraryHaskellDepends = [
          array base containers control-monad-failure directory fgl filepath
          mtl numeric-prelude random text typelevel-tensor vector
@@ -12204,7 +12224,7 @@ self: {
      mkDerivation {
        pname = "Parry";
        version = "0.1.0.0";
-       sha256 = "0jy0pya7ahy0nzw1yizi1ll7q5kv4jxgn3n56qgcwv25rh374n4s";
+       sha256 = "9a587206cc456cce1e36c50efbba247b167c280df1471ff8b7c0437594bfc04b";
        libraryHaskellDepends = [
          base binary bytestring containers directory ghc-prim network
          old-locale process random RSA SafeSemaphore time unix
@@ -12220,7 +12240,7 @@ self: {
      mkDerivation {
        pname = "ParsecTools";
        version = "0.0.2.0";
-       sha256 = "11vshnbxfl8p38aix4h2b0vms8j58agwxbmhd9pkxai764sl6j7g";
+       sha256 = "ef4843353127aa3e6f6ab0aece9f4245225d375802921e151a1751d797857a87";
        libraryHaskellDepends = [ base parsec ];
        description = "Parsec combinators for more complex objects";
        license = stdenv.lib.licenses.gpl3;
@@ -12231,7 +12251,7 @@ self: {
      mkDerivation {
        pname = "ParserFunction";
        version = "0.1.0";
-       sha256 = "0l0j1mdycqsb5d32l7h0giwrj5yj54523gdn0bvim2vz67qrbxrq";
+       sha256 = "38f795f1317f8b1af702b6bd210a29d21799797c001e2a462b4b63e65b0d1250";
        libraryHaskellDepends = [ base containers parsec ];
        description = "Parse and evaluate mathematical expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -12242,7 +12262,7 @@ self: {
      mkDerivation {
        pname = "PartialTypeSignatures";
        version = "0.1.0.1";
-       sha256 = "04c01bcfrb79av2j9bivlwanmycasn7gjnc9gb5jm6gkwyvgv0h3";
+       sha256 = "0382fdb6e7f3992acb7a8959f98ed58af96a15a73bae24c556e9acecd80a8011";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        homepage = "http://code.haskell.org/~aavogt/PartialTypeSignatures";
        description = "emulate partial type signatures with template haskell";
@@ -12254,7 +12274,7 @@ self: {
      mkDerivation {
        pname = "PasswordGenerator";
        version = "0.1.0.0";
-       sha256 = "12lxylmpi2f1ahy6w1n7jmwn9kay4hajgr95xbnqqdzv4dw6whzw";
+       sha256 = "fc436e7823fb378cedea25e52715245ecd647995c7066e3c54c189782bf59d8a";
        libraryHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/VictorDenisov/PasswordGenerator";
@@ -12267,7 +12287,7 @@ self: {
      mkDerivation {
        pname = "PastePipe";
        version = "1.8";
-       sha256 = "10gf9xkys704k89i9lajqcwqsihfxs314vjy35shhwgga5rjnslz";
+       sha256 = "9f6a2b7351ef710875195e6e1286ee0e468d39c352d114139a041ced674fee81";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cmdargs HTTP network network-uri ];
@@ -12282,7 +12302,7 @@ self: {
      mkDerivation {
        pname = "Pathfinder";
        version = "0.5.10";
-       sha256 = "1k38p73jnkfcmmz94iqpzg2g6apsxflidvy8p9lwqyzfmg70brqf";
+       sha256 = "0ee705ceabee7bcc69bac8ef16a9ebfa2af3c4fb1747927eadcc4d2bc7b968cc";
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ libxml2 ];
        description = "Relational optimiser and code generator";
@@ -12295,7 +12315,7 @@ self: {
      mkDerivation {
        pname = "Peano";
        version = "0.0.4";
-       sha256 = "0ss4p40gkqcw9bdh5iy0yar56gpsanrxld74q5dxvakrf8m6cqmz";
+       sha256 = "bf62662a7279aadd5bc1e434dab355fa3e53b2f2c0c702db4a9ce1f900b9446b";
        libraryHaskellDepends = [ base ];
        description = "simple Peano numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -12306,7 +12326,7 @@ self: {
      mkDerivation {
        pname = "PeanoWitnesses";
        version = "0.1.0.0";
-       sha256 = "1g83jws23grl84gnq89rnppw6q7vsbhi9hk6lp5dq2n4818kamgg";
+       sha256 = "ef55355140c40adccaa566c214e1d2fb60c3efb539216c1f4134bf21349703bd";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "GADT type witnesses for Peano-style natural numbers";
@@ -12320,7 +12340,7 @@ self: {
      mkDerivation {
        pname = "PerfectHash";
        version = "0.1.4";
-       sha256 = "1hj05lv8yj81nhpb01ljaqj9k7j6amw6lfx1azzjnwysmjj6ipkn";
+       sha256 = "76de68a4acda732bff57a13b6a7855469e9924569206b02eb401498f362d40c2";
        libraryHaskellDepends = [
          array base binary bytestring containers digest time
        ];
@@ -12336,7 +12356,7 @@ self: {
      mkDerivation {
        pname = "PermuteEffects";
        version = "0.2";
-       sha256 = "0lmmsvqbnw0k321254xfqlzmddvymy0mj50ax7caqj2fnarfgy4l";
+       sha256 = "94f8e7b2b24e48acd8e90a145981af7eb7563fc5ae932282181370bbf0d6b552";
        libraryHaskellDepends = [ base ReplicateEffects ];
        jailbreak = true;
        homepage = "https://github.com/MedeaMelana/PermuteEffects";
@@ -12355,7 +12375,7 @@ self: {
      mkDerivation {
        pname = "Phsu";
        version = "0.1.0.3";
-       sha256 = "12f6hqgxyf3svr53g0irn15q69wp9py1bxfw3a5inpkqzmrs04x9";
+       sha256 = "a913a073fd785e1b8b1adcf515fc4d9727834bb03982374ade7a38df1f86c689";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -12377,7 +12397,7 @@ self: {
      mkDerivation {
        pname = "Pipe";
        version = "2.1.2";
-       sha256 = "1453rjp5whl9vywiq8i86vjfa8ys1ppwabhvlibqwsbx804q9yhr";
+       sha256 = "19fa8409407d698e57a41b2ec5ef0dda23e5e43628221cb9df89425eaecca390";
        libraryHaskellDepends = [ base filepath process unix ];
        homepage = "http://iki.fi/matti.niemenmaa/pipe/";
        description = "Process piping library";
@@ -12390,7 +12410,7 @@ self: {
      mkDerivation {
        pname = "Piso";
        version = "0.1";
-       sha256 = "123hwav5bsadd2lmzgys4dwja1xrbn1c5w19063ak21y5415ci83";
+       sha256 = "03455602293e88a9860129f0c2825db907257923dabf5fa9684de955b6e27088";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/MedeaMelana/Piso";
        description = "Partial isomorphisms";
@@ -12404,7 +12424,7 @@ self: {
      mkDerivation {
        pname = "PlayHangmanGame";
        version = "0.2";
-       sha256 = "17avnaz6da80v5kgz0b3v0zq3y9p2d3mxxv5a09ggcmilbz4xwlg";
+       sha256 = "8ff24efea2b1b2f7125065f75e471337f9813fd86381ff66d900a966beb25b9d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -12422,7 +12442,7 @@ self: {
      mkDerivation {
        pname = "PlayingCards";
        version = "0.3.0.0";
-       sha256 = "1wq4y6dfn93c8pyxbz5dwbd1c2lq78fbw6s2pdk6nvi0zgf5hp6k";
+       sha256 = "d35c58dcfb206e6b66bb421bbe1c3a980a16dae2adfcd5fd456c24eb9af104f3";
        libraryHaskellDepends = [
          base HUnit MonadRandom QuickCheck random-shuffle
        ];
@@ -12439,7 +12459,7 @@ self: {
      mkDerivation {
        pname = "Plot-ho-matic";
        version = "0.5.0.5";
-       sha256 = "0x8mq7368yjb1q4xmkj6iqrxkf81d0vslfdrhp8cr12k83ydg3g3";
+       sha256 = "e38dd7fc405384ccd085b939aa376801b9d9338e46ceda090e4b7a64c6c11575";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -12458,7 +12478,7 @@ self: {
      mkDerivation {
        pname = "PlslTools";
        version = "0.0.2";
-       sha256 = "1kly1jfki4n9fhgkh2m9j9xj8182s92i7rsq81vcm6i3hd4fac94";
+       sha256 = "2431e54883239aca764058e71345d20205247b92a90a381f74c992389d0c9ece";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -12476,7 +12496,7 @@ self: {
      mkDerivation {
        pname = "Plural";
        version = "0.0.2";
-       sha256 = "047aw1pka7xsqnshbmirkxd80m92w96xfb0kpi1a22bx0kpgg58w";
+       sha256 = "1c95f7ee047d09a142bc132cd74de22255805a9f39d605b5c5ba1f356fe0ea10";
        libraryHaskellDepends = [ base containers regex-tdfa ];
        description = "Pluralize English words";
        license = stdenv.lib.licenses.gpl3;
@@ -12487,7 +12507,7 @@ self: {
      mkDerivation {
        pname = "Pollutocracy";
        version = "1.0";
-       sha256 = "036b114f6fas2w3kmbcb1ria2ymdgi1sc5iqkskfgbc1iizhm2wh";
+       sha256 = "908b0a7f8c81ade7a69e3816a6437cad7aa1620e8bad3a07175a39e34808cb0c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base clock GLUT random ];
@@ -12500,7 +12520,7 @@ self: {
      mkDerivation {
        pname = "PortFusion";
        version = "1.2.1";
-       sha256 = "1n095a7ggkgvxdagn7wi1rnb3h766lah5avyrdxnv4g0kl143vvy";
+       sha256 = "7eef41029de0916d7bcb7eab021535e6c0b16c0e911ffb54ebfbcdf78e2a09d8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring network splice ];
@@ -12514,7 +12534,7 @@ self: {
      mkDerivation {
        pname = "PortMidi";
        version = "0.1.4";
-       sha256 = "00w4208dan87adyd8gm7izbs38mva7glbi7s9rbcdjdkiz486q8m";
+       sha256 = "156183c88fb3c9c6564efac445df51bba2a1d78fa73ed47c530759d510108403";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ alsaLib ];
        homepage = "http://haskell.org/haskellwiki/PortMidi";
@@ -12527,7 +12547,7 @@ self: {
      mkDerivation {
        pname = "PostgreSQL";
        version = "0.2";
-       sha256 = "0p5q3yc8ymgzzlc600h4mb9w86ncrgjdbpqfi49b2jqvkcx5bwrr";
+       sha256 = "39f3553a9b1b4bb112890edfd5e4cbcc1ac4d3aa04026018fdff558f981fb85c";
        libraryHaskellDepends = [ base mtl ];
        description = "Thin wrapper over the C postgresql library";
        license = "unknown";
@@ -12543,7 +12563,7 @@ self: {
      mkDerivation {
        pname = "PrimitiveArray";
        version = "0.6.1.0";
-       sha256 = "1annz4pkz66jxcwzgq3b897vigf8b23aprv0vx1xyly9bbccdpcn";
+       sha256 = "96ddc6d85ac953df43df60e7ab8658c8bdb84f426be0f739ebd2983f2ff9d6aa";
        libraryHaskellDepends = [
          aeson base binary bits cereal deepseq OrderedBits primitive
          QuickCheck vector vector-binary-instances vector-th-unbox
@@ -12562,7 +12582,7 @@ self: {
      mkDerivation {
        pname = "Printf-TH";
        version = "0.1.1";
-       sha256 = "0n1gva510p69vy25zvjkzwqqz2gilbns1wnrzz2p22rjkkbrinvx";
+       sha256 = "7ddb98d79c320b71c5ffd9f2a0eda2f1898f31ff53ee5f84dfc95c108ada2f58";
        libraryHaskellDepends = [ base haskell98 pretty template-haskell ];
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12573,7 +12593,7 @@ self: {
      mkDerivation {
        pname = "PriorityChansConverger";
        version = "0.1";
-       sha256 = "0258ysarn6k5kxxwy4lz9ww2rdhg5mg7h6idfbfrszcgwkcp22a1";
+       sha256 = "410971d9e48f7d9ddd722d1a785e2d0fb62c384f9f12cf7b9f651a9b95f6a808";
        libraryHaskellDepends = [ base containers stm ];
        description = "Read single output from an array of inputs - channels with priorities";
        license = "LGPL";
@@ -12585,7 +12605,7 @@ self: {
      mkDerivation {
        pname = "ProbabilityMonads";
        version = "0.1.0";
-       sha256 = "0vmjg91yq4p0121ypjx4l1hh77j8xj6ha7awdvrjk5fjmz9xryh3";
+       sha256 = "03fadcd3afd29529f36e5c1d058dec489e0361a0a4cbeb8308e012ec437ab26e";
        libraryHaskellDepends = [ base MaybeT MonadRandom mtl ];
        description = "Probability distribution monads";
        license = stdenv.lib.licenses.bsd3;
@@ -12597,7 +12617,7 @@ self: {
      mkDerivation {
        pname = "PropLogic";
        version = "0.9.0.4";
-       sha256 = "1gr3xiwj5ggqlrvi2xi612sba0v7lwc3bz0w18knhh0gz60vslqy";
+       sha256 = "1e53bd81f90f4068270a1cfc3518a76703b5b40826761177a6f8bd2279ec23bf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base old-time random ];
@@ -12612,7 +12632,7 @@ self: {
      mkDerivation {
        pname = "Proper";
        version = "0.5.2.0";
-       sha256 = "0y8jrvhnvb3nr8zi4hw8cm90nnz4lmcp3npvzsbz2wlkif5qf7k6";
+       sha256 = "661e878b8b9372f197fefbda7159a5e45b0b52658843123fca76ac6de1ce1279";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers syb ];
@@ -12628,7 +12648,7 @@ self: {
      mkDerivation {
        pname = "ProxN";
        version = "0.0.1";
-       sha256 = "0mx3kgkcbhppz2p6g8vb9yx27219ca2w7k36j60vfhszni1c4gid";
+       sha256 = "2d3ec242b45f43b7819166ccc38562298823ba4f6ba367aef8f7c2c5e69ba357";
        libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/exFalso/ProxN";
        description = "Proximity sets in N dimensions";
@@ -12645,7 +12665,7 @@ self: {
      mkDerivation {
        pname = "Pugs";
        version = "6.2.13.20130611";
-       sha256 = "13advi8qykjslpg6kqilzdabz5076z6d69b66sf1ikyhjpc1j55i";
+       sha256 = "b11419d895d0cf189c366625d3cc370794bf54fb34e269dea55a4e8f51dc4d8d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -12667,7 +12687,7 @@ self: {
      mkDerivation {
        pname = "Pup-Events";
        version = "1.0";
-       sha256 = "13zjhxq8q1qd7sbc17d73g6mfsfls6rl3ndawbcfjgj73b7xajyj";
+       sha256 = "d24bd5cf1a473ee9d8e2aad941b3d1d46957cd1ba79dc0963e0d078c7087f28f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -12686,7 +12706,7 @@ self: {
      mkDerivation {
        pname = "Pup-Events-Client";
        version = "1.1.4";
-       sha256 = "1b6vkjnk1yk7ra221njh1mm92jgzqh2hjbh67p2h4fz2jf202xvm";
+       sha256 = "7577018493e23b02c53d062e0905c4ff49916a0d50da2084ca67fa30ad9cdbac";
        libraryHaskellDepends = [
          base network parsec Pup-Events-PQueue stm transformers
        ];
@@ -12701,7 +12721,7 @@ self: {
      mkDerivation {
        pname = "Pup-Events-Demo";
        version = "1.3";
-       sha256 = "06cf18ccamaknkm2fcmj17ymdb2i3130q5bakbji4m8349bzhxxb";
+       sha256 = "ab77f85722035512e59a6a150c461851ac56fd09b23227eab45355c5180a8e19";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -12718,7 +12738,7 @@ self: {
      mkDerivation {
        pname = "Pup-Events-PQueue";
        version = "1.0";
-       sha256 = "0sngiqxzj5kif452s2hn3x1kv257815c5v19dp4wqazbyc373iwx";
+       sha256 = "9dc77106f3eb2bccc96d29ecc24a40a7883d431f160a2d0a717116f93b8ecf6a";
        libraryHaskellDepends = [ base stm ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
@@ -12731,7 +12751,7 @@ self: {
      mkDerivation {
        pname = "Pup-Events-Server";
        version = "1.2";
-       sha256 = "18n4bzhwvx336dv4yb5pbicaxbzzhhd36951diwhgw4gf5ji80dn";
+       sha256 = "b6011465718ff007796ca124331a84ffafae585cb72c4f763363f4cde15fc4a2";
        libraryHaskellDepends = [
          base network parsec Pup-Events-PQueue stm transformers
        ];
@@ -12744,7 +12764,7 @@ self: {
      mkDerivation {
        pname = "QIO";
        version = "1.2";
-       sha256 = "1wm0n5r5nfgbd35ry4fn25bzfj83gn3xbrd14clpw4wqqq45rhx6";
+       sha256 = "a6c35c08c698137e2923a1e5d5877d0349f75711d6119fcb68eb395b72b1a0f2";
        libraryHaskellDepends = [ base containers mtl old-time random ];
        homepage = "http://www.cs.nott.ac.uk/~asg/QIO/";
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
@@ -12757,22 +12777,22 @@ self: {
      mkDerivation {
        pname = "QuadEdge";
        version = "0.2";
-       sha256 = "1f3wxc8ipb8ka02xq2snjs5wgl10mk528zjkpwdw5wf3fldhz037";
+       sha256 = "67800f1b75c3f1c21bbf537e24caac20d0c78b96560bdc055013ad1b11eb7cb8";
        libraryHaskellDepends = [ base random vector ];
        description = "QuadEdge structure for representing triangulations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "QuadTree" = callPackage
-    ({ mkDerivation, base, composition, lens }:
+    ({ mkDerivation, base, composition, lens, QuickCheck }:
      mkDerivation {
        pname = "QuadTree";
-       version = "0.10.1";
-       sha256 = "0r4qv6xw03g79sn1889vv1rzpkcpjm9lmipvxdl0l1d8r8kvxdxw";
+       version = "0.11.0";
+       sha256 = "ce22be7f089d90babe9e46217cc99cb5da0c7771739423e7c6cec3b94da294e2";
        libraryHaskellDepends = [ base composition lens ];
-       jailbreak = true;
+       testHaskellDepends = [ base composition lens QuickCheck ];
        description = "QuadTree library for Haskell, with lens support";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "QuasiText" = callPackage
@@ -12782,7 +12802,7 @@ self: {
      mkDerivation {
        pname = "QuasiText";
        version = "0.1.2.5";
-       sha256 = "10y2lirprxyh9m47qxq0plihc22xvmkhq6lfbx3i19vfvkbhnbwx";
+       sha256 = "9d2f0bd7dc6ea710475f8e1a0c67dd5d080623bd00777c484dd0f77c73a4c283";
        libraryHaskellDepends = [
          attoparsec base haskell-src-meta template-haskell text
        ];
@@ -12796,7 +12816,7 @@ self: {
      mkDerivation {
        pname = "QuickAnnotate";
        version = "0.6";
-       sha256 = "0xphlira6gxfs7md1b55vf9biqzw9v1kzmcs17x07xnzcy1y3dvb";
+       sha256 = "6bb7e18367dff603fa099ad53fc34efce3b892dba5acd0ead1ae3fa372a4f076";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -12813,7 +12833,7 @@ self: {
      mkDerivation {
        pname = "QuickCheck";
        version = "1.2.0.1";
-       sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld";
+       sha256 = "8daee0117004a5c8962092a1eadfafc31f86d1b37fb15f5619962c05d8dab7bf";
        revision = "2";
        editedCabalFile = "8f06f07cae74e90cd5bdde3eed23b0e3293ad494f42f0f0cb77074fa3b7950d9";
        libraryHaskellDepends = [ base random ];
@@ -12830,7 +12850,7 @@ self: {
      mkDerivation {
        pname = "QuickCheck";
        version = "2.8.1";
-       sha256 = "0fvnfl30fxmj5q920l13641ar896d53z0z6z66m7c1366lvalwvh";
+       sha256 = "7073aa3635660476aa31df7cf0476926a1ac0231235020122eb276070675763b";
        libraryHaskellDepends = [
          base containers random template-haskell tf-random transformers
        ];
@@ -12847,7 +12867,7 @@ self: {
      mkDerivation {
        pname = "QuickCheck-GenT";
        version = "0.1.4";
-       sha256 = "07zsp1praq0g6mcpfli9r1dwhfgj2cl5a2dljm6cdc8nsjl6dz7x";
+       sha256 = "fdfc66a8d416b1c64c95b409552813f239c85bc829527759350f60956fb8fa1f";
        libraryHaskellDepends = [ base mtl QuickCheck random ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/QuickCheck-GenT";
@@ -12861,7 +12881,7 @@ self: {
      mkDerivation {
        pname = "QuickCheck-safe";
        version = "0.1.0.1";
-       sha256 = "0rxqd1n814b9mf6zg1i0g9d96ym9xqdgky7w7qf5bnnnpkk1ckc7";
+       sha256 = "874d16e6bcd6da551c3efcf8f91aeea97a935a7a2086f78dab6991806c68b867";
        revision = "3";
        editedCabalFile = "4e791ac9fa2f2e73029ab92d17e3ab93571ec5b1d5acda0ea1f340c5ee1346f6";
        libraryHaskellDepends = [ base QuickCheck ];
@@ -12875,7 +12895,7 @@ self: {
      mkDerivation {
        pname = "Quickson";
        version = "0.2";
-       sha256 = "1mr8ilcjlwxcpbblk6l6w022qbf4ngzd0q62fc9k1kjb0w1palbg";
+       sha256 = "6f517503074bce301373c260d0feb3c42d2c04e0869a49d7baac732a198d28d7";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring either text
        ];
@@ -12892,7 +12912,7 @@ self: {
      mkDerivation {
        pname = "RANSAC";
        version = "0.1.0.1";
-       sha256 = "1frn3y0j4w337mfaakqw58d7p9pqhbi2fzk8blv6zilzvqmhbqqv";
+       sha256 = "1be3052bde9fc66f365d687e27e282f8a67b1a2a1c4fa55c3d637022811f36bb";
        libraryHaskellDepends = [ base random vector ];
        testHaskellDepends = [
          base HUnit lens linear test-framework test-framework-hunit vector
@@ -12906,7 +12926,7 @@ self: {
      mkDerivation {
        pname = "RBTree";
        version = "0.0.5";
-       sha256 = "0p46b105lixbxqjz8pwxf4asl4s7zdh2ss3nvgmp1rclqfg6cwrq";
+       sha256 = "3873669ec394e570ebdb76682d60fb4713aa15719d5ff425eeab475a4058865c";
        libraryHaskellDepends = [ base ];
        homepage = "git://github.com/wuxb45/Haskell-RBTree.git";
        description = "Pure haskell Red-Black-Tree implemetation";
@@ -12920,7 +12940,7 @@ self: {
      mkDerivation {
        pname = "RESTng";
        version = "0.1";
-       sha256 = "1fans0znb3i33n9cxd8w140n1sl8bdyl874cdrgc5wvlg6y3y4aj";
+       sha256 = "52113fbc7974f3c25e6e8c1c447d5b88ea6001091cb5ce921d238e653fd056b9";
        libraryHaskellDepends = [
          base HDBC HDBC-postgresql mtl old-time parsec redHandlers xhtml
          yuiGrid
@@ -12938,7 +12958,7 @@ self: {
      mkDerivation {
        pname = "RFC1751";
        version = "0.3.0.1";
-       sha256 = "1347cl0z5zw7f4dn6bjyf19pnfq06dzwpcl68z14zgxw0p58crka";
+       sha256 = "6a6686ca05bcbf4fc24786b2cb7f33003b7b53705e2e631b7187fff20165878c";
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [
          base binary bytestring HUnit QuickCheck test-framework
@@ -12956,7 +12976,7 @@ self: {
      mkDerivation {
        pname = "RJson";
        version = "0.3.7";
-       sha256 = "04vlhcyikd4liy65xiy3xn4slkm5w4q3r8ir54s095zs9bq8jx1n";
+       sha256 = "367489f04afa9704342939a23c30e1a54eaa89edc3c75e8c8f94b4193d837413";
        libraryHaskellDepends = [
          array base bytestring containers iconv mtl parsec syb-with-class
        ];
@@ -12972,7 +12992,7 @@ self: {
      mkDerivation {
        pname = "RMP";
        version = "0.0.2";
-       sha256 = "0bcilw8z764p6idjj19kxk9if5l4pxyn7zszxjv0q3bfky1rd8ay";
+       sha256 = "5ea196839f6e0d0cb6ec5fff637dbf841617d3ec3305295b349798f311a7912d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ allocated-processor base ];
@@ -12994,7 +13014,7 @@ self: {
      mkDerivation {
        pname = "RNAFold";
        version = "1.99.3.4";
-       sha256 = "0r4y4rinrdr2xwfpnys5agm1awr3qr9im4cqczz1fzjz7r425m96";
+       sha256 = "26d522483e5f7e17fe6798911a53c6237315ea53457b7b1def22b76c63269e64";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -13018,7 +13038,7 @@ self: {
      mkDerivation {
        pname = "RNAFoldProgs";
        version = "0.0.0.3";
-       sha256 = "1bmybm80fhw7xqjzny2iricicbzqsl33snpsjamfcr16a939wlwp";
+       sha256 = "97539e46522664e6aa92fa5a3d06d5f82f1659cc5178fb25ee874307505dbeae";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -13042,7 +13062,7 @@ self: {
      mkDerivation {
        pname = "RNAdesign";
        version = "0.1.2.2";
-       sha256 = "1qdfbwiydkh0974m7r4ashxhsbkss8k9d6kpc07vj4hspjf5v5ag";
+       sha256 = "4f955d9cbc1a12b90f60779a9626d27a2e0d3bd48ae453c94900cee6235faee1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -13064,7 +13084,7 @@ self: {
      mkDerivation {
        pname = "RNAdraw";
        version = "0.2.0.1";
-       sha256 = "1d85lps04b2sn23fzyn5hd8lj2lf7byqk7flj8p2b905hl3062dx";
+       sha256 = "bd0903068505a4252e92d49d89fd3a8e0a495183c5faef86b05a2c02f4a505b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -13086,7 +13106,7 @@ self: {
      mkDerivation {
        pname = "RNAwolf";
        version = "0.4.0.0";
-       sha256 = "1s7ilg8814gglg4n64nk94b51fdzh2fm1y4k1mw8d81qd66y60vn";
+       sha256 = "7603e38d6938a086780d93f8509d80bfb9501649d31263c9a3ef9180d0a3f1e8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -13109,7 +13129,7 @@ self: {
      mkDerivation {
        pname = "RSA";
        version = "2.1.0.1";
-       sha256 = "0m74683bm34zd5r46ndb1h8jx1xp8wypfqm0gi3zmrv1rmm0j0hv";
+       sha256 = "1b02096acd61e7fa477ca062773d47b7872e110cab594372699f8cba0632e454";
        libraryHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types pureMD5 SHA
        ];
@@ -13128,7 +13148,7 @@ self: {
      mkDerivation {
        pname = "Raincat";
        version = "1.1.1.3";
-       sha256 = "1aalh68h6799mv4vyg30zpskl5jkn6x2j1jza7p4lrflyifxzar8";
+       sha256 = "28abdf5df4d4654aee515f0629bab153163af5fd603cbfc9ae291d03918154a9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -13148,7 +13168,7 @@ self: {
      mkDerivation {
        pname = "Random123";
        version = "0.2.0";
-       sha256 = "18q6nf63qapypj10iifpc1qdaq7pndmv2p7jz0f96y113z33nqy4";
+       sha256 = "c4633bc61f2178931cf8f25cb16bb3f760d57060d7c50882bcfe2a3c8cb306a3";
        libraryHaskellDepends = [ array base data-dword random ];
        testHaskellDepends = [
          base HUnit QuickCheck random test-framework test-framework-hunit
@@ -13164,7 +13184,7 @@ self: {
      mkDerivation {
        pname = "RandomDotOrg";
        version = "0.2.1";
-       sha256 = "0rfarn424wsvvwvi7b1qzvzc63dxfqmlyrfd0hdcvmgkq5h2iy4c";
+       sha256 = "8cf82860c1f3d5cd1a04cd654f2b76bd0dc3fefe38ac1337df5b732288cdca65";
        libraryHaskellDepends = [ base HTTP-Simple network ];
        description = "Interface to random.org";
        license = stdenv.lib.licenses.publicDomain;
@@ -13176,7 +13196,7 @@ self: {
      mkDerivation {
        pname = "Randometer";
        version = "0.1.0.1";
-       sha256 = "1anj962cpgl06hipjfdygxlvq6adkdg3r0ghkwkzzf3dklmwzng6";
+       sha256 = "e6d9cf2b9d6db8ff279ff0813c5e9b4d19bc697fbe3979233480becb8449d2aa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base random-fu ];
@@ -13190,7 +13210,7 @@ self: {
      mkDerivation {
        pname = "Range";
        version = "0.1.0.0";
-       sha256 = "0759508s75zba89jjr56sqpm7idgwsxynmf9zl9hwrz9q11fxrqh";
+       sha256 = "10e7ee42c0e9670e13fdc955ebbbe6afc5532fd6a664291352eb97a31128a91c";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Data structure for managing ranges";
@@ -13202,7 +13222,7 @@ self: {
      mkDerivation {
        pname = "Ranged-sets";
        version = "0.3.0";
-       sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l";
+       sha256 = "14a0913c91f2c1e44aec0c042afb05f518d9fe718ecc34bd3ad6473f9aa6a0aa";
        libraryHaskellDepends = [ base HUnit QuickCheck ];
        homepage = "http://code.haskell.org/ranged-sets";
        description = "Ranged sets for Haskell";
@@ -13214,7 +13234,7 @@ self: {
      mkDerivation {
        pname = "Ranka";
        version = "0.1";
-       sha256 = "1df010121jdjbagc3gg906kydmwwpa7np1c0mx7w2v64mr7i2q1r";
+       sha256 = "3960114faec46cc14faf80856b8fba9cd7e6a701e9bdc19e5ab2c9200208c0b5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -13234,7 +13254,7 @@ self: {
      mkDerivation {
        pname = "Rasenschach";
        version = "0.1.3.1";
-       sha256 = "0y90clz236lqhacv6ba4w3qx4fyd5yls9nh4chk8s945hr92jg57";
+       sha256 = "a73c29528685248d266404daa4a92fcd3bd2f1e0442db39982989a213e652079";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -13253,7 +13273,7 @@ self: {
      mkDerivation {
        pname = "Rasterific";
        version = "0.6.1";
-       sha256 = "1y9jciiaam0dn2falhxc0nb97vy35dfvv71xzc1bhiw4gn66n4rm";
+       sha256 = "35136b8c7d8447b802fb3d9cbd5d2bc3ef939605ac43aa9cb00d54a5626432f9";
        libraryHaskellDepends = [
          base bytestring containers dlist FontyFruity free JuicyPixels mtl
          primitive vector vector-algorithms
@@ -13267,7 +13287,7 @@ self: {
      mkDerivation {
        pname = "ReadArgs";
        version = "1.2.2";
-       sha256 = "1v6yr5zzrrj31prfzxxh1n27sfnkqpkw34v3a47rcnm444ba58a7";
+       sha256 = "47a1a21621a45a960f516393c1e7c5d33a7d840db0f7eff20d43e6fc7fc9deec";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base system-filepath text ];
@@ -13288,7 +13308,7 @@ self: {
      mkDerivation {
        pname = "Redmine";
        version = "0.0.6";
-       sha256 = "10lq9lhz3yyzkzwbi8rx060hmwh0c8cplydrfzdmd1653x8267z8";
+       sha256 = "e81f23501fc58456db77b9797a196200f20a81013da3b8f89fdffbf1214d9882";
        libraryHaskellDepends = [
          aeson base bytestring connection containers HTTP http-client-tls
          http-conduit http-types MissingH network old-locale old-time
@@ -13309,7 +13329,7 @@ self: {
      mkDerivation {
        pname = "Ref";
        version = "0.1.1.0";
-       sha256 = "15qikbjbydbabc26skhavshzrsaz17a71q8hfxqvi5ix2bhhz4hm";
+       sha256 = "15920fe1123d96b8717710e170d4095fe9fca1de0a4e6d045b6a35bfe49a1197";
        libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "https://bitbucket.org/carter/ref";
@@ -13325,7 +13345,7 @@ self: {
      mkDerivation {
        pname = "RefSerialize";
        version = "0.3.1.4";
-       sha256 = "1hl1jxdarqp59fs1sjvxpyhcazrnlm4iywysgkf3iqm56jfp2f6w";
+       sha256 = "dc38719d34a5e238dc7cda731f49a5367fc5a0bf7d4b1db44be5e2ac5a9781c2";
        libraryHaskellDepends = [
          base binary bytestring containers hashtables stringsearch
        ];
@@ -13340,7 +13360,7 @@ self: {
      mkDerivation {
        pname = "Referees";
        version = "0.0.0";
-       sha256 = "076pa25455jd4b0dbs9gfksaa1ww66yvnknki4yivc0pm60pnh7r";
+       sha256 = "f9407b81a917b01d3d89d34ebbbd319c07a5f4742fe9d5c0224d96428a50d71c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -13361,7 +13381,7 @@ self: {
      mkDerivation {
        pname = "RepLib";
        version = "0.5.3.3";
-       sha256 = "1772r6rfajcn622dxwy9z1bvv53l5xj6acbcv8n9p7h01fs52mpr";
+       sha256 = "f95651b40b009e9b2cda6c3165642f7494bd57f8c9f3de84309649e5b2c9e29c";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        jailbreak = true;
        homepage = "http://code.google.com/p/replib/";
@@ -13375,7 +13395,7 @@ self: {
      mkDerivation {
        pname = "ReplicateEffects";
        version = "0.3";
-       sha256 = "194nbnbrf5g3d2pch6z9zapzhi0i2z30vpgjj0h5x8bfwzpf1527";
+       sha256 = "4794e0eee76ea15e2090f2dd0dc6171144f8affae91bc8ae68e31597975d96a4";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/MedeaMelana/ReplicateEffects";
        description = "Composable replication schemes of applicative functors";
@@ -13389,7 +13409,7 @@ self: {
      mkDerivation {
        pname = "ReviewBoard";
        version = "0.2.2";
-       sha256 = "1grcs7mily2gpxdzq1pcz1f71z2d8pz6paqrb8yv38nkckvm4j75";
+       sha256 = "e54852f764d3a2b13d5a19ab6bfe454dfc705cf8ec06fc5bbf4f781aebd12cbf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base HTTP json mtl network random ];
@@ -13406,7 +13426,7 @@ self: {
      mkDerivation {
        pname = "RichConditional";
        version = "0.1.0.0";
-       sha256 = "065plckw5r16aalkf51y7hs2xjandad3hgfly795wakqfhdnrajw";
+       sha256 = "5caa6c1b74782a5ed2f1d43d389a6a56c92e343c3e1437a95226e4c227a3b718";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/avieth/RichConditional";
@@ -13424,7 +13444,7 @@ self: {
      mkDerivation {
        pname = "Rlang-QQ";
        version = "0.3.1.0";
-       sha256 = "0rl3cmr7vfc8vk7132y40ib0l53v9yndw71bmp25zj24nkmha7hj";
+       sha256 = "121e05ebb444c85fc4ad2b1cdeac4f7b140a5604c48b11cedc88b97d72658366";
        libraryHaskellDepends = [
          array base binary bytestring Cabal containers data-binary-ieee754
          directory filepath haskell-src-meta HList lens mtl process repa SHA
@@ -13446,7 +13466,7 @@ self: {
      mkDerivation {
        pname = "RollingDirectory";
        version = "0.1";
-       sha256 = "0mw4hd99v8pp75ng75cv3vym5ld93f07mpkcbi2b6v12k68bxx4v";
+       sha256 = "9bf4be9099226cb3445c6cde7a801ba9d152fd1e9b95f36c39f7a29d52838457";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -13467,7 +13487,7 @@ self: {
      mkDerivation {
        pname = "RxHaskell";
        version = "0.2";
-       sha256 = "0pwxsvkpdr4vzr6cpgjmkr55ip6ns3gcv8pma7dwzg21myx9c3vl";
+       sha256 = "740f96baaf41bccfdb51f5a2cdded0d6dc584a9e55becb4cfe9be476e7d69d5f";
        libraryHaskellDepends = [ base containers stm transformers ];
        homepage = "https://github.com/jspahrsummers/RxHaskell";
        description = "Reactive Extensions for Haskell";
@@ -13483,7 +13503,7 @@ self: {
      mkDerivation {
        pname = "SBench";
        version = "0.2.0";
-       sha256 = "0ym9qdwwn180365hgvwi6djzbqvfiyqrd2fhywpvxihwxnlnhiam";
+       sha256 = "554568a9ed1cc6be2ff7d08996b18f6ee3f5653391ef078b190005cb79c3a97a";
        libraryHaskellDepends = [
          base bytestring cassava criterion deepseq directory filepath
          gnuplot hp2any-core parsec process utf8-string vector
@@ -13498,7 +13518,7 @@ self: {
      mkDerivation {
        pname = "SConfig";
        version = "0.2.0.0";
-       sha256 = "032s6szll58zavdnf6fsj2rhpdlizv3l46lh819bqjy1kbffv0yz";
+       sha256 = "df83eddc9ac14bbc5240901a42c7fe91b60bb390da1967db561f154abf365a0c";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/fgaz/SConfig";
        description = "A simple config library";
@@ -13510,7 +13530,7 @@ self: {
      mkDerivation {
        pname = "SDL";
        version = "0.6.5.1";
-       sha256 = "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46";
+       sha256 = "864c336c8b7f9f9b0239ce2d62521c4e2fd101e67f8cde6d5c2fe8bc47ff43e9";
        revision = "1";
        editedCabalFile = "233e3fde4727ca7b597e0bf86619c6b862c32445191a37b7a536a3188634473e";
        libraryHaskellDepends = [ base ];
@@ -13524,7 +13544,7 @@ self: {
      mkDerivation {
        pname = "SDL-gfx";
        version = "0.6.0.1";
-       sha256 = "1ay72r29ybxf4icaqadly02xi03ifz82a8jz3xkvlk26c9bxl4c3";
+       sha256 = "8311da5762464cba671f5f2225d0777180d805f0b429ac5824ae2f9f4416c7ab";
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_gfx";
        license = stdenv.lib.licenses.bsd3;
@@ -13536,7 +13556,7 @@ self: {
      mkDerivation {
        pname = "SDL-image";
        version = "0.6.1.1";
-       sha256 = "1m02q2426qp8m8pzz2jkk4srk2vb3j3ickiaga5jx9rkkhz732zq";
+       sha256 = "f88b713e9c33a72e8b7a2a4e16871c6b8b993599538aff2faae8622388c002d4";
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_image";
        license = stdenv.lib.licenses.bsd3;
@@ -13548,7 +13568,7 @@ self: {
      mkDerivation {
        pname = "SDL-mixer";
        version = "0.6.1.1";
-       sha256 = "0md3238hx79mxb9a7l43kg3b3d28x4mqvj0hjsbsh15ajnvy9x2z";
+       sha256 = "5ff4e4b795aa04a8979610c88d2be948b4b1c69b83d0a3d2ea359d0ed110a355";
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_mixer";
        license = stdenv.lib.licenses.bsd3;
@@ -13560,7 +13580,7 @@ self: {
      mkDerivation {
        pname = "SDL-mpeg";
        version = "0.0.1";
-       sha256 = "0hx4977iynchnyd4b9ycbiw5qq07wk1a7dkisqx0a3x0ca4qirwj";
+       sha256 = "92e7888962a00f053ad671b6a3c2e407605c785ccca7459ab790591fcf49a443";
        libraryHaskellDepends = [ base SDL ];
        librarySystemDepends = [ smpeg ];
        description = "Binding to the SMPEG library";
@@ -13573,7 +13593,7 @@ self: {
      mkDerivation {
        pname = "SDL-ttf";
        version = "0.6.2.1";
-       sha256 = "1ld551jgrcs3c7n53zyzlkrxkf01rp81wwvf9ynkm0c5kgll779s";
+       sha256 = "3a9d43e99b85813aad4f6e731ed0cd01b8d9f3a4dfff51ec6143b3fc6428a5d1";
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_ttf";
        license = stdenv.lib.licenses.bsd3;
@@ -13585,7 +13605,7 @@ self: {
      mkDerivation {
        pname = "SDL2-ttf";
        version = "0.1.0";
-       sha256 = "03ng8kih285pvwj06jdwk4hkyyyb8j666pnvagnw5hsjhq60r8h6";
+       sha256 = "06a20c0c8652c3c2ed53db5e638c44cb7b3f2199bc490324dfb72001e344cf0e";
        libraryHaskellDepends = [ base SDL2 ];
        librarySystemDepends = [ SDL2 SDL2_ttf ];
        jailbreak = true;
@@ -13601,7 +13621,7 @@ self: {
      mkDerivation {
        pname = "SFML";
        version = "0.2.0.0";
-       sha256 = "1jz7wgrjc169slq7akf9sdgpfnl1cbiahig8hqck9p40ixn456k6";
+       sha256 = "669a426c8f80dc341986e845a8e262815a775fd3c94d7530d5c90426f3e3e7cb";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [
          csfml-audio csfml-graphics csfml-network csfml-system csfml-window
@@ -13619,7 +13639,7 @@ self: {
      mkDerivation {
        pname = "SFML-control";
        version = "0.2.0.2";
-       sha256 = "001h9y9395mz6fr58s1i8svn4pyy5iqbkzzsp19xdphh4w69za9g";
+       sha256 = "2fa99f0c2710ded653b8faffb9702cde5f62b746316854b233bf9634924f3000";
        libraryHaskellDepends = [ base mtl SFML template-haskell ];
        homepage = "https://github.com/SFML-haskell/SFML-control";
        description = "Higher level library on top of SFML";
@@ -13632,7 +13652,7 @@ self: {
      mkDerivation {
        pname = "SFont";
        version = "0.1.1";
-       sha256 = "077yvys00kp8lmkvc4mbynmkk9nn2ib5rh38bqcw0wnwsvl7140i";
+       sha256 = "119070e8d6dc72c0195e68c05c5614d6a639abf5ab12b667a5e84e00b4dffe1c";
        libraryHaskellDepends = [ array base SDL Sprig ];
        homepage = "http://liamoc.net/static/SFont";
        description = "SFont SDL Bitmap Fonts";
@@ -13645,7 +13665,7 @@ self: {
      mkDerivation {
        pname = "SG";
        version = "1.0";
-       sha256 = "0aj15lp5wbldaa9ndfvni1iq7kcrjv1syln9yz77jg6p8ndk61jv";
+       sha256 = "5b06339b45d73c79cef7c952afc39699cd83638876bb6693528d2e5e2e2d412a";
        libraryHaskellDepends = [ base mtl ];
        description = "Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
@@ -13657,7 +13677,7 @@ self: {
      mkDerivation {
        pname = "SGdemo";
        version = "1.1";
-       sha256 = "0f7s8y5wq479i2yix2ik5ffsqkrb65pi31n6a03453kvk5jc7wv6";
+       sha256 = "66f3c364997b8e420650c686116f312b4fac9d2b338a1ebd88e910cc8b47fa38";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT OpenGL SG ];
@@ -13674,7 +13694,7 @@ self: {
      mkDerivation {
        pname = "SHA";
        version = "1.6.4.2";
-       sha256 = "134ajm87fm4lpsw86m9q8apv20dw4bpk46raa389zr6bcdpifw64";
+       sha256 = "c470176f63cbe49fd0502a1b32ef22bc01b1af42385583b8be94547750958a8c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base binary bytestring ];
@@ -13692,7 +13712,7 @@ self: {
      mkDerivation {
        pname = "SHA2";
        version = "0.2.5";
-       sha256 = "1zs79a327x6myfam3p2vr8lmszcaqnkll2qz8n4sy835vz328j40";
+       sha256 = "804824c6df6520af89451f0b4aa7c58a7d5d29ca5bdc5195f3d5f423864a47ff";
        libraryHaskellDepends = [
          AES base bytestring monads-tf transformers
        ];
@@ -13707,7 +13727,7 @@ self: {
      mkDerivation {
        pname = "SMTPClient";
        version = "1.1.0";
-       sha256 = "07njj24c43iz33c641d5ish62h13lhpvn2mx5pv5i6s3fm3bxsfk";
+       sha256 = "d3e9be4675439b58f62dbd0abb2fa4234061a08ea50562d8183f0ec28890d21e";
        libraryHaskellDepends = [
          base containers extensible-exceptions hsemail network old-locale
          old-time
@@ -13723,7 +13743,7 @@ self: {
      mkDerivation {
        pname = "SNet";
        version = "0.1.0";
-       sha256 = "19ls2icg5vflznf9wn5b429x6blismcdxinh66vd8cr8hwgc8m99";
+       sha256 = "2955c41e872833d4b631d0c6de58d5912ed39320ab589e9cfdd4edf258149aa6";
        libraryHaskellDepends = [
          base bindings-DSL containers data-default lens mtl transformers
        ];
@@ -13742,7 +13762,7 @@ self: {
      mkDerivation {
        pname = "SQLDeps";
        version = "0.1";
-       sha256 = "1dx4vxrc7hjms3bx80bngwr5jxkb1v9hps09ayi0mqwhnfzq5vgp";
+       sha256 = "f7ed82bfb390e30aa25709e80bd30e6b7659327f7601d4d7d055c2c372dfa4b7";
        libraryHaskellDepends = [
          base hashable HDBC HDBC-sqlite3 mtl unordered-containers
        ];
@@ -13755,7 +13775,7 @@ self: {
      mkDerivation {
        pname = "STL";
        version = "0.3.0.2";
-       sha256 = "0papwfxp4y8rn1rqm0sw22lbfw6iaziziprh04z85isrwkfh8v43";
+       sha256 = "836c04dde459c7823e0130dff8e357d170b7a8105c838a73b0197972bbe3575d";
        libraryHaskellDepends = [ attoparsec base bytestring cereal text ];
        homepage = "http://github.com/bergey/STL";
        description = "STL 3D geometry format parsing and pretty-printing";
@@ -13767,7 +13787,7 @@ self: {
      mkDerivation {
        pname = "STMonadTrans";
        version = "0.3.3";
-       sha256 = "05d37ax0j8dp1h1w6pxkf1415mzn4gasdhn7gbsr8ay46iv1r4fr";
+       sha256 = "d9911c7634c42b94f57ac7c2a6d523f6d7124870b35fc3030cb72109ba3aa315";
        libraryHaskellDepends = [ array base mtl ];
        description = "A monad transformer version of the ST monad";
        license = stdenv.lib.licenses.bsd3;
@@ -13780,7 +13800,7 @@ self: {
      mkDerivation {
        pname = "SVG2Q";
        version = "0.3";
-       sha256 = "07cr20cdz4dk8c9j84j1wlzhg4qb4hmgyvh2nnlh4vc52bvvizmq";
+       sha256 = "b8feb8f712856d02a9b5026eff2a240b93073fe54112241343b391df1810991d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -13801,7 +13821,7 @@ self: {
      mkDerivation {
        pname = "SVGFonts";
        version = "1.5.0.0";
-       sha256 = "0w1675cwd8gx65vh421abnl4z6jw7jaz3a43g04x0a5kgf1sfl76";
+       sha256 = "e650a7837bb328d0097883a8f1953c5c9a4fa85d2a08027731fda1c659392670";
        libraryHaskellDepends = [
          attoparsec base blaze-markup blaze-svg containers
          data-default-class diagrams-core diagrams-lib directory parsec
@@ -13816,7 +13836,7 @@ self: {
      mkDerivation {
        pname = "SVGPath";
        version = "1.1.2";
-       sha256 = "1a4rmp1rn6jv8nkab688i146ywiv4w6fp5bpm0slwgda2x0h6lp4";
+       sha256 = "e452034117aa3d4e35a87795eb0c273b726f48880899a5a6455b1a9bc3ad99a8";
        libraryHaskellDepends = [ base parsec ];
        description = "Parsing the path command of SVG";
        license = stdenv.lib.licenses.bsd3;
@@ -13829,7 +13849,7 @@ self: {
      mkDerivation {
        pname = "SWMMoutGetMB";
        version = "0.1.0.0";
-       sha256 = "069076ckklky3hw26ff82kqnambb7yfcwf76dwzp7cahp8fpvq6l";
+       sha256 = "d4e07d1dba50b1733f6fe638ce9c3f6b5565f114c83923381c7ed23999392019";
        libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 split
        ];
@@ -13846,7 +13866,7 @@ self: {
      mkDerivation {
        pname = "SableCC2Hs";
        version = "0.0.1.0";
-       sha256 = "1sngk170p5wyi3sgjkl74fr3k570fbfabhbg0dnp8z4iw53d8jfl";
+       sha256 = "d449d446e1917c746d036fc1a5dc72e09439b223874ef9f4889e970b4e98cfea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers ];
@@ -13864,7 +13884,7 @@ self: {
      mkDerivation {
        pname = "Safe";
        version = "0.1";
-       sha256 = "0ybi5r4635yjx41ig54bm426fbdzrivc5kn8fwqxmzm62ai0v623";
+       sha256 = "43980da212a6feda3177c8cec276ccbf2d6704a98b941703e9d29761482e7179";
        libraryHaskellDepends = [ base ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/projects/libraries.php";
        description = "Library for safe (pattern match free) functions";
@@ -13876,7 +13896,7 @@ self: {
      mkDerivation {
        pname = "SafeSemaphore";
        version = "0.10.1";
-       sha256 = "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91";
+       sha256 = "21e5b737a378cae9e1faf85cab015316d4c84d4b37e6d9d202111cef8c4cef66";
        revision = "1";
        editedCabalFile = "1b168ec8de4b3958df15b33ba9ab60d8a651d9dd4ea36891d4c31ae81e7ec1cc";
        libraryHaskellDepends = [ base containers stm ];
@@ -13891,7 +13911,7 @@ self: {
      mkDerivation {
        pname = "Salsa";
        version = "0.2.0.2";
-       sha256 = "0915mwi1ksa85in03vzm5hqbvk6ih7l0zslg5cmy7j9fc0jhgwgd";
+       sha256 = "edf10725602ec9e32b2b8fea0fe881d1ccbd302cf5ef016c2c48e91922af2524";
        libraryHaskellDepends = [ base bytestring file-embed ];
        librarySystemDepends = [ glib mono ];
        homepage = "http://haskell.org/haskellwiki/Salsa";
@@ -13909,7 +13929,7 @@ self: {
      mkDerivation {
        pname = "Saturnin";
        version = "0.1.0.2";
-       sha256 = "0f6z17ry2n0qkgajiwip09r7dbcn72dkz7gh4igwk3n0igxlpqsr";
+       sha256 = "59e34bfb8bc08ec95f24f09d3f9b3896ad76720237f228d59b1858e1f309df38";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -13930,7 +13950,7 @@ self: {
      mkDerivation {
        pname = "SciFlow";
        version = "0.2.0";
-       sha256 = "1cvh5c5mj5jy02ky2hjkf7bkjy9wx2187dmf9d71wby9ymklg8ng";
+       sha256 = "cfa24767f5c92f1e4e4baeb68382e83c7939d7715342e1a7005e16590b2b70b3";
        libraryHaskellDepends = [
          base bytestring data-default-class mtl shelly template-haskell text
          unordered-containers yaml
@@ -13946,7 +13966,7 @@ self: {
      mkDerivation {
        pname = "ScratchFs";
        version = "0.1.0.2";
-       sha256 = "0c410hnby7g5qdx1kj3shwxl0m910vl3rj3ayx6f5qsz5by5rczh";
+       sha256 = "f0b35cfc2a5fe3e24cf76ac83ce8062155403b877ac8197ac3e51dbf2c048130";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -13967,7 +13987,7 @@ self: {
      mkDerivation {
        pname = "Scurry";
        version = "0.0.3";
-       sha256 = "0iwlai8zspz08l3v7qf505mgfxn5v177kqa1x4xfssq7wzxawq8j";
+       sha256 = "1261aefae7076bed3ae941e1794ed8c576f76a01c5e1b30745e05ffd51549447";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -13985,7 +14005,7 @@ self: {
      mkDerivation {
        pname = "SegmentTree";
        version = "0.3";
-       sha256 = "1hagm0y9x2j1wcgk5ibxnlh2slnxfggn79cq20ws0zvd4yqw3231";
+       sha256 = "6188c1b1276d7fa0391098a563df73dd522d20b57dc5321fe3418a9e3ca84fc1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -14000,7 +14020,7 @@ self: {
      mkDerivation {
        pname = "Semantique";
        version = "0.3.0";
-       sha256 = "1l334lvm56xr7rw135l6nj7iz4h1yskl1fcrr5rdimlw7dyw2cr8";
+       sha256 = "2833c17d3b9cd6d872c999b940a7f601921f8fb4869611783eb99b52372563d0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -14018,7 +14038,7 @@ self: {
      mkDerivation {
        pname = "Semigroup";
        version = "0.0.7";
-       sha256 = "1mdw1z50gr02j5hycki5rl95b1yk7xfrdk056ajw9ghw48s0jpx6";
+       sha256 = "a65f0934221cbec4a53205cc965d3fd3875512cd254ee6619102e407ca0fbcd5";
        libraryHaskellDepends = [ base bytestring containers mtl ];
        homepage = "https://bitbucket.org/dibblego/semigroup/";
        description = "A semigroup";
@@ -14030,7 +14050,7 @@ self: {
      mkDerivation {
        pname = "SeqAlign";
        version = "0.1.0.0";
-       sha256 = "0vk63ni1a93win8if032nps5y0xi245cmjqq2j4xfsdddg5bdln5";
+       sha256 = "c5d2b6ca6bad69d7891418cbca0a11b1035ff4b5620017918d7c2415a21d666e";
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
@@ -14044,7 +14064,7 @@ self: {
      mkDerivation {
        pname = "SessionLogger";
        version = "0.3.0.0";
-       sha256 = "1zgjslf9p64aa7dwww44jq2f6iic1192ic98gmjsjj5ww8anl8c3";
+       sha256 = "83216a15e2bc48a9657d28b12852082c46e304968470cedb518a989b1cd5f2fd";
        libraryHaskellDepends = [
          base directory filepath hslogger mtl old-locale random time
        ];
@@ -14061,7 +14081,7 @@ self: {
      mkDerivation {
        pname = "ShellCheck";
        version = "0.3.8";
-       sha256 = "06k5adw28abdfpvfjq0zka05211w6nlbf1ry3d9hck3jcrqvg1f1";
+       sha256 = "c185b77166724c06531b3e07b7a8353c0451809a1f60e9f6756d29247853651a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14085,7 +14105,7 @@ self: {
      mkDerivation {
        pname = "Shellac";
        version = "0.9.5.2";
-       sha256 = "1js9la0hziqsmb56q9kzfycda2sw3xm4kv2y5q2h3zlw5gzc5xli";
+       sha256 = "91f6c2fe2b9cfe01052e5eec496a1f5c0bd598777f266ccaaa1ac70f81a249cb";
        libraryHaskellDepends = [ base directory mtl unix ];
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "A framework for creating shell envinronments";
@@ -14098,7 +14118,7 @@ self: {
      mkDerivation {
        pname = "Shellac-compatline";
        version = "0.9.5.2";
-       sha256 = "134m0krbd3vlswjxdfvv9xy9x962g7ksg1mqmmgczss9ph2dx08i";
+       sha256 = "1181de04bc49ebcf5eadb886a7e779c2a49e7c4f7bbbd625d7748fb6f204958c";
        libraryHaskellDepends = [ base Shellac Shellac-editline ];
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "\"compatline\" backend module for Shellac";
@@ -14111,7 +14131,7 @@ self: {
      mkDerivation {
        pname = "Shellac-editline";
        version = "0.9.5.2";
-       sha256 = "14x4w4msh99c8vzhlv88ixb8yx43k178qz7504na68820389l9ah";
+       sha256 = "50259ad0000221a32c01e57c8c4e9883748f568f086d0aff462c25a82be1a493";
        libraryHaskellDepends = [ base editline Shellac ];
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "Editline backend module for Shellac";
@@ -14124,7 +14144,7 @@ self: {
      mkDerivation {
        pname = "Shellac-haskeline";
        version = "0.2.0.2";
-       sha256 = "0q70d5arw1yg0f8b6p3k0g3i4jbh2d8rp1cchswd3ynhinzhrnqg";
+       sha256 = "0fdb0cbf8dd0fad1b8868c859b5113704912c703735cb39003cf079e5569e060";
        libraryHaskellDepends = [ base haskeline mtl Shellac ];
        jailbreak = true;
        description = "Haskeline backend module for Shellac";
@@ -14137,7 +14157,7 @@ self: {
      mkDerivation {
        pname = "Shellac-readline";
        version = "0.9.5.2";
-       sha256 = "0248zzp40gadcc4xkr5dmjc4phq0xz9j4sirdncnr62y3pi4zi0n";
+       sha256 = "16c44fe21d5e986c996d396a22d3ef00c34b98acade4d909634d3d40eeff8808";
        libraryHaskellDepends = [ base readline Shellac ];
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "Readline backend module for Shellac";
@@ -14150,7 +14170,7 @@ self: {
      mkDerivation {
        pname = "ShowF";
        version = "0.1.1";
-       sha256 = "1nq4i4h43nfh86f6wgwng1ps6mcdl1ba96x9wsjl3qzn3blavyfh";
+       sha256 = "d0f9ade81af6e341a5e6a99ba456a08d55a36f78963f6e9c41d0d941208904db";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/conal/ShowF/";
        description = "Show for * -> *";
@@ -14162,7 +14182,7 @@ self: {
      mkDerivation {
        pname = "Shrub";
        version = "0.1.0.0";
-       sha256 = "105rnyrqzagfgbfdxbdx4wqhvdfxkd8d5jaxkyqd1zyvf0chi858";
+       sha256 = "a8a0081970dbffd0b09f5dc9d2509bddb50d3127bdaddedc7aeea98fb3b7b980";
        libraryHaskellDepends = [ base ];
        description = "4-way trie fuzzy search";
        license = stdenv.lib.licenses.bsd3;
@@ -14173,7 +14193,7 @@ self: {
      mkDerivation {
        pname = "Shu-thing";
        version = "1.1.3";
-       sha256 = "185vcxd3qvii9k0134j634x6znvk7v83sj24a4dnw7jjsax0kqiv";
+       sha256 = "3be209bad2521e6e1b5144483dd03e73db6f3a19469211c04c316e3c5a67bba0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT ];
@@ -14187,7 +14207,7 @@ self: {
      mkDerivation {
        pname = "SimpleAES";
        version = "0.4.2";
-       sha256 = "0s85xgwrhldyr2w3kcn9f72yjajmpz3d4dizq9p9z97rx4qva4vj";
+       sha256 = "7213b531e9f9a49f6ec23f36d2c6bf552ae9c571c9b239b8c8be5198f9eb0569";
        libraryHaskellDepends = [ base binary bytestring mwc-random ];
        description = "Fast AES encryption/decryption for bytestrings";
        license = stdenv.lib.licenses.bsd3;
@@ -14198,7 +14218,7 @@ self: {
      mkDerivation {
        pname = "SimpleEA";
        version = "0.2.1";
-       sha256 = "0qimm9y138jjnzy5i6s5b7899rkxahk7p2kcwfry0gdq2pcb68vr";
+       sha256 = "7923b3d815b83de0b3e36c8a7b26547de694d059459b58fcb752a2117caa3562";
        libraryHaskellDepends = [
          base mersenne-random-pure64 MonadRandom
        ];
@@ -14213,7 +14233,7 @@ self: {
      mkDerivation {
        pname = "SimpleGL";
        version = "0.9.3";
-       sha256 = "0c674q5jiqvscc53m0z5vkmljla29pcll15gbvxr86pqxwmqm5hr";
+       sha256 = "19968a2beff81a94fb5eaf044ad94d425149ebdce5833a0a637ae3280b26c730";
        libraryHaskellDepends = [
          base GLFW JuicyPixels OpenGL SimpleH vector
        ];
@@ -14230,7 +14250,7 @@ self: {
      mkDerivation {
        pname = "SimpleH";
        version = "1.2";
-       sha256 = "0g05yplsm65xmx7brdcqy5kc8qcmzj96vywicwqpmigcv8pi9zmc";
+       sha256 = "acfe142fdaecc57a316791fb6d92fc9561c466f198b5bc4eafbd98aae9f5053c";
        libraryHaskellDepends = [
          base bytestring clock containers cpu directory filepath network
          time unix
@@ -14250,7 +14270,7 @@ self: {
      mkDerivation {
        pname = "SimpleLog";
        version = "0.1.0.3";
-       sha256 = "12fjdmaxcpgp13gr1s25ybb5fysvbcg40j9yb29wvpbmf67xrsbw";
+       sha256 = "7ce9dc8f7175ddcd93583e49401e5b5b7b57d6f245e890df08f75dd6556dd289";
        libraryHaskellDepends = [
          ansi-terminal attoparsec base bytestring containers directory
          ForkableT monad-control mtl old-locale resourcet semigroups stm
@@ -14267,7 +14287,7 @@ self: {
      mkDerivation {
        pname = "SizeCompare";
        version = "0.1";
-       sha256 = "0f53vggmc1ysi1rn8zd2kafi45w20d6j7iv1jgnrqy7izpah91a7";
+       sha256 = "478504d5fdf1789ced9361c7234d038217129d9aa27d647388da0756dfdba338";
        libraryHaskellDepends = [ base containers ];
        description = "Fast size comparison for standard containers";
        license = "GPL";
@@ -14280,7 +14300,7 @@ self: {
      mkDerivation {
        pname = "Smooth";
        version = "0.1.0.1";
-       sha256 = "0rwl5dw1vpgszhs7pjk146kp8h8n3ggvpby9y18fr7zsqgsckzcd";
+       sha256 = "8dfdc9f4c3fa9fec50f0c9afbbdf1b164174a72161ca7b34fcfadd1d782b9467";
        libraryHaskellDepends = [
          base containers DifferenceLogic FirstOrderTheory HUnit Proper
        ];
@@ -14295,7 +14315,7 @@ self: {
      mkDerivation {
        pname = "SmtLib";
        version = "0.1.0.0";
-       sha256 = "0wmdzl3anbbfqik2kl2wjy57cd9r3ix8h8g28rmzqbvlajrvqcv1";
+       sha256 = "6133bcb354742ffc6b46e221887a1c3935768a975cd02966c46e2dab06fdad72";
        libraryHaskellDepends = [ base parsec transformers ];
        jailbreak = true;
        homepage = "https://github.com/MfesGA/HsmtlibParser";
@@ -14311,7 +14331,7 @@ self: {
      mkDerivation {
        pname = "Snusmumrik";
        version = "0.0.1";
-       sha256 = "1f4d493hnv7fag9c2p2hnm0kc6b705z7mgdk4z6s4g24536j4ksk";
+       sha256 = "534f22cd28443ca2cd27b3bd7a7e0167193641b5505cc1d253ee6c0b47228db8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -14335,7 +14355,7 @@ self: {
      mkDerivation {
        pname = "SoOSiM";
        version = "0.2.1.0";
-       sha256 = "0ghblkhf942gcidsvah8z6wigymzfng1010mp17pvacizamakcmp";
+       sha256 = "b7b2a9aafa91a97d4fb81504109e75bffa17b9f908aaad5b644f90e4e0a40b3e";
        libraryHaskellDepends = [
          base concurrent-supply containers monad-coroutine mtl stm
          transformers
@@ -14354,7 +14374,7 @@ self: {
      mkDerivation {
        pname = "SoccerFun";
        version = "0.5.2";
-       sha256 = "0xwgj4k1gn84sb8jc2nyxnvfp8sdmy4x5428fpvmn6n6ca8h6f17";
+       sha256 = "2738039162c61a5bf7754890d289af4da3ebb6edde0a26d1d204d91726918f77";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14375,7 +14395,7 @@ self: {
      mkDerivation {
        pname = "SoccerFunGL";
        version = "0.5.1";
-       sha256 = "1rzqibia10pl4yy64g5pqiqidhn109z0hlf38z3s57hx2zqqi9if";
+       sha256 = "2ea688f1171d9ea2c747c351087e02c1c21671c4b73c62bc27f482a0e28af8e7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14394,7 +14414,7 @@ self: {
      mkDerivation {
        pname = "Sonnex";
        version = "0.1.0.3";
-       sha256 = "0fqaw4wh7ml35kl75qsvqsq17g5pndf7x6clcmqxpwayjn2syzda";
+       sha256 = "aa7daf85955ef1db716594997e5cb3b7bc13b0c65be372e82c83d60339e10a3b";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
@@ -14410,7 +14430,7 @@ self: {
      mkDerivation {
        pname = "SourceGraph";
        version = "0.7.0.6";
-       sha256 = "03psglm6xyqvcgnbimidafy51kwpipk5q6s8ip5vhjm2d5makkhm";
+       sha256 = "15cea96a69a24ab8cb8d481b5ce68d97cf50bc532dd6b8ec631bfb6e2a7dfa0e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -14430,7 +14450,7 @@ self: {
      mkDerivation {
        pname = "Southpaw";
        version = "0.1.0.2";
-       sha256 = "1zijb1b6ryrmq2230i1fr7iqz8iax9f2rwpy75fkggiknrd4xnpq";
+       sha256 = "f8da4e5ab633be375d39fef22c5cea2aa28fe3c92e443084c035fb6c565832fe";
        libraryHaskellDepends = [
          ALUT base bytestring cairo containers filepath GLFW-b gtk3
          JuicyPixels OpenAL OpenGL vector Win32
@@ -14445,7 +14465,7 @@ self: {
      mkDerivation {
        pname = "SpaceInvaders";
        version = "0.4.2";
-       sha256 = "1idy95ym336c19rcvvrm8j9lgf77bs10hhmrnw2jc55m1z93m683";
+       sha256 = "03993ad20fb5142605b7b94208825ee7b847934435efcd720acc8c517d49bec5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base HGL random Yampa ];
@@ -14462,7 +14482,7 @@ self: {
      mkDerivation {
        pname = "SpacePrivateers";
        version = "0.1.0.0";
-       sha256 = "0gj709knv4lvz34900jigb1hiq35acbbl86iwa5yszibm8f0drkh";
+       sha256 = "70e6061caa2b7eed8be2d120ba165365e008c37a510290c8f89b926d6702473e";
        revision = "1";
        editedCabalFile = "b59d607892ad860616cef196c83ff54388204102eae597acf88467a2f54764bf";
        isLibrary = false;
@@ -14483,7 +14503,7 @@ self: {
      mkDerivation {
        pname = "SpinCounter";
        version = "0.0.1";
-       sha256 = "1rf9r69a2k3qfmy2nvwm3gdimncjglsv698rdc8i8gnjwrr0c1i2";
+       sha256 = "22060672e6d23e14116b1925b3357d92d91adb1b956f2b7c75784ca192c9c9e5";
        libraryHaskellDepends = [ base monad-loops ref-mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/Julek";
@@ -14502,8 +14522,8 @@ self: {
      }:
      mkDerivation {
        pname = "Spock";
-       version = "0.7.12.0";
-       sha256 = "05vglqzf75dphxx2wnkxqn7aqcb19nh8g560zfpw56jrfbbmygwg";
+       version = "0.8.0.0";
+       sha256 = "04a0a66eb9cb6cc1528e3989e5b54378079ee9919412bc54015a3919603b7e3a";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          directory hashable http-types hvect list-t monad-control mtl
@@ -14512,7 +14532,7 @@ self: {
          unordered-containers vault wai wai-extra warp
        ];
        testHaskellDepends = [
-         base hspec hspec-wai http-types reroute stm text wai
+         base bytestring hspec hspec-wai http-types reroute stm text wai
        ];
        homepage = "http://www.spock.li";
        description = "Another Haskell web framework for rapid development";
@@ -14524,7 +14544,7 @@ self: {
      mkDerivation {
        pname = "Spock-auth";
        version = "0.2.0.1";
-       sha256 = "1vcrl5dqjn0ri9ybza2yv80xvbv2iwrz5hj5rbhgy6i803ixlpx0";
+       sha256 = "a05fdae300281affe0ca45c2f2338f62afdd01da5ea8bf7c8a1958895ba199ed";
        libraryHaskellDepends = [ base http-types Spock text time ];
        jailbreak = true;
        homepage = "https://github.com/agrafix/Spock-auth";
@@ -14540,7 +14560,7 @@ self: {
      mkDerivation {
        pname = "Spock-digestive";
        version = "0.1.0.1";
-       sha256 = "13766v5y43jmdh7m3q1790ppw2chwg3g29dfh1zacxw7n1gmhlyl";
+       sha256 = "d453585fb08777a67e80ae25f1c6e390097e2f4827e0510f6c550ee2cb36e68c";
        libraryHaskellDepends = [
          base digestive-functors http-types mtl Spock text
          unordered-containers wai
@@ -14557,7 +14577,7 @@ self: {
      mkDerivation {
        pname = "Spock-worker";
        version = "0.2.1.3";
-       sha256 = "0pxh7ccqb6xpab0807vsfb65lk4bafa44fram1f4d84slggyn1a1";
+       sha256 = "4105ebdfa39aa0465ca82a3b4294538b4c5acc727a1f80c052b79b85193bb05f";
        libraryHaskellDepends = [
          base containers lifted-base mtl Spock stm text time transformers
          vector
@@ -14573,7 +14593,7 @@ self: {
      mkDerivation {
        pname = "SpreadsheetML";
        version = "0.1";
-       sha256 = "14d3fk0cal0svb2clbhbbk48fygwvb0k01aawfm72576mrz9mb18";
+       sha256 = "28ac9a7eaee61471aae34a0530c1dafc7987c85c0b2ecac4da1a50c5c074a391";
        libraryHaskellDepends = [ base xml ];
        description = "Write support for Excel's SpreadsheetML format";
        license = stdenv.lib.licenses.bsd3;
@@ -14584,7 +14604,7 @@ self: {
      mkDerivation {
        pname = "Sprig";
        version = "0.1.1";
-       sha256 = "06jxs1hc69viv38nvafhn8ilj3xn2j9k543abgd8p69gc95w1lbn";
+       sha256 = "76d1c04b622f998bda5b6a90329314b60f4923b2d0a96dd1d87127c360d05d1a";
        libraryHaskellDepends = [ base SDL ];
        homepage = "http://liamoc.net/static/Sprig";
        description = "Binding to Sprig";
@@ -14597,7 +14617,7 @@ self: {
      mkDerivation {
        pname = "Stasis";
        version = "0.0.1";
-       sha256 = "1pycmc30hg7vzf3addl0kdd74hpamzg3c1z4fj6fzr4542afhcq8";
+       sha256 = "0833e8942085e4ef8c74e40736deafea42725a9b80b6a686fbfb3c0806abccdf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -14613,7 +14633,7 @@ self: {
      mkDerivation {
        pname = "StateVar";
        version = "1.1.0.1";
-       sha256 = "1ap51cvwq61xckx5hw44l82ihbxvsq3263xr5hqg42c5qp67kbhf";
+       sha256 = "0eae79ccc58509f2302cb90f2306d6bb2f1805a2847058fa643d18cc370be5aa";
        libraryHaskellDepends = [ base stm transformers ];
        homepage = "https://github.com/haskell-opengl/StateVar";
        description = "State variables";
@@ -14625,7 +14645,7 @@ self: {
      mkDerivation {
        pname = "StateVar-transformer";
        version = "1.0.0.0";
-       sha256 = "1dbpxwjz6yf4ap20wm5ngvd0i0knkjsdahmd90ymddqj82v8w3d0";
+       sha256 = "a00d8eb64012b7563d48ad42d5b49c768208da7eb6540ec455c479f325ef77b5";
        libraryHaskellDepends = [ base mtl transformers ];
        homepage = "http://github.com/seagull-kamome/StateVar-transformer";
        description = "State variables";
@@ -14637,7 +14657,7 @@ self: {
      mkDerivation {
        pname = "StatisticalMethods";
        version = "0.0.0.1";
-       sha256 = "1h90i6crknxv23zryqi7mfzg65g1ydv62mza1hiri66jlmdahir6";
+       sha256 = "2647a85aa5d29898230cea576176f3e115f3beab27629fff10bbdb99998920c1";
        libraryHaskellDepends = [ base statistics tuple vector ];
        homepage = "http://www.tbi.univie.ac.at/~choener/Haskell/";
        description = "Collection of useful statistical methods";
@@ -14651,7 +14671,7 @@ self: {
      mkDerivation {
        pname = "Stomp";
        version = "0.1.1";
-       sha256 = "0fdibnhab5j03df70pfg9psk6ah80a91ds4nmlb0rdlldddbi3wn";
+       sha256 = "968fb85a6b94b60c16ad96e8169202082a33f54dcf5d705c1b4096a5a05db139";
        libraryHaskellDepends = [
          base binary bytestring network time utf8-string
        ];
@@ -14666,7 +14686,7 @@ self: {
      mkDerivation {
        pname = "Strafunski-ATermLib";
        version = "1.6.0.3";
-       sha256 = "1cicz4d5kyl9j4y3p79m3fk56vcqk3220a6y536dw525x6180dzw";
+       sha256 = "fc378082e94514decc28de2820c498986d53a61b359d3b3c9189fa591af92cb2";
        libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "An abstract data type designed for the exchange of tree-like data structures";
@@ -14680,7 +14700,7 @@ self: {
      mkDerivation {
        pname = "Strafunski-Sdf2Haskell";
        version = "1.0.0.2";
-       sha256 = "0h73yj74pl0k3p7vamqhw1jz36pvh8kfpw58gkmskdmkh7j6wb30";
+       sha256 = "602c6ee481b3b6a9eb7ca8f0eb2682fb9af165e01057b5cf1d13d04b8ef4e340";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -14698,7 +14718,7 @@ self: {
      mkDerivation {
        pname = "Strafunski-StrategyLib";
        version = "5.0.0.8";
-       sha256 = "09k9lcrrdzj6p7ywagc6mw17g4x9i743np36p4dkdp37q48j0mac";
+       sha256 = "4c552011c167dc361bb9665c3bc889a9937702af863dc5fdb946fe9633a36926";
        libraryHaskellDepends = [ base directory mtl syb transformers ];
        description = "Library for strategic programming";
        license = stdenv.lib.licenses.bsd3;
@@ -14711,7 +14731,7 @@ self: {
      mkDerivation {
        pname = "StrappedTemplates";
        version = "0.2.0.2";
-       sha256 = "0x0nsrzb2r9pwp353ksxwik48iw17whmsclfj07qrqxchdwrjy6h";
+       sha256 = "d078997983ace38c0f908e325d213f81474466e45dcf51c6e53765b17ed61674";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers filemanip filepath mtl
          parsec text transformers
@@ -14728,7 +14748,7 @@ self: {
      mkDerivation {
        pname = "StrategyLib";
        version = "4.0.0.0";
-       sha256 = "1sskndywpm1gi4bs4i1gah73jk49inlscg4jzcqhq0phb8f886xk";
+       sha256 = "b31b841c5af0020c31fb923ca6a98d894c390e542f44a217892fd4cb7db353eb";
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://naesten.dyndns.org:8080/repos/StrategyLib";
        license = stdenv.lib.licenses.unfree;
@@ -14739,7 +14759,7 @@ self: {
      mkDerivation {
        pname = "Stream";
        version = "0.4.7.2";
-       sha256 = "1l87l0kl4awzdyx6b28npwy6xf03r39d89iharsh06zgnd4y42wr";
+       sha256 = "990be249b3ef1b0075563026d4d2c803b86e3cbf168965ba6f9f2b4227a007d1";
        libraryHaskellDepends = [ base lazysmallcheck QuickCheck ];
        description = "A library for manipulating infinite lists";
        license = stdenv.lib.licenses.bsd3;
@@ -14750,7 +14770,7 @@ self: {
      mkDerivation {
        pname = "StrictBench";
        version = "0.1.1";
-       sha256 = "1l4l77rjhl5g9089kjyarsrvbvm43bk370ld50qp17dqhvisl73m";
+       sha256 = "751caae386b89d7031288d8233e61aa4eeb5b3cecacb991048af5028f33994d0";
        libraryHaskellDepends = [ base benchpress parallel ];
        homepage = "http://bonsaicode.wordpress.com/2009/06/07/strictbench-0-1/";
        description = "Benchmarking code through strict evaluation";
@@ -14766,7 +14786,7 @@ self: {
      mkDerivation {
        pname = "SuffixStructures";
        version = "0.0.1.0";
-       sha256 = "0s294s06pj95i6q8n1cxsgkdc7x98mvvr1qd720rxqd3y54n63lb";
+       sha256 = "8b0e6349f1a3e19e81380d87bc7745a91fd6e6d39d058bb08925c96b80264968";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14789,7 +14809,7 @@ self: {
      mkDerivation {
        pname = "SybWidget";
        version = "0.5.6";
-       sha256 = "0m3papl90fs3zmlqxsjn0cymk049352cl42bif2x7gij75cv2b68";
+       sha256 = "c82cb1593932bed3858b4b10ca44198980593d0356ea8e69fd433b90e8557754";
        libraryHaskellDepends = [
          base containers mtl syb-with-class template-haskell TypeCompose
        ];
@@ -14805,7 +14825,7 @@ self: {
      mkDerivation {
        pname = "SyntaxMacros";
        version = "1.0.3";
-       sha256 = "155vkv7kg026zc2crywdyna1df98mw41qm0sadqihaj49xk59vyc";
+       sha256 = "ccef54664f442a1871531a541c08af28b91694f58dfbcc04fb468037cf9ebb94";
        libraryHaskellDepends = [
          AspectAG base containers HList ListLike template-haskell TTTAS
          uu-parsinglib uulib
@@ -14824,7 +14844,7 @@ self: {
      mkDerivation {
        pname = "Sysmon";
        version = "0.1.2";
-       sha256 = "1zyp333vicjarcmip2q52nzfv948yl2q6qr3k3glp4v4m8f75ap3";
+       sha256 = "e3aa721caa64934bdf9823638305f588a4edbe15058b1b2bcb4ab2b8c718d7ff";
        libraryHaskellDepends = [
          base ConfigFile filepath fingertree Glob MissingH mtl old-locale
          pretty statistics template-haskell time vector
@@ -14842,7 +14862,7 @@ self: {
      mkDerivation {
        pname = "TBC";
        version = "0.0.3";
-       sha256 = "1063ckv034mb6s41xy8pr387y1hnknkyk4r29vmzdrm3pdcyzdn3";
+       sha256 = "c3b6ef59bba3e6f6eb4e2293e9a79d16067fd0c817f91e8836ab9201f664c380";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14863,7 +14883,7 @@ self: {
      mkDerivation {
        pname = "TBit";
        version = "0.4.2.3";
-       sha256 = "1by1wy2w3ankg1php7m911kc53q2dv5jfl8v1iwp3mb68s8b6wrs";
+       sha256 = "3a73b3904666d571790c1b5127cb6e028fc26608a99e0b6f78d3aac185e7c1af";
        libraryHaskellDepends = [
          base containers deepseq fgl free hmatrix integration list-extras
          mtl numeric-tools parallel
@@ -14880,7 +14900,7 @@ self: {
      mkDerivation {
        pname = "TCache";
        version = "0.12.0";
-       sha256 = "0marslz5jg66r3i2d0yjjrj11bpywpadcxs5k4j6782iczxybd7s";
+       sha256 = "fab4e5fb6751a06324994577d6d4e5feae106496d28326e2c8c63c593ed55955";
        libraryHaskellDepends = [
          base bytestring containers directory hashtables mtl old-time
          RefSerialize stm text
@@ -14894,7 +14914,7 @@ self: {
      mkDerivation {
        pname = "TTTAS";
        version = "0.6.0";
-       sha256 = "18p3rxh3g44ky5q4hjq53l4shg4gd8v68wra6bdxv8bjafxld1wp";
+       sha256 = "978746bb5372a1dddb322a7364366a8f3ca8091d054b4870f193903760cfe3a2";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/TTTAS";
        description = "Typed Transformations of Typed Abstract Syntax";
@@ -14906,7 +14926,7 @@ self: {
      mkDerivation {
        pname = "TV";
        version = "0.5.0";
-       sha256 = "0vz9j5vjypnkbzld18f6kczfj54disf43x5052s4n7gqzsjxpxvb";
+       sha256 = "6bf7dba5fef81d4bb428a0f4419c8e8d14e93e9bc6a1d0e85fd35e2f7791e96f";
        libraryHaskellDepends = [ base DeepArrow TypeCompose ];
        homepage = "http://haskell.org/haskellwiki/TV";
        description = "Tangible Values -- composable interfaces";
@@ -14920,7 +14940,7 @@ self: {
      mkDerivation {
        pname = "TYB";
        version = "0.2.3";
-       sha256 = "1rdwj6dg156i60i7s8xr310j0yza41jjqk6pmgx2giqjs122dz5n";
+       sha256 = "b6fc2644d012c727faabd74c2c6520ea7b204118b9237d2230d194f09a91bce5";
        libraryHaskellDepends = [
          array base containers mtl template-haskell transformers
        ];
@@ -14936,7 +14956,7 @@ self: {
      mkDerivation {
        pname = "TableAlgebra";
        version = "0.7.1";
-       sha256 = "1jqkjnyznklyiy2shm4c9gix267war1hmsjncdmailhca41fs4bz";
+       sha256 = "7f11ed02510cd2a86a6356ea0a4356fc18d1e34b8c54a8858f9e4efbbd9513cb";
        libraryHaskellDepends = [
          base containers HaXml mtl pretty template-haskell
        ];
@@ -14949,7 +14969,7 @@ self: {
      mkDerivation {
        pname = "Tables";
        version = "0.1.0.2";
-       sha256 = "02a6awbqwhmv7c74lgbp35ykqn31mgwp7ffd0j4rs42vv1a4ffkr";
+       sha256 = "793a4754d85b109d8904cdb973f9ab61583c7d19773d4a0e3bbb428e17574609";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cookbook ];
@@ -14964,7 +14984,7 @@ self: {
      mkDerivation {
        pname = "Tablify";
        version = "0.8.2";
-       sha256 = "10w3idjhrgmkrkjblrmb2wb2s2fg657nw5rmg5k147wrgrkzbsz3";
+       sha256 = "e3ebf5677e991f12667935176e4f31cf092d1617ab66bae4ccb3be0c658b8383";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base parsec xhtml ];
@@ -14978,7 +14998,7 @@ self: {
      mkDerivation {
        pname = "Tainted";
        version = "0.1.0.2";
-       sha256 = "1mjr81z42qhwa6njlvlsslpzbbpiab88ns8g8amskwv159gk6mlb";
+       sha256 = "8b56335f2a61f3a9ab420f698bd052f1aef52fd59a6e2aad511c62417e4059d6";
        libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/RossMeikleham/Tainted";
        description = "Tainted type, and associated operations";
@@ -14990,7 +15010,7 @@ self: {
      mkDerivation {
        pname = "Takusen";
        version = "0.8.7";
-       sha256 = "0mxck66rz6lplgcl3a3i0gaybc2ki0q7wfilhkp2f3h3m50fg7wy";
+       sha256 = "9e9fe740a9030e27ee84343a7e308853b0e5d50371a841d9a3979a9f8d99ac57";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
@@ -15005,7 +15025,7 @@ self: {
      mkDerivation {
        pname = "Tape";
        version = "0.4.0.0";
-       sha256 = "1d66l67cicn3q4a6glfxfkhc9cjm7vqi0bnyjad0bzyyv409j6bp";
+       sha256 = "77199900d9deff059a92de2e10f13e55b2c4e074ddd16714c1c3b2c88ea1c6b4";
        libraryHaskellDepends = [ base comonad distributive Stream ];
        jailbreak = true;
        homepage = "https://github.com/kwf/Tape";
@@ -15020,7 +15040,7 @@ self: {
      mkDerivation {
        pname = "TeaHS";
        version = "0.3.1";
-       sha256 = "1326lrpkw2gyn7y9px38gyzi2cnx87ki65r6mwds746d1s1zmmcn";
+       sha256 = "96d5fa830ecd90a31baf261713e741dd3211bf7f68f49bfcb1fe093e6fa6468c";
        libraryHaskellDepends = [
          array base containers mtl SDL SDL-image SDL-mixer SFont Sprig
        ];
@@ -15035,7 +15055,7 @@ self: {
      mkDerivation {
        pname = "Tensor";
        version = "1.1.0.1";
-       sha256 = "1q8infjcszbbfqybg1fv33fy33chyvj2nbj9d2sxvsixx57hm12m";
+       sha256 = "55840a4fe93deaddb568492e2be4f6908de1dd18db85b73c766b7dcda4b311e1";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/svenpanne/Tensor";
        description = "Tensor data types";
@@ -15047,7 +15067,7 @@ self: {
      mkDerivation {
        pname = "TernaryTrees";
        version = "0.2.0.2";
-       sha256 = "06m4mi9cl16sfyn9wibb0ph32vhgf501adjq059s3hdlxr4acdwr";
+       sha256 = "9937a648eeb4c1a1530158361540710f6e31e0056b459eac77da04ca52aca41a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base binary ];
@@ -15063,7 +15083,7 @@ self: {
      mkDerivation {
        pname = "TestExplode";
        version = "0.1.0.0";
-       sha256 = "0r4nwzwdila9p05g5y99rp06dbh1k2yl5jsc6yn6dwvxkvvdjcs1";
+       sha256 = "4133d9f69e7df366ac374ccb42bd9801ae66c0cd29f9f20ab849d1d8f8e79664";
        libraryHaskellDepends = [
          base containers directory fgl graphviz interpolatedstring-perl6 mtl
          process text
@@ -15079,7 +15099,7 @@ self: {
      mkDerivation {
        pname = "Theora";
        version = "1.0";
-       sha256 = "1gw97mxwb6ywc4qvfggjzsryl0m4g6g30ljx4xcvy6snfmgv00ig";
+       sha256 = "2f02b05f75561bbf59275d52309e79a402eab3fef23db73161dc9bc57b3d89bf";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ogg theora ];
        license = "GPL";
@@ -15091,7 +15111,7 @@ self: {
      mkDerivation {
        pname = "Thingie";
        version = "0.80";
-       sha256 = "0fl6pk2vp765gyzc4afjdg0lgbnh5v08gfbp0kzny4ng25bmxqwa";
+       sha256 = "8ae35e5711cf126fff0477b987c02ed0ae47c16bd229c2be7fc59cbbc5bc863a";
        libraryHaskellDepends = [ base cairo gtk mtl ];
        description = "Purely functional 2D drawing";
        license = stdenv.lib.licenses.bsd3;
@@ -15103,7 +15123,7 @@ self: {
      mkDerivation {
        pname = "ThreadObjects";
        version = "0.0";
-       sha256 = "0rpcv6kw351ykj36f83qdqygrhk4ylqlcgcswxl8gg1v33jaaqmz";
+       sha256 = "bf62a5e4183bbc8768e79a3d4631f564c2fc3c6e782067869c3e94c1a7d9ec66";
        libraryHaskellDepends = [ base ];
        description = "Mutable objects that reside in their own threads";
        license = stdenv.lib.licenses.gpl3;
@@ -15115,7 +15135,7 @@ self: {
      mkDerivation {
        pname = "Thrift";
        version = "0.6.0.1";
-       sha256 = "0yk496zql0jpyj83ybdzffc03sylf5pwn093k831m99j54l2r5yv";
+       sha256 = "db972c282932a51a069a2301cb6f71d4eb019873bf2d3f90f457028abf49647a";
        revision = "1";
        editedCabalFile = "56a8ab041685777391702f1475e5c2a3462b36765bd53de2e21e1f55aa5999d9";
        libraryHaskellDepends = [
@@ -15135,7 +15155,7 @@ self: {
      mkDerivation {
        pname = "TicTacToe";
        version = "0.0.1";
-       sha256 = "0542hripn5nlwdvnhkd9xzzh2b1x6alwnqxq877r92c7kqnlffw4";
+       sha256 = "843b472d9e878994cf41b863cba9323d2c01ffefa94d6877e3d4167b63868214";
        libraryHaskellDepends = [
          base containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -15150,7 +15170,7 @@ self: {
      mkDerivation {
        pname = "TigerHash";
        version = "0.2";
-       sha256 = "02plz1y7lmvp3jpl5srsnx2nkl6yhhfn6pqj00szs688cahk2dik";
+       sha256 = "333631a1620819fd3500125f631d84ded06945b73aeb42af1c77577a7cf8f40a";
        libraryHaskellDepends = [ base binary bytestring dataenc ];
        description = "TigerHash with C implementation";
        license = stdenv.lib.licenses.gpl2;
@@ -15163,7 +15183,7 @@ self: {
      mkDerivation {
        pname = "TimePiece";
        version = "0.0.5";
-       sha256 = "1ylf4kzyf947szgib0ivkvygbinmy97nvy77d0crryzxdmccrzbj";
+       sha256 = "72fdcc586dfdfb9c1968e7f86d4ff2d5c6f5fc9e3b8215dfd78724e7ff248efa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -15184,7 +15204,7 @@ self: {
      mkDerivation {
        pname = "TinyLaunchbury";
        version = "1.0.1";
-       sha256 = "1xxadd8pqbgl0z8vrqn8fm6x0c9l2y3a7irjmjkh9750x6hdb4b9";
+       sha256 = "6991d5a0e9a09c04a7ac32c7a386173431d04d75c8e2bcd107f42d7c516baaf7";
        libraryHaskellDepends = [ base mtl ];
        description = "Simple implementation of call-by-need using Launchbury's semantics";
        license = stdenv.lib.licenses.bsd3;
@@ -15196,7 +15216,7 @@ self: {
      mkDerivation {
        pname = "TinyURL";
        version = "0.1.0";
-       sha256 = "0y8bl6w3ix2zjhm10wazgi70sr02ydc3hrwjbr6whk341n140wsh";
+       sha256 = "507340820d644cc84d5e92673858f302640d4e7c5f71102a945ff438b8a10b79";
        libraryHaskellDepends = [ base HTTP network ];
        description = "Use TinyURL to compress URLs";
        license = stdenv.lib.licenses.bsd3;
@@ -15208,7 +15228,7 @@ self: {
      mkDerivation {
        pname = "Titim";
        version = "0.2.3";
-       sha256 = "1s8zvb38r9pxh55d5206lijprc6xsqnr0j670sdjrw7n8gyn7vav";
+       sha256 = "5bed63fd43f6f02c9b06c748902dd6ddb07c65a40688d24a81fda68cc6da1fe9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers matrix random ];
@@ -15223,7 +15243,7 @@ self: {
      mkDerivation {
        pname = "Top";
        version = "1.7";
-       sha256 = "0ykicqwayja14z30hn5cy3c96sikqhbyrh0bcqykk9izwhxs339x";
+       sha256 = "3d8da13be43fa6393d660bc0ec17c4336a93d8f0ac5808c6274149af3866717a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl ];
@@ -15241,7 +15261,7 @@ self: {
      mkDerivation {
        pname = "Tournament";
        version = "0.0.1";
-       sha256 = "1yzgcsp3g5sfyxavq1firna5z5m9bnk9ddrbxxmpy1yydmj1n5jk";
+       sha256 = "53161b646dde077f6bef2bb796a65da9965f94cdd105bc55f74e9737ae66effb";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [
          base containers mtl QuickCheck test-framework
@@ -15259,7 +15279,7 @@ self: {
      mkDerivation {
        pname = "TraceUtils";
        version = "0.1.0.2";
-       sha256 = "0la19yynd7bpswi9012hf0vl9c4fdnn8p6y0287xanmdcs9zqz16";
+       sha256 = "267cfc9366ad5ad50f12c09b8bac6d8eb044377050049022d7779d66bd4f4151";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Peaker/TraceUtils";
        description = "Functions that should have been in Debug.Trace";
@@ -15271,7 +15291,7 @@ self: {
      mkDerivation {
        pname = "TransformersStepByStep";
        version = "0.1.1.0";
-       sha256 = "1cd8sh6gi9zmvd70kzw1x9ycanfsyphjdy3r65xrph54ilwy511p";
+       sha256 = "3784e2398da4c09b7b3179f826e1f5da59c57cea81ff094edbf5a7f80cd4a8b1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl ];
@@ -15285,7 +15305,7 @@ self: {
      mkDerivation {
        pname = "Transhare";
        version = "0.9";
-       sha256 = "04n1ld6h3q71iqnvwyabzj69vdy2x98w0drriyx13ykywbd31036";
+       sha256 = "668030dae27efa11ba8f3937c051eac2b79d8cfc4b79be2d8ee1e0014da3c112";
        libraryHaskellDepends = [ base containers ];
        description = "A library to apply transformation to containers so as to maximize sharing of unchanged subcomponents";
        license = stdenv.lib.licenses.bsd3;
@@ -15296,7 +15316,7 @@ self: {
      mkDerivation {
        pname = "TreeCounter";
        version = "0.0.2";
-       sha256 = "06ci4v8gflsgi73wrpqvhb7w3mdkbjgidhqf95yyk4wiga1mrzal";
+       sha256 = "54fd5c837a9193e97d490ec3169f5cb3d5c1cf821bdfccc7894f53f7d0269119";
        libraryHaskellDepends = [ base ref-mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/Julek";
@@ -15309,7 +15329,7 @@ self: {
      mkDerivation {
        pname = "TreeStructures";
        version = "0.0.2";
-       sha256 = "1lcj166i8f7850fqjv7xqxdn6zwpdynzxn3bf243wdnwmnn5pysx";
+       sha256 = "5dfb5bacaddc363e88706bd8fead6f977f635bc7fd6c891d28e838148d0992d1";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://www.github.com/bhickey/TreeStructures";
@@ -15322,7 +15342,7 @@ self: {
      mkDerivation {
        pname = "TreeT";
        version = "0.0";
-       sha256 = "0d1k4nblcnksh2j6b4v14r2xd2kn6cmqmyqhmy6wyz3kr0lyzxqd";
+       sha256 = "0df7ef29c8737ccf8daf10fb8a2b33768ad64526619365a4807a5a4697253334";
        libraryHaskellDepends = [ base containers transformers ];
        description = "Transformer for Data.Tree";
        license = stdenv.lib.licenses.publicDomain;
@@ -15333,7 +15353,7 @@ self: {
      mkDerivation {
        pname = "Treiber";
        version = "0.0.4";
-       sha256 = "09sd9p1y3zqkfahkp1vgdnlvgv1vnvdl7kdzccsd41h1h61fz3jd";
+       sha256 = "4d8eef82810106d23463bfcd43dbb63becb7a96d6f873ba17213ffe1c34d4d27";
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        jailbreak = true;
        homepage = "https://github.com/Julek";
@@ -15348,7 +15368,7 @@ self: {
      mkDerivation {
        pname = "TrendGraph";
        version = "0.1.0.1";
-       sha256 = "1rdlimlbdpa089knhnqzgxc8ngqag4m4w3r92jd95kwnmr8nizkp";
+       sha256 = "77fe6851ae96cf929a14290f4e2a790a3f8b587f1f5b68674240ddb6688db4e5";
        libraryHaskellDepends = [
          base containers diagrams-cairo diagrams-lib mtl
          optparse-applicative time
@@ -15367,7 +15387,7 @@ self: {
      mkDerivation {
        pname = "TrieMap";
        version = "4.1.0";
-       sha256 = "14wril1sa35cja66y7ah9qwr3bmsi985y7rlxyj12x2fv6dclpc4";
+       sha256 = "845dca9ad94e7411a4ef341f5f508abaae91394e501d6f8c92ac0ca5038d9993";
        libraryHaskellDepends = [
          base bytestring containers primitive template-haskell
          th-expand-syns transformers unpack-funcs vector
@@ -15384,7 +15404,7 @@ self: {
      mkDerivation {
        pname = "Twofish";
        version = "0.3.2";
-       sha256 = "1bv79582fxwgk255fhss6k8irb7mlbdvlvvx8jyzs16g3fyw1y5a";
+       sha256 = "aaf8c0bd1bcf04fdbd447d6fbadba2f5ac1cd1345a43578a988f7727504967af";
        libraryHaskellDepends = [
          array base binary bytestring cereal crypto-api largeword mtl tagged
        ];
@@ -15404,7 +15424,7 @@ self: {
      mkDerivation {
        pname = "TypeClass";
        version = "0.2.1";
-       sha256 = "0crymgw91xx0hblbmz488x39i2qzf9c15kv5x950ljmpyrhy5jhv";
+       sha256 = "1bcae261f6b74a0a4aea65cf1258721f8b98464788fcbae882a0f790f8ab3e33";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -15422,7 +15442,7 @@ self: {
      mkDerivation {
        pname = "TypeCompose";
        version = "0.9.10";
-       sha256 = "1wpldqdf6czl36fs4pvvj2z3kg1487sanqncp4rbmgrrhbfmqxxq";
+       sha256 = "b8775cdd8239bfba32b9cc62abf44124bc39be907b5fa29d19f433e31a6ef4f2";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/conal/TypeCompose";
        description = "Type composition classes & instances";
@@ -15434,7 +15454,7 @@ self: {
      mkDerivation {
        pname = "TypeIlluminator";
        version = "0.0";
-       sha256 = "02ck7sik5wvh989k9ban1m2dlpfld0d0zs7sqb12m1f6wls7fghc";
+       sha256 = "0c3e7734e5c6852ac2c2fae80f1a68d45dda440d56ad34134a70f332a33e9309";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 ];
@@ -15449,7 +15469,7 @@ self: {
      mkDerivation {
        pname = "TypeNat";
        version = "0.4.0.0";
-       sha256 = "0v6xd98nwl7zg5q5xmlrgzsb3219vcwj8rfacdyzdb9xpq5l9dnv";
+       sha256 = "dbb6440bbe3dadf67d63ca652439db2988b1f47f99d65e7079ff506e516add6c";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/avieth/TypeNat";
@@ -15463,7 +15483,7 @@ self: {
      mkDerivation {
        pname = "TypingTester";
        version = "0.2.0.0";
-       sha256 = "07qwvmdh5164v552qkk4fm66nlvb4dcv0wh5jircfgh7gsd60l6n";
+       sha256 = "d650609a7e073ec772940572b059236b536b4c75644e2c4ad9c484025bdd1c1f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers directory time ];
@@ -15479,7 +15499,7 @@ self: {
      mkDerivation {
        pname = "UISF";
        version = "0.3.0.2";
-       sha256 = "0i5kw450yk44kh25xbqzjwnjipzh81i20vk8il9ic2fh4d79va46";
+       sha256 = "86a89d4e23d00916138d686e206240f0df282d971faf5e049c844c0f0ae1b344";
        libraryHaskellDepends = [
          arrows base containers deepseq GLFW OpenGL stm transformers
        ];
@@ -15495,7 +15515,7 @@ self: {
      mkDerivation {
        pname = "UMM";
        version = "0.3.1";
-       sha256 = "0k9kvlkcznk6ydfcymzzh0a4j4zkl5iblvnx6fkmk8xah1qnkq5h";
+       sha256 = "b0e0697180aaa359a733dd6eba62a1f313491480ff57cf5cf366dacf26dd334d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -15515,7 +15535,7 @@ self: {
      mkDerivation {
        pname = "URLT";
        version = "0.14";
-       sha256 = "14qlyrc3ins3lwhd2c8lyhm1j3v6nj4qgs5g9xys4w6hnndz2g3s";
+       sha256 = "7a3cf19bb5d070a27d4fafe88789b4660f192af41431d120a743db3858f61493";
        libraryHaskellDepends = [
          applicative-extras base Consumer happstack-server hsp hsx mtl
          QuickCheck regular template-haskell
@@ -15530,7 +15550,7 @@ self: {
      mkDerivation {
        pname = "URLb";
        version = "0.0.1";
-       sha256 = "1l62z7798bby4fbrz62ic802g8zah3flb2pmsd3ky7y5903s3nxr";
+       sha256 = "b9dba10748c51f3f47d3f58a45dd80eaa327006251989f97237e2d94cef9c2d0";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        homepage = "http://github.com/solidsnack/URLb";
        description = "DEPRECATED A simple, liberal URL parser";
@@ -15544,7 +15564,7 @@ self: {
      mkDerivation {
        pname = "Unique";
        version = "0.4.2";
-       sha256 = "0riyn68bi6wxz2mhqlywva6a1ngfr4k3gglp12dkhcmllh5l3dc2";
+       sha256 = "82b5410ba4b432389b0897be3726c9eed9a08cdadc530cabf89d9bb890b13e66";
        libraryHaskellDepends = [
          base containers extra hashable unordered-containers
        ];
@@ -15559,8 +15579,8 @@ self: {
      }:
      mkDerivation {
        pname = "Unixutils";
-       version = "1.53";
-       sha256 = "0gh8fii9kc2nah5l0gv1pzlxdxgw962vgr1w9kc5wksf85hgyplr";
+       version = "1.54.1";
+       sha256 = "f9295529744cb2658364956f376ff506dc1876eb2b0148e5b09c1a4bc4732644";
        libraryHaskellDepends = [
          base bytestring directory exceptions filepath mtl process
          process-extras pureMD5 regex-tdfa unix zlib
@@ -15575,7 +15595,7 @@ self: {
      mkDerivation {
        pname = "Unixutils-shadow";
        version = "1.0.0";
-       sha256 = "11m8lgq2rjvh7j8si7sqixf4k4ns65jy0zp6apqp0xc23c1znyr7";
+       sha256 = "277bfb031b827570f155e67ee06531da92495c8f589fa8913c70cb2cf0a3a886";
        libraryHaskellDepends = [ base unix ];
        homepage = "http://src.seereason.com/haskell-unixutils-shadow";
        description = "A simple interface to shadow passwords (aka, shadow.h)";
@@ -15587,7 +15607,7 @@ self: {
      mkDerivation {
        pname = "Updater";
        version = "0.2";
-       sha256 = "03n2r02bgv9hzlvxypdy1mrvdmzrxlm717bf7qp9f9ky1sj3ixp4";
+       sha256 = "e4f638a40e7e26972e3e6e9d702aedf9d7b6730dbe5ddf37fd30edb704c8c20e";
        libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/yokto/Updater";
        description = "Monadic FRP library based on stm";
@@ -15599,7 +15619,7 @@ self: {
      mkDerivation {
        pname = "UrlDisp";
        version = "0.1.7";
-       sha256 = "1y21v5k7s9sj8z5r3czp5i80x40zvyqxzr1xl28ardwj5q5rrvzp";
+       sha256 = "f7ef9c0b2e92b7ac90a03de4dfb1df1f900e502cf7b391cb4752277d66d941f8";
        libraryHaskellDepends = [ base cgi MaybeT mtl ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/UrlDisp";
@@ -15613,7 +15633,7 @@ self: {
      mkDerivation {
        pname = "Useful";
        version = "0.0.6";
-       sha256 = "01xb68qh29q6b0pdxvadqw7q1p855k14jdz1qjlhg6785n0qp954";
+       sha256 = "a4a48b812de89807a9c4e13749c22c05dd800fc74dedde2e580627013132ab07";
        libraryHaskellDepends = [ base containers random ];
        description = "Some useful functions and shorthands";
        license = stdenv.lib.licenses.bsd3;
@@ -15624,7 +15644,7 @@ self: {
      mkDerivation {
        pname = "UtilityTM";
        version = "0.0.4";
-       sha256 = "1mjy3w4sw32rbmm13yhmpidfsj91v3p58jvki16z0kzk3fswpa85";
+       sha256 = "05a9cbb51bf34ff04d88734b54eed82149ed5abc15fa116a5d590cae091f5ed6";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/tonymorris/utility-tm";
        description = "Utility functions that are missing from the standard library";
@@ -15641,7 +15661,7 @@ self: {
      mkDerivation {
        pname = "VKHS";
        version = "0.5.4";
-       sha256 = "0621x6mqa1qplswirxnzpzn24520qvl5ii1wyvqm8nfb69sbqzpg";
+       sha256 = "ef7ebc7432cb5954f1f63cc458e8c6401422ecbfdff61cb9a6170785abe94118";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -15662,7 +15682,7 @@ self: {
      mkDerivation {
        pname = "Validation";
        version = "0.2.0";
-       sha256 = "10smif8y5bgjiarag3ws131kwji32mlh6mqfnmmp20xf41fsm0z3";
+       sha256 = "e383aa5d20ae03716bb50e57036915234a3ec3089a8fa7b28af2ade2918b5583";
        libraryHaskellDepends = [
          base bifunctors semigroupoids semigroups
        ];
@@ -15677,7 +15697,7 @@ self: {
      mkDerivation {
        pname = "Vec";
        version = "1.0.5";
-       sha256 = "0hyk553pdn72zc1i82njz3md8ycmzfiwi799y08qr3fg0i8r88zm";
+       sha256 = "f523945104cf8d8c11f0299dc8a3fb9579d4eaf8d20a1403fbe2d8764729d343";
        libraryHaskellDepends = [ array base ghc-prim ];
        homepage = "http://github.net/sedillard/Vec";
        description = "Fixed-length lists and low-dimensional linear algebra";
@@ -15689,7 +15709,7 @@ self: {
      mkDerivation {
        pname = "Vec-Boolean";
        version = "1.0.6";
-       sha256 = "0zxxpychddmlrv7r190gn4dl282ak4qfk2d92l24qxi9fds1rshk";
+       sha256 = "13ea1c747329764c0415a989e930994a20411bb10fa490cfceb4b60699bfbd7f";
        libraryHaskellDepends = [ base Boolean Vec ];
        jailbreak = true;
        description = "Provides Boolean instances for the Vec package";
@@ -15702,7 +15722,7 @@ self: {
      mkDerivation {
        pname = "Vec-OpenGLRaw";
        version = "0.2.0.1";
-       sha256 = "0qsi1s8qp3fkr5alh2m7y1a1lm5xypjvmk174ywf0aga2y20bblm";
+       sha256 = "95ae058417ea29e0b82727ccbae5f5bd541a54f0a70a4855c9d38d8b910e5163";
        libraryHaskellDepends = [ base OpenGLRaw Vec ];
        homepage = "http://www.downstairspeople.org/darcs/Vec-opengl";
        description = "Instances and functions to interoperate Vec and OpenGL";
@@ -15715,7 +15735,7 @@ self: {
      mkDerivation {
        pname = "Vec-Transform";
        version = "1.1";
-       sha256 = "0jwi9kgij8xd0419nkksgffwcn94fz6ijdq8s29b771409a1pkfc";
+       sha256 = "cccd1b5402249cb392d0083719cd772459c69d7b7a4e9b0201ad2319df4c914b";
        homepage = "https://github.com/tobbebex/Vec-Transform";
        description = "This package is obsolete";
        license = stdenv.lib.licenses.bsd3;
@@ -15727,7 +15747,7 @@ self: {
      mkDerivation {
        pname = "VecN";
        version = "0.0.2";
-       sha256 = "1hv8idxv9gniwwjs67q75bbcc5ry9r05cxjmsxk0q54l8zscdss2";
+       sha256 = "42ebc6f44794140c66d7557656404e3e17c6d62a071fa325e7d1beb47b8b68c3";
        libraryHaskellDepends = [ base Peano ];
        description = "a simple peano-indexed vector type";
        license = stdenv.lib.licenses.bsd3;
@@ -15738,7 +15758,7 @@ self: {
      mkDerivation {
        pname = "ViennaRNA-bindings";
        version = "0.1.2.2";
-       sha256 = "06zz3svdsy6qzbj7s02sbifkprmm58r14ss46r6680c9ybw9w5l3";
+       sha256 = "83169ef8f28901644c36446b12322ab5e63b5d5c5a007de4fad878ddb61eff1b";
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ c2hs ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
@@ -15751,7 +15771,7 @@ self: {
      mkDerivation {
        pname = "ViennaRNAParser";
        version = "1.2.5";
-       sha256 = "0kc3b49g52dh0a4q8v5ir7pwa0x8s6rclmqjhkj95v1070ag4w0f";
+       sha256 = "0e70f2143820ec92e4841257cab2d1a803c5efc9b16c848902b089f21259834d";
        libraryHaskellDepends = [ base parsec process ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
@@ -15763,7 +15783,7 @@ self: {
      mkDerivation {
        pname = "WAVE";
        version = "0.1.3";
-       sha256 = "1cgla9y1lwcsdad5qdspymd7s6skdw961fgzh02kvi7gjbrrcyi7";
+       sha256 = "277a96f392efc43d0580ffb960126f531b7d5af557375c9a6a9a711a7c52f4b1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -15781,7 +15801,7 @@ self: {
      mkDerivation {
        pname = "WL500gPControl";
        version = "0.3.4";
-       sha256 = "0gbjb432758wvd3p5brb4kjn037x6h30bzvn9f681pg0m1w52hgv";
+       sha256 = "fb415178a8e0dd808c4b76ff050634fd0c60e5242baf7247db1c95230659723d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -15798,7 +15818,7 @@ self: {
      mkDerivation {
        pname = "WL500gPLib";
        version = "0.3.1";
-       sha256 = "15w065yg8hjhljgnmx88fnryhbh7dysmsqmpr9qnj96as7vrkwgs";
+       sha256 = "faf199f7d1ca246971cab7625db56f072ee8b37508f56a9fa45042f47c318097";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base curl mtl tagsoup ];
@@ -15815,7 +15835,7 @@ self: {
      mkDerivation {
        pname = "WMSigner";
        version = "0.1.0.0";
-       sha256 = "0im8rfyfnhq2s445cjm4xvnqqs8pgpavhmyk98jqshpfm9d1cd6q";
+       sha256 = "d834165aaaee428d254ad357b8d57d17698cedeea44a5608d10243ebbccba846";
        libraryHaskellDepends = [
          base base64-bytestring binary bytestring cryptohash directory lens
          mtl random split vector
@@ -15833,7 +15853,7 @@ self: {
      mkDerivation {
        pname = "WURFL";
        version = "0.1";
-       sha256 = "13vfszyfyxwz4zi8zilifd0jad1gwlr75x931q8qbpi1kwr7mivk";
+       sha256 = "73c77a329f21de85110e23f57232e52f3425417391c68fe2279f77effcd76e8f";
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "Convert the WURFL file into a Parsec parser";
        license = stdenv.lib.licenses.bsd3;
@@ -15845,7 +15865,7 @@ self: {
      mkDerivation {
        pname = "WXDiffCtrl";
        version = "0.0.1";
-       sha256 = "0vv8s483g3dkxyk833cjczj0a5zxiy9xh56kij6n0jjyzxb9bz0k";
+       sha256 = "13fc9556ff5e4a608d8cd314d8938ffd1705e467928d81a6efb38d3710d1686f";
        libraryHaskellDepends = [ base containers wx wxcore ];
        homepage = "http://wewantarock.wordpress.com";
        description = "WXDiffCtrl";
@@ -15860,7 +15880,7 @@ self: {
      mkDerivation {
        pname = "WashNGo";
        version = "2.12.0.1";
-       sha256 = "11d9cwqfpvf999a5fi3a3v5b4gdrszzgf4gbdhx63afy42ylbnfj";
+       sha256 = "d2d945bd20dea9613a6ceb11f7fed7b93db2ca1e6a4457544ac9edeb3067a985";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -15881,7 +15901,7 @@ self: {
      mkDerivation {
        pname = "Weather";
        version = "0.1.0.4";
-       sha256 = "0g5rpz6gnf8hl7gpjc7nwci8x24yw02ps3jwjsi6js5yf3mlrxnv";
+       sha256 = "dbf64ceb70be6869a2965c0e7d05e09e888e22e3f63079dfa11039fbccbfb93c";
        libraryHaskellDepends = [
          aeson base bytestring HTTP text unordered-containers
        ];
@@ -15895,7 +15915,7 @@ self: {
      mkDerivation {
        pname = "WebBits";
        version = "2.2";
-       sha256 = "1frmnjbpgm76dzs1p4766fb6isqc3pxv4dnj8sdhnfliv5j0xv2z";
+       sha256 = "5fec0e64d9913a0b9b46d236b2fb1d0ceb689633e6901bf46fe6d47797b435bb";
        libraryHaskellDepends = [ base containers mtl parsec pretty syb ];
        homepage = "http://github.com/brownplt/webbits";
        description = "JavaScript analysis tools";
@@ -15909,7 +15929,7 @@ self: {
      mkDerivation {
        pname = "WebBits-Html";
        version = "1.0.2";
-       sha256 = "18dd52970cd27kra4l89vvrx2mrdbqd4w4f76xrq3142daxsagal";
+       sha256 = "543da5bb6a8284817337c7114e1a5e2d57d1f3de0951a2f23ca231709228ada1";
        libraryHaskellDepends = [
          base containers mtl parsec pretty syb WebBits
        ];
@@ -15927,7 +15947,7 @@ self: {
      mkDerivation {
        pname = "WebBits-multiplate";
        version = "0.0.0.1";
-       sha256 = "1j3difi3f1w6bgbnsvqw9cv88aikin22myli0lx29pqn7xhqsbv3";
+       sha256 = "632f8d613f16df243a0591fa2a848d332a84364b1c6f6dd75b860737a28b6dc8";
        libraryHaskellDepends = [
          base multiplate multiplate-simplified transformers WebBits
        ];
@@ -15945,7 +15965,7 @@ self: {
      mkDerivation {
        pname = "WebCont";
        version = "0.0.1";
-       sha256 = "1lr5iz0kqhr8w0c7038mlbysw1c3lbzfjis085n68ib104ykyyi6";
+       sha256 = "267a3f3d016145646c414047e9fea28305aefda2150d7018e028433cc18f25d3";
        libraryHaskellDepends = [
          applicative-extras base concatenative containers formlets
          happstack-server happstack-state happstack-util mtl utf8-string
@@ -15962,7 +15982,7 @@ self: {
      mkDerivation {
        pname = "WeberLogic";
        version = "0.1.2";
-       sha256 = "0nl79q3y2qi0xnkppxj8d9h96hfwrgb3gksm2x1zp9lq7836562z";
+       sha256 = "5f9862063a98a6fb431755cf37d6cbdc4193606a48f67ba7ed2062e1074e875a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec ];
@@ -15982,7 +16002,7 @@ self: {
      mkDerivation {
        pname = "Webrexp";
        version = "1.1.2";
-       sha256 = "1iv969gd4xmagw74i6fmw4d864zxlzi4yf0y9ns1nvijn7w7s5jb";
+       sha256 = "4b167df8b1326e1bb44d1e384fe2a7fd13831ae1d599480e7faa76d25e3269c7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -16011,7 +16031,7 @@ self: {
      mkDerivation {
        pname = "Wheb";
        version = "0.3.1.0";
-       sha256 = "13x204lz2azfrry38w791rni2d0g9xsg5lhajrkrgfhdn56yrzqs";
+       sha256 = "1affec4db10dba9767960ad2f2744f0f34116d0ee970347cceee2bf12901a28f";
        libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive containers cookie
          http-types mtl pwstore-fast stm text time transformers unix uuid
@@ -16033,7 +16053,7 @@ self: {
      mkDerivation {
        pname = "WikimediaParser";
        version = "0.1";
-       sha256 = "0rzpf8z414qvkbks16zizsxsinvbdxbm1n0dbav11p286791xx1j";
+       sha256 = "32f41ed23148dc10b65a0dd850576f6bdba8bbfef19ba0e79a1b93403e72f767";
        libraryHaskellDepends = [ base parsec ];
        description = "A parser for wikimedia style article markup";
        license = stdenv.lib.licenses.bsd3;
@@ -16047,7 +16067,7 @@ self: {
      mkDerivation {
        pname = "Win32";
        version = "2.3.1.0";
-       sha256 = "1y9z682gmgjkrc8lijkidrlwh5pr30zgpvx2sc3gnvn8krg6jnk8";
+       sha256 = "685a695e9ec86efb06d3a2effb3e18f916c8696e71ca4811cb53befa04323ff9";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [
          advapi32 gdi32 shell32 shfolder user32 winmm
@@ -16063,7 +16083,7 @@ self: {
      mkDerivation {
        pname = "Win32-dhcp-server";
        version = "0.3.1";
-       sha256 = "0mkxk822gcg1r61cf5wq9ayya51am4dy8v2xqm3ld30d7hss4dij";
+       sha256 = "3236a2353c0d8c4647c55d6ce41ba92a14e5bd4a9817c782c9e1b127049a7d56";
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
        homepage = "http://github.com/mikesteele81/win32-dhcp-server";
        description = "Win32 DHCP Server Management API";
@@ -16076,7 +16096,7 @@ self: {
      mkDerivation {
        pname = "Win32-errors";
        version = "0.2.2.1";
-       sha256 = "1v7gm7vll1lq6d7d0y8vza7ilcw6i95jkprhy906awhqlhv3z031";
+       sha256 = "61803f36a418726540f230df294b8a86331a8ffa1b79d04e3398064af7a9efec";
        libraryHaskellDepends = [ base template-haskell text Win32 ];
        homepage = "http://github.com/mikesteele81/win32-errors";
        description = "Alternative error handling for Win32 foreign calls";
@@ -16089,7 +16109,7 @@ self: {
      mkDerivation {
        pname = "Win32-extras";
        version = "0.2.0.1";
-       sha256 = "00lrqvsa74mqv0k4yz00j2jdpmchkyhcicqv24z9a53iv1i0xp7h";
+       sha256 = "f0dc0e62d87114953e111bb3c8a09f90d5dba490007c4f26d8b892a3f4c69902";
        libraryHaskellDepends = [ base Win32 ];
        librarySystemDepends = [ imm32 msimg32 ];
        homepage = "http://hub.darcs.net/shelarcy/Win32-extras/";
@@ -16103,7 +16123,7 @@ self: {
      mkDerivation {
        pname = "Win32-junction-point";
        version = "0.2.1.1";
-       sha256 = "1pvlvhdp4wcz8kn5nldhrkryz03dmzyzvjbm8x1ri9kwq1icd941";
+       sha256 = "81a4c662c07ca698434775c9fdfdaf6d80eff3ccb0515bec449f71721bdc74df";
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
        homepage = "http://github.com/mikesteele81/Win32-junction-point";
        description = "Support for manipulating NTFS junction points";
@@ -16116,7 +16136,7 @@ self: {
      mkDerivation {
        pname = "Win32-notify";
        version = "0.3.0.1";
-       sha256 = "0zzbb00rykl8y1prkcm3paaamhmdrqji34070b9zg7sg2pc5k4f4";
+       sha256 = "c49159d8154f9ff7d30207901125ceadc2aa94baa3b2996ff0884e9f0158eb7f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers directory Win32 ];
@@ -16131,7 +16151,7 @@ self: {
      mkDerivation {
        pname = "Win32-security";
        version = "0.1.1";
-       sha256 = "0dh4z7a0mxwpqhx1cxvwwjc7w24mcrqc0bmg7bp86kd6zqz6rjly";
+       sha256 = "9eca6c3efea64d83ee3aaf2ec0706695087e98e47c77163ac497f70ad4f90436";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
@@ -16146,7 +16166,7 @@ self: {
      mkDerivation {
        pname = "Win32-services";
        version = "0.3";
-       sha256 = "07vby574s528g259zq8jby1327b6jqn4zlzs406ml99w1p02d9js";
+       sha256 = "5aa626c00d3c255a0d20fad34f2c96661d31825f12e19f8a7848144d4ef16b1f";
        libraryHaskellDepends = [ base Win32 Win32-errors ];
        librarySystemDepends = [ Advapi32 ];
        homepage = "http://github.com/mikesteele81/win32-services";
@@ -16162,7 +16182,7 @@ self: {
      mkDerivation {
        pname = "Win32-services-wrapper";
        version = "0.1.3.0";
-       sha256 = "1nihf12bcgahs5220pdny1kf54973qxh7llhzv5d9s9lxias2jyd";
+       sha256 = "cd4ba155ec34e9d4cafe90d2033b1e2791e266f0b65d2044d1503db6447030da";
        libraryHaskellDepends = [
          base directory filepath Win32 Win32-errors Win32-services
        ];
@@ -16178,7 +16198,7 @@ self: {
      mkDerivation {
        pname = "Wired";
        version = "0.3";
-       sha256 = "14zxf849r4k3mk5i5rakfjp2f216sz84ww4hfggq9cnr9w8j406j";
+       sha256 = "d20022114fd9b284df7390704ed0d7260827ae7453e512cbac63929c0872fd93";
        libraryHaskellDepends = [
          base chalmers-lava2000 containers mtl QuickCheck
        ];
@@ -16192,7 +16212,7 @@ self: {
      mkDerivation {
        pname = "WordNet";
        version = "1.1.0";
-       sha256 = "0b44xxkihafzsw25xx484xxw17zlzzqbj0bx8cs2nvf3p7jxd02k";
+       sha256 = "5380d6e5b9c36d2b34437d01b9f0fff49fc07b2788f45e04d7df291867ef842c";
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
@@ -16204,7 +16224,7 @@ self: {
      mkDerivation {
        pname = "WordNet-ghc74";
        version = "0.1.3";
-       sha256 = "1ab5wybawa3dfq89dn0g3zdhsqd03bcm3qky2d4z6irw7afdqrr8";
+       sha256 = "2867dc9c3a3c47f349137ee251d91aa0610ddb1f0fd89610766d28ae96e765a9";
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
@@ -16216,7 +16236,7 @@ self: {
      mkDerivation {
        pname = "Wordlint";
        version = "0.2.0.4";
-       sha256 = "08d02h4ynkwxqxxqzk8hfmdj9y7rg23biybb969pk0scgvg7iyd5";
+       sha256 = "a5f978de7e4c837993496bf9b88678f9f8245b7510cd8f7bc79d4feb0914a021";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base boxes cmdargs ];
@@ -16236,7 +16256,7 @@ self: {
      mkDerivation {
        pname = "Workflow";
        version = "0.8.3";
-       sha256 = "08r1s840771z1gy44dj3xc6ary7gk3ka3zvji5pmgzi998x4p6y8";
+       sha256 = "c89b4b3a4a29fe576f8972ffa1e698eff8ac0ceb433642fc0b3f9c0308d22123";
        revision = "1";
        editedCabalFile = "1be542eaf091e04c561a2a589f37330b0a65d6d3d5a44609c197a74e8385c64b";
        libraryHaskellDepends = [
@@ -16253,7 +16273,7 @@ self: {
      mkDerivation {
        pname = "WxGeneric";
        version = "0.8.1";
-       sha256 = "0lvbdmb1qwsz8bz0z715nzgbpshfckm4syk1ny52akkb4ddkrd60";
+       sha256 = "c0b43c5b236b4e258ab7617a4dea640eeabbdeb7259c0ffe425f731c566d6b53";
        libraryHaskellDepends = [
          base containers mtl SybWidget wx wxcore xtc
        ];
@@ -16268,7 +16288,7 @@ self: {
      mkDerivation {
        pname = "X11";
        version = "1.6.1.2";
-       sha256 = "1kzjcynm3rr83ihqx2y2d852jc49da4p18gv6jzm7g87z22x85jj";
+       sha256 = "5216d485f807bd53bf34fba170896a8930290a6ac28b8e611c28e751ad67f2cf";
        libraryHaskellDepends = [ base data-default ];
        librarySystemDepends = [ libX11 libXext libXrandr ];
        homepage = "https://github.com/haskell-pkg-janitors/X11";
@@ -16282,7 +16302,7 @@ self: {
      mkDerivation {
        pname = "X11-extras";
        version = "0.4";
-       sha256 = "1cpjr09gddcjd0wqwvaankv1zj7fyc6hbfdvar63f51g3vvw627a";
+       sha256 = "ea08c3f71e2f14374c56bbb9050df3eec81ff6b44a6d8e396892b5f612c8f2b2";
        revision = "1";
        editedCabalFile = "f7b315acd1fb4d44ee6312b2e8d397b7cda103cf5e9e8ca6867389ef6cadff3c";
        libraryHaskellDepends = [ base X11 ];
@@ -16298,7 +16318,7 @@ self: {
      mkDerivation {
        pname = "X11-rm";
        version = "0.2";
-       sha256 = "11jxlaad9jgjddd5v8ygy2rdrajrbm9dlp6f0mslvxa2wzn4v4r3";
+       sha256 = "23934dece742f54d7505ce5cda525d59aadcb2f0cfa35d5a6bf2c9d494a25d86";
        libraryHaskellDepends = [ base X11 ];
        description = "A binding to the resource management functions missing from X11";
        license = stdenv.lib.licenses.bsd3;
@@ -16310,7 +16330,7 @@ self: {
      mkDerivation {
        pname = "X11-xdamage";
        version = "0.1.2";
-       sha256 = "0r6dq9xx0v100162y7bvkj1l0lv5m697y35c659kgjj0mg8p9bjv";
+       sha256 = "5bae74d1ab40ca375331ac0c7f92a9655340839c7b1d2f4c00206cd07bc2cd64";
        libraryHaskellDepends = [ base X11 ];
        librarySystemDepends = [ Xdamage ];
        homepage = "http://darcs.haskell.org/X11-xdamage";
@@ -16324,7 +16344,7 @@ self: {
      mkDerivation {
        pname = "X11-xfixes";
        version = "0.1.1";
-       sha256 = "0wwhyqqybrjvy8mi5d5429wraky93xq348gr9ldhg2qj95hj13yk";
+       sha256 = "d38f206149128b071b4df92132701fc94f957912a4b4122bf25be6e531f69073";
        libraryHaskellDepends = [ base X11 ];
        librarySystemDepends = [ Xfixes ];
        homepage = "https://github.com/reacocard/x11-xfixes";
@@ -16338,7 +16358,7 @@ self: {
      mkDerivation {
        pname = "X11-xft";
        version = "0.3.1";
-       sha256 = "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf";
+       sha256 = "4eba3fee62570e06447654030a62fb55f19587884bc2cef77a9c3b2c3458f8d1";
        libraryHaskellDepends = [ base utf8-string X11 ];
        libraryPkgconfigDepends = [ libXft ];
        description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts";
@@ -16350,7 +16370,7 @@ self: {
      mkDerivation {
        pname = "X11-xshape";
        version = "0.1.1";
-       sha256 = "19p71lc0hihfn0xzl29j01kd0zf9yalspwj7dava0ybc1rm3g62h";
+       sha256 = "5098376a0e6c79a0b66a47f2aba9f2c97dd066003209fa3bb00e4608180de7a6";
        libraryHaskellDepends = [ base X11 ];
        homepage = "http://darcs.haskell.org/X11-xshape";
        description = "A binding to the Xshape X11 extension library";
@@ -16362,7 +16382,7 @@ self: {
      mkDerivation {
        pname = "XAttr";
        version = "0.1.1";
-       sha256 = "16vap0rw026lgxfcqpdfsx7l26ik97rhkkv1mg2j61akydhijs67";
+       sha256 = "c7681961f3530523c5ab61cf09f349331a414fd7ae5dcc5c7fd408c033b86a9b";
        libraryHaskellDepends = [ base unix ];
        description = "Read, set, and list extended attributes";
        license = "GPL";
@@ -16373,7 +16393,7 @@ self: {
      mkDerivation {
        pname = "XInput";
        version = "0.1";
-       sha256 = "1kk0gccv83mw8463x29c7rpl5davmhk9vyf82i4rbksgrdzkhjh9";
+       sha256 = "094a387fcb4fcf954914c8f99d26ac5bb5426f3e2c893e0c41bc0eb4197b60ce";
        libraryHaskellDepends = [ base Win32 ];
        librarySystemDepends = [ xinput ];
        homepage = "http://code.fac9.com/xinput/";
@@ -16387,7 +16407,7 @@ self: {
      mkDerivation {
        pname = "XMMS";
        version = "0.1.1";
-       sha256 = "08l53b0wp6v9wjfn53xfa1vlh64bnqidajc4lzlk8p31km1c09qx";
+       sha256 = "1d27c0429d615c34e9a78449d522b68b18487750ae8f629de4699bcbc11a8522";
        libraryHaskellDepends = [ base containers ];
        librarySystemDepends = [ xmmsclient xmmsclient-glib ];
        homepage = "http://kawais.org.ua/XMMS/";
@@ -16403,7 +16423,7 @@ self: {
      mkDerivation {
        pname = "XMPP";
        version = "0.1.2";
-       sha256 = "03gypa9kln2v3zqyxszn4k2x364g8wj0hppsy10ywmandghsvn7b";
+       sha256 = "ebd8ade16b5655ee41f0fa5e0824478f98d1c524f6ebeef11f5b583a93bafe0d";
        libraryHaskellDepends = [
          base haskell98 hsdns mtl network parsec random utf8-string
        ];
@@ -16421,9 +16441,9 @@ self: {
      mkDerivation {
        pname = "XSaiga";
        version = "1.0.0.0";
-       sha256 = "0smf0ym26kv0fa34plnsndxp5hflc7w6g0wbkg6n4cy9bz4sgd4z";
-       revision = "3";
-       editedCabalFile = "a152097b5010d51d0192d2c1748dce912a050f3f705f5a4b86ffa7a2f726488f";
+       sha256 = "9fb4a7c95fc93362cd9b8b8367f861d4c1727bb3dad24b8672604f23aa07ae6a";
+       revision = "4";
+       editedCabalFile = "d4af61293d2d3a615e34002a517490a4ac748799aae15d2b0e6aaed14204693e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base pretty ];
@@ -16442,7 +16462,7 @@ self: {
      mkDerivation {
        pname = "Xauth";
        version = "0.1";
-       sha256 = "1mvflp6y1nz9961gngbwk0b7wr8sx3p6296jfvvb6ln1kvm2scxs";
+       sha256 = "ba332dea9ec152b3f676d22461eee81a657e16987c3dfb8249e9dbe0cda56ed7";
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ libXau ];
        description = "A binding to the X11 authentication library";
@@ -16456,7 +16476,7 @@ self: {
      mkDerivation {
        pname = "Xec";
        version = "0.1.6";
-       sha256 = "1n3y232v9i5jzbshk2zw675g09snc45ni60acmi6kvfsk7nkmfw8";
+       sha256 = "88bb3aed99daed6962650a98680b615627f0ca31fc8b09f5fab2c4b4c5107ed8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -16473,7 +16493,7 @@ self: {
      mkDerivation {
        pname = "XmlHtmlWriter";
        version = "0.0.0.1";
-       sha256 = "0dv5nvvqy6w0ndjyab4bwhjpw1hlx8xi4bv2jw4rl8v6y68bilk1";
+       sha256 = "61d2b890f166239a0997622f123bea14067e25e48b2ce565b3801b8ff7b66537";
        libraryHaskellDepends = [ base mtl transformers ];
        homepage = "http://github.com/mmirman/haskogeneous/tree/XmlHtmlWriter";
        description = "A library for writing XML and HTML";
@@ -16486,7 +16506,7 @@ self: {
      mkDerivation {
        pname = "Xorshift128Plus";
        version = "0.1.0.1";
-       sha256 = "11g1gipc9v81h5jzndr3j7j4mwr4lva9b52fd0hml4mrzf6vj2dx";
+       sha256 = "bd09b98dfbb9125a21684e9495d4a624f34ae4912337fb658101edc46e7ce185";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kanaihiroki/Xorshift128Plus";
        description = "Pure haskell implementation of xorshift128plus random number generator";
@@ -16501,7 +16521,7 @@ self: {
      mkDerivation {
        pname = "YACPong";
        version = "0.1";
-       sha256 = "1r2n1vbzq755p68fzb5f6fm1yjfq2c5jgx52ri9p5rlrwmfk3hw5";
+       sha256 = "85c3315de599e67253cca2f4270b13d8491faa33aeacef90b9a51cfcd70e56e4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -16519,7 +16539,7 @@ self: {
      mkDerivation {
        pname = "YFrob";
        version = "0.4";
-       sha256 = "17pp79yr8jfmhx85vlr5kx7q5wha48p3ra7l4ligd583yxzvlnif";
+       sha256 = "2e5aba7ff70395f62225f4a83c2e220af2824f9f25d35d5087d549947d3af79e";
        libraryHaskellDepends = [ array base HGL Yampa ];
        homepage = "http://www.haskell.org/yampa/";
        description = "Yampa-based library for programming robots";
@@ -16542,7 +16562,7 @@ self: {
      mkDerivation {
        pname = "Yablog";
        version = "0.2.0";
-       sha256 = "0qa7m9y3dclr2r2vpd2cmpc58nib158hnr49hrdjvk00ncd4lyvk";
+       sha256 = "737b4a1ab300cc2d5b8689640b51092b5a54d8ad4cb4bb451699b2367caa4761";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -16570,7 +16590,7 @@ self: {
      mkDerivation {
        pname = "YamlReference";
        version = "0.9.3";
-       sha256 = "0nk7zw3ikv459hzrs0si06j4qf2yrgggsiv8vpm0r1lg5v5l3vng";
+       sha256 = "cfee41cb2e8f860ceadd6847fddecb5e384ca40151039d3f4c85ec1907ff675a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -16588,7 +16608,7 @@ self: {
      mkDerivation {
        pname = "Yampa";
        version = "0.10.2";
-       sha256 = "1pmszrbf1fxid4km0jdam8iqfba2mfyz8mzn6vxfb0da19vlz4cq";
+       sha256 = "98914f770aaa81e5fa36f657f4bdab422d8723aaaa49502769b1bbe056febade";
        libraryHaskellDepends = [ base deepseq random ];
        homepage = "http://www.haskell.org/haskellwiki/Yampa";
        description = "Library for programming hybrid systems";
@@ -16600,7 +16620,7 @@ self: {
      mkDerivation {
        pname = "Yampa-core";
        version = "0.2.0";
-       sha256 = "06mgmnj8zsnfzg3li3nw4a5lmiz0jkc4hxzilwhh1r84qiki72xp";
+       sha256 = "b78b1367c404e50021a7f17748d894e0c74a8b22dc8e48c7fbceea8fa4adaf1a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq random vector-space ];
@@ -16618,7 +16638,7 @@ self: {
      mkDerivation {
        pname = "YampaSynth";
        version = "0.2";
-       sha256 = "028a7lrfyikvky52s19kffssnry1grnip3sm7z55bs5fazma1im1";
+       sha256 = "a1c6a0ea57aee855ca3f558f1b6d7ec167abb57333052d8a9f7b46ef323d0a09";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -16634,7 +16654,7 @@ self: {
      mkDerivation {
        pname = "Yocto";
        version = "0.1.0";
-       sha256 = "1krp17rw25b7a280rf3idpfzkx39kpfcjqwznz96y0d2sdqbhg6p";
+       sha256 = "d73cb870d3a2016fd2b79f63c9dc9d69f4f9dd6d71b80c90506715c1f30937cf";
        libraryHaskellDepends = [ base containers parsec ];
        homepage = "https://github.com/ajg/yocto";
        description = "A Minimal JSON Parser & Printer for Haskell";
@@ -16648,7 +16668,7 @@ self: {
      mkDerivation {
        pname = "Yogurt";
        version = "0.4.1";
-       sha256 = "04fzixjgsn0azx2dp352kipxdijfafsm5dnrcvxpxdxms35npffq";
+       sha256 = "d8b96bcbd0b5b77efb66d9b652b5534ec6d66f9ca28cdb44ff0a58fd648fdf11";
        libraryHaskellDepends = [
          base containers mtl network old-locale process readline regex-posix
          syb time
@@ -16666,7 +16686,7 @@ self: {
      mkDerivation {
        pname = "Yogurt-Standalone";
        version = "0.4";
-       sha256 = "151kamqwdwnhinvsmzdq9ckryyvnrf9ihzw6qm4j851y375452hl";
+       sha256 = "148a42ca193e142449c5867f1893cb767b9f274bb8fdaab78dd0f2c671553394";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -16685,7 +16705,7 @@ self: {
      mkDerivation {
        pname = "ZEBEDDE";
        version = "0.1.0.0";
-       sha256 = "1i85pah79342ivmcg73q305awbf9fi6gw4ckg9i019d6vmdg5d17";
+       sha256 = "27b4f25adda6a500627a9311fe4c74c92dae0a18789cc7ea8e828c74a0ba05c5";
        libraryHaskellDepends = [ base vect ];
        jailbreak = true;
        description = "Polymer growth simulation method";
@@ -16698,7 +16718,7 @@ self: {
      mkDerivation {
        pname = "ZFS";
        version = "0.0.2";
-       sha256 = "1mwpcgkw1cci2grhb8vl081wykkgsmfbanwapp10mrzzp0df1yzr";
+       sha256 = "f9fbe01ab8ffe70ac2bd8a5bb55cd56f4ecf030274a305f31391b1c0e76397d7";
        libraryHaskellDepends = [
          base CC-delcont containers mtl network unix
        ];
@@ -16713,7 +16733,7 @@ self: {
      mkDerivation {
        pname = "ZMachine";
        version = "0.0";
-       sha256 = "1s005k892z9651mr2jj0jdwpm8aa0y72vi405xi4h6czg52i4rb3";
+       sha256 = "63651245799f1948622f80c42d8e074aa17a7993404a916b28267d91d02c00e8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base gtk mtl random ];
@@ -16727,7 +16747,7 @@ self: {
      mkDerivation {
        pname = "ZipFold";
        version = "0.1.4";
-       sha256 = "05cnpl9c6i0j8jqr4j43b32jgryv34gahimhp9g1m45idgnl2sn0";
+       sha256 = "c06a41ed6bb1901a5ebab046a81e19dbe727c558834892b1441244c312bd9615";
        libraryHaskellDepends = [ base TypeCompose ];
        homepage = "http://haskell.org/haskellwiki/ZipFold";
        description = "Zipping folds";
@@ -16739,7 +16759,7 @@ self: {
      mkDerivation {
        pname = "ZipperAG";
        version = "0.9";
-       sha256 = "0nl08r7s3r5hr5jag499fillca16wsb8yqz1dlzydvacqcklcxr9";
+       sha256 = "29774627c34cede63f6de1638f96e626284669742991a764c9b0e4a14f46805a";
        libraryHaskellDepends = [ base syz ];
        homepage = "www.di.uminho.pt/~prmartins";
        description = "An implementationg of Attribute Grammars using Functional Zippers";
@@ -16753,7 +16773,7 @@ self: {
      mkDerivation {
        pname = "Zora";
        version = "1.2.0";
-       sha256 = "1yni2yq8ynq9jhnzabyx0ahmvmvcyblc0swxy0n7qdzlz5rxzm3i";
+       sha256 = "71d4df73f9f4377c2cf09d6bc0e8f26cd75da102dd2ff52d94095b8fb017d1fa";
        libraryHaskellDepends = [
          base bytestring containers directory fgl graphviz random shelly
          text
@@ -16769,7 +16789,7 @@ self: {
      mkDerivation {
        pname = "Zwaluw";
        version = "0.1";
-       sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1";
+       sha256 = "419fadba4077db63d2104ca196e64b343cfbc0c55859665860f7bf12ed663bb3";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/MedeaMelana/Zwaluw";
        description = "Combinators for bidirectional URL routing";
@@ -16784,7 +16804,7 @@ self: {
      mkDerivation {
        pname = "a50";
        version = "0.5";
-       sha256 = "0jfnf0rq3rfic196zjwbaiamyis98zrr8d4zn2myjlgqlzhljzs0";
+       sha256 = "407f49e1a7f851e9abb09f3494f34749475f55548bcb6f5260d1e5813370d649";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -16800,7 +16820,7 @@ self: {
      mkDerivation {
        pname = "abacate";
        version = "0.0.0.0";
-       sha256 = "1lxsn3n77fk7jl8i76nffj1zngvi2s38y17s54ha29h8hrp3s3dg";
+       sha256 = "af0d3d6e860826a12029fa048f8616713ffb8374ce9a13119567ba73ecb0bad3";
        libraryHaskellDepends = [ base parsec text ];
        testHaskellDepends = [ base HUnit text ];
        jailbreak = true;
@@ -16815,7 +16835,7 @@ self: {
      mkDerivation {
        pname = "abc-puzzle";
        version = "0.2.1";
-       sha256 = "0i162j9wlpcisqzf9klqvag9hrs9v7araw4l16cvw0yrifvqzswd";
+       sha256 = "8deb8fb78bd903be9909947095d5d94967989eda98cee43ed6915dca93142644";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -16834,7 +16854,7 @@ self: {
      mkDerivation {
        pname = "abcBridge";
        version = "0.14";
-       sha256 = "1ki5h3058n3kpvaspl8g1vadprw6kb3xxyadb3a4k1irkfz8lfkf";
+       sha256 = "6e3a8abe9b398649d4584df9dec79a86e7dbd40e0fd1abd5be735854c08025ce";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aig base containers directory vector ];
@@ -16855,7 +16875,7 @@ self: {
      mkDerivation {
        pname = "abcnotation";
        version = "1.9.0";
-       sha256 = "0vmpgdqasnhj0fbb5wl7ikxmp6kzrlnbixp2yj4x93mh8vrrsk40";
+       sha256 = "804c9df346b08ed489f4e2f6b82ccd7f9a5bfb8c87f2b29603125aad707bb76e";
        libraryHaskellDepends = [
          base parsec prettify process semigroups
        ];
@@ -16871,7 +16891,7 @@ self: {
      mkDerivation {
        pname = "abeson";
        version = "0.1.0.1";
-       sha256 = "1g258gfk7sk8hsd4nixah0vj69rwphvv6aywsvdldm8pbw51sy1c";
+       sha256 = "2c781d0a5f17d546dbd6dc2bb337bc3c27233780aa474b9a8668ea33dd4345bc";
        revision = "1";
        editedCabalFile = "fc1839c19327f8fb9b36d2aa6dd133e3d391696183b3292894f9f7e1ca188727";
        libraryHaskellDepends = [
@@ -16889,7 +16909,7 @@ self: {
      mkDerivation {
        pname = "abstract-deque";
        version = "0.3";
-       sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9";
+       sha256 = "09aa10f38193a8275a7791b92a4f3a7192a304874637e2a35c897dde25d75ca2";
        libraryHaskellDepends = [ array base containers random time ];
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "Abstract, parameterized interface to mutable Deques";
@@ -16903,7 +16923,7 @@ self: {
      mkDerivation {
        pname = "abstract-deque-tests";
        version = "0.3";
-       sha256 = "19gb5x5z3nvazdra3skm24c2g2byj0i4cjbzfwfghnb5q96gn5sz";
+       sha256 = "5f17fb4cc26559f81c777f494622907e8927181175eaa172fb6adbf14b2feba5";
        libraryHaskellDepends = [
          abstract-deque array base containers HUnit random test-framework
          test-framework-hunit time
@@ -16922,7 +16942,7 @@ self: {
      mkDerivation {
        pname = "abstract-par";
        version = "0.3.3";
-       sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4";
+       sha256 = "248a8739bd902462cb16755b690b55660e196e58cc7e6ef8157a72c2a3d5d860";
        libraryHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/simonmar/monad-par";
        description = "Type classes generalizing the functionality of the 'monad-par' library";
@@ -16934,7 +16954,7 @@ self: {
      mkDerivation {
        pname = "abstract-par-accelerate";
        version = "0.3.3";
-       sha256 = "0k1730mg2vyf21837fc459m8si1ffnbj78cdkbgglp2vn51f3nz4";
+       sha256 = "e4dbe142b15b5cfade9a8da12397752e448d6a2a84b9335010ce6ff12a18274c";
        libraryHaskellDepends = [
          abstract-par accelerate array base vector
        ];
@@ -16951,7 +16971,7 @@ self: {
      mkDerivation {
        pname = "abt";
        version = "0.1.1.0";
-       sha256 = "1hgbzzpxn6gcs3zjs8hqz065gqk2x6gzra2b1fw9lyb2x4lw42y9";
+       sha256 = "c90bc229e962799ab80b4ba8fc9fe962e2570cf818222dffd0ec19dbefffebc1";
        libraryHaskellDepends = [
          base profunctors transformers transformers-compat vinyl
        ];
@@ -16966,7 +16986,7 @@ self: {
      mkDerivation {
        pname = "ac-machine";
        version = "0.2.0.5";
-       sha256 = "00s2nvd85l00kpl45ipaq4ypa1ymaxmvnaf5mdvdladg4icl50i4";
+       sha256 = "2482425924af29da76abc529bb6b57d507753dc1eac642e89d00d082dab64203";
        libraryHaskellDepends = [
          base hashable unordered-containers vector
        ];
@@ -16980,7 +17000,7 @@ self: {
      mkDerivation {
        pname = "ac-machine-conduit";
        version = "0.1.0.0";
-       sha256 = "1nsnbvllwznbqycw33f09vfgqvqmqfkcbi367clm6k4v6rfswzl3";
+       sha256 = "837eae5d369b4c53293b66c4c5a6c3156ffcdc4ec08dc199c7cb7e4ee95e56db";
        libraryHaskellDepends = [ ac-machine base conduit text ];
        jailbreak = true;
        description = "Drive Aho-Corasick machines in Conduit pipelines";
@@ -16995,7 +17015,7 @@ self: {
      mkDerivation {
        pname = "accelerate";
        version = "0.15.1.0";
-       sha256 = "07bbam9za0g15vm0h0p9dypblw2f709v4qmvc52jcvmsv1drl3yv";
+       sha256 = "db0f9a5bd8ba6e264561bb62b213384e70baae6fe90208ea2ee101f553556b1d";
        libraryHaskellDepends = [
          array base containers fclabels ghc-prim hashable hashtables pretty
          template-haskell unordered-containers
@@ -17012,7 +17032,7 @@ self: {
      mkDerivation {
        pname = "accelerate-arithmetic";
        version = "0.0.1";
-       sha256 = "093j1wdabhws695hfb4cmj05ys6i4hkh0yppkszmhn5z4imlv741";
+       sha256 = "819c4d6b24bf5858bf9ef77a002724d1685f80ac8c2c074b329ac3a51a0f7224";
        libraryHaskellDepends = [
          accelerate accelerate-utility base QuickCheck utility-ht
        ];
@@ -17032,7 +17052,7 @@ self: {
      mkDerivation {
        pname = "accelerate-cublas";
        version = "0.0";
-       sha256 = "1dcra6qpva8sg5bdh6ilrfdg44h7p6dfh7vkrhifiim4vkvgh9sc";
+       sha256 = "4c27f8f6dca4c6e822cc731fe89ab90712f29acb341ad856791aa97db15199b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -17059,7 +17079,7 @@ self: {
      mkDerivation {
        pname = "accelerate-cuda";
        version = "0.15.0.0";
-       sha256 = "1z8nfciwxm2f2vaddnhan5gi9i1l7qa9h9fsngmdh8d6wabxxidy";
+       sha256 = "bec5de97e2a621d8eab3da2598143e34c4145fb10adad6d4164ed4ce237316fd";
        revision = "2";
        editedCabalFile = "5ed199c4c1d360ed3eaee24df7016462ed1fb1313ff47d6828be546eec8708fc";
        libraryHaskellDepends = [
@@ -17081,7 +17101,7 @@ self: {
      mkDerivation {
        pname = "accelerate-cufft";
        version = "0.0";
-       sha256 = "12faz5z0k682381fgwav91wx5wny0n5jdzgnrajx3sxc8gpg5xd7";
+       sha256 = "a7f5f2ee43acebd1a5caf6fd268b05def2d279485bf1e7021a0299097ef9ca89";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -17099,7 +17119,7 @@ self: {
      mkDerivation {
        pname = "accelerate-examples";
        version = "0.15.0.0";
-       sha256 = "1jfwb0ryb8idfjc1gccb1h67hl730qn455k5z5wna8aikfscy7rq";
+       sha256 = "381fcfb49b51216579f96596422c06e350780c0c8bb11798742da2e53358dcc9";
        revision = "1";
        editedCabalFile = "2cf8a02096ae9902b9336ce9d0665b3233abb20381d0cb4585efc53357d795cc";
        configureFlags = [ "-f-opencl" ];
@@ -17116,7 +17136,7 @@ self: {
      mkDerivation {
        pname = "accelerate-fft";
        version = "0.15.0.0";
-       sha256 = "0nxlw8z7bnr29vp24qbbwwmq9rj2q6jqqkmm46pp8dp582y4yk6v";
+       sha256 = "db4c4fbc40e53674af21b54e8ca5c142e6842be76b6122ee4e22db753ee2b45b";
        revision = "1";
        editedCabalFile = "c23b93ae20f528782aeb10b528fa2a7847cce5c1aa9db546f3b000d7f05f53ca";
        libraryHaskellDepends = [
@@ -17135,7 +17155,7 @@ self: {
      mkDerivation {
        pname = "accelerate-fftw";
        version = "0.0";
-       sha256 = "03ffsa6xshhrx8a4grld128g46x2nkkydwql8h7jw7b2igr7i1ks";
+       sha256 = "7a8678f28b621d2e0f4414f3e6e7b4a21bf290088de64714ea1942dd8dd2ce0d";
        libraryHaskellDepends = [
          accelerate accelerate-io base carray fft storable-complex
        ];
@@ -17154,7 +17174,7 @@ self: {
      mkDerivation {
        pname = "accelerate-fourier";
        version = "0.0";
-       sha256 = "0b7cm540im3z9ja7a68sbs5y0ayzbx5h4sbwr437f05qdwkg7b2q";
+       sha256 = "58acf3266fb8007706c97c69024b5fdf2be08b5e1a1975944c7fd40848a9ec2c";
        libraryHaskellDepends = [
          accelerate accelerate-arithmetic accelerate-utility base containers
          QuickCheck transformers utility-ht
@@ -17177,7 +17197,7 @@ self: {
      mkDerivation {
        pname = "accelerate-fourier-benchmark";
        version = "0.0";
-       sha256 = "1679sn9ajn6fmj9pdgjdr434vcgj05chvn2fld3sri16q3jbqrga";
+       sha256 = "ea65bce4c026c4ac47a34ed80d5901f2b14d06c94dbe7693acce58a992d5e998";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -17197,7 +17217,7 @@ self: {
      mkDerivation {
        pname = "accelerate-io";
        version = "0.15.0.0";
-       sha256 = "00p8jmxsgywhx30nd44pl6hdcr076y2s6z2fsam6sgrmgr0qx936";
+       sha256 = "66a48e417e353f6daad24e7ca385370764d6a0a1979066c1e890fba77b95e802";
        revision = "1";
        editedCabalFile = "5c3f8f7ebc03117652646329743ea251d281f72d81454e55538c27e87e8c0ecc";
        libraryHaskellDepends = [
@@ -17215,7 +17235,7 @@ self: {
      mkDerivation {
        pname = "accelerate-utility";
        version = "0.1";
-       sha256 = "1n5hyklil2x2x5bc5z7iq0yz4p8lab8xxdnlwzgjpn3lliq0vgpv";
+       sha256 = "fbbe0d70a474d82bdfe7d4b6ded152145df23dc0f1fcc256e9a20b1ae9f4b0d8";
        libraryHaskellDepends = [ accelerate base utility-ht ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/accelerate-utility/";
@@ -17229,7 +17249,7 @@ self: {
      mkDerivation {
        pname = "accentuateus";
        version = "0.9.4";
-       sha256 = "16hgs81cs3zgbvsprh9lzvyxbh58g7rijf1d4j0dkrpnqnrvg0hy";
+       sha256 = "1e82b7b3c5f6e6d980242d3819f379a8c0d5fdfe34c17cf55eef0fcd02d20f9a";
        libraryHaskellDepends = [ base bytestring HTTP json network text ];
        jailbreak = true;
        homepage = "http://accentuate.us/";
@@ -17243,7 +17263,7 @@ self: {
      mkDerivation {
        pname = "access-time";
        version = "0.1.0.4";
-       sha256 = "13kg8mjrnif88r0w7b041x4vmzdm9aqrx4fskc3qv3smpq2q2ngs";
+       sha256 = "fa598105be558f8d079bda919eb14ab5fdba490f04acc34146c8459b65456f8e";
        libraryHaskellDepends = [ base filepath old-time time unix ];
        jailbreak = true;
        homepage = "http://www.github.com/batterseapower/access-time";
@@ -17259,7 +17279,7 @@ self: {
      mkDerivation {
        pname = "ace";
        version = "0.6";
-       sha256 = "0f07j2rj9ylvdrijwwlpx66mj503mhjfq1x2mylpxkr6kmjjniyk";
+       sha256 = "d3472b659d26cf7ea9afa207ec24ac0314598de997722e636e9bfa24b3900738";
        libraryHaskellDepends = [
          attoparsec base blaze-html blaze-markup data-default parsec text
        ];
@@ -17278,7 +17298,7 @@ self: {
      mkDerivation {
        pname = "acid-state";
        version = "0.12.4";
-       sha256 = "0mb2p29pi9dhby2bwn6zkg1nn3sf6vr7xzf6npx3738ffj3b2bad";
+       sha256 = "4d2db186740e8d33fab5c6fd7ef2364e0f6bc39bdf58be845fb0a57893b86255";
        libraryHaskellDepends = [
          array base bytestring cereal containers directory
          extensible-exceptions filepath mtl network safecopy stm
@@ -17296,7 +17316,7 @@ self: {
      mkDerivation {
        pname = "acid-state-tls";
        version = "0.9.2";
-       sha256 = "04w3r1x3msvsixmdlif99ly4k0py9bzb8pgi06j780zz5lpm1zpi";
+       sha256 = "f1fe502f2dff0374a401f15db4fe4afe82493c4dc945da6a8f7aeb3a7ac88313";
        libraryHaskellDepends = [
          acid-state base directory HsOpenSSL network safecopy
        ];
@@ -17311,7 +17331,7 @@ self: {
      mkDerivation {
        pname = "acl2";
        version = "0.0.1";
-       sha256 = "0bwlsdxk3lbir90xhar7xd83cwarqcm0a86gvwaghknpil2ay4cg";
+       sha256 = "8f11af048dd74ef814dfcf20052ac359713650eb272bd841ca71d1317bd3942f";
        libraryHaskellDepends = [ base process ];
        description = "Writing and calling ACL2 from Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -17322,7 +17342,7 @@ self: {
      mkDerivation {
        pname = "acme-all-monad";
        version = "0.1.0.0";
-       sha256 = "1qay7m16yjsjg8anbinkagb2v8r67k5wsppkrwyskn9jcb1wnbgv";
+       sha256 = "fb2dcbc36232d9a93dcff35ecdcb3c26a32dd653d3c665157a524b6f423d5ee1";
        libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        description = "A monad which is powerful enough to interpret any action";
@@ -17334,7 +17354,7 @@ self: {
      mkDerivation {
        pname = "acme-box";
        version = "0.0.0.0";
-       sha256 = "0n6mawj9kq6s84j4yxwqabhni7kzgvhmhxi9dw1mrwnxkh5ial8v";
+       sha256 = "1b51150b9cddf25c036f297658e17e7f9e68e15298774f2441dae0992457d558";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -17350,7 +17370,7 @@ self: {
      mkDerivation {
        pname = "acme-cadre";
        version = "0.1";
-       sha256 = "1nclcq48r547rgmd4h0hf498z27d15lp4da9yb3a3sy7qk6m92bi";
+       sha256 = "718954cdc4c7eba1c6f24935726909ed888f12711040d2eacb87948c086694d9";
        libraryHaskellDepends = [ base ];
        description = "car, cdr and more";
        license = stdenv.lib.licenses.publicDomain;
@@ -17361,7 +17381,7 @@ self: {
      mkDerivation {
        pname = "acme-cofunctor";
        version = "0.1.0.0";
-       sha256 = "06ii13zfr5iqf0cxaw35mxjxx16q0n7mvbgnqv0gwyfmgm3vxv6m";
+       sha256 = "d5ecbe477dd579fec0c6f6ad5d8f05d884de65af6570d519703896ecfe08311a";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jaspervdj/acme-cofunctor";
        description = "A Cofunctor is a structure from category theory dual to Functor";
@@ -17373,7 +17393,7 @@ self: {
      mkDerivation {
        pname = "acme-colosson";
        version = "0.1";
-       sha256 = "0mfnav0wb0ks365n3kghaic6nasp3qaznhmsdccx35h164ixj9vc";
+       sha256 = "6c27d923310196d1196bba42fb151e572b6b5854f0cd618b197a82c5c156d655";
        libraryHaskellDepends = [ base random ];
        description = "Determines whether it is numberwang";
        license = stdenv.lib.licenses.bsd3;
@@ -17384,7 +17404,7 @@ self: {
      mkDerivation {
        pname = "acme-comonad";
        version = "0.1.0.0";
-       sha256 = "1sc0alwdgfls18y4q4y0qkbzqm4fgzd9yv6dwwnzw3472vsz2x8s";
+       sha256 = "1a75f1f516870cfe2de7cd6c9fda7f8e54fcd7c4c0134c3c0a9abad7385580e9";
        libraryHaskellDepends = [ base comonad ];
        jailbreak = true;
        description = "A more efficient dualization";
@@ -17396,7 +17416,7 @@ self: {
      mkDerivation {
        pname = "acme-cutegirl";
        version = "0.2.0.0";
-       sha256 = "1vvhfncnrq4pbzrgq45kannqv1c029b96lvi1qzwvzf513rqfb3z";
+       sha256 = "7f2c87f308c5fdcd3f0e715393561280858dad55b310fcf25f97e06c997570ef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -17411,7 +17431,7 @@ self: {
      mkDerivation {
        pname = "acme-dont";
        version = "1.1";
-       sha256 = "1kj3qjgn1rz093050z49w3js4is9p0g9pk5g7d7wvg28hpzk28n3";
+       sha256 = "c32231ff8548bccd4f3bafcc9b1eb84947a2e5e0897c50c048e0e7609fc443ce";
        libraryHaskellDepends = [ base ];
        description = "A don't construct";
        license = stdenv.lib.licenses.bsd3;
@@ -17422,19 +17442,31 @@ self: {
      mkDerivation {
        pname = "acme-flipping-tables";
        version = "0";
-       sha256 = "1xl5gwc67acg47fdkgrn7sjvvvnc4sjf5vifph0jb3c7gv93n757";
+       sha256 = "a71c3bd27e878d2501bc2eeee2a426cceebda53e36bfd9dc218fa963187f85f6";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/jystic/acme-flipping-tables";
        description = "Stop execution with rage";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "acme-grawlix" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "acme-grawlix";
+       version = "0.1.0.2";
+       sha256 = "56f3f73854e790aab0f41a209033f4b6893dc418cc8fef6a448b8fb046dc0c9c";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/kadoban/acme-grawlix";
+       description = "More readable names for commonly used symbols";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "acme-hq9plus" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "acme-hq9plus";
        version = "0.1";
-       sha256 = "0da4ysj74fmhcbbvxxfb6w97pr870518k90vwnc3z8kglj1ni187";
+       sha256 = "07856883a46fa23f98e51ba489420107e57b1237cbf5bed762b03a72a4f64435";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/joeyadams/haskell-acme-hq9plus";
        description = "An embedded DSL for the HQ9+ programming language";
@@ -17449,7 +17481,7 @@ self: {
      mkDerivation {
        pname = "acme-http";
        version = "0.2.2";
-       sha256 = "1nmv8ilh783jrp6mxl308ybv032xi833awhsys7svma3l9v5i4gi";
+       sha256 = "f1915876a243d5ad8ff61a7235068a5d0cb0974760d05ecdcd72a0036944bbda";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -17466,7 +17498,7 @@ self: {
      mkDerivation {
        pname = "acme-inator";
        version = "0.1.0.0";
-       sha256 = "1h1vdzqarrmb8sl6y6250h6fia4rxi9vz4i4sj7km7nyk3778zyk";
+       sha256 = "d37f74ce98de9e3a8fd42492bf53ec99a8e80c0445186fa846abe6acf06f3bc0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -17481,7 +17513,7 @@ self: {
      mkDerivation {
        pname = "acme-io";
        version = "0.1.0.1";
-       sha256 = "091czdcbydc75ndaw2ns8cncxa6ihlvclhrbcz9vp29kvhf483cb";
+       sha256 = "8b0d441cdc3389bbd3672b43ca3685d1a8ce2c43da0aae9a2d8735bf58fb2c24";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "N/A";
@@ -17494,7 +17526,7 @@ self: {
      mkDerivation {
        pname = "acme-lolcat";
        version = "0.1.1";
-       sha256 = "08issbr9lgc2saqvgs80sxl1sgi7ig5jg6iykv1g1zl5k1kv2a32";
+       sha256 = "6228b1679885fef0c29e3e9a27cb8b273e1d68d700e9b7b1d2823d9af2d23a22";
        libraryHaskellDepends = [ base parsec random random-shuffle text ];
        homepage = "https://github.com/llelf/acme-lolcat";
        description = "LOLSPEAK translator";
@@ -17506,7 +17538,7 @@ self: {
      mkDerivation {
        pname = "acme-lookofdisapproval";
        version = "0.1";
-       sha256 = "194xvcab14bs3b3nrayxp4z3da60afxa9cmip58mkms5016kwhis";
+       sha256 = "3a423e4d0045d75951b9b1b2a4ba53c0a8363eb9ddab6cc71a7a91b014db9da4";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/llelf/acme-lookofdisapproval";
        description = "Express your disapproval";
@@ -17518,7 +17550,7 @@ self: {
      mkDerivation {
        pname = "acme-memorandom";
        version = "0.0.3";
-       sha256 = "1l6kxmdb7fi47ldfpcqbl6h4dnzw6zw0ahxmvx6sxwxm3x4hynhi";
+       sha256 = "115a0f491fb5f3ae4ddfb54305f837fcdb46a0a10bb3eb1a3d24bab35aedd3d0";
        libraryHaskellDepends = [ base MemoTrie random ];
        homepage = "https://github.com/ion1/acme-memorandom";
        description = "Memoized random number generation";
@@ -17530,7 +17562,7 @@ self: {
      mkDerivation {
        pname = "acme-microwave";
        version = "0.1.0.2";
-       sha256 = "136lwxcimj241nq9l0x7icxk1q9xz826sg07d40yj87shir52j39";
+       sha256 = "6948517284fa20e90169073c6d04fa3de1303b8ba7039ab00d44c81a59e7d48c";
        libraryHaskellDepends = [ base ];
        description = "The eighth wonder of the world, kitchen math!";
        license = stdenv.lib.licenses.bsd3;
@@ -17541,7 +17573,7 @@ self: {
      mkDerivation {
        pname = "acme-miscorder";
        version = "0.1.0.0";
-       sha256 = "180fs64vlbxb2700qq8hzzz82kkmpknakkbk66ddkk1pdl7nm0j4";
+       sha256 = "44826a0f6d37ccd99a3173cda9ecbc754e81feff10610cc011ab2fba89d10ea0";
        libraryHaskellDepends = [ base random ];
        jailbreak = true;
        description = "Miscellaneous newtypes for orderings of discutable use";
@@ -17553,7 +17585,7 @@ self: {
      mkDerivation {
        pname = "acme-missiles";
        version = "0.3";
-       sha256 = "0nvkgdj04i21gq5k541an8zjz0hzzy7dpi384yrhcyh14jsxhqz5";
+       sha256 = "e563d8b524017a06b32768c4db8eff1f822f3fb22a90320b7e414402647b735b";
        libraryHaskellDepends = [ base stm ];
        description = "Cause serious international side effects";
        license = stdenv.lib.licenses.publicDomain;
@@ -17564,7 +17596,7 @@ self: {
      mkDerivation {
        pname = "acme-now";
        version = "1.0.0.1";
-       sha256 = "0lnrsndx7r00b7vgh9jmp5j635m4pb2bzx0lfhqidkzfc2llzwsm";
+       sha256 = "55f34fa960eecf16317414f4bfc4baa4966164b95526f8f65900e4d39bd5d952";
        libraryHaskellDepends = [ base time ];
        jailbreak = true;
        description = "An interface to the philosophical and metaphysical \"now\"";
@@ -17576,7 +17608,7 @@ self: {
      mkDerivation {
        pname = "acme-numbersystem";
        version = "0.3.0.0";
-       sha256 = "1p5rdssdmds6yqgv3yvlh835h180h9q9430j8i6qrhygqn8lmv87";
+       sha256 = "07ed4a91c5cfc38c4d44120c927082000558068274fbb11ff646b7dab46eb9dc";
        libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        description = "Define the less than and add and subtract for nats";
@@ -17589,7 +17621,7 @@ self: {
      mkDerivation {
        pname = "acme-omitted";
        version = "2.0.0.0";
-       sha256 = "0pj6jlm4i05m0nys8d66d0xfkhfz6gfa9122bsk64xcms5n0hxad";
+       sha256 = "4d75086cd1957562a65e4284a4dc33dfc1e93a68c634a4bd05b580482a95465e";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/joachifm/acme-omitted#readme";
@@ -17602,7 +17634,7 @@ self: {
      mkDerivation {
        pname = "acme-one";
        version = "0.0.2";
-       sha256 = "11sgx648g5594w8m8x8r25x7s61jyyxazp5dcfyglvhc7zlrrvbb";
+       sha256 = "6bed9ce93f0c6efabc63addcafbaf732187d7a111975541127a9948788e94f87";
        homepage = "https://github.com/ion1/acme-zero-one";
        description = "The identity element of package dependencies";
        license = stdenv.lib.licenses.publicDomain;
@@ -17613,7 +17645,7 @@ self: {
      mkDerivation {
        pname = "acme-operators";
        version = "0.2.0.0";
-       sha256 = "1wf12iphv12srygdvhy7xyja453dzjmm6kd9l2qp00fx986zd01w";
+       sha256 = "3c80f60d4add0170b1a0a94d53abfc6d14a2a4efc7c3dd9ecf5a840d6f14c1f1";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/phadej/acme-operators#readme";
        description = "Operators of base, all in one place!";
@@ -17625,7 +17657,7 @@ self: {
      mkDerivation {
        pname = "acme-php";
        version = "0.0.3";
-       sha256 = "091ddg3441ac6hbzd84jzakll7nvz2r6mcfdwxy8d7rd8wx9jdyz";
+       sha256 = "df37993a472d9f867ce7cdb16ab2f8db1e4aa7fa92a0f617344c0542c66b2d24";
        libraryHaskellDepends = [ base ];
        description = "The flexibility of Haskell and the safety of PHP";
        license = stdenv.lib.licenses.bsd3;
@@ -17636,7 +17668,7 @@ self: {
      mkDerivation {
        pname = "acme-pointful-numbers";
        version = "0.1.2.4";
-       sha256 = "02gml2db5vigkwkx99lqzjkpfaqdc74x16bgdx62kf7r3nn37my9";
+       sha256 = "c9d733ac1df9b8294c6f6f99d0c9610d2b77a7fc98a6d4279f2feeb29aa0f509";
        libraryHaskellDepends = [ base split ];
        description = "Make more than one point in numeric literals";
        license = stdenv.lib.licenses.bsd3;
@@ -17647,7 +17679,7 @@ self: {
      mkDerivation {
        pname = "acme-realworld";
        version = "0.1.1";
-       sha256 = "0ffhichjhhic7d5cjypmd2zmcq0dpqiz5ygsw0y67v83hry0vf8r";
+       sha256 = "19b90d7c8603ed633ce0faf9f223be0d6056bf68f57ac94a3b2c4228218bd039";
        libraryHaskellDepends = [ base ];
        description = "Primitives for manipulating the state of the universe";
        license = stdenv.lib.licenses.bsd3;
@@ -17658,7 +17690,7 @@ self: {
      mkDerivation {
        pname = "acme-safe";
        version = "0.1.0.0";
-       sha256 = "0bmv45b3v45967gdvsy37xfw6x50qpl8234y20m3nc48f4nf0z68";
+       sha256 = "c87ce02c7188303b2a109e0c81e8c5a074c35d3fc3ebddde31a9903d5621bb2e";
        libraryHaskellDepends = [ acme-dont base ];
        homepage = "http://github.com/fgaz/acme-safe";
        description = "Safe versions of some infamous haskell functions such as fromJust";
@@ -17672,7 +17704,7 @@ self: {
      mkDerivation {
        pname = "acme-schoenfinkel";
        version = "0.1.1";
-       sha256 = "0jvbrivxpq8jb5rhz6j3pxx2g3d0ckviprp4iza31d6ik7cpk8ad";
+       sha256 = "4da179d999d1b430d48fe4e61bf764a08d277abf439a0f735912e1db77cc6b4b";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -17688,7 +17720,7 @@ self: {
      mkDerivation {
        pname = "acme-strfry";
        version = "0.1";
-       sha256 = "1r6xnkyx22khzq6hlb8bk0fnbb6hlwbf12wajhx8vcxa7bkhh8lb";
+       sha256 = "8b2208e73aaab38d3a948a8be016a7d0ac651d980b2d0a0dfe700ad1fdb4dde4";
        libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "https://github.com/ehird/acme-strfry";
@@ -17701,7 +17733,7 @@ self: {
      mkDerivation {
        pname = "acme-stringly-typed";
        version = "1.0.0.0";
-       sha256 = "18wvsvdmbwh9dcawiy4f9pn4vg98kdq9zxc37sz7dpmaigimw16f";
+       sha256 = "ce045ee38baade76be3e83f59f709b28bd4dec4d8ef8c8156b09f255dbd69ba3";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Stringly Typed Programming";
@@ -17713,7 +17745,7 @@ self: {
      mkDerivation {
        pname = "acme-strtok";
        version = "0.1.0.3";
-       sha256 = "1anj8yygzcqkl4nwqwbrmwsqda84qcl8yzq7pgx2b7p895xcfa68";
+       sha256 = "c828c77a49e89e25fabb077f8f28c304a98635af7971cc2da113b3ffbc47d2aa";
        libraryHaskellDepends = [ base mtl ];
        description = "A Haskell port of the C/PHP strtok function";
        license = stdenv.lib.licenses.publicDomain;
@@ -17724,7 +17756,7 @@ self: {
      mkDerivation {
        pname = "acme-timemachine";
        version = "0.0.1.0";
-       sha256 = "1dfwn0n4hg6zs4ikz6jzkn2spwsvchs1jgq7662aq4ljyp7f1rvb";
+       sha256 = "6be7e0cef59212ac8431073f1934645bf3ab859d5f9a3f23d1df3c482cb0dcb5";
        libraryHaskellDepends = [ base ghc-prim mtl transformers ];
        description = "An easy way to perform and unperform IO and other stateful actions";
        license = stdenv.lib.licenses.bsd3;
@@ -17735,7 +17767,7 @@ self: {
      mkDerivation {
        pname = "acme-year";
        version = "2015";
-       sha256 = "1ymsxy51vi2i75jkq0hfm2ii8qp78c3g35ijma0ygcrq9mmm12rv";
+       sha256 = "3b8b506b4d38b3e781aa3296f10643e76214a3a80e023c653951c41d8aefbafa";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
        homepage = "http://github.com/joeyadams/hs-acme-year";
@@ -17748,7 +17780,7 @@ self: {
      mkDerivation {
        pname = "acme-zero";
        version = "0.0.2";
-       sha256 = "06d4hpda8qwwq9wzkgx6fpiq39l1md8sfm9hnvh4r95xyg5q53f6";
+       sha256 = "c68d82cbf3bda44ce0b63055a751ab81a681e375a6bff979c29c63a4da85a419";
        jailbreak = true;
        homepage = "https://github.com/ion1/acme-zero-one";
        description = "The absorbing element of package dependencies";
@@ -17761,7 +17793,7 @@ self: {
      mkDerivation {
        pname = "action-permutations";
        version = "0.0.0.1";
-       sha256 = "0rhlzpwshixpnqma7sk28f22dkwz39b6lcwnzmd31rcnz5cyw6d4";
+       sha256 = "a419ee59f996e5305afd96336a561a9fcf26844362eaa32ab6b747a8f9fd1466";
        libraryHaskellDepends = [ base ];
        description = "Execute a set of actions (e.g. parsers) in each possible order";
        license = stdenv.lib.licenses.bsd3;
@@ -17774,7 +17806,7 @@ self: {
      mkDerivation {
        pname = "active";
        version = "0.2.0.4";
-       sha256 = "1xm2y8knqhd883c41194h323vchv4hx57wl32l9f64kf7gdglag0";
+       sha256 = "e029fada3b6e12e3121583f2533a241bb23dc480248540d840a8416c27f2a2f6";
        libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -17796,7 +17828,7 @@ self: {
      mkDerivation {
        pname = "activehs";
        version = "0.3.1";
-       sha256 = "03za0c24a22fy28mcm173r0cca6fk60jikp0pp817mrq6gpv62hc";
+       sha256 = "0c0ab3ef3338d713d0bde0ce288199ce28c6401e27545691f04e08450403ea0f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -17817,7 +17849,7 @@ self: {
      mkDerivation {
        pname = "activehs-base";
        version = "0.3.0.3";
-       sha256 = "1q433by9ygs7rrjj8z76hg94zyh2cp4qiwsv7q1mywr5scfccn32";
+       sha256 = "6258c61cd325735f033e5bf388c96502fa4fd283e67c2465ce473f9ffc1a83e0";
        libraryHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        description = "Basic definitions for activehs";
@@ -17829,7 +17861,7 @@ self: {
      mkDerivation {
        pname = "activitystreams-aeson";
        version = "0.2.0.1";
-       sha256 = "1bprj41552zr1aj0k73c3skdhg8jb60rhcm9p9hjcmy2al9izsag";
+       sha256 = "4fe91f1355c2572661baa932988159123dd8a61e6c9c09a40af98b520291f9ae";
        libraryHaskellDepends = [
          aeson base text time unordered-containers
        ];
@@ -17843,7 +17875,7 @@ self: {
      mkDerivation {
        pname = "actor";
        version = "0.1.1";
-       sha256 = "1ic74yrfy6hk7217vh2ff6yacvf3dc5m1hjkcpfvxzdk5xhdv2b5";
+       sha256 = "6589dd602fb3fdbedd6553c2500b6bc36da6bc714ec07d8238131aefb22787c5";
        libraryHaskellDepends = [ base haskell98 stm time ];
        homepage = "http://sulzmann.blogspot.com/2008/10/actors-with-multi-headed-receive.html";
        description = "Actors with multi-headed receive clauses";
@@ -17859,7 +17891,7 @@ self: {
      mkDerivation {
        pname = "ad";
        version = "4.2.3";
-       sha256 = "0w9nd8llzcjb91x1d3mh5482pavbx1jpn8w2ahm6ydjwvijjd9r5";
+       sha256 = "25a72665dc5c366f2a5482237b65e86bab2b1029b08e167a484bb24f296a3671";
        libraryHaskellDepends = [
          array base comonad containers data-reify erf free nats reflection
          transformers
@@ -17876,7 +17908,7 @@ self: {
      mkDerivation {
        pname = "adaptive-containers";
        version = "0.3";
-       sha256 = "16h0zi55hf9g07xisbcmgkx72m9laiqykh2r9nh2siczx3sxi1qk";
+       sha256 = "1387d8f5e89f452da04d59c0e97154345571fa7c952d1dfb012f39584afc009a";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~dons/code/adaptive-containers";
        description = "Self optimizing container types";
@@ -17889,7 +17921,7 @@ self: {
      mkDerivation {
        pname = "adaptive-tuple";
        version = "0.2.0";
-       sha256 = "1kf4d3qf8nv61c7pajv234b2vil84c2cq40csnm456lg55qh53r1";
+       sha256 = "218f0271298f9a42aad50c10cc042388c62d1619624b750f0b665be4f068c4cd";
        libraryHaskellDepends = [ base template-haskell type-level ];
        homepage = "http://inmachina.net/~jwlato/haskell/";
        description = "Self-optimizing tuple types";
@@ -17903,7 +17935,7 @@ self: {
      mkDerivation {
        pname = "adb";
        version = "0.1.0.0";
-       sha256 = "17dxvdzmg3i8n0gbgbj0jyhm90w0dq7j27id8n24frild2w4c0d0";
+       sha256 = "a00146b86834664784452d1e210f6e808354a19740aeb71eb0288e577fdbbd9d";
        libraryHaskellDepends = [
          base bytestring cereal containers mtl network
        ];
@@ -17920,7 +17952,7 @@ self: {
      mkDerivation {
        pname = "adblock2privoxy";
        version = "1.3.3";
-       sha256 = "1iy0dmaw48nvgq4cqlx41n51almhz1w4k7rjpgsxqbsdnlwd8zdl";
+       sha256 = "b47dd438b54d2fdcf5bb329f4978f8b052158a0da453cc087edb22c2556dc0c7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -17939,7 +17971,7 @@ self: {
      mkDerivation {
        pname = "addLicenseInfo";
        version = "0.1";
-       sha256 = "054kcm0ibh1qdkyci36w3yxwxln56hz1yvi7gskp636nzhw5sjrw";
+       sha256 = "3c4b5d38fcd60c73a77e276e1f3e34c5d2cebb1fdc8cc8fc6c38c01541659314";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process ];
@@ -17955,7 +17987,7 @@ self: {
      mkDerivation {
        pname = "adhoc-network";
        version = "1.0.3";
-       sha256 = "1whdrmxw13nr7bb95rhqaz3klgmcwx4ai51bz5yb38nldf4ac377";
+       sha256 = "e70ca6886bd4a2b17cf92b94a848e7ac3e3ac75718e692d63ad98ec07bcd0df2";
        libraryHaskellDepends = [
          base bytestring containers Crypto dataenc HaXml hsgnutls network
          old-locale parsec pkcs1 random time utf8-string xml-parsec
@@ -17973,7 +18005,7 @@ self: {
      mkDerivation {
        pname = "adict";
        version = "0.4.1";
-       sha256 = "07w3595cwlicvwg04w9i5sg1x9d3r8c64pq0yi5pmnza7jpd5vgq";
+       sha256 = "f8edd2ae3ceadb7a4bf4005f6218caa3a51e9e2e3171021edf2c52ce4a2a831f";
        libraryHaskellDepends = [
          array base binary containers dawg PSQueue vector
        ];
@@ -17995,7 +18027,7 @@ self: {
      mkDerivation {
        pname = "adjunctions";
        version = "4.2.1";
-       sha256 = "0vzlz2q6863ywnhvax3m5xq99x6bz1h47z7z8hmnqdfg5pa4r9k5";
+       sha256 = "65a64cd42dcf356c2b44fffc4360f8cbf494702f7574b5a1e57e1864b0f8f46f";
        libraryHaskellDepends = [
          array base comonad containers contravariant distributive free mtl
          profunctors semigroupoids semigroups tagged transformers void
@@ -18012,7 +18044,7 @@ self: {
      mkDerivation {
        pname = "adobe-swatch-exchange";
        version = "0.2.0";
-       sha256 = "0jc6xwh1m2hmpfclsi27233775kp4yk0wrkr498qx7fs6p7xflpv";
+       sha256 = "fb52d7cf35da9d8e512279660ea627779673c61047444d99bb158a1a20ef8649";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -18036,7 +18068,7 @@ self: {
      mkDerivation {
        pname = "adp-multi";
        version = "0.2.3";
-       sha256 = "1lmmyxa22lm9a86w0gap8g676mnh5l1kxczbsv8ymb98fzcg6a27";
+       sha256 = "4728f3d87728adead1d6ebb33e032dd05673cc43573dc00d52a9522154f7b5d2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers htrace ];
@@ -18058,7 +18090,7 @@ self: {
      mkDerivation {
        pname = "adp-multi-monadiccp";
        version = "0.2.1";
-       sha256 = "13zlmhgyf46pcnrjwcrk7l6nmrkgqvycrajq3v7z72kjixakis6s";
+       sha256 = "dae838558f728af3cf1e58aaccfcc66fe66a0d3d33332eb365d710e71facf48f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ adp-multi base containers monadiccp ];
@@ -18083,7 +18115,7 @@ self: {
      mkDerivation {
        pname = "aeson";
        version = "0.7.0.6";
-       sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4";
+       sha256 = "645531759ba18105cadf024415e1be60353ad704ac686ff5ee67c7f4754d4e6f";
        revision = "1";
        editedCabalFile = "8b87a1343dd8d93d98e48e530f2ec14f5949fcdc96c8ecc81458a1d20defd001";
        libraryHaskellDepends = [
@@ -18112,7 +18144,7 @@ self: {
      mkDerivation {
        pname = "aeson";
        version = "0.9.0.1";
-       sha256 = "1g7qdq7zpyvqwmh4sfhizqpb51cg24lrcj9vq5msz8k896y7vfcj";
+       sha256 = "92b97dbc4968a2af6bc13b499629118f85b22efe113a4d60e578fbfb0f6ef8bc";
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq dlist ghc-prim
          hashable mtl scientific syb template-haskell text time transformers
@@ -18133,7 +18165,7 @@ self: {
      mkDerivation {
        pname = "aeson-applicative";
        version = "0.1.0.0";
-       sha256 = "0plbpln1glmf8a53f4nag1lx7sy8lcali6f1m526zifgak99p3qz";
+       sha256 = "1f8f9bd254cfc56f44a9c1994815a3c8ebd36978ca12378a42aed2172cbd8b5e";
        libraryHaskellDepends = [ aeson base text unordered-containers ];
        jailbreak = true;
        homepage = "https://github.com/gregwebs/aeson-applicative-dsl";
@@ -18149,7 +18181,7 @@ self: {
      mkDerivation {
        pname = "aeson-better-errors";
        version = "0.9.0";
-       sha256 = "00b9mjf636pfgg50961y86qbkpix19x5pvbzlha0mr0icqqaan76";
+       sha256 = "e658a5306611e40a14a47fed5b7a0a3ddeb9b0413e9804ca7bee9a619cac6901";
        libraryHaskellDepends = [
          aeson base bytestring dlist mtl scientific text transformers
          transformers-compat unordered-containers vector void
@@ -18166,7 +18198,7 @@ self: {
      mkDerivation {
        pname = "aeson-bson";
        version = "0.3.0";
-       sha256 = "0a4hrx56q1kfvf2ff9flsmrpgpvz3rshri9dpj4a9bf76ah04jn9";
+       sha256 = "c94a02a032c7ada488bc2dc50c751e7fdf7773d5d425e784db6e066c4acf9028";
        libraryHaskellDepends = [
          aeson array attoparsec base bson bytestring containers text
          unordered-containers vector
@@ -18184,7 +18216,7 @@ self: {
      mkDerivation {
        pname = "aeson-casing";
        version = "0.1.0.2";
-       sha256 = "07r19341n6k5pxk0xr7y5sylxgd9ryyhj7gx2irxhqsg9hn11yax";
+       sha256 = "5df9102c4c4f63d87314fd1d09bdcfa9bd4ebd2efee40e66bf651a1bc848211f";
        libraryHaskellDepends = [ aeson base ];
        testHaskellDepends = [
          aeson base tasty tasty-hunit tasty-quickcheck tasty-th
@@ -18202,7 +18234,7 @@ self: {
      mkDerivation {
        pname = "aeson-diff";
        version = "0.1.1.2";
-       sha256 = "00bmvdnqhw364i1j2f1n2didfzpgs93ia8djmmq81adgry73xmbq";
+       sha256 = "78d53e8ecfafa98070adb2211547d2ef7ed7621336382143246670886ddb7501";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -18228,7 +18260,7 @@ self: {
      mkDerivation {
        pname = "aeson-lens";
        version = "0.5.0.0";
-       sha256 = "1pr8cxkx41wi7095cp1gpqrwadwx6azcrdi1kr1ik0fs6606dkks";
+       sha256 = "7ace668031da8119439e21b6ccbe329d37c533be2f5c5612389107d2676728df";
        libraryHaskellDepends = [
          aeson base bytestring lens text unordered-containers vector
        ];
@@ -18245,7 +18277,7 @@ self: {
      mkDerivation {
        pname = "aeson-native";
        version = "0.3.3.2";
-       sha256 = "1s5i88r8sdd7ayrpjw6f18273k6r0igk0sswb503hzvjagzmzffh";
+       sha256 = "d0b95fff53727f3840595c6b305f04d9cc71040ace7079b357a7358d3242b1e8";
        revision = "1";
        editedCabalFile = "c9519a30bce75564cfbe84aade5ffb99fad12ecea1c7d2c362cca2234b8ae497";
        libraryHaskellDepends = [
@@ -18267,7 +18299,7 @@ self: {
      mkDerivation {
        pname = "aeson-pretty";
        version = "0.7.2";
-       sha256 = "03ap81853qi8yd9kdgczllrrni23a6glsfxrwj8zab6ipjrbh234";
+       sha256 = "6408b8b2bcd12cf591e4b93b4d9f5143449b33a59fbd3653f328e2515040570d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -18282,21 +18314,21 @@ self: {
      }) {};
 
   "aeson-qq" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, ghc-prim
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim
      , haskell-src-meta, hspec, parsec, scientific, template-haskell
      , text, vector
      }:
      mkDerivation {
        pname = "aeson-qq";
-       version = "0.8.0";
-       sha256 = "12vs3mh1a6j2r74xr11bpzb69i0k25dxplhvw15ph72kmhfbri7f";
+       version = "0.8.1";
+       sha256 = "2dcd2392902baac446e317621df509b09db9dca9b8c9187e53701226f18013fd";
        libraryHaskellDepends = [
-         aeson attoparsec base haskell-src-meta parsec scientific
-         template-haskell text vector
+         aeson attoparsec base base-compat haskell-src-meta parsec
+         scientific template-haskell text vector
        ];
        testHaskellDepends = [
-         aeson attoparsec base ghc-prim haskell-src-meta hspec parsec
-         scientific template-haskell text vector
+         aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec
+         parsec scientific template-haskell text vector
        ];
        homepage = "http://github.com/zalora/aeson-qq";
        description = "JSON quasiquoter for Haskell";
@@ -18314,7 +18346,7 @@ self: {
      mkDerivation {
        pname = "aeson-schema";
        version = "0.3.0.7";
-       sha256 = "1r84ih3bhnzfl3hl6a4ph4x2l25ls11py3mrxqd04kcpyqzsll5g";
+       sha256 = "af50aa3ff6974d021aeeb90e7f43d0b4082a3a81972843e1a0ee5bb8068c04e5";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
          regex-base regex-compat regex-pcre scientific syb template-haskell
@@ -18336,7 +18368,7 @@ self: {
      mkDerivation {
        pname = "aeson-serialize";
        version = "0.0.0";
-       sha256 = "010lbzm5ik2gdiqm8slnf9kwgbnz8ib03c901schrw5kildfxq51";
+       sha256 = "a1e0ee1a8db3f00c990e20b1015644dfaec76772966a54716c4fcc58ea5f1404";
        libraryHaskellDepends = [ aeson base cereal ];
        testHaskellDepends = [ aeson base cereal hspec HUnit ];
        description = "Simple serialization functions for aeson types";
@@ -18350,7 +18382,7 @@ self: {
      mkDerivation {
        pname = "aeson-smart";
        version = "0.2.0.0";
-       sha256 = "1r3262k6d7nskbnnam5rw5vq7i84347amz8lk6hrjn3c4bwacf35";
+       sha256 = "6538a6f8226c5899a19914fdaa0e1904c58377e1b95465ed9ada9e66a63062e4";
        libraryHaskellDepends = [
          aeson base data-default template-haskell text unordered-containers
          vector
@@ -18369,7 +18401,7 @@ self: {
      mkDerivation {
        pname = "aeson-streams";
        version = "0.1.0";
-       sha256 = "1mmkilvjrffzbf7d024kpc4i6b72f7dbq5hrkvrzr0q7dg1mg825";
+       sha256 = "45a057c36b0783fcf39e1916bcda71e22c1309bb9308d08e5bdfb92c378db3d6";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring HsOpenSSL http-streams io-streams
        ];
@@ -18386,7 +18418,7 @@ self: {
      mkDerivation {
        pname = "aeson-t";
        version = "0.0.5";
-       sha256 = "1mpqkjxsg4bpmbkj8ys39g53knw851l428x83619bmvnlrj1fkkd";
+       sha256 = "6d4e1764a676d7958219a82341682888db39ca4b437b24e7aa7791a7bb9cf8d6";
        libraryHaskellDepends = [
          aeson base bytestring text unordered-containers vector
        ];
@@ -18405,7 +18437,7 @@ self: {
      mkDerivation {
        pname = "aeson-toolkit";
        version = "0.0.1";
-       sha256 = "07cb4f4zwm64x0q5z63gsskl80s6qbwnk4nl6x2jiardcl3k8cl3";
+       sha256 = "83323407652dab284537d49269f9c2460344a7d66f985f30e8c454fe89238b1d";
        libraryHaskellDepends = [ aeson base bytestring failure text ];
        testHaskellDepends = [ base hspec ];
        description = "A generalization of Aeson over Failure";
@@ -18419,7 +18451,7 @@ self: {
      mkDerivation {
        pname = "aeson-utils";
        version = "0.3.0.2";
-       sha256 = "07sbvmm158yqmw4hri9l66ag4r6l59x230gbjm9r97w4x0dlp0bi";
+       sha256 = "71814b1be8849f945395eb81217a2ad464f2943134c50c09afd8a3126add4b1f";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific text
        ];
@@ -18434,7 +18466,7 @@ self: {
      mkDerivation {
        pname = "affine-invariant-ensemble-mcmc";
        version = "0.2.0.0";
-       sha256 = "116ln9zf4n0xy95nyyb3kwhg7ds36m793ys5yd5ha74vqf48gvk5";
+       sha256 = "65ee8788c39b1c054bf345fb914e3543b7f3209f63796f4bf21d58e27eb2d484";
        libraryHaskellDepends = [
          base containers mwc-random primitive split vector
        ];
@@ -18452,7 +18484,7 @@ self: {
      mkDerivation {
        pname = "afis";
        version = "0.1.2";
-       sha256 = "0ppq3rbwszz3wczg0zgk8hjqplv2ck11bbq5xr8306s5n02ybcf9";
+       sha256 = "c9b1e505b0451b3050ee05af15c26462d38b2544f37df03ee3e37fcd571ef85e";
        libraryHaskellDepends = [
          base byteable bytestring crypto-random cryptohash packer
        ];
@@ -18473,7 +18505,7 @@ self: {
      mkDerivation {
        pname = "afv";
        version = "0.1.1";
-       sha256 = "06p2xp5myipjhyzqak4zwr755kc1l4qljdf2bxn8rg0m7rhy01vk";
+       sha256 = "7307e0613e15bc8c6c5fc2354931a181cd524ee69f4c85bf87f2465fcbede21a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -18494,7 +18526,7 @@ self: {
      mkDerivation {
        pname = "agda-server";
        version = "0.1.1";
-       sha256 = "070xszykrazkisp1lsh2q1ri1i64lhd8psz8g4blv37zm899fpga";
+       sha256 = "ea5d9712aaff8c4d1779e8eb8b1aa4c4c41073c0026a1aae8ef3ab3cfdd71d1c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -18515,7 +18547,7 @@ self: {
      mkDerivation {
        pname = "agentx";
        version = "0.2.0.0";
-       sha256 = "0pmnrij90xag46af4c5yws5g26pf77l5ck864f4cyw5g9acw67g6";
+       sha256 = "e61dc3994aaf70cf8823064d56e839ee1af18ae6be30e294214f759064ccb65e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -18537,7 +18569,7 @@ self: {
      mkDerivation {
        pname = "agum";
        version = "2.6";
-       sha256 = "1j2qlwnvg7rxjx8fk3y5n3wjkikv1d17p8grh4gzp4c5a7pn5kim";
+       sha256 = "35ce62ef518591fb1f81f9a17b420b7bc629f9b0c58fe950973d9fb72da758c8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -18551,7 +18583,7 @@ self: {
      mkDerivation {
        pname = "aig";
        version = "0.2.3";
-       sha256 = "0363wr5fnryz49ksj6mvwngpqi2bj7ldgyzh6hgvmvvdz5nmmxzr";
+       sha256 = "f9f75a6df96defba1f34f0fbd7e8914b447c9fe5bb1aa96722df67eb4ae6c30c";
        libraryHaskellDepends = [ base mtl QuickCheck vector ];
        description = "And-inverter graphs in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -18564,7 +18596,7 @@ self: {
      mkDerivation {
        pname = "air";
        version = "2015.5.4";
-       sha256 = "1g9zzsxhmkiqpdmmapsvvh3vq5dp5gmmyr0x7ja59529xndslwaj";
+       sha256 = "5271aa9bed499454943c1d645feb2bb715bc07dc5b5f556bbb38ce0abbfe3fbd";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath mtl text time
        ];
@@ -18580,7 +18612,7 @@ self: {
      mkDerivation {
        pname = "air-extra";
        version = "2015.5.4";
-       sha256 = "07k01yjr9kj5q0dr871w9jmf23sdd75xrwgldsrkpppfc8kvnd97";
+       sha256 = "2735bb2762eede3bb36ef4f1dccb694d0fe1aa4c3c1c941bc045ce94a50f601e";
        libraryHaskellDepends = [
          air array base bytestring containers directory filepath parallel
          parsec regexpr text time
@@ -18595,7 +18627,7 @@ self: {
      mkDerivation {
        pname = "air-spec";
        version = "2013.7.1";
-       sha256 = "0s4y2805nmfydzxgr5lnhmyzkb6rh9mx2kpvzqqgyh4jvccdnwfx";
+       sha256 = "dd71db18db9240ff30fefb4ed16b82d9acf97d859696fcfa6fde555b00129e68";
        libraryHaskellDepends = [ base hspec text ];
        homepage = "https://github.com/nfjinjing/air-spec";
        description = "air spec helper";
@@ -18607,7 +18639,7 @@ self: {
      mkDerivation {
        pname = "air-th";
        version = "2014.11.17";
-       sha256 = "0rhp56qvwiwlrs7pvpbslybvlp4xnllfjab6pap2chxgywas34pq";
+       sha256 = "f892a115f7af4326aeba6629e928b59d5cba97a77add7d8fce9447beb1291766";
        libraryHaskellDepends = [ air base template-haskell ];
        homepage = "https://github.com/nfjinjing/air-th";
        description = "air";
@@ -18623,7 +18655,7 @@ self: {
      mkDerivation {
        pname = "airbrake";
        version = "0.2.0.0";
-       sha256 = "03z5hjrdwv8kjsj1vhipqhfmc19mi5cnjkcvcm71b0gmnpd71shq";
+       sha256 = "18ea70dab5f581154e659b4d6959893505561dc437c21da496136ddeb284e50f";
        libraryHaskellDepends = [
          base blaze-markup bytestring directory exceptions filepath
          http-conduit monad-control network semigroups template-haskell text
@@ -18647,7 +18679,7 @@ self: {
      mkDerivation {
        pname = "airship";
        version = "0.3.0.0";
-       sha256 = "118valfn96mwdl8pfrvpqgp1rg9armcwlw2r4lvvzb6ci0nyp9n8";
+       sha256 = "c8a6eb2d88ccacbf37255970ca59cd2abd1ceec3776777116dbc9a641d551b85";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -18675,7 +18707,7 @@ self: {
      mkDerivation {
        pname = "aivika";
        version = "4.3";
-       sha256 = "01vcjc6i040lp92xhxma6sp3iffam9d7nxqch6i64pajvd8cq97j";
+       sha256 = "f224cc50db525d62a2810c777b5aaacab938ae36aa76d845ba1410100d936c07";
        libraryHaskellDepends = [
          array base containers mtl random vector
        ];
@@ -18691,7 +18723,7 @@ self: {
      mkDerivation {
        pname = "aivika-experiment";
        version = "4.0.3";
-       sha256 = "1v0x37kmav87b3mxvribw6658glf5hbk7npipkabp1qbfz5sp7zv";
+       sha256 = "fb9fabcb770b87bbd4bcf1da33172c8e3e548ce12be6ddeb58076d55e7191dec";
        libraryHaskellDepends = [
          aivika base containers directory filepath mtl network-uri
          parallel-io split
@@ -18708,7 +18740,7 @@ self: {
      mkDerivation {
        pname = "aivika-experiment-cairo";
        version = "4.3.1";
-       sha256 = "0p54ssbl0ack51gwlj962x45954v4h22mqq6zqa5r8xrbcig2pdb";
+       sha256 = "ab5df1225bb9a35c14fe06e32a04249b945448172649ca5f2893294097d6a45c";
        libraryHaskellDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-cairo
        ];
@@ -18725,7 +18757,7 @@ self: {
      mkDerivation {
        pname = "aivika-experiment-chart";
        version = "4.3.1";
-       sha256 = "18fagq4ddvqzi6r0c850yassgncicqy0plasfn262fmhgwflpa8n";
+       sha256 = "16a94b1d7fb03a6184755ad10b3c6691d9a7b5f2a02006b2891fefd6087ecaa1";
        libraryHaskellDepends = [
          aivika aivika-experiment array base Chart colour containers
          data-default-class filepath lens mtl split
@@ -18742,7 +18774,7 @@ self: {
      mkDerivation {
        pname = "aivika-experiment-diagrams";
        version = "4.3.1";
-       sha256 = "1plb44bcjnawg3fsb9crmlyzwzyiz802ldsk559ni9sb590ywr7n";
+       sha256 = "f664ee412a4ba768532953372a00fad17ffe3dad99a5a5dd785c59c916218bde";
        libraryHaskellDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-diagrams
          containers filepath
@@ -18760,7 +18792,7 @@ self: {
      mkDerivation {
        pname = "aivika-transformers";
        version = "3.0";
-       sha256 = "1b9hkza735g1gxr3l73fz48y29fyph89j8114wzld3ydma2f6d1z";
+       sha256 = "3f34e384aacd8f463f2721209910bcde25e111f96e1c3a727fe19571d49f30ad";
        libraryHaskellDepends = [
          aivika array base containers mtl random vector
        ];
@@ -18779,7 +18811,7 @@ self: {
      mkDerivation {
        pname = "ajhc";
        version = "0.8.0.10";
-       sha256 = "1x2rc0gyyg7idc07hi64fvkv5h5a652kmcrczfxqyzbiyx2fjphs";
+       sha256 = "1a5ee944f7717d8fbbfb2cb33a4531aac0b2e776c44478006bf13cef1f6059f4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -18803,7 +18835,7 @@ self: {
      mkDerivation {
        pname = "al";
        version = "0.1.4";
-       sha256 = "1jr707fhsl1jvjidaznxj7xsi6br2v7gzckfhvcrmicd4i98yg1q";
+       sha256 = "383c8f52248dc59ad9866eb2ffce167999a8fb91dd7ed5a2dc32500ddd0127cb";
        libraryHaskellDepends = [ base mtl ];
        libraryPkgconfigDepends = [ openal ];
        libraryToolDepends = [ c2hs ];
@@ -18817,7 +18849,7 @@ self: {
      mkDerivation {
        pname = "alarmclock";
        version = "0.2.0.8";
-       sha256 = "1g06bnbp0y6dcz7zgbh828klk7xc1spwzw3ff6jpqh74cm82vq6f";
+       sha256 = "cee02d5065e4407ca5716ef0cfaf0eac9f49271208aef7cf67cd7870975d06bc";
        libraryHaskellDepends = [ base stm time unbounded-delays ];
        testHaskellDepends = [ base time ];
        homepage = "https://bitbucket.org/davecturner/alarmclock";
@@ -18830,7 +18862,7 @@ self: {
      mkDerivation {
        pname = "alea";
        version = "0.4.0.0";
-       sha256 = "1j18hqyrfyyhngla4dikdchi659bi7gj1lsl38r08645hf9n5395";
+       sha256 = "258d629383851804321a54d320df892b1513216b3336a2e8b3d07b973d8628c8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ argparser base containers threefish ];
@@ -18847,7 +18879,7 @@ self: {
      mkDerivation {
        pname = "alex";
        version = "3.1.4";
-       sha256 = "17x13nbbr79xgdlzywjqw19vcl6iygjnssjnxnajgijkv764wknn";
+       sha256 = "d64e4eccd953c62795ed566a6de5f3d150b653e05872ff697b3d9dbc961da19f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -18866,7 +18898,7 @@ self: {
      mkDerivation {
        pname = "alex-meta";
        version = "0.3.0.8";
-       sha256 = "1ja5y2dyil4h6j7q9dhrxzhry018fqc7vy3v5mrkvxyp7bhw1n9f";
+       sha256 = "2ed9c0e13ad7f73d732d7bf87d187628009fe1ef19b6848f3490d0e89bf045c9";
        libraryHaskellDepends = [
          array base containers haskell-src-meta QuickCheck template-haskell
        ];
@@ -18882,7 +18914,7 @@ self: {
      mkDerivation {
        pname = "alfred";
        version = "0.5";
-       sha256 = "1c6ak56g29wkas66x7yhg1zk039mp2mvlp7njixchhh2c4kx9fvn";
+       sha256 = "76bbd427610242c87a94f65cbaabb8350d307f78d09f6e8c569327f14c99cab0";
        revision = "1";
        editedCabalFile = "06e4b9ba672fc3d29452df70d2e9f9018ada5e8b62aa5890b9a70d9d937d6581";
        libraryHaskellDepends = [
@@ -18900,7 +18932,7 @@ self: {
      mkDerivation {
        pname = "algebra";
        version = "4.2";
-       sha256 = "1b74c55326qsnpyqzyhyq87j61wp3zrpsqhipgw8db8nm2lq9nhs";
+       sha256 = "1ada84a9a816ad86f8bb11627df31f9707230fc21efa8ffdb51a1b314a61e4ac";
        revision = "1";
        editedCabalFile = "621c4b71305b0a6a926f055608b5ca76c4c2360a523bcdf88d80fd10d20f4210";
        libraryHaskellDepends = [
@@ -18920,7 +18952,7 @@ self: {
      mkDerivation {
        pname = "algebra-dag";
        version = "0.1.1.1";
-       sha256 = "1pr6bbj67n13bw120l82zn5bj7bj0x00b754w852pbpij03fjay9";
+       sha256 = "c92be90690f1ae2b0ae2a49c054007721db98afd025120025f23d863e45a26df";
        libraryHaskellDepends = [
          aeson base containers fgl mtl parsec template-haskell transformers
        ];
@@ -18937,7 +18969,7 @@ self: {
      mkDerivation {
        pname = "algebra-sql";
        version = "0.3.0.0";
-       sha256 = "1wvm9qkixmyawwjd6ypshsmby7y7229zwidj3qhzkbmyi7p5sgzj";
+       sha256 = "f23f5dee89beaef9211eb245fe9310c71fbfaa86fa7ad324e7cad71e274e75f3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -18959,7 +18991,7 @@ self: {
      mkDerivation {
        pname = "algebraic";
        version = "0.1.0.2";
-       sha256 = "15gv6w9vz02960r6bd0k979vi6kj7pfxg705ajbrsd1pnwklfnwh";
+       sha256 = "905b4727b737349d9754059cd7dd3d729ab8d34913b46532304980bf1337fb95";
        libraryHaskellDepends = [ accelerate base ];
        jailbreak = true;
        homepage = "https://github.com/wdanilo/algebraic";
@@ -18973,7 +19005,7 @@ self: {
      mkDerivation {
        pname = "algebraic-classes";
        version = "0.6";
-       sha256 = "0i34n1lmnw12xrnaqvmiydnnlm8m8ky12chwb9jmnsf3klv8qm61";
+       sha256 = "c1548c369dc3695b655a1c3211fc4415556a6df3b16eac6cee22705b69b06444";
        libraryHaskellDepends = [ base syb template-haskell ];
        jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/algebraic-classes";
@@ -18986,7 +19018,7 @@ self: {
      mkDerivation {
        pname = "align";
        version = "0.1.1.2";
-       sha256 = "1bv7x687ga563kdnl23smrspljq32bkaarq4zdg071glqckrffq9";
+       sha256 = "093b9727c3f485035efb0467a5e612034b7a75ae7a086adb1ca6a87790e967af";
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "Sequence alignment algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -18997,7 +19029,7 @@ self: {
      mkDerivation {
        pname = "align-text";
        version = "0.1.0.1";
-       sha256 = "1vn8l9lxih2w8bjkfl8j4xxi8p44c1gqia63gi143xk9s035rjh2";
+       sha256 = "02ca5c06d069f641427cc3a8885f60845c147b27125137e5425cc0d869a2c8ee";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base optparse-applicative text ];
@@ -19012,7 +19044,7 @@ self: {
      mkDerivation {
        pname = "aligned-foreignptr";
        version = "0.1";
-       sha256 = "0hmnp08k04c0ag9fyp5sajg54r4gi57vrd9krk4g8y8fri0fgc00";
+       sha256 = "00b0e740cc0e79f4c8cc33b5bc4f898f64529e54ba5cefd25380113011b8b642";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "An aligned ForeignPtr type";
@@ -19024,7 +19056,7 @@ self: {
      mkDerivation {
        pname = "allocated-processor";
        version = "0.0.2";
-       sha256 = "0jhz3q0972snrgd9c7lr934ddkwllwgw6anj7ax8hj4zi0zc615m";
+       sha256 = "b504c33e889f4888ba3ad22ac31fa794cfd6c848991e96dacb568b93001e1f4a";
        libraryHaskellDepends = [ base vector-space ];
        description = "Functional combinators for monadic actions that require allocation and de-allocation";
        license = stdenv.lib.licenses.bsd3;
@@ -19035,7 +19067,7 @@ self: {
      mkDerivation {
        pname = "alloy";
        version = "1.2.1";
-       sha256 = "00bndi30yhd92vwij3dwhbj79dhv9n3l45bw01mfqak45gqbfwyv";
+       sha256 = "db73b7f02b642aec6a007c1542874d1bb674e482bc0d19f916a9410f466c7601";
        libraryHaskellDepends = [ base containers mtl syb vector ];
        description = "Generic programming library";
        license = stdenv.lib.licenses.bsd3;
@@ -19046,7 +19078,7 @@ self: {
      mkDerivation {
        pname = "alloy-proxy-fd";
        version = "1.0.0";
-       sha256 = "1fhk5ydnf0l0n579gqg5lfg2cc9z8xbgqsqzgkpcw0046kp53rjw";
+       sha256 = "5ce651ee340400ceee7c1f6bfc56473f31269ea3e5e1974eb18002679b2f13ba";
        libraryHaskellDepends = [ alloy base mtl ];
        description = "Some add-on instances for the Alloy library";
        license = stdenv.lib.licenses.bsd3;
@@ -19057,7 +19089,7 @@ self: {
      mkDerivation {
        pname = "almost-fix";
        version = "0.0.2";
-       sha256 = "03x715jcrsxfs2d08hsg3y5f6a4bnlzfxsmhzimvpdp9bw0psn90";
+       sha256 = "20597d015fe9b6bb6bfcb0eaee3eb58b28e38a1f4f43049ad0aeebcc6409a70f";
        libraryHaskellDepends = [ base ];
        description = "Recurse while a predicate is satisfied";
        license = stdenv.lib.licenses.bsd3;
@@ -19072,7 +19104,7 @@ self: {
      mkDerivation {
        pname = "alms";
        version = "0.6.7";
-       sha256 = "1xickrpjx2dn2pa5zcbjsfm5j6mqn54hpyzi7c6sv5i20hs2gamp";
+       sha256 = "b7aa2734042296ad0d3bf1fb0b49b1b81a59aad372b15fd415b6892e6f9e2cf6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -19094,7 +19126,7 @@ self: {
      mkDerivation {
        pname = "alpha";
        version = "1.0.15";
-       sha256 = "1gc2kjyk75cxggy52w49j97q4gcn74q7f582q6kjb3gsp2pdrn09";
+       sha256 = "09d8dcaeb8fa8d25a7c10215773039963d824f92897051fc7b9d9533bd9c82bd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -19117,7 +19149,7 @@ self: {
      mkDerivation {
        pname = "alpino-tools";
        version = "0.2.0";
-       sha256 = "1sh0mrlpfak5i20wqmz23ihphim4di802h02kyxj795gq8q6v61r";
+       sha256 = "39986d30c2afa423bb9f024001506ca44678611ce257cc8188652a7769ae00ea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19141,7 +19173,7 @@ self: {
      mkDerivation {
        pname = "alsa";
        version = "0.4";
-       sha256 = "0zdnhi2wm7w6182k6mccm16x453g7kvbsqx2afnhfjpr3iaj69mg";
+       sha256 = "af2623551cf94a07ad53a263bdf63c6f14d24da88c5533050a869fca4584b67d";
        libraryHaskellDepends = [
          array base extensible-exceptions sample-frame
        ];
@@ -19158,7 +19190,7 @@ self: {
      mkDerivation {
        pname = "alsa-core";
        version = "0.5.0.1";
-       sha256 = "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b";
+       sha256 = "eb50495ef05ecc7c06a0147da7f0d3efde832a44d23caaf5172dc114882270ab";
        libraryHaskellDepends = [ base extensible-exceptions ];
        libraryPkgconfigDepends = [ alsaLib ];
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
@@ -19173,7 +19205,7 @@ self: {
      mkDerivation {
        pname = "alsa-gui";
        version = "0.1";
-       sha256 = "0zcyjckdjhsj614iib3dzj9dfp8xj847jfqf4q1sk9311gscbzns";
+       sha256 = "dafec5f40b61a4a903260e3b7908921d5dd792fc6dac1849305243d926939e7d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -19192,7 +19224,7 @@ self: {
      mkDerivation {
        pname = "alsa-midi";
        version = "0.4.0.1";
-       sha256 = "1dmc336irhw6wdny6f2za9n3gnd83i3pcfr7qfkm8fzq6kzkkjy3";
+       sha256 = "c3cb39ff34f83b54a7c3273b76471ca8d9376c525f38e36de386c31ccd18acb6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19212,7 +19244,7 @@ self: {
      mkDerivation {
        pname = "alsa-mixer";
        version = "0.2.0.2";
-       sha256 = "11sc2n879a8rb9yz54cb8vg8rplgapbymzy785p7n7638xx877hk";
+       sha256 = "139e837a47c31c7b6e41c7ffead7558fde8cde468b91f27d5a19a97490154c87";
        libraryHaskellDepends = [ alsa-core base unix ];
        librarySystemDepends = [ alsaLib ];
        libraryToolDepends = [ c2hs ];
@@ -19228,7 +19260,7 @@ self: {
      mkDerivation {
        pname = "alsa-pcm";
        version = "0.6.0.3";
-       sha256 = "0rq0i17xhd0x7dnlhdf3i1fdvmyxrsbm0w0k9lrx20xpy4gw2zfs";
+       sha256 = "da7dc11ff1b703d1334d13705097ceddd7dd5c88c335486d3b1d34d84f880067";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19246,7 +19278,7 @@ self: {
      mkDerivation {
        pname = "alsa-pcm-tests";
        version = "0.1";
-       sha256 = "1bhrjf731jqs5297zcid5b6mmdh2njqx2hxssd077a4iqvm0c21k";
+       sha256 = "330806eac691a87340d3ba43d1b1b402b65acd2a2db27f92281acb308e9319ae";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ alsa base ];
@@ -19263,7 +19295,7 @@ self: {
      mkDerivation {
        pname = "alsa-seq";
        version = "0.6.0.5";
-       sha256 = "1ll42nlhjwgzan9h1vzyyyhilj9d41l3gavnbahhgbr8h9wb2f0j";
+       sha256 = "1238b1788228af07a15a76ab3768202d491aa1f7feef009355ff7109a91584d2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19281,7 +19313,7 @@ self: {
      mkDerivation {
        pname = "alsa-seq-tests";
        version = "0.1";
-       sha256 = "0is11wdymarzm5zlilh572j1nw3akxma0czbswvgy391pj1a007s";
+       sha256 = "fa00a082bc210dff36d7eb33a06a9f6a701ba43805d2487fa93fabea1b0f4147";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ alsa base ];
@@ -19296,7 +19328,7 @@ self: {
      mkDerivation {
        pname = "altcomposition";
        version = "0.2.2.0";
-       sha256 = "0893802bwdmywl5jh5d6mdf7l4h4qyc5y53mp39xc5lx6dsiq1d9";
+       sha256 = "a9051c75339d16d6d3b875145f98c704127a5caba615280be5be36be04402321";
        libraryHaskellDepends = [ base composition ];
        homepage = "https://github.com/jcristovao/altcomposition";
        description = "Alternative combinators for unorthodox function composition";
@@ -19310,7 +19342,7 @@ self: {
      mkDerivation {
        pname = "alternative-io";
        version = "0.0.1";
-       sha256 = "01hypbci3hw2czkmx78ls51ycx518ich4k753jgv0z8ilrq8isch";
+       sha256 = "90e98870a6117db09f1ce54c025944a174e643d1149d5ee76782c311d9ba1e06";
        revision = "1";
        editedCabalFile = "982094590ae1e54131d4b1285eaec6d4160717a2864858f90a3511522fc591d6";
        libraryHaskellDepends = [
@@ -19325,7 +19357,7 @@ self: {
      mkDerivation {
        pname = "altfloat";
        version = "0.3.1";
-       sha256 = "1n0mxgl1jzap74sglw85l0595lhaj493bz46b90cnsqr5as9mal8";
+       sha256 = "88aa9ab42a196bcb405a86fc3512910ad2920aa00571fa3439577d19e8eb15d8";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        homepage = "http://repo.or.cz/w/altfloat.git";
        description = "Alternative floating point support for GHC";
@@ -19338,7 +19370,7 @@ self: {
      mkDerivation {
        pname = "alure";
        version = "0.1";
-       sha256 = "1nrlw8qdbgv3l99mlcql35zknyj767fgh3f53y2mjksrh0p61v8n";
+       sha256 = "16ed602e80594f59851fc50df8dc31477a3b7f1914335a53a263bfd530e234db";
        libraryHaskellDepends = [ base OpenAL ];
        librarySystemDepends = [ alure ];
        description = "A Haskell binding for ALURE";
@@ -19354,7 +19386,7 @@ self: {
      mkDerivation {
        pname = "amazon-emailer";
        version = "0.4.0.0";
-       sha256 = "0s8m16qbcz6jgxx83sx1swg2217bvv3q3pm8b7f2jsn33nihrzxx";
+       sha256 = "bdff0ca31dc36a29dc59a8de81c7deeb04211ed7a1eb817a7fd27cb6b0091569";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -19374,7 +19406,7 @@ self: {
      mkDerivation {
        pname = "amazon-emailer-client-snap";
        version = "0.1.1.1";
-       sha256 = "03am5nzacq2wd9jf46fnwmwq2ghfsh3yd9s0mzrrkskd26q1askb";
+       sha256 = "6b6a15b0116dea99f3af40a7e607d40e3e8179e5d619e2646a5c60a6be2d550d";
        libraryHaskellDepends = [
          base mtl snap snaplet-postgresql-simple text
        ];
@@ -19393,7 +19425,7 @@ self: {
      mkDerivation {
        pname = "amazon-products";
        version = "0.1.0.1";
-       sha256 = "10y86b3bzx6yk0478pixh3hh4nkkh0qlwwr0ac2fn6sh1hd6c7sl";
+       sha256 = "541f661a0c501beb045320734e3180735a02e1803d5e740898def4bfc632c883";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19421,7 +19453,7 @@ self: {
      mkDerivation {
        pname = "amazonka";
        version = "0.3.6";
-       sha256 = "1snzrclzs275gks19glrrayiysvywzwpzx6y5hnwmm48z4lh4gsb";
+       sha256 = "4b3f0229f988d4ca2d2cdef47ff9e77e6b1fbdca99be14f47ce508fd29cbdfea";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra cryptohash
          cryptohash-conduit exceptions http-conduit lens mmorph
@@ -19438,7 +19470,7 @@ self: {
      mkDerivation {
        pname = "amazonka-autoscaling";
        version = "0.3.6";
-       sha256 = "11dkcf0arjimvdzdin690811hs9klhr4xbhmjxcvqmwjr0z0sbb9";
+       sha256 = "692d0d3ec89257bc599715ae4e32a43369180202c9d8d87edb35caac8063b385";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
@@ -19450,7 +19482,7 @@ self: {
      mkDerivation {
        pname = "amazonka-cloudformation";
        version = "0.3.6";
-       sha256 = "0m64p8xgwskv5vyzkkd5cxcwg5a7qa86a8sndan7yffap5b4nzq3";
+       sha256 = "037f4b56b9ca397fac6a56236590c24795c75967a5cdf9fd2e7b6afe3abac454";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
@@ -19462,7 +19494,7 @@ self: {
      mkDerivation {
        pname = "amazonka-cloudfront";
        version = "0.3.6";
-       sha256 = "09kl01agnmq24r1ip2f047ayrlf95x51nm80l3g40lx91n3mc7rp";
+       sha256 = "371f56870da95340dea000551b4a2fc9d1ecd521c0891b43260257fb54007426";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
@@ -19474,7 +19506,7 @@ self: {
      mkDerivation {
        pname = "amazonka-cloudhsm";
        version = "0.3.6";
-       sha256 = "0m17yjilg4d7hm8d5mbs3bqsm9hlxcybk9b49bj06266jcd9rxff";
+       sha256 = "cef59c1a93c60803e44a64a5b93ceb14a6aaf11a7ad5d25085a79147a3f42754";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
@@ -19486,7 +19518,7 @@ self: {
      mkDerivation {
        pname = "amazonka-cloudsearch";
        version = "0.3.6";
-       sha256 = "1hyapllcv5g2s8qxmyigy2k0fha9k07dd2jax69hkwi2qv88cks5";
+       sha256 = "454f86d0c622f20993e94a8ad60e98494107a6f02ffada31d2e295cd28bdcac3";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
@@ -19498,7 +19530,7 @@ self: {
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
        version = "0.3.6";
-       sha256 = "0dfi0flb77zjbjzdsfybr0hxwwdh2qd1pc5pry88l57iibjhmxym";
+       sha256 = "d5f70ae58af1148a90cfb7b01b1a16b071de21c8cb3bddbe5cf29fb3a803d135";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
@@ -19510,7 +19542,7 @@ self: {
      mkDerivation {
        pname = "amazonka-cloudtrail";
        version = "0.3.6";
-       sha256 = "07b47dy9r1f7dl5zq6z1zx1xa9q4qlack49zy8y48x1im90dnc9x";
+       sha256 = "3d31db40aa3174443cf23f91c914c50427d543ffe11bfc0b6dc7859c7c3b641d";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
@@ -19522,7 +19554,7 @@ self: {
      mkDerivation {
        pname = "amazonka-cloudwatch";
        version = "0.3.6";
-       sha256 = "14vx5v9iicxv768637v8smzwj04nhd80dcrwrxq3yqqlq9mbk9nk";
+       sha256 = "d3a6b96ac214633f70cf3cb30650839600c97fd5689f619039bbb318d32e7d93";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
@@ -19534,7 +19566,7 @@ self: {
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
        version = "0.3.6";
-       sha256 = "15xpyfifqm6c5s4ysak1y0sgn6h5g9bapl69s9dpacg7nfpajqvb";
+       sha256 = "6b63a9aeb3e731755bd2c9d0ab567a051afb34f0612aed892ecc54eca2f3b797";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
@@ -19546,7 +19578,7 @@ self: {
      mkDerivation {
        pname = "amazonka-codedeploy";
        version = "0.3.6";
-       sha256 = "1cp99l1kjm0w0jb1c4brq00dy4mn53pycra5gvlvz9k210g72ndm";
+       sha256 = "b559711e0862a6bfe97e4565e6ef28b612df00c079111696041c5439034de9b2";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
@@ -19558,7 +19590,7 @@ self: {
      mkDerivation {
        pname = "amazonka-cognito-identity";
        version = "0.3.6";
-       sha256 = "1ig50w3z85y8g7hiq1hahbv529kq5pfrcpqwsrpf1zwynl50jjkz";
+       sha256 = "7f4a090ab59effe06ed61c5f96dd2d782651f6820a061ce179c817f40707e5c5";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
@@ -19570,7 +19602,7 @@ self: {
      mkDerivation {
        pname = "amazonka-cognito-sync";
        version = "0.3.6";
-       sha256 = "1m6nw80ls7rl55ci36y2xvw8a1wfqiv64wm3q4anzmyybl50s133";
+       sha256 = "63040d0a5dded76f15c1a3726276c48e0785f8eec29b115929341f4d01e2d6d4";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
@@ -19582,7 +19614,7 @@ self: {
      mkDerivation {
        pname = "amazonka-config";
        version = "0.3.6";
-       sha256 = "0aa73cmlaydayvy6vxbxdz5br8a6hsns3dn3s06r4nzxxy7zmfzg";
+       sha256 = "efbbfa8feffd5b920dd0c3b6a1ad8646a1bcca6f7df56dfcf6aa79452b1b4729";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
@@ -19601,7 +19633,7 @@ self: {
      mkDerivation {
        pname = "amazonka-core";
        version = "0.3.6";
-       sha256 = "1l60z0fcfbyrhi7r4lfy2a6b2vwc4bn1swd6ddna19qyq9fn67l2";
+       sha256 = "821e635dc21ea7a06c6ba6711dec228c6fb18c12de51924f84d92fc71cf8c0d0";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bifunctors bytestring case-insensitive conduit conduit-extra
@@ -19623,7 +19655,7 @@ self: {
      mkDerivation {
        pname = "amazonka-datapipeline";
        version = "0.3.6";
-       sha256 = "0p0k76hiif5nd4kxm1ww6p0srjfmmq8q3xln4sbkq8ss448zfymh";
+       sha256 = "b07af711215a233c972696f68111aed5c9acc1359c87da2769b6b818a139135c";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
@@ -19635,7 +19667,7 @@ self: {
      mkDerivation {
        pname = "amazonka-directconnect";
        version = "0.3.6";
-       sha256 = "0q258fxwklm5xwyzram3kdq3ylayk498a02xzs7v2vb2vd3pmdb6";
+       sha256 = "66b57a47db626db18ffe5d008512995e513f709ba3aafc3defa5d2c9bb434560";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
@@ -19647,7 +19679,7 @@ self: {
      mkDerivation {
        pname = "amazonka-dynamodb";
        version = "0.3.6";
-       sha256 = "1k6kzip69sjakcw1y7n0xjd0qjpbrk604fs4hng8n6az107vbdjq";
+       sha256 = "58b6b50f085f198b9e85443b02cccceb4a0c9aecc01e1f389b4aea646efcd3cc";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
@@ -19659,7 +19691,7 @@ self: {
      mkDerivation {
        pname = "amazonka-ec2";
        version = "0.3.6.1";
-       sha256 = "19gyqga1qp50jsi6pykykkivfz18357p6pd6fg84bir0j9d4vawy";
+       sha256 = "9eab4d5a9220c745d073a65d734f19287cb7e39c7efa6ba296a05c1cd4c3fea5";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
@@ -19671,7 +19703,7 @@ self: {
      mkDerivation {
        pname = "amazonka-ecs";
        version = "0.3.6";
-       sha256 = "1md59pdqir5prlfwlmlgd78g6c9gq0dszm2lxpa3kbv9zxs1kgfr";
+       sha256 = "d9bd1974ff69af39d4ed54d4af1bc02f31f3d0698f56ca1dcdb7e488db4da5d5";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
@@ -19683,7 +19715,7 @@ self: {
      mkDerivation {
        pname = "amazonka-elasticache";
        version = "0.3.6";
-       sha256 = "0hapj08jj89gl934zgkfj2lg9bsc71y1mvdl5dmv4vk8qrwp912a";
+       sha256 = "4a847479c6686eb26b2bb4ed1a7c384caff4a8906ebe4f46a22f212911905741";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
@@ -19695,7 +19727,7 @@ self: {
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
        version = "0.3.6";
-       sha256 = "1bpixxvj4rdx3v07f2pdky0xbz0kz5p3afjazwv8w588sj2i6773";
+       sha256 = "e31c1385d408158e36ff4a3a356ef913fcd5819fed0a77c01ebd652277eff1ae";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
@@ -19707,7 +19739,7 @@ self: {
      mkDerivation {
        pname = "amazonka-elastictranscoder";
        version = "0.3.6";
-       sha256 = "1rfnzwl6z0ym2ln5nbcx6an2iiqcwnb3rjki2jnxpqkv6hj8d1p8";
+       sha256 = "e8868624347be2dbad1471ca3c96e50cc728ac329d2d5b2c15d5836f28ffd6e5";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
@@ -19719,7 +19751,7 @@ self: {
      mkDerivation {
        pname = "amazonka-elb";
        version = "0.3.6";
-       sha256 = "0yriv45wrxw9jns17idiqwxxvh086g3bg2hclzaanzxllir4jb59";
+       sha256 = "a92c4972a4b47fabd4a70c8ab7c63308c0dd3bc7b1c513b49589f7cc0bd9317b";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
@@ -19731,7 +19763,7 @@ self: {
      mkDerivation {
        pname = "amazonka-emr";
        version = "0.3.6";
-       sha256 = "0pv0li7823alrgl9w1fjx9i02ndk4k12fbb6z5z50krypcxp8819";
+       sha256 = "2920743bbb3e4f507ef9662d27c224b3590162ead2059ee8cb540d814ea4605f";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
@@ -19743,7 +19775,7 @@ self: {
      mkDerivation {
        pname = "amazonka-glacier";
        version = "0.3.6";
-       sha256 = "0i3j1yha1hjj7imqn6m42329p3637v09hbjampq0c500dvy1j5dl";
+       sha256 = "b41519fc6e001406f0ad4a2e98c03ec38c9bc410a41a8b6b3c52c2a0a00f7244";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
@@ -19755,7 +19787,7 @@ self: {
      mkDerivation {
        pname = "amazonka-iam";
        version = "0.3.6";
-       sha256 = "0nzs9xn70f2a0n3xdnprwdk0mwnr23cgq0rwwxc83gf08i19nl8j";
+       sha256 = "12519b4244c0bd8158e73c03fcd810d9f20a66e3f9dad687054a38706c4ffa5b";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
@@ -19767,7 +19799,7 @@ self: {
      mkDerivation {
        pname = "amazonka-importexport";
        version = "0.3.6";
-       sha256 = "1qcqzqg9sxqaf5kb3l91n7zp5brdpyv2mhy7da08wxb16f1v1r9x";
+       sha256 = "3de5b0833361758e806ac7c32ab6bf2daf72ffb121d1b166710a779d1efe98e1";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
@@ -19779,7 +19811,7 @@ self: {
      mkDerivation {
        pname = "amazonka-kinesis";
        version = "0.3.6";
-       sha256 = "0r4s5qfpirapg2gsgk9gbyp3ap4pz3cpnz4wdidlc4ys9v4vfhay";
+       sha256 = "5e41b7c94eda13465b6c9c7c7bd9f8975c35ae5f2fcda79f7857e5781d2e9a64";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
@@ -19791,7 +19823,7 @@ self: {
      mkDerivation {
        pname = "amazonka-kms";
        version = "0.3.6";
-       sha256 = "1x68jg5m79rapwvb6nb9xmf2hwdv34r63r0aar742igpjwssxzn9";
+       sha256 = "c9feae3597f745414e560ae4613219bb71285ced6959b336bf2aa753cb93c8f4";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
@@ -19803,7 +19835,7 @@ self: {
      mkDerivation {
        pname = "amazonka-lambda";
        version = "0.3.6";
-       sha256 = "1g6gf64k60zanmv787rsg8zxnv6vxzdwv3dibwm5b00fzw7cshlp";
+       sha256 = "9742cd0eff0e80552a5fb18dcddbefdb6cdb3f7a3a1f7476b5ea03338971cfbc";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
@@ -19815,7 +19847,7 @@ self: {
      mkDerivation {
        pname = "amazonka-ml";
        version = "0.3.6";
-       sha256 = "0ma60mdn14xs3999yg98dzlx96arlwrc9wsvgf0gq6s6c0gnrc04";
+       sha256 = "04b06c1f60461bfc807b5bf3c432a75999d4e96f283d9f521aba93605b054655";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Machine Learning SDK";
@@ -19827,7 +19859,7 @@ self: {
      mkDerivation {
        pname = "amazonka-opsworks";
        version = "0.3.6";
-       sha256 = "1d9qgazp4qk6lc4isggb0rm50crp0s1qmz6m0s3wwfdwd6lvhaql";
+       sha256 = "142bb8a969bc39ce8706d5fc8a83063733506a06eb3d1d09a3666272bf7a38b5";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
@@ -19839,7 +19871,7 @@ self: {
      mkDerivation {
        pname = "amazonka-rds";
        version = "0.3.6";
-       sha256 = "105xj8zrjha5yvpj8m0r7asy0hys17g1gglf95kgnkwdh9zhj3yl";
+       sha256 = "d40f097f828d4ffb66498ebe17de09da43e0b53a195424eff64541993f92bd80";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
@@ -19851,7 +19883,7 @@ self: {
      mkDerivation {
        pname = "amazonka-redshift";
        version = "0.3.6";
-       sha256 = "195lawjhy6hmfwk05cm9wi2x8pn6f3zr8rhcvrwa0igg8xi39fpr";
+       sha256 = "f9ba346247ef45a078de0c6694ff70c65ed445e4a9b2022677151a0f2557b4a4";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
@@ -19863,7 +19895,7 @@ self: {
      mkDerivation {
        pname = "amazonka-route53";
        version = "0.3.6.1";
-       sha256 = "155d4yfc96x99mw8h89n2waj7ywx4hcw8izcx1sk1x96lcd6h9mw";
+       sha256 = "bc26681aa326f53075e8ec47c419249dfb231517362188784da99bc49c27ad94";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
@@ -19875,7 +19907,7 @@ self: {
      mkDerivation {
        pname = "amazonka-route53-domains";
        version = "0.3.6";
-       sha256 = "13dykx5w35dj3fn7nqs3znisjzqczpsxxyyghh2kfsgfhxna0kqv";
+       sha256 = "1b4fa06c87ee69370584cffbdef5fd0c7fa9a3fd43637bac1bb295c14b9fbe8d";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
@@ -19887,7 +19919,7 @@ self: {
      mkDerivation {
        pname = "amazonka-s3";
        version = "0.3.6";
-       sha256 = "1q45d6g4wrfjmw9d65bvrin1p9vcfv5xyz47158p9zxm2cvpvcv9";
+       sha256 = "69b37d3713b5ff745109877cdfcb766ca71b6ccc7b15d312afd2654e9e6985e0";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
@@ -19899,7 +19931,7 @@ self: {
      mkDerivation {
        pname = "amazonka-sdb";
        version = "0.3.6";
-       sha256 = "1wswsirmjq1zvhppv4bk4h9k2b94hdl1w8q18c7mh5i4j6kx41lc";
+       sha256 = "8c06d2a7912416580f4301231e6883242d31132473917d2fdc3f605973d45cf3";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
@@ -19911,7 +19943,7 @@ self: {
      mkDerivation {
        pname = "amazonka-ses";
        version = "0.3.6";
-       sha256 = "1f7k13mpf1hs27li4fdfv4wsbckyljmhwf9i6r176h6lkkb24vxx";
+       sha256 = "bd6f22d69cd44073423631390eaba47eb2a539d9ae3912e9111a0677eb08f3b8";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
@@ -19923,7 +19955,7 @@ self: {
      mkDerivation {
        pname = "amazonka-sns";
        version = "0.3.6";
-       sha256 = "00bln36dmxikxgjyib009i3y56nln4i4j58nj89sclc87mdbzbma";
+       sha256 = "aaaebf5a3d8851a6139216154922b1d49ae2474c00ace8e5eb33f6daccb07401";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
@@ -19935,7 +19967,7 @@ self: {
      mkDerivation {
        pname = "amazonka-sqs";
        version = "0.3.6";
-       sha256 = "04qz8d81xz5pj3ib7cpxrig61n70val2vgjjy3xc0wjki3sk7xw8";
+       sha256 = "88f733f5885372c0faf052be2da8dae0d8605eccfdb2b3e290b7fc1e50431f13";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
@@ -19947,7 +19979,7 @@ self: {
      mkDerivation {
        pname = "amazonka-ssm";
        version = "0.3.6";
-       sha256 = "1xzz82hxh0am6mgzgqx0w8lxm5q8d3zpny2qyyl7bjyjh8k7v370";
+       sha256 = "e08c7d2682d2cb75a8f758787bff680897da29e2a0e3f75f355501d8a140fff7";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Systems Management Service SDK";
@@ -19959,7 +19991,7 @@ self: {
      mkDerivation {
        pname = "amazonka-storagegateway";
        version = "0.3.6";
-       sha256 = "1cjajpwf0lfvn3r62n7y4ly16496cn7qhs17grjxv3c9i8pikq2z";
+       sha256 = "5fe0192f8a898ddd657e2768888f652611133c25fe5861f2b0db51e0f8954ab2";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
@@ -19971,7 +20003,7 @@ self: {
      mkDerivation {
        pname = "amazonka-sts";
        version = "0.3.6";
-       sha256 = "096av2p79b4vnb3zzmkbjspvxkcgzx77w96mrziggfj8mxh3x5f1";
+       sha256 = "c1953e60af48baf7e2cfd5247e4eff8fcdbeaf966bd6ffc7b29bac74aed8ca24";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
@@ -19983,7 +20015,7 @@ self: {
      mkDerivation {
        pname = "amazonka-support";
        version = "0.3.6";
-       sha256 = "0igaq8538vrbwn7pqap5500alx3lp1c37imq75gk9nx7q846gqy6";
+       sha256 = "c6e36708c2a7db345f39b8c63358b87474aa0028e52a7c8fe52b6f340ac2ea45";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
@@ -19995,7 +20027,7 @@ self: {
      mkDerivation {
        pname = "amazonka-swf";
        version = "0.3.6";
-       sha256 = "0mijdc797ybdz7g0nkyncahspsl0dpy3g8hkhcj2jdhhdbqn7qfc";
+       sha256 = "cce163f16a103629248313a237fc6d80eaaba162d64f0bdef96df9930e6b3256";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
@@ -20007,7 +20039,7 @@ self: {
      mkDerivation {
        pname = "amazonka-workspaces";
        version = "0.3.6";
-       sha256 = "1hwlm2a5fn4hrqqv79iw39xrrgfhl1d1p6236lqqfdyycnq4x5wk";
+       sha256 = "93974eb065de3787313543981b5aa0d0bd9c7b1a3ca6b331ce90585794a894c3";
        libraryHaskellDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkSpaces SDK";
@@ -20024,7 +20056,7 @@ self: {
      mkDerivation {
        pname = "ampersand";
        version = "3.0.3";
-       sha256 = "0xasmdcsrnvyfw3q5jkd1cpmi26yj8c5ifzgmjy6qp6wpsldswqc";
+       sha256 = "0c73dda8bedc5c6cbcacefbb581892de88582f0b6dca8207777edbac59ab5a75";
        revision = "1";
        editedCabalFile = "42a4a0f82e5c10b76a8412ba625df82da44d7e28353a9efa5aad2b10e7cc9d2a";
        isLibrary = false;
@@ -20051,7 +20083,7 @@ self: {
      mkDerivation {
        pname = "amqp";
        version = "0.13.0";
-       sha256 = "1qnknyk8xizq5i94s9zv7prqqcpccigc92c6jqqh82y2yqz5xnjj";
+       sha256 = "52da5e3ef6c20b0431968689c45e64ec328cf33dfb274d522cf8c78ea6b7d3e2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -20078,7 +20110,7 @@ self: {
      mkDerivation {
        pname = "amqp-conduit";
        version = "0.2.0.0";
-       sha256 = "1mlapyp22bbnkz7ny2rs2da6a6nbs41j8ljsjlxv1x9cfnjzjayb";
+       sha256 = "cb2bf9a5752cf5b03b955a522403d1cb1a6554133a0b6fcf9f762d21aebf8ad6";
        libraryHaskellDepends = [
          amqp base conduit exceptions lifted-base monad-control mtl
          resourcet text transformers transformers-base
@@ -20097,7 +20129,7 @@ self: {
      mkDerivation {
        pname = "amrun";
        version = "0.0.0.5";
-       sha256 = "1y0azhsjarv26lkny1wckdz45bs87wbga29hbg6w59wc2gjkbxqz";
+       sha256 = "1ff735e5138ca7c2cd5b3009f5163f48af427e9b8c076f273562672535fc0af8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base deepseq parsec ];
@@ -20112,7 +20144,7 @@ self: {
      mkDerivation {
        pname = "analyze-client";
        version = "0.1.0.2";
-       sha256 = "12csrds628c3ff9giyc6q74jn1s2fbkdyagzbqcvnh3brnzsjvss";
+       sha256 = "5a6fa9bfcd6b40bb195eff29dfe67242072bc9c186f9f8927383216174cb9a89";
        libraryHaskellDepends = [
          base bytestring http-conduit MonadCatchIO-transformers mtl snap
          snap-core time
@@ -20129,7 +20161,7 @@ self: {
      mkDerivation {
        pname = "anansi";
        version = "0.4.8";
-       sha256 = "1fzrry9axri0wcff0zbxq0dbq0pxyq6x6bzw426xkm3ayzfd825a";
+       sha256 = "aa08d4dcf76ad4d98d20fc2fd30df6fd02bc1ac07d7de01ce320e6ae92cff9bb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -20152,7 +20184,7 @@ self: {
      mkDerivation {
        pname = "anansi-hscolour";
        version = "0.1.2";
-       sha256 = "0ffk44lacm3al96cmnacyi6pnhlzhw34jgn87fsfjcl516ffmfxw";
+       sha256 = "bcbbea9c098532e9b43bc83e4906879f427b4df44cd9ca4ca26a54a62821d339";
        libraryHaskellDepends = [
          anansi base bytestring containers hscolour monads-tf text
        ];
@@ -20168,7 +20200,7 @@ self: {
      mkDerivation {
        pname = "anansi-pandoc";
        version = "0.1.3";
-       sha256 = "13s370b35wmwvbp6a9afsbl62hswj4mdhnvcgigwjz6bcwxxxpxi";
+       sha256 = "b1dfde3b67cb7cc95f7c6c5bd82a915c4361e8d24e2565eedabcf2321638438f";
        libraryHaskellDepends = [
          anansi base bytestring containers monads-tf pandoc text
        ];
@@ -20187,7 +20219,7 @@ self: {
      mkDerivation {
        pname = "anatomy";
        version = "0.4";
-       sha256 = "0xza3xfzzbix9xf0vwwk4qz02h4iil3hglqspgdymhjbxfl68714";
+       sha256 = "241c64a8eb4bc2eadbbb1ad307078d9140013e2693f30d5c4f3daeff5d1fea77";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -20214,7 +20246,7 @@ self: {
      mkDerivation {
        pname = "android-lint-summary";
        version = "0.2.1";
-       sha256 = "1sk2mfxfbj6bbsff89jch1x7rhag2yv5331qhal50qf1q7fvzgx1";
+       sha256 = "a1bfbfddc1c16150a882388c51b6174fc17c7a804c26e49c5ecbc8e5baab62ea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -20243,7 +20275,7 @@ self: {
      mkDerivation {
        pname = "angel";
        version = "0.6.2";
-       sha256 = "0n73w8lczsncagf2041lq1963mnsmw9albwy0n5qbhqx9030pzya";
+       sha256 = "caff0b06481dc3858b059e2faa12afdad66152c0341020dc53cceacf28e2e358";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -20266,7 +20298,7 @@ self: {
      mkDerivation {
        pname = "animalcase";
        version = "0.1.0.2";
-       sha256 = "0csbs9yrl8vhlgs7zax06shqlhcjs38q91wnkz5d3f6a4588lyqi";
+       sha256 = "117b8a5021cab8d1ca9f968784d1d092418aa136a0ab7ff4a370239a7dd24b33";
        libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/ibotty/animalcase";
        description = "Convert camelCase to snake_case and vice versa";
@@ -20278,7 +20310,7 @@ self: {
      mkDerivation {
        pname = "annotated-wl-pprint";
        version = "0.6.0";
-       sha256 = "1rwjfw4fspyi564a847sb6k679sa6psajm2jybzpa1pvjq9z2a9x";
+       sha256 = "3d29f11396fb0675fff25254a9f4354aa763a659fa10a48829d15fed087792e7";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer, with annotation support";
@@ -20290,7 +20322,7 @@ self: {
      mkDerivation {
        pname = "anonymous-sums";
        version = "0.4.0.0";
-       sha256 = "0jb7s6m7dblnydrzh5nsczr0kpqwy9gr346pcrxsaywz2gfjcrhi";
+       sha256 = "116626dd139f7ba57b66d790915ff21cdf09f267da16f873f396ae76aad16749";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -20305,7 +20337,7 @@ self: {
      mkDerivation {
        pname = "anonymous-sums-tests";
        version = "0.4.0.0";
-       sha256 = "0a7f7d3xzn8nl9gyzr4wl7m83aszmw42nd0dj8b875khh7i01h0b";
+       sha256 = "0bc000e28170968316920d342b08af5fab81eaa19ce4ef5fa216d9df473bee28";
        libraryHaskellDepends = [ anonymous-sums base QuickCheck ];
        homepage = "http://www.github.com/massysett/anonymous-sums";
        description = "QuickCheck functions to accompany the anonymous-sums package";
@@ -20317,7 +20349,7 @@ self: {
      mkDerivation {
        pname = "ansi-terminal";
        version = "0.6.2.1";
-       sha256 = "1xmp8wpcyvqys777qpyfx99bhlnvmr7jil7r78j5n6fx3mkkhnln";
+       sha256 = "965a38671ddd195b243af9d0284faedb52b852eace5f7cced11e6fcf2e47b7f6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base unix ];
@@ -20332,7 +20364,7 @@ self: {
      mkDerivation {
        pname = "ansi-wl-pprint";
        version = "0.6.7.2";
-       sha256 = "0x0pv7hq4q2n103pzzxghmgzmd3b5cwpnmkdbpzry222890w8ph1";
+       sha256 = "015ec4414242089fff5d6d567b392b6bb4fa5f85afff7f0708566082e1d91774";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
@@ -20350,7 +20382,7 @@ self: {
      mkDerivation {
        pname = "antagonist";
        version = "0.1.0.29";
-       sha256 = "1dkrjn07445kmdq09fwdlnk676dvjzrzkgcfwni661lr5kbrj7p9";
+       sha256 = "e91e99d72c990663a2e58ebdf9f397bb9963a6a58dbb0470abb31072809579b6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -20373,7 +20405,7 @@ self: {
      mkDerivation {
        pname = "antfarm";
        version = "0.1.0.0";
-       sha256 = "1s2lfd7va0nq5z0q4f37ig2spjpxigfhkhi067fz4y0n1zjc1isd";
+       sha256 = "4dc7c0e40f1678f2dd3120c209dd8bfdcaabc58b673882c12fd802b54f7354e8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -20398,7 +20430,7 @@ self: {
      mkDerivation {
        pname = "anticiv";
        version = "0.1.0.5";
-       sha256 = "0sxxa2kylgagbnlf7msrgfq98jaf26lvlas6afypnr15aavvlfzh";
+       sha256 = "f03bbab75225647bbd53462bbaa9114e4994b07b59d7e3a85d4f3deaa750bd6b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -20423,7 +20455,7 @@ self: {
      mkDerivation {
        pname = "antigate";
        version = "2.0.1";
-       sha256 = "0vd2f4kq2zkngyqpnw3lcvjkn8335gs9rdfr7kb8442p8dhps139";
+       sha256 = "69047d6143571082d63cd9b59cf42b63203be56674707bb17f767e812771a26d";
        libraryHaskellDepends = [
          base bytestring data-default deepseq exceptions failure http-client
          http-conduit resourcet safe text transformers
@@ -20439,7 +20471,7 @@ self: {
      mkDerivation {
        pname = "antimirov";
        version = "0.1.0";
-       sha256 = "0aay5fhw2r502hvdlh6svj6k88zh5wjinn8mk2a3md7zdaiji9iq";
+       sha256 = "38a628a36affb43a949815591b252ff023348ddcda40da3614a064c1a12b5e29";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers QuickCheck ];
@@ -20454,7 +20486,7 @@ self: {
      mkDerivation {
        pname = "antiquoter";
        version = "0.1.1.0";
-       sha256 = "1qv5iid7az7bn1jf6r7ffg5qqbcs8ypf78j4vrs5ajwp39jnbiiy";
+       sha256 = "3ec665651a974b5574de44a2e3ae479a2d8ccb73ee64e364b0eb7c755a8c65e3";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Combinator library for quasi- and anti-quoting";
        license = stdenv.lib.licenses.bsd3;
@@ -20467,7 +20499,7 @@ self: {
      mkDerivation {
        pname = "antisplice";
        version = "0.17.1.0";
-       sha256 = "1f4872gmw1h2xl5jy9ajck5n4qmxdwk0f3v3bk1fxc9x8y5mscny";
+       sha256 = "de325d8b473db1eec25c630f07266fbd6262cb6452252f0bed02065e9f3888b8";
        libraryHaskellDepends = [
          base chatty chatty-utils haskeline mtl template-haskell text time
          transformers
@@ -20484,7 +20516,7 @@ self: {
      mkDerivation {
        pname = "antlrc";
        version = "0.0.2";
-       sha256 = "1hjk2cvn6j1ijvg3gnml46ysri672jnxmfyh09y1aqsrbimkw8gd";
+       sha256 = "ed213e6b5c5963157c02d0bbdaad14c7c4acbd21b4da37de96314863371353c2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base haskell98 ];
@@ -20504,7 +20536,7 @@ self: {
      mkDerivation {
        pname = "anydbm";
        version = "1.0.7";
-       sha256 = "1rxk36r6i065m0qiq4g5xlrk2yjsds7j896cbddbsyddbzy10d6k";
+       sha256 = "d33410fc5fad79bd5a5bcc24248f6e5a7a3133ede5111c31a8c58068b219b3e7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl ];
@@ -20523,7 +20555,7 @@ self: {
      mkDerivation {
        pname = "aosd";
        version = "0.2.1";
-       sha256 = "0zma3ypjnqn8c9pk4zfyzzwn27l3wb6l6xnjjydn90fxsmpa1vh6";
+       sha256 = "06eea06ed5dd81649b97d27643cde2831e61f9ffde7d326f62c8622baf1faa7e";
        libraryHaskellDepends = [
          base bindings-DSL cairo colour monad-control pango transformers X11
        ];
@@ -20541,7 +20573,7 @@ self: {
      mkDerivation {
        pname = "ap-reflect";
        version = "0.2";
-       sha256 = "1ih0in9j26v96pjqr1wbjxl881xb2xsrcvhmn50wbv4iwxv7y222";
+       sha256 = "42087f76e791ecc541b1156e967517ab078468978b878ce535691b21938d00c6";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/cmc-msu-ai/ap-reflect";
        description = "Partial evaluation reflection a la simple-reflect";
@@ -20556,7 +20588,7 @@ self: {
      mkDerivation {
        pname = "apache-md5";
        version = "0.6.1.4";
-       sha256 = "1dwnn200sjp2pvriii3y4srrms0gyicd6qp6kvc74yyad8pqhky8";
+       sha256 = "c84f882f6aca7b72d89ee662d358f40fe89ab3267ec418f3bee24a0d80b096b7";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [
@@ -20577,7 +20609,7 @@ self: {
      mkDerivation {
        pname = "apelsin";
        version = "1.2.3";
-       sha256 = "08a747p0dyjvgn5pjfvrb1hnh7vk2km8hbbyvjmnsxl89r5m992l";
+       sha256 = "54a4544b4e88766dabdc7e2d88ea14731f686158793b798b7d5bfa06ee214721";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -20599,7 +20631,7 @@ self: {
      mkDerivation {
        pname = "api-builder";
        version = "0.10.0.0";
-       sha256 = "0pzbp0grmnrc48h1cbsxsxzyjgnxzmf4d6cfi53ccq0v3yfybw9v";
+       sha256 = "3bf1e59d1f1b60c646898e99465cfddd3ee97fd75d2f1620222cdb9a1fb8eb5f";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring HTTP http-client http-client-tls
          http-types text transformers
@@ -20608,6 +20640,7 @@ self: {
          aeson base bytestring Cabal containers hspec http-conduit text
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/intolerable/api-builder";
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -20618,7 +20651,7 @@ self: {
      mkDerivation {
        pname = "api-opentheory-unicode";
        version = "1.2";
-       sha256 = "1mzbkrbdwcxr83bprk3gjrrg6sarl0vwv729xs8x5d1rfdiqlm88";
+       sha256 = "08558a637339b4d291ee499ccd37a05969f372966fcc7cd740b933de569eebd7";
        libraryHaskellDepends = [ base bytestring opentheory-unicode ];
        testHaskellDepends = [
          base bytestring directory opentheory-unicode
@@ -20638,7 +20671,7 @@ self: {
      mkDerivation {
        pname = "api-tools";
        version = "0.5.2";
-       sha256 = "0pd2kaii40isbnc1rgh0zkm2abrljipmq27nlgz3zbldbm1l5xw6";
+       sha256 = "86f742435d8dae3ffea3f6085c6f94342f25eafc00be1c985d3a0212a39aa25d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -20680,7 +20713,7 @@ self: {
      mkDerivation {
        pname = "apiary";
        version = "1.4.3";
-       sha256 = "1z6fgdkn3k4sbwk5jyz6yp9qwllhv2m9vq7z25fhmj41y3spgcsc";
+       sha256 = "4cb377f5f081c80a5d11ffe09daad890528ed3f5e67b59265f9acc61677bcefc";
        revision = "1";
        editedCabalFile = "024867d05ec04c0b83c41e948b80c56686cc170beed600daffa8d8c725e50a32";
        libraryHaskellDepends = [
@@ -20709,7 +20742,7 @@ self: {
      mkDerivation {
        pname = "apiary-authenticate";
        version = "1.4.0";
-       sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0";
+       sha256 = "40dbdb0d6799ba7091ae9b72929c7d62a74dd251b5a6e01f8979314d75dbd107";
        revision = "1";
        editedCabalFile = "724a8cbf0f2e57cd497b54de4401acda2877437053f13164dd23ba7b6c7d119b";
        libraryHaskellDepends = [
@@ -20730,7 +20763,7 @@ self: {
      mkDerivation {
        pname = "apiary-clientsession";
        version = "1.4.0";
-       sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6";
+       sha256 = "a6bba1337d2ee7ded7303f2801b09b9d93cdafb93f5115328c797bef3e6126fd";
        revision = "1";
        editedCabalFile = "ac724d51a8bd867838bccb788a0db76f97cfe19b052d1247e38ba001561e4bfd";
        libraryHaskellDepends = [
@@ -20749,7 +20782,7 @@ self: {
      mkDerivation {
        pname = "apiary-cookie";
        version = "1.4.0";
-       sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx";
+       sha256 = "3dcf4cf38377685340ec5c6ab105a0df3ba2b0a4d0d7079fc88593bd15eeeb04";
        revision = "2";
        editedCabalFile = "4edecbd2a1e6fb740815be85cc9c4836144338af88e6774348a1703e861a9771";
        libraryHaskellDepends = [
@@ -20766,7 +20799,7 @@ self: {
      mkDerivation {
        pname = "apiary-eventsource";
        version = "1.4.0";
-       sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7";
+       sha256 = "a7c9f566fea8501864ac194d744dfe94c0ee04d174ccb51161c4a64243bd0176";
        revision = "1";
        editedCabalFile = "368e1b555b07ff026b4753cab0364d0f70a4e2536166f756bde35f8ce9fb9ae6";
        libraryHaskellDepends = [ apiary base blaze-builder wai-extra ];
@@ -20783,7 +20816,7 @@ self: {
      mkDerivation {
        pname = "apiary-helics";
        version = "1.4.0";
-       sha256 = "1qm9fnhzafdja6fr20c7qhl6dmagmnzn23ni49ln5k55kbawfk8a";
+       sha256 = "0a4dc7d59aa5cc626922d10e61bfad4fd56628c48701919d51b239f5a175a9e2";
        revision = "1";
        editedCabalFile = "80ce4b1a9dd5c7a30099392219d0077b9281b9ceeabbb01843f12754df0b0827";
        libraryHaskellDepends = [
@@ -20804,7 +20837,7 @@ self: {
      mkDerivation {
        pname = "apiary-logger";
        version = "1.4.0";
-       sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48";
+       sha256 = "884cf856a25685db351f76ab2df43126456cfe4c1a8640b72ac055623518c05d";
        revision = "3";
        editedCabalFile = "03f6b1ac0e588631c2deed8459e527f935a74a86c15455c3f509270ba5bbd5f7";
        libraryHaskellDepends = [
@@ -20824,7 +20857,7 @@ self: {
      mkDerivation {
        pname = "apiary-memcached";
        version = "1.4.0";
-       sha256 = "1rwkj7byc84yism5sxphs1s231910ay8w7lap2cdg0y9k9f24gby";
+       sha256 = "7e3d225c9ac983d798b88a1e8ebc0221852174d0f0765daa8e9e20e6d79193e7";
        revision = "1";
        editedCabalFile = "7a332392add31b3f5ef9fcc2e69069de3a23bdbfdcfeececc47d2832ec767c29";
        libraryHaskellDepends = [
@@ -20844,7 +20877,7 @@ self: {
      mkDerivation {
        pname = "apiary-mongoDB";
        version = "1.4.0";
-       sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd";
+       sha256 = "8d97a32e5d55334d1a4f5d318d6a590a74c0b8ad6c84877956728318b89f36eb";
        revision = "1";
        editedCabalFile = "e2578f19108129ed47946fa7369c86203610d5b447a6a7a8f1af5f2537d55a4b";
        libraryHaskellDepends = [
@@ -20864,7 +20897,7 @@ self: {
      mkDerivation {
        pname = "apiary-persistent";
        version = "1.4.0";
-       sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9";
+       sha256 = "09c6c5730d6ad65b544e994f2d73f5412aae92aac093fd308234c8bea68f4a02";
        revision = "2";
        editedCabalFile = "7f1c18de1d41b15397df81d9a3377e109cc07f6efc07390584e0e2952d34e889";
        libraryHaskellDepends = [
@@ -20885,7 +20918,7 @@ self: {
      mkDerivation {
        pname = "apiary-purescript";
        version = "1.4.0";
-       sha256 = "0z1d2wqpa86bv6xkpiw696sn77fdq52vk2s8951v8qdffbxia3jz";
+       sha256 = "5f0e15fb72ae61b44349488bb945c1cd9d63b54986c73bbbd9cb207531172d7c";
        revision = "1";
        editedCabalFile = "9f716a5d9173c31c6472a4bf7decc34523bdc761540d440f5d0ad4f9521bf98c";
        libraryHaskellDepends = [
@@ -20904,7 +20937,7 @@ self: {
      mkDerivation {
        pname = "apiary-session";
        version = "1.4.0";
-       sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23";
+       sha256 = "434cd8b985a95bd4c72dde7ac521768d1c1402f3cc8b4835dded6736bdbcd74a";
        revision = "1";
        editedCabalFile = "8e4a0b590972ea4e1ab1252696b7339038c4d7206ae44d1f1397a67cdde077dd";
        libraryHaskellDepends = [
@@ -20922,7 +20955,7 @@ self: {
      mkDerivation {
        pname = "apiary-websockets";
        version = "1.4.0";
-       sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1";
+       sha256 = "e15e7e9281b72d9fa2419c1d3dbbf0c11e08dc139fe0d0242a5612a181ff545b";
        revision = "1";
        editedCabalFile = "5162825445fc14b48d11a0a1f63d67e8d66a8c5aaeaf1e117a1f2302474d7581";
        libraryHaskellDepends = [
@@ -20942,7 +20975,7 @@ self: {
      mkDerivation {
        pname = "apis";
        version = "0.0.1";
-       sha256 = "07jvx1bsfiqk9l4l9k9yrsmvqm7dc2lb6p7h8p2bzqc3dqcqp67q";
+       sha256 = "f8988b196e83e1bfc445f05cb3a860ed54bcabce3ecd44094d1347a757e85b1e";
        libraryHaskellDepends = [
          aeson base containers deepseq directory ecma262 exceptions
          filemanip filepath hslogger hxt mtl opendatatable split
@@ -20966,7 +20999,7 @@ self: {
      mkDerivation {
        pname = "apotiki";
        version = "0.5.2";
-       sha256 = "1rih1lasky5sjdf3lz2qi2qya3iwbbxs658p77h1amqpsa7lsfp7";
+       sha256 = "e73a4d8fd2175715e0391715a3fb5a3c0ee5b188587c3a5c93baf8a9150d30e6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -20993,7 +21026,7 @@ self: {
      mkDerivation {
        pname = "app-lens";
        version = "0.1.0.0";
-       sha256 = "0gizjnc7x1ggryfrm4d87xiyjz9yw6c5y3zp23x40bgmw49zl318";
+       sha256 = "280cfa13e1f52d40fa10f70f5f98e13e7de9633fa8919a9dcfef857e98953f3e";
        revision = "2";
        editedCabalFile = "29d9e8cabf54f27b1ccf007530fe698c0895c0bb6a2a6da50b71fafd4c27bd6d";
        libraryHaskellDepends = [ base containers lens mtl ];
@@ -21011,7 +21044,7 @@ self: {
      mkDerivation {
        pname = "app-settings";
        version = "0.2.0.5";
-       sha256 = "17918i7k1wagmqxvkhww69w8ffybshfm6y1dd9iyg9x45qdrvr6k";
+       sha256 = "d3e49d1b2ea4a7e7636a2d78531dd4cb3b8778329cc3b93bae4ff1304f44219d";
        libraryHaskellDepends = [
          base containers directory mtl parsec text
        ];
@@ -21029,7 +21062,7 @@ self: {
      mkDerivation {
        pname = "appar";
        version = "0.1.4";
-       sha256 = "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq";
+       sha256 = "58ea66abe4dd502d2fc01eecdb0828d5e214704a3c1b33b1f8b33974644c4b26";
        libraryHaskellDepends = [ base bytestring ];
        description = "A simple applicative parser";
        license = stdenv.lib.licenses.bsd3;
@@ -21043,7 +21076,7 @@ self: {
      mkDerivation {
        pname = "appc";
        version = "0.0.6";
-       sha256 = "0qns7kjp9sjrpdx6vfkci9q6xinb0gwkb1a9ssw8xfbqqhf9ljms";
+       sha256 = "ba4a9a1cc478b98eb8d6498535f903cbc66e708a6cba6d7abb59ea74e53cda62";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21066,7 +21099,7 @@ self: {
      mkDerivation {
        pname = "applicative-extras";
        version = "0.1.8";
-       sha256 = "1svsf8mvb816nksg1dh4dz3cms2zx2hjprz2z7h3zidpxmzs0pr8";
+       sha256 = "285fa07fedb7c53fe0f9e2e72ba1e85fe8cac66f04b6f0f4b426a0b52b727aeb";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/chriseidhof/applicative-extras/";
        description = "Instances for Applicative";
@@ -21080,7 +21113,7 @@ self: {
      mkDerivation {
        pname = "applicative-fail";
        version = "1.1.1";
-       sha256 = "11bk0svzdys8rgx6nzb80fkxz8mp6r0238ylmb5wzsnl8nc9y041";
+       sha256 = "81009f9845d4eacfcbaad4a3214036b7a2dfa703687d6bfacb48fbf6b7067385";
        libraryHaskellDepends = [
          base bifunctors dlist mtl transformers transformers-base
        ];
@@ -21097,7 +21130,7 @@ self: {
      mkDerivation {
        pname = "applicative-numbers";
        version = "0.1.3";
-       sha256 = "0rnjl7yz6nga4qi0jdvhf911yf1qk6gy2fm5236bsgc50d5wbaw0";
+       sha256 = "80abc54b03853dbdcc10a53ae19f9938381f42727037092226ea59f3fda1d266";
        libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/applicative-numbers";
        description = "Applicative-based numeric instances";
@@ -21111,7 +21144,7 @@ self: {
      mkDerivation {
        pname = "applicative-parsec";
        version = "0.1.0.0";
-       sha256 = "12y2j9lpaqpjcr2a9fk4anlvc1cw5rimyx031b6xa5dx500phrrx";
+       sha256 = "3d67780128bd15d5cd0a03745f632e9c05b6a95564baa44466f262756992c28b";
        libraryHaskellDepends = [ base containers lens mtl text ];
        testHaskellDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
@@ -21127,7 +21160,7 @@ self: {
      mkDerivation {
        pname = "applicative-quoters";
        version = "0.1.0.8";
-       sha256 = "10m29d0938khjdazsmsvvncr5xndnpzpm1b7ymzb3b4b81xmcpgl";
+       sha256 = "f45d567b408bacb17ef567857affb5cdf69299dd5b57fd559370a291404ba282";
        libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
        description = "Quasiquoters for idiom brackets and an applicative do-notation";
        license = stdenv.lib.licenses.bsd3;
@@ -21143,7 +21176,7 @@ self: {
      mkDerivation {
        pname = "approx-rand-test";
        version = "0.2.1";
-       sha256 = "17aww5sffw07wk8hlyf0qv26v0jkr5qzv45wxk4zhhyb453b9m41";
+       sha256 = "81d4b44621cb43f8c9ecbc90fd71c953826dc4c6c0790ad1e40770e774e15c9d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21175,7 +21208,7 @@ self: {
      mkDerivation {
        pname = "approximate";
        version = "0.2.2.1";
-       sha256 = "1h09257l7rfy64fiwr4d1jyq6vcfhly3hrn314rkfp6rkzxpvh79";
+       sha256 = "e9c07dfb9fd95c373309c366383c858e6d83bd0c8d641e1d31dee5434f1109c0";
        libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq ghc-prim hashable
          hashable-extras lens log-domain pointed safecopy semigroupoids
@@ -21194,7 +21227,7 @@ self: {
      mkDerivation {
        pname = "approximate-equality";
        version = "1.1.0.2";
-       sha256 = "0pxvyb5a6vh0isba81flv7wjlwfn091xrma7g6wzr08bvqmix883";
+       sha256 = "03a11e2bde0b81fcb97947d5dc4302d6712af9d9d405a4968e006ea3caf2bb5f";
        libraryHaskellDepends = [ base type-level-natural-number ];
        homepage = "http://github.com/gcross/approximate-equality";
        description = "Newtype wrappers for approximate equality";
@@ -21206,7 +21239,7 @@ self: {
      mkDerivation {
        pname = "ar-timestamp-wiper";
        version = "0.1.0";
-       sha256 = "1gk1z0dw7i0c3wql1zh8iri6573falmiz31s0widfz7dav45vkrz";
+       sha256 = "3fcf5dc856ed7cd722073a8c1f2b556e9c62628e08fe40311f0cc4c31bf861be";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -21224,7 +21257,7 @@ self: {
      mkDerivation {
        pname = "arb-fft";
        version = "0.2.0.2";
-       sha256 = "1yxhafzv71xx2gva4b9slr26iqs6p1lh578x1774bv07ifqys6dp";
+       sha256 = "b719edb18b07ec45ce091d9d0269b846e36844a63a2da2f613bd87b3bf53b0fb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21249,7 +21282,7 @@ self: {
      mkDerivation {
        pname = "arbb-vm";
        version = "0.1.1.20";
-       sha256 = "0k31ardnlg925vcrrl4n9w09867dbr68sdnc3bhs9xz1r9cdlkv8";
+       sha256 = "684fda58cae1f7a4e11acc368d4c5eed1894004f96d09cd92e223d6a5b56614c";
        libraryHaskellDepends = [
          base bytestring cereal containers directory mtl pretty
        ];
@@ -21270,7 +21303,7 @@ self: {
      mkDerivation {
        pname = "arbtt";
        version = "0.9.0.4";
-       sha256 = "02qz7qsk1kjavsdl8mq56blxzzjnnjlnyjvjnyfamq7j0rqzdq5v";
+       sha256 = "bbe0f67106f2e0aa9cb7724b6fa9b456fedfe9320557449bde4ace30353e1f0b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -21298,7 +21331,7 @@ self: {
      mkDerivation {
        pname = "archive";
        version = "1.2.12";
-       sha256 = "0rdgrdmmsn4qijbbprw4dbppb5klgn9lw3fyizzcd79gsgz4s61r";
+       sha256 = "39184dfed32f9dc6fe8fde0d4e937d749675ef6a84e7bb968c98585d6bcbaf65";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21319,7 +21352,7 @@ self: {
      mkDerivation {
        pname = "archiver";
        version = "0.6.2.1";
-       sha256 = "19gvja890lhn9zr2aqjshwq5qqb95nynxrsw5wk4z2a417xj70j2";
+       sha256 = "428223fb0944894f262f5ce76ebd2d69615c30875a6225f24f1652909092fba5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base curl HTTP network ];
@@ -21338,7 +21371,7 @@ self: {
      mkDerivation {
        pname = "archlinux";
        version = "1.3";
-       sha256 = "051pgn39f8xq80qf8g04j162n6zysvcdbj8a8m05x6vi6mbr9jx2";
+       sha256 = "a2cb945735719b5e40450ac9d5d8d6fe1b2b4c90043ce43040b82397867d3714";
        libraryHaskellDepends = [
          base Cabal containers directory filepath pretty
        ];
@@ -21356,7 +21389,7 @@ self: {
      mkDerivation {
        pname = "archlinux-web";
        version = "0.1";
-       sha256 = "1rzjkxxmf24hrmlc70s416akn6rbcly7152ly618dxgigvqnir48";
+       sha256 = "88e468f17ef1f58682f15494703c652b1b3b95094483c368cd9008577b9ff2e7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21380,7 +21413,7 @@ self: {
      mkDerivation {
        pname = "archnews";
        version = "0.2";
-       sha256 = "1v7b6w2cqfy69kvsr09a1qv4zyz78khygmd9l9hqjlmj7w3x8gys";
+       sha256 = "da3fd4073fb2528961a2a9d5e7e144e7fb4f360e2a81acf74cc63bcc0437ebec";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -21398,7 +21431,7 @@ self: {
      mkDerivation {
        pname = "arff";
        version = "0.1.0";
-       sha256 = "1mwak4kl4ksg5vqya9abz02v0zgj6lbi6bzq2bd8jpnncazsxha5";
+       sha256 = "45c1aebf62d65e89da12f82f131735f27db005f84b25e5f12e4f4f4227998ad7";
        libraryHaskellDepends = [
          base binary bytestring bytestring-lexing bytestring-show old-locale
          time
@@ -21415,7 +21448,7 @@ self: {
      mkDerivation {
        pname = "argparser";
        version = "0.3.4";
-       sha256 = "0ypdj4mcm4yk5pswzwi9jk2w25f6qhiari8gam72za6ihyjwfig6";
+       sha256 = "e645c7a587d1a82f4e550fc5ac22c4c615c1c59429f2cff52dd393ca2a91ed7a";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers HTF HUnit ];
        description = "Command line parsing framework for console applications";
@@ -21430,7 +21463,7 @@ self: {
      mkDerivation {
        pname = "arguedit";
        version = "0.1.0.1";
-       sha256 = "17s6m9mjai439j8g0cd5pr2zb0224h1ckik9fg0rbd06zgxvfmq6";
+       sha256 = "0657b7fbfb06b495c17369c6c902244280f545bea531f0904c8344256baa469f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -21452,7 +21485,7 @@ self: {
      mkDerivation {
        pname = "ariadne";
        version = "0.1.2.3";
-       sha256 = "02hyn3y4h7w4l5k48kp73al67lp8vzlymblb7al72w14r01ww8p3";
+       sha256 = "e322ce03c8247071a83a8baeeae9dfe8d263a81ae74e4466a1841f48fcb01e0a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -21479,7 +21512,7 @@ self: {
      mkDerivation {
        pname = "arion";
        version = "0.1.0.8";
-       sha256 = "107rbbzmqg0zrgv3qb0pr8svmzh25a63dm0kn0hhyirkjzdyjgqw";
+       sha256 = "1c3fe9db9733470f21b013d4368c2a02feba35ca172c3cf6cb1f3c5cff5af980";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -21503,7 +21536,7 @@ self: {
      mkDerivation {
        pname = "arith-encode";
        version = "1.0.0";
-       sha256 = "1wqm2jcc2dac31gvad6pmnq0wbajpj488h93xl93vfipsbak0cm8";
+       sha256 = "a83230d5d237ba3d12ed23418488bc522d0eb0add734b55f184c35c1981415f3";
        libraryHaskellDepends = [
          arithmoi array base binary Cabal containers fgl hashable
          unordered-containers
@@ -21522,12 +21555,38 @@ self: {
      mkDerivation {
        pname = "arithmatic";
        version = "0.1.0.1";
-       sha256 = "1qa1yqi67l1cd3ggb67h9iji9ps3ma43fcddv0vmc1hin61xnzj8";
+       sha256 = "487edb83b111065637d8ad313788aa43df14654cf098f5de682cd06322f641e1";
        libraryHaskellDepends = [ base ];
        description = "Basic arithmatic in haskell";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "arithmetic" = callPackage
+    ({ mkDerivation, base, opentheory, opentheory-bits
+     , opentheory-divides, opentheory-primitive, QuickCheck, random
+     }:
+     mkDerivation {
+       pname = "arithmetic";
+       version = "1.0";
+       sha256 = "1af6acf13de40f36d95b8d34e3ba47be559f32dd0f00f1f161b2aa0536b6d5a0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base opentheory opentheory-bits opentheory-divides
+         opentheory-primitive QuickCheck random
+       ];
+       executableHaskellDepends = [
+         base opentheory opentheory-bits opentheory-divides
+         opentheory-primitive QuickCheck random
+       ];
+       testHaskellDepends = [
+         base opentheory opentheory-bits opentheory-divides
+         opentheory-primitive QuickCheck random
+       ];
+       description = "Natural number arithmetic";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "arithmoi" = callPackage
     ({ mkDerivation, array, base, containers, ghc-prim, hspec
      , integer-gmp, mtl, random
@@ -21535,7 +21594,7 @@ self: {
      mkDerivation {
        pname = "arithmoi";
        version = "0.4.1.3";
-       sha256 = "1j8k0hqg5ddglw9lpbp3qg81s1g01sil1grizlrqfgwx0wj3jqif";
+       sha256 = "2e623924079d3f8733fd31bf40a30ee0051dd0c3e3ae4b13a7afb5f2300413c9";
        configureFlags = [ "-f-llvm" ];
        libraryHaskellDepends = [
          array base containers ghc-prim integer-gmp mtl random
@@ -21551,7 +21610,7 @@ self: {
      mkDerivation {
        pname = "armada";
        version = "0.1";
-       sha256 = "18ym9cs0mr4pr6pdgyk14rrwsxh1fa0xvqz3jg60lnxbgjlynvc1";
+       sha256 = "816deba97cab5b0acc93e3e3dd81720176cd732661fad7aec997e40a344bd5a3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT mtl OpenGL stm ];
@@ -21565,7 +21624,7 @@ self: {
      mkDerivation {
        pname = "arpa";
        version = "0.0.0.0";
-       sha256 = "13n878vafx1igw3q3v1c676iaidyqa4wk6z727vh7dagkkyl7653";
+       sha256 = "a39843fd9c4fb503f711e79bc989c2be4515cd312cec81077f3174a7363ac88e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -21581,7 +21640,7 @@ self: {
      mkDerivation {
        pname = "array";
        version = "0.5.1.0";
-       sha256 = "18hz1jcshdj6c10lsxq86rs6rbx77g91w4ay2s58h9j5rnkchjxq";
+       sha256 = "b84bc8a6cd4526888a165e111ed23ba7af6c743608774d41604636a8990c1fa2";
        libraryHaskellDepends = [ base ];
        description = "Mutable and immutable arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -21596,7 +21655,7 @@ self: {
      mkDerivation {
        pname = "array-forth";
        version = "0.2.1.4";
-       sha256 = "03kjkpygi9jc8vrvnw9i8zwbfaihsl50bi39j0liclja442j9h5m";
+       sha256 = "b5c02405214a5216299069c4050ad5302ab7f8473171bbf3464ca6f8fc9d720e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21619,7 +21678,7 @@ self: {
      mkDerivation {
        pname = "array-memoize";
        version = "0.6.0";
-       sha256 = "1p05vg8mdyad03aa7s1nrgw5xqgl80f6l7v0llhmi1q4xnrqrj3n";
+       sha256 = "76c88cb3ed04875821a5601f6a1c40f4e15ef8cb36e8a3d4004df956d1db05dc";
        libraryHaskellDepends = [ array base ];
        description = "Memoization combinators using arrays for finite sub-domains of functions";
        license = stdenv.lib.licenses.bsd3;
@@ -21630,7 +21689,7 @@ self: {
      mkDerivation {
        pname = "array-primops";
        version = "0.1.0.0";
-       sha256 = "11qwgs06ivfjhcjhihchg46hvpcrwmc7zz36630v9qyy2611q66x";
+       sha256 = "dd181c8211dee3b4c13066fc7f58e599dd0d0d7990c1082583d2ed68807e1c87";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Extra foreign primops for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -21641,7 +21700,7 @@ self: {
      mkDerivation {
        pname = "array-utils";
        version = "0.3";
-       sha256 = "1gh7gmbm0djr78dqkf8q3ap9yk4gm3dq48k8jad9ssp3w19wpkan";
+       sha256 = "56cdcb53e0e36a9d9a92682282dba88f4c9fae1a18b9891b3a593650577d07be";
        libraryHaskellDepends = [ array base ];
        description = "Primitive functions for updating many elements in mutable arrays at once";
        license = stdenv.lib.licenses.bsd3;
@@ -21653,7 +21712,7 @@ self: {
      mkDerivation {
        pname = "arrow-improve";
        version = "0.1.0.0";
-       sha256 = "0ppl8v746lj41aqb0k2724vm4n32jxmz723qa0j860jvhkh2nww7";
+       sha256 = "87732be0845b028324507888f36b976258523711474cb0b00a445243ce46f45e";
        libraryHaskellDepends = [
          arrows base pointed profunctors semigroupoids
        ];
@@ -21669,7 +21728,7 @@ self: {
      mkDerivation {
        pname = "arrow-list";
        version = "0.7";
-       sha256 = "1n6m77hdkpjd12r0b8fwxiz3jz0j86cplgsk27m2raj86vr3dy1k";
+       sha256 = "33f836f23648aa2cea11533f7a9941127c397eecdca105b2084dded9e039d5d8";
        libraryHaskellDepends = [ base containers mtl ];
        homepage = "https://github.com/silkapp/arrow-list";
        description = "List arrows for Haskell";
@@ -21681,7 +21740,7 @@ self: {
      mkDerivation {
        pname = "arrowapply-utils";
        version = "0.2";
-       sha256 = "02zampc6cc5a9fvdvxkz2r6i5sxf5w0qilsvsx8jxiw4kprbghii";
+       sha256 = "31c2b7f29d84c72e51d75bd388012faeeb124d167ff6ddb64baa3066d8adea0b";
        libraryHaskellDepends = [ base ];
        description = "Utilities for working with ArrowApply instances more naturally";
        license = stdenv.lib.licenses.bsd3;
@@ -21693,7 +21752,7 @@ self: {
      mkDerivation {
        pname = "arrowp";
        version = "0.5.0.2";
-       sha256 = "0a0ss5q8ximbd6hr0agy1106jfvdm8cx50q7a9yaiqfxs20fy6lx";
+       sha256 = "9d1aef80d0dde1a87c520783d219aa6d3b694008fe2990a169abc68e70d11a28";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers haskell-src ];
@@ -21708,7 +21767,7 @@ self: {
      mkDerivation {
        pname = "arrows";
        version = "0.4.4.1";
-       sha256 = "1qpbpwsc3frjdngwjv3r58nfa0ik88cqh24ls47svigsz3c4n42v";
+       sha256 = "5b104bd8f8fac5ad0fd194088819423302e52c2a796cc99f6d32bbc134bfebe2";
        libraryHaskellDepends = [ base Stream ];
        homepage = "http://www.haskell.org/arrows/";
        description = "Arrow classes and transformers";
@@ -21720,7 +21779,7 @@ self: {
      mkDerivation {
        pname = "artery";
        version = "0.1.1";
-       sha256 = "1fs8jap2ndcj21qgpkzy9nbnabvp4ac0xm0vdwkjjdf7i4j5kaqr";
+       sha256 = "19ab592489c73529276f1bd40e9822772f65974dfecffb701092352bae9248bb";
        libraryHaskellDepends = [
          base containers profunctors transformers
        ];
@@ -21738,7 +21797,7 @@ self: {
      mkDerivation {
        pname = "arx";
        version = "0.2.1";
-       sha256 = "0w29sdzhc54jjl7d0f3irq2s0kisd66amf0li0h9x7r00j72lvwx";
+       sha256 = "9d6f2a8e04209f9e208814b8aa8c693a4ea005ce7138d00e959214067fd34970";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21760,7 +21819,7 @@ self: {
      mkDerivation {
        pname = "arxiv";
        version = "0.0.1";
-       sha256 = "1has8v40h8w4v393pgd4qk4fzgdw02y12zk2hspkic1q5bx33dxh";
+       sha256 = "b0b731fa2a38b038af86627e11bc00bcbdefc8c4a4bd3bd2d8842308c8465ac1";
        revision = "1";
        editedCabalFile = "746311e6003440248df63acd19e428cbdbf5c95cdd3ee0993d2c89c7b2ceada7";
        libraryHaskellDepends = [ base parsec split tagsoup ];
@@ -21774,7 +21833,7 @@ self: {
      mkDerivation {
        pname = "ascetic";
        version = "0.0.0.4";
-       sha256 = "1c5ip8q9b6xnvh3li03iilmqz33rrlis78zs0lh4jva67b37akqk";
+       sha256 = "134f75c63a466d492005faa3a323cd798c8f2b8d71804807dcb69b9530bab1b0";
        libraryHaskellDepends = [ base MissingH ];
        description = "Generic markup builder";
        license = stdenv.lib.licenses.mit;
@@ -21787,7 +21846,7 @@ self: {
      mkDerivation {
        pname = "ascii";
        version = "0.0.4.1";
-       sha256 = "1xpw2n3gskndg74ilrq8zngawlvc3mbsji3nx2aprar96hdlpvpv";
+       sha256 = "fbee4b1b3429ab7c95e87644a9571d6c53ae9efd08671ac979cd4efd8615fcf6";
        libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive hashable text
        ];
@@ -21805,7 +21864,7 @@ self: {
      mkDerivation {
        pname = "ascii-progress";
        version = "0.2.1.2";
-       sha256 = "0lnxph4zdhkhp2w4rvx85xdwy8lnnm81apvkrddbwfr405j4nf1w";
+       sha256 = "3c384b6401243bbe5acb735f1550b59622cf5b2fa8ef4cb8b870c2f609bcdd52";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21830,7 +21889,7 @@ self: {
      mkDerivation {
        pname = "ascii-vector-avc";
        version = "0.1.0.0";
-       sha256 = "09m7wcq207glaz3s824vakj42vdaxc334y5k9lsh095v2xp7pwz4";
+       sha256 = "e4f37b6e17bb2400354db3783206ebaa6d41e4549b08a4c757f41d2030e3a726";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21851,7 +21910,7 @@ self: {
      mkDerivation {
        pname = "ascii85-conduit";
        version = "0.1.0.0";
-       sha256 = "191qw61y3jrbwzv7nabvxr6dxxigyxflbw49f0q637psqzdblsl5";
+       sha256 = "856abadac7fa9e61307089f0455df72ff6de4cee7b297bf6e72bcbe183e138a4";
        libraryHaskellDepends = [ base bytestring conduit ];
        testHaskellDepends = [ base bytestring conduit hspec ];
        jailbreak = true;
@@ -21868,7 +21927,7 @@ self: {
      mkDerivation {
        pname = "asciidiagram";
        version = "1.1.1.1";
-       sha256 = "0nzg4m1nd41x6fyki5qva5jj80sl7jd1z1gd674v50zchkw71a9m";
+       sha256 = "35a970f884ec83b2c931ed851f9a3c54032465511b9738bd333d90664325ef5b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21888,7 +21947,7 @@ self: {
      mkDerivation {
        pname = "asic";
        version = "1.2";
-       sha256 = "0w7pkfd0i46a6x2ivk659rx56v9nkjvlvnmiafy96y1cbfzkyffg";
+       sha256 = "cf393fbf5b2c7893bc53b1da4db79c366d537a4ec5cc1d4537ca90089a9bf770";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ asil base bytestring utf8-string ];
@@ -21906,7 +21965,7 @@ self: {
      mkDerivation {
        pname = "asil";
        version = "1.2";
-       sha256 = "1zprddksk91wfyl1597cdgdy2r46d7vxjfxxi80rhxbfkshs4qwx";
+       sha256 = "9d63a2a19e6e7598018abd3bd9f7698664e1db6beca412a8773ca4a9676bf9fe";
        libraryHaskellDepends = [
          array base binary bytestring containers data-binary-ieee754
          directory filepath haskell-src-exts mtl pretty utf8-string uuagc
@@ -21923,7 +21982,7 @@ self: {
      mkDerivation {
        pname = "asn1-data";
        version = "0.7.1";
-       sha256 = "10s7mxygw6w8a8mx090msvbl8pji8m68lsxxyr5bp7p887naia7r";
+       sha256 = "f9a8a8ec41e89ebb4af6bd6b8a4c45515e44d7d61524d02b52881bfe7caf4783";
        revision = "1";
        editedCabalFile = "6c8f01076a88b9ea0f2ce9b5fa2b09dc658332bd4dedfbc8d6e7fae25ea5ed1f";
        isLibrary = true;
@@ -21943,7 +22002,7 @@ self: {
      mkDerivation {
        pname = "asn1-encoding";
        version = "0.9.0";
-       sha256 = "02x3lzyl4gavl3lc2lrg8rknyvs6r2hf8kmm7xrmma5m857iks8p";
+       sha256 = "17e9194f41b5a85a733fb54ee4a0c8466f6f67462f53c1e8a05b3d42fda7a30b";
        libraryHaskellDepends = [
          asn1-types base bytestring hourglass mtl
        ];
@@ -21962,7 +22021,7 @@ self: {
      mkDerivation {
        pname = "asn1-parse";
        version = "0.9.1";
-       sha256 = "1pik647wjj1mpk2vj74kjdiblqmkk5s8yxf987maa9bjm2x8g071";
+       sha256 = "e18087baa87225a5ea41c9758f7499b362ba6293931cb9c5bc3548c90f3133de";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base bytestring mtl
        ];
@@ -21976,7 +22035,7 @@ self: {
      mkDerivation {
        pname = "asn1-types";
        version = "0.3.0";
-       sha256 = "1am8nmfarv7ymy3rqm0js2i82v6n6qwz0lnzb1qdmy4ligcdm65r";
+       sha256 = "b998dad88b94f8da7058df52f03936d66c81a2d012549c87affeecac5cb5a8aa";
        libraryHaskellDepends = [ base bytestring hourglass ];
        homepage = "http://github.com/vincenthz/hs-asn1-types";
        description = "ASN.1 types";
@@ -21989,7 +22048,7 @@ self: {
      mkDerivation {
        pname = "asn1dump";
        version = "0.1.0";
-       sha256 = "05kdx00bkpp3f4x1i9j8kfbdnhsivx1njcfpcxxgw93jm5ng3lj7";
+       sha256 = "47d2f16ca97224fe7a67d7316943df5143db969b48a6183a71e3deb900e86d16";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -22005,7 +22064,7 @@ self: {
      mkDerivation {
        pname = "assembler";
        version = "0.0.1";
-       sha256 = "1crwfndk7qci5id132s9f57i3kslxcdcqpymsykm1460x5nd42qs";
+       sha256 = "1a0bd26ce9c09050a7d7d55fcc1aeb54cf114f71498b115a2c91e1339b753cb3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ghc-binary parsec ];
@@ -22023,7 +22082,7 @@ self: {
      mkDerivation {
        pname = "assert";
        version = "0.0.1.2";
-       sha256 = "0pycrpa9m8kif31jsbmb2cb4rbvm6qinmzhkdam1b5mbmmmg5q96";
+       sha256 = "26e1f26aadab9615aa6a13fe6a233675af4c1613ab2e2dc37071a29ad4cdcc5f";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base bytestring Cabal directory filepath system-posix-redirect
@@ -22038,7 +22097,7 @@ self: {
      mkDerivation {
        pname = "assert-failure";
        version = "0.1.1.0";
-       sha256 = "09djlhhyn9w822a5r41y7gk4cqk74a2fy7skzml2bah2an166gm1";
+       sha256 = "a13e63825502aa2568fd531fef8422676246e63b3e905c94108827eb21a4b225";
        libraryHaskellDepends = [ base pretty-show text ];
        homepage = "https://github.com/Mikolaj/assert-failure";
        description = "Syntactic sugar improving 'assert' and 'error'";
@@ -22052,7 +22111,7 @@ self: {
      mkDerivation {
        pname = "assertions";
        version = "0.1.0.4";
-       sha256 = "1b2p6b6brk0b1hq264i20bpdhdaq4xdzcqp7gzvfy1s5q3zwjzj8";
+       sha256 = "487ec9ffc04507eff67fe762f65b275835d8ee02221223300c0bccbccc3257ac";
        libraryHaskellDepends = [ ansi-terminal base containers ];
        testHaskellDepends = [ base interpolate process ];
        description = "A simple testing framework";
@@ -22064,7 +22123,7 @@ self: {
      mkDerivation {
        pname = "assimp";
        version = "0.1";
-       sha256 = "0jhf76v08dh1bf65ln0az1b8bc8zi9gxb0bx273mi3jvprhns4zh";
+       sha256 = "f0136d61be5b8e58c7117d81d55f8a1fb18556f80a585a8c5b013604b6390e4a";
        libraryHaskellDepends = [ base haskell98 vect ];
        librarySystemDepends = [ assimp ];
        libraryToolDepends = [ c2hs ];
@@ -22078,7 +22137,7 @@ self: {
      mkDerivation {
        pname = "astar";
        version = "0.2.1";
-       sha256 = "0qgymyaawk0ml929d5lgfikmqbxyz4shs66wq9ch9d6r175cs5b8";
+       sha256 = "6815cdca09d9b40459c2dc180d35f9be2f5c67748f969644a2154cae94affe61";
        libraryHaskellDepends = [ base containers PSQueue ];
        description = "General A* search algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -22091,7 +22150,7 @@ self: {
      mkDerivation {
        pname = "astrds";
        version = "0.1.1";
-       sha256 = "1zb265z6m1py2jxhxzrq2kb3arw2riagajhh3vs0m54rkrak6szs";
+       sha256 = "fa6b33559e99940af41e104af554cc826735d61438ff0ebb14fe866a7e3162fd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -22112,7 +22171,7 @@ self: {
      mkDerivation {
        pname = "astview";
        version = "0.1.4";
-       sha256 = "0lv4wbblv4r0vwfynswsxzyrl6qp45byjdmg4cs760qq3jj749zl";
+       sha256 = "f42772a41c1803733423af36e95721171b9afdef9a6beb1ddf20934dd7e26453";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -22129,7 +22188,7 @@ self: {
      mkDerivation {
        pname = "astview-utils";
        version = "0.1";
-       sha256 = "1rqqlngmcdd7i1gww95lyim971w8xv0hjg20h0j8av4y29pjxfyn";
+       sha256 = "d6bb2e6f129e6c852480403c09c1ee8887936af4b424ce5f88a735569fa518e7";
        libraryHaskellDepends = [ base containers syb ];
        description = "Interfacing between hint and astview";
        license = stdenv.lib.licenses.bsdOriginal;
@@ -22142,7 +22201,7 @@ self: {
      mkDerivation {
        pname = "async";
        version = "2.0.2";
-       sha256 = "0azx4qk65a9a2gvqsfmz3w89m6shzr2iz0i5lly2zvly4n2d6m6v";
+       sha256 = "db54d384259eee2f3ca525821f45fe509b9a101fbf3a8df7132aa9622626fd2b";
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -22159,7 +22218,7 @@ self: {
      mkDerivation {
        pname = "async-extras";
        version = "0.1.2.0";
-       sha256 = "137vpkc4xlbmghbjmgdjxaqcji19cj1vxm64df9gxb7356d0rzyh";
+       sha256 = "d0ff0c9a29e3acfe926bc4d4be83642944c9b0eab2bd2a177c75d14ed8bcfb8c";
        libraryHaskellDepends = [
          async base lifted-async lifted-base monad-control SafeSemaphore stm
          transformers-base
@@ -22175,7 +22234,7 @@ self: {
      mkDerivation {
        pname = "async-manager";
        version = "0.1.1.0";
-       sha256 = "002w3n0ykn5ga7mwz9kjvr77izqnhklq5r3aczwjikvgkik9q6ck";
+       sha256 = "93199c669c6fcf28f9676ae482e98416ff784ede72a6cfeb51afd8e9811d5c00";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ async base stm unordered-containers ];
@@ -22193,7 +22252,7 @@ self: {
      mkDerivation {
        pname = "async-pool";
        version = "0.9.0";
-       sha256 = "10952y60ivkx78skf7ds0dv8gp6bf3v47lays928vnpb8m5cr0rh";
+       sha256 = "3083cc4a45ebda8d44d25ed143f670cbdc877603ba1d37353a7dee088c172581";
        libraryHaskellDepends = [
          async base containers fgl monad-control stm transformers
          transformers-base
@@ -22211,7 +22270,7 @@ self: {
      mkDerivation {
        pname = "asynchronous-exceptions";
        version = "1.1.0.1";
-       sha256 = "0vfx2ikw61sic35n4ayy7rng6izpafksz7lh4xgkcmbg627vkm8s";
+       sha256 = "1ad5b98f306f55365f27909eafa753f747f36c3ede2b62cb605107c36714dd6d";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/feuerbach/asynchronous-exceptions";
@@ -22224,7 +22283,7 @@ self: {
      mkDerivation {
        pname = "aterm";
        version = "0.1.0.1";
-       sha256 = "02aajiirz68wqyrcigfb4cym7j43cf3p0dn4awcw8simnqhfaskh";
+       sha256 = "706ae520b6356ac41957c43670876383c8533d23cbbdc8b2c71c999f63944a09";
        libraryHaskellDepends = [ array base containers ghc-prim ];
        homepage = "https://svn-agbkb.informatik.uni-bremen.de/Hets/trunk/atermlib";
        description = "serialisation for Haskell values with sharing support";
@@ -22236,7 +22295,7 @@ self: {
      mkDerivation {
        pname = "aterm-utils";
        version = "0.2.0.2";
-       sha256 = "0yyk2mdxrla0hwh1mn50x5mgqskkaw6i086gqqmprljr2668kkj0";
+       sha256 = "40ce898c1159d27c2bc6cf20100d57736afc6ae9a0d81a208740d1dc5b15d37b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aterm base mtl transformers wl-pprint ];
@@ -22252,7 +22311,7 @@ self: {
      mkDerivation {
        pname = "atl";
        version = "15409.2";
-       sha256 = "1by20xr3s3f0rh1h9zfpcp1i8sn1qv6292mjvav108iws0dh4wq2";
+       sha256 = "0273021bd03c2210b6dab28a24ccc6c16a14c365d7fd0403ccc00d3d7207c2af";
        libraryHaskellDepends = [ base ];
        description = "Arrow Transformer Library";
        license = "LGPL";
@@ -22269,7 +22328,7 @@ self: {
      mkDerivation {
        pname = "atlassian-connect-core";
        version = "0.7.0.1";
-       sha256 = "16pf2ir84fx6x01mpp109qh9rf96fp57230qr4k4n7qms068dgpy";
+       sha256 = "febe860cd0151f4b26c9180c71ca7526b99c204e20dc5b03e8a63b827214ee9a";
        libraryHaskellDepends = [
          aeson atlassian-connect-descriptor base base64-bytestring
          bytestring case-insensitive cipher-aes configurator containers
@@ -22292,7 +22351,7 @@ self: {
      mkDerivation {
        pname = "atlassian-connect-descriptor";
        version = "0.4.0.2";
-       sha256 = "1pss2rkd1s4dmnym5w2sanhqgz2pv1n9zyq4n8jy8ihc4zgrcscp";
+       sha256 = "976996df270c46e425b204fb9f6cd857fc87a1555af052bdad8de8d066165adf";
        libraryHaskellDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -22313,7 +22372,7 @@ self: {
      mkDerivation {
        pname = "atmos";
        version = "0.2.0.0";
-       sha256 = "0qx5a6dzaxjw1flybpmbf3hf7xycg4x69283njszwijw23ak6sv6";
+       sha256 = "666b33d5105c46feb5b40389643a79ccf7e3e070abdee5a90b5c76f59b51a563";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -22327,7 +22386,7 @@ self: {
      mkDerivation {
        pname = "atmos-dimensional";
        version = "0.1.2";
-       sha256 = "19rlcp1zn3k838c5ixsn6i09nclfwvd9prbirxy5fmch0yjlp39d";
+       sha256 = "2d8d4ba5079055577ccf71e59bdae68e329b403456f758181a680efbc36534a7";
        libraryHaskellDepends = [ atmos base dimensional ];
        description = "dimensional wrapper on atmos package";
        license = stdenv.lib.licenses.bsd3;
@@ -22338,7 +22397,7 @@ self: {
      mkDerivation {
        pname = "atmos-dimensional-tf";
        version = "0.1.2";
-       sha256 = "05g2v7ppbcvaw0dk9f0z0gb7k33c4lk2cm2ziyqahxmwsz928khm";
+       sha256 = "154e24d2d7bc76a8b08f5f542626256c8c79d6031fb8341be06ab375efd9e215";
        libraryHaskellDepends = [ atmos base dimensional-tf ];
        description = "dimensional-tf wrapper on atmos package";
        license = stdenv.lib.licenses.bsd3;
@@ -22349,7 +22408,7 @@ self: {
      mkDerivation {
        pname = "atom";
        version = "1.0.13";
-       sha256 = "111lz39q12rvh2iigxakcnf2firxgbgm462id805n3z7rmg8f807";
+       sha256 = "0720875ecde70f5b006a511852df7a3d47279c6553f517a3803b8b80d3f83484";
        libraryHaskellDepends = [ base bimap containers mtl process syb ];
        homepage = "http://tomahawkins.org";
        description = "An EDSL for embedded hard realtime applications";
@@ -22363,7 +22422,7 @@ self: {
      mkDerivation {
        pname = "atom-basic";
        version = "0.2.2";
-       sha256 = "1n9illmrkrd1gr3imjvclzny8kjx7d0mak9yvyc129gfb9ap52cd";
+       sha256 = "8d8972555aee251198df3e4d55413b5d4ee4eda76ccb1a477ea1e5992ba531d9";
        libraryHaskellDepends = [
          base base64-bytestring bytestring network network-uri old-locale
          text time
@@ -22383,7 +22442,7 @@ self: {
      mkDerivation {
        pname = "atom-conduit";
        version = "0.1.0.0";
-       sha256 = "1jhd7036ga1sf1zgclc1m5gjzj5smf84rzvy5xac70wgcaa8iajk";
+       sha256 = "53aa8894628f83c3542f7eff4c90abbac82f5fa98151f67e703aa86706380dca";
        libraryHaskellDepends = [
          base conduit conduit-parse containers exceptions lens
          mono-traversable network-uri parsers text time timerep xml-conduit
@@ -22404,7 +22463,7 @@ self: {
      mkDerivation {
        pname = "atom-msp430";
        version = "0.5.3";
-       sha256 = "02h1g35f3bd3cjjhr28g63vk1mnghshq9586wa922rfl79jp6jcs";
+       sha256 = "9a4973653ad4652192e2069584a186cfd630f7300f890ca564a3ade1ca78010a";
        libraryHaskellDepends = [ atom base mtl ];
        homepage = "https://github.com/eightyeight/atom-msp430";
        description = "Convenience functions for using Atom with the MSP430 microcontroller family";
@@ -22417,7 +22476,7 @@ self: {
      mkDerivation {
        pname = "atomic-primops";
        version = "0.8";
-       sha256 = "0wb45yjflpih94i95s88hfl4mcddcjsabspnm6h20wxv0n09xqf0";
+       sha256 = "c0e19e8005bb7320a0a9f6eaa5b464adb14aa88308e9922249305eeaa42f6471";
        libraryHaskellDepends = [ base ghc-prim primitive ];
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "A safe approach to CAS and other atomic ops in Haskell";
@@ -22431,7 +22490,7 @@ self: {
      mkDerivation {
        pname = "atomic-primops-foreign";
        version = "0.6.2";
-       sha256 = "1pfdbrxx4s6n53lfhxghcalm8dif2r9zj45bipibvyiczz5xkkpm";
+       sha256 = "f5ced9cbff2cfabde28dab10f953162e3654a962f075e8e828d668d27b5ecddd";
        revision = "1";
        editedCabalFile = "fd1067adbd96e923226347dccaa9e3e221439702fe7824c86db44eb5b7f6c318";
        libraryHaskellDepends = [ base bits-atomic ];
@@ -22449,7 +22508,7 @@ self: {
      mkDerivation {
        pname = "atomic-primops-vector";
        version = "0.1.0.1";
-       sha256 = "0m4mlixiz7cs4hqrh7i6dzbsj55p0qh3m16nc94819wbzcgi3vq7";
+       sha256 = "07ef111ffb8ba7804862d6843a2006b714a9d76f261e9831249a9d1f7ba49554";
        libraryHaskellDepends = [ atomic-primops base primitive vector ];
        testHaskellDepends = [ base vector ];
        jailbreak = true;
@@ -22464,7 +22523,7 @@ self: {
      mkDerivation {
        pname = "atomic-write";
        version = "0.2.0.4";
-       sha256 = "1y09vyxv1fdlkzz7r27snrjhi19msqj06cjdwy7mgbjb6v7z46w9";
+       sha256 = "891bf2cf364bae578fe74d320324d635850865b6fa887cfe9fb4b9b0bbdf09f8";
        libraryHaskellDepends = [
          base bytestring directory filepath temporary text unix-compat
        ];
@@ -22484,7 +22543,7 @@ self: {
      mkDerivation {
        pname = "atomo";
        version = "0.4.0.2";
-       sha256 = "0hby64jd9zi518rnfk46ilipnp3x0ynkgqk2n0brf1873y88mwx8";
+       sha256 = "a8f38a901f07059717b062e237ad077d5c7b238d864c67330a25fed424317e41";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -22508,7 +22567,7 @@ self: {
      mkDerivation {
        pname = "attempt";
        version = "0.4.0.1";
-       sha256 = "1gvq04ds62kk88r2210mxd1fggp6vf5p8j5hci9vqkkss1hy9rxh";
+       sha256 = "b0e7e461d07a4ebc5364b048748bdbe6bee742eb1504213242730aa31b0178bf";
        libraryHaskellDepends = [ base failure ];
        homepage = "http://github.com/snoyberg/attempt/tree/master";
        description = "Concrete data type for handling extensible exceptions as failures. (deprecated)";
@@ -22523,7 +22582,7 @@ self: {
      mkDerivation {
        pname = "atto-lisp";
        version = "0.2.2";
-       sha256 = "13lhdalam4gn9faa58c3c7nssdwp2y0jsfl1lnnvr3dx6wzp0jhc";
+       sha256 = "0c4a703f37bd8dbcada5813a2d81179737aded6183a1a2944bf691aaa86a908e";
        revision = "1";
        editedCabalFile = "feb39753d89c58abac767ed3fe5644428b5d15d83c69f7b26b282f3b9969f2fa";
        libraryHaskellDepends = [
@@ -22548,7 +22607,7 @@ self: {
      mkDerivation {
        pname = "attoparsec";
        version = "0.13.0.1";
-       sha256 = "0cprkr7bl4lrr80pz8mryb4rbfwdgpsrl7g0fbcaybhl8p5hm26f";
+       sha256 = "ce880acb45142eafd872e01d9af57d8dbb95c9f2b9a27f01ca9912ba4e9ef932";
        libraryHaskellDepends = [
          array base bytestring containers deepseq scientific text
          transformers
@@ -22568,7 +22627,7 @@ self: {
      mkDerivation {
        pname = "attoparsec-arff";
        version = "0.0";
-       sha256 = "1jf9065pqmdfshkd0cqiamhivs9an4slqx82n7yj0kkhdxw5lyq4";
+       sha256 = "047b5a786f704e20fdb102754c35b12ae91d61551133d026d4ae557c8b01c9c9";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "An ARFF file parser using Attoparsec";
        license = stdenv.lib.licenses.gpl2;
@@ -22579,7 +22638,7 @@ self: {
      mkDerivation {
        pname = "attoparsec-binary";
        version = "0.2";
-       sha256 = "02vswxsgayw50xli7mbacsjmk1diifzkfgnyfn9ck5mk41dl9rh5";
+       sha256 = "05e6445b20b396c99275de3e37bf8bb18559a5666ad5136907857bf574e77a0b";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Binary processing extensions to Attoparsec";
        license = stdenv.lib.licenses.bsd3;
@@ -22590,7 +22649,7 @@ self: {
      mkDerivation {
        pname = "attoparsec-conduit";
        version = "1.1.0";
-       sha256 = "18xn3nzxfghcd88cana1jw85ijv0ysw3bp36fb6r5wsf6m79z01y";
+       sha256 = "3e809f4e354ef392cd7266dc35b8f660cb5810974159c5106a0c3ed7bf1db6a3";
        libraryHaskellDepends = [ base conduit ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Consume attoparsec parsers via conduit. (deprecated)";
@@ -22602,7 +22661,7 @@ self: {
      mkDerivation {
        pname = "attoparsec-csv";
        version = "0.1.0.1";
-       sha256 = "0zh1g9687nrdxksniq348jc04hbgf5kxbzqs0kggmz7qqw03iq0v";
+       sha256 = "1be03800c7f8fcfade041affd567716f4102984464e068f5ec2ddb834c7a017e";
        libraryHaskellDepends = [ attoparsec base text ];
        jailbreak = true;
        homepage = "https://github.com/robinbb/attoparsec-csv";
@@ -22616,7 +22675,7 @@ self: {
      mkDerivation {
        pname = "attoparsec-enumerator";
        version = "0.3.4";
-       sha256 = "127mj0v6342mzxnc73qki3k197vhwsff8qkf92gm5idyxdisg5dy";
+       sha256 = "be95a763ebbec5529f486e62e49ce6709f14e688138fc36cff5590613690f588";
        libraryHaskellDepends = [
          attoparsec base bytestring enumerator text
        ];
@@ -22630,7 +22689,7 @@ self: {
      mkDerivation {
        pname = "attoparsec-expr";
        version = "0.1.1.2";
-       sha256 = "0z25pc3rq98ysk92jclr90n35982a566sxri51yh1s9c24vd8k4d";
+       sha256 = "8d4cd436112ce9007d2831776d4c5102a5322c48993229d2d41e259c07bb457c";
        libraryHaskellDepends = [ attoparsec base ];
        description = "Port of parsec's expression parser to attoparsec";
        license = stdenv.lib.licenses.bsd3;
@@ -22643,7 +22702,7 @@ self: {
      mkDerivation {
        pname = "attoparsec-iteratee";
        version = "0.4.0";
-       sha256 = "1j57xhk34ghi1b2gnzrfbswv2nab5h0z52h3wvx9w8d97bbvqp2s";
+       sha256 = "5a5cbcd73aa9219efae6038af2012c4b59b1b95e2e7ffbc40a113e3226eca7c8";
        libraryHaskellDepends = [
          attoparsec base bytestring iteratee transformers
        ];
@@ -22661,7 +22720,7 @@ self: {
      mkDerivation {
        pname = "attoparsec-parsec";
        version = "0.1.3";
-       sha256 = "0mi3f1kwcss8m1679ymiydp1sb1xdyv1f6a0qx9d683p86qxrwzq";
+       sha256 = "f8f3dcb1417720d352c7401917b66f3d2c1d6ef3b1fa744ca8486bc667702356";
        libraryHaskellDepends = [ attoparsec base parsec text ];
        testHaskellDepends = [
          attoparsec base hspec markdown-unlit QuickCheck text
@@ -22675,7 +22734,7 @@ self: {
      mkDerivation {
        pname = "attoparsec-text";
        version = "0.8.5.3";
-       sha256 = "1qq42lp1sah80a6lnnafi6pwl61b4w4q4jk1pbb7pg5p06mmk315";
+       sha256 = "258c59ab01b7bc7bd6ba614a8209272b18caaf894e594b8d02082a1d2e1504e3";
        libraryHaskellDepends = [ array attoparsec base containers text ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/felipe/attoparsec-text/home";
@@ -22689,7 +22748,7 @@ self: {
      mkDerivation {
        pname = "attoparsec-text-enumerator";
        version = "0.2.0.1";
-       sha256 = "0cffcwji141js09r7avb15b08xl4s8cgk5vxyrqaq7zw40hhb1gz";
+       sha256 = "ff85052120fc1fac70f67d97f918d284760456096bab9313d03290102567ce31";
        libraryHaskellDepends = [ attoparsec-text base enumerator text ];
        jailbreak = true;
        description = "(deprecated)";
@@ -22702,7 +22761,7 @@ self: {
      mkDerivation {
        pname = "attoparsec-trans";
        version = "0.1.1.0";
-       sha256 = "0lsbl7hhirr13jmn6fc4g5443j73p4rxjgxvv967n5dsp7xrjaa7";
+       sha256 = "472999fbb9ba157b4cdabb3fd933b9e3c8414879843963ab1c21e708e1a14b53";
        libraryHaskellDepends = [ attoparsec base transformers ];
        homepage = "https://github.com/srijs/haskell-attoparsec-trans";
        description = "Interleaved effects for attoparsec parsers";
@@ -22714,7 +22773,7 @@ self: {
      mkDerivation {
        pname = "attosplit";
        version = "0.1.0.0";
-       sha256 = "01sh8k9n9040xqx1lbn74rcf59j54n5861d9db1y5cdy7qssxyg4";
+       sha256 = "e4f9ae353ebeb1e2c36aa905838a2545a6e25826c72e1a3aee808064d3445007";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/attosplit";
@@ -22727,7 +22786,7 @@ self: {
      mkDerivation {
        pname = "atuin";
        version = "0.1.1";
-       sha256 = "1wmfnvl39amyfzkvpd3gysshyf10fjjb91zibalkqbq9pbsnfzjk";
+       sha256 = "537e67f5ba092f3ca95af187b4a47420380fb5f66fb4bbe777beaa34e8b6aef2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -22744,7 +22803,7 @@ self: {
      mkDerivation {
        pname = "audacity";
        version = "0.0";
-       sha256 = "1vfp5x5b6z7lwjiv8jla5bdwbcbafdm31zs9kr555idzz1n8wmqz";
+       sha256 = "1f578e6cf8bfc5524a9e49ff306a736ab1c5db2a8a4ab4a3e4f47cb34a2fd7ed";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq utility-ht ];
@@ -22762,7 +22821,7 @@ self: {
      mkDerivation {
        pname = "audiovisual";
        version = "0.0";
-       sha256 = "0qjcsvv52l53iqyh7hkhwdsifqb943wjp1vn63qhqsrdaajazp3h";
+       sha256 = "70dcafa4522d6b0cf13076872bf92069611775e370c2033d8ea35051f6d64c62";
        libraryHaskellDepends = [
          base boundingboxes colors deepseq directory filepath free freetype2
          hashable JuicyPixels JuicyPixels-util lens linear mtl objective
@@ -22779,7 +22838,7 @@ self: {
      mkDerivation {
        pname = "augeas";
        version = "0.6.1";
-       sha256 = "08z6l97hi6clv3b34mz9zjc5rns02jx1zx9iqdsmjl2p7hcn7rs5";
+       sha256 = "45e763193c57505975c331f51fba1440db5c98fce95732d6d89499084fa2e623";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring directory unix ];
@@ -22800,7 +22859,7 @@ self: {
      mkDerivation {
        pname = "augur";
        version = "2008.11.17";
-       sha256 = "1jvbf3z9z6m40hprykxcc5xwbmwm6p5hwlyab0dimd8h2ar50xfr";
+       sha256 = "d97550b21210b51a1b58ca530ecb3595d7c57b61ac4f9f2f04a49a9ffe706bcb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -22820,7 +22879,7 @@ self: {
      mkDerivation {
        pname = "aur";
        version = "3.0.0";
-       sha256 = "1sf76lysp8xchym78ha4glrw11hxic5g684mm8h6w0n05x1ywxcn";
+       sha256 = "9675ee432fc0026e20aa9520f30a8b1d86c0337d444174aa87aca3ab3d35c7e9";
        libraryHaskellDepends = [
          aeson aeson-pretty base filepath lens lens-aeson mtl text vector
          wreq
@@ -22839,7 +22898,7 @@ self: {
      mkDerivation {
        pname = "authenticate";
        version = "1.3.2.11";
-       sha256 = "1xkzaw9a338yclbm10cfa9cnjdjpmzif2qj4hprig45z5szqi4q4";
+       sha256 = "049388bf2ebf9017f3854462e1e2af57366959528e815017651e8da112577ff6";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring case-insensitive
          conduit containers http-conduit http-types monad-control
@@ -22856,7 +22915,7 @@ self: {
      mkDerivation {
        pname = "authenticate-kerberos";
        version = "1.0.0";
-       sha256 = "06k8xi9n44xq63dpmcv4l0vg35y19dk5x1ibyay05w58k4kv4fdq";
+       sha256 = "b839b22799a8f002bcf22b865e664bc197f136a064b37adb30b8136253ec681a";
        libraryHaskellDepends = [ base process text ];
        homepage = "http://github.com/yesodweb/authenticate";
        description = "Authentication methods for Haskell web applications";
@@ -22868,7 +22927,7 @@ self: {
      mkDerivation {
        pname = "authenticate-ldap";
        version = "0.0.3";
-       sha256 = "1wsx43l7jl40jpzhiv2fjc1mnpsaaryrjpqaiyqsn3ahacsy4ly5";
+       sha256 = "c553e23553500dabb18f0a5f997d564a5f5b03934eec08ff95805079e8205df3";
        libraryHaskellDepends = [ base LDAP text transformers ];
        jailbreak = true;
        homepage = "http://github.com:mlitchard/authenticate-ldap";
@@ -22884,7 +22943,7 @@ self: {
      mkDerivation {
        pname = "authenticate-oauth";
        version = "1.5.1.1";
-       sha256 = "02y35yd4zmpy36yba2nzbvijhfw0wvijkiqmh7h9qjpbqvmib7zb";
+       sha256 = "eb9f15ebc6eb4a9ce08115c729e3e6803b28e35edf0ab5bc19fed64f9a2fc30b";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring crypto-pubkey-types
          data-default http-client http-types random RSA SHA time
@@ -22900,7 +22959,7 @@ self: {
      mkDerivation {
        pname = "authinfo-hs";
        version = "0.1.0.0";
-       sha256 = "1jv0y4y2ig8dx95xw3zbxc1h9mv3wi3r8xqx00llmf2qs6wgdlp5";
+       sha256 = "e5d2f6b8d158b84a29001d779447e463d70403ebeb0fde4bea0dbd283cf160cb";
        libraryHaskellDepends = [ attoparsec base network text ];
        homepage = "http://github.com/robgssp/authinfo-hs";
        description = "Password querying for .authinfo";
@@ -22915,7 +22974,7 @@ self: {
      mkDerivation {
        pname = "authoring";
        version = "0.3.4";
-       sha256 = "0jfxgrbkcqpfcvg1jk7ysd74bq7xjlvzqamnr3qg4ib9zg6yw0k4";
+       sha256 = "6402eecdfb6945f2f0c8b62afc3795fde0454ed3fe4c19de66ee6236577edd49";
        libraryHaskellDepends = [
          ansi-wl-pprint base citation-resolve containers data-default
          haskell-src-meta HaTeX lens mtl parsers safe template-haskell text
@@ -22935,7 +22994,7 @@ self: {
      mkDerivation {
        pname = "auto";
        version = "0.4.3.0";
-       sha256 = "13ic0sh45ixxg456yg3y47f6b3avqn2l5ds0jc933ldk0z0wsdn8";
+       sha256 = "c836cdc107b3d131129340b74285c55b8d65dc217e3c6f0a79bdc742a0062c8e";
        libraryHaskellDepends = [
          base base-orphans bytestring cereal containers deepseq MonadRandom
          profunctors random semigroups transformers
@@ -22950,7 +23009,7 @@ self: {
      mkDerivation {
        pname = "auto-update";
        version = "0.1.2.2";
-       sha256 = "1ns4c5mqhnm7hsiqxf1ivjs5fflyq92b16ldzrcl0p85631h0c3v";
+       sha256 = "7b3000c330055d4059fe8d9ab044c29e3a57b4dc31b88ea386a75a886b6144db";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/yesodweb/wai";
        description = "Efficiently run periodic, on-demand actions";
@@ -22966,7 +23025,7 @@ self: {
      mkDerivation {
        pname = "autonix-deps";
        version = "0.3.0.0";
-       sha256 = "0mp2v6wdm4nlagg3z9xmxd9dfkchazgvbgdphm1nfqzkg8w7ralv";
+       sha256 = "9baa7c387af363674385b7bdb5df57904dd752ebb5a73fde53d492dab8d9e256";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring conduit containers errors
          filepath lens libarchive-conduit mtl optparse-applicative process
@@ -22983,7 +23042,7 @@ self: {
      mkDerivation {
        pname = "autonix-deps-kf5";
        version = "0.3.0.0";
-       sha256 = "0njmgx2x6018ca1r2xvbi3pq0rigqm4fjkk33q5kzacvmv5ni461";
+       sha256 = "c19068cbae9ba93f0b1e634ee948c52f6680ef886b779183622800d3457f555a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23002,7 +23061,7 @@ self: {
      mkDerivation {
        pname = "autoproc";
        version = "0.1.2";
-       sha256 = "0yrlaq2jr89ncla3cpj6ir8bamwdchxnr39vsvkm7qpan61f2x65";
+       sha256 = "c574e182b1eae253e7d63b8d6c3b648d57b5508e465e36146536a12c0556347b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory mtl process unix ];
@@ -23017,7 +23076,7 @@ self: {
      mkDerivation {
        pname = "avahi";
        version = "0.1.1";
-       sha256 = "0b2bw0rp33g8s1y6hyqji3ycv26a4ixgjmkph93isnjxglfl6ah0";
+       sha256 = "002a431d7d5d5a1d47827756f97a24ca88cdfc88127b687cd0e88d7133e04b2c";
        libraryHaskellDepends = [ base dbus-core text ];
        description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)";
        license = stdenv.lib.licenses.bsd3;
@@ -23029,7 +23088,7 @@ self: {
      mkDerivation {
        pname = "average";
        version = "0.6.1";
-       sha256 = "13qkgkwdcb09s69wzhd3b6dl1nm66lv2hqb51gmr4s64ylgf0a9h";
+       sha256 = "3029e01ef5c46892eb0b6561283635a6da409b59a3c1cf93d1092cd6f87c138f";
        revision = "1";
        editedCabalFile = "90c8c1d4ece76a1f1b43f1a6bef7ba15340a2bec8e2efbb465884d6b50b5d174";
        libraryHaskellDepends = [ base semigroups vector-space ];
@@ -23047,7 +23106,7 @@ self: {
      mkDerivation {
        pname = "avers";
        version = "0.0.9";
-       sha256 = "0zcgq4b20vvg2mqm9yqm4gvakafn9r8mghki8bn87xhk0w7h99km";
+       sha256 = "75a6040f0713f683ec4271c257514ed6a9a9f62315fb5471156f6f2016c18f7d";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring clock containers
          cryptohash filepath inflections MonadRandom mtl network network-uri
@@ -23072,7 +23131,7 @@ self: {
      mkDerivation {
        pname = "avl-static";
        version = "0.1.0.0";
-       sha256 = "13rl5wrpmbb4c0zsaymivi4d9qg2wl4lfw4nvkd81naqm3vskc10";
+       sha256 = "20b0a9f7a858d980dadc96704709e5e2e1d448dcb17aa53f6064ad7a332f348f";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -23087,7 +23146,7 @@ self: {
      mkDerivation {
        pname = "avr-shake";
        version = "0.0.1.1";
-       sha256 = "0avj9idsk70c7gzkm18kcsvh3xhg57r8aifhdpyihzyvp87k61pn";
+       sha256 = "f606330fbadb7f18fd6dd04585f2290ff601b76613853aff3b0c9ca95b4c722b";
        libraryHaskellDepends = [ base dependent-sum mtl process shake ];
        homepage = "https://github.com/mokus0/avr-shake";
        description = "AVR Crosspack actions for shake build systems";
@@ -23101,7 +23160,7 @@ self: {
      mkDerivation {
        pname = "awesomium";
        version = "0.1.0.0";
-       sha256 = "0qd89nlw4rqdl8iya49rldyn5a36d64slcnw5pfh5c5aajh27aq2";
+       sha256 = "02ab23a054aab002dd2ddc32aa896966a8627da33911e523a20d67c2a94da861";
        libraryHaskellDepends = [
          aeson attoparsec awesomium-raw base containers text vector
        ];
@@ -23115,7 +23174,7 @@ self: {
      mkDerivation {
        pname = "awesomium-glut";
        version = "0.1.0.0";
-       sha256 = "175hgqix2j26579g0rrryl86w7qvla95nvf4lwfxsxxwqgcq3zpd";
+       sha256 = "edfe81d9c3bc77dd1da7c46d5b92a21b1f6e10f53967f0d2294648d1237eb09c";
        libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ];
        description = "Utilities for using Awesomium with GLUT";
        license = stdenv.lib.licenses.gpl3;
@@ -23127,7 +23186,7 @@ self: {
      mkDerivation {
        pname = "awesomium-raw";
        version = "0.1.0.0";
-       sha256 = "0djilsrgb8y84ssslwawhw6lky7bqspz31qwjy9lkxywi5hwxnyb";
+       sha256 = "cbdbce6189dcf74993971c87f1afc6ebf8490d875c71aab526c8a3f5b2a65136";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ awesomium ];
        libraryToolDepends = [ c2hs ];
@@ -23150,7 +23209,7 @@ self: {
      mkDerivation {
        pname = "aws";
        version = "0.12.1";
-       sha256 = "0aykch71qakmxn47i6h23h52dp41x7kwcibv527xg57ab71vm1bc";
+       sha256 = "6c85bac359ea94d78f287b45c6e7e981dc260a1c029a7888ed752a1c0e64d32b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23178,7 +23237,7 @@ self: {
      mkDerivation {
        pname = "aws-cloudfront-signer";
        version = "1.1.0.2";
-       sha256 = "0cxh0b0g4lms2zpgw6q4k7bk2a7px8kafdr6qrbrcf7p3dkmzwd9";
+       sha256 = "a9f15f671bf7389657c62637a726eaf72831d799041bfeee17ba52f2c002b033";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base base64-bytestring bytestring
          crypto-pubkey-types old-locale RSA time
@@ -23198,7 +23257,7 @@ self: {
      mkDerivation {
        pname = "aws-configuration-tools";
        version = "0.1.0.0";
-       sha256 = "0xqwhd15ijwf6h26hb1nl16813b1rfh1nx6qipslz6pw857vv53b";
+       sha256 = "6b94bd4f41fc9a4ff58dd8741ba0cb618d804ca0362c6804348ecb5842831c77";
        revision = "2";
        editedCabalFile = "536eacac6f54fbeb3e823d5b751eaa8cf1bb45a69f1d0bf54bdbff6245eb93e9";
        libraryHaskellDepends = [
@@ -23217,7 +23276,7 @@ self: {
      mkDerivation {
        pname = "aws-dynamodb-conduit";
        version = "0.1.0.6";
-       sha256 = "15svx7c8nld8bgwqwy5mwkbniz4c1ifw2rw427gwk7y2py1hq38p";
+       sha256 = "170d0c83bfc29fc9df118467c15d0c8cfc68d7e4b5788ef95ba8518bd8e95b97";
        libraryHaskellDepends = [
          aeson attoparsec-trans aws base bytestring conduit containers
          http-conduit http-types json-togo resourcet text transformers
@@ -23237,7 +23296,7 @@ self: {
      mkDerivation {
        pname = "aws-dynamodb-streams";
        version = "0.1.0.0";
-       sha256 = "0yqmijls71jyvic2saabj3kwnpaxmlj6mf4krcdli3626ra7w4r2";
+       sha256 = "22137e5436c28c481bcb93b86a24ad5d5dcbe7904b292d58dc5e86a3a98c157b";
        libraryHaskellDepends = [
          aeson attoparsec aws aws-general base base-unicode-symbols
          base16-bytestring base64-bytestring byteable bytestring
@@ -23261,7 +23320,7 @@ self: {
      mkDerivation {
        pname = "aws-ec2";
        version = "0.3.2";
-       sha256 = "0wgg05hnzjrlhzkc5giy5gdkiy4dg6hvgdq433ifld11vrpy152d";
+       sha256 = "4d94e06fde2134eae21804b7b7a1798df838db2b3ebec2e68734cb6f6101ef71";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23288,7 +23347,7 @@ self: {
      mkDerivation {
        pname = "aws-elastic-transcoder";
        version = "0.2.0.2";
-       sha256 = "02dygqqyal6s3ibjvgxng4vspld3c6mrgrwdhig8lfri2zdpqsw9";
+       sha256 = "896b7cdb17313b8a5e848de797ab61a3d1ab3779b6bf2d571cda50e5317ebe09";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23314,7 +23373,7 @@ self: {
      mkDerivation {
        pname = "aws-general";
        version = "0.2.2";
-       sha256 = "08sy37w162zqd6dqi8kkg0782nv00jsp48bnrmhwhmkhnd2arfrj";
+       sha256 = "32bbac44b37056c861cd762172b504605b810e7873a2889b69f80b13f8195e23";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring blaze-builder byteable
          bytestring case-insensitive cryptohash deepseq hashable http-types
@@ -23340,7 +23399,7 @@ self: {
      mkDerivation {
        pname = "aws-kinesis";
        version = "0.1.5";
-       sha256 = "0npiff5zrcs552y8lq3q6fgnwffqy11dvgs3yaygy0m99mgiaaiz";
+       sha256 = "3f2a155f4da902ffbcf243bfdd42f0d8396e9f3378608abc2845b3fc8b73f15a";
        libraryHaskellDepends = [
          aeson aws aws-general base base64-bytestring blaze-builder
          bytestring conduit conduit-extra deepseq http-conduit http-types
@@ -23368,7 +23427,7 @@ self: {
      mkDerivation {
        pname = "aws-kinesis-client";
        version = "0.4.0.2";
-       sha256 = "1vygs2qdnwjw8pygbsncc22cq9294hmlbzi2fysi3agva2qxzmwx";
+       sha256 = "9dd7dfb150fba911b57722fe452b244924cc8460cceaf5fc455c72dbb0d0cfef";
        revision = "1";
        editedCabalFile = "4bd055f19f3ced5d6f52eec169220d7c5159cfa521128a3118aedecc9c3ad2f3";
        isLibrary = true;
@@ -23400,7 +23459,7 @@ self: {
      mkDerivation {
        pname = "aws-kinesis-reshard";
        version = "0.1.0.1";
-       sha256 = "1v7i39sd6rizrrgxpqp3pnc45sry4glkb7yi0jx8qcxf2d8bklnn";
+       sha256 = "d6d2b95013ae338cba04d19f35e9233eeb4298bde3e2db5fce3f66d3741af1ec";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23431,7 +23490,7 @@ self: {
      mkDerivation {
        pname = "aws-lambda";
        version = "0.1.0.1";
-       sha256 = "1dy9q86yvrydw7h1l1n4ciai400w7czc26mizzfi4r369mqyan89";
+       sha256 = "0959e5714d666412ddffb11ac13e3b1c00125564c4061ae0e1cde7ed0dc2c9b7";
        libraryHaskellDepends = [
          aeson aws-general base base-unicode-symbols bytestring containers
          exceptions filepath http-client http-types lens lens-action
@@ -23453,7 +23512,7 @@ self: {
      mkDerivation {
        pname = "aws-performance-tests";
        version = "0.1.1";
-       sha256 = "1m9najkh21ww4xmddad8ksnfa3if8q955q1vf3m48f52r2dl81hw";
+       sha256 = "1c06449bc8a23844ea703be05212462e0ee5ac9ea8a9d66a279c0701a75436d5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23478,7 +23537,7 @@ self: {
      mkDerivation {
        pname = "aws-route53";
        version = "0.1.2";
-       sha256 = "0qg0fzw5kb3xvldxc2sx7xgkwgspyscvs83sv3nrw91qjp6ypi18";
+       sha256 = "28c4ebcd9538249eedd87a20bd99f6573f3e5f3f5d0bd61bdd7dac59f877e061";
        libraryHaskellDepends = [
          aws base bytestring containers http-conduit http-types old-locale
          resourcet text time xml-conduit xml-hamlet
@@ -23498,7 +23557,7 @@ self: {
      mkDerivation {
        pname = "aws-sdk";
        version = "0.12.4";
-       sha256 = "0zmwfkfddiyyn264kay6m295fh23gii8axln1fjykbsdgd6yy5rb";
+       sha256 = "2b17ef4d7b4dafe9a50b967685627c43405792a8c6ab498cb0dec7d6dc74bc7e";
        libraryHaskellDepends = [
          base base64-bytestring bytestring conduit conduit-extra containers
          data-default http-conduit http-types iproute lifted-base
@@ -23525,7 +23584,7 @@ self: {
      mkDerivation {
        pname = "aws-sdk-text-converter";
        version = "0.3";
-       sha256 = "06a9sj9k1zpnzjcz8bd952fljwdn5r3vn5cg0vvc50bnidf99nfk";
+       sha256 = "d3d9945c8b7681c2f6068f15bb472eb671499d28a92df499fcf6fe3093d44919";
        libraryHaskellDepends = [
          base bytestring iproute old-locale safe strptime template-haskell
          text time
@@ -23548,7 +23607,7 @@ self: {
      mkDerivation {
        pname = "aws-sdk-xml-unordered";
        version = "0.3.1";
-       sha256 = "0f90l61npi6x59i81k2cjfklpjl5m52zj7ww04k3y5x5c7nj26nd";
+       sha256 = "cd1a21ed61a5173f26019c1ff945a985ca4ba7934ccc80622addc46b83a12039";
        libraryHaskellDepends = [
          aws-sdk-text-converter base conduit containers lifted-base mtl
          resourcet text unordered-containers xml-conduit xml-types
@@ -23571,7 +23630,7 @@ self: {
      mkDerivation {
        pname = "aws-sign4";
        version = "1.1.0.1";
-       sha256 = "1jw4dp8gg4lzski55iw5m5xihyx1cp33c334nlkd2xydrkk8rjhh";
+       sha256 = "10ca8ce6cccd77d126b5640c36c665a17b187ba985c752e2d49f92f7d06d84cb";
        libraryHaskellDepends = [
          aws base blaze-builder byteable bytestring case-insensitive
          cryptohash http-types old-locale safe time
@@ -23597,7 +23656,7 @@ self: {
      mkDerivation {
        pname = "aws-sns";
        version = "0.1";
-       sha256 = "1v1fjldn1bx65vv84zgx7np84pl4cr1wddngchkjxzci07ydrjpm";
+       sha256 = "f5cadcfc0191fd2e2764cfb6c64366845e82ae3dfd7d82f62ea6af601b952eec";
        libraryHaskellDepends = [
          aeson aws aws-general base blaze-builder bytestring conduit
          containers http-conduit http-types parsers QuickCheck resourcet
@@ -23621,7 +23680,7 @@ self: {
      mkDerivation {
        pname = "azure-acs";
        version = "0.0.1.1";
-       sha256 = "09gv4ym6nxx5854m40p06pxvxrqfhmadxlb0d72pji6hk180yg5l";
+       sha256 = "b43c0f5098d04479c56960d1de54850ee7befb35e002524941a5776baa27fb25";
        libraryHaskellDepends = [
          attoparsec base bytestring conduit conduit-extra connection
          http-conduit http-types network time
@@ -23639,7 +23698,7 @@ self: {
      mkDerivation {
        pname = "azure-service-api";
        version = "0.1.0.0";
-       sha256 = "09wb94k8f8wgcdx036x2fzixck7cbv739rrh299m7awbl4i3mfhg";
+       sha256 = "0fba3a22a18bab53531230e734ce5eec4cd6e377a29b017a638f238726498b27";
        libraryHaskellDepends = [
          base binary bytestring case-insensitive certificate
          crypto-pubkey-types http-conduit hxt hxt-xpath pretty resourcet tls
@@ -23660,7 +23719,7 @@ self: {
      mkDerivation {
        pname = "azure-servicebus";
        version = "0.1.6.0";
-       sha256 = "1ig8af14m11di9fis6s5hxmfqh7hc40c3bqyighnpi25xnv7mm13";
+       sha256 = "23d47ab6ed45c46be18b1eafc10061f040ec6a87451b1d5d8a2d844a8253e8c5";
        libraryHaskellDepends = [
          aeson async attoparsec azure-acs base bytestring case-insensitive
          conduit connection http-client http-conduit http-types network text
@@ -23681,7 +23740,7 @@ self: {
      mkDerivation {
        pname = "azurify";
        version = "0.4.0.5";
-       sha256 = "0nqkpizqiwv7wfs1bgl8q13aaqnc9wjh8gs6fyiklplnjdcpqf9g";
+       sha256 = "2f397c5993965e3aa377463f04254fcc62a546c088be15b4e367f3887fbc135b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23709,8 +23768,8 @@ self: {
      }:
      mkDerivation {
        pname = "b-tree";
-       version = "0.1.1";
-       sha256 = "1c20w9rzyj2gnd18042pv41r45cv3zvd5h83igh6w2gz1z7hl821";
+       version = "0.1.2";
+       sha256 = "201ba85e9a14b13adc759734ef0cda7ec16d5efc64189eac59f206ed734745a4";
        libraryHaskellDepends = [
          base binary bytestring containers directory errors filepath lens
          mmap mtl pipes pipes-interleave transformers vector
@@ -23733,7 +23792,7 @@ self: {
      mkDerivation {
        pname = "b9";
        version = "0.5.8";
-       sha256 = "0r8gjgmy9v655kza2c6ilngr4glijizgjddq0125s11pd40hzhvi";
+       sha256 = "71c30f016937045d4400b835f97e94913e929fa5d130a1fe2cc5ece4eb930f65";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23759,7 +23818,7 @@ self: {
      mkDerivation {
        pname = "babylon";
        version = "0.3";
-       sha256 = "12cyn149dgd9wvnc7smqsfy15mzgyfg8l17y6qz0k4dyapp8fvhf";
+       sha256 = "0e6e87ee55be91093e36fe048a9ef3efd712bcd3b8eac3ece6a9bd9648b09e89";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -23776,7 +23835,7 @@ self: {
      mkDerivation {
        pname = "backdropper";
        version = "1.2";
-       sha256 = "1z5v0p2yfgln9sv41myr10cjq60xcaav0hfzc18bmmssl8x2yljy";
+       sha256 = "5e522f3aa25ad7ba5060df41b095621d182c1908d9d740b64e963ee7c505bbfc";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -23795,7 +23854,7 @@ self: {
      mkDerivation {
        pname = "backtracking-exceptions";
        version = "0.1.0.0";
-       sha256 = "1m4z4m4ncyswvbr12dsvl0gz5398jxy99zkh22xjrdmfgl8rx6p2";
+       sha256 = "e29a9e117daeb62cbb1070fe947c97288df21fa05b3711f2da5c7b6649259fd4";
        libraryHaskellDepends = [
          base either free kan-extensions mtl semigroupoids semigroups
          transformers
@@ -23811,7 +23870,7 @@ self: {
      mkDerivation {
        pname = "backward-state";
        version = "0.1.0.2";
-       sha256 = "1akxm0v23gnph5jxwi20wq4lk07vd2kpiqns550k499yw95vqyam";
+       sha256 = "5579bc4be23e25324129dae278a768fb804909e64044de6581d7be2136a87daa";
        libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "https://github.com/luqui/backward-state";
@@ -23824,7 +23883,7 @@ self: {
      mkDerivation {
        pname = "bacteria";
        version = "1.1";
-       sha256 = "19y7p53b80lqfrs1b945l4pc73c54zivk8l6lffzznd7gmbc0mv5";
+       sha256 = "6557c0567da7d9ff9da386a2b9e327858dc32ea185a41574769802b446b9c7a7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gd X11 ];
@@ -23838,7 +23897,7 @@ self: {
      mkDerivation {
        pname = "bag";
        version = "0.1";
-       sha256 = "18n7ggrfm39mn4rva661hkxj75gjx2p3jcm0hlzpcshxyk93iblr";
+       sha256 = "99ae38d2f41d6a763f85a03239aee8f29523fb84c118b533b1358deaf27bc7a2";
        libraryHaskellDepends = [ base ];
        description = "A simple stable bag";
        license = stdenv.lib.licenses.mit;
@@ -23855,7 +23914,7 @@ self: {
      mkDerivation {
        pname = "bake";
        version = "0.4";
-       sha256 = "1xxv78i2q9hiw30vkbcx09nabqv88g3a6k872ckm9wk8isrnw2zz";
+       sha256 = "ff0b6eb38e68f2542713074da3c64368e3a56c029dadb9c1e011262c223abbf7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23884,7 +23943,7 @@ self: {
      mkDerivation {
        pname = "bamboo";
        version = "2010.2.25";
-       sha256 = "0v96ync9vkq7xyc5jmm7k7vfxpy4m1l2370m99wa8qlrpcffhrmi";
+       sha256 = "b166e81cbb9962a4784a159c2168a8c4dfeef699a7565998ef07cf9d98f5266d";
        libraryHaskellDepends = [
          base bytestring containers data-default directory filepath gravatar
          hack hack-contrib haskell98 mps mtl network old-locale old-time
@@ -23904,7 +23963,7 @@ self: {
      mkDerivation {
        pname = "bamboo-launcher";
        version = "2010.2.25";
-       sha256 = "1xp2k33jxbkf0maj3p3grv93c9vnjg6fzy6l8gg5dhil18834vdd";
+       sha256 = "ad6d32100a34c256de43d4f8efcc93762736d2ce6fdc2155056eae2ec798e2f6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -23924,7 +23983,7 @@ self: {
      mkDerivation {
        pname = "bamboo-plugin-highlight";
        version = "2009.7.5";
-       sha256 = "0f8hpampawv0csqsb504hg97r7mimkcs9irm9i2m2b13w5fciaqc";
+       sha256 = "0cabc85ce1232c51454c35c7a4d9acb19e7cd2830494a5b166607375abba1039";
        libraryHaskellDepends = [
          bamboo base bytestring hack hack-contrib highlighting-kate hxt mps
          xhtml
@@ -23943,7 +24002,7 @@ self: {
      mkDerivation {
        pname = "bamboo-plugin-photo";
        version = "2009.7.5";
-       sha256 = "19ik80hcshmw8gpsb9gwngnwvriri10xx2v6xvrz0q25cxgwdjah";
+       sha256 = "50c9c65f674560f0f3ee668bde418839e6cdedb3fca5a5ef43bc42cd204033a6";
        libraryHaskellDepends = [
          base bytestring data-default directory filepath hack hack-contrib
          haskell98 hxt mps utf8-string xhtml
@@ -23962,7 +24021,7 @@ self: {
      mkDerivation {
        pname = "bamboo-theme-blueprint";
        version = "2010.2.25.1";
-       sha256 = "1wchvz2nm4klg11wjk3yb5yvqpa26c9lg6xc65k0dwxhy0cyd2zx";
+       sha256 = "fd8be619f0b0f3066631ac9b471333425dbc7d597e4cc9437874926ac5df90f1";
        libraryHaskellDepends = [
          bamboo base bytestring containers data-default gravatar hack
          hack-contrib hcheat mps network rss utf8-string xhtml
@@ -23983,7 +24042,7 @@ self: {
      mkDerivation {
        pname = "bamboo-theme-mini-html5";
        version = "2009.11.27";
-       sha256 = "02zh9jqq46gg3hrsfjfq2skajr4jni3cisak4nd3shl6aqapw9d6";
+       sha256 = "a6257e155686423d9a2553e9c846b49264a9a616d849a7331cef1982b14cf00b";
        libraryHaskellDepends = [
          bamboo base base64-string bytestring cgi containers data-default
          directory filepath gravatar hack hack-contrib haskell98 hcheat moe
@@ -24003,7 +24062,7 @@ self: {
      mkDerivation {
        pname = "bamse";
        version = "0.9.5";
-       sha256 = "1nykyywrqmf5nyszfg3acm0ydr9z8q78wc7bgabfmjwrnpq1dw68";
+       sha256 = "c8f016f0b599cbea967aeb308e0e463fe5e641656a3cf7b5b7c5559cb9f7d3db";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -24020,7 +24079,7 @@ self: {
      mkDerivation {
        pname = "bamstats";
        version = "0.4";
-       sha256 = "0z8k47h492818yvgxggqw4gcb6m91pw70kpibf9s384vxcbj6r24";
+       sha256 = "44642317eb9ba0a1935bf14e70f80da99ac51ee1f8bdfeb647018944e021137d";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs samtools ];
@@ -24034,7 +24093,7 @@ self: {
      mkDerivation {
        pname = "bank-holidays-england";
        version = "0.1.0.3";
-       sha256 = "12k01aa0293izblgr7kszkilnw29716hddqfs9cq18h49gp6m7s5";
+       sha256 = "459f6aee4b04a28059d20eb7064d3849704be3fc7a9efce8fa712401940a608a";
        libraryHaskellDepends = [ base containers time ];
        testHaskellDepends = [ base containers hspec QuickCheck time ];
        homepage = "https://bitbucket.org/davecturner/bank-holidays-england";
@@ -24049,7 +24108,7 @@ self: {
      mkDerivation {
        pname = "banwords";
        version = "0.2.0.1";
-       sha256 = "13mnz060yi1j6gsxknn1ara34s4ymdswysypj8d94k1741jv89yn";
+       sha256 = "d627b46520274c921a92d76bcf75ab9e68325456c1dad9f53332440f0cf8b68e";
        libraryHaskellDepends = [
          attoparsec base bytestring data-default text vector
        ];
@@ -24067,7 +24126,7 @@ self: {
      mkDerivation {
        pname = "barchart";
        version = "0.1.1.1";
-       sha256 = "160ja5sdk0zdqc0ncsyldp4rmhc2g4zfa6xc7vbzf8gpqrcmzvgy";
+       sha256 = "feed5f59c6f721f7d73eac1be53e7982c19ac96dd46b6601c3ed83d974511298";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base csv diagrams filepath ];
@@ -24083,7 +24142,7 @@ self: {
      mkDerivation {
        pname = "barcodes-code128";
        version = "0.1.0";
-       sha256 = "14blxjhapn9g7cp7374f5s2nln7wgyb7a6z50gp04lnqf1aw6kmg";
+       sha256 = "af4ec35570d85202ee03e51b75967ffc586a852e8e9c712e3b2fd9aba0ec7491";
        libraryHaskellDepends = [ base bytestring HPDF ];
        jailbreak = true;
        description = "Generate Code 128 barcodes as PDFs";
@@ -24096,7 +24155,7 @@ self: {
      mkDerivation {
        pname = "barecheck";
        version = "0.2.0.8";
-       sha256 = "0hja4lrgv1faqaq41wzf1r88aw4pin8jh60k9n65yd0sxi1103a7";
+       sha256 = "470d1042ec1a345f8c4d131828918d977085500eeef340b0c2ca85fd32254a42";
        libraryHaskellDepends = [ base containers QuickCheck text time ];
        jailbreak = true;
        homepage = "http://github.com/massysett/barecheck";
@@ -24112,7 +24171,7 @@ self: {
      mkDerivation {
        pname = "barley";
        version = "0.3.0.2";
-       sha256 = "0igz39bxlw4p0fna1wf6g791pk7r1m7hfyib5rgmsdahzkkp7v2h";
+       sha256 = "50ec73e7fc50355d5f2e2b7a074f0df9cc1bd279c6f1a0ac039770da571aff45";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -24130,7 +24189,7 @@ self: {
      mkDerivation {
        pname = "barrie";
        version = "0.4.1";
-       sha256 = "10iraid6v333374mx9vinvaw6r1903ipa92xjxhl8qh4w7xmr9yv";
+       sha256 = "dba75cfbe104624461975d2475e3002964c3d5b671a75ec919638c6d5a543982";
        libraryHaskellDepends = [ base containers filepath glib gtk ];
        homepage = "http://thewhitelion.org/haskell/barrie";
        description = "Declarative Gtk GUI library";
@@ -24145,7 +24204,7 @@ self: {
      mkDerivation {
        pname = "barrier";
        version = "0.1.0";
-       sha256 = "1flhgx323dnqhh6gxmfv4m8qj2yysckrr9pzw0g7jisvk6pmcz4z";
+       sha256 = "9f7c56af995b47791ee0ffa69c27d3de0b895125dbd5fe0c84d8b621467f90ba";
        revision = "1";
        editedCabalFile = "2f75bd296d54424250895888d24eaec14bbdb35b355306306b6f8632052473bc";
        isLibrary = true;
@@ -24167,7 +24226,7 @@ self: {
      mkDerivation {
        pname = "barrier-monad";
        version = "0.1.0.1";
-       sha256 = "014nc21wnrklsvy5z7w4v9p9psn6bl210l7v97gj42cv6a8jk5nm";
+       sha256 = "d5962991329b0922df49fb5010045dc6ea9b6eda849f5ffcd67466cb83609604";
        libraryHaskellDepends = [ base comonad mtl transformers ];
        jailbreak = true;
        description = "Implementation of barrier monad, can use custom front/back type";
@@ -24180,7 +24239,7 @@ self: {
      mkDerivation {
        pname = "base";
        version = "4.8.1.0";
-       sha256 = "0rwya445hvnnzj3x5gsrmr72kr3yspd6w9mypxkrxxg19zfazjaj";
+       sha256 = "52c9afdc4fe1f59e67bfbe266edad57ee4294eae59bfd287fcd66e5808519e67";
        libraryHaskellDepends = [ ghc-prim rts ];
        description = "Basic libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -24191,7 +24250,7 @@ self: {
      mkDerivation {
        pname = "base-compat";
        version = "0.8.2";
-       sha256 = "02m93hzgxg4bcnp7xcc2fdh2hrsc2h6fwl8hix5nx9k864kwf41q";
+       sha256 = "3810c7273168a66e4b8f1051ee0c144c6728607382b17eae658bbcfe3e1ca90a";
        libraryHaskellDepends = [ base unix ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A compatibility layer for base";
@@ -24203,7 +24262,7 @@ self: {
      mkDerivation {
        pname = "base-generics";
        version = "0.1.0.1";
-       sha256 = "19k6kl66p71pza23b1n5njmj97k1pdlcm6brl1danfaxlflsmcms";
+       sha256 = "bab2aaa9a35d39ab5aa07999ca68bb619e24abb4c5863584fa379c6b0c9d66a6";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/HaskellZhangSong/base-generics";
@@ -24216,7 +24275,7 @@ self: {
      mkDerivation {
        pname = "base-io-access";
        version = "0.4.0.0";
-       sha256 = "0d0i8ndh2j42qf8ns9wprkjiffy3hyybgvs9nbf67yd50di6p263";
+       sha256 = "c3886b6203a5f963dcb249efb7bc87c33b17e5cc97276d91c38248019b451134";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/bheklilr/base-io-access";
@@ -24229,7 +24288,7 @@ self: {
      mkDerivation {
        pname = "base-noprelude";
        version = "4.8.0.0";
-       sha256 = "0kxpkahlwvmy86g94rawhv6x3kl761xf4s78jv1cjzglsb28q0zl";
+       sha256 = "f4038cc4d2f47dc9c296e868e27a3087ced1cd865c65929e41be6e4ea19ab74f";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/hvr/base-noprelude";
@@ -24241,8 +24300,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
        pname = "base-orphans";
-       version = "0.4.2";
-       sha256 = "1mfmhvb7zvyi3m5660755ph7xk4fdvhki6ssfd3i2ghzas8g1v7a";
+       version = "0.4.3";
+       sha256 = "405b6499679805b5361277e4d101240ab7848ffc009621fc29bbae2519ebfc0d";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
@@ -24255,7 +24314,7 @@ self: {
      mkDerivation {
        pname = "base-prelude";
        version = "0.1.19";
-       sha256 = "00mk7zpm3yb804h0gngvpjxhb2a6nds8qb8mwpn80s20x72083wb";
+       sha256 = "8b0f04c4e9406880ece5152d8c74b3468905bbbcfbd907200168f951ef3fb302";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nikita-volkov/base-prelude";
        description = "The most complete prelude formed from only the \"base\" package";
@@ -24267,7 +24326,7 @@ self: {
      mkDerivation {
        pname = "base-unicode-symbols";
        version = "0.2.2.4";
-       sha256 = "1afc5pchd3vw33bmjbjygkd0l5zh7glbsx4bfyxfscpc1x1l3y52";
+       sha256 = "a2f841430fec32edba778b74bde83bf0170ada7c5e2e59d7187c8f06d92dcca9";
        libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
        description = "Unicode alternatives for common functions and operators";
@@ -24279,7 +24338,7 @@ self: {
      mkDerivation {
        pname = "base16-bytestring";
        version = "0.1.1.6";
-       sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs";
+       sha256 = "5afe65a152c5418f5f4e3579a5e0d5ca19c279dc9bf31c1a371ccbe84705c449";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        homepage = "http://github.com/bos/base16-bytestring";
        description = "Fast base16 (hex) encoding and decoding for ByteStrings";
@@ -24293,7 +24352,7 @@ self: {
      mkDerivation {
        pname = "base32-bytestring";
        version = "0.2.1.0";
-       sha256 = "0z0q3fw3jzprgxmq9b2iz98kf4hwl3nydrzlaiwk81aplisfdgkl";
+       sha256 = "74bee674a45705347954f4e7e6eda01c123751fa51ac846b7ff97e39b81b187c";
        libraryHaskellDepends = [ base bits-extras bytestring cpu ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "https://github.com/pxqr/base32-bytestring";
@@ -24306,7 +24365,7 @@ self: {
      mkDerivation {
        pname = "base32string";
        version = "0.9.1";
-       sha256 = "0cpa6bvam4zd2l2hb3sdngj0dx482c9rkz4jj87n6pxsmq9id4wy";
+       sha256 = "9e931613aeba5f630f9292fc99131388f406e4b34d8f050515ed93aaf632ea32";
        libraryHaskellDepends = [ aeson base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -24321,7 +24380,7 @@ self: {
      mkDerivation {
        pname = "base58-bytestring";
        version = "0.1.0";
-       sha256 = "1ls05nzswjr6aw0wwk3q7cpv1hf0lw7vk16a5khm6l21yfcgbny2";
+       sha256 = "c2dbf598f3415053e12cca84b90fa7c0c1b02f3b784cce0157264baebf2d40d3";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring quickcheck-assertions quickcheck-instances tasty
@@ -24339,7 +24398,7 @@ self: {
      mkDerivation {
        pname = "base58address";
        version = "0.4";
-       sha256 = "0z15x9wx962ywkmh5lzfg4kq2jjmyzncbpayx2lkjnpdra4xgz7a";
+       sha256 = "eafcd789caed5a39a9e85eddc5ecf7554a812779eed302ebe45e98d479ea257c";
        libraryHaskellDepends = [
          base binary bytestring containers cryptohash
        ];
@@ -24357,7 +24416,7 @@ self: {
      mkDerivation {
        pname = "base58string";
        version = "0.10.0";
-       sha256 = "1260x4bkrizvnmylm237gpi92wazh31md9nf982sac3fsxyn0wiv";
+       sha256 = "3b72607dd76e30a5054acea656c3805f7191e27d67884a7db5fbc73c17e9c088";
        libraryHaskellDepends = [ aeson base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring hspec text ];
        homepage = "http://www.leonmergen.com/opensource.html";
@@ -24372,7 +24431,7 @@ self: {
      mkDerivation {
        pname = "base64-bytestring";
        version = "1.0.0.1";
-       sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db";
+       sha256 = "ab25abf4b00a2f52b270bc3ed43f1d59f16c8eec9d7dffb14df1e9265b233b50";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring containers HUnit QuickCheck test-framework
@@ -24390,7 +24449,7 @@ self: {
      mkDerivation {
        pname = "base64-conduit";
        version = "1.0.0.1";
-       sha256 = "07zhvn3fy60q04a5g5mzhkl17rap9jlh00vb4f6565bjha2k16g9";
+       sha256 = "e9993085827215538c236b0300a94c57e513e884bf965714011818ef86ddf01f";
        libraryHaskellDepends = [
          base base64-bytestring bytestring conduit
        ];
@@ -24409,7 +24468,7 @@ self: {
      mkDerivation {
        pname = "base64-string";
        version = "0.2";
-       sha256 = "0pkhrimabacsjalzq0y3a197fqfbspsbv8xszzg4vbb1fb59dj1y";
+       sha256 = "3ec896ca7261ad4ddeffbaa3bdf4d5cb61775250c303fca9929aa9a56acc705e";
        libraryHaskellDepends = [ base ];
        homepage = "http://urchin.earth.li/~ian/cabal/base64-string/";
        description = "Base64 implementation for String's";
@@ -24423,7 +24482,7 @@ self: {
      mkDerivation {
        pname = "base91";
        version = "2.1.0";
-       sha256 = "1lz9s7w5nlp4naj9jzwb73im0vbs5nlrddg18irjz64sgq3qd2nn";
+       sha256 = "d68a86077e9a982f7344e1b596a92d7a6d50e3388b7f99a4b2e4525bf8d1e9d3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mono-traversable ];
@@ -24443,7 +24502,7 @@ self: {
      mkDerivation {
        pname = "basex-client";
        version = "0.1.0.0";
-       sha256 = "189bmv479fmljy9w7nhc5mb7546iz8vahrmxffvgny51ywklk58n";
+       sha256 = "16954927f7a178fbb673bd66a836fad19072562d0cdac39397b4ba74c8ae2ba1";
        libraryHaskellDepends = [ base network pureMD5 utf8-string ];
        description = "A BaseX client for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -24456,7 +24515,7 @@ self: {
      mkDerivation {
        pname = "bash";
        version = "0.1.8";
-       sha256 = "1wv7haxb4vvnh9i7y17m1d7qbpl92qjrnn022g6hyxbxzmpgsw60";
+       sha256 = "c070fd6efd7d750fcd1302589b251689de854f0bf5047f6282766fb2ba8267f3";
        libraryHaskellDepends = [
          base binary bytestring containers hxt-regex-xmlschema mtl SHA
          shell-escape
@@ -24471,7 +24530,7 @@ self: {
      mkDerivation {
        pname = "basic-lens";
        version = "0.0.0";
-       sha256 = "0qgd2066vgsrzglcmw1jd7lcrpxvrzch7bnyyfxzddwxj148mvnj";
+       sha256 = "d2ee8a48909db7f6bbf3deae03d9cfbbdfcce86932f0cae8fb59bf6d0c10ed61";
        revision = "1";
        editedCabalFile = "dcb1e49555431b94fedf161e3a2169213eea59167a34eb20b91be22baac9e170";
        libraryHaskellDepends = [ base ];
@@ -24487,7 +24546,7 @@ self: {
      mkDerivation {
        pname = "basic-prelude";
        version = "0.5.0";
-       sha256 = "1l8hc99sxm27gd93zq6v0l0x2rzl6fd9zp7snh14m4yriqrn5xfi";
+       sha256 = "d1f562338ed9934a02b4fadc9f9a33f467d10105dbe03f527b47d4ae536210d1";
        revision = "1";
        editedCabalFile = "2ddf5a9d3413a8e7c877c488f63451357fcde4d187f7c560f5281a0c4856fd0b";
        libraryHaskellDepends = [
@@ -24504,7 +24563,7 @@ self: {
      mkDerivation {
        pname = "basic-sop";
        version = "0.1.0.5";
-       sha256 = "0zmjd11jckaknkifyif4zq5833cs2kxpm98j43viqc09w63brcx3";
+       sha256 = "a3b3bc86e109301cf72012a57afb149a8d810afec445efe2b4534d264368b27e";
        libraryHaskellDepends = [
          base deepseq generics-sop QuickCheck text
        ];
@@ -24517,7 +24576,7 @@ self: {
      mkDerivation {
        pname = "baskell";
        version = "0.1.1";
-       sha256 = "1vb74crz57i4qmjl8k3gxr2abz9rmpw7yl5sm1pggnlfy9wcm15l";
+       sha256 = "b484ca78f28edaf76ea8ba507ff8ad39fda544ee6f4c4465c5249ef2332367ed";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -24534,7 +24593,7 @@ self: {
      mkDerivation {
        pname = "battlenet";
        version = "0.2.0.0";
-       sha256 = "1nzli8n6lpa9jahwp3awvpafzfkx4j02bwanilh30sxfyp0mlxxa";
+       sha256 = "aa775ac1f5ae6b30208d56f12580247dbaefd4dd5c8dcba192495d6a2c8af4db";
        libraryHaskellDepends = [
          aeson base containers http-conduit text
        ];
@@ -24549,7 +24608,7 @@ self: {
      mkDerivation {
        pname = "battlenet-yesod";
        version = "0.2.0.0";
-       sha256 = "056z84rha1nwjij3am16vfp4nwgp7xzqrhkvrx9s8p1vivyb80yz";
+       sha256 = "df03b4fc8e3b5ca453cf7bc28c7f3ff7714baedb2654356494dc06053341df14";
        libraryHaskellDepends = [
          base battlenet http-conduit text yesod-core
        ];
@@ -24571,7 +24630,7 @@ self: {
      mkDerivation {
        pname = "battleships";
        version = "1.0.0";
-       sha256 = "1rg96qikd687wndwj0pgvzg2ln4vh7x304cnyiisci2ka9763cld";
+       sha256 = "8db2614e525344a663f4961130fa819b582adedfef02c99be50799362336e9e5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -24603,7 +24662,7 @@ self: {
      mkDerivation {
        pname = "bayes-stack";
        version = "0.2.0.1";
-       sha256 = "1nz4lnnxdfgacnv6mjxsgq543zxmim4rxvxbpsfx8yypjp6lsx5l";
+       sha256 = "b4744dcd95d77bd49dbeabef9e498db5ff410a7ebacb6ab665eab9d6ada5e4db";
        libraryHaskellDepends = [
          base cereal containers deepseq digamma enummapset gamma ghc-prim
          logfloat mtl mwc-random pretty random-fu random-source rvar
@@ -24620,7 +24679,7 @@ self: {
      mkDerivation {
        pname = "bbdb";
        version = "0.4";
-       sha256 = "18f07dg0f7z7b8qwmyrcl1c48mgmprnj97va33dahvm0p0iw2039";
+       sha256 = "6900c123b8a06ea8da186a9f246dbef5554458a02cfbca315ae71f075e3bc0a1";
        libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://www.nadineloveshenry.com/haskell/database-bbdb.html";
        description = "Ability to read, write, and examine BBDB files";
@@ -24632,7 +24691,7 @@ self: {
      mkDerivation {
        pname = "bcrypt";
        version = "0.0.6";
-       sha256 = "032la7v7kp0k26s3lj006hgc7a99ylqpp5qi27jxnac10yjl5bi5";
+       sha256 = "25ae42a5078129dbe51111977b31f529a9c31e3400483ab41113dc79f651540c";
        libraryHaskellDepends = [ base bytestring entropy ];
        description = "Haskell bindings to the bcrypt password hash";
        license = stdenv.lib.licenses.bsd3;
@@ -24645,7 +24704,7 @@ self: {
      mkDerivation {
        pname = "bdd";
        version = "0.2.0.0";
-       sha256 = "17hwqksqkrriqrm7sx70jzmi3r8184p485y9i7cqbakdjapb5a4q";
+       sha256 = "98a8b2ae926daa85d989c917442e4101e511eb97e0747d6ac631e789f5c41c9e";
        libraryHaskellDepends = [ base HUnit mtl transformers ];
        testHaskellDepends = [
          base directory HUnit mtl process test-framework
@@ -24661,7 +24720,7 @@ self: {
      mkDerivation {
        pname = "bdelta";
        version = "0.1.1.1";
-       sha256 = "17zapldywid4xq0a6qdxh6hnk5igjjgplfydnr800xdpicicbrww";
+       sha256 = "9ce7c5228bb7750050b6cd3b7a9f942f9669a181bd61a300eea445ee1bbdea9f";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/joeyadams/haskell-bytestring-delta";
        description = "Simple, fast binary diff/patch";
@@ -24673,7 +24732,7 @@ self: {
      mkDerivation {
        pname = "bdo";
        version = "1.0.1";
-       sha256 = "1mwc7l1n2gnw8yx5zphxlkgi6bkcw56qwifpy34wpa55x2lf6n82";
+       sha256 = "0259e3a8e8a5a8cbc9f0d7458e4de16c2e13dfa41dde5fba47dc3e61033d8cd7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base network text url ];
@@ -24690,7 +24749,7 @@ self: {
      mkDerivation {
        pname = "beamable";
        version = "0.1.1.1";
-       sha256 = "068d70ylk5b6jlg6j1c1nayb4a3mmf7r92blcgmdbjrz3ipqwg27";
+       sha256 = "473c8e6f1c3fcbd5ea637489948fab7528b2bcb28105691e956695493d380d19";
        libraryHaskellDepends = [
          base blaze-builder bytestring ghc-prim integer-gmp murmur-hash
        ];
@@ -24709,7 +24768,7 @@ self: {
      mkDerivation {
        pname = "beautifHOL";
        version = "0.11";
-       sha256 = "15k41z1p8h0b677wba4mqkfszwggkrfcp3n5hbdvdjfiqyx2hbzi";
+       sha256 = "f12f28bac7d1c9b6db82c58ecb5c9eeff1afddc495a8c5cf310b4074c30f6496";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base haskell98 mtl ];
@@ -24726,7 +24785,7 @@ self: {
      mkDerivation {
        pname = "bed-and-breakfast";
        version = "0.4.3";
-       sha256 = "0183770vkb5r9srxqr3fa4s601g10bx07b05hjr3b3nvc0ab9f6z";
+       sha256 = "dfb8b41460db8e35b28405ac03fa02e1056034516e64dcb34eb9acb9c1390305";
        revision = "1";
        editedCabalFile = "3efbed0b49112bb9addddcd87fdb8ffe58f14497c16a2aba9deb39e10dae0d4f";
        libraryHaskellDepends = [
@@ -24749,7 +24808,7 @@ self: {
      mkDerivation {
        pname = "bein";
        version = "0.3.3";
-       sha256 = "1sq6z2a9bddqh0kys10g495bfj7pcyibsvhfxfl279z53va7d6ch";
+       sha256 = "909976d41ee5a723a8eb0e6ebda267f748b74a220f04ed2780b8b59594f806eb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -24768,7 +24827,7 @@ self: {
      mkDerivation {
        pname = "benchmark-function";
        version = "0.1.0.0";
-       sha256 = "1cdbaf001m79xbpfdf3gg2z8jgyf25xqwrkg6y7da2mvk3127c5b";
+       sha256 = "abb023c298bb0ad58e376f668e7b11ce3f89be786fb8e6eeeae9d4008053abb1";
        libraryHaskellDepends = [ base process random time ];
        homepage = "xy30.com";
        description = "Test the time it takes to run a haskell function";
@@ -24780,7 +24839,7 @@ self: {
      mkDerivation {
        pname = "benchpress";
        version = "0.2.2.6";
-       sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg";
+       sha256 = "cf419681415deec13fa0fb53aa6290ab7a2d93abcef065d872137bf28453cfa7";
        libraryHaskellDepends = [ base mtl time ];
        jailbreak = true;
        homepage = "http://github.com/tibbe/benchpress";
@@ -24793,7 +24852,7 @@ self: {
      mkDerivation {
        pname = "bencode";
        version = "0.6.0.0";
-       sha256 = "12pnh598k30ggs54f0pic19j7ji8f4xn7fydkdnlig79rvzgv3iv";
+       sha256 = "3b8efdfecee9bc486d9bcdbb633b7128ca235360f102478a7e0f8c895281f68a";
        libraryHaskellDepends = [
          base binary bytestring containers parsec
        ];
@@ -24808,7 +24867,7 @@ self: {
      mkDerivation {
        pname = "bencoding";
        version = "0.4.3.0";
-       sha256 = "0f6d3g88y7i4s5wa53771n0fbkbs4na8vpy51wk21b563smdcpcc";
+       sha256 = "8c5dd6aa1ea6ac20260fc5df8d94257acde5800de78ca278d1241e8fd01bcd38";
        libraryHaskellDepends = [
          attoparsec base bytestring deepseq ghc-prim mtl pretty text
        ];
@@ -24826,7 +24885,7 @@ self: {
      mkDerivation {
        pname = "berkeleydb";
        version = "2008.10.31";
-       sha256 = "1qqzxi011xmb4b09r1j5x1b7slgrazh19csfilk4a9f91zvq6l3p";
+       sha256 = "775083f70fc92545268d4eb314e057f9517d56e845869cc022abf61040ec1fe3";
        libraryHaskellDepends = [ base binary bytestring ];
        librarySystemDepends = [ db ];
        description = "Pretty BerkeleyDB v4 binding";
@@ -24843,7 +24902,7 @@ self: {
      mkDerivation {
        pname = "berp";
        version = "0.0.2";
-       sha256 = "066m1nyfwi1nivjmcnykjdypqzkm2zqfzb07zf6f9hiz9m4g6x09";
+       sha256 = "0974f3484d3fc2e48cfb07aceff017757e7c7d93d35b56e58e3644eebc0dd518";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -24871,7 +24930,7 @@ self: {
      mkDerivation {
        pname = "bert";
        version = "1.2.2.4";
-       sha256 = "1vcbylvci91rqq5dxsa2gxc709klr0xkcflpdhcng69s6pihgsg4";
+       sha256 = "e4e907e3353a9967196c973a363bc8742670587f42e9de0ac639a4c836f58bed";
        libraryHaskellDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
          containers mtl network parsec time unix void
@@ -24890,7 +24949,7 @@ self: {
      mkDerivation {
        pname = "besout";
        version = "0.2.0.1";
-       sha256 = "0bv68nn6ijf1wv57kwp4yj6s75g960pds0n9wihxwkr4hh5azls1";
+       sha256 = "41d3af0a84244fde61e4c902dd2e30e995a38df4e4f279cae6c1c968ac45662f";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Extended GCD of polynomials over F_p[x]";
@@ -24907,7 +24966,7 @@ self: {
      mkDerivation {
        pname = "bet";
        version = "0.1.2.3";
-       sha256 = "0gy12m81bc6vgzq4m0v134jbq5lw1210dxsq4s28c0www0kxj658";
+       sha256 = "a818d927e09c0386842658f70682089c16bc241961834af07fdbb0155015c13f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -24931,7 +24990,7 @@ self: {
      mkDerivation {
        pname = "betacode";
        version = "0.1.0.0";
-       sha256 = "0ry42sp40234c83iw7di37j3jfjfbszxcv4mzgqc54b1693mjq7b";
+       sha256 = "eb605947326191c2f0fb956cd6bf5e4e3a39e419b11d1e0762640840ae16c467";
        libraryHaskellDepends = [
          attoparsec base errors hashable text text-icu
        ];
@@ -24946,7 +25005,7 @@ self: {
      mkDerivation {
        pname = "between";
        version = "0.10.0.0";
-       sha256 = "10bj4v2451c9dri3r9c825xnr4lb8jhihr05nhc6m8fdvqnyqvsi";
+       sha256 = "516fec2ddecda16a18b4056418a1448b926c7b1188a53c626e898542c4267281";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/trskop/between";
        description = "Function combinator \"between\" and derived combinators";
@@ -24958,7 +25017,7 @@ self: {
      mkDerivation {
        pname = "bf-cata";
        version = "1.1";
-       sha256 = "0f8pyd2j24x574xs73zhadsd058ib217vd12snkqzg6vg9l7vgzw";
+       sha256 = "fcbf7d687adbbc8fa7d522b47d82581115d07453f08fa33b39a5132145f31739";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        license = "LGPL";
@@ -24971,7 +25030,7 @@ self: {
      mkDerivation {
        pname = "bff";
        version = "0.3.1.2";
-       sha256 = "1i5y7pki3hyhq2vyshzi40n7yx354p7wiflfig8qxc4h31nbwi2x";
+       sha256 = "5d44be6c1890b08ed18b8ebac8cf2565747f2c20f143edb7c0d0c311e73dbec4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -24989,7 +25048,7 @@ self: {
      mkDerivation {
        pname = "bff-mono";
        version = "0.2.3";
-       sha256 = "1qswfjrij01g7g85iiyxpvk1k5hgnf6ll7jcf6b33k6dawi3a4qr";
+       sha256 = "1913352257cdcc3196714c1e4a8db30f9619e6beddc758d03b2f0019b3745ce3";
        libraryHaskellDepends = [ base containers mtl ];
        homepage = "https://bitbucket.org/kztk/bff-mono/";
        description = "\"Bidirectionalization for Free\" for Monomorphic Transformations";
@@ -25001,7 +25060,7 @@ self: {
      mkDerivation {
        pname = "bgmax";
        version = "0.1.0.1";
-       sha256 = "0wg2dh3i50c4f1bc0csi3ppbz28scjfhcr0hqfd0cpfiaf79fs5s";
+       sha256 = "ba68978e53d15d069ac31064069d641a89bfee1d5133c05670848112076ce271";
        libraryHaskellDepends = [ attoparsec base bytestring time ];
        jailbreak = true;
        homepage = "http://github.com/jonpetterbergman/bgmax";
@@ -25016,7 +25075,7 @@ self: {
      mkDerivation {
        pname = "bgzf";
        version = "0.1.0.0";
-       sha256 = "1lmwb65ads6ip5v0h8z03nyzxr9556p13j1y34lhgsyk2lxwdkrv";
+       sha256 = "3bcfc63b15d3eb0729193ec811ae2925e5febd1de0230876b9d1e8a68a59bcd2";
        libraryHaskellDepends = [
          base bytestring mtl parallel pipes streaming-commons
        ];
@@ -25030,7 +25089,7 @@ self: {
      mkDerivation {
        pname = "bibtex";
        version = "0.1.0.4";
-       sha256 = "0y6jf52361d225a1jynq7ysnwihid3qivsjqv2hbf0f8sayi8ic0";
+       sha256 = "804514bdd2c801b7a0d858ea1df16811466eb53fd87a195411a205334471d278";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base latex parsec utility-ht ];
@@ -25046,7 +25105,7 @@ self: {
      mkDerivation {
        pname = "bidirectionalization-combined";
        version = "0.1.0.1";
-       sha256 = "0bclazwhg3ra7zv19xfx5rw2z3p8h8scw5r4m281524qzrkm9j6m";
+       sha256 = "d5c85467fe98881290a82417ce3482e88e2f782eddf514f63f2a8f07f957942d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -25064,7 +25123,7 @@ self: {
      mkDerivation {
        pname = "bidispec";
        version = "0.1.3";
-       sha256 = "0y9hskhp1vcl92wrh3l7b1g6i7y9v4b06pl2qa9hhp9ladnvw7g4";
+       sha256 = "e41dbe6d53345d0893c2825e0316d9c99f685e58870e98b94894ed70e1d43079";
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Specification of generators and parsers";
        license = "LGPL";
@@ -25076,7 +25135,7 @@ self: {
      mkDerivation {
        pname = "bidispec-extras";
        version = "0.1";
-       sha256 = "0insqi63q6gvz39l0k584w583cw9m85vdx5dhpyx9qbb5zxyb0rm";
+       sha256 = "3583e5fb2f6be1d4fd85adf4b60baa89b3810a27a84c40d3f8fb193c4cc4da46";
        libraryHaskellDepends = [ base bytestring dataenc mtl ];
        jailbreak = true;
        description = "Extra helper functions for bidirectional specifications";
@@ -25088,7 +25147,7 @@ self: {
      mkDerivation {
        pname = "bifunctors";
        version = "5";
-       sha256 = "13990xdgx0n23qgi18ghhmsywj5zkr0a5bim0g8a4nzi0cx95ps1";
+       sha256 = "41df923a03f15ba2d00335aea2409ebf48ee7585f0a1101f1ec282fe5a07298d";
        libraryHaskellDepends = [ base semigroups tagged ];
        homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
@@ -25102,7 +25161,7 @@ self: {
      mkDerivation {
        pname = "billboard-parser";
        version = "1.0.0.1";
-       sha256 = "1jhiq5w4z7axlqqm6pyl1d3g1vh7ykyy2z69d9ma8qzgm6v72l05";
+       sha256 = "055071b6a9ef63a46a6ac97ce1fdf407eef0460bd45f5331a65d9d4f78c111ca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -25128,7 +25187,7 @@ self: {
      mkDerivation {
        pname = "billeksah-forms";
        version = "1.0.0";
-       sha256 = "094sq2kn0xfvy146i7r89vf1by90nqaj4ki1fk3i2rw9glrv25ms";
+       sha256 = "ba16b1337d896711c774214e2215b620f915dc4e289f6848f0db7560a7c09a24";
        libraryHaskellDepends = [
          base billeksah-pane billeksah-services Cabal containers directory
          filepath glib gtk mtl parsec pretty transformers
@@ -25147,7 +25206,7 @@ self: {
      mkDerivation {
        pname = "billeksah-main";
        version = "1.0.0";
-       sha256 = "1dyg6qfvhzxh2d90gvb8j7djqa04c3aci7rfk3s1wdqz5rkxmnlx";
+       sha256 = "9ddada672e1f371ef4982e9fc8d46004282cdb9168ed075213b07fb81d36cfb7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -25170,7 +25229,7 @@ self: {
      mkDerivation {
        pname = "billeksah-main-static";
        version = "1.0.0";
-       sha256 = "1g4zldnza6s2xvkqar4rgqirs4p8j2j4ssacg9x0zzc4njzklj7y";
+       sha256 = "fe483abfb484fd0f7a7a4c694da490e8129d237e996485e7ee421bf56da39fbc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -25193,7 +25252,7 @@ self: {
      mkDerivation {
        pname = "billeksah-pane";
        version = "1.0.0";
-       sha256 = "1ckzjbdfi3y09qvq951xki3h7q3sah41j29mgpqk45rayzqmiavg";
+       sha256 = "6fab58f1f72a1732f17d35091908547ae003479c3d9484374ec08fe8da927fb2";
        libraryHaskellDepends = [
          base billeksah-services containers directory filepath glib gtk mtl
          parsec pretty time transformers
@@ -25212,7 +25271,7 @@ self: {
      mkDerivation {
        pname = "billeksah-services";
        version = "1.0.0";
-       sha256 = "00bsbrsnclwnayqzs24c5fdz9r6ankbhnnkbkzyd1fxsl7lrziwn";
+       sha256 = "96c79fe9a1babbd0fc9f6b5a0bd7b4cae4f49b2b8c08fdb157965366755e7a01";
        libraryHaskellDepends = [
          base containers directory filepath mtl parsec pretty transformers
        ];
@@ -25228,7 +25287,7 @@ self: {
      mkDerivation {
        pname = "bimap";
        version = "0.3.0";
-       sha256 = "1j9rrxzzggvajz8laf58nda9hgf5lqsqxxc556690yyliln0gii1";
+       sha256 = "21c6072c8dd47b908c2985f58e35a6c53d9854b3a83845d1976abff77fcf39c9";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/joelwilliamson/bimap";
        description = "Bidirectional mapping between two key types";
@@ -25242,7 +25301,7 @@ self: {
      mkDerivation {
        pname = "bimap-server";
        version = "0.1.0.1";
-       sha256 = "0dgmiv1pzzrq22778a2l46knxfk5rh2vw331gcqhxx0jb23d3pq9";
+       sha256 = "09dfd1865812f40e317b610cbe05cc65ba6ea7215428748e1038ff7fc38ef535";
        libraryHaskellDepends = [
          aeson base bimap binary directory http-types unix wai warp
        ];
@@ -25259,7 +25318,7 @@ self: {
      mkDerivation {
        pname = "bimaps";
        version = "0.0.0.2";
-       sha256 = "1wipia9lil9r7lhsf9rk82k8ydy5c97qsixg0fia0ms5chmdr7qw";
+       sha256 = "1c9fdc2a644557a0a203af478d4f62c5378fa6403327a7213d39d148938a37f2";
        libraryHaskellDepends = [
          aeson base binary cereal containers deepseq hashable primitive
          QuickCheck storable-tuple unordered-containers vector
@@ -25278,7 +25337,7 @@ self: {
      mkDerivation {
        pname = "binary";
        version = "0.7.6.1";
-       sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg";
+       sha256 = "8f85cafc15be660757878a665d024ce595d4422fead174e20a501c9ec8f81067";
        libraryHaskellDepends = [ array base bytestring containers ];
        testHaskellDepends = [
          array base bytestring Cabal containers directory filepath HUnit
@@ -25296,7 +25355,7 @@ self: {
      mkDerivation {
        pname = "binary-bits";
        version = "0.5";
-       sha256 = "1577bd5q4lhw024v4hfil10iyx7v4cf72ldhxb8xhm27i80lllqn";
+       sha256 = "16534a018a4754d8d1eab051711c23fb741f41a0d141b289001c52824b5be794";
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [
          base binary bytestring QuickCheck random test-framework
@@ -25311,7 +25370,7 @@ self: {
      mkDerivation {
        pname = "binary-communicator";
        version = "1.0.2.1";
-       sha256 = "02w5ybp5fdqwz1ffvfs3pfrpx67bzh75njgzr6iai1vrdyjisfkl";
+       sha256 = "743a1da56f7987a8a2c9ff495b0efceb987eb3bb43bbed5cf81c3757eef2850b";
        libraryHaskellDepends = [ base binary bytestring mtl ];
        jailbreak = true;
        description = "Flexible way to ease transmission of binary data";
@@ -25325,7 +25384,7 @@ self: {
      mkDerivation {
        pname = "binary-conduit";
        version = "1.2.3";
-       sha256 = "0ymhxyf754j1pki7ap2vay8f9j49rzsjzp5yr253sn5wpw3qg8fr";
+       sha256 = "d9a18707bfbc583d8ac8bedc2ff5cf89c8e490575b5c75e2bc4192729cefb07a";
        revision = "1";
        editedCabalFile = "9cb1c58171575429a65947d1ef7e22c1501b4ca9becc07904c7b4a5066345e29";
        libraryHaskellDepends = [
@@ -25345,7 +25404,7 @@ self: {
      mkDerivation {
        pname = "binary-derive";
        version = "0.1.0";
-       sha256 = "1rb4fpx5hlq661md7nrpgpmi7jjdq3r1ky6q9vxl6f72h085acvl";
+       sha256 = "7433551080e23843fb4ed8f819f2c04dca13eb7d37dbd36a30065358fa7564e5";
        libraryHaskellDepends = [ base binary ghc-prim ];
        jailbreak = true;
        description = "Automatic deriving of Binary using GHC.Generics";
@@ -25360,7 +25419,7 @@ self: {
      mkDerivation {
        pname = "binary-file";
        version = "0.15.24";
-       sha256 = "134iigqjwlkj85pdp95xl6ia6fxr9l516j9b0dpg3r0zqi1kzp7i";
+       sha256 = "f1dc3f43c41fe4f16e032b49130a4db93ba3a2a1bda4db6e4172522ef18b918c";
        libraryHaskellDepends = [
          base bytestring monads-tf peggy template-haskell
        ];
@@ -25377,7 +25436,7 @@ self: {
      mkDerivation {
        pname = "binary-generic";
        version = "0.2.1";
-       sha256 = "0c6gfa1wvrcw4frrqzrfnc5ydqlbs56jq7hnxgzg89mr510mfsgz";
+       sha256 = "ff69574128b926f4feeb161e2c4dd18be2e60bb32e7f9cb3239ce5cd8372cf30";
        libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 syb text
        ];
@@ -25391,7 +25450,7 @@ self: {
      mkDerivation {
        pname = "binary-indexed-tree";
        version = "0.1";
-       sha256 = "1csbmkwrcfcfydyl2ab6s5bz1fy4fgl14m63zdyi0vy3d17zbl4d";
+       sha256 = "8dd0f54f68c36f107dfbc35412e873c4bbf057d16629417df38e3996f9ac4bb3";
        libraryHaskellDepends = [ array base ];
        description = "Binary Indexed Trees (a.k.a. Fenwick Trees).";
        license = "LGPL";
@@ -25405,7 +25464,7 @@ self: {
      mkDerivation {
        pname = "binary-list";
        version = "1.1.1.0";
-       sha256 = "03fh5ipmmjzdyywm28m2kkbxn11yb4ygrs1q2igll1mbmpm2km6x";
+       sha256 = "ddd429eaadab064a5f1438e8fc3c593e04dbd79ca22251b9f7edcb5a6f2cd00d";
        libraryHaskellDepends = [
          base binary bytestring deepseq phantom-state transformers
        ];
@@ -25418,7 +25477,7 @@ self: {
      mkDerivation {
        pname = "binary-literal-qq";
        version = "1.0";
-       sha256 = "0kbxd2ryls1zhmfg831ls219fn58xa7dq1bca48v7n7075nmh1jm";
+       sha256 = "5506586d39e0d8b311516c05dc8eeaa8589782d0340cf45c853f68eab3687d4d";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Extends Haskell with binary literals";
        license = stdenv.lib.licenses.bsd3;
@@ -25429,7 +25488,7 @@ self: {
      mkDerivation {
        pname = "binary-protocol";
        version = "1.0";
-       sha256 = "1hn6jc4j20z8ni7rpcyamam898yl6jy7zinrhy2rdjvx0p5br13h";
+       sha256 = "7084bcca057dcb968587d9c67fbc34d4a384aaaacab39b4fb4e803210993c6c2";
        libraryHaskellDepends = [ base binary bytestring mtl ];
        jailbreak = true;
        homepage = "http://github.com/gcross/binary-protocol";
@@ -25442,7 +25501,7 @@ self: {
      mkDerivation {
        pname = "binary-protocol-zmq";
        version = "0.2";
-       sha256 = "14jap6kc1jbr3i010qg2z8d0li09d3a88fwzwrlb750pn67x7amy";
+       sha256 = "beaad38fb11794b368e69f3b84d46809440a1afae26110401c79c9c0a6b94a92";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -25461,7 +25520,7 @@ self: {
      mkDerivation {
        pname = "binary-search";
        version = "0.1";
-       sha256 = "02s81jpysgqnnk8c45y9xc2fhy59mm1k2wskrl4hzhdjlp4c65f3";
+       sha256 = "c315c3c8a5b2c10f09cd53733143ada978e804ebc917c2d0b4163fedaf0c480b";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base directory doctest filepath hspec QuickCheck
@@ -25475,7 +25534,7 @@ self: {
      mkDerivation {
        pname = "binary-shared";
        version = "0.8.3";
-       sha256 = "1clqq0rqjw1v7y6glkjnfyga5gxh768flyw617g47z0qa181c0c3";
+       sha256 = "830116505018fc43de09867bea9039b0bfa29e77564efa8c3f3b708933c098b2";
        libraryHaskellDepends = [ base binary bytestring containers mtl ];
        homepage = "http://www.leksah.org";
        description = "Sharing for the binary package";
@@ -25487,7 +25546,7 @@ self: {
      mkDerivation {
        pname = "binary-state";
        version = "0.1.1";
-       sha256 = "06v3qxyl2mvwi3y29rxxf91b2vxvlh5gfznwlnzb4mxzd00aakgl";
+       sha256 = "f44da50068bf57b2bea5dc7ef70aa4bb6fb14272bde724fc887c57417dc7631b";
        libraryHaskellDepends = [ base binary bytestring containers mtl ];
        description = "Simple wrapper around Data.Binary, which adds StateT to Get/Put monads.";
        license = stdenv.lib.licenses.bsd3;
@@ -25501,7 +25560,7 @@ self: {
      mkDerivation {
        pname = "binary-store";
        version = "0.1.0.1";
-       sha256 = "1wjhc18zj6p5gy15y1b7gz0vlqdbwhmfyv82l55ggmzjv1qyv7rl";
+       sha256 = "349fed71d8f2d7f74aa1026def2ae4ab61bac17f67055f827fe51af9516050f2";
        libraryHaskellDepends = [
          base binary binary-list binary-transform bytestring bzlib deepseq
          reinterpret-cast
@@ -25522,7 +25581,7 @@ self: {
      mkDerivation {
        pname = "binary-streams";
        version = "0.1.0.1";
-       sha256 = "1kjf5ks9l7fs0fsmwk5bcyhxlrz22hi4315bqqx2jzyq6pnwf4mv";
+       sha256 = "bb12c7ed35d87f293ac6ab84412214e267daa167ab4c5eb503da1d9af42c4ece";
        libraryHaskellDepends = [ base binary bytestring io-streams ];
        testHaskellDepends = [
          base binary bytestring Cabal cabal-test-quickcheck io-streams
@@ -25539,7 +25598,7 @@ self: {
      mkDerivation {
        pname = "binary-strict";
        version = "0.4.8.2";
-       sha256 = "0cyrr45wpq5h4gg6qms54nmvhqpyj59d5bhlk316g4yjsf3484b7";
+       sha256 = "67114486d3d29367c29814aed25291fe62b8ab2545576cde23b0e0cb0bc9d933";
        libraryHaskellDepends = [ array base bytestring containers mtl ];
        jailbreak = true;
        homepage = "https://github.com/idontgetoutmuch/binary-low-level";
@@ -25555,7 +25614,7 @@ self: {
      mkDerivation {
        pname = "binary-typed";
        version = "0.3";
-       sha256 = "12yzgcrj528pss4jk753xmcrzv2qm70dacqjnx7460bcdsmyd6zy";
+       sha256 = "fe9be6ab6e6c01434eb71233d5c0a958ec9f59eda39c2989d6178922337bdf8b";
        libraryHaskellDepends = [ base binary bytestring murmur-hash ];
        testHaskellDepends = [
          base binary bytestring tasty tasty-hunit tasty-quickcheck
@@ -25570,7 +25629,7 @@ self: {
      mkDerivation {
        pname = "binarydefer";
        version = "1.2.2";
-       sha256 = "06q255kip3j31bmj01fqkikvjxbklvcaa1kv3al8v04nkqx6rg3p";
+       sha256 = "77bc6c3a9e96808da81a7b06a5d8a67375b9679cd80520eb0a438e1b6729021b";
        libraryHaskellDepends = [ base ];
        description = "Binary serialization with deferred loading";
        license = stdenv.lib.licenses.bsd3;
@@ -25584,7 +25643,7 @@ self: {
      mkDerivation {
        pname = "bind-marshal";
        version = "0.1";
-       sha256 = "13riawcdzwr97vmixvg2wf8aysxblzik2mvkrp2gqf9ywda9ksr6";
+       sha256 = "26eb9954e33e39fcc4cd735731e3a7ab6baf90e3e2ed1eeb3e29f3df1857318f";
        libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim monads-tf mtl
          numeric-prelude random stm strict transformers type-level-tf unix
@@ -25601,7 +25660,7 @@ self: {
      mkDerivation {
        pname = "binding-core";
        version = "0.2.2";
-       sha256 = "0qr7nr9cksy2cx2h8g2d485797hvv67197c654va0xwadkj5iviz";
+       sha256 = "3fee58e46c8a77a03629869d148ed91b9e740a224d3c044567c2ebc952b62763";
        revision = "1";
        editedCabalFile = "1aeacdf0ebf89a2f515ab0ef767ed86f44b4b22f740ac23d1afd76df391955c6";
        libraryHaskellDepends = [ base stm ];
@@ -25616,7 +25675,7 @@ self: {
      mkDerivation {
        pname = "binding-gtk";
        version = "0.2.1";
-       sha256 = "0l68n13w1khfqkc791l9mcnk3cb0565a9ysfn7b3hh5cjx8zi7vr";
+       sha256 = "799ff85197ac4038d6b14efba48a2960b1312dab898674d8c40ecec047b0c850";
        revision = "1";
        editedCabalFile = "9e435774bd5d6a7d9dd1e96dd9293d6a739f7ecde23838571d30866ac4628cb5";
        libraryHaskellDepends = [ base binding-core gtk mtl ];
@@ -25632,7 +25691,7 @@ self: {
      mkDerivation {
        pname = "binding-wx";
        version = "0.2.1";
-       sha256 = "07nbb6a0fmyhmx2dakkw4msxnv273hfcw3swdk3aczpfqlxd1r4i";
+       sha256 = "91e4d03ac5ee7ea6c66c5c0fce1c1c476cdb75257c4ed544afd057079459cb1e";
        revision = "1";
        editedCabalFile = "0307431866ac8b7f34ece32a684a3c70aa1b36ce74c05d815f249d1effe2efb2";
        libraryHaskellDepends = [ base binding-core stm wx wxcore ];
@@ -25647,7 +25706,7 @@ self: {
      mkDerivation {
        pname = "bindings";
        version = "0.1.2";
-       sha256 = "0zczf1yfjnfzdzv33j33vcc71zsf88a5qxsdmswxrpzika3rs6i0";
+       sha256 = "201a9d879af1dfdcb9ae4d775c14424eff7018db63c831f66fdf59e97c709f7d";
        libraryHaskellDepends = [ base ];
        description = "Deprecated package";
        license = stdenv.lib.licenses.bsd3;
@@ -25658,7 +25717,7 @@ self: {
      mkDerivation {
        pname = "bindings-DSL";
        version = "1.0.22";
-       sha256 = "0xkr1x3klpfwbh1yimah1dqmqcilifyblnf3kr6ay4gsvw74zkwr";
+       sha256 = "99cf4f0edffa11af4c9ec359babc8b34325c710b50d5e8035cdc5d3a470f7976";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
        description = "FFI domain specific language, on top of hsc2hs";
@@ -25670,7 +25729,7 @@ self: {
      mkDerivation {
        pname = "bindings-EsounD";
        version = "0.1.0.1";
-       sha256 = "0fl7gdh60k7wj3bnn5hpgsi0kkji857xb47spii7mrip5p4m8pff";
+       sha256 = "ce5d54c92d37e67a62bcfa90d54f4151ce09a27e17166bd790fc4c60607b873a";
        libraryHaskellDepends = [ base bindings-audiofile bindings-DSL ];
        libraryPkgconfigDepends = [ esound ];
        homepage = "http://cielonegro.org/Bindings-EsounD.html";
@@ -25687,7 +25746,7 @@ self: {
      mkDerivation {
        pname = "bindings-GLFW";
        version = "3.1.1.3";
-       sha256 = "0pzhlzx8h5g3cs7wr06zydabprlrf5sgdvdqmr2wg10azikxc12z";
+       sha256 = "5f04d667fc0a84c745aeb8edf6747199e6bb54f3df80cc8f66e31588faa7f05f";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [
          libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr
@@ -25709,7 +25768,7 @@ self: {
      mkDerivation {
        pname = "bindings-K8055";
        version = "0.1.2";
-       sha256 = "0daga3vh9x9gih25qgcsl0hafi4hw8h5x64ba6wbmywa9z3hrr20";
+       sha256 = "40e40cc74f8afbbab8518b985e20e29044a720a09a3d5c048c2ff504f7504f35";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ K8055D ];
        homepage = "https://github.com/jputcu/bindings-K8055";
@@ -25723,7 +25782,7 @@ self: {
      mkDerivation {
        pname = "bindings-apr";
        version = "0.1";
-       sha256 = "0fw71z74pv8dxw301iss66kmarhlgwj2lpsy0skmlqfkg98zc96k";
+       sha256 = "d324f6517ad3615aa7065e5f2a247f146655a7315ac70006ef0ded4bce0f873b";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ apr-1 ];
        jailbreak = true;
@@ -25738,7 +25797,7 @@ self: {
      mkDerivation {
        pname = "bindings-apr-util";
        version = "0.1";
-       sha256 = "0sr041vpakklpf2mmy78wl5wl8yzfbwvsy07wlplmlh5rgjdm4wx";
+       sha256 = "9d93dae4cb05d24a2fe50778bdf972df23ca0be5e8f85a85bb744e757720206b";
        libraryHaskellDepends = [ base bindings-apr bindings-DSL ];
        libraryPkgconfigDepends = [ apr-util-1 ];
        jailbreak = true;
@@ -25753,7 +25812,7 @@ self: {
      mkDerivation {
        pname = "bindings-audiofile";
        version = "0.1.0.2";
-       sha256 = "0ls0iy33i0b86fg7hx23s1d8ypa16bdiw3l8nmsni3zgnn67w6mj";
+       sha256 = "b21a7e8cb5ef8f6875b5880e1edb32415d8f5ad04374789e33688138868f4053";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ audiofile ];
        homepage = "http://cielonegro.org/Bindings-AudioFile.html";
@@ -25768,7 +25827,7 @@ self: {
      mkDerivation {
        pname = "bindings-bfd";
        version = "1.2.0.0";
-       sha256 = "0c05zr3k0az2hfyfync8z2sgdxx6gskqdb1n548fjc986cx298q4";
+       sha256 = "04a3243a332831e9102936ac86a77ea6f7f6b4f88859efbc83e22b3047fe0530";
        libraryHaskellDepends = [ array base containers unix ];
        librarySystemDepends = [ bfd opcodes ];
        libraryToolDepends = [ alex happy ];
@@ -25784,7 +25843,7 @@ self: {
      mkDerivation {
        pname = "bindings-cctools";
        version = "3.6.1.0.1.0.0.1";
-       sha256 = "1k0p0m09ndk6c42h3yy230q86fnm0hzr1zjr3871f9hapvnvzqr8";
+       sha256 = "28e3bfedbe0a26170e1a59fe903f04d53a833018c2fb01056166369b400517cc";
        libraryHaskellDepends = [ bindings-DSL ];
        librarySystemDepends = [ dttools ];
        homepage = "http://bitbucket.org/badi/bindings-cctools";
@@ -25800,7 +25859,7 @@ self: {
      mkDerivation {
        pname = "bindings-codec2";
        version = "0.1.1.0";
-       sha256 = "0mpb79djfqi0had6rx20jsgahdfv23bnp0i25lbxv8vg72m3wdnn";
+       sha256 = "d6363eaa386fa3dd172d22826bd710db35a89e9640f46c9a822062275b3aeb56";
        revision = "1";
        editedCabalFile = "48e69a5b497247c96ab7a6ed3ff818bef596c712249819e63a84c4667ef5d0b1";
        isLibrary = true;
@@ -25819,7 +25878,7 @@ self: {
      mkDerivation {
        pname = "bindings-common";
        version = "1.3.4";
-       sha256 = "1zbm8v5xp4pay6h0y24ngf8nw96ab0zr754b9n2zczadiarccmcb";
+       sha256 = "8b55c6b28a4d7df6854d8b94933f58ca246e917b96080fa0f1ea92dbcb4675fd";
        libraryHaskellDepends = [ base ];
        description = "This package is obsolete. Look for bindings-DSL instead.";
        license = stdenv.lib.licenses.bsd3;
@@ -25831,7 +25890,7 @@ self: {
      mkDerivation {
        pname = "bindings-dc1394";
        version = "0.2.1";
-       sha256 = "06xg2amlcqldb7h0xaw8dvzq65npirsibbgmbr5n8s59rwa6hfwq";
+       sha256 = "983b6814cfa968644b5ef5ad15758ed71683ff6e88ab0ee0598d6246ab12af1b";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ dc1394 ];
        libraryToolDepends = [ c2hs ];
@@ -25846,7 +25905,7 @@ self: {
      mkDerivation {
        pname = "bindings-directfb";
        version = "0.1";
-       sha256 = "0mmba1h9in9xh590nmr1vb5ccqng3nwdc4q0b9d67v22cmc7fhpp";
+       sha256 = "f74277586542ec635a5a0013d6b81dcf62c6cada21570b52813dd9986050ab56";
        libraryHaskellDepends = [ base bindings-DSL bindings-posix ];
        libraryPkgconfigDepends = [ directfb ];
        description = "Low level bindings to DirectFB";
@@ -25858,7 +25917,7 @@ self: {
      mkDerivation {
        pname = "bindings-eskit";
        version = "0.0.1";
-       sha256 = "0j0fi74ky1qdvkgbapyq8fag2linawz3ndgzgi8lcci8lsby0n72";
+       sha256 = "e258e097a6283246517cff353b3e573652f19443d85fb5dedc0d073fc9890e48";
        libraryHaskellDepends = [ array base bindings-DSL ];
        librarySystemDepends = [ eskit ];
        libraryPkgconfigDepends = [ eskit ];
@@ -25874,7 +25933,7 @@ self: {
      mkDerivation {
        pname = "bindings-fann";
        version = "0.0.2";
-       sha256 = "1hryjj9aabaxrcgmr3i6sklbyb58djzsrlssidgll3vb0wwcgbq7";
+       sha256 = "07afc738076b0f4a5f8b5ad3acbf6ca82cbfe8d4268e5c1fcb5d2da592943ec3";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ fann ];
        description = "Low level bindings to FANN neural network library";
@@ -25887,7 +25946,7 @@ self: {
      mkDerivation {
        pname = "bindings-fluidsynth";
        version = "0.1.1";
-       sha256 = "04q5zxv4iyjb7zf7bhx19cfc8nhnqxmxnl1q63qszjysmlpy39g5";
+       sha256 = "e5a5e12faddacbaff1303850db6bc7165ac41c4ba1c375dc3f4bfa4876ff0513";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ fluidsynth ];
        homepage = "http://github.com/bgamari/bindings-fluidsynth";
@@ -25900,7 +25959,7 @@ self: {
      mkDerivation {
        pname = "bindings-friso";
        version = "0.1.0.0";
-       sha256 = "0wg120qrqqf2g38ifjkwj5cc42sdcdn2lrs93wrdq9dd7kldn79c";
+       sha256 = "2c1ddbe83cad25dc321f49672a6c634d0bc258917c4a17d178c2619c3110e171";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ friso ];
        description = "Low level bindings for friso";
@@ -25913,7 +25972,7 @@ self: {
      mkDerivation {
        pname = "bindings-glib";
        version = "0.1.5";
-       sha256 = "0jhifzbwbphlzz9ffv3pyjv27phvcvky1gczmi9kvfz761b9qgyx";
+       sha256 = "dd3f9c5630e7bb3d53ac9fbde0e7661bde23b6f4776ce7d2ff14dec5d777114a";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings to GLib";
@@ -25925,7 +25984,7 @@ self: {
      mkDerivation {
        pname = "bindings-gobject";
        version = "0.4";
-       sha256 = "1r2cg06r068nfyppjs2kwfmam7vk5x0l4f865arrrgrqam3bs1av";
+       sha256 = "5b05bd465538bf9cb32a063942412f739faaaae3536879af771619900d784ce4";
        libraryHaskellDepends = [ base bindings-DSL bindings-glib ];
        libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings supporting GObject and derived libraries";
@@ -25937,7 +25996,7 @@ self: {
      mkDerivation {
        pname = "bindings-gpgme";
        version = "0.1.6";
-       sha256 = "0mwlb1fk852pk6an3ay9mgxmxqf6f6bzm965agm80yhr2ab3iqhq";
+       sha256 = "18e2389612197a80ea53c5a4fa9771c6e15efbabc9ab6195995714345d589457";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ gpgme ];
        homepage = "http://bitbucket.org/mauricio/bindings-gpgme";
@@ -25950,7 +26009,7 @@ self: {
      mkDerivation {
        pname = "bindings-gsl";
        version = "0.2.1";
-       sha256 = "0yv0k6r2pd4bbq0qsf6wfx752qn0d2d0s3jfa633gy6sg97j2n3y";
+       sha256 = "7e58214f7adaf83786514e0e0d9a68c062514e77dc388d015e8bb42bb299607b";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
@@ -25962,7 +26021,7 @@ self: {
      mkDerivation {
        pname = "bindings-gts";
        version = "0.1.1";
-       sha256 = "1niqkxw7wxircwgvd9z4q9j3jxswifhl0h88v3j35lbxhiz6v7kh";
+       sha256 = "709e6d7e847dd132e4d8084140a18b5c773964c2e4a7b61f6739767e789f38da";
        libraryHaskellDepends = [ base bindings-DSL bindings-glib ];
        libraryPkgconfigDepends = [ gts ];
        description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library";
@@ -25975,7 +26034,7 @@ self: {
      mkDerivation {
        pname = "bindings-hamlib";
        version = "0.1.0.0";
-       sha256 = "1na9v5s5lqdnnj031zmqg3xfpsvy80gzr7qg0f3gsyyniww72xlz";
+       sha256 = "9f7671388fd67bfd86030f9ffc1f407eebebfa78b8fe3080b4b6615a74d949d9";
        revision = "1";
        editedCabalFile = "1eea9735be1dd9f54d91406fbf56da41b8d68a3760ada5e4fc4caf0658c997c9";
        isLibrary = true;
@@ -25993,7 +26052,7 @@ self: {
      mkDerivation {
        pname = "bindings-hdf5";
        version = "0.1";
-       sha256 = "0x6p1mwwnpcd5bd6iy4di11n7b45c4zp9d6l957mmhsyg24h2n79";
+       sha256 = "e9580189785ec35a4f49d4b4743f6185ac6343888df868da2a8d5dcb790dd774";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Project bindings-* raw interface to HDF5 library";
        license = stdenv.lib.licenses.bsd3;
@@ -26005,7 +26064,7 @@ self: {
      mkDerivation {
        pname = "bindings-levmar";
        version = "1.1.0.3";
-       sha256 = "1da9n88wwjpm3ph7q73niv3cslpa0h8r0lsyfl35arymxfqpb4c0";
+       sha256 = "809175b1ebd5675506755e53901104ea52cdc68e761c7ce01df54ace11b249b5";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ blas lapack ];
        homepage = "https://github.com/basvandijk/bindings-levmar";
@@ -26018,7 +26077,7 @@ self: {
      mkDerivation {
        pname = "bindings-libcddb";
        version = "0.3";
-       sha256 = "1hygdr4w27igwc513vs7rc9i2xcmr1ndvbiwhkrdw2x0wsmz6yyy";
+       sha256 = "de7bf3abe6a00bdef2843caedd6cc895751113cb47ef110ae32f1ec1496ecfc3";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libcddb ];
        homepage = "http://bitbucket.org/mauricio/bindings-libcddb";
@@ -26031,7 +26090,7 @@ self: {
      mkDerivation {
        pname = "bindings-libffi";
        version = "0.3";
-       sha256 = "1321hr92nsa7fljxxir8waj7i42m8dvz76h693vp4n3lqll9hcf9";
+       sha256 = "c9319828c5745872f748069af37743559078a4e228c7de257547692b5286418c";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libffi ];
        description = "Low level bindings to libffi";
@@ -26043,7 +26102,7 @@ self: {
      mkDerivation {
        pname = "bindings-libftdi";
        version = "0.1";
-       sha256 = "07kabkvdjiskika9vddrf9vhknld1x9s4m3b89d9m6l4gb2ln76i";
+       sha256 = "d11c4bc57a849a9a5a426b54a2530f8dda097772b9b59dd48c5347d9f65c6a1e";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libftdi libusb ];
        description = "Low level bindings to libftdi";
@@ -26056,7 +26115,7 @@ self: {
      mkDerivation {
        pname = "bindings-librrd";
        version = "0.2.0.1";
-       sha256 = "1dyhq06rs91g77c67lfnscn7l9fgbzikiqnv2d494jd60y1q8n8y";
+       sha256 = "1e59848307a649924813dbe238e35fcf257a2cd3d6d163d8392f249d0dc0d0b7";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ librrd ];
        homepage = "http://cielonegro.org/Bindings-librrd.html";
@@ -26072,7 +26131,7 @@ self: {
      mkDerivation {
        pname = "bindings-libstemmer";
        version = "0.1.0.0";
-       sha256 = "03plarpy0fpv9anqnaqwcji3vij2qrxd4qmli77jb5npmax20r92";
+       sha256 = "226520baaad79625cf89b462d27ac642c63da2641c2b8bad4afb3ae06f56f40e";
        libraryHaskellDepends = [
          base bindings-DSL resourcet transformers
        ];
@@ -26087,7 +26146,7 @@ self: {
      mkDerivation {
        pname = "bindings-libusb";
        version = "1.4.5.0";
-       sha256 = "0xnx9p6wqbwiaqigdnf7x6vd0qq7w9wm0vxsh93adpb5wdpjza66";
+       sha256 = "c6a82f6fe365dda64682ba6f5079e20763d0b6e9c7d9f62256912fcccd4ddd76";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libusb ];
        homepage = "https://github.com/basvandijk/bindings-libusb";
@@ -26100,7 +26159,7 @@ self: {
      mkDerivation {
        pname = "bindings-libv4l2";
        version = "0.1";
-       sha256 = "0s31dh5g26nldb6aq6q4i6ypgajincw7n3d3vm838x3w320qvg2g";
+       sha256 = "4fbc8d81187c743450dda30d7b38b351aa77bd89041baccc6ad41af10a6c6168";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ v4l2 ];
        homepage = "https://gitorious.org/hsv4l2";
@@ -26114,7 +26173,7 @@ self: {
      mkDerivation {
        pname = "bindings-libzip";
        version = "0.11";
-       sha256 = "0hqkp4hvav67xqjfwbik3i06vq8f78jjzf37ncl6wwcw5w65hhrj";
+       sha256 = "3243580c2f9c716e28b367b82f253a0ee16d401c332eee24eec76cb521b91343";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libzip ];
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
@@ -26127,7 +26186,7 @@ self: {
      mkDerivation {
        pname = "bindings-linux-videodev2";
        version = "0.1";
-       sha256 = "1pqi8ks441m1s1md6nhjr7zhal5fv6s71xq4881zijd539qhq9dq";
+       sha256 = "b8250c711aa5c9f8034204f770b4d9ae5005ffc9125ad36ad0a10642f44411df";
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        homepage = "https://gitorious.org/hsv4l2";
        description = "bindings to Video For Linux Two (v4l2) kernel interfaces";
@@ -26140,7 +26199,7 @@ self: {
      mkDerivation {
        pname = "bindings-lxc";
        version = "0.2.0.1";
-       sha256 = "0w61xzx8krr1pfa9ys7akpra2r0njziysm3ri08fb98g75hp9942";
+       sha256 = "82a47461390fa5e510887954ede3971664a1f29dea689f94bb21e789faefc170";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ lxc ];
        jailbreak = true;
@@ -26154,7 +26213,7 @@ self: {
      mkDerivation {
        pname = "bindings-mmap";
        version = "1.0";
-       sha256 = "19qdf5z6mf8j8inlnax0nv1wiv4va27z4a303hpkbgda459093nd";
+       sha256 = "cd8e045221aabd352f1c6028f28f509becc8c3b6a02b4b6d4412b96a7e710da7";
        libraryHaskellDepends = [ bindings-posix ];
        description = "(deprecated) see bindings-posix instead";
        license = stdenv.lib.licenses.bsd3;
@@ -26165,7 +26224,7 @@ self: {
      mkDerivation {
        pname = "bindings-mpdecimal";
        version = "0.8.0.0";
-       sha256 = "18i68ivsrdndjpfnyq6dlmmkkx22v3rp619nm26af8ka3qai12j5";
+       sha256 = "458a10151e6a22a78ca8360573f3d842f4396ba5cd606fdd95cdb6ac774426a2";
        libraryHaskellDepends = [ base bindings-DSL ];
        jailbreak = true;
        homepage = "http://www.github.com/massysett/bindings-mpdecimal";
@@ -26181,7 +26240,7 @@ self: {
      mkDerivation {
        pname = "bindings-nettle";
        version = "0.4";
-       sha256 = "11fnyjxb6gvl2mfnsahzadd5xj0y1p25n98qbhrkzziaihsf01ph";
+       sha256 = "f006e0348c2afe3f335c18255bc40d1ec85e5a531f2a6d5d15743fb3baf4d685";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ nettle ];
        testHaskellDepends = [
@@ -26197,7 +26256,7 @@ self: {
      mkDerivation {
        pname = "bindings-parport";
        version = "0.0.4";
-       sha256 = "1q404clpqzv0gik80ycipl94hvj27397z5cw1cs7b0yxlypllg3j";
+       sha256 = "723c4aafa7dd8375340b9c957fd238426e4812bd917980667c607f7c292380e0";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "parport bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -26208,7 +26267,7 @@ self: {
      mkDerivation {
        pname = "bindings-portaudio";
        version = "0.1";
-       sha256 = "0wcxq300ijfkf4zc7p4xwsd9wzhnlss0kxjf04fka01mf9bh3ai2";
+       sha256 = "22aa0157723500351d014ef609b4a6167e9e9ae69ddcc33e71d3c908c0c09d71";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
@@ -26220,7 +26279,7 @@ self: {
      mkDerivation {
        pname = "bindings-posix";
        version = "1.2.6";
-       sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff";
+       sha256 = "cefd0c942dab939ea0c944f56a430aef9fc1afeb66dd74de75af38e0161eeafb";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Low level bindings to posix";
        license = stdenv.lib.licenses.bsd3;
@@ -26231,7 +26290,7 @@ self: {
      mkDerivation {
        pname = "bindings-potrace";
        version = "0.1";
-       sha256 = "0vb889f49li0lwy3zsji0f1cwzriizh9x6kg3r8676q5j08p7znd";
+       sha256 = "cdfe731190059b63501e6f9a9ee08f317fce820351ea3f3ca720d2445c42686d";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ potrace ];
        homepage = "https://github.com/rwbarton/bindings-potrace";
@@ -26244,7 +26303,7 @@ self: {
      mkDerivation {
        pname = "bindings-ppdev";
        version = "0.0.3";
-       sha256 = "18px429hplpabfhapwasbdgw8ynfm3vr5rf81pp173j1z0bv4ygq";
+       sha256 = "f879b217f8418e13ee0dc8e592f7a8ce7ac45f5b5af1aba05bead20b9320fda2";
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "PPDev bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -26257,7 +26316,7 @@ self: {
      mkDerivation {
        pname = "bindings-saga-cmd";
        version = "0.1.1.1";
-       sha256 = "11k56zsz1fg0hb0pqamq2hh3gczzqgj105qss5xrk0cgmsphhbmy";
+       sha256 = "be2e08afae8f81997bd11a1710e4c3ffb3372014b82a7cc182e0b9f0f5376586";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -26276,7 +26335,7 @@ self: {
      mkDerivation {
        pname = "bindings-sane";
        version = "0.0.1";
-       sha256 = "0jxhc0x5hq6y7iznqlxbgnl37a7k8yki2ri475gyc158d47b0zm2";
+       sha256 = "a27eb00e69a804e65f39246611a747f3a833a87dab536c7f3cde60583a60b04b";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ saneBackends ];
        homepage = "http://floss.scru.org/bindings-sane";
@@ -26289,7 +26348,7 @@ self: {
      mkDerivation {
        pname = "bindings-sc3";
        version = "0.4.1";
-       sha256 = "07vp6hzjjrbh3j152mq8f1i6xh9m2r20a555y03p9fzdfrb5kixd";
+       sha256 = "adc7595676edbb7407f0a51405441635c16e6270085751821c7065293f34771f";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ scsynth ];
        homepage = "https://github.com/kaoskorobase/bindings-sc3/";
@@ -26303,7 +26362,7 @@ self: {
      mkDerivation {
        pname = "bindings-sipc";
        version = "1.1";
-       sha256 = "1r2akdkhw054k6vg9a7jpm9ck280lsfkizz7y6cqbn1hy463grkd";
+       sha256 = "6de6370cf130d88599f1e7ff389da60089c952bdf2a8f4b699a4000e679b4ae4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -26320,7 +26379,7 @@ self: {
      mkDerivation {
        pname = "bindings-sophia";
        version = "0.2.0.2";
-       sha256 = "0fiibm7nrsx9pzi2lvhhbw71bah6s22h3jvn417ng3lj6ghhzii6";
+       sha256 = "26c60fe133928e674f2076cb0185d006aa150e5f106e2ae2bfa9eb6c4f5d313a";
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Low-level bindings to sophia library";
        license = stdenv.lib.licenses.bsd3;
@@ -26331,7 +26390,7 @@ self: {
      mkDerivation {
        pname = "bindings-sqlite3";
        version = "1.0.3";
-       sha256 = "0f30a7xdx50gs7hdv16b3m2055f0ar5c2cani318iwympnrpgww1";
+       sha256 = "81f377b3bdd5f388c2885631c14a56c09502441dcb84dde0d10f94defa516038";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ sqlite ];
        description = "Low level bindings to sqlite3";
@@ -26343,7 +26402,7 @@ self: {
      mkDerivation {
        pname = "bindings-svm";
        version = "0.2.1";
-       sha256 = "1nnmyxn28qdfy2sclnxv2mf2d426vrzgs7f0vvqri6fkjnvmk11b";
+       sha256 = "2b8459b795d39998f1dec01dfd7ede4690265c15bb5bcab4f0ae61246cf7d5da";
        libraryHaskellDepends = [ base bindings-DSL ];
        homepage = "http://github.com/tanimoto/bindings-svm";
        description = "Low level bindings to libsvm";
@@ -26355,7 +26414,7 @@ self: {
      mkDerivation {
        pname = "bindings-uname";
        version = "0.1";
-       sha256 = "1lsw4dh5vgmfvrx62ns5kmngzlmjzbxkx43x5i2k5qlmzp1pa3hk";
+       sha256 = "130e75c3fd95e232452c7d903efbfab2d2ff6c9d455b617adeaebe5d60235cd3";
        libraryHaskellDepends = [ base ];
        description = "Low-level binding to POSIX uname(3)";
        license = stdenv.lib.licenses.publicDomain;
@@ -26366,7 +26425,7 @@ self: {
      mkDerivation {
        pname = "bindings-yices";
        version = "0.2";
-       sha256 = "13yfhx6krj59qij9yvcl4fr6znd28nbldbv0qfhf83h3h18araf9";
+       sha256 = "c9a9ac5080030ee4a0c360af469745a2d96fb223946d9f64c4a9c83c4d87ce8f";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ gmp yices ];
        description = "Bindings to the Yices theorem prover";
@@ -26380,7 +26439,7 @@ self: {
      mkDerivation {
        pname = "binembed";
        version = "0.1.0.3";
-       sha256 = "163cs2qfj68dvbsyfg37hzb29jp0ylfpqlnhzjswm4j8mrcfsl3r";
+       sha256 = "7950ed58ae4892cab5fcd0527c1df5e0ca24d687673ce7f5da0d19e9b0d06c98";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring Cabal ];
@@ -26398,7 +26457,7 @@ self: {
      mkDerivation {
        pname = "binembed-example";
        version = "0.1.0.3";
-       sha256 = "06lw6jvg382k3wj8ybld05bj3nchb8dqk363a69mak3r5zxg43iy";
+       sha256 = "3e0ef2fa2f794c559351c38c891b5a90d92157018d2e8f241f53a0f1b6349c1a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -26417,7 +26476,7 @@ self: {
      mkDerivation {
        pname = "bio";
        version = "0.5.3";
-       sha256 = "1vby3nbqbwza65jg5d0bmzh22i5s20cjbqdgaq9zasza7ywgkj22";
+       sha256 = "42c8f9b83fea6bf51356afe1251910ba4421e0af0bb4f26431eaf385971d7eed";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -26439,7 +26498,7 @@ self: {
      mkDerivation {
        pname = "bioace";
        version = "0.0.1";
-       sha256 = "08k2w66gpysjk038pi50lc21gbn2dyp5z8ls0qhcmjqc59dn8hvg";
+       sha256 = "6f43645b2a0ccbca20069aa25fae6fc2ae1704a3a0c48b069852fbfb8ce16222";
        libraryHaskellDepends = [
          base bioalign biocore bytestring parsec
        ];
@@ -26453,7 +26512,7 @@ self: {
      mkDerivation {
        pname = "bioalign";
        version = "0.0.5";
-       sha256 = "006gg8ds6klrl9rc1csi247rf8gzlgn9mdi0jl4pjz5xmf0jw5dr";
+       sha256 = "b9152e81abbd7c79099520b69aeca3ff21970f1151b3c072a2994ea31b7acf00";
        libraryHaskellDepends = [ base biocore bytestring ];
        homepage = "https://patch-tag.com/r/dfornika/biophd/home";
        description = "Data structures and helper functions for calculating alignments";
@@ -26465,7 +26524,7 @@ self: {
      mkDerivation {
        pname = "biocore";
        version = "0.3.1";
-       sha256 = "06ml9p144bv0c9hv6pkcvhdgc0vw0jxzbqb834ilr38kjmrpsar1";
+       sha256 = "212b7d7395138d4c231968e1f5bb047c03f61adc6c5eb36162602f42c24db41a";
        libraryHaskellDepends = [ base bytestring stringable ];
        description = "A bioinformatics library";
        license = "LGPL";
@@ -26476,7 +26535,7 @@ self: {
      mkDerivation {
        pname = "biofasta";
        version = "0.0.3";
-       sha256 = "1l770sg2gcg7wl5yfrrk9nr7hgd5m0q158ad5nd8z7i5vsfah8b2";
+       sha256 = "6221a89cde259e8f9a2d4da11230a8a53d78b24d3367e70be5e7b1279e06e7d0";
        libraryHaskellDepends = [ base biocore bytestring ];
        homepage = "https://patch-tag.com/r/dfornika/biofasta/home";
        description = "Library for reading fasta sequence files";
@@ -26488,7 +26547,7 @@ self: {
      mkDerivation {
        pname = "biofastq";
        version = "0.1";
-       sha256 = "0453cb2sw6x9hx3z7w3fvymwi0l0s86wlvi6vvsh0jcwas3iirbl";
+       sha256 = "74e51887569c4900f5de266eca0dd28082c8abdf6ef0f34787a91baec562a310";
        libraryHaskellDepends = [ base biocore bytestring ];
        homepage = "http://biohaskell.org/";
        description = "A library for reading FASTQ files";
@@ -26502,7 +26561,7 @@ self: {
      mkDerivation {
        pname = "biophd";
        version = "0.0.8";
-       sha256 = "0p3xfv61xzz29qg660pcsgns7r5q1cybk3hdvdnwf0cqdc9fhxbl";
+       sha256 = "7475e8126b9801c76ddb0d8eb93c0bb8e4a3edd3ec02631e4ee2ff1ecc767d5c";
        libraryHaskellDepends = [
          base binary biocore bytestring parsec text time time-locale-compat
        ];
@@ -26519,7 +26578,7 @@ self: {
      mkDerivation {
        pname = "biopsl";
        version = "0.4";
-       sha256 = "1v9vg9gnrf606raqlzcd15irg60v3cf5m0yy5qsdyxm24102bgmj";
+       sha256 = "b2be254020a276df342ede835a1c1b1b989763098d7d8a5536c0b86c5f7a3bed";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base biocore bytestring ];
@@ -26536,7 +26595,7 @@ self: {
      mkDerivation {
        pname = "biosff";
        version = "0.3.7.1";
-       sha256 = "1mxsqxcf5sh37gpfqil499i9n8wi3sk5sl2cx6x6agbc0n726bwq";
+       sha256 = "982f238e056c3d65bae94c505da61e91239b624a8446ecee3b03eae258c7bad7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base binary biocore bytestring ];
@@ -26556,7 +26615,7 @@ self: {
      mkDerivation {
        pname = "biostockholm";
        version = "0.3.4";
-       sha256 = "04k7cl8fjsi2mv60p2qg2nmy86z2adw9gzjnkxffqsc1q85y4lz7";
+       sha256 = "e753e20bc28169ec5c9f56fe977853e21be4ab150f8b0bccae226ae910656712";
        libraryHaskellDepends = [
          attoparsec attoparsec-conduit base biocore blaze-builder
          blaze-builder-conduit bytestring conduit containers deepseq
@@ -26579,7 +26638,7 @@ self: {
      mkDerivation {
        pname = "bird";
        version = "0.0.19";
-       sha256 = "0w380dcpk8gp5cx24nh6xlnibd6pw93wmxcajl26p4kd5cxbgfqz";
+       sha256 = "1fbbb73a2b6d926b04958af5ca47e2d7b4152ded065a223a2bf7a17959036870";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -26599,7 +26658,7 @@ self: {
      mkDerivation {
        pname = "bit-array";
        version = "0.1.0";
-       sha256 = "0v04drr3m3096shp70l4iwqzva45szjhfl1yzaqblvn49hky8kns";
+       sha256 = "da4ee4274cc46ebab0fa3e5007e5d785a8fd318f848273a136098c3a726e046c";
        libraryHaskellDepends = [ base loch-th numeric-qq placeholders ];
        testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
@@ -26616,7 +26675,7 @@ self: {
      mkDerivation {
        pname = "bit-vector";
        version = "0.2.0";
-       sha256 = "1h3hm1akbj2qzl3df877hfgz3fanhvrj6czxvjbpcalpf3d6h5z1";
+       sha256 = "e11768da70972a7697dcfd3323f38656b9f19f83e720d706fd58c83555a870c0";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th vector
@@ -26631,7 +26690,7 @@ self: {
      mkDerivation {
        pname = "bitarray";
        version = "0.0.1.1";
-       sha256 = "00nqd62cbh42qqqvcl6iv1i9kbv0f0mkiygv4j70wfh5cl86yzxj";
+       sha256 = "b27f6f1065053a0e8e24fbf9382b7060af9962d8d150b631c682c0c58469d802";
        libraryHaskellDepends = [ array base ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Mutable and immutable bit arrays";
@@ -26647,7 +26706,7 @@ self: {
      mkDerivation {
        pname = "bitcoin-api";
        version = "0.12.1";
-       sha256 = "0c1ydggik4k3vj93bqk53privyblkwhd32jizw25qk5j34axwy69";
+       sha256 = "c978de1519b24c5c04ff518ad1209f74f91df31d65e23592dc639219df6b3e30";
        libraryHaskellDepends = [
          aeson base base58string binary bitcoin-block bitcoin-script
          bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text
@@ -26670,7 +26729,7 @@ self: {
      mkDerivation {
        pname = "bitcoin-api-extra";
        version = "0.9.1";
-       sha256 = "1z6pppjgq6sy4q78k176pnr6y3lq369brqf0pg90v0qggl0cc8y4";
+       sha256 = "c423c6007d0f830dd2bbc0e1bc9219980e6fb2bde684890e265e1bfce4bdd7fc";
        libraryHaskellDepends = [
          base binary bitcoin-api bitcoin-block bitcoin-tx bytestring conduit
          lens stm stm-chans stm-conduit text transformers
@@ -26691,7 +26750,7 @@ self: {
      mkDerivation {
        pname = "bitcoin-block";
        version = "0.13.1";
-       sha256 = "0nkx86fwv65x9vz6ni6qgz61afnvcifw2g92bnwdli8hww7prxfp";
+       sha256 = "d7f57c0fe71045dab85d223dc15d64db3a15cc7fd8446bfe4ebd98cd9d417d5a";
        libraryHaskellDepends = [
          base binary bitcoin-tx bitcoin-types bytestring cryptohash
          hexstring largeword lens
@@ -26713,7 +26772,7 @@ self: {
      mkDerivation {
        pname = "bitcoin-rpc";
        version = "0.5.0.1";
-       sha256 = "0bx54033w0yjb2isd7cvnd46qz3nqs7z6flw0mb1nkd81sdxbhp2";
+       sha256 = "e2c2d59b0ea84d1b56059c3af38fc6767c6c48b39b9da6a358d2033e0620a52f";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal containers ghc-prim HTTP
          mtl network text unix unordered-containers watchdog
@@ -26736,7 +26795,7 @@ self: {
      mkDerivation {
        pname = "bitcoin-script";
        version = "0.11.1";
-       sha256 = "0k3v35p6qpgh88gc5rqpcmh202xrn2rind9641dinwqqx631v31r";
+       sha256 = "398c1d86e918731b5b2026351bb3b0b90b20606517e7c21e42f05d6c6e197b4c";
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring text
        ];
@@ -26753,7 +26812,7 @@ self: {
      mkDerivation {
        pname = "bitcoin-tx";
        version = "0.13.1";
-       sha256 = "006c55l6q6cknxw0k0kzr8vkv8azapfb4mkax6ac6rih6mjq5f1v";
+       sha256 = "3bb88265353066c394e96a56b2dc555fa13d37ca7f820978b793196c6829cc00";
        libraryHaskellDepends = [
          base binary bitcoin-script bitcoin-types bytestring cryptohash
          hexstring lens
@@ -26773,7 +26832,7 @@ self: {
      mkDerivation {
        pname = "bitcoin-types";
        version = "0.9.2";
-       sha256 = "02y4svhcsml37p78g4cm97kyigcakgf4hds4bxnp0r4ba1498bxp";
+       sha256 = "b72f9448508b64706d5f443748dc9b8abde8e749959187ce3d8356cde0d6c40b";
        libraryHaskellDepends = [
          base base58string binary bytestring hexstring text
        ];
@@ -26790,7 +26849,7 @@ self: {
      mkDerivation {
        pname = "bitly-cli";
        version = "0.1.2";
-       sha256 = "0g63lg3599clbn4xcg9kcak6hs4877dwj00607c5gyh5x4d2c21d";
+       sha256 = "2d08261ae905fa57d8010600c9db39886868a662333dd6895d94a554c6a3c33c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -26808,7 +26867,7 @@ self: {
      mkDerivation {
        pname = "bitmap";
        version = "0.0.2";
-       sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m";
+       sha256 = "b578f508a416cb41523bfad5b977059c04862e583cd0edf1a18a51abf37299ba";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)";
@@ -26820,7 +26879,7 @@ self: {
      mkDerivation {
        pname = "bitmap-opengl";
        version = "0.0.1.5";
-       sha256 = "1wq1p0vvif750gpyh2kq3agzwga3hx0fq28irbw5dgrz462dd9pv";
+       sha256 = "fba6d684213fbf56f8ca1109ec4087433dfe9f1a780ae8ef03e5b8b837b801f3";
        libraryHaskellDepends = [ base bitmap OpenGL ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for Data.Bitmap.";
@@ -26834,7 +26893,7 @@ self: {
      mkDerivation {
        pname = "bitmaps";
        version = "0.2.6.3";
-       sha256 = "1cbfbbyvmdlfwn6pjhxkd8f4ajkp9cm18apzmrqffrj58gmzr1p0";
+       sha256 = "e086fceb434566e770aeff2a142a4b774a451c6ab343798de58eb6bafd5a6eb1";
        libraryHaskellDepends = [
          array base binary bitmap bytestring cereal containers monad-state
          stb-image string-class tagged zlib
@@ -26851,7 +26910,7 @@ self: {
      mkDerivation {
        pname = "bits";
        version = "0.4";
-       sha256 = "12s5yk47y0zqzqiyaw9jchyl3crf1id9dk67m638b070d46k29p6";
+       sha256 = "e626310d69e0808586a9c7cc965a0c2eb3413d643271e523fef8037fc8f4458b";
        libraryHaskellDepends = [ base bytes mtl transformers ];
        testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/analytics/bits";
@@ -26864,7 +26923,7 @@ self: {
      mkDerivation {
        pname = "bits-atomic";
        version = "0.1.3";
-       sha256 = "13fbakkwcdk63dm7r0mcsanm5mijp73c7x1kxpay2f03rxb39b70";
+       sha256 = "e0ac3456cf0338e1d5ed33f4c3c6b932d652add2ac827c6a1b6636c6e754cb8d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -26877,7 +26936,7 @@ self: {
      mkDerivation {
        pname = "bits-conduit";
        version = "0.2.0.0";
-       sha256 = "08hgl1pvwadnrgqcs1yl7lvqgh955swbscpay4chb097pqqggdrj";
+       sha256 = "32b7f730be27810519f1ea32bdb82e25c187373dd407cdf0cbb629be6fa00f22";
        libraryHaskellDepends = [ base bytestring conduit mtl ];
        testHaskellDepends = [ base bytestring conduit hspec HUnit mtl ];
        jailbreak = true;
@@ -26891,7 +26950,7 @@ self: {
      mkDerivation {
        pname = "bits-extras";
        version = "0.1.3";
-       sha256 = "0sy9dksmdx0773bsn8yi5hw4qpgn16g8aqqj888w1x75cbsxr997";
+       sha256 = "27a5dcf562e5f4c011421263859e09f65d4c382cd123abd73807f456f56cc96b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -26907,7 +26966,7 @@ self: {
      mkDerivation {
        pname = "bitset";
        version = "1.4.8";
-       sha256 = "0h912i3wb6v8sx0c4mlp0j65l3yhpdsk3my8zhif2jls2sxns988";
+       sha256 = "08256dbb169a4ae122fcc8d73175bbd00f5a8c049756c240d7689bc547142141";
        libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
        librarySystemDepends = [ gmp ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
@@ -26924,7 +26983,7 @@ self: {
      mkDerivation {
        pname = "bitspeak";
        version = "0.0.3";
-       sha256 = "02dyi59lp6blrvsc10ahjnra1vaz3kzb8h0jpk74k7n6flia8z1k";
+       sha256 = "337ca42275c69e49cebc1240b4fe1c5feda0b2955081c0f4ce74994b5389be09";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -26944,7 +27003,7 @@ self: {
      mkDerivation {
        pname = "bitstream";
        version = "0.2.0.4";
-       sha256 = "1j00r6jv9yp0h476gz7yalrlnxhkrdrl1w73d3zl98kyf207q2sy";
+       sha256 = "5e0b7c80707ea244ff68e3f04073cb13764b3355fefc670e81e0fab4a5c900c8";
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring vector
        ];
@@ -26961,7 +27020,7 @@ self: {
      mkDerivation {
        pname = "bitstring";
        version = "0.0.0";
-       sha256 = "1ix2x4v76wq5148k1aax69cf8sk14cd0z362dz1d2qmj9qxsnsw8";
+       sha256 = "886bab3b4eb262d1c26fc28c0f1a23616ae458325da930110905737336e9a2c7";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Lazy bit strings";
@@ -26982,7 +27041,7 @@ self: {
      mkDerivation {
        pname = "bittorrent";
        version = "0.0.0.3";
-       sha256 = "155bbqqn33mlavvcm6xfxs4dqij66jfhqxjmrjkyxvzd36yz0ann";
+       sha256 = "d62af0bd19edefeea7cc55760c9d344646dc88eeae9bcaf656b48e61315eab94";
        libraryHaskellDepends = [
          aeson base base16-bytestring base32-bytestring base64-bytestring
          bencoding binary binary-conduit bits-extras BoundedChan bytestring
@@ -27010,7 +27069,7 @@ self: {
      mkDerivation {
        pname = "bitvec";
        version = "0.1.0.1";
-       sha256 = "0zgg72qpxgcgjrr2lr702abibnm79h6knb3jcwdjcxssgb6l70q4";
+       sha256 = "048343cd7a5a77261b67722c3b0d4ca7da159712e0642a72968fbd7eb138ef7d";
        libraryHaskellDepends = [ base primitive vector ];
        testHaskellDepends = [
          base HUnit primitive QuickCheck test-framework test-framework-hunit
@@ -27026,7 +27085,7 @@ self: {
      mkDerivation {
        pname = "bitwise";
        version = "0.1.0.2";
-       sha256 = "195g09frdyyn3wsb4jyspdmz8dlmpymqdlbss6zyslkddkrs8hdf";
+       sha256 = "ae41a4f36c6d52edbfd17ad186abbf9536f46bbbda4bb2341fd6fb965d02afa4";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "http://code.mathr.co.uk/bitwise";
@@ -27036,22 +27095,23 @@ self: {
 
   "bitx-bitcoin" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit
-     , network, record, scientific, split, text, time
+     , http-types, microlens, microlens-th, network, scientific, split
+     , text, time
      }:
      mkDerivation {
        pname = "bitx-bitcoin";
-       version = "0.2.0.2";
-       sha256 = "0m91zh2g6ahpzwgfhj2phhghylgjp6qksca741bdffkax7xd6x17";
+       version = "0.4.0.0";
+       sha256 = "6c04902ab1ce6600373ba1f477878a17c6cfe00c3417596a3c96f22dbbfe492f";
        libraryHaskellDepends = [
-         aeson base bytestring http-conduit network record scientific split
-         text time
+         aeson base bytestring http-conduit http-types microlens
+         microlens-th network scientific split text time
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec microlens time
        ];
-       testHaskellDepends = [ aeson base bytestring hspec record time ];
-       jailbreak = true;
        homepage = "https://github.com/tebello-thejane/bitx-haskell";
        description = "A Haskell library for working with the BitX bitcoin exchange";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bk-tree" = callPackage
@@ -27059,7 +27119,7 @@ self: {
      mkDerivation {
        pname = "bk-tree";
        version = "0.1.1";
-       sha256 = "0av4gkh2vr9righ26hbagh8j30i8k4sp3af98lmwm5gf81vs5az4";
+       sha256 = "e4aba27740ee95ca2b45c9a9713599288221117c6a4123e08b39e52de07c642b";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/bitonic/language-spelling";
        description = "BK-tree implementation";
@@ -27074,7 +27134,7 @@ self: {
      mkDerivation {
        pname = "bkr";
        version = "0.1.2";
-       sha256 = "1zi429ny66qp3ywlqfg7y0xk472vxh4z572a4c8rbzpx5lgiypxs";
+       sha256 = "ba5f1f1f2dfdfe9511234a9cf209ec5b1c323bf0e7394cb91f171be36d1224fe";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27097,7 +27157,7 @@ self: {
      mkDerivation {
        pname = "bktrees";
        version = "0.3.1";
-       sha256 = "1d2iz48n0ayn0hi9xa110pxy1mv5a4m21rmbpvs6ki1a7cv4ghn9";
+       sha256 = "c9c247363b2ac469f4beabe6202a5165d7e0fb0521a89e2204d62b6011f951b4";
        libraryHaskellDepends = [ array base containers ];
        description = "A set data structure with approximate searching";
        license = stdenv.lib.licenses.bsd3;
@@ -27108,7 +27168,7 @@ self: {
      mkDerivation {
        pname = "bla";
        version = "2009.10.20";
-       sha256 = "1zb076m4673jmvzazwjjmlw3nrnw0j22hiim6r90014sqcpb6xhp";
+       sha256 = "1776b32ec39a040052363546288404dc663b38ad52f2affeae721c43aa3960fd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 unix ];
@@ -27126,7 +27186,7 @@ self: {
      mkDerivation {
        pname = "black-jewel";
        version = "0.0.0.1";
-       sha256 = "1ki6kdmc5ss0dp7jrhv9zx9a93f2p38q7i57n0y94awyv5772yla";
+       sha256 = "8a7a714ed99e2b923cb0a7c483d1b8c28da452ff69c32ccf6d40ebc26a9b26ce";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -27148,7 +27208,7 @@ self: {
      mkDerivation {
        pname = "blacktip";
        version = "0.1.0.1";
-       sha256 = "12s05l348q6xlhrwhh2i5v04i9bglvb00vpy25j5axdv5k8nwn62";
+       sha256 = "c2586ed12cbb75556411fe6e00d6a66fa548c02e5140c833a4dd6044062d408b";
        libraryHaskellDepends = [
          base bitwise bytestring deepseq deepseq-generics locators
          network-info safe split system-fileio system-filepath time
@@ -27164,7 +27224,7 @@ self: {
      mkDerivation {
        pname = "blakesum";
        version = "0.5";
-       sha256 = "15k3vf9jqcw1a9gyppkhn5ibj7ld8mb2irfhbwd3plj86xyxxa0g";
+       sha256 = "0fa8de7d3748d23b1a5fd0e52856458d1eb962b170deeb5f5281332c93db6396";
        libraryHaskellDepends = [ base bytestring text vector ];
        jailbreak = true;
        homepage = "https://github.com/killerswan/Haskell-BLAKE";
@@ -27180,7 +27240,7 @@ self: {
      mkDerivation {
        pname = "blakesum-demo";
        version = "0.5";
-       sha256 = "1d07005fd670p74vkyi9gg3wawyi21s37ww69fsrrgarf3i5p4m9";
+       sha256 = "a9925be27059bd9cb54b86f3337410d173c5c77b29fab9c9b9e098e60a0007b4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -27201,7 +27261,7 @@ self: {
      mkDerivation {
        pname = "blank-canvas";
        version = "0.5";
-       sha256 = "05kfyjp9vncyzsvq018ilb8vh7fyzbc06nlx35jk3dzj6i6x5bgs";
+       sha256 = "faadd24d34f2b73165199d5a03d8fade1db8d1a2110580b7fe9ed99daef46e16";
        revision = "1";
        editedCabalFile = "a9d9c32056144a2e5b84e96dfb3a5334aa89dc616c759e523c538a6b950d5084";
        libraryHaskellDepends = [
@@ -27221,7 +27281,7 @@ self: {
      mkDerivation {
        pname = "blas";
        version = "0.7.6";
-       sha256 = "1q6fkw2bsppymy5wi7mgkl09caij52xplw64786548z9i95r0bli";
+       sha256 = "912e904b8ae923520c3ac4707abb28322a96009daf9ec88baffe5ebd049fcee0";
        libraryHaskellDepends = [ base ieee QuickCheck storable-complex ];
        jailbreak = true;
        homepage = "http://github.com/patperry/blas";
@@ -27235,7 +27295,7 @@ self: {
      mkDerivation {
        pname = "blas-hs";
        version = "0.1.1.0";
-       sha256 = "11mhjvqjnap4lj70f6lxjrjrdlkw8gnmd1lz4cfkjawq4w4npq40";
+       sha256 = "80e06b0927982b391d239f8656ed437cd29665969d1a078ea4e42a2bf196b086";
        libraryHaskellDepends = [ base storable-complex ];
        librarySystemDepends = [ blas ];
        testHaskellDepends = [ base vector ];
@@ -27250,7 +27310,7 @@ self: {
      mkDerivation {
        pname = "blastxml";
        version = "0.3.2";
-       sha256 = "0slqvv8729vlniwswwipw3yss9id6xvmd416kad1ij064g28j00c";
+       sha256 = "0c0089c42306c8189a9a26905677372d26adfde03772ae79b4742771d0de986a";
        libraryHaskellDepends = [
          base biocore bytestring parallel tagsoup
        ];
@@ -27264,7 +27324,7 @@ self: {
      mkDerivation {
        pname = "blaze";
        version = "0.0.2";
-       sha256 = "01n6cw3fjmlj5pmdy122ch4kbf6srvwlz356rr6nxfrm0ndcxp38";
+       sha256 = "68dcce9a0535bb6e4dcea68c4ff9cedab83509644204dfea2d9256e90667c606";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27275,7 +27335,7 @@ self: {
      mkDerivation {
        pname = "blaze-bootstrap";
        version = "0.1.0.0";
-       sha256 = "1q1gwjg8xfp20lrlrlkdprny7j437fsnm5c9p5rv4549nyam7prw";
+       sha256 = "3cdf5395b78914b273b989956ab53b83c8e36dbe6dd24c3305e2ba8e9ee42fe0";
        libraryHaskellDepends = [ base blaze-html text ];
        jailbreak = true;
        homepage = "http://github.com/agrafix/blaze-bootstrap";
@@ -27291,7 +27351,7 @@ self: {
      mkDerivation {
        pname = "blaze-builder";
        version = "0.4.0.1";
-       sha256 = "1id3w33x9f7q5m3xpggmvzw03bkp94bpfyz81625bldqgf3yqdn1";
+       sha256 = "c136ec877bb8d1558409e87b77174977ae01f8dff5bddb472df8b8d4c7e0a3c5";
        libraryHaskellDepends = [ base bytestring deepseq text ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -27307,7 +27367,7 @@ self: {
      mkDerivation {
        pname = "blaze-builder-conduit";
        version = "1.1.0";
-       sha256 = "0xxyn3lhcn1bkybhrl5dx68d0adf26ilf34gv0mxkwpfj7m7d3k3";
+       sha256 = "638e76ea91eef2d92bd88f0c47a311ae29d090e9add00c979f2b5806e9b0be77";
        libraryHaskellDepends = [ base conduit ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Convert streams of builders to streams of bytestrings. (deprecated)";
@@ -27321,7 +27381,7 @@ self: {
      mkDerivation {
        pname = "blaze-builder-enumerator";
        version = "0.2.1.0";
-       sha256 = "15mz4dfnngll61b1xv3hfazvzjfd8g9ym0hps1qiks1hl4c2kxah";
+       sha256 = "50f52918a130e81971d01782ead343cdc9bfbf7270ec1e5630943e6b5d23bf96";
        revision = "1";
        editedCabalFile = "28796d33301d22cfca6188f54699d9efd7721802bc5e9c88a394bec14c9c4fae";
        libraryHaskellDepends = [
@@ -27338,7 +27398,7 @@ self: {
      mkDerivation {
        pname = "blaze-from-html";
        version = "0.3.2.1";
-       sha256 = "1li3zxrgwj5rgk894d9zwfxnx5dfjzkvjlcyck2g7s0awfp2kq4s";
+       sha256 = "9ae029aee30ae8f3c4649e51b9e797ae956ebbe33f3592d07cb948fe72ff23d2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -27357,7 +27417,7 @@ self: {
      mkDerivation {
        pname = "blaze-html";
        version = "0.8.1.0";
-       sha256 = "0cgddwdwjszhcd3grfxazvy6jwaxa90s8yw6ir9ji2apbdsw0vgv";
+       sha256 = "fb6dc0755b578928538e867ba441525d7169fcfeaabbfc4663f06bc91b6fed31";
        libraryHaskellDepends = [
          base blaze-builder blaze-markup bytestring text
        ];
@@ -27378,7 +27438,7 @@ self: {
      mkDerivation {
        pname = "blaze-html-contrib";
        version = "0.2.2";
-       sha256 = "0a10vzbd5l32y716nmgc49rj2gpyavl8fl1z4qs5drx9adwj50cf";
+       sha256 = "8e81227953a9e75634263f5087e856fe3e217322ec556bc2f162d0d2d6df2028";
        libraryHaskellDepends = [
          base blaze-html cgi data-default network safe text
        ];
@@ -27393,7 +27453,7 @@ self: {
      mkDerivation {
        pname = "blaze-html-hexpat";
        version = "0.1.0.0";
-       sha256 = "11bw5ywvi7dlz5inch3z0vlg936ch1rnp99bh4nmwskvszidd7kg";
+       sha256 = "6f9ed6e2d77b6a5e2d812ba56b7380cc8cf4e8067f406663f9b49db8b92f7c85";
        libraryHaskellDepends = [ base blaze-html bytestring hexpat text ];
        jailbreak = true;
        homepage = "https://github.com/jaspervdj/blaze-html-hexpat";
@@ -27409,7 +27469,7 @@ self: {
      mkDerivation {
        pname = "blaze-html-truncate";
        version = "0.3.0.0";
-       sha256 = "1czjqxaik1c9ialdwh8inh5iajl87lrnfa9rxnidzvfhc7ks9zbl";
+       sha256 = "74fda4e761d0eddfa2ed392967333d884a150bb41141dea88a89851955c7f2b3";
        libraryHaskellDepends = [
          base blaze-markup bytestring html-truncate tagsoup text
        ];
@@ -27426,7 +27486,7 @@ self: {
      mkDerivation {
        pname = "blaze-json";
        version = "0.2.1";
-       sha256 = "1jqrvv485qyscjppgq2kh6cvhd2lwwqq7gd69ynmrp3qllsc8x83";
+       sha256 = "0375c434a578dc5cad4fa6bd8331e75434b8998153e077af64dae382c8de19cb";
        libraryHaskellDepends = [
          base bytestring bytestring-builder containers data-default-class
          text
@@ -27449,7 +27509,7 @@ self: {
      mkDerivation {
        pname = "blaze-markup";
        version = "0.7.0.2";
-       sha256 = "0p3jsl7ng3fapvbp431cm1bckdwjgc1kmijyvxlgxn1l90l8l1p4";
+       sha256 = "e4068a284834d8fe68df5ec63a037b92b7c956a82c0c72d7beca8d670fd5725c";
        libraryHaskellDepends = [ base blaze-builder bytestring text ];
        testHaskellDepends = [
          base blaze-builder bytestring containers HUnit QuickCheck
@@ -27465,7 +27525,7 @@ self: {
      mkDerivation {
        pname = "blaze-svg";
        version = "0.3.4.1";
-       sha256 = "1bfxl2jwr622kgf4gz4gqpdrvscciqpfyzy6qad8j7w633xg8vrp";
+       sha256 = "376ff4fa18861f899ac2c67fef2e8e8ce99ddbc58ffc47dc9b4298cca5a0ddad";
        libraryHaskellDepends = [ base blaze-markup mtl ];
        homepage = "https://github.com/deepakjois/blaze-svg";
        description = "SVG combinator library";
@@ -27480,7 +27540,7 @@ self: {
      mkDerivation {
        pname = "blaze-textual";
        version = "0.2.1.0";
-       sha256 = "0bbcykkrlgdb6jaz72njriq9if6bzsx52jn26k093f5sn1d7jhhh";
+       sha256 = "1042795ab0bab891c034c24a51bafecbb89870ccd28af39534ab3d9ae7f46c2d";
        libraryHaskellDepends = [
          base blaze-builder bytestring ghc-prim integer-gmp old-locale text
          time vector
@@ -27501,7 +27561,7 @@ self: {
      mkDerivation {
        pname = "blaze-textual-native";
        version = "0.2.1.1";
-       sha256 = "1q3gdf4ljc5xhw8f72qkvi6insk2nwdfk28a00y1b58jmk8003sd";
+       sha256 = "4d0f00d0ac1295153c000a89e91ab7626a1b4ddc138be31087bd3049896b6fe0";
        libraryHaskellDepends = [
          base blaze-builder bytestring ghc-prim integer-gmp old-locale text
          time vector
@@ -27518,7 +27578,7 @@ self: {
      mkDerivation {
        pname = "blazeMarker";
        version = "0.1.0.0";
-       sha256 = "03gx3ylxz7xa86ngi33dm347ni6a4mcq4fizlx3majpfdk5fs38c";
+       sha256 = "0c0dedca6cee4a5547a73f3a825925ca447bc8a86d8cf8ac41aa9fdfa91ffd0d";
        libraryHaskellDepends = [ base blaze-html blaze-markup ];
        description = "...";
        license = stdenv.lib.licenses.mit;
@@ -27530,7 +27590,7 @@ self: {
      mkDerivation {
        pname = "blink1";
        version = "0.4";
-       sha256 = "0547wg4qk2xv5gzj1alaxk06j65dhmzhn6y48rjllyr4lc5bm2qj";
+       sha256 = "128bba0aa3247b4a6546c41b0b7f85ad1869c0ec8aaa20ff2bbb8b89c9e38714";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base unix ];
@@ -27546,7 +27606,7 @@ self: {
      mkDerivation {
        pname = "blip";
        version = "0.2.1";
-       sha256 = "0ilzdjfaq8dzfla0kxgkqbjsba0kbgkz8w5bzlhl0fw6rnaa0hn7";
+       sha256 = "c742a094cd863b4021fdab70f4e75b13a8a5e5c2f3f5091475bf21ac9c6c9f46";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -27566,7 +27626,7 @@ self: {
      mkDerivation {
        pname = "bliplib";
        version = "0.2.1";
-       sha256 = "0i5lh78yyj82g08ypyfp01kgc56p6c3nrl9fk49bp2yqpghv65qz";
+       sha256 = "1f17b3e1bbd88bbb12992ed16c0733d714f66600d7f9eb11780249efd181b444";
        libraryHaskellDepends = [
          base binary bytestring containers mtl pretty utf8-string
        ];
@@ -27581,7 +27641,7 @@ self: {
      mkDerivation {
        pname = "blocking-transactions";
        version = "0.1.0.5";
-       sha256 = "00xlj503h6073f9sk7a1p2b66nw2lryyvxxbawwz030mjdb6hgps";
+       sha256 = "fa3e685693150cf03957abf7ed7da6825b6396b8419da9931b0718384091b403";
        libraryHaskellDepends = [ base containers parallel ];
        homepage = "http://www.downstairspeople.org/git/blocking-transactions.git";
        description = "Composable, blocking transactions";
@@ -27596,7 +27656,7 @@ self: {
      mkDerivation {
        pname = "blogination";
        version = "0.5";
-       sha256 = "0bdhcjiz2b4zavmixvrl5la91s9z5pra05xk52118cjk4dcfdzfg";
+       sha256 = "cffde658235332148228b317a0f22d3fe990142d34ef1eeb569f2cf1a364b02d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27619,7 +27679,7 @@ self: {
      mkDerivation {
        pname = "bloodhound";
        version = "0.7.0.1";
-       sha256 = "1r66nb6vbq1pbh2a97wmsk9iav16ac4ppj5yjv3s5l8qc0rydmjs";
+       sha256 = "5ad6e6336018d1a2c796bec87b0953266c15d3d4959fa4045c37e0b5cdb2c6e4";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers data-default-class
          exceptions http-client http-types mtl semigroups text time
@@ -27643,7 +27703,7 @@ self: {
      mkDerivation {
        pname = "bloomfilter";
        version = "2.0.1.0";
-       sha256 = "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc";
+       sha256 = "6c5e0d357d5d39efe97ae2776e8fb533fa50c1c05397c7b85020b0f098ad790f";
        libraryHaskellDepends = [ array base bytestring deepseq ];
        testHaskellDepends = [
          base bytestring QuickCheck random test-framework
@@ -27659,7 +27719,7 @@ self: {
      mkDerivation {
        pname = "bloxorz";
        version = "0.1.2";
-       sha256 = "0cryvs5ia52dkc232cl2crhf0qq7ncir5c3zvrgsbzcc2hnmyrww";
+       sha256 = "9c675f2d148cfda55fde7fb09223b30763e06066823231049b4d14158bde3e33";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLFW OpenGL ];
@@ -27674,7 +27734,7 @@ self: {
      mkDerivation {
        pname = "blubber";
        version = "0.0.1";
-       sha256 = "0bc30pw6gvw7i6gh58hhkgx2j432zlh2wh4d41abnkjqygifsxsd";
+       sha256 = "4d77ede2f3584ebb54208d402e20fd621029fa9b10a2029f8987ef67f805832d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -27693,7 +27753,7 @@ self: {
      mkDerivation {
        pname = "blubber-server";
        version = "0.0.1";
-       sha256 = "12f594sl2c2hrxr95bpv911x0bdfpmaflp29mhw2yln2vh64nhj5";
+       sha256 = "45424b0cdcc2522f38ac495cea54bdae2dd04348fbae9272cf5030413549c589";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cereal containers random ];
@@ -27715,7 +27775,7 @@ self: {
      mkDerivation {
        pname = "bluetile";
        version = "0.6";
-       sha256 = "13xfnx08xgbfppr4cqmrqj82w192ll4m1x4kmv5jdpk02yb4zqa2";
+       sha256 = "42e14f961760de26cbae93f45009a522052e90c4b96246f2bd6ebd8e40b7ae8f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -27734,7 +27794,7 @@ self: {
      mkDerivation {
        pname = "bluetileutils";
        version = "0.2";
-       sha256 = "1qna8rr50mmd90xp7pwhcknx12dv2n7w5pdsw28kpbxykljrszgm";
+       sha256 = "f57d9d259dbeaf3b91e0baddc28f15bb89d0ed6490df733b48ad56507246cae2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gtk ];
@@ -27751,7 +27811,7 @@ self: {
      mkDerivation {
        pname = "blunt";
        version = "1.0.2";
-       sha256 = "1p0mwpjvrv9d0b0gp6s55zys9vcbhpjsjbi711f5x4dagdl0xkhc";
+       sha256 = "0cce0e687baa915e5c08272ea9e5858beda4fd2f459bfbc0022dedbce5e515dc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27771,7 +27831,7 @@ self: {
      mkDerivation {
        pname = "bmp";
        version = "1.2.5.2";
-       sha256 = "0f88f2ynm1fpzbjijy5fa8blfrdv42h5h28hfjlpd4fp0h96in5x";
+       sha256 = "bdd8681204d79176a974100958a020bb65471752ae7819e5fad7856abd700839";
        libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://code.ouroborus.net/bmp";
        description = "Read and write uncompressed BMP image files";
@@ -27785,7 +27845,7 @@ self: {
      mkDerivation {
        pname = "board-games";
        version = "0.1.0.1";
-       sha256 = "12b5hzazqilwwj0535wrh6i9r6lxi7lbzl727470mvzlr8p8lkyz";
+       sha256 = "df4f8a2ecaf4ef0a0e39e2d0bfe8899d9a9ca28199975180e49c46fcd5876589";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27812,7 +27872,7 @@ self: {
      mkDerivation {
        pname = "bogre-banana";
        version = "0.0.1";
-       sha256 = "0zlrm911sbszxyffz18yf64935iv8s2yk3v8v6cwjij69haryvwi";
+       sha256 = "916f9f154c4646c999d9688fe985463b969188711e85ef9cef5f2f1d42aa997e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27828,7 +27888,7 @@ self: {
      mkDerivation {
        pname = "bool-extras";
        version = "0.4.0";
-       sha256 = "008m43f04ncx2c24c241gzwjyyglw8rwpq2gsakqkw0nwz3czs61";
+       sha256 = "c1e8cfc6e716f089a7d24fe0cb33e2f4792ff97f81084604139d5902dc201501";
        libraryHaskellDepends = [ base ];
        homepage = "http://tom.lokhorst.eu/bool-extras";
        description = "A fold function for Bool";
@@ -27840,7 +27900,7 @@ self: {
      mkDerivation {
        pname = "boolean-list";
        version = "0.1.0.0";
-       sha256 = "0yr1szkaaz90nmawzrgfljv7hcd59xs7nr2fhc2rb4582crkykvp";
+       sha256 = "774f3f3313a8909505834e647b744fa53178b6a4eee5cf55b5207da5e6d7217b";
        libraryHaskellDepends = [ base bytestring HUnit ];
        homepage = "http://xy30.com";
        description = "convert numbers to binary coded lists";
@@ -27854,7 +27914,7 @@ self: {
      mkDerivation {
        pname = "boolean-normal-forms";
        version = "0.0.0.1";
-       sha256 = "11y26whzibxkcfck83lcrmxl34j7qp374wj6nzx2k3l65sdqm2ic";
+       sha256 = "2c8a8a9b2e868e29fab7467272c6c54792417bcd8c0e349963b3aff82137c287";
        libraryHaskellDepends = [ base cond containers ];
        testHaskellDepends = [
          base cond containers QuickCheck tasty tasty-quickcheck
@@ -27870,7 +27930,7 @@ self: {
      mkDerivation {
        pname = "boolexpr";
        version = "0.1";
-       sha256 = "14v894clplpcc1visqn337p7vmacj5hgx41vr60pwvflmv98d8xn";
+       sha256 = "b6a386d2aed46d7e81c93b90fe60914cd57dee19c3621d7760ecd24b19496893";
        libraryHaskellDepends = [ base parsec ];
        description = "Boolean expressions with various representations and search queries";
        license = stdenv.lib.licenses.bsd3;
@@ -27881,7 +27941,7 @@ self: {
      mkDerivation {
        pname = "bools";
        version = "0.1.1";
-       sha256 = "0057303m23p81v60jcsc3p7n2rs2rzrvbg5m18pc0fk95q2q2rim";
+       sha256 = "356681052e693ac02e0ab5bcb5f3cf426761cf1d4c3309cc0ee80e510718a700";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27892,7 +27952,7 @@ self: {
      mkDerivation {
        pname = "boolsimplifier";
        version = "0.1.8";
-       sha256 = "13w2i7b2g9w5kzqnbjjdzf3r2dm7a4xxags02khhwlj1f8vsjvq9";
+       sha256 = "096fa9377241520ee114403fd53b51a7369187fb4dca65f19f85a727d689828f";
        libraryHaskellDepends = [ base containers ];
        description = "Simplification tools for simple propositional formulas";
        license = stdenv.lib.licenses.bsd3;
@@ -27906,7 +27966,7 @@ self: {
      mkDerivation {
        pname = "boomange";
        version = "0.1.3.1";
-       sha256 = "1sg1ldrglhca62xiak33k5023zrpmgg3aa8xpwn8l1323kwlkqm0";
+       sha256 = "a0e249f91c62048a2cbf1d2935deab37ff214099634c15bb308a41fa72a3e1e9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -27921,7 +27981,7 @@ self: {
      mkDerivation {
        pname = "boomerang";
        version = "1.4.5";
-       sha256 = "03iaasyg2idvq25wzzjk2yr9lyql7bcgmfkycy1cy4ms5dg91k6q";
+       sha256 = "d8cc905e2bba12cf82677ebafad83a147b9ab21753fecf8bc0bb45f1bc562a0e";
        libraryHaskellDepends = [ base mtl template-haskell text ];
        description = "Library for invertible parsing and printing";
        license = stdenv.lib.licenses.bsd3;
@@ -27935,7 +27995,7 @@ self: {
      mkDerivation {
        pname = "boomslang";
        version = "0.0.4";
-       sha256 = "0yqqb4s5ld4fv7x17d5dp7z2dglrcmgb7fr4n8x4n2pysylxm9nh";
+       sha256 = "d0a6daa9d7fe0a4b3ab224bbb35e6599be26feb9adb413fad98e345a3459187b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -27959,7 +28019,7 @@ self: {
      mkDerivation {
        pname = "borel";
        version = "0.18.0";
-       sha256 = "0daayl70l8afpf6l4822nz2cqjy2k8zbrj89apipjbynsq543453";
+       sha256 = "a390410ad6d62f79e35509c9bc3e9ac24bccc4b74220428dbb4e210a0ef54a35";
        libraryHaskellDepends = [
          aeson async attoparsec base bimap cassava ceilometer-common
          chevalier-common configurator containers errors hslogger lens
@@ -27987,7 +28047,7 @@ self: {
      mkDerivation {
        pname = "bot";
        version = "0.3";
-       sha256 = "0crs1c6v298zqkjzkdgicigx22gvp9xv7bjlynbyckvx0lrvfmrc";
+       sha256 = "2c57b733057d4fe697f554aeb37bbafb09d15f64f1b5f9e5c41f25b10d0b3a33";
        libraryHaskellDepends = [ arrows base Stream ];
        homepage = "http://haskell.org/haskellwiki/Bot";
        description = "bots for functional reactive programming";
@@ -28000,7 +28060,7 @@ self: {
      mkDerivation {
        pname = "botpp";
        version = "0.1";
-       sha256 = "0ir6h4zkj05na1gyf7h97s832jkphh33c9qjk2i290d0q9y8s4fw";
+       sha256 = "dc118d7cc2a08124a2981227360684774a31903e091ee75f50b600393f812647";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -28017,7 +28077,7 @@ self: {
      mkDerivation {
        pname = "bound";
        version = "1.0.6";
-       sha256 = "0i1q6pv7d7vy9agb6yzj0mi8hq8154wv17qhwkf4jd87k07xv76v";
+       sha256 = "db9cdd0f98073549dce4109fb039290161886205f27bb39e4a7e9f76f6353844";
        libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad hashable
          hashable-extras prelude-extras profunctors transformers
@@ -28036,7 +28096,7 @@ self: {
      mkDerivation {
        pname = "bound-gen";
        version = "0.1.0.2";
-       sha256 = "1il4vb497d0195mhvra5djkn3mbdzd8dmcnffpqh1pv1pj8n8hwp";
+       sha256 = "97436491bc61df00f175ceb2da50fb6dd561a76c45e50d6b4901b493c8da84c6";
        libraryHaskellDepends = [ base bound monad-gen mtl ];
        description = "Unwrap Scope's with globally fresh values";
        license = stdenv.lib.licenses.mit;
@@ -28047,7 +28107,7 @@ self: {
      mkDerivation {
        pname = "bounded-tchan";
        version = "0.2.3";
-       sha256 = "12c78dz3y1ly05hckd9pf0j4fpknk383qyb5yrhps4sc2m3i9k9w";
+       sha256 = "3ccd1447154c137d61f665793cd098765e47247037b5c960019e063f7e438789";
        libraryHaskellDepends = [ base stm ];
        description = "Bounded Transactional channels (queues)";
        license = stdenv.lib.licenses.bsd3;
@@ -28058,7 +28118,7 @@ self: {
      mkDerivation {
        pname = "boundingboxes";
        version = "0.2.3";
-       sha256 = "0r3mffqxqadn8qklq3kr0ggirkficfj8ic1fxgki2zrc5jm4f2g8";
+       sha256 = "e80947aa2c2c7f11e7eb2eb088a463d1cd1cdf03790e4c2746b629dcb1737564";
        libraryHaskellDepends = [ base lens ];
        homepage = "https://github.com/fumieval/boundingboxes";
        description = "A generic boundingbox for an arbitrary vector";
@@ -28073,7 +28133,7 @@ self: {
      mkDerivation {
        pname = "bower-json";
        version = "0.7.0.0";
-       sha256 = "0vz9xxw2xr27lh70mqxfgvs43sr3sq88xf5vppcn2frsk1hnb7hs";
+       sha256 = "1a9e6561983a3b61d9bdbbb88e10d623eb41f47eaee30a0ea447e42e78efe96f";
        libraryHaskellDepends = [
          aeson aeson-better-errors base bytestring mtl scientific text
          transformers unordered-containers vector
@@ -28091,7 +28151,7 @@ self: {
      mkDerivation {
        pname = "boxes";
        version = "0.1.4";
-       sha256 = "1n7xiplzd3s1a39nizwjcgsh3wi2348mp21c3fk19v98ialfjgjf";
+       sha256 = "4e3ee9a88a28ed14a61b2c885b111922f201f56392ff68d350418ff6e98dfdd8";
        libraryHaskellDepends = [ base split ];
        testHaskellDepends = [ base QuickCheck split ];
        description = "2D text pretty-printing library";
@@ -28103,7 +28163,7 @@ self: {
      mkDerivation {
        pname = "bpann";
        version = "0.1.1";
-       sha256 = "02c8xyzs4kz9cx7ql48kq5cxf686vvd5mqrprkikynif9r4dk7w8";
+       sha256 = "889fd9484e2e5a3fe3cc37e35adade0619d759c113118a4f67e94fa2bfef8809";
        libraryHaskellDepends = [ base random split ];
        description = "backpropagation neuronal network";
        license = stdenv.lib.licenses.bsd3;
@@ -28114,7 +28174,7 @@ self: {
      mkDerivation {
        pname = "brainfuck";
        version = "0.1.0.2";
-       sha256 = "18xp0vlmh2n37x6rhczxw115cnips7vm9f560qsr395crqk5dzz9";
+       sha256 = "e9ff5626ceaca4913506a6b854f7d1375a5642e0fd33984d3fc30a58e906b7a3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base mtl ];
@@ -28128,7 +28188,7 @@ self: {
      mkDerivation {
        pname = "brainfuck-monad";
        version = "0.4.0";
-       sha256 = "14534i070l6w886sjp91yp9bfc2is5z6y7wzm8b6w4j9l78pfgmz";
+       sha256 = "bf3e77d1a149126e16aa9f1f6f7ed15130b7d2f5215da90d42dc50704024a390";
        libraryHaskellDepends = [ base ];
        description = "BrainFuck monad";
        license = stdenv.lib.licenses.bsd3;
@@ -28140,7 +28200,7 @@ self: {
      mkDerivation {
        pname = "brainfuck-tut";
        version = "0.7.0.0";
-       sha256 = "19x8mg15mscfrj1ppm32rzk8hhm4a2v498aq7sl3kkihrhp19x6j";
+       sha256 = "d2f4142ecc30ce39a83e58a144b650a44288e6cf62d47b83cc8ee95ac2aba8a7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
@@ -28156,7 +28216,7 @@ self: {
      mkDerivation {
        pname = "break";
        version = "1.0.0";
-       sha256 = "15fqdha71i4ziv0ra8v2mfp0fviwgs27xlsvc0chb8icqf33y22m";
+       sha256 = "55083f86c32ca20519605bd37e847e3c6e07aeab622395c18e9fc470146cd895";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Break from a loop";
        license = stdenv.lib.licenses.bsd3;
@@ -28167,7 +28227,7 @@ self: {
      mkDerivation {
        pname = "breakout";
        version = "0.0.2";
-       sha256 = "04qs2r944jbb2i11dqlvrav8iaanrgp15jri0mq6nf8ccjldh3wr";
+       sha256 = "990fd8a8640c396b700531cb12eecb56a988b6ca9be21642146b494252161a13";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskgame mtl SDL ];
@@ -28180,19 +28240,20 @@ self: {
   "breve" = callPackage
     ({ mkDerivation, aeson, base, binary, blaze-html, bytestring
      , configurator, cryptohash, directory, hashtables, http-types, mtl
-     , random, Spock, text, transformers, wai, wai-extra
+     , random, Spock, text, tls, transformers, wai, wai-extra
      , wai-middleware-static, warp, warp-tls, xdg-basedir
      }:
      mkDerivation {
        pname = "breve";
-       version = "0.4.0.0";
-       sha256 = "1ndzqwxj7dzff75mgjssh7sgrhxlicdwkcx8j71x52rxyav4aa0j";
+       version = "0.4.2.0";
+       sha256 = "51bcf984e0767649a336fe9658583e93326ffe039b9b0a83515d237d54902e61";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson base binary blaze-html bytestring configurator cryptohash
-         directory hashtables http-types mtl random Spock text transformers
-         wai wai-extra wai-middleware-static warp warp-tls xdg-basedir
+         directory hashtables http-types mtl random Spock text tls
+         transformers wai wai-extra wai-middleware-static warp warp-tls
+         xdg-basedir
        ];
        homepage = "https://github.com/rnhmjoj/breve";
        description = "a url shortener";
@@ -28204,7 +28265,7 @@ self: {
      mkDerivation {
        pname = "brians-brain";
        version = "0.0.1";
-       sha256 = "0a9gzclnqb28mm5gf2iiiby30qa0pwlwz3c115sim4lxpq60qran";
+       sha256 = "56650c0cbe9d921a7509818dcf29bf406130fc8a310af74aad482c6c29fb2f29";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base parallel random SDL ];
@@ -28214,6 +28275,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "brick" = callPackage
+    ({ mkDerivation, base, containers, contravariant, data-default
+     , Diff, lens, template-haskell, text, text-zipper, transformers
+     , vector, vty
+     }:
+     mkDerivation {
+       pname = "brick";
+       version = "0.1";
+       sha256 = "b81c5276709795fd9fe14f2b456b36ee0f4ee399abaa2f738948492baf2fb230";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers contravariant data-default Diff lens
+         template-haskell text text-zipper transformers vector vty
+       ];
+       executableHaskellDepends = [ base data-default lens text vty ];
+       homepage = "https://github.com/jtdaugherty/brick/";
+       description = "A declarative terminal user interface library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "brillig" = callPackage
     ({ mkDerivation, base, binary, cmdargs, containers, directory
      , filepath, ListZipper, text
@@ -28221,7 +28303,7 @@ self: {
      mkDerivation {
        pname = "brillig";
        version = "0.3.1";
-       sha256 = "18gm24fd5ad6dgbqiwcs750rvq2v6lmclysd6acj2y8iybwcsg8n";
+       sha256 = "163dcdf8f211792199324d7bca2a355be09d41399af188d76ba6a9d21c11f5a1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -28241,7 +28323,7 @@ self: {
      mkDerivation {
        pname = "broadcast-chan";
        version = "0.1.0";
-       sha256 = "1dympzv8gwh31hd0x6ap29rm83rf2klkj34as2xjrayfs9kbp87s";
+       sha256 = "faa0bb66d2ceab2cbbd08a0c39e9142e0f54731257990e1a0c03f287f6bfd5b7";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/merijn/broadcast-chan";
        description = "Broadcast channel type that avoids 0 reader space leaks";
@@ -28253,7 +28335,7 @@ self: {
      mkDerivation {
        pname = "broccoli";
        version = "0.4.1.0";
-       sha256 = "084nil9rfs3xpp4rk3qlwf6gsaljm57g7divfzd88dk9np6q5iwh";
+       sha256 = "90c782cdb5693684da773bb6f34ea9922afd8ce3148f99c9bd7d6897138d9620";
        libraryHaskellDepends = [ base containers stm time ];
        jailbreak = true;
        description = "Small library for interactive functional programs";
@@ -28265,7 +28347,7 @@ self: {
      mkDerivation {
        pname = "bsd-sysctl";
        version = "1.0.7";
-       sha256 = "18qs5s6sq6696w7y23fq6pd303j5bfh94lw86dz4z9hgdlmrx36y";
+       sha256 = "de8c9e2b6d0fa64f7e33885392a05b450e30da35d80de10f37c918ac8d2e1aa3";
        libraryHaskellDepends = [ base ];
        description = "Access to the BSD sysctl(3) interface";
        license = stdenv.lib.licenses.bsd3;
@@ -28280,7 +28362,7 @@ self: {
      mkDerivation {
        pname = "bson";
        version = "0.3.1";
-       sha256 = "1kihsjws8sqb44gvilh1zxrqn2bml8gxq2bbanxqb7nr4ymwfkiv";
+       sha256 = "3b4ec7ab27d99e85bb556b09dc1fa275098b73ff01d2b81f210b6ba4b9d430ce";
        libraryHaskellDepends = [
          base binary bytestring cryptohash data-binary-ieee754 mtl network
          text time
@@ -28300,7 +28382,7 @@ self: {
      mkDerivation {
        pname = "bson-generic";
        version = "0.0.8";
-       sha256 = "0r1gd6jxwzqana2b3i3xm8mx66lq4zkcir11c3v78g9fjyyhy7dh";
+       sha256 = "b01d0fbd972e3d74f66021e4c8e627981ad32baa7dc4b184b20a7fdea5692f64";
        libraryHaskellDepends = [ base bson ghc-prim text ];
        jailbreak = true;
        description = "Generic functionality for BSON";
@@ -28312,7 +28394,7 @@ self: {
      mkDerivation {
        pname = "bson-generics";
        version = "0.0.1";
-       sha256 = "03ifgmifk0dx6fzws1qlx3c1nslrkvwman5g3c4iag842bl03gxp";
+       sha256 = "b7bf01e812043d15091baf5855f99e996a1bd8e81407cdbf33bd81e9627d2e0e";
        libraryHaskellDepends = [ base bson ghc-prim ];
        jailbreak = true;
        description = "Generics functionality for BSON";
@@ -28327,7 +28409,7 @@ self: {
      mkDerivation {
        pname = "bson-mapping";
        version = "0.1.4.1";
-       sha256 = "0k91rkyh7lmq2iw2kmkl3lbzx4c46yzb2fp9pkag8yd05na2k9za";
+       sha256 = "eaa729942da079f4d4bce93ab1be378491fe171d74d6297814b8d203fdcc214d";
        libraryHaskellDepends = [
          base bson compact-string-fix template-haskell th-lift
        ];
@@ -28343,7 +28425,7 @@ self: {
      mkDerivation {
        pname = "bspack";
        version = "0.0.4";
-       sha256 = "0nzw1cs3nxb55yj3sy5afr6kycbm7xk26xpl0gvysgrd6bs0p8pb";
+       sha256 = "eba20bf4322d3fedf703f47623663f75313f4d76aa783da42f65753b340bfc5b";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        testHaskellDepends = [
          base bytestring mtl tasty tasty-hunit tasty-quickcheck
@@ -28358,7 +28440,7 @@ self: {
      mkDerivation {
        pname = "bsparse";
        version = "0.0.5";
-       sha256 = "12wn8jlqkb9d9vpdbwc3m288cgnr15cq4wv5fxlp7f10p3y42l2a";
+       sha256 = "4a5041fcb820b87369776573825909d93e8690a883f1d5ee4e2dad89a944968b";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/vincenthz/hs-bsparse";
        description = "A simple unassuming parser for bytestring";
@@ -28373,7 +28455,7 @@ self: {
      mkDerivation {
        pname = "btree-concurrent";
        version = "0.1.5";
-       sha256 = "1xgw3ki3vypyxxiyzfjajjx1vzavyn1v9445cgbqwrr0n0wpkqm6";
+       sha256 = "a6e27939b020678ed7638590b483f55bfd1dba944abaef63effefa3de21cfcf5";
        libraryHaskellDepends = [
          array base base64-bytestring bytestring cereal containers directory
          filepath hashable mtl random snappy stm time
@@ -28394,7 +28476,7 @@ self: {
      mkDerivation {
        pname = "btrfs";
        version = "0.1.1.1";
-       sha256 = "1k1b8x0p0q43872c4x5dma2hs9dzkvr7n2dnb3w29ha7f24k8g8z";
+       sha256 = "1f3d34897047c124f858b6097bf29ebf250d85aaad74c2c44183607041472bcc";
        revision = "1";
        editedCabalFile = "1ef2b2d9f4768be3250cf2f971639c1a0e410e6bb9b035e922305c62c5f00887";
        isLibrary = true;
@@ -28413,7 +28495,7 @@ self: {
      mkDerivation {
        pname = "buffer-builder";
        version = "0.2.4.0";
-       sha256 = "1krhzcd6jwfi2rclkzrvmlzr8mz1kcll481w890yi64vb65j5cn2";
+       sha256 = "c2b2228b599b98e841423c2042299be157943fad3bff495916d171691afb30cf";
        libraryHaskellDepends = [
          base bytestring mtl text unordered-containers vector
        ];
@@ -28436,7 +28518,7 @@ self: {
      mkDerivation {
        pname = "buffer-builder-aeson";
        version = "0.2.0.3";
-       sha256 = "0i8jv5w016m8az6g809mf54wbkz1dci5w4c7w94rxl2xhsx7q98p";
+       sha256 = "17257cba865dd09e49e287115e226be1cfc549713501f4cc57a89a0078d91245";
        libraryHaskellDepends = [
          aeson base buffer-builder bytestring integer-gmp scientific
          unordered-containers vector
@@ -28459,7 +28541,7 @@ self: {
      mkDerivation {
        pname = "bugzilla";
        version = "0.2.1.1";
-       sha256 = "19ayjkaniksivm99lgl7bfjabig00y0gd3w9ssabksg7rfwajc5d";
+       sha256 = "ad30a9b8cbe7e9b994d6898ff68007e0c5a5a45b873e9a52dd51cf68d5945ea5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -28479,7 +28561,7 @@ self: {
      mkDerivation {
        pname = "buildable";
        version = "0.1.0.3";
-       sha256 = "1jrvgm2k6m8k9hj7h727pf357zydmhq1ndl1z39ag6294xd2rgpx";
+       sha256 = "fdbe2c5a274998a7d2f881361b30accdff5386bb471c78244c135533457d3bcb";
        libraryHaskellDepends = [ base bytestring containers dlist text ];
        jailbreak = true;
        description = "Typeclass for builders of linear data structures";
@@ -28493,7 +28575,7 @@ self: {
      mkDerivation {
        pname = "buildbox";
        version = "2.1.6.1";
-       sha256 = "15ddnbnm6wqm5dqf6f2qmxlxy5az0sxvml4rwghivcj0609lfc6i";
+       sha256 = "d13047133040b21de1e399d0babb065f15df69af5838e3702b157353edb2ad95";
        libraryHaskellDepends = [
          base bytestring containers directory mtl old-locale pretty process
          random stm time
@@ -28508,7 +28590,7 @@ self: {
      mkDerivation {
        pname = "buildbox-tools";
        version = "1.5.3.1";
-       sha256 = "0j1fsdmaxnl1zxgvxilznw5jfaaphij6wnhllb64f59kvhpqmy4f";
+       sha256 = "8ef88a2fdc331547cca2145a6e64845729270bb79fc6be5fff81daae6ad32e48";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base buildbox parseargs ];
@@ -28530,7 +28612,7 @@ self: {
      mkDerivation {
        pname = "buildwrapper";
        version = "0.9.1";
-       sha256 = "1icm2vqimza6lslav01d11xq4v0p6dpymvx4md48ch8qbhdrn8r3";
+       sha256 = "23239b1b5c18418648aba4efea6f33176c827b082d80ada8a646fd1af11695c5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -28564,7 +28646,7 @@ self: {
      mkDerivation {
        pname = "bullet";
        version = "0.2.4";
-       sha256 = "0fksxkp6xq0q88g21b917qrg6pzzr1a00w5jjh45f4f9b3smibgn";
+       sha256 = "f6ad58f558c911570894b2700054c8ff5ff3323e21ad201e4218e06eeeec7a3a";
        libraryHaskellDepends = [ base vect ];
        libraryPkgconfigDepends = [ bullet ];
        libraryToolDepends = [ c2hs ];
@@ -28581,7 +28663,7 @@ self: {
      mkDerivation {
        pname = "bumper";
        version = "0.6.0.3";
-       sha256 = "1a6sqkdzq05az6yj3zmlcbx6bmhw4zjx2aijxfi481z3ifiy7z3w";
+       sha256 = "7cfce3a38be30744a2eb322ad1e5271cd665fa62b4fe21bdf9aa00fcdbc4daa8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -28597,7 +28679,7 @@ self: {
      mkDerivation {
        pname = "burst-detection";
        version = "1.0";
-       sha256 = "1pgrqjdc4n97s7jsb9ddmjkw3qa4c28p4fp1ajyx5bfxdll44dwm";
+       sha256 = "953742286dddadd2bd54e13a72916044e1c1a7acada5a5e5d12759c29ac4f9dd";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base ];
        jailbreak = true;
@@ -28612,8 +28694,8 @@ self: {
      }:
      mkDerivation {
        pname = "bus-pirate";
-       version = "0.6.2";
-       sha256 = "1l2icqm9wm1q61nrhab9zininifwql304lgzfqbddvah6qx53iqd";
+       version = "0.6.3";
+       sha256 = "22db2acbd964175dce221dcff52e16ba346846c14e7772e20e320cde7798314a";
        libraryHaskellDepends = [
          base bytestring either errors serialport transformers
        ];
@@ -28629,7 +28711,7 @@ self: {
      mkDerivation {
        pname = "buster";
        version = "2.51";
-       sha256 = "12h77sa7z5ba6n2hx5kag51lp7q7hdmsd1cb006l7i46cq5b5zzg";
+       sha256 = "efffb20a6686c4430d008b85a66b83079f4b43796a960e85356a957f943e078a";
        libraryHaskellDepends = [
          base binary bytestring containers dataenc mtl old-locale parsec
          pretty time
@@ -28648,7 +28730,7 @@ self: {
      mkDerivation {
        pname = "buster-gtk";
        version = "2.0";
-       sha256 = "1ajmwdrx7cq5dh7zj0viipnhas0p910ax1yb37ina4nddrpx0gd1";
+       sha256 = "a13dd06f6ecd1265e319cb87ae4048176805ed8d7103f90f6c05b3d373e355aa";
        libraryHaskellDepends = [
          base binary buster bytestring containers dataenc gtk mtl old-locale
          parsec pretty time
@@ -28666,7 +28748,7 @@ self: {
      mkDerivation {
        pname = "buster-network";
        version = "1.2";
-       sha256 = "17nzw5ycdrw3f1cgwcg1vh1jk80528nl7ksmbmxg2mgndc89kg3i";
+       sha256 = "71bc99106bf655f17a5d55cf432d1205a02903dce131fe587083e7c67ce1df9e";
        libraryHaskellDepends = [
          base binary buster bytestring containers dataenc haxr HTTP mtl
          network old-locale pretty time
@@ -28686,7 +28768,7 @@ self: {
      mkDerivation {
        pname = "bustle";
        version = "0.5.1";
-       sha256 = "1mj8zxwjbp35pdslnssb9hz6mr3wapslfr3g265s5gk9kn8iqq06";
+       sha256 = "06601c919d69bea28b116f6447f5557ce46a3e4c4b6b4b75bb65dc2579ff48d6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -28707,7 +28789,7 @@ self: {
      mkDerivation {
        pname = "bv";
        version = "0.3.0";
-       sha256 = "0r2bp39ilwq3zx38spbx5qrpccwm255ax2skab3i7jxjmf7yj025";
+       sha256 = "4500e98fabb2cb13c752538bae4a11953376332e7d5d8d46ff03731ad3b84b64";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -28723,7 +28805,7 @@ self: {
      mkDerivation {
        pname = "byline";
        version = "0.2.0.0";
-       sha256 = "1194h9bhd1n9sxc224j22mir852b9c5ww2cq0sf9x8k3vlfpm1jl";
+       sha256 = "54867a1ddd63a29e9c069809ce0b4b4b1494631542122158d7c9860657822485";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -28741,7 +28823,7 @@ self: {
      mkDerivation {
        pname = "bytable";
        version = "0.1.0.0";
-       sha256 = "0x4yh9li0pi2r9pjih000a143iw9kaz7r4z72510kv6kzkkcr9mn";
+       sha256 = "b6a6cce6fcd3ec094211e7937cbe9a89c741820200c0286fca225e1069829e74";
        libraryHaskellDepends = [ base bytestring word24 ];
        description = "data from/to ByteString";
        license = stdenv.lib.licenses.bsd3;
@@ -28753,7 +28835,7 @@ self: {
      mkDerivation {
        pname = "byteable";
        version = "0.1.1";
-       sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4";
+       sha256 = "243b34a1b5b64b39e39fe58f75c18f6cad5b668b10cabcd86816cbde27783fe2";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/vincenthz/hs-byteable";
        description = "Type class for sequence of bytes";
@@ -28765,7 +28847,7 @@ self: {
      mkDerivation {
        pname = "bytedump";
        version = "1.0";
-       sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf";
+       sha256 = "ae17b5040f0423eec792505f14d1d3e53f5ff81ddf83524f1c5dc7a16c0dc0dd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -28779,7 +28861,7 @@ self: {
      mkDerivation {
        pname = "byteorder";
        version = "1.0.4";
-       sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x";
+       sha256 = "bd20bbb586947f99c38a4c93d9d0266f49f6fc581767b51ba568f6d5d52d2919";
        libraryHaskellDepends = [ base ];
        homepage = "http://community.haskell.org/~aslatter/code/byteorder";
        description = "Exposes the native endianness or byte ordering of the system";
@@ -28794,7 +28876,7 @@ self: {
      mkDerivation {
        pname = "bytes";
        version = "0.15.0.1";
-       sha256 = "1qlqih83bx2vh5g15wffh4v9cfb5lv6jkj6i1xncd2imw5ynfi08";
+       sha256 = "0844677de1358ac66c0fd1c829cda66539963681cef1125e815bf435108c98e2";
        libraryHaskellDepends = [
          base binary bytestring cereal containers mtl text time transformers
          transformers-compat void
@@ -28810,7 +28892,7 @@ self: {
      mkDerivation {
        pname = "byteset";
        version = "0.1.1.0";
-       sha256 = "18dg863wbbjh95yial4gy6vi5spwygp0l7dfx6bj00lz4xdrqj8k";
+       sha256 = "13499c5b279f022097e9ae1d0aeef3fcea12b7f18f50157d4950aec58741afa1";
        libraryHaskellDepends = [ base binary ];
        description = "Set of bytes";
        license = stdenv.lib.licenses.bsd3;
@@ -28824,7 +28906,7 @@ self: {
      mkDerivation {
        pname = "bytestring";
        version = "0.10.6.0";
-       sha256 = "0xw924djdbs15r4dh2zyn209b0ji94si4ywliagjbg41gdmrl6r7";
+       sha256 = "271b9a6b7b81bc259f8a947b12354951829580b0fe0bd8482e41af261b118977";
        libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
        testHaskellDepends = [
          base byteorder deepseq directory dlist ghc-prim HUnit mtl
@@ -28842,7 +28924,7 @@ self: {
      mkDerivation {
        pname = "bytestring-arbitrary";
        version = "0.0.3";
-       sha256 = "1mxxgdak43wz7vzl2hbff9an7krqz4rhld9h173vvq6w2n8jnbi7";
+       sha256 = "272e2b9115dce0bdc70930350a33f938cf6355726e4141ff3e9f0f32557bbdd7";
        libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ];
        testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
        jailbreak = true;
@@ -28856,7 +28938,7 @@ self: {
      mkDerivation {
        pname = "bytestring-builder";
        version = "0.10.6.0.0";
-       sha256 = "1mkg24zl0rapb3gqzkyj5ibp07wx3yzd72hmfczssl0is63rjhww";
+       sha256 = "9c439987d11150ad3f73158ad3be1f9d1f70572cd2cf8fdf585765403f116fd6";
        libraryHaskellDepends = [ base bytestring deepseq ];
        description = "The new bytestring builder, packaged outside of GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -28867,7 +28949,7 @@ self: {
      mkDerivation {
        pname = "bytestring-class";
        version = "0.0.0.1";
-       sha256 = "1z65br00rplhniaw9fg3phpxwf13acgycn5hnhyjfcyr962xp03x";
+       sha256 = "7d80db8549d933273db4b058e61f532338de2fbce3b9c455b490de0c405ec5fc";
        revision = "1";
        editedCabalFile = "e3aa2813d237dcd0a12bfd27293d8bf592cdf13bfdc01a4b609f34df238d0417";
        libraryHaskellDepends = [ base bytestring utf8-string ];
@@ -28884,7 +28966,7 @@ self: {
      mkDerivation {
        pname = "bytestring-conversion";
        version = "0.3.1";
-       sha256 = "1y2fhwz632sp7n0iw87lz2g8vks4jgxz2kw99kysgivxfd4fmdqk";
+       sha256 = "13b7ea48737dc7a7fd4c894ff1fb9344cf8d9ef8f4201e813d578b613e874ef8";
        libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive double-conversion text
        ];
@@ -28901,7 +28983,7 @@ self: {
      mkDerivation {
        pname = "bytestring-csv";
        version = "0.1.2";
-       sha256 = "0x7qklb36jwxry1ih5x3jw7s861vlvd5g9h7yn7b2x64c0phyj0r";
+       sha256 = "19480f2f60c474b18ef507a657daa63b18a40f97a3171883cf9d4b33169df874";
        libraryHaskellDepends = [ array base bytestring dlist ];
        homepage = "http://code.haskell.org/~dons/code/bytestring-csv";
        description = "Parse CSV formatted data efficiently";
@@ -28914,7 +28996,7 @@ self: {
      mkDerivation {
        pname = "bytestring-delta";
        version = "0.1.0.1";
-       sha256 = "0iq59if3in08ssashk80wvh6yh1yr115387fi9kj952v6bzvzw1q";
+       sha256 = "38f0bfff325b9424678aeea05142c83e406fe0e6004da895d608d8385c4c0547";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/joeyadams/haskell-bytestring-delta";
        description = "Simple, fast binary diff/patch";
@@ -28928,7 +29010,7 @@ self: {
      mkDerivation {
        pname = "bytestring-from";
        version = "0.3";
-       sha256 = "030jrpri4qmv8lr8ahgkbl3gghv2c00lfigx2wbrrv9hz74gkpn4";
+       sha256 = "c4def9c8f930ed9c1717fd4547016062c3f7065df341853245bb6212f3cd120c";
        libraryHaskellDepends = [ attoparsec base bytestring text ];
        testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-quickcheck
@@ -28944,7 +29026,7 @@ self: {
      mkDerivation {
        pname = "bytestring-handle";
        version = "0.1.0.3";
-       sha256 = "0dakwnpymxj2nghqsnq09862czby8hy0xl8m74yzqdnd9ky22g0z";
+       sha256 = "1f3c21fc4ccd36fc3d3915d10e3c447e7d260c4a005b8de1b342f6eaafe55335";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -28960,7 +29042,7 @@ self: {
      mkDerivation {
        pname = "bytestring-lexing";
        version = "0.5.0.2";
-       sha256 = "0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81";
+       sha256 = "01f9add3f25067a89c5ae9ab1f2fd8ab75ec9f386987ee0d83f73ec855b43f73";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Parse and produce literals efficiently from strict or lazy bytestrings";
@@ -28972,7 +29054,7 @@ self: {
      mkDerivation {
        pname = "bytestring-mmap";
        version = "0.2.2";
-       sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v";
+       sha256 = "7bbcaeeccec5cf448ba59c9ed4de95bcc47b11ae2b9bcddb6201decb88eb69af";
        libraryHaskellDepends = [ base bytestring unix ];
        homepage = "http://code.haskell.org/~dons/code/bytestring-mmap/";
        description = "mmap support for strict ByteStrings";
@@ -28984,7 +29066,7 @@ self: {
      mkDerivation {
        pname = "bytestring-nums";
        version = "0.3.6";
-       sha256 = "1kg777gpqj05h5bj0637yky64bdx7x77hm7nq2rhpw4i1mh9gjmx";
+       sha256 = "bdca97600d91f00bb3c0f654784e3fbd2d62fcf4671820578105487cdf39e7cd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
@@ -28998,7 +29080,7 @@ self: {
      mkDerivation {
        pname = "bytestring-plain";
        version = "0.1.0.1";
-       sha256 = "057f9kyvj7cf2a53f6wqah0bw9cp67s7y3b6l6y78m24ipx8c56a";
+       sha256 = "ca1486fa8d445474bca1660d7ff4319725be0054981b378a128e1db9fd4cee14";
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim hashable
        ];
@@ -29014,7 +29096,7 @@ self: {
      mkDerivation {
        pname = "bytestring-progress";
        version = "1.0.5";
-       sha256 = "02j9gmvncap4xzvvmj0s84bkhf4xh8plw5saakiljxf6zi7hpdwq";
+       sha256 = "98b70b4ffcc67549e3544a174e2f829d383817411ac8baf7efe42a66777d490a";
        libraryHaskellDepends = [
          base bytestring terminal-progress-bar time
        ];
@@ -29030,7 +29112,7 @@ self: {
      mkDerivation {
        pname = "bytestring-read";
        version = "0.3.1";
-       sha256 = "0df6mb5fhfd1kgah5gv4q4ykxvl0y8hbqrdvm17nh33cxj2csj00";
+       sha256 = "0048cd84ec6c0c684fa8bb65bc20f280ee3e3dc164bf02d59ba139e8caaac635";
        revision = "1";
        editedCabalFile = "8a8b5f5c2f109a11df1cf47ffec170b810e02186f0406fd6c7f4155bfd2de0b6";
        libraryHaskellDepends = [ base bytestring types-compat ];
@@ -29047,7 +29129,7 @@ self: {
      mkDerivation {
        pname = "bytestring-rematch";
        version = "0.1.0.0";
-       sha256 = "01yk1pmsp6c89z4lf6p37g4jqbqz1d93g61gn4i99p8dijbg0pbh";
+       sha256 = "705df0968c0ddd9422b12f9837520b1f2f2cc93be31a47c94f8899abeb0dd307";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec HUnit rematch ];
        jailbreak = true;
@@ -29062,7 +29144,7 @@ self: {
      mkDerivation {
        pname = "bytestring-short";
        version = "0.0.1.0";
-       sha256 = "034c63hw49sy4mg6xarf61d4f3shafj66v4sqky04sin460s28wv";
+       sha256 = "9b23a18121366a02fcc49a6c63a453500f475a302eab6e5e255e27c2e1308c0c";
        libraryHaskellDepends = [ base bytestring deepseq ];
        testHaskellDepends = [ base bytestring QuickCheck ];
        jailbreak = true;
@@ -29078,7 +29160,7 @@ self: {
      mkDerivation {
        pname = "bytestring-show";
        version = "0.3.5.6";
-       sha256 = "04h81a0bh2fvnkby1qafnydb29gzk6d4d311i2lbn7lm2vyjw919";
+       sha256 = "29242efd16951ebba888218c469a99ff25b19ab74ee1e0d7b4db09b8800a0812";
        libraryHaskellDepends = [
          array base binary bytestring containers integer-gmp
        ];
@@ -29092,7 +29174,7 @@ self: {
      mkDerivation {
        pname = "bytestring-trie";
        version = "0.2.4.1";
-       sha256 = "0qqklrvdcprchnl4bxr6w7zf6k5gncincl3kysm34gd04sszxr1g";
+       sha256 = "2fe4feb526a03d32aaf673506623b3af4ce3fee126f745a8852c5fd676a61363";
        libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://code.haskell.org/~wren/";
        description = "An efficient finite map from (byte)strings to values";
@@ -29104,7 +29186,7 @@ self: {
      mkDerivation {
        pname = "bytestringparser";
        version = "0.3";
-       sha256 = "1g99vbp14ki563lb41y1fxlgvdmrmq1y0xsk0ia1m438rdpnh2qd";
+       sha256 = "0d0b686fcb68901a54045377e003aeb9b6fd6877c107b2e830254e12eeda29bd";
        libraryHaskellDepends = [ base bytestring containers ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
@@ -29116,7 +29198,7 @@ self: {
      mkDerivation {
        pname = "bytestringparser-temporary";
        version = "0.4.1";
-       sha256 = "019axq65hmgmszkc1lyyyy8rpv5xkjbf1pmgz1bz0hnc8lgv58pd";
+       sha256 = "eda2b21f45cc42f057f8afdee0969cbdec9b91f7ded3c0e6d7f555580cee2a05";
        libraryHaskellDepends = [ base bytestring containers ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
@@ -29127,7 +29209,7 @@ self: {
      mkDerivation {
        pname = "bytestringreadp";
        version = "0.2";
-       sha256 = "07hx3072zg9y3kj6h99yl8fd3n115x4z8z411c1cpx1hj292d57f";
+       sha256 = "ee9426929030f4cb020b817cf4492f21d8d11ca23e2568e41c3ebd2f0e181d1e";
        libraryHaskellDepends = [ base bytestring ];
        description = "A ReadP style parser library for ByteString";
        license = stdenv.lib.licenses.bsd3;
@@ -29139,7 +29221,7 @@ self: {
      mkDerivation {
        pname = "bzlib";
        version = "0.5.0.5";
-       sha256 = "0zh130vw719a8d11q5qzc3ilzgv8cqyc2a7r1a131cv1fjnd1rwy";
+       sha256 = "9ee7d0ac7461b330820af928c13c6668bf4fe3601f171c42432a85c33718017e";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ bzip2 ];
        description = "Compression and decompression in the bzip2 format";
@@ -29154,7 +29236,7 @@ self: {
      mkDerivation {
        pname = "bzlib-conduit";
        version = "0.2.1.3";
-       sha256 = "0jqg38zvxc0fpp74az0vm8klb88zwy076ncwzgq2zr0nrmr5cghm";
+       sha256 = "153e5672cd16e42ff0fb9c597380e71fa14527aa1b7c45cebd0eb0be3f1a0f4b";
        libraryHaskellDepends = [
          base bindings-DSL bytestring conduit conduit-extra data-default mtl
          resourcet
@@ -29174,7 +29256,7 @@ self: {
      mkDerivation {
        pname = "c-dsl";
        version = "0.3.1";
-       sha256 = "04hj3d26rp7ibv15n48y4xkfld3nnh6dqn8shxvw1h546z1316pw";
+       sha256 = "fc9a30c237a4c0c077871a59dc0cb47634ea66271e115bc25ef1dc6c441b1212";
        libraryHaskellDepends = [ base language-c ];
        description = "A higher level DSL on top of language-c";
        license = stdenv.lib.licenses.mit;
@@ -29185,7 +29267,7 @@ self: {
      mkDerivation {
        pname = "c-io";
        version = "0.1.0";
-       sha256 = "1za4wcrjrxqk8yqy1bddzxw8xxx0vlxyy31dj1glb5azx6qh7qp2";
+       sha256 = "e2e203b1e95f95455f902d0cef3bdda0f78e78ffadade0b14713f72c33e344fd";
        libraryHaskellDepends = [ base ];
        description = "C IO";
        license = stdenv.lib.licenses.bsd3;
@@ -29197,7 +29279,7 @@ self: {
      mkDerivation {
        pname = "c-storable-deriving";
        version = "0.1.2";
-       sha256 = "0cdy3fy8lpz5layc0qzixfpbx2jksl9smrf012l5rpl994dwc9x1";
+       sha256 = "a127c61b4989de5ca808c0e5aa13d5538abeaeebf163c0bca2e55f8abc1bbe31";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/maurer/c-storable-deriving";
        description = "Generate C-like storable instances from datatypes";
@@ -29209,7 +29291,7 @@ self: {
      mkDerivation {
        pname = "c0check";
        version = "0.2";
-       sha256 = "0alzv8cdv5q6inhgp5zpms24460iqbgmwbc3l1fmf31p6jj802im";
+       sha256 = "350a80a434370c575da0832d5edfc211184284aef797fba08d0697dd18da9f2a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base c0parser ];
@@ -29222,7 +29304,7 @@ self: {
      mkDerivation {
        pname = "c0parser";
        version = "0.2";
-       sha256 = "0i6bsi30dkz51044r92gcgqr07bzbjfzgbr1z7p078j4016zb7cw";
+       sha256 = "9c9df54d0044a203eef921aff79d5c7f1d90f1634fa44c0808e5cf0646d4cb44";
        libraryHaskellDepends = [ base parsec ];
        description = "Simple C0 Parser";
        license = "GPL";
@@ -29233,7 +29315,7 @@ self: {
      mkDerivation {
        pname = "c10k";
        version = "0.5.0";
-       sha256 = "1i62ilk95p1vjyk7gl1fv7lwq6yk3ysfn3v1bbyfpabf97gzr0d9";
+       sha256 = "a981fcdf496ea9ebfc5a610febb41fd31bcce9d92ed077a6973bdc92268dc2c4";
        libraryHaskellDepends = [ base network unix ];
        homepage = "http://github.com/kazu-yamamoto/c10k";
        description = "C10k server library using prefork";
@@ -29248,7 +29330,7 @@ self: {
      mkDerivation {
        pname = "c2hs";
        version = "0.25.2";
-       sha256 = "0d1rgcwvz49v3h511dibiv6m06v8s179pg4sw386z17pz3a2hghm";
+       sha256 = "153e28d4f8f7846fd0e09abc9b4ed0681b50cd8e2bb6100a1c3b91bf397b3934";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29272,7 +29354,7 @@ self: {
      mkDerivation {
        pname = "c2hsc";
        version = "0.6.5";
-       sha256 = "0c5hzi4nw9n3ir17swbwymkymnpiw958z8r2hw6656ijwqkxvzgd";
+       sha256 = "edfddd27e6329a620c8722a38f4ae2f1daea67f57c717d428ec3266e49fcb030";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29292,7 +29374,7 @@ self: {
      mkDerivation {
        pname = "cab";
        version = "0.2.15";
-       sha256 = "0g2z9ypnkxbva2h96ihf0slwg2wz389pxr974vn69v2sblkzl9c9";
+       sha256 = "8925fa275d5aec64ec2627e57e131a9f8bc7a9060e4693a0507bf569af4f5f3c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29315,7 +29397,7 @@ self: {
      mkDerivation {
        pname = "cabal-audit";
        version = "0.3.0.0";
-       sha256 = "02cfwka49fd399drv6rxb3hbxflpv6s1xfa7l759ihkp19d6ph9v";
+       sha256 = "3bc16b5a0a77c298caa147b91eb4d997babee0583d9b9d5b4aa3b944d4e48e09";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29335,7 +29417,7 @@ self: {
      mkDerivation {
        pname = "cabal-bounds";
        version = "0.9.5";
-       sha256 = "0l4s0j75ianggpl3hbqrr3zp7v9jjgd5646ydqbcg040win20lzh";
+       sha256 = "f053206ce48080c7166ede1053da9332ed73ffc8192f38e87dcfaa588e049a50";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29359,7 +29441,7 @@ self: {
      mkDerivation {
        pname = "cabal-cargs";
        version = "0.7.7";
-       sha256 = "08f3fpfsjj4kk5flxgpjvqffifhfkhnf7i4n23adkf7w1rdw4nlz";
+       sha256 = "9f5ac25b0efcb8d9d41096c4e32c9c0ebae81cdef2be4e5d999348a9dd75c321";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29379,7 +29461,7 @@ self: {
      mkDerivation {
        pname = "cabal-constraints";
        version = "0.0.0.1";
-       sha256 = "06k43il8yiwbj6x3fhw64xdwq8d8qsmvvd1ycgml7vsry6cz6pdh";
+       sha256 = "b05df399f159ef43eb633eb4bdabc6a821cc5b27864337ba918b478f681c641a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal optparse-applicative ];
@@ -29398,7 +29480,7 @@ self: {
      mkDerivation {
        pname = "cabal-db";
        version = "0.1.12";
-       sha256 = "1phksjb1ahg0dbgsxsckgmqvvhrzvpn02c3w26gbiq9diindx267";
+       sha256 = "c788de6c8c2de1b89e117c3001ecdd3fc3bd717d93e9aedf6ae0411596d413de";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29421,7 +29503,7 @@ self: {
      mkDerivation {
        pname = "cabal-debian";
        version = "4.30.2";
-       sha256 = "1vafxq1h2nispc7jdckxy2c746ikh60cscg9rrrbvs01wvjam9xw";
+       sha256 = "bca7aae4e601e8bd72cee931cd8081331a7298f07db2260fbb3a5a0103ee4eed";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29448,7 +29530,7 @@ self: {
      mkDerivation {
        pname = "cabal-dependency-licenses";
        version = "0.1.1.1";
-       sha256 = "11bp5gmm0j0w5pbd26qd7w05v1mkkxi5gf28rlx44dzic55xpkld";
+       sha256 = "8dcedb4b61f137423acd48b857629fb3865d003f0d1bd1d62d1c4850eb2b7785";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29467,7 +29549,7 @@ self: {
      mkDerivation {
        pname = "cabal-dev";
        version = "0.9.2";
-       sha256 = "1372bpn8s7d7nm01ggp3m98ldrynidbchk3p14yrjysvxwr3l6q8";
+       sha256 = "081b3a32ef5b7b993d09774cc8568bd6e74651aae3be1740b5a71d8dec5de28c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29488,7 +29570,7 @@ self: {
      mkDerivation {
        pname = "cabal-dir";
        version = "0.1.0.4";
-       sha256 = "0kbq549bl18f1cd2q4w7nngsvnvgc3366xr7y37x5sw80rq5w5wg";
+       sha256 = "8f175e700688ebd2cff0277763c6606fdbad9fb587132c1a0b0e05ba1229784d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal directory filepath ];
@@ -29501,7 +29583,7 @@ self: {
      mkDerivation {
        pname = "cabal-file-th";
        version = "0.2.3";
-       sha256 = "0kawvb5n56rkq4453l6pia3wrr6jvvdwkghi6i176n1gm2zf2ri8";
+       sha256 = "2866e1bea82f5873423411bec9dbded2e4cc878ad7d05108c1339b62cbda5c4d";
        revision = "1";
        editedCabalFile = "50bc6cf5a335a2608ab1e5e59b73f184d3f48d91f49fec189701416ff3e1e37e";
        libraryHaskellDepends = [ base Cabal directory template-haskell ];
@@ -29516,7 +29598,7 @@ self: {
      mkDerivation {
        pname = "cabal-ghci";
        version = "0.3";
-       sha256 = "1x7fpvvmr2mq7l960wgsijhyrdaiq3lnnl3z6drklc5p73pms8w6";
+       sha256 = "86235def38b7303a73337f506be9c051b5eca18cfa7160123db88a5cf7beeef4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal directory filepath ];
@@ -29536,7 +29618,7 @@ self: {
      mkDerivation {
        pname = "cabal-graphdeps";
        version = "0.1.2";
-       sha256 = "105q051bna299pf1ka0r9bmqsbpzcg9vmbi5ynmalancgjpnm29a";
+       sha256 = "2a896aaf7ccc2aaaaaf525aebad363ff2e8deb4a19a819dc4d4928bb4201b880";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29555,8 +29637,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.3.8.0";
-       sha256 = "1l2ign8q4kdsnypqvjl8x152lkb0s1zfn08vshirz2qf4v5wxs3n";
+       version = "0.5.0.0";
+       sha256 = "9b7efb284a61e9064be77f3a273410a5432877f7cbf11e6e0233a1826339dcc8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29567,7 +29649,7 @@ self: {
          base bytestring Cabal directory filepath process template-haskell
          temporary transformers utf8-string
        ];
-       testHaskellDepends = [ base extra unix ];
+       testHaskellDepends = [ base extra process unix ];
        description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -29582,7 +29664,7 @@ self: {
      mkDerivation {
        pname = "cabal-install";
        version = "1.18.1.0";
-       sha256 = "1r1shhvnpgxf91rmbv3wa1rkd24plbgr6bpz3aj80ir0z3zbdayn";
+       sha256 = "d6abb6fef8204780a41aff2e93dfa297883673507cec557348aebf6b37843ae4";
        revision = "1";
        editedCabalFile = "7f1c53bbf3a3906d0594e217d236e54acc015c67db88301dbadaf5008cb9ac4c";
        isLibrary = false;
@@ -29617,7 +29699,7 @@ self: {
      mkDerivation {
        pname = "cabal-install";
        version = "1.22.6.0";
-       sha256 = "1d5h7h2wjwc2s3dvsvzjgmmfrfl2312ym2h6kyjgm9wnaqw9w8wx";
+       sha256 = "9d239e385696a7faa49f068aea451882baec6a7df26fbddbd08271c9053cb0b4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29647,7 +29729,7 @@ self: {
      mkDerivation {
        pname = "cabal-install-bundle";
        version = "1.18.0.2.1";
-       sha256 = "0gsghmpn38idqivba8islfy5y1xhnhyjdyahdg7h7isc9kvq6isq";
+       sha256 = "584783f74c4cc703cf6b50f9263db4b0075fbca33a22b576c42da2616f854f3f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29668,7 +29750,7 @@ self: {
      mkDerivation {
        pname = "cabal-install-ghc72";
        version = "0.10.4";
-       sha256 = "1fgy79w5bzzhqpnwgfd9jis9w6ix5wwdbwr2g556rxvmqsgl7mmg";
+       sha256 = "afd6439fc675f76c4a7922f3d5382f3d1a9e7494a9b9c7edc5f0ff55783afeb9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29690,7 +29772,7 @@ self: {
      mkDerivation {
        pname = "cabal-install-ghc74";
        version = "0.10.4";
-       sha256 = "1ssk5h0hlv3aivzsr0iv90g683qkqmppc7glivhwfm6q1vkv9gmd";
+       sha256 = "adbeb4e70ed854c7e18ef41d766fc5130f641e483b82acff8e6a6c0a012c53eb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29709,7 +29791,7 @@ self: {
      mkDerivation {
        pname = "cabal-lenses";
        version = "0.4.5";
-       sha256 = "1v09n4mah5azb1hmc14ygiqwwm2an6ff2z2f9hw2c7jddbmays5n";
+       sha256 = "b668afea6a4d1e26384c4e7ce19cb14a54ce717c9e045661585f15a82ab109ec";
        libraryHaskellDepends = [ base Cabal lens unordered-containers ];
        jailbreak = true;
        description = "Lenses and traversals for the Cabal library";
@@ -29723,7 +29805,7 @@ self: {
      mkDerivation {
        pname = "cabal-macosx";
        version = "0.2.3";
-       sha256 = "0rvmb6lx2alr7f0v7nbv48xzg7wp4nrn03hdkjc4a4c97rai14i9";
+       sha256 = "299210553e891145989c0d0e60b325979ff73b227bd9b3813b992ad1a9597567";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29745,7 +29827,7 @@ self: {
      mkDerivation {
        pname = "cabal-meta";
        version = "0.4.1.3";
-       sha256 = "14k8nv2kg8n9ssz6jivvin56jjazsvp4xg7zi0z6hcawfmcdmzd6";
+       sha256 = "a6fdda58755c31683e88ffbc4eeed65f49698a8d7b4769bed6c9a237c5b66892";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base shelly system-filepath text ];
@@ -29767,7 +29849,7 @@ self: {
      mkDerivation {
        pname = "cabal-mon";
        version = "1.0.1";
-       sha256 = "1wngmf73dqyyf9nfbpwyg3mvbp32rqrhhp4kf9nylhawwkv7c8v0";
+       sha256 = "602376f6e45c41ea6d72935c0833ce62dcb5eb789edfe56c72dee3368eabcff2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29784,7 +29866,7 @@ self: {
      mkDerivation {
        pname = "cabal-nirvana";
        version = "0.2.2.1";
-       sha256 = "1clwhlqm1k9km29i9b2c2ys59nfspsffrixr2sz824gnd415x3lk";
+       sha256 = "938e5e0269f61181be16b9c7ec9cbedad954b4174cac1493a833cd5031859cb2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29800,7 +29882,7 @@ self: {
      mkDerivation {
        pname = "cabal-progdeps";
        version = "1.0";
-       sha256 = "0fz2hpm8fd49jhqdc9cwzvdq34b64zwn4ln8n77hxqx8rfw8zvif";
+       sha256 = "2eee8fb8cba8e30ecfb1c85262f927669181dbfe9c25d63094893487ea85e23b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal directory filepath ];
@@ -29816,7 +29898,7 @@ self: {
      mkDerivation {
        pname = "cabal-query";
        version = "0.1";
-       sha256 = "0j4n48ngwins8bl7g3mazwmbwgyjpp17mi77c9j1klfgx7fam6wa";
+       sha256 = "8a9baadce9cfd1196462e7c47ac2bdd23fbe2affaa8e77e842da46fe2c229648";
        libraryHaskellDepends = [
          base bytestring Cabal derive ghc MissingH mtl tar template-haskell
          uniplate
@@ -29835,7 +29917,7 @@ self: {
      mkDerivation {
        pname = "cabal-rpm";
        version = "0.9.6";
-       sha256 = "07ig7lwkf9lv10kacxcydpz3z6fhpmmpwcr6kq32xgh3larsf0g5";
+       sha256 = "e501a7b3a203be2e069e26337e6bbdd0993ffe6d9e75a626089b2637393d2f1e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29851,7 +29933,7 @@ self: {
      mkDerivation {
        pname = "cabal-scripts";
        version = "0.1.1";
-       sha256 = "1ajgx29hvcsdd6lwc78dyhsjm5ikx2zn0kdbwnzn1kggz2l08ls4";
+       sha256 = "445304a8f8efcd60bfe5ab4d60bfe833962a35f40d1dc6a9694db30d93e84faa";
        libraryHaskellDepends = [ base ];
        description = "Shell scripts for support of Cabal maintenance";
        license = stdenv.lib.licenses.bsd3;
@@ -29863,7 +29945,7 @@ self: {
      mkDerivation {
        pname = "cabal-setup";
        version = "1.2.1";
-       sha256 = "0k1lnixkmgdjn8d2akhj60133brs424y0cwwzwraq7awx03y72bm";
+       sha256 = "7589e307e85c1dac32ff9c33e089203aaf310230124e251ab2b2bd3a7bb4344c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
@@ -29880,7 +29962,7 @@ self: {
      mkDerivation {
        pname = "cabal-sign";
        version = "0.4.1.0";
-       sha256 = "1b8yr4k0mapysgh96dxabpzxznd65v8yrcba0jk6wda3mwlm1nqk";
+       sha256 = "13db5029af43356ea6046ab1ecd12ea6d9dfff5daa3793e0d3feaa0a26c91ead";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29898,7 +29980,7 @@ self: {
      mkDerivation {
        pname = "cabal-sort";
        version = "0.0.5.1";
-       sha256 = "1991k6p8vvagnm8wpmzy84088whkqls1q4rdgir4f2m7r0wxl414";
+       sha256 = "2410da39c8a70a47727c2d131c34c51372840041fed7cb51b54fed8dae9921a5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29919,7 +30001,7 @@ self: {
      mkDerivation {
        pname = "cabal-src";
        version = "0.3.0";
-       sha256 = "1x8fb7hly9cxhfacwrai1zam6737dgfhjs9g85826f2cp4vp0g29";
+       sha256 = "493c7037b94c382350412f6909dd6b671c53d50f5165ce94839d254fe1590ef5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29937,7 +30019,7 @@ self: {
      mkDerivation {
        pname = "cabal-test";
        version = "0.1";
-       sha256 = "11883q7zjy3l5qla5rvbmflm19kalvzqx7n1hprmiizr1kczh6ax";
+       sha256 = "5d19f8d90cf9c758f385c19e8effa66aa650a9ab6be7a2282e7478f90f1e0885";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29955,7 +30037,7 @@ self: {
      mkDerivation {
        pname = "cabal-test-bin";
        version = "0.1.5";
-       sha256 = "1qjshg9r6vh964mwsj0spsxcl3sdvll2znjd2hq4lw71va4iwm87";
+       sha256 = "07551e89dae1704a30144dda2f28dd4d0fcababe1a48cd2b31096e93d3835ae2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath unix ];
@@ -29970,7 +30052,7 @@ self: {
      mkDerivation {
        pname = "cabal-test-compat";
        version = "0.2.0.0";
-       sha256 = "15lxyrza1n9saac1awjx482gi7wq3sshqf4ich6k9xkfj464lrdq";
+       sha256 = "b8654a0c916ef6340d6491380cb51e989ff804225d721598523ad9a07ef69d96";
        libraryHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "http://twitter.com/khibino/";
        description = "Compatibility interface of cabal test-suite";
@@ -29982,7 +30064,7 @@ self: {
      mkDerivation {
        pname = "cabal-test-quickcheck";
        version = "0.1.6";
-       sha256 = "0rffvz3khxdfbl9rfk1q47xqv013dwmd4sy8cy7y833175j2zibi";
+       sha256 = "71c52f6439610ce48f67c86bd22a6f23808dfb21384c97135dae7538c7dfce65";
        libraryHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/zmthy/cabal-test-quickcheck";
        description = "QuickCheck for Cabal";
@@ -29994,7 +30076,7 @@ self: {
      mkDerivation {
        pname = "cabal-uninstall";
        version = "0.1.6";
-       sha256 = "0ys1c8z8042vc7dzmis47w0q3qapyllmsdkpb1by22qmcnaavii2";
+       sha256 = "22c6ad9465150be1575877365d29f557e181013f44c7fadb615b10803e62417b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath mtl process ];
@@ -30007,7 +30089,7 @@ self: {
      mkDerivation {
        pname = "cabal-upload";
        version = "0.4";
-       sha256 = "05k77hdx0sbgnn454vb6rc7mmrc3zby7s44x498i4ncrkivz90bz";
+       sha256 = "7f81f4779c99591251229d107dfcfa83e55a0fcb666d5288b56f69d01b3c6716";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base filepath HTTP network ];
@@ -30024,7 +30106,7 @@ self: {
      mkDerivation {
        pname = "cabal2arch";
        version = "1.1";
-       sha256 = "0sk10z9lj291rpidlaydp7nvgl7adbp7gyf2nvqqhrshxnlqpc8z";
+       sha256 = "1fb18ba9ed506788f1b6c2f977ee6aead0b7edb9cd2bdae2cd210949d307616a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30042,7 +30124,7 @@ self: {
      mkDerivation {
        pname = "cabal2doap";
        version = "0.2";
-       sha256 = "1nqchq9mzq8k99agvafwa4vll7d3ahpkaifnjj2bnljqdkxlh9al";
+       sha256 = "542548fb6c5852bb8494d645352f54a31d4a3751dca9fd544a13e15f13860cdb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30060,7 +30142,7 @@ self: {
      mkDerivation {
        pname = "cabal2ebuild";
        version = "0.0.15.9";
-       sha256 = "11fp52hmzkrgcmkxzclmq6bbzxsn0ph78ib6wzzkza5j2c48ya2l";
+       sha256 = "54288f0813b2a83fffe7664574e00556f7bf96c195b2df67652fcf5fa128d785";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal directory filepath ];
@@ -30077,7 +30159,7 @@ self: {
      mkDerivation {
        pname = "cabal2ghci";
        version = "0.0.1.1";
-       sha256 = "1fg3pr25f78a6b8nqxvxki4z3fvgx4i6zkmpl992a0iarycqdrsg";
+       sha256 = "4fe78699cf2a022552a2b7ce6f22e96fbbf1499c7d776cd1320a1d5744bee3b9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30096,7 +30178,7 @@ self: {
      mkDerivation {
        pname = "cabal2nix";
        version = "1.73";
-       sha256 = "1nskcr8k5a8wm9q5is0b1kww574q2nq45f16agya8z44hgk97xiv";
+       sha256 = "3bf693e683847ca4fc5326b842b015989cc2f90c0be85870aa1ca932516653db";
        revision = "5";
        editedCabalFile = "54866b8081ddfc72761c1f38cc96df6782682058cd09b465300562910f57e2ea";
        isLibrary = false;
@@ -30119,7 +30201,7 @@ self: {
      mkDerivation {
        pname = "cabal2spec";
        version = "1.0";
-       sha256 = "08y8rwj86n7f3bqfv2ximlx8qas12zspiz6ix8gg01whsry43nsj";
+       sha256 = "52db417cd69007f01eead1fc78f517412b8c3aadb18bedf01aee588324cfc823";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30139,7 +30221,7 @@ self: {
      mkDerivation {
        pname = "cabalQuery";
        version = "0.1.0.1";
-       sha256 = "195wsfh813z6pmba3lz2xgfcqijcql6xwqsggqb5rmzqxbkvk0bd";
+       sha256 = "6d81b9e7eaf8d75c167e4f63de0dc54c46ccdcebe2d3a156bde68f80a0d3bca4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal pretty ];
@@ -30157,7 +30239,7 @@ self: {
      mkDerivation {
        pname = "cabalg";
        version = "0.2.9";
-       sha256 = "02brl9b1g3cyw5nmk0mih073kbszpc6g2nqgs0sh93h7y5naf5kp";
+       sha256 = "7716a76cf1078e0435d00f5bf10cbb5faf390e80b182596de19e8d1756a27909";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath process ];
@@ -30174,7 +30256,7 @@ self: {
      mkDerivation {
        pname = "cabalgraph";
        version = "0.1";
-       sha256 = "1kgw1n22zh1ap6dfzhmh18d0wkr6ppd9b20r77f7q6m371hhbkvy";
+       sha256 = "7ecf056138a31a7cdc39198895dabd264f0e1a0ab0c2ef9ab92ac02f840dfccd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30191,7 +30273,7 @@ self: {
      mkDerivation {
        pname = "cabalmdvrpm";
        version = "0.0.1";
-       sha256 = "0pgkav4ifwkqh9idj8rpbnq3rw51i94dj1zw0wf7mv72bb32a0c6";
+       sha256 = "860125c65ae2ec7a1c07fc07d9488aa1f03cb05d3723d96282787217c956f35d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ];
@@ -30207,7 +30289,7 @@ self: {
      mkDerivation {
        pname = "cabalrpmdeps";
        version = "0.0.4";
-       sha256 = "19kzbwpb9gv9knz1dfvck8yb1kda5dg9rig5xrsd118wgq6xpkr1";
+       sha256 = "21cfdb0d7e1c85d074eee5c59c5e2baacdb03c9a6cbb16be9d69bfb42e5f7fa6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal filepath haskell98 ];
@@ -30223,7 +30305,7 @@ self: {
      mkDerivation {
        pname = "cabalvchk";
        version = "0.3";
-       sha256 = "1ai2yz4whbjk9qfpyzjqkdypqknnzfdr1fdp5ii7h059na0q6iq2";
+       sha256 = "02478381b2a90078622cb7b9909bfbd64e7c7d9b587e7f1d4e532ec8c9f722aa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
@@ -30238,7 +30320,7 @@ self: {
      mkDerivation {
        pname = "cabin";
        version = "0.1.0.3";
-       sha256 = "0wj1x6gsr5jlnq0l6xgwy2y64jlxna7bvx7vwk73znf572rswmxk";
+       sha256 = "b357aeb338c5d93fcee4fbf4bd8eb29d4a62bcf0fc754301b65496ac9fe94172";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30254,7 +30336,7 @@ self: {
      mkDerivation {
        pname = "cabocha";
        version = "0.1.0.0";
-       sha256 = "0siqh3dly69b1kfm5y3q0sccqxx25hflwhizw6ga70icmvscwrwf";
+       sha256 = "8e67cef4ae2c82a39ee13f424e1d2ca277cc980678f852dd0c2b194fdb80386a";
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ cabocha ];
        testHaskellDepends = [ base text-format ];
@@ -30263,6 +30345,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { cabocha = null;};
 
+  "cached-io" = callPackage
+    ({ mkDerivation, base, stm, time }:
+     mkDerivation {
+       pname = "cached-io";
+       version = "0.1.0.1";
+       sha256 = "76326e5acec346f27c258440b792e4899c6fb2fc364b1c217c73c5b72e3ce0b8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base stm time ];
+       executableHaskellDepends = [ base stm time ];
+       jailbreak = true;
+       description = "A simple library to cache a single IO action with timeout";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "cached-traversable" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, mtl
@@ -30270,7 +30367,7 @@ self: {
      mkDerivation {
        pname = "cached-traversable";
        version = "0.1.0.1";
-       sha256 = "05hlj6qdy0iqyi8z75h7fr9ijfhxngyr3v60q8y681acsgr54dv6";
+       sha256 = "663752f2d34c05643cc2c0ec91fdb31d3a1953760796f351f43802dfb0911416";
        libraryHaskellDepends = [
          base binary bytestring containers directory filepath mtl
        ];
@@ -30283,7 +30380,7 @@ self: {
      mkDerivation {
        pname = "caf";
        version = "0.0.3";
-       sha256 = "1yrl3ffkfwgs4kljx57m1ldam087s7iby2qs74c4crxkrcj0j7a8";
+       sha256 = "481d0924cbb3674618391a0bbfe2d10781aa1a0df5942ee924fa71379d1b34fb";
        libraryHaskellDepends = [ base ];
        homepage = "http://sites.google.com/site/cafwiki/";
        description = "A library of Concurrency Abstractions using Futures";
@@ -30295,7 +30392,7 @@ self: {
      mkDerivation {
        pname = "cafeteria-prelude";
        version = "0.1.0.0";
-       sha256 = "1iyasmd8zcg98vy7ffhxyyr664f02ird5z7rks9n67ixv7n60mrl";
+       sha256 = "345760ecd93d1e63939ef9fcd27214c01163b2f71d3a77fc46e9b18f5ad5cac7";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Scott-Fleischman/cafeteria-prelude";
        description = "Prelude subsets—take only what you want!";
@@ -30311,7 +30408,7 @@ self: {
      mkDerivation {
        pname = "caffegraph";
        version = "0.1.0.2";
-       sha256 = "1yz427ygabkycvngqw250ksl17nwi0fy52x2fy3x6apg79cw1ng2";
+       sha256 = "e2d9c0593aef2ad38777a28be21d88dc9e40f5044570fcec667e2ef5fc11e4fb";
        libraryHaskellDepends = [
          base bytestring containers fgl filepath graphviz language-lua lens
          mtl optparse-applicative process protocol-buffers
@@ -30329,7 +30426,7 @@ self: {
      mkDerivation {
        pname = "cairo";
        version = "0.13.1.0";
-       sha256 = "0vi7glzizi2nvv0p5wsdxlpkx3f1875jpij26k2j4h0h6z53z3kb";
+       sha256 = "6b8e3fca37104022c53442c62bcb41c18d3e2fed4df372c1de56c41f3f7d276e";
        libraryHaskellDepends = [
          array base bytestring mtl text utf8-string
        ];
@@ -30345,7 +30442,7 @@ self: {
      mkDerivation {
        pname = "cairo-appbase";
        version = "0.4";
-       sha256 = "1191j2587f1sy4d6z57df21xn00qdpv27clib7cyaqdy5jnv3zw2";
+       sha256 = "82ffb1ad2cbe61e5d95991b223f66d1800db8370ed946f1af13ab8838a902185";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cairo glib gtk ];
@@ -30361,7 +30458,7 @@ self: {
      mkDerivation {
        pname = "cake";
        version = "1.1.0.1";
-       sha256 = "168szg38gq0g0mppjszcsmsdygs8qy23w6xsz8gbg7dkh7izy1ba";
+       sha256 = "6a05ffe381b39db71efaba1b3e84c7483fdf74d5ec6b796f050fe087c6fb1a99";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30384,7 +30481,7 @@ self: {
      mkDerivation {
        pname = "cake3";
        version = "0.6.0";
-       sha256 = "0k045qqnivhmsvxas0zlmp9qgkb16917s4wk67l7mscgpi99fhdq";
+       sha256 = "b8419752bc8fe97ae83193137d423261cd87d3adf403adfad615ee68312e044c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30411,7 +30508,7 @@ self: {
      mkDerivation {
        pname = "cakyrespa";
        version = "0.0.29";
-       sha256 = "1a2ypgkpzzp2hn14x35ava0p0k781s7mhldw29ppl1an7fs91fyx";
+       sha256 = "ddbb90b43b56057a6f12bc51588f0ee84c7081daaa8c4e8285e2fe7fe7bb5ea8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30428,7 +30525,7 @@ self: {
      mkDerivation {
        pname = "cal3d";
        version = "0.1";
-       sha256 = "1b4pajzpf879vns2kffkqgyk5sbsfrr3q2kv5ryvls8rgwcjc3q6";
+       sha256 = "060f26197f1969ba7d2e7b0a3c72767ae932fdc3d3b929b4dde92077bf5497ac";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ cal3d ];
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
@@ -30442,7 +30539,7 @@ self: {
      mkDerivation {
        pname = "cal3d-examples";
        version = "0.1";
-       sha256 = "1fj6v1dw1gyy6dx4ssiziahxf8j8vr4l35n3rm04g797wypswmw0";
+       sha256 = "8057aeafe7279d4740cdc3964149de4822d7a18a3f6a4d7a33debfc05bd846ba";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
@@ -30457,7 +30554,7 @@ self: {
      mkDerivation {
        pname = "cal3d-opengl";
        version = "0.1";
-       sha256 = "02na1ww5dw08n2y7v2vkgdvzw0zpiic5683jac7f2zvhcij68sf2";
+       sha256 = "c269646464707fe10e53722053588cf703fe777b738b7dbcb008f056380fca0a";
        libraryHaskellDepends = [ base cal3d OpenGL ];
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "OpenGL rendering for the Cal3D animation library";
@@ -30470,7 +30567,7 @@ self: {
      mkDerivation {
        pname = "calc";
        version = "0.1";
-       sha256 = "1h3rqxj2df68knrb2rhp75rc92q9knsa7jp749j9h24258yr6qxw";
+       sha256 = "bc63933d2a8208986422e7caa3b49d098bc472391766b1b29dc8b82664c779c0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base harpy haskell98 mtl ];
@@ -30484,7 +30581,7 @@ self: {
      mkDerivation {
        pname = "calculator";
        version = "0.3.1.1";
-       sha256 = "1k21wf4gnq8h1a8nk5xx41yibc3azscxgkm8ajmjnj1a5w71wm8c";
+       sha256 = "0c551e0e2f2a482bab54a8ced799fe6ab0157d20bd9769910a1061fb88e341cc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers haskeline parsec ];
@@ -30502,7 +30599,7 @@ self: {
      mkDerivation {
        pname = "caldims";
        version = "0.1.0";
-       sha256 = "0mlgxghah8mw0v17rywfj190kmc4jajpmjpgkpgfxdqzw8djyph0";
+       sha256 = "005e2f1be21fb7eede9defca7aa59284d50952908efb7cc206bc22a8e0eb8f56";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30523,7 +30620,7 @@ self: {
      mkDerivation {
        pname = "caledon";
        version = "3.2.1.0";
-       sha256 = "0mg3qn4zfsg5pvfp51zjvsy24mljkqh2f7bsjbz04zasx5852dz9";
+       sha256 = "e9375150e95a7d02fe927a1d27209e925622bcdef28772ddbee569f789c5e355";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30547,7 +30644,7 @@ self: {
      mkDerivation {
        pname = "call";
        version = "0.2";
-       sha256 = "1hbzrhhx0cjgpxiq3200n38pl2m2y727zfmgfdfs45l1hqbvrldp";
+       sha256 = "b7d1bc17868116a25d73afba7fc4f1a20a7ad1b000888163bf4f32d021cc7fc1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30571,7 +30668,7 @@ self: {
      mkDerivation {
        pname = "call-haskell-from-anything";
        version = "0.1.0.2";
-       sha256 = "0hav4kypy39lil49wrclrrajrwa5prmi7r7s6y9i3xshn1mhnjx1";
+       sha256 = "a14b0b6bb050f7119337fae4136bbe45f12c55ce94659e088d340d7ffd245b41";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30590,7 +30687,7 @@ self: {
      mkDerivation {
        pname = "camh";
        version = "0.0.2";
-       sha256 = "0xk1rxydncwfwj9cg4jwdgi8mlgwmk5nfk462pla26dqqg44aw2p";
+       sha256 = "577045c8c3b819a1e815864c67cbacfcd18ae26b5c92c792e48e33db7ccf6176";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring Imlib terminfo ];
@@ -30607,7 +30704,7 @@ self: {
      mkDerivation {
        pname = "campfire";
        version = "0.2.1";
-       sha256 = "06m5d7b6dqmp3x09b1nib1rxjh1gvx84bhvfnydlb26093za71b4";
+       sha256 = "6485a3fe48c088459bb76ec34550df2f40d97358d18695401fb7e266d669a51a";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers filepath
          http-enumerator http-types mtl old-locale process text time
@@ -30625,7 +30722,7 @@ self: {
      mkDerivation {
        pname = "canonical-filepath";
        version = "1.0.0.3";
-       sha256 = "0dg9d4v08gykbjmzafpakgwc51mq5d5m6ilmhp68czpl30sqjhwf";
+       sha256 = "8e43893518f47e86cc859546534b2bb886c2f89bea3af5ab5cd33f043669e935";
        libraryHaskellDepends = [ base deepseq directory filepath ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/canonical-filepath";
@@ -30638,7 +30735,7 @@ self: {
      mkDerivation {
        pname = "canteven-config";
        version = "1.0.0.0";
-       sha256 = "1dkw0w43ajjgpczp8hmclr93v9scl75rlnsmxdjvwmv9phpj5559";
+       sha256 = "a994222fbc6957be65eb555b9acba14ca73d52a6ac42743fbb4f4a3508077cb6";
        libraryHaskellDepends = [ base unix yaml ];
        description = "A pattern for configuring programs";
        license = stdenv.lib.licenses.asl20;
@@ -30651,7 +30748,7 @@ self: {
      mkDerivation {
        pname = "canteven-log";
        version = "0.2.0.0";
-       sha256 = "15gfic3yzi4wc06s9zfpxs0ygxbhasarfn92dj7h0aqfgqa0wvff";
+       sha256 = "ce6d0e147e0e2b008f6c225997955670f5e781eed7fda40d609cc4ef078bee95";
        libraryHaskellDepends = [
          aeson base canteven-config directory filepath hslogger text yaml
        ];
@@ -30667,7 +30764,7 @@ self: {
      mkDerivation {
        pname = "cantor";
        version = "0.4";
-       sha256 = "16dx8v29gfwrrfb2lwkjlwbbp8n6jdpdcmwh15rrfx97rz4k0qz3";
+       sha256 = "e36330c9cf27759773099057d66e93c6a2bb16a772722a96cb99bb97c446bd99";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30693,7 +30790,7 @@ self: {
      mkDerivation {
        pname = "cao";
        version = "0.1.1";
-       sha256 = "0rmq22fiaadpszckbj5k5gi4sr1jipinyrx9hwc21k5d185vsakd";
+       sha256 = "6d2abd0b0aadcc201887a9676fe38d32644de22bb3c835d9d7b729159d10b866";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30712,7 +30809,7 @@ self: {
      mkDerivation {
        pname = "cap";
        version = "1.0.1";
-       sha256 = "1492x5hy5ljf0h40c045jd3w26f7jwqplgncka3dnw4mx9kq4g15";
+       sha256 = "253c8267ea9570db869acc3e7a3197c719c1479385000608044ed2e261e92291";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers haskell98 ];
@@ -30726,7 +30823,7 @@ self: {
      mkDerivation {
        pname = "capped-list";
        version = "1.2";
-       sha256 = "0sik7svknaam6fhlvb4p1ijwaiwrgssrdl9gmq1wmfx66g069xi9";
+       sha256 = "29f664c033a6bbca03ae2fd196b57e9947c5650c97ac4da13355293bb73e336a";
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy sequences, with a user-defined termination value";
        license = stdenv.lib.licenses.bsd3;
@@ -30737,7 +30834,7 @@ self: {
      mkDerivation {
        pname = "capri";
        version = "0.1";
-       sha256 = "0hsrznygvn1b2qpc75591kzmcpqh7p5fhi1mw3ws2c75igjqbni7";
+       sha256 = "27da85e58be530a1f9e03544e8ca3d105f56ff0ca994c32e162bd8fdbcfd5943";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30757,7 +30854,7 @@ self: {
      mkDerivation {
        pname = "caramia";
        version = "0.7.2.2";
-       sha256 = "1cvpyad7kmkndan1bfpfaav6lara8g78x02pgascrq8n73b2jcgs";
+       sha256 = "fa3129d63816e1ccb47a57808ece432a2b6ab652eeba15ac6a76d6799af277b3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30780,7 +30877,7 @@ self: {
      mkDerivation {
        pname = "carboncopy";
        version = "0.1.2";
-       sha256 = "1wi06n0cdqkvyqqr9ji7nyjn09qqckskrzi3djcnxgwhwwp8da3i";
+       sha256 = "71a8862ee790bf6e996c23fe3cf564182760a5b727ca9431f67be2c6803520f2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30799,7 +30896,7 @@ self: {
      mkDerivation {
        pname = "carettah";
        version = "0.3.0";
-       sha256 = "1vjrppsqmlxajj7dxr13ynipp0adi6xxpqic5mma04sjgi3afrj2";
+       sha256 = "4266a7467c5213a06a2d2ce2dbbb894d817ba3f523e4de8e94aad38af5bd59ee";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30818,7 +30915,7 @@ self: {
      mkDerivation {
        pname = "carray";
        version = "0.1.5.2";
-       sha256 = "0kjqxjnamhnpjjf2bgm1gnsy6jx1fjbn5mx394pyx1vq3lkfgfb0";
+       sha256 = "60b9e7261d7887ee2f49a3d7629774a14be3b57da1be259c94d7c2aaacec584e";
        libraryHaskellDepends = [
          array base binary bytestring ix-shapable syb
        ];
@@ -30833,7 +30930,7 @@ self: {
      mkDerivation {
        pname = "cartel";
        version = "0.14.2.6";
-       sha256 = "05m4b8gi5ysx73yzlhl27fx9i8fnlihxwsyh6a0702kzwgn40icc";
+       sha256 = "8c4540ece37f0a708032d06bde61a4d6a198ba3b8242fafd385dfb121f5aa416";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30856,7 +30953,7 @@ self: {
      mkDerivation {
        pname = "casadi-bindings";
        version = "2.3.0.1";
-       sha256 = "1a1644lwzarfcjgnhzyi7lp0xhxmzm80h6nini6bcgkm4g4c9h4q";
+       sha256 = "98c0c4c823753eb64cb4d11a0850fdb5c30e2e3dd17f689f642eabcf292126a8";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear vector vector-binary-instances
@@ -30875,7 +30972,7 @@ self: {
      mkDerivation {
        pname = "casadi-bindings-control";
        version = "2.0.0.1";
-       sha256 = "03lpg9vp47db8wc4waajfh1z96f3nc1v29wqc9a58vrhfdnhp52w";
+       sha256 = "5c940b6d73306f5454629827b103b3c399f4037452294e1847ab1d72777a970e";
        libraryHaskellDepends = [
          base casadi-bindings-core casadi-bindings-internal vector
        ];
@@ -30891,7 +30988,7 @@ self: {
      mkDerivation {
        pname = "casadi-bindings-core";
        version = "2.3.0.1";
-       sha256 = "0agzm3bqb3fii626m40684g7hahj2mhv60xx0smhw78z978cqw57";
+       sha256 = "a770ccd0491f1d0eab06bd03b36115122a781e4106906a8489d18d85d7a8ff29";
        libraryHaskellDepends = [ base casadi-bindings-internal vector ];
        libraryPkgconfigDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
@@ -30904,7 +31001,7 @@ self: {
      mkDerivation {
        pname = "casadi-bindings-internal";
        version = "0.1.3.0";
-       sha256 = "1kazy8xppydbl6gkdn1y1gv2lz38sif6i92crkxb476xz0fvmf00";
+       sha256 = "00b8ba1df8dd1cb2facc4ca4685cd4687c2af60b3ed8369fa1abf97b3bf25fcd";
        libraryHaskellDepends = [ base vector ];
        libraryPkgconfigDepends = [ casadi ];
        homepage = "http://github.com/ghorn/casadi-bindings";
@@ -30920,7 +31017,7 @@ self: {
      mkDerivation {
        pname = "casadi-bindings-ipopt-interface";
        version = "1.9.0.3";
-       sha256 = "1h1qpl8ch8riz614fssirlp5j3vzi39jjajwjnfqvgw7h8sdam2a";
+       sha256 = "4a54d5348287bf8d9d955c2a29d3887f0f592ecd516b4782f93123c810bd38c0";
        libraryHaskellDepends = [
          base casadi-bindings-core casadi-bindings-internal vector
        ];
@@ -30937,7 +31034,7 @@ self: {
      mkDerivation {
        pname = "casadi-bindings-snopt-interface";
        version = "1.9.0.3";
-       sha256 = "0sygbbvdrd1za6k9yf0yqxfd48imlhghzf6sy0dh77jmdhlb8asw";
+       sha256 = "5c2bb4286c559e031bf0dab80f1fa43522d25cc71e389fa6513fb4dcf65acf6b";
        libraryHaskellDepends = [
          base casadi-bindings-core casadi-bindings-internal vector
        ];
@@ -30954,7 +31051,7 @@ self: {
      mkDerivation {
        pname = "cascading";
        version = "0.1.0";
-       sha256 = "0w9zhaf4a09nl3b1sffllgf0zc10lzy38a8k4f7sbc0hr45wzj5y";
+       sha256 = "bec8cf0bc910b0a58f23132934fca720b00fdca3d4391dd6a03601459c823f71";
        libraryHaskellDepends = [
          base blaze-builder bytestring colour containers lens mtl text
          utf8-string web-routes
@@ -30970,7 +31067,7 @@ self: {
      mkDerivation {
        pname = "case-conversion";
        version = "0.1";
-       sha256 = "1njnhbqj1c0zxr0vkb7qh51764f3hscjqjq2yzgyy1shfrc1y1i4";
+       sha256 = "24061f58765007efdff7024b2c9986c311734281f8acb941ee1fb020f18256da";
        libraryHaskellDepends = [ base ];
        homepage = "www.xy30.com";
        description = "Convert between different cases";
@@ -30984,7 +31081,7 @@ self: {
      mkDerivation {
        pname = "case-insensitive";
        version = "1.2.0.4";
-       sha256 = "07nm40r9yw2p9qsfp3pjbsmyn4dabrxw34p48171zmccdd5hv0v3";
+       sha256 = "63830d4b6b8cd51f4e40e492c17b5eaa11ebab5ef28eeb344e57709f3220d51e";
        libraryHaskellDepends = [ base bytestring deepseq hashable text ];
        testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit text
@@ -30999,7 +31096,7 @@ self: {
      mkDerivation {
        pname = "cased";
        version = "0.1.0.0";
-       sha256 = "08xdc0mpp6b6inaxh6cr6ni08sy2ahfcbq8xbs3m4cfqbrqfd543";
+       sha256 = "8394e6705ed83152875e1de1c51c54c26b04a2359919d8958d66997b2b60ad23";
        libraryHaskellDepends = [ base text ];
        homepage = "https://github.com/jb55/cased";
        description = "Track string casing in its type";
@@ -31013,7 +31110,7 @@ self: {
      mkDerivation {
        pname = "cases";
        version = "0.1.2.1";
-       sha256 = "0p2dfnyj887bnp414psbmkin4ybmflvgr1q2npvcih2sxianywkd";
+       sha256 = "6d726f55ec5ac0c8f6b50287fc3675757962e3ac4b5f12c8b5eb2024bd754d5c";
        libraryHaskellDepends = [ attoparsec base-prelude loch-th text ];
        testHaskellDepends = [
          base HTF HUnit loch-th placeholders QuickCheck text
@@ -31031,7 +31128,7 @@ self: {
      mkDerivation {
        pname = "cash";
        version = "0.1.0.1";
-       sha256 = "0pwn33dpv5bgs74i8x6q47hsbl0jg68xwhjjiwyjdyl6sb3rfih7";
+       sha256 = "074697c7d286fa263d8f5242de917912d0a5e121d87414c9d16f957ddb18965f";
        libraryHaskellDepends = [
          base deepseq haskell98 HaXml network parallel pretty
        ];
@@ -31046,8 +31143,8 @@ self: {
     ({ mkDerivation, base, split }:
      mkDerivation {
        pname = "casing";
-       version = "0.1.0.0";
-       sha256 = "0d7frpz512gig2crpx3kxsnfwf3kbcklkann158wrzg8q02jhjhi";
+       version = "0.1.0.1";
+       sha256 = "9039e45dc21851b7b6e5e58c79603beb27a03a79588c3176150d5c83d6e077ac";
        libraryHaskellDepends = [ base split ];
        description = "Convert between various source code casing conventions";
        license = stdenv.lib.licenses.mit;
@@ -31061,7 +31158,7 @@ self: {
      mkDerivation {
        pname = "cassandra-cql";
        version = "0.5.0.2";
-       sha256 = "1nk0psvmzhvxls4h0p4blrm8qjn6lyh08bdxpiagpw6nrpvbda54";
+       sha256 = "a4a8b6f6cdd6f0fb54bcbd2d04a0a7c64a8c6aa68b5c0089a67dc35fb7be60da";
        libraryHaskellDepends = [
          base bytestring cereal containers cryptohash Decimal hslogger
          MonadCatchIO-transformers mtl network resource-pool stm text time
@@ -31076,7 +31173,7 @@ self: {
      mkDerivation {
        pname = "cassandra-thrift";
        version = "0.8.5.1";
-       sha256 = "0hmmi0g32nfwcny56sb4jw463jp7hiwj2hhv42bf8h9az30vjxwc";
+       sha256 = "8c77b9c1f82a41e496201b42217984e7ca610897646953bc65dc59311e88b542";
        libraryHaskellDepends = [ base bytestring containers Thrift ];
        homepage = "http://cassandra.apache.org/";
        description = "thrift bindings to the cassandra database";
@@ -31093,7 +31190,7 @@ self: {
      mkDerivation {
        pname = "cassava";
        version = "0.4.3.1";
-       sha256 = "1b62zx6fna0nx3qvs316bwc39l8qan9fpm82f1p28ipkyq0ym2g3";
+       sha256 = "e389ea01f6f346246e7002d5eb925518d134185f260cbdf1e81628eb4cffc2ac";
        libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
          hashable text unordered-containers vector
@@ -31115,7 +31212,7 @@ self: {
      mkDerivation {
        pname = "cassava-conduit";
        version = "0.2.0";
-       sha256 = "09z7i147qs292xl3hqqi1x1kigrxdh5s8gzin12fgcpbyjggv30n";
+       sha256 = "168cfd9ef4ebb2e744b0f13fa40b6c3dbf38430f116338681749687c4888e727";
        libraryHaskellDepends = [
          array base bifunctors bytestring cassava conduit conduit-extra
          containers mtl
@@ -31134,7 +31231,7 @@ self: {
      mkDerivation {
        pname = "cassava-streams";
        version = "0.1.1.0";
-       sha256 = "08b144jm9805wqj68cgmh5j0bq03i439cpbxvq5m2k72m9s81kl7";
+       sha256 = "87ce8074aae24c510bde7d5d96068903e0056481f5316424e605a05425216121";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -31156,7 +31253,7 @@ self: {
      mkDerivation {
        pname = "cassette";
        version = "0.1.0";
-       sha256 = "04qnk1s4bdj3wbbxdwzzvpnhkcgma8c4qfkg454ybg7f8kyv6h7x";
+       sha256 = "fd40b3fd44eebce549216f3a4c1852f5b109edddfff3d6d7e243b64574981613";
        libraryHaskellDepends = [ base ];
        description = "A combinator library for simultaneously defining parsers and pretty printers";
        license = stdenv.lib.licenses.bsd3;
@@ -31173,7 +31270,7 @@ self: {
      mkDerivation {
        pname = "cassy";
        version = "0.7.1";
-       sha256 = "0nm1xn7rkxqdap0k3lcl29jp7ajn5fypaqx3ag1zbyp8llc7xy0f";
+       sha256 = "0ef87e18a5e8faf5c353a36375bd2b56aa73651294d131c1550df7998feda15a";
        libraryHaskellDepends = [
          aeson async attoparsec base binary bytestring cassandra-thrift
          cereal conduit containers data-default errors exceptions mtl
@@ -31199,7 +31296,7 @@ self: {
      mkDerivation {
        pname = "castle";
        version = "0.1.0.1";
-       sha256 = "0h6dvc8lzlxkgkqkj3zwxjdmws29g4fsw7p6ysd7i54xqb8vy5ka";
+       sha256 = "6a16bfd1c29d94789af6e61eae1d7949685e9becfc0f39f17cb3d34f11dbcd40";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -31216,7 +31313,7 @@ self: {
      mkDerivation {
        pname = "casui";
        version = "0.3";
-       sha256 = "1vjhg9dxg23q0dqr07gbrg92h3m9r38d7jb3c4sxnw6gaj76f5gw";
+       sha256 = "fc15678e54cf70db356163c9d3d0c8a90e28d2cbeb1d9071037888d75b7a50ee";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gtk haskell98 mtl parsec ];
@@ -31231,7 +31328,7 @@ self: {
      mkDerivation {
        pname = "catamorphism";
        version = "0.5.1.0";
-       sha256 = "1lhqdr0l3wc59ms1i1xmwp6iy4n4xrd8pi0an0n0jgxw5j2sfbkq";
+       sha256 = "782ea7852cbc3f092cb00ac48b5aeec4121fcde5b58718744d85f141416e18d2";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/frerich/catamorphism";
        description = "A package exposing a helper function for generating catamorphisms";
@@ -31243,7 +31340,7 @@ self: {
      mkDerivation {
        pname = "catch-fd";
        version = "0.2.0.2";
-       sha256 = "05fvrkvqyj7xdn6vvdwhfbym7rg9fl7r7lzzcsr2cx59iqi23frx";
+       sha256 = "3dbb21228ea97426b266ffd3930f75e9e553fd7290b7bd8d6dfd488ff7ccdb15";
        libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "http://github.com/sonyandy/catch-fd";
@@ -31257,7 +31354,7 @@ self: {
      mkDerivation {
        pname = "categorical-algebra";
        version = "0.0.0.1";
-       sha256 = "1kx6195mfnw4aqmcd1m4s8z5l1s8zh69in00p9a0mxm3xj3pfvpl";
+       sha256 = "f46e7787eca3f60a54ba00d8980cfc48075a3ed2a486c62a56845b574b0aa6cf";
        libraryHaskellDepends = [ base newtype pointless-haskell void ];
        description = "Categorical Monoids and Semirings";
        license = stdenv.lib.licenses.bsd3;
@@ -31269,7 +31366,7 @@ self: {
      mkDerivation {
        pname = "categories";
        version = "1.0.7";
-       sha256 = "18ihv16g4w0s6n89c64j4998hbsgzhp5w9ph2gdkygq7f30cx7f2";
+       sha256 = "c29dcec070073f3fdb13f0265e2efc4f2f88522292189690351a70f24cd830a2";
        libraryHaskellDepends = [ base void ];
        homepage = "http://github.com/ekmett/categories";
        description = "Categories";
@@ -31288,7 +31385,7 @@ self: {
      mkDerivation {
        pname = "category-extras";
        version = "1.0.2";
-       sha256 = "168psp1qd80838b9945499qh99jidbl2gngcrjqk6hb0qsyhckcq";
+       sha256 = "984d06bdc6604133b1ccecd927e86a51a604714aa49094161a08a086c3d51799";
        libraryHaskellDepends = [
          adjunctions bifunctors categories comonad comonad-extras
          comonad-transformers comonads-fd contravariant distributive either
@@ -31309,7 +31406,7 @@ self: {
      mkDerivation {
        pname = "cautious-file";
        version = "1.0.2";
-       sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq";
+       sha256 = "38fa615f6b2154c65016662d7fa7c173c2f56ae3621b469aa6016795f9b385eb";
        revision = "1";
        editedCabalFile = "c6183204fc6d4767c8b8c4b954f6908fd376054c28904866a90a66497970d893";
        libraryHaskellDepends = [
@@ -31327,7 +31424,7 @@ self: {
      mkDerivation {
        pname = "cayley-client";
        version = "0.1.3.0";
-       sha256 = "0wzpnylzlyx0lanjqg44b134s2irb55072dz5s8ljq76acg1jmfl";
+       sha256 = "d455191e53e66049912ebf89034a59390a4d4658843c2cada2a07bfaa9b7f773";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring exceptions http-client
          http-conduit lens lens-aeson mtl text transformers
@@ -31347,7 +31444,7 @@ self: {
      mkDerivation {
        pname = "cblrepo";
        version = "0.17.1";
-       sha256 = "0yp2z0dpw19r6av71ghlp1pzal7276wlywsmjz5xmkggy04v1xnj";
+       sha256 = "d2f6b009f0efcddacb9755734fb939e250f56fb814be70b63239057e1bf8e27a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -31367,7 +31464,7 @@ self: {
      mkDerivation {
        pname = "cci";
        version = "0.3.1";
-       sha256 = "0pvap67fn9kmjvn2qqq3x99k3mzrrsnb6q6fhawvyxv8drihsfc7";
+       sha256 = "87390d636e6877bfb982ce60b3accef9d73153ea03632cec967526eb8eb96a5f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -31386,7 +31483,7 @@ self: {
      mkDerivation {
        pname = "ccnx";
        version = "0.0.0";
-       sha256 = "18gnm6skzdnh6cis7l7v3d5813zn6irw6nywg6shffrn8v2y6xh7";
+       sha256 = "0776e3c546363b07b579dc5bc37334f68f804a1bfbd0a32333d0b63fb5a9f6a1";
        libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "http://tomahawkins.org";
@@ -31401,7 +31498,7 @@ self: {
      mkDerivation {
        pname = "cctools-workqueue";
        version = "3.6.1.0.1.0.0.1";
-       sha256 = "1nqczr2f4bv107sdhqnllqcaz413r4f69f9ypshig8jyxzpcdwn3";
+       sha256 = "c3f2c6eeef5ea217a1be3eb9641cc92390af18a6d462d8f401612fe244fe0cdb";
        libraryHaskellDepends = [
          bindings-cctools bytestring lens monad-loops unix
        ];
@@ -31419,7 +31516,7 @@ self: {
      mkDerivation {
        pname = "cedict";
        version = "0.2.5";
-       sha256 = "13nhwd07ly2ppgbakffr2cc2idacz0q5bahz0819jjascspm32vy";
+       sha256 = "7e8b51af665a499902021faa5530f84cb5281813d9b9a9d6bb57787a40e3d08e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -31438,7 +31535,7 @@ self: {
      mkDerivation {
        pname = "cef";
        version = "0.1.2";
-       sha256 = "0f5qj5xhmlys09i4vis3ricz0ym2hmdn53kgcb1qk23y0m4s94ci";
+       sha256 = "9191a449057e8889c3626f8e625b85a27af059cc43c74d6202dad30a7b91b838";
        libraryHaskellDepends = [ base bytestring text time ];
        testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/picussecurity/haskell-cef.git";
@@ -31455,7 +31552,7 @@ self: {
      mkDerivation {
        pname = "ceilometer-common";
        version = "0.2.3";
-       sha256 = "1zqqh7k627yw6vfcdihl2gw8hh3l9gxj283azmmcc9pm15grblps";
+       sha256 = "fad2955f09f526c66afd6a2021fb4b744088f81314c6c6dc36dc1f61e68118ff";
        libraryHaskellDepends = [
          base bimap binary bytestring containers foldl lens pipes siphash
          template-haskell text vaultaire-common
@@ -31476,7 +31573,7 @@ self: {
      mkDerivation {
        pname = "cellrenderer-cairo";
        version = "1.0.0.0";
-       sha256 = "05cdrq1mrrhfbsk1w1dg5qayan0h9m92r4gqgcpzfa9a073w78zw";
+       sha256 = "fca3c3c7012a29f72f7bf8912c524d1058e5152eaf051ea65e0ee65c03ce8d15";
        libraryHaskellDepends = [ base cairo glib gtk mtl ];
        libraryToolDepends = [ c2hs ];
        jailbreak = true;
@@ -31489,7 +31586,7 @@ self: {
      mkDerivation {
        pname = "cereal";
        version = "0.4.1.1";
-       sha256 = "15rhfn9hrjm01ksh9xpz9syxsp9vkvpp6b736iqq38wv2wb7416z";
+       sha256 = "df047216179ba3817134e32c73ef9e3b5dddbd4efff604f50ca0ca0c93753097";
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim
        ];
@@ -31504,7 +31601,7 @@ self: {
      mkDerivation {
        pname = "cereal-conduit";
        version = "0.7.2.3";
-       sha256 = "0s1s8jm25wxj44x44vjz4kz5qblkyjaz7f8rw5i81bzam32afj9s";
+       sha256 = "3a49a7c4a8eaaf8062e119b9f395f4932e5cfe245f6e423a21b2f322aa443a68";
        libraryHaskellDepends = [
          base bytestring cereal conduit resourcet transformers
        ];
@@ -31521,7 +31618,7 @@ self: {
      mkDerivation {
        pname = "cereal-derive";
        version = "0.1.1";
-       sha256 = "04mlg1r2qvrwdzcfbf1aqs4bf9n2gc7cwv73fbhld2ji5naa6fwb";
+       sha256 = "8b3ba3942d518a46e172e36cce0e7bc226b788c62ab8e5d86f3c6f2c7278b412";
        libraryHaskellDepends = [ base cereal ghc-prim ];
        jailbreak = true;
        description = "Automatic deriving of Serialize using GHC.Generics";
@@ -31533,7 +31630,7 @@ self: {
      mkDerivation {
        pname = "cereal-enumerator";
        version = "0.3.1";
-       sha256 = "0lpsj4f7v4sgrr6lf8jl07xwj8j3i3wj23as0imswk71f7xwfnnk";
+       sha256 = "d35ac7fb71e14cae6b045a0d21f9884322c9fb015422474dce4f937d1c91fa52";
        libraryHaskellDepends = [ base bytestring cereal enumerator ];
        description = "Deserialize things with cereal and enumerator";
        license = stdenv.lib.licenses.publicDomain;
@@ -31545,7 +31642,7 @@ self: {
      mkDerivation {
        pname = "cereal-ieee754";
        version = "0.1";
-       sha256 = "1gr22ziz9bj4q3y8j1vg46m648zqvbajfdks8p64xc28ci25pw2s";
+       sha256 = "5af05b446448b04ecc457a3627d5daf82362aa216f0789fcc044aef4e31722bf";
        libraryHaskellDepends = [ array base cereal ];
        jailbreak = true;
        homepage = "http://github.com/jystic/cereal-ieee754";
@@ -31563,7 +31660,7 @@ self: {
      mkDerivation {
        pname = "cereal-plus";
        version = "0.4.0";
-       sha256 = "109y4ydhbl68rsi95fwck3gq1wvn9bpv0r9g9b7fm8wsgd06gipc";
+       sha256 = "ecc667407b9aa3eace4a2f65b0ef4a76f380df988cbb92a2cec8d0059b273e81";
        libraryHaskellDepends = [
          array base bytestring cereal containers errors hashable hashtables
          mmorph mtl stm text time unordered-containers vector
@@ -31585,7 +31682,7 @@ self: {
      mkDerivation {
        pname = "cereal-text";
        version = "0.1.0.1";
-       sha256 = "1wsp4zb6ib8fym4kaq6ixm7l2slljmz6waliab3dyb2zdl400spq";
+       sha256 = "f86a00086d5f2cdfc652912a6e7e95946a414fedd1603549f50ead68d62757f3";
        libraryHaskellDepends = [ base cereal text ];
        homepage = "https://github.com/ulikoehler/cereal-text";
        description = "Data.Text instances for the cereal serialization library";
@@ -31597,7 +31694,7 @@ self: {
      mkDerivation {
        pname = "cereal-vector";
        version = "0.2.0.1";
-       sha256 = "0czrb4l1n73cfxxlzbcqfa34qa3gw0m5w5mlz0rawylyqfk8a1pz";
+       sha256 = "ff0685a6c39e7aae32f8b4165e2ae06f284c867298ad4f7b776c1c1b2859f933";
        libraryHaskellDepends = [ base bytestring cereal vector ];
        testHaskellDepends = [ base cereal QuickCheck vector ];
        homepage = "https://github.com/acfoltzer/cereal-vector";
@@ -31613,7 +31710,7 @@ self: {
      mkDerivation {
        pname = "certificate";
        version = "1.3.9";
-       sha256 = "18g5rq7lpxmvmlnz610537w6mix6z6kxjrfj2ylbhkc81r5pn9g6";
+       sha256 = "e6257b4b0e884db8a817d265d9a7f9a6c76af8190504f32dadbbf64b0fcee5a1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -31633,7 +31730,7 @@ self: {
      mkDerivation {
        pname = "cf";
        version = "0.4.1";
-       sha256 = "1z8hqd06nrrbgmg2gpryalhnk4z0sxm7is46sgpy09x9p6xd0fqx";
+       sha256 = "1d3bd0bab9a927e0efd386e8786ad7e0936921553edf275e7d2b676b40c310fd";
        revision = "1";
        editedCabalFile = "9fd574edfce6ea014201ccc3591638de0574f251290bcf0f44a8a00338131692";
        libraryHaskellDepends = [ base ];
@@ -31654,7 +31751,7 @@ self: {
      mkDerivation {
        pname = "cfipu";
        version = "1.1.0.4";
-       sha256 = "1lwgqibxrs8n3czhpyg1halizsmz5jd8r2z8ham4pwi58815fzij";
+       sha256 = "327e57024225f24baa82e88b8c9a2cbfea1fa982e1f90b3f1b16e9dc57c48fd3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -31674,7 +31771,7 @@ self: {
      mkDerivation {
        pname = "cflp";
        version = "2009.2.1";
-       sha256 = "01j4904fa8z2wmflqs3q1g3dg966dllbp2sbxxbghh0hhzwyg0vy";
+       sha256 = "7e83e7f9871040f856ef4b8bbb286dc6a4d7c60b78684c5de5e223e508484406";
        libraryHaskellDepends = [
          base containers control-monad-omega HUnit incremental-sat-solver
          level-monad logict MonadRandom mtl random stream-monad syb
@@ -31693,7 +31790,7 @@ self: {
      mkDerivation {
        pname = "cfopu";
        version = "1.0.0";
-       sha256 = "1vd1ilcdd1k081bg4nk1zazdsd9fbz7zzcz453ff0xxjp9xl1b3z";
+       sha256 = "7fac407bbab277e0dc28e4b3ffcf5f2e35ddbefa615af256406086d6188da1ed";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -31712,7 +31809,7 @@ self: {
      mkDerivation {
        pname = "cg";
        version = "0.0.9.0";
-       sha256 = "0slsckr1xyn1b3vb2xhd2diqhr9cdbkn9g5hfsy0q6sjiy979vpl";
+       sha256 = "f4ee74928f521b0cbc76b0bc64e76a2c658863130d76b1f658c1fa1ef2649a6a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -31731,7 +31828,7 @@ self: {
      mkDerivation {
        pname = "cgen";
        version = "0.0.5";
-       sha256 = "18k9na7gwmnmn5gdin1qi041cb7w49xcgdnjjpc3dhmfiqnq41q8";
+       sha256 = "0807822d8eaec236d895d2b6c77a22fc2c16088838d8d85eb1d556fe8eb269a2";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -31752,7 +31849,7 @@ self: {
      mkDerivation {
        pname = "cgi";
        version = "3001.2.2.2";
-       sha256 = "0q1pxpa8gi42c0hsidcdkhk5xr5anfrvhqsn3iksr9c0rllhz193";
+       sha256 = "23850f29cd80a5ac671c5663b8b3b3aae45e269c8db5a8216082c487d4ed3760";
        libraryHaskellDepends = [
          base bytestring containers exceptions mtl multipart network
          network-uri old-locale old-time parsec xhtml
@@ -31767,7 +31864,7 @@ self: {
      mkDerivation {
        pname = "cgi-undecidable";
        version = "3000.0.0";
-       sha256 = "1xh3q0s7398gd3513ycxypnj0m9jn0kdbb7459dsb459kbvzdpab";
+       sha256 = "4bddf6f79aa990a55b2ae4acd526b0325520edf59df911ca680fa57134c003f6";
        libraryHaskellDepends = [ base cgi mtl ];
        description = "Undecidable instances for the cgi package";
        license = stdenv.lib.licenses.bsd3;
@@ -31778,7 +31875,7 @@ self: {
      mkDerivation {
        pname = "cgi-utils";
        version = "0.2.1";
-       sha256 = "0msljq31bz40hsrhhq9qhxrgmdlqq32l3ykcy4wviv8kmc3dic7p";
+       sha256 = "f7b0d806ab13edb839f16cfa41c5c098b6fa7287386108b38680fc1506965457";
        revision = "1";
        editedCabalFile = "df1cb1e658d9b79adde373fc31a1d7553a4803f8967c760abf233e75913ddd52";
        libraryHaskellDepends = [ base cgi containers mtl random ];
@@ -31797,7 +31894,7 @@ self: {
      mkDerivation {
        pname = "cgrep";
        version = "6.5.2";
-       sha256 = "021cwllz5cljb9j0klh3xn4jpg2vxfqwqyjm631gkpzndc9711wr";
+       sha256 = "998770126bf6dff9c230557accb1eb5bbc2b89ed03d209645a92b2f229e52c08";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -31815,7 +31912,7 @@ self: {
      mkDerivation {
        pname = "chain-codes";
        version = "0.3.0.0";
-       sha256 = "0vw6qwgcljxgrjrsgkpkdqqnpxvibnsc0c4h5kyg5p8h4avsk8k6";
+       sha256 = "66a2a9b72210ddf2fc2c9030c0b45d71f76b316ef3cea7b3ccaf4bca1ec7866f";
        libraryHaskellDepends = [ base containers JuicyPixels ];
        testHaskellDepends = [ base containers hspec JuicyPixels ];
        homepage = "http://github.com/Fuuzetsu/chain-codes";
@@ -31828,7 +31925,7 @@ self: {
      mkDerivation {
        pname = "chalk";
        version = "0.1.0.1";
-       sha256 = "0d9qp512ww5cpvv7pby4saqjxy9qyid3gf0gndqhglikcc0wayxy";
+       sha256 = "be7bc5016333d20771b30fb8375af438f92eb1d2c4af7bf6beac702e42b93835";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/joom/chalk";
@@ -31843,7 +31940,7 @@ self: {
      mkDerivation {
        pname = "chalkboard";
        version = "1.9.0.16";
-       sha256 = "0786fxylzz73kgbyyy6pz5fhk7rfh4fnrbq0br7ghg74qka66sb9";
+       sha256 = "696963d4c4e43cf84e5e00af6c1d812e9f095df9d778efd79be3fc4f7d77061d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -31862,7 +31959,7 @@ self: {
      mkDerivation {
        pname = "chalkboard-viewer";
        version = "0.1";
-       sha256 = "1gvnp176j8gd0s6wzq10zpiqkn3wma99pwn3f78wgxm9rh588gh2";
+       sha256 = "023e840acca9f6c7d171c3f29b92aa7cd889e3fd20e0cf8d06ed21694eb876bf";
        libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ];
        jailbreak = true;
        homepage = "http://ittc.ku.edu/~andygill/chalkboard.php";
@@ -31876,7 +31973,7 @@ self: {
      mkDerivation {
        pname = "chalmers-lava2000";
        version = "1.5";
-       sha256 = "1xrzh1mqa6d3hwr7lfazfskh6bklbj3kv9vlm40n650l2l42arga";
+       sha256 = "ea6525081514146301a974a73d875c742e03a7765f397a3287a319856b803ff7";
        libraryHaskellDepends = [ array base process random ];
        homepage = "http://projects.haskell.org/chalmers-lava2000/Doc/tutorial.pdf";
        description = "Hardware description EDSL";
@@ -31888,7 +31985,7 @@ self: {
      mkDerivation {
        pname = "chan-split";
        version = "0.5.0";
-       sha256 = "1mzvrxcf263gs61hj7gafra1cqvpfbzy7rza7ql0xvnmj2g2ybrc";
+       sha256 = "2c2f2f9e90d5ee0e283eeae7e3ff727763165476ea1d0983d16f18e158cffbd7";
        libraryHaskellDepends = [ base stm ];
        homepage = "http://brandon.si/code/module-chan-split-released/";
        description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class.";
@@ -31900,7 +31997,7 @@ self: {
      mkDerivation {
        pname = "change-monger";
        version = "0.0";
-       sha256 = "071qc0nhg4431c32z4qh23fiw1bjd1jc4s0sgq5v8ymwz4rfy9a2";
+       sha256 = "4225ef32f9bc7ab40b7e1a68c2646872051edd1010932f060b8390072d60381c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base process ];
@@ -31917,7 +32014,7 @@ self: {
      mkDerivation {
        pname = "charade";
        version = "0.1.1.2";
-       sha256 = "0vi82z2c3km5shyk3wwb07y3cqcnkvkgvbl1s36a50kbz65jrl64";
+       sha256 = "c4d02c8bf96b82a2ccd081aefde69e966136fc018bf3313dd4a5cec1c417286e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -31942,7 +32039,7 @@ self: {
      mkDerivation {
        pname = "charset";
        version = "0.3.7.1";
-       sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x";
+       sha256 = "3d415d2883bd7bf0cc9f038e8323f19c71e07dd12a3c712f449ccb8b4daac0be";
        libraryHaskellDepends = [
          array base bytestring containers semigroups unordered-containers
        ];
@@ -31956,7 +32053,7 @@ self: {
      mkDerivation {
        pname = "charsetdetect";
        version = "1.0";
-       sha256 = "1w302v6pmi448k2rq2cc7wp1javsd9rgk7r7i43lxvbjhniydn7p";
+       sha256 = "f7d8e6a38572ed4e0789279ff9726a7a2b192e3f8c099cc54484c47acd1660f0";
        libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "http://www.github.com/batterseapower/charsetdetect";
@@ -31969,7 +32066,7 @@ self: {
      mkDerivation {
        pname = "charsetdetect-ae";
        version = "1.0.1";
-       sha256 = "0bvdnv608glim8yn4dvh3av7x0fxxp3z6719j0n005bygdfgjxna";
+       sha256 = "ca76f95c7b7e15002c90291cf3c7eddd817eb61a7037623daa913e04ccb66d2f";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/Aelve/charsetdetect-ae";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
@@ -31981,7 +32078,7 @@ self: {
      mkDerivation {
        pname = "chart-histogram";
        version = "1.0.0";
-       sha256 = "130jbbbb1spkbqapxys0bqr0spq6c03x1m259alg5wxnl8xnn4w5";
+       sha256 = "85136b3ba2b6f3f2a84a45d4d00760065f0d325e40fb7e155ef3eab0d65a128c";
        libraryHaskellDepends = [ base Chart ];
        jailbreak = true;
        description = "Easily render histograms with Chart";
@@ -31996,7 +32093,7 @@ self: {
      mkDerivation {
        pname = "chaselev-deque";
        version = "0.5.0.5";
-       sha256 = "1x2301faqkchkzrvbnganly341jilvg1fmx6lazgbs98cbazhn2d";
+       sha256 = "4d58f8d56228e9f5bea2a65717dea65106323cb5ead9b5f39f904dac5c0043f4";
        libraryHaskellDepends = [
          abstract-deque array atomic-primops base ghc-prim transformers
          vector
@@ -32021,7 +32118,7 @@ self: {
      mkDerivation {
        pname = "chatter";
        version = "0.5.2.0";
-       sha256 = "01594wp13kigqvr27112fmsrgz4cny4vlprqvyygp90k8mavxw8s";
+       sha256 = "1af1be554513a4fbbcdf385fba89b78cfc977575228423f2c62fce112e27a904";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32052,7 +32149,7 @@ self: {
      mkDerivation {
        pname = "chatty";
        version = "0.6.4.1";
-       sha256 = "02garbdwhg32f089xd18w1i5hr9cbmvzk6cjdsl48w976liwqglz";
+       sha256 = "9f3ecc2335277144a86e9299f9775d2c655862e028b49e1070623cc8dbcaea09";
        libraryHaskellDepends = [
          ansi-terminal base chatty-utils directory mtl process random setenv
          template-haskell text time transformers unix
@@ -32068,7 +32165,7 @@ self: {
      mkDerivation {
        pname = "chatty-text";
        version = "0.6.2.0";
-       sha256 = "0gfgzqpdjja3ddz3hkynm31p9ma3g16qxavqcwybmp3v6h1pa2l3";
+       sha256 = "830a7503347bdcba3c6778ab8e4d7843d574c3a8d64f387e6b4349d92efecf3d";
        libraryHaskellDepends = [ base chatty transformers ];
        homepage = "http://doomanddarkness.eu/pub/chatty";
        description = "Provides some classes and types for dealing with text, using the fundaments of Chatty";
@@ -32080,7 +32177,7 @@ self: {
      mkDerivation {
        pname = "chatty-utils";
        version = "0.7.3.2";
-       sha256 = "1d929y9zqj9mr99v691ymp0amy1x6nzkxjdaj3ylbgydjw1m3j8j";
+       sha256 = "12c9510397cdbf45fd90aac93ebf353df8aac0ad3e24b353ca3549fc934f22b5";
        libraryHaskellDepends = [ base mtl text transformers ];
        homepage = "http://doomanddarkness.eu/pub/chatty";
        description = "Some utilities every serious chatty-based application may need";
@@ -32095,7 +32192,7 @@ self: {
      mkDerivation {
        pname = "cheapskate";
        version = "0.1.0.4";
-       sha256 = "0drx1hlqvdcrij4097q6bxhbfcqm73jsqv1wwhd3hsnjdmr46ch2";
+       sha256 = "023243726dd26a381ae43c6cace5381533b7605f069f04888c99b58d290c3d37";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32115,7 +32212,7 @@ self: {
      mkDerivation {
        pname = "check-email";
        version = "1.0";
-       sha256 = "1drw8rspdc4a7jw2ql3fi1dcmw56ah5csf2bil6ii8ccq5vsbfyz";
+       sha256 = "dfbba577c18ca1180d8d4b38cd0a54a6f0ca5a886e502cb83c8ab07675463cb7";
        libraryHaskellDepends = [ base bytestring email-validate ];
        librarySystemDepends = [ resolv ];
        description = "Confirm whether an email is valid and probably existant";
@@ -32129,7 +32226,7 @@ self: {
      mkDerivation {
        pname = "check-pvp";
        version = "0.0.1";
-       sha256 = "18xhm11xwvy9cz149ddm3lj4gxb514jglwhdr50mkrdd4rw8w59f";
+       sha256 = "2e158e7826ade55941c90d72fa240965f547241db5b544c267c96fde43a8b0a3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -32148,7 +32245,7 @@ self: {
      mkDerivation {
        pname = "checked";
        version = "0.1.0.1";
-       sha256 = "00l04qxdid2pi885ixnyh91bsigsmk5rxb0jw6dl6j1mlcq27smd";
+       sha256 = "adea2330a33548439be112ac9ecbacfa45bd4282def658108a57b4d83a268002";
        libraryHaskellDepends = [ base ];
        description = "Bounds-checking integer types";
        license = stdenv.lib.licenses.bsd3;
@@ -32160,7 +32257,7 @@ self: {
      mkDerivation {
        pname = "checkers";
        version = "0.4.3";
-       sha256 = "0ry5c9c1hcp9rgf2h3gy5ajjp96anhp2738hgzrvf9aj90hr6n60";
+       sha256 = "c0589321485225b7f37f108d232eb4caa42ba52afe0d28dccbe932185862c567";
        libraryHaskellDepends = [ array base QuickCheck random ];
        description = "Check properties on standard classes and data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -32173,7 +32270,7 @@ self: {
      mkDerivation {
        pname = "chell";
        version = "0.4.0.1";
-       sha256 = "0lb95abzxl4a87nfqxsxpb3a39pd52cci43hcvj8615hyhqvs2jz";
+       sha256 = "5f0abd31f4b00483e4667090c89828eda6a1c6ba5d77ecec418ad0fe972a6951";
        libraryHaskellDepends = [
          ansi-terminal base bytestring options patience random
          template-haskell text transformers
@@ -32188,7 +32285,7 @@ self: {
      mkDerivation {
        pname = "chell-hunit";
        version = "0.2.1";
-       sha256 = "006l2j98gmgjrapyp00vz93hxlx9gwkdnxwh5nx293zp7vm27x00";
+       sha256 = "00f423ea3ef78f24ba2d9077db267fa9d30e47fa1b80ebafcaf2d5879214d400";
        libraryHaskellDepends = [ base chell HUnit ];
        homepage = "https://john-millikin.com/software/chell/";
        description = "HUnit support for the Chell testing library";
@@ -32200,7 +32297,7 @@ self: {
      mkDerivation {
        pname = "chell-quickcheck";
        version = "0.2.5";
-       sha256 = "02bkcnx5k6r5csdnnkvk4wfd0l36nxb87i1463ynw17n7ym9s4cs";
+       sha256 = "9a119daa3ff6046efd3024c48356b76650d01c27734f6b9b66259b59ba657309";
        libraryHaskellDepends = [ base chell QuickCheck random ];
        homepage = "https://john-millikin.com/software/chell/";
        description = "QuickCheck support for the Chell testing library";
@@ -32212,7 +32309,7 @@ self: {
      mkDerivation {
        pname = "chesshs";
        version = "0.2.1";
-       sha256 = "0dydib3rf735wljyqij2g03xi0yxfviga5ws708nhg64f4kv8cfv";
+       sha256 = "db31b42771c43c6811389a17f5e276dd83d807784246ec25e5651c97c78acd37";
        libraryHaskellDepends = [
          array attoparsec base bytestring containers
        ];
@@ -32229,7 +32326,7 @@ self: {
      mkDerivation {
        pname = "chevalier-common";
        version = "0.6.0";
-       sha256 = "0fg7cb5ds2ixk046isz6wala7azaxqlfsacb1p7l9j6din9mgzrs";
+       sha256 = "3aff57938dcdc844cf0d8b29ed28eeeaaba3a8e2e6eb6808983d0addca62e739";
        libraryHaskellDepends = [
          base bifunctors bytestring cereal locators mtl network network-uri
          protobuf text unordered-containers vaultaire-common zeromq4-haskell
@@ -32247,7 +32344,7 @@ self: {
      mkDerivation {
        pname = "chp";
        version = "2.2.0.1";
-       sha256 = "18z0836hxs4ix7mdjxvpb40i4s71dc1j3vpxfh0vj8mf5drpc942";
+       sha256 = "822476732bae22b90174fdee21036be1681201597777d9eae991e80ecd40e0a3";
        libraryHaskellDepends = [
          base containers deepseq extensible-exceptions pretty stm
        ];
@@ -32262,7 +32359,7 @@ self: {
      mkDerivation {
        pname = "chp-mtl";
        version = "1.0.0";
-       sha256 = "1x14xl9hm9n3zczj6xhffvpac09q5a13i94fhkq2kzj2s3rk1b4z";
+       sha256 = "9fac30f3d042fe29f0848ea438822a3801a6ee760e76233ffbc3a60a13ed24f4";
        libraryHaskellDepends = [ base chp chp-plus mtl ];
        jailbreak = true;
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
@@ -32278,7 +32375,7 @@ self: {
      mkDerivation {
        pname = "chp-plus";
        version = "1.3.1.2";
-       sha256 = "1875fqf24jwl5vf2cys7yc70k0c53pg74i041y1xbrczincaww0z";
+       sha256 = "1f70ae988d9fe5d5830f044472de1d8581090ef3477b26dc2e944b221c76e5a0";
        libraryHaskellDepends = [
          base chp containers deepseq extensible-exceptions HUnit pretty
          QuickCheck stm
@@ -32296,7 +32393,7 @@ self: {
      mkDerivation {
        pname = "chp-spec";
        version = "1.0.0";
-       sha256 = "0jil6p0cw8bbpzb0kf9lxljdnbbp0xyq7c6x7bfc7291kqkafgdi";
+       sha256 = "b13da7269e2189c3dc3addb0837d07772ddb24ed34b909d6bf6b21cec035344a";
        libraryHaskellDepends = [
          base containers deepseq mtl pretty TypeCompose
        ];
@@ -32312,7 +32409,7 @@ self: {
      mkDerivation {
        pname = "chp-transformers";
        version = "1.0.0";
-       sha256 = "0d4hcqpjxmns1fhq918s6z9f4bxlbjlkxzq5xkpqwjxpzy83wq23";
+       sha256 = "43603e90ffb74b8eefec05ff3ea95cb42fe2d2371a8584a10bdad62e2f669034";
        libraryHaskellDepends = [ base chp chp-plus transformers ];
        jailbreak = true;
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
@@ -32326,7 +32423,7 @@ self: {
      mkDerivation {
        pname = "chronograph";
        version = "0.2.0.1";
-       sha256 = "0qy2ahnp324jh0ybqwsa4nc3r2x1hkbrg6sl6f8dg1xnr0gpaag2";
+       sha256 = "e229751fc8b687d79033549b97d784a18b3c98254a73bc3c809288712d54c263";
        libraryHaskellDepends = [
          base deepseq ghc-prim thyme vector-space
        ];
@@ -32343,7 +32440,7 @@ self: {
      mkDerivation {
        pname = "chu2";
        version = "2012.11.20";
-       sha256 = "01q34kzhisb8ani3k5dfjaixa7j1vqg0nh8mbmnya52hr7p4sdiz";
+       sha256 = "3f364deec95014e56d5d15410b1ede411ed5a392ae9539a25568e908ff240307";
        libraryHaskellDepends = [
          base bytestring data-default hack2 hack2-handler-snap-server
          utf8-string
@@ -32360,7 +32457,7 @@ self: {
      mkDerivation {
        pname = "chuchu";
        version = "0.4.5";
-       sha256 = "04xyylp5gliwpps753xqn8r72708ygxcp08j0fypc64ykhv5pnqc";
+       sha256 = "0cdb5b369c9e1876bd031281cbfaf3081c7132b2b88f72f4bd3cd2572ef5be13";
        libraryHaskellDepends = [
          abacate ansi-wl-pprint base cmdargs lifted-base monad-control
          parsec text transformers
@@ -32380,7 +32477,7 @@ self: {
      mkDerivation {
        pname = "chunked-data";
        version = "0.2.0";
-       sha256 = "0wmjpb0vq0nqvy317gmzxqh8yqq1bx0h2r90vqfpq3cv3z4g784s";
+       sha256 = "9aa0f3c81f9b0d7c1dde206501415f01638f20eebfbe1386dfd802bcc1bab272";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers mono-traversable
          semigroups text transformers vector
@@ -32395,7 +32492,7 @@ self: {
      mkDerivation {
        pname = "chunks";
        version = "2007.4.18";
-       sha256 = "0qdwilzhbnx5zgga65lcwd6kzwvsbvi8ybfw9i4d8ziz89190fkz";
+       sha256 = "7f3a9042423f7ed4484cdc2d8fe25e7af33f4de38c16a3defba5db053f8dbc61";
        libraryHaskellDepends = [ base haskell98 parsec template-haskell ];
        homepage = "http://www.wellquite.org/chunks/";
        description = "Simple template library with static safety";
@@ -32408,7 +32505,7 @@ self: {
      mkDerivation {
        pname = "chunky";
        version = "0.1.0.0";
-       sha256 = "12g5hvb5qpbmfn1389wj7sfkc4qp19vg24gpn6j225yfyk8ccik7";
+       sha256 = "6746c6d0f4ce1721a4b1f711f1760a1713369d3e9227348275755d5cd686e589";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base binary bytestring text ];
@@ -32424,7 +32521,7 @@ self: {
      mkDerivation {
        pname = "church-list";
        version = "0.0.2";
-       sha256 = "0xidwcn79acpg691n0xqk3q7xlprp9gibqkafn262zq24sks31xw";
+       sha256 = "bc87a1a726027f6184756ae2155fbaf9d27ef098b8031b927997a9742ce32d76";
        libraryHaskellDepends = [ base ];
        description = "Removed; please see fmlist";
        license = stdenv.lib.licenses.mit;
@@ -32436,7 +32533,7 @@ self: {
      mkDerivation {
        pname = "cil";
        version = "0.1.1";
-       sha256 = "0farjdyq6w33jm0qqdkfd6l7b8rr6k55dqfha643mj6nh1y904az";
+       sha256 = "5f11907c80d6c83a8851d0e156ca3439a375a8696e368c41956370837d935939";
        libraryHaskellDepends = [ base bytestring language-c ];
        jailbreak = true;
        homepage = "http://tomahawkins.org";
@@ -32450,7 +32547,7 @@ self: {
      mkDerivation {
        pname = "cinvoke";
        version = "0.1";
-       sha256 = "0niz7banhrkcwdfp6w5gwy1brz1c26mylnlavi5zxgawfq4d3sl2";
+       sha256 = "82ead108765cbdfe4bdc8a5aeaab112cfcbc82e7af70735de36c6668d53a3f5a";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ cinvoke ];
        homepage = "http://haskell.org/haskellwiki/Library/cinvoke";
@@ -32464,7 +32561,7 @@ self: {
      mkDerivation {
        pname = "cio";
        version = "0.1.0";
-       sha256 = "0518cbfyjh13ghihvnxvbhlw4060cqw5047bdrflphmigwbvpplb";
+       sha256 = "8bdebb177fb1c24b5d6eeb10503866c000c2295cbbdb0d237c2340e9dd622814";
        libraryHaskellDepends = [ base monad-stm mtl parallel-io stm ];
        homepage = "https://github.com/nikita-volkov/cio";
        description = "A monad for concurrent IO on a thread pool";
@@ -32480,7 +32577,7 @@ self: {
      mkDerivation {
        pname = "cipher-aes";
        version = "0.2.11";
-       sha256 = "05ahz6kjq0fl1w66gpiqy0vndli5yx1pbsbw9ni3viwqas4p3cfk";
+       sha256 = "d3b171895698c73da24d7ce97543f725d26637f038de670c0fd4012ca7f95015";
        libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem
        ];
@@ -32498,7 +32595,7 @@ self: {
      mkDerivation {
        pname = "cipher-aes128";
        version = "0.7.0.1";
-       sha256 = "0qknpgg7dimx2nm4bzig7vvzcq3kvbxjv5rb0s4f2ina4vwczbhq";
+       sha256 = "18aecff826ca46e188062b972dfbda7360f6f73e2ffe45aa15bdc676debb7662";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32517,7 +32614,7 @@ self: {
      mkDerivation {
        pname = "cipher-blowfish";
        version = "0.0.3";
-       sha256 = "0hb67gmiyqrknynz5am8nada1b1v47rqla87dw5nvfhxhl51fhcg";
+       sha256 = "8f41170a851dba6d0b6f07298af3213baca09ab2a8aaf2adb733631feb3b6641";
        libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem vector
        ];
@@ -32538,7 +32635,7 @@ self: {
      mkDerivation {
        pname = "cipher-camellia";
        version = "0.0.2";
-       sha256 = "19z2mi1rvp8fsqjdbmrm1hdlxmx61yr55fyknmmn945qrlvx234d";
+       sha256 = "8d0cd137cdb890646bb5d3bb52b20fa6d74e1b0c35d7d524d60edd9d43ace2a7";
        libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem vector
        ];
@@ -32559,7 +32656,7 @@ self: {
      mkDerivation {
        pname = "cipher-des";
        version = "0.0.6";
-       sha256 = "1isazxa2nr1y13y0danfk7wghy34rfpn3f43rw714nk2xk6vrwc5";
+       sha256 = "85f1bccdec625a120ecf83b861afcb6478f8f899ceaa06fc083e642b54ff4ac7";
        libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem
        ];
@@ -32580,7 +32677,7 @@ self: {
      mkDerivation {
        pname = "cipher-rc4";
        version = "0.1.4";
-       sha256 = "0k9qf0cn5yxc4qlqikcm5yyrnkkvr6g3v7306cp8iwz7r4dp6zn6";
+       sha256 = "c67e731bc9e7f3882e33609c3d9ec97b4e9bbd2f95cd882926acfb621970384d";
        libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types
        ];
@@ -32598,7 +32695,7 @@ self: {
      mkDerivation {
        pname = "cipher-rc5";
        version = "0.1.0.1";
-       sha256 = "1ld4kdn0bd7ka448bl6df30iw3kd3mw7117qlwxyfzwbisdcsrif";
+       sha256 = "2e66cd9a8e8b7fe73ba7f88470781d6d0e1ec170cdd0850851f3b4056c9ba4d1";
        libraryHaskellDepends = [ base split ];
        jailbreak = true;
        homepage = "http://github.com/fegu/cipher-rc5";
@@ -32611,7 +32708,7 @@ self: {
      mkDerivation {
        pname = "circ";
        version = "0.0.4";
-       sha256 = "0n3m7kjyqic10dl06zic5qjb1yb1ff8jn9d1wchrarkprcw25knc";
+       sha256 = "ccce2238cb77669521e3a1252b917361f9b0242e2c7e0368038145ece53c7558";
        libraryHaskellDepends = [ base directory mtl ];
        description = "A Compiler IR Compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -32622,7 +32719,7 @@ self: {
      mkDerivation {
        pname = "circle-packing";
        version = "0.1.0.4";
-       sha256 = "1sysyzhkjb7z4mn9hgxqiq0nd7ap3rs7w22swjrpnf8l1sv09xgv";
+       sha256 = "fbf504b60e14397bb3e45a087e741e579d66018eb83f986c25ff2c39e1f7daeb";
        libraryHaskellDepends = [ base ];
        description = "Simple heuristic for packing discs of varying radii in a circle";
        license = stdenv.lib.licenses.bsd3;
@@ -32633,7 +32730,7 @@ self: {
      mkDerivation {
        pname = "cirru-parser";
        version = "0.0.2";
-       sha256 = "11qnc8rbw9zxrsaa49x5wmkrnr0vi6pgb1j18nrn40sbbww95xrz";
+       sha256 = "3ff792385f4b0362b3454186f5ae891b649b67e5a527a294cefd27be32621687";
        libraryHaskellDepends = [ aeson base text vector ];
        homepage = "https://github.com/Cirru/parser.hs";
        description = "Cirru Parser in Haskell";
@@ -32649,7 +32746,7 @@ self: {
      mkDerivation {
        pname = "citation-resolve";
        version = "0.4.3";
-       sha256 = "1x561l7shkz1nh43xh2nj83pb183rah1swi0ql9n0wr9ykq1mh1l";
+       sha256 = "34c01af0f429736013c520721da0ca038575079256c03e08b4e14fa80f0da6f4";
        libraryHaskellDepends = [
          aeson base bytestring citeproc-hs containers curl data-default
          directory download-curl either lens mtl process safe text
@@ -32672,7 +32769,7 @@ self: {
      mkDerivation {
        pname = "citeproc-hs";
        version = "0.3.10";
-       sha256 = "1fb51v8hv8ik3a8grba2br6cfbj1b3y72lgjh4i75xh09i7xna0r";
+       sha256 = "1928db4f4c00f6722281f25171fc58412ec74c5e42adfc901a33a20dd10e65b9";
        libraryHaskellDepends = [
          base bytestring containers directory filepath hexpat hs-bibutils
          HTTP json mtl network network-uri old-locale pandoc-types parsec
@@ -32692,7 +32789,7 @@ self: {
      mkDerivation {
        pname = "citeproc-hs-pandoc-filter";
        version = "0.1";
-       sha256 = "1kwsmwm0yxvqdxxr7x13hmq4nm8a9plmsfkwbvfp13bbd4mwcxnj";
+       sha256 = "d276c62b696b8d70dd5e7c3a5de94d0a554b708523f4937b6f78770f2aaf9acf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -32712,7 +32809,7 @@ self: {
      mkDerivation {
        pname = "cityhash";
        version = "0.3.0.1";
-       sha256 = "1nr0sqrvnsjkgyhlw55mnr69s5ddxk9f0bbpwkigqc7m457vkxi6";
+       sha256 = "26f6b94f21f530fce2e4772de0d2ecad159d4cb6b5144ea17f536abb33d620db";
        libraryHaskellDepends = [ base bytestring largeword ];
        testHaskellDepends = [
          base bytestring largeword QuickCheck test-framework
@@ -32730,7 +32827,7 @@ self: {
      mkDerivation {
        pname = "cjk";
        version = "0.1.0.1";
-       sha256 = "1r0rw33vqkhck0mfqz19plw9a71f56gdcjldrxl23178fps349vl";
+       sha256 = "742732f475e8842168cf8d4ad69e292e1c9538bd297cec2a980c4ebcc7e019e4";
        libraryHaskellDepends = [
          attoparsec base bytestring containers text text-icu
        ];
@@ -32748,7 +32845,7 @@ self: {
      mkDerivation {
        pname = "clac";
        version = "0.5.0";
-       sha256 = "1ajah3ma4ms2y2kg4wkasjycsqz728n6chx1lm1r3xaiv17akya8";
+       sha256 = "48f9a94ed851f59143a5a143662c12e763cdbcd46a72f2a6f04257a2ea804aaa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -32772,7 +32869,7 @@ self: {
      mkDerivation {
        pname = "clafer";
        version = "0.4.0";
-       sha256 = "1xnjvqwdp7679hr6jkl6xnsrdidw494p1xr8mlng6gybflm8v9gn";
+       sha256 = "f6a58d2a75cb3ff32cad28f7704922bcc596b5ed864e69324cc79cdb38ded2f6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32803,7 +32900,7 @@ self: {
      mkDerivation {
        pname = "claferIG";
        version = "0.4.0";
-       sha256 = "01ilmmhz1wd142qpclk1b5nksm6cacr07pdj5cl5prfv7y04k9nw";
+       sha256 = "dca649803fdbe55b282bb2dd033253cc543d6d59615276b120a1f1f061ad3406";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32833,7 +32930,7 @@ self: {
      mkDerivation {
        pname = "claferwiki";
        version = "0.4.0";
-       sha256 = "1in0lzph5h7v9z9b974ibzh0rq7j343q474i9zfkylmdd1aivdyh";
+       sha256 = "d0b71d5568ad523fdd4f911c820719f2e00ce05f919cb4d24ffbc002efa7c0c6";
        libraryHaskellDepends = [
          base clafer containers directory gitit MissingH mtl network
          network-uri process SHA split time transformers utf8-string
@@ -32849,7 +32946,7 @@ self: {
      mkDerivation {
        pname = "clanki";
        version = "1.2.5";
-       sha256 = "0s94zxgcxq230y80kfqgim9yci3wqbq85byyvp0f0kqadsn4wmv1";
+       sha256 = "61574eac6e0a4fe0c0dddeaf82f0c27c44e6538d0fbb09900743e0ce5eff2469";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -32869,7 +32966,7 @@ self: {
      mkDerivation {
        pname = "clash";
        version = "0.1.3.11";
-       sha256 = "047dhg6y7yvp5vdarylry0q4l29a4x2dkjilk6j624lxcc17gyhx";
+       sha256 = "1dfa7702639d1261a49934cad944272a094a30f099faacda2e77fbe3cd83ed10";
        libraryHaskellDepends = [
          base containers data-accessor data-accessor-template directory
          filepath ghc haskell98 pretty prettyclass template-haskell tfp
@@ -32892,7 +32989,7 @@ self: {
      mkDerivation {
        pname = "clash-ghc";
        version = "0.5.11";
-       sha256 = "1lwc47b2iw2l7djga11gp4xdikb8gycqv4fxz1cxrf23xzkg5ggg";
+       sha256 = "efbdf2e6ef43b8dc59f8dd918d997f68cdd83ab92f04f5643b54f028d6218cd3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -32918,7 +33015,7 @@ self: {
      mkDerivation {
        pname = "clash-lib";
        version = "0.5.10";
-       sha256 = "039j561r7kgrd5b7z55axgjniwm5yi5y1y0azps4ipmvjsvalbdl";
+       sha256 = "b42daab696bbde48f4fd0af8e04bf4a5f268e5ebaa947f5669f9cd938329320d";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath hashable lens mtl
@@ -32938,7 +33035,7 @@ self: {
      mkDerivation {
        pname = "clash-prelude";
        version = "0.9.2";
-       sha256 = "1gl75mbqpv5g5dwg2c2vvqn36ydwhkcv7g6i8gjm41500dsrky0i";
+       sha256 = "11f8997503a00452e543d1bcb3d984bc79332cde5b30f1782bafec8b572d87be";
        libraryHaskellDepends = [
          array base data-default ghc-prim ghc-typelits-natnormalise
          integer-gmp lens QuickCheck singletons template-haskell th-lift
@@ -32955,7 +33052,7 @@ self: {
      mkDerivation {
        pname = "clash-prelude-quickcheck";
        version = "0.1.2.1";
-       sha256 = "1fn5wlg2lmxl6rs2ygnf0m88bgcjf62jpprbp425pqbq6lvhw70w";
+       sha256 = "1c1c0e373578e15b04b92bdf2b857192bd855005ce3e2f7436b4572a1ee5c5ba";
        libraryHaskellDepends = [ base clash-prelude QuickCheck ];
        jailbreak = true;
        description = "QuickCheck instances for various types in the CλaSH Prelude";
@@ -32970,7 +33067,7 @@ self: {
      mkDerivation {
        pname = "clash-systemverilog";
        version = "0.5.7";
-       sha256 = "0s8yqs4h5abamfrawfw95q9p0h8ni98pwyqr76nkvkrybxwykam5";
+       sha256 = "a5aae9795f3ecf3dad39197b7e518a164170132e893baeb2ab6aa90289c61e69";
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -32988,7 +33085,7 @@ self: {
      mkDerivation {
        pname = "clash-verilog";
        version = "0.5.7";
-       sha256 = "04wa7y108hk2bn453dwrr1x71bvxx48hivdpqxsx0gyhya14143j";
+       sha256 = "72904082f2d03fd075c7b7ed0811e97daf707ac899b751885d624204823f8a13";
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -33005,7 +33102,7 @@ self: {
      mkDerivation {
        pname = "clash-vhdl";
        version = "0.5.8";
-       sha256 = "08qplvnal8jjqy8rkivgn53n8qpzk232dslqxypx6ky6fks3bc0w";
+       sha256 = "1cb035f474c64fd3afef98ea268698ff626447b16fc79991c75222aaeca61723";
        libraryHaskellDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -33021,7 +33118,7 @@ self: {
      mkDerivation {
        pname = "classify";
        version = "2013.11.6.1";
-       sha256 = "03d4ygqhqbg4cvfjp8c5cyy0fkgf1fpzc1li45bqc555jrxwszwr";
+       sha256 = "997fcd7b96a5148657219106f6af0bee4d07bc6785a12bdd66e42d0cf1f3a40d";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Library for classification of media files";
        license = stdenv.lib.licenses.publicDomain;
@@ -33034,7 +33131,7 @@ self: {
      mkDerivation {
        pname = "classy-parallel";
        version = "0.1.0.0";
-       sha256 = "0vfik37g2fwzc4p343hag5aidvi77396vfhfdx1207gahbzqf21v";
+       sha256 = "3b0887ff82ea1d20426f0eba6dd23827ee1655790a0e322e619f3bf1ce98d16d";
        libraryHaskellDepends = [
          base lifted-base monad-control parallel resourcet transformers
        ];
@@ -33054,7 +33151,7 @@ self: {
      mkDerivation {
        pname = "classy-prelude";
        version = "0.12.1.1";
-       sha256 = "04rxmh4jzj4j5dx9i8ndh9ibn01cjdi485n1xvjngx0gs7zqa2k7";
+       sha256 = "670a85ffd10ff467e5eec1164462932c00bb6282cda2987a2b92c82f09ac3d13";
        libraryHaskellDepends = [
          base basic-prelude bifunctors bytestring chunked-data containers
          dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base
@@ -33078,7 +33175,7 @@ self: {
      mkDerivation {
        pname = "classy-prelude-conduit";
        version = "0.12.0.1";
-       sha256 = "1xv20i31f1za88kkdd00vin9shn9zxhqmwd0ln62cag4xfrmh9xi";
+       sha256 = "b12758b3ebe429268ca5a0f18a61ffc9429d6cdc00b4362742ea0717460462f7";
        libraryHaskellDepends = [
          base bytestring classy-prelude conduit conduit-combinators
          monad-control resourcet transformers void
@@ -33099,7 +33196,7 @@ self: {
      mkDerivation {
        pname = "classy-prelude-yesod";
        version = "0.12.0.1";
-       sha256 = "00pzlsbsdajzdlna1flrdd1lb98g0vx2b9757m8kfa37h6l443r2";
+       sha256 = "220f42a881672837513de5a425fa060fa545436b99baa02c6d5faaa697a6ff02";
        libraryHaskellDepends = [
          aeson base classy-prelude classy-prelude-conduit data-default
          http-conduit http-types persistent yesod yesod-newsfeed
@@ -33117,7 +33214,7 @@ self: {
      mkDerivation {
        pname = "clay";
        version = "0.10.1";
-       sha256 = "0m0ajbgypn9ki741x2bmcmpmpkccazv76wh8b9gha9483cl21f1v";
+       sha256 = "3bb820281b8824055f5a087273f6578ccd5b6f6575891ec88933d9ebdf920a54";
        revision = "1";
        editedCabalFile = "8ecb3c320c9470f2bf250552d7fac738520d90d28e8e90b11922d1c4940a0263";
        libraryHaskellDepends = [ base mtl text ];
@@ -33144,7 +33241,7 @@ self: {
      mkDerivation {
        pname = "clckwrks";
        version = "0.23.8";
-       sha256 = "0inhxyjs12990mngfx2n3m107wxnamgi4gby5lnvai5nz913qgzd";
+       sha256 = "ed3f3c42fab644b52d2d7e3d125f55b6f303421d5674f76c052989a0a5efd046";
        libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
@@ -33172,7 +33269,7 @@ self: {
      mkDerivation {
        pname = "clckwrks-cli";
        version = "0.2.14";
-       sha256 = "1dwvrxz2sjk61bbima9m70qv6gf4h4jx9yysmwnwpinmmqixwdi3";
+       sha256 = "2336de23aed5c6cb2dafdafbd42581c43db3313835a91ad70a664a2d7ecf9bb7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33192,7 +33289,7 @@ self: {
      mkDerivation {
        pname = "clckwrks-dot-com";
        version = "0.3.11";
-       sha256 = "0f39ws919qy00090l002k3g8dkcldq7rwayf0wyxg8mfycrnb700";
+       sha256 = "009c6533f3aea2d73d07ce2b9e0f6e94cd86de9802000a1200c0e31492e66938";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33219,7 +33316,7 @@ self: {
      mkDerivation {
        pname = "clckwrks-plugin-bugs";
        version = "0.7.5";
-       sha256 = "0la4ivk8sbh8wq1g2nhxx522ir2idffz5818bghjf8qffmqa47fv";
+       sha256 = "db1da270750e2327e15b28a0f29d6b51e42844e91d5af102e6082e8de68e4451";
        libraryHaskellDepends = [
          acid-state attoparsec base cereal clckwrks clckwrks-plugin-page
          containers directory filepath happstack-authenticate happstack-hsp
@@ -33245,7 +33342,7 @@ self: {
      mkDerivation {
        pname = "clckwrks-plugin-ircbot";
        version = "0.6.14";
-       sha256 = "1lrh2929ia6326vf9lyd5jy1a3nnavl8f27f9faw35871p1my1r2";
+       sha256 = "22075fc30d0795c1954bee0887e856d60e15bc2ccdd3e4b611c3a898441230d3";
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html bytestring clckwrks
          containers directory filepath happstack-hsp happstack-server hsp
@@ -33269,7 +33366,7 @@ self: {
      mkDerivation {
        pname = "clckwrks-plugin-media";
        version = "0.6.13";
-       sha256 = "0j6ijdq3n011h4d0gxxpjs35kwppp2kyjkg0bjcdw752ppk4y14w";
+       sha256 = "9c044fe6bda21cde985ce04de9a7b8f7f2598696b7f7071a8121003b7093d148";
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html cereal clckwrks containers
          directory filepath gd happstack-server hsp ixset magic mtl reform
@@ -33294,7 +33391,7 @@ self: {
      mkDerivation {
        pname = "clckwrks-plugin-page";
        version = "0.4.0";
-       sha256 = "0j82xzdgpy97s4xf6vx3an5ssbybcixhasmh0ca9bjmv9iqkjkws";
+       sha256 = "9a4f39714cbbca951403b06a057b64cb2fad8b55a36fe33ad127f9fbdaef0249";
        libraryHaskellDepends = [
          acid-state aeson attoparsec base clckwrks containers directory
          filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
@@ -33316,7 +33413,7 @@ self: {
      mkDerivation {
        pname = "clckwrks-theme-bootstrap";
        version = "0.4.0";
-       sha256 = "08sdklr7nikngkdcls9dwy0ij4nqrb1n6dnkm3cw73iaifsl6klz";
+       sha256 = "9f4e43b58b2a8ec3d9a8d33663c3cad8121981e72d69cada7c76467b329d4d23";
        libraryHaskellDepends = [
          base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
          mtl text web-plugins
@@ -33335,7 +33432,7 @@ self: {
      mkDerivation {
        pname = "clckwrks-theme-clckwrks";
        version = "0.5.0";
-       sha256 = "06szqp7mcak7ra1pzxzmj8hzhm1lmdr7nwjkxk1h8bba5ipcjwhv";
+       sha256 = "1b72c96e2c6a2d04c3ec53727b72ab3454f82192f5f77f83ca672a56cfc55f1b";
        libraryHaskellDepends = [
          base clckwrks containers happstack-authenticate hsp hsx2hs mtl text
          web-plugins
@@ -33351,7 +33448,7 @@ self: {
      mkDerivation {
        pname = "clckwrks-theme-geo-bootstrap";
        version = "0.1.1";
-       sha256 = "1qxik7hdz300n5lfb5xzh2md44b4xwwlr0c92y9x2na2xz41da7k";
+       sha256 = "f3a816c8ef4259d1931789814c39ef6411d2aa80bf97e568b1008cdfe099b1e3";
        libraryHaskellDepends = [ base clckwrks hsp text ];
        jailbreak = true;
        homepage = "http://divshot.github.com/geo-bootstrap/";
@@ -33365,7 +33462,7 @@ self: {
      mkDerivation {
        pname = "cld2";
        version = "0.1.0.1";
-       sha256 = "0fsjp0y5f17gv3k43vbxgx7w6i2l4ralrc6g1wb0xi0gp1vrm3hd";
+       sha256 = "0d8e9a77b80fc40e160fcfb04c55265444c34f7f7ded41e6d8ef04573cb8523b";
        revision = "1";
        editedCabalFile = "60506ceb359329f803a733a06f9a6060a31cab7e86dd4a8e3fd843953cb4cfbd";
        libraryHaskellDepends = [ base bytestring text ];
@@ -33380,7 +33477,7 @@ self: {
      mkDerivation {
        pname = "clean-home";
        version = "0.0.4";
-       sha256 = "0s894l3vjjkz94cvl5hv3vdpm934k7ila60kmr6acl7pvhppnc22";
+       sha256 = "42307b2fdcf750a64cae131845e39964a47adb1e1b16ba19497f4ab907250969";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33396,7 +33493,7 @@ self: {
      mkDerivation {
        pname = "clean-unions";
        version = "0.1.1";
-       sha256 = "1y4cj15s6gjcazwk0iycyc2qs7chrqcvchf4g5h4xnf2x8ld4i21";
+       sha256 = "4144d228eac2d94e6079c441b619ce901d8d05f3cc4730f9574c3ea34b908cf8";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/fumieval/clean-unions";
        description = "Open unions without need for Typeable";
@@ -33410,7 +33507,7 @@ self: {
      mkDerivation {
        pname = "cless";
        version = "0.3.0.0";
-       sha256 = "16v2hj2qxw7ij8aqhbx11fs4ss62d4d0jwi4mk0kc76yfdwl61hg";
+       sha256 = "0f06437973de1c36c1ac2472091a69c2684db40ba12f881592f1f08e8584629b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33428,7 +33525,7 @@ self: {
      mkDerivation {
        pname = "clevercss";
        version = "0.2.4";
-       sha256 = "0nnczd93j160747dc11z06ds81g938bw8lnqywg7mgylsfxalznl";
+       sha256 = "d47eaabad3d4bf7a1ef7d852c4171ae905a49b013f04d60e39c0043952fbcc5a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl parsec ];
@@ -33444,7 +33541,7 @@ self: {
      mkDerivation {
        pname = "cli";
        version = "0.0.4";
-       sha256 = "0iychwxbmnlywv7b7fpxym0ybcbk0aba9p0pvg8brs6llz2qrn9x";
+       sha256 = "3dd98cc5a7d4e8bcd0db17dca4960273b1e541f5fdbab3cee69edaba3a87cc47";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -33460,7 +33557,7 @@ self: {
      mkDerivation {
        pname = "click-clack";
        version = "1.0.1";
-       sha256 = "0ngvdq0i82qxwawqb5pqa3fscnyv1kxc3ifc3qijnn5v4py9ydd8";
+       sha256 = "a8359ffc25bb582b231eccc5c1fa0cdb5ba6dd50f89685b9e21d0b14016efb59";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33481,7 +33578,7 @@ self: {
      mkDerivation {
        pname = "clientsession";
        version = "0.9.1.1";
-       sha256 = "08h0461ydhfymw2pya472n81kx5rqp7awfgxlbz2r851rl5kqmn9";
+       sha256 = "c9563c0bcda1a02cfea2fd39aecec5b9f419901587287f05afdec1e683210022";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33508,7 +33605,7 @@ self: {
      mkDerivation {
        pname = "clifford";
        version = "0.1.0.14";
-       sha256 = "00xxvwa60ihrd24267hzs5ssjm6nrli39qlh9gm4fkdnrzif9r4r";
+       sha256 = "99e4e4e2cfb64d47ea4b90e23422cdd654a975d11f1e23886819466014dfbd03";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33535,7 +33632,7 @@ self: {
      mkDerivation {
        pname = "clippard";
        version = "0.1.1";
-       sha256 = "0qhi727irlkvi4ygx5qvd6h1zzz22588lymi39s0gcjir473a538";
+       sha256 = "6814350ec951b207741ab17a8a5011e2ff1fa0691b97fe3c897bd21c8f381162";
        libraryHaskellDepends = [ base process ];
        jailbreak = true;
        homepage = "https://github.com/Raynes/clippard";
@@ -33548,7 +33645,7 @@ self: {
      mkDerivation {
        pname = "clipper";
        version = "0.0.1";
-       sha256 = "0s4n8d07190yarkxpa2kjphkm6lw2ljgwcix3x6m3lxcxrvc3nr0";
+       sha256 = "20dbc176eeacd3514d1f3d32fe24159c9a3ae19553a8db67561ea47040439668";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/chetant/clipper";
        description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)";
@@ -33564,7 +33661,7 @@ self: {
      mkDerivation {
        pname = "clippings";
        version = "0.1.3";
-       sha256 = "0dm0cpqcv8r66zlwq7myjv7klpp43lbcwdgxs2zkg6mbsb2f1qvr";
+       sha256 = "79e3e0c4d2ab9a37bfd0fd35ce161de45e3acf96be1ecce93726a3cdf065a036";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33586,7 +33683,7 @@ self: {
      mkDerivation {
        pname = "clist";
        version = "0.1.0.0";
-       sha256 = "1jvkv6dwx2gm59vczmiagpxb0614fz63jzqrqm81bdai8yb0gpzd";
+       sha256 = "eddf07964751b51550c5197f39cc772418b0fa7d2ad6cf762af589ce9bd973cb";
        libraryHaskellDepends = [ base base-unicode-symbols peano ];
        homepage = "https://github.com/strake/clist.hs";
        description = "Counted list";
@@ -33598,7 +33695,7 @@ self: {
      mkDerivation {
        pname = "clock";
        version = "0.5.1";
-       sha256 = "1ncph7vi2q6ywwc8ysxl1ibw6i5dwfvln88ssfazk8jgpj4iyykw";
+       sha256 = "7c7a1f89bc4fa2f995d31a214bb7e3ad44c3570cb46b8f18e7de6011f78197d9";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/corsis/clock";
@@ -33613,7 +33710,7 @@ self: {
      mkDerivation {
        pname = "clocked";
        version = "0.4.1.3";
-       sha256 = "1z9n4nisa73zlwch7arixg6633w3jmcqw5w97jf4p5559q874wi8";
+       sha256 = "287272104ea5944b9c3c89178e5995838f61cceb31ab0319a77f1ca5a32536fd";
        libraryHaskellDepends = [
          base clock containers MonadCatchIO-transformers transformers
        ];
@@ -33631,7 +33728,7 @@ self: {
      mkDerivation {
        pname = "clogparse";
        version = "0.2";
-       sha256 = "17n5rwi64wjyv2xcxm86bawgmnpfrg7fjzwr9l3bj5jg0ggbyrbx";
+       sha256 = "7d65bfde034f16b9064d997fe9cecbeedafab85a06d5cebad85e726222cfc59e";
        libraryHaskellDepends = [
          attoparsec base bytestring filepath text time timezone-olson
          timezone-series
@@ -33649,7 +33746,7 @@ self: {
      mkDerivation {
        pname = "clone-all";
        version = "0.1.0.0";
-       sha256 = "1mif1cqwpgp1wis7lplqrvv5aikdl0iv5ddazwgm6zgrxz645p09";
+       sha256 = "09dc42cceff97d531fffaab5b223a06d4655f6ce985e7a74e4e1becb310b2ed6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33668,7 +33765,7 @@ self: {
      mkDerivation {
        pname = "closure";
        version = "0.1.0.0";
-       sha256 = "1z9clkwjpj01g258h8bldlc759vwsgdlyppn29sr11kyani1zjwf";
+       sha256 = "8ecb1fa2557e86907512f65e4fdbd37ca772186d7421888a7801c82bf9a42cfd";
        libraryHaskellDepends = [ base hashable unordered-containers ];
        jailbreak = true;
        homepage = "http://github.com/tel/closure";
@@ -33686,7 +33783,7 @@ self: {
      mkDerivation {
        pname = "cloud-haskell";
        version = "0.2.0.0";
-       sha256 = "11i2r7zf3vvywsfnlcsgvnh2qf92wgc81sfmhkhfpdrpcd2zx606";
+       sha256 = "0698fe456337b7ebe084d5e980d8e322392ca0dd4f336a9de67eefe1fec92286";
        libraryHaskellDepends = [
          distributed-process distributed-process-async
          distributed-process-client-server distributed-process-execution
@@ -33708,7 +33805,7 @@ self: {
      mkDerivation {
        pname = "cloudfront-signer";
        version = "0.0.0.1";
-       sha256 = "1ikjrlb421rxsj4c7dl4dw8a3kls43gzn4mapg1y9b2bkd7q6ywz";
+       sha256 = "9f7b834f9b4bace4c3bbaa12fbdf209acea1106f84b6c388d43d074116cd72c6";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base base64-bytestring bytestring
          crypto-pubkey-types old-locale RSA time
@@ -33727,7 +33824,7 @@ self: {
      mkDerivation {
        pname = "cloudyfs";
        version = "0.0.2";
-       sha256 = "0jfv3830kg3yp1vqqs75bmiwflv4y8ya86q575bsw1l695dc5lwg";
+       sha256 = "8fd3c25a498606ae5739051ba43cf26453c7635de5688c77b87ebc09061adb49";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33745,7 +33842,7 @@ self: {
      mkDerivation {
        pname = "cltw";
        version = "1.1.4";
-       sha256 = "08nishc8ngmvx0pdksn4z8a6l8vdgm3jiyz3w6d302pwp566z4q9";
+       sha256 = "09936f4cb9fc0a309ae1e3fb28477d6d236a14fac4ead92ee8bb3e8b18d4d122";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base curl mtl random tagsoup ];
@@ -33761,7 +33858,7 @@ self: {
      mkDerivation {
        pname = "clua";
        version = "0.3";
-       sha256 = "0xzhpjsb9nf8xw7fa111n5gki46gz67aiyd2wr1k50pzyjrvl3vv";
+       sha256 = "7b0fbab3f4ff823243e6a2f9a88ef9cf90385fb12104e50eefc8d9b4b4bcf077";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33778,7 +33875,7 @@ self: {
      mkDerivation {
        pname = "cluss";
        version = "0.3";
-       sha256 = "1q5km2f8zwnzcwnzj0khnszsgrb1x53zp0ryjwz2nfx9ajvh7zgg";
+       sha256 = "effd03b754a93b2b3e973e83fb47e961e5a7bfb67002f92d67dff28f9ca8b3e0";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/Kinokkory/cluss";
        description = "simple alternative to type classes";
@@ -33794,7 +33891,7 @@ self: {
      mkDerivation {
        pname = "clustering";
        version = "0.2.1";
-       sha256 = "1jxrgb13zm8bqcsx39fp31lrpna3y0pn7ckcf9q6gljz327c4y2h";
+       sha256 = "5078c28e185fd26770726cb2632ff043d99b6918d7a5d135c30bd53fc27ab9cb";
        libraryHaskellDepends = [
          base binary containers matrices mwc-random parallel primitive
          vector
@@ -33815,7 +33912,7 @@ self: {
      mkDerivation {
        pname = "clustertools";
        version = "0.1.5";
-       sha256 = "0in6fqzr1aki2dhbkv3vlmw17vla5m39g6msaplk4vix5yjw7vkq";
+       sha256 = "78eec3a52f3d6e32e955ba9a97462d8aee1378a57becb9601371aa903f76c646";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33834,7 +33931,7 @@ self: {
      mkDerivation {
        pname = "clutterhs";
        version = "0.1";
-       sha256 = "0mcl6pc0qjyijyqqlf1wh3548gn71kv6xy0jaqgrjddf20qlc8xl";
+       sha256 = "b423463110ae35991f5612f86ef60cc73e44ca803c388ab197d14b0cd8359455";
        libraryHaskellDepends = [
          array base cairo glib gtk haskell98 mtl X11
        ];
@@ -33852,7 +33949,7 @@ self: {
      mkDerivation {
        pname = "cmaes";
        version = "0.2.2";
-       sha256 = "060bmnkhbwrxhalfy5zxwjzbb6mp5ffj4r0qgkv6wp7bac2nnrp8";
+       sha256 = "e8666b0553eb5c6ef67c1864229d2bb79ab5bee4fd17efa8823df305a7ad0b18";
        libraryHaskellDepends = [ base mtl process safe strict syb ];
        testHaskellDepends = [
          base doctest doctest-prop mtl process random syb vector
@@ -33867,7 +33964,7 @@ self: {
      mkDerivation {
        pname = "cmark";
        version = "0.4.0.1";
-       sha256 = "1kimba33r0f2ify0sxy7x9npqarb9xaw8hih1z6vvf1bkjsji0v3";
+       sha256 = "638328b59c2bb8bdcd0f3042c4554f2b2b7c6deac7770dbc8bc2813c865a35ce";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base HUnit text ];
        homepage = "https://github.com/jgm/commonmark-hs";
@@ -33880,7 +33977,7 @@ self: {
      mkDerivation {
        pname = "cmath";
        version = "0.3";
-       sha256 = "1hb92cgblmwp49lv0x0ib8g557mhjk6db7ihnim75ldii2f93dnm";
+       sha256 = "d5b6919c88b1d1726ab4309ed5cc94b09e521e5a1174b069229757ba1e1369c1";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~dons/code/cmath";
        description = "A binding to the standard C math library";
@@ -33895,7 +33992,7 @@ self: {
      mkDerivation {
        pname = "cmathml3";
        version = "0.1";
-       sha256 = "0mh6qzdlbfc1lfx7353p2qfa2j77xjlnnnnw3csmv125zha4y96d";
+       sha256 = "cd244f14fc45845d351bdc5a6ba9ece748a11c16779471baa381b945dbc70656";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33915,7 +34012,7 @@ self: {
      mkDerivation {
        pname = "cmd-item";
        version = "0.0.1.0";
-       sha256 = "1lawn0v32dn38xf3jaz70gks99llbq453zlf876pylinh5id7q62";
+       sha256 = "c2e0d3628136527fcd418efe51085e94a6a4e703e72b395c47c3363136b05cd1";
        libraryHaskellDepends = [ base containers templater text ];
        testHaskellDepends = [
          base hspec hspec-laws HUnit QuickCheck quickcheck-instances text
@@ -33932,7 +34029,7 @@ self: {
      mkDerivation {
        pname = "cmdargs";
        version = "0.10.13";
-       sha256 = "0vmz7f0ssrqlp6wzmc0mjqj4qczfgk58g0lr0yz7jamamlgpq4b6";
+       sha256 = "66117c1fadaa2a79be07998287ca7cee334c249615b0fab9b91467ad813bbf6e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33950,7 +34047,7 @@ self: {
      mkDerivation {
        pname = "cmdargs-browser";
        version = "0.1.3";
-       sha256 = "1k0g2vh7sqkblzjsfvyhfiy1fcwkw0i10kgl4n2r68w7v52mmzd0";
+       sha256 = "a0fd5a45d98723938525f44d1022e09333177c74d06fa7e5a76b627de0160fcc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33969,7 +34066,7 @@ self: {
      mkDerivation {
        pname = "cmdlib";
        version = "0.3.6";
-       sha256 = "0mxk7yy3sglxc97my5lnphisg6fawifrbdbpz31h7ybiqccx4hsn";
+       sha256 = "5643d219c371f903c3f877b5955de4ca99a723bc96165f4f629d3e3dbc3fb357";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl split syb transformers ];
@@ -33985,7 +34082,7 @@ self: {
      mkDerivation {
        pname = "cmdtheline";
        version = "0.2.3";
-       sha256 = "1jwbr34xgccjbz6nm58bdsg1vqyv87rh45yia5j36vlfbaclyb04";
+       sha256 = "042c4f995a8e6e336451d11702f341dbe31d9e6e0b956acd5f92b1d7c9c88bcb";
        libraryHaskellDepends = [
          base containers directory filepath parsec pretty process
          transformers
@@ -34006,7 +34103,7 @@ self: {
      mkDerivation {
        pname = "cml";
        version = "0.1.3";
-       sha256 = "1hym074a8akzg3c96b1yczmdw5pgn4g0ahqxsxhg8d0kf8lzi5ph";
+       sha256 = "f096f829721334f460d71d43051eb1ef16deea673e2c93d8787f2aa4c801d5c3";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/cml/";
        description = "Events and Channels as in Concurrent ML";
@@ -34018,7 +34115,7 @@ self: {
      mkDerivation {
        pname = "cmonad";
        version = "0.1.1.1";
-       sha256 = "07adwhpsmg3q4nhifjpdjv2dy1m08n0qkvlssmbl3b6gklvb82sk";
+       sha256 = "530bb4369dcfac4157d59aee898145a006dfc496ed4a17a12578bcaa2fe44d1d";
        libraryHaskellDepends = [ array base ];
        description = "A library for C-like programming";
        license = stdenv.lib.licenses.bsd3;
@@ -34030,7 +34127,7 @@ self: {
      mkDerivation {
        pname = "cmu";
        version = "1.10";
-       sha256 = "0zlc6spb51s2k455s9mspqjjk8xm90wwjlj2nm7949ihkim4j5gy";
+       sha256 = "fe15496a9c3026924eb54252c93948b5a32925beba265d0a994287b2ae368c7e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers ];
@@ -34047,7 +34144,7 @@ self: {
      mkDerivation {
        pname = "cnc-spec-compiler";
        version = "0.2.0.1";
-       sha256 = "0nfqglz6szbi3s8xf5i87rnac7hc8cqfyrx2rs5ydb5i439s22b0";
+       sha256 = "6009a1d320b1ace68bcea267ef30430c1ea66c3e2816d7911e717d6d3e7dd859";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -34068,7 +34165,7 @@ self: {
      mkDerivation {
        pname = "cndict";
        version = "0.6.1";
-       sha256 = "0pi0n1chwv6y3ch7dw2smrllwsdiy6r295lmmsnfnbprc8w6gksq";
+       sha256 = "58cf673862f92eebacae959624b2f1b1694e69ae5af076201bde6c0e59b0205e";
        revision = "1";
        editedCabalFile = "6371863e768d5b9d01f80b10783bb7ab4530e8e168d0c0bcc0fcee2a4f1aa468";
        libraryHaskellDepends = [
@@ -34086,7 +34183,7 @@ self: {
      mkDerivation {
        pname = "code-builder";
        version = "0.1.3";
-       sha256 = "1ax4c19xkszahcxvwc1wa1hrgk6ajck5sbprbplsi1gc9jj4g7jm";
+       sha256 = "559e47a44cec85a8e95df92e5d2693cacc9761503c30be3b83eaebd95360a4ab";
        libraryHaskellDepends = [ base containers ];
        description = "Simple system for generating code";
        license = stdenv.lib.licenses.bsd3;
@@ -34100,7 +34197,7 @@ self: {
      mkDerivation {
        pname = "codec";
        version = "0.1.1";
-       sha256 = "0fkcbdas270gad7d3k40q96w68iwfb8jgi866x3dp4mf8wvsll9k";
+       sha256 = "3351aa3747ae92db463706c527d1723c22c34dc280ccd14e530f1ca1555b6c3a";
        libraryHaskellDepends = [
          aeson base binary binary-bits bytestring data-default-class mtl
          template-haskell text transformers unordered-containers
@@ -34121,7 +34218,7 @@ self: {
      mkDerivation {
        pname = "codec-libevent";
        version = "0.1.2";
-       sha256 = "17v7adxs65jq74ngid0iywg3p5pq5j2p9mznqwj7i53238l3p60l";
+       sha256 = "14983b281a62947824c7f6d774852cf8963b1ef711b4f82c395816a37b53679f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34142,7 +34239,7 @@ self: {
      mkDerivation {
        pname = "codec-mbox";
        version = "0.2.0.0";
-       sha256 = "0kbn76g6ly1pjd9higi0k0f26hplm0jhz85b23inn0bjli14n2cl";
+       sha256 = "94094b42a472016be310aba00f25a8f442231c9820be08539337786a9e39764d";
        libraryHaskellDepends = [ base bytestring ];
        description = "A library to read and write mailboxes in mbox format";
        license = stdenv.lib.licenses.bsd3;
@@ -34155,7 +34252,7 @@ self: {
      mkDerivation {
        pname = "codecov-haskell";
        version = "0.4.0.2";
-       sha256 = "0y1vv9iayjvikjfp4y41m4gypybxd1lq3pv4154nvbjpfapmndsw";
+       sha256 = "5c375baf7257ae6d490964df8169687df9eb1fa98178729d9c714baf62da3b78";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34179,7 +34276,7 @@ self: {
      mkDerivation {
        pname = "codemonitor";
        version = "0.2";
-       sha256 = "14jywd60mxbj5q1srxj4igs1ah0ddf8ww5k4n5d9g7cp1b1yv1mc";
+       sha256 = "ac86edc30a979d975ab16416ce916b0d4015f48b44f6ac032e72f50a4ce35e92";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -34197,7 +34294,7 @@ self: {
      mkDerivation {
        pname = "codepad";
        version = "0.1";
-       sha256 = "03jvbbv4cgrmk0ihz34shd1ydv5jhl1h1xiwqrln60622jlh8mr1";
+       sha256 = "215704a914c2006369c63cf6000385b2ece643839a8c0f2398353f46f65a5b0e";
        revision = "1";
        editedCabalFile = "52fe2b461d77b36400724ddd77e6ec5a92cb9c1bbf5f97efb4cfe87adba3a07a";
        libraryHaskellDepends = [ base curl mtl network tagsoup ];
@@ -34217,7 +34314,7 @@ self: {
      mkDerivation {
        pname = "codex";
        version = "0.3.0.8";
-       sha256 = "1jlrap3qhgnsgdmp0nb2hf3bbjlajp6p4z2q2rl70l93v0v9xi02";
+       sha256 = "02c49e36d82351706816587c72cd958acab586836259706b7bda3e88c75599ca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34241,7 +34338,7 @@ self: {
      mkDerivation {
        pname = "codo-notation";
        version = "0.5.2";
-       sha256 = "1bwfjg0bzph0vka1rx8m6f505l9dmj8nn6al9kmjkva18l05gsvq";
+       sha256 = "78eb57004541ed29eb4c54196b91ac2dd1028a3315f51cd4dc00debfc0938eaf";
        libraryHaskellDepends = [
          base comonad haskell-src-meta parsec template-haskell uniplate
        ];
@@ -34254,7 +34351,7 @@ self: {
      mkDerivation {
        pname = "cofunctor";
        version = "0.1.0.1";
-       sha256 = "0xn4k1c7l9z3g0slbwvlfg9kpfq8jbk0qf9363qz7azv7ks1149p";
+       sha256 = "379110f43cfbabf3f13023390ce69208bb3bd37374f3453578e3277a5898c476";
        libraryHaskellDepends = [ base ];
        description = "DEPRECATED: use the \"contravariant\" package";
        license = stdenv.lib.licenses.bsd3;
@@ -34269,7 +34366,7 @@ self: {
      mkDerivation {
        pname = "cognimeta-utils";
        version = "0.1.2";
-       sha256 = "00bq5qad7x8x0fac1gb8aq97zm4pylnk7n9bg4nkhyyvwnmjsy5l";
+       sha256 = "b4782dabe5db7b382d792bd9332df597d47f125668bdc094031df5d3142e7801";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34300,7 +34397,7 @@ self: {
      mkDerivation {
        pname = "coinbase-exchange";
        version = "0.2.0.2";
-       sha256 = "0mh95pfzdvfqy1frwsqi9fi1wgs1nk1xkzijh1pyjm2paqxzynn2";
+       sha256 = "c25aff3b565754e96f8032fed9c3b4413f1ea24b116b9e5df0d8edf6dd2d0956";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34331,7 +34428,7 @@ self: {
      mkDerivation {
        pname = "colada";
        version = "0.8.4.0";
-       sha256 = "16inmr2hp2racg85crrpwd45p1wgjhcp7w242nixc8dlwdy1lkz3";
+       sha256 = "e34f1a7ce3b421d6a31544f07319948f875b48e3376756d0632a8b0b45ae369a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34357,7 +34454,7 @@ self: {
      mkDerivation {
        pname = "colchis";
        version = "0.2.0.3";
-       sha256 = "1fhamxm740r59q0sazs2np1b8hv74dhhbb4ah73m94im96729rbb";
+       sha256 = "6be5248e49359254c7818aac0561236743b4c2b5427fa5014e2503726aaf0aba";
        libraryHaskellDepends = [
          aeson base conceit network network-simple pipes pipes-aeson
          pipes-attoparsec pipes-network text transformers
@@ -34374,7 +34471,7 @@ self: {
      mkDerivation {
        pname = "collada-output";
        version = "0.6";
-       sha256 = "1k6k2ljz9x06j0nrpbbpcgd3axamf3cgr6jyslam0xkgxzsi7w7x";
+       sha256 = "fdf013f5ef6f765015d55e9afcd870557535da6377ad9b2d9006f4f42515d3cc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34393,7 +34490,7 @@ self: {
      mkDerivation {
        pname = "collada-types";
        version = "0.3";
-       sha256 = "0aw1y3ylcnpj3wwh6w8168a4mmkiayav6swyh2fq3vfjlds91xc8";
+       sha256 = "88f59074a3d2ed819d809e6bb3955771d64a1432017103391ff25a46fdf0812b";
        libraryHaskellDepends = [
          base containers enumerable OpenGL tuple tuple-gen vector
        ];
@@ -34408,7 +34505,7 @@ self: {
      mkDerivation {
        pname = "collapse-util";
        version = "0.1.0.1";
-       sha256 = "02r4cz92wjm3hcih8jf5jvimw3ijwbp4x7iw90rkj05360ajikj7";
+       sha256 = "47ce281530a3003933483c9e4eeee2320e5ee396c549042383a34a2ed267240b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -34423,7 +34520,7 @@ self: {
      mkDerivation {
        pname = "collection-json";
        version = "0.1.0.0";
-       sha256 = "1nzpa791s04r3qikn329r67a64gl9rnk389bk3blijx6q2r9xacc";
+       sha256 = "8ca99eb2c0a6cb48d7982ba1316d4ef411a38ec9490c3b231e99001dd251f7db";
        libraryHaskellDepends = [ aeson base bytestring text ];
        jailbreak = true;
        homepage = "https://github.com/danchoi/collection-json.hs";
@@ -34436,7 +34533,7 @@ self: {
      mkDerivation {
        pname = "collections";
        version = "0.3.1.1";
-       sha256 = "0a5km8k2jwjv4gfd2vf0jiq3f9cw47dgz8f3lspmpx2b0g2pac7g";
+       sha256 = "ef3075c5034bf45bafa6c3a1ffda219c25377094c06dd1dc235b722926aab328";
        libraryHaskellDepends = [
          array base bytestring containers QuickCheck
        ];
@@ -34451,7 +34548,7 @@ self: {
      mkDerivation {
        pname = "collections-api";
        version = "1.0.0.0";
-       sha256 = "0vgw1spiv6wnk11j3y45d95r3axgr1sgksb5lilnxdjj2pn4gp5l";
+       sha256 = "b4dc47ec1552b66e69a465e9f974c8afab914b6a85f8214398969b1daf0efc6d";
        libraryHaskellDepends = [ array base QuickCheck ];
        homepage = "http://code.haskell.org/collections/";
        description = "API for collection data structures";
@@ -34466,7 +34563,7 @@ self: {
      mkDerivation {
        pname = "collections-base-instances";
        version = "1.0.0.0";
-       sha256 = "0nw6wpzqsj33pnffsflc6ipjcx6lknzdnxgn4rm3vhrl5y9rgpzk";
+       sha256 = "f3df97932f34c33d6a26f675dbbe9dd474266f348c3aed9cbd63488dffe5865b";
        libraryHaskellDepends = [
          array base bytestring collections-api containers
        ];
@@ -34481,7 +34578,7 @@ self: {
      mkDerivation {
        pname = "colock";
        version = "0.2.2";
-       sha256 = "0h3y5c3c3711k2glmnydc1rlz9ff73iibcc8vf0zjzvvw9rz0xb1";
+       sha256 = "6175f073e27b7ff981db88b115e338cea54f7360cddb4a9f98219cc1062b7e40";
        libraryHaskellDepends = [ base unix ];
        description = "thread-friendly file locks that don't block the entire program";
        license = "LGPL";
@@ -34492,7 +34589,7 @@ self: {
      mkDerivation {
        pname = "colorize-haskell";
        version = "1.0.1";
-       sha256 = "1v4spa6vw9igjpd1dr595z5raz5fr8f485q5w9imrv8spms46xh3";
+       sha256 = "03764374bd1aed5c63e20517441ccaae7c95cb2fa9e416da952f26be8dba9aec";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base haskell-lexer ];
@@ -34507,7 +34604,7 @@ self: {
      mkDerivation {
        pname = "colors";
        version = "0.3.0.2";
-       sha256 = "0gbdqn5wrh9711j5hs5ypbd3w7a3mh37g6aadqiq4m5n7jna6phm";
+       sha256 = "155ea3ac3cb65482236e4a997706ac431d3edababe6858640827c1cc8bc56d3d";
        revision = "1";
        editedCabalFile = "b49946d81e0089d4d80191523839f934802975ede3b9fd9521ead9e591142560";
        libraryHaskellDepends = [ base lens linear profunctors ];
@@ -34521,7 +34618,7 @@ self: {
      mkDerivation {
        pname = "colour";
        version = "2.3.3";
-       sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd";
+       sha256 = "8d15a63494f8e2a06fe6dc38baee8e948adfae0e93749b9e3ce0fd8ece09b6e2";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.haskell.org/haskellwiki/Colour";
        description = "A model for human colour/color perception";
@@ -34535,7 +34632,7 @@ self: {
      mkDerivation {
        pname = "coltrane";
        version = "0.1.0.0";
-       sha256 = "131arfizyniapjvc9ds6l90z7gig98imhm17k1vza5wvgjqbb5fa";
+       sha256 = "ca95b5b07c9b17f57798275458234a2fbef341a246b7c4b6bc2a5affa3cb2a8c";
        libraryHaskellDepends = [
          base bytestring HTTP http-types HUnit mtl regex-compat text wai
          wai-extra warp
@@ -34552,7 +34649,7 @@ self: {
      mkDerivation {
        pname = "com";
        version = "1.2.3.1";
-       sha256 = "1y6zm63jyigf631f2b0bqw1yhmr6hifaspqivy7qy30brmr5a27m";
+       sha256 = "f5085572cd0b0c8f8fdf115fad5c842657e803c70b2ce1c230ee452f87a9dff8";
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34563,7 +34660,7 @@ self: {
      mkDerivation {
        pname = "combinat";
        version = "0.2.7.0";
-       sha256 = "1rch5pk0sggmdr2wmqys5i5p1cjyqdymrngjf8a2721q6nycfjjz";
+       sha256 = "5f4ac7bc353888231472f2d95c7dc35eb2704b2cdae3ca456ef53d0de62d90e5";
        libraryHaskellDepends = [
          array base containers random transformers
        ];
@@ -34580,7 +34677,7 @@ self: {
      mkDerivation {
        pname = "combinat-diagrams";
        version = "0.1";
-       sha256 = "1m7b0qf583jgi65vg6lxvypvjal74p83iir03ma7cfrgw5s5mw2q";
+       sha256 = "58f05a74e12f3b76541d20c738d025872ab9afdf9d9ab78b894f0e541c06ebd4";
        libraryHaskellDepends = [
          array base colour combinat containers diagrams-core diagrams-lib
          transformers vector-space
@@ -34598,7 +34695,7 @@ self: {
      mkDerivation {
        pname = "combinator-interactive";
        version = "0.1.2";
-       sha256 = "0yxdy413pj6ah4d5qcpajbphfg02p0gxgs1x9salfa18fyflljc4";
+       sha256 = "84494a9d77282847954e3de8d71fb8023c07ef92ea325c1a81cac83b02f1ad7b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34622,7 +34719,7 @@ self: {
      mkDerivation {
        pname = "combinatorial-problems";
        version = "0.0.5";
-       sha256 = "1k3isi62i66xbisn48b018w7fcfhwwng1f64ca530qkk600fg850";
+       sha256 = "a0a0e700307362308a62c4b8f02ce7d03177380a602162755cdd98284cd471cc";
        libraryHaskellDepends = [
          array base bytestring bytestring-lexing containers parsec random
        ];
@@ -34637,7 +34734,7 @@ self: {
      mkDerivation {
        pname = "combinatorics";
        version = "0.1.0";
-       sha256 = "101b3lycfav6wqdqjhs0v93vgy4g3pfn5xyimip0x3alq0q2ix9a";
+       sha256 = "2af52830c0548d0e6eacd1f762dd1d8ff8b747da4043891be6662bc73c1d2b80";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Efficient computation of common combinatoric functions";
@@ -34651,7 +34748,7 @@ self: {
      mkDerivation {
        pname = "combobuffer";
        version = "0.2";
-       sha256 = "1zsdi9c9my6nrxpqqsy584swp4zg8lckrymfig1ywisbdfzb8rjh";
+       sha256 = "5066b4be6b4b47eec38baefa3c1945ef93cb3541c56b8c6fcfd6f89a588a4dff";
        libraryHaskellDepends = [
          base containers template-haskell vector vector-space
        ];
@@ -34666,7 +34763,7 @@ self: {
      mkDerivation {
        pname = "command";
        version = "0.1.1";
-       sha256 = "0qj6i5r1iz3d8visqpd74xwkribxzs4p66b1vgp0i3jiqgfrn2hw";
+       sha256 = "1c0a9bddc3518e08eedb61197389fe7dc53c7927a75dace3466dfc1872894662";
        libraryHaskellDepends = [ base deepseq process ];
        homepage = "https://github.com/nh2/command";
        description = "Conveniently run shell commands";
@@ -34680,7 +34777,7 @@ self: {
      mkDerivation {
        pname = "command-qq";
        version = "0.3.0.0";
-       sha256 = "1bqfb4gc5ja9d9jygijqpf6014bmfcxnsvpv7c5n4f1z2aj07jy5";
+       sha256 = "c5cb03a4123f38620b3bfb6e6d3b737591008cbb58c6e7656a49c9c21e590eaf";
        libraryHaskellDepends = [ base process template-haskell text ];
        testHaskellDepends = [ base doctest hspec template-haskell text ];
        homepage = "http://biegunka.github.io/command-qq/";
@@ -34697,7 +34794,7 @@ self: {
      mkDerivation {
        pname = "commodities";
        version = "0.2.0";
-       sha256 = "0xf2vp7wb3qkxkrcwhcqpqfzg9345ws890rkmibvcd21jnczhg89";
+       sha256 = "093df899954134b657ac338384342f64a4f71dbe9841cef2ec138fc5cfddc275";
        libraryHaskellDepends = [
          base comonad containers distributive keys lens linear mtl numbers
          PSQueue semigroupoids semigroups text thyme transformers
@@ -34719,7 +34816,7 @@ self: {
      mkDerivation {
        pname = "commsec";
        version = "0.3.5";
-       sha256 = "1lshp876qm29370mpa3bh0gijcv317sf1y8vajixzz1083bkpngm";
+       sha256 = "f5d93bd74020fcdfa3541bf9e0f4096333191f806ba85bc11949546c0eba50d3";
        libraryHaskellDepends = [
          base bytestring cipher-aes128 crypto-api network
        ];
@@ -34736,7 +34833,7 @@ self: {
      mkDerivation {
        pname = "commsec-keyexchange";
        version = "0.3.3";
-       sha256 = "1c207fv429frkyb742n0r1z0kkvlwnkcxblfkrjm1lwqfkdx0prn";
+       sha256 = "365fd0db7498d350659e8eaecea6e574cf097ec8c00a72969fd92541b63b40b0";
        libraryHaskellDepends = [
          base bytestring cereal cipher-aes128 commsec crypto-api
          crypto-pubkey-types cryptohash-cryptoapi DRBG monadcryptorandom
@@ -34748,6 +34845,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "commutative" = callPackage
+    ({ mkDerivation, base, QuickCheck, quickcheck-instances, random
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "commutative";
+       version = "0.0.1.1";
+       sha256 = "b704a7b2dd4c39929f1aec71cf2a6f10d5c4f18842a60e49d9976cfffa4ec43b";
+       libraryHaskellDepends = [ base random semigroups ];
+       testHaskellDepends = [
+         base QuickCheck quickcheck-instances tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       description = "Commutative binary operations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "comonad" = callPackage
     ({ mkDerivation, base, containers, contravariant, directory
      , distributive, doctest, filepath, semigroups, tagged, transformers
@@ -34756,7 +34870,7 @@ self: {
      mkDerivation {
        pname = "comonad";
        version = "4.2.7.2";
-       sha256 = "0arvbaxgkawzdp38hh53akkahjg2aa3kj2b4ns0ni8a5ylg2cqmp";
+       sha256 = "b762261ef545a16881b66409398752e249a8e654a34088c66d9fabf9ba5a3b2b";
        libraryHaskellDepends = [
          base containers contravariant distributive semigroups tagged
          transformers transformers-compat
@@ -34774,7 +34888,7 @@ self: {
      mkDerivation {
        pname = "comonad-extras";
        version = "4.0";
-       sha256 = "0irlx6rbp0cq5njxssm5a21mv7v5yccchfpn7h9hzr9fgyaxsr62";
+       sha256 = "c264dd957f2ee50f133cf63ac818f3659f5d8350a56adda52d9881bbb2e93447";
        libraryHaskellDepends = [
          array base comonad containers distributive semigroupoids
          transformers
@@ -34791,7 +34905,7 @@ self: {
      mkDerivation {
        pname = "comonad-random";
        version = "0.1.2";
-       sha256 = "11jak28rpnnaswrlf2wgn91v096zkz1laq2cdhjfc7abgmkx9gay";
+       sha256 = "5ebdd4677d4b1de6246c4c6045c39fdf24b043b28f0b4733d7cada9b91984a86";
        libraryHaskellDepends = [ base category-extras random ];
        jailbreak = true;
        description = "Comonadic interface for random values";
@@ -34804,7 +34918,7 @@ self: {
      mkDerivation {
        pname = "comonad-transformers";
        version = "4.0";
-       sha256 = "13zzp6r6s6c80skniphwvzxhpazbyal5854m53139kgcw560rv6z";
+       sha256 = "dfec0c4ce1eccd34c228951454a8f2ebab0bfbdf1cde68a70688196db2b9ff8f";
        libraryHaskellDepends = [ base comonad ];
        homepage = "http://github.com/ekmett/comonad-transformers/";
        description = "This package has been merged into comonad 4.0";
@@ -34816,7 +34930,7 @@ self: {
      mkDerivation {
        pname = "comonads-fd";
        version = "4.0";
-       sha256 = "19xpv0dsz7w3a1sq1gdxwzglfal45vj2s22zb12g9mpk5rp3hw1s";
+       sha256 = "3a70386e2ef3d6f444585f082de42e842a47dfe7bdbd807550839faf1bd8b7a7";
        libraryHaskellDepends = [ base comonad ];
        homepage = "http://github.com/ekmett/comonads-fd/";
        description = "This package has been merged into comonad 4.0";
@@ -34828,7 +34942,7 @@ self: {
      mkDerivation {
        pname = "compact-map";
        version = "2008.11.9";
-       sha256 = "0rk2g5swblbbairwabv5azp6a7cjqywhv49prm1rz8mc361dd9by";
+       sha256 = "7ea5d68219aca29f43cd37910db9c7921d65ee57652fc573546bd1c575796266";
        libraryHaskellDepends = [
          array base binary bytestring containers
        ];
@@ -34842,7 +34956,7 @@ self: {
      mkDerivation {
        pname = "compact-string";
        version = "0.3.1";
-       sha256 = "02lqxl82jmw276mzxwsc0gmps1kb5i62im85bpjvzqwycbf3gnj8";
+       sha256 = "48da37dc629ee3bfe55d05d5284c2c6b067deb034cf3feab3982572910ed980a";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://twan.home.fmf.nl/compact-string/";
        description = "Fast, packed and strict strings with Unicode support, based on bytestrings";
@@ -34855,7 +34969,7 @@ self: {
      mkDerivation {
        pname = "compact-string-fix";
        version = "0.3.2";
-       sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n";
+       sha256 = "f620377ff715dfc740cf48f5af82afb4b2afaca9e7bf76ef397ee39c2b053f98";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://twan.home.fmf.nl/compact-string/";
        description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
@@ -34867,7 +34981,7 @@ self: {
      mkDerivation {
        pname = "compare-type";
        version = "0.1.1";
-       sha256 = "1s6p3ni8pqxbp08ci4w6y646wrh60s0g34figrwdcqrywscyicsb";
+       sha256 = "4bb3e899e63e63d6787ed191f1800606666e88f18693c810b8abe38ba21dd7e8";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Kinokkory/compare-type";
        description = "compare types of any kinds in haskell";
@@ -34883,7 +34997,7 @@ self: {
      mkDerivation {
        pname = "compdata";
        version = "0.10";
-       sha256 = "1538jdaww57vil32hvd6s13lfiwkczpjgym07ipwccw06cj49l8h";
+       sha256 = "10d14424338033c66f3ca0fa27ef6793474747d0a66d28068dfb14ce55936894";
        revision = "1";
        editedCabalFile = "09ef1d8f84ae93c4f212661d411542155b0da1c8202e8bf10bfc18d69001a82e";
        libraryHaskellDepends = [
@@ -34904,7 +35018,7 @@ self: {
      mkDerivation {
        pname = "compdata-automata";
        version = "0.9";
-       sha256 = "1hlv6a4ywlnr86pzrlffqbg55mfkrkkxn2yir6a28bdirgi69fkf";
+       sha256 = "6eba64e2cbb12d2494c9d10bdbe7ccd3d552dec2ced1fcaf41d952ee89329bc2";
        revision = "1";
        editedCabalFile = "f8bda15b8d1d1e56f64c37f39ac8ba1c7bf860c291adad3698041eee68146130";
        libraryHaskellDepends = [ base compdata containers projection ];
@@ -34921,7 +35035,7 @@ self: {
      mkDerivation {
        pname = "compdata-dags";
        version = "0.2";
-       sha256 = "0z5vjfm0c4bcixnh951mzc06977l3lcs0v8mz6pbn65qbvv0d27c";
+       sha256 = "ec8806f65eb818bbaef9156da0191df49c6400fb3594046d8f6c1106aa93bb7c";
        libraryHaskellDepends = [
          base compdata containers mtl unordered-containers vector
        ];
@@ -34943,7 +35057,7 @@ self: {
      mkDerivation {
        pname = "compdata-param";
        version = "0.9";
-       sha256 = "1b7kdg4g1mqpzy10wdxm90mbjfwmfpprkbb52ba9qbcg7scap4i4";
+       sha256 = "2492ab983e8f2d9cd41265ad99ef75953bb92a48b5370e82ff17d7f0c86bf3ac";
        libraryHaskellDepends = [
          base compdata mtl template-haskell transformers
        ];
@@ -34964,7 +35078,7 @@ self: {
      mkDerivation {
        pname = "compensated";
        version = "0.6.1";
-       sha256 = "026gq3ppk3id4bvkn3pdg6ljbl14gd8p4hg6i0rc13138b0mlxnh";
+       sha256 = "d0765ac142238cc03288e64172517b24d025a979ed0e3bf7222d8e79efc0cf08";
        libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad deepseq distributive
          generic-deriving hashable lens log-domain safecopy semigroupoids
@@ -34985,7 +35099,7 @@ self: {
      mkDerivation {
        pname = "competition";
        version = "0.2.0.0";
-       sha256 = "07c6b6yai8x9i8qndimzmyp5bzhwckis8kg207n152gnskk7i3zn";
+       sha256 = "f68f78e6d4f68912ec01e24da4e3641cfe55aeafbfc666318aa9a3a8bc59861d";
        libraryHaskellDepends = [ base filepath parsec ];
        jailbreak = true;
        homepage = "github.com/yanatan16/haskell-competition";
@@ -34998,7 +35112,7 @@ self: {
      mkDerivation {
        pname = "compilation";
        version = "0.0.0.3";
-       sha256 = "0a1pp1jafra1agsx2jizdb33afzg02w6jh4a4pyw5w71kzqfrril";
+       sha256 = "34e6ecf09fe1f0c2fd258a4069b800ef3b35c66a3f4ad1f5534165a764b83728";
        libraryHaskellDepends = [ base MissingH ];
        description = "Haskell functionality for quickly assembling simple compilers";
        license = stdenv.lib.licenses.gpl3;
@@ -35010,7 +35124,7 @@ self: {
      mkDerivation {
        pname = "complex-generic";
        version = "0.1.1";
-       sha256 = "15lqcwg3jp1whf086mlx9f5jv6sbkn53jrilhapalgcgs07nf8ll";
+       sha256 = "9422670fd08f3daaae823466398a9d4b9b2d8b4b9d568380833c5c391e679896";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://gitorious.org/complex-generic";
        description = "complex numbers with non-mandatory RealFloat";
@@ -35022,7 +35136,7 @@ self: {
      mkDerivation {
        pname = "complex-integrate";
        version = "1.0.0";
-       sha256 = "0q0ffpqir4f2ch7d7p2fxgb73n7dg7xf19rg78an7i7zdl430cfj";
+       sha256 = "d23130086dffc463153a2fa7e0fa79edd871d6eb4edcd30e64c2911cf1750e60";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/hijarian/complex-integrate";
        description = "A simple integration function to integrate a complex-valued complex functions";
@@ -35036,7 +35150,7 @@ self: {
      mkDerivation {
        pname = "complexity";
        version = "0.1.3";
-       sha256 = "16crk93qyh0arcgqq2bx0i61cah2yhm8wwdr6sasma8y5hlw76lj";
+       sha256 = "929ac3292c1ea9aa9536b9718e2af4022a164c047d098c1fcb0a408f479a9999";
        libraryHaskellDepends = [
          base Chart colour data-accessor hstats parallel pretty time
          transformers
@@ -35052,7 +35166,7 @@ self: {
      mkDerivation {
        pname = "compose-trans";
        version = "0.1";
-       sha256 = "0p2fd0knfbfjk4s0aalzrsrzpxffrykmaprxyakbgs1lmp4jyq9z";
+       sha256 = "3f612fc9ad34e8b7a6f23d5f55a7cfcef5fbb3ce9f2a053499d22d6727684e5c";
        libraryHaskellDepends = [ base mtl ];
        description = "Composable monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -35064,7 +35178,7 @@ self: {
      mkDerivation {
        pname = "composition";
        version = "1.0.1.1";
-       sha256 = "112ypxszskri2skj0qbf2a13j2kqnz2pbsrkyja32gs37ln7ca1p";
+       sha256 = "3728762c3d433f3194f433eb75c5b7780a3982126e6120a716314ffd75bf5e84";
        description = "Combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35074,7 +35188,7 @@ self: {
      mkDerivation {
        pname = "composition-extra";
        version = "1.1.0";
-       sha256 = "1mkm0m08g9q6d8vfz33kj5lz0gnwlkmsnj4r5ar4p3slf2kaybz1";
+       sha256 = "e12fafa670548f4bb22a9948abeba4dc3ef06991738cef366a06a787400575d6";
        libraryHaskellDepends = [ base contravariant ];
        description = "Combinators for unorthodox structure composition";
        license = stdenv.lib.licenses.bsd3;
@@ -35088,7 +35202,7 @@ self: {
      mkDerivation {
        pname = "compressed";
        version = "3.10";
-       sha256 = "1y290n421knfh8k8zbcabhw24hb13xj9pkxx4h4v15yji97p5mcw";
+       sha256 = "9cd5724f8ad297b00924bdcf9b641f614122385c8aad8f2682cece20880549f8";
        revision = "1";
        editedCabalFile = "0ab968cb9d6a6da40cb91befc6051d91b77039f8f64442eecf7a61bd508f61bb";
        libraryHaskellDepends = [
@@ -35105,7 +35219,7 @@ self: {
      mkDerivation {
        pname = "compression";
        version = "0.1";
-       sha256 = "0cy7851i7dvn5aphg649jr3wmw9x57s29adk7qv0mvwz99fb4cpr";
+       sha256 = "f932b25c4a9fef0a363eb3a924f4293df1ca4796899807af2a76b7134341c733";
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://urchin.earth.li/~ian/cabal/compression/";
        description = "Common compression algorithms";
@@ -35120,7 +35234,7 @@ self: {
      mkDerivation {
        pname = "compstrat";
        version = "0.1.0.2";
-       sha256 = "1jdxvyqkszwkry3vly65nh80519cpfw4ghzg1lsbnhyrbhvlchkg";
+       sha256 = "6f4246375cd943bb340defc347b8bb2c850210b4c578ba87cf937f3db1dfbdc9";
        libraryHaskellDepends = [
          base compdata mtl template-haskell th-expand-syns transformers
        ];
@@ -35138,7 +35252,7 @@ self: {
      mkDerivation {
        pname = "comptrans";
        version = "0.1.0.5";
-       sha256 = "05r07900bniy1gazvgj3wj4g07j33h493885bhh7gq1n1xilqgkm";
+       sha256 = "753e4c630f36e077205c05a191081c431ef088e443befdd50b3eda05403a2017";
        libraryHaskellDepends = [
          base compdata containers deepseq deepseq-generics ghc-prim lens
          template-haskell th-expand-syns
@@ -35157,7 +35271,7 @@ self: {
      mkDerivation {
        pname = "computational-algebra";
        version = "0.3.0.0";
-       sha256 = "09ljbspgwpg4g0fca8j10qmbc7194cjhv0l6svz2qr6zzhmb3l4x";
+       sha256 = "9dd0b12afcdf642cfed686820d2523291cb62a064122c51c78e45dfeae5e9226";
        libraryHaskellDepends = [
          algebra base containers equational-reasoning heaps lens monad-loops
          monomorphic peggy singletons sized-vector tagged type-natural
@@ -35174,7 +35288,7 @@ self: {
      mkDerivation {
        pname = "computations";
        version = "0.0.0.0";
-       sha256 = "1kyg3dmgq5z0217rxgljs3x7x3xvcdly2aqj2ky4h4kbw1h0r260";
+       sha256 = "c0880c60e06b1248fc14122be16963bb8f7efad092be9e4f10e017fc6a1bcfcf";
        libraryHaskellDepends = [ base ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/computations";
        description = "Advanced notions of computation";
@@ -35186,7 +35300,7 @@ self: {
      mkDerivation {
        pname = "concatenative";
        version = "1.0.1";
-       sha256 = "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd";
+       sha256 = "ed5997924518f0ca6b8afcd4e1ee10d30675bb4c4ba164a4d70b4ddbd8c6bc17";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty";
        description = "A library for postfix control flow";
@@ -35200,7 +35314,7 @@ self: {
      mkDerivation {
        pname = "conceit";
        version = "0.3.2.0";
-       sha256 = "16pj90dnjn5v16ym2gglx895c9lc5qhrry4wydqyn4f0j7rm6drg";
+       sha256 = "2f3753f391c011eb71f39cf89c212e8c265612eaf43d51bd09bb58691b48f29a";
        libraryHaskellDepends = [
          base bifunctors exceptions mtl semigroupoids transformers void
        ];
@@ -35213,7 +35327,7 @@ self: {
      mkDerivation {
        pname = "concorde";
        version = "0.1";
-       sha256 = "0903lrj6bzajjdr01hbld1jm6vf7assn84hqk4kgrrs1mr3ykc20";
+       sha256 = "40b0e947ae41e7fc2699181264b556c76d53656874c100729352fd6564a60324";
        libraryHaskellDepends = [ base containers process safe temporary ];
        description = "Simple interface to the Concorde solver for the Traveling Salesperson Problem";
        license = stdenv.lib.licenses.bsd3;
@@ -35229,7 +35343,7 @@ self: {
      mkDerivation {
        pname = "concraft";
        version = "0.9.4";
-       sha256 = "17q7mhf0n9pnxhvwk3yy61ljfifz8nhld1xhhnn13fldq34663q3";
+       sha256 = "030f63c8c08dba11ac85b08746a145df45276930de8fc937ecf6260b1cac079f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35253,7 +35367,7 @@ self: {
      mkDerivation {
        pname = "concraft-hr";
        version = "0.1.0.2";
-       sha256 = "0q2l2yqxk210ycw1alcps9x7l2f60g9sb0wan7d1d2fkbfhq3z41";
+       sha256 = "81fc81a15bd38916dab18a83a5d303c6097a7ad297511538f32088d9b1175460";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35276,7 +35390,7 @@ self: {
      mkDerivation {
        pname = "concraft-pl";
        version = "0.7.4";
-       sha256 = "0yhq3vdg7l0ibhv0pxj70jm5lrfjk3k0xd1p6ap6im4rh3xxvgw3";
+       sha256 = "83bfddfb8099d468ae3237b40ee698d2655aaa0447f60b365c11d0f3da1e187a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35298,7 +35412,7 @@ self: {
      mkDerivation {
        pname = "concrete-relaxng-parser";
        version = "0.1.1";
-       sha256 = "1w4bg284fcnd15yg7097d8sh0rzxr76zlrr1bfj2dksw8ddy3jda";
+       sha256 = "aac9e15b435ccf26a45b2167facdc9fd6700356a2781f37c09cd324790788bf0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -35316,7 +35430,7 @@ self: {
      mkDerivation {
        pname = "concrete-typerep";
        version = "0.1.0.2";
-       sha256 = "07wy8drg4723zdy2172jrcvd5ir2c4ggcfz1n33jhm9iv3cl2app";
+       sha256 = "f72a41d9d8315528c7b0e13bf61e6122c7d236cb529c207cfb431cf272439e1f";
        revision = "1";
        editedCabalFile = "cdcd034ff6ff0e8cf9313f312294e12494f3f021c4bf562b9c1365b91715ff4e";
        libraryHaskellDepends = [ base binary hashable ];
@@ -35335,7 +35449,7 @@ self: {
      mkDerivation {
        pname = "concurrent-barrier";
        version = "0.1.2";
-       sha256 = "13idx7w5k8rk3qqls3yn9xqwk116xsqb36ya3vxkb5x4q4vix3mv";
+       sha256 = "bb8e1e37c1a49735fb1eca9bb1b0ee2684c9714fd60f4d311e33a359f8e92d8e";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jsgf/concurrent-barrier";
        description = "Simple thread barriers";
@@ -35349,7 +35463,7 @@ self: {
      mkDerivation {
        pname = "concurrent-dns-cache";
        version = "0.0.1";
-       sha256 = "0awba7ar4iky211psq5d44snd5j75ddvl6klalriic4i5w41dhv2";
+       sha256 = "62c316082f91b0183355741aba5b2b4796663521ad607d43107e4692d5518b2b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35372,7 +35486,7 @@ self: {
      mkDerivation {
        pname = "concurrent-extra";
        version = "0.7.0.9";
-       sha256 = "19bqm0brnbhhmp5nypi995p27mna7kd33xzw0kf7yx2w2p2kb1aw";
+       sha256 = "5c8535c5155c747fdc04fcf731da3ccad6236e49295e6fcbad102e9b17a878a5";
        libraryHaskellDepends = [ base stm unbounded-delays ];
        testHaskellDepends = [
          async base HUnit random stm test-framework test-framework-hunit
@@ -35391,7 +35505,7 @@ self: {
      mkDerivation {
        pname = "concurrent-machines";
        version = "0.1.0.0";
-       sha256 = "1rlxb9cjzjfzj3xj3m6cab3h6pqazi850lkglc6palamn6yd2vw4";
+       sha256 = "846fd1bcb15551750da36f525050fc0a5f03c752ccd421fb90dfc92f595a9de6";
        libraryHaskellDepends = [
          async base containers lifted-async machines monad-control
          semigroups time transformers transformers-base
@@ -35408,7 +35522,7 @@ self: {
      mkDerivation {
        pname = "concurrent-sa";
        version = "1.0.1";
-       sha256 = "1szvw0vih5jx2hvgb3h7mqh05im3pw687h7dshiy4ii5vs9pi6d6";
+       sha256 = "a6997893de2546e223d4edc0830cbfa3c60220ae078ef536145d161837e0fbeb";
        libraryHaskellDepends = [ base MonadRandom ];
        description = "Concurrent simulated annealing system";
        license = stdenv.lib.licenses.bsd3;
@@ -35419,7 +35533,7 @@ self: {
      mkDerivation {
        pname = "concurrent-split";
        version = "0.0.0.1";
-       sha256 = "0xriw08w70dj4gji4afa034q9vcgwymjw2j6gx1x7fwdpi04lzsb";
+       sha256 = "4b7f4a40bc8dbbd3437f460a2eabe78fed84c900ca2912e523b281c311e03177";
        libraryHaskellDepends = [ base ];
        description = "MVars and Channels with distinguished input and output side";
        license = stdenv.lib.licenses.bsd3;
@@ -35430,7 +35544,7 @@ self: {
      mkDerivation {
        pname = "concurrent-state";
        version = "0.6.0.0";
-       sha256 = "0b9lndzqm451j9wv2694gjd9w9j2vmhp32j57fqnq43pq8a1h1z6";
+       sha256 = "e6071814c277106cb13b458a7161dd42269e9a7c2419b17992a1908a7fb3342d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base exceptions mtl stm transformers ];
@@ -35446,7 +35560,7 @@ self: {
      mkDerivation {
        pname = "concurrent-supply";
        version = "0.1.7.1";
-       sha256 = "050d1k4hvjjyap3w8spcx57lagnh77z131jbgsndpc9mjx8r4l5y";
+       sha256 = "be5092519735b1dbac7e4b8611fe39d03e454fe9ec6ac4c7555eca0dc90c0d14";
        libraryHaskellDepends = [ base ghc-prim hashable ];
        testHaskellDepends = [ base containers ];
        homepage = "http://github.com/ekmett/concurrent-supply/";
@@ -35459,7 +35573,7 @@ self: {
      mkDerivation {
        pname = "concurrentoutput";
        version = "0.2.0.2";
-       sha256 = "0fd372awmxrngbcb2phyzy3az9j2327kdhjnm7c5mm808vix67a8";
+       sha256 = "481dd3e34600d55ad8a956c2368f1842a6af86ff1e5eb1d87a36f7ca9538a339";
        libraryHaskellDepends = [ base ];
        description = "Ungarble output from several threads";
        license = stdenv.lib.licenses.bsd3;
@@ -35470,7 +35584,7 @@ self: {
      mkDerivation {
        pname = "cond";
        version = "0.4.1.1";
-       sha256 = "12xcjxli1scd4asr4zc77i5q9qka2100gx97hv3vv12l7gj7d703";
+       sha256 = "039c76e43b5484bdc78627f50740106ae2844b3c877d92b5228de9106997ac8b";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kallisti-dev/cond";
        description = "Basic conditional and boolean operators with monadic variants";
@@ -35484,7 +35598,7 @@ self: {
      mkDerivation {
        pname = "condor";
        version = "0.3";
-       sha256 = "0ahikfb6h2clkx3pi6a7gyp39jhv2am98vyyaknyd1nvfvxl96x7";
+       sha256 = "a79b44fb76db86e6ed54de6f94aa121bca34ae7f479978479f940968969b112a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base binary containers glider-nlp text ];
@@ -35506,7 +35620,7 @@ self: {
      mkDerivation {
        pname = "condorcet";
        version = "0.0.1";
-       sha256 = "1raf8mrnfnn90ymcnyhqf1kzb9mpfsk83qlmajibjd8n94iq76nd";
+       sha256 = "cd9a8323491635b9a25495e281a676b7a6f56770187acbaa07c95a6773454ee5";
        libraryHaskellDepends = [ array base ];
        homepage = "http://neugierig.org/software/darcs/condorcet";
        description = "Library for Condorcet voting";
@@ -35519,7 +35633,7 @@ self: {
      mkDerivation {
        pname = "conductive-base";
        version = "0.3";
-       sha256 = "1jdslfnwyh7l10xhk9i0293p0qnw0xsd70d5xgpc6xlijhrsg8wp";
+       sha256 = "97a3a733949176c3eeeba581d37407dc6270471220a6093b08f440cfada3bac9";
        libraryHaskellDepends = [ array base containers random stm time ];
        homepage = "http://www.renickbell.net/doku.php?id=conductive-base";
        description = "a library for live coding and real-time musical applications";
@@ -35531,7 +35645,7 @@ self: {
      mkDerivation {
        pname = "conductive-clock";
        version = "0.2";
-       sha256 = "1plml14h5d31jr3bvjjgaxcdqssxqfwwnbz9c5gvjlds6lla145p";
+       sha256 = "b790a02835ba51b95f61e92fcbb9c35d6bdc58574fcabd469661b40249a095de";
        homepage = "http://www.renickbell.net/doku.php?id=conductive-clock";
        description = "a library for displaying musical time in a terminal-based clock";
        license = stdenv.lib.licenses.gpl3;
@@ -35545,7 +35659,7 @@ self: {
      mkDerivation {
        pname = "conductive-hsc3";
        version = "0.3.1";
-       sha256 = "1z037753mxkfqbqqrlkpg5a6z9afpjj16bfplsmbbx3r3vrxbkpa";
+       sha256 = "eaced5f31e79f4b5aaa6d72d13a4bc4ea56f547977d28cf1c26ef63aca3903fc";
        libraryHaskellDepends = [
          base conductive-base conductive-song containers directory filepath
          hosc hsc3 random
@@ -35562,7 +35676,7 @@ self: {
      mkDerivation {
        pname = "conductive-song";
        version = "0.2";
-       sha256 = "16bdsjv64fc3ydv230rja5q9rqzlr4vd9mh3jabiyahck44imrvi";
+       sha256 = "71e71a09990c2a1f979203d6d436c9f4e39c705132832176f3833962b6d46d99";
        libraryHaskellDepends = [ base conductive-base random ];
        homepage = "http://www.renickbell.net/doku.php?id=conductive-song";
        description = "a library of functions which are useful for composing music";
@@ -35577,7 +35691,7 @@ self: {
      mkDerivation {
        pname = "conduit";
        version = "1.2.4.1";
-       sha256 = "0g5rdcj0xbiz3x2pkmhwm67r9f0yncpnssv32s7k0w7qld46wri6";
+       sha256 = "26666e48a3f870308f16636b6d2fb31eb8948fa91cd679451f3fae0e246bb93c";
        libraryHaskellDepends = [
          base exceptions lifted-base mmorph mtl resourcet transformers
          transformers-base void
@@ -35599,7 +35713,7 @@ self: {
      mkDerivation {
        pname = "conduit";
        version = "1.2.5";
-       sha256 = "0iia5hc3rx813aayp839ixr377ajnrhfvpbjach266bk52scs05i";
+       sha256 = "b100cdb428731923205372dded60b6529d33728f69a0eb951a01f53c182c2a46";
        libraryHaskellDepends = [
          base exceptions lifted-base mmorph mtl resourcet transformers
          transformers-base
@@ -35618,7 +35732,7 @@ self: {
      mkDerivation {
        pname = "conduit-audio";
        version = "0.1";
-       sha256 = "1xmxnr7w8s3kmdv5h0y08rnp3sx5wvxqmkg1j7yjycp9z7hbmylb";
+       sha256 = "8bfabae0f9e9322ffd91e1cd8afbe6a5eb716d46c0035876ab7368c44fb6bdf6";
        revision = "1";
        editedCabalFile = "bf853ba8300deda982d278245bd268e91f444ca42185bd0d57eb9feae5ab066c";
        libraryHaskellDepends = [ base conduit vector ];
@@ -35634,7 +35748,7 @@ self: {
      mkDerivation {
        pname = "conduit-audio-lame";
        version = "0.1";
-       sha256 = "0i4nmb4yf2wlkl5da215ysj25gyaikfd292nc9gzmnxjgg1fx19w";
+       sha256 = "3c85eec27bb2dbfa5f625624d1dc8ccabf22a4f62508d50a9d940be7c9aa9644";
        revision = "1";
        editedCabalFile = "34e31416cde87ad1d75570612f3e95d8f54cbeac0539a6f85b93aebaf3979c1a";
        libraryHaskellDepends = [
@@ -35654,7 +35768,7 @@ self: {
      mkDerivation {
        pname = "conduit-audio-samplerate";
        version = "0.1";
-       sha256 = "04s5ld0nsgbjlgkj3f32xnwyah26m6j5qmjxycwgvxjp1siq2xsg";
+       sha256 = "4f7781a30e57f6fd38f35d565ca4a94640e5b9ed62b821e7a3723d6d41a34513";
        revision = "1";
        editedCabalFile = "c3601c344d95841d594827a61b1a7ad05042dec6f62ce9952e88b3d0fe814a63";
        libraryHaskellDepends = [
@@ -35674,7 +35788,7 @@ self: {
      mkDerivation {
        pname = "conduit-audio-sndfile";
        version = "0.1";
-       sha256 = "0v0vzc23c9wfc594pc91d3dw2sda26z1lrkdjjvf572771xysdbd";
+       sha256 = "6d35ed7b38479ce2b6946d661abe11aa69c1db6821b14b52618e273604fb1b6c";
        revision = "1";
        editedCabalFile = "f753b66e55fc5332463bc54a7077b9c503439cd03c7c1c799cd60751ab954a87";
        libraryHaskellDepends = [
@@ -35696,8 +35810,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-combinators";
-       version = "1.0.2";
-       sha256 = "1yfck6syqqi5zlp41n3qs8w5ljg63jhg25m8irrcks35n9i541j5";
+       version = "1.0.3";
+       sha256 = "29c1f3dd854d11212474692c6c3a4158ed2929e8443ff2878eee5ea1ed6700bf";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
          conduit conduit-extra filepath monad-control mono-traversable
@@ -35722,7 +35836,7 @@ self: {
      mkDerivation {
        pname = "conduit-connection";
        version = "0.1.0.1";
-       sha256 = "1z3i2s8xl02qb4wfnmqd92kzmbp2jb09msywnzgawyxs5aghy0n4";
+       sha256 = "c4020f9f2aba7baedeb7dceb9ac092e2aefaa7480d57eb38595800da911671fc";
        libraryHaskellDepends = [
          base bytestring conduit connection resourcet transformers
        ];
@@ -35744,7 +35858,7 @@ self: {
      mkDerivation {
        pname = "conduit-extra";
        version = "1.1.9.1";
-       sha256 = "18x01yll1jfv1p9kb7529k8gdh0lav4pbqcqkam2qr9jxxdy26rz";
+       sha256 = "3f1be15bef32652caa9a98e175c95614c0f6d04ca29c35d30ddbc940a90fa0a3";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring conduit directory filepath
          monad-control network primitive process resourcet stm
@@ -35767,7 +35881,7 @@ self: {
      mkDerivation {
        pname = "conduit-iconv";
        version = "0.1.1.0";
-       sha256 = "0bnak5dpqgdgybi62w1rbmr9brbcqv4i2v345x0m275gzsz0i84h";
+       sha256 = "90a008befeaf1c51412f646c11c9c66ce595725d397061e2f2af3d7c5b99ca2e";
        libraryHaskellDepends = [ base bytestring conduit ];
        testHaskellDepends = [
          base bytestring conduit mtl QuickCheck test-framework
@@ -35786,7 +35900,7 @@ self: {
      mkDerivation {
        pname = "conduit-network-stream";
        version = "0.2";
-       sha256 = "0ch0b23z7k4kxnbkvfd3gaxc7xrnlbjz7hv0pshp4k6xqg2bymv4";
+       sha256 = "6457bfc4c3dd4c72a1be60c3f3e5a236f7c3ba7aa3b93d97ed93ccf387580032";
        libraryHaskellDepends = [
          base bytestring conduit mtl network-conduit resourcet
        ];
@@ -35802,7 +35916,7 @@ self: {
      mkDerivation {
        pname = "conduit-parse";
        version = "0.1.0.0";
-       sha256 = "093qc82nrn8ziza1bfp4xnz8k0cpm39k868a3rq4dhah3s40gsv3";
+       sha256 = "63eb07881e50c146701e0a1934d3a8978189beede4ba15d48f1fd96c05627824";
        libraryHaskellDepends = [
          base conduit exceptions parsers text transformers
        ];
@@ -35821,7 +35935,7 @@ self: {
      mkDerivation {
        pname = "conduit-resumablesink";
        version = "0.1.1";
-       sha256 = "1bqdpnhqjh4dhvppsa8nlgja0jpdw48kxywz2999sp5hi53qxdfg";
+       sha256 = "cfb58e4789b05c9d52129ffb3e11e1ed4aa0e4a316297def868d4089a1bd0daf";
        libraryHaskellDepends = [ base conduit void ];
        testHaskellDepends = [
          base bytestring conduit hspec transformers void
@@ -35840,7 +35954,7 @@ self: {
      mkDerivation {
        pname = "conf";
        version = "0.1.1.0";
-       sha256 = "1mxrr14188ikizyxb06764qq1iwhnh19g150mz310q8yw6cypbfw";
+       sha256 = "dcadeb99e11e6110c6afa0849702b490c7803131c780d5fd8f33221448c8b9d7";
        libraryHaskellDepends = [ base haskell-src ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit test-framework-th
@@ -35855,7 +35969,7 @@ self: {
      mkDerivation {
        pname = "config-select";
        version = "0.0.1";
-       sha256 = "1b1fs42c5y5sixgag972m5hb6xwbwp1d64p0gadqg9mg1vknl34y";
+       sha256 = "9e0c6ae70eafa6879b7ae012d3c2e58b77b360a9e2a4a75e8fbaf8c204d12eac";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -35873,7 +35987,7 @@ self: {
      mkDerivation {
        pname = "config-value";
        version = "0.4.0.1";
-       sha256 = "0d9g6ih1rl0z4a2gf285f408vz7iysxwvw6kav280nvx99k2msb7";
+       sha256 = "67e92a664a7d5b80c456d3f0cdbbf6f1fc8d00710509f784221fd01c60342f35";
        libraryHaskellDepends = [ array base pretty text transformers ];
        libraryToolDepends = [ alex happy ];
        homepage = "https://github.com/glguy/config-value";
@@ -35890,7 +36004,7 @@ self: {
      mkDerivation {
        pname = "configifier";
        version = "0.0.5";
-       sha256 = "0k3r8i2mb06kvrqfln0birwd92bwx8m55wpahnbbzs35i35p60vz";
+       sha256 = "7f0373cb8865e8bf9685eaf2522aea7c89d4788e0b58ea70ded380554544794c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35915,7 +36029,7 @@ self: {
      mkDerivation {
        pname = "configuration";
        version = "0.1.1";
-       sha256 = "1jqc5xpbxrlnpxk2yci861gpxl5c9vm9lffchrpp1hk8ag5wkxk1";
+       sha256 = "61f6c9cb5368c2706f86cc399aea4eacd07e5f3028322f66bf96e6be6e2f0ccb";
        libraryHaskellDepends = [ base containers ];
        description = "Simple data type for application configuration";
        license = stdenv.lib.licenses.bsd3;
@@ -35934,7 +36048,7 @@ self: {
      mkDerivation {
        pname = "configuration-tools";
        version = "0.2.13";
-       sha256 = "0rhr5c91bk853zlgld2im0sm0pcss0q6g82c92p85vwkdgrgxlz2";
+       sha256 = "e2d3fef26b93ef82ae484ca06730d09a5d5035a85134fae81f05cd15122b1966";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base base-unicode-symbols
          base64-bytestring bytestring Cabal case-insensitive connection
@@ -35962,7 +36076,7 @@ self: {
      mkDerivation {
        pname = "configurator";
        version = "0.3.0.0";
-       sha256 = "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf";
+       sha256 = "6eb9996b672e9f7112ca23482c42fa533553312c3c13f38a8a06476e67c031b4";
        libraryHaskellDepends = [
          attoparsec base bytestring directory hashable text unix-compat
          unordered-containers
@@ -35983,7 +36097,7 @@ self: {
      mkDerivation {
        pname = "confsolve";
        version = "0.5.4";
-       sha256 = "0984gcahddrzlvzsfsrkr8i8jijjg7j2m5namfv8zhdlkrny8h11";
+       sha256 = "2140e46d9eb4c18fb6abca962ae47952468922ca336ba7ffa63fb706157b0425";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -36000,7 +36114,7 @@ self: {
      mkDerivation {
        pname = "congruence-relation";
        version = "0.1.0.0";
-       sha256 = "1pj4kby5pba1xfz2fvv2lij7h2i8crf3qkhgs3rp4ziay0jkg18v";
+       sha256 = "1b853725f02a7e72f3d00f4e3c5c66280a7864a4626f27beeb41ad5bfc9a44de";
        libraryHaskellDepends = [ array base containers ];
        jailbreak = true;
        description = "Decidable congruence relations for Haskell: up to you whether this is a joke";
@@ -36012,7 +36126,7 @@ self: {
      mkDerivation {
        pname = "conjugateGradient";
        version = "2.2";
-       sha256 = "1is3j61ra1whjpm8rq89yj9rscqj1ipgqlnh1nwvyzi2nggl06ya";
+       sha256 = "ca1b40dfb3227ebfb90dd052fc6e0c12339d93f409e18cea95900795839143c7";
        libraryHaskellDepends = [ base containers random ];
        homepage = "http://github.com/LeventErkok/conjugateGradient";
        description = "Sparse matrix linear-equation solver";
@@ -36027,7 +36141,7 @@ self: {
      mkDerivation {
        pname = "conjure";
        version = "0.1";
-       sha256 = "02a33940rnwq5bzqx50fjy76q0z6nimsg2fk3q17ai4kvi0rw0p3";
+       sha256 = "e3029e41dc934475021ed389a76bb4e6036c8e970e948eff2a98db0c481a4309";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36044,7 +36158,7 @@ self: {
      mkDerivation {
        pname = "conlogger";
        version = "0.1.0.1";
-       sha256 = "1bxpn27spj4cq9cwg5b486xb35gmwb8hnrhq5g5dpmm7lxgijzh3";
+       sha256 = "037e195fa7a7d6dbca2b18660bd1e2f595b1ba416495c759c28cc8ab8fb0b7af";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
@@ -36063,7 +36177,7 @@ self: {
      mkDerivation {
        pname = "connection";
        version = "0.2.5";
-       sha256 = "090il95jnm7ihwvcx3s9v6iwnp37nnsdx15q7722l845g51d95c8";
+       sha256 = "8895d4427985202ac439b884deb4b5675ccba3d9498fce3687f1542b4ba21124";
        libraryHaskellDepends = [
          base byteable bytestring containers data-default-class network
          socks tls x509 x509-store x509-system x509-validation
@@ -36081,7 +36195,7 @@ self: {
      mkDerivation {
        pname = "connection-pool";
        version = "0.1.2.0";
-       sha256 = "12nr9vl884yj4yq9dyfc725zi6dw0amp65xlm9hjm7wffz6mc5az";
+       sha256 = "5f1556cd778e9f2a61aab41773ab02bc99f88b38ccf996b027d21384e84ed98a";
        libraryHaskellDepends = [
          base between data-default-class monad-control network resource-pool
          streaming-commons time transformers-base
@@ -36098,7 +36212,7 @@ self: {
      mkDerivation {
        pname = "consistent";
        version = "0.0.1";
-       sha256 = "003vnmh6mbjz08msnvnjfwwfsn8m15fa9apr5igkvscdqrr5hzd5";
+       sha256 = "a57d5872c68de93d5f2cf9aaa45c091559ed3877d26eab2b025fae6a60b57b00";
        libraryHaskellDepends = [
          base lifted-async lifted-base monad-control stm transformers
          transformers-base unordered-containers
@@ -36117,7 +36231,7 @@ self: {
      mkDerivation {
        pname = "console-program";
        version = "0.3.2.0";
-       sha256 = "1517vwn9l10hihw7ysj812x7cypf5gca468sdzgdlcwvqa8wsr3m";
+       sha256 = "7564cd91c29b33dade6f1a19a2d82bee7a76ba08486a7f388c10049a2cdf2794";
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers directory fez-conf
          haskeline parsec parsec-extra split transformers utility-ht
@@ -36131,7 +36245,7 @@ self: {
      mkDerivation {
        pname = "const-math-ghc-plugin";
        version = "1.0.0.0";
-       sha256 = "1fcj3ssfyxnq4cmb3lr5cg7qkgnkhf1ra0469cbw61gr2fl3kzdl";
+       sha256 = "b4fd39a813f905c3174b8600958383d3be89cf6325d3b12a23d876efb41e92b9";
        libraryHaskellDepends = [ base containers ghc ];
        testHaskellDepends = [ base directory process ];
        homepage = "https://github.com/kfish/const-math-ghc-plugin";
@@ -36145,7 +36259,7 @@ self: {
      mkDerivation {
        pname = "constrained-categories";
        version = "0.2.1.1";
-       sha256 = "0m4c2kva0djxhiqnbxbnlrkq10wvzpbjbbvjv3mz9b550sxr6azy";
+       sha256 = "fe2b93bb06a5acf4ebd872af25d7fd9b838067a676f56571845d36a0f6148c54";
        libraryHaskellDepends = [ base tagged void ];
        homepage = "https://github.com/leftaroundabout/constrained-categories";
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
@@ -36158,7 +36272,7 @@ self: {
      mkDerivation {
        pname = "constrained-normal";
        version = "1.0.2";
-       sha256 = "1mq0w2qndrjx9ap9dkyxvz91fbszsnwlhh4hnm9g2dx020fawgac";
+       sha256 = "4c3dae1c10a037f152b5904048b9d55f2f17d2dfddcf96ae4a5de666b1e000d7";
        libraryHaskellDepends = [ base ];
        homepage = "http://dx.doi.org/10.1145/2500365.2500602";
        description = "Normalised Deep Embeddings for Constrained Type-Class Instances";
@@ -36170,7 +36284,7 @@ self: {
      mkDerivation {
        pname = "constraints";
        version = "0.4.1.3";
-       sha256 = "1w3ssvg30rfkp1y20vx0fbq1c0md2wys2rh50mih7645djv56hyx";
+       sha256 = "dd4353b66c85980363050566a13d17ad0216f072a06f207cb8d36530ded67af0";
        libraryHaskellDepends = [ base ghc-prim newtype ];
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
@@ -36182,7 +36296,7 @@ self: {
      mkDerivation {
        pname = "constructible";
        version = "0.1.0.1";
-       sha256 = "0d3x92h194y6q8qn11prj05gcnv01vmbvlcsvb1zxgp51qmv1aih";
+       sha256 = "30aab02b0ee5befec3da9ad1bdea0e605bf60a90f9866031c2c69314a0487d34";
        libraryHaskellDepends = [
          arithmoi base binary-search complex-generic
        ];
@@ -36196,7 +36310,7 @@ self: {
      mkDerivation {
        pname = "constructive-algebra";
        version = "0.3.0";
-       sha256 = "17ab0vkq5w3zwh76ws7b82wbc0871qdmvrxhxga78h3h0axjiz1x";
+       sha256 = "3dfc28bb02704074d4ebb0e75d1b0e0701b6b840eb686e0ee47ff082e7064b9d";
        libraryHaskellDepends = [ base QuickCheck type-level ];
        jailbreak = true;
        description = "A library of constructive algebra";
@@ -36213,7 +36327,7 @@ self: {
      mkDerivation {
        pname = "consul-haskell";
        version = "0.2.1";
-       sha256 = "13c3yqn5nsx7r0hkgdwka6fis2ypg54k4damv3c22rdjyids17x7";
+       sha256 = "a79fa05bf4b26521d8d85535324979d70b1d9d5193b73721c8a76b5b2cf6838d";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring http-client http-types
          lifted-async lifted-base monad-control network stm text
@@ -36236,7 +36350,7 @@ self: {
      mkDerivation {
        pname = "consumers";
        version = "1.0";
-       sha256 = "1f7jn9lja9fsznjz7d3wfhbd0dc8whcx9jl74jl39mv20k2sdhib";
+       sha256 = "2bc2a6c50462d734a82487cad419e48835d016747cb4f3a5fdda252569b2f2b8";
        libraryHaskellDepends = [
          base containers exceptions hpqtypes lifted-base lifted-threads log
          monad-control mtl stm time transformers-base
@@ -36251,7 +36365,7 @@ self: {
      mkDerivation {
        pname = "container-classes";
        version = "0.0.0.0";
-       sha256 = "18mx50mp9pv1a33kcwmckz6r4a0j6rlc1165ivn9cj8iiwpmd6pv";
+       sha256 = "fb9a562f8f114996ec8ec584c06836122892cd9fac7236c75061df742b28bda2";
        libraryHaskellDepends = [ base ];
        description = "Generic classes for interacting with different container types";
        license = stdenv.lib.licenses.bsd3;
@@ -36262,7 +36376,7 @@ self: {
      mkDerivation {
        pname = "containers";
        version = "0.4.2.1";
-       sha256 = "10xjyxlx6raz5jx17wyw7zqif3bp3xsbzb1756l263g91gd20rsm";
+       sha256 = "556720da0be90d23a82927acbf741f770d17f13fdcf313ba2c5f65d369f7b283";
        revision = "2";
        editedCabalFile = "4cdf787be0b51ffe34f02055117470f87d03c2f6567cd53d908b048c5fc970c8";
        libraryHaskellDepends = [ array base deepseq ];
@@ -36279,7 +36393,7 @@ self: {
      mkDerivation {
        pname = "containers";
        version = "0.5.6.3";
-       sha256 = "1kcd55nl0vzi99i8sr8fmc5j25fv7m0a9hd3nihnq1pd64pfciqn";
+       sha256 = "1647e62e31ed066c61b4a3c1a4403ddb15210bab0e658d624af16f406d298dcd";
        libraryHaskellDepends = [ array base deepseq ghc-prim ];
        testHaskellDepends = [
          array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
@@ -36296,7 +36410,7 @@ self: {
      mkDerivation {
        pname = "containers-benchmark";
        version = "1.1.0.0";
-       sha256 = "11h88lgwgiyacv9b9k96aih95ydjq1i4ny03z0zw8iyd3c0yi7m0";
+       sha256 = "a09ee8011bcd47c43ff803784b62c0b2f992605426cdb4d266cac7c71f450886";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -36313,7 +36427,7 @@ self: {
      mkDerivation {
        pname = "containers-deepseq";
        version = "0.1.0.1";
-       sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541";
+       sha256 = "8114b5bf3c5bc1c8afba3ecf4dd3389c251602259e1b2e97becf3b63243c2d51";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Provide orphan NFData instances for containers as needed. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -36324,7 +36438,7 @@ self: {
      mkDerivation {
        pname = "containers-unicode-symbols";
        version = "0.3.1.1";
-       sha256 = "0ccv7rqkykfk5wmr73mc0kwrnwyzakgp5x495dgwn5nila3g4ma6";
+       sha256 = "4655f286a2d116cb5f2b89f472df54df739bf904ac8e932b2fd34d3f713e9b31";
        libraryHaskellDepends = [ base base-unicode-symbols containers ];
        homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
        description = "Unicode alternatives for common functions and operators";
@@ -36340,7 +36454,7 @@ self: {
      mkDerivation {
        pname = "context-free-grammar";
        version = "0.1.0";
-       sha256 = "11s6v8h39iq0wy4p4y8cwpr8fjhphql07s38rgbm8qsq1hj9f3a1";
+       sha256 = "410d97240c586354d7cb68e8032886174a87f2e50c797289e700c73420da4687";
        libraryHaskellDepends = [
          array base containers control-monad-omega dlist mtl pretty
          template-haskell
@@ -36360,7 +36474,7 @@ self: {
      mkDerivation {
        pname = "context-stack";
        version = "0.1.0.1";
-       sha256 = "0y51xlva4364658bgbchcasbq5pka2ixlvhdf9g38xwlmhfg736x";
+       sha256 = "dd8cf31cac9477345e720d6edaa350f316bcb46290adb75031c40ca236eda178";
        libraryHaskellDepends = [
          base classy-prelude mtl unordered-containers
        ];
@@ -36378,7 +36492,7 @@ self: {
      mkDerivation {
        pname = "continue";
        version = "0.2.0";
-       sha256 = "0iyqwqbzmk8v4j6xdmfir8mdxjgzl1dh76c9ngwzyccpv7xbz59a";
+       sha256 = "2a95bffad99731fff9b38999035ba0ffc9de2acad1d5d68d241bcdfa17e6d847";
        libraryHaskellDepends = [
          base bifunctors monad-control mtl semigroupoids transformers
          transformers-base
@@ -36394,7 +36508,7 @@ self: {
      mkDerivation {
        pname = "continued-fractions";
        version = "0.9.1.1";
-       sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh";
+       sha256 = "d0da6d0fca5f1ae750b53951ea50d22523a79b346028a50970add6fa950f173f";
        libraryHaskellDepends = [ base ];
        homepage = "/dev/null";
        description = "Continued fractions";
@@ -36410,7 +36524,7 @@ self: {
      mkDerivation {
        pname = "continuum";
        version = "0.1.0.7";
-       sha256 = "0viqn05l4xjwb3w2qbldxmwv0dj1bzwbvjcgczj1clhdx2zdgfx6";
+       sha256 = "a6bbd7bee80d5216e4678fc9bdf85f4136b079ed8d2e2cf8585c76420bb0386e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36433,7 +36547,7 @@ self: {
      mkDerivation {
        pname = "continuum-client";
        version = "0.1.0.0";
-       sha256 = "0qv7dz2h3aay4ak5nz38wp3wrrk2zzg2g58xdlglvml08hpxsf7k";
+       sha256 = "f338dd2f4480d64d1f6d1d9527deff62e6ccc7e5687c5ba6225ea901c56f6763";
        libraryHaskellDepends = [
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
@@ -36448,7 +36562,7 @@ self: {
      mkDerivation {
        pname = "contravariant";
        version = "1.3.2";
-       sha256 = "0fb6az12604vwvfhnmvxfin68n0fb2jcvrliv3vvrmfnfq3axfjj";
+       sha256 = "52baae0676d6d5bcf7d891e6cda4580e58646c747d570bdde69b0023c2576639";
        libraryHaskellDepends = [
          base semigroups StateVar transformers transformers-compat void
        ];
@@ -36462,7 +36576,7 @@ self: {
      mkDerivation {
        pname = "control-bool";
        version = "0.2.1";
-       sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4";
+       sha256 = "e46a85d2985a65f8d7ecbcdab0cfb12734b4d6e4c558631e6ab01fe742ed5581";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/fumieval/control-bool";
        description = "Useful combinators for boolean expressions";
@@ -36474,7 +36588,7 @@ self: {
      mkDerivation {
        pname = "control-event";
        version = "1.2.1.1";
-       sha256 = "0hwsidsxnzi4b3aphn3f7lsf1z508ql6cnhfq6zbqfsvcynm7565";
+       sha256 = "c59453ad675b3bbcbec10e5a662846a0fce0343d6e5878d558247edb758b9a43";
        libraryHaskellDepends = [ base containers stm time ];
        description = "Event scheduling system";
        license = stdenv.lib.licenses.bsd3;
@@ -36486,7 +36600,7 @@ self: {
      mkDerivation {
        pname = "control-monad-attempt";
        version = "0.3.0.1";
-       sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s";
+       sha256 = "bac8217c9980bccfce3381ea6a28eb0e117d9aaf99f2cc3c2e5ffad5f6111690";
        libraryHaskellDepends = [ attempt base transformers ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/control-monad-attempt";
@@ -36502,7 +36616,7 @@ self: {
      mkDerivation {
        pname = "control-monad-exception";
        version = "0.11.2";
-       sha256 = "0vdms5if6c04459ksix5q38l9cflgc5bwnchd422fp2qfji5j14p";
+       sha256 = "970459a274585c2704699059be0a7bd4b144d1c0a5473d53210430e362d1b56d";
        libraryHaskellDepends = [
          base failure lifted-base monad-control monadloc transformers
          transformers-base
@@ -36519,7 +36633,7 @@ self: {
      mkDerivation {
        pname = "control-monad-exception-monadsfd";
        version = "0.10.3";
-       sha256 = "1izyxqry863jg9i88gcs7cib39q9c2mnm74mxdyl1d84kj1hrnim";
+       sha256 = "35da0c839c04b5407deb959c6aab6009a7b1223b9a3d84627a7218e433eefec7";
        libraryHaskellDepends = [
          base control-monad-exception monads-fd transformers
        ];
@@ -36535,7 +36649,7 @@ self: {
      mkDerivation {
        pname = "control-monad-exception-monadstf";
        version = "0.10.3";
-       sha256 = "1qj4y71g5p6b4aa5wn5fp4i5c9iw0pdrqs9yvzr6f41v6knw16za";
+       sha256 = "ea9bc0ed343b1067f2df3e699cdb053c265622b9ae585e9422cbdcf2c2f144e2";
        libraryHaskellDepends = [
          base control-monad-exception monads-tf transformers
        ];
@@ -36549,7 +36663,7 @@ self: {
      mkDerivation {
        pname = "control-monad-exception-mtl";
        version = "0.10.3";
-       sha256 = "1wwqn3xcd2fspfd2cnf9cym0cbbgvlajr3pkx7f2v3b37mx6blni";
+       sha256 = "d1d2657a3d638d2ddce9f38e2c15dd6f2d06aa67c959269abbda89c6fab098f3";
        libraryHaskellDepends = [ base control-monad-exception mtl ];
        homepage = "http://pepeiborra.github.com/control-monad-exception";
        description = "MTL instances for the EMT exceptions monad transformer";
@@ -36562,7 +36676,7 @@ self: {
      mkDerivation {
        pname = "control-monad-failure";
        version = "0.7.0.1";
-       sha256 = "1g304wb1fhx81iw2vv7nv6cp2qmy69frwiv3vax85lxw03s4nlkq";
+       sha256 = "78524bf400bcd382bada63479e5d32be627199d9f6ec2d780ca84317162760bc";
        libraryHaskellDepends = [ base failure transformers ];
        jailbreak = true;
        homepage = "http://github.com/pepeiborra/control-monad-failure";
@@ -36576,7 +36690,7 @@ self: {
      mkDerivation {
        pname = "control-monad-failure-mtl";
        version = "0.7.1";
-       sha256 = "0j9i85vq033789vx2589mfqwk954hqy1wla527ssbyf05k6vkn8j";
+       sha256 = "12d9b9cd2cc0f9a5f51145511e3c86a4a4c9b1ab0915d17742670c8077413149";
        libraryHaskellDepends = [ base failure mtl ];
        jailbreak = true;
        homepage = "http://github.com/pepeiborra/control-monad-failure";
@@ -36590,7 +36704,7 @@ self: {
      mkDerivation {
        pname = "control-monad-free";
        version = "0.5.3";
-       sha256 = "1igwawcdpg8irayjax1xdrlpa9587k1v4y28ib3xfb7yk0xv7vk1";
+       sha256 = "61eeb33b98fe2cd7c78a4878b2c33ca82475696e3d7425bdca11bddb1857fcc5";
        libraryHaskellDepends = [ base deepseq transformers ];
        homepage = "http://github.com/pepeiborra/control-monad-free";
        description = "Free monads and monad transformers";
@@ -36602,7 +36716,7 @@ self: {
      mkDerivation {
        pname = "control-monad-free";
        version = "0.6.1";
-       sha256 = "11i297ngwb5ck23vsr84fh5qx4hn7fzm9ml90y79lwi97hyigagy";
+       sha256 = "fea9173d3c29729a8e0789d654bf3b16928e0b740465bd8798ac2cfeec492286";
        revision = "1";
        editedCabalFile = "d08dceee154098bee492a1c00ef699a2a3a0e8a3851c5d49ccd49d5645a501a4";
        libraryHaskellDepends = [ base prelude-extras transformers ];
@@ -36616,7 +36730,7 @@ self: {
      mkDerivation {
        pname = "control-monad-loop";
        version = "0.1";
-       sha256 = "003k4pp6wgn30m9ksbh8680f0klzsvd90wsl9jpqs9lpg14hi6zj";
+       sha256 = "f29b08497897268daf4c547390dad69f4ee00032082e3d5305c33e6eee257300";
        libraryHaskellDepends = [ base transformers transformers-base ];
        homepage = "https://github.com/joeyadams/haskell-control-monad-loop";
        description = "Simple monad transformer for imperative-style loops";
@@ -36628,7 +36742,7 @@ self: {
      mkDerivation {
        pname = "control-monad-omega";
        version = "0.3.1";
-       sha256 = "11hirysr76i01qj8rm22xjcrv2qwxgwjlrqqyd1dsnnvypn9hfrq";
+       sha256 = "383b98ecf5db5add42f318672af9eb1c8b9d99ec42d48c240e209a93b5cf1186";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/control-monad-omega";
        description = "A breadth-first list monad";
@@ -36640,7 +36754,7 @@ self: {
      mkDerivation {
        pname = "control-monad-queue";
        version = "0.2";
-       sha256 = "15syy24v1a2h25j4ijddi9l0pmp84wq9hlryh18f1jvqm8apc8vs";
+       sha256 = "7a237615aa78cbe050803e53983027e8d60b688aadc948641150a8b089f05e97";
        libraryHaskellDepends = [ base ];
        description = "Reusable corecursive queues, via continuations";
        license = stdenv.lib.licenses.bsd3;
@@ -36651,7 +36765,7 @@ self: {
      mkDerivation {
        pname = "control-timeout";
        version = "0.1.2";
-       sha256 = "1g1x6c4dafckwcw48v83f3nm2sxv8kynwv8ib236ay913ycgayvg";
+       sha256 = "6f7bf5981f2179658658116d6efd44bb6b51ed70036d4438e39339d508333dbc";
        libraryHaskellDepends = [ base containers stm time ];
        description = "Timeout handling";
        license = stdenv.lib.licenses.bsd3;
@@ -36662,7 +36776,7 @@ self: {
      mkDerivation {
        pname = "contstuff";
        version = "1.2.6";
-       sha256 = "0rw2bslajjch057fsxf881wi39bsd9y6196j0kb0lz47r0zn8003";
+       sha256 = "0300643fc8877c0ad604d2a4607c6a7aa5117940c875ed4e019049a9a85e8267";
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://haskell.org/haskellwiki/Contstuff";
        description = "Fast, easy to use CPS-based monad transformers";
@@ -36674,7 +36788,7 @@ self: {
      mkDerivation {
        pname = "contstuff-monads-tf";
        version = "0.2.1";
-       sha256 = "0j4y76ar0m642jxcyrvlrxagawrlq637cvx3fqprw5sl5cslgxh5";
+       sha256 = "05f647352b54179e2f76a36f7686c13473f554cf7467cfba14c4549095399e48";
        libraryHaskellDepends = [ base contstuff monads-tf ];
        description = "ContStuff instances for monads-tf transformers (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -36686,7 +36800,7 @@ self: {
      mkDerivation {
        pname = "contstuff-transformers";
        version = "0.1.1";
-       sha256 = "0b5vskp1bxqpi4ffcxwjw6kr0jd6n8v8jlhf03p54ckfd5ym4ai6";
+       sha256 = "262a527d696e3252ee000e528936b2a64990a7e19277e61c8917f715eed4bb2c";
        libraryHaskellDepends = [ base contstuff transformers ];
        jailbreak = true;
        description = "Deprecated interface between contstuff 0.7.0 and the transformers package";
@@ -36699,7 +36813,7 @@ self: {
      mkDerivation {
        pname = "converge";
        version = "0.1.0.1";
-       sha256 = "0y28m7kgphknra0w2kzf0g4m2bdj604nr3f22xng46nl7kljbpvj";
+       sha256 = "72df25e93cd41af26c17c28d6c0930b22d51c903ee4fc181ca76c2fbe6a94878";
        libraryHaskellDepends = [ base ];
        homepage = "/dev/null";
        description = "Limit operations for converging sequences";
@@ -36710,8 +36824,8 @@ self: {
     ({ mkDerivation, base-prelude }:
      mkDerivation {
        pname = "conversion";
-       version = "1.1.0.1";
-       sha256 = "1bgads36prqw7m10hfmg9161d3hs5pa5qql9lbsny5hqvxsmb30d";
+       version = "1.1.1";
+       sha256 = "420411e16b58c7ea1ab522ea5171329270c885bfdbb8c403d8f65ee12405e61b";
        libraryHaskellDepends = [ base-prelude ];
        homepage = "https://github.com/nikita-volkov/conversion";
        description = "Universal converter between values of different types";
@@ -36723,7 +36837,7 @@ self: {
      mkDerivation {
        pname = "conversion-bytestring";
        version = "1.0.0.1";
-       sha256 = "1gsbfmp58qzhvnyl6jgy1pah954qaxi184clh31lzam9m1j44k3y";
+       sha256 = "7e4c4264a8a9aa4fc3809411146257989404d50dfe4943bdddf063546e754bbf";
        libraryHaskellDepends = [ base-prelude bytestring conversion ];
        homepage = "https://github.com/nikita-volkov/conversion-bytestring";
        description = "\"Conversion\" instances for the \"bytestring\" library";
@@ -36735,7 +36849,7 @@ self: {
      mkDerivation {
        pname = "conversion-case-insensitive";
        version = "1.0.0.0";
-       sha256 = "14mf5jincplqrdln6xja0c840mmj4khd5n3z5f4glgpnmk9r3dcp";
+       sha256 = "97b591d3acf63efa882b7fd8d2e024b2564010034a766369cb985e66a32cae92";
        libraryHaskellDepends = [ case-insensitive conversion ];
        homepage = "https://github.com/nikita-volkov/conversion-case-insensitive";
        description = "\"Conversion\" instances for the \"case-insensitive\" library";
@@ -36749,7 +36863,7 @@ self: {
      mkDerivation {
        pname = "conversion-text";
        version = "1.0.0.2";
-       sha256 = "0j7j0jww92v9gldh8hd35p51ka2mq4n26chfw6n4m034q3pjqpby";
+       sha256 = "7e5d2cefc064804aace10e32232cc155a819ca2da341041b7d698bc4b904f248";
        libraryHaskellDepends = [
          base-prelude bytestring conversion conversion-bytestring text
        ];
@@ -36765,7 +36879,7 @@ self: {
      mkDerivation {
        pname = "convertible";
        version = "1.1.1.0";
-       sha256 = "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9";
+       sha256 = "e9f9a70904b9995314c2aeb41580d654a2c76293feb955fb6bd63256c355286c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36783,7 +36897,7 @@ self: {
      mkDerivation {
        pname = "convertible-ascii";
        version = "0.1.0.1";
-       sha256 = "0yzfq0r430ziclxn44k9x3jwl675gs3lafr5d1cb6y9j20fl1sjw";
+       sha256 = "5cea401d103279b35868253b45877ee518cae5e86912623b65f1834132c0ee7b";
        libraryHaskellDepends = [
          ascii base base-unicode-symbols blaze-builder bytestring
          convertible-text failure text
@@ -36802,7 +36916,7 @@ self: {
      mkDerivation {
        pname = "convertible-text";
        version = "0.4.0.2";
-       sha256 = "1wqpl9dms1rsd24d00f18l9sm601nm6kr7h4ig8y70jdzy8w73fz";
+       sha256 = "df8dc391ff4d82e3d18b049e3c4db50198aa1345c101d088683a075d5ba217f3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36821,7 +36935,7 @@ self: {
      mkDerivation {
        pname = "cookbook";
        version = "3.0.0.1";
-       sha256 = "1mhj4g7bg6gi1wx8pshwl4n37vgqacnssh5hwskyaajy4gqz6hki";
+       sha256 = "7142f3f1235e2ae5a7e6b040ad2d53f8ed332ca11cea8b3a0ff199b7ce2312d6";
        libraryHaskellDepends = [ base directory strict ];
        description = "Tiered general-purpose libraries with domain-specific applications";
        license = stdenv.lib.licenses.bsd3;
@@ -36835,7 +36949,7 @@ self: {
      mkDerivation {
        pname = "cookie";
        version = "0.4.1.6";
-       sha256 = "0b6ym6fn29p5az4dwydy036lxj131kagrmgb93w4bbkqfkds8b9s";
+       sha256 = "3a2da4db7478ae45f848ebd5fcd40c23c84ecd00be79dec857e526619da9de2c";
        libraryHaskellDepends = [
          base blaze-builder bytestring data-default-class deepseq old-locale
          text time
@@ -36856,7 +36970,7 @@ self: {
      mkDerivation {
        pname = "coordinate";
        version = "0.0.19";
-       sha256 = "01f6dmyx2kqyzf1n06awcyx0ygqgy829snxw6bbxbvih9yhkjq2r";
+       sha256 = "596039a14f30eed5d732bc5b9d04f20f3f0fba675c196083fb1e4fd17d6dc605";
        libraryHaskellDepends = [ base lens radian tagged transformers ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -36874,7 +36988,7 @@ self: {
      mkDerivation {
        pname = "copilot";
        version = "2.1.2";
-       sha256 = "0mslkyyl5shcxh05i1vprzacaxxg3jjdqcfin475zv5gm5cn26vz";
+       sha256 = "7f1b6159a9afec5f0eb1d131dca41caf77c5d4cf77875800ec0cea42bd9f5457";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36898,7 +37012,7 @@ self: {
      mkDerivation {
        pname = "copilot-c99";
        version = "2.1.2";
-       sha256 = "0lvldfkksxxmf3mbchwxzj1a1yagdk7k3zbyid181gskvmkxnfzd";
+       sha256 = "ed3bdb67dd53bf80428b7efd31cf6c4ff9a082fc9d43b6ea70b5773da76b7453";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36921,7 +37035,7 @@ self: {
      mkDerivation {
        pname = "copilot-cbmc";
        version = "2.1.2";
-       sha256 = "02ng4iqsr5yp435fcqjjh9j5p93l4cixjdnqjx4fafhhfrv8g8a1";
+       sha256 = "41a1877676103ae54897d836d9232374a45b64825262e6ca20d797ac7124cf0a";
        libraryHaskellDepends = [
          base bytestring copilot-c99 copilot-core copilot-sbv directory
          pretty process
@@ -36938,7 +37052,7 @@ self: {
      mkDerivation {
        pname = "copilot-core";
        version = "2.1.2";
-       sha256 = "1gdq76c170sv58fb56ik8mam3f63dg0jk6myd5rv4sbh4z45xfs7";
+       sha256 = "47bb5ec8277069b27369be9a29c16bc3b8515545339ab21c2a5b83139839b8bd";
        libraryHaskellDepends = [
          base containers dlist mtl pretty pretty-ncols random
        ];
@@ -36954,7 +37068,7 @@ self: {
      mkDerivation {
        pname = "copilot-language";
        version = "2.1.2";
-       sha256 = "1099w6hk6v4rna02z4zsrwf1m883w6nxgycy5d8iamd4n2pk6bk3";
+       sha256 = "632e33afb0a45515512b9ef9d7ade103a11a1ccffa932f80b2996c33a1e12981";
        libraryHaskellDepends = [
          array base containers copilot-core data-reify ghc-prim mtl
        ];
@@ -36970,7 +37084,7 @@ self: {
      mkDerivation {
        pname = "copilot-libraries";
        version = "2.1.1";
-       sha256 = "0b69rfz4gvdvk9f9y7yns3hmh1m7akcrm3rcdi8rkhizykcnnsyj";
+       sha256 = "d26b6bd9f43fc299516c2c8f9ad954a70658e1d0d61f9f5c9abbed47becbc92c";
        libraryHaskellDepends = [
          array base containers copilot-language mtl parsec
        ];
@@ -36986,7 +37100,7 @@ self: {
      mkDerivation {
        pname = "copilot-sbv";
        version = "2.1.2";
-       sha256 = "1a4blmxrglp4fmrfnc7g3w0zhyl3fdx3lvaw2mi47wchqbqcgicr";
+       sha256 = "99c5c7f0c290f14362155c6d3a7a73837af8011fef30eb7275e4d2977ba58ba8";
        libraryHaskellDepends = [
          base containers copilot-core filepath pretty sbv
        ];
@@ -37002,7 +37116,7 @@ self: {
      mkDerivation {
        pname = "copr";
        version = "1.1.1";
-       sha256 = "0zgg60ri8yvz96gk08wdfn0445wqszigh2p0964nr2zdnffq5rnw";
+       sha256 = "dce6829db3ed8b6c8949e00af8e2d798174280758d23309f497f7b143330ef7d";
        revision = "1";
        editedCabalFile = "ef9fb8be7d257feae9e4647de62d489860e2bd6510e34a35465cf5b763fa2425";
        libraryHaskellDepends = [
@@ -37021,7 +37135,7 @@ self: {
      mkDerivation {
        pname = "core";
        version = "0.5";
-       sha256 = "1fqgfbd3in8l84250kda67paakz4sr2ywf5qzsy403546w7q9ccz";
+       sha256 = "9fb1840f37a40c40bcfeb838ee45d6e44fa5ee31aa4d50044114d938da720fbb";
        libraryHaskellDepends = [ base bytestring parsec pretty ];
        description = "External core parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
@@ -37033,7 +37147,7 @@ self: {
      mkDerivation {
        pname = "core-haskell";
        version = "0.6.4";
-       sha256 = "1wjmj2p8j6xw7cga01jsjgpi4dswrxif3j6mml48fq8a4k19zqxr";
+       sha256 = "b9e39fc2240a618708add5c8e162cf5c3712ef935a06a01e3bbc1b89ae9055f2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -37053,7 +37167,7 @@ self: {
      mkDerivation {
        pname = "corebot-bliki";
        version = "0.2.2.0";
-       sha256 = "10pfz4bw1wh55c2cizd8jiwh8bkaqw9p773976vl52f0jrhns1qg";
+       sha256 = "0f076d6196c08942b739699c7313c76a2e047994a8fdc8042b05f2c017f9ee82";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -37077,7 +37191,7 @@ self: {
      mkDerivation {
        pname = "coroutine-enumerator";
        version = "0.1.1";
-       sha256 = "1rjbhpy5vw1maawi47jsrnagqm19say9w1i31pgcpxl45vhrshp7";
+       sha256 = "e7429de12e84f6cbde0d23069ebcd22954fc94cd5a1e12b95235f05dfc854be6";
        libraryHaskellDepends = [ base enumerator monad-coroutine ];
        jailbreak = true;
        homepage = "http://trac.haskell.org/SCC/wiki/coroutine-enumerator";
@@ -37090,7 +37204,7 @@ self: {
      mkDerivation {
        pname = "coroutine-iteratee";
        version = "0.1.1";
-       sha256 = "1ycir4kwpcz34yg64cdb9q0jxv3ma12vrrs28cr5jm64jmi8m0wd";
+       sha256 = "8d838a6295c45459324342e7bc455075ec2e014eab31629e27e3b3cb27c991f9";
        libraryHaskellDepends = [ base iteratee monad-coroutine ];
        jailbreak = true;
        homepage = "http://trac.haskell.org/SCC/wiki/coroutine-iteratee";
@@ -37106,7 +37220,7 @@ self: {
      mkDerivation {
        pname = "coroutine-object";
        version = "0.3";
-       sha256 = "0q0rvcc7ipxwmikaxh0ymq1d65f2q1a2jrd1i553pdf8hwmv0k1r";
+       sha256 = "394cb02b87c8b53b4a89a1652954c0c215d302ae1ec0ae66acbcdf7818db1960";
        libraryHaskellDepends = [
          base bytestring cereal containers either lens mtl safecopy
          transformers transformers-free uuid
@@ -37122,7 +37236,7 @@ self: {
      mkDerivation {
        pname = "couch-hs";
        version = "0.1.6";
-       sha256 = "0mrx0mjh9kzk6nx53gn5hvhjgmhlwphxkl5yn9a1x17l62v3x6q7";
+       sha256 = "079b3eb630f4841e54b2bed0d9e1e514d627e186c5be51ba35f3cf0465053d57";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -37146,7 +37260,7 @@ self: {
      mkDerivation {
        pname = "couchdb-conduit";
        version = "0.10.6";
-       sha256 = "0rp5pj56m9n20g5hjjw8gbx81lb2z0ckwpgpvyr2a5sgk6b7z2al";
+       sha256 = "54897f96994f1725b2dff75d3e19f862d180fa7a884b09cb03c2a66a8abce566";
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder bytestring
          conduit containers data-default http-conduit http-types lifted-base
@@ -37177,7 +37291,7 @@ self: {
      mkDerivation {
        pname = "couchdb-enumerator";
        version = "0.3.7";
-       sha256 = "02h0a61dbchyjp0shpj0shsdfcggx0cm5psxgw9g67vv3v8f98pn";
+       sha256 = "f6a2e4d01e7b1ff3127f5ddf5219e8ef31d734d4405ea8c1951eb2d58251000a";
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-enumerator base bytestring enumerator
          http-enumerator http-types lifted-base monad-control text
@@ -37202,7 +37316,7 @@ self: {
      mkDerivation {
        pname = "count";
        version = "0.0.1";
-       sha256 = "1az2vr1rjq4pfgzswwbwgfq4kcb8kq759vn5kl7ghzaqr7b6vkgx";
+       sha256 = "fdcd6dd6c9587df80e9dc5ee540e9e68b149b07b7c71aeff7397609943dee2ab";
        libraryHaskellDepends = [ base ];
        description = "Bijective mappings between values and possibly infinite prefixes of [0..]";
        license = stdenv.lib.licenses.bsd3;
@@ -37213,7 +37327,7 @@ self: {
      mkDerivation {
        pname = "countable";
        version = "0.2";
-       sha256 = "1az6pk1is587ggys6v1qh3yabnc63vr0fcd5bmvwx20c137yflik";
+       sha256 = "3352e7cf080c88ce775da53107f21e86d9a5fc80386ca3fd7b07151dc3bce6ab";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/AshleyYakeley/countable";
        description = "Countable, Searchable, Finite, Empty classes";
@@ -37225,7 +37339,7 @@ self: {
      mkDerivation {
        pname = "counter";
        version = "0.1.0.1";
-       sha256 = "0pfg34ph6b7qb3wscvvnqdkqqzkjdjc8wynv35ikgf295bsf3kaz";
+       sha256 = "5fcde1f42a49b8376319db7a8e986c727e8c67c3766fa6f958f82c032f19cf5d";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/wei2912/counter";
        description = "An object frequency counter";
@@ -37239,7 +37353,7 @@ self: {
      mkDerivation {
        pname = "country-codes";
        version = "0.1.2";
-       sha256 = "16729grgn4bgnh9nw51h3pil054bixqxfa8lxwfz8xf3b6lcm774";
+       sha256 = "e49ccaa859c375f41def1429d7718f8b1440e31d30146e13b46f11fbf24be298";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base shakespeare text ];
@@ -37258,7 +37372,7 @@ self: {
      mkDerivation {
        pname = "courier";
        version = "0.1.0.15";
-       sha256 = "1aj9anrw7jfqx8s2xkdznqs212f54g6i2lcf79bgnkmxsbax252v";
+       sha256 = "5b14d1d5d2bd4efb563a8e5111cd23c5892034b6bfcd2e34ead8c9c3b35549aa";
        libraryHaskellDepends = [
          async base bytestring cereal containers hslogger network stm text
          uuid
@@ -37279,7 +37393,7 @@ self: {
      mkDerivation {
        pname = "court";
        version = "0.1.0.0";
-       sha256 = "0cpvm6cjfz203hajl8fj5gxc5hc7516v0bzz4d7hyih2kh21k6dn";
+       sha256 = "b69919049c02460f4f23ff2fb04d2887c1c2fa2bd2212a151c407c2799a9fb32";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -37300,7 +37414,7 @@ self: {
      mkDerivation {
        pname = "cpio-conduit";
        version = "0.7.0";
-       sha256 = "04zma03ivg9x5f1xkdpc828fk2lh6qrn7cig7gprci13id9yf2wg";
+       sha256 = "8f0be7538b234496ef3b2fb2633336908ae99040ecb6d9832b3dbd1d0750f513";
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring conduit conduit-extra
        ];
@@ -37321,7 +37435,7 @@ self: {
      mkDerivation {
        pname = "cplusplus-th";
        version = "1.0.0.0";
-       sha256 = "0gmsn35rd6ij4ax4j626hg9pdb40ilj22zg0nxrnl6n1828a9rqj";
+       sha256 = "12e7a49040c11a6a73b7e07d21248d80ac76d383461849ba22329a96cbb0ba3e";
        libraryHaskellDepends = [
          base bytestring containers process template-haskell
        ];
@@ -37339,7 +37453,7 @@ self: {
      mkDerivation {
        pname = "cpphs";
        version = "1.19.2";
-       sha256 = "194hcvhjgm6rmbqp857y3j39lvl2p91mqrrgpi15jq00icnv4idv";
+       sha256 = "bb45b22d8b00605942bc2f675c43ba826e9a861cfe1474f1aad9d427e16690a4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -37360,7 +37474,7 @@ self: {
      mkDerivation {
        pname = "cprng-aes";
        version = "0.6.1";
-       sha256 = "1wr15kbmk1g3l8a75n0iwbzqg24ixv78slwzwb2q6rlcvq0jlnb4";
+       sha256 = "64592a01de8c6683c5e29f538dceee918887ffe211d87214a2e38559d72c21f3";
        libraryHaskellDepends = [
          base byteable bytestring cipher-aes crypto-random
        ];
@@ -37376,7 +37490,7 @@ self: {
      mkDerivation {
        pname = "cprng-aes-effect";
        version = "0.1.0.2";
-       sha256 = "0443h7jfpjvc6vmp3kfx0h6j2aynvgfznssz7lin9fmsxghlvsfb";
+       sha256 = "cbe94de1ebbaba64233d5f6bfbdddbd62b210d04ddcd71eb366ccbebe4818310";
        revision = "1";
        editedCabalFile = "b9752152bb1764da66976eaf18776b09dabf80eeb6f252bcee0da10fa0a1057e";
        libraryHaskellDepends = [
@@ -37394,7 +37508,7 @@ self: {
      mkDerivation {
        pname = "cpsa";
        version = "2.5.2";
-       sha256 = "0zm2waj17ak43rhri9rhvwy970dv22r0k42fzbm3n6gcl5h2mcq5";
+       sha256 = "05b32a60a1ec193beafa4e9009b210bb81933cdf30a798611e64aa13a4e2a27e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers parallel ];
@@ -37408,7 +37522,7 @@ self: {
      mkDerivation {
        pname = "cpu";
        version = "0.1.2";
-       sha256 = "0x19mlanmkg96h6h1i04w2i631z84y4rbk22ki4zhgsajysgw9sn";
+       sha256 = "5627feb4974a3ff8499c42cc958927e88761a2e004c4000d34e9cd6a15ad2974";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -37422,7 +37536,7 @@ self: {
      mkDerivation {
        pname = "cpuid";
        version = "0.2.3";
-       sha256 = "126xg98yaf3q61h85yrs1cm6wxlayf590l0a3h0gw6c282s8l6gq";
+       sha256 = "f8198ab4408219fe001c0a50908af38a766e2a0b3afb8260307838e5517add88";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base data-accessor enumset ];
@@ -37436,7 +37550,7 @@ self: {
      mkDerivation {
        pname = "cpuperf";
        version = "0.1.1";
-       sha256 = "1xnmrm3agkxziflvanihckg6q97z5w9gh7yv7mbbc7gqax3sz6l0";
+       sha256 = "809aaf4757f81db6563ddb1ff8122fff246cde64305ab5a98bbfcfa746cdd5f6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl process ];
@@ -37451,7 +37565,7 @@ self: {
      mkDerivation {
        pname = "cpython";
        version = "3.3.0";
-       sha256 = "162m0dfgnicyv3jb9dqq6pmyymh1dim043kbmbg1hfhxjfrv17jj";
+       sha256 = "529eb0b3931d3a18deaa6b0e026a6c0156efeb3518b7b4e4d89e45fb5c035598";
        libraryHaskellDepends = [ base bytestring text ];
        libraryPkgconfigDepends = [ python3 ];
        libraryToolDepends = [ c2hs ];
@@ -37470,7 +37584,7 @@ self: {
      mkDerivation {
        pname = "cql";
        version = "3.0.5";
-       sha256 = "12v5hhlji9w73chxdhazpmhbaxmjs98lw1y6cm8p29bgxdi75q61";
+       sha256 = "c1e07262eb6f25715165c6074e51d2b276b560bd5fc1d6211b87a7282984658b";
        libraryHaskellDepends = [
          base bytestring cereal Decimal iproute network template-haskell
          text time transformers uuid vector
@@ -37494,7 +37608,7 @@ self: {
      mkDerivation {
        pname = "cql-io";
        version = "0.14.5";
-       sha256 = "0ks2sn3dfrr8ilvmw48hfz3140x9dsi79w6ci4vfksn1g5ndnpiy";
+       sha256 = "3e5edb6c79c1eae93689ccf074a26ea90312c67710115e378d2867d786d5424f";
        libraryHaskellDepends = [
          async auto-update base bytestring containers cql cryptohash
          data-default-class exceptions hashable iproute lens monad-control
@@ -37514,7 +37628,7 @@ self: {
      mkDerivation {
        pname = "cqrs";
        version = "0.9.0";
-       sha256 = "1r3wl6fwkqccnfhazq7dk4c2zmlirxrh3y7a7fjhxm9273g59f1b";
+       sha256 = "2bb854de3822d50ea53beaf80173cf91d62f1899ede0afa0b38ce1c99da17ce4";
        libraryHaskellDepends = [
          base bytestring conduit containers cqrs-types deepseq pool-conduit
          random SafeSemaphore stm transformers
@@ -37537,7 +37651,7 @@ self: {
      mkDerivation {
        pname = "cqrs-example";
        version = "0.9.1";
-       sha256 = "0yllvs64qaxpgqlwdv3hmi4gzl5qf2lbyy3r0whyi2kz53kwl03i";
+       sha256 = "7100cae7287f8ae821077978bfa870b8d0ff48ac70ecc6297eb72b4c8cde947a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -37559,7 +37673,7 @@ self: {
      mkDerivation {
        pname = "cqrs-postgresql";
        version = "0.9.0";
-       sha256 = "0zannh06gbc5vm5cpx9015i7ssg38k5lwwyajxhxa1nckwynqmzb";
+       sha256 = "eb576c3d9fcc06d56197ca734ecb44e3697d620920f5cb4add85ad6700b4567d";
        libraryHaskellDepends = [
          base bytestring bytestring-lexing conduit cqrs-types old-locale
          pool-conduit postgresql-libpq text time transformers
@@ -37581,7 +37695,7 @@ self: {
      mkDerivation {
        pname = "cqrs-sqlite3";
        version = "0.9.0";
-       sha256 = "086g5z7ajr2x2didd0q8qcvnxdsf2gfrn27436gbj8y81cbg0fsh";
+       sha256 = "503bf0160bc823b99e19e4089bdd134eb76e37c30883d662135d64a9ce2fcf20";
        libraryHaskellDepends = [
          base bytestring conduit cqrs-types direct-sqlite pool-conduit text
          transformers
@@ -37603,7 +37717,7 @@ self: {
      mkDerivation {
        pname = "cqrs-test";
        version = "0.9.0";
-       sha256 = "1i47c2d7c64kp63spm12jkwg3g21i0z4n9z9gdwvmsr1s638k5gl";
+       sha256 = "f4958986d121ebba797be9274b3e8841bcf1f89422d4ab87b99318769a6087c4";
        libraryHaskellDepends = [
          base bytestring conduit cqrs-types hspec HUnit pool-conduit stm
          transformers
@@ -37621,7 +37735,7 @@ self: {
      mkDerivation {
        pname = "cqrs-types";
        version = "0.9.0";
-       sha256 = "1xxyy8zrx76x3vg54awhp9lz5qhg9x5cafhlqr45ilfz2rxjkzbg";
+       sha256 = "6ffd297b16dfd15848c6143ac54a4f0fe2f269ba902b52de1edd9c9e3ff2bef7";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring conduit deepseq
          derive random
@@ -37639,7 +37753,7 @@ self: {
      mkDerivation {
        pname = "cr";
        version = "1.2";
-       sha256 = "107chyp8br2ryjqdf7100109k0wg3jawzva76wf4r6fndjr3gin1";
+       sha256 = "c1c637b26cd6994c1c3747edcf951c8f83994000201cd7b0f459e485ae87ec80";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -37656,7 +37770,7 @@ self: {
      mkDerivation {
        pname = "crack";
        version = "0.1";
-       sha256 = "0rfwvvb3q0a7z8is95yjh3wfvz818xyblp1hrwh8fwddppncrzrk";
+       sha256 = "33ffccecbdad718720cf305cba7c4701fdedf880d297a423fa47013cd6dedc65";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ crack ];
        description = "A haskell binding to cracklib";
@@ -37669,7 +37783,7 @@ self: {
      mkDerivation {
        pname = "crackNum";
        version = "1.3";
-       sha256 = "06balzwvvpl69abfcq0gynv6zpy42aygvlicb9jsnrys2vyipv28";
+       sha256 = "48ec1bfd16da67ab655a2cd2fdbc12c4df6fb6f50f60e6964a86debdf9a76a19";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base data-binary-ieee754 ieee754 ];
@@ -37683,7 +37797,7 @@ self: {
      mkDerivation {
        pname = "craftwerk";
        version = "0.1";
-       sha256 = "0002n3fq3afmby843gfi0dnwm2saq29w6hnn6lzqhsalw33j97d3";
+       sha256 = "a39d24c7e05469883f35d642c393c04a8bca6d03d1bd41905fd5a981ddb00200";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base colour mtl vector-space ];
@@ -37699,7 +37813,7 @@ self: {
      mkDerivation {
        pname = "craftwerk-cairo";
        version = "0.1";
-       sha256 = "16in87l2v49k785fldm7fvprywg0v497kz29jr22y91q5j5gnm4z";
+       sha256 = "9f54fb8a2c38242f449649fc7912d9e0719fef76a736ea0a3a33912de841369a";
        libraryHaskellDepends = [ base cairo craftwerk mtl ];
        jailbreak = true;
        homepage = "http://mahrz.github.com/craftwerk.html";
@@ -37715,7 +37829,7 @@ self: {
      mkDerivation {
        pname = "craftwerk-gtk";
        version = "0.1";
-       sha256 = "18b63yh4p5ry38c3p6plyhk5j0gmmnyjw25r2dxdaddpnn051nff";
+       sha256 = "ced95080b5b735d57a13b9082ebdadf5015926f4f49a3b181a3e974ba01f66a1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -37733,7 +37847,7 @@ self: {
      mkDerivation {
        pname = "crc16";
        version = "0.1.1";
-       sha256 = "15x3xwq2vyg474m09jak1c2zx9w5acpfjgmy5jj4asxj33z9n7bz";
+       sha256 = "7f1d9bfe18b26b45a42cbe3ee92e5385a7fe050b53c9042a39e4f92d30efa397";
        libraryHaskellDepends = [ base bytestring ];
        description = "Calculate the crc16-ccitt";
        license = stdenv.lib.licenses.bsd3;
@@ -37745,7 +37859,7 @@ self: {
      mkDerivation {
        pname = "crc16-table";
        version = "0.1";
-       sha256 = "0x943wmcbj679kj7q2a2ipjycq17ajm71m487vkb8b6gdrdy8f2z";
+       sha256 = "5f38e45b6ecf2cb4e63e88d470aa542760e6e58d42097ce44cc7c8c52a1f2475";
        libraryHaskellDepends = [ array base ];
        description = "Compute CRC16 checksums using a lookup table";
        license = stdenv.lib.licenses.bsd3;
@@ -37761,7 +37875,7 @@ self: {
      mkDerivation {
        pname = "creatur";
        version = "5.9.8.2";
-       sha256 = "15cjk5hb4j7ydsis8fz7gag3sa17i6yr26pfbf8aqkw7iakmjqs9";
+       sha256 = "496359a78a874fac905bee1a91bd8927283d9e7ae73ba4a36efe48b260999295";
        libraryHaskellDepends = [
          array base bytestring cereal cond directory exceptions filepath
          gray-extended hdaemonize hsyslog MonadRandom mtl old-locale process
@@ -37785,7 +37899,7 @@ self: {
      mkDerivation {
        pname = "crf-chain1";
        version = "0.2.2";
-       sha256 = "0v0mmpvn9qma3xz92s13ywk9p5czxzshh2rf06hb2zqqq5m6iwhq";
+       sha256 = "18f2686ac1187fb1a0012e0b08f5ef9f959b26f72368917e1faae264f7ad156c";
        libraryHaskellDepends = [
          array base binary containers data-lens logfloat monad-codec
          parallel random sgd vector vector-binary vector-th-unbox
@@ -37805,7 +37919,7 @@ self: {
      mkDerivation {
        pname = "crf-chain1-constrained";
        version = "0.3.2";
-       sha256 = "02xf9q96rlmmfcdz45bpbsdi0ki7mdrdwzg2zph7b55jwsnb4fja";
+       sha256 = "4a3ab2ace6b29475e0fde27dde72ab274e109b5e7715f21b73b5d26c124eae0b";
        libraryHaskellDepends = [
          array base binary containers data-lens logfloat monad-codec
          parallel random sgd vector vector-binary vector-th-unbox
@@ -37824,7 +37938,7 @@ self: {
      mkDerivation {
        pname = "crf-chain2-generic";
        version = "0.3.0";
-       sha256 = "104r52rf5q84bm6977bsfm4djcz8c08warfkk4xmympb0cmxkhxy";
+       sha256 = "bec3d92b03eb565f3b99d365c51160e833d948757a9d934c5d04e1e2b2289980";
        libraryHaskellDepends = [
          array base binary comonad-transformers containers data-lens
          logfloat monad-codec parallel sgd vector vector-binary
@@ -37844,7 +37958,7 @@ self: {
      mkDerivation {
        pname = "crf-chain2-tiers";
        version = "0.2.4";
-       sha256 = "0sxa5rsla676x47a1l8cvypccyl8vi7y68fnbnrk7r20ahw6vxi1";
+       sha256 = "21f66d385440e433b35dd621e34fdc887ac6aedf0cd1a00ee9e61845752eaa6b";
        libraryHaskellDepends = [
          array base binary comonad containers data-lens logfloat monad-codec
          parallel sgd vector vector-binary vector-th-unbox
@@ -37863,7 +37977,7 @@ self: {
      mkDerivation {
        pname = "critbit";
        version = "0.2.0.0";
-       sha256 = "1xdgaj73ffvj1q1kyi62bifbazmzgamfwzdbdz0c339axw5dga82";
+       sha256 = "02a9d70aef2a8dc1c06fab7deeaa7abf7eb55c5cc2443f030e723b378e54aff5";
        libraryHaskellDepends = [
          array base bytestring deepseq text vector
        ];
@@ -37887,7 +38001,7 @@ self: {
      mkDerivation {
        pname = "criterion";
        version = "1.1.0.0";
-       sha256 = "0f1d8lxb9jhrhcm0gbqqimmq52q36b5h1nqznmjmxa75nqdx9vaw";
+       sha256 = "5cedd41bb6e5a85e65b51fdb00cb32038b826b8d18af072a8319cab43a452d38";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -37916,7 +38030,7 @@ self: {
      mkDerivation {
        pname = "criterion-plus";
        version = "0.1.3";
-       sha256 = "127nqhp2gczbfqablvrrk92am4kpsnzhvyl4kcy98kdv313vcwdl";
+       sha256 = "b471b64718bb4d943c9b84fa0dbfd57792aa449a396fba1476ebb3272ec4f688";
        libraryHaskellDepends = [
          base criterion deepseq loch-th monad-control mtl
          optparse-applicative placeholders statistics string-conversions
@@ -37943,7 +38057,7 @@ self: {
      mkDerivation {
        pname = "criterion-to-html";
        version = "0.0.0.3";
-       sha256 = "010x56czgipw3p1cfkx07mlcy4yj6advq3zzgrxpmjhrxzsa89xn";
+       sha256 = "b627a4f4ef19ca7a7b7eff0fbc9b32d213cf683da04fc7c21dfcc6f799291d04";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -37960,7 +38074,7 @@ self: {
      mkDerivation {
        pname = "crockford";
        version = "0.2";
-       sha256 = "1fgsmf2k0v1j7b3gv06q9c65410qa2ivl59rwkm7j931wsymsg26";
+       sha256 = "463c5dbde6612479eae43915baa3501804520c4bd880fdc63a326c3085abfab9";
        libraryHaskellDepends = [ base digits QuickCheck safe ];
        description = "An implementation of Douglas Crockford's base32 encoding";
        license = stdenv.lib.licenses.bsd3;
@@ -37973,7 +38087,7 @@ self: {
      mkDerivation {
        pname = "crocodile";
        version = "0.1.2";
-       sha256 = "1krvcn5yb9i6jxwn2wwnpc8ylivhn27315a2sifn19f1l2vvy038";
+       sha256 = "6800bfb7a0c1a5605dd44295308eb07047ea11bb967361799726a6e58b653bcf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -37994,7 +38108,7 @@ self: {
      mkDerivation {
        pname = "cron";
        version = "0.3.0";
-       sha256 = "18yadf94bzyhm5nab6lc8zagp39yv5k8cjjakhaxncgipcm30s9k";
+       sha256 = "3369302abbf131db159c4a4a8666d93e8dfbd4478c9aa56ca9d0ff45926bcaa3";
        libraryHaskellDepends = [
          attoparsec base mtl mtl-compat old-locale text time
        ];
@@ -38015,7 +38129,7 @@ self: {
      mkDerivation {
        pname = "cron-compat";
        version = "0.2.6";
-       sha256 = "0km70j3xfqvpra9mvbxpvpqd7arjjfcpazmilvmj6kjxk6cw7pfx";
+       sha256 = "ddddc399995d4e23eba6b17e75999332abd3f0ddb7af5d93ca7763d78704a74e";
        libraryHaskellDepends = [
          attoparsec base mtl mtl-compat old-locale text time
          transformers-compat
@@ -38035,7 +38149,7 @@ self: {
      mkDerivation {
        pname = "cruncher-types";
        version = "1.1.0";
-       sha256 = "0kp0vm8mvgn12kk5csyhzv6g6az43acl6iwjbhvfdfr2mqif2b9h";
+       sha256 = "302de122ae22bbe6365c924743991ae42bf3ccfed06b56e614c1be5d51dde04e";
        libraryHaskellDepends = [ aeson base containers lens text ];
        testHaskellDepends = [ base hlint ];
        homepage = "http://github.com/eval-so/cruncher-types";
@@ -38050,7 +38164,7 @@ self: {
      mkDerivation {
        pname = "crunghc";
        version = "0.1.1.1";
-       sha256 = "08341mvdca70nlkdi2im344hhkv62s278a1gkp02hj0zrixzfkqm";
+       sha256 = "154ff77bcc1f4828c09d2f28748416664f080919358ad826b5e028d6760d6420";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -38070,7 +38184,7 @@ self: {
      mkDerivation {
        pname = "crypto-api";
        version = "0.13.2";
-       sha256 = "1vc27qcgbg7hf50rkqhlrs58zn1888ilh4b6wrrm07bnm48xacak";
+       sha256 = "5331d511a9761d5073e6661148234228d88f8ace14e2994171f0bcf5183e82ed";
        libraryHaskellDepends = [
          base bytestring cereal entropy tagged transformers
        ];
@@ -38087,7 +38201,7 @@ self: {
      mkDerivation {
        pname = "crypto-api-tests";
        version = "0.3";
-       sha256 = "0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl";
+       sha256 = "f44aecdd4ceb9da9f38330e84d9c17745a82b0611085ebb34442d2dce4207270";
        libraryHaskellDepends = [
          base bytestring cereal crypto-api directory filepath HUnit
          QuickCheck test-framework test-framework-hunit
@@ -38105,7 +38219,7 @@ self: {
      mkDerivation {
        pname = "crypto-cipher-benchmarks";
        version = "0.0.5";
-       sha256 = "1ddyz0fn3srvm37afbiw86lv0z7iwrmnhazgvk0gg5n3ic57anhq";
+       sha256 = "185a750a8bc396f7c0dcef2b686be6f17cb0a9413c2ea7cea83beb611df8beb5";
        libraryHaskellDepends = [
          base byteable bytestring criterion crypto-cipher-types mtl pretty
          securemem
@@ -38124,7 +38238,7 @@ self: {
      mkDerivation {
        pname = "crypto-cipher-tests";
        version = "0.0.11";
-       sha256 = "19wqignlq90qwpam01hnmmrxaxh5lkax9l1l6rlbi4a07nvp1dnz";
+       sha256 = "dfb670b73d4091b8683634d0d4d5a40576d573ad160650d5e518244ced8b98a7";
        libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types HUnit mtl QuickCheck
          securemem test-framework test-framework-hunit
@@ -38144,7 +38258,7 @@ self: {
      mkDerivation {
        pname = "crypto-cipher-types";
        version = "0.0.9";
-       sha256 = "03qa1i1kj07pfrxsi7fiaqnnd0vi94jd4jfswbmnm4gp1nvzcwr0";
+       sha256 = "2073f6b70df7916aebe2da49d224497183662d56d19da87b76f70039430c0a0f";
        libraryHaskellDepends = [ base byteable bytestring securemem ];
        homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Generic cryptography cipher types";
@@ -38159,7 +38273,7 @@ self: {
      mkDerivation {
        pname = "crypto-classical";
        version = "0.1.0";
-       sha256 = "06x694ia1alw53a282krzmkbcr1xbvn5nmgfqbgysgpz5ky931wg";
+       sha256 = "8f8791fc2cff3eeddfc2ee555bec5e3d64b666fd790a24d4289caaa02249a61b";
        libraryHaskellDepends = [
          base bytestring containers crypto-numbers crypto-random lens
          modular-arithmetic QuickCheck random random-shuffle text
@@ -38178,7 +38292,7 @@ self: {
      mkDerivation {
        pname = "crypto-conduit";
        version = "0.5.5";
-       sha256 = "0zd4smj3rk2x1msl8z8f5y01x4b87rhgm45g26g6c3dsdasn1lyf";
+       sha256 = "ced360b56aba0d669e11af90fa603e68911e802f0e7d44750d5dcc3c64d5a47d";
        libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra crypto-api resourcet
          transformers
@@ -38200,7 +38314,7 @@ self: {
      mkDerivation {
        pname = "crypto-numbers";
        version = "0.2.7";
-       sha256 = "19l9y5jzvqrqfam13xin9m9ca0s5ql86yv0cjn6dzkydx4byn2j2";
+       sha256 = "420aeb17e9cdcfdf8c950c6c6f10c54503c5524d36f611aa7238e3fd65f189a6";
        revision = "1";
        editedCabalFile = "2b493386b7605b70a67f751d6496e9feff8ef319a5294b122a3ff3895a8453ca";
        libraryHaskellDepends = [
@@ -38223,7 +38337,7 @@ self: {
      mkDerivation {
        pname = "crypto-pubkey";
        version = "0.2.8";
-       sha256 = "0vmmx2fqq2xc3xfavy22i2nyynpk88jhmjr62qgxw5w5qgsz5k60";
+       sha256 = "c0ccf2f5c38517de1f1626cb0a2542f35aefad8842f8ad5c1fac0b8c9de8b56e";
        libraryHaskellDepends = [
          base byteable bytestring crypto-numbers crypto-pubkey-types
          crypto-random cryptohash
@@ -38247,7 +38361,7 @@ self: {
      mkDerivation {
        pname = "crypto-pubkey-openssh";
        version = "0.2.7";
-       sha256 = "0ndb1crjl3xbd18bfs3ipqbzn120mpqnn27jfi4vjqf5ak48b444";
+       sha256 = "849085c854c561b94974f2086bf1ad4004fb17be7168b75068ab0f2a330bab59";
        libraryHaskellDepends = [
          asn1-encoding asn1-types attoparsec base base64-bytestring
          bytestring cereal crypto-pubkey-types pem
@@ -38267,7 +38381,7 @@ self: {
      mkDerivation {
        pname = "crypto-pubkey-types";
        version = "0.4.3";
-       sha256 = "0q0wlzjmpx536h1zcdzrpxjkvqw8abj8z0ci38138kpch4igbnby";
+       sha256 = "7ed9f52281ec4e34021a91818fe45288e33d65bff937f60334a3f45be5a71c60";
        libraryHaskellDepends = [ asn1-encoding asn1-types base ];
        homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";
        description = "Generic cryptography Public keys algorithm types";
@@ -38279,7 +38393,7 @@ self: {
      mkDerivation {
        pname = "crypto-random";
        version = "0.0.9";
-       sha256 = "0139kbbb2h7vshf68y3fvjda29lhj7jjwl4vq78w4y8k8hc7l2hp";
+       sha256 = "170a7a18441379c2d1c19b502ee5919026a19adc6e78641cd4fb40b1d69a6904";
        libraryHaskellDepends = [ base bytestring securemem unix vector ];
        homepage = "http://github.com/vincenthz/hs-crypto-random";
        description = "Simple cryptographic random related types";
@@ -38291,7 +38405,7 @@ self: {
      mkDerivation {
        pname = "crypto-random-api";
        version = "0.2.0";
-       sha256 = "0z49kwgjj7rz235642q64hbkgp0zl6ipn29xd19yb75xc5q7gsan";
+       sha256 = "56e9777061bd9ce553683d097ba3a11fdc371724060b62ca103f1f291f9f897c";
        libraryHaskellDepends = [ base bytestring entropy ];
        homepage = "http://github.com/vincenthz/hs-crypto-random-api";
        description = "Simple random generators API for cryptography related code";
@@ -38305,7 +38419,7 @@ self: {
      mkDerivation {
        pname = "crypto-random-effect";
        version = "0.2.0.4.1";
-       sha256 = "1gj40r6i79jvsghyv4nqm3yrjlby9fkxxhzp0lkr5j1b9b3b2xwr";
+       sha256 = "9977b1c64a2bc8922705f7c3dea74b7e5199fda8d892ede1d35ba6134d0644be";
        revision = "1";
        editedCabalFile = "f217573816b1efe3fcc9b1dcbd6325015bc9a87872200547f56a80ec2b959c31";
        libraryHaskellDepends = [
@@ -38325,7 +38439,7 @@ self: {
      mkDerivation {
        pname = "crypto-totp";
        version = "0.1.0.1";
-       sha256 = "0vkjkyaxp0rb4n2p7gdbbswm32gvbsbqnb6xs9hh4rncfaghpqds";
+       sha256 = "bae10b9f72cc660261d2dd2c8b975efb8951b95eabbd7385252b83db959f726e";
        libraryHaskellDepends = [
          base bytestring cereal containers cryptohash tagged unix
        ];
@@ -38340,7 +38454,7 @@ self: {
      mkDerivation {
        pname = "cryptocipher";
        version = "0.6.2";
-       sha256 = "0ip3a2as0df6drl29sryayxx22sx55v6bs60s2fh3i1nxqnydf9l";
+       sha256 = "34b9e62dee36c4019dd0c0e86576295d0bd1bb573eeb24686ec635a09550e346";
        libraryHaskellDepends = [
          base cipher-aes cipher-blowfish cipher-camellia cipher-des
          cipher-rc4 crypto-cipher-types
@@ -38357,7 +38471,7 @@ self: {
      mkDerivation {
        pname = "cryptohash";
        version = "0.11.6";
-       sha256 = "0dyzcaxr8vhzqq9hj4240rxpi87h4ps87yz09klz723shls26f6s";
+       sha256 = "da382334857a88f3e94ce0fb83f425f0a0787b0644100913c61f6e94bb62df37";
        libraryHaskellDepends = [ base byteable bytestring ghc-prim ];
        testHaskellDepends = [
          base byteable bytestring HUnit QuickCheck tasty tasty-hunit
@@ -38375,7 +38489,7 @@ self: {
      mkDerivation {
        pname = "cryptohash-conduit";
        version = "0.1.1";
-       sha256 = "1kmlskgb0jx8hkzdncr24aqir9k1kyfcb2rypvkdld1yin4nslga";
+       sha256 = "ea516d898d3e34dae6be3e8bc59c9f61a61cb1222233dbfe84a84bb0ded4b4ce";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra cryptohash resourcet
          transformers
@@ -38392,7 +38506,7 @@ self: {
      mkDerivation {
        pname = "cryptohash-cryptoapi";
        version = "0.1.3";
-       sha256 = "0wj53p32js8lfg0i8akrljpash0jdiyv2vcqpmjbd4dq2fx81w2n";
+       sha256 = "56f080ba13b891b664bd986db17d6c1240adaea4792a14c173146929c61d4572";
        libraryHaskellDepends = [
          base bytestring cereal crypto-api cryptohash tagged
        ];
@@ -38411,7 +38525,7 @@ self: {
      mkDerivation {
        pname = "cryptol";
        version = "2.2.4";
-       sha256 = "07aai72kg66skdnbydy25a07124znvrixbw91gk4n9430gsvv26z";
+       sha256 = "df88bdf50383244be60b89af1ef3b69f8870802ac237bf6c9bda9837c5894a1d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38438,7 +38552,7 @@ self: {
      mkDerivation {
        pname = "cryptonite";
        version = "0.6";
-       sha256 = "0lzqmhslq1pwj6pp82l3vdnnxbqvh0bqjyl02x2yp6sp72mcq5m0";
+       sha256 = "a016ccaa38579beb4517807a8917801baf6e6ddb830a74af91fc064c35acf853";
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim integer-gmp memory
        ];
@@ -38460,7 +38574,7 @@ self: {
      mkDerivation {
        pname = "cryptsy-api";
        version = "0.2.1";
-       sha256 = "1knnzh77y4rr7ka2nfwr99z61v2pvx2p1mzji06ac0mjk2n80ybs";
+       sha256 = "7a7980ac98b202a60c88f2d77045df57ec607e4a993b2bd43c39137f0efcd6ce";
        libraryHaskellDepends = [
          aeson base bytestring deepseq either http-client http-client-tls
          old-locale pipes-attoparsec pipes-http text time transformers
@@ -38477,7 +38591,7 @@ self: {
      mkDerivation {
        pname = "crystalfontz";
        version = "0.1";
-       sha256 = "14mh098kgckncips17bdsbg08q78xk1114174zq860z4znmc1gxv";
+       sha256 = "bbbfc0aafde40383f027279010c2ece86004ded26d9da06f6476b2375102b092";
        libraryHaskellDepends = [ base crc16-table MaybeT serialport ];
        description = "Control Crystalfontz LCD displays";
        license = stdenv.lib.licenses.bsd3;
@@ -38489,7 +38603,7 @@ self: {
      mkDerivation {
        pname = "cse-ghc-plugin";
        version = "0.1.1";
-       sha256 = "123x10ircbj8lrsqapf6cb9b3ibjgp1q8l862a3i6i0ak7ash49f";
+       sha256 = "2e11a8d5990a44138712065184c37d72c5b1d262c65d8575a6482e9623087d88";
        libraryHaskellDepends = [ base ghc ];
        homepage = "http://thoughtpolice.github.com/cse-ghc-plugin";
        description = "Compiler plugin for common subexpression elimination";
@@ -38502,7 +38616,7 @@ self: {
      mkDerivation {
        pname = "csound-catalog";
        version = "0.2.2";
-       sha256 = "0rrd0gk6z16ydpn90i4siy3p7d1qxb14q022r3mqmj792c1v6z5p";
+       sha256 = "b77cb30313e9c88aebc842004cc2ea38b473878f9a4490ec6dde846fe6032d67";
        libraryHaskellDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-catalog";
        description = "a gallery of Csound instruments";
@@ -38518,7 +38632,7 @@ self: {
      mkDerivation {
        pname = "csound-expression";
        version = "4.8.2";
-       sha256 = "1zhx4smvs8xnqfcv2hxhq57n16cl3sycz659viw8l6v8f36ibj5i";
+       sha256 = "b1c815cd70681b8a78dca998cfbc1e9499604fc1b043b199c3b623bdab261dfe";
        libraryHaskellDepends = [
          base Boolean colour csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
@@ -38537,7 +38651,7 @@ self: {
      mkDerivation {
        pname = "csound-expression-dynamic";
        version = "0.1.4.3";
-       sha256 = "1rzfah8d7j7s45w6zvrs5sabplcapx6njaimkmvfj9dby2brxprw";
+       sha256 = "3cdf9e97f0ab25e9769d352a694dbf8ad1bb942e3aef6f7821fac8d31054eee7";
        libraryHaskellDepends = [
          array base Boolean containers data-default data-fix data-fix-cse
          transformers wl-pprint
@@ -38554,7 +38668,7 @@ self: {
      mkDerivation {
        pname = "csound-expression-opcodes";
        version = "0.0.3";
-       sha256 = "0f7nwrnrpsi31q9vaxy2yihripzqjzp6683qy94ljkmxmfnm9sb5";
+       sha256 = "65e954adabbd4e4949f2782063ee97f8df9861f4c277b5130e23ea9b6de6f638";
        libraryHaskellDepends = [
          base csound-expression-dynamic csound-expression-typed transformers
        ];
@@ -38571,7 +38685,7 @@ self: {
      mkDerivation {
        pname = "csound-expression-typed";
        version = "0.0.7.7";
-       sha256 = "1z9hvkgl6lqwrdhngq79425s2frhkg4llkcpsar21d5ld4fhzfdl";
+       sha256 = "b4b90f1d69b4b420b2d2974d4ac99b303ba18b20e9e06761cb1c5343dfdc30fd";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          data-default deepseq ghc-prim stable-maps temporal-media
@@ -38588,7 +38702,7 @@ self: {
      mkDerivation {
        pname = "csound-sampler";
        version = "0.0.6.2";
-       sha256 = "0qgz3k6cw5hzp5la051xnmg3697p7yfdamn8r6mp7ca4fai311h0";
+       sha256 = "008630a27244b173abc9c856d59c3ff724335eb53d14a068b91f16cecc1cff61";
        libraryHaskellDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
@@ -38601,7 +38715,7 @@ self: {
      mkDerivation {
        pname = "csp";
        version = "1.0";
-       sha256 = "0skz2yx8armbr0x7vhixxkbm7qbspg38723x98k6kysz7n5nzw2c";
+       sha256 = "4cf06f8b3d5ffb69264a7d8883c6bb7ae153d7ec3dc27d3ac8ab6685ba177f6a";
        libraryHaskellDepends = [ base containers mtl nondeterminism ];
        description = "Discrete constraint satisfaction problem (CSP) solvers";
        license = "LGPL";
@@ -38614,7 +38728,7 @@ self: {
      mkDerivation {
        pname = "cspmchecker";
        version = "1.0.0";
-       sha256 = "1yz94yvggw6a7fh2p7fszyp02nnk7labbl6z079gqn3smayzfs31";
+       sha256 = "6168f7bdaa7a58fcd201dfd0b5143dd35a01aeffda9d2ba03bcaf0f7b627e9fb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -38631,19 +38745,37 @@ self: {
      mkDerivation {
        pname = "css";
        version = "0.2";
-       sha256 = "150gdsf059x658z6cbclrydzbynw06nhrpf4i1l9gwb6siarvjv9";
+       sha256 = "69cb9d55d466f1976888c4dd0cad01dcfaf59bcf942d663e2aa6a7029c6e0f94";
        libraryHaskellDepends = [ base mtl text ];
        description = "Minimal monadic CSS DSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "css-syntax" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory, hspec
+     , scientific, text
+     }:
+     mkDerivation {
+       pname = "css-syntax";
+       version = "0.0.2";
+       sha256 = "9ee149c46c3f76d46943bf7b374be79535aaec393b3a5dc2f176636c76382115";
+       libraryHaskellDepends = [
+         attoparsec base bytestring scientific text
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring directory hspec scientific text
+       ];
+       description = "This package implments a parser for the CSS syntax";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "css-text" = callPackage
     ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }:
      mkDerivation {
        pname = "css-text";
        version = "0.1.2.1";
-       sha256 = "1xi1n2f0g8y43p95lynhcg50wxbq7hqfzbfzm7fy8mn7gvd920nw";
+       sha256 = "dc0291da7ec756e4dda9dfadef303c78750eca63d07a5ad21dc4a3079cb021f6";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base hspec QuickCheck text ];
        homepage = "http://www.yesodweb.com/";
@@ -38656,7 +38788,7 @@ self: {
      mkDerivation {
        pname = "csv";
        version = "0.1.2";
-       sha256 = "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c";
+       sha256 = "8cf43442325faa1368f9b55ad952beccf677d9980cdffa3d70a7f204a23ae600";
        libraryHaskellDepends = [ base filepath parsec ];
        description = "CSV loader and dumper";
        license = stdenv.lib.licenses.mit;
@@ -38672,7 +38804,7 @@ self: {
      mkDerivation {
        pname = "csv-conduit";
        version = "0.6.6";
-       sha256 = "12sxxv92qblsa63zdnl80a8yk01b4cvk9k6h58w82bvcy5m0aabk";
+       sha256 = "7329056af16c2f81382ad0cc3437232b80e9910288daf687519a2e2cd2ee5d8b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38702,7 +38834,7 @@ self: {
      mkDerivation {
        pname = "csv-enumerator";
        version = "0.10.2.0";
-       sha256 = "0n1zc9rwzj9w39nmjfn65qawj19b6zay3d62ss2crnxbgqnh07gh";
+       sha256 = "f01d002d7eabdbcc84d6c2b4e1d5372b05c9152ec63a596d1a3cc9cf73623f58";
        libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring containers
          directory enumerator safe transformers unix-compat
@@ -38719,7 +38851,7 @@ self: {
      mkDerivation {
        pname = "csv-nptools";
        version = "0.4.1";
-       sha256 = "0898553pikxjgmycdyiw92bbmzxgbl4dl8029qljyjzlzlasj7by";
+       sha256 = "7e1da915fdf44b2f294e0220da085dafffba96483cfac67c7db2cf7847292821";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -38736,7 +38868,7 @@ self: {
      mkDerivation {
        pname = "csv-to-qif";
        version = "0.3.2";
-       sha256 = "1mfy19fvi92zzzqn70ga2p5csmc8qm0qnkn3vyl41ic6f69vm73x";
+       sha256 = "7d9cba937186c540a8dfc34e8b41c58855cdca15ea8163f1ff5fa4b85d0aded5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -38753,7 +38885,7 @@ self: {
      mkDerivation {
        pname = "ctemplate";
        version = "0.1";
-       sha256 = "02xsw0zpg728cq018w6zjgbzk6d7px62mapn40gir9c0hi6rqlx8";
+       sha256 = "a8539c4d8480a51c1f20f6aa2a4cbfa799f9d793df70140066489c773fe0ba0b";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ ctemplate ];
        homepage = "http://darcs.imperialviolet.org/ctemplate";
@@ -38767,7 +38899,7 @@ self: {
      mkDerivation {
        pname = "ctkl";
        version = "0.27.0.0";
-       sha256 = "0sqrg04zlwq62jggjvrd1dq7a2alwx2190w6b19d3jn51n0s907m";
+       sha256 = "f580a4810dc5cad1525886831444e7540975700b2d6ff99e140673fa0978196b";
        libraryHaskellDepends = [ array base ];
        jailbreak = true;
        description = "packaging of Manuel Chakravarty's CTK Light for Hackage";
@@ -38780,7 +38912,7 @@ self: {
      mkDerivation {
        pname = "ctpl";
        version = "0.1.0.1";
-       sha256 = "1mbqgbig5n8rrkxmrdbcl8qafa2r58c2pial2b67yr6cw08v0srv";
+       sha256 = "3b6bb011e0cc647fcc1254c52b182a5928a730a26cb55cfbcc19d9f2e27a78d5";
        libraryHaskellDepends = [ base chatty-text chatty-utils ];
        jailbreak = true;
        description = "A programming language for text modification";
@@ -38795,7 +38927,7 @@ self: {
      mkDerivation {
        pname = "ctrie";
        version = "0.1.0.2";
-       sha256 = "11ylwjmp015ppisczggzj1x7mfg1bfg4g4qg0s91xrrgms78r014";
+       sha256 = "24808c8eae2fe71e92060f93479e5be1b97a7a90ffbdcf74bcb70470abe4d487";
        libraryHaskellDepends = [ atomic-primops base hashable primitive ];
        testHaskellDepends = [
          base containers hashable QuickCheck test-framework
@@ -38813,7 +38945,7 @@ self: {
      mkDerivation {
        pname = "cube";
        version = "0.2.0";
-       sha256 = "0shclcwnh1az40ckvmhpw93xbhrr19wfhhvclcnv2fijy29667yp";
+       sha256 = "d71f6392f0323ab12da36c43e8780a39c3d547e217d63d19205f056839a30c6a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal containers STL ];
@@ -38834,7 +38966,7 @@ self: {
      mkDerivation {
        pname = "cubical";
        version = "0.2.0";
-       sha256 = "1n44d39s3r5iakbhjf99w49gb1y8l1xl46lz40jkhx7k4knwb1fj";
+       sha256 = "d285c5ed24f3743825209f1a427ba0c887f512e1293909d754b1e4a1d36884d8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -38853,7 +38985,7 @@ self: {
      mkDerivation {
        pname = "cubicbezier";
        version = "0.3.0";
-       sha256 = "1d5mr1xr1y7qnb65ybf6gncndzdz63di3gxrzwykks706ry475sr";
+       sha256 = "5997437c36e0e8393dffb9bf11db30bffd66997dc62d5fccb2f8f8907bc8b5b4";
        libraryHaskellDepends = [ base containers integration ];
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Efficient manipulating of 2D cubic bezier curves";
@@ -38865,7 +38997,7 @@ self: {
      mkDerivation {
        pname = "cubicspline";
        version = "0.1.1";
-       sha256 = "0n4c80vjf8sh5wf1n0qp9z8v8z7mj7rfygjg5a02sz0s6l7q1i8s";
+       sha256 = "1ac5800f351a7c2d802a4f3eeff291f57cb4d14f17031b1c2f50232737408c58";
        libraryHaskellDepends = [ base hmatrix safe ];
        description = "Natural cubic spline interpolation";
        license = stdenv.lib.licenses.bsd3;
@@ -38878,7 +39010,7 @@ self: {
      mkDerivation {
        pname = "cublas";
        version = "0.2.1.0";
-       sha256 = "02x8a9varkj770cl4nnb0mf4qh519gf9mv51awinlaikyz932q1w";
+       sha256 = "3c6031d2f7332a6a2357a1ec9adc4ba1404c5c05cb5a42193847ceac7652a80b";
        libraryHaskellDepends = [
          base cuda filepath language-c storable-complex template-haskell
        ];
@@ -38895,7 +39027,7 @@ self: {
      mkDerivation {
        pname = "cuboid";
        version = "0.14.2";
-       sha256 = "08l8qf98d5p9d5qyj3kh35rzp8fih77bd2pras4dkn7an39pmr6b";
+       sha256 = "cbe47ad3b0ead8d98856f98ab6ce81d1a1fb7319700ee97169e9968692c38822";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT Yampa ];
@@ -38908,7 +39040,7 @@ self: {
      mkDerivation {
        pname = "cuda";
        version = "0.6.6.2";
-       sha256 = "10c2nn0qhhznajpkjvmxivz3w6zr96fpsych53hnvpi2g6a332k1";
+       sha256 = "618a31947922de6de12890797d9d49f91b3efe8ebd6e39af54f6438881b58281";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -38926,7 +39058,7 @@ self: {
      mkDerivation {
        pname = "cudd";
        version = "0.1.0.2";
-       sha256 = "0zhsj4qrvk1q1rj55nsysznv11m1x31dg7gxmgp5wdsk8l18w02r";
+       sha256 = "59008e024553375eeeabfd9dd7c2e8a186b0edd75edb52640e38cc9d31911a7e";
        libraryHaskellDepends = [ array base mtl transformers ];
        librarySystemDepends = [ cudd dddmp epd mtr st util ];
        libraryToolDepends = [ c2hs ];
@@ -38942,7 +39074,7 @@ self: {
      mkDerivation {
        pname = "cufft";
        version = "0.1.2.1";
-       sha256 = "1qkrp2dwfpivf5j42a7wij61010a3rmldxng4j8ivkrc7vllv76j";
+       sha256 = "d29c4de93e2ccf1d9124cff6466b1e0a04108c8cfc284164713b5ec79bb879e2";
        libraryHaskellDepends = [ base cuda ];
        libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/robeverest/cufft";
@@ -38955,7 +39087,7 @@ self: {
      mkDerivation {
        pname = "curl";
        version = "1.3.8";
-       sha256 = "0vj4hpaa30jz7c702xpsfvqaqdxz28zslsqnsfx6bf6dpwvck1wh";
+       sha256 = "9087c936bfcdb865bad3166baa3f12bf37acf076fa76010e3b5f82a1d485446e";
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ curl ];
        description = "Haskell binding to libcurl";
@@ -38967,7 +39099,7 @@ self: {
      mkDerivation {
        pname = "curl-aeson";
        version = "0.0.4";
-       sha256 = "1fpi448f6bgf3rbw3zxf7r9nwyhv9q67zan5sixnad1y7lqxivrx";
+       sha256 = "3defd8313d3e34657bd4c5aa7f0c4e1b7a6e533eaeffc1571eee2de31021f1ba";
        libraryHaskellDepends = [ aeson base curl text utf8-string ];
        homepage = "https://github.com/zouppen/haskell-curl-aeson";
        description = "Communicate with HTTP service using JSON";
@@ -38979,7 +39111,7 @@ self: {
      mkDerivation {
        pname = "curlhs";
        version = "0.1.6";
-       sha256 = "1yh7rfk9ppglpjymzzi2yc44g9bp0irnl2yvj77y55djdkmckq3b";
+       sha256 = "6be0c9ea6cb295e2cf91db0b6a730477a54708f322fe5fbdbcf4dd9ba6cb07fa";
        revision = "1";
        editedCabalFile = "ac8dbe0348ce66746774f019fe62dbdaf40a200bed62f5b7fb0ecb9bd11cfa1c";
        libraryHaskellDepends = [ base bytestring rtld time ];
@@ -38995,7 +39127,7 @@ self: {
      mkDerivation {
        pname = "currency";
        version = "0.2.0.0";
-       sha256 = "0yj1x7zmkmwr9az55i9gvf84m7i3b4qi80p8qk9hszzlv7rigmdw";
+       sha256 = "bcd517f3d9f47f0dd3c4e802143159239e4a90db2fc552be4a99d759ffe9417a";
        libraryHaskellDepends = [
          base containers hashable iso3166-country-codes
        ];
@@ -39009,7 +39141,7 @@ self: {
      mkDerivation {
        pname = "current-locale";
        version = "0.2.0.1";
-       sha256 = "18lg46fzpz207bd60hbcas6ippw0wnsc8n93pnz775ks5y7apyr5";
+       sha256 = "25fbab8e2f7a9673bebd2359c4b4e580df1b8d566c4160da3a40fcfb9d218fa2";
        libraryHaskellDepends = [ base old-locale process split ];
        homepage = "https://github.com/koterpillar/current-locale";
        description = "Get the current system locale in System.Locale format";
@@ -39023,7 +39155,7 @@ self: {
      mkDerivation {
        pname = "curry-base";
        version = "0.2.9";
-       sha256 = "0sdwygsbqmvcbzi7zsr0jd02s2r19pc7zsk4b6hjxv4vzjc9f120";
+       sha256 = "40049798fc9bec2ea15964ea7fd84d210b2d409320eb7fe25f6c57bcf4f3bc69";
        libraryHaskellDepends = [
          base containers directory filepath mtl old-time pretty syb
        ];
@@ -39040,7 +39172,7 @@ self: {
      mkDerivation {
        pname = "curry-frontend";
        version = "0.2.12";
-       sha256 = "1igys4i7wwj1ildkf4is66gq22zsjg158kv3ald5xiilwkmvfc4h";
+       sha256 = "9030b7ebe434c65e1a55634f54c293fa0b819f313a12371b8d41727e22d1fec5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ filepath ];
@@ -39060,7 +39192,7 @@ self: {
      mkDerivation {
        pname = "cursedcsv";
        version = "0.1.2";
-       sha256 = "045lfyhpwjgcdw3wxj2klq0aqn555f5r4w95fr06vsq5pxspnnvc";
+       sha256 = "6c5b7b75bf05eb6d40762571928b2ba558ac00a653c8ce076fec497ea177b410";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39080,7 +39212,7 @@ self: {
      mkDerivation {
        pname = "curve25519";
        version = "0.2.1";
-       sha256 = "1kfs7cjxig0rk17nb7dzi189msww90yw0066rlalw01kff5w2hdy";
+       sha256 = "be41c18b7333004e15cdc600c03d489ceb9a5088bf9d654f9819bcd8253bdacd";
        libraryHaskellDepends = [ base bytestring crypto-api ];
        testHaskellDepends = [
          base bytestring crypto-api DRBG HUnit QuickCheck tagged
@@ -39099,7 +39231,7 @@ self: {
      mkDerivation {
        pname = "curves";
        version = "1.1.0.1";
-       sha256 = "0zmy9an40wnxjhqjhlvsg0jy4bqqby6hl8ckjcm0406988ma8mi6";
+       sha256 = "2656a42a42c900022a9393210a8d5f182fe225787a53283194dd7240ac4abe7e";
        libraryHaskellDepends = [
          base bytestring containers filepath HaXml JuicyPixels QuickCheck
        ];
@@ -39113,7 +39245,7 @@ self: {
      mkDerivation {
        pname = "custom-prelude";
        version = "0.2.2.0";
-       sha256 = "00lkpkl79kznib0s6xm644f3k13dv59x5z06ccymvx6l6iqxyzn6";
+       sha256 = "c67edf7134d4f45d3d6306fcd253d96d84391c21a676a3c18af6cf74e8bc9302";
        libraryHaskellDepends = [ base basic-prelude monad-loops ];
        jailbreak = true;
        homepage = "https://github.com/ajnsit/custom-prelude";
@@ -39126,8 +39258,8 @@ self: {
      }:
      mkDerivation {
        pname = "cv-combinators";
-       version = "0.1.3";
-       sha256 = "1lak96kr1fpsrqcvgv9k0igd5w2f42hv20f2mw8cvr0q0xwzc9zb";
+       version = "0.2.0.2";
+       sha256 = "fdb44fb8ed7ecadb8702eb6b610b45245dcfbac98ddd6cdb5122d4e9f0d98e7e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39145,7 +39277,7 @@ self: {
      mkDerivation {
        pname = "cyclotomic";
        version = "0.4.3";
-       sha256 = "14rfyxmqjrlirszk2mrqm030rya6cbcydbf7fl7if82y21qrfg0p";
+       sha256 = "173c9771105e20170f75c7ade6d96246f90c06a8385731bfce9166896bf72e93";
        libraryHaskellDepends = [ arithmoi base containers ];
        jailbreak = true;
        description = "A subfield of the complex numbers for exact calculation";
@@ -39161,7 +39293,7 @@ self: {
      mkDerivation {
        pname = "cypher";
        version = "0.8.1";
-       sha256 = "0f79791j9nczm80cifpc4iq5pqkhca67s94c5wqm0kiprlxblc53";
+       sha256 = "a330ba3acd374e50312f8c247d8c6270e25b7024ecbac800aa9fd924433ae938";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring classy-parallel conduit
          http-conduit http-types resourcet text transformers
@@ -39177,14 +39309,14 @@ self: {
     ({ mkDerivation, async, attoparsec, base, binary, blaze-builder
      , bytestring, conduit, conduit-extra, containers
      , data-binary-ieee754, data-default, exceptions, free, hslogger
-     , mtl, network, QuickCheck, singletons, stm, tasty
+     , mtl, network, QuickCheck, singletons, stm, tasty, tasty-hunit
      , tasty-quickcheck, tasty-th, template-haskell, text, transformers
      , xml-conduit, xml-hamlet, xml-picklers, xml-types
      }:
      mkDerivation {
        pname = "d-bus";
-       version = "0.1.2";
-       sha256 = "176brypscws03sswda215ywc6l5hj6l5iw4vkfrcppzycdyh3yd2";
+       version = "0.1.3";
+       sha256 = "0e1eb50a1a1185bc898e87f93040f47b80d8a0beb132fb2c14a77b6720011f32";
        libraryHaskellDepends = [
          async attoparsec base binary blaze-builder bytestring conduit
          conduit-extra containers data-binary-ieee754 data-default
@@ -39193,7 +39325,7 @@ self: {
          xml-types
        ];
        testHaskellDepends = [
-         base binary bytestring mtl QuickCheck singletons tasty
+         base binary bytestring mtl QuickCheck singletons tasty tasty-hunit
          tasty-quickcheck tasty-th text xml-hamlet
        ];
        description = "Permissively licensed D-Bus client library";
@@ -39206,7 +39338,7 @@ self: {
      mkDerivation {
        pname = "d3js";
        version = "0.1.0.0";
-       sha256 = "0wrxvfgss9fiv1pwsdi1md0plc4mf9sadkhgm46dsfq16dwrp3q2";
+       sha256 = "028f9b7933013bdd0ca90fcea6747295307a41ab2136cd6fd8d125ad9fdb3d73";
        libraryHaskellDepends = [ base mtl random text ];
        jailbreak = true;
        homepage = "https://github.com/nebuta/d3js-haskell";
@@ -39219,7 +39351,7 @@ self: {
      mkDerivation {
        pname = "daemonize-doublefork";
        version = "0.1.1";
-       sha256 = "1g446qxff8ajv44341y0f9v39j8idmnn23lwi08gq3ps4qrz0py2";
+       sha256 = "c25ff03326fa0efc10889c0e616d6d11c9347672c0073208d95221e73a3684bc";
        libraryHaskellDepends = [ base directory unix ];
        homepage = "https://github.com/scvalex/daemonize-doublefork";
        description = "Start background daemons by double-forking";
@@ -39234,7 +39366,7 @@ self: {
      mkDerivation {
        pname = "daemons";
        version = "0.2.1";
-       sha256 = "0zf9831vl1hz606nsp0yhjg46wxzvwkd3hn9shjw5akk26sddi8p";
+       sha256 = "17c5d6b41173aac225d4c9c2d126dfbf73439e841e5c6d0d301f06bac340c97d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39261,7 +39393,7 @@ self: {
      mkDerivation {
        pname = "dag";
        version = "0.1.0.2";
-       sha256 = "0khfyyzqzw7jj4n8p1k96wdrb2087jd380fzhlkmf0g7s4346pvp";
+       sha256 = "775f4306d1e701572785df01349a3c0888951b3769868b2c91f2f08fbff70e4e";
        libraryHaskellDepends = [ base constraints singletons ];
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-instances
@@ -39278,7 +39410,7 @@ self: {
      mkDerivation {
        pname = "damnpacket";
        version = "0.6.0";
-       sha256 = "137ckcsy2a9f8xfw83rapl2msb6z0pdlsksay5qkymxcpfwrabyb";
+       sha256 = "cb2f95b9bbac573f71f14a4f4ddb05df2c5d05bd2a0fc45d472e29e1359bec8c";
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq text
        ];
@@ -39297,7 +39429,7 @@ self: {
      mkDerivation {
        pname = "dao";
        version = "0.1.0.1";
-       sha256 = "0caas3ql32925rzsghb7rdrm17bw3hn84cizkl9dqmz6nwlhclk9";
+       sha256 = "69520629b7e657dc129d3f32822c1c7c9d5073cb67c1a77f2e228941f1d04a31";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39327,7 +39459,7 @@ self: {
      mkDerivation {
        pname = "dapi";
        version = "0.2.0.0";
-       sha256 = "0idi472qqks286fbw718vddk5kc3vxicrb8m38sllw6x663xnljz";
+       sha256 = "5f52db8731dd704a351a15adcc62df83cd325bdb281cbe9c41424f8cc521b145";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39355,7 +39487,7 @@ self: {
      mkDerivation {
        pname = "darcs";
        version = "2.10.1";
-       sha256 = "157faxxzziaj79ln1qqvrii1vnafyknfbnmgl4y5krw06ys6bvzi";
+       sha256 = "f1ef65b43780e7593ca1afdae5ecf44ed91d62cc1be360693a52c5ff7b57ee94";
        configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
        isLibrary = true;
        isExecutable = true;
@@ -39394,7 +39526,7 @@ self: {
      mkDerivation {
        pname = "darcs-benchmark";
        version = "0.1.9";
-       sha256 = "1qwh4yas6alp65lwimh8xlz3i572nxn4iwqsppx7qqlj8kjhbyvj";
+       sha256 = "72fb05e54492627cfabd1af3486cb7e294383eed08d6c86931972aa3952790e3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39420,7 +39552,7 @@ self: {
      mkDerivation {
        pname = "darcs-beta";
        version = "2.7.99.2";
-       sha256 = "0jkgy8k2i7hhcl7dzm4zvbm0q189hhp4cza9aslslzcq15jsa225";
+       sha256 = "4508a56509987daaa956497d462e8409050ceada9fd4df0e65109e2826f26f4a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39451,7 +39583,7 @@ self: {
      mkDerivation {
        pname = "darcs-buildpackage";
        version = "0.5.12";
-       sha256 = "0c82r7bgz8wj172q1n4dfz9kfn4466v7k159vlkfdqv7as0qj8qf";
+       sha256 = "0e2389815667e3e626dda98479b631845837d3778dd880c50992a3ffd6c90231";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39471,7 +39603,7 @@ self: {
      mkDerivation {
        pname = "darcs-cabalized";
        version = "2.0.2.2";
-       sha256 = "1lc1v30zmlcrp6i22d3arghqhy9pjncddr34df6zd8s0r9wsi61d";
+       sha256 = "2d98a879ca40a3f68d6b64e4d69895377988e1cb6a3421a2b999d1fac1d881d1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39494,7 +39626,7 @@ self: {
      mkDerivation {
        pname = "darcs-fastconvert";
        version = "0.2.1";
-       sha256 = "1a49v3l9n5cqlmdpjj8mzz5v6b47my84id62ag7004ynr11vih9s";
+       sha256 = "3ac1b843c8d61300ce53c2b44890af872cb3cbff1549795ba598159be8d889a8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39513,7 +39645,7 @@ self: {
      mkDerivation {
        pname = "darcs-graph";
        version = "1.0";
-       sha256 = "01404plnjrds57lf7widss2piwpal9khl0gq22xkswj68zzfjcv6";
+       sha256 = "6633e9fe4746723dbb10f8010a67a2eaf27885d62df2e3e829ba6569e9258004";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39532,7 +39664,7 @@ self: {
      mkDerivation {
        pname = "darcs-monitor";
        version = "0.4.2";
-       sha256 = "0rp6flaizbaxzr28fr82vaacl4wajh6zdqnwcbgyhwz5dj7rdanq";
+       sha256 = "d8aa968f6ce573e8df62dce2f60d948a13ca94da02658744fe5dad1f1575e666";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39550,7 +39682,7 @@ self: {
      mkDerivation {
        pname = "darcs-scripts";
        version = "0.1.1";
-       sha256 = "06gs18s89nc5qyicfpkj0hz999l5pf4glhlanm2yhyd6lxbfgkba";
+       sha256 = "6acde756a7a679e845b58a42fa88bb85a6943e04725ec7a2c785d984340afa19";
        libraryHaskellDepends = [ base ];
        description = "Shell scripts for support of darcs workflow";
        license = stdenv.lib.licenses.bsd3;
@@ -39564,7 +39696,7 @@ self: {
      mkDerivation {
        pname = "darcs2dot";
        version = "0.1.0.1";
-       sha256 = "0r6hri2kpfq7r0c25qrlrj5y9pi2j76njvwsgrpnpm6p4gg151wk";
+       sha256 = "938712de23d7d46b6f7e9a6f69cd9122dee48bcc34e32218c807bb3b45ccd064";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39588,7 +39720,7 @@ self: {
      mkDerivation {
        pname = "darcsden";
        version = "1.1.1";
-       sha256 = "1dz87a6a6bmi2sfk0q21syipgnhpg9fdlr86m7sdrlk4s9s1s0c5";
+       sha256 = "85011d74d264d2dcf4a90665da5c7a17da77a3d74160309d16b12ea38c3ae8b7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39615,7 +39747,7 @@ self: {
      mkDerivation {
        pname = "darcswatch";
        version = "0.4.4";
-       sha256 = "1gl0wplzlhb6ynacq7bv38ijhazpwr642zc0a2dixbpibchgxksf";
+       sha256 = "4ecffe205bf1ae1e9b50807d414ce6f72b28231a7b1dcc94f56641fae9e580be";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39637,7 +39769,7 @@ self: {
      mkDerivation {
        pname = "darkplaces-demo";
        version = "0.1";
-       sha256 = "0map78fnnqm2nlh92xrxmg3fs9q2hb4pl87hyara41v2dvwlsj3f";
+       sha256 = "6e484df96e6207a2b2f2f0207ac9820227edc6ab3d779120b5a2626b1d3a5755";
        revision = "1";
        editedCabalFile = "d16b0f7e29060476084a0457d38e524e1965b05e591af570197f287d574a8d01";
        isLibrary = true;
@@ -39663,7 +39795,7 @@ self: {
      mkDerivation {
        pname = "darkplaces-rcon";
        version = "0.1";
-       sha256 = "0ngxjb6zja7l905ixkr0cjyan21m311wc5dqdzacw5j5w7119v75";
+       sha256 = "e5ec14c2e14516ced46fb815c643183508abbc6420cf1e0b48f428f9cd92fd59";
        libraryHaskellDepends = [
          base byteable bytestring cryptohash network time
        ];
@@ -39683,7 +39815,7 @@ self: {
      mkDerivation {
        pname = "darkplaces-rcon-util";
        version = "0.1.1";
-       sha256 = "1xv9906ag2vgkzbk66f9r6lr5j6qwlwss246hjl7iriq315dmqlg";
+       sha256 = "8fe2da4a1838e678a8848608ad39e5d8c892a9c9c91933d79f6f8ba70c4869f7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39712,7 +39844,7 @@ self: {
      mkDerivation {
        pname = "darkplaces-text";
        version = "0.2.1";
-       sha256 = "12nsr005pk0v1nril61javh6nrjhqcvlif11mfhch8bvvcaiy4rm";
+       sha256 = "35131f15db7b21c8a0ab21b84837c350666be05632181ab30d1bcc5b00c8da8a";
        libraryHaskellDepends = [
          ansi-terminal array base bytestring text utf8-string vector
        ];
@@ -39731,7 +39863,7 @@ self: {
      mkDerivation {
        pname = "dash-haskell";
        version = "1.1.0.2";
-       sha256 = "1h22ay2cl5j2ngm2xi2hyvvprnmz48qcpzxiq9ldkzx8gg3gs36j";
+       sha256 = "d20cfdc67ba8ffd968c2b1ffcb3022bfda7cf7f650c42eeab34216ca845742c0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39749,7 +39881,7 @@ self: {
      mkDerivation {
        pname = "data-accessor";
        version = "0.2.2.6";
-       sha256 = "0668qgllmp2911ppsb0g9z95nq2x0h2cvzyyjlb6iwhnjzyyg7gf";
+       sha256 = "ee9de7fd9716f2681695deffcd04045d605bd24f0f2c7d6f0849dc4ae9c3c818";
        libraryHaskellDepends = [ array base containers transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Utilities for accessing and manipulating fields of records";
@@ -39761,7 +39893,7 @@ self: {
      mkDerivation {
        pname = "data-accessor-monadLib";
        version = "0.0.1";
-       sha256 = "0l1ywmr4jry4cys7lq6k0w0nsdpqj1g5l3vsnxyf0ai1901zk18i";
+       sha256 = "1185f90348212ae07cb77a0f5a5e90f8366d0107d3607ab467c4674972e53e50";
        libraryHaskellDepends = [ base data-accessor monadLib ];
        jailbreak = true;
        description = "Accessor functions for monadLib's monads";
@@ -39773,7 +39905,7 @@ self: {
      mkDerivation {
        pname = "data-accessor-monads-fd";
        version = "0.2.0.3";
-       sha256 = "1yvfk55qra7f9ggcybw3j68xg9dzx2f07swj99v4f588gh32ixhz";
+       sha256 = "1ff628067c081547764a92eb039ce8bfa5d79191832fcfde4beea88c4b996efb";
        libraryHaskellDepends = [
          base data-accessor monads-fd transformers
        ];
@@ -39788,7 +39920,7 @@ self: {
      mkDerivation {
        pname = "data-accessor-monads-tf";
        version = "0.2.1.4";
-       sha256 = "12skayn01s8svfdr4h5am2y2dw7ax6s83pb7vy3jxyddywpm04mk";
+       sha256 = "b312502ff7adf92e87df67dd81b4e9eaf026bca8aa40929bdb1ae900ac57538b";
        libraryHaskellDepends = [
          base data-accessor monads-tf transformers
        ];
@@ -39803,7 +39935,7 @@ self: {
      mkDerivation {
        pname = "data-accessor-mtl";
        version = "0.2.0.4";
-       sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh";
+       sha256 = "10cf9166e2e046076b7e58987718e57b31408e7cada9f26c8ff111e0379814c5";
        libraryHaskellDepends = [ base data-accessor mtl ];
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in mtl State monad class";
@@ -39816,7 +39948,7 @@ self: {
      mkDerivation {
        pname = "data-accessor-template";
        version = "0.2.1.12";
-       sha256 = "0pkr9qbvgysgsa28dpa77a21ghlgiykkcyl41gpr4s7jl9wjs107";
+       sha256 = "07042d79a2f26892ef0b847a36a78f8fc217843a47dd8684d24ffbb7174e795e";
        libraryHaskellDepends = [
          base data-accessor template-haskell utility-ht
        ];
@@ -39830,7 +39962,7 @@ self: {
      mkDerivation {
        pname = "data-accessor-transformers";
        version = "0.2.1.6";
-       sha256 = "1iawhp1h68ynr2axj12jrn47nf08mss0ar8blagp59yi8j7170fa";
+       sha256 = "ca81138e44d1a7729fa20b6505b4ae08387b88cd5204d995c8d62303c3855cc5";
        libraryHaskellDepends = [ base data-accessor transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in transformers State monad";
@@ -39842,7 +39974,7 @@ self: {
      mkDerivation {
        pname = "data-aviary";
        version = "0.4.0";
-       sha256 = "03jhlb7w98bwx5xa23as9i6id0qxcl4f7k9rql2cgcy8nxf7c2xn";
+       sha256 = "b60b765cb7c8b3c704c539cde308651d83164d4c5a0da17ae97ca1c4cfa2500e";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "Combinator birds";
@@ -39854,7 +39986,7 @@ self: {
      mkDerivation {
        pname = "data-binary-ieee754";
        version = "0.4.4";
-       sha256 = "02nzg1barhqhpf4x26mpzvk7jd29nali033qy01adjplv2z5m5sr";
+       sha256 = "59975abed8f4caa602f0780c10a9b2493479e6feb71ad189bb10c3ac5678df0a";
        libraryHaskellDepends = [ base binary ];
        homepage = "https://john-millikin.com/software/data-binary-ieee754/";
        description = "Parser/Serialiser for IEEE-754 floating-point values";
@@ -39866,7 +39998,7 @@ self: {
      mkDerivation {
        pname = "data-bword";
        version = "0.1";
-       sha256 = "1s0fid1b8fjazii4j9rsjfmfhyacacknvy374y7nixsdgl4xp44d";
+       sha256 = "8d90db097d4df7688f2767f86d27534c79e8aa933a274962fc4a3ab4428b0ee8";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/mvv/data-bword";
@@ -39879,7 +40011,7 @@ self: {
      mkDerivation {
        pname = "data-carousel";
        version = "0.1.0.0";
-       sha256 = "1vp17428a2pw4g3y2ra22ll5vjnqwl2xwr2wfj8ppkxaj34a2nsh";
+       sha256 = "505ba1c890aacf7b91745c64de05e5d8ca5d28154265e1c723fc0a850439e1ee";
        revision = "1";
        editedCabalFile = "56aa17d4ad0390625d0694ff6f8e281720d96bdabc678cc10934ac9becc663ea";
        libraryHaskellDepends = [ base containers lens ];
@@ -39892,7 +40024,7 @@ self: {
      mkDerivation {
        pname = "data-category";
        version = "0.6.1";
-       sha256 = "1rkxwzigc4lw4hp593fwcxkhnd4jqwd7szwc2jgdz50bdc6k3jqc";
+       sha256 = "0ccb310d6b0b94df9e148c7f7d1ac792340b6767dc8d542e249c12f6e2e77de6";
        homepage = "http://github.com/sjoerdvisscher/data-category";
        description = "Category theory";
        license = stdenv.lib.licenses.bsd3;
@@ -39903,7 +40035,7 @@ self: {
      mkDerivation {
        pname = "data-cell";
        version = "1.0.0.2";
-       sha256 = "03liak61gr90i48rd4dlm5lhr8z9v02nn6kdy33sinbpm6313agr";
+       sha256 = "f9a91186a977d9a8c7f06d1a6b05d8e9a30c69a9b49196118920e517cc54910e";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/zadarnowski/data-cell";
        description = "Generic cellular data representation library";
@@ -39915,7 +40047,7 @@ self: {
      mkDerivation {
        pname = "data-checked";
        version = "0.3";
-       sha256 = "0xjn7iqlsgi51h8gz4x40kc2qb5lwf6nw5kjwgkck1w5gjfd11yw";
+       sha256 = "dc87d09c7c8587c9e6e372166e8de3b42c2cd804a493ff100c253e4d713c5676";
        libraryHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/mvv/data-checked";
        description = "Type-indexed runtime-checked properties";
@@ -39927,7 +40059,7 @@ self: {
      mkDerivation {
        pname = "data-clist";
        version = "0.0.7.4";
-       sha256 = "0vnrn8fcnibdbvwdf2smipnvmamgva0x7pszl4bykmh15ns417vn";
+       sha256 = "769f40b42d01d6e917a15fdfd381daafaabaed8d550bd7f85e6d45cb1cb2d96e";
        libraryHaskellDepends = [ base deepseq QuickCheck ];
        homepage = "https://github.com/sw17ch/data-clist";
        description = "Simple functional ring type";
@@ -39939,7 +40071,7 @@ self: {
      mkDerivation {
        pname = "data-concurrent-queue";
        version = "0.3.0.0";
-       sha256 = "0rmn4pq5pgvam78vxp4y7431jai8dklml322r4nw47jjc1m20kmv";
+       sha256 = "bb4e206a60521ec22dc9420c5ae96c282a1906399edcbed1a96abf5bf025b666";
        libraryHaskellDepends = [ base stm ];
        jailbreak = true;
        description = "A Library for directional queues";
@@ -39952,7 +40084,7 @@ self: {
      mkDerivation {
        pname = "data-cycle";
        version = "0.1.2";
-       sha256 = "1k7a2k4vvbwilayh5827na7fifaww66fnmd7mr9vzwmsw9g6q80g";
+       sha256 = "0f206c5ee2baf2bf53aea755eb8ce15cb9e88eb247a002bda291afbdc914eacc";
        libraryHaskellDepends = [
          base collections-api collections-base-instances
        ];
@@ -39969,7 +40101,7 @@ self: {
      mkDerivation {
        pname = "data-default";
        version = "0.5.3";
-       sha256 = "0d1hm0l9kim3kszshr4msmgzizrzha48gz2kb7b61p7n3gs70m7c";
+       sha256 = "ec5470f41bf6dc60d65953fc8788823ffff85fd59564a8bf9ea3c69928a83034";
        libraryHaskellDepends = [
          base data-default-class data-default-instances-base
          data-default-instances-containers data-default-instances-dlist
@@ -39984,7 +40116,7 @@ self: {
      mkDerivation {
        pname = "data-default-class";
        version = "0.0.1";
-       sha256 = "0ccgr3jllinchqhw3lsn73ic6axk4196if5274rr1rghls0fxj5d";
+       sha256 = "adc8ee80a6f0e5903339a2b8685220b32bc3e23856d3c12186cc464ae5c88f31";
        libraryHaskellDepends = [ base ];
        description = "A class for types with a default value";
        license = stdenv.lib.licenses.bsd3;
@@ -39998,7 +40130,7 @@ self: {
      mkDerivation {
        pname = "data-default-generics";
        version = "0.3";
-       sha256 = "0asjirn324ixyzkf5vhanyf7q9aj9zh693m55qln7dx3vdayn1yv";
+       sha256 = "db07eb55dba3b763292ea58e64e04f52257c9cb70aeee2e6f73d12316c8e522b";
        libraryHaskellDepends = [
          base bytestring containers dlist ghc-prim old-locale text time
          unordered-containers vector
@@ -40016,7 +40148,7 @@ self: {
      mkDerivation {
        pname = "data-default-instances-base";
        version = "0.0.1";
-       sha256 = "1832nq6by91f1iw73ycvkbgn8kpra83pvf2q61hy47xffh0zy4pb";
+       sha256 = "eb12ff0174ae1fe2613058b87d0752f94e64df9a9bf971780c2e24bf0cb662a0";
        libraryHaskellDepends = [ base data-default-class ];
        description = "Default instances for types in base";
        license = stdenv.lib.licenses.bsd3;
@@ -40027,7 +40159,7 @@ self: {
      mkDerivation {
        pname = "data-default-instances-containers";
        version = "0.0.1";
-       sha256 = "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5";
+       sha256 = "a55e07af005c9815d82f3fc95e125db82994377c9f4a769428878701d4ec081a";
        libraryHaskellDepends = [ base containers data-default-class ];
        description = "Default instances for types in containers";
        license = stdenv.lib.licenses.bsd3;
@@ -40038,7 +40170,7 @@ self: {
      mkDerivation {
        pname = "data-default-instances-dlist";
        version = "0.0.1";
-       sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x";
+       sha256 = "7d683711cbf08abd7adcd5ac2be825381308d220397315a5570fe61b719b5959";
        libraryHaskellDepends = [ base data-default-class dlist ];
        description = "Default instances for types in dlist";
        license = stdenv.lib.licenses.bsd3;
@@ -40049,7 +40181,7 @@ self: {
      mkDerivation {
        pname = "data-default-instances-old-locale";
        version = "0.0.1";
-       sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0";
+       sha256 = "60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802";
        libraryHaskellDepends = [ base data-default-class old-locale ];
        description = "Default instances for types in old-locale";
        license = stdenv.lib.licenses.bsd3;
@@ -40063,7 +40195,7 @@ self: {
      mkDerivation {
        pname = "data-dispersal";
        version = "1.0.0.2";
-       sha256 = "1x6wd4xah19isysk2b9waws3fyvzx3w6l917zyw0cvdzf1lkpbw6";
+       sha256 = "86af3b6970bf6d06b8ff27246af8e87f7b3734573c2d31b5d73105a83a69dcf4";
        libraryHaskellDepends = [
          AES array base binary bytestring entropy finite-field matrix
          secret-sharing syb vector
@@ -40085,7 +40217,7 @@ self: {
      mkDerivation {
        pname = "data-dword";
        version = "0.3";
-       sha256 = "0m4jmmdi5j6h0pa4d8ll6pv2qvsf3y3bk6kss0hfglcwaa5vvy73";
+       sha256 = "e3f8bd8b529cd1e720d07a9ab9861f4e6f2cf63594a246d405d0c8125bad9254";
        libraryHaskellDepends = [
          base data-bword ghc-prim hashable template-haskell
        ];
@@ -40103,7 +40235,7 @@ self: {
      mkDerivation {
        pname = "data-easy";
        version = "0.6.1";
-       sha256 = "01plc0cs3bgyq16j94qqvswwmi12iqfxyxgw9jipqgvi7vbf5h9v";
+       sha256 = "3bc1e2d63e713f7ca34cfc75df1d8e22c4cab9de1893244dc0feada11960f406";
        libraryHaskellDepends = [ base containers safe ];
        testHaskellDepends = [
          base containers directory errors haskell-src-exts hlint hspec HUnit
@@ -40121,7 +40253,7 @@ self: {
      mkDerivation {
        pname = "data-endian";
        version = "0.1";
-       sha256 = "0ilvpd3xw1nljxvl7jdrzzyfkfl7gykidvbjvc7px3bca5mlmf1r";
+       sha256 = "39b84a6b516c8d7e0fdb72ed16a77f87bae9fcffb9c9437797d406de47bb9b46";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mvv/data-endian";
        description = "Endian-sensitive data";
@@ -40133,7 +40265,7 @@ self: {
      mkDerivation {
        pname = "data-extra";
        version = "2.5.5";
-       sha256 = "0py4a3mzqga25y6y1sirvc9369n3b7y5kpm5f9m613yjlypv6pc1";
+       sha256 = "815db3afa7d28f606a72a5de59fc59c3263312db39eae08d2f423dfceb50c45f";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40146,7 +40278,7 @@ self: {
      mkDerivation {
        pname = "data-filepath";
        version = "2.2.0.0";
-       sha256 = "1l71sg02rqgk7i6w401il7crx3ikdbxi5wbb6ida677pfdrpm7f7";
+       sha256 = "c79d7a7373f71ca35a346bf112fb6a338e9ed9a13100c24d3cf3e12cc0d3e1d0";
        libraryHaskellDepends = [
          base bifunctors ghc-prim semigroups split template-haskell
        ];
@@ -40163,7 +40295,7 @@ self: {
      mkDerivation {
        pname = "data-fin";
        version = "0.1.1.3";
-       sha256 = "02n3dr4gj73z549vwq5h7h1kvmx2j8vaxjcggpdlppps9wl6flry";
+       sha256 = "3e5367284ffade4bdb7d8fc9ae3692a2d73d033cb060be13297f1cf9486ec30a";
        libraryHaskellDepends = [
          base lazysmallcheck prelude-safeenum QuickCheck reflection
          smallcheck tagged
@@ -40179,7 +40311,7 @@ self: {
      mkDerivation {
        pname = "data-fin-simple";
        version = "0.1.0.0";
-       sha256 = "17qj3b3lkrakdk3vbs9nqc2pvqr81n43qxphcznfbkv91k1ygrp6";
+       sha256 = "e6e6e7c30c69cfe5ec67f0763c880d28e37d05c336e9b5c76c53e549c71a129f";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/seagull-kamome/data-fin-simple";
@@ -40192,7 +40324,7 @@ self: {
      mkDerivation {
        pname = "data-fix";
        version = "0.0.1";
-       sha256 = "09r08lrv92ka6p35wkbfhq9ywg7y5pmgszwbz8a20h31vjz1ffpr";
+       sha256 = "f93a17bedc61402014fa8b7ffdea2dfe3cee13866e4d5ec6356a8ab433452027";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/anton-k/data-fix";
        description = "Fixpoint data types";
@@ -40204,7 +40336,7 @@ self: {
      mkDerivation {
        pname = "data-fix-cse";
        version = "0.0.2";
-       sha256 = "1xn6qnir5dss23y8d71dsy78sdk7hczwprxir8v6la15c43rf9p2";
+       sha256 = "e22697076125286a36cab1e7cb3f8367368d8ed72d9c86fc105ab792a3c5c6f6";
        libraryHaskellDepends = [ base containers data-fix transformers ];
        homepage = "https://github.com/anton-k/data-fix-cse";
        description = "Common subexpression elimination for the fixploint types";
@@ -40216,7 +40348,7 @@ self: {
      mkDerivation {
        pname = "data-flags";
        version = "0.0.3.1";
-       sha256 = "1s0djw1qarjn1fkyf21fd6pacfpfy4cvyw3wbd63ccaf9g0s1gs5";
+       sha256 = "45bfa0c14b4e31364c5b7c70bf19f1ee3aa6ae692e08e7a70b56668503970de8";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A package for working with bit masks and flags in general";
        license = stdenv.lib.licenses.bsd3;
@@ -40227,7 +40359,7 @@ self: {
      mkDerivation {
        pname = "data-flagset";
        version = "1.0.0.0";
-       sha256 = "0ygvzrcb2vskjf203svk9wpv8lw4447rd218zvys4a0787ss1aw2";
+       sha256 = "82aba0f5410728a2fdfe2888960f218453b42f4f73eb018493536fb158fefb79";
        libraryHaskellDepends = [ base ];
        description = "An efficient data type for sets of flags";
        license = stdenv.lib.licenses.mit;
@@ -40238,7 +40370,7 @@ self: {
      mkDerivation {
        pname = "data-fresh";
        version = "0.2013.251.0";
-       sha256 = "1hz30myv78mw4sf19k1yg4qikrnxsa5ng0ff4naxyz1zyi2m87f1";
+       sha256 = "c11d5445f43f7cdf9525ce81678bd2dde61931793ecc149c26bca2b37d05e3c3";
        libraryHaskellDepends = [ base free transformers ];
        description = "Interface and functor transformers for fresh values";
        license = stdenv.lib.licenses.bsd3;
@@ -40251,7 +40383,7 @@ self: {
      mkDerivation {
        pname = "data-hash";
        version = "0.2.0.1";
-       sha256 = "1ghbqvc48gf9p8wiy71hdpaj7by3b9cw6wgwi3qqz8iw054xs5wi";
+       sha256 = "9117dd49013ca28ff188fc71c3595ac3af23d56d301c1f39bac93d44d8c60bbe";
        libraryHaskellDepends = [ array base containers ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -40269,7 +40401,7 @@ self: {
      mkDerivation {
        pname = "data-interval";
        version = "1.2.0";
-       sha256 = "139v825r0r4k8b8cmndpx6gfkdn55ygiwmq8r3fcgljajk99y4km";
+       sha256 = "75129fd2944ad2c7dcc808571e9f2fc5b6e99ee9b7d9cad0429364908b403b8d";
        libraryHaskellDepends = [
          base deepseq extended-reals hashable lattices
        ];
@@ -40286,7 +40418,7 @@ self: {
      mkDerivation {
        pname = "data-inttrie";
        version = "0.1.0";
-       sha256 = "00kzf3cw0y0848cprmx3i7g70rmr92hhfzn60a2x98vb8f7y3814";
+       sha256 = "24a0e18f436ba3d48502c67e07a148b96670de89a3d77c19220878c0d9707f02";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/data-inttrie";
        description = "A lazy, infinite trie of integers";
@@ -40298,7 +40430,7 @@ self: {
      mkDerivation {
        pname = "data-ivar";
        version = "0.30";
-       sha256 = "1vnbmvihkrcknys33sam9zlb5qk5qqkxz6w3wamsbdmpp0q6zfb2";
+       sha256 = "62b96f30b8b7b6a5abe2839bdf27c665e2b2e84f55e931b4b793e509e3aecbee";
        libraryHaskellDepends = [ base containers ];
        description = "Write-once variables with concurrency support";
        license = stdenv.lib.licenses.bsd3;
@@ -40312,7 +40444,7 @@ self: {
      mkDerivation {
        pname = "data-kiln";
        version = "0.1.0.0";
-       sha256 = "13pkpmpjy787cjn1hcsl9r04w70nxrzdx8xrn9w6ifbzb2xj2iny";
+       sha256 = "de4621bb587fb96878b2b9a3de7eee161c4e404e543318ac64071d2f6fbdf38e";
        libraryHaskellDepends = [
          base containers data-fix IfElse mtl transformers
        ];
@@ -40327,7 +40459,7 @@ self: {
      mkDerivation {
        pname = "data-layout";
        version = "0.1.0.0";
-       sha256 = "1w8r4vw731dmam8vcidz9a4wb2swqd5djsf9vkkxihxnphh0a1x5";
+       sha256 = "a5070520bcb6c3d8e7dcc969d94ac35c8bc5894abf45b65155b58571f82619f1";
        libraryHaskellDepends = [ base bytestring vector ];
        homepage = "http://github.com/jystic/data-layout";
        description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\".";
@@ -40341,7 +40473,7 @@ self: {
      mkDerivation {
        pname = "data-lens";
        version = "2.10.7";
-       sha256 = "0l70jzys2qb31cyq3nci97i01ncadkhizxvc9c3psxcd2n28l69v";
+       sha256 = "3b198a84158d757d074b6cf71fe16c8ad900e24991d9813d0b6361a1fd97e050";
        libraryHaskellDepends = [
          base comonad containers semigroupoids transformers
        ];
@@ -40355,7 +40487,7 @@ self: {
      mkDerivation {
        pname = "data-lens-fd";
        version = "2.0.5";
-       sha256 = "0r8cfgn6wx304b5ihmwgsxxjwalb7086wii655mgmb6cn3nirpyk";
+       sha256 = "d3df1cedb0ccacfa6a2926466e10388b2a2e7bd78f5718cb2260746eec730c65";
        libraryHaskellDepends = [
          base comonad data-lens mtl transformers
        ];
@@ -40369,7 +40501,7 @@ self: {
      mkDerivation {
        pname = "data-lens-ixset";
        version = "0.1.4";
-       sha256 = "0frzjfcp7w1ayfai1m07n0fpj3z1vbi971bc1kn1iarxhakny651";
+       sha256 = "a1186fa7823dab18ec0c6c8593e2dae10f791db007d41095f32af07399933f3b";
        libraryHaskellDepends = [ base data-lens ixset ];
        testHaskellDepends = [ QuickCheck ];
        jailbreak = true;
@@ -40384,7 +40516,7 @@ self: {
      mkDerivation {
        pname = "data-lens-light";
        version = "0.1.2.1";
-       sha256 = "038vfzb4vxk1qb0246l2kgv9br37wg59wnlhzyjpn97lypwlf68w";
+       sha256 = "1c1947f9f5f4247ba5ff905a9ecae367e495f69b821a22c0c261f64dd6771b0d";
        libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/feuerbach/data-lens-light";
        description = "Simple lenses, minimum dependencies";
@@ -40396,7 +40528,7 @@ self: {
      mkDerivation {
        pname = "data-lens-template";
        version = "2.1.9";
-       sha256 = "0dpj3a1dj5l5jll2f0flj3wss9h2jbsljihrwh68zbb92pcgb56g";
+       sha256 = "cf94f5d81569ad8f0ce4194649f5920226adf990d4012728958516d9821af236";
        libraryHaskellDepends = [ base data-lens template-haskell ];
        homepage = "http://github.com/roconnor/data-lens-template/";
        description = "Utilities for Data.Lens";
@@ -40408,7 +40540,7 @@ self: {
      mkDerivation {
        pname = "data-list-sequences";
        version = "0.1";
-       sha256 = "0r3y66lxgk0sdg500xnz0fvg4dvzvx47imnw0qkici22b9d92kv8";
+       sha256 = "684f915a5a4244162706dcd67848df7f37f2b603df7600ca6b1accd7a9317e64";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/jkramer/data-list-sequences";
        description = "Utilities for working with sequences within lists";
@@ -40420,7 +40552,7 @@ self: {
      mkDerivation {
        pname = "data-map-multikey";
        version = "0.0.1.2";
-       sha256 = "04h4k2zn6w8rahzyr80hwf8mvsmzgbqh7aw2138sva874bsk9mkf";
+       sha256 = "6ed634f52207a9add10882ab03f17abfea5d91e310a0ec3f54197163bf980412";
        libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://github.com/jhickner/data-map-multikey";
@@ -40433,7 +40565,7 @@ self: {
      mkDerivation {
        pname = "data-memocombinators";
        version = "0.5.1";
-       sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l";
+       sha256 = "b4341d2024b84a43f92edc39f6d6766bf4f0f00a40fd834b9f6f8e987b606ed7";
        libraryHaskellDepends = [ array base data-inttrie ];
        homepage = "http://github.com/luqui/data-memocombinators";
        description = "Combinators for building memo tables";
@@ -40445,7 +40577,7 @@ self: {
      mkDerivation {
        pname = "data-named";
        version = "0.5.2";
-       sha256 = "1mzwnbcb7ji4m6p4s68422gmpna06llbh2rhk6w048mgjxv4fhsx";
+       sha256 = "5d43477697af2202b899300bb8283540d95b9f1004194daea924cab3d8b2fcd7";
        libraryHaskellDepends = [ attoparsec base binary containers text ];
        homepage = "https://github.com/kawu/data-named";
        description = "Data types for named entities";
@@ -40458,7 +40590,7 @@ self: {
      mkDerivation {
        pname = "data-nat";
        version = "0.1.2";
-       sha256 = "1yzxkch0xzy76iyad0yshfnpvz38xklqdlyj8lgqnqsllw0vwh0m";
+       sha256 = "1540be01a754638b1f45d2d386e9ec68fc7dad83da83a67c34c7ff0e209bfdfb";
        libraryHaskellDepends = [ base semigroups ];
        jailbreak = true;
        homepage = "http://github.com/glehel/data-nat";
@@ -40472,7 +40604,7 @@ self: {
      mkDerivation {
        pname = "data-object";
        version = "0.3.1.9";
-       sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l";
+       sha256 = "14250ab80e6a1c235efcda2ad8c61194dfdee9dec1a31c3c844656c4e710157d";
        libraryHaskellDepends = [ base bytestring failure text time ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/data-object/tree/master";
@@ -40487,7 +40619,7 @@ self: {
      mkDerivation {
        pname = "data-object-json";
        version = "0.3.1.8";
-       sha256 = "06zkiqj4pkl5q4fmh816y4yj74rzwi2b91k542lxswjvfa3za3qk";
+       sha256 = "130ff587725b72dda9206586b444e43f93233df12620581dc185ce4b248ef31b";
        libraryHaskellDepends = [
          base bytestring bytestring-trie convertible-text data-object
          failure JSONb text
@@ -40506,7 +40638,7 @@ self: {
      mkDerivation {
        pname = "data-object-yaml";
        version = "0.3.4.2";
-       sha256 = "18a9r4wfpb7icjb6nji9iy3abq6sxafmsnfwqpnm1nn2nn3fm1ap";
+       sha256 = "5785ea86b5c2da50edc5dc595d9deadae0a5868f294a6b9664f1aceb38c949a1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40525,7 +40657,7 @@ self: {
      mkDerivation {
        pname = "data-or";
        version = "1.0.0.5";
-       sha256 = "0wp6qqq6k1zbdw9bv9gkzdiz6y8wp8r7zsqbjh54c43j3i7vdvwx";
+       sha256 = "9defb64f1c7210460a940beb7f32ba1c79f363fbf3a5bd126feb876930c6e672";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "A data type for non-exclusive disjunction";
@@ -40537,7 +40669,7 @@ self: {
      mkDerivation {
        pname = "data-ordlist";
        version = "0.4.7.0";
-       sha256 = "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g";
+       sha256 = "6f6c1e7a9a9155ad78ca78cb9abd6f7e2e1c78b3e549b179dc0874e6428f490d";
        libraryHaskellDepends = [ base ];
        description = "Set and bag operations on ordered lists";
        license = stdenv.lib.licenses.bsd3;
@@ -40548,7 +40680,7 @@ self: {
      mkDerivation {
        pname = "data-partition";
        version = "0.3.0.0";
-       sha256 = "05i8fg9q7fpc9jalhwbqpw6pfki2flqj4nqwgs3yfi0hvasvgjjb";
+       sha256 = "4bcab7b5da1044e7877e1c5b223175224e770dbf787148954cecba83d3732816";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/luqui/data-partition";
        description = "A pure disjoint set (union find) data structure";
@@ -40560,7 +40692,7 @@ self: {
      mkDerivation {
        pname = "data-pprint";
        version = "0.2.4";
-       sha256 = "0r4q95pl9gmgc080psi3j87cg1v3cmm6gxnrps17j5sw1nqzb6v5";
+       sha256 = "659bf5b10d5c177982bed9f6676a656387c70e9223ea0b1060afbe446f499864";
        libraryHaskellDepends = [ base deepseq mtl parallel pretty time ];
        description = "Prettyprint and compare Data values";
        license = stdenv.lib.licenses.bsd3;
@@ -40571,7 +40703,7 @@ self: {
      mkDerivation {
        pname = "data-quotientref";
        version = "0.1";
-       sha256 = "0ylimakhw37klz2axg8qrdhwag34mfa1byb2z2mz2i8z0w4737j8";
+       sha256 = "489e7108071f45f1abf862f91594ab643cc561cb18bdaec4a7f30c0ea7aa917a";
        libraryHaskellDepends = [ base ];
        description = "Reference cells that need two independent indices to be accessed";
        license = stdenv.lib.licenses.bsd3;
@@ -40586,7 +40718,7 @@ self: {
      mkDerivation {
        pname = "data-r-tree";
        version = "0.0.5.0";
-       sha256 = "1zgwm020zxfhb70llch4y075rd6klwwnv9yn8mpgh0rm0ib7jvyy";
+       sha256 = "de6f7956043503f86e45d6a76d39a7d3b45c0ef004324ac159d0f50f04a8fcfd";
        libraryHaskellDepends = [ base binary deepseq ];
        testHaskellDepends = [
          base binary containers HUnit QuickCheck test-framework
@@ -40602,7 +40734,7 @@ self: {
      mkDerivation {
        pname = "data-ref";
        version = "0.0";
-       sha256 = "0bcizcf6i1hfpk7ry64si40mfdndgd8k0h9mzh873xp1v2qali7n";
+       sha256 = "f644aab0d8e1f67110fc354130517bcd365701899a189fcfbc0e86681cfb912d";
        libraryHaskellDepends = [ base stm transformers ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Mutable_variable";
@@ -40615,7 +40747,7 @@ self: {
      mkDerivation {
        pname = "data-reify";
        version = "0.6.1";
-       sha256 = "00mjv6dc3fwhbqzrll02qxilwpfypahkzcdqnv17c4nbjqg0ldb1";
+       sha256 = "61350a1e96cb1276c2b6b8b13fa1bade5d4e63c702509a3f5e90bbc19ad9b202";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -40630,7 +40762,7 @@ self: {
      mkDerivation {
        pname = "data-reify-cse";
        version = "0.0.3";
-       sha256 = "0vjfpbp0maqwirvi8j21z9qbs396l76dk5npn8zxac56j0i6l62r";
+       sha256 = "59186a2290a630d53fb2d796d9cca1260dbd70fa414814778e1cab0aeeba4e6e";
        libraryHaskellDepends = [ base containers data-reify ];
        description = "Common Sub-Expression Elimination for graphs generated by Data.Reify.";
        license = stdenv.lib.licenses.bsd3;
@@ -40641,7 +40773,7 @@ self: {
      mkDerivation {
        pname = "data-rev";
        version = "0.1.0.1";
-       sha256 = "13bqp3vvsc6i6lcvw480i08fz2rm3f8varwyhvrp44dzv2q8zkl1";
+       sha256 = "81ce8fb0d8bf1172f3869e67b5911b358bef10880011be1935d130bdf7b8788d";
        libraryHaskellDepends = [ base bytestring containers text vector ];
        jailbreak = true;
        homepage = "https://github.com/jxv/data-rev";
@@ -40654,7 +40786,7 @@ self: {
      mkDerivation {
        pname = "data-rope";
        version = "0.3";
-       sha256 = "06sz6z0kd53av4acmgxh4668fsn588hx5k5qp752rrjf2nx9vww8";
+       sha256 = "88f39dba154ee62ccab9b8ccd22142c56a878c21b0bfca14d96a9436c1375f1b";
        libraryHaskellDepends = [ base bytestring bytestring-mmap unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
@@ -40666,7 +40798,7 @@ self: {
      mkDerivation {
        pname = "data-size";
        version = "0.1.1.7";
-       sha256 = "0j1g39ha2fjgd960zd0gbhpznisw3qw07mbdacbx226bw50nwa7y";
+       sha256 = "fe286e41e1cb08d117536dd503381e5c47fb2f5c0fb40f4c6a4f3aa1601a2f48";
        libraryHaskellDepends = [
          base bytestring containers deepseq text
        ];
@@ -40679,7 +40811,7 @@ self: {
      mkDerivation {
        pname = "data-spacepart";
        version = "20090215.0";
-       sha256 = "0h6z4yibjbnzck2fvh9mnppz9j0lzgx8nzmzm08q5yzmzjydy3rk";
+       sha256 = "330fdfbcfcf5fb8211a8bf7e8bfafb14c8f4efb535c1edc464df2eb9a227df40";
        libraryHaskellDepends = [ base vector-space ];
        jailbreak = true;
        homepage = "http://code.haskell.org/data-spacepart";
@@ -40695,7 +40827,7 @@ self: {
      mkDerivation {
        pname = "data-store";
        version = "0.3.0.7";
-       sha256 = "0cv02d3fwyyyxjv3519k9wilaagxlcn8m2nfifrcq0q0qihxd1bd";
+       sha256 = "6d85d661c40003ccb28bce8a8a2ca3fd2945234f338532b6ecde7bee46136033";
        libraryHaskellDepends = [
          base cereal containers deepseq lens safecopy transformers
        ];
@@ -40718,7 +40850,7 @@ self: {
      mkDerivation {
        pname = "data-stringmap";
        version = "1.0.1.1";
-       sha256 = "0djbky5m6hxr04jgxi2cq3fsivja32nzn16zs8ffqgadxw030pa1";
+       sha256 = "415d3000ef4d3dec1cd2df04fbad184aeea8ddc04cc4fe2401b943538b9f4b36";
        libraryHaskellDepends = [ base binary containers deepseq ];
        testHaskellDepends = [
          base containers deepseq ghc-heap-view HUnit QuickCheck
@@ -40736,7 +40868,7 @@ self: {
      mkDerivation {
        pname = "data-structure-inferrer";
        version = "1.0";
-       sha256 = "0jkbysk1rmbkjvjizwx72h58amvnz4iyjbs0lcx6987m4fn456w9";
+       sha256 = "899b42ac23f5a0643aa3402fe923f97657850a14a7f31fe59673d51ca6f66b4a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -40754,7 +40886,7 @@ self: {
      mkDerivation {
        pname = "data-tensor";
        version = "0.1.0.0";
-       sha256 = "0j6jsgj3lhx6ps3xs90vbgyvzmlr3sfl33r6rz34rvb29gs171n8";
+       sha256 = "c88613f44b62ed4cc6cf268f419d1e99d6bffd5b1b24dd87bea6433ae4d3d248";
        libraryHaskellDepends = [ base ];
        homepage = "https://bitbucket.org/tdammers/data-tensor";
        description = "Tensor and Group typeclasses";
@@ -40769,7 +40901,7 @@ self: {
      mkDerivation {
        pname = "data-textual";
        version = "0.3.0.2";
-       sha256 = "0c4qs923dj4jnvvkjvbij0c1yg922iw66140cq6wb1m4h6q31ia4";
+       sha256 = "44c530b081a486c50d668004637814223d1f1890716d39f7b692c83644d29830";
        libraryHaskellDepends = [
          base bytestring parsers text text-latin1 text-printer
        ];
@@ -40789,7 +40921,7 @@ self: {
      mkDerivation {
        pname = "data-timeout";
        version = "0.3";
-       sha256 = "1b6af2x19hb1kynsv7ypc2q6b71cazcg86gf1yhq0rr0fjj478ah";
+       sha256 = "50a143a474206780a10fee19f4d8572c9c65b060d79fadad9f61c114ba70caac";
        libraryHaskellDepends = [
          base data-textual parsers tagged text-printer transformers-base
        ];
@@ -40803,7 +40935,7 @@ self: {
      mkDerivation {
        pname = "data-transform";
        version = "0.1.0.0";
-       sha256 = "1mhcbwh4s414hq4cwljxxadazxfi382spfgkw38fz2xi08lbfsji";
+       sha256 = "516ab72802b18befd0e0f3b9ab051ad1f5af9aea5d52ce088624104d205f0cd6";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Functions to transform data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -40814,7 +40946,7 @@ self: {
      mkDerivation {
        pname = "data-treify";
        version = "0.3.4";
-       sha256 = "03xchr2h0f54rlcq285xaq5bakjq13mbjwz3xi3kfa6i71rr2rk9";
+       sha256 = "6966917338d1283747ece373b9ea08584eb50a56bd208119cda438004586ac0f";
        libraryHaskellDepends = [ base containers ty ];
        homepage = "http://ittc.ku.edu/~andygill/data-reify.php";
        description = "Reify a recursive data structure into an explicit graph";
@@ -40826,7 +40958,7 @@ self: {
      mkDerivation {
        pname = "data-type";
        version = "0.1.0";
-       sha256 = "1x3wsnilp9sxy061sfmyyg0f6b0k2lxvi0g4qf2gkldrz32c4qvj";
+       sha256 = "7263c2c4f8b9d1f984c3e481b83b15132ce3c0f3be3a1d0cf05da74ba3d57cf4";
        libraryHaskellDepends = [ base ];
        description = "Basic type wrangling types and classes";
        license = stdenv.lib.licenses.bsd3;
@@ -40838,7 +40970,7 @@ self: {
      mkDerivation {
        pname = "data-util";
        version = "0.4";
-       sha256 = "1ywp3h2zccknc2sr0b5zbf9ms2zph5qh8znswxc7bi5wynyk9z98";
+       sha256 = "28fd34bdf5bcc47558e7da7e047181f70b5d935bbf2c90b5607632f6051c97fb";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/cutsea110/data-util";
@@ -40851,7 +40983,7 @@ self: {
      mkDerivation {
        pname = "data-variant";
        version = "0.28.0.5";
-       sha256 = "11ia37q28xz8a87xkc8yyvqqd3qzfvcbdnp2caxdbzvdnjbazhmk";
+       sha256 = "b3c2af96b46dffd5ba62e2dab6d8761f8f86f1f61eb1d90f52e87724f0192a86";
        libraryHaskellDepends = [ base safe ];
        homepage = "https://bitbucket.org/tdammers/data-variant";
        description = "A variant data type, useful for modeling dynamically-typed programming languages";
@@ -40866,7 +40998,7 @@ self: {
      mkDerivation {
        pname = "database-migrate";
        version = "0.2.0";
-       sha256 = "1hhx3851yzgq7cf397sifdbnznk0sfqf3blflxfl50yq68rmwbzy";
+       sha256 = "fe2f5e3332d883425da78eaee1b0d360da6f5773519f341c3bf87d1f0a1a1dc2";
        libraryHaskellDepends = [
          base bytestring cmdargs containers directory either filepath lens
          postgresql-simple text time transformers
@@ -40881,7 +41013,7 @@ self: {
      mkDerivation {
        pname = "database-study";
        version = "0.0.1";
-       sha256 = "1aqp7a46p758f1q99cn700mgc1dic896gpsih3vj2fmffqj42gd7";
+       sha256 = "a73d412476ae3a21f78051df671262b105f62a00c7b2947070a89c6b883a17ab";
        libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://dbs.informatik.uni-halle.de/Lehre/LP09/";
@@ -40897,7 +41029,7 @@ self: {
      mkDerivation {
        pname = "datadog";
        version = "0.1.0.1";
-       sha256 = "05hfpkaizbgqi998wa0l0hb8qph8y7gwyx05690ljr0883m5a663";
+       sha256 = "c31855ea4008644941320574cfdff1085e8c160414288e528af8ad1fd5bc0e16";
        libraryHaskellDepends = [
          aeson auto-update base buffer-builder bytestring lens lifted-base
          monad-control network old-locale text time transformers-base
@@ -40912,7 +41044,7 @@ self: {
      mkDerivation {
        pname = "dataenc";
        version = "0.14.0.7";
-       sha256 = "1wwgm7wakkz6v94lyxyd3yi21l3h28sss4xxdb3d770vmjhp1lzr";
+       sha256 = "f9d370a1ac1b9cd3c66abd13ad351270d020a21fcd774f49dae6cfa9f8a98ff3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers ];
@@ -40929,7 +41061,7 @@ self: {
      mkDerivation {
        pname = "dataflow";
        version = "0.6.1.0";
-       sha256 = "099n0mlx695zvazx7q53i474nzmdrqk38q8lrzf6qh440h60q7bx";
+       sha256 = "7d1d0c0c0484406cdccf14613426cead7e4b0e89a3e0d3bfdabf24d369053625";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl parsec ];
@@ -40949,7 +41081,7 @@ self: {
      mkDerivation {
        pname = "datalog";
        version = "0.2.0.2";
-       sha256 = "1nfjmgf6j8a8602rmk7fg3kbkafiyd7lsnhvnwc95ms90icg0r86";
+       sha256 = "0665f0580449d79218b71b5a4d4ff3d1a9b9e678eecc9a0530482169dcabd2d9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40977,7 +41109,7 @@ self: {
      mkDerivation {
        pname = "datapacker";
        version = "1.0.1";
-       sha256 = "10fj1z4wbr76wfnp9h1jzyd8afzn495r6xvbjiw55bimy0hasalg";
+       sha256 = "8f2aad20f035ae5278946b77934b22f63b859aff32c074ade3e6e4c5c90fd281";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -40993,7 +41125,7 @@ self: {
      mkDerivation {
        pname = "date-cache";
        version = "0.3.0";
-       sha256 = "0grhcbd0rhdn0cf1fz82x8pv8cmxfhndlcwyrax4mnnr3pql9kmb";
+       sha256 = "abce44f11dd9da4abaca9e33da2c74bd32b42fea027d171c03b6c10cda62303f";
        libraryHaskellDepends = [ base bytestring ];
        description = "Date cacher";
        license = stdenv.lib.licenses.bsd3;
@@ -41004,7 +41136,7 @@ self: {
      mkDerivation {
        pname = "dates";
        version = "0.2.2.0";
-       sha256 = "08d90fii0nmvmfxhhw4k5ja13jyxg79n527089lrc2r31l3wj40a";
+       sha256 = "0a10c9070d230b966942e08862d379ddcb11942c937008bbabbb5a10a303a921";
        libraryHaskellDepends = [
          base base-unicode-symbols parsec syb time
        ];
@@ -41022,7 +41154,7 @@ self: {
      mkDerivation {
        pname = "datetime";
        version = "0.3.1";
-       sha256 = "0jmxxmv5s9rch84ivfjhqxdqnvqqzvabjs152wyv47h5qmvpag1k";
+       sha256 = "333c7577c5051eb23d172568b9d4fe186f8b5bc750ba1d09822c275d76edbd4a";
        libraryHaskellDepends = [ base old-locale old-time time ];
        testHaskellDepends = [
          base HUnit old-locale old-time QuickCheck test-framework
@@ -41041,7 +41173,7 @@ self: {
      mkDerivation {
        pname = "datetime-sb";
        version = "0.2.4";
-       sha256 = "1p2pn0jdidqcvmmi80njqm9z4amn1qp05nlxbnz1svpp6nc7amjf";
+       sha256 = "4e56759835f76e1dbe5d9dda022e0eb62af253c5d202146bdd0cb7d824b057dc";
        libraryHaskellDepends = [ base old-locale old-time time ];
        testHaskellDepends = [
          base HUnit old-locale old-time QuickCheck test-framework
@@ -41059,7 +41191,7 @@ self: {
      mkDerivation {
        pname = "dawg";
        version = "0.11";
-       sha256 = "0xvkw5hp66r46v59ld0s7yi2jzvlcc4vc8ignadai9vqxayzm799";
+       sha256 = "299dfabdea78a7a89ab22f22b60963747f29a23f1a349aca36241b7361e17377";
        libraryHaskellDepends = [
          base binary containers mtl transformers vector vector-binary
        ];
@@ -41073,7 +41205,7 @@ self: {
      mkDerivation {
        pname = "dbcleaner";
        version = "0.1.1";
-       sha256 = "1n4al0fd577ldvaxca6nz181lp0b29z4slrjldx3m51nkxy1ficc";
+       sha256 = "8c45177c9f36943a7aa332534d7e120b5c1a50f8d628d6d56ef49cd21ca08ad8";
        libraryHaskellDepends = [ base postgresql-simple text ];
        testHaskellDepends = [ base hspec postgresql-simple text ];
        description = "Clean database tables automatically around hspec tests";
@@ -41085,7 +41217,7 @@ self: {
      mkDerivation {
        pname = "dbf";
        version = "0.0.0.2";
-       sha256 = "1pay47bbmxvishmczs3kgn19nzkfmmip3m51h4zlwydm5kxfc5n2";
+       sha256 = "c216e6fa2cb5794e3f81a1d47163ad6e7e9b827d73e8cf2ad471f7bad6215edd";
        libraryHaskellDepends = [
          base binary bytestring monad-loops rwlock
        ];
@@ -41101,7 +41233,7 @@ self: {
      mkDerivation {
        pname = "dbjava";
        version = "1.7";
-       sha256 = "06xz0a38sjjr64sz19lg0wzb73yz1msdlbg5s02ldd8n4b9yjk5f";
+       sha256 = "ae4ce9d32216b54605d0e52dda740ddf8fb33e078fa6f03531594a8d8602bf1b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41125,7 +41257,7 @@ self: {
      mkDerivation {
        pname = "dbmigrations";
        version = "0.8.2";
-       sha256 = "031ibk22iyqzbkc6cy5ab5kmbhk68k5217szpw50vdp646rya21w";
+       sha256 = "3c08e5b321e6b60d0abf5f9f20ca4466c2556759aa7866d85c1ffb28c45c310c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41156,7 +41288,7 @@ self: {
      mkDerivation {
        pname = "dbus";
        version = "0.10.10";
-       sha256 = "0s14yb2bbi5n9m3xkznm4nbb0hpj9hmiwl0ppqqiml5s7xhwas6d";
+       sha256 = "cd68c5613fbad01a31be17501e2b4cf242b09625d5fed9474db6c4b5c4f22468";
        libraryHaskellDepends = [
          base bytestring cereal containers libxml-sax network parsec random
          text transformers unix vector xml-types
@@ -41178,7 +41310,7 @@ self: {
      mkDerivation {
        pname = "dbus-client";
        version = "0.4.1";
-       sha256 = "0z7061kafjzd4jaws4xcp1xzh2kx559bgp7cmcjq55mbxr1rrsjq";
+       sha256 = "58ea9c43eeab968225abecdcb752297d0af87bb8ac13cd9524ed4ba76630e07c";
        libraryHaskellDepends = [
          base containers dbus-core monads-tf text transformers
        ];
@@ -41197,7 +41329,7 @@ self: {
      mkDerivation {
        pname = "dbus-core";
        version = "0.9.3";
-       sha256 = "110373yinimq0k7hl8wkk7g4hm3hj563dpa2y8ag2lpl9yydzgfa";
+       sha256 = "cabddfbc4ff452f114f242dd364c91705448de9993230acf04b8461bfd380384";
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 libxml-sax
          network parsec text unix vector xml-types
@@ -41216,7 +41348,7 @@ self: {
      mkDerivation {
        pname = "dbus-qq";
        version = "0.1.0";
-       sha256 = "0dg03nv7bsjydywhby0rv1a6jc90gf2885djxd8pb9aly2ncpjxx";
+       sha256 = "bdcbcbacf054a57551ebb21584847b20316954d819f805b96f5eea75b61de035";
        libraryHaskellDepends = [
          base containers dbus parsec template-haskell
        ];
@@ -41233,7 +41365,7 @@ self: {
      mkDerivation {
        pname = "dbus-th";
        version = "0.1.1.1";
-       sha256 = "0sxk7m8fdd7cx0n0lbcfz2bv28d0i8v0im50y1sciac7pi13q4bc";
+       sha256 = "6c113c42bc87a9c874f0a0d408368aa021b197f88e2d0a2ce8ecb4e6503db36b";
        libraryHaskellDepends = [
          base containers dbus syb template-haskell text
        ];
@@ -41248,7 +41380,7 @@ self: {
      mkDerivation {
        pname = "dclabel";
        version = "0.9.0.0";
-       sha256 = "0bnbqbjpbx98wjgsz7kgr5znljbwhd6lsb8m9ky7dmzqygzybvir";
+       sha256 = "39eee5fff3f8d776fc4c152d4d4d837c496a7fc96f9eaf9fe428f575e5c2cb2e";
        libraryHaskellDepends = [ base bytestring cereal containers ];
        testHaskellDepends = [
          base bytestring cereal containers QuickCheck quickcheck-instances
@@ -41265,7 +41397,7 @@ self: {
      mkDerivation {
        pname = "dclabel-eci11";
        version = "0.3";
-       sha256 = "1bfc9ip4fqzjzlzppkrnspnm6gc50f4rkf0wngnxyj7f79fvjr6k";
+       sha256 = "d364b95d3aee48dfedb31cb8998903853d53edd536cf7b3ffdf263476e4cccad";
        libraryHaskellDepends = [ base pretty QuickCheck ];
        description = "The Disjunction Category Label Format";
        license = stdenv.lib.licenses.bsd3;
@@ -41278,7 +41410,7 @@ self: {
      mkDerivation {
        pname = "ddc-base";
        version = "0.4.1.3";
-       sha256 = "1v3qkvfcajr8ljnrkmdpkhp6069b54fg168ryknq4b7rkl4piqfm";
+       sha256 = "d5e178099df92c82edf41999f01c292b19602e9cb7d599ada4284bc5dc9e78ec";
        libraryHaskellDepends = [
          base containers deepseq parsec transformers wl-pprint
        ];
@@ -41297,7 +41429,7 @@ self: {
      mkDerivation {
        pname = "ddc-build";
        version = "0.4.1.3";
-       sha256 = "15bjdr9g48p1ahga9qc1cgfbpr89551yaqx9psa44da0vy468fjs";
+       sha256 = "5a3a6488df40354294bea963e5432909e5bbdc6381e1a41e54e122f2526e7295";
        libraryHaskellDepends = [
          base containers ddc-base ddc-core ddc-core-eval ddc-core-flow
          ddc-core-llvm ddc-core-salt ddc-core-simpl ddc-core-tetra
@@ -41315,7 +41447,7 @@ self: {
      mkDerivation {
        pname = "ddc-code";
        version = "0.4.1.3";
-       sha256 = "1m904n1s2cszakjrlz81y1gplrgfv3np2ja0m6fapj9c2yyfmg6r";
+       sha256 = "d9bceabc172cc9ab9ca9404971edd8ee657a5ff0017d9ae5545f33a1832520d5";
        libraryHaskellDepends = [ base filepath ];
        jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
@@ -41330,7 +41462,7 @@ self: {
      mkDerivation {
        pname = "ddc-core";
        version = "0.4.1.3";
-       sha256 = "15a51cgk3pqsbmy6hv0jrf8ldxmb0kvzd0pwkqa6141phk2g1dd5";
+       sha256 = "a5b5f0c484379060149efc82f6f704abf64691cb126c687c5d1adf311f0b4595";
        libraryHaskellDepends = [
          array base containers ddc-base deepseq directory mtl transformers
        ];
@@ -41348,7 +41480,7 @@ self: {
      mkDerivation {
        pname = "ddc-core-eval";
        version = "0.4.1.3";
-       sha256 = "0s11wzl75fa4pnjclgqdvymddk8srpknvpf6p3vkm2b09y0fryxd";
+       sha256 = "adfbec804f60893af7b8c6dd6de7cd1acdd6aadf0d3fcaa4bd44b972e8e72168";
        libraryHaskellDepends = [
          array base containers ddc-base ddc-core deepseq mtl transformers
        ];
@@ -41366,7 +41498,7 @@ self: {
      mkDerivation {
        pname = "ddc-core-flow";
        version = "0.4.1.3";
-       sha256 = "1szy9x5pc2l5ib8sbkajj6i7nfb46ypgi655wy0jrcnp7m2q22fy";
+       sha256 = "de0981453dd7b22c81e7a598f8ae3764397ba29152cda5d18a850a764b4ffeeb";
        libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
          ddc-core-simpl deepseq mtl transformers
@@ -41385,7 +41517,7 @@ self: {
      mkDerivation {
        pname = "ddc-core-llvm";
        version = "0.4.1.3";
-       sha256 = "0f0cby09lqhvw5ajm6q25qg57qbb4h3qvqwv30bzl6kw0884lkb5";
+       sha256 = "654d4a10027c1afa17189be38d07246be1531e2e029b2a55e11b629a805f0c38";
        libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
          ddc-core-simpl mtl transformers
@@ -41404,7 +41536,7 @@ self: {
      mkDerivation {
        pname = "ddc-core-salt";
        version = "0.4.1.3";
-       sha256 = "18cywxp3zp6aafpq8si1vvqy7lywwl31mdp58asyzcwi1g1v7y7q";
+       sha256 = "f8f8b3c30b91b3efb542e5b61a06e5dcd3e3f1de216a84af53cadc3f6ee79ea1";
        libraryHaskellDepends = [
          array base containers ddc-base ddc-core deepseq mtl transformers
        ];
@@ -41422,7 +41554,7 @@ self: {
      mkDerivation {
        pname = "ddc-core-simpl";
        version = "0.4.1.3";
-       sha256 = "0y3rxcl2h6dqmy367zfri1r21flcbygvrpa7sj8cr8gh128xwbbz";
+       sha256 = "7f2dde9108f0a1cc90d447ddbc9f5f8cba207288d9fd6386afb8192828eb7978";
        libraryHaskellDepends = [
          array base containers ddc-base ddc-core deepseq mtl transformers
        ];
@@ -41440,7 +41572,7 @@ self: {
      mkDerivation {
        pname = "ddc-core-tetra";
        version = "0.4.1.3";
-       sha256 = "01ax5dirrf8jk03316dw1cnrs9fl5qlm8k07nb0rzxwybm3wqdv2";
+       sha256 = "6237cc475d9ef79fc1b2074c54292ed4259d2d0bbc9930069812b99c632b5d05";
        libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
          ddc-core-simpl deepseq mtl transformers
@@ -41461,7 +41593,7 @@ self: {
      mkDerivation {
        pname = "ddc-driver";
        version = "0.4.1.3";
-       sha256 = "0iyvmifnj05v9r2sh867dm2vgm8hijsxf6bmzrksj1kcs36qwrrk";
+       sha256 = "33678ecdd06c06a967fe7519d7b58c10d5b7456dc720a8454ebb00695dacdb47";
        libraryHaskellDepends = [
          base containers ddc-base ddc-build ddc-core ddc-core-eval
          ddc-core-flow ddc-core-llvm ddc-core-salt ddc-core-simpl
@@ -41480,7 +41612,7 @@ self: {
      mkDerivation {
        pname = "ddc-interface";
        version = "0.4.1.3";
-       sha256 = "0pbsnxzlbx9xblqf9199wrl80aard59l3193gm8gzxx7ispfhs3f";
+       sha256 = "6e68e8ae8ea7f7ff507d238541536959298068e62985e4305d3df5457fb77a5d";
        libraryHaskellDepends = [ base containers ddc-base directory ];
        jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
@@ -41495,7 +41627,7 @@ self: {
      mkDerivation {
        pname = "ddc-source-tetra";
        version = "0.4.1.3";
-       sha256 = "088lsavx4fhyxyxzxd4vj1880j19r4l4fvlb4dly42mbyfrg5jrs";
+       sha256 = "3acbf2b2f3ab0ae269238b6e4728c929488050909bb4febbef1e3ad2b7d21421";
        libraryHaskellDepends = [
          array base containers ddc-base ddc-core ddc-core-salt
          ddc-core-tetra deepseq mtl transformers
@@ -41517,7 +41649,7 @@ self: {
      mkDerivation {
        pname = "ddc-tools";
        version = "0.4.1.3";
-       sha256 = "1hg6hajqrb7sf8bvr27cabdxalwvkw8lm2igsx05p9wq4bpirz62";
+       sha256 = "c2fc1cef2298a75b40d72f8a4a119f9b53d5db52ec88bc1772faac8ca582e6c1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -41540,7 +41672,7 @@ self: {
      mkDerivation {
        pname = "ddc-war";
        version = "0.4.1.3";
-       sha256 = "0y9h4z1drgwgmw9wjf8ga2kiagmfgppdy29l9cz0j4rjz3mm302y";
+       sha256 = "5e8051ebf83213093e4b3409dfee7dae3e15a7500f39c913af8fbfdcc2273079";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -41559,7 +41691,7 @@ self: {
      mkDerivation {
        pname = "ddci-core";
        version = "0.2.1.2";
-       sha256 = "1w4kcqivphc9gmj4xnkqx2hbzd3cmssww5hqgja1kh0b03q026w0";
+       sha256 = "801b01f0000bc019947c1816ceb5ae6cb4bfa0e878da4e647d89c1bb236693f0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -41580,7 +41712,7 @@ self: {
      mkDerivation {
        pname = "dead-simple-json";
        version = "0.1.2";
-       sha256 = "10wp97pxhkvlk3lhknvsnwkl9p7lm1v7y1wk0nn55q68jx1b5zpr";
+       sha256 = "f9feb24297c8e052ac0593077f76a8f4dc4427b77adb09e998744fd8ef499783";
        libraryHaskellDepends = [
          base containers parsec template-haskell transformers vector
        ];
@@ -41600,7 +41732,7 @@ self: {
      mkDerivation {
        pname = "debian";
        version = "3.87.2";
-       sha256 = "135f0szbnn8xp5zzfmlqcpmsrswahgc4rlgviyznfx6c4j7hg519";
+       sha256 = "2994078f24cc7467bf8ffbd14cd8838aebaceb659856f77fb91d59bbbe06ae8c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41624,7 +41756,7 @@ self: {
      mkDerivation {
        pname = "debian-binary";
        version = "0.0.1";
-       sha256 = "0k6blaq1p2phydl4pqlqg6kdicrfjhm6h27svws7dq8di3y274fq";
+       sha256 = "d89123fc880de17634dffa08682a942eb3d8a67998e24b68f3f08a1bb0a2cb4c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath HSH ];
@@ -41639,7 +41771,7 @@ self: {
      mkDerivation {
        pname = "debian-build";
        version = "0.7.2.1";
-       sha256 = "1x3jvrz5y85m9mnp5b8b85f4magbxa4r0yhkw30vgcljph6v7mfm";
+       sha256 = "d5d5b30dbc92b2b7c1e0137a9089eaeba94a5c410bad726d4db5205f7ede72f4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41656,7 +41788,7 @@ self: {
      mkDerivation {
        pname = "debug-diff";
        version = "0.1";
-       sha256 = "19k9f92pjh52qnr31l0468hn2klkb8wszs7azwczvxzg8aq7krld";
+       sha256 = "8de679b042eff7fd19ffeae8af395a934e61213204d030b2c5a24079457269a6";
        libraryHaskellDepends = [ base groom process temporary ];
        description = "Display a colorized diff between two Haskell values";
        license = stdenv.lib.licenses.bsd3;
@@ -41667,7 +41799,7 @@ self: {
      mkDerivation {
        pname = "decepticons";
        version = "0.1.0.0";
-       sha256 = "1fnp2c2rdpihvxm5j22z1mrf8pnpcnasvfsrlg7lvg5m76md7k3v";
+       sha256 = "7bccd3aa39b5bc4dcfa359bbad9565d75ee4720d5f08596adf30de960513d7ba";
        libraryHaskellDepends = [ base comonad-transformers ];
        jailbreak = true;
        description = "The categorical dual of transformers";
@@ -41681,7 +41813,7 @@ self: {
      mkDerivation {
        pname = "decode-utf8";
        version = "1.2";
-       sha256 = "10mj871j5gd4d8v8341lr5lr9avxxfph58sjhmd9kgywc10grqph";
+       sha256 = "f0e2fc4060dcbf995a8552a302afeb7dab9469c9349081366aa4bd22c341b282";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -41696,7 +41828,7 @@ self: {
      mkDerivation {
        pname = "decoder-conduit";
        version = "0.0.1.1";
-       sha256 = "0z5krcl4xd385f7v2bsnfyr7zidqwfjvc6b432gbbn2vcrx966c7";
+       sha256 = "8719937a665bd8b59e186419b6a5e3b8c57fb277562fb18f2b68b44e28cbb37c";
        libraryHaskellDepends = [ base binary bytestring conduit ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/decoder-conduit";
@@ -41713,7 +41845,7 @@ self: {
      mkDerivation {
        pname = "dedukti";
        version = "1.1.4";
-       sha256 = "0b7328529m3xl8bj7sncv5rr13ld2aghgqkf55j4n15jagv6g72d";
+       sha256 = "4d9c67f653b2044b64296ee2079f128d8e9073d9ccea2317a27dd4240a12e32c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ time unix ];
@@ -41737,7 +41869,7 @@ self: {
      mkDerivation {
        pname = "deeplearning-hs";
        version = "0.1.0.2";
-       sha256 = "1cw29xisgykb20qv3jkpcpaiijicyzkfsgglrsbx1admfzbqv98d";
+       sha256 = "0da58dd777b5a9d097cef43dede6f72cca18d56577cab131106bfaa7634f82b3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41762,7 +41894,7 @@ self: {
      mkDerivation {
        pname = "deepseq";
        version = "1.3.0.1";
-       sha256 = "068zka6rwprbzpx7yisi1ajsxdly23zaf2vjklx1wp66yypx54lp";
+       sha256 = "9792d2aff7c65c1e3a9d720ba7fe109eb6aea50a51477ffafd2b5f9e8d9a1f19";
        libraryHaskellDepends = [ array base ];
        jailbreak = true;
        description = "Deep evaluation of data structures";
@@ -41776,7 +41908,7 @@ self: {
      mkDerivation {
        pname = "deepseq";
        version = "1.4.1.1";
-       sha256 = "1gxk6bdqfplvq0lma2sjcxl8ibix5k60g71dncpvwsmc63mmi0ch";
+       sha256 = "908158eb30ac6abe2fb32d9c07cc2c3dae886867520b5529c09b5e87db32b3bf";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [
          array base HUnit test-framework test-framework-hunit
@@ -41793,7 +41925,7 @@ self: {
      mkDerivation {
        pname = "deepseq-bounded";
        version = "0.8.0.0";
-       sha256 = "192hqyidgbrsig2yx7x9vdx180w1jfcqxsgg4wslwfwj7d3sa81f";
+       sha256 = "2e20a5473b923b4e3527efe98e99938103147adba99feec58b3aafd7a2c750a4";
        libraryHaskellDepends = [
          array base cpphs deepseq deepseq-generics generics-sop mtl parallel
          random syb
@@ -41816,7 +41948,7 @@ self: {
      mkDerivation {
        pname = "deepseq-generics";
        version = "0.1.1.2";
-       sha256 = "01pvigx8n9p8hwbzp2qiq6kzf7cxiam843jz2sjgliacmmp1v7l3";
+       sha256 = "839e1d6ead4c45faa4165f0e82aa8a9d1df7a7c1118bfb1787e8268bfa8bfb06";
        revision = "1";
        editedCabalFile = "3f52867fe9267876504d8ce20c77dcfb2ac6613af8c915017859b6022d3cc9fd";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
@@ -41833,7 +41965,7 @@ self: {
      mkDerivation {
        pname = "deepseq-magic";
        version = "1.0.0.3";
-       sha256 = "15nisjmhcfippz153b8l8f291halkgbrync5c2v6xwkh07ibn7yp";
+       sha256 = "d71fbbe20170f26eb66085599fd79b54c190844314ad51c2bf373a06abd4d196";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ezyang/deepseq-magic";
        description = "Deep evaluation of data structures without NFData";
@@ -41845,7 +41977,7 @@ self: {
      mkDerivation {
        pname = "deepseq-th";
        version = "0.1.0.4";
-       sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965";
+       sha256 = "c5a4b8e6173163cdf5cee22e21267507161cb2222bfcff855822dcfc2244938b";
        libraryHaskellDepends = [ base deepseq template-haskell ];
        testHaskellDepends = [ base deepseq template-haskell ];
        jailbreak = true;
@@ -41859,7 +41991,7 @@ self: {
      mkDerivation {
        pname = "deepzoom";
        version = "0.1";
-       sha256 = "1hisk6yfq4182ak7d1mi1kmnwwlcl8w7gwc8wqkq4l8m3zfyij8k";
+       sha256 = "13c9e8dd1f15518227e688f17738a28c726eeb0cb18676a6122810ecbc993ac2";
        libraryHaskellDepends = [ base directory filepath hsmagick ];
        description = "A DeepZoom image slicer. Only known to work on 32bit Linux";
        license = stdenv.lib.licenses.bsd3;
@@ -41871,7 +42003,7 @@ self: {
      mkDerivation {
        pname = "defargs";
        version = "0.3";
-       sha256 = "1rz37w83awji034spyv4cnfbqb6r98r1bbvzh2i979qh5c5s6ckg";
+       sha256 = "6f32a30b2b10a793a2807faf15324ad92cbc9c6564fbabc900517235103fe3e7";
        libraryHaskellDepends = [ base cluss ];
        homepage = "https://github.com/Kinokkory/defargs";
        description = "default arguments in haskell";
@@ -41886,7 +42018,7 @@ self: {
      mkDerivation {
        pname = "definitive-base";
        version = "2.3";
-       sha256 = "126ln7k6k188xjnig60ksc425fp3hql5znb98h5c1w157jgg0sw9";
+       sha256 = "896bf09e3c25f0c00a4469d95f2886e3ba2208d3139817adec088569e6b1d488";
        libraryHaskellDepends = [
          array base bytestring containers deepseq ghc-prim GLURaw OpenGL
          OpenGLRaw primitive vector
@@ -41906,7 +42038,7 @@ self: {
      mkDerivation {
        pname = "definitive-filesystem";
        version = "1.2";
-       sha256 = "0bc098igiqzbm25bjaxdxm4jq17kc8bgz1ab0pgm0h5jvy1bf8id";
+       sha256 = "2d22b782dfb24050df054b85ff1662f3042c49edad2bb98aa8ebe3f8224a802d";
        revision = "1";
        editedCabalFile = "3a78d4d8aaa291ca95d889b62a979c4132bbe6f91073ab2bd9fdb0d55ed63121";
        libraryHaskellDepends = [
@@ -41930,7 +42062,7 @@ self: {
      mkDerivation {
        pname = "definitive-graphics";
        version = "1.2";
-       sha256 = "0ah19j2al9l6pbin821rsicidmg3rd4cc74r8qw095773sa98zyr";
+       sha256 = "d97f94941ee794043846991cc648cbe3d51659d4390864e3ba8626aa844c012a";
        revision = "1";
        editedCabalFile = "a6d867ea8098390daff40c088c81f854ca054f9a0c8b097f9194be329416baed";
        libraryHaskellDepends = [
@@ -41954,7 +42086,7 @@ self: {
      mkDerivation {
        pname = "definitive-parser";
        version = "2.1";
-       sha256 = "0sl77xgk7vjn69mx89k4f3yviz821mg01fga0klqplcccbkzknmh";
+       sha256 = "b0daf9e7628cd18be904eab9005e0d02fdb8fd706426d46b3256ee335f3f876a";
        libraryHaskellDepends = [
          array base bytestring containers cpu deepseq definitive-base
          ghc-prim GLURaw OpenGL OpenGLRaw primitive utf8-string vector
@@ -41973,7 +42105,7 @@ self: {
      mkDerivation {
        pname = "definitive-reactive";
        version = "1.0";
-       sha256 = "0gk39602k5yjxxgpd725dnvqhlcnaqgds7g0c8v1h509lc0d7xm3";
+       sha256 = "a3f6d300a30914183662e01ddd1e56965188b76d459c765fefd297298049633e";
        revision = "1";
        editedCabalFile = "8c3c6afcc4ce7569ede32c8006d1d66fb10448321159f875d1dec03419bd7797";
        libraryHaskellDepends = [
@@ -41995,7 +42127,7 @@ self: {
      mkDerivation {
        pname = "definitive-sound";
        version = "1.0";
-       sha256 = "01k4h7av4fhp4xchrcbnc1gnnbsh5ngasq55l16n3l438pr73vzj";
+       sha256 = "f2ef71f24583d0614da0a560ad9e2d502f6b5f6076b10c5927173ab2d5816406";
        revision = "1";
        editedCabalFile = "1491f0a01f47b84ea8f01a94492738a7f3b5fe7c68c805cca8701926cc443d71";
        libraryHaskellDepends = [
@@ -42016,7 +42148,7 @@ self: {
      mkDerivation {
        pname = "deiko-config";
        version = "0.5.0.0";
-       sha256 = "0zhi173mm905aqh52fsw1c9y3hxk07yc1g2s0rrjr75cdl7ssljy";
+       sha256 = "5e52ad0f6dac9c2c73065abcc0fc01b3c3e1130b5c3b51205605a45ac709117e";
        libraryHaskellDepends = [
          array base containers exceptions mtl parsec text transformers
        ];
@@ -42031,7 +42163,7 @@ self: {
      mkDerivation {
        pname = "deka";
        version = "0.6.0.2";
-       sha256 = "1l23b5v0wjg72vlnyxa87v3j2dxbld536ws8j03ddcwgqgws1fj4";
+       sha256 = "44baa0f9c38fb3d606904873334aa3ab3721c73e48756fe916e7490e765943d0";
        libraryHaskellDepends = [ base bytestring parsec transformers ];
        librarySystemDepends = [ mpdec ];
        jailbreak = true;
@@ -42048,7 +42180,7 @@ self: {
      mkDerivation {
        pname = "deka-tests";
        version = "0.6.0.2";
-       sha256 = "08226vca64v8brcgci8a3s5fnf4qy8g9drk3lzzd0dq6g8yvypy9";
+       sha256 = "c95fbf3d7a0637d0fea763e6961ef29838eb8a1e0a45f6585e6813a3d8364220";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring deka QuickCheck ];
@@ -42071,7 +42203,7 @@ self: {
      mkDerivation {
        pname = "delaunay";
        version = "0.1.0.2";
-       sha256 = "145a220kv3fk2lk6jpvqmmhwmbgiqzkcbsi5hynsg196chydxgvd";
+       sha256 = "6dbfde3c642685a7ad8725eac5e6c7f1adca61ad785f692615d38d3d8110aa90";
        libraryHaskellDepends = [
          AC-Vector base hashable unordered-containers
        ];
@@ -42087,7 +42219,7 @@ self: {
      mkDerivation {
        pname = "delicious";
        version = "0.3.4";
-       sha256 = "1dx2y2ggzcwcjs618jmg21342pcd0maqx8pj2hwv80zq6f5v0c50";
+       sha256 = "a030b08b33f803b43914f2a28e55058d5d414610af4a148c968cb3ff9ef0a2b7";
        libraryHaskellDepends = [
          base bytestring curl feed json nano-md5 xml
        ];
@@ -42104,7 +42236,7 @@ self: {
      mkDerivation {
        pname = "delimited-text";
        version = "0.3.0";
-       sha256 = "0mn6sv4nm3wbzq5cc9s9kb3xbm9jd5i059xr6qr9mqxa18j78c05";
+       sha256 = "053074240aaae39a3236b9a702626932d5d5c79a4927c60afe8b8f6ac9d6c656";
        libraryHaskellDepends = [
          attoparsec base binary bytestring bytestring-show
        ];
@@ -42120,7 +42252,7 @@ self: {
      mkDerivation {
        pname = "delta";
        version = "0.2.1.2";
-       sha256 = "0r2a2vffs3rn2xp56nhanyywzbm2wph5664spgj4lbsna6zgjnfj";
+       sha256 = "d259f9be51562f4ae4bb9a1853e0e5a2aecfbdb70a5a536e17360feddc164a64";
        revision = "2";
        editedCabalFile = "630e85a07132fe54b49c71f855b3d633982026d78120279e00888bc95a9d14dd";
        isLibrary = true;
@@ -42144,7 +42276,7 @@ self: {
      mkDerivation {
        pname = "delta-h";
        version = "0.0.3";
-       sha256 = "0ya0hgvpa9w41gswngg84yxhvll3fyr6b3h56p80yc5bldw700wg";
+       sha256 = "8f037078a3ab300fd035058e65b27783d20dbb27e83dcbf50b842775f7834079";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42164,7 +42296,7 @@ self: {
      mkDerivation {
        pname = "demarcate";
        version = "0.1.0";
-       sha256 = "130yk7461rwmjgzivsya10xzh0d0ca8pfkxh7fpll239r7xlbds3";
+       sha256 = "43b745fbc969084aaf3bb04f779162a001f83b08caeb1dff9395e760c8991e8c";
        libraryHaskellDepends = [ base free transformers ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/fizruk/demarcate";
@@ -42178,7 +42310,7 @@ self: {
      mkDerivation {
        pname = "denominate";
        version = "0.5.0";
-       sha256 = "06jdr1236wlsmapwn6hdmjl41qlig7ck541lynyds0qd6ymcb9k1";
+       sha256 = "61a6c5aa370d03ddbcf5349032d97991e240a8ac0d1acbafaa9a723344c84d1a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -42195,7 +42327,7 @@ self: {
      mkDerivation {
        pname = "dependent-map";
        version = "0.1.1.3";
-       sha256 = "1by83rrv8dfn5lxrpx3qzs1lg31fhnzlqy979h8ampyxd0w93pa4";
+       sha256 = "44dd913868dddfaa104c27794cbf852e8c4783fe78f49b3b2dd635b4731ec8af";
        libraryHaskellDepends = [ base containers dependent-sum ];
        homepage = "https://github.com/mokus0/dependent-map";
        description = "Dependent finite maps (partial dependent products)";
@@ -42207,7 +42339,7 @@ self: {
      mkDerivation {
        pname = "dependent-sum";
        version = "0.2.1.0";
-       sha256 = "1h6wsrh206k6q3jcfdxvlsswbm47x30psp6x30l2z0j9jyf7jpl3";
+       sha256 = "835e799c9749822f2818dd5c7dc1e887d4c5b5a6bb37c7e4c0661a2060d6dcc0";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mokus0/dependent-sum";
        description = "Dependent sum type";
@@ -42220,7 +42352,7 @@ self: {
      mkDerivation {
        pname = "dependent-sum-template";
        version = "0.0.0.4";
-       sha256 = "103jxzzw3drg7pkgmh39s7258zcwr8ixg8mijm6p33b87a8wdpwr";
+       sha256 = "99dfc6913a688d714d95b1a2d723ca9c7d54c4d169c0fae63d2fb7c1ffef7280";
        libraryHaskellDepends = [
          base dependent-sum template-haskell th-extras
        ];
@@ -42236,7 +42368,7 @@ self: {
      mkDerivation {
        pname = "depends";
        version = "0.0.1";
-       sha256 = "0y43bhxx5s4v72gc0y1cwfy2h4hyz9x5cab2fbkd7rvj5wn4w4gq";
+       sha256 = "f8114e2c2f72e7d3e6726229567afa1e1228bce32c78c09e389be8d23b5c8378";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -42258,7 +42390,7 @@ self: {
      mkDerivation {
        pname = "dephd";
        version = "0.1.6";
-       sha256 = "0qgqlnj7wkmjba5f2rql51g9jhak0ksx3xdmr25j3p6qwb43k5ih";
+       sha256 = "309639c8e2d8dc218bc8b5f5d1f5045341995e281467e18a5ab24e7ea4a5f861";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -42275,7 +42407,7 @@ self: {
      mkDerivation {
        pname = "dequeue";
        version = "0.1.5";
-       sha256 = "1z4c3hyk1lbjqm5is1d9qb6sxwv8i870ph7n2h51r631mhxbdnxl";
+       sha256 = "b4dbb63aac61981c0a14f6c00b0e8a68f3aecdc2a9051d4bc572d1303d1c8cfc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck safe ];
@@ -42290,7 +42422,7 @@ self: {
      mkDerivation {
        pname = "derangement";
        version = "0.1.0";
-       sha256 = "13w257bndjpaz7fiz4g2w4v2bmlch07ay5pxxv5ifc4llh665ch0";
+       sha256 = "00b2620ca4943017cbeefd16af0e808cd62536e1e2911fddf9eaca66d729828f";
        libraryHaskellDepends = [ base fgl ];
        description = "Find derangements of lists";
        license = "GPL";
@@ -42302,7 +42434,7 @@ self: {
      mkDerivation {
        pname = "derivation-trees";
        version = "0.7.3";
-       sha256 = "05f77vkqzia91rywkg68ad24j98a7h9aqkd0568x2zmqcndzbisy";
+       sha256 = "5ec7f59b65b87ed19129a04dac123c0a25494453c8bcc97d0e49c58fe73ec715";
        libraryHaskellDepends = [
          applicative-extras base labeled-tree mtl
        ];
@@ -42320,7 +42452,7 @@ self: {
      mkDerivation {
        pname = "derive";
        version = "2.5.22";
-       sha256 = "0g2grz9y23n8g4wwjinx5cc70aawswl84i3njgj6l1fl29fk1yf2";
+       sha256 = "c2f9305d12d4056ae49376448228d75c2970182bdd46c93979c80ee1d3cf4f3c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42337,7 +42469,7 @@ self: {
      mkDerivation {
        pname = "derive-IG";
        version = "0.1.1";
-       sha256 = "0bggj2jb3bbgxcz75v8q2yx29v88skiwjaj3fxkkynnv5zvrbgwr";
+       sha256 = "99bf95f72fdb5a3f6777432ac9e3d408ed24ba1718ed723eeb6fadb1a490ef2d";
        libraryHaskellDepends = [ base instant-generics template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/konn/derive-IG";
@@ -42351,7 +42483,7 @@ self: {
      mkDerivation {
        pname = "derive-enumerable";
        version = "0.1.1.0";
-       sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp";
+       sha256 = "5777fdf3313a2a2c39d03690069c12f5554bf6c941097fa0cd1956d693f5f023";
        libraryHaskellDepends = [ base data-default ];
        jailbreak = true;
        homepage = "https://github.com/mgoszcz2/derive-enumerable";
@@ -42366,7 +42498,7 @@ self: {
      mkDerivation {
        pname = "derive-gadt";
        version = "0.1.1";
-       sha256 = "0s6vb3b3chf1gy44a6zsi2z19d6snk12qlk4v8q2smipmj42v7d6";
+       sha256 = "a69d2d88ac37562d30da64522cc2b4dab414be88fa1b45887fc14136d658db68";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42389,7 +42521,7 @@ self: {
      mkDerivation {
        pname = "derive-topdown";
        version = "0.0.0.2";
-       sha256 = "0gdalqq1ks9jjp34kzavlx2ncpdad2pf6vdhx64yii5l2nl04r8p";
+       sha256 = "176502a815b4c4e889e9b06de3ae68aa5d6645a75bfd49c69532e91930a6aa3d";
        libraryHaskellDepends = [
          base derive mtl template-haskell template-haskell-util
        ];
@@ -42404,7 +42536,7 @@ self: {
      mkDerivation {
        pname = "derive-trie";
        version = "0.2.1";
-       sha256 = "11c378mh5razibd9ljffm5353v4plrgvkfb62p6029f04sf29jnc";
+       sha256 = "ccca249c26c02501cc1566b9b95fa697ec5146a9ce499ada8a5fe5022b3a8385";
        libraryHaskellDepends = [ array base containers template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/baldo/derive-trie";
@@ -42420,7 +42552,7 @@ self: {
      mkDerivation {
        pname = "deriving-compat";
        version = "0.1";
-       sha256 = "1v503lj9dds1hwnqhmw8rfbj9337gcyqqzys1d93r7s0bs3glgf3";
+       sha256 = "c33dfa865e409f3c520bda7f8c3d7b678c2497cb8857882d8741b796241da0ec";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -42435,7 +42567,7 @@ self: {
      mkDerivation {
        pname = "derp";
        version = "0.1.6";
-       sha256 = "0g8y98qjjampbwnxhvjzrs2jczh2mcwsacjq95jxpidgsld00shk";
+       sha256 = "136a001ad5afc5db65495832a539ab027e2685ce5f6ed82d5fb72a29314a1e3d";
        libraryHaskellDepends = [ base containers ];
        description = "Derivative Parsing";
        license = stdenv.lib.licenses.bsd3;
@@ -42446,7 +42578,7 @@ self: {
      mkDerivation {
        pname = "derp-lib";
        version = "0.0.0.1";
-       sha256 = "0j883w01k9scz6cfxljkw9s2kgs9f7vdxyyxxhlvvkgzb0050v0x";
+       sha256 = "1d6c500058ffcdbd29ecddfbdef67149bf2974e253d2ee98f94ca719001f0849";
        libraryHaskellDepends = [ base derp ];
        homepage = "http://darcsden.com/kyagrd/derp-lib";
        description = "combinators based on parsing with derivatives (derp) package";
@@ -42459,7 +42591,7 @@ self: {
      mkDerivation {
        pname = "descrilo";
        version = "0.1.0.3";
-       sha256 = "19x78lv6rd5i5xvqj92q5snly1579jiiw2fgmxzxza0km9j9yiw2";
+       sha256 = "82479f64aa13a8df7fafcf091ea34ca7044fad2e582489772fb1b46c3645a7a7";
        libraryHaskellDepends = [ base ];
        description = "Loads a list of items with fields";
        license = stdenv.lib.licenses.gpl3;
@@ -42472,7 +42604,7 @@ self: {
      mkDerivation {
        pname = "descriptive";
        version = "0.0.2";
-       sha256 = "0jh0l4assmqsmq9ajsbdl7vn8k6srl0z27kpxwzg1v0nmkkcl48p";
+       sha256 = "1711cae6ac16ecf03eef771ef101cdda4c64f7a16d69a912ae1a57ad15a1004a";
        revision = "3";
        editedCabalFile = "0aeae1dd5ab8c21ade57c1e036600b8162cd790823618a9c5894417ba68e2ea2";
        libraryHaskellDepends = [
@@ -42490,7 +42622,7 @@ self: {
      mkDerivation {
        pname = "descriptive";
        version = "0.9.4";
-       sha256 = "0bxskc4q6jzpvifnhh6zl77xic0fbni8abf9lipfr1xzarbwcpkr";
+       sha256 = "795ec65756bf87ec6ea4c92d85a25d0eb0d8cfa1df40685ddcf74b83099bba2f";
        libraryHaskellDepends = [
          aeson base bifunctors containers mtl scientific text transformers
          vector
@@ -42508,7 +42640,7 @@ self: {
      mkDerivation {
        pname = "despair";
        version = "0.0.2";
-       sha256 = "1dwhp1izikvj1qfz6shvnl4q519vgjpnfmkwkj8zp875dki87pnj";
+       sha256 = "d2de83e26ce5a0fb919c7c5667af7c3b858209b51b6af31d0e72cff863b890b7";
        libraryHaskellDepends = [ base random ];
        description = "Despair";
        license = stdenv.lib.licenses.bsd3;
@@ -42519,7 +42651,7 @@ self: {
      mkDerivation {
        pname = "deterministic-game-engine";
        version = "0.4.0";
-       sha256 = "1hdwr1vxfng3yc9mdnnsraapikq9kq1c07ik16csgp2ggnhgpprs";
+       sha256 = "3adffba07d4fdca79909331ec0029e09cf7895cadada5613f3e359d777c8bcc1";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/TGOlson/deterministic-game-engine";
@@ -42534,7 +42666,7 @@ self: {
      mkDerivation {
        pname = "detrospector";
        version = "0.3";
-       sha256 = "0fsdbagj9zhbm6hh5rsjgz3iq1raxkljnr65ba506nwxmc052xcn";
+       sha256 = "96755100ab9d5b038a5ac5642be9ec2a071cc77f52e702a1a90bfe249f5a4d3b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -42550,7 +42682,7 @@ self: {
      mkDerivation {
        pname = "deunicode";
        version = "0.1";
-       sha256 = "08skd630jj9h3mlxm86s7qkdrpcwhknk21dmlj69126dn67v159f";
+       sha256 = "2e95b08fb1cd88908ca4b50531ed849cdddc263edaa0da691d30490986695323";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring utf8-string ];
@@ -42566,7 +42698,7 @@ self: {
      mkDerivation {
        pname = "devil";
        version = "0.1.1.0";
-       sha256 = "1n5rzm40srakb0jv8j9gin6m15x5l37knmdckc4xhwvliyvllrf4";
+       sha256 = "c4654ab78f7473d8099bac553bcfa0a597508d8d2f49b4255853650d48fdb9d8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -42583,7 +42715,7 @@ self: {
      mkDerivation {
        pname = "dewdrop";
        version = "0.1";
-       sha256 = "1xi78d31hljbybpm3jzs4l3g35sdfhmmm7ksivjdi91gv9m88l0n";
+       sha256 = "1650846ada2fa4d8e48e7a9e5a2b744d97f10625facb51eff24b5218464327f6";
        libraryHaskellDepends = [
          base bytestring containers elf hdis86 syb
        ];
@@ -42598,7 +42730,7 @@ self: {
      mkDerivation {
        pname = "dfrac";
        version = "0.1.2.0";
-       sha256 = "1ybq5bnh85dbr9lfx5d6qw87x9qc8fs0yvbi1a6860an13lvrzy7";
+       sha256 = "c7ffbce9085601838c0a716d0fb4430ca77e10c7a695ee68caab1504ed2a78f9";
        libraryHaskellDepends = [ base scientific ];
        description = "A package for precise decimal arithmatic using rationals";
        license = stdenv.lib.licenses.mit;
@@ -42612,7 +42744,7 @@ self: {
      mkDerivation {
        pname = "dfsbuild";
        version = "1.0.2";
-       sha256 = "0nh5cvb8macw523iids072rs9kylkv8zrliraw1jrvmhsznkj05x";
+       sha256 = "bd0039edd7b0ee2c035739d2fcd19ed4cfa4b33840b71887289ca98ad666055a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -42629,7 +42761,7 @@ self: {
      mkDerivation {
        pname = "dgim";
        version = "0.0.3";
-       sha256 = "1brffyfawrdgr2659hbda42mpn9jiiq474a0yd57kj7z0dzq25f6";
+       sha256 = "c615817f03ffc8794af3409143708c32d95b05516dc1548cc8af65ae9c772eaf";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        jailbreak = true;
@@ -42644,7 +42776,7 @@ self: {
      mkDerivation {
        pname = "dgs";
        version = "0.2";
-       sha256 = "100xlxqhy33kllyb4dy7q0bwwy5wn9w45qy1cb5f0yb0dqff1pnx";
+       sha256 = "dddee01c6e6079e0ca62c1e34278b2bc78ce17c0c737b23ca5730c0f71a71d80";
        libraryHaskellDepends = [ base HTTP mtl network split ];
        jailbreak = true;
        homepage = "http://www.dmwit.com/dgs";
@@ -42658,7 +42790,7 @@ self: {
      mkDerivation {
        pname = "dia-base";
        version = "0.1.1.3";
-       sha256 = "1kx7dczabfklqpvbz7zcf1hhha8vrcbv35xl82fips02x0065b75";
+       sha256 = "e5ac6200e802e81b9d40b497b117cb1b29086170ec9fbff6c574baa53e6ba7cf";
        libraryHaskellDepends = [ base deepseq ];
        description = "An EDSL for teaching Haskell with diagrams - data types";
        license = stdenv.lib.licenses.bsd3;
@@ -42671,7 +42803,7 @@ self: {
      mkDerivation {
        pname = "dia-functions";
        version = "0.2.1.4";
-       sha256 = "14hfapfnfl2m9g8b6mdcmmq2fbyqgg14s0sagxbb8hhz47pznc27";
+       sha256 = "4730fbef211f42b4567f4a034dc27bd82f2770adac55b3d04b555067dd550e92";
        libraryHaskellDepends = [
          base containers data-pprint deepseq dia-base mtl xhtml
        ];
@@ -42686,7 +42818,7 @@ self: {
      mkDerivation {
        pname = "diagrams";
        version = "1.3";
-       sha256 = "1f5cpa2qjpzq9m8d3066iixbq414zk0pv1vajghb214a1w9sqaf9";
+       sha256 = "c929ac130f8a04b1e0936a877dc1fc2410bc7a8cc680d1504df85f8985baacb8";
        libraryHaskellDepends = [
          diagrams-contrib diagrams-core diagrams-lib diagrams-svg
        ];
@@ -42705,7 +42837,7 @@ self: {
      mkDerivation {
        pname = "diagrams-builder";
        version = "0.7.1.1";
-       sha256 = "1klmmh144bdwrg3zs45l6yy1li64r60jygqspxzyzlm8pfgzvgah";
+       sha256 = "50bdfd9fbba8d2ef7fbf1a3f2f81c9c4441abc37b410fdc7cbbc2d4202ac95ce";
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
        isLibrary = true;
        isExecutable = true;
@@ -42733,7 +42865,7 @@ self: {
      mkDerivation {
        pname = "diagrams-cairo";
        version = "1.3.0.3";
-       sha256 = "0962kz1b45hycjij90yxq88wa5qsdll82h16agzf0pm16j8r4v5s";
+       sha256 = "ba6c929134a15ee0fe53264081286d1a17c511c2dd8324a3641e16b2c29fc224";
        libraryHaskellDepends = [
          base bytestring cairo colour containers data-default-class
          diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
@@ -42753,7 +42885,7 @@ self: {
      mkDerivation {
        pname = "diagrams-canvas";
        version = "1.3.0.2";
-       sha256 = "1jklgvkmdhg5ari577jh5y7vr54wjdwyz2hql1n1icbfba5d6p0c";
+       sha256 = "0c5cd38a5a6eb1186ca0188aef79939c94bc8f2f509e536256e5c156e77e74ca";
        libraryHaskellDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
@@ -42776,7 +42908,7 @@ self: {
      mkDerivation {
        pname = "diagrams-contrib";
        version = "1.3.0.4";
-       sha256 = "0mr4m4kl028jxrjldn38kq7zsph6vqwzdjhxd0rznzbwpsnvsnkf";
+       sha256 = "6e5abdadbe7c7dfb33681dcaf639de065efd0f9e68d84665ee12094027a92457";
        libraryHaskellDepends = [
          base circle-packing colour containers data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -42800,7 +42932,7 @@ self: {
      mkDerivation {
        pname = "diagrams-core";
        version = "1.3.0.2";
-       sha256 = "0lrzphpia24dk1mxv33c9f5iy18r5d0lfsw92422nhbs36dslyzm";
+       sha256 = "f57baa9b197a412b0411896b47412b19051f8b4b6c8cdd6b988d08152fbc3f53";
        libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl semigroups unordered-containers
@@ -42815,7 +42947,7 @@ self: {
      mkDerivation {
        pname = "diagrams-gtk";
        version = "1.3";
-       sha256 = "0kf340d63jzb0clw9kv2i8wdhprv5cialcfqbaxyhdvf0qswp8ms";
+       sha256 = "baa2cb35066e37e8bb5ad831aa222b3b5fd8388a62cfc42903ebcb611a20c34d";
        libraryHaskellDepends = [
          base cairo diagrams-cairo diagrams-lib gtk
        ];
@@ -42835,7 +42967,7 @@ self: {
      mkDerivation {
        pname = "diagrams-haddock";
        version = "0.3.0.6";
-       sha256 = "0pa83kd1b1fnj9plwmz8gsi2nm35ghdsxdxi4w4f7shsgc64nhrj";
+       sha256 = "32434b0c7b1aeae30827b1b7ae1b7c65542ba27ee8574e6f92d68515da1c485d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42864,7 +42996,7 @@ self: {
      mkDerivation {
        pname = "diagrams-hsqml";
        version = "0.2.0.0";
-       sha256 = "0f84919h7k93nnzgr2k9jp08qsgs2dgzihavmz2g9q1c6d53q6v0";
+       sha256 = "601b3c4a332ce0f4c4af5bc1f85f13fa698cc095698afcbeb523cd0353480439";
        libraryHaskellDepends = [
          base colour containers diagrams-core diagrams-lib hsqml lens text
          transformers
@@ -42883,7 +43015,7 @@ self: {
      mkDerivation {
        pname = "diagrams-html5";
        version = "1.3.0.2";
-       sha256 = "18ifqv5xkk9cd86d3mir1qka2jy35vj4hqycq44z96hhp50yl29j";
+       sha256 = "3209ea41b9109af409c1cc6348e42ec34ba1260e39d6d10c6a2ccdd9cbc62ea2";
        libraryHaskellDepends = [
          base cmdargs containers data-default-class diagrams-core
          diagrams-lib lens mtl NumInstances optparse-applicative split
@@ -42900,22 +43032,19 @@ self: {
      , directory, distributive, dual-tree, exceptions, filepath
      , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens
      , linear, monoid-extras, mtl, optparse-applicative, process
-     , semigroups, system-filepath, tagged, text, transformers
-     , unordered-containers
+     , semigroups, tagged, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "diagrams-lib";
-       version = "1.3.0.2";
-       sha256 = "1gvvyzpzzdwzvrh452l6r2709qpbdzx1fi1ysvzalywi3gib69ds";
+       version = "1.3.0.3";
+       sha256 = "0cc9e5131c7eb0061963eac53e58ec91909f606652108515b1f2ca80492a7751";
        libraryHaskellDepends = [
          active adjunctions array base colour containers data-default-class
          diagrams-core diagrams-solve directory distributive dual-tree
          exceptions filepath fingertree fsnotify hashable intervals
          JuicyPixels lens linear monoid-extras mtl optparse-applicative
-         process semigroups system-filepath tagged text transformers
-         unordered-containers
+         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;
@@ -42929,7 +43058,7 @@ self: {
      mkDerivation {
        pname = "diagrams-pandoc";
        version = "0.1";
-       sha256 = "02dz0w2im68667v5k1ykdnl3cijvqfd5pgb7qqdyyizkgza88pb4";
+       sha256 = "645d84d47ff347ef1bc667bd5b9ac35b4636a86dd38759f63106991a0507bf09";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -42948,7 +43077,7 @@ self: {
      mkDerivation {
        pname = "diagrams-pdf";
        version = "0.3.1";
-       sha256 = "0wi38w0r1n1zm49r16vhmgg14v3pw7ca6wwb85y3zrbjmzfa37vy";
+       sha256 = "7e9fa1dcaf72e53f7c418b73a3d8e1776c12deab709b9013a93fd89001472372";
        libraryHaskellDepends = [
          base cmdargs colour diagrams-core diagrams-lib filepath HPDF lens
          monoid-extras mtl semigroups split vector-space
@@ -42969,7 +43098,7 @@ self: {
      mkDerivation {
        pname = "diagrams-pgf";
        version = "0.1.0.2";
-       sha256 = "1lwwr143nlvpxpkdvsbq4z4bs7qhbx636p6hi6w448xmbniq90rj";
+       sha256 = "328384a35db52342b889d05c334c5f101fbdc82778e9dde6ed77533b48c89cd3";
        libraryHaskellDepends = [
          base bytestring bytestring-builder colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels mtl
@@ -42989,7 +43118,7 @@ self: {
      mkDerivation {
        pname = "diagrams-postscript";
        version = "1.3.0.2";
-       sha256 = "0cdhs5ia6jm89h1bxgqm1w9gkjqnw6g0nw13vjasj0fh08nayk7s";
+       sha256 = "fa4caf2c02d001a995dc23700b9ee116cbf9120f15bfbe024ca84aa362d1b031";
        libraryHaskellDepends = [
          base containers data-default-class diagrams-core diagrams-lib dlist
          filepath hashable lens monoid-extras mtl semigroups split
@@ -43006,7 +43135,7 @@ self: {
      mkDerivation {
        pname = "diagrams-qrcode";
        version = "1.2";
-       sha256 = "15c1h0izxi475b1n8q3dmg0kpp7dk0s4nifnxcq3lbq71jmsg8ll";
+       sha256 = "94a2a7ab0c072f3a30ebd6454b3498eddc3bc1ab6d6064c32a87c4fe23808195";
        libraryHaskellDepends = [
          array base colour diagrams-core diagrams-lib
        ];
@@ -43026,7 +43155,7 @@ self: {
      mkDerivation {
        pname = "diagrams-rasterific";
        version = "1.3.1.3";
-       sha256 = "1gkapj3n2xyy13a819zbckslvv8k5jkdlz7x2dzhcganra9gkcki";
+       sha256 = "71b2f992ca563d067f13fd7cdaa62c13ed4df564eba780d408de776187bc6abe";
        libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
@@ -43042,7 +43171,7 @@ self: {
      mkDerivation {
        pname = "diagrams-rubiks-cube";
        version = "0.2.0.0";
-       sha256 = "1rymsiqwnd37mly5dlq5hkmy5vxvyvzwkn2rm2gwmxy3amk5g4db";
+       sha256 = "ab91576655c3f7ca9fa859d8c9fff6bbefe2eb8405d3563cad6734cb71d4d5e7";
        libraryHaskellDepends = [
          base data-default-class diagrams-lib lens
        ];
@@ -43056,7 +43185,7 @@ self: {
      mkDerivation {
        pname = "diagrams-solve";
        version = "0.1";
-       sha256 = "0jqc0mlswrp7iz7wg02fp9ggi04rb97bzlssvpv26z6i6ig3b5sf";
+       sha256 = "4e97355e34d17c23f6dd5ad3bf4e5a9980f85eba4e80c7cf8fe766ae69050c4b";
        libraryHaskellDepends = [ base ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Pure Haskell solver routines used by diagrams";
@@ -43073,7 +43202,7 @@ self: {
      mkDerivation {
        pname = "diagrams-svg";
        version = "1.3.1.4";
-       sha256 = "009xn6q9qwgi3l4v0rm79309i91m1s0jbng34bbli29s6vzwgjmz";
+       sha256 = "bfcac7ff363a8948d722e3d925810e35a498c048a766b0091df1719cb0b13d01";
        libraryHaskellDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
@@ -43090,7 +43219,7 @@ self: {
      mkDerivation {
        pname = "diagrams-tikz";
        version = "0.6";
-       sha256 = "1qs4m1xy62pv6gjgip9vx2pwlv2gzjq1h86yiiq15yg4gcbn5fav";
+       sha256 = "5bb962177be4f912708cde2018b0fc4f6ccaafe83bddf8e433fb0ae37ba844e3";
        libraryHaskellDepends = [
          base diagrams-core diagrams-lib dlist mtl
        ];
@@ -43106,7 +43235,7 @@ self: {
      mkDerivation {
        pname = "dice";
        version = "0.1";
-       sha256 = "1rfx3vh983f3gc6si661zimhjl47ip30l3pvf7dysjirr3gffgz1";
+       sha256 = "e13fe7dec8394aeddb71fb0e0ac68d8750096bfcc198a80d7bc30d94e01edde5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec random-fu transformers ];
@@ -43121,7 +43250,7 @@ self: {
      mkDerivation {
        pname = "dice-entropy-conduit";
        version = "1.0.0.1";
-       sha256 = "01xwxajwyvv6ac48j9if6xsv05aqg1p02i7d25ivk1k56ky41l1s";
+       sha256 = "3ad040fc346586b96311ed44016e785815b075372e26890853666fcfa5eabc07";
        libraryHaskellDepends = [
          base bytestring conduit entropy transformers
        ];
@@ -43141,7 +43270,7 @@ self: {
      mkDerivation {
        pname = "dicom";
        version = "0.1.1.0";
-       sha256 = "16n6mx95zfg8pa6y2zlj20imssykcrjilas1dh9li4r377rz5sdb";
+       sha256 = "abe9f2f339239348136c412b1a6566d36b5d2310927ee18dbae8b95f52afc69a";
        libraryHaskellDepends = [
          base binary bytestring old-locale pretty safe time
        ];
@@ -43157,7 +43286,7 @@ self: {
      mkDerivation {
        pname = "dictparser";
        version = "0.3.0.0";
-       sha256 = "1wjxcn53h9rp8jancspb9yq4h26215b63pghw802wgh073vp9h0i";
+       sha256 = "11c074f738003e2e00e2f0dd615609c20848b04feb6a6695443727388a655df2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec split ];
@@ -43174,7 +43303,7 @@ self: {
      mkDerivation {
        pname = "diet";
        version = "0.0.1";
-       sha256 = "0qkyfmys5k6la10dvi8wsmw120xfarjblpkr33xiazll2m9845wh";
+       sha256 = "9017825215947e15fb18795eba6456ae031178d51cc5dd4050d4cca27d757e62";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/tonymorris/diet";
        description = "Discrete Interval Encoding Tree";
@@ -43186,7 +43315,7 @@ self: {
      mkDerivation {
        pname = "diff-parse";
        version = "0.2.1";
-       sha256 = "0idwhxwhqd65sy0kfgwi8d942lpabyknwpyq9454y49dnn8k0lam";
+       sha256 = "55513091b52d114f0a49d85f6ea75fea52415243913f3781d7c5340c7987bc45";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base hspec text ];
        jailbreak = true;
@@ -43201,7 +43330,7 @@ self: {
      mkDerivation {
        pname = "diff3";
        version = "0.2.0.3";
-       sha256 = "0zdfn1jhsq8pd23qpkhzr8wgiwbazfbq688bjnpc406i7gq88k78";
+       sha256 = "e84c84f03bd100c2ae950b218397fb6af1f838ca1fce8b876817610d65b0ae7d";
        libraryHaskellDepends = [ base Diff ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -43216,7 +43345,7 @@ self: {
      mkDerivation {
        pname = "diffarray";
        version = "0.1.1";
-       sha256 = "0p95i1xzp0bdm0zrdil79rfxfyz372y2qjdxyvxdzxvfb1mvalcm";
+       sha256 = "9551b56b586ef7dffaf6bd492cbc38e37bd75d4e87c6963fa86d81fb7b88255d";
        libraryHaskellDepends = [ array base ];
        description = "DiffArray";
        license = stdenv.lib.licenses.bsd3;
@@ -43229,7 +43358,7 @@ self: {
      mkDerivation {
        pname = "diffcabal";
        version = "0.1.1";
-       sha256 = "0ggla2i4jw24a3vdq2xyz70asp80s5jl5nkwms6ck4r69zm3mci6";
+       sha256 = "26b23aea4f2693c98cae7cda4265d1005dadc0f9be0bdcf650447049a250f43d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -43250,7 +43379,7 @@ self: {
      mkDerivation {
        pname = "diffdump";
        version = "0.7.5";
-       sha256 = "08z1h3xf3j5xzhf08i9w7hvg05wvqcf13k50chx6av70f0cs2rvh";
+       sha256 = "7067a11970e06c653a64a0cc111cc39b17f0363c3c45041cfcbdc8e1fa80e123";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -43266,7 +43395,7 @@ self: {
      mkDerivation {
        pname = "digamma";
        version = "0.1";
-       sha256 = "0qij2pn107dfb9rl9rrd77l69wmfp9fghv9ysql2d7g5qdr306pd";
+       sha256 = "ed1a3072c3e59d2628d63e6df85cbaaef264e8392de744735aae1d10ec153262";
        libraryHaskellDepends = [ base polynomial ];
        jailbreak = true;
        homepage = "https://github.com/bgamari/digamma";
@@ -43279,7 +43408,7 @@ self: {
      mkDerivation {
        pname = "digest";
        version = "0.0.1.2";
-       sha256 = "04gy2zp8yzvv7j9bdfvmfzcz3sqyqa6rwslqcn4vyair2vmif5v4";
+       sha256 = "641717eb16392abf8965986a9e8dc21eebf1d97775bbb6923c7b7f8fee17fe11";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ zlib ];
        description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
@@ -43291,7 +43420,7 @@ self: {
      mkDerivation {
        pname = "digest-pure";
        version = "0.0.3";
-       sha256 = "0rb5jkzn1d4z90hd47qh98mf4n90wvj0cqf3qfpj7ndvw52yy95w";
+       sha256 = "bc24ef45e1bbd923afc3c36106e4e62059e22a4a101fd220489fb460ff946565";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ array base bytestring digest QuickCheck ];
        homepage = "http://github.com/danieldk/digest-pure";
@@ -43306,7 +43435,7 @@ self: {
      mkDerivation {
        pname = "digestive-bootstrap";
        version = "0.1.0.0";
-       sha256 = "0c1hd3l29sci624r4gwp3ndzmancwdy9dp3gz2fmd4jniani3kzz";
+       sha256 = "ffcf11ad8a5692569df86fdc967ce3ccaafa9b1d973f92893091e924e8683030";
        libraryHaskellDepends = [
          base blaze-bootstrap blaze-html digestive-functors
          digestive-functors-blaze http-types text
@@ -43323,7 +43452,7 @@ self: {
      mkDerivation {
        pname = "digestive-foundation-lucid";
        version = "0.0.0.1";
-       sha256 = "1gpmmbf5s4kxf9xhbhf086b5n3kkr9ay2qlm6xlnf8cx1l9rn6bi";
+       sha256 = "71199b130d9d216769379562e155ca730e5b9641c0c1057b727d125ddcaaf5be";
        libraryHaskellDepends = [
          base digestive-functors digestive-functors-lucid http-types lucid
          lucid-foundation text
@@ -43341,7 +43470,7 @@ self: {
      mkDerivation {
        pname = "digestive-functors";
        version = "0.8.0.0";
-       sha256 = "0wlp4504dpv0diw6ln0j3f3dz3232dgcccyzlck92b27asvl3yq3";
+       sha256 = "03fb41b756472c9126a3df33c65e13438cdf861b12586a786c60df4640219772";
        libraryHaskellDepends = [
          base bytestring containers mtl old-locale text time
        ];
@@ -43363,7 +43492,7 @@ self: {
      mkDerivation {
        pname = "digestive-functors-aeson";
        version = "1.1.16";
-       sha256 = "0v01applw92imi3yr6drd1bqig1l1mlps1ia2i1dcln1sh31ms9y";
+       sha256 = "3ee91a06d4c152d642142a067d690d34bc885768b999ec47ac51244eef55016c";
        libraryHaskellDepends = [
          aeson base containers digestive-functors lens lens-aeson safe text
          vector
@@ -43384,7 +43513,7 @@ self: {
      mkDerivation {
        pname = "digestive-functors-blaze";
        version = "0.6.0.6";
-       sha256 = "1kx8d6w89cs9dr7fpfikv7mf0ql1lz854i492nwm64x3d016q6xi";
+       sha256 = "b11b6c0268a31353b915894452d0a78162e0ead933baeb4e6e49b384b869a8cf";
        libraryHaskellDepends = [
          base blaze-html blaze-markup digestive-functors text
        ];
@@ -43400,7 +43529,7 @@ self: {
      mkDerivation {
        pname = "digestive-functors-happstack";
        version = "0.6.1.1";
-       sha256 = "0d613rxwja327fb2dm79xh55vhpa4mg8c1ch4xzrgw3jcchykag5";
+       sha256 = "e5a9e9216372f0977f279005865e25eac25d0aece9d426963b6228c97b1ec134";
        libraryHaskellDepends = [
          base bytestring digestive-functors happstack-server text
        ];
@@ -43416,7 +43545,7 @@ self: {
      mkDerivation {
        pname = "digestive-functors-heist";
        version = "0.8.6.2";
-       sha256 = "0njdhyrwzvcla65j5za0h4n41f2n1sdnar7glcal343xsy2rl019";
+       sha256 = "29009a85d77d904115a3ef64659b0e56b8402c8140fd228b5194edcfb3874d5a";
        libraryHaskellDepends = [
          base blaze-builder digestive-functors heist mtl text xmlhtml
        ];
@@ -43430,7 +43559,7 @@ self: {
      mkDerivation {
        pname = "digestive-functors-hsp";
        version = "0.5.0";
-       sha256 = "00n1cxkrkd3ayl7pp6pr7nyx6zcwqpsqzflnnnf0f8dabrz4wzdc";
+       sha256 = "ac7d4e7e5eaa21079cb596ba8ff5c59c7dd3bd3df99a7b0ff56ab4996767c102";
        libraryHaskellDepends = [ base digestive-functors hsp hsx text ];
        libraryToolDepends = [ trhsx ];
        jailbreak = true;
@@ -43445,7 +43574,7 @@ self: {
      mkDerivation {
        pname = "digestive-functors-lucid";
        version = "0.0.0.3";
-       sha256 = "1f9vlyh20b4qr7q324mxpkn7wbfp3h80il79rwqd5s5n1xx8ryhm";
+       sha256 = "15fa8c7a0fb6e8d230cfe9d008101cd72d7eecbcbd1231f0c9982c20a0a73bb9";
        libraryHaskellDepends = [ base digestive-functors lucid text ];
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Lucid frontend for the digestive-functors library";
@@ -43459,7 +43588,7 @@ self: {
      mkDerivation {
        pname = "digestive-functors-scotty";
        version = "0.2.0.2";
-       sha256 = "0flm1akhx3fj8pli3nz9s7asah7cfm9afz99jx3f4rv7352saclp";
+       sha256 = "9732a545196767e24697297da75275ec40a5d5d1e9db11e945d28d0ea70a953a";
        libraryHaskellDepends = [
          base bytestring digestive-functors http-types scotty text wai
          wai-extra
@@ -43476,7 +43605,7 @@ self: {
      mkDerivation {
        pname = "digestive-functors-snap";
        version = "0.6.1.3";
-       sha256 = "11ah4rvi5fj9vjjzjw0m60s72qiizy1i4hnj44v88ajf2095aigh";
+       sha256 = "f0455512104e2a843621d2421283ff31627134301570f9a5dc49ba1277265085";
        libraryHaskellDepends = [
          base bytestring containers digestive-functors directory filepath
          mtl snap-core text
@@ -43493,7 +43622,7 @@ self: {
      mkDerivation {
        pname = "digit";
        version = "0.1.1";
-       sha256 = "18l6ca3kgp0g8zmai6jsq6pz7hjilcnyspvz95h9pqklhh2z32qk";
+       sha256 = "138bf1058474e29b60497f5fed2da351c2f3afc15a9aa8ea470fdc37876286a2";
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck
@@ -43510,7 +43639,7 @@ self: {
      mkDerivation {
        pname = "digitalocean-kzs";
        version = "0.1.0.3";
-       sha256 = "0w1gbh84sbaab4gn9avjqmwd29rzv0b2dyxqqg22vq1da8g3bzng";
+       sha256 = "cffe351e522de02dc4c3b8fb2616d83f27d178c572ab641f594a2d4d105c2f70";
        libraryHaskellDepends = [
          aeson base bytestring HTTP http-conduit http-types text
          transformers
@@ -43527,7 +43656,7 @@ self: {
      mkDerivation {
        pname = "digits";
        version = "0.2";
-       sha256 = "18s9k7kj0qvd4297msl0k6ziwfb5bl1gwnxlrl8b4rkqda4kf17l";
+       sha256 = "f40437896a7866b210cdb45bfe025d65391ebf9980ea7a92206d6320e79949a3";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Converts integers to lists of digits and back";
        license = stdenv.lib.licenses.bsd3;
@@ -43538,7 +43667,7 @@ self: {
      mkDerivation {
        pname = "dimensional";
        version = "0.13.0.2";
-       sha256 = "1gi8948q1kxnbc76v05swj0yr58j9lljxak6lyci529ny0ac4qlp";
+       sha256 = "9762c214f036891299a766aa2e294d1295ec81e4ba806d0e5bb6cf80114928be";
        libraryHaskellDepends = [ base numtype time ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Statically checked physical dimensions";
@@ -43550,7 +43679,7 @@ self: {
      mkDerivation {
        pname = "dimensional-tf";
        version = "0.3.0.2";
-       sha256 = "1bqd7298y9ymykhi70pqgxwh1599xbq5x4v75mrki5kirh8gqc4x";
+       sha256 = "9d30fc10cc719638732d67935ef0ea299500797ff88213e1f4d5278f92380daf";
        libraryHaskellDepends = [ base numtype-tf time ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Statically checked physical dimensions, implemented using type families";
@@ -43568,7 +43697,7 @@ self: {
      mkDerivation {
        pname = "dingo-core";
        version = "0.2.0";
-       sha256 = "1h0ir5h6nq2c8qk4irbcai87mxgiyahyi2lcxps959zja70pmqf5";
+       sha256 = "c5e17ac151f2a792f4ed8c8ae8a1f2f1f57a50546ce54826464c606b60c911c0";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-builder blaze-html
          blaze-textual bytestring conduit containers cookie deepseq fclabels
@@ -43590,7 +43719,7 @@ self: {
      mkDerivation {
        pname = "dingo-example";
        version = "0.2.0";
-       sha256 = "0mla83bijf077bx16r9rsvbyr8v684j1bfllfw7kswlgyz37rf4b";
+       sha256 = "8bb87cc6f78f723d0f7794ba15244166a3ecd7d6396513fa3a073819d7408a56";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -43611,7 +43740,7 @@ self: {
      mkDerivation {
        pname = "dingo-widgets";
        version = "0.2.0";
-       sha256 = "1d61l2c6vwpngffr5ynm3zrvn7as9zgsm3zg18ldq958s0mvdn8p";
+       sha256 = "17d9b62bd0a824dc280aef8faadf4f5a1dbbf31fd5fa929d7bf6f26d98a0c1b4";
        libraryHaskellDepends = [
          aeson base blaze-html bytestring containers dingo-core fclabels
          file-embed shakespeare-js template-haskell text transformers
@@ -43628,7 +43757,7 @@ self: {
      mkDerivation {
        pname = "diophantine";
        version = "0.2.1.0";
-       sha256 = "118r59mwvihzqsjd530x4pdnvqjk87b3jjdhx5avq31cfdbiyaj9";
+       sha256 = "492a1f57732c0cbc55e9b04939d64153e26ddb251d8cd2a4c61fc6cd6b2a1985";
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ happy ];
        homepage = "https://github.com/llllllllll/Math.Diophantine";
@@ -43637,12 +43766,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diplomacy" = callPackage
+    ({ mkDerivation, base, containers, HUnit, parsec, transformers
+     , TypeNat
+     }:
+     mkDerivation {
+       pname = "diplomacy";
+       version = "0.1.0.0";
+       sha256 = "87bcb1b15d7470947a66f19a534ab145c185d928a3ade828fe2af2cee11cd87a";
+       libraryHaskellDepends = [
+         base containers HUnit parsec transformers TypeNat
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/avieth/diplomacy";
+       description = "The board game Diplomacy, spoken in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "direct-binary-files" = callPackage
     ({ mkDerivation, base, bytestring, mtl }:
      mkDerivation {
        pname = "direct-binary-files";
        version = "1.0";
-       sha256 = "0ci6av8sgrlsn12dbpvqf3imq9w1hm2ll5np2fz7gh9760vvdidr";
+       sha256 = "b9c5b6373027c177be13d7164a458581275ce37078dfd544b09ae6a7d1562632";
        libraryHaskellDepends = [ base bytestring mtl ];
        homepage = "http://ireneknapp.com/software/";
        description = "Serialization and deserialization monads for streams and ByteStrings";
@@ -43655,7 +43801,7 @@ self: {
      mkDerivation {
        pname = "direct-daemonize";
        version = "3.1";
-       sha256 = "0698l8zylkgafx8g91icysz6rq2lyrnd25blhday67s9vkdpbvxh";
+       sha256 = "b0ef75dbdc491fe355837415d16cf654e06cbef62c86f45077ea4dea3fa22819";
        libraryHaskellDepends = [ base unix ];
        homepage = "http://dankna.com/software/";
        description = "Library to switch to daemon mode using built-in OS facilities";
@@ -43669,7 +43815,7 @@ self: {
      mkDerivation {
        pname = "direct-fastcgi";
        version = "1.0.3";
-       sha256 = "049z23gkssk3h8sx9xr3baln3hz5cykf2zp9kzmvbk2n4ky8fs78";
+       sha256 = "e86887fc2456ccb5eb9fe97ee1a667e5c361a95a23f7d43582636a3ddf103f11";
        libraryHaskellDepends = [
          base bytestring containers mtl network utf8-string
        ];
@@ -43688,7 +43834,7 @@ self: {
      mkDerivation {
        pname = "direct-http";
        version = "0.6";
-       sha256 = "0aghfhg0nx2bqi56cw5hnnqxnjbziihn36yqpq12gyhnahwdfvpg";
+       sha256 = "ef6ed7385416fa2702bed89b61618c7f49dbb1b5b070664ac44b740b1e74f029";
        libraryHaskellDepends = [
          base bytestring containers direct-daemonize lifted-base
          monad-control mtl network old-locale SafeSemaphore time
@@ -43706,7 +43852,7 @@ self: {
      mkDerivation {
        pname = "direct-murmur-hash";
        version = "1.0.1";
-       sha256 = "09hv06hslz83gpqfxxv6bfg4i6l7pfv82jxab4lf8g964ciaa42q";
+       sha256 = "5810a52223263de42859aa4b81b6bb879a489e5b66f7eef07d037daaa1011b26";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://ireneknapp.com/software/";
        description = "An implementation of the MurmurHash3 algorithm";
@@ -43718,7 +43864,7 @@ self: {
      mkDerivation {
        pname = "direct-plugins";
        version = "1.1";
-       sha256 = "03f7jrx0skqiirvpzzakk3wwwdjanjxpzv8j5nwpzvqpb4syshcr";
+       sha256 = "9941ed355917ef7fb92d12ed7fbbb44a36cef99853fd7f778e114f0d7a96c70d";
        libraryHaskellDepends = [ base ghc ghc-paths ];
        homepage = "http://dankna.com/software/";
        description = "Lightweight replacement for Plugins, specific to GHC";
@@ -43733,7 +43879,7 @@ self: {
      mkDerivation {
        pname = "direct-sqlite";
        version = "2.3.15";
-       sha256 = "0hlpc3j4crh9hnydcpp6fmiisq9ddn916bslm46x5q1ajvcw7v12";
+       sha256 = "22ecc3d9962ae0d20da9542f13926d2d611d6375e65ed6bc85096646e4609742";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [
          base base16-bytestring bytestring directory HUnit text
@@ -43750,7 +43896,7 @@ self: {
      mkDerivation {
        pname = "directed-cubical";
        version = "0.1.2.0";
-       sha256 = "0wy6p5nymri7l1ldc6c34b9y4ncmzr2wpidbqjrmacxg07iypn3z";
+       sha256 = "7fd8ebe301af3355b3c4abc5cb45fe9559e2d3228319d668a027e6ea6db9c673";
        libraryHaskellDepends = [
          base bytestring containers deepseq hashable parallel QuickCheck
          unordered-containers vector
@@ -43766,7 +43912,7 @@ self: {
      mkDerivation {
        pname = "directory";
        version = "1.2.3.0";
-       sha256 = "1511nw0hgy6sg82xfimg8rbbf43vcqn6gw076m96b9zcy1dzijln";
+       sha256 = "96caf85bf0eca765523507f0672c667b10b75646af46d7057adaf80701b72194";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -43782,7 +43928,7 @@ self: {
      mkDerivation {
        pname = "directory-layout";
        version = "0.7.4.1";
-       sha256 = "0hj7dfv5i2s1dk0rws2fg84crpxz1kgvrq68f373a6hwkbfhv89b";
+       sha256 = "2ba10ddd9a1c1a35ce70c8e0bcdf0cbfdfcc087a4e689ec16c418b58b66b4742";
        libraryHaskellDepends = [
          base bytestring command-qq containers directory filepath free hspec
          lens semigroups template-haskell text transformers unix
@@ -43802,7 +43948,7 @@ self: {
      mkDerivation {
        pname = "directory-tree";
        version = "0.12.0";
-       sha256 = "1idknm7fwci91fkwvzl35g0qd0jk1vb00ds2x82zjf2hdbkcc2gz";
+       sha256 = "ff09c6e66a5038f905ea423700d60e538286c12b83fecda70b2932ee4eb5b3c5";
        libraryHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [ base directory filepath process ];
        homepage = "http://brandon.si/code/directory-tree-module-released/";
@@ -43817,7 +43963,7 @@ self: {
      mkDerivation {
        pname = "dirfiles";
        version = "0.1.0.9";
-       sha256 = "0jqavj2s28ffaql3mcgasxa8fg0bv0v6irr2a5334jqydksj0b96";
+       sha256 = "262d20f56c1e4b32465122e76836d80b3c8754d7eab13a2856ce21a185dc0a4b";
        libraryHaskellDepends = [
          aeson base containers hblock safecopy text time
          unordered-containers
@@ -43833,7 +43979,7 @@ self: {
      mkDerivation {
        pname = "dirstream";
        version = "1.0.0";
-       sha256 = "1hxmcc62h21zsy5bgm9m4d4q7vcgps168j2mp365d2wva56r87vw";
+       sha256 = "7c1f944d519b8b56ccb855486482be8fed83492335d5b78ad73f08280c63b5c3";
        libraryHaskellDepends = [
          base directory pipes pipes-safe system-fileio system-filepath unix
        ];
@@ -43846,7 +43992,7 @@ self: {
      mkDerivation {
        pname = "disassembler";
        version = "0.2.0.1";
-       sha256 = "1yg1mb9w679m1iml0rx2i6gq1ps8s56da4dvn2knvkgg7m1cr39c";
+       sha256 = "2c8dcc423defcd6da7b0bb11d54cd148df809f89a267406b0c351dc3d3aae1f9";
        libraryHaskellDepends = [ array base containers mtl parsec ];
        homepage = "https://github.com/mgrabmueller/disassembler";
        description = "Disassembler for X86 & AMD64 machine code";
@@ -43858,7 +44004,7 @@ self: {
      mkDerivation {
        pname = "discordian-calendar";
        version = "0.1";
-       sha256 = "0ykbfisrb6k8vsqx5avv99j0z4j4615hmql263h12jzhjxfzd22d";
+       sha256 = "4d88f65d97f04b11e03082e20a4b3044920f644a7babd2b1de689a9575746b7a";
        libraryHaskellDepends = [ base time ];
        jailbreak = true;
        homepage = "https://github.com/kallisti-dev/discordian-calendar";
@@ -43871,7 +44017,7 @@ self: {
      mkDerivation {
        pname = "discount";
        version = "0.1.1";
-       sha256 = "1q1lz9dgxp5kq0ngh7pagijmlc616vwrfrb14pjx2vc9s7yvg779";
+       sha256 = "e99cb7fdd1896dd1e525616597f936c1305a657cea1ef82cc0b3dcfe5afa34e0";
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ markdown ];
        homepage = "http://github.com/lightquake/discount";
@@ -43887,7 +44033,7 @@ self: {
      mkDerivation {
        pname = "discrete-space-map";
        version = "0.0.4";
-       sha256 = "1dci1yk1xpndszwcxshdh6sz6ibzxk6l2726b550xx1wffakpmcq";
+       sha256 = "98d53b95733cf40e4a59461c41cdec7f45f3b5810deacef8d7cdde1ea60f91b5";
        libraryHaskellDepends = [
          adjunctions base comonad distributive keys semigroupoids
        ];
@@ -43904,7 +44050,7 @@ self: {
      mkDerivation {
        pname = "discrimination";
        version = "0.1";
-       sha256 = "11ddphyjqc1zhsr6l94hyvxmz68sbjfwaasms7ilf55x5h61g3l1";
+       sha256 = "818e170c2cbd1447e3d1552bc59d5c1a995ffbf690246ab2863f302c3dbcad85";
        libraryHaskellDepends = [
          array base containers contravariant deepseq ghc-prim primitive
          profunctors promises semigroups transformers vector void
@@ -43921,7 +44067,7 @@ self: {
      mkDerivation {
        pname = "disjoint-set";
        version = "0.2";
-       sha256 = "05m7liind4fdw5lw8a8381hm6rjzsqz86qzir79y30pj0axayc3z";
+       sha256 = "7f30afba02f282e1d3c9f163833ed65f665361400329c469e1cd916663a4a716";
        libraryHaskellDepends = [ base containers mtl transformers ];
        testHaskellDepends = [
          base containers HUnit mtl QuickCheck transformers
@@ -43937,7 +44083,7 @@ self: {
      mkDerivation {
        pname = "disjoint-sets-st";
        version = "0.1";
-       sha256 = "0yy4gp5jhfsj3gbk7gh3yplxkxxfsmrl84chp4wfr4v46ff9pc2m";
+       sha256 = "55b09b9c336493ec38b990114473d5aef7d9e9f503be33d71b523b28cb7dc47b";
        libraryHaskellDepends = [ array base ];
        homepage = "http://github.com/ppetr/disjoint-sets-st/";
        description = "Imperative ST/IO based disjoint set data structure";
@@ -43949,7 +44095,7 @@ self: {
      mkDerivation {
        pname = "disk-free-space";
        version = "0.1.0.1";
-       sha256 = "07rqj8k1vh3cykq9yidpjxhgh1f7vgmjs6y1nv5kq2217ff4yypi";
+       sha256 = "f17a4f9c3b41083ccbb6c11b2debdbc705f86097b7459ff0f46cc01d2692381f";
        revision = "2";
        editedCabalFile = "60ab6de6ad0e36274c675338a37c8985972a5a64db69dee7b4f88b797c9b401b";
        libraryHaskellDepends = [ base ];
@@ -43963,7 +44109,7 @@ self: {
      mkDerivation {
        pname = "dist-upload";
        version = "0.0.4";
-       sha256 = "1i9g4jqmmjydcvi07878k6yb5kvxab6dlw3j6nkjdn4mcsc50s71";
+       sha256 = "e16850986695d826a7357270dacc527dcfb2bc99e8a003e266cdcb5ab1242fc5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal directory filepath process ];
@@ -43981,7 +44127,7 @@ self: {
      mkDerivation {
        pname = "distributed-process";
        version = "0.5.5";
-       sha256 = "0w3jwnfc8ca0sx9mshgbxr61pfbnp82ihy3ca5v1pkwz34dqd3f5";
+       sha256 = "c58d861b199fcf1b76516c781805ba76b91b4ceeeb415d53d74031c49ce57270";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static ghc-prim hashable mtl network-transport random
@@ -44004,7 +44150,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-async";
        version = "0.2.1";
-       sha256 = "0g28f2f5b28ra1gnm99yalah6rxqps4yvmi403nb0axw295pbmib";
+       sha256 = "2bd6754b12bc2bb0ec0024d6ed89beb8670315553ea56a5f501989559c70483c";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-extras fingertree hashable mtl stm time
@@ -44032,7 +44178,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-azure";
        version = "0.1.0";
-       sha256 = "0dc0izlsxzcr5jyiad5yvgs5sp5b6dqwr6gxxkk99p7h1wpd4r2g";
+       sha256 = "4f64d22e0ff0dc94e6ecfd99cc7133ab5c5df4dbbe3415bd2c99fdaee98f8035";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44060,7 +44206,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-client-server";
        version = "0.1.2";
-       sha256 = "0wr0fxdg9114jd180p4lrjkashqcyxv69harj1ww5jc8dxdb3k2s";
+       sha256 = "5accb15a6f88c9c2799059c16476f70c43ada6cc945c8042932484f45a772073";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-async distributed-process-extras fingertree
@@ -44093,7 +44239,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-execution";
        version = "0.1.1";
-       sha256 = "1zm4mcicasf59s3zzca2m7hp4ialzmsmn6arjlz2mnrhcpbkg7ja";
+       sha256 = "4a9e37d76530db2a3e9559195b75fd544572e1a942b1ff874ec569c522aba4fe";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
@@ -44127,7 +44273,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-extras";
        version = "0.2.0";
-       sha256 = "0l8k1h0nx2pign82ydyzsjbkc8qw3vhhbrdggzfwvr3hamnjpqly";
+       sha256 = "9ee22b6d5570e4cddd7fafe505e11e1c233697d4df372f907df18a6e010c1351";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          fingertree hashable mtl stm time transformers unordered-containers
@@ -44154,7 +44300,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-monad-control";
        version = "0.5.1";
-       sha256 = "01sdzmb8izsycxshhsg0pbx0mgn10y41df1dj1s66ish0qszw07m";
+       sha256 = "f500fe350650476374902db8168807c1be0afabae0690875675eff8856fd4d07";
        libraryHaskellDepends = [
          base distributed-process monad-control transformers
          transformers-base
@@ -44172,7 +44318,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-p2p";
        version = "0.1.3.2";
-       sha256 = "13m283cwlas0xzqxlrmnwmwimwy29hbvymavyqffd1b0k2m6ag31";
+       sha256 = "613c65aa986085e61cf65b55bf174cc2f31a79e5b666daf1ef402bcad940a28e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44197,7 +44343,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-platform";
        version = "0.1.0";
-       sha256 = "0bxfynvqkzvah7gbg74yzwpma8j32bamnyysj6dk39da0v880abm";
+       sha256 = "752980d006aaa5319b91da7b5bd5124322552fff9e9cb7de816aff89b7f5ae2f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44231,7 +44377,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-registry";
        version = "0.1.0";
-       sha256 = "0c2a5x70sfii053b11xfj2x7199vmmn1k759zylbd5qs129q7hw2";
+       sha256 = "82c38393081a97b6a8ffa99c196cad3ba570ba90ae87b04601313a0d4e2f4a30";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
@@ -44261,7 +44407,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-simplelocalnet";
        version = "0.2.3.0";
-       sha256 = "01871r4cj5zwcv63m95i622h0xxfjnflj33wvpxv1ii5z265rkjy";
+       sha256 = "5ece5c8cf825c6b0fbdd7c0c499d95ae77008530b1a43acc66fc17c9480e0705";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44287,7 +44433,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-supervisor";
        version = "0.1.2";
-       sha256 = "1b2rskzjimb2s8xrz4iv4q3c10njjnycxy5bcy159m6hawz1hzj1";
+       sha256 = "417e183e57d0d4548267abf8cebc95d282c006263b929f3bd262d528ffd459ac";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
@@ -44321,7 +44467,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-task";
        version = "0.1.1";
-       sha256 = "04w1nhca59i6bzmwfi80mryf5pcsn0zmswq3s3ksqc6wy4mfzy1m";
+       sha256 = "35f8ef2af1dc30ace7d003735d3fb09adde27cae0045c7eb5f26a6a218b48113";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-async distributed-process-client-server
@@ -44353,7 +44499,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-tests";
        version = "0.4.1";
-       sha256 = "1jjj77pw39bbbf58j61hdcpr872ncd1k1z2ly75n96gklw9aikbb";
+       sha256 = "6bcda812a7f39964cbf154fc304363561c942f6b3018898a5b6ba5c1ef3952ca";
        libraryHaskellDepends = [
          ansi-terminal base binary bytestring distributed-process
          distributed-static HUnit network network-transport random rematch
@@ -44378,7 +44524,7 @@ self: {
      mkDerivation {
        pname = "distributed-process-zookeeper";
        version = "0.2.0.0";
-       sha256 = "1v8jm5i4kjds7xcmzrhxg9lcz49l9ip7mm8gwjz3f3lgdxm2ykxi";
+       sha256 = "b14f2f6a6f8f0e37bee40fd57a6e4c3491cf687a1de65f593fbac94962a912ed";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44406,7 +44552,7 @@ self: {
      mkDerivation {
        pname = "distributed-static";
        version = "0.3.2.0";
-       sha256 = "1zz18lgf39i8anw17qxacb6cicm1kq0yayx9a4inxpnch5xfvg4m";
+       sha256 = "95bced7a81ccde6e2351a97be5019ea1b2c8cc62aae313b85528a6e11e45e1ff";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq rank1dynamic
        ];
@@ -44420,7 +44566,7 @@ self: {
      mkDerivation {
        pname = "distribution";
        version = "1.0.0.0";
-       sha256 = "0zh9ap3hhylpk7bsp54hm9gj5x8f8zvm5sg7nydmxnigyq0b3l4y";
+       sha256 = "9ed0b100f62fda5e9bb7e7e952f7470ef5225faa9094abd799977a08c755097e";
        libraryHaskellDepends = [
          array base containers MonadRandom random
        ];
@@ -44438,7 +44584,7 @@ self: {
      mkDerivation {
        pname = "distribution-plot";
        version = "1.0.0.0";
-       sha256 = "16k57dxg79x3i7j62ln063j4g4v4n5x80b12pajjrpxrmaffy79n";
+       sha256 = "361def9caab9df2ca5ba222c807ab1649347e430c05261e489a3a7f37a3b659a";
        libraryHaskellDepends = [
          base Chart Chart-cairo colour containers data-default-class
          distribution lens
@@ -44457,7 +44603,7 @@ self: {
      mkDerivation {
        pname = "distributive";
        version = "0.4.4";
-       sha256 = "0s2ln9jv7bh4ri2y31178pvjl8x6nik5d0klx7j2b77yjlsgblc2";
+       sha256 = "82d1f53495fe9c25e4e974825666b4a6232af7452784e145cc04aeb365b25468";
        libraryHaskellDepends = [
          base ghc-prim tagged transformers transformers-compat
        ];
@@ -44475,7 +44621,7 @@ self: {
      mkDerivation {
        pname = "diversity";
        version = "0.7.0.0";
-       sha256 = "04zmqsdpplps0xnhndpvfhxq2mfhnxbj1nzspw28ky7pcps1w621";
+       sha256 = "41181ef465f7f88904bffadb2057b7d055813b74fb360b6d07fad27b9bc6f513";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44496,7 +44642,7 @@ self: {
      mkDerivation {
        pname = "djinn";
        version = "2014.9.7";
-       sha256 = "1p9dvzb83nlrq8h4brdq5l9dm2zf28rjhsmi7nwmac79p5pk9y2g";
+       sha256 = "4ff8346fb9e93055b93db16a283312ee8bda122db8e54520c299da81d6df2ddd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -44513,7 +44659,7 @@ self: {
      mkDerivation {
        pname = "djinn-ghc";
        version = "0.0.2.3";
-       sha256 = "190llfn8dvxkdan806nybn3d4psmnr1126zg8lmk8p5wd7nnm5fb";
+       sha256 = "cb956aed69bc5c342b45ef1b1142b6555fd2865dde1a80ac6ab3ef86aca314a4";
        libraryHaskellDepends = [
          async base containers djinn-lib ghc mtl transformers
        ];
@@ -44526,7 +44672,7 @@ self: {
      mkDerivation {
        pname = "djinn-lib";
        version = "0.0.1.2";
-       sha256 = "048hs27awl4j9lg04qbnpf8c51mzbgy2afckis19zcswmavi1zn0";
+       sha256 = "c0fe10b7aa5cb39f828e933925fc5bbf86c290bb7661021e4d9250ae8ed01011";
        libraryHaskellDepends = [ base containers mtl pretty ];
        homepage = "http://www.augustsson.net/Darcs/Djinn/";
        description = "Generate Haskell code from a type. Library extracted from djinn package.";
@@ -44538,7 +44684,7 @@ self: {
      mkDerivation {
        pname = "djinn-th";
        version = "0.0.1";
-       sha256 = "089b6z8hcv6q9y77zy8m96lc00r1ckzmff0mybp9l1akj7gwdpix";
+       sha256 = "3ddec6df9153059aeef2153857ff642103c0a84915f97f8e4fd86c06d1372b21";
        libraryHaskellDepends = [
          base containers logict template-haskell
        ];
@@ -44554,7 +44700,7 @@ self: {
      mkDerivation {
        pname = "dlist";
        version = "0.7.1.1";
-       sha256 = "1zayvxvkan2s2ixajdr3f5rn1gzhprzv6cww4cbpwjhzw0l7zc08";
+       sha256 = "08b07f28e01f4a7e17239c33b37fbef0bf6073712337a97a145a583577df5efd";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/spl/dlist";
@@ -44567,7 +44713,7 @@ self: {
      mkDerivation {
        pname = "dlist-instances";
        version = "0.1";
-       sha256 = "0r1j7djywqd7c224wc9ixkplj3m2mbf9k3ra7n92ja2kfpksm615";
+       sha256 = "2598aae775532829923d2a8f99dcaaa20e49efec31314e8460a761ee653b3264";
        libraryHaskellDepends = [ base dlist semigroups ];
        homepage = "https://github.com/gregwebs/dlist-instances";
        description = "Difference lists instances";
@@ -44582,7 +44728,7 @@ self: {
      mkDerivation {
        pname = "dns";
        version = "2.0.0";
-       sha256 = "1jq12jdidgz9nrcpnr362n6rwvxywd5v7j4fi18bqaq2f67ybjay";
+       sha256 = "5ec9e58f71022bbc50888ec8b34be3be6f9e8d1566647b59b6e9bf169b1401cb";
        libraryHaskellDepends = [
          attoparsec base binary blaze-builder bytestring conduit
          conduit-extra containers iproute mtl network random resourcet
@@ -44604,7 +44750,7 @@ self: {
      mkDerivation {
        pname = "dnscache";
        version = "1.1.0";
-       sha256 = "0bwpfw7fsis0sqnqrgw13ifla17mcm2xk9b9jagjjqmim66d6zxb";
+       sha256 = "ab7fd38ca9b162299f9269a5d94565f504455d1c81bf8c2dd64047ed0e77972f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44622,7 +44768,7 @@ self: {
      mkDerivation {
        pname = "dnsrbl";
        version = "0.0.3";
-       sha256 = "07xq52aqqmzq1f68m8spr7fyax0cqnpv9mh5m4x3klxm0iznv9xm";
+       sha256 = "b5a76d7f04b5d3393aa905d6b4afc50c74e5ddc957a38a8c0bf8578c9528b81f";
        libraryHaskellDepends = [ base containers hsdns HUnit network ];
        homepage = "http://www.pigscanfly.ca/~holden/dnsrbl/";
        description = "Asynchronous DNS RBL lookup";
@@ -44634,7 +44780,7 @@ self: {
      mkDerivation {
        pname = "dnssd";
        version = "0.1.0.0";
-       sha256 = "0gfyyr1wcxni0r0r9df6lkmv6gvi0qvwclwi9majzg10pas6dk2n";
+       sha256 = "56cc66b4ba20bc2f554d9153c63706713fb3eba4c6b5944106d176c643f6de3d";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ dns_sd ];
        jailbreak = true;
@@ -44654,7 +44800,7 @@ self: {
      mkDerivation {
        pname = "doc-review";
        version = "0.7.1";
-       sha256 = "0009gpm6hgjr78bsp0cd4skvhbms83j4j9axf6zns7pnfqvc6inf";
+       sha256 = "ce46c33676f61e6dbf715d2549e440ba2eb8a7268d81ab173a593e68ea7d0900";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -44678,7 +44824,7 @@ self: {
      mkDerivation {
        pname = "doccheck";
        version = "0.1.0.0";
-       sha256 = "055jns09s50iyzgk9m9d7gbxvnmgd4wxfb5axsxra8qnlfq331lb";
+       sha256 = "8b8631b0a3162395bbeeaa2cd73969afdaddd73b2dd534dff711149d80b6b214";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -44698,7 +44844,7 @@ self: {
      mkDerivation {
        pname = "docidx";
        version = "1.1.0";
-       sha256 = "0020pi4m0n6cvb6hdzhai5f9jidwc8dy6qq3pjs6g4dwql9igsb8";
+       sha256 = "68e91713c5bc9167b4bc0363e31b62bc45995c890afe06cddacc585049bc4000";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -44720,7 +44866,7 @@ self: {
      mkDerivation {
        pname = "docker";
        version = "0.2.0.2";
-       sha256 = "0iv36j8ixjbxlwbpw426lj5z39kwd3mrpb5qqw7c2nxkfp2dr0gi";
+       sha256 = "f181dcc475b35bc10ec7b8ac9beb687ca6f18ba446107e17a77dc91e91346347";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default lens lens-aeson
          network-uri pipes pipes-bytestring pipes-http pipes-text text wreq
@@ -44748,7 +44894,7 @@ self: {
      mkDerivation {
        pname = "dockercook";
        version = "0.4.3.0";
-       sha256 = "0gsaw0qbbd3a017w82hwvmrv0ygxki2c8ls3b6hfc38a17ja68vc";
+       sha256 = "6c23a3e4090a0de6a0594353c4449cfd79b073dd1c0ac44f006ab4b530e04a3f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44775,7 +44921,7 @@ self: {
      mkDerivation {
        pname = "dockerfile";
        version = "0.1.0.1";
-       sha256 = "0980w0fh5xb7azknnmph6rmnzswsjw360ga5ymds2valq2vc0ji9";
+       sha256 = "294ac0b6c0546da15bf5453d6006979aeb6f6b36f0566be75767f5021de00025";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A simple DSL for describing and generating Dockerfile containers in Haskell";
@@ -44789,7 +44935,7 @@ self: {
      mkDerivation {
        pname = "docopt";
        version = "0.7.0.2";
-       sha256 = "0c62lz0xmrd3ycnpmw254jbc5s999nb0xzrrkbv3cj3n9zzcyzak";
+       sha256 = "537dcffe4f764836f69a39ff0e964d29e9c2962445f07a2df3a3e5dac1a7c230";
        libraryHaskellDepends = [
          base containers parsec template-haskell th-lift
        ];
@@ -44809,7 +44955,7 @@ self: {
      mkDerivation {
        pname = "doctest";
        version = "0.10.1";
-       sha256 = "1jbyhzbi2hfrfg7vbkpj6vriaap8cn99nnmzwcfscwaijz09jyrm";
+       sha256 = "357b99c0975171a61de3bf5a9b9265e82a15f336f2ceb5cf73d94111d7877ec9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44834,7 +44980,7 @@ self: {
      mkDerivation {
        pname = "doctest-discover";
        version = "0.1.0.6";
-       sha256 = "1rgk831yf4gamb4m10bbcc2r4hhdh4ffjjr80smkfs95x3pi15d3";
+       sha256 = "a39510efe8256937ab06284be91c810d429205636b8150c9aaea11e7c340f3e5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44858,7 +45004,7 @@ self: {
      mkDerivation {
        pname = "doctest-discover-configurator";
        version = "0.1.0.6";
-       sha256 = "1n2x8rp67ddifyahxcny0k7r514qa82lbxg13z7yg2kvmrfip7r8";
+       sha256 = "289f1b5dae7b8ae7cf1fe1f5450552988492cf04deb20e9577b1b5636e465dd8";
        revision = "1";
        editedCabalFile = "79f62a00ff10acba4f850730ed2ffe99d5637bdfdb48f6fc4b92f03fbbb20a45";
        isLibrary = true;
@@ -44882,7 +45028,7 @@ self: {
      mkDerivation {
        pname = "doctest-prop";
        version = "0.2.0.1";
-       sha256 = "1amfsq53s0bgal77g7hbsvbn1vlqh1jc3qvcjwv0achc6z65dc2a";
+       sha256 = "4ab056cc370c320536976ce3c1648098ee60d7d60b9e770e556f013d0ad6aeaa";
        libraryHaskellDepends = [ base HUnit QuickCheck ];
        testHaskellDepends = [ base doctest HUnit QuickCheck ];
        description = "Allow QuickCheck-style property testing within doctest";
@@ -44894,7 +45040,7 @@ self: {
      mkDerivation {
        pname = "dom-lt";
        version = "0.1.3";
-       sha256 = "0i51d8d49jpf7mhl6c2a4565d4vmh0x5f4kam46hn5ahb1v2nrga";
+       sha256 = "ea652b765850150b0da96a12573a807593564c214a3043613deeca441a6aa144";
        libraryHaskellDepends = [ array base containers ];
        description = "The Lengauer-Tarjan graph dominators algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -44907,7 +45053,7 @@ self: {
      mkDerivation {
        pname = "dom-selector";
        version = "0.2.0.1";
-       sha256 = "1nm3r79k4is5lh5fna4v710vhb0n5hpp3d21r0w6hmqizhdrkb22";
+       sha256 = "42ac991bfc11576838c841b4712f2c162cb841389b28eb0aa4454732d3c9a3da";
        libraryHaskellDepends = [
          base blaze-html containers html-conduit parsec QuickCheck
          template-haskell text th-lift xml-conduit
@@ -44928,7 +45074,7 @@ self: {
      mkDerivation {
        pname = "domain-auth";
        version = "0.2.1";
-       sha256 = "1b1kw4pkm1f5z5qwyfpppk5rjqzi4i7b2vx4zmb2cd9398dnkj4a";
+       sha256 = "8ac8691b4a23352656fda46fb14e24f16399cbbcf73acf71f9c5853a2fe133ac";
        libraryHaskellDepends = [
          appar base binary blaze-builder bytestring containers
          crypto-pubkey-types dns iproute network RSA SHA
@@ -44944,7 +45090,7 @@ self: {
      mkDerivation {
        pname = "dominion";
        version = "0.1.0.4";
-       sha256 = "13ypa09adkj7yilyxxf84rkpap5h4mmx4pwvc4x6121j77xz29dy";
+       sha256 = "be25f1fb393288603a619b5fd26b25b05c756726c8f5ee69f447cea61250d78f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44970,7 +45116,7 @@ self: {
      mkDerivation {
        pname = "domplate";
        version = "0.1.0.1";
-       sha256 = "1njzjxz7mymjfismmv8rxkqb24m0gindbsiszbjgy1wm1lwrspb4";
+       sha256 = "645d9d390d9507ffe4fa3aead56c7ca012b1f0ec19ed5a7574b2fa7a7e975fda";
        libraryHaskellDepends = [
          base bytestring containers tagsoup text unordered-containers vector
          yaml
@@ -44985,7 +45131,7 @@ self: {
      mkDerivation {
        pname = "dot2graphml";
        version = "0.1.0.2";
-       sha256 = "1fwfwp24fdgir0m721c801xi8gkhz2y8s1r1gxdp7m1vl5d0xqii";
+       sha256 = "31e20e5aa13bd4735b7f21078dbcf8703e147b008805712ac8f13547c4e58ebb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers graphviz hxt text ];
@@ -45001,7 +45147,7 @@ self: {
      mkDerivation {
        pname = "dotenv";
        version = "0.1.0.8";
-       sha256 = "1hrr8w5hi6l8v85cwq5r6175al6waj0hmfkvnx8xib2rpby47px6";
+       sha256 = "a6df43fcba59acd851b77bba0a8154dc50554e30b960ce0ada889a080b4739c3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base base-compat parsec ];
@@ -45025,7 +45171,7 @@ self: {
      mkDerivation {
        pname = "dotfs";
        version = "0.1.1.3";
-       sha256 = "0hj21rvjbn8hmb3kf4225ir57j75d8jyzhw2rw8kmjxw3w62l49f";
+       sha256 = "2e112a0c1fbccb3a11cf82c3ef256ae5c853722c421037c7aa10d925770e4242";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45052,7 +45198,7 @@ self: {
      mkDerivation {
        pname = "dotgen";
        version = "0.4.2";
-       sha256 = "148q93qsmqgr5pzdwvpjqfd6bdm1pwzcp2rblfwswx2x8c5f43fg";
+       sha256 = "cf0de20a435d74aeb9a32b8bcb3ebfa1b6659ac3f26edefe2df9e1aaf1481891";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -45069,7 +45215,7 @@ self: {
      mkDerivation {
        pname = "double-conversion";
        version = "2.0.1.0";
-       sha256 = "034ji9jgf3jl0n5pp1nki3lsg173c3b9vniwnwp1q21iasqbawh0";
+       sha256 = "0072b5b05631081c2eb73cda9dd660e384a7e988d3867b8b05540ef7648a920c";
        libraryHaskellDepends = [
          base bytestring ghc-prim integer-gmp text
        ];
@@ -45086,7 +45232,7 @@ self: {
      mkDerivation {
        pname = "dove";
        version = "0.0.0";
-       sha256 = "19h3inxxxcblsbakm93mblhg8g68qc699c13cnska65ij50h3jwd";
+       sha256 = "8dcb014191b11835b56523b0940cc3c83cf4205d75a43ad5d274b1debb8d03a6";
        libraryHaskellDepends = [ acl2 base ];
        description = "The Dove verification language";
        license = stdenv.lib.licenses.bsd3;
@@ -45099,7 +45245,7 @@ self: {
      mkDerivation {
        pname = "dow";
        version = "0.2.5";
-       sha256 = "15vlydfw0yw49jha90zcxynwajnyxhqn32x9w7n58k3j0rkcrp9l";
+       sha256 = "34ddcc6606724c54ece1a98b6131ecde4ac5adefec83a4a04c847bc05df37497";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -45114,7 +45260,7 @@ self: {
      mkDerivation {
        pname = "download";
        version = "0.3.2";
-       sha256 = "0nhbfq8q9ckc5fnlg54l361p2jhkag9cz11v07kj9f1kwkm4d7w3";
+       sha256 = "839f46eae433b824e7013b84cfd253134a718319949447ad2b6cb28411760b5a";
        libraryHaskellDepends = [ base bytestring feed tagsoup xml ];
        homepage = "http://code.haskell.org/~dons/code/download";
        description = "High-level file download based on URLs";
@@ -45127,7 +45273,7 @@ self: {
      mkDerivation {
        pname = "download-curl";
        version = "0.1.4";
-       sha256 = "1wf3pf2k4i6jvpfsjlxdj6v53qd33jj1z1ipaf3p47glgx4xw3lm";
+       sha256 = "950ede497ff41d72875337861fa41ca3e151b691ad53a9ddddd2443285bbc3f1";
        libraryHaskellDepends = [ base bytestring curl feed tagsoup xml ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~dons/code/download-curl";
@@ -45142,7 +45288,7 @@ self: {
      mkDerivation {
        pname = "download-media-content";
        version = "0.0.0.1";
-       sha256 = "1bj4310j3s26xd4ic6hm284dlk91npwilfbwvrk1zz8fas6yr6z6";
+       sha256 = "e69bec8d560efd1f66de7c391af9b5214dda0812151a1649eb46e821411844ae";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -45160,7 +45306,7 @@ self: {
      mkDerivation {
        pname = "dozenal";
        version = "0.1.0.0";
-       sha256 = "0sqvxyj3aybqvjlrz2a93lnp1vbjiqikysm575wizri2rd3vfj1l";
+       sha256 = "3448b747cb22e61f7939a56a3f238e72ed702d1d49899fa9dc787935a4ef1b6b";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/siddhanathan/dozenal";
@@ -45176,7 +45322,7 @@ self: {
      mkDerivation {
        pname = "dozens";
        version = "0.1.1";
-       sha256 = "1hvsdc69ag4x8rp2pzr3cxjfbl4fh9bdj4bwlkfvpr755qdi45ky";
+       sha256 = "7e16121b2ee5e4bbdda47c11d956828ed0e5646723ff2b6e469d3c950c6b7ac3";
        revision = "1";
        editedCabalFile = "08e6297d7be6ec753261aa5cb8f265a6ba6c369f44d25f46f9784ae1d8a88e52";
        libraryHaskellDepends = [
@@ -45194,7 +45340,7 @@ self: {
      mkDerivation {
        pname = "dph-base";
        version = "0.7.0.1";
-       sha256 = "19rc0h94lgxyndaw41wgnc0prwffl780i6nqsn9b7byvgy97f15y";
+       sha256 = "be0477927fdbafb392d5d89a08d0a1cef17c01b38f07c255b3be3f4a12042ca7";
        libraryHaskellDepends = [
          array base ghc-prim pretty random vector
        ];
@@ -45211,7 +45357,7 @@ self: {
      mkDerivation {
        pname = "dph-examples";
        version = "0.7.0.5";
-       sha256 = "1qbj8hsgpmcx95qsqycb6cnfb5vfk9h3w1jyq4k02hf9g7gyvckz";
+       sha256 = "7fb2eddf79c9410126c15e063e609a6e97e52c338b79ac71499dd5fb344472e1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -45232,7 +45378,7 @@ self: {
      mkDerivation {
        pname = "dph-lifted-base";
        version = "0.7.0.1";
-       sha256 = "1gp3l9bgpmly3h74hyfxi3yfm8v4r918800ca64q1b16019hk20k";
+       sha256 = "138809530026ac8089510c008442ca64a3eafc88dd79480e1c9ed6fb56a2e3be";
        libraryHaskellDepends = [
          array base containers dph-base dph-prim-par ghc pretty random
          template-haskell vector
@@ -45251,7 +45397,7 @@ self: {
      mkDerivation {
        pname = "dph-lifted-copy";
        version = "0.7.0.1";
-       sha256 = "11aaiarvrm5463b77r2jimw78pr39g8apjk7bim3d8rl3ija775q";
+       sha256 = "b89ca3641c34a3366a5c67caabd04b235f74788d52e473d630a4d4bcb38a4a85";
        libraryHaskellDepends = [
          array base dph-base dph-prim-par ghc random template-haskell vector
        ];
@@ -45269,7 +45415,7 @@ self: {
      mkDerivation {
        pname = "dph-lifted-vseg";
        version = "0.7.0.1";
-       sha256 = "0vkq7kyd65znzqxh32ql2lrm30vg1wy85bnjg8g08s9q9j3j6a45";
+       sha256 = "852823874c3869041e7ad2ae823c0f6f83513315148b013bfef617d3fc3c786e";
        libraryHaskellDepends = [
          array base containers dph-base dph-lifted-base dph-prim-par ghc
          pretty random template-haskell vector
@@ -45286,7 +45432,7 @@ self: {
      mkDerivation {
        pname = "dph-par";
        version = "0.5.1.99";
-       sha256 = "0csgd8ghbxv1vwp95dn98qv1zp8229fffm9j274bmjg857588i97";
+       sha256 = "274584ca29e8c9bac8113255e75c1202dd1f3646c9b6922edf61f7051f6a4f33";
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -45298,7 +45444,7 @@ self: {
      mkDerivation {
        pname = "dph-prim-interface";
        version = "0.7.0.1";
-       sha256 = "17m03gylc61d7mx26rz70kwmi014rv1g14683vraa1b77pci5h8j";
+       sha256 = "12c112d93d6705a5f21ec890f0c2ce248058f904e767237a3d2d1846fd1ba09e";
        libraryHaskellDepends = [ base dph-base random vector ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
@@ -45313,7 +45459,7 @@ self: {
      mkDerivation {
        pname = "dph-prim-par";
        version = "0.7.0.1";
-       sha256 = "13x7ribvcm965pnzissj0cwk17r5f0ag1zs7w31za17kal3r91pp";
+       sha256 = "f786940755f304f5c3e047fff01470259f30390352ebf8ed2d2655b657cca78f";
        libraryHaskellDepends = [
          base dph-base dph-prim-interface dph-prim-seq old-time random
          vector
@@ -45332,7 +45478,7 @@ self: {
      mkDerivation {
        pname = "dph-prim-seq";
        version = "0.7.0.1";
-       sha256 = "1fz95qzvk2f7zg8am73vdbk14ms420vfvapz79piip0s4bv8cnqr";
+       sha256 = "195b86f6221adc186f3affaaed3610445712e66a7b9caad0fbc789b93f2ee9bb";
        libraryHaskellDepends = [
          base dph-base dph-prim-interface ghc-prim primitive random vector
        ];
@@ -45347,7 +45493,7 @@ self: {
      mkDerivation {
        pname = "dph-seq";
        version = "0.5.1.99";
-       sha256 = "10s6qq4ayh85wvhnyl7dfdr72a76irvg83s71lww8ig988599ygp";
+       sha256 = "f7f9940a42e945c4390d470ff4768ee628717273ed506fe1e60541af08c64683";
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -45361,7 +45507,7 @@ self: {
      mkDerivation {
        pname = "dpkg";
        version = "0.0.3";
-       sha256 = "1bqrj1vqqjnv3qcs1s7lbwyzry95fzxrhi6340zqv0ibvyqnaz5k";
+       sha256 = "b37c65b1df2b828d3f20c34498fb7725f9fc3d5ff4e8a0191edb4a8c779019af";
        libraryHaskellDepends = [
          base bindings-DSL bytestring monad-loops
        ];
@@ -45378,7 +45524,7 @@ self: {
      mkDerivation {
        pname = "drClickOn";
        version = "0.1";
-       sha256 = "10rcmqa2x5xlh5pqfsg9dagf2lmrwc2bby3zklzv3x4s3yqg2ar3";
+       sha256 = "232bf1b01f9af4b13f9d7ff8b504e3b952e19e6ae969876f81b4972e14ae2c83";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/cwi-swat/monadic-frp";
        description = "Monadic FRP";
@@ -45391,7 +45537,7 @@ self: {
      mkDerivation {
        pname = "draw-poker";
        version = "0.1.0.1";
-       sha256 = "16b17qfj3bah468hqsksk2rhyl33m2vyqw0rrs1wyaz75yq35257";
+       sha256 = "a78832b02fe72bcf83ce1970ecb7a863500fb3987a6a0c912150ad211d3e6199";
        revision = "1";
        editedCabalFile = "62a11039e0b634f0b372c28d87f6fe84f40a33981211c9f2bc077135abcef629";
        isLibrary = true;
@@ -45409,7 +45555,7 @@ self: {
      mkDerivation {
        pname = "drawille";
        version = "0.1.0.5";
-       sha256 = "08zmy1r1qj7adhsp4z0mr7h0qvc9gaziacjqfl0629n5x2i7zddr";
+       sha256 = "b9b57fa2e8c526610075583215bf7a896d0ce0c9157c72356cea481c72f0f523";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -45424,7 +45570,7 @@ self: {
      mkDerivation {
        pname = "drifter";
        version = "0.1.0.1";
-       sha256 = "1ldqlkxkshg4i1iqvjzq01cz9mxhyaszhybhq4kngd0rig3n1qhq";
+       sha256 = "18e260c78b19b46727c17079f8b5f2b0d7f45900f8cb8d6388e4413dfba4b8d1";
        libraryHaskellDepends = [
          base bytestring postgresql-simple text time
        ];
@@ -45444,7 +45590,7 @@ self: {
      mkDerivation {
        pname = "dropbox-sdk";
        version = "0.3.1";
-       sha256 = "1s0aki1ayjickkkwmn1mc38gnd257v24wy6yj9p05qm2g8gm7xy2";
+       sha256 = "c2f7531f7aa2e2026e92de784ec43e4534fbd06035d8cae79c2c4aaf429c0ae8";
        libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive certificate conduit
          HTTP http-conduit http-types json monad-control network old-locale
@@ -45465,7 +45611,7 @@ self: {
      mkDerivation {
        pname = "dropsolve";
        version = "0.1.2.1";
-       sha256 = "1nrvrcf51jdy5vhqbnrllb3y5rgrhg1qwsd05z24s38ra40whbgp";
+       sha256 = "f72dc80151190d4dc42fa0698ec383f9e5e2c7a234db85e12ebec9501ccb3bdb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -45485,7 +45631,7 @@ self: {
      mkDerivation {
        pname = "ds-kanren";
        version = "0.2.0.1";
-       sha256 = "14sgqd55jnqahp0mi4x46a5903bnj2f2crlfrkyg9qds73wjj7fk";
+       sha256 = "d31d29f938bae1f4fccc8e66269c90760d908a32a49358c1850a5b594ac34f93";
        libraryHaskellDepends = [ base containers logict ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A subset of the miniKanren language";
@@ -45503,7 +45649,7 @@ self: {
      mkDerivation {
        pname = "dsh-sql";
        version = "0.2.0.2";
-       sha256 = "00r1wbgbkpnza1jjd14vqr4hwgfkhnz7yivkx4bla5frfdlv5q58";
+       sha256 = "a8e0b26973d9154517e973477fbe85d33d0e49c69b84266550dfdeb9dee22103";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45528,7 +45674,7 @@ self: {
      mkDerivation {
        pname = "dsmc";
        version = "0.1.0.1";
-       sha256 = "0va22bx3fj80rl03mv3pnwvsdjkax41pp8qxyj3yiicbyi6zzaa5";
+       sha256 = "45a9ff4df48bc5e887f41da37b03e96acaa637b777ec3a00cd004937fa12426d";
        libraryHaskellDepends = [
          attoparsec base bytestring containers entropy hslogger mwc-random
          parallel primitive repa strict transformers vector
@@ -45546,7 +45692,7 @@ self: {
      mkDerivation {
        pname = "dsmc-tools";
        version = "0.1.0.1";
-       sha256 = "0wry1dwcf3dwd780aic3v6jlrdjplrsciw1rr582a78c7anasjr0";
+       sha256 = "204badac3a0c1d2550c939f0c874a657b64ca5d9834505d069bc0dc7780b3e73";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -45564,7 +45710,7 @@ self: {
      mkDerivation {
        pname = "dson";
        version = "0.3.0.0";
-       sha256 = "15pqja0q1lram7xi5xk8dlcfg5m1z0l4zscqw24wm50hmqpxi09d";
+       sha256 = "2d81d82fae1094ca89e098e94f28f8a196e7186d68f612fba92ad3808192f896";
        libraryHaskellDepends = [ base parsec ];
        jailbreak = true;
        homepage = "https://github.com/lcycon/hs-dson";
@@ -45577,7 +45723,7 @@ self: {
      mkDerivation {
        pname = "dson-parsec";
        version = "0.4.1.1";
-       sha256 = "1zflz9vhcz7psssn6hrizmwdmrvpagxhl0648k6f1n9xj50kp99y";
+       sha256 = "3ea53b41913dd9e0cc44c4000afb5377e7da78fd314363b5d6f77c0677fad4fd";
        libraryHaskellDepends = [ base parsec ];
        jailbreak = true;
        homepage = "https://github.com/alvare/dson-parsec";
@@ -45590,7 +45736,7 @@ self: {
      mkDerivation {
        pname = "dsp";
        version = "0.2.3";
-       sha256 = "1h7y3b2gwbkq97lv6f9a4zssyqs422g5zj2bi9mq1a5fzy5i4v4v";
+       sha256 = "9b6c128bffaea8806b8a4bc85f9e104463aff5272a39b3e949782efec41afec0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base random ];
@@ -45607,7 +45753,7 @@ self: {
      mkDerivation {
        pname = "dstring";
        version = "0.4.0.4";
-       sha256 = "15zy1dhfs87hxq1qm54ym0pdhvg7l76m7vy5y06dnksb1sblhaqm";
+       sha256 = "152b48970e4b4fdb0cf0c5ef53cda1e76dd82ea89e948a03eef020ed600bfe97";
        libraryHaskellDepends = [ base base-unicode-symbols dlist ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/dstring";
@@ -45623,7 +45769,7 @@ self: {
      mkDerivation {
        pname = "dtab";
        version = "1.0";
-       sha256 = "1zx5kpljjxyzbsg0hg8ml8mig1s9hggm2nlqmbfbxmldxh3pq1j3";
+       sha256 = "43067c07ec8dd6bedcaa985a51df834987172ba2153d089e5edf7729e99da5ff";
        revision = "2";
        editedCabalFile = "50fe31cffb6f7eab4428bf547fd0c7e7804a0f20c604692a18b213d4a54a0a7a";
        isLibrary = true;
@@ -45647,7 +45793,7 @@ self: {
      mkDerivation {
        pname = "dtd";
        version = "1.1.0.2";
-       sha256 = "11sqmsxw36rn2xkccr7zrmpzijpc3j0z1cxsjcfncnj3l5iaqryp";
+       sha256 = "d767ac62a1435a661d93bab3f0811ceccaf86fcdff64c66617369bc1bbae5887";
        libraryHaskellDepends = [
          attoparsec attoparsec-conduit base blaze-builder conduit containers
          lifted-base monad-control network resourcet text transformers
@@ -45667,7 +45813,7 @@ self: {
      mkDerivation {
        pname = "dtd-text";
        version = "0.1.2.0";
-       sha256 = "1czygz52aparm4qbkfsskm9qd5wirdpccjn66nh7d62d440j1as8";
+       sha256 = "48ab2001214d9876a035c64ac66ecb919786539d5abbb930a9595d25ca7ffeb3";
        libraryHaskellDepends = [
          attoparsec base containers dtd-types text xml-types
        ];
@@ -45682,7 +45828,7 @@ self: {
      mkDerivation {
        pname = "dtd-types";
        version = "0.3.0.1";
-       sha256 = "1w2ni9b8kn242grdqb4wxvgxqpkpp9qy66d57n33l5jghlg8b0s7";
+       sha256 = "4783851e854f163a863da519e371ba775edcdfee9c2cdcf21344d889568a56f0";
        libraryHaskellDepends = [ base text xml-types ];
        homepage = "http://projects.haskell.org/dtd/";
        description = "Basic types for representing XML DTDs";
@@ -45695,7 +45841,7 @@ self: {
      mkDerivation {
        pname = "dtrace";
        version = "0.1";
-       sha256 = "0qszlhll0cx0clydypg0r0g00v8ig1aasqp1ga0jnbfr7q7rwfrr";
+       sha256 = "393b9e0f3ed92d2b817ae162ad5478116d001ec8e05ddf3c65a0334029a45f63";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -45710,7 +45856,7 @@ self: {
      mkDerivation {
        pname = "dtw";
        version = "1.0.1.0";
-       sha256 = "15qk8r958pssgwqhxffw45vm5bpvv9wfarv9spaplrnb3sm5bzhk";
+       sha256 = "13fe55aa1ecb667ad5d56967e578dafbae527721dcb90e317f5a5f5452461397";
        libraryHaskellDepends = [ base containers vector vector-space ];
        testHaskellDepends = [
          base containers QuickCheck test-framework
@@ -45727,7 +45873,7 @@ self: {
      mkDerivation {
        pname = "dual-tree";
        version = "0.2.0.6";
-       sha256 = "0zdmycfr7b2gf63r2w48ylhcywphz9v3z79im33q1wb7p7pjiacv";
+       sha256 = "9ba928efb967f180c7a8319d3f76faf072cf20f588709187714fac931df3b57d";
        libraryHaskellDepends = [ base monoid-extras newtype semigroups ];
        description = "Rose trees with cached and accumulating monoidal annotations";
        license = stdenv.lib.licenses.bsd3;
@@ -45740,7 +45886,7 @@ self: {
      mkDerivation {
        pname = "dump";
        version = "0.2.8";
-       sha256 = "0p0wwcxm2lgfbx82s226dprd8qa526pnrnpakxmdz5svd6ib0gh4";
+       sha256 = "043eb0a2695b97df6a9feada6caf114561d4f26d46082d505fee51513be31c5c";
        libraryHaskellDepends = [
          base haskell-src-meta interpolatedstring-perl6 template-haskell
          text
@@ -45766,7 +45912,7 @@ self: {
      mkDerivation {
        pname = "duplo";
        version = "1.8.1";
-       sha256 = "1k63904aly7qwx96vqys0yx4amys8y5dl9xb9hp4x7ymw0b6h43i";
+       sha256 = "71106816e0d59f4e2e4cab27da8a47da5745ba07dae36d52e7f878aa0848c3cc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45801,7 +45947,7 @@ self: {
      mkDerivation {
        pname = "dvda";
        version = "0.4";
-       sha256 = "1q8avdmzqxnr63ak0i1n6n4cvc23qkrmqlii628mis7vzfcw2yp8";
+       sha256 = "e87ac199fbfbe858913031525cf3c443b0cd8835364430d530d976fc6bdb0ae1";
        libraryHaskellDepends = [
          base containers hashable hashtables mtl unordered-containers vector
        ];
@@ -45820,7 +45966,7 @@ self: {
      mkDerivation {
        pname = "dvdread";
        version = "0.1";
-       sha256 = "1lxqm9r4zcw364yzpqaaf4nrja5n88vlwa527ixifhc80x6ffx0m";
+       sha256 = "1574e74c078841177b3ca2284e3742b628992d714ae1fb3d3183b34f72aab8d3";
        libraryHaskellDepends = [ base bytestring mtl ];
        libraryPkgconfigDepends = [ dvdread ];
        libraryToolDepends = [ c2hs ];
@@ -45834,7 +45980,7 @@ self: {
      mkDerivation {
        pname = "dvi-processing";
        version = "0.3.1";
-       sha256 = "0dp6acmrvlns85nzbbh65vd6fjam04h11kxd9bk6j6hqa2qaqa43";
+       sha256 = "8328acb050181a69e64aadcf102001554967da2e06aef56d41dad29d2b53e636";
        libraryHaskellDepends = [ base bytestring filepath transformers ];
        jailbreak = true;
        description = "Read/write DVI and TFM file";
@@ -45846,7 +45992,7 @@ self: {
      mkDerivation {
        pname = "dvorak";
        version = "0.1.0.0";
-       sha256 = "1kxnzzm24kslsyy9fsjazfz14svbh9svh6f7rnf060as864vmj5g";
+       sha256 = "afc8ba89415a01039ccdc719b875826b6b12befb4a6a97bcd7544f22eaffb6cf";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/kvanberendonck/codec-dvorak";
@@ -45859,7 +46005,7 @@ self: {
      mkDerivation {
        pname = "dwarf";
        version = "0.23";
-       sha256 = "0h6bzh628cz0qnbk4aiz5859r9va99q307scbwzvs1wn3nm6dszl";
+       sha256 = "f4eb66aa1d9607bd3f5f4c1f30704a6aa79c0a2a3f2a3297c5e033240cfccb40";
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for DWARF debug format";
        license = stdenv.lib.licenses.bsd3;
@@ -45872,7 +46018,7 @@ self: {
      mkDerivation {
        pname = "dwarf-el";
        version = "0.2.1.1";
-       sha256 = "18ba03v1m7xbsgygjgfrzr9c7fah21lr3300mhvqipicdgrb691w";
+       sha256 = "3c24b3f26b2cde8837ac008c91691050b9c352fed93df9fcd3ab9f1af6006aa1";
        libraryHaskellDepends = [
          base binary bytestring containers transformers utf8-string
        ];
@@ -45887,7 +46033,7 @@ self: {
      mkDerivation {
        pname = "dwarfadt";
        version = "0.4";
-       sha256 = "15mzv6sa2qf0g9skwq4ij35l3lqbc4x3fzwj5hkx93f8pz2bj1hi";
+       sha256 = "1106b9c4bfc88dd4272c927f373a610bd341cb9091603e757ac061a1b4d9bf96";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45905,7 +46051,7 @@ self: {
      mkDerivation {
        pname = "dx9base";
        version = "0.1.1";
-       sha256 = "16gwlpxfgh78sx7cb2ryqklhz5smhwk51ma260d6rg082nhy5y3i";
+       sha256 = "71f8e2a11508bc6c1a3042d550268755970fe9c43e8bc54ed7e8c0e7faa5fc99";
        libraryHaskellDepends = [ base Win32 ];
        description = "Backend for a binding to the Microsoft DirectX 9 API";
        license = stdenv.lib.licenses.bsd3;
@@ -45917,7 +46063,7 @@ self: {
      mkDerivation {
        pname = "dx9d3d";
        version = "0.1.1.1";
-       sha256 = "1y9g53jajgnlrzzg5vzgx329mii9k396xai4b04hs6gndkdrwprj";
+       sha256 = "325f9edb6cf6190d095824aa6ed29829c69ac4e8efeff2fecfd43ea9e4282ff9";
        libraryHaskellDepends = [ base dx9base Win32 ];
        librarySystemDepends = [ d3d9 ];
        description = "A binding to the Microsoft DirectX 9 API";
@@ -45930,7 +46076,7 @@ self: {
      mkDerivation {
        pname = "dx9d3dx";
        version = "0.1.1";
-       sha256 = "1n5rbq7k1g5l9y5vkadypfksai9sfx2vimdsas1if9h3jnqvvf67";
+       sha256 = "c7b8bdb1950326178356bad5b845773a45a5a7bbbea9b98b4fb4bc300f5eb9d8";
        libraryHaskellDepends = [ base dx9base dx9d3d Win32 ];
        librarySystemDepends = [ d3dx9 ];
        description = "A binding to the Microsoft DirectX 9 D3DX API";
@@ -45946,7 +46092,7 @@ self: {
      mkDerivation {
        pname = "dynamic-cabal";
        version = "0.3.5";
-       sha256 = "0fkr3hps3v0ygcah4dpzfqyfxm0rj4knivbbarllzv86h042vwxw";
+       sha256 = "bcf32d088006ed4f69566bed68279119d4ee3c76ff3602157b1eeca12f1c793a";
        libraryHaskellDepends = [
          base containers data-default directory filepath ghc ghc-paths
          haskell-generate haskell-src-exts time void
@@ -45967,7 +46113,7 @@ self: {
      mkDerivation {
        pname = "dynamic-graph";
        version = "0.1.0.8";
-       sha256 = "1lh7wlzmm1nsbzy7ahkcajyfkg4v2vbyp0992570w32bn7nl4b5k";
+       sha256 = "b32c42edb14b0c0e4e112981ebd7169bbce9bc546c4275fc5fda865a3fe507d2";
        libraryHaskellDepends = [
          base cairo colour either GLFW-b GLUtil OpenGL pango pipes
          transformers
@@ -45983,7 +46129,7 @@ self: {
      mkDerivation {
        pname = "dynamic-linker-template";
        version = "0.1.0.4";
-       sha256 = "043d8kp4a5pskfyzihm7laa1h9jchdgzvc8v32ck0mxcrigicrgq";
+       sha256 = "f865165fccac573099181bb1fd5f834c261894a2a7c2f8bd9bfa1645ee446d10";
        libraryHaskellDepends = [ base containers template-haskell unix ];
        homepage = "http://github.com/hsyl20/dynamic-linker-template";
        description = "Automatically derive dynamic linking methods from a data type";
@@ -45997,7 +46143,7 @@ self: {
      mkDerivation {
        pname = "dynamic-loader";
        version = "0.0";
-       sha256 = "0cwmwf60gfcb1xzbx9yz870fxxpdwcd0kmj4pkz6zy8l53j3mqi0";
+       sha256 = "20e23ae42814f96ffebc44d6091ae3edf6eec041dfa7be7e0f8bb9078ce39533";
        libraryHaskellDepends = [
          base directory ghc-prim hashable hashtables time transformers
        ];
@@ -46011,7 +46157,7 @@ self: {
      mkDerivation {
        pname = "dynamic-mvector";
        version = "0.1.0.3";
-       sha256 = "1nydfmhkdgynng4pn7c6f3rqdx2b21j7sqnzkb477gkri58y6335";
+       sha256 = "650ce3518979be73c89adf627d64104bf486f370861d7bc9b3d6bf366175cddb";
        libraryHaskellDepends = [ base primitive vector ];
        homepage = "https://github.com/AndrasKovacs/dynamic-mvector";
        description = "A wrapper around MVector that enables pushing, popping and extending";
@@ -46025,7 +46171,7 @@ self: {
      mkDerivation {
        pname = "dynamic-object";
        version = "0.2.1";
-       sha256 = "1xzjwsdq4v08m66lph81h67sii7qkvni5pygmh3iblx7rybsvflb";
+       sha256 = "8bbaad97cfa7d31507accfdf12ed9ef8c4a88f8101c14b8da9086c829be6f2f7";
        libraryHaskellDepends = [
          base containers lens mtl QuickCheck text transformers
        ];
@@ -46047,7 +46193,7 @@ self: {
      mkDerivation {
        pname = "dynamic-plot";
        version = "0.1.0.1";
-       sha256 = "0yrkf28hsh992bd9cx3dpc69xg444n9j819ysqjfci7wwnvzxx31";
+       sha256 = "61f4feb7e5fc44e624d63e0524932584bc9e0cbb6d7496da1229410d9170337b";
        revision = "1";
        editedCabalFile = "bf93f06c056b95264f16bd647b64220d9dd81c421045b66a9a2d2005659cecf5";
        libraryHaskellDepends = [
@@ -46070,7 +46216,7 @@ self: {
      mkDerivation {
        pname = "dynamic-pp";
        version = "0.2.0";
-       sha256 = "03y9sl3xcnp1ixi4y0i1a7frd2bgfvnb0r4pqjs38bvjkz96bbdd";
+       sha256 = "adad65d29f722f34b4c49764b0ec766f8996dd5121024f628fe15ad607d5c90f";
        libraryHaskellDepends = [
          ansi-terminal base blaze-builder bytestring Cabal hashable
          unordered-containers utf8-string
@@ -46092,7 +46238,7 @@ self: {
      mkDerivation {
        pname = "dynamic-state";
        version = "0.2.0.0";
-       sha256 = "1dp0sp5cjk7rga9jkjdhl1alpj9g6g51zm57g58b64h070b9r82k";
+       sha256 = "53a09c16380012b35079a7d41fca332fc94b55a0b0c929937af94cc9cad5e0b6";
        libraryHaskellDepends = [
          base binary bytestring hashable unordered-containers
        ];
@@ -46114,7 +46260,7 @@ self: {
      mkDerivation {
        pname = "dynobud";
        version = "1.4.0.0";
-       sha256 = "1dmgi69gsh7rm385pykajlq73m3cfaw617gkj2nv0h4x11mdp0ms";
+       sha256 = "ba82db6a089d40b0ad90f39d60b8726cd47130956afa5bd0a8f940fd9289afb6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46146,7 +46292,7 @@ self: {
      mkDerivation {
        pname = "dyre";
        version = "0.8.12";
-       sha256 = "10hnlysy4bjvvznk8v902mlk4jx95qf972clyi1l32xkqrf30972";
+       sha256 = "e224305cc6b38b4143f49489931c2ea94b326915206d34eddf5b2ee2b5a71682";
        libraryHaskellDepends = [
          base binary directory executable-path filepath ghc-paths io-storage
          process time unix xdg-basedir
@@ -46161,7 +46307,7 @@ self: {
      mkDerivation {
        pname = "dzen-utils";
        version = "0.1.1";
-       sha256 = "05s47s40amydwd6dc75rnaganx2qi2spx668p8x0xs0fdwnqvsf0";
+       sha256 = "c0e98d2d6f0ee80e3abac8987eb5885874ab9eb2b91cd64ce3cd5705883e4417";
        libraryHaskellDepends = [ base colour process ];
        description = "Utilities for creating inputs for dzen";
        license = "GPL";
@@ -46172,7 +46318,7 @@ self: {
      mkDerivation {
        pname = "eager-sockets";
        version = "0.1";
-       sha256 = "10g8w50hhw8ap6lvsv9apmmfaqvqjwzhnq4mx1npapb8cmsmzgdb";
+       sha256 = "abbd5f7565685d756de895600b3f977863e56abd2a6dbda9b90a710841e1e881";
        libraryHaskellDepends = [ base bytestring network ];
        jailbreak = true;
        description = "Socket operations with timeouts";
@@ -46186,7 +46332,7 @@ self: {
      mkDerivation {
        pname = "easy-api";
        version = "0.1.0.0";
-       sha256 = "0ch4vb7h499gfc2j60gfzj164f3s8rk9hw22g36ymiihsi3ipl1b";
+       sha256 = "2bd01b47d430c6eacd7842709866467a386282fcee012305732f2502cfda0432";
        libraryHaskellDepends = [
          aeson base bytestring either http-conduit mtl resourcet text
        ];
@@ -46202,7 +46348,7 @@ self: {
      mkDerivation {
        pname = "easy-file";
        version = "0.2.1";
-       sha256 = "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz";
+       sha256 = "ff86e1b29284499bea5f1d0ff539b3ed64fa6d1a06c2243ca61f93be0202e56c";
        libraryHaskellDepends = [ base directory filepath time unix ];
        homepage = "http://github.com/kazu-yamamoto/easy-file";
        description = "Cross-platform File handling";
@@ -46216,7 +46362,7 @@ self: {
      mkDerivation {
        pname = "easyjson";
        version = "0.1.0.1";
-       sha256 = "19464q0xc3pk1jbf3p94ym97i90600dzhyy4ddv9xf4ligvgbsg2";
+       sha256 = "e2e9f5f68b94b89e766bc47bf81b0006a47852f524dde1960cf30ed6012686a4";
        libraryHaskellDepends = [
          base mtl parsec text unordered-containers vector
        ];
@@ -46232,7 +46378,7 @@ self: {
      mkDerivation {
        pname = "easyplot";
        version = "1.0";
-       sha256 = "18kndgvdj2apjpfga6fp7m16y1gx8zrwp3c5vfj03sx4v6jvciqk";
+       sha256 = "1347b6a5d9a4eb01a4db858dcbf347fd056f423dd719f5dc955709d9f66b76a2";
        libraryHaskellDepends = [ base process ];
        homepage = "http://hub.darcs.net/scravy/easyplot";
        description = "A tiny plotting library, utilizes gnuplot for plotting";
@@ -46246,7 +46392,7 @@ self: {
      mkDerivation {
        pname = "easyrender";
        version = "0.1.0.1";
-       sha256 = "147r2jw0vrld73637vw4k83v4xf8r1dl9cy6gcll9kkpkcck8lkn";
+       sha256 = "765234199b77ce44297bc6b3445bc8c875b2079a84ef33cc388de60db814f990";
        libraryHaskellDepends = [
          base bytestring containers mtl superdoc zlib
        ];
@@ -46262,7 +46408,7 @@ self: {
      mkDerivation {
        pname = "ebeats";
        version = "0.1.0";
-       sha256 = "0r3pl63fxrrfafwp3791xh0c47pb4jqqcm9lk52g0gaqg0s8x5qk";
+       sha256 = "13978e3478583df04499345586b124eb1ec200ec219d71b9532ee7ee86a17764";
        libraryHaskellDepends = [ base time ];
        jailbreak = true;
        description = "Time in ebeats";
@@ -46276,7 +46422,7 @@ self: {
      mkDerivation {
        pname = "ec2-signature";
        version = "3.1";
-       sha256 = "1yzyz2a4fm2q6r3nlfjqjmm4fabhl31mq8dgg9shfd3p7cm646g0";
+       sha256 = "e019622a3b773407757aaf215cc3a07029476a95583a6a473658544794f8fefb";
        libraryHaskellDepends = [
          base base64-bytestring bytestring http-types SHA
        ];
@@ -46296,7 +46442,7 @@ self: {
      mkDerivation {
        pname = "ecdsa";
        version = "0.2";
-       sha256 = "1300m9rszfjmwqbqb7x9clg6y3qwgwa9s38w72r6plhzbiqmy28n";
+       sha256 = "16095f715c1fd26bb2381c0d9d147f1c0f6f1e65a99f8517e655baaf73aa008c";
        libraryHaskellDepends = [
          base bytestring crypto-api crypto-pubkey-types hecc
        ];
@@ -46313,7 +46459,7 @@ self: {
      mkDerivation {
        pname = "ecma262";
        version = "0.0.0";
-       sha256 = "1hvi5adgqjkxq1y10d7jr39h4i63khmgrgmlfk09114flllnh8gm";
+       sha256 = "f5216829a58e8490c074b4befc2a9cc34402d3c8f234107cc07d4afc9a2a71c3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46333,7 +46479,7 @@ self: {
      mkDerivation {
        pname = "ecu";
        version = "0.0.8";
-       sha256 = "1afb507ywpy2y29zmvywj25qw4gn1h5sd0k051jiw03yvdasn0wj";
+       sha256 = "9203ab55db7e001e65286082a60b0cf6118e8b90dceffa93f0c25fee0f28cba9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -46351,7 +46497,7 @@ self: {
      mkDerivation {
        pname = "ed25519";
        version = "0.0.2.0";
-       sha256 = "0x08p2941g7f3xsg8jgy5j73v0dihg47j2i1hb53c7h4jhvc1fmj";
+       sha256 = "b2bac03694041e36ca82210a79c883b1813d8e2cfe49f4741feebc4092b80874";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hlint QuickCheck ];
        homepage = "http://thoughtpolice.github.com/hs-ed25519";
@@ -46365,7 +46511,7 @@ self: {
      mkDerivation {
        pname = "ed25519-donna";
        version = "0.1";
-       sha256 = "1x7dmv53hj9j360rwyq379mfzsddbabyzpl37i5fmjwpy160c2r6";
+       sha256 = "260b064cf097cbea4a3c83deef975aade9ef6a3a037b9e8119324938caaeedf4";
        libraryHaskellDepends = [ base bytestring crypto-api ];
        jailbreak = true;
        homepage = "github.com/tommd/hs-ed25519-donna";
@@ -46380,7 +46526,7 @@ self: {
      mkDerivation {
        pname = "eddie";
        version = "1.0.0";
-       sha256 = "1zq2xadpl33mxdn99aim5rscwqgpy5w0lk7pa3k3h9x3d3c3qzxx";
+       sha256 = "bd7f3cd868a32738e650f74c0a78f1f761ce742e35aa946ceb750c7a9bea02ff";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -46401,7 +46547,7 @@ self: {
      mkDerivation {
        pname = "ede";
        version = "0.2.8.2";
-       sha256 = "0j0b0pn9apvpqxb0gnxxp51g32xc47jky4njb9jn0x59jssc1g1q";
+       sha256 = "38bcc0b496a97460655ad2123fe521ac8bf142b9bddb0756c7775f95ec050b48";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base bifunctors bytestring comonad directory
          filepath free lens mtl parsers scientific semigroups text
@@ -46420,7 +46566,7 @@ self: {
      mkDerivation {
        pname = "edenmodules";
        version = "1.2.0.0";
-       sha256 = "1wbasb9lsw2rycl2ibd8r9p3d9dl8gd75390qsc83znqx802ylxj";
+       sha256 = "b2532f00ead8fe8198c6208d72da43b4a5366ecaa8ad2828f359704dd3d26af1";
        libraryHaskellDepends = [ base containers deepseq parallel ];
        jailbreak = true;
        homepage = "http://www.mathematik.uni-marburg.de/~eden";
@@ -46434,7 +46580,7 @@ self: {
      mkDerivation {
        pname = "edenskel";
        version = "2.1.0.0";
-       sha256 = "1bf5zw1x4f6a801ig2b8b84kbnmp0asn804gkm18v9fjcchz3j9q";
+       sha256 = "38c9f12163d2a58d429d8f0064b502b7da35095a6889170340ca38d203ffc5ad";
        libraryHaskellDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
        license = stdenv.lib.licenses.bsd3;
@@ -46449,7 +46595,7 @@ self: {
      mkDerivation {
        pname = "edentv";
        version = "4.10.0";
-       sha256 = "0jkcva53vm8lm76z947xms8a2zkh9sn9951cwry8k7r132dmcn32";
+       sha256 = "6258569b18219f897ce62c9494ac4e707ea190aefd90f4cda914d53d8ada6c4a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -46469,7 +46615,7 @@ self: {
      mkDerivation {
        pname = "edge";
        version = "0.9.0.2";
-       sha256 = "0rd95pw3b83zg50i29g6bvqh4dnz5ma9l3v5r1hhszmrkpyfvzkv";
+       sha256 = "7bfeedfc9db97e0d61c8650f9a542ddf3602f15ee6251141797fa035f82da965";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -46489,7 +46635,7 @@ self: {
      mkDerivation {
        pname = "edit-distance";
        version = "0.2.2.1";
-       sha256 = "0jkca97zyv23yyilp3jydcrzxqhyk27swhzh82llvban5zp8b21y";
+       sha256 = "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a";
        libraryHaskellDepends = [ array base containers random ];
        testHaskellDepends = [
          array base containers QuickCheck random test-framework
@@ -46505,7 +46651,7 @@ self: {
      mkDerivation {
        pname = "edit-distance-vector";
        version = "1.0.0.2";
-       sha256 = "00j0lmj7wz5bm5z4v0v3bamf1pnrlmjkc2ysb5d16dqwi9768x85";
+       sha256 = "0575644e8a1c37135a59da0b3665a5d9dee0aa5a63834d7ea9ab7c7e64a54002";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [
          base QuickCheck quickcheck-instances vector
@@ -46520,7 +46666,7 @@ self: {
      mkDerivation {
        pname = "edit-lenses";
        version = "0.2";
-       sha256 = "1nrpbrq38q779s0fbzaxig2fdqgg9qg41vajx7lbhasal6aiclya";
+       sha256 = "ca531695a14a2bb8e8e952ed401e4eefe1e6c48b5dfde5804ee76034705e37db";
        libraryHaskellDepends = [
          base containers data-default lattices mtl
        ];
@@ -46534,7 +46680,7 @@ self: {
      mkDerivation {
        pname = "edit-lenses-demo";
        version = "0.1";
-       sha256 = "0dvxiwhbmknmg4w5dj202g8r0capvgy3rn6c757ci5nhcmr4lypc";
+       sha256 = "ec7a4a7265d096c84e39ccd83cfcdb573190d11340c8563879d5ceba208f7d37";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -46547,7 +46693,7 @@ self: {
      mkDerivation {
        pname = "editable";
        version = "1.0.0.2";
-       sha256 = "15jz0b913xd8yd3nzk4vrlj0vzbhjarl05h9j0mdcfgxns5j0yxi";
+       sha256 = "b17b208bb6fd39d62a90091640b39270fd0d24cd9bcc6f47f3a8f511d2025f96";
        libraryHaskellDepends = [ base text vty vty-ui ];
        jailbreak = true;
        homepage = "https://github.com/maxpow4h/editable";
@@ -46561,7 +46707,7 @@ self: {
      mkDerivation {
        pname = "editline";
        version = "0.2.1.1";
-       sha256 = "101zhzja14n8bhbrly7w2aywx3sxyzgyjdrmgpg4gn4alf4lzdlz";
+       sha256 = "9fb64f89a38ad847de7d3537e9dff75d8fcebd12fc789a175cc892a0e4873f80";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://code.haskell.org/editline";
@@ -46577,7 +46723,7 @@ self: {
      mkDerivation {
        pname = "editor-open";
        version = "0.6.0.0";
-       sha256 = "0raj0s8v72kz63hqpqhf58sx0a8mcwi4ania40spjirdrsdx3i9g";
+       sha256 = "2fc5d19bce2d477935202a5a4522671529d0352a0ee28be1307f8ab391065265";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46599,7 +46745,7 @@ self: {
      mkDerivation {
        pname = "effect-handlers";
        version = "0.1.0.6";
-       sha256 = "0i7glghwh35pfyzznzabaf8fnadk00lpajmasw5h5ndjl2dmqzy9";
+       sha256 = "c97f5c9ba0b2d9020bd7aa4a752900b329eb90534b7dfbbf77b70cc8e1a3ef44";
        libraryHaskellDepends = [ base free kan-extensions mtl ];
        testHaskellDepends = [
          base hspec hspec-discover HUnit QuickCheck
@@ -46614,7 +46760,7 @@ self: {
      mkDerivation {
        pname = "effect-monad";
        version = "0.6.1";
-       sha256 = "0kbjsdiv2x84spbw4qrgk76xwwgqrqhasim83h2jjwvn4qdpyjw8";
+       sha256 = "884b7f1b26767329051ca846ad20cef871decd992f63c2d7d50475b163d3724d";
        libraryHaskellDepends = [ base ghc-prim type-level-sets ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
@@ -46629,7 +46775,7 @@ self: {
      mkDerivation {
        pname = "effective-aspects";
        version = "0.1.0.0";
-       sha256 = "0hcczdc98w8mqhap20dm0dmxbmqrxa8xxs8mjx4lga7y2n6wq22i";
+       sha256 = "5108cc8d15fea847499715e9de91ea19d7d56b03b5017115c415719458fb8c41";
        libraryHaskellDepends = [
          base ghc-prim hashtables HUnit mtl QuickCheck
        ];
@@ -46652,7 +46798,7 @@ self: {
      mkDerivation {
        pname = "effective-aspects-mzv";
        version = "0.1.0.1";
-       sha256 = "03mignf38inf10l19mcsjgjb0935lm53b29xy39pkcycrpmp0ckj";
+       sha256 = "723270ebcdccb379d3f03d89354aa56524b0e4939ad5142808ce46349c7db10e";
        libraryHaskellDepends = [
          base ghc-prim hashtables HUnit mzv QuickCheck
        ];
@@ -46672,7 +46818,7 @@ self: {
      mkDerivation {
        pname = "effects";
        version = "0.2.2";
-       sha256 = "0ysz02qvw9gg271dsign11hs7cfsz7xfc4kjmggf10j86lcpi034";
+       sha256 = "64807819354882e0deab7212e6faf9dab1a36108f645ddc211ef25beb1005f7b";
        libraryHaskellDepends = [ base containers newtype void ];
        homepage = "http://github.com/sjoerdvisscher/effects";
        description = "Computational Effects";
@@ -46684,7 +46830,7 @@ self: {
      mkDerivation {
        pname = "effects-parser";
        version = "0.1";
-       sha256 = "0vjjld95kg02a4nr2a0lwlcwaq3867qvbbjk8b1g6fd3d1qj456r";
+       sha256 = "d914227168a339f3c24253aeb5f1316860c519e51428912d5102bc5952a3526e";
        libraryHaskellDepends = [ base effects ];
        homepage = "http://github.com/nybble41/effects-parser";
        description = "Parser Effect for the Control.Effects Library";
@@ -46696,7 +46842,7 @@ self: {
      mkDerivation {
        pname = "effin";
        version = "0.3.0.1";
-       sha256 = "0rckxjdkw5p4yy1kizj1z8kp7sxfxxhh9s7714jsn9in7lc4lsif";
+       sha256 = "2e6a4a183d3626ab2509e7e80461efaeeb7327fa41fe3883f7e4163e9bec9365";
        libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/YellPika/effin";
        description = "A Typeable-free implementation of extensible effects";
@@ -46712,7 +46858,7 @@ self: {
      mkDerivation {
        pname = "egison";
        version = "3.5.9";
-       sha256 = "16d3c4r72f6hv8v7zbcqwjjc1c53895kxjn1m61d2fhz8gmb8yq0";
+       sha256 = "007bb4ea431f3ad182a9c1ca3e4b42a3b0c0a4e498ad7f36dad038713261a399";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46738,7 +46884,7 @@ self: {
      mkDerivation {
        pname = "egison-quote";
        version = "0.2";
-       sha256 = "1qmbivr4lp8m27ns5cz38fkkynfky9z73hqr173dhyvqccjamfgk";
+       sha256 = "f3b9aa2463787bd8c60919c3717ef2d3593fa743e3b3a2ed11155d4af28eabe2";
        libraryHaskellDepends = [
          base egison mtl parsec template-haskell
        ];
@@ -46756,7 +46902,7 @@ self: {
      mkDerivation {
        pname = "egison-tutorial";
        version = "3.5.9";
-       sha256 = "1ay9m7ibl2z19yq9pd3fwghbyki6cawg3w9x42dllncjrwxwlh4m";
+       sha256 = "9540ca3bcf92594a9b203df1f1b862264ebfe0e36eb49bb04fe10bbae2a9c9ab";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -46776,7 +46922,7 @@ self: {
      mkDerivation {
        pname = "ehaskell";
        version = "0.7";
-       sha256 = "0d7j20lrxy5qy1ybgywfjk0d0f6iin37nfw9zdbmhi1z2l89mmnj";
+       sha256 = "d2d69a10153f445857fb893b7b868dd138d0c0948efbb77cf0b8f89e2910f234";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -46796,7 +46942,7 @@ self: {
      mkDerivation {
        pname = "ehs";
        version = "0.7.0";
-       sha256 = "0kckic7v6gab6ksbdmnxbv41fm68zvhfcmvshln9hxmq2mgli11x";
+       sha256 = "3d84485f15b876982c857a57e6e0fec85417c85eddd6b6f4344b3db30f8b934d";
        revision = "3";
        editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222";
        isLibrary = true;
@@ -46819,7 +46965,7 @@ self: {
      mkDerivation {
        pname = "eibd-client-simple";
        version = "0.0.4";
-       sha256 = "14nxahznqy6xfjgyi8d11b4hgrw431ywqc5hkz0lbpgxysgkc61d";
+       sha256 = "2d18369ff6fddd45c19fb030cc7d1884e707c90aa1a1e89f74dd786c3f54dd92";
        revision = "1";
        editedCabalFile = "5154a0f9083521b4c60cee92f2614b253961fd1e2dd9e7c5b541630df8597d80";
        libraryHaskellDepends = [
@@ -46839,7 +46985,7 @@ self: {
      mkDerivation {
        pname = "eigen";
        version = "2.1.6";
-       sha256 = "0287j907pasjb7w7bwr6snb4qic7j14msxhps445yjfkqa2arzfz";
+       sha256 = "dffdac84c2d3495f08d117765d499087454c96d526f375f85952ab7b40920709";
        libraryHaskellDepends = [
          base binary bytestring primitive transformers vector
        ];
@@ -46859,7 +47005,7 @@ self: {
      mkDerivation {
        pname = "either";
        version = "4.4.1";
-       sha256 = "1jq9b7mwljyqxmcs09bnqzza6710sfk2x444p3aagjlvq3mpvrci";
+       sha256 = "91e57debc09bcaa7d4b884902ea6d3201ca3fec77625a059edd84bcaeb5909cb";
        libraryHaskellDepends = [
          base bifunctors exceptions free mmorph monad-control MonadRandom
          mtl profunctors semigroupoids semigroups transformers
@@ -46875,7 +47021,7 @@ self: {
      mkDerivation {
        pname = "either-unwrap";
        version = "1.1";
-       sha256 = "0g1f5m7bcpnyg2sdvwx8x34ml6dqfrn326s8pbfciaqqf7wddayc";
+       sha256 = "ccabd6f87118abc8dcba481b316c76b8195ac9e8a8f3ddb478de5eb64e2d2e3c";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/gcross/either-unwrap";
        description = "Functions for probing and unwrapping values inside of Either";
@@ -46887,7 +47033,7 @@ self: {
      mkDerivation {
        pname = "eithers";
        version = "0.2.0";
-       sha256 = "069w3qbyghs1w8wqimj54dwblq5rx1ylgflzzc4cwnjn0aqzgs45";
+       sha256 = "85e8f7b102565ace08fb9fba477de8b960ba782345d68839e241c3e7171e3c19";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46901,7 +47047,7 @@ self: {
      mkDerivation {
        pname = "ekg";
        version = "0.4.0.8";
-       sha256 = "0cp88b5bf4bpjd6qzib00n7j76svwsykzizk52fk1dmknfx8h12v";
+       sha256 = "5b0488bab3b3b6309d28f3c73fbde65b9b238f0560c58f4d937711b7ca42e832";
        libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath network snap-core
          snap-server text time transformers unordered-containers
@@ -46919,7 +47065,7 @@ self: {
      mkDerivation {
        pname = "ekg-bosun";
        version = "1.0.4";
-       sha256 = "0cjwv99dbb1spfn25vdl4ikxr10s7yqr9ih36amvs02rnb47lx7f";
+       sha256 = "ee747ac8b25900bdab3203c694b13f1a84dc6724b4ed22acbb3aacd552da5c32";
        libraryHaskellDepends = [
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
@@ -46936,7 +47082,7 @@ self: {
      mkDerivation {
        pname = "ekg-carbon";
        version = "1.0.4";
-       sha256 = "0l1gg13wxyivcxcsmzq6wv7ma4vk6afxjmw7f9n9dc3zdga0v772";
+       sha256 = "e29c0dd46b7fb0966c728757d99d32731355cfe606ffaa59673bface47782f50";
        libraryHaskellDepends = [
          base ekg-core network network-carbon text time unordered-containers
          vector
@@ -46953,7 +47099,7 @@ self: {
      mkDerivation {
        pname = "ekg-core";
        version = "0.1.1.0";
-       sha256 = "07h6lwig1cwb526ack1g3f6w8irmaj4kibn11ihhdffk7avix8bv";
+       sha256 = "7ba11eb73ad3b906610cc1ae3889543547c48d1b2f4ca68c288bb3f022a7061e";
        libraryHaskellDepends = [
          base containers ghc-prim text unordered-containers
        ];
@@ -46968,7 +47114,7 @@ self: {
      mkDerivation {
        pname = "ekg-json";
        version = "0.1.0.0";
-       sha256 = "1nhqlajidg94zk6rs86ri5ar4cmkbdz04hwjp8qgam0vgpp5bi2j";
+       sha256 = "52c455ee7d1b54f530ba9243027e5bb332925589d9209dcdfc24bd16a5a218da";
        libraryHaskellDepends = [
          aeson base ekg-core text unordered-containers
        ];
@@ -46984,7 +47130,7 @@ self: {
      mkDerivation {
        pname = "ekg-log";
        version = "0.1.0.3";
-       sha256 = "1rgjpd0cksxxr1934k9xpzhyzsl54d7yp1mh65m85z7665kcjshw";
+       sha256 = "1c6ac96631e6fc826a31b086eb4f2385eaefe1bf3d4d3252c8bdebc940bbf2e5";
        libraryHaskellDepends = [
          aeson base bytestring directory ekg-core fast-logger filepath text
          time unix unordered-containers
@@ -47002,7 +47148,7 @@ self: {
      mkDerivation {
        pname = "ekg-push";
        version = "0.0.3";
-       sha256 = "1yxp0s3i87zc205bqkw8arq8n0y225gin94x98csldb9rd0k0s5y";
+       sha256 = "be683041cb6935aa194a9d241b5f11c2038b7056884fbc0a10ec1f148706b7fb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47023,7 +47169,7 @@ self: {
      mkDerivation {
        pname = "ekg-rrd";
        version = "0.2.1.69";
-       sha256 = "172p0whjyql5in94rcpr6h13zilhd84qp54z8qvk23kg5jqaf43r";
+       sha256 = "7910a7b02c6f0e3137469f948b096a90c63f0234f9b24c928d85622f2107579c";
        libraryHaskellDepends = [
          base directory ekg-core mtl process text time unordered-containers
        ];
@@ -47044,7 +47190,7 @@ self: {
      mkDerivation {
        pname = "ekg-statsd";
        version = "0.2.0.3";
-       sha256 = "02sknwz5cqwy5byqjiyc6nfppmbmfnxndp3dcs4lz276221h91hn";
+       sha256 = "1686048310e6884f89666ddc66bb7575d57b9d35cc4789fd2a9e63563eb7530b";
        libraryHaskellDepends = [
          base bytestring ekg-core network text time unordered-containers
        ];
@@ -47058,7 +47204,7 @@ self: {
      mkDerivation {
        pname = "electrum-mnemonic";
        version = "0.1.2";
-       sha256 = "1lswfw72imi326146dyvva3w9g4v5725kj817q9bjgrfmzn2k2k3";
+       sha256 = "638a29ecaf2e3fb9123e01c959c4299bbcc487dadb3743821123d6280e775cd3";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "easy to remember mnemonic for a high-entropy value";
@@ -47071,7 +47217,7 @@ self: {
      mkDerivation {
        pname = "elerea";
        version = "2.8.0";
-       sha256 = "1sc71775f787dh70ay9fm6x6npsn81yci9yr984ai87ddz023sab";
+       sha256 = "4be921c06feda0a8084ad9a7c87c40565f6bbaa92e79050e6c071d57ce0987e9";
        libraryHaskellDepends = [
          base containers transformers transformers-base
        ];
@@ -47084,7 +47230,7 @@ self: {
      mkDerivation {
        pname = "elerea-examples";
        version = "2.2.3";
-       sha256 = "17m52c6qa905wpfanllhnaizq6vv2hp0ldfmlv10b0hbzjs29bx1";
+       sha256 = "a1af24b4fc0b8205c2a6d5350a2e147b1bfca3b29052abdce50524850d13a59e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base elerea GLFW OpenGL ];
@@ -47097,7 +47243,7 @@ self: {
      mkDerivation {
        pname = "elerea-sdl";
        version = "0.1.1";
-       sha256 = "1dfbgnwn0jj3lv2fskc2k3m4h0crars2d1p0gpj265r4k58qis36";
+       sha256 = "66e8885199241723e47de086267456990148ea98824dedc4a6434a60b97dcbb5";
        libraryHaskellDepends = [ base elerea SDL ];
        homepage = "http://github.com/singpolyma/elerea-sdl";
        description = "Elerea FRP wrapper for SDL";
@@ -47109,7 +47255,7 @@ self: {
      mkDerivation {
        pname = "elevator";
        version = "0.2.3";
-       sha256 = "1m509dh5k9ci87g22gd2j8lfg4hm4wn156gvd86p3r636c5hbdw2";
+       sha256 = "82b7050b33c3e4710d6afb99122c271592e72892a23d21de4191a559604ba0d4";
        libraryHaskellDepends = [ base extensible transformers ];
        homepage = "https://github.com/fumieval/elevator";
        description = "Immediately lifts to a desired level";
@@ -47121,13 +47267,28 @@ self: {
      mkDerivation {
        pname = "elf";
        version = "0.27";
-       sha256 = "19ylk13ny2clwfgqv6r55h80ghlgzbwydzrfy1msyxcxn4zmdpjs";
+       sha256 = "5ade563fb19d75af6bf02effe6f9fa8fc207102c259b8d9fe394096f4798d4a7";
        libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://github.com/erikcharlebois/elf";
        description = "Parser for ELF object format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "elm-bridge" = callPackage
+    ({ mkDerivation, base, hspec, template-haskell }:
+     mkDerivation {
+       pname = "elm-bridge";
+       version = "0.1.0.0";
+       sha256 = "5eaaefea61b2a3e42c8da5dce5c310b349461261b7052500b2e0bd5e8c8a68d8";
+       revision = "1";
+       editedCabalFile = "705fd50300a9611e7be3908004980f1a82589bd82e1ea2f9bf1ec67396e86ca1";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "http://github.com/agrafix/elm-bridge";
+       description = "Derive Elm types from Haskell types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "elm-build-lib" = callPackage
     ({ mkDerivation, base, bytestring, containers, elm-compiler
      , elm-core-sources, file-embed, template-haskell
@@ -47135,7 +47296,7 @@ self: {
      mkDerivation {
        pname = "elm-build-lib";
        version = "0.14.0.0";
-       sha256 = "12hhyjr3bshbz66zxl5jfs4s3qx6laqqwcim3kf8rj2vh12h6wj5";
+       sha256 = "45720345805bc88cdc1c35328eb1a2a6e3a18976b2d0fe8df90bea35b2f4108a";
        libraryHaskellDepends = [
          base bytestring containers elm-compiler elm-core-sources file-embed
          template-haskell
@@ -47159,7 +47320,7 @@ self: {
      mkDerivation {
        pname = "elm-compiler";
        version = "0.15";
-       sha256 = "1g3q1z6bji1vx36kfkn8qayidds29b0jkk7k70sip4055jr4jc5n";
+       sha256 = "b63049b22c05901b3538f3cc29c14a42b716bdc2c84e37cde83b44b9cc0f78bc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47195,7 +47356,7 @@ self: {
      mkDerivation {
        pname = "elm-core-sources";
        version = "1.0.0";
-       sha256 = "1yr0csgz0hv25cz3jslap0adwvfcvv35bns32b9g0vyda1fm00x4";
+       sha256 = "a403505d50cd6ff0d21243db55c6decc6dde14b88a6a393e2b6243f09f6620fb";
        libraryHaskellDepends = [
          base bytestring containers file-embed template-haskell
        ];
@@ -47213,7 +47374,7 @@ self: {
      mkDerivation {
        pname = "elm-get";
        version = "0.1.3";
-       sha256 = "1did7vjd1h2kh5alndd2b63zi8b1m9hf6k1k75yxwvw6f6mz5i4q";
+       sha256 = "98c4f2ab71866fde7d39334ce360aa61a1f88759a2354b558153c0d0e43e2db6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47239,7 +47400,7 @@ self: {
      mkDerivation {
        pname = "elm-init";
        version = "1.0.1.0";
-       sha256 = "0jvdln18dhsxly33ysy1vv1740ri1576x44jn10gjva432rp8rwx";
+       sha256 = "9d6774b318446df940b092906e4e09310372c2dec16b3f86a75dc38682a56d4b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -47258,7 +47419,7 @@ self: {
      mkDerivation {
        pname = "elm-make";
        version = "0.1.2";
-       sha256 = "10yli9nxfyykkr3p2dma5zgblwgx2434axjj17a878xd0r4841sb";
+       sha256 = "4b07824806ada383d4095276450611fd71bade2faa3671479ed37bd76d8ad483";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -47283,7 +47444,7 @@ self: {
      mkDerivation {
        pname = "elm-package";
        version = "0.5";
-       sha256 = "08wsl42gf5wf9pmsnld38p2m675ljihpzkrvn3dzh6zf0dwblm5n";
+       sha256 = "b654ba7803ee1bf8dbb03bcf7f6194b41c53c545a351abeb4d8e17f704a19a23";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47315,7 +47476,7 @@ self: {
      mkDerivation {
        pname = "elm-reactor";
        version = "0.3.1";
-       sha256 = "0j8md3cqg7wrcx85s5hj8g812zvrr3y4833n0wc3dvfa3wlblpga";
+       sha256 = "ea5dba281fcaed361807760c44fcc8797f11d04312165d5067999f87d9681549";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -47339,7 +47500,7 @@ self: {
      mkDerivation {
        pname = "elm-repl";
        version = "0.4.1";
-       sha256 = "05fyk3q7243c8p4kw03jggrvp8qfgcfanr291bmgnn9s1lk0q253";
+       sha256 = "a3080c260d3a59fbea0a4964ab1c7b0ea3bbf37b72003ec9456c1071f098de15";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -47365,7 +47526,7 @@ self: {
      mkDerivation {
        pname = "elm-server";
        version = "0.11.0.1";
-       sha256 = "0nnkhmmm4cl6a314xxh5qwxkjsc3k3vcwdfar62578ykarxb53g1";
+       sha256 = "e18db27a56d3a35384c9ca35cef6988369393bc705f64ec2508632526b85d35a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -47385,7 +47546,7 @@ self: {
      mkDerivation {
        pname = "elm-yesod";
        version = "0.2";
-       sha256 = "0hza3khwspwlqbyllh2w1083hh19hslc0lhdryq1bbs8bssird39";
+       sha256 = "69b41cb55e48af15b0cf0d52c0a88629403810085c404afdc2945fcde11cea43";
        libraryHaskellDepends = [
          base blaze-markup Elm shakespeare-js text yesod-core
        ];
@@ -47403,7 +47564,7 @@ self: {
      mkDerivation {
        pname = "elocrypt";
        version = "0.4.1";
-       sha256 = "1hssxqhm962hr41mvjnrs4h74121nmvlbww0g9nyk10mx71rcbcg";
+       sha256 = "8f2d96c3e91584e96d7a80f34577b541047220d1d9ca5d03c950985421ee5ac3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base MonadRandom random ];
@@ -47424,7 +47585,7 @@ self: {
      mkDerivation {
        pname = "emacs-keys";
        version = "0.0.2.0";
-       sha256 = "12zxvjmlp06rjlhb7iaz7qrzb7cr1rgqg5ql5vv3lkz7z84h82ph";
+       sha256 = "f00a0409fae74f3af62e1497875f0e999df5333e5fc5b32095d9804babdcfd8b";
        libraryHaskellDepends = [
          base split template-haskell th-lift xkbcommon
        ];
@@ -47443,7 +47604,7 @@ self: {
      mkDerivation {
        pname = "email";
        version = "0.1.1.2";
-       sha256 = "144a53an7laivcc6zxawsjz8yijknswnlbrd8id87d6x6lbq1cw3";
+       sha256 = "83b3801735ddb4835a442d2f6ab9b653468fbed45cf56f18db51d163d5288a90";
        libraryHaskellDepends = [
          array base bytestring encoding HaskellNet hsemail old-locale
          old-time parsec process time
@@ -47462,7 +47623,7 @@ self: {
      mkDerivation {
        pname = "email-header";
        version = "0.2.0";
-       sha256 = "1kl7d1scxq6ygjdixl4xkhaa4d60zr8i92fkcw5qczk44la4wiyv";
+       sha256 = "db474e1425647e860b67d3891451fec034a2149c9dd01e9b7cdee0ce746887ce";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring case-insensitive
          containers text text-icu time
@@ -47484,7 +47645,7 @@ self: {
      mkDerivation {
        pname = "email-postmark";
        version = "0.2";
-       sha256 = "17zby98j1glsslrndmxl6zwrc3q7ir9771yvfxijawp4wdx6nayy";
+       sha256 = "de2b6b7ae3e472256377db8773528e070f96f937b4d76633d59abe2051f2eb9f";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers HTTP network
        ];
@@ -47502,7 +47663,7 @@ self: {
      mkDerivation {
        pname = "email-validate";
        version = "2.1.3";
-       sha256 = "1jw15hyj6p1155i3h5n4f728x33ym21ibpirkdiid0ksf6cpk5jv";
+       sha256 = "5b967999717a8216639b39de1583a87e8c8ec471c416386229215c233d2c81cb";
        libraryHaskellDepends = [ attoparsec base bytestring ghc-prim ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -47521,7 +47682,7 @@ self: {
      mkDerivation {
        pname = "email-validator";
        version = "0.0.3";
-       sha256 = "0ai0fj7rpq9h0i0rznrsqwvqbkkry5dgq4hgg5jc8ma3j9gym87n";
+       sha256 = "f6a0ea5f924355c464790f12fc5af179ce8537c73adb9f410430e19b8f74202a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -47542,7 +47703,7 @@ self: {
      mkDerivation {
        pname = "embeddock";
        version = "0.3.0.1";
-       sha256 = "01xyqwnyza1cpd7ky4kgr1z5m8w2ms395lj7xjwxh42jg65b1rfr";
+       sha256 = "d9e5b08a795210d8b9ec47d29286ae82a35a7ec86f123f4fbb2ca8ef2dc7be07";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -47560,7 +47721,7 @@ self: {
      mkDerivation {
        pname = "embeddock-example";
        version = "0.1";
-       sha256 = "07xc7kdnlbfwr08zhgjphbcmn8ycilp6pna3nk4y0w2hw87g7db0";
+       sha256 = "60b5f30ee25070e0c9b443d96b2e8dcc235bd982573ef811c8dc2d6adb3cac1f";
        libraryHaskellDepends = [ base embeddock time ];
        homepage = "https://github.com/nushio3/embeddock-example";
        description = "Example of using embeddock";
@@ -47575,7 +47736,7 @@ self: {
      mkDerivation {
        pname = "embroidery";
        version = "0.1";
-       sha256 = "1vqksv7a12xzi6zp4b2qfnsb5gaarg5bhxanhbi4qkn1jmwy82yx";
+       sha256 = "dd0be47995c14e4ce2825675b8cacb4abdb2b475582c72bf89bf8ba0ced613ef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47593,7 +47754,7 @@ self: {
      mkDerivation {
        pname = "emgm";
        version = "0.4";
-       sha256 = "0cpcwrb6wqwq371wqjmhzfhdwk3vfhjjgz4vgjsjvw6cdhbpw5p1";
+       sha256 = "e1167e176cccf02db57c9bfc2725747b4cdea0fbb04accc31998636e56e6ec32";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit QuickCheck syb ];
        jailbreak = true;
@@ -47608,7 +47769,7 @@ self: {
      mkDerivation {
        pname = "empty";
        version = "9";
-       sha256 = "0ap7qby3n5qiwf791z4li05h0l6p6xi899wkmg6x8z6bb8z9q2d9";
+       sha256 = "a9099c3e5acb7cd4cdab93a7846237d750000b8894fc908ee311173bfcc2e72a";
        description = "Ceci n'est pas une package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47621,7 +47782,7 @@ self: {
      mkDerivation {
        pname = "enclosed-exceptions";
        version = "1.0.1.1";
-       sha256 = "16ax1kqdsk4apg642qxkm2hf9vb5hzmkd14zmkxra8ssp8rn28z5";
+       sha256 = "e5236133ba5a2395fbac9f8436eb8765ede4a0a8b36341ccbb8a4cddf00c5d99";
        libraryHaskellDepends = [
          async base deepseq lifted-base monad-control transformers
          transformers-base
@@ -47642,7 +47803,7 @@ self: {
      mkDerivation {
        pname = "encoding";
        version = "0.8";
-       sha256 = "0y2fx99vxrqpvjflpqgnbikxsc3p50sn5b5g97zivjr9bbck52ji";
+       sha256 = "518a32d95a29cb1dff49afac6235287730dd675cf6e14b9ddc17e7be53ea4e78";
        libraryHaskellDepends = [
          array base binary bytestring containers extensible-exceptions
          ghc-prim HaXml mtl regex-compat
@@ -47657,7 +47818,7 @@ self: {
      mkDerivation {
        pname = "endo";
        version = "0.2.0.1";
-       sha256 = "0szbv44sgsnbkcdmmsvbiy539iiyd608p513slfw1pbb240sabii";
+       sha256 = "312ea501116bddc01dd523948b80693ec6348a8f6beb5a1b9bcbeaa709d9eb6b";
        libraryHaskellDepends = [ base between transformers ];
        homepage = "https://github.com/trskop/endo";
        description = "Endomorphism utilities";
@@ -47672,7 +47833,7 @@ self: {
      mkDerivation {
        pname = "engine-io";
        version = "1.2.10";
-       sha256 = "02wc4fdwrnaw934bxk39bfndzn2rjdcaa3rifcj84ap750fx16h0";
+       sha256 = "009ad01d28e72a822473310fa5589359d8dfac5b69ccbec8485cd9cc9b238c0b";
        libraryHaskellDepends = [
          aeson async attoparsec base base64-bytestring bytestring either
          free monad-loops mwc-random stm stm-delay text transformers
@@ -47692,7 +47853,7 @@ self: {
      mkDerivation {
        pname = "engine-io-growler";
        version = "0.1.0.1";
-       sha256 = "1yk7cpg89nsmd9kvmxdrxcgyr8wilara4kw35hyxl4l2b9c9pwjc";
+       sha256 = "4cf29b585a8212da3d2c834fa2b2a291a3ec1febb9f5ba676a55db84de6567fa";
        libraryHaskellDepends = [
          base bytestring engine-io growler http-types mtl pipes
          pipes-attoparsec pipes-wai socket-io text transformers
@@ -47710,7 +47871,7 @@ self: {
      mkDerivation {
        pname = "engine-io-snap";
        version = "1.0.3";
-       sha256 = "0i2099b4drvzknz6ifi4dvgfibkqxfrz6w3a15k09nw3vxc14hbg";
+       sha256 = "6f411258df83db0466096a70f3b3eb78aee8de6e24ba68be9d7fe746564a4044";
        libraryHaskellDepends = [
          attoparsec-enumerator base bytestring containers engine-io
          MonadCatchIO-transformers snap-core unordered-containers websockets
@@ -47728,7 +47889,7 @@ self: {
      mkDerivation {
        pname = "engine-io-wai";
        version = "1.0.3";
-       sha256 = "0p296y3xnpx0wj6yd152y7i765x0pwg8rg2bpcz92hkcmz57gdz7";
+       sha256 = "e7b777caaf6c42913ebb4bbc8c1ebfa01773e2f1a284e68de4a05fdb8737495c";
        libraryHaskellDepends = [
          attoparsec base bytestring either engine-io http-types mtl text
          transformers transformers-compat unordered-containers wai
@@ -47746,7 +47907,7 @@ self: {
      mkDerivation {
        pname = "engine-io-yesod";
        version = "1.0.2";
-       sha256 = "15hjq128zn23kq5nlmpv7sbrhzhv1936psgf8aa7yxvx4xwy6baw";
+       sha256 = "5c2de379277d777f9442eee96b460a1b7e98973efb566a0b9e43d88f44c01296";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra engine-io http-types text
          unordered-containers wai wai-websockets websockets yesod-core
@@ -47759,7 +47920,7 @@ self: {
      mkDerivation {
        pname = "engineering-units";
        version = "0.0.1";
-       sha256 = "1jpipav3znxbj7ld5m53wv6pmv1nrcxprqm0m1p3ny9cmpnw3r9x";
+       sha256 = "3de5c1edad2c793b6ea8a0e27c3bcb36ec7acde6a3d4d2e891abdb3fb6baf1ca";
        libraryHaskellDepends = [ base ];
        description = "A numeric type for managing and automating engineering units";
        license = stdenv.lib.licenses.bsd3;
@@ -47770,7 +47931,7 @@ self: {
      mkDerivation {
        pname = "entropy";
        version = "0.3.7";
-       sha256 = "1vzg9fi597dbrcbjsr71y47rvmhiih7lg5rjnb297fzdlbmj1w0z";
+       sha256 = "1ff020eba2edbb93c4b23297470f8c11d69d0ff1e1642d17cbab9d54a24befef";
        libraryHaskellDepends = [ base bytestring unix ];
        homepage = "https://github.com/TomMD/entropy";
        description = "A platform independent entropy source";
@@ -47782,7 +47943,7 @@ self: {
      mkDerivation {
        pname = "enumerable";
        version = "0.0.3";
-       sha256 = "1v94y0a3rlkg3qlbv70d1zj2vjhssf1f89xlgb5cnsy9az07517q";
+       sha256 = "f88472c057c96bcbca7ab427e482d31aca2de40f0d9cbd281e6fd23c14f024ed";
        libraryHaskellDepends = [ base control-monad-omega tagged ];
        description = "A typeclass for enumerating all values a type";
        license = stdenv.lib.licenses.bsd3;
@@ -47795,7 +47956,7 @@ self: {
      mkDerivation {
        pname = "enumeration";
        version = "0.1.0";
-       sha256 = "17d7vm2nkyhxw2f0wk6llrw9y5kqzgqlgswv98wrpnpsspwmx0bk";
+       sha256 = "73815ef9d5fada9b394a9beb47f1fb78169f78a6d44c0e9ce01dfa6945dda79d";
        libraryHaskellDepends = [
          arith-encode arithmoi base binary Cabal containers heap
        ];
@@ -47813,7 +47974,7 @@ self: {
      mkDerivation {
        pname = "enumerator";
        version = "0.4.20";
-       sha256 = "02a75dggj295zkhgjry5cb43s6y6ydpjb5w6vgl7kd9b6ma11qik";
+       sha256 = "33e21054352bb579e8db8697256ff3c61b3dc862c567f9e0fc2509f95e2b4709";
        libraryHaskellDepends = [
          base bytestring containers text transformers
        ];
@@ -47827,7 +47988,7 @@ self: {
      mkDerivation {
        pname = "enumerator-fd";
        version = "0.1.0.2";
-       sha256 = "0xbrkv65m206qlvnjlbfb52kvjhw91rdnihwv3y31p2qj5zlz29p";
+       sha256 = "37894f7f9158dc30fcd81c46db72481cca3d45596e516937c506885acc9e7975";
        libraryHaskellDepends = [ base enumerator mtl ];
        homepage = "https://john-millikin.com/software/enumerator/";
        description = "Enumerator instances for monads-fd classes";
@@ -47839,7 +48000,7 @@ self: {
      mkDerivation {
        pname = "enumerator-tf";
        version = "0.1.1";
-       sha256 = "0s47j6pf05nwl105i2vwvsn18gis1v96gid85kj49ngb8ax0pjsp";
+       sha256 = "57cb0bba42ebd944e42ca8c567d20e3a3e14acde7c8b5840a0dc16e0ae918768";
        libraryHaskellDepends = [ base enumerator monads-tf ];
        homepage = "https://john-millikin.com/software/enumerator/";
        description = "Enumerator instances for monads-tf classes";
@@ -47851,7 +48012,7 @@ self: {
      mkDerivation {
        pname = "enumfun";
        version = "0.5.1.0";
-       sha256 = "1fq4zmhc825bmyslfm7kbsa29qq773cgrz4npj2bcfl0jkbl3ndc";
+       sha256 = "acd941d794803ab684bc96fcfcd83807e324945ef35447b5afab08c460fd04bb";
        libraryHaskellDepends = [ base enummapset-th ];
        jailbreak = true;
        homepage = "https://github.com/liyang/enumfun";
@@ -47868,7 +48029,7 @@ self: {
      mkDerivation {
        pname = "enummapmap";
        version = "0.7.0";
-       sha256 = "17rlynm46i3y76ms8s5ajkz50cj5m1anw83dizj281887qg63iwr";
+       sha256 = "99c7611e3e080524e48f6d206e55a8453250fe94aa68a4ab397e4443aaf5349f";
        libraryHaskellDepends = [
          base contravariant data-default deepseq ghc-prim lens safecopy
          semigroups
@@ -47888,7 +48049,7 @@ self: {
      mkDerivation {
        pname = "enummapset";
        version = "0.5.2.1";
-       sha256 = "019q0b1qm6bcp1ld67aklvq76wfx1qwzjbdywliv9g8ybwivaxqg";
+       sha256 = "0f77b5235f1ebdb423e5be2df9390edd7173f0a6531dd368b86c998ac3023805";
        libraryHaskellDepends = [ base containers deepseq ];
        homepage = "https://github.com/michalt/enummapset";
        description = "IntMap and IntSet with Enum keys/elements";
@@ -47900,7 +48061,7 @@ self: {
      mkDerivation {
        pname = "enummapset-th";
        version = "0.6.0.2";
-       sha256 = "1g6z60qalyf8iv41xdl409kmcjm406zccljkgl658y1x9rdi08gr";
+       sha256 = "f921105b4e3d78540c7d5352c6be01a44a56670284b61ec88ec879aa3030dfbc";
        libraryHaskellDepends = [
          base containers deepseq template-haskell
        ];
@@ -47914,7 +48075,7 @@ self: {
      mkDerivation {
        pname = "enumset";
        version = "0.0.4";
-       sha256 = "1dzwxi7i757zdf68v470n8dwn1g8kg51w3c1mwqyxwq85650805w";
+       sha256 = "bc00048a2908f3ee31af810d1eca9be805cb1bb2e0908d8c6bff94134fecfcb7";
        libraryHaskellDepends = [ base data-accessor storable-record ];
        description = "Sets of enumeration values represented by machine words";
        license = stdenv.lib.licenses.bsd3;
@@ -47928,7 +48089,7 @@ self: {
      mkDerivation {
        pname = "env-parser";
        version = "0.0.2.1";
-       sha256 = "13d6yi5jbdi84nccn3ffiw96v5knbz4madjfg980izxfrnbsl1rr";
+       sha256 = "3907aa97cdaeff08507a4e3655c95f76966d128fce0dcb982528b6254bf4a68d";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring containers http-types mtl network old-locale text time
@@ -47946,7 +48107,7 @@ self: {
      mkDerivation {
        pname = "envparse";
        version = "0.2.1";
-       sha256 = "1pkxlda74wpl3f4xd5h69bcbgrw6q045hkdfj98dqd6z2czr2wcg";
+       sha256 = "8f71913f13df34dc5092ae4d5808c086e7b7d84a0696d6891bf4727254a37dde";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        homepage = "https://supki.github.io/envparse";
@@ -47961,7 +48122,7 @@ self: {
      mkDerivation {
        pname = "envy";
        version = "0.2.0.0";
-       sha256 = "0hi9nlrr2g32f4cp3ibmdvmqmqhbyps5d9f0v7612fbxhimqrkbq";
+       sha256 = "78cd8c6b847d3911ccd9c0a556f4f50be28aeb6e75c5711971623c9133b52942";
        libraryHaskellDepends = [
          base bytestring containers mtl text time transformers
        ];
@@ -47978,7 +48139,7 @@ self: {
      mkDerivation {
        pname = "epanet-haskell";
        version = "2.0.12.4";
-       sha256 = "1jpz58zlkhgf2fl4fzicpdkqqdbwy3sw56dga8yvjmgv5zcqqshx";
+       sha256 = "1d6a8cd92ffb55b93d52af99c2f5f07c358c67bb2c7e47a813eec1493f2affca";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://epanet.de/developer/haskell.html";
@@ -47991,7 +48152,7 @@ self: {
      mkDerivation {
        pname = "epass";
        version = "0.2.1";
-       sha256 = "0sg5pipzc4s9xq83ari7rigjbvhyh76kqnp57i98bs3k54ba53ym";
+       sha256 = "d58fa2162973e885523ce55a3ccd811eee255fcc27663510ee4913f66fbce569";
        libraryHaskellDepends = [ base stm time ];
        jailbreak = true;
        homepage = "http://github.com/baldo/epass";
@@ -48004,7 +48165,7 @@ self: {
      mkDerivation {
        pname = "epic";
        version = "0.9.3.3";
-       sha256 = "0ap8jr11sk8v2sdi03pahjhaxx3mc4ba7qbh3m8nsg0g5wr4962m";
+       sha256 = "559844322f0f3c6d511d70e1a3166175f4aea084ea0e109b161b4d1d4296e82a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base Cabal directory mtl process ];
@@ -48021,7 +48182,7 @@ self: {
      mkDerivation {
        pname = "epoll";
        version = "0.2.2";
-       sha256 = "0iz1x6lb5b71h4sgiacsnv5f8zj445v88a3rsra7vbza5g35nwnp";
+       sha256 = "d7725bc62beaaf7d54d67928847621447ee4cab69aa9f83481e1acb2a8e9e147";
        libraryHaskellDepends = [ base unix ];
        homepage = "http://github.com/twittner/epoll/";
        description = "epoll bindings";
@@ -48034,7 +48195,7 @@ self: {
      mkDerivation {
        pname = "eprocess";
        version = "1.7.2";
-       sha256 = "190qgsqj41dbkphjrgljif7q0zjm9ddp8wawc9wx8qklb897jrvj";
+       sha256 = "726779125a7462d479625c71745b4b557e808f8b92be2ce19dab0522b17e18a4";
        libraryHaskellDepends = [ base exceptions mtl ];
        description = "Basic Erlang-like process support for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -48047,7 +48208,7 @@ self: {
      mkDerivation {
        pname = "epub";
        version = "0.0.7";
-       sha256 = "0h9j9qqdllkng13w978fpd44zxni5v0mpywh7yxz259hlihwmw22";
+       sha256 = "42f0ca61a43015f1bb3f90fb5bc12ed1f64f48bb0e9dc447787652da304e3241";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48064,7 +48225,7 @@ self: {
      mkDerivation {
        pname = "epub-metadata";
        version = "4.3";
-       sha256 = "0gw5mfysvfqk9daa4807qq4xh190a1pzxmwwi2xbnpz7m4kyffyk";
+       sha256 = "d33be727a9e75fbbba889cd7fe6f502005d809c60720a2544b13bbadbdab853f";
        libraryHaskellDepends = [
          base bytestring containers directory filepath hxt mtl regex-compat
          zip-archive
@@ -48085,7 +48246,7 @@ self: {
      mkDerivation {
        pname = "epub-tools";
        version = "2.7";
-       sha256 = "17r7p68mdrc7mla65xwb5g8inh94hncqkg09igha9fyhnax4m3dk";
+       sha256 = "b38d4abab2d0bba4e08b09bc89998524411bd12b8bf76214ad87e55691b9279f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -48106,7 +48267,7 @@ self: {
      mkDerivation {
        pname = "epubname";
        version = "2.3.2";
-       sha256 = "1l3vi5z46x4m5h3x97hgr9g76i4s5scmpmpjzf97c1kddw31hlh3";
+       sha256 = "035218066f6d067692fbf2d65b992e9a44735eca0f9ed4072c9574437e897bd0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -48123,7 +48284,7 @@ self: {
      mkDerivation {
        pname = "eq";
        version = "4.0.4";
-       sha256 = "1rdxmkmlgyinpih5p708k18j7qq0rj1c8gv240naa9gbkqg4qbq4";
+       sha256 = "042f4c1e9eeb25a52c20623fc482cc00e3235198089c5b60bc36fa47ebacbde5";
        libraryHaskellDepends = [ base semigroupoids ];
        homepage = "http://github.com/ekmett/eq/";
        description = "Leibnizian equality";
@@ -48137,7 +48298,7 @@ self: {
      mkDerivation {
        pname = "equal-files";
        version = "0.0.5.2";
-       sha256 = "07n9xdsi00nz9xwd0bqrdn2d03q7dzlrr13wlym5lgc15r7iwf8w";
+       sha256 = "1c391e4f2e813d5aaaa77c849ce96f070fd0846d192fd0784fdf021075ebc91e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -48154,7 +48315,7 @@ self: {
      mkDerivation {
        pname = "equational-reasoning";
        version = "0.2.0.5";
-       sha256 = "1i8c3wn0z7binnz9p62c2mrvzgb305h797pnf5pvj9zk0iqxg21k";
+       sha256 = "3388d77104f327b96f71f69e74600163bdbf73154c989bbeb5719d0f2c1f0cc5";
        libraryHaskellDepends = [ base singletons template-haskell void ];
        description = "Proof assistant for Haskell using DataKinds & PolyKinds";
        license = stdenv.lib.licenses.bsd3;
@@ -48169,7 +48330,7 @@ self: {
      mkDerivation {
        pname = "equivalence";
        version = "0.3.1";
-       sha256 = "0zi053l03r5qcnpsphnq8xqazd0cbgj9n44hn47s1hagdra3j1bs";
+       sha256 = "7a0539546e4fc1a00fb190109be45b0cb4af7047d8c2abaf65b8e401e828207e";
        libraryHaskellDepends = [
          base containers mtl STMonadTrans transformers transformers-compat
        ];
@@ -48190,7 +48351,7 @@ self: {
      mkDerivation {
        pname = "erd";
        version = "0.1.3.0";
-       sha256 = "00cf1q7472kkl12z48dwnhixvyk99451by577qmfj0vhlnl1dc09";
+       sha256 = "09b016a8a57003e92a3ea7f8150a4969fadd23b4bc21f245a0738a430e0e8e01";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -48207,7 +48368,7 @@ self: {
      mkDerivation {
        pname = "erf";
        version = "2.0.0.0";
-       sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14";
+       sha256 = "24f0b79c7e1d25cb2cd44c2258d7a464bf6db8079775b50b60b54a254616b337";
        libraryHaskellDepends = [ base ];
        description = "The error function, erf, and related functions";
        license = stdenv.lib.licenses.bsd3;
@@ -48218,7 +48379,7 @@ self: {
      mkDerivation {
        pname = "erf-native";
        version = "1.0.0.1";
-       sha256 = "0i031ws189rjl5gn44qpkfylx8kz7rdf3nzw9h0dmy2h86xbkckc";
+       sha256 = "6cb2b9ba4150f8da004cfcdbe15a3e7fa24ebd9b1713625fa1322714340f0344";
        libraryHaskellDepends = [ base polynomial ];
        homepage = "http://code.haskell.org/~mokus/erf-native";
        description = "Native Haskell implementation of the interface from the erf package";
@@ -48232,7 +48393,7 @@ self: {
      mkDerivation {
        pname = "erlang";
        version = "0.1";
-       sha256 = "14jvl8mqdaxavzlkwdxr227m4igmcckhakmy45h7bgcxi5qbkla4";
+       sha256 = "44d1b970899dbd756021be4e052763f545528f10b9373ee9dfaaab862ba25b92";
        libraryHaskellDepends = [
          base binary bytestring directory filepath nano-md5 network random
        ];
@@ -48247,7 +48408,7 @@ self: {
      mkDerivation {
        pname = "eros";
        version = "0.6.0.0";
-       sha256 = "0nr0c2qq30ji50pyjrklrb6a73i6qkqws7ywbfpa4pcd176xwlrw";
+       sha256 = "3c53decd098d5da2ae5bdc1fcdf1c4268ea3ccca7466e92f28518281b160205b";
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        jailbreak = true;
        description = "A text censorship library";
@@ -48261,7 +48422,7 @@ self: {
      mkDerivation {
        pname = "eros-client";
        version = "0.5.0.1";
-       sha256 = "15pi4khibvfpxni4v3kz6f92s8s34kmkx4q7kwq1rxk5gb6p8rcb";
+       sha256 = "8b6574cd7a65f61c309f07933eeb2443232d92337f8e4da2edd7ed15e124f196";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -48280,7 +48441,7 @@ self: {
      mkDerivation {
        pname = "eros-http";
        version = "0.6.0.1";
-       sha256 = "1c7bwszjvbb3qnbvpjm0vin2x2z6dylplhs10hbhszkq2ypjjxyk";
+       sha256 = "d37729af17787e0d170441437aa96fe68b2e6cdca0cabb97c563ad2dbfe6ebb0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -48297,7 +48458,7 @@ self: {
      mkDerivation {
        pname = "errno";
        version = "0.1";
-       sha256 = "0jix16b2c24pfbc3rig01nl68zdwpi28zzbciscalmq8lkpp10fa";
+       sha256 = "ca8170efa40857aa988e6cfd8f44bcbc7d64a80de0c53cd87297082696093d4a";
        libraryHaskellDepends = [ base mtl ];
        description = "a FFI utility";
        license = stdenv.lib.licenses.bsd3;
@@ -48308,7 +48469,7 @@ self: {
      mkDerivation {
        pname = "error-continuations";
        version = "0.1.0.0";
-       sha256 = "0rv59fhlfr03qis957mjgl4gyk1i5axfyvr680z3ykbfd3k5gc1s";
+       sha256 = "3ab057e6686e4d3f3e40266fefba2a314cff087db29e9274c4036447a14b6567";
        libraryHaskellDepends = [ base either mtl transformers ];
        jailbreak = true;
        homepage = "https://github.com/echatav/error-continuations";
@@ -48321,7 +48482,7 @@ self: {
      mkDerivation {
        pname = "error-list";
        version = "0.1.0.3";
-       sha256 = "0k0rpscg4h55215mgkd72yd5la3f2im21vlsgyg7v4pkrxd1cj1j";
+       sha256 = "3248165acff3927d9e7f9aee206a146e285a9a17a7cd574b10a540f298be194c";
        libraryHaskellDepends = [ base mtl text text-render ];
        homepage = "http://github.com/thinkpad20/error-list";
        description = "A useful type for collecting error messages";
@@ -48333,7 +48494,7 @@ self: {
      mkDerivation {
        pname = "error-loc";
        version = "0.1.0.0";
-       sha256 = "0ch7c537fp52yg3qmc1v9rs4y70cc0zyb3g3i0bmmhgdhxd90bm5";
+       sha256 = "a52e905a87edc15a1788e38de53f600c1c4f744e3bb08ac7f3a25c7746610732";
        libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/error-loc";
@@ -48346,7 +48507,7 @@ self: {
      mkDerivation {
        pname = "error-location";
        version = "0.1.5.5";
-       sha256 = "1gfi3jvag662xbsiv75ndb8p9s3c7j6lny15a9gqk8wd4l71myid";
+       sha256 = "2dfa1a0e258da3895f5225784b8d3c6ce874d16ab69c1df5eac298a7b61cd1bd";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/gregwebs/ErrorLocation.hs";
        description = "error functions that show file location information";
@@ -48360,7 +48521,7 @@ self: {
      mkDerivation {
        pname = "error-message";
        version = "1.1";
-       sha256 = "0xnz5l3r9x81pmb6nddzrrws1yqzdqydqkr2g1ib4pwmdwazf7f9";
+       sha256 = "c91df7156f955fb26278224fdc3c6e1ffba079cebf356b56bd01f594072ddf76";
        libraryHaskellDepends = [
          ansi-wl-pprint base containers either-unwrap InfixApplicative mtl
        ];
@@ -48376,7 +48537,7 @@ self: {
      mkDerivation {
        pname = "errorcall-eq-instance";
        version = "0.3.0";
-       sha256 = "0hqw82m8bbrxy5vgdwb83bhzdx070ibqrm9rshyja7cb808ahijm";
+       sha256 = "5546a810408b1d253dd439d58c570407f4f6e11a68f1f676f13daf85aa401c43";
        libraryHaskellDepends = [ base base-orphans ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "An orphan Eq instance for ErrorCall";
@@ -48388,7 +48549,7 @@ self: {
      mkDerivation {
        pname = "errors";
        version = "1.4.7";
-       sha256 = "09g53dylwsw1phxq5zhkbq8pnpwqzipvqclmcrdypzkpwkmfncl7";
+       sha256 = "8732ebeae477feeb5b669532bc6ffc985f7b115e13fe823bbc816b4e7d1be525";
        libraryHaskellDepends = [ base either safe transformers ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
@@ -48399,7 +48560,7 @@ self: {
      mkDerivation {
        pname = "errors";
        version = "2.0.0";
-       sha256 = "00s7vsqfvv23j3mpicrhspibbyzi5diqrdgajqx9n2snq8vxn9s5";
+       sha256 = "4527db37c2560b9b3a96eab58c632bf1fbb5e2d530b378eb9043ecedb0de4703";
        libraryHaskellDepends = [ base safe transformers ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
@@ -48413,7 +48574,7 @@ self: {
      mkDerivation {
        pname = "ersatz";
        version = "0.3";
-       sha256 = "1hq6cdw1rvwc0289saz36x2imwwnj203hqk2lsbkbhyghdvqmpbr";
+       sha256 = "79dd8a7783cfc33597a6626238809096f31a4537e32b9d90008cef1c786306c3";
        revision = "3";
        editedCabalFile = "aafa6482bcf20d998dfc122b780b0378ec05187235252f4715e98bac02fc5b6c";
        isLibrary = true;
@@ -48440,7 +48601,7 @@ self: {
      mkDerivation {
        pname = "ersatz-toysat";
        version = "0.2.1.0";
-       sha256 = "1dpp4jl5mzc2z07f5670baxn95xvqgl9ynk0r0m83arpyp380fdq";
+       sha256 = "b83980c6f537ab812ac8605a9fe8c3bb9764bb5ae098e20ef882fd5aa824f7b6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48460,7 +48621,7 @@ self: {
      mkDerivation {
        pname = "ert";
        version = "0.0.2.1";
-       sha256 = "0ica7vir4ragcc3xrkzlmhncnn0ddx8ky61cj32z7ginybfjq2ig";
+       sha256 = "2f0a2cddf236bef3c5902c183f516f0d58cb2cacf4cfdc07634f6592e33e8a45";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48483,7 +48644,7 @@ self: {
      mkDerivation {
        pname = "esotericbot";
        version = "0.0.6";
-       sha256 = "0r77y94ff210nqjga0xm2hrraa01dgjfaxs3ijrg11z6hfz523s7";
+       sha256 = "470f51be83e687f0b28c4377e5e46b0128953314b503f524b62008e748f2e764";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48509,8 +48670,8 @@ self: {
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "2.4.0";
-       sha256 = "1lihililzzryy93lka06cyv60sjjk91jlymsj68rkzz4238vh4z0";
+       version = "2.4.1";
+       sha256 = "12cc83bd2774906c29df20be8b77d11e0fc6efedadf208714494dc406cd8f7fd";
        libraryHaskellDepends = [
          base blaze-html bytestring conduit monad-logger persistent
          resourcet tagged text transformers unordered-containers
@@ -48530,7 +48691,7 @@ self: {
      mkDerivation {
        pname = "ess";
        version = "0.1.0.0";
-       sha256 = "0pxrs9vr6gc61md9q4rxdc5fikvjandqw2rygs0xamrqlna51bcq";
+       sha256 = "98ad5094a53857d5817e3e0b8e9b5572cfe80a6b3d139c5a0d863d9377d2b95f";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/michaelochurch/ess";
@@ -48544,7 +48705,7 @@ self: {
      mkDerivation {
        pname = "estimator";
        version = "1.1.0.1";
-       sha256 = "1sf378qhmsxxazkk7nn1d7nvrq1ladsfvkzshqjwsnyl5pgj7sgq";
+       sha256 = "f8e923df2dd45bcd2586facfed745334e0bced69c1da33e757bdeb0a313ac3e9";
        libraryHaskellDepends = [
          ad base distributive lens linear reflection
        ];
@@ -48561,7 +48722,7 @@ self: {
      mkDerivation {
        pname = "estimators";
        version = "0.1.4";
-       sha256 = "0n7j2ay68m73f1mkfsxrrcs1rq0fpavwf58r50y7wirpm5f6agcy";
+       sha256 = "9e3d655ca937477e3c281915c7b7ba0ee01c34cbb96b376b70e35464bc12f258";
        libraryHaskellDepends = [
          base binary containers deepseq list-tries MonadRandom mtl pretty
          prettyclass QuickCheck text
@@ -48577,7 +48738,7 @@ self: {
      mkDerivation {
        pname = "estreps";
        version = "0.3.1";
-       sha256 = "100pqygnwclmpzjhzpz3j34y8v75d8ldxg76f9jys90gb41kggpi";
+       sha256 = "f1be3703590f24ed6572e6bcde286ae56ce4c990e3df0fe5bf95326e9fc71780";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -48597,7 +48758,7 @@ self: {
      mkDerivation {
        pname = "etcd";
        version = "1.0.5";
-       sha256 = "0bqz678mnpw2jpywz2m76923cyq864xn537a9zsqhm6c80gc0vwi";
+       sha256 = "916fc01e40cc5488f54fea8c623b31087b364432a78acffd95825f5bd1311f2f";
        revision = "1";
        editedCabalFile = "5cdbbc8d2aedc68e82e7c4d0cface390c3c68fb7ee7fb162d8123e42351f98fa";
        libraryHaskellDepends = [
@@ -48615,7 +48776,7 @@ self: {
      mkDerivation {
        pname = "eternal";
        version = "0.1.1";
-       sha256 = "151b9qcdyh0vixn0y4s9h54g1h0kk1hwcgh5xcx9qp7bgy0h8wv9";
+       sha256 = "697304817feb5c9c3aeb053ec6619813c0f0488149130f6c8f1b40df184e2b94";
        libraryHaskellDepends = [
          base base-unicode-symbols transformers utf8-string
        ];
@@ -48632,7 +48793,7 @@ self: {
      mkDerivation {
        pname = "ether";
        version = "0.3.0.0";
-       sha256 = "1k8g01ypck0w6sp6f3w3asdakzjg6k8m1sz58c2r5iz3z1v9b04m";
+       sha256 = "95809576f8e3c7920543e5eb50d1344ffea99a56830f67ae361c4c767d000fcd";
        libraryHaskellDepends = [
          base mmorph monad-control mtl newtype-generics template-haskell
          transformers transformers-base transformers-lift
@@ -48656,7 +48817,7 @@ self: {
      mkDerivation {
        pname = "ethereum-client-haskell";
        version = "0.0.4";
-       sha256 = "0dkvvs7bk4paqjmr1zihi14kp4cb28s33b18kd3a17lz1vd4qbfc";
+       sha256 = "cc2d4cda0e9f9ea0469b28ac3134128b913b498830fe90abc4ea92b98ede7b36";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -48683,7 +48844,7 @@ self: {
      mkDerivation {
        pname = "ethereum-merkle-patricia-db";
        version = "0.0.1";
-       sha256 = "0pxncaam139nl99wm1i7fcnnsy683p6inasz10knfd2jsxcz8yr8";
+       sha256 = "287bf459d752346727085f2b1bcd1dc8786d2d732786ca53a2368d509562b65f";
        libraryHaskellDepends = [
          ansi-wl-pprint base base16-bytestring binary bytestring cryptohash
          data-default ethereum-rlp leveldb-haskell nibblestring resourcet
@@ -48706,7 +48867,7 @@ self: {
      mkDerivation {
        pname = "ethereum-rlp";
        version = "0.0.1";
-       sha256 = "1hx5nhdy27kx67mwi8zjgqfxir0z7bp47xsw3a6hz40hj716n9r5";
+       sha256 = "25276bc29110900f8d1a5cf743ee3a1fe4d81d7ef2a3c8eb317d1ee11bb4a5c3";
        libraryHaskellDepends = [
          ansi-wl-pprint base base16-bytestring bytestring
        ];
@@ -48725,7 +48886,7 @@ self: {
      mkDerivation {
        pname = "ety";
        version = "0.1";
-       sha256 = "165vwca1q001pa9f09vfhf724kq5jnsip907c9dr6fncj9yjdp2p";
+       sha256 = "57dc267d92cc3a935b6207a41bb595054f228e836e27e092ba01001c14e3bb98";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48745,7 +48906,7 @@ self: {
      mkDerivation {
        pname = "euler";
        version = "0.9.2";
-       sha256 = "14ghmy5qblfgacc6b07jja6pssglf393j5hjypz0l0azd9w56kh5";
+       sha256 = "054e53786a5f010afef5121639d270f4697d8d92f280651853cfd1858baff091";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base directory hlint hspec process regex-posix xml
@@ -48765,7 +48926,7 @@ self: {
      mkDerivation {
        pname = "euphoria";
        version = "0.6.0.1";
-       sha256 = "1bml75lj30y83bln5a7b36gcb9d6gci4vhmr8ins9nz6bc1l29m9";
+       sha256 = "a92641035be6dba46d44b9c24d227ba6a5c59e19eba862e91ac883216939b4ae";
        libraryHaskellDepends = [
          base containers data-default deepseq elerea enummapset-th hashable
          HUnit transformers unordered-containers
@@ -48786,7 +48947,7 @@ self: {
      mkDerivation {
        pname = "eurofxref";
        version = "0.2.1";
-       sha256 = "0zjf3rky2ww2nq4ryyz0069cv3ps1h29nwrgr2sk127bsik868x9";
+       sha256 = "a9238366d4eb8830b5c82f739b040cfa8ecd9201e07b9f09b68273e1671e4e7e";
        libraryHaskellDepends = [
          base bytestring conduit containers failure hexpat http-conduit
          http-types monad-control mtl time
@@ -48802,7 +48963,7 @@ self: {
      mkDerivation {
        pname = "event";
        version = "0.1.1";
-       sha256 = "191d72dbaddxl2ql2860145iwfsrx2jrbcsylfq7028vmzzxqqm6";
+       sha256 = "a662dcffaf1b0970b0a35eb395a5e8593b1e0b09c02041b1a0bd35b59a382da4";
        libraryHaskellDepends = [
          base containers semigroups transformers
        ];
@@ -48815,7 +48976,7 @@ self: {
      mkDerivation {
        pname = "event-driven";
        version = "0.0.2";
-       sha256 = "1jkrc1k0ixjs95fvj36gr08igpx5vqff5zc6bi9f04ldxqz4wbap";
+       sha256 = "572d4e3eee8d12e0525c86fde21cdea5df1711c8cf0cb95d495af608666079ca";
        libraryHaskellDepends = [ base monads-tf yjtools ];
        description = "library for event driven programming";
        license = stdenv.lib.licenses.bsd3;
@@ -48827,7 +48988,7 @@ self: {
      mkDerivation {
        pname = "event-handlers";
        version = "0.0.0.3";
-       sha256 = "1515v1khdkr145z5inrm2ardhpzfsbncpl5wmfd9nmilw97da9ld";
+       sha256 = "8d26d54ee234569b9aabbcd0cbecd2ee5fd8b21235db587e2121cf0667d82594";
        libraryHaskellDepends = [ base containers ];
        homepage = "http://code.haskell.org/~mokus/event-handlers";
        description = "Event handlers";
@@ -48841,7 +49002,7 @@ self: {
      mkDerivation {
        pname = "event-list";
        version = "0.1.1.2";
-       sha256 = "1nvc473rv9m6vr9l9d5x9v6h89819s822gwzilx8d5fj5i50nqzb";
+       sha256 = "eb630b4a2cd295863a8d9f3f21904e012504cd4ebdb44453dea6a69dc7216cdb";
        libraryHaskellDepends = [
          base non-negative QuickCheck transformers utility-ht
        ];
@@ -48860,7 +49021,7 @@ self: {
      mkDerivation {
        pname = "event-monad";
        version = "0.0.3";
-       sha256 = "1phs799i4da1nfgx530bp93n9xhzgnavilwlk8nz5vi3kd61gzf4";
+       sha256 = "c4fd174c9b23eef22d9a94d3b8957d1ff66447ba0b8cd29fb3413512533a1ade";
        libraryHaskellDepends = [
          base containers event-handlers haskell98 monad-loops mtl pretty
          prettyclass priority-queue stateref
@@ -48878,7 +49039,7 @@ self: {
      mkDerivation {
        pname = "eventloop";
        version = "0.4.1.1";
-       sha256 = "0d870kzcb08pc0ngrdkfibi0yq4zs5vcgg8acqpa8gdjaiksm8jg";
+       sha256 = "4fa2aa6754b23da42e660abdc776d19f600fe28a6eb6fc2c601781c5fe040735";
        libraryHaskellDepends = [
          aeson base bytestring network suspend text timers websockets
        ];
@@ -48896,7 +49057,7 @@ self: {
      mkDerivation {
        pname = "eventstore";
        version = "0.8.0.0";
-       sha256 = "0p1z7xs3412s2hnv7pc18y1gx65p5hf09038n96vl22kvc9d84ww";
+       sha256 = "9c13d412db5308ba4db26880041c2cb798fe824781ddb32d145a0432743f3f5c";
        libraryHaskellDepends = [
          aeson async attoparsec base bytestring cereal containers network
          protobuf random sodium stm text time unordered-containers uuid
@@ -48911,7 +49072,7 @@ self: {
      mkDerivation {
        pname = "every-bit-counts";
        version = "0.1";
-       sha256 = "0r959iyd5nsw3sj7p0gwsccdgaald9lwisg0lvq9qynyz09kh4vj";
+       sha256 = "72133813f8de7a9cf0a6e0e9c8696a54a9d718d3fc817ba41e5cdbd27c4c2565";
        libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://research.microsoft.com/en-us/people/dimitris/pearl.pdf";
        description = "A functional pearl on encoding and decoding using question-and-answer strategies";
@@ -48925,8 +49086,8 @@ self: {
      }:
      mkDerivation {
        pname = "ewe";
-       version = "0.1.0.44";
-       sha256 = "0v313l0akvw9b3zn7xffy4ixz2c70i40k6kh4vdlrw8dvyv7zxk3";
+       version = "0.1.0.46";
+       sha256 = "ce3c9bea5cad4c5e7e1d2243d3f67530c47b60dc9602106e0046924c9429ff1a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -48934,7 +49095,7 @@ self: {
        ];
        executableToolDepends = [ alex happy ];
        homepage = "http://github.com/jfcmacro/ewe";
-       description = "An language using in Programming Languages teaching";
+       description = "A language for teaching simple programming languages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -48946,7 +49107,7 @@ self: {
      mkDerivation {
        pname = "ex-pool";
        version = "0.2";
-       sha256 = "0da5grl2fdca24zhlngq2n16smdb4f5vvxqzc29ipsc3j7wkbmva";
+       sha256 = "6ad735f99183e91b93601ff7bd8b23ab556d8215f8590a3f118a3527687e4535";
        libraryHaskellDepends = [
          base exceptions hashable stm time transformers vector
        ];
@@ -48961,7 +49122,7 @@ self: {
      mkDerivation {
        pname = "exact-combinatorics";
        version = "0.2.0.8";
-       sha256 = "0pj7sh6s1kawk39hb42q1sx20g2rmzanpmr3zri9yvmb16qj5a1j";
+       sha256 = "32a822b109ab6e9f62fe23d76bd5af593c20ba0e589005d3985ccda00dd4475e";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Efficient exact computation of combinatoric functions";
@@ -48973,7 +49134,7 @@ self: {
      mkDerivation {
        pname = "exact-pi";
        version = "0.2.1.1";
-       sha256 = "1f8lxdaal7m4vw8akzwlhn0j3vw5bh983f02j842g1vzs3n47x3g";
+       sha256 = "6ff443ecd07f8727089202b881125c85ef21818594ffa910dfa41eaa54eb14b9";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/dmcclean/exact-pi";
        description = "Exact rational multiples of pi (and integer powers of pi)";
@@ -48985,7 +49146,7 @@ self: {
      mkDerivation {
        pname = "exception-mailer";
        version = "0.4.1";
-       sha256 = "068zhr90gldin0f6xafqp1pncf6rhhm3gagnvn6r3p0kx060ia23";
+       sha256 = "43a8080ce813dc918dddf6a9372a84d938666fb8d8a96e1cb0b1d10752861f19";
        libraryHaskellDepends = [ base hslogger mime-mail text ];
        homepage = "https://github.com/drpowell/exception-mailer";
        description = "Catch all runtime exceptions and send an email";
@@ -48999,7 +49160,7 @@ self: {
      mkDerivation {
        pname = "exception-monads-fd";
        version = "0.2";
-       sha256 = "1wrhi9h2k068f0q0aqvpmlyx3318znm137xnvx7icf5shlpsilvi";
+       sha256 = "71d3a82f85ba38164fdfb69f11aafd288cd13dad7763053070c88029608a30f3";
        libraryHaskellDepends = [
          base exception-transformers monads-fd transformers
        ];
@@ -49016,7 +49177,7 @@ self: {
      mkDerivation {
        pname = "exception-monads-tf";
        version = "0.4";
-       sha256 = "0k9ada0g4nxwxggarpfcfdzg2zvxqdg9bkb4hv5v3qqanjmvb9hg";
+       sha256 = "0fa6b5abb40ae3b1cb8664cd955ec37d7ff17e73ccddacdeebbc5bf2806a2a4d";
        libraryHaskellDepends = [
          base exception-transformers monads-tf transformers
        ];
@@ -49029,7 +49190,7 @@ self: {
      mkDerivation {
        pname = "exception-mtl";
        version = "0.4";
-       sha256 = "1ya2xxl25afj2rxl2vziifrc91nzyg47vs06s0b65qjd7yz533j3";
+       sha256 = "438e51be3f4de26216d006e87dc8f3df86c4b28bf16f417b16d2a92268ef42f9";
        libraryHaskellDepends = [
          base exception-transformers mtl transformers
        ];
@@ -49044,7 +49205,7 @@ self: {
      mkDerivation {
        pname = "exception-transformers";
        version = "0.4.0.1";
-       sha256 = "1ay46wawrrsvii3b4kqxi2cg3b6r7wfw0l7d66il195qa6hh4sfq";
+       sha256 = "d86902a151b8a440a331ed50c01d3fd9acf198881d4fb2468c5be7cc1537c4ab";
        libraryHaskellDepends = [
          base stm transformers transformers-compat
        ];
@@ -49061,7 +49222,7 @@ self: {
      mkDerivation {
        pname = "exceptional";
        version = "0.3.0.0";
-       sha256 = "01lzx4ihdvyivjnkvn78hcdsk83dvm6iy9v5q1f28kd1iv96x1ns";
+       sha256 = "da866ed28ea14d245cc065271f4ddd6da0a91b83e8d83daddcd1ef0623e99f06";
        libraryHaskellDepends = [ base exceptions ];
        homepage = "https://github.com/";
        description = "Essentially the Maybe type with error messages";
@@ -49075,7 +49236,7 @@ self: {
      mkDerivation {
        pname = "exceptions";
        version = "0.8.0.2";
-       sha256 = "1x1bk1jf42k1gigiqqmkkh38z2ffhx8rsqiszdq3f94m2h6kw2h7";
+       sha256 = "070a3e0d1495243770fb3a629d5187ce898f069cb3621c5f7c610ae264982bf4";
        libraryHaskellDepends = [
          base mtl stm transformers transformers-compat
        ];
@@ -49096,7 +49257,7 @@ self: {
      mkDerivation {
        pname = "executable-hash";
        version = "0.2.0.2";
-       sha256 = "103s0095bb71wz3axhzw2w2nm5wfr01r9ypkdvbp22zhmq3xr1bj";
+       sha256 = "7285dc07aef00b71d76ef3fa9403c88e976a0517fcc3aec6e7e1ac5512007a80";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -49115,7 +49276,7 @@ self: {
      mkDerivation {
        pname = "executable-path";
        version = "0.0.3";
-       sha256 = "1jg58qf19qz93c60ryglcavwdcysz4fd4qn8kpw5im9w9kniawlc";
+       sha256 = "8c7215ed4c3cd558f89dc862d21cf9dab3c6b762f4f90c0c1be9e3141c46e5c9";
        libraryHaskellDepends = [ base directory filepath unix ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Finding out the full path of the executable";
@@ -49128,7 +49289,7 @@ self: {
      mkDerivation {
        pname = "exhaustive";
        version = "1.1.1";
-       sha256 = "0bgzg2qhx91hd9711bxv6cr2qc7m23g29al4gb7yx20cs78bz1mg";
+       sha256 = "af86bfd0d10c88eecf7a84aa24de10f5302c3233bbaf104e6a30a40eb178ff2d";
        libraryHaskellDepends = [
          base generics-sop template-haskell transformers
        ];
@@ -49144,7 +49305,7 @@ self: {
      mkDerivation {
        pname = "exherbo-cabal";
        version = "0.1.0.3";
-       sha256 = "1i1p9pwzdf44cp8d1crq40g1hv84gpimywq5kdpz2nfgcnr17ans";
+       sha256 = "daaa13b265cf59f16f9b05735fe37d046d181e2038b3d0d06584b8f6f94d37c4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -49160,7 +49321,7 @@ self: {
      mkDerivation {
        pname = "exif";
        version = "3000.0.0";
-       sha256 = "0w0l4xk3qwfiw10880729mwfdkx4xpfn9ffdw7fi5swyhinjh6wi";
+       sha256 = "911b286d849eeb12dde1cdb964ddeda4cfe6784de2008440e0d1713c66271470";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ exif ];
        description = "A Haskell binding to a subset of libexif";
@@ -49173,7 +49334,7 @@ self: {
      mkDerivation {
        pname = "exists";
        version = "0.2";
-       sha256 = "1f7v2f7jmqx0nkl2wla88mnb21nava74b73rvsmfbj4kxmwchsgy";
+       sha256 = "fe69c878ed93c8e5aade799c458edaca06b16c4548512ee8b4a0e32a8f13fbb8";
        libraryHaskellDepends = [ base contravariant ];
        jailbreak = true;
        homepage = "http://github.com/glehel/exists";
@@ -49190,7 +49351,7 @@ self: {
      mkDerivation {
        pname = "exp-pairs";
        version = "0.1.3.0";
-       sha256 = "033sdkfg94m33qrkw0l3lbs6dm8ssxfdj3jg3p39w63q7va2c0hr";
+       sha256 = "190226d43e78189ec61d4f0ed95cd71ad566f4a283023e331ea392f4dc6c7a0c";
        libraryHaskellDepends = [
          base deepseq generic-deriving ghc-prim memoize wl-pprint
        ];
@@ -49209,7 +49370,7 @@ self: {
      mkDerivation {
        pname = "expand";
        version = "0.0.1";
-       sha256 = "0i8agr9np8pg40z58z8jz1fvq3vqjk2sx247dn33mvqyd03hnbss";
+       sha256 = "5a2f0b07681eef3a866d8788aec594780fbc5df8127d543e20efa26b537e0a45";
        libraryHaskellDepends = [
          AspectAG base HList murder uu-parsinglib
        ];
@@ -49226,7 +49387,7 @@ self: {
      mkDerivation {
        pname = "expat-enumerator";
        version = "0.1.0.3";
-       sha256 = "0alllaa9qj94jp99pyvbh4ckdvb43aba2l2jmigazqvbc9db03mx";
+       sha256 = "bd0eb05a626be3af5eac5250a1961a64ed3619816bfb9bd29524499c94a2942a";
        libraryHaskellDepends = [
          base bytestring enumerator hexpat text transformers xml-types
        ];
@@ -49244,7 +49405,7 @@ self: {
      mkDerivation {
        pname = "expiring-cache-map";
        version = "0.0.5.4";
-       sha256 = "0wbx9qp9ki9gwrc9qafpflkmyj1yiryak1di163mz0i3dv2w73h8";
+       sha256 = "088ec3c56e23825f8709b185a97c8e3e485f2775d7299c58e62fc5992e4e7d71";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
@@ -49261,7 +49422,7 @@ self: {
      mkDerivation {
        pname = "expiring-mvar";
        version = "0.1";
-       sha256 = "0mkc7d346vdsjg83a253986w4pps53r262w1if91q16kx6qci7yy";
+       sha256 = "de9fc8b0e9d3041c928b810b23f228fa5ec20d4aa30835d093ba6d43463b6c56";
        libraryHaskellDepends = [ base ];
        description = "Create values which expire after a period of time";
        license = stdenv.lib.licenses.bsd3;
@@ -49272,7 +49433,7 @@ self: {
      mkDerivation {
        pname = "explain";
        version = "0.1.0.1";
-       sha256 = "14n8ic5mg2819s9bk4czwfxrkyz96c2lvnksv1hq5vwr579rvjx2";
+       sha256 = "a2cb9dd32999ef8261d87ada4d0533e9fb99bbe39f91b9924e0189570b8bc892";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -49290,7 +49451,7 @@ self: {
      mkDerivation {
        pname = "explicit-determinant";
        version = "0.1.0.0";
-       sha256 = "0g20kblzvhx53mi82frpx29x0nsfjrzsanqq8f6yw22lh47pbm4y";
+       sha256 = "9ed4750f815408ee8d43185ba57f964e5bd093e8373b81621da5c3fde99a403c";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/jwaldmann/haskell-explicit-determinant";
@@ -49303,7 +49464,7 @@ self: {
      mkDerivation {
        pname = "explicit-exception";
        version = "0.1.7.3";
-       sha256 = "0f1p1llz6z4ag1wnf57mgm861cbw7va0g0m8klp6f6pnirdhlwz1";
+       sha256 = "e1730a5b8ef61a672e9da88207d43e7cb160507df5146779788a7cf3290d3738";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base transformers ];
@@ -49317,7 +49478,7 @@ self: {
      mkDerivation {
        pname = "explicit-iomodes";
        version = "0.6.0.5";
-       sha256 = "0irz1zy6iaipym73x343zvr6cqym6ci2vbjbyr564d29ymd6ldzd";
+       sha256 = "ed376a5af54934624af64bae2d2233d56366f2fe838c3e4ef537aa68fc0f3f47";
        libraryHaskellDepends = [ base base-unicode-symbols tagged ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/explicit-iomodes/";
@@ -49330,7 +49491,7 @@ self: {
      mkDerivation {
        pname = "explicit-iomodes-bytestring";
        version = "0.2.0.2";
-       sha256 = "0h3dlgkd2gx8zr3sh949nhqgrdg943dgpp4v1n599jjjpqpw16hj";
+       sha256 = "129ac02fbe52ca948a0d9bdcfbda20e9b5fc30b48924a847fea83fd1e6a36d40";
        libraryHaskellDepends = [ base bytestring explicit-iomodes ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/explicit-iomodes-bytestring/";
@@ -49343,7 +49504,7 @@ self: {
      mkDerivation {
        pname = "explicit-iomodes-text";
        version = "0.1.0.8";
-       sha256 = "12ny5wa1j1wp8fbg5k8zkv4a3axmssxcvfvhg3frsm4dych6hmyg";
+       sha256 = "cf576820f38d549ddd7870bbcdbad6b5aba1c89e1fcdf29643970719142fde8a";
        libraryHaskellDepends = [ base explicit-iomodes text ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/explicit-iomodes-text/";
@@ -49356,7 +49517,7 @@ self: {
      mkDerivation {
        pname = "explicit-sharing";
        version = "0.9";
-       sha256 = "0jshv56i60mzlfddvfkcx0j7rzqdlhy6h09bmqci15wzisvpvjpq";
+       sha256 = "f8ca7db78e9f971019ae2b01683ca40dff7c24e86cbadd9aa3bf02134dd9504b";
        libraryHaskellDepends = [
          base containers derive mtl template-haskell
        ];
@@ -49372,7 +49533,7 @@ self: {
      mkDerivation {
        pname = "explore";
        version = "0.0.7.2";
-       sha256 = "18x2gw9w2jzisyl2hsp2rlml6slnlbjpqbadqcbcm8pamnl7w1fc";
+       sha256 = "cc057ea8adeaa2ca16c34d2d7ce5a2966a432bcde26a28a8d7f14bc1137fa2a3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base directory pngload ];
@@ -49390,7 +49551,7 @@ self: {
      mkDerivation {
        pname = "exposed-containers";
        version = "0.5.5.1";
-       sha256 = "09ck4hadxgdlqpgxr45jxr261mzkzihmwd5b02xi05z8034bhqk7";
+       sha256 = "6762b8c800e81710bb00ab345e61fcf3d76044eeb290dcdfc5b4bdde14249325";
        revision = "1";
        editedCabalFile = "25516f8a7288ce438b872a0d3054434c3ba48ce0ce8a57209ea6d78ce6e2665c";
        libraryHaskellDepends = [ array base deepseq ghc-prim ];
@@ -49409,7 +49570,7 @@ self: {
      mkDerivation {
        pname = "expression-parser";
        version = "0.1";
-       sha256 = "1ldp1f2c823byx4ag8jpmq9bhw26lq98fz7ljqslffs37pc098qs";
+       sha256 = "1aa304d83d433b473596f47c8712a64670b812ae57a2a748f76b08c4840bb7d1";
        libraryHaskellDepends = [ base ];
        description = "Generalization of parsec's expression parser";
        license = stdenv.lib.licenses.bsd3;
@@ -49422,7 +49583,7 @@ self: {
      mkDerivation {
        pname = "extcore";
        version = "1.0.2";
-       sha256 = "1dpn4dbbn5d3zqrhxkg8nvb97vp9pf61gwa46yf218nvwgqvx437";
+       sha256 = "6790bef1e3dba2209c3744f1178cbbe9ee93d6b6e8cd0e33fea315bb5623f6b6";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath mtl parsec
          pretty syb
@@ -49441,7 +49602,7 @@ self: {
      mkDerivation {
        pname = "extemp";
        version = "0.0.1";
-       sha256 = "1vbazvs1ij4qfhzf38f7z75lx4mdxnkvcb79ngqc3h67844s90xy";
+       sha256 = "be83a40941c7c0c1f0b3e92cb6a7edad924ecbf9c7a1e13e7498c818f4fe6aed";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -49461,7 +49622,7 @@ self: {
      mkDerivation {
        pname = "extended-categories";
        version = "0.2.0";
-       sha256 = "1dg9zvqszlg5v3mygazzgm84qlkcmpryv3vv4x3zwrzi1g0idq72";
+       sha256 = "e2e016c10bf167fe47277b8fedf3ad6c524c507dffabe7ebd8e5d1aff1fee9b5";
        libraryHaskellDepends = [ base constraints ghc-prim tagged ];
        jailbreak = true;
        homepage = "github.com/ian-mi/extended-categories";
@@ -49478,7 +49639,7 @@ self: {
      mkDerivation {
        pname = "extended-reals";
        version = "0.2.1.0";
-       sha256 = "1a3vp51l07kj85p578y5bryalqv1a8b5766w0hrr85yp67y7wfdp";
+       sha256 = "b7397efc31d717943304dc985316526163aa7c5ec5a3536e41721e4043b97ba8";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -49497,7 +49658,7 @@ self: {
      mkDerivation {
        pname = "extensible";
        version = "0.3.5";
-       sha256 = "0jff7vrmhj5sdd3migfi5p2bx35m6jbqlfai7rqpg0iqbxbp6pmy";
+       sha256 = "be5e73575f388277713e51398a9734b58cbec42dd1bd58476bba4858f33ece49";
        libraryHaskellDepends = [
          base constraints monad-skeleton profunctors tagged template-haskell
          transformers
@@ -49514,7 +49675,7 @@ self: {
      mkDerivation {
        pname = "extensible-data";
        version = "0.1.0.4";
-       sha256 = "143cl3w129mkvs410lx63v3x1dq2az8sk0hlcymaavnqik5maa6g";
+       sha256 = "cf2855cb8cd86ea5aa671482a9d15702b7d0c71ea6531088deb32611f8a06c90";
        libraryHaskellDepends = [
          base data-lens hashable template-haskell unordered-containers
        ];
@@ -49532,7 +49693,7 @@ self: {
      mkDerivation {
        pname = "extensible-effects";
        version = "1.11.0.0";
-       sha256 = "14f8x6gyq28n3lpap4f5bn290llj57my1k28km9r1nh14kxl1lp9";
+       sha256 = "e9d240fb2401da90539d48cce0eb29925290845dc591ab2e1d1609ec9fe9c891";
        libraryHaskellDepends = [
          base transformers transformers-base type-aligned void
        ];
@@ -49550,7 +49711,7 @@ self: {
      mkDerivation {
        pname = "extensible-exceptions";
        version = "0.1.1.4";
-       sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc";
+       sha256 = "6ce5e8801760385a408dab71b53550f87629e661b260bdc2cd41c6a439b6e388";
        libraryHaskellDepends = [ base ];
        description = "Extensible exceptions";
        license = stdenv.lib.licenses.bsd3;
@@ -49561,7 +49722,7 @@ self: {
      mkDerivation {
        pname = "external-sort";
        version = "0.2";
-       sha256 = "1i7q3wh2c4fyv6wn4smws8r382hnnppj39xys43h9pkqfis786r9";
+       sha256 = "291b74747478de0407d1bea721efb5160a3432d2bc6a62b9d9de1126201ff8c4";
        libraryHaskellDepends = [
          base binary bytestring EdisonAPI EdisonCore
        ];
@@ -49577,7 +49738,7 @@ self: {
      mkDerivation {
        pname = "extra";
        version = "1.4.1";
-       sha256 = "00fhy9l2cgfwj8873jf1iyz2fmhj1b3m0qlf38i4pd1yad8sfb70";
+       sha256 = "e02ca751533eb44b221a8e6250c70a125627be8fc1c9711092dc3d2668f2d001";
        libraryHaskellDepends = [
          base directory filepath process time unix
        ];
@@ -49596,7 +49757,7 @@ self: {
      mkDerivation {
        pname = "extractelf";
        version = "0.1.0.0";
-       sha256 = "13wbzqw0iz7xkqdrwan9xxl8vwqvhvwzlypps964v1s1bgabmpqj";
+       sha256 = "12dfbad45b41874d4cd2f77afaf9861bf38d68efc92a9e1b9efdfc0838fe8b8f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -49620,7 +49781,7 @@ self: {
      mkDerivation {
        pname = "ez-couch";
        version = "0.7.0";
-       sha256 = "023wrrk7slrg8p547saspfvp771zqwdh7mnvwg1sag4a2j20b660";
+       sha256 = "c0980584148a3ca5c3e3dbd6031bc73f9c73b7bb5ae943ca452f537d66ce7c08";
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-conduit base blaze-builder bytestring
          classy-prelude classy-prelude-conduit containers ghc-prim hashable
@@ -49640,7 +49801,7 @@ self: {
      mkDerivation {
        pname = "faceted";
        version = "0.0.2.0";
-       sha256 = "0apgad2rqpgxypm10n98agmfrlxydcawvsvyafdwj8jhynfycx03";
+       sha256 = "0374e69df55022c99b537eebcd156bbed3ecea53285910eaf5fd5d9c4553ef2a";
        libraryHaskellDepends = [ base free ];
        jailbreak = true;
        homepage = "http://github.com/haskell-faceted/haskell-faceted";
@@ -49656,7 +49817,7 @@ self: {
      mkDerivation {
        pname = "factory";
        version = "0.2.1.1";
-       sha256 = "07shidg02drvxpny0qgmshgliz0agw1app5xjs3d0z9zv3v5y1am";
+       sha256 = "55055ff6d83f7dd08696bddcab027f0afc481fd4f561e0eded3b37015e8b501f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -49676,7 +49837,7 @@ self: {
      mkDerivation {
        pname = "factual-api";
        version = "0.6.1";
-       sha256 = "1njijf5l277qndp5xmyqji0fcd84zxnn9vhz5v8nlqp3pfcilidp";
+       sha256 = "b7451a99bbe3626ad12e1fee646dff0435e64094d8d75e6eb3f81c418b9351da";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers curl dataenc hoauth
          HTTP MissingH text unordered-containers utf8-string vector
@@ -49692,7 +49853,7 @@ self: {
      mkDerivation {
        pname = "fad";
        version = "1.1.0.1";
-       sha256 = "00n5m3fa14y882rnzw7pwc154bgp46rhvvj2cghldvybxmj61zgm";
+       sha256 = "f5fd6064edcbef46e16342ee0db321f72d5202e3f7f06fb340c893a0dca8c502";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/bjornbm/fad";
        description = "Forward Automatic Differentiation";
@@ -49704,7 +49865,7 @@ self: {
      mkDerivation {
        pname = "failable-list";
        version = "0.2";
-       sha256 = "0bq0q9n4wnacjqs517i12kl56m16n5ff4gk8kamh87gqkd58w06x";
+       sha256 = "dd008e4a9bf81d04ab9a683ee25cb1265453e814219e5034964c594e6cc2002f";
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy streams, which might terminate with an error";
        license = stdenv.lib.licenses.bsd3;
@@ -49715,7 +49876,7 @@ self: {
      mkDerivation {
        pname = "failure";
        version = "0.2.0.3";
-       sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p";
+       sha256 = "77285693b66edcc4a8a4c52807f25ed0232a8f89d82ef7abe5077f43ba60354a";
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Failure";
        description = "A simple type class for success/failure computations. (deprecated)";
@@ -49727,7 +49888,7 @@ self: {
      mkDerivation {
        pname = "fair-predicates";
        version = "0.1.1";
-       sha256 = "1z0c83gfmvwhzsj2iz422mxcyxc8jnic25i1vz6yp4xzv41ibmj6";
+       sha256 = "46d61503d9bf93ebcddf2116c1a2958875cf7a1582fc28a4fe90efeade400cfc";
        libraryHaskellDepends = [ base ];
        homepage = "http://sebfisch.github.com/fair-predicates";
        description = "Fair Predicates";
@@ -49739,7 +49900,7 @@ self: {
      mkDerivation {
        pname = "faker";
        version = "0.0.0.2";
-       sha256 = "1wl0jx3adibf7z8k3jadnr90jvkmf3zhkq34qpsifcl18zip8skq";
+       sha256 = "786a74e347813217f5c564e009ff70756e0952b64dc931d13f6ec5a6469780f2";
        libraryHaskellDepends = [ base gimlh random split ];
        homepage = "https://github.com/gazay/faker";
        description = "Pure Haskell library for generating fake data";
@@ -49753,7 +49914,7 @@ self: {
      mkDerivation {
        pname = "falling-turnip";
        version = "0.1.0.0";
-       sha256 = "035rjjjvwbjw4z6nlmiyxia5y91yiiw7902f9q6n5jimi5xk2hgk";
+       sha256 = "f341317b8935ca620d4e4e8074788c3e245f54ec3e566acd275c2ebea594b90c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -49773,7 +49934,7 @@ self: {
      mkDerivation {
        pname = "fallingblocks";
        version = "0.1.4";
-       sha256 = "18h5d33hd4cs6dc508mzl7c46pxwrk2q0daabvg8m4fiwk5wzlr0";
+       sha256 = "20d3cfcbe4d1918ade5e4a3580c5ccbc5f43d8a1bf225058339a9106c76805a2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -49793,7 +49954,7 @@ self: {
      mkDerivation {
        pname = "family-tree";
        version = "0.5.1";
-       sha256 = "0b2063f8yz7hwv7h0yisrgh6glr5h4s1cx0q75gfg2wgp2mr72s1";
+       sha256 = "418b93abb88f8be75e39187416348125d367e0cb3a7a00cfe6f07c8fdc30402c";
        libraryHaskellDepends = [
          base binary containers hashable intervals lens tables text time
          unordered-containers
@@ -49809,7 +49970,7 @@ self: {
      mkDerivation {
        pname = "farmhash";
        version = "0.1.0.3";
-       sha256 = "0zqyp55grrkl4x4bhn13ng635zpsnd7g6vj2dqmvn3dg4zhyigf6";
+       sha256 = "c6bde8e127af0dbb2b6e426ef34eb3fafe32ccb32358b8482774e6fc4ab91e7f";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "https://github.com/abhinav/farmhash";
@@ -49824,7 +49985,7 @@ self: {
      mkDerivation {
        pname = "fast-builder";
        version = "0.0.0.2";
-       sha256 = "07fnn282ldfmgkfnsdnjr11hx89jhw7waz573a7nx2a329r1p4pf";
+       sha256 = "ee921b721243896e8f1aa77cc50f8732a10e43c8d2366ddd7cd5352a90b0d61d";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        testHaskellDepends = [ base bytestring process QuickCheck stm ];
        homepage = "http://github.com/takano-akio/fast-builder";
@@ -49839,7 +50000,7 @@ self: {
      mkDerivation {
        pname = "fast-digits";
        version = "0.1.0.0";
-       sha256 = "1dhvlsjbp4qrgcr9xlzbaps59160j2zl98xl5nrz6rffypz0gi72";
+       sha256 = "e2c407fef5ce65f3b32db4a344bf90c08454f455ebd39e327b1993bba4a61bb6";
        libraryHaskellDepends = [ base integer-gmp ];
        testHaskellDepends = [
          base digits QuickCheck smallcheck tasty tasty-quickcheck
@@ -49857,7 +50018,7 @@ self: {
      mkDerivation {
        pname = "fast-logger";
        version = "2.4.0";
-       sha256 = "1hh5rll2q4dpshplyk0hciknvypx3v2hd102hf0f2z5h70d4xzsc";
+       sha256 = "4cff4e1a38b07ce18083028406c51efdfa6d6764104c4f2fd4b7112c28cd05c2";
        revision = "3";
        editedCabalFile = "af5edf5e05ecd782e1d87b9d5730c5a9eb1016ac01fb1a377dda1cd8e88a274b";
        libraryHaskellDepends = [
@@ -49874,7 +50035,7 @@ self: {
      mkDerivation {
        pname = "fast-math";
        version = "1.0.2";
-       sha256 = "15dyw88z9abiv6n40fz4g3jpj9v6qbxvqaf0ds32wh46igf1s425";
+       sha256 = "45101ddc8b86402e866ec029bcfbc2662779e578e43b40acd971a9f411e2be95";
        libraryHaskellDepends = [ base ];
        description = "Non IEEE-754 compliant compile-time floating-point optimisations";
        license = stdenv.lib.licenses.bsd3;
@@ -49887,7 +50048,7 @@ self: {
      mkDerivation {
        pname = "fast-tags";
        version = "1.1.0";
-       sha256 = "1m6v9jdla0r36l45gs3swycfgisl48hjq7x9rvfc08h4kd5mcmay";
+       sha256 = "5e55564b9b0422c0dccea91f2c212254c7e798e77ae85708352303459b4cdbd4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -49911,7 +50072,7 @@ self: {
      mkDerivation {
        pname = "fast-tagsoup";
        version = "1.0.7";
-       sha256 = "089karddj08z0lfr83r2x070j67i2s0aq2s1qi5i66vw335y91d8";
+       sha256 = "a885e4cb187c1b134bc4410bac8016f118090ee8220f941d051f01d95a563321";
        libraryHaskellDepends = [ base bytestring tagsoup text text-icu ];
        homepage = "https://github.com/vshabanov/fast-tagsoup";
        description = "Fast parser for tagsoup package";
@@ -49923,7 +50084,7 @@ self: {
      mkDerivation {
        pname = "fast-tagsoup-utf8-only";
        version = "1.0.5";
-       sha256 = "10svhgjvp1802jawr1s5chkincl2xhh6k0grm60f216jpasbvff4";
+       sha256 = "c4b9bdb4bad204e180a9f9816920ec82321b27644587cc95140085bbe5835b83";
        libraryHaskellDepends = [ base bytestring tagsoup text ];
        homepage = "https://github.com/exbb2/fast-tagsoup";
        description = "Fast parser for tagsoup package";
@@ -49937,7 +50098,7 @@ self: {
      mkDerivation {
        pname = "fasta";
        version = "0.7.2.1";
-       sha256 = "1jwx8h3z3zlrnandqgmgrkam4y0awm3k1mfzljf7pn9acq6nxhs4";
+       sha256 = "44c36e0d662ad97b9ca4dfd53047e50a7852d5ccaf3edcacb299fef107449dcb";
        libraryHaskellDepends = [
          base bytestring containers foldl lens parsec pipes pipes-bytestring
          pipes-group pipes-text split text
@@ -49953,7 +50114,7 @@ self: {
      mkDerivation {
        pname = "fastbayes";
        version = "0.2.0.0";
-       sha256 = "1nqrfrhw8gd3blfzrwbf7pm4wwqbxfaw640bzx62kwh7x2h6v3cm";
+       sha256 = "958d6da0e807f2294cff0b10c395eb0b734eea3d6ef1fc1d5da33dc4617619db";
        libraryHaskellDepends = [ base hmatrix vector ];
        jailbreak = true;
        homepage = "https://github.com/cscherrer/fastbayes";
@@ -49966,7 +50127,7 @@ self: {
      mkDerivation {
        pname = "fastcgi";
        version = "3001.0.2.4";
-       sha256 = "0lp17w098043xczwkah7h1x47wzrym7vv5adgla0aq9iybqay7xr";
+       sha256 = "b91faff0f2316105147d4d95bd4ff5f9f3437a8007aac93feb830094003fe152";
        revision = "1";
        editedCabalFile = "74cd87692a90492171802f25c034ef047f0b68aaa1b53303d4e50ce3ec30e98a";
        libraryHaskellDepends = [ base bytestring cgi ];
@@ -49983,7 +50144,7 @@ self: {
      mkDerivation {
        pname = "fastedit";
        version = "0.1.0.0";
-       sha256 = "0ax5wnbf75n39crd9bw0xf3g83zlh29pbhwapbc5q7315rjdfxfj";
+       sha256 = "d275d7642e611c5cd8ba8ac3759380f40ff486eb80afd4324bc396e396e5a52b";
        libraryHaskellDepends = [
          base base-prelude bytestring containers hashable safe
          unordered-containers
@@ -50004,7 +50165,7 @@ self: {
      mkDerivation {
        pname = "fastirc";
        version = "0.2.0";
-       sha256 = "0ddacpw19kh304j8js9ybwclkgyh8n5yy1r2xh48z9h3gas2zim4";
+       sha256 = "a4c62fb47a03a68f08ec2207ef8b45d0bf49195f3e6989240103ce14f865aa35";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-show containers monadLib
          network-fancy
@@ -50019,7 +50180,7 @@ self: {
      mkDerivation {
        pname = "fault-tree";
        version = "0.0.0";
-       sha256 = "04m6hfj0sqhmq89fwfq4igz1rc0p3rzkhfg6fzsw5kyda2c8bbz0";
+       sha256 = "e0af859850cdcfc2f577e639387f1e17b01cfe8b043bee12c215620da483a612";
        libraryHaskellDepends = [ base yices ];
        homepage = "http://tomahawkins.org";
        description = "A fault tree analysis library";
@@ -50038,7 +50199,7 @@ self: {
      mkDerivation {
        pname = "fay";
        version = "0.23.1.8";
-       sha256 = "1772gdqka5hcgs2bq76bba9pca5xx32q3fg9vvkjqd5249rk5gv6";
+       sha256 = "66bf327322a2342ce7dee9b981c5e8bd2876935acb1cbc847e0c1635717be29c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50059,7 +50220,7 @@ self: {
      mkDerivation {
        pname = "fay-base";
        version = "0.20.0.1";
-       sha256 = "17mfblr40jhn93vz6vn0n0xsk4lwf5d5cavfy5zy8sg4inp6dkjr";
+       sha256 = "59ce66ae8de469e47ff16e2b565a719c92a93bb0c06ef3f748164a40325dae9e";
        libraryHaskellDepends = [ base fay ];
        homepage = "https://github.com/faylang/fay/";
        description = "The base package for Fay";
@@ -50073,7 +50234,7 @@ self: {
      mkDerivation {
        pname = "fay-builder";
        version = "0.2.0.5";
-       sha256 = "18ii5dnzk866q79h43fspdz8dzg17mzfrykh3pl4p0q4qdnylv8i";
+       sha256 = "116dea6dc304834be81d70faec7e3de1fd867ebbda0d02d3c1c6a0f96d2b31a2";
        libraryHaskellDepends = [
          base Cabal data-default directory fay filepath safe split text
        ];
@@ -50086,7 +50247,7 @@ self: {
      mkDerivation {
        pname = "fay-dom";
        version = "0.5.0.1";
-       sha256 = "1zm6w6nccswaksr283alhnsss6xw4k7s61yp8ff4lg5127ff9wp0";
+       sha256 = "e0f2e4dc11a13c4a9c43d707a3cf24bc1badb585540d24b29e8a6bc6ace1a6fe";
        libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/faylang/fay-dom";
        description = "DOM FFI wrapper library for Fay";
@@ -50098,7 +50259,7 @@ self: {
      mkDerivation {
        pname = "fay-geoposition";
        version = "0.1.0.1";
-       sha256 = "1qmkwfqgvj6a8fan1l3i18ggpl00vrfd2mhqj13g0gh9yhvgxv1q";
+       sha256 = "38ecfe36f4093ef046901856d15cde00d0fb1e0a71d0609543cac8fdb0e3b3e2";
        libraryHaskellDepends = [ fay-base fay-text ];
        homepage = "https://github.com/victoredwardocallaghan/fay-geoposition";
        description = "W3C compliant implementation of GeoPosition API";
@@ -50110,7 +50271,7 @@ self: {
      mkDerivation {
        pname = "fay-hsx";
        version = "0.2.0";
-       sha256 = "1mzjna8yc7jczgggpcgh9i6akiy72d60jczvmzxngh778z3g5zmi";
+       sha256 = "b1fef2c647e7c067fbaffb33094c13c7c7a94c4cf0b1fbdefb4c1ee691b2f2d7";
        libraryHaskellDepends = [ fay-base fay-jquery ];
        jailbreak = true;
        homepage = "http://www.happstack.com/";
@@ -50124,7 +50285,7 @@ self: {
      mkDerivation {
        pname = "fay-jquery";
        version = "0.6.0.3";
-       sha256 = "1x6i8y6xbz4nyzw59j3cqkhmjvgx9l4vdyh7jr0l1vv396ssnghf";
+       sha256 = "0e3eabb54963ef40419607fab6094dfd6d59e1c46cc854f8f796fcd58d47d1f4";
        libraryHaskellDepends = [ fay-base fay-text ];
        homepage = "https://github.com/faylang/fay-jquery";
        description = "jQuery bindings for Fay";
@@ -50136,7 +50297,7 @@ self: {
      mkDerivation {
        pname = "fay-ref";
        version = "0.1.0.0";
-       sha256 = "1dcifraih13zqwmm4xn57wfg63rdkiac81avyymid308r6p1x9cn";
+       sha256 = "96a51eaec9088c16abf75b05c4549c2d0ff31c3fc576522bc77f0418557691b5";
        libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/A1kmm/fay-ref";
        description = "Like IORef but for Fay";
@@ -50148,7 +50309,7 @@ self: {
      mkDerivation {
        pname = "fay-text";
        version = "0.3.2.2";
-       sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans";
+       sha256 = "da2a75e803d6d41249f49fa7dd420bc984faaff5e44f697056c93336bf443be0";
        libraryHaskellDepends = [ fay fay-base text ];
        homepage = "https://github.com/faylang/fay-text";
        description = "Fay Text type represented as JavaScript strings";
@@ -50160,7 +50321,7 @@ self: {
      mkDerivation {
        pname = "fay-uri";
        version = "0.2.0.0";
-       sha256 = "1vv4jgkz9cx8inbn6g6sn3a0nf1ak81qlj5li21sk2isj0yws1nr";
+       sha256 = "d906cd3d903a8aa98388b4488a039a2a380bd4b0da3c63978da8b3f4e79364ef";
        libraryHaskellDepends = [ fay-base ];
        homepage = "https://github.com/faylang/fay-uri";
        description = "Persistent FFI bindings for using jsUri in Fay";
@@ -50178,7 +50339,7 @@ self: {
      mkDerivation {
        pname = "fb";
        version = "1.0.11";
-       sha256 = "19kvsc6ap56b3h1z6wnjqmxgnqs7jqlhd3zx08h6nxkip3ddnzh5";
+       sha256 = "057edbdab871766b2002fd8f0629964763fb7ac5d272f3031ccb94ab0cd37ba6";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring cereal conduit conduit-extra crypto-api cryptohash
@@ -50202,7 +50363,7 @@ self: {
      mkDerivation {
        pname = "fb-persistent";
        version = "0.3.5";
-       sha256 = "0idxwm4brbn73s8azxsys6lxg9c4vzs0b123h9lg4qs4ks5451hh";
+       sha256 = "1086428a9e4463f26882438405f4df84a5d7a9d15ef7af901ec7aebc48e5bd45";
        libraryHaskellDepends = [ base cereal fb persistent text time ];
        homepage = "https://github.com/prowdsponsor/fb-persistent";
        description = "Provides Persistent instances to Facebook types";
@@ -50216,7 +50377,7 @@ self: {
      mkDerivation {
        pname = "fca";
        version = "0.1.0.2";
-       sha256 = "1c38524r3mhy4m7s1cvfcn539xvf50x0z8a9fzk4x4pz5yq9c1vp";
+       sha256 = "770796b02fff924ee67749a10f3a286ef7348a656eb3a04f251ed691892868b0";
        libraryHaskellDepends = [
          base bytestring containers cryptohash hashable text
          unordered-containers
@@ -50233,7 +50394,7 @@ self: {
      mkDerivation {
        pname = "fcd";
        version = "1.0.0.0";
-       sha256 = "1z3vphn3vgvsq0mshhvsks03v79wnj9g6r8mmrwkiax126aqzqn6";
+       sha256 = "c6e28f9511a1ab3879ae1565f392b43c9d3d809e7a43a82bc07abf3d2cbc7bfc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50252,7 +50413,7 @@ self: {
      mkDerivation {
        pname = "fckeditor";
        version = "0.1";
-       sha256 = "1yvsnk9awik143jh2268w1l5x70kmky60gac10fy2y1450dcn65x";
+       sha256 = "bd18cb1a282478e11d084c3d60fcac139c5e68e0c80801e5206146aed2b47afb";
        libraryHaskellDepends = [ base cgi HaXml xhtml ];
        jailbreak = true;
        homepage = "http://peteg.org/";
@@ -50267,7 +50428,7 @@ self: {
      mkDerivation {
        pname = "fclabels";
        version = "2.0.2.2";
-       sha256 = "0jvmmmky2h4i6lh0zj67j8rf1r1r1plv1s9y67jbs821266ffra8";
+       sha256 = "4865e78c114120bde4313ee9b0e90d39e4e03292c7c80f20359140e167ad754b";
        libraryHaskellDepends = [ base mtl template-haskell transformers ];
        testHaskellDepends = [
          base HUnit mtl template-haskell transformers
@@ -50282,7 +50443,7 @@ self: {
      mkDerivation {
        pname = "fclabels-monadlib";
        version = "0.2.1";
-       sha256 = "1j15fxrpwnjnbjkswsy6jxn8f0bj2nhcdsf5976i7rka7gsjzr3d";
+       sha256 = "6de42ff53b6ae613cd49c5e9c6a0157201876c97c66baea75c565a7e737725c8";
        libraryHaskellDepends = [ base fclabels monadLib ];
        jailbreak = true;
        description = "MonadLib monadic interface for the \"fclabels\" package";
@@ -50294,7 +50455,7 @@ self: {
      mkDerivation {
        pname = "fdo-notify";
        version = "0.3.1";
-       sha256 = "1n4zk1i7g34w0wk5zy8n4r63xbglxf62h8j78kv5fc2yn95l30vh";
+       sha256 = "7083414bb25e3057f6444722288cebf4ad3e4c2616f95f26079c8c7762989fd8";
        libraryHaskellDepends = [ base containers dbus ];
        homepage = "http://bitbucket.org/taejo/fdo-notify/";
        description = "Desktop Notifications client";
@@ -50308,7 +50469,7 @@ self: {
      mkDerivation {
        pname = "fdo-trash";
        version = "0.0.0.2";
-       sha256 = "04y29wmndyvrlrixj57m7jgx3z8qld0nvlggmg0rvia4p2dv82bk";
+       sha256 = "7309b49bb844c59dc1abefd16d41a318fdd19f3cf514d963a679fb662b4fc213";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50328,7 +50489,7 @@ self: {
      mkDerivation {
        pname = "feature-flags";
        version = "0.1.0.1";
-       sha256 = "1lssjgksq0k2dd7l5lmzxnr9f5zk3gbh386zfmcqgc4iczdzfk0f";
+       sha256 = "0e4cf7db6791b0875975dfa001d71bf31797b2edbfd2424f6b6202ace7935ad3";
        libraryHaskellDepends = [ base text ];
        homepage = "https://github.com/iand675/feature-flags";
        description = "A simple library for dynamically enabling and disabling functionality";
@@ -50340,7 +50501,7 @@ self: {
      mkDerivation {
        pname = "fec";
        version = "0.1.1";
-       sha256 = "04ryd1c06l45af6627vjvprhs0rk1rwl0k9gq0byr95ghvc6mk6d";
+       sha256 = "cdcc6ad886afa4ec17c02f4d40790e33030df3dd721f618c5385500358683e13";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://allmydata.org/source/zfec";
        description = "Forward error correction of ByteStrings";
@@ -50354,7 +50515,7 @@ self: {
      mkDerivation {
        pname = "fedora-packages";
        version = "0.0.3";
-       sha256 = "14fpv76ndp755mysgbya2hgr35rg2hb6dsagmrq2j2mn06xmngqk";
+       sha256 = "133f5bbb01b60a2970ae4fe96616142f97911f14caafa77d2de5dc66cdd9d791";
        revision = "1";
        editedCabalFile = "b09d857e6d91527f8c9fbb8626e1610c5c7b994a6fcf30cd3328c668a6e8d33a";
        libraryHaskellDepends = [
@@ -50378,7 +50539,7 @@ self: {
      mkDerivation {
        pname = "feed";
        version = "0.3.9.7";
-       sha256 = "01ssy7a1525cw72igpk1xksyafs7can68gmb81kvlzw8fddl4s0l";
+       sha256 = "1468425b73887fba6740ab3e64ac62473be5f5ec61de17c5e1ac8812d4f15a07";
        libraryHaskellDepends = [
          base old-locale old-time time time-locale-compat utf8-string xml
        ];
@@ -50398,7 +50559,7 @@ self: {
      mkDerivation {
        pname = "feed-cli";
        version = "2009.7.5";
-       sha256 = "0gql641jmbldx6vhk37i2v41j2nq22lrihm48f97wirrxw7yjn61";
+       sha256 = "c158e90fef39477e9243a4c298a910d80a19c816f18c09b7e98dae2a0331143f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -50418,7 +50579,7 @@ self: {
      mkDerivation {
        pname = "feed-crawl";
        version = "0.1.2.0";
-       sha256 = "0d3yfkiazzlypp3s85fqikwlli28ss27h0i215114vxsswmx1g7c";
+       sha256 = "ecbcd02bd7ba6f12420922027884d648444af98cd815a4c7bd9efeafe2747e34";
        libraryHaskellDepends = [
          base bytestring conduit connection http-conduit http-types hxt
          network-uri text transformers
@@ -50436,7 +50597,7 @@ self: {
      mkDerivation {
        pname = "feed2lj";
        version = "0.0.3.1";
-       sha256 = "0ym4f6d8fxl6j9kfqmp3ds36qj35nypxjmmqv6w96yz5y8ia3ynv";
+       sha256 = "dbfaa122f2e57b93b8d9b856d9afb765486c866ee356ec66928676879a71a47a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -50454,7 +50615,7 @@ self: {
      mkDerivation {
        pname = "feed2twitter";
        version = "0.2.0";
-       sha256 = "1zhl7f5zlyv0l5h0zay66p532n1vywnirwxbc1c9fjaia7yv0rij";
+       sha256 = "3266b0fd515149975860abf31c2df73b5831ca35c6ab0f60a1607bfa8b3b14fe";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50476,7 +50637,7 @@ self: {
      mkDerivation {
        pname = "feldspar-compiler";
        version = "0.7";
-       sha256 = "0kkxjnbx4yn3k2s1gdxg4jj06fhdd2jprq8s4zyaybs8xcddgvhh";
+       sha256 = "10eed71aeb482faffc271ae17ca5680d3a03a424afb717b498c37ad297957d4e";
        libraryHaskellDepends = [
          base Cabal containers data-default directory feldspar-language
          filepath ghc-paths mtl plugins plugins-multistage pretty process
@@ -50503,7 +50664,7 @@ self: {
      mkDerivation {
        pname = "feldspar-language";
        version = "0.7";
-       sha256 = "0gzs2qdvpzcx4w89wpmwk2jnambvyl08afpk16989vcviq5ri51n";
+       sha256 = "3694980b8e9bed849209f33a8500f57b5565a598bc5e9e10279dfdbb1b16fa3f";
        libraryHaskellDepends = [
          array base containers data-default data-hash data-lens deepseq
          monad-par mtl patch-combinators QuickCheck random syntactic tagged
@@ -50528,7 +50689,7 @@ self: {
      mkDerivation {
        pname = "feldspar-signal";
        version = "0.0.1.0";
-       sha256 = "147y0fy5pzagk8pm8way8qnxv42mn5qh8kmzjf02laydzxrwvpxd";
+       sha256 = "addfcd73ffcd2b2a8093bf4e0471b15590dd2d465e71542f9a4ffd5bbc03fe90";
        libraryHaskellDepends = [
          base base-compat feldspar-compiler feldspar-compiler-shim
          feldspar-language imperative-edsl mainland-pretty monadic-edsl-priv
@@ -50547,7 +50708,7 @@ self: {
      mkDerivation {
        pname = "fen2s";
        version = "1.2";
-       sha256 = "01111rxpdd9pqpjs54krx4z67k3abjglw9zbvn5j97z9zdj5qr81";
+       sha256 = "01655c64fbe99f248bddeb274e9f5c6acc633ee97992a2e5c537b5767b0e2104";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50568,7 +50729,7 @@ self: {
      mkDerivation {
        pname = "fences";
        version = "0.1.1";
-       sha256 = "16qzqczr6nlbng16vby1c12a0apfjm4lmm0pgybi5xaziaq4c4db";
+       sha256 = "ab1146b08a5ff512977f17d44a4995ee2aa04460c1af6dc2b38b5a933fc31f9b";
        libraryHaskellDepends = [ base ];
        description = "To be written";
        license = stdenv.lib.licenses.gpl3;
@@ -50582,7 +50743,7 @@ self: {
      mkDerivation {
        pname = "fenfire";
        version = "0.1";
-       sha256 = "0sq4g0sdayk1lqzdhggwshl22gny5cjbv70cmr1p27q0wfwfbfff";
+       sha256 = "ceb9e5b8e3001f7143ae0c9cbd242bde3e2128d4fc3dd83ea6617ad53478046b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -50600,7 +50761,7 @@ self: {
      mkDerivation {
        pname = "fez-conf";
        version = "1.0.3";
-       sha256 = "1gssbkwg9lqm3ajqkkcjnxjz8nhz855ki2hi5n2di3dappr73f0b";
+       sha256 = "0bb871f2bdaa8dd8842d118a384b411f5af465b792cd89a51a15d3f4f85c5abf";
        libraryHaskellDepends = [ base containers regex-compat ];
        homepage = "http://ui3.info/d/proj/fez-conf.html";
        description = "Simple functions for loading config files";
@@ -50612,7 +50773,7 @@ self: {
      mkDerivation {
        pname = "ffeed";
        version = "0.3.2";
-       sha256 = "1976v5m050lwp8v2vh1cm08pn6q9lbdkxhq10pql6fyzysn6qz62";
+       sha256 = "c27c6cacf6df3b43f10501c33edba2091b7b11a82cc02d36ba9c82026ad9e6a4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base HTTP json network utf8-string ];
@@ -50631,7 +50792,7 @@ self: {
      mkDerivation {
        pname = "fficxx";
        version = "0.2.1";
-       sha256 = "1vjkwp0krs2762ww7vkl1g0dpaw6ifba7acjndmqbnvm3yl0ha0d";
+       sha256 = "0d2808a81f75db856bb392a9a3968b86abdbc00b74eec3b93047e83cc1e553ee";
        libraryHaskellDepends = [
          base bytestring Cabal containers data-default directory either
          errors filepath hashable HStringTemplate lens mtl process pureMD5
@@ -50646,7 +50807,7 @@ self: {
      mkDerivation {
        pname = "fficxx-runtime";
        version = "0.2.1";
-       sha256 = "0hcpc0db4mh3yx8yzbkllq9b04dd1qvr63ppz2qa9nq5zydb5pxk";
+       sha256 = "b3dfb29aff05dba4b0f8f70e93370ead11b012a674aeef51f70356b21a609741";
        libraryHaskellDepends = [ base ];
        description = "Runtime for fficxx-generated library";
        license = stdenv.lib.licenses.bsd3;
@@ -50659,7 +50820,7 @@ self: {
      mkDerivation {
        pname = "ffmpeg-light";
        version = "0.8.2";
-       sha256 = "13pkdsjsw1h6gscpp2jwly1w81jj3rpb27ssa0w7gi2qhjcg1inw";
+       sha256 = "dcc6f0988458c47738505a1fb16e1e5206c483a75c8a7b997e0606aea56ef38e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50682,7 +50843,7 @@ self: {
      mkDerivation {
        pname = "ffmpeg-tutorials";
        version = "0.3.3";
-       sha256 = "134czpbzxw0mpnc5mz6j1l6vavdbhw5w3l4lg5zbc2gq1qg9ikqv";
+       sha256 = "1bcf981e0ef809b67e7994d0c10b87ab6db50d0dd2fc5a98bd15f0fed7fd8c8c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -50702,7 +50863,7 @@ self: {
      mkDerivation {
        pname = "fft";
        version = "0.1.8.1";
-       sha256 = "00q1j6swi5y740n5dnbc73aw1nphsgyx7qnv59snqd48fcllhcww";
+       sha256 = "9c3348297388346c752adbe2d3fdd3f0dac0d5386cd9562c20c797c8b5910103";
        libraryHaskellDepends = [
          array base carray ix-shapable storable-complex syb
        ];
@@ -50718,7 +50879,7 @@ self: {
      mkDerivation {
        pname = "fftwRaw";
        version = "0.1.0.0";
-       sha256 = "1dkkn72g4arjamv647ba05j7aj95vvjy2wdd6g9xcc5w2ix45kr4";
+       sha256 = "24cf427a14bc30d6d333ad71e1e5de25497564016a1d627655322bf2c4b173b6";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fftw ];
        homepage = "https://github.com/adamwalker/haskell-fftw-simple";
@@ -50733,7 +50894,7 @@ self: {
      mkDerivation {
        pname = "fgl";
        version = "5.5.2.1";
-       sha256 = "1nfm3gkr6cccqhi1g46k2d0l99yw2vq7xjd1hxxzcci5gidp8bhc";
+       sha256 = "0c2e745b7c2532f67b87a1c97ef016dca7444113d3901722c48c3193e71bd5d9";
        libraryHaskellDepends = [
          array base containers deepseq transformers
        ];
@@ -50747,7 +50908,7 @@ self: {
      mkDerivation {
        pname = "fgl-arbitrary";
        version = "0.2.0.0";
-       sha256 = "1116c4r1ick3xjhwwq9b6i1082njmxj2aymgkqppabj3d0hv43c4";
+       sha256 = "840db22168432e752f9eaf7a2564afd20a0442342b61cea1ec63b21832612684";
        libraryHaskellDepends = [ base fgl QuickCheck ];
        testHaskellDepends = [ base containers fgl hspec QuickCheck ];
        description = "QuickCheck support for fgl";
@@ -50759,7 +50920,7 @@ self: {
      mkDerivation {
        pname = "fgl-extras-decompositions";
        version = "0.1.1.0";
-       sha256 = "0p9dv7hq312wjqzm2ha4rafnmd1vplzwd5vk5fmzypgl2a1cz42s";
+       sha256 = "5a90cf8212f45dffab2b7397c63fbd3bb46a9dca4441513f965c8481e1d92d5d";
        libraryHaskellDepends = [ base containers fgl ];
        homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "Graph decomposition algorithms";
@@ -50771,7 +50932,7 @@ self: {
      mkDerivation {
        pname = "fgl-visualize";
        version = "0.1.0.1";
-       sha256 = "0vwafx0rggksg5i7cx4r2bs5wa6csb5p39vpix425zr3l6vggrxq";
+       sha256 = "b8e7f7b6a123ff22488f77a771cbd2cc285ef41299747662797abe9741778a6f";
        libraryHaskellDepends = [ base dotgen fgl ];
        description = "Convert FGL graphs to dot (graphviz) files";
        license = stdenv.lib.licenses.bsd3;
@@ -50786,7 +50947,7 @@ self: {
      mkDerivation {
        pname = "fibon";
        version = "0.2.0";
-       sha256 = "1jkawf65gdmyzmdw4xfk3jihahi3x7vsavjfy6rnl96bj15q4vzl";
+       sha256 = "f46f824b90cb246ab3f14e6ea5f7e9234205a31cd375c25bfdbeb6578ce36aca";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -50806,7 +50967,7 @@ self: {
      mkDerivation {
        pname = "fibonacci";
        version = "0.2.0.1";
-       sha256 = "18jqb4ynjsnpvydzpqzh7l5wyrjb3s3kxgc6a6ipwb6w2hygyf7k";
+       sha256 = "f338ff3c14dc2c7ea35186bd3e871e4b66cf0b3df0e3fb9bdfd76a693d5958a2";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/sebfisch/fibonacci";
        description = "Fast computation of Fibonacci numbers";
@@ -50820,7 +50981,7 @@ self: {
      mkDerivation {
        pname = "fields";
        version = "0.1.0";
-       sha256 = "0xxri0a3y75ppywcm6py9zbffaawcycrv8gabflbl1m1z8n6jq6v";
+       sha256 = "db60692cfaa106baa85beaa19d99675c29e7d64ffe9acab8bfb71c3f1488b977";
        libraryHaskellDepends = [
          array base containers fclabels monads-fd transformers
        ];
@@ -50837,7 +50998,7 @@ self: {
      mkDerivation {
        pname = "fields-json";
        version = "0.2.2.3";
-       sha256 = "0wqci95ad339nd3lfbhc6v55c7zdkq714hw8igq5fwvbd8kq11d0";
+       sha256 = "a08580276a6b7357f08b8843120e9eed1f56ca360c2e4747b3698ca64a8a0c73";
        libraryHaskellDepends = [
          base base64-bytestring containers json mtl utf8-string
        ];
@@ -50850,7 +51011,7 @@ self: {
      mkDerivation {
        pname = "fieldwise";
        version = "0.1.0.0";
-       sha256 = "1mmlw5nk09w829gjp8lc0p280vdkh68rv05b1j55x99l7xywgvj7";
+       sha256 = "47eec77d3f34a55e8a0cab809d9181b36d80c4058ca22b5f128827306de1b4d6";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        jailbreak = true;
@@ -50864,7 +51025,7 @@ self: {
      mkDerivation {
        pname = "fig";
        version = "1.4.0";
-       sha256 = "03bxiicvfwia5g0whg454ph2s34n8firjcqhn6d7qvbim338hkxq";
+       sha256 = "b84f88c6a8716d7c9ab1103399a343960c2de025853cc8c12b2a72b7598c7d0d";
        libraryHaskellDepends = [ base containers parsec pretty ];
        homepage = "http://www.bergsoe.org/fig";
        description = "Manipulation of FIG files";
@@ -50876,7 +51037,7 @@ self: {
      mkDerivation {
        pname = "file-collection";
        version = "0.1.1.9";
-       sha256 = "06bcj143j85p8m519zn88z6qn4bg5ifrw5pv5yva5x49gc3jq6gc";
+       sha256 = "ec192c077b89f4a2b62ffb169e5d2c6f118bcd47c8fe144a45b7203948906c19";
        libraryHaskellDepends = [
          base bytestring clock directory zip-archive
        ];
@@ -50893,7 +51054,7 @@ self: {
      mkDerivation {
        pname = "file-command-qq";
        version = "0.1.0.5";
-       sha256 = "06bi4nnz1f3i79wza6bxbnglqzddpq3r4w581wdl3bq26b52d3ab";
+       sha256 = "4b8d26ca3202af411b0fa8709207bead7d4c9f5d7d19f5793a71b8f0ad257119";
        libraryHaskellDepends = [
          base parsec process system-filepath template-haskell text
        ];
@@ -50910,7 +51071,7 @@ self: {
      mkDerivation {
        pname = "file-embed";
        version = "0.0.8.2";
-       sha256 = "1gdxz9244wjhfigpsyaan81gyx6vanb8574xxi7944sj9pcgi74y";
+       sha256 = "9e9cf8d84d5213924eec9d9c829655db74ff02b24a797d5f7450724244fabdbd";
        libraryHaskellDepends = [
          base bytestring directory filepath template-haskell
        ];
@@ -50927,7 +51088,7 @@ self: {
      mkDerivation {
        pname = "file-location";
        version = "0.4.9";
-       sha256 = "1p0lz02pvlvq2781542ims3x5vcck35dw4g58bv16y96qarxwady";
+       sha256 = "be29deb3c2267913f642e511deca988cedd287ae519012d01178d37d05f814dc";
        libraryHaskellDepends = [
          base containers HUnit lifted-base template-haskell th-orphans
          transformers
@@ -50946,7 +51107,7 @@ self: {
      mkDerivation {
        pname = "filecache";
        version = "0.2.8";
-       sha256 = "0dkdjj29dqgdywzxc24l54v8xqxrqy65l43ig2qr3l381mqi87lf";
+       sha256 = "8e1e14710d68d091b17871105a8cc7b9e38e36299408d63ff7ede19684946d36";
        libraryHaskellDepends = [
          base exceptions hashable hinotify lens mtl stm strict-base-types
          unordered-containers
@@ -50967,7 +51128,7 @@ self: {
      mkDerivation {
        pname = "filediff";
        version = "2.0.0";
-       sha256 = "15a02dya0qhgxq98whxza268vqsrkw6b1ipdskw3hwnjp02hnc9p";
+       sha256 = "37310b05b8d27238f8d4edc6b00c9f59e38d8c50bf438e12ee0f62a07c134095";
        libraryHaskellDepends = [
          base bytestring data-default data-memocombinators directory either
          hashmap mtl rainbow tasty tasty-hunit text threads time
@@ -50987,7 +51148,7 @@ self: {
      mkDerivation {
        pname = "filelock";
        version = "0.1.0.1";
-       sha256 = "0qypjnbkfayqyaymx8qrq4abddlrlzanf6lqhfn9cqzcgzr6735d";
+       sha256 = "ad8c63f27fec6396ac83981a67d5a799b6b614c119a35ebdf2d82b379795d763";
        libraryHaskellDepends = [ base unix ];
        homepage = "http://github.com/takano-akio/filelock";
        description = "Portable interface to file locking (flock / LockFileEx)";
@@ -51001,7 +51162,7 @@ self: {
      mkDerivation {
        pname = "filemanip";
        version = "0.3.6.3";
-       sha256 = "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8";
+       sha256 = "8836da17baaaf02ca080c9990ece4e0b0c8d6a128f458f8b64fd07b225ca9846";
        libraryHaskellDepends = [
          base bytestring directory filepath mtl unix-compat
        ];
@@ -51015,7 +51176,7 @@ self: {
      mkDerivation {
        pname = "filepath";
        version = "1.4.0.0";
-       sha256 = "0a5hhgfxh91clkk6c9iipdd0y3wb9y6lx2hhraaaa73b8y83afx4";
+       sha256 = "a43b3590476b1ca594ca108a4e8d4f8b0f0f5abb312666e6a42c24d8dd83b028";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
@@ -51029,7 +51190,7 @@ self: {
      mkDerivation {
        pname = "filepath-io-access";
        version = "0.1.0.0";
-       sha256 = "08rb2nafnh5vx7i6i3ddhq4h1s2ffgz8ailap5knr1xl7izgyywp";
+       sha256 = "977bff7e3cb4876c67b98a4685fe734ee8000986ad8d68e2e9bb40eb94152b23";
        libraryHaskellDepends = [ base base-io-access filepath ];
        jailbreak = true;
        description = "IO Access for filepath";
@@ -51043,7 +51204,7 @@ self: {
      mkDerivation {
        pname = "filepather";
        version = "0.3.0";
-       sha256 = "1gqnanmnhrpdw5iryf757qwj7j9izyzx1j4y74ydivxafz8w469v";
+       sha256 = "3b19c2d177aaefd83c399ec8d0bfff31c923393ee5389f63e1ed6668ab5516bf";
        libraryHaskellDepends = [
          base comonad comonad-transformers data-lens directory filepath mtl
          transformers
@@ -51061,7 +51222,7 @@ self: {
      mkDerivation {
        pname = "filestore";
        version = "0.6.1";
-       sha256 = "0mfllnnb1mqix1v65fyhd9jsvnrjbawd6l4h4012jk8401zwj280";
+       sha256 = "0009c97f00044d2902209050d3b85a32dbad656ad0bb6276e811d7b0aca5d455";
        libraryHaskellDepends = [
          base bytestring containers Diff directory filepath old-locale
          parsec process split time utf8-string xml
@@ -51081,7 +51242,7 @@ self: {
      mkDerivation {
        pname = "filesystem-conduit";
        version = "1.0.0.2";
-       sha256 = "05dsl3bgyjciq6sgmba0hki7imilrjq3ddp9ip5gxl9884j1f4a1";
+       sha256 = "411117244128d1feca8de9b636b0cc34d678e28440adfab4c19149ffd6a0ba15";
        libraryHaskellDepends = [
          base bytestring conduit containers system-fileio system-filepath
          text transformers unix
@@ -51104,7 +51265,7 @@ self: {
      mkDerivation {
        pname = "filesystem-enumerator";
        version = "0.1.1";
-       sha256 = "04cs5kz390g5qanwqps5kx1pd70b9vzaykn4c0yc0kxi16xlxyrc";
+       sha256 = "2cfb4ebb09b14fc03c60c44eaffe4e0b9c76439f455fccadc2e58134fe2c9a11";
        libraryHaskellDepends = [
          base enumerator system-fileio system-filepath transformers unix
        ];
@@ -51121,7 +51282,7 @@ self: {
      mkDerivation {
        pname = "filesystem-trees";
        version = "0.1.0.6";
-       sha256 = "1bnxhf9ppqwgcnpcanxj6ji8yi1i0pspzhjh3p3zyf57d7y6p8sh";
+       sha256 = "50a36bfc69a738ffc71d50c27ff50531448fa234b25bc5ae658fe37b9383ddae";
        libraryHaskellDepends = [
          base cond containers data-lens-light deepseq directory dlist
          filepath mtl unix
@@ -51136,7 +51297,7 @@ self: {
      mkDerivation {
        pname = "filtrable";
        version = "0.1.0.2";
-       sha256 = "0dfw08pqw4wlja1iavb8zz0rkr97hd7fg1v2akng8n7shmjhgbl5";
+       sha256 = "85ae076585fa58f4ec546287e74e8327e599c1ff686d15839294138e2f02dc35";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/strake/filtrable.hs";
        description = "Class of filtrable containers";
@@ -51148,7 +51309,7 @@ self: {
      mkDerivation {
        pname = "final";
        version = "0.1";
-       sha256 = "189vby5ym6hcjpz6y9chlgkyzl8wnndqkhzk7s7qy8mksr3g66f9";
+       sha256 = "c919f346d6b3228f8f3ef3c3899bb51cd1efe7a390256ffe950c9aea8b5f3ba1";
        libraryHaskellDepends = [ base stm transformers ];
        homepage = "http://github.com/errge/final";
        description = "utility to add extra safety to monadic returns";
@@ -51165,7 +51326,7 @@ self: {
      mkDerivation {
        pname = "find-conduit";
        version = "0.4.4";
-       sha256 = "15p1aj8lckmvnrq8a8wz6sbs0d2qbcjgachf5sgpf2lv57hzxksz";
+       sha256 = "5fcffee1299b0a779f2e0e32f5245b5834a097369f238570b6bb4e469154e196";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -51197,7 +51358,7 @@ self: {
      mkDerivation {
        pname = "fingertree";
        version = "0.1.1.0";
-       sha256 = "1w6x3kp3by5yjmam6wlrf9vap5l5rrqaip0djbrdp0fpf2imn30n";
+       sha256 = "160c5ba370d781dbf2920ddca870ce8596ab76729972535595bef835ee1cddf0";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -51212,7 +51373,7 @@ self: {
      mkDerivation {
        pname = "fingertree-psqueue";
        version = "0.3";
-       sha256 = "14kc0ijx44q7whniickjj3h9ag1pixn51dlxjs6n2ypaclcjz34z";
+       sha256 = "9f8c2f1965ea7a618d969db6506c8f373c95e09072b2182de40713d265046c92";
        libraryHaskellDepends = [ base fingertree ];
        description = "Implementation of priority search queues as finger trees";
        license = stdenv.lib.licenses.bsd3;
@@ -51223,7 +51384,7 @@ self: {
      mkDerivation {
        pname = "fingertree-tf";
        version = "0.1.0.0";
-       sha256 = "1ja8cqxpqhvssbcywph3zna946g1li5hlzsqab9lhg6vw0baakdn";
+       sha256 = "b64da516e0db3c48d352587f0a4ba4e1199294fd035eeed9d27a437c3b6648c9";
        libraryHaskellDepends = [ base ];
        description = "Generic finger-tree structure using type families";
        license = stdenv.lib.licenses.bsd3;
@@ -51238,7 +51399,7 @@ self: {
      mkDerivation {
        pname = "finite-field";
        version = "0.8.0";
-       sha256 = "0wlbq7dpb4545xdnqjqppp0cmjx9m8g1p6lydkvn7pj7dwar8lni";
+       sha256 = "d15294156f47de63f76c9e9a1b1eaaa9cbcac0bd174b6c5b2fa49075dbc18b72";
        libraryHaskellDepends = [
          base deepseq hashable template-haskell type-level-numbers
        ];
@@ -51256,7 +51417,7 @@ self: {
      mkDerivation {
        pname = "first-class-patterns";
        version = "0.3.2.2";
-       sha256 = "0da7mayn8lcizwjv06rafkgrsj257fhkj5xsxk7nx00n3aazzr68";
+       sha256 = "c8e4ff951a16806ecfecba1739a13b45489ddf742a1bb025ff915164bdaa4735";
        libraryHaskellDepends = [ base transformers ];
        homepage = "https://github.com/reinerp/first-class-patterns";
        description = "First class patterns and pattern matching, using type families";
@@ -51270,7 +51431,7 @@ self: {
      mkDerivation {
        pname = "firstify";
        version = "0.1";
-       sha256 = "1g851dgsxq9gfbsx4qas9vm844ay3g5vhfd1493fgpay0j7i5fnd";
+       sha256 = "cdba128f045edde74622a139b8cb1b5e1182ea4e5a61d2f5722fe1ae5f0b05bd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -51289,7 +51450,7 @@ self: {
      mkDerivation {
        pname = "fishfood";
        version = "0.0.1.3";
-       sha256 = "0bmp24mgg9y7ysnb1rig26cwgz1l40ca1fckzxh0yly0j9if062k";
+       sha256 = "5318e06292c0530f60ff93b9a0182034fcc799112fe6b0acf6c7a7f72a11b72e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -51307,7 +51468,7 @@ self: {
      mkDerivation {
        pname = "fit";
        version = "0.5.1";
-       sha256 = "0y7jvczi0ldzjw9y102z1k4nyj7z8f6p8w368x5v0m308d0jw6db";
+       sha256 = "ab192e41436054b04b476670748d43ff486fc90c5f80e01397bf51103fdbf278";
        libraryHaskellDepends = [
          attoparsec base bytestring containers contravariant mtl text
        ];
@@ -51325,7 +51486,7 @@ self: {
      mkDerivation {
        pname = "fitsio";
        version = "0.2";
-       sha256 = "07zsd05ncq8rnrswk4kzg97sam8czibw2nhlrqxg8q1a5canisag";
+       sha256 = "4fe968152b2a60f43ace145ac157fc0c55a54f7a7f92c975b61961660b68fa1f";
        libraryHaskellDepends = [ base filepath mtl ];
        librarySystemDepends = [ cfitsio ];
        homepage = "http://github.com/esessoms/fitsio";
@@ -51341,7 +51502,7 @@ self: {
      mkDerivation {
        pname = "fix-imports";
        version = "1.0.4";
-       sha256 = "0j8yqqf61f2m4zri844gp6k80vkfzk1rby2miv90niz3hbciknj6";
+       sha256 = "46da19d982e3470bd28e55f895c3fc6e6e80a6b98f1014f32755b8601cc61e49";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -51357,7 +51518,7 @@ self: {
      mkDerivation {
        pname = "fix-parser-simple";
        version = "15320.3";
-       sha256 = "0ls5fxwq2lnb0rjqih4isfwiv0603ga12gxnf7w3rpqp5qhrhas8";
+       sha256 = "482b98212e17df3cf871b63f11d41bc0801db9d391c0886506cb528179774553";
        libraryHaskellDepends = [ base mmtl ];
        description = "Simple fix-expression parser";
        license = "LGPL";
@@ -51369,7 +51530,7 @@ self: {
      mkDerivation {
        pname = "fix-symbols-gitit";
        version = "0.1.0";
-       sha256 = "01fxzhd2wqzp0paba64q5psfc4qvc4b8i88rdkn6mxlkm21gkp6y";
+       sha256 = "dedcf982a893f66aec6c19a18816611b13e6f42d9818b5d405f7632e1afcdd05";
        libraryHaskellDepends = [ base containers gitit ];
        description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols";
        license = stdenv.lib.licenses.bsd3;
@@ -51381,7 +51542,7 @@ self: {
      mkDerivation {
        pname = "fixed";
        version = "0.2.1.1";
-       sha256 = "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94";
+       sha256 = "24a9e1e251998c9d06037bb771d9eab2980a91132de59a19d0166a1c51e715e2";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/fixed";
        description = "Signed 15.16 precision fixed point arithmetic";
@@ -51393,7 +51554,7 @@ self: {
      mkDerivation {
        pname = "fixed-length";
        version = "0.1";
-       sha256 = "115j7bc6s45qn87hamy4w1ih247cxhyhrzaz244sw4qfkxypigkj";
+       sha256 = "72be787d9f0e13ae09115ffd0c3decec100163e0c457050fb2b8106dd83ab284";
        libraryHaskellDepends = [ base non-empty utility-ht ];
        homepage = "http://code.haskell.org/~thielema/fixed-length/";
        description = "Lists with statically known length based on non-empty package";
@@ -51405,7 +51566,7 @@ self: {
      mkDerivation {
        pname = "fixed-list";
        version = "0.1.6";
-       sha256 = "1gpv0p7xyzmrrq20irf0mpggnc0vm5hpq36j4vd1xlq6bplq1xmb";
+       sha256 = "abf680e95d06d31eda26d20c7c61a91b30fbdeadc0e50804ceb97edfcf05fbbe";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/jvranish/FixedList/tree/master";
        description = "A fixed length list type";
@@ -51417,7 +51578,7 @@ self: {
      mkDerivation {
        pname = "fixed-point";
        version = "0.5.0.1";
-       sha256 = "010gx32av4cn5bqq1zrrcah50ay528vw01fvv1xhfpkrx1ll9wka";
+       sha256 = "6af24469e8795e077bd8db05c03712c52b50a06239ff80f12a9691adc4e80f04";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Binary fixed-point arithmetic";
@@ -51430,7 +51591,7 @@ self: {
      mkDerivation {
        pname = "fixed-point-vector";
        version = "0.5.0.1";
-       sha256 = "029mn44d1i794b1pbpa0zmf6b20zl0cvsf77mbfdkqnyx8986883";
+       sha256 = "03218312eadee2d9dcaae738bd19a01f88655cfd40dd75c322e9c4d008b13509";
        libraryHaskellDepends = [ base fixed-point vector ];
        jailbreak = true;
        description = "Unbox instances for the fixed-point package";
@@ -51443,7 +51604,7 @@ self: {
      mkDerivation {
        pname = "fixed-point-vector-space";
        version = "0.5.0.1";
-       sha256 = "10b29gqy3rpwd5wf2b65p0llm8ksyp1p7k43rm1n5g5z67wkd7dx";
+       sha256 = "bd9d36f931bfbc6243cd83cc73c3f57aa24a29b8c52ce17869fce6e1f14b6281";
        libraryHaskellDepends = [ base fixed-point vector-space ];
        jailbreak = true;
        description = "vector-space instances for the fixed-point package";
@@ -51458,7 +51619,7 @@ self: {
      mkDerivation {
        pname = "fixed-precision";
        version = "0.4.0";
-       sha256 = "1akgiark8svzkqx764iic10qpfixm0js8vwga0134d81ppcp58f6";
+       sha256 = "c6a172d9bd01353202508f6fa425a83dba8b41603112733a9e7f6b34b38a6faa";
        libraryHaskellDepends = [
          base hmpfr integer-gmp reflection tagged template-haskell
        ];
@@ -51474,7 +51635,7 @@ self: {
      mkDerivation {
        pname = "fixed-storable-array";
        version = "0.3.1.1";
-       sha256 = "0vb5h2v2qx19d7xibf7ksv2cha2pngh49mfpkh43f9vrwc6042ph";
+       sha256 = "f00a020ce3792737089cd7d544e0b35728c8c4d6f3b815fb6929742cb680656d";
        libraryHaskellDepends = [ array base tagged ];
        jailbreak = true;
        description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead.";
@@ -51487,7 +51648,7 @@ self: {
      mkDerivation {
        pname = "fixed-vector";
        version = "0.8.0.0";
-       sha256 = "1hlg0rbi2phk7qr7nvjnazg344jqp5p13c3m8v5n01vw9bvjbnir";
+       sha256 = "39da25f74a7c0760cb4675b0116eb9581232de57566e7b323e135e1157068fc2";
        libraryHaskellDepends = [ base deepseq primitive ];
        testHaskellDepends = [ base doctest filemanip primitive ];
        jailbreak = true;
@@ -51502,7 +51663,7 @@ self: {
      mkDerivation {
        pname = "fixed-vector-binary";
        version = "0.6.0.0";
-       sha256 = "1yjyw9wc92laiwd9w8ng3456azicvf9a9wqk2v6liiksj3flw7hy";
+       sha256 = "1e1e4edd907ac648cd1613f3a492db2c7e650a19cf229e1a8f8a8ac478e25efa";
        libraryHaskellDepends = [ base binary fixed-vector ];
        testHaskellDepends = [
          base binary fixed-vector tasty tasty-quickcheck
@@ -51518,7 +51679,7 @@ self: {
      mkDerivation {
        pname = "fixed-vector-cereal";
        version = "0.6.0.0";
-       sha256 = "1kf3d0pfaif5fish1vc5z7d5ym23bwl80l8bg4bgpdw75cg2dnn6";
+       sha256 = "c6da261e2b87b7fb16790b5180285f43545fdaf985ed007574c545e52e68c3cd";
        libraryHaskellDepends = [ base cereal fixed-vector ];
        testHaskellDepends = [
          base cereal fixed-vector tasty tasty-quickcheck
@@ -51534,7 +51695,7 @@ self: {
      mkDerivation {
        pname = "fixed-vector-hetero";
        version = "0.3.1.0";
-       sha256 = "0x5fjggm0licrdd442pr1968zlzfb0ah4ib8s9yxcb2p6vc39lzv";
+       sha256 = "fbd334d836572cd67dd26845021558eed38f4c0af90a425acb2c5250df93ae74";
        libraryHaskellDepends = [
          base deepseq fixed-vector ghc-prim primitive transformers
        ];
@@ -51548,7 +51709,7 @@ self: {
      mkDerivation {
        pname = "fixedprec";
        version = "0.2.2.1";
-       sha256 = "0s921nhkmdglmcwzyr048r04dswc6hz7kvh9p4lvd8i2mxq0szgi";
+       sha256 = "f17d0d70af22a2b629b909ee793e348ceb4640460464ff39abf4b53aa10d2269";
        libraryHaskellDepends = [ base random ];
        description = "A fixed-precision real number type";
        license = stdenv.lib.licenses.bsd3;
@@ -51559,7 +51720,7 @@ self: {
      mkDerivation {
        pname = "fixedwidth-hs";
        version = "0.4.0.1";
-       sha256 = "0k4lidf95nb4a735331xdr77643b1yb15xllplxknbxxq9r2z3px";
+       sha256 = "fd8e2f72c2bd2f3b3bbd94f612960f6b10734e6e3d8c51c65164d9925c8b944c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson attoparsec base bytestring text ];
@@ -51579,7 +51740,7 @@ self: {
      mkDerivation {
        pname = "fixhs";
        version = "0.1.4";
-       sha256 = "0kxfx3k2d8xy75s7cln3l1hiia5vjcr6k5almbpys63dkr3svcz2";
+       sha256 = "e2b3ad479e6d18edefaa5495693293bba81861a0c352767439bea326e6e8ae4f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -51601,7 +51762,7 @@ self: {
      mkDerivation {
        pname = "fixplate";
        version = "0.1.5";
-       sha256 = "0mmkkydvdiw4nawgw3w7a9gpcxc3wzzlhz2083hqa6sxhx8x3b29";
+       sha256 = "49acd151875d1b85e140407c48ffe78375765f52870ffeb8b284c7b69b9fb356";
        libraryHaskellDepends = [ base containers ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Uniplate-style generic traversals for optionally annotated fixed-point types";
@@ -51614,7 +51775,7 @@ self: {
      mkDerivation {
        pname = "fixpoint";
        version = "0.1.1";
-       sha256 = "05h1cw1gpnwk1qjlia4l27j375cva8pp75fzn99w2rxsv6khszpb";
+       sha256 = "eb7e0da7d9ba67c153b2df95732f529b9533e41194a848250e93dbfb02670116";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.cse.unsw.edu.au/~rl/code/fixpoint.html";
        description = "Data types as fixpoints";
@@ -51626,7 +51787,7 @@ self: {
      mkDerivation {
        pname = "fixtime";
        version = "1.5.0.2";
-       sha256 = "1walxcyi1wrv28vgy318c88z3mprz6mc8qfhbjgxb156iwfv80w5";
+       sha256 = "8503b41d8fa684d59f5cd061c4aaf9f9d6f11162280cff36123bf3103deb54f1";
        libraryHaskellDepends = [ base time ];
        homepage = "https://github.com/pharpend/fixtime";
        description = "Some fixes to the time package";
@@ -51638,7 +51799,7 @@ self: {
      mkDerivation {
        pname = "fizz-buzz";
        version = "0.1.0.1";
-       sha256 = "169xaj7iczz0mnvd03pf95dcvy918jscpzap6z9y62kb0daskg4p";
+       sha256 = "97bca955036b0ae3d33757fdcbb44421f9cd5a49ee0ed0b6ade07f168f543d99";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Functional Fizz/Buzz";
@@ -51652,7 +51813,7 @@ self: {
      mkDerivation {
        pname = "flaccuraterip";
        version = "0.3.4";
-       sha256 = "0vx4fn1d8i2qh0q20vijhp7yc0zcvjdwk1v7f7ra0kbm4ygmi38h";
+       sha256 = "108d589f27754da0f2716787c99bdcec03e6cf85326e2030805844d48275a46f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -51668,7 +51829,7 @@ self: {
      mkDerivation {
        pname = "flamethrower";
        version = "0.0.5.1";
-       sha256 = "10kfy1cnp721hgz6lbc28y7hkjhbv6gpk2jff6nk2avrfbaqqd8x";
+       sha256 = "1d358cd572792b31ad714e8a799fd90bca098f47822d6afe83419c6b59f06e82";
        libraryHaskellDepends = [ base template-haskell text ];
        jailbreak = true;
        homepage = "https://charmander.me/flamethrower/";
@@ -51681,7 +51842,7 @@ self: {
      mkDerivation {
        pname = "flamingra";
        version = "0.1.1.1";
-       sha256 = "1yfqgbjam33vrkic5xnb8pp76215jnacr6sj1xw1xqcbcs02bn3v";
+       sha256 = "7bd82580668be11e780f529bcc9495250873ee45cbf6c2e2cc7b8caae47ad8f9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -51699,7 +51860,7 @@ self: {
      mkDerivation {
        pname = "flat-mcmc";
        version = "0.1.0.0";
-       sha256 = "1fp5jga82kbkj77xhy4m4vsn7zqf6fr9fwram3a2ybqssicgs3z5";
+       sha256 = "e50ffd58d41a2f2fd4a82a7397b2330eff63f5269578d8cf91734d81d493e5ba";
        libraryHaskellDepends = [
          base monad-par monad-par-extras mtl mwc-random primitive vector
        ];
@@ -51716,7 +51877,7 @@ self: {
      mkDerivation {
        pname = "flexible-defaults";
        version = "0.0.1.1";
-       sha256 = "0cbp8hb7y29xz3hl780173cs6ca4df0r98fz7v3drqr46aq55ipl";
+       sha256 = "f4c652b03224e3dcc63edfa194816b4431a3d93801a043e1f83d097f16447731";
        libraryHaskellDepends = [
          base containers template-haskell th-extras transformers
        ];
@@ -51730,7 +51891,7 @@ self: {
      mkDerivation {
        pname = "flexible-time";
        version = "0.1.0.3";
-       sha256 = "179k0r58r5s0g1vfs7ab382iq7qf5xbrnmvx2y8p86pz8fcz7a8l";
+       sha256 = "14a9f39943ff1a7491177d579b572f0e1f1c051a4b1ded767840978c4a06339d";
        libraryHaskellDepends = [ base bytestring unix-time ];
        jailbreak = true;
        homepage = "https://github.com/tattsun/flexible-time";
@@ -51743,7 +51904,7 @@ self: {
      mkDerivation {
        pname = "flexible-unlit";
        version = "0.2013.314.0";
-       sha256 = "0jwsa2qfzw4rdj55axy7cw1p82314i28c16f7p7pjp53cwnsp02a";
+       sha256 = "4a80ab2d67a35c79cf3dce048644246108740367c777558a6c99f0efb0509a4b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
@@ -51757,7 +51918,7 @@ self: {
      mkDerivation {
        pname = "flexiwrap";
        version = "0.1.0";
-       sha256 = "0vvl9w3i374k720sscbcsbha89fcfk1hcvdr0nk4y7gkp13xwdba";
+       sha256 = "6a35de47b8f31d4fa605b96d06c374cc25a4e0d26c31ad8138939c11074f746f";
        libraryHaskellDepends = [ base data-type mtl QuickCheck ];
        jailbreak = true;
        description = "Flexible wrappers";
@@ -51770,7 +51931,7 @@ self: {
      mkDerivation {
        pname = "flexiwrap-smallcheck";
        version = "0.0.1";
-       sha256 = "1dara0az10fxx46jmplf2l6a6x8qqjk00fxjzb9n10ndd4lxcsm3";
+       sha256 = "a36ad62969cd8260d3fab23b00a6c41875a30c158ede2a0de9dd81f0155059b5";
        libraryHaskellDepends = [
          base data-type flexiwrap mtl smallcheck
        ];
@@ -51787,7 +51948,7 @@ self: {
      mkDerivation {
        pname = "flickr";
        version = "0.3.3";
-       sha256 = "12fi34zl2ggbxf5gmfldplzi1pk9byf8rpn58ljw2fvz3qb8x6yl";
+       sha256 = "d49b8e161e7f3bc12545c5de8c9c5f69de103fbd8dbafa8aebeb3d413f19d189";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -51804,7 +51965,7 @@ self: {
      mkDerivation {
        pname = "flippers";
        version = "1.0.1";
-       sha256 = "1swyj1f67giq7h9xcl6dzsw4ywk1jbl6avpihbv0q9g9hp6yzqp3";
+       sha256 = "e3e2efcd85e9250cf682f16e65e89261724fb8fecd50d6133c38be635c909eeb";
        revision = "1";
        editedCabalFile = "e908ada5c891a6ac39cefb7e41648606d1a5f1b1048281f93bd496c5f22d73b4";
        libraryHaskellDepends = [ base ];
@@ -51817,7 +51978,7 @@ self: {
      mkDerivation {
        pname = "flite";
        version = "0.1.2";
-       sha256 = "0ck44icwg6gzi9x5h5iszk59qnr0fhsj95ghk0lxm8aygavwq44d";
+       sha256 = "8d10ccb77a5ea1da2998f095243574205b9ccafc3a16587a8aff99c759246432";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers haskell98 parsec ];
@@ -51837,7 +51998,7 @@ self: {
      mkDerivation {
        pname = "flo";
        version = "0.1";
-       sha256 = "1hxzdgnsfxallmw7z07hs4ax8pfn57hk55kyjxg8vnrj7i07bp9l";
+       sha256 = "34dd75403c32db8d5e977e9632e129d65dd415d1f0807f78a55475a7ed6bbfc3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -51858,7 +52019,7 @@ self: {
      mkDerivation {
        pname = "float-binstring";
        version = "0.2";
-       sha256 = "0dcxk1s13ppslqxd378yh92pzmxnmnhk1q07wl5ifcnfy5zamzdq";
+       sha256 = "b8fdaa7ef1ce32170be507e030a1adb6d77f45821e9dd13aa6fade1174989d35";
        libraryHaskellDepends = [ attoparsec base split text ];
        testHaskellDepends = [
          attoparsec base hspec HUnit QuickCheck split text
@@ -51873,7 +52034,7 @@ self: {
      mkDerivation {
        pname = "floating-bits";
        version = "0.3.0.0";
-       sha256 = "1cp2k9rks0g8i6lf6j3zrz7wxh42qmsqwvf26dkdqnnzi0aqkkxj";
+       sha256 = "b2cf891588df5adc6633c26d8e75c582c0cecfcf7f48e3a889e8013d739ae2b2";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Conversions between floating and integral values";
@@ -51886,7 +52047,7 @@ self: {
      mkDerivation {
        pname = "floatshow";
        version = "0.2.4";
-       sha256 = "1zsxjwgm8nkphnmsbz03yvplc2r02qybb387n910j4j6vya98khc";
+       sha256 = "0c4e9494df46120942b2078db53c16200b46eff603fca5ab85775a541f975dff";
        libraryHaskellDepends = [ array base integer-gmp ];
        homepage = "https://bitbucket.org/dafis/floatshow";
        description = "Alternative faster String representations for Double and Float, String representations for more general numeric types";
@@ -51900,7 +52061,7 @@ self: {
      mkDerivation {
        pname = "flock";
        version = "0.3.1.8";
-       sha256 = "1g1gf7qnlqkl57h28nzxnbzj7v2h73czffp5y7s7jm9vbihcwd4n";
+       sha256 = "9634ce605c3b5579f4f1e53af7d93850ec23ffb2fd5b24e02974626af1712fbc";
        libraryHaskellDepends = [
          base lifted-base monad-control transformers unix
        ];
@@ -51914,7 +52075,7 @@ self: {
      mkDerivation {
        pname = "flow";
        version = "1.0.1";
-       sha256 = "11i0p2f8zxpcpssga279hx8vy6a14xykmb8qxyfrrpvd6qg42i8y";
+       sha256 = "1e45411e366ddf9c9def18ad3a7d274119bf5187e908f5b4beecf68f9cb82086";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        homepage = "http://taylor.fausak.me/flow/";
@@ -51929,7 +52090,7 @@ self: {
      mkDerivation {
        pname = "flow2dot";
        version = "0.9.0.3";
-       sha256 = "1pf60wpwsvxxgqkz3zh2qlcyz9pyd8axi41y5y6pn77n9x8p2613";
+       sha256 = "231871514ff61c7b8d2f3e90d8156afea6ef19c502fef1277ebd6fcd2f07c6dd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -51950,7 +52111,7 @@ self: {
      mkDerivation {
        pname = "flowdock";
        version = "0.3.0.1";
-       sha256 = "1az9wwdng7i3jrjwizzz3690506b3vk1m8h2b96wf59r51qnpr6i";
+       sha256 = "d1e46b71283915c74d5a02a21ae61ecb80029219ffffc86596239e671be7e9ab";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring http-client http-client-tls
          lens lens-action mtl network pipes pipes-aeson pipes-http
@@ -51972,7 +52133,7 @@ self: {
      mkDerivation {
        pname = "flowdock-api";
        version = "0.1.0.0";
-       sha256 = "0p0b0pabyykvli9l0jrcbfgpyq7dna3zilb4z0s1hb6mamfdn7ng";
+       sha256 = "cf1edb5c55d52c1834f864d1f887b2ed607f9f5b2c4b4053a47b7abfd4050b5c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52006,7 +52167,7 @@ self: {
      mkDerivation {
        pname = "flower";
        version = "0.7.2";
-       sha256 = "0r9l3b91kyhf4ab8m2qv5jsfqf3k7x639bq1wjbf852imzl6138b";
+       sha256 = "0b8d60e8af5114e496e401af344c3f7338ecb42c1b8b8a96220efa19d21a3465";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -52024,7 +52185,7 @@ self: {
      mkDerivation {
        pname = "flowlocks-framework";
        version = "0.1.3.1";
-       sha256 = "1v9z302fg2fx6k9k7ci5128gxrrcgdqp40r7axk0yhrzc06b9wa8";
+       sha256 = "48f1b40c603f430f6657270372717b2ce7fe900825b233d334dd89e704183fed";
        libraryHaskellDepends = [ base containers syb ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Generalized Flow Locks Framework";
@@ -52039,7 +52200,7 @@ self: {
      mkDerivation {
        pname = "flowsim";
        version = "0.3.5";
-       sha256 = "0l3222a2r2khhrfhzvd0iikqq1rlcwhvf785bwnwqygq35i1w6j3";
+       sha256 = "431a1e6219f879cc2d5f051db7216734078c678ca0ed0f5d86708a2c94106250";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -52057,7 +52218,7 @@ self: {
      mkDerivation {
        pname = "fltkhs";
        version = "0.1.0.2";
-       sha256 = "11p957d12ivrf9r76zf2khjd736fdnhaj7qp0x6fbwmda2ifrij3";
+       sha256 = "43c6eca250adf2e54c07171fa9a06dce8cd3249cc27d737272794711da29e986";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -52077,7 +52238,7 @@ self: {
      mkDerivation {
        pname = "fluent-logger";
        version = "0.2.3.1";
-       sha256 = "0m97hljfrs5mh5pjbwvnw7b581y7w96qfyjr3d9p1aqbj6nsa6dp";
+       sha256 = "b719a5ad910bab70531b597a874de2c70754d6e176f3256f81b5e8ec24852755";
        libraryHaskellDepends = [
          base bytestring cereal containers messagepack network
          network-socket-options random stm text time vector
@@ -52098,7 +52259,7 @@ self: {
      mkDerivation {
        pname = "fluent-logger-conduit";
        version = "0.3.0.0";
-       sha256 = "0z21dg1y0rqfgvpvgci5kp3jh0kdx5v5paxdidwp8dd6v7y3ag9q";
+       sha256 = "383d35fcd9a63574798badab5b76e96d0228c79d25b2b7ef7e0e67e0c36b417c";
        libraryHaskellDepends = [
          base bytestring conduit fluent-logger resourcet transformers
        ];
@@ -52113,7 +52274,7 @@ self: {
      mkDerivation {
        pname = "fluidsynth";
        version = "0.2.0.0";
-       sha256 = "18r7q7sh35sr71ays0c9ic6f7vmrblpw25mz1y5v9sbk5x2lh64s";
+       sha256 = "9a1848452f73e9b48b0fbf16c12f5db9eee30c8b8901ed5538599701f5c127a3";
        libraryHaskellDepends = [ base bindings-DSL containers directory ];
        librarySystemDepends = [ fluidsynth ];
        jailbreak = true;
@@ -52128,7 +52289,7 @@ self: {
      mkDerivation {
        pname = "fmark";
        version = "0.1.1";
-       sha256 = "1bjkkd90mw1nbm5pyjh52dwhqa6xx3i3hhl2ys3qpk08mrw5r09l";
+       sha256 = "34815c78ae08cc8b87f6824238e2e8dd280c7913054a7f4b5d36f00a529b53ae";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -52145,7 +52306,7 @@ self: {
      mkDerivation {
        pname = "fmlist";
        version = "0.9";
-       sha256 = "1gzwmsrbxk22v7syf8zfvxphm23dmjzfpysz6qww3qvib8wm64aq";
+       sha256 = "581153395a71e3c139365ffbebbeac6d880a6fdfee23e7f5d942ccbeb2aefcbf";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/sjoerdvisscher/fmlist";
        description = "FoldMap lists";
@@ -52157,7 +52318,7 @@ self: {
      mkDerivation {
        pname = "focus";
        version = "0.1.4";
-       sha256 = "0h6q48ybcch1p15f4x56ya4d8mn4dwzbfjx573dy6z3x12v7qi2n";
+       sha256 = "56447cb6087d7ce3db38a54bb73e6fc456d488f2a674e24ab80132b63c22d840";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nikita-volkov/focus";
        description = "A general abstraction for manipulating elements of container data structures";
@@ -52169,7 +52330,7 @@ self: {
      mkDerivation {
        pname = "fold-debounce";
        version = "0.2.0.0";
-       sha256 = "1nq0729wy3v29liwhy5rp706cpspv9jygh0pvxf398ng2plgfjmb";
+       sha256 = "ab4af7e815cfa2345cdf17c0e765da575f66c0b9b978c8234d620fcf933800db";
        libraryHaskellDepends = [ base data-default stm stm-delay time ];
        testHaskellDepends = [ base hspec stm time ];
        homepage = "https://github.com/debug-ito/fold-debounce";
@@ -52184,7 +52345,7 @@ self: {
      mkDerivation {
        pname = "fold-debounce-conduit";
        version = "0.1.0.0";
-       sha256 = "0d5yw44zbkissnw7f0zssrr3f3m8ymkskizvjp6rhsiyx3iafj5k";
+       sha256 = "b348a7e2e83e6a98cd95fbc7a967f5a80e3772d6fa0377b8d53acef509e1be34";
        libraryHaskellDepends = [
          base conduit fold-debounce resourcet stm transformers
          transformers-base
@@ -52204,7 +52365,7 @@ self: {
      mkDerivation {
        pname = "foldl";
        version = "1.1.1";
-       sha256 = "01zqlb3hh5jsq49ax08nkwvysqq4fgkxpz4sdcman9y9fnxgwjgg";
+       sha256 = "ef49feba75c927ab2a6b9afcdbe7730463ed379f1681ae12c15a1608c7a2f807";
        libraryHaskellDepends = [
          base bytestring containers mwc-random primitive profunctors text
          transformers vector
@@ -52221,7 +52382,7 @@ self: {
      mkDerivation {
        pname = "foldl-incremental";
        version = "0.2.0.0";
-       sha256 = "09xf9cba3j49z4bwfmad6q9gdnp3f1zn817q4px7hky2gln3bhzk";
+       sha256 = "f3c3352c7dc24f78fa25f804647f70e3daf612364d55c717f989c8a1164bae27";
        libraryHaskellDepends = [
          base containers deepseq foldl histogram-fill vector
        ];
@@ -52244,7 +52405,7 @@ self: {
      mkDerivation {
        pname = "folds";
        version = "0.6.3";
-       sha256 = "1p8vr71vqzn0h4j5rz3wh7fsvsaaig52ds7sx8r2c8klbdf91zd4";
+       sha256 = "a4fd905c5b74222632eafae826ca8b4ae9addd817cfc5c2481c07ebcc3c91bdd";
        configureFlags = [ "-f-test-hlint" ];
        libraryHaskellDepends = [
          base comonad contravariant lens pointed profunctors reflection
@@ -52265,7 +52426,7 @@ self: {
      mkDerivation {
        pname = "folds-common";
        version = "0.2.0.0";
-       sha256 = "1dcyh798ijq4ms8xr0jwfp4fy5i5l4czl7m3yvk2z6rkha9w1zmc";
+       sha256 = "acfec09382339b2fe6f6a31efa19a12516efc8755c82dc91ae04cb88d2819eb5";
        libraryHaskellDepends = [ base containers folds ];
        testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        description = "A playground of common folds for folds";
@@ -52280,7 +52441,7 @@ self: {
      mkDerivation {
        pname = "follower";
        version = "0.0.1";
-       sha256 = "0iy8q06fpc03n4z6dcrl95vji67dia6bp30q42rrlqw6s9cwigsm";
+       sha256 = "55bfc859d286639ab320188cbb8c8aed9828774934b3663eb103b0eb0cc0c847";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -52298,7 +52459,7 @@ self: {
      mkDerivation {
        pname = "foma";
        version = "0.1.1.0";
-       sha256 = "1aiy4bizzx5g87lvlx8xy24rxvzh093mlaavxkcr542fq9ki8yb3";
+       sha256 = "63791467c24e9092d9ec5b295a4702f0ef9e89f01d75bae941aff4ffe3223eaa";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ foma ];
        homepage = "http://github.com/joom/foma.hs";
@@ -52312,7 +52473,7 @@ self: {
      mkDerivation {
        pname = "font-opengl-basic4x6";
        version = "0.0.3";
-       sha256 = "0myjb8g3mis887l0jmr88nb757x0zcvhnanx02hxjbfb5iqx3cx9";
+       sha256 = "a9b3d1712ccb2dd9a100dd2a0b37fba09f729645285709e84148c73a1e5ad257";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base OpenGL ];
@@ -52328,7 +52489,7 @@ self: {
      mkDerivation {
        pname = "foo";
        version = "1.0";
-       sha256 = "1f1abijdfvnmkgbvw9q94k4p39pbqslmg9am1j1sjyxrag5y0vv8";
+       sha256 = "686fe0cb53b97ba9830c55a557a9c6eba671c9240927bed79bd56ed7645c2ab8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -52347,7 +52508,7 @@ self: {
      mkDerivation {
        pname = "for-free";
        version = "0.1";
-       sha256 = "048m95sg8jq7kpr55iq5h93c7zbaqp5v340phb13v9yw2hv50sql";
+       sha256 = "146b503614dca73dc2821790b1cbc56afdc3468205c752f29d074bf474491511";
        libraryHaskellDepends = [
          base comonad comonad-transformers containers contravariant
          transformers
@@ -52365,7 +52526,7 @@ self: {
      mkDerivation {
        pname = "forbidden-fruit";
        version = "0.1.0";
-       sha256 = "0sxaa2lpz6j0ljz8kjxifvp4lk5x12w0ka9wjws4w7r8q9bld8dd";
+       sha256 = "ada14657c2281f4e34973ca909b808bd4c4aee76b1cb89bea4409a7fa950aa6b";
        libraryHaskellDepends = [
          base control-monad-loop hashable hashtables primitive transformers
          transformers-base vector
@@ -52386,7 +52547,7 @@ self: {
      mkDerivation {
        pname = "force-layout";
        version = "0.4.0.2";
-       sha256 = "0lncciqizp55if5ivlcbv5lqj21hlp2vfi40iagjswf2apxi0w0g";
+       sha256 = "0f7010fb55c2712d9f8a8044b7c5a530088969d98bd11d8b8ba5dc1f7164cc52";
        libraryHaskellDepends = [
          base containers data-default-class lens linear
        ];
@@ -52399,7 +52560,7 @@ self: {
      mkDerivation {
        pname = "fordo";
        version = "0.1";
-       sha256 = "0vlh5rfn3n8vi3gbfmpbw20jgv5skvcw187walgv6dns39pagsar";
+       sha256 = "59e9a76e1ada36b31f55fca0c0d99ebaec2781e0eb56b7de881bd9615d2e906e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process transformers ];
@@ -52413,7 +52574,7 @@ self: {
      mkDerivation {
        pname = "forecast-io";
        version = "0.2.0.0";
-       sha256 = "17wsqrq1zq1p80gnrfsvks5bhickfqj5mh2prbzzkzb3s28l1mby";
+       sha256 = "7ed54091d063fdf9ffca57c05a24769345b88a9e5bbb6c1f4037e01f70c69a9f";
        libraryHaskellDepends = [ aeson base text ];
        homepage = "https://github.com/stormont/forecast-io";
        description = "A Haskell library for working with forecast.io data.";
@@ -52425,7 +52586,7 @@ self: {
      mkDerivation {
        pname = "foreign-storable-asymmetric";
        version = "0.0.1";
-       sha256 = "1pj30p7z5nq8j95z9c4kjv6spandfch3r0dvx3n8wsbh3270dvxj";
+       sha256 = "b2ef068e1870698eece8bb813c2073cdaaabcd9693b0f44b9208dbf2cf0543de";
        libraryHaskellDepends = [ base ];
        description = "Types and instances for implementing a Storable with different peek and poke";
        license = stdenv.lib.licenses.bsd3;
@@ -52436,7 +52597,7 @@ self: {
      mkDerivation {
        pname = "foreign-store";
        version = "0.2";
-       sha256 = "1p436dn6l5zjzizcsj0hn10s2n907gr7c8y89i4sm3h69lhqlw86";
+       sha256 = "06718a214d068eaa494cc82376f23b2059a141b01048cd7efcf2176a6c3383dc";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/chrisdone/foreign-store";
        description = "Store a stable pointer in a foreign context to be retrieved later";
@@ -52448,7 +52609,7 @@ self: {
      mkDerivation {
        pname = "foreign-var";
        version = "0.1";
-       sha256 = "1rxfmzq9npj1170i85qhq5fhvvzb9j1wdi5lzmj57k4hlyxcwqjd";
+       sha256 = "4d62cebaa790cc5364fdb4c4c6834cebef0d5dc1101714c109415e9bf0afaee7";
        revision = "1";
        editedCabalFile = "f9c906434533279cfa8e2897c6eed6ed9c279f373efc5180bda76b704601fa1c";
        libraryHaskellDepends = [ base stm transformers ];
@@ -52462,7 +52623,7 @@ self: {
      mkDerivation {
        pname = "forger";
        version = "0.0.0.0";
-       sha256 = "1bykssfas1fz46qmiwhxs09xnnwp104hlmq08z9g1xh7qv8bh7iy";
+       sha256 = "3e1eb8d0c607f6f0d24700570a0908975bdb13d01df258b121df05ad9cd6d3af";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -52478,7 +52639,7 @@ self: {
      mkDerivation {
        pname = "forkable-monad";
        version = "0.1.1";
-       sha256 = "0nxcjx3cf8bkl0cwkpgz5c6byld13kw2601q4157fmfa370bi11h";
+       sha256 = "3084b8c019ca55774a20380023f81ca151bf0c2bffddc919a07321c74697ac5b";
        libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://code.google.com/p/forkable-monad/";
@@ -52495,7 +52656,7 @@ self: {
      mkDerivation {
        pname = "formal";
        version = "0.1.0";
-       sha256 = "0z8a5a9w7mg69c1x6h8825bhkll63gz6j85lbc0w59w1ag2x8865";
+       sha256 = "c520d4c55381a7c2015bb42069fe1b86d20957110841d3034be6d5c3932a0a7d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -52514,7 +52675,7 @@ self: {
      mkDerivation {
        pname = "format";
        version = "0.1.0.0";
-       sha256 = "1vv9b0hif5hi3jkd1n6j85b5mkfkjyixldblm2l4qfgrj95igmph";
+       sha256 = "f0d6174b92f9394ca8a87435daa397d3cd5a5641d2d8d0a61c111617215869ef";
        libraryHaskellDepends = [ haskell2010 parsec ];
        testHaskellDepends = [ haskell2010 parsec QuickCheck ];
        jailbreak = true;
@@ -52531,7 +52692,7 @@ self: {
      mkDerivation {
        pname = "format-status";
        version = "0.2.0.0";
-       sha256 = "0dfmjp307c8685cdw41nmjmisf3aplyf177r973wyqcrifabvs2q";
+       sha256 = "58e8bd948b9961cfc749f99ce03cbd6a381dabac3610de584106b103c695d535";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -52551,7 +52712,7 @@ self: {
      mkDerivation {
        pname = "formattable";
        version = "0.1.1";
-       sha256 = "0brp1j21ll6g266zyzknqc20k5nf3na97fjbh66hjbsw6yxah5x7";
+       sha256 = "a717a8ba375c2f098d814bba93941dce960904c3767eff8d11cf501a840c372f";
        libraryHaskellDepends = [
          base bytestring data-default-class old-locale text time
        ];
@@ -52571,7 +52732,7 @@ self: {
      mkDerivation {
        pname = "formatting";
        version = "6.2.2";
-       sha256 = "04ilp8zkzkab3x4v5kczpa58k5jr67yg9fq4prj7xrj81kixgp2g";
+       sha256 = "4fdcd7e30c48e67e64be04bbf4fc315996898aba9fcdb2491f4bcd3f3fba3412";
        libraryHaskellDepends = [
          base clock old-locale scientific text text-format time
        ];
@@ -52589,7 +52750,7 @@ self: {
      mkDerivation {
        pname = "forml";
        version = "0.2";
-       sha256 = "1bqfw3h06mbznivg37840qnzjygflzp90wkyssnb1kjxi4bj1vbv";
+       sha256 = "7bed2017895dceb0acd67e7290eea7ee79f92d06049df176b47f5503e0e00eaf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -52612,7 +52773,7 @@ self: {
      mkDerivation {
        pname = "formlets";
        version = "0.8";
-       sha256 = "0jx56vhrzcwca33rgp738plmssw95nv20rrzw5xrxcmdv26zp1w9";
+       sha256 = "8987fb8dd8adb29e7be13f6720b62d896b5de945e3dc97c7508cb39fe136a54b";
        libraryHaskellDepends = [
          applicative-extras base blaze-html bytestring haskell98 syb
          transformers xhtml
@@ -52631,7 +52792,7 @@ self: {
      mkDerivation {
        pname = "formlets-hsp";
        version = "2.3.1";
-       sha256 = "19m0nryrksh1cgsz7sx3gamjczw36hqfsbml05p6j7li3bk0fpw2";
+       sha256 = "825f07e61a911e696e01b42eed3034837f26ab7aa3ebf3f56301ea997db6a0a6";
        libraryHaskellDepends = [
          applicative-extras base formlets haskell98 hsp hsx mtl
        ];
@@ -52646,7 +52807,7 @@ self: {
      mkDerivation {
        pname = "forth-hll";
        version = "0.1.0.0";
-       sha256 = "1hmcicxnxcl99chidkbg1kspjzpxxcw8qh4lrwvmlpz2knzf11g3";
+       sha256 = "e385e0be9de25f5a37cf94408c38ebfd7e79f50c6fcd16214b89b26e3b8bacc2";
        libraryHaskellDepends = [ array-forth base free mtl ];
        jailbreak = true;
        description = "A simple eDSL for generating arrayForth code";
@@ -52659,7 +52820,7 @@ self: {
      mkDerivation {
        pname = "fountain";
        version = "0.1";
-       sha256 = "0mxzrvrag2qwn22llklmdkcf4icd8n9ifg1awd9q7ffll8a1a67p";
+       sha256 = "f7181514a2d4b98353e32a3c1793458d45e2d86c954e4a85b01c8ba7f2cebf57";
        libraryHaskellDepends = [ base containers random ];
        homepage = "http://tomahawkins.org";
        description = "A fountain codec";
@@ -52681,7 +52842,7 @@ self: {
      mkDerivation {
        pname = "fpco-api";
        version = "1.2.0.5";
-       sha256 = "1r80a6vimpy4nviskl62c4ivp2l8wrg3vhzgdg53nnfa5j6lmha2";
+       sha256 = "42c14a8d2cca593bca6befc33d5ee6888abb2361c2d0a9e3b6c4df1ab75100e5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52709,7 +52870,7 @@ self: {
      mkDerivation {
        pname = "fpipe";
        version = "0.0.1";
-       sha256 = "1b6r19yy9wh5w8xb0ajjxsd2qyzjnkgyav1975qv92wwxslyxwr8";
+       sha256 = "28f3eea9ee9c8bb47139296ce5dfb4f27b2c9aee522ab03ae205f2e47d0ad9ac";
        libraryHaskellDepends = [ base ];
        description = "F#-style composition and application";
        license = stdenv.lib.licenses.bsd3;
@@ -52720,7 +52881,7 @@ self: {
      mkDerivation {
        pname = "fpnla";
        version = "0.1.1";
-       sha256 = "15qpfi3b9vnpm17q3y64nsrhlj5vi9rgrgysjfk98aw1gkj9mvv4";
+       sha256 = "64ef9ae47c812b94a693dabffc728abb480ab3b6c4f8814fa8d7eeb446741797";
        libraryHaskellDepends = [ base ];
        description = "A library for NLA operations";
        license = stdenv.lib.licenses.bsd3;
@@ -52735,7 +52896,7 @@ self: {
      mkDerivation {
        pname = "fpnla-examples";
        version = "0.1.1";
-       sha256 = "1p305r0jgcqrbny22ic1ziyav9yjy6v02wgna0sgh4p0c1wi7pb2";
+       sha256 = "62dd137960e012f83450f67101b6f1d2a7ad7cfc814521bc5d19b327412e60dc";
        libraryHaskellDepends = [
          accelerate array base deepseq fpnla hmatrix linear-algebra-cblas
          monad-par parallel repa vector
@@ -52759,7 +52920,7 @@ self: {
      mkDerivation {
        pname = "fptest";
        version = "0.2.2.0";
-       sha256 = "1wqca640h9qcrnwkqdw1pyl73c4nraglgwqgimkrgbkjlwpyn824";
+       sha256 = "4420eb2fa772ae97678d0ff3479fca96b071a8bf81373cb9cd0c270888510cf3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -52784,7 +52945,7 @@ self: {
      mkDerivation {
        pname = "fquery";
        version = "0.2.1.5";
-       sha256 = "1v1qrbr5kz17haawrh0ksmjw7j4ks0x4kqzss5z1fbldl6axw97i";
+       sha256 = "f124de95a18d2e177ed1fae3493ad093c8c365d513c0cc958227fc59f2ca38ec";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -52800,7 +52961,7 @@ self: {
      mkDerivation {
        pname = "fractal";
        version = "0.0.1";
-       sha256 = "0iw5454mi0ms3w62m118rlqr6lr1j9mbxwfj26mlc5p38bq9k7ds";
+       sha256 = "ba9d99f042e31646ab11d2f1be6a9221539331cd28842a0c1fba825849218547";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -52808,12 +52969,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fractals" = callPackage
+    ({ mkDerivation, base, integer-gmp, QuickCheck }:
+     mkDerivation {
+       pname = "fractals";
+       version = "0.1.0.0";
+       sha256 = "3dbca177023352014cb5c61205a9a90a640a75a0557935126800e25f38f2424a";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base integer-gmp QuickCheck ];
+       description = "A collection of useful fractal curve encoders";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fraction" = callPackage
     ({ mkDerivation, base, semigroups }:
      mkDerivation {
        pname = "fraction";
        version = "0.1.0.4";
-       sha256 = "0blvvsc1rbn45nwgmkhd28bdz0awi5mk6h48yqbqy3ajm2gvpvdf";
+       sha256 = "aeedbb9fa8520d8f17f68840336b895c81df16120dcefab82dc4ae1c98de9b2e";
        libraryHaskellDepends = [ base semigroups ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/fraction";
        description = "Fractions";
@@ -52825,7 +52998,7 @@ self: {
      mkDerivation {
        pname = "frag";
        version = "1.1.2";
-       sha256 = "1xgnp4cls8i61hyl4kcf3afri77jlcahwjvww498xl5d5frdiv90";
+       sha256 = "20edd8b22badd08e12e17c4b0e15a3f29c989d1a8e4d423d0c26224d19b9f6f5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base GLUT OpenGL random ];
@@ -52844,7 +53017,7 @@ self: {
      mkDerivation {
        pname = "frame";
        version = "0.1";
-       sha256 = "0ldncqifcnk4d50qivgw62hcdy4nc23zr64q787azid0vb9vsdja";
+       sha256 = "4a36bdd3daa0c5af0e3a9898fc876096f8c6a030fced884169645ae62266b651";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52865,7 +53038,7 @@ self: {
      mkDerivation {
        pname = "frame-markdown";
        version = "0.1";
-       sha256 = "0wy1c9xgd6ykymqciga1sla83wfdwy17p88bygfp6pflbc0rw57g";
+       sha256 = "ef149e015bd45d73ddf30ba17b82e7cdf18114d541bdc870f5d39bf67a62c173";
        libraryHaskellDepends = [ base frame pandoc ];
        jailbreak = true;
        description = "A markdown to Frame GUI writer for Pandoc";
@@ -52877,7 +53050,7 @@ self: {
      mkDerivation {
        pname = "franchise";
        version = "0.0.6";
-       sha256 = "144fywp5fcix5i06wvwvzwsr19bgxpajx7bi7jw43hnm3rlcj4vr";
+       sha256 = "7913c9681ed5c241b83c719d2ed5ed6fa59035ff9b6f6e402c3d32572ef78e90";
        libraryHaskellDepends = [ base ];
        description = "A package for configuring and building Haskell software";
        license = stdenv.lib.licenses.bsd3;
@@ -52892,7 +53065,7 @@ self: {
      mkDerivation {
        pname = "free";
        version = "4.12.1";
-       sha256 = "0sr8phvrb4ny8j1wzq55rdn8q4br23q4pw2j276npr844825jr9p";
+       sha256 = "376559042204e56bcd1152f04bf01079118c6ccba5e0cf8344de929537bc286b";
        libraryHaskellDepends = [
          base bifunctors comonad distributive exceptions mtl prelude-extras
          profunctors semigroupoids semigroups template-haskell transformers
@@ -52909,7 +53082,7 @@ self: {
      mkDerivation {
        pname = "free-functors";
        version = "0.6.4.1";
-       sha256 = "1mc5y29j4khl222dwb9xcnfmn2jh3v47rkvkzwvlgrbg5bh81kzk";
+       sha256 = "f3cf80e02a6fe54737ff73cf7cc81e500a5b9d653d2dde8410144e2293f085d5";
        libraryHaskellDepends = [
          algebraic-classes base comonad constraints template-haskell
          transformers void
@@ -52929,7 +53102,7 @@ self: {
      mkDerivation {
        pname = "free-game";
        version = "1.1.81";
-       sha256 = "1z8l9k70rbcc9jbrnh7xhrnny6wd5l0jfb1a6ki7dnq6m5klivyp";
+       sha256 = "d7ef4867a906db76e2342a2c27012d8d1b6f6d86fd409b974c8cad0cce4c14fd";
        libraryHaskellDepends = [
          array base boundingboxes colors containers control-bool directory
          filepath free freetype2 GLFW-b hashable JuicyPixels
@@ -52950,7 +53123,7 @@ self: {
      mkDerivation {
        pname = "free-http";
        version = "0.1.1.3";
-       sha256 = "1gmafmi0mrmbm7a08cxiz96s43k4sc38wvzrnmcrqcl44a1n38fm";
+       sha256 = "d5a161832284329c59b5f96f8e06d3640ea24dfab13304d4a9abe60a6275aabe";
        libraryHaskellDepends = [
          base bytestring free http-client http-types mtl QuickCheck text
          time transformers
@@ -52967,7 +53140,7 @@ self: {
      mkDerivation {
        pname = "free-operational";
        version = "0.5.0.0";
-       sha256 = "0gim4m0l76sxxg6a8av1gl6qjpwxwdzyviij86d06v1150r08dmb";
+       sha256 = "ab36043228216c039a4132c6ed7fe39d5f890d7d612ba4cceb5d9b434125353e";
        libraryHaskellDepends = [
          base comonad-transformers free kan-extensions mtl transformers
        ];
@@ -52984,7 +53157,7 @@ self: {
      mkDerivation {
        pname = "free-theorems";
        version = "0.3.2.0";
-       sha256 = "1r0qz8h8fjb9akkhd3impr30gd0s5ky51dj667x0pf155b4lvx2w";
+       sha256 = "5cf44dc92a25b80bfa3146b650fc2c1ab40746be358e06e75469498720fa18e4";
        libraryHaskellDepends = [
          base containers haskell-src haskell-src-exts mtl pretty syb
        ];
@@ -53000,7 +53173,7 @@ self: {
      mkDerivation {
        pname = "free-theorems-counterexamples";
        version = "0.3.1.0";
-       sha256 = "1wq5lvnylw92qzv1q93liz4i3q2j8sbgwgaw8nw79q0x0cdvbbb3";
+       sha256 = "63adb51b031de074b8455c3dfe964652e011c98f74241cf6c72271eaeda605f3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53020,7 +53193,7 @@ self: {
      mkDerivation {
        pname = "free-theorems-seq";
        version = "1.0";
-       sha256 = "1scqjv6hc2y0w1x9f8v8bwrl1dnz64hf5jgrdam12dxbsk6qjs6g";
+       sha256 = "cf6889cdd4ab3711aa6af9c9e22031dfb640335f6823977ae0c00b06cd9698e9";
        libraryHaskellDepends = [
          array base bytestring containers free-theorems haskell-src mtl
          old-locale old-time parsec pretty syb utf8-string xhtml
@@ -53038,7 +53211,7 @@ self: {
      mkDerivation {
        pname = "free-theorems-seq-webui";
        version = "1.0.0.2";
-       sha256 = "1bx7fg1ddycl9pgrlh2qij5vb6fqx79gl6lbm248c95xyygi3iy5";
+       sha256 = "c5c7119ff7bd248688a88b1afad2e9d899b58b8c58409adf4d94f9d6c273a7af";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -53057,7 +53230,7 @@ self: {
      mkDerivation {
        pname = "free-theorems-webui";
        version = "0.2.1.1";
-       sha256 = "1qxdfbzr52dw0qww03l86vpgmylznifqzvjarmgpkfr129szl7ba";
+       sha256 = "6a1dfa751221bb795fcd4aee8f5db49ffafaee36880ec03906bc8992ff72ade3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -53077,7 +53250,7 @@ self: {
      mkDerivation {
        pname = "freekick2";
        version = "0.1.2";
-       sha256 = "1ybmffs05hgzn81szcd8nrz4f94qc64d9y2d2hkyq57djb87503j";
+       sha256 = "728072d092ed14ec27144df8d488619824477eb6a8b1af03b2ffc102b47375f9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -53096,7 +53269,7 @@ self: {
      mkDerivation {
        pname = "freenect";
        version = "1.2";
-       sha256 = "11ggp90npdyfdmf8zhjk442zl0j0lni6hizhgc0409za9i6s1l5g";
+       sha256 = "afd0a04d4cea2740007bf04768a2a54002fa052153c28f5c6dceb76b41baef85";
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ freenect freenect_sync ];
        homepage = "https://github.com/chrisdone/freenect";
@@ -53112,7 +53285,7 @@ self: {
      mkDerivation {
        pname = "freesect";
        version = "0.8";
-       sha256 = "150ch1xmx3slmq7hb74z8sjrqhrsc9kl1zjn030fj6k6kphrwd88";
+       sha256 = "08359ee19d661ae9c00056fe4067623a439ca5469f9c050fae548f5e7b800c94";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -53132,7 +53305,7 @@ self: {
      mkDerivation {
        pname = "freesound";
        version = "0.1.0";
-       sha256 = "0a34qc62sjc355qfr3qz92nh27gmcyqk2jlhq77pjfdzv0ivigcy";
+       sha256 = "9ebdb823d8bf3979cfc1904a31b167f51d01ad481f8fec702983492d0cc36428";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53151,7 +53324,7 @@ self: {
      mkDerivation {
        pname = "freetype-simple";
        version = "0.1.0.1";
-       sha256 = "1qhiy896a10af9fnzcp4y0ra1c9l6fbcclrr3k74pn2qvvfybnss";
+       sha256 = "5adbe5ddde58d84bce1c3953c6963334b1a032f0e4b26f5d720a046512f211e2";
        libraryHaskellDepends = [
          base boundingboxes bytestring freetype2 linear
        ];
@@ -53166,7 +53339,7 @@ self: {
      mkDerivation {
        pname = "freetype2";
        version = "0.1.1";
-       sha256 = "16ayyqvbl278z68ssfbv2nvbyxs7585zmnk2w53vlxvj0k9zj66s";
+       sha256 = "da18f9d3047277ba47e162dafa0b2a4777bfb6157b39ad91f9e808ba36f65e99";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -53179,7 +53352,7 @@ self: {
      mkDerivation {
        pname = "fresh";
        version = "0.1.1";
-       sha256 = "1441yv55bwmiwnr6jsccq91anq8vhc2a4ka0irn3i2i9cjzw0gkw";
+       sha256 = "7c3ec0bf64298a386c8e404da204831b61ab42c28c6969b2e5b1f255caf68190";
        libraryHaskellDepends = [ base containers haskell-src-exts syb ];
        homepage = "https://github.com/davidlazar/fresh";
        description = "Introduce fresh variables into Haskell source code";
@@ -53194,7 +53367,7 @@ self: {
      mkDerivation {
        pname = "friday";
        version = "0.2.2.0";
-       sha256 = "0cw8mghygbd76l2nf0s1n0n1a7ymh2hv4dfm11hkv0gcdrqrp9fr";
+       sha256 = "d9a59b716eec813d6108d535b2a180d51f152cb04103670535a7ade7e1ab8833";
        libraryHaskellDepends = [
          base convertible deepseq primitive ratio-int transformers vector
        ];
@@ -53213,7 +53386,7 @@ self: {
      mkDerivation {
        pname = "friday-devil";
        version = "0.1.1.1";
-       sha256 = "19g1h7palsaycv81fks9zbq979jdn7fqapxd6igxhkgzw73n69aj";
+       sha256 = "522563c7e1ff4dd85f34ad5f85ddb14da693f0fa494f17d0665e69aaee81e1a5";
        libraryHaskellDepends = [
          base bytestring convertible deepseq friday transformers vector
        ];
@@ -53228,7 +53401,7 @@ self: {
      mkDerivation {
        pname = "friendly-time";
        version = "0.4";
-       sha256 = "1x73jk9smga912nfyxa77j6yz74kyx8zdr4q6xj3sirp46qm5nh5";
+       sha256 = "05da52b12137473d643798e4f651f7939cef8d3c4775efac0849bdaad394e3f4";
        libraryHaskellDepends = [ base old-locale time ];
        testHaskellDepends = [ base hspec old-locale time ];
        description = "Print time information in friendly ways";
@@ -53240,7 +53413,7 @@ self: {
      mkDerivation {
        pname = "frisby";
        version = "0.2";
-       sha256 = "0isj9p7j33va1a4q78vnq32j9jdbjww596rxja235z4whicraf53";
+       sha256 = "a3389559849cfc3284923d9b543897abc924c5c076a383890a6a8f21cf4d5247";
        libraryHaskellDepends = [ array base containers mtl ];
        homepage = "http://repetae.net/computer/frisby/";
        description = "Linear time composable parser for PEG grammars";
@@ -53252,7 +53425,7 @@ self: {
      mkDerivation {
        pname = "frp-arduino";
        version = "0.1.0.3";
-       sha256 = "00659x5f5dq4lb25ss880cqggqc63i7wqik04qvzk1kq3dl9six5";
+       sha256 = "a5479d681b7886f937266046cc4f1c86e1f7300308695dc4a204b7e24a4fc500";
        libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://github.com/frp-arduino/frp-arduino";
        description = "Arduino programming without the hassle of C";
@@ -53265,7 +53438,7 @@ self: {
      mkDerivation {
        pname = "frpnow";
        version = "0.13";
-       sha256 = "13dvyf1zwzvcpal7zp1jx5ns49a01jsjn3pz0iqdrph7qgll2aqr";
+       sha256 = "192b41e9c307dedc7004ff0e2bb50c4025a26de932dc7fa8ba6c7ffe83f3bb8d";
        libraryHaskellDepends = [ base containers mtl transformers ];
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Principled practical FRP";
@@ -53278,7 +53451,7 @@ self: {
      mkDerivation {
        pname = "frpnow-gloss";
        version = "0.12";
-       sha256 = "1xywqcif16r3x4qckz3n6k5mp2pya4vj35h0jrh4rd1sspnhi99i";
+       sha256 = "31a508edd53ab44c60960096213751fe8a5bcb3476fcc930e9239be022c3dcf7";
        libraryHaskellDepends = [
          base containers frpnow gloss mtl transformers
        ];
@@ -53294,7 +53467,7 @@ self: {
      mkDerivation {
        pname = "frpnow-gtk";
        version = "0.11";
-       sha256 = "0yq9pgjlmzg5pzcky7z7n2ks82x92dp5pjacr6h3w8mdrhhhk80c";
+       sha256 = "0ca00921ccad223ea0c94cc95b6e13a90ba4a7b0e71f3fd9bfe5fd4ae5bb097b";
        libraryHaskellDepends = [
          base containers frpnow glib gtk mtl transformers
        ];
@@ -53308,7 +53481,7 @@ self: {
      mkDerivation {
        pname = "frquotes";
        version = "0.2.1";
-       sha256 = "0s5cb0m6xgf9zfch75nzk9b8lvghl4nc5dk35xkakq6ys3zizw6c";
+       sha256 = "ccf01fffd0dee0a9662f63b6c22ca1f06d8a569adf960399fbc9bd6e2a58ac68";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -53322,7 +53495,7 @@ self: {
      mkDerivation {
        pname = "fs-events";
        version = "0.1";
-       sha256 = "0jw6cx9fzzs8r20acjq8nq8zjhwiwnvg1b0kc97c2sij1bhw6pw4";
+       sha256 = "845fc3e10a326ac14e6213acf0b6e59143f911b6084ba680c848ffef5267864b";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/nkpart/fs-events";
        description = "A haskell binding to the FSEvents API";
@@ -53335,7 +53508,7 @@ self: {
      mkDerivation {
        pname = "fsharp";
        version = "0.0.4";
-       sha256 = "1scmvhbsn988x6j4a94ibg1c7adrxf8lzn06n9n1iv62bjd450m3";
+       sha256 = "a382429a5cc2ec186cb206d84f91ebb9a9c3c25b912445a4e90825ab17dc95e9";
        libraryHaskellDepends = [ base ];
        description = "some F# operators, high priority pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -53348,7 +53521,7 @@ self: {
      mkDerivation {
        pname = "fsmActions";
        version = "0.4.4";
-       sha256 = "05713wj1s1307brqkbnapqi42dva55kcjgb8n3x6yirpfp6lhdsc";
+       sha256 = "4c3748cd7537476ffab0683dc966296a374122becaae89f33a60041d241fe114";
        libraryHaskellDepends = [
          base containers fgl filepath graphviz MissingH mtl parsec pretty
        ];
@@ -53366,7 +53539,7 @@ self: {
      mkDerivation {
        pname = "fsnotify";
        version = "0.2.1";
-       sha256 = "0asl313a52qx2w6dw25g845683xsl840bwjh118nkwi5v1xipkzb";
+       sha256 = "ebcf1b7bd825f269510850f20508a2ba0f640a41af08de0c171d8ba24618542b";
        libraryHaskellDepends = [
          async base containers directory filepath hinotify text time
          unix-compat
@@ -53387,7 +53560,7 @@ self: {
      mkDerivation {
        pname = "fst";
        version = "0.10.0.1";
-       sha256 = "190a89445fv006m5nv8g58h569rpw9s8jadqdy6m3ik43mnggzpy";
+       sha256 = "fefef76c1d64c6518d6fb8298974e2372753202a0f6d5baa0160bb4248420aa4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base mtl ];
@@ -53405,7 +53578,7 @@ self: {
      mkDerivation {
        pname = "fsutils";
        version = "0.1.2";
-       sha256 = "07lx4928d1fnjbpfmky4jhhk7sqj98b11vdbv4f67p3bwfn5lrp8";
+       sha256 = "e8665aace36bdc631cd9abed10164a12eb332194c4cfeaee92d6858644229d1e";
        libraryHaskellDepends = [ base directory filepath ];
        jailbreak = true;
        homepage = "https://github.com/Raynes/fsutils";
@@ -53420,7 +53593,7 @@ self: {
      mkDerivation {
        pname = "fswatcher";
        version = "0.1.2";
-       sha256 = "1b6pm3jfyi5lbrpjv8n6z970xs11h61hj1g5ph54fhsqd2wvmpc2";
+       sha256 = "82ddbab9685843470abce50509838121e80e4efac6a22d6f5eb444efe4a8d7ac";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -53439,7 +53612,7 @@ self: {
      mkDerivation {
        pname = "ftdi";
        version = "0.2.0.1";
-       sha256 = "1gnfbngn3jwva6nvrcrzmi2n2vy4k55yh41zvg0kyb61w7kgm4m8";
+       sha256 = "a892fae6e1c12c3fc1db3f10e84b99c46f6145ac3fb3bcad519bcb619f5dcebe";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53458,7 +53631,7 @@ self: {
      mkDerivation {
        pname = "ftp-conduit";
        version = "0.0.5";
-       sha256 = "0gb65g46nr9haysy3dbrylka08fsz81yn7aiwwingc6wlp7d76dg";
+       sha256 = "af99d3cea5dcb06723e7511deb03fada21a026f579b5e1b55730656bc82b663d";
        libraryHaskellDepends = [
          base byteorder bytestring conduit MissingH network transformers
          utf8-string
@@ -53477,7 +53650,7 @@ self: {
      mkDerivation {
        pname = "ftphs";
        version = "1.0.9.1";
-       sha256 = "1whvawaifhi5xgmiagdayjf7m6p6vs71mvc4a4csd4vzzjr0a2yf";
+       sha256 = "ce0b05b2fc7f93a6195184ed1a8edee69a7a9cf4aa3d15ebeb25421715571bf2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53493,7 +53666,7 @@ self: {
      mkDerivation {
        pname = "ftree";
        version = "0.1.3";
-       sha256 = "1ma87jnwsgzlr7z6ac303i0qy9i2lywvjgb2zjv9qgnbkf18pg3m";
+       sha256 = "75bc8b829bcb3e9cb6fc623db9b9a722268f411c603065fec9f43fcdad3c48d5";
        libraryHaskellDepends = [ base ShowF type-unary ];
        homepage = "https://github.com/conal/ftree/";
        description = "Depth-typed functor-based trees, both top-down and bottom-up";
@@ -53507,7 +53680,7 @@ self: {
      mkDerivation {
        pname = "ftshell";
        version = "0.3.0.1";
-       sha256 = "1jrpb6dzq47xy6xvsisc7g1y53dc97s4l826f9sscxpdsrx3yp8r";
+       sha256 = "195d3f7ad6ed76a6757246204af449ac8de2c33b4c47bdbbf1fd10fc9b5937cb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -53524,7 +53697,7 @@ self: {
      mkDerivation {
        pname = "fugue";
        version = "0.1";
-       sha256 = "0g0qy0lcixbjm5srmfl1dnci4m09zwqcs5dpknpnsdc4b4l3925r";
+       sha256 = "b98834285984356daf9db715cd30ff095412996d81ba9a75a972f5c828f0183c";
        libraryHaskellDepends = [ base ];
        description = "A recapitulated prelude with minimal dependencies and profligate exports";
        license = stdenv.lib.licenses.bsd3;
@@ -53535,7 +53708,7 @@ self: {
      mkDerivation {
        pname = "full-sessions";
        version = "0.6.2.1";
-       sha256 = "0irm1zrggjl9zrapzxfl3kj32d81k30c8nbmr3bf9ramjg65xm90";
+       sha256 = "20d55ecc9355e5e4d6c87559c4c098013531e41cd4f57f55fe89caf7f20f3547";
        libraryHaskellDepends = [ base ghc network ];
        homepage = "http://www.agusa.i.is.nagoya-u.ac.jp/person/sydney/full-sessions.html";
        description = "a monad for protocol-typed network programming";
@@ -53550,7 +53723,7 @@ self: {
      mkDerivation {
        pname = "full-text-search";
        version = "0.2.1.3";
-       sha256 = "0s537hzb21w506bp4i6v7k5sbk905s9950gihh99r0b7id185ppk";
+       sha256 = "f3de82428b67819c1284f18192922e20cda5cb3cdb447297018507b13e3ca368";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers text vector ];
@@ -53570,7 +53743,7 @@ self: {
      mkDerivation {
        pname = "fullstop";
        version = "0.1.4";
-       sha256 = "10452kdl98igk2y48bb2ligj8nk7gpjcsf0nsiifvpjbfxv4gakc";
+       sha256 = "6caa4776774bdeed62d41638cde47d675a245fa4622d44bc982fa244db148580";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base split ];
@@ -53589,7 +53762,7 @@ self: {
      mkDerivation {
        pname = "funcmp";
        version = "1.8";
-       sha256 = "09kmfgl15d71fr5h66j2b0ngw69y8dp41d55lz35nrjxq3l3gz1k";
+       sha256 = "33fc37e8c05d665bc6a7a5b4406e433e19fe2c58421a034b76e1b412e8737526";
        libraryHaskellDepends = [ base filepath process ];
        homepage = "http://savannah.nongnu.org/projects/funcmp/";
        description = "Functional MetaPost";
@@ -53601,7 +53774,7 @@ self: {
      mkDerivation {
        pname = "function-combine";
        version = "0.1.0";
-       sha256 = "1m8bmqxb9kar3y8zv22qs2a6kzd636m5li1r2q4y6pps0nglv9i9";
+       sha256 = "29a64d9f05fa5ee3091639445aaa19a6fd6994d05888fd911f59cdb43aae0bd5";
        libraryHaskellDepends = [ base data-type ];
        description = "Combining functions";
        license = stdenv.lib.licenses.bsd3;
@@ -53613,7 +53786,7 @@ self: {
      mkDerivation {
        pname = "function-instances-algebra";
        version = "0.1";
-       sha256 = "0dxym6xrylngw8r5spi246nmi8fvvxxx776qismcr04zqshv7ygw";
+       sha256 = "fcf9b3a1c69f80ccaa8ed89cd37bdfdba158ad21225e5d32e2cf529fbba9be37";
        libraryHaskellDepends = [ base numeric-prelude ];
        jailbreak = true;
        homepage = "github.com/kreuzschlitzschraubenzieher/function-instances-algebra";
@@ -53626,7 +53799,7 @@ self: {
      mkDerivation {
        pname = "functional-arrow";
        version = "0.0";
-       sha256 = "1la9xqm5gs6a6cb18wyx9wr0nx6p5ryhczvb72d0zm6xrjrf0r5s";
+       sha256 = "ba64e0b2ccddd40f9a386b7f067d2ed7740b324fdd73141633cae8572aee49d1";
        libraryHaskellDepends = [ base HList ];
        jailbreak = true;
        description = "Combinators that allow for a more functional/monadic style of Arrow programming";
@@ -53639,7 +53812,7 @@ self: {
      mkDerivation {
        pname = "functor-apply";
        version = "0.11";
-       sha256 = "0jshf7and80p0gq26zz83xj4p3ff8lppa5252qg0646xsr06lfkr";
+       sha256 = "793a6a40d6dd10031e164514752f45ce8d4b641fe87f23f00317a066d571504b";
        homepage = "http://comonad.com/reader/";
        description = "This package has been subsumed by semigroupoids";
        license = stdenv.lib.licenses.bsd3;
@@ -53653,7 +53826,7 @@ self: {
      mkDerivation {
        pname = "functor-combo";
        version = "0.3.6";
-       sha256 = "1jlva6imjjpj9iww7dxiplw60vszjiw6456yq30zsqrb63sz2lk1";
+       sha256 = "6152f1f5302b63fdc1c0de146278945f6f6038bdb1b7c3794cf24a59a3519bca";
        libraryHaskellDepends = [
          base base-orphans containers data-inttrie lub type-unary
          TypeCompose
@@ -53667,7 +53840,7 @@ self: {
      mkDerivation {
        pname = "functor-infix";
        version = "0.0.3";
-       sha256 = "1hpk1q58kwxdpva57hylpqj4ywk6grsi4ks2cqg6lspprqfi60gy";
+       sha256 = "fe01131dcef76a6a1e66424f12757e66724f24bed4c353d4beadf3890a0ef3c2";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/fmap/functor-infix";
        description = "Infix operators for mapping over compositions of functors. Lots of them.";
@@ -53679,7 +53852,7 @@ self: {
      mkDerivation {
        pname = "functor-monadic";
        version = "0.1.0.3";
-       sha256 = "1qfrnny4qsn94n24q705z8d9gh9llz9nbyqbyy7hwh79bf1rkrcg";
+       sha256 = "8fe599835be9400e8ff70bfb65d3a734c1971afa051c4c8425c96a4cbcb5d9e1";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ombocomp/FunctorMonadic/";
        description = "Monad-style combinators for functors";
@@ -53691,7 +53864,7 @@ self: {
      mkDerivation {
        pname = "functorm";
        version = "1.0.1";
-       sha256 = "1aa4f6yp4vrrrs3rswhjxw2gij3mwn8yf299kgv42wd03xazyxrs";
+       sha256 = "3a77ff551fa07141f69b2909e791e575c8f804ef12729d87ce396f72bd7144a9";
        libraryHaskellDepends = [ base ];
        description = "Data.FunctorM (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
@@ -53703,7 +53876,7 @@ self: {
      mkDerivation {
        pname = "functors";
        version = "0.1";
-       sha256 = "0nfnjxihn0nhj0rhi1wvqax1f95wskr3fwb7c2clz4lvsma6bfg6";
+       sha256 = "e6b96554d59b924f9960677137f2d4bc2417bac29b87083390d0020b6397d659";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/aristidb/functors";
        description = "(.:) and friends, syntax for Functor and Applicative.";
@@ -53717,7 +53890,7 @@ self: {
      mkDerivation {
        pname = "funion";
        version = "0.0.2";
-       sha256 = "0pgl4fg29xg7g2pdyjqmi7qlpzcs25ggwg6d9y4fzbc7fzh31wxv";
+       sha256 = "bbf330e07787adef884fcd3cfe5e119afd4bf189154bdfae78e7f5249e23f45d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -53735,7 +53908,7 @@ self: {
      mkDerivation {
        pname = "funpat";
        version = "0.1";
-       sha256 = "0zblrfg8mfbc1hzxb36hk2lb3c167xmpcvg8h595m9kjpdmj4ayw";
+       sha256 = "dc2b226bbb72a65a5281e86d766b3f26b0b1a898d08cd53f0c6cb98a9ecb747d";
        libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "A generalization of pattern matching";
@@ -53749,7 +53922,7 @@ self: {
      mkDerivation {
        pname = "funsat";
        version = "0.6.2";
-       sha256 = "1hyyx3ivrhw5svklyl36qzbcd0wwx4978znvn42lsl53273ds5n3";
+       sha256 = "c316ddc611a3504d05b1db7e7412e99c83c6d6c766504fe7d685c3bce3e8dec3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53766,12 +53939,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fusion" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, pipes-safe
+     , transformers, void
+     }:
+     mkDerivation {
+       pname = "fusion";
+       version = "0.1.2";
+       sha256 = "b66f1d552ac2107574fd8faad1ac3c3b2f99d90aaac2a5f57d77b41a3272472b";
+       libraryHaskellDepends = [ base pipes-safe transformers void ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "https://github.com/jwiegley/fusion";
+       description = "Effectful streaming library based on shortcut fusion techniques";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "futun" = callPackage
     ({ mkDerivation, base, bytestring, network, unix }:
      mkDerivation {
        pname = "futun";
        version = "0.1.0.2";
-       sha256 = "1vfi30mlr0lds975wgq3197sv1qdwy6lvm6xaqwk28h5flmk28k1";
+       sha256 = "6122312b750522313956ddd44d8de70d87ad4f0a033f5e4ed28d824c2b18d1ed";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring network unix ];
@@ -53785,7 +53973,7 @@ self: {
      mkDerivation {
        pname = "future";
        version = "2.0.0";
-       sha256 = "1gvv1m6sfxdc28h4rzp5dh6hrz6nfh031nhs192606v8wg78m3ri";
+       sha256 = "318f8acee3681b60440a1ada300074d6fc0c0d6ce5fe4c2012ac75a74d0d7bbf";
        libraryHaskellDepends = [ base ];
        homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/future";
        description = "Supposed to mimics and enhance proposed C++ \"future\" features";
@@ -53798,7 +53986,7 @@ self: {
      mkDerivation {
        pname = "future-resource";
        version = "0.4.0.0";
-       sha256 = "10whksji6r1bilmj2fxcccg89zh7c08s2zfn07r6wj3xgschrckv";
+       sha256 = "7bb20c997e7d486ef201d67da1116007fe841e63ac3b212b8d2b6413a59e9083";
        libraryHaskellDepends = [ base transformers ];
        description = "realtime resource handling with manual concurrency";
        license = stdenv.lib.licenses.gpl3;
@@ -53811,7 +53999,7 @@ self: {
      mkDerivation {
        pname = "fuzzcheck";
        version = "0.1.1";
-       sha256 = "0qfr4f0b50l368b45yzwhqd4g2y1kvfrfj4hr84cdxcwdrwn9mpc";
+       sha256 = "ecd664796e9cf5c608ca904897dd9ec18b471a86fcfb4216328382b28023d961";
        libraryHaskellDepends = [
          base lifted-base monad-control QuickCheck random transformers
        ];
@@ -53828,7 +54016,7 @@ self: {
      mkDerivation {
        pname = "fuzzy";
        version = "0.1.0.0";
-       sha256 = "1jz9arrg33x64ygipk0115b7jfchxh20cy14177iwg0na8mpl2l2";
+       sha256 = "820a7a2b52163c1ecf0924780604ec903979560901cc1b9f27a68ff17256e9cb";
        libraryHaskellDepends = [ base monoid-subclasses ];
        testHaskellDepends = [ base HUnit ];
        homepage = "http://github.com/joom/fuzzy";
@@ -53844,7 +54032,7 @@ self: {
      mkDerivation {
        pname = "fuzzy-timings";
        version = "0.0.1";
-       sha256 = "1sm4g04y9n8r61q2sqa91n87hh32kpcn2r5zjlvdy7qxc11lrmj7";
+       sha256 = "47d64c43601d1fdf3695bf6461d99d624078900d49612d703019d9e40978a4ea";
        libraryHaskellDepends = [
          base containers glpk-hs mtl random time
        ];
@@ -53863,7 +54051,7 @@ self: {
      mkDerivation {
        pname = "fuzzytime";
        version = "0.7.7";
-       sha256 = "16ybyzki390g2172d3f48vyr1gr27grkvs1jjb6cblws34n5g2pr";
+       sha256 = "f98a572c199ad3c5cc9232e83df33b22bf90fd46c48d264e100fa411e7f7cb9b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -53882,7 +54070,7 @@ self: {
      mkDerivation {
        pname = "fwgl";
        version = "0.1.2.2";
-       sha256 = "1s4j1wgnncn6cmsarsc989zxz1qsqhsa722h7bv2k43093ww0nnh";
+       sha256 = "d05ac0f948609029f63a5088a334c41a87df7f4289e9ac7465c6326b1f0f92e8";
        libraryHaskellDepends = [
          base hashable transformers unordered-containers vector Yampa
        ];
@@ -53899,7 +54087,7 @@ self: {
      mkDerivation {
        pname = "fwgl-glfw";
        version = "0.1.0.5";
-       sha256 = "1y30mqayih5cd74dm90y7mbb9a0fw9sirzjlrmayvcm7aniyvmql";
+       sha256 = "14d7eda355a7b2ed55cd54fe1c75e20ea8b4563d1ea4dac869acc0e815ae60f8";
        libraryHaskellDepends = [
          base fwgl gl GLFW-b hashable JuicyPixels transformers
          unordered-containers vector Yampa
@@ -53917,7 +54105,7 @@ self: {
      mkDerivation {
        pname = "fwgl-javascript";
        version = "0.1.0.6";
-       sha256 = "0fxnnjp7403c29pjks739j0j92a1sldrrxg3sp4nrjb1ax01nia9";
+       sha256 = "49451b405761c96cc9d5e3f59c1bd5418924814ce3e8296f126c0072aeb4b63b";
        libraryHaskellDepends = [
          base fwgl ghcjs-base hashable unordered-containers Yampa
        ];
@@ -53933,7 +54121,7 @@ self: {
      mkDerivation {
        pname = "g-npm";
        version = "0.1.0";
-       sha256 = "1blr3xbqn8fa59av4kgfp2y3szky40v5qmw3k9gsr2barrvkjqz0";
+       sha256 = "e0633977ce6a89ac5f9a83575c36207e7e3dbcb8ee4db2552aca218b571f99ae";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base HTTP json ];
@@ -53949,7 +54137,7 @@ self: {
      mkDerivation {
        pname = "gact";
        version = "0.2";
-       sha256 = "0p1rb24yldkjnkrygjb43g63vfgzq2bix7rrmiqyrdwb37s65ixq";
+       sha256 = "b8c762f4198bb7ec71ac399f1e97c0ffb93dcc1b64c9e7f3b47236ea8958395c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -53965,7 +54153,7 @@ self: {
      mkDerivation {
        pname = "game-of-life";
        version = "0.1.0.4";
-       sha256 = "1d2hy2bb3dgzf3bj0p97hchsznzckirgws8cjm9qh5ba5mk0wl2z";
+       sha256 = "5f500e662d6a158853950c69fe729cecdbaf2183275d20d770ffb5b196f050b4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base hscurses random text ];
@@ -53981,7 +54169,7 @@ self: {
      mkDerivation {
        pname = "game-probability";
        version = "1.1";
-       sha256 = "1wl29h702g79kwy4ca35x1q37aaj3rphf1i9vdm2hmd44bzrwvkk";
+       sha256 = "736e9eff22a455286adb2906076f1e52a93370e86528463c9fe93c010e4c82f2";
        libraryHaskellDepends = [ base containers probability random ];
        jailbreak = true;
        description = "Simple probability library for dice rolls, card games and similar";
@@ -53993,7 +54181,7 @@ self: {
      mkDerivation {
        pname = "game-tree";
        version = "0.1.0.0";
-       sha256 = "1g8gkp4g18dr6m0scilhgdwg0zh0f9a2q3b1sk0gh4m3jw6gj4m5";
+       sha256 = "a512f90c97a312f8c0d4610d2c5472007ef0787b9046a64135b9a1f0c89d0fbd";
        libraryHaskellDepends = [ base ];
        description = "Searching game trees with alpha-beta pruning";
        license = "GPL";
@@ -54004,7 +54192,7 @@ self: {
      mkDerivation {
        pname = "gameclock";
        version = "1.0.4";
-       sha256 = "192rn2d8bil8wqilnaqxba8nzq0fjlbf0innv6rdcjs1kxw1ga0l";
+       sha256 = "14a817789f414bd6b2d9d646e016950ee06f915a1d2b4b23e688c6859ab059a4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cairo containers glib gtk time ];
@@ -54020,7 +54208,7 @@ self: {
      mkDerivation {
        pname = "gamma";
        version = "0.9.0.2";
-       sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq";
+       sha256 = "983ac33f0141f576425ae85b883ba8241bdfc73ff48d7ea8124a05a731a8e427";
        libraryHaskellDepends = [
          base continued-fractions converge template-haskell vector
        ];
@@ -54034,7 +54222,7 @@ self: {
      mkDerivation {
        pname = "gang-of-threads";
        version = "3.2.1";
-       sha256 = "0gj7ln0xq1a7zzxhyl636z854xfq714kmh2ld30ll0dskr701l1p";
+       sha256 = "37d0004e9eba014ac16854c03a4938d87552d037c3500ffbff4705dc81a5473e";
        libraryHaskellDepends = [ base containers mtl stm transformers ];
        description = "Non-deterministic parallelism with bags";
        license = stdenv.lib.licenses.bsd3;
@@ -54045,7 +54233,7 @@ self: {
      mkDerivation {
        pname = "garepinoh";
        version = "0.9.9.2.1";
-       sha256 = "1cylwaj62gmcjczw5g44k9x6g5bamgk88h2arbbripzphhaf7cm7";
+       sha256 = "a7b2e31484f7df98d7ca4a4084e6ab6a95677a9a84bcc23f93ac3e61a4e2d4b3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base haskeline transformers ];
@@ -54061,7 +54249,7 @@ self: {
      mkDerivation {
        pname = "garsia-wachs";
        version = "1.2";
-       sha256 = "0mks5nwc19i0wsc5hhxh0ji2bh0224y3r89b3p9dfzzn64n3za6v";
+       sha256 = "dba83f2c31f67fd7d21d2ba13c3c1102c025a204b0435898e620a6c0b82d7a56";
        libraryHaskellDepends = [ base ];
        description = "A Functional Implementation of the Garsia-Wachs Algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -54074,7 +54262,7 @@ self: {
      mkDerivation {
        pname = "gbu";
        version = "0.1";
-       sha256 = "0zqgq5hr3vmajijf1vmc1s1lwilnymwvv493rra4fl0zy28k5cz6";
+       sha256 = "e6b33291f01f504754ce2391bd79f596464e830eaceee06494aaee9161c10f7f";
        libraryHaskellDepends = [
          base containers fgl Graphalyze haskell98 mtl regex-posix
        ];
@@ -54090,7 +54278,7 @@ self: {
      mkDerivation {
        pname = "gc-monitoring-wai";
        version = "0.1.2";
-       sha256 = "04i86mngz0s6x5j36vs2nrxivqayqjfa2ppk016r4ffs4mi7i4va";
+       sha256 = "6a93786225da39924d00f35ea19cc45ee11d7bb6426f3364e94683ff6c352812";
        libraryHaskellDepends = [
          aeson base blaze-builder conduit http-types text transformers
          unordered-containers wai
@@ -54106,7 +54294,7 @@ self: {
      mkDerivation {
        pname = "gconf";
        version = "0.13.0.2";
-       sha256 = "0xyxia19bfpi4pd118d33z8gi5cnyygs3idrby7zrmj69rnwj2lk";
+       sha256 = "930ac96d4e46d6fc8f5fb9c5a19ff79695f8d01fa3a110da25f1ba95828add77";
        libraryHaskellDepends = [ base glib text ];
        libraryPkgconfigDepends = [ GConf ];
        libraryToolDepends = [ gtk2hs-buildtools ];
@@ -54122,7 +54310,7 @@ self: {
      mkDerivation {
        pname = "gd";
        version = "3000.7.3";
-       sha256 = "1dkzv6zs00qi0jmblkw05ywizc8y3baz7pnz0lcqn1cs1mhcpbhl";
+       sha256 = "14aecb600d9a058b1905dfdef3d51a1eb11fb92f804fbaaa041103a0bfd97fb6";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [
          expat fontconfig freetype gd libjpeg libpng zlib
@@ -54139,7 +54327,7 @@ self: {
      mkDerivation {
        pname = "gdiff";
        version = "1.1";
-       sha256 = "1d0d8f8bfw7ld6a1d5y6syzdha5qsm909mqzd5gfqcbi2wnh8aqc";
+       sha256 = "0c2b042d177131ec5e691fd70452d5b828d8bed7c697169469f470b790430db4";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/eelco/gdiff";
        description = "Generic diff and patch";
@@ -54153,7 +54341,7 @@ self: {
      mkDerivation {
        pname = "gdiff-ig";
        version = "0.1.1";
-       sha256 = "1ma9w9ypk078vvqwlfgkwcw962xha1g1fx4abji1b7km09p58jm2";
+       sha256 = "a24a546e02759e15a25c8a74175e50b00b9338e3f339caf1dee880797de249d5";
        libraryHaskellDepends = [
          array base ghc-prim instant-generics template-haskell
        ];
@@ -54170,7 +54358,7 @@ self: {
      mkDerivation {
        pname = "gdiff-th";
        version = "0.1.0.7";
-       sha256 = "1ihbz95k01giqbpbp1hddx71pkhz63pz5q4b71gv6z2vvvh34s2w";
+       sha256 = "5c6832e0de5b7cb35f388be0f2ef301fce1b4e6f0d86bbeec2f105304bfa0bc6";
        libraryHaskellDepends = [
          base containers gdiff mtl template-haskell th-expand-syns uniplate
        ];
@@ -54189,7 +54377,7 @@ self: {
      mkDerivation {
        pname = "gearbox";
        version = "1.0.0.3";
-       sha256 = "1j68vrb0fxschslh3q5i1afv0vx8q6qgv1bipfr3p77cqazp26zx";
+       sha256 = "fd1b71bfc2ec9c3bb2bb7185fdb0c1a86fb09d0ab1e001a9864c770756dec8c8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT OpenGLRaw Vec ];
@@ -54208,7 +54396,7 @@ self: {
      mkDerivation {
        pname = "geek";
        version = "1.1.1.0";
-       sha256 = "0n52s5azqqx06flfhsgbp5a63mpd4vd60y4rzrpa4jx13bydlp50";
+       sha256 = "a05cdafc1aa14ba26efe997860da26edd66154b9eb69e8a833a063fc55d1a258";
        libraryHaskellDepends = [
          aeson aeson-pretty air air-extra air-th base bytestring containers
          curl data-default directory filepath fsnotify Glob hack2
@@ -54228,7 +54416,7 @@ self: {
      mkDerivation {
        pname = "geek-server";
        version = "1.1";
-       sha256 = "1951jw8la59c7qvjpx8x898l7hnwc51c4264mmw0h402ik233bp2";
+       sha256 = "e2ae31c48c02100878adc408c24261dcc24351421df52b373e2c15451197a1a4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -54253,7 +54441,7 @@ self: {
      mkDerivation {
        pname = "gemstone";
        version = "0.3.0.1";
-       sha256 = "0y9ilxpkyb42iddks31k1f6vjkm78z6yaj2yd9ppis42r2advg40";
+       sha256 = "80bcdd94c882e8786f6a5e48e5cd47a74eb98d0b330c3d5b8b822c3f6fa73179";
        libraryHaskellDepends = [
          array base bitmap bitmap-opengl containers FTGL lens linear OpenGL
          random SDL SDL-image stb-image transformers
@@ -54272,7 +54460,7 @@ self: {
      mkDerivation {
        pname = "gencheck";
        version = "0.1.1";
-       sha256 = "1fa1p13zmqqhlcakcy73ypasn4ircg1x5p3q1p5mklvfjifphfir";
+       sha256 = "393a785d946ed359cb0d78dcd2c3633912abd5f5e3783615a310e3fa47b841b9";
        libraryHaskellDepends = [
          base combinat containers ieee754 memoize random template-haskell
          transformers
@@ -54288,7 +54476,7 @@ self: {
      mkDerivation {
        pname = "gender";
        version = "0.1.1.0";
-       sha256 = "0sfl3729v03s5ykd8ijv4yrf8lzja5hyaphsfgk96gcx3zvd1a0q";
+       sha256 = "18a8d0f61f9d3d93e6731a5ee56151f253e4b2275b46d4a62f7a809dc419d469";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base text ];
@@ -54307,7 +54495,7 @@ self: {
      mkDerivation {
        pname = "genders";
        version = "0.1.0.1";
-       sha256 = "0jl1sqj9syp31qcn3x6c0pjwj5ligirsc67ahzw2chgpf09bwh8g";
+       sha256 = "0f41be1270f74126f887ea18a6737c9116c9e505ccf461190ee37a9d24d6814a";
        libraryHaskellDepends = [ base bytestring filepath vector ];
        librarySystemDepends = [ genders ];
        testHaskellDepends = [ base bytestring hspec network vector ];
@@ -54322,7 +54510,7 @@ self: {
      mkDerivation {
        pname = "general-prelude";
        version = "0.1.2";
-       sha256 = "0km8nrd7pili8s5fz68xpb6nw9mfk0phgwaxnflk6a78vz9ic76d";
+       sha256 = "cd1c16d3dfe82833a9b35df1072f98ae266ecdba1d99ef8a4691c67b5ab6a84e";
        libraryHaskellDepends = [
          base lens pointless-fun strict system-filepath
        ];
@@ -54336,7 +54524,7 @@ self: {
      mkDerivation {
        pname = "generator";
        version = "0.5.5";
-       sha256 = "1rwz2ribijj5hb2isg0yz6hb2mwyjhzfg0ys041yb43qlcbhkhdd";
+       sha256 = "adc10917a37890e50301da83e73e949e57b1a0f91e3c1dc58245cab862169fe7";
        libraryHaskellDepends = [ base List transformers ];
        homepage = "http://github.com/yairchu/generator/tree";
        description = "Python-generators notation for creation of monadic lists";
@@ -54348,7 +54536,7 @@ self: {
      mkDerivation {
        pname = "generators";
        version = "1.0.3";
-       sha256 = "0i51xx2hhjqjdvyzy2jza921jcfhy37azyp1cfaakvrj9kxl2w2q";
+       sha256 = "587041fb4c32efa99463e1faafcef0d0311944525f0afffd6e124b0845efa144";
        libraryHaskellDepends = [ base mtl random ];
        jailbreak = true;
        homepage = "http://liamoc.net/pdf/Generator.pdf";
@@ -54364,7 +54552,7 @@ self: {
      mkDerivation {
        pname = "generic-accessors";
        version = "0.4.1";
-       sha256 = "1qhik496296v42pjmlxxlimnw4z9p451ndc2fjvrid4g0knfzvg0";
+       sha256 = "e0edefec048fb498b77482351b0ab9e9136e6ba4bdd32aaf20db2461129911e2";
        libraryHaskellDepends = [ base linear spatial-math ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -54380,7 +54568,7 @@ self: {
      mkDerivation {
        pname = "generic-aeson";
        version = "0.2.0.7";
-       sha256 = "06qczarf6vzd9wr9ad685v69hvd88zfv5lhry0zkka2bcdqc5wqz";
+       sha256 = "1ff3c270634ba8393ff019d2b2dd47a86d98cc2ec83495324fed6fe3b2fa0c1b";
        revision = "1";
        editedCabalFile = "f14b6017d6c92b2fc7a585bc81fd2ee286c8d73338cf1eb5964006bffeb70abd";
        libraryHaskellDepends = [
@@ -54396,7 +54584,7 @@ self: {
      mkDerivation {
        pname = "generic-binary";
        version = "1.0.1";
-       sha256 = "1h6xs56c351137mjc3hdba7yfcw8jy9dvzj0vdrgwm0dprn0xh29";
+       sha256 = "49c00e6cbe0d54fe72db40fedd92978833e78f5a0d0e26eb192194c14cd1ddc0";
        libraryHaskellDepends = [ base binary bytestring ghc-prim ];
        jailbreak = true;
        description = "Generic Data.Binary derivation using GHC generics.";
@@ -54409,7 +54597,7 @@ self: {
      mkDerivation {
        pname = "generic-church";
        version = "0.3.0.0";
-       sha256 = "1cw48dnw2nbnm3vr5xcsz7nma6g8dxvwvv7hwm63jikd9jgisnac";
+       sha256 = "4c591d9f4c6d46394ce5f0eccd776fe81955edf99af592f7a87659c16d4384b3";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -54424,7 +54612,7 @@ self: {
      mkDerivation {
        pname = "generic-deepseq";
        version = "2.0.1.1";
-       sha256 = "1yajkzp79ri5i7n5ynv0i6spxyg6kyi6qvqj46brlgjag98526iv";
+       sha256 = "3b1a51507a4a3e9a9721126f6ca29fe6f97eb589605b5fec8925e674ee9f52f9";
        revision = "1";
        editedCabalFile = "58ed9aeb48cc2a00e3122780fcbf2732c4d6fc46198434926a8b1bcc91d4a29b";
        libraryHaskellDepends = [ base ghc-prim ];
@@ -54437,7 +54625,7 @@ self: {
      mkDerivation {
        pname = "generic-deriving";
        version = "1.8.0";
-       sha256 = "1kc6lhdanls6kgpk8xv5xi14lz1sngcd8xn930hkf7ilq4kxkcr6";
+       sha256 = "26b3d927c1341e372118c976d4d8b33a7c4a42ec657734ef9b4653ab1aa486cd";
        libraryHaskellDepends = [ base ghc-prim template-haskell ];
        description = "Generic programming library for generalised deriving";
        license = stdenv.lib.licenses.bsd3;
@@ -54448,7 +54636,7 @@ self: {
      mkDerivation {
        pname = "generic-lucid-scaffold";
        version = "0.0.1";
-       sha256 = "13lry3hqqrqgk5z9dc6q6hr70iqky4ssra2l71y51gnrg1kprkrz";
+       sha256 = "3fcf7c6778d9be507c3854a8ac35f11347703234d8b0967e990f678ce1f0998e";
        libraryHaskellDepends = [ base lucid text ];
        description = "General-purpose web page scaffold for Lucid";
        license = stdenv.lib.licenses.mit;
@@ -54463,7 +54651,7 @@ self: {
      mkDerivation {
        pname = "generic-maybe";
        version = "0.3.0.4";
-       sha256 = "1gs89wzs3288l2p24pj5yi68xyy2kj3aczj31zk6v9xi3bwb73x1";
+       sha256 = "a18fb3f81ab1a76de60f437ea6869cc2fb8e4cf4455e22aea00889a13f4f48bf";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base bytestring containers deepseq directory doctest filepath
@@ -54483,7 +54671,7 @@ self: {
      mkDerivation {
        pname = "generic-pretty";
        version = "0.1.0";
-       sha256 = "0mg7mdbxf3va0xl2j0kz5wzy3mg6nvxv68axfjvx1zij1yjlamn7";
+       sha256 = "c75645a50f32fed0b7745d21b3fbb6e6d5e13f2f7f022968076a0fd757abe755";
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring containers text vector
        ];
@@ -54500,7 +54688,7 @@ self: {
      mkDerivation {
        pname = "generic-server";
        version = "0.1";
-       sha256 = "0bl3gfqdw6sdwcailzkzmpz433cpxf6np9w9qnkwwa05xhcpd2k6";
+       sha256 = "668a7619ec0528cea7c589a76b8deb978d41fead7f7e1a15e34d1bdeb07b832e";
        libraryHaskellDepends = [ base bytestring network ];
        description = "Simple generic TCP/IP server";
        license = stdenv.lib.licenses.bsd3;
@@ -54511,7 +54699,7 @@ self: {
      mkDerivation {
        pname = "generic-storable";
        version = "0.1.0.0";
-       sha256 = "016gg232r453i7grbjg2hb69ww8jqgafnq32f38lv7l81dgzwfxj";
+       sha256 = "b23bfe5f0b889e4dd1706260ebd4c312719ecc82e2c995df89a3902c8678cf04";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base ghc-prim hspec QuickCheck ];
        jailbreak = true;
@@ -54525,7 +54713,7 @@ self: {
      mkDerivation {
        pname = "generic-tree";
        version = "15329.2";
-       sha256 = "1frwwa45kahflnw2cgs8nb8jfxgrxw0n9i7h9cakpqzgbywy9b28";
+       sha256 = "48ace4b95fefe33b154bf0c46401eff97527d1b2483f26b8a50eaa5988e23cbb";
        libraryHaskellDepends = [ base ];
        description = "Generic Tree data type";
        license = "LGPL";
@@ -54536,7 +54724,7 @@ self: {
      mkDerivation {
        pname = "generic-trie";
        version = "0.3.0.1";
-       sha256 = "09f4rasw8q2yi7dakcr21igy02vhgiasylw6lzsz225kl58vjwz7";
+       sha256 = "e773b951a1b308f1f5a78653af557c700be05f0c22b3a9da895e60c4b5cac425";
        libraryHaskellDepends = [ base containers transformers ];
        homepage = "http://github.com/glguy/tries";
        description = "A map, where the keys may be complex structured data";
@@ -54549,7 +54737,7 @@ self: {
      mkDerivation {
        pname = "generic-xml";
        version = "0.1";
-       sha256 = "08fy9wc90wcnr74wbr7q3pfr0bigrzhchx158p1ji3gagb2n2njd";
+       sha256 = "4d5a61c57aea8d28c3452574c8e0cf2f2e90dd1df8e4c5c9c9967190184fde21";
        libraryHaskellDepends = [
          base HaXml mtl syb-with-class template-haskell
        ];
@@ -54565,7 +54753,7 @@ self: {
      mkDerivation {
        pname = "generic-xmlpickler";
        version = "0.1.0.3";
-       sha256 = "11vbfsws5agqiv9x6pfh0z6kbvjx6i27wnp5dcjh40z4bz6bjdgy";
+       sha256 = "fe35b9cc5fe40302256be55a7e44345dee35cd07d05dd3d38ef8a9a2b9766b87";
        libraryHaskellDepends = [ base generic-deriving hxt text ];
        testHaskellDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
@@ -54580,7 +54768,7 @@ self: {
      mkDerivation {
        pname = "generics-sop";
        version = "0.1.1.2";
-       sha256 = "1r9icxwyh4pg952yaywk4nfj4j21klzf361z9z24avd6vw89p6v7";
+       sha256 = "679b9b10dfa66d45c44f3f98e13e9d4148229d25937be54549ef12e8796731e5";
        libraryHaskellDepends = [ base ghc-prim template-haskell ];
        description = "Generic Programming using True Sums of Products";
        license = stdenv.lib.licenses.bsd3;
@@ -54591,7 +54779,7 @@ self: {
      mkDerivation {
        pname = "genericserialize";
        version = "0.1";
-       sha256 = "0zpb5rq2zvfsb0wlp9q4cckjkz6sdrngpir49d0sr06pivh8s6cl";
+       sha256 = "94198de08ed780ac414b24c7fb6c6edafc29276304a74b3958daed2f702eeb7e";
        libraryHaskellDepends = [ base ];
        description = "Serialization library using Data.Generics";
        license = stdenv.lib.licenses.bsd3;
@@ -54603,7 +54791,7 @@ self: {
      mkDerivation {
        pname = "genetics";
        version = "0.0.2";
-       sha256 = "0rq1m7psvs2r35mnz7gwmsvzyd3jv44bqp0zhq8l7mq2pq2x7dhv";
+       sha256 = "1bb6d305be02d74311861f5cbc08d97234ffb7aefc9d6f6b1959e8adefa90167";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base random-fu ];
@@ -54620,7 +54808,7 @@ self: {
      mkDerivation {
        pname = "geni-gui";
        version = "0.24.1";
-       sha256 = "1kng7bv8amch6bswhica6xhmavc0r5phg402lg76xwz7ywrsc6y3";
+       sha256 = "c31ba633f7e7f36ecea30290076fc9806d5561378a45c8f532905585f63acfce";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -54643,7 +54831,7 @@ self: {
      mkDerivation {
        pname = "geni-util";
        version = "0.24.1.1";
-       sha256 = "1ydxg10s6bk02i3mikb8aqjai099874gby26q50lwf9xp04csbfk";
+       sha256 = "d32dcd08b83d394e41c146f8f5c8412981a8245668cd584714602ea34178bdf9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -54667,7 +54855,7 @@ self: {
      mkDerivation {
        pname = "geniconvert";
        version = "0.20";
-       sha256 = "0brnh6f8zdpn37fjdmnpbdvb75vmaf6iq7i9vpv4a8g7asc425wd";
+       sha256 = "8d17419856e72145f6dd291e1c8d537597b3765bd7d626dd19f6b68f9c81362f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -54686,7 +54874,7 @@ self: {
      mkDerivation {
        pname = "genifunctors";
        version = "0.3";
-       sha256 = "16jsy5dyp1hqnk40nzjprkw3bfdbc92vkgzmwdds67ljh0jn6815";
+       sha256 = "2520632580921ea35be3f5bfb94562abb935f8cc577e0bc8b41886eb5bf15a9a";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        testHaskellDepends = [ base containers mtl template-haskell ];
        homepage = "https://github.com/danr/genifunctors";
@@ -54699,7 +54887,7 @@ self: {
      mkDerivation {
        pname = "geniplate";
        version = "0.6.0.5";
-       sha256 = "01cwyf5kql4hf76p1ssqpmhaxyl7rmnmqwv644wgd0j8km8b6szc";
+       sha256 = "ec6bb3509d4882f6382166735c6dcd87faae60bd58eb70cd7190503c8bf39c05";
        libraryHaskellDepends = [ base mtl template-haskell ];
        jailbreak = true;
        description = "Use Template Haskell to generate Uniplate-like functions";
@@ -54711,7 +54899,7 @@ self: {
      mkDerivation {
        pname = "geniplate-mirror";
        version = "0.7.1";
-       sha256 = "0wz7fp0cgf7xn37mmy91scacihnr0fcd6lpbi28yx4qss2hb1m30";
+       sha256 = "60d4b0a0d01a93ee9188eb52d39803d9c2c814d321f95acfb0fdb8c7c075e773";
        libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/danr/geniplate";
        description = "Use Template Haskell to generate Uniplate-like functions";
@@ -54725,7 +54913,7 @@ self: {
      mkDerivation {
        pname = "geniserver";
        version = "0.24.1.1";
-       sha256 = "1597ah64rqag20qx8dvjmdhhhsjzsfdq2f43y3jyy2cnzssj953c";
+       sha256 = "6c9424b5fe9609efe5f08338819bd35f6a0861ab7237d431104fe14c0c542795";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -54746,7 +54934,7 @@ self: {
      mkDerivation {
        pname = "genprog";
        version = "0.1.0.2";
-       sha256 = "1a9b2h4swfwx5zwcyr2zdhxdxi9f68pwpglijxhxb5javjc4dppr";
+       sha256 = "f9de4698dc4a96d5619791becb2f322ec5de3a6c5f64cff82f9d3bae09142ba9";
        libraryHaskellDepends = [ base MonadRandom syb syz ];
        jailbreak = true;
        homepage = "http://github.com/jsnajder/genprog";
@@ -54759,7 +54947,7 @@ self: {
      mkDerivation {
        pname = "gentlemark";
        version = "1.0.0";
-       sha256 = "1cb9si5axwqi1d893vp6n2mr68isdxc9qp6dfygy0v6hci2spnmm";
+       sha256 = "b5daab4564d06ce09f77cd5c9c586f3a2293abb0e6ee91500b11f3ae4ad469b1";
        libraryHaskellDepends = [ base parsec transformers ];
        testHaskellDepends = [ base HUnit parsec transformers ];
        jailbreak = true;
@@ -54773,7 +54961,7 @@ self: {
      mkDerivation {
        pname = "geocalc";
        version = "1.0.0";
-       sha256 = "1bvbvrkxh8dvm796ilpp294qlacid6aap2ljdi9pmz1lkf20fxjg";
+       sha256 = "4f7607849b34fc7a536c928aab946991298a4912f7d268d2a9bb21d867de6baf";
        libraryHaskellDepends = [ base ];
        description = "Libary for calculating distances between two coordinates in WSG84";
        license = stdenv.lib.licenses.bsd3;
@@ -54786,7 +54974,7 @@ self: {
      mkDerivation {
        pname = "geodetic";
        version = "0.1.4";
-       sha256 = "07l6yha31l0ahd6jhlj09vclms8km4q82xq2mfx2a3lbv2kffcfz";
+       sha256 = "df31e7a6d88b0e25baab02778130a913e94ad94e4052284d830ad03014f4861e";
        libraryHaskellDepends = [ base coordinate lens optional radian ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -54803,7 +54991,7 @@ self: {
      mkDerivation {
        pname = "geodetics";
        version = "0.0.3";
-       sha256 = "15ax0cj6q2zhlxl0fjxb434v1npq6w7n8bdqsw3vz3s9ngsvbldg";
+       sha256 = "afd1b5f5b3498fbf07d7b82d640f37f8dab0c920ab4b0768a7f00b6c24035d95";
        libraryHaskellDepends = [ array base dimensional ];
        testHaskellDepends = [
          array base dimensional HUnit QuickCheck test-framework
@@ -54821,7 +55009,7 @@ self: {
      mkDerivation {
        pname = "geohash";
        version = "1.0.1";
-       sha256 = "1pdx4pnq893kkjmgg0bgh9bfvfqdvzfq5fi02zfyhw3h8h4k05v4";
+       sha256 = "64173009447070e8dd1720ba82dddf0dbbed56826f81f7aa9c732484ed25bddd";
        libraryHaskellDepends = [ array base ];
        description = "Geohash latitudes and longitudes";
        license = stdenv.lib.licenses.bsd3;
@@ -54834,7 +55022,7 @@ self: {
      mkDerivation {
        pname = "geoip2";
        version = "0.1.0.1";
-       sha256 = "0h6iivpxkc1k463cj5npzagzd01xddinpnbv8357d40617gihgrg";
+       sha256 = "2f3f18df09069076ca407bd96b636b3d80f69ffad716c9862133b0d9ef8ed140";
        libraryHaskellDepends = [
          base binary bytestring bytestring-mmap containers iproute
          reinterpret-cast text
@@ -54852,7 +55040,7 @@ self: {
      mkDerivation {
        pname = "geojson";
        version = "1.3.0";
-       sha256 = "18fr5n3nmxlr97b7s9a5x1dx91fcg2fjfhlpxpcglkpwpkhabnqs";
+       sha256 = "1adba5e0bcfc4efad8ed9742279d78cc85d45be845257dd64999f66a872dd9a1";
        libraryHaskellDepends = [
          aeson base lens semigroups text transformers validation vector
        ];
@@ -54871,7 +55059,7 @@ self: {
      mkDerivation {
        pname = "geom2d";
        version = "0.1.3.1";
-       sha256 = "1kz0cdxfc27412vzqv7vcywg9pba177ds6mpwknxlh049vcfrvh5";
+       sha256 = "05eeecd84e0440daede4b71addce096addf4b867fb6cfcb708e408e67a63e0cf";
        libraryHaskellDepends = [ base ieee754 QuickCheck ];
        testHaskellDepends = [ base ieee754 QuickCheck ];
        description = "package for geometry in euklidean 2d space";
@@ -54885,7 +55073,7 @@ self: {
      mkDerivation {
        pname = "getemx";
        version = "0.1";
-       sha256 = "1qgq465ck4z0mix3ari9n7a5qx5xc1zii4hmfsp093vx3qlc5nwm";
+       sha256 = "95dbc2281e7d8f04ae761592187f60bd745cd4b12966357aace093c98a21f8e1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -54903,7 +55091,7 @@ self: {
      mkDerivation {
        pname = "getflag";
        version = "1.0";
-       sha256 = "0jsr8cmbnllcswdvf1rp11sc6cpjhwr22x7kx9sk3dw8bv772jjc";
+       sha256 = "4c4a71ce5e88b73175eaf374213287f232c374083707b71bd78c52bb2a43594b";
        libraryHaskellDepends = [ base ];
        description = "Command-line parser";
        license = stdenv.lib.licenses.mit;
@@ -54918,7 +55106,7 @@ self: {
      mkDerivation {
        pname = "getopt-generics";
        version = "0.10.0.1";
-       sha256 = "0x8vh0sng1m05blxr24ijrz16bsyvryxkk70jqkdvq173x5fj8lf";
+       sha256 = "8e22e94a1f27e0dd2696e0ccd97dde5e2f137e969188dce92aa0866735801b75";
        libraryHaskellDepends = [
          base base-compat base-orphans generics-sop tagged
        ];
@@ -54936,7 +55124,7 @@ self: {
      mkDerivation {
        pname = "getopt-simple";
        version = "0.1.0.2";
-       sha256 = "1pf40nc3jzprv4wn9h8mr0nhzxzilffgkapxg3k0qksfxydzv7pp";
+       sha256 = "f79efd9bef4e4f0ce678fdaaf99ca3f1f70f2dc815c16439d9f97e399805c4dd";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://bitbucket.org/dpwiz/getopt-simple";
        description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy.";
@@ -54953,7 +55141,7 @@ self: {
      mkDerivation {
        pname = "gf";
        version = "3.7";
-       sha256 = "13y01s94pq466jjzb3czxr93bdfh43mvypqp176n0zfp2v9496nb";
+       sha256 = "cb9a44d216d77d60cd09175fbfeb20d0b53552ee9f8df5a53486e04b920ec08f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -54983,7 +55171,7 @@ self: {
      mkDerivation {
        pname = "ggtsTC";
        version = "0.5";
-       sha256 = "0k5in0r3lwjr5yn4ayw5ssdvinh7zwzsx6pfjdj246ngx1r7ydxj";
+       sha256 = "b2377f72e8cf1a226493ee9aae3fff07dab89bd6857b45ac2f59723a32b0b14c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers parsec ];
@@ -55000,7 +55188,7 @@ self: {
      mkDerivation {
        pname = "ghc-core";
        version = "0.5.6";
-       sha256 = "11byidxq2mcqams9a7df0hwwlzir639mr1s556sw5rrbi7jz6d7c";
+       sha256 = "ec34f3e5892be7c2b52945875cd330397eca3904ae1d9574559855817b8b7e85";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -55018,7 +55206,7 @@ self: {
      mkDerivation {
        pname = "ghc-core-html";
        version = "0.1.4";
-       sha256 = "1yx22p9572zg2nvmlilbmraqjmws2x47hmin2l9xd0dnck5qhy35";
+       sha256 = "657888cb64b681d6131536567848179a578955ae8b465ab715ef8b53d215a2fb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -55034,7 +55222,7 @@ self: {
      mkDerivation {
        pname = "ghc-datasize";
        version = "0.1.2";
-       sha256 = "0bjdcfrk3q0rsy9wmw0b01q0vmbi9jsw1bxl4l78azs7xpk9yl03";
+       sha256 = "03509fe6ed477f850e25b4afc0b54c71d50d70000bf0ca93d719e031b3634d2e";
        libraryHaskellDepends = [ base ghc-heap-view ];
        homepage = "http://felsin9.de/nnis/ghc-datasize";
        description = "Determine the size of data structures in GHC's memory";
@@ -55046,7 +55234,7 @@ self: {
      mkDerivation {
        pname = "ghc-dup";
        version = "0.1";
-       sha256 = "0aw4wnbzfw031xqmq0lpi4zz2md1f43nj921ni91mhdl5xgqcajm";
+       sha256 = "552a865f2fb4c11a52b44124690771a155f13f8997025c710f0370f797e5842b";
        libraryHaskellDepends = [ base ghc ];
        jailbreak = true;
        description = "Explicitly prevent sharing";
@@ -55060,7 +55248,7 @@ self: {
      mkDerivation {
        pname = "ghc-events";
        version = "0.4.4.0";
-       sha256 = "0vagr03rivl5ymcnkxnzb1x5b4cr6xknnkwmfliqfrc1hhjgcaxb";
+       sha256 = "ab2bf624848165872375954f6b67379991557a58dff66959f585ee9807c84f6d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55084,7 +55272,7 @@ self: {
      mkDerivation {
        pname = "ghc-events-analyze";
        version = "0.2.1";
-       sha256 = "0lf063p2wj2d1hxb5hx4bcid3a3ni3g9x8sglm5q5kfbmdk7awj4";
+       sha256 = "44727566abcbcd824ba54fa39ede8876a8d1225ba4c3b23a0c4d482eee30c051";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -55105,7 +55293,7 @@ self: {
      mkDerivation {
        pname = "ghc-events-parallel";
        version = "0.5.0.1";
-       sha256 = "181qnh6mm3pmlalf17g2g87gj7hyzf5pxzvix1cmap2f31x4p6by";
+       sha256 = "7e994b7a184e5c5559e871ff7e8bfb1e1ef90e7ae29de0a8a2f58e5a0db438a0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55129,7 +55317,7 @@ self: {
      mkDerivation {
        pname = "ghc-exactprint";
        version = "0.3.1";
-       sha256 = "07kyifdh8s7jjp1jsm9f823hr0axgpxv54fr0vg8k3ibhdrw5dj1";
+       sha256 = "41b6c273832b8e89de06d991b2fb7d5d810c87402e552dc395f268049b8b7e1e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55149,7 +55337,7 @@ self: {
      mkDerivation {
        pname = "ghc-gc-tune";
        version = "0.3";
-       sha256 = "0ghp3f86m91zi6kl8zq157717s2p73nwdgln4aiclq830m72ys9w";
+       sha256 = "3c692f4e050361caa22296bec6ed3857e813ce29017f44a7893fa46a901b173e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath process ];
@@ -55163,7 +55351,7 @@ self: {
      mkDerivation {
        pname = "ghc-generic-instances";
        version = "0.1.0.0";
-       sha256 = "0264ma0w85fwypnagd0l4zfs1wi1yk16rygn6fhpzgsxycwmg47h";
+       sha256 = "f0905739f35dbf7fa133f6f96cc2f421f2a0dd2714b4a7ecf5dc15c481aac408";
        libraryHaskellDepends = [ base ghc ];
        homepage = "https://github.com/alanz/ghc-generic-instances";
        description = "Derived instances of GHC.Generic of the GHC AST";
@@ -55177,7 +55365,7 @@ self: {
      mkDerivation {
        pname = "ghc-heap-view";
        version = "0.5.4";
-       sha256 = "02n414m1lb6lilrkmjss2pd1s7hd4lf2sga7ql2ahib69kygzhx1";
+       sha256 = "a1c3fffc4c6645a804c5473d2d1c250d1e1dda155acb3a338dd42c1a2a09c40a";
        libraryHaskellDepends = [
          base binary bytestring containers ghc template-haskell transformers
        ];
@@ -55194,7 +55382,7 @@ self: {
      mkDerivation {
        pname = "ghc-imported-from";
        version = "0.2.0.6";
-       sha256 = "0y9gln7lbp8xqg5apfwfs95z3faawd236wqz69q8j7riwfra9bqm";
+       sha256 = "15afa4b2e3311f8970321f733344e34ab9f14bd28ebbabcac31ddd458fa52f79";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55223,7 +55411,7 @@ self: {
      mkDerivation {
        pname = "ghc-make";
        version = "0.3.2";
-       sha256 = "10vbibmgssb1ichxha92q5mqlaglhkcv4xxiikq4mh3l3bgzw6bj";
+       sha256 = "7219fedf1a74c04af08cb177b2d984f4298a6bc12229d8218b6169fdea8a6b83";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -55239,7 +55427,7 @@ self: {
      mkDerivation {
        pname = "ghc-man-completion";
        version = "0.0.0.3";
-       sha256 = "08qyn6mpmkq1vdfrqhckfqc096jv21scss76x9zcss4hfbljfa0p";
+       sha256 = "172827e9729068cd7eeae668cd74105b9a04187693419c5ddb01cf7aabb11e23";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base parsec process ];
@@ -55259,7 +55447,7 @@ self: {
      mkDerivation {
        pname = "ghc-mod";
        version = "5.2.1.2";
-       sha256 = "11wnrdb6blw169w6kd49ax9h1r9qkka5329lmdhimvki8amv8riv";
+       sha256 = "3b66b4ab4271ee1a61ab348951d49c38e500535789b469783281d36556cb9687";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55289,7 +55477,7 @@ self: {
      mkDerivation {
        pname = "ghc-mtl";
        version = "1.2.1.0";
-       sha256 = "0h6r6gip9nsjlsq88wj105hhqliy7ac2dmmndsfzbjz07b03cklk";
+       sha256 = "934e36c03ae0cbf59d6eb6d626983a3e520c6101417284b0a652db74e333d940";
        libraryHaskellDepends = [
          base exceptions extensible-exceptions ghc mtl
        ];
@@ -55306,7 +55494,7 @@ self: {
      mkDerivation {
        pname = "ghc-parmake";
        version = "0.1.8";
-       sha256 = "089ma8mjyvz61hr2907aihz8bh7h1pdmjrpm9smqmz8j5x72bsfc";
+       sha256 = "cce9254e2f12fd8aab4ef56659db0df0c0853e8cea8024320ce66f2f2b523521";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55331,7 +55519,7 @@ self: {
      mkDerivation {
        pname = "ghc-parser";
        version = "0.1.7.0";
-       sha256 = "0cb0d9szrimlflxh67ad74cqfi6yc2cr1bcl17c6b23ccnyqbq73";
+       sha256 = "e3e085bd656c8865d80994ad909960de448719394d1d033b75b4c6fc756a6031";
        libraryHaskellDepends = [ base ghc ];
        libraryToolDepends = [ cpphs happy ];
        homepage = "https://github.com/gibiansky/IHaskell";
@@ -55344,7 +55532,7 @@ self: {
      mkDerivation {
        pname = "ghc-paths";
        version = "0.1.0.9";
-       sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
+       sha256 = "afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945";
        libraryHaskellDepends = [ base ];
        description = "Knowledge of GHC's installation directories";
        license = stdenv.lib.licenses.bsd3;
@@ -55357,7 +55545,7 @@ self: {
      mkDerivation {
        pname = "ghc-pkg-autofix";
        version = "0.2.0.1";
-       sha256 = "0rm7vksfzwkpby1b8k2v745d7bylxbgspjhhfvdxc40a3rix8sz7";
+       sha256 = "e76bd4631e0a10d6db7610caabdfead4afd30a395b4cb4825f77f2eff4dca766";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -55375,7 +55563,7 @@ self: {
      mkDerivation {
        pname = "ghc-pkg-lib";
        version = "0.3";
-       sha256 = "1m2ny3f5i1ihvpq0vigpzj701gzrbzdz5h7f41qn37ikp9a6kd5a";
+       sha256 = "aab46954ba339e617120eec0f2db5ff9bf008efcf7c50df0dd308658dcf056d4";
        libraryHaskellDepends = [
          base Cabal directory filepath ghc ghc-paths
        ];
@@ -55390,7 +55578,7 @@ self: {
      mkDerivation {
        pname = "ghc-prim";
        version = "0.4.0.0";
-       sha256 = "1w3hkl1xyfi67kh65gqn99pinxrfqjl2s08yg0010r907w3qys31";
+       sha256 = "61688f073f20651000781e012da8c42e771b6f4a16bf62e03c263adf039d70f0";
        libraryHaskellDepends = [ rts ];
        description = "GHC primitives";
        license = stdenv.lib.licenses.bsd3;
@@ -55401,7 +55589,7 @@ self: {
      mkDerivation {
        pname = "ghc-prof-flamegraph";
        version = "0.1.2.1";
-       sha256 = "0nzk3h65iqnmva7n2m00kknllqbmg95xav4g5rpizhridpivg9hb";
+       sha256 = "0ba6b7e36d31c31f6f2e8f6cd54b7a75614aed9c0054618fdad5e2580c1cf35b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -55415,7 +55603,7 @@ self: {
      mkDerivation {
        pname = "ghc-server";
        version = "1.2";
-       sha256 = "1hg5iddlh87hir5vqjby2bihah4xcyarsfcgff3gd8l2h7mqi2dn";
+       sha256 = "b68988eb8182a2f686738f399d95679d4005e3127e49bc4b8ef020485b8be5c1";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55426,7 +55614,7 @@ self: {
      mkDerivation {
        pname = "ghc-simple";
        version = "0.1.2.1";
-       sha256 = "0hk3sii5d6mjry28gaipl45c6si82rhdsd43cq130fk9m0xzl9hf";
+       sha256 = "0e26fa3ba8693a3002668334dd6016286ac30aa137aa8784cfb29a5662d46342";
        libraryHaskellDepends = [ base ghc ghc-paths ];
        homepage = "https://github.com/valderman/ghc-simple";
        description = "Simplified interface to the GHC API";
@@ -55438,7 +55626,7 @@ self: {
      mkDerivation {
        pname = "ghc-srcspan-plugin";
        version = "0.2.1.0";
-       sha256 = "1cb669zhgibv9x7c924333kyzqa728031invr0smdnv0a2mgi2wi";
+       sha256 = "918bf8aa5060db5635c8dbc630001247e1efe7188388c44e4f7bc5077f3266b1";
        libraryHaskellDepends = [ array base containers ghc hpc ];
        description = "Generic GHC Plugin for annotating Haskell code with source location data";
        license = stdenv.lib.licenses.bsd3;
@@ -55449,7 +55637,7 @@ self: {
      mkDerivation {
        pname = "ghc-syb";
        version = "0.2.0.0";
-       sha256 = "0rwx7l89r5yfi1187c0zgx1ph2rsagyvrizb1c0vnbyrwhpbslh0";
+       sha256 = "0052bd2ee4d92fbb010bebc7bcfd533a0b78437f1fb0834288ce979c103d9d67";
        libraryHaskellDepends = [ base ghc ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/ghc-syb";
@@ -55463,7 +55651,7 @@ self: {
      mkDerivation {
        pname = "ghc-syb-utils";
        version = "0.2.3";
-       sha256 = "0rxwdivpcppwzbqglbrz8rm9f4g1gmba9ij7p7aj3di9x37kzxky";
+       sha256 = "7ef63fcfe829b621d5b947c6a4567de111976a463f2ffaf0fafc5e76776cbc67";
        libraryHaskellDepends = [ base ghc syb ];
        homepage = "http://github.com/nominolo/ghc-syb";
        description = "Scrap Your Boilerplate utilities for the GHC API";
@@ -55475,7 +55663,7 @@ self: {
      mkDerivation {
        pname = "ghc-tcplugins-extra";
        version = "0.1";
-       sha256 = "1lr3x3vg5aw8fjwz7skcisqg2hsls16abxp8p4w4940qnw5zznkf";
+       sha256 = "6edaff0bb718904438b9e8f6a54cd05443f1b08e6ceaf3b97488abf2f6e823d3";
        libraryHaskellDepends = [ base ghc ];
        homepage = "http://www.clash-lang.org/";
        description = "Utilities for writing GHC type-checker plugins";
@@ -55487,7 +55675,7 @@ self: {
      mkDerivation {
        pname = "ghc-time-alloc-prof";
        version = "0.0.0";
-       sha256 = "0a3800pngsbjc0fxpbqps9caa7gp5956wfyh18ybarlpi0ah7d7r";
+       sha256 = "f9b40315889766b53c0ad03b6e4a2af71da558d217afdb1d6072e9672f006828";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base containers text time ];
@@ -55503,7 +55691,7 @@ self: {
      mkDerivation {
        pname = "ghc-typelits-natnormalise";
        version = "0.3";
-       sha256 = "169imqq6hch4lamsgz8s3cnszysvxvw9xlgd5bjldq09zvpy7i8r";
+       sha256 = "19c5e3effe09e046e52aedd19ef8ee5bfbaf2d1b1afda7aba204326830ae3199";
        libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "http://www.clash-lang.org/";
@@ -55519,7 +55707,7 @@ self: {
      mkDerivation {
        pname = "ghc-vis";
        version = "0.7.2.7";
-       sha256 = "0kxkmbp71yx5mskzpcyjd8s2yq01q1q6dxmqzmwg6naalcpcbswv";
+       sha256 = "9bebc52ea34a59f378fdb8f66670c001602f346ad2b3fba7aea5fb70eeaab34f";
        libraryHaskellDepends = [
          base cairo containers deepseq fgl ghc-heap-view graphviz gtk mtl
          svgcairo text transformers xdot
@@ -55535,7 +55723,7 @@ self: {
      mkDerivation {
        pname = "ghci-diagrams";
        version = "0.1.1";
-       sha256 = "1jlym5k2d43avkgw7ff3pdaad5j2q5yq803cy74bgy0z69x77v1w";
+       sha256 = "3cec737a321ff8b7c8f16c00847dc14296a654bbc3b9c3dfdc6a902666a99eca";
        libraryHaskellDepends = [ base cairo colour diagrams gtk ];
        jailbreak = true;
        description = "Display simple diagrams from ghci";
@@ -55549,7 +55737,7 @@ self: {
      mkDerivation {
        pname = "ghci-haskeline";
        version = "0.2";
-       sha256 = "01j2ryxxmd5zzdv1ayvzibi3njl3nbn0ypxmafvglrvn2zwnmsqy";
+       sha256 = "1eeb6af9177667fab653b55f0fecb2834a3be28a7f7b1576fbbfb4dabbcf4206";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -55568,7 +55756,7 @@ self: {
      mkDerivation {
        pname = "ghci-lib";
        version = "0.1.0.0";
-       sha256 = "06lg1czsr6k5h18aks33p2kbahiidhv7xsrv7n1fcvqsgglzgk3z";
+       sha256 = "7fccf7e97b1a6fe6823d3beb7e366c3142b5a6b863e8a95080659aac3f0b8f1a";
        libraryHaskellDepends = [ base ghc MissingH ];
        jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
@@ -55583,7 +55771,7 @@ self: {
      mkDerivation {
        pname = "ghci-ng";
        version = "7.6.3.5";
-       sha256 = "01ghvv0y1qif19v8dlbspxyb9m5zag832sx2k3qyhqh8iccnr14x";
+       sha256 = "9d846c198b0862e8f198a26b31d053bfd4b47cbf7ad186760a2ee2e0c1def005";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -55602,7 +55790,7 @@ self: {
      mkDerivation {
        pname = "ghci-pretty";
        version = "0.0.2";
-       sha256 = "01syl5c6ana4m8d3jc5pbi64zf3c4l2x0r7jwkizm7kymszmbns5";
+       sha256 = "45db55bfae7e9efae3e4f264d005256cb84f4c5cb730391aaa44596558a15e07";
        libraryHaskellDepends = [ base hscolour ipprint ];
        homepage = "https://github.com/larskuhtz/ghci-pretty";
        description = "colored pretty-printing within ghci";
@@ -55617,7 +55805,7 @@ self: {
      mkDerivation {
        pname = "ghcid";
        version = "0.5";
-       sha256 = "1b5d70f1422lwn8xmcdn6b52qwqp3aax0h7q3zfnkv2ima18yk6l";
+       sha256 = "d44c8f82aa51ec69dd1ff840d0951a17732cca32b6b1da91e55408121c38adac";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55641,7 +55829,7 @@ self: {
      mkDerivation {
        pname = "ghcjs-codemirror";
        version = "0.0.0.1";
-       sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw";
+       sha256 = "dcd9f5288d7624c8a2a5bf8440d9de6ab8400707d366180b13cc3f472280a513";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ghcjs/CodeMirror";
        description = "Installs CodeMirror JavaScript files";
@@ -55649,27 +55837,29 @@ self: {
      }) {};
 
   "ghcjs-dom" = callPackage
-    ({ mkDerivation, base, ghcjs-base, mtl, text }:
+    ({ mkDerivation, base, glib, gtk3, text, transformers, webkitgtk3
+     }:
      mkDerivation {
        pname = "ghcjs-dom";
-       version = "0.1.1.3";
-       sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly";
-       libraryHaskellDepends = [ base ghcjs-base mtl text ];
-       jailbreak = true;
+       version = "0.2.1.0";
+       sha256 = "a99e19252bb56f4dc56a3778d81af006ce1f403e770ec0bc3f1ff409a37a7e81";
+       libraryHaskellDepends = [
+         base glib gtk3 text transformers webkitgtk3
+       ];
        description = "DOM library that supports both GHCJS and WebKitGTK";
        license = stdenv.lib.licenses.mit;
-       broken = true;
-     }) { ghcjs-base = null;};
+     }) {};
 
   "ghcjs-dom-hello" = callPackage
     ({ mkDerivation, base, ghcjs-dom, mtl }:
      mkDerivation {
        pname = "ghcjs-dom-hello";
        version = "1.2.0.0";
-       sha256 = "0jbn6nhaq7h01wh1limsb4xzgwp7i71922gql5mz916kv6wa2cgl";
+       sha256 = "f431a1b8d9d384f46ba1f80991c289e7f2f73b59ba461a200f001eaca0357649";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ghcjs-dom mtl ];
+       jailbreak = true;
        homepage = "https://github.com/ghcjs/ghcjs-dom-hello";
        description = "GHCJS DOM Hello World, an example package";
        license = stdenv.lib.licenses.mit;
@@ -55681,7 +55871,7 @@ self: {
      mkDerivation {
        pname = "ghcjs-websockets";
        version = "0.3.0.5";
-       sha256 = "1km7hdpa036hqxzddwxw23zaq1sjvbmjmqdp4fzdz62azp6g4ygq";
+       sha256 = "f879f2ccfd4a98dfbe23b7e12aebda5207acfe10bcf3d67ec7d00ca06e83a7ce";
        libraryHaskellDepends = [
          base base64-bytestring binary bytestring text
        ];
@@ -55700,7 +55890,7 @@ self: {
      mkDerivation {
        pname = "ghclive";
        version = "0.1.0.2";
-       sha256 = "0rnmv09sl5pj9y8hr7s8hwh23zfm4j8nsn524hpj73diwmzf5fh8";
+       sha256 = "08bae27ee5b18d232f24a2586d9124d5fd212087489f0c914ff216aa13d8d566";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55724,7 +55914,7 @@ self: {
      mkDerivation {
        pname = "ghczdecode";
        version = "0.1.0.1";
-       sha256 = "1yn6blszccmgv0zrq5cxv6kww47j7pwgywgy7piz6is44ab5s5l9";
+       sha256 = "89165d96224447f3e33dfe71fff83df210cea7d99d159c3fd8af32f6355dc6fa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base zenc ];
@@ -55741,7 +55931,7 @@ self: {
      mkDerivation {
        pname = "ght";
        version = "0.4.0.1";
-       sha256 = "03lrn3s79gxdn5fwh6cbp46k303662fnisjs7qp1yf8c66vxi8wc";
+       sha256 = "8ca3d8b7310c391f2e3e5aea689d306680310db98b19c85db1adbf74f4b0990e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55762,7 +55952,7 @@ self: {
      mkDerivation {
        pname = "gimlh";
        version = "0.1.3.0";
-       sha256 = "1hxdgff1rw3yp3a2p26bj6034jgc458bdzma1xkbh9pahlhwhs2l";
+       sha256 = "5468c82185ea26b8660faafeb65021ec49328091cb882bd4b87ef01c9c7badc3";
        libraryHaskellDepends = [ base split ];
        homepage = "https://github.com/gazay/gimlh";
        description = "Haskell parser for GIML";
@@ -55778,7 +55968,7 @@ self: {
      mkDerivation {
        pname = "ginsu";
        version = "0.8.1.1";
-       sha256 = "0qvhdzmqi1pppfcfld27mjzbzj9h6yaz2n7b6inp0ybr80vm6x4w";
+       sha256 = "9c745337407979706d34eb58f1953730c9bfbeac4734ea98bbf78688eb6f7063";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -55800,7 +55990,7 @@ self: {
      mkDerivation {
        pname = "gio";
        version = "0.13.1.0";
-       sha256 = "1qxbdjznxz56jw108cc78lzwh1r4g8l2jcaz2bh2akc1nwhv2x5j";
+       sha256 = "b274b121b7814d25e0125f3129287a2407c83f458731040297a6fc6ebf6cabe3";
        libraryHaskellDepends = [
          array base bytestring containers glib mtl
        ];
@@ -55818,7 +56008,7 @@ self: {
      mkDerivation {
        pname = "gipeda";
        version = "0.1.2.1";
-       sha256 = "0wra67d2jdnx463vw8hf2yzzwmnkbs9791x5mgarlgc6zj68g926";
+       sha256 = "46a4878cfc863d9ad5aba58774925ed356febf170e22be8721dd3629da312a73";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -55839,7 +56029,7 @@ self: {
      mkDerivation {
        pname = "gist";
        version = "0.1";
-       sha256 = "1jgdhga0qjbc6kx1nr5yngcx560rlxiil3cnsmzh8mwazbs3yyl1";
+       sha256 = "817a3ff4fa8a57047fd5960d1a63a71998d2d9b3be641bfa346c490cd483edc9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -55859,7 +56049,7 @@ self: {
      mkDerivation {
        pname = "git-all";
        version = "1.5.0";
-       sha256 = "0wfvfrmwn81myiaa5x4bw6ypyk0hljaaf3f7b9rnpxwk291dwc3z";
+       sha256 = "7f30de421293f76b735ac70da794a4104c7fbde18bf4a254f43520cb6b76db71";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -55894,7 +56084,7 @@ self: {
      mkDerivation {
        pname = "git-annex";
        version = "5.20150731";
-       sha256 = "18akv0xj4mf2ypzzd12briv0rw9ba7xw8k1qxvl10m9z4x6gvvm2";
+       sha256 = "a2eefd4c273f5510e8ee384cc4fb512bf10c76cc4b84f6fff5c255223bd853a1";
        configureFlags = [ "-fassistant" "-fproduction" ];
        isLibrary = false;
        isExecutable = true;
@@ -55938,7 +56128,7 @@ self: {
      mkDerivation {
        pname = "git-checklist";
        version = "1.0.0.0";
-       sha256 = "1q4fbvpdjca5k530dcm6yspsgzy60dx7nimar2fkm8s086qsf662";
+       sha256 = "c218a7b14140a33a9dc8aa467b7a03c6ffa7aff6a6b20646994531d9ee5e8ee0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -55958,7 +56148,7 @@ self: {
      mkDerivation {
        pname = "git-date";
        version = "0.2.2";
-       sha256 = "0yld8p7jgq0ihz21nkmirz3ynwi0mgrlgzx727kim59hplm6xrcl";
+       sha256 = "94e56e2abd30951ae711a7ff47f3ab2072ebc7cfb14e1bc48711e027cf458d7a";
        libraryHaskellDepends = [ base bytestring time utf8-string ];
        testHaskellDepends = [
          base bytestring old-locale QuickCheck test-framework
@@ -55977,7 +56167,7 @@ self: {
      mkDerivation {
        pname = "git-embed";
        version = "0.1.0";
-       sha256 = "0yrx06ay25zsk90djr4mrqnn80xp3w6cmkciqavrmijf25fc5jvn";
+       sha256 = "76cbc25c114ec69ab7c291cdca0c1fb703642dce9564d9409afa17e195013d7b";
        libraryHaskellDepends = [
          base directory filepath process template-haskell
        ];
@@ -55993,7 +56183,7 @@ self: {
      mkDerivation {
        pname = "git-freq";
        version = "0.0.2";
-       sha256 = "1vi87kdb58d7yg5bc97nkz2lcnfxsmn4w66m2m52rbfi8xnqkl6l";
+       sha256 = "d4d0896d47d1ad2c4a15d5184e6cd5dd5946c59ff624b6caf3a7a1b2da3c28ee";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -56015,7 +56205,7 @@ self: {
      mkDerivation {
        pname = "git-gpush";
        version = "3.1.0.1";
-       sha256 = "13m95j227mvl7facqjlwcz11kd88ibhr7fwf5ph81wppyic8136g";
+       sha256 = "cf8c8058f4f7f280e02d8ebb93e18a08b519c2679c4acc943b74d723842ca98e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -56039,7 +56229,7 @@ self: {
      mkDerivation {
        pname = "git-monitor";
        version = "3.1.1.4";
-       sha256 = "00byw8y9av60rwacp4006kv7qb9sc26j1f82cz1ngr42nfx9955c";
+       sha256 = "ac9494bab382e467c36702b9208d603a2d7cf6340090cb14cfc06c953ce27e01";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -56061,7 +56251,7 @@ self: {
      mkDerivation {
        pname = "git-object";
        version = "0.0.2";
-       sha256 = "1hwsl5n6im6b13iy1whvgd3avax9xb81maaan2vf3r474r3321jm";
+       sha256 = "550631462687e4e1b6b04aa91ad0eaa9abad467b1bf2e0e308cbd4686ca19ac3";
        libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring directory
          enumerator filepath zlib-enum
@@ -56080,7 +56270,7 @@ self: {
      mkDerivation {
        pname = "git-repair";
        version = "1.20150106";
-       sha256 = "19hgrp2kjqhcw53rf9payiajzfz6d7jqf2m2mnmbjv2zpr9y74dp";
+       sha256 = "b791e353be5f6cb9aaada20a87e569e6bb2f55f4ea269747e10c6239c5cd0fa6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -56102,7 +56292,7 @@ self: {
      mkDerivation {
        pname = "git-sanity";
        version = "0.1.0.0";
-       sha256 = "1yywxganjl7rj4lf3pp1fh4adjhp3110l4az1w76r3rywql6v8w2";
+       sha256 = "82a36d28e63e8f6c0e0f5f110a421817caa60874e1dee12891f95069d5ebdcfb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56125,7 +56315,7 @@ self: {
      mkDerivation {
        pname = "git-vogue";
        version = "0.2.0.1";
-       sha256 = "1l1ly1wkfidpzxr68z0qyfyj0pq7wdn534m4ks0hvh45sp6v569c";
+       sha256 = "2c99b2cdd585c00d819ea492516ce3075f20bdf3187c6472ffb7453779f034d0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56155,7 +56345,7 @@ self: {
      mkDerivation {
        pname = "gitcache";
        version = "0.2";
-       sha256 = "0vd580k1cxipycyyjpzhwvv6q70nf6fjfrsxp3gz3gy4iqzzssgy";
+       sha256 = "fe69fd3f8ec4bff1dfb85d67279d71161c6cf6e6f05fe93df33776162640a56d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -56174,7 +56364,7 @@ self: {
      mkDerivation {
        pname = "gitdo";
        version = "0.1.0.0";
-       sha256 = "0krna2rqdscnrd86d7ipq4gad7dzk1w5lnk8757a13qnd5jqrxdl";
+       sha256 = "b4f58c6569168fa04e39685a5a7898bf9da61ec1379e6650cb96e986b350364f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -56198,7 +56388,7 @@ self: {
      mkDerivation {
        pname = "github";
        version = "0.13.2";
-       sha256 = "1i07jwhkzaxia98a3fjnm3hynh4mjdhy9rzdh9chdlram5wqk87z";
+       sha256 = "ffa08979a92ad3065982ede7e461939540ebe1a856baa15052b1ab3f219707c4";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring byteable bytestring
          case-insensitive conduit containers cryptohash data-default failure
@@ -56225,7 +56415,7 @@ self: {
      mkDerivation {
        pname = "github-backup";
        version = "1.20150807";
-       sha256 = "19x8716wdhrj3nv4pgz4ncmnfnids8wjirkp3jkw5sd6fnx6q8sj";
+       sha256 = "52236cba75a6e9c2a71c77e62839d22d5a672bb3e4bf4bb61d32c3c64d38a8a7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -56247,7 +56437,7 @@ self: {
      mkDerivation {
        pname = "github-post-receive";
        version = "1.2.0.1";
-       sha256 = "14vd9rnr3x3wasnc6w6d3kcs5dnka902n9cbxblqdryc8l7p360q";
+       sha256 = "1898710f45cce786e9ea8b252b4052d3b6a2d91ccd70c3ac567cf4916d4e6d93";
        libraryHaskellDepends = [
          aeson base bytestring containers email-validate http-types text wai
          wai-logger warp
@@ -56262,7 +56452,7 @@ self: {
      mkDerivation {
        pname = "github-types";
        version = "0.1.0.5";
-       sha256 = "0lymbga0rwhni0rrjdla6fz5a1gz8zclf421rdiz5cnnh8lbd97i";
+       sha256 = "f1a4b62882d6b2f263cb411047d947ff0555be338a3699338816f20cd45bd553";
        libraryHaskellDepends = [ aeson base text ];
        description = "Type definitions for objects used by the GitHub v3 API";
        license = "unknown";
@@ -56273,7 +56463,7 @@ self: {
      mkDerivation {
        pname = "github-utils";
        version = "0.1.0";
-       sha256 = "1d7g1rzaqg19bc41vqvcdxdi37z9h7ajy3khsqa4pwbfavj412a5";
+       sha256 = "458940e4566ef14b14d6700e2fd581e99f115b6f6ce31d085b293cac7e0eefb4";
        libraryHaskellDepends = [ base basic-prelude github text ];
        jailbreak = true;
        homepage = "https://github.com/greenrd/github-utils";
@@ -56288,7 +56478,7 @@ self: {
      mkDerivation {
        pname = "github-webhook-handler";
        version = "0.0.3";
-       sha256 = "1dwq1fccgnngh97kxyb3kp4f6xr8dsydlgkydl28lxkbwcapk39h";
+       sha256 = "308d7915e36b768a046d7e3edabc6e2877e3c89d63f93e4f82cfdac7980b98b7";
        libraryHaskellDepends = [
          aeson base bytestring cryptohash github-types text transformers
          uuid vector
@@ -56304,7 +56494,7 @@ self: {
      mkDerivation {
        pname = "github-webhook-handler-snap";
        version = "0.0.3";
-       sha256 = "0v9wman214rj81dfvkgng195s3gsvy5d7csshqwcw9x10giby9iy";
+       sha256 = "3e26bfe203a127ce38865ab3d38adffa0d5d5278f6cded5a40329320acaa3c6d";
        libraryHaskellDepends = [
          base bytestring case-insensitive github-types
          github-webhook-handler snap-core uuid
@@ -56320,7 +56510,7 @@ self: {
      mkDerivation {
        pname = "gitignore";
        version = "1.0.1";
-       sha256 = "03sjhlsp7xswciypp7sw9x0b3h6m7fvc2dk5k0a3bibflns2zgql";
+       sha256 = "14bf2fb4a56ec53514986536c1b63bd5c0b1404f5c9f7b7d645cf7733585520f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -56346,7 +56536,7 @@ self: {
      mkDerivation {
        pname = "gitit";
        version = "0.11.1";
-       sha256 = "06wxy4hpbkbmlwrgnsxbr47k2a791094gzqsmlqzhsq6wa1bgfr9";
+       sha256 = "29bbb782e2066bf831ad1aff471208e928310fc9ab6bfb32a775cd7521f19d1b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56376,7 +56566,7 @@ self: {
      mkDerivation {
        pname = "gitlib";
        version = "3.1.0.2";
-       sha256 = "05l5i2s0212sx3bzw6r9njanjv1q1gmqc7f6g1z1sy9fibyxcwah";
+       sha256 = "5071d6fd8a2e791d7e78c61d86eb0b386c6995b4291bfed7e85a0401b4888516";
        libraryHaskellDepends = [
          base base16-bytestring bytestring conduit conduit-combinators
          containers directory exceptions filepath hashable lifted-async
@@ -56398,7 +56588,7 @@ self: {
      mkDerivation {
        pname = "gitlib-cmdline";
        version = "3.1.0.2";
-       sha256 = "1dridps65mw06r9slza80vl21f5n1kq1if7gnwcrbagicvy45p0k";
+       sha256 = "13dc42fc66f1a99519b7efb818f00cb6b820e806487daa533680d762f46d31b7";
        libraryHaskellDepends = [
          base bytestring conduit conduit-combinators containers directory
          exceptions gitlib monad-control mtl old-locale parsec
@@ -56421,7 +56611,7 @@ self: {
      mkDerivation {
        pname = "gitlib-cross";
        version = "3.1.0";
-       sha256 = "0iack7kafbfa45s9k7ypbafapahrifh2grjdzyrhvzjg767l3i1h";
+       sha256 = "30c4418f394ffe0db3ff4de627a08b19aaab9c5ad79f997421ca2da7e6994c45";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base gitlib gitlib-cmdline gitlib-libgit2 gitlib-test hspec
@@ -56444,7 +56634,7 @@ self: {
      mkDerivation {
        pname = "gitlib-libgit2";
        version = "3.1.0.5";
-       sha256 = "1xnzks7jwl7d0xf7qgz9gmqf4n1yn3qvjrs73prla8n063kgdh95";
+       sha256 = "25c1f6e630c02245f31d4767b9f1b03e58e2707de93f7c5c07ed502e8f9edff6";
        libraryHaskellDepends = [
          base bytestring conduit conduit-combinators containers directory
          exceptions fast-logger filepath gitlib hlibgit2 lifted-async
@@ -56473,7 +56663,7 @@ self: {
      mkDerivation {
        pname = "gitlib-s3";
        version = "3.1.0.1";
-       sha256 = "1vcx26dny7pj4lqn1rli3vqad2xh7vkqj86c6i7hyskilgbs6n8m";
+       sha256 = "1559a3d7a3716a0f4f34cc2089e73eb08ba6f01e91e6603125f21e6f9b119ded";
        libraryHaskellDepends = [
          aeson attempt aws base bifunctors binary bytestring conduit
          conduit-combinators data-default directory exceptions filepath
@@ -56496,7 +56686,7 @@ self: {
      mkDerivation {
        pname = "gitlib-sample";
        version = "3.1.0";
-       sha256 = "1px3yskxkr1kmgwfw1jdrbgjgkz8wxznz56g0gn3gqx63haxifmc";
+       sha256 = "acbad8151ca6e337ec03cf946f7fe7e8cf27dfca4d06eef8ab33e4d9a7f6a3df";
        libraryHaskellDepends = [
          base exceptions gitlib mtl transformers
        ];
@@ -56512,7 +56702,7 @@ self: {
      mkDerivation {
        pname = "gitlib-test";
        version = "3.1.0.3";
-       sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py";
+       sha256 = "fe0abfa269dabd63d60f856db0a82c88d6bd059de1d4d84dccaf846a1a38291f";
        libraryHaskellDepends = [
          base bytestring conduit conduit-combinators exceptions gitlib hspec
          hspec-expectations HUnit monad-control tagged text time
@@ -56530,7 +56720,7 @@ self: {
      mkDerivation {
        pname = "gitlib-utils";
        version = "1.2.0";
-       sha256 = "081vagmlf6lkh7qqr9y42nl8c1ds011s05a567dsw6ckf166wshn";
+       sha256 = "166a6e4c709319aedb314515a04300ba0586a815c4a78cf181931a47eb533b20";
        libraryHaskellDepends = [
          base bytestring conduit data-default failure gitlib hex lifted-base
          system-fileio system-filepath tagged text transformers
@@ -56547,8 +56737,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitrev";
-       version = "1.0.0";
-       sha256 = "05jxzhpjzd9n5sdaa8d9y2zczs2v5w4n9718wl411ghvx54jhnfd";
+       version = "1.1.0";
+       sha256 = "aabc77851c0de49bd3495fb2cf933170a5d566a19cfb230e1cc758f5775de120";
        libraryHaskellDepends = [
          base directory filepath process template-haskell
        ];
@@ -56565,7 +56755,7 @@ self: {
      mkDerivation {
        pname = "gitson";
        version = "0.5.1";
-       sha256 = "175j2pkc3cb37h3vilb99i782as9yg68nacs2ysnp1m7hrxvvyjy";
+       sha256 = "5efabd7b86a7866bb5179a298bccf3492b814e4c69d1b8073c63b1c1e615b29c";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring directory errors filepath flock
          monad-control process transformers
@@ -56586,7 +56776,7 @@ self: {
      mkDerivation {
        pname = "gl";
        version = "0.7.7";
-       sha256 = "0lsz8gq3cmkh6s9hhxnr3m95ibra9y63230jyqhwk9wamid2x2pg";
+       sha256 = "ef8a2e5aac8aa7c921f6120c318c4f2aaf58521dd976089336705636f0435f53";
        libraryHaskellDepends = [
          base containers directory filepath fixed half hxt split
          transformers
@@ -56601,7 +56791,7 @@ self: {
      mkDerivation {
        pname = "gl-capture";
        version = "0.1.0.0";
-       sha256 = "0pcan0fpb1mfwda69f8z8pdrdav79rdm31yvmrk98dca7al7k583";
+       sha256 = "039579a83a8a359466aedb87515b4e67ab96db451fb96454e3ae86751db08a5d";
        libraryHaskellDepends = [ base bytestring OpenGL ];
        description = "simple image capture from OpenGL";
        license = stdenv.lib.licenses.bsd3;
@@ -56612,7 +56802,7 @@ self: {
      mkDerivation {
        pname = "glade";
        version = "0.12.5.0";
-       sha256 = "0dbl7y5rdwzcham16iym9cikfyaphzr1rqcsni9ab6s2368a1vkr";
+       sha256 = "79eea09019429ba552b49ae11cf287577937234bd54713aa82ecf3968b3f7435";
        libraryHaskellDepends = [ base glib gtk ];
        libraryPkgconfigDepends = [ libglade ];
        libraryToolDepends = [ gtk2hs-buildtools ];
@@ -56628,7 +56818,7 @@ self: {
      mkDerivation {
        pname = "gladexml-accessor";
        version = "0.0";
-       sha256 = "06kzakvssmldjgx0s8qm0a3cd9glmwrdnh690sv708jcvg8x45y3";
+       sha256 = "c317d2d1db4c2270b606c940db32aff4a5c6860215230dfa938d56adf7547f1a";
        libraryHaskellDepends = [ base glade HaXml template-haskell ];
        description = "Automagically declares getters for widget handles in specified interface file";
        license = stdenv.lib.licenses.bsd3;
@@ -56643,7 +56833,7 @@ self: {
      mkDerivation {
        pname = "glambda";
        version = "1.0";
-       sha256 = "01bqh7g76a02qvzqm8di6ig84k0v7crd9aljsg339h7d3y7grxhf";
+       sha256 = "0ef6fc8e1fedc034c6d392aad4323b1b4c825e34b1a18affc6022873de817805";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56665,7 +56855,7 @@ self: {
      mkDerivation {
        pname = "glapp";
        version = "0.1.0.1";
-       sha256 = "076v7h0p91dj8hx110vm0li2njsc8p5dgcf6zxk721mdx5xkymhz";
+       sha256 = "1f563f7be9ad067166ffc6b1d7ca454c4b2b22057583103a44b28574013cdb1c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers GLFW-b lens mtl OpenGL ];
@@ -56683,7 +56873,7 @@ self: {
      mkDerivation {
        pname = "glasso";
        version = "0.1.0";
-       sha256 = "1ibkvgfighkfn3v27cqy7wwhvlhmnbi1dvyycwbfba6rfy9w6gb8";
+       sha256 = "683dc39377d9a8e51667deef16e2b215d20d393f1eb323f6b06ec217dddb73c5";
        revision = "1";
        editedCabalFile = "abf1b0cb0b9cc8c106f833a2549e2be95111a58296d6cc01c39e18c03abef797";
        libraryHaskellDepends = [ base vector ];
@@ -56698,7 +56888,7 @@ self: {
      mkDerivation {
        pname = "glib";
        version = "0.13.2.1";
-       sha256 = "1pxc2a0hnjaryf3f8d410rnhxmc7byx6lwcypgqg4zma6r3qhqwp";
+       sha256 = "9763884736aa7ef2f0bb9e716aba5f87d50e6d068134e486f359490b8112acdf";
        libraryHaskellDepends = [
          base bytestring containers text utf8-string
        ];
@@ -56714,7 +56904,7 @@ self: {
      mkDerivation {
        pname = "glider-nlp";
        version = "0.1";
-       sha256 = "1i604gj3ssabr3dcas6gfh20d4psqwl1j4d7wk4p3gy0hvjvr8fb";
+       sha256 = "cba1bce586c0bf71c9e4a7111928c7fa92060474cf68c5dac84b693de423c0c4";
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [ base Cabal containers HUnit text ];
        jailbreak = true;
@@ -56729,7 +56919,7 @@ self: {
      mkDerivation {
        pname = "glintcollider";
        version = "0.0.2";
-       sha256 = "1xgx02cxvpc8sv99wl44lpzbv9cc87nnihbpalmddb71mwrmj4ji";
+       sha256 = "51125933afe1acd62a5577c168ed418ca5bdfea584509ed2d688dddd9900fdf5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ppm split ];
@@ -56742,7 +56932,7 @@ self: {
      mkDerivation {
        pname = "gll";
        version = "0.2.0.3";
-       sha256 = "1w2z5071idac1jn367dymphqvayd580jlnhapmfrd3s40b6z6xaf";
+       sha256 = "4e75f3cd02448f965dbd0a5a2a012acdab8de1adbe1d33ac0c4cb5180e285ff0";
        libraryHaskellDepends = [ array base containers TypeCompose ];
        jailbreak = true;
        description = "GLL parser with simple combinator interface";
@@ -56757,7 +56947,7 @@ self: {
      mkDerivation {
        pname = "global";
        version = "0.2.1.0";
-       sha256 = "00d9qsh0n9yxr411mdisk602qiizy9h4wgz4k04mfr5x5g6cp418";
+       sha256 = "2890cbcc2bbd64570998e43f4e60f23f462c80993ab61a02c9dd270ba0c6a901";
        libraryHaskellDepends = [
          base haskell-src-exts haskell-src-exts-qq loch-th SafeSemaphore stm
          syntax-trees-fork-bairyn tagged template-haskell
@@ -56776,7 +56966,7 @@ self: {
      mkDerivation {
        pname = "global-config";
        version = "0.3.1";
-       sha256 = "1rp855j0rzx528x01q5wi2hah80bwqf5rrw7p8p8qzl39fhlpzqa";
+       sha256 = "0aff4ba14b837e8c2eba87e75c1ce60b20a8a088bce0003a12a5ff0c6429e8e6";
        libraryHaskellDepends = [
          base data-default global-variables transformers
        ];
@@ -56794,7 +56984,7 @@ self: {
      mkDerivation {
        pname = "global-lock";
        version = "0.1";
-       sha256 = "0b2sz9ag6wcr0amgrx08l7924brfansnh9rv64wg9s3nk4ni2sxp";
+       sha256 = "b76b112d9976e8f438313b2768b5552e2f22d2a108f4fcaa029971f354fa5a2c";
        libraryHaskellDepends = [ base ];
        description = "A global lock implemented without unsafePerformIO";
        license = stdenv.lib.licenses.bsd3;
@@ -56805,7 +56995,7 @@ self: {
      mkDerivation {
        pname = "global-variables";
        version = "1.0.1.1";
-       sha256 = "0fvhh6q6z114qyi5rhwzxhrlqfhx6af97187b49lyvx2k9zkzvzp";
+       sha256 = "f7ef3f7f9aa26f4f13590785939c321d3a4c33ec9fc35ca2c724846fb081703b";
        libraryHaskellDepends = [ base containers stm ];
        jailbreak = true;
        description = "Namespaced, global, and top-level mutable variables without unsafePerformIO";
@@ -56819,7 +57009,7 @@ self: {
      mkDerivation {
        pname = "glome-hs";
        version = "0.61";
-       sha256 = "069j4xvh5039xkg300h1cwa0lyvkycixasxr8zh4iqyl1g5bcvs8";
+       sha256 = "486fb6ca0bd4e348e047b96bd523f3737b0a1467010230deec69800277273219";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56844,7 +57034,7 @@ self: {
      mkDerivation {
        pname = "gloss";
        version = "1.9.2.1";
-       sha256 = "1fk7472lw4621gv64fv4mna8z1av15f7d0didpc9r22rdlkpa80l";
+       sha256 = "142075276d59889cd86db181765c095b858f94ad643b62f60bc2104ec52167ba";
        libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
@@ -56861,7 +57051,7 @@ self: {
      mkDerivation {
        pname = "gloss";
        version = "1.9.4.1";
-       sha256 = "1rdgcv9jmawzgvshnc6pgdl7f2p6a3f09jwjnhmkfxx3gdwr8q5i";
+       sha256 = "b16094797ba377372bb492cb04dc50e60a77687bd7300bf57e9fab2ad366afe5";
        libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
@@ -56875,7 +57065,7 @@ self: {
      mkDerivation {
        pname = "gloss-accelerate";
        version = "1.9.0.0";
-       sha256 = "13vr758nl712kpkc8nii05iv1zidsp55ihvaknqzn8zdhyk4dxrv";
+       sha256 = "3bf746a687ed23fbb19d6ac358cad52dfeb06301315ac4e69d221c6a5139798f";
        revision = "1";
        editedCabalFile = "cddab61d37317ec1a15ad7da65d909b8668b284dcf182a7a348d234bff7d30ff";
        libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
@@ -56888,7 +57078,7 @@ self: {
      mkDerivation {
        pname = "gloss-algorithms";
        version = "1.9.4.1";
-       sha256 = "0j8n0769690ikrqwbqp4ba6zz2l4i6211alic3l7mqc2h6rggjs0";
+       sha256 = "40cbf7b28182e17ae86091aa108489848aff8d5ae4e2c5719e112493cc011649";
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
        homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
@@ -56900,7 +57090,7 @@ self: {
      mkDerivation {
        pname = "gloss-banana";
        version = "0.1.0.4";
-       sha256 = "0zzpdryfcqvxpzv53ymsvkm2nza9ryvzqgf3n89pnvrni91avgj3";
+       sha256 = "43bead428a366f7b13b2c33dfcb7cf497d2beadcbafa51f6bf7d63e67c6ef77f";
        revision = "1";
        editedCabalFile = "232cec279cb20afd92056320c24d3d3041199b014981492ddbbe57eeff312a5a";
        libraryHaskellDepends = [ base gloss reactive-banana ];
@@ -56914,7 +57104,7 @@ self: {
      mkDerivation {
        pname = "gloss-devil";
        version = "0.2";
-       sha256 = "17gwy13z4lymm9dpj26q4ihcl198gqn9kpcjdw8lcgfcg4gxszsm";
+       sha256 = "557fdd1f79cc3d46116f92dd992c7e2805ca6024d808795baad553f247f0fc9d";
        libraryHaskellDepends = [ base bytestring gloss repa repa-devil ];
        description = "Display images in Gloss using libdevil for decoding";
        license = stdenv.lib.licenses.bsd3;
@@ -56929,7 +57119,7 @@ self: {
      mkDerivation {
        pname = "gloss-examples";
        version = "1.9.4.1";
-       sha256 = "02qsxxbrg8d4338mcj3ka3l2f9qyf3r515b32dm5iingjb8dn5ly";
+       sha256 = "9e16dbd092cfc6586a13639550f2701e2727e850734856d118a4a19757ef1a0b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -56947,7 +57137,7 @@ self: {
      mkDerivation {
        pname = "gloss-game";
        version = "0.3.3.0";
-       sha256 = "01k9600f9lv65n9bi2v40gzcl14gg9cm27fxz8yk4kx1hk5hv980";
+       sha256 = "00a50dcb84a14f323dfadd1d51597a8f04cafe03648bb8922d66d3e400306906";
        libraryHaskellDepends = [ base gloss gloss-juicy ];
        homepage = "https://github.com/mchakravarty/gloss-game";
        description = "Gloss wrapper that simplifies writing games";
@@ -56960,7 +57150,7 @@ self: {
      mkDerivation {
        pname = "gloss-juicy";
        version = "0.2";
-       sha256 = "1y525ck3cqqg9zggd88ilzxv1pfcz801s0sdgprw3amzyxn71kqq";
+       sha256 = "18cf706cf7bfaac1f37d4d031d00faccddb0fba711a1f6de4f0f6336262ba2f8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56981,7 +57171,7 @@ self: {
      mkDerivation {
        pname = "gloss-raster";
        version = "1.9.4.1";
-       sha256 = "0q6mqgmi3gx2yx8a3rq4nzk2mz2iidnzl26b5h4zhjgmgz8jawv9";
+       sha256 = "697325d17ff549f8092ccb08fa6d8b51fc2ae6b704e7a150f7a2bf11ebc3d560";
        libraryHaskellDepends = [
          base containers ghc-prim gloss gloss-rendering repa
        ];
@@ -56997,7 +57187,7 @@ self: {
      mkDerivation {
        pname = "gloss-raster-accelerate";
        version = "1.9.0.0";
-       sha256 = "0kgjbqharpl9an4kpciiy17chsdlzx5n4mgxp93yja4av8vik3i8";
+       sha256 = "288e1937da8a28e947bafd55624bffb469c84ef031b23b895589deac205ef24d";
        libraryHaskellDepends = [
          accelerate accelerate-cuda base gloss gloss-accelerate
        ];
@@ -57010,7 +57200,7 @@ self: {
      mkDerivation {
        pname = "gloss-rendering";
        version = "1.9.3.1";
-       sha256 = "1ns9x9fwkvxy0dwgdd3apv3p0d4857h3mkb3dx0rg9rs3wbapyzy";
+       sha256 = "fefbab161f3aa797416f63cd3ae029883470c7be6ab4f67803beefc95dea49db";
        libraryHaskellDepends = [
          base bmp bytestring containers GLUT OpenGL
        ];
@@ -57023,7 +57213,7 @@ self: {
      mkDerivation {
        pname = "gloss-sodium";
        version = "0.1.0.0";
-       sha256 = "0ygjqzb1pn092j0d0gcwhxdv940rdlvpaj1gxa347mdgvp4jb9za";
+       sha256 = "eaa725c9ddafd54386ea2f4875376d1990b45b879c3dd0801409d81bd6c7f279";
        libraryHaskellDepends = [ base gloss sodium ];
        jailbreak = true;
        homepage = "https://github.com/Twey/gloss-sodium";
@@ -57036,7 +57226,7 @@ self: {
      mkDerivation {
        pname = "glpk-hs";
        version = "0.3.5";
-       sha256 = "1nx0mcy009cj1h2fsz00qfpr9zawagwsp3w370251hdc5q6bw52p";
+       sha256 = "5714be0c2eacc1500438838fabf9535cfd94afc3007ced040c9225003caba0db";
        libraryHaskellDepends = [ array base containers deepseq mtl ];
        librarySystemDepends = [ glpk ];
        description = "Comprehensive GLPK linear programming bindings";
@@ -57051,7 +57241,7 @@ self: {
      mkDerivation {
        pname = "glue";
        version = "0.1.1.1";
-       sha256 = "1p93cv8c52dbw0lz48yjpfbrj48giyxrwmc9bymfpgjmynda4zab";
+       sha256 = "4b7da29af555beebaa5f89559ebb8f0f119997bbd223f229e0ab89c2d06623dd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -57076,7 +57266,7 @@ self: {
      mkDerivation {
        pname = "gluturtle";
        version = "0.0.58.1";
-       sha256 = "0jwkppf9ipm61g052r9m65awq3nsigf3q4m9bj2hmb3n9z75i1hp";
+       sha256 = "178658ce4f76ac0a855ca9123cdc8bda0ecc5531356551c00ba6de98dcbd934b";
        libraryHaskellDepends = [
          base convertible GLUT stm yjsvg yjtools
        ];
@@ -57091,7 +57281,7 @@ self: {
      mkDerivation {
        pname = "gmap";
        version = "0.1";
-       sha256 = "0kwx0zknxpda0pjf9hphniz33b9m0md54z8zx09vzkjq7lpljx7r";
+       sha256 = "f974492f3d58cebf13e81f7d525a0535ad317eb4f0c2e4e405aadd6ee7079d4f";
        libraryHaskellDepends = [
          array AvlTree base COrdering QuickCheck random
        ];
@@ -57107,7 +57297,7 @@ self: {
      mkDerivation {
        pname = "gmndl";
        version = "0.4.0.2";
-       sha256 = "04r7n24jnqgggi19d4l1lj1ag5jrh3zk2pvxwm5xfb7imlg37zm8";
+       sha256 = "a8fe331eadf12cd74be57d5f31ff805996a782a4819296427cef612b89b02713";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -57125,7 +57315,7 @@ self: {
      mkDerivation {
        pname = "gnome-desktop";
        version = "1.0.0.0";
-       sha256 = "0ipx8hka4ly3dc3dv6dnk2bq3hbiiahqqragdm1bqgy1plvwa5q6";
+       sha256 = "0617c537bdc13fbc426d4f658ca18a71c1819798b699dd066bc353a22644fd46";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -57142,7 +57332,7 @@ self: {
      mkDerivation {
        pname = "gnome-keyring";
        version = "0.3.1";
-       sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8";
+       sha256 = "880a62a69025a1b8ceae8eb896adf1e78cabfcd0a2fb4e8f8ddfe31e49f4ca21";
        libraryHaskellDepends = [ base bytestring text time ];
        librarySystemDepends = [ gnome_keyring ];
        libraryPkgconfigDepends = [ gnome_keyring ];
@@ -57160,7 +57350,7 @@ self: {
      mkDerivation {
        pname = "gnomevfs";
        version = "0.11.0";
-       sha256 = "0g4dic9k1c4221v4kacc46sj2vra1jlnb4pn657zfwbkni8z0kmp";
+       sha256 = "b74ef051b47371f74f31f69265a90c2a6f21b5218ca949761082b030138b8d3c";
        libraryHaskellDepends = [
          array base containers glib gtk haskell98 mtl
        ];
@@ -57178,7 +57368,7 @@ self: {
      mkDerivation {
        pname = "gnuidn";
        version = "0.2.1";
-       sha256 = "1jii635wc3j1jnwwx24j9gg9xd91g2iw5967acn74p7db62lqx37";
+       sha256 = "67744c8559ed5c722c53c7a4c2a37821b59ede4b9288ceb995410ec6cb3031ca";
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ libidn ];
        libraryPkgconfigDepends = [ libidn ];
@@ -57196,7 +57386,7 @@ self: {
      mkDerivation {
        pname = "gnuplot";
        version = "0.5.4";
-       sha256 = "1rx6gppgikjyd8ndlmc1yx3b4670184l80g8vrpcgjmbq23wjnmh";
+       sha256 = "b05ac987c0abcac76edee80144090ae018b246f78155da2c6a5ecef8ee7da6e7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -57214,7 +57404,7 @@ self: {
      mkDerivation {
        pname = "gnutls";
        version = "0.2";
-       sha256 = "1c5pm0d80wpgh2bkcgbvmc72agf89h8ghfnrn1m1x3fljbgzvrn0";
+       sha256 = "c0e6fddf92d48d1e6ab0d93af8104cc83d250eab7b3d369780ef72801aa8b7b0";
        libraryHaskellDepends = [ base bytestring monads-tf transformers ];
        librarySystemDepends = [ gnutls ];
        libraryPkgconfigDepends = [ gnutls ];
@@ -57228,7 +57418,7 @@ self: {
      mkDerivation {
        pname = "goa";
        version = "3.3";
-       sha256 = "0z1mhi2y4qm1lj6vfsmxf2gs5shfwdac3p9gqj89hx28mpc3rmzk";
+       sha256 = "f3d73cd8ad48749890c42fddc154e30eeaa29f70bd6ab78da4a162e24584357c";
        revision = "1";
        editedCabalFile = "5ae2bd1f4c29e22070fa32e5c126066813467ffe71a912148304d6f30d200137";
        libraryHaskellDepends = [ base directory filepath process ];
@@ -57244,7 +57434,7 @@ self: {
      mkDerivation {
        pname = "goatee";
        version = "0.3.0";
-       sha256 = "1py0cnmvqnjdf6bwwn8p6c78p9qnmk82932j7j6y2q91yhna6b2d";
+       sha256 = "4d2ca32cf42161e18d3c528c24d0ac16a78b0e331759ce97714d5abcab65c0df";
        libraryHaskellDepends = [
          base containers mtl parsec template-haskell
        ];
@@ -57262,7 +57452,7 @@ self: {
      mkDerivation {
        pname = "goatee-gtk";
        version = "0.3.0";
-       sha256 = "0wdspqs5pfa4axys87c8bci2s3y475fddjrdwh1kvc9vdsanb7xv";
+       sha256 = "bb9f65956e3bb13d03e42dcbd65c39c40f2d225b881da47d5744b95b34beba71";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -57282,7 +57472,7 @@ self: {
      mkDerivation {
        pname = "gofer-prelude";
        version = "2.30.3";
-       sha256 = "1whl3fvwxh26nsb4l6brljsmwl891w5yxlsv69mdfvfb1rl7p64f";
+       sha256 = "8e987b680ecb6dd76a325bd3ee0b0f09515eb5a479194a96b646c0ceb71b14f2";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "http://code.haskell.org/~dons/code/gofer-prelude";
        description = "The Gofer 2.30 standard prelude";
@@ -57295,7 +57485,7 @@ self: {
      mkDerivation {
        pname = "google-dictionary";
        version = "0.1.0.2";
-       sha256 = "12ib4y8cjg0dvvizy8yxgjaqvyawdy7vxmh1ab12b4yg40wwsg6g";
+       sha256 = "cf3ccd3920cf9325c25201d6be8f6f5cf98d957cdd23ffe3de0d3cc990272b8a";
        libraryHaskellDepends = [ aeson base bytestring HTTP lens mtl ];
        homepage = "https://github.com/mitchellwrosen/google-dictionary-api";
        description = "Simple interface to the google.com/dictionary API";
@@ -57306,15 +57496,16 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
      , directory, filepath, google-oauth2, hspec
      , hspec-expectations-lifted, http-conduit, http-types, load-env
-     , mtl, random, resourcet, text, time, timerep
+     , mtl, random, resourcet, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "google-drive";
-       version = "0.3.1";
-       sha256 = "0fzz9dgb2l5zcfjrzf4bqv0dgjhy12r9i1h66y1mji2z0f9qj37y";
+       version = "0.4.0";
+       sha256 = "488f740df4c746f58ccb1bf7bcc46dc8d504006d76bcc62ec54b8213b72954d3";
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra directory filepath
-         http-conduit http-types mtl random resourcet text time timerep
+         http-conduit http-types mtl random resourcet text time
+         unordered-containers
        ];
        testHaskellDepends = [
          base bytestring conduit conduit-extra directory google-oauth2 hspec
@@ -57332,7 +57523,7 @@ self: {
      mkDerivation {
        pname = "google-html5-slide";
        version = "2011.0";
-       sha256 = "0wkblf0i4lfw6s8adf2clcqj3161863vbsq1cip3rcn9djqbimzl";
+       sha256 = "f4d7b8b06cc9b23c6e6401ebb58741c1842131a34cb8a69036dc511281a36b72";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -57352,7 +57543,7 @@ self: {
      mkDerivation {
        pname = "google-mail-filters";
        version = "0.0.1.1";
-       sha256 = "0cxslr062h536q4vgs16r2s1lm7x5m9lcy1hzif6mpnmvjzqsn11";
+       sha256 = "21588dbfdcd5de6a5cfc307846532dfd541ab4c826e8b70936a3406140a6ba33";
        libraryHaskellDepends = [
          base containers google-search old-locale text time xml-conduit
        ];
@@ -57370,7 +57561,7 @@ self: {
      mkDerivation {
        pname = "google-oauth2";
        version = "0.2.0";
-       sha256 = "15aqwbr8wb1ghzy0r0k3fvfr187d9s3zz21lp07ci9pyz8ln8z08";
+       sha256 = "087c6429fafea6c80eb83488ff874eeda090dd7663820cfc872f2c8ef2e25895";
        libraryHaskellDepends = [
          aeson base bytestring HTTP http-conduit
        ];
@@ -57387,7 +57578,7 @@ self: {
      mkDerivation {
        pname = "google-search";
        version = "0.1.0.1";
-       sha256 = "0nkpvp5zjf3mkhqv6z5xvrmr6b6d5zgmzlh67y7ssslp4620m5m7";
+       sha256 = "a7960a8421976aad8f3f06d25fdf2fcd2c936bdebd7cb3319c7538f9cbdd775a";
        libraryHaskellDepends = [ base free nats old-locale text time ];
        homepage = "https://github.com/liyang/google-search";
        description = "EDSL for Google and GMail search expressions";
@@ -57403,7 +57594,7 @@ self: {
      mkDerivation {
        pname = "googleplus";
        version = "0.3.1.1";
-       sha256 = "046fvrr8cg00wagx4vdx35l2xk8qbs7fbs0v5hj45h4jk9dnk2jg";
+       sha256 = "4f8a695b9a92c042242c1be8e58e5e18cd2e6819bd6dd29fe2003c8672dece10";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers enumerator haskell98
          http-enumerator http-types mtl text time timerep transformers url
@@ -57415,6 +57606,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "googlepolyline" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text
+     }:
+     mkDerivation {
+       pname = "googlepolyline";
+       version = "0.1.0.1";
+       sha256 = "b16915544bfe4656fdf6104e769df8bac4a3e6c5f4ffd0c622d09fffb5f68717";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
+         base bytestring HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 text
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/lornap/googlepolyline";
+       description = "Google Polyline Encoder/Decoder";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "gopherbot" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-postgresql, MissingH, network
      , parsec, unix
@@ -57422,7 +57633,7 @@ self: {
      mkDerivation {
        pname = "gopherbot";
        version = "0.1.0";
-       sha256 = "0qa4xs07975spf4pwc2y0hichn4x8l7kn2949v0j19gbd099vjng";
+       sha256 = "cfca9d1268eba520c14e24093b0f459d58c822045e307e89bbba9c7480ee4461";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -57441,7 +57652,7 @@ self: {
      mkDerivation {
        pname = "gpah";
        version = "0.0.2";
-       sha256 = "1zwz065fdg3k09nh976igr90p1qpb397fyi7jh941c512m70qbxr";
+       sha256 = "b92f0c4e15a1b0401294277a77d25817870b527ed19c046d0273bce68a019fff";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -57459,7 +57670,7 @@ self: {
      mkDerivation {
        pname = "gpcsets";
        version = "0.9.2.0";
-       sha256 = "1fm0k6n6fb5a3wvmb2l6k4zq3sdfxv16cb2y2zmjgxgj5n3gy9s8";
+       sha256 = "4827ff862df2f527eb175e2c66c2eeaee9813f99868a55371faa2c67ac99a0ba";
        libraryHaskellDepends = [ base ];
        description = "Generalized Pitch Class Sets for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -57470,7 +57681,7 @@ self: {
      mkDerivation {
        pname = "gpolyline";
        version = "0.1.0.1";
-       sha256 = "01bsl7s8r33jgvk9lyca02awj43acii8spa6sskz19ivhm2adcr8";
+       sha256 = "28b3a644853ba6f0a7d6465d8d62646a10c995008a799ae67e728c8cf4a17a05";
        libraryHaskellDepends = [ base split ];
        homepage = "https://github.com/fegu/gpolyline";
        description = "Pure module for encoding/decoding Google Polyline";
@@ -57485,7 +57696,7 @@ self: {
      mkDerivation {
        pname = "gps";
        version = "1.2";
-       sha256 = "1krq6sv9qblwqlx7j6gb5qfv5zarxlyvaj6svhd4n8f7pr5w510r";
+       sha256 = "1984c24bbec7214b1adcda48b53ded59fdb21d2eeb19793ac59c2e9cb63638cf";
        libraryHaskellDepends = [
          base pretty prettyclass statistics text time vector
        ];
@@ -57506,7 +57717,7 @@ self: {
      mkDerivation {
        pname = "gps2htmlReport";
        version = "0.3.1";
-       sha256 = "1n6a1c6w3wmyaqan3ymlrk36h98yvy40wgwfdah4ayyxlsmvvxg8";
+       sha256 = "e8f5bdaba6dd7b45a06a8e3f0e88df1e2568c6ccb4fa611556bef2c10d0bcad8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -57528,7 +57739,7 @@ self: {
      mkDerivation {
        pname = "gpx-conduit";
        version = "0.1.1";
-       sha256 = "0ffb0npx0yb69qxdcdznxpw36zjp2za7vdpzy2r5l245y0xr7mj4";
+       sha256 = "44d6933bf085085ab2f0ffb67dd417577e33f8edf637d63a4e6679d0af05cb39";
        libraryHaskellDepends = [
          attoparsec base conduit filepath monad-control old-locale text time
          void xml-conduit xml-types
@@ -57546,7 +57757,7 @@ self: {
      mkDerivation {
        pname = "graceful";
        version = "0.1.1.5";
-       sha256 = "1kl4y01ny5w1y77r2jf830d7vd99by7frk106m2wc9nbl066mbhr";
+       sha256 = "19ae6a0ca0cb26c6453520ccec8e5f29b57d1a18c84991cff181176f03f084ce";
        libraryHaskellDepends = [ base directory network stm unix ];
        testHaskellDepends = [
          base directory filepath hspec network process stm unix
@@ -57563,7 +57774,7 @@ self: {
      mkDerivation {
        pname = "grammar-combinators";
        version = "0.2.7";
-       sha256 = "1z7i1270g919g1756wgfap2mfhvln13bhgya2pw4b9lbr5fphkdd";
+       sha256 = "ad4d785dc98ba645f815ca3fb846b0744357c555ee71534e7829a4078e08f1fc";
        libraryHaskellDepends = [
          base containers enumerable fgl graphviz MaybeT mtl multirec parsec
          template-haskell text uu-parsinglib
@@ -57580,7 +57791,7 @@ self: {
      mkDerivation {
        pname = "grapefruit-examples";
        version = "0.1.0.5";
-       sha256 = "0ad64jnp71gh7rj3rlfw7z67l5xnmc052g5q3slw3s6ga7spajlr";
+       sha256 = "994a75f551cfe8c1a91eb83c5100abb6177acc3fdcd13c643ef08573ad24a629";
        libraryHaskellDepends = [
          base colour containers fraction grapefruit-frp grapefruit-records
          grapefruit-ui
@@ -57598,7 +57809,7 @@ self: {
      mkDerivation {
        pname = "grapefruit-frp";
        version = "0.1.0.5";
-       sha256 = "155hmjflmzm463b00r1jjwbpjq8ilwss5xqwi6nz6lm3xbc2ddhm";
+       sha256 = "15b626d8eaa352f3ad891cf7a235a71161791797326400d630a4fe4a9dacb094";
        libraryHaskellDepends = [
          arrows base containers fingertree semigroups TypeCompose
        ];
@@ -57614,7 +57825,7 @@ self: {
      mkDerivation {
        pname = "grapefruit-records";
        version = "0.1.0.5";
-       sha256 = "02hyrbsz20fl9mnynval55xar175vgy77s23zaq66r3f8c6gf6h1";
+       sha256 = "011af70c436e6463b0fa43e873fcdbe584ac7a29546deb6d4dd401f1f5ca1e0a";
        libraryHaskellDepends = [ arrows base grapefruit-frp ];
        homepage = "http://grapefruit-project.org/";
        description = "A record system for Functional Reactive Programming";
@@ -57629,7 +57840,7 @@ self: {
      mkDerivation {
        pname = "grapefruit-ui";
        version = "0.1.0.5";
-       sha256 = "11xxvg2847vyzpw8i11a6mnflyr639hdwj51r9pfyaq95034q9jq";
+       sha256 = "58264c0628092bef6ecaa148de601a267bea6c352a8488f8fd7e1f82c4dbbd87";
        libraryHaskellDepends = [
          arrows base colour containers fraction grapefruit-frp
          grapefruit-records
@@ -57647,7 +57858,7 @@ self: {
      mkDerivation {
        pname = "grapefruit-ui-gtk";
        version = "0.1.0.5";
-       sha256 = "106svyjnv72f0ikcfxgq8zagqxcn52yc1f31kfgz9258mmdki49z";
+       sha256 = "3f91385bada888f49f9b61b8c0bc289675fcd447f875c766044e9c6da5dfda80";
        libraryHaskellDepends = [
          base colour containers fraction glib grapefruit-frp
          grapefruit-records grapefruit-ui gtk
@@ -57665,7 +57876,7 @@ self: {
      mkDerivation {
        pname = "graph-core";
        version = "0.2.2.0";
-       sha256 = "0czqcdg7w7al7gl339b9l15kn5n79zmdjbic3gn9mblnjb1666r9";
+       sha256 = "291b63c29296ae9aec1b2c2ed9ea4fc7163b4ba069a531e83b541d7e5e63f833";
        libraryHaskellDepends = [
          base containers deepseq hashable mtl QuickCheck safe
          unordered-containers vector
@@ -57686,7 +57897,7 @@ self: {
      mkDerivation {
        pname = "graph-generators";
        version = "0.1.2.0";
-       sha256 = "0iw22rmlhryc0z6k92lzdyjkc1qs98lj2509rk7qc7z0ghbhir9s";
+       sha256 = "3ae508177ce01f86cfcc091421294a1a0736a56f9f8a34cd07cc67486b168247";
        libraryHaskellDepends = [
          base containers fgl multiset mwc-random
        ];
@@ -57705,7 +57916,7 @@ self: {
      mkDerivation {
        pname = "graph-matchings";
        version = "0.1.0.0";
-       sha256 = "0dzkv13w06hkxg2vkbblpskvsq02c2ay06rw2j4vyjpw13hms5bv";
+       sha256 = "7b155de108fc4abf89143c1be095600260bda7be74adb9c5eb131ac047d8f337";
        libraryHaskellDepends = [ base containers fgl ];
        description = "An implementation of algorithms for matchings in graphs";
        license = stdenv.lib.licenses.lgpl21;
@@ -57716,7 +57927,7 @@ self: {
      mkDerivation {
        pname = "graph-rewriting";
        version = "0.7.6";
-       sha256 = "014zsw98ksylr4g1ax3xxlsh9jiybaz7xjapl2h88a8ma91da3jz";
+       sha256 = "5f0ed54252152984a0a057c97ebe5a3eca0435ed7d74151ec9d4eb8912d79f04";
        libraryHaskellDepends = [
          base base-unicode-symbols containers mtl
        ];
@@ -57734,7 +57945,7 @@ self: {
      mkDerivation {
        pname = "graph-rewriting-cl";
        version = "0.2.2";
-       sha256 = "0rwycs3vnzy9awm081h836136s2wjyk9qyhsx9j6z7y3lgsb2cr0";
+       sha256 = "2033b1f4a3c39f6f64ea1a7a9ca6975c683382190806042a57c97fbb87669e67";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -57755,7 +57966,7 @@ self: {
      mkDerivation {
        pname = "graph-rewriting-gl";
        version = "0.7.5";
-       sha256 = "0cynzhr226944w3sn13bdnl60z9fy87va5fjayd4g0as2168ikhy";
+       sha256 = "1ece884c105a81479a57d215b50ff22e7d60a86d6b04ab072724192132fcd633";
        libraryHaskellDepends = [
          AC-Vector base base-unicode-symbols containers GLUT graph-rewriting
          graph-rewriting-layout OpenGL
@@ -57775,7 +57986,7 @@ self: {
      mkDerivation {
        pname = "graph-rewriting-lambdascope";
        version = "0.5.6";
-       sha256 = "1qwy2mn22a5ppz3lrqz6czxrr3j26zxpp6lm3sf121k3a78c7vvp";
+       sha256 = "77efc3d0516306119c1e959a7bfb37428e9cfb67e6e34cc7bfb728216c159ee3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -57797,7 +58008,7 @@ self: {
      mkDerivation {
        pname = "graph-rewriting-layout";
        version = "0.5.3";
-       sha256 = "09fscyaknd3nhqn7d3wa4j8n2yagmmfk661m41cqx5hlay60x5f5";
+       sha256 = "c5950e8c5714968e59203518335dad4f796191248a8f762c8676343b9567da25";
        libraryHaskellDepends = [
          AC-Vector base base-unicode-symbols graph-rewriting
        ];
@@ -57815,7 +58026,7 @@ self: {
      mkDerivation {
        pname = "graph-rewriting-ski";
        version = "0.6.4";
-       sha256 = "0jdfwcz427lx3r0alba1rphc6hj43mqygkdqmwn37yll4r1c62a4";
+       sha256 = "4409c3422694fa332cafb8cde7711d4442c3e0cd412daa401e9d1e413ee3ae49";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -57836,7 +58047,7 @@ self: {
      mkDerivation {
        pname = "graph-rewriting-strategies";
        version = "0.2.3";
-       sha256 = "0mimp7xbmnp9c2j8hr09qivc6kgfi4g63p071s560laddins39jr";
+       sha256 = "59a6a16d6c4d51608a0e07dc611e89ee4dc376c4096488a460e9dabafab93556";
        libraryHaskellDepends = [
          base base-unicode-symbols containers graph-rewriting
        ];
@@ -57855,7 +58066,7 @@ self: {
      mkDerivation {
        pname = "graph-rewriting-trs";
        version = "0.1.6";
-       sha256 = "1v8imc3ym0jjyhpw10xh36l060nvd0klp9llnmdnv8qkmy7pn8yg";
+       sha256 = "cf237b8faf13a36d5bb594a64b2768db0203a819b083c02ff45282ea07ab11ed";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -57878,7 +58089,7 @@ self: {
      mkDerivation {
        pname = "graph-rewriting-ww";
        version = "0.3.4";
-       sha256 = "169s5iy15q9ll12fjxizrc0l2q34rvqmxfpbcanc602cj3inav2w";
+       sha256 = "5c6c65e3904c00c3ac62ebba5ef1ce64604101cb3f76e944a034e1127c2c3a99";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -57897,7 +58108,7 @@ self: {
      mkDerivation {
        pname = "graph-serialize";
        version = "0.2";
-       sha256 = "1a9qq5gpyxg6j6ja3kjldnf11wywjvvxpwvgiahlsrmwfw2c8d74";
+       sha256 = "e434c40477bc664da18a6ff3dbf796dcf3109c6d54cea1a491e6757f5fc138a9";
        libraryHaskellDepends = [ array base bytestring containers ];
        homepage = "http://github.com/nominolo/graph-serialize";
        description = "Serialization of data structures with references";
@@ -57911,7 +58122,7 @@ self: {
      mkDerivation {
        pname = "graph-utils";
        version = "0.3.7";
-       sha256 = "06wl6i8z0gfndr96g5ps11h877rbwvi1d9cbbr3d2whvbcsyclsf";
+       sha256 = "4e53e6355b1b72d1465e8ba516e2e62b9f836008fa9667526ed63df05134941b";
        libraryHaskellDepends = [
          base containers fgl mtl parsec syb template-haskell
        ];
@@ -57929,7 +58140,7 @@ self: {
      mkDerivation {
        pname = "graph-visit";
        version = "0.1.0.2";
-       sha256 = "0afj0wqpk549n0xs4vqcblrxs1d6knmxcldfnmz5vy2da5zlfn0q";
+       sha256 = "1858477f514df85d7eb5ae51d6ab9da605dd335d0c6fa23bb08994793107d229";
        libraryHaskellDepends = [
          base containers data-lens data-lens-template mtl
        ];
@@ -57945,7 +58156,7 @@ self: {
      mkDerivation {
        pname = "graph-wrapper";
        version = "0.2.5.1";
-       sha256 = "04z1qbsf1c31r0mhn8bgr8hisffxacq3j61y4fym28idr8zqaqc3";
+       sha256 = "8361853fca2d2251bd233e18393053dd391d21ca6f210b2bc861b0e0f4c2e113";
        libraryHaskellDepends = [ array base containers ];
        testHaskellDepends = [
          array base containers deepseq hspec QuickCheck
@@ -57962,7 +58173,7 @@ self: {
      mkDerivation {
        pname = "graphbuilder";
        version = "0.1.0.0";
-       sha256 = "0zhjzb53qaj6dy6ncqjaxdfrs2hwfy4g9czybpsgnbniqm07i22b";
+       sha256 = "4b887840c5d12efbf45dfeb3f488771c0a9d5deb4a62668d6f462a3ccafa127e";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [
          base containers mtl QuickCheck test-framework
@@ -57982,7 +58193,7 @@ self: {
      mkDerivation {
        pname = "graphene";
        version = "0.1.0.4";
-       sha256 = "09q57hqf3s29y3b6wn79wa9ksm5r2p75ww3kpwqmigvngy4sz006";
+       sha256 = "0680af897f76bf5831bf73705ece15b9543d93e2e9586ed6f049e8e1303c0527";
        libraryHaskellDepends = [
          base bifunctors containers hashable lens-family lens-family-core
          mtl transformers
@@ -58000,7 +58211,7 @@ self: {
      mkDerivation {
        pname = "graphics-drawingcombinators";
        version = "1.5.1";
-       sha256 = "0j0ilr54pdz61c78khy8bm37g89cvk1n56h5d6c55jabsv5gx3sf";
+       sha256 = "4e8ffecad64bc9529869059a62c3dc2ca177465dc8c3890e0be6b74b4aa61148";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -58019,7 +58230,7 @@ self: {
      mkDerivation {
        pname = "graphics-formats-collada";
        version = "0.3.1";
-       sha256 = "1kfx1c2x8v2i7ckhjiqv7ghhn44w7fscghxkn1iqkp3mj1p3xvbv";
+       sha256 = "7bed3e6e9075dc8963b0b3c3c7b43b9c100be13b1b4709273b516cd4050bddcd";
        libraryHaskellDepends = [
          base bitmap-opengl containers hxt OpenGL stb-image transformers
        ];
@@ -58035,7 +58246,7 @@ self: {
      mkDerivation {
        pname = "graphicsFormats";
        version = "0.1";
-       sha256 = "0bcqj0n8qqaqfrn21qgkf8si5qgxl3qlsc8djy0rqhnfi2grb8nh";
+       sha256 = "d0a2959f88ce429c81970d314df1a0fde1123572f3e1206c7658618c2c90982d";
        libraryHaskellDepends = [ base haskell98 OpenGL QuickCheck ];
        description = "Classes for renderable objects";
        license = stdenv.lib.licenses.bsd3;
@@ -58049,7 +58260,7 @@ self: {
      mkDerivation {
        pname = "graphicstools";
        version = "0.2.2";
-       sha256 = "0hcz8w6yf7dls4sv0i5kihs22ysv0dl63q5bs5y4hgv6d747psp8";
+       sha256 = "e8ea7bc869663f487cd1abe06168035b7b21348cb344b035d1b41de70d479f41";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -58069,7 +58280,7 @@ self: {
      mkDerivation {
        pname = "graphmod";
        version = "1.2.6";
-       sha256 = "02p1x44ywv2mb4l2dsz9z3ybnvv4nns3882lqm3nc8sw2hkib8z3";
+       sha256 = "e3a31527145c236647c5542034b4b5646fbbfcf8e9eb262859556cee09e9e10a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -58085,7 +58296,7 @@ self: {
      mkDerivation {
        pname = "graphs";
        version = "0.6.0.1";
-       sha256 = "061n1k5v6izpa77wyxch3ym4hzs1k64a902x2250gi724mj3mjsk";
+       sha256 = "53cb3a6425e2c4078a105d80a48899417f48aa1f9075cfcf51f747b3cb0c3618";
        libraryHaskellDepends = [
          array base containers transformers void
        ];
@@ -58101,7 +58312,7 @@ self: {
      mkDerivation {
        pname = "graphtype";
        version = "0.2.0";
-       sha256 = "13nblgd4b3pwpw8idvbd54fq2lf233vj8gvsl0qr381lsvj69fbi";
+       sha256 = "71b964e4d634a09131a07a3f24f718c251811d296ded1611bffc8e45daa3cb8e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -58121,7 +58332,7 @@ self: {
      mkDerivation {
        pname = "graphviz";
        version = "2999.17.0.2";
-       sha256 = "1zfndf5mpwx3nrgybxg5hy8n30zwsfx6jgp9468b0pp8c5h65j13";
+       sha256 = "23c8626061e85eb09021e93e69bad3fc83619187e5f5e55fb6a3f35b8b6bd6fd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -58147,7 +58358,7 @@ self: {
      mkDerivation {
        pname = "gravatar";
        version = "0.8.0";
-       sha256 = "1mzl08qzwzzhz6bvkz4qnrdnzsgvsmi2lnhzf743yzx4msn00q3g";
+       sha256 = "6f6000acaea47f3fc8711f5a2a62d5fbe96f5bb698fcb997f9f07ffe3102f4d7";
        libraryHaskellDepends = [
          base bytestring data-default HTTP pureMD5 text
        ];
@@ -58161,7 +58372,7 @@ self: {
      mkDerivation {
        pname = "gray-code";
        version = "0.3.1";
-       sha256 = "0b0pm24mxjsxg95q6yisr9pa0jfklsfw66cicryib42czvv083av";
+       sha256 = "5b0d04f6fe4c90157d669119c39da6d349a06eca3a7a834b7a5dcb5e89a8172c";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "http://bitbucket.org/astanin/hs-gray-code";
@@ -58176,7 +58387,7 @@ self: {
      mkDerivation {
        pname = "gray-extended";
        version = "1.5.1";
-       sha256 = "1lami8ncp9d4k25vzb23gz9067ahp8vws378qb57hnkisfnn932q";
+       sha256 = "588c64add3715a78cac2e80ccd37ba501d03d27f43acbf8b98a4a5cb2c8a55d1";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -58192,7 +58403,7 @@ self: {
      mkDerivation {
        pname = "greencard";
        version = "3.0.4.2";
-       sha256 = "1vl9p6mqss5r4jfqnjir7m1q7fhh9f204c99qd5y5d0j7yc26r5y";
+       sha256 = "be6423983f12b4e24bc3293102844b10ba83433d394a8b9d24b9688dabb989ee";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -58208,7 +58419,7 @@ self: {
      mkDerivation {
        pname = "greencard-lib";
        version = "3.0.1";
-       sha256 = "1a8h36kclb5db7kfy1pb4h2pwy6a6wwnjpm21xzvc9fjx9vj44kd";
+       sha256 = "6d122277ead225b67f0fa25e693937ca787e0524eb06efe659ad2ccaa61910a9";
        libraryHaskellDepends = [ array base containers greencard pretty ];
        homepage = "http://www.haskell.org/greencard/";
        description = "A foreign function interface pre-processor library for Haskell";
@@ -58223,7 +58434,7 @@ self: {
      mkDerivation {
        pname = "greg-client";
        version = "1.0.2";
-       sha256 = "1p645qgn5i194mna20ariypxp0dci7lzyxhszmnyylpd0icyg4in";
+       sha256 = "3692e75904ed52ef6dfd1a76ffe989ac81dbaf8f5901a16c2529c4621f2ec4dc";
        libraryHaskellDepends = [
          base binary bytestring clock hostname network stm system-uuid time
        ];
@@ -58240,7 +58451,7 @@ self: {
      mkDerivation {
        pname = "grid";
        version = "7.8.4";
-       sha256 = "1jci2191l6k1qlch54id7z05zn9lp5lzyh7g6hm9s522z97lgb2k";
+       sha256 = "53ac474ffa42149d2a34ef40ff69b934d95fc03f2d920219c5611a1a521091c9";
        libraryHaskellDepends = [ base cereal containers ];
        testHaskellDepends = [
          base containers QuickCheck test-framework
@@ -58258,7 +58469,7 @@ self: {
      mkDerivation {
        pname = "gridland";
        version = "0.1.0.3";
-       sha256 = "0q5p73n6h5ngg992f1msdqzxds2baafjypdx53zf2rdhbqp4fdi9";
+       sha256 = "2936472e5eb065e1fe28bd5d2f9d524be8d63f6eba0627527acf1668ec38b760";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -58277,7 +58488,7 @@ self: {
      mkDerivation {
        pname = "grm";
        version = "0.1.1";
-       sha256 = "1za45931c6avyqxb6dwiafl739fmwdk68kxpk13zkv0jwxxpp9px";
+       sha256 = "fda67b7be712ecf94798b74f6466e3d5a571a8539137b33af65b1916462a44fd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -58297,7 +58508,7 @@ self: {
      mkDerivation {
        pname = "groom";
        version = "0.1.2";
-       sha256 = "045hzpnf17rp1ib6q3gcznl9b7ivz5zmv0gh7qfg726kr8i030hf";
+       sha256 = "0e820122cad388f31c3ef0815d7ff93b9e95a8fdec0d6c560c379fe0ecfdb010";
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Pretty printing for well-behaved Show instances";
        license = stdenv.lib.licenses.publicDomain;
@@ -58312,7 +58523,7 @@ self: {
      mkDerivation {
        pname = "groundhog";
        version = "0.7.0.3";
-       sha256 = "0n5c501wfyqcl1iy4017yyxp95kz7mb4lgc0mjjk9si36ixkww9r";
+       sha256 = "39713e7b3423ea34a5ac803d4a563d7f9674bbf72700e263a00c7bc70328ac58";
        revision = "1";
        editedCabalFile = "dcf9bbeaf0fd7e7ac0809902a54779097e8935a07b1e7e43c404bc683c17e7f0";
        libraryHaskellDepends = [
@@ -58333,7 +58544,7 @@ self: {
      mkDerivation {
        pname = "groundhog-inspector";
        version = "0.7.1.2";
-       sha256 = "14wxmn18z4022vkakyrdl7mz7zbdaa3dnwbb52ymg3f5r13lr7lh";
+       sha256 = "909e4c47c8c58d57bd286b71db86526dfdf3eba12dfba9e61602908f82ad9d93";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -58358,7 +58569,7 @@ self: {
      mkDerivation {
        pname = "groundhog-mysql";
        version = "0.7.0.1";
-       sha256 = "01pnninva0va0pl9k7mjk2l7fm42978j9x82sj8z7cscshvl327f";
+       sha256 = "ee884137d44cb3f391d402f524d149825477a898b29e99e8056a03b56db4f606";
        libraryHaskellDepends = [
          base bytestring containers groundhog monad-control monad-logger
          mysql mysql-simple resource-pool text time transformers
@@ -58376,7 +58587,7 @@ self: {
      mkDerivation {
        pname = "groundhog-postgresql";
        version = "0.7.0.2";
-       sha256 = "18wdj51v6qqyqx10lvknr3irhs5qddvh301bx7l9cdcpkk1la81i";
+       sha256 = "312045c39c973596e8e92b8001776bb86898e3c8766e0a42c71e63b343918da3";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers groundhog
          monad-control monad-logger postgresql-libpq postgresql-simple
@@ -58394,7 +58605,7 @@ self: {
      mkDerivation {
        pname = "groundhog-sqlite";
        version = "0.7.0.1";
-       sha256 = "0lsm9yfapdpy4nf5bxrbjkvw9nwc82qfmyw1h9l3mc4b8nfp12dy";
+       sha256 = "be89709d458bb03a688281fbeab0408cdbc4f7942bf7559c25feb6ab9c4f5553";
        libraryHaskellDepends = [
          base bytestring containers direct-sqlite groundhog monad-control
          monad-logger resource-pool text transformers unordered-containers
@@ -58410,7 +58621,7 @@ self: {
      mkDerivation {
        pname = "groundhog-th";
        version = "0.7.0.1";
-       sha256 = "15g07rzw2jygzs5p9jflq6l2rjrmf03lj8pprzc4vgwvk04x233h";
+       sha256 = "700cd109989bbf4dd8cff72249077035cb2ca8c1d4c9748bfecf4bc17f3ee095";
        libraryHaskellDepends = [
          aeson base bytestring containers groundhog template-haskell text
          time unordered-containers yaml
@@ -58426,7 +58637,7 @@ self: {
      mkDerivation {
        pname = "group-with";
        version = "0.2.0.2";
-       sha256 = "0c7p3bj3b68h2zp0lzldfjwq7x2a38v0gnxyflisawdg61jnx8h6";
+       sha256 = "06a26e6530af71a52375bedb07361a4af483b9748d7e0aee17109935e41af730";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base Cabal containers hspec hspec-expectations QuickCheck
@@ -58442,7 +58653,7 @@ self: {
      mkDerivation {
        pname = "groupoid";
        version = "0.1.0";
-       sha256 = "0gpjlq9f2il4vp7ihh1sf5g2jr1rbi5big5c6dhjk961n8b1dq0z";
+       sha256 = "1fe01616b2c1a4296133acbcb84a5c3964295e713a4018cfdd8446e112a6f23e";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "A Groupoid class";
@@ -58454,7 +58665,7 @@ self: {
      mkDerivation {
        pname = "groupoids";
        version = "4.0";
-       sha256 = "08la44c19pz2clws5mb939zc1d17cb6qy9qlh2n1634pl0zrawb6";
+       sha256 = "6671953fa0970c13ac8014278fcd6227b4c07e1a69d5a23965e2df1418218a22";
        libraryHaskellDepends = [ base semigroupoids ];
        homepage = "http://github.com/ekmett/groupoids/";
        description = "This package has been absorbed into semigroupoids 4.0";
@@ -58466,7 +58677,7 @@ self: {
      mkDerivation {
        pname = "groups";
        version = "0.4.0.0";
-       sha256 = "1kp8h3617cimya8nnadljyy4vk66dzl5nzfm900k2gh3ci8kja6k";
+       sha256 = "d328395164033e310148d57d5be86fc6cc4dbc97b4296b91f235b213cc80e8ce";
        libraryHaskellDepends = [ base ];
        description = "Haskell 98 groups";
        license = stdenv.lib.licenses.bsd3;
@@ -58482,7 +58693,7 @@ self: {
      mkDerivation {
        pname = "growler";
        version = "0.6.0";
-       sha256 = "0skykz2p0kcs8g1vq7832h7fnw193hpq4pplkcaxazg8z97k8q75";
+       sha256 = "e560344ffae87dd5159bf45e822f1c2970eb0e14031dbcc3439a4d70c59f7e6a";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive either
          http-types lens monad-control mtl pipes pipes-aeson pipes-wai
@@ -58502,7 +58713,7 @@ self: {
      mkDerivation {
        pname = "gruff";
        version = "0.3.4";
-       sha256 = "0is9bpaalyr78g0hfp6bbmny4w6w8a3aj9a041f82499hhy0vv0h";
+       sha256 = "10ec0d3c842911815c204025a98642dc70e26d5dcb5c07c143277baad45d4947";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ruff ];
@@ -58523,7 +58734,7 @@ self: {
      mkDerivation {
        pname = "gruff-examples";
        version = "0.3.1";
-       sha256 = "02ygb88zxikf5ggw9ypyzganngk4dgfcszpkyzy6cwm47mksdzg7";
+       sha256 = "e7fda6673da47266fcf7f37ecddc6b643e6bd5fbfefac4df2b6ec6fe115acf0b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -58541,7 +58752,7 @@ self: {
      mkDerivation {
        pname = "gsasl";
        version = "0.3.6";
-       sha256 = "0cgrw5ypkwp4mzj8m12q783jqng1jp1j7ny15704jmjxbq13cq3q";
+       sha256 = "786036025e5d5649c029c1db23c395e1592c073a58848ae4afe4f2797de1f931";
        libraryHaskellDepends = [ base bytestring transformers ];
        libraryPkgconfigDepends = [ gsasl ];
        homepage = "https://john-millikin.com/software/haskell-gsasl/";
@@ -58554,7 +58765,7 @@ self: {
      mkDerivation {
        pname = "gsc-weighting";
        version = "0.2.2";
-       sha256 = "0y80j5qk601c965assl8d91k9bpvzijn2z0w64n2ksij9lm6b8p5";
+       sha256 = "e5a2652a4d32ea292c311c7c6165fcfbae34436a886aad8a492c003371910079";
        libraryHaskellDepends = [ base hierarchical-clustering ];
        description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting";
        license = stdenv.lib.licenses.bsd3;
@@ -58565,7 +58776,7 @@ self: {
      mkDerivation {
        pname = "gsl-random";
        version = "0.5.0";
-       sha256 = "0bhwi2ianxazyxyp2siczk8rfdnj4dx3rfz5d82bag2xcbzcrbfj";
+       sha256 = "d2adccfe625d3cb5046ae5bb3c7a23d23697d1fc2c6a717df75f75aba2881c2e";
        libraryHaskellDepends = [ base vector ];
        homepage = "http://github.com/patperry/hs-gsl-random";
        description = "Bindings the the GSL random number generation facilities";
@@ -58578,7 +58789,7 @@ self: {
      mkDerivation {
        pname = "gsl-random-fu";
        version = "0.0.0.1";
-       sha256 = "1qf5m3zksn16mlgavrwbq6yd1mbyafy27qf1ws4nmkxl8ci0k48i";
+       sha256 = "1191092243b4cf6a89e6c1e123bc537ed5d0bcc18be7ad1ead26583dffa8c5e1";
        libraryHaskellDepends = [ base gsl-random random-fu ];
        homepage = "http://code.haskell.org/~mokus/gsl-random-fu";
        description = "Instances for using gsl-random with random-fu";
@@ -58593,7 +58804,7 @@ self: {
      mkDerivation {
        pname = "gsmenu";
        version = "3.0";
-       sha256 = "15ddm69fmk0nkkrs5g80amdvld2mq59ah58nbnk83mwkffpi484f";
+       sha256 = "8e2012af7393d781a65d1615a852c15534ba5b5500bda2f39c16ccea92a9ad95";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -58613,7 +58824,7 @@ self: {
      mkDerivation {
        pname = "gstreamer";
        version = "0.12.5.0";
-       sha256 = "0grg20wsvdyfpm2y3ykw7d3j7s2hlbs8psjwfy0yfz3839yvccy6";
+       sha256 = "c633b67d1a687ce781775cea8bf4a250e823473b7cfae145bdceb7ad39102f3f";
        libraryHaskellDepends = [
          array base bytestring directory glib mtl
        ];
@@ -58633,7 +58844,7 @@ self: {
      mkDerivation {
        pname = "gt-tools";
        version = "0.2.1";
-       sha256 = "1mkccxgnvgjxkbsdl6bcn61yv0zi20i8h9z11hqcfd3ibfnsw7bh";
+       sha256 = "701daead5b7134c7300ce127882210f183ed83b16c19daf49a5dbe6d5f676cd6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -58651,7 +58862,7 @@ self: {
      mkDerivation {
        pname = "gtfs";
        version = "0.1";
-       sha256 = "0m0i13xpj9wz6ykngwfqi2vnrliwf0y1d2cxg9254dm865l5gvsi";
+       sha256 = "51ef576831a83652447a9d89163c703cd26cb788d8f167a7379f2779fb081154";
        libraryHaskellDepends = [
          base csv directory filepath rowrecord split
        ];
@@ -58667,7 +58878,7 @@ self: {
      mkDerivation {
        pname = "gtk";
        version = "0.13.9";
-       sha256 = "1mdz3s03y69713cr3grn8gawimykk8rs1f9vgch8a8q04ivhkq0j";
+       sha256 = "12e0097724002385207b3bb9a0339ad3d7c8d54336bf91d90827193f801ebfd5";
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
@@ -58685,7 +58896,7 @@ self: {
      mkDerivation {
        pname = "gtk-helpers";
        version = "0.0.7";
-       sha256 = "0cx43z79r77ksicgz4ajg8b4hhllyfadcb46zdh6lg088zsgc6v7";
+       sha256 = "671bf6f447083c6a60fb862cd694f3944248167a5291ff58d4f39c9cce1fa433";
        libraryHaskellDepends = [
          array base gio glib gtk mtl process template-haskell
        ];
@@ -58699,7 +58910,7 @@ self: {
      mkDerivation {
        pname = "gtk-jsinput";
        version = "0.0.0";
-       sha256 = "0fjlk6z8j77l35k9cdzgbyf1w5wd0v0k1sry78vf7f6j4mvv8wb0";
+       sha256 = "6071b47725d2b8e3363a3eeb30c1068d171e9c5fef37966619f41c89be99543a";
        libraryHaskellDepends = [ base gtk json transformers ];
        homepage = "http://github.com/timthelion/gtk-jsinput";
        description = "A simple custom form widget for gtk which allows inputing of JSON values";
@@ -58713,7 +58924,7 @@ self: {
      mkDerivation {
        pname = "gtk-largeTreeStore";
        version = "0.0.1.0";
-       sha256 = "0nzddvm17gqkdjpkls4rd5lxshx8fwvn35b9r3njqqpm2yi5qci0";
+       sha256 = "20325ca217f5622cedc86995613777a843dd696999683aaf6c13bf13ea6eed5b";
        libraryHaskellDepends = [
          base containers glib gtk3 mtl nested-sets
        ];
@@ -58729,7 +58940,7 @@ self: {
      mkDerivation {
        pname = "gtk-mac-integration";
        version = "0.3.1.1";
-       sha256 = "02s5ksr8fkqlbwlq468v93w0is1xa73wswgxahyyvhh51wnqp3ax";
+       sha256 = "5d8d8b2d0f05c2ed3d54fd71cdc7513de808f8481b1982295f144f87b29e450b";
        libraryHaskellDepends = [ array base containers glib gtk mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
@@ -58745,7 +58956,7 @@ self: {
      mkDerivation {
        pname = "gtk-serialized-event";
        version = "0.12.0";
-       sha256 = "0gh8kwd9758ws941xbxhrm3144pmnqln0md5r6vjbq7s1x54bsrf";
+       sha256 = "2eeb454a0ffae025b7c9a5556029b6f5121246cdb0af1e48d21c95931a9f083e";
        libraryHaskellDepends = [
          array base containers glib gtk haskell98 mtl
        ];
@@ -58761,7 +58972,7 @@ self: {
      mkDerivation {
        pname = "gtk-simple-list-view";
        version = "0.0.0";
-       sha256 = "1qqfhaap2996015h3jkgg9j3hyxrh88wn6kba29ys0q1h35f8yws";
+       sha256 = "9a7be4ca800103ed93506b1acb1182b97b38647a6fca014b0026257195820ee3";
        libraryHaskellDepends = [ base gtk ];
        homepage = "http://github.com/timthelion/gtk-simple-list-view";
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views";
@@ -58773,7 +58984,7 @@ self: {
      mkDerivation {
        pname = "gtk-toggle-button-list";
        version = "0.0.0";
-       sha256 = "14hb7nxf4l0q7hab8dzll8dh5ccb4hhc8arywijdgdrz4i2s2706";
+       sha256 = "061ca145243fb7d764e43e2bc420248bb1021ba2f437b4143c1850e2ba3d0b92";
        libraryHaskellDepends = [ base gtk ];
        homepage = "http://github.com/timthelion/gtk-toggle-button-list";
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists";
@@ -58785,7 +58996,7 @@ self: {
      mkDerivation {
        pname = "gtk-toy";
        version = "0.2.0";
-       sha256 = "0zf3k0c5h5wcgkqr8np5kvgz4c9nha86k5whsn4f1wk0ikj98dfq";
+       sha256 = "d83594e48c60f2e088d590976990823631f2df9ee55a94f17c8c17581898c37d";
        libraryHaskellDepends = [ base containers gtk ];
        jailbreak = true;
        description = "Convenient Gtk canvas with mouse and keyboard input";
@@ -58798,7 +59009,7 @@ self: {
      mkDerivation {
        pname = "gtk-traymanager";
        version = "0.1.5";
-       sha256 = "0hzl9pa5vx04vslb2visx35wwjagzzi1j5gyk5acy8pym8ly50hm";
+       sha256 = "1582e229aafe22cf5499fe1519e2ff4f49cecbe83a6eb1a8de04f45dd44df443";
        libraryHaskellDepends = [ base glib gtk ];
        libraryPkgconfigDepends = [ x11 ];
        homepage = "http://github.com/travitch/gtk-traymanager";
@@ -58813,7 +59024,7 @@ self: {
      mkDerivation {
        pname = "gtk2hs-buildtools";
        version = "0.13.0.4";
-       sha256 = "041mprflgqc74qb21czzy3m2nzj5mc3ji4i60f04dh2f2bac491a";
+       sha256 = "2a24c2d4124ec046800326922807ab457e2beaf0ffb320162687e1475dbe3510";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -58833,7 +59044,7 @@ self: {
      mkDerivation {
        pname = "gtk2hs-cast-glade";
        version = "0.10.1.1";
-       sha256 = "0azyf3h53r5dqvz66bbvqk9qp418v0mq0yzd1ia6pc6d7ypknkx6";
+       sha256 = "a64f3baf3fcdb06b540ced7b802bd828908bd3c47b2d63fec6ade451e070fe2b";
        libraryHaskellDepends = [
          base glade gtk gtk2hs-cast-glib hint template-haskell
        ];
@@ -58847,7 +59058,7 @@ self: {
      mkDerivation {
        pname = "gtk2hs-cast-glib";
        version = "0.10.1.1";
-       sha256 = "1bsz1zyz2hxf07q6xr232aciwxl3819jklj16hqqbfjwm4mzn2mp";
+       sha256 = "b70afb2ba95cba85313441d229534083761e991243e46ef001ae43f1fd0f5faf";
        libraryHaskellDepends = [ base glib ];
        description = "A type class for cast functions of Gtk2hs: glib package";
        license = "unknown";
@@ -58860,7 +59071,7 @@ self: {
      mkDerivation {
        pname = "gtk2hs-cast-gnomevfs";
        version = "0.10.1.2";
-       sha256 = "0fkrrsvagsn51rn0b16y8ac3fg509wrxqdfwsij9nbprcd8iz75g";
+       sha256 = "af9c1f5163f92e9b64d4dc35dc334fa03c379842de84056c0ec5eaa7b6ce793a";
        libraryHaskellDepends = [
          base gnomevfs gtk2hs-cast-glib gtk2hs-cast-th hint template-haskell
        ];
@@ -58876,7 +59087,7 @@ self: {
      mkDerivation {
        pname = "gtk2hs-cast-gtk";
        version = "0.10.1.2";
-       sha256 = "15d6c0mdd9nzpb310n19kyw0jqv019w17ncxxhg3wk90ckb43l3j";
+       sha256 = "72d041d664204d3e1eec9dd913780a606309b89f295810c6badfa6d62a60a695";
        libraryHaskellDepends = [
          base gtk gtk2hs-cast-glib gtk2hs-cast-th hint template-haskell
        ];
@@ -58892,7 +59103,7 @@ self: {
      mkDerivation {
        pname = "gtk2hs-cast-gtkglext";
        version = "0.10.1.2";
-       sha256 = "05m4h8wh820mwiarrysa4fkxj14l90ky89kv24irpa3vw27xnsm9";
+       sha256 = "a96adb8fe07ba89b23117b26e427489404d9a7234afb9c55e41508043982a416";
        libraryHaskellDepends = [
          base gtk2hs-cast-glib gtk2hs-cast-th gtkglext hint template-haskell
        ];
@@ -58908,7 +59119,7 @@ self: {
      mkDerivation {
        pname = "gtk2hs-cast-gtksourceview2";
        version = "0.10.1.2";
-       sha256 = "1fyca2kwjc4hk9jqshn9hzq4m7415kapdln1nv0rgxsd1iabjk81";
+       sha256 = "014db9540c4df797c1b6c1d276d52c819c4af087c9428d659a9030c9a750ccbb";
        libraryHaskellDepends = [
          base gtk2hs-cast-glib gtk2hs-cast-th gtksourceview2 hint
          template-haskell
@@ -58922,7 +59133,7 @@ self: {
      mkDerivation {
        pname = "gtk2hs-cast-th";
        version = "0.10.1.0";
-       sha256 = "19a7qb0dlfqw22fz7m94xyzbssvia106wlvy3brag5nhfza833px";
+       sha256 = "fd8e81d477d096a7f21a7e536e4050716bbdbeef24d5f39d101c3bdac0c247a5";
        libraryHaskellDepends = [ base hint template-haskell ];
        description = "A type class for cast functions of Gtk2hs: TH package";
        license = "unknown";
@@ -58933,7 +59144,7 @@ self: {
      mkDerivation {
        pname = "gtk2hs-hello";
        version = "1.1.0.0";
-       sha256 = "0km86yd8wkn85x8xr326a8pzrfmbrf0cpf6zz3sggk3kn4jrmbj4";
+       sha256 = "44ae9a25b173ccf7f4f8dfb8cb80cbabbafc2f52468cdc512fc84e8e9a37a84e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base glib gtk3 transformers ];
@@ -58948,7 +59159,7 @@ self: {
      mkDerivation {
        pname = "gtk2hs-rpn";
        version = "0.2.1";
-       sha256 = "01wikd60b48qcz6vk31kwfkpkf2za5laxbhdyns45s90lvr98rvi";
+       sha256 = "716794f2a620e942b4f50daeae68515fb879a7e3338cb9cd671891054c9b9107";
        libraryHaskellDepends = [ base cairo glib gtk mtl ];
        jailbreak = true;
        description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation";
@@ -58964,7 +59175,7 @@ self: {
      mkDerivation {
        pname = "gtk3";
        version = "0.14.0";
-       sha256 = "1j6nwjvjmzb144vbizraax0yf5bbkicg5hx2mm4z9ayacf58sm7c";
+       sha256 = "ec548d8a63caabf449ada2c3f2589c6b15e741572affb8362161fd2ab7e4d6c8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -58987,7 +59198,7 @@ self: {
      mkDerivation {
        pname = "gtk3-mac-integration";
        version = "0.3.2.0";
-       sha256 = "0m7659ca92w9yhd1fnraa255sx74qjagwsavd3navl41h687bzqj";
+       sha256 = "12ff75908181d0adec685b69fe94c4e4745d8a502a5b171af4898ba4582ae654";
        libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
@@ -59004,7 +59215,7 @@ self: {
      mkDerivation {
        pname = "gtkglext";
        version = "0.12.5.0";
-       sha256 = "1xhalcb85cpswdpqxx64fxpmyqq7iakgaczjrbr25fp0h1glshhk";
+       sha256 = "13424d5f80e0ba22f2caf233f5a68a07635f6f77c4f48e6fe3fab28216a30af6";
        libraryHaskellDepends = [ base glib gtk pango ];
        libraryPkgconfigDepends = [ gtkglext ];
        libraryToolDepends = [ gtk2hs-buildtools ];
@@ -59022,7 +59233,7 @@ self: {
      mkDerivation {
        pname = "gtkimageview";
        version = "0.12.0";
-       sha256 = "0sdfb7gmgqh4dkc0a39abx84x7j7zs5z1l62nfzz22wsx1h641j3";
+       sha256 = "43066260e89a0bf1bfb3c2d0f08bfe479e4e505f2a0d05d86c04e257df59ae69";
        libraryHaskellDepends = [
          array base containers glib gtk haskell98 mtl
        ];
@@ -59042,7 +59253,7 @@ self: {
      mkDerivation {
        pname = "gtkrsync";
        version = "1.0.4";
-       sha256 = "0z7mwgmjpbmj2949bfrragyjr6s38vv9sz8zpy63ss9h7b5xn4xw";
+       sha256 = "bc13dbcb3a30693d8cbf1f7d9df646439b2cfd5339bb954812b2ae2bebe3f57c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -59061,7 +59272,7 @@ self: {
      mkDerivation {
        pname = "gtksourceview2";
        version = "0.13.1.3";
-       sha256 = "1ji8sfkjggjxl4yrazm6n8gp74hlh3h28kjc9nfxka062bjmxfhf";
+       sha256 = "0eba5ee51206a8d99d4d4c4e24e0801492731fb2a67e953da15dbe27a7d328ca";
        libraryHaskellDepends = [
          array base containers glib gtk mtl text
        ];
@@ -59079,7 +59290,7 @@ self: {
      mkDerivation {
        pname = "gtksourceview3";
        version = "0.13.2.0";
-       sha256 = "0chn0rl5kkfi7y02h1x0gfkpbm4hfcl6pxrbdpfv20jk4m88a0qj";
+       sha256 = "12038550255302b1dd6d2bf76b287390d475a77ba00728803fd1cd5968061632";
        libraryHaskellDepends = [
          array base containers glib gtk3 mtl text
        ];
@@ -59095,7 +59306,7 @@ self: {
      mkDerivation {
        pname = "guarded-rewriting";
        version = "0.1";
-       sha256 = "04396pd4c4yqpw6ai5ciigva9l3acdz7yn4d5hvyks52khv5fsf9";
+       sha256 = "c96957369ca2e8e9372c8d587f7e636ad0a4f68b9195a80cbfd81346da356910";
        libraryHaskellDepends = [ base instant-generics ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/GuardedRewriting";
        description = "Datatype-generic rewriting with preconditions";
@@ -59107,7 +59318,7 @@ self: {
      mkDerivation {
        pname = "guess-combinator";
        version = "0.1.1";
-       sha256 = "1xaj8zl6cbgks3r0asbnkz1ixq1hlglpjxdymj6ikyjq955sxmzj";
+       sha256 = "f2d7ae4b4958fa198dacbe7579e9a330e01ec39f766905f2d0f32d66e84752f5";
        libraryHaskellDepends = [ base HList ];
        homepage = "http://code.atnnn.com/project/guess";
        description = "Generate simple combinators given their type";
@@ -59120,7 +59331,7 @@ self: {
      mkDerivation {
        pname = "gulcii";
        version = "0.2.0.3";
-       sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29";
+       sha256 = "49d052b38c4684c377d71e28978c0578b196b7b11d861ddec6754307fcdb063d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cairo containers filepath gtk ];
@@ -59135,7 +59346,7 @@ self: {
      mkDerivation {
        pname = "gutenberg-fibonaccis";
        version = "1.1.0";
-       sha256 = "0vvzlfnvh9r9jqf7v83d0piqpvl40sg0mswf9f41vncgzg0z79v2";
+       sha256 = "62a7f3c1fb8fd91d884b8eeb0a9e0684ee8be3056da07d1c962927b8ada37f6f";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/justinhanekom/gutenberg-fibonaccis";
        description = "The first 1001 Fibonacci numbers, retrieved from the Gutenberg Project";
@@ -59147,7 +59358,7 @@ self: {
      mkDerivation {
        pname = "gyah-bin";
        version = "0.2.2.3";
-       sha256 = "19r2vsi5v43a3wq2vbfh2wfscmbzvcbyd1lqc2xdg4bbla9pf648";
+       sha256 = "88187793a26b91d7ba609886e617db7f55a61d17d0ad2d301f6a905da2de22a7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base extra GiveYouAHead ];
@@ -59163,7 +59374,7 @@ self: {
      mkDerivation {
        pname = "h-booru";
        version = "0.3.0.0";
-       sha256 = "0v2mcf35j4dr32j9n6rx10h7mx9d9f14bh70yphj01laxg240746";
+       sha256 = "861c40c4eb8a0620e1f5e0c045824b2df57a20083d1b9ba418b911598663556c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59188,7 +59399,7 @@ self: {
      mkDerivation {
        pname = "h-gpgme";
        version = "0.3.0.0";
-       sha256 = "172awh918zldbivnn8jy24r30mxppgjvn2bz52phjxln02kcpm3x";
+       sha256 = "7dd4cba600967609af287f09bbe5bbb7573032115e226b775c8d7e1412e44a9c";
        libraryHaskellDepends = [
          base bindings-gpgme bytestring either time unix
        ];
@@ -59208,7 +59419,7 @@ self: {
      mkDerivation {
        pname = "h2048";
        version = "0.2.0.1";
-       sha256 = "1s8r476bhvmhpj914n4sjsa1z6dgf26m872rpzhlsyhw1rsxgcfr";
+       sha256 = "d9b1d7750e1c7a4de1bf591c548d70af991f94969a581292bcb06eb8cc2119e9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59231,7 +59442,7 @@ self: {
      mkDerivation {
        pname = "hArduino";
        version = "0.9";
-       sha256 = "03wq0c9aqv3n27zcm74l2df75z3sr7kvyszgs0m2sn2680izl024";
+       sha256 = "4400fa234046582d2ad0ef6bbfe7c97afc725c13949ccafe11766cac1203980f";
        libraryHaskellDepends = [
          base bytestring containers mtl serialport time
        ];
@@ -59245,7 +59456,7 @@ self: {
      mkDerivation {
        pname = "hBDD";
        version = "0.0.3";
-       sha256 = "1jj8hj8wl95fy0n1qixhra4sqlmgddgn080plk7q7iv000qv67gk";
+       sha256 = "f31db3310060c783cfa41720605f6baf52ac89cab0471c2cf0ae24ca918448ca";
        libraryHaskellDepends = [ base ];
        description = "An abstraction layer for BDD libraries";
        license = "LGPL";
@@ -59258,7 +59469,7 @@ self: {
      mkDerivation {
        pname = "hBDD-CMUBDD";
        version = "0.0.3";
-       sha256 = "16pvi496qi3q2rrw08p6lndnsz6d6p65i8m10ldjlh143y8k9ga9";
+       sha256 = "49bd34911f24402a1b05a1a258cc35cd7c6d9ba5e622c0731678446c1289fb9a";
        libraryHaskellDepends = [ base containers deepseq hBDD unix ];
        librarySystemDepends = [ bdd mem ];
        libraryToolDepends = [ c2hs ];
@@ -59274,7 +59485,7 @@ self: {
      mkDerivation {
        pname = "hBDD-CUDD";
        version = "0.0.3";
-       sha256 = "1r94nj23pj134bd5b2mqk01g8xvbcn4ik2xs9yp01v1jg2clhjha";
+       sha256 = "0a4a48997832ec00ae4fba8b1989656b77f40298b88a55da2223c83b84b424e5";
        libraryHaskellDepends = [ base containers deepseq hBDD unix ];
        librarySystemDepends = [ cudd epd mtr st util ];
        libraryToolDepends = [ c2hs ];
@@ -59291,7 +59502,7 @@ self: {
      mkDerivation {
        pname = "hCsound";
        version = "0.4.2";
-       sha256 = "0z4zcf70jplm68k69kigj0kfx78r00y6fx6rjymzpvpbhppmyyd2";
+       sha256 = "a2795fef85ebeefbab97d974673c00199dee26902fce642632955e098e639f7c";
        libraryHaskellDepends = [ base monads-tf transformers vector ];
        librarySystemDepends = [ csound64 libsndfile ];
        libraryToolDepends = [ c2hs ];
@@ -59306,7 +59517,7 @@ self: {
      mkDerivation {
        pname = "hDFA";
        version = "0.0.2";
-       sha256 = "1ays1qy2zsl3h49ryr2y9dymfv1ak1m1d0jvarmqwg3nb49armhm";
+       sha256 = "15d6ac1259763c8e6b565b82166a982a6c577d4b5e649f138183ea2f3c0edaab";
        libraryHaskellDepends = [ base containers directory process ];
        description = "A simple library for representing and minimising DFAs";
        license = stdenv.lib.licenses.bsd3;
@@ -59318,7 +59529,7 @@ self: {
      mkDerivation {
        pname = "hF2";
        version = "0.2";
-       sha256 = "1y0731fsay2dp9m4b94w15m054vqsnnafz4k8jjqjvvrmwyfgicz";
+       sha256 = "9fc5e73caf796f89a544937ca7acd57893026a099ca4456aba4d78a55d1807f8";
        libraryHaskellDepends = [ base cereal vector ];
        description = "F(2^e) math for cryptography";
        license = stdenv.lib.licenses.bsd3;
@@ -59332,7 +59543,7 @@ self: {
      mkDerivation {
        pname = "hGelf";
        version = "0.1";
-       sha256 = "0jkgf0sm8xv204hrzpkplccfq88y5xyrm8y2b5gjfp473872jqxw";
+       sha256 = "bc63290e1a875c275f59c2a39a7d2f1e21ec18a377de9f210162775435706f4a";
        libraryHaskellDepends = [
          aeson base bytestring cereal network old-time pureMD5 QuickCheck
          text time zlib
@@ -59349,7 +59560,7 @@ self: {
      mkDerivation {
        pname = "hLLVM";
        version = "0.5.0.1";
-       sha256 = "0my2071si1x25q482rz48ihj6b9pg1vf6g722jdx8nbgri1x4wzz";
+       sha256 = "ff73d243cc6f59d49b14e23ce37678372d236144e46781082ea287a8c301c257";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59374,7 +59585,7 @@ self: {
      mkDerivation {
        pname = "hMollom";
        version = "0.4.0";
-       sha256 = "1grhkvmcdyi7gmmcqfqi3n78p4gbimzxa4mylj1f0j8iy5iycmg5";
+       sha256 = "e555e663f11149e082a4be12d57f8deb918b8e1d113bcc6a7d27fac6ea9e30bf";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring Crypto dataenc ghc-prim HTTP mtl
          old-locale old-time pureMD5 random time
@@ -59390,23 +59601,23 @@ self: {
      , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
      , conduit, conduit-extra, containers, crypto-cipher-types
      , crypto-pubkey, crypto-random, cryptocipher, cryptohash
-     , data-default-class, errors, hashable, incremental-parser, ixset
-     , lens, monad-loops, nettle, network, network-uri, newtype
-     , old-locale, openpgp-asciiarmor, QuickCheck, quickcheck-instances
-     , resourcet, securemem, semigroups, split, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, transformers, unordered-containers
-     , wl-pprint-extras, zlib
+     , data-default-class, errors, hashable, incremental-parser
+     , ixset-typed, lens, monad-loops, nettle, network, network-uri
+     , newtype, old-locale, openpgp-asciiarmor, QuickCheck
+     , quickcheck-instances, resourcet, securemem, semigroups, split
+     , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
+     , unordered-containers, wl-pprint-extras, zlib
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.1";
-       sha256 = "0jl2rciqgnhjw6q4xgdm2117vrj25l18hzl58fdls7j9bqlvrn5y";
+       version = "2.2";
+       sha256 = "21801a62585fea80bea3ecda11df0a7113923646d3d7856bc48db27b868fe0a0";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bifunctors binary
          binary-conduit byteable bytestring bzlib conduit conduit-extra
          containers crypto-cipher-types crypto-pubkey crypto-random
          cryptocipher cryptohash data-default-class errors hashable
-         incremental-parser ixset lens monad-loops nettle network
+         incremental-parser ixset-typed lens monad-loops nettle network
          network-uri newtype old-locale openpgp-asciiarmor resourcet
          securemem semigroups split text time transformers
          unordered-containers wl-pprint-extras zlib
@@ -59416,7 +59627,7 @@ self: {
          bytestring bzlib conduit conduit-extra containers
          crypto-cipher-types crypto-pubkey crypto-random cryptocipher
          cryptohash data-default-class errors hashable incremental-parser
-         ixset lens monad-loops nettle network network-uri newtype
+         ixset-typed lens monad-loops nettle network network-uri newtype
          old-locale QuickCheck quickcheck-instances resourcet securemem
          semigroups split tasty tasty-hunit tasty-quickcheck text time
          transformers unordered-containers wl-pprint-extras zlib
@@ -59435,7 +59646,7 @@ self: {
      mkDerivation {
        pname = "hPDB";
        version = "1.2.0.4";
-       sha256 = "0fzr6y19x7c47y3jl68zcrjnlc8j3b0xnvvrpmqm15qznlrdh41s";
+       sha256 = "3a10d832b51f975071bd796fdbc11a12316a65661f192a873f849d9e8237f93b";
        libraryHaskellDepends = [
          AC-Vector base bytestring containers deepseq directory ghc-prim
          iterable mmap mtl Octree parallel QuickCheck tagged
@@ -59455,7 +59666,7 @@ self: {
      mkDerivation {
        pname = "hPDB-examples";
        version = "1.2.0.2";
-       sha256 = "1s1m09y3x8lpsdxs6ch77y1qipfy35swqwaj242aa0v5p8xs58wa";
+       sha256 = "8aa3a23bba6503a504115271cc7519dedd88833f0732a37bd397a23e7c0235e8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -59480,7 +59691,7 @@ self: {
      mkDerivation {
        pname = "hPushover";
        version = "0.2";
-       sha256 = "14k3sdy2c0anfsw0hdir0l107ixlsnr90miwxrxdsckh40kz3ad3";
+       sha256 = "a3a9f127207032dd7aee3c5690b2d5b4c7030205393608b8765601267cd36392";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit network text
        ];
@@ -59495,7 +59706,7 @@ self: {
      mkDerivation {
        pname = "hR";
        version = "0.1.1";
-       sha256 = "1kc03mgsxijszdvxw4qwq4fnd0ln61v08rk9y1k6kx9vyqc7bilc";
+       sha256 = "8cc67518f63bf56966f069660476309682661dc11c13de77fb5ac6ae5f1d80cd";
        libraryHaskellDepends = [ array base containers unix ];
        description = "R bindings and interface";
        license = stdenv.lib.licenses.bsd3;
@@ -59507,7 +59718,7 @@ self: {
      mkDerivation {
        pname = "hRESP";
        version = "0.1.0.0";
-       sha256 = "188rs1g2yacka8c4wbqkhwjrin95f3ribm8007lqsxiapaj1d89y";
+       sha256 = "3ea116a4ba2a768de90100d515f37025d9982587132f4e185293292f5ed019a1";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        homepage = "https://github.com/yihuang/hresp";
        description = "haskell implementation of RESP (REdis Serialization Protocol)";
@@ -59522,7 +59733,7 @@ self: {
      mkDerivation {
        pname = "hS3";
        version = "0.5.9";
-       sha256 = "0nf71jb15gkkcrb0x83mmql6j55c6dnz3bl3yq1grphwn0jbmq3y";
+       sha256 = "7ee0ba24b01cdefc02f683aef16d33ac146928ae75a00e566673be12960cc759";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59541,7 +59752,7 @@ self: {
      mkDerivation {
        pname = "hSimpleDB";
        version = "0.3";
-       sha256 = "045mgg2b7wmkcziil8njb2wsy8pgzqcc46dwdrabxgbw1nzsfkaa";
+       sha256 = "4a4da7bf0d7cbdbe546ebc19c218feef22afb958d2221ae367b3f2b3c47bb510";
        libraryHaskellDepends = [
          base bytestring Crypto dataenc HTTP hxt network old-locale old-time
          utf8-string
@@ -59557,7 +59768,7 @@ self: {
      mkDerivation {
        pname = "hTalos";
        version = "0.2";
-       sha256 = "05l9nlrwpb9gwgj8z48paxx46lkasa82naiq7armi98salk1a9ip";
+       sha256 = "37261526551aa558b33a382a2b90d26a52437a5717918fe4e32fadcb33b58916";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base ];
        jailbreak = true;
@@ -59572,7 +59783,7 @@ self: {
      mkDerivation {
        pname = "hTensor";
        version = "0.8.2";
-       sha256 = "1nwzh68v2b11lph64432bjdrpxrr62cv4hdh935wml13mac3l2ly";
+       sha256 = "9e0a3a98aa23d0cacb48b041b2993039f79b9b5c621062e0a5212cb191819fdb";
        libraryHaskellDepends = [ base containers hmatrix random ];
        homepage = "http://perception.inf.um.es/tensor";
        description = "Multidimensional arrays and simple tensor computations";
@@ -59585,7 +59796,7 @@ self: {
      mkDerivation {
        pname = "hVOIDP";
        version = "1.0.2";
-       sha256 = "0r9a461k1rr0j9zgjfq1z37i6blv9rqf8pzb984h1nmlfqpnidnc";
+       sha256 = "ccb6682f76b4da00094aeb5fe4704e9b2e13cff8013bf97e9220e73083212a65";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ array base hmatrix ];
@@ -59601,7 +59812,7 @@ self: {
      mkDerivation {
        pname = "hXmixer";
        version = "0.3.0.0";
-       sha256 = "1n9wlg6inzvnyqkx61bpbgx744q25zpjhkihwbqv6569lgir1h4x";
+       sha256 = "9dc090e3a3c914b3f1e2304e28ef2f021372fa5b7705d327f6767f1bcda33cd9";
        revision = "2";
        editedCabalFile = "ba9345a3146b34d0101920f9efd6af7f435188dd7ae53b50d76cc0851f13014f";
        isLibrary = false;
@@ -59620,7 +59831,7 @@ self: {
      mkDerivation {
        pname = "haar";
        version = "0.1";
-       sha256 = "1xmz659lqr25c0xxkmly5w4fxgk9rqnms2sknd5ab8czqdgq6n1v";
+       sha256 = "3b58835fc39fa1a54ab3530b5d2dce69beee082f9ed6d93b6045644c5331bff6";
        libraryHaskellDepends = [ base split ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -59637,7 +59848,7 @@ self: {
      mkDerivation {
        pname = "hacanon-light";
        version = "2008.10.28";
-       sha256 = "0m0wfg74kmpz6ydldz5h9z5xd54957v1rprl9wal9sjr0pzl28a7";
+       sha256 = "472141ff0559ea44154f34df1cf6298994d6cb4fb0fc469b37ffd649ce731c54";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Template Haskell framework for automatic FFI code generation";
        license = stdenv.lib.licenses.bsd3;
@@ -59648,7 +59859,7 @@ self: {
      mkDerivation {
        pname = "hack";
        version = "2012.2.6";
-       sha256 = "0wrfa9fa6skl985fi2a6iv4m8kchg87w9x3k37nf3l8vaz95jmdr";
+       sha256 = "b95559d2571bd1e1ec1973f4c40f7a904d54c98e4689e80a4a746aa35c522e73";
        libraryHaskellDepends = [ base bytestring data-default ];
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "a Haskell Webserver Interface";
@@ -59663,7 +59874,7 @@ self: {
      mkDerivation {
        pname = "hack-contrib";
        version = "2010.9.28";
-       sha256 = "1r0g8fcwz6r4vrsadjyb5awjmfbqsskmc1c8xkfwv0knak1qq2p1";
+       sha256 = "e10a8cc3547682cdddec880556a7d678b92ab92acbcba674de249bcf99430fe4";
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring cgi containers data-default
          directory filepath hack haskell98 mps network old-locale old-time
@@ -59682,7 +59893,7 @@ self: {
      mkDerivation {
        pname = "hack-contrib-press";
        version = "0.1.2";
-       sha256 = "12v7xw448cxl93bnbzqkinlij74flffpif0x5jd51sndvpgsh12r";
+       sha256 = "5904a8dfddcdea509a2c1db8789da38e1c19a98d13ff65d748b4334408ef678b";
        libraryHaskellDepends = [
          base bytestring bytestring-class containers hack json mtl parsec
          press
@@ -59700,7 +59911,7 @@ self: {
      mkDerivation {
        pname = "hack-frontend-happstack";
        version = "2009.6.24.1";
-       sha256 = "1x4kaj4nk5lrgsm6pfxr6f8rvjyxhy0agqv9f810xh6s1r9pihw1";
+       sha256 = "81c378530edac00e027269e3a78087ddcb9d9133b9bb6baa7e999669895493f4";
        libraryHaskellDepends = [
          base bytestring containers hack happstack-server network
          utf8-string
@@ -59716,7 +59927,7 @@ self: {
      mkDerivation {
        pname = "hack-frontend-monadcgi";
        version = "0.0.3.1";
-       sha256 = "0m0af44jv03djn5i2lgrnnvvcdqx44qppfx76m1bwr7gv1vzm432";
+       sha256 = "6290fa77d8ef64be4235a7bb7b31211d37b6b7b5f951118b956d802d09710a54";
        libraryHaskellDepends = [ base bytestring cgi containers hack ];
        description = "Allows programs written against MonadCGI to run with any hack handler. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -59727,7 +59938,7 @@ self: {
      mkDerivation {
        pname = "hack-handler-cgi";
        version = "0.2.0.2";
-       sha256 = "0pm8vs94dbaahqrdwfffwa1jb9ghyjnq48sirlw1dj2gcsa3np2x";
+       sha256 = "5d5c3b94664fc81638cd512382adf4f0a52583e2ce39de32864aad4692dea85e";
        libraryHaskellDepends = [ base bytestring hack ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/hack-handler-cgi/tree/master";
@@ -59742,7 +59953,7 @@ self: {
      mkDerivation {
        pname = "hack-handler-epoll";
        version = "0.1.3";
-       sha256 = "0q4cw789x8c93y53lwhr7g0hkli8x6qb9k0cg5pxln6cxxvi9p82";
+       sha256 = "02dd1477efcc58da6f790cccb4b0e928d209c13b19723a8a1f89a19ed0e18c60";
        libraryHaskellDepends = [
          base containers data-default epoll failure hack HTTP network unix
          utf8-string
@@ -59760,7 +59971,7 @@ self: {
      mkDerivation {
        pname = "hack-handler-evhttp";
        version = "2009.8.4";
-       sha256 = "1a09ls9jgakdx8ya6zd5z3ss2snb4pp0db1573hzmrhr37i2gklz";
+       sha256 = "9fce27e21919e6fae13825ac06ee25cb6aa1f5f8a57da33cea6daa2793a609a8";
        libraryHaskellDepends = [
          base bytestring bytestring-class containers data-default hack
          hack-contrib network
@@ -59777,7 +59988,7 @@ self: {
      mkDerivation {
        pname = "hack-handler-fastcgi";
        version = "0.2.0.1";
-       sha256 = "02slh33r9qy8q0vpi4s4vvf5lmb14ypk8bixdicvxakahjvxhanr";
+       sha256 = "d92ad8b7846aaabe596c3d2e34af2761555adcde44937837c0c8e394c780540b";
        libraryHaskellDepends = [ base bytestring hack hack-handler-cgi ];
        librarySystemDepends = [ fcgi ];
        jailbreak = true;
@@ -59794,7 +60005,7 @@ self: {
      mkDerivation {
        pname = "hack-handler-happstack";
        version = "2009.12.20";
-       sha256 = "10b3cp1gap59ialfl33dwhzw50nwrqg49zvv0v813q7rqk3nkhg4";
+       sha256 = "e4c169c7c4f9e011d0067bff441ecedc82c23fe46d0ceaa88aa95cf5c2656381";
        libraryHaskellDepends = [
          base bytestring cgi containers data-default hack happstack-server
          mtl network
@@ -59812,7 +60023,7 @@ self: {
      mkDerivation {
        pname = "hack-handler-hyena";
        version = "2010.3.15";
-       sha256 = "1p0zyki1iapz2xncq0l5bbas44pk5kb29kbb3bdxb4anb0m5jb2q";
+       sha256 = "582c592a585691d5db1a6bcd24d62cf312a2d55a8502cc6c17ffaa18e2f41fdc";
        libraryHaskellDepends = [
          base bytestring containers data-default hack hyena network
        ];
@@ -59827,7 +60038,7 @@ self: {
      mkDerivation {
        pname = "hack-handler-kibro";
        version = "2009.5.27";
-       sha256 = "0py30rp7r4hrazrfq3avpqcp1w8405pyfw1yxz7msb58yjppa792";
+       sha256 = "221d75aff4a82c5dcfef3e70e76f0104f17019be5b0decf25719927c6e06c35f";
        libraryHaskellDepends = [
          base cgi data-default hack kibro network
        ];
@@ -59844,7 +60055,7 @@ self: {
      mkDerivation {
        pname = "hack-handler-simpleserver";
        version = "0.2.2";
-       sha256 = "1p7igprgxkzkqhsy5n2qci75dbx2qxs1dcq8krghwj3isl6wds3y";
+       sha256 = "7ee8c60dd571480e5f9e08b31674c7a2af564e6458d8e235c4f3cffef27df1dc";
        libraryHaskellDepends = [
          base bytestring failure hack network web-encodings
        ];
@@ -59860,7 +60071,7 @@ self: {
      mkDerivation {
        pname = "hack-middleware-cleanpath";
        version = "0.0.1.1";
-       sha256 = "0107ajkiwkn33h56dz576y4dxl0sr2lkkcmjy6f9s2nzqp9ibin4";
+       sha256 = "c4c615d3c5df0a9d9cf1b2b239a9c81ad0de8837a7fc660a1cc34e1ea7540704";
        libraryHaskellDepends = [
          base bytestring hack split web-encodings
        ];
@@ -59877,7 +60088,7 @@ self: {
      mkDerivation {
        pname = "hack-middleware-clientsession";
        version = "0.0.1.1";
-       sha256 = "0h4l2lvshf9cqg43az9alq4rybhr4k07mhrila4fx7yjxslw871f";
+       sha256 = "2e1cc4a9eed29fee88a231c37ac024192e9f09a62a7d35c8c32c39a837159440";
        libraryHaskellDepends = [
          base clientsession hack old-locale predicates time web-encodings
        ];
@@ -59892,7 +60103,7 @@ self: {
      mkDerivation {
        pname = "hack-middleware-gzip";
        version = "0.0.0.1";
-       sha256 = "1x7526939h7g44yyscyk324gdb40cryyiffh13iinf8aw1rach70";
+       sha256 = "e040a672e00a391be308d0b9e87d6680acf68818d333ed3d21efc0349211e5f4";
        libraryHaskellDepends = [ base hack split zlib ];
        homepage = "http://github.com/snoyberg/hack-middleware-gzip/tree/master";
        description = "Automatic gzip compression of responses. (deprecated)";
@@ -59906,7 +60117,7 @@ self: {
      mkDerivation {
        pname = "hack-middleware-jsonp";
        version = "0.0.2.1";
-       sha256 = "0g7l441s0065f5dw2rj82m547nnc1i7cclx81kvgbpbi8q6hz0iw";
+       sha256 = "3c820f0d4671ddf5f60ca853c64e0cccda434a154866c15b71c500a00321f43c";
        libraryHaskellDepends = [
          base bytestring bytestring-class hack web-encodings
        ];
@@ -59921,7 +60132,7 @@ self: {
      mkDerivation {
        pname = "hack2";
        version = "2014.11.17";
-       sha256 = "1b6jzdisv58scyzb9pxhqrnz74sy0j96jkbbnf84wccwbwn4rf28";
+       sha256 = "48b84c2c5f9c314e90b36b4d6992045e93f36dc6b0dfb4be671a95ad63fbd2ac";
        libraryHaskellDepends = [ base bytestring data-default ];
        homepage = "https://github.com/nfjinjing/hack2";
        description = "a Haskell Webserver Interface (V2)";
@@ -59935,7 +60146,7 @@ self: {
      mkDerivation {
        pname = "hack2-contrib";
        version = "2015.5.4";
-       sha256 = "1vbdnbab5f090fp5zgviwbc2w33y7calgbh67fgxcaflhg0514vk";
+       sha256 = "739350c083d429d69f3b06ae47153b7e0c2ed8e271bf5fae0309b8b2d4b26ded";
        libraryHaskellDepends = [
          air base bytestring containers data-default directory filepath
          hack2 network-uri text time
@@ -59953,7 +60164,7 @@ self: {
      mkDerivation {
        pname = "hack2-contrib-extra";
        version = "2014.12.20";
-       sha256 = "1mxgvlr593cw523mknr5bcwf55544q04cz0nlpzgm5bg3336b5wl";
+       sha256 = "949765c6186f95fafea5167c460026a494e2385b25db5987289c8d5432ddafd7";
        libraryHaskellDepends = [
          air air-extra base bytestring cgi containers data-default directory
          filepath hack2 hack2-contrib network old-locale old-time time
@@ -59970,7 +60181,7 @@ self: {
      mkDerivation {
        pname = "hack2-handler-happstack-server";
        version = "2011.6.20";
-       sha256 = "115nrzf0626pc716n01qjhxs44c1awdd4q1c8kbax025cwac7kpx";
+       sha256 = "fdcec314674580aed6442c60d21a578111a23b9438006bc261d70803dccfb684";
        libraryHaskellDepends = [
          base bytestring cgi containers data-default enumerator hack2
          happstack-server mtl network
@@ -59991,7 +60202,7 @@ self: {
      mkDerivation {
        pname = "hack2-handler-mongrel2-http";
        version = "2011.10.31";
-       sha256 = "1pymar803n696yx3dwqpfwqlkg93ncff162p26mrs7iqn14v851w";
+       sha256 = "3c14b449b0381e9dab115798e01cb323bd49317717f336ba37c9d8015056d5df";
        libraryHaskellDepends = [
          aeson air attoparsec base blaze-builder blaze-textual bytestring
          containers data-default directory enumerator hack2 mtl network safe
@@ -60011,7 +60222,7 @@ self: {
      mkDerivation {
        pname = "hack2-handler-snap-server";
        version = "2015.3.9";
-       sha256 = "1qs5mncl44p410ni8hbpgvmv81158z62mcg66fmnnlrkwdr1bbh7";
+       sha256 = "07ae1572e333536bab33e6b12acc472504b4eb7e7741142d08e4124299ad45e3";
        libraryHaskellDepends = [
          air base blaze-builder bytestring case-insensitive containers
          data-default directory enumerator hack2 mtl network snap-core
@@ -60029,7 +60240,7 @@ self: {
      mkDerivation {
        pname = "hack2-handler-warp";
        version = "2012.5.25";
-       sha256 = "1p0lkhf95xkllfpcb9yibpa1rkam90bccmzj2aa60shd7v9qx9r5";
+       sha256 = "25a78ed33e0d6a609412f257c6164855cd1cd45dd1a7c5aea374f6921c9c14dc";
        libraryHaskellDepends = [
          air base data-default hack2 hack2-interface-wai warp
        ];
@@ -60047,7 +60258,7 @@ self: {
      mkDerivation {
        pname = "hack2-interface-wai";
        version = "2012.5.25";
-       sha256 = "18yyvb38axz18ac2q9z31qmqjd3d9yrzsgiv11wbf8ccdp2irm5w";
+       sha256 = "bcd41cc56d8c21b778083b3efdb34f6d34892b0ee3272c9842e17785c6dadea3";
        libraryHaskellDepends = [
          air base bytestring case-insensitive containers data-default hack2
          http-types mtl network safe wai
@@ -60065,7 +60276,7 @@ self: {
      mkDerivation {
        pname = "hackage-db";
        version = "1.22";
-       sha256 = "0rhh7w4929zkwzv10ika952yiw4dkffqd8f79f1bl76lz1la6cjd";
+       sha256 = "4d32a368f8d41cba824bc7a1869d9b8df0e845496a4610f6e7f32791083f1066";
        revision = "1";
        editedCabalFile = "b5277a8cbbfcfba81f29db4910003c2fa7e34c06bceb4f3e7318510e1ce74376";
        libraryHaskellDepends = [
@@ -60084,7 +60295,7 @@ self: {
      mkDerivation {
        pname = "hackage-diff";
        version = "0.1.0.0";
-       sha256 = "0kdc7ah1mn6xcaan56li9k7ccrcsjz3ysi04fp334l57kd3i105z";
+       sha256 = "bf8010479ba75032c6750444edc7979a65c6ce4c919a629562ddd81aa03aac4d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60109,7 +60320,7 @@ self: {
      mkDerivation {
        pname = "hackage-mirror";
        version = "0.1.0.0";
-       sha256 = "1iaaxdn4lsfrjksax8c9pawrjwj4sb6irqd4sfkdm3k9l2f8nqvg";
+       sha256 = "6f638b9ca0698edaa6d3a4e11ccdd2447299b9ba89a1aef494d9694a6ceb4ac5";
        revision = "1";
        editedCabalFile = "848ea26073e706a9303ec1baf811a74b65859ae649731a3b799b4fb8c558c1bc";
        isLibrary = true;
@@ -60137,7 +60348,7 @@ self: {
      mkDerivation {
        pname = "hackage-plot";
        version = "0.2.1";
-       sha256 = "11vlnmadnjz1q4iw4ay8gh1yclba7550mnxwakdryakws5v75am1";
+       sha256 = "a1aa7276d17c2a9fdb54bcdb0a4a396a51e6037cc82bc223c1e14bdb54b57487";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60159,7 +60370,7 @@ self: {
      mkDerivation {
        pname = "hackage-proxy";
        version = "0.3.0.1";
-       sha256 = "1vicmj070nb76zcxfmkj4sv0rxrrl13r31psnsgb8azbmvs1s0yp";
+       sha256 = "d7031df4aeeb2bb49eb6fa869147a039f70cb6267256d7d93767597080ac2cee";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60188,7 +60399,7 @@ self: {
      mkDerivation {
        pname = "hackage-server";
        version = "0.5.0";
-       sha256 = "1xsy2clsg53rhxgkb9vlan7dw7xqphm8gr1ajl8kq5ymfahnyd1i";
+       sha256 = "31346fa172d5173c11952ae4872abcb81fde8e5574a7355f877994a729135ef7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60220,7 +60431,7 @@ self: {
      mkDerivation {
        pname = "hackage-sparks";
        version = "0.5.1";
-       sha256 = "0b43vd1b18ksivxr7cfymzwcgs8rhwib2prn86wmwhghyx8a4qnw";
+       sha256 = "dc62a250f7f0415eb941365fb1228719e9c7f8afdeb193fb8e7aa2b042db832c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60238,7 +60449,7 @@ self: {
      mkDerivation {
        pname = "hackage2hwn";
        version = "0.5.1";
-       sha256 = "0vbp7c1g7dx119xxsn0f0fhk14l35jxmg7zdaqr1vcjhprj3nh6q";
+       sha256 = "d8403b64be50b21d3256ed9f57bb2c839230a1030e58dd7b0aa1b7f3023b776d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base download feed tagsoup ];
@@ -60253,7 +60464,7 @@ self: {
      mkDerivation {
        pname = "hackage2twitter";
        version = "0.2.1";
-       sha256 = "131hl59imxhql3hfp8m9363fgsgdywz1p8idrybncipyblwpsjgq";
+       sha256 = "f8497d395dfe466697cf2da21b3ef7ede9e78619a9a2ebe0a018f61a53a1308c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base feed feed2twitter ];
@@ -60270,7 +60481,7 @@ self: {
      mkDerivation {
        pname = "hackager";
        version = "1.2.0.1";
-       sha256 = "06lrsfs70zjhxqsz93wmhrmyq1v64kiq0580f9im9nw69w4yl4ax";
+       sha256 = "5d11ea094f86db546372001580e3246607ec6b86958ff435ee507e70b4d3991a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60289,7 +60500,7 @@ self: {
      mkDerivation {
        pname = "hackernews";
        version = "0.5.0.0";
-       sha256 = "1yj8wip52dagmdpziyyjs9hp7k1gdvwl6ynk5hr8c8wxapcj28bs";
+       sha256 = "7a2121d9559d2386322cd37a43f96e2fcc7361d2d2fbf86fab4f35516ee448fa";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring either HsOpenSSL http-streams
          io-streams text time transformers
@@ -60305,7 +60516,7 @@ self: {
      mkDerivation {
        pname = "hackertyper";
        version = "0.1.0.1";
-       sha256 = "17c77f687874bfwahmzcz2v6k8z9p4fv555r5r1f38snsdi825gf";
+       sha256 = "ee158162d356a3e1422eb994b21db9e9a369b6f8ec57a8b85be4a0838c3b879d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -60323,7 +60534,7 @@ self: {
      mkDerivation {
        pname = "hackport";
        version = "0.4.5";
-       sha256 = "18sv8kwhg0frsn6phg47hsm5vv84yaxxvk47sazgrb5hjl3qiam7";
+       sha256 = "a7aa880795b0acfcbed287ccddbbf204ed5daa86873c788dd5d98107f9445ba3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60348,7 +60559,7 @@ self: {
      mkDerivation {
        pname = "hactor";
        version = "1.2.0.0";
-       sha256 = "0jgnifwgfxapi8l0ds56xr7h66jprn1ynpwmvhafbyk84ymznf8y";
+       sha256 = "1e39fbab2768fae514dc955feb83cd571a034feea6e806288a5775f7b88bf649";
        libraryHaskellDepends = [
          base containers monad-control mtl resourcet stm stm-chans
          transformers-base
@@ -60365,7 +60576,7 @@ self: {
      mkDerivation {
        pname = "hactors";
        version = "0.0.3.1";
-       sha256 = "0nxcl3v9gnnyjzdpk30m2pmrhwcva9rky2dxrj4nnkr67ajm2dj0";
+       sha256 = "403651a53a264f6b89ccbd093f73529b7198eb15158c79db97deda97f6a0ac5b";
        libraryHaskellDepends = [ base stm ];
        jailbreak = true;
        homepage = "https://github.com/treep/hactors";
@@ -60380,7 +60591,7 @@ self: {
      mkDerivation {
        pname = "haddock";
        version = "2.16.1";
-       sha256 = "1mnnvc5jqp6n6rj7xw8wdm0z2xp9fndkz11c8p3vbljsrcqd3v26";
+       sha256 = "46ecd130cb5ad2b5c7452c843f9b75e976f1416d1cf17e6436d65c2c0bdbd6d6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haddock-api ];
@@ -60399,7 +60610,7 @@ self: {
      mkDerivation {
        pname = "haddock-api";
        version = "2.15.0.2";
-       sha256 = "1gdmwid3qg86ql0828bp8g121psvmz11s0xivrzhiv8knxbqj8l7";
+       sha256 = "87228957b713ed087fdeb1031dc2af5bdf20c24377218100c5063d3c5ae4b5bd";
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
@@ -60418,7 +60629,7 @@ self: {
      mkDerivation {
        pname = "haddock-api";
        version = "2.16.1";
-       sha256 = "1spd5axg1pdjv4dkdb5gcwjsc8gg37qi4mr2k2db6ayywdkis1p2";
+       sha256 = "e2061d67e3de2bb39a98225712f119ef21a62567afac361bd9b2ddf0ba2aedea";
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
@@ -60435,7 +60646,7 @@ self: {
      mkDerivation {
        pname = "haddock-leksah";
        version = "2.6.0";
-       sha256 = "1a56nihkxybldk55g69v2aw6r4ipa9x86i0jr19fd23zxvancs8h";
+       sha256 = "106966d5ee7f88e652c81244837a5237926cb8123b9957ca6c74f93e61b4a6a8";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60455,7 +60666,7 @@ self: {
      mkDerivation {
        pname = "haddock-library";
        version = "1.2.1";
-       sha256 = "0mhh2ppfhrvvi9485ipwbkv2fbgj35jvz3la02y3jlvg5ffs1c8g";
+       sha256 = "0fb1a09d2b6f5339bc008a8ebf6519f22d27f65cfcc682488a7b67e8ee151056";
        libraryHaskellDepends = [ base bytestring deepseq transformers ];
        testHaskellDepends = [
          base base-compat bytestring deepseq hspec QuickCheck transformers
@@ -60474,7 +60685,7 @@ self: {
      mkDerivation {
        pname = "haddocset";
        version = "0.3.2";
-       sha256 = "0ppbvmmiz07p8kyblkplzkki3kc4z8hlmxc9h18fj0xwr6dpfib7";
+       sha256 = "6745779bc9bc03e9508089f54a21fa84cd11e7fcf44ebafc44f7801f6bddeb5e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60496,7 +60707,7 @@ self: {
      mkDerivation {
        pname = "hadoop-formats";
        version = "0.2.1.1";
-       sha256 = "1w3869jz3mxhzdik5fwaha7dn9rhjg5w8g0qnznd4x45cnzxv5ga";
+       sha256 = "ea95ddbf658574d2ecb7183cc4cb933027db8e828abb3263fbb0d7f1653268f0";
        revision = "1";
        editedCabalFile = "59248cb9b3f28b9f003d694ee356a13ff1313c8edd3bf2963c154ce7e1de0553";
        libraryHaskellDepends = [ attoparsec base bytestring text vector ];
@@ -60516,7 +60727,7 @@ self: {
      mkDerivation {
        pname = "hadoop-rpc";
        version = "1.0.0.1";
-       sha256 = "1nm1xgb1ks57sbqg8x8aasr5l8lgdf4inr4ndgnnlsdjah6nbli1";
+       sha256 = "21d2650d54b2696aed6b96641b896b8f225ab2560a75f4f0d2a7e819d6eba1da";
        libraryHaskellDepends = [
          attoparsec base bytestring cereal exceptions hashable monad-loops
          network protobuf random socks stm text transformers unix
@@ -60538,7 +60749,7 @@ self: {
      mkDerivation {
        pname = "hadoop-tools";
        version = "0.7.2";
-       sha256 = "0grwi26xardg8fxvz7g10v9111bgph77s3pdrr58r9hqgm8lhx5v";
+       sha256 = "bb7448517d18a68c4aceed0e7d0ebc6f8510d206e19dbfbb43af65d58d883c3f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60562,7 +60773,7 @@ self: {
      mkDerivation {
        pname = "haeredes";
        version = "0.4.3";
-       sha256 = "0m6d75kgf40m3vnh148v2ysfhplspqbbqs8jha29ascap8xz7n47";
+       sha256 = "87d8f33bba8a699584821269bc16be9a5ee8b4171b9100ed1e1510f76639cd54";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60584,7 +60795,7 @@ self: {
      mkDerivation {
        pname = "haggis";
        version = "0.1.2.1";
-       sha256 = "09mqs4y26w7f4729gvrpv9mh431xpdngas14ad86bbjf2ncvggjg";
+       sha256 = "4fbeb799154eae6550532468f56cbb3d0c026bda37ef97c421ee70233cd1b826";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60607,7 +60818,7 @@ self: {
      mkDerivation {
        pname = "haha";
        version = "0.3.1.1";
-       sha256 = "1vfsy6ks9rnynwvavakj90662vxgvk7y0vwpdga2k2fc8nkqjf10";
+       sha256 = "203889a745cc8929d46b976fe0cfdcaf6f610c4872aaad36b7dee6a4a7f1daed";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers time ];
@@ -60624,7 +60835,7 @@ self: {
      mkDerivation {
        pname = "hailgun";
        version = "0.4.0.3";
-       sha256 = "1c4fd116xhkw0hknzfyxyw7v62wjixcdbdidx804rs8g8f3c5p1c";
+       sha256 = "2cdcc286430fe94c00ea2db6d5588f920bb30ff7ddbb6f27047cc26e42688eb0";
        libraryHaskellDepends = [
          aeson base bytestring email-validate exceptions filepath
          http-client http-client-tls http-types tagsoup text time
@@ -60640,7 +60851,7 @@ self: {
      mkDerivation {
        pname = "hailgun-send";
        version = "0.1.1.1";
-       sha256 = "1cxvzg5bfwsdly9k24izwnk5gf9vvzisaj3m6ng647bm1fc598c6";
+       sha256 = "86a154980b751d629e357548a5e3df3bb957a6e53f123193a74d73b7cafbbbb3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60665,7 +60876,7 @@ self: {
      mkDerivation {
        pname = "hails";
        version = "0.11.2.1";
-       sha256 = "1s447iqgpxsx78zd873izyqhdq34dz1ikjcfw8m9r0rv5nkxkf7c";
+       sha256 = "ecb8d9a72d3b839c2ae28ec919c36f64e006b1ff711cd43e3a5df7fb703c84e8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60701,7 +60912,7 @@ self: {
      mkDerivation {
        pname = "hails-bin";
        version = "0.1.1.1";
-       sha256 = "006qy5mkhh8zqy9mrpwjiym7klqma49zglwpjmx2ikmkkq9qnfvr";
+       sha256 = "793b8b139eb3ce287a9597d3f7135115d379aa8f92df5c93c71f41386bf1d800";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60722,7 +60933,7 @@ self: {
      mkDerivation {
        pname = "hairy";
        version = "0.1.3";
-       sha256 = "19kgygj9d3m56xcfc1zm0ki2ncgifrrsrf90bvp9bykyixycplap";
+       sha256 = "57d1cb7c8f7efa95ee5e20b9ac7376f1312be204f507e65837a58e96e4f36fa6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60752,7 +60963,7 @@ self: {
      mkDerivation {
        pname = "hakaru";
        version = "0.1.4";
-       sha256 = "033m28jckpqgc4izmyf4h60riy29mcvfhyw340z604miqg7ss2hf";
+       sha256 = "0e0aadcfc3b112603e20837be836ab49f8988181c4f9fa23610fdfc92412750c";
        libraryHaskellDepends = [
          aeson array base bytestring cassava containers directory hmatrix
          integration logfloat math-functions monad-loops mwc-random parallel
@@ -60779,7 +60990,7 @@ self: {
      mkDerivation {
        pname = "hake";
        version = "1.3.8.1";
-       sha256 = "0h0y466b664xyxi1hr8c7il4cslrmb1hyhsjzhvs55l33zb7591b";
+       sha256 = "2ba472d61f8396a237fc52430fc3aa996a46683c0c651862f79d18b38c211e40";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base filepath mtl time ];
@@ -60794,7 +61005,7 @@ self: {
      mkDerivation {
        pname = "hakismet";
        version = "0.1";
-       sha256 = "1ddmnzan16vn0fbp1fgsidahayihhr0vw8saypdqq7lnhqw8j9d4";
+       sha256 = "a425893886961e8cdbf54a23be4186307a05558bfab9709703769b60d5b7b5b5";
        libraryHaskellDepends = [ base HTTP network ];
        jailbreak = true;
        homepage = "https://code.reaktor42.de/projects/hakismet";
@@ -60810,7 +61021,7 @@ self: {
      mkDerivation {
        pname = "hako";
        version = "1.0.0";
-       sha256 = "1gcw15522yh0aa7xa793gda45qmq8my15id4ybivv3n16pcr7prm";
+       sha256 = "35df93d935c18ebde3f2a4c5127c45b8e242547b231dd58f52007a214a099cbd";
        libraryHaskellDepends = [
          base haskell-src-meta parsec template-haskell text transformers
        ];
@@ -60832,8 +61043,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.7.2.2";
-       sha256 = "1gy7j15qqh8m0wf8xkpb1hglahylwyy7vq6c4bm9arap3viak29c";
+       version = "4.7.2.3";
+       sha256 = "66b98d930b1312108bb690200985a273fcec2a39ff7b807f246b82c2609c28b1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60852,7 +61063,7 @@ self: {
          pandoc pandoc-citeproc parsec process QuickCheck random regex-base
          regex-tdfa snap-core snap-server system-filepath tagsoup
          test-framework test-framework-hunit test-framework-quickcheck2 text
-         time
+         time time-locale-compat
        ];
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
@@ -60865,7 +61076,7 @@ self: {
      mkDerivation {
        pname = "hakyll-R";
        version = "0.1.0.3";
-       sha256 = "0sr0mpyhjr7ajg227rfylhv2950vip6zkryalxp39m1xv0dh2rb3";
+       sha256 = "6365011bd83dd4346ea7cae7f9cd8d1b942436a4dee523c493ea6409fdad206b";
        libraryHaskellDepends = [
          base directory filepath hakyll pandoc process
        ];
@@ -60882,7 +61093,7 @@ self: {
      mkDerivation {
        pname = "hakyll-agda";
        version = "0.1.10";
-       sha256 = "1621l7pw2rcyalp17dcjp1bk650rs8w1i3swnwrzr9wwi6nrx7qb";
+       sha256 = "0b9f9ead899ca7fc33b75c8f1838d219143357b892b5132e559e65c1efa14198";
        libraryHaskellDepends = [
          Agda base containers directory filepath hakyll mtl pandoc
          transformers xhtml
@@ -60898,7 +61109,7 @@ self: {
      mkDerivation {
        pname = "hakyll-blaze-templates";
        version = "0.1.1.0";
-       sha256 = "11dl3rqls2yxkmycx63xr1cix4adk6b29sbwr4v5n48bqamr7p1j";
+       sha256 = "32dc93abc20b115b36c97ce92496994d911e59c87d98ce7c9ddd0b4d711eb485";
        libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ];
        jailbreak = true;
        description = "Blaze templates for Hakyll";
@@ -60911,7 +61122,7 @@ self: {
      mkDerivation {
        pname = "hakyll-contrib";
        version = "0.1.0.1";
-       sha256 = "0w23laiw6a5hxfq5hjq8vn3k7fx5l4yb9p8qcbm62zlycza1ci14";
+       sha256 = "244416d4679e7e61ea6218ddb43ca1a5bb3387dd084b58b0ebb028c3a3a24370";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hakyll pandoc ];
@@ -60928,7 +61139,7 @@ self: {
      mkDerivation {
        pname = "hakyll-contrib-hyphenation";
        version = "0.1.0.3";
-       sha256 = "0mkbsivifggi64k97ssxb0dskzwf7h0sny4m8gmkdsvwqjhfdjam";
+       sha256 = "55c9e6a0c47ceb36eb439578ab013c8effa91b585deb932631f13d1777d46b56";
        libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ];
        jailbreak = true;
        homepage = "https://bitbucket.org/rvlm/hakyll-contrib-hyphenation";
@@ -60944,7 +61155,7 @@ self: {
      mkDerivation {
        pname = "hakyll-contrib-links";
        version = "0.2.0.0";
-       sha256 = "0gzg88pcqxwj4qwr2qj24csjljvxcz3v9iclhz5f9g8dx41rkiy5";
+       sha256 = "c5c79903e90dbde4ca8794c5b4c7677d4b2a352342629139269277cc2e42ef3f";
        libraryHaskellDepends = [
          base binary containers hakyll pandoc pandoc-types parsec
        ];
@@ -60964,7 +61175,7 @@ self: {
      mkDerivation {
        pname = "hakyll-convert";
        version = "0.1.0.0";
-       sha256 = "1dvif26avp6fczhlg8pi591wp8d1z3kvjr745r5p17lzwpwy1rx3";
+       sha256 = "a3e7e0f9e59f9e704b2ee464b9e7f8a1a1cb432af1a247e167cedcad8c7071b7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60985,7 +61196,7 @@ self: {
      mkDerivation {
        pname = "hakyll-elm";
        version = "0.2.1";
-       sha256 = "0bgwcxarsa40aylvg4cc7ha5y87xklkc4ifwd17l69l4xbb4iqpk";
+       sha256 = "f3e248d6ea8426434f68dc45c2269dfd205f143c8c91b7a95780289d5567fc2d";
        libraryHaskellDepends = [
          base blaze-html blaze-markup Elm hakyll mtl
        ];
@@ -61004,7 +61215,7 @@ self: {
      mkDerivation {
        pname = "halberd";
        version = "0.1.2.9";
-       sha256 = "1d8r1cz9q9mgw1abz8b8n6lnnc19g223hv3igznxfldbws7d6zrj";
+       sha256 = "327fd38ee6ab51d7ed7f716c38847829306ba9b168a1bf54e0af269c3e0b19b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61032,7 +61243,7 @@ self: {
      mkDerivation {
        pname = "half";
        version = "0.2.0.1";
-       sha256 = "0lwh5bv8pnp9fzq64z1fg1i4fv8h2lcchs1298agq881hcay19qw";
+       sha256 = "1ca7e015830121fc144a2268c81815106d4762782e7c62f077e9da8bf62a9053";
        revision = "1";
        editedCabalFile = "cfadc0b87a5d9c4cc9a3ab5d7a5524221ae88e962f812eb41beba7b39111ccce";
        libraryHaskellDepends = [ base ];
@@ -61049,7 +61260,7 @@ self: {
      mkDerivation {
        pname = "halfs";
        version = "2.0";
-       sha256 = "1k47q0vp0cmvmxz28hmv8dgniz9ks7h0wjjmdkjgvb77p8jj2akd";
+       sha256 = "6d2a2125bae7acfde46c554a0ee0d133fd685f43bb42247eafbb327037c087cc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61071,7 +61282,7 @@ self: {
      mkDerivation {
        pname = "halipeto";
        version = "2.4.1";
-       sha256 = "1anyf6mh13rmj5a0lsayrcxzvm3zk0a2943pzkgz06y3aqgmcbdb";
+       sha256 = "ab2d561f56c31bf0dffc77902414987fd4fd3bcb5e690a5491358f00ab71deaa";
        libraryHaskellDepends = [ base directory HaXml pandoc ];
        jailbreak = true;
        homepage = "http://github.com/peti/halipeto";
@@ -61082,18 +61293,19 @@ self: {
 
   "halive" = callPackage
     ({ mkDerivation, base, bin-package-db, containers, directory
-     , filepath, foreign-store, fsnotify, ghc, ghc-paths, transformers
+     , filepath, foreign-store, fsnotify, ghc, ghc-paths, process
+     , transformers
      }:
      mkDerivation {
        pname = "halive";
-       version = "0.1.0.6";
-       sha256 = "0mwj3d45dynsygmblr2h8dj9bkl581zjxc66871rd02c7rj914ng";
+       version = "0.1.0.7";
+       sha256 = "1c0e073e4769fedec470f7518fb1e20eff8d5b7a56fe8a03ec186aaf5ae71398";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers foreign-store ];
        executableHaskellDepends = [
          base bin-package-db directory filepath fsnotify ghc ghc-paths
-         transformers
+         process transformers
        ];
        homepage = "https://github.com/lukexi/halive";
        description = "A live recompiler";
@@ -61110,7 +61322,7 @@ self: {
      mkDerivation {
        pname = "halma";
        version = "0.2.0.1";
-       sha256 = "04b0djijhmgwr79hkprikqxdzfxabavrvkwmb1pv9qybsa82j6sc";
+       sha256 = "4c1b2990d2cbe3b46f5895cf9db75aaabbdf3a9e31df09d3c9fc5528a36c6011";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61134,7 +61346,7 @@ self: {
      mkDerivation {
        pname = "haltavista";
        version = "0.1.0.1";
-       sha256 = "0l2qlibfxj8n7jqqqrbswx3fgislxz39075bhip07qx55193dx2f";
+       sha256 = "4ef4365228a5e3036e84ab1c90c6ef54c7e746e77a658cb13c16c9ee56a45850";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hint process ];
@@ -61147,7 +61359,7 @@ self: {
      mkDerivation {
        pname = "hamid";
        version = "0.10";
-       sha256 = "19792k9pwpkqwqznxm00nbq22swnayz7fv60ly0wsw5zmf1g6wv8";
+       sha256 = "6873f382abbf70cd81a7c06c77be57966b21f0b200d46e3fe6785e7ed314e9a4";
        libraryHaskellDepends = [ base HCodecs newtype ];
        description = "Binding to the OS level Midi services (fork of system-midi)";
        license = stdenv.lib.licenses.bsd3;
@@ -61158,7 +61370,7 @@ self: {
      mkDerivation {
        pname = "hamlet";
        version = "1.2.0";
-       sha256 = "0rla3ap3malk8j6mh07fr2aqvbscpy743wrfq3skgjv3j4jlpjfi";
+       sha256 = "d1c94b259163cb37f5c02ef3418ebf4caf8d95c8ee00588d4493aa3aae1a8a66";
        libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Haml-like template files that are compile-time checked (deprecated)";
@@ -61172,7 +61384,7 @@ self: {
      mkDerivation {
        pname = "hampp";
        version = "0.2.1";
-       sha256 = "0y7lsh16xrlgsgfsqw00ldcdcjwsy8cziw8p3g753k9m23can4wl";
+       sha256 = "9413abd81035cd51ce1b17f1f819f29a4bd658a30070acddd38fe66e02d4f478";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -61190,7 +61402,7 @@ self: {
      mkDerivation {
        pname = "hamtmap";
        version = "0.3";
-       sha256 = "04fr1wjlbmr0c9cp9ybdcirlgayw843klxi0lwl9b9pzwzn0glfl";
+       sha256 = "d4d107ece7ffa69528a720763a0741dcab4773646df974596220d745250fd911";
        libraryHaskellDepends = [ array base deepseq hashable ];
        homepage = "https://github.com/exclipy/pdata";
        description = "A purely functional and persistent hash map";
@@ -61205,7 +61417,7 @@ self: {
      mkDerivation {
        pname = "hamusic";
        version = "0.1.2.1";
-       sha256 = "1gfzydgnf8fffsl2f189gy81pb13dbf81i1a83laqsck6dhp60in";
+       sha256 = "36027361339369ace8402ac480dc6a23ac1b907f090527a876ce21675ff3dfbd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61230,7 +61442,7 @@ self: {
      mkDerivation {
        pname = "handa-gdata";
        version = "0.7.0.3";
-       sha256 = "1rm61kzvy8vrqmpa82y98hdf3dhqxkq9yh583p0l48zfj28ljh91";
+       sha256 = "2141499190ee2342c11da8409ff0ec18b6e11a44c90ba46ec57923bfff0ca6e6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61255,7 +61467,7 @@ self: {
      mkDerivation {
        pname = "handa-geodata";
        version = "0.2.0.1";
-       sha256 = "0x0ix66wcpv172rxk9daifirnrcbblkjlvlg762z4i7qhipjfi2n";
+       sha256 = "5644276f84f844f285398f6e2a275d8b659ba38baaa5d9b338615fc68de91174";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61274,7 +61486,7 @@ self: {
      mkDerivation {
        pname = "handle-like";
        version = "0.1.0.2";
-       sha256 = "1cn7423962fg21m75ww5gpg2kwbn1fb7y76hgfq9n6hhbnz8nd4m";
+       sha256 = "95348bbe5d101a9bb07bd01c7f960b76f129de7d85f3726a10cf09938620c7b2";
        libraryHaskellDepends = [ base bytestring ];
        description = "HandleLike class";
        license = stdenv.lib.licenses.bsd3;
@@ -61289,7 +61501,7 @@ self: {
      mkDerivation {
        pname = "handsy";
        version = "0.0.14";
-       sha256 = "1a2yzpj883wsn013cy2jvn6wjsqqyf5xn91nkw6f5cg4sd9znzmy";
+       sha256 = "be7efb53d3e4b1e20c9f3624db8bf3186bc98ddd52783602b09a0f84e4fd5ea8";
        libraryHaskellDepends = [
          base bytestring data-default-class operational process-extras retry
          shell-escape split transformers
@@ -61308,7 +61520,7 @@ self: {
      mkDerivation {
        pname = "hangman";
        version = "1.0.3";
-       sha256 = "0k86z27qiaz967hsdnb3sac5ybmnyzd4d2gxzvdngw8rcvcq3biy";
+       sha256 = "3eae81d96619f167dbfefd8946daf7b62e5f98d263d9a6e131e9ab888ff8064d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl random utility-ht ];
@@ -61324,7 +61536,7 @@ self: {
      mkDerivation {
        pname = "hannahci";
        version = "0.1.4.2";
-       sha256 = "072f9zsfrs8g6nw83g6qzczzybngrhyrm1m2y7ha37vf0y9gdpn0";
+       sha256 = "c0def692076e9fa1e0f1a2869a3dcccf2eff3ffbd8bc81b8350fe9ecf44f4e1c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -61345,7 +61557,7 @@ self: {
      mkDerivation {
        pname = "hans";
        version = "2.5.0.0";
-       sha256 = "19zmwwnccmr1smypm8xbxh1r0fcrd9967dqcrjw5mm9675v1iw0p";
+       sha256 = "17f018763926d55ab8cc0cb763526a99399003ecaba37a7dd52157c62ce7f5a7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61366,7 +61578,7 @@ self: {
      mkDerivation {
        pname = "hans-pcap";
        version = "0.1.0.2";
-       sha256 = "10zj129s6l4gf9acvs1yahdwv5vqj9kqwshvfjdak3gbi7arw48s";
+       sha256 = "1a119ed589eb8da99a741b6a8e67927897cd1b543ee8cd54728f50a39308f283";
        libraryHaskellDepends = [ base bytestring hans pcap ];
        jailbreak = true;
        homepage = "https://github.com/tolysz/hans-pcap";
@@ -61380,7 +61592,7 @@ self: {
      mkDerivation {
        pname = "hans-pfq";
        version = "0.1.0.0";
-       sha256 = "07jspsi8y921n5m5ar93w4gqaff4mjx79ss416ccm4s1k4l2km0b";
+       sha256 = "0bd42928994193ca980944eb74baacc439851fe12365556ab141248fa2be5a1e";
        libraryHaskellDepends = [ base bytestring hans pfq ];
        jailbreak = true;
        homepage = "https://github.com/tolysz/hans-pfq";
@@ -61397,7 +61609,7 @@ self: {
      mkDerivation {
        pname = "hapistrano";
        version = "0.2.0.2";
-       sha256 = "1bw37wb7wwf6qagp5q0i9biy5cma6i0yvn7z051da3gnad89iil1";
+       sha256 = "81c6985053f60dd54201ffd8ed4134aab2e2e34a11e0729fc2c6717e163f83af";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61424,7 +61636,7 @@ self: {
      mkDerivation {
        pname = "happindicator";
        version = "0.0.4";
-       sha256 = "1d0ycpxmlz2ab8dzys7i6ihc3rbs43d0l5l2mxvshqbpj3j73643";
+       sha256 = "839871e4907761a877af82160ada207ae5c16034f168ff1b5a4a7c5afb651eb4";
        libraryHaskellDepends = [
          array base bytestring containers glib gtk mtl
        ];
@@ -61441,7 +61653,7 @@ self: {
      mkDerivation {
        pname = "happindicator3";
        version = "0.2.1";
-       sha256 = "09h3077s61krg814aw2whgc869m6ff96rrxfk6rjpjy71lkmcl92";
+       sha256 = "225156270dc7cb2bb399aee76c9273a62683d8835c7045027a7906a3cf010326";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base glib gtk3 ];
@@ -61459,7 +61671,7 @@ self: {
      mkDerivation {
        pname = "happraise";
        version = "0.1";
-       sha256 = "1vcbfil9wxhk7vrmrmkn094rb281h4a3mrzpw5gl1842dpp5hp1g";
+       sha256 = "2f5c58ee6d82a0405fe1f7e73a1481018995490276d65cf33e13769e68748bed";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath ];
@@ -61474,7 +61686,7 @@ self: {
      mkDerivation {
        pname = "happs-hsp";
        version = "0.1";
-       sha256 = "0l1gb0qhhmld77qyz8qclbqxnv0hvyvjhav78690z50kvpjpqrxx";
+       sha256 = "bd677ce5dd13940f9241672b28b7df106cdbf1a20ca3eff1398d560831582f50";
        libraryHaskellDepends = [
          base bytestring HAppS-Server hsp mtl plugins
        ];
@@ -61489,7 +61701,7 @@ self: {
      mkDerivation {
        pname = "happs-hsp-template";
        version = "0.2";
-       sha256 = "0591ipk9zzzznmhz5wpp3qk7fkirhcp801qnk399jsms66fc8378";
+       sha256 = "e80cc49c31ba6a99d2981607802e83394e77261ef7f2f261b5ffff9fe68d2115";
        libraryHaskellDepends = [
          base bytestring containers directory filepath HAppS-Server hinotify
          hsp mtl network plugins RJson
@@ -61509,7 +61721,7 @@ self: {
      mkDerivation {
        pname = "happs-tutorial";
        version = "0.9.5";
-       sha256 = "1pkk78npgrr6dar00n93j6fbbkjam6198lkxp3q4zpdqspz4qypn";
+       sha256 = "f67a4cfed5b8dd4ff0b87d529482a94aceb59c91235900b26a26e7772d3a73de";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -61530,7 +61742,7 @@ self: {
      mkDerivation {
        pname = "happstack";
        version = "7.0.2";
-       sha256 = "1dfmfyrynggf1ff6364kb9a53rm64zhirx6ispnhykwdf60zbm6r";
+       sha256 = "d9d4f581718d4f0fedd5d1f41ce127a6e651545a9398619c0bee3debb377d5b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base happstack-server ];
@@ -61548,7 +61760,7 @@ self: {
      mkDerivation {
        pname = "happstack-auth";
        version = "0.2.1.1";
-       sha256 = "0mfd2r88681dskn1l1gcbam8rvaqsry09zavywkm4kvmw8912vy4";
+       sha256 = "c46f1112e2754f5227f75bfd047cd658ed8caa5aec051aecd42d20835016cd55";
        libraryHaskellDepends = [
          base bytestring containers convertible happstack happstack-data
          happstack-ixset happstack-server happstack-state mtl old-time
@@ -61574,7 +61786,7 @@ self: {
      mkDerivation {
        pname = "happstack-authenticate";
        version = "2.1.4";
-       sha256 = "075bncl5mz7hi674gyhd9mrnf3xb8zn5frcy39dj5m7jrsrdy91z";
+       sha256 = "3f24dfb2cef2d4225b1a9e6557ec47ab0f67734d0dfa478e89f0fc5a28b3ab1c";
        libraryHaskellDepends = [
          acid-state aeson authenticate base base64-bytestring boomerang
          bytestring containers data-default filepath happstack-hsp
@@ -61597,7 +61809,7 @@ self: {
      mkDerivation {
        pname = "happstack-clientsession";
        version = "7.3.0";
-       sha256 = "1dh6l52mfd6p9y39lr0qax1gs7rxpamy21iwxca7ylbhlqyxfa2g";
+       sha256 = "4f28d73da670517f14eb3c06e1abba3d1ffd425718649a864fd7345745a106b6";
        libraryHaskellDepends = [
          base bytestring cereal clientsession happstack-server monad-control
          mtl safecopy transformers-base
@@ -61615,7 +61827,7 @@ self: {
      mkDerivation {
        pname = "happstack-contrib";
        version = "0.2.1";
-       sha256 = "0cqdfnjcmghw3wwny2brw51qbkvi8ps2crl8382sqwqq9gkw0l75";
+       sha256 = "e550c0e74b1873ac051a886626f44571cf8543e179096f391f1cbecaa4750d33";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61639,7 +61851,7 @@ self: {
      mkDerivation {
        pname = "happstack-data";
        version = "6.0.1";
-       sha256 = "0v2ln4mdnild72p02mzjn8mn5srvjixsjqjgkdqzshvxjnnm95l8";
+       sha256 = "889654ad957d43fd719b4f62a97b943beb622bb2f25701ae388d46db2ab1546c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61661,7 +61873,7 @@ self: {
      mkDerivation {
        pname = "happstack-dlg";
        version = "0.1.2";
-       sha256 = "1zm8f224r0nwpykvil8s05lcswrw31iigcw9arnf4j362y03n2qp";
+       sha256 = "170b3b80176648e26c5689b31763183c73cd68011ad1b8a7bfdc824c8470a8fe";
        libraryHaskellDepends = [
          applicative-extras base bytestring containers formlets
          happstack-server mtl random template-haskell time xhtml
@@ -61683,7 +61895,7 @@ self: {
      mkDerivation {
        pname = "happstack-facebook";
        version = "0.30";
-       sha256 = "1rfd2rkizviq7pv6lmhkp0dmwwk2m25kz9vzczk3ycm57mk7ql8c";
+       sha256 = "0c517c663da5323fe6677fa73f8ba862725e1bb813566af63d38ee1f6716cde5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61707,7 +61919,7 @@ self: {
      mkDerivation {
        pname = "happstack-fastcgi";
        version = "0.1.5";
-       sha256 = "0rvb041nx2f8azvfy1yysisjqrmsfbxnccn992v5q7zhlglcvj8h";
+       sha256 = "10c9cde8a3f01f5cb648c93266fb72ba662c75d4de07eff657c8896e03016b67";
        libraryHaskellDepends = [
          base bytestring cgi containers fastcgi happstack-server mtl
          utf8-string
@@ -61723,7 +61935,7 @@ self: {
      mkDerivation {
        pname = "happstack-fay";
        version = "0.2.0";
-       sha256 = "1mwx7ki35s6x3ypxl8sv611a2h4zxwd77ij95bydf5azzz9l6ys5";
+       sha256 = "457b43d3ff5f15d7fc2a49c6731aef9f40a142305b23daaf1fdde832e23c9dd7";
        libraryHaskellDepends = [
          aeson base fay happstack-fay-ajax happstack-server mtl
        ];
@@ -61739,7 +61951,7 @@ self: {
      mkDerivation {
        pname = "happstack-fay-ajax";
        version = "0.2.0";
-       sha256 = "0zdkvvmywnfvqg5jdvf29qczzxmprvspxj0r1vj46fd6vld53j4j";
+       sha256 = "92c8511adda63943e40e19c87ef5ceb7f6ff194ec2ed26cbc3db59eeebdeb37d";
        libraryHaskellDepends = [ fay-base fay-jquery ];
        jailbreak = true;
        homepage = "http://www.happstack.com/";
@@ -61756,7 +61968,7 @@ self: {
      mkDerivation {
        pname = "happstack-foundation";
        version = "0.5.8";
-       sha256 = "1sbqp78mgnc5rrnn35myd0izlh3w1nv5pgpg807w3cax2xakw3bh";
+       sha256 = "700d3e55175db1c10f40efbe5bb60d7c40fa2368be96616dce85d957d1b978e9";
        libraryHaskellDepends = [
          acid-state base happstack-hsp happstack-server hsp lifted-base
          monad-control mtl reform reform-happstack reform-hsp safecopy text
@@ -61773,7 +61985,7 @@ self: {
      mkDerivation {
        pname = "happstack-hamlet";
        version = "7.0.4";
-       sha256 = "1l12gyyqzblb9psk6692r9xw640jxzyxqldfyg2yrzz8y0zi649a";
+       sha256 = "2a11133ff0e8ffecc5f3ae51dcfdef1210c37bca221933f54d8bae8fbd7f22d0";
        libraryHaskellDepends = [ base happstack-server shakespeare text ];
        jailbreak = true;
        homepage = "http://www.happstack.com/";
@@ -61788,7 +62000,7 @@ self: {
      mkDerivation {
        pname = "happstack-heist";
        version = "7.2.4";
-       sha256 = "1ax1fyw9788iilmczqr6s1ryh2h9x2f6n9c8mqxjmq58zg1lc2d3";
+       sha256 = "a30946c3fba8e02a3bae88256b9ce8090ae873d026e3cf2a8d11a193b877a1ab";
        libraryHaskellDepends = [
          base blaze-builder bytestring either filepath happstack-server
          heist mtl text
@@ -61811,7 +62023,7 @@ self: {
      mkDerivation {
        pname = "happstack-helpers";
        version = "0.56";
-       sha256 = "0yrspdcgxj2izivwm7fy8msfbzlpdn3zv0j1z6b1smzydcbad202";
+       sha256 = "0288a6166bfe571d96f94182fd876d97fee57445de9dca77fc51c8fe58bb3a7b";
        libraryHaskellDepends = [
          base bytestring containers DebugTraceHelpers directory filepath
          happstack-data happstack-ixset happstack-server happstack-state
@@ -61833,7 +62045,7 @@ self: {
      mkDerivation {
        pname = "happstack-hsp";
        version = "7.3.5";
-       sha256 = "0p8hidcdrqj7n4b9a5gbc0ic279wjmxvjacn6b8nzcnridq3mif6";
+       sha256 = "c6c53a708bd9b26fd1329629b97b953c1dc12260eb159516b147e2dc588b105d";
        libraryHaskellDepends = [
          base bytestring happstack-server harp hsp hsx2hs mtl syb text
          utf8-string
@@ -61852,7 +62064,7 @@ self: {
      mkDerivation {
        pname = "happstack-hstringtemplate";
        version = "7.0.4";
-       sha256 = "1pcj6vixzrbdmqi2yxcxhjnj5rdwlyg4nzcjkgks01ilgpg7fsf4";
+       sha256 = "c46977de7d3406a0e79b927d4b9ea7bce522ad849d752f22ae6de5dfe33692dd";
        libraryHaskellDepends = [
          base bytestring happstack-server hslogger HStringTemplate mtl
        ];
@@ -61869,7 +62081,7 @@ self: {
      mkDerivation {
        pname = "happstack-ixset";
        version = "6.0.1";
-       sha256 = "1hnhn0iyfw5rknz17p7m1p3rrngr77zv3lkni8d35q50bzzyw8ni";
+       sha256 = "d122eeff5fa0e0321a8a76d2b1ff39f9d99cc70df5dc13be9db970e723b0d0c2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61891,7 +62103,7 @@ self: {
      mkDerivation {
        pname = "happstack-jmacro";
        version = "7.0.10";
-       sha256 = "0kzp3dfy2qrd9bwq3lwnxvh1zibw7kib8w8rfqz36k0ywdwq8768";
+       sha256 = "c81c8479e31e4c333e761971b4e23c7cc51fe0ee96d381f94a2d63e15d1bf74f";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cereal digest happstack-server
          jmacro text utf8-string wl-pprint-text
@@ -61906,7 +62118,7 @@ self: {
      mkDerivation {
        pname = "happstack-lite";
        version = "7.3.6";
-       sha256 = "1mvzpbmjgf5gv9ls5kmg0s6cr765jl701vy2kmbynjkg6jimjmp8";
+       sha256 = "e85659a3346f4aeb579dc2ef000e95c59ccc8c06afcea269daafb827ebba7fd7";
        libraryHaskellDepends = [
          base bytestring happstack-server mtl text
        ];
@@ -61922,7 +62134,7 @@ self: {
      mkDerivation {
        pname = "happstack-monad-peel";
        version = "0.1";
-       sha256 = "0v6lshy572pvzhgqphyrhw8w2wsgxp9mqz8p3lrxmcp3i7sgqbry";
+       sha256 = "3e2ffcf489e3b2da331d177d5cd3ed4f73c11187d9c38b1ffcfb8a533cd4d46c";
        libraryHaskellDepends = [
          base happstack-server monad-peel mtl transformers
        ];
@@ -61938,7 +62150,7 @@ self: {
      mkDerivation {
        pname = "happstack-plugins";
        version = "7.0.2";
-       sha256 = "07zh0gk77rbd1akzax29l7d6412sx5ghjhz640d6cbzxs39nlaif";
+       sha256 = "2e2a6ad3d0fd2f661a20e643095fe95a0462daa14974f5a70a6de573e603f01f";
        libraryHaskellDepends = [
          base happstack-server mtl plugins-auto template-haskell th-lift
        ];
@@ -61961,7 +62173,7 @@ self: {
      mkDerivation {
        pname = "happstack-server";
        version = "7.4.4";
-       sha256 = "1whyv6rb4b9x9m381fs8938n74dgq7hd9gpznwnlzh76ah2nanjf";
+       sha256 = "4e5a650554e6c04f2db7ffbed4e0c1af9163d14848bb80464d3d2db2b2d91ef2";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -61986,7 +62198,7 @@ self: {
      mkDerivation {
        pname = "happstack-server-tls";
        version = "7.1.6";
-       sha256 = "00fmgws8hc0v1lsmxlj478xdbmlpgaz581m9hqw5nfjljg8mi74w";
+       sha256 = "9c9c58d193543a5b3886a90654be7a97d6d53a3a44d25e350d1b3088347fd501";
        libraryHaskellDepends = [
          base bytestring extensible-exceptions happstack-server hslogger
          HsOpenSSL network sendfile time unix
@@ -62005,7 +62217,7 @@ self: {
      mkDerivation {
        pname = "happstack-server-tls-cryptonite";
        version = "0.1.1";
-       sha256 = "1y450dvdswkqcaqillrzlpizss9hlk2q61x1p715wfhrlmizlrjq";
+       sha256 = "5866fa63a5193a5ec2b9a10783c5a43069fde3a53f531ab1627872dd760385f8";
        libraryHaskellDepends = [
          base bytestring cryptonite data-default-class extensible-exceptions
          happstack-server hslogger network sendfile time tls unix
@@ -62022,7 +62234,7 @@ self: {
      mkDerivation {
        pname = "happstack-state";
        version = "6.1.4";
-       sha256 = "1xfp0546z70sfda0z7w7ns4jhgcbx3vmnz4vsnckzhgflzmdixq9";
+       sha256 = "09f7d8eaa7eec13f99d59b7c5bf7e88b3d2889b6879f0f54731a9c6f4801d7f5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62044,7 +62256,7 @@ self: {
      mkDerivation {
        pname = "happstack-static-routing";
        version = "0.4.2";
-       sha256 = "0g8b94mfhajgs99rgvzfrlc19cxm5a0j6cgrrlrdhgfx7lggc9h2";
+       sha256 = "0226f61e3ddd3dd832cdf93123812ab5b31418cdeeef9753d24f2ae82a490b3d";
        libraryHaskellDepends = [
          base containers happstack-server list-tries transformers
        ];
@@ -62062,7 +62274,7 @@ self: {
      mkDerivation {
        pname = "happstack-util";
        version = "6.0.3";
-       sha256 = "0hqssd5wzir6rxn46q8r3hdp3nl7v5m7w322j39120xpg2bhiphh";
+       sha256 = "10de089778b70311d290420c7e6ad987da711b1c1961436ccf26c7cf4bd31a43";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62086,7 +62298,7 @@ self: {
      mkDerivation {
        pname = "happstack-yui";
        version = "7373.5.3";
-       sha256 = "178r3jqxmrdp0glp9p4baw8x7zk0w8j4m5l173rjnz9yxn53nyni";
+       sha256 = "d17a3b8aed3e7d2bf33881964a24e260fed311578bdc74e903b7e5dab11c199d";
        libraryHaskellDepends = [
          base boomerang bytestring containers directory happstack-jmacro
          happstack-server hsp interpolatedstring-perl6 jmacro mtl pretty
@@ -62105,7 +62317,7 @@ self: {
      mkDerivation {
        pname = "happy";
        version = "1.19.5";
-       sha256 = "1nj353q4z1g186fpjzf0dnsg71qhxqpamx8jy89rjjvv3p0kmw32";
+       sha256 = "62f03ac11d7b4b9913f212f5aa2eee1087f3b46dc07d799d41e1854ff02843da";
        revision = "1";
        editedCabalFile = "d6a01f50aab2c480799b7d19643c5bb01891e01ac97aa892ffec3e6029a1446c";
        isLibrary = false;
@@ -62124,7 +62336,7 @@ self: {
      mkDerivation {
        pname = "happy-meta";
        version = "0.2.0.8";
-       sha256 = "0hnj039vspqvym70c59y80ygb8ciz5bf18sqm0dbvzr5v2mixbag";
+       sha256 = "4fad1eabd825ffbd1aa858a3e056f991a1f53c403e15064ef51b5fbdd300d242";
        libraryHaskellDepends = [
          array base containers haskell-src-meta mtl template-haskell
        ];
@@ -62140,7 +62352,7 @@ self: {
      mkDerivation {
        pname = "happybara";
        version = "0.0.1";
-       sha256 = "1lp2awvj077d16gppir6nv9fx6d9g1k7w6j01bxkffy3q5x04xrv";
+       sha256 = "3b77027ac1c33b37fb0a401a7e6678a999eed2b626c77b9f09ed1c203757e2d2";
        libraryHaskellDepends = [
          aeson base filepath http-types lifted-base monad-control mtl text
          time transformers transformers-base
@@ -62161,7 +62373,7 @@ self: {
      mkDerivation {
        pname = "happybara-webkit";
        version = "0.0.1";
-       sha256 = "17446wkyljwd7nq6mhsj2v411zb9wsz833sczm4nzcigywvhx4fw";
+       sha256 = "dc910e37f72fb26f49fd4c8f81bee669fd10c81652c36ab03d8d4bea2737849c";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive data-default directory
          filepath happybara http-types lifted-base monad-control mtl network
@@ -62179,7 +62391,7 @@ self: {
      mkDerivation {
        pname = "happybara-webkit-server";
        version = "0.0.1";
-       sha256 = "0vh9ig9mvg12qgysk7gbqwiib3m2ciwi10asb1i0x25xjp585shi";
+       sha256 = "11ea82ca95bd880e62585a81107964a28e1523c7eb9da9fdc322bc5dd38b096e";
        libraryHaskellDepends = [ base directory filepath process ];
        jailbreak = true;
        homepage = "https://github.com/cstrahan/happybara/happybara-webkit-server";
@@ -62194,7 +62406,7 @@ self: {
      mkDerivation {
        pname = "har";
        version = "0.1.1.0";
-       sha256 = "0x51sqlybfq2pqv6nrhvf50yds3gs08sfih7zi9ijvn5dkrxx1z3";
+       sha256 = "e387def36cc56e1953fc0746a711d06fe8e641711b666b36be02bbe529d6a174";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath text
        ];
@@ -62211,7 +62423,7 @@ self: {
      mkDerivation {
        pname = "harchive";
        version = "0.2";
-       sha256 = "10485indn9sszq3514gs547phb0kpikm8m6ykq1ns2kp0pmkgz9m";
+       sha256 = "35fd37eb05770a6d039ede545467bc132c780f29fa915006fe5a27db6c2c8880";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -62231,7 +62443,7 @@ self: {
      mkDerivation {
        pname = "hark";
        version = "0.2";
-       sha256 = "1wxwxx3l4zvb1jr19lckamb0gxywsq1f4n4ncb373vqdnwnrr8x4";
+       sha256 = "a4a39c2db70def71c6629658e202d6dcf707565593d114b20c6b7f4247efbcf3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -62251,7 +62463,7 @@ self: {
      mkDerivation {
        pname = "haroonga";
        version = "0.1.7.1";
-       sha256 = "0j4668611qazzwb4w05v0xliw1w0a7kmlz0g2z9ixz0kywbfim2g";
+       sha256 = "4fd4e816f713fc1ed3170f7c5ae75180071e6907bb004e16ff5fe1100c328648";
        libraryHaskellDepends = [
          base bindings-DSL monad-control resourcet transformers
        ];
@@ -62267,7 +62479,7 @@ self: {
      mkDerivation {
        pname = "haroonga-httpd";
        version = "0.1.1.0";
-       sha256 = "1745b7khz1dn7n9w3z89na01jap62vbg1mb6c7i9n2mgwkkrys5g";
+       sha256 = "af689fe7e4af0a9be26166d5f0d616e62a1980b209fdc1933db6850fe759859c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -62283,7 +62495,7 @@ self: {
      mkDerivation {
        pname = "harp";
        version = "0.4.1";
-       sha256 = "0q9q3rw9yqkryjf5vvm41ckycqjfaxnsrmc1p0kmdrlb4f4dgclz";
+       sha256 = "9fb2d788238be65627b881d5ac6d574e62e6270ba4ee5d9cf479629f781e3861";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/seereason/harp";
        description = "HaRP allows pattern-matching with regular expressions";
@@ -62297,7 +62509,7 @@ self: {
      mkDerivation {
        pname = "harpy";
        version = "0.6.0.2";
-       sha256 = "1rlbakwqfjfr3d71jc6d5nyw5ms0y9wmb79p8jax45rxk1a8cfry";
+       sha256 = "3e3b8654983d17d29544379d5579f240d7c2bd2dcd30194e1bd94987f9548be6";
        libraryHaskellDepends = [
          array base containers disassembler mtl parsec pretty
          template-haskell
@@ -62312,7 +62524,7 @@ self: {
      mkDerivation {
        pname = "has";
        version = "0.5.0.1";
-       sha256 = "0zydwhr2ac66knmrlf0b9vsys61w6370g9rid2gag2dvmy7xqp2s";
+       sha256 = "5a5cdc8fafbb89a79e6831a707ce303c18edf54e0b389aab9dc6302532e4cd7f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck ];
@@ -62327,7 +62539,7 @@ self: {
      mkDerivation {
        pname = "has-th";
        version = "0.1";
-       sha256 = "0yyrfd8mgxwyfgwcg61q7yj2cq2zj6zlk1l340y4vzj71r53qgc4";
+       sha256 = "843d3c4a0e47fe4d3c20838649bf915f6026a43f3898c7f8739ef7575173d97b";
        libraryHaskellDepends = [ base has template-haskell ];
        homepage = "http://github.com/chrisdone/has-th";
        description = "Template Haskell function for Has records";
@@ -62340,7 +62552,7 @@ self: {
      mkDerivation {
        pname = "hascal";
        version = "2.0.0.1";
-       sha256 = "1nq383fg2cn82rbmnp6kgzyk42fgp9xnqj84ypz0kf42954n4h1l";
+       sha256 = "344062494982b809fef504496c7bbacf0932fd7fd35c5b5716c832f1dc4003db";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -62359,7 +62571,7 @@ self: {
      mkDerivation {
        pname = "hascat";
        version = "0.2";
-       sha256 = "04z9q3l2hwf7lii8d3cxbh7zh6cqbbmy07yv5bal4lvrnd1wqia7";
+       sha256 = "4745cc43b3795342d52adb1fe0eb5a9819f80f5c9d8d8662a4c77128e8c0e913";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -62380,7 +62592,7 @@ self: {
      mkDerivation {
        pname = "hascat-lib";
        version = "0.2";
-       sha256 = "0l2cixgnyv2xhbpvkzrrn1wxikx7gcmwpkwagkfzx27iy33xkrqj";
+       sha256 = "12e7d9c7f0f188fedd7c8acfcb2b7ba7cfd879b039ffb9ef825d6c6f5f8f4c50";
        libraryHaskellDepends = [
          base bytestring containers directory haskell98 HaXml html HTTP mtl
          network old-locale old-time parsec plugins xhtml
@@ -62398,7 +62610,7 @@ self: {
      mkDerivation {
        pname = "hascat-setup";
        version = "0.2";
-       sha256 = "058abyr70yr2130nbi64zhigglw207dh5anyxzw19c1qk4zmwsyi";
+       sha256 = "d16b5e3f9938b014f8efdeaa02db0182d3f722fcc4c465c108227b70b25f0a15";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62419,7 +62631,7 @@ self: {
      mkDerivation {
        pname = "hascat-system";
        version = "0.2";
-       sha256 = "1fabn71llrlxs5xlcpzkkvzjv7zibxlna0jvh6rkrz6pqyp1nd94";
+       sha256 = "24351baec7d7fc3cb3815b0265695ff19f2dff9ef35f467bd19d664ac3b14bb9";
        libraryHaskellDepends = [
          base bytestring containers hascat-lib HaXml HTTP mtl network
          old-time parsec plugins unix
@@ -62438,7 +62650,7 @@ self: {
      mkDerivation {
        pname = "hash";
        version = "0.2.0.1";
-       sha256 = "1ka6izpkz6gs4ag3xvnslxywi9344w3mh9rl968vq6ck203pv2rx";
+       sha256 = "3d8b7d07109319bc9149342758072764a4c87da7daee3e9e22fa993fef8f46cd";
        libraryHaskellDepends = [
          base bifunctors bytestring data-default generic-deriving hashable
          lens transformers
@@ -62459,7 +62671,7 @@ self: {
      mkDerivation {
        pname = "hashable";
        version = "1.2.3.3";
-       sha256 = "0kp4aj0x1iicz9qirpqxxqd8x5g1njbapxk1d90n406w3xykz4pw";
+       sha256 = "fc923f7d1fdc0062416a61f6ab96b4e1958e1aee1ddf1c71fa2cc6d08154e44e";
        libraryHaskellDepends = [
          base bytestring ghc-prim integer-gmp text
        ];
@@ -62479,7 +62691,7 @@ self: {
      mkDerivation {
        pname = "hashable-extras";
        version = "0.2.2";
-       sha256 = "118l23n78xs1faa0q42h996q210l2p9mzl85a73krljzsz8wkc1b";
+       sha256 = "2bb0c9d1d75fd23cc75105d15fd3151404814d4a50100c9472417774ec101485";
        libraryHaskellDepends = [
          base bifunctors bytestring hashable transformers
        ];
@@ -62496,7 +62708,7 @@ self: {
      mkDerivation {
        pname = "hashable-generics";
        version = "1.1.8";
-       sha256 = "1l5i4lasz32hsjvm9fbf7p9fy7s6bjy868w7rmpxci40qkz7ffhq";
+       sha256 = "183a77fec48044d66fcd872383bc5c461fefd23d6eb954b7d4508caf1525b1d0";
        libraryHaskellDepends = [ base ghc-prim hashable ];
        testHaskellDepends = [
          base ghc-prim hashable QuickCheck test-framework
@@ -62514,7 +62726,7 @@ self: {
      mkDerivation {
        pname = "hashable-time";
        version = "0.1.0.1";
-       sha256 = "1137cc7jyyn293g3nx9bs4mw4r8i7k9cq0rz5f5rs7j8997gkmbf";
+       sha256 = "6ed5f94e4a481e9d8b2b3f03ccd23c1165c22bd12b753bde48c27a2f0f636784";
        libraryHaskellDepends = [ base hashable time ];
        description = "Hashable instances for Data.Time";
        license = stdenv.lib.licenses.bsd3;
@@ -62527,7 +62739,7 @@ self: {
      mkDerivation {
        pname = "hashabler";
        version = "0.1.0.2";
-       sha256 = "0n3cw5vc48144kddz0krcm682bcigdafap81kdkvhq8alhc50532";
+       sha256 = "62145018a40a61b8679b015de5547b912d814c657982dfda242420c276e16c58";
        libraryHaskellDepends = [
          array base bytestring ghc-prim integer-gmp primitive
          template-haskell text
@@ -62544,7 +62756,7 @@ self: {
      mkDerivation {
        pname = "hashed-storage";
        version = "0.5.11";
-       sha256 = "0s8mnayxlvwrrii2l63b372yi5g08br6gpbgz2256d8y128mwjvk";
+       sha256 = "734b5e91081e355384f86fdd67f242e095e8c5196b182a62cc996fdabdb21569";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62561,7 +62773,7 @@ self: {
      mkDerivation {
        pname = "hashids";
        version = "1.0.2.1";
-       sha256 = "03q0fcxiw4yncmbdirnh6kaz9jhyxqy348dnrvgkbn4mzkh8fi2z";
+       sha256 = "5f4487e0fc95d835dfceb621323cee1ecaf4d534d0e6d85665d6131e3b73000f";
        libraryHaskellDepends = [ base bytestring containers split ];
        homepage = "http://hashids.org/";
        description = "Hashids generates short, unique, non-sequential ids from numbers";
@@ -62573,7 +62785,7 @@ self: {
      mkDerivation {
        pname = "hashmap";
        version = "1.3.0.1";
-       sha256 = "16scl1rbq0f18mggrj4lbhgkz7kzshsw9a523rjd8cjkdjz1ijwr";
+       sha256 = "99cb18be6c5332d4641ea2a8c435d47f9e3f1f5c94c8fc5e45c101bc72a04c9b";
        libraryHaskellDepends = [ base containers deepseq hashable ];
        homepage = "http://git.auryn.cz/haskell/hashmap/";
        description = "Persistent containers Map and Set based on hashing";
@@ -62587,7 +62799,7 @@ self: {
      mkDerivation {
        pname = "hashring";
        version = "0.0.0";
-       sha256 = "05q9iay0ygr79x8yikgbi99v74kagyrd68zvjx8qakfzqgs9a19j";
+       sha256 = "320595f4c3df4d855197fb23d3b27f6a92b3538aebcde8514f273f0fbc8a0917";
        libraryHaskellDepends = [ base containers hashable ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -62603,7 +62815,7 @@ self: {
      mkDerivation {
        pname = "hashtables";
        version = "1.2.0.2";
-       sha256 = "0dqq5ssgkqzplqf5dmc4l8cj28j5py7i6n6a069qn4cibvxfjaq1";
+       sha256 = "012be9fa5e91118b9301ca58138fbf45222119a284d5561ca6f7e3f9b42e1837";
        libraryHaskellDepends = [
          base ghc-prim hashable primitive vector
        ];
@@ -62618,7 +62830,7 @@ self: {
      mkDerivation {
        pname = "hashtables-plus";
        version = "0.2.0";
-       sha256 = "0g9jmc15g36iy0wmmsj74qwybh509j4lf8jzv3dws7c2j24kc7l7";
+       sha256 = "871e368990821dcddbd85f2247894ca0c0e5392647ea5a39f0d18c5702ab323d";
        libraryHaskellDepends = [
          base hashable hashtables loch-th placeholders
        ];
@@ -62633,7 +62845,7 @@ self: {
      mkDerivation {
        pname = "hasim";
        version = "0.1.2";
-       sha256 = "03wn142r0sh7adfghjqwb2mgq4rgkqs8nq2rx2jq717dr2xp987n";
+       sha256 = "f6a074bbc8ed8483a5e859608b349e2f13fcaa581c4bf85c53076a900509960f";
        libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://huygens.functor.nl/hasim/";
        description = "Process-Based Discrete Event Simulation library";
@@ -62648,7 +62860,7 @@ self: {
      mkDerivation {
        pname = "hask";
        version = "0";
-       sha256 = "1c87jxafxpnlyblhdif4br61wqvnad0s6hvfhmzhx9y1jri3rb39";
+       sha256 = "69ac3c6296c1a70e7f856e43a3415376631e4c5ec4c506e9f2d4deee549707b1";
        revision = "1";
        editedCabalFile = "04abcba45a7fbaa11d7f3bd9834f1e70a30f356ae871e59ab472f20d4cd60026";
        libraryHaskellDepends = [
@@ -62667,7 +62879,7 @@ self: {
      mkDerivation {
        pname = "hask-home";
        version = "2009.3.18";
-       sha256 = "128hkd1yycjvbnvwjd2r2mxhjdnmfkghyf0fcslh9fxprqgrhk18";
+       sha256 = "284c981fceb7bb04a9660e380fdf74d536097b155934c9b75d5b32ef439b1089";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -62687,7 +62899,7 @@ self: {
      mkDerivation {
        pname = "haskades";
        version = "0.2.1";
-       sha256 = "19cglzgzxbg65qr7m68gnc6y45b7n0wl98pgd9jrk20sblrhc6p6";
+       sha256 = "e61a06335d1a8899656aefa24439b06715e20db30f997a322ee6adfedfa78fa5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -62705,7 +62917,7 @@ self: {
      mkDerivation {
        pname = "haskakafka";
        version = "1.0.0";
-       sha256 = "0j1vii11lp91gydw3h0hb2b3lb85n9cji9m9rvb1d7svs91nhhk7";
+       sha256 = "67426843d25b9f16d6cea9a62859b2052d3a965810c0c19b7f215d1a428c3b48";
        libraryHaskellDepends = [
          base bytestring containers temporary unix
        ];
@@ -62726,7 +62938,7 @@ self: {
      mkDerivation {
        pname = "haskanoid";
        version = "0.1.5";
-       sha256 = "1k2y406kjxyv3sdpa50m6i15z2aiysy43xhjgln99v21x6rp08ia";
+       sha256 = "2a2270b3e941ec942c7d12f641bcf651895f42341514759b1edb77390d205ecc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -62746,7 +62958,7 @@ self: {
      mkDerivation {
        pname = "haskarrow";
        version = "0.0";
-       sha256 = "01l90qningjlb4wn02avjy9lmi4ry4yxzw0a9sd29qbzfpnf3viy";
+       sha256 = "3eeee1ec757fe1249a4e0af0df3df199c44a93975b09603959543e1b2d068906";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -62764,7 +62976,7 @@ self: {
      mkDerivation {
        pname = "haskbot-core";
        version = "0.1";
-       sha256 = "0alqjgg2gvb9610s2b4fil5frknn5j8d6r558bfp1n6a0d51pz74";
+       sha256 = "e4fc1b4a03cad870dd42a564d3902cd6ceec0a8d8e2ca1413069ed27de93982a";
        libraryHaskellDepends = [
          aeson base bytestring connection containers http-conduit http-types
          monads-tf stm text wai warp
@@ -62789,7 +63001,7 @@ self: {
      mkDerivation {
        pname = "haskdeep";
        version = "0.2.0.1";
-       sha256 = "0ncx9wx9ldynqwq0zwljwqzskm5mrq8rx74np43pm9qxvjc9f5vx";
+       sha256 = "7d179798dc1da77a07b9969c9e11ceb5d4a93fe692f20f30c7d6379a3a4f9d59";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -62810,7 +63022,7 @@ self: {
      mkDerivation {
        pname = "haskdogs";
        version = "0.3.2";
-       sha256 = "0vl3c66ki9j9ncs2rapdn80kbfk0l3y97qwfraqlnjycdl10sm6r";
+       sha256 = "d9540d026dcc4b4bb1ca8ee393fca060ba3501b2edaa2c34b349a6388d61836e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal filepath HSH ];
@@ -62826,7 +63038,7 @@ self: {
      mkDerivation {
        pname = "haskeem";
        version = "0.7.16";
-       sha256 = "0fmglaiq2axpb9f4yyk53fpppc1ysqglqgjxhy78yl3r8mik836n";
+       sha256 = "d60c34634579508f8e875d3e4c1fd63eb07baf1b657a4f5c5ab72b81a3a2af3a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -62846,7 +63058,7 @@ self: {
      mkDerivation {
        pname = "haskeline";
        version = "0.7.2.1";
-       sha256 = "09v4vy6nf23b13ws9whdqwv84mj1nhnla88rw2939qyqxb4a6mmf";
+       sha256 = "ae56a3c8ead8e33492e01921452db441568236c70df2a4f9086b08678ddf6427";
        configureFlags = [ "-fterminfo" ];
        libraryHaskellDepends = [
          base bytestring containers directory filepath terminfo transformers
@@ -62862,7 +63074,7 @@ self: {
      mkDerivation {
        pname = "haskeline-class";
        version = "0.6.2";
-       sha256 = "0xgdq2xgw2ccyfzkj5n36s5n6km5l947d2iy4y1qms8kbc05zmfl";
+       sha256 = "d4d55f005b13e98a83273e8a7648a2a54e638b36c31639bff38c09febac0ed75";
        libraryHaskellDepends = [ base haskeline mtl ];
        jailbreak = true;
        homepage = "http://community.haskell.org/~aslatter/code/haskeline-class";
@@ -62881,7 +63093,7 @@ self: {
      mkDerivation {
        pname = "haskell-aliyun";
        version = "0.1.0.0";
-       sha256 = "1id1l7arf3yq9mym6ds58k5wins57k71v8fgzyhxsg81657vh74a";
+       sha256 = "8a1cb84f31013ddda1ffcfa11dce3c45dbc8cb444537537d4dd80f97d5a1a1c5";
        libraryHaskellDepends = [
          aeson base base64-bytestring basic-prelude blaze-builder bytestring
          case-insensitive conduit Crypto data-default http-conduit
@@ -62904,7 +63116,7 @@ self: {
      mkDerivation {
        pname = "haskell-awk";
        version = "1.1.1";
-       sha256 = "0s6vzfsqh2wwsp98l8zpg6cvh7jwz5wha44idz3yavhmy6z08zgd";
+       sha256 = "ed7d04bef1156ee5c76f91100579f95c1eb89979f7238ad2d59c0b88b5fbdb68";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62931,7 +63143,7 @@ self: {
      mkDerivation {
        pname = "haskell-bcrypt";
        version = "0.3.1";
-       sha256 = "1w8crppmm02qw03n59s7dnqfhmqwmd44sj8qm38bf90fabl1wa7d";
+       sha256 = "ed281ee8520e24b7d0a818494d48ab1c57e8b06d47a76207e058805aefcd0cf1";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://www.github.com/zbskii/haskell-bcrypt";
        description = "A bcrypt implementation for haskell";
@@ -62946,7 +63158,7 @@ self: {
      mkDerivation {
        pname = "haskell-brainfuck";
        version = "0.1.0.1";
-       sha256 = "12yhnlcif0jj9pmi3a098f1swvnww45rg2rpn6g82bkjzmd4sjr8";
+       sha256 = "284b4d5afd722e819eb1378b970be1dc6eae834309a811eb4d52021719b5d08b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring mtl parsec ];
@@ -62968,7 +63180,7 @@ self: {
      mkDerivation {
        pname = "haskell-cnc";
        version = "0.1.3.200";
-       sha256 = "0x1kjdxbayq6z85w9fw6c4mpixzl60332wxgx4nh0ih9235jfdhd";
+       sha256 = "0d3627cb100946002de9af73310630f4f7782b6186bbc40bfa067bb57a933374";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62987,7 +63199,7 @@ self: {
      mkDerivation {
        pname = "haskell-coffee";
        version = "0.1.0.2";
-       sha256 = "1iz94kyq1xn3v89aay282qglv2sh41b04p8vaygwm22v1g4b4kk7";
+       sha256 = "674eb2c80b5b88ca9f571b5d025620508b4d1f164878a512dac3f680fd24e9c7";
        libraryHaskellDepends = [ base process ];
        description = "Simple CoffeeScript API";
        license = stdenv.lib.licenses.gpl3;
@@ -62999,7 +63211,7 @@ self: {
      mkDerivation {
        pname = "haskell-compression";
        version = "0.1.1";
-       sha256 = "0d0rfkl6ladsl0s033ny390nk5qkiwddg84di0d8hgxblqsxj11m";
+       sha256 = "3504d935a6ab3f881a888da0d71a8f139769411ade8e0134a0ba296ae8741934";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63017,7 +63229,7 @@ self: {
      mkDerivation {
        pname = "haskell-course-preludes";
        version = "0.0.0.4";
-       sha256 = "1r0vhaxcsszrcqnw70gz8xpfrqddmxf9kpka63gix1bjic4alzjn";
+       sha256 = "567eaa088b72851edf306ade995cafade1ec6e47ff81c32d66f96bcdba821be4";
        libraryHaskellDepends = [ base deepseq ];
        jailbreak = true;
        description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality";
@@ -63033,7 +63245,7 @@ self: {
      mkDerivation {
        pname = "haskell-docs";
        version = "4.2.5";
-       sha256 = "09xagxs0br6781flp430syfn6yv36ri0y1yki8cakrn7ak722fq2";
+       sha256 = "023b21ce54c7e6a9188ad3070f6236637b639dd760904b5d40c7e405747faa27";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63059,7 +63271,7 @@ self: {
      mkDerivation {
        pname = "haskell-formatter";
        version = "1.0.0";
-       sha256 = "0mrcd57g3pnn11smgak51pikxxf5zsi7h06f270pmf2r1vv2977b";
+       sha256 = "eb9c24f60e59b87ac111ce0078a2fec5f53ee30d65aa577508d6def14e692c57";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63089,7 +63301,7 @@ self: {
      mkDerivation {
        pname = "haskell-ftp";
        version = "0.1.0.1";
-       sha256 = "0736kh5q63qgvq23k5w06ds9538cwymk64i5wdycxh35lz64qaip";
+       sha256 = "372a4ccca765c0ce7ce3251233abe70c8d92743380973904de0f0f830b9c661c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63116,7 +63328,7 @@ self: {
      mkDerivation {
        pname = "haskell-generate";
        version = "0.2.3";
-       sha256 = "07j0z9jxxgbxfxz9bpy5w8nphrqsl5wyq1jysfhypfi7v87nv9an";
+       sha256 = "56a56d0fda27baeba1d35e06ec79a11a67782de2c5df957e777dbdde65fa401e";
        libraryHaskellDepends = [
          base containers haskell-src-exts template-haskell transformers
        ];
@@ -63131,7 +63343,7 @@ self: {
      mkDerivation {
        pname = "haskell-in-space";
        version = "0.1.1";
-       sha256 = "1rcz5s3xa0f9yalyqb540l47bzql8p18y2mmax1zr92m7sh7m274";
+       sha256 = "e4887aa03e55a4fc4357b50a8fc24514ff750805a42ceca9f2c901d5872e9fe5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base HGL random ];
@@ -63146,7 +63358,7 @@ self: {
      mkDerivation {
        pname = "haskell-lexer";
        version = "1.0";
-       sha256 = "11jv30msg4rym73lk6j21ky2510c3av8qxk5p4z63j4m283w9l46";
+       sha256 = "86d0c4071295c8613eb965768cb61a0c8422fc0c429a49c7a93e93a72b185b86";
        libraryHaskellDepends = [ base ];
        description = "A fully compliant Haskell 98 lexer";
        license = stdenv.lib.licenses.bsd3;
@@ -63157,7 +63369,7 @@ self: {
      mkDerivation {
        pname = "haskell-modbus";
        version = "0.3.2";
-       sha256 = "08bcw7g84509rak9xqn2g4pr1mk3a2clikgfdiafrsr7lff16gyf";
+       sha256 = "ce3f139ca327ebec546ceecd48995063d6902f79c2e29ea6ca091482dee16c21";
        libraryHaskellDepends = [ array base bytestring cereal ];
        testHaskellDepends = [ array base bytestring cereal hspec ];
        homepage = "http://www.github.com/jhickner/haskell-modbus";
@@ -63172,7 +63384,7 @@ self: {
      mkDerivation {
        pname = "haskell-mpi";
        version = "1.4.0";
-       sha256 = "1aw8jjvysdf3vsf6rcxnvwnqpiqmfrp88gryngakjjkxwzzh5an0";
+       sha256 = "c0aa02ffe77d4a39d5b33e3f846e7615c78b2ddfb6b36c9cdec335edb79488ab";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63197,7 +63409,7 @@ self: {
      mkDerivation {
        pname = "haskell-names";
        version = "0.5.3";
-       sha256 = "066mh4qgldh8nspinm97695zdhw5hkpz9mmrnc2a0y0wblggq5sm";
+       sha256 = "5517fc1e5d1c78a004b3b9d6f4ef8485c3f64b3227551bafb60836fa3081d518";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers data-lens-light filepath
          haskell-packages haskell-src-exts hse-cpp mtl tagged transformers
@@ -63224,7 +63436,7 @@ self: {
      mkDerivation {
        pname = "haskell-neo4j-client";
        version = "0.3.1.4";
-       sha256 = "171ar3vfhgijy79p0a4wqm0b8bisgqf8iqzm17yb5pwirlfm5hi6";
+       sha256 = "26c2521dcd91dfb2fc09f5e3881c7e3a2eb440c59c2870d3f1323ee8f6c82a9c";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default hashable HTTP
          http-conduit http-types lifted-base mtl network-uri resourcet
@@ -63249,7 +63461,7 @@ self: {
      mkDerivation {
        pname = "haskell-openflow";
        version = "0.0.0.1";
-       sha256 = "1zrzkvw4i7jaz74g63k1yj1v2i9lsxgr8zj2b6p3srag1dwgnmkd";
+       sha256 = "6d56fb780b4f653dae59427e945fd73445b183f4610ef3c8f94a9e48f89e3fff";
        libraryHaskellDepends = [
          base bytestring cereal network network-info
        ];
@@ -63268,7 +63480,7 @@ self: {
      mkDerivation {
        pname = "haskell-packages";
        version = "0.3";
-       sha256 = "199srg8k8j2nirs83hx04r1hkwv83h4k73z1sji547f5w0zwnws0";
+       sha256 = "4073cb3fe0c51d52a2d4e18f33091c68f3094326a0c381748e564834d1cb3aa5";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers deepseq directory filepath
          haskell-src-exts hse-cpp mtl optparse-applicative tagged
@@ -63287,7 +63499,7 @@ self: {
      mkDerivation {
        pname = "haskell-pdf-presenter";
        version = "0.2.5";
-       sha256 = "11y3n7ldnlx8vq2qb42kn8fg6ikq42x28bm46ivydx7h3z0zf5s3";
+       sha256 = "4317f7c11ff0f4e67734a42e24ba207846f31cb253908505dea853dbe8b1c387";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -63313,7 +63525,7 @@ self: {
      mkDerivation {
        pname = "haskell-platform-test";
        version = "2010.2.0.0";
-       sha256 = "0ki6mppxk9a6lm0miagr4mpsbjx66gizc3qxl5vfp7wvbc977bwk";
+       sha256 = "93af73125b9b9feb76a11d0ff6e333a6cba56f25f9a95841a546a5d9efad264e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -63339,7 +63551,7 @@ self: {
      mkDerivation {
        pname = "haskell-plot";
        version = "0.1.0.0";
-       sha256 = "0dwa2kz3sbnhc99kzhspf4hhid9q0c8irq8m9vr95l9kbq45avpi";
+       sha256 = "f16e55085e33d192f24e15e11c110338b508217157c33f5362d02e3dfe148a37";
        libraryHaskellDepends = [
          base Chart Chart-cairo Chart-gtk colour data-default lens
          math-functions vector
@@ -63355,7 +63567,7 @@ self: {
      mkDerivation {
        pname = "haskell-qrencode";
        version = "1.0.4";
-       sha256 = "1cq6fpz4vsx1kfnxnxnqz0pi5nzfg86s76vd0hcqvyqxnqbcd8hj";
+       sha256 = "12a2c616b61dfb8d19046d9ba30d7aeedb122ff8d876dbad9ba1eb4dfe7506b3";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ qrencode ];
        homepage = "https://github.com/jamessanders/haskell-qrencode";
@@ -63370,7 +63582,7 @@ self: {
      mkDerivation {
        pname = "haskell-reflect";
        version = "0.9";
-       sha256 = "116vs8p9j0py3rxh0m53nanwsa99ga0lg9z3avn5r0clmpak9zyn";
+       sha256 = "d6ff34d5ad94815cec56e3a747817a2929cdadb2a354007b1efe02992ed2db84";
        libraryHaskellDepends = [
          base containers hint MonadCatchIO-mtl mtl parsec template-haskell
          transformers
@@ -63385,7 +63597,7 @@ self: {
      mkDerivation {
        pname = "haskell-rules";
        version = "0.1.0.1";
-       sha256 = "03d8c1gnxd923f3fqqw06w3ibnd20llfgd7s5jgkscc872i5ghz6";
+       sha256 = "e6c357a23888313d9f2cfab4e72805a2d91507378063ec861b22b56e5f60a80d";
        libraryHaskellDepends = [ base syb ];
        description = "A DSL for expressing natural deduction rules in Haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -63399,7 +63611,7 @@ self: {
      mkDerivation {
        pname = "haskell-spacegoo";
        version = "0.2.0.1";
-       sha256 = "0g6ximrv5jwibklkyr74vy3qkx8mv4xbpc7f6w1qg9gnlylzmcqy";
+       sha256 = "1eb3faa9a7f6a5870337eeb0bb3ad915f58987dfe4643fe95c91cbb2738ddd3c";
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra mtl pretty pretty-show
          text vector vector-space
@@ -63413,7 +63625,7 @@ self: {
      mkDerivation {
        pname = "haskell-src";
        version = "1.0.2.0";
-       sha256 = "19lilhpwnjb7cks9fq1ipnc8f7dwxy0ri3dgjkdxs3i355byw99a";
+       sha256 = "2a25ee5729230edddb94af8d9881efbc1d8798bd316097f4646749cb2fa491a6";
        libraryHaskellDepends = [ array base pretty syb ];
        libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
@@ -63428,7 +63640,7 @@ self: {
      mkDerivation {
        pname = "haskell-src-exts";
        version = "1.15.0.1";
-       sha256 = "0xp5i06c478vn5m504ax5dfa7p5zc0kflbdkm2ijdzc779lpbx45";
+       sha256 = "85f475693a87fd26a3a8b32dea2660bfdca35c2b5d11506ab11b1dc20c88e576";
        libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
        libraryToolDepends = [ happy ];
        testHaskellDepends = [
@@ -63448,7 +63660,7 @@ self: {
      mkDerivation {
        pname = "haskell-src-exts";
        version = "1.16.0.1";
-       sha256 = "1h8gjw5g92rvvzadqzpscg73x7ajvs1wlphrh27afim3scdd8frz";
+       sha256 = "3f3bd41ad3a346a78e80195eca83de529d3ece63fa7edcd4df3b8bf40a970fc1";
        libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
        libraryToolDepends = [ happy ];
        testHaskellDepends = [
@@ -63467,7 +63679,7 @@ self: {
      mkDerivation {
        pname = "haskell-src-exts-qq";
        version = "0.6.1";
-       sha256 = "0cblv8fk369236szwzwmyaxaa8fkwia5r50zz5ghfbglb2xvwsmn";
+       sha256 = "b66abebb58f42d075ff91f945c54e4d321a5baf2957ffeb5192299311dda7431";
        libraryHaskellDepends = [
          base haskell-src-exts haskell-src-meta syb template-haskell
        ];
@@ -63482,7 +63694,7 @@ self: {
      mkDerivation {
        pname = "haskell-src-meta";
        version = "0.6.0.10";
-       sha256 = "0flcyimibz4flq66isshn2zsmzlly6sja6gfb0a0xn4ns4xpwpy1";
+       sha256 = "c15f7e3bd196d80e1458ee1925b5f194feaabfb050eb680ca68efc156bf48c3a";
        libraryHaskellDepends = [
          base haskell-src-exts pretty syb template-haskell th-orphans
        ];
@@ -63497,7 +63709,7 @@ self: {
      mkDerivation {
        pname = "haskell-src-meta-mwotton";
        version = "0.1.0";
-       sha256 = "04f0p3jxmvw1kqygvxihdr4dirapi6bdv2w213c2s771xbnx88nn";
+       sha256 = "d622d4edeae11c2dd808828bdd968957e5d8486e30f6fd3c9e81efdae5b8c011";
        libraryHaskellDepends = [
          base containers ghc-prim haskell-src-exts pretty syb
          template-haskell
@@ -63517,7 +63729,7 @@ self: {
      mkDerivation {
        pname = "haskell-token-utils";
        version = "0.0.0.6";
-       sha256 = "14nzlw9vqnp70xcwan6mjsr318p2sky5nsyqxw5iivggy7qspp9r";
+       sha256 = "39ddabf1f1efed180befd86b5bfcd4e2a230b296d558c55907e75abc13a7df92";
        libraryHaskellDepends = [
          base containers dual-tree ghc ghc-paths ghc-syb-utils
          haskell-src-exts monoid-extras mtl pretty rosezipper semigroups syb
@@ -63538,7 +63750,7 @@ self: {
      mkDerivation {
        pname = "haskell-type-exts";
        version = "0.1.0";
-       sha256 = "051lsg9j3dgkr2akannfaddawdhybvsnm6x6xafmdmwn31v73z98";
+       sha256 = "28fd71761896d7569deaa69b6af55e1e36ae5a53ce5a3595c8f3b521d3d33414";
        libraryHaskellDepends = [
          base containers haskell-src-exts pretty
        ];
@@ -63553,7 +63765,7 @@ self: {
      mkDerivation {
        pname = "haskell-typescript";
        version = "0.1.0.0";
-       sha256 = "0fv533nac6dlawgffr1kvn4xpv63hdcb4wgyqbbg2s6dg9a2hw38";
+       sha256 = "687028547acd68f1d6c2fe71b25883c3ecdb89dd3364e71e57b419a6ec18653b";
        libraryHaskellDepends = [ base process ];
        jailbreak = true;
        description = "Simple TypeScript API";
@@ -63565,7 +63777,7 @@ self: {
      mkDerivation {
        pname = "haskell-tyrant";
        version = "0.4";
-       sha256 = "1pqh1v0klpi8iq882l5gk0fsf87kabq6rw1wjwkiq6fvw8cc1l97";
+       sha256 = "27d1c018e2db191c27973cf06cf052f320a71d98af5081108e285e3ac10e10df";
        libraryHaskellDepends = [ base binary bytestring network ];
        homepage = "https://github.com/PeterScott/haskell-tyrant";
        description = "Haskell implementation of the Tokyo Tyrant binary protocol";
@@ -63580,7 +63792,7 @@ self: {
      mkDerivation {
        pname = "haskell-updater";
        version = "1.2.9";
-       sha256 = "0nd8xjlyr8zjrqj9mw6xpn3rxsj9vpb8khc6hq6dc5agmldl9z7a";
+       sha256 = "eafc441bad4f15d60c8686c189d6dd49ea9e87bdddf09a24cef2a3eca9eca859";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -63598,7 +63810,7 @@ self: {
      mkDerivation {
        pname = "haskell-xmpp";
        version = "1.0.2";
-       sha256 = "1z4x4mn0vry8mwq6ily668ignmf4s9m92fmga15dr83y7aq5wd59";
+       sha256 = "a9345eb03a7ea0dc4a50af3a916ad2c455fb2232c6d36830afc8e70d6c259dfc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63616,7 +63828,7 @@ self: {
      mkDerivation {
        pname = "haskell2010";
        version = "1.1.2.0";
-       sha256 = "1s0avb08b5iwaym42jz783mk1az9kmjf3zmhfag0kzdw10qcnz4m";
+       sha256 = "957ccb3008bcfd099e72b0fee1649de9ab30eb40e74b41aa573c9685c0da0ae8";
        libraryHaskellDepends = [ array base ghc-prim ];
        jailbreak = true;
        homepage = "http://www.haskell.org/onlinereport/haskell2010/";
@@ -63632,7 +63844,7 @@ self: {
      mkDerivation {
        pname = "haskell98";
        version = "2.0.0.3";
-       sha256 = "1450bgkn7gasj6cmkxn4afs828fc9slrrp2lqsqs3jlryr94cpdx";
+       sha256 = "bd5d4652f699caa1b1c654dc9ca94ecc2181b453c4f65999915abd63e75ba090";
        libraryHaskellDepends = [
          array base directory old-locale old-time process time
        ];
@@ -63650,7 +63862,7 @@ self: {
      mkDerivation {
        pname = "haskell98libraries";
        version = "2.0.0.2";
-       sha256 = "1dcjwkvggvwrs8lv2pcxcz2kcz179nbca9q16mbk90qnznysr8i8";
+       sha256 = "28a2acbdfd16833457350127c5964d277c36c5679d5db129d299eff7f6e492b5";
        libraryHaskellDepends = [
          array base directory old-locale old-time process time
        ];
@@ -63667,7 +63879,7 @@ self: {
      mkDerivation {
        pname = "haskelldb";
        version = "2.2.4";
-       sha256 = "0f8c9bz25wzsc65czv0chxk93w947824axl7p821fljlrykcm45y";
+       sha256 = "be90caa6cf54521704ba877645043a24f19166870ceccf8a61faf322fe4a0c39";
        libraryHaskellDepends = [
          base containers directory mtl old-locale old-time pretty time
        ];
@@ -63681,7 +63893,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-connect-hdbc";
        version = "0.1.0.0";
-       sha256 = "1l9ifff33xbgdr6fahnzz00nb7va2r0i3pncjd1j8bbnyya1w2kl";
+       sha256 = "740a1e94f7762d244393ccde1141166a9f6501f8df42e54c6e6ff5319c7331d1";
        libraryHaskellDepends = [ base containers haskelldb HDBC ];
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HDBC session for HaskellDB";
@@ -63696,7 +63908,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-connect-hdbc-catchio-mtl";
        version = "0.1.0.0";
-       sha256 = "1ssg96r7cphakis5c494m5lc3m5ksn1w03k554p0qx2kl1g885xw";
+       sha256 = "bc17845ea053740c2e29650ec083d5b3d4c168a9241156749c0a5e76b2494feb";
        libraryHaskellDepends = [
          base haskelldb haskelldb-connect-hdbc HDBC MonadCatchIO-mtl mtl
        ];
@@ -63713,7 +63925,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-connect-hdbc-catchio-tf";
        version = "0.1.0.0";
-       sha256 = "16qab88ryli9jbinw9frhhzl0ph09dinzx40x9cr9a3db7wvphw4";
+       sha256 = "84c3bbf9596da89459ea80f46f634b005e403f84d9256ee39229529f115a0a9b";
        libraryHaskellDepends = [
          base haskelldb haskelldb-connect-hdbc HDBC
          MonadCatchIO-transformers transformers
@@ -63731,7 +63943,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-connect-hdbc-catchio-transformers";
        version = "0.1.0.0";
-       sha256 = "0hbb6klc4azz6f5wi39l5736xq0b7wgja35fk9vmmn0lnf6iv5j7";
+       sha256 = "47961d8db314d85a779aae0c251f3f0be06ec629348dc88b33ff2bc2e8346b41";
        libraryHaskellDepends = [
          base haskelldb haskelldb-connect-hdbc HDBC
          MonadCatchIO-transformers transformers
@@ -63749,7 +63961,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-connect-hdbc-lifted";
        version = "0.1.0.0";
-       sha256 = "1ysnha7bmrd3accrnbswr17nv6j4pj1mbshcphjkhdffcvxb82wa";
+       sha256 = "8a0bb4fa66ce353825bc0cea5583bc449a6d4fc85c2f9b1953a3e5ba8e8256fb";
        libraryHaskellDepends = [
          base haskelldb haskelldb-connect-hdbc HDBC lifted-base
          monad-control transformers-base
@@ -63765,7 +63977,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-dynamic";
        version = "1.0.0";
-       sha256 = "0wdiywxjara2fwb1d548f9s0vcjxm1c38v4s05xqm5bz141l7a6a";
+       sha256 = "caa84303097f958a7b019a6c3458a85db20d747288941616774265253bf7b171";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base haskell98 haskelldb mtl plugins ];
@@ -63784,7 +63996,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-flat";
        version = "1.0.1";
-       sha256 = "0f75am17zfpbxhg951gnjqmdfgi1q7byhw1xv1rz4k36kcg623x1";
+       sha256 = "a10f611e9b664cf273d83d70e8d7c1213ed72a96f685921eecebba7f4255e538";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63803,7 +64015,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-hdbc";
        version = "2.2.2";
-       sha256 = "06vzzya6k1l74bm5ky7cbn6ch1wx5j5phnhi49bw17y3q632vd3f";
+       sha256 = "6eb42d86c1c39fc05722115a788b2c9d07c88c5decf859ea2287866994ff7f1b";
        libraryHaskellDepends = [
          base containers convertible haskelldb HDBC mtl old-time
        ];
@@ -63820,7 +64032,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-hdbc-mysql";
        version = "0.1.1";
-       sha256 = "0nn8jjrsi62xqws00izh3qi2shlxa58l37q91x1xnd9fig7j0ai2";
+       sha256 = "222a20cf8b2e35db430f099f4151519d422d221ef0470034c75d98a8b394c85a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63839,7 +64051,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-hdbc-odbc";
        version = "2.1.2";
-       sha256 = "1y87iiil6k9ycsni70kvfcq50fiws8aqnhmk4018f6k6q1bx7q6p";
+       sha256 = "d7e0d357c0661a870220b3428b15d23c3a5030737b8213ad663e4d43638c07f9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63858,7 +64070,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-hdbc-postgresql";
        version = "2.1.2";
-       sha256 = "08cv3y22zvf0pf1cs57vrma3vp3b5fzzs6nsnvcnfnzsvacanh7g";
+       sha256 = "ef40ab98dafa5b67d9b6da1afdbf2b6bdc3d54cdfb14cd82bbc0ed2f841f9b21";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63878,7 +64090,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-hdbc-sqlite3";
        version = "2.1.2";
-       sha256 = "0qdp2lzhk8ywb9pmppvvmwqkaagvrnyjiglahy6mb7rdfq89bas6";
+       sha256 = "46ab9510762d9f558d878abe28bdcdfb293531af7bdf5b6f5adca3093f15b761";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63895,7 +64107,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-hsql";
        version = "1.0.0";
-       sha256 = "0j1aqix21pqcsw7skl897pd1ir6hg836g4zb2h5338h4gih6blx0";
+       sha256 = "a0d365607c04a2310a14eb9367067ad0e418da3d09d1a90fd70cdf207ac42a48";
        libraryHaskellDepends = [ base haskelldb hsql mtl old-time ];
        jailbreak = true;
        homepage = "https://github.com/m4dc4p/haskelldb";
@@ -63911,7 +64123,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-hsql-mysql";
        version = "1.0.0";
-       sha256 = "09rlrv9jb2hw7jypglfqhgfx3b0bcp68iq2wk4jfqw74m4d34xkm";
+       sha256 = "7576321aa9e470ec24995ce088cc650bacd1dd83d8d177bd3c1c8a25d3ce3427";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63931,7 +64143,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-hsql-odbc";
        version = "1.0.0";
-       sha256 = "18r7b4x43729c9l34gvbhgw2fwgq7llcb6cfwcp077f9ia0kgn6a";
+       sha256 = "cad837818ac99d032ee38e99c5283df87127f8836b3f326862499c413a5927a3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63951,7 +64163,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-hsql-oracle";
        version = "1.0.0";
-       sha256 = "0j26gm9bibnj2jl5fs3sf2m8b5gl05brf55bzxnxa1cb78dgbpx9";
+       sha256 = "a9dff51a3a8b05d56dffab14975701f49585aa707a6857a814d2aeb8527d4648";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63971,7 +64183,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-hsql-postgresql";
        version = "1.0.0";
-       sha256 = "1d1vgw9q95h864gfv0n2gmdvnvkxjg4pdjmfpfj899xx1s0a0vsv";
+       sha256 = "5b6fa0800ebda784a4bbaeca76c9937d6ebb5b7dc282ed1e31089684137f3bb4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63991,7 +64203,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-hsql-sqlite";
        version = "1.0.0";
-       sha256 = "0hs8ympicys4p6lpfcvny3c183v4s25lk990yb4fzrpv0hy3bhhw";
+       sha256 = "1cc2353c04fbe6efc8f220a5498bd0640f14d8f0763377a9b9447b166ff54843";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64011,7 +64223,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-hsql-sqlite3";
        version = "1.0.0";
-       sha256 = "11xlr2f7203wxg17696yjqgyzckavqjazc9brmdqpbrnplaqdrc5";
+       sha256 = "85e58615bd36af8b5bcd2bb1af24de6ab2ef1f96de2473c2eb7c00719cc8b487";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64029,7 +64241,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-th";
        version = "2.1.0";
-       sha256 = "12whvz0qy9lqk1frfl5px9lhr1nwy519vj2z9c3g8nqjzscwzayb";
+       sha256 = "cbabcf99fe125bf4064b5fc89d42f1dc860c69eab750975d9898268fc1df908b";
        libraryHaskellDepends = [ base haskelldb mtl template-haskell ];
        jailbreak = true;
        homepage = "http://trac.haskell.org/haskelldb-th";
@@ -64042,7 +64254,7 @@ self: {
      mkDerivation {
        pname = "haskelldb-wx";
        version = "1.0.0";
-       sha256 = "01652m0bym80400navqlpdv5n0gfgnfzd1d0857f3kd13ksqk2hy";
+       sha256 = "1e8a89f51ca1cde14e41a085f69d7dee015b76bb146f6501200055bf4015c504";
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for WXHaskell";
        license = stdenv.lib.licenses.bsd3;
@@ -64058,7 +64270,7 @@ self: {
      mkDerivation {
        pname = "haskellscrabble";
        version = "1.1";
-       sha256 = "1wb9ncpzsacvwk8gmh8gzxm54viwlzsikj05lk14gpyp8xwhl54h";
+       sha256 = "90140a7947d7df47c2a405c819f5a73c6e526aff0fc1fad0e49b29fd2fb369f1";
        libraryHaskellDepends = [
          array arrows base containers errors mtl parsec QuickCheck random
          safe semigroups split transformers unordered-containers
@@ -64081,7 +64293,7 @@ self: {
      mkDerivation {
        pname = "haskellscript";
        version = "0.2.3";
-       sha256 = "0jrvvbpx35dhrwvknrxcwg1j1yi0mwzrnzrr2hsxja21drrqklf3";
+       sha256 = "c3d189736e4128d93514397f9b3faf20fa20c3e3ac673b37cfb095d1efda3b4b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -64101,7 +64313,7 @@ self: {
      mkDerivation {
        pname = "haskelm";
        version = "0.1.12.0";
-       sha256 = "1bzp79fcq6gxy8pvspw4q71iakzvrbdwr3vjahd698ymfbj5ji8y";
+       sha256 = "1e4559e472d5a3641a54728fccdbcafb4f15c3c1845fbd2ff2fd19cc5c3af7af";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64131,7 +64343,7 @@ self: {
      mkDerivation {
        pname = "haskgame";
        version = "0.0.6";
-       sha256 = "061dhk7d9d8mnb1rs7077q383sqlby8s31ips8jjadkkhyxi5lvz";
+       sha256 = "7fd312bb8773362525d23786a1915f14eb81063e071c9dc3b215b5d4ce842d18";
        libraryHaskellDepends = [ base containers haskell98 SDL SDL-ttf ];
        homepage = "http://haskell.org/haskellwiki/HaskGame";
        description = "Haskell game library";
@@ -64146,7 +64358,7 @@ self: {
      mkDerivation {
        pname = "haskheap";
        version = "0.1.2";
-       sha256 = "1c2fgqq2i3s2v0xi04y8y6li41ilvi50zlf2ba843my9s3i8njqr";
+       sha256 = "194b8be2d0c9d741905ac2d10f4adc340612a9f1c813103bd8428f28307e4eb0";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types network old-locale
          text time unordered-containers
@@ -64166,7 +64378,7 @@ self: {
      mkDerivation {
        pname = "haskhol-core";
        version = "1.1.0";
-       sha256 = "0vlzybbplqggvgnj61yl0g2rak2qbsp7hly9srgr6wd6qm9l1nxx";
+       sha256 = "bddb4053c5a671935fd6c95378ae5e584c95c503d40723eddbef617ad7f29f6e";
        libraryHaskellDepends = [
          acid-state base containers deepseq filepath ghc-prim hashable mtl
          parsec pretty safecopy shelly template-haskell text text-show
@@ -64187,7 +64399,7 @@ self: {
      mkDerivation {
        pname = "haskintex";
        version = "0.5.0.3";
-       sha256 = "0gbsr3b832rb3gk6gx3s1lrjpv4kqcf62cz3wgjj5riscq1vg73k";
+       sha256 = "739cb703663ae622e5e3e333611cc393ec2b330d7af467e61b2b8b81d6c87a3d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64207,7 +64419,7 @@ self: {
      mkDerivation {
        pname = "haskmon";
        version = "0.1.1.0";
-       sha256 = "1xsp0jd7n5rbky4giy3dik2hcsnkzwlj2mdr8v3ahr17cqj3sm74";
+       sha256 = "e4543d24662764a8c646b9552129ffd36a06c58c6df8f8889f2b177b9a0457f7";
        libraryHaskellDepends = [
          aeson base bytestring containers http-streams io-streams old-locale
          time vector
@@ -64227,7 +64439,7 @@ self: {
      mkDerivation {
        pname = "haskoin";
        version = "0.1.0.2";
-       sha256 = "0l3h2wvi56k0dcfjambqyjrd45hb7bj0brp8nzrrcfn7fbpyjg8c";
+       sha256 = "0c3de9ef72c73a96f3b7e8e605e43a0b16d2b2f47855251d6b609a1237177050";
        libraryHaskellDepends = [
          aeson base binary byteable bytestring containers cryptohash deepseq
          either json-rpc mtl pbkdf split text
@@ -64252,7 +64464,7 @@ self: {
      mkDerivation {
        pname = "haskoin-crypto";
        version = "0.0.1.1";
-       sha256 = "00argpj3qkaj8dcxbd46xsi1abjgr394li6ygyvna55508r1hd79";
+       sha256 = "e934183202a51465b77fde444ad2c84f2e15a2ee86b4d55943524d3ce47d5901";
        libraryHaskellDepends = [
          base binary byteable bytestring containers cryptohash haskoin-util
          mtl QuickCheck
@@ -64277,7 +64489,7 @@ self: {
      mkDerivation {
        pname = "haskoin-protocol";
        version = "0.0.1.1";
-       sha256 = "0r15csyylg5vd95z0spl5wkv6r8w7lpi983alsvlnkhv4dqnrg2v";
+       sha256 = "5bbc6c71231b4e4bb7a66aa0142f3d1c65b3272ff46af04b6abb3ceabd662564";
        libraryHaskellDepends = [
          base binary bytestring haskoin-crypto haskoin-util QuickCheck
        ];
@@ -64300,7 +64512,7 @@ self: {
      mkDerivation {
        pname = "haskoin-script";
        version = "0.0.1";
-       sha256 = "18lw5hxwvj4ichw1k4a35hjih7h0hd24khvl4m0yf2cq12m2gl11";
+       sha256 = "21d027aa089809e7412574c3494483001e18252c439119386491c8cd3b2c9ca2";
        libraryHaskellDepends = [
          base binary bytestring haskoin-crypto haskoin-protocol haskoin-util
          mtl QuickCheck
@@ -64325,7 +64537,7 @@ self: {
      mkDerivation {
        pname = "haskoin-util";
        version = "0.0.1.1";
-       sha256 = "0hh3vavqsp8pafw4nrv9py1kqcc1yx52zr80xsqzqjlsxq04fgfw";
+       sha256 = "dc3d4700ee9a4afcb1ee00e52f4af781313c83bf69674bb853175d8db7da0342";
        libraryHaskellDepends = [
          base binary bytestring either mtl QuickCheck
        ];
@@ -64351,7 +64563,7 @@ self: {
      mkDerivation {
        pname = "haskoin-wallet";
        version = "0.0.1";
-       sha256 = "18q110q93qc00mqzprs5wprzrl0jfw5fjpli73n99knqb127aq5s";
+       sha256 = "ba60754458d8ce94ec38915ee90a7712d0fcf3e545e7fb710580e191300801a3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64388,7 +64600,7 @@ self: {
      mkDerivation {
        pname = "haskoon";
        version = "0.3.1.1";
-       sha256 = "1rf5w1mvpsiqim1h5hh6s2cxzh3c5gm1k3n6z4h2ryc1s7m2bl9l";
+       sha256 = "34d125ead181f92c20f9c68e19ea2b6cc0df99d006c202438d38eabb6be0c5e5";
        libraryHaskellDepends = [
          base bytestring cgi directory fastcgi filepath hslogger hsp hsx
          MaybeT MissingH mtl network regex-posix safe utf8-string
@@ -64405,7 +64617,7 @@ self: {
      mkDerivation {
        pname = "haskoon-httpspec";
        version = "0.5.0.1";
-       sha256 = "059hywia5fa15j2dpbzvnvjzv55bzgivy3ddxcrdskd85zx7lx6z";
+       sha256 = "df747afa2fa84ddd32ebad0dbfe3fbab94fde5b6fbafdb842c41b9a222f73015";
        libraryHaskellDepends = [
          base bidispec bytestring haskoon hslogger HTTP httpspec mtl network
        ];
@@ -64422,7 +64634,7 @@ self: {
      mkDerivation {
        pname = "haskoon-salvia";
        version = "0.4.0.2";
-       sha256 = "0d0s0zd9gr3xbssyk62l7w507prjnyak81czhnd6fgbfqx82d6hk";
+       sha256 = "139a2650c76e3d679a859f053495b732df030a3f5498e9b55e7de497da071a34";
        libraryHaskellDepends = [
          base bytestring cgi fclabels haskoon hslogger HTTP monads-fd mtl
          network salvia salvia-protocol transformers
@@ -64440,7 +64652,7 @@ self: {
      mkDerivation {
        pname = "haskore";
        version = "0.2.0.5";
-       sha256 = "0zvr7hwxnv01g626617yv7f0vwpmyqvlwbyc6yhb2mrlfqwdgbd0";
+       sha256 = "a0add738763457b1a037cc2f4e37f6f5f20ddcd9fe04638479016cdb393c797f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64462,7 +64674,7 @@ self: {
      mkDerivation {
        pname = "haskore-realtime";
        version = "0.2";
-       sha256 = "0fhlfivp44py93gjlqrp370cjkvi0g79p156vayylds128hgpi5f";
+       sha256 = "aec4fb20124137eabddaa6849bce03714fc9c01937632adf48fe12727774143a";
        libraryHaskellDepends = [
          base bytestring data-accessor directory event-list haskore midi
          non-negative old-time process transformers unix utility-ht
@@ -64482,7 +64694,7 @@ self: {
      mkDerivation {
        pname = "haskore-supercollider";
        version = "0.3";
-       sha256 = "04rzbk1v8ay569npd8i1xv3aqx55jn8p6cvqpi6774afaxvb0qxy";
+       sha256 = "be63b076574e91734cbc7833739195a574acc6ee21a2766d32c52bb4c35c3f13";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64505,7 +64717,7 @@ self: {
      mkDerivation {
        pname = "haskore-synthesizer";
        version = "0.0.3.1";
-       sha256 = "0bdfn8s7gj39i3rr3xvi9xchi8zczqimb5gnkg0225m2zcfgvmy8";
+       sha256 = "c8d7fd1cfba21621c09bf6955523feeca308594f71f791f38869c87734b2ae2d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64524,7 +64736,7 @@ self: {
      mkDerivation {
        pname = "haskore-vintage";
        version = "0.2";
-       sha256 = "1dpqs7xv3hvhla94v60q0fxfzgr4l3l69s7xc45rh712r9iws66n";
+       sha256 = "d618cd63ca221c980b61fde864e8a024bfefba0318984d92a270c3b1fbd1f8b6";
        libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskore/";
        description = "The February 2000 version of Haskore";
@@ -64539,7 +64751,7 @@ self: {
      mkDerivation {
        pname = "hasktags";
        version = "0.69.1";
-       sha256 = "1rpi9nrxizvzs7cxmykxvkbwd78144gwglk5f0rc19qyb0n80gr4";
+       sha256 = "243f802c581ea7c0327065d2c71f21019dc6d7dc7dfadad9d17fffd8b34df1e6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64556,7 +64768,7 @@ self: {
      mkDerivation {
        pname = "haslo";
        version = "0.1.3";
-       sha256 = "0iizdi98w4k9kdizg9xwm2aca6mnn30frp15f8kyak3i194sk3kl";
+       sha256 = "748ea9490a714ce5277225dcecc0b0b61ac594a8bca7f7639b69128e526c3f46";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time wtk ];
@@ -64573,7 +64785,7 @@ self: {
      mkDerivation {
        pname = "hasloGUI";
        version = "0.1";
-       sha256 = "03avp9yn7ag1dc1wzk07sxkj3krqsrg3n44qcynxw9n1fmvk54lx";
+       sha256 = "9d92327775c126dead6798103b5ed638cf2167d707cccf036be1a9637dba5b0d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -64590,7 +64802,7 @@ self: {
      mkDerivation {
        pname = "hasparql-client";
        version = "0.1";
-       sha256 = "1ln0kdm40y6l8sncrjl0mj9bpd30ffg3msaxyd6fq520ypyws9pm";
+       sha256 = "f526cdfdf54014ec4cf35de93a9e7360b4bb92ac80caccac46d478406a9bc0d2";
        libraryHaskellDepends = [ base HTTP monads-fd network xml ];
        homepage = "https://github.com/lhpaladin/HaSparql-Client";
        description = "This package enables to write SPARQL queries to remote endpoints";
@@ -64603,7 +64815,7 @@ self: {
      mkDerivation {
        pname = "haspell";
        version = "1.1.0";
-       sha256 = "08ihdjgjvr8mgxxw62xwymj1lyl33r6w3mhy9chlw7ijcsy44y21";
+       sha256 = "417842bc66321e4e214b1ed6c14d1e837a1a64f5bc0bc37b7f15e52d9f6c3022";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ aspell ];
        homepage = "https://github.com/otters/haspell";
@@ -64619,8 +64831,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "0.7.3.2";
-       sha256 = "1hhqs4acq8g3331av1lm6l7mmd0sswym278wsn3i0p9khyafpkcm";
+       version = "0.7.4";
+       sha256 = "c7172de28bf9fdecaff4f2f04b16bfc70994555ebe339c9b96995e224e9d694f";
        libraryHaskellDepends = [
          attoparsec base base-prelude either hasql-backend list-t mmorph
          monad-control mtl resource-pool template-haskell text transformers
@@ -64642,8 +64854,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-backend";
-       version = "0.4.1.1";
-       sha256 = "13llpvppkj2k6kfhmqyllm3m2h8g7lvm6gy8y2bnqq8y5jw9xdm5";
+       version = "0.4.2";
+       sha256 = "541a37b288ec5300e9830416a764ef54cce82415b3678c08af526f569e88c20a";
        libraryHaskellDepends = [
          base-prelude bytestring either free list-t text transformers vector
        ];
@@ -64662,8 +64874,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-postgres";
-       version = "0.10.4.0";
-       sha256 = "0s2ng84m7mals3wm3lzmhfd9xlh8fm231gklzjyh6q7z5yw4yszf";
+       version = "0.10.5";
+       sha256 = "114b137e00975e729a19f5d2195da2db7c9c5080fc8a76821c712a9304a6d29a";
        libraryHaskellDepends = [
          aeson attoparsec base-prelude bytestring either free hashable
          hashtables hasql-backend list-t loch-th mmorph placeholders
@@ -64688,7 +64900,7 @@ self: {
      mkDerivation {
        pname = "hasql-postgres-options";
        version = "0.1.4";
-       sha256 = "19jsi8r63phyjcwgvbbs30idl944dnl0iw15i0q2d501sa51ksf4";
+       sha256 = "c4e9198ad2019426308825f008a86d8424da22187aadfd38931ede61328a5aa6";
        libraryHaskellDepends = [
          base-prelude hasql-postgres optparse-applicative
        ];
@@ -64705,7 +64917,7 @@ self: {
      mkDerivation {
        pname = "hastache";
        version = "0.6.1";
-       sha256 = "0r5l8k157pgvz1ck4lfid5x05f2s0nlmwf33f4fj09b1kmk8k3wc";
+       sha256 = "8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464";
        revision = "2";
        editedCabalFile = "92cea66e7c2d33e62c5caac8eaaf0e716fa6e2146ef906360db4d5f72cd30091";
        isLibrary = true;
@@ -64733,7 +64945,7 @@ self: {
      mkDerivation {
        pname = "hastache-aeson";
        version = "0.1.0.0";
-       sha256 = "0b69ppgs0s8zjkrycz5iyd1wa92wr9wln3dvgzf736pbfhsgv2qi";
+       sha256 = "118bfd3474eb9a71dc7fbb0d4b79ca5c24c543f3b17ce6f3941f69a0dfbdc92c";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers hastache text
          unordered-containers vector
@@ -64750,7 +64962,7 @@ self: {
      mkDerivation {
        pname = "haste";
        version = "0.1.1";
-       sha256 = "1vz36i74l1nnm34nn1rj3v8kprqa2piz3j5f58cccg2gvxl0abnj";
+       sha256 = "d22e0568df4f3cc6182aaec8f1e3150ae73bd11e32076bc9a8d6064a4e34e3ef";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base curl filepath mtl ];
@@ -64770,7 +64982,7 @@ self: {
      mkDerivation {
        pname = "haste-compiler";
        version = "0.5.0.1";
-       sha256 = "14kqrkjhfxzg0gv4v2kzxh938085bmzg426vp2jrhzvf5dzypkh0";
+       sha256 = "00ceeb7f2b6e7f98a5b8db08f27e5d05013412ec7f8a4df603ef7707e5cc7892";
        configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
@@ -64800,7 +65012,7 @@ self: {
      mkDerivation {
        pname = "haste-markup";
        version = "0.0.1.0";
-       sha256 = "02rqm4qjaww2c622bqd1bb2mjb73w2s7d7pwvz94x03npxkf4hn1";
+       sha256 = "c142e266bf76804ed2dffc9e76b4e0e32c59c55aa1e125846182732531a9380b";
        libraryHaskellDepends = [
          base containers directory filepath haste-lib
        ];
@@ -64816,7 +65028,7 @@ self: {
      mkDerivation {
        pname = "haste-perch";
        version = "0.1.0.9";
-       sha256 = "1a92ahmphsr0dgj1jlp2cxpq5yy59b3avw3gzmv0jzrds41p3ic8";
+       sha256 = "88c57103d12d7f0976fd6ff0adc64ac5fb826f67e25219e46b206b782b5422a9";
        libraryHaskellDepends = [ base haste-compiler transformers ];
        homepage = "https://github.com/agocorona/haste-perch";
        description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler";
@@ -64832,7 +65044,7 @@ self: {
      mkDerivation {
        pname = "hat";
        version = "2.9.0.0";
-       sha256 = "05sbgq1mliahdn4qj7flgw7klrm67r2mz7gxs03i6lx6mi3phm9f";
+       sha256 = "2e557847aca6531307d0fd9d5f453ea6663a0f7fd41d89896d50455a037e4b17";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64854,7 +65066,7 @@ self: {
      mkDerivation {
        pname = "hatex-guide";
        version = "1.3.1.0";
-       sha256 = "11wi053g9kybw0qa3wdfccyy0ka3xnnghgamaaf220r8hz49g25y";
+       sha256 = "be8897c8872803219c52553df8aced434de03d63aef1a130e0cbcff446019187";
        libraryHaskellDepends = [
          base blaze-html directory filepath HaTeX parsec text time
          transformers
@@ -64872,7 +65084,7 @@ self: {
      mkDerivation {
        pname = "hath";
        version = "0.2.3";
-       sha256 = "17ijsy0fmvaqq4ql7c2788kk3pi975pbi1g7ijh5fj0ybgxk5dww";
+       sha256 = "9cb732fb5b1e4857a08ce785b86e3929de31274247b04331c158edea80d7329e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -64895,7 +65107,7 @@ self: {
      mkDerivation {
        pname = "hatt";
        version = "1.5.0.3";
-       sha256 = "0dgjia07v489wlk23hg84d1043rh71hl9yg7vdcih2jcj8pn00z4";
+       sha256 = "e403602f924c0a1859dbe7f9446138300f024223e8c12126e509917d808af235";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64918,7 +65130,7 @@ self: {
      mkDerivation {
        pname = "haverer";
        version = "0.3.0.0";
-       sha256 = "1p4llwjab7h2zg10585jp5a5bfrzmmkziq7in164wk15rb2z5y0p";
+       sha256 = "17f8f2c5ca254c4e4cb0f1e0f867ad3fbb5554b9b2a002c2fb029ea524a794dc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64944,7 +65156,7 @@ self: {
      mkDerivation {
        pname = "hawitter";
        version = "0.4";
-       sha256 = "10qg24qkh17l9zqn47g64cg6hp48x7bjbcwigj35zpqcq71s9dxc";
+       sha256 = "acb7a4c3c10cdf5f867c91b325d7e9885c681e23e61d62f14ff4043831110f83";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -64966,7 +65178,7 @@ self: {
      mkDerivation {
        pname = "haxl";
        version = "0.2.0.0";
-       sha256 = "13nd291s04wyyx60cfs7x02dfpm4b9qn73h70c97gjq2s7l7y7qy";
+       sha256 = "1e1f7fe8d102cb771203078e63715aa45ed704e8473b064cf79e13a04312cd8e";
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath hashable HUnit
          pretty text time unordered-containers vector
@@ -64989,7 +65201,7 @@ self: {
      mkDerivation {
        pname = "haxl-facebook";
        version = "0.1.0.0";
-       sha256 = "0m8dycsh51sfrxhmajsaydgima4r0nc60yklv9w26302i176j2aq";
+       sha256 = "5809694e88020c2378da747a60980599a81a5ff34a4b5561cf4e870235f30d55";
        libraryHaskellDepends = [
          aeson async base conduit data-default fb hashable haxl
          http-client-tls http-conduit resourcet text time transformers
@@ -65013,7 +65225,7 @@ self: {
      mkDerivation {
        pname = "haxparse";
        version = "0.3.1.0";
-       sha256 = "12ksmhmk1yns8znh9srqm53q4by8dibdvkd9qhbihiwdyz137y6j";
+       sha256 = "d2f833c2f78d471817c4a9cddd566cc82f8247a938eb04ed47dafa302bac7a8a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65041,7 +65253,7 @@ self: {
      mkDerivation {
        pname = "haxr";
        version = "3000.11.1.1";
-       sha256 = "0a4ad0h45a6jv1x19ss0p6krhq040164cvvaivf0zba5q4ifmffh";
+       sha256 = "d0b9ea22c145ad0fdc8e6a6f464c00046098a7b940eb147ad8d2a84220688a28";
        libraryHaskellDepends = [
          array base base-compat base64-bytestring blaze-builder bytestring
          HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat
@@ -65058,7 +65270,7 @@ self: {
      mkDerivation {
        pname = "haxr-th";
        version = "3000.5";
-       sha256 = "1h1g4r7c5k3rja49ip4m21f2sscn06xjxharnlyazvvs6mzfysif";
+       sha256 = "2e6aef7e357aefaf3cb559c12ebb0196692d5c1095dc98889279ccc24e262fc0";
        libraryHaskellDepends = [ base haxr template-haskell ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haxr/";
@@ -65073,7 +65285,7 @@ self: {
      mkDerivation {
        pname = "haxy";
        version = "1.0";
-       sha256 = "1fzdxk0vl7pd3k1dgxli6f721lfvwpb2zl354fl0zy5gimiky7fs";
+       sha256 = "da1d3f638daff80fa82365d02fd6e5dbd1208e3391f6d7c21ced1ebac1ecedbb";
        revision = "2";
        editedCabalFile = "1dfd6805d921438c33b5388de37716d320af9aff2d8067837f510d43c3cf5940";
        libraryHaskellDepends = [
@@ -65092,7 +65304,7 @@ self: {
      mkDerivation {
        pname = "hayland";
        version = "0.1.0.1";
-       sha256 = "0dpisbqfsay8lwpfihw5fmpzi2ajc8qshsawbr4r6x8indy4kdy0";
+       sha256 = "c0b7497cb3117593495e5c69a831625289f86f7585c3e82ea7c82bedf0d2f136";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65114,7 +65326,7 @@ self: {
      mkDerivation {
        pname = "hayoo-cli";
        version = "0.1.0.4";
-       sha256 = "05wfxpkpxma3ynla3wdgzq0raxqwg21fsa01qqpsh1ib7v462ls0";
+       sha256 = "405361c83e2b06a82fc60128ed82781c779501feaff1a1a8f543d57ee7ed8e17";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -65135,7 +65347,7 @@ self: {
      mkDerivation {
        pname = "hback";
        version = "0.0.3";
-       sha256 = "01wx4dls0ccl0q09hvydjhj0lfpqfd32z76rjgc89p5889czkm5j";
+       sha256 = "b2d4f95942a8dc84d893d99c2f4673f83a0a2494cd6f9800069431a069239d07";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -65156,7 +65368,7 @@ self: {
      mkDerivation {
        pname = "hbayes";
        version = "0.5";
-       sha256 = "1zhjhham5jyfwll8sp3kprp92l4whqfyys4jfl81gpb5igpgz039";
+       sha256 = "6980ffee8b65dd1710759268ef1d869c50916ebe735c8d28e5cecb52158412fe";
        libraryHaskellDepends = [
          array base binary boxes containers directory filepath gamma HUnit
          mtl mwc-random parsec pretty QuickCheck random split statistics
@@ -65175,7 +65387,7 @@ self: {
      mkDerivation {
        pname = "hbb";
        version = "0.4.0.2";
-       sha256 = "1whnsbv04b9hr3dc6a3xzv270q7ygk8x4i20mb092fr98klbk9wn";
+       sha256 = "96a7b9e844293b91c0aa4044d2d17cfe6070c4fe7d28c3dac8302d02f6d216f2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -65192,7 +65404,7 @@ self: {
      mkDerivation {
        pname = "hbcd";
        version = "1.0";
-       sha256 = "1glld44m6h8yfh5h63w9q5isy238j0j312ycx43va1xa80x5r4dq";
+       sha256 = "b8915c3a40aa07b507e9cc8b3024906808af63c1890f030b741e4153096994be";
        libraryHaskellDepends = [ base bytestring Decimal digits split ];
        description = "Packed binary-coded decimal (BCD) serialization";
        license = stdenv.lib.licenses.mit;
@@ -65205,7 +65417,7 @@ self: {
      mkDerivation {
        pname = "hbeanstalk";
        version = "0.2.4";
-       sha256 = "13xcia1nnayhr22zi1wzgn8qs403ib4n2zikpxd3xnzy33yrgbzy";
+       sha256 = "feaf97fd18fedb3e5abf337e61c98a03108d917d9f87f885c8d02b6b838aac8f";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers network
        ];
@@ -65221,7 +65433,7 @@ self: {
      mkDerivation {
        pname = "hbeat";
        version = "0.1.2";
-       sha256 = "1lgsjwwpimvgczzgg2lvnf08hhcsnk5is52rm2lbmilky8ayhxjp";
+       sha256 = "5776e815f293c6baa8a859141dcbb49a418880b39b8af7fe676fd7783997fad1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -65241,7 +65453,7 @@ self: {
      mkDerivation {
        pname = "hblas";
        version = "0.3.2.1";
-       sha256 = "05c2mqhwjq0r8jyaj0cncaxn4n5x27dd8z6lv8g8cdc7r749q59y";
+       sha256 = "3e159cc8c98735861edad47cd4da11bd5862bb629601a9bc441960c921ae8215";
        libraryHaskellDepends = [ base primitive storable-complex vector ];
        librarySystemDepends = [ blas lapack ];
        testHaskellDepends = [ base HUnit tasty tasty-hunit vector ];
@@ -65260,7 +65472,7 @@ self: {
      mkDerivation {
        pname = "hblock";
        version = "0.1.0.2";
-       sha256 = "0g8hj42ir3jcpmwf3pin2k4zdcf5p1f1sx1f8rj380qbyxgdrw3v";
+       sha256 = "7bf0dc5ef70b033464462e741d5cb8c5b1f6c91436dee178bd4c8e1c0591103d";
        libraryHaskellDepends = [
          aeson base blaze-markup bytestring cereal containers deepseq
          hashable path-pieces safecopy text unordered-containers uuid vector
@@ -65282,7 +65494,7 @@ self: {
      mkDerivation {
        pname = "hbro";
        version = "1.4.0.0";
-       sha256 = "08vw5j3a22gszbsjhjp13dkgvxj2875zjsx6w3w7c2dkjg4lijpr";
+       sha256 = "f9ca48c993b30976f8e0a66bf9cb4142f6fd661be14a28f5fafa09a1862c7c23";
        revision = "1";
        editedCabalFile = "331a844037ba6df7831151e45e40223eed66313dabef7dc0285a6e658747b15c";
        isLibrary = true;
@@ -65310,7 +65522,7 @@ self: {
      mkDerivation {
        pname = "hbro-contrib";
        version = "1.4.0.0";
-       sha256 = "0v7qxg1phac5m06raspaq6782iid7rnvkinkji0fs0yjigbblps2";
+       sha256 = "425fbad68bd203ed4094d3c6b96d3e2d46818ec1ea6a950da8852978c3ebf86c";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring classy-prelude containers
          directory glib gtk3 hbro lens monad-control mtl network-uri pango
@@ -65328,7 +65540,7 @@ self: {
      mkDerivation {
        pname = "hburg";
        version = "1.1.2";
-       sha256 = "03gd0hgms5hmjvd1j533357h0gh7mh16vmlbbgdhzad1igq1lcfv";
+       sha256 = "db311af08ba1a90fdb5b8bd66d02ac073e004f19631419da9615165d1f04ed0d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -65345,7 +65557,7 @@ self: {
      mkDerivation {
        pname = "hcc";
        version = "0.0.0";
-       sha256 = "04aczl9mh1gb25kggh2jj043az61gzzhxqfg9gb3lcjr5krrnh4p";
+       sha256 = "97409bf32c59323ad64bcfe10eff7fc17c35089052c0f76611eb055813fd4c11";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring language-c ];
@@ -65360,7 +65572,7 @@ self: {
      mkDerivation {
        pname = "hcg-minus";
        version = "0.15";
-       sha256 = "04g0f4sr7904w3ynyl0gnbyi2sl0z7ziv5q15mfb6c7h0zl25d5r";
+       sha256 = "b9b422e807f030b35c2d01971dfff9806a11fdb20f506ffde004a4933571e011";
        libraryHaskellDepends = [ base colour ];
        homepage = "http://rd.slavepianos.org/t/hcg-minus";
        description = "haskell cg (minus)";
@@ -65374,7 +65586,7 @@ self: {
      mkDerivation {
        pname = "hcg-minus-cairo";
        version = "0.15";
-       sha256 = "002gh8adqzhcjfnqkbcnpzz8qiqbj9zkbk6jj11dnnxjigc4l2q9";
+       sha256 = "090b4ad88bb25bdb4290d2cc357f920b478cfebf96ad89ad930c7edc14824f00";
        libraryHaskellDepends = [
          base cairo colour filepath hcg-minus utf8-string
        ];
@@ -65388,7 +65600,7 @@ self: {
      mkDerivation {
        pname = "hcheat";
        version = "2010.1.16";
-       sha256 = "1fwgnp15kha9qb7iagd8n5ahjjhg194wbva5i436mb57fn86pya2";
+       sha256 = "42f96b9075a7ac6a068945edc5490a0f4a0955b1a83d15cfc249c159c2b58fbb";
        libraryHaskellDepends = [ base mps ];
        homepage = "http://github.com/nfjinjing/hcheat/";
        description = "A collection of code cheatsheet";
@@ -65403,7 +65615,7 @@ self: {
      mkDerivation {
        pname = "hchesslib";
        version = "0.1.0.0";
-       sha256 = "10785d9n87ddln1rvr19wnvcj401x3b53psdcf8vrwfaq930kjrv";
+       sha256 = "3bcb0946c2caf1bc91634ddf51d6e80110c9b6e529e49d83a5ad1d64532be880";
        libraryHaskellDepends = [ array attoparsec base containers text ];
        testHaskellDepends = [
          array attoparsec base containers hlint hspec QuickCheck text
@@ -65423,7 +65635,7 @@ self: {
      mkDerivation {
        pname = "hcltest";
        version = "0.3.7";
-       sha256 = "1hqx0khbxypq4hqq1hq0ybyadd7m6bpd6rzc3zya3w0s7kwk0dgd";
+       sha256 = "ed3530f93c1af0a1fc1fec67d3ee32f5b4a6fcf200c3803124f8fabee0041dc3";
        libraryHaskellDepends = [
          base bytestring directory dlist either filepath free lens mmorph
          monad-control mtl optparse-applicative process random-shuffle split
@@ -65443,7 +65655,7 @@ self: {
      mkDerivation {
        pname = "hcron";
        version = "0.0.0.3";
-       sha256 = "0ckq98aj6fgdgpwyy6ssydp4jazhhfshnalv71h2xx1z80m1ynq7";
+       sha256 = "075b1f2a403ff42e60389b2a0bb583f02b496ef35a1beff97ded3923154a7832";
        libraryHaskellDepends = [
          base bytestring containers directory mtl old-locale pretty process
          random stm time
@@ -65461,7 +65673,7 @@ self: {
      mkDerivation {
        pname = "hcube";
        version = "0.1.1";
-       sha256 = "1h1g05a8wnk2q65mm4mwywxhygr7fs0150q8ml33ik59mcc5v7fr";
+       sha256 = "d99d5d18aba9cc3806ad0883128076273f0f3bf7bc925a8bc1625a8e54012fc0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65480,7 +65692,7 @@ self: {
      mkDerivation {
        pname = "hcwiid";
        version = "0.0.5";
-       sha256 = "0dn19kkd1da9yk6yk8mmpz927d1gsjyip9v4dibsvc1w4v49n94x";
+       sha256 = "9d249bc8263cb0ad576c64a71bbdd42fb423d2bfb5a2e9cdf449b5d0e64cc136";
        libraryHaskellDepends = [ base unix ];
        librarySystemDepends = [ bluetooth cwiid ];
        homepage = "https://github.com/ivanperez-keera/hcwiid";
@@ -65496,7 +65708,7 @@ self: {
      mkDerivation {
        pname = "hdaemonize";
        version = "0.5.0.1";
-       sha256 = "03daf8qb8x0503h5k2vr6r4lyv6fv1a5n6mhykx5872khl81d8ms";
+       sha256 = "baa2161085531c54faf4b01a5b54d8ce6c4f4936798b59e0000574b43072aa0d";
        libraryHaskellDepends = [
          base extensible-exceptions filepath hsyslog mtl unix
        ];
@@ -65512,7 +65724,7 @@ self: {
      mkDerivation {
        pname = "hdaemonize-buildfix";
        version = "0.4.5";
-       sha256 = "15k4z77caa5y1jix4llqdmqpx0j7iv9nx5lk3vc5hs8vl2ax86f6";
+       sha256 = "c619d495a01b6958d81e93966ed38e47827e716d9852d2a30cbe28c5cef96496";
        libraryHaskellDepends = [
          base extensible-exceptions filepath hsyslog mtl unix
        ];
@@ -65529,7 +65741,7 @@ self: {
      mkDerivation {
        pname = "hdbc-aeson";
        version = "0.1.3.2";
-       sha256 = "04bp1zxw5alazk241gbz7g1s4cr0gabb7c15irzzlkbjz5jsk6d5";
+       sha256 = "a599a965f9724dfa7f8e25b0b3967a2033a2c33b7fbd40c4fc8aaac2fb0f7711";
        libraryHaskellDepends = [
          aeson base convertible HDBC scientific text unordered-containers
          vector
@@ -65545,7 +65757,7 @@ self: {
      mkDerivation {
        pname = "hdbc-postgresql-hstore";
        version = "0.0.1.1";
-       sha256 = "034zsmqgavh4ns69f6j4a1afyqbd1b7h35macmf20vzxj0j0bawj";
+       sha256 = "92ab052490fd6f205c65aa9601cf0a6d61ef5450441a978cb6046ef570d59f0c";
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        jailbreak = true;
        homepage = "http://bitbucket.com/dpwiz/hdbc-postgresql-hstore";
@@ -65558,7 +65770,7 @@ self: {
      mkDerivation {
        pname = "hdbc-tuple";
        version = "0.0.1";
-       sha256 = "155darl83c1b3gjkh7x8pwpj6v4nqfb389ix9vr39j7qw1pkjwdd";
+       sha256 = "ad71396fe0f8c834f24e3d263496c3966c232fbfa81f38e51b2bb0816856ad94";
        libraryHaskellDepends = [ base convertible HDBC typical ];
        description = "Type save tuples for HDBC";
        license = "GPL";
@@ -65575,7 +65787,7 @@ self: {
      mkDerivation {
        pname = "hdbi";
        version = "1.3.0";
-       sha256 = "0z8ivqs79lkqr2bji6nc5djd29ajag5r7d7caja482ksfq75wdc2";
+       sha256 = "82355e0e767a0a449454ecb493cb535225d1642bcc9a2897c878d27434de117d";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers Decimal deepseq
          old-locale stm template-haskell text time uuid
@@ -65602,7 +65814,7 @@ self: {
      mkDerivation {
        pname = "hdbi-conduit";
        version = "1.3.0";
-       sha256 = "1wrc38m8451vslvnmd4p128x9885dbjx5hzc566s06dw8wshfdgj";
+       sha256 = "f235073547bc19a08d29ecc3d2e56a05a1d4910897b46a37d53b14822a1a2cf3";
        libraryHaskellDepends = [
          base conduit hdbi resourcet transformers
        ];
@@ -65627,7 +65839,7 @@ self: {
      mkDerivation {
        pname = "hdbi-postgresql";
        version = "1.3.0";
-       sha256 = "1fjcp3ldc54bm8gj8l9ifjvdxx6h6lsswjspmwnzwfh1ahfrbg1x";
+       sha256 = "3dbc951d54013afe2daf574bae3535d0f4deb6743151241faa8b14d6e8b84cba";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring hdbi mtl old-locale
          postgresql-libpq postgresql-simple safe text time uuid
@@ -65653,7 +65865,7 @@ self: {
      mkDerivation {
        pname = "hdbi-sqlite";
        version = "1.3.0";
-       sha256 = "03vf5xv14hb6rwwaiv997a7j3s5rgp81cb60v0n013l20dqh1g04";
+       sha256 = "04bc007103828e002cd8c02c16d07db9e8218f3a29eda838cf664112762f6e0f";
        libraryHaskellDepends = [
          base blaze-builder bytestring direct-sqlite hdbi text
        ];
@@ -65676,7 +65888,7 @@ self: {
      mkDerivation {
        pname = "hdbi-tests";
        version = "1.3.0";
-       sha256 = "0rvrjcv890flsmq8v6bpgh8kvg0ix3x2n149kdg7xviy26liyjg5";
+       sha256 = "e5491fa9113eee7e5e9b89042bfae811bc3d117c77998d70d5d4818436937967";
        libraryHaskellDepends = [
          base bytestring containers Decimal hdbi HUnit ieee754 QuickCheck
          quickcheck-assertions quickcheck-instances stm test-framework
@@ -65696,7 +65908,7 @@ self: {
      mkDerivation {
        pname = "hdevtools";
        version = "0.1.1.9";
-       sha256 = "0cwgm4yws4irrrpk2jvgvgr74w7gn9ilcidb9flkxfh7kqwsjxac";
+       sha256 = "4c75a9399e07ba3ea94bab454663b2ef7072f2db6f4b316fce3912cd3da98f33";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -65715,7 +65927,7 @@ self: {
      mkDerivation {
        pname = "hdf";
        version = "0.15";
-       sha256 = "11nf9wlymdhydf0bhh9gdl0cdn0i4mbvx3hfdcmnxfvag5jmfbkk";
+       sha256 = "732e5765796abb6e2b6b0e8ebe572511d8c6006d2f41b8806b1eb6ea294fce86";
        libraryHaskellDepends = [
          base directory fgl fgl-visualize filepath hosc hsc3 murmur-hash
          process split transformers
@@ -65731,7 +65943,7 @@ self: {
      mkDerivation {
        pname = "hdigest";
        version = "1.0";
-       sha256 = "1wm9j8ncjfb0gscdz4zmkymrzykc6rqbcx7988r207l5s9q3043f";
+       sha256 = "6e103070d2851e203242e974b670366cfa9fab9ff593df987e6039c92c92a9f2";
        libraryHaskellDepends = [
          base cgi Crypto network parsec random time
        ];
@@ -65745,7 +65957,7 @@ self: {
      mkDerivation {
        pname = "hdirect";
        version = "0.21.0";
-       sha256 = "1v7yx9k0kib6527k49hf3s4jvdda7a0wgv09qhyjk6lyriyi3ny2";
+       sha256 = "c2db117dcc9e9a293dc409ecc7813aaab52d891e0e26328f2866c50966eafeec";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base haskell98 pretty ];
@@ -65763,7 +65975,7 @@ self: {
      mkDerivation {
        pname = "hdis86";
        version = "0.2";
-       sha256 = "0qr8d4qbvkncv4im0iwwdr9khvkyy4ky8wnwxri1jqhylcq8vdks";
+       sha256 = "7ab68d30a31e621962eedc72e427f17e6e38536e9c475023d9cccebd30692863";
        libraryHaskellDepends = [ base bytestring containers QuickCheck ];
        homepage = "https://github.com/kmcallister/hdis86";
        description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64";
@@ -65776,7 +65988,7 @@ self: {
      mkDerivation {
        pname = "hdiscount";
        version = "0.1.0.0";
-       sha256 = "0z6kpsk57gjqwpvs5v6ikiirnyyg26mbrxx827bb1v27lhsy7py0";
+       sha256 = "c0dfe335a447ecb0d611a8f7bcaa11cf7b9b639cd1eca2f7e558be53a6bed37c";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ markdown ];
        jailbreak = true;
@@ -65791,7 +66003,7 @@ self: {
      mkDerivation {
        pname = "hdm";
        version = "0.0.1";
-       sha256 = "1qgq4bwq2ip315j43f0pyhxah033bjrj3wrmvnzmc62s8k2rfvgh";
+       sha256 = "f06d97c5445a1856bfdd35f321b35c6300a83af417b8416409e34681f922f8e1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory process unix vty ];
@@ -65809,7 +66021,7 @@ self: {
      mkDerivation {
        pname = "hdocs";
        version = "0.4.4.0";
-       sha256 = "153rwd1f390j6sjfxx135h3bh80pb8zb5myws9q8d0jkrx2sl198";
+       sha256 = "2805aa45cf53828670d2dcd7b23e5a1720b8062c23f4eea43612a4e142e37994";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65836,7 +66048,7 @@ self: {
      mkDerivation {
        pname = "hdph";
        version = "0.0.1";
-       sha256 = "116499cr0pcc1gg7aniprlcp9vp8s61b4vk7rcm673nw3lay496a";
+       sha256 = "ca24e2151ddc8e632acb676eb282d1e8ee7419cd375a75de0b8c5d90594ac484";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65863,7 +66075,7 @@ self: {
      mkDerivation {
        pname = "hdph-closure";
        version = "0.0.1";
-       sha256 = "0rcmp5i7jvpghg8nql5wlidbyjs79cxxmdb6bq3xxk806gdj66d8";
+       sha256 = "a81923db3300cdde075e66b5da3b4b474bbf5aa4bc506cd183ef6e7962b99565";
        libraryHaskellDepends = [
          array base bytestring cereal containers deepseq template-haskell
        ];
@@ -65881,7 +66093,7 @@ self: {
      mkDerivation {
        pname = "headergen";
        version = "0.2.0.0";
-       sha256 = "1hc1pmbj9452k4a71iiazxg6id7caf783m08lqnf3flf77cdjxpa";
+       sha256 = "ea76d9d8398ebae12ca608d4818e53ecb4685eff2ac6701499a2902457bd81c1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -65898,7 +66110,7 @@ self: {
      mkDerivation {
        pname = "heap";
        version = "1.0.2";
-       sha256 = "1xwgdx4m558m2xqmqnskkbja9s1lqm131xphjgk0yclsk0sv8was";
+       sha256 = "5a71b435989a320fe693f0f63042c534e8a4e49a535b5c7117159552496f8ff7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -65912,7 +66124,7 @@ self: {
      mkDerivation {
        pname = "heaps";
        version = "0.3.2.1";
-       sha256 = "1g4nf361qfjyymwpyiiq0qk5brrsr4wz1pncij69pwda919b3j6b";
+       sha256 = "cbc8b15248aaf19b8c8cccdef039c93ae755260638467f79f55e3a1ccc7096bc";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
@@ -65926,7 +66138,7 @@ self: {
      mkDerivation {
        pname = "heapsort";
        version = "0.1.0";
-       sha256 = "0fzws9fjhqsygsbwj7nvj786j16264vqvqzc97dr73y72538k9qa";
+       sha256 = "0aa7894611c78f93db49ece38d3731c20469d091db1ec9977e5e63285dd2fc3b";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ array base QuickCheck ];
@@ -65942,7 +66154,7 @@ self: {
      mkDerivation {
        pname = "hebrew-time";
        version = "0.1.1";
-       sha256 = "0ckridxf4rvhhp0k1mckbbbpzfs32l4mwg7n9mrmsggldpl7x6f7";
+       sha256 = "c7997ee86df43d5d734df63c5e091543bb7fd75a93d530c1857067e27a8b7932";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -65958,7 +66170,7 @@ self: {
      mkDerivation {
        pname = "hecc";
        version = "0.4.1.1";
-       sha256 = "1p7h9mlap8i0w2inhq944r0dgr27rzwk44igylil7gv0dgf4hsyx";
+       sha256 = "dd6b48dc6b60bf4323f52f1232f9cf47e4d74026246168a3e020a2ab684df0dc";
        libraryHaskellDepends = [ base cereal crypto-api hF2 ];
        description = "Elliptic Curve Cryptography for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -65973,7 +66185,7 @@ self: {
      mkDerivation {
        pname = "hedis";
        version = "0.6.9";
-       sha256 = "0yciwxsnqc8d09356fisfb44nbzsnvi01aad86gbx4vhrdnw7n7a";
+       sha256 = "ead8c36dcb7093be9e414da900e2b6fa2f4bc8723a3a5346020d316c75e79179";
        libraryHaskellDepends = [
          attoparsec base BoundedChan bytestring bytestring-lexing mtl
          network resource-pool time vector
@@ -65991,7 +66203,7 @@ self: {
      mkDerivation {
        pname = "hedis-config";
        version = "0.0.2";
-       sha256 = "1ism20ddgcdsypbic6ikalvajq3918wm53ppiic68zaqfzwk9gk2";
+       sha256 = "62be34f977587d64588cf78e52390a6960a93655331a16d7f5bab1d71a1055c7";
        libraryHaskellDepends = [ aeson base hedis scientific text time ];
        homepage = "https://bitbucket.org/s9gf4ult/hedis-config";
        description = "Easy trivial configuration for Redis";
@@ -66005,7 +66217,7 @@ self: {
      mkDerivation {
        pname = "hedis-monadic";
        version = "0.0.4";
-       sha256 = "1540c4ra65y2kc97n7wxx7rdzf3dkaqqx7r4lwz4qpg3kzfi6q8w";
+       sha256 = "1c6113dd9fe35d4c3ea7249f8eb19a6db8dff2e99d1f7b129bc217a332618094";
        libraryHaskellDepends = [
          base hedis monad-control mtl transformers transformers-base
          transformers-compat
@@ -66023,7 +66235,7 @@ self: {
      mkDerivation {
        pname = "hedis-pile";
        version = "0.6.3";
-       sha256 = "0awwga4hvmfkkkqy68g4ja51szjifs1z20rav0kmbn3gn978248n";
+       sha256 = "1611814eb26fd85527d82a03f18376517e1d8a92e421e3f19cd3d50d897a9c2b";
        libraryHaskellDepends = [
          base binary bytestring hedis hedis-tags string-conversions
          transformers
@@ -66043,7 +66255,7 @@ self: {
      mkDerivation {
        pname = "hedis-simple";
        version = "0.1.0.0";
-       sha256 = "1dq7rpqg35caqj664q2ndqgd59mq7cfjahkaka5mlk1k5yjvz7av";
+       sha256 = "5b9dbfa52f334c5a8b9a6a42251d3bb8a6d21e6e5660628cc48a95f1f0cd07b7";
        libraryHaskellDepends = [ base bytestring either hedis mtl ];
        jailbreak = true;
        homepage = "http://github.com/sanetracker/hedis-simple";
@@ -66058,7 +66270,7 @@ self: {
      mkDerivation {
        pname = "hedis-tags";
        version = "0.2.3";
-       sha256 = "0d9jr26366xjjcc39ma36bs944d11xpw5izww9pw3lajsgdr0d1s";
+       sha256 = "3a3490dbd352d1c16fe2fcc7c26f0fa11192f43243d5341893b21b338cc83235";
        libraryHaskellDepends = [ base bytestring hedis ];
        testHaskellDepends = [
          base bytestring hedis HUnit lifted-base test-framework
@@ -66078,7 +66290,7 @@ self: {
      mkDerivation {
        pname = "hedn";
        version = "0.1.8.1";
-       sha256 = "12r7ndjq59q9pdnhziq7af4jkp2mgpq7qhnnzgv6w1z8v893b9r1";
+       sha256 = "21a73512dae8076ef6fbd6427cf07d55dc29895307c70f6dbb09a78265b3278b";
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq mtl old-locale
          stringsearch text time utf8-string vector
@@ -66101,7 +66313,7 @@ self: {
      mkDerivation {
        pname = "hein";
        version = "0.1.0.5";
-       sha256 = "0z3c9pvhnfx9zizzwkyawvzvs4zl7i5w5zkrjpax8rkrh8ai1060";
+       sha256 = "c0801015827966d4d59579fec24b3cf413bdffe6ca4ffe7ffca93b0bf74d6c7c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -66123,7 +66335,7 @@ self: {
      mkDerivation {
        pname = "heist";
        version = "0.14.1.1";
-       sha256 = "0hwf8d20lw4gn5mal8iqd62npr2859541h3md451hjlbwpjyqd19";
+       sha256 = "2934ece5e58b4a180a6975c0404a2a48e46b85693822aa6ab18f700a44438e43";
        revision = "1";
        editedCabalFile = "51f2aa86d7582ba504e26ead511da54db5350cf4bed7f13252c678c0cf19d400";
        libraryHaskellDepends = [
@@ -66144,7 +66356,7 @@ self: {
      mkDerivation {
        pname = "heist-aeson";
        version = "0.5";
-       sha256 = "1m0rwrb0gzsajnp5h0w7cf10jf6fram4mjkmny5hk0h5xwcn19dc";
+       sha256 = "aca56019ef0582098bb775ca4aaacace38098263870358ae954aff0756e619d4";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers heist monads-fd text
          vector xmlhtml
@@ -66159,7 +66371,7 @@ self: {
      mkDerivation {
        pname = "heist-async";
        version = "0.6.0.0";
-       sha256 = "16ab3cfs6fj66ssf6ypmx2yddq5an115wlmwybk3va0a7kbp58ll";
+       sha256 = "94a272d73c0aa83de6f2bc525e42b0aae0d6bce8f57ae3b436463aa31d1b4b99";
        libraryHaskellDepends = [
          base heist template-haskell text xmlhtml
        ];
@@ -66176,7 +66388,7 @@ self: {
      mkDerivation {
        pname = "helics";
        version = "0.5.1";
-       sha256 = "06kj42rmlzlw6zrilq9kc5whk0np5714wwn3nwbpv6fx4ginzg2c";
+       sha256 = "4cbc6fe323dd997d17b7c3724ec229d78209796133611af3379c7e5ab320721a";
        revision = "1";
        editedCabalFile = "698732187d22f634ca220584e3b4056415c873360a85bc0a4ab7c1e2c86fca3d";
        isLibrary = true;
@@ -66201,7 +66413,7 @@ self: {
      mkDerivation {
        pname = "helics-wai";
        version = "0.5.1";
-       sha256 = "10rb9l4sf31h59f5pwv54vqjnlm047mbq5gvhv5wblkh53ch1b31";
+       sha256 = "61ac00d92870d2c5cb86fb15bcea21a0522bf12665f35b5c2a300ca7094d2b83";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66218,7 +66430,7 @@ self: {
      mkDerivation {
        pname = "helisp";
        version = "0.1";
-       sha256 = "1j495j3kc43d34aviln6jrab3ydzsp1hrnk079p53mcnx2rpjz81";
+       sha256 = "017d79b3e896d5516e3a60da0cc3d5bff9b15496c6d2b815196d1036872c89c8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl parsec process ];
@@ -66234,7 +66446,7 @@ self: {
      mkDerivation {
        pname = "helium";
        version = "1.8.1";
-       sha256 = "0vwk8h5fwl63pjcydwndqgpikfjdm37w7gjmmgac95gl66fc5h5j";
+       sha256 = "b2c0c29c31f495c4d4ab55bec3cfa84dba19efc3cdf2e699bcc350ee0a44936f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66261,7 +66473,7 @@ self: {
      mkDerivation {
        pname = "hell";
        version = "2.1";
-       sha256 = "1kdxkk994g38bl2kcxcs0p9wn1rankn0jw14nlvy9z9appgxalnl";
+       sha256 = "d452d5dfbd2afde437b5247009ecb42a07cbd3059a7536055d683c92d29cbdcd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66284,7 +66496,7 @@ self: {
      mkDerivation {
        pname = "hellage";
        version = "0.1.1";
-       sha256 = "1gqz042qycwhka6fyma6fb104mi8wd22nsbywrini3m3nib5ci75";
+       sha256 = "e5445656b4a38e6863e67e692b44e3285602c2724655ef8c9a90338f05011fbf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -66306,7 +66518,7 @@ self: {
      mkDerivation {
        pname = "hellnet";
        version = "0.1.1";
-       sha256 = "0fb4r9nb39l1qr7xczgkx5i93cv4rqrin0fl22qq4h12ajvrp6m6";
+       sha256 = "a69a9bb754224082b110d4011b33ce64b39162e9f37dd64fc681a6b16cca6439";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66328,7 +66540,7 @@ self: {
      mkDerivation {
        pname = "hello";
        version = "1.0.0.2";
-       sha256 = "1x6q7frbrc4jdfx1qhxrydmdp5k7mm3lx504d7rhg6z2m6ibbh57";
+       sha256 = "a7c0b5a2a9e29b07f36904944e47ad6796db6af3b9431cba6b92b0bcb23bd8f4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -66346,7 +66558,7 @@ self: {
      mkDerivation {
        pname = "helm";
        version = "0.7.1";
-       sha256 = "04smx6q2k4zj4gjvwy393s4abik9k108c5j31yy3dwksbbhhmygg";
+       sha256 = "eff90ae15a7af236bc0f431686409869c6a5881e6978bee523f29329b0e95513";
        libraryHaskellDepends = [
          base cairo containers cpu elerea filepath mtl pango random sdl2
          text time transformers
@@ -66369,7 +66581,7 @@ self: {
      mkDerivation {
        pname = "help-esb";
        version = "0.1.6";
-       sha256 = "0fy0dygx3hdkbdip7gppk25akjar0p2px0s5q7sl1lmzgkcl1016";
+       sha256 = "268040d97cbfd240f5c145837ec50559c9a98a98f7be73635bb3c1d19f6fc03b";
        libraryHaskellDepends = [
          aeson base bytestring containers MissingH network network-uri text
          uuid
@@ -66386,7 +66598,7 @@ self: {
      mkDerivation {
        pname = "hemkay";
        version = "0.2.0";
-       sha256 = "16f1nzpi20j7fza1rs1b89mhyni4162q2x4l3ixrnd82yjmcmc1l";
+       sha256 = "34b0caaaf402359b7b1c9474818509245a0f6b422be81cd477470211efb7c199";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -66402,7 +66614,7 @@ self: {
      mkDerivation {
        pname = "hemkay-core";
        version = "0.1.4";
-       sha256 = "0br41879jynw3dzb2hlb07m55zmzgyim6gi8i48bzimbi70c9z89";
+       sha256 = "09fdc4c089abc6bf1089283e53a37fbffe52ea018b42b17e1bdc7a990e0a242f";
        libraryHaskellDepends = [ array base binary bytestring ];
        description = "A device independent module music mixer";
        license = stdenv.lib.licenses.bsd3;
@@ -66418,7 +66630,7 @@ self: {
      mkDerivation {
        pname = "hemokit";
        version = "0.6.5";
-       sha256 = "104387q98qfhykmjkyhg08rji8pljlllp2j57ilhpb7ws9ik2g26";
+       sha256 = "463c3163d2fcac0b693c458a4b2995f4a22833020ffa29ebf4d06194f0418380";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66446,7 +66658,7 @@ self: {
      mkDerivation {
        pname = "hen";
        version = "0.1.3";
-       sha256 = "1ri6brxmc2m09jx2r9p47lgpfn8zkxy147hyyw3x2pw3g6cgsill";
+       sha256 = "9446fd9879835fd107f71e1e127c9f1f59771f3de4a62cba4ca00a567b5e26e6";
        libraryHaskellDepends = [
          base bitset exceptions mtl transformers uuid
        ];
@@ -66468,7 +66680,7 @@ self: {
      mkDerivation {
        pname = "henet";
        version = "1.3.9.3";
-       sha256 = "0pm5lnn7rc647ic404c8bmki9wfrkc0mdmmkng50vv0bm2d7z5aq";
+       sha256 = "58957f9aa80bec0dcab3b3d656019bd9f114675d881140583cc4b07caca5a55e";
        libraryHaskellDepends = [
          base bitset bytestring network typesafe-endian
        ];
@@ -66482,7 +66694,7 @@ self: {
      mkDerivation {
        pname = "hepevt";
        version = "0.5";
-       sha256 = "0b7syzfzbcznjb98hi4k8bp46ss08s9qg2763bnnm1b10i7km23z";
+       sha256 = "7f883a4f0461856aed1ae688879346406b43ee42934488d292f6b3f5ddf7fa2c";
        libraryHaskellDepends = [ bytestring haskell2010 lha ];
        description = "HEPEVT parser";
        license = stdenv.lib.licenses.mit;
@@ -66494,7 +66706,7 @@ self: {
      mkDerivation {
        pname = "her-lexer";
        version = "0.1.1";
-       sha256 = "1hbx48r8zdmyr5qjf0b3pagmamj8pibsp7ca7bxdgk4jz8pxv2my";
+       sha256 = "be8add2ffa92ccd7fa3a8a9dab57bc4856559fba63012771c9beb68f32227dc1";
        libraryHaskellDepends = [ base mtl split ];
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she";
        description = "A lexer for Haskell source code";
@@ -66507,7 +66719,7 @@ self: {
      mkDerivation {
        pname = "her-lexer-parsec";
        version = "0.0.0";
-       sha256 = "1gkcd9ikaxjirxh8haq8b9a372n1dlaq63n9xzq9gsyazkxz7lgn";
+       sha256 = "f6d1f3fbfccaeb97f0efc90e83156dc18a33545a082b8860cf517635636a6cbe";
        libraryHaskellDepends = [ base her-lexer parsec transformers ];
        description = "Parsec frontend to \"her-lexer\" for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
@@ -66521,7 +66733,7 @@ self: {
      mkDerivation {
        pname = "herbalizer";
        version = "0.4.9";
-       sha256 = "1gm1ya1p1i734sxadbmj1zn6mbq1gssmzp897h5xjgb8vsa2fxs6";
+       sha256 = "46772794de683dd90b3c09dd5fb57e01af6aec0fb2aea6ba26e3c47083f2a1be";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -66540,7 +66752,7 @@ self: {
      mkDerivation {
        pname = "here";
        version = "1.2.7";
-       sha256 = "1fqjqzfg3fif67ic75pavsnfjb9lxk5cf82chxs2hrkx41gm4gr6";
+       sha256 = "263f525f207d662874874c20c7caec342de9acdeea96c3e2312ebaf1dcc712bb";
        libraryHaskellDepends = [
          base haskell-src-meta mtl parsec template-haskell
        ];
@@ -66554,7 +66766,7 @@ self: {
      mkDerivation {
        pname = "heredoc";
        version = "0.2.0.0";
-       sha256 = "0h0g2f7yscwl1ba1yn3jnz2drvd6ns9m910hwlmq3kdq3k39y3f9";
+       sha256 = "c90d9fc61cb8cd812be510845493b6a6eddcc4b772581fd40a9433ed8f130f40";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://hackage.haskell.org/package/heredoc";
        description = "multi-line string / here document using QuasiQuotes";
@@ -66570,7 +66782,7 @@ self: {
      mkDerivation {
        pname = "hermit";
        version = "1.0.0.0";
-       sha256 = "1m3dgp22ix3l64basv8bx0k9waagi0rckprpgqnfpxnir7cbhrkv";
+       sha256 = "7b66b8d8c9d1f6eb2c7e37dfc932884f299e26e80b6dad163174f428c47d6dd4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66592,7 +66804,7 @@ self: {
      mkDerivation {
        pname = "hermit-syb";
        version = "0.1.0.0";
-       sha256 = "1970n7q88q76dnp2h7h8r1d6psq0d9pdvrim556rqiv8smwi661x";
+       sha256 = "3d181379d568479c4d2935e6dd6e6a00eb6b5ac8081e28ae6de66084f0b1e0a4";
        libraryHaskellDepends = [
          base containers ghc ghc-prim hermit syb template-haskell
        ];
@@ -66606,7 +66818,7 @@ self: {
      mkDerivation {
        pname = "heroku";
        version = "0.1.2.3";
-       sha256 = "1gldsdpnmj7ljrmyvjfwqdmhhml2yp27icl2qqj9pz42pllq4x2k";
+       sha256 = "53748229bd82fc9b24c682b278c4f58256086bc3dcc9ed6b96f4c86a6fd38dbe";
        libraryHaskellDepends = [ base network-uri text ];
        testHaskellDepends = [ base hspec network-uri text ];
        homepage = "https://github.com/gregwebs/haskell-heroku";
@@ -66621,7 +66833,7 @@ self: {
      mkDerivation {
        pname = "heroku-persistent";
        version = "0.1.0";
-       sha256 = "1ws4076dk4a8l2yz9mwfwqk57sm7y2ch2c5318agsm7hnwil7wbf";
+       sha256 = "6ef14323b7f054fd140aa3300199f0a7ea5326e68ed7f4bda04891d9cc0144f3";
        libraryHaskellDepends = [
          base bytestring heroku persistent-postgresql text
        ];
@@ -66639,7 +66851,7 @@ self: {
      mkDerivation {
        pname = "herringbone";
        version = "0.1.1";
-       sha256 = "1xpdz24dinm56z4gx51frw19j2169ms9jvasg8xixi944q34hwmk";
+       sha256 = "b37248062624c51e3b7a5a6d99744d26089902cf2e94fec837a5dad888f8edf6";
        libraryHaskellDepends = [
          base bytestring containers directory http-types mtl old-locale
          process process-listlike system-fileio system-filepath text time
@@ -66657,7 +66869,7 @@ self: {
      mkDerivation {
        pname = "herringbone-embed";
        version = "0.1.1";
-       sha256 = "02i0k29fg0nb4ax0yaw6bnrnb0v0rk2fy7lckd5f5bny557mk1h6";
+       sha256 = "0686594f29deaee24a9b8c1eefc4cc608365b35d862b0fba22cb82e79298200a";
        libraryHaskellDepends = [
          base bytestring file-embed herringbone system-fileio
          system-filepath template-haskell text
@@ -66674,7 +66886,7 @@ self: {
      mkDerivation {
        pname = "herringbone-wai";
        version = "0.1.1";
-       sha256 = "1kw0n89qqazyap9w315pa6k4smnw1pf8s82grbm8z9d9xyhk980f";
+       sha256 = "0ea034a1efa9a58feaca4f208ddc0ddc564da651b784c1d355fe2b8c13b280cf";
        libraryHaskellDepends = [
          base bytestring herringbone http-types system-fileio
          system-filepath text time wai wai-app-static
@@ -66691,7 +66903,7 @@ self: {
      mkDerivation {
        pname = "hesql";
        version = "0.8";
-       sha256 = "1xxmm5b3n8wj548lmf7hp05g7qwy0sq7mkh0g98n7z1iqdmfamwa";
+       sha256 = "8a57e56ac331fc63517a00ce7ab0069ee3f30ab8f0b84a112992233b56a9b5f7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -66708,7 +66920,7 @@ self: {
      mkDerivation {
        pname = "hetero-map";
        version = "0.21";
-       sha256 = "1fnzj37kya5gqjchm3yq0709ay50n0spb24x5rxkxfbl0yy2nzk7";
+       sha256 = "677e2bbc0774b93e7b2e9d887535b0a07895c001d88f0a99c4af283fcf90dfba";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/hetero-map";
        description = "Pure heterogeneous maps";
@@ -66721,7 +66933,7 @@ self: {
      mkDerivation {
        pname = "hetris";
        version = "0.2";
-       sha256 = "0sj0grykzb7xq7iz0nj27c4fzhcr9f0yshfcq81xq2wdmg09j8yx";
+       sha256 = "dd2399c0ab8d0bdc03c2cc41ed814b99c1ef083b425af0e3c1fdac3f7d7e406a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base hscurses old-time random ];
@@ -66738,7 +66950,7 @@ self: {
      mkDerivation {
        pname = "heukarya";
        version = "0.2.0.2";
-       sha256 = "1ycfy29crdj8ch07wm77lfpg656vm2vl34mdqvsxfxijdxb23cxg";
+       sha256 = "afb321566f3276d7f5c6ad9241b7a8db14f3aea3e7547e006448b6cc92f08ef9";
        libraryHaskellDepends = [
          base containers deepseq parallel random text
        ];
@@ -66753,7 +66965,7 @@ self: {
      mkDerivation {
        pname = "hevolisa";
        version = "0.0.1";
-       sha256 = "1ys7xqdrnvwn6z2vgmh49zhfxj73pdmscblqcjk6qrwmpb2xha2s";
+       sha256 = "5a28d8c5ba95676ca664982ea66bbbe3c8eee04f04d6b7c537966f9b1bee47fb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -66771,7 +66983,7 @@ self: {
      mkDerivation {
        pname = "hevolisa-dph";
        version = "0.0.1";
-       sha256 = "0jsynxd33r7d5s5vn204z4wdgm4cq6qyjs7afa77p94ni5m2p3kb";
+       sha256 = "6b8e2b6a8996a47b8e72ea68e9b1c18cd4d738f90408bb8b2eede4315ab75e4b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -66787,7 +66999,7 @@ self: {
      mkDerivation {
        pname = "hex";
        version = "0.1.2";
-       sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj";
+       sha256 = "12ee1243edd80570a486521565fb0c9b5e39374f21a12f050636e71d55ec61ec";
        libraryHaskellDepends = [ base bytestring ];
        description = "Convert strings into hexadecimal and back";
        license = stdenv.lib.licenses.bsd3;
@@ -66798,7 +67010,7 @@ self: {
      mkDerivation {
        pname = "hexdump";
        version = "0.1";
-       sha256 = "012hknn9qhwr3hn3dbyd9s7vvaz4i3bvimmxkb1jyfckw3wjcnhc";
+       sha256 = "0c5a26f9e093392fc39abdd6b8d788e4abbd8f4ecdaf362c1c99439cac9d5004";
        libraryHaskellDepends = [ base ];
        description = "A library for forming hexdumps";
        license = stdenv.lib.licenses.publicDomain;
@@ -66809,7 +67021,7 @@ self: {
      mkDerivation {
        pname = "hexif";
        version = "0.2.0.0";
-       sha256 = "1asv5vs694mcifffvm5a4gsplpz7frk3p3zr9lqqv1f172ql9lql";
+       sha256 = "14d344b138c1858d314df98f3b6676e75f7af523aad4ed9c8bac9264f42e5bab";
        libraryHaskellDepends = [ base binary bytestring filepath ];
        jailbreak = true;
        homepage = "http://www.github.com/hansroland/hexif";
@@ -66824,7 +67036,7 @@ self: {
      mkDerivation {
        pname = "hexpat";
        version = "0.20.9";
-       sha256 = "17cx8iafb07f2c8wmfmrfgpz9cjilciba6001klf42z039ghf72x";
+       sha256 = "5d1c075f1ae00be2e80c0018b522a351b2f4ef73b9baca1113ee80e554449d9d";
        libraryHaskellDepends = [
          base bytestring containers deepseq List text transformers
          utf8-string
@@ -66842,7 +67054,7 @@ self: {
      mkDerivation {
        pname = "hexpat-iteratee";
        version = "0.6";
-       sha256 = "10cqgrrqg518lhr9mk6gq48fgc0sjzwiakm2amhqgfflva3q0nqn";
+       sha256 = "165b8087dad4b9876155a24e15f9971ab0e710c1cfcc9a32a4289487737e9881";
        libraryHaskellDepends = [
          base bytestring containers extensible-exceptions hexpat iteratee
          List parallel transformers
@@ -66861,7 +67073,7 @@ self: {
      mkDerivation {
        pname = "hexpat-lens";
        version = "0.1.3";
-       sha256 = "0283zpzj1xsav50d4k66i90fhll89flqnb1jv0x7gxppv1460vfr";
+       sha256 = "d96d6048d8f7f6773ad8322c8ba94b8852e8408ac64cd240d94af720fffd0309";
        libraryHaskellDepends = [
          base bytestring deepseq hexpat hexpat-tagsoup lens
        ];
@@ -66877,7 +67089,7 @@ self: {
      mkDerivation {
        pname = "hexpat-pickle";
        version = "0.6";
-       sha256 = "1k01s49mz4xxfbw1b7ab0ian2m0d7w5awbwf4jyz5ykgxg11kz9m";
+       sha256 = "35fd19c2eb6ffaf2bd248e2fae0a3f0d546155044b9d15f872bd935f13d101cc";
        libraryHaskellDepends = [
          base bytestring containers extensible-exceptions hexpat text
          utf8-string
@@ -66894,7 +67106,7 @@ self: {
      mkDerivation {
        pname = "hexpat-pickle-generic";
        version = "0.1.7";
-       sha256 = "0l0h5n1afkg8zjq28h7aidsskdzf1i5lnz9jlq0hblwa9wamamis";
+       sha256 = "3a5655154f8ad30501a6327d4b4b0ceeb7a9758bea4024b0fce84da7822d1050";
        libraryHaskellDepends = [ base bytestring hexpat text ];
        testHaskellDepends = [
          base bytestring QuickCheck test-framework
@@ -66910,7 +67122,7 @@ self: {
      mkDerivation {
        pname = "hexpat-tagsoup";
        version = "0.1";
-       sha256 = "0481446ba5m0h8lxmp216gzll0wr77mhk6hvm087749fwjj597aj";
+       sha256 = "529d54a4e42e917310a81b9a09eb3999034aff3341dcda2982a016b50c210111";
        libraryHaskellDepends = [ base hexpat tagsoup ];
        description = "Parse (possibly malformed) HTML to hexpat tree";
        license = stdenv.lib.licenses.bsd3;
@@ -66922,7 +67134,7 @@ self: {
      mkDerivation {
        pname = "hexpr";
        version = "0.0.0.0";
-       sha256 = "0wpmbzxdl63r2p398101ywzfs7b4p4x8ds4zzqbhvhs2r0fsg5wv";
+       sha256 = "9b97a71dc842c30d17fe9fe8863ab9641ded3ef7010494c6157918dafa5ff572";
        libraryHaskellDepends = [
          base data-ref either mtl parsec transformers
        ];
@@ -66939,7 +67151,7 @@ self: {
      mkDerivation {
        pname = "hexquote";
        version = "0.1";
-       sha256 = "0fr0sn2k12yvbbwmldqkmwgg0qk6bfd6811h2dgpq77821y62hq8";
+       sha256 = "0843617c10e81c7c5f133004649a5b6662f01eaf13375af95adb8b3085d5203b";
        libraryHaskellDepends = [
          base bytestring containers parsec template-haskell
        ];
@@ -66955,7 +67167,7 @@ self: {
      mkDerivation {
        pname = "hexstring";
        version = "0.11.1";
-       sha256 = "0509h2fhrpcsjf7gffychf700xca4a5l937jfgdzywpm4bzdpn20";
+       sha256 = "40d8dbfe22f572ffdb73f28c448b228a75008e83cc3bf78e939add0c9d800914";
        libraryHaskellDepends = [
          aeson base base16-bytestring binary bytestring text
        ];
@@ -66976,7 +67188,7 @@ self: {
      mkDerivation {
        pname = "heyefi";
        version = "0.1.1.1";
-       sha256 = "0dm9dyn12jgpc317pk5z3rhhgw2hbmbxyfba97jzq34b5z6crz0f";
+       sha256 = "0efccccc2f8b0cfce5496a39df575d50f007611ebfcc7bc260f74911ac6fa936";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -67002,7 +67214,7 @@ self: {
      mkDerivation {
        pname = "hfann";
        version = "0.4.2";
-       sha256 = "09pr24riz63irvykn6csbnm28z35ikwzg52ksah1p7zrywmgq9as";
+       sha256 = "5a25fc2af7f99f1ba0d25394f7f98c657c24aa5d9a193bfdce71981f3311f926";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -67022,7 +67234,7 @@ self: {
      mkDerivation {
        pname = "hfd";
        version = "0.0.2";
-       sha256 = "1n60h76hzkb4avnsl6lybq7ya4p4ghcdlplyml7fqwg7i20cak54";
+       sha256 = "a44cc58088e771ec0ead9e5eda187ce412e50f5e9e1aaaed5664cd0fcd81c0d8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -67040,7 +67252,7 @@ self: {
      mkDerivation {
        pname = "hfiar";
        version = "2.1.1";
-       sha256 = "1jsq33cdpdd52yriky989vd8wlafi9dq1bxzild7sjw1mql69d71";
+       sha256 = "e1b46428ae814b7d1a8dbfaf805b8a4e518eda4e28f919b317a5b5dbd81858cb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base eprocess mtl ];
@@ -67057,7 +67269,7 @@ self: {
      mkDerivation {
        pname = "hflags";
        version = "0.4";
-       sha256 = "17zzx273kmnwwazmmns78cllz3l7wad1gi7hizgcxi68j04blhd4";
+       sha256 = "a441ba0890c8c4cede8ff0c4179ae2878e4f294347db5abfe2dcd6398ee8ff9f";
        libraryHaskellDepends = [ base containers template-haskell text ];
        homepage = "http://github.com/errge/hflags";
        description = "Command line flag parser, very similar to Google's gflags";
@@ -67071,7 +67283,7 @@ self: {
      mkDerivation {
        pname = "hfoil";
        version = "0.2.0.2";
-       sha256 = "0jwnyfl1rcd2439738jgs0rgl0p09d1j877z84g0ax3xh7cm4zj1";
+       sha256 = "417e52d9817d74051e41ff1c24434be002fa32d04fa271d220a2b11ca8f3964b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67088,7 +67300,7 @@ self: {
      mkDerivation {
        pname = "hfov";
        version = "1.0.2";
-       sha256 = "04qwmjxm06akvpakc5imcx0ls9zlsz74s4r9p7xzj0q5fv20z09l";
+       sha256 = "34810fc4760503f9fbb929134dced7f4274d4167351636d5dd531950bbac1c13";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/nornagon/hfov";
@@ -67103,7 +67315,7 @@ self: {
      mkDerivation {
        pname = "hfractal";
        version = "0.4.2.5";
-       sha256 = "060qx7wmqhlavamxxyzjyn2ar1cigvfw5ww7c0r70ns54xm0rw5z";
+       sha256 = "bff00c6a27455b70326087f3c2dd7e9185ac84f5f2fbdeabda8a425cf9e91818";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -67121,7 +67333,7 @@ self: {
      mkDerivation {
        pname = "hfsevents";
        version = "0.1.5";
-       sha256 = "0hp9jjj59smfcs51d9zjhyvgdbn46l0rl0jr98wbzg3qya0vwj5k";
+       sha256 = "b348be81f278bcbf384a59029a0135c4aef6b687f2a7168a66aeea54a494e942";
        libraryHaskellDepends = [ base bytestring cereal mtl text unix ];
        homepage = "http://github.com/luite/hfsevents";
        description = "File/folder watching for OS X";
@@ -67134,7 +67346,7 @@ self: {
      mkDerivation {
        pname = "hfusion";
        version = "0.0.6.1";
-       sha256 = "05pisic8s6n2jqymyd2qjifr8kr824v3mflng1a0y4rp8pvbaj7r";
+       sha256 = "f948b5f64537130f547896ba3a3611284f945d9458345f3d96c21a8d58d4f116";
        libraryHaskellDepends = [
          base containers haskell-src mtl pretty syb
        ];
@@ -67151,7 +67363,7 @@ self: {
      mkDerivation {
        pname = "hg-buildpackage";
        version = "1.0.4";
-       sha256 = "0csibld3wrxi4jp35qqhfm17sw9fd5sca5rs9yd7i7l4jvsmfqhq";
+       sha256 = "186257f596849e789a4f3a17c574692e717d427510e332ae24b1673e1a5d5133";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -67168,7 +67380,7 @@ self: {
      mkDerivation {
        pname = "hgal";
        version = "2.0.0.2";
-       sha256 = "17qw8izy54042g56mp3hdbmqcyk95cdarg58xggniwd85q2l5dpi";
+       sha256 = "f1b642052ea8f168dfeba8bcac1a2b697a86eb6a70dc6aca130490e27f441c9f";
        libraryHaskellDepends = [ array base containers mtl ];
        description = "library for computation automorphism group and canonical labelling of a graph";
        license = "GPL";
@@ -67179,7 +67391,7 @@ self: {
      mkDerivation {
        pname = "hgalib";
        version = "0.2";
-       sha256 = "08a8lmh1rg3d1rmpfhcc2fzyc0kybqhzahx4hrvfrqjw7czcnmrw";
+       sha256 = "3c57cb3e3b5ce2ec7686a443f5215e7e02e6bf138c41776b0e6dbc1c60a54821";
        libraryHaskellDepends = [ array base haskell98 mtl ];
        description = "Haskell Genetic Algorithm Library";
        license = stdenv.lib.licenses.publicDomain;
@@ -67194,7 +67406,7 @@ self: {
      mkDerivation {
        pname = "hgdbmi";
        version = "0.2";
-       sha256 = "1gfmpk9a909vc8khf40lr32l3srqqrfbcprp28dp6g02id1xmck4";
+       sha256 = "64b2da438b023c731b12375fb65cc638eb41c5c814100727623b81a4d2bcd5bd";
        libraryHaskellDepends = [ base parsec process stm unix ];
        testHaskellDepends = [
          base directory HUnit process template-haskell temporary
@@ -67214,7 +67426,7 @@ self: {
      mkDerivation {
        pname = "hgearman";
        version = "0.1.0.2";
-       sha256 = "0bfipd7s6czp3aha0jx1yjzfzn8vywiswd07k68q2207j3br8yxk";
+       sha256 = "b37b94d79007088191990734ae23f71bd9efbef4a14ba0a01af733a34fbbd12d";
        libraryHaskellDepends = [
          base binary bytestring monad-control mtl network resource-pool
          transformers transformers-base unordered-containers
@@ -67228,7 +67440,7 @@ self: {
      mkDerivation {
        pname = "hgen";
        version = "1.4.0";
-       sha256 = "190zm0lkr2ymq91ka84a3v2lhxjv9yl43abqcyxj6c3cjqym9ib5";
+       sha256 = "65c5543d966c3023bb6778a941a84f5b7648c51e8a203543c2d58b3c29a81fa4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -67245,7 +67457,7 @@ self: {
      mkDerivation {
        pname = "hgeometric";
        version = "0.0.2.2";
-       sha256 = "0l460mmbla7354dldil0d7qzba7dp4jhhsna0s27gdd9aad4flsd";
+       sha256 = "4d53479a52a9b5778406ca6a0825b9eda8f5f16980c6461b29e328ba6a058650";
        libraryHaskellDepends = [ base containers ];
        homepage = "ftp://ftp.cs.man.ac.uk/pub/toby/gpc/";
        description = "A geometric library with bindings to GPC";
@@ -67262,7 +67474,7 @@ self: {
      mkDerivation {
        pname = "hgeometry";
        version = "0.4.0.0";
-       sha256 = "00z6xna83j9klba6rj09cdiriqgn45cx15pw22zylywn0s8agc4d";
+       sha256 = "8db0a79006967beabf10fc96d05921f6e198636309c86cd4a233c98194ede603";
        libraryHaskellDepends = [
          base bifunctors bytestring containers data-clist fixed-vector
          hexpat lens linear mtl parsec random semigroups singletons text
@@ -67282,7 +67494,7 @@ self: {
      mkDerivation {
        pname = "hgettext";
        version = "0.1.30";
-       sha256 = "1pgzyd1nqzl7g88pcw7sncija5sd2k4zif9d8qfw96cw6m6kli96";
+       sha256 = "26453a4d359c99c41d462db9f8c9144d172523b3fa7076117a877e6c43f3ffdd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67302,7 +67514,7 @@ self: {
      mkDerivation {
        pname = "hgithub";
        version = "0.1.0";
-       sha256 = "05dxbz9z457b5nl0wsv95pgah9b74agdfwziqf7x79j5q2qqjc2l";
+       sha256 = "543089b1c045a6d38fc3f173d79e226725a8de2d696b0ea82deb14f2d35fbd15";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67322,7 +67534,7 @@ self: {
      mkDerivation {
        pname = "hgl-example";
        version = "0.0.2";
-       sha256 = "0bigji3i3311wlphxa0g8lkls0i4cn05d2m57fcrdfan8rayjwxr";
+       sha256 = "b973e9554656b996993ba58a56806524024d27450fa80e2fe5218c1147942f2e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -67342,7 +67554,7 @@ self: {
      mkDerivation {
        pname = "hgom";
        version = "0.6";
-       sha256 = "0amdfdp1xmh506lgfbb4war2spfb4gqls864q18psmvshcwlpsmv";
+       sha256 = "bbea4b39837a577d51c0c4204df123cb5d2db2e2642df7a80105d61e6e73ad2a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -67359,7 +67571,7 @@ self: {
      mkDerivation {
        pname = "hgopher";
        version = "0.1.0.0";
-       sha256 = "0j6ybi8f5csa9rpbpy8dc9p6l6vf2qh2zk589a9nqj2phllz7mwf";
+       sha256 = "8ed7f3298557486c934aa8cc2f20166e1b6a6e620df9bb6e4e4ab3e2505cde48";
        libraryHaskellDepends = [ base bytestring network ];
        jailbreak = true;
        description = "Gopher server";
@@ -67371,7 +67583,7 @@ self: {
      mkDerivation {
        pname = "hharp";
        version = "0.1.1.0";
-       sha256 = "1f7k1jlc2ncxyxmc6rl603nw0lynqwv0dmj11hrcdmv282h4ff6s";
+       sha256 = "da3847a04062d7c6320c41d60636c7d653c0ed008666c36af79d59c1a80cf3b8";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ harp ];
        jailbreak = true;
@@ -67389,7 +67601,7 @@ self: {
      mkDerivation {
        pname = "hi";
        version = "1.2.0.0";
-       sha256 = "16c3j7pc87mxk9rgk98bicl9jhvnyj2d9spfjvhiknpsixb847h9";
+       sha256 = "091e82568ffada19e196eeead484f4764399288b0ba5f9729abd1ec4ee918399";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67419,7 +67631,7 @@ self: {
      mkDerivation {
        pname = "hiccup";
        version = "0.40";
-       sha256 = "1skzr5ipxz61zrndwifkngw70zdf2yh5f8qpbmfzaq0bscrzdxg5";
+       sha256 = "e5f5f633d30b60f55d5d172357a017ae7d70f8b3d345de6cfec1fc7e63c97fea";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -67437,7 +67649,7 @@ self: {
      mkDerivation {
        pname = "hichi";
        version = "0.0.1";
-       sha256 = "1f5cqqw9zn1nji0k2vp0ln1fdbzv9iwjqiaw9vd77kz9pz7p0kvq";
+       sha256 = "784f70cfbfe9cf73da4e5c452c794cfbafe682a5e06e31419436d89f38c6acb8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base bytestring mtl network ];
@@ -67453,7 +67665,7 @@ self: {
      mkDerivation {
        pname = "hid";
        version = "0.2.1";
-       sha256 = "18svis0bs4cilks71rih9m89mcdrll5hnjy18ccw81wj32cw9mdh";
+       sha256 = "b0d5c499189207c41943c14b0b0ba5b9b19a504d30e670f4a49111bd808e5ba3";
        libraryHaskellDepends = [ base bytestring transformers ];
        libraryPkgconfigDepends = [ hidapi-libusb ];
        libraryToolDepends = [ c2hs ];
@@ -67466,7 +67678,7 @@ self: {
      mkDerivation {
        pname = "hidapi";
        version = "0.1.3";
-       sha256 = "0ql6avpwi2m89rrglj9zk3fyi8vl91xswagqv8h24b2xgm7pw5i0";
+       sha256 = "20167e4f7d5d2c2220daf829ae7b4874a3e8dd983f49fa724ea88ac8ef568662";
        libraryHaskellDepends = [ base bytestring deepseq-generics ];
        librarySystemDepends = [ systemd ];
        homepage = "https://github.com/vahokif/haskell-hidapi";
@@ -67479,7 +67691,7 @@ self: {
      mkDerivation {
        pname = "hieraclus";
        version = "0.1.2.1";
-       sha256 = "11fjfmdjzvid0352d346p5xf44bl7dn8bd8pms5pi34xysdyr7pg";
+       sha256 = "ef9eec9bf69d8c788bae17b5856c3b7411e27ab9868c26ca002dee2f5b75d285";
        libraryHaskellDepends = [ base containers HUnit mtl multiset ];
        description = "Automated clustering of arbitrary elements in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -67492,7 +67704,7 @@ self: {
      mkDerivation {
        pname = "hierarchical-clustering";
        version = "0.4.6";
-       sha256 = "1cfcrnxqczqzqgpyipsw9dwfw1j75zd11vpd12i533f3p44pzwbm";
+       sha256 = "75f17f09b9c38d51a208edee10da2f4706ee784b5cdfe8efc31f7f86bbcdccb1";
        libraryHaskellDepends = [ array base containers ];
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Fast algorithms for single, average/UPGMA and complete linkage clustering";
@@ -67506,7 +67718,7 @@ self: {
      mkDerivation {
        pname = "hierarchical-clustering-diagrams";
        version = "0.3.2";
-       sha256 = "06ncyzhql74ni746a9hzma1v0grw99vas4xglmyvgd6yhdwl08sr";
+       sha256 = "5923407983deb4b77da5af13ad764a3c3fb083aa1f2665c889961c8ae1f7cc1a";
        libraryHaskellDepends = [
          base diagrams-lib hierarchical-clustering
        ];
@@ -67525,12 +67737,35 @@ self: {
      mkDerivation {
        pname = "hierarchical-exceptions";
        version = "1.0.1";
-       sha256 = "1yzhw7kgz5iljm8ndh5kyr18367cl6l120m1gkn5x9hpsh9mlamm";
+       sha256 = "b52a5a13d417a65eec7ca10211a8a1ec988142f6b3c06651953496ffe6e1f0fb";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell functions to easily create exception hierarchies";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "hierarchy" = callPackage
+    ({ mkDerivation, base, directory, doctest, exceptions, filepath
+     , free, hspec, hspec-expectations, mmorph, monad-control, mtl
+     , pipes, semigroups, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "hierarchy";
+       version = "0.3.1";
+       sha256 = "4ff6dcb89691dbf20de993964ad32904508f5b6569af1e83eaaaf73a271c9c5f";
+       libraryHaskellDepends = [
+         base exceptions free mmorph monad-control mtl pipes semigroups
+         transformers transformers-base transformers-compat
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath hspec hspec-expectations mtl pipes
+         semigroups transformers
+       ];
+       homepage = "https://github.com/jwiegley/hierarchy";
+       description = "Pipes-based library for predicated traversal of generated trees";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hiernotify" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl, old-time, stm
      , timers-updatable
@@ -67538,7 +67773,7 @@ self: {
      mkDerivation {
        pname = "hiernotify";
        version = "2011.4.12";
-       sha256 = "1imgwi6b0cn9y4y7vgqsyfgsyxjvsl1wkmqmrf51jkfqasnqsqh5";
+       sha256 = "05628dad56d84d198acb15d7c903d55b76af9ff31abf7d3cf1c932b04ce4afc6";
        libraryHaskellDepends = [
          base directory filepath mtl old-time stm timers-updatable
        ];
@@ -67553,7 +67788,7 @@ self: {
      mkDerivation {
        pname = "highWaterMark";
        version = "0.1.1";
-       sha256 = "1bwvhrzvrf004lypf0zrx6q6k6fn5qwvlk45vppmnv65v9vq519p";
+       sha256 = "37858277dac56c5befdd854cba392ed69969b0e9f903773d2500b8bc7f869baf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ghc ];
@@ -67571,7 +67806,7 @@ self: {
      mkDerivation {
        pname = "higher-leveldb";
        version = "0.3.0.0";
-       sha256 = "0lghf21l3s4fmwnp3dsndzxqhamgppczzydkvnqlmx1x9jk5g1b6";
+       sha256 = "668557a64c3df44ab1ddb3f9ffd9bdaf2a88fb6f56b7712daf8ee8418370f051";
        libraryHaskellDepends = [
          base bytestring cereal data-default leveldb-haskell lifted-base
          monad-control mtl resourcet transformers transformers-base
@@ -67590,7 +67825,7 @@ self: {
      mkDerivation {
        pname = "higherorder";
        version = "0.0";
-       sha256 = "06cqhk9jalyps4v9w6wmpy9jdj3piwsp0wl3fvkzwa5iydlyvisz";
+       sha256 = "5fc7ed69f3b128fee776837270358f77c82693bf951b9e36d1d75325d3849819";
        revision = "1";
        editedCabalFile = "c587250ea9c4828876f3837e82e5b1543e0dc2cc59bb4ec59ce0d947bae3d459";
        libraryHaskellDepends = [ base ];
@@ -67607,7 +67842,7 @@ self: {
      mkDerivation {
        pname = "highjson";
        version = "0.2.0.2";
-       sha256 = "07qz7zb53vbpb9ixrw0qwn5qhvgwzvrvfkp343a1cvbb42slpmkz";
+       sha256 = "7fd64bb5206b6d16d420e34eb7f3fefc6d888be518f0dc635a77ed51d63f1f1f";
        libraryHaskellDepends = [
          attoparsec base buffer-builder bytestring containers hashable hvect
          scientific text unordered-containers vector
@@ -67624,7 +67859,7 @@ self: {
      mkDerivation {
        pname = "highlight-versions";
        version = "0.1.3.5";
-       sha256 = "0nk7kdzzlyq2ml30mj661616h23zar3kqq8xd36lqs1ssr7nqnj7";
+       sha256 = "475a6c4fd63a684ccd681d613c47567f08688209c6c80a06ad027bfa7f9b675a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -67641,7 +67876,7 @@ self: {
      mkDerivation {
        pname = "highlighter";
        version = "0.2.2";
-       sha256 = "1x381ngd2gg2ff2rj7dyqmhy1achly2wbssjhsrcm0p6sxqab21x";
+       sha256 = "3d88a570d7e682cab28652ebc585a790a9e061c5be1d998573e23dd19e0d68f4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67661,7 +67896,7 @@ self: {
      mkDerivation {
        pname = "highlighter2";
        version = "0.2.5";
-       sha256 = "1gndzxi2i9hybqj6v14wflw8335v09q832knbx61hq9wcgq1hxwi";
+       sha256 = "917718f0633c61184c5f768a817002bb8c8138759c846d245e1ea62862ffcdbe";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67682,7 +67917,7 @@ self: {
      mkDerivation {
        pname = "highlighting-kate";
        version = "0.6";
-       sha256 = "16334fbiyq6017zbgc59qc00h0bk24xh4dcrbqx63dvf72ac37dk";
+       sha256 = "b39dc194386eb7613a5e9935023b1173010800c3a9b0b7fe09c0601f97236398";
        revision = "1";
        editedCabalFile = "7466b389fd27b0520d371b2b225cb6024e9b7dd371cffa78169c219ab449558b";
        configureFlags = [ "-fpcre-light" ];
@@ -67707,7 +67942,7 @@ self: {
      mkDerivation {
        pname = "hills";
        version = "0.1.1.0";
-       sha256 = "0fankar6p0m6n1ffis4ww5x9dqdbjh9py63jirbimpdcrzcxcym5";
+       sha256 = "a57ad6d9cfacdd1a578e72187f1394abe1967ae19ce8e85cb0a6826bb29a5639";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -67726,7 +67961,7 @@ self: {
      mkDerivation {
        pname = "himerge";
        version = "0.20";
-       sha256 = "0ivrl5wymqzwcn7vyr3anychlk35003ksxsvr463qz768vbcql00";
+       sha256 = "0050ccd646e67c3c0cc95b773d0700654c0a99b76a64bf8f65fce3ea79a17947";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -67747,7 +67982,7 @@ self: {
      mkDerivation {
        pname = "himg";
        version = "0.1.0.0";
-       sha256 = "09ya9966fn3ss7xxc1cd0izb5js35gwr2r1km881w4455sknl093";
+       sha256 = "23016aa72e85101e10aa336491f92b43cbb27e048d05d6fbd17a58674c4aca27";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67772,7 +68007,7 @@ self: {
      mkDerivation {
        pname = "himpy";
        version = "0.5.0";
-       sha256 = "0rpgvv9hq8ai6imhsbfw95igfyqnnzdgx9mw6cpd8ch5kb6wfqig";
+       sha256 = "2f62c7cd9a0532d42e33bca6fedab7167bf76249dc2d0d6b3451210cd3deef66";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -67795,7 +68030,7 @@ self: {
      mkDerivation {
        pname = "hindent";
        version = "4.5.4";
-       sha256 = "09pywkm5xjk6djfwml1frnl21zndw03wp47a30vcnqcqf2a3awi0";
+       sha256 = "20723594709861cb3618ea90cb07e0cdfe20a8cd2ed0ca9d6c66ca5eeae4fe26";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67822,7 +68057,7 @@ self: {
      mkDerivation {
        pname = "hinduce-associations-apriori";
        version = "0.0.0.0";
-       sha256 = "002ca2mxrmyvg1w5rr1n7ksc89qxqznasq0cw5grfr5h22pxs57z";
+       sha256 = "ff14ddaf10b064975fe10c60adecc71d27c4f43c36e45c7878dbd7dcab504c00";
        libraryHaskellDepends = [
          base containers deepseq hinduce-missingh parallel vector
        ];
@@ -67836,7 +68071,7 @@ self: {
      mkDerivation {
        pname = "hinduce-classifier";
        version = "0.0.0.1";
-       sha256 = "1cdx916xkpsy2ilsmmdkyqax2gb0cx6sgkydvjbiw7qibd76ylza";
+       sha256 = "ea536f4e5b111f1e97dccdcfa74d67603dd115f6b3d5aa69145edfd94d48bdb1";
        libraryHaskellDepends = [ base hinduce-missingh layout ];
        description = "Interface and utilities for classifiers";
        license = stdenv.lib.licenses.bsd3;
@@ -67850,7 +68085,7 @@ self: {
      mkDerivation {
        pname = "hinduce-classifier-decisiontree";
        version = "0.0.0.1";
-       sha256 = "1hdz4lbbpy2yc5j7chkagjvslsakmv3hbz2s7lpz0isfq7ls9idl";
+       sha256 = "b4c5a4e9c14e47f02f3d5afc05c7ae5369aab77c6a427664615ef8bb1625bfc1";
        libraryHaskellDepends = [
          base convertible hinduce-classifier hinduce-missingh layout
        ];
@@ -67867,7 +68102,7 @@ self: {
      mkDerivation {
        pname = "hinduce-examples";
        version = "0.0.0.2";
-       sha256 = "17jnrc8iji5byqbd08llwk0mw9yi1dq3biaszqp9jyinf50hcb4w";
+       sha256 = "9c2c064171367a992efe5ac535700bd1275ec1e49422d016f6ab441911cb569e";
        libraryHaskellDepends = [
          base containers convertible csv hinduce-associations-apriori
          hinduce-classifier hinduce-classifier-decisiontree hinduce-missingh
@@ -67883,7 +68118,7 @@ self: {
      mkDerivation {
        pname = "hinduce-missingh";
        version = "0.0.0.0";
-       sha256 = "1606fz8qhvwqidi798y3mxlmbmwn8yp3a4cl59j4i8s05vgbaj9z";
+       sha256 = "3f49b5de2e40a348642a941135ae4796d75569afc3a374628b986f88d1770698";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/roberth/hinduce-missingh";
        description = "Utility functions";
@@ -67895,7 +68130,7 @@ self: {
      mkDerivation {
        pname = "hinotify";
        version = "0.3.8.1";
-       sha256 = "03c1f4d7x805zdiq2w26kl09xrfjw19saycdkhnixzv2qcr6xm1p";
+       sha256 = "37d46e32c362ff1e2d9c8d79a553e0d2e59e009d46708163fb05a07e1a71810d";
        libraryHaskellDepends = [ base containers directory unix ];
        testHaskellDepends = [ base directory ];
        homepage = "https://github.com/kolmodin/hinotify.git";
@@ -67910,7 +68145,7 @@ self: {
      mkDerivation {
        pname = "hinquire";
        version = "0.1.1";
-       sha256 = "1mm0qi1y2qkiknb5s2jbgc3zljda52mi4mmh0fh7z8ck5rnng1x1";
+       sha256 = "a187676d2e93a17fa003b05612ab28aa49fa077b4b0a5d969d7162e143c4a0d6";
        libraryHaskellDepends = [
          base bifunctors QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
@@ -67932,7 +68167,7 @@ self: {
      mkDerivation {
        pname = "hinstaller";
        version = "2008.2.16";
-       sha256 = "1ldfqx98w7inpj76xyi0drh2lykfjfq9r34hlbcw7mv4bgxp4l8c";
+       sha256 = "0c5172fb5b64d7c3d9a2908c9cb0936e7a2a606e20fa6e8ebc361e8e52c7aed1";
        libraryHaskellDepends = [
          base bytestring Cabal directory filepath process template-haskell
        ];
@@ -67948,7 +68183,7 @@ self: {
      mkDerivation {
        pname = "hint";
        version = "0.4.2.3";
-       sha256 = "1ds09bd369qmy2672vkhll8igbp63q83wdzwkpky4ab9pac3yayg";
+       sha256 = "cf2b3f98ba6929e2e79dfc373e101ee6ae1711a5706e718cf0152733da4a40b7";
        libraryHaskellDepends = [
          base directory exceptions extensible-exceptions filepath ghc
          ghc-mtl ghc-paths mtl random unix
@@ -67967,7 +68202,7 @@ self: {
      mkDerivation {
        pname = "hint-server";
        version = "1.4.2";
-       sha256 = "1rv6b0vlqs855m3bv047pvdkycmx2mv049cnp9iw8b97d0fsfyf5";
+       sha256 = "c579a71d68272dc463ba9625027615bd323fdbbe8780bd462d05694c375866e7";
        libraryHaskellDepends = [
          base eprocess exceptions hint monad-loops mtl
        ];
@@ -67980,7 +68215,7 @@ self: {
      mkDerivation {
        pname = "hinvaders";
        version = "0.1";
-       sha256 = "01v5szci7kbp3w2jsdcnzv9j3lbcl5bvn9ipcvp3v2xvfjik110h";
+       sha256 = "108430a374bb8b3dee663726bb57a16cd121d3fe96352d051f77cd13d9d76507";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 random ];
@@ -67995,7 +68230,7 @@ self: {
      mkDerivation {
        pname = "hinze-streams";
        version = "1.0";
-       sha256 = "137jjwcs3a9n2zybkqqfdy2m1a2ahpdcmficwfmn7ykdz487xcsq";
+       sha256 = "58b37e10f96dfa63abe32cbacada854aa850856f0ee3b9fc1736a9a11997f28c";
        libraryHaskellDepends = [ base haskell98 Stream ];
        homepage = "http://code.haskell.org/~dons/code/hinze-streams";
        description = "Streams and Unique Fixed Points";
@@ -68013,7 +68248,7 @@ self: {
      mkDerivation {
        pname = "hipbot";
        version = "0.5";
-       sha256 = "0acy9bp2dwszd01l514nx2crdxgb356k18pm9ravddljxr24n1hs";
+       sha256 = "1a064b44ee92b6b6554ef5a2304d19ebf59699e896844203685ff326ee4a9e29";
        revision = "1";
        editedCabalFile = "6ac1673be45c18dc010eeeef508a021ec9fef4e0a4e05864733f91aec8508ab8";
        libraryHaskellDepends = [
@@ -68036,7 +68271,7 @@ self: {
      mkDerivation {
        pname = "hipe";
        version = "0.2.0.0";
-       sha256 = "1y8awzmvrvixlba1ndvw5rwm8i38lj1yf4mcfm6h7pmmvpdvr5ah";
+       sha256 = "5095bcdbddb5de034d75ac12e783a4684454792e7c371bd4a23deebcebe70af9";
        libraryHaskellDepends = [
          base containers hgeometry hxt parsec split text text-format
        ];
@@ -68050,7 +68285,7 @@ self: {
      mkDerivation {
        pname = "hips";
        version = "0.1";
-       sha256 = "0m3ribabhpdkwavhywjpc8iqqa9bbdl19d7g3agm4f402gd3rmvr";
+       sha256 = "79d73cda138038529f1aefb414685b2b298c236257720fb7e2b35db8d48a7954";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -68068,7 +68303,7 @@ self: {
      mkDerivation {
        pname = "hircules";
        version = "0.4.1";
-       sha256 = "1i291m3i3c082nsgg7mx2xx2a0q97kdmyashz26i4varqkwhz7qx";
+       sha256 = "1d9f0ff9c4596d128df8502b5fdb3c0903257a17bd9ef7b41508b011470d49c4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -68088,7 +68323,7 @@ self: {
      mkDerivation {
        pname = "hirt";
        version = "0.0.1.1";
-       sha256 = "0scn4gljgx0ig2fr4rfavk6k3pcychpxlasffd6gp2k1v3sb850v";
+       sha256 = "1b14b4f4d8618afb4c734e2bda2f649edd31cddcca65929d7811f427e9239669";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -68110,7 +68345,7 @@ self: {
      mkDerivation {
        pname = "hissmetrics";
        version = "0.5.1";
-       sha256 = "1rz0yxng4szhmjj1n6d36ljv3388ch8nih09yjrxk4l83zd6hc6d";
+       sha256 = "cd3068da1f8892d9b3f409c0681164088db12535a3191ba4acf06bf26cf7e0e7";
        libraryHaskellDepends = [
          base bytestring conduit http-conduit http-types text time
        ];
@@ -68129,7 +68364,7 @@ self: {
      mkDerivation {
        pname = "hist-pl";
        version = "0.3.2";
-       sha256 = "01c6k3f432yhcvcz7k4w29z7kbvhxlcnh57z1m47qbkymm5b4y7b";
+       sha256 = "eb78b24aad7e2e7c480dff146819ed70af797e129cccf3d966d08b41dc988605";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68153,7 +68388,7 @@ self: {
      mkDerivation {
        pname = "hist-pl-dawg";
        version = "0.2.1";
-       sha256 = "1ghhwabi46dimzfk79nkcnk8s4rlcyvqfcpr8ay7sfy7xns2ahjg";
+       sha256 = "4f4225b4edc73b7dbc42f93287b76734138da665d3a633ddafb1191297e210be";
        libraryHaskellDepends = [
          base binary containers dawg text text-binary
        ];
@@ -68169,7 +68404,7 @@ self: {
      mkDerivation {
        pname = "hist-pl-fusion";
        version = "0.5.3";
-       sha256 = "0ism9qw3g0x0r40qm6v0gj1b2fj5zdnfik7b4h0b0dqyi08m6sq3";
+       sha256 = "036b5311881e37b00024ebcce86cfb453ab1827c609b8a01c9a08337384e5547";
        libraryHaskellDepends = [
          base binary containers dawg hist-pl-dawg hist-pl-lexicon polimorf
          text text-binary
@@ -68187,7 +68422,7 @@ self: {
      mkDerivation {
        pname = "hist-pl-lexicon";
        version = "0.6.1";
-       sha256 = "1baq1a5l44q56msp2y2m9hyd5v841jkxm0cdlgi816fmc0768cqk";
+       sha256 = "1333640e60d59980e2a38d81daa70c04edd23c4c55787175350513428b0a58ad";
        libraryHaskellDepends = [
          base binary containers dawg directory filepath hist-pl-dawg
          hist-pl-types pipes text transformers
@@ -68203,7 +68438,7 @@ self: {
      mkDerivation {
        pname = "hist-pl-lmf";
        version = "0.1.0";
-       sha256 = "146vz15fig8k1wcvcw7fg64abxvg1nyarvhigz9jkzf5yngkzwvm";
+       sha256 = "75f33f9ff5c5fd29d37f11eeacbc0d6ff7a58879ee70b6190f13bde84af8db90";
        libraryHaskellDepends = [ base hist-pl-types polysoup text ];
        jailbreak = true;
        homepage = "https://github.com/kawu/hist-pl/tree/master/lmf";
@@ -68217,7 +68452,7 @@ self: {
      mkDerivation {
        pname = "hist-pl-transliter";
        version = "0.1.1";
-       sha256 = "146ywyh67a0hasgcpfmffrj8w1kg6anksaa3mm9f80k83shqhvrb";
+       sha256 = "2b6f88a11e6802e452ad43293dad326f068e6476aebacb9e5610a863a0e7de90";
        libraryHaskellDepends = [ base parsec ];
        homepage = "https://github.com/kawu/hist-pl/tree/master/transliter";
        description = "A simple EDSL for transliteration rules";
@@ -68229,7 +68464,7 @@ self: {
      mkDerivation {
        pname = "hist-pl-types";
        version = "0.1.0";
-       sha256 = "0i13aj1xcwap0k3w48vyiiganbvj93zydawmw3gw7m0kr6nl5l9v";
+       sha256 = "3bd142adc913d4c3dfe095abe6ff48722fab5e8c7e23c2c7045771d683542344";
        libraryHaskellDepends = [ base binary text text-binary ];
        jailbreak = true;
        homepage = "https://github.com/kawu/hist-pl/tree/master/types";
@@ -68244,7 +68479,7 @@ self: {
      mkDerivation {
        pname = "histogram-fill";
        version = "0.8.4.1";
-       sha256 = "0zamqza4ky90l27sjgv55rp7s1g4hs0k0qn2qza7lfwk991ijn9q";
+       sha256 = "385919434a933b7ad4c7c262308186e4057d6e2e653fa98fa020f949d4c7557d";
        libraryHaskellDepends = [
          base deepseq ghc-prim monad-primitive primitive vector
        ];
@@ -68258,7 +68493,7 @@ self: {
      mkDerivation {
        pname = "histogram-fill-binary";
        version = "0.6.2.1";
-       sha256 = "0bv70h1q8h50x3sr8ia6855vw0rrbvnzlnnh45k4i1dfadj6zsi2";
+       sha256 = "22ea6f6453ae85486621d05afaed5e3903be4b41464594f5e8a040840304672f";
        libraryHaskellDepends = [ base binary histogram-fill vector ];
        homepage = "https://github.com/Shimuuar/histogram-fill/";
        description = "Binary instances for histogram-fill package";
@@ -68270,7 +68505,7 @@ self: {
      mkDerivation {
        pname = "histogram-fill-cereal";
        version = "0.6.2.0";
-       sha256 = "17bnn6cb64333ak0qh841192jh2zwxg73rbc3zh5agp00wi23ism";
+       sha256 = "55c7212207e03e55e01f6ce5715ee75f4029520804410ca61a6310b398b1769d";
        libraryHaskellDepends = [ base cereal histogram-fill vector ];
        homepage = "http://bitbucket.org/Shimuuar/histogram-fill-cereal/";
        description = "Library for histograms creation";
@@ -68284,7 +68519,7 @@ self: {
      mkDerivation {
        pname = "historian";
        version = "0.0.1";
-       sha256 = "1lgajnq092jk4izy86qcw71ghxz6b8mprm4ha3ybrm5i2rlh12r6";
+       sha256 = "268b006916b1d4bcfc5090d47c2b5ae677f8c2e10c1be47f24538a04b095ead1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -68305,7 +68540,7 @@ self: {
      mkDerivation {
        pname = "hit";
        version = "0.6.3";
-       sha256 = "0wg44vgd5jzi0r0vg8k5zrvlr7rcrb4nrp862c6y991941qv71nv";
+       sha256 = "db86b3712029a4e40d1306dd6cc9ca2c9f4c77fe65a2b74106f1cbd2de26e471";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68328,7 +68563,7 @@ self: {
      mkDerivation {
        pname = "hjcase";
        version = "0.2.0.0";
-       sha256 = "0d1pb24jqk2dj635hy1way9axr9719g1ppxmxr4jpbb0sj6xphjk";
+       sha256 = "53c2db8dd460ad2b49eeb5df1b5e0a27e5ae92573c785886914d4c2c89583734";
        libraryHaskellDepends = [
          aeson base bytestring HUnit test-framework test-framework-hunit
          text unordered-containers vector
@@ -68344,7 +68579,7 @@ self: {
      mkDerivation {
        pname = "hjpath";
        version = "3.0.1";
-       sha256 = "0wmzxwi24q7r0yxnalzqnn3k0bzf7wc4ql26dv94pvzir156kahj";
+       sha256 = "12aa694ac8f1ef4bd26e46504c183fee2f3087b5f85365bb07f9602222efbf72";
        libraryHaskellDepends = [ base containers hjson parsec ];
        homepage = "http://bitcheese.net/wiki/code/hjpath";
        description = "XPath-like syntax for querying JSON";
@@ -68358,7 +68593,7 @@ self: {
      mkDerivation {
        pname = "hjs";
        version = "0.2.1";
-       sha256 = "0gk4misxbkc2x8hh7ynrj1ma91fs0h6q702w6r0kjq136fh48zhi";
+       sha256 = "117e44a03323603941365c80830d04da85a46a90d9fa0321ea82cdd575ac643e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68378,7 +68613,7 @@ self: {
      mkDerivation {
        pname = "hjsmin";
        version = "0.1.5.0";
-       sha256 = "1mzi7czzw1b8avkfzmsl79hqg57dcrcfp6klzx15drnbl7c1zn7l";
+       sha256 = "f4d81fd8a1cbe65642ff749aeb5866ed9487613a54d7efe6566805fe3f3bf1d7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68403,7 +68638,7 @@ self: {
      mkDerivation {
        pname = "hjson";
        version = "1.3.2";
-       sha256 = "1r59g5ypqjsldflsddg7pzpa6j8jps5nwm4h9cwiw7qk734rjik8";
+       sha256 = "684699c938131f1e394b90546e8bbe1249a3eebfe7b5a6a96b544b7c7d79a9e4";
        libraryHaskellDepends = [ base containers parsec ];
        description = "JSON parsing library";
        license = stdenv.lib.licenses.bsd3;
@@ -68414,7 +68649,7 @@ self: {
      mkDerivation {
        pname = "hjson-query";
        version = "1.0.2";
-       sha256 = "0sj86rm5pz0q9079f5kjnpz51dxvvq72waaf8h64jzrrhkpz8mlx";
+       sha256 = "9d56f4ef84397f490c444e292e0edebbb750feb57216970e4818fc5b6a36486a";
        libraryHaskellDepends = [ base containers hjson ];
        description = "library for querying from JSON";
        license = stdenv.lib.licenses.bsd3;
@@ -68427,7 +68662,7 @@ self: {
      mkDerivation {
        pname = "hjsonpointer";
        version = "0.2.0.3";
-       sha256 = "13n0fzhd2fmy7k5iafmg3cxd2lmpsfvvbg1a0q793wz5f3glw0l3";
+       sha256 = "83024edf70e5f3910e062abcb5b7d3b752d13a1baf3a15cb3cbe3ad1e077c08e";
        libraryHaskellDepends = [
          aeson base text unordered-containers vector
        ];
@@ -68450,7 +68685,7 @@ self: {
      mkDerivation {
        pname = "hjsonschema";
        version = "0.6.0.1";
-       sha256 = "1m7fg179khkmyhnhqa32gbaf2dgg27i4n36fafqm60pyc5kzhz69";
+       sha256 = "c97cf86761fe0253b153ce0c4be211ef35e1d47a62280c2df475c2994e78eed4";
        libraryHaskellDepends = [
          aeson base bytestring file-embed hashable hjsonpointer http-client
          http-types regexpr scientific text unordered-containers vector
@@ -68474,7 +68709,7 @@ self: {
      mkDerivation {
        pname = "hlatex";
        version = "0.3";
-       sha256 = "03v8law4yfm63f44zyiqngjmpismk8clqisq4sl4gcp1yc1hn704";
+       sha256 = "041c0b03f3e1b247a82658474c199a55c75be5b338fa4f881ba63a4fb8a2680f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68496,7 +68731,7 @@ self: {
      mkDerivation {
        pname = "hlbfgsb";
        version = "0.0.1.0";
-       sha256 = "0nar59rbi5zr6gi2k0f49f09fnxcmshnq9bb2dh973a4y3gcw6dx";
+       sha256 = "bd19cedef0448d9360136b256ca1aeac5b97804bc48129e233f997b8722a5959";
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ gfortran ];
        libraryToolDepends = [ gfortran ];
@@ -68516,7 +68751,7 @@ self: {
      mkDerivation {
        pname = "hlcm";
        version = "0.2.2";
-       sha256 = "14yqc02kfp2c9i22inma29cprqz9k8yx6c7m90kwimv4psv8766a";
+       sha256 = "ca9883b6be64d7c82748f530d33d9ae9e37c5912aada28444c4c5c370560d893";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68543,7 +68778,7 @@ self: {
      mkDerivation {
        pname = "hledger";
        version = "0.26";
-       sha256 = "1gixj6i99rqbn6ziwpni2scgv9sdd3yvxj6d3i1ivirmsx2rd3bm";
+       sha256 = "758d9645d735c71d431ccdc8befd684da7fd9816d15e1ebfb10be794a2913dbe";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68576,7 +68811,7 @@ self: {
      mkDerivation {
        pname = "hledger-chart";
        version = "0.16.1";
-       sha256 = "1yk563032ir98gqdvxazjjl1alg6q1pflzawh11pr3zrdnriracn";
+       sha256 = "96a91cb36df98f7c43805c7dea6ec0e65115a8945ff5ddf043294731c03065fa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -68595,7 +68830,7 @@ self: {
      mkDerivation {
        pname = "hledger-diff";
        version = "0.2.0.4";
-       sha256 = "1p0b2xc2axsigmbc5lhl12acsjjvn0j8gjlwp3v4ggyanwyj686r";
+       sha256 = "d920233db7cabf47f6b89cca8724b05b4acd940814d2c2567d51772558170bdc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib time ];
@@ -68609,7 +68844,7 @@ self: {
      mkDerivation {
        pname = "hledger-interest";
        version = "1.4.4";
-       sha256 = "16knk1cwrpg5jn6vgcab7hqpjzg33ysz57x1f2glrmhhv1slmbfn";
+       sha256 = "d6ad4a75d810d64c9f70a19ff2b51fe37d79313c4bb1b78d95e5ddcc5998769a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -68627,7 +68862,7 @@ self: {
      mkDerivation {
        pname = "hledger-irr";
        version = "0.1.1.7";
-       sha256 = "1gi7v5xsx1hv4lljlx19v4rwvnh7raglxzh4mgyiwlnwqybc2cr4";
+       sha256 = "2433c196c7dc521efdab04fe4e9fca07dacd33d929742a29251b86ae7bd927be";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -68647,7 +68882,7 @@ self: {
      mkDerivation {
        pname = "hledger-lib";
        version = "0.26";
-       sha256 = "0cm5d65kfxha6280q9iibrj4a0p5g6srfl28x1f8vay41xjg80nh";
+       sha256 = "d002f4640fc4ab8d5ce8485097b579e50245645e31260c90300a76378b69a532";
        libraryHaskellDepends = [
          array base base-compat blaze-markup bytestring cmdargs containers
          csv Decimal directory filepath HUnit mtl mtl-compat old-time parsec
@@ -68671,7 +68906,7 @@ self: {
      mkDerivation {
        pname = "hledger-vty";
        version = "0.16.1";
-       sha256 = "10aq9apxz6nrzvvynha0wkhy34dn8dybizr8assni6rns8ylh188";
+       sha256 = "0805483dd2369b68b55628ffb87c43b691e1e1e44041ebf7fed99adfaf4a5881";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -68696,7 +68931,7 @@ self: {
      mkDerivation {
        pname = "hledger-web";
        version = "0.26";
-       sha256 = "019r4jy0kss62ya883rgzkc6lkp14f0dfkdfiahpl4587fcvpxsi";
+       sha256 = "51f7bb993ba8107aa18aae4dd78023e14e6ad8fc2f0f84941746eb09bc243905";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68727,7 +68962,7 @@ self: {
      mkDerivation {
        pname = "hlibBladeRF";
        version = "0.1.0.6";
-       sha256 = "15k15afy04kld6ar317lk441js873fcyk8qh92r98hnhbpq3nrmw";
+       sha256 = "bc663bf05dd04294b24810a3e9991b0769190899f4849195697412e09d2a6196";
        libraryHaskellDepends = [ base bindings-DSL bytestring ];
        libraryPkgconfigDepends = [ libbladeRF ];
        testHaskellDepends = [ base hlint ];
@@ -68742,7 +68977,7 @@ self: {
      mkDerivation {
        pname = "hlibev";
        version = "0.4.0";
-       sha256 = "0416w0k5ahnj57gc6n15ihpsyznmm36s1sjkycl35l7s8bxdldyw";
+       sha256 = "dc37dafa42fad03228f353eaa0cda8d57eaf2f8c2558c3de29d2425526e02610";
        libraryHaskellDepends = [ base network ];
        librarySystemDepends = [ ev ];
        homepage = "http://github.com/aycanirican/hlibev";
@@ -68756,7 +68991,7 @@ self: {
      mkDerivation {
        pname = "hlibfam";
        version = "0.2";
-       sha256 = "10rxwfq2ppmqs3kjb8cq6l04g0qsxqy7w7ri7dj013kiz7rzk1yd";
+       sha256 = "cd87f9f3f9718e00643b311f7e3cee1a8347003598a125e7d0b8de2bb0e33d83";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fam ];
        description = "FFI interface to libFAM";
@@ -68769,7 +69004,7 @@ self: {
      mkDerivation {
        pname = "hlibgit2";
        version = "0.18.0.14";
-       sha256 = "0fxglcgi0iwj9xqgx1f3dixia9pqfzz0yq9iq7flaggpr9pvn3n0";
+       sha256 = "c00ebb6fcaf73d45ddc131610ffe77f826157b6cc385fe704f9247101fa3af3b";
        libraryHaskellDepends = [ base bindings-DSL zlib ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base process ];
@@ -68782,7 +69017,7 @@ self: {
      mkDerivation {
        pname = "hlibsass";
        version = "0.1.4.0";
-       sha256 = "062qsg5mr0qsa5ah1d0xx7njkpn4j4g6x4sv3skgvgc9855gywr6";
+       sha256 = "2673ff4a4189bdfda61e5b936e1e91c4de29ede91db40055511a835ccbd35818";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ sass ];
        testHaskellDepends = [ base hspec ];
@@ -68799,7 +69034,7 @@ self: {
      mkDerivation {
        pname = "hlint";
        version = "1.9.21";
-       sha256 = "14v3rdjjlml9nimdk7d5dvir2bw78ai49yylvms9lnzmw29s3546";
+       sha256 = "8694a193e0f55b9a74ddd4fb44a242872f91e36ea59dd96ab489562a65cb6393";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68817,7 +69052,7 @@ self: {
      mkDerivation {
        pname = "hlogger";
        version = "0.0.3.0";
-       sha256 = "1q3jsnxy7x0lv7wqfv9hlqnr22661k4agbb8yjbhj32fxyjqrn4f";
+       sha256 = "8ed88ca5ef4e0c0997f468ada7c80cc608912da6306d87f9d914f4e3bbd572e0";
        libraryHaskellDepends = [ base old-locale time ];
        homepage = "http://www.pontarius.org/sub-projects/hlogger/";
        description = "Simple, concurrent, extendable and easy-to-use logging library";
@@ -68832,7 +69067,7 @@ self: {
      mkDerivation {
        pname = "hlongurl";
        version = "0.9.3";
-       sha256 = "1njj7cvj9zjy0gghkr33bzwsv6lj27xvf56kicsr0pyyn76wplv5";
+       sha256 = "65d3cbcdb1de5f90358bd314b7fb11929aadf95f63e409df035efe24373b52da";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base curl json ];
@@ -68848,7 +69083,7 @@ self: {
      mkDerivation {
        pname = "hls";
        version = "0.15";
-       sha256 = "0h32fyvnqkxx8c9vfpdjvnqaxkvr8b15myjavxmnm6kwh7v2796l";
+       sha256 = "d4a423f6817c9a6a6bdf4afa5ac24279cfaeb0ddb25db71343bd4f6cb7776240";
        libraryHaskellDepends = [ base containers hcg-minus hps ];
        homepage = "http://rd.slavepianos.org/t/hls";
        description = "Haskell Lindenmayer Systems";
@@ -68860,7 +69095,7 @@ self: {
      mkDerivation {
        pname = "hlwm";
        version = "0.1.0.1";
-       sha256 = "1vp21440v9gq4mvnqnsw1ha72ywgc4hmp137pkpvs5p13ixyfrgi";
+       sha256 = "f165e77b1ce116bdefbc67845b21618f7b71140c5c5b6c7725f8a50d0809e2ee";
        revision = "1";
        editedCabalFile = "ce22b9186e03c83f13e56b33630f4af561b604c51374c23dc1ef4e24ced9a54e";
        isLibrary = true;
@@ -68881,7 +69116,7 @@ self: {
      mkDerivation {
        pname = "hly";
        version = "0.15";
-       sha256 = "192szfq39g3fdcdsxj4bsi13bfha8gjbqbixav3iywmdsgxp1hj8";
+       sha256 = "48c270fbd3ad721fc7563d2ebce4430aba3542d48bc8ae1b6b6ebc34b0fb5aa4";
        libraryHaskellDepends = [ base directory filepath hmt process ];
        homepage = "http://rd.slavepianos.org/t/hly";
        description = "Haskell LilyPond";
@@ -68896,7 +69131,7 @@ self: {
      mkDerivation {
        pname = "hmark";
        version = "1.2";
-       sha256 = "1s4ichb5dchcimcq9pvdddv2ibbdk2cb2b7p0l7p9s5lxn53bxgg";
+       sha256 = "eff5358aedb4e8740f05f72cb198986dad28766b6ddf84598d0cb256166491e8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68914,7 +69149,7 @@ self: {
      mkDerivation {
        pname = "hmarkup";
        version = "3000.0.1";
-       sha256 = "0p6f1jd1b01dvzffiac17f8z0l403f54vrph8k9b3549lpjfh452";
+       sha256 = "a210e8e4a58994b1d244f0e64d8a1b8050f0913b81a9e8dcdf2d80159a0cce5c";
        libraryHaskellDepends = [
          base containers mtl network parsec xhtml
        ];
@@ -68930,7 +69165,7 @@ self: {
      mkDerivation {
        pname = "hmatrix";
        version = "0.16.1.5";
-       sha256 = "1da1iy2rzz51l69nixacsl7gqhkzld1w8z5h0klkha3mcnf1kkkq";
+       sha256 = "78ce199c65752838e904b07cc443a37f42fc0ed54cf56893a1a1fc9f858f41b5";
        libraryHaskellDepends = [
          array base binary bytestring deepseq random split storable-complex
          vector
@@ -68946,7 +69181,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-banded";
        version = "0.0";
-       sha256 = "05jgm3hnlylnfhavcicjbhbxq929whm6mapggfwbxkzajhh0paaj";
+       sha256 = "52a90b2094eacfbeb87befaa6a2ae44924dc175c9245b61574967a6ae1a84f16";
        libraryHaskellDepends = [ base hmatrix transformers ];
        librarySystemDepends = [ lapack ];
        jailbreak = true;
@@ -68961,7 +69196,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-csv";
        version = "0.1.0.2";
-       sha256 = "0cbnxzl9ymqnyrikwk13d660l3hmi4ln5zdx0q814k8b7hyvsnkb";
+       sha256 = "6b5abd3d3c0b4d121006bdfd622989150e0a8c69234c3e63f616579fe8ef7631";
        libraryHaskellDepends = [ base bytestring cassava hmatrix vector ];
        homepage = "https://github.com/grtlr/hmatrix-csv";
        description = "CSV encoding and decoding for hmatrix";
@@ -68973,7 +69208,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-glpk";
        version = "0.4.1.0";
-       sha256 = "0jy00mblbqp7bx0nxmvzfpa94b21fbl4cam0mha673hzq11rfrxi";
+       sha256 = "b1679743c01f8e6314aca02a46e872412c92d4757fd76e415fe7e2455705c04b";
        libraryHaskellDepends = [ base containers hmatrix ];
        librarySystemDepends = [ glpk ];
        homepage = "https://github.com/albertoruiz/hmatrix";
@@ -68987,7 +69222,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-gsl";
        version = "0.16.0.3";
-       sha256 = "07hg9rfrr1029n9q8xyicyh4rr9x4c02cqn1xxnks9p9qyccf4kg";
+       sha256 = "6f12c798c7e9263d6defc1622600233de54ca067d17784934d02849c5d4e0f1e";
        libraryHaskellDepends = [
          array base hmatrix process random vector
        ];
@@ -69002,7 +69237,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-gsl-stats";
        version = "0.4.1";
-       sha256 = "113gi92xdck75zrllpncrnm72fj8wd2wcbf237jflkpbqcmzf8zq";
+       sha256 = "f823f72bc3eb4eeae419c22dc645e3483a71aacdcc5e4af32f67b2d6458a6f84";
        libraryHaskellDepends = [ base binary hmatrix storable-complex ];
        libraryPkgconfigDepends = [ gsl ];
        homepage = "http://code.haskell.org/hmatrix-gsl-stats";
@@ -69016,7 +69251,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-mmap";
        version = "0.0.5";
-       sha256 = "03z1f1xqw4hqh41q6hh8p103cl7dg9hqcawqlinapfmkvw5mzy8d";
+       sha256 = "0df95f0bdfb3baab6ca4982b86617aed503640b8084283038118128e7b70e10f";
        libraryHaskellDepends = [ base hmatrix mmap ];
        homepage = "http://github.com/alanfalloon/hmatrix-mmap";
        description = "Memory map Vector from disk into memory efficiently";
@@ -69028,7 +69263,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-nipals";
        version = "0.2";
-       sha256 = "0afmpwfi4hqz5bpcsm579mcvz1dx7vxqmqj2rb6axnw9512xyarj";
+       sha256 = "322bdf452889dbaeccca42e28afb3ebd85bf594da754cdee2a1f43121dbfd529";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hmatrix ];
@@ -69042,7 +69277,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-quadprogpp";
        version = "0.2.0.2";
-       sha256 = "02ysxyy7ixpnrghl0ignfmjy6j358i5xbmklmpxykkg27jgzvic3";
+       sha256 = "83c5fd9f3ce2cde9fbad74d6d54b446548e36575f64540e1cbf6f678bcefda0b";
        libraryHaskellDepends = [ base hmatrix vector ];
        librarySystemDepends = [ QuadProgpp ];
        description = "Bindings to the QuadProg++ quadratic programming library";
@@ -69055,7 +69290,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-repa";
        version = "0.1.2.1";
-       sha256 = "0xx02kll13c2zw5x13p9746av2yhgpybfxi508qgi84drfa8caa8";
+       sha256 = "48298694cb8da0f830022576b7fc7dd08bad0c39e98ed00bff828d40e914a077";
        libraryHaskellDepends = [ base hmatrix repa vector ];
        homepage = "http://code.haskell.org/hmatrix-repa";
        description = "Adaptors for interoperability between hmatrix and repa";
@@ -69067,7 +69302,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-special";
        version = "0.3.0.1";
-       sha256 = "1ziqzbfrk7xyah5n0cys1ccnmj2z91wxdamanv3y5v717zhdrqix";
+       sha256 = "3de2dce03fe1ece2c7b6aaaad679485fc86a190bda33600b54be9f99ddfa38fe";
        libraryHaskellDepends = [ base hmatrix hmatrix-gsl ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Interface to GSL special functions";
@@ -69081,7 +69316,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-static";
        version = "0.3.0.2";
-       sha256 = "1qjxj8k4cracinyyjpk0nr3c5n119v39kpxig78c11cjhvhm3zgi";
+       sha256 = "f1fd51e1869285c0d079b1df99c64e21d8c246b6605ee9bd8d4c654626925de2";
        libraryHaskellDepends = [
          array base haskell-src-meta hmatrix parsec template-haskell tfp
        ];
@@ -69097,7 +69332,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-svdlibc";
        version = "0.3.1";
-       sha256 = "0mi41n31i4bjnqjnsmqs4mbrprg3sx4vx4wqixgyp3qk0jm6lijm";
+       sha256 = "55466aaa04138feb5f8f9893be49d7e3e59b57251a576d25b6729118860d2456";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hmatrix ];
@@ -69114,7 +69349,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-syntax";
        version = "0.1.2.1";
-       sha256 = "0qy5dx480hf9i03d16kylg2l8dsj10lzwfbik5ijqa4x3h7h038b";
+       sha256 = "0b0d000f1c9d282c63997139fe2908523744c5a37e9ad00688c94180486fc563";
        libraryHaskellDepends = [
          base haskell-src-exts haskell-src-meta hmatrix template-haskell
        ];
@@ -69132,7 +69367,7 @@ self: {
      mkDerivation {
        pname = "hmatrix-tests";
        version = "0.4.1.0";
-       sha256 = "0jrq9719japf9a7v14xbwqj4fs8y14wkji13jhyn00x1xpp4nkh3";
+       sha256 = "034e4beeeda103603d9423443939091e694724e6ab93b08f4aee2a99c249384b";
        libraryHaskellDepends = [
          base hmatrix hmatrix-gsl HUnit QuickCheck random
        ];
@@ -69150,7 +69385,7 @@ self: {
      mkDerivation {
        pname = "hmeap";
        version = "0.15";
-       sha256 = "19hip2xzlsgj1fd8y4l4zhn4lcj8n8qyrayn6idzvlskx4vca0bh";
+       sha256 = "7001c536e953d3fd5b34d6abec31b248324a2cfc84128f9a0bf269fabbb811a6";
        libraryHaskellDepends = [
          array base bytestring bytestring-lexing delimited-text parsec
        ];
@@ -69167,7 +69402,7 @@ self: {
      mkDerivation {
        pname = "hmeap-utils";
        version = "0.14";
-       sha256 = "1dnmvzy7vkx2rfbkkqapfpql8h0gm9sq0333r90hy5nsyl9hhbq8";
+       sha256 = "082f0813f5da160f41ca630c8075aa0f4044f17557e13997cba2cf7dfcdfd5b6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -69188,7 +69423,7 @@ self: {
      mkDerivation {
        pname = "hmemdb";
        version = "0.4.0.0";
-       sha256 = "0zdz9nkianzviy0rn7fvzs01ymnz89p25kiis64rfvj3zwxk535w";
+       sha256 = "bc8c323bff436e9789d131ce226e42df561f80fedb1d9b818ffb5b15a74dbf7d";
        libraryHaskellDepends = [
          base binary containers monad-stm stm transformers
        ];
@@ -69201,7 +69436,7 @@ self: {
      mkDerivation {
        pname = "hmenu";
        version = "0.1.0.1";
-       sha256 = "0ym3nzyx1jwcc7m6qj8zchs2q73rj82d7f1r2rvykhns7ca20hrp";
+       sha256 = "374320143bdac2e9771639b8d30492791c2c34641f496cea618ccbd0fdb7a37a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base MissingH process ];
@@ -69216,7 +69451,7 @@ self: {
      mkDerivation {
        pname = "hmidi";
        version = "0.2.2.0";
-       sha256 = "1khqhw69c3bf3qj8pzxz876xisr099rgdgf2rr101x83h9hj8acb";
+       sha256 = "8b2924618203f50042cec2bdf6724a20ebd8cd41bfff8b241e6e0d960c8718ce";
        libraryHaskellDepends = [ base stm ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Binding to the OS level MIDI services";
@@ -69230,7 +69465,7 @@ self: {
      mkDerivation {
        pname = "hmk";
        version = "0.9.7.3";
-       sha256 = "08cq1lk1nkhkcjjjvkzy4xrr0gx6j2lpsv2vmj25kg6j9j33ilxh";
+       sha256 = "b0d338864cd2bc5984ac5b6c7da990a63f907327fecf2da564134e1b260d9821";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -69252,7 +69487,7 @@ self: {
      mkDerivation {
        pname = "hmm";
        version = "0.2.1.1";
-       sha256 = "08gdicnhls8y180il2k51zrcra1acw8m1qw0s2nz5w57mhfnxq31";
+       sha256 = "61e06e1daca7f0f2add080e35011672aa8ccf20f650a1a010a1e690a2d8bed21";
        libraryHaskellDepends = [
          array base data-memocombinators list-extras logfloat
        ];
@@ -69269,7 +69504,7 @@ self: {
      mkDerivation {
        pname = "hmm-hmatrix";
        version = "0.0.1";
-       sha256 = "1kkikv3spnvqms59980p8aappw3wh26y9qs2c8ykia5fpz9zag4h";
+       sha256 = "903cf5d3bfaea8383d6242e3e48d807cf07b954217a0948aae78dbabc79e71ce";
        libraryHaskellDepends = [
          array base containers explicit-exception hmatrix lazy-csv non-empty
          random semigroups transformers utility-ht
@@ -69289,7 +69524,7 @@ self: {
      mkDerivation {
        pname = "hmp3";
        version = "1.5.2.1";
-       sha256 = "0kfqzydilajcpaazpbhmpv3h18n3lx839wxmcbjlzvjc78ajblb3";
+       sha256 = "63d125153a4cee4fe562b5f33450a7c3a200c7be15aefb95ba4c2a1a9bffd84d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -69308,7 +69543,7 @@ self: {
      mkDerivation {
        pname = "hmpfr";
        version = "0.3.3.5";
-       sha256 = "00gqrmfwg7hk21iyfbma8h4ahpxgj21wi9fcxjdms506ahk7rwf4";
+       sha256 = "c4f17c265406145d9beccca5c88390af5fa80844aa2ee76310139ec75dcdf801";
        libraryHaskellDepends = [ base integer-gmp ];
        librarySystemDepends = [ mpfr ];
        homepage = "http://code.google.com/p/hmpfr/";
@@ -69326,7 +69561,7 @@ self: {
      mkDerivation {
        pname = "hmt";
        version = "0.15";
-       sha256 = "051kgsh9nl5f1nw8a24x7ds18g6ppzbhk3d9lf74nvvnccnzg3a9";
+       sha256 = "498df72d63766f4b8ea3a98d09d7bfd73c14743b9d0885b80dae509ba07e3314";
        libraryHaskellDepends = [
          array base bytestring colour containers data-ordlist directory
          filepath lazy-csv logict multiset-comb parsec permutation primes
@@ -69344,7 +69579,7 @@ self: {
      mkDerivation {
        pname = "hmt-diagrams";
        version = "0.15";
-       sha256 = "1g64b31bz31x0kiivazn20s22y2w7dz9f2gw5cnfkcnjd20k7glm";
+       sha256 = "95be338168d2b2e92c2bfc09977e3b5c78213410f6ab1de3043d8cbfc258c4bc";
        libraryHaskellDepends = [
          base cairo colour filepath hcg-minus hcg-minus-cairo hmt
          html-minimalist process xml
@@ -69361,7 +69596,7 @@ self: {
      mkDerivation {
        pname = "hmumps";
        version = "0.1.1";
-       sha256 = "06bixsd7vzfj0gwv0b2880p4xx3f9j7y1snindlnlcfr1qdp9jn2";
+       sha256 = "c2ca741b0ed9316a69b3d1eae08f4c6ef44e2e40482cb0f903d2fd7d9aee7119";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -69383,7 +69618,7 @@ self: {
      mkDerivation {
        pname = "hnetcdf";
        version = "0.3.0.0";
-       sha256 = "1309kzb5jrc9yy18bir3dy3r5xhmfnbd180ky9x4l3i1m4q5r31s";
+       sha256 = "3a8c5c30a9210e4a7af213a0d0967515f692876f23c78582f7896559d69f098c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69413,7 +69648,7 @@ self: {
      mkDerivation {
        pname = "hnix";
        version = "0.2.1";
-       sha256 = "1y10w6ylgrdgy271a372f14rqdkvzlmpkjl08d5zg3r84jxhy6ia";
+       sha256 = "2a1a0fbb24288ff74b4380ca792bfd7b369c4970e20c158ef0afe547bde120f8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69438,7 +69673,7 @@ self: {
      mkDerivation {
        pname = "hnn";
        version = "0.2.0.0";
-       sha256 = "13i2rs1ab7kh2mzf34hckkihpbrxpxzwfcdd529zd7dynhd3psjw";
+       sha256 = "5cea3b1ab4be9df69328ad31c77fbf3daf0be39c0c92e17e15709ea582ce228e";
        libraryHaskellDepends = [
          base binary bytestring hmatrix mwc-random random vector
          vector-binary-instances zlib
@@ -69454,7 +69689,7 @@ self: {
      mkDerivation {
        pname = "hnop";
        version = "0.1";
-       sha256 = "0sfw9gmcn7qclgsgzqm9zalyxhz0mig91fabcfq3g0r98krgjnr2";
+       sha256 = "225bf9f244298337b0634bb9905eace0c3eea9faa9e2fff4a30c1fcbea4bdc69";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -69467,7 +69702,7 @@ self: {
      mkDerivation {
        pname = "ho-rewriting";
        version = "0.1";
-       sha256 = "1hmnqck385mhk140kgf8882lfa91bmip4pxbjnfpf62dwh0z39a3";
+       sha256 = "43a5f101e44d18779d95ab5f72635d2129470542c8bd094898b0163426c3b6c2";
        libraryHaskellDepends = [
          base compdata containers mtl patch-combinators
        ];
@@ -69485,7 +69720,7 @@ self: {
      mkDerivation {
        pname = "hoauth";
        version = "0.3.5";
-       sha256 = "06vk3dv2dby7wadxg4qq2bzy10hl8ix2x4vpxggwd13xy3kpzjqp";
+       sha256 = "17cb7fe7f07d84c6dfeb77932e7a441482e0ff121893d79be2c7af26761b731b";
        libraryHaskellDepends = [
          base binary bytestring crypto-pubkey-types curl dataenc entropy mtl
          old-locale random RSA SHA time utf8-string
@@ -69502,7 +69737,7 @@ self: {
      mkDerivation {
        pname = "hoauth2";
        version = "0.4.8";
-       sha256 = "14rhhk9667asdvdri9xm6jr4blrj5q1mb1g54mi94sz1vqh9hj3f";
+       sha256 = "6e489820dee16b926225e58555032e32d345b234b5a798db6e5a1d63d2843093";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69524,7 +69759,7 @@ self: {
      mkDerivation {
        pname = "hob";
        version = "0.0.1.0";
-       sha256 = "1m2sxbw5il818g50b0650cm5vrb7njclk09m0na6i3amx3q10xjc";
+       sha256 = "4c7610f0e8558d68940535814999b467e55d2a03c58005ca4301d158f8ea5ad4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69552,7 +69787,7 @@ self: {
      mkDerivation {
        pname = "hobbes";
        version = "0.2.2";
-       sha256 = "1pri63d59q918jv1hdp2ib06m6lzw9a2b6bjyn86b2qrrx2512xd";
+       sha256 = "ad8b5044cf198b6590f572992554e29f9a6ac08ae23618b64421e154da3031df";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -69573,7 +69808,7 @@ self: {
      mkDerivation {
        pname = "hobbits";
        version = "1.1.1";
-       sha256 = "0q668jvlpqs7y3l27fk9m96aa8rzhdkz8jf0whifdb2gahlhx9hs";
+       sha256 = "1aa60e29544face622e4c049f467833f23a54caa69ba23e8f047e34bb744c660";
        libraryHaskellDepends = [
          base deepseq haskell-src-exts haskell-src-meta mtl syb tagged
          template-haskell th-expand-syns transformers type-equality
@@ -69591,7 +69826,7 @@ self: {
      mkDerivation {
        pname = "hoe";
        version = "1.1.0";
-       sha256 = "0g8528jllh90f8zbrs229ms07lg7b397pm2zjccd6kriqpq1vfv0";
+       sha256 = "60bb1df0c5314fd318935fd47bd258e7d103744d42e8bc3e7220414a2512053d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -69608,7 +69843,7 @@ self: {
      mkDerivation {
        pname = "hofix-mtl";
        version = "1.0";
-       sha256 = "1xlsddrdv56n7ww7a377jwz43xkkckl5zygghwxs9k88wxzskvvd";
+       sha256 = "6defa97fe708cda43b87eff95fe86473f6413e97e70c75383fd694dd726b9af6";
        libraryHaskellDepends = [ base mtl star-to-star template-haskell ];
        jailbreak = true;
        description = "defining @mtl@-ready monads as * -> * fixed-points";
@@ -69623,7 +69858,7 @@ self: {
      mkDerivation {
        pname = "hog";
        version = "0.1.1";
-       sha256 = "0mmp7ymmzvhpwmwjjnin9493a81vijai7hcyqwv9wrfhdjnykb1d";
+       sha256 = "2dace9ad6cd0659e36c79ec113958c3b20351249365a2979e517ee5fab3fb756";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -69642,7 +69877,7 @@ self: {
      mkDerivation {
        pname = "hogg";
        version = "0.4.1.2";
-       sha256 = "0djgbgahhrfdpxknqfjqkqwzy7ra3d7mnxyv6n76kpldalhihklw";
+       sha256 = "9c4e1821558dde698e35db775b4f1b2a1fff399e583a6c67bfcd6508d55b4f36";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69659,7 +69894,7 @@ self: {
      mkDerivation {
        pname = "hogre";
        version = "0.1.5";
-       sha256 = "0ndgnflcj885ylxf8q8l71cykrpm4j6svzqxlpdynf054safq174";
+       sha256 = "e404ec94260538ebdba51dffad8d24f5e6e959381461e43af50521c9a8b3af59";
        libraryHaskellDepends = [ base cgen ];
        librarySystemDepends = [ OgreMain ];
        libraryPkgconfigDepends = [ OGRE ];
@@ -69676,7 +69911,7 @@ self: {
      mkDerivation {
        pname = "hogre-examples";
        version = "0.1.4";
-       sha256 = "10zq4qch5bs0aawvs0zg3yyz41lykg1jrna5jqxlrvbq0wfz2s5g";
+       sha256 = "af68f11d0778ed4c3b9645d92cc39b9e06f2bd1fef03bdb95240af021926f883";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hogre ];
@@ -69692,7 +69927,7 @@ self: {
      mkDerivation {
        pname = "hois";
        version = "0.1.0.0";
-       sha256 = "0awb7dfa77y7n88ljkcdxs63g37qyc5xkr0j7lqwzx23q83a5c4k";
+       sha256 = "93b0a206c243f4cf313d12e4d90bf3f88c378cee8d4d4911b2c79fa35c3b8b2b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -69709,7 +69944,7 @@ self: {
      mkDerivation {
        pname = "hoist-error";
        version = "0.1.0.2";
-       sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z";
+       sha256 = "1fd00441ad981323aed41442896d3a262ce29dc54771e654a952944a73530591";
        revision = "2";
        editedCabalFile = "fca4ac245a1bddf638317290deb580d05d1539c6a700b02744ce61e259e2e879";
        libraryHaskellDepends = [ base either mtl ];
@@ -69722,7 +69957,7 @@ self: {
      mkDerivation {
        pname = "hold-em";
        version = "0.1.0.0";
-       sha256 = "1j2ql6izsd85skd6l9j1qfg7pj5rf513096s9bkvqip9bb4ibr4r";
+       sha256 = "99e415c95ae946bce74ada24304271b9c87b9ec341266adad40535fda3a158c8";
        libraryHaskellDepends = [ base random safe ];
        jailbreak = true;
        description = "An engine for Texas hold'em Poker";
@@ -69734,7 +69969,7 @@ self: {
      mkDerivation {
        pname = "hole";
        version = "0.1.1";
-       sha256 = "05ba87wk9b5i5b4gsfvsj16rv91dqsmzyys6b5fkssrxh2ika36c";
+       sha256 = "cc0c35a3803d6b3d5d59467bffabc62da49d4d907a3bfdc82ab1ac34f9416a15";
        libraryHaskellDepends = [ base containers ];
        description = "Higher kinded type removal";
        license = stdenv.lib.licenses.bsd3;
@@ -69746,7 +69981,7 @@ self: {
      mkDerivation {
        pname = "holey-format";
        version = "2.1.0";
-       sha256 = "13f6f647ykssqgdqw4fp7gnr2ardxbcn41ksgs15v5dx1n1xvan1";
+       sha256 = "c1aadd830dbd955d827e7a0662d9ea2d2b91ed3bd7118edbc35a4f7f8871c68d";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69762,7 +69997,7 @@ self: {
      mkDerivation {
        pname = "holy-project";
        version = "0.2.0.0";
-       sha256 = "05lns2xkw44g2jf2fbrpzdi5iqzq7hxkhhv86ah08hr14qiyp3sg";
+       sha256 = "4f8feb2326214304a0326843383b3cf8e35862fb372f279c148f103ebbd09616";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69790,7 +70025,7 @@ self: {
      mkDerivation {
        pname = "homeomorphic";
        version = "0.1";
-       sha256 = "1wm15bdz02sjgpz2n266xd50q3p6mncnv8mhimky6ps1kmzb5r6c";
+       sha256 = "cce4b27e9d415fe3678db0a26d99ade60e0c4aebc6082bfe7d520bf0db2aa1f2";
        libraryHaskellDepends = [ base containers mtl QuickCheck ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/homeomorphic/";
        description = "Homeomorphic Embedding Test";
@@ -69803,7 +70038,7 @@ self: {
      mkDerivation {
        pname = "hommage";
        version = "0.0.6";
-       sha256 = "053zv30ghm7c9idb6za44zasnn88g85z4bzbdpfpixlkvcm4sbck";
+       sha256 = "932d4d2adb93f678dd6deb2ff20b7a0859abd527447db35a4cec54f8c0d87f14";
        libraryHaskellDepends = [
          array base directory haskell98 random time
        ];
@@ -69817,7 +70052,7 @@ self: {
      mkDerivation {
        pname = "hommage-ds";
        version = "0.0.5";
-       sha256 = "0gnwpzs6kwhf2wm0nqcgwqa1pp7xwbnqh337pr62w40i76g252v4";
+       sha256 = "648b229e3911102e4cbe670c88ede2fddc1b14e68f610b2a170ef269f4bfdc3e";
        libraryHaskellDepends = [
          array base DirectSound haskell98 hommage
        ];
@@ -69836,7 +70071,7 @@ self: {
      mkDerivation {
        pname = "homplexity";
        version = "0.4.3.0";
-       sha256 = "0xw3fkbzb3jqi5sr28a69ga632c30g4xwykgd0cq8imrz70jlvam";
+       sha256 = "556d2ac1f9b9468419686f7adec903838961d44b4621917589588ef5d7748377";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -69857,7 +70092,7 @@ self: {
      mkDerivation {
        pname = "honi";
        version = "0.1.0.0";
-       sha256 = "0g1w1i78a93d10zgdy9ixkflblx9xixa493hh2cc8jzznqsp5yfi";
+       sha256 = "d1f97235b6ff4bc498807024a27aeca9d345ddec31f9f63e086d24854e0c3c3c";
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ freenect OpenNI2 ];
        testHaskellDepends = [ base hspec HUnit ];
@@ -69872,7 +70107,7 @@ self: {
      mkDerivation {
        pname = "honk";
        version = "1.3.0.0";
-       sha256 = "102jw5j89amgvz3k3b05plpw9pjkhg1rjpjpcvpxq11x8mfdxyhf";
+       sha256 = "0efade5c453d04dcef66575e99c38353dec42fbd05ac31c7dfafaa8464e15280";
        libraryHaskellDepends = [ base ];
        homepage = "https://lambda.xyz/honk/";
        description = "Cross-platform interface to the PC speaker";
@@ -69886,7 +70121,7 @@ self: {
      mkDerivation {
        pname = "hoobuddy";
        version = "0.1.0.1";
-       sha256 = "0l1q6h0irfv3275jajvylajm2rhkfmvi1kpfan6n6z5adibh9and";
+       sha256 = "cdaa04576caa7c638d55eece107775136651a5a27e4b25cb1163bb1c01343850";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -69904,7 +70139,7 @@ self: {
      mkDerivation {
        pname = "hood";
        version = "0.2.1";
-       sha256 = "1f98v1bqrmh6cmmbsmcsdm3f250imp4rk0zi34di8fzlyqfcf2yh";
+       sha256 = "d00bc71cf6f43b141b19f18399c9ad1114e1466d9a55bd6a6506d68c57d828b9";
        libraryHaskellDepends = [ array base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Hood";
        description = "Debugging by observing in place";
@@ -69916,7 +70151,7 @@ self: {
      mkDerivation {
        pname = "hood-off";
        version = "0.2";
-       sha256 = "15rj6qfyhihzc5svl3dwkn387x7bbkl5am7h0kj5jjj8hv2q1pnc";
+       sha256 = "ccde80c586484a59e404f05455e85cebf483869dbc0dba75611f46e81d363297";
        libraryHaskellDepends = [ base ];
        description = "Dummy package to disable Hood without having to remove all the calls to observe";
        license = stdenv.lib.licenses.bsd3;
@@ -69928,7 +70163,7 @@ self: {
      mkDerivation {
        pname = "hood2";
        version = "0.2.1";
-       sha256 = "0iyi1zljywamfaqc0mbd1xw3gn1hq0lcdgx688rr8zliw23jix02";
+       sha256 = "02f42887e0917e943342a6bfc628c030d837780f6d55c0b07255712fe90fd147";
        libraryHaskellDepends = [ array base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Hood";
        description = "Debugging by observing in place";
@@ -69942,7 +70177,7 @@ self: {
      mkDerivation {
        pname = "hoodie";
        version = "0.1.0.0";
-       sha256 = "1q3wpsqz833vypqnd7ljiraiyn1klxid35mh5vyizldk3i0qqf6w";
+       sha256 = "dc388c411cb3d11ffd2eb096d162a733581f558e929e66f1f57b0cf4b1be7ce0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -69961,7 +70196,7 @@ self: {
      mkDerivation {
        pname = "hoodle";
        version = "0.4.0";
-       sha256 = "0ygmizbhag16ifdyp8gcvs0m9vinvirn8v7jfbi2m457bllmbsmq";
+       sha256 = "b8ea55295da7902ae272f26c6473dc36ee5481deeca1eb9b8b263c05d78ff579";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69982,7 +70217,7 @@ self: {
      mkDerivation {
        pname = "hoodle-builder";
        version = "0.3.0";
-       sha256 = "0g4a3gf1mgf5gyniif0i2b89dz416h28171mwx7k7ivjw23gjvm7";
+       sha256 = "a76ef986e072c7334fe7359c80043481fc96d01211b818ad7fc5bd1adc1b8a3c";
        libraryHaskellDepends = [
          base blaze-builder bytestring double-conversion hoodle-types lens
          strict text
@@ -70007,7 +70242,7 @@ self: {
      mkDerivation {
        pname = "hoodle-core";
        version = "0.15.0";
-       sha256 = "04007hbnv4n3dl2yngfjzl6vrqd40yk5h9lq0ws2z33k4xa3a3rk";
+       sha256 = "330f355427738c2f3407982658a607a4e1bc0dfdd23deb056dc3926d173c0010";
        libraryHaskellDepends = [
          aeson aeson-pretty array attoparsec base base64-bytestring binary
          bytestring cairo case-insensitive cereal configurator containers
@@ -70037,7 +70272,7 @@ self: {
      mkDerivation {
        pname = "hoodle-extra";
        version = "0.1";
-       sha256 = "1mqx4qia457n8v4pdyd8mc8h7ybzx5asxm2d4p9ws5g2q4ybmshy";
+       sha256 = "1eeaba3cc1e215cdd3254dd4ae55e97ff90311aba8f976c946f614a222261dd7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70061,7 +70296,7 @@ self: {
      mkDerivation {
        pname = "hoodle-parser";
        version = "0.3.0";
-       sha256 = "0qp7x6csacf4w9crvmyrs7qsm9caici95qiwm11zyzyz2k9nm52g";
+       sha256 = "4f946ad314df7fff43a83ce292228b8aa5aaf1d1d9d79d59e2c431a599e9e762";
        libraryHaskellDepends = [
          attoparsec base bytestring containers either hoodle-types lens mtl
          strict text transformers xournal-types
@@ -70082,7 +70317,7 @@ self: {
      mkDerivation {
        pname = "hoodle-publish";
        version = "0.2.0";
-       sha256 = "1nx2y4f000gid9mps0xxx4l6h0nh120568h9cl45gsp6qlw3sa5m";
+       sha256 = "b5283d38c5e6ea5708650922538008d0026828e9bd037d6b6af101001cf1a2db";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70109,7 +70344,7 @@ self: {
      mkDerivation {
        pname = "hoodle-render";
        version = "0.5.0";
-       sha256 = "0460j9flj5cnvgv6cnchc6am0r5sw81lp67qf45rgcyjpz9q424i";
+       sha256 = "910882d3bfd2b3970b71f8984b03e2ba64509561905966f6db9615495d92c010";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cairo containers directory
          filepath gd gtk hashable hoodle-types lens monad-loops mtl poppler
@@ -70128,7 +70363,7 @@ self: {
      mkDerivation {
        pname = "hoodle-types";
        version = "0.3.0";
-       sha256 = "0mkx3n1sni43665dk5ify890wdfxamxvkx1h61kzsk3c3bazngr5";
+       sha256 = "253ffbd51a6c4cfd673030f4b97b55dd350e12f22e96d98a318344ab831d7d56";
        libraryHaskellDepends = [
          base bytestring cereal containers lens mtl strict text uuid
        ];
@@ -70148,7 +70383,7 @@ self: {
      mkDerivation {
        pname = "hoogle";
        version = "4.2.41";
-       sha256 = "1gm1sw7d88vzh53myqjzls2sxc3cnk1ni31dcagkj54khh0h7f56";
+       sha256 = "a6b80301849314399f622d8c68c3b46cb0ae85a65f625f47817f23d40ed7a1be";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70177,14 +70412,15 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle-index";
-       version = "0.4.2";
-       sha256 = "12hsajans11csbhiz7d187hx17h7s736g26cvmnahx9lgmgjgada";
+       version = "0.4.3";
+       sha256 = "353175f271d6a4df1ad8434bb9b088bada47d8dfe2f624ed4f0d1c92c7d6c380";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring Cabal containers directory errors filepath hoogle
          optparse-applicative process temporary transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/bgamari/hoogle-index";
        description = "Easily generate Hoogle indices for installed packages";
        license = stdenv.lib.licenses.bsd3;
@@ -70195,20 +70431,26 @@ self: {
      mkDerivation {
        pname = "hooks-dir";
        version = "0.1.1.0";
-       sha256 = "0gwdqpml8kn8xxxaq628d4way29k2f31f5av49fx7qj150h5qs5b";
+       sha256 = "ab685c202841e2d35d225b151786133309af38694818ac7aefc84e44ebc58d3f";
        libraryHaskellDepends = [ base directory process text ];
        homepage = "https://github.com/ibotty/hooks-dir";
        description = "run executables in a directory as hooks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hoopl_3_10_1_0" = callPackage
-    ({ mkDerivation, base, containers }:
+  "hoopl_3_10_2_0" = callPackage
+    ({ mkDerivation, base, containers, filepath, mtl, parsec
+     , test-framework, test-framework-hunit
+     }:
      mkDerivation {
        pname = "hoopl";
-       version = "3.10.1.0";
-       sha256 = "1m62dcgzd17xay2nd87607ryb6hswzhsgr9irzf705h5skgibxks";
+       version = "3.10.2.0";
+       sha256 = "6740814c774e51815e8260ae1b4ac8af6ab69f02e112904450f689c4792f1121";
        libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
+         base containers filepath mtl parsec test-framework
+         test-framework-hunit
+       ];
        homepage = "http://ghc.cs.tufts.edu/hoopl/";
        description = "A library to support dataflow analysis and optimization";
        license = stdenv.lib.licenses.bsd3;
@@ -70224,7 +70466,7 @@ self: {
      mkDerivation {
        pname = "hoovie";
        version = "0.1.1";
-       sha256 = "1g486kj7pwfvdr0a0mpfjxv9hifrkbp7120hxcfyrhx2zjmmc449";
+       sha256 = "891056abfca2c3ec1deb108870ee9ad945987697ee56a0406edbf17be43488bc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70247,7 +70489,7 @@ self: {
      mkDerivation {
        pname = "hopencc";
        version = "0.1.0.0";
-       sha256 = "1ygldh3r09qzpws28mnmhm3ai7h162gsafdc7nwl2f10kjnpjhyw";
+       sha256 = "dc4379ad9c203841b93dac39a59f30019ea84685d5562434bf1f2790076cf4f9";
        libraryHaskellDepends = [ base bytestring utf8-string ];
        libraryPkgconfigDepends = [ opencc ];
        libraryToolDepends = [ c2hs ];
@@ -70266,7 +70508,7 @@ self: {
      mkDerivation {
        pname = "hopencl";
        version = "0.2.1";
-       sha256 = "1kdrjr1y5wfq8bb31bkh360pvgb7ryhn9awnqszbq5d4wdwplqk8";
+       sha256 = "68627a79e3a415bcbec696ab64a1cf67bd7d811970ae30d642d8f1e24396b9cd";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ OpenCL ];
        libraryToolDepends = [ c2hs ];
@@ -70284,22 +70526,22 @@ self: {
     ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
      , base, base16-bytestring, binary, binary-conduit, bytestring
      , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
-     , directory, errors, fgl, graphviz, happy, hOpenPGP, ixset, lens
-     , monad-loops, old-locale, openpgp-asciiarmor, optparse-applicative
-     , resourcet, text, time, transformers, unordered-containers
-     , wl-pprint-extras, yaml
+     , directory, errors, fgl, graphviz, happy, hOpenPGP, ixset-typed
+     , lens, monad-loops, old-locale, openpgp-asciiarmor
+     , optparse-applicative, resourcet, text, time, transformers
+     , unordered-containers, wl-pprint-extras, yaml
      }:
      mkDerivation {
        pname = "hopenpgp-tools";
-       version = "0.15";
-       sha256 = "1qzp1lhbg9v6q7f8yq0abfwak80krmsdih86fpmfc6riiamfin7g";
+       version = "0.16";
+       sha256 = "16793bf1bc17f28dcd41a0e9c721c0b09abc0ab7ab761cb90eb66aeeb16916c2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson ansi-wl-pprint array attoparsec base base16-bytestring binary
          binary-conduit bytestring conduit conduit-extra containers
          crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP
-         ixset lens monad-loops old-locale openpgp-asciiarmor
+         ixset-typed lens monad-loops old-locale openpgp-asciiarmor
          optparse-applicative resourcet text time transformers
          unordered-containers wl-pprint-extras yaml
        ];
@@ -70314,7 +70556,7 @@ self: {
      mkDerivation {
        pname = "hopenssl";
        version = "1.7";
-       sha256 = "1zs69kxwz5fnm62mdscbpfz78vwnda75gyx1vxmmlisfhfslprly";
+       sha256 = "9ee64bb5834e475a6bdfa1fb578e6a966f74bebb8be95685a9d695cffb4c46ff";
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ openssl ];
        homepage = "http://github.com/peti/hopenssl";
@@ -70332,7 +70574,7 @@ self: {
      mkDerivation {
        pname = "hopfield";
        version = "0.1.0.2";
-       sha256 = "1cpr3540fdrqr39p6xhb64iz2fz8mzryd19515c55522s7xjk1zw";
+       sha256 = "fc8729fbd142945258092585e6f3afe83bf123310b7673d3c83837074819f9b2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70362,7 +70604,7 @@ self: {
      mkDerivation {
        pname = "hopfield-networks";
        version = "0.1.0.0";
-       sha256 = "1d3jcjk6s7raack7rvm1jzyh2fvaha6xy7k97fmq4cx22fzb48sd";
+       sha256 = "4d23b2be13a23382ab3b691edf8d826a3b01fd97a1ee7c26532a1f6da66472b4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base matrix MonadRandom split vector ];
@@ -70383,7 +70625,7 @@ self: {
      mkDerivation {
        pname = "hopfli";
        version = "0.2.1.0";
-       sha256 = "1rx5kvacnzm3qmc0z8n9fhrcrac059akzh9ccq0qswl7w9m4iby3";
+       sha256 = "c3af486ae287728d01662cc13f552a80a9cc3274c9a20f58c5a37ecbd49ea5e7";
        libraryHaskellDepends = [ base bytestring zlib ];
        testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
        jailbreak = true;
@@ -70399,7 +70641,7 @@ self: {
      mkDerivation {
        pname = "hoq";
        version = "0.3";
-       sha256 = "0h9cq1qzai1kbzc77bjlm0dbkrasfj0d21ydrh86kv9jd6gr7gb7";
+       sha256 = "67bd939f6932ed6910cccd07d180745ae5b91aa854ae73d85f3344f571c02c41";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70417,7 +70659,7 @@ self: {
      mkDerivation {
        pname = "horizon";
        version = "0.1.1";
-       sha256 = "1qx27i0xlrgcrdzp6lc06skipj888cfdxwwfrd7fyig48jn3wyd4";
+       sha256 = "a4793eac44e445ef4ecb8ef3de1c4308c91ba7368051737fcbec65da413ca2e3";
        libraryHaskellDepends = [ AC-Angle base time ];
        jailbreak = true;
        homepage = "https://github.com/intractable/horizon";
@@ -70433,7 +70675,7 @@ self: {
      mkDerivation {
        pname = "hosc";
        version = "0.15";
-       sha256 = "1yp25n159p69r32y3x7iwc55l5q9qaamj2vyl1473x8ras5afdcf";
+       sha256 = "8e35a78a5619f57148a07e0b5995c209175a0ae3f1f4e1c5c8c9dc54822de2fa";
        libraryHaskellDepends = [
          base binary blaze-builder bytestring data-binary-ieee754 network
          time transformers
@@ -70454,7 +70696,7 @@ self: {
      mkDerivation {
        pname = "hosc-json";
        version = "0.15";
-       sha256 = "0sask4nr5njf9grzigldflrbp7460z55fsam1pc3wcnsa575hxhi";
+       sha256 = "1176584e51da323ed80d556957ca07869cbb32758dbef8f34b4eda922d995a69";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring hosc json text
          unordered-containers utf8-string vector
@@ -70472,7 +70714,7 @@ self: {
      mkDerivation {
        pname = "hosc-utils";
        version = "0.15";
-       sha256 = "0zk59ig52vqym4n47yl9jgv21gszcwwbc0qc9ff0080allp6ddml";
+       sha256 = "b4b6662ea50a20009c4b0c03b638675fbf20f69389fa432ca91e6f515e4c657e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70491,7 +70733,7 @@ self: {
      mkDerivation {
        pname = "hostname";
        version = "1.0";
-       sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv";
+       sha256 = "9b43dab1b6da521f35685b20555da00738c8e136eb972458c786242406a9cf5c";
        libraryHaskellDepends = [ base ];
        description = "A very simple package providing a cross-platform means of determining the hostname";
        license = stdenv.lib.licenses.bsd3;
@@ -70502,7 +70744,7 @@ self: {
      mkDerivation {
        pname = "hostname-validate";
        version = "1.0.0";
-       sha256 = "0my8g4kqf9mz7ii79ff53rwkx3yv9kkn4jbm60q4b7g1rzhb3bvz";
+       sha256 = "7fafb1e0cfe19d453030754962e74cdb8f3e791ec5b974623cbf26872779c857";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Validate hostnames e.g. localhost or foo.co.uk.";
        license = stdenv.lib.licenses.bsd3;
@@ -70515,7 +70757,7 @@ self: {
      mkDerivation {
        pname = "hosts-server";
        version = "0.1.1";
-       sha256 = "1g5kga58c5iqm3svs2d0d2akkibxjnh0hc1jjhjf7dzxghg2paqy";
+       sha256 = "1eab2b1e7cfdb7e32494323008a0957dc5399568a009bdf5a83816868a7ab3bc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70535,7 +70777,7 @@ self: {
      mkDerivation {
        pname = "hothasktags";
        version = "0.3.4";
-       sha256 = "0pnp0xkqk2l29p5kr3kjmxl7hb8g1qd198n36vmfx1x8kc8bahdy";
+       sha256 = "be41b5109ba887eeea36c3a2141a0e0f2d7868af728e3ccb4d828a896707d75e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70552,7 +70794,7 @@ self: {
      mkDerivation {
        pname = "hotswap";
        version = "0.1.9.13";
-       sha256 = "1c614gvwypfqaj4gqsdimqq40i34w393vikq5hhy3d4qll2qp8hv";
+       sha256 = "1ba28b05a598b4e1212c78c63dd2e064444030aeb169fc8854d85dcff723c1b0";
        libraryHaskellDepends = [ base plugins ];
        jailbreak = true;
        homepage = "https://github.com/mikeplus64/hotswap";
@@ -70568,7 +70810,7 @@ self: {
      mkDerivation {
        pname = "hourglass";
        version = "0.2.9";
-       sha256 = "1xha17nwzxdjizbcp63d2142c6q051y77facs7xribgcl5iz2m4v";
+       sha256 = "9b54f163a1ecad98fbd14cb9737c28001b2648106d98cbd68fb2f5cfed090af6";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
@@ -70583,7 +70825,7 @@ self: {
      mkDerivation {
        pname = "hourglass-fuzzy-parsing";
        version = "0.1.0.1";
-       sha256 = "188mw1z8n650y3qik98x2m70sr8q66x4l4pg34mirk6kg4mgzy37";
+       sha256 = "67f8ff2a79d3cc1c2b19ef124aba3118650d4e151da519f1f0a0188b7ee015a1";
        libraryHaskellDepends = [ base hourglass parsec ];
        homepage = "https://gitlab.com/doshitan/hourglass-fuzzy-parsing";
        description = "A small library for parsing more human friendly date/time formats";
@@ -70597,7 +70839,7 @@ self: {
      mkDerivation {
        pname = "hp2any-core";
        version = "0.11.2";
-       sha256 = "1gmw9bggw8hsp6pi0xgrryf0sqjb1aaxbwh85q5h72h4ixskwn1y";
+       sha256 = "3e583e758f048a030b2e08f2d5950a4b620d9ccff97510afb91a22fede4abcbe";
        libraryHaskellDepends = [
          attoparsec base bytestring containers directory filepath network
          old-locale process time
@@ -70616,7 +70858,7 @@ self: {
      mkDerivation {
        pname = "hp2any-graph";
        version = "0.5.4.2";
-       sha256 = "1yj1miqn265pxq2dfhx87s20vjnnxmsl3d9xdy88cbzglpx2v9il";
+       sha256 = "34a62dfaa5ef2f86906f3db54175edd6ca0d843ea843d704eeb7186171ac41fa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hp2any-core OpenGL ];
@@ -70639,7 +70881,7 @@ self: {
      mkDerivation {
        pname = "hp2any-manager";
        version = "0.4.6";
-       sha256 = "143j3ylvzyq1s2l357vzqrwdcgg6rqhnmv0awb3nvm66c9smaarv";
+       sha256 = "3b2b557562c6d46dc7e20aec6a21cee63dd678c67f9f32a8d001fbbfa91f7290";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70657,7 +70899,7 @@ self: {
      mkDerivation {
        pname = "hp2html";
        version = "0.2";
-       sha256 = "11v0w5406d9lql5jaj2kwrvdgai9y76kbdlwpjnn2wjn36b8hdwa";
+       sha256 = "8a37889619567261adbc9cb635cdf129aad776e65348250bc534350348e16087";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers filepath ];
@@ -70672,7 +70914,7 @@ self: {
      mkDerivation {
        pname = "hp2pretty";
        version = "0.6";
-       sha256 = "1bma881ljhwhzirj2q9rqf0bxx9xfy0ng2z9mrhdnaywnw4d8v4c";
+       sha256 = "8c6cd408b7dc2bdb60aee98b6781773df5be80c339612173fc9043490342aaae";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70691,7 +70933,7 @@ self: {
      mkDerivation {
        pname = "hpack";
        version = "0.5.4";
-       sha256 = "1ghj80w5hx736hkr9z827s4f2fli5r4y0q3ka9ay706k5lj0g9xa";
+       sha256 = "aaa707242dd380e355527360e0492e913ae1883e02fd942734e37458384012be";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70718,7 +70960,7 @@ self: {
      mkDerivation {
        pname = "hpaco";
        version = "0.28.0.5";
-       sha256 = "03h634wwyj4d5ycvn7nmm94qcxwq9vayd7d9l44hqhka1ach4sx9";
+       sha256 = "a96b02990a6a420c09a1a99de6d54e98778649aad51ebb992f8d48cf3919060e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70738,7 +70980,7 @@ self: {
      mkDerivation {
        pname = "hpaco-lib";
        version = "0.28.0.5";
-       sha256 = "1n6lmkip1is6y4x5vivqv30if5di8cy35l6fs2kyg8wjxcqcsyqm";
+       sha256 = "157bcd30eb92a3e7a7d0ced0323c43b11517c1d878c75d3af146c770e3acd4d8";
        libraryHaskellDepends = [
          aeson base bytestring containers data-variant file-embed filepath
          mtl parsec safe split strict transformers
@@ -70757,7 +70999,7 @@ self: {
      mkDerivation {
        pname = "hpage";
        version = "0.12.2";
-       sha256 = "0sl2qh3l5vbijln2al7vmvxm4zhn3qsz8axvprs6jxjfbndmk78j";
+       sha256 = "129d599b5d4e766974bebb2bf4351e167e52fbaefb50252c9571ed4207c4826a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70777,7 +71019,7 @@ self: {
      mkDerivation {
        pname = "hpapi";
        version = "0.0.1.0";
-       sha256 = "0n07nr6mm9ssf632h30s6bqxsgvlfzpr39dhdl7vwrfyj2jvdg2s";
+       sha256 = "5abcb6a590de65be0f6db0a591ef77743fddf1321a0c2886715aa75a4db60758";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ papi ];
        description = "Binding for the PAPI library";
@@ -70797,7 +71039,7 @@ self: {
      mkDerivation {
        pname = "hpaste";
        version = "1.2.0";
-       sha256 = "1p8dfqm93598zcnz1ksj8px6l8i7kfn9514d68gx7qxvd4xw0fnm";
+       sha256 = "d53ac03b69bbe3d31f328d8492ac9b27226afa4552cff02dfb2895912a760ddd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70823,7 +71065,7 @@ self: {
      mkDerivation {
        pname = "hpasteit";
        version = "0.3.3";
-       sha256 = "1jj5q1gpnajnafikwf9jmayvaimi5486fvi90fk8q4b3lg7z9awm";
+       sha256 = "95abf4cfa363118ca603296e671029b146b5bdaa32393ea353562a7b5fc045ca";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70842,7 +71084,7 @@ self: {
      mkDerivation {
        pname = "hpc";
        version = "0.6.0.2";
-       sha256 = "1bqa9jmnjqk4jbvx2y90rz717hf2rhzbpmy9xqan97pyrkjz3rlm";
+       sha256 = "95e6f1e5ccfe9e6415eec9d7bb3eccc2c113cecf2079d1f792646269ab4c0aaf";
        libraryHaskellDepends = [
          base containers directory filepath time
        ];
@@ -70858,7 +71100,7 @@ self: {
      mkDerivation {
        pname = "hpc-coveralls";
        version = "0.9.0";
-       sha256 = "0ika073kkm8kivd0m2dhb7ysk5h7q9vsj02xf4azh3c4xpvw4086";
+       sha256 = "0601c2f7ed840df815715d00a977c20796a9fd59b0890ada8e13d539c7016a46";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70881,7 +71123,7 @@ self: {
      mkDerivation {
        pname = "hpc-strobe";
        version = "0.1";
-       sha256 = "1fgw4pf72684mi7s5pqvfj75s8y004rxf3ww377kyrlw1mb7405c";
+       sha256 = "ac0072560d9c663fcf199c0fd73301c0235d8e741bdfa24fac041971dc25fcb9";
        libraryHaskellDepends = [ base filepath hpc ];
        description = "Hpc-generated strobes for a running Haskell program";
        license = stdenv.lib.licenses.bsd3;
@@ -70894,7 +71136,7 @@ self: {
      mkDerivation {
        pname = "hpc-tracer";
        version = "0.3.1";
-       sha256 = "1mahyall1p96nc8z270002cdk8is9ahrd0zn0663w36ic158i3li";
+       sha256 = "918e884a60d10c3e8c01f68396a14a3aa2d99800001cf111b326dd40a9f250d5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70913,7 +71155,7 @@ self: {
      mkDerivation {
        pname = "hplayground";
        version = "0.1.3.1";
-       sha256 = "15yri40046lap05b762k4nk9nly8k6cbypic790zfmhj9ljjq1bv";
+       sha256 = "7b052c254d1256f7413a2c5ebf9899c8539ba6255398b30ab88a1a020089d997";
        libraryHaskellDepends = [
          base containers data-default haste-compiler haste-perch monads-tf
          transformers
@@ -70929,7 +71171,7 @@ self: {
      mkDerivation {
        pname = "hplaylist";
        version = "0.2";
-       sha256 = "01xkpsb8fjlifdz6fckwfawj1s5c4rs4slizcdr1hpij6mcdcg6y";
+       sha256 = "de3cd65835325e1872633f524d7426ace820b9727c32677e73914a8796beb307";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath process ];
@@ -70946,7 +71188,7 @@ self: {
      mkDerivation {
        pname = "hpodder";
        version = "1.1.6";
-       sha256 = "0gi94phkqxffxf3sq5al3cmn3zhc9vz6jql4hjsvz5nbhpdjhwda";
+       sha256 = "aa7128db85cb96bfb584846269fe4e0cfe612b1b5415ac87ebce753ce125293e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -70970,7 +71212,7 @@ self: {
      mkDerivation {
        pname = "hpqtypes";
        version = "1.4.2";
-       sha256 = "0jmc7m47gidmhnf2dz7hqzlypw1l72n948naccab6j58hkn683kk";
+       sha256 = "730e64ec84a848b31463ca2292ac3834f0ebe9c7f0fc269c85b5c577483dac4a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70998,7 +71240,7 @@ self: {
      mkDerivation {
        pname = "hprotoc";
        version = "2.1.4";
-       sha256 = "01848yssmpi0fgkgnlgwmcrmkmpdqc6yc19z91kj46sl187k2k8j";
+       sha256 = "124d310f0a541b2267483f05e60dc3edd65933abfc51fbe67320deaab5470405";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -71027,7 +71269,7 @@ self: {
      mkDerivation {
        pname = "hprotoc-fork";
        version = "2.0.16.1";
-       sha256 = "1fbpdi4mcc66z3ina01dkqxhy8slcjs4irh03ll2msp6p5vdqw9r";
+       sha256 = "3971dc76b9e6ea2a281d00e648b46454230f3b9e2d0065e3f8c63056496c77b9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -71054,7 +71296,7 @@ self: {
      mkDerivation {
        pname = "hps";
        version = "0.15";
-       sha256 = "0kmmrjg93rr6cjmg5n821p00qr4m3q46nnyfhql2s2nf20p7kprh";
+       sha256 = "30df792e10ce0a2d2886ce5b6b081e95640cc00d02d9f2aa6426e7919eccb54e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hcg-minus ];
@@ -71071,7 +71313,7 @@ self: {
      mkDerivation {
        pname = "hps-cairo";
        version = "0.11";
-       sha256 = "1xyk0q6qiqcqd849km86jns4bcfmyrvikg0zw44929wlmlbf0hg7";
+       sha256 = "e741e016ad94279108e11fbc1977f6d5b145b49506d599086a98e1880d06d3f7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cairo gtk hps ];
@@ -71088,7 +71330,7 @@ self: {
      mkDerivation {
        pname = "hps-kmeans";
        version = "0.1.0.0";
-       sha256 = "0w1yyrv4k7fi016084j4k1lh6jgxg5502r83zszr9cjc6rraj8fc";
+       sha256 = "cc21a972364cb294bffe0365014a79fd490369984412044c00d19d4976f63e70";
        libraryHaskellDepends = [ base vector ];
        jailbreak = true;
        homepage = "http://stathacking.com/hps-kmeans";
@@ -71101,7 +71343,7 @@ self: {
      mkDerivation {
        pname = "hpuz";
        version = "1.1.2";
-       sha256 = "04k9hdbc3ipn9z0qzzpm6xsiv0bkr1v48sfs2haapawd49bw7rhk";
+       sha256 = "13e6c357228dabab1414da694476c873811d7537f5fe8fc14ff6c6c156836912";
        libraryHaskellDepends = [ array base bytestring parsec ];
        libraryToolDepends = [ c2hs ];
        homepage = "https://github.com/ccasin/hpuz";
@@ -71115,7 +71357,7 @@ self: {
      mkDerivation {
        pname = "hpygments";
        version = "0.1.3";
-       sha256 = "1hb9yslb94ynzlphsp0i4f547zqxblrj49hqy4d7zivdqp38lqla";
+       sha256 = "8a628ac6c56dc77f1af1182622335d1dff438a23115c0d2ffdd693b4a8f669c1";
        libraryHaskellDepends = [
          aeson base bytestring process process-extras
        ];
@@ -71131,7 +71373,7 @@ self: {
      mkDerivation {
        pname = "hpylos";
        version = "1.0";
-       sha256 = "1vdpy9x3bg43zj9rcrnkz0jfsd9mrp4k5y2hn6jb2ar2bvq0iwha";
+       sha256 = "0af208f05e222bb1a4b150f832c9cd3535ed24f8d3669693fc83bc357af2b7ed";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -71148,7 +71390,7 @@ self: {
      mkDerivation {
        pname = "hpyrg";
        version = "0.1.0.0";
-       sha256 = "00ddyiznx07qkh3s4qjls39x991fqxvdw2bj245ypbxpxsk9fvsw";
+       sha256 = "5c6f97a6eeb7afeb0b117209de76c72ea4d4d3d05462a2079cf8806e7ff4ad01";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -71167,7 +71409,7 @@ self: {
      mkDerivation {
        pname = "hquantlib";
        version = "0.0.2.5";
-       sha256 = "1n84j2bha8cgv38rl8jxsjiybwws2sc60x8pjmnkn83jpscgcqv0";
+       sha256 = "6063f698be72203b6d9517756098169af3e5a3d45d229ad1d88f2105979004d9";
        libraryHaskellDepends = [
          base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random
          parallel statistics time vector vector-algorithms
@@ -71189,7 +71431,7 @@ self: {
      mkDerivation {
        pname = "hquery";
        version = "0.1.1.0";
-       sha256 = "0phlbbvkifw65ndjb4nc8ar0xx6z4sqn8xj41bg8qgr31ffpcjf8";
+       sha256 = "c849769d0b233f8cde0a447664b126dff40eb242cc92259b2d86bb38f75a145e";
        libraryHaskellDepends = [ base containers parsec text xmlhtml ];
        testHaskellDepends = [
          base bytestring filepath HUnit parsec test-framework
@@ -71204,7 +71446,7 @@ self: {
      mkDerivation {
        pname = "hranker";
        version = "0.1.1";
-       sha256 = "0hg2qjjr5pcnx62382r3d3rqvb3z7h1926lpym68869n4s19wz7d";
+       sha256 = "ed7c9e82263619844cf5971a91023c7fac8df368230b3484e996dd92a5c4e241";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base HCL NonEmpty ];
@@ -71220,7 +71462,7 @@ self: {
      mkDerivation {
        pname = "hreader";
        version = "0.2.0";
-       sha256 = "1a0zllljfjpz6fwq2h0l5wwl1wg1v68n6r84fs70vnny0c3wl6hg";
+       sha256 = "0f1aca0703deda0d8e7604656391d9e1f140392f144081b933ff4a2729a51fa8";
        libraryHaskellDepends = [
          base exceptions hset mmorph monad-control mtl transformers-base
        ];
@@ -71234,7 +71476,7 @@ self: {
      mkDerivation {
        pname = "hricket";
        version = "0.5";
-       sha256 = "1zhp9w0rki3chb27jbzvwifsgcjxzczn3q7hh7g3d0akfbg1v47f";
+       sha256 = "ee901dde72538136de81f0e0613ffb5db2a75de4fb2f79c4826cc499014f17fe";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers ];
@@ -71251,7 +71493,7 @@ self: {
      mkDerivation {
        pname = "hruby";
        version = "0.3.1.5";
-       sha256 = "1x9j3rc3kk64l8idkar35ap4y5kxh4abfssd2iphp8dqnjld3jxa";
+       sha256 = "aacbd1a8b4b8a10b6f144d6bb714817d164fae2a23abd922a2c4cc39581e32f5";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
@@ -71269,7 +71511,7 @@ self: {
      mkDerivation {
        pname = "hs-GeoIP";
        version = "0.3";
-       sha256 = "135bl4cjijq6mr485waz7aaxgkaji2fsdjhdy4v4756q6ahzcpwf";
+       sha256 = "8e5ff6a132d8944336f10dcaa69d8852cdd7953a5ff18248ae06cb2819a1ab8c";
        libraryHaskellDepends = [ base bytestring deepseq ];
        librarySystemDepends = [ GeoIP ];
        homepage = "http://github.com/ozataman/hs-GeoIP";
@@ -71283,7 +71525,7 @@ self: {
      mkDerivation {
        pname = "hs-bibutils";
        version = "5.5";
-       sha256 = "0pf5lh179rw9jkmw16ss3kiwydlj6zgfk868mjl5s57kx55z7ycm";
+       sha256 = "95f9f34be9f3145da8acc8a0e9de379236cfe31c5a9bc0eb9489e77402a4c55d";
        libraryHaskellDepends = [ base syb ];
        homepage = "http://istitutocolli.org/repos/hs-bibutils/";
        description = "Haskell bindings to bibutils, the bibliography conversion utilities";
@@ -71297,7 +71539,7 @@ self: {
      mkDerivation {
        pname = "hs-blake2";
        version = "0.0.2";
-       sha256 = "0i0yqci0z5gqmpgb0gk76grcd8mn7xql6gjalm78z6cl84vzsgh4";
+       sha256 = "043efd374194998f4ea54a3e43713fb6a2c6f233673eb0deadf8950f22c31e44";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ b2 ];
        testHaskellDepends = [
@@ -71316,7 +71558,7 @@ self: {
      mkDerivation {
        pname = "hs-captcha";
        version = "1.0";
-       sha256 = "02dd7kli8nm01jxs0p8imqvbdr4yzqizi6bwyyr228p3wscbdsn8";
+       sha256 = "c8eab698e6e32221b2f77c99f823fe9ee4b636ae115da0bb0ca05a14e93cad09";
        libraryHaskellDepends = [ base bytestring gd random ];
        homepage = "http://www.dankna.com/software/";
        description = "Generate images suitable for use as CAPTCHAs in online web-form security";
@@ -71328,7 +71570,7 @@ self: {
      mkDerivation {
        pname = "hs-carbon";
        version = "0.1.1.0";
-       sha256 = "0frip4q5vxvdkc4f8bigpp066i53f4786cj2znyq21h65zndaq53";
+       sha256 = "a360d5ec2f060681bdfd4232830e71a34463c0bd2f2ee4089b6df75d30b9313b";
        libraryHaskellDepends = [ base deepseq mtl parallel random ];
        testHaskellDepends = [ base HUnit ];
        description = "A Haskell framework for parallel monte carlo simulations";
@@ -71342,7 +71584,7 @@ self: {
      mkDerivation {
        pname = "hs-carbon-examples";
        version = "0.0.0.1";
-       sha256 = "1hcg6z3slzry4lkxnv5bllmlfsr50hcyxmpz3qhsb487j9r76c2z";
+       sha256 = "5f307372920791a5211effd6ee1904256b472ba5ab6cdb27253e7faac7378fc1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -71360,7 +71602,7 @@ self: {
      mkDerivation {
        pname = "hs-cdb";
        version = "0.1.1";
-       sha256 = "07pkz35mmk7qaa9ahfxmj4dddja23ksn7dm1fp8g9v8z8d9r9zl0";
+       sha256 = "80fe9453431fedf4d075a1b663f51c42c9d61a91b53ba89252f8cc5acbf8f31e";
        libraryHaskellDepends = [
          array base bytestring bytestring-mmap directory filepath mtl
        ];
@@ -71375,7 +71617,7 @@ self: {
      mkDerivation {
        pname = "hs-dotnet";
        version = "0.4.0";
-       sha256 = "1l2h1zv63c25k80gljnan3vg2r25a4b7byf5yryj3cjwa9xcg457";
+       sha256 = "a790c77a525cb2217df6c5f97516514564f1f6b0ca4afa009a45b061f60f50d0";
        libraryHaskellDepends = [ base ghc-prim ];
        librarySystemDepends = [ ole32 oleaut32 ];
        description = "Pragmatic .NET interop for Haskell";
@@ -71390,7 +71632,7 @@ self: {
      mkDerivation {
        pname = "hs-excelx";
        version = "0.6.0.0";
-       sha256 = "12hpfad8wn4r811md6269w10inx6nbipryhn8vdhbbcj9mmda3l5";
+       sha256 = "850ed56a4d92ad05db4616fa7ce3b2a6db08024f469856434099588e9a72178a";
        libraryHaskellDepends = [
          base bytestring containers mtl text time xml-conduit zip-archive
        ];
@@ -71404,7 +71646,7 @@ self: {
      mkDerivation {
        pname = "hs-ffmpeg";
        version = "0.3.4";
-       sha256 = "0j52drd3pb6ssgngfqxdsvvjjnx11nsmxwjsin6cmbv0nifpyq51";
+       sha256 = "a1607f5db460afca8c8d5af25eb50da15b29f7d6ad63f7ecd3daac3b5a6ea248";
        libraryHaskellDepends = [ base bytestring haskell98 ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/VasylPasternak/hs-ffmpeg";
@@ -71418,7 +71660,7 @@ self: {
      mkDerivation {
        pname = "hs-fltk";
        version = "0.2.5";
-       sha256 = "0nbxfy219mz0k27d16r3ir7hk0j450gxba9wrvrz1j17mr3gvqzx";
+       sha256 = "fde3fd46ae27c8f0f3ce3ca9d51f284482094f8e239bd08e98e0d71484777d59";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fltk fltk_images ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hs-fltk/";
@@ -71432,7 +71674,7 @@ self: {
      mkDerivation {
        pname = "hs-gchart";
        version = "0.4.1";
-       sha256 = "0nmykgdzkqidxv51bhlcn4zax4zfw26s4l65z3a3405si2s5x459";
+       sha256 = "a9905eb488ba0032d4f8c550a28de0ee93ae3eb18cc215caee2de2f9db9bbe5a";
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://github.com/deepakjois/hs-gchart";
        description = "Haskell wrapper for the Google Chart API";
@@ -71447,7 +71689,7 @@ self: {
      mkDerivation {
        pname = "hs-gen-iface";
        version = "0.5.0";
-       sha256 = "1mvzpn7zpk5ffyyqh214yd315dcis8zmm9p4m5099bqhfr735kws";
+       sha256 = "9acf324e7610af9440a9e4a65a3fd291b51246f3240888bd77aeccfb8fbd7fd7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -71465,7 +71707,7 @@ self: {
      mkDerivation {
        pname = "hs-gizapp";
        version = "0.1.0.3";
-       sha256 = "1j7ws3jm52n910p08432k60w09971bpcz4j5w48a305nz1dbkscm";
+       sha256 = "95e9b95af8b680a110e14592cfee0a2725c081996210042e08c98a52e5d0fcc8";
        libraryHaskellDepends = [
          base containers directory filepath parsec process
        ];
@@ -71479,7 +71721,7 @@ self: {
      mkDerivation {
        pname = "hs-inspector";
        version = "0.5.2.0";
-       sha256 = "0w9ijl56v0gnx6arz0vvrg740kkhw0vqgkzdvmgf22z9vn99fny8";
+       sha256 = "c85b9792dde90be15eddedcf8737e0704e40cecb7b839f95e9f6816d0a953171";
        libraryHaskellDepends = [ base haskell-src ];
        testHaskellDepends = [ base haskell-src hspec ];
        description = "Haskell source code analyzer";
@@ -71495,7 +71737,7 @@ self: {
      mkDerivation {
        pname = "hs-java";
        version = "0.3.4";
-       sha256 = "1qv6zwp9fws9s6502d9afwwbsh025xfpw4vsq8wgh2i0gvlskzq7";
+       sha256 = "07ffa9e97e200af838c27a137e5d2f0240bd38772a35018ad14973972eff66e3";
        libraryHaskellDepends = [
          array base binary binary-state bytestring containers
          control-monad-exception data-binary-ieee754 data-default directory
@@ -71511,7 +71753,7 @@ self: {
      mkDerivation {
        pname = "hs-json-rpc";
        version = "0.0.0.1";
-       sha256 = "0qlzylkplcb0bvh7pd8mwmc0pg69jjh8229a1hg3rhaix08mmj3c";
+       sha256 = "6cc85a11e851c13c1e0c2a0981a094c9bc0b58e515b57be05e60317a27f59f62";
        libraryHaskellDepends = [
          aeson base bytestring HTTP network text
        ];
@@ -71530,7 +71772,7 @@ self: {
      mkDerivation {
        pname = "hs-logo";
        version = "0.5.1";
-       sha256 = "0ypr4jpc12f771g3gsahbj0yjzd0ns8mmwjl90knwg267d712i13";
+       sha256 = "2344114e3b463c6e274854f25a91b6a07de9815c50e9375e38c789c0ae24f97a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -71557,7 +71799,7 @@ self: {
      mkDerivation {
        pname = "hs-mesos";
        version = "0.20.3.0";
-       sha256 = "1d9mf35i5nwpnr5l5v75rrcwihfkpfy3ji9jwhk9k0g285bfr5dh";
+       sha256 = "b095ec5641e2819926e4324539bcbbd3c1c859cee5ec424bb697db12cb7035b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -71579,7 +71821,7 @@ self: {
      mkDerivation {
        pname = "hs-nombre-generator";
        version = "0.2.1.0";
-       sha256 = "1bk278ni5bk8qcc8mbb7h26g9k5hcdl4h1ilrh8prc0kvngz8g4w";
+       sha256 = "9c3cf49fdd13b07c11cc3406486863b0ccf48c8067ad8a18c368ae122d3a62ae";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base HandsomeSoup hxt random ];
@@ -71596,7 +71838,7 @@ self: {
      mkDerivation {
        pname = "hs-pgms";
        version = "0.1.0.1";
-       sha256 = "064sk0g8mzkqm80hfxg03qn6g1awydlw15ylikk3rs4wf7fclw30";
+       sha256 = "6070cadc719ce83ce68cd497c069f35c85672c1ee0750701aa78fe8a1e989a18";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base MonadPrompt mtl random ];
@@ -71613,7 +71855,7 @@ self: {
      mkDerivation {
        pname = "hs-php-session";
        version = "0.0.9.3";
-       sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f";
+       sha256 = "0e717e90933f9e861d9cf374baa0dedac51d8ae7a1746ef2f7bd098fe38c8df7";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/elblake/hs-php-session";
        description = "PHP session and values serialization";
@@ -71625,7 +71867,7 @@ self: {
      mkDerivation {
        pname = "hs-pkg-config";
        version = "0.2.1.0";
-       sha256 = "09v2kp643asl3zpv8rbb8a7zv0h3bn5l4gxz44d71kly9qr3jkhh";
+       sha256 = "104e39324e9ece701a21bf3f428b5d0382fd8f426b65b4ef1f54ab41cc9d6227";
        revision = "1";
        editedCabalFile = "9337acf593d6f7e1d54f81886cb3736001a127e3b75ba01bd97a99d77565f784";
        libraryHaskellDepends = [ base data-default-class text ];
@@ -71643,7 +71885,7 @@ self: {
      mkDerivation {
        pname = "hs-pkpass";
        version = "0.4";
-       sha256 = "01jcl2ia8p29gg5yazpxm6cdxyskl6z895lmgh888qkf9jlzf5mf";
+       sha256 = "ae16f7a94c6e6284107c959684bea153fbde98a9fd7ee5cb7b495ca4a2a04c06";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit directory
          filesystem-conduit old-locale random shakespeare-text shelly
@@ -71662,7 +71904,7 @@ self: {
      mkDerivation {
        pname = "hs-re";
        version = "0.1.0";
-       sha256 = "0rx7shfjyi9k910mvzskykqxnijl8rrh08c0bkqlmqwisyhl7wbb";
+       sha256 = "6bf143a1d791e34af15c80210073465446dbf1f453ff5d414833452f1dd4a767";
        libraryHaskellDepends = [ array base regex-base regex-posix ];
        jailbreak = true;
        description = "Easy to use Regex";
@@ -71677,7 +71919,7 @@ self: {
      mkDerivation {
        pname = "hs-scrape";
        version = "0.1.0.0";
-       sha256 = "0w5zrd7xj3ccw4xkdsq20j1ki2j8sy3glzijsq5m2227szwv7y6v";
+       sha256 = "dbf8b3f9d74708510bd6327efa86d7488a38830402eb363be18c0dd94fcbbf70";
        libraryHaskellDepends = [
          base bytestring containers data-default exceptions hspec
          html-conduit lens retry safe text transformers url wreq xml-conduit
@@ -71698,7 +71940,7 @@ self: {
      mkDerivation {
        pname = "hs-twitter";
        version = "0.2.8";
-       sha256 = "1r8bd5q7d5mxmd6012mpp1yx353wzib174xd9v0mvkbb009b4mph";
+       sha256 = "f056b212006bcd5dc14ead931356fc7c94d17db8b78a004cabbd967670690be5";
        libraryHaskellDepends = [
          base HTTP json mime network old-locale old-time random utf8-string
        ];
@@ -71712,7 +71954,7 @@ self: {
      mkDerivation {
        pname = "hs-twitterarchiver";
        version = "0.2";
-       sha256 = "077mc8dn2f6x3s29pm80qi7mj6s2crdhky0vygzfqd8v23gmhqcg";
+       sha256 = "8f6158df101b35ecfef31bf8095b66421b594fc400d59b841edd38611b62f51c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base HTTP json mtl network pretty ];
@@ -71727,7 +71969,7 @@ self: {
      mkDerivation {
        pname = "hs-vcard";
        version = "0.1";
-       sha256 = "0qb7gsbki3ciqddxp9j46rnx64vv622n2p9vidv1b000wbmmrz15";
+       sha256 = "25fc5cebe2008015768b3b5d6185307b13d36d3644a6db5bc3918d38977e6761";
        libraryHaskellDepends = [ base old-locale time ];
        homepage = "http://qrcard.us/";
        description = "Implements the RFC 2426 vCard 3.0 spec";
@@ -71742,7 +71984,7 @@ self: {
      mkDerivation {
        pname = "hs2048";
        version = "0.1.0";
-       sha256 = "1hm9lwhq1b8i04gl3z2iw6g67slrjcrymp2fxxvykxgkff6dmkps";
+       sha256 = "faceda8c73f3f5e977ef4edcea339399ea639ee151fc411f0111ad8021a7a9c2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base random ];
@@ -71764,7 +72006,7 @@ self: {
      mkDerivation {
        pname = "hs2bf";
        version = "0.6.2";
-       sha256 = "1lx0px0gicwry5i4rwgzz6jasjhp24f620w2iby9xpbvn6h3zflm";
+       sha256 = "95ba3fa0b17bdd9efc8a8203611c11174aada4f9fff14c62f199b3f840bfa0d3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -71783,7 +72025,7 @@ self: {
      mkDerivation {
        pname = "hs2dot";
        version = "0.1.4";
-       sha256 = "0pfbclqpndlnxnvs630q8x272q13z9dfp35gp9dj6m527x78fapx";
+       sha256 = "fd2a874e3fa254235bbaaf8ceb5afa2360714447180ca3b7ed96367b3165cb5d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -71801,7 +72043,7 @@ self: {
      mkDerivation {
        pname = "hsConfigure";
        version = "0.1.0.2";
-       sha256 = "199sza2jh3d5046yyb141b0jwh1m1p68hv4x3b5xz6vw9dzfbw3c";
+       sha256 = "6cf0e57e4b7c9bdfcb1a9d6c88cc0d35402ec10a242cef0d01a50d2885fa3aa5";
        revision = "2";
        editedCabalFile = "ab3264ebf799e07e40fd913b9061197b346a7d84145908566155231e62a45c02";
        libraryHaskellDepends = [ base directory filepath process unix ];
@@ -71817,7 +72059,7 @@ self: {
      mkDerivation {
        pname = "hsSqlite3";
        version = "0.1";
-       sha256 = "0wmsswccwcz2zd3zap0wsapzbya72cxdyzhlcch4akvwqcl9hz6a";
+       sha256 = "ca7c9828c37c4f452063147edf3a1347f9f5afd21c5cf547fbe233ce18d7ba72";
        libraryHaskellDepends = [
          base bindings-sqlite3 bytestring mtl utf8-string
        ];
@@ -71832,7 +72074,7 @@ self: {
      mkDerivation {
        pname = "hsXenCtrl";
        version = "0.2.0";
-       sha256 = "0zxmlyckp9c0i5s8vi62d3qvnilh8kl093ckqr7dchgmki4az7rp";
+       sha256 = "379faf489cf541d64ec6938d04e8449046bbf168c2c48d748980a53b99a7b57f";
        libraryHaskellDepends = [ array base bytestring dlist mtl ];
        librarySystemDepends = [ xenctrl ];
        jailbreak = true;
@@ -71850,7 +72092,7 @@ self: {
      mkDerivation {
        pname = "hsass";
        version = "0.3.0";
-       sha256 = "15x5f8zcikg1bh10sk5b2gqjfldgp4jdgwhl2k20i6h8mxjkpmdf";
+       sha256 = "aed53b65af089a08c41414f2d724b9af5127f113ab4c0d025ce1cdc83e72a597";
        libraryHaskellDepends = [
          base bytestring data-default-class filepath hlibsass monad-loops
          transformers
@@ -71868,7 +72110,7 @@ self: {
      mkDerivation {
        pname = "hsay";
        version = "1.1.0";
-       sha256 = "0qar7y4190dfv63jmzx8saxqxzh73spc2q3i6pqywdbv7zb6zvrl";
+       sha256 = "34ef6fd63f7b35eef1357160c1ae1e07fe8ebbd2a8ff2a87d9ae8114883f5961";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Hclip HTTP process unix ];
@@ -71884,7 +72126,7 @@ self: {
      mkDerivation {
        pname = "hsb2hs";
        version = "0.3.1";
-       sha256 = "1n7rj2q87j544d82alxhrsqhz4ix8qpwxpw3l2np7wjl0n101n4a";
+       sha256 = "8ad800820554f273ada083dfce2f463d920fb1ceb053255023a4c883b090f9d8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -71901,7 +72143,7 @@ self: {
      mkDerivation {
        pname = "hsbackup";
        version = "0.1.1";
-       sha256 = "1g1lb43f7cdm5fjmdd64n9vl2nxlm8jpng94hyyldwv8a6x7555z";
+       sha256 = "bf9472ba5168f346bd87243d7b25aab45b4177b2c4b456a52bb5b1e3065934bc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -71922,7 +72164,7 @@ self: {
      mkDerivation {
        pname = "hsbencher";
        version = "1.20.0.5";
-       sha256 = "1fqp0n106dnqik3p6fa60xkamls8wgg8c5sp2klgp36n3xflvy9h";
+       sha256 = "30f94d5d1fd68cfbe814571786dee348d3aa6607463973c78cd83603820517bb";
        libraryHaskellDepends = [
          async base bytestring containers data-default directory filepath
          GenericPretty io-streams mtl process random time unix
@@ -71943,7 +72185,7 @@ self: {
      mkDerivation {
        pname = "hsbencher-codespeed";
        version = "0.1.0.1";
-       sha256 = "1a3hac73mzd0q25b1xbdh121k33m12phpxfn6hh7qcg5yys2i8l5";
+       sha256 = "85a228b4f7e5317c2034d6f50baf08758c1944806df5b08ac0a0fd3a0e5370a8";
        libraryHaskellDepends = [
          base bytestring containers data-default directory filepath
          hsbencher HTTP http-conduit http-types json mtl network resourcet
@@ -71961,7 +72203,7 @@ self: {
      mkDerivation {
        pname = "hsbencher-fusion";
        version = "0.3.15.2";
-       sha256 = "0xp2jm5zvrx5sz2mniachd7hjmhmf0sv9as3dzln8693n6l1ak4r";
+       sha256 = "994c15a8b1231964e96f43abb435701556094f834c455bc5d7a5e7fd4b95e276";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -71981,7 +72223,7 @@ self: {
      mkDerivation {
        pname = "hsc2hs";
        version = "0.67.20120610";
-       sha256 = "0kfvpsapgslxywpmqba5vcx79xmbj87dwg8fjjjk517x28wisivz";
+       sha256 = "7f471d3912fd8432a5940e3dde0e92abf6743adb452d5c2ff79dea7795bedb4d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers directory process ];
@@ -71999,7 +72241,7 @@ self: {
      mkDerivation {
        pname = "hsc3";
        version = "0.15.1";
-       sha256 = "1ad5q4rq82v7l556rinaiikglr1kjswi5raw0dxqwsfjbp8imbha";
+       sha256 = "0aae1ad15dd2698e7b035ce512b9963364fa668ccac66c4aa1670b8433c1a5a9";
        libraryHaskellDepends = [
          base binary bytestring containers data-default data-ordlist
          directory filepath hashable hosc network process random safe split
@@ -72016,7 +72258,7 @@ self: {
      mkDerivation {
        pname = "hsc3-auditor";
        version = "0.15";
-       sha256 = "02p4y06p08mizdrbvl52364szksrwnx28s992prw8b2ilav11563";
+       sha256 = "c39410b6a2512cc4f315296924bae559cfaf8919a2d0bd72fbb122700df0e40a";
        libraryHaskellDepends = [
          base filepath hmt hosc hsc3 hsc3-sf-hsndfile
        ];
@@ -72030,7 +72272,7 @@ self: {
      mkDerivation {
        pname = "hsc3-cairo";
        version = "0.14";
-       sha256 = "1f62mfjssky7igbp1nx2zf1azbih76m65xydnf5akp8pim7nzmis";
+       sha256 = "3ad66f4f8d17dda98ab3cdf762aa3930aeaf82fba2db70d78bc74fada5abc2b8";
        libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/?t=hsc3-cairo";
@@ -72046,7 +72288,7 @@ self: {
      mkDerivation {
        pname = "hsc3-data";
        version = "0.15";
-       sha256 = "0321rnajfiwldwwpns78im842hypykc1js7flnasld7al6m7487d";
+       sha256 = "ed2072aaa1ea34aa95a5ee6819d8f4d74341508de8687b396f94472795cd410c";
        libraryHaskellDepends = [
          base bifunctors Glob hcg-minus hmt hsc3-lang hsc3-plot
          hsc3-sf-hsndfile safe split SVGPath xml
@@ -72062,7 +72304,7 @@ self: {
      mkDerivation {
        pname = "hsc3-db";
        version = "0.15";
-       sha256 = "0sj3hq0d8dl4m6fn75lvyr78sg283p6y13lg8yi2yrgz74kn4zbl";
+       sha256 = "747d622739ff652fa2478f8ee0cd1d483c8d4ef69b96639da98436d40086436a";
        libraryHaskellDepends = [ base hsc3 safe ];
        homepage = "http://rd.slavepianos.org/t/hsc3-db";
        description = "Haskell SuperCollider Unit Generator Database";
@@ -72074,7 +72316,7 @@ self: {
      mkDerivation {
        pname = "hsc3-dot";
        version = "0.15";
-       sha256 = "1ck2g15zw23smry1xvn9ida8ln57vnvkxvr3khhp5didwisgm90m";
+       sha256 = "15a4fa74e42db672219c23ef3eb7dda7588a548bc9ee1e7cae7a08fe4b7862b2";
        libraryHaskellDepends = [ base directory filepath hsc3 process ];
        homepage = "http://rd.slavepianos.org/t/hsc3-dot";
        description = "haskell supercollider graph drawing";
@@ -72088,7 +72330,7 @@ self: {
      mkDerivation {
        pname = "hsc3-forth";
        version = "0.15";
-       sha256 = "0b3q6w1r12wv1fl05armkrprlkx2s7n08mimkxxndsd9kl6zl8lw";
+       sha256 = "9c22fa0d9da9e9667b9f355604ecd1a24f9a6f9e35ab02a80b9b8b900337782c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -72111,7 +72353,7 @@ self: {
      mkDerivation {
        pname = "hsc3-graphs";
        version = "0.15";
-       sha256 = "1d59gl0shwkwi9581j7x7yy1j63acns9ccpwin4y5lwk0k5x6s38";
+       sha256 = "6868d3cb0493d3e2898dfc3296b4656a1819bc3ffdc8804a8a7c72a8017da9b4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72142,7 +72384,7 @@ self: {
      mkDerivation {
        pname = "hsc3-lang";
        version = "0.15";
-       sha256 = "09qn9kb8h40cwhnjf4pl70i2vi7cn4pa4wkdwjbn07hrdpvxgihf";
+       sha256 = "0ec6d7f76d191e6097e46d72a22eb1ecc42d2238f412272de40c1088d64c1627";
        libraryHaskellDepends = [
          array base bifunctors bytestring containers data-default
          data-ordlist dlist hashable hmatrix-special hosc hsc3 MonadRandom
@@ -72161,7 +72403,7 @@ self: {
      mkDerivation {
        pname = "hsc3-lisp";
        version = "0.15";
-       sha256 = "1k45ipivvlfymvh6rzxsv1kfvd11spsn3skmsswg2vd76bcgh20x";
+       sha256 = "1d08f8d832a76df1b8d675ea61f5d521b4ed66d8baff6ce0aeded1bde38d85cc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -72181,7 +72423,7 @@ self: {
      mkDerivation {
        pname = "hsc3-plot";
        version = "0.15";
-       sha256 = "1v5n4k54qp8ifwka2bhrq9w1kfzd3ldzhqyhvkcgl0z46xcf7lk3";
+       sha256 = "63d2e35837e403fad8dcd063f81b1dedbb1978c2192ea12677115d4cca24b6ec";
        libraryHaskellDepends = [
          base directory filepath hosc hsc3 hsc3-lang process split
          statistics vector
@@ -72200,7 +72442,7 @@ self: {
      mkDerivation {
        pname = "hsc3-process";
        version = "0.10.0";
-       sha256 = "1h769akpd5gsmmlzmhya3dh56rhpf4fkj0vl6zngahc5hl4s7qxc";
+       sha256 = "ace3a309858541f5ec377403391d71176653601bcac3fa69adfa9576a74ae6c0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72218,7 +72460,7 @@ self: {
      mkDerivation {
        pname = "hsc3-rec";
        version = "0.14.1";
-       sha256 = "0m814vr41i0mm0c001vbih9i93048niljv3z8czaz32wysa8xpfl";
+       sha256 = "d4dd8e94f65c8caf3e437f6c49a345048c14138c6b070018a815c440f2260155";
        libraryHaskellDepends = [ base hsc3 ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/?t=hsc3-rec";
@@ -72234,7 +72476,7 @@ self: {
      mkDerivation {
        pname = "hsc3-rw";
        version = "0.15";
-       sha256 = "1jcnw0a1nf4wwf5bz61bkpwd3jfgccfxmcqq06vy43pc98223z8p";
+       sha256 = "17fd21044aec0ee2b70118b3da1d63cfc9d1f89d2b98bf8ae39c381b14e096c9";
        libraryHaskellDepends = [
          base directory haskell-src-exts parsec polyparse split syb
          transformers
@@ -72254,7 +72496,7 @@ self: {
      mkDerivation {
        pname = "hsc3-server";
        version = "0.10.0";
-       sha256 = "00lw0mj76i2fqhx81d258mqdwqxy8313574i2i8vrjn0mn4bbg2p";
+       sha256 = "57bcb588adc0cabc5114919c32c240be63de704545b4803ac44e447364059c02";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72280,7 +72522,7 @@ self: {
      mkDerivation {
        pname = "hsc3-sf";
        version = "0.15";
-       sha256 = "1dg3gqhvi2rshfqnw7i89bd4bvqjvbk4f9g17x18swyrvgkz9wr7";
+       sha256 = "27f3f4e7dbd9738d423fe12547e6da12ef45da4a281e6eb1833a8bb8217ee3b5";
        libraryHaskellDepends = [ base bytestring hosc ];
        homepage = "http://rd.slavepianos.org/t/hsc3-sf";
        description = "Haskell SuperCollider SoundFile";
@@ -72294,7 +72536,7 @@ self: {
      mkDerivation {
        pname = "hsc3-sf-hsndfile";
        version = "0.15";
-       sha256 = "11ksss2g8a7lqpjqvdwj4j9y3kdc8algc9mhlyjmj38mgg4raa2i";
+       sha256 = "512895c97b150d59a5a7b026f6a842accde1932492b78de5c5f428f484d67a86";
        libraryHaskellDepends = [
          array base hsc3-sf hsndfile hsndfile-vector vector
        ];
@@ -72308,7 +72550,7 @@ self: {
      mkDerivation {
        pname = "hsc3-unsafe";
        version = "0.14";
-       sha256 = "0kywqx7x10hqzhq8by0f62aznrnq4y3013cxkccx1r0naajpz3yj";
+       sha256 = "d28f7fa55216e4d0199b9d8d008627d866fb95300ef88530fc1882d04fc7dc4f";
        libraryHaskellDepends = [ base hsc3 ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/?t=hsc3-unsafe";
@@ -72324,7 +72566,7 @@ self: {
      mkDerivation {
        pname = "hsc3-utils";
        version = "0.15";
-       sha256 = "1pvg2z6n2r7jhwgwx9rv4q94jdj2ql3kgjh4smjq4xafnzzlyrix";
+       sha256 = "3d664fffb74e758265d504ca3707c542364912263ba7ce1f87f26461cd176fdf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72345,7 +72587,7 @@ self: {
      mkDerivation {
        pname = "hscamwire";
        version = "0.2.1";
-       sha256 = "0alnwc170hd2dyq718nvfq5dsbnyp29j3z49w2w5k59pi9pnqybc";
+       sha256 = "6c796c6f8a379559b8e089fc2193b8de2edd0a76dba270b06fa2417002e3962a";
        libraryHaskellDepends = [ array base time unix ];
        librarySystemDepends = [ camwire_1394 dc1394_control raw1394 ];
        jailbreak = true;
@@ -72362,7 +72604,7 @@ self: {
      mkDerivation {
        pname = "hscassandra";
        version = "0.0.7";
-       sha256 = "06jr17karspq3qpan9iqh0zk2w3b2d7ghdvl8wd4hjz73yacw6f4";
+       sha256 = "c419ce941fe74b481a477437f84e136b70313f803826ab2e1ef8eaace609591a";
        libraryHaskellDepends = [
          base bytestring cassandra-thrift containers mtl network old-time
          Thrift
@@ -72378,7 +72620,7 @@ self: {
      mkDerivation {
        pname = "hscd";
        version = "0.0.3";
-       sha256 = "1wjf3gba1gfbd54d0r4xpkfq7lyvyamhfw21wnsnqsl4hvp335jr";
+       sha256 = "599631ee86846a6cb5e5417007abf2dbd383ddbc9d64d04869cbbda0d61b4ef2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
@@ -72394,7 +72636,7 @@ self: {
      mkDerivation {
        pname = "hsclock";
        version = "1.0";
-       sha256 = "0g853fq9vv33nga05rhls6hk5h4gaby8mws0i8yq2iday6j576nf";
+       sha256 = "ce9a53a4f1aa45813d8a40f38afc528fc032a1d114e602d4b363ec9db01b053d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cairo glib gtk old-time ];
@@ -72409,7 +72651,7 @@ self: {
      mkDerivation {
        pname = "hscolour";
        version = "1.23";
-       sha256 = "1c4i2zpami8g3w9949nm3f92g7xwh5c94vkx658zz7ihrjp7w5lp";
+       sha256 = "97167eaecc309eff51317d6e925881bc9f27921bd52692121f0fc5aaee1791b0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -72427,7 +72669,7 @@ self: {
      mkDerivation {
        pname = "hscope";
        version = "0.4.1";
-       sha256 = "1m5mp45pvf64pnpc3lsig382177vfc232bbm9g3a8q58jrwridy7";
+       sha256 = "c7b7987996a860a4c64b752d310473fb9c20d07851d3c1aebdc4b87d0bb9b5d4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -72450,7 +72692,7 @@ self: {
      mkDerivation {
        pname = "hscrtmpl";
        version = "1.4";
-       sha256 = "1az51cv6wqjdkw0fqgi5s75rmfka3sly85022rhvk44w1vd45iii";
+       sha256 = "31c642da0e9c90b961160214e4a91e6aba9acbd1253eec009f4d626e360be5ab";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -72468,7 +72710,7 @@ self: {
      mkDerivation {
        pname = "hscuid";
        version = "1.2.0.0";
-       sha256 = "01dmxckv9rlgb87ms5xbysw2cc7prmfww8g2n98ncgnc0lh3pc5l";
+       sha256 = "b4b03b2005cc3e6651b2e221ce5dcdf73026b8f6ab175d0f5a8fe6b427ebb505";
        libraryHaskellDepends = [
          base formatting hostname random text time transformers unix
        ];
@@ -72484,7 +72726,7 @@ self: {
      mkDerivation {
        pname = "hscurses";
        version = "1.4.2.0";
-       sha256 = "0msf80475l3ncpnb1lcpnyscl1svmqg074ylb942rx7dbvck71bj";
+       sha256 = "728533d95eedf42c485ad493031eae5b07cab4b797d1b0ec6576d07208404e57";
        libraryHaskellDepends = [
          base exceptions mtl old-locale old-time unix
        ];
@@ -72498,7 +72740,7 @@ self: {
      mkDerivation {
        pname = "hscurses-fish-ex";
        version = "1.3.1";
-       sha256 = "1s7b2v3cl0nl2b55agn5wkvxn30f2bgp6mznkn33148vlbya1mzs";
+       sha256 = "fad7a0fca21b9130869df65773df120e0cdbf7e4c53e55ca12d402cac616ebe8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hscurses random safe unix ];
@@ -72522,7 +72764,7 @@ self: {
      mkDerivation {
        pname = "hsdev";
        version = "0.1.4.2";
-       sha256 = "1l2pm2p0k2m8aln6an3kxswcalc7w72v7mxs5fzq0nfy60iphcys";
+       sha256 = "da33782330de5980bf2bbad7b3c5e18751c5b8ee7358652c55a88a09aea857d0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72551,7 +72793,7 @@ self: {
      mkDerivation {
        pname = "hsdif";
        version = "0.14";
-       sha256 = "1wxms6z8mpyf4l1qqxi6gvscls3mwlj5aq6g3ldashzrmb7pcimm";
+       sha256 = "b54676cfaaf943ad1a1dcf605524e57568caf47e26768c0325cedf8abed1b5f3";
        libraryHaskellDepends = [ base bytestring hosc ];
        jailbreak = true;
        homepage = "http://rd.slavepianos.org/?t=hsdif";
@@ -72564,7 +72806,7 @@ self: {
      mkDerivation {
        pname = "hsdip";
        version = "0.1";
-       sha256 = "0hqwpcf2bcrj36wg02mxd2zdg07dqh4b5mv9yn295xp64snrdw84";
+       sha256 = "04f196ad26e6f69284f569d7b208c4ed80d7be68bd0af0b81932b3251cbb1c43";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cairo containers HUnit parsec ];
@@ -72579,7 +72821,7 @@ self: {
      mkDerivation {
        pname = "hsdns";
        version = "1.6.1";
-       sha256 = "0s63acjy1n75k7gjm4kam7v5d4a5kn0aw178mygkqwr5frflghb4";
+       sha256 = "64c1475d7625733c9fafe804ae809d459156f6a96a922adf99e5d8e02553c368";
        libraryHaskellDepends = [ base containers network ];
        librarySystemDepends = [ adns ];
        homepage = "http://github.com/peti/hsdns";
@@ -72594,7 +72836,7 @@ self: {
      mkDerivation {
        pname = "hsdns-cache";
        version = "1.0.4";
-       sha256 = "1f0822kly602izwzxfi46w668k0jybn3khfacnxmc1744jpqr89i";
+       sha256 = "31a18caf24e40456bb65cac139ecf2124c640c3724bafef98f02184fa71008b8";
        libraryHaskellDepends = [
          base hsdns network SafeSemaphore text time unordered-containers
        ];
@@ -72609,7 +72851,7 @@ self: {
      mkDerivation {
        pname = "hse-cpp";
        version = "0.1";
-       sha256 = "0f1bgi1hnpnry1pm7jhi626afdvymzy7k0a70n07n41js46pjxd0";
+       sha256 = "a075790dd132107b8005478179fcaf7e37a78c3011ca536ff0d95e0b437c2b38";
        libraryHaskellDepends = [ base cpphs haskell-src-exts ];
        description = "Preprocess+parse haskell code";
        license = stdenv.lib.licenses.mit;
@@ -72622,7 +72864,7 @@ self: {
      mkDerivation {
        pname = "hsebaysdk";
        version = "0.3.0.0";
-       sha256 = "1bmkka53dxaizbiazici0i60qrqq2zbff95xqxlfp11v3cclcffg";
+       sha256 = "cf3946191b3b84eb68c7bd24e7d61718670c4c0491c5afe2fa51f5368a9ab3ae";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-types text time transformers
          unordered-containers
@@ -72637,7 +72879,7 @@ self: {
      mkDerivation {
        pname = "hsemail";
        version = "1.7.7";
-       sha256 = "16wqrpzi5njv26za1rckn74jsqmyswndb6k38yz1567h1y4w7ai5";
+       sha256 = "25aac3890ff09812be47639ad52cd7be622dc9b193e5a0be115bda12ffcd989b";
        libraryHaskellDepends = [ base mtl old-time parsec ];
        testHaskellDepends = [ base doctest hspec old-time parsec ];
        homepage = "http://github.com/peti/hsemail";
@@ -72650,7 +72892,7 @@ self: {
      mkDerivation {
        pname = "hsemail-ns";
        version = "1.3.2";
-       sha256 = "03d0pnsba7yj5x7zrg8b80kxsnqn5g40vd2i717s1dnn3bd3vz4s";
+       sha256 = "9afc3dda1ad6b6a04f3851b40dc82b165bdd27400bbdfc4f2fd21fb5b4bda00d";
        libraryHaskellDepends = [ base mtl old-time parsec ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/hsemail-ns/home";
@@ -72666,7 +72908,7 @@ self: {
      mkDerivation {
        pname = "hsenv";
        version = "0.5";
-       sha256 = "1kjj9p8x6369g9ah9h86xlyvcm4jkahvlz2pvj1m73javbgyyf03";
+       sha256 = "0338efdfda4a8e5383dc577cbaa19a9254b63ded06c104557ac90cd3d14d52ce";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -72684,7 +72926,7 @@ self: {
      mkDerivation {
        pname = "hserv";
        version = "0.1.0.3";
-       sha256 = "1dvnkd3nwgdz9hq8zafvmn75hczsiflbf05j10nmrj8imhyh70j3";
+       sha256 = "4382033dac11c95c2d08b200b7a88bfa33588eaddba98f304cbf3d6e479b76b7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs wai-app-static warp ];
@@ -72698,7 +72940,7 @@ self: {
      mkDerivation {
        pname = "hset";
        version = "1.1.0";
-       sha256 = "15ls3wkk29mf2nyrm80dcmg66q0dd0srgwyv46ix3zkaxs239mbl";
+       sha256 = "74d53484ee6afed1a321dbf39735680d60635e650da09abd15ae2631271f9a96";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base HUnit mtl ];
        homepage = "https://bitbucket.org/s9gf4ult/hset";
@@ -72713,7 +72955,7 @@ self: {
      mkDerivation {
        pname = "hsexif";
        version = "0.6.0.4";
-       sha256 = "0k9a6d6c2n0x5g6vls4848gydnvw790lf1nyy5piz1rdzsd6bx3k";
+       sha256 = "73f4659afe2d871f6ff1de0647413a7cdbe61f228868bacd2b1d58c14c332a4d";
        libraryHaskellDepends = [
          base binary bytestring containers iconv text time
        ];
@@ -72730,7 +72972,7 @@ self: {
      mkDerivation {
        pname = "hsfacter";
        version = "0.2.1";
-       sha256 = "1j7pny0yjpx5qw2d9br723dyic4v09k1qbvrham57p9qxn9m5b0q";
+       sha256 = "18ac5293ed38dd53aa82792f1c66029bb0e8db1027afd404c7a55fe981b7f7c8";
        libraryHaskellDepends = [ base containers language-puppet text ];
        homepage = "http://lpuppet.banquise.net";
        description = "A small and ugly library that emulates the output of the puppet facter program";
@@ -72743,7 +72985,7 @@ self: {
      mkDerivation {
        pname = "hsfcsh";
        version = "0.0.1";
-       sha256 = "1fc1fk33wslfkpb83c3ax251h60d5zn2qiqyw81v19wd5r2a6kqc";
+       sha256 = "0c4fa3442e8da7b003e21e472cec2f0d18188ae86ab081d69d8e6a3ec67481b9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -72760,7 +73002,7 @@ self: {
      mkDerivation {
        pname = "hsfilt";
        version = "0.1.0.0";
-       sha256 = "063k5f64734wvrl45nrp1yvh3bf51w3dzzf3jj4fmj1gjp07zy48";
+       sha256 = "88f87fc0952fc8ea8894c3fddf060fc5ad01b70f37db4268de9c8c438c2b7318";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ghc ];
@@ -72774,7 +73016,7 @@ self: {
      mkDerivation {
        pname = "hsgnutls";
        version = "0.2.3.2";
-       sha256 = "1nd3z8kb4qjaj0hic9b305c15a7g6sfx6dixz8pspvqg1x84cjnm";
+       sha256 = "d54a46500f0fefab2ffa3d36d39d36efa812580163251621904a62b226faa3d9";
        libraryHaskellDepends = [ base bytestring mtl old-time ];
        librarySystemDepends = [ gcrypt gnutls ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls";
@@ -72788,7 +73030,7 @@ self: {
      mkDerivation {
        pname = "hsgnutls-yj";
        version = "0.2.3.3";
-       sha256 = "05dn7kvjxk2pnzv040hyw71nvr83jvdvajq4a9v76kcyjhhwiv0w";
+       sha256 = "1cecc821949e4d737652044bb5db9603e56dc3e11e0202f6b757cc2ef73cb615";
        libraryHaskellDepends = [ base bytestring mtl old-time ];
        librarySystemDepends = [ gcrypt gnutls ];
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls";
@@ -72802,7 +73044,7 @@ self: {
      mkDerivation {
        pname = "hsgsom";
        version = "0.2.0";
-       sha256 = "1043lavrimaxmscayg4knx7ly0yc0gsb729pg72g897hc455r2dn";
+       sha256 = "b6895c0a61f024f4c4793789b3f403cc034f4fb7933caf98ae5dd598b7a28380";
        libraryHaskellDepends = [ base containers random stm time ];
        description = "An implementation of the GSOM clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -72816,7 +73058,7 @@ self: {
      mkDerivation {
        pname = "hsgtd";
        version = "0.2";
-       sha256 = "0rsi54zhznqdycjkbkdblbfcx7lbvwdwvw0zlxqspyiz2px6lqc6";
+       sha256 = "86616afa153ffaab71a71ff0cd1bdf8b9ecedca2abcd3525f30ddb0f3f295167";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -72832,7 +73074,7 @@ self: {
      mkDerivation {
        pname = "hsharc";
        version = "0.14";
-       sha256 = "1mzi074iiz48pcy6rvgqz6ckm0zx115kmvax60bx9bfcanw686vf";
+       sha256 = "6e1b64b855ccadd417305ded3a4b08fd833a99f9f8ed6c3cbb88fc18c901f1d7";
        libraryHaskellDepends = [ base xml ];
        homepage = "http://rd.slavepianos.org/?t=hsharc";
        description = "Haskell SHARC bindings";
@@ -72847,7 +73089,7 @@ self: {
      mkDerivation {
        pname = "hsignal";
        version = "0.2.7.1";
-       sha256 = "1dzga1cgxrk7i65zrmpg22521islp4xzfc95ph7kla2acxzr6q0x";
+       sha256 = "1d60937f674a283a0fbc2531f73bb954c7208a10efd6fc8b8967e6fe5850efb7";
        libraryHaskellDepends = [
          array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats
          hstatistics mtl storable-complex
@@ -72865,7 +73107,7 @@ self: {
      mkDerivation {
        pname = "hsilop";
        version = "0.1.1.0";
-       sha256 = "001wwlwxd3qb3mcpn0l5qmd7nvpy8qlrcr5j3s5111pgfi8ib0sn";
+       sha256 = "5683155174ef86108a1eb264962946fe6e7b5ac585027b591d0b8fd639e53c00";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskeline ];
@@ -72882,7 +73124,7 @@ self: {
      mkDerivation {
        pname = "hsimport";
        version = "0.6.5";
-       sha256 = "10h19rdzqskjvaax30znqpvx765x0lj58wp1zgf8dv6mgvaz77zy";
+       sha256 = "fe9ff3d57ed5ec86dcfbe172542405bd98d3f7c5f683d195da726afc5b4e0182";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72905,7 +73147,7 @@ self: {
      mkDerivation {
        pname = "hsini";
        version = "0.4.2";
-       sha256 = "1zkrfc2zyhcwy7l1k8kn0k2qv6jkxw0d6h6bifzh6d5h01ws72mr";
+       sha256 = "b98aa37900b03403bf8bcb40d300ef539a8dc50476a219e8f19c41ff057379fe";
        libraryHaskellDepends = [ base bytestring containers mtl parsec ];
        testHaskellDepends = [
          base bytestring containers HUnit mtl parsec QuickCheck tasty
@@ -72920,7 +73162,7 @@ self: {
      mkDerivation {
        pname = "hskeleton";
        version = "0.1.1";
-       sha256 = "0f06xir28rzpwphk14gkpww8l7gbws4habhm26915idpnd4bva2w";
+       sha256 = "5ca8bd48b3b7c5129211152e0589e6eb1d8a38bff39130e1e5f7672472ec0638";
        libraryHaskellDepends = [ base Cabal ];
        description = "Skeleton for new Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -72932,7 +73174,7 @@ self: {
      mkDerivation {
        pname = "hslackbuilder";
        version = "0.0.2";
-       sha256 = "0j4wkw6hqajgwzik8flfzs2m5rlmy9blm98n5ym56svjypshl55q";
+       sha256 = "b8140af5f5726b53aa2f16a54a57f295e65285fe8e3a34e3e74f2a0c0d9f9c48";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -72949,7 +73191,7 @@ self: {
      mkDerivation {
        pname = "hslibsvm";
        version = "2.89.0.1";
-       sha256 = "00smw10j2ipw10133qc38famar5r6rkswj7bhvb9hdj2rrdyx6sf";
+       sha256 = "4e9bee5bce423698d686eb48ae6736b96455954383e1310208fc462141e05503";
        libraryHaskellDepends = [ base containers ];
        librarySystemDepends = [ svm ];
        description = "A FFI binding to libsvm";
@@ -72963,7 +73205,7 @@ self: {
      mkDerivation {
        pname = "hslinks";
        version = "0.6.1";
-       sha256 = "1dqicdvklkczn216qxb7gnjjgvgmr0s6iljyb33qhmmabrx5a7x1";
+       sha256 = "a11f557a5eaa5688c7585ed26834c8f5ed27a57d67756c82b09f4d3a776311b7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -72980,7 +73222,7 @@ self: {
      mkDerivation {
        pname = "hslogger";
        version = "1.2.9";
-       sha256 = "0xml1xgkj4hjjxypnjiia7y330a0nh5fcnkwhmnrwsw7hckwqqmy";
+       sha256 = "be62cc2783876b9e6d857c5ae60ab4408131fc51314a7b7d971212395f0fb476";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72996,7 +73238,7 @@ self: {
      mkDerivation {
        pname = "hslogger-template";
        version = "2.0.3";
-       sha256 = "1q5g2jgx4yjzvbrc22qcxrb3r9cma64jg90wzx9yc19yxq0fa95k";
+       sha256 = "b324e500ee3e05e653ff1ca427895195a53c56ee0c0bc1f2da5f7ad29f14afe0";
        libraryHaskellDepends = [ base hslogger mtl template-haskell ];
        description = "Automatic generation of hslogger functions";
        license = stdenv.lib.licenses.publicDomain;
@@ -73007,7 +73249,7 @@ self: {
      mkDerivation {
        pname = "hslogger4j";
        version = "0.2";
-       sha256 = "0mypcdj8npygj9g8d276rhr2wagk96zc4rjimwx2ylw4qm0scv5n";
+       sha256 = "b66ca641c584532f3aaf5166c2be49f3292e32cce688865e92cf5f8b6463d757";
        libraryHaskellDepends = [ hslogger ];
        homepage = "http://hslogger4j.googlecode.com/";
        description = "DEPRECATED hslogger handlers for log4j's XMLLayout";
@@ -73026,7 +73268,7 @@ self: {
      mkDerivation {
        pname = "hslogstash";
        version = "0.3.7.1";
-       sha256 = "040564f4wxmdhglziahava5cbyhvwbiw1ifi1g3cfb9zna2xl8p6";
+       sha256 = "e622da85b23f2dc7c60bd1c5c0e3e21bfac58ada0aaaf8e983ad764e1c310510";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring conduit containers
          data-default hedis http-conduit http-types iconv lens network
@@ -73050,7 +73292,7 @@ self: {
      mkDerivation {
        pname = "hslua";
        version = "0.4.0";
-       sha256 = "0l50ppvnavs3lc1vmrpxhlb3ffl772n1hk8mdi9w4ml64ninba3p";
+       sha256 = "77a865a3258656c2536c154d18ac38873a371685fde6ba03a3436f65f7bda050";
        revision = "2";
        editedCabalFile = "43f6956aba870857548523718d3d5645e422187964e5158d14a9c17d96671ccb";
        configureFlags = [ "-fsystem-lua" ];
@@ -73071,7 +73313,7 @@ self: {
      mkDerivation {
        pname = "hsmagick";
        version = "0.5";
-       sha256 = "1bfzbwddss0m0z4jf7i0b06pmxy9rvknpqnzhf0v5jggv5nr442p";
+       sha256 = "5710926dd9efc9b28183dfe26be7cec9f77a0d58201e27c9071568dd1a5fdfad";
        libraryHaskellDepends = [
          base bytestring directory filepath pretty process
        ];
@@ -73098,7 +73340,7 @@ self: {
      mkDerivation {
        pname = "hsmisc";
        version = "1.2";
-       sha256 = "1n2na14a5qaph0f457zvkjwr2zkbgh3mfli2ir5wkm7m1bm671aj";
+       sha256 = "528563ea0af5d4c94b8e225257077c6b7e91b99cfb9f421c8057e1a2485056d8";
        libraryHaskellDepends = [
          base containers mtl old-locale parsec time
        ];
@@ -73113,7 +73355,7 @@ self: {
      mkDerivation {
        pname = "hsmtpclient";
        version = "1.0";
-       sha256 = "08gbrwrc85in34nrgjm0zr5sjz2zbjc7hk2zlpvk1dq8x62a6wsg";
+       sha256 = "4f73a384e908b730f7a55f4c78985c5f7ca94bfea0ca972d193616c432cfeb21";
        libraryHaskellDepends = [ array base directory network old-time ];
        homepage = "http://code.google.com/p/hsmtpclient/";
        description = "Simple SMTP Client";
@@ -73126,7 +73368,7 @@ self: {
      mkDerivation {
        pname = "hsndfile";
        version = "0.7.1";
-       sha256 = "1254r811sspd7h8a4yr4ff3a6c39ywp1zjrkxbsczpxbyg9bdnv2";
+       sha256 = "62dbb6d2f3abdfcff4ea33cb1f2ef76930a38673247ba2103ced6a1d02caa488";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ libsndfile ];
        libraryToolDepends = [ c2hs ];
@@ -73140,7 +73382,7 @@ self: {
      mkDerivation {
        pname = "hsndfile-storablevector";
        version = "0.5.2";
-       sha256 = "1n7jw14pnixiv1z50lb7yzwyyl3yd3gdfg5w0gx0m52pnmqiav9z";
+       sha256 = "3f6d1571b557940afa03bc3cd7de687e50eff9f76751507ed8b1477b49e0f2d8";
        libraryHaskellDepends = [ base hsndfile storablevector ];
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile (Data.StorableVector interface)";
@@ -73153,7 +73395,7 @@ self: {
      mkDerivation {
        pname = "hsndfile-vector";
        version = "0.5.2";
-       sha256 = "1598bf87llbiri1qh8zirhbsd94c9vhd41lf9vialqrykbmi3zig";
+       sha256 = "2ffe11eb9a3e63aae24e8e06d2e04e8ca4a617ccf1238843cc71517a905b2895";
        libraryHaskellDepends = [ base hsndfile vector ];
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile (Data.Vector interface)";
@@ -73167,7 +73409,7 @@ self: {
      mkDerivation {
        pname = "hsnock";
        version = "0.5.1";
-       sha256 = "1hh4lyrd2ki79q6pfz62icp3igzyljwa5bz8ba9vk4kxxawrnbhw";
+       sha256 = "1c2e9bb9ea7d92b9935ae8afa2b8a4febf382e8bc27c770d4e274ed1b2a704c2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec readline ];
@@ -73187,7 +73429,7 @@ self: {
      mkDerivation {
        pname = "hsnoise";
        version = "0.0.2";
-       sha256 = "0f8xpmzmg71l7qn1vjvzncsx8r7vfpzvlnlq0029ixf64gshbmzl";
+       sha256 = "f4d705f523c6f5980400985abaff75fb64d435b37fcb1d2c3e349c577fbd1d39";
        libraryHaskellDepends = [ base vector ];
        homepage = "https://github.com/colinhect/hsnoise";
        description = "A coherent 3d noise library";
@@ -73199,7 +73441,7 @@ self: {
      mkDerivation {
        pname = "hsns";
        version = "0.5.3";
-       sha256 = "0r3z9h5l4hxbjfcqsfk67jp2r964wgvrisk352lpx550vwd6chbf";
+       sha256 = "6e41661adfa0947ea92863ea98f7e3c4a42cae3c663a8d9993ab43420b4c7f64";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base network pcap ];
@@ -73216,7 +73458,7 @@ self: {
      mkDerivation {
        pname = "hsnsq";
        version = "0.1.2.0";
-       sha256 = "0chmcyfar29rnsni47yx286a308rll098lxrr1zhyi7kxvh9j4fb";
+       sha256 = "cb1199e0eef3440f7fc8b9539400a51981a10c12dd1f12adb63989ac9c671532";
        libraryHaskellDepends = [
          aeson async attoparsec attoparsec-binary base bytestring containers
          hostname hslogger mtl network pipes pipes-attoparsec pipes-network
@@ -73234,7 +73476,7 @@ self: {
      mkDerivation {
        pname = "hsntp";
        version = "0.1";
-       sha256 = "0pw5l6z1yjjvcxgw71i00gfnjdqcvg09bsacazq9ahvnwsn4aayd";
+       sha256 = "cd2b45ace6764395f0574ce995c0db0c3769dd032086c35f675b4a1fbea1855f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base mtl network old-time random ];
@@ -73253,7 +73495,7 @@ self: {
      mkDerivation {
        pname = "hsoptions";
        version = "1.0.0.0";
-       sha256 = "1c4sigmagwbs3g5pj3as4f930mvba090p7cjq4cy8hbmv6cz0fn1";
+       sha256 = "c13af099d97541e419c1929d0b12506b573092235a0d79cb1b7af1a7ea8b9ab0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73277,7 +73519,7 @@ self: {
      mkDerivation {
        pname = "hsp";
        version = "0.10.0";
-       sha256 = "1ayfywgrlmzivsq6lirmgvl65x1shf8041lzw2yh245rkmd91lsf";
+       sha256 = "4ed3905a9db91001bde09f060290833af462e87e35476ab0def1579a1ff7ceab";
        libraryHaskellDepends = [ base mtl text ];
        homepage = "http://hub.darcs.net/nibro/hsp";
        description = "Haskell Server Pages is a library for writing dynamic server-side web pages";
@@ -73289,7 +73531,7 @@ self: {
      mkDerivation {
        pname = "hsp-cgi";
        version = "0.4.4";
-       sha256 = "0m1xylqzmi2c1c92zk5bq6232id9fmjlx4s88ic2fvf5a389n11n";
+       sha256 = "36049bd050c56d27584448934e6575a9453184c1abcc2f120b4cc4fa31f53d54";
        libraryHaskellDepends = [ base containers harp hsp network ];
        homepage = "http://code.google.com/p/hsp";
        description = "Facilitates running Haskell Server Pages web pages as CGI programs";
@@ -73302,7 +73544,7 @@ self: {
      mkDerivation {
        pname = "hsparklines";
        version = "0.1.0";
-       sha256 = "10za4f07a5agg3zgy32fdz02vg9fl344qswhzj5mnx8wpnxmr3y6";
+       sha256 = "c68f5cbbbd1c755b8bfc906b4cc8a02ebd2dc06f4e0cfffe784f15758023ea83";
        libraryHaskellDepends = [ base bytestring dataenc gd ];
        homepage = "http://www.jasani.org/search/label/hsparklines";
        description = "Sparklines for Haskell";
@@ -73317,7 +73559,7 @@ self: {
      mkDerivation {
        pname = "hsparql";
        version = "0.2.6";
-       sha256 = "1vgdp4gz7zwh1n3iilg6kwdasfy4w48pjjgj6swr17k37irwzal4";
+       sha256 = "84aacf733c639e90b936f2497911e1c43bad1a9fe6d118870d90fff31fb9eded";
        libraryHaskellDepends = [
          base bytestring HTTP MissingH mtl network network-uri rdf4h text
          xml
@@ -73339,7 +73581,7 @@ self: {
      mkDerivation {
        pname = "hspear";
        version = "0.14";
-       sha256 = "1h3av9mpgsqfdrd817fz0isqrxn3lxmjyanw33dk9jax136ivi1h";
+       sha256 = "30c41dcd085dc934db18dc2a2f6ba7c3f68c7504df9d805a6e0eeb776bda6ac0";
        libraryHaskellDepends = [
          base bytestring bytestring-lexing split utf8-string zlib
        ];
@@ -73357,7 +73599,7 @@ self: {
      mkDerivation {
        pname = "hspec";
        version = "2.1.10";
-       sha256 = "0m51afa2n187jjx0fwarg11chakhv3z7fbmqq5rr7j60d9ix9ypq";
+       sha256 = "f8fad4636ac0c89373c1b82e77fed8702ac84278597107ba9407052b9453a154";
        libraryHaskellDepends = [
          base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
          transformers
@@ -73377,7 +73619,7 @@ self: {
      mkDerivation {
        pname = "hspec-attoparsec";
        version = "0.1.0.2";
-       sha256 = "0r7v6x0k5r8jxl0rnsq8h3gqhbiimsic3kiphn6dxaw954zqnypa";
+       sha256 = "ea7a8b3f2989abde8c8537cec1a2ae312e88df80086b9b01ed12e5324137fb64";
        libraryHaskellDepends = [
          attoparsec base bytestring hspec-expectations text
        ];
@@ -73394,7 +73636,7 @@ self: {
      mkDerivation {
        pname = "hspec-checkers";
        version = "0.1.0";
-       sha256 = "043qzgjp9ch9wqm269dd87jn8wk5c90q25098hnz8ilv5pnywk6d";
+       sha256 = "cd4ceeed2d9b46f42d440914814162657264e541ad25232ae609b274e5fb7810";
        libraryHaskellDepends = [ base checkers hspec ];
        testHaskellDepends = [ base checkers hspec ];
        description = "Allows to use checkers properties from hspec";
@@ -73406,7 +73648,7 @@ self: {
      mkDerivation {
        pname = "hspec-contrib";
        version = "0.3.0";
-       sha256 = "006syw8xagfhsx06ws9ywig1qx5lk4cgl7sq6pbid1s64c72mxn4";
+       sha256 = "c4f62a0e23468716d735581ffa1899b4741c5ee43e696e40d7d03dd511f7da00";
        libraryHaskellDepends = [ base hspec-core HUnit ];
        testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
        homepage = "http://hspec.github.io/";
@@ -73423,7 +73665,7 @@ self: {
      mkDerivation {
        pname = "hspec-core";
        version = "2.1.10";
-       sha256 = "1q0fnag7lw54zf6aj55cckcfzs5ykpc841bczap6q9gnwrvpwbk8";
+       sha256 = "682e7e77e6f6256caefa6c0582d89dbee8efd864ac14a98cfba4707a9eb20ee0";
        libraryHaskellDepends = [
          ansi-terminal async base deepseq hspec-expectations HUnit
          QuickCheck quickcheck-io random setenv tf-random time transformers
@@ -73443,7 +73685,7 @@ self: {
      mkDerivation {
        pname = "hspec-discover";
        version = "2.1.10";
-       sha256 = "02qs0y7nn8wczjjs606d8ivixxib0024kny2al6mgvxyp524xcgg";
+       sha256 = "efb14e44b9beef570d55c2db4904002bf61e7744cd00a3a5fc8c236b8f071a0b";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath ];
@@ -73458,7 +73700,7 @@ self: {
      mkDerivation {
        pname = "hspec-expectations";
        version = "0.7.1";
-       sha256 = "0n52k7qwqc5awig08fvajvymb9bb235q6pp8w0cbcb9a96rwdjmg";
+       sha256 = "afcac6b3492a2db618e0e85e83cb106ba555fd966a3b045ee4aa30ccf199a258";
        libraryHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/sol/hspec-expectations#readme";
        description = "Catchy combinators for HUnit";
@@ -73472,7 +73714,7 @@ self: {
      mkDerivation {
        pname = "hspec-expectations-lens";
        version = "0.4.0";
-       sha256 = "17c9qn525bmg113mw30sc35gm207rl0d6h156c7c1npnkyp1pw0k";
+       sha256 = "13f01bae9ff6dac00e332540d300cd0788faca601a0c5e4708afae228ac5899d";
        libraryHaskellDepends = [
          base hspec hspec-expectations HUnit lens
        ];
@@ -73487,7 +73729,7 @@ self: {
      mkDerivation {
        pname = "hspec-expectations-lifted";
        version = "0.5.0";
-       sha256 = "0c3fxgwxjwqgwpnlxlbp2amhk44m34iq2lxs1rxkp3vjwkqi2m8b";
+       sha256 = "0b5511f1e4728f3b7b0eba53812319959009ab1277d14eede50f73d9f9eb6e30";
        revision = "1";
        editedCabalFile = "43e88e0e7587ba1965ba3f2416500c239ad44ba19043bb249c6f307665e85208";
        libraryHaskellDepends = [ base hspec-expectations transformers ];
@@ -73503,7 +73745,7 @@ self: {
      mkDerivation {
        pname = "hspec-expectations-pretty";
        version = "0.1";
-       sha256 = "1x8xpc9b2m33sqwf7j643wjzja956m4vcdvaqrwlpxwqn887sxn5";
+       sha256 = "c5767d10b298f74b79c66a37b649352529f9251fc4c8e338d66354b112bb1df5";
        libraryHaskellDepends = [
          base deepseq hspec-expectations wl-pprint-extras wl-pprint-terminfo
        ];
@@ -73518,7 +73760,7 @@ self: {
      mkDerivation {
        pname = "hspec-experimental";
        version = "0.1.0";
-       sha256 = "197c9x25r41xmaq84xqhi0kizxi7as7jn7k9klj7pq9fmd9hcg7m";
+       sha256 = "f53c0653ab2ee17b249d691e2b8f5627f61f2788107782b0aa3d905c444feca4";
        libraryHaskellDepends = [ base hspec HUnit QuickCheck ];
        testHaskellDepends = [ base hspec-meta ];
        jailbreak = true;
@@ -73532,7 +73774,7 @@ self: {
      mkDerivation {
        pname = "hspec-jenkins";
        version = "0.1.1";
-       sha256 = "16aql0fyssc16z85isskccq93dj5i1pydblnf2q1np7z6pl1azy2";
+       sha256 = "c27f15e835ff5c1bb07096aee66f8845b691306353eb58d0378169ed1da05899";
        libraryHaskellDepends = [ base blaze-markup hspec ];
        homepage = "https://github.com/worksap-ate/hspec-jenkins";
        description = "Jenkins-friendly XML formatter for Hspec";
@@ -73544,7 +73786,7 @@ self: {
      mkDerivation {
        pname = "hspec-laws";
        version = "0.0.0";
-       sha256 = "15mcspn20znjxjsjqivrfvpndjd2i3kic5nyij13lfwyd3p2al0j";
+       sha256 = "125025ee689e3b3a828cde1616e788a2c966ef7679472cb5ecd27e20ecd5ac96";
        libraryHaskellDepends = [ base hspec QuickCheck ];
        testHaskellDepends = [ base hspec markdown-unlit QuickCheck ];
        description = "Document and test laws for standard type classes";
@@ -73559,7 +73801,7 @@ self: {
      mkDerivation {
        pname = "hspec-meta";
        version = "2.1.7";
-       sha256 = "0yh9yf9859cimd1qrh3bn65c89n16fpxzrcsily3xzr4miri7r7z";
+       sha256 = "ffe41373ac24ff3e3c8d9ae5dfaf33c126c48ab16bc08c43ab91a58292f3097a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73579,7 +73821,7 @@ self: {
      mkDerivation {
        pname = "hspec-monad-control";
        version = "0.1.0.0";
-       sha256 = "07ry4nghrjbrlv6slv2a1m67r5ajdss7ifyzph0zwa96bjl1w124";
+       sha256 = "44041ea85c2629fe01bcdfbb78b46e52957c4c0d4a6caacda679c90c9f253e1f";
        libraryHaskellDepends = [
          base hspec-core monad-control transformers transformers-base
        ];
@@ -73595,7 +73837,7 @@ self: {
      mkDerivation {
        pname = "hspec-server";
        version = "0.4.1";
-       sha256 = "17bn5v3fqcmcd0qi4q9n9fj27kpw4iqyrjpjvvc4gwz1bc5bhf5q";
+       sha256 = "b838b80a5be1f347d8def2caec7124fcce23a44b3661123168ac32ecc62e769d";
        libraryHaskellDepends = [
          base containers hspec hspec-core hspec-expectations HUnit process
          regex-posix temporary transformers
@@ -73610,7 +73852,7 @@ self: {
      mkDerivation {
        pname = "hspec-shouldbe";
        version = "0.0.1";
-       sha256 = "0b4y84vqyx22kihr0sbbxzr6sdz99hi2rhyl09r8ddzkzqadfii3";
+       sha256 = "2346d714fef3b7867202d4c32c224ce9376df2ef6b6990619c42748f37419e2c";
        libraryHaskellDepends = [ hspec test-shouldbe ];
        description = "Convenience wrapper and utilities for hspec";
        license = stdenv.lib.licenses.mit;
@@ -73622,7 +73864,7 @@ self: {
      mkDerivation {
        pname = "hspec-smallcheck";
        version = "0.3.0";
-       sha256 = "1yybyrbbj0fv62cf8nh851rgbb8phyhpsm57mzn7s5vqz7lf7dxw";
+       sha256 = "bcb7e3e8f978177decafa7547da18717adf57228085ae49830db01b956f6cbfb";
        libraryHaskellDepends = [ base hspec smallcheck ];
        testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        homepage = "http://hspec.github.io/";
@@ -73638,7 +73880,7 @@ self: {
      mkDerivation {
        pname = "hspec-snap";
        version = "0.3.3.0";
-       sha256 = "1ch58zz5yhvp4dq91ls05bgraf2p36aixl189zm3ipc9naidjrg4";
+       sha256 = "e465d9a2b289dd38ea4f28d01e9519573895df2a40d390702377435ffe4705b2";
        libraryHaskellDepends = [
          aeson base bytestring containers digestive-functors HandsomeSoup
          hspec hspec-core hxt lens mtl snap snap-core text transformers
@@ -73660,7 +73902,7 @@ self: {
      mkDerivation {
        pname = "hspec-test-framework";
        version = "0.1.0";
-       sha256 = "13rlyn4yibajj469hzvw6hmvm3lyra11fl73g49zc3nvcial5ldv";
+       sha256 = "bbd1425564db0ef61379e3501782ca9e8eba2b347c7f980c9152ade889f5348f";
        libraryHaskellDepends = [
          base hspec hspec-contrib hspec-core HUnit QuickCheck
        ];
@@ -73676,7 +73918,7 @@ self: {
      mkDerivation {
        pname = "hspec-test-framework-th";
        version = "0.1.0";
-       sha256 = "1apzvrbyksz5jai0i6x5y8lz1rpi2px5x9rwirhm1flbzvpdypma";
+       sha256 = "aa5edfeefe8bba50618e3ca75efa15f1e6f029f2a59b08a292e5ebe957deffaa";
        libraryHaskellDepends = [
          base hspec-test-framework language-haskell-extract template-haskell
        ];
@@ -73691,7 +73933,7 @@ self: {
      mkDerivation {
        pname = "hspec-test-sandbox";
        version = "0.1.0";
-       sha256 = "1kg7lpm1is5yxwcjhmdayxv8g52d2q215d9f8f8h33qvc7w0a8yp";
+       sha256 = "d72305f8611b8f0191432eb51204164d948776f7aa552819efbee818eaa5e7cd";
        libraryHaskellDepends = [ base hspec hspec-core test-sandbox ];
        testHaskellDepends = [ base hspec test-sandbox ];
        description = "Hspec convenience functions for use with test-sandbox";
@@ -73706,7 +73948,7 @@ self: {
      mkDerivation {
        pname = "hspec-wai";
        version = "0.6.3";
-       sha256 = "0vydfzpfwrld6wi47bk1d27hm5mz8hll3fc0ckzy7dyyzrgfnp4i";
+       sha256 = "915ceb5efedeb7e3ff6480b9412944bf960a8f6861ae4322378d66eeee77cd6f";
        libraryHaskellDepends = [
          base bytestring case-insensitive hspec-core hspec-expectations
          http-types text transformers wai wai-extra
@@ -73727,7 +73969,7 @@ self: {
      mkDerivation {
        pname = "hspec-wai-json";
        version = "0.6.1";
-       sha256 = "0sbw6iddywxdg4n8npnz6m0lmcf9nrq3ib7kckpx7shpq9khwgih";
+       sha256 = "303e0e67c217ead3ef64f3ac3870b6c9b14a4135df5e8b2c79ad73df5a347c69";
        libraryHaskellDepends = [
          aeson aeson-qq base bytestring case-insensitive hspec-wai
          template-haskell
@@ -73746,7 +73988,7 @@ self: {
      mkDerivation {
        pname = "hspec-webdriver";
        version = "1.0.2";
-       sha256 = "1wkdv129arxbfby1214a93sfqbi1kvkgvqpp4z6qzh45q74hhd9c";
+       sha256 = "2c3508c9c185c08fcd27f7e2fde69e212eecf4488a0411fc72ab679544d86df2";
        libraryHaskellDepends = [
          base data-default hashable hspec hspec-core HUnit lifted-base stm
          text transformers unordered-containers webdriver
@@ -73761,7 +74003,7 @@ self: {
      mkDerivation {
        pname = "hspec2";
        version = "0.6.1";
-       sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4";
+       sha256 = "c4d5b728d158b764a04b458db85a55c5896e5c7635f529fa831e6143f2a99b7e";
        revision = "1";
        editedCabalFile = "d41ebaf2f80c6ae149a944cd77e31fce98c0eea45cf47a561c5c25d48e03107f";
        libraryHaskellDepends = [ base hspec hspec-discover ];
@@ -73775,7 +74017,7 @@ self: {
      mkDerivation {
        pname = "hspr-sh";
        version = "0.3";
-       sha256 = "1qnqg2gg93l5dp2nyvvaq7n58gsnljvbafbhfpvys48g5ry2dk7a";
+       sha256 = "eacc267c2e0f11edf7757039b5b6a4563f54ecc16a6f6fc56d858ef49e78d8e2";
        libraryHaskellDepends = [ base old-time ];
        homepage = "http://www.cs.chalmers.se/~d00nibro/hsp/";
        description = "Session handler for HSP";
@@ -73789,7 +74031,7 @@ self: {
      mkDerivation {
        pname = "hspread";
        version = "0.3.3";
-       sha256 = "1z7v5awagmhxyz4cl020s4gk4yxp0i62z3hqm9kwf73b3b69x2kf";
+       sha256 = "6e8a9ecc1a6b1cc767aa188e2f4c04b77b321fd14000cac8f71dd6a7b82afbfc";
        libraryHaskellDepends = [
          base binary bytestring containers extensible-exceptions network
        ];
@@ -73803,7 +74045,7 @@ self: {
      mkDerivation {
        pname = "hspresent";
        version = "0.2.2";
-       sha256 = "0x4f3y8l8vj1498bnw4fxw9nzf7q2y4vjys72j73h50c7hr83j07";
+       sha256 = "07c881323c0c14388e14477bb98917f8b86f13ef8e70bb5022416e44911f8e74";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base bytestring vty ];
@@ -73822,7 +74064,7 @@ self: {
      mkDerivation {
        pname = "hsprocess";
        version = "0.3";
-       sha256 = "1g47g3i8fgknzyf7pp7g1mk2bfn7r7igm0c6j2v9fnahhrpj4a5z";
+       sha256 = "bf28226f86505997b6908681fae2c9c7ba25660defdc7b9cff763e87e27887bc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
@@ -73844,7 +74086,7 @@ self: {
      mkDerivation {
        pname = "hsql";
        version = "1.8.2";
-       sha256 = "0i53n42ynq22fzlz4kpmri4q4abmi4dz8bz0izn307is1pmk4bby";
+       sha256 = "7e2d32eb0d3a1e30ec8fe02ff41b8975298249ccf54ef2e9774260eb05b1a344";
        libraryHaskellDepends = [ base old-time ];
        description = "Database access from Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -73855,7 +74097,7 @@ self: {
      mkDerivation {
        pname = "hsql-mysql";
        version = "1.8.3";
-       sha256 = "0834jr5jrr1m7ap93wvmb5ir0906f7f7xx52x21i1l1jfpan34j9";
+       sha256 = "499261d57532d01083e8a2f47edc71062490635975f391ae3a35e42c4b966420";
        revision = "1";
        editedCabalFile = "e1bbb71ecb6e310acf23a93e4a5e0121c8bd332e7a81dfa5bfe27ae94cbf14ab";
        libraryHaskellDepends = [ base Cabal hsql ];
@@ -73870,7 +74112,7 @@ self: {
      mkDerivation {
        pname = "hsql-odbc";
        version = "1.8.2";
-       sha256 = "0lz9zjy1xgjjbabbi2hcrvsnfid6c78y2cb2703qjwr93xy54f1f";
+       sha256 = "2e38527c1f29738907386231e1d161a64567f5ce0c8ab8965a52be1ebcfce953";
        libraryHaskellDepends = [ base hsql old-time ];
        librarySystemDepends = [ unixODBC ];
        description = "A Haskell Interface to ODBC";
@@ -73882,7 +74124,7 @@ self: {
      mkDerivation {
        pname = "hsql-postgresql";
        version = "1.8.2";
-       sha256 = "0yj0jalpapjvpxmc79yd6bn93ax13pp87dipbg2c9mxf3p38jc9z";
+       sha256 = "3f3189c61daed7c4c45b37b683ee1da1ab91ec32cda7c36abf5b5e75a992407a";
        libraryHaskellDepends = [ base hsql old-time ];
        librarySystemDepends = [ postgresql ];
        description = "A Haskell Interface to PostgreSQL via the PQ library";
@@ -73894,7 +74136,7 @@ self: {
      mkDerivation {
        pname = "hsql-sqlite3";
        version = "1.8.2";
-       sha256 = "15f7f4f4k1afrpmkw2k6lyx1b81hlwvwv660yh0vm2vz269mxycl";
+       sha256 = "94f95e93117f8bba01f4c098cd37a730a015baa7660a3eebcd4e85491c71c795";
        libraryHaskellDepends = [ base hsql ];
        librarySystemDepends = [ sqlite ];
        description = "SQLite3 driver for HSQL";
@@ -73908,7 +74150,7 @@ self: {
      mkDerivation {
        pname = "hsqml";
        version = "0.3.3.0";
-       sha256 = "0m0g822182q45cvl3k7ir1c6g5wzwb1c9137g1c62f3npinb0kmz";
+       sha256 = "bf4eb06cbc76386158786784c4c2e29f976758c8f1cc41372b040b1484400f54";
        libraryHaskellDepends = [
          base containers filepath tagged text transformers
        ];
@@ -73927,8 +74169,8 @@ self: {
     ({ mkDerivation, base, hsqml, qt5, template-haskell, text }:
      mkDerivation {
        pname = "hsqml-datamodel";
-       version = "0.0.0.1";
-       sha256 = "16q92q00q96kyg41xh8smp5vvkvlfrps6nj7ds1y09msdqvihw9v";
+       version = "0.1.0.0";
+       sha256 = "354c225514ae632f5429f45a75975b7b7f6f2a245f7c57cd68567eacb2f2e21f";
        libraryHaskellDepends = [ base hsqml template-haskell text ];
        libraryPkgconfigDepends = [ qt5 ];
        homepage = "https://github.com/marcinmrotek/hsqml-datamodel";
@@ -73944,7 +74186,7 @@ self: {
      mkDerivation {
        pname = "hsqml-datamodel-vinyl";
        version = "0.1.0.0";
-       sha256 = "0jg3jl1h4jf92vazyf7wb88dhrl89zm9hh21hymzy3pnc5kssd91";
+       sha256 = "2135ad6761f60effab87414098ea4f8866d8105afc38ffd516c949020395e349";
        libraryHaskellDepends = [
          base exceptions hsqml-datamodel type-list vinyl
        ];
@@ -73960,7 +74202,7 @@ self: {
      mkDerivation {
        pname = "hsqml-demo-morris";
        version = "0.3.1.0";
-       sha256 = "0zkjcll4hgsv1ji4rd48fx95hn90vl9vvdzxbirqfaf40xai58md";
+       sha256 = "ada2125507c42987735cfdb7bd13dd205958527788b44ca20c5b3f482865727e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -73980,7 +74222,7 @@ self: {
      mkDerivation {
        pname = "hsqml-demo-notes";
        version = "0.3.3.0";
-       sha256 = "0gjlsqlspchav6lvc4ld15192x70j8cyzw903dgla7g9sj8fg813";
+       sha256 = "23a0e790d4e91d455f1b20f1ef1992e0749142098d12b6a9d90ab2ab29d6543e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -73996,7 +74238,7 @@ self: {
      mkDerivation {
        pname = "hsqml-demo-samples";
        version = "0.3.3.0";
-       sha256 = "072k2vc6wk8r2zn2isp37p9xhi8dbg15sy5hmpj868lzbq3mzyac";
+       sha256 = "4cf95f075e9f2283e4adb0785dc25b0d45d8d33de3ea28ec17194d6ed816531c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
@@ -74014,7 +74256,7 @@ self: {
      mkDerivation {
        pname = "hsqml-morris";
        version = "0.2.0.0";
-       sha256 = "1qisi1r8lljgkwc9v5p3nqq6b78vdn9wyydsp31dxqnbd1lyg5ax";
+       sha256 = "5d95e76968cbe2dec2b8ba79cf936d1b9d6530b6e3969d189f4f528a72883ae2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74035,7 +74277,7 @@ self: {
      mkDerivation {
        pname = "hsreadability";
        version = "1.0.0.0";
-       sha256 = "0q4sqx7xjsa8jplrdzirdlh6170ckqags02idjknwpc48plarnaw";
+       sha256 = "5cd9ace845845d6ea76c5100fd149e0c9c60206d39fe96e9954869d94fc79a60";
        revision = "1";
        editedCabalFile = "e0b87a28497a4730024ce1459c7812d519027e8b90aa863dac85dd251558fa23";
        libraryHaskellDepends = [
@@ -74057,7 +74299,7 @@ self: {
      mkDerivation {
        pname = "hsshellscript";
        version = "3.3.3";
-       sha256 = "0g8qm1nx2dzsmkn2rp1vwqgvgqpxgjambnmq81qyky66d83mgbz1";
+       sha256 = "e1af57076ac6f8e97140b8da55957cfde2b71fe63bdc2cecacfa37d16da8183d";
        libraryHaskellDepends = [ base directory parsec random unix ];
        libraryToolDepends = [ c2hs ];
        homepage = "http://www.volker-wysk.de/hsshellscript/";
@@ -74070,7 +74312,7 @@ self: {
      mkDerivation {
        pname = "hssourceinfo";
        version = "0.0.2";
-       sha256 = "07g1wsm4131ymp4ym33fx8yfs0bsqn9as65lkyg21ajc0dz2j1qa";
+       sha256 = "0a07297e034caa209e9fb418ad92c57a01ed3cea6e8ceac9ad3e8c40aae6e11d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74088,7 +74330,7 @@ self: {
      mkDerivation {
        pname = "hssqlppp";
        version = "0.4.2";
-       sha256 = "083mczqb5ca52ly88xhmd8244q8j1iyf0kkxmgp4w13w6sa5lwzl";
+       sha256 = "f4735a94367c044eeeab7d4ee07c0c126142046a1576843c1545b1b2f0677520";
        libraryHaskellDepends = [
          base containers mtl parsec pretty syb template-haskell transformers
          uniplate
@@ -74110,7 +74352,7 @@ self: {
      mkDerivation {
        pname = "hstatistics";
        version = "0.2.5.2";
-       sha256 = "08bkffx3d87c3cb3zp0gdj10cw1cb2m55lbqkh6b6lvxjy26igvp";
+       sha256 = "77bf6884977d53b30c9c78d152aa582c7006826c0fdc3f161beca036ba737321";
        libraryHaskellDepends = [
          array base hmatrix hmatrix-gsl-stats random vector
        ];
@@ -74125,7 +74367,7 @@ self: {
      mkDerivation {
        pname = "hstats";
        version = "0.3";
-       sha256 = "04v03gha4p0i9ymjladmzpw8mwk72s60aihk50k2ixqja976y9hj";
+       sha256 = "12266f4e5212f72826281346058c1667f28af8fdb5292aab4f115ca2e01b6013";
        libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://github.com/unmarshal/hstats/";
        description = "Statistical Computing in Haskell";
@@ -74138,7 +74380,7 @@ self: {
      mkDerivation {
        pname = "hstatsd";
        version = "0.1";
-       sha256 = "092q52yyb1xdji1y72bdcgvp8by2w1z9j717sl1gmh2p89cpjrs4";
+       sha256 = "446779594257c0fa02d5271c997ee0c22f74f7636d89e34394ad87e5bd285824";
        libraryHaskellDepends = [ base bytestring mtl network text ];
        homepage = "https://github.com/mokus0/hstatsd";
        description = "Quick and dirty statsd interface";
@@ -74152,7 +74394,7 @@ self: {
      mkDerivation {
        pname = "hstest";
        version = "0.0.1";
-       sha256 = "0afvl5b82alnbdj0l26scg1qy7rln94qk9an252p83zlg5nd16gd";
+       sha256 = "ed99d06c79f40f74451156a58949b2341f8fc363da080a645b962a8156a1db29";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74170,7 +74412,7 @@ self: {
      mkDerivation {
        pname = "hstidy";
        version = "0.2";
-       sha256 = "1hjsdxl0vn42n5kfiq42yvrr3j31sjy9g7iwjlnj2x72jff79vxs";
+       sha256 = "baef749c93e274212d953c9e97bcd461c891f3f682e0e866b182d80d686f5ac2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell-src-exts ];
@@ -74189,7 +74431,7 @@ self: {
      mkDerivation {
        pname = "hstorchat";
        version = "0.1.1.0";
-       sha256 = "1d87s6f6qgq7sbqzdgidnn3gxz9panhdk2mfhd7263hb9mrq1k3c";
+       sha256 = "6ccc80734d0b0e234e83ae8ad9a05537fdfe86b52dbef6f1d2073f6c9cd107b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74218,7 +74460,7 @@ self: {
      mkDerivation {
        pname = "hstradeking";
        version = "0.1.0";
-       sha256 = "10wyvfha6vngrj8h8i9dx1skyz3c4g1pcx13cafix5cpim6dr64w";
+       sha256 = "9c98dc4c8d97951e9d62237476c3236c7c3f75e82d450491cccf6ea3a0db9e83";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74242,7 +74484,7 @@ self: {
      mkDerivation {
        pname = "hstyle";
        version = "0.2.0.3";
-       sha256 = "1a63i54zd9ls1lii4p2qzpds3q8xbcl8w8b6m53ix3n6ikpa4n35";
+       sha256 = "6558a2ee8cc68e1e47a966218e285b1de1a1dbfd585c12230d9aa6f64989c3a8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74261,7 +74503,7 @@ self: {
      mkDerivation {
        pname = "hstzaar";
        version = "0.9.3";
-       sha256 = "1hjf5n7m5d9bnj1rwnsf2pvs6vcfvv2hf53a6pbyb63c4rgqzk2m";
+       sha256 = "55cc8f5f266c98e5d7356a1407c5de8e6da3f7154e5b9e83b42bb5528f2d4ec2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74284,7 +74526,7 @@ self: {
      mkDerivation {
        pname = "hsubconvert";
        version = "0.0.2";
-       sha256 = "1sl7dxqi47x937wivdlx5yg6a4niczcz22xs3flvgsrxbx1ahy9w";
+       sha256 = "3c79a8425f3debb7a91bba0bf1d967d112659e2f9db61df919a91f12716f87ea";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74305,7 +74547,7 @@ self: {
      mkDerivation {
        pname = "hsverilog";
        version = "0.1.0";
-       sha256 = "1qk34zl1894ra9w0w2gzg8ivz230ymgyjghsd2cwn00fcsyafa7a";
+       sha256 = "ea28a7bc660e00cb99681a3ee95ff56088bf237aff090e7852992414e82763e2";
        libraryHaskellDepends = [
          base containers shakespeare text transformers
        ];
@@ -74322,7 +74564,7 @@ self: {
      mkDerivation {
        pname = "hswip";
        version = "0.3";
-       sha256 = "11nlpnfjnypz76m2padkz7ppjdir1vz3bp65s9wzphvnsmp3a681";
+       sha256 = "0119356ed576c3fb79d2c5dc35fe0e393679eff9b3a92baa39ff7a2b9dbdd486";
        libraryHaskellDepends = [ base haskell98 mtl ];
        librarySystemDepends = [ ncurses readline swipl ];
        description = "embedding prolog in haskell";
@@ -74336,7 +74578,7 @@ self: {
      mkDerivation {
        pname = "hsx";
        version = "0.10.5";
-       sha256 = "046428y16h6za41lwqkp5pnqfd74zw8jiz8xw7j7sq0rhylg134v";
+       sha256 = "9b8cf0a88719607de4e11dfd2811ffe43487ed2d77624e0351df40133c12c410";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ];
@@ -74354,7 +74596,7 @@ self: {
      mkDerivation {
        pname = "hsx-jmacro";
        version = "7.3.6";
-       sha256 = "1fr60b57z2ri2pfs890xvrzrh4n75p2j4nmb7b819cf4rhgshgnh";
+       sha256 = "d03ea81fccc4b114d03aab5a22c52dc712987fde1d24a4dd15318b7fca0226bb";
        libraryHaskellDepends = [
          base happstack-hsp hsp jmacro mtl text wl-pprint-text
        ];
@@ -74369,7 +74611,7 @@ self: {
      mkDerivation {
        pname = "hsx-xhtml";
        version = "0.4.4";
-       sha256 = "1051fh4yjnsax60v4rfh5r87n660ygq033gmg710nm3gw57ihkl2";
+       sha256 = "824e184fe16f540bc279f58d01f0f3c0187b502ed065b281e94a5be90974a180";
        libraryHaskellDepends = [ base hsx mtl ];
        homepage = "http://code.google.com/hsp";
        description = "XHTML utilities to use together with HSX";
@@ -74384,7 +74626,7 @@ self: {
      mkDerivation {
        pname = "hsx2hs";
        version = "0.13.3.2";
-       sha256 = "1vpq6a1379h7lmxcmwdb0r81gda2zn4lv02xslrixszsb757l1ck";
+       sha256 = "93057aca59faeb1e33d55d804d89fd42b5175006abf1ca7aa507a6338232f8ee";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74401,7 +74643,7 @@ self: {
      mkDerivation {
        pname = "hsyscall";
        version = "0.4";
-       sha256 = "0ysi317vwgksaq78k31sb8s34rjjhl4w8ncvycfsmmdnv7cdg2ld";
+       sha256 = "8d8ad7d8d9b6d5aa1df39b59c40985526632345a3a8c890e567a3ebe4f18517b";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aycanirican/hsyscall";
        description = "FFI to syscalls";
@@ -74414,7 +74656,7 @@ self: {
      mkDerivation {
        pname = "hsyslog";
        version = "2.0";
-       sha256 = "02v698grn43bvikqhqiz9ys8x2amngdmhvl3i0ar9203p2x8q3pq";
+       sha256 = "f80e8cbab80388941588836e58dbb355898eb44f3f628867dc6b109b1f4a660b";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/peti/hsyslog";
@@ -74427,7 +74669,7 @@ self: {
      mkDerivation {
        pname = "hszephyr";
        version = "0.1";
-       sha256 = "0lgzricdq2vijmsqrwg93amxslmdwzj17c4ppmws3pcb54xj2fsr";
+       sha256 = "593b213b298bdda179bd97b013e4e7ad52ddab1ae9f18c7595710bdc58ccff51";
        libraryHaskellDepends = [ base bytestring mtl time ];
        librarySystemDepends = [ com_err zephyr ];
        description = "Simple libzephyr bindings";
@@ -74440,7 +74682,7 @@ self: {
      mkDerivation {
        pname = "htags";
        version = "1.0.1";
-       sha256 = "064ddzligzqimdhprgpgl1j0gf4xv53anaisx3fc88as104q8zjk";
+       sha256 = "537e8409085a21c4dce83a2aab46d99db80764a0efbe7c61ab11ff17e96f8d18";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74457,7 +74699,7 @@ self: {
      mkDerivation {
        pname = "htar";
        version = "0.4.0.2";
-       sha256 = "15m57vq0hcfk2dqamh2c624icv3smcqjgswy58glcclxz7f8ly3z";
+       sha256 = "7f788adcf99d32461f2a9eeb2731ab7a6c1689304cc0aa7013d33108f03ea596";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74474,7 +74716,7 @@ self: {
      mkDerivation {
        pname = "htiled";
        version = "0.1.2.0";
-       sha256 = "1g0fak4iwjii5zvn79hcdydrp4vs5c0nwwbf7v2m2gajw1r34fg9";
+       sha256 = "e9393272e0523d51c53e6e716e012b7a939b9b6f0ca663f72f314a1ec9540ebc";
        libraryHaskellDepends = [
          base base64-bytestring bytestring containers filepath hxt split
          zlib
@@ -74489,7 +74731,7 @@ self: {
      mkDerivation {
        pname = "htime";
        version = "0.3.1";
-       sha256 = "14y7ipbc6ic1qraxnrs4k0hrqh5c8ks1fsm8af6wm9x762bcfaxr";
+       sha256 = "b92bc79630a7a7ca8d53a86a17f444ac409c21984467db55c68145c3d68dc793";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process time ];
@@ -74502,7 +74744,7 @@ self: {
      mkDerivation {
        pname = "html";
        version = "1.0.1.2";
-       sha256 = "0q9hmfii62kc82ijlg238fxrzxhsivn42x5wd6ffcr9xldg4jd8c";
+       sha256 = "0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061";
        libraryHaskellDepends = [ base ];
        description = "HTML combinator library";
        license = stdenv.lib.licenses.bsd3;
@@ -74516,7 +74758,7 @@ self: {
      mkDerivation {
        pname = "html-conduit";
        version = "1.2.0";
-       sha256 = "0jj02s71a9fk9mrk7bqms93y1m2zz96jg4rd7jn486ln1w49c43m";
+       sha256 = "751096080f961a44ac3c2d93274dfa5fd4e047d215af33734dd325158e16404a";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra containers resourcet
          tagstream-conduit text transformers xml-conduit xml-types
@@ -74536,7 +74778,7 @@ self: {
      mkDerivation {
        pname = "html-email-validate";
        version = "0.2.0.0";
-       sha256 = "1bvdmaamxbldb8nndi5f330msj1d0mrj8lapvxqyr333bg3kwaix";
+       sha256 = "3d2a3ec75b638cec71df57512473052d485dc118aec4662d5a8dae5e95aa6daf";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [
          attoparsec base hspec QuickCheck regex-pcre-builtin text
@@ -74552,7 +74794,7 @@ self: {
      mkDerivation {
        pname = "html-entities";
        version = "1.1.0.0";
-       sha256 = "0zm0s5y875wp5mb3hrprrzfv5h7cs4zzxqv0y1dmrs3nk9yrah8n";
+       sha256 = "1641957d9a76e85c5bf060e3fe3fd1ecc0b2ddcff96638562d9797837cd1a07e";
        libraryHaskellDepends = [
          attoparsec base-prelude text unordered-containers
        ];
@@ -74571,7 +74813,7 @@ self: {
      mkDerivation {
        pname = "html-kure";
        version = "0.2.1";
-       sha256 = "1x72f3r6nayv03y0a7x5dyj2lnbli14nmqi5i7i8isqbngsvca0l";
+       sha256 = "1428b6f5b30beb88e28925e26a498874592aa46fa51f05fc00db2b6bf270e2f4";
        libraryHaskellDepends = [ base hxt kure ];
        homepage = "www.ittc.ku.edu/csdl/fpg/software/html-kure";
        description = "HTML rewrite engine, using KURE";
@@ -74583,7 +74825,7 @@ self: {
      mkDerivation {
        pname = "html-minimalist";
        version = "0.15";
-       sha256 = "06qhjb8c1x9wab77g493bbqqm068alkc4vn7c6dj810gdgxwgw5j";
+       sha256 = "b2f0c7fb6b0f04249b61c76ec22655c8808af15a239177ce523cf5c0d092101b";
        libraryHaskellDepends = [ base xml ];
        homepage = "http://rd.slavepianos.org/t/html-minimalist";
        description = "Minimalist haskell html library";
@@ -74595,7 +74837,7 @@ self: {
      mkDerivation {
        pname = "html-rules";
        version = "0.1.0.1";
-       sha256 = "1k0jqx1mlcar6z8ggrz3fv1nzilkwdxvg3gvsb3pg7nvbkhz5lpw";
+       sha256 = "fcd2f2e15cdb9e77c7d2fb8db77be393c66fc376e3e7f7d03759315a43c712cc";
        libraryHaskellDepends = [ base lens mtl tagsoup transformers ];
        jailbreak = true;
        homepage = "http://github.com/kylcarte/html-rules/";
@@ -74611,7 +74853,7 @@ self: {
      mkDerivation {
        pname = "html-tokenizer";
        version = "0.4.0.0";
-       sha256 = "0a44jxw90hk1i3h8j1vk8rjz3z91z9gdszyjbkngnpnfwrdhfrw7";
+       sha256 = "8767075be6ce5efbec5cd27fdd5efa21fdf16546730789e08861429078978428";
        libraryHaskellDepends = [
          attoparsec base-prelude case-insensitive conversion
          conversion-case-insensitive conversion-text text
@@ -74629,7 +74871,7 @@ self: {
      mkDerivation {
        pname = "html-truncate";
        version = "0.3.0.0";
-       sha256 = "1d66kdg81774b8isw1mfkl54sgmaz0n04n6shd5jjz18sjwyxp14";
+       sha256 = "24dceeb9d4287c294b83da58022cf8aa3e4d0a9dae06ae235ae49c805e9bc6b4";
        libraryHaskellDepends = [ base tagsoup ];
        homepage = "https://github.com/mruegenberg/html-truncate";
        description = "A HTML truncator";
@@ -74644,7 +74886,7 @@ self: {
      mkDerivation {
        pname = "html2hamlet";
        version = "0.3.0";
-       sha256 = "1n49dz59nlkvb4ax1h9cfq7nqcwlxcrm372x4373ig6xdzbckdmz";
+       sha256 = "bfb6c9d66fddbc38ce205d9c5133eb94336c0f762cc1d015597b529bca6f89d8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74661,7 +74903,7 @@ self: {
      mkDerivation {
        pname = "html5-entity";
        version = "0.2.0.3";
-       sha256 = "0bmmzshxanzw5y2y0hvgzz9yw18jqgv535i1xq2a5lf7w8wpj1if";
+       sha256 = "2e067939e2c7d1a204ee219651f6c31205eed3ff6f43e0852ffc5bd5a1feb52e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers text ];
@@ -74675,7 +74917,7 @@ self: {
      mkDerivation {
        pname = "htodo";
        version = "0.0.4";
-       sha256 = "0av34wypj47h4aifwqjjdwihb5b5jly5hcr32jq64ld94b7r4l2m";
+       sha256 = "555092cf22a95162b0142333583c95659505236f5262eea222f010793d27632b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base HDBC HDBC-sqlite3 ];
@@ -74692,7 +74934,7 @@ self: {
      mkDerivation {
        pname = "htoml";
        version = "0.1.0.2";
-       sha256 = "0gv57isivg65wd05yxcyi2wv4ck2f153pkk2vblp6q1xh7d81asm";
+       sha256 = "55ab80da813d6073e9da62ce3b4a706232b2b9889e755f40e3c5bc1d753c653f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74718,7 +74960,7 @@ self: {
      mkDerivation {
        pname = "htrace";
        version = "0.1";
-       sha256 = "0ar1w9p6ppag2vp8kw6byirhfdfs4r639pjh5icnyiiliz6jkvlx";
+       sha256 = "9dee29cd8f34466f592c50de344c26da350773f4cbf089ee164fdd6b6ee2212b";
        libraryHaskellDepends = [ base ];
        description = "Hierarchical tracing for debugging of lazy evaluation";
        license = stdenv.lib.licenses.bsd3;
@@ -74729,7 +74971,7 @@ self: {
      mkDerivation {
        pname = "hts";
        version = "0.15";
-       sha256 = "0l09skjsds4p9kdwrwrxg8hdd1ja7m2zmggf23dfimzm1jsij6y2";
+       sha256 = "c21b19b50cf5d7e8da10eebdfa453d4a86d6207a3df3ccdb4c97e8a6e5d40950";
        libraryHaskellDepends = [ base hmt xml ];
        homepage = "http://rd.slavepianos.org/t/hts";
        description = "Haskell Music Typesetting";
@@ -74744,7 +74986,7 @@ self: {
      mkDerivation {
        pname = "htsn";
        version = "0.1.1";
-       sha256 = "123h3x22652xfnc1szvclnhfnr5wb5ndx8ahyvramvgjr1mmxpp5";
+       sha256 = "e5de5e6bc8f2edaaf2f650a1de6c59bc64eba0a56c7f1d98755d1423441f7088";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74764,7 +75006,7 @@ self: {
      mkDerivation {
        pname = "htsn-common";
        version = "0.0.2";
-       sha256 = "0ywp0683mna16znsqn6h6k5iihpzhj909hivgmlvfzkrn6plvc15";
+       sha256 = "25b04dafb1797eb7697d3bc2049284ffc218cb34d058aced3741d93a9001977b";
        libraryHaskellDepends = [
          ansi-terminal base hslogger transformers
        ];
@@ -74782,7 +75024,7 @@ self: {
      mkDerivation {
        pname = "htsn-import";
        version = "0.2.4";
-       sha256 = "1mm098a748dmwzzak0ciam7dq80l3iv4hvk8c1crr03dbybr8rq3";
+       sha256 = "036794975f6d809c5960686e48761c1420dc4e559181a9fee7b52172144aa0d6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74807,7 +75049,7 @@ self: {
      mkDerivation {
        pname = "http-accept";
        version = "0.2";
-       sha256 = "1ivwkwr9jgbf6m2dv4gaw5vxrz2vm5wzz65ncl5jpma6wimwh4ii";
+       sha256 = "3112c86be446d52b0b65b698ff79a95bfcdc77e1ea91dd44356e3d99329f7cc7";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/singpolyma/http-accept";
        description = "Functions for working with HTTP Accept headers";
@@ -74819,7 +75061,7 @@ self: {
      mkDerivation {
        pname = "http-attoparsec";
        version = "0.1.1";
-       sha256 = "12l892fix11mrvm10awwvv31y59q5rb6gb0sqjp6l4p4ym9ngqa3";
+       sha256 = "43e16753f5e4126aaec41aac67562e38151fc6de9c2b10eace35841e9d48888a";
        libraryHaskellDepends = [ attoparsec base bytestring http-types ];
        jailbreak = true;
        homepage = "https://github.com/tlaitinen/http-attoparsec";
@@ -74837,8 +75079,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.18.1";
-       sha256 = "0v0mmsbh8hgzkxyg7gkn3dlq5l21ljzbxr9c3wmmz6viwhhabfv9";
+       version = "0.4.19";
+       sha256 = "5e5db3a8dfb309c8dc99ba154e0176013f7c50547b60b758725a5f5927b5e3f8";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -74864,7 +75106,7 @@ self: {
      mkDerivation {
        pname = "http-client-auth";
        version = "0.1.0.1";
-       sha256 = "07scawz138qffcgw5lyxbxmwdm0czhylqy1rzm0ff59n8amr46j4";
+       sha256 = "441a92ab423615e740fd39784c3dfc0cd4c66b5fddd3c21f730ea3113e574c1f";
        libraryHaskellDepends = [
          base base64-string blaze-builder bytestring case-insensitive
          conduit crypto-conduit http-client http-conduit pureMD5 resourcet
@@ -74879,7 +75121,7 @@ self: {
      mkDerivation {
        pname = "http-client-conduit";
        version = "0.3.0";
-       sha256 = "0k2vq9y7kfbkhcsszjr74ahq5nw5z7dbzjhw1ixbigcr56axsd19";
+       sha256 = "2934dd952999bdb87a0c1ccabfdaf985db82a12227cbaf358373b9797cc25b4c";
        libraryHaskellDepends = [ base http-client ];
        homepage = "https://github.com/snoyberg/http-client";
        description = "Frontend support for using http-client with conduit (deprecated)";
@@ -74893,7 +75135,7 @@ self: {
      mkDerivation {
        pname = "http-client-lens";
        version = "0.1.0";
-       sha256 = "1n5q3wprhp8kwwq2n1v06l1a9k9p3z96rxv3kr6bbwga9lsb3jip";
+       sha256 = "37cab1344deaf1b54c9e63f76cd21f37cda4023560072b30e7135d982f1fb8d8";
        libraryHaskellDepends = [
          base bytestring http-client http-types lens network
        ];
@@ -74908,7 +75150,7 @@ self: {
      mkDerivation {
        pname = "http-client-multipart";
        version = "0.3.0.0";
-       sha256 = "18za6s3658hgm95rrygghrz0b643c7nkzaimb14v2hv82w3k9crg";
+       sha256 = "2fb33407176843b1495835aa3fed618398057e86eff99c4baa0fa2628636eaa3";
        libraryHaskellDepends = [ base http-client ];
        homepage = "https://github.com/snoyberg/http-client";
        description = "Generate multipart uploads for http-client. (deprecated)";
@@ -74922,7 +75164,7 @@ self: {
      mkDerivation {
        pname = "http-client-openssl";
        version = "0.2.0.1";
-       sha256 = "1mg2gn51ixb68wd8mm66kcj4627q6gj64810wsa1axy3jmk5qym3";
+       sha256 = "a37a5c6695c3771594e6202062e433f80843249bc6d48a1a4766f5188a7de2d5";
        libraryHaskellDepends = [ base HsOpenSSL http-client network ];
        testHaskellDepends = [
          base HsOpenSSL hspec http-client http-types
@@ -74939,7 +75181,7 @@ self: {
      mkDerivation {
        pname = "http-client-request-modifiers";
        version = "0.1";
-       sha256 = "1bd6r24gh0nxfj040q3x39nqnpkdqkri1wdlg3jf2h61cb5gli5r";
+       sha256 = "b944faca62c140e1e478b4f110f3c46d5e8b6d1a7d60408074dd02f888c8a6ad";
        libraryHaskellDepends = [
          base bytestring exceptions http-client http-media http-types
          network network-uri
@@ -74958,7 +75200,7 @@ self: {
      mkDerivation {
        pname = "http-client-streams";
        version = "0.3.1.0";
-       sha256 = "1q9w0l89a599l4955kb3156ysmlg7il9pz0x7kfl3bxly4gadf8z";
+       sha256 = "1fb9a61ef1b4af41dd3c1dfc9b683c8f56ed4d0963cd5212a129159510053ce1";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL http-client http-client-openssl
          io-streams mtl transformers
@@ -74975,7 +75217,7 @@ self: {
      mkDerivation {
        pname = "http-client-tls";
        version = "0.2.2";
-       sha256 = "0a01r05h5fxswyn6k6cgqgak4scqjan72hyy5wbdqzzhl4rmh7j5";
+       sha256 = "451e5833a1f07fdc162fde4371ac92986932d5c38f9969ace7babb020bc80128";
        libraryHaskellDepends = [
          base bytestring connection data-default-class http-client network
          tls
@@ -74994,7 +75236,7 @@ self: {
      mkDerivation {
        pname = "http-common";
        version = "0.8.2.0";
-       sha256 = "14s5a178sb2vm5k00rs21760mds5dz2gs10k9iyn22h01mxyf599";
+       sha256 = "2915e77b0d000a617d4c1304fdc46f45b70acc0942670066a95b2c8d4e504593";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring case-insensitive
          directory mtl network text transformers unordered-containers
@@ -75014,8 +75256,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit";
-       version = "2.1.7.2";
-       sha256 = "0inw95a2vdmsffh3ns1kh8hr7xrx2pbgdrq0yv68bwf1v4sd1mfc";
+       version = "2.1.8";
+       sha256 = "550d86ea9ee6dd90994a460c5c85ddc861fb5c0f007304dc4a2e2035f980ea3d";
        libraryHaskellDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -75041,7 +75283,7 @@ self: {
      mkDerivation {
        pname = "http-conduit-browser";
        version = "2.0.0.0";
-       sha256 = "1swgsb14mwsfrwhw2ggydi2wm24hrqlisslh5q46qll7rl2gx19q";
+       sha256 = "3885fe04cd87526c082e906a1d29ce9088ca456cfe3dc121cf4ef34ac2d28feb";
        libraryHaskellDepends = [
          base bytestring conduit containers cookie data-default exceptions
          http-client http-conduit http-types lifted-base monad-control
@@ -75069,7 +75311,7 @@ self: {
      mkDerivation {
        pname = "http-conduit-downloader";
        version = "1.0.25";
-       sha256 = "0g393cmkbpb40in03zlyahxxwiy5i7zj7wg5zb92a0hkmjkgbrka";
+       sha256 = "6ae6f5a6ac130225d2fae5f123ff89c547de3b549efe016c0464dd352b1b693c";
        libraryHaskellDepends = [
          base bytestring conduit connection data-default HsOpenSSL
          http-client http-conduit http-types lifted-base mtl network
@@ -75088,7 +75330,7 @@ self: {
      mkDerivation {
        pname = "http-date";
        version = "0.0.6.1";
-       sha256 = "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj";
+       sha256 = "f2e106603e2b3f710f1189e478f6c20067d9a9d21a20a633fe362b3f91807636";
        libraryHaskellDepends = [ array attoparsec base bytestring ];
        testHaskellDepends = [
          base bytestring doctest hspec old-locale time
@@ -75104,7 +75346,7 @@ self: {
      mkDerivation {
        pname = "http-encodings";
        version = "0.9.3";
-       sha256 = "0b29zqa2ybja73jip83qn1xhiinn1k64b6dmc39ccp48ip1xdnvn";
+       sha256 = "76dbd6c38d885cc6d260b59945cc0cd6c6087bb078a01be5384a2e2f14fe492c";
        revision = "2";
        editedCabalFile = "0370852e7250c2c2bb1575155286442cbfcdd03a7e494dcaa73305d4e84a6c76";
        libraryHaskellDepends = [
@@ -75126,7 +75368,7 @@ self: {
      mkDerivation {
        pname = "http-enumerator";
        version = "0.7.3.3";
-       sha256 = "10w2ppgb4kjl3h77iq7j9qh3gcl6a0fvbpidi2njd4pfhrq4lgs6";
+       sha256 = "463f4a7086ee9226ad882ddeb51d5086b237204ef2e0780e1c544eb2debd8283";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -75150,7 +75392,7 @@ self: {
      mkDerivation {
        pname = "http-kit";
        version = "0.5.1";
-       sha256 = "1swnvsbaabk946pys9q9kr0bgdvalnznd59dw981sg7cywqdcz28";
+       sha256 = "487cd630f7ec3c1d50e22d9566bfa56ab7b7409e0927edaf21692ea596de96eb";
        libraryHaskellDepends = [
          base bytestring case-insensitive http-types
        ];
@@ -75168,7 +75410,7 @@ self: {
      mkDerivation {
        pname = "http-link-header";
        version = "0.2.0";
-       sha256 = "0vdmb0w7ppss8lffdghn9d2vjawn6nvhx7cx1dcvl4fllxfiaihc";
+       sha256 = "0c46155da7d411ba590b9d9d0eb735962bb9454b16bee61c455adf7b3858b56d";
        libraryHaskellDepends = [
          attoparsec base bytestring-conversion errors network-uri text
        ];
@@ -75187,7 +75429,7 @@ self: {
      mkDerivation {
        pname = "http-listen";
        version = "0.1.0.0";
-       sha256 = "1ccm4lzlngcw7hp4rvk2d85zg5725pj01mzavl3zx140i6w0psz0";
+       sha256 = "e0eb0bb8898084fe07ddead700e42de294f70b6a62ee4c2e3c9c3d4b3f2595b1";
        revision = "1";
        editedCabalFile = "3fcb0a5c155c41513cf81c4cd5058be331d56aed083a3f42892feef452a0cd8b";
        libraryHaskellDepends = [
@@ -75205,7 +75447,7 @@ self: {
      mkDerivation {
        pname = "http-media";
        version = "0.6.2";
-       sha256 = "0r3xghxhnwpc8gblcj6l5sq3lxzra7280vlph1s4xfqxknv69km7";
+       sha256 = "a7ce64b69d1dbb4e7480976e80c451f9773ab02ed44846d743ec720b3b7c7d64";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers
        ];
@@ -75225,7 +75467,7 @@ self: {
      mkDerivation {
        pname = "http-monad";
        version = "0.1.1";
-       sha256 = "127fy54km9js02kp5ws9pyg2d1qc2ar1342g1w2p3h8086il6mp7";
+       sha256 = "e75643a34100c171050f4f9011b2120c87269ebf49f372a7005aa63a49f1ee88";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -75247,7 +75489,7 @@ self: {
      mkDerivation {
        pname = "http-proxy";
        version = "0.0.12";
-       sha256 = "0k6qmr3xrky1w90if2jvzc9bgifxifxkwbymw8zndgxs976zpdig";
+       sha256 = "2fb6fbcd49babf663fe2d52f3ebb8bddc5b712fb5b0a1741e2c1cfdc47aed84c";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder blaze-builder-conduit
          bytestring bytestring-lexing case-insensitive conduit ghc-prim
@@ -75268,7 +75510,7 @@ self: {
      mkDerivation {
        pname = "http-querystring";
        version = "1.0";
-       sha256 = "0n21x8w9pggyp5lbgww70g7860k6n35csq669s9gvrmv1n22k7m6";
+       sha256 = "a69e29840dbbe6fd924ec660cdcab0660283ce0387f3b768b9febd9b38ea4158";
        libraryHaskellDepends = [ base bytestring containers http-types ];
        testHaskellDepends = [
          base bytestring containers doctest hspec http-types QuickCheck
@@ -75288,7 +75530,7 @@ self: {
      mkDerivation {
        pname = "http-reverse-proxy";
        version = "0.4.2";
-       sha256 = "10cd6h1n1fp55jpwcp4nnk64yslxy2cnm7rhzd25xvi5fkhfl61i";
+       sha256 = "3118eae07425ee5e44fb309f6a99f09d6a4fccb4965cc6af2ce5ba6003348d81";
        revision = "1";
        editedCabalFile = "3b7a6c0b55cd7eb98d3f020ac08cec7ca052b8ec716f76cfabdcbaef27645db7";
        libraryHaskellDepends = [
@@ -75314,7 +75556,7 @@ self: {
      mkDerivation {
        pname = "http-server";
        version = "1.0.6";
-       sha256 = "1da385swv7x92d8cpdz28bdp38a8h058svbbpnkqpvrs0m0lgm2w";
+       sha256 = "5cd44741053aef8ba7bd6b6d8d0a8048a171db42e2b7cb5013a99fcd754143b5";
        libraryHaskellDepends = [
          base HTTP mime network network-uri text unix url utf8-string
        ];
@@ -75328,7 +75570,7 @@ self: {
      mkDerivation {
        pname = "http-shed";
        version = "0.1";
-       sha256 = "0asb499rkxr3jzyv5abiqcjx7jdsxkqndcaiqrlx7sfb6f3rccdv";
+       sha256 = "bb31968733cbe9d369c651b166f1ecbac9d325c371a9b2fd9723f79953224b2b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base network ];
@@ -75349,7 +75591,7 @@ self: {
      mkDerivation {
        pname = "http-streams";
        version = "0.8.3.3";
-       sha256 = "0cp2jdalg0vzikl6v4yhyflllv7yqskph5gp5ahirawhcj9rfi9z";
+       sha256 = "3f4597936490ab1ca12af71578a7c6fe6c4aa9f3d0936de88c7f83475593e232";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          case-insensitive directory HsOpenSSL http-common io-streams mtl
@@ -75376,7 +75618,7 @@ self: {
      mkDerivation {
        pname = "http-test";
        version = "0.2.4";
-       sha256 = "06y7nikmyr9jrcrnsqy63p1zv1nv0z1h1bmbryr4dkh5pisfmr83";
+       sha256 = "03e5ea74bc05ce46b2cfabae00c307db86fdc31dc6636d33cb32655f67b4c71b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -75398,7 +75640,7 @@ self: {
      mkDerivation {
        pname = "http-types";
        version = "0.8.6";
-       sha256 = "1q1ni88rs8d79xnk1x2jaf3848ygxlfhpvv4gw46k08lw29ihfxh";
+       sha256 = "b03b1893e0148169087f64ef0b1dedcf2382865352f4306d4fa7219d118a36e0";
        libraryHaskellDepends = [
          array base blaze-builder bytestring case-insensitive text
        ];
@@ -75416,7 +75658,7 @@ self: {
      mkDerivation {
        pname = "http-wget";
        version = "0.6.2.3";
-       sha256 = "1sbg4gpx8ikaxb15wflm7fnjnkr32fj07bva62z54dsm630s37fx";
+       sha256 = "dd9da1c130553752be306aaf03a413234f2bad3b953a5ec2ea6a46d4ef236fe9";
        libraryHaskellDepends = [ base failure process transformers ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/http-wget/tree/master";
@@ -75432,8 +75674,8 @@ self: {
      }:
      mkDerivation {
        pname = "http2";
-       version = "1.0.3";
-       sha256 = "075j4xhfmgiij431zn5mzmq6m40fj74l5f5wckqa22aq2ay19p8c";
+       version = "1.0.4";
+       sha256 = "727fc0d39a62b02b677189f9ef745e3c8fd574334736594139767940dc4647b7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -75459,7 +75701,7 @@ self: {
      mkDerivation {
        pname = "httpd-shed";
        version = "0.4.0.3";
-       sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh";
+       sha256 = "b0ff87d81e61f788d3920d952e4469d984742ba49c006df086c159886bf09218";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base network network-uri ];
@@ -75475,7 +75717,7 @@ self: {
      mkDerivation {
        pname = "https-everywhere-rules";
        version = "0.1.0";
-       sha256 = "170ynbjv8dz221rs26i4d0kwkv3h4ljmx5azslc9jj9lzgb42knp";
+       sha256 = "d74e41d6fb34499918d55f955e252570ecc92768241aa17310e237b4e5b21e9c";
        libraryHaskellDepends = [
          attoparsec base errors functor-infix http-client
          https-everywhere-rules-raw lens network pipes string-conversions
@@ -75498,7 +75740,7 @@ self: {
      mkDerivation {
        pname = "https-everywhere-rules-raw";
        version = "4.0";
-       sha256 = "0zm3znn42nzh9dlpjjn38nsz8rsb0gzl5rv6ngii1vfq534sddy6";
+       sha256 = "c6b7a6c928d8ed10e3b366e742ff034b67f4b545c34a79694bf05b41acfda37e";
        libraryHaskellDepends = [
          base directory filepath functor-infix text
        ];
@@ -75516,7 +75758,7 @@ self: {
      mkDerivation {
        pname = "httpspec";
        version = "0.3.0.1";
-       sha256 = "1vghkrs72cja9x2lqshh6nhsdp8f68s3wh7zljn86011h4widd5v";
+       sha256 = "bbb4163981210083aca4ff403e34320edda6a135106a4c454f4a3271749ef0ed";
        libraryHaskellDepends = [
          base bidispec bytestring cgi containers encoding filepath HTTP hxt
          hxthelper MissingH mtl network pretty safe
@@ -75531,7 +75773,7 @@ self: {
      mkDerivation {
        pname = "htune";
        version = "0.2";
-       sha256 = "1il1d8b7xyv59f7xim337zyh88s1qchsrdhrgmv322hqf73n6rh2";
+       sha256 = "026663c771180a31767d19b6ac21c3412304fd3f63d4d88f4b65fb7e166a81c6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ alsa-pcm base carray fft gloss ];
@@ -75546,7 +75788,7 @@ self: {
      mkDerivation {
        pname = "htzaar";
        version = "0.0.2";
-       sha256 = "12g41q821yh43nslb96jpqyb58k1lz6g0a6vmqw202m0hv94npdb";
+       sha256 = "ab5d4bd286a00a2038aedb28f0cca761a2b23cbed2a445b51d04fa20100ee489";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base OpenGL random SDL ];
@@ -75563,7 +75805,7 @@ self: {
      mkDerivation {
        pname = "hub";
        version = "1.9.0.1";
-       sha256 = "10hcaddk1mqzyl1fmzsvzqq141lg9a43295158ckmkbnx8i1rxv1";
+       sha256 = "61f71c22ea76cd3a192aa12431884a8f061230fe5bffea02f51fd7305b530c82";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -75580,7 +75822,7 @@ self: {
      mkDerivation {
        pname = "hubigraph";
        version = "0.3.2";
-       sha256 = "19mxblqy3bchhrk725x4kmpa9hidjzj0d0sqhx34smqw7v36x814";
+       sha256 = "24a06ec63e1c574d4687588306e4972dc2a46e9da41771668690ade1315dbda6";
        libraryHaskellDepends = [ base containers haxr mtl ];
        homepage = "http://ooxo.org/hubigraph/";
        description = "A haskell wrap for Ubigraph";
@@ -75594,7 +75836,7 @@ self: {
      mkDerivation {
        pname = "hubris";
        version = "0.0.3";
-       sha256 = "135q3nzchncbkx4bpx7p1glwnc9aw5j77f3xnr0d6llfba1bw79l";
+       sha256 = "341dbe825a8e52d340b67db87364e12a31cbe90bf7f4bb489f8b59c8be1db88c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -75618,7 +75860,7 @@ self: {
      mkDerivation {
        pname = "huffman";
        version = "1.0.1";
-       sha256 = "191llv4s64jrh8cma43r5z740avd5picja5fr45l4mi2gwmkx4s3";
+       sha256 = "43933e2b7f2256420bc9ae28c9e22d6d2b40ce2f79105519825912a3c9a634a4";
        libraryHaskellDepends = [ base containers fingertree ];
        description = "Pure Haskell implementation of the Huffman encoding algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -75631,7 +75873,7 @@ self: {
      mkDerivation {
        pname = "hugs2yc";
        version = "0.1.1";
-       sha256 = "1bmcdjwh08q84ijx7hdfraz0wqq0wwgf5pj0jlmdq5rbpb9c547a";
+       sha256 = "ea90c2d2ba2b17dc2a9540dee21ee700630ebecaaec1d36524082300b96cacae";
        libraryHaskellDepends = [
          base containers directory filepath mtl parsec uniplate ycextra
          yhccore
@@ -75651,7 +75893,7 @@ self: {
      mkDerivation {
        pname = "hulk";
        version = "0.2.0";
-       sha256 = "0vq0sb11kiiry67bh5ish1cwj8sf6rgf70p1zrm462zsqgv9wkk2";
+       sha256 = "624e9ef6c3fa0b436afee182e35e364e23c959803a16b88ef139c619c2d2006f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -75680,7 +75922,7 @@ self: {
      mkDerivation {
        pname = "hums";
        version = "0.7.0";
-       sha256 = "1wb9bn83lrn6cpp0gkpc7v40m9wlx8i8zqijm4dmd23zzmrlrxhr";
+       sha256 = "19f64c73fd7f88561ba932e28f22ea94a70ac83eecce07ee65c6663a905d69f1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -75700,7 +75942,7 @@ self: {
      mkDerivation {
        pname = "hunit-gui";
        version = "0.1.4";
-       sha256 = "0wzy2gjxpqr0j2cfnl88ixccm8dv3z9cql1zpzr4ph6g37dc9w60";
+       sha256 = "c0f0c4da19cfc04bf2bf3f50ccd21fbba1ca588f0851eb989020e3dbe513fe73";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cairo gtk haskell98 HUnit ];
@@ -75717,7 +75959,7 @@ self: {
      mkDerivation {
        pname = "hunit-parsec";
        version = "0.3";
-       sha256 = "089l8n1yjcf6sypr76r8p0djwpcqaa5xdk1d0m2k9piig9fnzr40";
+       sha256 = "80e46f5d7a31de3445052dccd68b52985d2e1bb8289b93afd7c631e983453421";
        libraryHaskellDepends = [ base HUnit parsec ];
        description = "An HUnit Testable instance for Parsec parser unit tests";
        license = stdenv.lib.licenses.bsd3;
@@ -75728,7 +75970,7 @@ self: {
      mkDerivation {
        pname = "hunit-rematch";
        version = "0.1.0.1";
-       sha256 = "1xj5f6l8nfanbf0xdwl2j2na45w5h0spi9a8pxqgpxx2rak145gs";
+       sha256 = "fa1512a6caa2f7fb70bf48a57835808517a2ac9082f2d6815b56398ba87145f6";
        libraryHaskellDepends = [ base HUnit rematch ];
        testHaskellDepends = [ base hspec HUnit rematch ];
        jailbreak = true;
@@ -75745,7 +75987,7 @@ self: {
      mkDerivation {
        pname = "hunp";
        version = "0.1";
-       sha256 = "0k07dbqrlnhg3a4yk25gc665z43hcl57kblr20mzryw0cf9zdsci";
+       sha256 = "91e9f6936380fbfc2b1099ae790a6570905f8c61af88e9891a0f5a9af16a074c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -75769,7 +76011,7 @@ self: {
      mkDerivation {
        pname = "hunt-searchengine";
        version = "0.3.0.1";
-       sha256 = "1y8pq158jwdl3zq5f0xdgszihp8z181lhwd92d66ckw9nh0sllw6";
+       sha256 = "8653aa01b4894f664c13a97148030a1f5d18bf7ead0357f01fb471894ac017f9";
        libraryHaskellDepends = [
          aeson aeson-pretty base binary bytestring containers data-default
          data-r-tree data-stringmap deepseq dlist filepath hslogger
@@ -75799,7 +76041,7 @@ self: {
      mkDerivation {
        pname = "hunt-server";
        version = "0.3.0.2";
-       sha256 = "19bbn97pj01sbqbjkgh82hiwzxfybnnm29wj4irgicab0d72jvg6";
+       sha256 = "e66d294e034bb1f87224922751ad5ddef5cf231408be29175e3a00794fb26ba5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -75824,7 +76066,7 @@ self: {
      mkDerivation {
        pname = "hunt-server-cli";
        version = "0.2.0.0";
-       sha256 = "1pmlg06jipmc99v7clz2q7x3bh4ndar55595fx729khnjrbiy9bz";
+       sha256 = "7f251f579616ce244e77259552b26a96c035fac1e25376764aacde280d78b4de";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -75845,7 +76087,7 @@ self: {
      mkDerivation {
        pname = "hurdle";
        version = "0.4.0";
-       sha256 = "13hg6v7vk72yiy0qhwm1f3ksm85vf56a3g5mm62kpbb0lcxvvqwf";
+       sha256 = "8ee3bd3ba360ad3b85a9b5bca14c71bba0aae770a17288818f5e9cb9cf360f8e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -75866,7 +76108,7 @@ self: {
      mkDerivation {
        pname = "husk-scheme";
        version = "3.19";
-       sha256 = "1y8b15cgiky6kasx21q4gw4h40scyby4mkqynq96kaq2yrrayd5q";
+       sha256 = "b834af72f602ab6912b61ecf4afcf24c0302097f0407d1b59ac6cff858090bf9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -75890,7 +76132,7 @@ self: {
      mkDerivation {
        pname = "husk-scheme-libs";
        version = "0.0.1";
-       sha256 = "18c8ww2f7bgxbh33agcrpb36xgjn7zs509ji7q968hnwqnx9vgcj";
+       sha256 = "92bd9dbac5dc4264123e512650f43f56be6ec6ba993d35065cfdade304e788a1";
        libraryHaskellDepends = [
          array base containers husk-scheme json mtl transformers
        ];
@@ -75907,7 +76149,7 @@ self: {
      mkDerivation {
        pname = "husky";
        version = "0.4";
-       sha256 = "136sskjkb4nwsqdmgyly207zv4kv27bxf633p2wl869wcr6kkdbg";
+       sha256 = "6fb5394d663c1944b9b86318d7d7117b92fd0f109efa571bd6dc9235e5d4da8c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -75928,7 +76170,7 @@ self: {
      mkDerivation {
        pname = "hutton";
        version = "1.0.0";
-       sha256 = "12rvlagd0n946x05wnyixd1b16ls9ynagccw2bc77fjqfb0d9shi";
+       sha256 = "11ead4c07258ba73d8129cb1a7ac4f9a9ab042ebd15b5e40372459d09ea23b8b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -75947,7 +76189,7 @@ self: {
      mkDerivation {
        pname = "huttons-razor";
        version = "0.1.1.0";
-       sha256 = "1wwphyg2fm34gxn7s7a4q7p8fyab3c7am4fmw1x50gkrmkwgd72s";
+       sha256 = "5a9cf6f8ac793e507ae0d591aa0e1b4b7987eec1441d7d6c7f6454279e8797f3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base parsec parsec-numbers ];
@@ -75961,7 +76203,7 @@ self: {
      mkDerivation {
        pname = "huzzy";
        version = "0.1.5.5";
-       sha256 = "0i8h380nszd7hk7x6l7qx0ri6k12551li2m77gspzakcf47l6ldp";
+       sha256 = "b751430f716caa7ff53ba78a484329224c1333e8f850d3cf84a77d6d011a1045";
        libraryHaskellDepends = [ base easyplot ];
        jailbreak = true;
        description = "Fuzzy logic library with support for T1, IT2, GT2";
@@ -75974,7 +76216,7 @@ self: {
      mkDerivation {
        pname = "hvect";
        version = "0.2.0.0";
-       sha256 = "01iarjnwm5syhmf6552g3p9dc05nqc74r4nfmagajgv7fnlsf3ri";
+       sha256 = "310fa7a975673fa99eaace924c0ec3b600d6d21d4f94625c855e97caadcc2a06";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTF ];
        homepage = "https://github.com/agrafix/hvect";
@@ -75989,7 +76231,7 @@ self: {
      mkDerivation {
        pname = "hwall-auth-iitk";
        version = "0.1.0.1";
-       sha256 = "0ibxdyg9r5n3dc8szhb8fvdjsbgpbwdah2aahn0kagi1zxw24fl2";
+       sha256 = "823a2278ff213e3581854a09a81a5ff72d2ddb7668c1af116bc3969c9e6f7d45";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -76007,7 +76249,7 @@ self: {
      mkDerivation {
        pname = "hweblib";
        version = "0.6.3";
-       sha256 = "03dmx5irlsyb3b9zg2r6nz947sslizkn0nlk65ldb5n4m8my33hy";
+       sha256 = "1e8ee12baac496d56831935a60e78f54eb43d2b7268bf7d31acb6b9a63e9b50d";
        libraryHaskellDepends = [
          attoparsec base bytestring containers mtl text transformers
        ];
@@ -76026,7 +76268,7 @@ self: {
      mkDerivation {
        pname = "hws";
        version = "1.1.0.1";
-       sha256 = "0d0f0bwbfcmbm1jx6m90qxxjad2adz5k0k51i4jh5ylrfa9xfs7r";
+       sha256 = "f968d7937299fa022589a14c30cb6f4a34257bc72055d365a8ab32b7f8020e34";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -76046,7 +76288,7 @@ self: {
      mkDerivation {
        pname = "hwsl2";
        version = "0.3.2.0";
-       sha256 = "0y3k9xlhzvscbwzrhxgiqf9s3724zak1nbnf6lcaynpzk4p8jmm1";
+       sha256 = "a156892e99ff5aaf1835ce2e1ba6fa449ca193c3f175983f5f4cef0f694f7378";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring Cabal cabal-test-quickcheck QuickCheck
@@ -76063,7 +76305,7 @@ self: {
      mkDerivation {
        pname = "hwsl2-bytevector";
        version = "0.1.0.0";
-       sha256 = "0kfsc85k4vgdbkryrw80rgpjzzbavwqqzqylc95h80vm7xnlg2p9";
+       sha256 = "e98a476d3f7503044b62d4e38f31df6afd2fefcb00f1ecf35ced6d320b62da4d";
        libraryHaskellDepends = [ base bytestring fingertree hwsl2 ];
        homepage = "https://github.com/srijs/hwsl2-haskell-bytevector";
        description = "A hashed byte-vector based on algebraic hashes and finger trees";
@@ -76075,7 +76317,7 @@ self: {
      mkDerivation {
        pname = "hwsl2-reducers";
        version = "0.1.0.0";
-       sha256 = "1q7phb2v11gfwlvm0f0jrsm7gc7ga9awd9cp0kkxm2k20mggrg7x";
+       sha256 = "fdbcfc5e05628adae70497a5c65552efb077aace12385037e5ee85b0c582f7e0";
        libraryHaskellDepends = [
          base bytestring hwsl2 reducers semigroups
        ];
@@ -76089,7 +76331,7 @@ self: {
      mkDerivation {
        pname = "hx";
        version = "0.4";
-       sha256 = "04wkgql6gs9glmp9kj5awis5b15vmwgkyqzi814k9514k3c7c1rb";
+       sha256 = "2b0776d8982494344940f1633f1fafbb845574e4aac8996ea52fe967287e9313";
        libraryHaskellDepends = [ base ];
        description = "Haskell extras (missing utility functions)";
        license = stdenv.lib.licenses.mit;
@@ -76102,7 +76344,7 @@ self: {
      mkDerivation {
        pname = "hxmppc";
        version = "0.2.3";
-       sha256 = "1fri1xcs95ynkf471hrkai0k8kvxhx77ra07yripycnlpa9fcwj9";
+       sha256 = "4972e692bad4327f63f607a87c4e877d4f34415433c370889bd697a4590f31bb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -76125,7 +76367,7 @@ self: {
      mkDerivation {
        pname = "hxournal";
        version = "0.6.6.1";
-       sha256 = "1fk4cgk4ncf5v7k8hankwb49ablfcxj1rcw64ka6pz3jrz4sablq";
+       sha256 = "982ea5c9cf72fc6bd42486b31c64678e2e95c8e2d32a88e6d9c5314be66364ba";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -76151,7 +76393,7 @@ self: {
      mkDerivation {
        pname = "hxt";
        version = "9.3.1.15";
-       sha256 = "0q35jqi3g5qfwzp2p2hm22lkmbmk08bx2qvpgq4731zm48y7ngkj";
+       sha256 = "723e7b3c22f58771087e7763d11702b3ae3aa910158a2beee70e973722966560";
        configureFlags = [ "-fnetwork-uri" ];
        libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath HUnit
@@ -76170,7 +76412,7 @@ self: {
      mkDerivation {
        pname = "hxt-binary";
        version = "0.0.2";
-       sha256 = "1hbby0lcb9kis05zsf5rgyisa1qwryvv8zf91q9fi0j0d7s3rasw";
+       sha256 = "5cab3cf4694082e8120ec97db4b7cf1c07a5a37fb938fd0bd071a6c528f06bc1";
        libraryHaskellDepends = [
          base binary bytestring bzlib deepseq haskell98 hxt
        ];
@@ -76188,7 +76430,7 @@ self: {
      mkDerivation {
        pname = "hxt-cache";
        version = "9.1.0.1";
-       sha256 = "1ki3h9x186c6p1c6hnczr0a1idil6kfvs2jl9d9hmzp9rlmh2w7l";
+       sha256 = "f470012bcde9fe0a534b540abddd3434b61814c89f596858b88619147a8223ce";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath hxt
          SHA time unix
@@ -76203,7 +76445,7 @@ self: {
      mkDerivation {
        pname = "hxt-charproperties";
        version = "9.2.0.1";
-       sha256 = "1mml8wglvagqq891rchgli6r8rnkwrqhgsxfl6kb5403pzb18rp4";
+       sha256 = "e46614d6bf0390b2a6a1aeeb0771e6d366944da40fb21c12c2f8a94d1f47b4d6";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "Character properties and classes for XML and Unicode";
@@ -76215,7 +76457,7 @@ self: {
      mkDerivation {
        pname = "hxt-css";
        version = "0.1.0.1";
-       sha256 = "0z8qswykx0k965n2mfp87b6h8fixrydvjg98d8h37bclfsqzj15w";
+       sha256 = "bc04f9b17694ad33206a283db99bcf3d3a04cd3ae8ba2a6c3169823e3dd7187d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hxt parsec split ];
@@ -76229,7 +76471,7 @@ self: {
      mkDerivation {
        pname = "hxt-curl";
        version = "9.1.1.1";
-       sha256 = "1sn5ngzz5qszdb3anbpqbjdijz29gmrwjrg9vsmrqsdqz65wrhfd";
+       sha256 = "cdc1cc8bf9b8699cabdee965c9737d497c199b5cf82eabc66a5fe3f2ffb3c5ea";
        libraryHaskellDepends = [ base bytestring curl hxt parsec ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "LibCurl interface for HXT";
@@ -76241,7 +76483,7 @@ self: {
      mkDerivation {
        pname = "hxt-expat";
        version = "9.1.1";
-       sha256 = "1mi2f2i31nqjqzwl82iypm1qngrpxp7lz506pjgqfbn840yc9n8h";
+       sha256 = "10d9c43c20c82e879fbc06944fcfed373f8b43bd3e0a44f9c712db30a27022d6";
        libraryHaskellDepends = [ base bytestring hexpat hxt ];
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "Expat parser for HXT";
@@ -76253,7 +76495,7 @@ self: {
      mkDerivation {
        pname = "hxt-extras";
        version = "0.4.1";
-       sha256 = "1bv8kcra2vgjbp7k0yczlrfbjh7ib2xixaqpnnd60hq84878nzb1";
+       sha256 = "617d8b0e220843609ab517ab1ebb58f140b95ca69f7930cf5df26da1329b68af";
        libraryHaskellDepends = [ base hxt ];
        homepage = "http://code.google.com/p/hxt-extras/";
        description = "Extra functions for HXT";
@@ -76267,7 +76509,7 @@ self: {
      mkDerivation {
        pname = "hxt-filter";
        version = "8.4.2";
-       sha256 = "0jxiph7c59dc2fy5c2ygii1xlcmh8s5zb8c0hwvjkj0hzfjznra0";
+       sha256 = "4065fba5fb10c829378780a1f58b46b032da438ccf0b56bc13aca5c20ebcb14b";
        libraryHaskellDepends = [
          base containers directory filepath haskell98 HTTP HUnit hxt network
          parsec process
@@ -76286,7 +76528,7 @@ self: {
      mkDerivation {
        pname = "hxt-http";
        version = "9.1.5.2";
-       sha256 = "02yxvzczv89j518b94wh8m4dsmnymzxgv9158m7w6lqxk41rv8bg";
+       sha256 = "6fa19d03991d53c34f4525a4fdfaafde56dd48459093b4502832a1fdd9dfdd0b";
        libraryHaskellDepends = [
          base bytestring HTTP hxt network network-uri parsec
        ];
@@ -76300,7 +76542,7 @@ self: {
      mkDerivation {
        pname = "hxt-pickle-utils";
        version = "0.1.0.3";
-       sha256 = "1id9459yphsbxqa0z89dhsmqqcgvk2axv91d05aw3n6r4ygs3nwx";
+       sha256 = "9ddba19f27d9d8c155012da4dd9598fb318cab862da10f14ee4bc3eb5321a9c5";
        libraryHaskellDepends = [ base hxt mtl ];
        homepage = "https://github.com/silkapp/hxt-pickle-utils";
        description = "Utility functions for using HXT picklers";
@@ -76314,7 +76556,7 @@ self: {
      mkDerivation {
        pname = "hxt-regex-xmlschema";
        version = "9.2.0.2";
-       sha256 = "1hkcd5p7rhv8z2vlcpd1gcdiyni28m8k8yd5fnxw8a9bvrnnfi27";
+       sha256 = "4744676dde2b29c4bb75a579345145225a1f1b7ba15d46b7f868c37c6e696cc2";
        libraryHaskellDepends = [
          base bytestring hxt-charproperties parsec text
        ];
@@ -76331,7 +76573,7 @@ self: {
      mkDerivation {
        pname = "hxt-relaxng";
        version = "9.1.5.5";
-       sha256 = "07s47z5xhd0pdzz8mr9vg78qxay450sm8ljycpprq7y7mgh2vzhf";
+       sha256 = "0efe2de0abc71f9cef655e52543528c4ab8ed1793be58afe6f1734d8cb3f441f";
        libraryHaskellDepends = [
          base containers hxt hxt-charproperties hxt-regex-xmlschema
          network-uri parsec
@@ -76348,7 +76590,7 @@ self: {
      mkDerivation {
        pname = "hxt-tagsoup";
        version = "9.1.3";
-       sha256 = "1rp499j6w3h9xfxqyw2fn05ffq3z0wg1r9h2c205m37mb8visq77";
+       sha256 = "e7601d375af58c5a806002a61c1e077f60e70ab04e708fbbeb090e6e644ae4e6";
        libraryHaskellDepends = [
          base hxt hxt-charproperties hxt-unicode tagsoup
        ];
@@ -76362,7 +76604,7 @@ self: {
      mkDerivation {
        pname = "hxt-unicode";
        version = "9.0.2.4";
-       sha256 = "0rj48cy8z4fl3zpg5bpa458kqr83adav6jnqv4i71dclpprj6n3v";
+       sha256 = "7b5823f3bd94b57022d9d84ab3555303653c5121eaaef2ee1fd4918f3c434466";
        libraryHaskellDepends = [ base hxt-charproperties ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
@@ -76375,7 +76617,7 @@ self: {
      mkDerivation {
        pname = "hxt-xpath";
        version = "9.1.2.2";
-       sha256 = "0wlq9s01icalnvjkkilx5zaqp3ff4v5limj1xy8i18qpzjspqdsh";
+       sha256 = "50377cb5fc17a31091ef41d648cb26ce8d8bd52f9dc639e5b654b118804e9872";
        libraryHaskellDepends = [
          base containers directory filepath hxt parsec
        ];
@@ -76391,7 +76633,7 @@ self: {
      mkDerivation {
        pname = "hxt-xslt";
        version = "9.1.1.1";
-       sha256 = "020k7zjwbad5j2zbc0cgp8f5lggws5jijlcwmi71p510n0f51y9j";
+       sha256 = "32f9501cb020941b4eac9c511965d1fc3d5a1cba8f01b6be90a5a9c5e53f1308";
        libraryHaskellDepends = [
          base containers directory filepath hxt hxt-xpath parsec
        ];
@@ -76405,7 +76647,7 @@ self: {
      mkDerivation {
        pname = "hxthelper";
        version = "0.2.2";
-       sha256 = "1il21mqmvvfdny5ksnyixj1wqhabvxqhccd6vj4dbzlvvf5yb6k1";
+       sha256 = "619ae58bdb9bfed588dca6310671df4b41cc83ecd15b3d8bb7cded5d710d82c6";
        libraryHaskellDepends = [ base bytestring encoding hxt mtl ];
        jailbreak = true;
        description = "Helper functions for HXT";
@@ -76418,7 +76660,7 @@ self: {
      mkDerivation {
        pname = "hxweb";
        version = "0.1";
-       sha256 = "0faiyflyhmn2y0bs920qgm9xkj9i69lzxhsg4rxffal989gi32z8";
+       sha256 = "e88b115f42892ae77a264fc3fe693231c9d9537d1888a417f0c256e8a9f35139";
        libraryHaskellDepends = [ base cgi fastcgi libxml mtl xslt ];
        description = "Minimal webframework using fastcgi, libxml2 and libxslt";
        license = stdenv.lib.licenses.bsd3;
@@ -76430,7 +76672,7 @@ self: {
      mkDerivation {
        pname = "hyahtzee";
        version = "0.2";
-       sha256 = "0zv9ycgf9sii59q86s04m6krjyjgmrqaxz4lyvwa58b7a886wcmv";
+       sha256 = "bb326e105267a1a2f8f694fcae70ae4f7a99a7a9046883702a31eae41ef3697f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers HUnit random ];
@@ -76447,7 +76689,7 @@ self: {
      mkDerivation {
        pname = "hyakko";
        version = "0.6.7";
-       sha256 = "1k81whay05mp9jb39gmb64l2xqxa90yrb7svbphj1cnsz0b76qwk";
+       sha256 = "93637316f8dab220e15d5b9f953d48aae32e2831abbe34964cb716e015e401cd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -76466,7 +76708,7 @@ self: {
      mkDerivation {
        pname = "hybrid";
        version = "2.0";
-       sha256 = "05v69csnz7g9ikymnrmzjqhdwlrfsb44pbv8mzddgk6my9ddlb9w";
+       sha256 = "3c2dda5af2d5ccd7daaf68af4bc8d22e53de2096bf665bfd8ce99d6f354b6617";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -76483,7 +76725,7 @@ self: {
      mkDerivation {
        pname = "hybrid-vectors";
        version = "0.2";
-       sha256 = "0xdrna6jgn4l0idhv0bn6ic8m7g8pps23ky2f75zwgpqrkflnb41";
+       sha256 = "812c4bddccf83efecb71c2cf21f4bde89d8a583476810d5b0494d8278db2b975";
        revision = "1";
        editedCabalFile = "43a2c8cd2fa6abe7dc526dd99ef9d296394922a3d92ced8138072250fe75eb35";
        libraryHaskellDepends = [ base deepseq primitive vector ];
@@ -76497,7 +76739,7 @@ self: {
      mkDerivation {
        pname = "hydra-hs";
        version = "1.0.0.2";
-       sha256 = "18sxqangnl3gbb77dsg036ymsjj6w7zws2v43qnp3cfi0ksjxx8s";
+       sha256 = "1af52ef504d1b1712d1e640bcdffe1464a5dbd19e0e976ce5a6f50fbacc25da3";
        libraryHaskellDepends = [ base hmatrix ];
        librarySystemDepends = [ sixense_x64 ];
        testHaskellDepends = [ base ];
@@ -76518,7 +76760,7 @@ self: {
      mkDerivation {
        pname = "hydra-print";
        version = "0.1.0.3";
-       sha256 = "16cgp3a475pzy0zasvfv3cvkvgc84g6p960sykk7y4aki0n3769i";
+       sha256 = "3199332c8853117fe6f41a9874cd2388bd3d371bdb6dad3ef0ff9643d4b88f99";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -76548,7 +76790,7 @@ self: {
      mkDerivation {
        pname = "hydrogen";
        version = "0.3.0.0";
-       sha256 = "0aq4svvwcys06mv172zz4yp624f6mnjg94lycj4r66xhm8m3fv4i";
+       sha256 = "916c372aaab01b9389649e92f4a4adc61161ae27ff8b137635407bc6f7d6042b";
        libraryHaskellDepends = [
          base bytestring containers mtl pretty text
        ];
@@ -76566,7 +76808,7 @@ self: {
      mkDerivation {
        pname = "hydrogen-cli";
        version = "0.14";
-       sha256 = "03hz4z964zg1b5nzywymrd1m3ss081rq6nnbqwcgbwabx6wd209b";
+       sha256 = "2b01d1b8e94bf1f518c7cb5a83734040eb5143cbd573ff6d59e17d62d2271f0e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -76586,7 +76828,7 @@ self: {
      mkDerivation {
        pname = "hydrogen-cli-args";
        version = "0.17";
-       sha256 = "1wapq5lfyvm09sl9n7zhiaxpb8iapirvizq3ak9rl17vy4iz5xl4";
+       sha256 = "84f6f223f1fb049ad35403ffb873bc2aa275bb8af01f9ba84ea06eef68c157f1";
        libraryHaskellDepends = [
          base containers hydrogen-multimap hydrogen-prelude
        ];
@@ -76602,7 +76844,7 @@ self: {
      mkDerivation {
        pname = "hydrogen-data";
        version = "0.14";
-       sha256 = "0d9457sarii5z1m2p1jzfk1g1ix2bm0s3ghfw7gab1w74i3hlh88";
+       sha256 = "08410a47248787a5dee10ebea1415da2c7f0c2745f862b6af825c6acf4292435";
        libraryHaskellDepends = [ base hydrogen-parsing hydrogen-prelude ];
        jailbreak = true;
        homepage = "https://scravy.de/hydrogen-data/";
@@ -76616,7 +76858,7 @@ self: {
      mkDerivation {
        pname = "hydrogen-multimap";
        version = "0.3";
-       sha256 = "0ik68a85yxdz12sgfpqi7bagkhvm9qgvl2bgplm2anxjsxcqbi93";
+       sha256 = "23c58559d7b25b252abd6f09ba1f4e75c3f9d43a115ff7b408bf755f90426646";
        libraryHaskellDepends = [ base containers ghc-prim ];
        homepage = "https://scravy.de/hydrogen-multimap/";
        description = "Hydrogen Multimap";
@@ -76628,7 +76870,7 @@ self: {
      mkDerivation {
        pname = "hydrogen-parsing";
        version = "0.17";
-       sha256 = "0m9rliry031lr7bn4xkbjmar288zcrnpsbnjdyxs13v675bh7h29";
+       sha256 = "49c0035739668fa0bb6fd22e7d6d661f219155956b7662d7c9340ce073a43955";
        libraryHaskellDepends = [
          base containers hydrogen-prelude parsec
        ];
@@ -76648,7 +76890,7 @@ self: {
      mkDerivation {
        pname = "hydrogen-prelude";
        version = "0.20";
-       sha256 = "18g3r95ssg385zqzny3137ms0ppv7d33xgvc4gvxkijv8cgj1697";
+       sha256 = "2799201f435bc6d9f7236cbf3e463bfb5ea0eb196178fbf12f683cad4bcae3a1";
        libraryHaskellDepends = [
          array base binary bytestring cereal containers directory filepath
          hashable hydrogen-multimap hydrogen-version network process random
@@ -76665,7 +76907,7 @@ self: {
      mkDerivation {
        pname = "hydrogen-prelude-parsec";
        version = "0.17";
-       sha256 = "0hdvvp3kxc66y6bxzcrjqp7wc6s21isvfra0ps53j69jmnzqd2mh";
+       sha256 = "b08a86bfad3219398abe4065b7750c421bc6cfc532b3df97f1c6b03ec7ddbb41";
        libraryHaskellDepends = [ base hydrogen-prelude parsec ];
        jailbreak = true;
        homepage = "http://scravy.de/hydrogen-prelude-parsec/";
@@ -76681,7 +76923,7 @@ self: {
      mkDerivation {
        pname = "hydrogen-syntax";
        version = "0.17";
-       sha256 = "17j6iq2fh1s3vwkzd5js786abk1zkmj4dfg425d290k4nvdl08dv";
+       sha256 = "bb2140dbb66482245a11e4b946649d3fcca50c3a5a96f627df4307e8048e469e";
        libraryHaskellDepends = [
          base containers hydrogen-parsing hydrogen-prelude nicify parsec
          uuid
@@ -76698,7 +76940,7 @@ self: {
      mkDerivation {
        pname = "hydrogen-util";
        version = "0.8";
-       sha256 = "14z2nf2af0ydqr2sm4r4cn252qn0hbacdc4z1lhyjnin66djb1a8";
+       sha256 = "4885259b31365ae9210d9fb0c6d482c0625184652493aa45c6cd03a784b3e293";
        libraryHaskellDepends = [
          base containers hydrogen-prelude parsec time
        ];
@@ -76714,7 +76956,7 @@ self: {
      mkDerivation {
        pname = "hydrogen-version";
        version = "1.4";
-       sha256 = "04v39lvh0z0ig6igsz7ncfasag3j6pdbsa86gyp63n4g325fmf38";
+       sha256 = "68b8ea8a188fd861ae7f0629bdda35723ca59563f67cfda279117c00374d6313";
        libraryHaskellDepends = [ base ];
        homepage = "https://scravy.de/hydrogen-version/";
        description = "Hydrogen Version Type";
@@ -76729,7 +76971,7 @@ self: {
      mkDerivation {
        pname = "hyena";
        version = "0.1.0.1";
-       sha256 = "0899lw0vyvcw03ph4w717rxach2ncb69xfn9387j7fl0s01ch0ji";
+       sha256 = "5102c802d080ba230f1ac9ba9ecc625640a67a3ee17002ef009c6dbf01a72921";
        libraryHaskellDepends = [
          base bytestring containers directory extensible-exceptions filepath
          mtl network network-bytestring unix
@@ -76748,7 +76990,7 @@ self: {
      mkDerivation {
        pname = "hylolib";
        version = "1.4.0";
-       sha256 = "160k8lp6r2rbgj7qz3msa5sd5yxkdb5rjlhwd5lqbcxw2sry0vj2";
+       sha256 = "426ee0b316bcb38569691c5299cb6ab3fbd27451ba8e8f8f7c2b8b6c2e451398";
        libraryHaskellDepends = [
          array base containers mtl pretty QuickCheck random uniplate
        ];
@@ -76763,7 +77005,7 @@ self: {
      mkDerivation {
        pname = "hylotab";
        version = "1.2.1";
-       sha256 = "0xynx72xpb84g19gnsgq00gwj3ycfgk5qgd9j949b6k3fqr3n71w";
+       sha256 = "3c1c3b3276639a954892a93d5ce673cc0fc91f00f869fb527804addbc5e9d677";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hylolib mtl ];
@@ -76778,7 +77020,7 @@ self: {
      mkDerivation {
        pname = "hyloutils";
        version = "1.0";
-       sha256 = "1pn14f3hjcxa5bww0pg2irqmbvfs7f3vfwl8z87jmxfyydgffgnh";
+       sha256 = "d03ee75ef3def52a0ffa8872b7873bdaed55718ee25dc0f92aaa33098723c1de";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -76796,7 +77038,7 @@ self: {
      mkDerivation {
        pname = "hyperdrive";
        version = "0.1";
-       sha256 = "0hvgxsrq1aws5c97w1lrk87d74kn8796vmclkdxhajfammj6ccz9";
+       sha256 = "e9336664adca49057b9b94d56dd2417692d30e9a99067e122b9aab80b3ee6f43";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -76816,7 +77058,7 @@ self: {
      mkDerivation {
        pname = "hyperfunctions";
        version = "0";
-       sha256 = "0q452g2qzlw961zwkdihwi8d8hknxavfgd8vkjdhiazx5anbqzkm";
+       sha256 = "757ebcac2afdab089b9c1bb5e7b6ea7642d450e430b6c97f3089d38fc5138560";
        libraryHaskellDepends = [
          adjunctions base distributive profunctors transformers
        ];
@@ -76835,7 +77077,7 @@ self: {
      mkDerivation {
        pname = "hyperloglog";
        version = "0.3.4";
-       sha256 = "122qdkg1xwyhbxll5zimp8w6j79i30102g3iqf41lrbrx0xllpag";
+       sha256 = "4f5d4a3be879651a88c3713c010218311d6938ba35fe42695fd0f31ede6c5888";
        libraryHaskellDepends = [
          approximate base binary bits bytes cereal cereal-vector comonad
          deepseq distributive hashable hashable-extras lens reflection
@@ -76857,7 +77099,7 @@ self: {
      mkDerivation {
        pname = "hyperpublic";
        version = "0.1.1";
-       sha256 = "07jz89x0daps5rkmccjprrbkwn5mzdskp2yv8asfnmcyir36lmzd";
+       sha256 = "ed576a468e9e55ebb442db8b3b75fbb5583e57ce573256672efaaa067a425f1e";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring http-enumerator http-types
        ];
@@ -76873,7 +77115,7 @@ self: {
      mkDerivation {
        pname = "hyphenate";
        version = "0.1";
-       sha256 = "0pnp5d1a0hwn6jm8v6i7yygd831q2bvsz6qb9n8db8n17lfxikx4";
+       sha256 = "a4cfd81d3dc1a2d5904d0b9baff712380cd49ef7279a8daa349643a0422bd75e";
        libraryHaskellDepends = [ base containers ];
        homepage = "http://www.alpheccar.org";
        description = "Text hyphenation algorithm";
@@ -76887,7 +77129,7 @@ self: {
      mkDerivation {
        pname = "hyphenation";
        version = "0.6";
-       sha256 = "1xqj4na1gm40ssirc4k70r27bzxhg2dkiipp48a5hqwgq5k3crrg";
+       sha256 = "2f673666c18f63581422f7c6389b78b0ff754406671296a3d680d417942512f7";
        libraryHaskellDepends = [
          base bytestring containers unordered-containers zlib
        ];
@@ -76911,7 +77153,7 @@ self: {
      mkDerivation {
        pname = "hypher";
        version = "0.1.5";
-       sha256 = "0q5lpza6l4aqd85i1wxkkrdd3j9kk2k8xd0l6szpgkv87b41qfhk";
+       sha256 = "133a1cc83a68cf77bf3614b48ea69833c9d15a9eb3f3100b6a58116ad4bfb460";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default hashable HTTP
          http-conduit http-types lifted-base monad-control mtl resourcet
@@ -76939,7 +77181,7 @@ self: {
      mkDerivation {
        pname = "hzk";
        version = "2.1.0";
-       sha256 = "1jcvha3wzf6wka1zpmsvg1j48jl85v1s4p0mryfhjqz7l9h3wkac";
+       sha256 = "4c4d3e60a2e763099dcf155ca2c32e884a4464785bd7fb839adcb8cf87829bc9";
        libraryHaskellDepends = [ base bytestring resource-pool time ];
        librarySystemDepends = [ zookeeper_mt ];
        testHaskellDepends = [
@@ -76960,7 +77202,7 @@ self: {
      mkDerivation {
        pname = "hzulip";
        version = "1.1.1.1";
-       sha256 = "1gxywjng4mv0g13yap2a0i62l8wlbncj8ajj87ca6p8aikrd6cm1";
+       sha256 = "a132d3f28c0a5da3d841522a24995d94232a4c044a5ce547786057f2ace4bebf";
        libraryHaskellDepends = [
          aeson base bytestring conduit exceptions http-client
          http-client-tls http-types lens lens-aeson mtl stm stm-conduit text
@@ -76984,7 +77226,7 @@ self: {
      mkDerivation {
        pname = "i18n";
        version = "0.3";
-       sha256 = "0l1z9acg1nnxs66w70vyhlj3wx2xg7w0lja59yp5awmh98815q1p";
+       sha256 = "37e012104ab07255ae4f45490af8795d743e24857e83c38dd1dddaf0984a3f50";
        libraryHaskellDepends = [
          array base containers directory filepath mtl old-locale old-time
          parsec utf8-string
@@ -77002,7 +77244,7 @@ self: {
      mkDerivation {
        pname = "iCalendar";
        version = "0.4.0.3";
-       sha256 = "0dbs9s68fpx67ngjnd1p8c9n421bzn6a034dr6i3bhg2cn0s01mw";
+       sha256 = "bc06a08165e2c135a2c98d0ca08cfd2b0862134337342b9f3da65f878c4e7a35";
        libraryHaskellDepends = [
          base base64-bytestring bytestring case-insensitive containers
          data-default mime mtl network network-uri old-locale parsec text
@@ -77018,7 +77260,7 @@ self: {
      mkDerivation {
        pname = "iException";
        version = "0.0.1";
-       sha256 = "0g9hh7v5m194wyj9c5vzsjjc10fia60c9p8si778yky4chvfvj7p";
+       sha256 = "f7c8ed3664c44f8fce891addc48051d181c0a4d47f1796a4e724855af681303d";
        libraryHaskellDepends = [ base interleavableIO mtl ];
        description = "Version of Control.Exception using InterleavableIO.";
        license = "unknown";
@@ -77032,7 +77274,7 @@ self: {
      mkDerivation {
        pname = "iap-verifier";
        version = "0.1.0.1";
-       sha256 = "0mf55kx2y5q8qldgqcq805r3565nxngjm7nwq4q2xy54s7m2fsha";
+       sha256 = "0a6a27ead1a4f82e30c1dc9e2a9fedb6983272010833fc1ac508172ffa2cc555";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring conduit http-conduit
          monads-tf text transformers
@@ -77048,7 +77290,7 @@ self: {
      mkDerivation {
        pname = "ib-api";
        version = "0.1.0.1";
-       sha256 = "0zswsb7mvbm8zycb14sks2kvg4jy2wn3vc7z6lb00s0alm1v0srk";
+       sha256 = "336bb043a50a68001635ffb03d2c175e92b7a7d05393b098ffa8ae5dcfd25c7f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base bytestring network ];
@@ -77068,7 +77310,7 @@ self: {
      mkDerivation {
        pname = "iban";
        version = "0.1.1.0";
-       sha256 = "0rg4h2as5n324zf9y6jllz28s4wj687vdiqvrbnzlavl2kbx96vl";
+       sha256 = "749bd4d714742bfaedca1bc7b60f3292138dc4a7541a9fdc2762d8a29580e465";
        libraryHaskellDepends = [
          base containers iso3166-country-codes text unordered-containers
        ];
@@ -77085,7 +77327,7 @@ self: {
      mkDerivation {
        pname = "iconv";
        version = "0.4.1.3";
-       sha256 = "0m5m0ph5im443xcz60wm1zp98bnmf8l1b5gfllxwhjriwdl52hin";
+       sha256 = "36425168e3314bc83ba5ee95152872d52e94ee0f9503f3591f84d458e005b554";
        libraryHaskellDepends = [ base bytestring ];
        description = "String encoding conversion";
        license = stdenv.lib.licenses.bsd3;
@@ -77104,7 +77346,7 @@ self: {
      mkDerivation {
        pname = "ide-backend";
        version = "0.10.0";
-       sha256 = "18p079m9hfi4mbhyp8fhlhzlvhdpr9v82ih49s1630rxaf15z8r6";
+       sha256 = "26a35f82533d8361824e04468176cab7c14d3fa4d0a1ebe1aa243a986a3ae0a2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77142,7 +77384,7 @@ self: {
      mkDerivation {
        pname = "ide-backend-common";
        version = "0.10.0";
-       sha256 = "1x230hvxr5n8d04q9cdjryalrp47q9vsamgd0qafw1x25ar1fxwl";
+       sha256 = "947717b22aa207ee1406ed55a577c287dc4c95cfb2b1840968c896dc370443f4";
        libraryHaskellDepends = [
          aeson async attoparsec base binary bytestring bytestring-trie
          containers crypto-api data-accessor directory filepath fingertree
@@ -77158,7 +77400,7 @@ self: {
      mkDerivation {
        pname = "ide-backend-rts";
        version = "0.1.3.1";
-       sha256 = "1zj1glpyhmgpkxy4n96aqqf3s1gl2irl8ksnx4i9y4nwvs06qzj0";
+       sha256 = "407e6c80dedc129f22e9564f447314f4053d1cc6ca244b7c9ff755e82f7d41fe";
        libraryHaskellDepends = [ base ];
        description = "RTS for the IDE backend";
        license = stdenv.lib.licenses.mit;
@@ -77174,7 +77416,7 @@ self: {
      mkDerivation {
        pname = "ide-backend-server";
        version = "0.10.0";
-       sha256 = "1kahc57f5jrz7869phzlbk6y3apwyh3j6k8b7xbyfcc4qwq6jgry";
+       sha256 = "3e3f6930c78431e7573f0b4d2307f4fcaae1cd5cf4c39b0c3a3fcbe24e6150cd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -77197,7 +77439,7 @@ self: {
      mkDerivation {
        pname = "ideas";
        version = "1.3.1";
-       sha256 = "1rwvnxih9lb8hw3wvnv377z78szdq80qsrspnxbdqf37kfdw3fx0";
+       sha256 = "a0bbc19b9b6738dc56b757678d01c2ed6b74fe3963dbcd078768d10463b79be7";
        libraryHaskellDepends = [
          array base bytestring containers Diff directory exceptions filepath
          mtl multipart network old-locale old-time parsec QuickCheck random
@@ -77217,7 +77459,7 @@ self: {
      mkDerivation {
        pname = "ideas-math";
        version = "1.2";
-       sha256 = "1s3pryjzc7dkmfdfrysag1w1j752y29cga4040a8fag10n9w7rr2";
+       sha256 = "22e7c39305e12987142080a8c792f0a21c1978784afbec9aabb31df6a5cf77e8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -77235,7 +77477,7 @@ self: {
      mkDerivation {
        pname = "idempotent";
        version = "0.1.2";
-       sha256 = "18jwk65mm50lqnbx9px4c8aa2x7n5dkrazzpzvdwq7cy4q614bj0";
+       sha256 = "402e120c269e1dccdbfef77f95672bf674a11462a4dfd497c514945a8b995ca2";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        jailbreak = true;
@@ -77252,7 +77494,7 @@ self: {
      mkDerivation {
        pname = "identifiers";
        version = "0.4.0.0";
-       sha256 = "0lk58c465a77mshz1b8rdgpidkgr73xbh9q0hij5dqw8d32h958f";
+       sha256 = "0e9504c56888e35664840027b8fa38f9cd16ef6b19adf0a1aee7a86208436552";
        libraryHaskellDepends = [
          base binary cereal containers deepseq hashable ListLike text
          unordered-containers
@@ -77273,7 +77515,7 @@ self: {
      mkDerivation {
        pname = "idiii";
        version = "0.1.3.3";
-       sha256 = "11595aj56sjwk28grh6ldsbk5c6kgrirsc2xglfixw82vj7viw8h";
+       sha256 = "10f1b88fdc02f11e1d7d5d309d637ed3b032976ed4c0fc90985c6a53a42aa984";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77295,7 +77537,7 @@ self: {
      mkDerivation {
        pname = "idna";
        version = "0.3.0";
-       sha256 = "04w2mp9wa4mzdz4njx47j081jia8y000b46cw8vmx44fx8gv1zwp";
+       sha256 = "97ffb01fea8e905e37e2cc900500f04845191090877469c96fbf12c5d3ad8213";
        libraryHaskellDepends = [ base punycode stringprep text ];
        description = "Implements IDNA (RFC 3490)";
        license = stdenv.lib.licenses.bsd3;
@@ -77306,7 +77548,7 @@ self: {
      mkDerivation {
        pname = "idna2008";
        version = "0.0.1.0";
-       sha256 = "1pd62pr1hyk565mxc15f5lxyms58bywcqll5ya6cnzw20lv4lzlz";
+       sha256 = "9f7e4a3605827fcb8cf28552ccb85fa8e8ea3b2dae04d66b31657a18f215a6dd";
        libraryHaskellDepends = [ base punycode split ];
        jailbreak = true;
        description = "Converts Unicode hostnames into ASCII";
@@ -77327,7 +77569,7 @@ self: {
      mkDerivation {
        pname = "idris";
        version = "0.9.18.1";
-       sha256 = "0xd4kqnjdx427l26b07rrw9bnrxb8zrsqy93wayf4rmg6l8rymj8";
+       sha256 = "48569f1135af66e2bce22379acf347ab67bb12cff98065043d82f4262d9ea475";
        configureFlags = [ "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
@@ -77354,7 +77596,7 @@ self: {
      mkDerivation {
        pname = "ieee";
        version = "0.7";
-       sha256 = "0ckhmy10l4kchr5bg1hlygrj86ij0wrj3r8in9g3c3jhh00dx3km";
+       sha256 = "758ede0080500e365eb211e5213307321a24f3f31486b74a866c120a82af7032";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/patperry/hs-ieee";
        description = "Utilities for dealing with IEEE floating point numbers";
@@ -77366,7 +77608,7 @@ self: {
      mkDerivation {
        pname = "ieee-utils";
        version = "0.4.0";
-       sha256 = "0548m1xjvzf65kkklmqjr2f5h85zdfpvxmdbx5rcg33zi8aiqfgk";
+       sha256 = "f3391c158a7f8cc772e9abd5beaf6bbf20589cc812573ae72cc6fd2d7ba88814";
        libraryHaskellDepends = [ base ];
        description = "ieee-utils";
        license = stdenv.lib.licenses.bsd3;
@@ -77378,7 +77620,7 @@ self: {
      mkDerivation {
        pname = "ieee-utils-tempfix";
        version = "0.4.0.1";
-       sha256 = "0x0mkvnf3q4yfh7bi7hv6364gy0l57syzy9xgzyax8z94zh465c3";
+       sha256 = "831543e027e9a3aefc7f3df9eff52914f847cc301b9eb80e749ee0e1ec9e1574";
        libraryHaskellDepends = [ base ];
        description = "ieee-utils";
        license = stdenv.lib.licenses.bsd3;
@@ -77389,7 +77631,7 @@ self: {
      mkDerivation {
        pname = "ieee754";
        version = "0.7.6";
-       sha256 = "03s56h82n7hcwcn2dhd646prcf9wxj5jq49xqsnl7cnvi9768h2q";
+       sha256 = "5840644e8adbb243adc63d112c8bec3c3996af21a6c1262ce30c1e2b1034450f";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/patperry/hs-ieee754";
        description = "Utilities for dealing with IEEE floating point numbers";
@@ -77401,7 +77643,7 @@ self: {
      mkDerivation {
        pname = "ieee754-parser";
        version = "0.1";
-       sha256 = "06pyzjd9imcnrffc0h4dwq46llkb9cmfk1nygmjgfz0y0f9481iv";
+       sha256 = "3b064492031e7cf7647dde86e92a4b6b526a08e68d40c09ccb96d5989afcfe1a";
        libraryHaskellDepends = [ base binary bytestring ];
        license = "GPL";
      }) {};
@@ -77411,7 +77653,7 @@ self: {
      mkDerivation {
        pname = "iff";
        version = "0.0.5";
-       sha256 = "1qy19d39zkf79z2j3mvimcnr48vpka5zj05g46fl4f9hz9xjiv16";
+       sha256 = "26ec287bfa3039429d21af00f98b9a7723922dab71d721c54fc7cd9f464bc1e3";
        libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://code.haskell.org/~thielema/iff/";
        description = "Constructing and dissecting IFF files";
@@ -77425,7 +77667,7 @@ self: {
      mkDerivation {
        pname = "ifscs";
        version = "0.2.0.0";
-       sha256 = "1675j66kmlfcwd8g0wanx4jfs3vnnvz8hpazskzng6ghvp4bam1q";
+       sha256 = "3854b5c8ddf09967ffd45f5d88feb6760fed24e95671f050e3ccd13a8d91e598";
        libraryHaskellDepends = [ base containers failure ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -77443,8 +77685,8 @@ self: {
      }:
      mkDerivation {
        pname = "ig";
-       version = "0.3.1";
-       sha256 = "0ggr6h5inwwxvqs9qywiagi1c5bx1vky5h0zvhz0df88nbfd3d21";
+       version = "0.4";
+       sha256 = "ed03d66cd64476c6f0065251ad777cdbfb62a740802007218dd24f732fcf723e";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring conduit conduit-extra
          crypto-api cryptohash cryptohash-cryptoapi data-default
@@ -77463,7 +77705,7 @@ self: {
      mkDerivation {
        pname = "ige-mac-integration";
        version = "0.1.0.1";
-       sha256 = "1949c5v3157xlwcmddawc79iagxlgy4l08skpkldi45amyy3jqn6";
+       sha256 = "c66239bcafaa90d8e8bc532340897fb43f15d3615cb55619a7fd9430766189a4";
        libraryHaskellDepends = [
          array base containers glib gtk haskell98 mtl
        ];
@@ -77483,7 +77725,7 @@ self: {
      mkDerivation {
        pname = "igraph";
        version = "0.1.1";
-       sha256 = "098b1y1iwmlpi3kspq4cd82cs0bbxvygghssjr986664lgv06hsd";
+       sha256 = "4d4303f6a3c4188352965ac3f7fcee6b01cd046a8ce0abe78897561e830f0b25";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
@@ -77500,7 +77742,7 @@ self: {
      mkDerivation {
        pname = "igrf";
        version = "0.2.0.0";
-       sha256 = "04ipbhry1v3cpkflshqa9sp46px0k6g67n8apvdqykk5fsssdpm1";
+       sha256 = "a1dea6b576654e8fdbbe0ad9639e99a05f43ae4e0a434dddbc6cece0335c3712";
        revision = "1";
        editedCabalFile = "7d616cb461fb1406310675937e1e761f2d09757824dce8a92d235b7ef6ce1e4f";
        libraryHaskellDepends = [ ad base polynomial ];
@@ -77521,8 +77763,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell";
-       version = "0.6.4.0";
-       sha256 = "1jcksbc82csr11lpy5jakf7g6wj2w7mx27cp7knlbi65fsablsk5";
+       version = "0.6.4.1";
+       sha256 = "524cf3836857ba1762f895379b533352cf25a532ad8825f93f9842d9f235adbe";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77559,7 +77801,7 @@ self: {
      mkDerivation {
        pname = "ihaskell-aeson";
        version = "0.3.0.0";
-       sha256 = "0h2bbkqwl8mdyn24n0lphcjfrvmfq8ckincv3rncspp9h0v705m7";
+       sha256 = "a716703680e95ecd6c1e9bd93819c2aeeeec248397024b84f5ad22caf15c4b40";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring here ihaskell text
        ];
@@ -77574,7 +77816,7 @@ self: {
      mkDerivation {
        pname = "ihaskell-basic";
        version = "0.3.0.0";
-       sha256 = "1vb4x6h6bs3liq1bbnhs3ns0zrk4czy63zmkp1q075g7fq1fh7hw";
+       sha256 = "1c1ee80276e7950370b8b3fe61fc6764e60fb41d1adab5028e74e865a0e964ed";
        libraryHaskellDepends = [ base ihaskell ];
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for basic types";
@@ -77587,7 +77829,7 @@ self: {
      mkDerivation {
        pname = "ihaskell-blaze";
        version = "0.3.0.0";
-       sha256 = "1il3iz1nksh5v753srvchrjdazf7dqsd3q59w7crzbyrlx81v97b";
+       sha256 = "eba41d50a7d9af9fd9e1a9e0d1346ec77dd564866c673dcad905ea69c38f83c6";
        libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for blaze-html types";
@@ -77602,7 +77844,7 @@ self: {
      mkDerivation {
        pname = "ihaskell-charts";
        version = "0.3.0.0";
-       sha256 = "0nlimyx953v1s4xgzdb9987i9bw1bdralkg2x6cp41kzqd49i4f3";
+       sha256 = "c3919848c37f067299e9e24daa725b81af140f4a69b5ff3ad1618f92baaf915a";
        libraryHaskellDepends = [
          base bytestring Chart Chart-cairo data-default-class directory
          ihaskell
@@ -77620,7 +77862,7 @@ self: {
      mkDerivation {
        pname = "ihaskell-diagrams";
        version = "0.3.0.0";
-       sha256 = "0w1jzsrn9lpgrwbr1wsy7kqvkdbq5v21fm67gxif0xrv6hgavzca";
+       sha256 = "8afdad1e343b77e0627fc75417c42e78b5b9f13c5ef39017cfefd264b3fe3270";
        libraryHaskellDepends = [
          active base bytestring diagrams diagrams-cairo diagrams-lib
          directory ihaskell text
@@ -77635,7 +77877,7 @@ self: {
      mkDerivation {
        pname = "ihaskell-display";
        version = "0.1.0.0";
-       sha256 = "1cbfhv9kg33dj28mn6mhhi363pz9jr2kw4ph64ga1fiawlj563l0";
+       sha256 = "800e5324e52abaa01e31f0123e4596e9df614684b01a5b91906d8c37d3866eb1";
        libraryHaskellDepends = [ base classy-prelude ihaskell ];
        jailbreak = true;
        homepage = "http://www.github.com/gibiansky/IHaskell";
@@ -77648,10 +77890,9 @@ self: {
     ({ mkDerivation, base, HaTeX, ihaskell, text }:
      mkDerivation {
        pname = "ihaskell-hatex";
-       version = "0.2.0.0";
-       sha256 = "02ynqhirz8bblcfaxksgxxqgnkmxqazj8imwxc2gbrw2v3p0i39s";
+       version = "0.2.1.0";
+       sha256 = "11999ba26d5d09a1f51f88907ca52dcbff9b7714e3f8b66d2bb150cd975a1525";
        libraryHaskellDepends = [ base HaTeX ihaskell text ];
-       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for hatex";
        license = stdenv.lib.licenses.mit;
@@ -77664,7 +77905,7 @@ self: {
      mkDerivation {
        pname = "ihaskell-juicypixels";
        version = "0.3.0.0";
-       sha256 = "0apsll540z4hzzs39bqk14iadnr4rjp873q712la7lp2xnyf4k0y";
+       sha256 = "1e4ce2bcede2d2a3a808078f83aecc24dba6220913af34f4ff907c400aa5fa2a";
        libraryHaskellDepends = [
          base bytestring directory ihaskell JuicyPixels
        ];
@@ -77681,7 +77922,7 @@ self: {
      mkDerivation {
        pname = "ihaskell-magic";
        version = "0.3.0.0";
-       sha256 = "05jvyca163daqrmpb7fhk1wng04vk4bayffp0lp68sy3zskrjndl";
+       sha256 = "b45999a7fec36b642e05d739af16999b80677998d09d756bc6aa0d1314f35b16";
        libraryHaskellDepends = [
          base base64-bytestring bytestring ihaskell ipython-kernel magic
          text utf8-string
@@ -77699,7 +77940,7 @@ self: {
      mkDerivation {
        pname = "ihaskell-parsec";
        version = "0.3.0.0";
-       sha256 = "0n1awvn81228cci1q1rvy7p91zfl29byp5imkiwqbxswzz5sq8n4";
+       sha256 = "c422accbff5cf785799c3596eb5712d4fd90eef13b071c2263488880ece62a58";
        libraryHaskellDepends = [
          aeson base here ihaskell parsec random text unordered-containers
        ];
@@ -77715,7 +77956,7 @@ self: {
      mkDerivation {
        pname = "ihaskell-plot";
        version = "0.3.0.0";
-       sha256 = "17qp2ln9v4sv9i3biyxgyq0csqikxwm5gs612fn5zsl1ixznj1h1";
+       sha256 = "0106697f8f81ea5fac13c1e8572aef3362cd00f6affbb8464c5b939d2c15179f";
        libraryHaskellDepends = [ base bytestring ihaskell plot ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instance for Plot (from plot package)";
@@ -77731,7 +77972,7 @@ self: {
      mkDerivation {
        pname = "ihaskell-rlangqq";
        version = "0.3.0.0";
-       sha256 = "1w2ywl3m122d56cvgnhll6dpjw03y2jy3nc8v325291zhknrziaj";
+       sha256 = "52c59fed843f2451c4d888d9e1a5f00370799ba114dab799294d885007e55ef0";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring directory filepath
          ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat
@@ -77741,6 +77982,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ihaskell-widgets" = callPackage
+    ({ mkDerivation, aeson, base, containers, ihaskell, ipython-kernel
+     , nats, scientific, singletons, text, unix, unordered-containers
+     , vector, vinyl
+     }:
+     mkDerivation {
+       pname = "ihaskell-widgets";
+       version = "0.1.0.0";
+       sha256 = "342a68d3fb3d6ec75e8fe249c6c99863c02f3c242b705a7659a63ce3ed586652";
+       revision = "1";
+       editedCabalFile = "94521ebd405d3a25cbdc349cbc1a29ee14032e9829f2da4cddec71b29e47a92e";
+       libraryHaskellDepends = [
+         aeson base containers ihaskell ipython-kernel nats scientific
+         singletons text unix unordered-containers vector vinyl
+       ];
+       jailbreak = true;
+       homepage = "http://www.github.com/gibiansky/IHaskell";
+       description = "IPython standard widgets for IHaskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ihttp" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , contstuff, enumerator, netlines, network
@@ -77748,7 +78010,7 @@ self: {
      mkDerivation {
        pname = "ihttp";
        version = "0.3.0";
-       sha256 = "1rcv92cdy3g9v3qgr3zvjjj0c4d7k99n7ya0mym0bjj79wj4r5zm";
+       sha256 = "f5974c244f47ca05aaaf40f963539aa71106a494fb8ffcf0d8e90ddf98489be5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77767,7 +78029,7 @@ self: {
      mkDerivation {
        pname = "illuminate";
        version = "0.1";
-       sha256 = "16ijh2sadbayh3ldiagjq67xilhyv55qhqmmz8a73lbnlq3cphk5";
+       sha256 = "65c2cb06a676d17114fab562884bd91ed2d88fc1f2a9d8e8805eada6b480329a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77787,7 +78049,7 @@ self: {
      mkDerivation {
        pname = "image-type";
        version = "0.1.0.0";
-       sha256 = "0xr55c5g4jn1y83qy7bqa5ww9r73vw9clgln9ld893vypmb91wks";
+       sha256 = "7af29056bd7e8f841a4d963eca12dfe3e4c47951781d8f07f2c14af20a2b2577";
        revision = "1";
        editedCabalFile = "47033c893690f2cea85ba867343f277a8e2594f9010a5466a39dc7f3c4d682f2";
        libraryHaskellDepends = [ base bytestring ];
@@ -77801,7 +78063,7 @@ self: {
      mkDerivation {
        pname = "imagefilters";
        version = "0.1";
-       sha256 = "1n7awx8wsm6z0sp54jri3sp403n14wzr08vjj4a422q1lf306l3y";
+       sha256 = "7e500386a3010b4114917223903f27c10e40ae1e314b52ae06df54cd51e7ead8";
        libraryHaskellDepends = [ base gd ];
        homepage = "https://github.com/tchannel/imagefilters";
        description = "Image Filters (contrast, brightness, gaussian blur, etc)";
@@ -77817,7 +78079,7 @@ self: {
      mkDerivation {
        pname = "imagemagick";
        version = "0.0.3.5";
-       sha256 = "0vwmx86wpxr1f5jrwlqpvrb94dbrm0jjdqq6bppfnfyppd3s1mmq";
+       sha256 = "b8d6a047bbd73bebee5d06e32625a879359256de17539e657121f7cb0dea956f";
        revision = "1";
        editedCabalFile = "9666a02ba8aef32515f97734c86453b3b9759c46c6a9306be9f20dbdb6b98203";
        isLibrary = true;
@@ -77844,7 +78106,7 @@ self: {
      mkDerivation {
        pname = "imagepaste";
        version = "0.2.0.1";
-       sha256 = "1k512mw4a2hm6nzz2sn00rmkf7fb7mj4a2lk1klr1wmlchwimvpv";
+       sha256 = "fbee1a3964b4f290e90c930a45643dcb1d376b06c06af1bf35150a457815a1cc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -77864,7 +78126,7 @@ self: {
      mkDerivation {
        pname = "imagesize-conduit";
        version = "1.1";
-       sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i";
+       sha256 = "31c5784578b305921b89f7ab6fca35747e5a35f12884770b78c31e3a0a01ac19";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra exceptions
        ];
@@ -77883,7 +78145,7 @@ self: {
      mkDerivation {
        pname = "imapget";
        version = "0.0.3";
-       sha256 = "0h6kbh3z78xm1rjphyv7zkjc5knd7v9agss0b9rzarm1z4qd2q5v";
+       sha256 = "bb60d130f9a166f5735a40eba7d23ecdcec2e4fc677b78650eb5a3f3075cd340";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -77902,7 +78164,7 @@ self: {
      mkDerivation {
        pname = "imbib";
        version = "1.0.0";
-       sha256 = "0x31wjd6maqixr3rbangaph0s5skp18fmb8xgm1a6jsky8k367vz";
+       sha256 = "7f1f3326f2534ba3427d1dadea50b853170de055cfaa9547ee11ab6a9ae46174";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -77923,7 +78185,7 @@ self: {
      mkDerivation {
        pname = "imgurder";
        version = "1.2";
-       sha256 = "156a3fq274112j3a6lqiprwhgrcrjp3izix2z1s9bbx3c04pwrjx";
+       sha256 = "5d667e0960a3af9574f8a2c71fc79599e50779be1153a38614219023b01bca94";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77948,7 +78210,7 @@ self: {
      mkDerivation {
        pname = "imm";
        version = "0.6.0.3";
-       sha256 = "0fhqb36xj2xr1hhfrhk1npms9lnvbh6fmvki9mmm3gqs06hb925l";
+       sha256 = "b488b4a0011abf516b4d71eeea0c5cdbd2a4ebb561c2ec200cb90bd9cd58183a";
        revision = "1";
        editedCabalFile = "c14d5caa0066c05d15589dfbb663c5397bcb6d12ab4477de1d7572e3a16b132d";
        isLibrary = true;
@@ -77974,7 +78236,7 @@ self: {
      mkDerivation {
        pname = "immortal";
        version = "0.2";
-       sha256 = "1si9zh309xh29qrxkhb0shwisjrsja2d9lpj17dwlzn0gv0i1672";
+       sha256 = "e29810c17ec07ecadb09f2d2d484923a4b1d39d460c1d9334e02f60406fc29ea";
        libraryHaskellDepends = [
          base lifted-base monad-control transformers-base
        ];
@@ -77994,7 +78256,7 @@ self: {
      mkDerivation {
        pname = "imparse";
        version = "0.0.0.3";
-       sha256 = "15bpz985d39az15jn8hd6wcil7ivsi3vcnxi5lcfs34i848rs9fg";
+       sha256 = "cf259d1141910ced182db15bb647d43b1e1a19370d222b4bf82a8d5650fa7795";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78020,7 +78282,7 @@ self: {
      mkDerivation {
        pname = "implicit";
        version = "0.0.3";
-       sha256 = "0zsd25gd0c4sp1ipjnsbn1gbdl6s0y2vy8n4nwn3dxgrv75cd1l9";
+       sha256 = "8986c6cad9f9f5362cb7c422bf8507dad0b65eb04b5b7963b89a30d05e114d7f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78040,7 +78302,7 @@ self: {
      mkDerivation {
        pname = "implicit-params";
        version = "0.2.1";
-       sha256 = "1da01fnwxf1350ywawvl58qf479q2rz81wi9s8lvw2n3d75qpn8i";
+       sha256 = "11d98bcb69c30abe29d229f2807e16381de2302a7473c53d2823b8cead0b40b5";
        libraryHaskellDepends = [ base data-default-class ];
        homepage = "http://github.com/duairc/implicit-params";
        description = "Named and unnamed implicit parameters with defaults";
@@ -78052,7 +78314,7 @@ self: {
      mkDerivation {
        pname = "imports";
        version = "0.1.2.1";
-       sha256 = "1hm4dg07mw8cihkqziz827kwa3qqvgjg1y45r2lg66crsaanprgz";
+       sha256 = "ffe56b95d29919f3a8c885f8f0e4db180fc5e711e8c78f278c0cf17ac06ba4c2";
        libraryHaskellDepends = [ base directory filepath mtl ];
        testHaskellDepends = [ base directory filepath mtl ];
        jailbreak = true;
@@ -78066,7 +78328,7 @@ self: {
      mkDerivation {
        pname = "improve";
        version = "0.4.0";
-       sha256 = "0z8w7lgk263ickb4l3ajhvy1bjq38bbiiw6c048a3yn4h8kpg67a";
+       sha256 = "ea98772782c4faa11001ccf018d74203cb15fc86520d4ad6647118311f3d1c7d";
        libraryHaskellDepends = [ base mtl yices ];
        jailbreak = true;
        homepage = "http://github.com/tomahawkins/improve/wiki/ImProve";
@@ -78080,7 +78342,7 @@ self: {
      mkDerivation {
        pname = "inc-ref";
        version = "0.3.0.0";
-       sha256 = "0hr25bdwq2a1mj74wb8dvb95jyfqx13rz0h4makyb5kqlhxz40xl";
+       sha256 = "b403f23ba47896e5a7aa04829f47e8d87959d2da0d2d4e8eac4109ccdb2a2243";
        libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/jfischoff/inc-ref";
        description = "A STM reference useful for incremental computing";
@@ -78094,7 +78356,7 @@ self: {
      mkDerivation {
        pname = "inch";
        version = "0.2.0";
-       sha256 = "05f25yza05ib0xnkpfimhrb3nqyp5km85r1j9n6yh9k0cwdagndi";
+       sha256 = "b1d9a71a676026e88d4d32e482ea2cd7633b568635ba3b6d072b16a0be2fc215";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -78116,7 +78378,7 @@ self: {
      mkDerivation {
        pname = "include-file";
        version = "0.1.0.2";
-       sha256 = "0yrqvdp37wjw9j7vknzyiw4954yskxh75z8r3sic6qdmz17zv8ba";
+       sha256 = "6aa1fd4ff8b561c3a21e19fd72609fda9392088ffedbb98f4c5cf2336edb387b";
        libraryHaskellDepends = [ base bytestring template-haskell ];
        testHaskellDepends = [ base bytestring ];
        description = "Inclusion of files in executables at compile-time";
@@ -78131,7 +78393,7 @@ self: {
      mkDerivation {
        pname = "incremental-computing";
        version = "0.0.0.0";
-       sha256 = "0zdq122m0nq18igvdxis7lqgdflf6sc94m1aqypjwfkxy4qfvvq3";
+       sha256 = "03efed30f17d3a2eafc72a549298368ebaf6303d3af6b65f44015b508508b87d";
        libraryHaskellDepends = [
          base containers dlist fingertree order-maintenance transformers
        ];
@@ -78151,7 +78413,7 @@ self: {
      mkDerivation {
        pname = "incremental-parser";
        version = "0.2.3.4";
-       sha256 = "0n2318i4dzgcs9xcs80wcfbm9rc902w02nwqa30b3nrwl21cjag3";
+       sha256 = "e329c982a03cdbb1c050985b01b80089e55497631c20cd7ad2ecfd46220a4358";
        libraryHaskellDepends = [ base monoid-subclasses ];
        testHaskellDepends = [
          base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
@@ -78166,7 +78428,7 @@ self: {
      mkDerivation {
        pname = "incremental-sat-solver";
        version = "0.1.7";
-       sha256 = "1kic3q19lli8yd28szrngpfsqi50wc47k6597ay24zmiikhx4c2v";
+       sha256 = "5b30d2e18cb17e22bc3aa9987908e3a044acdd7d367f8d44f328529a021e2cce";
        libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://github.com/sebfisch/incremental-sat-solver";
        description = "Simple, Incremental SAT Solving as a Library";
@@ -78181,7 +78443,7 @@ self: {
      mkDerivation {
        pname = "increments";
        version = "0.1.0.4";
-       sha256 = "0dsand1y9f215fsikwr2601zxrzxpv85aka6f0gaaf0657mr4x9i";
+       sha256 = "317592eb290638a51e70464d55d0befde7fe033022f319b52b41b8e443b34a37";
        libraryHaskellDepends = [
          base beamable bytestring containers ghc-prim
        ];
@@ -78202,7 +78464,7 @@ self: {
      mkDerivation {
        pname = "indentation";
        version = "0.2.1.1";
-       sha256 = "1wb5kv0wx25hhg08afsqpzkkc8c981pbhp8wrzdclb4105y4l4vj";
+       sha256 = "72134a7c01812ccadacf1c5db86e40892136e7bf583b85c083b088cec19e65f1";
        libraryHaskellDepends = [ base mtl parsec parsers trifecta ];
        testHaskellDepends = [ base parsec tasty tasty-hunit trifecta ];
        homepage = "https://bitbucket.org/mdmkolbe/indentation";
@@ -78215,7 +78477,7 @@ self: {
      mkDerivation {
        pname = "indentparser";
        version = "0.1";
-       sha256 = "141bzmhdk5x2bzjx9g7hcf5p07h4q2vzzxlda8vf3dcgxgpdc7aw";
+       sha256 = "5c1dd6eeeb8fb5e136528df6ffb7c0041e708b63f0bcd4e55fa297d960fd2b90";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec ];
@@ -78229,7 +78491,7 @@ self: {
      mkDerivation {
        pname = "indents";
        version = "0.3.3";
-       sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
+       sha256 = "b61f51ac894609cb5571cc3ded12db5de97185a8de236c69ec24c87457109f9a";
        libraryHaskellDepends = [ base concatenative mtl parsec ];
        homepage = "http://patch-tag.com/r/salazar/indents";
        description = "indentation sensitive parser-combinators for parsec";
@@ -78241,7 +78503,7 @@ self: {
      mkDerivation {
        pname = "index-core";
        version = "1.0.2";
-       sha256 = "0sj69r9mavw1s17lhh7af9n5vrb60gk5lm6v593sp0rs77canldw";
+       sha256 = "bc51abd8393a83ab472adb545ae60366e55d6c72ea40484fd0816f55534e466a";
        revision = "1";
        editedCabalFile = "97808339bd2ac8a5c79ed99e716e2e8e941234421fde3930b370e0bbc734b063";
        libraryHaskellDepends = [ base ];
@@ -78256,7 +78518,7 @@ self: {
      mkDerivation {
        pname = "indexed";
        version = "0.1";
-       sha256 = "1dx5pyi5psjd2l26hc3wfsapnywdl0kqpw98b3jwc0xq4406ax12";
+       sha256 = "2274650021b803c6e55828f18b27a08d7b7b95767c306804154dea5ba2bfa5b7";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/reinerp/indexed";
        description = "Haskell98 indexed functors, monads, comonads";
@@ -78269,7 +78531,7 @@ self: {
      mkDerivation {
        pname = "indexed-do-notation";
        version = "0.1";
-       sha256 = "10yvbhjjzg19lyw9ynn2j1cyms2k4hxly5hmw0ad416f8zxmisf9";
+       sha256 = "c9e958fb47ce04d214e015164f3b2453e8ea5990c25a9fb8a729bc2f255cdb83";
        libraryHaskellDepends = [
          base haskell-src-meta indexed template-haskell
        ];
@@ -78283,7 +78545,7 @@ self: {
      mkDerivation {
        pname = "indexed-extras";
        version = "0.1.1";
-       sha256 = "0mhzk2smcli5mk6ghcxpbnq58adryf42s50qmqrj72sxsfd7a09r";
+       sha256 = "3901759ad35d8b2333ae18142d88f3b92954b05db733f8ccac255256b5981f56";
        libraryHaskellDepends = [ base bifunctors indexed mtl pointed ];
        jailbreak = true;
        homepage = "https://github.com/reinerp/indexed-extras";
@@ -78296,7 +78558,7 @@ self: {
      mkDerivation {
        pname = "indexed-free";
        version = "0.3.1";
-       sha256 = "1172vxhyzyf061mnlb8dndnvycjk3shxhiqd8hdz42ipv223admx";
+       sha256 = "bd363584d8370af21b440d47d8a11e5332bf6db30d2d6a6b30c0f9ef61dfe284";
        libraryHaskellDepends = [ base indexed ];
        homepage = "https://github.com/fumieval/indexed-free";
        description = "indexed monads for free";
@@ -78308,7 +78570,7 @@ self: {
      mkDerivation {
        pname = "indian-language-font-converter";
        version = "0.2";
-       sha256 = "1dw0fy3v2hfvlaw371af2c288v4p0wyg43h88clswids3nh1lpn8";
+       sha256 = "c85e1aa01dba45ae2943080ef23c07976c8404134e8533b8a2db41b1877780b7";
        libraryHaskellDepends = [ base gtk HDBC HDBC-sqlite3 ];
        description = "Indian Language Font Converter";
        license = stdenv.lib.licenses.bsd3;
@@ -78319,7 +78581,7 @@ self: {
      mkDerivation {
        pname = "indices";
        version = "1.7.1";
-       sha256 = "1sy609gq9idk5x28wasd9i61jwhlpf9ls21jps1nw1dfymid41c5";
+       sha256 = "8505d262f5ae056e83be32084d93bb1472194c4c4d2b8e442fb3c5845f02c6eb";
        libraryHaskellDepends = [ base tagged template-haskell ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Multi-dimensional statically bounded indices";
@@ -78334,7 +78596,7 @@ self: {
      mkDerivation {
        pname = "infer-upstream";
        version = "0.1.1.0";
-       sha256 = "11v8njjinjqzqfa5hggj0r1gki3hz6y7cxj5qfnzxa77hdav10fa";
+       sha256 = "ca81b05583e7a8feadc3457676bcf970c4f94206f23d5894c31f4b1ba5b46887";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -78355,7 +78617,7 @@ self: {
      mkDerivation {
        pname = "infernu";
        version = "0.0.0.1";
-       sha256 = "0m4azl5pxypnf3q9riwf1gkwlfwrw5dswgrr2y9j1myb812ag5qn";
+       sha256 = "1697a74440cbd7209317393fae5be1993bcae70b8ec79cf070f6fa7e0bfd8a54";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78373,7 +78635,7 @@ self: {
      mkDerivation {
        pname = "infinite-search";
        version = "0.12";
-       sha256 = "18sf9798nna155xix71lw68k19r7ayk9kmppjzd76yxa61r38g41";
+       sha256 = "813c347230aa7b73da97f7d699a65727a73091e1349c1e7b2941598bd2494ea3";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/infinite-search";
        description = "Exhaustively searchable infinite sets";
@@ -78386,7 +78648,7 @@ self: {
      mkDerivation {
        pname = "infinity";
        version = "0.3";
-       sha256 = "1d2l6a4ngawm7zqgfwxd19rh3zwihivbgns39q44yjh1d5v0azab";
+       sha256 = "4b7d057669014a4f084e43dbb7768491ff01730aad73f7f03f95ab67893254b4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -78402,7 +78664,7 @@ self: {
      mkDerivation {
        pname = "infix";
        version = "0.1.1";
-       sha256 = "156lcw4bvav9w41vggfjk84z41ppam31880wpislxwcsvc9jrd6q";
+       sha256 = "d8b42c13db9af14e75bc1c20144655f706f2099ad2bdb703e169abbd0867d494";
        libraryHaskellDepends = [ base containers haskell-src ];
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Infix expression re-parsing (for HsParser library)";
@@ -78417,7 +78679,7 @@ self: {
      mkDerivation {
        pname = "inflections";
        version = "0.2.0.0";
-       sha256 = "16s2sj2417qmhdlzn7j51yf7fh50f5msgb50fsavw80845602x43";
+       sha256 = "8374014c210820be9576a0aca76b71a040779c0f451efb6983159f4084d4429b";
        libraryHaskellDepends = [ base containers parsec ];
        testHaskellDepends = [
          base containers HUnit parsec QuickCheck test-framework
@@ -78433,7 +78695,7 @@ self: {
      mkDerivation {
        pname = "inflist";
        version = "0.0.1";
-       sha256 = "0srw75ds7hic0sjs2fnj0hsqsygzvppgy17y8qmsjz9z14ryqncw";
+       sha256 = "9c59ec33093f7da92b46fe04ffeeddff798d3504d23aa1a5062cc2a35b393c6b";
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "https://bitbucket.org/eegg/inflist";
@@ -78452,7 +78714,7 @@ self: {
      mkDerivation {
        pname = "influxdb";
        version = "0.9.1.3";
-       sha256 = "0v092i592j5n31fl0vc5750pqjbgaj10n3dm314bkll6ld0gdbwx";
+       sha256 = "9daff640a386d2b94818b50d0b82546f497c4139856d405d18b648914a14096c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78481,7 +78743,7 @@ self: {
      mkDerivation {
        pname = "informative";
        version = "0.1.0.20";
-       sha256 = "1xglpqwr4bc7rqaspq7w6pc9g5ilzvxfb6lfkji3inagg5xksl7n";
+       sha256 = "f6503d7b794fd938a29c8e9ae5fafe349697d835fce0ab15ce872d9239bef4f5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78506,7 +78768,7 @@ self: {
      mkDerivation {
        pname = "ini";
        version = "0.3.1";
-       sha256 = "01iwf4ifdx3mrw1rybj4crip4hmjxhab250rv995dgbwldh1iyqb";
+       sha256 = "0bfb1860a37cbd5652da1914b114ecb242726366442e9f03cf75f4e622713c06";
        libraryHaskellDepends = [
          attoparsec base text unordered-containers
        ];
@@ -78521,7 +78783,7 @@ self: {
      mkDerivation {
        pname = "inilist";
        version = "0.2.0.0";
-       sha256 = "1rr71yajc6j0idsqgna8mbnawiv6iw1x8kswkv7x2l0ih89r6y3a";
+       sha256 = "6a789313821150d1cf9e5c4fd4038f6647aeecaa48d987758b401a26950f27e7";
        libraryHaskellDepends = [
          base bifunctors containers safe trifecta
        ];
@@ -78542,7 +78804,7 @@ self: {
      mkDerivation {
        pname = "inject";
        version = "0.1.0";
-       sha256 = "0rm81xkxfwbm98ywcwjnh1l9qkah3xma59l8z5l37b458hayxjqq";
+       sha256 = "18cbee154485ac3368f988a6a26a1f504d9c68805672c63d4a7571d7670fa866";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base process text ];
@@ -78559,7 +78821,7 @@ self: {
      mkDerivation {
        pname = "inject-function";
        version = "0.2.1.0";
-       sha256 = "1iw82rzw2w3y40zndz3mxpa7k5ds8zs87ccvp228s4zva0mp5ddl";
+       sha256 = "b4b5722b50fb138d84b89bb183f447ba9579d4ed75fc663f207e70c17f1688c7";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/skypers/inject-function";
@@ -78577,7 +78839,7 @@ self: {
      mkDerivation {
        pname = "inline-c";
        version = "0.5.4.3";
-       sha256 = "03b15dz0bm26bv9jkpjdgmqii3fw1ifj6zwmysibir50jxlbx9pk";
+       sha256 = "f3a6be6897a0e4b8a2f6957f235d0cdc8d18717d4dde29d35e46d4057e2b610d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78600,7 +78862,7 @@ self: {
      mkDerivation {
        pname = "inline-c-cpp";
        version = "0.1.0.0";
-       sha256 = "0iba77p2ncxbg5sb4ks8f3lgp6zdnjhzvrr2ap3yg49is5b9f5rf";
+       sha256 = "2e179756d13191e7c75522e7fda1b4ed9bfbe870484fb27479ab332bee396a45";
        libraryHaskellDepends = [ base inline-c template-haskell ];
        testHaskellDepends = [ base ];
        description = "Lets you embed C++ code into Haskell";
@@ -78614,7 +78876,7 @@ self: {
      mkDerivation {
        pname = "inline-c-win32";
        version = "0.1";
-       sha256 = "14255dn7smmm1rpnjifn7gn2amcncnf3j45ah22bblyb4h27iikm";
+       sha256 = "75c6780424cbd3b58480aa10399c65965525ec3bd645696f0eb5567d6c2b4590";
        libraryHaskellDepends = [
          base containers inline-c template-haskell Win32
        ];
@@ -78628,7 +78890,7 @@ self: {
      mkDerivation {
        pname = "inquire";
        version = "0.1";
-       sha256 = "18qcjdwgn7a1lrdnqnh6sh1bzii0nvb5jv56qq5kri8m6qwc9wl8";
+       sha256 = "88f2c4383615c53c0bc6a66c59d6b620c6bf02d4065a6c5ba6411dfb78930ca3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ aether base text ];
@@ -78643,7 +78905,7 @@ self: {
      mkDerivation {
        pname = "inserts";
        version = "0.1.2";
-       sha256 = "1m72ysfd2g2jszvcihh7zbfxvpj2a8qjq3ra4vs4bjzpja4kh477";
+       sha256 = "e710388992f7cb45f4262a0f2c315242deddddfa07c2c8f6d7523cd19cf6e2d4";
        libraryHaskellDepends = [ attoparsec base bytestring dlist ];
        jailbreak = true;
        homepage = "http://github.com/tel/inserts";
@@ -78658,7 +78920,7 @@ self: {
      mkDerivation {
        pname = "inspection-proxy";
        version = "0.1.0.3";
-       sha256 = "09mk2wd4bs31zhz0x8z3ajlk734r0rp5k07g0mfdy4bsvi2hdqiy";
+       sha256 = "3ee20645dc7a11df5c05ef80596e06998c33a954e3a30e3efc61e8451a17b326";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -78674,12 +78936,13 @@ self: {
      }:
      mkDerivation {
        pname = "instant-aeson";
-       version = "0.1.0.1";
-       sha256 = "18zxvd4sw13j4gn2f7r2xdy6p0xayjv3ks8j97j7vi6cdw9aqw2z";
+       version = "0.2";
+       sha256 = "98d43d18aec3de9bd52c9c162eabbc736d4a50ad27fd5a9ade54888b5f6ba222";
        libraryHaskellDepends = [ aeson base instant-generics ];
        testHaskellDepends = [
          aeson base instant-generics tasty tasty-quickcheck
        ];
+       homepage = "https://github.com/k0001/instant-aeson";
        description = "Generic Aeson instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78690,12 +78953,13 @@ self: {
      }:
      mkDerivation {
        pname = "instant-bytes";
-       version = "0.1.0.1";
-       sha256 = "1g99yakjychx12amls2b6cfma0fzh0n9w4m2k03wqibk1aagl940";
+       version = "0.2";
+       sha256 = "e70cc805ca399ac0e413a30de053c5abbce7f4d2698f49976d299fdd2074f9f5";
        libraryHaskellDepends = [ base bytes instant-generics ];
        testHaskellDepends = [
          base bytes instant-generics tasty tasty-quickcheck
        ];
+       homepage = "https://github.com/k0001/instant-bytes";
        description = "Generic Serial instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78704,9 +78968,10 @@ self: {
     ({ mkDerivation, base, deepseq, instant-generics }:
      mkDerivation {
        pname = "instant-deepseq";
-       version = "0.1.0.1";
-       sha256 = "1yv5zqv2fqj8b7qzx2004sa287mrvrswmghl13vsbj2whmdh0kjz";
+       version = "0.2";
+       sha256 = "606ffaffb09ad1bb1d766499a589b16531e9a4c7978734a349975248a4e60e21";
        libraryHaskellDepends = [ base deepseq instant-generics ];
+       homepage = "https://github.com/k0001/instant-deepseq";
        description = "Generic NFData instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78716,7 +78981,7 @@ self: {
      mkDerivation {
        pname = "instant-generics";
        version = "0.5";
-       sha256 = "174avn0jjxv4h04m6k85gvv6x3kvrlwhcbhqg9ih0ps5mp7crmvr";
+       sha256 = "79d7cccead455f00637a182e0639cd7b8e6ef67e054d53098064772981dd8a9c";
        revision = "1";
        editedCabalFile = "c69a74fef28272e5e46a0e37711bb980ac07d2f3feeed3513da1cc572a1ab6bc";
        libraryHaskellDepends = [ base containers syb template-haskell ];
@@ -78729,9 +78994,10 @@ self: {
     ({ mkDerivation, base, hashable, instant-generics }:
      mkDerivation {
        pname = "instant-hashable";
-       version = "0.1.0.1";
-       sha256 = "1yaf24r68zh5vsp73747hbv2fdk9y9vgswj6lv22s52s8h6f1agj";
+       version = "0.2";
+       sha256 = "8bf851b902126e91845e28cf6443d119ce675724c2e664562f8dd76664403a77";
        libraryHaskellDepends = [ base hashable instant-generics ];
+       homepage = "https://github.com/k0001/instant-hashable";
        description = "Generic Hashable instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78741,7 +79007,7 @@ self: {
      mkDerivation {
        pname = "instant-zipper";
        version = "0.0.0";
-       sha256 = "0gd5hzlm5rlmzba2dl37al711vp1nn2b30d36rvb2j8y90y8c44c";
+       sha256 = "8c10863c481e49b17636a381b184b5e1ee100e5567d026d4fa95e652e987a53d";
        revision = "1";
        editedCabalFile = "a0e15510d3e3eefaa18d20fbfce7a1840519e160e2a8a8b36c498a3664b9c037";
        libraryHaskellDepends = [ base instant-generics mtl ];
@@ -78756,7 +79022,7 @@ self: {
      mkDerivation {
        pname = "instinct";
        version = "0.1.0";
-       sha256 = "0wh95zjdv9j1n3ccg2j08av43qnb9vmiyvqvyi70p47dr481npl8";
+       sha256 = "885e1b10c9ed900b4ef41b6f1feb4ecbe241b642408ac7d8b041a6dde42f0972";
        libraryHaskellDepends = [ base containers mersenne-random vector ];
        description = "Fast artifical neural networks";
        license = stdenv.lib.licenses.bsd3;
@@ -78767,7 +79033,7 @@ self: {
      mkDerivation {
        pname = "instrument-chord";
        version = "0.1.0.9";
-       sha256 = "0gq79i1mqpbyvxm8cfpr2b8h0knbc6f2m3b3mnm0p3yvi2d642nb";
+       sha256 = "cb0a629a88db8f0baaad638d2a9c61cb4e00d112f93a866adf7e5d5c434c073f";
        libraryHaskellDepends = [ array base containers music-diatonic ];
        homepage = "https://github.com/xpika/chord";
        description = "Render Instrument Chords";
@@ -78781,7 +79047,7 @@ self: {
      mkDerivation {
        pname = "int-cast";
        version = "0.1.2.0";
-       sha256 = "0gfx3pg0n1jyn8z2q804iyc24ahi41sjr3h7v5ivzc3g57vi1ykb";
+       sha256 = "6bfa10f7296fb0bf63d9078e2c7520112a22988f04202c3eb25e060bde1ddd3d";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -78797,7 +79063,7 @@ self: {
      mkDerivation {
        pname = "integer-gmp";
        version = "1.0.0.0";
-       sha256 = "0sh01sbib7z0bx934a7gq6583hdz8yncaxpfi9k8y4v18gm8j55f";
+       sha256 = "ae1489ea4361138f668aee76c5ac47bfc1818ac1ef2832525fe09f15970e006a";
        revision = "1";
        editedCabalFile = "5d63fab9a7c94b4e713d151bdc0c361228efbac2b7583dfa8e6c5370ecae5663";
        libraryHaskellDepends = [ ghc-prim ];
@@ -78810,7 +79076,7 @@ self: {
      mkDerivation {
        pname = "integer-pure";
        version = "1.0";
-       sha256 = "0lrhf6mw90bfph3hbyxv3n7g2n2xnjfq4qnhyhw4ml76k4yybmxa";
+       sha256 = "aad7e53d99e6d04a38f4d062829db45d58f18e1dbbfb0507bc6e81c4ab713053";
        homepage = "http://projects.haskell.org/~malcolm/integer-pure";
        description = "A pure-Haskell implementation of arbitrary-precision Integers";
        license = stdenv.lib.licenses.bsd3;
@@ -78822,7 +79088,7 @@ self: {
      mkDerivation {
        pname = "integration";
        version = "0.2.1";
-       sha256 = "0bsqad6q4kc0wykswwqykcn6nd4wj6yd9dzpg075h2n1mmg3h9qc";
+       sha256 = "0c27385eadc10a580e78f7b7d4bc919c346b2c9b1e73aea7e7804d824d53582f";
        libraryHaskellDepends = [ base parallel ];
        homepage = "https://github.com/ekmett/integration";
        description = "Fast robust numeric integration via tanh-sinh quadrature";
@@ -78837,7 +79103,7 @@ self: {
      mkDerivation {
        pname = "intel-aes";
        version = "0.2.1.1";
-       sha256 = "11cy9dlynlz9mgbs4w4xfjb9dx05dklfjl3gg2130si8q2kk3cm9";
+       sha256 = "a9b231a7c0286a3082786f50e9e86c05f49696749d70a2d7abe953eb694b9e85";
        libraryHaskellDepends = [
          base bytestring cereal crypto-api DRBG largeword process random
          rdtsc split tagged time unix
@@ -78854,7 +79120,7 @@ self: {
      mkDerivation {
        pname = "interchangeable";
        version = "0.2.0.0";
-       sha256 = "1r0gxwbl2k4i9r7jlbmabr1088q8nk1an4nhf79gsx2ybfdzlndh";
+       sha256 = "b059fa9b5b5e74fdd271d012abc2b4082304425eaa2e2a4f4e914c4117ef0fe4";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/arowM/interchangeable";
        description = "A type class for interchangeable data";
@@ -78866,7 +79132,7 @@ self: {
      mkDerivation {
        pname = "interleavableGen";
        version = "0.0.1";
-       sha256 = "10clafccpg8xciqhj2hzbi4kixzprgp733396qf531nwakvnqpp2";
+       sha256 = "e25e6cf754dc86511c36698c71eecbf7f738495c1f0a0971641dbdcb98539481";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory haskell-src hint mtl ];
@@ -78880,7 +79146,7 @@ self: {
      mkDerivation {
        pname = "interleavableIO";
        version = "0.0.1";
-       sha256 = "19jdrfr6n6yzvj1i8r7hhr3k6zkkbrs6pizqcbzhb0nvzzshmqa8";
+       sha256 = "48e10af5ffdb8205ff62f8c76b745e737e334786f0641483dcdf1b6bb2cb4da6";
        libraryHaskellDepends = [ base mtl ];
        description = "Use other Monads in functions that asks for an IO Monad";
        license = "unknown";
@@ -78892,7 +79158,7 @@ self: {
      mkDerivation {
        pname = "interleave";
        version = "1.0";
-       sha256 = "062ixqbrrmamwv3fj6vpfcxy35p37i1wpmsxk1gl9n06n0lg9a8c";
+       sha256 = "0ca9f428b006d8445f985dd7cb433ce396e13b73771be9c6e655d59c17ee5118";
        libraryHaskellDepends = [ base ];
        description = "Combinators for supporting interleaving of different behaviours";
        license = stdenv.lib.licenses.bsd3;
@@ -78903,7 +79169,7 @@ self: {
      mkDerivation {
        pname = "interlude";
        version = "0.1.2";
-       sha256 = "1yiv24n0mfjzbpm9p6djllhwck3brjz9adzyp6k4fpk430304k7s";
+       sha256 = "fa4c020618645e47a6b9fe3795becc6b4cc621a5b2999bea5d5fba0a2c113bfa";
        libraryHaskellDepends = [ base ];
        homepage = "http://malde.org/~ketil/";
        description = "Replaces some Prelude functions for enhanced error reporting";
@@ -78917,7 +79183,7 @@ self: {
      mkDerivation {
        pname = "intern";
        version = "0.9.1.4";
-       sha256 = "0snjar5mil9zsyy1ml13a8p1g2cvq62c5r8547i6z451w06j1zk0";
+       sha256 = "60fe200de0a1906fe22105e5c284c19b89172e5223d01abcd73fd1584b56d26a";
        libraryHaskellDepends = [
          array base bytestring hashable text unordered-containers
        ];
@@ -78933,7 +79199,7 @@ self: {
      mkDerivation {
        pname = "internetmarke";
        version = "0.0.3";
-       sha256 = "1gn6vvrnhck9f9hzs8igdg20gvrvjnba00bj191paw02kpzbgx7z";
+       sha256 = "fff4b7fe9d027075430a7201a096953bef07c46b2f22fd6172693268f3dec6be";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -78953,7 +79219,7 @@ self: {
      mkDerivation {
        pname = "interpol";
        version = "0.2.3";
-       sha256 = "11awkl6rgy33yl4qcnf7ns464c87xjk9hqcf10z8shjjbaadbz43";
+       sha256 = "83fcd5945a52428d3e088e6198a6ec07316288b6c7598609f563f8970d9d5c85";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -78976,7 +79242,7 @@ self: {
      mkDerivation {
        pname = "interpolate";
        version = "0.1.0";
-       sha256 = "0wlc10qd1bq3xj64a3yq2gzds9kas9zyylkm9kxd46gy35fns6id";
+       sha256 = "2d1a6d5d19fe19d2fa4c7552ef7fd26a26ddfe13d80f458cec03afd030088c72";
        libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
        testHaskellDepends = [
          base bytestring haskell-src-meta hspec QuickCheck
@@ -78993,7 +79259,7 @@ self: {
      mkDerivation {
        pname = "interpolatedstring-perl6";
        version = "1.0.0";
-       sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35";
+       sha256 = "65e0b2ad2d7482755570637212417b84d1db3bcc3cd1aa348b6b37f57911a1d3";
        libraryHaskellDepends = [
          base bytestring haskell-src-meta template-haskell text
        ];
@@ -79007,7 +79273,7 @@ self: {
      mkDerivation {
        pname = "interpolatedstring-qq";
        version = "0.2";
-       sha256 = "1bqn9gqc43r158hyk35x8avsiqyd43vlpw2jkhpdfmr2wx29jprq";
+       sha256 = "385f9944e72257d72e9c52f04bf720cde3a8b742bd8ce9212a210fc2f04b16af";
        libraryHaskellDepends = [
          base haskell-src-meta-mwotton template-haskell
        ];
@@ -79022,7 +79288,7 @@ self: {
      mkDerivation {
        pname = "interpolatedstring-qq-mwotton";
        version = "0.1.1";
-       sha256 = "1cwhy4jwbl50nglfw0wfmdr3rrg33dqskw0wq06prx14x22yshbk";
+       sha256 = "7341ed85e824f47c0dc01cf0a9711be3e53c72ab8e03eee8b3a0d0c525f190b3";
        libraryHaskellDepends = [
          base haskell-src-meta-mwotton template-haskell
        ];
@@ -79037,7 +79303,7 @@ self: {
      mkDerivation {
        pname = "interpolation";
        version = "0.1";
-       sha256 = "1yip0fjhmd9gf9w7qi4yfpq38m51jn0i52zxil2hfc49r5aydlya";
+       sha256 = "cad3e655c9893007058dfd8b128195a15434f0759e447c78722fb50aa50337fa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base utility-ht ];
@@ -79057,7 +79323,7 @@ self: {
      mkDerivation {
        pname = "intervals";
        version = "0.7.1";
-       sha256 = "03ra3jkch26x4crsq6nh2wnj51jrx7zmwafmq22xqrpsg7hpav92";
+       sha256 = "226d75e179fa66dc85c0d5295effe95986222d17d01aac3323dd08c8a61c2a0f";
        libraryHaskellDepends = [ array base distributive ghc-prim ];
        testHaskellDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/ekmett/intervals";
@@ -79074,7 +79340,7 @@ self: {
      mkDerivation {
        pname = "intricacy";
        version = "0.5.5";
-       sha256 = "0jlqxd7nwh3yvy5pni3w4a19wvn2xdrhhhfm9xkf4cs2rqnz525q";
+       sha256 = "b888f22dce4233e2664fd5410873ebc26e9e82227c447b8bdf7e406e4feb984a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -79095,7 +79361,7 @@ self: {
      mkDerivation {
        pname = "intset";
        version = "0.1.1.0";
-       sha256 = "044nw8z2ga46mal9pr64vsc714n4dibx0k2lwgnrkk49729c7lk0";
+       sha256 = "60d2c3923889cc99ede3544cd0576cc4927098dec4e49ba8aa86a8273ee29610";
        libraryHaskellDepends = [ base bits-extras bytestring deepseq ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -79115,7 +79381,7 @@ self: {
      mkDerivation {
        pname = "invariant";
        version = "0.2";
-       sha256 = "0zxzpbha3z4z23xmsbgajjxk477ad1v28ml3rry0102lpcpvl6j1";
+       sha256 = "411aba2fbb5480007cce8356247668ea1c32bb94ea2d5dfb109ffca1e0babf7f";
        libraryHaskellDepends = [
          array base bifunctors containers contravariant ghc-prim profunctors
          semigroups stm tagged template-haskell transformers
@@ -79132,7 +79398,7 @@ self: {
      mkDerivation {
        pname = "invertible-syntax";
        version = "0.2.1";
-       sha256 = "0kyi7gq0a792v4lwmpq8i56vzwk6g7cjc3lbpxch47jsqv8lfhbp";
+       sha256 = "774147d1c65a1e0259bf8b0e26d97966f2bf4d8908dfca29d9221d05f03bd14f";
        libraryHaskellDepends = [ base partial-isomorphisms ];
        homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse";
        description = "Invertible syntax descriptions for both parsing and pretty printing";
@@ -79144,7 +79410,7 @@ self: {
      mkDerivation {
        pname = "io-capture";
        version = "0.3";
-       sha256 = "03kjjsz1i1viwngmq9mvkzd43490g93mbkcvgjvcway2z5prv06f";
+       sha256 = "ce809d6ff9c22bceb67c9bcd55477a209141da9fbb265c9fe5718718be96720e";
        libraryHaskellDepends = [ base unix ];
        description = "capture IO action's stdout and stderr";
        license = stdenv.lib.licenses.bsd3;
@@ -79157,7 +79423,7 @@ self: {
      mkDerivation {
        pname = "io-choice";
        version = "0.0.5";
-       sha256 = "19nr8kxcg98510cqgjn4c9sd8i9yz8fv4ryqg6lzzgpwqzkvx5ph";
+       sha256 = "f096bee7c7fcbeffa979d867b21dfa3e45d47462c4ca87190805a5c7fa44d9a6";
        libraryHaskellDepends = [
          base lifted-base monad-control template-haskell transformers
          transformers-base
@@ -79174,7 +79440,7 @@ self: {
      mkDerivation {
        pname = "io-manager";
        version = "0.1.0.2";
-       sha256 = "0f21h36z2ls0d6g31pcf4kcyfninaxws8w159zy33bwa19saf2mz";
+       sha256 = "bf0aa7740a8aaf31fc4f2570a47957365ae7d9248edd309e694053f1cd804138";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -79188,7 +79454,7 @@ self: {
      mkDerivation {
        pname = "io-memoize";
        version = "1.1.1.0";
-       sha256 = "0ga85wdvz67jjx8qh6f687kfikcrfmp7winn13v6na7vlaqs2ly7";
+       sha256 = "c753a1b1a2fb286bf608d6467e6e7599cde8e641c619885197f298bf1b2f483d";
        libraryHaskellDepends = [ async base ];
        homepage = "https://github.com/DanBurton/io-memoize";
        description = "Memoize IO actions";
@@ -79200,7 +79466,7 @@ self: {
      mkDerivation {
        pname = "io-reactive";
        version = "0.1.1";
-       sha256 = "09iq8c86ql0hmzdf7i82lpdqa6nn6r0zy9lgryd6chkxd0kcpgvn";
+       sha256 = "76bfcb26687d42669acf8f26ff4136d61a85dba502c5e3daaf10506c10433826";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -79215,7 +79481,7 @@ self: {
      mkDerivation {
        pname = "io-region";
        version = "0.1.1";
-       sha256 = "1w8m21zkhbhqr9lsdzwxfpy0jhb2ciybn3bvhyp3zlxkq9k3yc7f";
+       sha256 = "ee303f66c2b3d33fae877b0dbb7c64624109fc759dffa669ca182e387f1015f1";
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base hspec transformers ];
        homepage = "https://github.com/Yuras/io-region/wiki";
@@ -79228,7 +79494,7 @@ self: {
      mkDerivation {
        pname = "io-storage";
        version = "0.3";
-       sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs";
+       sha256 = "9a0df5cc7ff2eeef11e29e1362fea284f535bc2fe67469bba6dbc41c4f5b49bd";
        libraryHaskellDepends = [ base containers ];
        homepage = "http://github.com/willdonnelly/io-storage";
        description = "A key-value store in the IO monad";
@@ -79245,7 +79511,7 @@ self: {
      mkDerivation {
        pname = "io-streams";
        version = "1.3.2.0";
-       sha256 = "0gqj2adc3zlwz81wy38y8x4rihvhk4zm9xb0rd04a77nn15xlc0y";
+       sha256 = "1e30da4bb0f61c4540cb60f5543f9970c39849471e0dcf03fa9cfec19a12123f";
        configureFlags = [ "-fnointeractivetests" ];
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder network primitive
@@ -79268,7 +79534,7 @@ self: {
      mkDerivation {
        pname = "io-streams-http";
        version = "0.2.1.2";
-       sha256 = "0ra3z236d4mbw2vqlx4zxpa5z53a7k1j2pmkwf3075ghgdavrmk3";
+       sha256 = "63d6bc557bf0950386e3b35e21c33c6a945fd4ed9f748ab7e0ab926686f84365";
        libraryHaskellDepends = [
          base bytestring http-client http-client-tls io-streams mtl
          transformers
@@ -79282,7 +79548,7 @@ self: {
      mkDerivation {
        pname = "io-throttle";
        version = "0.1.0";
-       sha256 = "043plb9n606hkbdjddgk9kg12fzzs7ry063ckiky4zymy2vprcj9";
+       sha256 = "49b27cb7f0d57fe2679c6c18e0f3d1ff3b11de4cf3b526db9ad00063d3a27710";
        revision = "1";
        editedCabalFile = "c3903532515f76e374229ea572d11f7ab02a560062425f33649399c5ac61a16e";
        libraryHaskellDepends = [ base SafeSemaphore threads ];
@@ -79297,7 +79563,7 @@ self: {
      mkDerivation {
        pname = "ioctl";
        version = "0.0.1";
-       sha256 = "0rwh7mlwdd24ndzz4b4vd5b5daz9cga47m9nz6g75m03iyy237qs";
+       sha256 = "1a9f21bc8f03d4729ef936d543d463e9ab5656699b2cf27fb344b4c6693d9067";
        libraryHaskellDepends = [ base network unix ];
        description = "Type-safe I/O control package";
        license = stdenv.lib.licenses.mit;
@@ -79308,7 +79574,7 @@ self: {
      mkDerivation {
        pname = "iothread";
        version = "0.1.0.0";
-       sha256 = "1nvysb0nmx42q0ilr09nzbsmr7mbbclhgl0iikibhhfb34r2afx0";
+       sha256 = "a03b253219cb41b8e28c11d007295bab9e5cf5fa36814c23c082f46ac1d27edb";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/tattsun/iothread";
@@ -79321,7 +79587,7 @@ self: {
      mkDerivation {
        pname = "iotransaction";
        version = "0.1";
-       sha256 = "0ylwrim2wfx3v03syd8v0iwf9kbw9154wlxsp8wc1d3n6sz7p1cc";
+       sha256 = "8c857bbe3676b4c038baba534e4a487ccde478041b35af07d8a33b2e6acc9c7a";
        libraryHaskellDepends = [ base ];
        homepage = "https://bitbucket.org/dshearer/iotransaction/";
        description = "Supports the automatic undoing of IO operations when an exception is thrown";
@@ -79336,7 +79602,7 @@ self: {
      mkDerivation {
        pname = "ip-quoter";
        version = "1.0.1.1";
-       sha256 = "1819742yjdl96k2z8s55a5x9xw9mg4lps1dq1f55zvc31afkdi4l";
+       sha256 = "94c4369d0a83ed5f8a0bb8057d297935f19e7a51a568f4c5348936e9053929a0";
        libraryHaskellDepends = [ base cpu network template-haskell ];
        testHaskellDepends = [ base cpu network tasty tasty-hunit ];
        homepage = "https://github.com/shlevy/ip-quoter";
@@ -79349,7 +79615,7 @@ self: {
      mkDerivation {
        pname = "ip6addr";
        version = "0.5.0.1";
-       sha256 = "08nwzas5r3b47chldc3dmwmwxam5dlmsyqqqmql7rjm87h645di4";
+       sha256 = "24b6420c3ca8ca7c28ae1863af2b6da5aace2baf6db046213b648d5cb4fadc22";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs IPv6Addr text ];
@@ -79365,7 +79631,7 @@ self: {
      mkDerivation {
        pname = "ipatch";
        version = "0.1.1";
-       sha256 = "19yf0b82ifplja05if38llfs38mzmxxald89jc2yzqzzkvws9ldq";
+       sha256 = "b8d1a4f99effe3ef05930935aa7aafbfa2a11da568b8588092f4ba28d002cea7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -79385,7 +79651,7 @@ self: {
      mkDerivation {
        pname = "ipc";
        version = "0.0.5";
-       sha256 = "0d1w62181s21ks63548i3jdfk4k1rg0hssnhkm97ymkrlcz6w68d";
+       sha256 = "0d196e3ea379567f529dd06a0dc1cb6192e99a1c1191328c9e41e88082303c34";
        libraryHaskellDepends = [
          base binary bytestring dlist mtl network network-bytestring stm
        ];
@@ -79401,7 +79667,7 @@ self: {
      mkDerivation {
        pname = "ipcvar";
        version = "0.0.1";
-       sha256 = "085p03xk29wk03yfshpjvzkf2z79byhp9yy81vra1aci9nkgjr3n";
+       sha256 = "7664f9a64d91a9a0f20ec8fb74a15fe97ce1e6dff242edfc00932731fb00b720";
        libraryHaskellDepends = [ base binary bytestring directory unix ];
        testHaskellDepends = [ base hspec unix ];
        description = "Simple inter-process communication through IPCVars";
@@ -79416,7 +79682,7 @@ self: {
      mkDerivation {
        pname = "ipopt-hs";
        version = "0.5.0.0";
-       sha256 = "03cpn73ybkifkbl8dxbpyh17gv71jx9x53pkhi9wbfpqqz2ail9c";
+       sha256 = "2cd1a8c4c7f8bac55384f38ed25397e1ec7702f477f586e89a2ecee5c7b1970d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79435,7 +79701,7 @@ self: {
      mkDerivation {
        pname = "ipprint";
        version = "0.5";
-       sha256 = "0h75k21blbnzvp5l20qsima557dx6zfrww79y7qsqf04pbd81j7s";
+       sha256 = "fac880daba0438acf1f1e9709edd37bd9d52548d1a0341cbdddf2eba8298e540";
        libraryHaskellDepends = [ base Extra haskell-src ];
        description = "Tiny helper for pretty-printing values in ghci console";
        license = stdenv.lib.licenses.bsd3;
@@ -79448,7 +79714,7 @@ self: {
      mkDerivation {
        pname = "iproute";
        version = "1.5.0";
-       sha256 = "0mr5dwzvsik5v59fy5lpnj6qabgc8cwbybil5hb6gqqvd0y26fz3";
+       sha256 = "e33b233c681be367162c342ebf3843ec2d858db49716ef52d96546bd3f6f2557";
        revision = "1";
        editedCabalFile = "f601b3319004e7b4a4636c89996ea78fd084e9b10d15d679d7ae58e822fe19b8";
        libraryHaskellDepends = [
@@ -79470,7 +79736,7 @@ self: {
      mkDerivation {
        pname = "iptables-helpers";
        version = "0.5.0";
-       sha256 = "13xv7g349ssgbz9c0g8q77hf52gp0v7nw9q665l697237jbvl57j";
+       sha256 = "f214ba973c439c64683106276ecf06f789e2e039183dc0d25f4feb44c63bbb8f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79493,7 +79759,7 @@ self: {
      mkDerivation {
        pname = "iptadmin";
        version = "1.3.4";
-       sha256 = "1ksnypq95xaybsb3vvhmabrh8l3c2c3mcqz83a61md9c1vw3n94m";
+       sha256 = "95243bf80e2cb51a8c1ae8635607136c5004f35215ee3d965e5ef592f0f556cf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -79517,8 +79783,8 @@ self: {
      }:
      mkDerivation {
        pname = "ipython-kernel";
-       version = "0.6.1.0";
-       sha256 = "1dmmrkph3myc67wp4ibx2l10dkxpkgzh7i4shbjbqag39ljb0q60";
+       version = "0.6.1.2";
+       sha256 = "1431c7442b9081dd9169348b36f0befafeedca8a773b8d5349518b39fde1e4e2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79541,7 +79807,7 @@ self: {
      mkDerivation {
        pname = "irc";
        version = "0.6.1.0";
-       sha256 = "1q9p2qwfy9rsfyaja4x3gjr8ql2ka2ja5qv56b062bdkvzafl5iq";
+       sha256 = "3816ead4dfb32d61c03265e3a2a45053508cb27ca3132595773a27ef381637e1";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -79556,7 +79822,7 @@ self: {
      mkDerivation {
        pname = "irc-bytestring";
        version = "0.1";
-       sha256 = "09n4y93x74wblbz89s1hwzmanwwi72cj0baz72485svarg55kid7";
+       sha256 = "a7c559cacb6aeb8288385f2d2099389173abeae730e884fea28b93d347f2c426";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        homepage = "https://github.com/kallisti-dev/irc-bytestring";
        description = "serialization and parsing of IRC messages";
@@ -79571,7 +79837,7 @@ self: {
      mkDerivation {
        pname = "irc-client";
        version = "0.2.4.0";
-       sha256 = "137ix1x2qy92v5naaq3lz3iyvbxvf32gnsq09flddadx88d51vv6";
+       sha256 = "66ef501a42bda9d6a84b006bfbc470bbafede3f87460a56cd922792c7ae8f18c";
        libraryHaskellDepends = [
          base bytestring conduit data-default-class irc-conduit irc-ctcp
          old-locale stm stm-conduit text time transformers
@@ -79586,7 +79852,7 @@ self: {
      mkDerivation {
        pname = "irc-colors";
        version = "0.1";
-       sha256 = "1xl38bq1b6w7z8q0frra4h76lyk63bsy5i1qd34pdgwvikd2rkh0";
+       sha256 = "00ce2cda8c9bbf76c96838c4e2f51a667a6a0e242a670730fa879b15f04283f6";
        libraryHaskellDepends = [ base text ];
        description = "Colourize your IRC strings";
        license = stdenv.lib.licenses.bsd3;
@@ -79600,7 +79866,7 @@ self: {
      mkDerivation {
        pname = "irc-conduit";
        version = "0.1.2.0";
-       sha256 = "1mw418frhbnk7gncilvb2c3cj4fvzm5fvafq0p28vggxisda9bkp";
+       sha256 = "77aea49a8efdbd8dc405d8a9ed4afddb11c906136bd3c8ec3bd32e981d0a84d7";
        libraryHaskellDepends = [
          async base bytestring conduit conduit-extra connection irc irc-ctcp
          network-conduit-tls text time tls transformers x509-validation
@@ -79621,7 +79887,7 @@ self: {
      mkDerivation {
        pname = "irc-core";
        version = "1.1.0.1";
-       sha256 = "01n10wcnq4h2wpmxl1rh9zgqayk3mllbz563fg8qw1k01n7q9257";
+       sha256 = "a788848f0d60068ed173c394bf28ad637a85df4f3007daebe502126c1907c106";
        revision = "3";
        editedCabalFile = "a2be33ee630d69381c0103cf25743005688f53220d02552cc99ed7131eefdadf";
        isLibrary = true;
@@ -79636,6 +79902,7 @@ self: {
          network old-locale split stm text time tls transformers vty x509
          x509-store x509-system x509-validation
        ];
+       jailbreak = true;
        homepage = "https://github.com/glguy/irc-core";
        description = "An IRC client library and text client";
        license = stdenv.lib.licenses.bsd3;
@@ -79646,19 +79913,48 @@ self: {
      mkDerivation {
        pname = "irc-ctcp";
        version = "0.1.3.0";
-       sha256 = "16mp9dpp57id760zc932dszd5r1ncskwwxrp0djka5r1alddjz6n";
+       sha256 = "d67cd91a5521173565033777cea76636e4d2be6e6224f681392d9e726f4bb79a";
        libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/barrucadu/irc-ctcp";
        description = "A CTCP encoding and decoding library for IRC clients";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-fun-bot" = callPackage
+    ({ mkDerivation, base, irc-fun-client, irc-fun-messages
+     , transformers
+     }:
+     mkDerivation {
+       pname = "irc-fun-bot";
+       version = "0.1.0.0";
+       sha256 = "58950b66db2841646fa172e9298a3a59094f2781793e9f26cd7077ab1782912c";
+       libraryHaskellDepends = [
+         base irc-fun-client irc-fun-messages transformers
+       ];
+       jailbreak = true;
+       homepage = "http://rel4tion.org/projects/irc-fun-bot/";
+       description = "Very simple library for writing fun IRC bots";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
+  "irc-fun-client" = callPackage
+    ({ mkDerivation, base, irc-fun-messages, network }:
+     mkDerivation {
+       pname = "irc-fun-client";
+       version = "0.1.0.0";
+       sha256 = "fc1f8fb91d3fbabdebf2506999a1f98d055cd95a6362ccfa2f1442a29a14dccd";
+       libraryHaskellDepends = [ base irc-fun-messages network ];
+       homepage = "http://rel4tion.org/projects/irc-fun-client/";
+       description = "Another library for writing IRC clients";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "irc-fun-color" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "irc-fun-color";
        version = "0.1.0.0";
-       sha256 = "1zb3d3m17049g7cfnpnl8c1ldyhhwvxh99dbfx1xzyadg841i08a";
+       sha256 = "0a8118087a4df9df4377aba504fbe610fa460343d45eebd879898013ea6863fd";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "http://rel4tion.org/projects/irc-fun-color/";
@@ -79666,6 +79962,20 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "irc-fun-messages" = callPackage
+    ({ mkDerivation, base, regex-applicative }:
+     mkDerivation {
+       pname = "irc-fun-messages";
+       version = "0.1.0.0";
+       sha256 = "4bebbf6790688f81ff3d777c03f7a7646af6c7ad2c23cd5bcd45d94cddfd22a0";
+       revision = "1";
+       editedCabalFile = "32bea454ad4ce55be98627138277c26a5de4abc73ccae3d196f8e5e653d4389a";
+       libraryHaskellDepends = [ base regex-applicative ];
+       homepage = "http://rel4tion.org/projects/irc-fun-messages/";
+       description = "Types and functions for working with the IRC protocol";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "ircbot" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , irc, mtl, network, parsec, random, SafeSemaphore, stm, time, unix
@@ -79673,7 +79983,7 @@ self: {
      mkDerivation {
        pname = "ircbot";
        version = "0.6.4";
-       sha256 = "024wmkp08rni9frflpjl0p30ql6k1kj956j5dysz40xygajk8fmd";
+       sha256 = "ad3a34a57abe03f2b56f459a92e40cd3500cc605545eeab24bd16604eeac9c08";
        libraryHaskellDepends = [
          base bytestring containers directory filepath irc mtl network
          parsec random SafeSemaphore stm time unix
@@ -79688,7 +79998,7 @@ self: {
      mkDerivation {
        pname = "ircbouncer";
        version = "0.2.0";
-       sha256 = "1bn0m9x89pqknz8gn8gk9is6w6px4hznp3fqqb5dxwssmmjm99zm";
+       sha256 = "f5a75465ad5af3decac2d88d6b3f24fd1a6e744cf321fbd0b713df847aaac0ae";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79699,7 +80009,7 @@ self: {
      mkDerivation {
        pname = "ireal";
        version = "0.2.1";
-       sha256 = "0i9850l0k1w7vmdx4cs35789rf6j4i1xalpyrinf8x85f6c8mfxa";
+       sha256 = "aabb8a98710575e46cccfe52d54324d2b89cd0294333d25bdd87870928282845";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Real numbers and intervals with relatively efficient exact arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -79711,7 +80021,7 @@ self: {
      mkDerivation {
        pname = "iron-mq";
        version = "0.1.1.0";
-       sha256 = "1yi1ia4ii6xg17ndp0v47cix0ds6bbrsbf0pghcmx3y4b55v0dlr";
+       sha256 = "9936b04b59c48f5e197c17b8a5f35a4637d0233b6483dbec09af9b18898a21fa";
        libraryHaskellDepends = [ aeson base http-client lens text wreq ];
        jailbreak = true;
        homepage = "https://github.com/arnoblalam/iron_mq_haskell";
@@ -79726,7 +80036,7 @@ self: {
      mkDerivation {
        pname = "ironforge";
        version = "0.1.0.35";
-       sha256 = "1dx0ljvfll8vb9rjdvx41vm4mrybafjch83xk7xs5fpvijjfp47l";
+       sha256 = "f490eba48cfbbaa2fb997d20c8a453cbe74aea0ea4ef26735a1b51eab6a4a0b7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79745,7 +80055,7 @@ self: {
      mkDerivation {
        pname = "is";
        version = "0.2";
-       sha256 = "1ihrrpypdjhsr42nd9chyq730kllx239igjpa12m14458lnrcb2h";
+       sha256 = "502c962d45859050455057be9886e8944e300ef690a56605c91aca76fdcd19c6";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Pattern predicates using TH";
@@ -79759,7 +80069,7 @@ self: {
      mkDerivation {
        pname = "isdicom";
        version = "0.0.2";
-       sha256 = "05f99nv4ydals0x1y39mswm3437s6bisdk63bgfzb89sgh0p9w1p";
+       sha256 = "37f074017c3aa1f5dd5bc3cca6e332fa0c322ad7350d1f3ad054354fb64dc915";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -79777,7 +80087,7 @@ self: {
      mkDerivation {
        pname = "isevaluated";
        version = "0.3.0.2";
-       sha256 = "10f09br33xy5ldl924kfnnlc5ilwq44hd17s2qdf9jm75q4sa7d5";
+       sha256 = "a51da5092ea7cae41a16fa840609c19cc6c2a8b56e129168a3c5f731f24ac081";
        libraryHaskellDepends = [ base vacuum ];
        jailbreak = true;
        description = "Check whether a value has been evaluated";
@@ -79790,7 +80100,7 @@ self: {
      mkDerivation {
        pname = "isiz";
        version = "0.0.1";
-       sha256 = "0k0nyiicz87lvay95vligf563k1dgx93zds0f0kzqxn20miq480s";
+       sha256 = "1a20826305c276fc277040b73f527f2dcc618a7b91ee92bcdaf4a0cf62f4164c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gtk3 ];
@@ -79803,7 +80113,7 @@ self: {
      mkDerivation {
        pname = "islink";
        version = "0.1.0.0";
-       sha256 = "1mxfs8k0znc7v2iynjnhr4k5c9as4ip37ybvxnvjfqy4dld9rgyg";
+       sha256 = "cfbf9c1a6dc46327b7ed7bf9336e245a255626c9d04aeba3d887d90f26d2aed7";
        libraryHaskellDepends = [ base unordered-containers ];
        homepage = "https://github.com/redneb/islink";
        description = "Check if an HTML element is a link";
@@ -79817,7 +80127,7 @@ self: {
      mkDerivation {
        pname = "ismtp";
        version = "4.0.2";
-       sha256 = "0skyrp497p0gfh39j1ng7ahpbzfykfvykq720akafgnapgsfxkhm";
+       sha256 = "15ceeef4bbca3ea7a602e2e0e9b79bdefd75a13acf069906740fdc93c8cd7e6a";
        libraryHaskellDepends = [
          base bytestring containers contstuff dnscache enumerator
          lifted-base monad-control netlines network vector
@@ -79832,7 +80142,7 @@ self: {
      mkDerivation {
        pname = "iso3166-country-codes";
        version = "0.20140203.7";
-       sha256 = "1cfmrkrx5wdcr8rrwakhmv0a5bxipxc3l7p4z5nxzl5nrjrli79s";
+       sha256 = "3a9d48b3ccb6d0df6df9e41e3a58bfb1afa2c0ae702a9e33caacf1d2f3ccd5b1";
        libraryHaskellDepends = [ base ];
        description = "A datatype for ISO 3166 country codes";
        license = "LGPL";
@@ -79843,7 +80153,7 @@ self: {
      mkDerivation {
        pname = "iso639";
        version = "0.1.0.3";
-       sha256 = "1s15vb00nqxnmm59axapipib1snh6q5qhfdw7pgb9vdsz8i86jqj";
+       sha256 = "124b8322fabaedb4de3dbc39880b36d0eab0e28d5775954aadb6630bc0da25e8";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/HugoDaniel/iso639";
        description = "ISO-639-1 language codes";
@@ -79857,7 +80167,7 @@ self: {
      mkDerivation {
        pname = "iso8583-bitmaps";
        version = "0.1.0.0";
-       sha256 = "0w6m8ygpy1g95zvmbzq9402rxh4dj48i5bhcdzc4s0kig239gzqd";
+       sha256 = "0dff97867871024dd86f0cae1211918dc09e052009ff55f72fe9057f9f47d570";
        libraryHaskellDepends = [
          base binary bytestring containers parsec syb template-haskell
          th-lift
@@ -79871,7 +80181,7 @@ self: {
      mkDerivation {
        pname = "iso8601-time";
        version = "0.1.3";
-       sha256 = "05qwpcj4whibj0bmdnq0wns9ks5v4fqnsyq7sl2v36pd11h9i9zv";
+       sha256 = "fba7986008ed9ab105d5077b6db123bbe899b4e500db5617902b424e24bb1c17";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec HUnit time ];
        homepage = "https://github.com/nh2/iso8601-time";
@@ -79886,7 +80196,7 @@ self: {
      mkDerivation {
        pname = "isohunt";
        version = "0.1.3";
-       sha256 = "189dmxczmr0kqh440ziyp6kxx6iza2yyq7cs05hic9w8lhpwa6pw";
+       sha256 = "fc1ac52fa488271661019a1decbd503f9adea7b93e7e4008c413e4fa59af2da1";
        libraryHaskellDepends = [
          aeson base bytestring data-default ghc-prim http-conduit text
          unordered-containers uri vector
@@ -79904,7 +80214,7 @@ self: {
      mkDerivation {
        pname = "itanium-abi";
        version = "0.1.0.0";
-       sha256 = "19ywiim8jjkpj2f7agvq98j4p7l1bw8lp2lmgimwq3bz17nrawwk";
+       sha256 = "937395ed097f0dcc6b7c958a4b115f819e4b244a783f759c90774a896a8cdca7";
        libraryHaskellDepends = [
          base boomerang text transformers unordered-containers
        ];
@@ -79923,7 +80233,7 @@ self: {
      mkDerivation {
        pname = "iter-stats";
        version = "0.1.0.4";
-       sha256 = "1pfvxxps319ynfpaqgkiyk7gbpi4l2rfqzqyw27jhzlxx860yq71";
+       sha256 = "e1600f0cea9d7e288fe01e7fecb2a024def5cef4713eacaeb33e85a16fefdbdd";
        libraryHaskellDepends = [ base heap iteratee ListLike mtl ];
        testHaskellDepends = [
          base heap HUnit iteratee ListLike mtl statistics test-framework
@@ -79943,7 +80253,7 @@ self: {
      mkDerivation {
        pname = "iterIO";
        version = "0.2.2";
-       sha256 = "0cq0awzl249m9kzgs0hzs49r2v29q4dhq3sbd818izvyqzfzz4zm";
+       sha256 = "f593ffddc77eff88026a4b0f0c1bc1496c9113d11f02fdfe4c3511413f570033";
        libraryHaskellDepends = [
          array attoparsec base bytestring containers filepath HsOpenSSL
          ListLike mtl network old-locale process stringsearch time unix
@@ -79961,7 +80271,7 @@ self: {
      mkDerivation {
        pname = "iterable";
        version = "3.0";
-       sha256 = "194718jpjwkv3ynlpgjlpvf0iqnj7dkd3zmci363gsa425i3vlbc";
+       sha256 = "6cd13d621144e937cc88acfed1663bd2e208dcbe54be4bad1f7b7279250a87a4";
        libraryHaskellDepends = [
          base mtl tagged template-haskell vector
        ];
@@ -79979,7 +80289,7 @@ self: {
      mkDerivation {
        pname = "iteratee";
        version = "0.8.9.6";
-       sha256 = "1yc5fqqb8warvgld3cymka7d2wmjydvfin5jy7zaazb7alf14q1p";
+       sha256 = "3760121c55677da5fef1b2d8e876f3b272d18e9ad5b3d1e8db5971b4307685f9";
        libraryHaskellDepends = [
          base bytestring containers exceptions ListLike monad-control
          parallel transformers transformers-base unix
@@ -80001,7 +80311,7 @@ self: {
      mkDerivation {
        pname = "iteratee-compress";
        version = "0.3.3.1";
-       sha256 = "1j5w3pfi8mx88wfg6fwrj5jccfp8spw0jwb4zh3yyzg1jacrpal4";
+       sha256 = "84aa9b9992e17def07fc647109f8d5e83ac66491993bf31c47a85714dd1dbcc8";
        libraryHaskellDepends = [ base bytestring iteratee mtl ];
        librarySystemDepends = [ bzip2 zlib ];
        description = "Enumeratees for compressing and decompressing streams";
@@ -80016,7 +80326,7 @@ self: {
      mkDerivation {
        pname = "iteratee-mtl";
        version = "0.5.0.0";
-       sha256 = "0a3f0m9lgc4ks18891a689bbb1c1kdrxswj42s5syvcq73y7v2h0";
+       sha256 = "008a7dfc38986daf8b164472dd739b8185b5564246858450d093b04753056e28";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80036,7 +80346,7 @@ self: {
      mkDerivation {
        pname = "iteratee-parsec";
        version = "0.0.6";
-       sha256 = "1saffq3pl20fph6jdss6yzdgfaqxwb2183gb3qxj6cwsrblzz628";
+       sha256 = "4898ffe9ca9a33233b1eeb0d14c4e21d2bf7daf746eb260dbc0e087a07764ee9";
        libraryHaskellDepends = [
          base iteratee ListLike parsec reference transformers
        ];
@@ -80051,7 +80361,7 @@ self: {
      mkDerivation {
        pname = "iteratee-stm";
        version = "0.1.2";
-       sha256 = "1916phr07ckvm571rspswqr93z22la0mkxghvzljr0vgd1zi4p0x";
+       sha256 = "1d5c127f686f832ce9dff0f55981a242fc9132e6faea1c4ea97bb20332bc26a4";
        libraryHaskellDepends = [
          base iteratee stm stm-chans transformers
        ];
@@ -80069,7 +80379,7 @@ self: {
      mkDerivation {
        pname = "iterio-server";
        version = "0.3";
-       sha256 = "1yz05y6i036irdbnsmhhr9lpcfk56ii6ls1fqdgh80h9giyi6c0n";
+       sha256 = "1630137d7c0902045fc32e686a6234653a7669ca10566d57cbd10c108d2fe0fb";
        libraryHaskellDepends = [
          base bytestring filepath iterIO ListLike monadIO mtl network split
          transformers unix
@@ -80086,7 +80396,7 @@ self: {
      mkDerivation {
        pname = "ivar-simple";
        version = "0.3.1";
-       sha256 = "1zn3nr0qmrnpr7jnpwgb4sancflbp9xmk2qyahl0d9vw7agqhwlm";
+       sha256 = "9572889f3a7ca70628541e8b597bba8b3a669526ebf16be5c9d7e68a41b6c3fe";
        libraryHaskellDepends = [ base ];
        description = "Write once concurrency primitives";
        license = stdenv.lib.licenses.mit;
@@ -80099,7 +80409,7 @@ self: {
      mkDerivation {
        pname = "ivor";
        version = "0.1.14.1";
-       sha256 = "0r9ykfkxpwsrhsvv691r361pf79a7y511hxy2mvd6ysz1441mych";
+       sha256 = "90f91a08095f7bd37615bec3108a3f2a1d7783193924b3b78659f3dba79b3e65";
        libraryHaskellDepends = [
          base binary containers directory haskell98 mtl parsec
        ];
@@ -80116,7 +80426,7 @@ self: {
      mkDerivation {
        pname = "ivory";
        version = "0.1.0.0";
-       sha256 = "1rn1akrsci0k5nbk4zipxznkdm0y3rvv9la5mnrr9mkj5zikj5sc";
+       sha256 = "4c1739e32f72d694b3ad45d1b4771e1ed436edef377e32972d1344a6f354c1e6";
        libraryHaskellDepends = [
          base containers monadLib parsec pretty template-haskell th-lift
        ];
@@ -80135,7 +80445,7 @@ self: {
      mkDerivation {
        pname = "ivory-backend-c";
        version = "0.1.0.1";
-       sha256 = "12rcaanxl86wna05x1gdkpfj90azn1z74cs3kfk9cp5g3g230ii4";
+       sha256 = "244630c41baf5c96a69b4333727eb05f8124dd9ded855e80b2dc20daad522c8b";
        libraryHaskellDepends = [
          base bytestring cmdlib containers directory filepath ivory
          ivory-opts language-c-quote mainland-pretty monadLib process srcloc
@@ -80154,7 +80464,7 @@ self: {
      mkDerivation {
        pname = "ivory-bitdata";
        version = "0.2.0.0";
-       sha256 = "03qqax98qr2qyidc71i81f70lbma1s2q5jikl3m4ni4wyj3gg1m3";
+       sha256 = "a386f786f49c444beaa033ca82850eaa2e0a8e0b2886c35af458648c5257180f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80175,7 +80485,7 @@ self: {
      mkDerivation {
        pname = "ivory-examples";
        version = "0.1.0.2";
-       sha256 = "0jjcr72s616y8g4288fz506p1swrv06c2fmds28yd1rqc57g1mrm";
+       sha256 = "35d7f04e613887e691d0ad3ac10cd899eb700d28df2124c843de04a3c5c94c4a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -80196,7 +80506,7 @@ self: {
      mkDerivation {
        pname = "ivory-hw";
        version = "0.1.0.0";
-       sha256 = "1sa0ayym7ng5q7i356n59p18qqpy9cr2xcsmgh96a7ni4srbrbsy";
+       sha256 = "5eafbcb226d11e65127c55b32e324bfe628cc24dc59a32e2c1e5d953bd5740e9";
        libraryHaskellDepends = [
          base filepath ivory ivory-backend-c ivory-bitdata
        ];
@@ -80213,7 +80523,7 @@ self: {
      mkDerivation {
        pname = "ivory-opts";
        version = "0.1.0.1";
-       sha256 = "08ywjwkd37dld6h355r6a36h72s94gai7hs2r4hj5nk5pm7k4s5z";
+       sha256 = "bf68324fbd65da2221c942c313d523498b03cd50269732a069b49dd12697dc23";
        libraryHaskellDepends = [
          base containers dlist fgl filepath ivory monadLib
        ];
@@ -80229,7 +80539,7 @@ self: {
      mkDerivation {
        pname = "ivory-quickcheck";
        version = "0.1.0.0";
-       sha256 = "0jbfpsmz8kq0h9gg5lm44pcdzhv8kv2rr554m4bic2bny94hnsjd";
+       sha256 = "4d6a0b49f276091617a9a4949cc59e68c3dfd825a4d2f25e82004ff4abbe6e49";
        libraryHaskellDepends = [ base ivory monadLib QuickCheck random ];
        jailbreak = true;
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
@@ -80243,7 +80553,7 @@ self: {
      mkDerivation {
        pname = "ivory-stdlib";
        version = "0.1.0.0";
-       sha256 = "1a3d9916rgrznr5ci79ki918xg6xxd81krn8irv9wbp8h8ird2xq";
+       sha256 = "b88b962382e82e9e768ec8e61950ebddbc8e428a339dc84ab63fbf6c424a6da8";
        libraryHaskellDepends = [ base filepath ivory ];
        jailbreak = true;
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
@@ -80259,7 +80569,7 @@ self: {
      mkDerivation {
        pname = "ivy-web";
        version = "0.2";
-       sha256 = "0m2wd8lh22nqyjiijw9ldl6l17fbkj7b4n0j5ymgrs3yx2mnnv1q";
+       sha256 = "386c6babe87ee8fcaa2f1258b28e9ccb9d400d6d347119a3f4d80a01296a5c54";
        libraryHaskellDepends = [
          base invertible-syntax partial-isomorphisms snap snap-core
        ];
@@ -80274,7 +80584,7 @@ self: {
      mkDerivation {
        pname = "ix-shapable";
        version = "0.1.0";
-       sha256 = "08ljlzywnw0h8ijwb6yh4r8l6z7bbknwxv9cjq7lkfx7m2vgy1sh";
+       sha256 = "5007ffb6a8a7bb490f962cedceed5ceb7c435126d09bc565441070cbfda79222";
        libraryHaskellDepends = [ array base ];
        description = "Reshape multi-dimensional arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -80285,7 +80595,7 @@ self: {
      mkDerivation {
        pname = "ixdopp";
        version = "0.1.3";
-       sha256 = "1vknwznk42b33q4pmh6z620g761yf3cmsmrmhilgq42i5qhll4d4";
+       sha256 = "a4114a212e5110fc688435575dd9703e98f38030dfc07a091e630932ede776ee";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base preprocessor-tools syb ];
@@ -80301,7 +80611,7 @@ self: {
      mkDerivation {
        pname = "ixmonad";
        version = "0.57";
-       sha256 = "1k8qfx9p6jw6gb4jsgq6y2bc6y6ah4h44gdgs0fxkrg371wyym7k";
+       sha256 = "f354ef7938e3e5d91dd0af3d422081ca78c396f0063f2dc97a864b73537718cd";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
@@ -80314,7 +80624,7 @@ self: {
      mkDerivation {
        pname = "ixset";
        version = "1.0.6";
-       sha256 = "097f9fkm9a2n67bzagr9h2v7acdn8h1ayv9c83n7nv1dh157bpyv";
+       sha256 = "dbdf754a802d6c7bec402c6daf0244b63175b680293ff5d73156a854a74bee24";
        libraryHaskellDepends = [
          base containers safecopy syb syb-with-class template-haskell
        ];
@@ -80331,7 +80641,7 @@ self: {
      mkDerivation {
        pname = "ixset-typed";
        version = "0.3";
-       sha256 = "0m6k5n755pfkx1grd5rbp1a9vlps6fdm25l91aa0wp5af1sakjmk";
+       sha256 = "b3caa97470aa5c0e940a8916519b33fad29d54b82b97965fe8d3dd528e2dd354";
        libraryHaskellDepends = [
          base containers deepseq safecopy syb template-haskell
        ];
@@ -80351,7 +80661,7 @@ self: {
      mkDerivation {
        pname = "iyql";
        version = "0.0.7";
-       sha256 = "1jb97jzm9w8z8jyswbcr3kdraam95by6bc1gpjddwn817dijf0q4";
+       sha256 = "040327633b0159de9abc2fb065fc2aa92a95db1c992daebd441ff154bf3c69c9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -80371,7 +80681,7 @@ self: {
      mkDerivation {
        pname = "j2hs";
        version = "0.99.1";
-       sha256 = "0fls5krx9l0c7g755b4yyksiki45hbb6v7m0y6nsmpd217rggkb2";
+       sha256 = "62cdf7f209a2ddaaadf1a09e6dd68285c419f5f49eac52ce3b0cd0d4f32c9a3a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -80393,7 +80703,7 @@ self: {
      mkDerivation {
        pname = "jack";
        version = "0.7.0.3";
-       sha256 = "12ap7xcgzmp5zwmqkwsgxplh5li21m7xngijr4mhnn9y33xc1lrk";
+       sha256 = "33d3c0fa183e590b2bc9323edb4f0d22d202e9ed4ff3892bffe5d6ff583f5789";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80411,7 +80721,7 @@ self: {
      mkDerivation {
        pname = "jack-bindings";
        version = "0.1.1";
-       sha256 = "1gmz2qiz7wzydj0rhswbfhwi0zbdcbps29l1lryzqxm8chfc9mbm";
+       sha256 = "75d5c41c64a876fc7da68126a1ef626d7d1039748b6b98816cfef3f32316bfbe";
        libraryHaskellDepends = [ base mtl ];
        libraryPkgconfigDepends = [ libjack2 ];
        libraryToolDepends = [ c2hs ];
@@ -80425,7 +80735,7 @@ self: {
      mkDerivation {
        pname = "jackminimix";
        version = "0.1";
-       sha256 = "03ysmgg5f3dsimskqw5vpnrv5jg4gf1gd0khmf0s1ilfm1jc1nfd";
+       sha256 = "cdd9c064a88ec6a081ab7082f6827be4c9b2b3bdbb703c758dba0d57deabda0f";
        libraryHaskellDepends = [ base hosc ];
        jailbreak = true;
        homepage = "http://www.renickbell.net/doku.php?id=jackminimix";
@@ -80439,7 +80749,7 @@ self: {
      mkDerivation {
        pname = "jacobi-roots";
        version = "0.2.0.4";
-       sha256 = "1skpw2jm5g0lylc79n5fk37d3lrvhwb3cmn50wcy4i5nnjvfdijc";
+       sha256 = "4cc6e6b6b4b644e21907c5563616873bd3d1ce98aed87418f514bc52a5e077ea";
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/ghorn/jacobi-roots";
@@ -80454,7 +80764,7 @@ self: {
      mkDerivation {
        pname = "jail";
        version = "0.0.1.1";
-       sha256 = "0wxz3w5r1zc571ibyqskwk27ba1dafwwpr10psbsg44fj7ii3vvz";
+       sha256 = "7fef11e3918e90a797be20e4cbb9532da875c4e45363bf623885fd900b1fbf73";
        libraryHaskellDepends = [
          base containers directory monads-fd transformers
        ];
@@ -80468,7 +80778,7 @@ self: {
      mkDerivation {
        pname = "jailbreak-cabal";
        version = "1.3";
-       sha256 = "1i4a8azbq74r3pb4hvb816amy13z03afpq4jvyps3s399id6zhx2";
+       sha256 = "a2c36f5a4c69e8a1afdf92e0ebd4007f045f9509686d48d61d991cbcbe428ac4";
        revision = "2";
        editedCabalFile = "eb10d8166cc3a40e8d731ab1fba7d37ef57d155d6122c7234297ddbf776ec28a";
        isLibrary = false;
@@ -80484,7 +80794,7 @@ self: {
      mkDerivation {
        pname = "jalaali";
        version = "0.2.0";
-       sha256 = "025ryrz87bii3401nq0bhyigzrs6lkippds6r4h0qzpq4pg8l7m0";
+       sha256 = "a01e8ade25f87e0c20c946b77be3a446e7ffa2870b601b001931ae837ef6b908";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        jailbreak = true;
@@ -80501,7 +80811,7 @@ self: {
      mkDerivation {
        pname = "jalla";
        version = "0.2.0.1";
-       sha256 = "122lf1j9hs81yzj6hdv7a7q56846h1ggasbjgvjnk8r34d0xsl40";
+       sha256 = "8050dd412323a369e57e7269f55e80862053f051673768e4f701699864705488";
        libraryHaskellDepends = [
          base base-orphans convertible mtl QuickCheck random
        ];
@@ -80525,7 +80835,7 @@ self: {
      mkDerivation {
        pname = "jammittools";
        version = "0.5.0.1";
-       sha256 = "1qfa90hi0kcylfw3p4m2qx5n4ni14426ssffj63hixqrqcnz60gx";
+       sha256 = "fd01f32dc319f7088791ce696d0421215a624bc7a2923bb8a39e4d102148cae1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80547,7 +80857,7 @@ self: {
      mkDerivation {
        pname = "jarfind";
        version = "0.1.0.3";
-       sha256 = "0cfxq8k0k8r3wf4siypb78rqx5c9m2cm899bpa0zz591hc0p6k0w";
+       sha256 = "1c4c7301832195ff81ba2b255499a889958e333aebfaa889e323a30926c2dd31";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80569,7 +80879,7 @@ self: {
      mkDerivation {
        pname = "java-bridge";
        version = "0.20130606.3";
-       sha256 = "16nm5jn5y3rs3g1m524gn8xqxw13973cmpllmylh6qdpqcz47457";
+       sha256 = "a790433ec3b76103a9af94decac64923f08e3bb28f8852c31b3a0f5fac2cd59a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80590,7 +80900,7 @@ self: {
      mkDerivation {
        pname = "java-bridge-extras";
        version = "0.99";
-       sha256 = "0wjxm0h5xlsab7iphcabb66c7gjxy7hyb502inlj5zxq1ic5ghzv";
+       sha256 = "fbc357580cb8ff22a98d0294e5e1f15dbec38c594b3178e3594ad35e20a85d72";
        libraryHaskellDepends = [ base java-bridge transformers ];
        jailbreak = true;
        description = "Utilities for working with the java-bridge package";
@@ -80603,7 +80913,7 @@ self: {
      mkDerivation {
        pname = "java-character";
        version = "0.0.4";
-       sha256 = "1ms8m95mara3pp7qdg8jn2ajbq3zj8pnbs1b9jhpxbdkl5220768";
+       sha256 = "c81c2044a1b3ad7ea14c2be8652f927fe02595b012bd86cfbd4365554baa48d7";
        libraryHaskellDepends = [ base diet ];
        homepage = "https://github.com/tonymorris/java-character";
        description = "Functions to simulate Java's Character class";
@@ -80615,7 +80925,7 @@ self: {
      mkDerivation {
        pname = "java-reflect";
        version = "0.99";
-       sha256 = "1vdfq3c8chqhss6jiy139yrm45mij4kjdwxf2wrsfm4064j0n3wc";
+       sha256 = "8c0f0b24318054a73317aef3262791b11652b34f23f8288dd6104386d8c0aeed";
        libraryHaskellDepends = [ base containers hx java-bridge ];
        jailbreak = true;
        description = "Tools for reflecting on Java classes";
@@ -80630,7 +80940,7 @@ self: {
      mkDerivation {
        pname = "javasf";
        version = "0.1.0";
-       sha256 = "0k8si8rdhplfhfp5yq7rlkifj80401qyanfhv101h8amxg20m97w";
+       sha256 = "fca40ac4eb55211840d8d059e571000420e9e2a4f9605fae838e5ed8328a1a4d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -80650,7 +80960,7 @@ self: {
      mkDerivation {
        pname = "javav";
        version = "0.1.1";
-       sha256 = "1kzhp9gim9jl78jw8gm9vzxciiz6m04pjamgx1pqbhkji3lkw55d";
+       sha256 = "ad143ee98872c2856fe8af2a7909a8e6c7c8fadfa93ec4253a54a61a5fbaf0cf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -80670,7 +80980,7 @@ self: {
      mkDerivation {
        pname = "jcdecaux-vls";
        version = "0.1.0";
-       sha256 = "11army6p19xmdils32nxf5zbjh4fcsp075x7h3v2hbc08n6fkj8s";
+       sha256 = "1ac9e98c45802d28f680a79703ae668e40b97e71dd8aa1696cb5a7708daf5985";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit text transformers
        ];
@@ -80687,7 +80997,7 @@ self: {
      mkDerivation {
        pname = "jdi";
        version = "0.0.3";
-       sha256 = "1jznizbnyg37lir155sq84dbsqcaavz061hj2a703w9x28s6pcnb";
+       sha256 = "cbb26b34123df1018e12120603fe568a61bd1a4158971272a4673c6fd78ff6cb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80710,7 +81020,7 @@ self: {
      mkDerivation {
        pname = "jespresso";
        version = "1.0.2";
-       sha256 = "0wka2wq89x6vzhvr93wrlc8dp7shd8jic11camrgpqqsqk3j0pnd";
+       sha256 = "cd5e20c7c41ae3fb72552c0416256a509fdb10a3998f9437fcdbf48430176a72";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80741,7 +81051,7 @@ self: {
      mkDerivation {
        pname = "jmacro";
        version = "0.6.13";
-       sha256 = "0b7l4h3apkj41w69wg3ympflh2l53vbmyvs6xf20xn57d6p8lhn4";
+       sha256 = "c4428aae69a7d80e84eb466f5fd71e850a48ddad7e3c9e0c0f44ceab0624f42c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80762,7 +81072,7 @@ self: {
      mkDerivation {
        pname = "jmacro-rpc";
        version = "0.3.2";
-       sha256 = "1nf5f62s749xsji2rg25dgj7mc668l3n7i7l9n1pjkn8gfwm6bx3";
+       sha256 = "a32f53b97bc84e79834df4c4630745c6b07ae46b45bc2ca2d43d91a38571c5d9";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-html bytestring containers
          contravariant jmacro mtl scientific split text unordered-containers
@@ -80780,7 +81090,7 @@ self: {
      mkDerivation {
        pname = "jmacro-rpc-happstack";
        version = "0.3.2";
-       sha256 = "0r5h8hlsjppnhqdxa0dsrjkpv3pldbkv5v4dryd4km2v38yfxkcr";
+       sha256 = "99cdee3c1a5bd4499acf8decb2e76af48e7da7ccba01d51b86f65ea92944b064";
        libraryHaskellDepends = [
          aeson base blaze-html bytestring containers happstack-server jmacro
          jmacro-rpc mtl
@@ -80797,7 +81107,7 @@ self: {
      mkDerivation {
        pname = "jmacro-rpc-snap";
        version = "0.3";
-       sha256 = "1syzx2lw4r8knsqhsvilp04wb8a718379cmn0nhjqlwhpaja9bj8";
+       sha256 = "48aea4a4ba90532ca105b6b274060a47a1c509b8346e0db1b61365c2a9e8dfeb";
        libraryHaskellDepends = [
          aeson base bytestring containers jmacro jmacro-rpc mtl snap-core
        ];
@@ -80816,7 +81126,7 @@ self: {
      mkDerivation {
        pname = "jobqueue";
        version = "0.1.5";
-       sha256 = "0zfdh559qyzflrnh0gg23zfpw4vkp8qsx6syrblq2d0iknfybhir";
+       sha256 = "39c2e59d9d113481e9ca5e9bae31ba73137edd1fe23d006da6ee7b9c4a81cd7d";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default
          fast-logger HDBC HDBC-sqlite3 hslogger hzk lifted-base
@@ -80839,7 +81149,7 @@ self: {
      mkDerivation {
        pname = "join";
        version = "0.4";
-       sha256 = "0bx9cvdhhw7z30qgxwpl0j23z18sx7xyin2y7bwxvg5ga737j8qx";
+       sha256 = "1d2379c651afbcddf93a5ed8e8fbe91a853f8404f4f2fe3018ff7008db66a92f";
        libraryHaskellDepends = [ base haskell98 multisetrewrite stm ];
        homepage = "http://sulzmann.blogspot.com/2008/12/parallel-join-patterns-with-guards-and.html";
        description = "Parallel Join Patterns with Guards and Propagation";
@@ -80852,7 +81162,7 @@ self: {
      mkDerivation {
        pname = "joinlist";
        version = "0.3.0";
-       sha256 = "0hjlyyylbh471696v9b1jckm7d4gfp1ka978sr1j0005d03gwv35";
+       sha256 = "656cfe066805002043d6e82435c3758fb453279361a56d920987c045bdf75442";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "Join list - symmetric list type";
@@ -80867,7 +81177,7 @@ self: {
      mkDerivation {
        pname = "jonathanscard";
        version = "0.1.1";
-       sha256 = "0zwd5mdwamyl6xlflhj0yvp9k5yfrxggvv49d3hriz9z15f5v5g8";
+       sha256 = "e8955d5c093ffd98e16889ecfd5ecfce9799eef64042ea6837d457c55b2d8d7f";
        libraryHaskellDepends = [
          base bytestring containers HTTP json mtl network old-locale time
        ];
@@ -80883,7 +81193,7 @@ self: {
      mkDerivation {
        pname = "jort";
        version = "1.0.0";
-       sha256 = "1c1nr8pq4vyn4mvyqms2mq1sm42qgr2mrznn5rsv34rd1f75b2d3";
+       sha256 = "a389558e0b2d93b1752ed6fe5c457e5890aa03ae4257ec7725d66f822fca36b0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base gtk ];
@@ -80904,7 +81214,7 @@ self: {
      mkDerivation {
        pname = "jose";
        version = "0.3.41.2";
-       sha256 = "0pamg1wkp85zpwnbsvmsszy7nxsifl3zhbxvfmh44n0b6d2wg4w5";
+       sha256 = "8593c745330b58426075bb2ff8077551777bfcd7ba6ebd2cbfbfa03b7978555d";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bifunctors byteable
          bytestring crypto-pubkey crypto-pubkey-types crypto-random
@@ -80936,7 +81246,7 @@ self: {
      mkDerivation {
        pname = "jose-jwt";
        version = "0.6.2";
-       sha256 = "0fw3b34ghpjpm56iln1i46kr8dcj1yv8gmalgdl7ym7n9bvgrfzq";
+       sha256 = "f8bbfcf64af6547f687b54d587b60f923594a72131581a4da9575ef8c858833b";
        revision = "1";
        editedCabalFile = "5aa6637a051160937328c7ff477615ff8424212374f46e41386c705e4db425c0";
        libraryHaskellDepends = [
@@ -80961,7 +81271,7 @@ self: {
      mkDerivation {
        pname = "jpeg";
        version = "0.0.1.1";
-       sha256 = "1hnfapr21zpfyiywa4zzmwa518jzg73dnmaakrbvvpcmr4fvh9qx";
+       sha256 = "1d27b81dc995ddbd579e4a55dbc6795fa25014afff13c57df4eefe20f255cec2";
        libraryHaskellDepends = [ base mtl ];
        description = "A library for decoding JPEG files written in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -80972,7 +81282,7 @@ self: {
      mkDerivation {
        pname = "js-flot";
        version = "0.8.3";
-       sha256 = "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv";
+       sha256 = "1ba2f2a6b8d85da76c41f526c98903cbb107f8642e506c072c1e7e3c20fe5e7a";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTTP ];
        homepage = "https://github.com/ndmitchell/js-flot#readme";
@@ -80985,7 +81295,7 @@ self: {
      mkDerivation {
        pname = "js-good-parts";
        version = "0.0.7";
-       sha256 = "0i3r3xl8hi2a3d6hrj77vbfi54bkq4pidrjcz13vz4az9dvz6k75";
+       sha256 = "e54cf3774b5f91bf47f84ce6162fc1739112dddae7c80c4d1b4a4488681f7944";
        libraryHaskellDepends = [ base wl-pprint ];
        homepage = "https://github.com/sseefried/js-good-parts.git";
        description = "Javascript: The Good Parts -- AST & Pretty Printer";
@@ -80998,7 +81308,7 @@ self: {
      mkDerivation {
        pname = "js-jquery";
        version = "1.11.3";
-       sha256 = "0my2ncql2vkdhxcqiw4jly957zkjdvbbw9jhf2dk6ndfnp81jyrx";
+       sha256 = "3d7b19d0b5ae59339b705026bed66e72fe5392a792f08859876d6e4131b3c257";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTTP ];
        homepage = "https://github.com/ndmitchell/js-jquery#readme";
@@ -81007,20 +81317,21 @@ self: {
      }) {};
 
   "jsaddle" = callPackage
-    ({ mkDerivation, base, hslogger, lens, template-haskell, text
-     , transformers
+    ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell
+     , text, transformers, webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.2.0.6";
-       sha256 = "1ggnhv9lgsd330p1k6zvg20dbqb1ysh282nalxramqvn2yhmqsx4";
+       version = "0.2.1.0";
+       sha256 = "3aebcb9422803265598a027f1e8a63f0f41176a0efdb436bf502d61102754513";
        libraryHaskellDepends = [
-         base lens template-haskell text transformers
+         base lens template-haskell text transformers webkitgtk3
+         webkitgtk3-javascriptcore
        ];
        testHaskellDepends = [
-         base hslogger lens template-haskell text transformers
+         base glib gtk3 hslogger lens template-haskell text transformers
+         webkitgtk3 webkitgtk3-javascriptcore
        ];
-       jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -81030,7 +81341,7 @@ self: {
      mkDerivation {
        pname = "jsaddle-hello";
        version = "1.0.0.0";
-       sha256 = "07kgjp35vbwljhyz9i49fbvbj4d05gn8swzynb0hd02bbsl5i0dp";
+       sha256 = "b78158a85e4b8006c1b2fe738dec2ba011b9f67289c4f43d9494af5dc6956f1e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ghcjs-dom jsaddle lens ];
@@ -81048,7 +81359,7 @@ self: {
      mkDerivation {
        pname = "jsc";
        version = "0.1.1.1";
-       sha256 = "18mvpncvsfv4gv7lx00g8aixjmhzp0yklxaajx45v2hsx0azn8zc";
+       sha256 = "ec23fb15e81a8a5d48974a753a3db81f56d9a3420f804ecf7e643bbd99bdbba2";
        libraryHaskellDepends = [
          base jmacro lens template-haskell text transformers webkitgtk3
          webkitgtk3-javascriptcore
@@ -81068,7 +81379,7 @@ self: {
      mkDerivation {
        pname = "jsmw";
        version = "0.1";
-       sha256 = "1r36w2h5007qln56gnyyd7w6bcqiymn1jw287z0waf4fhpy02ygq";
+       sha256 = "f87901fc858e38c5c13f4870196cf511b365f869dedb678aa5f80050a0e066e4";
        libraryHaskellDepends = [ base DOM mtl WebBits ];
        jailbreak = true;
        description = "Javascript Monadic Writer base package";
@@ -81083,7 +81394,7 @@ self: {
      mkDerivation {
        pname = "json";
        version = "0.9.1";
-       sha256 = "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn";
+       sha256 = "96b57e4d167e45dc80aeff872a922ae9cdb953a1ded29ebbb51019b68f0085a2";
        libraryHaskellDepends = [
          array base bytestring containers mtl parsec pretty syb text
        ];
@@ -81098,7 +81409,7 @@ self: {
      mkDerivation {
        pname = "json-assertions";
        version = "1.0.7";
-       sha256 = "1x73szyqb6w1hnhb4ab8dfc7hwn12avj4304jnr8lyxjg08hfaqa";
+       sha256 = "0a2b071178b27b8ab295040c22b712c17278986b6829b2a085819b85fdd7e3f4";
        libraryHaskellDepends = [
          aeson base indexed indexed-free lens lens-aeson text
        ];
@@ -81116,7 +81427,7 @@ self: {
      mkDerivation {
        pname = "json-autotype";
        version = "1.0.7";
-       sha256 = "11x6am3hqzhai0dm02pk20l5pk5bpj434z8ic4b8lksnv8l5zq46";
+       sha256 = "86e05f28da564f8a1661117d3288bcabcc5b2810f30a501b880a7e0c4755a687";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81146,7 +81457,7 @@ self: {
      mkDerivation {
        pname = "json-b";
        version = "0.0.4";
-       sha256 = "0wcvaswgffzvhfq7v5lqxp6xhxajaabbxkqpqxp5vwcv5slkiags";
+       sha256 = "faa938a92e9bf15d6ec717cfbe96525275d8cded98967db083fb3bf7b8569b71";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81171,7 +81482,7 @@ self: {
      mkDerivation {
        pname = "json-builder";
        version = "0.3";
-       sha256 = "0k8b93bqi68c7nwq09cws8kfm84kd4k5lpy4z9ifks1jaiyj3vxm";
+       sha256 = "b5ef217d5432e8e962fac45f5a266993a0ea26d29c2580b93d0c9988d7480b4d";
        libraryHaskellDepends = [
          base blaze-builder blaze-textual bytestring containers text
          unordered-containers utf8-string vector
@@ -81189,7 +81500,7 @@ self: {
      mkDerivation {
        pname = "json-enumerator";
        version = "0.0.1.2";
-       sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d";
+       sha256 = "2dd58e7a85c2b45f78767e21069b2b6597e848e6c6339b678670ef5b42cdfc21";
        libraryHaskellDepends = [
          base blaze-builder blaze-builder-enumerator bytestring containers
          enumerator json-types text transformers
@@ -81208,7 +81519,7 @@ self: {
      mkDerivation {
        pname = "json-extra";
        version = "0.1.0.1";
-       sha256 = "1wqn68brkjmix7xidcb7170ydpxwq1p48qqmm4w9ak0zkvm70fks";
+       sha256 = "7a3a70ea9e1f4c9538a91563446ec0bcdfe6c10967b116fbe9b1ca99173216f3";
        revision = "1";
        editedCabalFile = "76113c3d47cb5d8087ffe18e1b09eaa22cc8dcd07010537739c7f1e4dc6b0741";
        libraryHaskellDepends = [
@@ -81228,7 +81539,7 @@ self: {
      mkDerivation {
        pname = "json-fu";
        version = "0.1.1";
-       sha256 = "098ps56igr12wm9hai3agh2hdmvd00rzpdd5lw0ffjivjxxfh829";
+       sha256 = "4920e87a973b4ae700a7a5b5fb33006dd706057c6a440553e522e4174dd11725";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers hashable mtl syb text
          time unordered-containers vector
@@ -81248,7 +81559,7 @@ self: {
      mkDerivation {
        pname = "json-python";
        version = "0.4.0.1";
-       sha256 = "0ga3clvmq20xlyx47bril651xg8rhq77s7nj6r1v836m3xwcb0y9";
+       sha256 = "c983c5781fd50cb44336d21e7d0e8619bd1e8aa131af43baa71d085c3765433d";
        libraryHaskellDepends = [
          aeson base bytestring containers pureMD5 template-haskell
        ];
@@ -81265,7 +81576,7 @@ self: {
      mkDerivation {
        pname = "json-qq";
        version = "0.4.1";
-       sha256 = "0rpfv0i4jhjkq39xcs3b89ms0w4il4l7f385msqj93qzj76is7m6";
+       sha256 = "a61e1dcd911f8f24b1ae050d7728a19170a06b426b68d6d3c053424922d8ee66";
        libraryHaskellDepends = [
          base haskell-src-meta parsec template-haskell
        ];
@@ -81280,21 +81591,21 @@ self: {
      , conduit-extra, deepseq, hashable, lifted-async, monad-control
      , monad-logger, mtl, QuickCheck, stm, stm-conduit, test-framework
      , test-framework-quickcheck2, text, transformers
-     , unordered-containers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "json-rpc";
-       version = "0.6.2.0";
-       sha256 = "1d9w18x9l0iyq5br1xgjaxkclcmrw56nlkifqkcv9fgsividhyw3";
+       version = "0.7.0.1";
+       sha256 = "e99da039bd589685ce9f396b6ef532a2640731c9e18d374cbe4aaf472530095f";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit conduit-extra deepseq
          hashable lifted-async monad-control monad-logger mtl QuickCheck stm
-         stm-conduit text transformers unordered-containers
+         stm-conduit text transformers unordered-containers vector
        ];
        testHaskellDepends = [
          aeson base bytestring conduit lifted-async monad-logger mtl
          QuickCheck stm stm-conduit test-framework
-         test-framework-quickcheck2 text unordered-containers
+         test-framework-quickcheck2 text transformers unordered-containers
        ];
        homepage = "https://github.com/xenog/json-rpc";
        description = "Fully-featured JSON-RPC 2.0 library";
@@ -81311,7 +81622,7 @@ self: {
      mkDerivation {
        pname = "json-rpc-client";
        version = "0.2.1.0";
-       sha256 = "1ma5vahbcfarbvc0m8n88i0hn9szbvanmfd81jmvwkamkqxxgmis";
+       sha256 = "3ad6d73b9e554dbeab0ca8b96ad55e5f270b4144c8a20ad85e5939b6a0da45d5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81336,7 +81647,7 @@ self: {
      mkDerivation {
        pname = "json-rpc-server";
        version = "0.2.1.0";
-       sha256 = "1rbm8anj3lg3x7gky5nazxcsdwd5c48b1axphgcqzzy5hn8hsg2r";
+       sha256 = "593c0d9185c5ff8fd983b7abb01061a5f1a659ffca163fdfe9e3d121ad4275e5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81360,7 +81671,7 @@ self: {
      mkDerivation {
        pname = "json-schema";
        version = "0.7.4.0";
-       sha256 = "073hs9wmpmv7b07s7by9r6hjcwn7bjhwyf256f2xiz4y355zljf5";
+       sha256 = "c549fa4b199efcd885334538cfa15cc77226a1c9c9afa30f5867d75b79d2701c";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -81380,7 +81691,7 @@ self: {
      mkDerivation {
        pname = "json-sop";
        version = "0.1.0.4";
-       sha256 = "02x65fh0s3gl8adij8xg8mgqp7p3jj4yjhhvch51zgbhcflsb7cv";
+       sha256 = "9b9da5a96370bd1f0a641b42e98994e39e8b5f45af23199b42f40d0da02ba60b";
        libraryHaskellDepends = [
          aeson base generics-sop lens-sop tagged text time transformers
          unordered-containers vector
@@ -81397,7 +81708,7 @@ self: {
      mkDerivation {
        pname = "json-stream";
        version = "0.3.0.4";
-       sha256 = "01hmy7xxlh79mspcx3xgmqlndj8p2mqdjlakr3sl4p837xdkhv2d";
+       sha256 = "4d6c385b3f035d42f5c85351d9701517c96629aeaf8fceaeaee940dafbf11506";
        libraryHaskellDepends = [
          aeson base bytestring scientific text unordered-containers vector
        ];
@@ -81419,7 +81730,7 @@ self: {
      mkDerivation {
        pname = "json-togo";
        version = "0.1.1.0";
-       sha256 = "0aw0dkv1scllj56vj9q07a44vfs88f3k5x1m80y0mivlpz0280l3";
+       sha256 = "830224c0bf74c70a3c4035f432874348bb4d883a0027b94d9194321df66c802b";
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-trans base bytestring scientific text
          transformers unordered-containers vector
@@ -81436,7 +81747,7 @@ self: {
      mkDerivation {
        pname = "json-tools";
        version = "0.5.0";
-       sha256 = "13iyhsq4010ypgmlsdkdk93w8dhg6v0cllsf0avfaxkdva9lrqkf";
+       sha256 = "6ee24c93da6d76e5b6024e53cac0360f36c4479a6d364debbb1e0440b0863e8e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -81453,7 +81764,7 @@ self: {
      mkDerivation {
        pname = "json-types";
        version = "0.1";
-       sha256 = "088if9qv0didjyb6y1583viihjgc4nwr61qfjqdg9rzc2ya6vqdn";
+       sha256 = "b6e16d9417ece7f41a960e0793b925ec4918e31ea8046f96972d36b071721121";
        libraryHaskellDepends = [ base containers text ];
        description = "Basic types for representing JSON";
        license = stdenv.lib.licenses.mit;
@@ -81466,7 +81777,7 @@ self: {
      mkDerivation {
        pname = "json2";
        version = "0.8.3";
-       sha256 = "1w7x67cykbnr2h8jjjqd5whf7pq7vwk7r9g1q1i9g25b9b49i7r8";
+       sha256 = "289f98c84aab889762c0e1a57c26df07dfe3202f0d4b291114d9aee9d931fdf0";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers json2-types mtl old-locale
          parsec pretty time utf8-string
@@ -81483,7 +81794,7 @@ self: {
      mkDerivation {
        pname = "json2-hdbc";
        version = "0.5.1";
-       sha256 = "1flbh68ymm39ccw5h9fiwy35qarn8zkxljmnjgg6fd39j8zbc3dj";
+       sha256 = "b20db63e92693467de93b64adae747362b5c86e7d12558386369d4ea91818bba";
        libraryHaskellDepends = [
          base containers HDBC json2 json2-types time utf8-string
        ];
@@ -81497,7 +81808,7 @@ self: {
      mkDerivation {
        pname = "json2-types";
        version = "0.1";
-       sha256 = "0gr5mfi68hvk8wajw6wbimmwxd0rgjwqrg3mjyfppkr1nwkyfzpr";
+       sha256 = "f97ee727b721cf7b9d9775bc8cb97c19b4ce6b8d8b1b2e1547734364a2ab253f";
        libraryHaskellDepends = [ base containers ];
        description = "Defined JSON data types and function for renders JSON to string";
        license = stdenv.lib.licenses.bsd3;
@@ -81508,7 +81819,7 @@ self: {
      mkDerivation {
        pname = "json2yaml";
        version = "0.3.2.3";
-       sha256 = "1ip9qgrzr59v3zxcj6l1dys0zbfj9s8fgdj4lv1grh7wbzdfz9dn";
+       sha256 = "b6a5efda5ffcc0fcc2a644b6e7904ed2ad0fb46f811ac9fa1f3b95fcf3c3e9c6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ aeson base bytestring yaml ];
@@ -81524,7 +81835,7 @@ self: {
      mkDerivation {
        pname = "jsonresume";
        version = "0.1.0.1";
-       sha256 = "14kv1cbjh1m9ri0vjj015hx6bx6l7jv71gpfa6n0fg21hh5fl7a4";
+       sha256 = "441dea0a84413c07ac51eebe70b63cd4f4653a2c0148b941cca90628170b7b92";
        libraryHaskellDepends = [
          aeson base bytestring old-locale text time unordered-containers
        ];
@@ -81542,7 +81853,7 @@ self: {
      mkDerivation {
        pname = "jsonrpc-conduit";
        version = "0.2.6";
-       sha256 = "08mjwic7qbp241ydxiy5lm782igwd4ba27sii3csv4wdgdxgd3vy";
+       sha256 = "7e8ff67a7b8d93add988511fa11669fc45814ea5c5c7de7c20e22e7c58e4b222";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81565,7 +81876,7 @@ self: {
      mkDerivation {
        pname = "jsonschema-gen";
        version = "0.3.0.1";
-       sha256 = "18hc6a7ihjpnnnjsx4r403w2zx2nzxa4qvj4picdw83r4sgjvv2d";
+       sha256 = "4dec2d9f267920de58bc446e4c54ff56f42ff8002493aea5b5f64a188f320ca2";
        libraryHaskellDepends = [
          aeson base bytestring containers scientific tagged text time
          unordered-containers vector
@@ -81586,7 +81897,7 @@ self: {
      mkDerivation {
        pname = "jsonsql";
        version = "0.1.0.1";
-       sha256 = "1mr4xdwspza87kvaq4337k6hwzvrjxsr5bybdp1sv3x3fdg481ir";
+       sha256 = "3906445e73a38fadc36dcbaf927597797f0ecd3c6310acf63c48fdab79eb24d7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -81608,7 +81919,7 @@ self: {
      mkDerivation {
        pname = "jsontsv";
        version = "0.1.5.0";
-       sha256 = "0qilhv14q51g3dzsxk0zp5fp2igy7m79lq1qsk1myrd6iyannxc5";
+       sha256 = "85756b958fa6655fc3d438609a4e3dfe45715db91fccae7f1b2f144cc2863462";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -81629,7 +81940,7 @@ self: {
      mkDerivation {
        pname = "jspath";
        version = "0.1";
-       sha256 = "072q6mipfaqf33w806chf2226zpay124lgph0wlgfdbhfd5118n7";
+       sha256 = "c7a2104a737035f72807f03e4a44f0ea7e238470901980f8180e2b776335581c";
        libraryHaskellDepends = [
          base bytestring bytestring-trie JSONb utf8-string
        ];
@@ -81645,7 +81956,7 @@ self: {
      mkDerivation {
        pname = "judy";
        version = "0.2.3";
-       sha256 = "1acw072v0lj2jkc6lffcigl1miy1r4wv52qxk6qql0wdg5ydjcjh";
+       sha256 = "5032d97c798d038ab1991d8bb239c9c1c71ae88bcc396ad8944252b0c5019ca9";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        librarySystemDepends = [ Judy ];
        testHaskellDepends = [ base hspec QuickCheck ];
@@ -81663,7 +81974,7 @@ self: {
      mkDerivation {
        pname = "jukebox";
        version = "0.1.4";
-       sha256 = "07galk5i5lq4dx1njd5851c7jz4qwhw8da76ggxd91f9xpvkmf9y";
+       sha256 = "3eb93af7edc985d4fa7be6a88638e4987c795828a83469436f04d312cba4ea1d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81685,7 +81996,7 @@ self: {
      mkDerivation {
        pname = "jumpthefive";
        version = "0.0.1";
-       sha256 = "0ymp7hkkla7jxn3c7prsrcdl0mzkpqdm6ivq599qwx39rcnq6dpl";
+       sha256 = "f436832dcb69748e532a7847531bbef357401bcb3adfc386edf2283a273cb77a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parallel ];
@@ -81701,7 +82012,7 @@ self: {
      mkDerivation {
        pname = "jvm-parser";
        version = "0.2.1";
-       sha256 = "0rhixf1syrnhql3aqlvl9hcylaiyhca1yvismdzalkhbz0qdgvir";
+       sha256 = "39eed730f80b4eaa7eab3a6e1f14833e2aea194c7453ac06c5d066af83eb1166";
        libraryHaskellDepends = [
          array base binary bytestring containers data-binary-ieee754 fgl
          fingertree pretty zlib
@@ -81720,7 +82031,7 @@ self: {
      mkDerivation {
        pname = "jwt";
        version = "0.6.0";
-       sha256 = "02nb1nz7rrgqgr9dg01gi2kh29hpy4mlwpvk5ziqcg3zkb0gl60w";
+       sha256 = "1c18fac09a7f3c86e32f735f4e2bf1172601a7882f80d7527ef8e57cbe0dcb0a";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring containers cryptohash
          data-default http-types network network-uri scientific semigroups
@@ -81745,7 +82056,7 @@ self: {
      mkDerivation {
        pname = "kademlia";
        version = "1.1.0.0";
-       sha256 = "0wjyslrhbms6cnm495g40yl6365h3vgjcka12lka8xdy89v3c0yy";
+       sha256 = "de03367642be75a42615414d26df1eb09861a807e49544aa6546d70533d55e72";
        libraryHaskellDepends = [
          base bytestring containers mtl network stm transformers
          transformers-compat
@@ -81767,7 +82078,7 @@ self: {
      mkDerivation {
        pname = "kafka-client";
        version = "0.7.0.1";
-       sha256 = "1577s3s9lf3rdw7xf7snfhiw53h6pg85l5h9l29av5fsg051ifai";
+       sha256 = "51b9180a78da95ad92a009165ad0bb068ec22374561fd70f6f79389af4d0e794";
        libraryHaskellDepends = [
          base bytestring cereal digest dlist network snappy time zlib
        ];
@@ -81788,7 +82099,7 @@ self: {
      mkDerivation {
        pname = "kan-extensions";
        version = "4.2.2";
-       sha256 = "0dqqlrzrhz8di5hp4kby3205inpj2r30bl75zyy24nq4hgans7g5";
+       sha256 = "e51d6dd583045b22bcffe5d0054616f2da5880187e4d7261890d7d987fa61837";
        libraryHaskellDepends = [
          adjunctions array base comonad containers contravariant
          distributive free mtl semigroupoids tagged transformers
@@ -81803,7 +82114,7 @@ self: {
      mkDerivation {
        pname = "kangaroo";
        version = "0.4.0";
-       sha256 = "1l7b71dhrxd2g3nbqg3h0n5dvgxr23av1cy1f0mvw347y91rx36x";
+       sha256 = "dd8c9e43f2870cbe2b70c1b3b0d510b9bfdd8a05703cbcec78a2f50c5b38ebd0";
        libraryHaskellDepends = [ array base ];
        jailbreak = true;
        homepage = "http://code.google.com/p/copperbox/";
@@ -81819,7 +82130,7 @@ self: {
      mkDerivation {
        pname = "kansas-comet";
        version = "0.3.1";
-       sha256 = "0xbapi4clmkighxh0jb12zpzgrz9sqyfpwdkvrj6cdq6i6a22qx1";
+       sha256 = "a16321948906376664deb3f1eb3cd6e9e7f7ef176149003b7c7156ca48bc6a75";
        libraryHaskellDepends = [
          aeson base containers data-default scotty stm text time
          transformers unordered-containers
@@ -81840,7 +82151,7 @@ self: {
      mkDerivation {
        pname = "kansas-lava";
        version = "0.2.4.3";
-       sha256 = "0i2k5jzirgn68g685azyjp2x96fd2mif56ghxvi566aa1qs5gw1v";
+       sha256 = "3bf057340e4a1953e2eef099e26215cd99d4c595feab82cc43c6be1cbf2c5344";
        revision = "1";
        editedCabalFile = "7b1860125ab2958d3831cb2536a6b939879f09951199649182bb848e70b583eb";
        isLibrary = true;
@@ -81865,7 +82176,7 @@ self: {
      mkDerivation {
        pname = "kansas-lava-cores";
        version = "0.1.2.2";
-       sha256 = "076hd8c59hivdirpf4y5vgdlvhq74lfd5zm6np34y8hblq6jyl0m";
+       sha256 = "15502f0da60b224fc6b5a6fed21c2507c34ddbdbc51377736c3bc254186ad01c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81887,7 +82198,7 @@ self: {
      mkDerivation {
        pname = "kansas-lava-papilio";
        version = "0.3.1";
-       sha256 = "0n8ffiygl72cbqza0whmkhsqyg6d7flfdz1jvr22g68x3005r00y";
+       sha256 = "1e805c00181d992744de32fce6a83bcd3c8f359c1572a03e5e4c1cfa7c740e59";
        libraryHaskellDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava kansas-lava-cores netlist network sized-types
@@ -81904,7 +82215,7 @@ self: {
      mkDerivation {
        pname = "kansas-lava-shake";
        version = "0.1.2";
-       sha256 = "00xkrm724d7q5dmdgz41gm5s058b75rr4pgv3f6qkkx7g9qbd6d7";
+       sha256 = "a799b6707aa7cf898d1bfb5d9273390b15a04b7d81fcd76a2bf834224ecdb303";
        libraryHaskellDepends = [
          base containers directory filepath hastache kansas-lava shake
          temporary text
@@ -81921,7 +82232,7 @@ self: {
      mkDerivation {
        pname = "karakuri";
        version = "0.1.1";
-       sha256 = "0ys4kx4pq9xrb4gjg6syyim8mpfy3yzyyiw2mdc4vh9hmsny373c";
+       sha256 = "6c9ce1adae30c14d58ab8247efbf1fdedd8a6af45e9b271f59b9277c499f447b";
        libraryHaskellDepends = [
          base comonad containers minioperational mtl transformers
        ];
@@ -81938,7 +82249,7 @@ self: {
      mkDerivation {
        pname = "karver";
        version = "0.1.2";
-       sha256 = "0rbxhwxajcv8y6m0pz316r431jh5k8w3bcxqw117cnv6xkwgxpi1";
+       sha256 = "21defef8ec665b7642e0b8b335389a05ca30483661fc0baaf16833a93a877d65";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring text unordered-containers vector
        ];
@@ -81957,7 +82268,7 @@ self: {
      mkDerivation {
        pname = "katt";
        version = "0.2.0.3";
-       sha256 = "1hvi23r9wgz77w6wl9nhpvkcbajm5m8kmy87pjmfgifj60d9cmhg";
+       sha256 = "0f56961a30d2c5e7aabc07f93a512d55aac5e6bed026ca0d3fe73f9ef21071c3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81978,7 +82289,7 @@ self: {
      mkDerivation {
        pname = "kbq-gu";
        version = "0.2";
-       sha256 = "1skz1yllkwbpx4wd8w8q4zmqd3f62baaj5pja6dpqr2xviiv0j6g";
+       sha256 = "cf48b063dc5d647c9b51f216a9d412c68d86eb271871d438e977f149a90f7fea";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -81992,7 +82303,7 @@ self: {
      mkDerivation {
        pname = "kd-tree";
        version = "0.1.0";
-       sha256 = "0j9wlap9gx2szb5saa4pxm7mp2w132ki1p6mlcv0s0wy9rv6dnm7";
+       sha256 = "a7da66764e9e030d36a3d5dc10a718818b5b4fed9728a5cbfa5af497aea23c49";
        libraryHaskellDepends = [
          base lens linear vector vector-algorithms
        ];
@@ -82009,7 +82320,7 @@ self: {
      mkDerivation {
        pname = "kdesrc-build-extra";
        version = "0.1.0.2";
-       sha256 = "1n19jika26wgv7nhbbwnjjhmcbgqqag06k467r6q0s16ilp1p5nr";
+       sha256 = "d9961b2e8d2668804d3e864c039ec2f82d56a19496af05edd98f1ba1669429d8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -82027,7 +82338,7 @@ self: {
      mkDerivation {
        pname = "kdt";
        version = "0.2.3";
-       sha256 = "0chxxl53jnnhfs02gxr2a3kzppmsnwrrfr1fjyx71lkvigwy71yk";
+       sha256 = "d387e3f98b7bd270ba972e649733b7badefbe75022f7278076d05a390aed1d32";
        libraryHaskellDepends = [ base deepseq deepseq-generics heap ];
        testHaskellDepends = [ base deepseq deepseq-generics QuickCheck ];
        homepage = "https://github.com/giogadi/kdt";
@@ -82040,7 +82351,7 @@ self: {
      mkDerivation {
        pname = "keera-callbacks";
        version = "0.1";
-       sha256 = "1xgxg30za69nfk8y83bmskjq2w3r3afg4gc507wkn91xdah93niq";
+       sha256 = "38da91a06a3d243bf901853df29c1a797081e5d4750de4d1743619f5c178fdf5";
        libraryHaskellDepends = [ base mtl ];
        description = "Mutable memory locations with callbacks";
        license = stdenv.lib.licenses.bsd3;
@@ -82053,7 +82364,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-i18n";
        version = "0.0.3.3";
-       sha256 = "0aih2mxgyfnrfnvqqsdv5g7r4jgjg5cfqykgalcsb9wqv0gq6d4i";
+       sha256 = "9134831fd898a7a519556f7aec5879f24992cf2bbb698cb775d93aff7a15302a";
        libraryHaskellDepends = [
          base directory filepath glib hgettext MissingK setlocale
          utf8-string
@@ -82068,7 +82379,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-mvc-controller";
        version = "0.0.3.3";
-       sha256 = "00qr5czm0hq3jxwp42fc50v6r458rm9qq9fpri4rhnc41il79nzb";
+       sha256 = "ebdb74680c84599849ccd7258c53cda8906c3628cc097279970343503f2b1903";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Gtk-based controller for MVC applications";
@@ -82082,7 +82393,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-mvc-environment-gtk";
        version = "0.0.3.3";
-       sha256 = "0bk3191x8bsvmmnqyf7jzmrlg71q26z2kn4xfahdnpgxw3qskwmr";
+       sha256 = "b9f2a9f1e0fd5ddba0729dd829be11389c4773fdf2388f6dad5b2fd4430a632e";
        libraryHaskellDepends = [
          base keera-hails-mvc-model-protectedmodel keera-hails-mvc-view
          keera-hails-mvc-view-gtk
@@ -82099,7 +82410,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-mvc-model-lightmodel";
        version = "0.0.3.4";
-       sha256 = "085qppi68qf8jbkp674ldikhr5z4nrffzqa9kgdm1dngrgsib190";
+       sha256 = "208515f5cbcfb650db9b49e1ef5cb6e4970c676c941c73e792c86164e2bdb820";
        libraryHaskellDepends = [
          base containers keera-hails-reactivevalues MissingK stm
          template-haskell
@@ -82117,7 +82428,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-mvc-model-protectedmodel";
        version = "0.0.3.5";
-       sha256 = "14jm1116j3plzglxygjdymfy8z3p5k8zinnh8wazkxgc5y9kkcsx";
+       sha256 = "5db339932fecf5f91547d0daf8d12c777ce45df54d3edfe9fbf40e6942085592";
        libraryHaskellDepends = [
          base containers keera-hails-reactivevalues MissingK stm
          template-haskell
@@ -82132,7 +82443,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-mvc-solutions-config";
        version = "0.0.3.3";
-       sha256 = "16c6nh5fqw2r42nxs3x27rqbpscypjzgqnprl99241giwcvy98x1";
+       sha256 = "a1a3e437e3f1052252a2f95afcbebc9ee9bb703ea20fddad205970ec0ab48699";
        libraryHaskellDepends = [ base directory filepath MissingK ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Easy handling of configuration files";
@@ -82149,7 +82460,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-mvc-solutions-gtk";
        version = "0.0.3.4";
-       sha256 = "01sksznn8rxv4ww3p99qm8dhjlpy03ygavp512zmyrpvydhp86mm";
+       sha256 = "b51a7461f3fb665fbf08e56ef5fc00fe52091baa38a53b3827bb6764edd75307";
        libraryHaskellDepends = [
          base gtk hslogger HTTP keera-hails-mvc-environment-gtk
          keera-hails-mvc-model-protectedmodel keera-hails-mvc-view
@@ -82166,7 +82477,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-mvc-view";
        version = "0.0.3.3";
-       sha256 = "0jkwbpw23ba5z83nfk51hp8wsfkrbbiwr0f6bvx39wzz1v81n58p";
+       sha256 = "17151bd00efff334fa5ec681cce35a793acdd185a14c6707fa45ad21f85d7c4a";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Generic View for MVC applications";
@@ -82178,7 +82489,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-mvc-view-gtk";
        version = "0.0.3.3";
-       sha256 = "1yz4drm0r1831acg9y8glg7hgiqwgc5nqkz4hfgqgfngqs94jx4z";
+       sha256 = "9f744992c6cfba879f83e44f6c0b7b1cc707cfa30ff9f4980a03850c6a6ee4fb";
        libraryHaskellDepends = [
          base gtk gtk-helpers keera-hails-mvc-view
        ];
@@ -82194,7 +82505,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-reactive-fs";
        version = "0.0.3.4";
-       sha256 = "1yinlhp08xxdlbnm90gnwbr1h9sp8r741ihd8kihy1yfqzkp85cy";
+       sha256 = "9e1574e7c7ce070fe3440dc6404e46572718f2e2f68154eda2ad77042ea436fa";
        libraryHaskellDepends = [
          base directory fsnotify keera-hails-reactivevalues system-filepath
        ];
@@ -82211,7 +82522,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-reactive-gtk";
        version = "0.0.3.6";
-       sha256 = "1i7l330y10vf35b61y9r5wij0gm871n4bc6lij56nx20msi66ch4";
+       sha256 = "043263a2ae40746b8a8cd4b0456c38a83e20232f39f96056196e83e0c118f4c4";
        libraryHaskellDepends = [
          base gtk gtk-helpers keera-hails-reactivevalues mtl transformers
        ];
@@ -82225,7 +82536,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-reactive-network";
        version = "0.0.3.3";
-       sha256 = "1379djvy5nn6k67ds7mk9jjh03zd6sj0v8sf5agmk3pf5cyp0xa3";
+       sha256 = "4375703d2bee8e599f2a4ea30da436ed0f00a54cb31edd8e99c6dae2b76ce98c";
        libraryHaskellDepends = [
          base keera-hails-reactivevalues network
        ];
@@ -82240,7 +82551,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-reactive-polling";
        version = "0.0.3.3";
-       sha256 = "1khkbhj94y6y5s2d56h718c8kh3y698wdryi2369mrw755dy6qh8";
+       sha256 = "0862e35b2987e79acc10d1e7c651327ec089180a079ad2842ede7892245c13ce";
        libraryHaskellDepends = [
          base keera-callbacks keera-hails-reactivevalues
        ];
@@ -82254,7 +82565,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-reactive-wx";
        version = "0.0.3.3";
-       sha256 = "02ikqqfgwr3nrr18qdd1jshqm0dlnwbybqpzpj2ba7zbwpabd5bw";
+       sha256 = "7c95b6d4e5eb1fb584bcffe2e517b7b4818aa196a1358c42ce7664fe1cc6330a";
        libraryHaskellDepends = [
          base keera-hails-reactivevalues wx wxcore
        ];
@@ -82270,7 +82581,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-reactive-yampa";
        version = "0.0.3.3";
-       sha256 = "1n1xyr9pc1sw9gypwhh1rfdjshg7x1kvwr6v3hp0837zvdcz8gw1";
+       sha256 = "813ff459dbff0c042e1cdb64be67e8e7412d9bcb01427efd4b5c077653f63dd8";
        libraryHaskellDepends = [
          base keera-callbacks keera-hails-reactivevalues time Yampa
        ];
@@ -82284,7 +82595,7 @@ self: {
      mkDerivation {
        pname = "keera-hails-reactivevalues";
        version = "0.0.3.4";
-       sha256 = "0qqp4ss0prl3z4bwrsd5jmbvdmhh7x3m846b58dd7ibb0bycp1pb";
+       sha256 = "eb86cbfc026bc5d31a2acb1054473f10d6b65795a5e9cc17f983e60bb4261763";
        libraryHaskellDepends = [ base contravariant ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Values";
@@ -82305,7 +82616,7 @@ self: {
      mkDerivation {
        pname = "keera-posture";
        version = "0.1.4.4";
-       sha256 = "0nlq68da3yfmp058j637xy25jjdwia8b1z49zf70rhdmyh8kvh60";
+       sha256 = "c0c03d11f4b5c10c8efb89fcb0908abc495984ef6718890ab8d5f9a11a32985a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -82335,7 +82646,7 @@ self: {
      mkDerivation {
        pname = "keiretsu";
        version = "0.4.4";
-       sha256 = "0bwwsxav04dnipg5xvb8j4ncxbd5mw6r5gisn5avqjm34wr8y2b9";
+       sha256 = "69098f3227a34abc55b13abe920dafa5adce2c9168ed5ede8db611b055d79c2f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -82362,7 +82673,7 @@ self: {
      mkDerivation {
        pname = "keter";
        version = "1.4.3.1";
-       sha256 = "0bsq6z7krisshcrkb528kixiw6liabb7chgk87088vn3gpwx048i";
+       sha256 = "1111d0f97dc36e84c041f34176d652911a1e7b9c48943533835ac73ccf37582f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -82391,7 +82702,7 @@ self: {
      mkDerivation {
        pname = "kevin";
        version = "0.11.0";
-       sha256 = "00hghd44h8d87kbf0j8ns78syz79a9sdwl454sb5n6ynq62fgwr1";
+       sha256 = "21f3e784c1d61b5b96268550de7452e97cafd1d11649e0d63ca8214848830f02";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -82409,7 +82720,7 @@ self: {
      mkDerivation {
        pname = "keycode";
        version = "0.1";
-       sha256 = "1cwj96mzxqagim3bcshzsrm2mxgmm8rrawy6hkvki9l55cggwbpv";
+       sha256 = "fb2efe1e2b85a638f784c6739533aaf5f52a6ad61f6ab6468d4fe1feab4992b3";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/RyanGlScott/keycode";
        description = "Maps web browser keycodes to their corresponding keyboard keys";
@@ -82421,7 +82732,7 @@ self: {
      mkDerivation {
        pname = "keyring";
        version = "0.1.0.4";
-       sha256 = "1j7nynr7sksrqdn4zfp9ikwx6vvlimlhwhifbs68igfdn03gxnrd";
+       sha256 = "2ddbfe06b0cdbd888c5e2e420e698d746fd3f98ce9ba4f6cc3594f7db2f5f6c8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base udbus ];
@@ -82439,7 +82750,7 @@ self: {
      mkDerivation {
        pname = "keys";
        version = "3.10.2";
-       sha256 = "1xmyhsqpz4rvm2i8f8xgd1wpj8qlps0lvbif1li73lzg13jiwps2";
+       sha256 = "425f1ee508efd371220d2eae4d81be1423797968af2387a2a83b937fb186bef6";
        libraryHaskellDepends = [
          array base comonad containers free hashable semigroupoids
          semigroups transformers unordered-containers
@@ -82460,7 +82771,7 @@ self: {
      mkDerivation {
        pname = "keystore";
        version = "0.7.0.1";
-       sha256 = "0hswqspbb0lmr33bz1d5f12fhs66i2ynynxii6qwcsrzjn77ps8j";
+       sha256 = "12e97b8e953f6bc6b189b15b6fbd88c668e84470a585bfc6c89582b5aec65c43";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -82488,7 +82799,7 @@ self: {
      mkDerivation {
        pname = "keyvaluehash";
        version = "0.3.1.2";
-       sha256 = "1gph4cfx1xqjzhzx6nl2sfgqa6mk6a272a65gk5j43yjfh4s17gl";
+       sha256 = "f49da00974d20f22cb7cc528718432b31a859fd3825ad33ffc12f7d01d23f0be";
        libraryHaskellDepends = [
          array base binary bytestring derive directory filepath hashable
          mmap storable-record
@@ -82504,7 +82815,7 @@ self: {
      mkDerivation {
        pname = "keyword-args";
        version = "0.2.0.2";
-       sha256 = "18cj2l804d77mxzmdl2mai1a157yljskadqdlinmc9w9krhcx4jx";
+       sha256 = "5d92ce609e8927566da40d3735b5a4fe94a0425455d0567fafe73402101592a1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers parsec ];
@@ -82524,7 +82835,7 @@ self: {
      mkDerivation {
        pname = "kibro";
        version = "0.5.0";
-       sha256 = "0yfyx4jyz0n3p2w6pca3nxc72s01240n3siy5sx883ldz706adls";
+       sha256 = "9a3665c0f98d0e84ba2e3eea61011101687158b743b16bb8b8c382ef25e9de79";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82538,7 +82849,7 @@ self: {
      mkDerivation {
        pname = "kicad-data";
        version = "0.1.0.0";
-       sha256 = "02bgz21jw76kzn57z2a7njbwz366j5hpjimyn7dw05h3c64gf8h1";
+       sha256 = "0122f788610316c0dbb1be46796191c68ccf97b447897f8afdd31c2e83f86f09";
        libraryHaskellDepends = [
          base ieee754 lens-family parsec parsec-numbers pretty-compact
        ];
@@ -82560,7 +82871,7 @@ self: {
      mkDerivation {
        pname = "kickass-torrents-dump-parser";
        version = "0.0.1";
-       sha256 = "1bqv07v5sx0jaalnzyk703g08js6sb2snvpsk6ld5zr6iqm7k4wk";
+       sha256 = "9393792a8e26ffd2a899fa6eabc5d2464b04de0067fa6fa95212745df6011baf";
        libraryHaskellDepends = [ base bytestring cassava text vector ];
        testHaskellDepends = [
          base bytestring cassava hspec hspec-expectations string-qq text
@@ -82580,7 +82891,7 @@ self: {
      mkDerivation {
        pname = "kickchan";
        version = "0.1.0.4";
-       sha256 = "1gmp8d2gm275mc379rhyhyfk7r2z8d1mhaz0nikbg4wpczhqf0n7";
+       sha256 = "c70287e1679793b766b4e02b5843435fe4339d871ee67406abe588fa4443b7be";
        libraryHaskellDepends = [ base containers primitive vector ];
        testHaskellDepends = [
          base containers HUnit primitive QuickCheck test-framework
@@ -82598,7 +82909,7 @@ self: {
      mkDerivation {
        pname = "kif-parser";
        version = "0.0.3";
-       sha256 = "1d8abd4l8mcgcfqmm06zmd7yxvfls1kqkphx64bi6mmqzy8lcx3k";
+       sha256 = "73744691ffb8561317311dde8967d0d4edee4fabdf805ab1638f5544495b0ab5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -82614,7 +82925,7 @@ self: {
      mkDerivation {
        pname = "kinds";
        version = "0.0.1.5";
-       sha256 = "169f2b0nn7mkjws6c5sb3mih2p6snhfq42bkfds3zxz01y53v2g5";
+       sha256 = "e5893d8a0fe0f73f74737309821db4da5c01631d4b17663497b31e6bc1122e99";
        libraryHaskellDepends = [ base ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/kinds";
        description = "Emulation of subkinds and subkind polymorphism";
@@ -82629,7 +82940,7 @@ self: {
      mkDerivation {
        pname = "kit";
        version = "0.7.12";
-       sha256 = "0557v1js7bzd9a00lq078csr66pdrr4kr9qiign2zwz03rrcaviw";
+       sha256 = "3c6ec5721ee0f32fec8b11a73c49ceed1a93354307600a804aedafa365d8a714";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -82648,7 +82959,7 @@ self: {
      mkDerivation {
        pname = "kmeans";
        version = "0.1.3";
-       sha256 = "02rc3bd2cp1fp0fxbzqiy34s5gn38j8hgviilz1584z05jhj97ix";
+       sha256 = "3d9e24a12ce01354c2a731ee079144c3bea2c9f011ffd51db82e5c26da1a2c0b";
        libraryHaskellDepends = [ base ];
        description = "K-means clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -82661,7 +82972,7 @@ self: {
      mkDerivation {
        pname = "kmeans-par";
        version = "1.5.1";
-       sha256 = "087z1r9fljvysgl940qpnrf7any80fy33shmn8hbmn2kwgczn69c";
+       sha256 = "2c19fbd9e353d8ba20b215ea31bc03c85b755cb6170392e8d37e4bea520eff20";
        libraryHaskellDepends = [ base metric parallel semigroups vector ];
        testHaskellDepends = [
          base hspec metric normaldistribution parallel QuickCheck semigroups
@@ -82677,7 +82988,7 @@ self: {
      mkDerivation {
        pname = "kmeans-vector";
        version = "0.3.2";
-       sha256 = "1ckw3dmwwqzgbl0wcd6h435afjddqmim3y19p2wqcghxd2rk8bdv";
+       sha256 = "bb2d34b3681d3e86b9b829f85163c5ad49a7ca20d034c6015def63ce6b1b7cb2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl vector ];
@@ -82692,7 +83003,7 @@ self: {
      mkDerivation {
        pname = "knob";
        version = "0.1.1";
-       sha256 = "05qj7s04p5pbasivyxc06l0jbii250zjnvb3l1y2sfhglb7q8b4c";
+       sha256 = "8c2c84cfa20f3a2d7ca0636d2b3f2822c62501358075bfa356eb964b803e1217";
        libraryHaskellDepends = [ base bytestring transformers ];
        homepage = "https://john-millikin.com/software/knob/";
        description = "Memory-backed handles";
@@ -82706,7 +83017,7 @@ self: {
      mkDerivation {
        pname = "knots";
        version = "0.1.0.1";
-       sha256 = "1yv26gnf8aipjh6d6apszbx4jwvfa7cafnjz0frw73xagnd1z084";
+       sha256 = "04811f9a7daa8fc3b3035f5aa7d8516e7349fafafa2ad30c94372ae4ec3362fb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -82723,7 +83034,7 @@ self: {
      mkDerivation {
        pname = "koellner-phonetic";
        version = "0.0";
-       sha256 = "0r7gbgvs49y1nyq5z5f2sb4sjfr847l1vrbih2f5975i3hd9c9kg";
+       sha256 = "6f26961a1cb19c549c8071e51de821283ba9c9d2c2955fb0b7c127a2f75bef64";
        libraryHaskellDepends = [ base HUnit ];
        testHaskellDepends = [ base HUnit ];
        description = "\"map German words to code representing pronunciation\"";
@@ -82740,7 +83051,7 @@ self: {
      mkDerivation {
        pname = "kontrakcja-templates";
        version = "0.1";
-       sha256 = "020vcd04dxaxcd3bb9vwgw1qvxnz5gx590mjkbnnxrcjhl9yd9j8";
+       sha256 = "48a6e6138592e56eed9ab28254fa2bdff68d037f7ca7b546635df54640631b08";
        libraryHaskellDepends = [
          base bytestring containers directory HStringTemplate html MissingH
          mtl old-time parsec transformers utf8-string
@@ -82763,7 +83074,7 @@ self: {
      mkDerivation {
        pname = "koofr-client";
        version = "1.0.0.3";
-       sha256 = "1bz7akd7sssn1gzqfvr0y343771zk7dn1n3as0m93wg4ifpz1dia";
+       sha256 = "2ab6f0af8be4f1912ad06ad860db993f9c33c8f0206f87ff0b566b7dda54e7af";
        libraryHaskellDepends = [
          aeson base bytestring filepath http-client http-client-tls
          http-types mtl
@@ -82778,7 +83089,7 @@ self: {
      mkDerivation {
        pname = "korfu";
        version = "0.2";
-       sha256 = "1mwndf83yl57bawc6vk8983qca3yhcdiczj6q7n1rgv8qphnw0wz";
+       sha256 = "9f036ee1c568bf1cecc1467e161b837e2886074a686ec3b85aa7503f906b96d7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -82796,7 +83107,7 @@ self: {
      mkDerivation {
        pname = "kqueue";
        version = "0.1.2.6";
-       sha256 = "1q25ahsxsxrj8l99skymzssklj11d5prsa09b23dmbgc4qw28lg8";
+       sha256 = "e851243826ecadda865809289d6f6921483ab5fed54f9d12453277dd355445e0";
        libraryHaskellDepends = [ base directory filepath mtl time unix ];
        libraryToolDepends = [ c2hs ];
        jailbreak = true;
@@ -82813,7 +83124,7 @@ self: {
      mkDerivation {
        pname = "kraken";
        version = "0.0.1";
-       sha256 = "1df6g65wrhzfz3kj9n4bcja09adr4qhl3kzv5vaxl37lbr9nwzr2";
+       sha256 = "227f6e535ef40cdad52efbcf412126b9a90494648bd824e7f8eec3cc8b79c6b5";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls mtl
        ];
@@ -82830,7 +83141,7 @@ self: {
      mkDerivation {
        pname = "krpc";
        version = "0.6.1.0";
-       sha256 = "0ldhg4ahhfp4jy3ijssfmcwfg68dggw3biqmc4my2qrcgd2mvx29";
+       sha256 = "49f45d457b2c63e12b6115c735f87b0d99e738ab4e6b198797e43a081579b051";
        libraryHaskellDepends = [
          base bencoding bytestring containers data-default-class lifted-base
          monad-control monad-logger mtl network text transformers
@@ -82849,7 +83160,7 @@ self: {
      mkDerivation {
        pname = "ks-test";
        version = "0.1";
-       sha256 = "1xj9bnwiws3rnax3rlf67p8dh487w07xl99h81a9j1wjkqysldym";
+       sha256 = "d537aa3d9e92079954403025da0fe00711d8d03dc6d13cbab279681eb95d49f6";
        libraryHaskellDepends = [ base gamma random-fu roots vector ];
        description = "Kolmogorov distribution and Kolmogorov-Smirnov test";
        license = stdenv.lib.licenses.publicDomain;
@@ -82860,7 +83171,7 @@ self: {
      mkDerivation {
        pname = "ktx";
        version = "0.2";
-       sha256 = "1s7jw27p96spksja6ks2xdnhyds8diwc5y7h22bj6cq5kglskvxf";
+       sha256 = "aeefa9e99b0533239710f0f8c2786c48370f6deb424fa3a49e579b748fe0f2e8";
        libraryHaskellDepends = [ base bytestring OpenGL ];
        libraryPkgconfigDepends = [ egl glew ];
        homepage = "https://github.com/corngood/ktx";
@@ -82873,7 +83184,7 @@ self: {
      mkDerivation {
        pname = "kure";
        version = "2.16.10";
-       sha256 = "0xfnrp39w2ip9744898mfd63sbya8an72fx3nwj1s3vzdb1h3lhm";
+       sha256 = "15d201c36a7f0f1d24b7a33b71ac42ca2f3d4c73152544c849370a9ec6cdd675";
        libraryHaskellDepends = [ base dlist transformers ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html";
        description = "Combinators for Strategic Programming";
@@ -82885,7 +83196,7 @@ self: {
      mkDerivation {
        pname = "kure-your-boilerplate";
        version = "0.1.3";
-       sha256 = "0bfcmx1fz521vkc2lrbpyvaqcy4c29h5xp6wmyxvgrjjnq32ld1b";
+       sha256 = "2b342a06b652e6b7bbafdcdc5e60128c7886d5f677652ad8dc4194ef42afcc2d";
        libraryHaskellDepends = [ base kure template-haskell ];
        jailbreak = true;
        homepage = "http://ittc.ku.edu/~andygill/kure.php";
@@ -82899,7 +83210,7 @@ self: {
      mkDerivation {
        pname = "kyotocabinet";
        version = "0.1.3";
-       sha256 = "1wzwmfmh2cx3c9blnhk7ibsimwsnnxz9jpcdfdkgy5rb28wvvkyz";
+       sha256 = "dfcfbd39122b17ff66738d5d997eb756f31af58a67424b5762a33301ababfcf3";
        libraryHaskellDepends = [ base bytestring cereal ];
        librarySystemDepends = [ kyotocabinet ];
        description = "Mid level bindings to Kyoto Cabinet";
@@ -82911,7 +83222,7 @@ self: {
      mkDerivation {
        pname = "l-bfgs-b";
        version = "0.1.0.1";
-       sha256 = "0ypzkq2rpbmdjfqba72pl3wf6d4wz0z5vmy84dq5m38ij5mlb4y7";
+       sha256 = "c793456b91118d5a7023c8d75d3ef89c34e3f8a0571cb5b093adae9b059eff7a";
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ lbfgsb ];
        homepage = "http://nonempty.org/software/haskell-l-bfgs-b";
@@ -82925,7 +83236,7 @@ self: {
      mkDerivation {
        pname = "labeled-graph";
        version = "1.0.0.0";
-       sha256 = "060nvnlh1h8vxi6k2hsz79fn4xypangdj5v4q0kc6abyf9garf7r";
+       sha256 = "f9b8ac5e727e29c326c06417d99e55d777625d3a5f43314dec1bc100a9dd1618";
        libraryHaskellDepends = [ base labeled-tree ];
        description = "Labeled graph structure";
        license = stdenv.lib.licenses.bsd3;
@@ -82937,7 +83248,7 @@ self: {
      mkDerivation {
        pname = "labeled-tree";
        version = "1.0.0.0";
-       sha256 = "1cnnyic5z5y21hpxpmx66ph34mjyysckgiasmzg7yx202y2ih7s7";
+       sha256 = "471f18851740747fdeaf5ac53799f65e5632e035a6d7db2f0cc2975f58f4d6b2";
        libraryHaskellDepends = [ base ];
        description = "Labeled tree structure";
        license = stdenv.lib.licenses.bsd3;
@@ -82951,7 +83262,7 @@ self: {
      mkDerivation {
        pname = "laborantin-hs";
        version = "0.1.5.2";
-       sha256 = "18bgd9v4bh3wfh7p7xjzrsj130cppm6x55vzagcpn10cwqag41cs";
+       sha256 = "9a05f214e60c047bd9537f97d24dbd978111a4ce5ff6730f747cc045766a6fa1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -82976,7 +83287,7 @@ self: {
      mkDerivation {
        pname = "labyrinth";
        version = "0.5.0.0";
-       sha256 = "1yi53vg248j8ww08z2a5v3agci84q3m2d37h9mdbprciryh3hfcl";
+       sha256 = "943938a0cf91e5bb5a4df08c26eac00445f6d4d845898f00e7482222de1e25fa";
        libraryHaskellDepends = [
          base containers derive lens monad-loops MonadRandom mtl parsec
          random safecopy template-haskell transformers
@@ -83003,7 +83314,7 @@ self: {
      mkDerivation {
        pname = "labyrinth-server";
        version = "0.1.4.1";
-       sha256 = "00mx8zmwqawp2hh1a0v4r26w7wsji0iz7jwsh83742wimir316aw";
+       sha256 = "5c993072ac910b7206829acbf3238852f3c38dc86403152014972bcceb47bd02";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -83036,7 +83347,7 @@ self: {
      mkDerivation {
        pname = "lagrangian";
        version = "0.6.0.1";
-       sha256 = "07jlmfynnq42syim9k7hks6zmkzq2i62slvwwik8w2rg07ran72v";
+       sha256 = "5b1cabf2012f0b8e66e47c532d4c14f8cffa8d9ef0cc54a3d782606bbdab541e";
        libraryHaskellDepends = [
          ad base hmatrix nonlinear-optimization vector
        ];
@@ -83057,7 +83368,7 @@ self: {
      mkDerivation {
        pname = "laika";
        version = "0.1.3.1";
-       sha256 = "0brysrzz0cci6hqm5ldl7fk5zqhcjp7naifabks1zk3mzg8kr1x1";
+       sha256 = "a1873cd1fb75cc1ff45cca4565cf950ce25fa63bb4d15231349131f07fd63e2f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83076,7 +83387,7 @@ self: {
      mkDerivation {
        pname = "lambda-ast";
        version = "0.0.12";
-       sha256 = "07i0fw7hvkzky9rwrnh4b3i35crbv4mkj0w001dwkgsh1flzh95f";
+       sha256 = "ae24f8a90b50bfc95b008003392bd92bb332e25804dacc73f2f3cf0d0f77201e";
        libraryHaskellDepends = [ base ];
        description = "Lambda Calculi Abstract Syntax Trees";
        license = stdenv.lib.licenses.bsd3;
@@ -83087,7 +83398,7 @@ self: {
      mkDerivation {
        pname = "lambda-bridge";
        version = "0.1";
-       sha256 = "0qiqw4av62fdf2b1qc64lvj84lkzcfpik7lvq81qk015pz58cbs3";
+       sha256 = "432f86cabf25808903c29b9e19af637f5282e4a6c4301c9670cd09b315e13862";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -83103,7 +83414,7 @@ self: {
      mkDerivation {
        pname = "lambda-canvas";
        version = "0.1";
-       sha256 = "14wl1w1sc0j1yjfad5v00346ccxp0grfs1677hnjqwisashdac92";
+       sha256 = "2231d5a0563a722c2d3cc704edf203b73366c8006097a69cf44102a6030f9493";
        libraryHaskellDepends = [ base GLUT mtl OpenGL time ];
        jailbreak = true;
        description = "Educational drawing canvas for FP explorers";
@@ -83118,7 +83429,7 @@ self: {
      mkDerivation {
        pname = "lambda-devs";
        version = "0.4.0";
-       sha256 = "1j2j6clm35ffvdjlh7apydir06g7az40gsqvlcw8p4qbdk2z2vrh";
+       sha256 = "306ff1c56c0b938b38a31beb07c857e7199063f3571d4865dbce9551293352c8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83143,7 +83454,7 @@ self: {
      mkDerivation {
        pname = "lambda-options";
        version = "0.8.0.0";
-       sha256 = "1z9gmps06w458v8i3zpkalby83p367r3z9i0c312jxl0zp51q891";
+       sha256 = "21211ccafd807629c26020a63ff231e30ee41755f3fe11d146857003f4ad2ffd";
        libraryHaskellDepends = [ base containers mtl read-bounded ];
        jailbreak = true;
        homepage = "https://github.com/thomaseding/lambda-options";
@@ -83156,7 +83467,7 @@ self: {
      mkDerivation {
        pname = "lambda-placeholders";
        version = "0.0.0.0";
-       sha256 = "0s3y55yqa5js1q3rfq8dgdip6rnjag4w5j5vdldghq9ax5yph3gd";
+       sha256 = "ed0d787de92a61f81a6dbbc8c2c953d26673637b0d6197070e5a16857d297e68";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mmirman/lambda-placeholders";
        description = "A library to emulate laceholders similar to Scala";
@@ -83168,7 +83479,7 @@ self: {
      mkDerivation {
        pname = "lambda-toolbox";
        version = "1.0.1";
-       sha256 = "1m11gdwq4nma3231043h5szplmask5152y2r9ayyrpacczddcbim";
+       sha256 = "352ed6da674cddecbd4a59785142995a557abf2e7010108618aa5a82797b21d4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -83183,7 +83494,7 @@ self: {
      mkDerivation {
        pname = "lambda2js";
        version = "0.1";
-       sha256 = "0490yswk7zsyc2lskyqkwa98xsaj5a2cgw4pyxbg5920lyjqb3n8";
+       sha256 = "c88e85a5a740a4f256f797f0c7842a52e98e92e213fba9a9605eff33b9f62011";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ haskell2010 parsec ];
@@ -83198,7 +83509,7 @@ self: {
      mkDerivation {
        pname = "lambdaBase";
        version = "0.0.2.0";
-       sha256 = "19c2bxipilb2lag7qzk4ajlzqch574dbhqk9cna13ijsjiyq24nd";
+       sha256 = "cd12817d945ac61194656962b81a390532fca954647e7c9ea262d178635f82a5";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec ];
        license = stdenv.lib.licenses.mit;
@@ -83210,7 +83521,7 @@ self: {
      mkDerivation {
        pname = "lambdaFeed";
        version = "0.3.1";
-       sha256 = "0gji0jix99qbldqkclymnwf5pnmiszy0qka9m2wq8kyi09f3y4h8";
+       sha256 = "08123f5c02d14f84b9a8494d0cfcd7b1da5b1cb7d5533671a30ba7d4a304513e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 html ];
@@ -83227,7 +83538,7 @@ self: {
      mkDerivation {
        pname = "lambdaLit";
        version = "0.1.1.0";
-       sha256 = "1xw1496q84wrzy1r3dwvwy04sb3184namnmdj5kspc5pmd8ipx0h";
+       sha256 = "10f41b51abb7b0ab6791addaaa2c41612c4d80e79bb79183ff9913844d2281f7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -83247,7 +83558,7 @@ self: {
      mkDerivation {
        pname = "lambdabot";
        version = "5.0.3";
-       sha256 = "1kbrmxz5604jzcx9l6j4lmbb0xqz2cmj0f30nmpzdkmzsqv1hfj2";
+       sha256 = "423a1836d6bfcef66fb56038202b131f77b056a5441a9a3afb9200537eaf79cd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -83271,7 +83582,7 @@ self: {
      mkDerivation {
        pname = "lambdabot-core";
        version = "5.0.3";
-       sha256 = "12gawsimdqch61rh4zwvzrx6pqx8yd645wqpki8dr56wnmbhbr03";
+       sha256 = "03e40557b5dc94dc509c17f3424cf3a8e36b7afe9b7f02733090e156a3e6ea89";
        libraryHaskellDepends = [
          base binary bytestring containers dependent-map dependent-sum
          dependent-sum-template directory edit-distance filepath haskeline
@@ -83297,7 +83608,7 @@ self: {
      mkDerivation {
        pname = "lambdabot-haskell-plugins";
        version = "5.0.3";
-       sha256 = "0iya4zipjjaqrld0a1v334praw1vnw186scfsi6inqdg314jc7x1";
+       sha256 = "a11f264918af611b4dd48e698302b73b70952f196307051acd584979e327ca47";
        libraryHaskellDepends = [
          array arrows base bytestring containers data-memocombinators
          directory filepath haskell-src-exts hoogle HTTP IOSpec
@@ -83319,7 +83630,7 @@ self: {
      mkDerivation {
        pname = "lambdabot-irc-plugins";
        version = "5.0.3";
-       sha256 = "1v4zh2yjdgy9ix6dmxdh8j5iqyrixaln78c5jgpiyjcwgi17blrw";
+       sha256 = "3cd375427c9c491fef9385a163a9ea317b1c8b44b0f5da4c8fc9bf26bd809fec";
        libraryHaskellDepends = [
          base bytestring containers directory filepath lambdabot-core
          lifted-base mtl network SafeSemaphore split time
@@ -83339,7 +83650,7 @@ self: {
      mkDerivation {
        pname = "lambdabot-misc-plugins";
        version = "5.0.1";
-       sha256 = "08dhwls7lgwrpyqzjxpg95cn80mqf3izrwnzbmygkp3my8xqxakp";
+       sha256 = "77aa8e3bf275dcf97c5ddff2fce370b802645949ef76f9b1bf993f7a34e5b021";
        libraryHaskellDepends = [
          base bytestring containers filepath hstatsd lambdabot-core
          lifted-base mtl network network-uri parsec process random random-fu
@@ -83360,7 +83671,7 @@ self: {
      mkDerivation {
        pname = "lambdabot-novelty-plugins";
        version = "5.0.3";
-       sha256 = "086y8p92a8g2zjjkxj1ny4s1dlza2dz1v64g3jg7p0dz1n1s1jpy";
+       sha256 = "fecaa0830dbf817b9e1c8f981d7e13ead31634f136c83ea5fce22125d245de20";
        libraryHaskellDepends = [
          base binary brainfuck bytestring containers dice directory
          lambdabot-core misfortune process random-fu regex-tdfa unlambda
@@ -83378,7 +83689,7 @@ self: {
      mkDerivation {
        pname = "lambdabot-reference-plugins";
        version = "5.0.3";
-       sha256 = "1yw1l0jl4iym2q2lfgzcmxm8865av37kf7zji0f7in2phqs3r1zz";
+       sha256 = "ff873c348657d8781c88f21f37cfd8aa18846aafec3f470516d5474225a081fb";
        libraryHaskellDepends = [
          base bytestring containers HTTP lambdabot-core mtl network
          network-uri oeis process regex-tdfa split tagsoup utf8-string
@@ -83395,7 +83706,7 @@ self: {
      mkDerivation {
        pname = "lambdabot-social-plugins";
        version = "5.0.1";
-       sha256 = "0ylp40j54whn4fsgxi0843mvs0gx286c5fm127ja1h7j6c74svkc";
+       sha256 = "6c6e4d0e33f2c0a0e411a1bac20c12fd01bdeb2008c4feb4231672522420977a";
        libraryHaskellDepends = [
          base binary bytestring containers lambdabot-core mtl split time
        ];
@@ -83409,7 +83720,7 @@ self: {
      mkDerivation {
        pname = "lambdabot-trusted";
        version = "5.0.2.1";
-       sha256 = "078yhq9d0vxgnc01hfa25kf4kdg4mymg9678jqmyk8csjy5gjw0h";
+       sha256 = "1070f98a979aa1e92b96e898f4aaafe4b549dc2c42391800b3af6fd012861e1d";
        libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ];
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot trusted code";
@@ -83424,7 +83735,7 @@ self: {
      mkDerivation {
        pname = "lambdabot-utils";
        version = "4.2.2";
-       sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7";
+       sha256 = "a715912af48c3fcd56a5c786f7f3c831d2008909cf985fb7b21ded6d6c4ebf56";
        revision = "3";
        editedCabalFile = "f54d43d6964d63f1d8796606419b512a6e7b87b1defe960748c27c7417f59a08";
        libraryHaskellDepends = [
@@ -83446,7 +83757,7 @@ self: {
      mkDerivation {
        pname = "lambdacat";
        version = "0.1.1";
-       sha256 = "18m7z0lmi26ib1n1wrql96wb5i229k8fk3iw4vavs9j59b4pz1br";
+       sha256 = "79857fc94a4526bdd5263c8ee9d04c42c4b2b84914671e6c58d1885829f8a7a2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83469,7 +83780,7 @@ self: {
      mkDerivation {
        pname = "lambdacms-core";
        version = "0.3.0.2";
-       sha256 = "0m8piymzcciy4dqhxqxslpm1rbzasm1diasr8ab05r9lcrs1dn76";
+       sha256 = "e6d816746634e502964259abd842d5eaaf1ceaa5bae30e71233e32f6ab8f1755";
        libraryHaskellDepends = [
          base blaze-html bytestring containers data-default esqueleto
          file-embed friendly-time gravatar lists mime-mail old-locale
@@ -83491,7 +83802,7 @@ self: {
      mkDerivation {
        pname = "lambdacms-media";
        version = "0.4.0.0";
-       sha256 = "0vq32qppnasc24jrjh6c19hr2pxby65c5m5k90fk7afyms307b5c";
+       sha256 = "acac0386aedea9331d48b3d4c28af1ab5f91610acc409925114c2b7b2f16036f";
        libraryHaskellDepends = [
          base directory filepath lambdacms-core persistent shakespeare text
          time yesod yesod-form
@@ -83506,7 +83817,7 @@ self: {
      mkDerivation {
        pname = "lambdacube";
        version = "2008.12.25";
-       sha256 = "1qwwcbs7slddpjlz3dlyjr32xk66clcbxbnb6j1d5v5dz9mvjh3b";
+       sha256 = "6b40b96bfaadecd28234cbaebe1865c6cc2e46969eb6f1a9bcad517df4629ce3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base editline mtl pretty ];
@@ -83520,7 +83831,7 @@ self: {
      mkDerivation {
        pname = "lambdacube-bullet";
        version = "0.2.1";
-       sha256 = "1wnv8vgp100fdnx4g80d3gshbba9jni7rbjhhj8rx1mi0wcc1bcv";
+       sha256 = "9badc01807b1869e918450ae7ca29549ad05f51b0da047ba6d0e8070df46dbf2";
        libraryHaskellDepends = [
          base bullet lambdacube-engine mtl vector
        ];
@@ -83537,7 +83848,7 @@ self: {
      mkDerivation {
        pname = "lambdacube-core";
        version = "0.2.0";
-       sha256 = "001nw31h61dawh036yk4w9b35aha6c6xdmsl4vdipnr3kwykgk9l";
+       sha256 = "34cd373d9f23db1bdb2654d7d60d330aaa3256e2647a3300e4aa0503c3e03600";
        libraryHaskellDepends = [
          base bytestring bytestring-trie containers mtl vector
        ];
@@ -83553,7 +83864,7 @@ self: {
      mkDerivation {
        pname = "lambdacube-edsl";
        version = "0.2.0";
-       sha256 = "18lbkshc9wh7scb2bbvl565w6yryz7n1iy14r81cahnj7m68fj8m";
+       sha256 = "1549874c3dd242c502ca24f818ecf93e7bc38b2974af2516d307f2c4a09e8ba2";
        libraryHaskellDepends = [
          base bytestring bytestring-trie containers ghc-prim lambdacube-core
          mtl vector
@@ -83572,7 +83883,7 @@ self: {
      mkDerivation {
        pname = "lambdacube-engine";
        version = "0.2.4";
-       sha256 = "1xdp10nylndmfw16dywqrxj30g99rf9qbcx5qiglvzm1c1kxid3f";
+       sha256 = "6eb4d86760a1fe4d5fc4a5b38593cb293d3064cf98fb660277b559ea2d08b7f5";
        libraryHaskellDepends = [
          array base binary bitmap bytestring bytestring-trie containers
          directory filepath mtl OpenGLRaw stb-image uulib vect vector
@@ -83589,7 +83900,7 @@ self: {
      mkDerivation {
        pname = "lambdacube-examples";
        version = "0.2.2";
-       sha256 = "14l40ncbkblphmyn4prqiy2w70agcw830bpyawfdilf93bs340b9";
+       sha256 = "690132f41ac9d1d81c57fe2e3010674f81c3858f385f627d8597aeb998058492";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -83609,7 +83920,7 @@ self: {
      mkDerivation {
        pname = "lambdacube-gl";
        version = "0.2.0";
-       sha256 = "1r26gvpyfvk87wx1fpp6y5687q5y7pxzmjvm55r96m976200lz50";
+       sha256 = "a07c0a8030275593722975cbfafb3dbee0834cf1e65e173a3f686ee7ef7e46e4";
        libraryHaskellDepends = [
          base binary bitmap bytestring bytestring-trie containers
          lambdacube-core lambdacube-edsl language-glsl mtl OpenGLRaw
@@ -83629,7 +83940,7 @@ self: {
      mkDerivation {
        pname = "lambdacube-samples";
        version = "0.2.0";
-       sha256 = "0zl9d524a81vg3h7f9cbfi34b0hw452bd30xmgvg9ayfwxa842d1";
+       sha256 = "a1098254e7ceabf4f6ab1d8cb644211c824546748b2577e0783b20454469897e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -83655,7 +83966,7 @@ self: {
      mkDerivation {
        pname = "lambdatwit";
        version = "0.1.0.0";
-       sha256 = "01mqmhnq70k3yg29z492x7d6mzpwlijdrrgf0zbz8c8mlgnm4ljx";
+       sha256 = "5d5252eda31531f4d707eee5dc64a4fcfe6adae922919fc4f36382832dacb806";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -83679,7 +83990,7 @@ self: {
      mkDerivation {
        pname = "lambdiff";
        version = "0.1";
-       sha256 = "0xlvz4r09vn1vdvs5wykry626hwcsg2zvdvl6jf6zrsq9331zcwy";
+       sha256 = "9eb31fc64858e76f9c3474b7fdc5d38c43238ccfd3f3a277dbc1ee0432f99b76";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -83699,7 +84010,7 @@ self: {
      mkDerivation {
        pname = "lame-tester";
        version = "1.2";
-       sha256 = "1wa7h48a7hfb748i4chl2lpizrqmsdydg9vbwjf8gmy5cwlh816y";
+       sha256 = "de04042967c5d7879ce46ba7d77cd315e71f2f151432121139cbc1a3108147f1";
        libraryHaskellDepends = [
          base bifunctors containers semigroups validation
        ];
@@ -83715,7 +84026,7 @@ self: {
      mkDerivation {
        pname = "language-asn1";
        version = "0.5";
-       sha256 = "14aiqk1l1d3bh7dcml4a85xg81583h3r30h5splw0lvcxmbggzp3";
+       sha256 = "e3fef756ed6c53c0e9d5058291071ca804f47a418ad0cada816bb440c3c45191";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec syb ];
@@ -83729,7 +84040,7 @@ self: {
      mkDerivation {
        pname = "language-bash";
        version = "0.6.0";
-       sha256 = "07hb9hg4grmf01zlvfm583q9km4dxfgm4pkb9glihl3v7iqz21vs";
+       sha256 = "7a07f1713c7b5018e94b6b5e529feb8dd499f040a5ba4d7f00aee6471e4c0b1e";
        libraryHaskellDepends = [ base parsec pretty transformers ];
        jailbreak = true;
        homepage = "http://github.com/knrafto/language-bash/";
@@ -83746,7 +84057,7 @@ self: {
      mkDerivation {
        pname = "language-boogie";
        version = "0.2";
-       sha256 = "166n9x3gil42w26r7p9d1jq6iy0yi9zacijkfmxj2gkkswyyb91x";
+       sha256 = "3da4e53dd7733e217b755346a67e8a1ef868b00c2ddd938de082d0f8464fd698";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83771,7 +84082,7 @@ self: {
      mkDerivation {
        pname = "language-c";
        version = "0.4.7";
-       sha256 = "1r0jlncv6d6ai8kblrdq9gz8abx57b24y6hfh30xx20zdgccjvaz";
+       sha256 = "5f6dc9d86b1f88dec1800e1a4fc43aa52f85fe4bb865ba268aca34b399a512e4";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath pretty process
          syb
@@ -83787,7 +84098,7 @@ self: {
      mkDerivation {
        pname = "language-c-comments";
        version = "0.3";
-       sha256 = "1rmciff72zpcq7pvbbxlsg2339dbk00k18vxp35sz8haql0jnrf2";
+       sha256 = "c2652b01c50aa2afcbb87da3300198aba531c4d3b4afb5efc1ec7e719c8bace6";
        libraryHaskellDepends = [ array base language-c ];
        libraryToolDepends = [ alex ];
        homepage = "http://github.com/ghulette/language-c-comments";
@@ -83803,7 +84114,7 @@ self: {
      mkDerivation {
        pname = "language-c-inline";
        version = "0.7.9.1";
-       sha256 = "0apxv1mcmglb3m06dchs25sc7bhgz6v4gv098yfb79qmjmsxpc33";
+       sha256 = "63b0db759515a7b39c4709ec47b6f90faec374111ab266401d8bbeca6ad8fd2a";
        libraryHaskellDepends = [
          array base containers filepath language-c-quote mainland-pretty
          template-haskell
@@ -83825,7 +84136,7 @@ self: {
      mkDerivation {
        pname = "language-c-quote";
        version = "0.11";
-       sha256 = "1v55pmzrsd7nvxdkik0fh5psbycx9cv4j5zwzlv872lzhfsr3lc7";
+       sha256 = "87d191b5839f8a8336fdfc1749364b9df9a56f810ecc385bdff6349d7fbda5ec";
        libraryHaskellDepends = [
          array base bytestring containers exception-mtl
          exception-transformers filepath haskell-src-meta mainland-pretty
@@ -83846,7 +84157,7 @@ self: {
      mkDerivation {
        pname = "language-cil";
        version = "0.2.2";
-       sha256 = "0b3yapn53bwaxia7b59kizzcxh1d3842as1cbkyzd096v8wsgwfa";
+       sha256 = "caf1a739da2681f6fd5c2c6825081a2dc0cefe8f33957554ec8aaf51ec557e2c";
        libraryHaskellDepends = [ base bool-extras ];
        jailbreak = true;
        homepage = "https://github.com/tomlokhorst/language-cil";
@@ -83859,7 +84170,7 @@ self: {
      mkDerivation {
        pname = "language-css";
        version = "0.0.3";
-       sha256 = "1g0mh08rz44533473isrqbfn6hp12np9dxm85cn5xpx68jl9ni9g";
+       sha256 = "2f459ba844a6df5e2c2ba8f696ae15e14263ddc259c771c81885909f118015bc";
        libraryHaskellDepends = [ base pretty ];
        description = "CSS 2.1 syntax";
        license = stdenv.lib.licenses.bsd3;
@@ -83870,7 +84181,7 @@ self: {
      mkDerivation {
        pname = "language-dot";
        version = "0.0.8";
-       sha256 = "0cjjfm7mcsl0x5by7gvbsdrr92x88i8sadb4pz6qh618sgrci7ax";
+       sha256 = "5d9dc8f2d3281888cdbf6435a55144a88b9473d36bbfe357e9806a564f755232";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
@@ -83887,7 +84198,7 @@ self: {
      mkDerivation {
        pname = "language-ecmascript";
        version = "0.17.0.1";
-       sha256 = "1yawnk6ylx7g9fgx2ib11dgkwkpaz2cy3iph84pxzgqw30yh9q4l";
+       sha256 = "94e0043d181cbfdf2f41f0c6e199f8ea4e3e5f0b6145d19f4bef74eacdb45cf9";
        libraryHaskellDepends = [
          base containers data-default-class Diff mtl parsec QuickCheck
          template-haskell testing-feat uniplate wl-pprint
@@ -83909,7 +84220,7 @@ self: {
      mkDerivation {
        pname = "language-ecmascript-analysis";
        version = "0.9.1";
-       sha256 = "04zc3iwls4hxlsa2c77an5q1h0xylndld02sn38sgykx6ibmmy9n";
+       sha256 = "36f95a57347dfaa7d1b05a80469ba5be031870b1ea1c2694a61d124d791cec13";
        libraryHaskellDepends = [
          base containers language-ecmascript parsec uniplate
        ];
@@ -83926,7 +84237,7 @@ self: {
      mkDerivation {
        pname = "language-eiffel";
        version = "0.1.2";
-       sha256 = "1v3m31ffx4pmgq92ahvlyzsh9hjvrdsmyzhd61qxzgpn3z9zzlcm";
+       sha256 = "95d1ffd31ff6bedf71300d7e5f75cb5bc204f5f7744325127ef592ee5c1875ec";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq derive ghc-prim
          hashable lens mtl parsec pretty text unordered-containers
@@ -83944,7 +84255,7 @@ self: {
      mkDerivation {
        pname = "language-fortran";
        version = "0.3";
-       sha256 = "0csp0nmiwb2kflahhnnjxa7gmam3k9c4ivvh2wg919x85yp7v40z";
+       sha256 = "1f907dae2fa8a7901e1770ef48589aa3aafa8eead25a081575532c1eab055733";
        libraryHaskellDepends = [ array base haskell-src parsec syb ];
        libraryToolDepends = [ alex happy ];
        description = "Fortran lexer and parser, language support, and extensions";
@@ -83956,7 +84267,7 @@ self: {
      mkDerivation {
        pname = "language-gcl";
        version = "0.2";
-       sha256 = "12yh49zh9wissms20rbvgzw5i5wlc8m1iqwkxg68f52g7mk6clrf";
+       sha256 = "2e5366663d4f1487cceb93e3182a62949758f87f7b652074d53af2047f22d08b";
        libraryHaskellDepends = [ base bifunctors parsers ];
        jailbreak = true;
        description = "Something similar to Dijkstra's guarded command language";
@@ -83970,7 +84281,7 @@ self: {
      mkDerivation {
        pname = "language-glsl";
        version = "0.2.0";
-       sha256 = "1wmfzif1cc3a8sls3swms9x54hm9ic8y301zav6fg4mr7xa4hqr3";
+       sha256 = "236348543fb992e7cc563f80e1118ba942527ad295eba1a9466a30165cfcaef2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec prettyclass ];
@@ -83987,7 +84298,7 @@ self: {
      mkDerivation {
        pname = "language-go";
        version = "0.8";
-       sha256 = "1p545115x73q4mzfja50f4lxal97ydvz9r3wq6pvcqls2xgvxzvc";
+       sha256 = "6cffbe5f179a62b6afc17ce4f477f32751d52971a028e97e25789c5e4228a4dc";
        libraryHaskellDepends = [ array base parsec utf8-string ];
        jailbreak = true;
        description = "A library for analysis and synthesis of Go code";
@@ -84000,7 +84311,7 @@ self: {
      mkDerivation {
        pname = "language-guess";
        version = "0.1.2";
-       sha256 = "0gdnkc1hb0mcn494vk9r7fw19hvaba807brwh6fna0sxyh2nx3p0";
+       sha256 = "e08e6e05f45d03659d813caf03905a6ac314b83b39cd4d12b1ac8205039bb63d";
        libraryHaskellDepends = [ base bytestring cereal containers ];
        description = "Guess at which language a text is written in using trigrams";
        license = stdenv.lib.licenses.bsd3;
@@ -84011,7 +84322,7 @@ self: {
      mkDerivation {
        pname = "language-haskell-extract";
        version = "0.2.4";
-       sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl";
+       sha256 = "14da16e56665bf971723e0c5fd06dbb7cc30b4918cf8fb5748570785ded1acdb";
        libraryHaskellDepends = [ base regex-posix template-haskell ];
        homepage = "http://github.com/finnsson/template-helper";
        description = "Module to automatically extract functions from the local code";
@@ -84026,7 +84337,7 @@ self: {
      mkDerivation {
        pname = "language-java";
        version = "0.2.7";
-       sha256 = "1519grsjw0f4skldxs563qz07mmj1cg72ma0plmvzpas7inkikyf";
+       sha256 = "cecf386d3c5addbf2bbd4055711e0bb2d6033e1ea6e8dee8d4c4012e757e2994";
        libraryHaskellDepends = [ array base cpphs parsec pretty ];
        libraryToolDepends = [ alex ];
        testHaskellDepends = [
@@ -84046,7 +84357,7 @@ self: {
      mkDerivation {
        pname = "language-java-classfile";
        version = "0.2.0";
-       sha256 = "0pzlvzx5rv006mn88b15zvvrhf7h681xpl166368b92dc0x85gcf";
+       sha256 = "8ebd823a604da485cc3026d0db0332f03898f7fe252c846c3500ec5cfadff45f";
        libraryHaskellDepends = [
          array base binary bytestring containers data-binary-ieee754
          data-flags deepseq language-java LibZip mtl parsec utf8-string
@@ -84064,7 +84375,7 @@ self: {
      mkDerivation {
        pname = "language-javascript";
        version = "0.5.14.2";
-       sha256 = "0inm6yncl5dv9ij3fyk38c6mad8fm1vqs70rpqi1a7w2n5cbv1ia";
+       sha256 = "2a86bd58b1821f1522be191c8d77a80e35550d43637a37644cbb15caac37d546";
        libraryHaskellDepends = [
          array base blaze-builder bytestring containers mtl utf8-string
        ];
@@ -84087,7 +84398,7 @@ self: {
      mkDerivation {
        pname = "language-kort";
        version = "0.1.0.0";
-       sha256 = "0dhrzd470hfvkjpizgg9czgyz80nc9sq86r2zcimsch6rxmid0i0";
+       sha256 = "2082166bcf06325d23fb221b84756216a0efdf67e9bd1faf9cdb417048fb1936";
        libraryHaskellDepends = [
          base base64-bytestring bytestring random razom-text-util
          regex-applicative smaoin text text-position utf8-string
@@ -84109,7 +84420,7 @@ self: {
      mkDerivation {
        pname = "language-lua";
        version = "0.6.3.2";
-       sha256 = "0wnmybaqiwwxg8xcs7g1ffsmv8kmld7m6s0a8wp0lvhdil7d9xq6";
+       sha256 = "06f7d40e8d0d6e0a2e470a68534fa375a25db573e11dcd3a7a9df388d5f2d572";
        libraryHaskellDepends = [ array base deepseq mtl parsec safe ];
        libraryToolDepends = [ alex ];
        testHaskellDepends = [
@@ -84126,7 +84437,7 @@ self: {
      mkDerivation {
        pname = "language-mixal";
        version = "0.1";
-       sha256 = "0fgjkx003bn0bi4z6rgg8yvsl8k8almydh2lajkyp6zi5348vcv5";
+       sha256 = "65b38dc828f19beba75454c0e62b556822aab747ef65f3495cc0ae01409ff239";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
@@ -84144,7 +84455,7 @@ self: {
      mkDerivation {
        pname = "language-objc";
        version = "0.4.2.8";
-       sha256 = "0dqx8fzbh53kakbh62zmq3x4gx4p5zfwisi3z6n03mjyfv3wv6jv";
+       sha256 = "5b9acdc7765ed601acf923eac8dd2f97f447fac0f50b03d7547314b8be431d37";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath newtype pretty
          process syb
@@ -84162,7 +84473,7 @@ self: {
      mkDerivation {
        pname = "language-openscad";
        version = "0.1.6";
-       sha256 = "0xbwd0arsxinszlmdql5d61w33mpqya8gybkllyb1v7xhqskjasr";
+       sha256 = "592b393586fdecb03ca573f98794c7b78ec1836985e256e9d736769d15687c75";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base bytestring ];
@@ -84181,7 +84492,7 @@ self: {
      mkDerivation {
        pname = "language-pig";
        version = "0.3.0.1";
-       sha256 = "1lv8zm352him9rby1k0n90bklx8wlvr1w8anzmr54fmbd9ibx0f2";
+       sha256 = "c281be626aab3a5272fd56211ef2a61c753a174816cce0574e35425146fd68d3";
        libraryHaskellDepends = [
          base Cabal containers parsec pretty-tree
        ];
@@ -84208,7 +84519,7 @@ self: {
      mkDerivation {
        pname = "language-puppet";
        version = "1.1.3.1";
-       sha256 = "1h6zsslp3szc3m2ki273a6w47gf9fizyjh0xxby694cmhspknn90";
+       sha256 = "20593baf86959164fcea1d40e97f74c9bd43b851e38838451deceb71a9d6dfc0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84244,7 +84555,7 @@ self: {
      mkDerivation {
        pname = "language-python";
        version = "0.5.0";
-       sha256 = "1z0m0lbvrcjyh04zr52wi1zhmb28m4s67zlvf2wc6qh0z9y4l7wy";
+       sha256 = "9e1f4a7cfa0062c3b8709bfe6334a948ac0a7f885c94fc09805eb2bc170515fc";
        libraryHaskellDepends = [
          array base containers monads-tf pretty transformers utf8-string
        ];
@@ -84259,7 +84570,7 @@ self: {
      mkDerivation {
        pname = "language-python-colour";
        version = "0.1";
-       sha256 = "1cspr1v0dm4lbjrb654n8lax9nvmj94a89cp3vqir8xccaxhggpz";
+       sha256 = "ffbe07bb62aca31cf11e9725a4489275dbd415459614b3b25c94d40676c857b3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -84276,7 +84587,7 @@ self: {
      mkDerivation {
        pname = "language-python-test";
        version = "0.5.0";
-       sha256 = "0sxl2snzwi4v3fzfgdwy2fx1pih4qvh1z8s1qkkq346x76n4rgnv";
+       sha256 = "dbbe4cac39dd9081e7c441a31fe0c604c61bba139eb7e7be1b9b44fead16b46b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base language-python ];
@@ -84291,7 +84602,7 @@ self: {
      mkDerivation {
        pname = "language-sh";
        version = "0.0.3.1";
-       sha256 = "12yjynd1sib1mxx4jc28gs1k3r7kl1qv7xhanvn635dkcmswsd5k";
+       sha256 = "b334cd7565b39561ecb60af6b371a0f3e431837e4830497aaf61451d9af5d28b";
        libraryHaskellDepends = [
          base directory filepath mtl parsec pcre-light
        ];
@@ -84310,7 +84621,7 @@ self: {
      mkDerivation {
        pname = "language-slice";
        version = "0.3.0.0";
-       sha256 = "1d9g41z1nw327z5n7hj8gj0yfvmkj7hz7cpwhi4r32xa7x98hdzy";
+       sha256 = "fe3788523faa8b914984fcb2f3e191b36ee7817c48c263cb3f62701b7e202fb5";
        libraryHaskellDepends = [ base bytestring parsec transformers ];
        testHaskellDepends = [
          base bytestring HUnit parsec QuickCheck test-framework
@@ -84329,7 +84640,7 @@ self: {
      mkDerivation {
        pname = "language-spelling";
        version = "0.3.2";
-       sha256 = "05jgx1rcfb9aidrim2h9vr72c3m9hak2njkh04hkf4q3v1pv03ym";
+       sha256 = "d50fb06fd80313372101704a2ba682a90e264ede098a1a738b2a2dc772e84f16";
        libraryHaskellDepends = [
          array base bk-tree bytestring containers ListLike
          listlike-instances text tst vector
@@ -84350,7 +84661,7 @@ self: {
      mkDerivation {
        pname = "language-sqlite";
        version = "1.1";
-       sha256 = "1mpbp56xgqx6j4mfla00kvr9q6mysncjw57mphvrz86ificjw93m";
+       sha256 = "75242e5974d1a09f37bcf5142e99d5be1a9cf29e0028ea2a91a6e3d74db9ebd6";
        libraryHaskellDepends = [
          array base bytestring containers mtl template-haskell utf8-string
        ];
@@ -84367,7 +84678,7 @@ self: {
      mkDerivation {
        pname = "language-thrift";
        version = "0.4.0.0";
-       sha256 = "0al6a9j9hwla8kyfw30m9ylw4wzxv0nr3nvri8w9wnh6ckaf5j2w";
+       sha256 = "5cc8e2d464065a9e388a79db912dd8fd73c2a94f150ceefc448a72986452862a";
        libraryHaskellDepends = [
          base mtl parsers text trifecta wl-pprint
        ];
@@ -84385,7 +84696,7 @@ self: {
      mkDerivation {
        pname = "language-typescript";
        version = "0.0.4";
-       sha256 = "07lm3d4m7c6j2b5gywqm05189iwkh2zjiv5xwwmcw1fm2a63r2zd";
+       sha256 = "ed8b3c8c12d505ce2ae7bdec28bf8093c78442011573ffca12d2b053491b951e";
        libraryHaskellDepends = [ base containers parsec pretty ];
        homepage = "http://github.com/paf31/language-typescript";
        description = "A library for working with TypeScript Definition files";
@@ -84399,7 +84710,7 @@ self: {
      mkDerivation {
        pname = "largeword";
        version = "1.2.3";
-       sha256 = "1ldcsnnji6p84sn03j17pdcpg7vqn1xrhyn4wys0v5fyy0d383ln";
+       sha256 = "960e341af0de950db4e7c47a987bb0789f7759bb27c801ac26e89a28add5acd1";
        libraryHaskellDepends = [ base binary ];
        testHaskellDepends = [
          base binary bytestring HUnit QuickCheck test-framework
@@ -84418,7 +84729,7 @@ self: {
      mkDerivation {
        pname = "lat";
        version = "0.6";
-       sha256 = "0snzcck07v3w1qcgw2j6w7g4ydm59cprf3cqivl9qbgsjljl3zxn";
+       sha256 = "b6ff412595fa2d9ce88e980d972f4ba5364fdee1460afe180e7cec032663df6a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -84439,7 +84750,7 @@ self: {
      mkDerivation {
        pname = "latest-npm-version";
        version = "0.3.1";
-       sha256 = "0z6jl0i9d9r4nifyn2h6pk8s3ni5zfmbc4gpaqim3hzzbh6kqrn0";
+       sha256 = "c0663c0d5cffc3512356f711b6aafb25daa1d1bc060aeb5db424a79622a0d27c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84469,7 +84780,7 @@ self: {
      mkDerivation {
        pname = "latex";
        version = "0.1.0.3";
-       sha256 = "1linwqab6z2s91vdxr874vk7rg7gv1ckabsxwmlr80gnhdfgyhmp";
+       sha256 = "b742ff5c83f6019469e55d2f3559d8efbc7ce62607e5de76485a7cb314e636d2";
        libraryHaskellDepends = [ base containers utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/LaTeX";
        description = "Parse, format and process LaTeX files";
@@ -84483,7 +84794,7 @@ self: {
      mkDerivation {
        pname = "lattices";
        version = "1.3";
-       sha256 = "1jp63rh1girf9ka0lfi219wlisni8dsckf67h6413ihdxdh2mp3l";
+       sha256 = "74dc2a60eb0dc6118881c7b8c97443d1ea48790a223a0ad44c2ec717601ee6ca";
        libraryHaskellDepends = [
          base containers deepseq hashable unordered-containers
        ];
@@ -84498,7 +84809,7 @@ self: {
      mkDerivation {
        pname = "launchpad-control";
        version = "0.0.1.0";
-       sha256 = "0lbrrm5wfi3vgmvba9rvbzq78idq6z98psjfh5scjp8hg0qbf8q2";
+       sha256 = "0223b73078105dc974814eea8bd237b84574f05f3b27b5767d7b44c74bcd7951";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84515,7 +84826,7 @@ self: {
      mkDerivation {
        pname = "lax";
        version = "0.1.0.3";
-       sha256 = "12f0k2545nk50cvs3gd41dhsfls19xkhvn3avhmgx69y57mhalcy";
+       sha256 = "9e5105eb293e99fe2adc6ad80d674f4153a7610ba4bda1370365da428a98c089";
        libraryHaskellDepends = [ base ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/lax";
        description = "Lax arrows";
@@ -84527,7 +84838,7 @@ self: {
      mkDerivation {
        pname = "layers";
        version = "0.1";
-       sha256 = "1yn8swgxb908wslcnh04919m9rzy47dxgawns89zw5v1gbq3wmdf";
+       sha256 = "ae553ef07a6117fe13d296abd7db21fee75453480440cba8e608a4d51fd7c8fa";
        libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/duairc/layers";
@@ -84543,7 +84854,7 @@ self: {
      mkDerivation {
        pname = "layers-game";
        version = "0.5";
-       sha256 = "01j1gq3jd8mm519p3drxfpd32mm1qmik39vijncrx64p7wii73k8";
+       sha256 = "688e13233f97989e999571a73163c5a15631da753db7715328b5a226077e4106";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -84560,7 +84871,7 @@ self: {
      mkDerivation {
        pname = "layout";
        version = "0.0.0.1";
-       sha256 = "04075x2f646ifaw9pxi5s6avp1vis1j524w9a2m3apyrz583cj0g";
+       sha256 = "0f483650f9d95f35aa5089135164d07187bb95d125f69bb872d110e3442f0710";
        libraryHaskellDepends = [ base convertible hinduce-missingh ];
        description = "Turn values into pretty text or markup";
        license = stdenv.lib.licenses.bsd3;
@@ -84572,7 +84883,7 @@ self: {
      mkDerivation {
        pname = "layout-bootstrap";
        version = "0.2.2";
-       sha256 = "0rm0w5l4g865ais4rg3vdfx6fyzp1dginlhlabvqclbjwwzkiyqi";
+       sha256 = "11fb383fe7725186f75214521b5f0bf77b67ba6b7bbc4c7454c5a04768e1a066";
        libraryHaskellDepends = [ base blaze-html containers text ];
        homepage = "https://bitbucket.org/dpwiz/layout-bootstrap";
        description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5";
@@ -84585,7 +84896,7 @@ self: {
      mkDerivation {
        pname = "lazy-csv";
        version = "0.5.1";
-       sha256 = "17v495xnv38bx9zfjfa8dl3prj94lg74dhn1jzqrjq488gfwp2w8";
+       sha256 = "888bcbdd43886099f197c1c246cea324c97c076d4839e97eea0b8d6d7b49649f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -84600,7 +84911,7 @@ self: {
      mkDerivation {
        pname = "lazy-io";
        version = "0.1.0";
-       sha256 = "0fbvm8wwvp4xm4rq2mdfnrra7c88dps91j7ay2vn7iqmpdkcwly9";
+       sha256 = "c953ce66bb15c763b7f0eac890f46d08b1a372b6ae558133a99ddccd39aa7b39";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kawu/lazy-io";
        description = "Lazy IO";
@@ -84612,7 +84923,7 @@ self: {
      mkDerivation {
        pname = "lazyarray";
        version = "0.1.3";
-       sha256 = "0bc2n7x8fydmzc84yb5zbdaca1r4qwpk7zlvbgcycycr87fk7p7n";
+       sha256 = "f6dc33dd419979e6d95b9bfe332fc72407c5545bbf2c4f10fbb57987fab1822d";
        libraryHaskellDepends = [ array base ];
        description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)";
        license = stdenv.lib.licenses.bsd3;
@@ -84624,7 +84935,7 @@ self: {
      mkDerivation {
        pname = "lazyio";
        version = "0.1.0.1";
-       sha256 = "16cl1yifcmfywqc7kgz9kmp0x6s4300ccgmcrzr4j4jgwcgl38bc";
+       sha256 = "6ca1411fe34f1249f2cfac3ec60018449b0e6e9de9bf7918e6de55e6a20f9499";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base transformers unsafe ];
@@ -84638,7 +84949,7 @@ self: {
      mkDerivation {
        pname = "lazysmallcheck";
        version = "0.6";
-       sha256 = "0lqggm75m1qd34lzqj3ibvnjwhjqvq16cab8zxm4yzn7j2sxzm4x";
+       sha256 = "9dd4dfb590c77e4f6aff68296602de58422eed5e7148fc29190d875a4e7d0f53";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.york.ac.uk/~mfn/lazysmallcheck/";
        description = "A library for demand-driven testing of Haskell programs";
@@ -84650,7 +84961,7 @@ self: {
      mkDerivation {
        pname = "lazysplines";
        version = "0.2";
-       sha256 = "0r6z3b6yaxsnz8cbfr815q97jlzsjrqszb2vvzwjyqbh6qqw006y";
+       sha256 = "de00c0313670612ff9df5bacaf7196fa5379122e0165b718fa5677e5cd1adf64";
        libraryHaskellDepends = [ base ];
        description = "Differential solving with lazy splines";
        license = stdenv.lib.licenses.bsd3;
@@ -84662,7 +84973,7 @@ self: {
      mkDerivation {
        pname = "lbfgs";
        version = "0.0.5";
-       sha256 = "0j69hq053ksypb5a3dcvnfa5pscvxhsnby1p5pj4bw6c209g8a06";
+       sha256 = "0628f41210ccf045e42d37f86535ec9be95b94b39bb5a1caba5ecf510086c948";
        libraryHaskellDepends = [ array base ];
        description = "L-BFGS optimization";
        license = "unknown";
@@ -84673,7 +84984,7 @@ self: {
      mkDerivation {
        pname = "lca";
        version = "0.3";
-       sha256 = "081fk0ci5vb84w4zwah6qwbr0i78v2pr6m6nn1y226vv5w3kakza";
+       sha256 = "ea4f35072f7b1b217cb0d65493afd8e8449017c7062afe092768ed1219982e20";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/ekmett/lca/";
@@ -84686,7 +84997,7 @@ self: {
      mkDerivation {
        pname = "lcs";
        version = "0.2";
-       sha256 = "1w8z80vqb86zl6ap4nd87kpl91qms8310k1d8r6qrxg2skm6gnxl";
+       sha256 = "b4db67ead4e2f58c4d462d4c1006d2158744ef3ca8597295a1dfa08537401ff1";
        libraryHaskellDepends = [ array base ];
        homepage = "http://urchin.earth.li/~ian/cabal/lcs/";
        description = "Find longest common sublist of two lists";
@@ -84701,7 +85012,7 @@ self: {
      mkDerivation {
        pname = "lda";
        version = "0.0.2";
-       sha256 = "125y7syfpwg6356h4rq34k45h115ywbz9yisvd741jf6aij23is2";
+       sha256 = "42c7216454c6c9404edb3afaf417f7250458c8240367024d19e6f1ebbc3ebe88";
        libraryHaskellDepends = [
          base containers ghc-prim mtl random-fu random-source rvar vector
        ];
@@ -84718,7 +85029,7 @@ self: {
      mkDerivation {
        pname = "ldap-client";
        version = "0.1.0";
-       sha256 = "18c33jfgwa7vdickxshyhmrqdpndy7ayjd3z0zqkjqa7awd0zcf4";
+       sha256 = "c4b10f1a57476139f1077f34e9d5f1cdde8673851eea3e596cfb28fe9c1c83a1";
        libraryHaskellDepends = [
          asn1-encoding asn1-types async base bytestring connection
          containers network semigroups stm text
@@ -84737,7 +85048,7 @@ self: {
      mkDerivation {
        pname = "ldif";
        version = "0.0.13";
-       sha256 = "0mf0cvjzgimrqf80g6hg75azv18930g5mrvjjxw70116mdpp718a";
+       sha256 = "0a85736fab260470789772e75a1e180985fd55390f9a0790c3b9c6f7e566c055";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84761,7 +85072,7 @@ self: {
      mkDerivation {
        pname = "leaf";
        version = "1.0.1.1";
-       sha256 = "1czk4d2xa2g7djdz669h1q6ciflzwxm4n05m9jv3d3z7r6fcch6z";
+       sha256 = "df40c69cc9e78f36b64cb5004b6ae79fbac80c0e3019f39b6ce709d54523f3b3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -84781,7 +85092,7 @@ self: {
      mkDerivation {
        pname = "leaky";
        version = "0.4.0.0";
-       sha256 = "17cs1mszcfibfkcbwxdcn4pi3n6b84a23szv548vqxwypyrzlbf0";
+       sha256 = "c02dfab3bf9e77bc1129fbeb211441cbd8112fb1ac75bed8742b3af6750d9a9d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -84799,7 +85110,7 @@ self: {
      mkDerivation {
        pname = "leankit-api";
        version = "0.4";
-       sha256 = "14ax9w72cdmbsgy879mwwi2g0345xzfvivrq8b7ngkr8dyfp72r7";
+       sha256 = "278b739d6f28cf67cf4238efb8ddef850cf044e4bca683fcd3ab36260e4f5d91";
        libraryHaskellDepends = [
          aeson base bytestring colour curl split
        ];
@@ -84812,7 +85123,7 @@ self: {
      mkDerivation {
        pname = "leapseconds-announced";
        version = "2015.0.0.1";
-       sha256 = "0k8khjfq1cr8wb2wgwwk7yv6461h7z6wf6qn21qd9zq9i22bpyhm";
+       sha256 = "15fabb848809ffd47010161bc7cd3f301862b63f93f3c7c5e228b3809d84134d";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base QuickCheck time ];
        homepage = "https://github.com/bjornbm/leapseconds-announced";
@@ -84825,7 +85136,7 @@ self: {
      mkDerivation {
        pname = "learn";
        version = "0.1.1";
-       sha256 = "1i2rn4pmgbqxj0xsjqp5rh50lv6zgnblbjgwmqh5cxb3dsillvpj";
+       sha256 = "f26e4aa36e63755620aefcc945977ddf6c0a0acce562a93b901daf572fb159c4";
        libraryHaskellDepends = [ base containers ];
        description = "Learning Algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -84838,7 +85149,7 @@ self: {
      mkDerivation {
        pname = "learn-physics";
        version = "0.5";
-       sha256 = "0bh7p0pp4pspb5m4bfab5z3sfrywlw59yc7w11sa6ax29q9r9faq";
+       sha256 = "58b994134ea22ba37408fc309f0aa7dc67a7c72f4bb9456a59575f722fb8072e";
        libraryHaskellDepends = [
          base gloss gnuplot not-gloss spatial-math vector-space
        ];
@@ -84855,7 +85166,7 @@ self: {
      mkDerivation {
        pname = "learn-physics-examples";
        version = "0.5.0.1";
-       sha256 = "0fwmc7q59srasciijd7ws1bqay4cc7jhi1469my67kchg0n45q3k";
+       sha256 = "73e0422c7890cd637c4d868408e5618c788557d0fc341923d32aeb54f061953b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -84874,7 +85185,7 @@ self: {
      mkDerivation {
        pname = "learning-hmm";
        version = "0.3.2.2";
-       sha256 = "1a2a97cflnlalcqr54ssbmy047i6y1xgswssy64hsr36g2lhywrs";
+       sha256 = "3a730fa97866640d89f15a73fd7af0261e027c5d5a939231a38a5aead8494aa8";
        libraryHaskellDepends = [
          base containers deepseq hmatrix random-fu random-source vector
        ];
@@ -84888,7 +85199,7 @@ self: {
      mkDerivation {
        pname = "leetify";
        version = "0.1.0.1";
-       sha256 = "106pr7rlma67dqqyfhknh9fb6r37lsj00qjx1dq3xx7yxp368nvr";
+       sha256 = "795b64c6edfef43e700b5d6200a4a66764b35c827642e7316ec7a84af3c9d780";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers ];
@@ -84902,25 +85213,27 @@ self: {
     ({ mkDerivation, array, base, binary, binary-shared, blaze-html
      , bytestring, Cabal, conduit, containers, cpphs, deepseq, directory
      , executable-path, filepath, ghc, ghcjs-codemirror, ghcjs-dom, gio
-     , glib, gtk3, gtksourceview3, hamlet, haskell-src-exts, hlint
-     , hslogger, jsaddle, leksah-server, lens, ltk, monad-loops, mtl
-     , network, network-uri, old-time, parsec, pretty, pretty-show
-     , QuickCheck, regex-base, regex-tdfa, regex-tdfa-text, shakespeare
-     , stm, strict, text, time, transformers, unix, utf8-string, vado
-     , vcsgui, vcswrapper, webkitgtk3, webkitgtk3-javascriptcore
+     , glib, gtk3, gtksourceview3, haskell-src-exts, hlint, hslogger
+     , jsaddle, leksah-server, lens, ltk, monad-loops, mtl, network
+     , network-uri, old-time, parsec, pretty, pretty-show, QuickCheck
+     , regex-base, regex-tdfa, regex-tdfa-text, shakespeare, stm, strict
+     , text, time, transformers, unix, utf8-string, vado, vcsgui
+     , vcswrapper, webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.15.1.1";
-       sha256 = "0gjgaigkd34gzfvqhlxqqxcydh12064prnn0x653kb5ks8bq4qml";
+       version = "0.15.1.2";
+       sha256 = "4b90e8f41165afd439a7b3bb587e03c89eb908deec6ee0837af38f7eaf925fc7";
+       revision = "1";
+       editedCabalFile = "e97b32fd5b0bfc80e02961a66cbb505cae737e3bc8f4f88afd9602740fc21d66";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base binary binary-shared blaze-html bytestring Cabal conduit
          containers cpphs deepseq directory executable-path filepath ghc
-         ghcjs-codemirror gio glib gtk3 gtksourceview3 hamlet
-         haskell-src-exts hlint hslogger jsaddle leksah-server lens ltk mtl
-         network network-uri old-time parsec pretty pretty-show QuickCheck
+         ghcjs-codemirror gio glib gtk3 gtksourceview3 haskell-src-exts
+         hlint hslogger jsaddle leksah-server lens ltk mtl network
+         network-uri old-time parsec pretty pretty-show QuickCheck
          regex-base regex-tdfa regex-tdfa-text shakespeare stm strict text
          time transformers unix utf8-string vado vcsgui vcswrapper
          webkitgtk3 webkitgtk3-javascriptcore
@@ -84934,7 +85247,6 @@ self: {
          leksah-server ltk monad-loops QuickCheck stm text transformers
          webkitgtk3
        ];
-       jailbreak = true;
        homepage = "http://www.leksah.org";
        description = "Haskell IDE written in Haskell";
        license = "GPL";
@@ -84951,8 +85263,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.15.0.6";
-       sha256 = "1pcf42hipc5q3n61pbd2sdgvhshl2ri261i94myb3fc13kbi90hb";
+       version = "0.15.0.7";
+       sha256 = "8d98649f6227f0fc3ad9aa169c74f435ec825a1333c57445860b9f8ff1ffc79d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84985,7 +85297,7 @@ self: {
      mkDerivation {
        pname = "lendingclub";
        version = "0.1.1";
-       sha256 = "1r40qm7f45vgzdxnzlhpqhsi81rbwa2nss3gf1d5mqz32dscjwfx";
+       sha256 = "dd71c97413e3e35a5a706f686d85e22b071435c417d26f7bfb6f17e24ec580e4";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring HsOpenSSL http-streams
          io-streams mtl scientific text vector
@@ -85009,7 +85321,7 @@ self: {
      mkDerivation {
        pname = "lens";
        version = "4.12.3";
-       sha256 = "0898z1ws9sy77yfhvx5did0pibpp81yxz0jg418gdx3znd39vyj8";
+       sha256 = "48fa9d46b37ff4f650204f82df7d40f7ae78418badf40d9d3fc7eba479f82821";
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
@@ -85037,7 +85349,7 @@ self: {
      mkDerivation {
        pname = "lens-action";
        version = "0.2.0.1";
-       sha256 = "164fka3krz32zhxnhkylnkmgnx2qj4qvn6y1hfwwla4ddn0axm9n";
+       sha256 = "36d5ae806d8d28cab983c11bbb31915874fbeab4d44f683bfc62fc3c879a8e98";
        libraryHaskellDepends = [
          base comonad contravariant lens mtl profunctors semigroupoids
          semigroups transformers
@@ -85056,7 +85368,7 @@ self: {
      mkDerivation {
        pname = "lens-aeson";
        version = "1.0.0.4";
-       sha256 = "0zjl645y4bwg3pvld8z4vj9rdpdy6fja2cx63d85k37zp5n98y7v";
+       sha256 = "fb78946cb9ff8c59501ba633a1a433bedd9693dce4a346f71d8f2fe20b31547e";
        revision = "2";
        editedCabalFile = "f9ddeac68a237cb5dbe8ab7457fb7529bdeeb675c5e80bc122e196255072393d";
        libraryHaskellDepends = [
@@ -85077,7 +85389,7 @@ self: {
      mkDerivation {
        pname = "lens-datetime";
        version = "0.2.1";
-       sha256 = "1wqks7ynw3njlizdd9hvgrc1xjxcgcfck9ppj1lgg8wr3l2myi72";
+       sha256 = "e2445f051d99a3f76890f7a6c91c7baccb1e587e1ba6d67ea4d20e6efdd113f3";
        libraryHaskellDepends = [ base lens time ];
        homepage = "http://github.com/nilcons/lens-datetime";
        description = "Lenses for Data.Time.* types";
@@ -85091,7 +85403,7 @@ self: {
      mkDerivation {
        pname = "lens-family";
        version = "1.2.0";
-       sha256 = "0pbyx43ajx96nhcw4brml1r5azs1041k7nv4m94ak6x77n5sr4mb";
+       sha256 = "ab92ac8b3da79ba948aa64db330301417f5572a0352fc219b42675a906e97e5d";
        libraryHaskellDepends = [
          base containers lens-family-core mtl transformers
        ];
@@ -85104,7 +85416,7 @@ self: {
      mkDerivation {
        pname = "lens-family-core";
        version = "1.2.0";
-       sha256 = "0hxrbbc4azfafnr4ab2zxgic093wwg6gx5h1ggp4xks55d8rhraz";
+       sha256 = "5f6598512b45cf4eee7b0196fecce37c24c0e2eb5f2c45b275ca7d45d85ab943";
        libraryHaskellDepends = [ base containers transformers ];
        description = "Haskell 98 Lens Families";
        license = stdenv.lib.licenses.bsd3;
@@ -85115,7 +85427,7 @@ self: {
      mkDerivation {
        pname = "lens-family-th";
        version = "0.4.1.0";
-       sha256 = "084yng26xyhw6c6hij3p70zvjpvm1dlw6klphw51car9gi6dqkvm";
+       sha256 = "754fdc4c7c292b160a87974ec3690b755fb93f3877c8080d331cfa6ec4b39e20";
        revision = "1";
        editedCabalFile = "13c96ddf2d410ec4e6671c8412710b7cdbbfc837ff5be1d09a6dbb9ecdb9285d";
        libraryHaskellDepends = [ base template-haskell ];
@@ -85129,7 +85441,7 @@ self: {
      mkDerivation {
        pname = "lens-properties";
        version = "4.11";
-       sha256 = "0cg0n75ss5ayy31igwyz9yz2sh0smcaiidbbm1wkrk1krzbws31w";
+       sha256 = "3c0ccdd7cf33cc3c79a86bb51815ab1a402dbe4fdff317c3f05e15adcbb1e031";
        libraryHaskellDepends = [ base lens QuickCheck transformers ];
        homepage = "http://github.com/ekmett/lens/";
        description = "QuickCheck properties for lens";
@@ -85143,7 +85455,7 @@ self: {
      mkDerivation {
        pname = "lens-regex";
        version = "0.1.0";
-       sha256 = "0hjizjmvdngxn63gs7x87qidh71aqhvyigrnqlbfjqan76pb6m29";
+       sha256 = "4954b3ae395661e916c536bfe837c42a1cd8223ea81ffd86b1fdd9b6abfc5142";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85164,7 +85476,7 @@ self: {
      mkDerivation {
        pname = "lens-simple";
        version = "0.1.0.7";
-       sha256 = "08ynx0zhll603srdmgqf9pgdbzn4i9ry99hs7m35kwaj21whrq5q";
+       sha256 = "b8e00c791052f159463d1aa6e4738ac4fed5de4d0ebfdab21ec0500a3fe8d623";
        libraryHaskellDepends = [
          base lens-family lens-family-core lens-family-th mtl transformers
        ];
@@ -85178,7 +85490,7 @@ self: {
      mkDerivation {
        pname = "lens-sop";
        version = "0.1.0.2";
-       sha256 = "1b56q8qsg3w5gzra7bjf76mqinv8vpjrb6any7c3wdpjgvssly56";
+       sha256 = "a678aaf57ef2363ed8f1569995e5dd68db88ab394eaea3f27f858fa731c2a6ac";
        libraryHaskellDepends = [
          base fclabels generics-sop transformers
        ];
@@ -85191,7 +85503,7 @@ self: {
      mkDerivation {
        pname = "lens-text-encoding";
        version = "0.1.0.0";
-       sha256 = "1yxab87ci6gl0c5gsdd8pb780ai8lmxxa3fxkpl1shv1pw124fsv";
+       sha256 = "5b3b2202bf61431de89ddd0dd57ba5282a80cebaa835fd0a03f499c80e5aaafb";
        libraryHaskellDepends = [ base bytestring lens text ];
        jailbreak = true;
        homepage = "http://github.com/iand675/text-lens-encoding";
@@ -85204,7 +85516,7 @@ self: {
      mkDerivation {
        pname = "lens-time";
        version = "0.1.0.0";
-       sha256 = "1hrp9d6qja7yc3zj68w3hylgflyfsvh79m8daw9030yjdxm525za";
+       sha256 = "ea17516a6fd2830112570dd574e0d6ce53f7a887832323ff60fe28894d4b37c3";
        libraryHaskellDepends = [ base lens time ];
        jailbreak = true;
        description = "lens for Data.Time";
@@ -85216,7 +85528,7 @@ self: {
      mkDerivation {
        pname = "lenses";
        version = "0.1.7";
-       sha256 = "09p1ph5ih2dzrbn7h9wjnf4xch04g0amf8cc3q64g5a2clg3vjx4";
+       sha256 = "a4cb3d1e654295470c1e8c215715780440d689b3922778eccabf09180bbce126";
        libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "http://github.com/jvranish/Lenses/tree/master";
        description = "Simple Functional Lenses";
@@ -85228,7 +85540,7 @@ self: {
      mkDerivation {
        pname = "lensref";
        version = "0.2";
-       sha256 = "0dj43hqrv198dgfnngq4l8kwnksqcm6nydcr1z1a5gqz5s99m4bn";
+       sha256 = "76919a922e1fbfa2c20f99356f4d65584fcb27a2043f6bdd6b28859d311c4436";
        libraryHaskellDepends = [ base monad-control mtl transformers ];
        testHaskellDepends = [ base ];
        jailbreak = true;
@@ -85245,7 +85557,7 @@ self: {
      mkDerivation {
        pname = "lentil";
        version = "0.1.3.1";
-       sha256 = "19zjwkj9is5fdayvwf6w8r42z0lyrbj2lqqw822zr87xaq96r2g2";
+       sha256 = "e2896c1256fda0fc85401c632ae4ca9e822f4846dc38bebd6aaee898e4e4f2a7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -85266,7 +85578,7 @@ self: {
      mkDerivation {
        pname = "level-monad";
        version = "0.4.1";
-       sha256 = "1l5jyhpvbcj4fmyggp8bjy4gx9igcydply3yb1s23fxdcz0b638a";
+       sha256 = "0a0db3c067adbb2174587e787a9b672fa6fe88970bddf77c7544b2b52ff4b2d0";
        libraryHaskellDepends = [ base fmlist ];
        homepage = "http://github.com/sebfisch/level-monad";
        description = "Non-Determinism Monad for Level-Wise Search";
@@ -85281,7 +85593,7 @@ self: {
      mkDerivation {
        pname = "leveldb-haskell";
        version = "0.6.3";
-       sha256 = "0vljwjcd9m63wk7zmkl2s6b6kpjn7hqmwwg0p2bjm0d7ras69pk5";
+       sha256 = "65de64b4caa7812a97b8e0715e313c56de6996d182cefacfe4c3d4d498e4926e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85309,7 +85621,7 @@ self: {
      mkDerivation {
        pname = "leveldb-haskell-fork";
        version = "0.3.4.4";
-       sha256 = "021ckykw5wwkm8gpbqq1znis4rakqmri8bz8ldmm8cmlb3v3b6aq";
+       sha256 = "589935f658b432546ba3e82f1473c55365a2a3fd01e3751faa93f3c2a79f2c08";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85334,7 +85646,7 @@ self: {
      mkDerivation {
        pname = "levmar";
        version = "1.2.1.5";
-       sha256 = "09ambniwcvrss8s3f9rvgrq204d9y7baxiw52r3pp693spmwazkj";
+       sha256 = "727ec5ebd523997b471685c7aed6f1a91120707e3b273734d23a6fc6a35d5525";
        libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
        homepage = "https://github.com/basvandijk/levmar";
        description = "An implementation of the Levenberg-Marquardt algorithm";
@@ -85347,7 +85659,7 @@ self: {
      mkDerivation {
        pname = "levmar-chart";
        version = "0.2";
-       sha256 = "0ws9d2ipk67ir4b31rd7vakyglhrr290k400zpb24ny3vvdgcwaj";
+       sha256 = "5271f6dadec35b22d6fd00900992c819d2e7a7daa7e53016c9f19879a3684973";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
@@ -85366,8 +85678,8 @@ self: {
      }:
      mkDerivation {
        pname = "lexer-applicative";
-       version = "2.1";
-       sha256 = "1xryc4nnfs7vzvmdszksmzjmz0pi1gpip0qr3gf2lv0baayma7zj";
+       version = "2.1.0.1";
+       sha256 = "3e9612800e7d70f997e0d3396628b91133568b9e85e2c160834d1eb96acca49c";
        libraryHaskellDepends = [ base regex-applicative srcloc ];
        testHaskellDepends = [
          base deepseq regex-applicative srcloc tasty tasty-hunit
@@ -85387,7 +85699,7 @@ self: {
      mkDerivation {
        pname = "lgtk";
        version = "0.8.0.4";
-       sha256 = "1bph09i8znzv3c8sqbg2xbrdlpvlnx52psgyybwn0imqip81lmv5";
+       sha256 = "65571ad08db84660f9f2fee92b4ab7745fdaf2eae22dac111bfbdb8f6202f0ae";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85412,7 +85724,7 @@ self: {
      mkDerivation {
        pname = "lha";
        version = "0.1.2";
-       sha256 = "0a5h1d0sdnpy209k4zkmcrrxl4b000226hif098bqs9pngpbgki1";
+       sha256 = "21ceb7eeb33769bc50022e422304006011da7366757e321310fedaa6410bb028";
        libraryHaskellDepends = [ haskell2010 ];
        homepage = "https://github.com/bytbox/lha.hs";
        description = "Data structures for the Les Houches Accord";
@@ -85428,7 +85740,7 @@ self: {
      mkDerivation {
        pname = "lhae";
        version = "0.0.3";
-       sha256 = "120g8x0wbd5va2gqvkr5mx643g8r4hrfyqa68nm3apvfc9z7f8g3";
+       sha256 = "e321777e626e5f35aa454661ef322419bd414caf25cf8d9f50bbb4c541470f88";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -85453,7 +85765,7 @@ self: {
      mkDerivation {
        pname = "lhc";
        version = "0.10";
-       sha256 = "1x50k6lx9p36qxl0qn9zfyqlkgsq3wdzvcv7l6sn920hg5scvcr3";
+       sha256 = "23b3cd7479108864b5a167b3fd1b1f58bf49b1773f590c68c766dcd4a999a0f4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -85473,7 +85785,7 @@ self: {
      mkDerivation {
        pname = "lhe";
        version = "0.5";
-       sha256 = "08725r5i71ni9ip4qbc5fr111j256rsii936yvxbd7kbbw4ap2a9";
+       sha256 = "4989ab085f6b9eb6faf666a418753645c8104276852d4c6e4cd186134b2ee220";
        libraryHaskellDepends = [ bytestring haskell2010 HaXml lha ];
        description = "Parser and writer for Les-Houches event files";
        license = stdenv.lib.licenses.mit;
@@ -85487,7 +85799,7 @@ self: {
      mkDerivation {
        pname = "lhs2TeX-hl";
        version = "0.1.4.5";
-       sha256 = "1mm6ikiv6zj025yh5abq3f8mqkw9302mfzd01xcihbh74bsdpi9l";
+       sha256 = "34c5dbf422072e18590fa07d570518894f5c911b78a9027d11407eb3e38ca6d6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -85504,7 +85816,7 @@ self: {
      mkDerivation {
        pname = "lhs2html";
        version = "0.999999";
-       sha256 = "1cwvpn6cl0d5rs5x6q3c2pw4l4hpxz20sr717mggafzsj6j7cccv";
+       sha256 = "9b3176a491fa3bf55e3de1640dc4ef17124af8156c60d38bcea501ca8cbd9bb3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath Glob ];
@@ -85519,7 +85831,7 @@ self: {
      mkDerivation {
        pname = "lhs2tex";
        version = "1.19";
-       sha256 = "03mhhkrqjjqmmh18im8di1cl6wqv30lsib5hv73f0wsnv5bhbbi4";
+       sha256 = "24ae0557d95673e0c6d9b0aca829181b734359880dd58802ac154b89f384b00e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -85535,7 +85847,7 @@ self: {
      mkDerivation {
        pname = "lhslatex";
        version = "0.1.0.0";
-       sha256 = "0kgmx160i1rylgzh23qlg8ds0sq64yk1i3rah8kmgwabpnvds7f7";
+       sha256 = "c71dddb6bd4bf15727822a8f18a627066ba01b7a140f01ffa33e87084ce8f54d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -85554,7 +85866,7 @@ self: {
      mkDerivation {
        pname = "libGenI";
        version = "0.16.1";
-       sha256 = "1n37pccmx0466425zcbdfpgivsrnqzwsm0nwcjv8lkg8jxjxrwmz";
+       sha256 = "bff2dc6597e84d8ab664dc82aaf9c736eb1ddf756db15f043186805e19bb67d8";
        libraryHaskellDepends = [
          base binary containers HUnit mtl parsec process QuickCheck
        ];
@@ -85571,7 +85883,7 @@ self: {
      mkDerivation {
        pname = "libarchive-conduit";
        version = "0.1.0.0";
-       sha256 = "022fnxxwz44cjzcldk3yg1xs77xqnrvkr9bv6hi7kdy120dk4p04";
+       sha256 = "045c321b10c1b77922347ba53c77b6b89fa37b787ecc46d9978c90cf7bb74e08";
        libraryHaskellDepends = [
          base bytestring conduit resourcet transformers
        ];
@@ -85588,7 +85900,7 @@ self: {
      mkDerivation {
        pname = "libconfig";
        version = "0.3.0.0";
-       sha256 = "152rvfyc6y9waxic9fw4hfb7w5qfcrr23hdv9jlvksg9yw8mnq12";
+       sha256 = "22605b11f7e9e9b9a94cbbc12172660e177e968384bbc462573c79c3bcdb5994";
        libraryHaskellDepends = [
          base binary cereal cereal-text deepseq hashable text text-binary
          transformers transformers-compat
@@ -85609,7 +85921,7 @@ self: {
      mkDerivation {
        pname = "libcspm";
        version = "1.0.0";
-       sha256 = "1v8w8i871a0fjyjqb8hr4yk9wli5v7djfpyjgg14rjb26v6yq79v";
+       sha256 = "3b1deccd3662c94cc27bd25f27dbd925529ea62719a285a5970ea87050441ced";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath
          graph-wrapper hashable hashtables mtl pretty text value-supply
@@ -85629,7 +85941,7 @@ self: {
      mkDerivation {
        pname = "libexpect";
        version = "0.3.2";
-       sha256 = "0xpsc9a16biqg4z9b9wk9wqz6ypshw99xrksnxi8nlh3qn98lrsc";
+       sha256 = "4c678a92c503528b62b77ae69e1287fa7af3314f93a7953e79382e135462fa76";
        libraryHaskellDepends = [ base unix ];
        librarySystemDepends = [ expect tcl ];
        description = "Library for interacting with console applications via pseudoterminals";
@@ -85642,7 +85954,7 @@ self: {
      mkDerivation {
        pname = "libffi";
        version = "0.1";
-       sha256 = "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28";
+       sha256 = "48387067c0f33bcfadf7a3bebbf48a55294202500f2b754229ffc8f12cb4f23c";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ ffi ];
        libraryPkgconfigDepends = [ libffi ];
@@ -85655,7 +85967,7 @@ self: {
      mkDerivation {
        pname = "libgit";
        version = "0.3.1";
-       sha256 = "08km9y2wqz426c5c6r49ar5snl8ss1w7d55yqivksdkwk3fn0k0x";
+       sha256 = "1d4c60dd987c363d77c4be947678d01a51ab4b568964c30a33827ccc854f7522";
        libraryHaskellDepends = [ base mtl process ];
        homepage = "https://github.com/vincenthz/hs-libgit";
        description = "Simple Git Wrapper";
@@ -85669,7 +85981,7 @@ self: {
      mkDerivation {
        pname = "libgraph";
        version = "1.5";
-       sha256 = "0pyync48lr2silvm3cdmn11zmv355hcmmaj6rm7lb365mqv444i1";
+       sha256 = "21124236aec58c454fcd46aa5a192c65ecfa43b0b5b151378d5a648a08b3de5f";
        libraryHaskellDepends = [
          array base containers monads-tf process union-find
        ];
@@ -85686,7 +85998,7 @@ self: {
      mkDerivation {
        pname = "libhbb";
        version = "0.4.1.0";
-       sha256 = "17wycfnp1f288fxq3vd9c206gcard3n59s0a0myy0hkl6xy281s8";
+       sha256 = "4807247c377442e07d050ae854ec6859b1678060a9ed81bb4348b870ad639e9f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85714,7 +86026,7 @@ self: {
      mkDerivation {
        pname = "libjenkins";
        version = "0.8.1";
-       sha256 = "00h4wzzs6b3s9cv4bw2slj3c0ckb6p8gph7wzx8cgrxjyjqqx85z";
+       sha256 = "bfa08eb1f4b2e7c750fffcc0fbd0356b32c086a45af045364b7a2ca3ffe70402";
        libraryHaskellDepends = [
          async attoparsec base bytestring conduit containers free
          http-client http-conduit http-types monad-control mtl network
@@ -85742,7 +86054,7 @@ self: {
      mkDerivation {
        pname = "liblastfm";
        version = "0.5.1";
-       sha256 = "1bf508a1rqjb486wcwn0n36bm8lwnj3b4bg0826lp92zmaxiyxpy";
+       sha256 = "fe761fbbaa5fa44b8d40e02db286b49ca2baccb0c072c60d224be21c1402c5ad";
        libraryHaskellDepends = [
          aeson base bytestring cereal containers crypto-api http-client
          http-client-tls network-uri profunctors pureMD5 semigroups text
@@ -85763,7 +86075,7 @@ self: {
      mkDerivation {
        pname = "liblinear-enumerator";
        version = "0.1.2";
-       sha256 = "19x0y70fn2pr06qsz4z6s67sym7dw5x3qa3z6jf3nmwncsy64qi2";
+       sha256 = "226262bc6696573b9c347f283c7ae1ed54af8fd1e693afb101f90aebc0f1a0a7";
        libraryHaskellDepends = [
          base bindings-DSL enumerator mtl vector
        ];
@@ -85778,7 +86090,7 @@ self: {
      mkDerivation {
        pname = "libltdl";
        version = "0.1.0.3";
-       sha256 = "05a4l841w20l4a0wmbp93bb1vc4kmnbcv7pmnym5hrrd7daj2vzr";
+       sha256 = "f96f21553b2d6758aab7f59ecd96ad93b01dd61ae9aeca812214081e08a24415";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -85797,7 +86109,7 @@ self: {
      mkDerivation {
        pname = "libmpd";
        version = "0.9.0.2";
-       sha256 = "1q6lcp9gfzvzcsigv6958ng9c44kq68qh4amnszjjji0jq0lvdjz";
+       sha256 = "5fb64d0196204a29bfb655118891c19310969e452599fda2667f7ff7d265d4e0";
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class filepath
          mtl network old-locale text time utf8-string
@@ -85816,7 +86128,7 @@ self: {
      mkDerivation {
        pname = "libnotify";
        version = "0.1.1.0";
-       sha256 = "1wc19v14agadj7dzi81lm3qzk2x33apaj5ylmg7x232k56xzfvr0";
+       sha256 = "206ff7bb29530cd1cfabd417a9ae1aa38bf9f1a834a0f8db914d3d45c24e81f1";
        libraryHaskellDepends = [ base bytestring glib gtk ];
        librarySystemDepends = [ libnotify ];
        description = "Bindings to libnotify library";
@@ -85830,7 +86142,7 @@ self: {
      mkDerivation {
        pname = "libnvvm";
        version = "1.0.0";
-       sha256 = "00vblp869zyk8gr33b846rnvn9axlsbldhx1gkj14xgrlyambdmx";
+       sha256 = "bdb65595a7f97512e47ca1c34697a65d25bb6d3604ad31f243d3ff64d0a56b03";
        libraryHaskellDepends = [ base bytestring cuda ];
        librarySystemDepends = [ nvvm ];
        libraryToolDepends = [ c2hs ];
@@ -85849,7 +86161,7 @@ self: {
      mkDerivation {
        pname = "liboleg";
        version = "2010.1.10.0";
-       sha256 = "1lv0il1psy8bfdxc76ivc5nlwga4m475gys1g0ia3wacdksgs7a6";
+       sha256 = "461dfdf46c4cf1a1227841fb570ea9443d4e6d613b9ac37a730b797d038d60d3";
        libraryHaskellDepends = [
          base CC-delcont containers mtl template-haskell unix
        ];
@@ -85864,7 +86176,7 @@ self: {
      mkDerivation {
        pname = "libpafe";
        version = "0.1.1.0";
-       sha256 = "1l2s98y805mgxnwy2jvrab65gz1aq5zf48rqk88nclb97w04lnws";
+       sha256 = "9a5b4a003f695166119a3823e27ec12afc57cc52794be1b9edaf16803c4a5ad0";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ pafe ];
        testHaskellDepends = [ base bytestring iconv transformers ];
@@ -85879,7 +86191,7 @@ self: {
      mkDerivation {
        pname = "libpq";
        version = "0.4.1";
-       sha256 = "11s8zaxq7qwzqdgyfd3v7sk6vf5cq3wzv2j02g0gnri9w45wf2i7";
+       sha256 = "270ac70be12966fbc013408afdf9c0acb86da63e7b34e75fc39fe383bbfa4887";
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ postgresql ];
        homepage = "http://github.com/tnarg/haskell-libpq";
@@ -85893,7 +86205,7 @@ self: {
      mkDerivation {
        pname = "librandomorg";
        version = "0.0.1.0";
-       sha256 = "07xg59f48jw78mjbx83bz1rc2fxvdnlb08cdfd7hwkj43a127kxn";
+       sha256 = "b6cf23821a444e0e4f738d21b0a86dbb3bc172f86ba0be6445874b445c2aaf1f";
        libraryHaskellDepends = [ base bytestring curl ];
        jailbreak = true;
        homepage = "https://github.com/supki/haskell-random.org";
@@ -85909,7 +86221,7 @@ self: {
      mkDerivation {
        pname = "librato";
        version = "0.2.0.1";
-       sha256 = "1l0q8kx0v563glplz5blg5scnvwf1aak04w08abxkrbfdjq6a8z4";
+       sha256 = "e42365b06c6ee5d99742801330950a8e6fcb747974954f2f7dc3940dfa4418d0";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring either http-client http-conduit
          http-types mtl resourcet text unordered-containers uri-templater
@@ -85927,7 +86239,7 @@ self: {
      mkDerivation {
        pname = "libravatar";
        version = "0.1.0.1";
-       sha256 = "00rdnhxwp1h4ax3cwlmqa6digzl1b8br5ajg7k0dsydb9ik171x5";
+       sha256 = "a58713664cab79ddc03c4faa92175a81fe179b51b852ce46570486cb3bb42d03";
        libraryHaskellDepends = [
          base bytestring crypto-api dns network-uri pureMD5 random SHA url
          utf8-string
@@ -85944,7 +86256,7 @@ self: {
      mkDerivation {
        pname = "libssh2";
        version = "0.2.0.3";
-       sha256 = "0xfdhszz4j98spmzwxwcjnm3kzjkg76bwszmky0lmx9zmqirzakw";
+       sha256 = "7caa9f23ae3ff54a819ff56bbecc7953fe39aa958c77feebd52849f2bf86cd75";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring network syb time ];
@@ -85963,7 +86275,7 @@ self: {
      mkDerivation {
        pname = "libssh2-conduit";
        version = "0.1";
-       sha256 = "1zpcj6qwc4kpdcgdqlzspzwz99a990f3r5wpl13l54j8c1g0kc8h";
+       sha256 = "10b1095e6048924247a097973c1c4849a5f4f9bffa53dc1e6b7712c6b191ecfe";
        libraryHaskellDepends = [
          base conduit libssh2 monad-control stm transformers
        ];
@@ -85980,7 +86292,7 @@ self: {
      mkDerivation {
        pname = "libstackexchange";
        version = "0.3.0.0";
-       sha256 = "00v8hmk67dsb0j1bncc06fh46jkz4raf5a796l223mg6x0l3a828";
+       sha256 = "48203528e8e6d5210435e9a8e254267f4a43a0338031bb82044bb76366856803";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default
          http-conduit profunctors text
@@ -85997,7 +86309,7 @@ self: {
      mkDerivation {
        pname = "libsystemd-daemon";
        version = "0.1.0.1";
-       sha256 = "1rmzyca7ry30d6wvhv3k30jaksa3iw8kzk1rwp6gwclxizsvwgf0";
+       sha256 = "c03dbef58f9d32fecce539cc3f118f43e9a92418736cb8b96960f87c14f3bfe6";
        libraryHaskellDepends = [ base bytestring network utf8-string ];
        librarySystemDepends = [ systemd-daemon ];
        testHaskellDepends = [
@@ -86016,7 +86328,7 @@ self: {
      mkDerivation {
        pname = "libsystemd-journal";
        version = "1.3.3";
-       sha256 = "02d1zpmimmisjngkx9l23af51v18pdbc5mh7yljyw81lm39yzvfn";
+       sha256 = "d6edefd3a83420ee25f507d6c256bb28ec509c1a82a63e9f953ad61aebfda109";
        libraryHaskellDepends = [
          base bytestring hashable hsyslog pipes pipes-safe text transformers
          uniplate unix-bytestring unordered-containers uuid vector
@@ -86032,7 +86344,7 @@ self: {
      mkDerivation {
        pname = "libtagc";
        version = "0.12.0";
-       sha256 = "1f7r82cfrkxrqcrxk92y6zhk79qwpack2g67crww5q8hs7438vja";
+       sha256 = "4a6e34c8d110e1c27966c73c3199ba1ca733e1375ea4d933c3b9cfec9840f9b8";
        libraryHaskellDepends = [ base bytestring glib ];
        librarySystemDepends = [ taglib ];
        libraryPkgconfigDepends = [ taglib ];
@@ -86047,7 +86359,7 @@ self: {
      mkDerivation {
        pname = "libvirt-hs";
        version = "0.1";
-       sha256 = "0fgxvzzfw52s4hs838l0sr6lxln4bhqqhzzy6grww2fs27gjpb4c";
+       sha256 = "8cac2bdf11da09cef333fe7f88315cc4d24e4dd680a28134245a14eefedffd39";
        libraryHaskellDepends = [ base syb ];
        librarySystemDepends = [ virt ];
        libraryToolDepends = [ c2hs ];
@@ -86062,7 +86374,7 @@ self: {
      mkDerivation {
        pname = "libvorbis";
        version = "0.1.0.1";
-       sha256 = "0ykv2jv559yalypadwnvpzv87rksn24b4h8qi9x1x6r2x4kbwvrl";
+       sha256 = "346fbe26e9229b1e7a8a1841b288b07ae683f6bfdbf2a6aea7caa752b6147b7a";
        libraryHaskellDepends = [ base bytestring cpu ];
        homepage = "https://github.com/the-real-blackh/libvorbis";
        description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files";
@@ -86074,7 +86386,7 @@ self: {
      mkDerivation {
        pname = "libxml";
        version = "0.1.1";
-       sha256 = "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi";
+       sha256 = "d1e92affb41e7abe1c7b692aa24ae47dbcf3636f2753bb85a3469c370d9afb07";
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ libxml2 ];
        description = "Binding to libxml2";
@@ -86089,7 +86401,7 @@ self: {
      mkDerivation {
        pname = "libxml-enumerator";
        version = "0.5";
-       sha256 = "0mqh454w1f3k75kcshdn848ynva938q6xm3a5yzcyf7nflzw75pg";
+       sha256 = "ef96c33f75f638cfbe2f6ad46e301a496deb1141b641cd663973b8c049211057";
        libraryHaskellDepends = [
          base bytestring enumerator libxml-sax text transformers xml-types
        ];
@@ -86104,7 +86416,7 @@ self: {
      mkDerivation {
        pname = "libxml-sax";
        version = "0.7.5";
-       sha256 = "0lbdq6lmiyrnzk6gkx09vvp928wj8qnqnqfzy14mfv0drj21f54r";
+       sha256 = "99141784cc0d6c5749f0df618b2d46922391eede09f4f9ccfc36fb58a9c16d51";
        libraryHaskellDepends = [ base bytestring text xml-types ];
        librarySystemDepends = [ libxml2 ];
        libraryPkgconfigDepends = [ libxml2 ];
@@ -86118,7 +86430,7 @@ self: {
      mkDerivation {
        pname = "libxslt";
        version = "0.1";
-       sha256 = "1szz8zkm1w8dbfgix3ii896sc4vljgivcgx8j7vpny4ci9sfmn5a";
+       sha256 = "aad8ea748a8c787bf791a83fb6e3937413a64d42318e1e9f5b0df150e747ffeb";
        libraryHaskellDepends = [ base bytestring libxml ];
        librarySystemDepends = [ xslt ];
        jailbreak = true;
@@ -86132,7 +86444,7 @@ self: {
      mkDerivation {
        pname = "life";
        version = "0.1";
-       sha256 = "0drsv1d0318yr7a0aa2j6kvsiyl8jj8h4z6wpdnrcyxw6z4qlssq";
+       sha256 = "586b8ac937bc7b966dbbdc7c02919488faa8f734522805d4c91e85015ad83a37";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base GLUT OpenGL random ];
@@ -86149,7 +86461,7 @@ self: {
      mkDerivation {
        pname = "lifted-async";
        version = "0.7.0.1";
-       sha256 = "0skfpgqlxni3bdn7pdg2732xkijmwsz655962wrbmflh987ms8y3";
+       sha256 = "c3235d0f4a90baba3217269562bee655c6d9c538e2b57b6c5b23da4ef1bb6e6a";
        libraryHaskellDepends = [
          async base constraints lifted-base monad-control transformers-base
        ];
@@ -86170,7 +86482,7 @@ self: {
      mkDerivation {
        pname = "lifted-base";
        version = "0.2.3.6";
-       sha256 = "1yz14a1rsgknwyl08n4kxrlc26hfwmb95a3c2drbnsgmhdyq7iap";
+       sha256 = "57c5837d83f569bb72136ca89256e50e1ac168ee935804a8e7763e9d8322e1fb";
        libraryHaskellDepends = [ base monad-control transformers-base ];
        testHaskellDepends = [
          base HUnit monad-control test-framework test-framework-hunit
@@ -86186,7 +86498,7 @@ self: {
      mkDerivation {
        pname = "lifted-threads";
        version = "1.0";
-       sha256 = "1sq071bn5z8ks2qj52bfx6n8bdx2chijh62ai3rz6lmjai6dazbz";
+       sha256 = "7f7dd54c54b252f3f3884a18282364a2b785ace96e8922b1d013fd62573800eb";
        libraryHaskellDepends = [
          base monad-control threads transformers-base
        ];
@@ -86202,7 +86514,7 @@ self: {
      mkDerivation {
        pname = "lifter";
        version = "0.1";
-       sha256 = "11c0j2mdrp4rvinl4iym9mfsqzh101yb5sf710vm8n7qih1fzcpc";
+       sha256 = "ecb2ef028cf858543708c7e9b27c00017eac5d4dd547426ddc99dcdcaa908085";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -86219,7 +86531,7 @@ self: {
      mkDerivation {
        pname = "ligature";
        version = "0.1.0.0";
-       sha256 = "03h30lbhppi9hmpsc8fhsrsad6w9sjs9n53lz76czz3iqaknkcrb";
+       sha256 = "2bb369a7c271fccfccf974149bb4d4899ba674d6d021a66f8529de0b1705030e";
        libraryHaskellDepends = [ base text ];
        jailbreak = true;
        description = "Expand ligatures in unicode text";
@@ -86231,7 +86543,7 @@ self: {
      mkDerivation {
        pname = "ligd";
        version = "0.2";
-       sha256 = "1hxfx514ar9hr9gqzzdgd7avfvlsvr7lv6hgza5k04b2xm73ysrp";
+       sha256 = "376b3f4eed6211308bfa0f9a4d4fde9a6eb7d569affd8f5fca30654542e9aec3";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/spl/ligd";
        description = "Lightweight Implementation of Generics and Dynamics";
@@ -86245,7 +86557,7 @@ self: {
      mkDerivation {
        pname = "lighttpd-conf";
        version = "0.4";
-       sha256 = "085msb62wpqyc1sp4zbwbyn70k48p9k9cky9rxn93xm0gjsaydf8";
+       sha256 = "c835afb47ca0f6916ccfc94f9666ba884c70ac5f7c7d7275601e5f2eccd2b520";
        libraryHaskellDepends = [
          array base bytestring packedstring pretty template-haskell
        ];
@@ -86262,7 +86574,7 @@ self: {
      mkDerivation {
        pname = "lighttpd-conf-qq";
        version = "0.5";
-       sha256 = "1nd30inhh6wzq34rg76lq6m3wp0x3sc0l7jv37gw6dk3dnkwqh6q";
+       sha256 = "d840cca76d6336c3df195b1e0a981e1d5c3eaac1d49c97c9c09f1b086d04a3d9";
        libraryHaskellDepends = [
          array base bytestring haskell-src-exts lighttpd-conf
          template-haskell
@@ -86279,7 +86591,7 @@ self: {
      mkDerivation {
        pname = "lilypond";
        version = "1.9.0";
-       sha256 = "1nb6kkp5gbsbkjbbicyd49ckg2j9dm4a1l9ya4vp38br5j7dn4gw";
+       sha256 = "fc11db8e2c79a17137513ed1a0486d498a375922cdb3b8969c4baf57ee9c66d9";
        libraryHaskellDepends = [
          base data-default music-dynamics-literal music-pitch-literal
          prettify process semigroups vector-space
@@ -86296,7 +86608,7 @@ self: {
      mkDerivation {
        pname = "limp";
        version = "0.3.2.1";
-       sha256 = "0fx8q7ll47qc06laagiap0z4b5mbp958r3b9mc6qm1h9rhksimjk";
+       sha256 = "53d6a827cc09868a0dab698d8c4abaab96453eb82a3ea5a8010c1f42e9c1a83b";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck tasty-th
@@ -86312,7 +86624,7 @@ self: {
      mkDerivation {
        pname = "limp-cbc";
        version = "0.3.2.1";
-       sha256 = "0q4az96nbwvm7jhrwvbjp87vzkb5nlp739jhkya6z0iq340cjxjy";
+       sha256 = "5e76c9001938826f949f50a6712eb565cdbf0fba726d9ea13c75f3654dfa8a60";
        libraryHaskellDepends = [ base containers limp vector ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base limp ];
@@ -86327,7 +86639,7 @@ self: {
      mkDerivation {
        pname = "lin-alg";
        version = "0.1.0.2";
-       sha256 = "19123k967mql69my6c19mnvp4qwa4b3bgimmlbhipqdljykj7pqc";
+       sha256 = "0cdf23a797b4e11be1a2b5c6b7c6228a6372b7ad2930e36b3214d763d21c22a4";
        libraryHaskellDepends = [ base NumInstances vector ];
        description = "Low-dimensional matrices and vectors for graphics and physics";
        license = stdenv.lib.licenses.bsd3;
@@ -86339,7 +86651,7 @@ self: {
      mkDerivation {
        pname = "linda";
        version = "0.1.2";
-       sha256 = "0d58i69hvry9vzr4i7f1yhhm99808vqw238hfjc3sr51plc1is45";
+       sha256 = "85e81818bda1643d9874100dc1f14600a55421f4c19d48f2dfc9e70d9389a834";
        libraryHaskellDepends = [ base hmatrix HUnit ];
        description = "LINear Discriminant Analysis";
        license = stdenv.lib.licenses.bsd3;
@@ -86350,7 +86662,7 @@ self: {
      mkDerivation {
        pname = "lindenmayer";
        version = "0.1.0.1";
-       sha256 = "07gz4lbvyzahffcp6f1f87zl20kf834iswh671vb8vxffigrz5y1";
+       sha256 = "c1979f5f74ae6fb4763806721dc9406e0241ff412e38739973507dbf1725ff1d";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/reinh/hs-lindenmayer";
        description = "L-systems in Haskell";
@@ -86362,7 +86674,7 @@ self: {
      mkDerivation {
        pname = "line-break";
        version = "0.1.0.0";
-       sha256 = "01w5bk58n14vni6cb8rc4ri3hpgism1c78jk605927yf2llxnc14";
+       sha256 = "2430db2915ce1f910a3053a2c342d5f15d3862262ca3c54cb49b048bca5c8507";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -86375,7 +86687,7 @@ self: {
      mkDerivation {
        pname = "line2pdf";
        version = "0.0.7";
-       sha256 = "0x8kbjjd9i6gp0agdfsfgicj2z1g4jwj7axj4hq01c31wrzb6g95";
+       sha256 = "253db37ee661b0003024b2ab23b9242f7c21597c4ebbf614b8cfc4d4a45c1375";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
@@ -86396,7 +86708,7 @@ self: {
      mkDerivation {
        pname = "linear";
        version = "1.19.1.3";
-       sha256 = "1hprmhs1nm6l81kpnnznz92l66j10z4asn3g3l9c47165q881592";
+       sha256 = "229580102e261cc2121d6f58adc807411a4345faf65b7b6740d4541b34acf9c2";
        libraryHaskellDepends = [
          adjunctions base binary bytes cereal containers deepseq
          distributive ghc-prim hashable lens reflection semigroupoids
@@ -86417,7 +86729,7 @@ self: {
      mkDerivation {
        pname = "linear-accelerate";
        version = "0.2";
-       sha256 = "0433mzw2cswk86nmj3gnygn3d07yq0sbmv2ylxbw8ri35yddjap6";
+       sha256 = "e62ad99a2f2366c457a75eecba34c0fe8036ecf3f60d59ad41936b26f8af6310";
        libraryHaskellDepends = [ accelerate base lens linear ];
        homepage = "http://github.com/ekmett/linear-accelerate/";
        description = "Instances to use linear vector spaces on accelerate backends";
@@ -86431,7 +86743,7 @@ self: {
      mkDerivation {
        pname = "linear-algebra-cblas";
        version = "0.1";
-       sha256 = "1wsan17zrlg4kr9dwk23ggfvylignnmg4sa62krri45s925kvh3i";
+       sha256 = "71c03d8b48ba9098f3144669f2aab52f52bfdd7b434cde529ee4d1fc4fb04af3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86451,7 +86763,7 @@ self: {
      mkDerivation {
        pname = "linear-grammar";
        version = "0.0.2.1";
-       sha256 = "00vfhcqhg6azb1ay12n248l0bjg5g0c5y5ybz5rqf2jdlab7fg97";
+       sha256 = "273d7796a24d0a8773f9cb175f1878e5c9052822c28ae055585f990731836e03";
        libraryHaskellDepends = [ base containers QuickCheck ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A simple grammar for building linear equations and inclusive inequalities";
@@ -86463,7 +86775,7 @@ self: {
      mkDerivation {
        pname = "linear-maps";
        version = "0.6.1";
-       sha256 = "0671px94wvqg2yyc8qhjcwrv5k2ifwp5mrj7fkcwlwvg8w1bp19k";
+       sha256 = "3385bb02476f73cad97447e65a2e7751ccb233671262c4bc170f6f4e52bfe118";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers HUnit ];
@@ -86479,12 +86791,11 @@ self: {
      }:
      mkDerivation {
        pname = "linear-opengl";
-       version = "0.2.0.8";
-       sha256 = "18yy35pcl4jg0albh9dhngi7q4ak40fzr6ypa2piz2di4zqhfqp6";
+       version = "0.2.0.9";
+       sha256 = "d07378f189641577cb6229dd3812ba9786394c35a16bf21ab3d01b3b5640178d";
        libraryHaskellDepends = [
          base distributive lens linear OpenGL OpenGLRaw tagged
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/bgamari/linear-opengl";
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
@@ -86495,7 +86806,7 @@ self: {
      mkDerivation {
        pname = "linear-vect";
        version = "0.1.1.0";
-       sha256 = "0i6z10pgqcykkygl6kq63phx5hvwi2d84j2f5vw4nrnic59sm9jy";
+       sha256 = "5ea6aa5361d1664bf82e4e48829a887cc3d2e11d064f439f9fd333fc2e08df44";
        libraryHaskellDepends = [ base random ];
        jailbreak = true;
        homepage = "https://github.com/capsjac/linear-vect";
@@ -86508,7 +86819,7 @@ self: {
      mkDerivation {
        pname = "linearEqSolver";
        version = "1.3";
-       sha256 = "0bszi1k27ag4yk31zxkn3jk3cqh1xzdcscm4nb6k4n0psf0qm2rp";
+       sha256 = "378b8a81d3175832cdb2a432cddaef016236a61c76f61fc6f4e4a92366885f2f";
        libraryHaskellDepends = [ base sbv ];
        homepage = "http://github.com/LeventErkok/linearEqSolver";
        description = "Use SMT solvers to solve linear systems over integers and rationals";
@@ -86520,7 +86831,7 @@ self: {
      mkDerivation {
        pname = "linearscan";
        version = "0.7.0";
-       sha256 = "13sfwkjg94q47lfxw5zddi8xpf4az07g88yq5pvgnh3vs5xggwip";
+       sha256 = "37f2f77ad17b40fbf62dd823f40ef88ab8db516ced17de1d3d0493f4e4e44e8f";
        libraryHaskellDepends = [
          base containers ghc-prim mtl transformers
        ];
@@ -86538,7 +86849,7 @@ self: {
      mkDerivation {
        pname = "linearscan-hoopl";
        version = "0.7.0";
-       sha256 = "1zvzgcj5yln6g3mqljgcyjpjj2visiigd7qwl70l1zclz5zcfynv";
+       sha256 = "db7ac77ef994fd40c1a11c9ff662d4710b29aff4ec498aeb78c6525f247b7fff";
        libraryHaskellDepends = [
          base containers free hoopl linearscan QuickCheck transformers
        ];
@@ -86558,7 +86869,7 @@ self: {
      mkDerivation {
        pname = "linebreak";
        version = "1.0.0.3";
-       sha256 = "1fds2mgsijfsc96dq95skn562iv2r341zr7v0qsz48y9fh97s3p7";
+       sha256 = "e70e7d1274c923f23506fbe41fc8c86247618a9dba24dc4c62dac9a85f15bab9";
        libraryHaskellDepends = [ base hyphenation ];
        homepage = "http://ariis.it/static/articles/linebreak/page.html";
        description = "breaks strings to fit width";
@@ -86570,7 +86881,7 @@ self: {
      mkDerivation {
        pname = "linguistic-ordinals";
        version = "0.1.0.0";
-       sha256 = "0adcdxf0lxc372j12fk87klyrgr3b42sas6f1smiyza4wicjp9h3";
+       sha256 = "03a62b59e4447d1fab0ece68a5055923bfece93c683a11a43883750a5c6fac29";
        libraryHaskellDepends = [ base text ];
        jailbreak = true;
        homepage = "http://github.com/argiopetech/linguistic-ordinals";
@@ -86584,7 +86895,7 @@ self: {
      mkDerivation {
        pname = "linkchk";
        version = "0.0.2";
-       sha256 = "0fzszn8nb5kglg4s5hk9k51vdkarlc08bdp67rbrj0cwfxpkn6wd";
+       sha256 = "8d1b3b6f779c0199573ee6b68500a359cdb6439969c2a2c9a36f966591fdfa3b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -86601,7 +86912,7 @@ self: {
      mkDerivation {
        pname = "linkcore";
        version = "0.4.1";
-       sha256 = "0m1jwqa3vbiyzcdrn1h63dm0709j5xijm00j2x7dpwgn8k92iq81";
+       sha256 = "01e128d244f6f1db4e1712802a632f3281036a1b06069b1bfb3eae3d14e63254";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -86619,7 +86930,7 @@ self: {
      mkDerivation {
        pname = "linkedhashmap";
        version = "0.4.0.0";
-       sha256 = "1bv39g9vivr3j8arnpla39dhnwaja5l9da2yw580pzmw5bqi0wyq";
+       sha256 = "d87310f12abcfe0b50e15ea896685152710b5b1a8a5e9b159223efb8d34b63af";
        libraryHaskellDepends = [
          base containers deepseq hashable unordered-containers
        ];
@@ -86639,7 +86950,7 @@ self: {
      mkDerivation {
        pname = "linklater";
        version = "3.2.0.0";
-       sha256 = "15c6p63yd1g5if2nz9pig6kc0rvqpjixjs6zr2j9m16q0h6kgrfr";
+       sha256 = "d9e5370d04d8849aa4c8df68d9a3bc7867c0a679f1a66f858be585e687b98695";
        libraryHaskellDepends = [
          aeson base base-prelude bytestring containers http-types text wai
          wreq
@@ -86656,7 +86967,7 @@ self: {
      mkDerivation {
        pname = "linux-blkid";
        version = "0.2.0.0";
-       sha256 = "06f7zwb40zgps6503cyp65c68181gj3s9q1s6vh43y6najiimzqx";
+       sha256 = "1dff1aa354d6f841e0363ae0a4877c0105645831d7b3018ad1f77d4016ffc719";
        libraryHaskellDepends = [
          base monad-control transformers transformers-base
        ];
@@ -86672,7 +86983,7 @@ self: {
      mkDerivation {
        pname = "linux-cgroup";
        version = "0.1.1.2";
-       sha256 = "0dd1ii1n6y9frilnkxikzahp9xrh3i334i7syvd8fyxp51dpzgy1";
+       sha256 = "c1bf7f5b28b77b87daf6fa4432461c30f774a1fa33f66969cc2e7963438ca135";
        libraryHaskellDepends = [ base filepath ];
        jailbreak = true;
        description = "Very basic interface to the Linux CGroup Virtual Filesystem";
@@ -86684,7 +86995,7 @@ self: {
      mkDerivation {
        pname = "linux-evdev";
        version = "0.3.1";
-       sha256 = "1zx5m0446rkbbj43m1f110a7jvl7vd7wkhikqql608a0jzqr7bk0";
+       sha256 = "60ae93f19740216028c633c2c94fdb876e791408c1853a885c6b664308a8a5ff";
        libraryHaskellDepends = [ base bytestring time unix ];
        homepage = "http://github.com/bgamari/linux-evdev";
        description = "Bindings to Linux evdev input device interface";
@@ -86696,7 +87007,7 @@ self: {
      mkDerivation {
        pname = "linux-file-extents";
        version = "0.2.0.0";
-       sha256 = "1l4vznam1a8vf3nixhbmw38rpzkvmbka0cbdfdsgfrpn03kxjz3c";
+       sha256 = "6c7cd9e700f666f774736d31a0e6aa7bfe9bd1e075c11eed701ba95095fd9bd0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base unix ];
@@ -86710,7 +87021,7 @@ self: {
      mkDerivation {
        pname = "linux-inotify";
        version = "0.2.0.1";
-       sha256 = "1970v1zkbp45amylmg79bbdfhk8kg6vzxjznd76gfl5kff2cv12r";
+       sha256 = "5984cd8473b350f7cc69f6cbfeb779134de8da5ae9bc4a7d5585dc357fd8e0a4";
        libraryHaskellDepends = [ base bytestring hashable unix ];
        description = "Thinner binding to the Linux Kernel's inotify interface";
        license = stdenv.lib.licenses.bsd3;
@@ -86721,7 +87032,7 @@ self: {
      mkDerivation {
        pname = "linux-kmod";
        version = "0.1.0.1";
-       sha256 = "1vqbibp93fw6r03v5q2cisya6m12xb12rad11myxrkbn29rjmhws";
+       sha256 = "9ac32a731276cddc7d0da1a92cc2ea2254a3bc8e4ce0b207c886bb91ee8a0bef";
        libraryHaskellDepends = [ base directory ];
        libraryPkgconfigDepends = [ libkmod ];
        homepage = "https://github.com/tensor5/linux-kmod";
@@ -86735,7 +87046,7 @@ self: {
      mkDerivation {
        pname = "linux-mount";
        version = "0.2.0.1";
-       sha256 = "12bwrniaxg6gm347jdgbf535pdz4z57pkyiwa98c903y9q9ssnyi";
+       sha256 = "d15bad134e7e80c450523cfa794ff9e4b75b4671eb3579c8a8cfbcaea2cd7c89";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/tensor5/linux-mount";
        description = "Mount and unmount filesystems";
@@ -86747,7 +87058,7 @@ self: {
      mkDerivation {
        pname = "linux-namespaces";
        version = "0.1.2.0";
-       sha256 = "0yznnp9rdz15drm79pvbqbrbk2nczbkmlf00pb7rki7w1l9njp2q";
+       sha256 = "585c69130dfcc499cfba00385ae7facc8ab9f2c26bdf746a6e25fc96d3b5f67b";
        libraryHaskellDepends = [ base unix ];
        homepage = "https://github.com/redneb/hs-linux-namespaces";
        description = "Create new or enter an existing linux namespaces";
@@ -86761,7 +87072,7 @@ self: {
      mkDerivation {
        pname = "linux-perf";
        version = "0.3";
-       sha256 = "18akjagbqw2fswrnp4ifzivwdwsbny28kvnm0hfc1ysyy9id8511";
+       sha256 = "2114d462f25efbc01c04d5ee8984b74bf3c677fc2e926b33d74e70bc9e9253a1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86785,7 +87096,7 @@ self: {
      mkDerivation {
        pname = "linux-ptrace";
        version = "0.1.2";
-       sha256 = "0hzniy9vlycbsqkrr9xxdgnx070h5v6jz4gqx7rc60a3q0hqn43m";
+       sha256 = "75108b21c04301c3f2e9f8912fcd2e101cd0ed6bbda79c27d68b79ba938ff643";
        libraryHaskellDepends = [
          base bytestring mmap posix-waitpid process template-haskell unix
        ];
@@ -86800,7 +87111,7 @@ self: {
      mkDerivation {
        pname = "linux-xattr";
        version = "0.1.1.0";
-       sha256 = "0rpq5sm557gm227id2rfsffgr47lrj4d4kpzh194d74dx2qkg5g6";
+       sha256 = "e69537b1e88d9c465280ff4ed288ccf490fc9cd32e8b168f10f59d52aa2ef866";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/tensor5/linux-xattr";
        description = "Read, set and list extended attributes";
@@ -86814,7 +87125,7 @@ self: {
      mkDerivation {
        pname = "linx-gateway";
        version = "0.1.0.2";
-       sha256 = "0diacwvxpq2iyfzlcmdqrbfndhmlmgzq9hvxlyp12idlzwa9p1cq";
+       sha256 = "98859b14ffb44511aea77dc384ffabb4c266ddcab85546bff351e0db37672a36";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base binary bytestring network ];
@@ -86834,7 +87145,7 @@ self: {
      mkDerivation {
        pname = "lio";
        version = "0.11.5.0";
-       sha256 = "10miy18x1898dcq58bnk0md3ymw9ckh9j26grsr6w3jqnvw69712";
+       sha256 = "229c64f8b6580e6eb2cecf0899e06489573f5a05d32e54306b28a1d051f0b182";
        libraryHaskellDepends = [ base bytestring containers hashable ];
        description = "Labeled IO Information Flow Control Library";
        license = "GPL";
@@ -86847,7 +87158,7 @@ self: {
      mkDerivation {
        pname = "lio-eci11";
        version = "0.2";
-       sha256 = "11vl27kn0wdxndkwn3yvxd6kg9jv0lilxpvx2hkax37lq3x15rc8";
+       sha256 = "88e512fac0f48cae26147ddf4e23055ba6374debdb0fcb67b3bd7160e7117487";
        libraryHaskellDepends = [
          array base bytestring containers dclabel-eci11 directory filepath
          mtl old-time SHA time unix
@@ -86864,7 +87175,7 @@ self: {
      mkDerivation {
        pname = "lio-fs";
        version = "0.0.1.2";
-       sha256 = "1zzxsr0kg3bxm2wzhsqw2irk5myzshgqhr3fxi062hzw2rh0nqn9";
+       sha256 = "c9620b6016fc436140ec6e64881fd4dfd73273141c6bf8b9a87d8d3741d6fdff";
        libraryHaskellDepends = [
          base bytestring containers directory filepath lio SHA unix xattr
        ];
@@ -86880,7 +87191,7 @@ self: {
      mkDerivation {
        pname = "lio-simple";
        version = "0.0.2.2";
-       sha256 = "1nddiakk6b9biay6ijnc48dxcfgpi9vx4g6a8r9vz6cjh6mh0154";
+       sha256 = "a40400ab819299bf5346ca3cd2778af739d61b22ccca68bc8a2b2d33a78aadd9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86903,7 +87214,7 @@ self: {
      mkDerivation {
        pname = "lipsum-gen";
        version = "0.1.0.2";
-       sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c";
+       sha256 = "6c4caaecfd8fc61e0e6d516c8cde84d653392dd17fbd30bc2cc7c9caccee731d";
        libraryHaskellDepends = [ base QuickCheck ];
        jailbreak = true;
        description = "Generators for random sequences of English-like nonsense text";
@@ -86920,7 +87231,7 @@ self: {
      mkDerivation {
        pname = "liquid-fixpoint";
        version = "0.3.0.1";
-       sha256 = "00s5ch8i96nqjy2kq6y3i25mji3ld6z8121ngpbz87zbgp3zwhaw";
+       sha256 = "5c41fec77deb1ff4d77d368880be697444598b88c31b3c8597d89a1411644503";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86955,7 +87266,7 @@ self: {
      mkDerivation {
        pname = "liquidhaskell";
        version = "0.4.1.1";
-       sha256 = "1yxg6zii0mbsri5j37k2s976nyglijyjfgz9vwafiqdrca328z4s";
+       sha256 = "9a7c248662b9e1e814dfe93f27bd8cf4796b4ed2629e214bcc7a5510e337affb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86987,7 +87298,7 @@ self: {
      mkDerivation {
        pname = "lispparser";
        version = "0.3.1";
-       sha256 = "1hj5fwmzxp2gw2gx86wa1fy36jmmh3sf8kd4acc8x0rghpmlw0w8";
+       sha256 = "88034eeb852f838e1853a44de4f480b54a33bc0b8a1bd49fe04fdcfe2b7745c2";
        libraryHaskellDepends = [ base parsec ];
        description = "Simple parser for LISP S-expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -86998,7 +87309,7 @@ self: {
      mkDerivation {
        pname = "list-extras";
        version = "0.4.1.4";
-       sha256 = "15vjk6y3zwiffm1x8wlzv6203ykzm2phalqlq4zhmhcj2wd70viw";
+       sha256 = "3c6e701a1792c10a3fc1145305afa87ffa0184d99f72d443752ef23fbc997297";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Common not-so-common functions for lists";
@@ -87010,7 +87321,7 @@ self: {
      mkDerivation {
        pname = "list-fusion-probe";
        version = "0.1.0.3";
-       sha256 = "1djmh6bwnmp64vwq5f5j4f54ygrjkl56gp0la06yxknyvyn9k8jp";
+       sha256 = "57a299acdfdeceee0d5014dc670a9d323f4f8a23b2b882f926e656cb978155b6";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "testing list fusion for success";
@@ -87022,7 +87333,7 @@ self: {
      mkDerivation {
        pname = "list-grouping";
        version = "0.1.1";
-       sha256 = "0w9f68cr4k0p8zl81y8ax19i6ypzks0y27hdlz71wwmgn5v2y63l";
+       sha256 = "74182f76b1af721ecea70d1ee1819eff7a1353e80af980e847174c9219322e71";
        libraryHaskellDepends = [ base ];
        homepage = "http://coder.bsimmons.name/blog/2009/08/list-grouping-module-released/";
        description = "Functions for grouping a list into sublists";
@@ -87034,7 +87345,7 @@ self: {
      mkDerivation {
        pname = "list-mux";
        version = "1.0";
-       sha256 = "147zb156g79a5p1w0b9vcvjy5x7nsrhng5rgjqq3cy3xpbam4nys";
+       sha256 = "da5b52d5ba7d783630962f976761d6f6f4e2e5663b2dc0c32d2a9d674a58ff90";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/hellertime/list-mux";
@@ -87051,7 +87362,7 @@ self: {
      mkDerivation {
        pname = "list-remote-forwards";
        version = "0.0.1";
-       sha256 = "1bq5244ys4xy3pfj72dq399x0g57q41lrllbd5hgvk9z0j92lxys";
+       sha256 = "da772a92043fcdfd60698bd24c03c1a73cd0531ab88923dd1dbe13ed091105af";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -87075,7 +87386,7 @@ self: {
      mkDerivation {
        pname = "list-t";
        version = "0.4.5.1";
-       sha256 = "0mf1dv0pcbc2sgnimjkhmivl32ivjck7arhkq679s1ba5hc6np3a";
+       sha256 = "6a5c6b182c6a059d8ec113667526933b8a4177ac70ca1aedd3822d76c16ec155";
        libraryHaskellDepends = [
          base-prelude mmorph monad-control mtl transformers
          transformers-base
@@ -87094,7 +87405,7 @@ self: {
      mkDerivation {
        pname = "list-t-attoparsec";
        version = "0.4.0.2";
-       sha256 = "02sr57qpw8r38s9hb0wj0pik7x4rqgs51hl4s1mmnihgdflm0jb1";
+       sha256 = "614950a96b0f465b6bd084c250f4c399f433e305928305934623237ef129590b";
        libraryHaskellDepends = [
          attoparsec base-prelude either list-t text transformers
        ];
@@ -87110,22 +87421,21 @@ self: {
     ({ mkDerivation, base-prelude, case-insensitive, conversion
      , conversion-case-insensitive, conversion-text, either, hspec
      , html-entities, html-tokenizer, list-t, list-t-attoparsec
-     , list-t-text, mtl-prelude, text
+     , list-t-text, mtl-prelude, text, xml-types
      }:
      mkDerivation {
        pname = "list-t-html-parser";
-       version = "0.4.0.0";
-       sha256 = "1i243xa52ljqr79zccybx3x5nb58lvsfq4q99n2kk2qyhwyv7wb5";
+       version = "0.4.1.1";
+       sha256 = "42f9b2c5e77acfa154a56ac538b29888d943d451487a45a70040d32458c24f27";
        libraryHaskellDepends = [
          base-prelude case-insensitive conversion
          conversion-case-insensitive conversion-text either html-entities
-         html-tokenizer list-t mtl-prelude text
+         html-tokenizer list-t mtl-prelude text xml-types
        ];
        testHaskellDepends = [
-         base-prelude conversion conversion-text hspec html-tokenizer
-         list-t-attoparsec list-t-text text
+         base-prelude conversion conversion-text either hspec html-tokenizer
+         list-t-attoparsec list-t-text text xml-types
        ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t-html-parser";
        description = "Streaming HTML parser";
        license = stdenv.lib.licenses.mit;
@@ -87139,7 +87449,7 @@ self: {
      mkDerivation {
        pname = "list-t-http-client";
        version = "0.1.0.1";
-       sha256 = "02wxqsfixzv7ccznydp3vij7maqvxhsbailakij2fcfrf2acw3g2";
+       sha256 = "e20dce9470d93127649c8a46b534ec1bab7a64dce3366f3f6367ff1e9dc69d0b";
        libraryHaskellDepends = [
          base-prelude bytestring http-client list-t mtl-prelude
        ];
@@ -87155,7 +87465,7 @@ self: {
      mkDerivation {
        pname = "list-t-libcurl";
        version = "0.3.0.0";
-       sha256 = "1hcgxr87q7k6ixisj4p4gghm7nqb1l7bg361rcnqxf1145xmyyr5";
+       sha256 = "257b5f7b2121b88e2dcbc18cb70e0d0bdb53e17be412a9638f661e7c50ee8fc1";
        libraryHaskellDepends = [
          base base-prelude bytestring curlhs either list-t mtl-prelude
          resource-pool stm
@@ -87172,7 +87482,7 @@ self: {
      mkDerivation {
        pname = "list-t-text";
        version = "0.2.0.2";
-       sha256 = "1hsbisvmjprfzhqlhzmicxzyv67ylik0dazl4yjyilh8frjd7qlm";
+       sha256 = "95e2d3647608d2e8a527f4ab0666a4fe98ed7f67b17e4831fc2e5f59b78e4bc3";
        libraryHaskellDepends = [
          base-prelude bytestring list-t mtl-prelude text
        ];
@@ -87190,7 +87500,7 @@ self: {
      mkDerivation {
        pname = "list-tries";
        version = "0.6.1";
-       sha256 = "06li8zwhy3i3shgqrq4505af1b1dz9xpzx2lpx2has4p79bgd1mq";
+       sha256 = "b886f6563a97680545bf54f47f7bfa2dace0540185e08c1fd4230e0ff947911a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base binary containers dlist ];
@@ -87205,7 +87515,7 @@ self: {
      mkDerivation {
        pname = "listlike-instances";
        version = "0.2.3.1";
-       sha256 = "0mkhnqn7wxspzxvivhaksxmxp7d6x9bazhl28nl9gck56bpa90sm";
+       sha256 = "5583a4ee3265b297a84582c2af56eaa69ddb6bd753c11d77ff57777e2cb67056";
        libraryHaskellDepends = [ base bytestring ListLike text vector ];
        jailbreak = true;
        homepage = "http://jwlato.webfactional.com/haskell/listlike-instances";
@@ -87219,7 +87529,7 @@ self: {
      mkDerivation {
        pname = "lists";
        version = "0.4.2";
-       sha256 = "0qjziksh6gl6v8rzvqajkcbakbby5j3i4z2jk6w6zs89b93rwnln";
+       sha256 = "965a9e475a09e96fb899527c12872c7eada9169b52e1fd33da863e03f58c5f62";
        libraryHaskellDepends = [ base list-extras split ];
        description = "Functions for dealing with lists";
        license = stdenv.lib.licenses.bsd3;
@@ -87230,7 +87540,7 @@ self: {
      mkDerivation {
        pname = "listsafe";
        version = "0.1.0.1";
-       sha256 = "0scd74fv6gzl7yi5ssb1z9kwwfyx9p39yqprnzbpvspvxm3k41qs";
+       sha256 = "1a073247edfbea7dd7b7f9629fc64ddd3bce67fa61695da23ff43fb31d398d69";
        libraryHaskellDepends = [ base exceptions ];
        homepage = "https://github.com/ombocomp/listsafe";
        description = "Safe wrappers for partial list functions, supporting MonadThrow";
@@ -87245,7 +87555,7 @@ self: {
      mkDerivation {
        pname = "lit";
        version = "0.1.0.5";
-       sha256 = "0xnbifi0g1kmxi88l9f77ypkgmdvhi69vy3fycbxwn926gc12v1r";
+       sha256 = "396c11d8332259de17f36ef89d4c84bbd537af3fc7258a50ec758607a28bcb76";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -87263,7 +87573,7 @@ self: {
      mkDerivation {
        pname = "literals";
        version = "1.0";
-       sha256 = "06n4svp0qss78l8827qmppmd63877wq01d6w9xagd10vn3c4hs2j";
+       sha256 = "526848d8b01b84f6544fdcb400303f070dd3eabd151f811045476b0ceed6c41a";
        libraryHaskellDepends = [ base ];
        description = "Non-overloaded functions for concrete literals";
        license = stdenv.lib.licenses.mit;
@@ -87281,7 +87591,7 @@ self: {
      mkDerivation {
        pname = "live-sequencer";
        version = "0.0.4";
-       sha256 = "04n8s2p772ylzfjpclbrq01im0j9rlp0xd37i8jshll7r51iz66l";
+       sha256 = "d4981f43c98752a8258a67b40e2ecd49821a03c0795176a5fbd48b73aed0c812";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base event-list non-negative ];
@@ -87304,7 +87614,7 @@ self: {
      mkDerivation {
        pname = "ll-picosat";
        version = "0.1.0.0";
-       sha256 = "0393ccnlink30492aw1gyv4jzd7rsckd8ymkm1wgbpma13vkf67h";
+       sha256 = "f01837f708aadef578a8b37ad426d3f9b42fc9f62f7025120163da482d63230d";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ picosat ];
        jailbreak = true;
@@ -87317,7 +87627,7 @@ self: {
      mkDerivation {
        pname = "llrbtree";
        version = "0.1.1";
-       sha256 = "057bp1f1mpzlgg408b02x1bdzsixrrkcl1536nyvhp43rvxmgj61";
+       sha256 = "c1c857fbce835cb8bd35a304ca66ce3deadf56e8022c04c87bf4df1a5cb8eb14";
        libraryHaskellDepends = [ base ];
        description = "Purely functional sets and heaps";
        license = stdenv.lib.licenses.bsd3;
@@ -87331,7 +87641,7 @@ self: {
      mkDerivation {
        pname = "llsd";
        version = "0.2.0.0";
-       sha256 = "1v1yaaj02qk6z58kiz3g7dr9cik8141vv409cyxlzqv1k79rpzrg";
+       sha256 = "2fff9bd39961e34fbb670990bd0309684696723b6ffc3851f9666201a4523eec";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87353,7 +87663,7 @@ self: {
      mkDerivation {
        pname = "llvm";
        version = "3.2.0.2";
-       sha256 = "11k1m80vg9x6fgiyh9gxzl1i2i0l0jw9hbn3gs1d1dd7avzl9mrr";
+       sha256 = "39d744ff56a7b5d0827ec32e98b80414441103fdfd25e8e373a6a7b701aa6186";
        libraryHaskellDepends = [
          base bytestring containers directory llvm-base mtl process
          type-level
@@ -87374,7 +87684,7 @@ self: {
      mkDerivation {
        pname = "llvm-analysis";
        version = "0.3.0";
-       sha256 = "0jck1c9wy11wjss6aji64jw927mrncwd2nmnq65zq85r5hha3m8k";
+       sha256 = "13d5a1202cb920fc8bc1b65ad138b3b91e91b824264a65b4963c04cf130b9349";
        libraryHaskellDepends = [
          array base boomerang bytestring containers deepseq directory
          failure fgl filemanip filepath GenericPretty graphviz hashable
@@ -87395,7 +87705,7 @@ self: {
      mkDerivation {
        pname = "llvm-base";
        version = "3.2.0.2";
-       sha256 = "1f76nb85hnidp06v6lbl4aasac4h7ff9r8i054m8cnby2vc59r4n";
+       sha256 = "96e454d8167e59862a2920a29c9c3b9030a595227451b30db82d5a58d0b2e6b8";
        libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/bos/llvm";
        description = "FFI bindings to the LLVM compiler toolkit";
@@ -87410,7 +87720,7 @@ self: {
      mkDerivation {
        pname = "llvm-base-types";
        version = "0.3.0";
-       sha256 = "142xc7w250y0nx60qnm4gc5hrqjm1bxk0nhgsp669g5kvxqcd3bn";
+       sha256 = "768dc670dfb3bc64ccd50f5a30fb0a55e20c0b7ba45a0c4cb7c08322f8615d90";
        libraryHaskellDepends = [
          base containers deepseq dwarf failure GenericPretty graphviz
          hashable pretty regex-tdfa text transformers unordered-containers
@@ -87426,7 +87736,7 @@ self: {
      mkDerivation {
        pname = "llvm-base-util";
        version = "3.0.1.0";
-       sha256 = "07q6dvwkg7h6qkwq0a7719g82anipj2pk0xid5p24pvzssa9z22w";
+       sha256 = "5c889f94d67f5f226e69b1837985bcd12a815e0ae72880f9c4069e37f96e061f";
        libraryHaskellDepends = [ base llvm-base ];
        homepage = "https://github.com/bos/llvm";
        description = "Utilities for bindings to the LLVM compiler toolkit";
@@ -87442,7 +87752,7 @@ self: {
      mkDerivation {
        pname = "llvm-data-interop";
        version = "0.3.0";
-       sha256 = "08kflxb0qannp6nb2sizz0bhl850dl1sszl1hk9l28m21r2akdy1";
+       sha256 = "c1b7a9440ea22241d384817ead036da0200a17f83f6ab1acb9d62a0c56a76e22";
        libraryHaskellDepends = [
          array base bytestring containers data-default deepseq dwarf
          hashable hashtables llvm-base-types loch-th mtl text transformers
@@ -87460,7 +87770,7 @@ self: {
      mkDerivation {
        pname = "llvm-extra";
        version = "0.6";
-       sha256 = "0nlh5l070zc7y1jpwnyxnc0223w8xaw0z92agmigiw6bm8vcs568";
+       sha256 = "c814cd36aacbf0f8627d4aa40fb8ea880f2100b3dd5b7e65f0877d70002d905a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87477,7 +87787,7 @@ self: {
      mkDerivation {
        pname = "llvm-ffi";
        version = "3.0.0";
-       sha256 = "07hb4n7wk0gmprjps045cvhcyvmis0jp5f11jbk55y4mgn4jy0cv";
+       sha256 = "9b012f897d95f852e69221b87225d0b16ecfe06685007d65bef581c98f250b1e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -87498,7 +87808,7 @@ self: {
      mkDerivation {
        pname = "llvm-general";
        version = "3.4.5.4";
-       sha256 = "1zfixhvwagvznrvnxzrb9fzkswa43mj1nmbpmx87888q8z9m31j0";
+       sha256 = "408651d34718217450af77551b641d44713dbf4b2bff6e77b67f3fc537ecd1fd";
        libraryHaskellDepends = [
          array base bytestring containers llvm-general-pure mtl parsec
          setenv template-haskell transformers transformers-compat
@@ -87522,7 +87832,7 @@ self: {
      mkDerivation {
        pname = "llvm-general-pure";
        version = "3.4.5.4";
-       sha256 = "0kc4f431j65qfsa54a17y3m82a8xf3dmd3hzr8mj514jz4wv6jn5";
+       sha256 = "c54ab339f99284222bca1f8e56db701d2981eaf02728529476b818190671844d";
        libraryHaskellDepends = [
          base containers mtl parsec setenv template-haskell transformers
          transformers-compat
@@ -87544,7 +87854,7 @@ self: {
      mkDerivation {
        pname = "llvm-general-quote";
        version = "0.2.0.0";
-       sha256 = "02j3npamy5s6ircfd9njg0y25asbpxl6fpsxjpxy7k4v1y6c3b75";
+       sha256 = "e5acc18c0f9bcce3fb955d5f6768bf4bab223c78d2a6e6588e46175fd5b5430a";
        libraryHaskellDepends = [
          array base bytestring containers haskell-src-meta llvm-general-pure
          mainland-pretty mtl split srcloc syb symbol template-haskell
@@ -87568,7 +87878,7 @@ self: {
      mkDerivation {
        pname = "llvm-ht";
        version = "0.7.0.0";
-       sha256 = "1yn8wyp2jjjdggvf1jz7iras4f7fg2dq57ramr5prvcapc6r5yn6";
+       sha256 = "c6fa920dbb8aed7c4bae2a9f829b78ee38a2558ee7cbe0f67b4d4a29aee7c8fa";
        libraryHaskellDepends = [
          base bytestring directory mtl process type-level
        ];
@@ -87585,7 +87895,7 @@ self: {
      mkDerivation {
        pname = "llvm-pkg-config";
        version = "0.0";
-       sha256 = "1sfw901bhnwiam8mm7h50fb6rpqv7vs8j7bxdx6azcf02cmivx6w";
+       sha256 = "dcf41d2b13c0b1af4c6f7d1d89f43e1bdf6c9603059e5a5155915bb80248dce9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -87601,7 +87911,7 @@ self: {
      mkDerivation {
        pname = "llvm-pretty";
        version = "0.3.1.1";
-       sha256 = "1qk3dlinhic9m8ahynqqi90y7ai728p10c4mkmj2w135wp8a8ran";
+       sha256 = "5665a4d0e565042e649d9530102e1227aae3418a185b0f15aa894568236d63e2";
        libraryHaskellDepends = [ base containers monadLib pretty ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
@@ -87615,7 +87925,7 @@ self: {
      mkDerivation {
        pname = "llvm-pretty-bc-parser";
        version = "0.1.3.1";
-       sha256 = "15h66zdkisjg1mrrchkyzknj0mq5xybjn41mrnfs3pzalnffsfqs";
+       sha256 = "1a3bed9ca5eadfa19dcd35102b97ef055720edfc7e4296730d4fea38db370696";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87640,7 +87950,7 @@ self: {
      mkDerivation {
        pname = "llvm-tf";
        version = "3.0.3.1";
-       sha256 = "0bkx86gv5f7w14hxny6h36balsklscxzm3qakv8f2ana0bk1sv09";
+       sha256 = "096c1de602ca2ae1d09e0a8ffa3bd3746aaa9619d078db2109fcb8b29f417d2e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87661,7 +87971,7 @@ self: {
      mkDerivation {
        pname = "llvm-tools";
        version = "0.2.0.1";
-       sha256 = "1nyp0sgdqsaa2f2v7xgmm3s8mf2a170mzz2h3wwsi163ggvxwvhd";
+       sha256 = "0d6edef77bc384a8391f50fc5fc1094ab88af4a8f5f5b385134a69dc9e06d7db";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87683,7 +87993,7 @@ self: {
      mkDerivation {
        pname = "lmdb";
        version = "0.2.5";
-       sha256 = "0z8wj06b5ii0w6pls2jlqmd3mhyrplhxd1c6h1my1p0w45b2hmc0";
+       sha256 = "80552856211cdce06b808685d621bdd9c33a5ac5540a4dafe120c6b20c901c7d";
        libraryHaskellDepends = [ array base ];
        librarySystemDepends = [ lmdb ];
        homepage = "http://github.com/dmbarbour/haskell-lmdb";
@@ -87696,7 +88006,7 @@ self: {
      mkDerivation {
        pname = "load-env";
        version = "0.1.1";
-       sha256 = "05pxxplp96pcnzk61xcckxnxljl3hjl13ckn4xrr93zmlw49rqwg";
+       sha256 = "8fe39c08a7f58f94732776b211a884834ada6d9f8cf560e6b7ec9a74e9edfd16";
        libraryHaskellDepends = [ base directory parsec ];
        testHaskellDepends = [ base directory hspec HUnit parsec ];
        description = "Load environment variables from a file";
@@ -87708,7 +88018,7 @@ self: {
      mkDerivation {
        pname = "loadavg";
        version = "0.1";
-       sha256 = "13q2yxqyzkh099jwz32plmdc71p4w2gkajx5bbi3fkvl2gylqlk6";
+       sha256 = "66524cfd13744f37e25aa54b359fe0e486c35aa5578ccf654a00ceef71f7028f";
        libraryHaskellDepends = [ base ];
        description = "Load average parsing from /proc/loadavg and bindings to getloadavg (3)";
        license = stdenv.lib.licenses.bsd3;
@@ -87719,7 +88029,7 @@ self: {
      mkDerivation {
        pname = "local-address";
        version = "0.0.1";
-       sha256 = "1846lhs0jc8finxcp1hfgifzs7hwzzxvmmv03laxzl63p5h2k8x9";
+       sha256 = "a9a32960b9c3d0df151d60d7bafbff1c1efd5d7c0e86cbba8d0e310934a486a0";
        libraryHaskellDepends = [ base network ];
        homepage = "http://bitbucket.org/khibino/haskell-local-address";
        description = "Functions to get local interface address";
@@ -87733,7 +88043,7 @@ self: {
      mkDerivation {
        pname = "local-search";
        version = "0.0.7";
-       sha256 = "0xrp34m2qfbz458g7bxdkp2lvsm0hskwxfcrm1d8n8g150ddn2xf";
+       sha256 = "ae0bdb1a28e1218b5aa899b9cea786a0ea4dc59dadaff350217f392c2a193777";
        libraryHaskellDepends = [
          base combinatorial-problems containers erf random
        ];
@@ -87748,7 +88058,7 @@ self: {
      mkDerivation {
        pname = "located-base";
        version = "0.1.0.0";
-       sha256 = "0jb4ziagvbvgaihgw9ajsni0nylqbh5hw3q4dw561qmx2msjjfpj";
+       sha256 = "f23a297515bde2600a6f040f0e0b5c987a0ba2d55225fe60546faffd54fc6449";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/gridaphobe/located-base";
        description = "Location-aware variants of partial functions";
@@ -87762,7 +88072,7 @@ self: {
      mkDerivation {
        pname = "locators";
        version = "0.2.4.2";
-       sha256 = "172fbxb51p09afsgp9g28zpbisxnf0wxdr3bwi6hwp40ac3363g4";
+       sha256 = "e40d330653805c0e4de46be4d63970b6ebb8ee47e2a5fbb45309dc50565f4e9c";
        libraryHaskellDepends = [
          base bytestring cereal containers cryptohash
        ];
@@ -87779,7 +88089,7 @@ self: {
      mkDerivation {
        pname = "loch";
        version = "0.2";
-       sha256 = "1dwv4v76i1fd60rrr0bla3wjz62x9dcgpd48p8z11lsjgpqarld3";
+       sha256 = "a3d1acf07d52d3103eba88b4fb584b5d982ff95074819c3330cd8568ce269bb7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -87794,7 +88104,7 @@ self: {
      mkDerivation {
        pname = "loch-th";
        version = "0.2.1";
-       sha256 = "1kfrjsgzq6wl749n2wm1fhwwigjxcd9lww7whiwjrbmhiz5ism3p";
+       sha256 = "77541dcb8fb0ae2c7984fc704e53635dbec83974a172611339941bfc9f96d9cd";
        libraryHaskellDepends = [ base pretty template-haskell ];
        homepage = "https://github.com/liskin/loch-th";
        description = "Support for precise error locations in source files (Template Haskell version)";
@@ -87809,7 +88119,7 @@ self: {
      mkDerivation {
        pname = "lock-file";
        version = "0.5.0.2";
-       sha256 = "1l4slkykw59p20kw9iqaa4pjczqx701a9z14nvbzwrmgs2acnki7";
+       sha256 = "274ecb94d0af66fed7b624fca402381d7f262f510ac7c4271037153efda49ad0";
        libraryHaskellDepends = [
          base data-default-class directory exceptions tagged-exception-core
          transformers
@@ -87832,7 +88142,7 @@ self: {
      mkDerivation {
        pname = "lockfree-queue";
        version = "0.2.3.1";
-       sha256 = "131s1w6bdd958pg42s2i62xvw4basagir45y3vhbvsp8p9a6lmra";
+       sha256 = "2a576a54bae8eabde01ebe901c9fd26a11bebb30516841de4525b5b60c0f3a8c";
        libraryHaskellDepends = [
          abstract-deque atomic-primops base bytestring ghc-prim
        ];
@@ -87853,7 +88163,7 @@ self: {
      mkDerivation {
        pname = "log";
        version = "0.2.2";
-       sha256 = "05izcd3qwwfwj5kl2k2pzjs8fk14hq10qls3a8m057gg4pd6nw1n";
+       sha256 = "36706bda25ef9d022a5243530c0286244c87b4fc574c416791dc718e47633f16";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring deepseq exceptions hpqtypes
          monad-control monad-time mtl old-locale split stm text time
@@ -87873,7 +88183,7 @@ self: {
      mkDerivation {
        pname = "log-domain";
        version = "0.10.2";
-       sha256 = "0v91xilbgw0cym43fn5abz5ljrxz8anfj1w5x6nzp1qcqcwgwcg4";
+       sha256 = "e431fe38c30c87fbade98507e9ac42bf6749cb5faa583748f50cf0b768ec216d";
        libraryHaskellDepends = [
          base binary bytes cereal comonad deepseq distributive hashable
          hashable-extras safecopy semigroupoids semigroups vector
@@ -87894,7 +88204,7 @@ self: {
      mkDerivation {
        pname = "log-effect";
        version = "0.4.0.1";
-       sha256 = "05rx54bsypisw6k8xm87a4rssyb0lwx7xavwamb1ciiwmvg3j14m";
+       sha256 = "950439deae3c461656557cab7e3aa76079ad335107d58ea6e13a5eaf17293d17";
        libraryHaskellDepends = [
          base bytestring extensible-effects fast-logger time
        ];
@@ -87910,7 +88220,7 @@ self: {
      mkDerivation {
        pname = "log2json";
        version = "0.1";
-       sha256 = "0cidi9zkvqvdqpibr0jpnlk33kprmxwh016w0f86zg9cm3dfb5zf";
+       sha256 = "ee97e5daa82cbd6f9003dc040079aff9ce3126b55782bce2c56de33d7f8a2d32";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ base containers json parsec ];
@@ -87926,7 +88236,7 @@ self: {
      mkDerivation {
        pname = "logfloat";
        version = "0.13.3.2";
-       sha256 = "092c9xviq9gsr3q25q254x9kdl80lfssbwjyvi8rrv1300nw7h4c";
+       sha256 = "8cc0c32d0023ec9c51dc5ef2a5b5a300d136532745e022f0c8fa251c774f4c24";
        libraryHaskellDepends = [ array base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Log-domain floating point numbers";
@@ -87940,7 +88250,7 @@ self: {
      mkDerivation {
        pname = "logger";
        version = "0.1.0.0";
-       sha256 = "1v264iv34k13lz63ajci03iikc7ajqcl3dvcaxcv7m3h538km8vm";
+       sha256 = "75a33ad12870d4b359576cb7411996eab019e300914935cca7234c32762446ec";
        libraryHaskellDepends = [
          ansi-wl-pprint base containers lens mtl template-haskell time
          transformers unagi-chan
@@ -87959,7 +88269,7 @@ self: {
      mkDerivation {
        pname = "logging";
        version = "2.2.0";
-       sha256 = "0awcaj88754bppjmaay6lwmrmv0n53fppn2sjrnyi876r1ibr4qp";
+       sha256 = "1793bc62c8e6a0e86d965ad87bdd2816ec9a2ba7c62b55e5bd8b948390548c2b";
        libraryHaskellDepends = [
          base binary bytestring fast-logger lifted-base monad-control
          monad-logger old-locale pcre-light text time transformers
@@ -87974,7 +88284,7 @@ self: {
      mkDerivation {
        pname = "logging-facade";
        version = "0.1.0";
-       sha256 = "0zhdbjyj0j9by19rma9alxysrxnnl3s4kks4zk4bx0dg5xa0264y";
+       sha256 = "9e1801542faf81bec8fc44cf49f4a0d6f6ac7da72aa99a53f02b4920bd5c0d7e";
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [ base hspec ];
        description = "Simple logging abstraction that allows multiple back-ends";
@@ -87988,7 +88298,7 @@ self: {
      mkDerivation {
        pname = "logging-facade-journald";
        version = "0.0.0";
-       sha256 = "151p7574v9mxiniwxa4lngm5g4viznw4kg9adnngc3pi5nnh1z7l";
+       sha256 = "f4fc00ad2df10ef6ac6d2abd49b8fd719357eab394a8cea38dbda64d4e393794";
        libraryHaskellDepends = [
          base libsystemd-journal logging-facade text unordered-containers
        ];
@@ -88008,7 +88318,7 @@ self: {
      mkDerivation {
        pname = "logic-TPTP";
        version = "0.4.3.0";
-       sha256 = "0hjznn92ippwgrsmklj02w2pf6dfylyiw1kifa4svjqwa9mx4hpv";
+       sha256 = "fb42d26b521ccbad897271061e3df5ae1977051740d259757efcde2892b55f42";
        libraryHaskellDepends = [
          ansi-wl-pprint array base containers mtl pointed QuickCheck syb
          transformers transformers-compat
@@ -88025,7 +88335,7 @@ self: {
      mkDerivation {
        pname = "logic-classes";
        version = "1.5.2";
-       sha256 = "05p291y7hw8cfp0s0pb2vm9zpfs092nr92axwz6f74bkfdhrafwj";
+       sha256 = "923b9561737391e3cce75d8994ad4840bbfb53dd625da0c1750c71787c48e216";
        libraryHaskellDepends = [
          applicative-extras base containers HUnit mtl pretty PropLogic
          safecopy set-extra syb template-haskell
@@ -88045,7 +88355,7 @@ self: {
      mkDerivation {
        pname = "logicst";
        version = "0.1.0.0";
-       sha256 = "061x6g92334m2776xclh8mcbjind3l595pggc0g7yi4qzs31zbdc";
+       sha256 = "acad1f86fe98447f1e60efdd920a1dcd46b9584590b26ece11958c21d2333d18";
        libraryHaskellDepends = [ base logict transformers ];
        homepage = "http://github.com/sonyandy/logicst";
        description = "Backtracking mutable references in the ST and IO monads";
@@ -88057,7 +88367,7 @@ self: {
      mkDerivation {
        pname = "logict";
        version = "0.6.0.2";
-       sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi";
+       sha256 = "1182b68e8d00279460c7fb9b8284bf129805c07754c678b2a8de5a6d768e161e";
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://code.haskell.org/~dolio/";
        description = "A backtracking logic-programming monad";
@@ -88069,7 +88379,7 @@ self: {
      mkDerivation {
        pname = "logsink";
        version = "0.1.0";
-       sha256 = "1yxzqx47017z0djm8bymz43pc8cccnpkawaisvvzb646j6nbrw93";
+       sha256 = "23f1bcac918698f5f7d6517135af658c217607f9d52f546503ff047048c7bffb";
        libraryHaskellDepends = [ base hsyslog logging-facade time ];
        testHaskellDepends = [ base hspec logging-facade ];
        description = "A logging framework for Haskell";
@@ -88084,7 +88394,7 @@ self: {
      mkDerivation {
        pname = "lojban";
        version = "0.3";
-       sha256 = "0pd31g21db8yh1mrnmy7r60lr0dbpwlxpwc0hli3y1wcr4fisnx6";
+       sha256 = "a65b1d1dc98c073f228580f1db29bfab814c81c9c7579b6b801ead16c40ba35d";
        revision = "1";
        editedCabalFile = "9d30c9c8f1aa80aea24ca606d74ee1b3a9af0ecde15a0e65b1150d483d6b1cfc";
        isLibrary = true;
@@ -88105,7 +88415,7 @@ self: {
      mkDerivation {
        pname = "lojbanParser";
        version = "0.1.9.2";
-       sha256 = "0axi63dvls9k87samaa0jihisfqyl92jbhmx1j9q73yjrn5wsk8j";
+       sha256 = "124dcd8bcdd28f83930cbdc22545a21e3b1d619440a9aaf4413369badb30b12b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -88120,7 +88430,7 @@ self: {
      mkDerivation {
        pname = "lojbanXiragan";
        version = "0.3";
-       sha256 = "1h7jmhs38v6mfas4nj22shm2dwphx46247sv3mia28xlzim3xdsp";
+       sha256 = "57b73e6afcb423a1621d5b1f220ce9f0f2262ad442484bb472d56c3434acf2c0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -88135,7 +88445,7 @@ self: {
      mkDerivation {
        pname = "lojysamban";
        version = "0.0.8.1";
-       sha256 = "0c571fk7kz4szpba85d7bf5awak5bc25r59kyx3xvyvk011y9hhd";
+       sha256 = "0dc2e4430073fbdd47f733955c045b652aae8a5ba715a4d6fd9afc79a60ba730";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base lojbanParser yjtools ];
@@ -88152,7 +88462,7 @@ self: {
      mkDerivation {
        pname = "loli";
        version = "2011.6.24";
-       sha256 = "1m23dkxh2vah7d47arpqx5zdpwczm8k4jixzslmqbdizm9h933ja";
+       sha256 = "4a8e9160aa3fb6852bd5bf474926aa9ff1db7ee9f86675483b506d01fb6c43d4";
        libraryHaskellDepends = [
          base bytestring containers data-default hack hack-contrib mps mtl
          template utf8-string
@@ -88169,7 +88479,7 @@ self: {
      mkDerivation {
        pname = "loop";
        version = "0.2.0";
-       sha256 = "11ifqahlg9ky5klid1fhsyfvfb6w8yb0dsy43s0cxcmldbw3qv5x";
+       sha256 = "bd6c3cf86ab4b2ce801ec4eb069647dc2cb79dd7d08516e92c7ea647a1c22e86";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec mtl ];
        homepage = "https://github.com/nh2/loop";
@@ -88182,7 +88492,7 @@ self: {
      mkDerivation {
        pname = "loop-effin";
        version = "0.1.1.0";
-       sha256 = "02x02m98ka1y8f1jjqwfwmsyx29g583gnr4jdm5syqxfr0dz6c52";
+       sha256 = "a230f31bc8ae63af4b6d9264fb062a2f89ee75e58e632983433ea8895215a00b";
        libraryHaskellDepends = [ base effin ];
        jailbreak = true;
        homepage = "https://github.com/konn/loop-effin";
@@ -88196,7 +88506,7 @@ self: {
      mkDerivation {
        pname = "loop-while";
        version = "1.0.0";
-       sha256 = "1yvw91gn1iyw72rbq455zzrbb3pq8ph9cv1c6800qzjyxx0694bd";
+       sha256 = "6d916440ef5e7e0c00322c6c96e045f88eb5f2ffa510bcb238dcc7605f487cfb";
        libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "A monad transformer supporting various styles of while loop";
@@ -88210,7 +88520,7 @@ self: {
      mkDerivation {
        pname = "loops";
        version = "0.2.0.2";
-       sha256 = "1syx22gp2zra2dhwvmm2np6c1lvqk622a62k4xxjd8y1fs2ckks7";
+       sha256 = "47cfc98476c1a3267b27531825849978d3c0ccb5a2d6cd61132a7f719f10ddeb";
        libraryHaskellDepends = [ base primitive transformers vector ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Fast imperative-style loops";
@@ -88224,7 +88534,7 @@ self: {
      mkDerivation {
        pname = "loopy";
        version = "0.0.1";
-       sha256 = "0gyd7l4i3vzv7swyqfywzwhsdxq3j5869c2id6hz6nm7db47wyy6";
+       sha256 = "c67b7ec86aa75af3a16951b064509103f7a621ffdc3becb93efbef11093dcd3f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88248,7 +88558,7 @@ self: {
      mkDerivation {
        pname = "lord";
        version = "2.20150122";
-       sha256 = "0kzvi4310mbz51zkgmm84qyxxpi4m5ww2bsrfkj73a45bn7z198j";
+       sha256 = "12a5f08f5d85a871e474592fc179a924dede3d26a8d6377f287f55100689fb4f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88283,7 +88593,7 @@ self: {
      mkDerivation {
        pname = "lorem";
        version = "0.0.0.0";
-       sha256 = "1fx7z90k9y12rii0yxk58159paiix1qi8y4j0za4k4szylr8f5ni";
+       sha256 = "d1168732f55f9349d40792781471e831aa9b4a4065760f62cc22f83441faa7bb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -88299,7 +88609,7 @@ self: {
      mkDerivation {
        pname = "loris";
        version = "0.3.1";
-       sha256 = "19w1c3gsmy03y4a238yp844wgqcv9s53cwrcapv2yvn9xpchm2gq";
+       sha256 = "f8890ad9edc96e2ff6552c73368a4e9be1c70941d7a32114f103f8aadf6081a7";
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ loris ];
        libraryToolDepends = [ c2hs ];
@@ -88316,7 +88626,7 @@ self: {
      mkDerivation {
        pname = "loshadka";
        version = "0.2";
-       sha256 = "01jjbcgzpkh3mp729xahy2437hrg6wc2l1qnwcm069zrs3c1bdny";
+       sha256 = "deb615d8d0f927032ae316072a18372fc33388f050f524cead03cefb1f5b5206";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88336,7 +88646,7 @@ self: {
      mkDerivation {
        pname = "lostcities";
        version = "0.2";
-       sha256 = "1avlq28k0jcfbnd0pfww80ixz5lvpp4jkf20dybjl7pfqyhj3s9p";
+       sha256 = "37e921a1c7ee1e2a976f40b829c9bd9b96df23409cbb0b9a5d8e493091c074ab";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88354,7 +88664,7 @@ self: {
      mkDerivation {
        pname = "lowgl";
        version = "0.3.1.1";
-       sha256 = "1c354ddx9niimfnppbg43d0v2dfr5s9s5dkppi0sld06jxaakxc5";
+       sha256 = "85f5a954970634aa41bc77b6a2932ed935b1411be4ad7badab31dad45b2365b0";
        libraryHaskellDepends = [ base data-default gl linear vector ];
        jailbreak = true;
        description = "Basic gl wrapper and reference";
@@ -88366,7 +88676,7 @@ self: {
      mkDerivation {
        pname = "lrucache";
        version = "1.2.0.0";
-       sha256 = "05knlckzx261yxbz38rqq8vy86zj1np0w2l32cnib6714vhaj5sz";
+       sha256 = "5f17a9e026e198152d13830a0eae0df21be437c238a3f157f7c188fe27a37616";
        libraryHaskellDepends = [ base containers contravariant ];
        homepage = "http://github.com/chowells79/lrucache";
        description = "a simple, pure LRU cache";
@@ -88380,7 +88690,7 @@ self: {
      mkDerivation {
        pname = "ls-usb";
        version = "0.1.1";
-       sha256 = "08xaf27iirdxax7gjjjzvw4nv0qya6vz46826bzmp7f0i0rn88qk";
+       sha256 = "1323643388c09d5bff320219f2b7511e836d09df5f4af94e57bde5188f70aa23";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88401,7 +88711,7 @@ self: {
      mkDerivation {
        pname = "lscabal";
        version = "0.1.1";
-       sha256 = "14j19jcmx20nhvb9a7im81j3wwkkx6lkb6b1kfizv8qkgnp0jd5j";
+       sha256 = "b23409ae7d13a3fda39b619935a9e973723e6440351e95d68616885e994c4192";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88420,7 +88730,7 @@ self: {
      mkDerivation {
        pname = "lss";
        version = "0.1.0.0";
-       sha256 = "1r890sya0db0xvs9cm5ghhr6x55hkqplirv95km6y7py7hj69cjr";
+       sha256 = "59b264243cfe1e6fea2c69e7482f9eb0946e3284af5496f4ee6035a0bc0609e5";
        libraryHaskellDepends = [
          attoparsec base containers directory filepath language-css
          language-css-attoparsec text xmlhtml
@@ -88441,7 +88751,7 @@ self: {
      mkDerivation {
        pname = "lsystem";
        version = "1.2";
-       sha256 = "1wk41hsr7pp9azac3449xp0xv8kd31bwif3yw6cfw9jfg3g498xg";
+       sha256 = "afa344de784e26ee98e17eb8c857186da2ddc1ed8990c1d457e9de93350c64f2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88460,7 +88770,7 @@ self: {
      mkDerivation {
        pname = "ltext";
        version = "0.0.2.1";
-       sha256 = "0dr99prlsbzisaz8jbiw297fw1fysr9zq0g5ywc959ar3nki039f";
+       sha256 = "2e0d10a71d59a59218f7e501fc53d6de05ee4e123c2e89bed2f12f4df34d2937";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88483,13 +88793,12 @@ self: {
      }:
      mkDerivation {
        pname = "ltk";
-       version = "0.15.0.2";
-       sha256 = "19wnkl9acibs6kcnm0m02jhjxrn19sanf5z2w0kqwjbqlfcrcc4a";
+       version = "0.15.0.3";
+       sha256 = "86e0ed96110ad0b2be8d63828e4ab8429893e4c269b28a95f4e1d70c73bc05c2";
        libraryHaskellDepends = [
          base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text
          transformers
        ];
-       jailbreak = true;
        homepage = "http://www.leksah.org";
        description = "Leksah tool kit";
        license = "GPL";
@@ -88500,7 +88809,7 @@ self: {
      mkDerivation {
        pname = "ltl";
        version = "0.0.0";
-       sha256 = "0h3jxngsdmakcr35zapxjaykjsqs44lxxk86d5i4rg0gi0i9qw3g";
+       sha256 = "6f709c22880fbc4c626906cdde29211a6b39bd92fdaa5f466653d5a69fed7240";
        libraryHaskellDepends = [ base vcd ];
        homepage = "http://tomahawkins.org";
        description = "Using linear temporal logic (LTL) to verify embedded software and hardware";
@@ -88514,7 +88823,7 @@ self: {
      mkDerivation {
        pname = "lua-bytecode";
        version = "0.1.0.0";
-       sha256 = "1cwpixaxxkfd8n714c8w82z97h3h8bqqqnh2wsn22cll168rb6zl";
+       sha256 = "f49b959109943221ace6025a8cf14270c093be401c31128e45cdcdde558f97b3";
        libraryHaskellDepends = [
          array base bytestring cereal containers hashable numeric-extras
          vector
@@ -88530,7 +88839,7 @@ self: {
      mkDerivation {
        pname = "luachunk";
        version = "0.1.0.0";
-       sha256 = "03a8adaz3m93wnfmrvsqbmc57h1d8h0a90spfj1cb7yrpz0pr3ck";
+       sha256 = "938d7cc1bfd99fc582745783a400442dc053585d58ef5c9de523d5f15553480d";
        libraryHaskellDepends = [
          attoparsec base binary bytestring custom-prelude ghc-prim pretty
          text
@@ -88549,7 +88858,7 @@ self: {
      mkDerivation {
        pname = "luautils";
        version = "0.1.4";
-       sha256 = "176szfrz1ydnin1zi50235j4f4l87j516yjddmqbmd834dzvk20d";
+       sha256 = "0d88b97f2303b5ba706d4d7a138a3c88124764190294f8838db6f9f0b3fbda9c";
        libraryHaskellDepends = [
          base binary bytestring containers hslua monad-loops text
        ];
@@ -88568,7 +88877,7 @@ self: {
      mkDerivation {
        pname = "lub";
        version = "0.1.7";
-       sha256 = "1dsm7cg0i930r5dn8591aabkl0p8b5l348pccdvi7p0g7asx451h";
+       sha256 = "3014d2b53a0fdc137763ec22326859e8023a97522115645bc960a4081e3b55b7";
        libraryHaskellDepends = [ base unamb ];
        homepage = "http://haskell.org/haskellwiki/lub";
        description = "information operators: least upper bound (lub) and greatest lower bound (glb)";
@@ -88583,7 +88892,7 @@ self: {
      mkDerivation {
        pname = "lucid";
        version = "2.9.2";
-       sha256 = "0r3bzh9pmcqsac5id064jcscn9x2pyfhpazdzvz0666smf4b9jah";
+       sha256 = "50c9b488abda1803fefeedab0b9dbfa227cb3493c480160b531ab37a13fc6b64";
        revision = "1";
        editedCabalFile = "62ded561d5846fbcbe77e7f491c5fed2f4beddbf5cda336685f3d980df525218";
        libraryHaskellDepends = [
@@ -88605,7 +88914,7 @@ self: {
      mkDerivation {
        pname = "lucid-foundation";
        version = "0.0.2.1";
-       sha256 = "10l6xvb3kmkjb9sq92ijwnnbpm3rmp6j8r8vf00kdxkgx84n1zqd";
+       sha256 = "0dff6009ea6ff63601701b6524cdad79d4bbace5328a84755a72d639d6ee8682";
        libraryHaskellDepends = [ base lucid text ];
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-instances
@@ -88619,7 +88928,7 @@ self: {
      mkDerivation {
        pname = "lucid-svg";
        version = "0.5.0.0";
-       sha256 = "1p7ipdy0nmqfg1b038a1b5nd3xh2779d2gnw4h683mm5jcbf0mvj";
+       sha256 = "7257e01693a5d6810c24dc3ed1d23902f6d16c5941a10156780e570b7cbbf1dc";
        libraryHaskellDepends = [
          base blaze-builder lucid text transformers
        ];
@@ -88636,7 +88945,7 @@ self: {
      mkDerivation {
        pname = "lucienne";
        version = "0.0.2";
-       sha256 = "1dcvax756cqpqg6rrrjrd4sfr3ggvqdiwp42rb8fdrsi3v2skwrj";
+       sha256 = "32f3a9c51e51e7e6d0ca825c1e1bdeef8dec346959e69ccdc31733534e579bb5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88656,7 +88965,7 @@ self: {
      mkDerivation {
        pname = "luhn";
        version = "0.2";
-       sha256 = "0ix7x28kmd3iarydl709vqd041h0qx6kv582c8ca54z8ag7lzynz";
+       sha256 = "dffa4fcf53e893a2186202953d4dc70006021ade091cda7c5671b43a91e8a747";
        libraryHaskellDepends = [ base digits QuickCheck ];
        description = "An implementation of Luhn's check digit algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -88669,7 +88978,7 @@ self: {
      mkDerivation {
        pname = "lui";
        version = "0.0.6";
-       sha256 = "081451gpm20z8zl3y1mjy9015a461g7q99w7sjnr8alvd3pbhd6v";
+       sha256 = "db34b8ee689b2a94add487a784cf0b86a81240f2b2063fe8471f887a5f282420";
        libraryHaskellDepends = [
          base containers haskell98 haskgame MaybeT mtl SDL
        ];
@@ -88683,7 +88992,7 @@ self: {
      mkDerivation {
        pname = "luka";
        version = "2012.8.29";
-       sha256 = "00g7a80nlw1bgw6x2pqg1qn4786ra3bwbwbfm9b7iyhb101b7s9s";
+       sha256 = "3ae9b302080bfa7856aa6ef1c5d750d9a0432c0e0f5fd10d7f2b706a0152e701";
        libraryHaskellDepends = [ air base bytestring libffi ];
        librarySystemDepends = [ objc ];
        homepage = "https://github.com/nfjinjing/luka";
@@ -88697,7 +89006,7 @@ self: {
      mkDerivation {
        pname = "lushtags";
        version = "0.0.1";
-       sha256 = "0325c064nsczypapvwdchx7x5n69jxjbyjs90ah7q5ydxbjl6w9c";
+       sha256 = "2c7143e5eacd177ca002494bbf6497c9d8d24f87acf17dd5f59f694b0c60450c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell-src-exts text vector ];
@@ -88712,7 +89021,7 @@ self: {
      mkDerivation {
        pname = "luthor";
        version = "0.0.1";
-       sha256 = "023kckpcdn6n5dyq0dip0132jp1w30hdx1qb5hbsd3js86j52a12";
+       sha256 = "222851a4415a8ea6172c0b87de20183c5c2946003736807d2bd6d8c6ee647308";
        libraryHaskellDepends = [ base mtl parsec ];
        testHaskellDepends = [ base mtl parsec ];
        jailbreak = true;
@@ -88732,7 +89041,7 @@ self: {
      mkDerivation {
        pname = "lvish";
        version = "1.1.4";
-       sha256 = "1s7i1jxb6m7ivk4nd60dy8hn4wgfhv1gcamvv6hgjvcw6rxn4k44";
+       sha256 = "844c627b369c6df9a0d9bb2af6c286ee716221f20d9866c9dcf154b3ba0cf1e8";
        revision = "2";
        editedCabalFile = "bb376e7ac0598a623c8222824a2ace2649a395be610f81912eb7193450aa3e7e";
        libraryHaskellDepends = [
@@ -88758,7 +89067,7 @@ self: {
      mkDerivation {
        pname = "lvmlib";
        version = "1.1";
-       sha256 = "1lr2qr817mb8qb7b3wvry9jpj3wjphj5s60rn3dyqibx8gny36bg";
+       sha256 = "6f99e1ed437d45ecdbb019185d24bc920f7965f279f3b1cec268d51350c622d3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88778,7 +89087,7 @@ self: {
      mkDerivation {
        pname = "lvmrun";
        version = "1.0";
-       sha256 = "0wcf9brcvf4b7qcs51mngca3qxilk0x50h3dml28zg6lg93wwbfa";
+       sha256 = "ca2dce477ad4bc8f04ad6d40503a9834763c147bb686a2193e8bb8cdf24a8e71";
        isLibrary = false;
        isExecutable = true;
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
@@ -88791,7 +89100,7 @@ self: {
      mkDerivation {
        pname = "lxc";
        version = "0.3.1.1";
-       sha256 = "1mksram2nlb611b81yh5smvgr3dqxyabphrrpimspixwwl8173zr";
+       sha256 = "f98f1310e5bcc7ab6bbc39c3bb94efb88dfc76d505fa80560866512baaca7ad6";
        libraryHaskellDepends = [ base bindings-lxc mtl transformers ];
        jailbreak = true;
        homepage = "https://github.com/fizruk/lxc";
@@ -88806,7 +89115,7 @@ self: {
      mkDerivation {
        pname = "lye";
        version = "0.1.0.0";
-       sha256 = "1pmlxvnlwdsb51pjrkak1sakfh3nyk5lia5pqmr7larlm1n3dx9m";
+       sha256 = "35f5366ca8342b7a72c5b7a848cbf4764037950e53cd2c6f284b374eedeeb4de";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88823,7 +89132,7 @@ self: {
      mkDerivation {
        pname = "lz4";
        version = "0.2.3.1";
-       sha256 = "1wck0sl7m873pqnpmn95vrp9jbr7awjdp9rrkqgj0nd3l6z65k4q";
+       sha256 = "98cc62bea1a359201f9e39a7db2457272f996ede25d97a2dbee3a07aa80693f1";
        libraryHaskellDepends = [ base bytestring cereal ];
        testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ];
        homepage = "http://github.com/mwotton/lz4hs";
@@ -88839,7 +89148,7 @@ self: {
      mkDerivation {
        pname = "lzma-conduit";
        version = "1.1.3";
-       sha256 = "01pf7q56y4m377qcbfwdv767dhlvkhd4cs01bqcg9k667iy21fr4";
+       sha256 = "24bb207c3cc6ccf4185e0168461a9c9bc276ccd98dbbc5f039a3126f0a3eee06";
        libraryHaskellDepends = [
          base bindings-DSL bytestring conduit resourcet transformers
        ];
@@ -88861,7 +89170,7 @@ self: {
      mkDerivation {
        pname = "lzma-enumerator";
        version = "0.1.3";
-       sha256 = "0pzz8bf6310p23pmsa013i8vib0xsfvlkj7zp0w9xs2xsi4j7jk1";
+       sha256 = "61ca2349d45de89e38b8ffc849b7d31dacb8511c01285def10178461dc42ff5f";
        libraryHaskellDepends = [
          base bindings-DSL bytestring enumerator mtl
        ];
@@ -88884,7 +89193,7 @@ self: {
      mkDerivation {
        pname = "lzma-streams";
        version = "0.0.0.0";
-       sha256 = "0klgi097b8mky989hfzn3kk3r25yq1p0sjna4r68k7z9y143yzm2";
+       sha256 = "a27e3f48f0e99f894c26ca4a0d6ec0be883ce61cf63b9850f2b3a27512888f4e";
        libraryHaskellDepends = [ base bytestring io-streams ];
        librarySystemDepends = [ lzma ];
        testHaskellDepends = [
@@ -88903,7 +89212,7 @@ self: {
      mkDerivation {
        pname = "maam";
        version = "0.2.0.1";
-       sha256 = "1r6vp774gjb52bd1lmjx6xzh0pw82b060pl7bh8n0z58i67bvm9q";
+       sha256 = "38d5bd8e89a87c60115c875e60c012885f007f375d561ada1265c947ceb9dbe4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88920,7 +89229,7 @@ self: {
      mkDerivation {
        pname = "mac";
        version = "0.1.0.0";
-       sha256 = "1ym5hk774y65mjxhp1vwa40ji2yjf4abqrpf3v9dknc28r64v8bi";
+       sha256 = "71a14d4c4682d9d9d21eee66bc1471d28b2801517c870bbbacc57872ce84a5fa";
        libraryHaskellDepends = [ base network transformers ];
        description = "Static Mandatory Access Control in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -88931,7 +89240,7 @@ self: {
      mkDerivation {
        pname = "maccatcher";
        version = "2.1.5";
-       sha256 = "0z56rbfr8vijhjf3dcqd4kaxgx9bf3qgi9sm61yc3i6ra60w7byb";
+       sha256 = "cbafc38151d9c4c17c3055a7f8f0702bf5d7d5240db3369c84326e94ddcaa67c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base binary parsec process ];
@@ -88946,7 +89255,7 @@ self: {
      mkDerivation {
        pname = "machinecell";
        version = "2.1.0";
-       sha256 = "10ywc93sihag844ifsimxz0vmr34i3a7rjpy63gs0ikkvr4vxs1g";
+       sha256 = "2fe8be49de7346a0df30feca7cd48864e4bac1ef356a1709414fc1a84762dc83";
        libraryHaskellDepends = [
          arrows base free mtl profunctors semigroups
        ];
@@ -88966,7 +89275,7 @@ self: {
      mkDerivation {
        pname = "machines";
        version = "0.5.1";
-       sha256 = "1dyvyy0yv9qha1ff2nfrl304vmmbi4hd881jyj3xpqhgc3zz8ab2";
+       sha256 = "6229f4ff600fe2db87f43220d42089abd64dc0a0d959e15c5010a7ed81f7dbb7";
        revision = "1";
        editedCabalFile = "c50d5fcc8b1b5635539169a5da097a25c7a7b7e9b8cc582abba3703014ba2d1d";
        libraryHaskellDepends = [
@@ -88987,7 +89296,7 @@ self: {
      mkDerivation {
        pname = "machines-directory";
        version = "0.2.0.6";
-       sha256 = "03faha5zbxikbrz40wb0qar8qyjkzaylnk78ba925vms57dwwxva";
+       sha256 = "6a77cedb29baee22925ae84c4bbdfa537a8cb2c26071407e5e33f6f58b82ca0d";
        libraryHaskellDepends = [
          base directory filepath machines machines-io transformers
        ];
@@ -89003,7 +89312,7 @@ self: {
      mkDerivation {
        pname = "machines-io";
        version = "0.2.0.6";
-       sha256 = "19xi9ia2f18nwqx58qb4l1hc2cv25jwcsl4qxd7snp4ynjyy6ln1";
+       sha256 = "c152e3bdb49e5cab4feb9850cdb82c6233c160a06461543ae6160527544cb1a7";
        libraryHaskellDepends = [
          base bytestring chunked-data machines transformers
        ];
@@ -89018,7 +89327,7 @@ self: {
      mkDerivation {
        pname = "machines-process";
        version = "0.2.0.4";
-       sha256 = "1v0jskb8m1s7cd51672v4fj9sjy5l1q01vm6qyvkrsabjp04lq4l";
+       sha256 = "94604ac0954be93cb7c7a6ee0070a0c54b9da4235b1c134a6347878ad6d412ec";
        libraryHaskellDepends = [
          base chunked-data machines machines-io process
        ];
@@ -89033,7 +89342,7 @@ self: {
      mkDerivation {
        pname = "machines-zlib";
        version = "0.1.0";
-       sha256 = "0ajdc7878vzam5zphdaw8zn8knzk8kq80y3yf84jwlakb6ihrv6d";
+       sha256 = "cdec0ca35953512e09727e7880f044f3db89ec475c35787fa9ea6f74d0614d2a";
        libraryHaskellDepends = [
          base basic-prelude machines streaming-commons
        ];
@@ -89048,7 +89357,7 @@ self: {
      mkDerivation {
        pname = "macho";
        version = "0.22";
-       sha256 = "13i8bap38ha8j0259kw4gfx18jxc4860awp3s9rz16i4q2vik0v2";
+       sha256 = "628319b7c0249af073d2e372050c22ac4b14ba7b84cf540490484134ae5a288e";
        libraryHaskellDepends = [ base binary bytestring ];
        homepage = "http://github.com/erikcharlebois/macho";
        description = "Parser for Mach-O object format";
@@ -89063,7 +89372,7 @@ self: {
      mkDerivation {
        pname = "maclight";
        version = "0.1.0.0";
-       sha256 = "0qf44jza8avq2yfsx2f0bdxbnda4lm3xq9qaivmslfbdfjy3mxv3";
+       sha256 = "63f73abc746d39aaeb8e0a27dc47a54435bb7a5bc089ae9d17782ba4be24c461";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base filemanip filepath parsec strict ];
@@ -89086,7 +89395,7 @@ self: {
      mkDerivation {
        pname = "macosx-make-standalone";
        version = "0.1.0.1";
-       sha256 = "04j5fpj4758bl8ksaqn4zz6dl8pg24ih65k1b0pg8qrar4275r14";
+       sha256 = "24e47204c92a63f42e586116032311ef22daccffc462a527a20b9543e4754512";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89103,7 +89412,7 @@ self: {
      mkDerivation {
        pname = "mage";
        version = "1.1.0";
-       sha256 = "0fknvy48sanvq7vg5pxwbjsahpiby1hba5wf8w6rq2g3d0a1cjwz";
+       sha256 = "9f4b161468e3099c0d478e17b560f02b5ea8b45cbcdff2f6c1db2a8d88df763a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers mtl random ];
@@ -89119,7 +89428,7 @@ self: {
      mkDerivation {
        pname = "magic";
        version = "1.1";
-       sha256 = "10p0gjjjwr1dda7hahwrwn5njbfhl67arq3v3nf1jr3vymlkn75j";
+       sha256 = "b21c3b69f57b64199c1d7be0ac8ea1d02d698be59943058f6a2d642ea57ce082";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ magic ];
        description = "Interface to C file/magic library";
@@ -89132,7 +89441,7 @@ self: {
      mkDerivation {
        pname = "magma";
        version = "0.3.0.0";
-       sha256 = "0bk4a9kw2jxvvz81ppj6qh3kk8cbknnqmg6vvkd0kpn70rcx0hnv";
+       sha256 = "db42d05906c7de09dadcdbbc8aad9d8ba13907c446de1bd0dfbb4bc16752642e";
        libraryHaskellDepends = [ base deepseq profunctors semigroups ];
        jailbreak = true;
        homepage = "https://github.com/cutsea110/magma";
@@ -89149,7 +89458,7 @@ self: {
      mkDerivation {
        pname = "mahoro";
        version = "0.1.2";
-       sha256 = "0fmhms0415wawd539ipdj47gf27h2jjq2gpzhb0s21r6z63ayp7f";
+       sha256 = "ee5caf86f92607a1c182ff3e81a514f008f70e91edc6344ae38a974080aeb03a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89170,7 +89479,7 @@ self: {
      mkDerivation {
        pname = "maid";
        version = "2014.10.14";
-       sha256 = "1gss86263pzwvm14yx5lqzskrwc3z6521z9yp0mg8780qgr8h9sr";
+       sha256 = "592788f2c3001df42ab83efd208af983f13cf5c7b4744f42ddfcdf6184415abf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89191,7 +89500,7 @@ self: {
      mkDerivation {
        pname = "mailbox-count";
        version = "0.0.2";
-       sha256 = "1zd3vd0sj4pq8nhjn768rpfyn9a06a9c3j2fnhxsb9d800ilpvvf";
+       sha256 = "6eef4b2300a8a5a53bb44ec8c192324025ebddcdc81c2ba145f812a941dba3fd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89214,7 +89523,7 @@ self: {
      mkDerivation {
        pname = "mailchimp-subscribe";
        version = "1.0";
-       sha256 = "0c6sn7bpzw82iarpw40l88f58xrjl9gzdqx1xnbafzdyfhbrnzbi";
+       sha256 = "717d9b1774be7da796eda1e3f65fa23277541c4214107eb38a02f17fd7b1da30";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89235,7 +89544,7 @@ self: {
      mkDerivation {
        pname = "mailgun";
        version = "0.1.0.4";
-       sha256 = "01xcr0dwbkpryavk054y52fdk9qis4s6df8d0yxz05kdl8b5nczq";
+       sha256 = "f8335b16a26d16f0bb070db96634d111a7d99c289e1430b7f2f9cec51bc8ac07";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89255,7 +89564,7 @@ self: {
      mkDerivation {
        pname = "mainland-pretty";
        version = "0.4.1.0";
-       sha256 = "0r8xhlbpws6wq305dv3z074d7492jif9dsscz4sjbwvh5dk4x1zl";
+       sha256 = "f4874e662b70f32535f94ceb965c942291d3c8017fec56c0c0dc687e17851d65";
        libraryHaskellDepends = [ base containers srcloc text ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Pretty printing designed for printing source code";
@@ -89269,7 +89578,7 @@ self: {
      mkDerivation {
        pname = "majordomo";
        version = "0.1.6";
-       sha256 = "1rjarfwjqlrq9cdgjv93v6jwg58984c0dwjk506svsr29ll0p1b1";
+       sha256 = "61850b284d22ebad0d2853f20618410995c7a5d9236df91a4b38532cb9cb4ae6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89289,7 +89598,7 @@ self: {
      mkDerivation {
        pname = "majority";
        version = "1.1";
-       sha256 = "1442xw8i9jgk3hqavqikks98qs9l3i37lk63xyzpdgnlkfqapzka";
+       sha256 = "6afeabb09bd4be76bfefc34c7a461c34698c929e33e2ad301cf3c91411ef8290";
        libraryHaskellDepends = [ haskell2010 ];
        homepage = "https://github.com/niswegmann/majority";
        description = "Boyer-Moore Majority Vote Algorithm";
@@ -89304,7 +89613,7 @@ self: {
      mkDerivation {
        pname = "make-hard-links";
        version = "0.2";
-       sha256 = "0bynbrn7fnnw7s6wafaji5yf21zjsrdmdfyb7m97bk77ss0gprq2";
+       sha256 = "02e7fb80d6e7cc75523dcbbb565bd6f207e17c895239c58d3edc5a776c5ed62f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89322,7 +89631,7 @@ self: {
      mkDerivation {
        pname = "make-package";
        version = "1.2.0";
-       sha256 = "1502pggc0gcmsj6fhzkjcrbqydaxz4qivsmv57jm6cxpbypkyin3";
+       sha256 = "c3463faf5fb73353e529bbea1d31f95d358f5766727ee88cd4953dc0debb0294";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89339,7 +89648,7 @@ self: {
      mkDerivation {
        pname = "makedo";
        version = "0.1";
-       sha256 = "0sc2fa45a046lw5x5z839gb1zk0d5nj663ghxajiclm6iw65kl2n";
+       sha256 = "56d0590c8fa65216a5eaf00d63a42d0dcc1fd64b03fdd20ba786005588728269";
        libraryHaskellDepends = [ base directory filepath HSH process ];
        jailbreak = true;
        homepage = "http://darcsden.com/kowey/makedo";
@@ -89352,7 +89661,7 @@ self: {
      mkDerivation {
        pname = "managed";
        version = "1.0.0";
-       sha256 = "06nb71pd68m5l6a48sz5kkrdif74phbg3y6bn9ydd00y515b9gn5";
+       sha256 = "c5beb44a281e80d67cb2cbf8f116bce4b8d8f29ce56b4494a1a522d36e38cb1a";
        libraryHaskellDepends = [ base transformers ];
        description = "A monad for managed values";
        license = stdenv.lib.licenses.bsd3;
@@ -89366,7 +89675,7 @@ self: {
      mkDerivation {
        pname = "manatee";
        version = "0.2.2";
-       sha256 = "1v44kml92i426hbinjmx00znyp7dwxa8qj0bmhb3hz0fwmgck1c3";
+       sha256 = "8385c95ee50e7c3816ac0b488c54e7ed5c6f3f00bd4a1b1734824491689d84ec";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89390,7 +89699,7 @@ self: {
      mkDerivation {
        pname = "manatee-all";
        version = "0.2.2";
-       sha256 = "1l3s22svds27q8hyh9nsawpc11crcll3vrcbfy6dvk64s04mwr21";
+       sha256 = "41645e09d0c4ccdd8c778be53d28659985c02e57da26e821c247e8b6b5107ad0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89412,7 +89721,7 @@ self: {
      mkDerivation {
        pname = "manatee-anything";
        version = "0.0.8";
-       sha256 = "1ag0272cv700yi7y539hz3r04hqfqq9mx3cacp4hix4wag25f0n8";
+       sha256 = "c80257c4539cf408c9658a8d5e13c60e4302f2f8308de24ff4009ccdc411e0a9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89433,7 +89742,7 @@ self: {
      mkDerivation {
        pname = "manatee-browser";
        version = "0.1.1";
-       sha256 = "01blfcfynfbshznrz4arn89j7s063s7xhlkqnzbv42wqk04i083h";
+       sha256 = "7020100998980bb2d7b77852d88f1e06e82313b259919fed877a39eb1d737405";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89457,7 +89766,7 @@ self: {
      mkDerivation {
        pname = "manatee-core";
        version = "0.1.1";
-       sha256 = "05s5cd43a395jgyh4i01wzzzwha9rx9vrflwyr6lpz5nqnfp755v";
+       sha256 = "bb94739dc5b6fc4b4df69cbabc53cf4941feffe7014402fd93250d3548634517";
        libraryHaskellDepends = [
          array base binary bytestring Cabal cairo containers dataenc
          dbus-client dbus-core derive directory filepath gconf ghc ghc-paths
@@ -89480,7 +89789,7 @@ self: {
      mkDerivation {
        pname = "manatee-curl";
        version = "0.1.1";
-       sha256 = "0v525dcg6cs8mfrcbaxk9vx86gnd37c2z8gp9q8fck11616vckvn";
+       sha256 = "764fb64d30214ce6104ef7a12fd819cd3e83fa4eb3abc5b2ab4833f3582ba26c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89502,7 +89811,7 @@ self: {
      mkDerivation {
        pname = "manatee-editor";
        version = "0.1.1";
-       sha256 = "0rd6xjc1hmvfchwjh32ij4sa36z0v6b1k81gnx7278qqsscmgl9y";
+       sha256 = "3ed15799d618a3234eb72fa01996d9e09ba13491510c2839646e571898eca665";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89523,7 +89832,7 @@ self: {
      mkDerivation {
        pname = "manatee-filemanager";
        version = "0.1.1";
-       sha256 = "06zrhycpsnfi8r3a071p6qlrqidddv004h10zcglb9ryhw0sh2p1";
+       sha256 = "e10aa801873ea7451ffb204002c06ead459c2936371ca04646d1597d9987f91b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89544,7 +89853,7 @@ self: {
      mkDerivation {
        pname = "manatee-imageviewer";
        version = "0.1.1";
-       sha256 = "0yn32xsckvw96kxskfhgcqg98rffl07hkwfjzyd7cm221hwd9s0g";
+       sha256 = "0fe8d4380c4254769affd2f1090fa0ce65941e660fbaa9fb3489efc97417c37a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89567,7 +89876,7 @@ self: {
      mkDerivation {
        pname = "manatee-ircclient";
        version = "0.1.1";
-       sha256 = "0l14r4mw5bwyjzs5m49sp3vdi2lzfgyjwhsb0q94l3937wb4abgy";
+       sha256 = "fe2d45163f230d4a12064b432efd739f8ad8f6b83a915af4979eafc22bc92450";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89589,7 +89898,7 @@ self: {
      mkDerivation {
        pname = "manatee-mplayer";
        version = "0.1.1";
-       sha256 = "1jg9ikshscpjyq73g125acqndd049ry8zw7h0gglsi63xbqpldz4";
+       sha256 = "e4377af1eac3444ddf03f0f08f7c4e04b46631534584370ef6f2320df58ce9c9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89611,7 +89920,7 @@ self: {
      mkDerivation {
        pname = "manatee-pdfviewer";
        version = "0.1.1";
-       sha256 = "0k00drrk7mpbc8ak5cwzx245xf968186dkc12cxp7n2h2mccb456";
+       sha256 = "a690c5581550d8733b1381cd66504026b95e88e89fb3321562ebd633736e004c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89631,7 +89940,7 @@ self: {
      mkDerivation {
        pname = "manatee-processmanager";
        version = "0.1.1";
-       sha256 = "1zxkfil6anh2v692ky9l6gf40784y2czbx8853xmypnhnvgr95ll";
+       sha256 = "949694dfb6d05e5ffb2808f5f599f0041d40dc3334f92992d9025a656874b3ff";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89652,7 +89961,7 @@ self: {
      mkDerivation {
        pname = "manatee-reader";
        version = "0.1.1";
-       sha256 = "07zkjg1q3gdqiw1pp0325pyvh84740mxvlf8k6sc6l1l258zpk90";
+       sha256 = "20cdfb51113450c3b499c8d1dd2b208720b8fd2d62807b038fb8bd81c393f31f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89673,7 +89982,7 @@ self: {
      mkDerivation {
        pname = "manatee-template";
        version = "0.1.1";
-       sha256 = "0lcd3g7gp3fl4xpc51wgk0q9q1lijgnfdla521h7nqz84wcdfbcy";
+       sha256 = "9e2dd71827e8637b601045d1e6ec9391069c30988f87c26e27d48dfbce1b8d51";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89693,7 +90002,7 @@ self: {
      mkDerivation {
        pname = "manatee-terminal";
        version = "0.1.1";
-       sha256 = "1aj1pghad0jdm3biy9f4caahvpyby0ia3clrl8lg2rmp2j703wkd";
+       sha256 = "6df2018e14b766f128a299b2a122f0cbdf0d9562c4251fd7a84d82a6e0bb41aa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89714,7 +90023,7 @@ self: {
      mkDerivation {
        pname = "manatee-welcome";
        version = "0.1.1";
-       sha256 = "1vwj91i05rwgqmral4v2mmcmlrqy54h816j8vi6d0ivs1693p308";
+       sha256 = "088c3b92097a47d04cdc489a8020291e675a59ad6213aa72c58fe702624892ef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89732,7 +90041,7 @@ self: {
      mkDerivation {
        pname = "mancala";
        version = "0.1";
-       sha256 = "1vsrp69qhndagzlw5fg9chi0hhphfbjmlvarypqi3g9fgrdghn46";
+       sha256 = "8658f85a7e2ebd11f1f5596d5ae572f042082264e9b9c2e97faa598893b959ef";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -89749,8 +90058,8 @@ self: {
      }:
      mkDerivation {
        pname = "mandrill";
-       version = "0.2.2.1";
-       sha256 = "0fs9fid7d87cnx5wi513xjqkgq425pfd4v9dx82x2c0pvnyfdvhk";
+       version = "0.3.0.0";
+       sha256 = "f497b16900ead8851bec4d8529dfa2a0ba77397a8e7f95ef39d68928d64ffc09";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
          email-validate http-client http-client-tls http-types lens mtl
@@ -89771,7 +90080,7 @@ self: {
      mkDerivation {
        pname = "mandulia";
        version = "0.7";
-       sha256 = "1wrpzai3482c9g7zfacmjszi6h073ip00fbq17nyc22z2zw4908s";
+       sha256 = "1a8144f8175f08e6ed097839006e1c074013bf969529f7cf4b4c2032a2fa37f3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89795,7 +90104,7 @@ self: {
      mkDerivation {
        pname = "mangopay";
        version = "1.11.4";
-       sha256 = "0yb6i97ihcywbgzqkrad72q33m7fgx903rqizlhb4nz4bkl8793d";
+       sha256 = "6da483e85ce45bb220fd11e701527feed431b0384de589ff5bdc33184f8a6679";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89831,7 +90140,7 @@ self: {
      mkDerivation {
        pname = "manifolds";
        version = "0.1.3.1";
-       sha256 = "1d1hcdv76bzw2pl6ik2kdprdjdv7nmbbxs31rgz93lzhpkn8dlpj";
+       sha256 = "f2d286ecbcf0d391fecb61e8be56b56737d9f26d53cc68e815fc2f73766330b4";
        libraryHaskellDepends = [
          base comonad constrained-categories containers deepseq hmatrix
          MemoTrie semigroups tagged transformers vector vector-algorithms
@@ -89851,7 +90160,7 @@ self: {
      mkDerivation {
        pname = "map-syntax";
        version = "0.2";
-       sha256 = "02v1dvq86qzbfbwbza4myj3a6a6a5p059fi5m3g548hmqk3v2p1r";
+       sha256 = "395cb1c7c4152252dea825ba54c02dca28a386f495a8bff872eb6383f06e610b";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [
          base containers deepseq HUnit mtl QuickCheck test-framework
@@ -89868,7 +90177,7 @@ self: {
      mkDerivation {
        pname = "marionetta";
        version = "0.1.0.3";
-       sha256 = "0k25m5q8p592xrg2qa0mvm3749gllrj4cmmx2h1k5hssan68bk9g";
+       sha256 = "2fcd858c555ac3320314bd564664a6f4257246dd15282c5eee22958b70a9454c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89889,7 +90198,7 @@ self: {
      mkDerivation {
        pname = "markdown";
        version = "0.1.13.2";
-       sha256 = "15aiwjs006g8aajw88rgfvrpcwaxml9hnpz7jrhmdm2pqxfrkb8z";
+       sha256 = "1fad995dc757d4566196e75f0b13ad5d7176f3762f23c4a552e81900b4e45195";
        libraryHaskellDepends = [
          attoparsec base blaze-html blaze-markup conduit conduit-extra
          containers data-default text transformers xss-sanitize
@@ -89912,7 +90221,7 @@ self: {
      mkDerivation {
        pname = "markdown-kate";
        version = "0.1.2.1";
-       sha256 = "0zjqy163rxpjy0w3bn21j193qp04f7sdc8mfskaddqfks402h4i0";
+       sha256 = "20122800d1d3e1d6d4d4ae22d6f471045c3c529041d83538f0f2f63c4cf0587e";
        libraryHaskellDepends = [
          attoparsec attoparsec-conduit base blaze-html conduit containers
          data-default highlighting-kate text transformers xss-sanitize
@@ -89932,7 +90241,7 @@ self: {
      mkDerivation {
        pname = "markdown-pap";
        version = "0.0.1.10";
-       sha256 = "0cq0s9yixkg98vhsgiv1xjia2cn0b4q6gjl1wv0q7yrm26anaqcq";
+       sha256 = "986165951135fb83c1e681ca673059c032a1a2ec61c7a7e146e9cd1e7dd20033";
        libraryHaskellDepends = [ base monads-tf papillon ];
        description = "markdown parser with papillon";
        license = stdenv.lib.licenses.bsd3;
@@ -89946,7 +90255,7 @@ self: {
      mkDerivation {
        pname = "markdown-unlit";
        version = "0.2.0.1";
-       sha256 = "1bc3vcifv2xcddh8liq380c6sxarrs5pf21pfs9i4dx9rfl3hvhq";
+       sha256 = "186e38a8cba9371293763708778bce59756d184003478a606bac8bed22db83ad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -89965,7 +90274,7 @@ self: {
      mkDerivation {
        pname = "markdown2svg";
        version = "0.0.1.27";
-       sha256 = "0sman1849sfr0d56kifpyb0ba9pqghvmyhr3gchcd13qimp80395";
+       sha256 = "250d806e8d7884c6207b23435f377cf826b5c0f2d7c5694a03d9e94450b0aa6a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89982,7 +90291,7 @@ self: {
      mkDerivation {
        pname = "marked-pretty";
        version = "1.1.2.1";
-       sha256 = "01dsqdckrm93ydc5frsxj55vgj238213qr31n1iybjdmw5x2r0dl";
+       sha256 = "b4812c7ae1b5c9e563b061643c824043c8b74b915d675758f323d53c59c3ba05";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/ku-fpg/marked-pretty";
@@ -89995,7 +90304,7 @@ self: {
      mkDerivation {
        pname = "markov";
        version = "0.1";
-       sha256 = "1ka44rvrl9ppshbjmk95997cna670bqwjsharcr9qsalp6pchmdf";
+       sha256 = "ae55c8aeb954699c32cb0a6ac9f102c728cb4e4a25cd2a17d4f7269a772644cd";
        libraryHaskellDepends = [ base ];
        description = "Simple interpreter for Markov's normal algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -90006,7 +90315,7 @@ self: {
      mkDerivation {
        pname = "markov-chain";
        version = "0.0.3.3";
-       sha256 = "1y9fjsf6dg6a9ha75w2szq4gi5fhq89l1r7wqb20hmadkcjjplx8";
+       sha256 = "a8d32b259b4d5508c4c2fce44013c2d095f808fe5af072144ccabc669c962ef9";
        libraryHaskellDepends = [ base containers random transformers ];
        homepage = "http://code.haskell.org/~thielema/markov-chain/";
        description = "Markov Chains for generating random sequences with a user definable behaviour";
@@ -90020,7 +90329,7 @@ self: {
      mkDerivation {
        pname = "markov-processes";
        version = "0.0.2";
-       sha256 = "1pd09fdy05l3drmpdd3rbid6g2vdyalrpc704xmacbp186hmnf38";
+       sha256 = "68385ba141e12ea66a27e0b09ba9f26d8b675a5c79b4766b6e8316e09b4ba0dd";
        libraryHaskellDepends = [
          base bifunctors memoize MonadRandom random
        ];
@@ -90037,7 +90346,7 @@ self: {
      mkDerivation {
        pname = "markup";
        version = "1.1.0";
-       sha256 = "0p037nq20vdbrvn29n3xlaval98fs0lml3y5h0j9fy04x6zcdkz8";
+       sha256 = "e8cfc6bee90478972480c50f5a29d00e25aab6a27dd824ecceab6d20b03d035c";
        libraryHaskellDepends = [
          base blaze-html blaze-markup comonad lucid mtl text transformers
          urlpath
@@ -90055,7 +90364,7 @@ self: {
      mkDerivation {
        pname = "markup-preview";
        version = "0.2.2.1";
-       sha256 = "09gfmh9hdzyjijkv2h5a6gfa9rfmba2642rhhh80wsw9y4rg8ns1";
+       sha256 = "415bf432f1896b0e1084300b62845ad5e5a4dc33aa40b1a78cd2ff0613acee25";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90077,7 +90386,7 @@ self: {
      mkDerivation {
        pname = "marmalade-upload";
        version = "0.10";
-       sha256 = "0643l0xnm4rq6zfbbd01ps3z7qnw7crvpblg7n5rwigi0m1zl4n9";
+       sha256 = "c912fa4305f1459e8b3d8faebb333bdce2f387be01b4b5dc3738936a3ba08318";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90112,7 +90421,7 @@ self: {
      mkDerivation {
        pname = "marquise";
        version = "4.0.0";
-       sha256 = "1w2lvns840hdzyismdwv70s70qd2af2ms14y58nhp24yf6h58j7b";
+       sha256 = "eb4854a0719e880b2d2a9e045d8553a2617034389bb7aaa3ff0d0282b4dd54f0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90143,7 +90452,7 @@ self: {
      mkDerivation {
        pname = "marxup";
        version = "3.0.0.1";
-       sha256 = "01yz9ry25k6kq1r8z3dbqj2xqm95wssfh2jhwarv3w3z65wa6x8n";
+       sha256 = "1675a378317ff0b1b3e2500ae8b4e62555dc85c4ab8d8f72c0d3cc227c4edf07";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90169,7 +90478,7 @@ self: {
      mkDerivation {
        pname = "masakazu-bot";
        version = "0.4.0.0";
-       sha256 = "1p9d2vy3c7yh1w1aczh3f4886q0hldrpisnkk40w62cqvjg7sig7";
+       sha256 = "e7457d9edc9809c30199d3ea7873a31060831071037ea6020fd01f36fc162ddd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90190,7 +90499,7 @@ self: {
      mkDerivation {
        pname = "mastermind";
        version = "2010.7.25.1";
-       sha256 = "0bxzjs19n2c7xd1v2hrzx6h1rrw6m8yax7kbcar0q766bv36qfmy";
+       sha256 = "be3a6cc65ec61c0cb2626b9eae3caa86e71ca0e93f43b143eb87099b8296bf2f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base random ];
@@ -90204,7 +90513,7 @@ self: {
      mkDerivation {
        pname = "matchers";
        version = "0.24.0.0";
-       sha256 = "171ncbch38nzy46lb6p9navaar1b492hgf4b9kbd3g6fsldvny64";
+       sha256 = "c478bb1bd5cebcd1d64c8bb80745222b64a5b6b2e99a450df1dfa201d962369c";
        libraryHaskellDepends = [ base bytestring prednote text ];
        librarySystemDepends = [ pcre ];
        jailbreak = true;
@@ -90222,7 +90531,7 @@ self: {
      mkDerivation {
        pname = "math-functions";
        version = "0.1.5.2";
-       sha256 = "12cznf7gwia1ki7xhvlhk5p8d09zrdvfgn07pkp4sfrwsc4vijcy";
+       sha256 = "9ec9b809d33c3b4deebc07d8e776cb3f81866e99906ed84f9c4145fe8eb39f89";
        libraryHaskellDepends = [
          base deepseq erf vector vector-th-unbox
        ];
@@ -90243,7 +90552,7 @@ self: {
      mkDerivation {
        pname = "mathblog";
        version = "0.5";
-       sha256 = "01iyzrwscqirhcr4622d0n16mr4p54qbvg5m2a0ns36j59xfd79g";
+       sha256 = "2f9de67a2ad20c6d8112b5bcbd302997e46a82054d084332833962a679fe3e06";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90265,7 +90574,7 @@ self: {
      mkDerivation {
        pname = "mathgenealogy";
        version = "1.3.0";
-       sha256 = "1gbk1bv5v7s4mbs3cr30zhfnm3zrhxhly3791mar5807bqw86q5v";
+       sha256 = "bb6083385e07a092550de90c4f6187f98f6a1dfc606436f4aa449f5df60a73bd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90285,7 +90594,7 @@ self: {
      mkDerivation {
        pname = "mathlink";
        version = "2.0.1.1";
-       sha256 = "1agqbhl6r40swsvsllyx9vf9hc9a709wvg546rh6fn315waifqqk";
+       sha256 = "136317152f6158676036a4bccd13382a3198dc4edd53aab7e61a906c285cf8a9";
        libraryHaskellDepends = [
          array base containers haskell98 ix-shapable mtl
        ];
@@ -90302,7 +90611,7 @@ self: {
      mkDerivation {
        pname = "matlab";
        version = "0.2.0.0";
-       sha256 = "08kalclinzqxy5l7j115hz6h9nw1g7mf9rzmpz8dblbhbwvj4l7x";
+       sha256 = "fd5022375f70d1d5d0bff5e7e4ea7981db04cd8725047968f11d7f1b29a36a22";
        libraryHaskellDepends = [ array base Cabal filepath ];
        librarySystemDepends = [ eng mat mx ];
        jailbreak = true;
@@ -90318,7 +90627,7 @@ self: {
      mkDerivation {
        pname = "matrices";
        version = "0.4.2";
-       sha256 = "1mcv3ihaf15biai6m98jfgv31whgmwbzgagxyj3bfpnilslp98l6";
+       sha256 = "86a274a9a6d15eb786f4fda9f717af0ff230f67312a56aa28aab04a7601c9bd5";
        revision = "1";
        editedCabalFile = "6aabde42e016b428562ed0e983444308c23d79837f04453fe57f60a6cbc02fe4";
        libraryHaskellDepends = [ base primitive vector ];
@@ -90336,7 +90645,7 @@ self: {
      mkDerivation {
        pname = "matrix";
        version = "0.3.4.4";
-       sha256 = "03aaw60x8849rsrcqc8n0d3k8a6dp8naxnqfq2xq776q5zbbcrpv";
+       sha256 = "fb66b6d62fd89c83bbc00edbae2cbacd283447031631ccb2ce8920d481e14a0d";
        libraryHaskellDepends = [ base deepseq loop primitive vector ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A native implementation of matrix operations";
@@ -90348,7 +90657,7 @@ self: {
      mkDerivation {
        pname = "matrix-market";
        version = "1.2";
-       sha256 = "1hzpjkmwr24073mf9i13rx3n23ri0b5vmvwx8k9lxbrg1821hy28";
+       sha256 = "487818040a2faf4ed3449defbacb02310f6147cf23c4e4ea388088cceb94f7c3";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://stat.stanford.edu/~patperry/code/matrix-market";
        description = "Read and write NIST Matrix Market files";
@@ -90360,7 +90669,7 @@ self: {
      mkDerivation {
        pname = "matrix-market-pure";
        version = "0.2";
-       sha256 = "05jjf5wnxhbafrca1qfzlrxvysy5bff22mzk45pia5b9gwdhygn1";
+       sha256 = "c13e0f1b7f6915156f21f357219c5bc56bbf7ba6dfe1a058766ac16e79715216";
        libraryHaskellDepends = [ array base containers ];
        homepage = "http://bitbucket.org/jetxee/hs-matrix-market";
        description = "Pure and composable reader and writer of the Matrix Market format";
@@ -90374,7 +90683,7 @@ self: {
      mkDerivation {
        pname = "matsuri";
        version = "0.0.4";
-       sha256 = "15pjqyy9qs9bn2vfayl73h5maf01snv7rvq1acb3ly8pain36lh4";
+       sha256 = "0452336c5417793a165301ef7cb6d50138550b1c877ae5b6b02b699cbcc7f296";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90394,7 +90703,7 @@ self: {
      mkDerivation {
        pname = "maude";
        version = "0.6.1";
-       sha256 = "0qadqpj5vzg84mqh29p6vr2ffih7y69ds0jdpxmr17am5bh3mhql";
+       sha256 = "14c33ae02a559d906bbf4d02dd92f10746e744dee626017125e8fd5de4c54d61";
        libraryHaskellDepends = [
          base directory filepath process process-extras temporary text xml
        ];
@@ -90412,7 +90721,7 @@ self: {
      mkDerivation {
        pname = "maxent";
        version = "0.7";
-       sha256 = "0vxfxlvcrmqcxplw6f2r7nljcam9iv92jy2nxa7x67ldyj7yxk28";
+       sha256 = "48ccee8ff48d1ed38fea567829d28ea92a26a93d5938c3e9ed0cd7cc36edae6f";
        libraryHaskellDepends = [
          ad base lagrangian nonlinear-optimization vector
        ];
@@ -90432,7 +90741,7 @@ self: {
      mkDerivation {
        pname = "maximal-cliques";
        version = "0.1.1";
-       sha256 = "1sbmykgb5lrd32rih09d8d0r5isz4nh5slfyd93dgln7ag3hb7bh";
+       sha256 = "709d05c753c7d2d7466ade515da0255fc79241432d0118b3182dd3b2def475e9";
        libraryHaskellDepends = [ base containers vector ];
        description = "Enumerate all maximal cliques of a graph";
        license = stdenv.lib.licenses.bsd3;
@@ -90446,7 +90755,7 @@ self: {
      mkDerivation {
        pname = "maxsharing";
        version = "1.0.2";
-       sha256 = "1a9z3bmdjl5mhn718bj8h95m4xlhiyimkz7z54d0dmcv6ryld4wx";
+       sha256 = "9d93467d369bd5061a29fffc59a38f9076524b82482e148e85b550d9ea1a3fa9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90466,7 +90775,7 @@ self: {
      mkDerivation {
        pname = "maybe-justify";
        version = "0.1.0.0";
-       sha256 = "0zgc3niz0vz4b3xcxj6s4fpxzizgkimllyd0r6vcafbl9ffv2a38";
+       sha256 = "6828b19d4b7439c5b6c9a0794a6b9cefc7dfaf23dac8cefa58e46ff0a31dec7d";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Simple higher order function for Maybe";
@@ -90480,7 +90789,7 @@ self: {
      mkDerivation {
        pname = "maybench";
        version = "0.2.4.1";
-       sha256 = "1iqfmvj9maa0f4gk66g0j1dv1prhac3vb0b225d9sw9bliwnb1br";
+       sha256 = "79856579a42b719d5a116281b5075330dfb05b90e019331f7140a99ae4ae0ec7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base benchpress old-time process ];
@@ -90499,7 +90808,7 @@ self: {
      mkDerivation {
        pname = "mbox";
        version = "0.3.1";
-       sha256 = "13hq6h280wbc9xwbvdcq4qqrhbjnnzg824lk4zxkh4bvqpabjwni";
+       sha256 = "d172b9d4c57b1138fb27931281deb7562e98312698b5bd784f6c71800434188e";
        libraryHaskellDepends = [ base safe text time time-locale-compat ];
        description = "Read and write standard mailbox files";
        license = stdenv.lib.licenses.bsd3;
@@ -90512,7 +90821,7 @@ self: {
      mkDerivation {
        pname = "mbox-tools";
        version = "0.2.0.4";
-       sha256 = "1j0dl97skgbxq2gcd3w6jzsdd2yv1mw6z4fz61akcimzyn8c2lvh";
+       sha256 = "7053c190f5bf46365530df916f780ddb8bd6f497868fc69ec07dbda94fa20dc8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90530,7 +90839,7 @@ self: {
      mkDerivation {
        pname = "mcmaster-gloss-examples";
        version = "2013";
-       sha256 = "178f2n2r7m4jznkzhnqqslqf0czvz9h7cifhbdmvr1nihhgb532q";
+       sha256 = "588cb21e84d186bc6b5bd0457660fafb33e030d5185bf8a7fd92d49385150e9d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gloss ];
@@ -90546,7 +90855,7 @@ self: {
      mkDerivation {
        pname = "mcmc-samplers";
        version = "0.1.1.1";
-       sha256 = "0pqc6i86b5vdhfw93x220k0x7dcfs77s7az6avaw7fn2q6xl1qli";
+       sha256 = "91e240bbc1c2bac3d556e6aba3cfd18eb5d3c10442f491b8836d976550340c5f";
        libraryHaskellDepends = [
          base containers hakaru hmatrix mwc-random primitive statistics
        ];
@@ -90561,7 +90870,7 @@ self: {
      mkDerivation {
        pname = "mcmc-synthesis";
        version = "0.1.2.2";
-       sha256 = "14z1x9dqnjj391nrlngs9s887yqh3arc7kfgk0m3d89vrkc185vq";
+       sha256 = "781714d8cc3ba1362a98cfcdc3b21a10fb83904efa599a6d48434a8b5beae193";
        libraryHaskellDepends = [ base MonadRandom ];
        jailbreak = true;
        description = "MCMC applied to probabilistic program synthesis";
@@ -90573,7 +90882,7 @@ self: {
      mkDerivation {
        pname = "mcpi";
        version = "0.0.1.2";
-       sha256 = "15ab4fl49nq398q49wz5fgphfb7xzbrf4j51rnd80qb30rm6xfl6";
+       sha256 = "86ba6e6a066361809acda148e2f2fafd2c07ef73e5f344304a03db44a8234b95";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base network split transformers ];
@@ -90590,7 +90899,7 @@ self: {
      mkDerivation {
        pname = "mdcat";
        version = "0.1.0.4";
-       sha256 = "0jynmcawrxwv6xfbwvz3915rsp2ssx9s8h7i3pgd5adlzqpws19l";
+       sha256 = "3405cd2ffeb4a9d2de1df140a453d75a5c9d4b48e36fbe5c379bf7cc15abd64b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90611,7 +90920,7 @@ self: {
      mkDerivation {
        pname = "mdo";
        version = "0.0.1";
-       sha256 = "13i4lb74m69k6ij3rq0dqwghdazwmc60fs55prc1h3p7b0rz15mv";
+       sha256 = "bb96f03358e70e1858bea568070cabfcab061fc70de03c643433994acea2248e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process ];
@@ -90624,7 +90933,7 @@ self: {
      mkDerivation {
        pname = "mecab";
        version = "0.4.0";
-       sha256 = "0z650y4fnxr4mk0i5s8axjbq14dcpgnrzkafbpg17vfhl2v5a3z3";
+       sha256 = "e30f55b6a0d0ed13de5d4ecd9fedbbac918097ec0ae912c1ac2477eb8807c57c";
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ mecab ];
        jailbreak = true;
@@ -90639,7 +90948,7 @@ self: {
      mkDerivation {
        pname = "mecha";
        version = "0.1.1";
-       sha256 = "0y3rzif667kjaxmnf9d382lcbxf27y4ik02kisij125kc7yi6d21";
+       sha256 = "413413fd61b38820a38e538019893fc2f5c5a840a325676b57721e635cfc7978";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -90655,7 +90964,7 @@ self: {
      mkDerivation {
        pname = "mediawiki";
        version = "0.2.6";
-       sha256 = "1wfrhii7zqrw6rmskab40h9zliidi34kd4n07rdkvf8f8nypwg1r";
+       sha256 = "393c7ebd450eb93d5b3ec09236c9882d46fa130464a9a96b363ce37f6284d9f1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base HTTP mime network utf8-string xml ];
@@ -90677,7 +90986,7 @@ self: {
      mkDerivation {
        pname = "mediawiki2latex";
        version = "7.9.0.1";
-       sha256 = "0q708hh5280k5hknf1mh3nza7qvpszplcis90y0i78a2jd0x2r3w";
+       sha256 = "7c64d1419342a1138107494746efd777e3a3be1db00667272c1320512044e060";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90701,7 +91010,7 @@ self: {
      mkDerivation {
        pname = "meep";
        version = "0.1.2.0";
-       sha256 = "1jr3zgja3m40ajygi1jqsxfwhsf7yf0lwblffd8z096w67pn4idr";
+       sha256 = "b94562ef31dc24f051738e2e4e81f3c769c85dd75886f8bc5480d4a1e4fb23cb";
        libraryHaskellDepends = [
          base bifunctors lens semigroupoids semigroups
        ];
@@ -90721,7 +91030,7 @@ self: {
      mkDerivation {
        pname = "mega-sdist";
        version = "0.2.10.4";
-       sha256 = "0x85l77q9zzi1gmcl9h3rrjbgyfynxqcczl636iah88wvdg7lplg";
+       sha256 = "8f5e7a5edb1c21a8a219867ec670b7def9b764ce0326caea0bf1ff84cfa10575";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90740,7 +91049,7 @@ self: {
      mkDerivation {
        pname = "meldable-heap";
        version = "2.0.3";
-       sha256 = "1p75zjlls38sd1lma7w95mpmb9kdff19s2as6pz1ki1g20nnxdk3";
+       sha256 = "63b66e2d102fc419fe355a099d82736da6556f2d891f5569681a0d4da9fce5dc";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.google.com/p/priority-queues/";
        description = "Asymptotically optimal, Coq-verified meldable heaps, AKA priority queues";
@@ -90754,7 +91063,7 @@ self: {
      mkDerivation {
        pname = "melody";
        version = "0.2";
-       sha256 = "1sbwd1xmgh94ll3xm7ancjsaalk2mphnr1l331zix5s3kqvy6g6p";
+       sha256 = "d73ce3379e43971e7f1883866ce1ad6252a5b464569dda07a524c1577b687ce9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90777,7 +91086,7 @@ self: {
      mkDerivation {
        pname = "memcache";
        version = "0.1.0.0";
-       sha256 = "1x2lw802m02p9z28rsmvwczsax9f6vl16p9kwjq4zmn8ak0s74m5";
+       sha256 = "a592a3c154c8d64fb0e4335d13e8362e75a53fe3bbea8cc44f57802a00e254f4";
        revision = "1";
        editedCabalFile = "6e2508fa18aae99fee1c0aa41cc86e97d73ff504647b5265e54adf3566ca81e7";
        libraryHaskellDepends = [
@@ -90798,7 +91107,7 @@ self: {
      mkDerivation {
        pname = "memcache-conduit";
        version = "0.0.3";
-       sha256 = "1y1jysshvwddr3rymbzr9s6bq4pg7rd0bkk7ip4xwa8kpzf8k3pj";
+       sha256 = "f28e89dcbf1329dec98d67ce055a3eef12bc8c4ef9afeaf3c8adf10db5f632f8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90823,7 +91132,7 @@ self: {
      mkDerivation {
        pname = "memcache-haskell";
        version = "0.0.10.1";
-       sha256 = "0j3fn59nz4iynlmhv3hxbfqip0rjj94fkb3kx8jax90jbnf7s6sc";
+       sha256 = "4c1b7d9c5d12a4ae24ea73ace9489232831bb15b1d8e0d2bb53e926f53b16e48";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90846,7 +91155,7 @@ self: {
      mkDerivation {
        pname = "memcached";
        version = "0.2.1";
-       sha256 = "1a6wzznhpz06c0y3wrjf5bskdd8myild8v0p0x1h0swhmy6di2yd";
+       sha256 = "cd8bd88caf906b004307176cd468f415b536f52a4e663e3c6006fc0bedffdca8";
        libraryHaskellDepends = [ base bytestring network utf8-light ];
        jailbreak = true;
        homepage = "http://github.com/olegkat/haskell-memcached";
@@ -90862,7 +91171,7 @@ self: {
      mkDerivation {
        pname = "memcached-binary";
        version = "0.2.0";
-       sha256 = "137vb065f744jq3avpraqryzspch78vc5krp0fw2zzcbk5cm92ad";
+       sha256 = "4d895459998bfd2fb80337cfc2363a905dfd7dc62adfad0696841c570c58fb8c";
        revision = "2";
        editedCabalFile = "663a104dc09413397f9640534b6d1a743835a395598f641d02ef0dbd44093530";
        libraryHaskellDepends = [
@@ -90882,7 +91191,7 @@ self: {
      mkDerivation {
        pname = "memexml";
        version = "0.0.2";
-       sha256 = "07cmjx10wbpfcblnd23rzdkma04nyjcpd1g58gp0phajj6xj4i7a";
+       sha256 = "ea4422bb9152c10bee43e5857699f496005567fb798866e962ee2e0e4297951d";
        revision = "1";
        editedCabalFile = "a1712ea7643a27f1fb40a771fdae76282818b5d317fe8da6a22e705b06bc3b3e";
        libraryHaskellDepends = [ base hxt ];
@@ -90897,7 +91206,7 @@ self: {
      mkDerivation {
        pname = "memo-ptr";
        version = "0.1.0.0";
-       sha256 = "1vy3673dvf0crs384vhi56i7bir9k8yk3cjcrcc7bn15qyclif19";
+       sha256 = "29b84899c725d87518cb4cb2313d9a29c775a229116e8286ce0cb8ddc631c3ef";
        libraryHaskellDepends = [ base containers ];
        description = "Pointer equality memoization";
        license = stdenv.lib.licenses.mit;
@@ -90908,7 +91217,7 @@ self: {
      mkDerivation {
        pname = "memo-sqlite";
        version = "0.1";
-       sha256 = "1gijza29wj79k8czfg4mghq7nqsbpyf1scnm9hmg2ykhnllpzvy3";
+       sha256 = "c3ef7f29b5707af12a4cd5321d9cbf4b637b307c953cf7199ae9489e84fa32be";
        libraryHaskellDepends = [ base direct-sqlite ];
        jailbreak = true;
        homepage = "https://gitorious.org/memo-sqlite";
@@ -90922,7 +91231,7 @@ self: {
      mkDerivation {
        pname = "memoize";
        version = "0.7";
-       sha256 = "1sqi9n9r2q3sh00isgj3rmayrlm970a2g9x389rlfb0kczixdnq4";
+       sha256 = "04dbd6e367132c477342a3a7271438a9d2ec55cd433e1d01807a6091934d11eb";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A memoization library";
        license = stdenv.lib.licenses.bsd3;
@@ -90935,7 +91244,7 @@ self: {
      mkDerivation {
        pname = "memory";
        version = "0.7";
-       sha256 = "1yj1v4xr3y3inrn1rzlh1lfmgxi8p15k4qm48bac76qg3a2wh8z1";
+       sha256 = "e123c8851a0f9bc3d442a462324bb828f6571d0d90fe1c6cb671f8913bd941fa";
        libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
@@ -90948,7 +91257,7 @@ self: {
      mkDerivation {
        pname = "memscript";
        version = "0.0.2.0";
-       sha256 = "0vbmgvdjq4mxax39zr6anmb96pr2pgqlwmc4qbkrz2c7v8hg2mjb";
+       sha256 = "4b56f120da87899fe7c284554ef1bb225f9356b5cae49f4657bd122cdb7e756d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base readline ];
@@ -90962,7 +91271,7 @@ self: {
      mkDerivation {
        pname = "mersenne-random";
        version = "1.0.0.1";
-       sha256 = "193qz3wn7lz18aywddr9qyn8v08ifv2yxwr68c67p5mn8vr8mvmw";
+       sha256 = "bcee8af246b6967b0c4326f3eec57611818dacc729b7c6bd42e1d363f9f878a4";
        libraryHaskellDepends = [ base old-time ];
        homepage = "http://code.haskell.org/~dons/code/mersenne-random";
        description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister";
@@ -90974,7 +91283,7 @@ self: {
      mkDerivation {
        pname = "mersenne-random-pure64";
        version = "0.2.0.4";
-       sha256 = "0qh72ynfg1k4c70qxdzsa6f1x9wyxil2d9gi85c879wrc41k899h";
+       sha256 = "302534036199a7835841f1a52668ec9ea71e9c51fab78ec1616486e7ac170762";
        libraryHaskellDepends = [ base old-time random ];
        homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/";
        description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
@@ -90988,7 +91297,7 @@ self: {
      mkDerivation {
        pname = "messagepack";
        version = "0.4.0";
-       sha256 = "198rd9yy99zsgp48gmz3kxzljcpmbqh2gghzndn3q0n7cv0lls0i";
+       sha256 = "11684ac166c7023c6cb31fbe27205ef532497f9fe3d787c87dfaa7e47d6a19a5";
        libraryHaskellDepends = [ base bytestring cereal containers ];
        testHaskellDepends = [
          base bytestring cereal containers QuickCheck test-framework
@@ -91006,7 +91315,7 @@ self: {
      mkDerivation {
        pname = "messagepack-rpc";
        version = "0.2.0.0";
-       sha256 = "0lx0qyv41pylbz2580zvw4qw07pih4l9sbdd2h99gwkqjpjnc8x8";
+       sha256 = "a82366e59578f2971214ad2d9d2881f11ec031e1fb0354c45fd4df40b6c7a053";
        libraryHaskellDepends = [
          base bytestring cereal containers messagepack network-simple
        ];
@@ -91020,7 +91329,7 @@ self: {
      mkDerivation {
        pname = "messente";
        version = "0.1.0.1";
-       sha256 = "1yv2dspkn34yf61z8c09aijngjr96w30s2sjmhyv9c2c48ys6jc5";
+       sha256 = "8549a33d224cb0b43dac520b0d063729cb6765540930f483719e0c3baf6e62fb";
        libraryHaskellDepends = [
          base bytestring HTTP http-conduit network
        ];
@@ -91034,7 +91343,7 @@ self: {
      mkDerivation {
        pname = "meta-misc";
        version = "0.1.0.3";
-       sha256 = "0pxsg67r2z0f9zxr8m98sndlii0bixyxwgjkc31z5743ciw9ch0c";
+       sha256 = "0c40967864839cf2c360533ede7d8f0bc4489bd5285594fb4f0e7c918f79ba5f";
        libraryHaskellDepends = [ base loch-th template-haskell ];
        homepage = "https://github.com/bairyn/meta-misc";
        description = "Utility library providing miscellaneous meta-programming utilities";
@@ -91048,7 +91357,7 @@ self: {
      mkDerivation {
        pname = "meta-par";
        version = "0.3";
-       sha256 = "012blwbwxac2wikiydvjsa4b7f866wws3g33bczv8dzcx3123ljn";
+       sha256 = "56d221c2e8ec37b43f5b63bca1393706b9b388d272371f67e482a9ce17a74b04";
        libraryHaskellDepends = [
          abstract-deque abstract-par base bytestring containers deepseq mtl
          mwc-random transformers vector
@@ -91066,7 +91375,7 @@ self: {
      mkDerivation {
        pname = "meta-par-accelerate";
        version = "0.3.5";
-       sha256 = "0gl6bh2jqf697vl4cg88z39g6180bbha01h67qz46f1vcyvi0lwq";
+       sha256 = "985310b7673b38433e3e0606a0e05a0005f3d2f8083d46e83ec9382c055c863e";
        libraryHaskellDepends = [
          abstract-deque abstract-par abstract-par-accelerate accelerate
          array base meta-par QuickCheck transformers vector
@@ -91082,7 +91391,7 @@ self: {
      mkDerivation {
        pname = "metadata";
        version = "0.2.0.0";
-       sha256 = "148c7vgh8zxgy5fb0xflk0lzm5d233d1ynjncpiwi1bb9jzbdm3r";
+       sha256 = "79d4b6be4c6b85c8e365565a1fda18a295fa2998d475b05cf1af7f04df3e0c91";
        libraryHaskellDepends = [ base text time ];
        jailbreak = true;
        homepage = "http://github.com/cutsea110/metadata";
@@ -91095,7 +91404,7 @@ self: {
      mkDerivation {
        pname = "metamorphic";
        version = "0.1.2.3";
-       sha256 = "0pazw2kdsl8g4dax6bg0hfg7vp2nna6lrsnzdkixpins7ac95078";
+       sha256 = "e88092983adac6dbe36cdfea4c8db256dc7d9e83e02dd355230f51dda6e05f5d";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/technogeeky/metamorphic";
        description = "metamorphisms: ana . cata or understanding folds and unfolds";
@@ -91107,7 +91416,7 @@ self: {
      mkDerivation {
        pname = "metaplug";
        version = "0.1.1";
-       sha256 = "086n9kqyi2jqki31jgylm0r63ahgvw3pf7mi5hln2m86a5x4ij4n";
+       sha256 = "96c8487a51065561292cb11e7707df0faa6132a8d43f19469c588ae8f14cd620";
        libraryHaskellDepends = [ base Cabal filepath ghc haskell98 ];
        description = "a tiny ghc api wrapper";
        license = stdenv.lib.licenses.bsd3;
@@ -91121,7 +91430,7 @@ self: {
      mkDerivation {
        pname = "metric";
        version = "0.2.0";
-       sha256 = "172drfn8p5yqyvka2jphhi1lfj5msv2xssa271lfb3w757br452d";
+       sha256 = "4d1492d729878fe568384269ddc5d6b548474384f04aa1e6f6d8978baccb4d9c";
        libraryHaskellDepends = [
          base data-default edit-distance hmatrix vector
        ];
@@ -91141,7 +91450,7 @@ self: {
      mkDerivation {
        pname = "metrics";
        version = "0.3.0.2";
-       sha256 = "00iwairgi9lvb4f8iz4d834v8vq1f4awr34nl72fbkqgccdq1whd";
+       sha256 = "0df2801b630fcfe5c4a1968ccc1571016fb4c9408dfc881c599ba6f872543c02";
        libraryHaskellDepends = [
          ansi-terminal base bytestring containers lens mtl mwc-random
          primitive text time unix unordered-containers vector
@@ -91159,7 +91468,7 @@ self: {
      mkDerivation {
        pname = "metricsd-client";
        version = "0.1";
-       sha256 = "1q807wvmj1q605257jj60h0j2wal6ypjiad9wkjmv836p3mis5q9";
+       sha256 = "09171debb866a05de5e4a9a928af37547121010446ca534401060759373f00e1";
        libraryHaskellDepends = [ base network ];
        jailbreak = true;
        description = "Client for the metrics aggregator Metricsd";
@@ -91171,7 +91480,7 @@ self: {
      mkDerivation {
        pname = "metronome";
        version = "0.1";
-       sha256 = "0gx0g8s5w99mhvip1v1kj03dhij3fhig1b8myha0zdssf2x6vjwc";
+       sha256 = "8ccb6dba705ab70f14f415adf022744346d8069033ec70e38635255e347aa03f";
        libraryHaskellDepends = [
          base data-lens data-lens-template hosc stm
        ];
@@ -91187,7 +91496,7 @@ self: {
      mkDerivation {
        pname = "mfsolve";
        version = "0.1.0";
-       sha256 = "1lvx3nlxhfmvh9xbi62hik8ypv4n28ax86nqzwkchb60k1djnagg";
+       sha256 = "ef292b5b98c02cc826ffd81ad4151296ecebd18c5098b87a82bb3ad8a91d7dd3";
        libraryHaskellDepends = [ base hashable unordered-containers ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Equation solver and calculator à la metafont";
@@ -91199,7 +91508,7 @@ self: {
      mkDerivation {
        pname = "mgeneric";
        version = "0.0.0.2";
-       sha256 = "1pgmgssysl0nv9z4vvlmxjijl6y7jvy1b7ph30jnj3fmcrwdf6w3";
+       sha256 = "831bd77866d50d692518f09e15fc96c71b2aa3ec95ee4d7eda1650edb57ef5dd";
        libraryHaskellDepends = [
          base containers lens mtl template-haskell
        ];
@@ -91215,7 +91524,7 @@ self: {
      mkDerivation {
        pname = "mi";
        version = "0.0.1";
-       sha256 = "03virg707xxy330xq4g60fy1rvs1rq9w5p08yc5khzh64v1g3i2b";
+       sha256 = "4bc4f1c226067e380bf308dcc213ce41ef1cbc03e611dcc118bef703cecb710f";
        libraryHaskellDepends = [
          base haskell-src-meta parsec split template-haskell
        ];
@@ -91230,7 +91539,7 @@ self: {
      mkDerivation {
        pname = "microbench";
        version = "0.1";
-       sha256 = "05yphn77rxg7zqpn27292yvmah2634hqfx2mgfyp5yws5ickrvkg";
+       sha256 = "6fee3c592c9afb72bd7b5574872119464055b717491c612ffee7f57c8e85d717";
        libraryHaskellDepends = [ base time ];
        homepage = "http://neugierig.org/software/darcs/browse/?r=microbench;a=summary";
        description = "Microbenchmark Haskell code";
@@ -91247,7 +91556,7 @@ self: {
      mkDerivation {
        pname = "microformats2-parser";
        version = "0.1.1";
-       sha256 = "0n4clyzaw2a9vi0qcf6f2pdp7wckl3z84sfjqdj8k4dbp1qnwl55";
+       sha256 = "a5506e71b8ab918964c3d26982fea093f173db15ce388641dc4909aebea78c58";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91275,7 +91584,7 @@ self: {
      mkDerivation {
        pname = "microformats2-types";
        version = "0.4.1";
-       sha256 = "1p2s2g78bnqbcf0www0x11pz5nyxjfac7q7sbd2qfn1v777ylv7b";
+       sha256 = "eb6ceacf393b5887455bfae0c39493dddbf26f081d70ce81630bdb85ce135adc";
        libraryHaskellDepends = [
          aeson base data-default-class pandoc-types setters text time
        ];
@@ -91289,7 +91598,7 @@ self: {
      mkDerivation {
        pname = "microlens";
        version = "0.2.0.0";
-       sha256 = "08m0qcsazq690w1k6hd2h3z8w47bqc01s53j6qbf3jbfin28axbg";
+       sha256 = "6f7585848d6ec9e1163672141d00c3eb108efe80a241330307c9e0af34c3a022";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library which you can depend upon";
@@ -91301,7 +91610,7 @@ self: {
      mkDerivation {
        pname = "microlens-each";
        version = "0.1.0.0";
-       sha256 = "00bk2vriwh8aj2c6n5g2w84pfq0nssfa62iw97dm9c3zkp558wxj";
+       sha256 = "b27354ca9d7fb054db493c0aa39cd616607709e2e2156b98900a411ef3167301";
        libraryHaskellDepends = [ base microlens ];
        jailbreak = true;
        homepage = "http://github.com/aelve/microlens";
@@ -91314,7 +91623,7 @@ self: {
      mkDerivation {
        pname = "microlens-ghc";
        version = "0.1.0.1";
-       sha256 = "17kkh6dnxhr2j1a9nll5ia0y5rd68icxjjk4kqs0wml1whmhhg55";
+       sha256 = "a53c082be481560e349e644ad95944a6e5e2818a85529b549022c36e9b81739e";
        libraryHaskellDepends = [
          array base bytestring containers microlens
        ];
@@ -91330,7 +91639,7 @@ self: {
      mkDerivation {
        pname = "microlens-mtl";
        version = "0.1.3.1";
-       sha256 = "118ym5n1c6b2lg815hikzbwc4bnz8kz3j4flfxwq3m50dbn29vzc";
+       sha256 = "ecef24ec6aa0d4817977d41139fe44df2ec2f8fa33c212d0a36219166ca91e85";
        libraryHaskellDepends = [
          base microlens mtl transformers transformers-compat
        ];
@@ -91344,7 +91653,7 @@ self: {
      mkDerivation {
        pname = "microlens-th";
        version = "0.2.1.0";
-       sha256 = "1l4hxkq8z8h6pvld54bjlnzy5g30wr0akv1xjrjyk552mfi9gwvl";
+       sha256 = "74f397a2aba294e965963deca940e660bce2bfa57291d2e8be06a28ff0ec90d0";
        libraryHaskellDepends = [
          base containers microlens template-haskell
        ];
@@ -91358,7 +91667,7 @@ self: {
      mkDerivation {
        pname = "microtimer";
        version = "0.0.1.2";
-       sha256 = "09w8jn6g8fq3zsp2ahdrzv33mvayh8vladmc2wf8pbmpmdii0kap";
+       sha256 = "574d1063abb7ae8b1c17ac364537825eed3ac6feb94125aefe033bf48c958827";
        libraryHaskellDepends = [ base time ];
        homepage = "http://thoughtpolice.github.com/hs-microtimer";
        description = "A tiny library for benchmarking IO actions";
@@ -91374,7 +91683,7 @@ self: {
      mkDerivation {
        pname = "mida";
        version = "0.4.3";
-       sha256 = "0x71qih8r48kp2anvdnwfkja3sz8iigzprsqkaqi259mn58qd9ch";
+       sha256 = "90a58651b1351511b19a58e7fb5f8ce8eba1e474dcb66d95b813918c60c4e174";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91405,7 +91714,7 @@ self: {
      mkDerivation {
        pname = "midi";
        version = "0.2.1.5";
-       sha256 = "0vi9pslbix7wcbciv3nlk1v6v6f45xf1lq85nl8awhs488fhbl3z";
+       sha256 = "7fd0051d424443ae10b505611a5c2fc4996d7698d48e1dd962fcf4b8a8be296e";
        libraryHaskellDepends = [
          base binary bytestring event-list explicit-exception
          monoid-transformer non-negative QuickCheck random transformers
@@ -91425,7 +91734,7 @@ self: {
      mkDerivation {
        pname = "midi-alsa";
        version = "0.2.1";
-       sha256 = "13dc299d252nrll1vzp7pl1ncv0qw3xhz5b3kqnc8hb0g4mkkgpc";
+       sha256 = "ecbe392b796041c42c9e63950ffbe0186c6603bde7fe1d28cd5614d15212ac8d";
        libraryHaskellDepends = [
          alsa-seq base data-accessor midi utility-ht
        ];
@@ -91442,7 +91751,7 @@ self: {
      mkDerivation {
        pname = "midi-music-box";
        version = "0.0";
-       sha256 = "0hnlnjgn378mkrhky8fvpzs6i34s3n6lx81mf3hnxmb1vgwy2nmf";
+       sha256 = "ae5ae1f9db61d56ee17035a04e8d1d9a8c68f4bfdb213f619e159d619fb4d442";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -91460,7 +91769,7 @@ self: {
      mkDerivation {
        pname = "midi-util";
        version = "0.1.1.1";
-       sha256 = "1g8rhx1n6rhyi49x6rkim1bnv7rg6wc0x89dzkrbzyxm28hkvjfk";
+       sha256 = "d3c93d2112b5fbbff2fc2da10e18372f9f6d57a87166d313891e6663438719bd";
        revision = "1";
        editedCabalFile = "2c42b8e0940125f6354a9174ad5cb19da6fc0122b4947576e28abb753a7cff14";
        libraryHaskellDepends = [
@@ -91478,7 +91787,7 @@ self: {
      mkDerivation {
        pname = "midimory";
        version = "0.0.0.2";
-       sha256 = "13bfb2s6ybvspmmq427v55nb2csvcp4ijfgm9fvfh6cab2pm1dyz";
+       sha256 = "dfb750af588a19e8b64bf53919c9655b33b16c29fb08826bbd7a2f6fb4586e8d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -91497,7 +91806,7 @@ self: {
      mkDerivation {
        pname = "midisurface";
        version = "0.1.0.0";
-       sha256 = "0i1g1hqr1jjjnrrkfgp0i9zm5cm6aza1kzqy2z8hmbqjdvyv21fz";
+       sha256 = "df05b1fd6e12af0ad1171eff19d457a6b2527f8ae03e3773b652ca90310c2f44";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -91517,7 +91826,7 @@ self: {
      mkDerivation {
        pname = "mighttpd";
        version = "0.4.3";
-       sha256 = "0xl6x4755x8sz2igqfp3mr5n29q7hb4v5b1mycah9vffk1bhi0yf";
+       sha256 = "ce83085798ceed0415f335acb2c9820727614baee33afca2f81af5520ee98676";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -91541,7 +91850,7 @@ self: {
      mkDerivation {
        pname = "mighttpd2";
        version = "3.2.9";
-       sha256 = "0gxdf9xkw1w4cdb8cdq1slj5x1ch39kxrqhnaxdkb8w4jdxqbj5p";
+       sha256 = "b7c8857b9384a3355b5716e2dc671a90855e24d5013786566384073e7b72ad3f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91566,7 +91875,7 @@ self: {
      mkDerivation {
        pname = "mikmod";
        version = "0.2.0.0";
-       sha256 = "0wr671a7r20ysnry92qimdsdnf5gijbxzv382mb7w8fav88v5kvv";
+       sha256 = "7bcfb211daca217e561568ecdf978caf38db74ab118be4b3d51e887c54382673";
        libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "https://github.com/evanrinehart/mikmod";
@@ -91581,7 +91890,7 @@ self: {
      mkDerivation {
        pname = "miku";
        version = "2014.11.17";
-       sha256 = "1zfvi7v05cdp94cdrwxxhwkzqyliaakl16klk9zb0byvsg32ns3n";
+       sha256 = "76682bc6d3db2fb07e9a749a40a752917afc2787bdf3dc1849b7b102f689dbfd";
        libraryHaskellDepends = [
          air air-th base bytestring containers data-default hack2
          hack2-contrib mtl
@@ -91599,7 +91908,7 @@ self: {
      mkDerivation {
        pname = "milena";
        version = "0.2.0.0";
-       sha256 = "08nfjd1jn9cniksj8zrifaz3fjgnhzgydlswbz2h4lqv9kyqvvrm";
+       sha256 = "35ef8dfd4c1b5302c55f5cd3e6df87f64937be72317f24f58c96252b4393ce22";
        libraryHaskellDepends = [
          base bytestring cereal containers digest either lens mtl network
          random resource-pool transformers
@@ -91616,7 +91925,7 @@ self: {
      mkDerivation {
        pname = "mime";
        version = "0.4.0.2";
-       sha256 = "0x9qx8adradc5irfwfn4xs4j9pd228j1b3lpngap2qxabhz2iyp7";
+       sha256 = "e7fa283e5caa6371d5b3978e152412a2dd2489eec43aee722caca9dc14ea3875";
        libraryHaskellDepends = [ base text ];
        homepage = "https://github.com/GaloisInc/mime";
        description = "Working with MIME types";
@@ -91630,7 +91939,7 @@ self: {
      mkDerivation {
        pname = "mime-directory";
        version = "0.5.1";
-       sha256 = "1f54rbznv52m4h72yazr397k1d9jyb1i524pfl3d494swvn9b05r";
+       sha256 = "b98095ece69a24d20675978812c3f232b5304f1af92b2f0e2455946dffcaa4b8";
        libraryHaskellDepends = [
          base base64-string bytestring containers old-locale regex-pcre time
        ];
@@ -91647,7 +91956,7 @@ self: {
      mkDerivation {
        pname = "mime-mail";
        version = "0.4.9";
-       sha256 = "1l638jr7914227mg8854i6xgyhq403kb1zc2py77yb0xifm20534";
+       sha256 = "641420aa8b1d2c7f8ebf82fdb0e6000443ffba89a420f4ea11828474b244c3d0";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
@@ -91667,7 +91976,7 @@ self: {
      mkDerivation {
        pname = "mime-mail-ses";
        version = "0.3.2.2";
-       sha256 = "1dzlfrpqw3bdqkwgp5i52azkp8lv2cgvrdvl1w39q484ra4by2y1";
+       sha256 = "c10bbf88ca04119c060f74b7bc1f139ba23bbf122596fbf8c46d0d8e6f76f4b7";
        libraryHaskellDepends = [
          base base64-bytestring byteable bytestring conduit cryptohash
          http-client http-conduit http-types mime-mail old-locale text time
@@ -91685,7 +91994,7 @@ self: {
      mkDerivation {
        pname = "mime-string";
        version = "0.4";
-       sha256 = "0v028cgqll918zdaa95myazlg7dnvb2cvvvm1iyyqw81grza3r61";
+       sha256 = "c1e4a17e7e0171ec7d0c75efcdc4dab69d47bff2b524a5da4721518a1f43026c";
        libraryHaskellDepends = [
          base base64-string bytestring iconv mtl network old-time
        ];
@@ -91699,7 +92008,7 @@ self: {
      mkDerivation {
        pname = "mime-types";
        version = "0.1.0.6";
-       sha256 = "090z3dp928243amnc6s8g10rk2h2bprk9y138q6wj3cpflzr72pw";
+       sha256 = "fc8a933f75970dc90d4623f834f35d028a994178481b66ab1a4420916e1b1f24";
        libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "https://github.com/yesodweb/wai";
        description = "Basic mime-type handling types and functions";
@@ -91711,7 +92020,7 @@ self: {
      mkDerivation {
        pname = "mines";
        version = "0.1";
-       sha256 = "16s98hwskycl2bqv1n2bnivh8w8q3xhhj687hk8flcg9s9ny4s8k";
+       sha256 = "1369e26dd2e931ead084071909611f18710477b44bd8b0f11294f9a93944499b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory mtl random ];
@@ -91727,7 +92036,7 @@ self: {
      mkDerivation {
        pname = "minesweeper";
        version = "0.9.2.1";
-       sha256 = "1cbw136wl9rdcl4vbbz9i5w1mw33qhr0gzbww0qf63zfz2lg4gs2";
+       sha256 = "423ff2a8f8ee0fe330e07cfd0732c463f01a7889e9afb509652d27cacd087cb1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -91745,7 +92054,7 @@ self: {
      mkDerivation {
        pname = "miniball";
        version = "0.1.0.2";
-       sha256 = "16fdzbfspxqi0h7v6gn25n065anvk9zm28236qvfwbvr9l2ki172";
+       sha256 = "e28438054d792fee36364320517f9adbaa62802dc23eb30f0411f7abddfacd99";
        libraryHaskellDepends = [ base vector ];
        homepage = "http://nonempty.org/software/haskell-miniball";
        description = "Bindings to Miniball, a smallest enclosing ball library";
@@ -91760,7 +92069,7 @@ self: {
      mkDerivation {
        pname = "miniforth";
        version = "0.1.0.1";
-       sha256 = "1f2scxg7j6zifqj6q2khxb8s49ilnk4r9qms72vysp1s5p76zk0g";
+       sha256 = "0fcc6fce2d3a5cedb738bae294c9b43426a2d1ea700a6c2476f11b795e675ab8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91781,7 +92090,7 @@ self: {
      mkDerivation {
        pname = "minimal-configuration";
        version = "0.1.1";
-       sha256 = "06r710l30kf5aaz2k446z9fhc6zshdsssp1zwri0572r1jryzd43";
+       sha256 = "83b4efb30c599c0262e63f5cad7583fa1b065dfa869029be52c54d302808271b";
        revision = "1";
        editedCabalFile = "12049d8491610c2789c61e4736586d3fa8b1122c5c7657647c3de8d21073ef80";
        libraryHaskellDepends = [
@@ -91799,7 +92108,7 @@ self: {
      mkDerivation {
        pname = "minimorph";
        version = "0.1.6.0";
-       sha256 = "17ds0bjpyz7ngsq7nnlqix6yjfr6clr7xkwgpg4fysii7qvymbkz";
+       sha256 = "7faeea373e316aefc8bb8fcf7e3265263be94d8f985a7bb07ef67c7fe502ba9d";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit text
@@ -91814,7 +92123,7 @@ self: {
      mkDerivation {
        pname = "minimung";
        version = "0.1";
-       sha256 = "0i825bd751adfj22lkgc929jlgxjj16i81k8qqkhqh7ib131kqlf";
+       sha256 = "8ee2194658f1400c27c66806144d90b23f2a9348ec4d2a84744d8572da2a0245";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT haskell98 unix ];
@@ -91828,7 +92137,7 @@ self: {
      mkDerivation {
        pname = "minions";
        version = "0.2.0.0";
-       sha256 = "1r7c07pa9lr7h32y1mgxrlrj6a4sf8kfwc7vvvrr6bjfwr3m54vl";
+       sha256 = "74935247e64e2e93f3defb30ee26729a282333cdfdd5e0c58027d3a4ee01ece4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -91847,7 +92156,7 @@ self: {
      mkDerivation {
        pname = "minioperational";
        version = "0.4.9";
-       sha256 = "0kbfk3gpgzxi84kyjf7awdc2x579339zd7c42khlflhk6y88j95m";
+       sha256 = "b524899037135247e114849df6d318e9942e58e3ea38e92741b1ff77df986e4d";
        libraryHaskellDepends = [
          base containers elevator extensible mtl template-haskell
          transformers
@@ -91864,7 +92173,7 @@ self: {
      mkDerivation {
        pname = "miniplex";
        version = "0.3.4";
-       sha256 = "15rsg617wmh8cb0f2pkd5hyzrj96qjvar4p6nx21vlxr3b2plcg4";
+       sha256 = "e4317ac51ab9d31d44b7e692acb6c426c9fc3d2c6d5ee1c06208567e82793a97";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91884,7 +92193,7 @@ self: {
      mkDerivation {
        pname = "minirotate";
        version = "0.1.2.2";
-       sha256 = "15hgag1r0w6smilab7059z7bsn9i1czhdknma53rmj1ma2pd148y";
+       sha256 = "1e91d0ae5035c89a4751d5ce063f0b3159bdce4f059ca568acda7090c3530f96";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -91903,7 +92212,7 @@ self: {
      mkDerivation {
        pname = "minisat";
        version = "0.1.2";
-       sha256 = "089jam2cbwf4m16sgb9wh4zkgbmpfsg647lng3kyjs5d3m02i5dd";
+       sha256 = "ad9528401dad68e9e778961e629e76b7ae373f813cada74da8c4f1c544553221";
        libraryHaskellDepends = [ async base ];
        description = "A Haskell bundle of the Minisat SAT solver";
        license = stdenv.lib.licenses.bsd3;
@@ -91916,7 +92225,7 @@ self: {
      mkDerivation {
        pname = "ministg";
        version = "0.3";
-       sha256 = "05ddhr50pbqy0yjgcw0wgfjxlkgapg0zppqqyxfy5apr68zd02mm";
+       sha256 = "b50ad03e32f9aae25df718dffbc1bbea4ddaa57b1c70f6a4071eaf0b4a86ad15";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -91936,7 +92245,7 @@ self: {
      mkDerivation {
        pname = "miniutter";
        version = "0.4.4.2";
-       sha256 = "1nr08cm6qrww01sqxvr4bmkhxxihcl9sm8077gl25alj1s3gq21s";
+       sha256 = "3a08fc860e92aa22e83b07a0aa136530f60e675d24ef8e75009c676c2a4320db";
        libraryHaskellDepends = [
          base binary containers ghc-prim minimorph text
        ];
@@ -91954,7 +92263,7 @@ self: {
      mkDerivation {
        pname = "minst-idx";
        version = "0.1.2.2";
-       sha256 = "06ixg6bm55h1mjym3qp667gddy7f32inaxgyfbrh918zl283briv";
+       sha256 = "3be63590a01f8504f372fe7565a318eef8d6de31e6e251bdac01965297793d1a";
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base binary directory hspec vector ];
        homepage = "https://github.com/kryoxide/minst-idx/";
@@ -91969,7 +92278,7 @@ self: {
      mkDerivation {
        pname = "mirror-tweet";
        version = "0.1.0.0";
-       sha256 = "07dz0c65xkb7kgr2rby7m3g5893rqsbyl2nmjhf4q2wqsypmiipa";
+       sha256 = "eac658afd7980b4c1c94d50aea97c6792454dea8c7af2cf29b67cd5e0c03bf1d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -91991,7 +92300,7 @@ self: {
      mkDerivation {
        pname = "misfortune";
        version = "0.1.1.2";
-       sha256 = "0j93zqgqskrj2zc0vwsmwldidr6nkcxq2v3mmzv7l7l1bwhl8jxf";
+       sha256 = "ae4b44215f811e7af6af756c813b9bd6e4161be555f30dd817324f8d1ffe2349";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92009,7 +92318,7 @@ self: {
      mkDerivation {
        pname = "missing-foreign";
        version = "0.1.1";
-       sha256 = "11f8pknbarlj956nmalqhd2v704z7d7xbi61hs1q8vb2p36kc6wy";
+       sha256 = "9e1b36cdb8626d848386c1c4d54f3b9f80b3458398aa6a4d499266b5ecbcc885";
        libraryHaskellDepends = [ base ];
        description = "Convenience functions for FFI work";
        license = stdenv.lib.licenses.bsd3;
@@ -92020,7 +92329,7 @@ self: {
      mkDerivation {
        pname = "missing-py2";
        version = "1.0.1";
-       sha256 = "0daa310acml90r4f4qdjf3qns70gvx08mpjzw2h3v46vrwlacrmj";
+       sha256 = "b266a628cfdb903da0e05fde8a40df0f1c6df170b261e248068956a640184a35";
        libraryHaskellDepends = [ anydbm base MissingH ];
        testHaskellDepends = [
          anydbm base Cabal directory HUnit MissingH
@@ -92036,7 +92345,7 @@ self: {
      mkDerivation {
        pname = "mix-arrows";
        version = "1.2";
-       sha256 = "0m70l09bmr8b95d87rpz4vdircdar2rsvnamr2g07542wx024931";
+       sha256 = "61242240e78294039ec855d9adb3c8aab11cdb26ffe6835a490be5ba12a0e054";
        libraryHaskellDepends = [ base ];
        description = "Mixing effects of one arrow into another one";
        license = stdenv.lib.licenses.bsd3;
@@ -92048,7 +92357,7 @@ self: {
      mkDerivation {
        pname = "mixed-strategies";
        version = "0.1.0.0";
-       sha256 = "0vsldq2j2avj98fcz2lbydf4y23iwydr4jsvpbcvwlvqavgz1rkc";
+       sha256 = "6ce6f0df567853bed9ba5b4b929be771084f5cf38b8acf1c4a722b21056e546f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers simple-tabular ];
@@ -92066,7 +92375,7 @@ self: {
      mkDerivation {
        pname = "mkbndl";
        version = "0.2.1";
-       sha256 = "1qzfmf92sx5vq5jxrqhln1a6y8kayrip36izf5m8hryymxd4dard";
+       sha256 = "2dab465aafde67886a713f9a7163f66a226f54b014e2dc65c1bb742d92abeee3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath haskell98 ];
@@ -92082,7 +92391,7 @@ self: {
      mkDerivation {
        pname = "mkcabal";
        version = "1.0.0";
-       sha256 = "1cmawm49i01xxvzgf67cin6s9hihfc3ihr6s5hn2makasfxbnryc";
+       sha256 = "cc67bbbad36aaa2a2c2cda6418077330c2a48d8dec18f7feee3d809848e5aab2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -92099,7 +92408,7 @@ self: {
      mkDerivation {
        pname = "ml-w";
        version = "0.1.1";
-       sha256 = "04d0drqyaz075y6fs3rj6c2sp8ns1x4rfxqf1dbm2b31q09ycnl1";
+       sha256 = "815ae613c0612c51570b0e7797490fdaa2ab0533320fed8c2f077ce5716ea011";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
@@ -92114,7 +92423,7 @@ self: {
      mkDerivation {
        pname = "mlist";
        version = "0.0.2";
-       sha256 = "06mwmahyp781wigjva12kz7w75vjkkprl8k1yiqd1yd0162vp31k";
+       sha256 = "338cbb8509a0f9d070f461229aef9c7297c3cf9f22a82d5fe4019deba1aabc1a";
        libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://haskell.org/haskellwiki/mlist";
        description = "Monadic List alternative to lazy I/O";
@@ -92127,7 +92436,7 @@ self: {
      mkDerivation {
        pname = "mmap";
        version = "0.5.9";
-       sha256 = "1y5mk3yf4b8r6rzmlx1xqn4skaigrqnv08sqq0v7r3nbw42bpz2q";
+       sha256 = "58fcbb04e1cb8e7c36c05823b02dce2faaa989c53d745a7f36192de2fc98b5f8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -92140,7 +92449,7 @@ self: {
      mkDerivation {
        pname = "mmorph";
        version = "1.0.4";
-       sha256 = "0k5zlzmnixfwcjrqvhgi3i6xg532b0gsjvc39v5jigw69idndqr2";
+       sha256 = "22e3665b4c86bf28cb4e836da91f586294d74d1cf1c18db364dcf568eba7bf4c";
        libraryHaskellDepends = [ base transformers ];
        description = "Monad morphisms";
        license = stdenv.lib.licenses.bsd3;
@@ -92151,7 +92460,7 @@ self: {
      mkDerivation {
        pname = "mmtl";
        version = "0.1";
-       sha256 = "0bb19l52s56y2dwyskvjwdal7387ii2dg9cc1l6f341y3695nj7l";
+       sha256 = "f4485b92193e90e10c0d8ca5d7448c078d4355e3724fed7913de142d0a4d612d";
        libraryHaskellDepends = [ base ];
        description = "Modular Monad transformer library";
        license = stdenv.lib.licenses.bsd3;
@@ -92163,7 +92472,7 @@ self: {
      mkDerivation {
        pname = "mmtl-base";
        version = "15321.1";
-       sha256 = "13hdaxpb9zds3yc2l3pl60h26541yvswprdc43swn05hzf6p01nq";
+       sha256 = "d806708dfbb000cbf520ace5cbf5f68114232030f40e2a981fbafdb46e570d8e";
        libraryHaskellDepends = [ base mmtl ];
        description = "MonadBase type-class for mmtl";
        license = stdenv.lib.licenses.bsd3;
@@ -92177,7 +92486,7 @@ self: {
      mkDerivation {
        pname = "moan";
        version = "0.2.0.2";
-       sha256 = "0fb0z3v4a8kblwx4xjs7xdkczpvcyz9la7071kz7q6cjl6w49i30";
+       sha256 = "60c444b8a192197cfe0c071c45d3f76cdfcf66eb47cb4e3aa76b2245f6f86039";
        libraryHaskellDepends = [
          base binary bytestring containers dawg regex-tdfa regex-tdfa-text
          tagset-positional text zlib
@@ -92196,7 +92505,7 @@ self: {
      mkDerivation {
        pname = "mockery";
        version = "0.3.2";
-       sha256 = "0m0lp2z63sgkylz5318j53r5hnrkp705qh7nqbb149ir4gy7g1bg";
+       sha256 = "6f8577fc23392612d6c2f6405cc0b9335b58f2281285513ef5f3e961beb81454";
        libraryHaskellDepends = [
          base bytestring directory filepath logging-facade temporary
        ];
@@ -92214,7 +92523,7 @@ self: {
      mkDerivation {
        pname = "modbus-tcp";
        version = "0.1";
-       sha256 = "1j0gkc6vrvydz0vcdm8bpiarl75zqh4k5z18s4903b6mqwpscslr";
+       sha256 = "996aa62fc7d5ac0112d128fc3209c4bf1c9a55bc0bd5c636f8cdefbc0d9b0fc8";
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring cereal network
        ];
@@ -92231,7 +92540,7 @@ self: {
      mkDerivation {
        pname = "modelicaparser";
        version = "0.1.0.0";
-       sha256 = "0ifsgdqi3376z7xspjlx62hh3dah3dskqrar3s63pmw1cf9b6qfl";
+       sha256 = "d461b3926381d73b8c1e59653c751b50b501a1309dcaabfbf9e68c11717bda45";
        libraryHaskellDepends = [ base containers parsec ];
        testHaskellDepends = [
          ansi-terminal base containers filepath parsec QuickCheck
@@ -92249,7 +92558,7 @@ self: {
      mkDerivation {
        pname = "modsplit";
        version = "0.2.1";
-       sha256 = "0xm9vj78clawys9ascgm2fl8kqg5zmdfbkkb42d1d1h5z72cc55p";
+       sha256 = "b714c6c4f90586169a206bcee55afde5e189a813f531ad92f65c51868edca976";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92268,7 +92577,7 @@ self: {
      mkDerivation {
        pname = "modular-arithmetic";
        version = "1.2.1.1";
-       sha256 = "005pbkrszgkbm0qx9hzn1f72l9z07qhqypmcw72fi5i5hppr45av";
+       sha256 = "5b1592ef852596e8c4e1ac5e8f213ee0272a8e0bf6c3d431a86bbeaff35cb700";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        jailbreak = true;
@@ -92285,7 +92594,7 @@ self: {
      mkDerivation {
        pname = "modular-prelude";
        version = "0.3.0.0";
-       sha256 = "0hlmxm9xfnf55qz1nrljm0s4bhpa6x973h3qi2b7bl8pil423rkf";
+       sha256 = "6ee621088d17d175968878c0715237eac24534a892661b3e2ec559d753ed9542";
        libraryHaskellDepends = [
          base basic-prelude bytestring containers data-default hashable
          system-filepath text transformers unordered-containers vector
@@ -92302,7 +92611,7 @@ self: {
      mkDerivation {
        pname = "modular-prelude-classy";
        version = "0.1.0.0";
-       sha256 = "1izinrgd9a6sm57isg8jgs4wjidczwqcxl6vg5h4gy5zz9dg8xnx";
+       sha256 = "dd76f45afabff8476079dbd0ce30ffac45c9897e123d1d4fa9daa8d45eb6f1c7";
        libraryHaskellDepends = [ base classy-prelude modular-prelude ];
        jailbreak = true;
        homepage = "https://github.com/DanBurton/modular-prelude#readme";
@@ -92321,7 +92630,7 @@ self: {
      mkDerivation {
        pname = "module-management";
        version = "0.20.4";
-       sha256 = "185vky00i0cm7rd019xa87x1rld4j92fqcm4a4igpn13lh2y4nzq";
+       sha256 = "f85be205a423d8fb2251a432ec4492a4d11cfa41aaa7005a3e958108809fbba0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92350,7 +92659,7 @@ self: {
      mkDerivation {
        pname = "modulespection";
        version = "0.1.2.2";
-       sha256 = "00172s9v4823q4f8mvln2v3m7zcri8vp2b7b8j1ank0sb9lbyjlf";
+       sha256 = "8e4abf685a1a4cab8244eb2c71378a99fd53c71696ee8a1cc14320b293162700";
        libraryHaskellDepends = [
          base exceptions filepath ghc ghc-paths template-haskell temporary
          transformers
@@ -92369,7 +92678,7 @@ self: {
      mkDerivation {
        pname = "modulo";
        version = "1.9.1";
-       sha256 = "1dxvfd8f7zx43zm9h5dd71ci768khhmh8660h3abazqhm7ws367c";
+       sha256 = "ec98a1f9a9107fb5d480c018042b841399135938ad1598ea1fa4ffe35073bbb7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92388,7 +92697,7 @@ self: {
      mkDerivation {
        pname = "moe";
        version = "2015.5.4";
-       sha256 = "0yiyr8n0bw5wcc8jyrah2kf9jnj3x4h5kl3qprysx8ffhc6dx3r9";
+       sha256 = "298fde0c83cea1ae7dbe78d05920e9435a99dc1450652f1163bcf0052cca3e7a";
        libraryHaskellDepends = [
          air base bytestring data-default dlist mtl text
        ];
@@ -92405,8 +92714,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.12";
-       sha256 = "1f31qd4lgc2li9q7cf7zx700v23sln9wxfd7yaw0d2q0qmqj2zvi";
+       version = "0.1.0.14";
+       sha256 = "7b8548c3b91dbe0fc51304af356537b8af6586a487153ab3777ec804668d9fef";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -92428,7 +92737,7 @@ self: {
      mkDerivation {
        pname = "mohws";
        version = "0.2.1.3";
-       sha256 = "1na585nc16s3giq88kr5i8wlqc03i29blqsgqp40da6dyqiihqwf";
+       sha256 = "8e631823f6cda806c8c54f63ba928803304c398a254f84707c439bc06c4145d9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92450,7 +92759,7 @@ self: {
      mkDerivation {
        pname = "monad-abort-fd";
        version = "0.4";
-       sha256 = "01ny9pq66cma3wai48mhzijk465h7ssrj253npyy2myxnj0y93zr";
+       sha256 = "f98fe481b4dd57e1fdb5a30899b53eb0183265fcb02212151faa3263f04dde06";
        libraryHaskellDepends = [
          base data-default monad-control mtl transformers transformers-abort
          transformers-base
@@ -92466,7 +92775,7 @@ self: {
      mkDerivation {
        pname = "monad-atom";
        version = "0.4.1";
-       sha256 = "16dnp6wz0s56gm58k6m5cv5c47hb2vz1m4a3pqvrg3j97y344c3q";
+       sha256 = "783042863f498e9737be43911afe160b1ec2ca66a59a894a7da668f0b9b9b699";
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "Monadically convert object to unique integers and back";
@@ -92479,7 +92788,7 @@ self: {
      mkDerivation {
        pname = "monad-atom-simple";
        version = "0.0.2";
-       sha256 = "1k4rcrdjjs52p9mnsbwp0gmb2inivhcqw044l56dbc080yxrk32j";
+       sha256 = "528c99bb0708b0d54ca184008e19dcd146b1ea03972f6d6bbaa268295b6699cc";
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically map objects to unique ints";
        license = stdenv.lib.licenses.bsd3;
@@ -92491,7 +92800,7 @@ self: {
      mkDerivation {
        pname = "monad-bool";
        version = "0.2.0";
-       sha256 = "1f3n2wbd3lbsp2snsf9x4h09apw62hayhzjibakp6mqw6174444h";
+       sha256 = "9010424e301c5773a75a517ee81514865f9500243d396db5b87ad1d1161776b8";
        libraryHaskellDepends = [ base ];
        description = "This package has been removed";
        license = stdenv.lib.licenses.bsd3;
@@ -92506,7 +92815,7 @@ self: {
      mkDerivation {
        pname = "monad-classes";
        version = "0.3.1.1";
-       sha256 = "1n0ry7lq0vh9siaqxfdfavg67a99zmws5nvr1hjq8k212v36v40c";
+       sha256 = "0c906dc616414c84250c79dba279fd29a963de56aeb98e55d4096e80e9f119d8";
        libraryHaskellDepends = [
          base ghc-prim mmorph monad-control peano reflection transformers
          transformers-base transformers-compat
@@ -92525,7 +92834,7 @@ self: {
      mkDerivation {
        pname = "monad-codec";
        version = "0.2.0";
-       sha256 = "0jim6hk891jby2gch6f1k4262jm8fl9jgl808dj204ylz8w1475l";
+       sha256 = "b41c1238fad41320644300d1271375a84a610499c119c89ef04b86842634354a";
        libraryHaskellDepends = [ base binary containers data-lens mtl ];
        homepage = "https://github.com/kawu/monad-codec";
        description = "Monadic conversion between complex data structures and unique integers";
@@ -92539,7 +92848,7 @@ self: {
      mkDerivation {
        pname = "monad-control";
        version = "1.0.0.4";
-       sha256 = "07pn1p4m80wdd7gw62s4yny8rbvm60ka1q8qx5y1plznd8sbg179";
+       sha256 = "e984b7346af6d31b7ce918e1a0263075af8cbcf5440bc3df698d0354c90df61e";
        libraryHaskellDepends = [
          base stm transformers transformers-base transformers-compat
        ];
@@ -92555,7 +92864,7 @@ self: {
      mkDerivation {
        pname = "monad-coroutine";
        version = "0.9.0.1";
-       sha256 = "10b98w0xr7hbnawfz93qqkbcpvklgkpljxmv9drr40bd9bv33wij";
+       sha256 = "32f231f64a6d0192734bbb7649ef7c74eecbd6c478a4efb8b20b9edc01476981";
        libraryHaskellDepends = [
          base monad-parallel transformers transformers-compat
        ];
@@ -92571,7 +92880,7 @@ self: {
      mkDerivation {
        pname = "monad-exception";
        version = "0.1";
-       sha256 = "1mh19mxi6mlkvd083vjjdmdimdnk6n5yaj7v7xxgqycl5sazqkh8";
+       sha256 = "084efc952e9479fc7a3ffb48e58b35d3b61a5b6d52ee8140db9356137b4d01d6";
        libraryHaskellDepends = [
          base monad-control mtl-evil-instances transformers
          transformers-base
@@ -92589,7 +92898,7 @@ self: {
      mkDerivation {
        pname = "monad-extras";
        version = "0.5.11";
-       sha256 = "0rq44dk1fvfqkhng2yczyyz7jh6d6m0kjy58k02ady28f7j2r5vn";
+       sha256 = "76972ce47148f8a60498a878394135cd4079bef79f79f12c9cd86d1766230467";
        libraryHaskellDepends = [
          base mmorph monad-control stm transformers transformers-base
        ];
@@ -92603,7 +92912,7 @@ self: {
      mkDerivation {
        pname = "monad-fork";
        version = "0.1";
-       sha256 = "15xwavq4yc3xfif4isjh9m0q9h1bh7pmv2i3rh99sndmd34cdpwc";
+       sha256 = "8cdfc6c868b5599d12cc238a5def812bc084414d50ea485c747d304ff056bc97";
        libraryHaskellDepends = [ base monad-control ];
        jailbreak = true;
        description = "Type class for monads which support a fork operation";
@@ -92615,7 +92924,7 @@ self: {
      mkDerivation {
        pname = "monad-gen";
        version = "0.3.0.1";
-       sha256 = "0rc4r6sg29sjgh9xsk7q80h0lixhyxs60bszj5dnn8yf7w18b15y";
+       sha256 = "be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A simple monad for generating fresh integers";
        license = stdenv.lib.licenses.mit;
@@ -92626,7 +92935,7 @@ self: {
      mkDerivation {
        pname = "monad-interleave";
        version = "0.1";
-       sha256 = "09hpl7ah5ivsrx4xlk96d129n1j4wpx7kj6l95zwadyaz7rj9fp7";
+       sha256 = "e7ba24f3f9ca37c57f49d4c879fae544069b4468264dda49cf7ac702d5a11726";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/patperry/monad-interleave";
        description = "Monads with an unsaveInterleaveIO-like operation";
@@ -92641,7 +92950,7 @@ self: {
      mkDerivation {
        pname = "monad-journal";
        version = "0.7.1";
-       sha256 = "1bfj9yy7hkixii31fbxdydjwx9ln6snm40w6l5vph2skcrms9bvr";
+       sha256 = "79afa46b66530b7877a1860352ad3696a6ce65f3ad2f17468c3d4e78bc4fd2ad";
        libraryHaskellDepends = [
          base either monad-control mtl transformers transformers-base
        ];
@@ -92657,7 +92966,7 @@ self: {
      mkDerivation {
        pname = "monad-levels";
        version = "0.1.0.1";
-       sha256 = "1v3i12h4c788yz93a2c9nxcczrhz8nwpq0057q7b1nad74g70lan";
+       sha256 = "5651701e394dd9b00e3e05007cb9451fe6cf58b7890935d2f7081d46a00871ec";
        libraryHaskellDepends = [
          base constraints transformers transformers-compat
        ];
@@ -92678,7 +92987,7 @@ self: {
      mkDerivation {
        pname = "monad-logger";
        version = "0.3.13.2";
-       sha256 = "1cp2npa5mzn3yss1di151ikw7hx4slc99cvx8gipdwp1696kqf61";
+       sha256 = "c1383c4d32e1f276e3437db39418d5a4c3c3670c25c416b4f6c3fe5ad4b5e2b2";
        libraryHaskellDepends = [
          base blaze-builder bytestring conduit conduit-extra exceptions
          fast-logger lifted-base monad-control monad-loops mtl resourcet stm
@@ -92696,7 +93005,7 @@ self: {
      mkDerivation {
        pname = "monad-logger-json";
        version = "0.1.0.0";
-       sha256 = "1ap98487lwgvgrrxkjskga86ckbv6rhn2n6pzp403343xx51r1qh";
+       sha256 = "10871c4aef838c01c8fdd7586161367b4d66907a53cbd9737efb717a1041e9aa";
        libraryHaskellDepends = [
          aeson base monad-logger template-haskell text
        ];
@@ -92712,7 +93021,7 @@ self: {
      mkDerivation {
        pname = "monad-logger-syslog";
        version = "0.1.1.1";
-       sha256 = "0hdm495knrdrl76xlsdp0sk6n0v6qnl9b6r6x9ac6s1p7j1w66vf";
+       sha256 = "6e1bc3833c3768c354ea269b95a8c566036ba606b769dacda1b9653b4b22b541";
        libraryHaskellDepends = [
          base bytestring fast-logger hsyslog monad-logger text transformers
        ];
@@ -92726,7 +93035,7 @@ self: {
      mkDerivation {
        pname = "monad-loops";
        version = "0.4.3";
-       sha256 = "062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky";
+       sha256 = "7eaaaf6bc43661e9e86e310ff8c56fbea16eb6bf13c31a2e28103138ac164c18";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/mokus0/monad-loops";
@@ -92739,7 +93048,7 @@ self: {
      mkDerivation {
        pname = "monad-loops-stm";
        version = "0.4";
-       sha256 = "0y7j2xpr1s7ggwm3vvpb5mlagsnxhq9qpncapibhk2pbf2d5r7as";
+       sha256 = "5a9d5c9a70eb8a0957bc8ad98b1386ddeaa7682debee3d2a7fefe8906f17f278";
        libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/mokus0/monad-loops-stm";
        description = "Monadic loops for STM";
@@ -92753,7 +93062,7 @@ self: {
      mkDerivation {
        pname = "monad-lrs";
        version = "0.0.2.1";
-       sha256 = "01i8hz50r3lf8r3rasl96blr6br3p1x6hvckhbi8aw61x507jmcg";
+       sha256 = "8f557940e9c17085e282936d687ab8232f93e932896a9547468e8e0cca872806";
        revision = "1";
        editedCabalFile = "dd714797826911e564a0e418307530fa99a8ba9ea91400517be2bb78b4e695c1";
        libraryHaskellDepends = [ base containers ];
@@ -92775,7 +93084,7 @@ self: {
      mkDerivation {
        pname = "monad-memo";
        version = "0.4.1";
-       sha256 = "07gid18rsja7gvk2ccsbwvpz223x59mdk9x9w36bz18cy2pw802c";
+       sha256 = "4c00c4aff00c85bfcce0a9a7d96a2a7d08f1efe64b3326e67e47499d5168f11d";
        libraryHaskellDepends = [
          array base containers mtl primitive transformers vector
        ];
@@ -92794,7 +93103,7 @@ self: {
      mkDerivation {
        pname = "monad-mersenne-random";
        version = "0.1";
-       sha256 = "03kbqbgv4npzfzn90jk4p17y8kb62sslby6q36819qkif1j76lq6";
+       sha256 = "065373647071e2149019d8f845b516664de44fb8644a90ec77ff5ab2dfc26b0e";
        libraryHaskellDepends = [ base mersenne-random-pure64 ];
        homepage = "http://code.haskell.org/~dons/code/monad-mersenne-random";
        description = "An efficient random generator monad, based on the Mersenne Twister";
@@ -92807,7 +93116,7 @@ self: {
      mkDerivation {
        pname = "monad-open";
        version = "0.1.0.0";
-       sha256 = "18h24zdvbffnwr2xh4qahakr80z8ly65pmksmk3ngjykxrvif2vx";
+       sha256 = "7d0b1777eed3cb67c7ac7ad65b8ca7e80394a7820a13d845e6d6b9b5db2702a2";
        libraryHaskellDepends = [ base exceptions mtl transformers ];
        jailbreak = true;
        description = "Open recursion for when you need it";
@@ -92819,7 +93128,7 @@ self: {
      mkDerivation {
        pname = "monad-ox";
        version = "0.3.0";
-       sha256 = "1x65jvh816a296y2ds8vysfzl83am4pwwrnap4zdg0prpcxfpwl8";
+       sha256 = "88f2eb3abbf982d73eb9ca66ce2fa96a20fa9df61be926bc49429980e096c5f4";
        libraryHaskellDepends = [ base containers mtl text vector ];
        homepage = "https://github.com/kawu/monad-ox";
        description = "Monad for observation extraction";
@@ -92835,7 +93144,7 @@ self: {
      mkDerivation {
        pname = "monad-par";
        version = "0.3.4.7";
-       sha256 = "12n27hs274nrfkpa6hx0gdkrc76wxzliqf53x6689idl363sdf13";
+       sha256 = "23b8a68719b4c5848ce9a3381ce9efdc1c96677ba043a3ee74d99223343cc28a";
        libraryHaskellDepends = [
          abstract-deque abstract-par array base containers deepseq
          monad-par-extras mtl mwc-random parallel
@@ -92858,7 +93167,7 @@ self: {
      mkDerivation {
        pname = "monad-par-extras";
        version = "0.3.3";
-       sha256 = "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2";
+       sha256 = "e21e33190bc248afa4ae467287ac37d24037ef3de6050c44fd85b52f4d5b842e";
        libraryHaskellDepends = [
          abstract-par base cereal deepseq mtl random transformers
        ];
@@ -92873,7 +93182,7 @@ self: {
      mkDerivation {
        pname = "monad-parallel";
        version = "0.7.1.4";
-       sha256 = "01sadhl3kv7gsx1m90fb76n2xh7b9awjc9071gzn0ab26d67a98b";
+       sha256 = "0b25754c33622960ff0b072426b94aebc02eac39cb815443d7efec39286c4a07";
        libraryHaskellDepends = [
          base parallel transformers transformers-compat
        ];
@@ -92889,7 +93198,7 @@ self: {
      mkDerivation {
        pname = "monad-parallel-progressbar";
        version = "0.1.0.1";
-       sha256 = "1pqi2alyvsflwy5ygp4cl5g90jg50ix61plqxvsldpdkzncmmk84";
+       sha256 = "04cd5a99fdb3dd46f5ee98de607a04e549905ea18cdce78be7d4e9eda91211df";
        libraryHaskellDepends = [
          base monad-parallel monadIO terminal-progress-bar
        ];
@@ -92903,7 +93212,7 @@ self: {
      mkDerivation {
        pname = "monad-param";
        version = "0.0.4";
-       sha256 = "08rm902kclapqh1iafjrsqspf0szhbx5jaqv6hh9p5zbg8ipdkhc";
+       sha256 = "0cce76237aeb979b20341b2b59fa825f037735d6593a1503c457513605483523";
        libraryHaskellDepends = [ base mtl stm ];
        homepage = "http://hackage.haskell.org/package/monad-param";
        description = "Parameterized monads";
@@ -92915,7 +93224,7 @@ self: {
      mkDerivation {
        pname = "monad-peel";
        version = "0.2";
-       sha256 = "1cg6j2qhh14ryn4766dwx57g50qalzcv79rx9ysdgkskkjs6fiix";
+       sha256 = "3d4667b49c53cfd7b44f3da7b3d9a70a83f24ee9bc197388f5990408b190e6b1";
        libraryHaskellDepends = [
          base extensible-exceptions transformers
        ];
@@ -92929,7 +93238,7 @@ self: {
      mkDerivation {
        pname = "monad-primitive";
        version = "0.1";
-       sha256 = "1vi6g65hdyq5vq78mfag0qljxgzb6vq83m82x3cpgjl7dr9k5h1x";
+       sha256 = "3dc032536e87ca77d9e802d581f036ebbf2e29064fb98a0ede05fb068b7926ee";
        libraryHaskellDepends = [ base primitive transformers ];
        homepage = "http://bitbucket.org/Shimuuar/monad-primitive";
        description = "Type class for monad transformers stack with pirimitive base monad";
@@ -92941,7 +93250,7 @@ self: {
      mkDerivation {
        pname = "monad-products";
        version = "4.0.0.1";
-       sha256 = "017cxiavxfw0f08sr0d6m3avla1lplmdj51rxpf1103ripq20r53";
+       sha256 = "a36420f08d798010dced3914d92abd3428bad5a8a681ac117080bbbe55ecec04";
        revision = "1";
        editedCabalFile = "fb4d07af0ad3081f3f2a252c99b777fafa6b3ece61ca81642f8a889ef370710e";
        libraryHaskellDepends = [ base semigroupoids ];
@@ -92955,7 +93264,7 @@ self: {
      mkDerivation {
        pname = "monad-ran";
        version = "0.1.0";
-       sha256 = "04y9s2b4hz2f8khr0q62xy0f6l2v896s7x03i3s18i14bwscqlax";
+       sha256 = "5d51cc345f244414f48803f4a34d425b50e380efc26090e1444e7c4896d0c913";
        libraryHaskellDepends = [ base ghc-prim mtl ];
        jailbreak = true;
        description = "Fast monads and monad transformers";
@@ -92968,7 +93277,7 @@ self: {
      mkDerivation {
        pname = "monad-resumption";
        version = "0.1.2.0";
-       sha256 = "09yz5cbvjlmqdlr25adxggpdz52jxyryyyrzix1pkdjr6aqpidkr";
+       sha256 = "79b678b13259b679438f3f7befb3ef5294dfee7bbda922326db852b9172bdf27";
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        homepage = "https://github.com/igraves/resumption_monads";
        description = "Resumption and reactive resumption monads for Haskell";
@@ -92980,7 +93289,7 @@ self: {
      mkDerivation {
        pname = "monad-skeleton";
        version = "0.1.2.1";
-       sha256 = "0sg1yj4cp7ac26ydwhpc05j9bs3scaj25b9sb0xr1gw1qasnyi76";
+       sha256 = "e6446fb5c281bf903b583aad22a4627ae8956401ec42debc114c9dcb88f4e169";
        libraryHaskellDepends = [ base containers ghc-prim ];
        homepage = "https://github.com/fumieval/monad-skeleton";
        description = "An undead monad";
@@ -92992,7 +93301,7 @@ self: {
      mkDerivation {
        pname = "monad-st";
        version = "0.2.4";
-       sha256 = "1j67s07p5lsr81cjl0ch5d1q7zarmpak5kmnwckhavihg3l5m3bi";
+       sha256 = "718d5ae878306e0527e3b6ce32d5ad59fd83432b90012a594059d3720fd0c7c8";
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/ekmett/monad-st";
        description = "Provides a MonadST class";
@@ -93006,7 +93315,7 @@ self: {
      mkDerivation {
        pname = "monad-state";
        version = "0.2.0.3";
-       sha256 = "1dh1dw7n39rb85wk4zq0hw2g9x81zyha033awv81l6xl8pjdxqxv";
+       sha256 = "bbe3dee445b41b1ad0e66a0ca0a0ff01f5f40487007f3279412ba7610f6f01b6";
        libraryHaskellDepends = [
          AbortT-transformers base fclabels monads-tf transformers
        ];
@@ -93020,7 +93329,7 @@ self: {
      mkDerivation {
        pname = "monad-statevar";
        version = "0.1";
-       sha256 = "08sr29qr02kfqja51ciqcpsf95wp3bypx64f4cwgpwh23xapr1fx";
+       sha256 = "dd857c551f02f2fb38238e987efd1a9797e4f46538b25094c46e0a9071125923";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base stm ];
        homepage = "http://github.com/joeyadams/hs-monad-statevar";
@@ -93034,7 +93343,7 @@ self: {
      mkDerivation {
        pname = "monad-stlike-io";
        version = "0.2.2";
-       sha256 = "1lizwf31d8ha0xq644cfcn91l8sz8i4ldy12ig4ajfghxj2x4ad5";
+       sha256 = "a529d285ecf039a9c88b22f84649445f231a92658e116270070aa21686e33fd2";
        libraryHaskellDepends = [
          base bytestring containers deepseq monads-tf
        ];
@@ -93049,7 +93358,7 @@ self: {
      mkDerivation {
        pname = "monad-stlike-stm";
        version = "0.1.1";
-       sha256 = "007rsq9x0dq8xmiimgqb0v8k15xizx63qmc76b1b8a66nfsd9w56";
+       sha256 = "a6f0d4b4b3c628b4c23287553c4cffb19730d1060bbf1a63ed0837d013d6f900";
        libraryHaskellDepends = [ base monad-stlike-io stm ];
        homepage = "http://github.com/taruti/monad-stlike-stm";
        description = "ST-like monad capturing variables to regions and supporting STM";
@@ -93062,7 +93371,7 @@ self: {
      mkDerivation {
        pname = "monad-stm";
        version = "0.1.0.2";
-       sha256 = "09bbhbj9zg928j3dnvvxsrv8hw1c7s0vj0wffrhs810aqlf1m9xp";
+       sha256 = "b7a71a1cc50a04a461768e03b9813e2c708876d67d6fdb864422bd9fe4826b25";
        libraryHaskellDepends = [ base stm transformers ];
        description = "MonadSTM class analogous to MonadIO";
        license = stdenv.lib.licenses.bsd3;
@@ -93073,7 +93382,7 @@ self: {
      mkDerivation {
        pname = "monad-supply";
        version = "0.6";
-       sha256 = "1gg4r7fwaq2fa0lz8pz301mk3q16xpbs7qv54hhggxrv3i1h33ir";
+       sha256 = "398e01431c3bf7f7202465e3a3d7ed26e0316b00e35ff429504e60c5ddc9e4bd";
        libraryHaskellDepends = [ base mtl ];
        description = "Stateful supply monad";
        license = "unknown";
@@ -93084,7 +93393,7 @@ self: {
      mkDerivation {
        pname = "monad-task";
        version = "0.1.0";
-       sha256 = "01w3wqmsfl9w96kfpdiwfyghm2zjn70x78l436bzxfrcm1d3ayi8";
+       sha256 = "287a355aa82cbbfe971984a2d3c1b1f28b0a9f773cb6eba6493c51a72be68307";
        libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "http://github.com/ninegua/monad-task";
@@ -93097,7 +93406,7 @@ self: {
      mkDerivation {
        pname = "monad-time";
        version = "0.1";
-       sha256 = "1g3dqfwwmqwdpr3dcixxyw5akbdicx53i6d2s8921l2zbkm0hfnj";
+       sha256 = "d23a08ea5c5fd02012d2a299384a67b1ada90af7bd47d646be8de3cab9c36dbc";
        libraryHaskellDepends = [ base mtl time ];
        homepage = "https://github.com/scrive/monad-time";
        description = "Type class for monads which carry the notion of the current time";
@@ -93109,7 +93418,7 @@ self: {
      mkDerivation {
        pname = "monad-tx";
        version = "0.0.1";
-       sha256 = "0jv3pcmbm3bph42hhr4i0l3dchapixf5j5gd7ybs9j3bbk3yydk9";
+       sha256 = "6936efc75c6bc8a4973fed15595c8f5741d606059164080581778dba2abb634b";
        libraryHaskellDepends = [ base ];
        description = "A transactional state monad";
        license = stdenv.lib.licenses.bsd3;
@@ -93121,7 +93430,7 @@ self: {
      mkDerivation {
        pname = "monad-unify";
        version = "0.2.2";
-       sha256 = "1icl4jaa4vc4lb75m6wv4vjvf8b2xx7aziqhsg2pshizdkfxmgwp";
+       sha256 = "97bfdadd6c3f427dc5d310c7af4eef6221b7e5269b9b5acea2846da2942494c5";
        revision = "1";
        editedCabalFile = "7d585b29bfa558cf59d169421d1ec3363b6ef56b88cf6a9a082192d609676ce2";
        libraryHaskellDepends = [ base mtl unordered-containers ];
@@ -93139,7 +93448,7 @@ self: {
      mkDerivation {
        pname = "monad-unlift";
        version = "0.1.1.0";
-       sha256 = "1x86xpgirp97rda1y22129xf3fbkyb442jndpjsb9j1k4lplh7y2";
+       sha256 = "c21f482f2533c8b4b4bccd4a41c8f273b9e17a1241081f54cb27dd1cdfed06f5";
        libraryHaskellDepends = [
          base constraints exceptions monad-control mtl mutable-containers
          resourcet stm transformers transformers-base
@@ -93154,7 +93463,7 @@ self: {
      mkDerivation {
        pname = "monad-wrap";
        version = "0.1";
-       sha256 = "1hmigg0cbrsdvf6s0z2wn3s81q12qg3c30jjlsrw4jdfwv1qn13f";
+       sha256 = "6e048bc3e6ae49c2b3a65282c1c6c322e080f4b05c7ca08ddb4de7c5c07bb1c2";
        libraryHaskellDepends = [ base transformers ];
        description = "Wrap functions such as catch around different monads";
        license = stdenv.lib.licenses.bsd3;
@@ -93165,7 +93474,7 @@ self: {
      mkDerivation {
        pname = "monadIO";
        version = "0.10.1.4";
-       sha256 = "08158j978h69knbnzxkzv856sjhhw24h5lh7d8hx2lyhzbpnfarl";
+       sha256 = "342b67effad053d1216a07d20289e0104a6d0ada7ff66f979dc9407492442520";
        libraryHaskellDepends = [ base mtl stm ];
        description = "Overloading of concurrency variables";
        license = stdenv.lib.licenses.bsd3;
@@ -93176,7 +93485,7 @@ self: {
      mkDerivation {
        pname = "monadLib";
        version = "3.7.3";
-       sha256 = "17m9rj6spr5n9jlhwwvk8p40yrpwgz3j9kj3pjq7mpyrc1ssfd0q";
+       sha256 = "1834a77560d9df7ab0bc43ce24c77ffc660fc84573730ea94cb6e4ab8dcca99e";
        libraryHaskellDepends = [ base ];
        homepage = "http://wiki.github.com/yav/monadlib";
        description = "A collection of monad transformers";
@@ -93188,7 +93497,7 @@ self: {
      mkDerivation {
        pname = "monadLib-compose";
        version = "0.2";
-       sha256 = "14byhdcby094qpgmkblysnplz5r88xnfk7rnfddihzz4jgjzlvy1";
+       sha256 = "c16ffae593e47f185b73369fe96c4728974fafd59eae59dfc52401bf58837e91";
        libraryHaskellDepends = [ base monadLib ];
        jailbreak = true;
        homepage = "http://github.com/aristidb/monadLib-compose";
@@ -93201,7 +93510,7 @@ self: {
      mkDerivation {
        pname = "monadacme";
        version = "0.0.2";
-       sha256 = "1qam6k3gax2kf9zbf0q2mbsknkmx8y73i9qshbylj8wrpf896y97";
+       sha256 = "27799390bb992349fd821aa7388e47bd4e3bf5aa0203b77e725374f5c63455e1";
        libraryHaskellDepends = [ base ];
        description = "The Acme and AcmeT monads";
        license = stdenv.lib.licenses.bsd3;
@@ -93213,7 +93522,7 @@ self: {
      mkDerivation {
        pname = "monadbi";
        version = "0.1";
-       sha256 = "0r5hja34nalhvlc4x2rmhk9j1rsd363ilfjkd7y7cv4l8yzvifq7";
+       sha256 = "07bbb8bf47946c76fc69533a1a87194de720d384358b4e18dd902a4b8692b064";
        libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/ajnsit/monadbi";
        description = "Extract underlying monads from monad transformers";
@@ -93227,7 +93536,7 @@ self: {
      mkDerivation {
        pname = "monadcryptorandom";
        version = "0.6.1";
-       sha256 = "0j99j0f2qwhslimfgslsdlv0xihsddas3i69pfnjwnsd9zg5pgj2";
+       sha256 = "42be5bde4f4d5b2eadbbc9c4a1556b1ac60e366d9aeae76aa41a722c1c902949";
        libraryHaskellDepends = [
          base bytestring crypto-api mtl tagged transformers
        ];
@@ -93241,7 +93550,7 @@ self: {
      mkDerivation {
        pname = "monadfibre";
        version = "0.1.2.1";
-       sha256 = "0vj84g5y0k903pz4lk12sa6l6c0f26dc42x62f1mqny8457r3ds6";
+       sha256 = "46b7914f21c85b5c8313a60bc29a110e30438dd2224c4afe1d204de0cb23486e";
        libraryHaskellDepends = [ base monadbi ];
        homepage = "https://github.com/ajnsit/monadfibre";
        description = "Monadic functions which provide Choice and Parallelism";
@@ -93253,7 +93562,7 @@ self: {
      mkDerivation {
        pname = "monadic-arrays";
        version = "0.2.1.4";
-       sha256 = "1vlqh0mqfkg1f47dhl5lw49b7xawlbyjmq7xpmmf16q3idxnkahh";
+       sha256 = "10aa697b8b039be06abdfde02afda25cf5b312e1b450d80e71e14d872b8098ee";
        libraryHaskellDepends = [ array base stm transformers ];
        homepage = "http://github.com/ekmett/monadic-arrays/";
        description = "Boxed and unboxed arrays for monad transformers";
@@ -93265,7 +93574,7 @@ self: {
      mkDerivation {
        pname = "monadiccp";
        version = "0.7.6";
-       sha256 = "083ppr53ac85r5ybndngsfwxgalj63giz32aa7wpcm629b9g4lxc";
+       sha256 = "ac53f2d24ac25476f9514a8c1fdf3092aad7b9d3cf36bb7cc90531354abe7720";
        libraryHaskellDepends = [
          base containers mtl parsec pretty random
        ];
@@ -93282,7 +93591,7 @@ self: {
      mkDerivation {
        pname = "monadiccp-gecode";
        version = "0.1.2";
-       sha256 = "1ylyzklcb37khrq8a11fzlyd0sa1nrhpd7cv470m23v7l1hc1wg0";
+       sha256 = "e0f1c060a0670f51c1219b9d7661b64169d03cfd2e04857086f38cc5e8fc9efa";
        libraryHaskellDepends = [ base containers monadiccp mtl ];
        librarySystemDepends = [
          gecodeint gecodekernel gecodesearch gecodeset gecodesupport
@@ -93299,7 +93608,7 @@ self: {
      mkDerivation {
        pname = "monadio-unwrappable";
        version = "0.3";
-       sha256 = "18hbi4vxj9lfcla11b17sb88ysskxavq00zmrjx62cpyzkp85yxh";
+       sha256 = "b0fb82eefcfe3261baccf50380b7ea536b8fd0d227ac1014658e26d937890ba2";
        libraryHaskellDepends = [ base monads-tf transformers ];
        description = "Reversibly allow monad transformer stacks to run in IO";
        license = stdenv.lib.licenses.bsd3;
@@ -93310,7 +93619,7 @@ self: {
      mkDerivation {
        pname = "monadlist";
        version = "0.0.2";
-       sha256 = "1zpxqp5zhcpk4358xqrapvkcfyazpdsdlrw3g14518y2kwnfifq6";
+       sha256 = "06bbe82c9fc2a35048788367da74bb5f79c7e6be2ae38eca20f332f8cbc5fdfe";
        libraryHaskellDepends = [ base ];
        description = "Monadic versions of list functions";
        license = stdenv.lib.licenses.bsd3;
@@ -93321,7 +93630,7 @@ self: {
      mkDerivation {
        pname = "monadloc";
        version = "0.7.1";
-       sha256 = "1a773nysrsj61ka7bdacb0i7dxlgb1fjz3x5w9c1w1dv7rmhynmj";
+       sha256 = "b25a0f6b3ebb051e58e2a58f2f5d588ff67622584cb575d40c46eaacbd1de7a8";
        libraryHaskellDepends = [ base template-haskell transformers ];
        homepage = "http://github.com/pepeiborra/monadloc";
        description = "A class for monads which can keep a monadic call trace";
@@ -93335,7 +93644,7 @@ self: {
      mkDerivation {
        pname = "monadloc-pp";
        version = "0.3.1";
-       sha256 = "0ch25kcz63xhinwd6mjqbhm282hfh280s3z910wnvdp3krgx0mpc";
+       sha256 = "ec56d05f9ee3b66d3908e90f0d90800e0a242a5c5856d3b88db00ff3d92c0232";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -93352,7 +93661,7 @@ self: {
      mkDerivation {
        pname = "monadplus";
        version = "1.4.2";
-       sha256 = "15b5320wdpmdp5slpphnc1x4rhjch3igw245dp2jxbqyvchdavin";
+       sha256 = "366ed520db1eaf2ec56d8508fee2804cc24c7a6016de4b75b9addec681186595";
        libraryHaskellDepends = [ base ];
        description = "Haskell98 partial maps and filters over MonadPlus";
        license = stdenv.lib.licenses.bsd3;
@@ -93363,7 +93672,7 @@ self: {
      mkDerivation {
        pname = "monads-fd";
        version = "0.2.0.0";
-       sha256 = "1iqr5p3va5sxmpvydwqz2src54j5njcyrzn9p5apc60nv7yv6x4c";
+       sha256 = "8c74b3fdd916187655b9c9feec99b44592c2b2161ff3e6f7ad5d17b5c72d19c7";
        libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        description = "Monad classes, using functional dependencies";
@@ -93375,7 +93684,7 @@ self: {
      mkDerivation {
        pname = "monads-tf";
        version = "0.1.0.2";
-       sha256 = "0z07z2lfm3l93fx0qhfd98j76d1rksi5llq67l5v09pm8da4jvyb";
+       sha256 = "cb6f495443f526b00b3d06535aa29e393473244acd410cba1b898eeaa8f8077c";
        libraryHaskellDepends = [ base transformers ];
        description = "Monad classes, using type families";
        license = stdenv.lib.licenses.bsd3;
@@ -93386,7 +93695,7 @@ self: {
      mkDerivation {
        pname = "monadtransform";
        version = "0.0.2";
-       sha256 = "0i586zh6247jfmkw2x27j0aq47yz1c71irj9iwrlx1zrmvzak1yv";
+       sha256 = "db87a9feaef9874e338f49e6180e0bdf1f8215904774c16775f21061e037a844";
        libraryHaskellDepends = [ base transformers ];
        homepage = "https://github.com/tonymorris/monadtransform";
        description = "A type-class for transforming monads (homomorphism) in a transformer";
@@ -93401,7 +93710,7 @@ self: {
      mkDerivation {
        pname = "monarch";
        version = "0.10.0.0";
-       sha256 = "1a47hhlmllrm3k4ssr8rr3bgq1w7i6jpx07nyf0k8k9x5sgi1siv";
+       sha256 = "3bea109f2e3d4d3481f3f6807ea5898707fcd6c81965adc91c35535a298487a8";
        libraryHaskellDepends = [
          base binary bytestring containers lifted-base monad-control mtl
          network pool-conduit stm transformers transformers-base
@@ -93424,14 +93733,14 @@ self: {
      }:
      mkDerivation {
        pname = "mongoDB";
-       version = "2.0.5";
-       sha256 = "09ysw5sp7x8pyfsjj1qgfq3wm8l0cpxkv9g9x117iss04bfk0p3h";
+       version = "2.0.6";
+       sha256 = "d6b7699d98a9349b2711be23fce0c61fbf91b66e4625e937ca1b65c6b6f988c5";
        libraryHaskellDepends = [
          array base binary bson bytestring containers cryptohash hashtables
          lifted-base monad-control mtl network parsec random random-shuffle
          text transformers-base
        ];
-       testHaskellDepends = [ base hspec mtl old-locale time ];
+       testHaskellDepends = [ base hspec mtl old-locale text time ];
        homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = "unknown";
@@ -93444,7 +93753,7 @@ self: {
      mkDerivation {
        pname = "mongodb-queue";
        version = "0.4.0.1";
-       sha256 = "1y3c5ydf7595ai3h6iapc0dmls348vv1jmy4g8n5wfmwzy4li22s";
+       sha256 = "5a884889ffbc3a5e2c7ac45719f64664685a1b6057450347542595e39a2f6cf8";
        libraryHaskellDepends = [
          base data-default lifted-base monad-control mongoDB network text
          transformers
@@ -93468,7 +93777,7 @@ self: {
      mkDerivation {
        pname = "mongrel2-handler";
        version = "0.3.2";
-       sha256 = "1bv9i2b0pb50r7l7l43h26ng5rcs1iyymwndcwxji8dnmbnr4jdf";
+       sha256 = "ae4992edaab6a1283b67cdf2ea7d0c9ae5f2ac1170107ae8c9a0ac0b968869af";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring
          case-insensitive containers http-types text zeromq-haskell
@@ -93484,7 +93793,7 @@ self: {
      mkDerivation {
        pname = "monitor";
        version = "0.1.1";
-       sha256 = "06p9xj5y3xl4hcl57afqz4m4yc2vaah8i6f4smmhwmkzslg7svbs";
+       sha256 = "7a6d7d1ed57f560e6bd5c49988a0525b304f2af9d8a953288384f6e18bece91a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base filepath hinotify process ];
@@ -93497,7 +93806,7 @@ self: {
      mkDerivation {
        pname = "mono-foldable";
        version = "0.1.0.2";
-       sha256 = "1qnbw9pd06czwyj2xcsjdigg7bj8d23p3ljnnkgd3d0r67qxxlxm";
+       sha256 = "b5d3def13119b4d1deb456d271876848aef35e6c52b32ea4e79f19d06ee2cbe2";
        libraryHaskellDepends = [ base bytestring text vector ];
        jailbreak = true;
        homepage = "http://github.com/JohnLato/mono-foldable";
@@ -93515,7 +93824,7 @@ self: {
      mkDerivation {
        pname = "mono-traversable";
        version = "0.9.2.1";
-       sha256 = "1vs2nl3c0gdhaxxh013ri3l9n13yl9nawiynpsyq6zp495xq5hrl";
+       sha256 = "34c3827b49e47e83bdbed647ae6ca27e049be8887904007b57b03dc006b542ef";
        libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups text transformers unordered-containers
@@ -93535,7 +93844,7 @@ self: {
      mkDerivation {
        pname = "monoid-extras";
        version = "0.4.0.1";
-       sha256 = "0jcyjqmk4s64j05qisvibmy87m5xi5n837wsivq7lml8lfyrj7yf";
+       sha256 = "ce1f99bda388567af08e9a9f816c89bdd4837c5d71eb880b90c468322b969e49";
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -93546,7 +93855,7 @@ self: {
      mkDerivation {
        pname = "monoid-owns";
        version = "2010.5.29";
-       sha256 = "1n05f95yhn6jp7rdnlx686k1lsls4iilxdxnp41ds4afsypaclfk";
+       sha256 = "d351a6aed74e11dd02b9b6b74e63249a6a1aa641a653dbf2b9d258e84b7205d8";
        libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://github.com/nfjinjing/monoid-owns";
        description = "a practical monoid implementation";
@@ -93559,7 +93868,7 @@ self: {
      mkDerivation {
        pname = "monoid-record";
        version = "0.1";
-       sha256 = "14xs1nvf0ngx4jvinkhzq3ainhs159zx0396z88y21vvc8kw42i5";
+       sha256 = "250ac227627b07e111fa260dd07f2a41431bd5c01f4e1bb724fd59e0b60dba93";
        libraryHaskellDepends = [ base ];
        description = "Support for modifying record fields of monoidal type";
        license = stdenv.lib.licenses.bsd3;
@@ -93570,7 +93879,7 @@ self: {
      mkDerivation {
        pname = "monoid-statistics";
        version = "0.3.1";
-       sha256 = "0gfdjmx457r580lc40vpg8fkzd8n971b5vam96v6kzssg2cznqy3";
+       sha256 = "c363fb99785aff69b64955edb2c24916b53f1d7a7703c22840259f427a95cd3d";
        libraryHaskellDepends = [ base ];
        homepage = "https://bitbucket.org/Shimuuar/monoid-statistics";
        description = "Monoids for calculation of statistics of sample";
@@ -93584,7 +93893,7 @@ self: {
      mkDerivation {
        pname = "monoid-subclasses";
        version = "0.4.1.2";
-       sha256 = "0j9an1zq3dg02jz8skqkch01kg2ha59zja2729v8lpwxsd4sbi9x";
+       sha256 = "3dc5a549d39d5f8a76124728f9535150bc190064134f8dbe14e0b5817fb02a49";
        libraryHaskellDepends = [
          base bytestring containers primes text vector
        ];
@@ -93602,7 +93911,7 @@ self: {
      mkDerivation {
        pname = "monoid-transformer";
        version = "0.0.3";
-       sha256 = "1f06ppvv50w5pacm4bs89zwkydih626cgbd2z6xqbp8cmhg6dj4l";
+       sha256 = "94c8661eac0cdd85bbf9a2adc78c3030363ff94f482f5299ba8583b2f7bd06b8";
        libraryHaskellDepends = [ base ];
        description = "Monoid counterparts to some ubiquitous monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -93615,7 +93924,7 @@ self: {
      mkDerivation {
        pname = "monoidal-containers";
        version = "0.1.2.2";
-       sha256 = "06yam4ljp4lm2rjaccykg8zx4hnmn0ly3fs24xjm4q45ldz7gwyb";
+       sha256 = "cbf3777ea3856052652742bbe129b0d542d23f7ad333a6641695922b29a9ca1b";
        libraryHaskellDepends = [
          base containers deepseq hashable lens newtype unordered-containers
        ];
@@ -93629,7 +93938,7 @@ self: {
      mkDerivation {
        pname = "monoidplus";
        version = "0.1.0.1";
-       sha256 = "1klgwv3sd9zmqpj157rypln51kcwml9b1fyaxnip0a1525h6c2s9";
+       sha256 = "490b666011252870a3edcabbb012ad9ccd502cbd3e9f12e4c5f5a7a6c7e68fce";
        libraryHaskellDepends = [
          base contravariant semigroups transformers
        ];
@@ -93646,7 +93955,7 @@ self: {
      mkDerivation {
        pname = "monoids";
        version = "0.3.2";
-       sha256 = "0yn15q0569mdm20wdbwydbb1vdzfdh1ismhwplwbvi2989h78kca";
+       sha256 = "8a4d74604249c4bd38bd1c561d036ceeb71dd66a9eafc681a8ad2653002ec17a";
        libraryHaskellDepends = [
          array base bytestring containers fingertree parallel text
        ];
@@ -93662,7 +93971,7 @@ self: {
      mkDerivation {
        pname = "monomorphic";
        version = "0.0.3.3";
-       sha256 = "0x7fig4ms5qqiah4847ghl13s2r1xv2372hj6xrhjw6bdfh85cln";
+       sha256 = "96b282a06bcb70097337128a33c4ee210b3d0285ef1044a08a18175dc98bee74";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/konn/monomorphic";
        description = "Library to convert polymorphic datatypes to/from its monomorphic represetation";
@@ -93678,7 +93987,7 @@ self: {
      mkDerivation {
        pname = "montage";
        version = "0.1.1";
-       sha256 = "1yx2aagfxjgs9jwipbwa05aiqkm1xgxd0gwnc4qj6mwz9913zsl7";
+       sha256 = "87ea3f424a9f57233161963fd0faeba14e1c55018aaf1bb94cfac9ee9e52a2fb";
        libraryHaskellDepends = [
          aeson base bytestring containers ListLike old-locale pool-conduit
          protocol-buffers protocol-buffers-descriptor riak-bump safe
@@ -93702,7 +94011,7 @@ self: {
      mkDerivation {
        pname = "montage-client";
        version = "0.1.1";
-       sha256 = "18bgaw0i7zllabq8ys6p6qd8qga3xgxsfmgn88g4dijh6v6zf7pf";
+       sha256 = "ee1ef7cd3650c6461e42f655a7fbeb433d8c1a36d7688ff05294fe1301576fa1";
        libraryHaskellDepends = [
          aeson base bytestring containers ListLike mtl old-locale
          pool-conduit protocol-buffers protocol-buffers-descriptor riak-bump
@@ -93724,7 +94033,7 @@ self: {
      mkDerivation {
        pname = "monte-carlo";
        version = "0.6.1";
-       sha256 = "1zk8wyf9bzarnvsxh9a6diyssb78sfq1pl729gq113j0vibs8f0x";
+       sha256 = "1d38a457dc408e10f04be2d01bb0d3e82cad7d6c4625d8f5b659fd959ce768fe";
        libraryHaskellDepends = [
          base gsl-random primitive transformers vector
        ];
@@ -93747,7 +94056,7 @@ self: {
      mkDerivation {
        pname = "moo";
        version = "1.0";
-       sha256 = "02ah9v6h4ansd8kz76jnrx0yra9nz6ql92p5rm01pxri1gc7kn6w";
+       sha256 = "dcd879d80b31f71b40cde58a44b1f936a9ec41cf569af3276ada2a02cd4e5009";
        libraryHaskellDepends = [
          array base gray-code mersenne-random-pure64 monad-mersenne-random
          mtl random random-shuffle time
@@ -93769,7 +94078,7 @@ self: {
      mkDerivation {
        pname = "moonshine";
        version = "2.0.0.0";
-       sha256 = "1b8b7h9nk5nzk9q5ysg57q1rain36bxhvx4l7qwidsx30rdfs6qs";
+       sha256 = "1a1bed5a06a3eb16393e94f40dfb32c34695033ee5695f709adf9669133c0bad";
        libraryHaskellDepends = [
          aeson base bytestring canteven-config ekg ekg-core hslogger snap
          text time transformers yaml
@@ -93787,7 +94096,7 @@ self: {
      mkDerivation {
        pname = "morfette";
        version = "0.4.3";
-       sha256 = "149jp0s5nsa02zivlp868qqvvam59wwf6nkq79ynlqjsa4lanvay";
+       sha256 = "5e6dab28515a626a7d3a785ae3384fa5aabd3146065dbae31740695b34b83291";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -93808,7 +94117,7 @@ self: {
      mkDerivation {
        pname = "morfeusz";
        version = "0.4.2";
-       sha256 = "1lzl5ks7px1xibfa6y0wnfv2mk2w39hscrrynqn7a3gjnca00sx0";
+       sha256 = "a06b0014b3f20d752cb63e67a6611a5ccc2ab6b31c78a3dc8a3df47bf42cf4d3";
        libraryHaskellDepends = [
          base bytestring containers directory mtl text
        ];
@@ -93828,7 +94137,7 @@ self: {
      mkDerivation {
        pname = "morte";
        version = "1.2.1";
-       sha256 = "15zvk50qpp3ywkwqgpm4phdcspfszzwipxcf07lnxpk98i7ybc4g";
+       sha256 = "8fb0e54f4469de6ee9018ef51bf9ffda5dcd1abca4de87f9e47edc8b4199fb97";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93851,7 +94160,7 @@ self: {
      mkDerivation {
        pname = "mosaico-lib";
        version = "0.1.1.0";
-       sha256 = "1qcr3l1a422fh5226443dc8p6hvrr9wbhri6mk2pcw7zyfd5xr0b";
+       sha256 = "0be45e9af3ff7076c5ac2666b878ca794373116b83102344814e08a2021d99e1";
        libraryHaskellDepends = [
          base base-unicode-symbols colour diagrams-cairo diagrams-core
          diagrams-gtk diagrams-lib glib gtk JuicyPixels mtl split stm
@@ -93869,7 +94178,7 @@ self: {
      mkDerivation {
        pname = "mount";
        version = "0.2.1";
-       sha256 = "0rdlnz0xk6mil79a8ygfrwgdychsn6h1gbv6qn2nybzaw1zjf4z3";
+       sha256 = "e313277fe0ea2f6f85c566af17a0b11a32df1ecfee79a4d2a1b19ad9c1b7b465";
        libraryHaskellDepends = [ base bytestring ];
        description = "Mounts and umounts filesystems";
        license = "GPL";
@@ -93885,7 +94194,7 @@ self: {
      mkDerivation {
        pname = "mp";
        version = "0.2.2";
-       sha256 = "1klz2ykglgkvxs66j5iacjbx5cv5gq0y4d12g68ng2pcmpwc93ir";
+       sha256 = "398ec4f8adec8a6791792234e2017e65b3d297642a16698cee7b3efaa6179fce";
        revision = "1";
        editedCabalFile = "8c578611352448e5aea9a082fb0696e7bb890397214631a009351925db2f88b1";
        isLibrary = false;
@@ -93906,7 +94215,7 @@ self: {
      mkDerivation {
        pname = "mp3decoder";
        version = "0.0.1";
-       sha256 = "0kwjnbrmlp9a5wz3mgf76nd2ar32d3n1f4jmbfpsggcm7jdp1rmv";
+       sha256 = "bbe6709b3c95bda7af5b551217ec686264259a35c7bd3a3e2f2a5d5af3b2924f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -93923,7 +94232,7 @@ self: {
      mkDerivation {
        pname = "mpdmate";
        version = "0.1";
-       sha256 = "02p6g8wgmmzxl3dnrvbj1msg972c40s300rfykqsg1g5wiqbllf2";
+       sha256 = "c251ba70e4e585a7f1f42e033034204c9cf4740d72ed6cdba0fdd7fa387ae60a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -93940,7 +94249,7 @@ self: {
      mkDerivation {
        pname = "mpppc";
        version = "0.1.3";
-       sha256 = "1zcilskpslpqyrbwpabwbry4p3kpcfca94wchh9dkq9g8pg8laxi";
+       sha256 = "b12b8ade452fe1d912848c93a49863778e4b7c5e7ca9cb57f6f8527da7a691fd";
        libraryHaskellDepends = [
          ansi-terminal base bytestring split text
        ];
@@ -93957,7 +94266,7 @@ self: {
      mkDerivation {
        pname = "mpretty";
        version = "0.1.0.0";
-       sha256 = "0q4fi7jmdf3bvcqk6fc7194h59sjwf76ld8niwqczc30v8lyjq2n";
+       sha256 = "5660e929da60b0cf308f16356a8ee352a702490a87393331db6bb856e5898e60";
        libraryHaskellDepends = [
          ansi-terminal base containers data-lens-fd data-lens-template mtl
          orders text transformers
@@ -93975,7 +94284,7 @@ self: {
      mkDerivation {
        pname = "mprover";
        version = "0.0.0.0";
-       sha256 = "1b5vzhbn5jnpxc0bzbhdak51qhzv5hif0300jsrbi5ffyvcjqkss";
+       sha256 = "5a4f2cd9f6ce95b8b296000ce0222cfb431cca540daebf00ebd7ca6217fcbbac";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -93994,7 +94303,7 @@ self: {
      mkDerivation {
        pname = "mps";
        version = "2010.11.28";
-       sha256 = "1xhflvgwrjzj7qb69dn149lh32c7q9161zrzfs07ncs233y0w4lg";
+       sha256 = "8f120efc1842337b80763fff6042c28789016922c1b664163ef2cbccdfa60ef6";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath monoid-owns
          old-locale old-time parallel parsec regexpr template-haskell time
@@ -94013,7 +94322,7 @@ self: {
      mkDerivation {
        pname = "mpvguihs";
        version = "0.1.1";
-       sha256 = "1nmc03s8h3khmvajyhwaniczq0r4wrinq2sjjp1c6gyc2nggxzyx";
+       sha256 = "ddfffe9e15cc3fc3c295520b6c63e62403fc59b48a432fd5ae700e88f400acda";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -94033,7 +94342,7 @@ self: {
      mkDerivation {
        pname = "mqtt-hs";
        version = "0.2.0";
-       sha256 = "0jvzr6qbmdxl11j8fwnbasgqgdfm395lm2gh2va9zfpk5xpx0mjg";
+       sha256 = "4f56d06f2ff3ba9fd416f0894a4b1ad5b5879f56cb72876408b4b7bab0c97f4b";
        revision = "1";
        editedCabalFile = "aa0a2e9ea99cfbed4646ac02625b66361f8175ae2d70efc041dc517119706439";
        libraryHaskellDepends = [
@@ -94054,7 +94363,7 @@ self: {
      mkDerivation {
        pname = "ms";
        version = "0.2.1";
-       sha256 = "0h70dkgzybbjm48ay9xqbvydf13a6q1zy99ln8kx4qlfdi4gsrnp";
+       sha256 = "d766fd486c8e62d227b23425ff03366a04d7fc5eb827af10a9722dffdf6ce040";
        libraryHaskellDepends = [
          base contravariant edit-distance lens profunctors semigroupoids
          semigroups vector
@@ -94076,7 +94385,7 @@ self: {
      mkDerivation {
        pname = "msgpack";
        version = "1.0.0";
-       sha256 = "0kk6nqn290sh0l0hhglccs0cqgk0fb3xdjzqz19yw9wb8aw01xh8";
+       sha256 = "08f600b8428b27ee53f8f8cbd6c772603ecc80668c3e0801055083242cb6664e";
        libraryHaskellDepends = [
          base binary blaze-builder bytestring containers data-binary-ieee754
          deepseq hashable mtl text unordered-containers vector
@@ -94097,7 +94406,7 @@ self: {
      mkDerivation {
        pname = "msgpack-aeson";
        version = "0.1.0.0";
-       sha256 = "1ygnki55cj6951y75snc4gnv4vsjp9pgwqg3jp7cy9bcss3msq3j";
+       sha256 = "72605d87d66c25cfce95e361fe6eba526fb2ed23ccea727c28c948564a9cf6f9";
        libraryHaskellDepends = [
          aeson base bytestring deepseq msgpack scientific text
          unordered-containers vector
@@ -94116,7 +94425,7 @@ self: {
      mkDerivation {
        pname = "msgpack-idl";
        version = "0.2.1";
-       sha256 = "0z28qikcfvfkj9xr87g13jlm2blqfxj3rfrg7hm2hfgv3qz4gkfz";
+       sha256 = "dfcd473e1efb39282a3c2fbb3c6477982e51a91ce11d947b92d36dc766c4487c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -94140,7 +94449,7 @@ self: {
      mkDerivation {
        pname = "msgpack-rpc";
        version = "1.0.0";
-       sha256 = "00m5hpj5cd521j3jzsaw49asbpxvka0x1zi2qs26si82wxgnpjkn";
+       sha256 = "76ca6b5fe702456d84c622fed0819abbdfa555225ce92f870ca23456e485a502";
        libraryHaskellDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
          exceptions monad-control msgpack mtl network random text
@@ -94156,7 +94465,7 @@ self: {
      mkDerivation {
        pname = "msi-kb-backlit";
        version = "0.1.0.1";
-       sha256 = "1lq1a13h74dkhmh6mkg9mzksvzc2mjb8ynsbs9856z7079ifsdw4";
+       sha256 = "8437ed623ae07c5350d24b5b8f96ac82fdade7afe9cd6a6085b39103475001d3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring hid split ];
@@ -94169,7 +94478,7 @@ self: {
      mkDerivation {
        pname = "mstate";
        version = "0.2.7";
-       sha256 = "05rcpfang0biy16aglf6da44zp9zqy2x0zdsfl75mv1drkky6225";
+       sha256 = "4508e3e7cc2dec5a0e75ba7dd085c73fdd4f886ac6d1a74cf071816795bb2c17";
        libraryHaskellDepends = [ base monad-peel mtl stm ];
        description = "MState: A consistent State monad for concurrent applications";
        license = stdenv.lib.licenses.bsd3;
@@ -94182,7 +94491,7 @@ self: {
      mkDerivation {
        pname = "msu";
        version = "0.0.2";
-       sha256 = "0bqzzk7y3dj60r02xn3cjlq955jzsrvcbq63pvav0w952bvxvx5c";
+       sha256 = "acf4ddf7122571b0d5bec3e0c576d65f969230956cd82e400646b6e1cffc1f2f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -94203,7 +94512,7 @@ self: {
      mkDerivation {
        pname = "mtgoxapi";
        version = "0.5.0.2";
-       sha256 = "1iyn2mq0fql952phmbs8578awrv5l6q9iqkmsaby2jp48mnwizji";
+       sha256 = "51fec86d45e44ae197d275e298b0a16567aed02948af0aaf288962077015d6c7";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring curl either errors hashable HTTP ixset network SHA text
@@ -94226,7 +94535,7 @@ self: {
      mkDerivation {
        pname = "mtl";
        version = "2.1.3.1";
-       sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp";
+       sha256 = "77af766957fb49361fe63446f272a698bddb13398669edc363022e5c2517f6f6";
        libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/mtl";
@@ -94239,7 +94548,7 @@ self: {
      mkDerivation {
        pname = "mtl";
        version = "2.2.1";
-       sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa";
+       sha256 = "cae59d79f3a16f8e9f3c9adc1010c7c6cdddc73e8a97ff4305f6439d855c8dc5";
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/ekmett/mtl";
        description = "Monad classes, using functional dependencies";
@@ -94251,7 +94560,7 @@ self: {
      mkDerivation {
        pname = "mtl-c";
        version = "0.1";
-       sha256 = "0n91jh07v87j2rbilyrip3inixb9a95i2j61g5hz42kiq5wj71gb";
+       sha256 = "eb852379c1710af26179c148114b5269f568e3b8317b1a5716f2a07d00942159";
        libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/fumieval/mtl-c";
        description = "Very strict CPS'd transformers";
@@ -94263,7 +94572,7 @@ self: {
      mkDerivation {
        pname = "mtl-compat";
        version = "0.2.1.3";
-       sha256 = "15388p9ybdn6digk6cpdsw6havd0yva8vvwl3p7fnc9sb59wln34";
+       sha256 = "6458ca53593a31ebce1d94ef8dd4f6a06d050dd7ed32335f6cc6b6e5d3456894";
        revision = "1";
        editedCabalFile = "b4d1feef302a6fe59e77e822e61261eeaec449a6b56560ea8429bb1bc7dbccc6";
        libraryHaskellDepends = [ base mtl ];
@@ -94279,7 +94588,7 @@ self: {
      mkDerivation {
        pname = "mtl-evil-instances";
        version = "0.1";
-       sha256 = "1z10p0dmvjyadjc46nkzyqicfk0097ff2ni3fiypw9z5knsxhym4";
+       sha256 = "a47ad8b59de5277e7d74235ae1dc49004cc722f67f5a43986ccacb5d1bb820fc";
        libraryHaskellDepends = [
          base monad-control mtl transformers transformers-base
        ];
@@ -94293,7 +94602,7 @@ self: {
      mkDerivation {
        pname = "mtl-prelude";
        version = "1.0.3";
-       sha256 = "1qr0bwcg9rlj53gbnji969s86qh8laaiibkfy2msziqnp011108x";
+       sha256 = "1d811002b816c7afabf06eae1895a20862837432294abbde2892e6f4185f20e3";
        libraryHaskellDepends = [ base mtl transformers ];
        homepage = "https://github.com/nikita-volkov/mtl-prelude";
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
@@ -94305,7 +94614,7 @@ self: {
      mkDerivation {
        pname = "mtl-prelude";
        version = "2.0.2";
-       sha256 = "1j42pdkiiqjkdmidgmgpfbwh2i8dwsc40labw4pm86qzsi0r8m2v";
+       sha256 = "5b549441d41f1b542fe14b514098e60d4501f972f7d5d7626d53e21867bb82c8";
        libraryHaskellDepends = [ base mtl transformers ];
        homepage = "https://github.com/nikita-volkov/mtl-prelude";
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
@@ -94317,7 +94626,7 @@ self: {
      mkDerivation {
        pname = "mtl-tf";
        version = "0.1";
-       sha256 = "0qfmswdkj95bh6wkic8hh002wsxqlrylw45k6w9iyzv4saqnl22f";
+       sha256 = "4e086ab1d2647f1f1337b3104e7da6b86b2e008010b138b981ab24391bd7d561";
        libraryHaskellDepends = [ base ];
        description = "Monad transformer library using type families";
        license = stdenv.lib.licenses.bsd3;
@@ -94331,7 +94640,7 @@ self: {
      mkDerivation {
        pname = "mtl-unleashed";
        version = "0.3.1";
-       sha256 = "04kbm0lxfwv34991384blz8a4qjwl32jv0d3x6rvgpjlidphfi2l";
+       sha256 = "5444076f8b54deb7b3e9a3812dc5a05c62a2d0a78ba01152226373d729a86b12";
        libraryHaskellDepends = [
          base contravariant lens mtl profunctors tagged
        ];
@@ -94348,7 +94657,7 @@ self: {
      mkDerivation {
        pname = "mtlparse";
        version = "0.1.4.0";
-       sha256 = "1fl5rvmgk37bqgjzs3c2wh80pfhr0i4yakxbsaryg7piws7j6ygc";
+       sha256 = "ec79238fe6f19ee7b3d2ab4fe5490419ba0b10e4820dfde5c3eb8cf9eace85ba";
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://homepage3.nifty.com/salamander/second/projects/mtlparse/";
        description = "parse library using mtl package";
@@ -94360,7 +94669,7 @@ self: {
      mkDerivation {
        pname = "mtlx";
        version = "0.1.6";
-       sha256 = "0s0cniqn1fb7rq14w3wjh7mkzkxpndj1h1wrgssxds6cs3vkk4dn";
+       sha256 = "b69139f7d0cce8d6b57e99071864b3b7cf3feb81920f4e02ce67b96071b40c68";
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Monad transformer library with type indexes, providing 'free' copies";
        license = stdenv.lib.licenses.bsd3;
@@ -94372,7 +94681,7 @@ self: {
      mkDerivation {
        pname = "mtp";
        version = "0.1.1.1";
-       sha256 = "164q7p81c5an4w3pqpfk94rgn0banfs2yp7fhbbckdyb2qymsbww";
+       sha256 = "9c2f5d3d16cbb7c9d682ee5c2fb4b36a01fb3249d35d7c0727561516d03d9898";
        libraryHaskellDepends = [ base filepath unix ];
        librarySystemDepends = [ mtp ];
        jailbreak = true;
@@ -94386,7 +94695,7 @@ self: {
      mkDerivation {
        pname = "mtree";
        version = "0.1";
-       sha256 = "1l4kjrmr5v8pkhf48w0ym6dlrsvaf21p3x5sykq1rxwp821cqglv";
+       sha256 = "9b3ecc824097f71cf0f4baf47183706aeb4c9ba91e70441c9c17ed926b9693d0";
        libraryHaskellDepends = [ base bifunctors ];
        description = "Tree with Meta and Content parameters";
        license = stdenv.lib.licenses.publicDomain;
@@ -94397,7 +94706,7 @@ self: {
      mkDerivation {
        pname = "mucipher";
        version = "0.6.0";
-       sha256 = "0bmdri4bni9whjgz4mxvkk9jbxkscci38l06gk2n5xiwyg1hwg0y";
+       sha256 = "1e3c0ec3f33cf662c57c06503422637af625d39cbb57f29f843c45bb48ccad2e";
        libraryHaskellDepends = [ base ];
        description = "A library to produce simple ciphers for use with lambdabot";
        license = "GPL";
@@ -94411,7 +94720,7 @@ self: {
      mkDerivation {
        pname = "mudbath";
        version = "0.0.3";
-       sha256 = "1bfsgsl09aajxa8ajps63zj348ccr8pswppj0dar5k8mr6nr6n3q";
+       sha256 = "785893adc915cd925503f25eae2fca8c2132e41f465fa990ea52a904a87edaad";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -94431,7 +94740,7 @@ self: {
      mkDerivation {
        pname = "muesli";
        version = "0.1.1.0";
-       sha256 = "0cysqy3g9zgvbzj9gnwlpqk63inkm26dvhhqx8qlzp1lan6f125w";
+       sha256 = "bc88e08c5534dc4f31ea18c2dd8ca8d3c66126be94db97e45ffbfdf486c7da33";
        libraryHaskellDepends = [
          base bytestring cereal containers directory filepath hashable mtl
          psqueues time
@@ -94449,7 +94758,7 @@ self: {
      mkDerivation {
        pname = "mueval";
        version = "0.9.1.1.2";
-       sha256 = "1h8a0lfbpgx9pjsmb0yld4n12z2nia5kkikjq1qqzk4m8rsknk70";
+       sha256 = "e04c3b754695cc8f71c072c6398b8a567c112c69d48355b5bca9bfbb1c050ac1";
        revision = "1";
        editedCabalFile = "5c6cf1e221928e15536f1dfa46942293acf7b470a442c619ef66529b78c59596";
        isLibrary = true;
@@ -94469,7 +94778,7 @@ self: {
      mkDerivation {
        pname = "multext-east-msd";
        version = "0.1.0.4";
-       sha256 = "1if1ip22y7w59lkyshn4ic4p46zrfs4kcdzzjai9l8xbscavgdl6";
+       sha256 = "86b6b715d3ab239aa292ff37368976f91b72098bc442ed274d851f2fc48dc1c5";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/jsnajder/multex-east-msd";
@@ -94484,7 +94793,7 @@ self: {
      mkDerivation {
        pname = "multi-cabal";
        version = "0.1.0.0";
-       sha256 = "0qzphh4pmrdqanv9sjy0ipf3z775xvrvdyagd0291vv1mqkbbz3g";
+       sha256 = "6ffcb526ae61ef9004684ff9b6f3eee59c3fdc8dc04b9db655b8e57a0984f763";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base filepath mtl ];
@@ -94506,7 +94815,7 @@ self: {
      mkDerivation {
        pname = "multiarg";
        version = "0.30.0.8";
-       sha256 = "18lq0q76a4vx5r28wrxwa3cb2gdx6hv8vylkky07dqccqgxdg5ss";
+       sha256 = "5a97d7fac38ce176809f93fa8d3634bd3db1d850bc678e442e7d13650e0698a2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -94526,7 +94835,7 @@ self: {
      mkDerivation {
        pname = "multifocal";
        version = "0.0.1";
-       sha256 = "0w47ffx8f8hw2a35kxjwi16l9bfgc0k2ac7r844123anmgv2wcfm";
+       sha256 = "d5312ef6ab560d110841f930252660cfad444d885cf65986121c2287ba738770";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -94552,7 +94861,7 @@ self: {
      mkDerivation {
        pname = "multihash";
        version = "0.1.1";
-       sha256 = "09yjr7whddn60kyn25hzjjls1m5xi87nqzbkrb6vp4hlvmzm0b1g";
+       sha256 = "2f2c507fdd1492bbcdca737d6c0f8abdd4a0a9941f1661fd04c6b606f9c9d227";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -94574,7 +94883,7 @@ self: {
      mkDerivation {
        pname = "multimap";
        version = "1.2.1";
-       sha256 = "0d3l5q4yvmywl6i9ip96zz0fvhjdh00mfbbniphbjxsi8wlwack3";
+       sha256 = "6332c529475177b9e08d762d5701804dc2edc0ff26dd98a2a1dcd7ed092e7434";
        libraryHaskellDepends = [ base containers ];
        homepage = "http://hub.darcs.net/scravy/multimap";
        description = "A multimap";
@@ -94586,7 +94895,7 @@ self: {
      mkDerivation {
        pname = "multipart";
        version = "0.1.2";
-       sha256 = "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5";
+       sha256 = "e543fb307beb14fc366171d7767a6a18244bacf78db295d8d161c5c03d94043c";
        libraryHaskellDepends = [ base bytestring parsec ];
        homepage = "http://www.github.com/silkapp/multipart";
        description = "HTTP multipart split out of the cgi package";
@@ -94600,7 +94909,7 @@ self: {
      mkDerivation {
        pname = "multipart-names";
        version = "0.0.1";
-       sha256 = "17cw9lg1qi3rm38yh13n6gkb0grld4gc003hz49vdz8bx4gzfqxc";
+       sha256 = "ac63f71fe90bfdb613f97000c01e69343fb0e6337604e8d1a879441c1e4d9c9d";
        libraryHaskellDepends = [ base case-insensitive lens parsec ];
        testHaskellDepends = [
          base HUnit lens test-framework test-framework-hunit
@@ -94617,7 +94926,7 @@ self: {
      mkDerivation {
        pname = "multipass";
        version = "0.1.0.2";
-       sha256 = "0zs5sw9m5r8g9p29knrihqsvihwihr1ca28vb0283k5jik18aifm";
+       sha256 = "d54585c28cb2cc8104581b09c5428691c3b8358631db99c44d0fe55213d7457f";
        libraryHaskellDepends = [
          base binary containers ghc-prim hashable keys math-functions
          newtype unordered-containers
@@ -94634,7 +94943,7 @@ self: {
      mkDerivation {
        pname = "multiplate";
        version = "0.0.2";
-       sha256 = "02pqfkdcv4fn0pmxphg19b3fiazn4hpphfj8xgp77vpy2lczndsw";
+       sha256 = "5c37fb1915feee73eeeb483a782f24f6abe8c64ae1c1dbeb05d691cdda74f80a";
        libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Multiplate";
@@ -94647,7 +94956,7 @@ self: {
      mkDerivation {
        pname = "multiplate-simplified";
        version = "0.0.0.2";
-       sha256 = "0xzjl3nsm6wgbqd6rjn0bf9jhiw6l6ql5gj5m8xqccv8363i5v2r";
+       sha256 = "59ec1287196833863baa45be42b1a1864728935bc0ca6c1a5e8f9baaeda0f277";
        libraryHaskellDepends = [ base multiplate transformers ];
        jailbreak = true;
        description = "Shorter, more generic functions for Multiplate";
@@ -94660,7 +94969,7 @@ self: {
      mkDerivation {
        pname = "multiplicity";
        version = "0.1.0";
-       sha256 = "1y0v06qnpna8sa0aw24i4s29yc49m3a7d8yrl6xiv1jrgycjcafc";
+       sha256 = "cc2926997f59861dbba1d9a376d4a889309f84269108ae80d248d96bb1011bf8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -94676,7 +94985,7 @@ self: {
      mkDerivation {
        pname = "multirec";
        version = "0.7.5";
-       sha256 = "164a0rbka606d7d0l2p11j0zry0dlwkymig10wrkvckj7mh5yydz";
+       sha256 = "bf795f603d72b23d3307e1c5ea27a70df8fc810ce10a0ada6906183557068a98";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
        description = "Generic programming for families of recursive datatypes";
@@ -94690,7 +94999,7 @@ self: {
      mkDerivation {
        pname = "multirec-alt-deriver";
        version = "0.1.3";
-       sha256 = "0hrzrzmgj1y784dvwiz20y842m4kk9rd9vhbwz8cazafs8gindfc";
+       sha256 = "cc351b1fd24e7dc5d0e70beed4729a9354419007e247be1b41c707f9eacf3f43";
        libraryHaskellDepends = [
          base containers mtl multirec syb template-haskell th-expand-syns
        ];
@@ -94705,7 +95014,7 @@ self: {
      mkDerivation {
        pname = "multirec-binary";
        version = "0.0.1";
-       sha256 = "1cj1rfjqxwc06vr5w12fqbcpjb0fjsphf8vp40sp2naizpvvnmzs";
+       sha256 = "fa57bbf7fd5159713520772307af960e2c79d9c24e045ef23680f18ea5cb41b2";
        libraryHaskellDepends = [ base binary multirec ];
        jailbreak = true;
        description = "Generic Data.Binary instances using MultiRec.";
@@ -94718,7 +95027,7 @@ self: {
      mkDerivation {
        pname = "multiset";
        version = "0.3.0";
-       sha256 = "0wpc2v55q6gwn70nlk2x5xd4dk9a8aw2ivl1gr0xhdp1dnn5dhcb";
+       sha256 = "8bc156ac6de136d8417e81ee28b8422acd465a2f5d4c6ac1b1fc195cca16ec72";
        libraryHaskellDepends = [ base containers ];
        description = "The Data.MultiSet container type";
        license = stdenv.lib.licenses.bsd3;
@@ -94729,7 +95038,7 @@ self: {
      mkDerivation {
        pname = "multiset-comb";
        version = "0.2.4";
-       sha256 = "0j7vxm67aws7dzlmdkvx2aja888jp22qdzz8hgmhvbpcr4p7lz99";
+       sha256 = "297d7a2ec9ecae0deb83e8ff8685b81221a4a4127dcf56e96f4773754cedfb48";
        revision = "1";
        editedCabalFile = "b6ecbed315e0578b665644b8a73ed1e348968e5a93bb1d491fb5a6faf79d7545";
        libraryHaskellDepends = [ base containers transformers ];
@@ -94742,7 +95051,7 @@ self: {
      mkDerivation {
        pname = "multisetrewrite";
        version = "0.6";
-       sha256 = "1chgdikgp70rkzw2k3wy7i276j5vb435vq26yl37lkh0im1bg5ay";
+       sha256 = "5e95b7428d004e7a06f546e05d0659bb4873443c9e8f29f89f199cfb666c0fb2";
        libraryHaskellDepends = [ base haskell98 stm ];
        homepage = "http://sulzmann.blogspot.com/2008/10/multi-set-rewrite-rules-with-guards-and.html";
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
@@ -94755,7 +95064,7 @@ self: {
      mkDerivation {
        pname = "multistate";
        version = "0.6.2.0";
-       sha256 = "0s8x0gb332724sd3vcp5yimxpbf85kvg327lg3bb77jvy6cfdzvj";
+       sha256 = "72ffe698f15b9eb3d678f488f1f62cc8addb6bf4e5b23d9a26e28831d6031d69";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl tagged transformers ];
@@ -94773,7 +95082,7 @@ self: {
      mkDerivation {
        pname = "muon";
        version = "0.1.0.8";
-       sha256 = "0s11xvhawwrcr31f0khp0q6fimwjps12n992z35ldnh0kk3dmk9z";
+       sha256 = "3fcddac69c00da46cbf822252b82be92d7e80c06174ee0c2c82c73aee0ee2168";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -94793,7 +95102,7 @@ self: {
      mkDerivation {
        pname = "murder";
        version = "1.3.4";
-       sha256 = "0pr77j3br8knk26iknsa6hy076bx2bb6jgii3v6aqhv40ykcrv15";
+       sha256 = "25eccca6076443accc1e313e69d6127d99033c344adb198d9876a2bc863c275f";
        libraryHaskellDepends = [
          AspectAG base containers HList ListLike template-haskell TTTAS
          uu-parsinglib uulib
@@ -94810,7 +95119,7 @@ self: {
      mkDerivation {
        pname = "murmur-hash";
        version = "0.1.0.8";
-       sha256 = "01isk1gy1x75zksdmddcpp7mnx69wb96g1xv8gl3anvx9bfg9fbc";
+       sha256 = "6cb9f4dc4a7d5b35e843bb8767d2e2c9745bcfbdacb5daf4fce5f4e05f983a06";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/nominolo/murmur-hash";
        description = "MurmurHash2 implementation for Haskell";
@@ -94825,7 +95134,7 @@ self: {
      mkDerivation {
        pname = "murmur3";
        version = "1.0.0";
-       sha256 = "1rdnfy37dmmrqpapdv9h22ki94mxrz1xdk5ibcj833q35868kjmq";
+       sha256 = "b8ca890c2a038f81245bb1ccd6c3cfbd9214a71030ed76d5c5b9d6768677b6e5";
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring HUnit QuickCheck test-framework
@@ -94841,7 +95150,7 @@ self: {
      mkDerivation {
        pname = "murmurhash3";
        version = "1.0";
-       sha256 = "1hz6rf1qrzgixx19bn9hnp07jfb61wnrjq5bgqnd3px569afwdb2";
+       sha256 = "6235ee5432a5dfd12c7eab60992d0f663979c0b530d99542eff1fd8c83cbe6c3";
        libraryHaskellDepends = [ haskell2010 ];
        homepage = "https://github.com/niswegmann/murmurhash3";
        description = "32-bit non-cryptographic hashing";
@@ -94854,7 +95163,7 @@ self: {
      mkDerivation {
        pname = "music-articulation";
        version = "1.9.0";
-       sha256 = "0cxbhk25kn3hpkmb6h0brcf03yyi6kaz3i3l3lv2rzgfxv14a2pg";
+       sha256 = "ef0a45c2eeeefd2c361d74c4f1d534d1fb011ccb0b40b3eabc70d859c484ab33";
        libraryHaskellDepends = [ average base semigroups ];
        description = "Abstract representation of musical articulation";
        license = stdenv.lib.licenses.bsd3;
@@ -94865,7 +95174,7 @@ self: {
      mkDerivation {
        pname = "music-diatonic";
        version = "0.1.1";
-       sha256 = "19sflj0b5qslclqjwyacgc2pdplwr3mimmhf8ka7bbs70r557wbs";
+       sha256 = "7af1534a0647af75d4440ed61aebc89cde76057b4c792e316554e3b280a44ea7";
        libraryHaskellDepends = [ base ];
        description = "Implementation of basic western musical theory objects";
        license = stdenv.lib.licenses.bsd3;
@@ -94877,7 +95186,7 @@ self: {
      mkDerivation {
        pname = "music-dynamics";
        version = "1.9.0";
-       sha256 = "12a11qrdy4p0bczpg2zp8yqw4wdmgfhq5z9ffajlsib2xcs6y8s4";
+       sha256 = "44236f34eb62454da5722efd82a17bb571c2b147f78b773f5be012df320e4189";
        libraryHaskellDepends = [
          average base music-dynamics-literal semigroups
        ];
@@ -94890,7 +95199,7 @@ self: {
      mkDerivation {
        pname = "music-dynamics-literal";
        version = "1.9.0";
-       sha256 = "19bql45aqjfkhvpkfbvfcsc8p1mzg93n966r1yv5rwps6s2x86d5";
+       sha256 = "a519d48536faf25cb60fd99864477abf868b98666e2f37ef86d349ac0aa178a5";
        libraryHaskellDepends = [ base semigroups ];
        description = "Overloaded dynamics literals";
        license = stdenv.lib.licenses.bsd3;
@@ -94903,7 +95212,7 @@ self: {
      mkDerivation {
        pname = "music-graphics";
        version = "1.8.1";
-       sha256 = "1764qmb8pafddsclr5gl5ibqpi9wvwa96idn6iqx8d3jbpqc4fam";
+       sha256 = "5539c2f05d7234d47134b6459314df3cc58b572cf4954c996ecda98b56c5c49c";
        libraryHaskellDepends = [
          aeson base blaze-svg bytestring lens music-pitch music-preludes
          music-score process
@@ -94923,7 +95232,7 @@ self: {
      mkDerivation {
        pname = "music-parts";
        version = "1.9.0";
-       sha256 = "1kiz968kcwcyczxg5gl40c7bwgkn86l7qi0ak8p68bm4rmsw9id4";
+       sha256 = "a4c5c475cda42e642e9a0a447ca841763ebe0e0384bef2fa679e713691493fce";
        libraryHaskellDepends = [
          adjunctions aeson base bytestring cassava containers data-default
          lens monadplus music-dynamics music-pitch roman-numerals semigroups
@@ -94942,7 +95251,7 @@ self: {
      mkDerivation {
        pname = "music-pitch";
        version = "1.9.0";
-       sha256 = "1w5b62il0n8147a3sdvx9ndykfp56nf0kabwpw8khd29cmpff0bz";
+       sha256 = "7f01e76e6549343811bf7ca9099c35e5bae99b4d7d373dd421015940a330abf0";
        libraryHaskellDepends = [
          aeson base containers data-interval lens music-pitch-literal nats
          positive semigroups type-unary vector-space vector-space-points
@@ -94956,7 +95265,7 @@ self: {
      mkDerivation {
        pname = "music-pitch-literal";
        version = "1.9.0";
-       sha256 = "0vsvw7c29qvi69z9gy2zzq9bpajmjd5vs1kll7jw0qbsh28jsqql";
+       sha256 = "14632d91807a61c0e5a17406bd4b9355aabb12fe5ff8977e3271e324d8e15b6f";
        libraryHaskellDepends = [ base semigroups ];
        description = "Overloaded pitch literals";
        license = stdenv.lib.licenses.bsd3;
@@ -94973,7 +95282,7 @@ self: {
      mkDerivation {
        pname = "music-preludes";
        version = "1.9.0";
-       sha256 = "1fqw3rz0zrwa5a0l639b0bd6qxiq4zmqcrf0vkrgh03n65r2901q";
+       sha256 = "38802472317600f8f2dcc06586eb2738766cda022b0d43812a8ae70f7e1e1cbb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95001,7 +95310,7 @@ self: {
      mkDerivation {
        pname = "music-score";
        version = "1.9.0";
-       sha256 = "10cysii04njrjd0qx14fwsjn91ycvfxcs3kvwnb8j24v3svcha10";
+       sha256 = "2028c8b61e9b088996e57b0ecdbadbcc8764a5e68e848e4193595a0262d49e81";
        libraryHaskellDepends = [
          adjunctions aeson average base base-orphans bifunctors colour
          comonad containers contravariant distributive HCodecs lens lilypond
@@ -95024,7 +95333,7 @@ self: {
      mkDerivation {
        pname = "music-sibelius";
        version = "1.9.0";
-       sha256 = "1yahz8z81ggcg303i2syzf6bsxq8dmzzzqs3fj89r5kq766275kz";
+       sha256 = "7f96238c3978969c907443e3ff7f6d0877bd8cfb5e8b38c078ecbd803efa50f9";
        libraryHaskellDepends = [
          aeson base bytestring lens monadplus music-articulation
          music-dynamics music-parts music-pitch music-pitch-literal
@@ -95043,7 +95352,7 @@ self: {
      mkDerivation {
        pname = "music-suite";
        version = "1.9.0";
-       sha256 = "1nss12cad2vjq2whz5kxsr1r63iwc4pnza0nnf2h2zai3gxzsnn6";
+       sha256 = "c65afdfb1b517d0185b316a86f2f613c0e9343d67d960fb9c0728ba698085adb";
        libraryHaskellDepends = [
          abcnotation lilypond music-articulation music-dynamics
          music-dynamics-literal music-parts music-pitch music-pitch-literal
@@ -95061,7 +95370,7 @@ self: {
      mkDerivation {
        pname = "music-util";
        version = "0.17";
-       sha256 = "0pv6mwdrk2kz3lr8r3jkc368zch46w4rn5dmqbjqm0ykfw1n3bqf";
+       sha256 = "0eaf610377d3838ae5c2b5159b093704b28fcc60538e8c321d7f8a991baf665f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -95083,7 +95392,7 @@ self: {
      mkDerivation {
        pname = "musicbrainz-email";
        version = "1.0.0.0";
-       sha256 = "10salrdl4vfdy3x26564i8kdv6lx8py697v5n8q9ywqsd05dcrv2";
+       sha256 = "6267d60a681a739f30b2659f64fc459d9add268ac41423faf0cd6d425ba64a83";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95114,7 +95423,7 @@ self: {
      mkDerivation {
        pname = "musicxml";
        version = "0.1.2";
-       sha256 = "0sn8gzymf6xpdksd7v2xyb4y2iks2l09hyw0rch109lgrnsy5gp8";
+       sha256 = "e8bee2b5cd8f261020cb807b9800157a46e1c9f25decd3f46cb71b57fd7fc86a";
        libraryHaskellDepends = [
          base containers directory HaXml old-time pretty
        ];
@@ -95133,7 +95442,7 @@ self: {
      mkDerivation {
        pname = "musicxml2";
        version = "1.9.0";
-       sha256 = "07axlifkqf0dcqnxfb62x829ygc2y7didsh60x081zw429853fy8";
+       sha256 = "c8bb51501284ff80400706ea16dbf1823d9f04eac22cd72d660d383c5da45d1d";
        libraryHaskellDepends = [
          base data-default music-dynamics-literal music-pitch-literal nats
          reverse-apply semigroups type-unary xml
@@ -95150,7 +95459,7 @@ self: {
      mkDerivation {
        pname = "mustache-haskell";
        version = "0.1.0.5";
-       sha256 = "0mkj5ngcblm949wkxiq2qck3zak93r5zipppwgis59yg01cp79v2";
+       sha256 = "62a7735900cfa7a2e3e3f7def84b1e69aa3f26c302c73e7922a9d2c59e2d7256";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95175,7 +95484,7 @@ self: {
      mkDerivation {
        pname = "mustache2hs";
        version = "0.3";
-       sha256 = "1m15q6dy3hbbf5q302gw3y2znxf2mfz9pwbdyawg8bqiw81zahis";
+       sha256 = "3a42f503e2112ff4b8f26df19bbeabc275fb851ffc093070716bc1e19bc125d4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -95195,7 +95504,7 @@ self: {
      mkDerivation {
        pname = "mutable-containers";
        version = "0.3.0";
-       sha256 = "1xsz214z5z1qrl5xy5gyq97bsh8b1li3kaz7cp6zm955bz43rv6c";
+       sha256 = "ccec3cc85fa5a4facd65e7ab39220d0b41bd4ec2fe15df0bcd38fcf249105ff7";
        libraryHaskellDepends = [
          base containers ghc-prim mono-traversable primitive vector
        ];
@@ -95214,7 +95523,7 @@ self: {
      mkDerivation {
        pname = "mutable-iter";
        version = "0.6.1";
-       sha256 = "08fqfkzb6b0pzzffkfcwigcm0s4hgadh7jl4pg6smjcyfjz9572f";
+       sha256 = "4e9c92be749ec9aacdbb84ca039b7a906850d98b9cb9e9dcff172cb3fe74d821";
        libraryHaskellDepends = [
          base iteratee MonadCatchIO-transformers transformers vector
        ];
@@ -95232,7 +95541,7 @@ self: {
      mkDerivation {
        pname = "mute-unmute";
        version = "0.2.0.0";
-       sha256 = "0nd1c4l2z7bflnghz7bbbahpfl2jj9mygpygxc7028axrrxj09af";
+       sha256 = "4e25207bce5d21010eebcfdfe76b92525077a15a6b9d0f9fa56e9d2f2861a159";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -95252,7 +95561,7 @@ self: {
      mkDerivation {
        pname = "mvc";
        version = "1.1.0";
-       sha256 = "115cg7xlkk0zj3qdhwm35397vbp1s28h3j0ipw2a9i9ap16d7x1i";
+       sha256 = "31f4d34cb82ac5a404bf11c80191d0e1ae7dd228a372d8f0901fcc49fb79ac84";
        libraryHaskellDepends = [
          async base contravariant foldl managed mmorph pipes
          pipes-concurrency transformers
@@ -95266,7 +95575,7 @@ self: {
      mkDerivation {
        pname = "mvc-updates";
        version = "1.2.0";
-       sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6";
+       sha256 = "c60603c0b97949219361c674097fe37b38bc68cf137b641b5abc329c0ee3ab88";
        libraryHaskellDepends = [ async base foldl mvc ];
        jailbreak = true;
        description = "Concurrent and combinable updates";
@@ -95282,7 +95591,7 @@ self: {
      mkDerivation {
        pname = "mvclient";
        version = "0.4";
-       sha256 = "12ckzfb6wwa3865isxnzw7xmwh9f43ali0ab5mal6brs33zz0z53";
+       sha256 = "a37cf0ff183a2f43552d4b8148d5202e415efbe1df761d8b4143716e96fb9389";
        libraryHaskellDepends = [
          base base-unicode-symbols binary bytestring containers
          control-event Crypto data-binary-ieee754 hexpat http-enumerator
@@ -95302,7 +95611,7 @@ self: {
      mkDerivation {
        pname = "mwc-random";
        version = "0.13.3.2";
-       sha256 = "01jqmq52knlwskgyx7940c81dmgdivrj0sbi2h6l0ccbxiaf7c9c";
+       sha256 = "2cb1e354ec8b31400d14716920f38eedd5161003249deedfd49cda290aae5806";
        libraryHaskellDepends = [ base primitive time vector ];
        testHaskellDepends = [
          base HUnit QuickCheck statistics test-framework
@@ -95320,7 +95629,7 @@ self: {
      mkDerivation {
        pname = "mwc-random-monad";
        version = "0.7.3.1";
-       sha256 = "0h4ljwwhqg4yy513lqk2ix0m9q2hmk276hgfrc6n3ja6wqbpkwyh";
+       sha256 = "d0f37917e646c9610dcbee4173c4ac50e054418f62623a42f19e3c0c39979440";
        libraryHaskellDepends = [
          base monad-primitive mwc-random primitive transformers vector
        ];
@@ -95337,7 +95646,7 @@ self: {
      mkDerivation {
        pname = "myTestlll";
        version = "1.0.0";
-       sha256 = "1rd3pxc20xwb3j0q9ckygy59mks8p38vzmi4wfg8zp1dq92jmhy0";
+       sha256 = "c0c32a45c22ddc8f9ee324d6bfd1b848cf9a8a7f7eb284811c8b772058bfa3e5";
        revision = "4";
        editedCabalFile = "e554b67c3f8efd73e028328341e3b535dc4898b3d476524a40c236c4c2871e43";
        libraryHaskellDepends = [
@@ -95360,7 +95669,7 @@ self: {
      mkDerivation {
        pname = "mybitcoin-sci";
        version = "0.3";
-       sha256 = "1iy84z13i98wbkman7yp2y2821yzf3xxpcy10rh9bdskjijvgjnq";
+       sha256 = "d8cab7659453b7956006c1b3dbfb70df07818417d71fabea5c1ca538c227c8c7";
        libraryHaskellDepends = [
          base cgi curl directory mtl process split
        ];
@@ -95376,7 +95685,7 @@ self: {
      mkDerivation {
        pname = "myo";
        version = "0.1.0.0";
-       sha256 = "0sn3ic3h94ff57igs61l2cq82y6xxz87qflm8dykwwy721swq1qn";
+       sha256 = "1607cc7510c7733e7d43953a7cd0efdd788130133418fde229ce9104078bc36a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95398,7 +95707,7 @@ self: {
      mkDerivation {
        pname = "mysnapsession";
        version = "0.4.1";
-       sha256 = "0871nq9nhpslni5kfldwiswhvpk1aajj7ikyiy9ikmcq16fb1z9m";
+       sha256 = "35fdb09c0998d519938f7ec623a55261de0db98ebc51374bb4545f6813b6e120";
        libraryHaskellDepends = [
          base bytestring cereal clientsession containers mtl random
          regex-posix snap snap-core time
@@ -95416,7 +95725,7 @@ self: {
      mkDerivation {
        pname = "mysnapsession-example";
        version = "0.4";
-       sha256 = "0lxzn8fn97f1j3fx97f46m16y25w7m1w84l59r75xisr662gc9lz";
+       sha256 = "9f26f6843159c75e4e4e8512c4433dbc086f4235c49dd4dd90c19d641db2bf53";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -95434,7 +95743,7 @@ self: {
      mkDerivation {
        pname = "mysql";
        version = "0.1.1.8";
-       sha256 = "115xz4khg4klrgjvv9dy83pv197b4y1zgw6fbpv8j88yr3qjmw4h";
+       sha256 = "90f02af1c81e2189f65dcef0f78327eba4b0ef40bea5bde5cb74920727f9bd84";
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ mysql ];
        homepage = "https://github.com/bos/mysql";
@@ -95449,7 +95758,7 @@ self: {
      mkDerivation {
        pname = "mysql-effect";
        version = "0.2.0.3";
-       sha256 = "11fpsh4w2zlqdqhk5snb276pcbx4p9g1igs94fympa9asfr2rxm3";
+       sha256 = "a3f62cb2d32aa95bbd2349bf185ebaa42f76cd11cbea32216e987ec109d4d785";
        revision = "1";
        editedCabalFile = "d4474591079b806b8e26d102824d46c7e4c239afb3479ea8d1e8cbd39f015718";
        libraryHaskellDepends = [
@@ -95469,7 +95778,7 @@ self: {
      mkDerivation {
        pname = "mysql-simple";
        version = "0.2.2.5";
-       sha256 = "132igmgrgkpc0g9063d593ha3iv40k5dd017nlb07sz0qs9hi8w6";
+       sha256 = "86a30893c6e0eb0316b52780d6ca0464c7a1e048a50d03d203ecce975f7d518c";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring blaze-builder blaze-textual
          bytestring mysql old-locale pcre-light text time
@@ -95486,7 +95795,7 @@ self: {
      mkDerivation {
        pname = "mysql-simple-quasi";
        version = "1.0.0.2";
-       sha256 = "1ggqqjn83rx23qk7lzrcgj1arjhmhi85xfl7d2pz27rrjx2ywpn8";
+       sha256 = "c85eee4597391ff1af6887ba5e508415caac827c2c7f7a261ea2e781acc4f8bd";
        libraryHaskellDepends = [
          base haskell-src-meta mysql-simple template-haskell
        ];
@@ -95502,7 +95811,7 @@ self: {
      mkDerivation {
        pname = "mysql-simple-typed";
        version = "0.1.1.2";
-       sha256 = "19wnvmrb523n8xl5cp9kypcqcrs0xs8pwdk771y1bdin5ds9j095";
+       sha256 = "250199742b36b6157c3867367e91ee406786d9f5335d5668477688b272dd96a7";
        libraryHaskellDepends = [
          base mysql mysql-simple template-haskell typedquery utf8-string
        ];
@@ -95517,7 +95826,7 @@ self: {
      mkDerivation {
        pname = "mzv";
        version = "0.1.0.2";
-       sha256 = "044x87jzyqsg5npp3s0mncgcl0gv26h6hzhc7bbgjja95x16ma2l";
+       sha256 = "54a86a422f4949f9d63a0c7e68a011fb01ca1eb315e871af2d4f63ffe5419d10";
        libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/ifigueroap/mzv";
@@ -95531,7 +95840,7 @@ self: {
      mkDerivation {
        pname = "n-m";
        version = "0.0.1";
-       sha256 = "189ybl8fb70cf24zhnjcmgrgkshrf2ziacklg9ixgvnbdp3abb7m";
+       sha256 = "f5aca5c66dcbeed7637a743215bf7019eaf9f2ab4c5af889700c9ce5105d3ea1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -95547,7 +95856,7 @@ self: {
      mkDerivation {
        pname = "nagios-check";
        version = "0.3.1";
-       sha256 = "17ww3n2y6cmjc3n05cra43csk60sm5s07q2mn3zq1sjiiq2cw82c";
+       sha256 = "4c20ce048e51ea80ffb055e00374a91a98a9d9202ab302ec60b232e3851d9c9f";
        libraryHaskellDepends = [
          base bifunctors exceptions mtl nagios-perfdata text
        ];
@@ -95564,7 +95873,7 @@ self: {
      mkDerivation {
        pname = "nagios-perfdata";
        version = "0.2.2";
-       sha256 = "159m45fvxgdabh7n24bkmg2901y3792afcrccqna1in3ha9vxd22";
+       sha256 = "42b4be9382c3c6a02c662c33a7443ac30790c4ab7311610f5caabdbe5d213595";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring containers mtl
        ];
@@ -95584,7 +95893,7 @@ self: {
      mkDerivation {
        pname = "nagios-plugin-ekg";
        version = "0.1.1.0";
-       sha256 = "1rk6sphxn93kmayjs0y386g1llhgbw8jpwhfkhlrbv9c395gxkrh";
+       sha256 = "30cffe4a1a2ced95299c0ef22b115f0f521a9e41c3032dbdaa7324dbe1d566e6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95608,7 +95917,7 @@ self: {
      mkDerivation {
        pname = "named-formlet";
        version = "0.2";
-       sha256 = "0wpjxn03cnxnn5x1706byl9d1129g9p1vkl1a1v9qw0afgzlj8y7";
+       sha256 = "c72349ff730a709c765081ce1d6e7a4984d012f5cb80137ab1b65b3680edf272";
        libraryHaskellDepends = [
          base blaze-html bytestring containers mtl text transformers
        ];
@@ -95621,7 +95930,7 @@ self: {
      mkDerivation {
        pname = "named-lock";
        version = "0.1";
-       sha256 = "1db12f2q395yk6pwz5gnb2q0kf4s868z8d1vvwa7vngnfc1h924i";
+       sha256 = "9188040373f6d97d14df3b34f491419ab809b058f695cfaf99bea481851361b5";
        libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/named-lock";
@@ -95635,7 +95944,7 @@ self: {
      mkDerivation {
        pname = "named-records";
        version = "0.5";
-       sha256 = "0ykcmmnns63zjfd00kd9941c33l19n9c5b5xkin4n7r9v0qvirwr";
+       sha256 = "99e7b831d8291f4b6c9cbdacc2924d818ec10249a94d009a937f186d6dad6c7a";
        libraryHaskellDepends = [ base binary names template-haskell ];
        description = "Flexible records with named fields";
        license = stdenv.lib.licenses.mit;
@@ -95648,7 +95957,7 @@ self: {
      mkDerivation {
        pname = "namelist";
        version = "0.1.0";
-       sha256 = "0sfiqd1dh3frzwnqz4fjh0wg8m55cprqw8ywvcaszrp5gq3mj74s";
+       sha256 = "9a1c59077ee5e6af15dbdc238ef365a554f43880d2918f2dffd90dd842c3d169";
        libraryHaskellDepends = [
          base case-insensitive data-default-class parsec
        ];
@@ -95665,7 +95974,7 @@ self: {
      mkDerivation {
        pname = "names";
        version = "0.3.1";
-       sha256 = "0sjjp90zfrkjavj8fqyscnvc9d72mkvv8f7ajd47jba92mhwzr5g";
+       sha256 = "afe4cf6115492d794893ea38b4f7ace2b4c4b665da6387e4567266f741ba526a";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Type level names";
        license = stdenv.lib.licenses.mit;
@@ -95676,7 +95985,7 @@ self: {
      mkDerivation {
        pname = "names-th";
        version = "0.1.0.1";
-       sha256 = "1bqbh6751lmiiwvdvry796lzzbjkk8x1lhylkh61l6ycdib2qxjq";
+       sha256 = "58762c566ccc1b1a0c9cd4431a3a9a53aeffa949c7e7dd368fb1d2508e810baf";
        libraryHaskellDepends = [ base containers template-haskell ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Manipulate name strings for TH";
@@ -95688,7 +95997,7 @@ self: {
      mkDerivation {
        pname = "nano-cryptr";
        version = "0.1.1.3";
-       sha256 = "1pqwzl8l48c4q83jhjj11jd3kwwa0ail2c6kv3k38kig9yvj7ff8";
+       sha256 = "c8b923b74f2f4e34e6d8d33041a3028af3399a0c414a2807c284214211fd1cdf";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/chowells79/nano-cryptr";
        description = "A threadsafe binding to glibc's crypt_r function";
@@ -95701,7 +96010,7 @@ self: {
      mkDerivation {
        pname = "nano-hmac";
        version = "0.2.0";
-       sha256 = "0rrwa1c3mval1jm4siqyx1vk14ibifya62hni13cimcdafj35fnq";
+       sha256 = "d8ba32a4538dd5c84688160aa3bc8b2b923077e81e474daa0c54ed3a58503c67";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
        homepage = "http://www.jasani.org/search/label/nano-hmac";
@@ -95715,7 +96024,7 @@ self: {
      mkDerivation {
        pname = "nano-md5";
        version = "0.1.2";
-       sha256 = "18db3y76w0kv2m7h3lrqxcag4lc7519b2j80113g6hhm1wxkpabk";
+       sha256 = "73a93b3b0f1542f346080049b152288751f214eb38d3014f157b026e8e1faba1";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
        homepage = "http://code.haskell.org/~dons/code/nano-md5";
@@ -95731,7 +96040,7 @@ self: {
      mkDerivation {
        pname = "nanoAgda";
        version = "1.0.0";
-       sha256 = "034mwssj296xn7j123sqvfl9rv1bwnj1v5sw5l34481dk5zsi9sm";
+       sha256 = "55a7a87f992d2042062d5c971da4e52bec9ca8db580f11e4b1dd2421b5e6950c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -95748,7 +96057,7 @@ self: {
      mkDerivation {
        pname = "nanocurses";
        version = "1.5.2";
-       sha256 = "04kgf3vvjdx6d1fmfzp0xy5x42zlg0ij59ayi1zhz8hkwsfn5g1m";
+       sha256 = "35bc629de613a20f7f885ea5222378f40bd28befe07e575d68a637b9f7706f12";
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ ncurses ];
        homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html";
@@ -95762,7 +96071,7 @@ self: {
      mkDerivation {
        pname = "nanomsg";
        version = "0.1.1";
-       sha256 = "06jb8s3jxjiz7r6dn8xx33xqd76f2r5q1mshsz41z4q0khf4wdp3";
+       sha256 = "e3364e1c9c00931fc8d750d7804b16ce9c86fb18bd23db4c3e3fca2e87464b1a";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ nanomsg ];
        jailbreak = true;
@@ -95777,7 +96086,7 @@ self: {
      mkDerivation {
        pname = "nanomsg-haskell";
        version = "0.2.2";
-       sha256 = "1p4d0qdyqfg4qidcdcddjnyw4x2q8551ka6bsryz9b6dpj6kywch";
+       sha256 = "90713f8dbccdacf47dd6cba8194a415874c2bd95adb1c65ac4e439ec1b068ddc";
        libraryHaskellDepends = [ base binary bytestring ];
        librarySystemDepends = [ nanomsg ];
        testHaskellDepends = [
@@ -95795,7 +96104,7 @@ self: {
      mkDerivation {
        pname = "nanoparsec";
        version = "0.1.1";
-       sha256 = "00ghdzkzshk24g7v42hq7zq0dxsq8vjpkslj41dxdnx0zizwbn3m";
+       sha256 = "75d8c57ffca0dbd65b2092ea79e54658f706f03f180ab2cf236242fde76ff001";
        libraryHaskellDepends = [ base bytestring ListLike ];
        jailbreak = true;
        description = "An implementation of attoparsec-like parser around list-like";
@@ -95807,7 +96116,7 @@ self: {
      mkDerivation {
        pname = "nanospec";
        version = "0.2.1";
-       sha256 = "0jq2l1lmy4hcl6r975xcg86xr1y7jfxr3qn27ibsmjbzlnxdkjyv";
+       sha256 = "dbcbd9baa57fc9aa573cc2e291bb93c787dc0d7aac9793b2a10c125f69a0024b";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec silently ];
        description = "A lightweight implementation of a subset of Hspec's API";
@@ -95819,7 +96128,7 @@ self: {
      mkDerivation {
        pname = "narc";
        version = "0.1.3";
-       sha256 = "1ng1rzj1lf6h9g3pk8gsz05bnck72rp5j62iwn82vlcw8pyk0fsc";
+       sha256 = "4c3b30fd459cd12d90e55118596e166732bb0af8faa179c74bd0381ae4cfe1d9";
        libraryHaskellDepends = [ base HDBC HUnit mtl QuickCheck random ];
        homepage = "http://ezrakilty.net/projects/narc";
        description = "Query SQL databases using Nested Relational Calculus embedded in Haskell";
@@ -95832,7 +96141,7 @@ self: {
      mkDerivation {
        pname = "nat";
        version = "0.3";
-       sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5";
+       sha256 = "c5d58fc25be8a3bd1e996700a66057b2638dac3298715b7d45168b935b6083ec";
        libraryHaskellDepends = [ base ];
        description = "Lazy binary natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -95845,7 +96154,7 @@ self: {
      mkDerivation {
        pname = "nationstates";
        version = "0.2.0.0";
-       sha256 = "07rs7c5pvq6x8icg5pzk613vazcnnl3rfrcsf3zw6i8gaxh0dq48";
+       sha256 = "88e00660570f45c3ff709a659707b5967db54730f3dff25844dde07d0b3b3a1f";
        libraryHaskellDepends = [
          base bytestring clock containers http-client http-client-tls
          http-types multiset transformers xml
@@ -95860,7 +96169,7 @@ self: {
      mkDerivation {
        pname = "nats";
        version = "1";
-       sha256 = "0r6s8l4s0yq3x2crrkv0b8zac13magfasr9v8hnq6rn1icsfhic0";
+       sha256 = "8045e8348bc166832d443b65addc537504a63e5a60cf9c99e8037ba00945da64";
        homepage = "http://github.com/ekmett/nats/";
        description = "Natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -95873,7 +96182,7 @@ self: {
      mkDerivation {
        pname = "nats-queue";
        version = "0.1.2.0";
-       sha256 = "0gqgqf87dzja0yhfpazqbdpvia1jisarhnph9bxvb3mfl4is9sgf";
+       sha256 = "eee9a423a1ae8eb5fb4af05a98958e32a8b86f5bf8abeba0074afe7690c30f3f";
        libraryHaskellDepends = [
          aeson async base bytestring containers dequeue network network-uri
          random text
@@ -95894,7 +96203,7 @@ self: {
      mkDerivation {
        pname = "natural-number";
        version = "1.0";
-       sha256 = "1n8qgjbi4c50pwynlya4bjxd6lpwj00257drqk04mlrr3nw3gp5x";
+       sha256 = "bddc37b81d39d34ac0c4b99d220090fc52d3ba5c44796a3dbfa03012977c18d9";
        libraryHaskellDepends = [
          base type-equality type-level-natural-number
          type-level-natural-number-induction
@@ -95910,7 +96219,7 @@ self: {
      mkDerivation {
        pname = "natural-numbers";
        version = "0.1.2.0";
-       sha256 = "0cj9lnnlvry425bkixqv9fh5b9xhy7dmwcqsxprj6lamccvxspwn";
+       sha256 = "965fdd3763555123f3ed1a335edbf1b0a755a04b1bf7385711c4e74dada54932";
        libraryHaskellDepends = [ base ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/natural-numbers";
        description = "Natural numbers";
@@ -95922,7 +96231,7 @@ self: {
      mkDerivation {
        pname = "natural-sort";
        version = "0.1.2";
-       sha256 = "0l3bkbqzrlpdhzazqqlx71ah0m13ypa0981qvw3sn9q8d0sbfwkv";
+       sha256 = "7b72b734680827ab07df38a004d4f523540055389d62fcd587edd2fcf19a6b50";
        libraryHaskellDepends = [ base bytestring parsec text ];
        homepage = "https://john-millikin.com/software/natural-sort/";
        description = "User-friendly text collation";
@@ -95936,7 +96245,7 @@ self: {
      mkDerivation {
        pname = "natural-transformation";
        version = "0.2";
-       sha256 = "1fxgbjf74kdag42hscplc5sn63z0idz2z2yykk1jz4zp71wa0wdp";
+       sha256 = "b771a07838f7932fc39cde8b2f7e8be00f637561f4320d0579aa4d729c5cafbb";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
@@ -95951,7 +96260,7 @@ self: {
      mkDerivation {
        pname = "naturalcomp";
        version = "0.0.3";
-       sha256 = "1l594lkd3yb52lhh0raygvk3jlzwkcc2pmcqjmg02dmd6j6mw42x";
+       sha256 = "5d105e8d34ad36015e9598d52b189bfc5339e67e5e6500211565f9d12625a9d0";
        libraryHaskellDepends = [ base text utf8-string ];
        homepage = "not yet available";
        description = "Natural-order string comparison";
@@ -95963,7 +96272,7 @@ self: {
      mkDerivation {
        pname = "naturals";
        version = "0.2.0.2";
-       sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16";
+       sha256 = "2654d9083a478706c82fcb524947e8882b1a252679b01f02818ab5315048c2ab";
        libraryHaskellDepends = [ base ];
        homepage = "frigidcode.com";
        description = "Constructors and related functions for natural numbers";
@@ -95978,7 +96287,7 @@ self: {
      mkDerivation {
        pname = "nbt";
        version = "0.5.1";
-       sha256 = "08184rn4mwxd2m2fnqvja23jpkzlkvb8d2vn8i4rqcil136wb6q0";
+       sha256 = "009bc5cd0834329c4944768b86d69ef4cf2b87507263eb4415adf34a6c262820";
        libraryHaskellDepends = [ array base bytestring cereal text ];
        testHaskellDepends = [
          array base bytestring cereal HUnit QuickCheck test-framework
@@ -95997,7 +96306,7 @@ self: {
      mkDerivation {
        pname = "nc-indicators";
        version = "0.3";
-       sha256 = "0w5nddirsib9vz96dpan9bgdg1mag9gaz7w7ix51l44ls9r8yn3m";
+       sha256 = "75588f72d294101a4a8f879faf5e7aaa86d7de4a56dd66d2df69459d636bb670";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -96016,7 +96325,7 @@ self: {
      mkDerivation {
        pname = "ncurses";
        version = "0.2.11";
-       sha256 = "08jr224i37jxrprka9c276sid6mw001m8r2krd6g8jscshwd5nzk";
+       sha256 = "f3dbd238d44c4bf44ccb5364540300bc9a16b539822535f3cd5d9e1189105922";
        libraryHaskellDepends = [ base containers text transformers ];
        librarySystemDepends = [ ncurses ];
        libraryToolDepends = [ c2hs ];
@@ -96030,7 +96339,7 @@ self: {
      mkDerivation {
        pname = "ndjson-conduit";
        version = "0.1.0.2";
-       sha256 = "0fxxnbccasyhxd5yykzkvrj09zci8is7yqfjw0wg11n1p00hzahj";
+       sha256 = "12aa0f01b8c186f038e0d2617f744491fd0464def34fef4bebd06bc5d8b2bd3b";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit
        ];
@@ -96044,7 +96353,7 @@ self: {
      mkDerivation {
        pname = "neat";
        version = "0.1.0";
-       sha256 = "0lh5clnlfkzd5d9zmm9r92wpzrp8g7x6ndml7wajr882s53dv6jk";
+       sha256 = "539add46d102a12c153fb4366bfa79e8e67fb94839d5fa532bed4f472d650552";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base filepath parsec ];
@@ -96061,7 +96370,7 @@ self: {
      mkDerivation {
        pname = "neat-interpolation";
        version = "0.2.2.1";
-       sha256 = "00xkhc25s675pcg5s3fiq3l57zsslc0vps44gmwwas4gnz27wdfy";
+       sha256 = "de357ec4b78f68c5797d84e8bb01a35aff53e8c0d10d5d1ebbe5185d0483b303";
        libraryHaskellDepends = [
          base base-prelude parsec template-haskell
        ];
@@ -96079,7 +96388,7 @@ self: {
      mkDerivation {
        pname = "needle";
        version = "0.1.0.1";
-       sha256 = "1p7hmja7mvdbd10jv7bzr5b9i18l9nghdcvvxpn9xvfm8ycz7yg2";
+       sha256 = "e2f9f39947d5ed9eeced7bb3069f4d14859856c97f9d2d4168abed7a94acf0dc";
        libraryHaskellDepends = [
          base containers haskell-src-meta mtl parsec parsec-extra
          template-haskell text vector
@@ -96098,7 +96407,7 @@ self: {
      mkDerivation {
        pname = "neet";
        version = "0.4.0.0";
-       sha256 = "1x0l6cpjc9pjirjndh47asmva8jx5wc6gq8vab1ik2090ph0w1v5";
+       sha256 = "65070ee005098819c3521be167182f5d22b5ab5687c066658ef226262f3314f4";
        libraryHaskellDepends = [
          base cereal containers graphviz MonadRandom multimap parallel
          random transformers
@@ -96116,7 +96425,7 @@ self: {
      mkDerivation {
        pname = "nehe-tuts";
        version = "0.2.4";
-       sha256 = "00zll88gk44l22lqxv47v4j5ipfapy5599ld8fcsvhk57nfcm2r0";
+       sha256 = "208bca9c3d65c2ad99438da6548abfcadd5824d987ec8ea9109490f910a2f403";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -96134,7 +96443,7 @@ self: {
      mkDerivation {
        pname = "neil";
        version = "0.9";
-       sha256 = "0cg4x4b2x81d3mbk8nhwqib3pr154hd0snh160bfbm3b31yfr19k";
+       sha256 = "3385ec7c186bd4e51630015a0d1a2425e43b56c41c5a34571d2da02e16e9e431";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -96151,7 +96460,7 @@ self: {
      mkDerivation {
        pname = "neither";
        version = "0.3.1.1";
-       sha256 = "192l840yb1pprfjjq7ax5xaraagl1pbmsidkg1yibp6r4azd61yf";
+       sha256 = "ce07d3be22d9dc157d78b3455dd70df42995552f5d1d2ca5cbf786e5014154a4";
        libraryHaskellDepends = [ base failure transformers ];
        jailbreak = true;
        homepage = "http://github.com/snoyberg/neither";
@@ -96166,7 +96475,7 @@ self: {
      mkDerivation {
        pname = "nemesis";
        version = "2015.5.4";
-       sha256 = "149fx29818cf9rxp1gp64w5l288l4whij7im5rfms3rlgj95w6ji";
+       sha256 = "511a5e927c340f5d5d2e351e1921271421410b27e6be707b4e8ea18092e82e91";
        libraryHaskellDepends = [
          air air-th base containers directory dlist Glob mtl process time
        ];
@@ -96182,7 +96491,7 @@ self: {
      mkDerivation {
        pname = "nemesis-titan";
        version = "2014.5.19";
-       sha256 = "183m6wz52lrf5kfwxz11ad7v5zazv4gcf1c2rcylh2ys6zda4xmd";
+       sha256 = "ad76a2da37da0b483dcb8205c71ed95ffdb24f5321fccedd2c2e53513e3775a0";
        libraryHaskellDepends = [
          air air-th base bytestring directory filepath hspec HStringTemplate
          nemesis random uuid
@@ -96201,7 +96510,7 @@ self: {
      mkDerivation {
        pname = "nerf";
        version = "0.5.3";
-       sha256 = "18rkjgk2r6784mjbdd2lydv9yac252xvj18m78bbaplnac1504ak";
+       sha256 = "5311500253965eb5163a1505b9bb2882299f76f354b4b66425e8982ce69333a3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96224,7 +96533,7 @@ self: {
      mkDerivation {
        pname = "nero";
        version = "0.3.1";
-       sha256 = "1nmikqdxih91xhppn72a4xsrszj4050xl9winjsm62k5wdm9ld50";
+       sha256 = "a0349a6ae3650a53b5b49127da4101447e9d75274a1c7b2fec21c1d81b9eb1da";
        libraryHaskellDepends = [
          base bifunctors bytestring containers lens text
        ];
@@ -96244,7 +96553,7 @@ self: {
      mkDerivation {
        pname = "nero-wai";
        version = "0.3";
-       sha256 = "1jz2was51lfqiq1krrjljy7yl2z49nlj72x9dspc748dznizb8aw";
+       sha256 = "5ca1f5a3fd0d91c3ae6ea98b23a94de40bea8f9754e63c038ed8d150b4e2e2cb";
        libraryHaskellDepends = [
          base bytestring http-types lens nero text wai wai-extra
        ];
@@ -96259,7 +96568,7 @@ self: {
      mkDerivation {
        pname = "nero-warp";
        version = "0.3";
-       sha256 = "1ddr0hs9x7r74f5bb00fbi0z87cfkxp21m5ikp5qgyblqb09940s";
+       sha256 = "1a9094c0c274f987cb9db1d4206e9f8e1df4415c0e80b58a23279f9e3404b9b5";
        libraryHaskellDepends = [ base nero nero-wai warp ];
        homepage = "https://github.com/plutonbrb/nero-warp";
        description = "Run Nero server applications with Warp";
@@ -96277,7 +96586,7 @@ self: {
      mkDerivation {
        pname = "nested-routes";
        version = "3.2.0";
-       sha256 = "02mj54a797h9ywa0985xw8pspl953xgn813r6mz2apx0mk6gp1xg";
+       sha256 = "af87fbccaca05f257e357904645f1f25d1ab2fe2bda00414f7099e741429b20a";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-html bytestring clay composition
          constraints containers http-media http-types lucid mtl poly-arity
@@ -96299,7 +96608,7 @@ self: {
      mkDerivation {
        pname = "nested-sets";
        version = "0.0.1.1";
-       sha256 = "0a3ppsl6x9yh2pvx7fyir1khdg99wlx9d9zjflamv3gcck3d8p4i";
+       sha256 = "915cd4c664ec8d5d1575f2a7963ae529bd0667c8d1bbd3f715d0a76ea8be7728";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        description = "Nested set model implementation";
@@ -96313,7 +96622,7 @@ self: {
      mkDerivation {
        pname = "nestedmap";
        version = "0.1.0.3";
-       sha256 = "1his95sqzyr5xb7iihz62vp9y32smf5wy4ck81yrxdvkn6zvhajl";
+       sha256 = "542ab8bfb173b79e7d409311cf8bab5a0c9fee16e6c318cfea25fb8f75493ac2";
        libraryHaskellDepends = [ base base-unicode-symbols containers ];
        testHaskellDepends = [
          base base-unicode-symbols containers data-ordlist hspec QuickCheck
@@ -96330,7 +96639,7 @@ self: {
      mkDerivation {
        pname = "net-concurrent";
        version = "0.1.0";
-       sha256 = "0ar5y38nqgh10y23yxjcz0vlvdj2hcp2b2kq0srmbh17iw8d8906";
+       sha256 = "0624d4108f27c055b306788a252e8342b64d37f84c763f8407013e6cd1f0252b";
        libraryHaskellDepends = [
          base bytestring containers ghc-binary hslogger monad-loops network
        ];
@@ -96346,7 +96655,7 @@ self: {
      mkDerivation {
        pname = "netclock";
        version = "0.6";
-       sha256 = "0vskyczfhv9bszl2hnr6j9cvhkfampja5s41kh6i9wk8j9kpf9p8";
+       sha256 = "e82677679268f2140d9c81e8a2e4adca4db85992265b28e8d72b6de83ef3536f";
        libraryHaskellDepends = [ base bytestring hosc network ];
        homepage = "http://netclock.slab.org/";
        description = "Netclock protocol";
@@ -96363,7 +96672,7 @@ self: {
      mkDerivation {
        pname = "netcore";
        version = "1.0.0";
-       sha256 = "0biqhmfvszwmmnpgja6qk3k2s5ynx4l659zq9awrxr0637dc19a5";
+       sha256 = "45a5c0da1906e49eb94af8a76228e9d6172de698d828f9aead957fbd5d85382e";
        libraryHaskellDepends = [
          ansi-wl-pprint base bimap binary binary-strict bytestring
          containers fgl HList hslogger mtl multiset network parsec process
@@ -96389,7 +96698,7 @@ self: {
      mkDerivation {
        pname = "netlines";
        version = "1.0.0";
-       sha256 = "006ca49rhh09lz8did0sil2f0xp1ggk69d4dqb2kx12drijp1jgj";
+       sha256 = "f2c97065cc4d843ec5c28db464e67be176e0048d1ab4d8d0a70940981351cc00";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96408,7 +96717,7 @@ self: {
      mkDerivation {
        pname = "netlink";
        version = "0.1";
-       sha256 = "0w2iyxmmk53k8gg0i8g3339dkdlpjgj39ar0kmsrzhxa6nakclwn";
+       sha256 = "9653369535aac39f759d20ab34e49397b6d9d218e3a108de437394596bf75170";
        libraryHaskellDepends = [
          base bytestring cereal containers monad-loops unix
        ];
@@ -96424,7 +96733,7 @@ self: {
      mkDerivation {
        pname = "netlist";
        version = "0.3.1";
-       sha256 = "0f3fwgpg0p3ajgxfzbqr4z04ly5cdbhjxms5xbd0k2ixdwgyxm67";
+       sha256 = "c7d4ee1f6f3d8a09daea45d72ee16aac784ac02719afeffa936a5cf0eee36e38";
        libraryHaskellDepends = [ base binary containers syb ];
        description = "Netlist AST";
        license = stdenv.lib.licenses.bsd3;
@@ -96435,7 +96744,7 @@ self: {
      mkDerivation {
        pname = "netlist-to-vhdl";
        version = "0.3.2";
-       sha256 = "107pkkihj62qjkfwrnhwfscpph5r76lx6r3s0m3b0dbsf1jy2a61";
+       sha256 = "c128e165707a35b046057a64d3a939b9c07b99761cdaccdd94581809e39cf780";
        libraryHaskellDepends = [ base netlist pretty ];
        description = "Convert a Netlist AST to VHDL";
        license = stdenv.lib.licenses.bsd3;
@@ -96449,7 +96758,7 @@ self: {
      mkDerivation {
        pname = "netpbm";
        version = "1.0.1";
-       sha256 = "02gj7m7gmislrkpk0mn5qb66z77zqy2k3py5c965bcjm086pk3fc";
+       sha256 = "cc8d790d0255b2554c62c5df3185c7ff9c6fccc2c55630efcc54c7fa4e3df209";
        libraryHaskellDepends = [
          attoparsec attoparsec-binary base bytestring storable-record
          unordered-containers vector vector-th-unbox
@@ -96467,7 +96776,7 @@ self: {
      mkDerivation {
        pname = "netrc";
        version = "0.2.0.0";
-       sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls";
+       sha256 = "9a5e07efa44f4b715b110aa4f9687e2b75458fb7537a2f4f1a3582c9e2e82a86";
        revision = "1";
        editedCabalFile = "55e4e8785866fa2145f9b4de21522d4092a7c486845062915704b2917b8c4fbd";
        libraryHaskellDepends = [ base bytestring deepseq parsec ];
@@ -96486,7 +96795,7 @@ self: {
      mkDerivation {
        pname = "netspec";
        version = "0.2.0.0";
-       sha256 = "0qmca5pf6r0zam86a8wghs3ylsmvd4cxk9g3nlv2gc3vl3fb8caq";
+       sha256 = "5831b4dca07bb02736b5e3a5d91969bb6aea87868f236550551f64e36e51ac62";
        libraryHaskellDepends = [
          aeson base binary bytestring mtl network template-haskell text
          transformers
@@ -96503,7 +96812,7 @@ self: {
      mkDerivation {
        pname = "netstring-enumerator";
        version = "0.1.1";
-       sha256 = "1n1g8d8507i0k4i93wb4i6yh7j7l3r0d9dfgxwl02hsk1svk5hkm";
+       sha256 = "75c232b70e53430128efcfb5d4401ef4c803bd8964f1912299201e5050432fd8";
        libraryHaskellDepends = [
          base bytestring enumerator transformers
        ];
@@ -96522,7 +96831,7 @@ self: {
      mkDerivation {
        pname = "nettle";
        version = "0.1.1";
-       sha256 = "1l9515ks41b9rkcxv91d391lwl87k2ipl3j5qfjcdz1qaxrnjkyr";
+       sha256 = "d94f69735738fcc6a4c3450e7aa39807514e431a2da4ddd9cc6905a2670925d1";
        libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem tagged
        ];
@@ -96544,7 +96853,7 @@ self: {
      mkDerivation {
        pname = "nettle-frp";
        version = "0.1.1";
-       sha256 = "0jkb9a3vci91gx1rj81jbanhf0xw7n4xk69a5nhy7b55vclv8lcr";
+       sha256 = "9951b429dba5ace3a12d2a99d9893dbc0307ad5a322099437f2145b6874a6b4a";
        libraryHaskellDepends = [
          base bimap binary bytestring containers mtl nettle-openflow network
          network-data random time
@@ -96562,7 +96871,7 @@ self: {
      mkDerivation {
        pname = "nettle-netkit";
        version = "0.2.0";
-       sha256 = "152i4mdmqfrbvzq4nfzl8vy2n3jczbn18wd2mjxng1130l86cylp";
+       sha256 = "977a661005238467bbaca27114ecfa4c0e2bfc46f43b4bf0df2b3b5c5b255194";
        libraryHaskellDepends = [
          base containers directory filepath mtl nettle-openflow unix
        ];
@@ -96578,7 +96887,7 @@ self: {
      mkDerivation {
        pname = "nettle-openflow";
        version = "0.2.0";
-       sha256 = "1jc9dpsz8s6ivmkmddxy7i8kyiqf93x8rhnxly357nxlgmsn5dgk";
+       sha256 = "f3b562757db4db5386a7ddc28cfa480e473f513cbeb75667ddd168f4f56d89c9";
        libraryHaskellDepends = [
          array base bimap binary binary-strict bytestring containers HList
          mtl network parsec syb
@@ -96595,7 +96904,7 @@ self: {
      mkDerivation {
        pname = "netwire";
        version = "5.0.1";
-       sha256 = "1izl4iarcc6z2j0d6gkcygpp63asajikn1p44p8ixwzx96xx578r";
+       sha256 = "199dd2bb49fdf31ed125e4063ba3545a0d73eff36c3ed38014df30965524f4c7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96614,7 +96923,7 @@ self: {
      mkDerivation {
        pname = "netwire-input";
        version = "0.0.4";
-       sha256 = "1f0dczgnc1fibq5ypdzi1hgsahmbfmv783bliwh5x4j4vm81k0h6";
+       sha256 = "06821950dd44925e208f740d747675ab42a51f0cf1b7eb0b5ed10566df670db8";
        libraryHaskellDepends = [ base netwire ];
        homepage = "https://www.github.com/Mokosha/netwire-input";
        description = "Input handling abstractions for netwire";
@@ -96627,7 +96936,7 @@ self: {
      mkDerivation {
        pname = "netwire-input-glfw";
        version = "0.0.4";
-       sha256 = "163jd8bb0msy9r51s8qb6ypk25lax46kkbzq9wh2s4kvzribmdlg";
+       sha256 = "8fb6ba62fe7b122d204ff8af390de98a1631af370b231d4a4e5e57b0166a7298";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96645,7 +96954,7 @@ self: {
      mkDerivation {
        pname = "network";
        version = "2.6.2.1";
-       sha256 = "1yhvpd4wigz165jvyvw9zslx7lgqdj63jh3zv5s74b5ykdfa3zd3";
+       sha256 = "a3fda15c9bbe2c7274d97f40398c6cf8d1d3a9fe896fbf6531e1bfc849bb1bfa";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit
@@ -96662,7 +96971,7 @@ self: {
      mkDerivation {
        pname = "network-address";
        version = "0.2.0";
-       sha256 = "0pz6x11naxzby14jxrm31j2jdd6gwqspbrx1hv5204rbf7lifib1";
+       sha256 = "614517e9712b1320ca86a1e77535e6cfb426850ca3e62e49f0eb776543e8e65f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal ];
@@ -96685,7 +96994,7 @@ self: {
      mkDerivation {
        pname = "network-anonymous-i2p";
        version = "0.10.0";
-       sha256 = "0b7z7w105l1yd3xpnnl2z779m5zknf756cslksbbpsy16rn7kxfg";
+       sha256 = "cff5796c36c1ebbb969e5433538eb3f3979acef9825a7bfb683ed002023fff2c";
        libraryHaskellDepends = [
          attoparsec base bytestring exceptions mtl network
          network-attoparsec network-simple text transformers uuid
@@ -96709,7 +97018,7 @@ self: {
      mkDerivation {
        pname = "network-anonymous-tor";
        version = "0.9.2";
-       sha256 = "1zssb8npwnzj8mra8pkvshni7h36wqhddva9rrwbq480492sck1w";
+       sha256 = "3c4ca645220011bc78ce49edd620e666c0132dd47b5ea47245f25b7e2d5a5aff";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96737,7 +97046,7 @@ self: {
      mkDerivation {
        pname = "network-api-support";
        version = "0.2.0";
-       sha256 = "01ambd53cf2n4y3c1j62wav3jz09s5vml87gkg69bl6h1g63zls1";
+       sha256 = "41d33fcc0bd0d095cc9bef205a77d1097c39b6e2c2c8c086275638364a5b5505";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring case-insensitive http-client
          http-client-tls http-types text time tls
@@ -96756,7 +97065,7 @@ self: {
      mkDerivation {
        pname = "network-attoparsec";
        version = "0.12.2";
-       sha256 = "1w08py367mmwfg5lff6y9s6hdpg1nbjf7v6vv9s19aw6saxak44p";
+       sha256 = "9790a9bad286ab1474dadbece3e4b2e1dd068d4ede3847cb73bcd66386bf08f0";
        libraryHaskellDepends = [
          attoparsec base bytestring enclosed-exceptions exceptions
          lifted-base monad-control mtl network transformers
@@ -96778,7 +97087,7 @@ self: {
      mkDerivation {
        pname = "network-bitcoin";
        version = "1.8.1";
-       sha256 = "0gw04wh24j4vpyvx0wy0bdhh3dkwdxrg2laq7vsvwlpzwgcny99h";
+       sha256 = "30256fd9e3ff52bef53e5851f1726f7cb601615bc073d0b7bf9b48222027803f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96802,7 +97111,7 @@ self: {
      mkDerivation {
        pname = "network-builder";
        version = "0.1.0";
-       sha256 = "0faa3clz80158m9cy4mblnszla6k9hbf8bdwp5cam05dwmvsdcyw";
+       sha256 = "dcb3a677e5ad80aa58b9bc2de4164cd328fab5a5ab12cf52452500f4291b4a39";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base bytestring shelly text yaml ];
@@ -96822,7 +97131,7 @@ self: {
      mkDerivation {
        pname = "network-bytestring";
        version = "0.1.3.4";
-       sha256 = "19m10mj9nqsa7s0syv9dyhqkhvmf2h7yna8n7bq0xkdp8m9l0g96";
+       sha256 = "263d405345b7cd0ef03a1629eb0f14ae6e3831f42d6daf813e4a639b6405a1a6";
        libraryHaskellDepends = [ base bytestring network unix ];
        jailbreak = true;
        homepage = "http://github.com/tibbe/network-bytestring";
@@ -96836,7 +97145,7 @@ self: {
      mkDerivation {
        pname = "network-carbon";
        version = "1.0.5";
-       sha256 = "0kb3gz8545dgi93ys9pk240vap7zjnl2npn1xryng2ijl7ssn9li";
+       sha256 = "9126abf5a1328a677deec15e2ba895ff5cb50111f326ed478aaf1552d07f634d";
        libraryHaskellDepends = [
          base bytestring network text time vector
        ];
@@ -96850,7 +97159,7 @@ self: {
      mkDerivation {
        pname = "network-conduit";
        version = "1.1.0";
-       sha256 = "06amxl8rg4zfnmgc1iyq5mxy9qihcqddqgqkbfvaf25mwr43992p";
+       sha256 = "57a43448e6b508a7b65b133fdc1a6630e2e47b2dd8c7c05eb5ee939711ed5519";
        libraryHaskellDepends = [ base conduit ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Stream socket data using conduits. (deprecated)";
@@ -96865,7 +97174,7 @@ self: {
      mkDerivation {
        pname = "network-conduit-tls";
        version = "1.2.0.1";
-       sha256 = "17d267sg74snq626kk8n9yy9njspjzivwjg60l69879z4nsvp200";
+       sha256 = "0088bbb5253f1d940c05e649bee397574b9bbc4f16cd6984c15693f3f431a29d";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra connection cprng-aes
          data-default monad-control network streaming-commons tls
@@ -96886,7 +97195,7 @@ self: {
      mkDerivation {
        pname = "network-connection";
        version = "0.1.1";
-       sha256 = "0v3dwq5vxmgknsiq2nddfj3gvvvaxdlfsnk0bxrqw9zzzdkpi0q1";
+       sha256 = "01837867fbff278e735f605aed68eb6aeffd8674ad5981a3b6f3d5be0be66d6c";
        libraryHaskellDepends = [
          base bytestring containers network network-bytestring stm
        ];
@@ -96901,7 +97210,7 @@ self: {
      mkDerivation {
        pname = "network-data";
        version = "0.5.3";
-       sha256 = "0zbwplzrr899lj0ig2nyq58cayy6f8pkn4wnqbrd1i50lhq61szz";
+       sha256 = "ffeb6030a4a0c4d0f2c296133b2f72c67bc550c1de8a1781a429a19c3fbd7c7d";
        libraryHaskellDepends = [ base bytestring cereal pretty ];
        description = "Library for network data structures and their serialization";
        license = stdenv.lib.licenses.bsd3;
@@ -96914,7 +97223,7 @@ self: {
      mkDerivation {
        pname = "network-dbus";
        version = "0.0";
-       sha256 = "024h0gfgn7hmfh90y74nf03kpvj5mg74a54lgb6clvxxfp8j64w9";
+       sha256 = "891323d175bd6fcacc7a941445ceab45ee3b0770961c0f1274151efbdc039008";
        libraryHaskellDepends = [
          base binary bytestring containers mtl network parsec unix
          utf8-string
@@ -96932,7 +97241,7 @@ self: {
      mkDerivation {
        pname = "network-dns";
        version = "1.0.0.1";
-       sha256 = "0gg1g1gnbi6dzw5anz3dam2gh09q948d3k7q84agkswa64c0azn8";
+       sha256 = "c87e0518318aebf91441f8ccd110493801f844556d7cab0affcdc4655f78e13d";
        libraryHaskellDepends = [
          base binary bytestring cereal containers data-textual hashable
          network-ip parsers tagged text-latin1 text-printer
@@ -96949,7 +97258,7 @@ self: {
      mkDerivation {
        pname = "network-enumerator";
        version = "0.1.5";
-       sha256 = "11hwgdw03a39k3akjy5qlg9zsb7z8qiikvdmcqr2dhj6ykmfwsvk";
+       sha256 = "736beeeaf446c2263266b5ed192346ff2cfdd3a3b87839d59869a801787b1c86";
        libraryHaskellDepends = [
          base bytestring enumerator network transformers
        ];
@@ -96963,7 +97272,7 @@ self: {
      mkDerivation {
        pname = "network-fancy";
        version = "0.2.3";
-       sha256 = "1b4hbwqbir3qw3hs1mxdqdz0lnagyqrp5r383b6cm7yvjy3q3if5";
+       sha256 = "c5c5818797db9fcacc1a68e47233f64f590a7ec3add7a0e1e078e4b8305f90ac";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/taruti/network-fancy";
        description = "Networking support with a cleaner API";
@@ -96975,7 +97284,7 @@ self: {
      mkDerivation {
        pname = "network-house";
        version = "0.1.0.1";
-       sha256 = "0s9ysp28nd29q2g62w7ch5h7l2kxdjfqqbz4h70vg8py3zs5gfqn";
+       sha256 = "16bb57f41ffea2b7c181e42f8c9d6c7d0a7a6081ec70619ec049348bc4d53e69";
        libraryHaskellDepends = [ array base containers mtl ];
        homepage = "https://github.com/nh2/network-house";
        description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP";
@@ -96988,7 +97297,7 @@ self: {
      mkDerivation {
        pname = "network-info";
        version = "0.2.0.7";
-       sha256 = "0pa0051ji3sr8ax8z1gfgj8x0wvvr20i1zkxs28hq4hdsv1y4dpg";
+       sha256 = "ef36e2c3d60d120c91d07dfe1081c87b73d0917cee858fba42598f284301405d";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/jystic/network-info";
        description = "Access the local computer's basic network configuration";
@@ -97000,7 +97309,7 @@ self: {
      mkDerivation {
        pname = "network-interfacerequest";
        version = "0.0.1";
-       sha256 = "0qa5rbbcw9axg7mj4kjj027hfsclnw85cj8nmi6jvrzq2yhhk56c";
+       sha256 = "cc9409a117f8e72d4dac16495610b79469078f00524e22eb795d25ced6ca4561";
        libraryHaskellDepends = [ base bytestring ioctl network ];
        jailbreak = true;
        description = "Haskell bindings for the ifreq structure";
@@ -97015,7 +97324,7 @@ self: {
      mkDerivation {
        pname = "network-ip";
        version = "0.2.1.1";
-       sha256 = "0abc07pi39drsldhk4znlq1j6cv0vxm7y8yyg2z4qanb3sy990iy";
+       sha256 = "3e8294bc1ecb2a4cbe78de237f6adf60332303a6f693091bd5b9a511ef016c29";
        libraryHaskellDepends = [
          base binary cereal data-default-class data-dword data-endian
          data-textual hashable parsers text-printer type-hint
@@ -97036,7 +97345,7 @@ self: {
      mkDerivation {
        pname = "network-metrics";
        version = "0.4";
-       sha256 = "0dvrjf84pdm42pxwc7fm4gvswc5nzmdsq7cr7ab8jyzvjqb8684c";
+       sha256 = "8c20831696fb7b89963a991dac5bfdb630aef723d51dc6fb15a4b64b90937937";
        libraryHaskellDepends = [
          base binary bytestring data-default network random time
        ];
@@ -97054,7 +97363,7 @@ self: {
      mkDerivation {
        pname = "network-minihttp";
        version = "0.2";
-       sha256 = "104jfksb0xagd8am3h390avqqr3k7qgxcd0znppz4hr0p9d681f5";
+       sha256 = "c505645aba2043f2efb51f34d61f3e73648cb70269c051156a4f75b0f4749280";
        libraryHaskellDepends = [
          base binary binary-strict bytestring containers filepath HsOpenSSL
          mtl network network-bytestring network-connection network-dns
@@ -97071,7 +97380,7 @@ self: {
      mkDerivation {
        pname = "network-msg";
        version = "0.5";
-       sha256 = "0ykphm5xljxml4ifx2v2f7f51kny170k552sy5l4f5paciv47a1g";
+       sha256 = "2fa8437664ea164768f15a9432c109dece50dc71628bee22a1b54bda4b85777a";
        libraryHaskellDepends = [ base binary bytestring network unix ];
        description = "Recvmsg and sendmsg bindings";
        license = "unknown";
@@ -97082,7 +97391,7 @@ self: {
      mkDerivation {
        pname = "network-multicast";
        version = "0.1.0";
-       sha256 = "12kswjqg4xv7gdjqabbyr7wvqkkzsyga3fjxnv9z9fdmil7xphhq";
+       sha256 = "18c2db0f8db5b9f4d3b65dbaa19ed77f4ebcf9c97e2d85657b6777f2b0e47a8a";
        libraryHaskellDepends = [ base network ];
        description = "Simple multicast library";
        license = stdenv.lib.licenses.publicDomain;
@@ -97095,7 +97404,7 @@ self: {
      mkDerivation {
        pname = "network-netpacket";
        version = "0.0.1";
-       sha256 = "12q3bqy57lj46m3l44zdk3sqkhbnqfd5cjp3qy1m5m5wxfdnmx56";
+       sha256 = "a6f46a9bebbcd45283c7e34a569ac376c189f598ed1342473544d2533c5e038b";
        libraryHaskellDepends = [
          base bytestring foreign-storable-asymmetric ioctl network
          network-interfacerequest
@@ -97112,7 +97421,7 @@ self: {
      mkDerivation {
        pname = "network-pgi";
        version = "0.0.1";
-       sha256 = "0s0rk3q1nlic2ibcpr0px0kb8gwp2hbnra5109l71q3dr713n2yw";
+       sha256 = "dc0b3bc2c96de0706802a1a86c1714973fb426e817e4cb56142c521bf0981968";
        libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring enumerator tnet
        ];
@@ -97127,7 +97436,7 @@ self: {
      mkDerivation {
        pname = "network-protocol-xmpp";
        version = "0.4.8";
-       sha256 = "07hy8byhaakjwfidrvkjp07jn25aw21g8wcs93ni3njj0kh2jxza";
+       sha256 = "ea7729e00452da11ed489a71f482e0aa082b0fb872eedca2e3722a05fd421e1e";
        libraryHaskellDepends = [
          base bytestring gnuidn gnutls gsasl libxml-sax monads-tf network
          text transformers xml-types
@@ -97145,7 +97454,7 @@ self: {
      mkDerivation {
        pname = "network-rpca";
        version = "0.0.1";
-       sha256 = "1dhy4n0502rx66pansmgmjv8avwwbhvf23afhb98zqksqlkavdir";
+       sha256 = "39b6ad26c57ae28fd2824e0de1365c9c6f85b6acaf6aabae313d0b5080251eb6";
        libraryHaskellDepends = [
          array base binary binary-strict bytestring codec-libevent
          containers control-timeout network network-bytestring stm
@@ -97160,7 +97469,7 @@ self: {
      mkDerivation {
        pname = "network-server";
        version = "0.2.0";
-       sha256 = "0iijgw07b5g3rcd4va98pb4hdkk912c67y2d1lkz03bfyq75b6xk";
+       sha256 = "b39b550ef66e0df0270d4df863980869ce06c9ba28a94d1acbe39575007f3246";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base network unix ];
@@ -97177,7 +97486,7 @@ self: {
      mkDerivation {
        pname = "network-service";
        version = "0.1.0.0";
-       sha256 = "1js0p0i27fj8rjnq54pcq97bgvhdx7jpwj1ghqmdwpvhn8ds07p4";
+       sha256 = "e41ea01bb2705fde2a862f487ee5e90deeb74ec2ec9282adcc48ba2322b840cb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97199,7 +97508,7 @@ self: {
      mkDerivation {
        pname = "network-simple";
        version = "0.4.0.4";
-       sha256 = "0qa3ax29ci7m01af0d2rvnx9m24q1d9zw727bzhc88k2g6k2xzah";
+       sha256 = "50fd2ea6796222c4e05f471cfe530b98889abadd5934e05400f5449644574361";
        libraryHaskellDepends = [
          base bytestring exceptions network transformers
        ];
@@ -97215,7 +97524,7 @@ self: {
      mkDerivation {
        pname = "network-simple-sockaddr";
        version = "0.2";
-       sha256 = "0c7jjdpzvbpg29njr1w0kn26m3pxa8q1z3sh7bfh933spnvqm52x";
+       sha256 = "5d948ab7bd7a8c04dd3a508f1f3052fd8e6a849d80872c6d12efaefd6f93f230";
        libraryHaskellDepends = [
          base bytestring directory exceptions network transformers
        ];
@@ -97231,7 +97540,7 @@ self: {
      mkDerivation {
        pname = "network-simple-tls";
        version = "0.2.1";
-       sha256 = "0hbpxbs357bxifksbqrlrdkwkkfaydxcf9wdla6kafaymhrxhc0k";
+       sha256 = "1330d833ac5e39358da28d27c77af3cacdc967cb34e3a5a78b7d9d32f4ea7741";
        libraryHaskellDepends = [
          base bytestring certificate cprng-aes exceptions network
          network-simple tls tls-extra transformers
@@ -97248,7 +97557,7 @@ self: {
      mkDerivation {
        pname = "network-socket-options";
        version = "0.2.0.1";
-       sha256 = "00qf22nwzsv8229gb7yqaaafiz573xl4v78mn1zf9ajvwzvwb63r";
+       sha256 = "7998c5f7e75baae47eb0159d4d681fa7fce89452d89ff5921068ebcfad100e03";
        libraryHaskellDepends = [ base network ];
        homepage = "https://github.com/joeyadams/haskell-network-socket-options";
        description = "Type-safe, portable alternative to getSocketOption/setSocketOption";
@@ -97262,7 +97571,7 @@ self: {
      mkDerivation {
        pname = "network-stream";
        version = "0.1.0";
-       sha256 = "1y7c2m8yrkb67iqqv6sjbxxmhlnv0s6k82lv9f6wk4mhckcsc5n1";
+       sha256 = "c116a6d964b092c98d4b9b0a348d06db52587b5f529b8d713c66cdec5115ecf8";
        libraryHaskellDepends = [
          base binary bytestring cereal enumerator network stm text
          transformers
@@ -97281,7 +97590,7 @@ self: {
      mkDerivation {
        pname = "network-topic-models";
        version = "0.2.0.1";
-       sha256 = "1l5m9f08aizrxxkv2dspv8swf558cch6vx4gyzs6qs6826v9q32b";
+       sha256 = "4b0c9cb611c8686cf4f78ff46d2063a814c735da5737b167eff94785804bb5d0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -97303,7 +97612,7 @@ self: {
      mkDerivation {
        pname = "network-transport";
        version = "0.4.2.0";
-       sha256 = "0arwy5csrm33217rmnip6b0x61b6am1db6mj5phfysj0pz30viqf";
+       sha256 = "0ec70dc6bf406aefe02db29ad542556605d3c13237da9a4f1063d4ac59f13c2b";
        libraryHaskellDepends = [
          base binary bytestring deepseq hashable transformers
        ];
@@ -97321,7 +97630,7 @@ self: {
      mkDerivation {
        pname = "network-transport-amqp";
        version = "0.1.0.0";
-       sha256 = "1165xl5g8m423y4nvzwpihzrv6nc9y2dyr6dm4sqp6n1bw4dqqdq";
+       sha256 = "b861dc085fc19a8b35a9cd64df844fcc9a9d3f8c97ff6d891f8254f40aedc584";
        revision = "2";
        editedCabalFile = "724410b5035d55d170110908838d023a675306faf5fc056ed2a8d68beeb112d4";
        libraryHaskellDepends = [
@@ -97346,7 +97655,7 @@ self: {
      mkDerivation {
        pname = "network-transport-inmemory";
        version = "0.5.0";
-       sha256 = "1znc4xk6arzi6vr8pfv2vyvak377jpxzzq82r17kz4csdrbnbfw6";
+       sha256 = "86bb65576e9a913f4fc802e1fffb95e78ca9b6df62bb8bf236f167656627ccfe";
        libraryHaskellDepends = [
          base bytestring containers data-accessor network-transport stm
        ];
@@ -97365,7 +97674,7 @@ self: {
      mkDerivation {
        pname = "network-transport-tcp";
        version = "0.4.2";
-       sha256 = "0wh3d37cfmqbxa0x9c56miki7m9mpg0xv5rrn8fh562lfvcn89ls";
+       sha256 = "9a2664d9765498021db23997ddc1bb35d51367aca6b0d481ea0b57c7ce680372";
        libraryHaskellDepends = [
          base bytestring containers data-accessor network network-transport
        ];
@@ -97384,7 +97693,7 @@ self: {
      mkDerivation {
        pname = "network-transport-tests";
        version = "0.2.2.0";
-       sha256 = "0914sj3884sp5sxbm460x5frvl0ipn8v1jpkskhc9ajjx4v0s106";
+       sha256 = "06040d36e952aac4e0d4f3cab091bd11d09d5de9c090baba2e57138486d42424";
        libraryHaskellDepends = [
          ansi-terminal base bytestring containers mtl network-transport
          random
@@ -97404,7 +97713,7 @@ self: {
      mkDerivation {
        pname = "network-transport-zeromq";
        version = "0.2.1";
-       sha256 = "0bfznyxf893k0yf4cm53bmmcpyrs7llpf6fd077rccn37x1kj0ih";
+       sha256 = "300239433fc33296cf01cd1977293d3afbcb6a5da354469c077324e4bab7df2d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97433,7 +97742,7 @@ self: {
      mkDerivation {
        pname = "network-uri";
        version = "2.6.0.3";
-       sha256 = "1pwbqb2rk4rnvllvdch42p5368xcvpkanp7bxckdhxya8zzwvhhg";
+       sha256 = "0fc2cdff47ca77d826ebeb5cabe6ddac2333ca1504b2b629dd369399c5c28bdf";
        libraryHaskellDepends = [ base deepseq parsec ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -97449,7 +97758,7 @@ self: {
      mkDerivation {
        pname = "network-uri-static";
        version = "0.1.0.0";
-       sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9";
+       sha256 = "c93ac20fb39a326ddbef5a18e4c1205e107a8eb4b6c6df9f68df9c278e956899";
        libraryHaskellDepends = [ base network-uri template-haskell ];
        testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/snakamura/network-uri-static";
@@ -97462,7 +97771,7 @@ self: {
      mkDerivation {
        pname = "network-wai-router";
        version = "0.3.0.1";
-       sha256 = "1fnqc1vbahy6zy632s9kam8bv7108bhmynyh2iwkqb7ybkkj37i9";
+       sha256 = "299e21e75cfe2c3c7914d05b5fe142209cbd50553369318cffc643b57660d8ba";
        libraryHaskellDepends = [ base wai ];
        description = "A routing library for wai";
        license = stdenv.lib.licenses.mit;
@@ -97473,7 +97782,7 @@ self: {
      mkDerivation {
        pname = "network-websocket";
        version = "0.3";
-       sha256 = "053qrlm2bd14mlcvlh64awsqsgn355nkr13k9h4dnfabafymkkbm";
+       sha256 = "75cd59bd534b39db084c73843c6d29c33e8d3557c440ba19ad24b4252acd7814";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base haskell98 network webserver ];
@@ -97491,7 +97800,7 @@ self: {
      mkDerivation {
        pname = "networked-game";
        version = "0.1.0.1";
-       sha256 = "12sy97cgqrsmqywh0cznp8wbsw8z2yahlfalsjy32qarcz44banz";
+       sha256 = "dfaa45c867596131bcd454390a95171f71bd38baf63300b9c75567fcd8495e8b";
        libraryHaskellDepends = [
          base binary bytestring containers network time transformers
        ];
@@ -97505,7 +97814,7 @@ self: {
      mkDerivation {
        pname = "newports";
        version = "1.1";
-       sha256 = "1paxqr8rm8lbp0896qsd7v76c0kahkk6fngpcdzswbrqpyqhwjwc";
+       sha256 = "8c4b0eb1bf382fae7f63f75967e6846a0266ce3e4d639310b88ba29a51c65ddd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory old-time ];
@@ -97522,7 +97831,7 @@ self: {
      mkDerivation {
        pname = "newsynth";
        version = "0.3.0.1";
-       sha256 = "1c65s4nwxzlmix0549chhvm5wj4rvxq92y5kfzd9h11jc4hxl7xs";
+       sha256 = "ba1fda2161320498da77b3789170df99485eea86902552408f95fece2dd1c5b0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97545,7 +97854,7 @@ self: {
      mkDerivation {
        pname = "newt";
        version = "0.0.3.1";
-       sha256 = "0amhpvqqy8pan3vihjvpkd25jz3m4syavw4l15cvqny8mhrxbvpj";
+       sha256 = "f2eed533acc85bbc590994f0adbc26757c59449b774b18f7b0ea228ff1beb02a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97568,7 +97877,7 @@ self: {
      mkDerivation {
        pname = "newtype";
        version = "0.2";
-       sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p";
+       sha256 = "b714033abd9a8b0903bcef0d36d0913de2a5003c852f43f97fa688717289e459";
        libraryHaskellDepends = [ base ];
        description = "A typeclass and set of functions for working with newtypes";
        license = stdenv.lib.licenses.bsd3;
@@ -97581,7 +97890,7 @@ self: {
      mkDerivation {
        pname = "newtype-deriving";
        version = "0.1.2";
-       sha256 = "15ajk0vbh4habil8339naajy7l086cryqw52ifv1agjyn9kmlixa";
+       sha256 = "aa475a67b25e3e15b68ba270ec333308d0e3a552368d81685c0a12b836985295";
        libraryHaskellDepends = [
          base base-prelude monad-control template-haskell transformers
          transformers-base
@@ -97596,7 +97905,7 @@ self: {
      mkDerivation {
        pname = "newtype-generics";
        version = "0.4.1";
-       sha256 = "1qjzcmx5yj85cvdgglyg9f9ff7k9gvnyrb85n6bjzyh10q9n7vd5";
+       sha256 = "a5ed63130601fa2f97b105adeced7e691ee7924bcfd3f7da6605495f7a655fe2";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "A typeclass and set of functions for working with newtypes, with generics support";
@@ -97610,7 +97919,7 @@ self: {
      mkDerivation {
        pname = "newtype-th";
        version = "0.3.3";
-       sha256 = "1slgphymjxzbxxgsilfijkhiwapfy2gkhkby2dxqj107v4s0788k";
+       sha256 = "13a10334d90704897b137e4d389ff0ee2a1ee194d1d1a85fefeb77593dbc8fea";
        libraryHaskellDepends = [
          base haskell-src-meta newtype syb template-haskell
        ];
@@ -97626,7 +97935,7 @@ self: {
      mkDerivation {
        pname = "newtyper";
        version = "0.1";
-       sha256 = "1s1mzy1m3wpawv1ci85dl02105v550l1fdi5rxi5gqnxb0jrg4fs";
+       sha256 = "da91972558dde25762cf253617282865171004a0ada0c8c2e6eaf25183ff35e8";
        libraryHaskellDepends = [ base Kleislify newtype ];
        homepage = "https://github.com/techtangents/Newtyper";
        description = "Extra functions for the Control.Newtype typeclass";
@@ -97638,7 +97947,7 @@ self: {
      mkDerivation {
        pname = "nextstep-plist";
        version = "0.0.1";
-       sha256 = "0wld4nc6hcv642km60vvjyclsfwnpfavq59mqm8fm3a73al4csyw";
+       sha256 = "dc6b46a81a478dea50c53515bc95bb963b4d99977b0353a72066336898258d72";
        libraryHaskellDepends = [ base parsec pretty QuickCheck ];
        description = "NextStep style plist parser and printer";
        license = stdenv.lib.licenses.bsd3;
@@ -97649,7 +97958,7 @@ self: {
      mkDerivation {
        pname = "nf";
        version = "1.0.1.0";
-       sha256 = "1yrw6skp2n8fd874481bfalli8lcglakhdggdsj8dm036wpm935a";
+       sha256 = "aa8c542f3703d486a46eef3538157d8ca248a9722b20420e6a0e5971a7363cfb";
        libraryHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/ezyang/nf";
        description = "NF data type to statically enforce normal form";
@@ -97663,7 +97972,7 @@ self: {
      mkDerivation {
        pname = "ngrams-loader";
        version = "0.1.0.1";
-       sha256 = "0z26mpk1q7hnx4vkcyfwy6pbm7nm76ydm04z3vk598q2ifq5vmpd";
+       sha256 = "edd65db08b02a354e61e9f80dabc39d59ebaaef1dc793637e9161e1ce6ad467c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97684,7 +97993,7 @@ self: {
      mkDerivation {
        pname = "nibblestring";
        version = "0.0.3";
-       sha256 = "0ijcv7ph09mmllly09jgigwiq64m05c7qkq2riki3mbza2skxbrr";
+       sha256 = "39af3eb5507fd51167cc024f7c580195181cf98b4f26e029a5b52600efd94c46";
        libraryHaskellDepends = [
          ansi-wl-pprint base base16-bytestring bytestring
        ];
@@ -97702,7 +98011,7 @@ self: {
      mkDerivation {
        pname = "nicify";
        version = "1.2.1";
-       sha256 = "0qpm18md4jmfznfxqbi9aqvlqrgmiab7b477s11hwcb6y00kyfwk";
+       sha256 = "933b3f01f066310e43d0e79075968af5654c3756292edc9dfdae4ad22a0af562";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base nicify-lib ];
@@ -97715,7 +98024,7 @@ self: {
      mkDerivation {
        pname = "nicify-lib";
        version = "1.0.1";
-       sha256 = "0cp76s0msf1i8a7pkzjl6qgi18n7zdya3pg90ml1dnidg5nzh9kx";
+       sha256 = "7d26f86d792dda166805e9dda17cfbc7a2101f3654fe798f4231385d8136e732";
        libraryHaskellDepends = [ base parsec transformers ];
        description = "Pretty print the standard output of default `Show` instances";
        license = stdenv.lib.licenses.mit;
@@ -97729,7 +98038,7 @@ self: {
      mkDerivation {
        pname = "nicovideo-translator";
        version = "0.1.0.0";
-       sha256 = "01qbmkr9h78iwyrgdijqyf06xl8wk2z9nn4v8dc5pb1gknlbp8wh";
+       sha256 = "90a3bba89d2fac5b58439b589bbe981cd16e80f358c6f6b2e7111d98f2ac0b07";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97751,7 +98060,7 @@ self: {
      mkDerivation {
        pname = "nikepub";
        version = "1.1.2";
-       sha256 = "1w7cvkh36p7i9n62rvfh6nlr8z16hds06fbr1lpvbc84ymci75v0";
+       sha256 = "60971359f504b1b52f0d7939037483267c94a935d0ed2c8c4df15c33e0dcecf0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -97770,7 +98079,7 @@ self: {
      mkDerivation {
        pname = "nimber";
        version = "0.1.3";
-       sha256 = "0350fmddnfp09051i89fl5ibrxqy36cx5560l00cjssx2gs2dh8w";
+       sha256 = "1cc126f4135d6bc900a0c094d299191ef7bc62a12ea1180a48e03adb5a75a00c";
        libraryHaskellDepends = [ arithmoi base ];
        homepage = "http://andersk.mit.edu/haskell/nimber/";
        description = "Finite nimber arithmetic";
@@ -97782,7 +98091,7 @@ self: {
      mkDerivation {
        pname = "nitro";
        version = "0.2.2.5";
-       sha256 = "17aqzk1kq670fwawia0qjmd8ld1b0h8zh0w8j8x4y48hlzyb75xb";
+       sha256 = "ab97b3fca710114f3a928803f811042b348a5a9518a8c81577e0183cc3fc589d";
        libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "http://haskell.gonitro.io";
@@ -97801,7 +98110,7 @@ self: {
      mkDerivation {
        pname = "nixfromnpm";
        version = "0.1.0.7";
-       sha256 = "0pl00kiirpmhzsyr96gzkjrzps69vycpabrjjdq31ngckwqvjib1";
+       sha256 = "6145b9319fecd9307093322f7599dfc9e8fbb39cff9994bdfeb0de1ce304805e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97829,7 +98138,7 @@ self: {
      mkDerivation {
        pname = "nixos-types";
        version = "1.5";
-       sha256 = "1q38cs0747fyf94y35cq734yzmsdcyfmmk5w6qv563jns55qj36c";
+       sha256 = "cc0c894bd1560e533636bccc5a9d674dd7efc9389895e14972de1d72806668e0";
        homepage = "http://hackage.haskell.org/package/cabal2nix";
        description = "this package is obsolete; see cabal2nix instead";
        license = stdenv.lib.licenses.bsd3;
@@ -97843,7 +98152,7 @@ self: {
      mkDerivation {
        pname = "nkjp";
        version = "0.4.0";
-       sha256 = "1i9q0xyfqi3cv29k8yflrg34hgblxfyj2dqr1zjg20jpymsfi06l";
+       sha256 = "d480e874f55702f1e40f193721bdeb743d48c6cbd4793493d86c44ec7c0738c5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97861,7 +98170,7 @@ self: {
      mkDerivation {
        pname = "nlp-scores";
        version = "0.7.0";
-       sha256 = "0cxa6f4y3416hlal4wnqf0qpq82zj9x58nprnaw3s2kdxxav0d9m";
+       sha256 = "3535b055ef6d0a3db8b2f95a547a925f207c3170d8724215852690e18933aa33";
        libraryHaskellDepends = [ base containers strict ];
        homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "Scoring functions commonly used for evaluation in NLP and IR";
@@ -97873,7 +98182,7 @@ self: {
      mkDerivation {
        pname = "nlp-scores-scripts";
        version = "0.2.0.0";
-       sha256 = "02jisx8slzzljv77d931b169hxq6i6ajg5ly9a37g13q9h75gd2c";
+       sha256 = "4cb4570e4c788477864a9e962795890677984c5861a476ce96f47faa51d7510a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -97890,7 +98199,7 @@ self: {
      mkDerivation {
        pname = "nm";
        version = "1.0.1";
-       sha256 = "028p25pb2cqlvrydy87y26rinvypbq0lnphd59k3zaxvxxikqwf1";
+       sha256 = "c1713c63efbbab3f662a0d5e4b015ed76f1bb311fe20df7cde1433b16e111709";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base vector ];
@@ -97908,7 +98217,7 @@ self: {
      mkDerivation {
        pname = "nme";
        version = "0.2";
-       sha256 = "14qzc4af1pm1myjdfs7z4b1jxxj0gz9c4cl9qgpm06hjzvjjf8wm";
+       sha256 = "952327e5fe121a50efc38932c2d27f40f62ec322ff68d7a4afa1dee014611f93";
        libraryHaskellDepends = [ base bytestring utf8-string ];
        homepage = "https://github.com/singpolyma/NME-Haskell";
        description = "Bindings to the Nyctergatis Markup Engine";
@@ -97923,7 +98232,7 @@ self: {
      mkDerivation {
        pname = "nntp";
        version = "0.0.4";
-       sha256 = "1yg91zai4krxx7yqzskss19jjgh4nvc2vqzddvpwsdm07lri8g35";
+       sha256 = "653c14333da036cdef6eede32dd8b6043e2953d07aea8ffde93d4f12d50fe9f9";
        libraryHaskellDepends = [
          base bytestring monad-loops mtl network old-locale parsec time
        ];
@@ -97937,7 +98246,7 @@ self: {
      mkDerivation {
        pname = "no-role-annots";
        version = "1.1";
-       sha256 = "1kk9ii5w40di3azlqzbz4vkvwdz8apca0lh4jn94nvr3hns6l5s7";
+       sha256 = "47176ab485236f4b92950452a0d855e837bee7267f7d4cbf1ab101c24b8c69ce";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/goldfirere/no-role-annots";
@@ -97950,7 +98259,7 @@ self: {
      mkDerivation {
        pname = "nofib-analyze";
        version = "7.10.1";
-       sha256 = "04n056gsxv61igdvdysqkxbsz1a5bvkzfnsbrz03ixjgaqg2whfl";
+       sha256 = "d4412e1e564ff638c0cf4b5bf7e75e4585af579f58fbb6db8bc1ecae9f29c012";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers regex-compat ];
@@ -97967,7 +98276,7 @@ self: {
      mkDerivation {
        pname = "noise";
        version = "0.0.1";
-       sha256 = "0h9aq4f8n1acmzhdq185y0adl35cf7avms6zvgsyf9lkx2msja0q";
+       sha256 = "1828a9abe89326e7f5dbdfe8bad571ac0cda14f00505dce0af4c058b1cc12a41";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97990,7 +98299,7 @@ self: {
      mkDerivation {
        pname = "non-empty";
        version = "0.2.1";
-       sha256 = "1p0jp44xlc77da5g5fq78vvgfv8r9z4m0axm36qbliv609rnp5g3";
+       sha256 = "e3956b73026647bab019b52b50c94f196df7f64607bbf28a6ae730da09b912dc";
        libraryHaskellDepends = [ base containers QuickCheck utility-ht ];
        homepage = "http://code.haskell.org/~thielema/non-empty/";
        description = "List-like structures with static restrictions on the number of elements";
@@ -98002,7 +98311,7 @@ self: {
      mkDerivation {
        pname = "non-negative";
        version = "0.1.1";
-       sha256 = "163g3j3xrx1jkrbg2wnha3yyxyg1mn7kabmbpg82y3rbl3ihy1p7";
+       sha256 = "e7060fe3a02b0f2fd0bbab2e358fade1f9eefd50d072f1569e32f4dc871c6f98";
        libraryHaskellDepends = [ base QuickCheck utility-ht ];
        testHaskellDepends = [ base QuickCheck utility-ht ];
        homepage = "http://code.haskell.org/~thielema/non-negative/";
@@ -98017,7 +98326,7 @@ self: {
      mkDerivation {
        pname = "nonce";
        version = "1.0.2";
-       sha256 = "1l4w6bdrwa42r90n6xzwr8lz2fdrn3m763ls311pnygajr4ih10h";
+       sha256 = "1004184996ea797b43189a0e73eab0b939f129cafc776341ca82289edb329cd0";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cprng-aes crypto-random text
          transformers
@@ -98032,7 +98341,7 @@ self: {
      mkDerivation {
        pname = "nondeterminism";
        version = "1.0";
-       sha256 = "0hxfqrm51svmr9lk1i8l5ib5bi5zlc92q6k3qwnvkqz8qgb4w8i0";
+       sha256 = "20224ed6c3e8e3b92dc7631a2c12a3bfc455562c14c53069ca75eb506ac6ae43";
        libraryHaskellDepends = [ base containers mtl ];
        description = "A monad and monad transformer for nondeterministic computations";
        license = "LGPL";
@@ -98044,7 +98353,7 @@ self: {
      mkDerivation {
        pname = "nonfree";
        version = "0.1.0.1";
-       sha256 = "05jf3i9m58lwixd3mnj9ikgkrg1gdcxz7d8m5k5k5j3fdbbgbmqi";
+       sha256 = "11d7f5d66a6ec832cb2c15b5f33b6b2fbc3cdf8c49da3a5a8f9ca252531c4e16";
        libraryHaskellDepends = [ base ];
        description = "Free structures sans laws";
        license = stdenv.lib.licenses.mit;
@@ -98055,7 +98364,7 @@ self: {
      mkDerivation {
        pname = "nonlinear-optimization";
        version = "0.3.10";
-       sha256 = "11dq7fvysdb0szkg58f2wmx2vg6sa9qfj9kfv7wv6fl3386dnp7f";
+       sha256 = "ee5cdb0c1a833ab3f9d96e26e97052dabc2d7ae5c2a1f2e6d76035edb73bb885";
        libraryHaskellDepends = [ base primitive vector ];
        description = "Various iterative algorithms for optimization of nonlinear functions";
        license = "GPL";
@@ -98068,7 +98377,7 @@ self: {
      mkDerivation {
        pname = "nonlinear-optimization-ad";
        version = "0.2.1";
-       sha256 = "0k3iynppdvmm9asy1wddp8n3gmskh40dmcngqv8pgy5qx0bnx8jd";
+       sha256 = "4da26e17e8b8f877d1c6cfb2da008153d7372cbaadf1e0b54ab5ee76aff5714c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98085,7 +98394,7 @@ self: {
      mkDerivation {
        pname = "noodle";
        version = "0.0.19";
-       sha256 = "08v5rz5skmaqxqj85l76kjxqmlhnf3vapgfdqd042cmh41zwznx0";
+       sha256 = "a0dbcf7f20b0324140c3cdbdabf67016d28abb9ce6d08224ee58d5a9cbcf6523";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -98101,7 +98410,7 @@ self: {
      mkDerivation {
        pname = "normaldistribution";
        version = "1.1.0.3";
-       sha256 = "1q7p0bx435amqb7r9qksix0mrbpnqsyfb44chjyz6xkgjj0s6yvd";
+       sha256 = "6d7ba381946f76f3bd848c90e5bcc6f6ae5c418f7ae294cfc2559541fa02f7e0";
        libraryHaskellDepends = [ base random ];
        homepage = "https://github.com/bjornbm/normaldistribution";
        description = "Minimum fuss normally distributed random values";
@@ -98116,7 +98425,7 @@ self: {
      mkDerivation {
        pname = "not-gloss";
        version = "0.7.5.0";
-       sha256 = "1r0mycb3ilz2k89vab08c1diz18mp03b5sds4ixmxfb0zqaz68lb";
+       sha256 = "8b22f315fe60b95e7b24bae9b206b815851f5b60082cb5139ae2d33816f315e4";
        libraryHaskellDepends = [
          base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
          spatial-math time vector vector-binary-instances
@@ -98132,7 +98441,7 @@ self: {
      mkDerivation {
        pname = "not-gloss-examples";
        version = "0.5.0";
-       sha256 = "0dszimvwb78ac1zfp25iy8lhnsq0grjs6zrsiyr1d80fj9kmg49y";
+       sha256 = "3e915767920ea016b28f3a7fa3657e006b0b29f2b188eb7e600a9dc5778d5f37";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -98148,7 +98457,7 @@ self: {
      mkDerivation {
        pname = "not-in-base";
        version = "0.1.1";
-       sha256 = "1mm1j0l3h8qxpk0bis4g1f6zp5407rkq2z5ldyr036frbvfwqaj5";
+       sha256 = "452accdd5ed99901b26fb47c81673e8094fb8d0b8fe8b8c0bc1d23382890a1d6";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/finnsson/not-in-base";
        description = "Useful utility functions that only depend on base";
@@ -98160,7 +98469,7 @@ self: {
      mkDerivation {
        pname = "notcpp";
        version = "0.2.0.3";
-       sha256 = "15aa96zdz60x9wc9k8ad5qkc4bs5rbgm9xvsykf3ppyys2z449ca";
+       sha256 = "8a2542bed0dedf3bdcf47af754dfca452fc2262e4da199184f1d98dfbe494a95";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Avoiding the C preprocessor via cunning use of Template Haskell";
@@ -98174,7 +98483,7 @@ self: {
      mkDerivation {
        pname = "notmuch-haskell";
        version = "1.0.0.3";
-       sha256 = "0znbsvbjj3995mn04zaxgv0q90qplwjkwhwjkmz1k5jxajxgwwzj";
+       sha256 = "f273feba545d96197e9d92433e25a7178384c17e5d7d026c2d290d29d7d6cb7e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers filepath time ];
@@ -98201,7 +98510,7 @@ self: {
      mkDerivation {
        pname = "notmuch-web";
        version = "0.2.0";
-       sha256 = "1jjk3fhzhpf9wrgk980rgp55kji5zjzdl0xyi4wgz3xvn1k8hrhs";
+       sha256 = "1a668866b0bb8fff3889be03dabefc25ca59ca7d19a0345fe6c95df8a11b53ca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98233,7 +98542,7 @@ self: {
      mkDerivation {
        pname = "notzero";
        version = "0.0.10";
-       sha256 = "0g4l4b5f6m3da172k9n49zkcisbv88b3601zabb474l6a80zrz8p";
+       sha256 = "17fdfc0152869243d6523f003316427be9c8e64fc4a6294e506d54e3ca22943c";
        libraryHaskellDepends = [
          base bifunctors lens mtl semigroupoids semigroups transformers
        ];
@@ -98250,7 +98559,7 @@ self: {
      mkDerivation {
        pname = "np-extras";
        version = "0.3.0.1";
-       sha256 = "19mj868qpvaqmv8j83hcfyrspbg24bc2vdad3gp1wcrrpbj7ib0m";
+       sha256 = "15ac78e4ba39331eee1b4db52dd822e2adabb3770c0e24d1ae58ed8b9141b2a6";
        libraryHaskellDepends = [ base containers numeric-prelude primes ];
        description = "NumericPrelude extras";
        license = stdenv.lib.licenses.bsd3;
@@ -98263,7 +98572,7 @@ self: {
      mkDerivation {
        pname = "np-linear";
        version = "0.3.0.2";
-       sha256 = "00rmm36is8i6k1a0xyri61v09asc54fanlp5nai7k7vhp0wyfzz1";
+       sha256 = "e17fe739b8709f79a2b2e552ab1c294cab04763031fb0e549826221dcda83503";
        libraryHaskellDepends = [
          base binary containers numeric-prelude reflection tagged
        ];
@@ -98280,7 +98589,7 @@ self: {
      mkDerivation {
        pname = "nptools";
        version = "0.6.0";
-       sha256 = "1zipawfk8l98bszi1yviv7ph96x1z715d3nlzs3w2mzahir57h3d";
+       sha256 = "6dc0537284ea57c187fed48e56c2f9a19b04efd971fb10bf5e2851341d5737fe";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -98298,7 +98607,7 @@ self: {
      mkDerivation {
        pname = "nsis";
        version = "0.3";
-       sha256 = "0w7mip0dxpzdfdxj8gdk58zfz5n4aasd60ql546hx3yv5r65dbq3";
+       sha256 = "03af564c2edb8f0e0d291403d3b452c496ef3e2ab33d247b73eddfdec08df570";
        libraryHaskellDepends = [ base transformers uniplate ];
        testHaskellDepends = [
          base directory process transformers uniplate
@@ -98313,7 +98622,7 @@ self: {
      mkDerivation {
        pname = "nth-prime";
        version = "1.2";
-       sha256 = "0iq1658jfywni2yhk3aa1d4bnjjp8c9288bqfqxd8ayv87bvpirh";
+       sha256 = "30c7bbd741db2bd43a767821241243574abb480b4a8d09bd88967b2751310147";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -98331,7 +98640,7 @@ self: {
      mkDerivation {
        pname = "nthable";
        version = "0.1";
-       sha256 = "1qi1wq7wbnp3sv3c2v4185mnq80646vcsnqq16mqlshiy164wsly";
+       sha256 = "9e6a4e4cf0116a8aab09185bcdb62106206c6b41816cc1c6d6e3dac50fe621e2";
        libraryHaskellDepends = [ base type-level ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98344,7 +98653,7 @@ self: {
      mkDerivation {
        pname = "ntp-control";
        version = "0.1";
-       sha256 = "14ns5lbvbdn0yrmfjp9rb4id19fxfd6dp68pgzm4lkh0xk0qnc4y";
+       sha256 = "9e308bc1ec004e4aea7f1799db4c73dda5d02259395de96af6c0b6b5172dda92";
        libraryHaskellDepends = [
          base bytestring bytestring-lexing cereal network old-locale time
        ];
@@ -98362,7 +98671,7 @@ self: {
      mkDerivation {
        pname = "null-canvas";
        version = "0.2.7";
-       sha256 = "1i6krgxlbdmv5md1p3n5mcw3sk24f5sk6y7yiznx8glxncxmfdll";
+       sha256 = "9436573bb39d3ed4ed8ffe78337571444c3d38abc58e1b5a2dbbb645fbcbd3c4";
        libraryHaskellDepends = [
          aeson base containers filepath scotty split stm text transformers
          wai-extra warp
@@ -98379,7 +98688,7 @@ self: {
      mkDerivation {
        pname = "number";
        version = "0.1.0.0";
-       sha256 = "1cl9s5qf7i0kixwqg27znmx4rvnckggpghs3hls77mq22igskd8p";
+       sha256 = "17b5a95f1402d773348543c377df9bccee4c7ab5ff8887798f13c4e370d189b2";
        libraryHaskellDepends = [ base ];
        description = "A library for real numbers";
        license = stdenv.lib.licenses.mit;
@@ -98390,7 +98699,7 @@ self: {
      mkDerivation {
        pname = "numbering";
        version = "0.2.1";
-       sha256 = "0hh4km2zbvs7rsb142f1rifqvwzajh0grgky2vyyyf48dk5plrlv";
+       sha256 = "9b667acb6c8838effd167ebefc0094eaf38d5dccc1091296ce47eff5459d0442";
        libraryHaskellDepends = [ base containers vector ];
        homepage = "https://github.com/DanielSchuessler/numbering";
        description = "Combinators for creating bijections from some type to the natural numbers";
@@ -98404,7 +98713,7 @@ self: {
      mkDerivation {
        pname = "numbers";
        version = "3000.2.0.1";
-       sha256 = "10z1bi5qbc81z5xx2v1ylwcpmcfl1ci7lxrswkgi0dd1wi8havbk";
+       sha256 = "736d0551e4a13510dfe43a777a220bd4b17a19a73e6cd17bf901b1854b5ce183";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -98423,7 +98732,7 @@ self: {
      mkDerivation {
        pname = "numerals";
        version = "0.4";
-       sha256 = "1fkxlwf68bn353hs3622yqvlbndjnf263jbnh4q2rkj4xiirn4qm";
+       sha256 = "15139b63ec44ce2c308176c96184b3b2d94537f64298a1e128c32e641ca77dba";
        libraryHaskellDepends = [
          base base-unicode-symbols containers containers-unicode-symbols
          fingertree integer-gmp text
@@ -98447,7 +98756,7 @@ self: {
      mkDerivation {
        pname = "numerals-base";
        version = "0.3";
-       sha256 = "0qp9xhsqvs22siyfwjzffqc1kbpsanbxks3pbjfdcmbcwlq7hpg8";
+       sha256 = "e85d7830e56c55d69c5c77e8d99755faae191876ee4bee7cd442e88d35ece962";
        libraryHaskellDepends = [
          base base-unicode-symbols containers containers-unicode-symbols
          fingertree
@@ -98468,7 +98777,7 @@ self: {
      mkDerivation {
        pname = "numeric-extras";
        version = "0.0.3";
-       sha256 = "18jyjrk6iizz3sgkwgbh1rxf6zdf166bkgs7wia8b4z7f6261nzg";
+       sha256 = "efdb608471e7938554e447bfb98c09ae7de37a0e703d3e9f1effc76866965ea2";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/numeric-extras";
        description = "Useful tools from the C standard library";
@@ -98480,7 +98789,7 @@ self: {
      mkDerivation {
        pname = "numeric-limits";
        version = "0.1.0.0";
-       sha256 = "0lsi0my45lpd30vjbwdbzhisz8r3lryvg1c80qcmwipnxklnr5cb";
+       sha256 = "8b956ce9ecf6465e19068885b77da623a3af23fcabf1253718edd2427c055153";
        libraryHaskellDepends = [ base ];
        description = "Various floating point limit related constants";
        license = stdenv.lib.licenses.bsd3;
@@ -98493,7 +98802,7 @@ self: {
      mkDerivation {
        pname = "numeric-prelude";
        version = "0.4.2";
-       sha256 = "1i6qavz3av3dbf70li7yqsh184bl618l1sm9s9ia15srrkzsj9sk";
+       sha256 = "5327a9ffcc5997a062d2a9ea405130741114a0c6fe440a8e5b6d6c35fe56d8c4";
        revision = "1";
        editedCabalFile = "acbf128b14ff1177ed767ec9ebb89b1c3c0e998d5d031fdd0e4bc64ebc6bffe2";
        isLibrary = true;
@@ -98514,7 +98823,7 @@ self: {
      mkDerivation {
        pname = "numeric-qq";
        version = "0.1.2";
-       sha256 = "0zxiaiqzcg4z354wyvxl672ffswvhbqk6h6nvpgmydw84akpimcm";
+       sha256 = "95d578a72288375fdfddd64033f1829b6be7c431b46fcf49199f3cf67154b17f";
        libraryHaskellDepends = [
          base loch-th placeholders template-haskell
        ];
@@ -98531,7 +98840,7 @@ self: {
      mkDerivation {
        pname = "numeric-quest";
        version = "0.2.0.1";
-       sha256 = "110v2frn085pggjzl3l8wqgr4vcdd5h29x2wak2a59x16ngjg7ga";
+       sha256 = "ea9d279f35a1a7a2c4545cf42460698d6d921fe6880efae57bb72060b3131b84";
        revision = "1";
        editedCabalFile = "aae9d00f380bf447af5575311f566cd6960aafb7eec8c30abbab09a2fcff092e";
        libraryHaskellDepends = [ array base ];
@@ -98545,7 +98854,7 @@ self: {
      mkDerivation {
        pname = "numeric-tools";
        version = "0.2.0.1";
-       sha256 = "0frdsj90gqpa55ybjfkzfcda43bbwkqd2v26l6w35kyq1snqyhd3";
+       sha256 = "a3418fad0ed8cf32b8a1466cd1f0e46b0da21a737f3ab97c29eae20792d42d3b";
        libraryHaskellDepends = [ base ieee754 primitive vector ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://bitbucket.org/Shimuuar/numeric-tools";
@@ -98558,7 +98867,7 @@ self: {
      mkDerivation {
        pname = "numericpeano";
        version = "0.2.0.0";
-       sha256 = "1f9ar8kdwzi8xarzb7mrq204v1n3n8kh0fbqv06l9677vv1pc19v";
+       sha256 = "3b0576c3dee798440dd878390027b2c3864d80c0b99ef5b3ea287ede26ca2ab9";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ombocomp/numericpeano/";
        description = "Peano numbers with attendant bells and whistles";
@@ -98570,7 +98879,7 @@ self: {
      mkDerivation {
        pname = "nums";
        version = "1.2.0";
-       sha256 = "0bbl7f3qd26sa92k73qni3r1jwxxrfq5k19hcvh5rgdh5ig9d6v8";
+       sha256 = "689b965e2cb0bd5ce066308559b0cbbd7319f288168f334552da8886873b742d";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98581,7 +98890,7 @@ self: {
      mkDerivation {
        pname = "numtype";
        version = "1.1";
-       sha256 = "1az10xcfl6qpyy9qnh8g2iqx53rxnjxzc1h8kl1gira6yv7g6857";
+       sha256 = "a720f3cef646e5f8029d0806f6bbb43d8fd271140f418b93f7171bea5807e1ab";
        libraryHaskellDepends = [ base ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Type-level (low cardinality) integers";
@@ -98593,7 +98902,7 @@ self: {
      mkDerivation {
        pname = "numtype-dk";
        version = "0.5";
-       sha256 = "0gd1a5hf0bw4vc56f1n7y143bsjkdc97pysv4q1gxpwrnj1sgbxd";
+       sha256 = "adafa783b499dffe02265bfb7b126b53ea3548f0c706670adb842fe06051a13d";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/bjornbm/numtype-dk";
        description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families";
@@ -98605,7 +98914,7 @@ self: {
      mkDerivation {
        pname = "numtype-tf";
        version = "0.1.2";
-       sha256 = "00bnz9k4nq21z4vax37qjv6ra2jvlshk0jlici1w8y9rx39zrjyx";
+       sha256 = "ddcbfcd3e83979c44364914a30a1a65b0a95cd96f88cae36f941604b66fa7601";
        libraryHaskellDepends = [ base ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Type-level (low cardinality) integers, implemented using type families";
@@ -98619,7 +98928,7 @@ self: {
      mkDerivation {
        pname = "nurbs";
        version = "0.1.0.0";
-       sha256 = "1rxg0d8j6srhw5mq0i6ma9dyqrx3h1c15pv3gj8brh8ghjw9z1wi";
+       sha256 = "91879fb8840fc1bc907c63df125880a367ec5b52d544806be1306b235103afe7";
        libraryHaskellDepends = [
          base base-unicode-symbols lens linear mtl
        ];
@@ -98643,7 +98952,7 @@ self: {
      mkDerivation {
        pname = "nvim-hs";
        version = "0.0.2";
-       sha256 = "0f551qr7dgn6p4slr0yyfw7v2c6j6w1haqzgc7n7phrgmnhvrhzp";
+       sha256 = "f7c3bca1ad2fc37bec61ef63050337d230b10f77de834c35b9c6be76320ea538";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98674,7 +98983,7 @@ self: {
      mkDerivation {
        pname = "nyan";
        version = "0.2";
-       sha256 = "02bcyb6ibb6m84d2r6pp05vbv9jv09v1lp35n18mn2vkrgwls649";
+       sha256 = "89184df9cb730b5b51b0655c1a76025ba6bd7601f79a2c1a41d5ac15cdf26c09";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring mtl ncurses text ];
@@ -98689,7 +98998,7 @@ self: {
      mkDerivation {
        pname = "nymphaea";
        version = "0.3";
-       sha256 = "1nlnz7mvdkhcqp4v1fyfb6r6v18xpxi0ddqqp84dsqg6ahdypc13";
+       sha256 = "23b0eb1b54e661dd08ba18b70662bf1d856db259cebbb0c9c50cceb6ebf996da";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -98710,7 +99019,7 @@ self: {
      mkDerivation {
        pname = "oauthenticated";
        version = "0.1.3.4";
-       sha256 = "1l6qir6qnipq8295cljl66mhlws2rrqjvz9nsl7rq2ldqv711bbm";
+       sha256 = "75ad10cec68d0a9c0fd536fd2d71ce42730aab315452569240f8468b4d8ed8d0";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring
          case-insensitive crypto-random cryptohash either exceptions
@@ -98727,7 +99036,7 @@ self: {
      mkDerivation {
        pname = "obdd";
        version = "0.3.2";
-       sha256 = "0dck1jaw2smvnc1cdjmxjchsxsjw14h98y58lm5z0ccl3rfjr1hw";
+       sha256 = "1c862c5d1e9431f04ba5a8789420095ceaae2193bdcac602b3bb6ac1950c9335";
        libraryHaskellDepends = [ array base containers mtl random ];
        homepage = "https://github.com/jwaldmann/haskell-obdd";
        description = "Ordered Reduced Binary Decision Diagrams";
@@ -98742,7 +99051,7 @@ self: {
      mkDerivation {
        pname = "oberon0";
        version = "0.0.2";
-       sha256 = "0w8ygppqr1mjklc0545z2n503ap5xzxmjw2xsmb0i85nmh6f95hv";
+       sha256 = "1b96e40cacb6a00856d55d7059fbefe5aa018a15bf9002189db2868cef7d1e71";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98768,7 +99077,7 @@ self: {
      mkDerivation {
        pname = "obj";
        version = "0.1.2";
-       sha256 = "0w9yyyd2i88lkhqlghnf7zkrx0sql5w8vwx67j9j1jr7d5zrad4z";
+       sha256 = "9f34957f6927cb20933ca6f38d78a158839ee73fcec247319c14a1289af73e71";
        libraryHaskellDepends = [
          array base binary bytestring checkers Codec-Image-DevIL containers
          directory filepath graphicsFormats haskell98 InfixApplicative
@@ -98787,7 +99096,7 @@ self: {
      mkDerivation {
        pname = "objectid";
        version = "0.1.0.2";
-       sha256 = "1cr9hzrkj8a6ggym8d6gyy0rmric93x8xwdjqfal10bg5s6d6vgs";
+       sha256 = "fa6dd38c2e6f814095c3b2f18efa482ce69a81f7cf3454fd7b462139f38729b3";
        libraryHaskellDepends = [
          base blaze-builder bytestring cereal cryptohash
        ];
@@ -98810,7 +99119,7 @@ self: {
      mkDerivation {
        pname = "objective";
        version = "1.0.5";
-       sha256 = "07v1srbzd2sxwfwi1jrq63jycr46hwq4wh6wi7sgdpla5m28mhyh";
+       sha256 = "d0c38a442d8adef6f489dc404e30878664e6e53038cb10b9e35d8bf657d6611f";
        libraryHaskellDepends = [
          base containers either exceptions free hashable monad-skeleton
          monad-stm mtl profunctors stm template-haskell transformers
@@ -98826,7 +99135,7 @@ self: {
      mkDerivation {
        pname = "observable-sharing";
        version = "0.2.1.2";
-       sha256 = "0f2da4bxid9ap21p0l6vf8czg84ifnzq1ljj1h4qy95ydv2bc0za";
+       sha256 = "ea03b6c46ebe248f090c52d280bf7591a0f71972db507083b82ab5d817514d38";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/atzeus/observable-sharing";
        description = "Simple observable sharing";
@@ -98844,7 +99153,7 @@ self: {
      mkDerivation {
        pname = "octohat";
        version = "0.1.4.2";
-       sha256 = "0say5682zqv4ss6q9v4p171vprdl6aa7aaack1y0526qq7gj05l2";
+       sha256 = "821620dfc1d888027c984c29759432b4e5bbc30997ec848dd664e32f90295e69";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98872,7 +99181,7 @@ self: {
      mkDerivation {
        pname = "octopus";
        version = "0.0.2.1";
-       sha256 = "1p1sf694a5zryvb2i38ygd7fby54pqi0v5r3b24wcpwj43dy57ca";
+       sha256 = "8a9de2db20925fc6895823970d22bea4f8e54e7b1e8d28d6f6f9174592713adc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98895,7 +99204,7 @@ self: {
      mkDerivation {
        pname = "oculus";
        version = "0.1.0.2";
-       sha256 = "04015wbh5j36gd66k7fn12nl92lq68d0c9dia8fz0pr8y3b7ims4";
+       sha256 = "44d778d6f0285ff01d52b125061a32988a44ad08d69d694c7b66c802172f0110";
        libraryHaskellDepends = [
          base either monads-tf transformers vect-floating
        ];
@@ -98916,7 +99225,7 @@ self: {
      mkDerivation {
        pname = "oeis";
        version = "0.3.6";
-       sha256 = "1q7ywczm2d5inrjqgz3j8vfk5sj2yixvwdkzlfs2whd0gadbcfa0";
+       sha256 = "4039b69a7aa0412eb4a37f36be7bf442ea32dd4672fc8765b6b134513fe3fee0";
        libraryHaskellDepends = [ base HTTP network network-uri ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -98930,7 +99239,7 @@ self: {
      mkDerivation {
        pname = "off-simple";
        version = "0.1";
-       sha256 = "03sb2bmjw8v01908zkzmw8njsmqy5k2hcnv6ajbia7n8qawyhivj";
+       sha256 = "7247e8b9c2c81e159754665b06c52c1e572d2de2f5cf8f400a60232eeb124b0f";
        libraryHaskellDepends = [ base parsec3 vector ];
        jailbreak = true;
        homepage = "https://github.com/acfoltzer/off-simple";
@@ -98943,7 +99252,7 @@ self: {
      mkDerivation {
        pname = "ofx";
        version = "0.4.0.2";
-       sha256 = "0vhr2pydnfc0ma7w1qdn5p5yylzlj3n47fnm16mlbhlb5ydnjshg";
+       sha256 = "0f6a699b2f8bc245ab09d5ba43ec90f453efcb2db6e1c08faa8039dbfc15196e";
        libraryHaskellDepends = [ base parsec pretty time ];
        homepage = "http://www.github.com/massysett/ofx";
        description = "Parser for OFX data";
@@ -98959,7 +99268,7 @@ self: {
      mkDerivation {
        pname = "ohloh-hs";
        version = "0.0.2";
-       sha256 = "0nbk24ymkkjrapxa83qzhzl1m7zi3bxdc9jsjkbqvb7r9nz3jhyj";
+       sha256 = "d24339be4df9ac8dd7945a26d6fa1af19f1ae8871f0fa4fa5559ce593d117359";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base data-lens hxt text-format-simple ];
@@ -98983,7 +99292,7 @@ self: {
      mkDerivation {
        pname = "oi";
        version = "0.3.1";
-       sha256 = "14q8map7r2cc8jcfhczyb16br553h2m9xf40qm34l6pb9l1bzn2p";
+       sha256 = "57d8bf024deb1a4a46c580b89eaa80a394bc4c58fe33e898448c897caeaa0893";
        libraryHaskellDepends = [
          base comonad directory filepath parallel SafeSemaphore
        ];
@@ -98997,7 +99306,7 @@ self: {
      mkDerivation {
        pname = "ois-input-manager";
        version = "0.1.0.1";
-       sha256 = "1p34xybkf5079pq5hkildaz6skx06f6s3qg0k2i73jhh93q3ckiq";
+       sha256 = "384e36f04810ca71a298e0e1a18d33a04f6dbe6a344e58f04d07143797ef64dc";
        libraryHaskellDepends = [ base hogre ];
        librarySystemDepends = [ OIS ];
        jailbreak = true;
@@ -99011,7 +99320,7 @@ self: {
      mkDerivation {
        pname = "old-locale";
        version = "1.0.0.7";
-       sha256 = "0l3viphiszvz5wqzg7a45zp40grwlab941q5ay29iyw8p3v8pbyv";
+       sha256 = "dbaf8bf6b888fb98845705079296a23c3f40ee2f449df7312f7f7f1de18d7b50";
        libraryHaskellDepends = [ base ];
        description = "locale library";
        license = stdenv.lib.licenses.bsd3;
@@ -99022,7 +99331,7 @@ self: {
      mkDerivation {
        pname = "old-time";
        version = "1.1.0.3";
-       sha256 = "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw";
+       sha256 = "1ccb158b0f7851715d36b757c523b026ca1541e2030d02239802ba39b4112bc1";
        libraryHaskellDepends = [ base old-locale ];
        description = "Time library";
        license = stdenv.lib.licenses.bsd3;
@@ -99033,7 +99342,7 @@ self: {
      mkDerivation {
        pname = "old-version";
        version = "1.4.2";
-       sha256 = "1sqga2fmrc702k2grv2kw32wg0yy8qy94cs1jl6112xk6lb79qb3";
+       sha256 = "63e1741635b38b100c954133923c46de83c7c5e053ecfcc414e0b05c9d500feb";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Basic versioning library";
@@ -99048,7 +99357,7 @@ self: {
      mkDerivation {
        pname = "olwrapper";
        version = "0.4.1";
-       sha256 = "0cnkanaxsrsshk2y37sbvyyzc40k61r57zb0c3jarz583h3yzlai";
+       sha256 = "51d1ef071ca8fcace46060fd5372301310f6bddf4b9fe1c5845a67dd9555d332";
        revision = "1";
        editedCabalFile = "44d11ed6751baf0383e968d36adca3c1ab49450cb0e147c1496feba468087e90";
        isLibrary = true;
@@ -99073,7 +99382,7 @@ self: {
      mkDerivation {
        pname = "omaketex";
        version = "0.1.1.0";
-       sha256 = "0kq2j8pndzn3fjdklyh22vcg8am48i29gx4jq2i74p4gmdryavn9";
+       sha256 = "c96ee573ab8f5c72a2c092f4974444a42af4d816027a3a9b74c3fe662f92024f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -99093,7 +99402,7 @@ self: {
      mkDerivation {
        pname = "omega";
        version = "1.5.2";
-       sha256 = "0v11j2gz98g5ng9dsfbr7k3a2xhw2xqa1qi1q8ad53sx2yhjv0ly";
+       sha256 = "9e822da1175d8fd214c221e2a070171c76a1c63c7939ddd2b3e5a1f49f90216c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -99112,7 +99421,7 @@ self: {
      mkDerivation {
        pname = "omnicodec";
        version = "0.7";
-       sha256 = "18xkwsinfjvd20249bm3z0qvsi51j776ifqa6vkrrl186pwa8im7";
+       sha256 = "a746a4f83528d09ce7360abb68ce91a144bd31f8a3ae4404106d4b67a3e6b3a3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -99132,7 +99441,7 @@ self: {
      mkDerivation {
        pname = "on-a-horse";
        version = "0.3";
-       sha256 = "18nbvdbdg05fmymbvvhig6invr6ald0gdadl666m4axc8m9n6pvg";
+       sha256 = "6f5f635345ac2b528d31b4a9f640a3cae46da37911eebdaaafae80d756dbcba2";
        libraryHaskellDepends = [
          arrows base bytestring case-insensitive containers cookie
          http-types mtl random safe split text time transformers utf8-string
@@ -99151,7 +99460,7 @@ self: {
      mkDerivation {
        pname = "on-demand-ssh-tunnel";
        version = "0.1.0.6";
-       sha256 = "0pmkaw3w69nf928z263my7q0l2zi2v4yx5w49warbgv66h00wgkz";
+       sha256 = "7f3e0e003466bf95154f8497eec916f10b0af0f17518f19148ce26c30757b35e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -99170,7 +99479,7 @@ self: {
      mkDerivation {
        pname = "one-liner";
        version = "0.5.1";
-       sha256 = "0nb3cix82nvs06v5mv1xa6076j5cvwyx2jrn7dmyrpf67a76kfh0";
+       sha256 = "00ba698e3ac6ddec6b3b364bd13ddfac487380513dec5ab6017a5b817a646359";
        libraryHaskellDepends = [
          base contravariant ghc-prim transformers
        ];
@@ -99187,7 +99496,7 @@ self: {
      mkDerivation {
        pname = "one-time-password";
        version = "1.0.0.1";
-       sha256 = "1kpwx8lpk764qva536v9x7xskjy94rj8xwwnhsqakps6r29c7qa0";
+       sha256 = "40e1c392c846dfa9b08696f38e6426c9cba9fbe9699b51d4c6c49c7929eafcce";
        libraryHaskellDepends = [
          base byteable bytestring cereal cryptohash time
        ];
@@ -99204,7 +99513,7 @@ self: {
      mkDerivation {
        pname = "oneOfN";
        version = "0.1.0.1";
-       sha256 = "05gycp2zvq08bjl9dx1lm3cjr12i50k3cwq4al34y1rlp2r531lk";
+       sha256 = "938651b2b834074f0655047336262851842cd9a834f496a85c08e0fdc565fe15";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mokus0/oneOfN";
        description = "Anonymous coproduct type";
@@ -99216,7 +99525,7 @@ self: {
      mkDerivation {
        pname = "oneormore";
        version = "0.1.0.3";
-       sha256 = "1lz429abk7qqwfya3wa1m5pcyyldagcmmc0ghjfbl8byhkaax63p";
+       sha256 = "7798aed4847e21ba9c840fb05ad9538d7acf6ea941f1a1bce3189fb95412e4d3";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/thinkpad20/oneormore";
@@ -99230,7 +99539,7 @@ self: {
      mkDerivation {
        pname = "only";
        version = "0.0.6.0";
-       sha256 = "17c9yy0fshxhpdfqb6hi23kvnvvckcdmlr2dffpgx4cg9znh62s1";
+       sha256 = "410b03ed4f8f91feae734d645a1b9b6c6fbbe710119a855dbbb043ed80f7899d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base parsec regex-compat ];
@@ -99243,7 +99552,7 @@ self: {
      mkDerivation {
        pname = "onu-course";
        version = "1";
-       sha256 = "1d0yn5bj04ircxbi12rx80kds54zssmq4j9kqyk05nmv506x76k0";
+       sha256 = "609ad30d28bbda02a6c7334982abd69f14dd26403d8b10576739122057b11eb4";
        libraryHaskellDepends = [ base smallcheck ];
        description = "Code for the Haskell course taught at the Odessa National University in 2012";
        license = stdenv.lib.licenses.mit;
@@ -99255,7 +99564,7 @@ self: {
      mkDerivation {
        pname = "oo-prototypes";
        version = "0.1.0.0";
-       sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly";
+       sha256 = "9eaee40e3221f817b957e472917977bdb06ac0e163a0c6ef87941de29a12f576";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/yi-editor/oo-prototypes";
        description = "Support for OO-like prototypes";
@@ -99271,7 +99580,7 @@ self: {
      mkDerivation {
        pname = "opaleye";
        version = "0.4.0.0";
-       sha256 = "1dzfxy5r2phqcnijvq74ardjg9p2mlkpidg95dd3v9qiz1ls71rk";
+       sha256 = "3387a369f811a73d5a2be9b57827ade2a6275b56e4e02da365185e918befeeb7";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -99297,7 +99606,7 @@ self: {
      mkDerivation {
        pname = "opaleye-sqlite";
        version = "0.0.1.0";
-       sha256 = "0r3ij02wkxq50hl70wn53fdr1qi5gigg4x3y0vabm53gabgxdbxq";
+       sha256 = "b8afd6df526f94bad4067e74f25e7c25e2909b1bc57270280405f7c905907164";
        libraryHaskellDepends = [
          base base16-bytestring bytestring case-insensitive contravariant
          direct-sqlite pretty product-profunctors profunctors semigroups
@@ -99317,7 +99626,7 @@ self: {
      mkDerivation {
        pname = "open-browser";
        version = "0.2.0.0";
-       sha256 = "093i475l9gyb5jyk2m6fdz1dw2jm545rlrbmwqz3vfdfy2ikcks3";
+       sha256 = "434f36a3f0aeb93d3ee675659a0b29550adec26fce5431bd2ccbbf44cb217124";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base process ];
@@ -99335,7 +99644,7 @@ self: {
      mkDerivation {
        pname = "open-pandoc";
        version = "1.5.1.1";
-       sha256 = "1k9d1r1z7q6lm8fha630rg2qfmwwnr9dv2ajvqwvrki2m6i9sczn";
+       sha256 = "f6339da2a922cebc39de5289dd52b69c5787c5cb6018051daad4e0f3430e2dcd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -99354,7 +99663,7 @@ self: {
      mkDerivation {
        pname = "open-typerep";
        version = "0.3.1";
-       sha256 = "1wx3rh7fzq5d4g45k4fjwv0yh5grcqpvzlf2ixkni20d9rhb0yzs";
+       sha256 = "fa7bb0604e0d8868678fc2d1bf2f66f915e8c1e6d29159c823ade0ef0ecca3f3";
        libraryHaskellDepends = [ base constraints mtl syntactic tagged ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/emilaxelsson/open-typerep";
@@ -99367,7 +99676,7 @@ self: {
      mkDerivation {
        pname = "open-union";
        version = "0.1.0.1";
-       sha256 = "1dkz7a5k86r74lnf891grn48q8agkmd81czfp1g4l4dnxslldsqw";
+       sha256 = "1ceb46a9eeb6114a5eb8eeb3805a9d4f218c88cd2f24e42c25271b348b3a7fb6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -99383,7 +99692,7 @@ self: {
      mkDerivation {
        pname = "open-witness";
        version = "0.1.1";
-       sha256 = "1i38lhy1wla0xqgcbyf06179r1hs6194wqd8gg26q491ddc0vp3l";
+       sha256 = "74dc0d586b21116cc47ba8614e52301a869c4e30c0f9c51eee40511e3ca468c4";
        libraryHaskellDepends = [ base mtl witness ];
        jailbreak = true;
        description = "open witnesses";
@@ -99396,7 +99705,7 @@ self: {
      mkDerivation {
        pname = "opencv-raw";
        version = "0.1.0.0";
-       sha256 = "040hjkqd2zqkd8zbnfv8wmyzkfgckiv4njryilx1gpyp7c6qxpwn";
+       sha256 = "96df8e0d3bd7df173a8d3e4b4b769cecb9f97de5683bbb3e6a137fd1f0941010";
        libraryHaskellDepends = [ base bindings-DSL Cabal vector ];
        libraryPkgconfigDepends = [ opencv ];
        jailbreak = true;
@@ -99411,7 +99720,7 @@ self: {
      mkDerivation {
        pname = "opendatatable";
        version = "0.0.0";
-       sha256 = "1bv729ljw07arz9fzg0nqj6fkpwkxkjds073cz3zr9in0a5b1531";
+       sha256 = "6194b08a0236a6fcc767e300dde4ec93dfe98cc416bcefd2cfea002e691267af";
        libraryHaskellDepends = [ base hxt template-haskell th-lift ];
        jailbreak = true;
        homepage = "https://github.com/fabianbergmark/OpenDataTable";
@@ -99426,7 +99735,7 @@ self: {
      mkDerivation {
        pname = "openexchangerates";
        version = "0.1.0.0";
-       sha256 = "0ci1hfdcf0msn3j5l42z4pnn9sw77r0a4anlqsrnl2vrcpfs3j8l";
+       sha256 = "14c9a1dd65790b6ab3c6d42aa2403e87eb64ed255f105ae4b0ba02c79a832132";
        libraryHaskellDepends = [
          aeson base containers currency errors HTTP network text
        ];
@@ -99443,7 +99752,7 @@ self: {
      mkDerivation {
        pname = "openflow";
        version = "0.3.0";
-       sha256 = "0dhg34s4imr1v6wlc567qg5929wa82my7jbhxm9hqq0882vb0sb2";
+       sha256 = "6269b0b64008600c53ed70c9e3ab408a2791cac3c71446b9d921d74834190f36";
        libraryHaskellDepends = [
          aeson base bimap binary bytestring containers deepseq-generics
          hashable network
@@ -99462,7 +99771,7 @@ self: {
      mkDerivation {
        pname = "opengles";
        version = "0.7.0";
-       sha256 = "0vzd1dfg772947h4wny1fsskgdfxk31q86n0p507vmd7pxz6m5dj";
+       sha256 = "b2956a7ebfa7d57d40b9c01a84c398ddb537b576c15b4ee021499cf35c0bed6f";
        libraryHaskellDepends = [
          base bytestring distributive future-resource ghc-prim lens linear
          packer vector
@@ -99481,7 +99790,7 @@ self: {
      mkDerivation {
        pname = "openid";
        version = "0.2.0.2";
-       sha256 = "0rhd2hz3ls9ifcrifxhd4qvd7axydnlk5gckxay55dp2lcfc4css";
+       sha256 = "5a33c21ca3e2b652bcea93bd32a96dbeabd336260d7617337331693a3e140d66";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -99501,7 +99810,7 @@ self: {
      mkDerivation {
        pname = "openpgp";
        version = "0.6.1";
-       sha256 = "03sdl0nzxnqbg8cnkglxkbz5xh5s57n6qgdjdnd82sdz139ia69s";
+       sha256 = "3a1915d308bf69819a6db23d6cec29bac05efe9a9dbe69197a0bdbfe2da04d0f";
        libraryHaskellDepends = [
          base binary bytestring bzlib utf8-string zlib
        ];
@@ -99523,7 +99832,7 @@ self: {
      mkDerivation {
        pname = "openpgp-Crypto";
        version = "0.5";
-       sha256 = "0gsdzfg378j7s2kpryg43ajxcdk8s5szk0yq48qfvnlsbgrxz07r";
+       sha256 = "f980dff35b9adaed3022d883f975d16836d6a51ae4f97ca7d047a2339efb4d3f";
        libraryHaskellDepends = [
          base binary bytestring Crypto openpgp utf8-string
        ];
@@ -99546,7 +99855,7 @@ self: {
      mkDerivation {
        pname = "openpgp-asciiarmor";
        version = "0.1";
-       sha256 = "1xrv0n7n1n8izvxvqm8wmj6mkn5l6wcq18bxs9zd1q5riynmmm2w";
+       sha256 = "5cd45aad8fb9e0d07ed27da1801937b4d8598dac1c55bcfbfe11d9608f053bf7";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring cereal
        ];
@@ -99569,7 +99878,7 @@ self: {
      mkDerivation {
        pname = "openpgp-crypto-api";
        version = "0.6.3";
-       sha256 = "18grb5jzf7n4670xww3ca2l05ck3lj2msynl57y5fjia8gfr8ijm";
+       sha256 = "554694dd432a4a57fc29d47a5d85a463b202a8506c70dec131c41ef76559f9a1";
        libraryHaskellDepends = [
          base binary bytestring cereal crypto-api cryptocipher cryptohash
          openpgp tagged transformers
@@ -99594,7 +99903,7 @@ self: {
      mkDerivation {
        pname = "opensoundcontrol-ht";
        version = "0.3";
-       sha256 = "154bviaqkh9a02li6f2351764wgy0b0lh4a4s0wg8ql7ml0fykza";
+       sha256 = "ea4fef00ad8762f438d0441148c102fe71624e28433813a9002ac18955dc8b94";
        libraryHaskellDepends = [
          base binary bytestring hosc process random transformers utility-ht
        ];
@@ -99610,7 +99919,7 @@ self: {
      mkDerivation {
        pname = "openssh-github-keys";
        version = "0.1.1.0";
-       sha256 = "0a7vfbw84p3iyggq92yhw2dcsmk1cycxaq3v1104i7ipr2kdm36a";
+       sha256 = "ca8cdaa6c8379e4840087b60d599676156cd9ae0d08b84dff3715c82f872fb28";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base octohat text ];
@@ -99632,7 +99941,7 @@ self: {
      mkDerivation {
        pname = "openssl-createkey";
        version = "0.1";
-       sha256 = "1p59wlkirz4dwyhsnzzzbvy2cwfizn2zky5sxrsmnrzfkbpx1ig5";
+       sha256 = "e5c5d0ef9aee675b75eebaf8f985fdd17126fc5eff7faba1e78dfc1c27e5a9dc";
        libraryHaskellDepends = [ base directory HsOpenSSL time unix ];
        description = "Create OpenSSL keypairs";
        license = stdenv.lib.licenses.bsd3;
@@ -99645,7 +99954,7 @@ self: {
      mkDerivation {
        pname = "openssl-streams";
        version = "1.2.1.0";
-       sha256 = "1jqrc9wxvw196vgcbhpazi9vldqs31jb6jxc529iy9k7vh4mk5m9";
+       sha256 = "a9965909dc67261f9328ac4bb364181a37ba53fceac2c5de3629f0dd796219cb";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL io-streams network
        ];
@@ -99662,7 +99971,7 @@ self: {
      mkDerivation {
        pname = "opentheory";
        version = "1.200";
-       sha256 = "0fdxrpsw3c4p1y80xfab0cl5zhkjcp9dlylgxywzq5kcpqv07ifh";
+       sha256 = "d0c50336be6c16fcb9ef8f7adad26572c25f28034bb90e900f97b0c1f5cdbd39";
        libraryHaskellDepends = [ base opentheory-primitive QuickCheck ];
        testHaskellDepends = [ base opentheory-primitive QuickCheck ];
        homepage = "http://opentheory.gilith.com/?pkg=base";
@@ -99677,7 +99986,7 @@ self: {
      mkDerivation {
        pname = "opentheory-bits";
        version = "1.66";
-       sha256 = "1qjgrmi05ay4qss6w5ld4pmksb3lsscqpw0x2dcdkja1i5hfpwfj";
+       sha256 = "d2f1eb608941c9d958131df08b99d6742c3deb258d166eb4c6c4ab0262cd4fe2";
        libraryHaskellDepends = [
          base opentheory opentheory-primitive opentheory-probability
          QuickCheck
@@ -99695,7 +100004,7 @@ self: {
      mkDerivation {
        pname = "opentheory-byte";
        version = "1.126";
-       sha256 = "0zlfik0irikrwk706fdjqb10z5jck3ldlsw269mfwlz6s1d5j2qz";
+       sha256 = "1f0b595ad0e653ee6a32826bdae8984c960fc2c2b23903cee479c61cc18c8e7e";
        libraryHaskellDepends = [
          base opentheory opentheory-bits opentheory-primitive
          opentheory-probability QuickCheck
@@ -99713,7 +100022,7 @@ self: {
      mkDerivation {
        pname = "opentheory-char";
        version = "1.41";
-       sha256 = "0z0dg3bgck8yjn45a7i5ymx2gm9i5m9skmg0n1cg7p6hgdka9j9i";
+       sha256 = "31c9a4667bd0dcf358b0e0d5a9532d31d5277af5251e5588951e4df6d6780d7c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -99736,7 +100045,7 @@ self: {
      mkDerivation {
        pname = "opentheory-divides";
        version = "1.63";
-       sha256 = "1jax8103yhgmbwfzbpnis4nj6f90n3wizb2znvafd4pw2afs5mkv";
+       sha256 = "7bd6a29d12fc92e6d4b65fac1ff9b02039232dd1d1def51d5ff5413f40405dc9";
        libraryHaskellDepends = [
          base opentheory opentheory-primitive QuickCheck
        ];
@@ -99755,7 +100064,7 @@ self: {
      mkDerivation {
        pname = "opentheory-fibonacci";
        version = "1.69";
-       sha256 = "09rqz7fixh1k4ya1aci7v0wy0sz2m7j5cj66plcbvpv6p03yq1vv";
+       sha256 = "7b07ec07b866dfbd18bdc64856e4a9e26be039d8273215942733c01eddf93827";
        libraryHaskellDepends = [
          base opentheory opentheory-primitive opentheory-stream QuickCheck
        ];
@@ -99772,7 +100081,7 @@ self: {
      mkDerivation {
        pname = "opentheory-parser";
        version = "1.158";
-       sha256 = "0325g7m5z64dg8sihmcgi9rmkms6r76hf1d7927v08dl5xh4dlhi";
+       sha256 = "11d246602fb421b08f48a70507cdc946d759738a8f5518357a8d985fea79450c";
        libraryHaskellDepends = [
          base opentheory opentheory-primitive QuickCheck
        ];
@@ -99792,7 +100101,7 @@ self: {
      mkDerivation {
        pname = "opentheory-prime";
        version = "1.82";
-       sha256 = "1x6sir4abr34cghmhbyv5qfd847xbbxg88qaw1vs3sa5lhb5dm8s";
+       sha256 = "1ad55616a445e9a177e00a23f4fa5afd10d41c2edb2f58e16364e4a5488edaf4";
        libraryHaskellDepends = [
          base opentheory opentheory-divides opentheory-primitive
          opentheory-stream QuickCheck
@@ -99812,7 +100121,7 @@ self: {
      mkDerivation {
        pname = "opentheory-primitive";
        version = "1.7";
-       sha256 = "02lg02w4sds1489bfz4hwgnhd9l6a1l7r9pwjd3s16yj2hbmr6jn";
+       sha256 = "569a5c1714d29ba04793fca67c685086a606ede3907cb7122241374db8008f0a";
        libraryHaskellDepends = [ base QuickCheck random ];
        testHaskellDepends = [ base QuickCheck random ];
        homepage = "http://www.gilith.com/research/opentheory/";
@@ -99826,7 +100135,7 @@ self: {
      mkDerivation {
        pname = "opentheory-probability";
        version = "1.49";
-       sha256 = "0dszjszjdabgafpvxiailpgzm7y96f4a8zhjfhin3m36f3lb0dmy";
+       sha256 = "be36b0e87066d4612374127ea48833c99ffadfa551c5beaf536fa926bf965f37";
        libraryHaskellDepends = [
          base opentheory opentheory-primitive QuickCheck
        ];
@@ -99842,7 +100151,7 @@ self: {
      mkDerivation {
        pname = "opentheory-stream";
        version = "1.46";
-       sha256 = "0p27hvxxxl6x6g97llls8kry5vlmpi5b02x9x96v24m4clxj55wa";
+       sha256 = "8a97223b65a412b14deaa90bb04abc95eee2f3449a527ad233ddd0defb86475c";
        libraryHaskellDepends = [
          base opentheory opentheory-primitive QuickCheck
        ];
@@ -99859,7 +100168,7 @@ self: {
      mkDerivation {
        pname = "opentheory-unicode";
        version = "1.140";
-       sha256 = "1w916hc6qn8bf5z95b43aqm25mbivlg7b4q91g5s6gy3q1f4iqna";
+       sha256 = "cae2485cc0c33fa3cb0b0993751edd71d5222a5683ac927e710b596c183421f1";
        libraryHaskellDepends = [
          base opentheory opentheory-bits opentheory-byte opentheory-parser
          opentheory-primitive opentheory-probability QuickCheck
@@ -99879,7 +100188,7 @@ self: {
      mkDerivation {
        pname = "operational";
        version = "0.2.3.2";
-       sha256 = "1aj3jhiyz4190b0qmyp684b8lbzrp8jn56s898892rvbp0hxa0pd";
+       sha256 = "ed02d521b86b6791104a489b6225baf92f8a1641e6fa8ac1022990ef239443aa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl ];
@@ -99894,7 +100203,7 @@ self: {
      mkDerivation {
        pname = "operational-class";
        version = "0.3.0.0";
-       sha256 = "02z766b5a6fa7dgmw3qa1xryijf2im9n79gnjq0m5pd2hv5vja4b";
+       sha256 = "8b28b9cb86a2dd520196f6a563538dc2c9e8730f0a0f5e5f3bca19559631e70b";
        libraryHaskellDepends = [ base operational transformers ];
        homepage = "https://github.com/srijs/haskell-operational-class";
        description = "MonadProgram typeclass for the operational package";
@@ -99906,7 +100215,7 @@ self: {
      mkDerivation {
        pname = "opml";
        version = "0.4";
-       sha256 = "1bnr6lkcf2qs7pvrmd8a5xmklcg67l64b776hzclfvxqy1qil29x";
+       sha256 = "3d091a71f0b86f47d987e69c450c3de6313a6b2f0ab59af73d1a0bc72635d9ae";
        libraryHaskellDepends = [ base directory xml ];
        description = "Representing and handling OPML subscription information";
        license = stdenv.lib.licenses.bsd3;
@@ -99924,7 +100233,7 @@ self: {
      mkDerivation {
        pname = "opml-conduit";
        version = "0.3.0.0";
-       sha256 = "00kknysgzv1cbrgx1sgb2qg99lr3715mhdx2wcjsi65msk67ngiz";
+       sha256 = "3f3e7bccd4b598a825e3a237584b3823d3941e16ebe9d05f5e2cecffb4b77302";
        libraryHaskellDepends = [
          base case-insensitive conduit conduit-parse containers data-default
          exceptions hashable hashable-time lens mono-traversable
@@ -99949,7 +100258,7 @@ self: {
      mkDerivation {
        pname = "opn";
        version = "0.1.2";
-       sha256 = "0x53kvcpbd9fh00zs8wdkb3xsl8hf1bsqgl83ci17di1jyg3m4ch";
+       sha256 = "90913a9e9721b613221b883eac57701051ddc79a8d23fd01802eb575d99ea374";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -99968,7 +100277,7 @@ self: {
      mkDerivation {
        pname = "optimal-blocks";
        version = "0.1.0";
-       sha256 = "1863sh22yfy7i5ibqjsp3bzbaxjd7vwhy2j3r523qrcci0xs8n9b";
+       sha256 = "2b59a43b888c653c44c9430a0ff93e4d76b5fe1a574bbc6289c73b2f04d4c3a0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring deepseq vector ];
@@ -99991,7 +100300,7 @@ self: {
      mkDerivation {
        pname = "optimization";
        version = "0.1.6";
-       sha256 = "182dwjs24m60waqqhvq42l9hpshwzr07bbb87jjpmhfjrlxf4xly";
+       sha256 = "9e76e23acdd2c17aa53c68ad7540fe1cea0b1315046f88b1e2c05422b4e44da0";
        libraryHaskellDepends = [
          ad base distributive linear semigroupoids vector
        ];
@@ -100009,7 +100318,7 @@ self: {
      mkDerivation {
        pname = "optimusprime";
        version = "0.0.1.20091117";
-       sha256 = "0642f9vv08qyqk3pjgin5k2sfv2ffhah9h9rc2xw6ahnygqbpbmf";
+       sha256 = "aeaebbf0f3162ac3bb6039c10415744e6ca7c52c363e79c7c41e23b077728218";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -100028,7 +100337,7 @@ self: {
      mkDerivation {
        pname = "optional";
        version = "0.0.1";
-       sha256 = "1i1nl81gg5fndf3vafirpmklikn4xpy791is6ff8j7pzys0qfj8g";
+       sha256 = "0f498781f6ff1e899c333a8674fcedc4ce4867bd393ab5876bd695f702a236c4";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck
@@ -100043,7 +100352,7 @@ self: {
      mkDerivation {
        pname = "optional-args";
        version = "1.0.0";
-       sha256 = "0j49cp5y7gp9acvhw315lq92mgr35fwaw90vpxy0n9g541ls350z";
+       sha256 = "1f94a16920e5250b7cbf1b24aeb82b23bf2a12a6250c0e3753e9bee3cb658948";
        libraryHaskellDepends = [ base ];
        description = "Optional function arguments";
        license = stdenv.lib.licenses.bsd3;
@@ -100056,7 +100365,7 @@ self: {
      mkDerivation {
        pname = "options";
        version = "1.2.1.1";
-       sha256 = "0qjs0v1ny52w51n5582d4z8wy9h6n0zw1xb5dh686ff5wadflgi8";
+       sha256 = "283eea9ae2c539830c6c65f5c03fb00626cfd1274da0526c285c146fc3065a62";
        libraryHaskellDepends = [ base containers monads-tf transformers ];
        testHaskellDepends = [
          base chell chell-quickcheck containers monads-tf transformers
@@ -100071,7 +100380,7 @@ self: {
      mkDerivation {
        pname = "options-time";
        version = "1.0.1";
-       sha256 = "0rsmwalmnry71w23k6sg0a307xgb2s71j9s12zqqq380fw6c1bhm";
+       sha256 = "15aec00c77000d8cf1174127198e16ebf50386024f9b39040fc7675ba9e25567";
        libraryHaskellDepends = [ base options time ];
        testHaskellDepends = [ base chell options time ];
        homepage = "https://john-millikin.com/software/haskell-options/";
@@ -100086,7 +100395,7 @@ self: {
      mkDerivation {
        pname = "optparse-applicative";
        version = "0.10.0";
-       sha256 = "04hr6rzgc8h0c8fy748as3q7sc8vm94gvk0rw4gdj605z8hvaxcb";
+       sha256 = "8b75b521fa0518d91ee119ccfd48aa1b317df0d00a91e31d620022f67e361912";
        revision = "1";
        editedCabalFile = "20d6ce280b028a493a1920dcc22bb39bee10e9c788a58e03dcaeecba97afffb0";
        libraryHaskellDepends = [
@@ -100105,7 +100414,7 @@ self: {
      mkDerivation {
        pname = "optparse-applicative";
        version = "0.11.0.2";
-       sha256 = "0ni52ii9555jngljvzxn1ngicr6i2w647ww3rzhdrmng04y95iii";
+       sha256 = "31c6923c01cfd6dce0cf83f3430c17d164169f0db6ff2de9b3b294926214255a";
        libraryHaskellDepends = [
          ansi-wl-pprint base process transformers transformers-compat
        ];
@@ -100119,7 +100428,7 @@ self: {
      mkDerivation {
        pname = "optparse-declarative";
        version = "0.3.0";
-       sha256 = "1avy0g6jk34jbfp1xzqcyhb4j53knsbzx1pssl4b5f6nn981mbj8";
+       sha256 = "48ae1a50b2d6b8b208d5fa86fe97b673144916f40cff1eae5b928c29cd037eab";
        libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/tanakh/optparse-declarative";
        description = "Declarative command line option parser";
@@ -100133,7 +100442,7 @@ self: {
      mkDerivation {
        pname = "optparse-simple";
        version = "0.0.3";
-       sha256 = "0zlcvxhx98k1akbv5fzsvwcrmb1rxsmmyaiwkhfrp5dxq6kg0is5";
+       sha256 = "4547f0a6c1bd959b1d9c3c2a5fabee39ac9a19dffabbb2d75461a2d461df8c7e";
        libraryHaskellDepends = [
          base either gitrev optparse-applicative template-haskell
          transformers
@@ -100148,7 +100457,7 @@ self: {
      mkDerivation {
        pname = "orc";
        version = "1.2.1.4";
-       sha256 = "0zl456v2mwa68k2lq7fx3ds6xr9vbrijq8q8ma5mm1kk9p9znr0x";
+       sha256 = "1d64fbd34d73865a8baa08232c635e3be56e741bdd1d4cc54446f12ab629847e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq monadIO mtl process stm ];
@@ -100168,7 +100477,7 @@ self: {
      mkDerivation {
        pname = "orchestrate";
        version = "0.2.0.2";
-       sha256 = "09h9jqni25ysalw747xbf532m0gvy8najjwbn3jj7d3z50s0vf8z";
+       sha256 = "1fb90d34287fb423e5b08b4ba92cf2fb812a4671ab1f723855da17112d960926";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive data-default either errors
          http-client http-types lens mtl text transformers
@@ -100191,7 +100500,7 @@ self: {
      mkDerivation {
        pname = "orchid";
        version = "0.0.8";
-       sha256 = "1d3cfhhsv1qpiiin4cs9wxx2a6vwcj0iad746z7l1qzyxrhg4dkm";
+       sha256 = "7536f260eefee340cf37e4341581647c1b257ae7493362638c1787ad21746cb4";
        libraryHaskellDepends = [
          base bytestring containers encoding extensible-exceptions fclabels
          filestore hscolour mtl nano-md5 parsec process QuickCheck salvia
@@ -100210,7 +100519,7 @@ self: {
      mkDerivation {
        pname = "orchid-demo";
        version = "0.0.6";
-       sha256 = "1gfjmakfx8244q1yqbgp2ji9bh45ll8ixvxbdd961my30j7gh29z";
+       sha256 = "3f09f88e04c3d760526babef1e11a585c095a214f72dec032644a0eea6aad2bd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -100228,7 +100537,7 @@ self: {
      mkDerivation {
        pname = "ord-adhoc";
        version = "0.0.0.1";
-       sha256 = "062wkfpww1ic3xiy26k22369azk5wjlpn5wm5xh1w75kc9crv263";
+       sha256 = "c3889d5962b31c1e602f95177ba9e4657e95cc10621ae1631f2c06ceaf9b5c18";
        libraryHaskellDepends = [ base void ];
        homepage = "https://github.com/fumieval/ord-adhoc/";
        description = "Creating Ord instances instantly";
@@ -100242,7 +100551,7 @@ self: {
      mkDerivation {
        pname = "order-maintenance";
        version = "0.0.1.0";
-       sha256 = "01j8caxlmzz04qabinq5kcjdsr1855lmcdsi9sqn9zf79s16q97k";
+       sha256 = "f3246c824ec7fd64b14e51375669292864dd249b05dbb81426e0ff4abb624806";
        libraryHaskellDepends = [ base containers transformers ];
        testHaskellDepends = [
          base Cabal cabal-test-quickcheck containers QuickCheck transformers
@@ -100260,7 +100569,7 @@ self: {
      mkDerivation {
        pname = "order-statistics";
        version = "0.1.1";
-       sha256 = "1df9b0q4rmgnd74q7pckcppyiygzba6f39vajkwb2pmxlfafcy7a";
+       sha256 = "ea78e694a3bd5eb1f8946aa7e18c5afff9e8ef6593dd83c969f6d54c3058c9b5";
        libraryHaskellDepends = [
          base containers math-functions statistics vector vector-space
        ];
@@ -100275,7 +100584,7 @@ self: {
      mkDerivation {
        pname = "ordered";
        version = "0.1";
-       sha256 = "0s0g5kgzdw7qjsdcddszjclamx9bi0369pkwhh0wncjg68a7mq69";
+       sha256 = "c9e07a14324f32cb01847cde6406882bf5aa28935fb7c69a96f8f0f6df2c0f68";
        libraryHaskellDepends = [ base ];
        description = "A definition of Posets";
        license = "unknown";
@@ -100286,7 +100595,7 @@ self: {
      mkDerivation {
        pname = "orders";
        version = "0.1.0.0";
-       sha256 = "1ry6flg5sh3hl1xpkqk67ayd4y0xx3j2pwcz26q1pgqn6m84plzr";
+       sha256 = "f9d34b503516bf1bb0119ff12be4e81d78d2bc3a66e2797ba070405d1e75c6e7";
        libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "basic orders";
@@ -100300,7 +100609,7 @@ self: {
      mkDerivation {
        pname = "ordrea";
        version = "0.3.0.0";
-       sha256 = "067nf69diqi00vswd7xarl55ps9v5cwqmph1w6nzjylnl0pjh811";
+       sha256 = "2120282fa0967af9ade101de8a392b3be95b0acdaa9fc6f50620e2d89271f618";
        libraryHaskellDepends = [ base containers transformers vector ];
        testHaskellDepends = [ base directory process split ];
        description = "Push-pull implementation of discrete-time FRP";
@@ -100312,7 +100621,7 @@ self: {
      mkDerivation {
        pname = "organize-imports";
        version = "0.3.0.0";
-       sha256 = "04d56k6x6psynk8lddbawc3kfa4yc66w4qgjag20grm4zd7y45ax";
+       sha256 = "5d15e24ffba4e607c453f261c28d619e283707e36ab546d1b45e5fd3cd34a511";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ attoparsec base text ];
@@ -100328,7 +100637,7 @@ self: {
      mkDerivation {
        pname = "orgmode";
        version = "0.1.0.0";
-       sha256 = "084dzafa8pm2hs346zk3x3agzzcxay7ca9r40s6sh61vfc6hbwg0";
+       sha256 = "e0f1050d733b18a88d062427c58e579dfdffd4e8637e438686a25ea49cfa8d20";
        libraryHaskellDepends = [
          base containers HStringTemplate parsec regex-posix syb text
        ];
@@ -100349,7 +100658,7 @@ self: {
      mkDerivation {
        pname = "orgmode-parse";
        version = "0.1.1.2";
-       sha256 = "1ys9gcydipjxn5ba7ndmz70ri218d6wivxrd7xvcsf4kncfks3xi";
+       sha256 = "b10f3d1db39338cd763f2df71db969288898c1f9b5d9a356b15dded83c7b49fb";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable
          old-locale text thyme unordered-containers
@@ -100370,7 +100679,7 @@ self: {
      mkDerivation {
        pname = "origami";
        version = "0.0.4";
-       sha256 = "0q0dsyhpp63kkpjqvjksy1xnwp1f9yilgxrxgwcqrzdjzmgg4rzw";
+       sha256 = "fc67f25efdb2fd8c197f3df747a34f2e5c6e7bf07aca8de59d73987ba1d70d60";
        libraryHaskellDepends = [
          base bifunctors containers lens mtl pretty template-haskell
        ];
@@ -100390,7 +100699,7 @@ self: {
      mkDerivation {
        pname = "os-release";
        version = "0.2.1";
-       sha256 = "0ij6i1yp2rmbkr9jhr8i969xajw3kbfx0yb44s51gm3mcjb3g4la";
+       sha256 = "8a9237966475d4178a266479d0dd9a834bd59349116528539eab66717d884646";
        libraryHaskellDepends = [ base containers parsec transformers ];
        testHaskellDepends = [
          base containers hlint hspec parsec process regex-compat temporary
@@ -100408,7 +100717,7 @@ self: {
      mkDerivation {
        pname = "osc";
        version = "1.0.0.2";
-       sha256 = "0f7diw6nna7mq5rsn63jk9n230pnrr5ppi5dp8rcpniqry2gs1q3";
+       sha256 = "0307fd84cf38dacb32baadc47b4bcef682216c9a7218ab73c1f5286b0d8fed38";
        libraryHaskellDepends = [
          attoparsec base binary bytestring data-binary-ieee754 network
        ];
@@ -100425,7 +100734,7 @@ self: {
      mkDerivation {
        pname = "osdkeys";
        version = "0.0";
-       sha256 = "18pc2r5acb3b6dr7niib4fn8x2la6y3f5zlj3ibrxhl5c1q35j6y";
+       sha256 = "dec832706085c29e571c92fee286378a8a8eac232b467b72336b2ca64a16eca2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100447,7 +100756,7 @@ self: {
      mkDerivation {
        pname = "osm-download";
        version = "0.4";
-       sha256 = "056ggv31nycgz59gkmibzmx0k5x8klb5bwlnbhdih8d71larbsb3";
+       sha256 = "63e995150da721181b5c96f255169da897097afd2bd6f952f98f791bc67ecf14";
        libraryHaskellDepends = [
          base bytestring conduit containers data-default directory gps
          http-conduit http-types monad-control monadIO mtl persistent
@@ -100465,7 +100774,7 @@ self: {
      mkDerivation {
        pname = "osx-ar";
        version = "0.11";
-       sha256 = "1d2lna7gvygiq062p2y1zy182wv3vkr0lda49y502ad6jf483xdn";
+       sha256 = "b6f5818893a629018a4f44350af2dc63738182ffc18b2b0cc0f1f9fd8eb254b4";
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for OS X static archive format";
        license = stdenv.lib.licenses.bsd3;
@@ -100479,7 +100788,7 @@ self: {
      mkDerivation {
        pname = "ot";
        version = "0.2.0.0";
-       sha256 = "0vf4lqc0mffnhz4a03jvs35rl1ygp2ipdmn3dyb5darsg941gsd3";
+       sha256 = "a3e917487a3aab56966fc3d676a3b8cf079acbd05b0ea0c887d6b90a18a6c46d";
        libraryHaskellDepends = [
          aeson attoparsec base binary either ghc mtl QuickCheck text
        ];
@@ -100499,7 +100808,7 @@ self: {
      mkDerivation {
        pname = "ottparse-pretty";
        version = "0.1.2.5";
-       sha256 = "1dwl9jbrhw5b7z2imlnkn8qjk36z06gqca4y9h8r85phsdkyzbm4";
+       sha256 = "a4aeef67d3f01694114c9e28869f01df8c2931b2d3d21ac53fab7098974c94b7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -100514,7 +100823,7 @@ self: {
      mkDerivation {
        pname = "overture";
        version = "0.0.5";
-       sha256 = "0mv9iakq1yjawf7f0zckmxbzlcv2rlqngsllfsrcydi6lxazznzw";
+       sha256 = "fcdbff55a72636cfb27694ea6731cd6233fa57af937de08ee34afa80a78a6957";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        jailbreak = true;
@@ -100529,7 +100838,7 @@ self: {
      mkDerivation {
        pname = "pack";
        version = "0.4.0";
-       sha256 = "19ps1dk855br5h9x72f26sjx8xnh4gmqb0cf5mi65jpp5zvp0zj9";
+       sha256 = "497e70f72ff7ca62622d8e8185eb23d076d4a536c289d3132c799582660bfaa6";
        libraryHaskellDepends = [
          array base bytestring lens transformers vector
        ];
@@ -100546,7 +100855,7 @@ self: {
      mkDerivation {
        pname = "package-o-tron";
        version = "0.1.0.0";
-       sha256 = "0r4zksyszbhywyyayjs1cn8d69cnm0p4y9xqir9nw1g4gkl23df8";
+       sha256 = "c8b521e87ce4056e538eb8274f2ea89625d39065414bafbce71eaeafbd9e9f64";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base filemanip filepath groom process ];
@@ -100562,7 +100871,7 @@ self: {
      mkDerivation {
        pname = "package-vt";
        version = "0.1.3.3";
-       sha256 = "0rsv60n6fd9kkjihdjzi7hadxj8yd6bd640w92y2wx1y9qxl8lhm";
+       sha256 = "1552443b4e3e742ebc481c10d396691ec9de143cf1cb06a39c3335672c305b67";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -100581,7 +100890,7 @@ self: {
      mkDerivation {
        pname = "packdeps";
        version = "0.4.0.3";
-       sha256 = "08an9nwg448d3w4yds67l02mgikmjmn52pvva3i386fv4hfkabhp";
+       sha256 = "172e351d24db1934e2507b5f516c9575c65705a0c7e8e6091f0d11f2b84d5621";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100602,7 +100911,7 @@ self: {
      mkDerivation {
        pname = "packed-dawg";
        version = "0.2.0.7";
-       sha256 = "03wf6pnv2l7aydxzv0gx073324iy5j7pbfh5nl3p5xdpr8y8il7y";
+       sha256 = "fed0883ccab7f57207b505ba758f2c3e1231c601fd81fd7bf3ea50b1ed358e0f";
        libraryHaskellDepends = [
          base binary deepseq mtl unordered-containers vector
          vector-binary-instances
@@ -100621,7 +100930,7 @@ self: {
      mkDerivation {
        pname = "packedstring";
        version = "0.1.0.1";
-       sha256 = "1x78pzzdlnpcmh9p37rlf8m5cxf3yqm2alf3whl4zpr9w25r0qj8";
+       sha256 = "4862908be029df4f28e4c351252af6c375562a72349f7113acec5adafebfe8f4";
        revision = "1";
        editedCabalFile = "cbc334ff8e721fb18b6799b28dc3e77addc7234aa553725b0af68375f75e0bcf";
        libraryHaskellDepends = [ array base ];
@@ -100638,7 +100947,7 @@ self: {
      mkDerivation {
        pname = "packer";
        version = "0.1.8";
-       sha256 = "1r7q54a1c6yb0gjd8hvxq1jw2fmgbhf5anfw47nzibs1bywjjgbi";
+       sha256 = "713d29b95f41aff8ed21dc59551c5caf3ac165c07d43d4e403cb1b161429f8e4";
        libraryHaskellDepends = [ base bytestring ghc-prim transformers ];
        testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-quickcheck
@@ -100655,7 +100964,7 @@ self: {
      mkDerivation {
        pname = "packunused";
        version = "0.1.1.4";
-       sha256 = "1ahb8wq7yxnfzwcvppk8cyhj9r51fz9ci1pwy0h4ql7iyc3z0vy8";
+       sha256 = "c86ff007f3f1504c20f0fc86c8d277a1e424a16768debb19ffce767f30470baa";
        revision = "1";
        editedCabalFile = "5ddb122ff2a1ac4e79226f31b4d8f7dab67bb5501d0e715d84dbfe36c845b772";
        isLibrary = false;
@@ -100674,7 +100983,7 @@ self: {
      mkDerivation {
        pname = "pacman-memcache";
        version = "0.1.0.3";
-       sha256 = "04jlfinds38kjy0qrk00a7ik5x7mkdwkb0cwmlzlif45x4zrhwfv";
+       sha256 = "db71983fe985b8483fad9c8135799bf5f432e35100cc8c8197130ddd6c745412";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base deepseq directory-tree ];
@@ -100691,7 +101000,7 @@ self: {
      mkDerivation {
        pname = "padKONTROL";
        version = "0.1";
-       sha256 = "1sv7124ms2msqb2wb361xshykmh8cr4i85qayjak8y8q7bpzkdfd";
+       sha256 = "cdb5f9ef3a18793495f40a1714496608d6e9a1eec18cc5c5c2ba0a5d890867eb";
        libraryHaskellDepends = [
          base containers hmidi minioperational transformers
        ];
@@ -100708,7 +101017,7 @@ self: {
      mkDerivation {
        pname = "pagarme";
        version = "0.1.0.0";
-       sha256 = "1zkh8cx4bdgsyra7x9kzzdcckg65y1hacwq90w36gdl6i4hs7nj0";
+       sha256 = "40daa3218986b66706070973a660f0c5bcc958fb7fa67e54f6fab5453a4370fe";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100729,7 +101038,7 @@ self: {
      mkDerivation {
        pname = "pager";
        version = "0.1.1.0";
-       sha256 = "1wzfsindjxx61nca36hhldy0y33pgagg506ls9ldvrkvl4n4y7iy";
+       sha256 = "3e1e4f2ca17be6dd68d2d480f29e7a770c0f7ca3109aa1980da677d96cd4eef3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100753,7 +101062,7 @@ self: {
      mkDerivation {
        pname = "pagerduty";
        version = "0.0.3.2";
-       sha256 = "0cdn5xmqpfl85nair2ns3dv690wgyfiapks0lnc3aqi8nnly7bws";
+       sha256 = "9aafe3a9b528623598a540cfaba2f38f8364761bda8a1c952d88ba8b6b2fb631";
        revision = "1";
        editedCabalFile = "016fff9ce8abfc6dec19a84ed7043a2d6f6692f2b0f20a845e98a347a1bc48ba";
        libraryHaskellDepends = [
@@ -100775,7 +101084,7 @@ self: {
      mkDerivation {
        pname = "pagure-hook-receiver";
        version = "0.1.0.0";
-       sha256 = "0qnnkxcad4843v6c1fqqkiip6cv82q5fckpn5v40sw2p9xk3lkcl";
+       sha256 = "944d3a664f57700dc82ef64ee60a16683373639c18bbc0cc1e0491a6589fd662";
        libraryHaskellDepends = [
          base containers scotty shelly text transformers unix
        ];
@@ -100789,7 +101098,7 @@ self: {
      mkDerivation {
        pname = "palette";
        version = "0.1.0.2";
-       sha256 = "1snhn4mz58ax5sd77kh1m4jicwdmlrf89j612rkz5bkavvks6rrr";
+       sha256 = "3967a3e7de6aaef26716c1c8845ca6b5711625a901ce739a2e5da1f22bb1d0ea";
        libraryHaskellDepends = [ array base colour containers ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Utilities for choosing and creating color schemes";
@@ -100801,7 +101110,7 @@ self: {
      mkDerivation {
        pname = "palindromes";
        version = "0.4";
-       sha256 = "1k0kvd8p1ivwmpmf8khwmb4vyk8z0di74xn5840zy9jhf1cwx4kn";
+       sha256 = "7692ce59705026ff0141c5767262031f4dbfc9aa1c4ee4eaad7cc77051db13cc";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ array base bytestring containers ];
@@ -100815,7 +101124,7 @@ self: {
      mkDerivation {
        pname = "pam";
        version = "0.1";
-       sha256 = "1lmkq12p18qavx2c7xrnha56017y0f21ri4l3cqal4fb8zy0g5nj";
+       sha256 = "d29607fc47cb11aa301b94c41c8403fe04608a8236f7c344df0aa37045c0b3d2";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ pam ];
        libraryToolDepends = [ c2hs ];
@@ -100832,7 +101141,7 @@ self: {
      mkDerivation {
        pname = "panda";
        version = "2009.4.1";
-       sha256 = "0yn6ia1pql5fvj784a57ym74n5sd08n1g9djgapllw9lkf6r7hv7";
+       sha256 = "67c3938d9b34714aaf7ab2a5172c024d174b4ef5a728828edcae507c838ac67a";
        libraryHaskellDepends = [
          base cgi containers data-default directory filepath gravatar
          haskell98 hcheat kibro MissingH mps network old-locale old-time
@@ -100860,7 +101169,7 @@ self: {
      mkDerivation {
        pname = "pandoc";
        version = "1.15.0.6";
-       sha256 = "0ipdy5wl2qb8nvmdka9si17hvxn38xmv5pzpb9v5lvaj8a0rcl6r";
+       sha256 = "d950968142526d5a765af7dfb26b47c3f60d4f883aa9d9eab668614179f1ed46";
        configureFlags = [ "-fhttps" ];
        isLibrary = true;
        isExecutable = true;
@@ -100898,8 +101207,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.7.2";
-       sha256 = "0dpr74alkz9vy5yc09bnqb968hcrqys2xlydjda1g3qsarjg7p9y";
+       version = "0.7.3";
+       sha256 = "72fc81d962812d037bb78c6d38d602ca2c6895f0436c8be94cb71600ed288e68";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100926,7 +101235,7 @@ self: {
      mkDerivation {
        pname = "pandoc-crossref";
        version = "0.1.2.4";
-       sha256 = "1ay54zkxxa22nz5sr40d6k4bam81hxh19583kffwqdcp0af23d7l";
+       sha256 = "f4b4219c029735cc9d9b03951460870155b5c8340d90accbb742a8dee727c5ab";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -100947,7 +101256,7 @@ self: {
      mkDerivation {
        pname = "pandoc-csv2table";
        version = "1.0.1";
-       sha256 = "0b4xszf9bzfhrjgy2cymryab58zhh4jwv9p8g2hiqgrxix8jr1qb";
+       sha256 = "0b872c518f3d3f1ca178e8a6cd2581f0a3b294cfd533e19fccd0fd95dcd79d2c";
        revision = "1";
        editedCabalFile = "0924cc418394f855f93486ee6fb3bae991112c3e63df74f95afa6c2d62b09299";
        isLibrary = true;
@@ -100963,10 +101272,9 @@ self: {
     ({ mkDerivation, base, containers, lens, pandoc-types }:
      mkDerivation {
        pname = "pandoc-lens";
-       version = "0.3.2";
-       sha256 = "1n0h3cf2yb5rmlfd0bbxlj3r8bm4h8yffd76fqsbw3s5jm0df4wb";
+       version = "0.3.3";
+       sha256 = "69502fc2630bb482ed4211b9966a0446403af59ee4cab78dd89cebe11b236cdc";
        libraryHaskellDepends = [ base containers lens pandoc-types ];
-       jailbreak = true;
        homepage = "http://github.com/bgamari/pandoc-lens";
        description = "Lenses for Pandoc documents";
        license = stdenv.lib.licenses.bsd3;
@@ -100979,7 +101287,7 @@ self: {
      mkDerivation {
        pname = "pandoc-placetable";
        version = "0.1.2";
-       sha256 = "0vq94j5jsq60p0wbml50hwqa2zpidbzx92cbb7d2ialqj7816zwb";
+       sha256 = "8b7f13d09198aa28da598b89d4ff6af17ea13087a0d0ba38b8c0602d8b24096f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -100998,7 +101306,7 @@ self: {
      mkDerivation {
        pname = "pandoc-types";
        version = "1.12.4.5";
-       sha256 = "0yw7mkhx63320vqabql2iqnmkrwh1qs670sicqpcvv73dchdp8c7";
+       sha256 = "87a1db206be3eccd2e66518363340e90e7592d8e82e2a5f006620cd3e1ac877b";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq-generics ghc-prim syb
        ];
@@ -101012,7 +101320,7 @@ self: {
      mkDerivation {
        pname = "pandoc-unlit";
        version = "0.1.0";
-       sha256 = "0jdlfqhp7h6jsp9qq2ndnm8fs96m19cmmd5rnjpqb76ilg6kn7l9";
+       sha256 = "891e3bcda3d19c85afb4b9b45a590ad524ed50b5cd0a8cd3d5d2c0732176b449";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base pandoc ];
@@ -101028,7 +101336,7 @@ self: {
      mkDerivation {
        pname = "pango";
        version = "0.13.1.0";
-       sha256 = "0s69ga5gn9grdqcfxkbnvk0f3malql3fnhzh9cwvpfzqk3hxn4hn";
+       sha256 = "1612dbe198f8bbbb394bf043eb06c554d5e1c0dc76cdee186ef925fb8a7ac968";
        libraryHaskellDepends = [
          array base cairo containers directory glib mtl pretty process text
        ];
@@ -101046,7 +101354,7 @@ self: {
      mkDerivation {
        pname = "papillon";
        version = "0.1.0.0";
-       sha256 = "02j3bydxzs39ljfnx1sgsn9ppw1cah81dfbws57yp9vdrcyq2ipf";
+       sha256 = "ee46813dcb6da7eb4fd17cb91610542cf07b93d54f876e9da469e8df9b5f430a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101066,7 +101374,7 @@ self: {
      mkDerivation {
        pname = "pappy";
        version = "0.1.0.2";
-       sha256 = "14f4mv9xgqwmmyy3fg1miqdmi7a6bs3hixqk4z46r0pz44w6nlxd";
+       sha256 = "ad536b3821ff826cc82713f708875e469d581b8e353c37bcaf95e3d7d3aec491";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -101081,7 +101389,7 @@ self: {
      mkDerivation {
        pname = "para";
        version = "1.1";
-       sha256 = "0l5abmqi548s10f87m124ld4hhphhl1szljyc04a13fah4dsqjbh";
+       sha256 = "7049ac1b81ca8da008605ed2af0385f042481a2522d4831c081a9112715daa50";
        libraryHaskellDepends = [ base ];
        description = "Text paragraph formatting";
        license = stdenv.lib.licenses.bsd3;
@@ -101095,7 +101403,7 @@ self: {
      mkDerivation {
        pname = "paragon";
        version = "0.1.28";
-       sha256 = "1iz7fg7ziq3ffq1wac0z2m151rn4xmvd5kig04fdw1cy0x487c9c";
+       sha256 = "2cb18348079e05de1c012fced276edc4e65042151f30c503766ee0f8cf73e7c7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101121,7 +101429,7 @@ self: {
      mkDerivation {
        pname = "parallel";
        version = "3.2.0.3";
-       sha256 = "1kbdzdz9s8jq0xysqgvxx1zvzqlxgj1sk476mciwcn327kpl0fhn";
+       sha256 = "163a40ef3c6258c623abe690a9837c9de2bf7fe87d3fac7d0758229d7efb6dcd";
        libraryHaskellDepends = [ array base containers deepseq ];
        jailbreak = true;
        description = "Parallel programming library";
@@ -101133,7 +101441,7 @@ self: {
      mkDerivation {
        pname = "parallel";
        version = "3.2.0.6";
-       sha256 = "0hp6vf4zxsw6vz6lj505xihmnfhgjp39c9q7nyzlgcmps3xx6a5r";
+       sha256 = "b928d3fbd0b7b247bfb7072796c6950f3a5b61ec051449cddf86ebfe89dbe642";
        libraryHaskellDepends = [ array base containers deepseq ];
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
@@ -101144,7 +101452,7 @@ self: {
      mkDerivation {
        pname = "parallel-io";
        version = "0.3.3";
-       sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s";
+       sha256 = "3a14c02b9b8b7c72577eb90a8dd72de75d99192def87d7aa79545ee4d6e80645";
        revision = "1";
        editedCabalFile = "75eeeb51593fa2771c8dbc965ca09d830d62e08135870188a10446f842178bee";
        isLibrary = true;
@@ -101164,7 +101472,7 @@ self: {
      mkDerivation {
        pname = "parallel-tasks";
        version = "4.0.1.0";
-       sha256 = "0cng14pivk0cw3xax0z4j59s0vpbkm7hjycsb3cif6pfjbypsm3x";
+       sha256 = "7d547dfd92ee1a17d9589a79094f9deb6ea05391e483aefae00ccc1d2f09cf32";
        libraryHaskellDepends = [
          base bytestring cereal deepseq here old-locale stm time
          transformers vector vector-algorithms
@@ -101179,7 +101487,7 @@ self: {
      mkDerivation {
        pname = "parallel-tree-search";
        version = "0.4.1";
-       sha256 = "1x2k649q6gqz9z16vwg1j59ajf2wp59lfwb65g8819fz4rwimncr";
+       sha256 = "99d91a7926dfa580d02b66714753b95c38a95291e1f16dc24f1f3f83133153f4";
        libraryHaskellDepends = [ base parallel tree-monad ];
        homepage = "http://github.com/sebfisch/parallel-tree-search";
        description = "Parallel Tree Search";
@@ -101191,7 +101499,7 @@ self: {
      mkDerivation {
        pname = "parameterized-data";
        version = "0.1.5";
-       sha256 = "1zcfpapbgmzfrrwn8bq829scb89b52p1567xaw45d77z3hw24cq1";
+       sha256 = "013322381cff9c560857fd9812ae282ba1c57412082f6479ceeed7b7aeba8efd";
        libraryHaskellDepends = [ base template-haskell type-level ];
        homepage = "http://code.haskell.org/parameterized-data";
        description = "Parameterized data library implementing lightweight dependent types";
@@ -101204,7 +101512,7 @@ self: {
      mkDerivation {
        pname = "parco";
        version = "0.1";
-       sha256 = "0598hz6zqcn4lh5y3vr54z4jh4ampxnh8rq29k6p5vnmrpvn4lq4";
+       sha256 = "045362f7cdd5ee72cd4c0267046dbf551128c92725efe10ba4c432fccd872815";
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised parser combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -101216,7 +101524,7 @@ self: {
      mkDerivation {
        pname = "parco-attoparsec";
        version = "0.1";
-       sha256 = "0bc2gyvc1i3l3p702zs6hfkab7fmc7li5kh4mdzy3a91gzgsl3jh";
+       sha256 = "500eaadf7f21a9e17fab04ce12e961d59da5a683467f01ce1d74c4c0b67f822d";
        libraryHaskellDepends = [ attoparsec base mtl parco ];
        description = "Generalised parser combinators - Attoparsec interface";
        license = stdenv.lib.licenses.bsd3;
@@ -101228,7 +101536,7 @@ self: {
      mkDerivation {
        pname = "parco-parsec";
        version = "0.1";
-       sha256 = "0m3dsjay3av4y0v4j76wxybmk4mkjdhqq81w1wsfr173d4blgxf3";
+       sha256 = "c3f5471769e384ec340f3c208c6193b3925997efdc1c4936f064abe195d46d54";
        libraryHaskellDepends = [ base mtl parco parsec ];
        description = "Generalised parser combinators - Parsec interface";
        license = stdenv.lib.licenses.bsd3;
@@ -101242,7 +101550,7 @@ self: {
      mkDerivation {
        pname = "parcom-lib";
        version = "0.8.0.3";
-       sha256 = "0xkxkqswpkqr9xcpg52v845kkxg8z20r26yih8l2vwkym5cj49ab";
+       sha256 = "4b252259a97ef22d2882d11b9181f8e8f5390b415b9477594f19cfcb359e7d76";
        libraryHaskellDepends = [
          base bytestring containers mtl text transformers utf8-string word8
        ];
@@ -101262,7 +101570,7 @@ self: {
      mkDerivation {
        pname = "parconc-examples";
        version = "0.3.5";
-       sha256 = "05id69rb2cdzs1jf7zgv0gxgvbwm6x83s6ihdh9w1wnnpa7ykpap";
+       sha256 = "57dde98fbad6f2c0136c301a3d503795affdfa03fbfde364d0bf31b172322d16";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -101283,7 +101591,7 @@ self: {
      mkDerivation {
        pname = "parport";
        version = "0.0.0";
-       sha256 = "1d4fq67179n6flmi4ll0341cnnx6p7v44sj5xkk5vknm7qv1p5nx";
+       sha256 = "dd961b363ed5ce5de6ec456a42f6b9a65bcb02198052122b75c6a6138ec18eb4";
        libraryHaskellDepends = [ array base ];
        description = "Simply interfacing the parallel port on linux";
        license = "GPL";
@@ -101294,7 +101602,7 @@ self: {
      mkDerivation {
        pname = "parse-dimacs";
        version = "1.3";
-       sha256 = "0amh3h49xi65kx8l34cy5jkai1f0d9l1qxp4937f3cjf7afif0pj";
+       sha256 = "f202179d3a4eb2e1ce48e4761c686ac085a8a62c9e9141519fc5c49e081cb02a";
        libraryHaskellDepends = [ array base bytestring parsec ];
        description = "DIMACS CNF parser library";
        license = stdenv.lib.licenses.bsd3;
@@ -101307,7 +101615,7 @@ self: {
      mkDerivation {
        pname = "parse-help";
        version = "0.0";
-       sha256 = "1vy7v49nh60gkb7vsig87hv11cxn19xs2jjvd0xnnhdz0zm4z7yf";
+       sha256 = "ce9f4fea07bf416b3b685b4aa17b0ab6b310363ce845bdcf9a0f186813d9c7ef";
        libraryHaskellDepends = [
          attoparsec base containers data-default file-location
          template-haskell text th-lift
@@ -101325,7 +101633,7 @@ self: {
      mkDerivation {
        pname = "parseargs";
        version = "0.1.5.2";
-       sha256 = "0pzw7w1kr2rv6ffqgn93rypn37wy2r5k01p3y5256laaplm575am";
+       sha256 = "5595532abd4a515344f1e306304b169e9f61afcf23d9879d333b8b3c033ffc5f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -101342,7 +101650,7 @@ self: {
      mkDerivation {
        pname = "parsec";
        version = "3.1.9";
-       sha256 = "1ja20cmj6v336jy87c6h3jzjp00sdbakwbdwp11iln499k913xvi";
+       sha256 = "71f711d24c89581a43b8bc2d3ed56a1a802bbf1cd0b083bc34636c232b0342c9";
        libraryHaskellDepends = [ base bytestring mtl text ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -101357,7 +101665,7 @@ self: {
      mkDerivation {
        pname = "parsec-extra";
        version = "0.1.0.5";
-       sha256 = "0x5lpkly8z26ygp0k8ddkybgmfi5n2vnf6sv3sjn3xm531xf6qy4";
+       sha256 = "c463e37a18a5f661a51e5b1b67b7b025bafa969fada109eef3467ce4e9bcb474";
        libraryHaskellDepends = [ base monads-tf parsec transformers ];
        description = "Some miscellaneous basic string parsers";
        license = stdenv.lib.licenses.bsd3;
@@ -101368,7 +101676,7 @@ self: {
      mkDerivation {
        pname = "parsec-numbers";
        version = "0.1.0";
-       sha256 = "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp";
+       sha256 = "77019a4817712f6bfc61c9d148b680579955eb40d286f7766f7b0a90c726febf";
        libraryHaskellDepends = [ base parsec ];
        description = "Utilities for parsing numbers from strings";
        license = stdenv.lib.licenses.bsd3;
@@ -101381,7 +101689,7 @@ self: {
      mkDerivation {
        pname = "parsec-parsers";
        version = "0.2";
-       sha256 = "1knmcciyq07vp06s3xh4hwz654n017863dh9hdp1mwm57vc43s3j";
+       sha256 = "72e841d83ea5f21a6e8309b661d009c092623e8704f6a10db8fb00ec2363d5ce";
        libraryHaskellDepends = [ base parsec parsers ];
        testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
@@ -101395,7 +101703,7 @@ self: {
      mkDerivation {
        pname = "parsec-permutation";
        version = "0.1.2.0";
-       sha256 = "0yfdgvw093kk5id9h6b566zniss26kw6rxnvsni6dgr4knzyx1xi";
+       sha256 = "b187eebf9d24bf66a2d5dbf66cf83442eb68bf316519985a2c738e04f87ecd79";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec QuickCheck ];
        description = "Applicative permutation parser for Parsec intended as a replacement for Text.Parsec.Perm.";
@@ -101407,7 +101715,7 @@ self: {
      mkDerivation {
        pname = "parsec-tagsoup";
        version = "0.1";
-       sha256 = "1pzspf5fimjlki5fn3lxz1kdpd9pf2ww8z9sf08zaiyfp4ms15n1";
+       sha256 = "c196a02bb9ce47f511703a7dc4b97037b5db66f89d0eeb4a9c54d6e88abbfadf";
        libraryHaskellDepends = [ base parsec tagsoup ];
        description = "Parsec parsers for Tagsoup tag streams";
        license = stdenv.lib.licenses.publicDomain;
@@ -101418,7 +101726,7 @@ self: {
      mkDerivation {
        pname = "parsec-utils";
        version = "0.1.0.0";
-       sha256 = "0pfdl9zsdzxcbjh37234djcbg6sdhqzx3fnin0b55hxn78k26ivi";
+       sha256 = "714723263ab6c35216b0d1bad13f864d9bb7986c648833a05cacffa67fa2cd5d";
        libraryHaskellDepends = [ base parsec ];
        description = "Utility functions and combinators for Text.Parsec";
        license = stdenv.lib.licenses.bsd3;
@@ -101429,7 +101737,7 @@ self: {
      mkDerivation {
        pname = "parsec1";
        version = "1.0.0.6";
-       sha256 = "0wwmghla8cqmmpwx9wwcmh39d9np9cgc1d0w3xf18k4adb1sg636";
+       sha256 = "6698a7c36a8a4c145c1f1cb4c01e4bd7a69606ac8cf3d4f9ad1533a4287c9573";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/~daan/parsec.html";
        description = "Portable monadic parser combinators";
@@ -101441,7 +101749,7 @@ self: {
      mkDerivation {
        pname = "parsec2";
        version = "1.0.0";
-       sha256 = "0iq5b5d0pdm49qnigss29vnxj3yjqa5rllp29dxl8df6393k6sk9";
+       sha256 = "696a33471ac635447b4be2529a8bc2d20fd9ed4e42eb172d4ea4b60b5a590547";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/~daan/parsec.html";
        description = "Monadic parser combinators";
@@ -101454,7 +101762,7 @@ self: {
      mkDerivation {
        pname = "parsec3";
        version = "1.0.1.8";
-       sha256 = "00p3kffqmsi6lvxbpa60nql3lgm9vnxsspp8m0jz2d2hfl7hadqf";
+       sha256 = "0e37050f755034f125a8e85eadbbdda93e3a28b6c0a8bbfaa626ea8a9d9be302";
        libraryHaskellDepends = [ base bytestring mtl text ];
        homepage = "http://www.cs.uu.nl/~daan/parsec.html";
        description = "Monadic parser combinators";
@@ -101466,7 +101774,7 @@ self: {
      mkDerivation {
        pname = "parsec3-numbers";
        version = "0.1.0";
-       sha256 = "0i7fvbhvvmf5nld51kv9v0vpb42dlnpivxcl7ll0zwa3gzks2cm5";
+       sha256 = "a532a1e77f43f10f283d94f51dafa54d907537d869cf501ab5c5d5bde1daee44";
        libraryHaskellDepends = [ base parsec ];
        description = "Utilities for parsing numbers from Char sequences";
        license = stdenv.lib.licenses.bsd3;
@@ -101477,7 +101785,7 @@ self: {
      mkDerivation {
        pname = "parsedate";
        version = "3000.0.0";
-       sha256 = "0gsylvm8srddmh3g3ysjgqqmgp0ddg6pdi2sz15v6nrvsqfabiip";
+       sha256 = "37c6a51cd63b5bb34bf85ac476cd6b0ddc57317e52fbf106acad658deaa65e3f";
        libraryHaskellDepends = [ base old-locale old-time parsec ];
        homepage = "http://www.cs.chalmers.se/~bringert/darcs/parsedate/doc/";
        description = "Data and time parsing for CalendarTime";
@@ -101489,7 +101797,7 @@ self: {
      mkDerivation {
        pname = "parseerror-eq";
        version = "0.1.0.1";
-       sha256 = "1w5hn50gwyq2qcax869nplmhrclpsxfy0ckij6ydlhmq22zh0l03";
+       sha256 = "035000bf10b842dabc917132e05dd797b20c2bbd3619d415c3027bfe40b1b0f0";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
        homepage = "https://github.com/stackbuilders/parseerror-eq";
@@ -101502,7 +101810,7 @@ self: {
      mkDerivation {
        pname = "parsek";
        version = "1.0.1.3";
-       sha256 = "184cbw9gz3vv2jbr2wzkygv25y70jayxd8d76pgpvjcaps4qqxp7";
+       sha256 = "e7768c89be8ac97ddf35a7a1d6bd92e0f822f6f3f3739197147b8fff125f8ca0";
        libraryHaskellDepends = [ base ];
        description = "Parallel Parsing Processes";
        license = stdenv.lib.licenses.gpl3;
@@ -101513,7 +101821,7 @@ self: {
      mkDerivation {
        pname = "parsely";
        version = "0.1";
-       sha256 = "16sg32qs1kq184wk6d83z20b9firh1kjmysqwd2aqaiyq37zjyyb";
+       sha256 = "cb7bf9cfc03e2aac44e358fb2a678039bab480f8033533394101cfa0b1184f9b";
        libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://naesten.dyndns.org:8080/repos/parsely";
        license = stdenv.lib.licenses.bsd3;
@@ -101525,7 +101833,7 @@ self: {
      mkDerivation {
        pname = "parser-helper";
        version = "0.1.0.0";
-       sha256 = "0cvdvphxlbyv5l9q5yc4b4kb59ghar2pmqx8pk387ffgz71r7ppb";
+       sha256 = "ebde93c3f9cfb983c6bca8e37a4556f0a5b2265984f982132ddb2fdae1dd6d33";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -101545,7 +101853,7 @@ self: {
      mkDerivation {
        pname = "parsergen";
        version = "0.2.0.7";
-       sha256 = "01yx4pa5x87nqz8k999jr7bnyfkjlgk660c53xkj5ipcvl4b9mfi";
+       sha256 = "d1d5b408ddecc622671f850163e6a3723a6fd7c932a534d1c7f6a05ed425dd07";
        libraryHaskellDepends = [
          base bytestring directory filepath parsec template-haskell
        ];
@@ -101568,7 +101876,7 @@ self: {
      mkDerivation {
        pname = "parsers";
        version = "0.12.2.1";
-       sha256 = "0wrzqx282ygc3m05nff2zkshgnx4lkws8d54qhkd9pjxja0fbjn7";
+       sha256 = "c7cae580925dded426c4a434a4f9a4a4db07f5fcc2395b401dec798144c73f73";
        libraryHaskellDepends = [
          attoparsec base charset containers parsec scientific text
          transformers unordered-containers
@@ -101590,7 +101898,7 @@ self: {
      mkDerivation {
        pname = "parsestar";
        version = "1.5";
-       sha256 = "0prbn7vi2bp66x4fs5cm8lz9qv4d1kpcd20mf24zwpa9siwyf4aq";
+       sha256 = "5811e779d4495dfe89701588c6ee0c8d6c9c3e459515ed4837e62e11f7b12b5f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101612,7 +101920,7 @@ self: {
      mkDerivation {
        pname = "parsimony";
        version = "1.3";
-       sha256 = "0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg";
+       sha256 = "8f229049dccb73c13518977b7a6859d4a30d6c2647d3de1d2ea82694e6f66a6d";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Monadic parser combinators derived from Parsec";
        license = stdenv.lib.licenses.bsd3;
@@ -101623,7 +101931,7 @@ self: {
      mkDerivation {
        pname = "partial";
        version = "0.1.0.0";
-       sha256 = "0ybh0yz68gawbfswk1s498asc1z7qw6b8qys7rasw5i5iw6vjvr8";
+       sha256 = "286fb90d8f2516ae553eda63b40cc7e707a6154a4487c9b55b5c3d64be077079";
        revision = "1";
        editedCabalFile = "f49cbb0cfb2f101a006bb54ada3982ae85b6413d019fd92927ce259b3666e172";
        libraryHaskellDepends = [ base ];
@@ -101637,7 +101945,7 @@ self: {
      mkDerivation {
        pname = "partial-handler";
        version = "1.0.0.0";
-       sha256 = "1fmfiw38v77anh20xh5zzqxm2dcryyyismsagn09sc27jdgnnrzl";
+       sha256 = "f4676b5f9347309d807d4a571dbdf79935513bfebfc00e04b4ea9c8d068faeba";
        revision = "1";
        editedCabalFile = "2e1042c8b036ba686e544bfdd1302fd9f66f377010fa05739e7fc000d97fa597";
        libraryHaskellDepends = [ base ];
@@ -101651,7 +101959,7 @@ self: {
      mkDerivation {
        pname = "partial-isomorphisms";
        version = "0.2";
-       sha256 = "0wmlx1dp7i9rp3s5028gvqa7z0g1dkzlyd134kh04s1lx2hb94px";
+       sha256 = "fd92b4a0e8346802e02423344fff6ce1817f14de0f0950f4b839c5735be8b472";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse";
        description = "Partial isomorphisms";
@@ -101665,7 +101973,7 @@ self: {
      mkDerivation {
        pname = "partial-lens";
        version = "0.0.1";
-       sha256 = "0s7p69fl1a3q4x2n9hf4540dcxjxjsj4knf2nal3wl1djh067ja8";
+       sha256 = "48c96300942d503ea8b2c2d949a4965d76d60029c4c164452778a8405d32f768";
        libraryHaskellDepends = [
          base comonad-transformers data-lens transformers
        ];
@@ -101680,7 +101988,7 @@ self: {
      mkDerivation {
        pname = "partial-uri";
        version = "0.2";
-       sha256 = "0n3rmajbmnydqk6jk36n83a6ra5p1dkdbd592ywjfq4jhmh98333";
+       sha256 = "630c946085926027b917a9b4d5660bb7a86cd440d68c29cdc4cddbbaa4aa7958";
        libraryHaskellDepends = [ base network-uri ];
        homepage = "https://github.com/singpolyma/partial-uri";
        description = "Datatype for passing around unresolved URIs";
@@ -101694,7 +102002,7 @@ self: {
      mkDerivation {
        pname = "partly";
        version = "1.0.0.2";
-       sha256 = "0s5cr0ysxv74dlziyf2ga29wawwlikqgb2njv8g1f1rb8i5n97gv";
+       sha256 = "fb9d644b442b07171edad28af5f08c9473c593504f381f3f6de4ecae3dc8ac68";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base binary bytestring ];
@@ -101719,7 +102027,7 @@ self: {
      mkDerivation {
        pname = "passage";
        version = "0.1";
-       sha256 = "11qrm27a1fn8p8z0q1400nd30sblm8pcn6znz4syg9jkmqhpn8ig";
+       sha256 = "2f227b21ae53a6e735f9f61bcb2eaa7469309a0580040c3ebac8baa08ea81987";
        libraryHaskellDepends = [
          array base containers directory filepath GraphSCC monadLib
          mwc-random pretty primitive process random
@@ -101734,7 +102042,7 @@ self: {
      mkDerivation {
        pname = "passwords";
        version = "0.1.0.6";
-       sha256 = "0x345pfa28abj152kkr1afnaraf4r8pj0216ack79brxvdhlk6li";
+       sha256 = "919a4961db3daf7426532608202fcac4a9acac5321cf294a904b21a1dc2d6474";
        libraryHaskellDepends = [ base containers MonadRandom random ];
        description = "Password generation/validation library";
        license = stdenv.lib.licenses.mit;
@@ -101745,7 +102053,7 @@ self: {
      mkDerivation {
        pname = "pastis";
        version = "0.1.2";
-       sha256 = "1425gzss5maqzrphrvvsw60lkapwg3wfjx10c59qkylx63k5ixjl";
+       sha256 = "54f658e6309dfa8953612074e9f878fcaa4981e17aef0c6ffe58d5a2f57f4590";
        libraryHaskellDepends = [ base HTTP network ];
        description = "Interface to the past.is URL shortening service";
        license = stdenv.lib.licenses.bsd3;
@@ -101757,7 +102065,7 @@ self: {
      mkDerivation {
        pname = "pasty";
        version = "0.1";
-       sha256 = "12pmqcpqa6gjph40w4ga53ij8b989igaf3r6jwxng67kmddkq22z";
+       sha256 = "5f083c5babf398673b97260fa75e4c282d24e328ea110e08bcf219852fc3f58a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring mtl ];
@@ -101772,7 +102080,7 @@ self: {
      mkDerivation {
        pname = "patch-combinators";
        version = "0.2.2";
-       sha256 = "007bxr6xfqjmbx4b9k3n3qw7jmrn298v8cqxvycfhy5924l9jyi6";
+       sha256 = "267a992811a978e898df1d33b45112365779381e76ccb4485f5562d74deeeb00";
        libraryHaskellDepends = [ base ];
        description = "A library for patching functions and data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -101786,7 +102094,7 @@ self: {
      mkDerivation {
        pname = "patch-image";
        version = "0.1.0.1";
-       sha256 = "0ls3dlwgki483l1raaqb247by0kpzvqc54g1gmvr71zfgbfxrjl2";
+       sha256 = "82cadcdd7aee8793777de191c2f0fe7702bf0e110b2b95031d88c4f9386d4353";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -101807,7 +102115,7 @@ self: {
      mkDerivation {
        pname = "path";
        version = "0.5.2";
-       sha256 = "10ai0ygal1pipdi6221nhv0apgv8hzrra7jpgkn7nl62dbj2sl34";
+       sha256 = "64502de46ac2507bec7c571e95f38768bfabc08636086162bbf106aa9e075181";
        libraryHaskellDepends = [
          base exceptions filepath template-haskell
        ];
@@ -101821,7 +102129,7 @@ self: {
      mkDerivation {
        pname = "path-pieces";
        version = "0.2.0";
-       sha256 = "116zx2ryzywh2rd4q16a5vh04gw92as9vgfvraw3a66xn0m6g5y0";
+       sha256 = "c097672ab0dd1835b8cadbbd9db412893f02e02eca044c5a1690fbefb3e8df84";
        libraryHaskellDepends = [ base text time ];
        testHaskellDepends = [ base hspec HUnit QuickCheck text ];
        description = "Components of paths";
@@ -101833,7 +102141,7 @@ self: {
      mkDerivation {
        pname = "pathfinding";
        version = "0.1.0.0";
-       sha256 = "1d1vpkx4gl438b71mni80n46yrhz57z2hq2p9j2fkkpxj3k72y80";
+       sha256 = "007971e690fdcee9844c576028fe291f666f880528da1ace4283d047fabc3bb4";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/rvion/pathfinding";
        description = "pathfinding in grid and graphs";
@@ -101845,7 +102153,7 @@ self: {
      mkDerivation {
        pname = "pathfindingcore";
        version = "1.2";
-       sha256 = "0x2bw79ym5rndhy5qd50gqv6fkqvp2zby4af2d5gdvsbm9fhv6c8";
+       sha256 = "88990d5daa4beff64a134e11bfbeb81b4f67367ea0345c3c6c3697ead3e14b74";
        libraryHaskellDepends = [ array base split ];
        testHaskellDepends = [ array base HUnit tasty tasty-hunit ];
        homepage = "http://github.com/TheBizzle";
@@ -101859,7 +102167,7 @@ self: {
      mkDerivation {
        pname = "pathtype";
        version = "0.5.4";
-       sha256 = "1ns5q3nrkl99xp4mrmk8wpvb9qzyvnw5cyjwh5rh76ykm2d5dbg7";
+       sha256 = "e7ad569aa8d39b0373815c7a56b8ddfee3b4f6e568d65cc9ed29d199edc045db";
        libraryHaskellDepends = [ base directory QuickCheck time ];
        homepage = "http://code.haskell.org/pathtype";
        description = "Type-safe replacement for System.FilePath etc";
@@ -101871,7 +102179,7 @@ self: {
      mkDerivation {
        pname = "patience";
        version = "0.1.1";
-       sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm";
+       sha256 = "35c7c334d344b3cbdc61cc88c559bedb300ace860a80e3990aeb268f1f10db63";
        libraryHaskellDepends = [ base containers ];
        description = "Patience diff and longest increasing subsequence";
        license = stdenv.lib.licenses.bsd3;
@@ -101882,7 +102190,7 @@ self: {
      mkDerivation {
        pname = "patronscraper";
        version = "0.0.0.1";
-       sha256 = "0agmgp3qvd710fcrqyfyvhck6yd311wxmmh5qd8lfgdm6597lhvi";
+       sha256 = "71437a5231b53d4751c305d6da7908a3793319dcde799c9903e1b48dc77df529";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base HandsomeSoup hxt ];
@@ -101896,7 +102204,7 @@ self: {
      mkDerivation {
        pname = "pattern-arrows";
        version = "0.0.2";
-       sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg";
+       sha256 = "6fc2d972e72785d727d2b68e1f82ef94a2c93cedbc00e6a4cdc03498825c078f";
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://blog.functorial.com/posts/2013-10-27-Pretty-Printing-Arrows.html";
        description = "Arrows for Pretty Printing";
@@ -101910,7 +102218,7 @@ self: {
      mkDerivation {
        pname = "patterns";
        version = "0.1.1";
-       sha256 = "176si32zbrklf7wsspg0qdswd85ah0gl9k25ylx9qi2rr1vp18pv";
+       sha256 = "fba27077c859449c3af545cc441f80aaa0c675c3e05dadf97174e6f5c588da9c";
        libraryHaskellDepends = [
          base bytestring conduit containers mtl time utf8-string
          zeromq-haskell
@@ -101926,7 +102234,7 @@ self: {
      mkDerivation {
        pname = "paymill";
        version = "0.0.0";
-       sha256 = "1gw3mxh766wf5anyn84qcf8nn96fzd1ibcjg55bk9b1yw6dc1va0";
+       sha256 = "40edc09ae13eac3457294fb21543fbce246b91639820ebad2a8e1b7360af83bf";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "This is an unofficial client for the Paymill API";
@@ -101941,7 +102249,7 @@ self: {
      mkDerivation {
        pname = "paypal-adaptive-hoops";
        version = "0.11.0.2";
-       sha256 = "0z71j79wqxnixadpy47n30nrwhqya6qaadlwvrk9q60vrqvd21rm";
+       sha256 = "3507d136ce1b189c66de9c36a5b0511e439e2d18f6107f9bead176ccd391e17c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101965,7 +102273,7 @@ self: {
      mkDerivation {
        pname = "paypal-api";
        version = "0.2";
-       sha256 = "0im96yxvbb78sb0b83yypcwsa27gnjbjxbfki5rdnpgbf2yr8k9h";
+       sha256 = "304d94bd70eb5ddb7289d3ad2e97b4ef08a539bbde0fb4c0d2e8acb5bb37a946";
        libraryHaskellDepends = [
          base bytestring conduit containers failure http-conduit http-types
          mtl old-locale text time wai
@@ -101982,7 +102290,7 @@ self: {
      mkDerivation {
        pname = "pb";
        version = "0.1.0";
-       sha256 = "03cb5diy7wvcd0gm09r4172mck0n4v5hxyc622r8k3phzvzq9zdf";
+       sha256 = "aefd84fffef08e89b21086f90ecb26164c56c5092427501f686cf3e3632b8b0d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -101998,7 +102306,7 @@ self: {
      mkDerivation {
        pname = "pbc4hs";
        version = "0.1.1.5";
-       sha256 = "16dki82d9x6rpkbax090ax8ynwjxv31cvpzpy51ynq83kjg3v2z9";
+       sha256 = "e98b3d9e9c0361eb43f1f7dfcdc2d85d72eb51572081aed6bcd9f4d4048ab399";
        libraryHaskellDepends = [ base hslua string-qq ];
        jailbreak = true;
        homepage = "https://github.com/DavidFeng/pbc4hs";
@@ -102013,7 +102321,7 @@ self: {
      mkDerivation {
        pname = "pbkdf";
        version = "1.1.1.1";
-       sha256 = "1nbn8kan43i00g23g8aljxjpaxm9q1qhzxxdgks0mc4mr1f7bifx";
+       sha256 = "ddc5755cc895b00af47cadf70f71c0a97675659754a137c403200e62d54476d9";
        libraryHaskellDepends = [
          base binary byteable bytedump bytestring cryptohash utf8-string
        ];
@@ -102030,7 +102338,7 @@ self: {
      mkDerivation {
        pname = "pcap";
        version = "0.4.5.2";
-       sha256 = "0pydw62qqw61sxfd8x9vvwgpgl3zp6mqv8rm4c825ymzyipjxsg7";
+       sha256 = "e7e92e6ff4bffa22102335a38dabb97fd0771fdf3b75d45cd7c1708c85e1cd5f";
        libraryHaskellDepends = [ base bytestring network time ];
        homepage = "https://github.com/bos/pcap";
        description = "A system-independent interface for user-level packet capture";
@@ -102042,7 +102350,7 @@ self: {
      mkDerivation {
        pname = "pcap-conduit";
        version = "0.1";
-       sha256 = "07a6cwaq668a948njjybj9clbswmhz88xrwjkb42jg9gm1nh46kz";
+       sha256 = "7f1a026da82f3d29c89a92e78ed08795eb455992cb4b6911490a19831567461d";
        libraryHaskellDepends = [
          base bytestring conduit pcap transformers
        ];
@@ -102057,7 +102365,7 @@ self: {
      mkDerivation {
        pname = "pcap-enumerator";
        version = "0.5";
-       sha256 = "0v7ar3jbs54ibhrbbzmvajc7pc8h8dv56wr77w4vsbyz6xq4sqdb";
+       sha256 = "ab614d7037df2fbd093f277353764310b17b9854bbfeb5325c9114bde4c8ea6c";
        libraryHaskellDepends = [
          base bytestring enumerator pcap transformers
        ];
@@ -102074,7 +102382,7 @@ self: {
      mkDerivation {
        pname = "pcd-loader";
        version = "0.3.0.1";
-       sha256 = "1nwyv5c0x262b4j73560bnxhab07ky0cba8nrzdbmmwl2g72c8m7";
+       sha256 = "a72226ce1394d7badacf16a9c5809f072c05bb5dc094712459c2880e58d99edb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102097,7 +102405,7 @@ self: {
      mkDerivation {
        pname = "pcf";
        version = "0.1.0.1";
-       sha256 = "1dmp9afylsf4n7gxa23wn25w8h89lqyhjlxa5g7gshrbwxkx7c55";
+       sha256 = "a5b0d367e72b43fdce2baa53093da60941c48bb07c08d5dfb1c469ea9d4ab7b6";
        libraryHaskellDepends = [
          base bound c-dsl containers monad-gen mtl prelude-extras
          transformers void
@@ -102113,7 +102421,7 @@ self: {
      mkDerivation {
        pname = "pcg-random";
        version = "0.1.3.1";
-       sha256 = "02sx8l51dks316n0df7h75igynb56ms8gs8siczbl5zrlrgycywi";
+       sha256 = "917be65fa6f917ba3e8b1ae98774356559ff6239f0b806ac0943cf160a455d0b";
        libraryHaskellDepends = [
          base bytestring entropy primitive random time
        ];
@@ -102130,7 +102438,7 @@ self: {
      mkDerivation {
        pname = "pcre-heavy";
        version = "0.2.2";
-       sha256 = "08cv6vmf5qpjky8zfrz3c5cczn5vrf30p5masyb3m625wm2sjjw3";
+       sha256 = "834ba945e545983a96d7aa960b86cbbbd8cf5861e367f7919ff2e2e2ea369b21";
        libraryHaskellDepends = [
          base bytestring pcre-light stringable template-haskell
        ];
@@ -102145,7 +102453,7 @@ self: {
      mkDerivation {
        pname = "pcre-less";
        version = "0.2.1";
-       sha256 = "1widnpz4r2az96lwxrq21vm21j9j7b4sn86kqn2iih3xs2dpwqf9";
+       sha256 = "c9617e9bd07dc01885c5d320abc93a32c920ea0e02e7cea9495f894cfeb52df2";
        libraryHaskellDepends = [ array base regex-pcre ];
        description = "Nicer interface to regex-pcre";
        license = stdenv.lib.licenses.bsd3;
@@ -102156,7 +102464,7 @@ self: {
      mkDerivation {
        pname = "pcre-light";
        version = "0.4.0.3";
-       sha256 = "0l1df2sk5qwf424bvb8mbdkr2xjg43fi92n5r22yd7vm1zz0jqvf";
+       sha256 = "6e6309fe0f759fe685c8c58a14dd204f7691675b15adbd88208ee332b5702d50";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ pcre ];
        homepage = "https://github.com/Daniel-Diaz/pcre-light";
@@ -102169,7 +102477,7 @@ self: {
      mkDerivation {
        pname = "pcre-light-extra";
        version = "0.0.0";
-       sha256 = "1kjh36gglszd16rsh0rm2q5fxjlfipzld4hw0l2r23y0flbqkbvx";
+       sha256 = "7daf891775c00f9105051c9246ff8d8ecaee0a163503a8b309ed6bfa9e1950ce";
        libraryHaskellDepends = [ base bytestring pcre-light ];
        jailbreak = true;
        homepage = "http://github.com/urso/pcre-light-extra";
@@ -102184,7 +102492,7 @@ self: {
      mkDerivation {
        pname = "pcre-utils";
        version = "0.1.5";
-       sha256 = "0b6n3sls6r65kn7i9z607ck99sxw2xxh7frljc09cx73iy71ml69";
+       sha256 = "c9d01a8e8fe37496009334bb037b17bceb94263bc0fc148f9dc564a3a91ed62c";
        libraryHaskellDepends = [
          array attoparsec base bytestring mtl regex-pcre-builtin vector
        ];
@@ -102200,7 +102508,7 @@ self: {
      mkDerivation {
        pname = "pdf-toolbox-content";
        version = "0.0.3.3";
-       sha256 = "03kyp3nnbg4gchc4g9biavlf0hdjv77pc66jqngzjzmk8rh03k9c";
+       sha256 = "2ccd016046b37ef99fc5d21876cfd9b241e0e85671a54718648fbc65edb87e0e";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring containers io-streams
          pdf-toolbox-core text
@@ -102217,7 +102525,7 @@ self: {
      mkDerivation {
        pname = "pdf-toolbox-core";
        version = "0.0.3.3";
-       sha256 = "006fp7cvq8r4l0iif2ihi0cq8pxl5mm8vf7ny4zhaniyyf52g68m";
+       sha256 = "1599278af33e5a053ff1f6b88d6a2db45f841988300a1723a02423bcd9b9ce00";
        libraryHaskellDepends = [
          attoparsec base bytestring containers errors io-streams scientific
          transformers zlib-bindings
@@ -102235,7 +102543,7 @@ self: {
      mkDerivation {
        pname = "pdf-toolbox-document";
        version = "0.0.5.1";
-       sha256 = "0qcnhdhxvrj9ypwyb3h7q7w6yn9jpzzrqrlhnas40lvjb9rc2yws";
+       sha256 = "9a7bc1725a725340b4b290669cffbf32596ff8c1078ee5f9f549e6dd61839661";
        libraryHaskellDepends = [
          base bytestring cipher-aes cipher-rc4 containers crypto-api
          cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text
@@ -102254,7 +102562,7 @@ self: {
      mkDerivation {
        pname = "pdf-toolbox-viewer";
        version = "0.0.3.3";
-       sha256 = "02nnxvbd5l2wni9djqmdmqagb5k10dnc1k4crlkvrc8fa9rlajz2";
+       sha256 = "e24b4573520eb1bc27cd8cccc06c036196f514aead62d952b45cd0d2d6eed60a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -102274,7 +102582,7 @@ self: {
      mkDerivation {
        pname = "pdf2line";
        version = "0.0.1";
-       sha256 = "07a9ddr4j5f4vhv1md32f0d3mwhx5p9lw0bwjikfhhqq49jvrpa5";
+       sha256 = "45ddbc65221843e866947c014ed32d1df23a1a7062b41a36dcc41549726b491d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -102291,7 +102599,7 @@ self: {
      mkDerivation {
        pname = "pdfinfo";
        version = "1.5.4";
-       sha256 = "04894cwvcn910j2b0j95dc6i9v6xriqa0v97z3vyi9dhi9yiysls";
+       sha256 = "9a6a1f7d8ab0a5e8f7f8276da070ccddec140d6b2549b084042159b639230911";
        libraryHaskellDepends = [
          base mtl old-locale process-extras text time time-locale-compat
        ];
@@ -102305,7 +102613,7 @@ self: {
      mkDerivation {
        pname = "pdfsplit";
        version = "0.0.1";
-       sha256 = "00bnbfy3awl9vd9vvmh6ylfn2d882r3r1am6b6788b78lvznypxa";
+       sha256 = "aa5f6fffa6e82c848e59a6aa9047160835611df506d6bd53db897235bc5b7601";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -102324,7 +102632,7 @@ self: {
      mkDerivation {
        pname = "pdynload";
        version = "0.0.3";
-       sha256 = "0949nzk85fp9vs6v90cd6kxgg52pcaz2mfahv7416qpgp65hpw93";
+       sha256 = "23f10b8bb9ef6213c8d950b92abe625794f7fa348d81b48ddee9ba82e6b78924";
        libraryHaskellDepends = [
          base directory filepath ghc ghc-paths old-time process
        ];
@@ -102340,7 +102648,7 @@ self: {
      mkDerivation {
        pname = "peakachu";
        version = "0.3.1";
-       sha256 = "1wmlainnbrzpwrsr4qhw7m39s4crhc67xg1mxam0rfj9c1cnimxp";
+       sha256 = "b7d768596049ba0caaea35bc7e0c8399119d463d1c629275e6f7e7656d54b4f2";
        libraryHaskellDepends = [
          base derive GLUT List template-haskell time TypeCompose
        ];
@@ -102354,7 +102662,7 @@ self: {
      mkDerivation {
        pname = "peano";
        version = "0.1.0.1";
-       sha256 = "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i";
+       sha256 = "31fdd23993a76155738224a7b230a1a6fcfde091b2fbc945df4cb54068eeec7b";
        libraryHaskellDepends = [ base ];
        description = "Peano numbers";
        license = "unknown";
@@ -102365,7 +102673,7 @@ self: {
      mkDerivation {
        pname = "peano-inf";
        version = "0.6.5";
-       sha256 = "1w8rvlckqcy41ciq2csb2nf83l969nwvvrrlm0x1yzf5i6ibg33b";
+       sha256 = "6b8cb7a289c57d1f3aa834e7bdb94d26d1819c154b3381230bc4333c19dd19f1";
        libraryHaskellDepends = [ base containers lazysmallcheck ];
        description = "Lazy Peano numbers including observable infinity value";
        license = stdenv.lib.licenses.bsd3;
@@ -102379,7 +102687,7 @@ self: {
      mkDerivation {
        pname = "pec";
        version = "0.2.3";
-       sha256 = "110i4y93gm6b76and12vra8nr5q2dz20dvgpbpdgic3sv2ds16k0";
+       sha256 = "609aa09bd87ab0f8da5df7ed06c46f02976c91ca5b84669539cbd43792271184";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102400,7 +102708,7 @@ self: {
      mkDerivation {
        pname = "pecoff";
        version = "0.11";
-       sha256 = "0vb22jfl309k4a6b80015cyrs5cxls7vyf8faz7lrm7i0vj0vz1q";
+       sha256 = "38fc0de406f1d44ccf570e39bf8fa69d159d3d2b0100b48c223381419d14626d";
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for PE/COFF format";
        license = stdenv.lib.licenses.bsd3;
@@ -102413,7 +102721,7 @@ self: {
      mkDerivation {
        pname = "peg";
        version = "0.2";
-       sha256 = "0mh56nkn31dwpyrl238b06gyfwy3p7y90b9y6k639vpqkn9nnzcd";
+       sha256 = "8d7d6b939df8ee34cc343e2d90fcb9c373e79f010b0d41b3bfbc8561a7350556";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -102432,7 +102740,7 @@ self: {
      mkDerivation {
        pname = "peggy";
        version = "0.3.2";
-       sha256 = "1km847arc193wq6cdr38xvz1znbdmrgdyji2p9rs4j2p35rr6s6y";
+       sha256 = "de689373195748a273ba224adf5eae6dd91ffeee68e4c60ce6230596d521a8ce";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102453,7 +102761,7 @@ self: {
      mkDerivation {
        pname = "pell";
        version = "0.1.0.0";
-       sha256 = "0sxgliwhd0iplv3xd44a40vz8i2kmzvsq1a3zvbz4j77611hmnxd";
+       sha256 = "addb0a4330e748f2d7fe4305acf7af5344f437208a90d6c7a637820679a4af6b";
        libraryHaskellDepends = [ arithmoi base containers ];
        testHaskellDepends = [
          arithmoi base Cabal cabal-test-quickcheck containers primes
@@ -102473,7 +102781,7 @@ self: {
      mkDerivation {
        pname = "pem";
        version = "0.2.2";
-       sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p";
+       sha256 = "372808c76c6d860aedb4e30171cb4ee9f6154d9f68e3f2310f820bf174995a98";
        libraryHaskellDepends = [ base base64-bytestring bytestring mtl ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -102489,7 +102797,7 @@ self: {
      mkDerivation {
        pname = "penn-treebank";
        version = "0.1.0.1";
-       sha256 = "12c5bzn3ac8783lny56n7rd8a1ik4ayfm1pr5v7gm7z53f7iz0qy";
+       sha256 = "1e831f8f1be59fface2ef986eabc223306855a3ed6146fe940073135ec5f8589";
        libraryHaskellDepends = [ base containers parsec ];
        description = "Tools for manipulating the Penn TreeBank";
        license = stdenv.lib.licenses.bsd3;
@@ -102505,7 +102813,7 @@ self: {
      mkDerivation {
        pname = "penny";
        version = "0.32.0.10";
-       sha256 = "0bzxihhi7cs8cqbnz7mf6sj12dyr267265asc010pgyffpjc22qi";
+       sha256 = "110bc1e475cebf0b02605a15238e11d93711a436ae9e6f176648b313218cfd2f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102533,7 +102841,7 @@ self: {
      mkDerivation {
        pname = "penny-bin";
        version = "0.22.0.0";
-       sha256 = "0mdl8wpcy2yzscpww6vv5vhgiwy5xi0js1yxd7y4h5dmvhxsrr9l";
+       sha256 = "34e5ac3bdcb51548fc69dd072d41ecc5f3f8e02e7b1bce2fd3df0bcf2e47b455";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -102556,7 +102864,7 @@ self: {
      mkDerivation {
        pname = "penny-lib";
        version = "0.22.0.0";
-       sha256 = "0fy671xvia7kjlcrwpsv93gsnyz5wvcajlva98ykbh7cdkf56b17";
+       sha256 = "272c53dc6cecc0353d4a6a53a9d8e6e57babdf485b5f9e1995f3a8b87b38c63b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102576,7 +102884,7 @@ self: {
      mkDerivation {
        pname = "peparser";
        version = "0.21";
-       sha256 = "1qy8hghpvp9idiq4ksn55n1dpx7823s7mjfvqfgrmhj0xl1b1y54";
+       sha256 = "a4f8b002ed40c29a9fc3dbc97af410e8f4db822dc5ea49706c31dd7de183c8e3";
        libraryHaskellDepends = [ base binary bytestring haskell98 ];
        homepage = "https://github.com/igraves/peparser-haskell";
        description = "A parser for PE object files";
@@ -102589,7 +102897,7 @@ self: {
      mkDerivation {
        pname = "perceptron";
        version = "0.1.0.3";
-       sha256 = "0w1vrsv43z92y6vsv9nzs2pjlqkhrxvzh53r2722530lzff34m78";
+       sha256 = "e854329cfb148c22c4117914f877cf70622aafd0dfa6adb7f122fd41b6ce3b70";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "The perceptron learning algorithm";
@@ -102606,7 +102914,7 @@ self: {
      mkDerivation {
        pname = "perdure";
        version = "0.2.1";
-       sha256 = "04vj8kva5qmrf8r93xyf0qw8nx64j241pdc19s2ddvd21lq5wqkz";
+       sha256 = "7f625e300da2edd6844e81b51b8890c4748b3806cef7913272b9e2a2f6447213";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102634,7 +102942,7 @@ self: {
      mkDerivation {
        pname = "perm";
        version = "0.4.0.0";
-       sha256 = "0lf6smw3m32vwrga5y671z355w0vphp3n63cfnsirk1kiz5ik5rx";
+       sha256 = "3d9719cb8f33cc1cb5756c183b2ebc1bf052c60fc7f8a25ee65b8c3a78d5c651";
        libraryHaskellDepends = [ base catch-fd mtl transformers ];
        testHaskellDepends = [
          base HUnit mtl test-framework test-framework-hunit
@@ -102651,7 +102959,7 @@ self: {
      mkDerivation {
        pname = "permutation";
        version = "0.5.0.5";
-       sha256 = "005737s6k9dfpjmjf41m3k1wc31c2kql08ig7fd6npk22nhwmdai";
+       sha256 = "51b5caa115625e6b9a3b2f2240f1142c0cc6c31c351027abbcaea569f419a700";
        libraryHaskellDepends = [ base ghc-prim QuickCheck ];
        homepage = "https://github.com/spacekitteh/permutation";
        description = "A library for permutations and combinations";
@@ -102663,7 +102971,7 @@ self: {
      mkDerivation {
        pname = "permute";
        version = "1.0";
-       sha256 = "03g1d9h26f1id0pnaigy9xy1cv5pvzqcjrwgzn75xnnbm5c3y9ch";
+       sha256 = "90253f58a9cbda5e8efd8f67c9f0dfb76c167c4ffe45652f68313823606ae10d";
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised permutation parser combinator";
        license = stdenv.lib.licenses.bsd3;
@@ -102675,7 +102983,7 @@ self: {
      mkDerivation {
        pname = "persist2er";
        version = "0.1.0.1";
-       sha256 = "096gjkmw06crywwwydyr67447xmp8x967dwh1gavlr0061skb72p";
+       sha256 = "579c3575300064bad50b90b7635247b7f643c831d937cf39f79919c0eb94cf24";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -102693,7 +103001,7 @@ self: {
      mkDerivation {
        pname = "persistable-record";
        version = "0.1.0.0";
-       sha256 = "1z03rixy03zp4l4ygb9jlj4p4x5vp20r5qq39hi8vn1x37j39x26";
+       sha256 = "46f434e4193dd88d224c03e39281b8bb747289a432ade70925f70fe07bcc03fc";
        libraryHaskellDepends = [
          array base containers dlist names-th template-haskell transformers
        ];
@@ -102714,7 +103022,7 @@ self: {
      mkDerivation {
        pname = "persistent";
        version = "2.2";
-       sha256 = "04l5394yrnm0d5cz7nq2phmsbm5vxbggn4wp8n0i0ms0y7blfh0p";
+       sha256 = "174047d7f140571081459713fbdeeabbd4a52bbc02dbf35969a0daec491a8512";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
          bytestring conduit containers exceptions fast-logger lifted-base
@@ -102739,7 +103047,7 @@ self: {
      mkDerivation {
        pname = "persistent-cereal";
        version = "0.1.0";
-       sha256 = "09akf8vpkn2jskf1vf9mq96sakqzr7mfs8hhri8qlbkwx3i5nr6f";
+       sha256 = "ce645be2e87c2e8a51cc1022edeac91f4fa54dc235b91ddcd452d87937725325";
        libraryHaskellDepends = [ base cereal persistent text ];
        jailbreak = true;
        homepage = "http://hub.darcs.net/co-dan/persistent-cereal";
@@ -102752,7 +103060,7 @@ self: {
      mkDerivation {
        pname = "persistent-equivalence";
        version = "0.3";
-       sha256 = "14nn01bbwskllbccgcnwnjwzyws6vppqv4l51n6pcvhwbphn18qz";
+       sha256 = "1fa360e15d1c6e768d0d85928defdd4673ffb9b4dcb2c7d8a2746abe5600d692";
        libraryHaskellDepends = [ array base diffarray ];
        jailbreak = true;
        description = "Persistent equivalence relations (aka union-find)";
@@ -102766,7 +103074,7 @@ self: {
      mkDerivation {
        pname = "persistent-hssqlppp";
        version = "0.1";
-       sha256 = "1p4fpa5qlkn2jmggszzmzg0bva8r8j0x7b2bidqyzlw2i9332ba2";
+       sha256 = "422d31468a82d3ef718b4bacd3814419a9bdc0fbf57ffd5e95c24e8a8bba8edc";
        libraryHaskellDepends = [
          base bytestring hssqlppp monad-control mtl persistent
          persistent-template template-haskell text th-lift
@@ -102781,7 +103089,7 @@ self: {
      mkDerivation {
        pname = "persistent-instances-iproute";
        version = "0.1.0.1";
-       sha256 = "0nmk138kv020aa0pw29l177rb6rji4rnmw4ndnkn1xvp8gh3w0yn";
+       sha256 = "d6033ee04377f760a76d96f06a3389329b95cf0934097e815240803dd108b35a";
        libraryHaskellDepends = [ base bytestring iproute persistent ];
        description = "Persistent instances for types in iproute";
        license = stdenv.lib.licenses.bsd3;
@@ -102794,7 +103102,7 @@ self: {
      mkDerivation {
        pname = "persistent-map";
        version = "0.3.5";
-       sha256 = "0an0j6xkxygxlvjj50fq356sc4njbniz9jzv6v2h9pihsmcckhvq";
+       sha256 = "78c3c958d530de04c536fbcbf4a35dd212a64d19d88122e5a6fdf93ebb91c02a";
        libraryHaskellDepends = [
          base binary containers directory EdisonAPI EdisonCore filepath LRU
          mtl stm-io-hooks
@@ -102814,7 +103122,7 @@ self: {
      mkDerivation {
        pname = "persistent-mongoDB";
        version = "2.1.2.2";
-       sha256 = "1ppjywipfp48dsahc4mf8p9vx99937yh552kq7dhalnd1yfcbcik";
+       sha256 = "33b2c59c0fcd5205dbc1539402fd1929a5bed345ae1206956e885c7723f7f2de";
        libraryHaskellDepends = [
          aeson attoparsec base bson bytestring cereal conduit containers
          monad-control mongoDB network path-pieces persistent resource-pool
@@ -102833,7 +103141,7 @@ self: {
      mkDerivation {
        pname = "persistent-mysql";
        version = "2.2";
-       sha256 = "09hajfvwgjkrmk1qmjfx3z6qkisv4gj0qjcmd1m8n9nb76bmdfz9";
+       sha256 = "e9bb569739cb268b6a6895490ce4235bc789cd1fddc98ac3ac79cac7b7930a26";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger mysql mysql-simple persistent resourcet
@@ -102853,7 +103161,7 @@ self: {
      mkDerivation {
        pname = "persistent-odbc";
        version = "0.2.0.1";
-       sha256 = "0rvcjl9p7pj0hrf0ghhj96ib2knhxnfi9nhc7cppn7gnja1x8ldp";
+       sha256 = "b751d48392f61d7b2f3b0cda149dedd04eb1a24912c2075c8640de7313956c67";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102875,7 +103183,7 @@ self: {
      mkDerivation {
        pname = "persistent-postgresql";
        version = "2.2";
-       sha256 = "0ydwc2jb8w3wma8f0v7i16pzglx0gv1ffikfvislw3c6wkangwby";
+       sha256 = "7ef167d5e4860d4e75dc6e46e7c27ea0d3f7af09f16ce090aa7c70b4a460bc79";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger persistent postgresql-libpq
@@ -102893,7 +103201,7 @@ self: {
      mkDerivation {
        pname = "persistent-protobuf";
        version = "0.1.5";
-       sha256 = "046dpasgv6bwcm17w0z9dz4bvaa622cdb8paj7j6accmsc4rvs9z";
+       sha256 = "3fe99d09d3953165e491eaa2d5981046a9bdc86fe9037e42657c99fdb4bacd10";
        libraryHaskellDepends = [
          base bytestring persistent protocol-buffers
          protocol-buffers-descriptor template-haskell text
@@ -102910,7 +103218,7 @@ self: {
      mkDerivation {
        pname = "persistent-ratelimit";
        version = "0.1.0.1";
-       sha256 = "13mvf0k4nkcdcz7gcvqsw3mrnbpvw0lvs94rff0y9q50cc6y36xd";
+       sha256 = "ad9be10d63a0e0e481739924bd29e0fb2e9bebe01a6ff6ce678d4d4b2670bb8e";
        libraryHaskellDepends = [ base time yesod ];
        jailbreak = true;
        homepage = "https://github.com/jprider63/persistent-ratelimit";
@@ -102927,7 +103235,7 @@ self: {
      mkDerivation {
        pname = "persistent-redis";
        version = "0.3.2";
-       sha256 = "0p5wjf4f201mpdwry188v1h9wf3fh1pvfsm663x4ipy3b1yc8b1k";
+       sha256 = "332cc47c58c3df48fa30a66ab76f806e389e60d808059f79bb3500e18893bc5c";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring hedis monad-control mtl
          path-pieces persistent scientific text time transformers
@@ -102948,7 +103256,7 @@ self: {
      mkDerivation {
        pname = "persistent-refs";
        version = "0.4";
-       sha256 = "1lyhz0cywls91a6crjq5v8x4h4740s73h3blvbkr6fg26kh11cs6";
+       sha256 = "46b310e034e23993e7da740d388e06e410483ada05cbcc8c0a4953ee19f8d0d3";
        libraryHaskellDepends = [
          base containers mtl ref-fd transformers
        ];
@@ -102965,7 +103273,7 @@ self: {
      mkDerivation {
        pname = "persistent-sqlite";
        version = "2.2";
-       sha256 = "1567ja3f87syw6x6x6gl6xzdl3pl8ammlrqy2500gbgr7ni0a47i";
+       sha256 = "f11005a23df9ad0740111e675aab42f40eda7e37f4996ebae15e1fe48692c794";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102990,7 +103298,7 @@ self: {
      mkDerivation {
        pname = "persistent-template";
        version = "2.1.3.4";
-       sha256 = "0wi1mrcilz66jnlgz16crqlh4bibb03mj460bgg3af4f8zpwja2g";
+       sha256 = "4f28c9ef478e3835de5bc0105907582b2e0229cecc84ffa895c67c1a59ae2172";
        libraryHaskellDepends = [
          aeson base bytestring containers ghc-prim monad-control
          monad-logger path-pieces persistent tagged template-haskell text
@@ -103011,7 +103319,7 @@ self: {
      mkDerivation {
        pname = "persistent-vector";
        version = "0.1.1";
-       sha256 = "1l5v02pjb24gk4hw28knjp55l7z6jzcfiklfikd2nqbl7866c2j2";
+       sha256 = "420a660c3a74612bda8c8ecee8d897e61f5aca957622c121998f8825af00bbd0";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -103031,7 +103339,7 @@ self: {
      mkDerivation {
        pname = "persistent-zookeeper";
        version = "0.2.0";
-       sha256 = "11s99wrxhyzyfg657dqma1v1vvdadskvrjybrya2zm8lp675ri9z";
+       sha256 = "3fc55c8eb914d52f94cfcbcbbca76eaaed1d765015b753cc73fe7bd8334f4987";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring binary bytestring conduit
          containers hzk monad-control mtl path-pieces persistent
@@ -103058,7 +103366,7 @@ self: {
      mkDerivation {
        pname = "persona";
        version = "0.1.0.0";
-       sha256 = "1w1m1m3kybk8cg8qn44l04i19i0zqgaz1i1k6666gvvrzk2rh7nh";
+       sha256 = "d01e98c5fc79ef678c3133c4f0d5c31fc414220194108bd163682e3f470d35f0";
        libraryHaskellDepends = [
          aeson base data-default-class jose lens network-uri text time
          unordered-containers
@@ -103077,7 +103385,7 @@ self: {
      mkDerivation {
        pname = "persona-idp";
        version = "0.1.0.2";
-       sha256 = "082ly9m0m0g9brgzma489i4b4pkqqy50gv0a6hn7pvyhpr901b6n";
+       sha256 = "d6ac0052bed0ef7b2c340aec078ac7785eb2484c88a8fa5f5ee9810a6af25420";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -103095,7 +103403,7 @@ self: {
      mkDerivation {
        pname = "pesca";
        version = "4.0.1";
-       sha256 = "12cwmjszbbqrd1f21jvwvp026ja3377c3p0wfrbrl34g23gnysgp";
+       sha256 = "f7696fdf108f0c9a57761cdcc1ce19434923c0dd7ccb205c6819aff5b5ac9c89";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process ];
@@ -103115,7 +103423,7 @@ self: {
      mkDerivation {
        pname = "peyotls";
        version = "0.1.6.5";
-       sha256 = "0dy641izw76cn1rslf7mbmbwhl5ajxjll95w4rg7pyvq2lq2qk9f";
+       sha256 = "2e4d2c301578fb7b5e26bc244a6597aa50c8575df538aa73b0cc1cfe6320c637";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base bytable bytestring cipher-aes
          crypto-numbers crypto-pubkey crypto-pubkey-types crypto-random
@@ -103140,7 +103448,7 @@ self: {
      mkDerivation {
        pname = "pez";
        version = "0.1.0";
-       sha256 = "0w2m8i1h87v9l5lhz8mdllnrx62fk3isqhw3cvnv9rf6rk3zhv74";
+       sha256 = "e46cf8c7ccc6e5b4ed668343ace3984e989e2da5ada20f69a1691f0443445570";
        libraryHaskellDepends = [ base failure fclabels thrist ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -103159,7 +103467,7 @@ self: {
      mkDerivation {
        pname = "pg-harness";
        version = "0.2.1";
-       sha256 = "0ax6ch87jqbcy5il17n0kppy8pn44rj6ljksamh61sg438vcdhqf";
+       sha256 = "0ec3c6361ae4e96060557a4a6a6426c45ee4ef9dc09e4063f16c61791064a62b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring HTTP ];
@@ -103178,7 +103486,7 @@ self: {
      mkDerivation {
        pname = "pg-harness-client";
        version = "0.3.1";
-       sha256 = "12z5354in4zswn219cvxhqbva76p2jsccmzdn5iyw5g401546lr2";
+       sha256 = "2253434a00e415ee63b1ed57c6b414d71cb517867db31484e5fa131b4919e58b";
        libraryHaskellDepends = [ base bytestring HTTP ];
        homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "Client library for pg-harness-server";
@@ -103192,7 +103500,7 @@ self: {
      mkDerivation {
        pname = "pg-harness-server";
        version = "0.3.1";
-       sha256 = "0459i1x5hsxkihyb5a8ca947ngs0gg8866s77bcdsifjw6b3cb4a";
+       sha256 = "8a2c3696e1d245ddd83a471b83d07b403f7b48520ca9b23c8cb36b587a88a910";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -103213,7 +103521,7 @@ self: {
      mkDerivation {
        pname = "pgdl";
        version = "8.3";
-       sha256 = "0kbx9dgmy9pvcgcpsjplrpnqlk8x3icfpr0flincmzqkzxxzcaq5";
+       sha256 = "052bf67bff13ffca6ca40ee4eb581c1d4d8aedcdf44a7dd963fb265f5f4b7d4d";
        revision = "2";
        editedCabalFile = "9d6e976e130869b6761d870380b867c2501c43a1318a5f385687608c13a0ef72";
        isLibrary = false;
@@ -103232,7 +103540,7 @@ self: {
      mkDerivation {
        pname = "pgm";
        version = "0.1.4";
-       sha256 = "1s3kch1qsxrfzk9sa4b0jn9vzjhw7dvh1sajgnnz97gl5y0gydmv";
+       sha256 = "bb36ff802ff49df4ad7d52e900773b1ccabf93956011a5d3fc2e778d036473e8";
        libraryHaskellDepends = [ array base bytestring parsec ];
        homepage = "https://github.com/astanin/haskell-pgm";
        description = "Pure Haskell implementation of PGM image format";
@@ -103246,7 +103554,7 @@ self: {
      mkDerivation {
        pname = "pgp-wordlist";
        version = "0.1.0.1";
-       sha256 = "123d8fh1bd78iq4n00xc873zsnizczzdl372vkl87z4lpivfkpd3";
+       sha256 = "a3dde976bc94fc83e8dce20cdafe673f5afdc741ac0360098ee8b415a0436d88";
        libraryHaskellDepends = [ base bytestring containers text vector ];
        testHaskellDepends = [
          base bytestring HUnit tasty tasty-hunit tasty-quickcheck text
@@ -103265,7 +103573,7 @@ self: {
      mkDerivation {
        pname = "pgsql-simple";
        version = "0.1.2";
-       sha256 = "1z39g6bp748ya54in48vcg8z20c3skza82cv203rqy192nj01km5";
+       sha256 = "a5ce00a41529789c07109b09a4fed48301f1d1631b111b49511e9173977969fc";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring binary blaze-builder
          blaze-textual bytestring containers MonadCatchIO-transformers mtl
@@ -103288,7 +103596,7 @@ self: {
      mkDerivation {
        pname = "pgstream";
        version = "0.1.0.3";
-       sha256 = "0zbasvi8392pa7ibd0q5072f1i7h0114v46rwhdfczsk1qzlnscg";
+       sha256 = "8f694b3f0e537fe61ae4d9904d4200f0c4e0c4010583b6e25157a481e2d66a7d";
        libraryHaskellDepends = [
          async attoparsec base blaze-builder bytestring conduit
          conduit-extra deepseq mtl parallel postgresql-binary
@@ -103307,7 +103615,7 @@ self: {
      mkDerivation {
        pname = "phantom-state";
        version = "0.2.0.2";
-       sha256 = "04fg0j79nkajsiw8n2yy62mwiw1r4fjy2jln5ng07h64pwyncdnm";
+       sha256 = "d536663dbfc4c0039e2d964ae1a52339f0c8ab30de0b8b78d4524d9b8e04cf11";
        libraryHaskellDepends = [ base transformers ];
        description = "Phantom State Transformer. Like State Monad, but without values.";
        license = stdenv.lib.licenses.bsd3;
@@ -103319,7 +103627,7 @@ self: {
      mkDerivation {
        pname = "phasechange";
        version = "0.1";
-       sha256 = "0i54myn9abrpzrs58llqgii9fhd9ns9hipnaj00dnqx2mfbg7pan";
+       sha256 = "56ddf396aba263db0090cade0893b6a94197627c98525474fe372f95acafa444";
        libraryHaskellDepends = [
          array base ghc-prim monad-st primitive vector
        ];
@@ -103337,7 +103645,7 @@ self: {
      mkDerivation {
        pname = "phash";
        version = "0.0.5";
-       sha256 = "1bndzncy52swvfk2p1imvxlbiv01qx9qi5mb68jmc22b1d99s6bv";
+       sha256 = "7b199d520b4b08562532ab968853c701ecb868df35862ba6db5c8be299fdcdae";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ pHash ];
        testHaskellDepends = [
@@ -103358,7 +103666,7 @@ self: {
      mkDerivation {
        pname = "phone-push";
        version = "0.1.3";
-       sha256 = "0ndaddj3ssrdclzigdj0q04pwpdkbmhfc3rz8j7q9f4l7iv6yshi";
+       sha256 = "116a6f763c94b8848f443f0fe6605db35d7e09c040b6173f652d6b3d646baa59";
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring conduit convertible
          HsOpenSSL http-conduit network time transformers
@@ -103374,7 +103682,7 @@ self: {
      mkDerivation {
        pname = "phonetic-code";
        version = "0.1.1.1";
-       sha256 = "0pjvjqxp37n901s16ys5qq5rzblamz8izvsd1992w06bcyrs36cw";
+       sha256 = "9c99a1b367cb002e520a4def1fd1af8aae9f0bc6457b137400c99e713b965b5e";
        libraryHaskellDepends = [ array base containers regex-compat ];
        homepage = "http://wiki.cs.pdx.edu/bartforge/phonetic-code";
        description = "Phonetic codes: Soundex and Phonix";
@@ -103388,7 +103696,7 @@ self: {
      mkDerivation {
        pname = "phooey";
        version = "2.0.0.1";
-       sha256 = "0aa0s7qmy78s4q1mjcnw0qiqlbmdmkmk2nbn6hkmw5fn29iq0iwj";
+       sha256 = "9247806312d6155e2734765931ebacad2e8a2306dc325903261a1d5ff1d14029";
        libraryHaskellDepends = [
          array base mtl reactive TypeCompose wx wxcore
        ];
@@ -103406,7 +103714,7 @@ self: {
      mkDerivation {
        pname = "photoname";
        version = "3.1";
-       sha256 = "0d44fzflpyw94rfyn9nw9pqklm01vw6nczava2kfj68sq12m94rp";
+       sha256 = "37935445c01a19e9a6505b7d660ddf01543af14ddc26eb5d2689fb4bdd778434";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -103427,7 +103735,7 @@ self: {
      mkDerivation {
        pname = "phraskell";
        version = "0.1.4";
-       sha256 = "1bczvnmbgc7qcpmlhrnmql4yn2grry2ys7hcg06sqzwr5qhl1k9k";
+       sha256 = "33cd40212e997fac0d780c1eed85cff909eb09c5d56648eb65f8b0b7aadd9fad";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl SDL transformers ];
@@ -103447,7 +103755,7 @@ self: {
      mkDerivation {
        pname = "phybin";
        version = "0.3";
-       sha256 = "1v6zcyfjnkgwc9kffi7lf15qb3j4wq2kclx26i1k9ssf6h7cs5g9";
+       sha256 = "e915cd0e344eeb344334a2533605e6448e854b70f444e76662fc4d2b9d67dfec";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103481,7 +103789,7 @@ self: {
      mkDerivation {
        pname = "pi-calculus";
        version = "0.0.5";
-       sha256 = "1w5krkss2qzzcqqmgqs369p5xnqyrm76vvsxd7mlhcdqaaj06n2q";
+       sha256 = "585803a452b83148eb695def6d4ecd1edb5e6e3243e3573166ff63a1f5ccb3f0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -103503,7 +103811,7 @@ self: {
      mkDerivation {
        pname = "pia-forward";
        version = "0.1.0.1";
-       sha256 = "02ryfiibkbfx6zg1n0h8kvb4mkiai57cvllqcwp815x50rsrpd2r";
+       sha256 = "59b49b7506a597802e6798d2cd4e892ace4ad69e08021bde37ddadb962743e0b";
        revision = "1";
        editedCabalFile = "7ace7bfcb4b05c4099a28ec12b7e12682669ddfe6d4e5f68c4d74c05914b7582";
        isLibrary = false;
@@ -103528,7 +103836,7 @@ self: {
      mkDerivation {
        pname = "pianola";
        version = "0.1.1";
-       sha256 = "02y630yskx139l5yii45rf47w2a2v3x0pad59ac9qzjalv7s68aq";
+       sha256 = "5821a3cfa64a7e9c984aa5a90bfad842097e88cb85c4e80b4d23f4a93d18c60b";
        libraryHaskellDepends = [
          attoparsec attoparsec-iteratee base bytestring comonad
          comonad-transformers containers either errors filepath free
@@ -103547,7 +103855,7 @@ self: {
      mkDerivation {
        pname = "picologic";
        version = "0.1.1";
-       sha256 = "14wil9fqx7n7zk7ldhk336g9mbybcf0gljvwjrnra3r01yiz7f20";
+       sha256 = "40b8f3a30f200f956d967c4bfa8063cbaf9a9e1963c246cffcc79e8e5da29193";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103569,7 +103877,7 @@ self: {
      mkDerivation {
        pname = "picoparsec";
        version = "0.1.2.2";
-       sha256 = "1gf51clsfllfpmpm4bfzyicwk1zz3kymyi8zcdfm5y5rhg1yjcg9";
+       sha256 = "e931e9c383b9f8525d631f455ffd1cff87c959f4df2d526fbd8e52a7290bc5bd";
        libraryHaskellDepends = [
          array base bytestring containers deepseq monoid-subclasses
          scientific text
@@ -103589,7 +103897,7 @@ self: {
      mkDerivation {
        pname = "picosat";
        version = "0.1.3";
-       sha256 = "1ljgarjvhw7qi06bjykgbd17s27h73gdj21rpi5x4ddv9fb68k9p";
+       sha256 = "374d64964bbb35d24bbc3908d9de38f0087d425b6f7ab90c88f870b865564fd2";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/sdiehl/haskell-picosat";
        description = "Bindings to the PicoSAT solver";
@@ -103601,7 +103909,7 @@ self: {
      mkDerivation {
        pname = "piet";
        version = "0.1";
-       sha256 = "0ab0msb12cj38qimxllwk0p0g9aggfxhgvdp2b5znxpixlr39cz9";
+       sha256 = "e9b33432edf176fbcb12b7ed07bb7b4fa5072e989cd25e234643321196ae6029";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers Imlib mtl ];
@@ -103615,7 +103923,7 @@ self: {
      mkDerivation {
        pname = "piki";
        version = "0.5.2";
-       sha256 = "0rsc2anh20hlr2dfyh07dyrrfns0l1pibz6w129fp5l8m6h3xjin";
+       sha256 = "36ca3ea0a98896eb9208dcfc156fa0405b97b36f0740ef9ac8140201ad124c67";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl parsec text ];
@@ -103634,7 +103942,7 @@ self: {
      mkDerivation {
        pname = "pinboard";
        version = "0.6.5";
-       sha256 = "0xnxdnr2ifn0z78jzibg64znki2jppfy13fsl7s8vwrw0i5ys7a8";
+       sha256 = "481ded4b043cf38df4a1da8de0ddbd52c4693f316fc52fd1f9c0ba28b26ddd76";
        libraryHaskellDepends = [
          aeson base bytestring containers either haskell-src-exts HsOpenSSL
          http-streams http-types io-streams mtl network old-locale random
@@ -103650,7 +103958,7 @@ self: {
      mkDerivation {
        pname = "pipe-enumerator";
        version = "0.3.0.2";
-       sha256 = "0h6k00k85pn0jajk3rvvfnrfwlkllprhv00x0qd9zg9gg7lf7zkc";
+       sha256 = "6cfee3e8792fbd9f1a061d800df3a57452eeb2757be731a592c0de822600d340";
        libraryHaskellDepends = [ base enumerator pipes transformers ];
        homepage = "https://github.com/zadarnowski/pipe-enumerator";
        description = "A bidirectional bridge between pipes and iteratees";
@@ -103662,7 +103970,7 @@ self: {
      mkDerivation {
        pname = "pipeclip";
        version = "0.1.0.1";
-       sha256 = "1hmbhgnrq894jnm7gy6yc812nysvkrbjk6qqjmk7g7fsj46xpdfg";
+       sha256 = "cfb5db0d91da9d776695189b29579e5b7b2b0262def877aa9524219ced83abc2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -103680,7 +103988,7 @@ self: {
      mkDerivation {
        pname = "pipes";
        version = "4.1.6";
-       sha256 = "0dbl9sa0ryclyxwm0zfmqvpx7ljmpnfccmnihxia35q471h50sid";
+       sha256 = "2d6a5060380497a16287d156c69cbd55d2d3efc6d57d5079f794f90c944e7435";
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        testHaskellDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
@@ -103696,13 +104004,12 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-aeson";
-       version = "0.4.1.3";
-       sha256 = "0c95fm4bj4y0dsar4r7n9irvhrcihylcp8k40khm2bqcad14pjjc";
+       version = "0.4.1.4";
+       sha256 = "59d9f8bd3078073d23591e66c94fc8258bc6c16465c7a80bd0ca9cc4fa449133";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring pipes pipes-attoparsec
          pipes-bytestring pipes-parse transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/k0001/pipes-aeson";
        description = "Encode and decode JSON streams using Aeson and Pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -103715,7 +104022,7 @@ self: {
      mkDerivation {
        pname = "pipes-async";
        version = "0.1.1";
-       sha256 = "1b0l3fnblfgwgcbd5brs5iwix4wix1ijx10ppwb8yb1wbqbmh8z2";
+       sha256 = "e22358175e3c2c8f16bf17842e63e891931e792c3aafd2167bfc39baac1b14ac";
        libraryHaskellDepends = [
          base lifted-async lifted-base monad-control pipes pipes-safe stm
          transformers-base
@@ -103736,7 +104043,7 @@ self: {
      mkDerivation {
        pname = "pipes-attoparsec";
        version = "0.5.1.2";
-       sha256 = "1qhhy86c89j6ial5y1j2lhgqx225qr33777jk8sxv021gkabsmlv";
+       sha256 = "9b56bdd47c4180dd359af29c3346c645888e1fa442065fa88a4626c40cf210e2";
        libraryHaskellDepends = [
          attoparsec base bytestring pipes pipes-parse text transformers
        ];
@@ -103756,7 +104063,7 @@ self: {
      mkDerivation {
        pname = "pipes-attoparsec-streaming";
        version = "0.1.0.0";
-       sha256 = "0alr94jjh583cdi19zrlacrc71dspy12lhq8h24hqiar6l2lr1d7";
+       sha256 = "a7854c053559450c898008432a82bfba85c3325334ff1462630315282549992a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103777,7 +104084,7 @@ self: {
      mkDerivation {
        pname = "pipes-bgzf";
        version = "0.2.0.1";
-       sha256 = "04y0wzy8982g64xyxq6rl9xc63n0c8xl8mhyf0x4ivqxnn49iv23";
+       sha256 = "43ec9888b51def483a701e56443b62c00ec37aa2d9e0ee3b314fa084fce7c013";
        libraryHaskellDepends = [
          base bytestring mtl parallel pipes streaming-commons
        ];
@@ -103793,7 +104100,7 @@ self: {
      mkDerivation {
        pname = "pipes-binary";
        version = "0.4.0.4";
-       sha256 = "1c90vvdzbrp5x73iwpdcsi701v4krmqqxj0l9kyzfygvd242i56i";
+       sha256 = "d194288868fb79f7fd4c14c88e71cd93ec004ed4ac5d1ec7e9e5e6f5dbde20b1";
        libraryHaskellDepends = [
          base binary bytestring ghc-prim pipes pipes-bytestring pipes-parse
          transformers
@@ -103814,7 +104121,7 @@ self: {
      mkDerivation {
        pname = "pipes-bytestring";
        version = "2.1.1";
-       sha256 = "1zn8vbsq214x1dswaz1sb7vjjvwxjy5sg8cv67cdmac0l1rw5dmz";
+       sha256 = "bfb6c273a080a9dad8319ba1a78b979d6f29f7593a7cc5750b9d0481f5dac8fe";
        libraryHaskellDepends = [
          base bytestring pipes pipes-group pipes-parse transformers
        ];
@@ -103827,7 +104134,7 @@ self: {
      mkDerivation {
        pname = "pipes-cellular";
        version = "0.0.0.1";
-       sha256 = "0j0ayzvc9k3fmd9j37p41z50nqp4hwyywashcvng23qgp7m4ahdc";
+       sha256 = "ac4145eab90f0ff1ec66502bee3d87e4620bca0fe49e2153ab6eccc4f6f70a48";
        libraryHaskellDepends = [ base bytestring data-cell pipes ];
        homepage = "https://github.com/zadarnowski/pipes-cellular";
        description = "Pipes-based combinators for cellular data processing";
@@ -103840,7 +104147,7 @@ self: {
      mkDerivation {
        pname = "pipes-cellular-csv";
        version = "1.0.0.0";
-       sha256 = "1lzism9rrs1569lhbjl6b49c461igmpgvxq6pnnpfvnqbps56vc9";
+       sha256 = "896d53f45dd86e77adbd06f7fd6e7d3118c2125986ca05693225e89c53d5f1d3";
        libraryHaskellDepends = [
          base bytestring data-cell pipes pipes-cellular
        ];
@@ -103856,7 +104163,7 @@ self: {
      mkDerivation {
        pname = "pipes-cereal";
        version = "0.1.0.0";
-       sha256 = "04f538gyzvwxhqscsj9sywi6hz5k1fabjaga0vf861hlmv9agaa8";
+       sha256 = "48a9a7d2ae140683dc06ea29b9940bb37c6822f73a49cd34869defef1f1ac511";
        libraryHaskellDepends = [
          base bytestring cereal mtl pipes pipes-bytestring pipes-parse
        ];
@@ -103871,7 +104178,7 @@ self: {
      mkDerivation {
        pname = "pipes-cereal-plus";
        version = "0.4.0";
-       sha256 = "1x1qfl8s0lhvcz2hqh5dl5ilyixar995bqqzas721ni2skflbhqr";
+       sha256 = "19c345ddd422da208e561fe35552caaa474f63a1ad400cc5671b52a0117538f4";
        libraryHaskellDepends = [
          base bytestring cereal-plus errors mtl pipes pipes-bytestring text
        ];
@@ -103889,7 +104196,7 @@ self: {
      mkDerivation {
        pname = "pipes-cliff";
        version = "0.10.0.4";
-       sha256 = "0czgzmfl5rs0p63x24zr4pcl01a0wy93hx8wpin9k61yfx7bb4ix";
+       sha256 = "3d92b54e773e98996cbc1c753892e7400540d925f913d187b940e7425dfdef33";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103905,7 +104212,7 @@ self: {
      mkDerivation {
        pname = "pipes-concurrency";
        version = "2.0.3";
-       sha256 = "0jsfnlzl6yvhikgn6v361ld9aypv2h2nsz1q24dxfk953zvm2sp5";
+       sha256 = "e56a51f71f254dd71b11387c6d0514fb7a951a0d666c63df8c707b433fb54e4b";
        libraryHaskellDepends = [ base pipes stm ];
        testHaskellDepends = [ async base pipes stm ];
        description = "Concurrency for the pipes ecosystem";
@@ -103917,7 +104224,7 @@ self: {
      mkDerivation {
        pname = "pipes-conduit";
        version = "0.0.1";
-       sha256 = "1nzylhmi3f2m0xnqgx0m9g0p5pwl6xnidsz8ykzmv8wafrh60dh8";
+       sha256 = "08366060768aa35dfff4e8eb166d3794df72c14b15f4876d0755b8112ba4fedb";
        libraryHaskellDepends = [ base conduit mtl pipes-core ];
        jailbreak = true;
        homepage = "https://github.com/pcapriotti/pipes-extra";
@@ -103933,7 +104240,7 @@ self: {
      mkDerivation {
        pname = "pipes-core";
        version = "0.1.0";
-       sha256 = "1abzy45bjiy8lijg4a5xkwdh1k37c6m921y2s31x0yqgq79qlgyp";
+       sha256 = "d73f8ad3c10f7bd0c3d0c20791aa6167cc001b9fbd28f264a4c847b90af17fa9";
        libraryHaskellDepends = [
          base categories lifted-base monad-control transformers void
        ];
@@ -103948,7 +104255,7 @@ self: {
      mkDerivation {
        pname = "pipes-courier";
        version = "0.1.0.0";
-       sha256 = "1v2bm2cmzb6a7bmpv8byrb5x4k5pivp3s8ma6r6dwhldic294jgf";
+       sha256 = "ee4992048b8d42de4c36aa223dee8eb74cd2cbca7ea17deb3acaac5f99a84bec";
        libraryHaskellDepends = [ base courier pipes ];
        jailbreak = true;
        homepage = "http://github.com/kvanberendonck/pipes-courier";
@@ -103964,7 +104271,7 @@ self: {
      mkDerivation {
        pname = "pipes-csv";
        version = "1.4.0";
-       sha256 = "1q1gnfnkvlkk8lwllhyar7323k3jynh9rl6x9yks7lc3nqr1n16j";
+       sha256 = "d2041b32b683d1a3a74fddd09ca0f572cc21c6c9ca434a394573d23dadb32fe0";
        libraryHaskellDepends = [
          base blaze-builder bytestring cassava pipes unordered-containers
          vector
@@ -103983,7 +104290,7 @@ self: {
      mkDerivation {
        pname = "pipes-errors";
        version = "0.3";
-       sha256 = "1vbpchs3v08sc1rfa9fl89wzxg9ak823xjbkl0k37ycwwc36fn76";
+       sha256 = "e6586706e39cf93326a073c93e049a2abdfe7942d425e572601a813d346477ed";
        libraryHaskellDepends = [ base errors pipes ];
        jailbreak = true;
        homepage = "https://github.com/jdnavarro/pipes-errors";
@@ -103999,7 +104306,7 @@ self: {
      mkDerivation {
        pname = "pipes-extra";
        version = "0.2.0";
-       sha256 = "0yrbjs9y9s9a1q59138f7m0fsp8vsg0a31sfzgwfrg9pm2sfivfr";
+       sha256 = "d9ede8b4a837bdecf8fb4e87a1c0d31b5ded403d0e8d900a0e2ae9e493962b7b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104022,7 +104329,7 @@ self: {
      mkDerivation {
        pname = "pipes-extras";
        version = "1.0.0";
-       sha256 = "1dwqvbmngiprdffi9l0vhrlchfrr8cl0dvzlb34pmczkm9rvq8xk";
+       sha256 = "b323bc73aaf3b37ac958f4ef062843393bc868861bd0149d6bf9c667ebda98b7";
        libraryHaskellDepends = [ base foldl pipes transformers ];
        testHaskellDepends = [
          base HUnit pipes test-framework test-framework-hunit transformers
@@ -104039,7 +104346,7 @@ self: {
      mkDerivation {
        pname = "pipes-fastx";
        version = "0.3.0.0";
-       sha256 = "0xds11gfacj7m5lz6cssaj4v5z73ycrdmn57f0qxzqdsc2kln9ii";
+       sha256 = "31264ba760bae1df3170a7d8da32f3e3fcb289545a33f369a94732e55e08ba75";
        libraryHaskellDepends = [
          attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring
        ];
@@ -104047,12 +104354,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-files" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory, doctest
+     , exceptions, filepath, free, hierarchy, hspec, hspec-expectations
+     , mmorph, monad-control, mtl, pipes, pipes-safe, posix-paths
+     , process, regex-posix, semigroups, text, time, transformers
+     , transformers-base, transformers-compat, unix, unix-compat
+     }:
+     mkDerivation {
+       pname = "pipes-files";
+       version = "0.1.1";
+       sha256 = "a895f464790996ca19195fe605040520660087a36e8c6316fe6647bc23d516aa";
+       libraryHaskellDepends = [
+         attoparsec base bytestring directory exceptions filepath free
+         hierarchy mmorph monad-control mtl pipes pipes-safe posix-paths
+         regex-posix semigroups text time transformers transformers-base
+         transformers-compat unix unix-compat
+       ];
+       testHaskellDepends = [
+         base bytestring directory doctest filepath hierarchy hspec
+         hspec-expectations mtl pipes pipes-safe process semigroups text
+         transformers unix
+       ];
+       homepage = "https://github.com/jwiegley/pipes-files";
+       description = "Fast traversal of directory trees using pipes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-group" = callPackage
     ({ mkDerivation, base, free, pipes, pipes-parse, transformers }:
      mkDerivation {
        pname = "pipes-group";
        version = "1.0.2";
-       sha256 = "01k1j0b7rg39lfh2zhxxnj1bclmaas69b9wiai89h5i1m6aanmp0";
+       sha256 = "e056ab94a9211698505491a7958c56aa52b682b4bdc32fa0a369bc7c16906106";
        libraryHaskellDepends = [
          base free pipes pipes-parse transformers
        ];
@@ -104067,7 +104401,7 @@ self: {
      mkDerivation {
        pname = "pipes-http";
        version = "1.0.2";
-       sha256 = "0hqab1pzcj11qwvc4dznis0qsyn1zc1d0riqxy6b5k04p9i2jbzk";
+       sha256 = "f32f2962ba04ccb28cef3866d002fbc17a8d818ef637c236c72148f66f580a43";
        libraryHaskellDepends = [
          base bytestring http-client http-client-tls pipes
        ];
@@ -104082,7 +104416,7 @@ self: {
      mkDerivation {
        pname = "pipes-illumina";
        version = "0.1.0.0";
-       sha256 = "19s6rkrfvmni914flq37fkbfs6angzl3c40bzg0ddivn4ada7jvn";
+       sha256 = "76cba39a2276c7d6c0fb0b1036e87f5619edd6746760ea4848d1d6edf2cc46a7";
        libraryHaskellDepends = [
          base bytestring directory filepath pipes pipes-bgzf
        ];
@@ -104096,7 +104430,7 @@ self: {
      mkDerivation {
        pname = "pipes-interleave";
        version = "0.2.1";
-       sha256 = "1xs48bxr4qjnwcmaajl3av4db87bxwm6nyffk3k5rks47lqmra3r";
+       sha256 = "79a85c313d44cf5ce698ce796b2aefeba0d5c856834aa52ae3566292fb4244f7";
        libraryHaskellDepends = [ base containers pipes ];
        homepage = "http://github.com/bgamari/pipes-interleave";
        description = "Interleave and merge streams of elements";
@@ -104108,7 +104442,7 @@ self: {
      mkDerivation {
        pname = "pipes-mongodb";
        version = "0.1.0.0";
-       sha256 = "0h4334fajrza7r8jrr78nqhs522kxnbzdj0gnbp7ndvzvx5ij888";
+       sha256 = "0821194bdf7f377beeb20fc8f697ed5388a221b6e8e42c513eea67a91c198340";
        libraryHaskellDepends = [ base monad-control mongoDB pipes ];
        testHaskellDepends = [ base monad-control mongoDB pipes text ];
        homepage = "http://github.com/jb55/pipes-mongodb";
@@ -104123,7 +104457,7 @@ self: {
      mkDerivation {
        pname = "pipes-network";
        version = "0.6.4";
-       sha256 = "1wabyv5j4q0wxiz8ry7dq3amlvfh4r0721pd2lksx7hj3a5qzm2p";
+       sha256 = "57d48f8b1a129eae2715ed06714026d06d5ad5c0edf88c7eec1c6022cbf64bf1";
        libraryHaskellDepends = [
          base bytestring network network-simple pipes pipes-safe
          transformers
@@ -104141,7 +104475,7 @@ self: {
      mkDerivation {
        pname = "pipes-network-tls";
        version = "0.2.1";
-       sha256 = "0k3w13s3vasd85mapa594xhi31mhdwqycxqnadidqy24q5s6zdhc";
+       sha256 = "0cb66f74c14478dc62531677e6316fb086116127a9a8ab6a414dab3df4087c4c";
        libraryHaskellDepends = [
          base bytestring network network-simple network-simple-tls pipes
          pipes-network pipes-safe tls transformers
@@ -104161,7 +104495,7 @@ self: {
      mkDerivation {
        pname = "pipes-p2p";
        version = "0.4";
-       sha256 = "1ls89dnz0aibmyy4mky7jl4ibirpfrs12yxmflarghv3j6rn0wnc";
+       sha256 = "cc7260b39163c3971575b57b11747637c7150995c7cf4abcaf2b2af06d4b48d3";
        libraryHaskellDepends = [
          async base binary bytestring errors exceptions mtl network
          network-simple-sockaddr pipes pipes-concurrency pipes-network
@@ -104178,7 +104512,7 @@ self: {
      mkDerivation {
        pname = "pipes-p2p-examples";
        version = "0.3";
-       sha256 = "08fdk005yrmr8mz3qlsfjys3pz9iidk53maylbgdk3nixk8plwwm";
+       sha256 = "95737ad1ecd18ed9dea25ed551668b31fd3bb4974e533c7e45b9665f0098cd21";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -104197,7 +104531,7 @@ self: {
      mkDerivation {
        pname = "pipes-parse";
        version = "3.0.3";
-       sha256 = "00sslgh1h1n114adc0k2w23wk19pzmf2mh5zn37w40jdganrhlpm";
+       sha256 = "f55298ad7a4d02c2cfb0bfc02a5cfd3785c987e06202d61409c10618e0a35a03";
        libraryHaskellDepends = [ base pipes transformers ];
        description = "Parsing infrastructure for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
@@ -104211,7 +104545,7 @@ self: {
      mkDerivation {
        pname = "pipes-postgresql-simple";
        version = "0.1.2.0";
-       sha256 = "12ij2msdwjzzc93mlvvizh6amam5ld9j1a0b9xsa2awdjd21mwc1";
+       sha256 = "81f11a44938d2ba1744f0ba82053a3a5aaaa0cfc716f5a4762ff4bde7415328a";
        libraryHaskellDepends = [
          async base bytestring exceptions mtl pipes pipes-concurrency
          pipes-safe postgresql-simple stm text transformers
@@ -104225,7 +104559,7 @@ self: {
      mkDerivation {
        pname = "pipes-rt";
        version = "0.5.0";
-       sha256 = "1wlgwil8ag6ax0kvammbqk7v2d8k6ygdqpjpys97zxrvy47dfc6r";
+       sha256 = "d930d70ef13bf77f92f6575edc9e371335b1cfc4ab56b527e8ca3c8568e48ff2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mwc-random pipes time ];
@@ -104242,7 +104576,7 @@ self: {
      mkDerivation {
        pname = "pipes-safe";
        version = "2.2.3";
-       sha256 = "19wr3q6skwdyd68k1r33w2mipfsgsg2982027faq7rnfw9lq2yyi";
+       sha256 = "d17b8169e2cee683953b020894c4d34fbb1babe063e4309169bef1a90d1e99a7";
        libraryHaskellDepends = [
          base containers exceptions monad-control mtl pipes transformers
          transformers-base
@@ -104258,7 +104592,7 @@ self: {
      mkDerivation {
        pname = "pipes-shell";
        version = "0.1.3";
-       sha256 = "0w49il312ns8pyl05144gznxfdchd0rnq8hprmjrgy8yp3v8j4v1";
+       sha256 = "611389f6b81ef99765cd17226c33689035d7ed7f848402a8bf485b11068d8970";
        libraryHaskellDepends = [
          async base bytestring pipes pipes-bytestring pipes-safe process stm
          stm-chans text
@@ -104280,7 +104614,7 @@ self: {
      mkDerivation {
        pname = "pipes-text";
        version = "0.0.0.16";
-       sha256 = "0db6xh10g4h1zy62aamcz59hykhlnq8d7qs24yp7lva8g0ymapyv";
+       sha256 = "db5f553d78486d7aae2742e3d310b6144e0f53f9ac2a258cff01920702ec6635";
        libraryHaskellDepends = [
          base bytestring pipes pipes-bytestring pipes-group pipes-parse
          pipes-safe streaming-commons text transformers
@@ -104297,7 +104631,7 @@ self: {
      mkDerivation {
        pname = "pipes-vector";
        version = "0.6.2";
-       sha256 = "11nibsshxgnr2jw8lh8q9aygbmpfsq7mf7kdvaqzyggmrdsns2wn";
+       sha256 = "960b6d75cbf53dffb1da6d1e570fd6eed6f5bc4a18418ab814d9be0eb55ed186";
        libraryHaskellDepends = [
          base monad-primitive pipes primitive transformers vector
        ];
@@ -104312,7 +104646,7 @@ self: {
      mkDerivation {
        pname = "pipes-wai";
        version = "3.0.2";
-       sha256 = "0wfab4nln9v91qprwm2ik9cz27m2qdhcw7qnndg4dhq47m7kvaw8";
+       sha256 = "88ab3d4f3d04c3465eb3161fce60c3a21ef1599a51549e2f0e69274b2d59ca71";
        libraryHaskellDepends = [
          base blaze-builder bytestring http-types pipes transformers wai
        ];
@@ -104328,7 +104662,7 @@ self: {
      mkDerivation {
        pname = "pipes-websockets";
        version = "0.0.0.0";
-       sha256 = "176gp747anh6a4wghkcj3jblb7ywhrp8c5wc7wrain77vn1sihk6";
+       sha256 = "66c2a883dde7d8a8323f8c17866e86dc9f45971c924df83851065a75c8b9cf9c";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-hunit
@@ -104347,7 +104681,7 @@ self: {
      mkDerivation {
        pname = "pipes-zeromq4";
        version = "0.2.0.0";
-       sha256 = "1zlj7vcn3ng11n80a9m37al7y322ph9grq5qxn022vpb82baxwr4";
+       sha256 = "24f3ae9640eb6e2180edb8e0fc12bc420c7fa83aa32605900de1d961d93e92fe";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104368,7 +104702,7 @@ self: {
      mkDerivation {
        pname = "pipes-zlib";
        version = "0.4.3";
-       sha256 = "04iiw0r1mnxl4myyp87wqhff6jm0g2246gwismi7jnwy7xmllsmc";
+       sha256 = "ac6a4a6b3f9e5b7962d5913f438478a04ae31cc4fca0eb7d25b4db1a32e03112";
        libraryHaskellDepends = [
          base bytestring pipes transformers zlib zlib-bindings
        ];
@@ -104384,7 +104718,7 @@ self: {
      mkDerivation {
        pname = "pisigma";
        version = "0.2.1";
-       sha256 = "1mz4cfhg8y7cv38ir2lzl7b2p1nfm8c4syvgzz4b9j98dxg694xz";
+       sha256 = "bf93645e6f28c9b4c8ff6f7b4d18aace862bd6a19f8a1cd1d8ec78f4a063e4d7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104405,7 +104739,7 @@ self: {
      mkDerivation {
        pname = "pit";
        version = "0.3.1";
-       sha256 = "10qrhpxk8v5qrs4pq4ghj0dj3brsbiv61pb5vakpq031h7grfg8p";
+       sha256 = "173d97df8161007ca7da65dd60765c3aaf211b90f0117c89ceb86c34fb851983";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104427,7 +104761,7 @@ self: {
      mkDerivation {
        pname = "pkcs1";
        version = "1.0.2";
-       sha256 = "1598gj6r6mv3z68qir1rgjk4p73w0k2fwkkban04s97xf86a0669";
+       sha256 = "c918a00c72fd244d80556b4eeec4047c9c4ba67c39e48891f96357938d7c2895";
        libraryHaskellDepends = [ base bytestring random ];
        homepage = "http://sep07.mroot.net/";
        description = "RSA encryption with PKCS1 padding";
@@ -104439,7 +104773,7 @@ self: {
      mkDerivation {
        pname = "pkggraph";
        version = "0.1";
-       sha256 = "019mli0g65g7k4rsp2myxc7g6p6wykj85amvb2g2ipw117zpzkfz";
+       sha256 = "dfcd7fff0981df289e58bbaa82e4f4dc5cf30eebbe8aab3399e715f340a43505";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal split ];
@@ -104453,7 +104787,7 @@ self: {
      mkDerivation {
        pname = "pktree";
        version = "0.2";
-       sha256 = "172dsg1krxqamq8ids9xwyfqidr9z0qq4nmbq4rk2x62g4q0960c";
+       sha256 = "0c98043079c2743133c1ab5a8231f829b7889de73de91611ae0af73cc3d34d9c";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/singpolyma/pktree-haskell";
        description = "Implementation of the PKTree spatial index data structure";
@@ -104465,7 +104799,7 @@ self: {
      mkDerivation {
        pname = "placeholders";
        version = "0.1";
-       sha256 = "0ih35n2pw5gr9ggj2xz5zfcs4bdk200fdw6q9hdy3xna7maphak5";
+       sha256 = "652a78553dcaf6e11b4cd8f0e60010b32da299fbe57721df4bf9157e852d0346";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ahammar/placeholders";
        description = "Placeholders for use while developing Haskell code";
@@ -104477,7 +104811,7 @@ self: {
      mkDerivation {
        pname = "plailude";
        version = "0.6.0";
-       sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i";
+       sha256 = "31083b4d1442000e0964d2b198942d61f9ce40726c593cf66901b171c19f188e";
        libraryHaskellDepends = [ base bytestring mtl time unix ];
        jailbreak = true;
        homepage = "https://secure.plaimi.net/works/plailude";
@@ -104492,7 +104826,7 @@ self: {
      mkDerivation {
        pname = "planar-graph";
        version = "1.0.0.0";
-       sha256 = "1c7a168wkym50nh6a0vqfnqgj4hsk91d4x3w84ip0phcnig65iip";
+       sha256 = "37c6625eb40c5e7023417c74d2429a1a12f9b075780365a005a5fac99109eab0";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers data-clist
          deepseq
@@ -104508,7 +104842,7 @@ self: {
      mkDerivation {
        pname = "plat";
        version = "0.1.0.1";
-       sha256 = "06syff2yzrs7qvj8m1f7bgzd6qc834zl9qphv67q3ps5r2hy09qd";
+       sha256 = "0d27e0a1c845df818fd9f0e2443f198861d3fe5bc7858ae4c647e7ef85735e1b";
        libraryHaskellDepends = [
          base bytestring containers mtl utf8-string
        ];
@@ -104524,7 +104858,7 @@ self: {
      mkDerivation {
        pname = "playlists";
        version = "0.3.0.0";
-       sha256 = "1g49w0h3fms4ihxwbaq0bg0dzgqa1k83zrbnnd57svcr5qgi9clb";
+       sha256 = "8bb2141f2e996d7d4ab376e53fd00c0abfdfc05b00abc53b8c44573720e089bc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104544,7 +104878,7 @@ self: {
      mkDerivation {
        pname = "plist";
        version = "0.0.6";
-       sha256 = "0xsx1pvlnqyidpvswisir9p9054r7fczi81nccflazijn3pr9rgb";
+       sha256 = "ebe594efb0327e451d6336a0f8993b9914906eca5147aef76dd1634bf70d5d77";
        libraryHaskellDepends = [ base base64-bytestring bytestring hxt ];
        description = "Generate and parse Mac OS X property list format";
        license = stdenv.lib.licenses.bsd3;
@@ -104558,7 +104892,7 @@ self: {
      mkDerivation {
        pname = "plivo";
        version = "0.2.0.0";
-       sha256 = "16q6jwnbzxhapmkzi2sn1k02z8gq11s9wp555fv7msv2if5axrp0";
+       sha256 = "e0e6ae8a8b62eb7ab62ba55c9e7408f8a12fc00c568bf867bd0af6bf2c97069b";
        revision = "1";
        editedCabalFile = "7ef78cd34067e8d72872b32bcad9d01537710c11efce159c990aeb4670e4efb3";
        libraryHaskellDepends = [
@@ -104579,7 +104913,7 @@ self: {
      mkDerivation {
        pname = "plot";
        version = "0.2.3.4";
-       sha256 = "1dclv0z94xpxmx80yzzppahq92cqjwaqr0g1ama0spywxhz6l7h3";
+       sha256 = "031e6a3eecdc5f0d5455e1818c1597988984a1baf77f0f50affd76923ed894b5";
        libraryHaskellDepends = [
          array base cairo colour hmatrix mtl pango transformers
        ];
@@ -104593,7 +104927,7 @@ self: {
      mkDerivation {
        pname = "plot-gtk";
        version = "0.2.0.2";
-       sha256 = "18p3jjrs1asd35q3fykfsrwx22d7rqczymbyxsaqwya5y0nv3ymn";
+       sha256 = "b6fab12df045798e95ee7e55ff19cea709d179d66e7a3770194daba0b394e3a2";
        libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ];
        homepage = "http://code.haskell.org/plot";
        description = "GTK plots and interaction with GHCi";
@@ -104607,7 +104941,7 @@ self: {
      mkDerivation {
        pname = "plot-gtk-ui";
        version = "0.1.0.0";
-       sha256 = "0q3f1rm1s22vrk19yzbflr1pwbl094lx5j8zbyhqqjvhpz491dx7";
+       sha256 = "a7b790c8bf704b8ca15f1fc9d22949802e7e43a66e7d9fc2cc5b081d6a0e6e60";
        libraryHaskellDepends = [
          base cairo colour fixed-vector gtk hmatrix plot text vector
        ];
@@ -104621,7 +104955,7 @@ self: {
      mkDerivation {
        pname = "plot-gtk3";
        version = "0.1.0.1";
-       sha256 = "0x7s9wb8r2sds25q9k6h8mvpfzgi90v497ccxskvb3qd0a1jv24f";
+       sha256 = "8e882d83020d8fb5a7ee8c9d443648f17d777745d0cc848bd04d8b8c164ffa74";
        libraryHaskellDepends = [
          base glib gtk3 hmatrix mtl plot process
        ];
@@ -104635,7 +104969,7 @@ self: {
      mkDerivation {
        pname = "plot-lab";
        version = "0.0.1.9";
-       sha256 = "1qa5mxq9j5m5zbvzsmrzg8jb9w9v8ik50c8w5ffddcrrqb9b8mcq";
+       sha256 = "9855b4d2c239b3d69c2b1c315066443bf1b4247a3f57fdf7faa5169970af45e1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -104652,7 +104986,7 @@ self: {
      mkDerivation {
        pname = "plotserver-api";
        version = "0.22";
-       sha256 = "17vr3c9dnd1jabx66qih7z19mk0irrxzab51gl5gifcgdxlf4s3x";
+       sha256 = "7d68e2686f8fb9f80a7da12cf57bce11cc9ac23f306263fa523234db121b799f";
        libraryHaskellDepends = [ base curl split ];
        description = "Plotserver API";
        license = stdenv.lib.licenses.mit;
@@ -104665,7 +104999,7 @@ self: {
      mkDerivation {
        pname = "plugins";
        version = "1.5.4.0";
-       sha256 = "126lp2bbz9aa3pfi5dmbbzgsancdj1m26k7man96avixb21mzbi8";
+       sha256 = "28ae5f83583d6e659255f54c236a908d59a5df5fabb612dd1d4aa5bf96b8d488";
        libraryHaskellDepends = [
          array base Cabal containers directory filepath ghc ghc-paths
          ghc-prim haskell-src process random
@@ -104683,7 +105017,7 @@ self: {
      mkDerivation {
        pname = "plugins-auto";
        version = "0.0.4";
-       sha256 = "1gia9d45d7rb658wm6ihkfz36l4ph7w0hr0vnfw42s035aj5shy4";
+       sha256 = "c4435da42a036841b8b31b6408f881975033be9b309aca51312b9f56484b2abe";
        libraryHaskellDepends = [
          base containers filepath hinotify mtl plugins template-haskell
        ];
@@ -104700,7 +105034,7 @@ self: {
      mkDerivation {
        pname = "plugins-multistage";
        version = "0.6.1";
-       sha256 = "0kwibjp9r9gwkmi8i79cc217jhnqljcgdkvpsk7hclmaa7ir3caq";
+       sha256 = "58b191e351aa5206cfd477cff698a4d8427982602c9d88629dfca59cae5c914f";
        libraryHaskellDepends = [
          base directory ghc process template-haskell th-desugar
        ];
@@ -104717,7 +105051,7 @@ self: {
      mkDerivation {
        pname = "plumbers";
        version = "0.0.3";
-       sha256 = "1grw827jhxwka1zl0n5ycgrpc4ljw8bxg3psms8lsxfiiz6mwmq9";
+       sha256 = "09575ecd8fd1754d91aefa8ed717e2921276f363be58407f509377288f403cbf";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Pointless plumbing combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -104731,7 +105065,7 @@ self: {
      mkDerivation {
        pname = "ply-loader";
        version = "0.4.1";
-       sha256 = "0hi32n4gjvydahlclzc47qsnwqhzxxa7irc4qv6qbgpra4j6zqg1";
+       sha256 = "e1e16f2451f9be85cdc684e57854ef1f626e353e847dca2854cd6ff988152342";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104750,7 +105084,7 @@ self: {
      mkDerivation {
        pname = "png-file";
        version = "0.0.1.1";
-       sha256 = "18m5pqf2dx26spwjav9b67plha9f3bgn4wl6g6pckl0mmym3zm10";
+       sha256 = "20d43faaaf15d0c9ae79867262df1a2e2948ef312b6d25f9d546f4261cbea5a2";
        libraryHaskellDepends = [
          array base binary-file bytestring monads-tf template-haskell zlib
        ];
@@ -104767,7 +105101,7 @@ self: {
      mkDerivation {
        pname = "pngload";
        version = "0.1";
-       sha256 = "1j8zagi5xcb4spvq1r0wcnn211y2pryzf0r8z7h70ypqak7sy6ps";
+       sha256 = "fa1aafcf54f87a70e0f92803f77dbec28720ac651ce480f7d564b15ee2531fc9";
        libraryHaskellDepends = [
          array base bytestring haskell98 mtl parsec zlib
        ];
@@ -104781,7 +105115,7 @@ self: {
      mkDerivation {
        pname = "pngload-fixed";
        version = "1.0";
-       sha256 = "02ikfn7kl8jx5iffa2pv0n1z1c75qcg9aq94nrccfdp532wxr7bx";
+       sha256 = "7d9ddcb918e536c758b62461951ec3e5b0f08305fb0ae55c2c5d223a8f75330a";
        libraryHaskellDepends = [ array base bytestring mtl parsec zlib ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
@@ -104793,7 +105127,7 @@ self: {
      mkDerivation {
        pname = "pnm";
        version = "0.1.0.0";
-       sha256 = "0h6wsqv6c36cmk30gs3rjdjbxxq9zih49pmzhj2dh9nyxsqbj2yw";
+       sha256 = "dc0bb9b0eede26d88484bfde4460fc09f7be649379e807c6accc0c6636d6dc40";
        libraryHaskellDepends = [ base bytestring ];
        description = "PNM image format header parsing and pretty printing";
        license = stdenv.lib.licenses.bsd3;
@@ -104810,7 +105144,7 @@ self: {
      mkDerivation {
        pname = "pocket-dns";
        version = "0.1.1";
-       sha256 = "1736gj66ljgarmdxwzc9m5aa9inkmgzfmn9sjcqlcs0kpp5faqsh";
+       sha256 = "5063e5cabd13684631933ad9eafeabd3c6a454a9897dde5bcdea496a8c7c669c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104842,7 +105176,7 @@ self: {
      mkDerivation {
        pname = "pointed";
        version = "4.2.0.2";
-       sha256 = "0ynswx6ybl7b6vbrm2bd2zj2sbvsclhdi440lpv1aix5smd8m2jb";
+       sha256 = "4b8a8a5ad5a54715f6a58090d820657a2f2de4176d899ad736ebd0e54de7da7a";
        libraryHaskellDepends = [
          base comonad containers data-default-class hashable kan-extensions
          semigroupoids semigroups stm tagged transformers
@@ -104858,7 +105192,7 @@ self: {
      mkDerivation {
        pname = "pointedlist";
        version = "0.6.1";
-       sha256 = "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l";
+       sha256 = "743cb0f89cbb128f8aa24c4519b262b561bf2cd607f83e94f9241e8af1cfba9b";
        libraryHaskellDepends = [ base binary ];
        description = "A zipper-like comonad which works as a list, tracking a position";
        license = stdenv.lib.licenses.bsd3;
@@ -104871,7 +105205,7 @@ self: {
      mkDerivation {
        pname = "pointfree";
        version = "1.1";
-       sha256 = "0lkwan8vi86jl72wfpdi0saac6rbx8z270r2nf3vp0468dqk25cf";
+       sha256 = "8e153171438680bb87b32283233eea2b1ba69406b15dc7c5a1d2a0b891557c52";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104895,7 +105229,7 @@ self: {
      mkDerivation {
        pname = "pointful";
        version = "1.0.6";
-       sha256 = "151cyy324g6cl5bdwcpbvcvpavj3x2592jbic1jq5q3fgahf5wqk";
+       sha256 = "13f3e2a07a6ee08265607149918ae8436e7537dbeb32de56a1cc3c2286f72c94";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104914,7 +105248,7 @@ self: {
      mkDerivation {
        pname = "pointless-fun";
        version = "1.1.0.6";
-       sha256 = "0m5hwd0mr7bmb2sbs1qa7l65xrr5h2wjznknsrk1ga08qkd5jp6h";
+       sha256 = "d05c59dac408a81766d676da2fb98025e75e0c3d0a07bdb458759d5c41e3b054";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Some common point-free combinators";
@@ -104926,7 +105260,7 @@ self: {
      mkDerivation {
        pname = "pointless-haskell";
        version = "0.0.9";
-       sha256 = "0f0bnd6dyi1ancdxd2hkszshws9d8jz8iamz5pir0i4nsj69mqyx";
+       sha256 = "dde39a8cd4964490e32dbfaa88be442d690ef5d7138ad61bb32a44df4cb30b38";
        libraryHaskellDepends = [ base GHood process syb ];
        homepage = "http://haskell.di.uminho.pt/wiki/Pointless+Haskell";
        description = "Pointless Haskell library";
@@ -104941,7 +105275,7 @@ self: {
      mkDerivation {
        pname = "pointless-lenses";
        version = "0.0.9";
-       sha256 = "1z09wbx9nrlpg0msq69zyaypp28rfm653l22g7q5xcn0wn4hfs0b";
+       sha256 = "0b680789e5c0b25ef07942d0514c7519897bbdf23f19ac2b7897669bfae209fc";
        libraryHaskellDepends = [
          base containers derive pointless-haskell process QuickCheck
        ];
@@ -104958,7 +105292,7 @@ self: {
      mkDerivation {
        pname = "pointless-rewrite";
        version = "0.0.3";
-       sha256 = "0dc37gw8p5zyi23g94llbq7vb5n09rgznjf24nhg28jw2vmf3f0n";
+       sha256 = "16b8e1ea165c22f1a025c249fb5f4ec096b50f5e9492f48688fe978bf83b8335";
        libraryHaskellDepends = [
          base containers mtl pointless-haskell pointless-lenses process
        ];
@@ -104972,7 +105306,7 @@ self: {
      mkDerivation {
        pname = "poker-eval";
        version = "0.3.1";
-       sha256 = "0v1is9jnpw1ij3b7h9figkjqk58dzc44v6vpdmxfmb80w0myihrv";
+       sha256 = "3bc3e82be000adea7a6d779b4d08fb0d9589e57cd12578d69031f06b65d2316c";
        libraryHaskellDepends = [ array base mtl random vector ];
        librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
@@ -104987,7 +105321,7 @@ self: {
      mkDerivation {
        pname = "pokitdok";
        version = "4.1.0.2";
-       sha256 = "08pknbn79hihkil1vcpr7a8ilah3i5b6lnlc41bmprycyqz5vj1w";
+       sha256 = "3cc85d3ef6cce75b57208c5a6a5689032a1a913af9b21d689c30c274ecb2f322";
        libraryHaskellDepends = [
          aeson base base64-string bytestring case-insensitive directory hex
          HTTP http-client http-conduit http-types strict text time
@@ -105003,7 +105337,7 @@ self: {
      mkDerivation {
        pname = "polar";
        version = "0.0.1";
-       sha256 = "1f0anpxc57vxa5z0x4wrfay0g1sw2qwnz5nkz74y9vmh8vd99kkh";
+       sha256 = "70ce94da46b0eee4c9f9d3966f39165c8707bc7299930e7e517d9fc2fab50ab8";
        libraryHaskellDepends = [ base ];
        homepage = "http://space.k-hornz.de/polar";
        description = "Complex numbers in polar form";
@@ -105017,7 +105351,7 @@ self: {
      mkDerivation {
        pname = "polh-lexicon";
        version = "0.2.2";
-       sha256 = "0mnccx3xj568s3q82achf1pj57zqdpj9iskgh62w39xbqm7spivl";
+       sha256 = "74c7ab4fc5aba7c185816fea98e46df89f226f70902981f0d0c814d94767cc56";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105036,7 +105370,7 @@ self: {
      mkDerivation {
        pname = "polimorf";
        version = "0.7.3";
-       sha256 = "0vv7j1l0wnjwpd3hpxswq0k33izl0ck2njspcga885bkrd45lzdr";
+       sha256 = "b97d5a48cb731584d463574b2b2603f4c73126c05cf70b47bb5c5a0e6890676f";
        libraryHaskellDepends = [
          base binary containers text text-binary
        ];
@@ -105051,7 +105385,7 @@ self: {
      mkDerivation {
        pname = "poll";
        version = "0.0";
-       sha256 = "0v4cyrr506zqvxqbxkncss2pl2j38skl02p1vj6cjxcvlzb2y43p";
+       sha256 = "77102fd6a79b75c98cdce10a40a746430a7a85d6cccebe70dff81b5072f68c6c";
        libraryHaskellDepends = [ base enumset utility-ht ];
        description = "Bindings to poll.h";
        license = stdenv.lib.licenses.bsd3;
@@ -105064,7 +105398,7 @@ self: {
      mkDerivation {
        pname = "poly-arity";
        version = "0.0.4.1";
-       sha256 = "15yl8mqwahbrwl0hmz6lb4k7i48qgnxhav7xalj4q541ghd7cnwp";
+       sha256 = "975b761a7c81144c2455fd6c05bb7d1891782659d4fc0a01e57941c57145d497";
        revision = "2";
        editedCabalFile = "0bce1ff7388433830c7824530bb9c4fe3f4545bad44683dec2a5780028d870af";
        libraryHaskellDepends = [ base constraints HList ];
@@ -105080,7 +105414,7 @@ self: {
      mkDerivation {
        pname = "polyToMonoid";
        version = "0.1";
-       sha256 = "068acarrpd66682yjscm6l5k9kj9p8zxbf3hi76kz7gvkhkbsjj8";
+       sha256 = "484abd269cfb9d3fcd8970b8d53fba49ce340b359569e90532c6b49bb3620a19";
        libraryHaskellDepends = [ base ];
        description = "Polyvariadic functions mapping to a given monoid";
        license = stdenv.lib.licenses.bsd3;
@@ -105093,7 +105427,7 @@ self: {
      mkDerivation {
        pname = "polynomial";
        version = "0.7.2";
-       sha256 = "1w1zpa2l7l7yzqdgr142mqhf73mq8kiz7h3ydpd84n4vawjzz7z1";
+       sha256 = "e19fff25579b5882da6d7ec0f3e344b88ee320ae8284fc1afefed04385ba3ff0";
        libraryHaskellDepends = [
          base deepseq pretty vector vector-space vector-th-unbox
        ];
@@ -105107,7 +105441,7 @@ self: {
      mkDerivation {
        pname = "polynomials-bernstein";
        version = "1.1.1";
-       sha256 = "0pjdwi84gz5j1rij4m89nyljjafzjnakmf4yd6vj4xz54nmmygg6";
+       sha256 = "e63d5fab25e57722b7699eb83a9595df2929a9b7095522630eb2fc4750e44d5e";
        libraryHaskellDepends = [ base vector ];
        description = "A solver for systems of polynomial equations in bernstein form";
        license = "GPL";
@@ -105118,7 +105452,7 @@ self: {
      mkDerivation {
        pname = "polyparse";
        version = "1.11";
-       sha256 = "1z417f80b0jm4dgv25fk408p3d9mmcd1dlbya3ry0zdx4md09vrh";
+       sha256 = "30ef045a25bd7de0f3507ed1161aab35b5711120d315b15f23558205903b81fc";
        libraryHaskellDepends = [ base bytestring text ];
        homepage = "http://code.haskell.org/~malcolm/polyparse/";
        description = "A variety of alternative parser combinator libraries";
@@ -105133,7 +105467,7 @@ self: {
      mkDerivation {
        pname = "polyseq";
        version = "0.1.2.1";
-       sha256 = "1l31ynlkjkk2zzpsv194gv3pbl55liizvq4x16m5z52vzgszb570";
+       sha256 = "e094f5f5fb5b945faa099de0fd63a4a5d075c77e2485adefff624e39a9f561d0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105151,7 +105485,7 @@ self: {
      mkDerivation {
        pname = "polysoup";
        version = "0.6";
-       sha256 = "1c7lmx7waj2p9gn9k0hsvnmzrxf3ryz5q7zr4770g3nj8yvbpyp2";
+       sha256 = "e2fabbb647d28e07ce21f91f5cbecfc3f5fcabdd1a8299ec4b5748c54faff4b0";
        libraryHaskellDepends = [
          base containers deepseq polyparse tagsoup
        ];
@@ -105166,7 +105500,7 @@ self: {
      mkDerivation {
        pname = "polytypeable";
        version = "0.1.0.0";
-       sha256 = "0vb2adm97ypi553lsjz7333q3dg9fmi0incrxlikqixk0f3ajaq8";
+       sha256 = "082ba98603b3473c23ed99d9086275e9b581c718e74b4d4729f1fa936a53626d";
        libraryHaskellDepends = [ base ];
        description = "Typeable for polymorphic types";
        license = stdenv.lib.licenses.bsd3;
@@ -105178,7 +105512,7 @@ self: {
      mkDerivation {
        pname = "polytypeable-utils";
        version = "0.1.0.0";
-       sha256 = "1hbpamgqsmsjkzjjva15f566yra77hwasp88b6y68nx9qa36a821";
+       sha256 = "41206586c2a95b64bc59085dad383c47656f4c7125a82de59f52578d5f5577c1";
        libraryHaskellDepends = [ base haskell98 polytypeable ];
        description = "Utilities for polytypeable";
        license = stdenv.lib.licenses.bsd3;
@@ -105190,7 +105524,7 @@ self: {
      mkDerivation {
        pname = "ponder";
        version = "0.0.1";
-       sha256 = "1nq4z063g429hxwf4vbyyr2b2s7sn325m0h6ggf793inlj48ci0h";
+       sha256 = "10448688a4368e74dc7b06825ac4b0fa68b144f67e6de278874990370cf804db";
        libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        homepage = "https://gihub.com/matt76k/ponder";
@@ -105205,7 +105539,7 @@ self: {
      mkDerivation {
        pname = "pontarius-mediaserver";
        version = "0.0.2.0";
-       sha256 = "00qyrbibav26x5ycipnyypybgjms2kxn38s3iy9gqzv0kmgsdxna";
+       sha256 = "caf6a65f9d607ffc928f43a361fb14bacab7fcf5dedec87ce9466cb5e2ca1e03";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -105235,7 +105569,7 @@ self: {
      mkDerivation {
        pname = "pontarius-xmpp";
        version = "0.4.2.2";
-       sha256 = "1krbr0vdza3s6w4sa119x591i5ryq9bmqfnacy665xr5si4bkzcv";
+       sha256 = "9bfdb948d425f7628c67ca3a5c57c23e971852e92904a509377aa8df36c82bcf";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
@@ -105266,7 +105600,7 @@ self: {
      mkDerivation {
        pname = "pontarius-xpmn";
        version = "0.0.1.0";
-       sha256 = "1nd228fgsxlqxql38wkvhq8k5d04bgknpx7i83qxrzj8kb6890dy";
+       sha256 = "be8184cc9a48fedcf140f1f46be75b04b43211867b723428ee9876fd1c12a2d9";
        libraryHaskellDepends = [
          base containers pontarius-xmpp random text xml-types
        ];
@@ -105282,7 +105616,7 @@ self: {
      mkDerivation {
        pname = "pony";
        version = "1.0";
-       sha256 = "0a8bya0kwk9d965awpg881bgzy9z1szcwsqqr0lfkd6bw3cb9fyy";
+       sha256 = "debbb4d8e0cbb4e928c8186bcebe0e3ff9ff5640e85dae8a492d4d3e81f20b29";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -105296,7 +105630,7 @@ self: {
      mkDerivation {
        pname = "pool";
        version = "0.1.2.1";
-       sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c";
+       sha256 = "2ca0a2a97c481716f0dc86162b16e37fbace71507c1d9fbec8f9ce313bb79cbb";
        revision = "1";
        editedCabalFile = "c79e139723764f4d4ba584c6cf6f73174700271910b15ed0f25a150a53a8c951";
        libraryHaskellDepends = [ base monad-control transformers ];
@@ -105314,7 +105648,7 @@ self: {
      mkDerivation {
        pname = "pool-conduit";
        version = "0.1.2.3";
-       sha256 = "1myjbmbh0jm89ycx9d961mpgw8hp7al8wgnsls4p19gvr73gcbfv";
+       sha256 = "db2df6c6c9fba57089a6da3e8ea83a1722fe6e0d26b5d4994fa84a00575dd2d7";
        revision = "1";
        editedCabalFile = "b894f71054b3824a0a05753e8273efbc7c1dc48efa9c6d56625ba4411a74afa5";
        libraryHaskellDepends = [
@@ -105334,7 +105668,7 @@ self: {
      mkDerivation {
        pname = "pooled-io";
        version = "0.0.2";
-       sha256 = "0v7l0jvk2acqslb1inw6lgwbjraj73s396r160hw56slqxh5sgxl";
+       sha256 = "b43f5d60c7549bc22130219b34f4385265b9f8a386db1816d5982931b704f46c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105351,7 +105685,7 @@ self: {
      mkDerivation {
        pname = "pop3-client";
        version = "0.1.4";
-       sha256 = "0kfcfxfwg5rjm7qx9r0ssdvkrvca95hflahrip1hi5wbplf224xv";
+       sha256 = "bb13211cbd8b9708c38d192aea60498aed3c77d31ae4d4f1a93297c75d77cc4d";
        libraryHaskellDepends = [ base mtl network ];
        homepage = "https://github.com/tmrudick/haskell-pop3-client/";
        description = "POP3 Client Library";
@@ -105363,7 +105697,7 @@ self: {
      mkDerivation {
        pname = "popenhs";
        version = "1.0.0";
-       sha256 = "01pb8g5zl99zccnjnkwklfgaz1pqjp1xrgz5b3qy45nclyln0bm4";
+       sha256 = "a42e60a9a7cc16e2f158e5bfdcc395f886af9ea3934f2b2d633f25facb43eb06";
        libraryHaskellDepends = [ base directory haskell98 unix ];
        homepage = "http://www.haskell.org/~petersen/haskell/popenhs/";
        description = "popenhs is a popen-like library for Haskell";
@@ -105378,7 +105712,7 @@ self: {
      mkDerivation {
        pname = "poppler";
        version = "0.13";
-       sha256 = "1fv0h2ixanzv5vy4l2ln23f9n8ghmgdxzlyx54hh69bwhrcg049s";
+       sha256 = "3a11f058867c25032129ddd3dfdbabf0219bdc10960a4afc2efb5bd5a38060bb";
        libraryHaskellDepends = [
          array base bytestring cairo containers glib gtk mtl
        ];
@@ -105396,7 +105730,7 @@ self: {
      mkDerivation {
        pname = "populate-setup-exe-cache";
        version = "1.0";
-       sha256 = "06z723fgqwvcxgxy63pqwmjb6xkcl69xmdry117f0i5rhy0aix3y";
+       sha256 = "7ef4a88087b944e04e083eb7da93a16c76b364e5f80ee3fbeb6c73fcdc10e71b";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mietek/populate-setup-exe-cache/";
        description = "Empty Cabal package";
@@ -105408,7 +105742,7 @@ self: {
      mkDerivation {
        pname = "portable-lines";
        version = "0.1";
-       sha256 = "1l94p3s56a3kfqc8fzqc52z12rhg3c8xsmgcw1i20dnl8aygalsh";
+       sha256 = "5053f5bc42d4362062e0ec55dd111b0f6611be280c7f871876732853f4b824d1";
        libraryHaskellDepends = [ base bytestring ];
        description = "Alternative 'lines' implementation that understands CR-LF and CR";
        license = stdenv.lib.licenses.bsd3;
@@ -105419,7 +105753,7 @@ self: {
      mkDerivation {
        pname = "portaudio";
        version = "0.2.4";
-       sha256 = "0vxlfn2462fmknj94sd5ajbm3lydy3z8mrqb3vgh47wwn0sq8sk3";
+       sha256 = "636a8435b09c1f02df1e0be78afef0cdd3519754a56992a49dd509438475b46f";
        libraryHaskellDepends = [ base containers ];
        librarySystemDepends = [ portaudio ];
        homepage = "http://code.haskell.org/portaudio";
@@ -105434,7 +105768,7 @@ self: {
      mkDerivation {
        pname = "porte";
        version = "0.0.4";
-       sha256 = "1cc7kbbz0vqh60acaxyn8b8pdmwx2w022sgvk1mw7p60s8jhng2d";
+       sha256 = "4d3c0b25d2c0dcc36b98fb692100179dd776d142d677c51430106ff0d79a87b1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105450,7 +105784,7 @@ self: {
      mkDerivation {
        pname = "porter";
        version = "0.1";
-       sha256 = "0aw1gq7z3h5ag5vzl6crw7vijg9w25s0jvxr4rkniv4jk0wlfmnk";
+       sha256 = "d35647399892ec686726b96f0974113c3d19f7e19919fa7779aac0f10f7e812b";
        libraryHaskellDepends = [ haskell2010 ];
        description = "Implementation of the Porter stemming algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -105462,7 +105796,7 @@ self: {
      mkDerivation {
        pname = "ports";
        version = "0.4.3.2";
-       sha256 = "1ixyrg4k1f91v2r485r2fs8bgq373bhvg02mza5jdcb1amyfi7rm";
+       sha256 = "359fe87c5561b1268bfa5580b7e11a67e0b79076221744b2d821b930c9cbbec7";
        libraryHaskellDepends = [ base haskell98 unix ];
        homepage = "http://www.cse.unsw.edu.au/~chak/haskell/ports/";
        description = "The Haskell Ports Library";
@@ -105475,7 +105809,7 @@ self: {
      mkDerivation {
        pname = "ports-tools";
        version = "0.0.1";
-       sha256 = "0bs7b88qiczf59dliqhbxbzciv4xi07b6djspgpydigyrf5maac6";
+       sha256 = "8629558bcbfec5e6efbb5a36b30e889decc8feea0be2485b2aeeb388115a472f";
        libraryHaskellDepends = [ base directory process ];
        homepage = "http://github.com/ppenzin/hs-ports-tools/";
        description = "Library to interact with port tools on FreeBSD";
@@ -105487,7 +105821,7 @@ self: {
      mkDerivation {
        pname = "positive";
        version = "0.4.1";
-       sha256 = "034vlx889sgwvn7g2s1vl3w0nf1vs0c2c1gc0vn77wd9l1vw0hfg";
+       sha256 = "cf41c077a0a9f173ec06ec052618d03b380bf8a03b68f18eddfce98450a79b0c";
        libraryHaskellDepends = [ base nats semigroups ];
        description = "Positive integers";
        license = stdenv.lib.licenses.bsd3;
@@ -105500,7 +105834,7 @@ self: {
      mkDerivation {
        pname = "posix-acl";
        version = "0.2.0.0";
-       sha256 = "1qiq5bqq6bwdxrxc3i27jiq1ic5pn0309453a0y6vjwamrc8h7rv";
+       sha256 = "3b1f8858ae8acb6d3c50a3900406b0b7b018709447c4c17aee8d2f83f12a38e2";
        libraryHaskellDepends = [
          base bytestring containers lifted-base monad-control transformers
          transformers-base unix
@@ -105518,7 +105852,7 @@ self: {
      mkDerivation {
        pname = "posix-escape";
        version = "0.1";
-       sha256 = "0yrx8cr6qximfy0vh7qqljlkj27q9gksrnqmqbnj2hk5bsa5l48w";
+       sha256 = "1c115a945e654221edc215dbace74bf80839a9a4181fb8817735766c32433d7b";
        libraryHaskellDepends = [ base ];
        description = "Quote arguments to be passed through the Unix shell";
        license = stdenv.lib.licenses.bsd3;
@@ -105529,7 +105863,7 @@ self: {
      mkDerivation {
        pname = "posix-filelock";
        version = "0.1";
-       sha256 = "106rrbw4d0f13wcj19m6h0vy3v53j11bawqd3q4r0pcsypk53qmk";
+       sha256 = "b3e251e6f59a5d90091e0d73b54290a3ece13780a6a620191fc18146f8cad980";
        libraryHaskellDepends = [ base transformers unix ];
        homepage = "https://github.com/singpolyma/posix-filelock-haskell";
        description = "Nice wrapper around POSIX fcntl advisory locks";
@@ -105542,7 +105876,7 @@ self: {
      mkDerivation {
        pname = "posix-paths";
        version = "0.2.1.0";
-       sha256 = "187sq0rcdg06h64kkjdgqg32s8s51hd4cgf6hvajj1pgd9pyd1i0";
+       sha256 = "2086e66f6aef0629d586c63d461a0c45232dc6c3afc939898106bcc632c0faa0";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [
          base bytestring doctest HUnit QuickCheck unix
@@ -105556,7 +105890,7 @@ self: {
      mkDerivation {
        pname = "posix-pty";
        version = "0.2.0.1";
-       sha256 = "1f0jyhfl41fvnjc290lm7x4dik2bhymcfxzf0il1iza5rpcjabxa";
+       sha256 = "aa2f25d9cd45fd186804ee77c7aa874bccd8483f95822498b4db05421df412b8";
        libraryHaskellDepends = [ base bytestring process unix ];
        librarySystemDepends = [ util ];
        homepage = "https://bitbucket.org/merijnv/posix-pty";
@@ -105569,7 +105903,7 @@ self: {
      mkDerivation {
        pname = "posix-realtime";
        version = "0.0.0.3";
-       sha256 = "0g7mflyvhrypr8a5795vnqb5qlkg3w4nd3j8pnqql9dbmcbqc2aq";
+       sha256 = "58098617abab258ab1bd488e66091f6f525c16b6bba45314cad767b83d75f53c";
        libraryHaskellDepends = [ base unix ];
        description = "POSIX Realtime functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -105580,7 +105914,7 @@ self: {
      mkDerivation {
        pname = "posix-timer";
        version = "0.3";
-       sha256 = "0z4j98pb46gzhi5i5pvxxm7an7am5i757p43cp2jv8pirx33k8zd";
+       sha256 = "eda33946cff1a22dc56583dc534e2c551dab4eed7ddf124b84ff19b22e4a927c";
        libraryHaskellDepends = [ base transformers-base unix ];
        homepage = "https://github.com/mvv/posix-timer";
        description = "Bindings to POSIX clock and timer functions";
@@ -105592,7 +105926,7 @@ self: {
      mkDerivation {
        pname = "posix-waitpid";
        version = "0.1";
-       sha256 = "1v3y3pg3gv0s26hdqc5fsar2j3vk4kpldkr23zxm14ncpz2w2dhk";
+       sha256 = "1336c1c5bfcc9250fb1f22cf46ef24730f29b2d2ae30dca0111aec37de1d7eec";
        libraryHaskellDepends = [ base unix ];
        description = "Low-level wrapping of POSIX waitpid(2)";
        license = stdenv.lib.licenses.mit;
@@ -105604,7 +105938,7 @@ self: {
      mkDerivation {
        pname = "possible";
        version = "0.1.0.5";
-       sha256 = "1iiyz3yf5rwcdawrbawdrx3fwrhb1s62ram6yavfwkvc7j9rfvzx";
+       sha256 = "fd6f97933c6c4feeb6f2a6aa2c8c0e0b66ee46cf8dab95b96a8ce7e2fcf83ec6";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/tolysz/possible";
        description = "Three valued Data.Maybe";
@@ -105616,7 +105950,7 @@ self: {
      mkDerivation {
        pname = "post-mess-age";
        version = "0.1.0.0";
-       sha256 = "1rl7i37szwnqs6slhha3wv45mw9w9x6yxcrkbdcfvdc63x8nh74w";
+       sha256 = "9c1c68511f86b5ed585b33b3ee4d4f3cf15ac8e6434148b5d1d8f2afcf8887e6";
        libraryHaskellDepends = [ base ];
        description = "Send messages to a Handle concurrently without getting them mixed";
        license = stdenv.lib.licenses.bsd3;
@@ -105627,7 +105961,7 @@ self: {
      mkDerivation {
        pname = "postcodes";
        version = "0.1.1";
-       sha256 = "1z0d5pl11jymd0jj1k50si35lq2af3y0apiyz6mbi25zl5x49bi8";
+       sha256 = "28ae447aa1bf88b8aaf93e5e05fc704a605a46d4a0cc202568d5cb10e82d0dfc";
        libraryHaskellDepends = [ aeson base bytestring HTTP ];
        homepage = "https://github.com/mattyhall/haskell-postcodes";
        description = "A library that gets postcode information from the uk-postcodes.com";
@@ -105642,7 +105976,7 @@ self: {
      mkDerivation {
        pname = "postgresql-binary";
        version = "0.5.2.1";
-       sha256 = "02dzsh9d62pgrqsvjmdxyffr4cryk3sd2dg12jmygg94q5dfkm0m";
+       sha256 = "15d4e95ac124bde7ab14e135d1f4983e33929df3bd55b935ceef0ad312d4bf09";
        libraryHaskellDepends = [
          attoparsec base-prelude bytestring loch-th placeholders scientific
          text time transformers uuid
@@ -105664,7 +105998,7 @@ self: {
      mkDerivation {
        pname = "postgresql-config";
        version = "0.1.0";
-       sha256 = "1p5kzj2wsd3kigi9qavsqkxv9kfk4qbl809wqbdk4pd7y34ajab4";
+       sha256 = "6429a9c8f0a75d32dbc23c01441726d3cdb4fbc47a2b9ce28b7334cd85fcb3dc";
        libraryHaskellDepends = [
          aeson base bytestring monad-control mtl postgresql-simple
          resource-pool time
@@ -105679,7 +106013,7 @@ self: {
      mkDerivation {
        pname = "postgresql-copy-escape";
        version = "0.1";
-       sha256 = "063phxj8r3vy25awwwn47k9ac0s8z59igpgqrhb9gbfdq4ldrlpm";
+       sha256 = "f5d2dc28c1cdad9716ccf8dd1753f94803a6d23cc472ce55117e8f8c64877718";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/joeyadams/hs-postgresql-copy-escape";
        description = "Format data to feed to a PostgreSQL COPY FROM statement";
@@ -105691,7 +106025,7 @@ self: {
      mkDerivation {
        pname = "postgresql-cube";
        version = "0.1.0.0";
-       sha256 = "0jla8rxnrk995qxyp5dgwm2d6yrcafyz5mj7yqr6v5jyzh6b59c3";
+       sha256 = "83a5b20cfc5e966d32f647d6f2bd532c7bd344e5af95eb3b2e29cd6c7b468a4a";
        libraryHaskellDepends = [ base bytestring postgresql-simple ];
        description = "Cube support for postgresql-simple";
        license = stdenv.lib.licenses.mit;
@@ -105702,7 +106036,7 @@ self: {
      mkDerivation {
        pname = "postgresql-libpq";
        version = "0.9.1.1";
-       sha256 = "0waqg245ly017j1qml4sc24896ax645bv8a2fghwwa46zvbsx0z4";
+       sha256 = "e483aed7fe8628cee17342a1bd0a315d998488609ad08a833c01785a88785871";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ postgresql ];
        homepage = "http://github.com/lpsmith/postgresql-libpq";
@@ -105718,7 +106052,7 @@ self: {
      mkDerivation {
        pname = "postgresql-orm";
        version = "0.3.2";
-       sha256 = "1a81wrqzhpgdhs7i0znamkrrra2bksfwsh22yxv94qg6r7c2qp2p";
+       sha256 = "575c2cd8c9e6619276f74240cd9d9e4ba89cf3acca7e108f86ed5df871e601a9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105748,7 +106082,7 @@ self: {
      mkDerivation {
        pname = "postgresql-query";
        version = "1.4.0";
-       sha256 = "0ba5sslcjmfvjm1s3sf1ym7lgzgxx0p5gzdgby1r2y20i5cswfsr";
+       sha256 = "593bae5989407891835faffd572ee8fdfd474ff5c1e9a14395db55c9a8d6452d";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default either exceptions file-embed haskell-src-meta hreader
@@ -105773,7 +106107,7 @@ self: {
      mkDerivation {
        pname = "postgresql-schema";
        version = "0.1.3";
-       sha256 = "17i4xpal7cf7km3p59p7m1cbc39rgkjwg6dkmhswnr669v40r350";
+       sha256 = "a08c0cc84ec664cb35acb399c7e57c390db658a8e7a672479dc7b143d5ed249e";
        revision = "1";
        editedCabalFile = "48c36bad1c6796bd2c7211e0002d2aafc5bb0c8dedde4ec9f8ece597335096ce";
        isLibrary = true;
@@ -105801,7 +106135,7 @@ self: {
      mkDerivation {
        pname = "postgresql-simple";
        version = "0.4.10.0";
-       sha256 = "0ar8rjd3fsk56ykf7ys3f14ld3771dknhvkfk08fq7054rilrir0";
+       sha256 = "20c74c6326051cec10986e6e68670be78c46497043fbe3a637656a379acc282b";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-textual bytestring
          case-insensitive containers hashable postgresql-libpq scientific
@@ -105822,7 +106156,7 @@ self: {
      mkDerivation {
        pname = "postgresql-simple-migration";
        version = "0.1.3.0";
-       sha256 = "0qz75dgp346q6sbxwlfrqd9hpkh14krij2r8440nhb9qs4ccl2jz";
+       sha256 = "5f0aca18d1382d680121280b19f32401ce0b53c3d951de9736d890715f2be763";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105845,7 +106179,7 @@ self: {
      mkDerivation {
        pname = "postgresql-simple-sop";
        version = "0.1.0.7";
-       sha256 = "1hbfh4rp40h1h4m8dzr70zrfb24fckqwp5s6a7kc2fa7a9lw9g8r";
+       sha256 = "19bdc469524739c1e6514697cbf1648e88e5f20727ff862a8101027233816ec1";
        libraryHaskellDepends = [ base generics-sop postgresql-simple ];
        homepage = "https://github.com/openbrainsrc/postgresql-simple-sop";
        description = "Generic functions for postgresql-simple";
@@ -105859,7 +106193,7 @@ self: {
      mkDerivation {
        pname = "postgresql-simple-typed";
        version = "0.1.0.1";
-       sha256 = "0rgy0sx4fwcsr8ln14vhrp23hc1b67c07gw0hj5csrsjn40s0c2c";
+       sha256 = "4c30a001b15267cd8a8480bf03d8312b3038c4cd70936029ca9a7147ba06fe65";
        libraryHaskellDepends = [
          base postgresql-libpq postgresql-simple template-haskell
          transformers typedquery utf8-string
@@ -105877,7 +106211,7 @@ self: {
      mkDerivation {
        pname = "postgresql-simple-url";
        version = "0.1.0.1";
-       sha256 = "1878zcfgis931nn5pnbixzfj2sbp790rxq294cwjy6g1ab35w5ng";
+       sha256 = "cf165ec652e1192f392349e09e413a776921ddef71d95bac0d23e9f81cfbe8a0";
        libraryHaskellDepends = [
          base network-uri postgresql-simple split
        ];
@@ -105898,7 +106232,7 @@ self: {
      mkDerivation {
        pname = "postgresql-typed";
        version = "0.4.0";
-       sha256 = "0w3fbxwiqsl32g4hmkdxyw821nd14dv3i2pwykpx68c9w6vvlmx9";
+       sha256 = "a957bab7e18921d3eff4fc8a387623a1d92010f7bdcd0ac913836a1c795f6e70";
        libraryHaskellDepends = [
          aeson array attoparsec base binary bytestring containers cryptohash
          haskell-src-meta network old-locale postgresql-binary scientific
@@ -105926,7 +106260,7 @@ self: {
      mkDerivation {
        pname = "postgrest";
        version = "0.2.10.0";
-       sha256 = "0s1nmdpdjylqb6lmb9ijh83pfjyf8j6dkagl3rzl4dxc97w6fbpy";
+       sha256 = "fe2e67f849ac37427f1ef4a9d98c44ce4b77078232a655a959987ad96eab3668";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105973,7 +106307,7 @@ self: {
      mkDerivation {
        pname = "postie";
        version = "0.5.0.0";
-       sha256 = "1iqg7wirdcysjq4i7ah3lkzc2rzlbgvc7asq953zdir21g9jpqwk";
+       sha256 = "93e32bd30b22c7f6474958abc3f65bf467c1fea403aa130996dab396233f0fc7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105995,7 +106329,7 @@ self: {
      mkDerivation {
        pname = "postmark";
        version = "0.1.1";
-       sha256 = "1jh1byixnc8mh3g4xb1w0nx9ghh5dchhqf1nxji869kbim2lqgaw";
+       sha256 = "5c3d4c458d6b2683a2ec36380c216b05c297ba053cac4ede801531dba35f01ca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106016,7 +106350,7 @@ self: {
      mkDerivation {
        pname = "postmaster";
        version = "0.3";
-       sha256 = "1yzhblrqnd94gvcl4dzxx6glx1qyyvjy7gqa6ymqahcy8kh1v7ki";
+       sha256 = "719e1de0449e4185ab370abfe3e5f61e874e9fe9fd3742d97e24358b335df0fb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -106035,7 +106369,7 @@ self: {
      mkDerivation {
        pname = "potato-tool";
        version = "0.1.0.2";
-       sha256 = "1d95y8nchzzy3zaq1dsm94b7nhrlxhwpq7yn9dr1nisz43f4j7bx";
+       sha256 = "7d1d49dc205f471b724bd61f7c39ec34437b164955b780d51ffe7fc82cf225b5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base binary bytestring split ];
@@ -106051,7 +106385,7 @@ self: {
      mkDerivation {
        pname = "potrace";
        version = "0.1.0.0";
-       sha256 = "1frxf3jzjyyp3bfj6b2mi29fxwcml4bya6sn4c5aizg741dhphng";
+       sha256 = "cfc20b5b20e7fda80a23561be517a195f1ee9288552c23dd1ad77bf9e5703dbb";
        libraryHaskellDepends = [
          base bindings-potrace bytestring containers data-default
          JuicyPixels vector
@@ -106065,7 +106399,7 @@ self: {
      mkDerivation {
        pname = "potrace-diagrams";
        version = "0.1.0.0";
-       sha256 = "0ys70a5k384czz0c6bpyy0cqrk35wa1yg6ph19smhm3ag9d8161v";
+       sha256 = "3b98805a7a6a5458750af09ae783e265cc8c19f0fe2ec3c0ff8ca0318b02477b";
        libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Potrace bindings for the diagrams library";
@@ -106077,7 +106411,7 @@ self: {
      mkDerivation {
        pname = "powermate";
        version = "0.1";
-       sha256 = "19qsi4g4v2dwagps3gq9grbin44rzk9ydpkpbwysc4gbizh1lrs0";
+       sha256 = "40671ae08feb11a63d5f77dee6d3fc99101b577e09bfa1ef53bc894d1e891aa7";
        libraryHaskellDepends = [ base directory network unix ];
        homepage = "http://neugierig.org/software/darcs/powermate/";
        description = "PowerMate bindings";
@@ -106090,7 +106424,7 @@ self: {
      mkDerivation {
        pname = "powerpc";
        version = "0.0.1";
-       sha256 = "0z3nqv8l9h0kwdaqb2vnk7vx5d0hmx02giv2k01llk7vznlkqqny";
+       sha256 = "de623ca9fdfb4c4a039862c72740af10b4d2f799768b8555e313c044d1c6767c";
        libraryHaskellDepends = [ base ];
        homepage = "http://tomahawkins.org";
        description = "Tools for PowerPC programs";
@@ -106103,7 +106437,7 @@ self: {
      mkDerivation {
        pname = "ppm";
        version = "2009.5.13";
-       sha256 = "0nzvxi1ybfxb1zqkbfqfic8j3mf3r6i2zdyjf7x41rz6m6lhqfcy";
+       sha256 = "9e390ca9a9e6e740fa71d2b72fa2c9c3d521118b0ebb35f10fabbbe543ecfb5b";
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://github.com/nfjinjing/ppm/tree/master";
        description = "a tiny PPM image generator";
@@ -106115,7 +106449,7 @@ self: {
      mkDerivation {
        pname = "pqc";
        version = "0.8";
-       sha256 = "1n71qhlxn9js5cizyqdq9f7m08m5j0354871r8b47bnzdi2kqkc4";
+       sha256 = "844d3c456cdfae4316cae120520690a522508f4bb861ff232b5a26db29c4e1d8";
        libraryHaskellDepends = [ base QuickCheck random stm ];
        testHaskellDepends = [ base ChasingBottoms ];
        homepage = "http://hub.darcs.net/shelarcy/pqc";
@@ -106129,7 +106463,7 @@ self: {
      mkDerivation {
        pname = "pqueue";
        version = "1.3.0";
-       sha256 = "0nandznr9dmyvxxb4pfrcc21zyhbkn2q6ny0m60943kdmisf4401";
+       sha256 = "0110e274ac6d0e9280a9c05b83859d0bfa1f0463d95db27adfbeb694ed6f5659";
        libraryHaskellDepends = [ base deepseq ];
        description = "Reliable, persistent, fast priority queues";
        license = stdenv.lib.licenses.bsd3;
@@ -106142,7 +106476,7 @@ self: {
      mkDerivation {
        pname = "pqueue-mtl";
        version = "1.0.7";
-       sha256 = "0ikg11klbq25fjcbpyb7i7z9wyx9mf4hv262m14j741x4dk9ib6g";
+       sha256 = "cfac9866233d902349a8c2880d89aba97b9efe8967f9bb987445e04567086f46";
        libraryHaskellDepends = [
          base containers ghc-prim MaybeT mtl stateful-mtl uvector
        ];
@@ -106159,7 +106493,7 @@ self: {
      mkDerivation {
        pname = "practice-room";
        version = "0.0.2";
-       sha256 = "071arrk0wir2lwziw6p3cbq6ybjdf3gfc4d25sh21gpnk10ighp2";
+       sha256 = "e2c2174198f6be20a02ea211e6de704d2e6ff062e31a1e3fa722470e66ce2a1c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -106178,7 +106512,7 @@ self: {
      mkDerivation {
        pname = "precis";
        version = "0.5.0";
-       sha256 = "0d0cl60p58i8w2ll8z826r94zx0svm7v578fy70r7i19pn64l6bd";
+       sha256 = "6d194a8cbd29c493c1f10e9db24fdd1af44f5236027d44a9e028a27281a10c34";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106199,7 +106533,7 @@ self: {
      mkDerivation {
        pname = "pred-trie";
        version = "0.2.0";
-       sha256 = "11d0673jhz8vb271wf0qsl8a480hzrghly07iqcmckybalr17ibs";
+       sha256 = "7ac5133255cb4f56198e07780a5ffe1020a210d518381e8e581b7d28c731a085";
        libraryHaskellDepends = [ base semigroups ];
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-instances
@@ -106213,7 +106547,7 @@ self: {
      mkDerivation {
        pname = "predicates";
        version = "0.1";
-       sha256 = "0ly64xml5gbazyq07s409swgysvlwjc19w4x46yp1684ifv0gghf";
+       sha256 = "0ebe07b68b049970bd219df01498e4746bffb84e80e803b0ff6abd426b27c653";
        libraryHaskellDepends = [ base ];
        description = "A couple of convenience functions for forming predicates";
        license = stdenv.lib.licenses.bsd3;
@@ -106227,7 +106561,7 @@ self: {
      mkDerivation {
        pname = "prednote";
        version = "0.36.0.2";
-       sha256 = "1nm6r448vzl1gkkasjihaf31i57lx7pi627dxwf73slwxfz4j0wb";
+       sha256 = "8b0349beeb9cea711cefed0813efe9f494188653304aade67c81fe8d08c9a6da";
        libraryHaskellDepends = [
          base bytestring containers contravariant rainbow split text
          transformers
@@ -106248,7 +106582,7 @@ self: {
      mkDerivation {
        pname = "prednote-test";
        version = "0.26.0.4";
-       sha256 = "0amx13lnbx6x37adpjrxjac23qbx1xvsk82pn572kyp7pshn7ijj";
+       sha256 = "52c663a1bee7fa294eb157a0a9770f7de12198923dcbdbd419ddf465e908bd2a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106272,7 +106606,7 @@ self: {
      mkDerivation {
        pname = "prefix-units";
        version = "0.1.0.2";
-       sha256 = "07b5s2bsqlaad06dgr5psidfgi1nmgc5c16j6kzayw9f4najjrav";
+       sha256 = "5b652995252e71affe34d20456d8ab36c4e75ad4b7e4d70c684a51ac97d0651d";
        revision = "1";
        editedCabalFile = "492d6b953a52678e44a880c5272c30175eed27c3f2bd4de82fc29eee4b4db00a";
        libraryHaskellDepends = [ base ];
@@ -106294,7 +106628,7 @@ self: {
      mkDerivation {
        pname = "prefork";
        version = "0.0.9";
-       sha256 = "0zraxygc8ybf93sw7lq60nynd5k1q65dns5kl4mdyflv3in8cfw8";
+       sha256 = "883b866c1c9b3adf2aa1b368db8ac1619666bd0506d3c3f5486e79c49eef2a7f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106322,7 +106656,7 @@ self: {
      mkDerivation {
        pname = "pregame";
        version = "0.1.4.3";
-       sha256 = "0ls2fmg1xm10njwzz7nifndggq4bpi7ylx3n9aah8bn1hqwf8sy4";
+       sha256 = "c46be43886c12e04954a7674ea4fbc8be0f79a75d19effb9b420d41e5e754253";
        libraryHaskellDepends = [
          base bytestring cmdargs containers data-default lens mtl parallel
          safe stm text transformers tuple vector
@@ -106339,7 +106673,7 @@ self: {
      mkDerivation {
        pname = "prelude-extras";
        version = "0.4";
-       sha256 = "0mzsc9pzcamaa7i3g9hkajy35sbpqdjrflv6r98r8hhlr0yrdjan";
+       sha256 = "56c9963dc814429451ca66539765c377e932bc5413a637e251aa2af66f62fa57";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/prelude-extras";
        description = "Haskell 98 - higher order versions of Prelude classes";
@@ -106351,7 +106685,7 @@ self: {
      mkDerivation {
        pname = "prelude-generalize";
        version = "0.4";
-       sha256 = "0h452pn7zs97z5gv2p3x9pg61phphwcw5y5g1w38k3gihdvym8jl";
+       sha256 = "54a2ea7783f18d89060faff8c2198717de60de4d7d5cb15ff927e97fec158540";
        libraryHaskellDepends = [ base comonad logict transformers ];
        jailbreak = true;
        description = "Another kind of alternate Prelude file";
@@ -106364,7 +106698,7 @@ self: {
      mkDerivation {
        pname = "prelude-plus";
        version = "0.0.0.6";
-       sha256 = "139b0580f1gx4hj211c7lwcq5y6a0qpdzsaidvqbfq36h04w8kjv";
+       sha256 = "5b4ec409806660b7f06e51e9df2e06caf88219a78785202424fd050750012b8d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base utf8-string ];
@@ -106378,7 +106712,7 @@ self: {
      mkDerivation {
        pname = "prelude-prime";
        version = "0.1";
-       sha256 = "1avj11a5bqn8sxizzh1fxhw3dvd55xsimbbhdwymxfn45vvfswr7";
+       sha256 = "2773edf62ec4ba5e3d6f70ad1a752fa5ed3638ec2ec0ff63d7c8e255540872ab";
        libraryHaskellDepends = [ base ];
        description = "A slightly better (but conservative) Prelude";
        license = stdenv.lib.licenses.mit;
@@ -106389,7 +106723,7 @@ self: {
      mkDerivation {
        pname = "prelude-safeenum";
        version = "0.1.1.2";
-       sha256 = "09wp6b7bvnp2wz0kigwm4vfca74phh3bbpqybqdgm60isfaz3yfl";
+       sha256 = "d4f9f195d31198fa1a5e1edfb50684971cc5dc2695bf38c1e7e2dabdce329727";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "A redefinition of the Prelude's Enum class in order to render it safe";
@@ -106405,7 +106739,7 @@ self: {
      mkDerivation {
        pname = "preprocess-haskell";
        version = "0.0.1.1";
-       sha256 = "1jglriabjw44f9phx7ah87wwmri64a61v236dzs58snagzdiq84r";
+       sha256 = "99201cdb7fca6a54f46f66881d8c2226e6caf941509d0e6f728470b954ccf4c9";
        libraryHaskellDepends = [
          base base-unicode-symbols basic-prelude bytestring Cabal containers
          cpphs deepseq directory file-embed foldl haskell-src-exts here
@@ -106422,7 +106756,7 @@ self: {
      mkDerivation {
        pname = "preprocessor-tools";
        version = "1.0.1";
-       sha256 = "0ngfmvw6hvbr52i01n180ls4c8rx2wk2rka6g6igpvy9x2gwjin9";
+       sha256 = "c946c99fe8c9effba27946cd2c26173d2346340528d800a228796d68f8aeee59";
        libraryHaskellDepends = [ base mtl parsec syb ];
        homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
        description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
@@ -106434,7 +106768,7 @@ self: {
      mkDerivation {
        pname = "presburger";
        version = "1.3.1";
-       sha256 = "15yhqc6gk14dsqr4b0x87i1xw0sc3iscw28grg4vmcspsjxil0l6";
+       sha256 = "86021abbd457b3bac9cb0f09ce741c4c03de433ca8834532d68d84f90cc3d097";
        revision = "1";
        editedCabalFile = "7c88061e13bab0e63240c05dad36b9518ad50d7ad4ade0f8911efa7826eb4b5d";
        libraryHaskellDepends = [ base containers pretty ];
@@ -106451,7 +106785,7 @@ self: {
      mkDerivation {
        pname = "present";
        version = "2.2";
-       sha256 = "1z9zvmszda7h1h4inq4b6ig9bd205mskqq85ns3rzsffxaj471p4";
+       sha256 = "e48643a4eacee99f87b605613c752d40b4955e348b601b090cf0a8f675dd3ffd";
        libraryHaskellDepends = [
          aeson atto-lisp base bytestring data-default mtl semigroups text
        ];
@@ -106464,7 +106798,7 @@ self: {
      mkDerivation {
        pname = "press";
        version = "0.1.2";
-       sha256 = "0aa3079az8bazyzqxxhx575vxr4a0p3wvlgh765w3k01vh6dkzgf";
+       sha256 = "eefdd90cdc01ccc18b39f0d1cdc7058ae4becb291df68ebfff6aa1afd2014329";
        libraryHaskellDepends = [ base containers json mtl parsec ];
        homepage = "http://github.com/bickfordb/text-press";
        description = "Text template library targeted at the web / HTML generation";
@@ -106481,7 +106815,7 @@ self: {
      mkDerivation {
        pname = "presto-hdbc";
        version = "0.1.0.3";
-       sha256 = "1353nh8pq3ja4pw1fps0a46rfizph47l7k5gqlnkbz8w8b41miap";
+       sha256 = "57c51ac8421cfd352dc5afcc430f81f747970d51405f17f8254a0e7c11b4a38c";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring convertible either either-unwrap
          errors HDBC HTTP http-streams io-streams lens mtl network-uri safe
@@ -106497,7 +106831,7 @@ self: {
      mkDerivation {
        pname = "prettify";
        version = "1.0";
-       sha256 = "18bwgz2cgkd6n9gwpwipv2bc6d5501mflmr0r2akwy98q2gb9qg8";
+       sha256 = "e8e1b49ec028793e95c82057ea6a00a534c396d837f2cb5fb2a6cdc7c47f7ca1";
        libraryHaskellDepends = [ base containers semigroups ];
        description = "Haskell2010 structured text formatting";
        license = stdenv.lib.licenses.bsd3;
@@ -106508,7 +106842,7 @@ self: {
      mkDerivation {
        pname = "pretty";
        version = "1.1.3.2";
-       sha256 = "0k61v71c40dy4whvy1q1n3hs0xnhscg4svp0prcihn7s57j2spvi";
+       sha256 = "715f2de429fa581859bee06e4d1ed3d076a0e1b00107bf2127be01c2c2d9c14c";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [ base deepseq ghc-prim QuickCheck ];
        homepage = "http://github.com/haskell/pretty";
@@ -106521,7 +106855,7 @@ self: {
      mkDerivation {
        pname = "pretty-class";
        version = "1.0.1.1";
-       sha256 = "1qdfp2kpahzflq9a3idwmb0pqs4l7almxn5rbw5gp2pmdx81p3am";
+       sha256 = "558d1b506ff58afb0a5fb9d85ea93a94687cc1aabcc5a112a6ee4375a7b8aee1";
        libraryHaskellDepends = [ base pretty ];
        homepage = "https://github.com/ddssff/pretty-class";
        description = "Pretty printing class similar to Show";
@@ -106533,7 +106867,7 @@ self: {
      mkDerivation {
        pname = "pretty-compact";
        version = "1.0";
-       sha256 = "0k6yvdwcfhjp0dbfmc55xfncfry7b69hrp5rsaqm2iia3ahx0nan";
+       sha256 = "5659d0a11a2a4651b1d2b9dc0c9359c767c7aceba5b0ea56035742c778dbde4c";
        libraryHaskellDepends = [ base ];
        description = "Pretty-printing library";
        license = "GPL";
@@ -106544,7 +106878,7 @@ self: {
      mkDerivation {
        pname = "pretty-hex";
        version = "1.0";
-       sha256 = "0ylwkvvjvmpprha9nx83xb8gkhyanhk5fffc0r7lb96n4ch5z6pz";
+       sha256 = "ff9a5f2023d6a4454f06cc395726b4cac3f9d0ea03759b14ccf7d62df79e9c7a";
        libraryHaskellDepends = [ base bytestring ];
        description = "A library for hex dumps of ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -106555,7 +106889,7 @@ self: {
      mkDerivation {
        pname = "pretty-ncols";
        version = "0.1";
-       sha256 = "0bvd8wgjrj9g86b1z8m9mjzswibrmhasgajnkgr2dlizl5lg7faq";
+       sha256 = "58b9f368a13fd226f29b56aaa715ac7945aebfaca9a21f96412fc92c1f476d2f";
        libraryHaskellDepends = [ base pretty ];
        description = "A implementation of multi-column layout w/ Text.PrettyPrint";
        license = stdenv.lib.licenses.bsd3;
@@ -106568,7 +106902,7 @@ self: {
      mkDerivation {
        pname = "pretty-show";
        version = "1.6.8.2";
-       sha256 = "1s95nzjkmqb747s50i68c9s8p91cxgydzqkd2l5yjzdaygrvrhqv";
+       sha256 = "1bc3bcf3f3aa7de90b156de2dffceb2ca48b7462c84450f42167e13ae5b725e9";
        revision = "1";
        editedCabalFile = "3454673131f18cc65fb3fbca43d5d010f6b228abc0b7e501e67ef90ffded4218";
        isLibrary = true;
@@ -106588,7 +106922,7 @@ self: {
      mkDerivation {
        pname = "pretty-sop";
        version = "0.1.0.1";
-       sha256 = "1sv6lwzgj9jv7lx3lb868md5w93p77mzspgxgqcss1kr9q5xyfvm";
+       sha256 = "753bdf0b4e7906ad197efd5dfdeb3977245e5a45062d3a3a3d5b26f93ea766eb";
        libraryHaskellDepends = [ base generics-sop pretty-show ];
        description = "A generic pretty-printer using generics-sop";
        license = stdenv.lib.licenses.bsd3;
@@ -106599,7 +106933,7 @@ self: {
      mkDerivation {
        pname = "pretty-tree";
        version = "0.1.0.0";
-       sha256 = "0cf856qjacc0lmiina44s00i17ga2qrfr7wdlxhwiqdmpsh5g3fw";
+       sha256 = "dc8d57a0beb5e1c861a78d9fec3216ea9d1001d084281b63a5803125b129c831";
        libraryHaskellDepends = [ base boxes containers ];
        description = "Pretty-print trees";
        license = stdenv.lib.licenses.bsd3;
@@ -106610,7 +106944,7 @@ self: {
      mkDerivation {
        pname = "prettyFunctionComposing";
        version = "1.0.1";
-       sha256 = "0c39dyjlcrah1aq2rkk7zqysmzxqym6chv8x9zmifclvn5a4j98b";
+       sha256 = "0b254954b19b3217eb4f1d6dc84cf5b8ffaa3dfe67ce2cb00a506546a56f6930";
        libraryHaskellDepends = [ base ];
        description = "prettier function composition by (°)";
        license = stdenv.lib.licenses.bsd3;
@@ -106621,7 +106955,7 @@ self: {
      mkDerivation {
        pname = "prettyclass";
        version = "1.0.0.0";
-       sha256 = "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5";
+       sha256 = "e537446e7a346e5e0872ed8281db2bb0220c737f10757848c901da1399548986";
        libraryHaskellDepends = [ base pretty ];
        description = "Pretty printing class similar to Show";
        license = stdenv.lib.licenses.bsd3;
@@ -106632,7 +106966,7 @@ self: {
      mkDerivation {
        pname = "prim-uniq";
        version = "0.1.0.1";
-       sha256 = "1zssi4zaihjaf3an10ar39d4qb155wcl1j66aymfrr9z2f2rf1gv";
+       sha256 = "fb059785133fe5ecaa57c6c840192f252c4c5a1a598160d5704ac2a83e895aff";
        libraryHaskellDepends = [ base dependent-sum primitive ];
        homepage = "https://github.com/mokus0/prim-uniq";
        description = "Opaque unique identifiers in primitive state monads";
@@ -106644,7 +106978,7 @@ self: {
      mkDerivation {
        pname = "primes";
        version = "0.2.1.0";
-       sha256 = "0ny6fzr967d1fifk050k95j9snnbjjif2bxf3v9s93k3zdc6bmkl";
+       sha256 = "74d66558fb638ea4d31eae2fe1a294cb5a9d64491314305d74a11d93f277c65b";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/sebfisch/primes";
        description = "Efficient, purely functional generation of prime numbers";
@@ -106656,7 +106990,7 @@ self: {
      mkDerivation {
        pname = "primitive";
        version = "0.5.1.0";
-       sha256 = "0a8mf8k62xga5r5dd0fna1swqbx2r94c0mvqnc4mfq640zrsa5w8";
+       sha256 = "8817a5f307c4605709b37857c048caa22fcc7550d681d64a2eea756126721529";
        revision = "1";
        editedCabalFile = "ee8bf53215343bfc18dc8d310fd0e03ad3eaab8b85afdbc97dea3b047e0d98ec";
        libraryHaskellDepends = [ base ghc-prim ];
@@ -106671,7 +107005,7 @@ self: {
      mkDerivation {
        pname = "primitive";
        version = "0.6";
-       sha256 = "08lpsvrgdvqh8xw7f1wzkvwdnkizblbym8y2xpknk0y62f9g799l";
+       sha256 = "34a5f39213c68369e7edc2a3ea175d3f4edbf89e9f0777784710eff6f2d69722";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        testHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/haskell/primitive";
@@ -106688,7 +107022,7 @@ self: {
      mkDerivation {
        pname = "primula-board";
        version = "0.0.1";
-       sha256 = "0hh13i0idpwv509zavg92wwvp3s20vc1ivz7vfwa4kxp0h21phs9";
+       sha256 = "49c31b0404b74fa2b8dbe7ef18d806428fbb3917e96df513289bdf16411c0142";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -106709,7 +107043,7 @@ self: {
      mkDerivation {
        pname = "primula-bot";
        version = "0.0.2";
-       sha256 = "0j3xjlwvix81zxd38540jwb3vp438d72gmfxdhbypyi5f1qgx01x";
+       sha256 = "3d80fe707025faeb176cddd5274e4383dc3d16978014345aff01f5b839957d48";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -106729,7 +107063,7 @@ self: {
      mkDerivation {
        pname = "printf-mauke";
        version = "0.6.0";
-       sha256 = "1fyxm4bdhv27g83q21d0j59p7da8kgi8sfnsp39xb8gl4k0gd80z";
+       sha256 = "1fa0f6c024f4a1d5d3b8da3a8de29b48b5735391a00581077a476cd816a9ddbb";
        libraryHaskellDepends = [
          base bytestring containers data-default template-haskell
          utf8-string
@@ -106744,7 +107078,7 @@ self: {
      mkDerivation {
        pname = "printxosd";
        version = "0.1";
-       sha256 = "1myn6bp28d8nf92v9xf3iw5jvzwmrxbzf8px254hmzv8zvd5ki1i";
+       sha256 = "31c459dafe68ff0a4911fd22f757cf95ff2d0b8fc3f5b44572163524ee32d6d7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base xosd ];
@@ -106758,7 +107092,7 @@ self: {
      mkDerivation {
        pname = "priority-queue";
        version = "0.2.2";
-       sha256 = "0nsiil0yl32m80a1kpg3z0wd5fxwkpz2lzf66pa06iy24q0rz5lf";
+       sha256 = "8e969f0126c24703d435c67d2afe9dbcbbd238f8e3dd191440550cea018d515b";
        libraryHaskellDepends = [ base containers queue reord stateref ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~mokus/priority-queue";
@@ -106773,7 +107107,7 @@ self: {
      mkDerivation {
        pname = "priority-sync";
        version = "0.2.1.1";
-       sha256 = "1ffg3ba6wfd72r2d86hq28y83qx80pdza939knay9hsnyw84vd6g";
+       sha256 = "cfb44d10f756c3e4959d6924f5db05a8e3813c12181ad44416a7396ed41acfb9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106789,7 +107123,7 @@ self: {
      mkDerivation {
        pname = "privileged-concurrency";
        version = "0.3";
-       sha256 = "0r345189lympvin6xw6r8s04dldj94kv2703ilcazm0a6mgf0q67";
+       sha256 = "c760e05e350ad4af188d031cb12749b2d1468046d9f06e6cdcb77a9a50286464";
        libraryHaskellDepends = [ base stm ];
        description = "Provides privilege separated versions of the concurrency primitives";
        license = stdenv.lib.licenses.bsd3;
@@ -106802,7 +107136,7 @@ self: {
      mkDerivation {
        pname = "prizm";
        version = "0.3.1.2";
-       sha256 = "0n0pihi8f8y349lmy6hcv2z728isvwjlcggv9pnhm8d0k97la2b9";
+       sha256 = "6909454f9aa0a10aed4dfb3d4625df3a2271bed80c1a5f6922c32387228c1758";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-hunit
@@ -106819,7 +107153,7 @@ self: {
      mkDerivation {
        pname = "probability";
        version = "0.2.4.1";
-       sha256 = "0nh73l03d7niz3a3h2y4i80mlp64ilfkx7krn57skzfi8drwnjvc";
+       sha256 = "6c4bcb7343d1fda94fb1799e3e1d8dc45c5a018ac40b38d4f8d19e36001d075a";
        libraryHaskellDepends = [
          base containers random transformers utility-ht
        ];
@@ -106836,7 +107170,7 @@ self: {
      mkDerivation {
        pname = "probable";
        version = "0.1.1";
-       sha256 = "1n6p7pharcq2cmfabh2ngfsy9mfqqs6qh57m0kygq13lbzwyy8wr";
+       sha256 = "9923eff95f7404fcfc04f514888dc6d8d5e4b57b56c0a55c6502b3ace03dd7d8";
        libraryHaskellDepends = [
          base mtl mwc-random primitive statistics transformers vector
        ];
@@ -106852,7 +107186,7 @@ self: {
      mkDerivation {
        pname = "proc";
        version = "0.0.9";
-       sha256 = "0p3cr4q34h81g77psypja4m0mgs9mwl51mfb5kdxj5xrsf2nd3la";
+       sha256 = "8a8e6685d3b917d9db2ccbd55028af49bf0a2a51f27a7dcf7901413230c96c5c";
        libraryHaskellDepends = [
          base containers directory filepath process regex-tdfa split strict
          xformat
@@ -106867,7 +107201,7 @@ self: {
      mkDerivation {
        pname = "process";
        version = "1.2.3.0";
-       sha256 = "1ib01nkh513v5ab7wa255jqpsnqjsjdmh8d9dz8inqw3f4ah97k1";
+       sha256 = "619e04157183631bd16fa921589bd4125b7db12c45287e962a7b8402a70d60c5";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base ];
        description = "Process libraries";
@@ -106882,7 +107216,7 @@ self: {
      mkDerivation {
        pname = "process-conduit";
        version = "1.2.0.1";
-       sha256 = "0hnbywmjvk3y26sc9a0jfqzm04pg08zd2bflld1mvni02s89lvc8";
+       sha256 = "886d9a901620da5d43a3d42dd13e02ef12503f7612a8c4b4117ecc2d2bf7cb42";
        libraryHaskellDepends = [
          base bytestring conduit control-monad-loop mtl process resourcet
          shakespeare shakespeare-text template-haskell text
@@ -106901,7 +107235,7 @@ self: {
      mkDerivation {
        pname = "process-extras";
        version = "0.3.3.5";
-       sha256 = "18fyv47xhvw5881is2hk9a1x35fr21jvw36irlc5cxc3vfmnym6s";
+       sha256 = "da546fabdb83755618cdd10cbe6510d995d1834a130a1d0342856fd80fd9dea1";
        libraryHaskellDepends = [
          base bytestring deepseq ListLike process text
        ];
@@ -106917,7 +107251,7 @@ self: {
      mkDerivation {
        pname = "process-iterio";
        version = "0.0.0";
-       sha256 = "18kdj70fv4y5fnw7d8pd0mbvlwca1pm1f88z4ibpji0n4dja332z";
+       sha256 = "5f8ca1642316447957241f2117ea0d8a71ba5705eda276b875c593edc0916da2";
        libraryHaskellDepends = [
          base bytestring cpphs iterIO process transformers
        ];
@@ -106935,7 +107269,7 @@ self: {
      mkDerivation {
        pname = "process-leksah";
        version = "1.0.1.4";
-       sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv";
+       sha256 = "7bf15534c348f865997ea661b2967cecba3427a463242a72d442486de1f229a1";
        libraryHaskellDepends = [ base directory filepath unix ];
        jailbreak = true;
        description = "Process libraries";
@@ -106949,7 +107283,7 @@ self: {
      mkDerivation {
        pname = "process-listlike";
        version = "1.0";
-       sha256 = "0yaz90pfpx9kahwbvbvl2ir62imxxsq7v72i67ac2zv3585c427r";
+       sha256 = "f908c20a2a637fc1d431519c7db0eebd4661721474afbd385433f5eb2e485f79";
        revision = "3";
        editedCabalFile = "75f8f07195965b0a2ca36725792b095896801d4e4133c7c67a72600bdbeb63b1";
        libraryHaskellDepends = [
@@ -106969,7 +107303,7 @@ self: {
      mkDerivation {
        pname = "process-progress";
        version = "0.14";
-       sha256 = "0kdzb8m6fx0ah9i15fpcz6phzqd88g4djf0a5h0vi4d4qkib6kin";
+       sha256 = "364eb3e2c4a491b8012c0a38d9c843a8e10faff9ecba1262820a74672a5abf4d";
        libraryHaskellDepends = [
          base bytestring deepseq HUnit ListLike mtl process process-listlike
          text time unix utf8-string
@@ -106987,7 +107321,7 @@ self: {
      mkDerivation {
        pname = "process-qq";
        version = "0.2.0";
-       sha256 = "1495dc39kjf9mjvn7ag8hb95bsmhb18sd0ykg4mz7rrl0q03ig2a";
+       sha256 = "4abc38000634e7f32b79d383a65158b0ea55d282e8a963b7acc9c999066b2591";
        libraryHaskellDepends = [
          base bytestring enumerator mtl process shakespeare-text
          template-haskell text
@@ -107010,7 +107344,7 @@ self: {
      mkDerivation {
        pname = "process-streaming";
        version = "0.7.2.2";
-       sha256 = "0jmhl7jdrznbf9w9cpwh98apghhcnb9vadj94sjxfh288k21ckb3";
+       sha256 = "634d16c4444840d7a5264936b5d3b20cc277154a905f967872cbfedce4a1b04a";
        libraryHaskellDepends = [
          base bifunctors bytestring conceit containers contravariant foldl
          free pipes pipes-bytestring pipes-concurrency pipes-parse
@@ -107036,7 +107370,7 @@ self: {
      mkDerivation {
        pname = "processing";
        version = "1.2.0.1";
-       sha256 = "1axryd8453b2l4hbhqy5vkj29hqppsvk1sqxbawdhk3d3hs705pa";
+       sha256 = "ea1670341c6d4cd8b85a1deb30b7be17c324e4dcc563b820a1628d4250f3b9ab";
        libraryHaskellDepends = [
          base blaze-html containers directory filepath mainland-pretty
          multiset QuickCheck quickcheck-instances template-haskell text
@@ -107055,7 +107389,7 @@ self: {
      mkDerivation {
        pname = "processor-creative-kit";
        version = "0.1.0.1";
-       sha256 = "1jshzych1vbb24bm219sdpxkb2amvv11fbhqwf7iy4l1prg248h7";
+       sha256 = "0722225ebe81121f8fe3182e17c2de558935fb6d3a055117116bed0099ff50cb";
        libraryHaskellDepends = [
          array attoparsec base bytestring containers deepseq mtl
        ];
@@ -107069,7 +107403,7 @@ self: {
      mkDerivation {
        pname = "procrastinating-structure";
        version = "1.0.1";
-       sha256 = "126mp2mfmy9xg1kichl19ga6j3w1s0qpk3hqh47x5x5120qh63l3";
+       sha256 = "830e033110a1f4d20f81188e7931d0810f69d44b81421667783df9eaaab8d588";
        libraryHaskellDepends = [ base procrastinating-variable ];
        description = "Pure structures that can be incrementally created in impure code";
        license = "unknown";
@@ -107081,7 +107415,7 @@ self: {
      mkDerivation {
        pname = "procrastinating-variable";
        version = "1.0.2";
-       sha256 = "12px0nk7j74hyfzcvxacd9020gk3cd3ijqb7fjmmg8y33354jkc4";
+       sha256 = "844d49ca18c3a357ab746761194763633e20406a4cf5cdbef3901c79a605fd8a";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/gcross/procrastinating-variable";
        description = "Haskell values that cannot be evaluated immediately";
@@ -107094,7 +107428,7 @@ self: {
      mkDerivation {
        pname = "procstat";
        version = "0.1.0.1";
-       sha256 = "1md75jc32nfnvs7ygf1mna00gl0wmimp2lkdcs9r9v0iy4b1hr5m";
+       sha256 = "b5641816f111ec9493666d52716bac1cd00780b235b8e78fded65931982ca7d5";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        jailbreak = true;
        homepage = "http://closure.ath.cx/procstat";
@@ -107110,7 +107444,7 @@ self: {
      mkDerivation {
        pname = "proctest";
        version = "0.1.3.0";
-       sha256 = "02iz323arx9zwclvspgaaqz81bp6jdnj89pjm08n2gamg39zsbdn";
+       sha256 = "b62dfdd378553d6111a8f226246d93e6ae803e56ea5dbd29e33ff5ac86183f0a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring HUnit process text ];
@@ -107128,7 +107462,7 @@ self: {
      mkDerivation {
        pname = "product-profunctors";
        version = "0.6.3";
-       sha256 = "0mkir3anyccjzcqjybnmx4ijz2h0qnps48pc5giaszmfs9nv7p18";
+       sha256 = "28dcb36dd2ae7eade22bec22a2afc5008a2f23e9d52e2f31fb92316fd5c87156";
        libraryHaskellDepends = [
          base contravariant profunctors template-haskell
        ];
@@ -107143,7 +107477,7 @@ self: {
      mkDerivation {
        pname = "prof2dot";
        version = "0.4.1";
-       sha256 = "1cf1ysnfpng7ijgsbnly5878wg7cp907cqpvf4yq9sd6nym8hcng";
+       sha256 = "cf3288aab7a6e9843d71fb627640baec3c8e0e2a9edaa59f8ce7d9ebacf6c1b1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107162,7 +107496,7 @@ self: {
      mkDerivation {
        pname = "prof2pretty";
        version = "0.1.0.0";
-       sha256 = "104frg0czfk4rgjxyf0xz7100j3y9ndvf01jgv3yibaq98v2h64r";
+       sha256 = "991828364a58ade8c77e3200b79b4d7e4800c2f91d38dfe5cb64bacfc0cb8e80";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107180,7 +107514,7 @@ self: {
      mkDerivation {
        pname = "profiteur";
        version = "0.2.0.1";
-       sha256 = "17h690m78xsvbcxms2yxq7g9d1w5dx31q1m3a2m3i4gfwby1ndnf";
+       sha256 = "ce361bfce2ee9138aa50a3061c466f858796dec1dd0b5d3b5b5b77742a48069e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107197,7 +107531,7 @@ self: {
      mkDerivation {
        pname = "profunctor-extras";
        version = "4.0";
-       sha256 = "10j458liqlyz5s9gkg95c6aq7ap5fa7d8pc7hygy71nn87pm2g4a";
+       sha256 = "8a3c51ef41d686e39f87875dd48e72e5aa83956125bdf9922edf531c292a4482";
        libraryHaskellDepends = [ base profunctors ];
        homepage = "http://github.com/ekmett/profunctor-extras/";
        description = "This package has been absorbed into profunctors 4.0";
@@ -107211,7 +107545,7 @@ self: {
      mkDerivation {
        pname = "profunctors";
        version = "5.1.1";
-       sha256 = "0lw2ipacpnp9yqmi8zsp01pzpn5hwj8af3y0f3079mddrmw48gw7";
+       sha256 = "873f4478cdadd574c070c00fa790e4b0d8fb6f00577f142bf6e9dacbd48d8253";
        libraryHaskellDepends = [
          base comonad distributive tagged transformers
        ];
@@ -107225,7 +107559,7 @@ self: {
      mkDerivation {
        pname = "progress";
        version = "1.0";
-       sha256 = "0cac4v6k2nrpglnf3680y334kw4k0s6xfm86wrfyszl5sq2a7w94";
+       sha256 = "24f1a304d6857eed5de60655d78d0693f049c6f00099e12c7d375b31cd264c31";
        libraryHaskellDepends = [ base time ];
        description = "Simple progress tracking & projection library";
        license = stdenv.lib.licenses.bsd3;
@@ -107237,7 +107571,7 @@ self: {
      mkDerivation {
        pname = "progressbar";
        version = "0.0.1";
-       sha256 = "09yfspxcdp4y5chim2qmylfmjp0kdg4qg2w54kg3hir8f7kih3ns";
+       sha256 = "da0e18e771284738de24858b87c96b135c591df5158b1a212b9edcc6fad5ce27";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base io-reactive ];
@@ -107254,7 +107588,7 @@ self: {
      mkDerivation {
        pname = "progression";
        version = "0.5.0.2";
-       sha256 = "01s01v59hjy5i8dd9a1gxjpyw2qq3r81np7acn94wjh64c8rrmpa";
+       sha256 = "ead69c1123064a4e9265ea5c1b501e180beeafec2fa8d41a8ac54b98ca0e4007";
        libraryHaskellDepends = [
          base containers criterion directory filepath haskeline process
          txt-sushi
@@ -107273,7 +107607,7 @@ self: {
      mkDerivation {
        pname = "progressive";
        version = "0.1.0.1";
-       sha256 = "1psbgl19x2wwh4rcd4nsayrc1bq2g27qywr1m9jgmshcz1cinpbh";
+       sha256 = "705d1b59f80ceafa64aa21738f8f7802afc0b257da92c632819c8b9e027d4bdf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107292,7 +107626,7 @@ self: {
      mkDerivation {
        pname = "proj4-hs-bindings";
        version = "0.1";
-       sha256 = "0cwkjg1bm1swl103nsziyc71yqgvdq82ywgi2jnn7cj9lk4ihrah";
+       sha256 = "506518c9a449b263ad14f1712f106efb611f0ef3f16b3b40a05c87bac2939333";
        libraryHaskellDepends = [ base ghc-prim ];
        librarySystemDepends = [ proj ];
        description = "Haskell bindings for the Proj4 C dynamic library";
@@ -107308,7 +107642,7 @@ self: {
      mkDerivation {
        pname = "project-template";
        version = "0.2.0";
-       sha256 = "0433a2cmximz2jbg0m97h80pvmb7vafjvw3qzjpsncavg38xgaxf";
+       sha256 = "aeabd7d1785b31abaffc78f02d9dda67d57d01822755f09614bfc65e99506310";
        libraryHaskellDepends = [
          base base64-bytestring bytestring conduit conduit-extra containers
          directory filepath mtl resourcet text transformers
@@ -107327,7 +107661,7 @@ self: {
      mkDerivation {
        pname = "projection";
        version = "0.1";
-       sha256 = "0g9zrdp92w8ygrsmbw4600xaf8d17sm4pq68qd6z7hnf8zps22c1";
+       sha256 = "8109a1ef47cec2f34dc3c8e04baa3ea121a73a0086f055757e1e71916ecb3f3d";
        revision = "1";
        editedCabalFile = "805db4a9404200c6d8c00b7e96f95c9c71e3595b6601f75efed7237ad5bed30b";
        libraryHaskellDepends = [ base ];
@@ -107342,7 +107676,7 @@ self: {
      mkDerivation {
        pname = "prolog";
        version = "0.2.0.1";
-       sha256 = "073sd3rhcfqw9csm0qsbc57ix57dv3k5yjr9hcc33b9zq5y10sp0";
+       sha256 = "e06a107cc13fad311883294b5fe6d8ed941e4f614b6350354b1c3b06f3687a1c";
        libraryHaskellDepends = [
          base containers mtl parsec syb template-haskell th-lift
          transformers
@@ -107361,7 +107695,7 @@ self: {
      mkDerivation {
        pname = "prolog-graph";
        version = "0.1.0.2";
-       sha256 = "1w3wz0sn1qhw286g3arin30jvlldadw976xr7hp0afdvqicl3892";
+       sha256 = "22a14159c4bb39052e3cb99b9378538dd22dc1b031abf10c121ce26035f87cf0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107379,7 +107713,7 @@ self: {
      mkDerivation {
        pname = "prolog-graph-lib";
        version = "0.2.0.1";
-       sha256 = "02xa4hqmhmsv7vkdy3m3dr1w3z88kc8ly0jjn7q6pba5yarci7nr";
+       sha256 = "d99ec8b2f245ad6bf0b152024f119b08fdc1436ea30edfe63e5b57583124aa0b";
        libraryHaskellDepends = [ base fgl graphviz mtl prolog text ];
        homepage = "https://github.com/Erdwolf/prolog";
        description = "Generating images of resolution trees for Prolog queries";
@@ -107395,7 +107729,7 @@ self: {
      mkDerivation {
        pname = "prometheus-client";
        version = "0.1.0.1";
-       sha256 = "0bvp40rdlq8f6rh5v75pgqnmiwz85j960sfi22y7s0r5vykbgh5x";
+       sha256 = "bdc0b7a6df25037dbc10d16960922ce8f3582d7eb79c5d60360e61da3220772f";
        libraryHaskellDepends = [
          atomic-primops base bytestring containers mtl stm time transformers
          utf8-string
@@ -107414,7 +107748,7 @@ self: {
      mkDerivation {
        pname = "prometheus-metrics-ghc";
        version = "0.1.0.1";
-       sha256 = "15a7hli2fsjmgjnvhdsv1572nqj3i214b0r9bygdang4cjrjv10p";
+       sha256 = "17842db364e459d59e5f298345828843622b4e095b37b8ad7c556a2722854795";
        libraryHaskellDepends = [ base prometheus-client utf8-string ];
        testHaskellDepends = [ base doctest prometheus-client ];
        homepage = "https://github.com/fimad/prometheus-haskell";
@@ -107427,7 +107761,7 @@ self: {
      mkDerivation {
        pname = "promise";
        version = "0.1.0.0";
-       sha256 = "1hzsprmw15apc654n77ima1pgs9nj6287d412jb5z37154bd0nfg";
+       sha256 = "cf59d01629e18c5f961481b483849136e97783aaf11c4b8a615795c06bbefac3";
        libraryHaskellDepends = [ async base ];
        jailbreak = true;
        homepage = "http://github.com/jfischoff/promise";
@@ -107440,7 +107774,7 @@ self: {
      mkDerivation {
        pname = "promises";
        version = "0.2";
-       sha256 = "0fgczzjf93fvrfh9sgy49072c6qw27626qwla0qwl0wvfhaal7ah";
+       sha256 = "501daa14749b03ca3150946323cc111c1b260e48c43f9da0cbdb8de4e4ffec39";
        libraryHaskellDepends = [ base primitive ];
        homepage = "http://github.com/ekmett/promises/";
        description = "Lazy demand-driven promises";
@@ -107452,7 +107786,7 @@ self: {
      mkDerivation {
        pname = "prompt";
        version = "0.1.1.0";
-       sha256 = "13ayvs1irsa1hqy6y6ca99dr20vwvy9g10zjrqshvj48i5ra2j4g";
+       sha256 = "8f48a1728988c80d35cef283f092df7c03915b4a8a196f3c8641e91c83de5e8d";
        libraryHaskellDepends = [
          base mtl transformers transformers-compat
        ];
@@ -107468,7 +107802,7 @@ self: {
      mkDerivation {
        pname = "propane";
        version = "0.1";
-       sha256 = "1kzlwsxka72h3a612xi2s741hdx88qsib07kcralv2k76krqxlj4";
+       sha256 = "44d28ef334678a4d5566f380153546a83718c8d12276118c1a501c35bbe6f4cf";
        libraryHaskellDepends = [
          base colour containers directory filepath repa repa-devil spawn
        ];
@@ -107486,7 +107820,7 @@ self: {
      mkDerivation {
        pname = "propellor";
        version = "2.7.0";
-       sha256 = "12pfrv6n61bsg4cyylfr0kw82x36mwvnyvzdkr2lrka79i5l9a5w";
+       sha256 = "bca8444b4c47cd4c459eed6f6f37af667481f804d951ef19797a0563cdceee8a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107509,7 +107843,7 @@ self: {
      mkDerivation {
        pname = "properties";
        version = "0.0.2";
-       sha256 = "04a35zxgps9rn6y86x3jf6gma6kjl8izmnyl45hz64cl9yb5dwwi";
+       sha256 = "91f356964f9411f36121d4dbfa23a2721a559f71727483bcb139e9fbfa2f4311";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "check quickCheck properties in real time";
@@ -107525,7 +107859,7 @@ self: {
      mkDerivation {
        pname = "property-list";
        version = "0.1.0.5";
-       sha256 = "0wv97v6b7yfkwaz6mpw3l12q34k620jb1clz0j9a1kvysm1r005k";
+       sha256 = "b3009043d57ecfa092049fb2b0241066928145a083df6abee2d3f9b3cc3e6973";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cereal containers free oneOfN
          recursion-schemes syb template-haskell text time time-locale-compat
@@ -107541,7 +107875,7 @@ self: {
      mkDerivation {
        pname = "proplang";
        version = "0.1";
-       sha256 = "1vm01qvd0jgcdpqx3p2h6gafhxi5x7bs8r5a6xsk4zz6cc1cbw4m";
+       sha256 = "95f0c50263e67f327537aa64a4d7e92576e8d43350dcd1f16dec49d0360ea0ee";
        libraryHaskellDepends = [ base glade glib gtk ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/proplang/";
        description = "A library for functional GUI development";
@@ -107554,7 +107888,7 @@ self: {
      mkDerivation {
        pname = "props";
        version = "0.1.2";
-       sha256 = "10bkbqhl15xgc9iglx0f9h218a2hcfg0wali2c6a17wvlpfcwjbx";
+       sha256 = "7d49cedca59b9fa00c13912a0e9e63502814044c0e74fa6262af9740215e7381";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck ];
        homepage = "http://github.com/deviant-logic/props";
@@ -107570,7 +107904,7 @@ self: {
      mkDerivation {
        pname = "prosper";
        version = "0.1.1";
-       sha256 = "006h3i316s85f3d6qmwm9kajbxil1xcnqp11jfvv5ypnx2gdyhgb";
+       sha256 = "eb41df9ee8f6fab2b793215c6c590f34f625d54c95576cda70056913461cd000";
        libraryHaskellDepends = [
          aeson base bytestring cereal containers HsOpenSSL http-streams
          io-streams mtl text transformers vector
@@ -107585,7 +107919,7 @@ self: {
      mkDerivation {
        pname = "proteaaudio";
        version = "0.6.2";
-       sha256 = "10ayg0pr7vjffk8l114gwf098kpmamirk6cknw1xhpnr7hwr1mln";
+       sha256 = "96d690393cd95ed803b79399996355f54e9480e38f8440d1744eee932f785e81";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ alsaLib ];
        libraryToolDepends = [ c2hs ];
@@ -107601,7 +107935,7 @@ self: {
      mkDerivation {
        pname = "protobuf";
        version = "0.2.1.0";
-       sha256 = "0i8hjrj6jycqmq7i1wl0kr9s17g4qfyc0gfwcbhbv70yxwf499di";
+       sha256 = "b1a5441cef1e9cbde062dc3dc0bcc3e49da0539e80f2100fae98796964961045";
        libraryHaskellDepends = [
          base bytestring cereal data-binary-ieee754 deepseq mtl text
          unordered-containers
@@ -107623,7 +107957,7 @@ self: {
      mkDerivation {
        pname = "protobuf-native";
        version = "1.0.0.1";
-       sha256 = "0k3cljm4r3jxlklkmfhv0362hg8095f1cq73mgdqkbqa5gwrk86r";
+       sha256 = "d9a099f92b0aaf89dbabe360165c49003d28cc001bba3ae9a45d8e4caaa46c4c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107649,7 +107983,7 @@ self: {
      mkDerivation {
        pname = "protocol-buffers";
        version = "2.1.4";
-       sha256 = "0sn92mf0dl7w6cg25rhm492sl58pssshjyipadis4w4ww0kyp4md";
+       sha256 = "ad92eb27e09c70a26353377a09b5d61715aa452215e6221e33fcd0065c15c96a";
        libraryHaskellDepends = [
          array base binary bytestring containers directory filepath mtl
          parsec syb utf8-string
@@ -107664,7 +107998,7 @@ self: {
      mkDerivation {
        pname = "protocol-buffers-descriptor";
        version = "2.1.4";
-       sha256 = "1m07l890465ks53acmk9g3fzbm2h5l2pdfhp16hcmvvzxlaz2zvy";
+       sha256 = "7e7ff115ed7fefcaa00917ba76052d50d4f5dd786956a646d1b3180212a207d4";
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers
        ];
@@ -107680,7 +108014,7 @@ self: {
      mkDerivation {
        pname = "protocol-buffers-descriptor-fork";
        version = "2.0.16";
-       sha256 = "1wn6yqs70n26j6z44yfmz4j4rwj2h1zfpysn56wzaq7bwsdb0bqb";
+       sha256 = "0b2fb09ae6eb60f5b92956fbeb7e8042f24c24f9d57942be9146587034f6c6f2";
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers-fork
        ];
@@ -107697,7 +108031,7 @@ self: {
      mkDerivation {
        pname = "protocol-buffers-fork";
        version = "2.0.16";
-       sha256 = "061kc43dg3xdv81wmj4yjm1s6amrd8ql59nj7vff4vdb87v9nriz";
+       sha256 = "3f669bf641ab6de2dc3ed2a642316ab92aa343959ec8ca03daad8fd706613318";
        libraryHaskellDepends = [
          array base binary bytestring containers directory filepath mtl syb
          utf8-string
@@ -107715,7 +108049,7 @@ self: {
      mkDerivation {
        pname = "proton-haskell";
        version = "0.7";
-       sha256 = "1gn4h8xprq8gkngccyqbbqn8nidwlczlwckxzjgnb190yy3kd7hi";
+       sha256 = "119e3687f72085659ffc7d324e3fa3bc458b2c5e0b7bc69e9d0fe17c3b82c4be";
        libraryHaskellDepends = [ base containers directory filepath ];
        testHaskellDepends = [
          base containers directory filepath HUnit test-framework
@@ -107731,7 +108065,7 @@ self: {
      mkDerivation {
        pname = "prototype";
        version = "0.5.3";
-       sha256 = "1kzinhdy622gzg3mzfln15vgi890i2l3lkrgrw0n0yb08r2n53i7";
+       sha256 = "278e62454660796001cf2f4f3aa88820a1f8760996ba5fc7fb4f08e31bb4f1cf";
        libraryHaskellDepends = [ base monads-tf ];
        description = "prototype-based programming on Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -107745,7 +108079,7 @@ self: {
      mkDerivation {
        pname = "prove-everywhere-server";
        version = "0.1.1";
-       sha256 = "127ky7rj9d2bqaddcg99azm18m65ksxr26amq0r5prhym8kmc3jx";
+       sha256 = "5d0e5627aa1ee65b32c0551991bb9ec55414ea57293dd69ac24bb424f3f1f388";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107765,7 +108099,7 @@ self: {
      mkDerivation {
        pname = "proxy-kindness";
        version = "0.1";
-       sha256 = "0wpzj6hnlxvgd7lfd2921mrk97aw7ljf77jry3my97zdapkxz8i7";
+       sha256 = "27a2dfe755ed9fe4ebf0599ee3243d5c9d34730d2289e6e8696f776aa191ff72";
        libraryHaskellDepends = [ base tagged ];
        jailbreak = true;
        homepage = "https://github.com/jberryman/proxy-kindness";
@@ -107782,7 +108116,7 @@ self: {
      mkDerivation {
        pname = "pseudo-boolean";
        version = "0.1.2.0";
-       sha256 = "13bgv7kkglajrvng7vcy7qv9x8xlm0nrv8in8zh5w5m6xl7i5wkz";
+       sha256 = "7ff2120feda6165ee04736a29d2da8b4a39e363e9eedf3ecce52d137e7d96f8d";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder containers deepseq
          dlist hashable parsec
@@ -107801,7 +108135,7 @@ self: {
      mkDerivation {
        pname = "pseudo-trie";
        version = "0.0.4.3";
-       sha256 = "020jkgr6h1f4z14xbrl6zsqjqflkps03lh5102742bfsd58d9hvb";
+       sha256 = "6bc3d45069da2d418e00a1403a80be933a2cb1fe86e6d549f8c40568f29b1208";
        libraryHaskellDepends = [ base semigroups ];
        description = "A tagged rose-tree with short circuited unique leaves";
        license = stdenv.lib.licenses.bsd3;
@@ -107812,7 +108146,7 @@ self: {
      mkDerivation {
        pname = "pseudomacros";
        version = "0.0.2";
-       sha256 = "112g7qxn7vl5702gzx2kdg55rvvp9g0gc50dvcwlrgvrsvsdy6c9";
+       sha256 = "8919dff4d679bf4c39db0d14f6c04b77ef5cca6b53f4ff043885ee633b3e4f84";
        libraryHaskellDepends = [ base template-haskell time ];
        description = "cpp-style built-in macros using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -107826,7 +108160,7 @@ self: {
      mkDerivation {
        pname = "psqueues";
        version = "0.2.0.2";
-       sha256 = "1mv86li4acx7jchlbh1nfyqyy9wqf7nifzmlph06wd1kvcs0cj73";
+       sha256 = "e3480634db33346e00bcb47e17ed719827efb17736c0452193a73345223568d7";
        libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
        testHaskellDepends = [
          array base deepseq ghc-prim hashable HUnit QuickCheck tagged
@@ -107844,7 +108178,7 @@ self: {
      mkDerivation {
        pname = "pub";
        version = "2.0.2";
-       sha256 = "0ps4i5q4kzkla6gzr8amf2bql2y5g0gb4dbjf9w0q58yzzvpp2c8";
+       sha256 = "88897bf7ff1e150c78727235b21e78c50b8a977055a1fc9f5174fe497089445f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107863,7 +108197,7 @@ self: {
      mkDerivation {
        pname = "publicsuffix";
        version = "0.20150808";
-       sha256 = "1dcmi45vz9m4asf7i8bw6qigdcd2f7f48dmm2bq4w4dsjrp247dk";
+       sha256 = "b31d226e96ba114ef012b53644dc71a2b1f622367ca1789c56a4a6bf0b8995b5";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -107878,7 +108212,7 @@ self: {
      mkDerivation {
        pname = "publicsuffixlist";
        version = "0.1";
-       sha256 = "0mbrmhgyjp8jms3fd3nq4knc4j97sw8ijrmnlfjs7qj8jw4vwzxk";
+       sha256 = "b37fbe099748e2a3a5a3b6661911d72749c2ec24d88ee686ae125de91fac7955";
        libraryHaskellDepends = [
          base bytestring cereal containers data-default text utf8-string
        ];
@@ -107898,7 +108232,7 @@ self: {
      mkDerivation {
        pname = "publicsuffixlistcreate";
        version = "0.0.2";
-       sha256 = "0v4arfixnfzpsi3hvik2s2lqqp61324bd98wc8ympqxlmldpbri3";
+       sha256 = "23e6751badb4e35b3d621ca5b68818c15c8ca9d062c60d47d4f73bdba3cb8a6c";
        libraryHaskellDepends = [
          base bytestring conduit containers data-default idna
          publicsuffixlist text
@@ -107922,7 +108256,7 @@ self: {
      mkDerivation {
        pname = "pubnub";
        version = "1.1.1";
-       sha256 = "0clcf5gsw34gpqycw652wq8ndmlzz48mf2gla0g7j815j21hrhv8";
+       sha256 = "68c30c83902520791e50f4095711f99fd66611e6a218ce3cbe8f0cae5f718c32";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107953,7 +108287,7 @@ self: {
      mkDerivation {
        pname = "pubsub";
        version = "0.11";
-       sha256 = "09xaycbzq50q1299r4s84nb8wjhqalimvipv8z135fifvgdsjpm8";
+       sha256 = "a85ea9dbdb2eba32c247fbc65d2355184a8e962548939c92081814fc17f3aa27";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107976,7 +108310,7 @@ self: {
      mkDerivation {
        pname = "puffytools";
        version = "0.0.0.1";
-       sha256 = "0pqqcs3plrhq6474j29lnwvc6fhr1wskb0ph8x64gzv9ly52dc9i";
+       sha256 = "31b1268aa769ff474c47f08235350f193ac336b73409490e3118667a8766185f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108005,7 +108339,7 @@ self: {
      mkDerivation {
        pname = "pugixml";
        version = "0.3.2";
-       sha256 = "0pvvx7cd16a7cjp991l487p0vgpkdyv7ic64brz92bkjxgrpw94i";
+       sha256 = "91247ef3eb722e917e5ec4b078b66ff3be0dee41848694ae644799d0d8e97b5f";
        libraryHaskellDepends = [
          base bytestring data-default-class template-haskell
        ];
@@ -108022,7 +108356,7 @@ self: {
      mkDerivation {
        pname = "pugs-DrIFT";
        version = "2.2.3.20130611";
-       sha256 = "0c5h829zh8clggf53byng4gh5g0zxk3763w1nk0ihf2laak238c6";
+       sha256 = "86a121a652543818c1b4810f73c6ec1fbc021f79d6af51dc7b9421f89340b030";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108044,7 +108378,7 @@ self: {
      mkDerivation {
        pname = "pugs-HsSyck";
        version = "0.41";
-       sha256 = "108dfhd83yzmlhbgff6j0a40r6vx9aq9dcdd8swk4yib9gbvsrp1";
+       sha256 = "e166bdd74b2b7a32b946adb196b04a7d9b0c8802d238f716a4f5fb811a740d81";
        libraryHaskellDepends = [ base bytestring ];
        description = "Fast, lightweight YAML loader and dumper";
        license = "unknown";
@@ -108059,7 +108393,7 @@ self: {
      mkDerivation {
        pname = "pugs-compat";
        version = "0.0.6.20130611.0";
-       sha256 = "15pgg4z6clqgazi70jac280ib0d4rhz1hdqbg5i4kffziv2q6jsm";
+       sha256 = "554b83c58edfb94962790b37183ecca4811501124c4970e2570f53663e79ef96";
        libraryHaskellDepends = [
          array base bytestring containers directory mtl network process
          random regex-base regex-pcre-builtin stm stringtable-atom syb time
@@ -108075,7 +108409,7 @@ self: {
      mkDerivation {
        pname = "pugs-hsregex";
        version = "1.0";
-       sha256 = "1px8qvz7afws2w8scplxs4zm628anvh5ssbf0ba9hajh686h133i";
+       sha256 = "718c000d32502a98d4026e695de0b60a09533fd19d5ea611179a3b75fec6a8df";
        libraryHaskellDepends = [ array base haskell98 ];
        homepage = "http://repetae.net/john/computer/haskell/hsregex/";
        description = "Haskell PCRE binding";
@@ -108088,7 +108422,7 @@ self: {
      mkDerivation {
        pname = "pulse-simple";
        version = "0.1.14";
-       sha256 = "1as1cnx50mqmib5llzy2w218rg7dxmhz6nfa9kryfjzk0n5rshl4";
+       sha256 = "84429d8b05f34be7f34cca59f361ededbc8c82e0c27f4acb8a155750ba6541ab";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ libpulseaudio ];
        description = "binding to Simple API of pulseaudio";
@@ -108102,7 +108436,7 @@ self: {
      mkDerivation {
        pname = "punkt";
        version = "0.1.1";
-       sha256 = "0hhrpkbgm56zs1ynd0ba37fv1vg2bxr79kfb2myjfxsnc6gr4h9b";
+       sha256 = "2b41929f615677277d15cbcd74725fe2edb0dd196a81667dd0df94fad6bc1942";
        libraryHaskellDepends = [
          array base mtl regex-tdfa regex-tdfa-text text unordered-containers
        ];
@@ -108122,7 +108456,7 @@ self: {
      mkDerivation {
        pname = "punycode";
        version = "2.0";
-       sha256 = "192jgfixnpxdj6jiiz92kx5bi6ij3c389b76q9f4vyfmvcajj1sr";
+       sha256 = "59072915dbd5f94d5cc2e6ac84061b329ab84a9f22fd18a591ad5fdba37b52a4";
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
        testHaskellDepends = [
          base bytestring cereal encoding HUnit mtl QuickCheck text
@@ -108139,7 +108473,7 @@ self: {
      mkDerivation {
        pname = "puppetresources";
        version = "0.4.2";
-       sha256 = "064swfpxk7jhb81bi0v9l0r1hn0z2cafnzx7ijdr33xhikyc92rb";
+       sha256 = "2b8bc4fc8cb08f919b8ca77feb14131f581832a06983b8025a509ed9afe39a18";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108159,7 +108493,7 @@ self: {
      mkDerivation {
        pname = "pure-cdb";
        version = "0.1.1";
-       sha256 = "1yjh7h02hkhx2vgvn7qfmfd3bp12ibpkf4znybsd2bfh0i1pzn0n";
+       sha256 = "16d87f4304d02dd1f4f2f61337ef8a22dc359aab0e1fbbdf161d4e28003c50fa";
        libraryHaskellDepends = [
          base binary bytestring containers directory mtl vector
        ];
@@ -108176,7 +108510,7 @@ self: {
      mkDerivation {
        pname = "pure-fft";
        version = "0.2.0";
-       sha256 = "1zzravfgxbx07c38pf0p73a9nzjk2pbq3hzfw8v9zkqj95b3l94i";
+       sha256 = "91243a564912cf9f36e2eec381d715537e9bd43817b88b063ba0affedc56f9ff";
        libraryHaskellDepends = [ base ];
        description = "Fast Fourier Transform";
        license = stdenv.lib.licenses.bsd3;
@@ -108187,7 +108521,7 @@ self: {
      mkDerivation {
        pname = "pure-io";
        version = "0.2.1";
-       sha256 = "0pzvkd8jxw859s187n972yaq5wmwi00cxwhivgffr7z29hr0zvx9";
+       sha256 = "a9ef0f324ce29fecdcdb11f2ce0088bcf282951727d983824e05f12e519bfb5f";
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Pure IO monad";
        license = stdenv.lib.licenses.bsd3;
@@ -108198,7 +108532,7 @@ self: {
      mkDerivation {
        pname = "pure-priority-queue";
        version = "0.14";
-       sha256 = "125vnkjx6n7pgflk9iqg7b6daw55a1rdfi9pfgp39ikfcx9vhb3p";
+       sha256 = "772cb853676ec634ee733745d77250a570d5cc3a0fc734a97bf758d3e5b4bb88";
        libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "A pure priority queue";
@@ -108212,7 +108546,7 @@ self: {
      mkDerivation {
        pname = "pure-priority-queue-tests";
        version = "0.12";
-       sha256 = "17x2drpmdppzxp3nnxq0vajxrzdnhpapk9rz9qcqaxbg934c7h3d";
+       sha256 = "6dc0c3c8486f7585194e3fa779d585b6fddca5da00776bc7edffde566f6ea29f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108232,7 +108566,7 @@ self: {
      mkDerivation {
        pname = "pure-zlib";
        version = "0.3";
-       sha256 = "1in93rx2y3zaahzpblwybskjrbwc0zrzh792ibi64jxvkrxjkyxn";
+       sha256 = "b6fb297b9ebb4b62e28a221df8f3078caf2ca75e9ed3753f54ea0f2f7a1ec9c6";
        libraryHaskellDepends = [
          base bytestring containers fingertree monadLib
        ];
@@ -108252,7 +108586,7 @@ self: {
      mkDerivation {
        pname = "pureMD5";
        version = "2.1.2.1";
-       sha256 = "1zsn949qk95bwx1fbyv84q0lhb4k18bgixl7nivfzsnmhr31fs37";
+       sha256 = "6768174686d5eaef76b487f6f8160a932c48012668fbe542e7aba489134956ff";
        libraryHaskellDepends = [
          base binary bytestring cereal crypto-api tagged
        ];
@@ -108271,7 +108605,7 @@ self: {
      mkDerivation {
        pname = "purescript";
        version = "0.7.2.0";
-       sha256 = "0drx0n1ac0sjnma7c15hsld1n6rwwl7r8fzcdibk73k5pfyz9a6k";
+       sha256 = "d3a8f4bdbb658e33576cec3b940fe53c1b1b1ad5b0047654b55203a682053d37";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108305,7 +108639,7 @@ self: {
      mkDerivation {
        pname = "purescript-bundle-fast";
        version = "0.1.0.1";
-       sha256 = "0s9db4nb5ppr3yznay7jlgydq68hcdn525cwnxkj41h8fv9sflfw";
+       sha256 = "dc51a7d37608062267b79c15516c631019dcfca3f27865bf1ff9deb22c592d69";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108327,7 +108661,7 @@ self: {
      mkDerivation {
        pname = "push-notify";
        version = "0.1.0.1";
-       sha256 = "1ca9cs55yj1960cx7vha2w33nvqj89rhkdji555aaac3z302jgjs";
+       sha256 = "5a3e29c0f88329a54a2951b6097342126f3b06170aeed3193029485f8a6649b1";
        libraryHaskellDepends = [
          aeson async attoparsec-conduit base base16-bytestring bytestring
          cereal certificate conduit connection containers convertible
@@ -108350,7 +108684,7 @@ self: {
      mkDerivation {
        pname = "push-notify-ccs";
        version = "0.1.0.1";
-       sha256 = "1fgpzcbkcsb03lysml28a8w3c9l3nx4mirrn287g7y1kb4kx3bw0";
+       sha256 = "80afd1275933f8f30e1236e75849b7832636385248d0aa3d1d60693617fbf7b9";
        libraryHaskellDepends = [
          aeson async attoparsec base bytestring cprng-aes crypto-random
          data-default hslogger mtl network pontarius-xmpp push-notify retry
@@ -108370,7 +108704,7 @@ self: {
      mkDerivation {
        pname = "push-notify-general";
        version = "0.1.0.1";
-       sha256 = "0vyw3733xm2s3nxybav8an68mlagk8v3bb43qlz71hkjgjddvpdh";
+       sha256 = "b0dddd9a7c72c2703ec583ac35369a4fd18a8c5568abe5bb1d5ad43ec619dc6f";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default hashable http-client
          http-conduit http-types push-notify push-notify-ccs text
@@ -108389,7 +108723,7 @@ self: {
      mkDerivation {
        pname = "pusher-haskell";
        version = "0.1.0.0";
-       sha256 = "0ymj27a3kmaddydd5zshj108fmzhlxasn9i4igzjaj308f1ygki6";
+       sha256 = "26cee78343604825ff8b2426ab55a7f05787409050ffd29a6f4dd539d411b27a";
        libraryHaskellDepends = [
          aeson base bytestring HTTP MissingH mtl SHA time
        ];
@@ -108410,7 +108744,7 @@ self: {
      mkDerivation {
        pname = "pushme";
        version = "1.5.0";
-       sha256 = "0cn350p0v6wb6c1n589c2l460c8pac41c645fja5xqxyyiiyni4d";
+       sha256 = "8d44eb63f4bee35e9474851816085317316008152ca16203338b9b0d2e28c332";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108432,7 +108766,7 @@ self: {
      mkDerivation {
        pname = "putlenses";
        version = "0.1.3";
-       sha256 = "153hxffd1rg3m73kss0j3s7102lj6p84c95gvzyl0gmjpljfxffp";
+       sha256 = "d7b9ee24bdb23e40fddfaf2446d035920a108e1e12683dc7a9e3e5d09ceb7094";
        libraryHaskellDepends = [
          base containers ghc-prim lens mtl QuickCheck random safe split
          template-haskell transformers
@@ -108452,7 +108786,7 @@ self: {
      mkDerivation {
        pname = "puzzle-draw";
        version = "0.1.0.4";
-       sha256 = "0jbc24a959klaf3niri5ilq0jdqpxdg4fg79bjfdpg51na4xr3hi";
+       sha256 = "118edc89b2a1bcdb9c5ce93c475eeb173709308d25e668875374a69214116c49";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108480,7 +108814,7 @@ self: {
      mkDerivation {
        pname = "puzzle-draw-cmdline";
        version = "0.1.0.4";
-       sha256 = "0jv0gai689ba5f4c6kdfdlfx5dz000zzk0gdwlz5d9n9pxxfgzxf";
+       sha256 = "aeffe77abfc9a6563ee5ed81f93f00e0b7d21d6dae4dc3882b6a2564a27a604b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108500,7 +108834,7 @@ self: {
      mkDerivation {
        pname = "pvd";
        version = "1.1.1";
-       sha256 = "18hlsh3ndlybkiblcfqzjm1pa4myc01yzr9hx7p48yp86q519hvr";
+       sha256 = "79c3140a36e87a44eee930e5ef0360be127543951f3b46579ccbd36607d414a2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108521,7 +108855,7 @@ self: {
      mkDerivation {
        pname = "pwstore-cli";
        version = "0.4";
-       sha256 = "1cwb214bifiql2d4jacjl93swhy8yigzj72wbhv213c593bxg8jr";
+       sha256 = "59a2d7d748858d20365c5c1cf95ff4c843ae47a29229499aa038bab848108bb3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108543,7 +108877,7 @@ self: {
      mkDerivation {
        pname = "pwstore-fast";
        version = "2.4.4";
-       sha256 = "1cpvlwzg3qznhygrr78f75p65mnljd9v5cvnagfxjqppnrkay6bj";
+       sha256 = "7219af66b6f762d9dd5376b3b25393d4d6626e390e9d9c9f87f6e3f13ea7fbb2";
        libraryHaskellDepends = [
          base base64-bytestring binary byteable bytestring cryptohash random
        ];
@@ -108559,7 +108893,7 @@ self: {
      mkDerivation {
        pname = "pwstore-purehaskell";
        version = "2.1.4";
-       sha256 = "1g7lmlgw8iscbbs96r3a534cf46fyks49b1f9y7hv25ny4wp1p9c";
+       sha256 = "2cdd7039f1b6880d8f4f2eac44f4f4ce10c7c8286a6493f45a4c47c41fadf4bc";
        libraryHaskellDepends = [
          base base64-bytestring byteable bytestring random SHA
        ];
@@ -108573,7 +108907,7 @@ self: {
      mkDerivation {
        pname = "pxsl-tools";
        version = "1.0.1";
-       sha256 = "1q45l1grcja0mf1g90yxsdlr49gqrx27ycr6vln4hsqb5c0iqcfw";
+       sha256 = "dc311c012b0b6b482cdd26337f44cff8259269d3dd83f482ab4049965fa085e0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl parsec ];
@@ -108589,7 +108923,7 @@ self: {
      mkDerivation {
        pname = "pyffi";
        version = "0.4.0.2";
-       sha256 = "0cpzl0d0hsdlm1786s75xsq3c93mm1sp7alr6xhihmnrsj71d58h";
+       sha256 = "1095168ed4d95618613799aa7375a8752436b0eee568834ea8b469081aa0ff32";
        libraryHaskellDepends = [
          aeson base bytestring containers pureMD5 template-haskell
        ];
@@ -108607,7 +108941,7 @@ self: {
      mkDerivation {
        pname = "pyfi";
        version = "0.4.0.4";
-       sha256 = "0xq5nhc11dkf2yvzcd129n0r7vpias091lzkll4f4cjsmljbxigw";
+       sha256 = "fcc5be24ad5a32e208a5f3d3908056f1ee93814d2234f6b7176eb61018b40577";
        libraryHaskellDepends = [
          aeson base bytestring containers pureMD5 template-haskell
        ];
@@ -108625,7 +108959,7 @@ self: {
      mkDerivation {
        pname = "python-pickle";
        version = "0.2.0";
-       sha256 = "0p7pmwqs9jfv6464106j0k22x6lij5rc5v74aqbfclx7iwp6lh75";
+       sha256 = "e5406a2e8fa753e61656e4ecc27291919a2ec404d280400c31dbc9a431aff75c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108643,7 +108977,7 @@ self: {
      mkDerivation {
        pname = "qc-oi-testgenerator";
        version = "1.2.0.3";
-       sha256 = "13rga5haz26qvx3hznbl6ik55s8g7qi3nj7a6vhyx46vjhzwnsvg";
+       sha256 = "6f6bcb3f94db90eee136ea483b223e0fe952663474d90f47dfd888af60512f8f";
        libraryHaskellDepends = [
          base fclabels QuickCheck template-haskell
        ];
@@ -108658,7 +108992,7 @@ self: {
      mkDerivation {
        pname = "qd";
        version = "1.0.2.1";
-       sha256 = "0dhvdrpcbc6qiqna2kiaa0zbz7cgq7ziy2my6k85cbgv6k77p918";
+       sha256 = "28a47bce34fb2d56d034be0a1fffc18f9dbf3e502a4ea12c8ed8b0c56e6e1b36";
        libraryHaskellDepends = [ base floatshow ];
        librarySystemDepends = [ qd ];
        description = "double-double and quad-double number type via libqd";
@@ -108671,7 +109005,7 @@ self: {
      mkDerivation {
        pname = "qd-vec";
        version = "1.1";
-       sha256 = "0lj5kg0sjkck89phvi239xb2k7hxmxg9dh7yg2df2iaj4c2m2ync";
+       sha256 = "cc7a5105235245e19a78fec0965eaf1d9e29564f43c40d6f42934da9c19b4552";
        libraryHaskellDepends = [ base qd Vec ];
        description = "'Vec' instances for 'qd' types";
        license = stdenv.lib.licenses.bsd3;
@@ -108683,7 +109017,7 @@ self: {
      mkDerivation {
        pname = "qhull-simple";
        version = "0.1";
-       sha256 = "0g0abqc5z9nysm21c77kylkka1bvyn16ycinws1lcrjy53cb82sw";
+       sha256 = "5c0bb4d8285e664683e636326f82f57b053527f5f31c1644d5dea65f185e0a3c";
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ qhull ];
        homepage = "http://nonempty.org/software/haskell-qhull-simple";
@@ -108697,7 +109031,7 @@ self: {
      mkDerivation {
        pname = "qrcode";
        version = "0.1.2";
-       sha256 = "1wfnxlz6rqjcgnkaqq0wdn75jsh3b9hagb84c1ljnwqaw98n3a9d";
+       sha256 = "2da96151e20a732b696004ada7605a036a598e6d1c60aca67d4ce26c3eedd6f1";
        libraryHaskellDepends = [ array base containers mtl vector ];
        description = "QR Code library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -108711,7 +109045,7 @@ self: {
      mkDerivation {
        pname = "quadratic-irrational";
        version = "0.0.5";
-       sha256 = "1z9a1q8px4sx7fq9i1lwfx98kz0nv8zhkz5vsfn31krvd4xvkndz";
+       sha256 = "bfd9b93b693bcf30acd3bbfc093fda16fc8952779c8698b03b5d937e110e2afd";
        libraryHaskellDepends = [
          arithmoi base containers mtl transformers
        ];
@@ -108733,7 +109067,7 @@ self: {
      mkDerivation {
        pname = "quandl-api";
        version = "0.2.1.0";
-       sha256 = "01mjwg7myal3hc98s7v582ycabv7qx2j6lcsyvhxbmhzs1wl8sqf";
+       sha256 = "0e6b4479d01fd6d5e1f69a512345c7672fc5bc40651f8d1283832a5fcfe3b206";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring http-conduit http-types syb
          text time time-locale-compat unordered-containers
@@ -108750,7 +109084,7 @@ self: {
      mkDerivation {
        pname = "quantfin";
        version = "0.2.0.0";
-       sha256 = "0s9wmkngz31wrllffk3i8y66f60liajwhapih7mnriyfvqqsb6ra";
+       sha256 = "2a9ba531decec76ceb81f12ac8a58a1418678c47714ce728cd3c8cffecac3c69";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108771,7 +109105,7 @@ self: {
      mkDerivation {
        pname = "quantities";
        version = "0.3.0";
-       sha256 = "1c9ll27qwmzz8rfy7jlknzg56r0z2hij9aha3vwylv6iaynl4fr9";
+       sha256 = "293b42ad57d16ceaf91e0aaa2423141f6453deb793cae35d46ff578e8fa034b1";
        libraryHaskellDepends = [ base containers mtl parsec ];
        testHaskellDepends = [
          base containers doctest Glob hlint hspec mtl parsec process
@@ -108788,7 +109122,7 @@ self: {
      mkDerivation {
        pname = "quantum-arrow";
        version = "0.0.5";
-       sha256 = "19z5b0jwnz20g0203xd78cv8rgm92diyxard4mbj6dyrj2kkfgww";
+       sha256 = "9c3f37a790d9372357252dabee6313a9be8c3643a7f5010478407ccb2558e5a7";
        libraryHaskellDepends = [ base MonadRandom mtl QuickCheck random ];
        jailbreak = true;
        homepage = "http://github.com/luqui/quantum-arrow";
@@ -108804,7 +109138,7 @@ self: {
      mkDerivation {
        pname = "qudb";
        version = "0.0.1";
-       sha256 = "0cpvik35qv587k2qsd2rh7awlwll1gciv0nr7wjr79bn0q9df0cq";
+       sha256 = "9801d7120676a593253fd9821dd90b9472cad58159348dc53ca86c5cc68cfb32";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108825,7 +109159,7 @@ self: {
      mkDerivation {
        pname = "quenya-verb";
        version = "0.0.1";
-       sha256 = "0zw15qym8r00m7kir9h9cys1rmszdqihfcvy6dw52f1pb6cp5vsx";
+       sha256 = "5def72995937385178337e3307236e5fd71cb46709a61ce7a90064543d2e817f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108847,7 +109181,7 @@ self: {
      mkDerivation {
        pname = "querystring-pickle";
        version = "0.2.0";
-       sha256 = "18by7671q3sp38cii7j8b0jvdbbix4wyaa3wan77s0mfkdxzicrf";
+       sha256 = "2eb3f87b9bae027d8e557c28e539e971adb62558489e18191a570f1c8e397ea1";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [
          base bytestring QuickCheck test-framework
@@ -108863,7 +109197,7 @@ self: {
      mkDerivation {
        pname = "questioner";
        version = "0.1.1.0";
-       sha256 = "05q64mslkbg017fpjx7ma2al6iz5zjrkyzipm8p86n8zcx3l1aw3";
+       sha256 = "83ab4047671f59832eaa377e3fb3fce547439550f57479dd09e0ad4975250617";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108880,7 +109214,7 @@ self: {
      mkDerivation {
        pname = "queue";
        version = "0.1.2";
-       sha256 = "0fx2svkj2sy2wd056lha9h20hy2z6gjspzl11jmv7i3rdwwfr6f7";
+       sha256 = "c799ec386f79c4b3ab0c81feabe5335f7808044c0a525340e3c26b21e7d6a23b";
        libraryHaskellDepends = [ base stm ];
        homepage = "http://code.haskell.org/~mokus/queue";
        description = "Abstraction typeclasses for queue-like things";
@@ -108892,7 +109226,7 @@ self: {
      mkDerivation {
        pname = "queuelike";
        version = "1.0.9";
-       sha256 = "0nvs9ln55wrczpn948i4z110rbfp0rv2wv8iz94lbyxhilhyjf1z";
+       sha256 = "3f38e9218db0fb4549fa116d2e7606d7ad0c42f8242292ecfd2cf3522c4d7a5b";
        libraryHaskellDepends = [ array base containers mtl stateful-mtl ];
        description = "A library of queuelike data structures, both functional and stateful";
        license = stdenv.lib.licenses.bsd3;
@@ -108904,7 +109238,7 @@ self: {
      mkDerivation {
        pname = "quick-generator";
        version = "0.3";
-       sha256 = "1bccyvm300bkm3n98ayjc3syfcakjnf26bs2mdqdjimdfw2f0g6n";
+       sha256 = "d63ce00477ad46d970ab422f239c955331e7f560d22b94eca8730130eaf68cad";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Generator random test data for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -108915,7 +109249,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-assertions";
        version = "0.2.0";
-       sha256 = "0h7pa84hzy3bhv1acf1rvvw3lza0m8shd8a0vykzpx8lnkxbl3v0";
+       sha256 = "600fbafab414f5fba7df40a10635aa407d3af8de3938a6c2866bf80f0952f740";
        libraryHaskellDepends = [ base ieee754 QuickCheck ];
        testHaskellDepends = [ base hspec ieee754 QuickCheck ];
        homepage = "https://github.com/s9gf4ult/quickcheck-assertions";
@@ -108930,7 +109264,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-instances";
        version = "0.3.11";
-       sha256 = "041s6963czs1pz0fc9cx17lgd6p83czqy2nxji7bhxqxwl2j15h2";
+       sha256 = "02962005e51d77b84e94dd0a8f3f1be89af6e8099d25e6c0bf417f364c323a10";
        libraryHaskellDepends = [
          array base bytestring containers hashable old-time QuickCheck text
          time unordered-containers
@@ -108945,7 +109279,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-io";
        version = "0.1.1";
-       sha256 = "16q3sqvxnaqmbb1zbda8f61mdlmmzxhrznqxab113lmg380nwfm2";
+       sha256 = "a23a6e011aafd211c2521ddb9f61ffb5d256837148b5f5c35a152bdb37d6039b";
        libraryHaskellDepends = [ base HUnit QuickCheck ];
        description = "Use HUnit assertions as QuickCheck properties";
        license = stdenv.lib.licenses.mit;
@@ -108958,7 +109292,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-poly";
        version = "0.2.0.1";
-       sha256 = "0imigjsb6jy1k9xipi5b4b300cpv2l7hhd2iiqpn80dp10v7y5na";
+       sha256 = "ca167f3608b701642f8e5134080f15fb3200c622abc41b7b9ac14bb3b47cb146";
        libraryHaskellDepends = [
          base haskell98 hint MonadCatchIO-mtl QuickCheck regex-compat
          regex-tdfa
@@ -108973,7 +109307,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-properties";
        version = "0.1";
-       sha256 = "0hr61w1wpah1p4h87iz17aby53ysa8waqsl0als8b69in0zyv29w";
+       sha256 = "3c89ed3fb03199853455806aac3852da8fe2973ae1c78320b901aacb030f2643";
        libraryHaskellDepends = [ base ];
        description = "QuickCheck properties for standard type classes";
        license = stdenv.lib.licenses.bsd3;
@@ -108984,7 +109318,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-property-comb";
        version = "0.1.0.2";
-       sha256 = "0wqz2amhwf1djbwwdin142mzp94mxbzb12khznijissjdz38knp5";
+       sha256 = "e5da89c66f52eb28a3fd708ab0feea95a4fbab20c1c6c6f9922d380eab121f73";
        libraryHaskellDepends = [ base mtl QuickCheck ];
        jailbreak = true;
        homepage = "http://www.github.com/jfeltz/quickcheck-property-comb";
@@ -108999,7 +109333,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-property-monad";
        version = "0.2.3";
-       sha256 = "12vg14xwhhsqwygrs5lylsg514am5sslqc15nbl8mwzzxix1w8xb";
+       sha256 = "ab231e7aecfff38ae8b225304cb52e5591509ea69e169d9fe75843c83b096f8b";
        libraryHaskellDepends = [ base either QuickCheck transformers ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck
@@ -109017,7 +109351,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-regex";
        version = "0.0.3";
-       sha256 = "00h08l3qabj140zzcpj87hy9zb6cw1xj5w6xv6sq2m8yc3pdwi8n";
+       sha256 = "1645deee601e5581b5d9ddf0227be0ccac9f3c3c485ef63f20412e8507450002";
        libraryHaskellDepends = [
          base containers QuickCheck regex-genex regex-tdfa
        ];
@@ -109034,7 +109368,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-relaxng";
        version = "0.0.2";
-       sha256 = "1wrndgvza9610ai02gkwab30hp8ngdknw8n2lx0mg6qajsiiy949";
+       sha256 = "89241fa3960a9b5741a7c2226e677b165d08c6527c3e01a202c124f5f76b36f3";
        libraryHaskellDepends = [
          base hxt hxt-relaxng QuickCheck quickcheck-regex
        ];
@@ -109049,7 +109383,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-rematch";
        version = "0.1.0.0";
-       sha256 = "0pmw9441l36sprw9ngq6gn2yi4v427zd5n22s9zicfyiwi4qf5ba";
+       sha256 = "6a158749e4d13b167fd242d8d2fe116493e8857d063f9b78beda0c1a0849bc5e";
        libraryHaskellDepends = [ base QuickCheck rematch ];
        testHaskellDepends = [ base hspec HUnit QuickCheck rematch ];
        jailbreak = true;
@@ -109064,7 +109398,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-script";
        version = "0.1.1.1";
-       sha256 = "157v4qcyk5c6hnmhmy5rsrfsj46m343nn2bvrqyb6r92wh70is5g";
+       sha256 = "afe8080ee42265b33cce7b096b0719d510a95dd6b9f80aab858695e91926fb94";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory process QuickCheck ];
@@ -109078,7 +109412,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-simple";
        version = "0.1.0.0";
-       sha256 = "0vnxyb3qz8i1rpmkga6151cld1jr3kiyv3xrhg814mhf1fmhb8xl";
+       sha256 = "b4a305ab0b0e5612d083b98fede31c5986465928c1a837ebcd21a28fc7f2dd6e";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Test properties and default-mains for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -109089,7 +109423,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-unicode";
        version = "1.0.0.1";
-       sha256 = "1a8nl6x7l9b22yx61wm0bh2n1xzb1hd5i5zgg1w4fpaivjnrrhi4";
+       sha256 = "24c29caddc515d477878ef97581a0cebf760055ca0f260ba1762257abaa116a9";
        libraryHaskellDepends = [ base QuickCheck ];
        homepage = "https://github.com/bos/quickcheck-unicode";
        description = "Generator and shrink functions for testing Unicode-related software";
@@ -109101,7 +109435,7 @@ self: {
      mkDerivation {
        pname = "quickcheck-webdriver";
        version = "0.1.0.7";
-       sha256 = "12jkj8jy4f0mix658pd8jfgwx268fs3bbqz90mac1vvag4c72i0h";
+       sha256 = "10447118796aefc05405e9e3b58676c888ce9f93a85d544c8f1538e22592538a";
        libraryHaskellDepends = [ base QuickCheck transformers webdriver ];
        jailbreak = true;
        description = "Utilities for using WebDriver with QuickCheck";
@@ -109115,7 +109449,7 @@ self: {
      mkDerivation {
        pname = "quicklz";
        version = "1.5.0.11";
-       sha256 = "17v9bfdp4ib9258r7001naqwss7l6v83by40va3gm3l418vj62qd";
+       sha256 = "0d0b23370a848efa86da80f835d036f468cdb1b201809351116945729b5b699f";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring QuickCheck test-framework
@@ -109132,7 +109466,7 @@ self: {
      mkDerivation {
        pname = "quickpull";
        version = "0.4.2.2";
-       sha256 = "0vy5s3qa67kwj68rxqc0zhqizqpvqa1x0bg3dakq5pimrqhmb7d4";
+       sha256 = "a49d5521ce35de82a76ae32dd083c2fbe21f31fc80e19e91917c1ea3f0d0c56f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath QuickCheck ];
@@ -109152,7 +109486,7 @@ self: {
      mkDerivation {
        pname = "quickset";
        version = "0.1.0";
-       sha256 = "0xiw57wi9z567nmp4h0vfcw3sr9dciy29jadn47bvi3q278v7zdy";
+       sha256 = "befdb3d11178c4bd0eb14dc9247c642d653d38731b4072ab3da6fc14f9293c76";
        libraryHaskellDepends = [ base vector vector-algorithms ];
        description = "Very fast and memory-compact query-only set and map structures";
        license = stdenv.lib.licenses.bsd3;
@@ -109166,7 +109500,7 @@ self: {
      mkDerivation {
        pname = "quickspec";
        version = "0.9.6";
-       sha256 = "0prwzxsrvfqryl75rmma229d4y7ra61vc3d72kyqi4l44ga2ay21";
+       sha256 = "417825d423849288fd14a70db68351f978d29210aad65c0ef519bb9d75ff3c5f";
        libraryHaskellDepends = [
          array base containers ghc-prim QuickCheck random spoon transformers
        ];
@@ -109180,7 +109514,7 @@ self: {
      mkDerivation {
        pname = "quicktest";
        version = "0.1.3";
-       sha256 = "0nvh6jd155xrjzkkbsz5q8d08z50881vkdhmprm7fdxax1gvjc95";
+       sha256 = "2531b95fe8aa37776abe15b6b90342a07c041ac2e5eb35e797b997129a34705b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -109197,7 +109531,7 @@ self: {
      mkDerivation {
        pname = "quickwebapp";
        version = "2.1.0.0";
-       sha256 = "0zwqfwwna1d588yk2i20nzryl56k2bh4nyg03ljszyhna16iclij";
+       sha256 = "3252164d5016faaf251de0794be012d314eaf3b74044313d42a505653977987f";
        libraryHaskellDepends = [ base bytestring http-types scotty text ];
        jailbreak = true;
        description = "A quick webapp generator for any file processing tool";
@@ -109209,7 +109543,7 @@ self: {
      mkDerivation {
        pname = "quiver";
        version = "0.0.0.11";
-       sha256 = "1pxnxdm84fqmxvv0l312q8nynpaiyf43jksa2qg1wkl53n0mm2fa";
+       sha256 = "ca895a811d854e1e1e164a4f3988f3515deb2dc2220c0af6ee153b826aebb6df";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/zadarnowski/quiver";
        description = "Quiver finite stream processing library";
@@ -109221,7 +109555,7 @@ self: {
      mkDerivation {
        pname = "quiver-bytestring";
        version = "0.0.0.2";
-       sha256 = "17wjj1fg60g3km9d4kxfz7lk9bf4sfz0brsg8pb0h2xlw0zvm3wl";
+       sha256 = "948fba3fe0b40b08d6454fe705bed3c4ad34e9f9ae4fd2529de301f35c90929f";
        libraryHaskellDepends = [ base bytestring quiver ];
        homepage = "https://github.com/zadarnowski/quiver-bytestring";
        description = "Quiver combinators for bytestring streaming";
@@ -109233,7 +109567,7 @@ self: {
      mkDerivation {
        pname = "quiver-cell";
        version = "0.0.0.2";
-       sha256 = "10p11ljmwp7szw46saxa972xpjiyr5r19kia6ivaq98jqwcvi5af";
+       sha256 = "4e95b819c71225ac76342ace1472c93ecadbc549aa2b6d08fffa5c5e250de182";
        libraryHaskellDepends = [ base data-cell quiver ];
        homepage = "https://github.com/zadarnowski/quiver-cell";
        description = "Quiver combinators for cellular data processing";
@@ -109247,7 +109581,7 @@ self: {
      mkDerivation {
        pname = "quiver-csv";
        version = "0.0.0.3";
-       sha256 = "19wb16lbv0wr7w2qba6g2cdmzdhpyyjx1bjvrnz0cqbb4di9yscj";
+       sha256 = "92699f62236b6106becd5baed0a5f717b65f1b13cfa885053f9983bda8098ba7";
        libraryHaskellDepends = [
          base bytestring data-cell quiver quiver-bytestring
        ];
@@ -109261,7 +109595,7 @@ self: {
      mkDerivation {
        pname = "quiver-enumerator";
        version = "0.0.0.1";
-       sha256 = "0k0822yzlxkb6b46834hm3bad3x1gma1gqcjl9ryxpqsl73nc4mp";
+       sha256 = "b71266c7a11adfee73a292e117547da18fa6d6a8900c64c8326b76fabd10084c";
        libraryHaskellDepends = [ base enumerator quiver ];
        homepage = "https://github.com/zadarnowski/quiver-enumerator";
        description = "Bridge between Quiver and Iteratee paradigms";
@@ -109277,7 +109611,7 @@ self: {
      mkDerivation {
        pname = "quoridor-hs";
        version = "0.1.1.2";
-       sha256 = "1yha2rsphq2ar8c7p15dlg621d4ym46xgv70fga9mlq2r4zwy2lv";
+       sha256 = "9b0acf3fc902d39ad473e0ecd70da99eb420cca3ad847b18ca4a607875160afa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109299,7 +109633,7 @@ self: {
      mkDerivation {
        pname = "rabocsv2qif";
        version = "1.1.5";
-       sha256 = "1vb9r2nmkhybx1ra2jpzfz5i6klgz2jz09zhg5wi95dnml82p33g";
+       sha256 = "6f8c2b10adb695147979f027f0a5f88f4e13cb77ff4aa172e8cbc359adc869ed";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base old-locale split time ];
@@ -109314,7 +109648,7 @@ self: {
      mkDerivation {
        pname = "rad";
        version = "0.1.6.3";
-       sha256 = "19g2lc3vmnapccdxf390cmkfl9bd3agcn01kk8ccd4lmaqn2c12d";
+       sha256 = "4d04262c569592c6189a3300cb9e1a6d25ea6665200dd71b6357d9ba07a3e2a5";
        libraryHaskellDepends = [ array base containers data-reify ];
        jailbreak = true;
        homepage = "http://comonad.com/reader/";
@@ -109330,7 +109664,7 @@ self: {
      mkDerivation {
        pname = "radian";
        version = "0.0.4";
-       sha256 = "1f53h9gcbmfga5khc67z81aysibcj5pqgi3iwa2shy5mfd10a86a";
+       sha256 = "ca20054273b578a885e271c4876f916c45ed5540ff18066751cfd5c55e82a3b8";
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -109346,7 +109680,7 @@ self: {
      mkDerivation {
        pname = "radium";
        version = "0.4.2";
-       sha256 = "1kwbv7qvpjwdcnj6l26dpyw0xl3irhd5igwda4xx509llc8j8n3s";
+       sha256 = "7a582411a33481d23b518dbf581acc71d00eb8bfcd086aa4658dcbbbf1d98bcf";
        libraryHaskellDepends = [ base containers parsec ];
        testHaskellDepends = [
          base Cabal containers hspec parsec QuickCheck
@@ -109364,7 +109698,7 @@ self: {
      mkDerivation {
        pname = "radium-formula-parser";
        version = "0.2";
-       sha256 = "1b2gmc27dj9fanbjh7h0902jjh3jz1ydc6qvp9p3rfskaf6854bf";
+       sha256 = "6e91828c5353bb3c6eba1b1bd67cf87240290548001e2897552ec97604ab4fac";
        libraryHaskellDepends = [ base containers parsec ];
        testHaskellDepends = [
          base Cabal containers hspec parsec QuickCheck
@@ -109381,7 +109715,7 @@ self: {
      mkDerivation {
        pname = "radix";
        version = "1.0.0.0";
-       sha256 = "1hkz0fd1w72g6wnx9dq7z249195kjlhalcd1y8z13gj6yqn1sl9s";
+       sha256 = "3a511d2cf646be113ef2a131aa2095b3a49088f807b7d42d374f1c1e9a037fc2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base filepath ];
@@ -109398,7 +109732,7 @@ self: {
      mkDerivation {
        pname = "rados-haskell";
        version = "3.1.0";
-       sha256 = "0xffgf95dss442sf6adh7yys39i0z64w155akjyzr9dp2jzr6f2k";
+       sha256 = "533893bf14b7a5fcbd9caa94c089f920a6a1bd3fb029e3b42044eb56927bce75";
        libraryHaskellDepends = [
          async base bytestring containers mtl uuid
        ];
@@ -109420,7 +109754,7 @@ self: {
      mkDerivation {
        pname = "rail-compiler-editor";
        version = "0.3.0.0";
-       sha256 = "0jjsa21a7f4hysbk9qvcxyyc2ncrmmjh02n7yyhjnfjgdp4sclwb";
+       sha256 = "8b53a6c96d4f3a2ba1f7c70a0065ad9959c1bcef6ce33497f690b8a382505a4a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109443,7 +109777,7 @@ self: {
      mkDerivation {
        pname = "rainbow";
        version = "0.26.0.6";
-       sha256 = "1v0za967cp1205fkbwglf28yn2pslp7dvyqb3rbym3j7r3pby3zc";
+       sha256 = "ec0fbfeec8478eea571e0bfbddcea5fa0aeb9170f4f1355d01225c764c521fec";
        libraryHaskellDepends = [ base bytestring lens process text ];
        testHaskellDepends = [
          base bytestring lens process QuickCheck text
@@ -109460,7 +109794,7 @@ self: {
      mkDerivation {
        pname = "rainbow-tests";
        version = "0.20.0.4";
-       sha256 = "0cjq2m2zpk4j2f7gw65yqqvyc4kng1rsnq48fs4xcs6bdzw0zhlg";
+       sha256 = "8fc20ff86fcb68d689768860ab73787612e637c6be18fe8e1392ccfb45155832";
        libraryHaskellDepends = [
          barecheck base QuickCheck rainbow terminfo text
        ];
@@ -109478,7 +109812,7 @@ self: {
      mkDerivation {
        pname = "rainbox";
        version = "0.18.0.2";
-       sha256 = "1dczbs4y8yzvp132cfy0fl1jv2zf2nm6d3zn4j4pmy2p8cxs1g4v";
+       sha256 = "9bbca03b4357f87a8924f68f66aa15ee8b2d0375c03b2646b8fb7be4895e9fb5";
        libraryHaskellDepends = [
          base bytestring containers lens rainbow text
        ];
@@ -109496,7 +109830,7 @@ self: {
      mkDerivation {
        pname = "rake";
        version = "0.0.1";
-       sha256 = "0cn22xg7r80f61z8pf7i0rqqag4qx43rhlfpncgkv5b6vcrsafpn";
+       sha256 = "f63aa533db66953d1fb3d7519807e9983c857106f1b88b7e300ea07c5e17c232";
        libraryHaskellDepends = [ base containers text ];
        homepage = "http://github.com/toschoo/Haskell-Libs";
        description = "Rapid Automatic Keyword Extraction (RAKE)";
@@ -109510,7 +109844,7 @@ self: {
      mkDerivation {
        pname = "rakhana";
        version = "0.2.0.2";
-       sha256 = "10gk2wk8495y1zk148sqsm993dzi4z6a49nn717qccpc2qi4lw6k";
+       sha256 = "d3704a2216ec32864f38d626a2cc27f1b79152d5582312e60fbe24822617f381";
        libraryHaskellDepends = [
          attoparsec base bytestring containers lens mtl pipes scientific
          transformers vector zlib
@@ -109527,7 +109861,7 @@ self: {
      mkDerivation {
        pname = "ralist";
        version = "0.1.0.0";
-       sha256 = "0v2cg1d2wzjcygk78qcz1yfy9rcqw8yrplnnk6cax41qifhr5z5i";
+       sha256 = "b1fc92a18b3890ae9899d6d29b3de298e5e49d0f9f6174e6f34c7e2e5a784c6c";
        libraryHaskellDepends = [ base ];
        description = "Random access list with a list compatible interface";
        license = stdenv.lib.licenses.bsd3;
@@ -109539,7 +109873,7 @@ self: {
      mkDerivation {
        pname = "rallod";
        version = "0.0.1";
-       sha256 = "14fnk2q702qm0mh30r9kznbh4ikpv4fsd5mrnwphm5d06vmq6hq9";
+       sha256 = "094383eb36a0950a2fb7b996a61dd977460297fd3365306005150b70b098d691";
        libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://github.com/moonmaster9000/rallod";
        description = "'$' in reverse";
@@ -109554,7 +109888,7 @@ self: {
      mkDerivation {
        pname = "raml";
        version = "0.1.0";
-       sha256 = "02c1rki7azfwfiawi29z5gp1zwfdx46rw17bifpklw7zya525pr9";
+       sha256 = "29df228af2ff703aaf8beb049e0de9cdf11fee2b3f89c85574dc7d75e2cc8109";
        libraryHaskellDepends = [
          aeson base bytestring text unordered-containers yaml
        ];
@@ -109568,7 +109902,7 @@ self: {
      mkDerivation {
        pname = "rand-vars";
        version = "0.1";
-       sha256 = "165jvx59vzmpxp7gw60ivfka77kgc1irwijikkwja7jb4dm4ay3x";
+       sha256 = "7d78456a234b1e25f99c51469e63606f9ea3a6db1118feceedb7fe9d4adfb298";
        libraryHaskellDepends = [ array base IntervalMap mtl random ];
        description = "Random variable library, with Functor, Applicative and Monad instances";
        license = stdenv.lib.licenses.bsd3;
@@ -109582,7 +109916,7 @@ self: {
      mkDerivation {
        pname = "randfile";
        version = "0.1.0.0";
-       sha256 = "11f72kfya4l41dihjvaz15hzipry281r8i6k6dzp5q3gq4valgyz";
+       sha256 = "df3faa36c16fe0727f33d3449403123edff861095f6d09630b8412e5dd14c785";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -109598,7 +109932,7 @@ self: {
      mkDerivation {
        pname = "random";
        version = "1.1";
-       sha256 = "0nis3lbkp8vfx8pkr6v7b7kr5m334bzb0fk9vxqklnp2aw8a865p";
+       sha256 = "b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base ];
        description = "random number library";
@@ -109610,7 +109944,7 @@ self: {
      mkDerivation {
        pname = "random-access-list";
        version = "0.2";
-       sha256 = "1ymbs3f38l6ch0nphsy9pi32yb1a4hazn3grm9fl0dvgqw28xl8r";
+       sha256 = "19d18e04c76f37405daaf90dfb15242a2c2f46bcc96b782d80cc5034dcd0abfa";
        libraryHaskellDepends = [ array base containers ];
        description = "Random-access lists in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -109622,7 +109956,7 @@ self: {
      mkDerivation {
        pname = "random-derive";
        version = "0.1.0.0";
-       sha256 = "08irzyg8cgigj009zp5hg33gdwranrdyyzrxhmwyib6fm5bmsj8p";
+       sha256 = "17495d57a9ceace879853d7fef5bb62af3f6c678b0dc9f00902f3e869eff3922";
        libraryHaskellDepends = [ base random template-haskell ];
        homepage = "https://github.com/frerich/random-derive";
        description = "A Template Haskell helper for deriving Random instances";
@@ -109634,7 +109968,7 @@ self: {
      mkDerivation {
        pname = "random-eff";
        version = "0.1.0.1";
-       sha256 = "1m28np0zfabp1n1d08przh35bxfr1l7d39kj4a5z61jkchmsaxyf";
+       sha256 = "ce77a52b645306f38b2272a6d10e0dd9f55506fcf922d0820d7729f7c1b548d4";
        libraryHaskellDepends = [ base extensible-effects random ];
        jailbreak = true;
        description = "A simple random generator library for extensible-effects";
@@ -109647,7 +109981,7 @@ self: {
      mkDerivation {
        pname = "random-effin";
        version = "0.1.1.0";
-       sha256 = "0p1n5dfdsp00q9mlhd7xcl93k5d0wji91p59858gmfx9xf8j0p0h";
+       sha256 = "105c2091eba9bbfa5041a9dc90a2e4a095391265fd34486bc2005cdd5c2b365c";
        libraryHaskellDepends = [ base effin random ];
        jailbreak = true;
        description = "A simple random generator library for effin";
@@ -109661,7 +109995,7 @@ self: {
      mkDerivation {
        pname = "random-extras";
        version = "0.19";
-       sha256 = "1b45s314rqkk0np460p3p0wrqvkv9dczifny8pp76ikksalfvgn0";
+       sha256 = "c0beeda8d2734673ee45debaf8594b7b6e9c39b8e30243ae0573e24cc2d085ac";
        libraryHaskellDepends = [
          array base containers random-fu random-source
        ];
@@ -109678,7 +110012,7 @@ self: {
      mkDerivation {
        pname = "random-fu";
        version = "0.2.6.2";
-       sha256 = "1j7zr7h860vjwlh9d9sj319xs44ly2vyzn3s72c5qc39r0yv00ng";
+       sha256 = "cf02b03dc869305c98387ad8efb7f09410dd531852a79620e5720383e0c9ffc8";
        libraryHaskellDepends = [
          base erf log-domain math-functions monad-loops mtl random-shuffle
          random-source rvar syb template-haskell transformers vector
@@ -109695,7 +110029,7 @@ self: {
      mkDerivation {
        pname = "random-hypergeometric";
        version = "0.1.0.0";
-       sha256 = "0jg4j2nwijb5ic9zl5y9miqhn881dmf0s49gj8f818as3mhvqlgh";
+       sha256 = "f051bc611d5aa1801c922f110d5c6d01210b71acc917fa138b65c9c8ad90e449";
        libraryHaskellDepends = [ base math-functions random-fu ];
        testHaskellDepends = [
          base Cabal cabal-test-quickcheck math-functions mwc-random
@@ -109713,7 +110047,7 @@ self: {
      mkDerivation {
        pname = "random-shuffle";
        version = "0.0.4";
-       sha256 = "0586bnlh0g2isc44jbjvafkcl4yw6lp1db8x6vr0pza0y08l8w2j";
+       sha256 = "52704411f040fd0bf2361dad162e35dc13caa6535b2e4908d3513c00a95d0615";
        libraryHaskellDepends = [ base MonadRandom random ];
        description = "Random shuffle implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -109727,7 +110061,7 @@ self: {
      mkDerivation {
        pname = "random-source";
        version = "0.3.0.6";
-       sha256 = "0wsv41kpswqml04ym5bq2nan4i637f7h3fmvda2zy506xwxfrpzk";
+       sha256 = "f3dfec3aef0614ff856abbba018f3bc3446295157895ea09a015737d67205b73";
        libraryHaskellDepends = [
          base flexible-defaults mersenne-random-pure64 mtl mwc-random random
          stateref syb template-haskell th-extras
@@ -109742,7 +110076,7 @@ self: {
      mkDerivation {
        pname = "random-stream";
        version = "0.1.1";
-       sha256 = "0q191kz3hmjzrgs143nja5gcis07igb38f51mwqw64zx7vjqvx66";
+       sha256 = "c6f48de53efd13c331afa13834d68b07e8c85e51d20e12f4cb5f5638fe0c2960";
        libraryHaskellDepends = [ base binary bytestring random ];
        description = "An infinite stream of random data";
        license = stdenv.lib.licenses.bsd3;
@@ -109756,7 +110090,7 @@ self: {
      mkDerivation {
        pname = "randomgen";
        version = "0.1";
-       sha256 = "0y7yvsach0c27ahscxr36avjrq281pmg7w6cv2yj5kmbk7ddwlyi";
+       sha256 = "d153deda99abce22bdd8ccf0f3ea0d48e02cb7322377a6a13a8201c894defe78";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -109773,7 +110107,7 @@ self: {
      mkDerivation {
        pname = "randproc";
        version = "0.4";
-       sha256 = "0fb0239fwvn1n3rbdr03k4kx1igzbb638a1iq0ln1k1i1fpaayd7";
+       sha256 = "a779a5ae0b31cc6029c0312834cc5affc5d0279903e4b6f2b0c16eeed2106039";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.haskell.org/haskellwiki/Random_Processes";
        description = "Data structures and support functions for working with random processes";
@@ -109785,7 +110119,7 @@ self: {
      mkDerivation {
        pname = "randsolid";
        version = "0.3";
-       sha256 = "0v7j6qqs16j281hn0330vcpkriqgyvl7087ll665c7dcqqh2bswk";
+       sha256 = "93eb2520c6ac1d568ca1f42070e8f60fc73c2fdb600c606140429aa03136f26c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base random X11 ];
@@ -109800,7 +110134,7 @@ self: {
      mkDerivation {
        pname = "range";
        version = "0.1.2.0";
-       sha256 = "028bigaq4vk5ykzf04f5hi3g37gxzzp6q24bjcb3gjfzcgy7z6ab";
+       sha256 = "4b997ffc63dfc93716938b086ceefffd9df14684c511e0fef4656e82d58b0b09";
        libraryHaskellDepends = [ base free parsec ];
        testHaskellDepends = [
          base Cabal free QuickCheck random test-framework
@@ -109816,7 +110150,7 @@ self: {
      mkDerivation {
        pname = "range-set-list";
        version = "0.0.7";
-       sha256 = "1qgw95gvbxar13ia6562ddz9zqd14ffyxwp9qi41w859prfc1728";
+       sha256 = "489cc05cbea9201e48c4e9f2ee9d23a1e19f7e6bc214a3e20859f5b55f49fce1";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        jailbreak = true;
@@ -109833,7 +110167,7 @@ self: {
      mkDerivation {
        pname = "range-space";
        version = "0.1.1.2";
-       sha256 = "06cl5kgyl1lccr78galqxp21nli2vkvlywy6394cnp14wqfz8r94";
+       sha256 = "2465f41de6245ccb481ac6734ff7dc22521bc4ed98aa874e668c06eadf2c9419";
        libraryHaskellDepends = [
          base semigroups vector-space vector-space-points
        ];
@@ -109853,7 +110187,7 @@ self: {
      mkDerivation {
        pname = "rangemin";
        version = "2.2.2";
-       sha256 = "01n1m3ibi44pjg04mg16j751fjzkspmnq8bzxz55qbyi22wshnwc";
+       sha256 = "8c5ba8b910d12f5ccaef7f216cebd5f34b17ca9126bc4ac0939790b8e2a8c106";
        libraryHaskellDepends = [ base containers primitive vector ];
        description = "Linear range-min algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -109865,7 +110199,7 @@ self: {
      mkDerivation {
        pname = "ranges";
        version = "0.2.4";
-       sha256 = "1ymvmvfvzkdxblg691g9n5y94gpiz782jgyvaisg5mydzj1s1fyv";
+       sha256 = "dbbba083fccdd7f27454db3f29d0f9f13e927cb1e985641e5dbdcdbfddaebbfa";
        libraryHaskellDepends = [ base containers ];
        description = "Ranges and various functions on them";
        license = stdenv.lib.licenses.bsd3;
@@ -109878,7 +110212,7 @@ self: {
      mkDerivation {
        pname = "rank1dynamic";
        version = "0.3.1.0";
-       sha256 = "0klfwglssp782p1brbfgjm30d2s3lpgd75iv7jq1pih598kkjsd5";
+       sha256 = "a56939274a05c61bb03c3b96d3dea5438b064695cfadbcc215e85cade9e38e4e";
        libraryHaskellDepends = [ base binary ghc-prim ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -109896,7 +110230,7 @@ self: {
      mkDerivation {
        pname = "rascal";
        version = "1.1.6";
-       sha256 = "0q7afppkm5jd1p13fszzsfjpdz6g6bw1vd6wigcy3janxn5686rs";
+       sha256 = "3a1b648aed56c9e1d98bdcb41df832cffc76a5d3ff6b37c20d4d963aef75ea60";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109927,7 +110261,7 @@ self: {
      mkDerivation {
        pname = "rasterific-svg";
        version = "0.2.3.1";
-       sha256 = "00p3l8czj7l9jm6ibn9c6wb99v5j5x9ivgh3pamznqcri3lqy7kk";
+       sha256 = "731e8fe9889961fbabba03be1d532fb2ec9416372cd9154d95891ef919a2e302";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109948,7 +110282,7 @@ self: {
      mkDerivation {
        pname = "rate-limit";
        version = "1.1.1";
-       sha256 = "1d1dfj05vi8jr2cfy42a58wnm84zm6cmx7fabp2rb83qqm4l2riz";
+       sha256 = "3f664149c578a095c55dca9d5e99a99fa06a392a4a10ef98c812c55d80742db4";
        libraryHaskellDepends = [ base time-units ];
        homepage = "http://github.com/acw/rate-limit";
        description = "A basic library for rate-limiting IO actions";
@@ -109960,7 +110294,7 @@ self: {
      mkDerivation {
        pname = "ratio-int";
        version = "0.1.2";
-       sha256 = "06kqr4iyi184sa8y2vdkw5h0pvh5f8lwcqb8mbcn34lpqm961s7g";
+       sha256 = "efe86052c5979261d9aa6861c6297205ee0b60e1b36de191d20485e823c9781a";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/RaphaelJ/ratio-int";
        description = "Fast specialisation of Data.Ratio for Int.";
@@ -109975,7 +110309,7 @@ self: {
      mkDerivation {
        pname = "raven-haskell";
        version = "0.1.0.0";
-       sha256 = "06pa03g9pxxv1qk34ckcgwp5wirj5ag1akml48k18la6p0a2r3mx";
+       sha256 = "bd8e2c14b84651142622b44e159e2a32475e2e7f6c3232260ebbf79bde00ea1a";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit network old-locale random text
          time unordered-containers uuid
@@ -109996,7 +110330,7 @@ self: {
      mkDerivation {
        pname = "raven-haskell-scotty";
        version = "0.1.0.3";
-       sha256 = "0vllfasn4rky8r8fg3mpln8pdkxbcvrvx8wamn0xswfwf1rvcf6k";
+       sha256 = "d338b67370dc71dd81ad8aa3bef366abcf7691a5b78ee750467e6662b572946e";
        libraryHaskellDepends = [
          base bytestring case-insensitive mtl raven-haskell scotty text wai
        ];
@@ -110011,7 +110345,7 @@ self: {
      mkDerivation {
        pname = "raw-strings-qq";
        version = "1.0.2";
-       sha256 = "0wnifa97am2s9bqixlidw3nf8w14h2qkg3sn1rxzgvc3fws57jg9";
+       sha256 = "e9c953347783edf77b0e568f37b1802470e4ece02dd21ef14a5a54759272d172";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/23Skidoo/raw-strings-qq";
        description = "Raw string literals for Haskell";
@@ -110023,7 +110357,7 @@ self: {
      mkDerivation {
        pname = "rawstring-qm";
        version = "0.2.2.2";
-       sha256 = "0h3s62sn84skwx3p9lcycswydvg6rijig7pk3g7v4rvypfdlybz6";
+       sha256 = "e62f4f9bbb7e67b2cf1bf39e1765cce6ede6b9669ed17447e7531364b5307a40";
        libraryHaskellDepends = [ base bytestring template-haskell text ];
        homepage = "https://github.com/tolysz/rawstring-qm";
        description = "Simple raw string quotation and dictionary interpolation";
@@ -110037,7 +110371,7 @@ self: {
      mkDerivation {
        pname = "razom-text-util";
        version = "0.1.2.0";
-       sha256 = "0sfqc222pplsdmbrhwvbdf6pmqa18vgjd83rk7hqixzp6rk9h7pg";
+       sha256 = "ef1e986636f7f788e19979a026df4641e17a8d6b6b7398576d9ade2b8460d869";
        libraryHaskellDepends = [
          base regex-applicative smaoin text text-position
        ];
@@ -110052,7 +110386,7 @@ self: {
      mkDerivation {
        pname = "rbr";
        version = "0.8.6";
-       sha256 = "0q7b990k3ijjjwhnm1283k9vzmvypyg7mhvbzagvi74q0sgwyac7";
+       sha256 = "8729cf9f06989cb89ffa6bc37a9ebf7ed7bfd31c48846a219752c631414aeb60";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bio bytestring containers ];
@@ -110069,7 +110403,7 @@ self: {
      mkDerivation {
        pname = "rclient";
        version = "0.1.0.0";
-       sha256 = "1hdcbnkb184a1zfxsh4fxgff9znc5sw6503qbix67c45qiw25zhn";
+       sha256 = "16fe2278c485b0637a5c788062b82eccfee4dceb8e40dddd0f8aa0b0a65dacc1";
        libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 network QuickCheck split
        ];
@@ -110087,7 +110421,7 @@ self: {
      mkDerivation {
        pname = "rdf4h";
        version = "1.3.2";
-       sha256 = "09ya3d1svg6fj7jdm408gisv0cnn0c2i2c3pn07xggnn882s93bw";
+       sha256 = "7c8da40542d6bed70fb07730110503d632b0757c0890dae491cebcad431bca27";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -110118,7 +110452,7 @@ self: {
      mkDerivation {
        pname = "rdioh";
        version = "0.2.1";
-       sha256 = "1k0djlhabycj4q7x85bj7n3k0rcyxn9b3k3ijb4za2vxj081qdj0";
+       sha256 = "40361c10907d0bf5c99271ccb192ed9e6530873d7215d40f2692f9a520950dcc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -110139,7 +110473,7 @@ self: {
      mkDerivation {
        pname = "rdtsc";
        version = "1.3.0.1";
-       sha256 = "0l6r5v6bgqf7lq9j6bf7w362bz7bv4xrsbz90ns60v4dyqjskjal";
+       sha256 = "54c9a925f68d6c60b405e92f9d3bd9ebfc25cce0c72d2313a6c7e1b7cc2ed950";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mgrabmueller/rdtsc";
        description = "Binding for the rdtsc machine instruction";
@@ -110151,7 +110485,7 @@ self: {
      mkDerivation {
        pname = "rdtsc-enolan";
        version = "0.1";
-       sha256 = "0v3x7ga4gx5q4gwh8xdhb2arlmjyilr9igz28wysy9qqlcdw775q";
+       sha256 = "b89cc31ba31827af3d47e2bf98328d5e569a9558b07504f923b8f447d43b7d6c";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/rdtsc";
        description = "Binding to sources of high-efficiency, high-precision, monotonically increasing relative time";
@@ -110163,7 +110497,7 @@ self: {
      mkDerivation {
        pname = "re2";
        version = "0.1";
-       sha256 = "08mmbxj9dpnb56b6vh0lz7nimp3w3v9g2c6ypxgz8ahvlia0a4f5";
+       sha256 = "c5110554a41b2af45fbfde30f1d21e7cdc1aedf914c06d9629cbde96645fb522";
        libraryHaskellDepends = [ base bytestring vector ];
        testHaskellDepends = [ base bytestring chell vector ];
        homepage = "https://john-millikin.com/software/haskell-re2/";
@@ -110178,7 +110512,7 @@ self: {
      mkDerivation {
        pname = "react-haskell";
        version = "2.0.1";
-       sha256 = "0kjbicrvriliy50gy82b7rsrfk5p3iv20wwnhiaq9i16mbh2zj8j";
+       sha256 = "12c92fe0aa26c4845584967320761cb74c97753e4b20ff40f191c6bc338b4b4e";
        libraryHaskellDepends = [
          aeson base deepseq lens-family monads-tf text transformers
          unordered-containers void
@@ -110193,7 +110527,7 @@ self: {
      mkDerivation {
        pname = "reaction-logic";
        version = "2010.11.17";
-       sha256 = "0g1lbr0lsx71ddmd64q9lxx3gj63ncc7nqd12l4739wq495q57r0";
+       sha256 = "209f824b2298a7710815a1617b18b3c3c8377aa70913d36a6be1744d415e343c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl QuickCheck ];
@@ -110211,7 +110545,7 @@ self: {
      mkDerivation {
        pname = "reactive";
        version = "0.11.5";
-       sha256 = "1axhgggl1g8yjdvp817bnkj4xc23scc3i2k224k43942255sf71j";
+       sha256 = "321ca74b1182a4412611628a3818d343b04ee4b4eb047477931ebd40df7bb0ab";
        libraryHaskellDepends = [
          base category-extras checkers old-time QuickCheck random Stream
          TypeCompose unamb vector-space
@@ -110227,7 +110561,7 @@ self: {
      mkDerivation {
        pname = "reactive-bacon";
        version = "0.4.1";
-       sha256 = "0cic01yikwgalbprz8y0fs7i7c0pynxl7aivsfjgsl75wdpjsj3m";
+       sha256 = "75482d6fe3e550fda4d33baa43bbf517b0138f76c0a39fefa2eaf1197d002c32";
        libraryHaskellDepends = [ base old-time stm ];
        testHaskellDepends = [ base containers HUnit old-time stm ];
        homepage = "http://github.com/raimohanska/reactive-bacon";
@@ -110245,7 +110579,7 @@ self: {
      mkDerivation {
        pname = "reactive-balsa";
        version = "0.1.1";
-       sha256 = "14k65rjvyxwb4psa53qcz89jllabqv76vh4xwx2k6k5ssl6qfr3n";
+       sha256 = "7664870dd5ba4c3345e79dc06dcec64b512a13fa0c8fa2f4258b77bf652e6692";
        libraryHaskellDepends = [
          alsa-core alsa-seq base containers data-accessor
          data-accessor-transformers event-list extensible-exceptions midi
@@ -110267,7 +110601,7 @@ self: {
      mkDerivation {
        pname = "reactive-banana";
        version = "0.8.1.2";
-       sha256 = "1ak3i0r7y9d5pyb4q6jag804bkgiqj3az7cckj50ffvra2v37nga";
+       sha256 = "ead933b650793b078a9c8c9daf86c4f1cd45007a4a1a4c96bfa5257f328863aa";
        libraryHaskellDepends = [
          base containers hashable psqueues transformers unordered-containers
          vault
@@ -110288,7 +110622,7 @@ self: {
      mkDerivation {
        pname = "reactive-banana-sdl";
        version = "0.2.0";
-       sha256 = "067g8v7xhll416f47prifv0l2i8vr6aywbahhci8kwci75a1al6m";
+       sha256 = "d55015543991f1892283502dee95c91b4541c17631df439c098452d8cf46ef18";
        libraryHaskellDepends = [
          base data-lens data-lens-template reactive-banana SDL SDL-image
          SDL-ttf
@@ -110304,7 +110638,7 @@ self: {
      mkDerivation {
        pname = "reactive-banana-threepenny";
        version = "0.7.1.3";
-       sha256 = "1fb0bq7rcxsnga2hxh94h2rpp4kjh383z06qgk36m49pyvnbnl9a";
+       sha256 = "2a51bbecf637916ac67cd8803fd08072927bb38024c10e857a5677960f5e60b9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
@@ -110320,7 +110654,7 @@ self: {
      mkDerivation {
        pname = "reactive-banana-wx";
        version = "0.8.0.4";
-       sha256 = "1r000r9svkf1sqxhg5mpawg9a7dkfndsyz242sbmfaxf94nrrscg";
+       sha256 = "8fe99c2d49ae2b579716447caf9b75b31d951e57b796073bd6c1cdad530600e4";
        configureFlags = [ "-f-buildexamples" ];
        isLibrary = true;
        isExecutable = true;
@@ -110339,7 +110673,7 @@ self: {
      mkDerivation {
        pname = "reactive-fieldtrip";
        version = "0.0.9";
-       sha256 = "092bxjnhbcyqlij8jc014c56k67ncp5wjm8kmwvn8argfplyscxg";
+       sha256 = "af33ede9752f2b6437af1355c9cb65f698690a2301308964a4d8b305adec4b24";
        libraryHaskellDepends = [
          base FieldTrip InfixApplicative reactive reactive-glut unamb
          vector-space
@@ -110357,7 +110691,7 @@ self: {
      mkDerivation {
        pname = "reactive-glut";
        version = "0.1.10";
-       sha256 = "164ivzgrnvqvx7r1jagsng9m47ql0jkayzahhcvs8wd78ksbbsfh";
+       sha256 = "d0e9b5f444a771a43783507dafa604141f52d3b3fa2919f2e91b6f9bdfdf9198";
        libraryHaskellDepends = [
          base GLUT old-time OpenGL reactive vector-space
        ];
@@ -110372,7 +110706,7 @@ self: {
      mkDerivation {
        pname = "reactive-haskell";
        version = "0.0.1";
-       sha256 = "115zjaymcx1dm7lwdqjq810j664a2kj8phrvjkhfkdsl95srqc85";
+       sha256 = "05319c754954b7e9e0943bc38be4148a1823414058e2c6e9a92d7456bd92bf84";
        libraryHaskellDepends = [ base ];
        description = "minimal fork of io-reactive";
        license = stdenv.lib.licenses.bsd3;
@@ -110383,7 +110717,7 @@ self: {
      mkDerivation {
        pname = "reactive-io";
        version = "0.1";
-       sha256 = "0s7a29cfzb2j5xvqykx1n5naci2np36zjs3qyq0i4yzjf3qprr63";
+       sha256 = "c3e47cf170f27b1201f67868f9cdb85644a66cb1a14f8f772f52acef5812ea68";
        libraryHaskellDepends = [ base transformers ];
        description = "IO-oriented FRP library";
        license = stdenv.lib.licenses.mit;
@@ -110394,7 +110728,7 @@ self: {
      mkDerivation {
        pname = "reactive-thread";
        version = "0.3.2.1";
-       sha256 = "1mydwb3p2c4xm7zfv7cwcyscq1wdcvs2az743s3j8gl8ggc1zs50";
+       sha256 = "a0e81fd87b883e24871ee47c25f4668d07ccb4679c9dedfea99d3071c7e2cdd7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base monad-parallel stm transformers ];
@@ -110415,7 +110749,7 @@ self: {
      mkDerivation {
        pname = "reactor";
        version = "0.1.3";
-       sha256 = "0g57vkq8cgigy6383p5jk6bbp3l1vcihryz8sjwvr8hs4y96642f";
+       sha256 = "4e106392271aa2bcb9d4e8fb0c23db818ebb9699b2dc8186f12f3e86f0dca73c";
        libraryHaskellDepends = [
          array base bits-atomic comonad contravariant mtl semigroupoids
          transformers
@@ -110432,7 +110766,7 @@ self: {
      mkDerivation {
        pname = "read-bounded";
        version = "0.1.1.0";
-       sha256 = "19ynv5vxa5dnphv9kby0nfvq3wn6qpk7n5qv1x22ipkfxnxdw47k";
+       sha256 = "f310debaed6ede28440f1b177be6c5c6f281b7b3c0af9936bcb615d577d9d6a7";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/thomaseding/read-bounded";
@@ -110445,7 +110779,7 @@ self: {
      mkDerivation {
        pname = "readable";
        version = "0.3.1";
-       sha256 = "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h";
+       sha256 = "703037ad2cca4d6d42ba23e2758d1911cd82e3e922c4078076c273231e4b43c9";
        libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/mightybyte/readable";
        description = "Reading from Text and ByteString";
@@ -110457,7 +110791,7 @@ self: {
      mkDerivation {
        pname = "readline";
        version = "1.0.3.0";
-       sha256 = "1sszlx34qa88fad3wlhd4rkb1my1nrpzvyd8vq7dn806j5sf3ff0";
+       sha256 = "c0b9e174910620db0edea8f9fd6fb6c1d7b066260d523e9a7208294c46a75feb";
        libraryHaskellDepends = [ base process ];
        librarySystemDepends = [ ncurses readline ];
        description = "An interface to the GNU readline library";
@@ -110469,7 +110803,7 @@ self: {
      mkDerivation {
        pname = "readline-statevar";
        version = "1.0.1.0";
-       sha256 = "1gfxs3wfdkkarxil2an5l58syrm2vajj0qpshzabzchni32yxic8";
+       sha256 = "88c5eec58816b2bfd487fa6220a5daa266af51a1c52a4163cf6acee6f8d0ddbd";
        libraryHaskellDepends = [ base readline StateVar ];
        jailbreak = true;
        description = "Readline with variables (setX/getY) wrapped in state vars";
@@ -110481,7 +110815,7 @@ self: {
      mkDerivation {
        pname = "readpyc";
        version = "0.2.1";
-       sha256 = "1icb7w3hgfczrr48x48lwvln05yaw3c9bxwrrfxc92h3q73v1rpp";
+       sha256 = "f7e6b0c7c1038ac4bacb99f795d8e0ca1760e9e614918e48ce9fb907073f8bc5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bliplib parseargs ];
@@ -110495,7 +110829,7 @@ self: {
      mkDerivation {
        pname = "really-simple-xml-parser";
        version = "0.4.0.0";
-       sha256 = "1qmrfisnvm9a25a9ssg4r466yna69vzbwn7s7f4zql28cndg3syy";
+       sha256 = "deebf19a654850fc893bfa58befe4e46596f0cc9e4699d54112ad56d7574b9e2";
        libraryHaskellDepends = [ base parsec ];
        jailbreak = true;
        homepage = "http://website-ckkashyap.rhcloud.com";
@@ -110509,7 +110843,7 @@ self: {
      mkDerivation {
        pname = "reasonable-lens";
        version = "0.2.1.1";
-       sha256 = "0ic239ikxqsk4qjnyraka3jn4pjmmsgwqyga6zmqlw7z1kpgaxam";
+       sha256 = "5575f5ee0cff708aeb37ea79cc9fae555e62e55053656f252653e33e631a8245";
        libraryHaskellDepends = [ base mtl split template-haskell ];
        homepage = "https://github.com/tokiwoousaka/reasonable-lens";
        description = "Lens implementation. It is more small but adequately.";
@@ -110522,7 +110856,7 @@ self: {
      mkDerivation {
        pname = "reasonable-operational";
        version = "0.1.0.1";
-       sha256 = "18d49rzpygbsd17d9hz79bbgj6jznlx2jzhkw43gzw3rhvklwyh9";
+       sha256 = "097a4ee78679f0ff06e1137e293ab55f1af9d64ae7c3d44e687a3d7f7f4ea4a1";
        revision = "1";
        editedCabalFile = "963ed294ec0f951858022c25b9713b06e65d2a05098068a1183110e298b5c8cf";
        libraryHaskellDepends = [ base ];
@@ -110536,7 +110870,7 @@ self: {
      mkDerivation {
        pname = "recaptcha";
        version = "0.1.0.3";
-       sha256 = "18rqsqzni11nr2cvs7ah9k87w493d92c0gmc0n6fhfq6gay9ia19";
+       sha256 = "29a898bc7a063be88c05ac3ec0446a23117ed04c501dbd99c83684683fd638a3";
        libraryHaskellDepends = [ base HTTP network network-uri xhtml ];
        homepage = "http://github.com/jgm/recaptcha/tree/master";
        description = "Functions for using the reCAPTCHA service in web applications";
@@ -110550,7 +110884,7 @@ self: {
      mkDerivation {
        pname = "record";
        version = "0.4.0.2";
-       sha256 = "18j30j7dppm0lqf9p345bfz65cls15ka6jyflamwgig5h0dzz5mw";
+       sha256 = "bc96ff1b80e5c5c7aba2ce4ba366099ab262be5b858c9b1ca6a0dedb8e0443a2";
        libraryHaskellDepends = [
          base base-prelude basic-lens template-haskell transformers
        ];
@@ -110566,7 +110900,7 @@ self: {
      mkDerivation {
        pname = "record-aeson";
        version = "0.1.0.0";
-       sha256 = "023g63y478k7mq8kk5xcxa3civs3hdhlvdb0qh3amvvybpj3g4av";
+       sha256 = "5b9137e45d7eefaa06c460b54d618343efc886eaac973911ae67a243fc306f08";
        libraryHaskellDepends = [
          aeson base base-prelude record template-haskell
        ];
@@ -110586,7 +110920,7 @@ self: {
      mkDerivation {
        pname = "record-gl";
        version = "0.1.0.0";
-       sha256 = "0z0qwnzayarwlamig9g4zngq3mcddhl3pgalir811lxf3a3g1dqq";
+       sha256 = "18b7f0861aaed310508e54bd3b286c8dd5819ffde4a517aba23c2bafbee5187c";
        revision = "1";
        editedCabalFile = "6d2017f9112690ce717a1bb7dad9d2d4272b01b4bce8ee3ae79247f97f277d85";
        libraryHaskellDepends = [
@@ -110609,7 +110943,7 @@ self: {
      mkDerivation {
        pname = "record-preprocessor";
        version = "0.1.0.3";
-       sha256 = "0vfij2kj4lg9pvyrcq3x33vnibq441fc80cpd67c9ik9axgf0r3y";
+       sha256 = "7e64e05e5769c6c48e699701c45c2004af68f7187d6096fdbee95122a790d16d";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -110629,7 +110963,7 @@ self: {
      mkDerivation {
        pname = "record-syntax";
        version = "0.1.0.2";
-       sha256 = "177zy0j05yvpalflja5wpp0a45nplhpa9vq8ssfxw2nw9ydam637";
+       sha256 = "6798aa9a4fdc0ade9dd608efa42ea4d716a2c0bdbc28491d5577fb0224f0ff9c";
        libraryHaskellDepends = [
          base base-prelude conversion conversion-text haskell-src-exts
          parsec record template-haskell text transformers
@@ -110648,7 +110982,7 @@ self: {
      mkDerivation {
        pname = "records";
        version = "0.1.1.6";
-       sha256 = "1nzqqbqwgsr066ykmanyzmlv5nzdzpkkcla0lg8klyw6ck9ddk69";
+       sha256 = "c9ccd6d264867b3ad1a3405136e7fdeddbb269fddeaa3abd3120ebc7f1c2f8db";
        libraryHaskellDepends = [ base kinds type-functions ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/records";
        description = "A flexible record system";
@@ -110663,7 +110997,7 @@ self: {
      mkDerivation {
        pname = "records-th";
        version = "0.1.1.0";
-       sha256 = "1m6v52kmh1clcgah07jjjxvsfpbp6z8lkdd78wap0v3mqiv8mdcg";
+       sha256 = "8fb58a76c4756c701547a7b549d137775da77797521e00d563940558a728dbd4";
        libraryHaskellDepends = [
          aeson base data-default kinds records template-haskell text
          type-functions unordered-containers
@@ -110680,7 +111014,7 @@ self: {
      mkDerivation {
        pname = "recursion-schemes";
        version = "4.1.2";
-       sha256 = "1z64r20qgf7n5c2529cpwhklb3nkmw01p2llq903dqkplmbi7z9n";
+       sha256 = "36fd1357a577e23640c2948a1b00afd38e4527e4972551042bf6b88781c8c4fc";
        libraryHaskellDepends = [ base comonad free transformers ];
        homepage = "http://github.com/ekmett/recursion-schemes/";
        description = "Generalized bananas, lenses and barbed wire";
@@ -110694,7 +111028,7 @@ self: {
      mkDerivation {
        pname = "recursive-line-count";
        version = "0.1";
-       sha256 = "0iyacn4gb7v6ly0bdci34mrjkjc29mbplqc6bhfv8ksz74aaafyn";
+       sha256 = "d63ba514395f4fb41d5c86617a574d82c929732523b2b680a7669ff58865ca47";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -110713,7 +111047,7 @@ self: {
      mkDerivation {
        pname = "redHandlers";
        version = "0.1";
-       sha256 = "1llb81aqr0jlsajsmy20br5vqd6ap54bk17ipg8z3gmzd0wcf9c9";
+       sha256 = "8925c73868bfbef1d1bbf184b948b9ca34bc4b5e40f8aaa5d254828c55408bd2";
        libraryHaskellDepends = [
          array base bytestring cgi containers haskell98 MaybeT mtl network
          old-time parsec stm unix xhtml
@@ -110732,7 +111066,7 @@ self: {
      mkDerivation {
        pname = "reddit";
        version = "0.1.1.0";
-       sha256 = "1flsawdld5a4bs5crs352zc1r9ag3yn1indbzw7vgs2mmyiavg7k";
+       sha256 = "f3bcada2af55e8b70fffabd918ac1f4fa51cd81765e8cc8a5e4495461b579aba";
        libraryHaskellDepends = [
          aeson api-builder base bytestring data-default http-conduit
          http-types network stm text time transformers unordered-containers
@@ -110755,7 +111089,7 @@ self: {
      mkDerivation {
        pname = "redis";
        version = "0.14.1";
-       sha256 = "02r97k08n9gyrfmbm6qgb8dddivaiprp50hs79a5bnxvvl6vmq9b";
+       sha256 = "2be1ba0dddbbdb55543a1a8272f38d6ac7d61a5a0f9bbaaacbfe258bc03c290b";
        libraryHaskellDepends = [
          base bytestring concurrent-extra containers exceptions mtl network
          old-time utf8-string
@@ -110770,7 +111104,7 @@ self: {
      mkDerivation {
        pname = "redis-hs";
        version = "0.1.2";
-       sha256 = "1irayxwkdksc9v70g7il7zl7pmkrim2admcgjwcm9inyca7618wg";
+       sha256 = "8fa3608e62dec65419978fd5a6448d79d67be83f349e07ce4e4ccf3679f72ac7";
        libraryHaskellDepends = [ base bytestring network utf8-string ];
        homepage = "http://ohloh.net/p/redis-hs";
        description = "A simple Redis library for Haskell";
@@ -110787,7 +111121,7 @@ self: {
      mkDerivation {
        pname = "redis-io";
        version = "0.5.1";
-       sha256 = "13zj3d89drqdfq8202y982l7jp0nc3mmnmhwpxxfap0pb69n2s5m";
+       sha256 = "b568619359175ce57abf1c565beb60165c79a840c90b2010760de796501bf28f";
        libraryHaskellDepends = [
          attoparsec auto-update base bytestring containers exceptions
          iproute monad-control mtl network operational redis-resp
@@ -110811,7 +111145,7 @@ self: {
      mkDerivation {
        pname = "redis-resp";
        version = "0.3.2";
-       sha256 = "07lvgq2l2fahhc9z3hjjjpx3n4rzdxl2l2ww9brxnv23432xpz97";
+       sha256 = "27fddbc520436cdbf34a9c0b2a686f3f133bfa9552c2f11383503941057e9b1e";
        revision = "2";
        editedCabalFile = "6375e871f3ad78efa6e4780c4e5c026fa4694f27e32f3837679fff42f488877f";
        libraryHaskellDepends = [
@@ -110828,7 +111162,7 @@ self: {
      mkDerivation {
        pname = "redis-simple";
        version = "0.1.1";
-       sha256 = "0kzs5lc2y40dzx57k0klz0k9zijhi7mh0awi6rzhzd3h5z1gdr43";
+       sha256 = "83e4f6c22f70b40f7f36912b00eb8950c69f26f87482794aff0d102f182dfa4f";
        libraryHaskellDepends = [ base binary bytestring redis ];
        homepage = "http://github.com/jaspervdj/redis-simple";
        description = "Simple redis bindings for Haskell";
@@ -110842,7 +111176,7 @@ self: {
      mkDerivation {
        pname = "redo";
        version = "0.2.0";
-       sha256 = "18951sri8wix8aazd8hy8g2gzcpxw2x1ihzmn2prlf10zy1jcy4d";
+       sha256 = "8d782683ff20389aafb0f5c318bae0fdb2ffc4431ea2f695423d7214b30e25a1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -110861,7 +111195,7 @@ self: {
      mkDerivation {
        pname = "reducers";
        version = "3.10.3.2";
-       sha256 = "1zfryrmz5ajahs4d6dj3fzzkqbgdzqz358jvj4rhqiwa61ylhb42";
+       sha256 = "822c487d308a470c33915ba2323efeed2d3cff774336d388864aaaf26bf6d9fd";
        libraryHaskellDepends = [
          array base bytestring containers fingertree hashable semigroupoids
          semigroups text transformers unordered-containers
@@ -110876,7 +111210,7 @@ self: {
      mkDerivation {
        pname = "reenact";
        version = "0.9";
-       sha256 = "19xw0w15ja8h5wxpz4x65vzvc7qxpn3k33p82pa2g3w9l9hlj2xw";
+       sha256 = "bc0b4961a2898f27d415e88e3187bd1d1fb6ff2ea6937f3b2f1029590207bca7";
        libraryHaskellDepends = [
          base hamid HCodecs stm time vector-space
        ];
@@ -110889,7 +111223,7 @@ self: {
      mkDerivation {
        pname = "reexport-crypto-random";
        version = "0.1.0.0";
-       sha256 = "0lraykl190x0cj65z495c11vi4pcg3g8gz1bdgdndf6662lp56x9";
+       sha256 = "a99b72a930c6b866db6b2bfc87de78ec92b8436025915f8c64a08314e8f42a53";
        libraryHaskellDepends = [ base crypto-api ];
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -110899,7 +111233,7 @@ self: {
      mkDerivation {
        pname = "ref";
        version = "0.1.1.2";
-       sha256 = "109illgbz4g4a6qavgc4wvyxfjvjhyrxa2gpps67avmr1v90gihr";
+       sha256 = "19c607d20eb96e758cbef709d5b387724bd7fde684bdadb051e491bf1ea53181";
        libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "https://bitbucket.org/carter/ref";
@@ -110913,7 +111247,7 @@ self: {
      mkDerivation {
        pname = "ref-fd";
        version = "0.4";
-       sha256 = "1r8cj6v798chr3bp7x6qvsiz04xsj2iicpa6824b4fzzy5ixkj96";
+       sha256 = "26c9d963f1ff3bb28840465d16a390ba13f0a3ded8f473d7c890a174b6910ce5";
        libraryHaskellDepends = [ base stm transformers ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "A type class for monads with references using functional dependencies";
@@ -110925,7 +111259,7 @@ self: {
      mkDerivation {
        pname = "ref-mtl";
        version = "0.3";
-       sha256 = "0wijkaf3qyp6qjz0cwyhb89z5jrcz792hx8m9a43xrp7v2f84080";
+       sha256 = "0001829cd8e7e63e884a157528d2f92ccbf2135ad07306bec4e67a3c9c9a3272";
        libraryHaskellDepends = [ base mtl stm transformers ];
        jailbreak = true;
        homepage = "http://www.eecs.harvard.edu/~mainland/";
@@ -110938,7 +111272,7 @@ self: {
      mkDerivation {
        pname = "ref-tf";
        version = "0.4";
-       sha256 = "049xpdn14py3r7hs4ikqdz7jgfsxi6vdsxgq0jfz69gzg4binc25";
+       sha256 = "45301b1779ff25f39d04f875ddb6895dbb27cf6f7846a2e1c9c35f126cbb3d11";
        libraryHaskellDepends = [ base stm transformers ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "A type class for monads with references using type families";
@@ -110950,7 +111284,7 @@ self: {
      mkDerivation {
        pname = "refact";
        version = "0.3.0.1";
-       sha256 = "0nmlhx35g3kb5if6qnkmabgi5dj4b446vkd1n5df1vsiyaf65w11";
+       sha256 = "21f0629cf251efe05ab1a1cd6d085944b612df52755a6c5c2c6b8e574687b45a";
        libraryHaskellDepends = [ base ];
        description = "Specify refactorings to perform with apply-refact";
        license = stdenv.lib.licenses.bsd3;
@@ -110964,7 +111298,7 @@ self: {
      mkDerivation {
        pname = "refcount";
        version = "0.1.2";
-       sha256 = "1h1gprc4c784pf3wi2ri2hxk7pbh9y8bqc0xcryjcyjk3519ig16";
+       sha256 = "26bc984219537a267d661d30bc904f70dd333b14318bc887bb041d4658be2fc0";
        libraryHaskellDepends = [
          base hashable QuickCheck unordered-containers
        ];
@@ -110984,7 +111318,7 @@ self: {
      mkDerivation {
        pname = "reference";
        version = "0.1";
-       sha256 = "1gqbbiwhx5wq1g73m3apwyrrpapqzimincmw2b64fpkkykq66dq1";
+       sha256 = "013763f0f4735e47cc12bc321b6bfcf8aa9bb3e7578d3ace0b98970e795c0bbf";
        libraryHaskellDepends = [ base stm ];
        description = "A class for references in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -110998,7 +111332,7 @@ self: {
      mkDerivation {
        pname = "references";
        version = "0.3.0.0";
-       sha256 = "0rw3r9sz39f3pw2zxq7n9ca9jccfrj6lnjs3frimh0xrmdi9bmjk";
+       sha256 = "53d69562abb903586376434b4b8dcc8e3199144bf6e0fe05bfc3a5f175ca8367";
        libraryHaskellDepends = [
          array base containers directory either filepath instance-control
          mtl template-haskell text transformers
@@ -111017,7 +111351,7 @@ self: {
      mkDerivation {
        pname = "refh";
        version = "0.1.1";
-       sha256 = "1fhvn4cjfq92hi422mcdq4xwb405cc4pvlax0bqvyw3bg9ngqz9m";
+       sha256 = "357dfc6c7a6b70bff1025dd17d09630590c53bc18d5521488422612719b11bba";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -111035,7 +111369,7 @@ self: {
      mkDerivation {
        pname = "refined";
        version = "0.1.0.0";
-       sha256 = "0072zc4x8v6b8vdfgxnm1k6hbhzvf1m4cdb65v8df3qngb603r5n";
+       sha256 = "b6e401cc7a160fd7d02e6635466a70fbc305cd0cd5f6e7da46cb6cd409fbe200";
        libraryHaskellDepends = [ base base-prelude template-haskell ];
        homepage = "https://github.com/nikita-volkov/refined";
        description = "Refinement types with static and runtime checking";
@@ -111047,7 +111381,7 @@ self: {
      mkDerivation {
        pname = "reflection";
        version = "2";
-       sha256 = "1hlrji6wyqr892a78px7wilhywyiqdfdmnr7zp4c641qks4rw6gf";
+       sha256 = "ee199e899e3810c3c8fd27dbda5cc3d1730f69e4a75f7494482863cf4d9499c2";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/reflection";
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
@@ -111060,7 +111394,7 @@ self: {
      mkDerivation {
        pname = "reflection-extras";
        version = "0.1.1.0";
-       sha256 = "1cnqd8hrcvjvcdrida0q3dxkkmp36qsfqhv0a5zr94b1y5zfrj4k";
+       sha256 = "93c8ec7ef16191947f516043ec3436e3d6397b1b18a81673635b6e96216ad8b2";
        libraryHaskellDepends = [
          aeson base constraints lens reflection tagged
        ];
@@ -111076,7 +111410,7 @@ self: {
      mkDerivation {
        pname = "reflection-without-remorse";
        version = "0.9.5";
-       sha256 = "1iz4k42hc8f11a6kg2db847zmq5qpfiwns1448s62jswc2xm0x0r";
+       sha256 = "197450bb605c4b6134222468cba3bbb8e0fa0f41ab89378d0ac121060599e4c7";
        libraryHaskellDepends = [ base type-aligned ];
        homepage = "https://github.com/atzeus/reflection-without-remorse";
        description = "Efficient free and operational monads";
@@ -111092,7 +111426,7 @@ self: {
      mkDerivation {
        pname = "reflex";
        version = "0.3";
-       sha256 = "1aw4pz0y0rpf7klsb232q0zi4zqcpkwrw0s3zrkq5iyhzaswfnyd";
+       sha256 = "cd5bc7b5fad0c78267fe43039ef9bc0c7f123fc06288a5e93cee66e0c1bf84ab";
        libraryHaskellDepends = [
          base containers dependent-map dependent-sum exception-transformers
          mtl primitive ref-tf semigroups template-haskell these transformers
@@ -111117,7 +111451,7 @@ self: {
      mkDerivation {
        pname = "reflex-dom";
        version = "0.2";
-       sha256 = "1pc6mz9c6nr4s5b2mhlyxjzzffh85cv1bgvyycmq04s6dmg0ndgx";
+       sha256 = "fd350b5e6d4613802bf37ebf15362b083af7bfec9ec22a56d1245bc3d2af86dd";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-default
          dependent-map dependent-sum dependent-sum-template directory
@@ -111138,7 +111472,7 @@ self: {
      mkDerivation {
        pname = "reflex-dom-contrib";
        version = "0.1";
-       sha256 = "1xqw1i5wldfamjyav7fbw3001hdnbj4x3phlr216ybw3ndxrjklc";
+       sha256 = "8c4e997bb3832f6f82c814ded1895cb6c100c0e0cb9dadbcacca35ca4b0c1cf7";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-default ghcjs-base
          ghcjs-dom http-types lens mtl readable reflex reflex-dom
@@ -111157,7 +111491,7 @@ self: {
      mkDerivation {
        pname = "reflex-gloss";
        version = "0.1.0.2";
-       sha256 = "18sbqryf6kxadgbvr6nh0f07897fq9fjj0h2w07xcdpp1ygg1nfg";
+       sha256 = "cfd9f09e0ff736d60fe00202295dc2ee24748003d09abcd76baa4fe37cc64ba3";
        libraryHaskellDepends = [
          base dependent-sum gloss reflex transformers
        ];
@@ -111171,7 +111505,7 @@ self: {
      mkDerivation {
        pname = "reform";
        version = "0.2.7";
-       sha256 = "0jjbcc88ffv6nqj0jbgb54bin0k5hh4w1i44xh3vdv00s7aj3abm";
+       sha256 = "75a921d5d100ecb607ec84c4c0098465021b1729eb2d0924b6663b8710634b4a";
        libraryHaskellDepends = [ base containers mtl text ];
        homepage = "http://www.happstack.com/";
        description = "reform is an HTML form generation and validation library";
@@ -111183,7 +111517,7 @@ self: {
      mkDerivation {
        pname = "reform-blaze";
        version = "0.2.4";
-       sha256 = "124hvgjhb2x6769qnwwjw30qmramh54pmggpqmj0dc8m473psfjy";
+       sha256 = "5e3a7dc72115b10664c5f7bd7a498155e58ac1e092738b9339a68b05e5db9088";
        libraryHaskellDepends = [
          base blaze-html blaze-markup reform text
        ];
@@ -111197,7 +111531,7 @@ self: {
      mkDerivation {
        pname = "reform-hamlet";
        version = "0.0.4";
-       sha256 = "1f8rh9wiax6g7kh1j0j2zmqr7n1ll9ijn2xqp1shhsq8vp30f8fg";
+       sha256 = "cf2107c6dd086b0875b8b80b2b63a234d89371fd420219e03ccf7415798219b9";
        libraryHaskellDepends = [
          base blaze-markup reform shakespeare text
        ];
@@ -111214,7 +111548,7 @@ self: {
      mkDerivation {
        pname = "reform-happstack";
        version = "0.2.5";
-       sha256 = "12asmp1bklk33rpbhwhpbvmnkssjll92l47qxywibnpdf0zc6xsc";
+       sha256 = "4c77c33e70edda15b9eff8102a12a552eb69eb5e1772b86e1e63d2b9c2ad5a89";
        libraryHaskellDepends = [
          base bytestring happstack-server mtl random reform text utf8-string
        ];
@@ -111228,7 +111562,7 @@ self: {
      mkDerivation {
        pname = "reform-hsp";
        version = "0.2.6";
-       sha256 = "0aigsrax7s5ys0w2kd52jqi3453q81f4yp6c1s84a383yqndyq1j";
+       sha256 = "3260df2cf6030d45900ecc5c4f5c407814322296a2b42938d0bee8d355d62f2a";
        libraryHaskellDepends = [ base hsp hsx2hs reform text ];
        homepage = "http://www.happstack.com/";
        description = "Add support for using HSP with Reform";
@@ -111242,7 +111576,7 @@ self: {
      mkDerivation {
        pname = "regex-applicative";
        version = "0.3.2.1";
-       sha256 = "19swnf6mqjxg7d1wxr4h9drjm51af4hj4ax712n8702xfvfb4jmz";
+       sha256 = "bf4ab2dc765d8083ac08a72b2221712a942a734b90e4ce433baf4b5c8db35ca7";
        libraryHaskellDepends = [ base containers transformers ];
        testHaskellDepends = [
          base containers smallcheck tasty tasty-hunit tasty-smallcheck
@@ -111253,12 +111587,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "regex-applicative-text" = callPackage
+    ({ mkDerivation, base, regex-applicative, text }:
+     mkDerivation {
+       pname = "regex-applicative-text";
+       version = "0.1.0.0";
+       sha256 = "6f01deddcbba44441b12f7b4048e143f938a65e0c518f0c211e530a661a632d7";
+       libraryHaskellDepends = [ base regex-applicative text ];
+       homepage = "https://github.com/phadej/regex-applicative-text#readme";
+       description = "regex-applicative on text";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "regex-base" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, mtl }:
      mkDerivation {
        pname = "regex-base";
        version = "0.93.2";
-       sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10";
+       sha256 = "20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278";
        libraryHaskellDepends = [ array base bytestring containers mtl ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
@@ -111270,7 +111616,7 @@ self: {
      mkDerivation {
        pname = "regex-compat";
        version = "0.95.1";
-       sha256 = "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m";
+       sha256 = "d57cb1a5a4d66753b18eaa37a1621246f660472243b001894f970037548d953b";
        libraryHaskellDepends = [ array base regex-base regex-posix ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
@@ -111282,7 +111628,7 @@ self: {
      mkDerivation {
        pname = "regex-compat-tdfa";
        version = "0.95.1.4";
-       sha256 = "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg";
+       sha256 = "4fa38ed24ae390eeffe6eef04bbe632d7ecd02b9123729e976e7420f927520dd";
        libraryHaskellDepends = [ array base regex-base regex-tdfa ];
        homepage = "http://hub.darcs.net/shelarcy/regex-compat-tdfa";
        description = "Unicode Support version of Text.Regex, using regex-tdfa";
@@ -111297,7 +111643,7 @@ self: {
      mkDerivation {
        pname = "regex-deriv";
        version = "0.0.4";
-       sha256 = "0anj0az7q3fzdxknc83vci3nm5w0wj54w77xz2jphcbmn9ix9s4c";
+       sha256 = "8ce8d463b2753178a5f8fd1c4e8ae480976a47647b2066676fdf0d7cbe02d22a";
        libraryHaskellDepends = [
          base bitset bytestring containers deepseq dequeue ghc-prim hashable
          hashtables mtl parallel parsec regex-base
@@ -111313,7 +111659,7 @@ self: {
      mkDerivation {
        pname = "regex-dfa";
        version = "0.91";
-       sha256 = "1f846d86wg7yha29qinchpi3r5gv9795f384pqahbyc13wfky7dp";
+       sha256 = "b71d3f1d1f81f90515be040d57d249fb953ce285cc469c8482fe3c6e503304b9";
        libraryHaskellDepends = [ base mtl parsec regex-base ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
@@ -111328,7 +111674,7 @@ self: {
      mkDerivation {
        pname = "regex-easy";
        version = "0.1.0.0";
-       sha256 = "1062h3zd0bxak7rins7kk8n95ic04z5l9zqhg22h0iq5csapllf9";
+       sha256 = "c9517a9566054700857810ff44cb2780c5922c9af3681bf399aa2fd0fe80c280";
        libraryHaskellDepends = [
          array base bytestring regex-pcre string-conversions
        ];
@@ -111344,7 +111690,7 @@ self: {
      mkDerivation {
        pname = "regex-genex";
        version = "0.6.2";
-       sha256 = "1816zmlh1bmxykvjp1q2viqckjvcj2g9b11ggz31ja5xi2mwc9iq";
+       sha256 = "3826c6ab88bd2819c67f2f84959e906ccbc970dc02872bf7f4bdae0069fd26a0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111363,7 +111709,7 @@ self: {
      mkDerivation {
        pname = "regex-parsec";
        version = "0.90";
-       sha256 = "0zf5cr10mxlxxd8fp4q4ix6ibxc5xx3ml3k043kx28f9vfdh2xnx";
+       sha256 = "dd76019bdbc921d1e720600e5a47ef85f5154d8f0493eb50eb9df60a4266c57d";
        libraryHaskellDepends = [ base parsec regex-base ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
@@ -111378,7 +111724,7 @@ self: {
      mkDerivation {
        pname = "regex-pcre";
        version = "0.94.4";
-       sha256 = "1h16w994g9s62iwkdqa7bar2n9cfixmkzz2rm8svm960qr57valf";
+       sha256 = "8eaa7d4ac6c0a4ba35aa59fc3f6b8f8e252bb25a47e136791446a74752e226c0";
        libraryHaskellDepends = [
          array base bytestring containers regex-base
        ];
@@ -111393,7 +111739,7 @@ self: {
      mkDerivation {
        pname = "regex-pcre-builtin";
        version = "0.94.4.8.8.35";
-       sha256 = "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b";
+       sha256 = "0bd1b695de953ba4b6e6e0de007021c346cb2a6c8e09356fbcd34f8a79d2ea78";
        libraryHaskellDepends = [
          array base bytestring containers regex-base
        ];
@@ -111409,7 +111755,7 @@ self: {
      mkDerivation {
        pname = "regex-pderiv";
        version = "0.1.3";
-       sha256 = "1jh7ksv3cgsjd0f51yyrs2kvji1wyi9qk2ysavh3w34nkgyxmg55";
+       sha256 = "a5bcdafd9b960c3ee056da8b8953f43c44b9a7d0d9fb501c68523f36b69e07ca";
        libraryHaskellDepends = [
          base bitset bytestring containers deepseq ghc-prim mtl parallel
          parsec regex-base
@@ -111425,7 +111771,7 @@ self: {
      mkDerivation {
        pname = "regex-posix";
        version = "0.95.2";
-       sha256 = "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an";
+       sha256 = "56019921cd4a4c9682b81ec614236fea816ba8ed8785a1640cd66d8b24fc703e";
        libraryHaskellDepends = [
          array base bytestring containers regex-base
        ];
@@ -111441,7 +111787,7 @@ self: {
      mkDerivation {
        pname = "regex-posix-unittest";
        version = "1.1";
-       sha256 = "0kcxsdn5lgmpfrkpkygr54jrnjqd93b12shb00n6j00rg7p755vx";
+       sha256 = "7d9772ee791900692c000b6a11d6480d4b9b2529f9f9796776b73e5a6cd39d4d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -111458,7 +111804,7 @@ self: {
      mkDerivation {
        pname = "regex-tdfa";
        version = "1.2.0";
-       sha256 = "00gl9sx3hzd83lp38jlcj7wvzrda8kww7njwlm1way73m8aar0pw";
+       sha256 = "fc82ac14aae378c543a55cdac3f944aae5bff9918c4a342e1da87d38ba4ef401";
        revision = "1";
        editedCabalFile = "5489b69b9f0e8e181ee5134fd500bb0e2b4f914234c5223c59186035fb50478e";
        libraryHaskellDepends = [
@@ -111476,7 +111822,7 @@ self: {
      mkDerivation {
        pname = "regex-tdfa-rc";
        version = "1.1.8.3";
-       sha256 = "1vi11i23gkkjg6193ak90g55akj69bhahy542frkwb68haky4pp3";
+       sha256 = "e35ee2a782c82c3eb313a478a8e04a464e55ca0369aa91827972ce37440c21ee";
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
@@ -111490,7 +111836,7 @@ self: {
      mkDerivation {
        pname = "regex-tdfa-text";
        version = "1.0.0.2";
-       sha256 = "1p17xv3j2xd74iilyqwlqhkmyp26asq4k1pb0h2f0wdqqfr87bfd";
+       sha256 = "cdad83b2c3b871e00404eb8649b056465c5f27c494634f6324a77521c7ee27dc";
        revision = "2";
        editedCabalFile = "4b0e54f79540143c88adb071ea8e0aa3734a625db026a6a44ca2ef45b870b07c";
        libraryHaskellDepends = [ array base regex-base regex-tdfa text ];
@@ -111505,7 +111851,7 @@ self: {
      mkDerivation {
        pname = "regex-tdfa-unittest";
        version = "1.1";
-       sha256 = "1b9cca3l46qxvc5ck3z27dg6w1888pabkk0q752bzjqr3fc4nidc";
+       sha256 = "ac454b981b19cbbf443918ccb9d44508056e5e3be28fc90adb1d1b4287622cad";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -111522,7 +111868,7 @@ self: {
      mkDerivation {
        pname = "regex-tdfa-utf8";
        version = "1.0";
-       sha256 = "0i5di03v9dsvvhz8mdfx5qba8zcpim0fpx1cjg9gvz4gh0yhqf4k";
+       sha256 = "93380c3d808ffcfdd2932cf4eb408d977da4162eddb58a3edc5bb7b40788ad44";
        libraryHaskellDepends = [
          array base bytestring regex-base regex-tdfa utf8-string
        ];
@@ -111536,7 +111882,7 @@ self: {
      mkDerivation {
        pname = "regex-tre";
        version = "0.91";
-       sha256 = "1b7x0y8q1fvipnzh06by48f8l9l5ypm6yblpl35fzf641z3m9b7j";
+       sha256 = "f2ac54c70fc4b8efcaa0972e6feaf585268a1c227e1900bfbd71bb809107fdac";
        libraryHaskellDepends = [ base regex-base ];
        librarySystemDepends = [ tre ];
        homepage = "http://sourceforge.net/projects/lazy-regex";
@@ -111550,7 +111896,7 @@ self: {
      mkDerivation {
        pname = "regex-xmlschema";
        version = "0.1.5";
-       sha256 = "1dmhvnz6sj80kdnm2v7n0lvx8g9arhf9pqqzkn0rwzfhr2by0ss4";
+       sha256 = "446be097c8d07d9e819d1fe39b1ccc2a3dd43705f66c516d9b00496dbeddb0b6";
        libraryHaskellDepends = [ base haskell98 parsec ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
@@ -111566,7 +111912,7 @@ self: {
      mkDerivation {
        pname = "regexchar";
        version = "0.9.0.12";
-       sha256 = "1f1yb3h43pr38c7j3zs2jmph33arc828q1hbsmlz2xh4krdrc0vc";
+       sha256 = "6c03965b9e0476f169d50b068c0462598d016f9542ff210f4323df41e0583eb8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111585,7 +111931,7 @@ self: {
      mkDerivation {
        pname = "regexdot";
        version = "0.11.1.1";
-       sha256 = "1nrbqlxlkppi6q7w7ypq47saskxdx9a127dcwkl2azzz5082yf8j";
+       sha256 = "12392f1028ff7f25e8e4ac1d1154eaad4fadf421f8fac30f36f1de493bc52bdb";
        libraryHaskellDepends = [ base deepseq parallel parsec toolshed ];
        homepage = "http://functionalley.eu";
        description = "A polymorphic, POSIX, extended regex-engine";
@@ -111599,7 +111945,7 @@ self: {
      mkDerivation {
        pname = "regexp-tries";
        version = "0.2";
-       sha256 = "16spdq22dsblksvpd85cm6bmjd9053znphw6na1iy9pkmc491v1l";
+       sha256 = "34ec9008abf3261f83b286c36bff2820355997a9aca076b79e74e926046e579b";
        libraryHaskellDepends = [
          base containers derive-trie template-haskell weighted-regexp
        ];
@@ -111615,7 +111961,7 @@ self: {
      mkDerivation {
        pname = "regexpr";
        version = "0.5.4";
-       sha256 = "0136wp6hrnmj6pbdhp3a131dzz8bp1pbd92bpagpv1r6gwj16y5z";
+       sha256 = "bf7813247f26877d9fba4ba4b66eb80bfddfc2086a5cd8d635b2da0ccde56604";
        libraryHaskellDepends = [ base HUnit mtl mtlparse ];
        homepage = "http://homepage3.nifty.com/salamander/second/projects/regexpr/";
        description = "regular expression like Perl/Ruby in Haskell";
@@ -111627,7 +111973,7 @@ self: {
      mkDerivation {
        pname = "regexpr-symbolic";
        version = "0.5";
-       sha256 = "1cpwvb5mmcaqwy617m6cr25pcb4v4yxwzxng82bcrwkhjfdklsdr";
+       sha256 = "b9693a9b9370f2cc9640cff6cfbb279b2c768bc8ccd4138ce758b15acbdafcb2";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://sulzmann.blogspot.com/2008/12/equality-containment-and-intersection.html";
@@ -111640,7 +111986,7 @@ self: {
      mkDerivation {
        pname = "regexqq";
        version = "0.6";
-       sha256 = "10vh4i7q9vf6b716hf2i9pv1dy6vlyrh8bybqh91i704a55m40f3";
+       sha256 = "c301524b51049c1812c4cb2f04b3a7dbf816f64d513868c259c6ed844f247083";
        libraryHaskellDepends = [
          base bytestring pcre-light template-haskell
        ];
@@ -111656,7 +112002,7 @@ self: {
      mkDerivation {
        pname = "regional-pointers";
        version = "0.7";
-       sha256 = "1v71k64is86yc19n96062wl8f382xna1vnm0spcmr9jx6x3wyqv2";
+       sha256 = "6263cf47375da65cd9d5a0da1d94ed020d8728170698645360de201d8999e1ec";
        libraryHaskellDepends = [
          base base-unicode-symbols regions transformers
        ];
@@ -111674,7 +112020,7 @@ self: {
      mkDerivation {
        pname = "regions";
        version = "0.11";
-       sha256 = "1l4wi4vziw0d0vaagbknf8bsvh4irqxls6qbhcg8ngpn62a0fa7p";
+       sha256 = "f728079430f63e8b1e830b1b4d3bce91c0ad177276aea7d4060df0f837899cd0";
        libraryHaskellDepends = [
          base base-unicode-symbols monad-control transformers
        ];
@@ -111692,7 +112038,7 @@ self: {
      mkDerivation {
        pname = "regions-monadsfd";
        version = "0.3.1.3";
-       sha256 = "13xyigw1f92bzppqrl96wbz36j9cwrsaxdb2vkg8sjjvnirly3h9";
+       sha256 = "090e4f73b45b4a8ddedc62b5ae74e62c4933fee226d18ceffd4b2417f88bbe8f";
        libraryHaskellDepends = [
          base-unicode-symbols monads-fd regions transformers
        ];
@@ -111709,7 +112055,7 @@ self: {
      mkDerivation {
        pname = "regions-monadstf";
        version = "0.3.1.7";
-       sha256 = "0r4fr3p2k4k8r1lw6la7h4al068xf5kzb8cgq5864rlkrgf53fxb";
+       sha256 = "abbb51dccb93666250c18fa1f567711d194015814751c369c8689229eec88e64";
        libraryHaskellDepends = [
          base-unicode-symbols monads-tf regions transformers
        ];
@@ -111725,7 +112071,7 @@ self: {
      mkDerivation {
        pname = "regions-mtl";
        version = "0.3.1.7";
-       sha256 = "1s0sr42k1kmwgmrnj5zcan0j9br8xrrm1vdnj6yhliqdfz41ifc0";
+       sha256 = "80b918c8770d470abd91b6ed5073ee28af248155ec1769737dbcce3005c91ae8";
        libraryHaskellDepends = [ base-unicode-symbols mtl regions ];
        jailbreak = true;
        homepage = "https://github.com/basvandijk/regions-mtl/";
@@ -111739,7 +112085,7 @@ self: {
      mkDerivation {
        pname = "regress";
        version = "0.1.1";
-       sha256 = "00b4n4gw5y0mpayb0zlkvz91nfrpbspz22kqhpvdnxbb4zcz7pnj";
+       sha256 = "d2def3d9276b75dbf685780af1af5e373b1bd2df937eb0bcba15f8c21fb16401";
        libraryHaskellDepends = [ ad base vector ];
        homepage = "https://github.com/alpmestan/regress";
        description = "Linear and logistic regression through automatic differentiation";
@@ -111751,7 +112097,7 @@ self: {
      mkDerivation {
        pname = "regular";
        version = "0.3.4.4";
-       sha256 = "112n3j27ac9lzs0lc3q12r6wmpkmfgdalv18h1qklhd5nh4j9wl5";
+       sha256 = "85f22409b4a5413a7180286caada7375deca4d16010f4681fe343175841c5684";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generic programming library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
@@ -111762,7 +112108,7 @@ self: {
      mkDerivation {
        pname = "regular-extras";
        version = "0.2.3";
-       sha256 = "0x1sbps0ccwpvf6fx1jnbjxylqsvvfzkkynliip9jyh6gkhm44vx";
+       sha256 = "7d1352e17c067a996e8cd4fa39bfdb5b63eabb5c5686ee8cdb973306f45d3a74";
        libraryHaskellDepends = [ base binary deepseq QuickCheck regular ];
        jailbreak = true;
        description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put";
@@ -111777,7 +112123,7 @@ self: {
      mkDerivation {
        pname = "regular-web";
        version = "0.1.1";
-       sha256 = "0f4lsly4497p7szibasin27hf2xy5cs8gp87vsbg6mlkk07bvysz";
+       sha256 = "5ffbbd0e989356f396de07dd87342bbe0b078fb051ab15bf3ef724423cd59438";
        libraryHaskellDepends = [
          applicative-extras base fclabels formlets json mtl regular xhtml
        ];
@@ -111793,7 +112139,7 @@ self: {
      mkDerivation {
        pname = "regular-xmlpickler";
        version = "0.2";
-       sha256 = "1qjx4xsidnpr2as3m2ir97ap5vc9cw6a0z332g53ifx9gskjli9f";
+       sha256 = "2e452aa77ea9bb38ca13637ca00c6789ed72d549398a3ab412f9da1675275de2";
        libraryHaskellDepends = [ base hxt regular text ];
        homepage = "http://github.com/silkapp/regular-xmlpickler";
        description = "Generic generation of HXT XmlPickler instances using Regular";
@@ -111805,7 +112151,7 @@ self: {
      mkDerivation {
        pname = "reheat";
        version = "0.1.5";
-       sha256 = "0m6s6r2d39g3qkjylsrhixk9l9sb2jv0ihxwjn7b0wz7585g2bdv";
+       sha256 = "bb2df10a2ae773b08e95bcc308b6144b279a668f306beae5c4e3a5d14436da54";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory text vty vty-ui ];
@@ -111823,7 +112169,7 @@ self: {
      mkDerivation {
        pname = "rehoo";
        version = "0.3.1";
-       sha256 = "0pwmz1q2866yj8hxbvha4v1smhppkd3jsrrhbhmbxw137l54ijgf";
+       sha256 = "eec9480a3d23f0be2a5c30672d479bf7c2aac3260aeed52192de182470f8955f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -111841,7 +112187,7 @@ self: {
      mkDerivation {
        pname = "rei";
        version = "0.3.0.0";
-       sha256 = "03dd4miy0r2mkh603f1p7f93mgxqhfkz8gfk6b4macqcw5pvi3vf";
+       sha256 = "6e8fb86fe10c3355c932d33df4a783b8bf3a923b37b8010c9c5564e06325ad0d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -111859,7 +112205,7 @@ self: {
      mkDerivation {
        pname = "reified-records";
        version = "0.2.2";
-       sha256 = "0vg05idyiy3havw8rlsky7x4y34mpk6by9500r7rb921xgpdq70a";
+       sha256 = "0a1cdceeeb41a4954f06a024bfccbc950c4ffaf153d38cf85670f8e85b2ce06d";
        libraryHaskellDepends = [ base containers mtl ];
        jailbreak = true;
        homepage = "http://bitbucket.org/jozefg/reified-records";
@@ -111873,7 +112219,7 @@ self: {
      mkDerivation {
        pname = "reify";
        version = "0.1.1";
-       sha256 = "1bl4yv77i8c4w1y5lqr6b8xi1m4ym2phvdjwc9l95rx1vrxkqpk1";
+       sha256 = "615e3c7bdea1e79268625cb60dafa89ed4103b5a26635a7ce084a178cef684ae";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ghc ];
@@ -111890,7 +112236,7 @@ self: {
      mkDerivation {
        pname = "reinterpret-cast";
        version = "0.1.0";
-       sha256 = "1r2k2fyfm5lknfdfs282l274bgaxf4j4dikk4hpwchjbj0n64m2n";
+       sha256 = "5654622c904b42c62f2473c64624715dbd458ea00209ed9ab39396eabc1353e4";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [ base data-binary-ieee754 hspec loop ];
        homepage = "https://github.com/nh2/reinterpret-cast";
@@ -111903,7 +112249,7 @@ self: {
      mkDerivation {
        pname = "relacion";
        version = "0.1";
-       sha256 = "1jq3ii9j8s7q8fr7ac2pdr2l33jvzsyyq70cjd9q1spqa1v6k976";
+       sha256 = "e6a4697650f8ea8053930c1cecbdfe5b8e41456e573075b243f86824538c03cb";
        libraryHaskellDepends = [ array base containers ];
        homepage = "not available";
        description = "A relation data structure";
@@ -111915,7 +112261,7 @@ self: {
      mkDerivation {
        pname = "relation";
        version = "0.2.1";
-       sha256 = "03h6l8v3ppxbwg9ddgg121yx3i2v4vbcpwrv1vg3mgbw5pwq7x4c";
+       sha256 = "8cf483f92d7cbd3ade0e3bf3cbd6265bc4d17d10e1bdd6d2e3abdf3b36a2060e";
        libraryHaskellDepends = [ array base containers groom ];
        jailbreak = true;
        homepage = "https://www.github.com/d-day/relation/";
@@ -111931,7 +112277,7 @@ self: {
      mkDerivation {
        pname = "relational-postgresql8";
        version = "0.1.0.0";
-       sha256 = "1fmgb7qbcbyr5simy5x6fqnib3v3cq0vsz9i720snszs7a2k1z8f";
+       sha256 = "0efd30853afa6bab8138317dbd0166638f152d76a6175fa32ed92fb6f059afba";
        libraryHaskellDepends = [
          base containers HDBC names-th persistable-record relational-query
          relational-query-HDBC template-haskell time
@@ -111949,7 +112295,7 @@ self: {
      mkDerivation {
        pname = "relational-query";
        version = "0.5.1.1";
-       sha256 = "1gs2ip483paqw01wipd5x5vf27l1w887dv7ah0icgjshwg84ff1p";
+       sha256 = "373847d0e350cbc72280eaec7610e2811ee176e9a5ddc803e058dd81c88d42bf";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -111971,7 +112317,7 @@ self: {
      mkDerivation {
        pname = "relational-query-HDBC";
        version = "0.1.0.0";
-       sha256 = "1r5lj96w8cqcmma2kh46g8xyw0zz161nv1h9bwqia21vvis396vj";
+       sha256 = "729b3474dc3b0815315f09866d8309ff03ee3b7a86c02954ad0c33c44d92b4e4";
        libraryHaskellDepends = [
          base containers convertible HDBC HDBC-session names-th
          persistable-record relational-query relational-schemas
@@ -111987,7 +112333,7 @@ self: {
      mkDerivation {
        pname = "relational-record";
        version = "0.1.2.0";
-       sha256 = "00cb3yb4gin6kq7yz3jbkhm372z3vhq97h2l1xk0xja8xi8mfhn6";
+       sha256 = "c6425751ec48c90e660f54c09330dce38b332a9c4b8eef0f9ec6c647961f8b01";
        libraryHaskellDepends = [
          base relational-query relational-query-HDBC
        ];
@@ -112004,7 +112350,7 @@ self: {
      mkDerivation {
        pname = "relational-record-examples";
        version = "0.2.0.2";
-       sha256 = "0jpzn739xl1ylz6aja1czvkg4gjbgkag56pcja31mfx9xiv5jnmf";
+       sha256 = "ae5a5976eca9bb1a8692ec9af2d47c4b3ef2e6fe2c28a9cca73ed09ec6b1ff4a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -112022,7 +112368,7 @@ self: {
      mkDerivation {
        pname = "relational-schemas";
        version = "0.1.0.2";
-       sha256 = "1267bv92z2k8s2cmn8sgw0i0vs3y2m8jyvnv969v15lrpsid1vvw";
+       sha256 = "7cefd0a2be9996b09349db6e2f51157ee80d22e04f235b99d0688a2fd25ec788";
        libraryHaskellDepends = [
          base bytestring containers persistable-record relational-query
          template-haskell time
@@ -112038,7 +112384,7 @@ self: {
      mkDerivation {
        pname = "relative-date";
        version = "0.0.1";
-       sha256 = "052rk17flm5zp70wcl7ki3ys47hnaa2d5c1vjsap7bfkcg4lff66";
+       sha256 = "c63847c963d3ad7395963bb0d28452161ea2fd88f350c6c1b9bf54ea4e985914";
        libraryHaskellDepends = [
          base concatenative datetime mtl parsec time
        ];
@@ -112052,7 +112398,7 @@ self: {
      mkDerivation {
        pname = "relit";
        version = "0.1.3";
-       sha256 = "03cnra0yfpijp65p1x0wv4fvc1p1l27lcb00k22ijrcy2mxqr9cg";
+       sha256 = "8fa58c7b159e65198598002c468fa0e106b61dd91cf4708bb9325ee781ca960d";
        libraryHaskellDepends = [ base regex-base template-haskell ];
        description = "Literal for regular expression";
        license = stdenv.lib.licenses.bsd3;
@@ -112063,7 +112409,7 @@ self: {
      mkDerivation {
        pname = "rematch";
        version = "0.2.0.0";
-       sha256 = "0law4al9hzn9qljfm8rwgmb15pzpcs8i44v1l6279977q0lxx5pr";
+       sha256 = "f996de29c0e7a47484a16113129166f7df12567d3ca3ea24c5c97e98a8225c51";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "A simple api for matchers";
@@ -112075,7 +112421,7 @@ self: {
      mkDerivation {
        pname = "rematch-text";
        version = "0.1.0.2";
-       sha256 = "0q8jf7128360waq6k369ykp0hfjwydkm7f8ykwzd8xflmgfiywfd";
+       sha256 = "cd711fddabd475d43e9f1eb95367f35c3a08eef4c98c69b0e2c00c24c2711261";
        libraryHaskellDepends = [ base rematch text ];
        testHaskellDepends = [ base hspec HUnit rematch text ];
        description = "`rematch` matchers for Data.Text";
@@ -112090,7 +112436,7 @@ self: {
      mkDerivation {
        pname = "remote";
        version = "0.1.1";
-       sha256 = "14awzhpc21pp4iq53vz4ib81ygxsnlnfppv723zy77z6jja08gf0";
+       sha256 = "c03d049494e69fe3ff1067dfeb2cb5ba3f1fd08ae4ef517024f706c12efc5c91";
        libraryHaskellDepends = [
          base binary bytestring containers directory filepath mtl network
          pureMD5 stm syb template-haskell time utf8-string
@@ -112105,7 +112451,7 @@ self: {
      mkDerivation {
        pname = "remote-debugger";
        version = "0.2.2";
-       sha256 = "1c6xh390963hk7q2qvhqb6yma5ma7hk39nxjikizwh7s2h9vi9k4";
+       sha256 = "64a6b81314fa40fee38cb2db34263caa1655bd59186e2cf099709804d280ddb0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -112129,7 +112475,7 @@ self: {
      mkDerivation {
        pname = "remotion";
        version = "0.2.0";
-       sha256 = "0m7x5i00i6ai39yii6h5vzlsp1rnmprmddqllqja57kdy3q7v7na";
+       sha256 = "ca9e7df0f06d9ea224a614b756f3ad3687abe9df059a187d1a519908402cfd54";
        libraryHaskellDepends = [
          async base bytestring concurrent-extra containers directory errors
          filelock hashable hashtables lifted-async loch-th monad-control mtl
@@ -112157,7 +112503,7 @@ self: {
      mkDerivation {
        pname = "reord";
        version = "0.0.0.2";
-       sha256 = "07lxnfj0q565ydjzgcnb9dhjlrs7s1h6ybam7aic68lfd4p0hr7y";
+       sha256 = "fe64082e698e22c3a23a552d6f60d047672a614bcbb2f765f3c5140ca4b39d1e";
        libraryHaskellDepends = [ base ];
        description = "Ad-hoc Ord instances";
        license = stdenv.lib.licenses.publicDomain;
@@ -112170,7 +112516,7 @@ self: {
      mkDerivation {
        pname = "reorderable";
        version = "0.3.1";
-       sha256 = "1i81yran553jdsyx0bx5g72dg6v24yk3g6l40m1cd430f8yy8a6f";
+       sha256 = "ce28e43d726090c64205849a37a627629bd7c479a52fd0bd6e72946255f601c5";
        libraryHaskellDepends = [
          base constraints haskell-src-exts haskell-src-meta template-haskell
        ];
@@ -112187,7 +112533,7 @@ self: {
      mkDerivation {
        pname = "repa";
        version = "3.4.0.1";
-       sha256 = "197ab7z0fi50n3i8lkcxqazgnv39dv8dhndzihppsmfkil5y58l4";
+       sha256 = "84a2e20b8dd3557d2f8cbf59d8d06e696cfbbec29d4d8ae2b0a04407fe59eaa4";
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
@@ -112201,7 +112547,7 @@ self: {
      mkDerivation {
        pname = "repa-algorithms";
        version = "3.4.0.1";
-       sha256 = "0q8jwp1msg5icvcqxszh5c1190llwz17gxc7nmd1bkyca59j8w0l";
+       sha256 = "1470245351cccf155ab587f577c2e7948214022bf0eb8ed966b13c5dc3e51261";
        libraryHaskellDepends = [ base repa vector ];
        homepage = "http://repa.ouroborus.net";
        description = "Algorithms using the Repa array library";
@@ -112215,7 +112561,7 @@ self: {
      mkDerivation {
        pname = "repa-array";
        version = "4.1.0.1";
-       sha256 = "04bi2j2y5rrpkfzys6ma0d5fhsrapip0xb43gqsgcqz3rk89lank";
+       sha256 = "d32a9ad0cce363f6347e83ac0e6ebc2a6be84a03aa1aedbf9b37e7e285147111";
        libraryHaskellDepends = [
          base bytestring double-conversion mtl primitive repa-convert
          repa-eval repa-stream text vector
@@ -112232,7 +112578,7 @@ self: {
      mkDerivation {
        pname = "repa-bytestring";
        version = "3.0.0.1";
-       sha256 = "1q7kvm39iqabanrgyi438n8mfn1ikvpygralyakfc02rm2gpl0gb";
+       sha256 = "eb017a9fa85900e6a6f254e5e7ef9e31585791458344ffb2554be19846ddf3e0";
        libraryHaskellDepends = [ base repa ];
        jailbreak = true;
        homepage = "http://repa.ouroborus.net";
@@ -112248,7 +112594,7 @@ self: {
      mkDerivation {
        pname = "repa-convert";
        version = "4.2.0.1";
-       sha256 = "0y7xjcbrm2g3rgppb9lqbj4m1l7bvir12gjg11a18fkl1mzdh89l";
+       sha256 = "3421d87e0d743a1454084f3e1172dcebd050895c98a675efcbe3899a1793fd78";
        libraryHaskellDepends = [
          base bytestring double-conversion primitive repa-scalar vector
        ];
@@ -112262,7 +112608,7 @@ self: {
      mkDerivation {
        pname = "repa-devil";
        version = "0.3.2.6";
-       sha256 = "0f7xawg4qlfbf24lrjbpqzl3f3zf63f8g5b2gi17h0rpyw3cxhzy";
+       sha256 = "fec3ce06f7370378427c629587dc30ee0f37e8c777c94c8970cb514c1e57fd38";
        libraryHaskellDepends = [ base repa transformers ];
        librarySystemDepends = [ libdevil ];
        homepage = "https://github.com/RaphaelJ/repa-devil";
@@ -112275,7 +112621,7 @@ self: {
      mkDerivation {
        pname = "repa-eval";
        version = "4.0.0.1";
-       sha256 = "0vng0y835gma937q1996qghfzx06wabxf7ln8ckrwy5djzza8h9y";
+       sha256 = "3e41a4fe97ad789e2743961ed797e206f4efe0c326a580cf48aabe329007cf6e";
        libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "http://repa.ouroborus.net";
@@ -112290,7 +112636,7 @@ self: {
      mkDerivation {
        pname = "repa-examples";
        version = "3.4.0.1";
-       sha256 = "00v1z4kscvmnd4k7lsswzaxafkk7mbsy4ghdd503wpvr4fvslgaz";
+       sha256 = "5f3daab723795f3e40690d3ee2f5aa674ea7bafa5c6b7a2669b66ea627f96103";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -112309,7 +112655,7 @@ self: {
      mkDerivation {
        pname = "repa-fftw";
        version = "3.2.3.2";
-       sha256 = "0y05hjysf484nfdr2qs1mbs7znxi58q9f0kxfnkcbskijwxnj320";
+       sha256 = "400c693b9771eac5a6757d0297302ab1db7ff4aa4163919bb30411a7bd840578";
        libraryHaskellDepends = [ base carray fft repa storable-complex ];
        testHaskellDepends = [
          base repa tasty tasty-hunit tasty-quickcheck
@@ -112325,7 +112671,7 @@ self: {
      mkDerivation {
        pname = "repa-flow";
        version = "4.1.0.1";
-       sha256 = "0d3j4wc3f0rbxmmj2hq9m8m9hjnad6siard279xs7sd4qzwkcpg7";
+       sha256 = "e75d36f9c7a4e9a37b3aa26515b569ca4a982aaa0943216bed2b033718277234";
        libraryHaskellDepends = [
          base bytestring containers directory filepath primitive repa-array
          repa-eval repa-stream text vector
@@ -112344,7 +112690,7 @@ self: {
      mkDerivation {
        pname = "repa-io";
        version = "3.4.0.1";
-       sha256 = "06ks4gxsajnalxh9mpnl4pckxnyfc59823war3m74anb0pqcrbbl";
+       sha256 = "74adccf005cb2a72eac88a0f815261cedb3ed925d4de9a60a7ca4aa5fb237a1a";
        libraryHaskellDepends = [
          base binary bmp bytestring old-time repa vector
        ];
@@ -112358,7 +112704,7 @@ self: {
      mkDerivation {
        pname = "repa-linear-algebra";
        version = "0.1.0.0";
-       sha256 = "06lvp3sj6w4kvw6qhn5wcy2c2v7w15jaicw1pm14ssxhs4xl866g";
+       sha256 = "cf18443bd1b06b4d42bd81b3a86409fc6cc18467bc58880ddf937023f5b89b1a";
        libraryHaskellDepends = [ base hmatrix repa vector ];
        homepage = "https://github.com/marcinmrotek/repa-linear-algebra";
        description = "HMatrix operations for Repa";
@@ -112372,7 +112718,7 @@ self: {
      mkDerivation {
        pname = "repa-plugin";
        version = "1.0.0.1";
-       sha256 = "0s644rlk6sqz8sb2rwak42153xxsp5vjpqhlxnmbic0b7r67s8y9";
+       sha256 = "c9237d4c3e0bb0b8aaed14e22b77b9baf751822053f12c96461f6b336926c468";
        libraryHaskellDepends = [
          base containers ddc-base ddc-core ddc-core-flow ddc-core-simpl ghc
          mtl
@@ -112390,7 +112736,7 @@ self: {
      mkDerivation {
        pname = "repa-scalar";
        version = "4.2.0.1";
-       sha256 = "1mby4xa0i2jrzhiyvayif6bwxsmfz1ibvigxw8kwxjd5hqc0y6f6";
+       sha256 = "c6190f1886a5c9ce27e2fdc5bd62f8aeeace9771d1abed23fc598a0854277ed5";
        libraryHaskellDepends = [
          base bytestring double-conversion primitive vector
        ];
@@ -112404,7 +112750,7 @@ self: {
      mkDerivation {
        pname = "repa-series";
        version = "1.0.0.1";
-       sha256 = "1kldz4d4cv0vliqw78ywbcfgh0mw4i5cd93j0jdagvhsbhlxlp5k";
+       sha256 = "b35cda295c1aeea79a0472a4c64a24bc02f81c5bdca3c371a41b6c461af98dce";
        libraryHaskellDepends = [ base ghc ghc-prim vector ];
        jailbreak = true;
        description = "Series Expressionss API";
@@ -112419,7 +112765,7 @@ self: {
      mkDerivation {
        pname = "repa-sndfile";
        version = "3.2.3.3";
-       sha256 = "0pgrdhi7s1capainmd6hq1h8wjzppyr8fn93fzygwjpvnnhfggk8";
+       sha256 = "68bee7a0b5fb4afefc77235987b2bff74b8e60c0d0b46aa3ba8a057d226cf95d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hsndfile repa ];
@@ -112438,7 +112784,7 @@ self: {
      mkDerivation {
        pname = "repa-stream";
        version = "4.1.0.1";
-       sha256 = "17n48ixypx5a3anj212h4vxa6sqwk5yssjqyprb8lb3mnqfdlxmm";
+       sha256 = "b576da1cb6752c8a56be1e4bad7d991c6ba3fa26500421ad1aaaf4eb7b44c49e";
        libraryHaskellDepends = [ base mtl primitive vector ];
        jailbreak = true;
        homepage = "http://repa.ouroborus.net";
@@ -112453,7 +112799,7 @@ self: {
      mkDerivation {
        pname = "repa-v4l2";
        version = "0.2.0.0";
-       sha256 = "1d8spppfjbcb9smk735zxgpz1v1f5p1sm50nfzry68bdb1p29xnz";
+       sha256 = "dff6246e586d21e3f3771694aac32d2eecf0efebbf8c33ab4e8b2de9eebd1ab5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112472,7 +112818,7 @@ self: {
      mkDerivation {
        pname = "repl";
        version = "1.1";
-       sha256 = "0q9gk76r9n8gyn8fwqfmywbrjhyqy0gz8blmmvrvwghyfscabnh9";
+       sha256 = "09daa598761e3ebef3ae952ef41ff0d8439917f7d561ee90f50fd994cd992f61";
        libraryHaskellDepends = [
          base ghc ghc-paths haskell-src-exts parsec
        ];
@@ -112492,7 +112838,7 @@ self: {
      mkDerivation {
        pname = "repl-toolkit";
        version = "0.5.0.0";
-       sha256 = "0m0jh734zfmxc2bfilb1ka12y3nhsm94hxcg0q6wwf6bxkl564vq";
+       sha256 = "781353e8eccb38ce0d068f754852d5d00e2f829a61d1e89660bdba4fc6811254";
        libraryHaskellDepends = [
          aeson base bytestring data-default directory exceptions filepath
          functor-monadic ListLike listsafe monad-loops mtl numericpeano
@@ -112508,7 +112854,7 @@ self: {
      mkDerivation {
        pname = "repline";
        version = "0.1.4.0";
-       sha256 = "16qi3lpgymn61nssv9k21v889xszycimp6i5602llnry6ks77bij";
+       sha256 = "32ae73f4343e5b4a0530259a5b23f35ff784d00e62a6adb50dc656ff2e1d119b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers haskeline mtl ];
@@ -112526,7 +112872,7 @@ self: {
      mkDerivation {
        pname = "repo-based-blog";
        version = "0.0.1";
-       sha256 = "0ada0xqpkp6ch71sizf8fscvz6rjq95asmfgdvg8jj8gwpzvlncs";
+       sha256 = "9a59baffe50f4989de6ecf55ad4ac2329bbf9976c8fda8c381ccdc797107aa29";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112553,7 +112899,7 @@ self: {
      mkDerivation {
        pname = "repr";
        version = "0.4.1.3";
-       sha256 = "1y1zl81yjc9jrci83bm6bn8hrfqf6x25vxzkhrkydhhwcwqfqaj5";
+       sha256 = "452aec30671cc2e66786f3f75d44370ebb0c915da6ae8122cb3231e903a23ff8";
        libraryHaskellDepends = [
          base base-unicode-symbols dstring random string-combinators
        ];
@@ -112569,7 +112915,7 @@ self: {
      mkDerivation {
        pname = "repr-tree-syb";
        version = "0.1.0";
-       sha256 = "1kpxfvbmfv3zhn0fx7fznnppqxjz2f70g5n89hzkiqjz2am0ls5s";
+       sha256 = "ba680aaa125fe2383f4cc896078e135f767cafb5df9dee80857f6c57d776fdce";
        libraryHaskellDepends = [ base containers syb text ];
        jailbreak = true;
        homepage = "https://github.com/nikita-volkov/repr-tree-syb";
@@ -112585,7 +112931,7 @@ self: {
      mkDerivation {
        pname = "representable-functors";
        version = "3.2.0.2";
-       sha256 = "156rhm9hqxkwpv4ppg6647gz2q95mp61rx6ii0nk6i0ygmjvw1l2";
+       sha256 = "8206be657d1e44332d88d1f41cccad2561f1df21c6bc7bc9be7c760c5385d994";
        libraryHaskellDepends = [
          array base comonad comonad-transformers comonads-fd containers
          contravariant distributive free keys mtl semigroupoids semigroups
@@ -112603,7 +112949,7 @@ self: {
      mkDerivation {
        pname = "representable-profunctors";
        version = "3.2";
-       sha256 = "0bly94xix00krgl7iaxwb0l0bvykrm0zqz57m78p8j7pdmkr89wc";
+       sha256 = "8c2794676df74874d1a9a77cfc41cdd3ef052858bcab78e8cb13801e3b499e2e";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/representable-profunctors/";
        description = "This package has been absorbed into profunctor-extras";
@@ -112619,7 +112965,7 @@ self: {
      mkDerivation {
        pname = "representable-tries";
        version = "3.0.2";
-       sha256 = "07qjm04xf9qndyybph4mhjp65yjvz54pia4y8kj7wps75gjail2m";
+       sha256 = "55d0a8e42b475f7ee4449ea87849f95bfa62ae8495c0bbbc6f1627d709a8121f";
        libraryHaskellDepends = [
          adjunctions base bifunctors comonad comonad-transformers containers
          distributive keys mtl representable-functors semigroupoids
@@ -112637,7 +112983,7 @@ self: {
      mkDerivation {
        pname = "request-monad";
        version = "0.3.0.1";
-       sha256 = "1aqcsm9a3zd11k7d4nbvxsy7l35fr77z7gyhrl7rvflnixid29ws";
+       sha256 = "9a27d1628f96ba9d0fcdd0bff3cfc9ae0c7abcee7b59d2ce0ca1fda152d50cab";
        libraryHaskellDepends = [ base free mtl transformers ];
        jailbreak = true;
        homepage = "http://github.com/nahiluhmot/request-monad";
@@ -112653,7 +112999,7 @@ self: {
      mkDerivation {
        pname = "reroute";
        version = "0.3.0.2";
-       sha256 = "14xkkcgqbg7bddln849h2k0xrrj9hfvw2ikai81snz7dsf3mcnb8";
+       sha256 = "68595687d3ed7cab038a6a46c1b78349e6dcc114301164696bebbc851f9bb393";
        libraryHaskellDepends = [
          base deepseq graph-core hashable hvect mtl path-pieces regex-compat
          text transformers unordered-containers vector
@@ -112674,7 +113020,7 @@ self: {
      mkDerivation {
        pname = "reserve";
        version = "0.1.1";
-       sha256 = "152pngw3xrlyrq905a231hi9hg3pf5ddpcihwic496rng5hd5hj2";
+       sha256 = "42c2d26079369b4458e430b2db5a71773c98220c43a80212ce9ee63ef8b35794";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -112696,7 +113042,7 @@ self: {
      mkDerivation {
        pname = "resolve-trivial-conflicts";
        version = "0.3.0.2";
-       sha256 = "1d64hg2nwhqzm720w25xgb4wv2akg0kv3iwwh2ivc57zp525xpcq";
+       sha256 = "98dd5e44b9ff14b6a3809cc7b127785389cdc97abd080ec4a91f436ec583c4b4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -112715,7 +113061,7 @@ self: {
      mkDerivation {
        pname = "resource-effect";
        version = "0.1.1";
-       sha256 = "085ila27irk7pflx4kgn1p364wx2hj9wlm2lvdq0ix25hv8afxnb";
+       sha256 = "cb76a7d08645f40870db5454ca9384a27362c60df64dd2a9bb67e67884a2b120";
        libraryHaskellDepends = [ base containers extensible-effects ];
        testHaskellDepends = [
          base containers extensible-effects HUnit mtl QuickCheck
@@ -112732,7 +113078,7 @@ self: {
      mkDerivation {
        pname = "resource-embed";
        version = "0.1.0.0";
-       sha256 = "1i33z3rr72s5z2k6j5c10vjy7nslgfn3xqgwf8w05n9m2pwhn2fv";
+       sha256 = "db090bf91535d9023872fce13eac7b54dbe3e506811569a6f8458b93f3f863c4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring directory ];
@@ -112749,7 +113095,7 @@ self: {
      mkDerivation {
        pname = "resource-pool";
        version = "0.2.3.2";
-       sha256 = "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6";
+       sha256 = "8627eea2bea8824af2723646e74e2af0c73f583dd0c496c9fd242cd9d242bc12";
        libraryHaskellDepends = [
          base hashable monad-control stm time transformers transformers-base
          vector
@@ -112766,7 +113112,7 @@ self: {
      mkDerivation {
        pname = "resource-pool-catchio";
        version = "0.2.1.0";
-       sha256 = "0g9r6hnn01n3p2ikcfkfc4afh83pzam29zal3k2ivajpl3kramsw";
+       sha256 = "5c5795e7a057aa1dc51c54fd24aafa7720e814616e3a36a3b8c306602d34393d";
        libraryHaskellDepends = [
          base hashable MonadCatchIO-transformers stm time transformers
          transformers-base vector
@@ -112783,7 +113129,7 @@ self: {
      mkDerivation {
        pname = "resource-simple";
        version = "0.2";
-       sha256 = "0m6jdhnq0f9anjm9bqmz3v8d0k12nkp4nks7mvhw7hjbjnkgscni";
+       sha256 = "d132fda6954bc2c3e1ae474f4beeb4224cd0d01ebfe295aab42a39802d6cd254";
        libraryHaskellDepends = [
          base containers monad-control monad-fork mtl-evil-instances
          transformers transformers-base
@@ -112802,7 +113148,7 @@ self: {
      mkDerivation {
        pname = "resourcet";
        version = "1.1.6";
-       sha256 = "0zhsaaa4n8ry76vjih519a8npm2hrzk10d5asrgllcwpzmifl41y";
+       sha256 = "3e10ea62fd97334a5fd6aa3410e6cf50d46b914aa1c028b7393e234b94521a7e";
        libraryHaskellDepends = [
          base containers exceptions lifted-base mmorph monad-control mtl
          transformers transformers-base transformers-compat
@@ -112824,7 +113170,7 @@ self: {
      mkDerivation {
        pname = "respond";
        version = "1.1.0";
-       sha256 = "0j2xafk6rrspffmd0fxsmmz8gnmxxn3dxngh684nwj4030cg9m3r";
+       sha256 = "79d4f4181880486e0932f0d9de86edbdda877eadba3bd0aa7357e76ca6535d48";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112854,7 +113200,7 @@ self: {
      mkDerivation {
        pname = "rest-client";
        version = "0.5.0.3";
-       sha256 = "02lgdjn4800301w8cki2wyl65jzc4yp4gxrhz5lwv9jcy69gbkkb";
+       sha256 = "6bcef592f14ca6cd69f930f747ae27eccb62a8e7224e867800030044ac6c8f0a";
        libraryHaskellDepends = [
          aeson-utils base bytestring case-insensitive data-default
          exceptions http-conduit http-types hxt hxt-pickle-utils
@@ -112876,7 +113222,7 @@ self: {
      mkDerivation {
        pname = "rest-core";
        version = "0.36.0.5";
-       sha256 = "1xvhhj03kyv39w8s330gn3pxz4431xmcbiacf6y8a4d0nd6fw8qf";
+       sha256 = "0e23ee4cb3a01185bc714cc5c56a0f8390dfefb00f8ca1114f63fb39808470f7";
        libraryHaskellDepends = [
          aeson aeson-utils base bytestring case-insensitive errors fclabels
          hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random
@@ -112901,7 +113247,7 @@ self: {
      mkDerivation {
        pname = "rest-example";
        version = "0.2.0.2";
-       sha256 = "13mq7zhjwp57rials06kkj8aq400wapldl5mc35h1xynm396xmpi";
+       sha256 = "f1d66ed2a8d6f700cb60b5d046afe20010ac909cd3004d55cca75c2ee13fb88e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112929,7 +113275,7 @@ self: {
      mkDerivation {
        pname = "rest-gen";
        version = "0.17.1.2";
-       sha256 = "05imgbal0b6ab1i8b1896y1qm956ci7r0xx3qnkjbb6vxdl51vaa";
+       sha256 = "4aed5068ebdbac25a7c5a377904f64a6a48a83370985856258ca2c40d57a3516";
        libraryHaskellDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
@@ -112951,7 +113297,7 @@ self: {
      mkDerivation {
        pname = "rest-happstack";
        version = "0.2.10.8";
-       sha256 = "0n1rc1b9vdq83ilm2s9ac96jln89g0g0img1pwg991dbm30k3v7y";
+       sha256 = "feec31c1a8ab85941ebfe1d5081e7809592a4d622a6951691c08b79d56603958";
        libraryHaskellDepends = [
          base containers happstack-server mtl rest-core rest-gen utf8-string
        ];
@@ -112966,7 +113312,7 @@ self: {
      mkDerivation {
        pname = "rest-snap";
        version = "0.1.17.18";
-       sha256 = "0g8srn4b7nxyi98vn28q27li4mk7ypdgg9l66ba7z5h0bg8w2766";
+       sha256 = "c61cc1d15b00967fd43286a6f7daf5675612e9111809bb518abedbb388cd1a3d";
        libraryHaskellDepends = [
          base bytestring case-insensitive rest-core safe snap-core
          unordered-containers uri-encode utf8-string
@@ -112982,7 +113328,7 @@ self: {
      mkDerivation {
        pname = "rest-stringmap";
        version = "0.2.0.6";
-       sha256 = "0jjj0yam4d4w36lnxk0ci7ylb9ya48y0ag3b54k9ikyg0hps7rb6";
+       sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a";
        libraryHaskellDepends = [
          aeson base containers hashable hxt json-schema tostring
          unordered-containers
@@ -112998,7 +113344,7 @@ self: {
      mkDerivation {
        pname = "rest-types";
        version = "1.14.0.1";
-       sha256 = "0chb91gb3xvfp7k4sbsp07ri2m5x26qj4q2bq0ldkxpk06jicmb4";
+       sha256 = "645516a501f3f6d928c04b6022b111bd5411f301572f4de6b96ef7b15e480b32";
        libraryHaskellDepends = [
          aeson base case-insensitive generic-aeson generic-xmlpickler hxt
          json-schema rest-stringmap text uuid
@@ -113015,7 +113361,7 @@ self: {
      mkDerivation {
        pname = "rest-wai";
        version = "0.1.0.8";
-       sha256 = "0r11y2rl0h2axnlqcqhdy7w0b3c207qbyhg60rr0rnm9vsqj5l5d";
+       sha256 = "add022b1dea9da0c7206e641bff001828d05f8f10d6286a9ed4a4040b3f02164";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types mime-types
          mtl rest-core text unordered-containers wai
@@ -113033,7 +113379,7 @@ self: {
      mkDerivation {
        pname = "restful-snap";
        version = "0.2";
-       sha256 = "16gqbk9wl2a1ivhq30yh584h7p2vd7qvwx1rprin47amqzn5b6gc";
+       sha256 = "ec9955ecc7551d6263be3974bef1695bdc03092ad08381e18e4109cad35cf899";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers data-default
          digestive-functors errors heist lens mtl old-locale readable snap
@@ -113053,7 +113399,7 @@ self: {
      mkDerivation {
        pname = "restricted-workers";
        version = "0.1.1";
-       sha256 = "0lxipqp8nsgw07hmb4b8rfxlfmfhj0l7sg8k0042qscys92rzg9l";
+       sha256 = "34bd9f45d29e692c0800133d7d2890d05547bbcb689155e101fc698b2ebeb153";
        libraryHaskellDepends = [
          async base bytestring cereal data-default directory either filepath
          monad-control mtl network selinux stm text transformers
@@ -113071,7 +113417,7 @@ self: {
      mkDerivation {
        pname = "restyle";
        version = "0.1.0";
-       sha256 = "0hzkdg4f5h96zqznnrbjbxrzv17gz1zvd5g4a51rrpsgpngkax7x";
+       sha256 = "fd74359fbd4fdf9c4351e495b67ff8ef84fd735f72656b3ffe26c1e2c86bf343";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -113087,7 +113433,7 @@ self: {
      mkDerivation {
        pname = "resumable-exceptions";
        version = "0.0.0.20100920";
-       sha256 = "06lzjf8dcbxks57x434n27146whryzzpwcn8bq2mclwfcrv9g3gs";
+       sha256 = "fa8d9776668e5356055ec8327efff7197243c211960cd24fd1b32fd690939f1a";
        libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "A monad transformer for resumable exceptions";
@@ -113103,7 +113449,7 @@ self: {
      mkDerivation {
        pname = "rethinkdb";
        version = "2.0.0.0";
-       sha256 = "09digdn4a9vsmanpj6d2wn6kh59r05cfwjk4xq22iszzjrxami6d";
+       sha256 = "cdc4aa7a96ffeb2804ee644aee58013915388de5a21979adaa7a27456c7bb125";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113127,7 +113473,7 @@ self: {
      mkDerivation {
        pname = "rethinkdb-client-driver";
        version = "0.0.19";
-       sha256 = "0yzmypflg133dzy5yj2jmdk450zmr237prjvnaf9343jiy143nyi";
+       sha256 = "d1db41828f7290919cb25be67b86c8f5834266ab52485ffc6f638447ddf5f57b";
        libraryHaskellDepends = [
          aeson base binary bytestring hashable mtl network old-locale
          scientific template-haskell text time unordered-containers vector
@@ -113149,7 +113495,7 @@ self: {
      mkDerivation {
        pname = "rethinkdb-model";
        version = "0.1.0.2";
-       sha256 = "15993912bw3v09c6fiqnjcjcpd77px61kq276v1aaqdbahzpzw2q";
+       sha256 = "58f07f3f54ab61a5c23647e0194cbfe7b4cb249316476758027bf025421a2995";
        libraryHaskellDepends = [
          aeson base mtl rethinkdb text transformers unordered-containers
        ];
@@ -113169,7 +113515,7 @@ self: {
      mkDerivation {
        pname = "rethinkdb-wereHamster";
        version = "1.8.0.5";
-       sha256 = "0wkxf1iixy9rnl2rawima61qpjz77g4w08dd13q004g6c1n0h6kq";
+       sha256 = "781a086c60e61100f008ad21c0c93be7cb8b835135729505b539f91e63707d72";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default ghc-prim
          mtl network protocol-buffers protocol-buffers-descriptor text time
@@ -113187,7 +113533,7 @@ self: {
      mkDerivation {
        pname = "retry";
        version = "0.6";
-       sha256 = "1ry2zqs5361mg5ibnd6awjpl3nl3a6ha18m0v2f28hs9kw6dnsgj";
+       sha256 = "f269db0c9f4943249cd8a0a2a0a05183da41afe4ca34bb627935985134fec2e7";
        libraryHaskellDepends = [
          base data-default-class exceptions transformers
        ];
@@ -113206,7 +113552,7 @@ self: {
      mkDerivation {
        pname = "retryer";
        version = "0.1.0.1";
-       sha256 = "1rvblmzlsyfvvvjz71ngb8l412rrr943s7pp75gqjcxnklnlc97j";
+       sha256 = "f224462d9db633895f39f71e3d48ca398b40285acf86f3e5dedb794d7fa56be7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base optparse-applicative process ];
@@ -113221,7 +113567,7 @@ self: {
      mkDerivation {
        pname = "rev-state";
        version = "0.1";
-       sha256 = "1lsq7b225v86rwm2rnrnhn28asjh6r3zwbvdm5vl4sp46cr5i4cf";
+       sha256 = "8e91583233e46a4277a96d2ffe4736506a85848536db2c2acf06ed22c43a58d3";
        libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/DanBurton/rev-state#readme";
        description = "Reverse State monad transformer";
@@ -113233,7 +113579,7 @@ self: {
      mkDerivation {
        pname = "revdectime";
        version = "0.1.1";
-       sha256 = "0lbf7dclcdvy56b7wjyq3iam757wf4vic4b5qyxd4bffk66q3asm";
+       sha256 = "55ab818d99ce2dd2bac76511163771fc9453551cd84b7e96297e3746593b6e51";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base old-time ];
@@ -113246,7 +113592,7 @@ self: {
      mkDerivation {
        pname = "reverse-apply";
        version = "2.0.1";
-       sha256 = "0iw1j2xr5dy29a1bwcg7fqk3lv72izr0nhj31rn45w53py1367nb";
+       sha256 = "cb1e3382bfa3f0426c0e43420bf28fe26c3a2676e731be824ac2b792bb908147";
        libraryHaskellDepends = [ base ];
        description = "Standard version of the reverse apply operator";
        license = stdenv.lib.licenses.bsd3;
@@ -113259,7 +113605,7 @@ self: {
      mkDerivation {
        pname = "reverse-geocoding";
        version = "0.2.1";
-       sha256 = "089p1fv1ghznfsnhw1bdnwna3hcxmmqakw2qgzg91w5gifzaf18s";
+       sha256 = "1a05a7be8baff090de7f58f0a970ad9dc1a12cb76d050ead76f6c317b60b3721";
        libraryHaskellDepends = [
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
@@ -113274,7 +113620,7 @@ self: {
      mkDerivation {
        pname = "reversi";
        version = "0.1.1";
-       sha256 = "1dddlldp55c6l7g5n2gi8r1r0f8r6r3ipq9mlx11d54j8wmvvlnz";
+       sha256 = "dfd2bd2b4792941642a735e11b47361939904346f1095bdea18695721ba5adb5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base process ];
@@ -113288,7 +113634,7 @@ self: {
      mkDerivation {
        pname = "rewrite";
        version = "0.10";
-       sha256 = "10cbsjilc4nv4hi4ipb078hiy7afnjl20f9kcda15pmpmqxxywjg";
+       sha256 = "4f72df3baeb7de125463333920a8b44e1d1f213a60dd482224db1246a3d48b81";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -113306,7 +113652,7 @@ self: {
      mkDerivation {
        pname = "rewriting";
        version = "0.2.2";
-       sha256 = "0gnd8awqjnm905m29yldy3z7w7jvilj5svijz63lzmwbjknfh6bs";
+       sha256 = "7a19e8ec948bd74f87f9326e5d248d5b1e7efef08dfa246a01a95a89b942cd3e";
        libraryHaskellDepends = [ base containers regular ];
        description = "Generic rewriting library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
@@ -113320,7 +113666,7 @@ self: {
      mkDerivation {
        pname = "rex";
        version = "0.5.1";
-       sha256 = "18g09pg7hhj052v72vncjvy900h3xhza8hl2g3akad8asn9k6jl6";
+       sha256 = "864a3393d50a3535d5788242a43eec030290fc96cc6e71b628404278de4de0a1";
        libraryHaskellDepends = [
          base bytestring containers haskell-src-exts haskell-src-meta
          pcre-light template-haskell
@@ -113337,7 +113683,7 @@ self: {
      mkDerivation {
        pname = "rezoom";
        version = "0.0.4";
-       sha256 = "122hca6whzxqk3x7207k4clrrl2awy96pafq0gjwddqicny41jza";
+       sha256 = "eacb40bc6511b7c6e503d8a96b92e74ad09c2923f30071fa98b87fc88d625088";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -113354,7 +113700,7 @@ self: {
      mkDerivation {
        pname = "rfc3339";
        version = "1.0.5";
-       sha256 = "1p3nahcmsikrc5maf7qz45042h80m6xszx70154yq169rsqkvav0";
+       sha256 = "60ab3db1cec904ec4909e0f4afbba900414140211f1fa76a6179465d195476dc";
        libraryHaskellDepends = [ base timerep ];
        description = "Parse and display time according to RFC3339 (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -113366,7 +113712,7 @@ self: {
      mkDerivation {
        pname = "rfc5051";
        version = "0.1.0.3";
-       sha256 = "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3";
+       sha256 = "e38dab28a5625774be60545c8c99e647b79bbc0ac0bc9c65fe6b2ebef160642b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
@@ -113382,7 +113728,7 @@ self: {
      mkDerivation {
        pname = "rhythm-game-tutorial";
        version = "0.1.1";
-       sha256 = "08ddm1pxi7qdjz2mgvjvwdgxyskvac4ahi3jp2fd8z1sh68c7x7s";
+       sha256 = "faf4c390813a7cd49cb87244a808537b6adf5fe35bee57c5970d9fd86fa8ad21";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -113403,7 +113749,7 @@ self: {
      mkDerivation {
        pname = "riak";
        version = "0.8.0.0";
-       sha256 = "16ncq22vhg62p1v1ch1jc1z3xds1qsr536fg3awvp7a0a8vyq528";
+       sha256 = "4814ec3752409dbbb91acf9951b2c641b73e7e6032401676b8c23cb885c0cc9a";
        libraryHaskellDepends = [
          aeson attoparsec base binary blaze-builder bytestring containers
          monad-control network protocol-buffers-fork pureMD5 random
@@ -113426,7 +113772,7 @@ self: {
      mkDerivation {
        pname = "riak-protobuf";
        version = "0.19.0.0";
-       sha256 = "1954f8hgibmilqpf72pp2yf8nx9cm60gfk1ypmb99h69lf8d5x1y";
+       sha256 = "3ef4d290a3c9c09456bd3e4cf780a92c758b9c17f78ae32ea6b1aef82072a4a4";
        libraryHaskellDepends = [
          array base parsec protocol-buffers-descriptor-fork
          protocol-buffers-fork
@@ -113442,7 +113788,7 @@ self: {
      mkDerivation {
        pname = "richreports";
        version = "0.0.3.0";
-       sha256 = "0mik0m6nziwm6z517wkxdmjp92nh3qz1m8yk3x5897zafgs1y5kk";
+       sha256 = "73161ff473ea9f844a1fd3a31a3e1ed08a74656d7df213ca3795c76f4d053356";
        libraryHaskellDepends = [ ascetic base MissingH ];
        description = "Integrated pretty-printing and error/static analysis reporting";
        license = stdenv.lib.licenses.mit;
@@ -113456,8 +113802,8 @@ self: {
      }:
      mkDerivation {
        pname = "riemann";
-       version = "0.1.0.1";
-       sha256 = "0d36ff839g7y1lm8dg5j5s1vdxr1hqbyjxh7gsfjca00a0cgy5xa";
+       version = "0.1.0.2";
+       sha256 = "7399d2b85839ef9c44aab66ad3b2f3a35e6a893fd8f5ab1aa1626a0f04128708";
        libraryHaskellDepends = [
          base cereal containers data-default either errors lens network
          protobuf text time transformers
@@ -113479,7 +113825,7 @@ self: {
      mkDerivation {
        pname = "riff";
        version = "0.3.0.1";
-       sha256 = "1970bsg1ngc6mzsyj8mapzar0h1wkdb4skfz64d0ccdfpipp5hdb";
+       sha256 = "abc1726fbcae31061a31df4d4d569b3c4090d5bfaa22e9f5af863d1b9e5ee0a4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113496,8 +113842,8 @@ self: {
     ({ mkDerivation, base, mtl, primitive, vector }:
      mkDerivation {
        pname = "ring-buffer";
-       version = "0.1.1";
-       sha256 = "03v2xxj1gd35738qrhxcl0d3bx6pps4l1singb0yg1smrx5nkpp7";
+       version = "0.1.2";
+       sha256 = "8fc8bd6234d0a3a5c427f4c263873f4bfe7ad5496563d318d31ed466524e766b";
        libraryHaskellDepends = [ base mtl primitive vector ];
        homepage = "http://github.com/bgamari/ring-buffer";
        description = "A concurrent, mutable ring-buffer";
@@ -113511,7 +113857,7 @@ self: {
      mkDerivation {
        pname = "riot";
        version = "1.20080618";
-       sha256 = "1dgdwr9d0jl3r78f4shx0ff22vqlq72n5w5whw3ppirm8ccxf0ms";
+       sha256 = "ba02d7194335c77b0787bcf062c5c1146f219c031d6ae2d0c9834ad052e6edb5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -113534,7 +113880,7 @@ self: {
      mkDerivation {
        pname = "ripple";
        version = "0.3";
-       sha256 = "1y19kp63chg4ljcccq6cp9n3g26x6jyyhch3jqj04ya9c16cbypw";
+       sha256 = "fcfac54c6049790224960332e8bd34dd88376cbacc60c698a4e44136cc9d29f8";
        libraryHaskellDepends = [
          aeson attoparsec base base58address binary bytestring cereal
          crypto-api crypto-pubkey-types cryptohash-cryptoapi ecdsa errors
@@ -113554,7 +113900,7 @@ self: {
      mkDerivation {
        pname = "ripple-federation";
        version = "0.3";
-       sha256 = "0m7mlv8qmw257hnk9lngxvq3nskninl88f5hl77r7w8r5hbymf0s";
+       sha256 = "1ab8ea172c19f193cfa1b03884a88d766a3bf0eecfd2342d3c45f08ad1a6f554";
        libraryHaskellDepends = [
          aeson attoparsec base base58address blaze-builder bytestring errors
          http-streams http-types io-streams network-uri text unexceptionalio
@@ -113571,7 +113917,7 @@ self: {
      mkDerivation {
        pname = "risc386";
        version = "0.0.20130719";
-       sha256 = "0i0fkg4vys3n31jwazrajirywxmk7idjv2kz3nlb8kwriqc6d723";
+       sha256 = "439c66188e994fb4a81d7f8a2d5b3cb376ee73942a7fc565187668bfc99b0e44";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers mtl pretty ];
@@ -113588,7 +113934,7 @@ self: {
      mkDerivation {
        pname = "rivers";
        version = "0.1.0";
-       sha256 = "0x7r04mwxwnqckfk865dckml4am11zx80a9k5kc91kz5ikq1ns64";
+       sha256 = "c4681bf08ce5cf90d82c332980fa0fa12a42eb64ad1834dd64d8f2ce2b01f974";
        libraryHaskellDepends = [ base lazysmallcheck oeis QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/d-rive/rivers";
@@ -113602,7 +113948,7 @@ self: {
      mkDerivation {
        pname = "rivet";
        version = "0.1.0.0";
-       sha256 = "1hiwgn0xyl42y9cmmc25464y42w7grf68xv8cvjznwzv0v1v63cg";
+       sha256 = "8f0db3c306fb73fbe5666877645c7e870be2892145b05a59f28250df817d3cc2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base rivet-core rivet-simple-deploy ];
@@ -113619,7 +113965,7 @@ self: {
      mkDerivation {
        pname = "rivet-core";
        version = "0.1.0.1";
-       sha256 = "102zgb1ryfl341h8r9hxm9zbmg8jq67bkn57hxhnfsjxv7952x21";
+       sha256 = "417451d2d95d6a676187a7d8b98ec112bdba7eaa1da68c6020833a9fc37a5f80";
        libraryHaskellDepends = [
          base configurator directory directory-tree filepath
          postgresql-simple process shake template-haskell text time
@@ -113635,7 +113981,7 @@ self: {
      mkDerivation {
        pname = "rivet-migration";
        version = "0.1.0.1";
-       sha256 = "1vg6ns5scq5nqyj2w070hswynji8pqfh654qa3zjda2xhna5mnbd";
+       sha256 = "6dd95a94855da826ff509814031dbe284aebb986e0002ea4c7b660a68bb6e6ed";
        libraryHaskellDepends = [ base postgresql-simple text ];
        homepage = "https://github.com/dbp/rivet";
        description = "Postgresql migration support for project management tool";
@@ -113647,7 +113993,7 @@ self: {
      mkDerivation {
        pname = "rivet-simple-deploy";
        version = "0.1.0.0";
-       sha256 = "1003sm8mpnc7l7fbp1j08cvc55va54arp6j0qdg2cc2m8cy5bpxf";
+       sha256 = "aedf553c435530265ec3409a9b15296a97c236434086bbdca187d95b51d50380";
        libraryHaskellDepends = [ base configurator mtl rivet-core text ];
        homepage = "https://github.com/dbp/rivet";
        description = "Basic deployment support for project management tool";
@@ -113661,7 +114007,7 @@ self: {
      mkDerivation {
        pname = "rlglue";
        version = "0.2.2.0";
-       sha256 = "0672j0xjlhyyfq2fbvnfc0gahihpkkcfh7nnbwh1salgy0ykzhq0";
+       sha256 = "00c33f3df08f2a1d205fd61ee8d89c1746a81e60ceeee50476de432a3b90e218";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113684,7 +114030,7 @@ self: {
      mkDerivation {
        pname = "rmonad";
        version = "0.8.0.2";
-       sha256 = "1pamp8n88f1y4q0q83vmvbqbfva03prcfdqfj3x888mjwxgh6h8l";
+       sha256 = "1441035fe7b22284fa900e37c7f21d406db7f0da750f8401263e38842cba55dd";
        libraryHaskellDepends = [ base containers suitable transformers ];
        testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit
@@ -113701,7 +114047,7 @@ self: {
      mkDerivation {
        pname = "rncryptor";
        version = "0.0.2.1";
-       sha256 = "086cq7b7x0l98q5di2bpbv9vjrhl7b62nlzwchdl8pqb5w83345m";
+       sha256 = "b59031102f0b5f441b64fc532bcc3a1466b9d35e7789d80a4689827ed6c1cc20";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113723,7 +114069,7 @@ self: {
      mkDerivation {
        pname = "rng-utils";
        version = "0.2.1";
-       sha256 = "11yy6v0dbdf0cn823vlyd90zc5q5aw0zjzylpz5s9c94wsd4pjfa";
+       sha256 = "cac94b9ae624b1a4cbbfd47ff901570517f6416a9eee219065c0b5d5c036de87";
        libraryHaskellDepends = [ base bytestring mwc-random vector ];
        description = "RNG within an MVar for convenient concurrent use";
        license = stdenv.lib.licenses.bsd3;
@@ -113734,7 +114080,7 @@ self: {
      mkDerivation {
        pname = "robot";
        version = "1.4";
-       sha256 = "1vac4ks3kdyf9wdiiw224rz2nm5859np7cqjpl5mrb2h27bycv5c";
+       sha256 = "ac6ce6d71150ac5c0bbd12b3736d2aa8542b7e2642f0181b4fceb739f4244ced";
        libraryHaskellDepends = [
          base containers exceptions transformers xhb
        ];
@@ -113750,7 +114096,7 @@ self: {
      mkDerivation {
        pname = "robots-txt";
        version = "0.4.1.3";
-       sha256 = "051ibkbhqlpimajj8gl0m468rs6qhlgs15f5bcrhlngfs20jbfkq";
+       sha256 = "78ba2581d0ee590a335bc595a01f85d8e88c0ca9803e24a5aaf1520cd75c3114";
        libraryHaskellDepends = [
          attoparsec base bytestring old-locale time
        ];
@@ -113771,7 +114117,7 @@ self: {
      mkDerivation {
        pname = "rocksdb-haskell";
        version = "0.1.0";
-       sha256 = "1wi8mc0xzdd47r2vxa1x4gmbm4yikp4pyfj00ycnydvs4b2n3iad";
+       sha256 = "4dc561c5227a376f9907403a7fc99dd193baea233da8be453ea4b5df01ab28f2";
        libraryHaskellDepends = [
          base bytestring data-default filepath resourcet transformers
        ];
@@ -113788,7 +114134,7 @@ self: {
      mkDerivation {
        pname = "roguestar";
        version = "0.6.0.1";
-       sha256 = "0xnpji131pva54drxjqra5nkciqljf4x6zylm3snzs8s4c7klak6";
+       sha256 = "662a3a0f231ae96ff5a8d47fd389931447366d5119cb9e1b296adf304294d776";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -113808,7 +114154,7 @@ self: {
      mkDerivation {
        pname = "roguestar-engine";
        version = "0.6.0.1";
-       sha256 = "056080bzdmrn6k0c9lx2d69l2ygal275xlkd6y31sj2ax9yizqkv";
+       sha256 = "7be21f7dea4a481d86376dd25e8ea0ea79419369a2d3c4c03436d7f61740c014";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -113831,7 +114177,7 @@ self: {
      mkDerivation {
        pname = "roguestar-gl";
        version = "0.6.0.1";
-       sha256 = "1lajrc6ay1vk9rbi3x8mx56rrsxkihmapzfm7l8aav2jx0wwryzs";
+       sha256 = "fafbcc39e8526ca5103dd5fdab2a8cb3eb9c4de915f511574e7307af0ccb52d1";
        libraryHaskellDepends = [
          arrows base bytestring containers filepath GLUT MonadRandom mtl
          OpenGL priority-sync random rsagl rsagl-frp rsagl-math stm
@@ -113848,7 +114194,7 @@ self: {
      mkDerivation {
        pname = "roguestar-glut";
        version = "0.6.0.1";
-       sha256 = "13kg8mabh0y1a48zjx9f9k207i5qn0hkabjyg10ha5d0kf36xbyh";
+       sha256 = "d0af6e869ba0150541785e2e3521b0b8c403c44c2e75f91151c103b854456f8e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT roguestar-gl rsagl ];
@@ -113866,7 +114212,7 @@ self: {
      mkDerivation {
        pname = "rollbar";
        version = "0.3.1";
-       sha256 = "0hv9i38c0c1bv36xy4inq6dghn79bmjw1x0xgi5mlwf5lzzp2fv1";
+       sha256 = "613b71ffa7c5715a4b7c1df4c0655de958f89ac13612dfcdd82b30c0d0886943";
        libraryHaskellDepends = [
          aeson base basic-prelude http-conduit monad-control network text
          vector
@@ -113883,7 +114229,7 @@ self: {
      mkDerivation {
        pname = "roller";
        version = "0.1.3";
-       sha256 = "07bicx83h66xmy3i2jszl5awkxw6fvy9y5r3v4hq2rz86z09zw0s";
+       sha256 = "1af09fc037e8678121d923179ffc7686f7c955a15f4b1187afdd18385067711d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113903,7 +114249,7 @@ self: {
      mkDerivation {
        pname = "rolling-queue";
        version = "0.1";
-       sha256 = "1l39dlq8pn38b48iwqgrnh83h74qkmm34l5m9a0rbg76s2z04c43";
+       sha256 = "833002bed0e6bc95814ab550326a9d981c3810b4f9611e115968d88b306d69d0";
        libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/joeyadams/haskell-rolling-queue";
        description = "Bounded channel for STM that discards old entries when full";
@@ -113915,7 +114261,7 @@ self: {
      mkDerivation {
        pname = "roman-numerals";
        version = "0.5.1.5";
-       sha256 = "10da5vls9l5i255bapms4b2r7dnwmxgsaa1cdll2lrmid5dikixr";
+       sha256 = "b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81";
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring text
        ];
@@ -113931,7 +114277,7 @@ self: {
      mkDerivation {
        pname = "romkan";
        version = "0.1.0.0";
-       sha256 = "094z59jbkpy6gv51kf990q4fgmjyylifc63ij4kcdm0hlhmrmdc8";
+       sha256 = "88b59a2ba410d4c626917118e622f55ed6e7080629b919ca7ec6dfb9642a9f24";
        libraryHaskellDepends = [ attoparsec base containers text ];
        testHaskellDepends = [
          attoparsec base containers HUnit test-framework
@@ -113947,7 +114293,7 @@ self: {
      mkDerivation {
        pname = "roots";
        version = "0.1.1.2";
-       sha256 = "0xzsz4w153mbkkkv07558xkv83fph4g98hvjf6iljwvbbp47l0j9";
+       sha256 = "49027ac85d6b7349a3717243941e81d70db46747a51cb0e79cab8e1238f9fa77";
        libraryHaskellDepends = [ base tagged ];
        homepage = "/dev/null";
        description = "Root-finding algorithms (1-dimensional)";
@@ -113959,7 +114305,7 @@ self: {
      mkDerivation {
        pname = "rope";
        version = "0.6.4";
-       sha256 = "1g77bv2mmfhy2mkb08k92m3f2jab6p2la2s7rfib2r1jy6lq5vhb";
+       sha256 = "0bee82a9f13264b1a2cb470b45c5354b49e146156922b066151eba5ac55ee7bc";
        libraryHaskellDepends = [
          base bytestring fingertree mtl utf8-string
        ];
@@ -113977,7 +114323,7 @@ self: {
      mkDerivation {
        pname = "rosa";
        version = "0.2.1.0";
-       sha256 = "0qnvv8vyijjgb51pw5zfcmxy96nnnfrsvbg8xrnmq3p34xc168gb";
+       sha256 = "eb21135827e30e5c6deee8adadb3b3d69ae47b65ee177e43594fcae837dadb62";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -113996,7 +114342,7 @@ self: {
      mkDerivation {
        pname = "rose-trees";
        version = "0.0.1.1";
-       sha256 = "0ii9jxyd7q0x30zyp1gal29msd81n5vj613mkxxavjlz9ar9gvgx";
+       sha256 = "fded97b24a9fcaad7a9f75042377b101355d93a0ea85eb3f181de0d37c972946";
        libraryHaskellDepends = [
          base containers data-default pseudo-trie semigroups transformers
        ];
@@ -114012,7 +114358,7 @@ self: {
      mkDerivation {
        pname = "rosezipper";
        version = "0.2";
-       sha256 = "1g6ppa8cappdbq9923lsac504dfjh0ks64gbm6qbihrc34f4zavc";
+       sha256 = "6cab4f1c192cc3b8b0a9eb11a32780d235020a539a0e91125eed5ec590bad7bc";
        libraryHaskellDepends = [ base containers ];
        description = "Generic zipper implementation for Data.Tree";
        license = stdenv.lib.licenses.bsd3;
@@ -114029,7 +114375,7 @@ self: {
      mkDerivation {
        pname = "roshask";
        version = "0.2.1";
-       sha256 = "12sa8ir9cl2gygayk3vhd00shv3wy3sqyhf4hh6arml5q7wz1f3m";
+       sha256 = "75b8f0f9c185d6ac0c84c4418ff5f07c6ca80168708fe9d5f34f509672444a8b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114057,7 +114403,7 @@ self: {
      mkDerivation {
        pname = "rosso";
        version = "1.0";
-       sha256 = "0cz5kqpvq9qjkdy2x3y6aqia3armawjjsnv2pxifl0l6f9hhrvis";
+       sha256 = "3aee0c61728602ea62bf625b2d255735aba12256c68f2e7c9b1227bc2f9ee533";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "General purpose utility library";
        license = stdenv.lib.licenses.bsd3;
@@ -114069,7 +114415,7 @@ self: {
      mkDerivation {
        pname = "rot13";
        version = "0.1.0.2";
-       sha256 = "0d9c0zfc92xfp5v5dp83w2897pg2gyz9n14xpggakwk6ynfmf6hd";
+       sha256 = "0d1a579df566f2a9debb9d049bbe7fe2dd9390e003dd5676b9ae8bc4dc072c35";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/kvanberendonck/codec-rot13";
@@ -114084,7 +114430,7 @@ self: {
      mkDerivation {
        pname = "rotating-log";
        version = "0.2";
-       sha256 = "1gqdfzdz3nwp6mjy61a49kwhcrykjl00aq9gq1v68li6z75zf85k";
+       sha256 = "b320f7cbf926526476c02f61050095d36706f94c4405e3653597dbf1db770dbf";
        libraryHaskellDepends = [
          base bytestring directory filepath old-locale time
        ];
@@ -114100,7 +114446,7 @@ self: {
      mkDerivation {
        pname = "rounding";
        version = "0.3.0";
-       sha256 = "1d2vaijcna8gwcrhsjpclqw4gjdvdpmnrlyszqzcxnqf0l206a6y";
+       sha256 = "de280304050edbce3efedad36ceb6dbbc94738a6ec4a0d33e30f29cb64545bb4";
        libraryHaskellDepends = [ array base numeric-extras ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/ekmett/rounding";
@@ -114116,7 +114462,7 @@ self: {
      mkDerivation {
        pname = "roundtrip";
        version = "0.2.0.3";
-       sha256 = "1q7n8fnlf9kg4647pm2a3s347dzj7qp29f6hkr0rqfmzp774zwhi";
+       sha256 = "11f24fceb9bf3a9c419ed0b8242e3ef2b743861e4ad47b88216f2647ad43f6e0";
        libraryHaskellDepends = [
          base containers pretty safe template-haskell text xml-types
        ];
@@ -114133,7 +114479,7 @@ self: {
      mkDerivation {
        pname = "roundtrip-aeson";
        version = "0.2.0.0";
-       sha256 = "0m96447l2m0y4aapil077xpnzlkjla0yp2bzajfijik9gkjbiih4";
+       sha256 = "04c6b8e47c6946199d547f89eb81a272d26f6f3f07d07895221e54410f212655";
        libraryHaskellDepends = [
          aeson base bytestring containers lens lens-aeson roundtrip
          scientific text unordered-containers vector
@@ -114153,7 +114499,7 @@ self: {
      mkDerivation {
        pname = "roundtrip-string";
        version = "0.1.0.1";
-       sha256 = "1lad64y877rf36dgldkc7qcg5xagjc00z4cf2r1ahamv379df8d7";
+       sha256 = "a721d7d219bb2aa842168e910f00934ff5f2183e6c36fa9a192e9f833c314dd1";
        libraryHaskellDepends = [ base mtl parsec roundtrip ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
@@ -114169,7 +114515,7 @@ self: {
      mkDerivation {
        pname = "roundtrip-xml";
        version = "0.3.0.5";
-       sha256 = "1gl649saiaj1biqda64wmpbnv5f3njm3rmfgvf1iavyliqgrwn9m";
+       sha256 = "35599e1f8ed46f1583dbcfd53caab4c3956dd7ad9c18d5705c41aaa8742286be";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114187,7 +114533,7 @@ self: {
      mkDerivation {
        pname = "route-generator";
        version = "0.6.1";
-       sha256 = "0bfrb3mz9nxrl4l5pikrp3x4igq4w9jlmvwikyc71ph8ks6rghc6";
+       sha256 = "86c1978d9e08de70989f91ef4a65e204bf48fab879c65b28a1b9dbf4eb58d92d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -114206,7 +114552,7 @@ self: {
      mkDerivation {
        pname = "route-planning";
        version = "0.0.3";
-       sha256 = "0l3z9hjd8xqnahffg930qi13pf8cpiq44diqmpmh1narcllcbgj7";
+       sha256 = "47bec5286559d900ebad38364270bc0cb93b42c460a4e71c541677d4244c7f50";
        libraryHaskellDepends = [
          base containers coordinate lens semigroupoids semigroups text xsd
        ];
@@ -114224,7 +114570,7 @@ self: {
      mkDerivation {
        pname = "rowrecord";
        version = "0.1";
-       sha256 = "0gcrdy75f0rqfayn37frwcixb086x4s7dygphxhxbpvyl8sjnl0l";
+       sha256 = "14502b35a27edfd56187f7f97634e90681d523e3d99d61bd723803578e6f993d";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Build records from lists of strings, as from CSV files";
        license = stdenv.lib.licenses.bsd3;
@@ -114238,7 +114584,7 @@ self: {
      mkDerivation {
        pname = "rpc";
        version = "0.0.1";
-       sha256 = "0bw92pmnkfq1azw08ygpmp1z856l3ybhmxkfhy4sfds769k2s4j9";
+       sha256 = "49122d66324737a789876ef60a971fd414f4c3adf77904f85701bb69eb15892f";
        libraryHaskellDepends = [
          base bytestring cereal containers derive network-fancy
          template-haskell th-lift
@@ -114255,7 +114601,7 @@ self: {
      mkDerivation {
        pname = "rpc-framework";
        version = "2.0.0.2";
-       sha256 = "0avjbw9zsa6nsjlwmb1lll0n80j9ggniwpy9sllaam83r6jpxhqq";
+       sha256 = "18c37ea5c90355a528d5c95f1eed7b49026401a534accaa9d4d628fd135f722b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114276,7 +114622,7 @@ self: {
      mkDerivation {
        pname = "rpf";
        version = "0.2.5";
-       sha256 = "0x40j5rk8v61wzhcj730g75a97ikki7j22dfrh4z873b6mxwfh4k";
+       sha256 = "9340c77b356b1cf409ccae09214f9c339ea4ca79601cc9e0e7c16c3473918074";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -114293,7 +114639,7 @@ self: {
      mkDerivation {
        pname = "rpm";
        version = "0.0.1";
-       sha256 = "1wvaf1llcw4xcp8hmd80scqlk490qfiv5sqncpjmafw7zanrab4z";
+       sha256 = "9f2c95adfa873b55e56516ebb2a3c320914931d300b50ad1659d704669706af3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath HaXml process ];
@@ -114311,7 +114657,7 @@ self: {
      mkDerivation {
        pname = "rsagl";
        version = "0.6.0.1";
-       sha256 = "0f1f6kksrz1ghn6jhbdqsh4rhpkp65ccc4ci2fn5kmmw7qxzal59";
+       sha256 = "a950f53b3ebcd659ac139111c65831775e9809d4b82d288d852ffcace7342e38";
        libraryHaskellDepends = [
          array arrows base containers data-memocombinators deepseq mtl
          old-time OpenGL OpenGLRaw parallel parsec random rsagl-frp
@@ -114331,7 +114677,7 @@ self: {
      mkDerivation {
        pname = "rsagl-frp";
        version = "0.6.0.1";
-       sha256 = "0lim4slnhy1sq449kmvs489xy4axryn6qkk32hkzmlwvw8hqpl01";
+       sha256 = "01d08b21e29bd3fa2714634e6caccf5d11df13227ad79908c13a7868a9263552";
        libraryHaskellDepends = [
          array arrows base containers mtl old-time random rsagl-math stm
        ];
@@ -114349,7 +114695,7 @@ self: {
      mkDerivation {
        pname = "rsagl-math";
        version = "0.6.0.1";
-       sha256 = "04i1l6zb1jm784gdr86jrfm5m999px7ymzwwr5nyh69dk1730znn";
+       sha256 = "d67e304e982d19e86dc99cffea4fbf29a55aaacbd2a0dc1e41a7cab0bea12112";
        libraryHaskellDepends = [
          array base containers deepseq OpenGL OpenGLRaw parallel parsec
          random Vec Vec-OpenGLRaw
@@ -114366,7 +114712,7 @@ self: {
      mkDerivation {
        pname = "rspp";
        version = "0.1.0.0";
-       sha256 = "1rlx6hzw987jng2wmm2igfqlfym06wk8wxvqpb4v1zgqb00rabpc";
+       sha256 = "ec2e950158f8fdb0c9ba78778e2637a07a47b17b51d4cac5b3f2a0c43f349de6";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/AJChapman/rspp";
@@ -114381,7 +114727,7 @@ self: {
      mkDerivation {
        pname = "rss";
        version = "3000.2.0.5";
-       sha256 = "0ydr6wqmac6bk3bn69fgay66rc2xap99jgz1gg5z09mhhv3bjmb1";
+       sha256 = "6155b9c686b026f0cb7be13f99d2555db06c8c57cf2563d798cb30553137b979";
        libraryHaskellDepends = [
          base HaXml network network-uri old-locale time
        ];
@@ -114399,7 +114745,7 @@ self: {
      mkDerivation {
        pname = "rss2irc";
        version = "1.0.6";
-       sha256 = "0gflfr97y2ypm9h5alm5c851pc0171p8wckdqdhr4wb6r844g8dw";
+       sha256 = "bca14708ca66719261c36d328e6e3801b01b0a62a5525560aad70b7f5276d43d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -114420,7 +114766,7 @@ self: {
      mkDerivation {
        pname = "rtld";
        version = "0.0.2";
-       sha256 = "18y55lv3vyl4kpwzphw5gb1jsvp1f6i4dqh9rs6i9fyvabndvfik";
+       sha256 = "33baddec52dbbb148dce09e246a271e16e2dc37a85c3fbf99d84fa3d362dc5a3";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kkardzis/rtld";
        description = "dynamic linker tools for Haskell";
@@ -114432,7 +114778,7 @@ self: {
      mkDerivation {
        pname = "rtlsdr";
        version = "0.1.0.4";
-       sha256 = "090m8qsj9g0xr8ybyiik6vrc9j7bvgmgp42vznank3nklrmkxbgz";
+       sha256 = "ffad3e6ba6d38e6995fd5b90fbeadbebc8c4f2363346bf3cca1dbc2435461524";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ rtl-sdr ];
        libraryToolDepends = [ c2hs ];
@@ -114448,7 +114794,7 @@ self: {
      mkDerivation {
        pname = "rtorrent-rpc";
        version = "0.2.2.0";
-       sha256 = "0k14m4r0zsalngb6c4dckr7z521mymabc0ihk0zz402l7s13n68s";
+       sha256 = "1a193b823e5400f23f983002b654f53588f24f9eac1166d6b354e90f32a9244c";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring deepseq haxr
          mtl network split utf8-string
@@ -114466,7 +114812,7 @@ self: {
      mkDerivation {
        pname = "rtorrent-state";
        version = "0.1.0.1";
-       sha256 = "0lh7plp9qwlya0dnfvz2sg8nhg42vnrypi2p8rh6i278glniwn90";
+       sha256 = "20591e2d7de88868604657c4ebb3dd823c68d1d3e26f671b509e729c2ebd0752";
        libraryHaskellDepends = [
          base bencoding bytestring containers directory filepath lens
          utf8-string
@@ -114485,7 +114831,7 @@ self: {
      mkDerivation {
        pname = "rubberband";
        version = "0.1.0.2";
-       sha256 = "15j402a7vwrx6sjn29jrby4qxc27c1aa4mkbalssn8jlpjhlpffm";
+       sha256 = "d5b94ba1bc5422ab35556b56a2546047b08e895f592661a5363df37d94004496";
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ rubberband ];
        libraryToolDepends = [ c2hs ];
@@ -114503,7 +114849,7 @@ self: {
      mkDerivation {
        pname = "ruby-marshal";
        version = "0.1.0";
-       sha256 = "1dmlgks7wfs82k9dxkgi35q4sa0a7ljpcw86j25k85vbclzpyp7j";
+       sha256 = "f25c7f3f656b17348b90067176253d0a284d7019f1cdded214483b7ef47cb4b6";
        libraryHaskellDepends = [
          base bytestring cereal containers mtl string-conv vector
        ];
@@ -114522,7 +114868,7 @@ self: {
      mkDerivation {
        pname = "ruby-qq";
        version = "0.1.0.0";
-       sha256 = "1d2a31kiiv0p8d2yygpg8mgrz0xy6zh5qnf49hz70yk2vavkcac1";
+       sha256 = "812936b7da627a703e4cc4595ce037be839f5f45ef3eef454317ec1867184ab4";
        libraryHaskellDepends = [
          base bytestring haskell-src-exts haskell-src-meta pcre-light
          process template-haskell trifecta
@@ -114538,7 +114884,7 @@ self: {
      mkDerivation {
        pname = "ruff";
        version = "0.4";
-       sha256 = "09gj31p5cbjdns7d2xs2s08kpaks0bqnhzbf93xypci6zr6gxvyl";
+       sha256 = "d4effe4cfe26b2ebfb486e7d68f1027aaa3b11d04277d18eb64d2e566e18f225";
        libraryHaskellDepends = [ array base mtl parsec safe strict Vec ];
        homepage = "https://gitorious.org/ruff";
        description = "relatively useful fractal functions";
@@ -114553,7 +114899,7 @@ self: {
      mkDerivation {
        pname = "ruler";
        version = "0.4.0.2";
-       sha256 = "1kcca2h3gvp63s9frnq4dmhaiw5pxhk5ji86bar0cwyrc9all8v5";
+       sha256 = "65234a5562d97306b25a06455926ecb7f0a8606d04dbec921ee6ee37a0508ccd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -114571,7 +114917,7 @@ self: {
      mkDerivation {
        pname = "ruler-core";
        version = "1.0";
-       sha256 = "06c55pdfkh9vcmmzlf485d0qxczgd2xj1ajkz277df72p29xvrgd";
+       sha256 = "ede5dd93b8e2b8768ef853aa20bb68efb38e412b8838fa6b653bc1e9da2d8519";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -114588,7 +114934,7 @@ self: {
      mkDerivation {
        pname = "rungekutta";
        version = "1.0.2";
-       sha256 = "07drd0xvkg06p2fsbncafnr7wzkrs4m6sfs1szbbscggw3pxh4fp";
+       sha256 = "d711d8efe0ef31bdd6d7413b6d2ad1797e7eb2758ad9a59db806bcb93b68b91d";
        libraryHaskellDepends = [ base ];
        description = "A collection of explicit Runge-Kutta methods of various orders";
        license = stdenv.lib.licenses.bsd3;
@@ -114602,7 +114948,7 @@ self: {
      mkDerivation {
        pname = "runghc";
        version = "0.1.0.3";
-       sha256 = "1vn08xdisdf5l3ps6bcpg3rvl89209f3ig504w7ysqbjgdib96n0";
+       sha256 = "c09ab4627b7261ed0f27a0bc385c022221baf378972da3efa0c5351d5b47c0ee";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -114618,7 +114964,7 @@ self: {
      mkDerivation {
        pname = "runmemo";
        version = "1.0.0.1";
-       sha256 = "12fn0lsil0rj0pj0ixzppsdw2fmj0cnzci4fh11z9rcggwbz6pms";
+       sha256 = "ba5ef3177f8fe5f443808e44f62d03b23ac19bbef7f708e40532031a3505d689";
        testHaskellDepends = [ base data-memocombinators time ];
        homepage = "https://github.com/DanBurton/runmemo";
        description = "A simple memoization helper library";
@@ -114632,7 +114978,7 @@ self: {
      mkDerivation {
        pname = "rvar";
        version = "0.2.0.2";
-       sha256 = "1n24fl27mrm7cndp8b646b9c5hjm3hf5m12y9ni0f850dd739jm4";
+       sha256 = "a4ca344e6ba02007a24d5e845a1c1c55c2c2d232c42c749b65a7e67a047544d8";
        libraryHaskellDepends = [
          base MonadPrompt mtl random-source transformers
        ];
@@ -114646,7 +114992,7 @@ self: {
      mkDerivation {
        pname = "rwlock";
        version = "0.0.0.3";
-       sha256 = "0isx32ayaqh7vhcyl11ykdy8f1chs1fdw73h3c2r53k989yfkmba";
+       sha256 = "6ad5e97c42698e92051b701cde5cd09005877c9b3e04ea19dc0762e595185d47";
        libraryHaskellDepends = [ base monad-loops-stm stm syb ];
        homepage = "https://github.com/mokus0/rwlock";
        description = "Multiple-read / single-write locks";
@@ -114660,7 +115006,7 @@ self: {
      mkDerivation {
        pname = "rws";
        version = "0.1.1.2";
-       sha256 = "1ildbmnpdh8x25m6kjdc6506cjgngjmjhvrdfkrcwg5cdqcqs266";
+       sha256 = "c6088d196eac3ccef2742d6f28ab7cf649664031acc9696a111dc1766d5d8dc6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base binary bytestring parsec ];
@@ -114681,7 +115027,7 @@ self: {
      mkDerivation {
        pname = "s3-signer";
        version = "0.3.0.0";
-       sha256 = "15647fs38blg37s0407ybxlmzwdhmxz3sk914p21g90i2bw5gsc9";
+       sha256 = "89e957f81211a417c425214d3d7eafb0f15f695ffe0002f4198f2e34b43bc494";
        libraryHaskellDepends = [
          base base64-bytestring cryptohash http-types time utf8-string
        ];
@@ -114695,7 +115041,7 @@ self: {
      mkDerivation {
        pname = "safe";
        version = "0.3.9";
-       sha256 = "1jdnp5zhvalf1xy8i872n29nljfjz6lnl9ghj80ffisrnnkrwcfh";
+       sha256 = "d0319ea7b55947e70092f0256aa9f9d2496a93b0e2a0887c0f8eaa0d7fb9b6c9";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ndmitchell/safe#readme";
        description = "Library of safe (exception free) functions";
@@ -114707,7 +115053,7 @@ self: {
      mkDerivation {
        pname = "safe-access";
        version = "0.2.1.1";
-       sha256 = "0pijjy8ilq0spmanilmhqxkkrky7ldacxphz5ci8pvnw4g6y40z8";
+       sha256 = "e803e2cd23dcee8b222b1fdece54a3c7cf3c67c7b0d26855bd1a601a9197325e";
        libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "http://hub.darcs.net/thoferon/safe-access";
@@ -114720,7 +115066,7 @@ self: {
      mkDerivation {
        pname = "safe-failure";
        version = "0.5.0.2";
-       sha256 = "102fjardfdf9zy0vyalgq6m1l64356b0a0xaam49j31lqgfldaw7";
+       sha256 = "87ab46ddc3340c994855aa0305962983181aaac18f2abf81ffc935d7b2924e80";
        libraryHaskellDepends = [ base failure ];
        homepage = "http://www-users.cs.york.ac.uk/~ndm/safe/";
        description = "Library for safe functions (deprecated)";
@@ -114732,7 +115078,7 @@ self: {
      mkDerivation {
        pname = "safe-failure-cme";
        version = "0.1.0";
-       sha256 = "0np0gq6f9xvywdf2fz5cb43ji0r4c9aqk6gb5w80hwklxdy553gk";
+       sha256 = "f38d527ceb747208102feb998955622483280759ac7c275ce37ef7e40c7ee05a";
        libraryHaskellDepends = [
          base control-monad-exception safe-failure
        ];
@@ -114745,7 +115091,7 @@ self: {
      mkDerivation {
        pname = "safe-freeze";
        version = "0.2.1";
-       sha256 = "12mqgak0rla20n9b4m6ynx64bwr06njcr849csc0z0r573xw2v33";
+       sha256 = "636cc1fb3825830f986689a0cca43520f3454cb7de54b2920542d10ca67ab88a";
        libraryHaskellDepends = [ base indexed mtl vector ];
        jailbreak = true;
        homepage = "https://github.com/reinerp/safe-freeze";
@@ -114759,7 +115105,7 @@ self: {
      mkDerivation {
        pname = "safe-globals";
        version = "0.1.1";
-       sha256 = "0an3hy28fpdw3v5gjx13fbszzp4r2p65l8mgks0pdflscf2cwwv5";
+       sha256 = "6573ce84639aba76819eaf225acc1599dcfff5722374f9ca1ebc5d878487c32a";
        libraryHaskellDepends = [ base stm template-haskell ];
        description = "Safe top-level mutable variables which scope like ordinary values";
        license = stdenv.lib.licenses.bsd3;
@@ -114772,7 +115118,7 @@ self: {
      mkDerivation {
        pname = "safe-lazy-io";
        version = "0.1";
-       sha256 = "1hqw4i814sz94iqyj79jai8aa2mwmv0mrnfk8ggb0sdx4xqn784c";
+       sha256 = "8ca0637127bd69b0de43d3d95cc1aebc0aa55054321de97124e96b1250241cc3";
        libraryHaskellDepends = [
          base extensible-exceptions parallel strict-io
        ];
@@ -114788,7 +115134,7 @@ self: {
      mkDerivation {
        pname = "safe-plugins";
        version = "0.1";
-       sha256 = "1nxy70iig54098pzbi8mwc8412fj759y6ihmsdjsk6xlpy6bwx65";
+       sha256 = "c574be8cbfb49ba965d31546e35339d2894010e315c5f52f4a8094172338bedb";
        libraryHaskellDepends = [
          base directory filepath haskell-src-exts plugins Unixutils
        ];
@@ -114804,7 +115150,7 @@ self: {
      mkDerivation {
        pname = "safe-printf";
        version = "0.1.0.0";
-       sha256 = "19nw306q7xlj6s132qxlfskg67x6rx3zhsk2n6lbz2kryr7v99g6";
+       sha256 = "e6a5b44ff6798abfa8b1626af847cfa61ff3a676b46331823692f6830d18dca6";
        libraryHaskellDepends = [
          base haskell-src-meta template-haskell th-lift
        ];
@@ -114825,7 +115171,7 @@ self: {
      mkDerivation {
        pname = "safecopy";
        version = "0.8.5";
-       sha256 = "1r0v2276hynxkysyrdmy2334gwxgaz2v6j8g0hd5jzfj2kmnnmk9";
+       sha256 = "69566beb14d27d591a040f49b3c557aff347c610beb6ecb59fdd7a688e101be4";
        revision = "1";
        editedCabalFile = "9b7af1be25774add78e43c0f9a4f1fe55ce2a98fb00738400661835adf1672c0";
        libraryHaskellDepends = [
@@ -114848,7 +115194,7 @@ self: {
      mkDerivation {
        pname = "safeint";
        version = "0.5.3";
-       sha256 = "1xrdqylf4f6nk2rnpp0zyaj562cdn2wmf9skir21fbzkw1lzvq7j";
+       sha256 = "f2e0fd69e0f32f17448e532757b9b08d0953a4f21fdc6bb398d638e2a8c72df7";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -114866,7 +115212,7 @@ self: {
      mkDerivation {
        pname = "safer-file-handles";
        version = "0.11";
-       sha256 = "1jqw13drzj36gjvlaf9fqd4cj1dpy8psmgsdykag6krxvhq6p639";
+       sha256 = "69986b30dc3d4ff3d4f44dbfaa2ff2b705c948c32e3945b77c66c89fdb081ccb";
        libraryHaskellDepends = [
          base base-unicode-symbols explicit-iomodes pathtype
          regional-pointers regions transformers
@@ -114885,7 +115231,7 @@ self: {
      mkDerivation {
        pname = "safer-file-handles-bytestring";
        version = "0.3.0.1";
-       sha256 = "1fbhk5hmq9bpw556vz6w3vq5j380n5pzfgby6w4vrmwnn93y12b9";
+       sha256 = "6989e047b296d7bc09377e3df76fb1000d59f01edcfc6d4ae177255c619970b9";
        libraryHaskellDepends = [
          base bytestring explicit-iomodes-bytestring regions
          safer-file-handles transformers
@@ -114904,7 +115250,7 @@ self: {
      mkDerivation {
        pname = "safer-file-handles-text";
        version = "0.2.0.2";
-       sha256 = "14x0kig9dnjrksh7b4gmwdwqr045cqcqjgicvjckhf85jc8bcanm";
+       sha256 = "d52ab6109305393899dc2c3e89196685808c79e3f59175a09e59da965e9ca093";
        libraryHaskellDepends = [
          explicit-iomodes-text regions safer-file-handles text transformers
        ];
@@ -114920,7 +115266,7 @@ self: {
      mkDerivation {
        pname = "saferoute";
        version = "0.2.0.0";
-       sha256 = "00ykmy44paghgc3m731p1hh00zv11416pl2xil4cav7vrr43nb6h";
+       sha256 = "d02c3b48cefb6cc5088d5dd06b0209617f00200c378c53077bf0a94b88afd303";
        libraryHaskellDepends = [ base blaze-html containers text ];
        jailbreak = true;
        description = "A simple type-safe routing library";
@@ -114933,7 +115279,7 @@ self: {
      mkDerivation {
        pname = "sai-shape-syb";
        version = "0.3.4";
-       sha256 = "07g7qpf7avv5hnxykrh4x7qr8sx9mwwv4hbavnsqi1n7zy2z91a3";
+       sha256 = "4385f485ffc78688b5dd6a41b239afa96b94f1e904e6e9bb85656f75dcc5e71d";
        libraryHaskellDepends = [ base containers ghc ghc-syb-utils syb ];
        testHaskellDepends = [
          base containers ghc ghc-syb-utils HUnit syb
@@ -114952,7 +115298,7 @@ self: {
      mkDerivation {
        pname = "saltine";
        version = "0.0.0.4";
-       sha256 = "1n74qk8yb0ylj6gns68rak5g030yjsaycn96x0hvk1cx7qwym887";
+       sha256 = "07a1ea393e9d85b921e82659e695961e0cf0ca5419196d9f91d483e5d1c4e4d8";
        libraryHaskellDepends = [ base bytestring profunctors ];
        librarySystemDepends = [ libsodium ];
        testHaskellDepends = [
@@ -114970,7 +115316,7 @@ self: {
      mkDerivation {
        pname = "saltine-quickcheck";
        version = "0.1.0.1";
-       sha256 = "041286rsyzv67qqbbbd38fc9qqzmml0js4qr0rqhaljv8cf1sxnj";
+       sha256 = "d2761d1c435b5205710619132d01adf5639c9843a3adb5303e667fafb3412210";
        libraryHaskellDepends = [
          base bytestring bytestring-arbitrary hex QuickCheck saltine
        ];
@@ -114993,7 +115339,7 @@ self: {
      mkDerivation {
        pname = "salvia";
        version = "1.0.0";
-       sha256 = "1qcnhj3ifjqrkaw1ixqkwmv2br9w5dlk1mrrwgl73c3wxgin7gni";
+       sha256 = "d1be63e3eb7cb071e8e339d730692b3ce52576e513f718b89a194b17878496e1";
        libraryHaskellDepends = [
          base bytestring containers directory fclabels MaybeT-transformers
          monads-fd network old-locale process pureMD5 random safe
@@ -115014,7 +115360,7 @@ self: {
      mkDerivation {
        pname = "salvia-demo";
        version = "1.0.0";
-       sha256 = "0sfvx7hj0z2g57gs6l1s078z3a34hfgm4pfcb1qr1pvbc8lj3f1h";
+       sha256 = "30b82129626bdf907158cc5d529f8364a8f1d1013a50a3df294f7c20e1e9db69";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115037,7 +115383,7 @@ self: {
      mkDerivation {
        pname = "salvia-extras";
        version = "1.0.0";
-       sha256 = "1nfiak4nabxm27ddksaif1jdpwn7drbz25jrqk0bmyr5q6q70a51";
+       sha256 = "a12870b0c125fbbac0c45916f1576ec7f2db647051e9d9da11b52f65c954d1d9";
        libraryHaskellDepends = [
          base bytestring c10k clevercss fclabels filestore hscolour
          HStringTemplate monads-fd network old-locale pureMD5 salvia
@@ -115057,7 +115403,7 @@ self: {
      mkDerivation {
        pname = "salvia-protocol";
        version = "1.0.1";
-       sha256 = "0a49wjjhdhhlnrwfi6l2zn6jl7vynwyil6s6qzp1za7s5vji48vb";
+       sha256 = "6b2312e52efaa81feec7461b1a3db77e1f2a8dfd829ae878b614c206a5e48928";
        libraryHaskellDepends = [
          base bimap bytestring containers fclabels parsec safe split
          utf8-string
@@ -115076,7 +115422,7 @@ self: {
      mkDerivation {
        pname = "salvia-sessions";
        version = "1.0.0";
-       sha256 = "0cfl9xhawg16gkl18wfxpjysn312yb3q9bagmclrhqk3qzwxgb0h";
+       sha256 = "10acd7f9c763629829ab4fad84c7f2220cabbdbcdd7114e87c263cae604fd431";
        libraryHaskellDepends = [
          base containers fclabels MaybeT-transformers monads-fd pureMD5
          random safe salvia salvia-protocol stm time utf8-string
@@ -115094,7 +115440,7 @@ self: {
      mkDerivation {
        pname = "salvia-websocket";
        version = "1.0.0";
-       sha256 = "14sr5z5z9xjkf18z1srz6cgciyrhhs4zyl7a8pffxmb893a2gngl";
+       sha256 = "f4d927d44868d5eedc45ea50ff898630fbc81e333febf0517053f6f4cb2f5993";
        libraryHaskellDepends = [
          base bytestring fclabels monads-fd salvia salvia-protocol stm
          utf8-string
@@ -115110,7 +115456,7 @@ self: {
      mkDerivation {
        pname = "sample-frame";
        version = "0.0.3";
-       sha256 = "0ivj0bcnqqc805np62bdpvh8v4ykmw86ph5rp7k54bbv9wd31bsv";
+       sha256 = "5baf301a4f7b2d52e6b9b9c06b10afd3938de0be6d09736d0188616cd9027247";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck storable-record ];
@@ -115124,7 +115470,7 @@ self: {
      mkDerivation {
        pname = "sample-frame-np";
        version = "0.0.4";
-       sha256 = "1l7447xjxj98jx99b75hdfdjps6mcm293yhx0fjrqwxkz6anxv6d";
+       sha256 = "cdec6e95f9b3739ca5031dfa914465d5e82b9b6bb09c95529728c92efb21e4d0";
        libraryHaskellDepends = [ base numeric-prelude sample-frame ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Orphan instances for types from sample-frame and numericprelude";
@@ -115138,7 +115484,7 @@ self: {
      mkDerivation {
        pname = "samtools";
        version = "0.2.4.1";
-       sha256 = "00hm12wz6sqv0jn9v7vqxzvq1m7k8d4fdaw25x928ck7g95gk9id";
+       sha256 = "2da6f94a7a673224522f82abe64843f3d480f7ef789f9dac041b6bf3b9081502";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring seqloc vector ];
@@ -115161,7 +115507,7 @@ self: {
      mkDerivation {
        pname = "samtools-conduit";
        version = "0.1.1.0";
-       sha256 = "0s59ds9s8ghj8wq2cfnh2s865v8bmga53aqvcqf781iv9zvxbqmw";
+       sha256 = "bce2d5f74f3b06741c661bab51d4ab0bed629016d03a263047123ea4936ea968";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115183,7 +115529,7 @@ self: {
      mkDerivation {
        pname = "samtools-enumerator";
        version = "0.1.2.1";
-       sha256 = "0wk2m2av9fd5zvx29my4llbc8zqk1hrczfvnhrvd90qmw8p33r5m";
+       sha256 = "b5e4312ee21583d4768676bbcf320c137fc416a5c4d724fafea5b9b495a86272";
        libraryHaskellDepends = [
          base bytestring enumerator samtools transformers
        ];
@@ -115198,7 +115544,7 @@ self: {
      mkDerivation {
        pname = "samtools-iteratee";
        version = "0.2.2.1";
-       sha256 = "139cp03lm05s536gsf03in7lrsmiprs2x6vpr9vci4k0pq2pd06l";
+       sha256 = "d4807605be6092c876ca779b2e74beb1ea4c8f8d0338fdcc28ba804a07b82c8d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115219,7 +115565,7 @@ self: {
      mkDerivation {
        pname = "sandi";
        version = "0.3.5";
-       sha256 = "19dfiph5rrxs4shpw286r4agcz739f6afw2wyrlkl66lpaaxjvl5";
+       sha256 = "856ed995bad4183a69f65c70a78c4be37cf614c906097ea126bae75ce08daea5";
        libraryHaskellDepends = [ base bytestring conduit exceptions ];
        testHaskellDepends = [
          base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
@@ -115234,7 +115580,7 @@ self: {
      mkDerivation {
        pname = "sandlib";
        version = "0.0.2";
-       sha256 = "07wh6va4rpf6vvxnjqbmwfna3rg20ysjh2pnzylz6xzlayzq0pkx";
+       sha256 = "7d5e80bf57f477f3a9fff60a28b507e2e5a1ace3756169fbdec6dd4cd436901f";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/regularlambda/sandlib";
@@ -115249,7 +115595,7 @@ self: {
      mkDerivation {
        pname = "sandman";
        version = "0.1.0.1";
-       sha256 = "184gsdrw10h345ic1bdcdnfaac5fhr6dx77db790fl1lff7z5s1g";
+       sha256 = "2fe8f28f73345007d259ed9cde4c86ae30a59c6dacadc062210382c073d38fa0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -115266,7 +115612,7 @@ self: {
      mkDerivation {
        pname = "sarasvati";
        version = "0.3.0.0";
-       sha256 = "0x8d5n2mydhwl9h7vzk7nr58b2aym9xb21p4m21rfa6vy6r2n438";
+       sha256 = "68102bb2f1db289783a8e406b17aaa5e89854ab667fe7d60a21c365f852d0d75";
        libraryHaskellDepends = [ base deepseq portaudio ];
        jailbreak = true;
        homepage = "https://github.com/tokiwoousaka/Sarasvati";
@@ -115281,7 +115627,7 @@ self: {
      mkDerivation {
        pname = "sasl";
        version = "0.0.0.2";
-       sha256 = "02cv19vi8wfwzxhi33f32zihjqypxjz1x6j7ff70my2wffw95w26";
+       sha256 = "46f092b8735cf80a8e73479a1ebeecd76309e317c38d1161ffdc7114770a9b09";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cryptohash monads-tf papillon
          simple-pipe
@@ -115297,7 +115643,7 @@ self: {
      mkDerivation {
        pname = "sat";
        version = "1.1.1";
-       sha256 = "1ia2asqnxzpyr9s4n488yy00388x0bfy8kwqjx17fap33jkjfi6p";
+       sha256 = "d74427a71ce32a774297984fe4dd021da10180f708114b74cafefe6eb15642c5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -115314,7 +115660,7 @@ self: {
      mkDerivation {
        pname = "sat-micro-hs";
        version = "0.1.1";
-       sha256 = "1w09ccky9rhp1l5g3rxjp9ydfyn0cc7kxmhz922ngls4ywd1hbc4";
+       sha256 = "842d181af744d36785481fd63e0f63c07ad77cbab2e7f10a0d17e6e4276309f0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -115333,7 +115679,7 @@ self: {
      mkDerivation {
        pname = "satchmo";
        version = "2.9.9";
-       sha256 = "134i2xd7fvdhx43a51486mb3szi6c604pqc6w3cxsic1ngm30jbw";
+       sha256 = "7c4930eab38145ddd9e086e14b8061267e3d56358884a206e9b06d775a17918c";
        libraryHaskellDepends = [
          array async base bytestring containers deepseq directory hashable
          lens memoize minisat mtl process transformers
@@ -115351,7 +115697,7 @@ self: {
      mkDerivation {
        pname = "satchmo-backends";
        version = "1.9.1";
-       sha256 = "1hyzwmhy0f4k60hqjbh9jl3qr4xw3rjgl8nz2gfcdvm5ad91bfdf";
+       sha256 = "aeb9155253a5eec6dc13df22fa641ebc938c0795092e8921309338e061e5dfc3";
        libraryHaskellDepends = [
          array base bytestring containers process satchmo timeit
        ];
@@ -115368,7 +115714,7 @@ self: {
      mkDerivation {
        pname = "satchmo-examples";
        version = "1.8.1";
-       sha256 = "1xvgamq53yfzcl1p9wbfyy7dlhxsnbj6pjpxgjkyycndgszc84w3";
+       sha256 = "8313c4be7ecd32efa77cfdca6be4b2ba43da8ef76ef1740365dff95170556ff7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -115387,7 +115733,7 @@ self: {
      mkDerivation {
        pname = "satchmo-funsat";
        version = "1.4";
-       sha256 = "0nx0xlbwwcdhdd608akmiwzx8abrd5v4b411221rdl8fshqrbv34";
+       sha256 = "64ec9531d40ed196831021904576697929d43f8f752a044c6bb031ce17eda05b";
        libraryHaskellDepends = [
          array base containers funsat parse-dimacs satchmo
        ];
@@ -115402,7 +115748,7 @@ self: {
      mkDerivation {
        pname = "satchmo-minisat";
        version = "1.3";
-       sha256 = "1dwgj16l2zjqfmf92kpr695ycliwki6a38sxc06scvs6sv6wkc56";
+       sha256 = "a6b0c9cdd6466fa60d605da3a14c9c3c52e64b32f94e915c75587e414d908fb7";
        libraryHaskellDepends = [ base containers process satchmo ];
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "minisat driver as backend for satchmo";
@@ -115415,7 +115761,7 @@ self: {
      mkDerivation {
        pname = "satchmo-toysat";
        version = "0.2.1.0";
-       sha256 = "1g6hzgdiiczwk87928xi42lv2swm218i9hs39f3zqpcp8r7fxh61";
+       sha256 = "c1c0ee4e46975dfc874b43c3145110956bb1a920b123910e9afcb318dbfbd0bc";
        libraryHaskellDepends = [
          array base containers satchmo toysolver
        ];
@@ -115433,7 +115779,7 @@ self: {
      mkDerivation {
        pname = "sbv";
        version = "4.4";
-       sha256 = "1914695yxyd3ag1z56dd88kz0p0zvl63255psd4bilzvdwlys6ls";
+       sha256 = "9a1aed296ffbd3b848d3b714310cdd1f5cf02742ad99f2c353a3f9ee4b3224a4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115455,7 +115801,7 @@ self: {
      mkDerivation {
        pname = "sc3-rdu";
        version = "0.15";
-       sha256 = "0zrd9w3s535b2dpnmmrfg4i6jd9f4nh338x1cbggcw3pjyv8gk30";
+       sha256 = "60cc87b6977770f6de62a1a331a0252e356922792ed76a6f13ab8ca2074f2d7f";
        libraryHaskellDepends = [ base hsc3 hsc3-db ];
        homepage = "http://rd.slavepianos.org/t/sc3-rdu";
        description = "Haskell bindings to sc3-rdu (sc3 rd ugens)";
@@ -115470,7 +115816,7 @@ self: {
      mkDerivation {
        pname = "scalable-server";
        version = "0.2.2";
-       sha256 = "066ncvz6zid1j6d6j89m4k2hywq58p73z30dkqn2l1svlic7dmx6";
+       sha256 = "a6d77658a45b072a2c9e0d8c3fce4505730fc5243521699a91a1c56ffe66d618";
        libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base blaze-builder BoundedChan
          bytestring enumerator mtl network network-enumerator
@@ -115486,7 +115832,7 @@ self: {
      mkDerivation {
        pname = "scaleimage";
        version = "0.1";
-       sha256 = "0alhi0zr2n97942wpnyzq8q62nd4nzjl0rdxaarr7psx6dd3h3nn";
+       sha256 = "d60e385a335ddf93b352bd6540e5b7a4596130c2dfdbcb05492759913f88902a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base filepath gd ];
@@ -115503,7 +115849,7 @@ self: {
      mkDerivation {
        pname = "scalpel";
        version = "0.2.1";
-       sha256 = "0lva7pi78ksbxcjd19dycn4ayxcma28wrjmx3x31hn01nvhsnqg0";
+       sha256 = "e061abe1b6015818461fbdcacc91509575af8865bea5d024eb4b4f74e23d6a53";
        libraryHaskellDepends = [
          base bytestring curl regex-base regex-tdfa tagsoup text
        ];
@@ -115518,7 +115864,7 @@ self: {
      mkDerivation {
        pname = "scan";
        version = "0.1.0.9";
-       sha256 = "0imc8zmg0d42pzbrxiyi8lqx5q24i73ajj3pmb3kqinfhm465jgv";
+       sha256 = "fbc9624885ce463cc7aa7748a9c68944e0d23145d1c79ed7bf8234f0ea47ac46";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base parsec ];
@@ -115532,7 +115878,7 @@ self: {
      mkDerivation {
        pname = "scan-vector-machine";
        version = "0.2.7";
-       sha256 = "112ibzc205pjcmjiwbknw7pdh0c5fyq6i4sqk97jfdr0ynb72vvc";
+       sha256 = "6c6f7196f52037274f9a589368b0778501d8eee1762e1e6565f21620d85f5184";
        libraryHaskellDepends = [ accelerate array base dph-base HUnit ];
        testHaskellDepends = [ array base HUnit ];
        description = "An implementation of the Scan Vector Machine instruction set in Haskell";
@@ -115547,7 +115893,7 @@ self: {
      mkDerivation {
        pname = "scat";
        version = "1.1.0.1";
-       sha256 = "18sn7dg2pc5wx73gxs6036fxp8yal95pfh336llvmn3azmkd6n95";
+       sha256 = "2559d366fd6ad8ba29356340774ba2caa3db9d19c0e8fec6e9bcb02b5e3b56a3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -115575,7 +115921,7 @@ self: {
      mkDerivation {
        pname = "scc";
        version = "0.8.2.2";
-       sha256 = "0rsx9h0y5g2sgwg47lzdzpmx5nfnpb033fyzz5xkxnc5k4bllad5";
+       sha256 = "a5294a179985d93e7bf9dfbb31c0bad6d9d2ebfdedd3431e7f5abce2014c5d67";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115606,7 +115952,7 @@ self: {
      mkDerivation {
        pname = "scenegraph";
        version = "0.1.0.2";
-       sha256 = "1l946h6sggg2n8ldx34v2sx4dyjqxd7i34wrsllz88iiy4qd90yw";
+       sha256 = "dc83d430f13122f429d59993114feb58fa46ba169b8cde28b2e2bda70d3424d1";
        libraryHaskellDepends = [
          array base containers fgl GLUT haskell98 hmatrix mtl old-time
          OpenGL process
@@ -115625,7 +115971,7 @@ self: {
      mkDerivation {
        pname = "scgi";
        version = "0.3.3";
-       sha256 = "0zmn5w5vwxv8slnydbrj1jfhmbvsyars2wf9bbrbgvwsfd40zd2m";
+       sha256 = "55b40f48739aefb7f25ac971a1b3f27aaf0a9d0c32afe62dd56877be0b2fb67e";
        libraryHaskellDepends = [
          base bytestring cgi extensible-exceptions network
        ];
@@ -115640,7 +115986,7 @@ self: {
      mkDerivation {
        pname = "schedevr";
        version = "0.1.0.6";
-       sha256 = "1ggywgyfpdza1fk66ixj8z3a1nv1r64dmw7l4d1m3h65yzxx9jcb";
+       sha256 = "8bc9d4fbf7c5c0514323f4f0da88c961dba0c647b24763a60beab7ebfce3febd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -115660,7 +116006,7 @@ self: {
      mkDerivation {
        pname = "schedule-planner";
        version = "1.0.1.1";
-       sha256 = "1x42jm9fciwdp1khlvcw5vl748pw12n8xk4phbnd6iwqaazf9wv8";
+       sha256 = "68f3e4be529847d3ec8297cc8eac08fc2272e82e9c6d0a67b88d47e6529582f4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -115676,7 +116022,7 @@ self: {
      mkDerivation {
        pname = "schedyield";
        version = "1.0";
-       sha256 = "0lzhxlfxa660vx4y49gbg2q76v8dda00h3rznj5fhdjj29pkypgp";
+       sha256 = "f75d3f6f125236e88ab43f0f08806a0d6d73b078eb25e249dfc018d51dedf053";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Exposes standard POSIX function sched_yield";
@@ -115698,7 +116044,7 @@ self: {
      mkDerivation {
        pname = "scholdoc";
        version = "0.1.3";
-       sha256 = "0dsbr4nk56cmbgdnk91s39lc4qp2wb39hkyisaf4f1n6nmx8zmn4";
+       sha256 = "c4d68f7ab5c606479cd2d14f98c6e2e262c2681a3aa469db5b9599322dc94b37";
        revision = "1";
        editedCabalFile = "bbe7070ca2ca48d86095c9a45120d2bfbf6a480b3894117d70e0f8e3ccabb435";
        isLibrary = true;
@@ -115738,7 +116084,7 @@ self: {
      mkDerivation {
        pname = "scholdoc-citeproc";
        version = "0.6";
-       sha256 = "0wy8cwr933zcqb85qscj9l9qcl2xv8mkbd2g9b4gs7c1k5b6khll";
+       sha256 = "94c2695699811dfdc84a4fb4352bda5d5086134d92695cd0c2ec8f913267c873";
        revision = "1";
        editedCabalFile = "33a066de8000d8bdb0a8f04f71baca64e27f4a2bb2d2a330f6d5a7f81090b118";
        isLibrary = true;
@@ -115772,7 +116118,7 @@ self: {
      mkDerivation {
        pname = "scholdoc-texmath";
        version = "0.1.0.1";
-       sha256 = "05yb55df33v357khdkr95ghmxqzikvq8gxqkh143zc8fi43gjf99";
+       sha256 = "2939f906890eb13f488013f787f09ef1e35ee12b29cf06e729638fe15a29cb17";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115795,7 +116141,7 @@ self: {
      mkDerivation {
        pname = "scholdoc-types";
        version = "0.1.3.1";
-       sha256 = "02335isa6w7mxjziiwsdm2883b778v0y0ayzxpha9p0xr5nlkbar";
+       sha256 = "59ad496dc91ddca4e0eddf2be0c146e7ac8190a84df318bfecf570a3742c6308";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq-generics ghc-prim syb
        ];
@@ -115810,7 +116156,7 @@ self: {
      mkDerivation {
        pname = "schonfinkeling";
        version = "0.1.0.0";
-       sha256 = "1wwbalfkfg66azr9zizscvdc2csi9q73d6wq5bwbiq33z522nwxy";
+       sha256 = "be732b44f963e0b8f82a989b360e4e5133c1da66fac79ff257c63c371d558bf3";
        libraryHaskellDepends = [ base ];
        description = "Transformation of n-ary functions to unary functions";
        license = stdenv.lib.licenses.bsd3;
@@ -115821,7 +116167,7 @@ self: {
      mkDerivation {
        pname = "sci-ratio";
        version = "0.2.1.0";
-       sha256 = "1qddamwk2fzakixx9f0y0r3z9z6kmyyxgpb3dhiiiza6krnf8r9k";
+       sha256 = "3365e46c9e46fd18236c63ddd7bdafd3fcf447061eb8d47b9cea3b317955ade1";
        libraryHaskellDepends = [ base hashable ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/Rufflewind/sci-ratio";
@@ -115834,7 +116180,7 @@ self: {
      mkDerivation {
        pname = "science-constants";
        version = "0.2.0.0";
-       sha256 = "0qp3d9la929kks2b2pyylgznl86gy91lp3zgpb9bn7gas3wll9vy";
+       sha256 = "7e274af9d0ea1dbbd2baef8f4b43f2cf206affa3de5fb1849e3389a4686ae362";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Mathematical/physical/chemical constants";
@@ -115846,7 +116192,7 @@ self: {
      mkDerivation {
        pname = "science-constants-dimensional";
        version = "0.1.0.1";
-       sha256 = "0n39pfs7kfhy62vl9q2ka5f9bfckncpssjsdx71d1hrld0jcq2g8";
+       sha256 = "e809cc246834c3d0c2e94d4bad2fb393b9955c5153e044b7301eba79b4bb6958";
        libraryHaskellDepends = [
          base dimensional numtype science-constants
        ];
@@ -115864,7 +116210,7 @@ self: {
      mkDerivation {
        pname = "scientific";
        version = "0.3.3.8";
-       sha256 = "0k6f9g3jpwhm52af4zayhdby8xibarn60mpxbb8xxgm78hmdw373";
+       sha256 = "e30cde2a44a7beded15afd56606c562b76e457835e7de2942815f22bc74bce4c";
        libraryHaskellDepends = [
          array base bytestring deepseq ghc-prim hashable integer-gmp text
        ];
@@ -115885,7 +116231,7 @@ self: {
      mkDerivation {
        pname = "scion";
        version = "0.1.0.2";
-       sha256 = "1ihq538ym6hh099p0h9p1ngjsq3a9h9k5ssnwyr4bqhlmv8xam0i";
+       sha256 = "1154d5d1ae14e245b2e756eb32134c6a602d9f0d3741705302109aead12818c6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115916,7 +116262,7 @@ self: {
      mkDerivation {
        pname = "scion-browser";
        version = "0.5.0";
-       sha256 = "1nf4rvy8szxjra6l20jxd0v2f6zf985jiz2d1y5rkfvrqx1pwqnc";
+       sha256 = "cc627e43c779bb998b0f4dfc280b4aee1b2736685d02418dcab27f8dfccec4d9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115946,7 +116292,7 @@ self: {
      mkDerivation {
        pname = "scons2dot";
        version = "0.9";
-       sha256 = "1c9akvpvwakdnqciz57bwjhqkdfkky43wmj7rx9fsk552pamzijk";
+       sha256 = "53c65fd515a54ced52cf47563e889fd3b589a1e4eb941f19b66d2abeef9e2ab1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring containers process ];
@@ -115963,7 +116309,7 @@ self: {
      mkDerivation {
        pname = "scope";
        version = "0.8.0.1";
-       sha256 = "1ks66paa30xwqgrllkyz0phh73pc0d2f6aq474cpz7gdb7zyrkzi";
+       sha256 = "f1cfecff59ed9d7f1939042be34403ec8e03e105df4f4af3c3bc83a1d43546cf";
        libraryHaskellDepends = [
          base bytestring containers iteratee MonadCatchIO-transformers mtl
          mwc-random time unix zoom-cache
@@ -115980,7 +116326,7 @@ self: {
      mkDerivation {
        pname = "scope-cairo";
        version = "0.8.0.1";
-       sha256 = "0dhpyf0kh6qrrcyr3iwp3i3rkj5vcl7k7aa9qmxq2qq1f6dhw4p6";
+       sha256 = "e6120e9b710163817bc549a9330f65bbc899471c97c7913dcb191b3881f31736";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116004,7 +116350,7 @@ self: {
      mkDerivation {
        pname = "scottish";
        version = "0.1.0.1";
-       sha256 = "01874r5r6lzwa7w0pa5i0ymnxb5vpkpxyfnf3knlyblv9b5j82nx";
+       sha256 = "dd0a24cb4a9b2e4fed1cce3adfefbcbbac6eab07b1a80bf851fc53934b260705";
        libraryHaskellDepends = [
          base data-default enclosed-exceptions http-types lens mtl
          persistent resource-pool scotty stm text transformers wai warp
@@ -116026,7 +116372,7 @@ self: {
      mkDerivation {
        pname = "scotty";
        version = "0.10.2";
-       sha256 = "0jlw82brnvc4cbpws0dq3qxn4rnb3z6rx6cfiarqwas14x4k3kl6";
+       sha256 = "86ce314927412b8eb38a8e999ecd1fcb66623b1eb801cdef62846d9b97409c4a";
        revision = "1";
        editedCabalFile = "e0ab23342583c37af1a5422fad9a64926e54cad208dbcac75c70b3db40bf9e99";
        libraryHaskellDepends = [
@@ -116051,7 +116397,7 @@ self: {
      mkDerivation {
        pname = "scotty-binding-play";
        version = "1.3";
-       sha256 = "0k9ylywhvb4nfnm304zlan0bzdx8rxcwnvip8assz80kz47zvjp9";
+       sha256 = "e9cafd0ff913a0afb542376ecb59cfa8b7bf8055f41330aa7596ac0db9a73e4d";
        libraryHaskellDepends = [
          base bytestring mtl scotty template-haskell text
        ];
@@ -116069,7 +116415,7 @@ self: {
      mkDerivation {
        pname = "scotty-blaze";
        version = "0.1.3";
-       sha256 = "0bl37bplal6y6ma0ba8llypsrx11959vcq04s8x6642hzk0cgid7";
+       sha256 = "a7c5c7c0fc5010633ad20460b6534921f4acafa714a9055435de5045ef3a832e";
        libraryHaskellDepends = [
          base blaze-builder blaze-html mtl scotty wai
        ];
@@ -116085,7 +116431,7 @@ self: {
      mkDerivation {
        pname = "scotty-cookie";
        version = "0.1.0.3";
-       sha256 = "0wyvx30889lbbgq7dmjfldlbnyg1b8b3zh1py5lis59mwz6r3w9l";
+       sha256 = "34f191cde735151d69f137c03f165ae179bb68a34ed676f05b8b2684c0e8db73";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers cookie scotty text time
          transformers
@@ -116103,7 +116449,7 @@ self: {
      mkDerivation {
        pname = "scotty-fay";
        version = "0.1.1";
-       sha256 = "13ksxw2v6gac3r368ifnbrrgmmafr2fyki63ws4qxw415fwnqa82";
+       sha256 = "02296cb92b81f08e89e6c3c4e99dc84ed5fa725ed64564461e4c3db305ef7a8e";
        libraryHaskellDepends = [
          base bytestring data-default directory fay fay-jquery filepath
          http-types scotty text transformers wai
@@ -116126,7 +116472,7 @@ self: {
      mkDerivation {
        pname = "scotty-hastache";
        version = "0.2.1";
-       sha256 = "1yyip8iq1n71iidmpbfs7rifxvpphyrcaf4z394rx36hq72ka8dn";
+       sha256 = "b62135c5c1d08c9e491a9f38c5b287f7eeee623edaad5b5b8ce1d88023bad1fb";
        libraryHaskellDepends = [
          base containers filepath hastache http-types mtl scotty text wai
          warp
@@ -116145,7 +116491,7 @@ self: {
      mkDerivation {
        pname = "scotty-session";
        version = "0.0.5";
-       sha256 = "1jvxzsnprfp2k9svkzxykmpc3qs6dvzc0wnnircyimha4gca6qh7";
+       sha256 = "0762a3d8230ad6e8598ed672c0fe6e46e3c16e9dbeffb9759ae2ba7cadfe7dcb";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring crypto-api
          http-types scotty stm text time transformers unordered-containers
@@ -116162,7 +116508,7 @@ self: {
      mkDerivation {
        pname = "scotty-tls";
        version = "0.4.0";
-       sha256 = "1axr54s8zi9jw5y6yl2izjx4xvd25y18nh4fw7asq9fz0nwjb45a";
+       sha256 = "aa9025b905df25acd5e18e408b822fa2ed4ebafc51506f7ce132c58f3429b9ab";
        libraryHaskellDepends = [
          base scotty transformers wai warp warp-tls
        ];
@@ -116178,7 +116524,7 @@ self: {
      mkDerivation {
        pname = "scp-streams";
        version = "0.1.0";
-       sha256 = "1wi860cl9dsq6hfhyas3dk0gcjyd8hx62k3fjwgr5x56ps5fp6ry";
+       sha256 = "3e9beb8abea6f4921f976e4c613a44cd4bf6c06c432b0f1d3458b744193028f2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116201,7 +116547,7 @@ self: {
      mkDerivation {
        pname = "scrabble-bot";
        version = "0.1.0.0";
-       sha256 = "035jpwp58l70jd0dklx5rg0sm8b2bd5r1m726dbhhlv60w6bdfn3";
+       sha256 = "c3bab60c076653085733e2d4904b5b62a1aac1cba5d3d94093e050542ebfb20c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -116221,7 +116567,7 @@ self: {
      mkDerivation {
        pname = "scrobble";
        version = "0.2.1.1";
-       sha256 = "161l75bni4fxmh35dfz8r2vgllmmf0s55j9y2xpyskqfj3xc85a7";
+       sha256 = "4715c4fa900e4fed6f173ec9523470b552fab6c8e8bb5606acdd916857393498";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116245,7 +116591,7 @@ self: {
      mkDerivation {
        pname = "scroll";
        version = "1.20150323";
-       sha256 = "06nzvvqn592jgf93zck74w1nhzjq0llzypsy7x575ljvprb3ph0d";
+       sha256 = "0dc03b56be5bd2724a3f5e5fff2905587e68032767b23f927b52a462f1dedf1a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -116267,7 +116613,7 @@ self: {
      mkDerivation {
        pname = "scrypt";
        version = "0.5.0";
-       sha256 = "1cnrjdq1ncv224dlk236a7w29na8r019d2acrsxlsaiy74iadh1y";
+       sha256 = "3ec0a622393e2a4dbbce4c899602c848d924f8516688491b1162331b7093d9b2";
        libraryHaskellDepends = [
          base base64-bytestring bytestring entropy
        ];
@@ -116290,7 +116636,7 @@ self: {
      mkDerivation {
        pname = "scrz";
        version = "0.0.0.1";
-       sha256 = "1j5mvvrk1647qfqdl4q6ywnx7l9bgnqp6rsjr1l8bynikfm0ghcg";
+       sha256 = "8fc107aa9bd1fa8568c8526773b17d2bd1d32df70613dab0c3879830f3deb5c8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -116313,7 +116659,7 @@ self: {
      mkDerivation {
        pname = "scyther-proof";
        version = "0.10.0.1";
-       sha256 = "0c4djdr2lq6kbi726zmjicscsc2ksj4l787pzyj5lfbl9c11fb6j";
+       sha256 = "d22c17024b74395aa4fff7a04389d45330cd348bb27e234e5cd3602a72938d30";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -116333,7 +116679,7 @@ self: {
      mkDerivation {
        pname = "sde-solver";
        version = "0.1.0.0";
-       sha256 = "0sp12fcf1h4qs0l5iblf3kl6nv1sb4ff49p2ybmrx7jifiwqxma6";
+       sha256 = "46d58e7974519e9eebf2e226e21c593a6c6be81c8eae5828d098c0e09813e16a";
        libraryHaskellDepends = [
          base cereal cereal-vector ghc-prim haskell-mpi
          mersenne-random-pure64 mtl mwc-random normaldistribution parallel
@@ -116351,7 +116697,7 @@ self: {
      mkDerivation {
        pname = "sdf2p1-parser";
        version = "0.1.1";
-       sha256 = "1az42i4ridb4xza6zyg2mrsfv7gjp61727cmnfcy5x5b55nl3ahz";
+       sha256 = "1faa416d29abf4e299b3951d7182b9f29ded74aee2f96fd4ef64b5984914e4ab";
        libraryHaskellDepends = [ base bytestring parsec transformers ];
        testHaskellDepends = [
          base bytestring Cabal HUnit parsec test-framework
@@ -116367,7 +116713,7 @@ self: {
      mkDerivation {
        pname = "sdl2";
        version = "1.3.1";
-       sha256 = "17d3nmiz32hccbbxx55wa2zca8xn7mq3f02rcarzynqczvi5hlyv";
+       sha256 = "db5358e2fe0c5bffb362590037703db623c5be50bc94ded7620c8af163b5a39d";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ SDL2 ];
        libraryPkgconfigDepends = [ SDL2 ];
@@ -116380,7 +116726,7 @@ self: {
      mkDerivation {
        pname = "sdl2-image";
        version = "0.1.3.2";
-       sha256 = "0gps89yy4jzmlh5cdvs94mhmqlakqb99ldall3rirqdfhdv2wysj";
+       sha256 = "527b2e7683aee11cf3a054359ad2c253515c612549efc60aa4f54be27d42fa3e";
        libraryHaskellDepends = [ base sdl2 ];
        librarySystemDepends = [ SDL2 ];
        libraryPkgconfigDepends = [ SDL2 SDL2_image ];
@@ -116393,7 +116739,7 @@ self: {
      mkDerivation {
        pname = "sdl2-ttf";
        version = "0.2.1";
-       sha256 = "0w760xsb02n0j4bv7iigc810mwasgjf8lckrjqbipqvvq1am3l56";
+       sha256 = "a6d05155c07be31b179679328a9c7c5af10a02622fc6b31791c00ab07407e670";
        libraryHaskellDepends = [ base sdl2 ];
        librarySystemDepends = [ SDL2 SDL2_ttf ];
        testHaskellDepends = [ base sdl2 ];
@@ -116406,7 +116752,7 @@ self: {
      mkDerivation {
        pname = "sdnv";
        version = "0.1.0.0";
-       sha256 = "07d7989v4a8dz5jqrhz56ki9wkngaf1d0153271lylj015y00rmc";
+       sha256 = "ac66007c0940524fc311a304d08253cf4e9ee234e5c38c65f90d29b2134aa71d";
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Self-delimiting numeric values encoding library";
        license = stdenv.lib.licenses.bsd2;
@@ -116423,7 +116769,7 @@ self: {
      mkDerivation {
        pname = "sdr";
        version = "0.1.0.3";
-       sha256 = "1whw45vnns0f5iw9vlmfxw90y3l0gp0q5yar6p6dp1dn57gyrdkc";
+       sha256 = "6cb6ecdf29b685dbcc3559f982c17d800e0f12efaed29d782c0e686b77211cf2";
        libraryHaskellDepends = [
          array base bytestring cairo cereal Chart Chart-cairo colour
          containers Decimal dynamic-graph either fftwRaw GLFW-b OpenGL
@@ -116451,7 +116797,7 @@ self: {
      mkDerivation {
        pname = "seacat";
        version = "1.0.0.3";
-       sha256 = "0iyl7mp0vpxy4kqr7qqqz642zxpla3ydlbdzmw4ipjmg5gwjr7pm";
+       sha256 = "f59e2cf92bafca1b09afbf2ddafc50f4f62f88f918e393f124bedf0d6e3dd447";
        libraryHaskellDepends = [
          base blaze-builder blaze-html bytestring ConfigFile data-default
          directory filepath http-types mime-types MissingH monad-control mtl
@@ -116471,7 +116817,7 @@ self: {
      mkDerivation {
        pname = "seal-module";
        version = "0.1.0.1";
-       sha256 = "0x2m280qbfaswr2gk26d26dwg2s3v1nk4n93zh2fh1ikpkw13dfq";
+       sha256 = "d8b511f8bc3306e804fc2359326dd8438bc79b11cd88f944e65ab98501125574";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell support for global configuration data";
        license = stdenv.lib.licenses.bsd3;
@@ -116484,7 +116830,7 @@ self: {
      mkDerivation {
        pname = "search";
        version = "0.1.0.1";
-       sha256 = "0w9pfyw33zrfjy70bwslbgyns1jswshzxcz71cgbfl4q5hjbmvkw";
+       sha256 = "7ceeba242c9850b71e0be7b3fea1e65a066dfd5b54f3058e972eff31b8773771";
        libraryHaskellDepends = [
          base ghc-prim profunctors semigroupoids tagged transformers
        ];
@@ -116501,7 +116847,7 @@ self: {
      mkDerivation {
        pname = "sec";
        version = "0.0.1";
-       sha256 = "1ryl0nm1a37r606xhxy6ykf3c8c1gml6gdqna428w8y3a2vg5q2v";
+       sha256 = "5be0f2b650c3238e045116b767687d812136dcf4c677d80d30f90c15aa05d4e7";
        libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/urso/sec";
@@ -116514,7 +116860,7 @@ self: {
      mkDerivation {
        pname = "secdh";
        version = "0.2";
-       sha256 = "0qrb2g7dfhh2m3hwp39xlimbc3kinww279a58pah738gqnhmayrs";
+       sha256 = "3a7b55a1c50f8d03d54545a52338b7710eb66aa43d8dcbe1a80242d7ce132b63";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -116530,7 +116876,7 @@ self: {
      mkDerivation {
        pname = "seclib";
        version = "1.1.0.2";
-       sha256 = "0jbgdd3mh126c3n0sblvd7rbcnnzrfyfajrj9xcsj7zi7jqvs8nw";
+       sha256 = "dc22bdb13cf11fa9594f324be5bccbdf5ab6f2699b2e0dec60460458476b6f49";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "A simple library for static information-flow security in Haskell";
@@ -116547,7 +116893,7 @@ self: {
      mkDerivation {
        pname = "second-transfer";
        version = "0.6.0.0";
-       sha256 = "1w726qfbz86sicpg5apx5n767av61l3kn8fra7ban8f67amg3z7w";
+       sha256 = "fcfcf1aa3ac621abd651d9213b070d66ab638e2dfdaaf22e8bdaa0bf1c36e2f0";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring binary bytestring clock conduit
          containers deepseq exceptions hashable hashtables hslogger http2
@@ -116576,7 +116922,7 @@ self: {
      mkDerivation {
        pname = "secret-santa";
        version = "0.1.0.0";
-       sha256 = "0qrc1jk2hhhhq0cq9h9g8pc2frjsb1m96h6sdj79m7km5dc2slm8";
+       sha256 = "a8522d582b759e9a8e6cda40936a585a6627d8452fc18419c0104228a60c2c63";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -116597,7 +116943,7 @@ self: {
      mkDerivation {
        pname = "secret-sharing";
        version = "1.0.0.3";
-       sha256 = "0q315gmfnhpzgi4r0p3li8vvrdl2a0xgh0gxdin6s3nkh6hjpbv2";
+       sha256 = "62af2ba181d30e6d6c6cfd01f83a5082b6bc378a745c90497cff42ebea2b6160";
        libraryHaskellDepends = [
          base binary bytestring dice-entropy-conduit finite-field polynomial
          vector
@@ -116616,7 +116962,7 @@ self: {
      mkDerivation {
        pname = "secrm";
        version = "0.0";
-       sha256 = "0hcf8mxl1br27764ha0gdf7jdl7zlxknbspqijw0jr6ws7hshxg9";
+       sha256 = "e975a8e1d1dc6409b88cf8ea6567a7ffd0268f6b0f2848cc3922af407b458e41";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 ];
@@ -116633,7 +116979,7 @@ self: {
      mkDerivation {
        pname = "secure-sockets";
        version = "1.2.9.2";
-       sha256 = "0ijizi76fzqamynwhyd3ppzy90bfvypmzbjr0v63ng2w0mwnrjlz";
+       sha256 = "9fca6c79055c3c3bcc0659ae5fafdf6e81e4ffbda379c8adaf0a7f674efc5146";
        libraryHaskellDepends = [
          base bytestring directory HsOpenSSL network process transformers
        ];
@@ -116647,7 +116993,7 @@ self: {
      mkDerivation {
        pname = "securemem";
        version = "0.1.9";
-       sha256 = "0dkhhjxa7njc3qbgvd5a23rkvr39vj2kn2a9nk6yjg7a8b2hvdpy";
+       sha256 = "feb60dc542ea3ce9cdb449093b85dc69e43df310aab4fd161e4cdaa3ba847036";
        libraryHaskellDepends = [
          base byteable bytestring ghc-prim memory
        ];
@@ -116663,7 +117009,7 @@ self: {
      mkDerivation {
        pname = "sednaDBXML";
        version = "0.1.2.5";
-       sha256 = "068yl4z0wb5kr7a7c7haah3z391mjqdzgxh5rg68rrjgvf7dczky";
+       sha256 = "7e7ed68edb4fe68ccccb05f6f71b9635a4f107540a1e76d4c9b32c0e3ea11e19";
        libraryHaskellDepends = [
          base bindings-DSL bytestring containers iteratee mtl text
        ];
@@ -116678,7 +117024,7 @@ self: {
      mkDerivation {
        pname = "select";
        version = "0.4.0.1";
-       sha256 = "180cj5m0bap1lb19s68icpn1dvk2s395cmlcc6dnwz3mpbj5alj0";
+       sha256 = "405255e4ba757c6e9b618c5656d2d062ee16ec6511199dc2a2e1aa056a910ca0";
        libraryHaskellDepends = [ base ];
        homepage = "http://nonempty.org/software/haskell-select";
        description = "Wrap the select(2) POSIX function";
@@ -116692,7 +117038,7 @@ self: {
      mkDerivation {
        pname = "selectors";
        version = "0.0.3.0";
-       sha256 = "1chs2d1j58y4r01231hh50gr4h0wnwsg9mardzq8ybqc6z6l32pr";
+       sha256 = "f98a41cd370c2f8ff06f59d5f434b71c40921f2810862102c8c4a32243131ab2";
        libraryHaskellDepends = [
          array base containers template-haskell text xml-conduit
        ];
@@ -116708,7 +117054,7 @@ self: {
      mkDerivation {
        pname = "selenium";
        version = "0.2.5";
-       sha256 = "0vr3d891pj947lv2grgbc83nm828gz9bbz6dp8mnf9bsji3ih7l7";
+       sha256 = "871e1847947a25672bbacdfcb5d27f48a06a0762ebe527363d24c91b126a236f";
        libraryHaskellDepends = [ base HTTP HUnit mtl network pretty ];
        description = "Test web applications through a browser";
        license = stdenv.lib.licenses.bsd3;
@@ -116723,7 +117069,7 @@ self: {
      mkDerivation {
        pname = "selenium-server";
        version = "0.1.0.0";
-       sha256 = "13bqzhia3z35174hzf2ipl4ga62mcvh7whvhwj5b8rsazgi259qf";
+       sha256 = "0ea722e2fb4a67b48ae470437ee0665518f508bd51b80fc90965fca122fc788d";
        libraryHaskellDepends = [
          base conduit directory filepath http-conduit
          http-conduit-downloader network process random regex-tdfa
@@ -116742,7 +117088,7 @@ self: {
      mkDerivation {
        pname = "selfrestart";
        version = "0.1.0";
-       sha256 = "100a427r8xjfv7fsh7khj3db9klqwnalfy33w23khxqp7k1bkq3n";
+       sha256 = "76e0b9c23c17773887e063784795e598ceb4da90701ea8ddd94e76948f200a80";
        libraryHaskellDepends = [ base directory executable-path unix ];
        homepage = "https://github.com/nh2/selfrestart";
        description = "Restarts the current executable (on binary change)";
@@ -116754,7 +117100,7 @@ self: {
      mkDerivation {
        pname = "selinux";
        version = "0.1.1";
-       sha256 = "1r0lwah32y3cza5jnihzwkl4wdk23qh7sgw6yzcajq7rjnzrf8qw";
+       sha256 = "1c2397bf95f960a9d8f7863f7d201e62364ee8e41f462b8bfa6c7831a0e214e4";
        libraryHaskellDepends = [ base unix ];
        librarySystemDepends = [ selinux ];
        homepage = "https://github.com/luite/selinux";
@@ -116768,7 +117114,7 @@ self: {
      mkDerivation {
        pname = "semaphore-plus";
        version = "0.1";
-       sha256 = "1349pzjs91xayx4dib520037mmgh4lvyc0wjx8h8yf492dvfbdkr";
+       sha256 = "79b6e5761389388f20ea9203e63725f0d57a0600a2acd848f7aa87a4e5bf898c";
        libraryHaskellDepends = [ base ];
        description = "Various concurrency abstractions built on top of semaphores";
        license = stdenv.lib.licenses.bsd3;
@@ -116781,7 +117127,7 @@ self: {
      mkDerivation {
        pname = "semi-iso";
        version = "1.0.0.0";
-       sha256 = "09hcg6hkyd4bnk0586gk4dzc76g64sx37jg0pz3jq87lrq8dzm5g";
+       sha256 = "afd4df10cef4202cc7bfe0c933ba26e699c37e23f31954c0b48b343fa1790c26";
        libraryHaskellDepends = [
          base lens profunctors semigroupoids transformers tuple-morph
        ];
@@ -116795,7 +117141,7 @@ self: {
      mkDerivation {
        pname = "semigroupoid-extras";
        version = "5";
-       sha256 = "0ciq1jnc0d9d8jph9103v04vphiz7xqa69a8f4dmmcf3bjsk6bhh";
+       sha256 = "102e33b55cc3b15a1b714825a3703f3fc2bb09d8038404af442d35c0ac0c3832";
        libraryHaskellDepends = [ base profunctors semigroupoids ];
        homepage = "http://github.com/ekmett/semigroupoid-extras";
        description = "Semigroupoids that depend on PolyKinds";
@@ -116809,8 +117155,8 @@ self: {
      }:
      mkDerivation {
        pname = "semigroupoids";
-       version = "5.0.0.2";
-       sha256 = "14q7284gq44h86j6jxi7pz1hxwfal0jgv6i2j1v2hdzqfnd8z5sw";
+       version = "5.0.0.3";
+       sha256 = "17dc07085806c6b8c79863f489f0ad534713578a529935b081691830bab4d292";
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad containers contravariant
          distributive semigroups tagged transformers transformers-compat
@@ -116830,7 +117176,7 @@ self: {
      mkDerivation {
        pname = "semigroupoids-syntax";
        version = "0.0.1";
-       sha256 = "1r3byywgbcn82dq9xw4k9m5lgmhsgj02rxwmkrp4jwrjaax8v4zh";
+       sha256 = "f0938dba523273496e9e95f72c807c1ad6474b4d93f09e7013c8b2f5b8f76be4";
        libraryHaskellDepends = [
          base comonad containers contravariant distributive semigroupoids
          semigroups transformers
@@ -116851,7 +117197,7 @@ self: {
      mkDerivation {
        pname = "semigroups";
        version = "0.16.2.2";
-       sha256 = "0mzdv05yhrvnib62mwfwwj66fmyzs3axm0y5sn374ig2r113wzni";
+       sha256 = "d17e3e42c8e2457286d5c583dad5d0df57678ce4dcf12acc8a7667e80bd8ed57";
        libraryHaskellDepends = [
          base bytestring containers deepseq hashable nats text
          unordered-containers
@@ -116866,7 +117212,7 @@ self: {
      mkDerivation {
        pname = "semigroups-actions";
        version = "0.1";
-       sha256 = "0vns2vdchszw34i12s9rfl4cm76ympfrivpb397j2vzg2i7bghqb";
+       sha256 = "0bc3b74e14ef6f214f1aebee98ddadde9cca08753969112219fc6bc8da16da6e";
        libraryHaskellDepends = [ base containers semigroups ];
        jailbreak = true;
        homepage = "http://github.com/ppetr/semigroups-actions/";
@@ -116883,7 +117229,7 @@ self: {
      mkDerivation {
        pname = "semiring";
        version = "0.3";
-       sha256 = "1b56y5a45fha07rbqqjl6f5i2bw9pji97pagyjcn9bprzqfbiymy";
+       sha256 = "befab81cfef9ae6499f44fdd93a2bc892f118b335462bcf2010aba4254f1a6ac";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Boolean containers monoids ];
@@ -116903,7 +117249,7 @@ self: {
      mkDerivation {
        pname = "semiring-simple";
        version = "0.2.1.0";
-       sha256 = "074wp8bn6jhx8jjp78dzjpy9bdwc2i1a1sp6qkqj689zvrhwfman";
+       sha256 = "5655c761de3f2123f1c4e6eaa042148cb795fc95bfa173a5441d4a6317ba9c1c";
        libraryHaskellDepends = [ base ];
        description = "A module for dealing with semirings";
        license = stdenv.lib.licenses.bsd3;
@@ -116916,7 +117262,7 @@ self: {
      mkDerivation {
        pname = "semver";
        version = "0.3.3.1";
-       sha256 = "1cf8dcxq4s479f826drncqc4hd07hv330zsipkrn0vc30sbkdlrn";
+       sha256 = "36d3369706836d60f3bc517f30c6860734481866363723904b8768823b6bc8b1";
        libraryHaskellDepends = [ attoparsec base deepseq text ];
        testHaskellDepends = [ base tasty tasty-hunit text ];
        homepage = "https://github.com/brendanhay/semver";
@@ -116929,7 +117275,7 @@ self: {
      mkDerivation {
        pname = "sendfile";
        version = "0.7.9";
-       sha256 = "0hnw1ym81cff49dwww19kgbs4s0kpandbvn6h5cml3y0p1nxybqh";
+       sha256 = "102fdf6db8c00f5a5981c6eed5acba1368a2d79b2970ce5b22ceb180aa0fdc42";
        libraryHaskellDepends = [ base bytestring network ];
        homepage = "http://hub.darcs.net/stepcut/sendfile";
        description = "A portable sendfile library";
@@ -116943,7 +117289,7 @@ self: {
      mkDerivation {
        pname = "sendgrid-haskell";
        version = "1.0";
-       sha256 = "0k5sbc4j9palfsp7ryap79scb50jhm0kzzq0lfa0r7py1pkx2ylp";
+       sha256 = "977ad1e70dfe9e0c94a300ff3f41851294c5743a57f97cae7654dd24095bba4c";
        libraryHaskellDepends = [
          aeson base bytestring containers exceptions http-conduit
          monad-control text transformers
@@ -116960,7 +117306,7 @@ self: {
      mkDerivation {
        pname = "sensenet";
        version = "0.1.0.0";
-       sha256 = "1yzh1ngfddybxwqybvdg7l5lgg85kmhqhdl3mzsnndvz2labphp1";
+       sha256 = "e1c2bb14157f376bf5af833688619d05bd470b3dafede531efcbb7e69e0df0fb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -116981,7 +117327,7 @@ self: {
      mkDerivation {
        pname = "sentry";
        version = "0.1.0";
-       sha256 = "1kv4ldms739x4b2fbs6hjwy8bssrwv0kavn4jqdc2svzlfqxqsqx";
+       sha256 = "1d6bdcb1a37f6bc11a96c46e35c1e659eb853c97d0e8e5c4223d8da36ba364cf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117001,7 +117347,7 @@ self: {
      mkDerivation {
        pname = "senza";
        version = "0.1";
-       sha256 = "0pl7dcs9w4dzzajlfnkrjl5kgsx8zdzzl5hvikh9v9djsmw2290h";
+       sha256 = "10242178d5b2a59de08c1b16fa7ffba8eb370b95795a47a5fabf119e346b875e";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117014,7 +117360,7 @@ self: {
      mkDerivation {
        pname = "separated";
        version = "0.1.0";
-       sha256 = "18kb9c6l0ikhzy3kiw4pg5b7vcm42hhbkp693qyygpr74hzpi2h2";
+       sha256 = "028a783f2427dfe73d1ec9dcb92014a4b27d567997f03887ff7046400d4b6ba2";
        libraryHaskellDepends = [
          base bifunctors lens semigroupoids semigroups
        ];
@@ -117035,7 +117381,7 @@ self: {
      mkDerivation {
        pname = "seqaid";
        version = "0.4.0.0";
-       sha256 = "0kmzzxk1z10lqjawl0yqbv1n35b0bx41ikgiqii202m73khbg9qn";
+       sha256 = "16a7b7e01ca70a2062c4f1cd18485f609561c35ed803ca95c414841f66ffbf4e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117058,7 +117404,7 @@ self: {
      mkDerivation {
        pname = "seqalign";
        version = "0.2.0.4";
-       sha256 = "01a3fhymyp7279hym03zzz6qkh5h47nq5y1xglar0n46imjr98af";
+       sha256 = "4ea194658d865890157d3df882ed21b0c089cdff7f80ea613ae25c5f3d744305";
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
@@ -117069,7 +117415,7 @@ self: {
      mkDerivation {
        pname = "seqid";
        version = "0.1.0";
-       sha256 = "0q5vs8kravhiq906rrzi5iw5837bb8s6fibycgdracyfwrzvxly0";
+       sha256 = "c0d3be7fe6ce3395db637e4567345aeb0c54782cf1e76c40c2116e9527d2bb60";
        libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        description = "Sequence ID production and consumption";
@@ -117081,7 +117427,7 @@ self: {
      mkDerivation {
        pname = "seqid";
        version = "0.4.1";
-       sha256 = "0lfgw2fwizhid58aj4ncia8pqldzmkpzrmpgmvw51pgd0c25wjz0";
+       sha256 = "e04b5e0403eddd50f8aeefd6fcefacbf517c918acc12a9506911fec89de0cf51";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
@@ -117092,7 +117438,7 @@ self: {
      mkDerivation {
        pname = "seqid-streams";
        version = "0.1.0";
-       sha256 = "13g0c76lyl3b4qdznpyr2a3szjb1dch2bsvgyv68br94045fk6d2";
+       sha256 = "a299e90a0124e585ccf66feb25206b61c9af8712d95ffb1b266b504fcd61e08d";
        libraryHaskellDepends = [ base io-streams seqid ];
        jailbreak = true;
        description = "Sequence ID IO-Streams";
@@ -117104,7 +117450,7 @@ self: {
      mkDerivation {
        pname = "seqid-streams";
        version = "0.4.0";
-       sha256 = "05h2878dlrnlv66lsf41bngk4w9nwqviq4jl3bj0wdhcdvy9d9il";
+       sha256 = "34a696fc6e0c360ee41a54121c37e63671329f5d81384d8dd9d466dad0410216";
        libraryHaskellDepends = [ base io-streams seqid ];
        jailbreak = true;
        description = "Sequence ID IO-Streams";
@@ -117118,7 +117464,7 @@ self: {
      mkDerivation {
        pname = "seqloc";
        version = "0.6.1.1";
-       sha256 = "1hsm9y6q0g7ixnqj562a33lmyka4k7f778fndcmn25v4m1myfda4";
+       sha256 = "4435e76ba86417612b6bd6a173dc99444d5fe9184a9822b1edf13c808d4f55c3";
        libraryHaskellDepends = [
          attoparsec base biocore bytestring hashable unordered-containers
          vector
@@ -117142,7 +117488,7 @@ self: {
      mkDerivation {
        pname = "seqloc-datafiles";
        version = "0.4.2";
-       sha256 = "175nifix2vax5xsinz604mm3nid7krh5a9d7gqpy02wh4f5qdrja";
+       sha256 = "4ae6868b23900be02f7ea72555609ea7453b6a25c07c1b752f5d6dd1a38bb69c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117172,7 +117518,7 @@ self: {
      mkDerivation {
        pname = "sequence";
        version = "0.9.8";
-       sha256 = "0ayxy0lbkah90kpyjac0llv6lrbwymvfz2d3pdfrz1079si65jsh";
+       sha256 = "50cb62a24e07849f5dbba389ef76f57c656a36a58029e9ef0409aab928f0dd2b";
        libraryHaskellDepends = [ base containers transformers ];
        homepage = "https://github.com/atzeus/sequence";
        description = "A type class for sequences and various sequence data structures";
@@ -117184,7 +117530,7 @@ self: {
      mkDerivation {
        pname = "sequent-core";
        version = "0.5.0.1";
-       sha256 = "1q9rrr0nrnnhdv2jwpwjs1r98g3xdbqi7sfj7zsv1dykzalmc2nd";
+       sha256 = "cd0a56a9fad3b7b0f53fd2e913f16a7d3c9472d0925f2ec56ed0da6c41ce39e1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117202,7 +117548,7 @@ self: {
      mkDerivation {
        pname = "sequential-index";
        version = "0.2.0.1";
-       sha256 = "0vd7nrkx59vsxrhpb46kgzbvz7v830wh5zx3vg9494wvski983y6";
+       sha256 = "c60f94e2d49b9344d2dba3ff023918689fbfd77fd3907561ee7aa7d267b6a76d";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "https://github.com/aristidb/sequential-index";
        description = "Sequential numbers that allow arbitrarily inserting numbers - for containers";
@@ -117216,7 +117562,7 @@ self: {
      mkDerivation {
        pname = "sequor";
        version = "0.7.2";
-       sha256 = "1m41yk7bgazl9g30im8qvnvzjh4f4kvrd6jhk1wz2r31xxlxp7ms";
+       sha256 = "ba9edb69ef6164f17998509a96f7248e40f9b7dd18d508c64bf4abb7cef481d4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117240,7 +117586,7 @@ self: {
      mkDerivation {
        pname = "serf";
        version = "0.1.1.0";
-       sha256 = "0ry0shqmazxcsjxsh6amvz2fky2fy3wwlck7d331j8csz7fwdjfn";
+       sha256 = "d6c9c6ddf99a2119c6686732caf9f04ef8e9c4df5519a8bbd4ac7f5531d4c067";
        libraryHaskellDepends = [
          attoparsec base conduit conduit-extra mtl operational process
          resourcet text
@@ -117255,7 +117601,7 @@ self: {
      mkDerivation {
        pname = "serial";
        version = "0.2.7";
-       sha256 = "1h52h8i28bhamp57q57ih1w9h26ih9g1l25gg9rhiwv5ykhy2vfq";
+       sha256 = "d86de1e1f465f308737aaf081a5e82d108987880f1147ccaad0a2e242282a2c0";
        libraryHaskellDepends = [ base unix ];
        description = "POSIX serial port wrapper";
        license = "LGPL";
@@ -117268,7 +117614,7 @@ self: {
      mkDerivation {
        pname = "serial-test-generators";
        version = "0.1.3";
-       sha256 = "0crivy8j3jnlm2vpbvfqgvmr6afwyg3lkzaj7jl0j6vgvq16xyas";
+       sha256 = "5af96e02de6f1b09a83c52fd49c7f3dc2993eb7ed8ed75b7a8d4ca2191df3133";
        libraryHaskellDepends = [
          aeson base binary bytestring cereal here
        ];
@@ -117285,7 +117631,7 @@ self: {
      mkDerivation {
        pname = "serialport";
        version = "0.4.7";
-       sha256 = "1z2drw7ighyws72wqms015n5hy0zxbrphdca7ldn34pz28122z07";
+       sha256 = "077c210212ff92611b3d8a3578f3ea1f78586c094057ccc5d1dcc3170fcf4dfc";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring HUnit ];
        homepage = "https://github.com/jputcu/serialport";
@@ -117303,7 +117649,7 @@ self: {
      mkDerivation {
        pname = "servant";
        version = "0.4.4";
-       sha256 = "1v0n194gj2cy16scfgs94q2vcb2baryp0rl1s21zwww1kfgmpffj";
+       sha256 = "d2b95b9f9b8173fe83d08166707d564b2cb60526493fc7b4099e09f9480a16ec";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
@@ -117326,7 +117672,7 @@ self: {
      mkDerivation {
        pname = "servant-JuicyPixels";
        version = "0.1.0.0";
-       sha256 = "1fnlyk6848nzby0nxdrvm4d0vvisdx6pmlzjnh6y1q5q8wq4m48j";
+       sha256 = "12914a3047b8e0e00db4f2d37a4d6f3aee0d1aa93bb76e815fdf2282ccf4d4ba";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117345,7 +117691,7 @@ self: {
      mkDerivation {
        pname = "servant-blaze";
        version = "0.4.4";
-       sha256 = "140sgy7hcp6pxjrh7zk5i59sq79swqgg76gakgdnvkg7zz0a150s";
+       sha256 = "1a94a0c0ffe7cd6ddb9bea99f31ee63a1dac538965fe03b3ecd75c068f7f1a90";
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
@@ -117362,7 +117708,7 @@ self: {
      mkDerivation {
        pname = "servant-client";
        version = "0.4.4";
-       sha256 = "0m5aw8pb6iga2rf8m3mnx58xh6jnh33rvvkdzbmb3s6vplsqh6vz";
+       sha256 = "7f1b8835bddbe8b1eafa6dee9dc780561ad851e9b68e8a5c16ea45b32ee2aa54";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring either exceptions http-client
          http-client-tls http-media http-types network-uri safe servant
@@ -117386,7 +117732,7 @@ self: {
      mkDerivation {
        pname = "servant-docs";
        version = "0.4.4";
-       sha256 = "0kp5346jxakjz8x92wvayz7c3f2xcvnpsgg9dxgb41imvww2pyfc";
+       sha256 = "ccf92b38df3506b25e6fe93d7ded665db8c1cef76a73913afa72aa2e0d19e54e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117415,7 +117761,7 @@ self: {
      mkDerivation {
        pname = "servant-ede";
        version = "0.5";
-       sha256 = "0lq9kd96lzkyx35n46q0yxk44lirpnh9gv4wji8i8qjqf18fkg6c";
+       sha256 = "ccbce9507058621451949cec97a0bd39524266f7001b62cbe87e7e6a529b0953";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117440,7 +117786,7 @@ self: {
      mkDerivation {
        pname = "servant-examples";
        version = "0.4.4";
-       sha256 = "1qzrlkqwfv4w7d3sjbvz3s4kgx0x6zn0hh07hm955vvlfksgwjym";
+       sha256 = "d54bfef47474ef525285074008ec371df437891e7f2fa9473b9c6cc7f1a4f9e3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -117462,7 +117808,7 @@ self: {
      mkDerivation {
        pname = "servant-jquery";
        version = "0.4.4";
-       sha256 = "04j2cnxrx2hljxnha94nbmql61zw3apz7n32mf23vf749svjcmvd";
+       sha256 = "6d5726b74ee4b83d84ab62d8f3af1afc0743715d9624056d97148a9ebb654212";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base charset lens servant text ];
@@ -117482,7 +117828,7 @@ self: {
      mkDerivation {
        pname = "servant-lucid";
        version = "0.4.4";
-       sha256 = "1vy9vdd1jkvx7nzcw6a83az4p351ds98x7wasn496h3bwk23bbhr";
+       sha256 = "19ae35c4e46b409388d58a9f8e926ea18c4bbe1a4819cebe3d7d4f195adbc9ef";
        libraryHaskellDepends = [ base http-media lucid servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Servant support for lucid";
@@ -117496,7 +117842,7 @@ self: {
      mkDerivation {
        pname = "servant-pandoc";
        version = "0.4.1.1";
-       sha256 = "00clyv651fyz0dx9b4g5c0z5z3bgybgg93x4s1b1lciwsin8i6nk";
+       sha256 = "d39a886cd43c321a56d0a48ff4def26f8d5f3e60e591957a03dfbb50ccf69401";
        revision = "1";
        editedCabalFile = "ee2eff37865c8a5c246021f6d05aae5f075ba5910cac6d650312aafb2f4bf091";
        libraryHaskellDepends = [
@@ -117512,7 +117858,7 @@ self: {
      mkDerivation {
        pname = "servant-pool";
        version = "0.1";
-       sha256 = "0if4lxb0fpdd4lnkz9j7z6vhjbrcc80pvz9jb6sdb9p6sbbgqf69";
+       sha256 = "c938fcd6d2e6a6d5b45932fd7d01622c2f09b7f947a63f2d25ad5d0756a7c445";
        libraryHaskellDepends = [ base resource-pool servant time ];
        homepage = "http://github.com/zalora/servant-pool";
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
@@ -117527,7 +117873,7 @@ self: {
      mkDerivation {
        pname = "servant-postgresql";
        version = "0.1";
-       sha256 = "1svy1v6sl5pq0zs8ms4qf7wn6zar63bqmfiyfqgz84ryli0wxrhj";
+       sha256 = "12e6ce41a43e13f41f763eba8ad730597d63f97198e88af407f816aacd0e7eeb";
        libraryHaskellDepends = [
          base bytestring postgresql-simple servant servant-pool
          servant-response
@@ -117543,7 +117889,7 @@ self: {
      mkDerivation {
        pname = "servant-response";
        version = "0.1";
-       sha256 = "0vgzi6nm3f1vjbnvhzcr6v2fh75fsl18wsps54ya0mbmfn2v6chy";
+       sha256 = "1e32b385757555a03c29fa6a8e02d5ae1ce8c436997db8ed923bb851ad89ff6d";
        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";
@@ -117557,7 +117903,7 @@ self: {
      mkDerivation {
        pname = "servant-scotty";
        version = "0.1.1";
-       sha256 = "0d3yc7aa2p1izizqnj81iscj9hbgbkpyav1ncmxzkr48svr6h783";
+       sha256 = "031d68f2d688e4f97b65366ce5ef5c6fc124998e01498b7ffc315ca1d4617e34";
        libraryHaskellDepends = [
          aeson base http-types scotty servant servant-response text
          transformers
@@ -117579,7 +117925,7 @@ self: {
      mkDerivation {
        pname = "servant-server";
        version = "0.4.4";
-       sha256 = "0byxply71jv558bs33i1j9whrfgfa1iygdjsxap7wiq9f27iyaa9";
+       sha256 = "49291f8f7009477eaeea5ab6e76350eeb90c7992218ea1172a65cb703cbddd2f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117607,7 +117953,7 @@ self: {
      mkDerivation {
        pname = "serversession";
        version = "1.0.1";
-       sha256 = "08j8v6a2018bmvwsb7crdg0ajak74jggb073pdpx9s0pf3cfzyrz";
+       sha256 = "3ffbefd87017e8d46fbbe380f59e24672aa9c06b999da5f9ae0b052094d94822";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring data-default hashable nonce
          path-pieces text time transformers unordered-containers
@@ -117629,7 +117975,7 @@ self: {
      mkDerivation {
        pname = "serversession-backend-acid-state";
        version = "1.0.1";
-       sha256 = "1hc5vpy82pxd0wlzabw3md4gvhxbnvs8wsa0wammni2a1pf123a7";
+       sha256 = "470d11dc0d4a445babe240698ef4b6abc3fd48ab832ff52907ad5f81fcdd85c1";
        libraryHaskellDepends = [
          acid-state base containers mtl safecopy serversession
          unordered-containers
@@ -117653,7 +117999,7 @@ self: {
      mkDerivation {
        pname = "serversession-backend-persistent";
        version = "1.0.1";
-       sha256 = "0n4l2hgfzlg1ra4blq6dcp61mvcfm6k8cwafi6rrzid67amr022k";
+       sha256 = "530890ab3aa6c59fb3894e7186a6a98eed1acc65cd60ba88cae1d1ef1e149458";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring cereal path-pieces
          persistent serversession tagged text time transformers
@@ -117678,7 +118024,7 @@ self: {
      mkDerivation {
        pname = "serversession-backend-redis";
        version = "1.0";
-       sha256 = "0r1zr25zw80s4psscdwscf7wlm8qfw4dyk0kkczzvj5434jnxnj2";
+       sha256 = "42da6e2519a4c8fd3f9b134cdf08771855ca8f639a37a6f5251a20fe8bc83f64";
        libraryHaskellDepends = [
          base bytestring hedis path-pieces serversession tagged text time
          transformers unordered-containers
@@ -117700,7 +118046,7 @@ self: {
      mkDerivation {
        pname = "serversession-frontend-snap";
        version = "1.0";
-       sha256 = "1n29c3jfv61fz9kfc4zjwj7df1fll74l2kqccxmg4id8jpsrywci";
+       sha256 = "91719ff595a845f26a670c4f41c9a1d405d78ee4f213e666fa2e98ede46049d8";
        libraryHaskellDepends = [
          base bytestring nonce path-pieces serversession snap snap-core text
          time transformers unordered-containers
@@ -117718,7 +118064,7 @@ self: {
      mkDerivation {
        pname = "serversession-frontend-wai";
        version = "1.0";
-       sha256 = "0rxifhjirhmhk1x14m6lvpv6dl32g179i4i3xi3dq59r7l716j0b";
+       sha256 = "0b48130e3d3915dc46ec2392984e7862d066f6ddd454127a98b0c21c2574b167";
        libraryHaskellDepends = [
          base bytestring cookie data-default path-pieces serversession text
          time transformers unordered-containers vault wai wai-session
@@ -117736,7 +118082,7 @@ self: {
      mkDerivation {
        pname = "serversession-frontend-yesod";
        version = "1.0";
-       sha256 = "0lv7gkj4inks98g44n5kqvx5s4c66lmxf7gqfdly54znggglcf86";
+       sha256 = "063946df7bf693e26973f81dd72b3586115dfac6b358421e4a7ada48e47c6753";
        libraryHaskellDepends = [
          base bytestring containers cookie data-default path-pieces
          serversession text time transformers unordered-containers wai
@@ -117756,7 +118102,7 @@ self: {
      mkDerivation {
        pname = "servius";
        version = "1.1.1.2";
-       sha256 = "02c570ghvrp0qw2s6k30548k619424p77bpi1mfh02yrv1a45jdk";
+       sha256 = "b3c94254d8d90b005d0df1ae732e112405331129604ca305c7e0e60d1f388509";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -117778,7 +118124,7 @@ self: {
      mkDerivation {
        pname = "ses-html";
        version = "0.3.0.0";
-       sha256 = "1clf24kyyp9b8r22bacp44q0gf83zr6k1b33dz4bfy935wbnlshy";
+       sha256 = "1e6a6a172f2379b7c86f63ac304dfe03b907302197a92544462b5def27118eb2";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html byteable bytestring cryptohash
          HsOpenSSL http-streams tagsoup time
@@ -117794,7 +118140,7 @@ self: {
      mkDerivation {
        pname = "ses-html-snaplet";
        version = "0.1.0.0";
-       sha256 = "1lrr321gk7djyzv9yb7x967d53azxflh4jkf9zlkpxh3p7rz6793";
+       sha256 = "231df3f3b903f63be94f6e4a02a9eb5f8dd28e49fd2c9ff6f7b29df9821839d3";
        libraryHaskellDepends = [
          base blaze-html bytestring configurator ses-html snap text
          transformers
@@ -117811,7 +118157,7 @@ self: {
      mkDerivation {
        pname = "sessions";
        version = "2008.7.18";
-       sha256 = "0zijfbakj3fh052b8nvaddg1xy87ysfbm3qnibisam93lx0agp2s";
+       sha256 = "5adca740a72355a5e38a168fba9cf607f91e5e6b6a5bb44401d00d39d572327e";
        libraryHaskellDepends = [
          base binary bytestring containers mtl network
        ];
@@ -117826,7 +118172,7 @@ self: {
      mkDerivation {
        pname = "set-cover";
        version = "0.0.4";
-       sha256 = "0323l2jnk5caa3wsxqxgsdkvnfs9llb4yh13c0rx55q0is8a203j";
+       sha256 = "7200a1908e0097d2336023404f16a5493bbb67d3afe3aef9508a9569a5a0430c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers utility-ht ];
@@ -117840,7 +118186,7 @@ self: {
      mkDerivation {
        pname = "set-extra";
        version = "1.3.2";
-       sha256 = "0lyxz1mnslsq8crc0vnvygz8r5r3iqyl457sjvg2j6lnz132917p";
+       sha256 = "f7842446f8961a29de96fa14423d8e23978cfef3db6ec0324358536d6bf8dd53";
        libraryHaskellDepends = [ base containers mtl syb ];
        homepage = "https://github.com/ddssff/set-extra";
        description = "Functions that could be added to Data.Set.";
@@ -117852,7 +118198,7 @@ self: {
      mkDerivation {
        pname = "set-monad";
        version = "0.2.0.0";
-       sha256 = "1nxgn8d0qff4s66gcvfrnxjh0aq5q5jk0s453km28457qh946azb";
+       sha256 = "eb2b4312c4a71024ea1c85683065c1052b0065b7d96df68cd1c4390c1ab2afdb";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Set monad";
        license = stdenv.lib.licenses.bsd3;
@@ -117865,7 +118211,7 @@ self: {
      mkDerivation {
        pname = "set-with";
        version = "0.0.1";
-       sha256 = "0mkc44gkhjibq3zhxgiw3c7nfy03jmjmrafdr8x9f5ak4l9ns0h4";
+       sha256 = "04026d13255315973acacda95c65950378670f1b3cbe0effc02b4a381f216c56";
        libraryHaskellDepends = [ base containers invariant ];
        testHaskellDepends = [
          base QuickCheck quickcheck-instances tasty tasty-hunit
@@ -117883,7 +118229,7 @@ self: {
      mkDerivation {
        pname = "setdown";
        version = "0.1.0.1";
-       sha256 = "1007cb1p8ymnm39cbk423jfgzvdk7yip54yy3ydiiqwkfy2rxs5g";
+       sha256 = "afe89e857793e3189b1fde9372a33fb3edff9c1c82ccc5d2a8b67a74c3620780";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -117902,7 +118248,7 @@ self: {
      mkDerivation {
        pname = "setenv";
        version = "0.1.1.3";
-       sha256 = "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73";
+       sha256 = "e358df39afc03d5a39e2ec650652d845c85c80cc98fe331654deafb4767ecb32";
        revision = "1";
        editedCabalFile = "c5916ac0d2a828473cd171261328a290afe0abd799db1ac8c310682fe778c45b";
        libraryHaskellDepends = [ base unix ];
@@ -117915,7 +118261,7 @@ self: {
      mkDerivation {
        pname = "setlocale";
        version = "1.0.0.3";
-       sha256 = "17n173byca8k5cmqmnzgjk7772ibhg5am5sd1adfp0zd0rcqnqsd";
+       sha256 = "4d638b5906ed83eb9a0a4d97aaca832b8a73ce94efdb8a2b2b1329e6d738c19e";
        libraryHaskellDepends = [ base ];
        homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
        description = "Haskell bindings to setlocale";
@@ -117927,18 +118273,40 @@ self: {
      mkDerivation {
        pname = "setops";
        version = "0.1.2";
-       sha256 = "1mja48p8g9prfk53218qbv83ks6rs63s0n6jad0jgrj1221afpvg";
+       sha256 = "6f5fa7821041e6274153d258a087d1d9e839d05e180531ca74f9a6872e224ad6";
        libraryHaskellDepends = [ base containers ];
        description = "Uniform names (and Unicode operators) for set operations on data structures";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "sets" = callPackage
+    ({ mkDerivation, base, commutative, containers, contravariant
+     , discrimination, hashable, QuickCheck, quickcheck-instances
+     , set-with, tasty, tasty-hunit, tasty-quickcheck
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "sets";
+       version = "0.0.1.1";
+       sha256 = "5f9262b02eb5e6d1caf85ae65f3b659b49e5d4b17447b8cbd52a359df8ba0a1d";
+       libraryHaskellDepends = [
+         base commutative containers contravariant discrimination hashable
+         set-with unordered-containers
+       ];
+       testHaskellDepends = [
+         base QuickCheck quickcheck-instances tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       description = "Various set implementations in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "setters" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
        pname = "setters";
        version = "0.1";
-       sha256 = "0rw9m9f7cqi0kvjcq81b7qrn3v672d4w0ch1k377m1151vg20a2z";
+       sha256 = "5f2820de0e25847ace980132c04913c7ec61333e2b20cce49e2062765caa8967";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Small (TH) library to declare setters for typical `record' data type fields";
        license = stdenv.lib.licenses.bsd3;
@@ -117952,7 +118320,7 @@ self: {
      mkDerivation {
        pname = "sexp";
        version = "0.7";
-       sha256 = "19blk6nzbsm9syx45zzlmqxq1mi2prv0jq12cf83b4kf4pvwk32n";
+       sha256 = "568cc9f7256e9235906322600976be22d6803baef4ff42bad7a9eaf5ad9974a5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117974,7 +118342,7 @@ self: {
      mkDerivation {
        pname = "sexp-show";
        version = "0.1.1.0";
-       sha256 = "1ip1y1y2z2d6ib3ihq18j93081cp2lkwjm27bc0d0ihixd154gy5";
+       sha256 = "c53f5242eb1146d0005b4754c927159705044692286018c78aa6892f7cf0e1c6";
        revision = "1";
        editedCabalFile = "314f05a4542c657517d485faa31ec23324458782cf0112acda948fb7092a154c";
        isLibrary = false;
@@ -117991,7 +118359,7 @@ self: {
      mkDerivation {
        pname = "sexpr";
        version = "0.2.1";
-       sha256 = "1ffs5r065zkipsa3y4v14if45fqjbzgksj3r40qci453kc3xq93p";
+       sha256 = "7724dc079ba390c8302079483ddf5f12bb425c2461133f94be71fe62402edab9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118008,7 +118376,7 @@ self: {
      mkDerivation {
        pname = "sext";
        version = "0.1.0.0";
-       sha256 = "0vq7fbm8gm7fym9qjaxsy2mk89rn2pjfkbhv3ym94xslcybwrwpy";
+       sha256 = "fef2cc9767547792aa1f1baee9e415362734abf0ba2b8953f5eed487ea72076f";
        libraryHaskellDepends = [ base bytestring template-haskell text ];
        jailbreak = true;
        homepage = "http://github.com/dzhus/sext/";
@@ -118022,7 +118390,7 @@ self: {
      mkDerivation {
        pname = "sfml-audio";
        version = "0.7.1.1816";
-       sha256 = "057z0z2xbls1p43k0kixbw26v0pv6lsvfh5ycjx37r8xw8ks31ba";
+       sha256 = "6a85a127e21de533ba64be40b73535fb826d045f3d4e3007b941d3d5c507ff14";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ libsndfile openal ];
        homepage = "http://patch-tag.com/r/shahn/sfml-audio";
@@ -118035,7 +118403,7 @@ self: {
      mkDerivation {
        pname = "sfmt";
        version = "0.1.1";
-       sha256 = "1jwzsk43kkvlmw551z46bhbvccf9yn1ncrhd27lm4pn93as2v1p6";
+       sha256 = "e6862db41ac95e52e9110d666683f5c931b6175c86fc500aaf74cf39c8d49fcb";
        libraryHaskellDepends = [ base bytestring entropy primitive ];
        homepage = "https://github.com/philopon/sfmt-hs";
        description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding";
@@ -118050,7 +118418,7 @@ self: {
      mkDerivation {
        pname = "sgd";
        version = "0.3.7";
-       sha256 = "1z4w81mbk2syrxacfrjb690ik6lcsh1fb7m3d65zlz37y3pk5q04";
+       sha256 = "04e032eff0677cfa8b69a39ee502d48c9a1941324b66c754cf5e8bb96a409cfc";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq filepath lazy-io logfloat
          monad-par mtl primitive random temporary vector
@@ -118068,7 +118436,7 @@ self: {
      mkDerivation {
        pname = "sgf";
        version = "0.1.3.1";
-       sha256 = "1bwfphbbkkwi2q8l0916yvpl58j7fb0nr144w582vpsq3wfvgiwc";
+       sha256 = "8cc7b71d1f58df2d50e184846cc17247a242eff6262440111691cfb916bc8eaf";
        libraryHaskellDepends = [
          base containers encoding extensible-exceptions mtl parsec split
          time transformers
@@ -118083,7 +118451,7 @@ self: {
      mkDerivation {
        pname = "sgrep";
        version = "0.0";
-       sha256 = "0ai9j735wj5lclixwlki5g2s50g2mscglfrir2q7bj0lwg76dygi";
+       sha256 = "f1f966cee314c875b0c8313bfa98aee281a2c52b7152de2365b4485ec691292a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bio regex-compat ];
@@ -118098,7 +118466,7 @@ self: {
      mkDerivation {
        pname = "sha-streams";
        version = "0.1.1";
-       sha256 = "1qasdpm244dr7zh3hnr51jbp1b8qnrwbxvm3nnrbaf7bah1y4d2i";
+       sha256 = "5134e20354eb38b5b2b5a3eebe78b618ad70970c255b38e03fb91122ea6d5ae1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base binary bytestring io-streams SHA ];
@@ -118116,7 +118484,7 @@ self: {
      mkDerivation {
        pname = "shadower";
        version = "0.1.0.6";
-       sha256 = "1m0zxnmxn536jnaj5l4qpj5k7xshffsbca0cl53y3dnb6ssq9fni";
+       sha256 = "d1ba84b536cbb6e147a10c28b6b47350f7338bbc98d02295956614dbabed1fd4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -118134,25 +118502,27 @@ self: {
      }) {};
 
   "shadowsocks" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , cryptohash, HsOpenSSL, HUnit, network, optparse-applicative
-     , process, unordered-containers
+    ({ mkDerivation, aeson, async, base, binary, bytestring
+     , conduit-combinators, conduit-extra, containers, cryptohash
+     , HsOpenSSL, HUnit, iproute, optparse-applicative, process
+     , unordered-containers
      }:
      mkDerivation {
        pname = "shadowsocks";
-       version = "1.20141007";
-       sha256 = "1630lfspy8fnsi9j2np9sygdng59bxx1q54kcr7cx7rgq434s5ys";
+       version = "1.20150811";
+       sha256 = "1021016861c01a63f4a30825431b22e74e5011984f9406fc6642f5070e201382";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson base binary bytestring containers cryptohash HsOpenSSL
-         network optparse-applicative unordered-containers
+         aeson async base binary bytestring conduit-combinators
+         conduit-extra containers cryptohash HsOpenSSL iproute
+         optparse-applicative unordered-containers
        ];
        testHaskellDepends = [
          base binary bytestring containers cryptohash HUnit process
        ];
        homepage = "https://github.com/rnons/shadowsocks-haskell";
-       description = "A fast tunnel proxy that help you get through firewalls";
+       description = "A fast SOCKS5 proxy that help you get through firewalls";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -118164,7 +118534,7 @@ self: {
      mkDerivation {
        pname = "shady-gen";
        version = "0.5.1";
-       sha256 = "1vsk0ah6ngcgn5i6xda9j400xan1y843v25hc4lqcql37mg3ifn8";
+       sha256 = "c8ba385e3d8362862961b0883d08f2c1aa0e009149b56e62b18f3d6ba00253ef";
        libraryHaskellDepends = [
          applicative-numbers base Boolean containers data-treify MemoTrie
          mtl ty TypeCompose vector-space wl-pprint
@@ -118183,7 +118553,7 @@ self: {
      mkDerivation {
        pname = "shady-graphics";
        version = "0.5.0";
-       sha256 = "1wzlygmpjfys4ijyqh8ymv2f75swy9zd0g05gxpqhxkvlrw3jdk4";
+       sha256 = "64363978a67b76886f7f053cd07ef25c97e3c4ae1e41ec6524da3b79ebf3f4f3";
        libraryHaskellDepends = [
          applicative-numbers base Boolean containers data-treify MemoTrie
          mtl shady-gen ty TypeCompose vector-space wl-pprint
@@ -118203,7 +118573,7 @@ self: {
      mkDerivation {
        pname = "shake";
        version = "0.15.5";
-       sha256 = "18vkyc8h7dpz5d3snfdssfqd1cfp22wnpv63ckrik9p8r4j6i01c";
+       sha256 = "2c806824c9e8a619f364c3ec6bb910d7b1d0b0d3ba39ab472bffb60311f373a3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118231,7 +118601,7 @@ self: {
      mkDerivation {
        pname = "shake-cabal-build";
        version = "0.1.0";
-       sha256 = "1ql2w164f2sfmbcqk2da00nihwfr6a85f99apx5dwpbkfbc53n8l";
+       sha256 = "14d951d872735dde4abf2a25579032d971182d00aa8989d9aa4e0b474ce082e2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -118250,7 +118620,7 @@ self: {
      mkDerivation {
        pname = "shake-extras";
        version = "0.1.1";
-       sha256 = "0qqzdhd6q8hhix7lx4j1v4j37b8jnv710clilk2wxbyvz03rbblz";
+       sha256 = "9fae9507f8dbafcec5a4913210ceb612ad3324d941924e4f8f10226c1a6c1f63";
        libraryHaskellDepends = [
          base bytestring cmdargs directory filepath shake
        ];
@@ -118268,7 +118638,7 @@ self: {
      mkDerivation {
        pname = "shake-language-c";
        version = "0.8.0";
-       sha256 = "1b7yi1cprgiyx06dnhc94shmfx5n1am7zhgiwg6g0bk2gg20im35";
+       sha256 = "65d408c47b622ef0cce3f1c17faa0ab67457a1268941db0ce83ebe7c5988feac";
        libraryHaskellDepends = [
          base data-default-class fclabels process shake split
          unordered-containers
@@ -118284,7 +118654,7 @@ self: {
      mkDerivation {
        pname = "shake-minify";
        version = "0.1.4";
-       sha256 = "17q0xzjj6xl9h3s6dlxgkxxz2dd4ycbh918ali1lrq2dq9gig3ir";
+       sha256 = "398e175fc24de04c43a40a850417f3a435f17b9fafd366f480897623e5ef009f";
        libraryHaskellDepends = [
          base bytestring css-text hjsmin shake text
        ];
@@ -118298,7 +118668,7 @@ self: {
      mkDerivation {
        pname = "shake-pack";
        version = "0.1.2";
-       sha256 = "0iy2n7cg7fm0by479s1hm5w2jzzfdavjlyq6nf2sh6qlkc6w2ga1";
+       sha256 = "413dc10d9b141ba885b3067b2ab76aee7f2978a930e874885fa0baf3d8b1c247";
        libraryHaskellDepends = [ base bytestring bzlib shake tar ];
        homepage = "https://github.com/LukeHoersten/shake-pack";
        description = "Shake File Pack Rule";
@@ -118314,7 +118684,7 @@ self: {
      mkDerivation {
        pname = "shaker";
        version = "0.5.1";
-       sha256 = "1m4b7pvpr5mg6g5sc9xhnn7i9lx65vb3ass38zkyrfgksg65lwhf";
+       sha256 = "0e725accd3f3b9ece747436b35d62ea6d3148fb5b027a6cb33af967cf73d8bd4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118344,7 +118714,7 @@ self: {
      mkDerivation {
        pname = "shakespeare";
        version = "2.0.5";
-       sha256 = "0jdmmrglzqzpj4cfiyab3kfr0vlz1rfc893nrq94b1rg4vwh1zzh";
+       sha256 = "f0ff00f9262f874512ce7624c45c0e9f6e90dd1c4bf9e81891f7e34f5faeb549";
        revision = "1";
        editedCabalFile = "c3cde3794b87e5f99500aac7199a66ad95985ba716170551fe40e82452a61ebc";
        libraryHaskellDepends = [
@@ -118367,7 +118737,7 @@ self: {
      mkDerivation {
        pname = "shakespeare-css";
        version = "1.1.0";
-       sha256 = "18d0kxfrs0aj9pfd9p1j7w5amch1hvsww3xycgn5qk6i0z7l4ywz";
+       sha256 = "9f7b42cf07d14c5cec63be0fcef58601b2aa0a3f32dcd4dc4d52019d5d9fa0a1";
        libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Stick your haskell variables into css at compile time. (deprecated)";
@@ -118380,7 +118750,7 @@ self: {
      mkDerivation {
        pname = "shakespeare-i18n";
        version = "1.1.0";
-       sha256 = "0ahhg9r7d8kdxn0x33bp5p8wmwkh1yvdqhw05yjwif0ky5y9h625";
+       sha256 = "4518987cf113b8c8a52f8043dcb60f70f2cad12d778dd181ed6da276727a102a";
        libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A type-based approach to internationalization. (deprecated)";
@@ -118393,7 +118763,7 @@ self: {
      mkDerivation {
        pname = "shakespeare-js";
        version = "1.3.0";
-       sha256 = "0hihcrgvzf4nsrgw6vqpkzbgskq01yc1mnvp7g2wy7vq0dv4pjp4";
+       sha256 = "e4ca4b7603781fcfc53b77db1a980f004ffdd69f176fc35fd696b8bf5f663042";
        libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)";
@@ -118405,7 +118775,7 @@ self: {
      mkDerivation {
        pname = "shakespeare-text";
        version = "1.1.0";
-       sha256 = "18ixixb9aqn630s9wblxcki1gggm4i0fj9752c55p3b42q8h86rc";
+       sha256 = "2c1b041116648d5b0a13e524e94024f5bd17e2649d2e9e3418c66295568f3da2";
        libraryHaskellDepends = [ base shakespeare ];
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Interpolation with quasi-quotation: put variables strings (deprecated)";
@@ -118417,7 +118787,7 @@ self: {
      mkDerivation {
        pname = "shana";
        version = "2009.12.1";
-       sha256 = "0fg16nbi0r0pdd3sfabzdz1f4595x3hz3b4pxfwy8l78p8lppv0y";
+       sha256 = "1eec7b29bae850e4b9eb97acf1e1e82515e2c26f7f29a7476b1764109735e139";
        libraryHaskellDepends = [ base directory regex-posix ];
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "treat haskell functions as unix pipes";
@@ -118431,7 +118801,7 @@ self: {
      mkDerivation {
        pname = "shapefile";
        version = "0.0.0.1";
-       sha256 = "0j6c01igj767ab3pd5yzkjkd8374rmjr57f2gw5c69qnh288c6w6";
+       sha256 = "861b8690801627c30a7fc29d9265cde40cd4a69cdf9776c752c71cf96200cc48";
        libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 dbf filepath rwlock
        ];
@@ -118447,7 +118817,7 @@ self: {
      mkDerivation {
        pname = "shapely-data";
        version = "0.1";
-       sha256 = "1yn1rim4y6j834ngpz47wsi5pyhbi2gaznj0pyrqrmallzv0zin8";
+       sha256 = "c8c60ff6a754d58cb3bf40daaf9e880bfa5ba2e687fcfb2c19481a4f6accc1fa";
        libraryHaskellDepends = [
          base proxy-kindness tagged template-haskell
        ];
@@ -118467,7 +118837,7 @@ self: {
      mkDerivation {
        pname = "shared-buffer";
        version = "0.2.2";
-       sha256 = "031aabqynp5d4k47rjjwyx3xjzh4f1k4csfgdnnhsf45xv5nc3kc";
+       sha256 = "6c0e66cbee85380dad6dcf69466670047ed947f75cca7cc824ad5cebf1522a0c";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [
          base bytestring QuickCheck test-framework
@@ -118485,7 +118855,7 @@ self: {
      mkDerivation {
        pname = "shared-fields";
        version = "0.2.0.0";
-       sha256 = "107n6w4dn0n4iv7qmfm1d9y04rgj3ab3qc8kyqqddnbnfa44y157";
+       sha256 = "a7044f887276d9d630f613313c961af265027c6aa1ba8acf8ec402db0837f680";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base Cabal hspec lens text ];
        homepage = "http://github.com/intolerable/shared-fields";
@@ -118498,7 +118868,7 @@ self: {
      mkDerivation {
        pname = "shared-memory";
        version = "0.1.0.0";
-       sha256 = "15h4j81q2v97dx61pnpaqs99z4vvlw7xl1dxbh878imxj8zn4z84";
+       sha256 = "047d623f92bd4674105cbd05da0fa77b939f92c6eada1b4c6f276d8103920496";
        libraryHaskellDepends = [ base unix ];
        testHaskellDepends = [ base bytestring unix ];
        homepage = "https://github.com/nh2/shared-memory";
@@ -118511,7 +118881,7 @@ self: {
      mkDerivation {
        pname = "sharedio";
        version = "0.1.0";
-       sha256 = "08hmmb2nn2lpirdnpp928m6xadzkv8k90x1nycw2b58vp1rpk7zv";
+       sha256 = "fb9f7973b81b952538f336749026daf337d54d4522dd6b5b8e970a6bc5aa1522";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nh2/haskell-sharedio";
        description = "Bundles shared calls to IO functions to perform them only once";
@@ -118523,7 +118893,7 @@ self: {
      mkDerivation {
        pname = "she";
        version = "0.6";
-       sha256 = "0x3jc2c4j0b8xavap7hj4673zb89zgww1pv13sddkn6p49pk1zvc";
+       sha256 = "6cff306f22d7d8d99a1e61dfc0f9fb09ad3f8e21129eabb6ea68014998607274";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base filepath mtl ];
@@ -118543,7 +118913,7 @@ self: {
      mkDerivation {
        pname = "shell-conduit";
        version = "4.5.2";
-       sha256 = "04kc9gzlqbw3d2pj6qn13pnmmrlmx8nmmj5bvxn7zdmh25nw6ys2";
+       sha256 = "427bc36d11b0b67f6cdfabc85a2dea95e65aed1dc16223af68832f4cff4b6c12";
        libraryHaskellDepends = [
          async base bytestring conduit conduit-extra control-monad-loop
          directory filepath monad-control monads-tf process resourcet
@@ -118560,7 +118930,7 @@ self: {
      mkDerivation {
        pname = "shell-escape";
        version = "0.2.0";
-       sha256 = "0jms5hdl8zrpxwypq9998798krspclivprirrcq59r179alrng72";
+       sha256 = "e23c9ba94a27e45430cb39e6bb236557e789d24129257c3def377f441b2cba4a";
        libraryHaskellDepends = [
          base binary bytestring containers vector
        ];
@@ -118574,7 +118944,7 @@ self: {
      mkDerivation {
        pname = "shell-monad";
        version = "0.6.4";
-       sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13";
+       sha256 = "23c4d4bd1cdff86c7a7f5496e86ba3b436cd3124d07b99e74a7f5dd2c586b1f2";
        libraryHaskellDepends = [ base containers text unix ];
        description = "shell monad";
        license = stdenv.lib.licenses.bsd3;
@@ -118585,7 +118955,7 @@ self: {
      mkDerivation {
        pname = "shell-pipe";
        version = "0.1";
-       sha256 = "0xyarxm2hs8yypmz8w4zbnjvv5xl9dd657j7j3a82gbghsb93vyy";
+       sha256 = "deef9196866f3d81d490479e625a4bb497bda55d9f70f4ebf51e69286acfca77";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -118603,7 +118973,7 @@ self: {
      mkDerivation {
        pname = "shellish";
        version = "0.1.4";
-       sha256 = "1ldwid270mwyky6zmggbvn72hvs4s39hhf2zj8r0jahxnwlpbfan";
+       sha256 = "56b97529b71d2a0932925f3808d3d0446f288eddebbdfa8d9f9e5770448bbcd1";
        libraryHaskellDepends = [
          base bytestring directory filepath mtl process strict time
          unix-compat
@@ -118621,7 +118991,7 @@ self: {
      mkDerivation {
        pname = "shellmate";
        version = "0.1.6";
-       sha256 = "17fpl0h58cw5hp6jzrajkl629mw2c6x15cmlcbdxqk9xlxqrg4hr";
+       sha256 = "19929771a73d4ddcdb62b4b212ba6182d7240c9d52e52fcd8585335420a0d79d";
        libraryHaskellDepends = [
          base directory filepath process temporary time transformers
        ];
@@ -118638,7 +119008,7 @@ self: {
      mkDerivation {
        pname = "shelltestrunner";
        version = "1.3.5";
-       sha256 = "0ad8sc4md8mp0l0s40yx7qbgaabqzd4nz8lx15ajcdbwr2ffnra2";
+       sha256 = "4265eb9cc87c352655099da26f49fb7829f5163edd03a20105b7a25609d3a829";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -118661,7 +119031,7 @@ self: {
      mkDerivation {
        pname = "shelly";
        version = "1.6.3.3";
-       sha256 = "173aypf9dcrkhnaz5gfcpicw9ha6cgs7javds3s7m2qr2vdj8rhs";
+       sha256 = "1a6624db16198b7af4d06d2b79f46346c1c459bcccbdf2958533b396dcf56a9c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118688,7 +119058,7 @@ self: {
      mkDerivation {
        pname = "shelly-extra";
        version = "0.3.0.1";
-       sha256 = "1mc55m10s89mp2fz267sqhayaj0igj27kwyx7hnk5h23w0nhc0h5";
+       sha256 = "0502062de043c0322d3cddf379847c1148e515c4fa18f19db835210d422d85d5";
        libraryHaskellDepends = [ async base mtl SafeSemaphore shelly ];
        testHaskellDepends = [
          async base hspec HUnit mtl SafeSemaphore shelly text
@@ -118705,7 +119075,7 @@ self: {
      mkDerivation {
        pname = "shivers-cfg";
        version = "0.1";
-       sha256 = "1jrf9l25lcmqh55zy3g2nbi60ph9m0ycvjz1q0qvpb403kqhd0wa";
+       sha256 = "8a8306f11c80acbb31c0e1cbcd3ca8095e60e2b2e20dff4b81b8325a044d2ecb";
        libraryHaskellDepends = [
          base containers directory HPDF language-dot mtl pretty process
        ];
@@ -118719,7 +119089,7 @@ self: {
      mkDerivation {
        pname = "shoap";
        version = "0.2";
-       sha256 = "0ywb8bfkdpqqv2spb92j9rzx4fv5k1c7b65wj0zwnn9rp7ckq59v";
+       sha256 = "3b153cd9b93959cb3f90bc98755898653bd27f4e52a475b5d818df36dd428b7b";
        libraryHaskellDepends = [ base curl ];
        jailbreak = true;
        homepage = "http://richardfergie.com/shoap";
@@ -118732,7 +119102,7 @@ self: {
      mkDerivation {
        pname = "shortcircuit";
        version = "0.1";
-       sha256 = "02gcr6glp1kjs4l7ds8487dbblr1pw8nyq34i3rg1hskz0b83l6z";
+       sha256 = "dfd08116f853c3f0f28864606f11bf21d3b5da4104e97628d172864b9fc9ec09";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aristidb/shortcircuit";
        description = "Short-circuit values and expressions";
@@ -118744,7 +119114,7 @@ self: {
      mkDerivation {
        pname = "shortcut-links";
        version = "0.4.0.0";
-       sha256 = "1i9a5hgzw9w9fqg7vjixc90ck49ag0ikm9bjl2xc30gvjslpy3r8";
+       sha256 = "280f7fa996fb81c1baa072a53a23782a91c940623dca7d1e768927fe1f2c2ac5";
        libraryHaskellDepends = [ base text ];
        homepage = "http://github.com/aelve/shortcut-links";
        description = "Link shortcuts for use in text markup";
@@ -118756,7 +119126,7 @@ self: {
      mkDerivation {
        pname = "shorten-strings";
        version = "0.1.0.1";
-       sha256 = "1srqbc2kx1zn0xlzv94y7kqdrflmdck3jy6d2fl75zhf11wilxw3";
+       sha256 = "83771a79080efe72a813cd7839266b95badcf03c9ea4fd6907f6873e055b38eb";
        libraryHaskellDepends = [ base text ];
        jailbreak = true;
        homepage = "https://github.com/Tarrasch/shorten-strings";
@@ -118769,7 +119139,7 @@ self: {
      mkDerivation {
        pname = "should-not-typecheck";
        version = "2.0";
-       sha256 = "0869dgn7xccnzxhzbjl150x0sdwwgppk06nq448i9xlnhhrk6dkc";
+       sha256 = "6c3633338496f6141121d81a30ef7d9c370d3a2881caf561ff96b17eec6bc920";
        libraryHaskellDepends = [ base deepseq HUnit ];
        testHaskellDepends = [
          base deepseq hspec hspec-expectations HUnit
@@ -118784,7 +119154,7 @@ self: {
      mkDerivation {
        pname = "show";
        version = "0.6";
-       sha256 = "15bvfffnr034z8wbmhxa8h5qskbxwbflk434dx023l1qlm3sjmsg";
+       sha256 = "4f57a947a538d021406f649049dde27d4d8d0b44aac3ba38fa64806c9d737b95";
        libraryHaskellDepends = [ base syb ];
        description = "'Show' instances for Lambdabot";
        license = "GPL";
@@ -118795,7 +119165,7 @@ self: {
      mkDerivation {
        pname = "show-type";
        version = "0.1.1";
-       sha256 = "1sppi8vj1cg7gwz7vagc1cry22b814wlwbm6jjj1c4d5f4kmpyyv";
+       sha256 = "dbfb5b2771a51116a494a62e4e39096809e1330beca97d3e7fe7b120378af7ea";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Kinokkory/show-type";
        description = "convert types into string values in haskell";
@@ -118807,7 +119177,7 @@ self: {
      mkDerivation {
        pname = "showdown";
        version = "0.5.3";
-       sha256 = "1gpjb8lw5zmnsd8ic739j91iqsv9a707nd9j5mbnhq6gilk61nrh";
+       sha256 = "30db60268dcf6068572d32357bc051696b1c4392691c1651d3b6fec2295af2be";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base glade gtk random ];
@@ -118824,7 +119194,7 @@ self: {
      mkDerivation {
        pname = "shpider";
        version = "0.2.1.1";
-       sha256 = "19741zlma2fp3jbfsmqgl0004bvfpizbjljg2k5xam1k4v144kwd";
+       sha256 = "8d4f42c2263354d5cb144f52b97ebc6e2f0200a00f57ed961cd70955e90fe4a4";
        libraryHaskellDepends = [
          base bytestring containers curl mtl regex-posix tagsoup
          tagsoup-parsec time url web-encodings
@@ -118840,7 +119210,7 @@ self: {
      mkDerivation {
        pname = "shplit";
        version = "0.3";
-       sha256 = "0wml7x8843ib8jmwq6xz9q011hz4vpd7zmnvbc8h2zdql6p6lqxr";
+       sha256 = "b9636aaea1b87d01115bdbd67fdadde4c310004ebf1bccab442b0e82503fb472";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl ];
@@ -118856,7 +119226,7 @@ self: {
      mkDerivation {
        pname = "shqq";
        version = "0.1";
-       sha256 = "08mdnlnq001slxml0y1rg7nry2fz8qcf1cw0q22j84gx3csrfhcm";
+       sha256 = "954197351bfd112485c080b3e01846df099fed793978406ba73a00802db5ad22";
        libraryHaskellDepends = [
          base parsec posix-escape process template-haskell unix
        ];
@@ -118872,7 +119242,7 @@ self: {
      mkDerivation {
        pname = "shuffle";
        version = "0.1.3.3";
-       sha256 = "0ngva3p3838xay3zz442n99ilhk5d9majg342x6y7hs796lqbrrd";
+       sha256 = "2de785a94947c3e34d17643ca96a6a65421a53b28290ff87571d0d34ee50fb59";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118890,7 +119260,7 @@ self: {
      mkDerivation {
        pname = "sieve";
        version = "0.1.0.1";
-       sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m";
+       sha256 = "15156000b39d8f8ef7cd330e64306be70f2aecf9abee9c7e2f14a338e0e7f2a7";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.the-singleton.com";
        description = "Sieve is an implementation of the Sieve abstract data type";
@@ -118904,7 +119274,7 @@ self: {
      mkDerivation {
        pname = "sifflet";
        version = "2.2.1";
-       sha256 = "0xahs91s1kvb2vrdr6xwg4nrm3d4pfz807rnb7dj9rfj1knlaw4j";
+       sha256 = "927045ed0cd2e524db59361f80bebba48d9a2d79bc9bdcf2166bcfa043d25075";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -118925,7 +119295,7 @@ self: {
      mkDerivation {
        pname = "sifflet-lib";
        version = "2.2.1";
-       sha256 = "1snaq0vlsk4r2lbg2sk389ppwnz22mqwhf1lgwjh3cg91ab905n4";
+       sha256 = "c41690960ae9b101257f3438c87115e25b7e6f42636af11615994c4d37c0caea";
        libraryHaskellDepends = [
          base cairo containers directory fgl filepath glib gtk hxt mtl
          parsec process unix
@@ -118946,7 +119316,7 @@ self: {
      mkDerivation {
        pname = "sign";
        version = "0.4.1";
-       sha256 = "1d7hxvvmbbv8izr74l4ah1q50fwmmgman90rhjixkvppkq8fwjhz";
+       sha256 = "1f4aee109ef7eed9a3841924abeaab953b5070808a5072f28f68af55f7eef0b4";
        libraryHaskellDepends = [
          base containers deepseq hashable lattices
        ];
@@ -118966,7 +119336,7 @@ self: {
      mkDerivation {
        pname = "signals";
        version = "0.0.0.1";
-       sha256 = "12l5vixyv6j3fz8j9rwahf5ifvibqb38kc9j7xg36akc5v2n11s2";
+       sha256 = "428760c52e6c2a335e3f32b189c6c22b6e178b838ae724d177439aed7bdc858a";
        libraryHaskellDepends = [
          array base constraints containers data-reify exception-mtl
          exception-transformers language-c-quote mainland-pretty mtl
@@ -118984,7 +119354,7 @@ self: {
      mkDerivation {
        pname = "signed-multiset";
        version = "0.4";
-       sha256 = "0pxi6g095axf9x6hsiqf0ilsjlws4zvl0pjfjamjyyl1wj82h747";
+       sha256 = "871c2890e4817a2fab924e5e40f7279a53a969040e470d4d4faeab92c033b15f";
        libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "Multisets with negative membership";
@@ -118996,7 +119366,7 @@ self: {
      mkDerivation {
        pname = "silently";
        version = "1.2.5";
-       sha256 = "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf";
+       sha256 = "cef625635053a46032ca53b43d311921875a437910b6568ded17027fdca83839";
        libraryHaskellDepends = [ base deepseq directory ];
        testHaskellDepends = [ base deepseq directory nanospec temporary ];
        homepage = "https://github.com/hspec/silently";
@@ -119009,7 +119379,7 @@ self: {
      mkDerivation {
        pname = "simd";
        version = "0.1.0.1";
-       sha256 = "0rmp715k7k41h7nnfg3ik28pf602jvh5wb23yzbpz0j8vkfysn8m";
+       sha256 = "1559eddddc48827fd7f7432c5ee0960218779198713c67ed8181cc334b38b766";
        libraryHaskellDepends = [ base ghc-prim primitive vector ];
        jailbreak = true;
        homepage = "http://github.com/mikeizbicki/simd";
@@ -119025,7 +119395,7 @@ self: {
      mkDerivation {
        pname = "simgi";
        version = "0.3";
-       sha256 = "1yqd9799ys8y4n325mayq8qps99ajv1r4j8h6r16l5n94wvyw1ba";
+       sha256 = "6a05ee3727c9166a4236104992c3962a257d31c25ed52286251e699fd2490dfb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -119048,7 +119418,7 @@ self: {
      mkDerivation {
        pname = "simple";
        version = "0.10.1";
-       sha256 = "1s75cr2fjgicgf6mndaf659xrp0dga68i2ii8l5dbjz0b2sbhhm7";
+       sha256 = "a742b8b458e0cbd50a45318a888c7a0ddcdc53314e355b8d7b2c3ee94466e5e8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119077,7 +119447,7 @@ self: {
      mkDerivation {
        pname = "simple-actors";
        version = "0.4.0";
-       sha256 = "13xjyr6gf55yxinaah4c8fx56a9fyr191v4lwycnlkdz8vvizw25";
+       sha256 = "45f01ff746bf4d6a99e794ec9042f62e2953ba438c40a56cecbe14f74cf6b28f";
        libraryHaskellDepends = [
          base chan-split contravariant mtl transformers
        ];
@@ -119091,7 +119461,7 @@ self: {
      mkDerivation {
        pname = "simple-atom";
        version = "0.2";
-       sha256 = "1kqkaay3r03plxvvyan3hdgj2rfynygnisi6hrsjwqgj4nw6va17";
+       sha256 = "27a86db825f2612e758626ea689fb7de65215f83c32abf77a777803cbc5213cf";
        libraryHaskellDepends = [ base containers deepseq ];
        jailbreak = true;
        homepage = "http://github.com/nominolo/simple-atom";
@@ -119104,7 +119474,7 @@ self: {
      mkDerivation {
        pname = "simple-bluetooth";
        version = "0.1.0.0";
-       sha256 = "1qrlvqy2vcl36db3403nb1c0sx233d3vwxrbqb7jip13hy0h6jf4";
+       sha256 = "c44903818723dc28cfc22b77be471b43740d5858760032563383b22d3cde34e3";
        libraryHaskellDepends = [ base bytestring network ];
        librarySystemDepends = [ bluetooth ];
        description = "Simple Bluetooth API for Windows and Linux (bluez)";
@@ -119121,7 +119491,7 @@ self: {
      mkDerivation {
        pname = "simple-c-value";
        version = "0.0.0.1";
-       sha256 = "0ky0yilcc54hx8sl11z4dl14n6k9wfz0w9bwv3pbgyi44ravr8gs";
+       sha256 = "faa1bc552624fab7eed87c250ebee3691a4b026de4874035ea9014c668f4c04f";
        libraryHaskellDepends = [
          base DebugTraceHelpers dlist ghc-prim tuple
        ];
@@ -119146,7 +119516,7 @@ self: {
      mkDerivation {
        pname = "simple-conduit";
        version = "0.5.1";
-       sha256 = "1jy70cdw2h6fd2618dczajml5k82kkjmd2n0mgbby2mr6r3sk5zr";
+       sha256 = "f997a94736b90abfd6abc08a56e59c02cd42ab549f35148c68ce40c11b03c7cb";
        libraryHaskellDepends = [
          base bifunctors bytestring chunked-data containers either
          exceptions filepath free lifted-async lifted-base mmorph
@@ -119166,7 +119536,7 @@ self: {
      mkDerivation {
        pname = "simple-config";
        version = "1.2.2.1";
-       sha256 = "1ndczlpqycrmyjm8v3gpsw1f946lfvc70kzmipli4ir9cbqh5d5k";
+       sha256 = "b3b402f162294712e98df54f70d876d490e402d7f78d8daaf435338f2ffdacd9";
        libraryHaskellDepends = [
          base bytestring data-default network-uri parsec template-haskell
          transformers
@@ -119184,7 +119554,7 @@ self: {
      mkDerivation {
        pname = "simple-css";
        version = "0.0.4";
-       sha256 = "19a2yfp9gji7w5ps5lh8jwvnhma21d83v4fm2hrc92490fpq9aid";
+       sha256 = "2daa84af038988c43214d5913d500b425568379708d2a26fe127ca97aef342a5";
        libraryHaskellDepends = [
          base blaze-html hashable language-css unordered-containers
        ];
@@ -119198,7 +119568,7 @@ self: {
      mkDerivation {
        pname = "simple-eval";
        version = "0.1.0.1";
-       sha256 = "185dgpfc7b1ayw0ajfdnf28fy1a87b3kqn4fh9y5l9krzlqs2lfl";
+       sha256 = "d451a131fd79265a7c828e583cc73a4805ef9070b639a900f72aacc3dc7dada0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec text transformers ];
@@ -119214,7 +119584,7 @@ self: {
      mkDerivation {
        pname = "simple-firewire";
        version = "0.1.3.4";
-       sha256 = "14fh3z3vqkmfgvgxja431ivm3lk1ksgrxaqjzz25wdc493j640ka";
+       sha256 = "6a0262e44884355ec4ff12ab9e9f9e61d251770c8328d9df7eae4ebcc71fd091";
        libraryHaskellDepends = [ base bindings-dc1394 CV ];
        homepage = "https://github.com/aleator/simple-firewire";
        description = "Simplified interface for firewire cameras";
@@ -119229,7 +119599,7 @@ self: {
      mkDerivation {
        pname = "simple-form";
        version = "0.5.0";
-       sha256 = "01pqp7593vxf32fw18g7351qblj4lxvbgvs0psgb9aghsw3dss53";
+       sha256 = "a368dd06d7f0a9b49ebe40efb776a744d2854319e7a1c09d18aeef91cab9f806";
        libraryHaskellDepends = [
          base blaze-html digestive-functors email-validate network-uri
          old-locale text time transformers
@@ -119245,7 +119615,7 @@ self: {
      mkDerivation {
        pname = "simple-genetic-algorithm";
        version = "0.2.0.0";
-       sha256 = "14gy8bmkvv81zd1hmdzmmdzf4pspn4nymfpjx07jxcgm5isn49qi";
+       sha256 = "112762752cf5b12e0fe8f2baea2db1575fe27eabf5b70a43fb01ed3deb42fe91";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parallel random ];
@@ -119263,7 +119633,7 @@ self: {
      mkDerivation {
        pname = "simple-genetic-algorithm-mr";
        version = "0.4.0.0";
-       sha256 = "193n24n5dpmdha85h4vn0kx846hppyzbc9f75wgndc7y7vm1qagy";
+       sha256 = "fe291cea3efeb0661f2fc725b6bebf171a82fa047613589082adde562c1176a4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119282,7 +119652,7 @@ self: {
      mkDerivation {
        pname = "simple-get-opt";
        version = "0.1.0.0";
-       sha256 = "1hia6kjx3nnv6i5wrkmvj6vz52pw12fwsz48gkz7049ygpa5jnl5";
+       sha256 = "855a59d47d3e1170fe7c887ccd9d08fc8af2b791bbcecc4b34dbdad1e5342ac2";
        libraryHaskellDepends = [ base ];
        description = "A simple library for processing command-line options";
        license = stdenv.lib.licenses.bsd3;
@@ -119295,7 +119665,7 @@ self: {
      mkDerivation {
        pname = "simple-index";
        version = "0.1.0.1";
-       sha256 = "0w5nqhabv1rdbgnjw5vgx6p19dhqiq6xn5ljld3s7ndfk8nfddgy";
+       sha256 = "feb5e62c9aaed9a347a39216db0d8e18b614aee96f172eed5b2d87bd14c4b670";
        libraryHaskellDepends = [
          base containers hashable safecopy unordered-containers
        ];
@@ -119312,7 +119682,7 @@ self: {
      mkDerivation {
        pname = "simple-log";
        version = "0.3.2";
-       sha256 = "1nlnxjv2p6fkk069480czn0wg1m2jcw1g2sb38cb524kv0qn1kr0";
+       sha256 = "20cf6031d89388b2181a4b8b173893a286c781fd0c20920c98d3992bb6ec96da";
        libraryHaskellDepends = [
          base containers deepseq directory filepath
          MonadCatchIO-transformers mtl SafeSemaphore text time transformers
@@ -119327,7 +119697,7 @@ self: {
      mkDerivation {
        pname = "simple-log-syslog";
        version = "0.2.0";
-       sha256 = "1619jsxgz5afmwhjcixg54i7dhh8jl29cmziifjrg60mm4rf2c34";
+       sha256 = "6430e132a9159897a58bf15796049508c2762229af472621af4e95ffba962998";
        libraryHaskellDepends = [ base hsyslog simple-log text ];
        jailbreak = true;
        homepage = "http://github.com/mvoidex/simple-log-syslog";
@@ -119342,7 +119712,7 @@ self: {
      mkDerivation {
        pname = "simple-neural-networks";
        version = "0.2.0.1";
-       sha256 = "07brvfs19qprbpiys38gw3ypkwyx8y31fdil3kkzc9gszvcfi7vy";
+       sha256 = "7e9fe8d8fefa25f6e71c3436178647ddf379fde00f0dede35df9e214b4db791d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119365,7 +119735,7 @@ self: {
      mkDerivation {
        pname = "simple-nix";
        version = "0.1.0.4";
-       sha256 = "1kyarxkp9zdf6k1jpx9a5yjrjghbr52ranfzrbcnb8kdnzi0mh0f";
+       sha256 = "0ec00ae2b76da265d9cadf599545c90b3e99a52f2af52bc334aefd7467cfcacf";
        libraryHaskellDepends = [
          base classy-prelude error-list MissingH mtl parsec system-filepath
          text text-render unordered-containers
@@ -119384,7 +119754,7 @@ self: {
      mkDerivation {
        pname = "simple-observer";
        version = "0.0.1";
-       sha256 = "1njzw6zjarlpjrmbkxwivr9azj8v1298bsd1ai3ddlmylwyhn24r";
+       sha256 = "99080b3da7bed2d64654a1e98592081bc9af52de91f7b96a96976625bfe15fda";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/gimbo/observer.hs";
        description = "The Observer pattern";
@@ -119398,7 +119768,7 @@ self: {
      mkDerivation {
        pname = "simple-pascal";
        version = "0.1";
-       sha256 = "1nrm52agsgr2gxljv14l7f713jvbfa99qnzkcni2s7777xc33dkk";
+       sha256 = "73b631583fe71c2da265f35b9c92726bcb118e3b94842d697f223ffd942835db";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119416,7 +119786,7 @@ self: {
      mkDerivation {
        pname = "simple-pipe";
        version = "0.0.0.28";
-       sha256 = "11bvk1dwi6anmnsvv3hi7ii60yy3d64g38vfmxhabh93sjr4b4nm";
+       sha256 = "d59245b2d423c1a560af6ea3f18869c37b60623c118ebdb5ad5699c85b987b85";
        libraryHaskellDepends = [
          base bytestring lifted-base monad-control monads-tf stm
          transformers-base
@@ -119435,7 +119805,7 @@ self: {
      mkDerivation {
        pname = "simple-postgresql-orm";
        version = "0.9.0.1";
-       sha256 = "0j1v64ywfchxjdidy5pb1dzab0qhn516vcy580incw1bminyh3rz";
+       sha256 = "3f0fe86dac2b70662340c5b36d42b11083a57e0beb16df62931d32c73d313b48";
        libraryHaskellDepends = [
          base bytestring directory filepath postgresql-orm postgresql-simple
          resource-pool simple transformers
@@ -119451,7 +119821,7 @@ self: {
      mkDerivation {
        pname = "simple-reflect";
        version = "0.3.2";
-       sha256 = "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq";
+       sha256 = "38224eb3d0d5eafc7101ad48fa92001c3e753a015d53bb12753a3836b871ecb6";
        libraryHaskellDepends = [ base ];
        homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
        description = "Simple reflection of expressions containing variables";
@@ -119463,7 +119833,7 @@ self: {
      mkDerivation {
        pname = "simple-rope";
        version = "0.1";
-       sha256 = "187ghgn8nivvn5m8nsn0vrjh8mr6h7n6r1p1119gr4h3m2hpmrpl";
+       sha256 = "f4e67aa1a80392fc5208e1866cec8126570465dec06a8b6ab17b478bec83efa0";
        libraryHaskellDepends = [ base bytestring QuickCheck ];
        homepage = "http://github.com/jkff/haskell-rope";
        description = "Memory-efficient strings with concatenation and splitting";
@@ -119477,7 +119847,7 @@ self: {
      mkDerivation {
        pname = "simple-sendfile";
        version = "0.2.21";
-       sha256 = "0xzxcz60gl22w3rxjvw0s6js0g5mi6as1n48gl37dv4lbrn9s8v1";
+       sha256 = "61239d6c5e94ec76067d88d8a09589b53ca0a5d1806fd9f3e042d007cc67fd77";
        libraryHaskellDepends = [ base bytestring network unix ];
        testHaskellDepends = [
          base bytestring conduit conduit-extra directory hspec HUnit network
@@ -119494,7 +119864,7 @@ self: {
      mkDerivation {
        pname = "simple-server";
        version = "0.0.3";
-       sha256 = "0qmqkcyikyjcfsq82w0i54ydizfnp72h0qfsbjw5qjizf4l3awcr";
+       sha256 = "99713528713f4a5cb85cda6100c5b9d6fdd83c29117081b0764cfa193d9bb862";
        libraryHaskellDepends = [
          base bytestring concurrent-extra containers hashtables network time
          unbounded-delays
@@ -119511,7 +119881,7 @@ self: {
      mkDerivation {
        pname = "simple-session";
        version = "0.10.0.0";
-       sha256 = "1vqpikn6ml4fmz9pg29blw1c5ck8d4xx1qrb388jw57x24gknp0k";
+       sha256 = "135c3b1f11fd142e111a2be3d03b6968b2c202a72b8977d3af8ed06aec8c17ef";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder byteable bytestring containers
          cookie cryptohash http-types simple transformers wai
@@ -119527,7 +119897,7 @@ self: {
      mkDerivation {
        pname = "simple-sessions";
        version = "0.1.3";
-       sha256 = "08abag1im9gp2jpndd12sv911ca2qwh6frrz6qr87mj11xfhbky5";
+       sha256 = "c5cf055d0f41d68332363f676720c742b110d2d622b466af14f7a51ac3534b21";
        libraryHaskellDepends = [ base indexed synchronous-channels ];
        homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
        description = "A simple implementation of session types";
@@ -119539,7 +119909,7 @@ self: {
      mkDerivation {
        pname = "simple-smt";
        version = "0.6.0";
-       sha256 = "15dnd6vjf8zl0bi5r4pczxdns8614rvdq1f44sgrmy8crc4x9d0c";
+       sha256 = "0cb4d409cb0cf99a9f26c405dc7626c1206d5bffec925ce202f42327b769b695";
        libraryHaskellDepends = [ base process ];
        description = "A simple way to interact with an SMT solver process";
        license = stdenv.lib.licenses.bsd3;
@@ -119552,7 +119922,7 @@ self: {
      mkDerivation {
        pname = "simple-sql-parser";
        version = "0.4.1";
-       sha256 = "0hz5acbkn9i46c8hpx258vkyj0q9ii4kh5wsjjj79avlnal2gz8q";
+       sha256 = "18fd27a8b274ab74a4949a1738498c0903e9e74645f40b113324263b1753e543";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
@@ -119572,7 +119942,7 @@ self: {
      mkDerivation {
        pname = "simple-stacked-vm";
        version = "0.1.1";
-       sha256 = "1grhdaf6z6illki5km1glliaaqlyvskwjvvcqz2vh8467arsy2pd";
+       sha256 = "ed0aafb33a8620b8c5c76c6fc9a7de9e62a522a52fd459e2a4349a6f9c6a30bf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119587,7 +119957,7 @@ self: {
      mkDerivation {
        pname = "simple-tabular";
        version = "0.1.0.0";
-       sha256 = "0p7rd8y6rhwg0ap6cib7l32bglvfkvbzg938pdwpb2ss6cv8b9zs";
+       sha256 = "faa78536335a8b7579bb68a4f7d79e6ed3b7c4a0674566ae028fc36c3c6af95c";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/BartMassey/simple-tabular";
@@ -119602,7 +119972,7 @@ self: {
      mkDerivation {
        pname = "simple-templates";
        version = "0.8.0.0";
-       sha256 = "1lmls90fbd18bklhhblfm0983w9bk66jj8iad3jzi5gd2injwj78";
+       sha256 = "e8482e6d14ed95f8e5682a22298d992bf18112a88e2e08e95c28b4e540d2b4d2";
        libraryHaskellDepends = [
          aeson attoparsec base scientific text unordered-containers vector
        ];
@@ -119620,7 +119990,7 @@ self: {
      mkDerivation {
        pname = "simple-vec3";
        version = "0.1.0.1";
-       sha256 = "1vzx88drwg40a9b7dzz4nbd5faawrc15wgyd1b12zmrsysn0h6s4";
+       sha256 = "441b08acf63ad72fc20acd3f5e02cb5c2957dab2e4ff765652803c9e1b42fdef";
        libraryHaskellDepends = [ base vector ];
        jailbreak = true;
        homepage = "http://github.com/dzhus/simple-vec3/";
@@ -119634,7 +120004,7 @@ self: {
      mkDerivation {
        pname = "simpleargs";
        version = "0.2.1";
-       sha256 = "1grjjpb3397wnr6sd0bn679k9pfg1zlm61350zd2gj5yq6pshl6p";
+       sha256 = "d750a8afc1bec827da07650453e90fcfdd34d3317681a64db6fca431d69532bf";
        libraryHaskellDepends = [ base ];
        homepage = "http://malde.org/~ketil/simpleargs";
        description = "Provides a more flexible getArgs function with better error reporting";
@@ -119648,7 +120018,7 @@ self: {
      mkDerivation {
        pname = "simpleirc";
        version = "0.3.1";
-       sha256 = "1mwhqa5gby38hlbq0shjbff4whhblw00x8wksqbh47jd6i6ihww5";
+       sha256 = "8573184d344d1e0217d693a30e00a70b424e9c5b126a80178568f8f58ac290d7";
        libraryHaskellDepends = [
          base bytestring connection containers network old-locale time
        ];
@@ -119664,7 +120034,7 @@ self: {
      mkDerivation {
        pname = "simpleirc-lens";
        version = "0.1.0.0";
-       sha256 = "0lr4zrp8h7xgg8zsznawqkkzh3pvlzfw5hl6n0hss5ramb71ccy5";
+       sha256 = "c53316ceaa2a17ad21b086c2c2dda7fb0ef8e7c45cd9af3f7aaf1f886efe2453";
        revision = "2";
        editedCabalFile = "618750d5b230316747d59d784bd40481a4404443316fc9c3a73e1349e3d10975";
        libraryHaskellDepends = [ base bytestring simpleirc ];
@@ -119681,7 +120051,7 @@ self: {
      mkDerivation {
        pname = "simplenote";
        version = "1.0";
-       sha256 = "0kggnvbhvzrsqj387vqq2xpspk4xn3830k65g4cc642gmw4l803v";
+       sha256 = "7b004409af4f10c31879c54c30d0b09dccab6f1718ef8386c43aff0dd7b6ef4d";
        libraryHaskellDepends = [
          base bytestring curl dataenc download-curl HTTP json time
          utf8-string
@@ -119698,7 +120068,7 @@ self: {
      mkDerivation {
        pname = "simpleprelude";
        version = "1.0.1.3";
-       sha256 = "0qlhh9m455fh8w9hdzykgxbw699mkd926ar031j99dhimca2d4hj";
+       sha256 = "12922614ab11b6946418202b23529b3525c3577fd3ff061347d095426a829062";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -119716,7 +120086,7 @@ self: {
      mkDerivation {
        pname = "simplesmtpclient";
        version = "0.2";
-       sha256 = "0z8g82222nvh3yhn8qisr8qqnsv02zxjyzs32qrcg2pshbd5mdj8";
+       sha256 = "48b65ada82fa8ac73216437f2ffb17606b8b31ca3a6264a11f705b2184400f7d";
        revision = "1";
        editedCabalFile = "e6021c7bbf5e50c15433dca491f4618483229203c810a7b71e7c42094e13ad25";
        libraryHaskellDepends = [ array base directory network old-time ];
@@ -119729,7 +120099,7 @@ self: {
      mkDerivation {
        pname = "simplessh";
        version = "0.2.0.5";
-       sha256 = "1f0rck8shcm69bg2n2ijjad6dzrybfyrjqpsx5qh333mmz0q7bbq";
+       sha256 = "78ad83c1af758c0171e9fa6299bd5b3eff669a92320a2bde4aa632a8d16419b8";
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ ssh2 ];
        homepage = "http://hub.darcs.net/thoferon/simplessh";
@@ -119745,7 +120115,7 @@ self: {
      mkDerivation {
        pname = "simplex";
        version = "0.3.8";
-       sha256 = "0z8ysg43dydij5l271ary8g5l26k0fvsymi99ycyjnl2ij1sg482";
+       sha256 = "0291a7838c825ae9994f2956afb703d3085a1ef25985236891b1f936c8d31e7d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -119763,7 +120133,7 @@ self: {
      mkDerivation {
        pname = "simplex-basic";
        version = "0.0.0.1";
-       sha256 = "180bnrka1id16scz4zzi60m8692b7pyicfzfbzvi8rz1shl038zq";
+       sha256 = "f8a30128d4e16714f75fee3b16fd3d4b24832a30f17ff29936a1c5a066b60ba0";
        libraryHaskellDepends = [
          base bifunctors linear-grammar mtl QuickCheck transformers
        ];
@@ -119780,7 +120150,7 @@ self: {
      mkDerivation {
        pname = "simseq";
        version = "0.0";
-       sha256 = "0i60ksi5xc0d0rg5xzhbdjv2f3b5jr6rl9khn9i2b1n9sh1lv36m";
+       sha256 = "d58c4d03d4c9862562b270269a4d96650d27b66c0bfe5e5e060db05ea29ec044";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bio bytestring random ];
@@ -119795,7 +120165,7 @@ self: {
      mkDerivation {
        pname = "simtreelo";
        version = "0.1.1.0";
-       sha256 = "1j7q2mld8np16nmq8w3lx87j1f530jpxv4jlpf038k42pf4p23l2";
+       sha256 = "820e7189bb824c3480bb5492ddaf04a3b8200fea747084ab35e15ad46815f8c8";
        libraryHaskellDepends = [ base containers ];
        description = "Loader for data organized in a tree";
        license = stdenv.lib.licenses.gpl3;
@@ -119809,7 +120179,7 @@ self: {
      mkDerivation {
        pname = "sindre";
        version = "0.4";
-       sha256 = "0p76rsk02p6rw51ppbr3j7ydk57k34684qf50nrz5qd0jrnapjm2";
+       sha256 = "a2caab6c96a0e1f2b305c561820c19f394d9fc9123af7b43e1d95c01a6cee65c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119836,7 +120206,7 @@ self: {
      mkDerivation {
        pname = "singleton-nats";
        version = "0.3.0.1";
-       sha256 = "1zgrvpszlvbq3mhfrs50dz2wd3bx6zxpyh0cj1zlwbn62psbdqxm";
+       sha256 = "b5e3b6f415c62e4e7f900c407ffb377d8dc6c56fa0e8ec601d786dfaf5ddf9fd";
        libraryHaskellDepends = [ base singletons ];
        description = "Unary natural numbers relying on the singletons infrastructure";
        license = stdenv.lib.licenses.bsd3;
@@ -119849,7 +120219,7 @@ self: {
      mkDerivation {
        pname = "singletons";
        version = "1.1.2.1";
-       sha256 = "1lxbajfwq65bkl73cr3zqzcqy67vqbq9sf8w9ckrik4713sx0mhb";
+       sha256 = "0b56d0f50887cc98274b1c399df0c2fb188fd9c77f64360e9dab18cc9d54abd3";
        libraryHaskellDepends = [
          base containers mtl template-haskell th-desugar
        ];
@@ -119866,7 +120236,7 @@ self: {
      mkDerivation {
        pname = "sink";
        version = "0.1.0.1";
-       sha256 = "04ny9450h2mlw1j0gn6a1vvgwsk3gbhhzshqv2sbcg5pwkzkdrzp";
+       sha256 = "f7e736ffe4b73cb6b4d818ea0fe17a636afef60ecad80764e0b40a080a49de12";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "An alternative to lazy I/O that doesn't conflate execution with evaluation";
@@ -119880,7 +120250,7 @@ self: {
      mkDerivation {
        pname = "siphash";
        version = "1.0.3";
-       sha256 = "1wq5dan30ggjgmravy92ylqjvjv1q7mxrmddr7zc8h6aqr0wx0fg";
+       sha256 = "cf81ce41c6ca40c4fec9add5dcebc161cb2d31f522f9ad727df23d30ac6a05f3";
        libraryHaskellDepends = [ base bytestring cpu ];
        testHaskellDepends = [
          base bytestring QuickCheck test-framework
@@ -119898,7 +120268,7 @@ self: {
      mkDerivation {
        pname = "sirkel";
        version = "0.1";
-       sha256 = "0hhphhdvzcq9az5zriip7sgypfwbf5plx65s96nvrm2lznw4pzan";
+       sha256 = "56fd4bb8fd54d4bcad49ba984e6f718bbbeb9f3e37c6fccb5709b3bf1b841742";
        libraryHaskellDepends = [
          base binary bytestring containers hashtables haskell98 random
          remote SHA transformers
@@ -119913,7 +120283,7 @@ self: {
      mkDerivation {
        pname = "sitemap";
        version = "0.1.2";
-       sha256 = "0njb20w6kazsqgw61ykvfx3syqywv9frs7ch9bf2sr0i1d3b61bd";
+       sha256 = "6d05b3460b11642ddc4a901d9d5ddadc63af47777bfa60f8c3faab6938104b5a";
        libraryHaskellDepends = [ base lens taggy taggy-lens text ];
        homepage = "http://github.com/alpmestan/sitemap";
        description = "Sitemap parser";
@@ -119927,7 +120297,7 @@ self: {
      mkDerivation {
        pname = "sized";
        version = "0.1.0.0";
-       sha256 = "00n9fb7kk3c6dy4j19d9ikmynllpxc7yd51sign0rhvnasmyrghl";
+       sha256 = "14beecab5676c30cec8b3a94e60feb9752ebeb8ca9a520896f868d39cf72c902";
        libraryHaskellDepends = [
          base constraints containers ListLike monomorphic type-natural
          vector
@@ -119945,7 +120315,7 @@ self: {
      mkDerivation {
        pname = "sized-types";
        version = "0.5.1";
-       sha256 = "1nwr92gy8031f18w367ys0l27q4qvpkrkikbj03m93q2i7y74ry7";
+       sha256 = "c76772fc89028f5407906bc699e7dd98e02328d0fe98c151706100e49f4899db";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119966,7 +120336,7 @@ self: {
      mkDerivation {
        pname = "sized-vector";
        version = "1.4.2.0";
-       sha256 = "0lz1fr2n5x7xfb6y8l7prnawj1p3fp79bbgi98w1n22wazcy9jkm";
+       sha256 = "75cae4d9575c081b384af1ad95ce75e306c995cdf750e4cd72fdf4624576e153";
        libraryHaskellDepends = [
          base constraints deepseq equational-reasoning hashable monomorphic
          singletons type-natural
@@ -119985,7 +120355,7 @@ self: {
      mkDerivation {
        pname = "sizes";
        version = "2.3.2";
-       sha256 = "0xns0xl3khks1jvsmxh0nqf1saxs7qscvkbcg4270pp7n6lziqdg";
+       sha256 = "afe1f8a9b1e75e7004796ccdcd343eba2b1d1cb600f6aab70c7ac2396807da76";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -120004,7 +120374,7 @@ self: {
      mkDerivation {
        pname = "sjsp";
        version = "0.1.0";
-       sha256 = "0x76hrzm0ikijsf5n425bagzin2x463mcmlnjqvinrb6ni47f4bl";
+       sha256 = "74117748b466651b379696565687215dd8f89f5a45105b9c967146507f86e674";
        revision = "1";
        editedCabalFile = "309e00100db2c1bae2d292c485f2dc1a68e1c72a848a2142c3f0637c494dd727";
        isLibrary = false;
@@ -120025,7 +120395,7 @@ self: {
      mkDerivation {
        pname = "skein";
        version = "1.0.9.3";
-       sha256 = "0k7ibm4ykvypz6dm6jgqx0aj7qlg34cg841vipyjkbykp8nv3fn7";
+       sha256 = "c7bab12dbad3af29fd8d3b10f418198fe22315e8f849539bf9d7efe9495df14c";
        libraryHaskellDepends = [
          base bytestring cereal crypto-api tagged
        ];
@@ -120044,7 +120414,7 @@ self: {
      mkDerivation {
        pname = "skeleton";
        version = "0.1.0.0";
-       sha256 = "10bcw4l4w7myrbpmalg4mvpcyzbrnr8dafsplxkjlb6bnhc33scb";
+       sha256 = "8be93118b4cb2c2a67a7573bd550b6797dcfeeaee45155efcabe1e4e28e16c81";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -120063,7 +120433,7 @@ self: {
      mkDerivation {
        pname = "skell";
        version = "0.1.0.0";
-       sha256 = "0lnlqcw5slv5gshdq35il16pm57fh07hkd7zx95gfxx1aipyr4lp";
+       sha256 = "9792ec6f54a177f74aeaffb4090f80ee947a4da0b10cdca07e65535d38c3d452";
        libraryHaskellDepends = [
          base blaze-html bytestring containers http-types text wai
        ];
@@ -120081,7 +120451,7 @@ self: {
      mkDerivation {
        pname = "skype4hs";
        version = "0.0.0.0";
-       sha256 = "0mrd63yfmxxmv3l5v5i01rh4lyl831pfb06k9bxvc6m5q88fxglp";
+       sha256 = "97beee10c2a51ab6fb4ad380e56e18887a4a600e20965de8d8b5f7eafc302d57";
        libraryHaskellDepends = [
          attoparsec base bytestring lifted-base monad-control mtl stm text
          time transformers-base word8 X11
@@ -120100,7 +120470,7 @@ self: {
      mkDerivation {
        pname = "skypelogexport";
        version = "0.2";
-       sha256 = "0rk9m9fw6as7zzjkm4jhwgw7nbs05ky1s556xmjbnkh6l9xp2chw";
+       sha256 = "1c32717ba2064ebb64eda6141dfc2c402f7bf8e350923ae5ff472bc35daa6966";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -120121,7 +120491,7 @@ self: {
      mkDerivation {
        pname = "slack";
        version = "0.1.0.0";
-       sha256 = "0sqi4g8wavxdd98cnv869qx2p9g77f6dznxlfmgv1jlvd4a1ya67";
+       sha256 = "c7281f14699bcab05f75b4dbdf8c3be7a52b3a4e066dcb506aad6fc5d123116b";
        libraryHaskellDepends = [
          aeson base containers either http-conduit mtl old-locale text time
          transformers
@@ -120141,7 +120511,7 @@ self: {
      mkDerivation {
        pname = "slack-api";
        version = "0.5";
-       sha256 = "1jjm7qzb1s2z8c7ikwsvz2bp7f3dx3qcqw7kcas42xp0ziwnl50m";
+       sha256 = "15146a79fce07641b462f370ccf0e86db87397f85bf3190f435fe8b03e3e55ca";
        libraryHaskellDepends = [
          aeson base bytestring containers errors HsOpenSSL io-streams lens
          lens-aeson monad-loops mtl network network-uri openssl-streams text
@@ -120159,7 +120529,7 @@ self: {
      mkDerivation {
        pname = "slack-notify-haskell";
        version = "0.2.3";
-       sha256 = "0sz05v40b78qdpz8cqpnblhjy4dxqsz5175hq5083j7iv3xi3kc7";
+       sha256 = "87cd11fbd8f1c88140c1b09c50bec6bd112f215df66286fe6d189d05c82ee06b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120180,7 +120550,7 @@ self: {
      mkDerivation {
        pname = "slave-thread";
        version = "1.0.0.0";
-       sha256 = "0snk0v126a79q2blddbznz50l89jfap4y4xs9i76pk0b0dcik319";
+       sha256 = "298c1959030bcc6b4e4cba134fae7232210acab77fb54697c0e92823c206d36a";
        libraryHaskellDepends = [
          base base-prelude list-t mmorph partial-handler stm-containers
          transformers
@@ -120201,7 +120571,7 @@ self: {
      mkDerivation {
        pname = "slice-cpp-gen";
        version = "0.3.0.0";
-       sha256 = "0mvjj8hs8837dby54ii71wd1sg2z3r14sr7w2hnj2nhnjy7c23yy";
+       sha256 = "de0fc18e97165a212d14fc644d421e5f3c1d1a0f274652fc6a6720a421927257";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -120220,7 +120590,7 @@ self: {
      mkDerivation {
        pname = "slidemews";
        version = "0.3";
-       sha256 = "0x6blvdqwf9sqspwj48drasizx1pb1i92a0lp06szwa2nszdvzf0";
+       sha256 = "c0fdddbeb642f1af0db8142891625837f41fb5ca0d11c9afc63a398edba6cb74";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -120240,7 +120610,7 @@ self: {
      mkDerivation {
        pname = "sloane";
        version = "2.0.5";
-       sha256 = "1jmnyw5n2k9c0bsdgna7hxc6yxjrycss02wjwsavbq13i7amq8i9";
+       sha256 = "29225cd58923e0b595e6920ba035f359766f588747d9d7f4022c4d610bf7b6ca";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -120260,7 +120630,7 @@ self: {
      mkDerivation {
        pname = "slot-lambda";
        version = "0.1.0.3";
-       sha256 = "1npin7yaharbi5nzwksj1j7rf2k1nvmr1jgcf2xpnvvbcga7l69i";
+       sha256 = "31197ad4636b6f7bbb70ecc990ebb6610a978f0c524ffe6d892b2ba8fcb1f1da";
        libraryHaskellDepends = [
          base containers haskell-src-exts haskell-src-meta syb
          template-haskell vector
@@ -120275,7 +120645,7 @@ self: {
      mkDerivation {
        pname = "sloth";
        version = "0.0.2";
-       sha256 = "0x3iw1mqbl3q723kkxr6b0i1hxcfb4sink4kmg6xnpzd3hwaspq9";
+       sha256 = "095fad381ced5fdbcdab934c1b35598e7518225826f739873878d0856be07174";
        libraryHaskellDepends = [ base mtl process ];
        description = "Testing for minimal strictness";
        license = stdenv.lib.licenses.bsd3;
@@ -120287,7 +120657,7 @@ self: {
      mkDerivation {
        pname = "smallarray";
        version = "0.2.2.4";
-       sha256 = "16fgxsg8grxhqx6d4s3mm89qbkw2k72qvr4r701ih1i8gmf1ms1z";
+       sha256 = "3fe81a5c7d280618033899e48dc59982cf8513aa7568d24cc7b0e7879eeecf99";
        libraryHaskellDepends = [ base bytestring deepseq hashable ];
        jailbreak = true;
        homepage = "http://community.haskell.org/~aslatter/code/bytearray";
@@ -120303,7 +120673,7 @@ self: {
      mkDerivation {
        pname = "smallcaps";
        version = "0.6.0.0";
-       sha256 = "1vjzvsvci8zn4y2lh7s2kh6v1c6447nfksqxcv468zz8d1mflsfi";
+       sha256 = "d169ea6a68e87f64c8661debe9ec21c4b0b00d9c421f488527f6a3c8b6de5fee";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120324,7 +120694,7 @@ self: {
      mkDerivation {
        pname = "smallcheck";
        version = "1.1.1";
-       sha256 = "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd";
+       sha256 = "4d17607c1a620491e7e495a17575b73952932c761e7f9bdfa87e0102fb52f9f9";
        libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
        homepage = "https://github.com/feuerbach/smallcheck";
        description = "A property-based testing library";
@@ -120338,7 +120708,7 @@ self: {
      mkDerivation {
        pname = "smallcheck-laws";
        version = "0.1";
-       sha256 = "11b1fmbksw7z7inn9as73vjplm39d8kwmq10v8gj0yfw1g872xh0";
+       sha256 = "007671d00bdc79201fda20e0ca276a69547ae51e47ab646d3cff703d57756185";
        revision = "1";
        editedCabalFile = "ff6bf8f4f1f7b95550c9adc53125bfb25dc665260f5121eaf811ca3a08e386a1";
        libraryHaskellDepends = [
@@ -120356,7 +120726,7 @@ self: {
      mkDerivation {
        pname = "smallcheck-lens";
        version = "0.1";
-       sha256 = "19awz3gphvkmb54j3mqqmqjzdjywdrrvsb9lp46gbhjazn94sxdl";
+       sha256 = "b4754d92fd4ac2f50cb9342dbd736edccbf625ae18d7214959756e78dff85ca5";
        libraryHaskellDepends = [
          base lens smallcheck smallcheck-series tasty tasty-smallcheck
          transformers
@@ -120376,7 +120746,7 @@ self: {
      mkDerivation {
        pname = "smallcheck-series";
        version = "0.4";
-       sha256 = "05iixqnq9mfqc2gbwxnhx640apbppck8zb8akkwz1linlypvym60";
+       sha256 = "c054bfafa736d2f0f99c0aad8f26bb775d0588e9d076be9e60d8d5842dee3116";
        libraryHaskellDepends = [
          base bytestring containers logict smallcheck text transformers
        ];
@@ -120391,7 +120761,7 @@ self: {
      mkDerivation {
        pname = "smallpt-hs";
        version = "0.1";
-       sha256 = "1g4g2sgj39pkm3ll4yv0q9dcmq2lyd26qkr1gir1svmxs6hdwp59";
+       sha256 = "a95cdea0d1bd6e1d727c214f6c44f354e0ca5ac2607b42e9a8f3a6219f168fbc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base vector ];
@@ -120409,7 +120779,7 @@ self: {
      mkDerivation {
        pname = "smallstring";
        version = "0.3.3";
-       sha256 = "1wkgbnknx9k56ikl6hpv91r9sav8v5qvl2w7z2jadgrlj29fy755";
+       sha256 = "a51cef929034bfa6a4f8870bba71d9682b9d7248fb4243673465a66ea75d6ff2";
        libraryHaskellDepends = [
          base bytestring deepseq hashable smallarray text utf8-string
        ];
@@ -120426,7 +120796,7 @@ self: {
      mkDerivation {
        pname = "smaoin";
        version = "0.3.0.0";
-       sha256 = "0j18pdpywgb01679b4f2aj7pzna1njh45giw1b1dsqqdp45gz2rp";
+       sha256 = "378bff0ab90d63ddc20a3cbe42a0b441d97f8f54c291958e09603dee6fbb2848";
        libraryHaskellDepends = [ base bytestring random text uuid ];
        testHaskellDepends = [ base bytestring QuickCheck ];
        homepage = "http://rel4tion.org/projects/smaoin-hs/";
@@ -120439,7 +120809,7 @@ self: {
      mkDerivation {
        pname = "smartGroup";
        version = "0.3.0";
-       sha256 = "10wb5v87xl54bsl2xxsh1fh54bgqbhmmkhyaa3ly23nm2f01cpnp";
+       sha256 = "d75e168013d50ee1e950cac3592b5cf82d52a00b50f72ea85ea4d07ed02e8b83";
        libraryHaskellDepends = [
          base bytestring containers template-haskell
        ];
@@ -120456,7 +120826,7 @@ self: {
      mkDerivation {
        pname = "smartcheck";
        version = "0.2.1";
-       sha256 = "1rkw4fhiidn9rfq4dvik58zr453jsh2l8xpswas2rsv6k5w0909r";
+       sha256 = "398104789966eb2cb4e2fa764405d47214923f2a33ee46b0cbc9b618a1237ce6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120476,7 +120846,7 @@ self: {
      mkDerivation {
        pname = "smartconstructor";
        version = "0.2.0.0";
-       sha256 = "1082siphwd4xx9akqip78kzpqi19i3l53h0s2vghhdm5lwplcvlv";
+       sha256 = "9b6e462fa7a53608df161ac051e88829447cff44e7463c55ea9d340e6fd40281";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/frerich/smartconstructor";
        description = "A package exposing a helper function for generating smart constructors";
@@ -120488,7 +120858,7 @@ self: {
      mkDerivation {
        pname = "smartword";
        version = "0.0.0.5";
-       sha256 = "0dxw4jgmwcz92n2rymdrfaz1v8lc2wknql9ca5p98jc14l8c2bl3";
+       sha256 = "832ec110258149946e512c516c27178ca21dbe72b9559f8515e9335e9f24bc37";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -120505,7 +120875,7 @@ self: {
      mkDerivation {
        pname = "sme";
        version = "0.1";
-       sha256 = "1d3kjyskwzc7p5bi6pv9yxfa6l6dqkkqc24dmmxl5wx7vmbfma25";
+       sha256 = "45a8ea56dda7f3427bad8d0886e7c4cd50a35cf7695f1357b9877d3eb59773b4";
        libraryHaskellDepends = [ base ];
        description = "A library for Secure Multi-Execution in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -120517,7 +120887,7 @@ self: {
      mkDerivation {
        pname = "smoothie";
        version = "0.4.0.2";
-       sha256 = "1g2lk58p8rbhi45j6q3r0w4103bxi6pn9i3c5i3525s8brl4y8ni";
+       sha256 = "d1224f685e481751462c6cc464af897d0d1008077960230b89706574519954bc";
        libraryHaskellDepends = [ aeson base linear text vector ];
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
@@ -120529,7 +120899,7 @@ self: {
      mkDerivation {
        pname = "smt-lib";
        version = "0.0.2";
-       sha256 = "1phm50pabahrpxrzp25mfhpafzhp4hz8cxp6fp93rwh4cl7cckky";
+       sha256 = "7e4ec60e6504f23cd275e676863e24177ea72e74b588fb73bf19aaa52e2815de";
        libraryHaskellDepends = [ array base directory polyparse ];
        jailbreak = true;
        homepage = "http://tomahawkins.org";
@@ -120543,7 +120913,7 @@ self: {
      mkDerivation {
        pname = "smtLib";
        version = "1.0.7";
-       sha256 = "1jn2790x7g7n6jm5cfgd692n3l6iafyv0zyz40hx8ykcs4jh2rkf";
+       sha256 = "6e660125d16c7ad42120df7fb0bd53d1d0614532ed3956aa34f6bcd3413ac2ca";
        libraryHaskellDepends = [ base pretty ];
        description = "A library for working with the SMTLIB format";
        license = stdenv.lib.licenses.bsd3;
@@ -120557,7 +120927,7 @@ self: {
      mkDerivation {
        pname = "smtlib2";
        version = "0.2";
-       sha256 = "1xkbsqhfjsnf3qx9x7n7hqp3l769k4bbrp1274sf9cqqgbcs2ny6";
+       sha256 = "c65ba1d97a18b3e4343922dcbc1699c91c3a2e86c79e9e3a1ece6ae920d66bf6";
        libraryHaskellDepends = [
          array atto-lisp attoparsec base blaze-builder bytestring
          constraints containers data-fix mtl process tagged text
@@ -120575,7 +120945,7 @@ self: {
      mkDerivation {
        pname = "smtp-mail";
        version = "0.1.4.5";
-       sha256 = "010fbrcbypajwd9fjjc35br9p5axl1pqd0n1v51585ncrlv2icyw";
+       sha256 = "dcb32836cdcc165442d9c182866fa05d959bf22a8349e952e3525dbf585e0e04";
        libraryHaskellDepends = [
          array base base16-bytestring base64-bytestring bytestring
          cryptohash filepath mime-mail network text
@@ -120594,7 +120964,7 @@ self: {
      mkDerivation {
        pname = "smtp-mail-ng";
        version = "0.1.0.2";
-       sha256 = "0jvjb3ps22p71b0vq7lgfyxmhjbzhsc3crs0cv3qsnkhz4ghvgbh";
+       sha256 = "70bd0d1ff9705a8dc76640673698867f4958bb778f1ebcc10ae70aa1ef58724b";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring base64-bytestring bytestring
          crypto-random cryptohash filepath haskeline mime-mail mtl network
@@ -120612,7 +120982,7 @@ self: {
      mkDerivation {
        pname = "smtp2mta";
        version = "0.2";
-       sha256 = "0z36zvrh6xhg8s7wai65d2y6hz0qz016ick9a4yrjpqxxk78h902";
+       sha256 = "022488ceec1d5f993d5169b26802f8187c68bc68c544c58f460f7603f3fe667c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 network process ];
@@ -120631,7 +121001,7 @@ self: {
      mkDerivation {
        pname = "smtps-gmail";
        version = "1.3.0";
-       sha256 = "0vbykxqrw0gdhxwgchvgvkxwh7pwyrc1wvl26x5wqlkmkalmkvv9";
+       sha256 = "69ef59a99a7552cc4b37826e1e58f6fc1ec8fbdc6f43f67887ed019e719f7e6d";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring conduit conduit-extra
          cprng-aes data-default filepath mime-mail network resourcet
@@ -120649,7 +121019,7 @@ self: {
      mkDerivation {
        pname = "snake-game";
        version = "1.2";
-       sha256 = "1iy3m20ldc98agdi7n71ik8k2f62ybfg719z79lcf8pzynbfsrbd";
+       sha256 = "6d65ed96f5ff22c7683a3f85f3dcf2c23831d18ce1d813db5328b14681a8c3c7";
        libraryHaskellDepends = [ base GLUT OpenGL random ];
        description = "Snake Game Using OpenGL";
        license = stdenv.lib.licenses.bsd3;
@@ -120668,7 +121038,7 @@ self: {
      mkDerivation {
        pname = "snap";
        version = "0.14.0.6";
-       sha256 = "05xnil6kfxwrnbvg7sigzh7hl8jsfr8cvbjd41z9ywn6ymxzr7zs";
+       sha256 = "fa9ffc7bf5c6729f7e204daecd50765a220a0ffc2feaf3f6b29977370d8db617";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120693,7 +121063,7 @@ self: {
      mkDerivation {
        pname = "snap-accept";
        version = "0.1.0";
-       sha256 = "19sn7q9avb7y9j46fk7iga237qgcdm69sanb351c5s0lfgcpnf1m";
+       sha256 = "35387bd97314e8c24219cb2a9d4c6dece133847af14c67884cfeacad123e56a7";
        libraryHaskellDepends = [ base http-media snap-core ];
        jailbreak = true;
        homepage = "http://github.com/zimothy/snap-accept";
@@ -120707,7 +121077,7 @@ self: {
      mkDerivation {
        pname = "snap-app";
        version = "0.7.0";
-       sha256 = "1v3izzvxadjplir47ipi087sj6fcmfj5ivlhbkpp9ld7vj8sv2hi";
+       sha256 = "118aad91dca7d174ef5c90ee58a4abcc19a90f02f1c64372a45736d5f7ff71ec";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120721,7 +121091,7 @@ self: {
      mkDerivation {
        pname = "snap-auth-cli";
        version = "0.1.0.1";
-       sha256 = "0spdn7zazd17yrcx004m4yag8vy4bac4997f81nfvy25jvg87hhl";
+       sha256 = "14c283de9645f8ed6c40eea444985ac46ff494279500d059f627b4affeb1ed6a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -120739,7 +121109,7 @@ self: {
      mkDerivation {
        pname = "snap-blaze";
        version = "0.2.1.3";
-       sha256 = "0jpiykqgvdbhk1wk37qgfxmyrnx8553wnnmn7a4b3mq8zx8fzmlm";
+       sha256 = "95d6ef50ff08d7b1883ab65acb4729a8dbec6b770f9f31799870b5fdf0f4f14a";
        libraryHaskellDepends = [ base blaze-html snap-core ];
        homepage = "http://github.com/jaspervdj/snap-blaze";
        description = "blaze-html integration for Snap";
@@ -120751,7 +121121,7 @@ self: {
      mkDerivation {
        pname = "snap-blaze-clay";
        version = "0.1.0.0";
-       sha256 = "05zi9rjd37xznjj8yhm5har12mfrclsrwd9fbcwh5ngccd7h7fiy";
+       sha256 = "3eba034f63ecd902395b2e359e3565d95511b282a5428fa4b4bf9fd1644ef117";
        libraryHaskellDepends = [ base blaze-html clay snap-core ];
        jailbreak = true;
        homepage = "http://github.com/deckool/snap-blaze-clay";
@@ -120764,7 +121134,7 @@ self: {
      mkDerivation {
        pname = "snap-configuration-utilities";
        version = "0.1.0.0";
-       sha256 = "07cm60v7bz585fawfc8mml178z54zqfg8kb7ldln5bsa0ggpha2z";
+       sha256 = "5f2878df034aaf6269a3674df41cfea47c7402ad1531c7952ba8fc753630951d";
        libraryHaskellDepends = [
          base configurator text unordered-containers
        ];
@@ -120784,7 +121154,7 @@ self: {
      mkDerivation {
        pname = "snap-core";
        version = "0.9.7.2";
-       sha256 = "0lgnflwcjyiinrm75dy1flr37bvjn3yljx53cvlsb3ccfnxqwsjj";
+       sha256 = "526a8ebb758c8da5e966a37449fdb072af333275c1b7726ab6317ac93875f651";
        revision = "1";
        editedCabalFile = "d39520edcc970d9d1f683af9631ccbcad39536b9f88040b93efb66cbe7aefc55";
        libraryHaskellDepends = [
@@ -120808,7 +121178,7 @@ self: {
      mkDerivation {
        pname = "snap-cors";
        version = "1.2.9";
-       sha256 = "0s6bl9nldr96l0zjx1qh3zq9fs5wlrmagaalxsppjsln456gzjcd";
+       sha256 = "8dc9ff4c21966a79afee54a9a76aa6bc6897f01f10872e3fa026e5466da2cb68";
        libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive hashable network
          network-uri snap text transformers unordered-containers
@@ -120825,7 +121195,7 @@ self: {
      mkDerivation {
        pname = "snap-elm";
        version = "0.1.1.2";
-       sha256 = "1lp76s5yqgw5zvkv13b4552zq9f2mrngp5l5vd8kwz9rhawgl6kr";
+       sha256 = "791afab882397d3e51db8596fb6caec225fc4529648db0e7fe853fec8b36e7d2";
        libraryHaskellDepends = [
          base bytestring directory Elm filepath process snap-core text
          transformers
@@ -120842,7 +121212,7 @@ self: {
      mkDerivation {
        pname = "snap-error-collector";
        version = "1.1.1";
-       sha256 = "1b0wsbk01zjxqmilan94h0dprnvnq4j8rhair54ra2lzyqsbdbcx";
+       sha256 = "9dadb634f69f0a9549c951c18c24c176db7c1b8024594563c55dfe00e6d21cac";
        libraryHaskellDepends = [
          async base containers monad-loops MonadCatchIO-transformers snap
          stm time transformers
@@ -120864,7 +121234,7 @@ self: {
      mkDerivation {
        pname = "snap-extras";
        version = "0.11.0.1";
-       sha256 = "1747qvwbn1rlrjk085rj1780nrsqw4ps78c13si3kkk697k4wcbm";
+       sha256 = "75314ee64966ce39a21e81a1a32fe158670bd009321704a6cc3407bbf8c6879c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120891,7 +121261,7 @@ self: {
      mkDerivation {
        pname = "snap-loader-dynamic";
        version = "0.10.0.3";
-       sha256 = "0nk4knkxnfffs5pgf6x3ld83l174aymqlyasxbf7j10w0w8srmvw";
+       sha256 = "7cd7ac11071c0479dcea5a798aab57e4043a50a3a31bf76ed1ce39dba79d645a";
        libraryHaskellDepends = [
          base directory directory-tree hint mtl snap-core template-haskell
          time unix
@@ -120906,7 +121276,7 @@ self: {
      mkDerivation {
        pname = "snap-loader-static";
        version = "0.9.0.2";
-       sha256 = "0d6s7n6yryfs2jkw0hxvhvc79fhbj256askb1c6ksqhscxxxwz1m";
+       sha256 = "357cde7b671a623d0d0b6b6a658a900bba74d886bb43c0a714daf9ec8d3dda34";
        revision = "1";
        editedCabalFile = "c927448783c28f56bd57c7b09d147965b96e7b4c7320524b26c83bf10ab89c21";
        libraryHaskellDepends = [ base template-haskell ];
@@ -120924,7 +121294,7 @@ self: {
      mkDerivation {
        pname = "snap-predicates";
        version = "0.3.1";
-       sha256 = "02rksb2p8wgpla86313z6lwqli5f4ryv4wr95s61kamcpbmf18y5";
+       sha256 = "c5a3e0eabaacaa198c2e2973b27d26ae448a39357f846190a2f77174c5d2330b";
        libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive containers monads-tf
          snap-core text transformers
@@ -120949,7 +121319,7 @@ self: {
      mkDerivation {
        pname = "snap-server";
        version = "0.9.5.1";
-       sha256 = "18ryin6f315picrs2159sn2668266l3xchs7jb8isw0gp52273xg";
+       sha256 = "af8f2344b90f701dd1924743d6073546206384d5a904a1338bb784e18c8d3ea3";
        revision = "1";
        editedCabalFile = "7909ad539e7d3f23f3c799d736d1a54d0a9098dd55fd6be75c13b57794bfaa5c";
        configureFlags = [ "-fopenssl" ];
@@ -120972,7 +121342,7 @@ self: {
      mkDerivation {
        pname = "snap-testing";
        version = "0.6.0.0";
-       sha256 = "1kzcdlfahhrpczihbr4f41p4ijps27lhghrh29csl6jl7n71lvqk";
+       sha256 = "136f1a8e3d541aaa591230c307e911faca486e208ee405e3673743a81c6deccf";
        libraryHaskellDepends = [
          async base bytestring containers digestive-functors HandsomeSoup
          hxt io-streams mtl process QuickCheck snap snap-core text
@@ -120997,7 +121367,7 @@ self: {
      mkDerivation {
        pname = "snap-utils";
        version = "0.1.2";
-       sha256 = "1kr09fj1jfs6sfmca51k0gwn4acya70s9irzay9yf5b9yyvka391";
+       sha256 = "210d35b7f76915e793573fc7a4c1519e2962f9033314c5aad3463b19a44b20cf";
        libraryHaskellDepends = [
          base bytestring heist http-types MonadCatchIO-transformers mtl snap
          snap-core text xmlhtml
@@ -121015,12 +121385,11 @@ self: {
      }:
      mkDerivation {
        pname = "snap-web-routes";
-       version = "0.5.0.0";
-       sha256 = "1ml0b759k2n9bd2x4akz4dfyk8ywnpgrdlcymng4vhjxbzngnniv";
+       version = "0.5.1.0";
+       sha256 = "a2d2257193d69613fe504a81596b21d6453a5e41fee959c904de2565c7bc8de0";
        libraryHaskellDepends = [
          base bytestring heist mtl snap snap-core text web-routes xmlhtml
        ];
-       jailbreak = true;
        homepage = "https://github.com/lukerandall/snap-web-routes";
        description = "Type safe URLs for Snap";
        license = stdenv.lib.licenses.bsd3;
@@ -121031,7 +121400,7 @@ self: {
      mkDerivation {
        pname = "snaplet-acid-state";
        version = "0.2.7";
-       sha256 = "0vjqcmcp0p8vmh7vzwv62bigbx1ck2vnaxlkqmg5wddn0mhfm6gx";
+       sha256 = "fd99ea6005b6355e5ec5937665b7982cf4f5e21266f3bf0fac1b5d705965586e";
        libraryHaskellDepends = [
          acid-state base mtl snap text transformers
        ];
@@ -121051,7 +121420,7 @@ self: {
      mkDerivation {
        pname = "snaplet-actionlog";
        version = "0.2.0.1";
-       sha256 = "177a1b9fvlqh59hd9b5y92lq8yxv14jh79aadkyhxb4i0l5rl9vv";
+       sha256 = "7b279a0b0591ac0efd6c4aa5032509bb7b84a948beacd4602a10d3edd20aea9c";
        libraryHaskellDepends = [
          base blaze-builder bytestring digestive-functors
          digestive-functors-heist digestive-functors-snap errors heist
@@ -121073,7 +121442,7 @@ self: {
      mkDerivation {
        pname = "snaplet-amqp";
        version = "1.1.0.0";
-       sha256 = "01qw28paifysk402lpb7y8dyhf401ls1l0dcn6fiigvczwxzmk91";
+       sha256 = "21cdfa3bff6cbf189db1ac011a340d8038e81bf2675d2a0099dabba82e121c07";
        libraryHaskellDepends = [
          amqp base bytestring configurator lens monad-control mtl network
          resource-pool snap transformers
@@ -121093,7 +121462,7 @@ self: {
      mkDerivation {
        pname = "snaplet-auth-acid";
        version = "0.1.0";
-       sha256 = "0i0py2rj2vkivl97fxnv87bpbsbms2ncdqbq4zs0777nbr717swm";
+       sha256 = "95eb134e5ef69c03f42778e1c6acd075e975d741db767712dd716e21b3f01744";
        libraryHaskellDepends = [
          acid-state aeson attoparsec base cereal clientsession directory
          errors filepath hashable lens MonadCatchIO-transformers mtl
@@ -121112,7 +121481,7 @@ self: {
      mkDerivation {
        pname = "snaplet-coffee";
        version = "0.1.0.2";
-       sha256 = "1kxxnk8m9154sallhy3rf8nmz0qkvchh8m761jgzhfbnnwlznpnf";
+       sha256 = "ce5efb29b77639f89f0ce6540421db13835f2d72797848a9d2a48454d1b4bdcf";
        libraryHaskellDepends = [
          base bytestring configurator directory filepath haskell-coffee mtl
          snap snap-core
@@ -121129,7 +121498,7 @@ self: {
      mkDerivation {
        pname = "snaplet-css-min";
        version = "0.1.2";
-       sha256 = "1bp6y0x03dpflbp4b1kkbxnqwsgnynbbpdgcpswwxz48xkpcp0ij";
+       sha256 = "3282cbeeec88fcceb9beecb5bb96f5f6698e6d5f738645eea2eeb6013af0e6ae";
        libraryHaskellDepends = [
          base bytestring css-text directory filepath lens snap text
          utf8-string
@@ -121148,7 +121517,7 @@ self: {
      mkDerivation {
        pname = "snaplet-environments";
        version = "0.1.1";
-       sha256 = "1kk2ry19z73cmmwh3hmg87n00hqhzpmdvnb36b7yf9ck4zkhgy3h";
+       sha256 = "70f807e7279325e7cf3263d9ddeafd104300ec41afc20179ad6c9c9f82cf62ce";
        libraryHaskellDepends = [
          base bson configurator mtl regex-tdfa snap snap-core text
          unordered-containers
@@ -121166,7 +121535,7 @@ self: {
      mkDerivation {
        pname = "snaplet-fay";
        version = "0.3.3.12";
-       sha256 = "1j9khzd1zalzkli0p139fx48dljn76f4g851k889q3zq5lriihps";
+       sha256 = "fac218332df80f9c109aa1a0479c3956d286487769840b229d9faa1fda8733c9";
        libraryHaskellDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
@@ -121183,7 +121552,7 @@ self: {
      mkDerivation {
        pname = "snaplet-hasql";
        version = "1.0.2";
-       sha256 = "08gx096vg0swjc7z10nzlqsnjlr43cp190q4krkf08jb54ln3kcv";
+       sha256 = "9bcd6129294b22e0669e0483142e1b24536935a6df82f00f935c83b74d02fd21";
        libraryHaskellDepends = [
          aeson base bytestring clientsession configurator hasql
          hasql-backend lens mtl snap text time
@@ -121200,7 +121569,7 @@ self: {
      mkDerivation {
        pname = "snaplet-haxl";
        version = "0.0.0.2";
-       sha256 = "0xqz62qrhzr0ik60055w7jawxkps6cn5k6v1g7nx2zzhyvg1w4wl";
+       sha256 = "94131edef6f07fd1ed79619b592c33facece953cbc1400cc8c207f98b1301f77";
        libraryHaskellDepends = [
          base haxl MonadCatchIO-transformers snap transformers
        ];
@@ -121220,7 +121589,7 @@ self: {
      mkDerivation {
        pname = "snaplet-hdbc";
        version = "0.9.1";
-       sha256 = "17r7ailc2cnfny1ki7b027b5xipg2nvgr2yxvfh0sfzq8xkqa8ym";
+       sha256 = "d523856747f83b0da0dbdd8bfcb615efc65ed611609d3883b7ce32c16854279f";
        libraryHaskellDepends = [
          base bytestring clientsession containers convertible data-lens
          data-lens-template HDBC MonadCatchIO-transformers mtl
@@ -121241,7 +121610,7 @@ self: {
      mkDerivation {
        pname = "snaplet-hslogger";
        version = "1.0.0.2";
-       sha256 = "15cvpiz3p1qhb80sgz61mabvkb8h6j713jrny6mbg6qj945jbb0x";
+       sha256 = "1dac250b49129bb7aaf136cb118e3410adb997aac1fca7015a10873b7ebc9b95";
        libraryHaskellDepends = [
          base configurator hslogger mtl snap transformers
        ];
@@ -121258,7 +121627,7 @@ self: {
      mkDerivation {
        pname = "snaplet-i18n";
        version = "0.0.5";
-       sha256 = "0yl28vvk5p1qazcvb3ca3748cqzr45x9274ifcidcn13p327kck2";
+       sha256 = "62b279c4b82358d62273911c917a21f96386c8198a8db5d95738dc32f746827a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121284,7 +121653,7 @@ self: {
      mkDerivation {
        pname = "snaplet-influxdb";
        version = "1.0.1.1";
-       sha256 = "1dv800rclzl0b251bixksfl7jf28z82ql7nikf5dvginfpm71j7j";
+       sha256 = "f2c870ea7536bedd8a9bd11e8a05fa483879a8d3b3c7158a58807eca320068b7";
        libraryHaskellDepends = [
          base bytestring configurator http-client influxdb lens
          monad-control mtl network snap text transformers
@@ -121302,7 +121671,7 @@ self: {
      mkDerivation {
        pname = "snaplet-lss";
        version = "0.1.0.0";
-       sha256 = "0gll9r65xahx5vai4pbi0nrvscg6z964m30s58kkzy3898j000gx";
+       sha256 = "fd0100244a68f83f272a1a8c4a4cfae631bdb305715d12d52e1daa5e4c4e943e";
        libraryHaskellDepends = [
          base directory filepath heist lss snap text xmlhtml
        ];
@@ -121320,7 +121689,7 @@ self: {
      mkDerivation {
        pname = "snaplet-mandrill";
        version = "0.1.0.3";
-       sha256 = "0yyb0qbd14v6xw5vix08pv40w9l8p2vwvmh67sa9b4q9wkvwv962";
+       sha256 = "c2a4cdf7e4099395943e06d6cdb7b888260ec8be08f4b80bef6693d01606cb7b";
        libraryHaskellDepends = [
          base configurator mandrill mtl network snap transformers
        ];
@@ -121339,7 +121708,7 @@ self: {
      mkDerivation {
        pname = "snaplet-mongoDB";
        version = "0.2";
-       sha256 = "0hpm2bhvb8gh4sz4dfx53s24gkkk2c234szhwbrn10bmd7hrapaw";
+       sha256 = "5c5d95e169758160f3e2f06b32041373ce47841ea5bb46be26f0a1b5e112f542";
        libraryHaskellDepends = [
          base bson bytestring compact-string-fix containers haskell-src-exts
          MonadCatchIO-transformers mongoDB mtl parsec regular safe snap
@@ -121357,7 +121726,7 @@ self: {
      mkDerivation {
        pname = "snaplet-mongodb-minimalistic";
        version = "0.0.6.12";
-       sha256 = "0d0hnn0qp4zd453wzh1d3adls68gpv28dnkr7dcmjfl4f5igdran";
+       sha256 = "56e5f66271843a59593b79da86c4be0f194d9b1a2dc0cf4721ed938b81b51034";
        libraryHaskellDepends = [
          base lens mongoDB mtl snap text transformers
        ];
@@ -121377,7 +121746,7 @@ self: {
      mkDerivation {
        pname = "snaplet-mysql-simple";
        version = "0.2.1.0";
-       sha256 = "0hq58xsk5089kcdv2pby7dd71nb3nqzxrpppzb9qyqfz7pf45nr1";
+       sha256 = "21db42dc3ddf618fd3faf7dedc3fb663d9705a3b7e5db11b9b09813275470543";
        libraryHaskellDepends = [
          base bytestring clientsession configurator containers errors lens
          MonadCatchIO-transformers mtl mysql mysql-simple
@@ -121400,7 +121769,7 @@ self: {
      mkDerivation {
        pname = "snaplet-oauth";
        version = "0.0.6";
-       sha256 = "177yspz91nlzz9pw9x9zh4s4q7z7w9kl8gg5fd285xbadxazp3yl";
+       sha256 = "d48ffb556f6af5824473e53d4467e2e71f4c34813ff5c46ffa9fda90fed5fe9c";
        libraryHaskellDepends = [
          aeson base bytestring bytestring-show data-lens data-lens-template
          failure hashable heist hoauth2 http-conduit http-types
@@ -121428,7 +121797,7 @@ self: {
      mkDerivation {
        pname = "snaplet-persistent";
        version = "0.5";
-       sha256 = "1zbxknmsg9q6jwbxr4nh8nkfgkjmxb7pr2wwqa7rgr0wvh8ipx5k";
+       sha256 = "b3f41b11dc1ce4978fc29c8b7ccfea55cee7a645d092dc179706a7a7ab9d7dfd";
        libraryHaskellDepends = [
          base bytestring clientsession configurator errors heist lens
          monad-logger MonadCatchIO-transformers mtl persistent
@@ -121450,7 +121819,7 @@ self: {
      mkDerivation {
        pname = "snaplet-postgresql-simple";
        version = "0.6.0.2";
-       sha256 = "0xx69x9mkv6xyd7arnip12zzyq7hdcqbypgypalgsj6vcjb8i4mp";
+       sha256 = "b792889664db48fda8bafe5dbf306bf060ffbf0837daac4ef3ddec59534fa677";
        revision = "2";
        editedCabalFile = "cfc56ee20478bf05a650bdcb457b606a640daa71b84a3a2a3bdb8930dcbbeb7b";
        libraryHaskellDepends = [
@@ -121471,7 +121840,7 @@ self: {
      mkDerivation {
        pname = "snaplet-postmark";
        version = "0.2.0";
-       sha256 = "0006i88ssgh6z9g967wlw0km8abxmxdjjs7aalsddzla6xdp8wnx";
+       sha256 = "dd72745b378afed63455ea68295baf7d295427e0941f935efa063ead118a0600";
        libraryHaskellDepends = [
          base configurator mtl postmark snap text transformers
        ];
@@ -121488,7 +121857,7 @@ self: {
      mkDerivation {
        pname = "snaplet-purescript";
        version = "0.3.0.0";
-       sha256 = "1dapzqyxj7s6j4drp0szldjxrhm77r4yvbjxs79155a58mj9p1wn";
+       sha256 = "96879b6445459512d2d15daeed493ea7c2dc65a35f839b1b91461fd93dfe57b5";
        libraryHaskellDepends = [
          base configurator mtl raw-strings-qq shelly snap snap-core text
          transformers
@@ -121505,7 +121874,7 @@ self: {
      mkDerivation {
        pname = "snaplet-recaptcha";
        version = "1.0.3";
-       sha256 = "02f5fv70r7zjzycrrqsd1jwgpa7sq1m6rci74dlcbnms7z9cpv26";
+       sha256 = "46eccbd23fbadac5682327b26c6ac0faa8fbb80c4de39c99fff29f0cce76c509";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring configurator heist http-conduit
          lens MonadCatchIO-transformers mtl snap text transformers
@@ -121522,7 +121891,7 @@ self: {
      mkDerivation {
        pname = "snaplet-redis";
        version = "0.1.4.2";
-       sha256 = "0ri5cj3gjz5c1snh7kbncb08ijs1551ixr06v3nxjsb03hrl4hhh";
+       sha256 = "104242331c6069d9edd806e41e432941cb88c06276cd03ad0eac7cf986642566";
        libraryHaskellDepends = [
          base configurator hedis lens mtl network snap text transformers
        ];
@@ -121541,7 +121910,7 @@ self: {
      mkDerivation {
        pname = "snaplet-redson";
        version = "0.1.0.0";
-       sha256 = "0pvan8fnddn27cps5x8gyrwmm88z96jjh124i9g3mi9aqpyx8z5d";
+       sha256 = "ad7cd4fdc52ac53a5e8a440428a5491fa15a79f60ff5a22f3bc2b6661db26a5f";
        libraryHaskellDepends = [
          aeson base bytestring configurator containers data-lens
          data-lens-template easy-file hedis mtl snap snap-core snaplet-redis
@@ -121562,7 +121931,7 @@ self: {
      mkDerivation {
        pname = "snaplet-rest";
        version = "0.1.0";
-       sha256 = "1w1cy5zisn0mxj6rrz7wrw31ariia006cjxqwh9ahds6iwqh40y1";
+       sha256 = "c10302318f4637a812e4b84b66005031661506cffcfc9c8dec15581d7ff12cf0";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive http-media
          lens mtl snap snap-accept snap-core text utf8-string xmlhtml
@@ -121582,7 +121951,7 @@ self: {
      mkDerivation {
        pname = "snaplet-riak";
        version = "0.2.0.0";
-       sha256 = "0q0mnk0cl31xidax6bahvwabm9341p5852939yzgbam72mcv8jh0";
+       sha256 = "004ab45915a7aaf5be4f238982ca0d64a4ba14df502dd3558b3d0ccac0b41560";
        libraryHaskellDepends = [
          aeson base containers data-lens data-lens-template mtl riak
          riak-protobuf snap snap-core time transformers
@@ -121601,7 +121970,7 @@ self: {
      mkDerivation {
        pname = "snaplet-sass";
        version = "0.1.2.0";
-       sha256 = "1aiznsi54lxzwxnilckspvp6rdfmksxppa3964kqxh93a9gvkr9z";
+       sha256 = "3fe5b95f5223c18e273169a87bbb9ed5b56ceebe7a321a6de7bf5352a2b63faa";
        libraryHaskellDepends = [
          base bytestring configurator directory filepath mtl process snap
          snap-core transformers
@@ -121618,7 +121987,7 @@ self: {
      mkDerivation {
        pname = "snaplet-sedna";
        version = "0.0.1.0";
-       sha256 = "1rd0ymsnanf3nk02cim8lm9gppm739jfi2x6fzmp10xs9wmlhqab";
+       sha256 = "4b61482b4fba8370eb77a68be8641aa7defb52a5a84626c0b4c3596575f5a0e5";
        libraryHaskellDepends = [
          base bytestring containers monad-control mtl resource-pool
          sednaDBXML snap
@@ -121636,7 +122005,7 @@ self: {
      mkDerivation {
        pname = "snaplet-ses-html";
        version = "0.1.1.0";
-       sha256 = "1s5pyhwdnpw1ijy67h4kw052jz4pp73bpjcqii31passybvfd7k6";
+       sha256 = "669ee6f6f25aab1b468c98c9bbc6b9977c290ae093c063bc8c815fdb38f4b7e8";
        libraryHaskellDepends = [
          adjunctions base blaze-html bytestring configurator lens ses-html
          snap text transformers
@@ -121656,7 +122025,7 @@ self: {
      mkDerivation {
        pname = "snaplet-sqlite-simple";
        version = "0.4.8.3";
-       sha256 = "0nc0kv9s3c4wc3xb6jggx9v4p141c3af07x8vda18c7qlfif5nx3";
+       sha256 = "a3dbe2a2a3f8301454dba81fe0d46081844b76eaef49b3fa609cb0a1d39e8059";
        libraryHaskellDepends = [
          aeson base bytestring clientsession configurator direct-sqlite lens
          MonadCatchIO-transformers mtl snap sqlite-simple text transformers
@@ -121681,7 +122050,7 @@ self: {
      mkDerivation {
        pname = "snaplet-stripe";
        version = "0.3.0";
-       sha256 = "0j85vzfmw6skag8rfww4gsg1lyfc7qbxiqhmwbsh4vfjiagrc9wp";
+       sha256 = "9727969f8ad26d02f5e215e2d8173ecc791a9e7e847397d153531b5edddf0549";
        libraryHaskellDepends = [
          base bytestring configurator heist lens-family-core mtl snap stripe
          text text-format transformers xmlhtml
@@ -121699,7 +122068,7 @@ self: {
      mkDerivation {
        pname = "snaplet-tasks";
        version = "0.1.2";
-       sha256 = "0wkhjjjmd08jbhp41j6xvcvg3g7c74cz18mm89k8alwfc50krvc0";
+       sha256 = "80ed3c41618e53856642b5a2f01939ecbcf136dbddc8402e5c128156a5947072";
        libraryHaskellDepends = [
          base bytestring containers curl data-hash haskell98 MissingH mtl
          network snap snap-core
@@ -121718,7 +122087,7 @@ self: {
      mkDerivation {
        pname = "snaplet-typed-sessions";
        version = "0.5";
-       sha256 = "0gc6vnxsbwgciv281p6jff8ylcni4qpkmak2zqz710in86grjbgw";
+       sha256 = "fc2d999f413682703efe62aa3a2f26d132ea9173d2dc80c48eecf1a5bbdd863d";
        libraryHaskellDepends = [
          base bytestring cereal clientsession containers hashtables mtl
          PSQueue random regex-posix snap snap-core time
@@ -121739,7 +122108,7 @@ self: {
      mkDerivation {
        pname = "snaplet-wordpress";
        version = "0.1.1.2";
-       sha256 = "1vmkywrd0vfyd028d0pvfglywgbv1m26j1shwy9wmnr581vx9pab";
+       sha256 = "4bddd4774025dbca93e7500769440d7b3deee973fb82860468de6dd032f7b3ee";
        libraryHaskellDepends = [
          aeson async attoparsec base blaze-builder bytestring configurator
          containers data-default either hedis heist hspec hspec-snap lens
@@ -121764,7 +122133,7 @@ self: {
      mkDerivation {
        pname = "snappy";
        version = "0.2.0.2";
-       sha256 = "14fdx0fikkd9krpzqrvas6mjqmmhmh0qwqzvz1kymil7d8rdyr85";
+       sha256 = "0565df326a87c6ea67f8fb638e01acb0562cabd16a67fc6f9ea9cd191de8cd91";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ snappy ];
        testHaskellDepends = [
@@ -121781,7 +122150,7 @@ self: {
      mkDerivation {
        pname = "snappy-conduit";
        version = "0.1.0.0";
-       sha256 = "0k93v3dyv7818xy45l7i5wykfmnwyqkykxjh6xr937zh8a4qapfi";
+       sha256 = "d15d858942f09f91723750f6e927f6dc56373d2ff1d0427c47019deddbd8234d";
        libraryHaskellDepends = [ base bytestring conduit snappy ];
        jailbreak = true;
        homepage = "http://github.com/tatac1/snappy-conduit/";
@@ -121794,7 +122163,7 @@ self: {
      mkDerivation {
        pname = "snappy-framing";
        version = "0.1.0";
-       sha256 = "1m7zk4ns8igh2717d77k4zvf06byp35dly3ykawaz9hxwsxn1jb2";
+       sha256 = "62c960bbe61da6afb89a7e78dacab87e19e0f627f39c76c211f045a42d99ffd4";
        libraryHaskellDepends = [ array base binary bytestring snappy ];
        homepage = "https://github.com/kim/snappy-framing";
        description = "Snappy Framing Format in Haskell";
@@ -121806,7 +122175,7 @@ self: {
      mkDerivation {
        pname = "snappy-iteratee";
        version = "0.1";
-       sha256 = "17jwsvw7ik2bjanmzw4h72mdjaz031b5a6hi7cjz4ba1yjkiqnmk";
+       sha256 = "b35a1ca7f4412df2253b111a555618e02bd9aa3890f05fad924bcc78f8d65c9e";
        libraryHaskellDepends = [ base bytestring iteratee snappy ];
        jailbreak = true;
        homepage = "http://github.com/iand675/snappy-iteratee";
@@ -121823,7 +122192,7 @@ self: {
      mkDerivation {
        pname = "sndfile-enumerators";
        version = "0.10.0.0";
-       sha256 = "1nnlbhnm88xy462sh3d54b751ndl0r2qggbxn2irrwqdnhc21v4r";
+       sha256 = "99ec2018b40df39ca3b07dbd874506b4d950ce22a50da88521be23542d5cd4da";
        libraryHaskellDepends = [
          base binary bytestring containers filepath iteratee
          listlike-instances MonadCatchIO-transformers transformers vector
@@ -121836,12 +122205,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sneakyterm" = callPackage
+    ({ mkDerivation, base, classy-prelude, containers, lens, linear
+     , mtl, ncurses, transformers
+     }:
+     mkDerivation {
+       pname = "sneakyterm";
+       version = "0.1";
+       sha256 = "6dec2306f63d72f7e7931ba16827ff467de4b36d98089ecef8ba5df5346f5687";
+       libraryHaskellDepends = [
+         base classy-prelude containers lens linear mtl ncurses transformers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/pmiddend/sneakyterm";
+       description = "Tiny, declarative wrapper around ncurses";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "sneathlane-haste" = callPackage
     ({ mkDerivation, base, haste-compiler }:
      mkDerivation {
        pname = "sneathlane-haste";
        version = "1";
-       sha256 = "0m6281a1hvwbhv02vpdd01vm0jvccvq1kvy26dfncv0a8158y6wj";
+       sha256 = "921b8f4a400a6c665d33c2ef19f0666c4b507700addd2dc0868b6f185440c254";
        libraryHaskellDepends = [ base haste-compiler ];
        jailbreak = true;
        homepage = "http://sneathlane.com";
@@ -121855,7 +122241,7 @@ self: {
      mkDerivation {
        pname = "snippet-extractor";
        version = "0.2.0";
-       sha256 = "0iyya6p5i5jrhvah45bcvqgldfx49qv8393vwi5k413vxjr7c3zm";
+       sha256 = "f50f76b2ec7b04324be47ba481364ea4bb461fde6c1502d586599658ae51de47";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base parsec ];
@@ -121870,7 +122256,7 @@ self: {
      mkDerivation {
        pname = "snm";
        version = "0.0.4";
-       sha256 = "1n2cj35qrp6a766w29qrqcpcrv81xcpk9agkbibxngxh03abyhji";
+       sha256 = "5142bfd400b03fdb575cf3a9342feb01edcc2ec31927c18d39cadc8ccb904cd8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121895,7 +122281,7 @@ self: {
      mkDerivation {
        pname = "snmp";
        version = "0.2.0.0";
-       sha256 = "0vjbpjsa4ivsjzvfc9sr457pms2rw1zpb92d971n0yccl0bxmf67";
+       sha256 = "c7b8da17a08c7960c3494da4757fe059e87a4f215927e6f6977a47a2b4bc4b6e";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types async base binary bytestring
          cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl
@@ -121910,7 +122296,7 @@ self: {
      mkDerivation {
        pname = "snow-white";
        version = "2009.12.1";
-       sha256 = "007hzr8dpj0mhvmnpdg0gi296q3mlicnx36s6hmgifzmyaa8kssi";
+       sha256 = "51eb8994f2f5bbf82a34da8c6e59a4756093447ce0b56beb8615c8db50fef000";
        libraryHaskellDepends = [ base binary bytestring mps ];
        homepage = "http://github.com/nfjinjing/snow-white";
        description = "encode any binary instance to white space";
@@ -121926,7 +122312,7 @@ self: {
      mkDerivation {
        pname = "snowball";
        version = "1.0.0.1";
-       sha256 = "0fvxzm14ffjqq6n51bi5cmq5yrlggpkbb9rbbw522l6cjgv0apbx";
+       sha256 = "7d5d05f693cc50210a5f2ba7b5e67d8f665f706525ae50acc1583a4742fd7d3b";
        libraryHaskellDepends = [ base bytestring text text-icu ];
        testHaskellDepends = [
          base HUnit QuickCheck quickcheck-instances test-framework-hunit
@@ -121942,7 +122328,7 @@ self: {
      mkDerivation {
        pname = "snowflake";
        version = "0.1.1.1";
-       sha256 = "1pfd8lqwv0504hli6fhwiqckcca0x9pnfzmy3kz36w7138rclmpi";
+       sha256 = "f156ca321ae17033fe1cbe7e676fea403136198e1c3a132924a080cd3145cddd";
        libraryHaskellDepends = [ base time ];
        description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers.";
        license = stdenv.lib.licenses.asl20;
@@ -121955,7 +122341,7 @@ self: {
      mkDerivation {
        pname = "snowglobe";
        version = "3.0.0.2";
-       sha256 = "0l6hy0mza344k7m9skb6v9al611zgrrknhjdzx4ipqdd9zky9p23";
+       sha256 = "43dce4e74fade11b49ff4d423b737e3f044355da664d9dea99840cf52bf0d050";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -121976,7 +122362,7 @@ self: {
      mkDerivation {
        pname = "soap";
        version = "0.2.2.7";
-       sha256 = "02yirl0pr680pbwbh9z0awyk4blgdd0rir8x1gyydyn6v5dg736i";
+       sha256 = "d18cf35ad9c6fae6fd0b1de598416b8f2e323d57e027b8f8ba00997c01cdd10b";
        libraryHaskellDepends = [
          base bytestring conduit configurator data-default exceptions
          http-client http-types iconv mtl resourcet text
@@ -121998,7 +122384,7 @@ self: {
      mkDerivation {
        pname = "soap-openssl";
        version = "0.1.0.2";
-       sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210";
+       sha256 = "2008547f4fd22063479ce1cd1c483db926f5f08a2ff6fb0c60fb2f0f7d42830f";
        libraryHaskellDepends = [
          base configurator data-default HsOpenSSL http-client
          http-client-openssl soap text
@@ -122016,7 +122402,7 @@ self: {
      mkDerivation {
        pname = "soap-tls";
        version = "0.1.1.2";
-       sha256 = "0xnzwzmhh2i5nci7xbnkr28hxm376fbmgjcwz7svk46k1vxvlfp4";
+       sha256 = "e43abafb0ed390b9f5f99cc957973367d40e91c8d3ae7e22b3250a08ebe7df76";
        libraryHaskellDepends = [
          base configurator connection data-default http-client
          http-client-tls soap text tls x509 x509-store x509-validation
@@ -122033,7 +122419,7 @@ self: {
      mkDerivation {
        pname = "sock2stream";
        version = "0.3";
-       sha256 = "1vnrjza4x4jqlvz7mmihrjbdf4ngw02fkkn1j768w81m814vny7h";
+       sha256 = "f078bb494035208ecc91c1cee904e0cf12d796cc30d67afea658924ed497d9ee";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -122050,7 +122436,7 @@ self: {
      mkDerivation {
        pname = "sockaddr";
        version = "0.0.0";
-       sha256 = "1h74k5pipv9314y1d2wgpwgvyxfp6pcnq5051fdqr1shqlkpwbs2";
+       sha256 = "422f7e27c550878c9b0b05146cd935d775bf1fbf8f8b163c0923ed1b6f99e4c0";
        libraryHaskellDepends = [ base byteorder bytestring network ];
        description = "Printing SockAddr";
        license = stdenv.lib.licenses.bsd3;
@@ -122060,8 +122446,8 @@ self: {
     ({ mkDerivation, async, base, bytestring }:
      mkDerivation {
        pname = "socket";
-       version = "0.5.2.0";
-       sha256 = "0mika886mqzjzm14sby3qdlwdlnd20xwl2d2n1faalgimjl1149y";
+       version = "0.5.3.0";
+       sha256 = "f9d6ff67fa2a725c4184d38ecd635c955fd90ef83bcac02f16dbbb1179f26066";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ async base bytestring ];
        homepage = "https://github.com/lpeterse/haskell-socket";
@@ -122074,7 +122460,7 @@ self: {
      mkDerivation {
        pname = "socket-activation";
        version = "0.1.0.1";
-       sha256 = "109zxc16zlp98ggc99ap7wbzaa40yg34v3abn2nfs0w49dvh1zma";
+       sha256 = "aafe00774b8403edacb04b8d4dc6f38028f5173f57a5c4de43e9d26f02eb3f81";
        libraryHaskellDepends = [ base network transformers unix ];
        homepage = "https://github.com/sakana/haskell-socket-activation";
        description = "systemd socket activation library";
@@ -122088,7 +122474,7 @@ self: {
      mkDerivation {
        pname = "socket-io";
        version = "1.3.3";
-       sha256 = "1gy8g8bxjjj1hifkhvid6v8amml0gpp6gbfpih3v0grbi5aci0w7";
+       sha256 = "8783c854892b3fb0078cd7ad67ee7d80d6aad0362d6e385d84414ad9177ac8bf";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
@@ -122102,7 +122488,7 @@ self: {
      mkDerivation {
        pname = "socket-sctp";
        version = "0.1.0.0";
-       sha256 = "1xdrc3d31xzi0q8arh8liv1h9xqinscaa5ip2xs6dvf4gap7rvs8";
+       sha256 = "48ef7cae7ac4ed6674173716a598b611f704c38e14c1ac1006f1f730da60b9f5";
        libraryHaskellDepends = [ base bytestring socket ];
        librarySystemDepends = [ sctp ];
        testHaskellDepends = [ base bytestring socket ];
@@ -122123,7 +122509,7 @@ self: {
      mkDerivation {
        pname = "socketio";
        version = "0.1.3";
-       sha256 = "19rwkix7fjj3znd7z5bzknnpcfkmkmpcmrksv3q51b9fwph8gwrq";
+       sha256 = "38f387e0e52ead50f0d87ae6ca6e9d753a76ad9d7f957f9afd434a777a9c3ca7";
        libraryHaskellDepends = [
          aeson ansi-terminal attoparsec base blaze-builder bytestring
          conduit conduit-extra http-types lifted-base monad-control mtl
@@ -122147,7 +122533,7 @@ self: {
      mkDerivation {
        pname = "socks";
        version = "0.5.4";
-       sha256 = "1nmldlwxqasmg359i2aa3a903gi3lmnlspvf12xk49jrg3mf3dg9";
+       sha256 = "e9b5e1ea78592632bb086e5f4d6da523be01921a4a8998ca78552bdc396db4da";
        libraryHaskellDepends = [ base bytestring cereal network ];
        homepage = "http://github.com/vincenthz/hs-socks";
        description = "Socks proxy (version 5) implementation";
@@ -122159,7 +122545,7 @@ self: {
      mkDerivation {
        pname = "sodium";
        version = "0.11.0.3";
-       sha256 = "00qs1calial08a185ma5hm17lmmzig0yjf3710d5ikq1bmrgcqga";
+       sha256 = "ea61f6725d01cf581a086738e9c18bbf567a428545d582824280aa48150b1a03";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Sodium Reactive Programming (FRP) System";
        license = stdenv.lib.licenses.bsd3;
@@ -122170,7 +122556,7 @@ self: {
      mkDerivation {
        pname = "soegtk";
        version = "0.12.1";
-       sha256 = "01f49hwxc5h85iwzgnddxlh1lmb3s27zddmghxrlq958gcrr2iar";
+       sha256 = "594591337ba8244c7387afb6f68fd063551a20edadd9f7792c0816d6394cc405";
        libraryHaskellDepends = [ base cairo gtk old-time stm ];
        jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
@@ -122185,7 +122571,7 @@ self: {
      mkDerivation {
        pname = "sonic-visualiser";
        version = "0.1.1";
-       sha256 = "0gihsk7szq27ihhy9idiaslv164by23c9c70fhzwyqx3wk7z1aip";
+       sha256 = "37aaf0cfe4a363cf3f74e0b0c486f08b98b0a956b1c5e4218c47e0afcfd4303e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122207,7 +122593,7 @@ self: {
      mkDerivation {
        pname = "sophia";
        version = "0.1.2";
-       sha256 = "18svfy0ald8cz03vfv3m43w777rxksmaz0713a1vzcmyfb6h5iwg";
+       sha256 = "8fc702cd72beb2bf831ae180afaa9e3d9f73f820756cb707f80c35aa80775ba3";
        libraryHaskellDepends = [ base bindings-sophia bytestring ];
        testHaskellDepends = [
          base bindings-sophia bytestring directory tasty tasty-hunit
@@ -122224,7 +122610,7 @@ self: {
      mkDerivation {
        pname = "sort-by-pinyin";
        version = "2014.5.19";
-       sha256 = "1ksfx5zhagg2y8virg8am1w8ljrzc9ddmf7xgvi5gx88zibi32fd";
+       sha256 = "cd891157fc08f557e27efdb8da5a623f4b8a78a80abd1c37f2e23d057fe94ecf";
        libraryHaskellDepends = [
          air air-extra air-th base bytestring containers text
        ];
@@ -122238,7 +122624,7 @@ self: {
      mkDerivation {
        pname = "sorted";
        version = "0.0.1";
-       sha256 = "0rzcxhzc4s4sbdnysmjh1i8pd39jyx7a4hbhkarsp2qbx29s4h03";
+       sha256 = "0340a293e80b8babb39a7041a24ef7328d76510c5056ed6d5b9a68c23eecec67";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Efficient, type-safe sorted sequences";
@@ -122251,7 +122637,7 @@ self: {
      mkDerivation {
        pname = "sorted-list";
        version = "0.1.4.2";
-       sha256 = "1prfxpfvsx03lvk5q33azpcif2a3j80v4naw2kn48r1kb84r60m1";
+       sha256 = "a10293095a336444ec145c59b20192430917d9fd6a0c5ce6a60374bddded2edf";
        libraryHaskellDepends = [ base deepseq ];
        homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
        description = "Type-enforced sorted lists and related functions";
@@ -122263,7 +122649,7 @@ self: {
      mkDerivation {
        pname = "sorting";
        version = "1.0.0.1";
-       sha256 = "1i2vbmq7p7rja9rnhalyrspc2p5nc8yg6mfj9ia89j55vkc6225n";
+       sha256 = "b60861d8dca5c884544cd255f33c62b65cc1aece9e2a687352329f7b705d5bc4";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/joneshf/sorting";
        description = "Utils for sorting";
@@ -122275,7 +122661,7 @@ self: {
      mkDerivation {
        pname = "sorty";
        version = "0.1.1";
-       sha256 = "04bripdlc90rlkv5q6p44j10n7c1zdwv0ibiq5p365xijgribfaq";
+       sha256 = "58b915f393b117336ec17145b079fb811d0b8224e41a5cf6a4192446db8d7911";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring ];
@@ -122293,7 +122679,7 @@ self: {
      mkDerivation {
        pname = "sound-collage";
        version = "0.1";
-       sha256 = "11zwhq5r21phgadfvxxmvz7gcz3vhyrqw2rmwnkxz0n65p5az15m";
+       sha256 = "b584afca2dc682dfa7e5350b8eb3877b7cf6cedfb5f7ed9a7af006910b86fc87";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -122313,7 +122699,7 @@ self: {
      mkDerivation {
        pname = "sounddelay";
        version = "0.1.0.2";
-       sha256 = "1mqa70zbhpw860hclns4y8pri6d9swahzbhac7jhzrwq4vyia9xj";
+       sha256 = "b22715fd2698e70fe5610aae0f15d7a999982ff2445bca2030885fb83e380ad7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers parseargs WAVE ];
@@ -122331,7 +122717,7 @@ self: {
      mkDerivation {
        pname = "source-code-server";
        version = "2010.9.1";
-       sha256 = "1934awipc837mdhkfa3ghmljxk0vb16wd4f31qdl4q9nxgwfv6c8";
+       sha256 = "8899edf8eb3661421b0ec391c64d581bcc2e69856f283761ab672076235764a4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -122353,7 +122739,7 @@ self: {
      mkDerivation {
        pname = "sourcemap";
        version = "0.1.3.0";
-       sha256 = "1flfsjs2z2zjzqwvmc2vcibvxh19s89ah4s560xr2s5mhdqwbkk5";
+       sha256 = "65cec57183b568913b304513a812d229c0be57645bb0ba39fef28b2fb4d48eba";
        revision = "1";
        editedCabalFile = "aa8b674ddb6f30642da0a391ad3481b44241f9f1cb2ee661503e59dac3ca2053";
        libraryHaskellDepends = [
@@ -122372,7 +122758,7 @@ self: {
      mkDerivation {
        pname = "sousit";
        version = "0.4";
-       sha256 = "0vfgl4l3zwfsb2p5fds47bikyvfcsypmbjd1yvkjvi36x2g3pzwr";
+       sha256 = "99ff3b9ee866c42de7f6a1c955afd7cc6d3fe33a443757ae58daf13f28a1cf6d";
        libraryHaskellDepends = [
          base bytestring cereal mtl resourcet stm transformers
        ];
@@ -122393,7 +122779,7 @@ self: {
      mkDerivation {
        pname = "sox";
        version = "0.2.2.5";
-       sha256 = "19jczxackqhbi85i0i3jl26ng34a9hkfw73jlfscfl8xjqc0j99n";
+       sha256 = "36250918961d51c7b4a3721cee264c8a8c678da07244100b8a0be2c954ff4ca6";
        libraryHaskellDepends = [
          base containers explicit-exception extensible-exceptions process
          sample-frame transformers unix utility-ht
@@ -122411,7 +122797,7 @@ self: {
      mkDerivation {
        pname = "soxlib";
        version = "0.0.2";
-       sha256 = "1d82sqihmx3ymgyahbnjlzmam4pj4rwyp956p74fpl0gsmqphmr8";
+       sha256 = "28577871d50fd0ebc8b9a6a4eb7926f292aaeaa7d22ea8fcab7ef40a23d602b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122432,7 +122818,7 @@ self: {
      mkDerivation {
        pname = "soyuz";
        version = "0.0.0";
-       sha256 = "1w8adkrics3jp8lc1gwjiwn4i94yfzxba13wf65qywhmdr9lcy3p";
+       sha256 = "777846536e15728f8b717c04b5fa779ea4482c8f92bfc028ba726816f36c0af1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122450,7 +122836,7 @@ self: {
      mkDerivation {
        pname = "spacefill";
        version = "0.1";
-       sha256 = "0md1ygps2y2ri49g012xj5vv9iglixw06sicl685k60h4sskiqsk";
+       sha256 = "53e338b52610985990a12c6a03788ff4c5b477915d04f012895978a1eff3a155";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/knz/spacefill";
@@ -122463,7 +122849,7 @@ self: {
      mkDerivation {
        pname = "spacepart";
        version = "0.1.0.0";
-       sha256 = "118wch92ix54jp1hi4qw9mk46571lnak4df8ji83bs2vz3vax6jp";
+       sha256 = "579aaef6f85be8355094c8353295a5e11443664d1c9308c395a4f42812641c85";
        libraryHaskellDepends = [ base vector-space ];
        jailbreak = true;
        homepage = "http://code.haskell.org/data-spacepart";
@@ -122478,7 +122864,7 @@ self: {
      mkDerivation {
        pname = "spaceprobe";
        version = "0.3.0";
-       sha256 = "09vpnq5mfdzr132cqm5i4xkxmpg2035pbs64a56lgq0asdzlhfmy";
+       sha256 = "be3a487fd30ae0474d51c4e875cb00e2ddda6727b154ccc408f937570bb67727";
        libraryHaskellDepends = [ base clock containers erf mtl ];
        testHaskellDepends = [
          base clock containers erf mtl QuickCheck test-framework
@@ -122496,7 +122882,7 @@ self: {
      mkDerivation {
        pname = "spanout";
        version = "0.1";
-       sha256 = "0qi1pm46fyrn4vv1b5kcwhd8im59nz5qil6z33r8wq16vv151qb4";
+       sha256 = "64e150c2de26608ef218dfd088cbb7a9d4881ae46c9615f626367b6748bd2162";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -122519,7 +122905,7 @@ self: {
      mkDerivation {
        pname = "sparse";
        version = "0.9.2";
-       sha256 = "0ckjmpnav3rd40ylksrwc0awy4pigv6ngm15z1k6sicw73iyl3pd";
+       sha256 = "ed0eeae3389c456d66f825d467cd7ef112cf15603ceb493d202d8fadecad7232";
        libraryHaskellDepends = [
          base contravariant deepseq hybrid-vectors lens primitive
          transformers vector vector-algorithms
@@ -122544,7 +122930,7 @@ self: {
      mkDerivation {
        pname = "sparse-lin-alg";
        version = "0.4.3";
-       sha256 = "1255q13mb6196i3hv1i41agifg1x1840z535mx48jjkln297gmc9";
+       sha256 = "89d57792b0744a8948af65940f080a3d3c179f0a24860d473429985547c0a588";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base containers QuickCheck test-framework
@@ -122560,7 +122946,7 @@ self: {
      mkDerivation {
        pname = "sparsebit";
        version = "0.5";
-       sha256 = "1a4gsnmr1y8b05iws2vrmjqbs5y9svfsz0jb3k19dddn1aszzm07";
+       sha256 = "07d4ffb50ab6b596c21c4b82afddd6c917bdb0ac790bcd63010bf990abd58fa8";
        libraryHaskellDepends = [ base haskell98 ];
        homepage = "http://kyagrd.dyndns.org/wiki/SparseBitmapsForPatternMatchCoverage";
        description = "Sparse bitmaps for pattern match coverage";
@@ -122573,7 +122959,7 @@ self: {
      mkDerivation {
        pname = "sparsecheck";
        version = "0.1.0.3";
-       sha256 = "19h9vy7arhi35rqafbq3nf9a50vnlw5mbfwvl6sp1j61w0yxai95";
+       sha256 = "2545d53de0c1c870b5a19bbb550ba77683a292b3032fa7702e23c2ac8edf09a6";
        libraryHaskellDepends = [ base containers ];
        homepage = "http://www.cs.york.ac.uk/~mfn/sparsecheck/";
        description = "A Logic Programming Library for Test-Data Generation";
@@ -122588,7 +122974,7 @@ self: {
      mkDerivation {
        pname = "sparser";
        version = "0.6.1";
-       sha256 = "1mhnjlsqmvvwnh35dzrms9vsdvr563aq49qhwg35pvscsia2fpr2";
+       sha256 = "225f2754d44cef5bc6e3102782d53025efa677d235ff5606b47cef8a359516d6";
        libraryHaskellDepends = [
          base containers data-default monadplus nats pointed semigroups
        ];
@@ -122601,7 +122987,7 @@ self: {
      mkDerivation {
        pname = "spata";
        version = "2010.10.10";
-       sha256 = "1cr0d82l2b96jvszca4yavdgwq450yzigcyrrlddrf9m9908kkzy";
+       sha256 = "fecf89404a35b9dc1acdd9b317bf078560feda569e28f6f596262d41056a20b3";
        libraryHaskellDepends = [ base dlist mps mtl ];
        homepage = "http://github.com/nfjinjing/spata";
        description = "brainless form validation";
@@ -122616,7 +123002,7 @@ self: {
      mkDerivation {
        pname = "spatial-math";
        version = "0.2.4.0";
-       sha256 = "0aysc8r9ry7ii76d6522ja4pjwrfl3m212mbrimbdrh20ykirjvv";
+       sha256 = "7bcb1ca70702e6b66accab8a20eaa02e737989924214d3cc89f1f89c3262da2b";
        libraryHaskellDepends = [
          base binary cereal ghc-prim lens linear
        ];
@@ -122630,7 +123016,7 @@ self: {
      mkDerivation {
        pname = "spawn";
        version = "0.3";
-       sha256 = "0xkkl0w30rqif2jwdzjv239raly4yaf0116vkqcwh1i41jqn7ij8";
+       sha256 = "48c663b10c2406c8199edb84009cf2c45395d3105bfec6a57011673038a07376";
        libraryHaskellDepends = [ base ];
        description = "Tiny library for concurrent computations";
        license = stdenv.lib.licenses.bsd3;
@@ -122641,7 +123027,7 @@ self: {
      mkDerivation {
        pname = "spdx";
        version = "0.2.0.0";
-       sha256 = "0hxzkmyi90cbr7w8mjlp2azbkyp8gvjpv28c57lpvxw2xvyavgjq";
+       sha256 = "58beadfcee82f77de9290c897de57ee8fab9be1297ca8af8c98b81147d9dbf43";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/phadej/spdx";
@@ -122654,7 +123040,7 @@ self: {
      mkDerivation {
        pname = "spe";
        version = "0.6.3";
-       sha256 = "02cq8f9yz5z3rwkcj4nj8dgzwnn2w3b1jpndmmcqwsjymmivy8fr";
+       sha256 = "d921bf63ad5e6a8e59adcd5e19d6e0c25afe5f43d212c926cfe397ef93439809";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "http://github.com/akc/spe";
@@ -122667,7 +123053,7 @@ self: {
      mkDerivation {
        pname = "special-functors";
        version = "1.0.0.1";
-       sha256 = "0c68af104qxn9lhzshcy9s466q10n3ic7q4navqi53mmmmznivrd";
+       sha256 = "2def687fadb58e12f15696e0c3e2b0206063884e9e41fd214db663028253c830";
        libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)";
@@ -122683,7 +123069,7 @@ self: {
      mkDerivation {
        pname = "special-keys";
        version = "0.1.0.3";
-       sha256 = "0r66rzyh9m9wsy8mhyq09ar0zbalfyr627z9xrxny8242nbsygpy";
+       sha256 = "fe3eaf971544206f7beee91f61b27754ad0fb24a007b5891d73cd504fdcfc664";
        libraryHaskellDepends = [
          aeson base blaze-markup bytestring cereal deepseq hashable
          mwc-random path-pieces primitive safecopy text uuid
@@ -122702,7 +123088,7 @@ self: {
      mkDerivation {
        pname = "specialize-th";
        version = "0.0.0.8";
-       sha256 = "1b9bs08zja8id739zf0q47y91aq10gjr1ikbf7rvzav9i3w6djnc";
+       sha256 = "ccca66f88869abbff3716bc690e50301ab90fc2118b89fc6691129f911d02bad";
        libraryHaskellDepends = [
          base composition derive MissingH mtl newtype newtype-th
          template-haskell th-expand-syns tuple type-sub-th uniplate
@@ -122727,7 +123113,7 @@ self: {
      mkDerivation {
        pname = "species";
        version = "0.3.4.2";
-       sha256 = "07xixq45wbfqmdiykra2fpsfjv1n5s1zn0jvqrhja5d2i92865ly";
+       sha256 = "9e1683448aa2152561c65b02fb832e366ce9f47542e5e963abd82d5e08eeb11f";
        libraryHaskellDepends = [
          base containers multiset-comb np-extras numeric-prelude
          template-haskell
@@ -122741,7 +123127,7 @@ self: {
      mkDerivation {
        pname = "speculation";
        version = "1.5.0.2";
-       sha256 = "11d4v3x9phayx29lxl4na0b940ax27rjd867f7l9jb284p1rvhp5";
+       sha256 = "e5c29dc325482c99e871c7a026f3115d0192165096d04e93e85ec19bfad8a485";
        libraryHaskellDepends = [ base ghc-prim stm transformers ];
        homepage = "http://github.com/ekmett/speculation";
        description = "A framework for safe, programmable, speculative parallelism";
@@ -122753,7 +123139,7 @@ self: {
      mkDerivation {
        pname = "speculation-transformers";
        version = "0.1.2";
-       sha256 = "0050iy5q9m1ylkhbbnpff7yl99917pa46pgvj76isij4lvdl4f5a";
+       sha256 = "aa3842dba644461dcd91fb5d43d43d21a544fd71eedab5e0a43ed4848b8fa000";
        libraryHaskellDepends = [ speculation ];
        homepage = "http://github.com/ekmett/speculation/";
        description = "Merged into 'speculation'. Use that instead.";
@@ -122768,7 +123154,7 @@ self: {
      mkDerivation {
        pname = "spelling-suggest";
        version = "0.5.2.1";
-       sha256 = "0n0b2lbvj3pjg841pdw7pb09cpkz2d186dd4pmabjnm6r6wabm2n";
+       sha256 = "56d4a5b8c9a65ab954bda4358342137f5e96c0ba87b71b087af20eb917150b58";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122789,7 +123175,7 @@ self: {
      mkDerivation {
        pname = "sphero";
        version = "0.1.0.0";
-       sha256 = "1b5i6zpp3xz8jcvs44g97iyam5vcig3fpy0hcsldg51cm762sv48";
+       sha256 = "886c2dcca92c94d7a86610f8ebc68b6c97aa7c3ce911a23793e8f771ef37b1ac";
        libraryHaskellDepends = [
          base bytestring cereal containers mtl simple-bluetooth
        ];
@@ -122806,7 +123192,7 @@ self: {
      mkDerivation {
        pname = "sphinx";
        version = "0.6.0.1";
-       sha256 = "1pcm4y9k5lc00805ddv519cx4j3qld2v1dnbckg38n9dyp96wj98";
+       sha256 = "28496ed2f52d5934de64cbb6b045a37848d2590a65b756000280d132932795dd";
        libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 network text text-icu
          xml
@@ -122821,7 +123207,7 @@ self: {
      mkDerivation {
        pname = "sphinx-cli";
        version = "0.1";
-       sha256 = "08fqfmd6462skjywv2j4ilnmpbzr28d6vwmb187w3sv0byvvjzw3";
+       sha256 = "837fb9b75f60ebc10f0aabf26d1a12f9af5b2d8d448acdbd9c5a18625a75d821";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base sphinx ];
@@ -122837,7 +123223,7 @@ self: {
      mkDerivation {
        pname = "spice";
        version = "0.5.0.0";
-       sha256 = "1xs09ipg9l38nq3kxpdyv6643ywivhw87w6il0q9bzhng4rpfj6g";
+       sha256 = "cf4877337916fe9530a0d1f08338dc91fb418cd9bedd3e07b668d0f46e4c40f7";
        libraryHaskellDepends = [
          base bytestring containers data-default elerea GLFW JuicyPixels
          JuicyPixels-repa OpenGL
@@ -122857,7 +123243,7 @@ self: {
      mkDerivation {
        pname = "spike";
        version = "0.3";
-       sha256 = "11xr80fmbd6ps79fyzb40ha1gw4crxr8gff2nk39spj0sj64jqdn";
+       sha256 = "b661498cd4405e9dc6b4c2b98772cf8cf0171404647defd2d1d7b4551d40b987";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -122877,7 +123263,7 @@ self: {
      mkDerivation {
        pname = "spine";
        version = "0.1";
-       sha256 = "1sk2vkslcbmr4z87xc7q38ywbj118bcgqrkz9fqsp7jffxvy4bgv";
+       sha256 = "fb2de277774e9eabb14b7f66fcd84221c8c53d1af8b07ed027b92e46f5dc62ea";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/spl/spine";
        description = "Simple implementation of the generic spine view";
@@ -122889,7 +123275,7 @@ self: {
      mkDerivation {
        pname = "spir-v";
        version = "0.0.0.1";
-       sha256 = "1aazv418dd4kgpm8kq7n1cfm0gwcr0amsfdks0n1d9mn1rvz7b9p";
+       sha256 = "37adf3770eb6a6162cd0b3395d15c88c3f501d0bf6e089ea7d93b48602d95fa9";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/expipiplus1/spir-v";
@@ -122902,7 +123288,7 @@ self: {
      mkDerivation {
        pname = "splay";
        version = "0.0.6";
-       sha256 = "1mq5n62lg2jbhzbl1py7yhnhdyxa0gn2xmihb9cm5r7p75p5wacl";
+       sha256 = "94295e6e39f7e452595a30d62eec03aafb062df4c7df40d7874b8a4785b105d7";
        libraryHaskellDepends = [ base ];
        description = "Generic splay-based sequence representation";
        license = stdenv.lib.licenses.bsd3;
@@ -122915,7 +123301,7 @@ self: {
      mkDerivation {
        pname = "splaytree";
        version = "0.1.5";
-       sha256 = "0jilqkgp1mk6sllxhigp1sidnp7amgsfdmxf23r0l69hp0w4dcm7";
+       sha256 = "a7b24638b830190af210aed7e6f4abea5cdba20ef745d829d566d670dfc4344a";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base containers QuickCheck test-framework
@@ -122932,7 +123318,7 @@ self: {
      mkDerivation {
        pname = "splice";
        version = "0.6.1.1";
-       sha256 = "0lsfkm4vfipzbnqpf3yli6fwrv5a5mwbs149dfzhs7spa9kbxyl1";
+       sha256 = "81fabe6652571f0dbf6b8904bd782daaeccc9d89d40f77b15dff46b7499d4e53";
        libraryHaskellDepends = [ base network ];
        homepage = "http://corsis.github.com/splice/";
        description = "Cross-platform Socket to Socket Data Splicing";
@@ -122947,7 +123333,7 @@ self: {
      mkDerivation {
        pname = "spline3";
        version = "0.0.2";
-       sha256 = "112agbhn11wpy4dn0g3j9mrqcja5hhql55swmwh3lbm26hcvwjpq";
+       sha256 = "f84abe1934a22e3a20af5c97423184454986734d723c601bf1978760e17a4a84";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -122971,7 +123357,7 @@ self: {
      mkDerivation {
        pname = "splines";
        version = "0.5.0.1";
-       sha256 = "1bq5m8izvkrw21v9anp381rrq41svsmkxa0fk86ncm0lkaj09l5b";
+       sha256 = "abd004a49a1454660d9a0ea83eabde3a109c7340e35a9576103ccffd23aa05af";
        libraryHaskellDepends = [
          base containers polynomial vector vector-space
        ];
@@ -122989,7 +123375,7 @@ self: {
      mkDerivation {
        pname = "split";
        version = "0.1.4.3";
-       sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby";
+       sha256 = "7e69989206e26bb28f46cc8cf1edff5e439aa6be4adbc5b09118d6fdc1aa3bc5";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://code.haskell.org/~byorgey/code/split";
@@ -123002,7 +123388,7 @@ self: {
      mkDerivation {
        pname = "split";
        version = "0.2.2";
-       sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr";
+       sha256 = "f9cf9e571357f227aed5be9a78f5bbf78ef55c99df2edf7fdc659acc1f904375";
        revision = "1";
        editedCabalFile = "9098e40414e8491b0a400f5874408e577a444c4eadf1e03fb4ea6dfcc32e30c4";
        libraryHaskellDepends = [ base ];
@@ -123016,7 +123402,7 @@ self: {
      mkDerivation {
        pname = "split-channel";
        version = "0.2.0.1";
-       sha256 = "0w2sgj1f5ydfvhm80d3pbka9988jwl80n14bp5nisawpd2glxvak";
+       sha256 = "53ed4e9f68972b1d6db98b040b10e512a194d45c7734802adcaef9e2827c5a70";
        libraryHaskellDepends = [ base ];
        description = "Control.Concurrent.Chan split into sending and receiving halves.";
        license = stdenv.lib.licenses.mit;
@@ -123029,7 +123415,7 @@ self: {
      mkDerivation {
        pname = "split-record";
        version = "0.1.1.1";
-       sha256 = "0d53npfi3mba83vpjkq59ga51nxqvkvv7gr0mj1jb8kj8i4jjw7v";
+       sha256 = "fb7029494472a22583ac20bfb3f7dcb8db50d44b054f79f7406ad511ddb5a334";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -123047,7 +123433,7 @@ self: {
      mkDerivation {
        pname = "split-tchan";
        version = "0.1.0.0";
-       sha256 = "0qwcbvnm2vlr4bmn8r1q3ycamvgs0nfap4dkyzgp54f9rrl73x2p";
+       sha256 = "57f47168cec99172dff7b391ab9c05faedaa981f386464eb22996e51ed5e8c63";
        libraryHaskellDepends = [ base stm ];
        description = "STM's TChan split into sending and receiving halves";
        license = stdenv.lib.licenses.bsd3;
@@ -123058,7 +123444,7 @@ self: {
      mkDerivation {
        pname = "splitter";
        version = "0.1.0.0";
-       sha256 = "1nibmm0ab7a2j9rdmnphzz2svc3xfq268jbn23a403465s0v6sq6";
+       sha256 = "066bb3812e860c40d41076496404767db0adc5fff0dada7292429da540ad2bda";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -123078,7 +123464,7 @@ self: {
      mkDerivation {
        pname = "splot";
        version = "0.3.12";
-       sha256 = "0xk5p2ikrzrmhvl69cl36sskcqgfnhxbbdlyp7bzl5pny0l0h9in";
+       sha256 = "36260828f0f616fad7b99eb6b53ab4ee6136b53683b264e88635ff3ca3b86576";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -123096,7 +123482,7 @@ self: {
      mkDerivation {
        pname = "spool";
        version = "0.1";
-       sha256 = "1svkz3cxkyi6f3akakjfk1cvij85xy69v52d88gh97xgiawp5346";
+       sha256 = "868c72b98aaf9f041f424d949d8cef05c9b859984e4e35d57026fad9d9f873eb";
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Convert between ByteString and Vector.Storable without copying";
        license = stdenv.lib.licenses.bsd3;
@@ -123107,7 +123493,7 @@ self: {
      mkDerivation {
        pname = "spoon";
        version = "0.3.1";
-       sha256 = "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr";
+       sha256 = "b9b350b6730e34c246bbf7e228a86b3d4925b52c95542f7676d719ef2a9881d4";
        revision = "1";
        editedCabalFile = "e46c5e919cc9d0c7b0f671cddb631ef0979622a1e2250c59c7e491a799944527";
        libraryHaskellDepends = [ base deepseq ];
@@ -123122,7 +123508,7 @@ self: {
      mkDerivation {
        pname = "spoonutil";
        version = "0.0.1";
-       sha256 = "0xkarfm0c0931dz6yjs7pb5s2zizz1psnx9gfri5jq16skxk2nhd";
+       sha256 = "0d5a31fbd426605962762f75ab6ff83f7ea1cbba474b6f7e0b230106aacb6a76";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123141,7 +123527,7 @@ self: {
      mkDerivation {
        pname = "spoty";
        version = "0.1.0.2";
-       sha256 = "0p1mn8yixlyj2al98mxzs10m0klqqmmdfjcwc9xax97xp4ixjcm3";
+       sha256 = "a332d923b9fda4ae7a629c49d76ac5984e5041d0bf5794a812d2d31e3db2355c";
        libraryHaskellDepends = [
          aeson base bytestring lens lens-aeson pipes text
          unordered-containers wreq
@@ -123159,7 +123545,7 @@ self: {
      mkDerivation {
        pname = "spreadsheet";
        version = "0.1.3.3";
-       sha256 = "1q6cdgn1bf6dz6brd237ypw3cn0arbf9sm8ghzfngz20k0rbgcj1";
+       sha256 = "41b2b7329840fc67dd870f559ddcca0a5836f8f567889697f9cdb815ec6bcce0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123175,7 +123561,7 @@ self: {
      mkDerivation {
        pname = "spritz";
        version = "0.1.0.0";
-       sha256 = "1syv2l0z7c2s6bbi5103i4var40j8pavahiic813v8m9s6waa4fk";
+       sha256 = "d311a5b8d1a9a23d02623142b5d5451290ac3689038412d7325ab0f30115dbeb";
        libraryHaskellDepends = [ base lens mtl vector ];
        homepage = "https://github.com/relrod/spritz";
        description = "An implementation of the Spritz RC4-like stream cipher in Haskell";
@@ -123189,7 +123575,7 @@ self: {
      mkDerivation {
        pname = "spsa";
        version = "0.2.0.0";
-       sha256 = "0jj08bkvmg8cj0lp7j8sd2ksanyrr5i2xxcz4kfwkrlyf8zhqxrh";
+       sha256 = "30770c3f729ee6c9dd249ff52e62c9d95ba5a7681ac97329900cbdbae742404a";
        libraryHaskellDepends = [ base hmatrix mtl random ];
        testHaskellDepends = [
          base hmatrix HUnit QuickCheck random test-framework
@@ -123209,7 +123595,7 @@ self: {
      mkDerivation {
        pname = "spy";
        version = "0.10";
-       sha256 = "1b3nhx009mzwl7n9d1bka4i9mwdh1gq08bsfmcnw9s7527nhn0ph";
+       sha256 = "f0020bed11e5e8c42dab4e2f04f00bb0f19a2251738596eca1fcd704408776ac";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -123234,7 +123620,7 @@ self: {
      mkDerivation {
        pname = "sql-simple";
        version = "0.3.1";
-       sha256 = "1vhg8ijpa64qalgza5sr3j8y1ihk6ys5lyf34vwcmjv8nlpyhpwh";
+       sha256 = "905fe82fb568cbcaf826c3795ab43713c6e0911c5917f51f5598187565440fee";
        libraryHaskellDepends = [
          base containers exceptions monad-control text transformers
          transformers-base
@@ -123253,7 +123639,7 @@ self: {
      mkDerivation {
        pname = "sql-simple-mysql";
        version = "0.3.0";
-       sha256 = "1i9xgzl3pjxii4mgx8az5gmygxq2vn1km7kmndwy07qkh26ynd7p";
+       sha256 = "f734eb8d80131fe079b3759e3a83dd02f7e7eb2b5fa1fe2a89b1cb3be87f3dc5";
        libraryHaskellDepends = [
          base data-default-class mysql mysql-simple sql-simple text
        ];
@@ -123271,7 +123657,7 @@ self: {
      mkDerivation {
        pname = "sql-simple-pool";
        version = "0.3.0";
-       sha256 = "14pradqy01vsd2cngvcbwvrwq5r3c5a00awi6j5vmkb51dycizh9";
+       sha256 = "09fec87c0b65cdba8b34912b0054612317ccf3e68bed6799687a07e07153f992";
        libraryHaskellDepends = [
          base data-default-class monad-control resource-pool sql-simple text
          time
@@ -123290,7 +123676,7 @@ self: {
      mkDerivation {
        pname = "sql-simple-postgresql";
        version = "0.3.0";
-       sha256 = "0dk2829zkcwxyqw0p2nsrm9gw527cmggdslhflrylg8xr1ag6zs1";
+       sha256 = "417ff354c81d3dea337590eaf65e654714fe52cdda8a0b38f69db3f993406236";
        libraryHaskellDepends = [
          base data-default-class postgresql-simple sql-simple text
        ];
@@ -123306,7 +123692,7 @@ self: {
      mkDerivation {
        pname = "sql-simple-sqlite";
        version = "0.3.0";
-       sha256 = "07ji17b4q9b8w9q9r8digb218qkjcrxfc24113p0f3pmgbwci3f1";
+       sha256 = "c18dc8f87af50e07ee088108e67a66726214c47ab1a19c70e268254cd609511e";
        libraryHaskellDepends = [ base sql-simple sqlite-simple ];
        jailbreak = true;
        homepage = "https://github.com/philopon/sql-simple";
@@ -123320,7 +123706,7 @@ self: {
      mkDerivation {
        pname = "sql-words";
        version = "0.1.3.1";
-       sha256 = "17dma51naynrxhvljwp7s3sadnmfqgallxsq7l763z6d0a25zkn9";
+       sha256 = "c9ce5f8402cdfc610e3d58774ad5c3aedaa6f4d0e7724937ecd97a654351b59d";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
@@ -123335,7 +123721,7 @@ self: {
      mkDerivation {
        pname = "sqlite";
        version = "0.5.2.2";
-       sha256 = "1hlyv2w4q2dlcsz18fqbmqf7nwsbzyh184ynzfnz5svvc8j9hbrp";
+       sha256 = "372f9824627bebf2adfbd61314a0ff4b737b1cae0b3b14be66b4094cb8d89ec2";
        libraryHaskellDepends = [
          base bytestring directory pretty time utf8-string
        ];
@@ -123352,7 +123738,7 @@ self: {
      mkDerivation {
        pname = "sqlite-simple";
        version = "0.4.9.0";
-       sha256 = "18v03yqq9jxyvxq93rh20sxak4ffsshhpq9v9lrz1lk9vnhy9pw1";
+       sha256 = "81dfe4a1dd69d2f0334d3be10ba1d6ce91a9ba0602e69170dfbecb84b11f60a3";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          direct-sqlite text time transformers
@@ -123372,7 +123758,7 @@ self: {
      mkDerivation {
        pname = "sqlite-simple-typed";
        version = "0.1.0.0";
-       sha256 = "00flij4wv8ga0bpnnai6gwwga1fkra9kr3y9yw30j7czwl5r2h0r";
+       sha256 = "1940910be59f1d0906f7c98f3c93cad305f5387f262a6bef02eaa1cd898cd401";
        libraryHaskellDepends = [
          base haskell-src-meta sqlite sqlite-simple template-haskell
          typedquery utf8-string
@@ -123389,7 +123775,7 @@ self: {
      mkDerivation {
        pname = "sqlvalue-list";
        version = "0.2";
-       sha256 = "1r9y3p355rl57pnm84flx734zzjxnnc53fkcfdkykxi5wi5j05v0";
+       sha256 = "6017204be425f6e967736cba5198b55dfe4fc6e9d41154ed3d85e652c61d3ee5";
        libraryHaskellDepends = [ base convertible HDBC template-haskell ];
        description = "Class and instances for conversion to list of SqlValue";
        license = stdenv.lib.licenses.bsd3;
@@ -123402,7 +123788,7 @@ self: {
      mkDerivation {
        pname = "squeeze";
        version = "1.0.4.4";
-       sha256 = "18nia9c5zvcwd3sbj1h53kfcfa2ihfmff74ab2lfi97dgrq5p1n4";
+       sha256 = "c4865b707eeda4e8a8588a1ce7aa835128c7dc1c0506b9f4689ced5f5852d1a2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -123423,7 +123809,7 @@ self: {
      mkDerivation {
        pname = "sr-extra";
        version = "1.46.3.1";
-       sha256 = "0ssrv6h50kycxzb84s5j61mg78xyb4hyda2zxshnlqz0gbq134sr";
+       sha256 = "599311f07ae0636aa1ee5fa8e62159bea3f36a30b26882d6efcc4f50a0d9596b";
        libraryHaskellDepends = [
          base bytestring bzlib containers directory filepath HUnit mtl
          network-uri old-locale old-time pretty process pureMD5 QuickCheck
@@ -123441,7 +123827,7 @@ self: {
      mkDerivation {
        pname = "srcinst";
        version = "0.8.10";
-       sha256 = "05ydsh4ippapxcx7j3fq8s64qiskcrmndgvilxkdp4qhxyi80gj9";
+       sha256 = "493e80a2ef1093db66a771bf666b6653474c8c46d80d793aeb57dd1b09d4cd17";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -123458,7 +123844,7 @@ self: {
      mkDerivation {
        pname = "srcloc";
        version = "0.5.1.0";
-       sha256 = "1zssd6jxdhzl5wcygbmzq1s82i7m7rav6nm1m6kl5b68g77gc7g6";
+       sha256 = "e61df6ce79c8ac42a7a9a15ab3553ef5448174c0bfaee7192ff4c3d6a5695aff";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Data types for managing source code locations";
@@ -123470,7 +123856,7 @@ self: {
      mkDerivation {
        pname = "srec";
        version = "0.1.0";
-       sha256 = "028sb4znvdqsygipcsf44j0xazk03pdfkirzrczmxcd11srh3h1k";
+       sha256 = "33c001b30ea1b15e3fcb3fc7e9da1d607ed58124c46976e3f31ab76d3f591a09";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://tomahawkins.org";
        description = "Parsing and processing s-records";
@@ -123485,7 +123871,7 @@ self: {
      mkDerivation {
        pname = "sscgi";
        version = "0.3.0";
-       sha256 = "0pkhk6xhh1404yncyl62mjyp7mc2i06ihy243r0mq7qyy7ak417r";
+       sha256 = "f90432d5f11e1f5c411e4478180d8882d573bdacc250cfac27800408bb99705e";
        libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive containers Glob
          MonadCatchIO-mtl mtl transformers utf8-string
@@ -123508,7 +123894,7 @@ self: {
      mkDerivation {
        pname = "ssh";
        version = "0.3.1";
-       sha256 = "1v4xrnc7h5r0nlcv3m129phf6qpp48fvkgv9yxf0fy1i3lp52krj";
+       sha256 = "324f512e1d3178075cf769bfb91d22f762e3e04d22d4b119b520177898cd9dec";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base base64-string binary bytestring
          cereal containers crypto-api crypto-pubkey-types
@@ -123534,7 +123920,7 @@ self: {
      mkDerivation {
        pname = "sshd-lint";
        version = "0.1.0.1";
-       sha256 = "0q34zx8cn0gs91c4x4bicmygfaary5kk42ib62jk0hlrh3rzdi7c";
+       sha256 = "ecc4f6f380994230a5302b0a3267f15929f77c6571914e5848fa01cb50ff6460";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -123555,7 +123941,7 @@ self: {
      mkDerivation {
        pname = "sshtun";
        version = "1.0.0";
-       sha256 = "0794vsv043ppydzyjxnh06m4l3gbnga7x8nwsamh8skrzjfwn6jq";
+       sha256 = "581acb9dfc796a04abd2dca27ed4b3eb0d4aaa01d076e97ff3f70e02b6de241d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -123576,7 +123962,7 @@ self: {
      mkDerivation {
        pname = "sssp";
        version = "1.1.1";
-       sha256 = "1nr30nrldjd3q1iw3l967x3v1rvl9afz1p87hhhkvpy60gri8m7c";
+       sha256 = "ec5414f303c6df3d218407ddf09d4a74e7b0473f26d1c163c0a3c946b30523db";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123605,7 +123991,7 @@ self: {
      mkDerivation {
        pname = "sstable";
        version = "1.0";
-       sha256 = "1siyjj75k1nsncpqwz53algbnvgbmr4syw45rfj1cpq4qbfwlcgm";
+       sha256 = "f531caddc2045f16a4cb8570af49aeeb6dbb1e55a37c8e2fb3da86598e943eea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123622,7 +124008,7 @@ self: {
      mkDerivation {
        pname = "ssv";
        version = "0.3";
-       sha256 = "1z01611d380rgn64b0sbwxfbz7m8lgwhkc3lljpih6nsdn9hwrq5";
+       sha256 = "05670e936dda1a18afa474b009f9a3a89ebf5ce74b83458c7d19a0d1423001fc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -123637,7 +124023,7 @@ self: {
      mkDerivation {
        pname = "stable-heap";
        version = "0.1.0.0";
-       sha256 = "14wx42lmk2vd6v356q5cbd78y9xdnmkwcn6ddpnkyzq331hk23s1";
+       sha256 = "410f316118037f3fed6dcd58c667b5ad278f4e5bac6053c6366d8b59a9209d93";
        libraryHaskellDepends = [ base ];
        homepage = "http://hub.darcs.net/jmcarthur/stable-heap";
        description = "Purely functional stable heaps (fair priority queues)";
@@ -123649,7 +124035,7 @@ self: {
      mkDerivation {
        pname = "stable-maps";
        version = "0.0.5";
-       sha256 = "1sjidykbj5f692di93nml0frazvyw9kxyhjwbyyvrb9gwgc2ms3w";
+       sha256 = "7ce82ad8e32fadbcbd5f5c42df67e27e7f951da0d58e149b48c615b9a66f51ea";
        libraryHaskellDepends = [ base containers ghc-prim ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/stable-maps";
@@ -123662,7 +124048,7 @@ self: {
      mkDerivation {
        pname = "stable-memo";
        version = "0.3.1";
-       sha256 = "1rv578311cvn7ym08vxxi18dhic50w7ms6cjn77vh032b8fxr3gx";
+       sha256 = "fd8ddc1d5a6200b8cfb192195d0f078545d85088bd6f04aa3f76b310063a65e7";
        libraryHaskellDepends = [ base ghc-prim hashtables ];
        description = "Memoization based on argument identity";
        license = stdenv.lib.licenses.mit;
@@ -123676,7 +124062,7 @@ self: {
      mkDerivation {
        pname = "stable-tree";
        version = "0.7.0";
-       sha256 = "0mcb983sdwfsf39gd8zsls7pgndqrnnzvxsz8kn9c5nqjxwdll4p";
+       sha256 = "9750da7897d81696ec445ff7fdadcdb8d9778fa6faa3f6d270daf1a6074a8b55";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123713,7 +124099,7 @@ self: {
      mkDerivation {
        pname = "stack";
        version = "9.9.9";
-       sha256 = "1kpsza23b22mg970c2qs943khzad38imzsa1xzki2a3xvfiadana";
+       sha256 = "caaaa6a2db7d2811e7ef41e95f231a4d7d3807491a0b064e7a55883584faface";
        revision = "4";
        editedCabalFile = "5ff7356010e14ec43684d11fcec6e34f47f794cc48a258919568cc27c72ffd34";
        isLibrary = true;
@@ -123756,7 +124142,7 @@ self: {
      mkDerivation {
        pname = "stack-prism";
        version = "0.1.4";
-       sha256 = "1lw42nkbzsc7mg8fnspjsply67ashrnbkml797fz2nvic84l8820";
+       sha256 = "4020440962715bf1dd4987d6b96c865a1de3e9d5f26aebd0ab87e9bfa61584d3";
        libraryHaskellDepends = [
          base profunctors tagged template-haskell transformers
        ];
@@ -123775,7 +124161,7 @@ self: {
      mkDerivation {
        pname = "stackage";
        version = "0.7.3.2";
-       sha256 = "0npry3yxbfyz97q19b405h40mb4rypgkhlp78hgl7zqbxk28ysza";
+       sha256 = "ea6b8fc4ec0bff431f44e75238dff599ac0a082c80ac14f049dfbbd5fdf0f95a";
        libraryHaskellDepends = [
          base stackage-build-plan stackage-cabal stackage-cli
          stackage-install stackage-sandbox stackage-setup stackage-update
@@ -123795,7 +124181,7 @@ self: {
      mkDerivation {
        pname = "stackage-build-plan";
        version = "0.1.1.0";
-       sha256 = "1slqkcmvnrbbg50qdf368q5h7svngw77b984mpg39p44mc7ghwyg";
+       sha256 = "cf73f80eab84dc34dead04a5750e7f76eb030b4666b88641796b65bb2b9b98ea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123819,7 +124205,7 @@ self: {
      mkDerivation {
        pname = "stackage-cabal";
        version = "0.1.1";
-       sha256 = "0797izw5451mqr41a22xvv5c6c0936hi44cfmp9rzhj6mh92iwzj";
+       sha256 = "f2f32812ac46c29fd3ad8e1112a1190930c3cade5d081548c6351452f88f271d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -123840,7 +124226,7 @@ self: {
      mkDerivation {
        pname = "stackage-cli";
        version = "0.1.0.2";
-       sha256 = "10asq1zg7b4zqsn51ap03809j0bxrwh1gacc387wdi1p3zakn88n";
+       sha256 = "16213bd51f37c4c60f1a8ca91720cf7d0199001ae0aa50acc69facf37ec05a81";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123871,7 +124257,7 @@ self: {
      mkDerivation {
        pname = "stackage-curator";
        version = "0.10.0";
-       sha256 = "0dlsgm9bbib45591m7kj9vai48r4n0zvkwm4vd4c78rj54qhnq9n";
+       sha256 = "36610b312932a3c348dba4f2b93fb0242312d54e729e1a522964c5b5527d9a36";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123909,7 +124295,7 @@ self: {
      mkDerivation {
        pname = "stackage-install";
        version = "0.1.1.1";
-       sha256 = "0xdqd1q1xy0qax4c2dn1qa0qphvq01xy3wzdp7rr2xnd23ikmbs6";
+       sha256 = "46af3ae310cd7691f3b9edf3e17b0078c38b81c2c136c1485718f81e7068b875";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123932,7 +124318,7 @@ self: {
      mkDerivation {
        pname = "stackage-metadata";
        version = "0.3.0.0";
-       sha256 = "08hs6gnya0ci07gsacc01hvjamwh9xnfni9ihg7wf77w4vrncssx";
+       sha256 = "5d6b66f326fc1cc7cf833145eb6c4f905725370c8031a5df019101e5ed331a22";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123957,7 +124343,7 @@ self: {
      mkDerivation {
        pname = "stackage-sandbox";
        version = "0.1.5";
-       sha256 = "0d5i2wszn4sv797gzdv84abvdm3nzaa1lgn2gp4ywj1iqbbszbns";
+       sha256 = "daaeafd7c23148eec97dc23e1a94fa76d4b6972268b7ff4e3a5b13fb3517b134";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -123979,7 +124365,7 @@ self: {
      mkDerivation {
        pname = "stackage-setup";
        version = "0.0.2";
-       sha256 = "1101sb822v42zjjgabn4s80qyvn6nvzkfagaxpzjm6dp5svl3biv";
+       sha256 = "3bae41b72eb7992affedea2937ffb6c66e8f01d2c42ef5a4fc826c21d0d20184";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -124002,7 +124388,7 @@ self: {
      mkDerivation {
        pname = "stackage-types";
        version = "1.1.0";
-       sha256 = "0ynfnkpzvgd54x294w4ga8nyg8lrmcwg3bhlwdlxs2fcffaazi81";
+       sha256 = "01c5af9473cc09dd69e314aef138ab99a2e72d528f70924427a5bdfdefb4ce7a";
        libraryHaskellDepends = [
          aeson base Cabal containers exceptions hashable safe semigroups
          text time unordered-containers vector
@@ -124017,7 +124403,7 @@ self: {
      mkDerivation {
        pname = "stackage-update";
        version = "0.1.2";
-       sha256 = "1lw30fvscnb3n29lavw16am41adrvby1v2vbh7yykbr80pkb3hvj";
+       sha256 = "72c3b1e60528afe9fd816b8b1dfcdab9a940aa32816f4593b06359a6b70383d3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath process ];
@@ -124035,7 +124421,7 @@ self: {
      mkDerivation {
        pname = "stackage-upload";
        version = "0.1.0.5";
-       sha256 = "0fxkscyzpl6ph28100b0l663rjny9vp2jrhcca19dc0jzj0kfdgi";
+       sha256 = "f1353781fc12b09682620c6629ee4edeca3c8ca16001109080d7d0fb3dd3b33b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124057,7 +124443,7 @@ self: {
      mkDerivation {
        pname = "standalone-haddock";
        version = "1.1.4.4";
-       sha256 = "02j10ws9n7xc2gvmpd146vrg7khawll9y3904h28k5d6ffk6qr14";
+       sha256 = "24646ca673a695890424200d9f28e50acef3f23624b45bf713ac1f9b3407410a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -124073,7 +124459,7 @@ self: {
      mkDerivation {
        pname = "star-to-star";
        version = "1.0";
-       sha256 = "1nxkb1rdw6lhka49r6xdjskipyig09jzrvp82hx8a1xnqb9cyrrj";
+       sha256 = "3267cfd2c2b607853a14e8eefc65022ffa1ba796ad9b9c889a901ade7258b3db";
        libraryHaskellDepends = [ base ];
        description = "the * -> * types, operators, and covariant instances";
        license = "unknown";
@@ -124084,7 +124470,7 @@ self: {
      mkDerivation {
        pname = "star-to-star-contra";
        version = "1.0";
-       sha256 = "1kmpjm51jzk4pv6qggvwjvfqvqnr5z7znfbhiscvcq89j1842x53";
+       sha256 = "a3744150900961b6998e7039fbcf2fd9e28ddd967cbf87cdbe647e194a95b7ce";
        libraryHaskellDepends = [ base star-to-star ];
        description = "contravariant instances for * -> * types and operators";
        license = "unknown";
@@ -124095,7 +124481,7 @@ self: {
      mkDerivation {
        pname = "starling";
        version = "0.3.0";
-       sha256 = "0i0f19k2b5y6vb0jngqwnf035csgiaqjgiw37wvj8vs2lbh907bp";
+       sha256 = "771d90e0a2426f24373f83c727b18a4fb33280b31c3f2bc1dac69725660a0e44";
        libraryHaskellDepends = [
          base binary bytestring failure transformers
        ];
@@ -124112,7 +124498,7 @@ self: {
      mkDerivation {
        pname = "starrover2";
        version = "0.1.1";
-       sha256 = "0rdkxyhy62h87vdq08znqpjhg4wriwvbmn0pwak9nqsd5xk6slka";
+       sha256 = "6a526d662f4d639ba6e217d8ba368f999307e5c5f62380db3e080ae3a1efb365";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -124132,7 +124518,7 @@ self: {
      mkDerivation {
        pname = "stash";
        version = "0.1";
-       sha256 = "01h3s19agw2aa6a0hw8f9k2qibmckqllvnx2yy2w2p1xlw8g9jwm";
+       sha256 = "95cbf410a73d5cc185f7a2db4d299eacae88c54c0e710894514af0a752d00306";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring directory hashable text vector
        ];
@@ -124145,7 +124531,7 @@ self: {
      mkDerivation {
        pname = "state";
        version = "0.1";
-       sha256 = "0j5hbh0rkcwfigvskmgb0hql95qs0cjbys61c6sni2hc719bshx6";
+       sha256 = "a643bd52380c8a68b561c168bf24031a97443104ebd5a9f78b8eb399015cb048";
        libraryHaskellDepends = [ arrows base mtl ];
        jailbreak = true;
        description = "Data.State";
@@ -124157,7 +124543,7 @@ self: {
      mkDerivation {
        pname = "state-plus";
        version = "0.1.1";
-       sha256 = "09zc4rymzvpq12mgl59h069m418qr43myhsj8dlf62g477wyx4g1";
+       sha256 = "e191eef939e409e3684352435f07c918055293013015faaa08f8ee5f7d26ec27";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base checkers mtl QuickCheck ];
        jailbreak = true;
@@ -124170,7 +124556,7 @@ self: {
      mkDerivation {
        pname = "state-record";
        version = "0.0.1";
-       sha256 = "1y9ql1dlv2kf564x153gyw5h967pjn5zilfq88px8rqmkydqix7g";
+       sha256 = "eff4889b9f1567d42f42d8d1f88b95f798040bf76f94d089296e8a4d5ba038f9";
        libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/ktvoelker/state-record";
        description = "Better records for State monad states";
@@ -124183,7 +124569,7 @@ self: {
      mkDerivation {
        pname = "stateWriter";
        version = "0.2.3";
-       sha256 = "19rhkl39mlkyrj0i1qsmncnlj5nsvp8vp1vjhl43qmcbxfxflc0l";
+       sha256 = "1430eabaeb8b553c08857287bbd1ddda16492db355e31081cc7ed29a069d30a7";
        libraryHaskellDepends = [ base mtl transformers ];
        testHaskellDepends = [ base free hspec mtl QuickCheck ];
        description = "A faster variant of the RWS monad transformers";
@@ -124195,7 +124581,7 @@ self: {
      mkDerivation {
        pname = "statechart";
        version = "0.1.0";
-       sha256 = "122vv9h3rxn126chm5bj4rkxd7mbzndy73ck5nlmnhhxyks25d26";
+       sha256 = "46b422f4f41d425ba92d938de39bfdab9ed6672672950a9911c1f63c60da5b88";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base polyparse ];
@@ -124209,7 +124595,7 @@ self: {
      mkDerivation {
        pname = "stateful-mtl";
        version = "1.0.7";
-       sha256 = "19645rqfqbcvngq8hj7bryl35lgx7p5k55vgsxa1a2hm2kq8vm5h";
+       sha256 = "b0d48df014150a1554d76f9732cb3dfdd132a8cfeb4888f0b39b2dec702ec4a4";
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom";
        license = stdenv.lib.licenses.bsd3;
@@ -124221,7 +124607,7 @@ self: {
      mkDerivation {
        pname = "stateref";
        version = "0.3";
-       sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx";
+       sha256 = "7dd390aab346ca877cde1217d5b62145cdfa6f9390e3b7a53c9296229ee1b741";
        libraryHaskellDepends = [ base mtl stm ];
        homepage = "http://code.haskell.org/~mokus/stateref/";
        description = "Abstraction for things that work like IORef";
@@ -124233,7 +124619,7 @@ self: {
      mkDerivation {
        pname = "statestack";
        version = "0.2.0.4";
-       sha256 = "0swj3f2vc56a5y2qxp2pq8nxkwngcw2lm87dmaikymchbqb832hd";
+       sha256 = "0d8a81165e90553fa3aaeda04a0567cff2d92dc257dc8e852fca14b6851b926b";
        libraryHaskellDepends = [
          base mtl transformers transformers-compat
        ];
@@ -124246,7 +124632,7 @@ self: {
      mkDerivation {
        pname = "statethread";
        version = "0.1.1";
-       sha256 = "05clniwqk4i3zz22jzbjj2x9cgkxb2ks7mccjyp3gyy4zbm2xlmz";
+       sha256 = "bfd22eeafac4fb37ae978cd5a3a7587d3e96ba90727d29c4ff23928979b49415";
        libraryHaskellDepends = [ applicative base transformers ];
        jailbreak = true;
        description = "The ST monad and STRefs";
@@ -124261,7 +124647,7 @@ self: {
      mkDerivation {
        pname = "statgrab";
        version = "0.1.3";
-       sha256 = "1rckyxg1px6v69rbr1ldy107b1q5rrh89dawlrdjzwbnmxjgbvj5";
+       sha256 = "45eef564af76f12f5ba65cb58460ce05877540f08d86bc7232dbf41b5ef793e5";
        libraryHaskellDepends = [
          async base bytestring time transformers
        ];
@@ -124277,7 +124663,7 @@ self: {
      mkDerivation {
        pname = "static-canvas";
        version = "0.2.0.2";
-       sha256 = "1lphx10wljylsbjwlw5p7bsjh5gf2fj1sl09556y814r11a6rjff";
+       sha256 = "cec96c54089904e44d2909501da413ee1528f53ab770cae5d2d44bca41e8f0d2";
        libraryHaskellDepends = [ base double-conversion free mtl text ];
        homepage = "https://github.com/jeffreyrosenbluth/static-canvas";
        description = "DSL to generate HTML5 Canvas javascript";
@@ -124289,7 +124675,7 @@ self: {
      mkDerivation {
        pname = "static-hash";
        version = "0.0.1";
-       sha256 = "0nkgx4s389027zi23wmbc6wqnmplvjvbrsbyzy7zn41mbwmzqz8l";
+       sha256 = "147dfc2b5f3510fb8fff7ee9bcb6dcf4568bb961abf221e23f02243434e96f5a";
        libraryHaskellDepends = [ array base containers hashable primes ];
        description = "Immutable hash";
        license = stdenv.lib.licenses.bsd3;
@@ -124303,7 +124689,7 @@ self: {
      mkDerivation {
        pname = "static-resources";
        version = "0.1.7";
-       sha256 = "0wf9kpn1l2iq00m1ms46vn2lrnyy8ip1z54ya2h4kqarcy5sr8m9";
+       sha256 = "a9a2ac8b6759e149a0509e941f6e44dedb4c85dd86e81a2a00380a1aec9dc971";
        libraryHaskellDepends = [
          base directory filepath hslogger MissingH mtl old-time process syb
          time
@@ -124321,7 +124707,7 @@ self: {
      mkDerivation {
        pname = "staticanalysis";
        version = "0.0.0.3";
-       sha256 = "0b6y8yi0cfisi58pxxx1gnd1vab2i8f5wb3gzv1dfsxx5hl6jlwf";
+       sha256 = "8e5369282cbd6bd7c2fe6f2c5e1c8a62a91d9a7da1f77e51893a3a06a247de2c";
        libraryHaskellDepends = [ base MissingH ];
        description = "Reusable static analysis interfaces and modules";
        license = stdenv.lib.licenses.gpl3;
@@ -124336,7 +124722,7 @@ self: {
      mkDerivation {
        pname = "statistics";
        version = "0.13.2.3";
-       sha256 = "1gbghzbacfrm7vn24ssx7wz9sycafxk9b306zm6cdlsr954v296n";
+       sha256 = "d624b1494959d3c64cfd068c9566778a799d3e3f5d6b22ec3e353ba6d6876fbd";
        libraryHaskellDepends = [
          aeson base binary deepseq erf math-functions monad-par mwc-random
          primitive vector vector-algorithms vector-binary-instances
@@ -124358,7 +124744,7 @@ self: {
      mkDerivation {
        pname = "statistics-dirichlet";
        version = "0.6.3";
-       sha256 = "1sx7hxv5gvzr270h4lb76dihcqcqwgdm6mq2394s407iipb2clbw";
+       sha256 = "7c5126d68df100a2491a025753dbe39861066333675102c111f9ef577687a7eb";
        libraryHaskellDepends = [
          base deepseq hmatrix-special nonlinear-optimization vector
        ];
@@ -124372,7 +124758,7 @@ self: {
      mkDerivation {
        pname = "statistics-fusion";
        version = "1.0.1";
-       sha256 = "17w7vz0jarbyf9y72bn9yg134q6ja5ymfyl1v9nx94glbhbybrlf";
+       sha256 = "8ee6e5175cf491d46dda817a577d51d26032c2f3c92e717c727e6525c1df879f";
        libraryHaskellDepends = [ base vector ];
        homepage = "http://code.haskell.org/~dons/code/statistics-fusion";
        description = "An implementation of high performance, minimal statistics functions";
@@ -124387,7 +124773,7 @@ self: {
      mkDerivation {
        pname = "statistics-hypergeometric-genvar";
        version = "0.1.0.0";
-       sha256 = "05j83vaklwi73yr4q4yq5f36wzmbas73lxkj0dkg0w1ss97syv7m";
+       sha256 = "f56caf4fd23a70f0660372763a8e56ab7e6e862bd8134cb21f27723ad51e4816";
        libraryHaskellDepends = [
          base math-functions mwc-random primitive statistics
        ];
@@ -124404,7 +124790,7 @@ self: {
      mkDerivation {
        pname = "statistics-linreg";
        version = "0.3";
-       sha256 = "02c9xrd3b8iy7bwgsf1r06smi88k3sgpqv2ivr782wl0dcbc4wv2";
+       sha256 = "6273c2166b8072814ede516c7c9f1e13a158b5013938fdf83a3ea2355aee8909";
        libraryHaskellDepends = [
          base MonadRandom random random-shuffle safe statistics vector
        ];
@@ -124418,7 +124804,7 @@ self: {
      mkDerivation {
        pname = "stats";
        version = "0.1.1";
-       sha256 = "08ig4nrlqshxmiar739zfbs95hlrp8l212hszh4zs0w2x4i3s17f";
+       sha256 = "ee043d22e98203fd09fc1a8a2028ba99c292f4723f8d9355ac1d6a4cb3252f22";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base statistics text vector ];
@@ -124435,7 +124821,7 @@ self: {
      mkDerivation {
        pname = "statsd";
        version = "0.1.0.1";
-       sha256 = "13bcqms31rvzs3lfbmx43wqkmp21jbzj326yn971334cf722f0a1";
+       sha256 = "410127c4718c8c114eb2de8821ff9241dc3a311fa4d7e5e8d07fe73074c56c8d";
        libraryHaskellDepends = [
          base bytestring monad-control mtl network random
        ];
@@ -124452,7 +124838,7 @@ self: {
      mkDerivation {
        pname = "statsd-datadog";
        version = "0.2.0.0";
-       sha256 = "1c9kgyzfk5xdxsjkjhs6vbiz03mqm41qr0ycyfxc11v0wl78yazk";
+       sha256 = "f32b8f0ee56087c0baf3cc838c03a9b80ef0e3da464339a5eead97e9be7f33b1";
        libraryHaskellDepends = [
          base bytestring monad-control network text transformers-base
        ];
@@ -124466,7 +124852,7 @@ self: {
      mkDerivation {
        pname = "statvfs";
        version = "0.2";
-       sha256 = "16z9fddgvf5sl7zy7p74fng9lkdw5m9i5np3q4s2h8jdi43mwmg1";
+       sha256 = "e1555e07894d222834c1e3da12532dbc4d9a9e75e4dce3ffa1bab8fd5a73e99b";
        libraryHaskellDepends = [ base ];
        description = "Get unix filesystem statistics with statfs, statvfs";
        license = stdenv.lib.licenses.bsd3;
@@ -124477,7 +124863,7 @@ self: {
      mkDerivation {
        pname = "stb-image";
        version = "0.2.1";
-       sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52";
+       sha256 = "a238d55f13171cf6bfba932ed77a89e38be90c13eb7a7bb71bc173537089a6d7";
        libraryHaskellDepends = [ base bitmap bytestring ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A wrapper around Sean Barrett's JPEG/PNG decoder";
@@ -124489,7 +124875,7 @@ self: {
      mkDerivation {
        pname = "stb-truetype";
        version = "0.1.2";
-       sha256 = "1hbbi7hax5fw5zb7ashfs5paixqzqrrr64lwisda80dskdazld4m";
+       sha256 = "9534fa559bba01a49a8e9c129373c61ff7a86ed10e6a75d62fdc95aee0896bc1";
        libraryHaskellDepends = [ array base bytestring containers ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A wrapper around Sean Barrett's TrueType rasterizer library";
@@ -124502,7 +124888,7 @@ self: {
      mkDerivation {
        pname = "stdata";
        version = "0.0.4";
-       sha256 = "0ijir2knl4vc1cpzzmf32wcjfdc958li1wd7w5vdmgk4bx45kybf";
+       sha256 = "6ef959485f64beda76e1a7f110292a8935271917c3d5ff2f0b6c136aa7c85146";
        libraryHaskellDepends = [ base parsec syb template-haskell ];
        jailbreak = true;
        description = "Structure Data Library";
@@ -124517,7 +124903,7 @@ self: {
      mkDerivation {
        pname = "stdf";
        version = "0.2.0.0";
-       sha256 = "1blwf18qvsrhkxfakyznr3ljr35dw6d027jybr2hh4a5yfqn6zyd";
+       sha256 = "cd7f63b1f3451108455e5e1e019ae1ad8c2ce9c8f6fba95c9f30eb8d51709cae";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124538,7 +124924,7 @@ self: {
      mkDerivation {
        pname = "steambrowser";
        version = "0.1.0.0";
-       sha256 = "071ial002ip6lsm422wf9xzq7ka70h4va67382smkbgiinbma5g4";
+       sha256 = "e41555978df1ad59b540e318b5090447cd837f4f8e0b41aaa6e646010055311c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory parsec transformers ];
@@ -124554,7 +124940,7 @@ self: {
      mkDerivation {
        pname = "steeloverseer";
        version = "1.1.0.4";
-       sha256 = "1wqhjg6xw2k863fkfhq0i706c399xsv7z7gaf61x7l9wrc91pcbn";
+       sha256 = "76b11b12cb3cd1d38371ea9d7fb6ee290d66c089004337dd30680adecd9310f3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -124571,7 +124957,7 @@ self: {
      mkDerivation {
        pname = "stemmer";
        version = "0.5.1";
-       sha256 = "0jiwwhwyqnbwzfn0vhd6d4f2zq6aazh18fbhm8w7zjc3cz0cr4m0";
+       sha256 = "a092ccc06783c97f38aa703914e057cae02f1c69a6c10dacfb7c59ec39e43c4a";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.github.com/bgamari/stemmer";
        description = "Haskell bindings to the Snowball stemming library";
@@ -124583,7 +124969,7 @@ self: {
      mkDerivation {
        pname = "step-function";
        version = "0.1.1.0";
-       sha256 = "03pdpm1glmaqhqzr2cp08iy84c1vjhq0fq7yavmcrx94hxfw1zfd";
+       sha256 = "cdfdc05d8724f5ccea56fe600730943b30827c44e032913f865855fa42bded0e";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base Cabal cabal-test-quickcheck QuickCheck
@@ -124599,7 +124985,7 @@ self: {
      mkDerivation {
        pname = "stepwise";
        version = "1.0.2";
-       sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf";
+       sha256 = "0ebf2a47cf252a3cecee273177dccd2f0e38cdde03d52dc8ec1392c5c7433315";
        libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        license = "LGPL";
@@ -124611,7 +124997,7 @@ self: {
      mkDerivation {
        pname = "stickyKeysHotKey";
        version = "0.1.0.1";
-       sha256 = "18p0yxfw9wnzk0yxdvlm3g23k8zq5nb707411i92z5m82l6pkpmi";
+       sha256 = "b1de790d15a8962f520c811c70962df8a339c41b95eed63d98dff2c45df7e0a2";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "get and set STICKYKEYS.SKF_HOTKEYACTIVE";
@@ -124624,7 +125010,7 @@ self: {
      mkDerivation {
        pname = "stitch";
        version = "0.3.2.0";
-       sha256 = "1h8n7ry8wmzvz4bjfg6vsd7ssy17y54h2pzgjdlfam8yfcly2bb7";
+       sha256 = "672de129731e55e56893ef5f0149f12778ad4fd3db3c2717f9fb578e7c3e16c1";
        libraryHaskellDepends = [ base containers text transformers ];
        testHaskellDepends = [ base Cabal hspec text ];
        description = "lightweight CSS DSL";
@@ -124636,7 +125022,7 @@ self: {
      mkDerivation {
        pname = "stm";
        version = "2.4.4";
-       sha256 = "0gc8zvdijp3rwmidkpxv76b4i0dc8dw6nbd92rxl4vxl0655iysx";
+       sha256 = "5dfb588a01b46f427b16a92d6b7843ac81489639bbdfd962e5795c19dbfe883d";
        libraryHaskellDepends = [ array base ];
        description = "Software Transactional Memory";
        license = stdenv.lib.licenses.bsd3;
@@ -124647,7 +125033,7 @@ self: {
      mkDerivation {
        pname = "stm-channelize";
        version = "0.1.1";
-       sha256 = "1aj4zibq54ssbb7smkxjrjl24d9vccgjpl2b9261yqyg692cz9hm";
+       sha256 = "15a6cf4432cf631f8c484bd02b1f633b3522a8ccb2cfaacf5a5a938257fc44aa";
        libraryHaskellDepends = [ base stm ];
        description = "Transactional I/O for duplex streams";
        license = stdenv.lib.licenses.bsd3;
@@ -124658,7 +125044,7 @@ self: {
      mkDerivation {
        pname = "stm-chans";
        version = "3.0.0.4";
-       sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13";
+       sha256 = "2344fc5bfa33d565bad7b009fc0e2c5a7a595060ba149c661f44419fc0d54738";
        libraryHaskellDepends = [ base stm ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Additional types of channels for STM";
@@ -124670,7 +125056,7 @@ self: {
      mkDerivation {
        pname = "stm-chunked-queues";
        version = "0.1.0.0";
-       sha256 = "0264air2mhwbya2sxskrh4z1bs8il7d9iv4vm6wyz8zxxc95v1nj";
+       sha256 = "d2865d12ebfda3efb9a99bec98daa111e9153e8179eaae85f28bc32a7254c408";
        libraryHaskellDepends = [ async base stm ];
        testHaskellDepends = [ async base HUnit stm tasty tasty-hunit ];
        homepage = "http://github.com/kholdstare/stm-chunked-queues/";
@@ -124690,7 +125076,7 @@ self: {
      mkDerivation {
        pname = "stm-conduit";
        version = "2.6.1";
-       sha256 = "0cd99aj9azlr6d9bayjyrbigbzll9yfny7qan1wnrh413i1z1x0p";
+       sha256 = "17f4f0431c81c06c79b00a1f6f9d4f94fef5e2ca5e7ab55233997e95a44aa931";
        libraryHaskellDepends = [
          async base cereal cereal-conduit conduit conduit-combinators
          conduit-extra directory ghc-prim lifted-async lifted-base
@@ -124714,7 +125100,7 @@ self: {
      mkDerivation {
        pname = "stm-containers";
        version = "0.2.9";
-       sha256 = "0p2lyz1s98cxdcqfamqyx7dxxa4fzxr0a93cbm7lnmzfjvk48p52";
+       sha256 = "a25c44e696ee574b4f5d6c240572ff8ea8dedbe91e57e5306b9da1a4c3f7545c";
        libraryHaskellDepends = [
          base-prelude focus hashable list-t loch-th placeholders primitive
          transformers
@@ -124734,7 +125120,7 @@ self: {
      mkDerivation {
        pname = "stm-delay";
        version = "0.1.1.1";
-       sha256 = "0cla21v89gcvmr1iwzibq13v1yq02xg4h6k9l6kcprj7mhd5hcmi";
+       sha256 = "b132581aac47e6cba6a1691a485e1700fbb047c02b7e1e43ae9bbd8476108a32";
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base stm ];
        homepage = "https://github.com/joeyadams/haskell-stm-delay";
@@ -124750,7 +125136,7 @@ self: {
      mkDerivation {
        pname = "stm-firehose";
        version = "0.2.1";
-       sha256 = "0y4q3qj3ih2xcn0mhd4jszb1d5l87abkvlmhdvx9d1407bw9j99r";
+       sha256 = "392599f83a808496fa6eb0d23d973a889616d6d792345881655dc038241e9878";
        libraryHaskellDepends = [
          base blaze-builder conduit http-types network-conduit stm stm-chans
          stm-conduit transformers wai warp
@@ -124767,7 +125153,7 @@ self: {
      mkDerivation {
        pname = "stm-io-hooks";
        version = "1.1.0";
-       sha256 = "0dg2za2p7h9wb9lbs2yb07pdhq9sn4mdxxfmq179d9kinq94009m";
+       sha256 = "35014012b671a6964ec0d5f5de2ab13a61d8ee01cb0bbd685a3cc17385fae235";
        libraryHaskellDepends = [ array base containers mtl stm ];
        description = "STM with IO hooks";
        license = stdenv.lib.licenses.bsd3;
@@ -124778,7 +125164,7 @@ self: {
      mkDerivation {
        pname = "stm-lifted";
        version = "0.1.0.0";
-       sha256 = "1x3yxxyik0vyh3p530msxh2a1aylmh8zab05qpq7nfl5m9v6v090";
+       sha256 = "20816d76aa853a7bf0c5052cf511acd4aba004ecba8251ee807e83197def7ef4";
        revision = "1";
        editedCabalFile = "d313721a31d8e7ccc725c3a1542f4ac3f8c84fbcad10094cd1067c133edc6c54";
        libraryHaskellDepends = [ base stm transformers ];
@@ -124791,7 +125177,7 @@ self: {
      mkDerivation {
        pname = "stm-linkedlist";
        version = "0.1.0.0";
-       sha256 = "1x65z38dx0qi55fmbarc1827wpl4j08m23nklq8854y7kqznf9kr";
+       sha256 = "7926673f9ec7938210a6d30e511190845e7e040a2cab555d291183ded0f8c5f4";
        libraryHaskellDepends = [ base stm ];
        description = "Mutable, doubly linked lists for STM";
        license = stdenv.lib.licenses.bsd3;
@@ -124802,7 +125188,7 @@ self: {
      mkDerivation {
        pname = "stm-orelse-io";
        version = "0.1";
-       sha256 = "11v0xc5zlw641mf6r5k8lqhzxc4y9bsx3xivwmbkfniph0x7g5m4";
+       sha256 = "a496773a80375a3757e53bf6d1f54a9eb0fe21a668966c5c0dc470fa0beb6087";
        libraryHaskellDepends = [ base stm ];
        homepage = "http://nonempty.org/software/stm-orelse-io";
        description = "Choose between the return value of an STM operation and an IO action";
@@ -124814,7 +125200,7 @@ self: {
      mkDerivation {
        pname = "stm-promise";
        version = "0.0.3.1";
-       sha256 = "07wrbj88gwdbsczjr225g0z1ai1v13mdg71gl9qsmipqs0s0pfwc";
+       sha256 = "8cbb0b34d0f8c6aa71a22f9cd7ea083b44153e7845882c3fd3abf187905c991f";
        libraryHaskellDepends = [ base mtl process stm unix ];
        testHaskellDepends = [ base QuickCheck stm ];
        homepage = "http://www.github.com/danr/stm-promise";
@@ -124827,7 +125213,7 @@ self: {
      mkDerivation {
        pname = "stm-queue-extras";
        version = "0.2.0.0.1";
-       sha256 = "1zb6i8dg11pshvb6rm5sqdsbq547h4ys6wlmh2ywcmks2ss7q100";
+       sha256 = "00047cb4167a56c6bd809572a33d818714bc74c3bad46cd686fa86f01a8a66fd";
        libraryHaskellDepends = [ base stm stm-chans ];
        description = "Extra queue utilities for STM";
        license = stdenv.lib.licenses.asl20;
@@ -124838,7 +125224,7 @@ self: {
      mkDerivation {
        pname = "stm-sbchan";
        version = "0.1";
-       sha256 = "0fz4vfbyr848b32vbdm3pjj9gwi7wj39l3vsqmdpjnbfwvkw0y0s";
+       sha256 = "1a78c0e7e66e59795bc57a0f9a86e427f297a4bca3b6b5c55888a0ec97dbe43b";
        libraryHaskellDepends = [ base stm stm-tlist ];
        homepage = "https://github.com/joeyadams/haskell-stm-sbchan";
        description = "Bounded channel for STM where item sizes can vary";
@@ -124850,7 +125236,7 @@ self: {
      mkDerivation {
        pname = "stm-split";
        version = "0.0.0.1";
-       sha256 = "05338nbfhwmyy8njynznmbv0lddqs4kzs5x132992xq346dvvww8";
+       sha256 = "88f3bd9b210377919218a117fd27d1b8350af6aaf65b2f2df2be72e896456314";
        libraryHaskellDepends = [ base stm ];
        description = "TMVars, TVars and TChans with distinguished input and output side";
        license = stdenv.lib.licenses.bsd3;
@@ -124861,7 +125247,7 @@ self: {
      mkDerivation {
        pname = "stm-stats";
        version = "0.2.0.0";
-       sha256 = "0i8ky2l8lvh7nymxglvbifp0ylbyjw20p75avzb51zpzx6qkjkqa";
+       sha256 = "0a4f39b1e9fffe50d6dfaa9c0b04977e510fae8b6bd3d7abb7076e8aa8f01345";
        libraryHaskellDepends = [
          base containers stm template-haskell time
        ];
@@ -124874,7 +125260,7 @@ self: {
      mkDerivation {
        pname = "stm-tlist";
        version = "0.1.1";
-       sha256 = "0ssr8phmm9m93kcp045jr0rcn1dxzz202cgyw1vzjl2ch55bcsy6";
+       sha256 = "c66bb64a814c50f977e0fe3101c4ffbd05cb32c8b21070d91ca9a65ae145596b";
        libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/joeyadams/haskell-stm-tlist";
        description = "Mutable, singly-linked list in STM";
@@ -124886,7 +125272,7 @@ self: {
      mkDerivation {
        pname = "stmcontrol";
        version = "0.1";
-       sha256 = "0m42pgnvzqadqycq0qbml5da0zw7myc24y5vka1qydz7rdfyaa24";
+       sha256 = "4428e55dcbe7378f839abb782298af877fa05aa175618099c74de1bfedbb8254";
        libraryHaskellDepends = [ base haskell98 mtl stm ];
        homepage = "http://sulzmann.blogspot.com/2008/12/stm-with-control-communication-for.html";
        description = "Control communication among retrying transactions";
@@ -124901,7 +125287,7 @@ self: {
      mkDerivation {
        pname = "stomp-conduit";
        version = "0.1.0";
-       sha256 = "1qzr5fkffs96clxkvm7lf7kfafijv8fsri6k0j85wrarx3qdgapa";
+       sha256 = "eaaad7f0e859655e9004d3c4ac1dda323ae5e671f4d43d3b652669e7a62bf9e3";
        libraryHaskellDepends = [
          base conduit mime mtl resourcet stomp-queue stompl
        ];
@@ -124917,7 +125303,7 @@ self: {
      mkDerivation {
        pname = "stomp-patterns";
        version = "0.1.0";
-       sha256 = "0rdk9h7blj7j5kiwy7zq2kb4wxxs19xk3lg73c0srrvbclb0qgbw";
+       sha256 = "7c3d0c16656be7ac011be7d1317b0aba774ed614f81fcfe32cf248ba0e4cb365";
        libraryHaskellDepends = [
          base bytestring containers mime mtl split stomp-queue stompl time
        ];
@@ -124934,7 +125320,7 @@ self: {
      mkDerivation {
        pname = "stomp-queue";
        version = "0.2.2";
-       sha256 = "1kymwwj7yjdsyykqdqcnvgphbb1ypx7hi5a2wvx1wzv53lrspa9c";
+       sha256 = "2ca9ab331d657f1efae64295084fbf3eac05efdb96e186a7f7ba497f24e7d5cf";
        libraryHaskellDepends = [
          attoparsec base bytestring conduit conduit-extra mime mtl
          network-conduit-tls split stompl time utf8-string
@@ -124951,7 +125337,7 @@ self: {
      mkDerivation {
        pname = "stompl";
        version = "0.3.0";
-       sha256 = "1ip50w8f26362h1s3kb0qzv15dq264j0vbmqw5v0s40gbwmpv2aj";
+       sha256 = "52897d2b5f0f100d76e1b8ae0d243102b712f6c760cda103146618e11007e5c6";
        libraryHaskellDepends = [
          attoparsec base bytestring mime split text utf8-string
        ];
@@ -124965,7 +125351,7 @@ self: {
      mkDerivation {
        pname = "storable";
        version = "0.1";
-       sha256 = "10289mf3fskfpg0jwgzyhvg4arb0hcj3r94jngb3hlbidvf8k1jg";
+       sha256 = "4f8689dc6e715138d6b392a43c2483606545de86fe3f2ec1bb6e6a375c4d4880";
        libraryHaskellDepends = [ base mtl ];
        homepage = "http://anna.fi.muni.cz/~xjanous3/gitweb/?p=storable.git;a=summary";
        description = "Storable type class for variable-sized data";
@@ -124977,7 +125363,7 @@ self: {
      mkDerivation {
        pname = "storable-complex";
        version = "0.2.2";
-       sha256 = "01kwwkpbfjrv26vj83cd92px5qbq1bpgxj0r45534aksqhany1xb";
+       sha256 = "ab076f15c47a2a324a2119c8feee0a78e1d2af488d0d24b7113b4bb7eee47c06";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/cartazio/storable-complex";
        description = "Storable instance for Complex";
@@ -124989,7 +125375,7 @@ self: {
      mkDerivation {
        pname = "storable-endian";
        version = "0.2.5";
-       sha256 = "04j1nk0wga4dqrqvhm8yd9h9194db1n3yrnhg8s3gsc0jk7yw1p2";
+       sha256 = "e206eecf9480e937347ad0663f6c588da490606a1e55b871c68da8c7c1b44112";
        libraryHaskellDepends = [ base byteorder ];
        description = "Storable instances with endianness";
        license = stdenv.lib.licenses.bsd3;
@@ -125000,7 +125386,7 @@ self: {
      mkDerivation {
        pname = "storable-record";
        version = "0.0.3";
-       sha256 = "1mv2s4r7dqkl2fy0wjnywyr2zi2g53nkn0z72mgr8drkzdszzxx1";
+       sha256 = "a1f7ff75fb3337945f15e7033bed284fc42fb2e7de4a0ebc1374e27632d162d7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base transformers utility-ht ];
@@ -125014,7 +125400,7 @@ self: {
      mkDerivation {
        pname = "storable-static-array";
        version = "0.6.1.0";
-       sha256 = "0akdh6v2cdq38jw8v69bn3m50g6wxanh0plikq4hj5mfrkg6xsxm";
+       sha256 = "b5eb6edeccae1609099e915e00adeadc3c50eab02b998db844033726b6816d2a";
        libraryHaskellDepends = [ array base tagged vector ];
        jailbreak = true;
        description = "Statically-sized array wrappers with Storable instances for FFI marshaling";
@@ -125027,7 +125413,7 @@ self: {
      mkDerivation {
        pname = "storable-tuple";
        version = "0.0.2";
-       sha256 = "03qls46rwc3za730r6pv63rrnjq4vkh3h2vjhx9082dqa9q7vqqd";
+       sha256 = "0de37d7052b809045287720b38e0dc044b9bf330fb9a0cc6517f309e0dd1140f";
        libraryHaskellDepends = [ base storable-record utility-ht ];
        homepage = "http://code.haskell.org/~thielema/storable-tuple/";
        description = "Storable instance for pairs and triples";
@@ -125041,7 +125427,7 @@ self: {
      mkDerivation {
        pname = "storablevector";
        version = "0.2.10";
-       sha256 = "0195j9b0p5217jdai4lwyhfwihnxgsqxcbzpa375wsa66kxjk7bl";
+       sha256 = "749d29fb3446695ece50f72fd6b17eddc2c81df49c92a89a3c41940b56922505";
        libraryHaskellDepends = [
          base non-negative QuickCheck syb transformers unsafe utility-ht
        ];
@@ -125060,7 +125446,7 @@ self: {
      mkDerivation {
        pname = "storablevector-carray";
        version = "0.0";
-       sha256 = "1cqgfddaldxj2yig39fr2smm23nfz52dvh5grf4zr222djm7043i";
+       sha256 = "711070aa6c4288fc89cbafc0dd44f9ce0e51ab16d9a5f1a217b237aa5a730fb3";
        libraryHaskellDepends = [ base carray storablevector utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Conversion between storablevector and carray";
@@ -125075,7 +125461,7 @@ self: {
      mkDerivation {
        pname = "storablevector-streamfusion";
        version = "0.0";
-       sha256 = "1qgnakr01f28iarq1qd5x86919fj7zwf19nb80w7757l0dhdjb6m";
+       sha256 = "d52cd96003f494733840cba6e0f83fd2a5900ceaa5e180b38a48b800f254f6e1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -125098,7 +125484,7 @@ self: {
      mkDerivation {
        pname = "str";
        version = "0.1.0.0";
-       sha256 = "093bgzjj183g48gapmjvbrbp7ns7wfcf94ishgwy84gajpkyb6sr";
+       sha256 = "599be5e795ea11e4f9833a92e498e347db73575e5bd6ab1e226fa020e57f6b24";
        libraryHaskellDepends = [
          base base16-bytestring bytestring Crypto hashable MissingH text
          utf8-string
@@ -125117,7 +125503,7 @@ self: {
      mkDerivation {
        pname = "stratum-tool";
        version = "0.0.4";
-       sha256 = "02m8znx5spg8mjphbqw4kw5mavjki8hjfqf6x9j9i0xsja88958p";
+       sha256 = "1795849092ba839864eac66127218a536e550b9f84e305aface85d5dbafda80a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -125134,7 +125520,7 @@ self: {
      mkDerivation {
        pname = "stream-fusion";
        version = "0.1.2.5";
-       sha256 = "006fz03jdwd9d0kwf8ma3077xxmg6zym94pwbb4sx1xcn7zf4yc6";
+       sha256 = "8679e2feb1ac87aec95afc9254fd37aff67e0e18aa22c72768a9f12607f8ce00";
        libraryHaskellDepends = [ base ];
        homepage = "http://hackage.haskell.org/trac/ghc/ticket/915";
        description = "Faster Haskell lists using stream fusion";
@@ -125147,7 +125533,7 @@ self: {
      mkDerivation {
        pname = "stream-monad";
        version = "0.4.0.2";
-       sha256 = "0311j6a378pm26g9qqfjpnjq7909qj69fhiw253ln603z5q5gkc6";
+       sha256 = "86cd5770f903184b47113c42978cc409a483a5bdd2619c9e11f5a2339491210c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base logict ];
@@ -125165,7 +125551,7 @@ self: {
      mkDerivation {
        pname = "streamed";
        version = "0.2";
-       sha256 = "0dql0vxw28nr60979zhhc9frwqhg6cmj8g03r4m8zlb6anqwv7xa";
+       sha256 = "aa9fcdb15566d18f2ac9033c242b330f629e5d6210fe741230d922c1fb061437";
        libraryHaskellDepends = [
          alsa-core alsa-seq base containers data-accessor
          data-accessor-transformers event-list midi midi-alsa non-negative
@@ -125186,7 +125572,7 @@ self: {
      mkDerivation {
        pname = "streaming-commons";
        version = "0.1.12.1";
-       sha256 = "1msg18bvz1cxfh745m3jgxf65x7jncqwwpfi538x24qsn788vgfm";
+       sha256 = "d5bd8dd0b11a13d1d128d15dce31b3f2f4625c7f72d4420e749d85bf170a4fd7";
        libraryHaskellDepends = [
          array base blaze-builder bytestring directory network process
          random stm text transformers unix zlib
@@ -125207,7 +125593,7 @@ self: {
      mkDerivation {
        pname = "streaming-histogram";
        version = "0.1.0.0";
-       sha256 = "1sm05hx5llab6ng6d27rz44kd6njk85axkn3bs3nm03pr85c9xq7";
+       sha256 = "07f7c40aca77806a875ec3ceae0a9ad29a3609f9f988669e354b515a3a2ca0ea";
        libraryHaskellDepends = [ base containers criterion ];
        testHaskellDepends = [
          base containers tasty tasty-hunit tasty-quickcheck
@@ -125220,7 +125606,7 @@ self: {
      mkDerivation {
        pname = "streamproc";
        version = "1.6.2";
-       sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7";
+       sha256 = "e76effaaff83e6a066df949415db109b405bda0aaeb95f0710906c65892584f2";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/peti/streamproc";
        description = "Stream Processer Arrow";
@@ -125234,7 +125620,7 @@ self: {
      mkDerivation {
        pname = "streams";
        version = "3.2.1";
-       sha256 = "1xyrsb55dg7v3pris0hc0yqdlqaymxb6g286wrbc7h2lva5wrva4";
+       sha256 = "44edcc8bda54c0c356e606896756af5e61dab0070c021df31dfbbc56cad2d9f7";
        libraryHaskellDepends = [
          adjunctions base comonad distributive semigroupoids semigroups
        ];
@@ -125248,7 +125634,7 @@ self: {
      mkDerivation {
        pname = "strict";
        version = "0.3.2";
-       sha256 = "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc";
+       sha256 = "2cd35a67938db635a87617d9576d5df0158b581e8e5694f07487c0f4b1549221";
        libraryHaskellDepends = [ array base ];
        homepage = "http://www.cse.unsw.edu.au/~rl/code/strict.html";
        description = "Strict data types and String IO";
@@ -125262,7 +125648,7 @@ self: {
      mkDerivation {
        pname = "strict-base-types";
        version = "0.3.0";
-       sha256 = "03z38yxig43qq4xw9hinzzfarzy7176s5gfv8rsjnild8sa0bsvb";
+       sha256 = "6beb0594468d462b7546dbbda2cd09c7ffacdcff36c2c43bc1789017bb47e30f";
        libraryHaskellDepends = [
          aeson base bifunctors binary deepseq ghc-prim lens QuickCheck
          strict
@@ -125277,7 +125663,7 @@ self: {
      mkDerivation {
        pname = "strict-concurrency";
        version = "0.2.4.1";
-       sha256 = "128sbh5fnv02v2xdjlk7cb525bfckqyj7fyz5399nfycs0nj2f89";
+       sha256 = "0939212dd0cc3b9bd228dfbb233d9eccad22ca626752d9bad8026ceb0a5c1a89";
        revision = "1";
        editedCabalFile = "e9b8d4599f2eae037bb3b6008284513dbb50af7d3ab42e617b76577bdea656a1";
        libraryHaskellDepends = [ base deepseq ];
@@ -125293,7 +125679,7 @@ self: {
      mkDerivation {
        pname = "strict-ghc-plugin";
        version = "0.1.1";
-       sha256 = "0hx1zp99npwdp5w3q93xfidcw59lxskilmbqc80xi97d4w4h8jrb";
+       sha256 = "2b4b040927eda4d8016278551aa7ee3415ce5a747d243c78b98d5f9bd2fda143";
        libraryHaskellDepends = [ base ghc syb ];
        homepage = "http://thoughtpolice.github.com/strict-ghc-plugin";
        description = "Compiler plugin for making Haskell strict";
@@ -125305,7 +125691,7 @@ self: {
      mkDerivation {
        pname = "strict-identity";
        version = "0.1.0.0";
-       sha256 = "1fzcim7baycdb60z5icdw5flj1a3dfn6xscpyif6l94c1538g3i1";
+       sha256 = "218e8746098c246a5cf497e96eac6b4305495de18dc5f281598d79b54e8decbb";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/cartazio/strict-identity";
@@ -125318,7 +125704,7 @@ self: {
      mkDerivation {
        pname = "strict-io";
        version = "0.2.1";
-       sha256 = "003pfzjixa04qyx4db0rgk7y72nk2xwlb29aigmdmfn80xbmw9md";
+       sha256 = "ad265e5707c8badaea8b2a89457917d38ae3cf7c19ac46bac704a81ee5777700";
        libraryHaskellDepends = [ base deepseq extensible-exceptions ];
        jailbreak = true;
        description = "A library wrapping standard IO modules to provide strict IO";
@@ -125330,7 +125716,7 @@ self: {
      mkDerivation {
        pname = "strictify";
        version = "0.1";
-       sha256 = "0z28ifg21xgzh75ird41mp40a4rrc5p0wrnbhrxv92ih6pf5zmah";
+       sha256 = "50d55fdc35308ab47b86cb660e6e61391305c8ad81b41ccb81fff5209e8b487c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -125345,7 +125731,7 @@ self: {
      mkDerivation {
        pname = "strictly";
        version = "1.0.0.0";
-       sha256 = "1a3azrg9ksb4kmbckjqw3krxj0app6q19ighd6k3z7xpf682qx3c";
+       sha256 = "6c742c9071b79f3fa669f0c514b0b95701d9f31c1ccbc9569d64e9995efe6aa8";
        libraryHaskellDepends = [ base deepseq ];
        jailbreak = true;
        homepage = "https://github.com/DanBurton/strictly#readme";
@@ -125358,7 +125744,7 @@ self: {
      mkDerivation {
        pname = "string";
        version = "0.4.0";
-       sha256 = "1l94p8c9j8a2dbpwj5q7d1m61gdhmi6vllz34g8d9qjfwpnx7z6z";
+       sha256 = "dffcd3ede54ee2d4d023e353ba4dacb0bd606a680717c9ef6a42219918ba24d1";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125369,7 +125755,7 @@ self: {
      mkDerivation {
        pname = "string-class";
        version = "0.1.6.5";
-       sha256 = "0yi3fagwqkgr8pf6wnl360qikyvfb649qs2y6gp0n7jjw0zc27c2";
+       sha256 = "821dc13ee0521e0bee335e689c88596efb193130835a6edc45f94dcc9f72237a";
        libraryHaskellDepends = [ base bytestring tagged text ];
        homepage = "https://github.com/bairyn/string-class";
        description = "String class library";
@@ -125381,7 +125767,7 @@ self: {
      mkDerivation {
        pname = "string-combinators";
        version = "0.6.0.5";
-       sha256 = "07ky2z5f1l5mb7r3rvyraak0bzciq4krkg5lv8g0a5vxpnzlm4cl";
+       sha256 = "94914abfbd7d17051edab4bc9927c191fd05a652d9ef3cf259b5d0e0ca177e1e";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/basvandijk/string-combinators";
        description = "Polymorphic functions to build and combine stringlike values";
@@ -125393,7 +125779,7 @@ self: {
      mkDerivation {
        pname = "string-conv";
        version = "0.1";
-       sha256 = "0zjmlkjmdiqnfnb9qqam6bkipwqz5iwy4bjy9xcs20ljf01586l6";
+       sha256 = "861a5402709202a1594f5e2ee2792c1ff31be73255619c967516c756e5a4557e";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Standardized conversion between string types";
        license = stdenv.lib.licenses.bsd3;
@@ -125404,7 +125790,7 @@ self: {
      mkDerivation {
        pname = "string-conversions";
        version = "0.4";
-       sha256 = "1bi4mjnz0srb01n0k73asizp5h2ir7j3whxai9wprqvz7kdscr0s";
+       sha256 = "1a64a6db3c7fe37c798aaa433ee4c951c0727fd46a9c096c002b6bf0adac24ae";
        libraryHaskellDepends = [ base bytestring text utf8-string ];
        description = "Simplifies dealing with different types for strings";
        license = stdenv.lib.licenses.bsd3;
@@ -125415,7 +125801,7 @@ self: {
      mkDerivation {
        pname = "string-convert";
        version = "2.0.1";
-       sha256 = "0lx9bc7czwzbf8rky8k02kgi6w3pjfz6ydig9i9ll83zy70l9208";
+       sha256 = "088844c1f17f204a534c2f366fbe93777013df1460223f3372ebf3cf0e5ba953";
        libraryHaskellDepends = [ base bytestring text utf8-string ];
        homepage = "https://bitbucket.org/tdammers/string-convert";
        description = "Provide universal string conversions between any two string-like types";
@@ -125427,7 +125813,7 @@ self: {
      mkDerivation {
        pname = "string-qq";
        version = "0.0.2";
-       sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp";
+       sha256 = "9757cad387856a313729caffe0639215a10be7d72b09c44bcab9e55ee2a8c218";
        libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.publicDomain;
@@ -125438,7 +125824,7 @@ self: {
      mkDerivation {
        pname = "string-quote";
        version = "0.0.1";
-       sha256 = "1pfkd3lwdphvl00gly7zbpvsmlw6b2d5568rxyqmq2qw6vzf9134";
+       sha256 = "6484e4fe361c0b5cb1ef1999529a5886d3aaf75dff78fa00a01bdec6e968d3dd";
        libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.bsd3;
@@ -125449,7 +125835,7 @@ self: {
      mkDerivation {
        pname = "string-similarity";
        version = "0.1.0.0";
-       sha256 = "0k03krg3m03bxk9i5ph5ipks9b0j8yqsal0haf8fyjq83xs1hbmv";
+       sha256 = "bb2e18741f084bef90531050a5b14712aca4e78d05de12d3ec6b803a5e9e034c";
        libraryHaskellDepends = [ base suffixtree ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "http://github.com/mwotton/string-similarity";
@@ -125462,7 +125848,7 @@ self: {
      mkDerivation {
        pname = "stringable";
        version = "0.1.3";
-       sha256 = "10jsvbiqbmnbipv1566k5mqkpgfyrzbk8m7b18rqjb5m3qg9dbz7";
+       sha256 = "e7af961e1eb52c89330aeb5434d7cfdebd3b712dd39812f68dcbd685e3da5a82";
        libraryHaskellDepends = [ base bytestring system-filepath text ];
        description = "A Stringable type class, in the spirit of Foldable and Traversable";
        license = stdenv.lib.licenses.mit;
@@ -125473,7 +125859,7 @@ self: {
      mkDerivation {
        pname = "stringbuilder";
        version = "0.5.0";
-       sha256 = "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9";
+       sha256 = "8966882622fc06fd4e588da626a558b54daa313f2328c188d9305b0c6f2fe9aa";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A writer monad for multi-line string literals";
@@ -125487,7 +125873,7 @@ self: {
      mkDerivation {
        pname = "stringlike";
        version = "0.0.0";
-       sha256 = "0wrhma5g73lnyazbb11z2xhd7fdz93mb1kgbqxjn1prhlc3j7ahy";
+       sha256 = "1eaa2307a330df6065c7ebcdb0ea48bfb9d360173f84b5bef2968ef38aaa3073";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [
          base bytestring QuickCheck quickcheck-instances test-framework
@@ -125507,7 +125893,7 @@ self: {
      mkDerivation {
        pname = "stringprep";
        version = "1.0.0";
-       sha256 = "0ha4cvzdppd514xh9315v3nvrn1q4xd74gifdqpszw98hj2mw0b0";
+       sha256 = "60015e858428f1af2f6e2e3e725a2738d8bcedd8258c043b09a5dddbfe664441";
        libraryHaskellDepends = [ base containers text text-icu ];
        testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck tasty-th text
@@ -125522,7 +125908,7 @@ self: {
      mkDerivation {
        pname = "strings";
        version = "1.1";
-       sha256 = "1xz9v3w5s13yhk7iy9dw6i8s2jc6c0b1ci96dwmcq9a1n3l3ng4v";
+       sha256 = "9b3c3be8b04125cc2a6f26451616608649a15134bc251fcf847e045df8d8e9f7";
        libraryHaskellDepends = [ base bytestring text ];
        homepage = "http://hub.darcs.net/scravy/strings";
        description = "Functions for working with strings, including Text, ByteString, etc";
@@ -125534,7 +125920,7 @@ self: {
      mkDerivation {
        pname = "stringsearch";
        version = "0.3.6.6";
-       sha256 = "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9";
+       sha256 = "295f1971920bc52263d8275d7054ad223a7e1aefe75533f9887735c9644ffe4a";
        libraryHaskellDepends = [ array base bytestring containers ];
        homepage = "https://bitbucket.org/dafis/stringsearch";
        description = "Fast searching, splitting and replacing of ByteStrings";
@@ -125546,7 +125932,7 @@ self: {
      mkDerivation {
        pname = "stringtable-atom";
        version = "0.0.7";
-       sha256 = "1wp6w12bflrqcwi09y7s1crj72n4pbj8bkpwj2ia5gaqn5x56wjs";
+       sha256 = "5a72537ab158bda2a290fcce85e4bac48a23330bfaf80422673853b744e0e6f2";
        libraryHaskellDepends = [ base binary bytestring containers syb ];
        homepage = "http://github.com/audreyt/stringtable-atom/";
        description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets";
@@ -125560,7 +125946,7 @@ self: {
      mkDerivation {
        pname = "stripe";
        version = "0.8.3";
-       sha256 = "1lqz116lvj2444sf2j58dg1nkjwaxm9abrizp1zqkmixbl7ykaqh";
+       sha256 = "10abe90f5d3dd6897fb83fe6a552ed8acb69c36ba848e1342144c84d4d081fd3";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types mtl text time
          unordered-containers utf8-string
@@ -125579,7 +125965,7 @@ self: {
      mkDerivation {
        pname = "stripe-haskell";
        version = "0.1.4.1";
-       sha256 = "066jcinjg430p4mwy1wdc5pkp3y43isv3z70w2lqdsyl2q3cgzx0";
+       sha256 = "a0ffc70616d4eb86a9e0e0fcb1751cc48f3b6f618d07cf2bb96090276d64d218";
        libraryHaskellDepends = [
          aeson base bytestring either HsOpenSSL hspec http-streams
          io-streams mtl random text time transformers unordered-containers
@@ -125601,7 +125987,7 @@ self: {
      mkDerivation {
        pname = "strive";
        version = "2.1.0";
-       sha256 = "08jirx24wnfpknlgkcz605sn9nwb0g5hv75vgrms5gbq65gkg9s2";
+       sha256 = "42a7375f3178bda26b7ebb9c0dcb038bdb647501e6b3f9a89dd7594e44cf5122";
        libraryHaskellDepends = [
          aeson base bytestring data-default gpolyline http-conduit
          http-types template-haskell text time transformers
@@ -125617,7 +126003,7 @@ self: {
      mkDerivation {
        pname = "strptime";
        version = "1.0.10";
-       sha256 = "1f42yf49fqr2fyjfakscmmlnmw3w5rg7wyy6gjyrf0gcgsh0h9fd";
+       sha256 = "cd2508a07eec0197bd7cc67b7e5e2e7cf06a69ad4c4fe5a47722639788f382b8";
        libraryHaskellDepends = [ base bytestring text time ];
        description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)";
        license = stdenv.lib.licenses.bsd3;
@@ -125631,7 +126017,7 @@ self: {
      mkDerivation {
        pname = "structural-induction";
        version = "0.3";
-       sha256 = "1wykd33phjmz2aky2dynsxmrmxqpkh4h41majq57lh3dag87cwax";
+       sha256 = "5d7176d0536d407a0a96aa0602099c17f79a6bd7d637e1a712bf4a78c768d3f3";
        libraryHaskellDepends = [
          base containers genifunctors mtl pretty safe
        ];
@@ -125651,7 +126037,7 @@ self: {
      mkDerivation {
        pname = "structured-haskell-mode";
        version = "1.0.20";
-       sha256 = "1pcy83ic95l7k3839py4m10zlx4s4pk4n3bsx3mb7n8rp8zngcv2";
+       sha256 = "62b3673fba19d9b3eae87a0d4be6259a74fa41a8c4df34d0988796c4e2409edd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -125670,7 +126056,7 @@ self: {
      mkDerivation {
        pname = "structured-mongoDB";
        version = "0.3";
-       sha256 = "0f4s4zi6h53jhcj3f43a2arra02fk1i2almdm6x2mjy1mzhdkjdx";
+       sha256 = "bdc9d9e0afc1cb2abaa9ad522562984e0095b3126a10372483721468e2279a38";
        libraryHaskellDepends = [
          array base bson bytestring compact-string-fix containers
          monad-control mongoDB mtl old-time template-haskell transformers
@@ -125693,7 +126079,7 @@ self: {
      mkDerivation {
        pname = "structures";
        version = "0.2";
-       sha256 = "000misbp9fsnmzhqi7na9b56h45c18ac86j7gfaxv7fgqz82zis8";
+       sha256 = "48c72fd0c7cf9ddd957b471ac4140aac1068ca4aca9e88e1af56bb74978e1500";
        libraryHaskellDepends = [
          base containers contravariant deepseq free ghc ghc-prim hashable
          hybrid-vectors lens monad-st parallel primitive semigroups
@@ -125720,7 +126106,7 @@ self: {
      mkDerivation {
        pname = "stunclient";
        version = "0.1.0.1";
-       sha256 = "0i9sbicwx6d3vsp2fxjr31msd1n5nqh1vxb2hn4in5n8y6d32qlx";
+       sha256 = "9d62319af1c8161b898562f51d20b6c586a66b18597627aedea399ce595c3a45";
        libraryHaskellDepends = [
          base bytestring cereal crypto-api cryptohash cryptohash-cryptoapi
          digest network random stringprep text transformers unbounded-delays
@@ -125742,7 +126128,7 @@ self: {
      mkDerivation {
        pname = "stunts";
        version = "0.1.2";
-       sha256 = "075rbdhlrz88qkwx54jrmb4h4jq8q5wk4ncb858llaswcbsfgl8w";
+       sha256 = "1cd1e7f4625c2b4a51418b593279c1084b02c9aa5992d2f9c408fd4c615bb91c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -125763,7 +126149,7 @@ self: {
      mkDerivation {
        pname = "stylish-haskell";
        version = "0.5.14.1";
-       sha256 = "055kvwf158m91kx2y3ysiqpjgf15w6r8ryzm4yj0jhy48ymgil5j";
+       sha256 = "b2d0f8aa47c44309a427f5fb8cb2e125b8272f8eda0f2ffa0ca9a2121cdfb314";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -125789,7 +126175,7 @@ self: {
      mkDerivation {
        pname = "stylized";
        version = "0.1.3";
-       sha256 = "09gacqlq3vlnsnbjjr44pjypw9v3amg8sqsxg0xwl8ricxpww774";
+       sha256 = "e41cce6f673123ca3b785d638d5e5563277ebdbc84642997d596ee812966ea25";
        libraryHaskellDepends = [ ansi-terminal base ];
        jailbreak = true;
        homepage = "http://patch-tag.com/r/lucid/Stylized";
@@ -125807,7 +126193,7 @@ self: {
      mkDerivation {
        pname = "subhask";
        version = "0.1.0.1";
-       sha256 = "17r26mccarr9m7wxvax3bmwz94gcaxg732797js1qa12fdnbsn8m";
+       sha256 = "1559bd6c7322281cb43ce988715e57ec91f4795da3abddf9a92967c55835229f";
        libraryHaskellDepends = [
          approximate base bloomfilter bytes bytestring cassava containers
          deepseq erf gamma ghc-prim hmatrix hyperloglog lens monad-primitive
@@ -125829,7 +126215,7 @@ self: {
      mkDerivation {
        pname = "subnet";
        version = "0.0.1.2";
-       sha256 = "199kslgxlhxv8zx3mj5pxgicjxyff7vzjhw13fwfxcf9pa9289nv";
+       sha256 = "db262492bac9b1eeb81b8143f9f771ce77c9e2ebb7c83afa47bb43da1fd533a5";
        libraryHaskellDepends = [ base split ];
        homepage = "https://github.com/gcganley/subnet";
        description = "subnetting calculator";
@@ -125841,7 +126227,7 @@ self: {
      mkDerivation {
        pname = "subtitleParser";
        version = "0.5";
-       sha256 = "1kkr6zbnv777gnv2lwq3pyxq3vv5r24f4avwv5g4dds3y8d8mv3q";
+       sha256 = "78ec8a1af243b7465ed97c2be288c865ef81bbbf03732ab67de79c6dd73779ce";
        libraryHaskellDepends = [ attoparsec base containers text ];
        homepage = "https://patch-tag.com/r/rubenAst/subtitleParser/home";
        description = "A parser for .srt and .sub files";
@@ -125853,7 +126239,7 @@ self: {
      mkDerivation {
        pname = "subtitles";
        version = "0.0.1";
-       sha256 = "0pvcwwz6i4mpmir0s2xnjy27j2cnbi4l9lxhlmxcsw4yz4spdgcl";
+       sha256 = "94bd7635f99e70cd7aa5b0d344495c9609798497b60b0d72acb792683ee76c5f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base split ];
@@ -125866,7 +126252,7 @@ self: {
      mkDerivation {
        pname = "suffixarray";
        version = "0.0.3.1";
-       sha256 = "0wa2yfz5y90dq9mf3xyl7126rvjldnaa32gmg253bfv6hjvk4hhp";
+       sha256 = "174232b78466bb358a78f589a1946d54ee6c4438d4f7e16ac20d245fbef34271";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base vector ];
@@ -125882,7 +126268,7 @@ self: {
      mkDerivation {
        pname = "suffixtree";
        version = "0.2.2.1";
-       sha256 = "1ddk2hp27al9jzcgkrhv7v1i7knci4l22flkgb2r94h96z5nhfq6";
+       sha256 = "063b68cb37099294c57a933a212889ccce13c33e1be6f9d89789aa232e14b3b5";
        libraryHaskellDepends = [ base bytestring containers ];
        homepage = "https://github.com/bos/suffixtree";
        description = "Efficient, lazy suffix tree implementation";
@@ -125894,7 +126280,7 @@ self: {
      mkDerivation {
        pname = "sugarhaskell";
        version = "0.1";
-       sha256 = "1hlzckm5c1dih79nmwy2gk4fjnn4kxzp3pk0adfyhldapkq6wpmq";
+       sha256 = "b85e6ef0bcaa51e85d5360de717f9fc45ae9c87cc2f36ad381b10556ea649fc2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process ];
@@ -125908,7 +126294,7 @@ self: {
      mkDerivation {
        pname = "suitable";
        version = "0.1.1";
-       sha256 = "1pvw7zgvfr0z2gjy224gd92ayh20j3v97rdlqmq6k6g4yabdpgci";
+       sha256 = "91bddb96f2e4996970c5b4e593f6904040af446a8f08e1e5131f64b7df3f7cdf";
        libraryHaskellDepends = [ base containers ];
        description = "Abstract over the constraints on the parameters to type constructors";
        license = stdenv.lib.licenses.bsd3;
@@ -125920,7 +126306,7 @@ self: {
      mkDerivation {
        pname = "sundown";
        version = "0.6";
-       sha256 = "09xh3pbyarflfjk17bn2isgpmsq49d6gmq7z918kf4c32fc7x6yb";
+       sha256 = "cb9b7e98138311375148ffe0fa4c4b04eb7a9f8ec2ae13a674d465e5d71db027";
        libraryHaskellDepends = [ base bytestring text ];
        homepage = "https://github.com/bitonic/sundown";
        description = "Bindings to the sundown markdown library";
@@ -125934,7 +126320,7 @@ self: {
      mkDerivation {
        pname = "sunlight";
        version = "0.6.0.0";
-       sha256 = "1q90fxv40jz5ngh6xi1n6xjx6hh1as223wjjhchk6k0y0frdg55x";
+       sha256 = "bd94d7b2031e4c33218352f22184560142d3653736c46ee0b3e54b40767720e1";
        libraryHaskellDepends = [
          base bytestring Cabal directory old-locale process random time
          tuple
@@ -125954,7 +126340,7 @@ self: {
      mkDerivation {
        pname = "sunroof-compiler";
        version = "0.2";
-       sha256 = "1r03aw55s4vnpbfk0n39li0aai3wvm209pqdimfkkk3kkan648cz";
+       sha256 = "9f2162ac9a73cc395d8d0ddf0444dd7c44a540a4695830ddba76135d0a5703e4";
        libraryHaskellDepends = [
          base Boolean containers data-default data-reify mtl operational
          semigroups tagged template-haskell transformers vector-space
@@ -125974,7 +126360,7 @@ self: {
      mkDerivation {
        pname = "sunroof-examples";
        version = "0.2.2";
-       sha256 = "0bcxai3gq1akbcxqkkj0n52a43zqcnw865bnngy9b4z26b43kj5k";
+       sha256 = "b3c839c832e29395fcb3761583b865f80fa244b140ce893b5b5305fc46549d2d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -125999,7 +126385,7 @@ self: {
      mkDerivation {
        pname = "sunroof-server";
        version = "0.2.1";
-       sha256 = "11acyb846wga6g6zcvlaffh299qn0l8jic8syg76cchm3l3348d5";
+       sha256 = "a52132061d153266cef31ab128110516a724a0738a6ef6cd33ea7143d0f24c85";
        libraryHaskellDepends = [
          aeson base containers data-default filepath kansas-comet scientific
          scotty semigroups stm sunroof-compiler tagged text time
@@ -126020,7 +126406,7 @@ self: {
      mkDerivation {
        pname = "supercollider-ht";
        version = "0.3";
-       sha256 = "1v8nqcfdn2dasiv24lny73bc0xz2d26wvvybhxw6s7dz4bkb9kiw";
+       sha256 = "3cceb4e622bf1d6d7887cbefcd8d68e277c0d638de522276d4aa09db1cc316ed";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126040,7 +126426,7 @@ self: {
      mkDerivation {
        pname = "supercollider-midi";
        version = "0.2.1";
-       sha256 = "1m3h6d49bjwhldbf4khyp6p8k4vr05m5392nk3d33x3d9pfhl20k";
+       sha256 = "13080add4d6df431da9856a4516a01799389aeb91e4ee256a390cb95483370d4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -126061,7 +126447,7 @@ self: {
      mkDerivation {
        pname = "superdoc";
        version = "0.1.2.1";
-       sha256 = "1fjy25fm7hz495dnxl9jw0asfhl23ykyax1w4q4yvkpmx8ars9wd";
+       sha256 = "8d279d15eaf5ceed09263c74e5a71f8242a715e032d16e5b49e4c3535d115eba";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126084,7 +126470,7 @@ self: {
      mkDerivation {
        pname = "supero";
        version = "3.0";
-       sha256 = "0jnip7wahy4z1jiablqzvmbk40as1ala65m7da7gsp0xvf2q7hwf";
+       sha256 = "8ec38385db1d5cfd8e6aa716a3a80a5a013257dd1fd3a5a20c9f78a8f8b9d14a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -126103,7 +126489,7 @@ self: {
      mkDerivation {
        pname = "supervisor";
        version = "0.1.1.0";
-       sha256 = "1gdgqm89ig236hkrz8sjgy3shqnl961401qgavs4qpqw7r2xk8vx";
+       sha256 = "7da3d9453e1c5f4cf4560f07408249d462a8877f52a39f273443bc9850c5afbd";
        libraryHaskellDepends = [
          base containers exceptions monadloc mtl
        ];
@@ -126118,7 +126504,7 @@ self: {
      mkDerivation {
        pname = "suspend";
        version = "0.2.0.0";
-       sha256 = "0wphk3dabba6rgd9lkxbsmq5vivvyy6b4jfxfndqb53yhdj5nkrg";
+       sha256 = "2f4f5b64837e94859b75dd49b28cf77bc75d70d5ab4f9adacb46ada5da98f072";
        libraryHaskellDepends = [ base lifted-base transformers-base ];
        description = "Simple package that allows for long thread suspensions";
        license = stdenv.lib.licenses.bsd3;
@@ -126132,7 +126518,7 @@ self: {
      mkDerivation {
        pname = "svg-tree";
        version = "0.3.1";
-       sha256 = "1fnj7d2nw4p9m46wp64gz99ssggxd0rz4737732hpk9vr5xq78lc";
+       sha256 = "8ca2837bc93bcd0bc538671cf23368fd3dad53fa8f98cb0da9e9126e453bd2ba";
        libraryHaskellDepends = [
          attoparsec base bytestring containers JuicyPixels lens linear mtl
          scientific text transformers vector xml
@@ -126148,7 +126534,7 @@ self: {
      mkDerivation {
        pname = "svg2q";
        version = "0.3.2";
-       sha256 = "0bkhh1klwp3lgsx0s62bpdhsw9sa1cdw8gjijj9npnygznbi7jhj";
+       sha256 = "12ca1397fdcfdb6b9394513ec41b0b4a27ae61bb4b180dba7e745c4e6780702e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -126168,7 +126554,7 @@ self: {
      mkDerivation {
        pname = "svgcairo";
        version = "0.13.0.3";
-       sha256 = "0jbcz46n5324vf9i05y8zdjp4ayid2frggsadm5nr8h9mnd4vncz";
+       sha256 = "9fd94d9aad09a26c4b6d4abf979d68d12b7265fbc8171093db448c620df96c49";
        libraryHaskellDepends = [ base cairo glib mtl text ];
        libraryPkgconfigDepends = [ librsvg ];
        libraryToolDepends = [ gtk2hs-buildtools ];
@@ -126182,7 +126568,7 @@ self: {
      mkDerivation {
        pname = "svgutils";
        version = "0.1";
-       sha256 = "131mic1c09adcphry7153bviiib59avxrd7dgwny0vdmw23cgfs1";
+       sha256 = "41bbc786e0b56de02d7fedb4dcb74a65c518f71a251c9fe1654d25c0028b358c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base xml ];
@@ -126198,7 +126584,7 @@ self: {
      mkDerivation {
        pname = "svm";
        version = "1.0.0.1";
-       sha256 = "19fr1lzp8j0hmqqy1hyx85gmkgxc2hy8cz5zv6jlvni0qqibiksz";
+       sha256 = "5fcfb822c620da4da5d9bf7c863c14acbf595f41ddc3e031ae1048743f0dd9a5";
        libraryHaskellDepends = [ array base ];
        homepage = "http://github.com/andrewdougherty/svm";
        description = "A support vector machine written in Haskell";
@@ -126209,10 +126595,9 @@ self: {
     ({ mkDerivation, attoparsec, base, bytestring, containers }:
      mkDerivation {
        pname = "svm-light-utils";
-       version = "0.1.2";
-       sha256 = "1p2rnx045zw9qqd88m5ldx5p3xmbsi6rkdh1bfk6ab1a0krjiifa";
+       version = "0.1.3";
+       sha256 = "fa5770c144c516485e409cc164cbc1e4f7dc5f1a32f41dd95356964c663e2e23";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
-       jailbreak = true;
        homepage = "http://github.com/bgamari/svm-light-utils";
        description = "Parsers and formatters for the SVMlight input file format";
        license = stdenv.lib.licenses.bsd3;
@@ -126225,7 +126610,7 @@ self: {
      mkDerivation {
        pname = "svm-simple";
        version = "0.2.7.1";
-       sha256 = "07s9mly01ar6c3p4fdl7wsi5j4bziagjjlbssr7x6s3ab5r8k9vd";
+       sha256 = "6da78972596a68d34fd67a51299f8a7f1159a2e6873647ee6026ab003cad491f";
        libraryHaskellDepends = [
          base binary bindings-svm bytestring containers deepseq directory
          monad-par mwc-random vector
@@ -126244,7 +126629,7 @@ self: {
      mkDerivation {
        pname = "svndump";
        version = "0.4.5";
-       sha256 = "0m6agn9riamsadf13w1g6i0nx59xl812112xdkqh0zl34rf5hkwp";
+       sha256 = "974f585c26837e00f16c5d842002a23d956e41342ff0115c53baaa98937dca54";
        libraryHaskellDepends = [
          attoparsec base bytestring containers filepath old-locale text time
        ];
@@ -126264,7 +126649,7 @@ self: {
      mkDerivation {
        pname = "swagger";
        version = "0.2.2";
-       sha256 = "1hpc569n34kr1nkrwlx76pc0yp9icr8j5cxliwjqffnh7x2czzqr";
+       sha256 = "19ffcf443fd03a87258fb4b3225166315d0fd835a7539ea70d7992619329ecc2";
        libraryHaskellDepends = [
          aeson base bytestring text time transformers
        ];
@@ -126280,7 +126665,7 @@ self: {
      mkDerivation {
        pname = "swapper";
        version = "0.1";
-       sha256 = "0a9g6cv7pvwna11cz1xc274rs0dgyhb84hqqdg5zyga7kkx0i06l";
+       sha256 = "d48008fa9c473dffcb6b18438216f4af019dc911ac87cf425096ef7b36332f29";
        libraryHaskellDepends = [
          base binary bytestring deepseq happstack-data happstack-state
          parallel
@@ -126300,7 +126685,7 @@ self: {
      mkDerivation {
        pname = "swearjure";
        version = "1.0.0";
-       sha256 = "0g3xq3abwkv6rs7kvv6niwdhx50c90ys1zrrzspx2g47c9fbs2iq";
+       sha256 = "380abd5c62873cd1affe39ffa03d480c940e1b8fd6ec3d8fce664fbed4c07d3c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -126319,7 +126704,7 @@ self: {
      mkDerivation {
        pname = "swf";
        version = "1.0.1";
-       sha256 = "1jx5941kb97w4zpgz7m1r2x2lxllmi1i9a9nmwflinyj74xxg1rl";
+       sha256 = "3487d73b39d2db481daf36a91443ac94762abac8a19effee27fca4350349a5cb";
        libraryHaskellDepends = [ base mtl pretty ];
        homepage = "http://www.n-heptane.com/nhlab";
        description = "A library for creating Shockwave Flash (SWF) files";
@@ -126334,7 +126719,7 @@ self: {
      mkDerivation {
        pname = "swift-lda";
        version = "0.7.0.0";
-       sha256 = "0cjvj7v8kjabv6a146hwgyk8k6b4z7gz4yrhz3d0nxa86ilvjl9q";
+       sha256 = "3851b9693448750bdaf8307bf2dff9649989a67f1c1a1294d94bc989f6915b32";
        libraryHaskellDepends = [
          array base containers ghc-prim mwc-random primitive vector
        ];
@@ -126352,7 +126737,7 @@ self: {
      mkDerivation {
        pname = "swish";
        version = "0.9.1.3";
-       sha256 = "07h5677d1liap81z3gvjab5yjib2vbmzvhfzqqmkjg7grk1dblld";
+       sha256 = "8dd2d5c2ccef3c392bc6dfc1fdebda6245e9cb5272bff103ba2ad2d0ce31051e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126378,7 +126763,7 @@ self: {
      mkDerivation {
        pname = "sws";
        version = "0.3.1.1";
-       sha256 = "0anl5h5lwc6b7whkg83ziyizq5w2mlcpv0akcl0ahgjl4mxnmiwd";
+       sha256 = "8dc76a7b25543ea8006553817d19ad8217fca38f7fa037213fcb304e0b2cd42a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -126398,7 +126783,7 @@ self: {
      mkDerivation {
        pname = "syb";
        version = "0.5.1";
-       sha256 = "0iiqz5mamk1nsij99rypms7dhx5flm2n02k1x6miqgnhg075zc41";
+       sha256 = "81b05f0e78d03e1cabe9610a6045a5ae74d88eaed7e79464d436ccaa6af93846";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base containers HUnit mtl ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
@@ -126411,7 +126796,7 @@ self: {
      mkDerivation {
        pname = "syb-extras";
        version = "0.3";
-       sha256 = "1l1637kf1f7n5nvcp2hv516qah7baykh5w2wmil2b909k75iq2x9";
+       sha256 = "a90b1ccb9909a42568ac5cf002a757eb40854d281b8acbb62df6b8e0e61926d0";
        libraryHaskellDepends = [ base eq prelude-extras ];
        homepage = "http://github.com/ekmett/syb-extras/";
        description = "Higher order versions of the Scrap Your Boilerplate classes";
@@ -126426,7 +126811,7 @@ self: {
      mkDerivation {
        pname = "syb-with-class";
        version = "0.6.1.6";
-       sha256 = "1c61hig293lxyr2kdri3rp6wkns921fiwwmml9zhrhrrryfr0p2n";
+       sha256 = "565c909dcf39c30c7fa2b5721e5d1049dbc9cdcd23e63645f69d8e245e84c1b0";
        revision = "1";
        editedCabalFile = "e894d322dfc9c36c33058bfcbecbe6d36e620556a9713108b008120f7981cd7c";
        libraryHaskellDepends = [
@@ -126441,7 +126826,7 @@ self: {
      mkDerivation {
        pname = "syb-with-class-instances-text";
        version = "0.0.1";
-       sha256 = "0vnpqk89nxs0anx62mzasl9wrcscw18vwc284y067ryb086aj2hf";
+       sha256 = "0e0aa90c02cbe76380274830be51e04cb3cc13d5ea5761ba5540779bd0c4d76e";
        libraryHaskellDepends = [ base syb-with-class text ];
        description = "Scrap Your Boilerplate With Class Text instance";
        license = stdenv.lib.licenses.bsd3;
@@ -126456,7 +126841,7 @@ self: {
      mkDerivation {
        pname = "sylvia";
        version = "0.2.2";
-       sha256 = "1yjvjfkg623kpnzpkknljfgcizyf3jsvkncz49yjsy9j2iklqg2k";
+       sha256 = "533c4c671432792d7d229fd9b9b51cceffc89e93d4ce79bfbd7308f3a6935bfa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -126480,7 +126865,7 @@ self: {
      mkDerivation {
        pname = "sym";
        version = "0.11.1";
-       sha256 = "140wy1l2y71v70fhl1z4sa5dvasz5f98w2knayhd7lvw15cglmbj";
+       sha256 = "7255fa58097cd3d3a057760a8e922b5fabdd8ad2e4070a1d383b1c2f68f01c90";
        libraryHaskellDepends = [
          array base containers hashable QuickCheck
        ];
@@ -126494,7 +126879,7 @@ self: {
      mkDerivation {
        pname = "sym-plot";
        version = "0.2.0";
-       sha256 = "0186i6c3dyvs5pa4fh0b284wgpm10pgwax9prahirnq8whph94p2";
+       sha256 = "e292042fe408db1ca1ca3775c5df05a1dec709120b4047d42d7afb3698890605";
        libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ];
        jailbreak = true;
        homepage = "http://github.com/akc/sym-plot";
@@ -126508,7 +126893,7 @@ self: {
      mkDerivation {
        pname = "symbol";
        version = "0.2.4";
-       sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h";
+       sha256 = "d074a7741f6ce0f2a604e4467c1c46e1acc2b707db107b3458395e646a9b8831";
        libraryHaskellDepends = [ base containers deepseq ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "A 'Symbol' type for fast symbol comparison";
@@ -126520,7 +126905,7 @@ self: {
      mkDerivation {
        pname = "sync";
        version = "0.1";
-       sha256 = "10c2divizmjij5w7x2ky6dzhq6y6wr6qq1pwl7wlhgv663y9yalk";
+       sha256 = "932a9ffc30663f48f9a1fc068c4de6c61b0c7f337e8a7e789151d61f776c8281";
        libraryHaskellDepends = [ base stm ];
        description = "A fast implementation of synchronous channels with a CML-like API";
        license = stdenv.lib.licenses.bsd3;
@@ -126529,25 +126914,31 @@ self: {
 
   "sync-mht" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, byteable
-     , bytestring, Cabal, cereal, containers, cryptohash, directory
-     , exceptions, filepath, io-streams, mtl, process, random
-     , regex-compat, temporary, text, time, transformers, unix, zlib
+     , bytestring, cereal, containers, cryptohash, directory, exceptions
+     , filepath, HUnit, io-streams, mtl, process, random, regex-compat
+     , temporary, text, time, transformers, unix, zlib
      }:
      mkDerivation {
        pname = "sync-mht";
-       version = "0.3.5.0";
-       sha256 = "1mkrap2qhfhnisz28vb4hjl5fmfi8r48n1igvv4c0qf9nclhfbhd";
-       isLibrary = false;
+       version = "0.3.6.0";
+       sha256 = "a6bd7b06e599844e7e93c5fff857b3b0af4975228f1b75fe25407c051f8ea5b9";
+       isLibrary = true;
        isExecutable = true;
+       libraryHaskellDepends = [
+         array base base16-bytestring byteable bytestring cereal containers
+         cryptohash directory exceptions filepath HUnit io-streams mtl
+         process random regex-compat temporary text time transformers unix
+         zlib
+       ];
        executableHaskellDepends = [
-         array base base16-bytestring byteable bytestring Cabal cereal
-         containers cryptohash directory exceptions filepath io-streams mtl
+         array base base16-bytestring byteable bytestring cereal containers
+         cryptohash directory exceptions filepath HUnit io-streams mtl
          process random regex-compat temporary text time transformers unix
          zlib
        ];
        testHaskellDepends = [
-         array base base16-bytestring byteable bytestring Cabal cereal
-         containers cryptohash directory exceptions filepath io-streams mtl
+         array base base16-bytestring byteable bytestring cereal containers
+         cryptohash directory exceptions filepath HUnit io-streams mtl
          process random regex-compat temporary text time transformers unix
          zlib
        ];
@@ -126563,7 +126954,7 @@ self: {
      mkDerivation {
        pname = "synchronous-channels";
        version = "0.2";
-       sha256 = "0xzpjq3h3mqdi553v7p6xm3i74nvbhz5igjlhfh6snlmr7p1cdvb";
+       sha256 = "6b3716eec9955a6da08354be583e5cdb921347ede69e3d4a890dd7010796f777";
        libraryHaskellDepends = [ base ];
        description = "Synchronous communication channels";
        license = stdenv.lib.licenses.bsd3;
@@ -126580,7 +126971,7 @@ self: {
      mkDerivation {
        pname = "syncthing-hs";
        version = "0.3.0.0";
-       sha256 = "0mancdrf3miicjcsrszxgv5bnka9nvbcsynyw4ljn19c2mk2628r";
+       sha256 = "19092366152c052b29e1de7acdd6b6494dbbca7efdebac996431d6e172635655";
        libraryHaskellDepends = [
          aeson base bytestring connection containers either exceptions
          http-client http-client-tls lens regex-posix text time
@@ -126604,7 +126995,7 @@ self: {
      mkDerivation {
        pname = "synt";
        version = "0.1.2";
-       sha256 = "12d9ilb81vcm24s8whk2cbq1nxlrzdsr7049962q6b0vkrk64v5v";
+       sha256 = "bb6c62669e1b2c83854989809375fb99761bf06262428e341195ed80168da989";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126632,7 +127023,7 @@ self: {
      mkDerivation {
        pname = "syntactic";
        version = "2.1";
-       sha256 = "1r2b11xw235qsv6z6qqssrmgd1wcbr28vmlqs7vlb4h0yhpkd1i3";
+       sha256 = "2386362ff4009245f7d198d68d445e8c87f66ad61a63f3cdd6b80cc17b084be4";
        libraryHaskellDepends = [
          base constraints containers data-hash deepseq mtl safe tagged
          template-haskell tree-view
@@ -126651,7 +127042,7 @@ self: {
      mkDerivation {
        pname = "syntactical";
        version = "0.1";
-       sha256 = "1sqnmarmdm4mha28h8gbp3jddlig84v7zqn53a29047w3877g3gw";
+       sha256 = "fc8d770e1afc1090841ac5e27f36412fd2d6e4b8eb2188848295d456b3aa16eb";
        libraryHaskellDepends = [ base ];
        description = "Distfix expression parsing library";
        license = stdenv.lib.licenses.bsd3;
@@ -126664,7 +127055,7 @@ self: {
      mkDerivation {
        pname = "syntax";
        version = "1.0.0.0";
-       sha256 = "1dhbzbf1zlpfjhnacqfhzvjznwlzv39c12a3y8ivqhplnkmqsm7x";
+       sha256 = "fd548debb4f442bc23f24389c0d2d89f72fbe5fed061a62c94eed21fdcfa0bb6";
        revision = "1";
        editedCabalFile = "7f3d7f3a8c8aedb78145f4d8a992815cdb644d839a5431b23e5fad0a62d7dd5c";
        libraryHaskellDepends = [
@@ -126682,7 +127073,7 @@ self: {
      mkDerivation {
        pname = "syntax-attoparsec";
        version = "1.0.0.0";
-       sha256 = "1ygikzc7s967bh9yz19r9zd2r1jychlf04cylbigaakrxnnkj4hi";
+       sha256 = "111239aded792af5e2a29e11e028645e862cda4f3985ef135cc7247dd89ff1f9";
        libraryHaskellDepends = [
          attoparsec base bytestring scientific semi-iso syntax text vector
        ];
@@ -126698,7 +127089,7 @@ self: {
      mkDerivation {
        pname = "syntax-example";
        version = "1.0.0.0";
-       sha256 = "1szfapnlcgr19cipm4q68w7p52sw2hapks63vcnn9qfjnav17ljr";
+       sha256 = "59d213b6b2d2e1642ddbc3e87915145c8b720f4706937a234b213f46ed55eeeb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -126717,7 +127108,7 @@ self: {
      mkDerivation {
        pname = "syntax-example-json";
        version = "1.0.0.0";
-       sha256 = "1bgv2y97rk5jr2gkl4d1pm19v3pl1gziz4sxnlv9w539dna0dwim";
+       sha256 = "35f206946d69149e36b55d931fff0bf48e9d42bda1113a9fc8b2cc7c9217fbad";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -126735,7 +127126,7 @@ self: {
      mkDerivation {
        pname = "syntax-pretty";
        version = "0.2.0.0";
-       sha256 = "1dyv0d998lbjndiw05hz9rmiazzz3rvw8hqdx5npb6yjmq237zmf";
+       sha256 = "aefe3304aed29b756de90d43c4771eff7f156b4e1f16c063b37251945203dbb7";
        libraryHaskellDepends = [
          base pretty scientific semi-iso syntax text
        ];
@@ -126751,7 +127142,7 @@ self: {
      mkDerivation {
        pname = "syntax-printer";
        version = "1.0.0.0";
-       sha256 = "051gkxj9qgrmjp8jl48nb7487y2hd6ymrzjl62k2faa0cfz6sbqz";
+       sha256 = "1f2f6dbe63402927a63054fe5cbd6950f883c85916112ad195353f9c649f2f14";
        libraryHaskellDepends = [
          base bifunctors bytestring scientific semi-iso semigroupoids syntax
          text vector
@@ -126769,7 +127160,7 @@ self: {
      mkDerivation {
        pname = "syntax-trees";
        version = "0.1.2";
-       sha256 = "19lgaiql3d8v6w8dl0a7adrfw63ch5376dz6y4jzndrwzi43p9sb";
+       sha256 = "4ba73b48fc3c37fb25f1e6377346816c18ee72534701da10371bb54171548fa6";
        libraryHaskellDepends = [
          base haskell-src-exts hint mtl template-haskell uniplate
        ];
@@ -126785,7 +127176,7 @@ self: {
      mkDerivation {
        pname = "syntax-trees-fork-bairyn";
        version = "0.1.2.5";
-       sha256 = "1n4k8m4zl5phxyrh6s46ijxcba9iljyh7zvhrrzzaw3d00nfvqg6";
+       sha256 = "e6e1ed2c006d70f57fce70ff03bda431a9c5ba8c866803b3eff016fa494593d8";
        libraryHaskellDepends = [
          base haskell-src-exts hint mtl template-haskell uniplate
        ];
@@ -126804,7 +127195,7 @@ self: {
      mkDerivation {
        pname = "synthesizer";
        version = "0.2.0.1";
-       sha256 = "1n5r7061x8212a8wfv0j9g28l79lxgbymr1f0m1qgzkhqf80gz3d";
+       sha256 = "6dfc0790c370fe8743052ee4ead7eb341d8ac44b126cc7911241a01e0c38b9d8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126829,7 +127220,7 @@ self: {
      mkDerivation {
        pname = "synthesizer-alsa";
        version = "0.5.0.2";
-       sha256 = "0k4hnhldrqjxz391p45rc125d2v8pbx23qxsvfs4hwra886imny3";
+       sha256 = "c3db1a0d422a7348b4dbbae321faba688b564460b9901bd2f85de2dc28b4904c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126855,7 +127246,7 @@ self: {
      mkDerivation {
        pname = "synthesizer-core";
        version = "0.7.1";
-       sha256 = "0h3dj4j9ha1db2lw3vd7zai05ivm9lfydaynq2bxqhz77s07skzf";
+       sha256 = "ee4f7d803ee743dc97c0d6abe61d4d75c702a2faa7edc1a9582d289824916d40";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq event-list
          explicit-exception filepath non-empty non-negative numeric-prelude
@@ -126881,7 +127272,7 @@ self: {
      mkDerivation {
        pname = "synthesizer-dimensional";
        version = "0.7.0.2";
-       sha256 = "1y3jnlzpgs0n42vf5ami98c3nc1kz645spxirdaqn60f3ig4bvzb";
+       sha256 = "ebef455e1c0e188b55cbb15f5d88f933303b184ab1aae2b62016e8773fb572f8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126902,7 +127293,7 @@ self: {
      mkDerivation {
        pname = "synthesizer-inference";
        version = "0.2";
-       sha256 = "07jhdd73vrhlvx6aq6rdd78qk8vfy2jcc9vrdrf8y6ikq6ir99rb";
+       sha256 = "2ba794a3c1331a8f5c6e7927c6a4f06ea389d1692d1bac4cdf14e63d4e6b501e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126926,7 +127317,7 @@ self: {
      mkDerivation {
        pname = "synthesizer-llvm";
        version = "0.7.0.1";
-       sha256 = "04mzsdwf8n31nqjlv7ryylx64mvhcfkx6r8jq1yijvnb1pih4vk2";
+       sha256 = "626e02e30dcb6e197dc01265d3a7637057623af53e9f4d25b66158e478d3bf12";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126955,7 +127346,7 @@ self: {
      mkDerivation {
        pname = "synthesizer-midi";
        version = "0.6.0.2";
-       sha256 = "0xsfjgh82nxpwrhpllhjxxzaj42cxb5cbbpgwd1b1bsv67441h2x";
+       sha256 = "5dc040c8315bafb042e3efaec5caea4c10a97eef12527a61e6b75b81e0934e77";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126976,7 +127367,7 @@ self: {
      mkDerivation {
        pname = "sys-auth-smbclient";
        version = "2.0.0.0";
-       sha256 = "00j1ss8xsnd8m0v0p9r9mampbczclzanzcli2qrxcl4j9vkp2mb7";
+       sha256 = "675571e74e9250d6331691b26fd5a7ecb375abaa29a70b36a8a859dd91d64102";
        libraryHaskellDepends = [ base process text ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/kkazuo/sys-auth-smbclient";
@@ -126992,7 +127383,7 @@ self: {
      mkDerivation {
        pname = "sys-process";
        version = "0.1.6";
-       sha256 = "04f6mbkc61qx8wjf95kwxhrqhv2qprl2wa73rkgsq8nc18gicf3q";
+       sha256 = "7838161f0acc22acdfcce3282e68be586c8833ec7c96e424471d07c3e6aac611";
        libraryHaskellDepends = [
          base bifunctors directory filepath lens mtl notzero process
          semigroupoids semigroups transformers
@@ -127010,7 +127401,7 @@ self: {
      mkDerivation {
        pname = "system-argv0";
        version = "0.1.1";
-       sha256 = "1ijfry2r3cypp3zmws6dczk21m4n86fkxjld7yl19gjp46fxllbd";
+       sha256 = "6d51da9d2157be14a83f8dca3e9d4196d420e667cd685effb8d7b39185cf4ec6";
        libraryHaskellDepends = [ base bytestring system-filepath text ];
        homepage = "https://john-millikin.com/software/haskell-filesystem/";
        description = "Get argv[0] as a FilePath";
@@ -127024,7 +127415,7 @@ self: {
      mkDerivation {
        pname = "system-canonicalpath";
        version = "0.3.2.0";
-       sha256 = "031m5j7xglxdgp3rkgf2v37jya1a3hhjp3mxbfyyjl27wv7pzhjy";
+       sha256 = "5ec27fcfe64750e9bd5bbd8e2b211c2a282fcfd8c2bd99c77dadd3d78f2c350c";
        libraryHaskellDepends = [
          base basic-prelude directory system-filepath text
        ];
@@ -127042,7 +127433,7 @@ self: {
      mkDerivation {
        pname = "system-command";
        version = "0.0.10";
-       sha256 = "11lfr6xm5xpvq4244pc7a0psy2m1krz0b1jd9pdw6kzn5ammi1b2";
+       sha256 = "628558ab2af64fc3db4d4d86057e9ea10aaf2f50875d4204c1fbf652bbc98e86";
        libraryHaskellDepends = [
          base directory filepath process transformers
        ];
@@ -127061,7 +127452,7 @@ self: {
      mkDerivation {
        pname = "system-fileio";
        version = "0.3.16.3";
-       sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i";
+       sha256 = "3175707cb322c65760fa2eb2ab17327f251c8294ad688efc6258e82328830491";
        libraryHaskellDepends = [
          base bytestring system-filepath text time unix
        ];
@@ -127081,7 +127472,7 @@ self: {
      mkDerivation {
        pname = "system-filepath";
        version = "0.4.13.4";
-       sha256 = "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l";
+       sha256 = "345d7dec968b74ab1b8c0e7bb78c2ef1e5be7be6b7bac455340fd658abfec5fb";
        libraryHaskellDepends = [ base bytestring deepseq text ];
        testHaskellDepends = [
          base bytestring chell chell-quickcheck QuickCheck text
@@ -127096,7 +127487,7 @@ self: {
      mkDerivation {
        pname = "system-gpio";
        version = "0.0.2";
-       sha256 = "1i718k96xvsfl9rh1x4n5ra88838wd6rzmj3p70bfkxxrsvv1zi4";
+       sha256 = "24feb0b7cebd4fb7c0b943d69f4de3682084542e96f40073a24eef6ed244e1c4";
        libraryHaskellDepends = [ array base ghc-prim ];
        homepage = "https://github.com/luzhuomi/system-gpio/";
        description = "GPIO wrapper libary for Raspberry Pi";
@@ -127108,7 +127499,7 @@ self: {
      mkDerivation {
        pname = "system-inotify";
        version = "0.1";
-       sha256 = "0ndw4vcvvf7p6nb5vn91mhbj4w9lmgm4cl0jzsks4mxs625bv4lg";
+       sha256 = "8f92bd8a30ba57a2a7fe125046eaab34712217ac21d95d9635f7b8bdd926bc59";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://darcs.imperialviolet.org/system-inotify";
        description = "Binding to Linux's inotify interface";
@@ -127122,7 +127513,7 @@ self: {
      mkDerivation {
        pname = "system-lifted";
        version = "0.2.0.1";
-       sha256 = "1c27y14867dd6706kp9n9y287vi7vqfzd2qr9365mk2854zvqifw";
+       sha256 = "dc45bc3f2948cc5acc48198bf61dde27ee83844f36dd69c031ad1d8348f047b0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127145,7 +127536,7 @@ self: {
      mkDerivation {
        pname = "system-posix-redirect";
        version = "1.1.0.1";
-       sha256 = "1wkfz898d3607xnx779l1k1qc8i2k63ixg47542r45scwq8m0lsk";
+       sha256 = "53535011e64c1792052987bc1e8799222286c30c349dd36d3fc08c8612fa6ef2";
        libraryHaskellDepends = [ base bytestring unix ];
        description = "A toy module to temporarily redirect a program's stdout";
        license = stdenv.lib.licenses.bsd3;
@@ -127160,7 +127551,7 @@ self: {
      mkDerivation {
        pname = "system-random-effect";
        version = "0.4.1.3";
-       sha256 = "1gfzyjap173brh0i4plgad0409hpah98wsf9w0n7mcr2ysrvjdmb";
+       sha256 = "ab36b9b3f622b37a2ce0c9698e125417264040538f5e1201cc6b9c7095f4dfbd";
        libraryHaskellDepends = [
          base bytestring crypto-api extensible-effects
          mersenne-random-pure64 primitive statistics vector
@@ -127182,7 +127573,7 @@ self: {
      mkDerivation {
        pname = "system-time-monotonic";
        version = "0.2";
-       sha256 = "0f5grhh6x2fbawmdk0gq1nsjz47iz8f8r2592d1l69fqddwdhc3v";
+       sha256 = "7b30d8786bd825434313a9888c1cfaf1902fb50df881d92a57cb896e20ccaf38";
        libraryHaskellDepends = [ base time ];
        homepage = "https://github.com/joeyadams/haskell-system-time-monotonic";
        description = "Simple library for using the system's monotonic clock";
@@ -127197,7 +127588,7 @@ self: {
      mkDerivation {
        pname = "system-util";
        version = "0.2";
-       sha256 = "0sjgsm4n3imnl45zgpvs1vd10wmgci2am03kpjphbqgi5bdywzqk";
+       sha256 = "137feedb2af1e105afbc7380aa4464af7210da0e7adff70ba1b6c66149d54f6a";
        libraryHaskellDepends = [
          base directory either filepath semigroups system-lifted
          template-haskell transformers unix
@@ -127220,7 +127611,7 @@ self: {
      mkDerivation {
        pname = "system-uuid";
        version = "2.1.1";
-       sha256 = "12c05aqgxfqfsc5hbwlfwy6rhcx29ywz6ai86009y45hx9iii4cb";
+       sha256 = "8b911863eab0109f0030282af3b94fa233988de78ef2050bd30ebbfeb02a8089";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127243,7 +127634,7 @@ self: {
      mkDerivation {
        pname = "systemd";
        version = "1.0.0";
-       sha256 = "10iyiw0m543bx9j9vdnz2lpnc3944i7ff9vbpdivvgv5z7gd17yn";
+       sha256 = "d69fd0def965bfbd63bb6b27e74e24240d662f15dfb69d64ea6b9052018f3e82";
        libraryHaskellDepends = [
          base bytestring network transformers unix
        ];
@@ -127259,7 +127650,7 @@ self: {
      mkDerivation {
        pname = "syz";
        version = "0.2.0.0";
-       sha256 = "1m5395937yyxsa1bmlfn1dxa1jr15yjhlz9s15bpwapshcd8119y";
+       sha256 = "3e85801a83fa2a7e57093a7d0aa52f21cba07a0bd6d1ba82d2ddfb335249a3d4";
        libraryHaskellDepends = [ base syb ];
        homepage = "http://www.cs.indiana.edu/~adamsmd/papers/scrap_your_zippers/";
        description = "Scrap Your Zippers";
@@ -127274,7 +127665,7 @@ self: {
      mkDerivation {
        pname = "t-regex";
        version = "0.1.0.0";
-       sha256 = "0g1sv92cglcvdcq320rwdndmq80nyy1yljl6hm86mjppha20dnxl";
+       sha256 = "b4db068482f7ca6a5085864aea83f716205c9b6d3c0331306b9bd1c744da3a3c";
        libraryHaskellDepends = [
          base containers haskell-src-exts haskell-src-meta lens mtl
          QuickCheck recursion-schemes template-haskell transformers
@@ -127290,7 +127681,7 @@ self: {
      mkDerivation {
        pname = "ta";
        version = "0.1";
-       sha256 = "1i9d34gdxrc0gnny5zgp73m0si9583i8w0gw97mqpyha4pzz6hxx";
+       sha256 = "bd43f3ff250afa8beb49fc018ee24025450dea38f7fde2ad7d80e5de1e192dc5";
        libraryHaskellDepends = [
          base containers ghc-prim mtl Takusen template-haskell time
        ];
@@ -127306,7 +127697,7 @@ self: {
      mkDerivation {
        pname = "table";
        version = "0.1.0.0";
-       sha256 = "1aqi8ivmlzi5j8kxjcwyd2nbz9jpp6q3xya8acsni5fis9l4757w";
+       sha256 = "fc944368d2d19568355348f93eb0b957a6bfac689e33d92792257e5a774411ab";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -127323,7 +127714,7 @@ self: {
      mkDerivation {
        pname = "table-tennis";
        version = "0.1.0.3";
-       sha256 = "1v5g4fbbspgm4smjxk499a0grh5xsr18688kmivql8knhxh1351k";
+       sha256 = "339411608776228a77ac13218342d6bdc0fc804a89cc2eab26f55dbd9623afec";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "A table tennis game tracking engine";
@@ -127337,7 +127728,7 @@ self: {
      mkDerivation {
        pname = "tableaux";
        version = "0.2";
-       sha256 = "0dc1qdjlwxqjfb286knmbam6y9w9wlr6ah7l2ndq33yia4n2jp8b";
+       sha256 = "0b5d292c51d18f819b15f4406532e589276faa5ad54e83c47212774e65c38135";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -127356,7 +127747,7 @@ self: {
      mkDerivation {
        pname = "tables";
        version = "0.4.1.1";
-       sha256 = "1bv51i0bn0nlgi0zj8sjdch6m9dd8ncmnksz699fa28cn57ln64p";
+       sha256 = "97184b4fb10c09e552325f4f5b9945ada56a206b5223f9417cd402bb400c65af";
        libraryHaskellDepends = [
          base binary cereal comonad containers deepseq hashable lens
          profunctors safecopy template-haskell transformers
@@ -127381,7 +127772,7 @@ self: {
      mkDerivation {
        pname = "tablestorage";
        version = "0.2.1.0";
-       sha256 = "03j8cqq85i9wikw772swazbvyv1dcw0mnhmqq3slydl0axi12yr8";
+       sha256 = "287b11625780364ff5c0b8425b01672d6cbfd7575c8b73f88c3cc5823066480e";
        libraryHaskellDepends = [
          base base64-bytestring bytestring conduit crypto-api cryptohash
          HTTP http-conduit http-types mtl network old-locale resourcet SHA
@@ -127400,7 +127791,7 @@ self: {
      mkDerivation {
        pname = "tabloid";
        version = "0.47";
-       sha256 = "1qcay15g6g2c9h6vfc7pi7rl4d8fsl09vrq33pdqvgg2fp2xclh3";
+       sha256 = "0352d6c575e2bd8ddb1d03e79d00d50e3542f389f730b70d4c4c3cf34af08ae1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -127417,7 +127808,7 @@ self: {
      mkDerivation {
        pname = "tabular";
        version = "0.2.2.7";
-       sha256 = "1ysgq7rrks7f98nnvxil8xz1q27hxdgz4szbjhqwzbwd209dmy0k";
+       sha256 = "13f8da12108dafcf3194eb6bf25febf0081c7e4734f66d2d4aeee899f3c14ffb";
        libraryHaskellDepends = [ base csv html mtl ];
        homepage = "http://hub.darcs.net/kowey/tabular";
        description = "Two-dimensional data tables with rendering functions";
@@ -127435,7 +127826,7 @@ self: {
      mkDerivation {
        pname = "taffybar";
        version = "0.4.5";
-       sha256 = "0igwq5gmfki61igrs6v51pm8r3wz8pzv6iz8dw30nmqgr3ypddlw";
+       sha256 = "9cb676fdc80f570b066fe847b3ff459f8f8cea0d651b9d5f0c264e575fc1fc45";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127458,7 +127849,7 @@ self: {
      mkDerivation {
        pname = "tag-bits";
        version = "0.1.1.2";
-       sha256 = "0crn1g3dh97s3b55z0pkvjm9h89kq99c2agk687vr0vij6r5di65";
+       sha256 = "c5c456b2917183bc0f32f329c152c2332198aadcf3825fca1afa24d8c60b3633";
        libraryHaskellDepends = [ base ghc-prim ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/tag-bits";
@@ -127473,7 +127864,7 @@ self: {
      mkDerivation {
        pname = "tag-stream";
        version = "0.2.1";
-       sha256 = "160kyp1w3y3zg0hj198v5a3jvhpfdy0y0lfz4r2d8azay4f1pkmn";
+       sha256 = "b6ce1b1cf1ea2bd44426df51e0816feec22d872a1ba52021787ff8c1c3f51398";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring enumerator
        ];
@@ -127489,7 +127880,7 @@ self: {
      mkDerivation {
        pname = "tagchup";
        version = "0.4.0.4";
-       sha256 = "143bnz73fyy8swm37p0pjg9zagpgzi8mcvixvswla6fiszgc203p";
+       sha256 = "7700c1ded7d11945b9de3d6e5651fcef3ef5d39317dc332ad7c87b37ceb76b90";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127506,7 +127897,7 @@ self: {
      mkDerivation {
        pname = "tagged";
        version = "0.8.1";
-       sha256 = "1hc2qzhhz5p1xd8k03sklrdnhcflkwhgpl82k6fam8yckww9ipav";
+       sha256 = "5bdd98389fcca3aa9c9902d1fb209fd431685ba6530f3051ebe1960fe1c782c1";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/tagged";
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
@@ -127518,7 +127909,7 @@ self: {
      mkDerivation {
        pname = "tagged-binary";
        version = "0.2.0.0";
-       sha256 = "0ibp4hmzg4c4dn88ws7x1j5wc6cbz3j2hymyaw2qkac3j4phzqrm";
+       sha256 = "35e30f2f9183a9890557be7a28e4f88b19c68b0cfd688e906d8491f72b247745";
        libraryHaskellDepends = [ base binary bytestring pureMD5 ];
        description = "Provides tools for serializing data tagged with type information";
        license = stdenv.lib.licenses.mit;
@@ -127529,7 +127920,7 @@ self: {
      mkDerivation {
        pname = "tagged-exception-core";
        version = "2.1.0.0";
-       sha256 = "1w4020qb6f5vnym13a4jrha62vj7rqz3nfsrsxa34dl04y63jcax";
+       sha256 = "5d31398c2780363254d7593b3b3ece476e6114cc92a811aab7bb38b3301080f0";
        revision = "1";
        editedCabalFile = "8f3f0eba857169c03927f8605ed326b7a4a5395582aeac4edcee44369b4c9689";
        libraryHaskellDepends = [
@@ -127549,7 +127940,7 @@ self: {
      mkDerivation {
        pname = "tagged-list";
        version = "1.1";
-       sha256 = "1gdkq9d6hc25z9y8wcsjq10vz25fw40hz2hbp8jfwczhchdxy35s";
+       sha256 = "ba0cdf1b64f033ee24ba0b8a0f01e1ae88bf41c052338e7cfa4530685ac2b3bd";
        libraryHaskellDepends = [
          AbortT-transformers base binary natural-number type-equality
          type-level-natural-number type-level-natural-number-induction
@@ -127566,7 +127957,7 @@ self: {
      mkDerivation {
        pname = "tagged-th";
        version = "0.1";
-       sha256 = "1qqysn5zrkx2q3rv8ynf6nmy5rwdqk6niw0fphg5kyrg72h31s69";
+       sha256 = "c9e830a0382ffb591ebc0ef068cdc48de7e2ab35ce7ab4f3c0a2cffc8bd51ee3";
        libraryHaskellDepends = [
          base tagged template-haskell type-spine
        ];
@@ -127583,7 +127974,7 @@ self: {
      mkDerivation {
        pname = "tagged-transformer";
        version = "0.8";
-       sha256 = "13jzfrzcgbh3g3qssv08r8i8j2l5c5y84blc1m90rhyyvx2zizn7";
+       sha256 = "c7fef845dfdec30c520d8c2e827c61850a8922ca086cadf17803aec77e765f8e";
        libraryHaskellDepends = [
          base comonad contravariant distributive exceptions mtl reflection
          semigroupoids tagged
@@ -127599,7 +127990,7 @@ self: {
      mkDerivation {
        pname = "tagging";
        version = "0.1";
-       sha256 = "012lcbp2c9a38s4l2i9jaiqcxaidk93v7gxcnf9lplixrnzczy93";
+       sha256 = "23f9cfbecd3dd24b93b3acbfb3479a2daace70543245418946432526ee625404";
        libraryHaskellDepends = [ base bytestring pcre-light ];
        homepage = "git://github.com/jre2/HaskellTagging.git";
        description = "Library for tagging data";
@@ -127614,7 +128005,7 @@ self: {
      mkDerivation {
        pname = "taggy";
        version = "0.2.0";
-       sha256 = "01q2ccf3a8akaifh79ajnfr5yrjsq4xihq0pl7lsz173n7mhnsy3";
+       sha256 = "c36b0bebb1e384afe9a11760183bc15a665fb2b352a5035d545321351c630207";
        revision = "1";
        editedCabalFile = "0343ad030ba4e9fd651b383e92c213c6c4a6560ec33f561cfcfa9c5493deb50b";
        isLibrary = true;
@@ -127640,7 +128031,7 @@ self: {
      mkDerivation {
        pname = "taggy-lens";
        version = "0.1.2";
-       sha256 = "05m2c9q0rz4y0zz6n3dqf0hhzfvk0mp1692jxykg86c802d7pkib";
+       sha256 = "2bce7b9a008819f4a6ef5224136e0573bb0f2170b80d6bfe079efc0c7062a216";
        libraryHaskellDepends = [
          base lens taggy text unordered-containers
        ];
@@ -127657,7 +128048,7 @@ self: {
      mkDerivation {
        pname = "taglib";
        version = "0.1.1";
-       sha256 = "16qyfy8rxaab0q9j2v00h4j5d3la95acfhmp32x1hdxz1rwr6zfp";
+       sha256 = "d77d93790ebf3718ba18b742c754498a8e562481006c2113064ba99e91771e9b";
        libraryHaskellDepends = [ base bytestring utf8-string ];
        librarySystemDepends = [ taglib ];
        libraryPkgconfigDepends = [ taglib ];
@@ -127672,7 +128063,7 @@ self: {
      mkDerivation {
        pname = "taglib-api";
        version = "0.1.1.3";
-       sha256 = "1ahbwi28yjigbkgfv52iaaqalmmlc4d09fa65l0yczxrs7rzchmj";
+       sha256 = "b242f6f3d1b97fe6012d46b9041a61b456aab0525194edde5c2f4a8f44e40baa";
        libraryHaskellDepends = [
          base bytestring containers mtl text transformers
        ];
@@ -127689,7 +128080,7 @@ self: {
      mkDerivation {
        pname = "tagset-positional";
        version = "0.3.0";
-       sha256 = "0x1mwwlwhka12bzshy0j0w7iq9ka6kn1jgsifi26jmg7zf79zydf";
+       sha256 = "aef99f8efbe755694474513f19ec346a261c0f071278a8ff12414dc829e73574";
        libraryHaskellDepends = [
          base binary containers parsec text text-binary
        ];
@@ -127704,7 +128095,7 @@ self: {
      mkDerivation {
        pname = "tagshare";
        version = "0.0";
-       sha256 = "1q3chp1rmwmxa8rxv7548wsvbqbng6grrnv1587p08385sp4ncfj";
+       sha256 = "d2314bae2e6820700f2a61db9c9f7976e1b53547a49cdd3352bdf29ac3856ce0";
        libraryHaskellDepends = [ base containers mtl ];
        description = "TagShare - explicit sharing with tags";
        license = stdenv.lib.licenses.bsd3;
@@ -127715,7 +128106,7 @@ self: {
      mkDerivation {
        pname = "tagsoup";
        version = "0.13.3";
-       sha256 = "13b6zy6346r3cxhaivys84fnxarg8wbv7r2znazfjdkqil8n5a1j";
+       sha256 = "32a862118d7836e9beb25fe4b317472fab6e1d41daefa86067231b328cff668d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text ];
@@ -127732,7 +128123,7 @@ self: {
      mkDerivation {
        pname = "tagsoup-ht";
        version = "0.3";
-       sha256 = "1yxb1lmayqqlnxx4jgcbvya8llfgdbbr8rvcxwicwjrq3xsjl8km";
+       sha256 = "75222a751f384bce22ef6c6794d76acf518a94df8b3d497ab71463af2a0dabfb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127755,7 +128146,7 @@ self: {
      mkDerivation {
        pname = "tagsoup-parsec";
        version = "0.0.8";
-       sha256 = "0h62kqls8nrq5wqxbzvxav4kfn1lxc6qm5vg8dhkvqdp5z6xnkzk";
+       sha256 = "f34fdbcd2fb7e13d61436f978a0deb345837c9567dffd5312f385ba4299ec240";
        libraryHaskellDepends = [ base parsec tagsoup ];
        homepage = "http://www.killersmurf.com";
        description = "Tokenizes Tag, so [ Tag ] can be used as parser input";
@@ -127771,7 +128162,7 @@ self: {
      mkDerivation {
        pname = "tagstream-conduit";
        version = "0.5.5.3";
-       sha256 = "1arlf7qil9bzcqykda8yyrnncm29jsfjvz5kbcdrbbhqpbqfi5mj";
+       sha256 = "b296e8f0ba18ae951b5bb3fc2d9d964954666df61ea9363d667f251af17134ab";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring case-insensitive conduit
          conduit-extra data-default resourcet text transformers xml-conduit
@@ -127789,7 +128180,7 @@ self: {
      mkDerivation {
        pname = "takahashi";
        version = "0.2.2.0";
-       sha256 = "0flr87m1yjxcv1r64bvrx1gm9dpp6xvj2lj14pi99pipywgw4kgs";
+       sha256 = "fa4dc21ff737de94e2254152217737f7b6545fe8792f6272d8ac4b1fea41993a";
        libraryHaskellDepends = [ base lens monad-skeleton mtl ];
        description = "create slide for presentation";
        license = stdenv.lib.licenses.mit;
@@ -127802,7 +128193,7 @@ self: {
      mkDerivation {
        pname = "takusen-oracle";
        version = "0.9.3";
-       sha256 = "1d57zcv409d3w6qz8n1c8k93wqrqvgynm327vx3w8p7kqs20yaad";
+       sha256 = "4d290f84c6f35cc447df478c6afddb38633ed2442c58f4b1e1a3254036fba7b4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
@@ -127830,7 +128221,7 @@ self: {
      mkDerivation {
        pname = "tamarin-prover";
        version = "0.8.6.1";
-       sha256 = "0g7gwqaykvn2r7zbddcvcr4qjs78n0w0cvzk9sfm51i0xgmx3llg";
+       sha256 = "8fd2d1ebeb2086529d4ef36f0638b0e8688949669bb5b6fec9c2eee915e6ef3c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -127856,7 +128247,7 @@ self: {
      mkDerivation {
        pname = "tamarin-prover-term";
        version = "0.8.5.1";
-       sha256 = "17wq4hr7wfxw5x52jzk8882197zq1lwdqk5yr9wagsbn7hldmaa5";
+       sha256 = "45a9da283c76e9a778cabe4cdc380df89f140442687e294a2fbc3b7e3224989f";
        libraryHaskellDepends = [
          attoparsec base binary bytestring containers deepseq derive
          directory dlist HUnit mtl parsec process safe split syb
@@ -127879,7 +128270,7 @@ self: {
      mkDerivation {
        pname = "tamarin-prover-theory";
        version = "0.8.6.0";
-       sha256 = "1xc11mrzfg1v8ilp7yb1zlg2359w14szhbdy86pbfzbjl31852l3";
+       sha256 = "838a82c2a0727db7ae41be2df835093c95211efd61f97369443b3cf7730d81f5";
        libraryHaskellDepends = [
          array base binary bytestring cmdargs containers deepseq derive
          directory dlist fclabels filepath HUnit mtl parallel parsec process
@@ -127901,7 +128292,7 @@ self: {
      mkDerivation {
        pname = "tamarin-prover-utils";
        version = "0.8.5.1";
-       sha256 = "11phn05fb8s80g6zk6sly8wi1rl8i3rnymkr99la8abr8yw12j3c";
+       sha256 = "6c4811b8477929a4684a79566ff38888e61039f2549bf9cd0348a3e50ab0f086";
        libraryHaskellDepends = [
          base base64-bytestring binary blaze-builder bytestring containers
          deepseq dlist fclabels mtl parsec pretty SHA syb time transformers
@@ -127918,7 +128309,7 @@ self: {
      mkDerivation {
        pname = "tamper";
        version = "0.4.1";
-       sha256 = "1nkfcai9l6z6hvjixq8nny1466f8shc5432hr8l17llqcwpbzv5p";
+       sha256 = "b7ecbf2e6798d21328ca500c5218d4c8194382b716e11ee586e61b9aa2626eda";
        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;
@@ -127930,7 +128321,7 @@ self: {
      mkDerivation {
        pname = "tar";
        version = "0.4.1.0";
-       sha256 = "05875pc5ns1fsbl9qgr8sqh29xl4mhvj0pwsa9z4afxv6h6328bm";
+       sha256 = "7521310c34bb3b457e529a5f2037ac84f62420d6283f9ce8d22e685bd82d0715";
        libraryHaskellDepends = [
          base bytestring directory filepath time
        ];
@@ -127945,7 +128336,7 @@ self: {
      mkDerivation {
        pname = "tar";
        version = "0.4.2.1";
-       sha256 = "102hjlrqfb9d0mvz2bdrj0wg7hvhvzbv4f8gsvxz0wfnq7k0mb9g";
+       sha256 = "2fad0ae6c1d671f0fbd60f39b2d7df70c3f33890b92df177052d2d8733955080";
        libraryHaskellDepends = [
          array base bytestring directory filepath time
        ];
@@ -127962,7 +128353,7 @@ self: {
      mkDerivation {
        pname = "tardis";
        version = "0.3.0.0";
-       sha256 = "15f88b5qg4v1ah60y0jxkww9n6z7gvnkslx4inckh6m6c7yvj8k6";
+       sha256 = "6622b9fd61a61a38998da4533ded7ee71b9b389f5d020f0c54619387cb42c895";
        libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/DanBurton/tardis";
        description = "Bidirectional state monad transformer";
@@ -127979,7 +128370,9 @@ self: {
      mkDerivation {
        pname = "target";
        version = "0.1.3.0";
-       sha256 = "0przmavzzcbyxkqj1wffiissxz9fdlrx2q8lpxgmsamadd46xq66";
+       sha256 = "c6e06e486baa2a5d5fbf1461d1336d2efdae758ccef120f1ec7eb1ffb7aa3f5f";
+       revision = "1";
+       editedCabalFile = "173753da5f21d9f9d164cc546890e9ad602e339ed99351863ad1ba5df9489fb3";
        libraryHaskellDepends = [
          base containers directory exceptions filepath ghc ghc-paths
          liquid-fixpoint liquidhaskell mtl pretty process syb tagged
@@ -128004,7 +128397,7 @@ self: {
      mkDerivation {
        pname = "task";
        version = "0.0.1";
-       sha256 = "0z4f4hs2c7xl6c134bqhk81wzxhb6yf7fsar2fnqvahviaqqgzqn";
+       sha256 = "16ff87b18a1baa8dad135969779c370bf6cf039a102f320233b41f2634248e7c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -128024,7 +128417,7 @@ self: {
      mkDerivation {
        pname = "taskpool";
        version = "0.1.0";
-       sha256 = "02r7y882sfj7m3yaj68v40f4065ajiig2b25v55svh13jars7c3n";
+       sha256 = "76b0a3b39223c0ad4bd9452cf16294aa18401c201b19a9fca8473a2d10f2270b";
        libraryHaskellDepends = [
          async base containers fgl stm transformers
        ];
@@ -128043,7 +128436,7 @@ self: {
      mkDerivation {
        pname = "tasty";
        version = "0.10.1.2";
-       sha256 = "0c5p86ljqa7id6rlkj4p4wy53m9p77f6nayr8ybhcqsjprpb5q4i";
+       sha256 = "91e0b26ebe5263069747d92b6bdc3937d5513c2797c849b369f1282ca941b730";
        libraryHaskellDepends = [
          ansi-terminal async base containers deepseq mtl
          optparse-applicative regex-tdfa-rc stm tagged time unbounded-delays
@@ -128060,7 +128453,7 @@ self: {
      mkDerivation {
        pname = "tasty-ant-xml";
        version = "1.0.1";
-       sha256 = "1wb9lm9rbk46g9cm2lpcrzh59zpcy270p824agg61bj1xb9jymsc";
+       sha256 = "4c572fd3ea41ae60de5344a00b8ef0ecfe54e0cfec5251597a86cc9553a569f1";
        libraryHaskellDepends = [
          base containers generic-deriving ghc-prim mtl stm tagged tasty
          transformers xml
@@ -128078,7 +128471,7 @@ self: {
      mkDerivation {
        pname = "tasty-golden";
        version = "2.3.0.1";
-       sha256 = "19jlfxhgrphsv7nfwsfil5ci2snlm9qsqwswnzn68pa3440zqiji";
+       sha256 = "5146fc0121435d64ecb75c73ac71aad46a1159a1d169eeecd91adefc607754a6";
        libraryHaskellDepends = [
          async base bytestring containers deepseq directory filepath mtl
          optparse-applicative process tagged tasty temporary-rc
@@ -128098,7 +128491,7 @@ self: {
      mkDerivation {
        pname = "tasty-hspec";
        version = "1.1";
-       sha256 = "15ly6jf4kgdc15k6b584d99j18xb41alas62gyakw5sf8y0y02i6";
+       sha256 = "260ae081474e173e957fc268455520aba320536a0495656609acbd499c349e96";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck random tasty tasty-quickcheck
          tasty-smallcheck
@@ -128115,7 +128508,7 @@ self: {
      mkDerivation {
        pname = "tasty-html";
        version = "0.4.1";
-       sha256 = "0a4j8w4gm8wr9pgmkkahadl5k2sd19za9f6x323f01v4ff455hwg";
+       sha256 = "8fc35288736407e08618ddb8a47e0a4d8b59685350cd59df4d99a3fa08479228";
        libraryHaskellDepends = [
          base blaze-html bytestring containers filepath generic-deriving mtl
          stm tagged tasty text transformers
@@ -128130,7 +128523,7 @@ self: {
      mkDerivation {
        pname = "tasty-hunit";
        version = "0.9.2";
-       sha256 = "08qnxaw34wfnzi9irs1jd4d0zczqm3k5ffkd4zwhkz0dflmgq7mf";
+       sha256 = "ae1efc2a750dfc09f9276d3a57e6a8f8b30f1a6932e81c53fcd67132b8ea1623";
        libraryHaskellDepends = [ base tasty ];
        homepage = "http://documentup.com/feuerbach/tasty";
        description = "HUnit support for the Tasty test framework";
@@ -128142,7 +128535,7 @@ self: {
      mkDerivation {
        pname = "tasty-hunit-adapter";
        version = "1.0";
-       sha256 = "0626islqqkncdma8790z2z47r8x90y9v7fj0p5nhkw6mpy6p0ifg";
+       sha256 = "cf45708dbfd5f0096db940bab39307a9a37cc8171fa483546dcc4e8ca98e4618";
        libraryHaskellDepends = [ base HUnit tasty tasty-hunit ];
        jailbreak = true;
        homepage = "https://github.com/jstolarek/tasty-hunit-adapter";
@@ -128161,7 +128554,7 @@ self: {
      mkDerivation {
        pname = "tasty-integrate";
        version = "0.0.1";
-       sha256 = "0zjbs7ax5nrxcg1njnrliavablda5rgjciq2h3nycvic8r1g9p7x";
+       sha256 = "fddcf442462c6ee6ed800247265f2eaad1a5b68a345b69c3633ddbd2d5d14b7e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -128189,7 +128582,7 @@ self: {
      mkDerivation {
        pname = "tasty-kat";
        version = "0.0.3";
-       sha256 = "14yvlpli6cv6bn3kh8mlfp4x1l6ns4fvmfv6hmj75cvxyzq029d7";
+       sha256 = "a72501f0f77db372648566bbba1dd1d6d0d0c975b42238875d663313e9a5db93";
        libraryHaskellDepends = [ base bytestring tasty ];
        testHaskellDepends = [
          base bytestring mtl tasty tasty-hunit tasty-quickcheck
@@ -128205,7 +128598,7 @@ self: {
      mkDerivation {
        pname = "tasty-program";
        version = "1.0.3";
-       sha256 = "18q6b8z5hh1jybr9i72ark95hwz8kg6zbh40ghgwsf6n3ijyfn8n";
+       sha256 = "1659e7651cd638cd1f7c80c0f5cd9be87358d2cc4a9c98f2f23240583e5a06a3";
        libraryHaskellDepends = [
          base deepseq directory filepath process tasty
        ];
@@ -128221,7 +128614,7 @@ self: {
      mkDerivation {
        pname = "tasty-quickcheck";
        version = "0.8.3.2";
-       sha256 = "1q1fghmsjrdl6jkcnajmsvw4d893m6cyhzpai9vvrhxy9vdy0l1v";
+       sha256 = "3b50e0db4ebec3bc778aea7ee899a923a146f8d6552acba634b465a92b7c2ee0";
        libraryHaskellDepends = [ base QuickCheck tagged tasty ];
        testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
        homepage = "http://documentup.com/feuerbach/tasty";
@@ -128236,7 +128629,7 @@ self: {
      mkDerivation {
        pname = "tasty-rerun";
        version = "1.1.4";
-       sha256 = "1c0mbjfgg0s2p1cmlyd8gnmmc6wk5ih5v9jr11bln54myyjywq8m";
+       sha256 = "1561eea5f795144b570859a65d602c931b56ab7da8795a59b84283f79c5c15b0";
        libraryHaskellDepends = [
          base containers mtl optparse-applicative reducers split stm tagged
          tasty transformers
@@ -128255,7 +128648,7 @@ self: {
      mkDerivation {
        pname = "tasty-silver";
        version = "3.1.7";
-       sha256 = "1mplisyhps9n3kw2w3fjanc14cr6vbyr4xdydq76za9dmx07kd3l";
+       sha256 = "74b47940af2da96f0e6ebe7592fdda2633129855d20d2ef81c36e90bbd8ef4d6";
        libraryHaskellDepends = [
          ansi-terminal async base bytestring containers deepseq directory
          filepath mtl optparse-applicative process process-extras regex-tdfa
@@ -128275,7 +128668,7 @@ self: {
      mkDerivation {
        pname = "tasty-smallcheck";
        version = "0.8.0.1";
-       sha256 = "0yckfbz8na8ccyw2911i3a4hd3fdncclk3ng5343hs5cylw6y4sm";
+       sha256 = "55136f38f5ac6838c828cf8e4919b3cd8d06891a318424b8670c298bfe729379";
        libraryHaskellDepends = [ async base smallcheck tagged tasty ];
        homepage = "http://documentup.com/feuerbach/tasty";
        description = "SmallCheck support for the Tasty test framework";
@@ -128289,7 +128682,7 @@ self: {
      mkDerivation {
        pname = "tasty-th";
        version = "0.1.3";
-       sha256 = "1fl5pagm9bdqvp7v54ilkr91m667rxw1jifwfdhrikr938aqrzx3";
+       sha256 = "a3ff8c151a29cf986173dc451978cfc7981a529e3492b2cfddb8ad549fba85ba";
        libraryHaskellDepends = [
          base language-haskell-extract tasty template-haskell
        ];
@@ -128303,7 +128696,7 @@ self: {
      mkDerivation {
        pname = "tau";
        version = "6.2831";
-       sha256 = "10vw3y3vimqpb22amhk7n0d0jni46j60iva1gqa28ky8lhqq8ssz";
+       sha256 = "5f6b8431a4c84f24147e41ed088c34245a091ab067c2aa845817d7b8871f7c83";
        libraryHaskellDepends = [ base ];
        description = "Tau, the ratio between any circle's circumference and radius";
        license = stdenv.lib.licenses.bsd3;
@@ -128317,7 +128710,7 @@ self: {
      mkDerivation {
        pname = "tbox";
        version = "0.1.0";
-       sha256 = "0qsc4mdiryrf3pqzzjvx57iz92xagp7692h312q2pm412zg6p1vy";
+       sha256 = "7e876bde1781d42bb008038a64ce7daa8bf4e3297dcbfff11d2efb1c5b254c63";
        libraryHaskellDepends = [
          array base binary cautious-file containers directory filepath
          IfElse monad-loops mtl random safe-failure stm-io-hooks
@@ -128336,7 +128729,7 @@ self: {
      mkDerivation {
        pname = "tcache-AWS";
        version = "0.0.1";
-       sha256 = "18hi8jvc117pxjhpb891hqlsbi4wvmd6nr3vwnqqr7rcw2dsmnwv";
+       sha256 = "9bdbaa9be02c9f8cb1e57b646b5add9cc4a5298621a175a1ecf784c0b64411a2";
        libraryHaskellDepends = [
          aws base bytestring conduit http-conduit network TCache text
        ];
@@ -128351,7 +128744,7 @@ self: {
      mkDerivation {
        pname = "tccli";
        version = "0.0.1";
-       sha256 = "0ljfn9dvyncl205mrnpic5j0633gnzka03gjc4dmccsqq0c1wjm7";
+       sha256 = "a74a1e18c05833561b61f20da0e6b76f0c036461f1da5c0b109459bf5bb24e52";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -128368,7 +128761,7 @@ self: {
      mkDerivation {
        pname = "tce-conf";
        version = "1.1";
-       sha256 = "1c3wr9rab7835dfg9qmxhprb2r21iyig1wkvwl49h7brhmhxzpnh";
+       sha256 = "d0dedf6185791d9808e57bf2f0a28f4164b1f285bde2f45c2b039da572ca7cb0";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers HUnit ];
        homepage = "http://hub.darcs.net/dino/tce-conf";
@@ -128381,7 +128774,7 @@ self: {
      mkDerivation {
        pname = "tconfig";
        version = "0.5.2";
-       sha256 = "05cnlbrdddbrdwlm8s7b76ydwrn49vaifdgaklfhv8rzz9dfpvbr";
+       sha256 = "79edeb5afa3fa30d1d9dea3517d54ec466debc39eb6854296f79b5d6f2a29615";
        libraryHaskellDepends = [ base containers ];
        description = "Simple text configuration file parser library";
        license = stdenv.lib.licenses.bsd3;
@@ -128392,7 +128785,7 @@ self: {
      mkDerivation {
        pname = "tcp";
        version = "0.0.2";
-       sha256 = "1wqkfnkd2di9a6h0br33fd7jaf1yqpaf7kjnpjwp52l4xv04ajlv";
+       sha256 = "9b4a45c0ee848a72b9bc56cee3d4c53e38254f7363e405a0512936d1a67513f3";
        libraryHaskellDepends = [ base containers old-time ];
        homepage = "http://www.cl.cam.ac.uk/~pes20/Netsem/";
        description = "A purely functional TCP implementation";
@@ -128410,7 +128803,7 @@ self: {
      mkDerivation {
        pname = "tdd-util";
        version = "0.3.0.1";
-       sha256 = "1d9avxpj2d90agd2pvc905j7jfa4rssl7bnrp2fmky4hfcbqa8ly";
+       sha256 = "9e2285177390f8599db8d9ae43b5ce443979640189ed2bda532035216fdf2ab5";
        libraryHaskellDepends = [
          base bytestring HUnit lens MonadCatchIO-transformers parallel-io
          process QuickCheck random system-posix-redirect tagged
@@ -128435,7 +128828,7 @@ self: {
      mkDerivation {
        pname = "tdoc";
        version = "0.4.6";
-       sha256 = "0gslj3z3lnh2wl7ljg8rza6kmmgfmgv94hgla75nblirvyka8v48";
+       sha256 = "886ca4a6df39d265cb51f44192f6abeed53a8dfa193d490fe5025a3afe90543f";
        libraryHaskellDepends = [
          base bytestring template-haskell transformers xhtml
        ];
@@ -128449,7 +128842,7 @@ self: {
      mkDerivation {
        pname = "teams";
        version = "0.0.2.3";
-       sha256 = "04jq7qdh0kr55a7a3gkjc8dgn130bp0kqh8qcmf284wz981vj9gd";
+       sha256 = "ed25b9034a9f13245c6518413cc15d6004fb1a6272bea18e2a254f001b3e5812";
        libraryHaskellDepends = [ base containers fgl graphviz ];
        description = "Graphical modeling tools for sequential teams";
        license = "GPL";
@@ -128461,7 +128854,7 @@ self: {
      mkDerivation {
        pname = "teeth";
        version = "0.1.0.0";
-       sha256 = "1hxii574qdxcbh10f4bgwyaxf83inqj9vrcwk7vkffv6pg349xcl";
+       sha256 = "94f544c6bb663b37f7999ce59d24b67120d795e76f1107025cac374c4e89b1c3";
        revision = "1";
        editedCabalFile = "84bb818fc4cb06bf91450e31e9a023926449a6157ce1e5de60649cda931db416";
        libraryHaskellDepends = [ base ];
@@ -128478,7 +128871,7 @@ self: {
      mkDerivation {
        pname = "telegram";
        version = "0.1.0.0";
-       sha256 = "1ci6606fx5cisb9yrjh0mkd549w2j3h1vzj3zm2zsl9gr7agvh4n";
+       sha256 = "96c0fdd4c92f51fd45fd43fe1de090822752daac00caecd3d29195ee0c3026b2";
        libraryHaskellDepends = [
          aeson base bytestring data-default http-conduit url utf8-string
        ];
@@ -128495,7 +128888,7 @@ self: {
      mkDerivation {
        pname = "tellbot";
        version = "0.5.1.4";
-       sha256 = "0mm7yyyxs3dvqsrs1xd4mq7byfn55rwri26k9xq3l4k9v7sxbgx8";
+       sha256 = "a8bfd5f5d969123a704fd38898792ec53abf0eaea4f5a0b3c6bb0dddbdf7a756";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -128512,7 +128905,7 @@ self: {
      mkDerivation {
        pname = "template";
        version = "0.2.0.10";
-       sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg";
+       sha256 = "8fd5a321b1c62f8ca5ed68c098e676917a5dac4d65809fceaed4b52c22b4ac82";
        libraryHaskellDepends = [ base mtl text ];
        description = "Simple string substitution";
        license = stdenv.lib.licenses.bsd3;
@@ -128523,7 +128916,7 @@ self: {
      mkDerivation {
        pname = "template-default";
        version = "0.1.1";
-       sha256 = "07b8j11v0247fwaf3mv72m7aaq3crbsyrxmxa352vn9h2g6l1jsd";
+       sha256 = "4dcb40cd1330d92dca50bdf6ecf5ca6c60a54e1567d7e114778708b04390681d";
        libraryHaskellDepends = [ base data-default template-haskell ];
        jailbreak = true;
        homepage = "https://github.com/haskell-pkg-janitors/template-default";
@@ -128537,7 +128930,7 @@ self: {
      mkDerivation {
        pname = "template-haskell";
        version = "2.10.0.0";
-       sha256 = "1y0dikbpy98n9g1rwb6swng86cch815x5ipj8kfjgpjgs0c3i2im";
+       sha256 = "358a3818d04fde27dd44f2c6d24b409031839ee5da2c9ec34b16257fd78c0df8";
        libraryHaskellDepends = [ base pretty ];
        description = "Support library for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -128548,7 +128941,7 @@ self: {
      mkDerivation {
        pname = "template-haskell-util";
        version = "0.1.1.0";
-       sha256 = "032gkb6pgd5l8ih48971ckiy7spvvr6fcmjx4ysiyyaj7hra174f";
+       sha256 = "8e9ca0323c52791fb5275d56e64cdefbeae3e364e124446044b4b477cd9a4f0c";
        libraryHaskellDepends = [
          base GenericPretty ghc-prim template-haskell
        ];
@@ -128566,7 +128959,7 @@ self: {
      mkDerivation {
        pname = "template-hsml";
        version = "0.2.0.3";
-       sha256 = "1lnw1rhxj66zn34p8ca2dx98326l40w8kj6nrxxhff0v30myxa1g";
+       sha256 = "2fa8ee2b181b38077bcfd6c8893820d48881526f423174c9b0df18d9610edcd2";
        libraryHaskellDepends = [
          base blaze-markup haskell-src-exts haskell-src-meta parsec
          template-haskell
@@ -128588,7 +128981,7 @@ self: {
      mkDerivation {
        pname = "templatepg";
        version = "0.2.6";
-       sha256 = "1i5ais5nlga3qv0w2fg5fdkfxikks9yg6fgwqx7agcrxp4wpqcb7";
+       sha256 = "67317c39b93db3a74ec7fc39f37cd273c6ee6673e539c1c1c6433d6a8b8eaac4";
        libraryHaskellDepends = [
          base binary bytestring haskell-src-meta mtl network old-locale
          parsec regex-compat regex-posix template-haskell time utf8-string
@@ -128606,7 +128999,7 @@ self: {
      mkDerivation {
        pname = "templater";
        version = "0.0.3.0";
-       sha256 = "0j00bb915j5d9a416gjqng08zcqfwbv24k2rqmb0mbmzz768viz4";
+       sha256 = "e4c78dccf9bfae0a56c5594c22f6e20eb38fc0b3583e13884aadc812d25a0048";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [
          base hspec hspec-attoparsec HUnit QuickCheck text
@@ -128624,7 +129017,7 @@ self: {
      mkDerivation {
        pname = "tempodb";
        version = "0.2.2.5";
-       sha256 = "00z02hl31ad497rvxjxx5khb20ql6irkgpdvsg5m7axq8bi3d5fl";
+       sha256 = "d49536e242b8ab53cbd3bbdd3773341403b1e02cbdcbbef349a4a9302814e003";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers HsOpenSSL HTTP
          http-streams io-streams mtl old-locale text time
@@ -128644,7 +129037,7 @@ self: {
      mkDerivation {
        pname = "temporal-csound";
        version = "0.4.3.1";
-       sha256 = "1c7difs3svrq1ka8bdf61vvg9b29baqd086l19a84f0734q5ph19";
+       sha256 = "29c05b3019073882540ad420d0b05a49acf4f60ec6b585d40c386f3db48bedb0";
        libraryHaskellDepends = [
          base csound-catalog csound-expression temporal-media
          temporal-music-notation temporal-music-notation-western
@@ -128660,7 +129053,7 @@ self: {
      mkDerivation {
        pname = "temporal-media";
        version = "0.6.0";
-       sha256 = "0mpi97lqh4mqv6flgcrwzbv8ihlxhxzf5z2xd87wxpzvcglx2n0n";
+       sha256 = "1658d1e963fbdfce0f6a5dfce27e879dc288f6fa3cb3479dd9b81288e949f156";
        libraryHaskellDepends = [ base Boolean ];
        homepage = "https://github.com/anton-k/temporal-media";
        description = "data types for temporal media";
@@ -128672,7 +129065,7 @@ self: {
      mkDerivation {
        pname = "temporal-music-notation";
        version = "0.4.1";
-       sha256 = "09mx6bfz0lxyy7z0srl4372qv42fyymc5pqxkyxj7mhf872y4biv";
+       sha256 = "3b2ee2c5410ed623bb9f1ddfc2aaf74e908dc51984660dfef1be53f0dd32bd26";
        libraryHaskellDepends = [
          base data-default temporal-media vector
        ];
@@ -128688,7 +129081,7 @@ self: {
      mkDerivation {
        pname = "temporal-music-notation-demo";
        version = "0.4.0";
-       sha256 = "1jd9yd9ay9xmlmpm4wnkpd0ic69xlg8igqbagrycc6kv4zf1p20z";
+       sha256 = "1f881bdc277b1ac67c7e6ae117d1a33d191641bbd372526fa5b527af52f3a9c9";
        libraryHaskellDepends = [
          base binary data-default HCodecs temporal-music-notation
        ];
@@ -128702,7 +129095,7 @@ self: {
      mkDerivation {
        pname = "temporal-music-notation-western";
        version = "0.4.0";
-       sha256 = "012pv4l5r3ijnyid7b8h1lpifjs7cf3k4a13f6773r93qfgvxpkc";
+       sha256 = "6cdebe9fc323e5718e712328328763474b172f0d10add3a2b7328e5c28d95704";
        libraryHaskellDepends = [ base temporal-music-notation ];
        homepage = "https://github.com/anton-k/temporal-music-notation-western";
        description = "western music notation";
@@ -128716,7 +129109,7 @@ self: {
      mkDerivation {
        pname = "temporary";
        version = "1.2.0.3";
-       sha256 = "0is67bmsjmbbw6wymhis8wyq9gax3sszm573p5719fx2c9z9r24a";
+       sha256 = "8a889c7e62a2bb144eb9e394fab51e5dbd843d473ac2eab9e16b55a9eb3a4647";
        libraryHaskellDepends = [
          base directory exceptions filepath transformers unix
        ];
@@ -128732,7 +129125,7 @@ self: {
      mkDerivation {
        pname = "temporary-rc";
        version = "1.2.0.3";
-       sha256 = "1nqih0qks439k3pr5kmbbc8rjdw730slrxlflqb27fbxbzb8skqs";
+       sha256 = "1a4f8dd65f7db92316a68ef64c3518873799115babce92ef9869103d318011db";
        libraryHaskellDepends = [
          base directory exceptions filepath transformers unix
        ];
@@ -128748,7 +129141,7 @@ self: {
      mkDerivation {
        pname = "temporary-resourcet";
        version = "0.1.0.0";
-       sha256 = "1nxl8ivp5sd250w7pwm4f1kas5g1ikij3z39px717ys1xvk1r81h";
+       sha256 = "30a01ce6ee41fb134ebf69fc21e38ce115ad6670a4f27b3828a2e9727744b4db";
        libraryHaskellDepends = [
          base directory exceptions filepath resourcet transformers unix
        ];
@@ -128767,7 +129160,7 @@ self: {
      mkDerivation {
        pname = "tempus";
        version = "0.1.0";
-       sha256 = "0hv5b09vly9zakjfgi4bnjx503ny334dhg13g5ma85rp3dbsjvsn";
+       sha256 = "566fa9571b3717a46a79233cd8c818de0e50bab48bc4e7e4543f79ba13586543";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -128786,7 +129179,7 @@ self: {
      mkDerivation {
        pname = "tensor";
        version = "0.3.0.1";
-       sha256 = "03m612xvx3p44za0g291xir89lcgm4pk885lpy3wshp0987ij1nf";
+       sha256 = "ce06190f4ae042cd87bfb420342fa98fd18472ec218907d427e48ebebb08a60e";
        libraryHaskellDepends = [ base ghc-prim random vector ];
        testHaskellDepends = [ base QuickCheck random ];
        homepage = "http://noaxiom.org/tensor";
@@ -128802,7 +129195,7 @@ self: {
      mkDerivation {
        pname = "term-rewriting";
        version = "0.2";
-       sha256 = "07axcgr8llrj8icaysi1awq29p8vgpakvv56shvjrcgjf9ar0m11";
+       sha256 = "2154905572f2b12c37d4a6ec3dd57d1bdd243057216aaf584432538af2635d1d";
        libraryHaskellDepends = [
          ansi-wl-pprint array base containers mtl multiset parsec
          union-find-array
@@ -128820,7 +129213,7 @@ self: {
      mkDerivation {
        pname = "termbox-bindings";
        version = "0.1.0.5";
-       sha256 = "0hv72kkpx6narykfbf6m59gq4l8gym6fm52n1zzazac1802zw0dv";
+       sha256 = "bb01fe054081a9affe0f5694ea4cf50f51825f2ad5b8e5a6cfca9a7ee7146743";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -128839,7 +129232,7 @@ self: {
      mkDerivation {
        pname = "terminal-progress-bar";
        version = "0.0.1.4";
-       sha256 = "0ldvii23ks446xrd27aklh8s8pn1yi3dzhhzl05gipjqbhq3lsx3";
+       sha256 = "a36b3a305c58def80aa01fc2df46f4c15ea411a4531dd1723784e839448cbb51";
        libraryHaskellDepends = [
          base base-unicode-symbols stm stm-chans
        ];
@@ -128856,7 +129249,7 @@ self: {
      mkDerivation {
        pname = "terminal-size";
        version = "0.3.2";
-       sha256 = "0vm6xrm5j60h01lgn7srhsx2698aq6k5jkbc84bi5zh5w63fsdyp";
+       sha256 = "d737ed86e105fe1217416c4d59a6c10a2523ba86591ffb68001018596aeea66e";
        libraryHaskellDepends = [ base ];
        description = "Get terminal window height and width";
        license = stdenv.lib.licenses.bsd3;
@@ -128867,7 +129260,7 @@ self: {
      mkDerivation {
        pname = "termination-combinators";
        version = "0.1";
-       sha256 = "1k32s5vzkxnsawj8vdscyfc96hk0s97zpj1mgw1hk93hwcrxn9wh";
+       sha256 = "9027db33e370a409037f35c8fb4fd260429398f34cb78d2457daf6f977d162cc";
        libraryHaskellDepends = [ base containers contravariant ];
        jailbreak = true;
        homepage = "http://www.github.com/batterseapower/termination-combinators";
@@ -128880,7 +129273,7 @@ self: {
      mkDerivation {
        pname = "terminfo";
        version = "0.4.0.1";
-       sha256 = "1qsspg1kqk68ja217fn3anv1j8arr1pwzzb5m74zpxpjaqb02153";
+       sha256 = "a304011656f2f6fbc9a965fdcf6fc8592119b655c3ba138492c84c3cc3bb5ae3";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ncurses ];
        homepage = "https://github.com/judah/terminfo";
@@ -128895,7 +129288,7 @@ self: {
      mkDerivation {
        pname = "terminfo-hs";
        version = "0.1.0.1";
-       sha256 = "1bbf37c34l8q12hy9yhw1jcjzcb1g87r850pxhwyzsikwhf75g81";
+       sha256 = "01bd721ce433eaef39ec1714940f7a61b12f990c1cfae4a108185132d8196ead";
        libraryHaskellDepends = [
          attoparsec base bytestring containers directory errors filepath
        ];
@@ -128909,7 +129302,7 @@ self: {
      mkDerivation {
        pname = "terrahs";
        version = "0.9";
-       sha256 = "0gciz8nvn7x1lclzihvwy8v1c53p6frb1q32ckpmsqw7xiasqlhb";
+       sha256 = "0b52ac55ec87635def6462e0b0b23377141636f27cc3f829a3a11fbb2dfa913d";
        libraryHaskellDepends = [ base haskell98 old-time ];
        librarySystemDepends = [ terralib4c translib ];
        jailbreak = true;
@@ -128925,7 +129318,7 @@ self: {
      mkDerivation {
        pname = "tersmu";
        version = "0.2";
-       sha256 = "064s43a7iq2rr643x4ahibgjanyq3v5h6qcgvc68j1dycq56snnl";
+       sha256 = "d45a6d0a66be05890cdb8f6103cb1ed85b25df8a50913e88c959e078d4209a18";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -128944,7 +129337,7 @@ self: {
      mkDerivation {
        pname = "test-framework";
        version = "0.8.1.1";
-       sha256 = "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq";
+       sha256 = "7883626a5aebb1df327bf26dbd382208946250a79f9cc3bf9a9eb0b0767bb273";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128963,7 +129356,7 @@ self: {
      mkDerivation {
        pname = "test-framework-doctest";
        version = "0.2.1.2";
-       sha256 = "01k0kcsbc41zaric5zgnhfnrp9dd19brv4d3p22vly7a7bmn6n0q";
+       sha256 = "185863eb3aea78ba85b8a3919d570aada59bad83f6fdc262563f10b6349b6006";
        libraryHaskellDepends = [
          base doctest test-framework test-framework-hunit
        ];
@@ -128981,7 +129374,7 @@ self: {
      mkDerivation {
        pname = "test-framework-golden";
        version = "1.1.3.3";
-       sha256 = "1sfgr91zn7iwgj1p1s3298mswv29rbxz4x4086r8mav7prd0ww36";
+       sha256 = "66700e5abe67ab8ab2418074f2fbca496cae2b4a62e870837c3c1efb43cacfe9";
        libraryHaskellDepends = [
          base bytestring filepath mtl process temporary test-framework
        ];
@@ -128996,7 +129389,7 @@ self: {
      mkDerivation {
        pname = "test-framework-hunit";
        version = "0.3.0.1";
-       sha256 = "1h0h55kf6ff25nbfx1mhliwyknc0glwv3zi78wpzllbjbs7gvyfk";
+       sha256 = "d3f9fd8e5e7251fa2f4727feb1397d80d9e979a4b086ee962dc239e3662910c0";
        libraryHaskellDepends = [
          base extensible-exceptions HUnit test-framework
        ];
@@ -129010,7 +129403,7 @@ self: {
      mkDerivation {
        pname = "test-framework-program";
        version = "1.1";
-       sha256 = "10p6xxxbfx3yr71wdbvk7qhm3xkxq3a1dv4hgcirzynsdfk36s3z";
+       sha256 = "7f6833a66bdafa9f237b90ec16d4c07df651213e73afc6c3c97e74b77aefe682";
        libraryHaskellDepends = [ base directory process test-framework ];
        description = "Test framework support for running simple test programs";
        license = stdenv.lib.licenses.bsd3;
@@ -129023,7 +129416,7 @@ self: {
      mkDerivation {
        pname = "test-framework-quickcheck";
        version = "0.3.0";
-       sha256 = "0g8sh3x3mhns03svccgbdbw8crzpzmahp1hr1fs6ag66fqr8p9mv";
+       sha256 = "bba68b3276c63c65b40b19860b55fdf76786f86aeb31b6f500dac23afa801a3d";
        libraryHaskellDepends = [
          base deepseq extensible-exceptions QuickCheck random test-framework
        ];
@@ -129041,7 +129434,7 @@ self: {
      mkDerivation {
        pname = "test-framework-quickcheck2";
        version = "0.3.0.3";
-       sha256 = "12p1zwrsz35r3j5gzbvixz9z1h5643rhihf5gqznmc991krwd5nc";
+       sha256 = "cc96c6f30c29b16a3f7ec5c108f320a6c0f0d3ef71afff8a1cb98caf33ffe18a";
        revision = "1";
        editedCabalFile = "14fdf07c345e9460882b975851739afc2cf62f0c9930c38d0fee5b0943351638";
        libraryHaskellDepends = [
@@ -129060,7 +129453,7 @@ self: {
      mkDerivation {
        pname = "test-framework-sandbox";
        version = "0.1.0";
-       sha256 = "0bfj0l189dh52dipdnxcqllk2h6g4dwcwcw5pll2my3n7r78pn7v";
+       sha256 = "fbd88b4e3e76f82a28bd8533ce7823cf403129c5acdb76631305b6840205d22d";
        libraryHaskellDepends = [
          ansi-terminal base lifted-base mtl temporary test-framework
          test-sandbox transformers
@@ -129081,7 +129474,7 @@ self: {
      mkDerivation {
        pname = "test-framework-skip";
        version = "1.0";
-       sha256 = "1avs36j6a846a3qiy0f23qnld1swgpngidb3098dcib2rbw4p3n9";
+       sha256 = "c98e4bf8ca6245d6500263b5f8ec7d5c87462d1ec2011ff150862065a4197aab";
        libraryHaskellDepends = [ base test-framework ];
        testHaskellDepends = [
          base HUnit QuickCheck smallcheck test-framework
@@ -129098,7 +129491,7 @@ self: {
      mkDerivation {
        pname = "test-framework-smallcheck";
        version = "0.2";
-       sha256 = "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0";
+       sha256 = "6081c4f35967b0d0cb92ac09a915fa9e2da01c401266b20ce18793fbc2bceff6";
        libraryHaskellDepends = [
          base smallcheck test-framework transformers
        ];
@@ -129112,7 +129505,7 @@ self: {
      mkDerivation {
        pname = "test-framework-testing-feat";
        version = "0.1.0.1";
-       sha256 = "0pf07psqc4ihg0wrqqm127hd9qjbllmqw9lzf1ridg6r3xs63994";
+       sha256 = "24a561741fd9bc1673709f268e2ba54be2d4e011a1629c3978301286f53dc05d";
        libraryHaskellDepends = [ base test-framework testing-feat ];
        testHaskellDepends = [ base test-framework testing-feat ];
        homepage = "http://github.com/jfischoff/test-framework-testing-feat";
@@ -129127,7 +129520,7 @@ self: {
      mkDerivation {
        pname = "test-framework-th";
        version = "0.2.4";
-       sha256 = "12lw7yj02jb9s0i7rb98jjam43j2h0gzmnbj9zi933fx7sg0sy4b";
+       sha256 = "8b780d9e3edd8d91e24f72d9fa1f80420e52959428ad7c22d0694901a43f9c8a";
        libraryHaskellDepends = [
          base haskell-src-exts language-haskell-extract regex-posix
          template-haskell test-framework
@@ -129144,7 +129537,7 @@ self: {
      mkDerivation {
        pname = "test-framework-th-prime";
        version = "0.0.8";
-       sha256 = "0gb7bpdxzsd8fnh4ck4p1ks7nxrk7fsw97x90d4zjds5hnw3hchr";
+       sha256 = "193238b8854537f94903a99fc4b53b33777bf40c974c46a075a8e9dfdb5d673d";
        libraryHaskellDepends = [
          base cpphs haskell-src-exts template-haskell test-framework
        ];
@@ -129157,7 +129550,7 @@ self: {
      mkDerivation {
        pname = "test-invariant";
        version = "0.4.5.0";
-       sha256 = "0ck3kk7pmj1679ddmrysx5j3y27619ar1b2pny45mskz3g6vyvrh";
+       sha256 = "306fbfcd1b7fea5a88b757ac90550ae6083f64e9dae7da5a3a26c87acf9c6332";
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        homepage = "https://github.com/knupfer/test-invariant";
@@ -129170,7 +129563,7 @@ self: {
      mkDerivation {
        pname = "test-pkg";
        version = "0.3.0.0";
-       sha256 = "0fncybd3sxrbnrd4l1hri18rhfg9h0fm3k4305iwh4l65fbwg2n8";
+       sha256 = "c88ac7972b8612c8630183cc511d80e93998518819064a5ab62b773ddaf2cc3a";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Just tests Hackage";
@@ -129188,7 +129581,7 @@ self: {
      mkDerivation {
        pname = "test-sandbox";
        version = "0.1.5";
-       sha256 = "1cknqblzf2wqq46casmfq00lx4zh3y9g07bqsbchxbq4xmd000js";
+       sha256 = "5a02005aed04af0ed9d2781df0921ff0934e01c0ae6ac50cc1980bf7e9c276b2";
        libraryHaskellDepends = [
          base bytestring cereal containers data-default directory filepath
          lifted-base monad-control monad-loops mtl network process random
@@ -129215,7 +129608,7 @@ self: {
      mkDerivation {
        pname = "test-sandbox-compose";
        version = "0.1.3";
-       sha256 = "1yqh5b3gzmwqf0wj491pmkvbn9jzpg36bh427vkl1w6yj5c4ha7x";
+       sha256 = "fd28485891def040e73e82c065c6bb5f26bbf6ac372422397098d7ffc62a10fb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129241,7 +129634,7 @@ self: {
      mkDerivation {
        pname = "test-sandbox-hunit";
        version = "0.1.1";
-       sha256 = "1pdxwbs3508s9j1409bvpjipbqz8ymch633r6gyrirmr1r1zp3dy";
+       sha256 = "be8dfb430eb9e698fd33790c0359f5e8e375a3bc7b2540824c1a8132f4e2bddd";
        libraryHaskellDepends = [ base HUnit lifted-base test-sandbox ];
        homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "HUnit convenience functions for use with test-sandbox";
@@ -129255,7 +129648,7 @@ self: {
      mkDerivation {
        pname = "test-sandbox-quickcheck";
        version = "0.1.0";
-       sha256 = "0gijq6qwcljq2kvh08nffb6d9qblwpj4hw2jlxidvxy1hzbsgiyi";
+       sha256 = "d1c7a7d787c1f7dd62a7527048e4e574e1d4cc72ce2200f7145852c6b1c1323e";
        libraryHaskellDepends = [
          base mtl QuickCheck random test-sandbox transformers
        ];
@@ -129269,7 +129662,7 @@ self: {
      mkDerivation {
        pname = "test-shouldbe";
        version = "0.2.1.1";
-       sha256 = "0wagfhljym2mnwpxld8dcf4qcdbp3d9liyf9mcigd4kiy5sdhfx4";
+       sha256 = "a43bd874f17192f622abc9f948531b77358689630d35da2fb755542f29744f71";
        libraryHaskellDepends = [ base HUnit ];
        testHaskellDepends = [ base hspec hspec-discover silently ];
        jailbreak = true;
@@ -129284,7 +129677,7 @@ self: {
      mkDerivation {
        pname = "test-simple";
        version = "0.1.7";
-       sha256 = "1p9y15vv23j1qn3shxl2wqb8skh0n53vrb39qv1nvff9bclxldka";
+       sha256 = "6a36da295bc9b96dc3c669acbc47b1004e8d16e68276a887c5410eb177093edd";
        libraryHaskellDepends = [
          base mtl QuickCheck state-plus template-haskell
        ];
@@ -129301,7 +129694,7 @@ self: {
      mkDerivation {
        pname = "testPkg";
        version = "0.0";
-       sha256 = "0lppzyh0qxqry8a2d1yqrin51kizw2hl937pxg2a6pi34grlhdd0";
+       sha256 = "a03548f323235ea3c4ebf78c44a1e03fce506cccd8872614f219770ca0fff752";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -129317,7 +129710,7 @@ self: {
      mkDerivation {
        pname = "testing-feat";
        version = "0.4.0.2";
-       sha256 = "15gi6w7p4alnih9grklhhr8338y1aal07admbz4n2f724hnhyb2j";
+       sha256 = "522c0f2d24e23861c95fb5a903a852c1a331508690cefc128c962a720f37f195";
        revision = "1";
        editedCabalFile = "0168dde1e9ac0e7a1f80a33c12a6c5d2b7c5e59e4dcd060ffb8d82f100c4dd3f";
        libraryHaskellDepends = [
@@ -129332,7 +129725,7 @@ self: {
      mkDerivation {
        pname = "testing-type-modifiers";
        version = "0.1.0.1";
-       sha256 = "1wh2n95n39ivv6kbqn42vbzrj8zagsmk6f2al2qj40bg5kgdl2q5";
+       sha256 = "050bdade2c6f0122b1a04a3833ab7eea2399ffda8258bca6d93ba6614bb202f2";
        libraryHaskellDepends = [ base ];
        description = "Data type modifiers for property based testing";
        license = stdenv.lib.licenses.publicDomain;
@@ -129345,7 +129738,7 @@ self: {
      mkDerivation {
        pname = "testloop";
        version = "0.1.1.0";
-       sha256 = "1bygfdcnd0y60jhyp34zkss2cxr3s2jq6ysxm0w9c4vhl361ib7z";
+       sha256 = "ffac18cca070139638a85d7b83a5d0237726b49e9f8ceba104c683665973cfaf";
        libraryHaskellDepends = [
          base Cabal directory filepath fsnotify hint mtl system-filepath
          time unix
@@ -129363,7 +129756,7 @@ self: {
      mkDerivation {
        pname = "testpack";
        version = "2.1.3.0";
-       sha256 = "1rq5d64d7j3gpgbfxmfr4xmzizjy0ricw5ghrakv8gzvxmi2bn4p";
+       sha256 = "97d82562edfb3fb4a7caf015ce62065efef86b27d9d5eed6bb6fc8d3886905e7";
        libraryHaskellDepends = [
          base containers HUnit mtl QuickCheck random
        ];
@@ -129378,7 +129771,7 @@ self: {
      mkDerivation {
        pname = "testpattern";
        version = "0.1";
-       sha256 = "0a0kw5546z5jydk6dq2p16p2kpwv7fnmy1m907m3x6n580i1vh3l";
+       sha256 = "74c01d2240c59a3eea01a9065fad3b9bdf29ae0957e06666f3b27c434ae11328";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base filepath gtk ];
@@ -129394,7 +129787,7 @@ self: {
      mkDerivation {
        pname = "testrunner";
        version = "0.9.1";
-       sha256 = "1887g3wn5mnlbxj4vbzv0zm3gwaj9ycr9sk7hy27qbb2x7c30iaw";
+       sha256 = "5c4530d8e9622d7c848767ea94994f52f137ea07fbaf4d645fd4d662f97807a1";
        libraryHaskellDepends = [
          base HUnit QuickCheck random regex-compat stm
        ];
@@ -129408,7 +129801,7 @@ self: {
      mkDerivation {
        pname = "tetris";
        version = "0.27178";
-       sha256 = "10wlw1frkaa3j8mb8lxgpvxcx87m8wdpca3mli9c5kirdm51vjgw";
+       sha256 = "fcc91d4a6d39cec252a47528761b47f5a0cefabeaf53b42a9243a9995de09483";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT random ];
@@ -129423,7 +129816,7 @@ self: {
      mkDerivation {
        pname = "tex2txt";
        version = "0.1.0.0";
-       sha256 = "1q41kphll7xhbccwyvlsvk5vxisig23ipmcqf7v9qc3rx1hb0p0w";
+       sha256 = "1c5cb060e879309cf67198d51b877851c7becbdc9a6ecf195bb01f4ae19d81e0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers deepseq parsec ];
@@ -129443,7 +129836,7 @@ self: {
      mkDerivation {
        pname = "texmath";
        version = "0.8.2.2";
-       sha256 = "1wy2rr18wsn9q06arrxibahpsnr8bqrzsimmpgwji6nxpzc95x51";
+       sha256 = "a1f492d8bfdd9a28f9bbb546fd335e285b7da15ab1e7ac0cc0c96a8e42cec2f3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129467,7 +129860,7 @@ self: {
      mkDerivation {
        pname = "texrunner";
        version = "0.0.1.0";
-       sha256 = "1p7q9fz6f56wcm9q0xap17xc2r9a01qf8gdlrbdgryv25fp0lhcs";
+       sha256 = "9a410aae2b62fbfcdacab43de470002a65c1fa095775805365dc1467be4bf8dc";
        libraryHaskellDepends = [
          attoparsec base bytestring directory filepath io-streams mtl
          process temporary
@@ -129489,7 +129882,7 @@ self: {
      mkDerivation {
        pname = "text";
        version = "1.2.1.3";
-       sha256 = "0gzqx5cpkdhshbz9xss51mpyq23pnf8dwjz4h3irbv2ryaa4qdlq";
+       sha256 = "98364c94f259ec95e380e44bde90b37708ec6f0d45eb9efe821ab67959e9f83f";
        libraryHaskellDepends = [
          array base binary bytestring deepseq ghc-prim integer-gmp
        ];
@@ -129510,7 +129903,7 @@ self: {
      mkDerivation {
        pname = "text-and-plots";
        version = "0.2.1.0";
-       sha256 = "0fjwjdr6pbqfzlyi75apfclsq07qld4yj4h574pgyc22lnk2z9z8";
+       sha256 = "e8a72fa6a54230ff2e390512e949a3f800ac29735795133dfd0eaf6b72935c3a";
        libraryHaskellDepends = [
          base blaze-html bytestring containers markdown text
          unordered-containers
@@ -129525,7 +129918,7 @@ self: {
      mkDerivation {
        pname = "text-binary";
        version = "0.2.1";
-       sha256 = "00paqwnngd9l88zhah9wqg4wr41mrs30xm49w8xq337yxcvz48nz";
+       sha256 = "df22f237ebfe8c813be289d40e86ce3590ccc9c33c41053f4234b5672dc7ea02";
        libraryHaskellDepends = [ base binary text ];
        homepage = "https://github.com/kawu/text-binary";
        description = "Binary instances for text types";
@@ -129539,7 +129932,7 @@ self: {
      mkDerivation {
        pname = "text-format";
        version = "0.3.1.1";
-       sha256 = "02zfgzfjvkaxbma1h2gr95h10c8q9gyaadag41q579j68iv15qbd";
+       sha256 = "6de112764446a65370204f35a5fc4b1831106049f90918545d5dcd2ddd7fee0b";
        libraryHaskellDepends = [
          array base double-conversion ghc-prim integer-gmp old-locale text
          time transformers
@@ -129554,7 +129947,7 @@ self: {
      mkDerivation {
        pname = "text-format-simple";
        version = "1.1.0";
-       sha256 = "0iqs3v03kirjczlp7jpqdqzrfvqsbm260g110abkbpbxws3szqhk";
+       sha256 = "13e2af87e67ddd359702213c60445d1a6f973f6ef8ca73e96732c739c01e1a47";
        libraryHaskellDepends = [ base MissingH ];
        description = "Simple text formatting library";
        license = stdenv.lib.licenses.bsd3;
@@ -129568,7 +129961,7 @@ self: {
      mkDerivation {
        pname = "text-icu";
        version = "0.7.0.1";
-       sha256 = "0y3z5jda7v2iyll2148ivxfd2yhp27d3ryxrspp0cdq394klqxp2";
+       sha256 = "e2764c2749033706eed5b9fb3cda11177ad15cdf11912028f551eca39a2c7f78";
        libraryHaskellDepends = [ base bytestring deepseq text ];
        librarySystemDepends = [ icu ];
        testHaskellDepends = [
@@ -129588,7 +129981,7 @@ self: {
      mkDerivation {
        pname = "text-icu-translit";
        version = "0.1.0.7";
-       sha256 = "1qfmkydayqj1knlvfs1l6nq42a4y81k5z2g87lvzafrylyjjd002";
+       sha256 = "028026a5a73e3bf5373de8895f66409e2841b0353468b7a99d4162af9a9fd5e1";
        libraryHaskellDepends = [ base text ];
        librarySystemDepends = [ icu ];
        testHaskellDepends = [
@@ -129606,7 +129999,7 @@ self: {
      mkDerivation {
        pname = "text-json-qq";
        version = "0.4.1";
-       sha256 = "137m593yz5gl6jj7mi1f9kjsgi1np4n6707aqp94iw0qzxj8hdhg";
+       sha256 = "0f368864ff18f048d2c5ea80632cb936c4a7e54c2ec47aa434f495ef472af58c";
        libraryHaskellDepends = [
          base haskell-src-meta json json-qq parsec template-haskell
        ];
@@ -129623,7 +130016,7 @@ self: {
      mkDerivation {
        pname = "text-latin1";
        version = "0.3";
-       sha256 = "1cs09qwkcljbnckakzr1wnpclkzjb0in3nnz6fpjyl4mxp5bqaw9";
+       sha256 = "892bbccaed95502faf33dfda612358f24fcaaee521ffa926b34b5236394e40b3";
        libraryHaskellDepends = [
          base bytestring case-insensitive data-checked hashable text
        ];
@@ -129640,7 +130033,7 @@ self: {
      mkDerivation {
        pname = "text-ldap";
        version = "0.1.1.6";
-       sha256 = "12r0bcj83qfaaj6q1sw21dh3y4c82rxas1s5nzyn650pfnpvv2mq";
+       sha256 = "b88abdaf75171463fdb74507ad7a1688113f600b82eb808d54cae181245b208b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129660,7 +130053,7 @@ self: {
      mkDerivation {
        pname = "text-locale-encoding";
        version = "0.1.0.2";
-       sha256 = "1ls41s45qwrmmac8k1gryvxbhhczqy2wanwanw48m7xnbv52p9fg";
+       sha256 = "cfa52bca5eb69f8a08b78a5bc585c79f41b8faf6f9858998aa35735c880e44d3";
        libraryHaskellDepends = [ base bytestring bytestring-handle text ];
        homepage = "https://github.com/exbb2/text-locale-encoding";
        description = "Encode and decode Text to/from ByteString using TextEncoding";
@@ -129672,7 +130065,7 @@ self: {
      mkDerivation {
        pname = "text-manipulate";
        version = "0.2.0.1";
-       sha256 = "0bwxyjj3ll45srxhsp2ihikgqglvjc6m02ixr8xpvyqwkcfwgsg0";
+       sha256 = "e0e9c71d9b1cfb7d3bca3d0a500d939b3efc6684515c0d7bd685503aa4f49d2f";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base tasty tasty-hunit text ];
        homepage = "https://github.com/brendanhay/text-manipulate";
@@ -129687,7 +130080,7 @@ self: {
      mkDerivation {
        pname = "text-normal";
        version = "0.2.1.0";
-       sha256 = "10cxvn450q2fdjxly72m20x2yikkvwx3dvyqs7b992c2dr1zc1iv";
+       sha256 = "3b06f6436e828994d6d1d8ef363adf73462f3a10551c4fbb6c4e605088dd9d81";
        libraryHaskellDepends = [ base deepseq text text-icu ];
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-instances
@@ -129703,7 +130096,7 @@ self: {
      mkDerivation {
        pname = "text-position";
        version = "0.1.0.0";
-       sha256 = "0cdi5kwpwvzmadhgkgnwax4jhllm6gjrsg1y3f3fp12x28nml1g8";
+       sha256 = "e8055a2d125d84eb861b3e3c9de5339552284957dcbef96053f56f7ef92cb131";
        revision = "1";
        editedCabalFile = "45fd633a94e0a13dbaeeb1791725a72d185f54027569e967f8006f07df67d586";
        libraryHaskellDepends = [ base regex-applicative ];
@@ -129721,7 +130114,7 @@ self: {
      mkDerivation {
        pname = "text-printer";
        version = "0.4";
-       sha256 = "0jcixgxln4c12nzmj50g3mmslki6f083xjrm9hr6hqvqzffxny5q";
+       sha256 = "b878db9dfb786368324c35cb3e1070264eaa6b1d0f1459bf1581114bfbeb9149";
        libraryHaskellDepends = [
          base bytestring pretty semigroups text text-latin1
        ];
@@ -129740,7 +130133,7 @@ self: {
      mkDerivation {
        pname = "text-regex-replace";
        version = "0.1.1.0";
-       sha256 = "0p8xjw6srlb23giqrb3qay1hd1jq3gd9im0v7fnr8yifc0ri6piz";
+       sha256 = "3f5e1333602e7a94ad3b1bd498da1b588606835778ac8ce31b62d1ac0d971d5d";
        libraryHaskellDepends = [ attoparsec base text text-icu ];
        testHaskellDepends = [
          base hspec QuickCheck smallcheck text text-icu
@@ -129755,7 +130148,7 @@ self: {
      mkDerivation {
        pname = "text-register-machine";
        version = "0.4.0";
-       sha256 = "0g0iihfin5vjfk69r7jjw4vs3l1k3f0kkg3bbc4xqm274vd72bph";
+       sha256 = "f02e71da264754dc095b6bbc39811b33d0a137e1529e9ccc7472171b1d8c113c";
        libraryHaskellDepends = [ base containers mtl vector ];
        jailbreak = true;
        homepage = "https://github.com/acfoltzer/text-register-machine";
@@ -129769,7 +130162,7 @@ self: {
      mkDerivation {
        pname = "text-render";
        version = "0.1.0.2";
-       sha256 = "17fgnddp4cfh9l6vlwyq4fnrws56gxxgdvq06fnvz0x8rd0c72wp";
+       sha256 = "978bc340cba883bfad3300eff67a7fa6689ead23d873ba0d4dd031725bb3cf9d";
        libraryHaskellDepends = [ base classy-prelude mtl parsec text ];
        homepage = "http://github.com/thinkpad20/text-render";
        description = "A type class for rendering objects as text, pretty-printing, etc";
@@ -129786,7 +130179,7 @@ self: {
      mkDerivation {
        pname = "text-show";
        version = "2";
-       sha256 = "152nccaz9m337rrv7i6z1vjj73xdcp410fgxcs8imhr125fs6r2z";
+       sha256 = "5f64a35d1121c31a9166fd3910c865ad8f23e50edfc4b3733e63d4f415635694";
        libraryHaskellDepends = [
          array base base-compat bytestring bytestring-builder containers
          generic-deriving ghc-prim integer-gmp nats semigroups tagged
@@ -129814,7 +130207,7 @@ self: {
      mkDerivation {
        pname = "text-show-instances";
        version = "2.0.1";
-       sha256 = "1k5lwkfg8vrrmhm0xir1shplygvh2xki2dw13z56xrkkm8ygv3cx";
+       sha256 = "9d8dfd3caa73e66eca1f8137116717703f4f2fd421c70e2aac396ff4dce4b4cc";
        libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          haskeline hoopl hpc old-locale old-time pretty random semigroups
@@ -129838,7 +130231,7 @@ self: {
      mkDerivation {
        pname = "text-stream-decode";
        version = "0.1.0.5";
-       sha256 = "1s2lncs5k8rswg1bpf4vz5p1maj46bsgf7ar4lzcla9bf3f4bppy";
+       sha256 = "fede45dc702b29ca3e25591df7f43244aa1a6ef99bb8bbc2e33aa35934b354e8";
        revision = "1";
        editedCabalFile = "d4ea8ff401a3ccbd8a6ce2918385bac4859150047ce9b7f752ff5575db71e9fd";
        libraryHaskellDepends = [ base bytestring text ];
@@ -129855,7 +130248,7 @@ self: {
      mkDerivation {
        pname = "text-utf7";
        version = "0.1.0.0";
-       sha256 = "0kcbw9gb8mwvc4p10m0g5gplgi38qlnnc0plaw22l1qdkx0k8ilv";
+       sha256 = "9b4634419f0d072a0457f402662dc568c447ef2b0f54102e619b57b45ee28b4d";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [
          base bytestring quickcheck-instances tasty tasty-hunit
@@ -129873,7 +130266,7 @@ self: {
      mkDerivation {
        pname = "text-xml-generic";
        version = "0.1.1";
-       sha256 = "1w3gqv94yj1j71qhs1s6sxnxax8ahxwsz7brv0w79sg3r9akl31h";
+       sha256 = "300c3a55cae3e97438d8799daf79870a75d56dd746070d713832484fd2c66ff0";
        libraryHaskellDepends = [
          base bytestring containers haskell98 mtl not-in-base split syb
          template-haskell xml
@@ -129889,7 +130282,7 @@ self: {
      mkDerivation {
        pname = "text-xml-qq";
        version = "0.1";
-       sha256 = "0311in43n89bk1fg4y9qglvbbl47ygvcvr0f7zpr8bpaqbb1ard5";
+       sha256 = "a56515d6c2ea2e94ef3f0ee4cdf6f387d0b5367d3879f25c982b213b888d210c";
        libraryHaskellDepends = [ base parsec template-haskell xml ];
        homepage = "http://www.github.com/finnsson/text-xml-qq";
        description = "Quasiquoter for xml. XML DSL in Haskell.";
@@ -129902,7 +130295,7 @@ self: {
      mkDerivation {
        pname = "text-zipper";
        version = "0.2.1";
-       sha256 = "1a4kzn2s0ah1sizbdj6fks8zb4wmsx8cqjml4id9xj94zp4akq2r";
+       sha256 = "59e0a9c8fd24c99e5a24b44acc50d79593f5919ecec8b67ed4012aa085fd93a8";
        libraryHaskellDepends = [ base text ];
        description = "A text editor zipper library";
        license = stdenv.lib.licenses.bsd3;
@@ -129915,7 +130308,7 @@ self: {
      mkDerivation {
        pname = "text1";
        version = "0.0.3";
-       sha256 = "0l3xh8hv5xwfib63llikhnp4w3jx8nwc2rmj4sy7yd5acxgj39sc";
+       sha256 = "4ca7215f67aa347fbc26b266c1b8455d0e4eae8533523acc8a8ef7b221827d50";
        libraryHaskellDepends = [ base binary lens semigroups text ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -129930,7 +130323,7 @@ self: {
      mkDerivation {
        pname = "textPlot";
        version = "0.2";
-       sha256 = "0sy5lf5aa3yl3wy199ifb14cnkq5xghcv8m9ny9vzhyyk00h0j6y";
+       sha256 = "de48000198dec3bf93b7a9a2cde0eb054fcb48582ea6143c1fd40fa58aa3c56b";
        libraryHaskellDepends = [ array base ];
        description = "Plot functions in text";
        license = stdenv.lib.licenses.bsd3;
@@ -129942,7 +130335,7 @@ self: {
      mkDerivation {
        pname = "textmatetags";
        version = "0.0.1.2";
-       sha256 = "1q47s8z6igi21m4gqbyizlgiq1z7frk9pi4jppckxmpcjs5xd0gk";
+       sha256 = "f381d68b96ecd63ed9bd92c49b6676e7071c1ffdd12ffc480d22be683ed287e0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 process ];
@@ -129959,7 +130352,7 @@ self: {
      mkDerivation {
        pname = "textocat-api";
        version = "0.1.0.0";
-       sha256 = "0cljy3s13xqdvxffpp74iwamfvkmq7s49vpc8vpxnq2fvh6bmkx9";
+       sha256 = "a9cfba0cdc4e60dbef46ecee44f4c1756e57158fe4dceb5cdf0df711f4f09232";
        libraryHaskellDepends = [
          aeson base bytestring conduit http-conduit http-types resourcet
          text transformers
@@ -129979,7 +130372,7 @@ self: {
      mkDerivation {
        pname = "texts";
        version = "0.4.0";
-       sha256 = "15r3lrd6qrhhsll6qlbvgd5g545mj2s6banahwlibcimqqdw8s9h";
+       sha256 = "3069c41bc635b2152987caaa65b490b590f24a7b7b516c28d510666c5aa62397";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129990,7 +130383,7 @@ self: {
      mkDerivation {
        pname = "tf-random";
        version = "0.5";
-       sha256 = "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f";
+       sha256 = "2e30cec027b313c9e1794d326635d8fc5f79b6bf6e7580ab4b00186dadc88510";
        libraryHaskellDepends = [ base primitive random time ];
        description = "High-quality splittable pseudorandom number generator";
        license = stdenv.lib.licenses.bsd3;
@@ -130001,7 +130394,7 @@ self: {
      mkDerivation {
        pname = "tfp";
        version = "1.0";
-       sha256 = "03jf2dk7sgggnr72wk6chxs3l4aycpmnapdjfm5f9i8wr0spga4l";
+       sha256 = "94a87735c81cc5e44a75b25d65eb655e113a7487cc4c2e4eb6ef3d7d66134e0e";
        libraryHaskellDepends = [ base utility-ht ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic";
@@ -130014,7 +130407,7 @@ self: {
      mkDerivation {
        pname = "tfp-th";
        version = "0.8";
-       sha256 = "139dcwvik8yfpl3i71ddjml1xn126qrx1mbxa4mcwfm6q81fvkzm";
+       sha256 = "f5cfed02c2a63ace2a517dd5d0333622d81e6895ad851307bdcea31937672d8d";
        libraryHaskellDepends = [ base template-haskell tfp ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic";
@@ -130030,7 +130423,7 @@ self: {
      mkDerivation {
        pname = "tftp";
        version = "0.2";
-       sha256 = "0d95nhz5z0zi665h3npcags71zgprgrh7rq86yzn3wamnavlvswn";
+       sha256 = "96eb4db7b255f161bf3708e703f3cbf7fd70f453ecda018b31f1835f3eb42535";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130054,7 +130447,7 @@ self: {
      mkDerivation {
        pname = "tga";
        version = "0.2";
-       sha256 = "0lpc5z575y7cq03ww2knr5qdkfb36qnim5y1gkh552r9k3pfdjhf";
+       sha256 = "0ecae6ee98298b52e07cc1971a2d3663b9d970c9760ace07c0ecf872ca2fec52";
        libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        description = "Reading and writing of tga image files";
@@ -130069,7 +130462,7 @@ self: {
      mkDerivation {
        pname = "th-alpha";
        version = "0.2.0.2";
-       sha256 = "1syp28514wwj2c66jcx89zl5ax311jhywqgpcpqlfapfwqphysgk";
+       sha256 = "f3690f2fe6ee2a47f165f761eea10c617455e84fa833690c139273120a12d7eb";
        libraryHaskellDepends = [
          base containers mmorph mtl template-haskell th-desugar transformers
        ];
@@ -130086,7 +130479,7 @@ self: {
      mkDerivation {
        pname = "th-build";
        version = "0.4.0.0";
-       sha256 = "0f16cgwkmqhkm5nxyic0f56swzm96yqmagmbh7vjd203mn9zv9z6";
+       sha256 = "e6a7fd93ad038826f781ab3e55b137a97eae4d718045df6da913e23af9632638";
        libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        homepage = "https://github.com/DanielSchuessler/th-build";
@@ -130103,7 +130496,7 @@ self: {
      mkDerivation {
        pname = "th-context";
        version = "0.22";
-       sha256 = "0zzrb5dzxcn2dxhqniv3nx4kasgpx7mck730y9hgjink58wqsdx4";
+       sha256 = "a4378d392ad346f960f2609cc9eae9f7693549b763478b616fc2b2fe5b59f97f";
        libraryHaskellDepends = [
          base containers data-default haskell-src-exts lens mtl
          mtl-unleashed syb template-haskell th-desugar th-orphans
@@ -130126,7 +130519,7 @@ self: {
      mkDerivation {
        pname = "th-desugar";
        version = "1.5.4";
-       sha256 = "1dwp77gys84bb0v2af33knhwnj37rg5r662d9kcvhvqk5z4i6c68";
+       sha256 = "c83013c92f136fb8d94c4d1893cbcb6748cba19d63382536588b20eddf3997b7";
        libraryHaskellDepends = [
          base containers mtl syb template-haskell th-lift th-orphans
        ];
@@ -130144,7 +130537,7 @@ self: {
      mkDerivation {
        pname = "th-expand-syns";
        version = "0.3.0.6";
-       sha256 = "03qv93pyqk8all39knsf0mzmbfdck5x61kqnyn8rbisw5c1ymx6j";
+       sha256 = "d2f4ea032b5cc79591f516cf607a99acb9557f054edb9906a50a4decef481b0f";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Expands type synonyms in Template Haskell ASTs";
@@ -130156,7 +130549,7 @@ self: {
      mkDerivation {
        pname = "th-extras";
        version = "0.0.0.2";
-       sha256 = "15sqf2jjnqcssq8hp80fk0ysgwqykjjc31gvvmzg4sypskpjs8cl";
+       sha256 = "94212defd4d76bf27eddfb85c1a49c1ef3a73d980ea00b11d69a612ba5705897";
        libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "https://github.com/mokus0/th-extras";
        description = "A grab bag of functions for use with Template Haskell";
@@ -130168,7 +130561,7 @@ self: {
      mkDerivation {
        pname = "th-fold";
        version = "0.0.0.1";
-       sha256 = "10n1aw74xi5gzs1847dhiv6yjxcz99idw91hvf34zhhs8hp8zf2z";
+       sha256 = "5fb88f2e441ac24f86db3024de624a9f75e9cd8eb01d8282feafc44e0e57c182";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://code.haskell.org/~mokus/th-fold";
        description = "TH fold generator";
@@ -130180,7 +130573,7 @@ self: {
      mkDerivation {
        pname = "th-inline-io-action";
        version = "0.1.0.0";
-       sha256 = "1yvxi3n1nafr37zmj0dd83sf2jq4c0sss34k4q5f64vrai8a6zwg";
+       sha256 = "8f7fa350547913e30a26930cad3560044be1f440ad0159ff19d9291bec887dfb";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/tolysz/inline-io-action";
        description = "Simple inline IO action into compiled code using TH";
@@ -130194,7 +130587,7 @@ self: {
      mkDerivation {
        pname = "th-instance-reification";
        version = "0.1.4";
-       sha256 = "0cnq7qxqpc58a59iv8sfqrkhx9wkzpgn9l7r84kh0xa21w16inki";
+       sha256 = "71da68020f4275002741f9d064dffd93a70e67c64ea31d5351a8b08b3b3ed832";
        libraryHaskellDepends = [
          base containers list-extras loch-th placeholders template-haskell
          th-expand-syns
@@ -130218,7 +130611,7 @@ self: {
      mkDerivation {
        pname = "th-instances";
        version = "0.1.0.14";
-       sha256 = "1izamc2j1zjyrvzns7kj1mcma4bbmyd3sagbzxsyi4ja8kszcy0v";
+       sha256 = "1b78f6f5444a92e875ffeb293d9aaf6b1155590d721e6dffce5efe2005abeac7";
        libraryHaskellDepends = [
          base checkers derive mtl QuickCheck template-haskell th-kinds
          th-lift
@@ -130238,7 +130631,7 @@ self: {
      mkDerivation {
        pname = "th-kinds";
        version = "0.1.1";
-       sha256 = "0d8n0wnygdyi9qhkr7418f0227r3dcjwvmfhpw0kslryz0vqyf5b";
+       sha256 = "ab388f37f83e533d01bfd0d5cd256b231f218043819c3c214ed1b7e72d071635";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        jailbreak = true;
        description = "Automated kind inference in Template Haskell";
@@ -130251,7 +130644,7 @@ self: {
      mkDerivation {
        pname = "th-lift";
        version = "0.7.2";
-       sha256 = "0jl2x09mh9frsx5bccw8m4m3h72bncjaix9ylyfpvizisivj8p3m";
+       sha256 = "755c2477d4f1c77d9da73ef5a824b34b1c382aa98833b64ad7d9255813e8824a";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/mboes/th-lift";
@@ -130266,7 +130659,7 @@ self: {
      mkDerivation {
        pname = "th-lift-instances";
        version = "0.1.5";
-       sha256 = "1j9j70344mi77923v78v3hfhwn72cpq92i87rqd7alvbhkhcny8z";
+       sha256 = "1f79cbe0846b53751ace074591f065e2580e1d1c1b9d3d443a275642063832c9";
        libraryHaskellDepends = [
          base bytestring containers template-haskell text th-lift vector
        ];
@@ -130287,7 +130680,7 @@ self: {
      mkDerivation {
        pname = "th-orphans";
        version = "0.12.2";
-       sha256 = "0435l20vzsr6p4app6riyf242hcqizbypf4f5v17wjy3ihw0jddb";
+       sha256 = "ab3509388cc34b7ec22e8eb8ebd78f98414184f3319b7b15b926ebbf81a06510";
        libraryHaskellDepends = [
          base mtl nats template-haskell th-lift th-reify-many
        ];
@@ -130303,7 +130696,7 @@ self: {
      mkDerivation {
        pname = "th-printf";
        version = "0.3.1";
-       sha256 = "089grlpavvqv90graa9rdwg9x1ph484g5bj7sfjklqy8mgwwqg7a";
+       sha256 = "ea3cccf9abc8633aa5d347aef20822f0869e1e6f3929951f481befad2ecd2f21";
        libraryHaskellDepends = [
          attoparsec base bytestring template-haskell text transformers
        ];
@@ -130322,7 +130715,7 @@ self: {
      mkDerivation {
        pname = "th-reify-many";
        version = "0.1.3";
-       sha256 = "00hryljcs434wcv1vaamfdbjk857f46djxv7mlwplkl3zsmfhlfx";
+       sha256 = "dd51e8aafe834e7a39ad6777d90c71a7a029577355a91d36e36410cd24f51902";
        libraryHaskellDepends = [
          base containers mtl safe template-haskell th-expand-syns
        ];
@@ -130337,7 +130730,7 @@ self: {
      mkDerivation {
        pname = "th-sccs";
        version = "0.0.0.20110723";
-       sha256 = "0vrjqwdjv2922kqmh57ypbslbv1m829wag78addqsr4vjd9b3zl6";
+       sha256 = "86feb152939b648d5b53e83cc5934035ec45f5bafe1458f11422892d1bc7326f";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Binding group analysis in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -130352,7 +130745,7 @@ self: {
      mkDerivation {
        pname = "th-typegraph";
        version = "0.28";
-       sha256 = "0dwkhrrcb5n3n06dr0ck613yr3j6f05sldnvrkb654xm69pw1qfc";
+       sha256 = "cce1c06f32b59362d6ccdb36aa0b70468eec47309381dc0cb0c396c572869337";
        libraryHaskellDepends = [
          base base-compat containers data-default haskell-src-exts lens mtl
          mtl-unleashed set-extra syb template-haskell th-desugar th-orphans
@@ -130375,7 +130768,7 @@ self: {
      mkDerivation {
        pname = "themoviedb";
        version = "1.1.1.0";
-       sha256 = "1859hbhznmp7x8kbqzrpyhndfy69jg01qrp1vh67557mznari6d8";
+       sha256 = "a8999895fdf594720cdce1661cc093c978d72cf4377fbc26eae756fbe182a9a0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130402,7 +130795,7 @@ self: {
      mkDerivation {
        pname = "themplate";
        version = "1.2";
-       sha256 = "0ingf6f4d2a93jdcw0lij7l02gr7mfk97svhda94wx0k1lmj2li3";
+       sha256 = "2352212b0d13744e926a70eb93a6ab273f01e8919102ce9a1c4989469c71cf46";
        revision = "1";
        editedCabalFile = "9562873914a204ed7daf91844f70592385a93b6c348798dc8772b439436ca109";
        isLibrary = false;
@@ -130423,7 +130816,7 @@ self: {
      mkDerivation {
        pname = "theoremquest";
        version = "0.0.0";
-       sha256 = "05z0jppjbw70rlyh2qis27xp8vdx9fgn7i22ckxb0m2y75gffq61";
+       sha256 = "c160e75e395e54b0fa6442c4639f4bbd6d74fb113a62013dcde0f025ef95e017";
        libraryHaskellDepends = [ base HTTP json utf8-string ];
        jailbreak = true;
        description = "A common library for TheoremQuest, a theorem proving game";
@@ -130435,7 +130828,7 @@ self: {
      mkDerivation {
        pname = "theoremquest-client";
        version = "0.0.0";
-       sha256 = "0kdfbz5sa2gcy9znz4c2hnyni01vpabixrclg2gs7awysw8hiy3a";
+       sha256 = "6af80811d79eaba39f7894e51e97ba3b8068bd8582916f7ff2ec09a5cb5fae4d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base HTTP network theoremquest ];
@@ -130452,7 +130845,7 @@ self: {
      mkDerivation {
        pname = "these";
        version = "0.4.2";
-       sha256 = "0hs59i07k1lkynvdpymjvl1va2frc3aq6wyrmbi7mz3vmz0bjcp7";
+       sha256 = "e732b9c0af7bfc7ae2aad97383d560d909b503ddb2fadbb6f5938679404c4543";
        revision = "1";
        editedCabalFile = "02eb71fed8c848cc4f94f1181f09a6f9667caac38746f757bd57ca881aa47629";
        libraryHaskellDepends = [
@@ -130470,7 +130863,7 @@ self: {
      mkDerivation {
        pname = "thespian";
        version = "0.999";
-       sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn";
+       sha256 = "d6b2856d7c8bce362a06f48d7400d583f03434fb5a063ddef92077e398c46c7c";
        libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://bitbucket.org/alinabi/thespian";
        description = "Lightweight Erlang-style actors for Haskell";
@@ -130482,7 +130875,7 @@ self: {
      mkDerivation {
        pname = "theta-functions";
        version = "1.0.1";
-       sha256 = "0m9k1b75ja5a6vq7jdqzsbqjc4fh1kzy29rzss08ph6700bm6z8f";
+       sha256 = "0e7d531700c7c08b80d63f27e1ff0cd01126f1d21f3779f036aa2859ce0a3355";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/hijarian/theta-functions";
        description = "Theta-functions implemented as trigonometric series";
@@ -130494,7 +130887,7 @@ self: {
      mkDerivation {
        pname = "thih";
        version = "1.0";
-       sha256 = "0ir8z7al3fxjwq5nb05l136k7vp82ag6khcyf9bvjcymlra4cs0m";
+       sha256 = "15684654a6d533b957729ec1699e12e8ee33cd08b480650be6b2bb41d5f92847";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base pretty ];
@@ -130511,7 +130904,7 @@ self: {
      mkDerivation {
        pname = "thimk";
        version = "0.3.1";
-       sha256 = "1pjz6rnbm1llxgp47fasv40w2vg197z582vf9mm7rhm5qjp25zi0";
+       sha256 = "20fe22aec4a5c27c6a4d6e0b54fe49e16dc101d95ab943eeeb9486ba6c365fde";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -130530,7 +130923,7 @@ self: {
      mkDerivation {
        pname = "thorn";
        version = "0.2";
-       sha256 = "1krxfsgj4ciifg76khsl4lw1nb40xx4gs07nwd84ail85s394h1h";
+       sha256 = "304092862e88464550e3f600fd48ef802c1b382554c369ce733132229f763dcf";
        revision = "1";
        editedCabalFile = "d19e959e95f55075f6f4f0013cbc980e2c351c871e3d9d5bbe2febafb7711b9a";
        libraryHaskellDepends = [
@@ -130548,7 +130941,7 @@ self: {
      mkDerivation {
        pname = "thread-local-storage";
        version = "0.1.0.3";
-       sha256 = "0ka6xrxzsw2z95qcc4v2hh4ldb22zkd5s62lns3v1853g4dw7k3l";
+       sha256 = "74ccc31b79a3a0b087b654185ddafc42ac4609846213c670495f70fd7bee464d";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ atomic-primops base containers ];
        description = "Several options for thread-local-storage (TLS) in Haskell";
@@ -130560,7 +130953,7 @@ self: {
      mkDerivation {
        pname = "threadPool";
        version = "0.3.1";
-       sha256 = "18zr8k9sldbkvs5yw0ann92amri6dv2n8wws87lcqxgs52sw6pwi";
+       sha256 = "915fc3b528fa75cce8419a7364c56e26e6aa44b25601ee8bde7335aad344f9a3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process ];
@@ -130574,7 +130967,7 @@ self: {
      mkDerivation {
        pname = "threadmanager";
        version = "0.1.7";
-       sha256 = "17s26hlailbr8c9d3dv1pwiy81m3nzr3sw0v9y716rmhldf7k09f";
+       sha256 = "2e81795ca3b066138e4f1b703df2b7a306e423bf61b7d1124379d1a82834429f";
        libraryHaskellDepends = [ base containers ];
        description = "(deprecated in favor of 'threads') Simple thread management";
        license = stdenv.lib.licenses.bsd3;
@@ -130587,7 +130980,7 @@ self: {
      mkDerivation {
        pname = "threads";
        version = "0.5.1.3";
-       sha256 = "04b4hjwv38iv48hdaxrw8ngrid6pgia32h6vci80szgpjxslrg82";
+       sha256 = "02bd4c7597f77d0d5064db4031547cd7b4989f453c77d520223ba2b1b9846411";
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [
          base concurrent-extra HUnit stm test-framework test-framework-hunit
@@ -130602,7 +130995,7 @@ self: {
      mkDerivation {
        pname = "threads-pool";
        version = "0.1";
-       sha256 = "1x1yafxaaf8r02cqipqnm9shj74kja1bqdp0d1cq5kdhcnh22xkz";
+       sha256 = "7f7621a065b0cd825968e036bc8292931c0975aa16df8899001939a5ba533ef4";
        libraryHaskellDepends = [ base containers mtl stm ];
        description = "A library to operate with pool of haskell's IO threads";
        license = stdenv.lib.licenses.bsd3;
@@ -130616,7 +131009,7 @@ self: {
      mkDerivation {
        pname = "threads-supervisor";
        version = "1.0.3.0";
-       sha256 = "1iipljryqj1g06bqmlyvkxagq7l3rfx7w5d1ci5dw22qsrijnkmn";
+       sha256 = "b64e2b63d65808de4a64a1157ebacb831efc549fdbd38a97012f48ecb3a437c6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130638,7 +131031,7 @@ self: {
      mkDerivation {
        pname = "threadscope";
        version = "0.2.7";
-       sha256 = "1dpxgzm29p07iy17hkfzki4c9ckhwx4acvjhlwxmpmaj2a1m6mnc";
+       sha256 = "cc5653831252d55b3ba7506ea648e770b2c4489cdf4d78828f07dc24ea7ffdb6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -130657,7 +131050,7 @@ self: {
      mkDerivation {
        pname = "threefish";
        version = "0.2.6";
-       sha256 = "1v4vxm2yb7wmzkh9rsf5b6m04wjmy7yr7jq49b5msddjdzhfmf91";
+       sha256 = "21b9eae06fb2355dcb4a04cb93fdf1557202aa59c5e99ce0fc959fe545ed9bec";
        libraryHaskellDepends = [
          array base bytestring cereal crypto-api data-default entropy random
          tagged
@@ -130676,7 +131069,7 @@ self: {
      mkDerivation {
        pname = "threepenny-gui";
        version = "0.6.0.3";
-       sha256 = "04qrwvzz705s8aqb8f5vgakh78rv1w64ldv2mvm6fg3llfl5nlfd";
+       sha256 = "cd515ba8a3743c67eaae62374a0c0f3ba303a77abb38b4b042ba80f3ffe61913";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130699,7 +131092,7 @@ self: {
      mkDerivation {
        pname = "thrift";
        version = "0.9.2";
-       sha256 = "1c8x66agbbrcsk08i9ha3h9kdq97lnz8sby7xsjx84v5f6kmd7a4";
+       sha256 = "449d56a7716513d4a5eec72f8dbea527e136131c0aa688c0d42caff594311db1";
        libraryHaskellDepends = [
          attoparsec base binary bytestring containers ghc-prim hashable HTTP
          network network-uri QuickCheck split text unordered-containers
@@ -130716,7 +131109,7 @@ self: {
      mkDerivation {
        pname = "thrist";
        version = "0.3.0.2";
-       sha256 = "01y4s5mpk7d0y878fr40j9k19dryj37am9g86v2s9lr5d0q2nnqp";
+       sha256 = "175b2b306825d3a4c536e8a5aace903eb71466928064870ef2a09d796bd1c407";
        libraryHaskellDepends = [ base ];
        homepage = "http://heisenbug.blogspot.com/search/label/thrist";
        description = "Type-threaded list";
@@ -130728,7 +131121,7 @@ self: {
      mkDerivation {
        pname = "throttle";
        version = "3.0.0";
-       sha256 = "1yxmq7244a8bcw1jg00dqcpwzf8h1333c51k9d0v39flpkzp5qlc";
+       sha256 = "8ce272ffbcd4a5b1414b331436c60810b9cf2fc30d802703670b2942c4c1b5fb";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130739,7 +131132,7 @@ self: {
      mkDerivation {
        pname = "through-text";
        version = "0.1.0.0";
-       sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk";
+       sha256 = "933225da128906e61865ccd1da73463781b890d742cbb38f52524d94ac19b4cd";
        libraryHaskellDepends = [ base bytestring case-insensitive text ];
        homepage = "https://www.github.com/bergmark/through-text";
        description = "Convert textual types through Text without needing O(n^2) instances";
@@ -130751,7 +131144,7 @@ self: {
      mkDerivation {
        pname = "thumbnail";
        version = "0.8.0";
-       sha256 = "1ms7pzw4lrpkpv6sb0l7jvw5a0n5j7fc9wyi28bq7ik22d4sc8kd";
+       sha256 = "6d22a6491362c6831712d1f3c4dc91c50255f8968782a5cdbef3664af8bf47d7";
        libraryHaskellDepends = [ base bytestring gd ];
        homepage = "https://github.com/cutsea110/thumbnail";
        description = "generate thumbnail image";
@@ -130766,7 +131159,7 @@ self: {
      mkDerivation {
        pname = "thumbnail-plus";
        version = "1.0.5";
-       sha256 = "0320yfgnsazl7bxm9zf077mi4dgfmlcfnzy1qpdl9w3jl5i7z441";
+       sha256 = "81907f62a172f044dbc5c17feb18adee3512eb39c0fd54fb3af42b6d9ff3400c";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra data-default directory either
          gd imagesize-conduit resourcet temporary transformers
@@ -130789,7 +131182,7 @@ self: {
      mkDerivation {
        pname = "thyme";
        version = "0.3.5.5";
-       sha256 = "0v3rbjl92bqggsdra72zdq6rxzb2qf1268424p94225lnwgp1il4";
+       sha256 = "84c6701fb7b40841d22582202382c362fd9e0d6e5f1c959b7e0f2f91a85c796c";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers deepseq mtl old-locale
          profunctors QuickCheck random text time vector vector-space
@@ -130814,8 +131207,8 @@ self: {
      }:
      mkDerivation {
        pname = "tianbar";
-       version = "0.4.6.3";
-       sha256 = "1ns1gsjqq1xcdxqw7xplcax88ydfx8pn6id42n5idmcbgxkjzm9p";
+       version = "0.4.8.0";
+       sha256 = "5ed0ad66ed6bfeb5b7145ce1e05d578963f8f7fec43c5474ca9a9023acb3cb16";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130837,7 +131230,7 @@ self: {
      mkDerivation {
        pname = "tic-tac-toe";
        version = "0.1";
-       sha256 = "0bdls2xz281zdxq5z6vbkahmf6bpiqr0ra823j21783jwiyh8j01";
+       sha256 = "0148047de472a013841c02a90c328e771957a19a6b9b5f706f3f20f1bbd0b42d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base glade gtk haskell98 ];
@@ -130855,7 +131248,7 @@ self: {
      mkDerivation {
        pname = "tickle";
        version = "0.0.4";
-       sha256 = "11zm6fwnykp6hlfp9d4xcvcvmczj5x77sfkkx6v1gwz3qfkf2qcj";
+       sha256 = "9261e1a6c3e3f317b6e9733a7d4e2ff2b3bad9669db4741d85e64e6fb933f587";
        libraryHaskellDepends = [
          base bifunctors bytestring lens mtl semigroupoids semigroups
          transformers validation
@@ -130868,6 +131261,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tictactoe3d" = callPackage
+    ({ mkDerivation, base, hArduino, tuples-homogenous-h98, vector }:
+     mkDerivation {
+       pname = "tictactoe3d";
+       version = "0.1.0.0";
+       sha256 = "e4f7b7559e187ac46167313a50ac8af17ddf26cdd83f3b5dd8eeb0bfb5a8fd72";
+       libraryHaskellDepends = [
+         base hArduino tuples-homogenous-h98 vector
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/ryo0ka/tictactoe3d";
+       description = "3D Tic-Tac-Toe logic";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "tidal" = callPackage
     ({ mkDerivation, base, binary, bytestring, colour, containers
      , hashable, hmt, hosc, mersenne-random-pure64, mtl, parsec, process
@@ -130876,7 +131284,7 @@ self: {
      mkDerivation {
        pname = "tidal";
        version = "0.5.3";
-       sha256 = "09bq5ng0wvl1rcaaaw0p2b84f9sddpmabaf9c72ifw3z9k35cfyw";
+       sha256 = "dc3b56c64c7f7017c561c9a9a5ea6d4d2747d0121770a514cb816e0e9e2d7825";
        libraryHaskellDepends = [
          base binary bytestring colour containers hashable hmt hosc
          mersenne-random-pure64 mtl parsec process text time transformers
@@ -130894,7 +131302,7 @@ self: {
      mkDerivation {
        pname = "tidal-midi";
        version = "0.1";
-       sha256 = "04d5xfr57rw22jq62iil6sa9drya6z545hcm1fx98jrkcyglb10c";
+       sha256 = "0c84459f67334b94ba0b95c142ca37cae7969436344661b01482e753b2eba511";
        libraryHaskellDepends = [
          base bytestring containers hashable hosc PortMidi process tidal
          time
@@ -130909,7 +131317,7 @@ self: {
      mkDerivation {
        pname = "tidal-vis";
        version = "0.1.8";
-       sha256 = "1j9a4sgvji2wc9kq9xf0ja45b9md4v1xlanh6cfqk8p0b2qgmcrw";
+       sha256 = "3cb3fab058e0a2891d33d02adac326ada6558892c0f58467625c44b99f262ac9";
        libraryHaskellDepends = [ base cairo colour tidal ];
        homepage = "http://yaxu.org/tidal/";
        description = "Visual rendering for Tidal patterns";
@@ -130921,7 +131329,7 @@ self: {
      mkDerivation {
        pname = "tie-knot";
        version = "0.2";
-       sha256 = "1iksr5h6cyyl88z35fbaskriv4vhc1696d3i1i3c171c0vq0hwg4";
+       sha256 = "e47108f0062c9cc0460c7134934c6070931df3d46ab9323e42d47b6660c97ac6";
        libraryHaskellDepends = [ base containers mtl recursion-schemes ];
        jailbreak = true;
        homepage = "https://github.com/ppetr/tie-knot";
@@ -130934,7 +131342,7 @@ self: {
      mkDerivation {
        pname = "tiempo";
        version = "0.0.1.0";
-       sha256 = "1gmaiiwcbn3z3zmhgii7q3922c2rwdgkjsc4104gyzjm2m08998r";
+       sha256 = "19a5844015557eff08088469395fe3593021d2c027c607eb1f7fd8c5788caabe";
        libraryHaskellDepends = [ base deepseq time ];
        jailbreak = true;
        homepage = "http://github.com/HaskVan/tiempo";
@@ -130948,7 +131356,7 @@ self: {
      mkDerivation {
        pname = "tiger";
        version = "1.1.1";
-       sha256 = "1llmizacz4sg77l5yi3f9m9xkckl1mpjh0ly20cbqf5747q354q1";
+       sha256 = "019332f021a738bc18109e02286f0d74b2d9534d6e445fe8394f93cfd48f95d2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -130967,7 +131375,7 @@ self: {
      mkDerivation {
        pname = "tightrope";
        version = "0.2.0.0";
-       sha256 = "1vvzfsl166qhg0ykq71rzavllid216f6fg5xrk2454z9zskc9n60";
+       sha256 = "c0d8c4a6fee99342c4ccbd3c679c09a2454ab7fa391c3c3d78101b13a8767fef";
        libraryHaskellDepends = [
          aeson base bytestring containers http-types lens mtl text wai
          wai-extra wreq
@@ -130984,7 +131392,7 @@ self: {
      mkDerivation {
        pname = "tighttp";
        version = "0.0.0.8";
-       sha256 = "0xbipgy79pivy69a84lrriw7ams60r1a2rrkqy6llhsw4v2qk497";
+       sha256 = "279189c5265c434a8dc73367a1420646577578cc9912a492f13bde74fcbb7175";
        libraryHaskellDepends = [
          base bytestring handle-like monads-tf old-locale papillon
          simple-pipe time
@@ -131001,7 +131409,7 @@ self: {
      mkDerivation {
        pname = "tilings";
        version = "0.1";
-       sha256 = "03a9bc4zbfb3c0dd75rxj7h9pj3sc23l9a9gmabcww5nsx8kpjys";
+       sha256 = "dacb3b51d7b670ce96aa2fa94487607ac89be0913d97d31a6063b9f5095b490d";
        libraryHaskellDepends = [ base ];
        homepage = "https://gitorious.org/tilings";
        description = "substitution tilings";
@@ -131015,7 +131423,7 @@ self: {
      mkDerivation {
        pname = "timberc";
        version = "1.0.3";
-       sha256 = "0x2yc57g9g5ii14l65xkly55rhx44nfjqnbl4bqf286mqsgz191j";
+       sha256 = "32a4f09fc6d520e1f02274592c9d25a4c35c8aa7b317434988b1bcf44e615e74";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131035,7 +131443,7 @@ self: {
      mkDerivation {
        pname = "time";
        version = "1.5.0.1";
-       sha256 = "0knixcmdsl2jhjw0x6is02yrw6dhjn4gr3fh06adc003gc3wr894";
+       sha256 = "24a1cc077b0300d69401d08dfc8895b0199ebd003a9a0eb8845250dd2aebd14e";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base deepseq QuickCheck test-framework test-framework-quickcheck2
@@ -131051,7 +131459,7 @@ self: {
      mkDerivation {
        pname = "time-compat";
        version = "0.1.0.3";
-       sha256 = "0zqgzr8yjn36rn6gflwh5s0c92vl44xzxiw0jz8d5h0h8lhi21sr";
+       sha256 = "590711214510c0d2d09780c7fe3b21748bc4802e9053f78ccd6658e951fe0f7f";
        libraryHaskellDepends = [ base old-time time ];
        homepage = "http://hub.darcs.net/dag/time-compat";
        description = "Compatibility with old-time for the time package";
@@ -131063,7 +131471,7 @@ self: {
      mkDerivation {
        pname = "time-extras";
        version = "1.1.4";
-       sha256 = "1k9adm922l431gyk8figx5df1n2xk5awir2fpijnvvyphrwk5p3l";
+       sha256 = "74dc327986d7ef6d65bc4ee4c855995dd8e05ae92f3a34fd0b835021526d2acd";
        libraryHaskellDepends = [ base time ];
        jailbreak = true;
        homepage = "http://semantic.org/TimeLib/";
@@ -131080,7 +131488,7 @@ self: {
      mkDerivation {
        pname = "time-exts";
        version = "2.1.0";
-       sha256 = "0y73axrlm6lh8150i4av0jza18zpd5fiiqv9y5m8a7xx11a386bm";
+       sha256 = "7519345408bd1f856af169e3185d69f7a3a0be045b91084a40909a4a7357e378";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -131106,7 +131514,7 @@ self: {
      mkDerivation {
        pname = "time-http";
        version = "0.5";
-       sha256 = "0jbiawi14p8cgcxvr5b38kyjdmhq1lagr1dqnlpymlv7d7pcxljd";
+       sha256 = "4dd2ceee6967d3ea2fb5b885fc140d18d626fd446395bc3b7b0c5d1222577149";
        libraryHaskellDepends = [
          ascii attempt attoparsec base base-unicode-symbols blaze-builder
          blaze-textual bytestring convertible-text data-default failure
@@ -131129,7 +131537,7 @@ self: {
      mkDerivation {
        pname = "time-io-access";
        version = "0.1.0.0";
-       sha256 = "0n05lw6zpcfr3lwy2qn7v0j3ym1la9x0mak8szaxc2nbkyc8drrb";
+       sha256 = "2be786989fcb0ad6d5d768aa0a7a5234543f24d8c762e1391dd9b1fb0da70558";
        libraryHaskellDepends = [ base base-io-access time ];
        jailbreak = true;
        description = "IO Access for time";
@@ -131141,7 +131549,7 @@ self: {
      mkDerivation {
        pname = "time-lens";
        version = "0.4.0.1";
-       sha256 = "0916qfan93aq91icf87ifvskrq6s6s75rhkajvl8pxp74j28hlwz";
+       sha256 = "9f53888424e7f68be8966ac25c8e36dae03cf576f120c76248588d6495c32624";
        libraryHaskellDepends = [ base data-lens-light time ];
        description = "Lens-based interface to Data.Time data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -131152,7 +131560,7 @@ self: {
      mkDerivation {
        pname = "time-locale-compat";
        version = "0.1.1.0";
-       sha256 = "0mdl1i17hcbka8miq1n6mscrr84vnmx5a3mqgwv2yb28k404v815";
+       sha256 = "25a04d0099482c2f367fb80e557ab59ba09c99aec6061c2b52733178420cb455";
        libraryHaskellDepends = [ base time ];
        homepage = "http://twitter.com/khibino/";
        description = "Compatibility of TimeLocale between old-locale and time-1.5";
@@ -131164,7 +131572,7 @@ self: {
      mkDerivation {
        pname = "time-patterns";
        version = "0.1.3.1";
-       sha256 = "17gfin2bd6zsk3ij4hdh5xddlki0kb05mq9xkmvly9ka39gsr82n";
+       sha256 = "56a0ac5f1a6a264f779d3de15ac09a204eda5a2fb04122e398fa9bb6848dee9d";
        libraryHaskellDepends = [ base intervals lens thyme vector-space ];
        jailbreak = true;
        homepage = "https://bitbucket.org/jfmueller/time-patterns";
@@ -131180,7 +131588,7 @@ self: {
      mkDerivation {
        pname = "time-qq";
        version = "0.0.0.2";
-       sha256 = "0zpgs5xmjq4fk5djg438fpyh3582v22rjrpqhdr3qy81gcqbgaz7";
+       sha256 = "e7abb7307b01793c7283f8669985d8029501fd756890275b998e60597bd1ef7e";
        libraryHaskellDepends = [
          base template-haskell time time-locale-compat
        ];
@@ -131197,7 +131605,7 @@ self: {
      mkDerivation {
        pname = "time-recurrence";
        version = "0.9.2";
-       sha256 = "1arqmkagmswimbh78qfz5bcilk9i14w29j4vf4i89d00vac3vrzm";
+       sha256 = "f5e73d98da00b48422719bc8243809314d1ad92adf6174e0aa91ebfad4ac38ab";
        revision = "1";
        editedCabalFile = "7f1fe44ec61160e3fba86a04942d056ac91faa0002817e107e3d8399b71fe427";
        libraryHaskellDepends = [ base data-ordlist mtl time ];
@@ -131216,7 +131624,7 @@ self: {
      mkDerivation {
        pname = "time-series";
        version = "0.1.0.0";
-       sha256 = "1j6xrf45i4japgr35kzqcawlhdn13k3fbsjfmm2j3j92skwra095";
+       sha256 = "250195f9d422c92145ad4eeae5c61cc13648b962f8cf32f2bb4a925888cbddc8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers mtl ];
@@ -131231,7 +131639,7 @@ self: {
      mkDerivation {
        pname = "time-units";
        version = "1.0.0";
-       sha256 = "16g0i6r6vj9w4lbn12jqrhgbbjjca8wbzq6546dz08aks1yrk0g1";
+       sha256 = "e181997dd05321f09b21c5e0bf38524ccab51ecc588a6017253cc96db289e099";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/acw/time-units";
        description = "A basic library for defining units of time as types";
@@ -131243,7 +131651,7 @@ self: {
      mkDerivation {
        pname = "time-w3c";
        version = "0.1.0.1";
-       sha256 = "12hnvhcv18kv1djqn5dqv8i1rrzsxlvnsjyjsy9m1ngmr9nvvfbg";
+       sha256 = "6fb9bd6dcaf5d95093d7d24b6d37edfae71c22dab8158b650b7ba2b019dc168a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base convertible parsec time ];
@@ -131259,7 +131667,7 @@ self: {
      mkDerivation {
        pname = "timecalc";
        version = "0.1.1";
-       sha256 = "05nzfydzn9nmjfmdnpf5jl238kdixbwwqkyrax89i4anmpxv1v9s";
+       sha256 = "3aedb0fbad5691985057d94fccf9eab14d340495c55ddbaa93d526fb9b77df16";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskeline uu-parsinglib ];
@@ -131273,7 +131681,7 @@ self: {
      mkDerivation {
        pname = "timeconsole";
        version = "0.1.0.0";
-       sha256 = "0zmrysri8hxxvr4dffmawv5cb8lyz92w8ixfj5kah8ya2p422yc0";
+       sha256 = "807921c815ca23a86691ae47c445fa9ea2c5cae6aa3ad748debd4314b3f6b97e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process time ];
@@ -131287,7 +131695,7 @@ self: {
      mkDerivation {
        pname = "timeit";
        version = "1.0.0.0";
-       sha256 = "0dkjbp636dp882zlbwvvz76k4g7ga28wksd41w6mh0k8z45xjj5x";
+       sha256 = "bd48d90bf96802580d0fa4e9c99150ef3c32cdf97bf345bf40e83633cc5d7236";
        libraryHaskellDepends = [ base ];
        description = "Time a computation";
        license = stdenv.lib.licenses.bsd3;
@@ -131300,7 +131708,7 @@ self: {
      mkDerivation {
        pname = "timeout";
        version = "0.1.1";
-       sha256 = "1jddkkmc3d8ysh8rnlpkzvlg67if8c71wqmjdsysddpwwm3wbgjn";
+       sha256 = "56bec547e5fcb6a6bd6eb2621e0e432e1ef3e8fef3529b11d41eb5c1ea9cadc9";
        libraryHaskellDepends = [ base exceptions mtl time ];
        testHaskellDepends = [
          base exceptions mtl QuickCheck tasty tasty-quickcheck time
@@ -131318,7 +131726,7 @@ self: {
      mkDerivation {
        pname = "timeout-control";
        version = "0.1";
-       sha256 = "1w2y39699zsxv43w53q8qbi1wfvg14kqvxqfp92pisvxnrwpcisp";
+       sha256 = "57477679b67deb7845ba0ef78d27096f3b1ee2c2088fc207d95dff944c1a5ef0";
        libraryHaskellDepends = [
          base ghc-prim lifted-base monad-control mtl transformers-base
        ];
@@ -131334,7 +131742,7 @@ self: {
      mkDerivation {
        pname = "timeout-with-results";
        version = "0.2";
-       sha256 = "1y5mc1awahcp9xpmmwqc74cfn7g0zm1cyxi396xirll8nk335nd0";
+       sha256 = "a0d932c6b488d21cbb492376cf42fde01deb18390cf35a6f4f9741c55560b5f8";
        libraryHaskellDepends = [ base deepseq mtl parallel ];
        homepage = "https://github.com/ppetr/timeout-with-results";
        description = "Runs a time-limited computation alowing it to return intermediate results";
@@ -131348,7 +131756,7 @@ self: {
      mkDerivation {
        pname = "timeparsers";
        version = "0.3.2";
-       sha256 = "1dicp58f2amn5rgmnlfjpv4aj7ak6jrdlba2marglddvj4ycq1h7";
+       sha256 = "0706cc3c91bb35fab2aa422ddab234531da9c8bed2515b5f2eb62ae150b92cb6";
        libraryHaskellDepends = [
          attoparsec base bytestring containers convertible mtl time
        ];
@@ -131366,7 +131774,7 @@ self: {
      mkDerivation {
        pname = "timeplot";
        version = "1.0.29";
-       sha256 = "01px3hyl5hb114jibjr3p6pda6ppvxv2alk31wwc82dywnjp1srx";
+       sha256 = "3deb70a5e5be09c4380f63522576dff71ad5aeb923cb15250961c1423d1cfd06";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131388,7 +131796,7 @@ self: {
      mkDerivation {
        pname = "timerep";
        version = "2.0.0.1";
-       sha256 = "0rk3svwx7axp77v92j1gpmnni0jlniw3sz55q5hpa6k43d2jr4b8";
+       sha256 = "68912c451b641a7561c1a57c3d78b45482686dbd2f4891f639b7abd3f9d66366";
        libraryHaskellDepends = [
          attoparsec base monoid-subclasses text time
        ];
@@ -131407,7 +131815,7 @@ self: {
      mkDerivation {
        pname = "timers";
        version = "0.2.0.3";
-       sha256 = "0q4w41jdhf5ildcdl94lgfn06fg275hf04dpah3l6vva24d8alj5";
+       sha256 = "4552851a116a6f430754b711e06039e23903ac7b9424da58a3b138d864209c60";
        libraryHaskellDepends = [
          base lifted-base monad-control suspend transformers-base
        ];
@@ -131420,7 +131828,7 @@ self: {
      mkDerivation {
        pname = "timers-updatable";
        version = "0.2.0.2";
-       sha256 = "1naw59xvbfhgz49qhvgzng4xjf4fzi59gl996pcp5l6s2sbpx4mw";
+       sha256 = "bc927e9716dad072d93529d1974afc8e38d9c9b3ff6d8813f90fbab57b2a5cd9";
        libraryHaskellDepends = [ base stm ];
        homepage = "http://github.com/paolino/timers-updatable";
        description = "timers which are updatable in the remaining time";
@@ -131434,7 +131842,7 @@ self: {
      mkDerivation {
        pname = "timestamp-subprocess-lines";
        version = "0.1.0.3";
-       sha256 = "1vn947bbfh7awmz2rxzn2rya439ljjm83rggp6g9v178hxff5aim";
+       sha256 = "35aae25c87e8849d9eb9efe581aa94340da27c16f6f72c7ee5ea40b7d621c9ee";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131451,7 +131859,7 @@ self: {
      mkDerivation {
        pname = "timestamper";
        version = "1.0.3";
-       sha256 = "1qpzk3047ky0lx5riivv9fa418qhwsa5iyy1fb9l7az6ri094qys";
+       sha256 = "da639240cce6ab43d372c1fb5894e610a340944b7bc7984ba7c0cf43c098ffe2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base old-locale time ];
@@ -131467,7 +131875,7 @@ self: {
      mkDerivation {
        pname = "timezone-olson";
        version = "0.1.7";
-       sha256 = "1am6vqq3zxrnb444waqfajk3s1wpynw9fszqnk9ww7akf2v5abr3";
+       sha256 = "232f55b670531dced3b4f86b97b8f597073da6540e2b4e085936f73f30dea6aa";
        revision = "1";
        editedCabalFile = "cdd67661d2460ceb1720bcbb194726a57c21b113b9383cd1f1dca91e8e71d652";
        libraryHaskellDepends = [
@@ -131485,7 +131893,7 @@ self: {
      mkDerivation {
        pname = "timezone-olson-th";
        version = "0.1.0.1";
-       sha256 = "1xqy4bbkwn03ynvk8dhcmrp37rj1swaskh2si9adb9d5prcibsv1";
+       sha256 = "61eb1559bea5a5d5548a5ac0a915d741e6336eae0c3634b7f503583ed7221ef7";
        libraryHaskellDepends = [
          base template-haskell time timezone-olson timezone-series
        ];
@@ -131499,7 +131907,7 @@ self: {
      mkDerivation {
        pname = "timezone-series";
        version = "0.1.5.1";
-       sha256 = "0mks5s5wdw8fi5hjhf6zbs3pfgy4gsysd1369s41kw4h7aidsi6j";
+       sha256 = "d244dda23a90f019884e6684a6bd7ec43f77875edf382861890ef1c68b2e7a56";
        libraryHaskellDepends = [ base time ];
        homepage = "http://projects.haskell.org/time-ng/";
        description = "Enhanced timezone handling for Data.Time";
@@ -131511,7 +131919,7 @@ self: {
      mkDerivation {
        pname = "timing-convenience";
        version = "0.1";
-       sha256 = "078p6gzzb7f9g68lm3q5806azhrs6li35ras9jnb9gs2r6i0w83j";
+       sha256 = "72200ea2c942bfb4ac4c5ae53222353ac3af0c40058f4a9179c99df5ff33171d";
        libraryHaskellDepends = [ base time ];
        description = "Convenient functions for getting times";
        license = stdenv.lib.licenses.bsd3;
@@ -131524,7 +131932,7 @@ self: {
      mkDerivation {
        pname = "tinyMesh";
        version = "0.1.0.0";
-       sha256 = "19jpwnk7hmi0mg46nqhyiipz085dkakqwgh17lv9ccvvcirpclm3";
+       sha256 = "a3527673647b3396363d013e8ea79aad20f06f8c1e626bc8ab205678a6e557a6";
        libraryHaskellDepends = [
          attoparsec base bytestring hex serialport unix
        ];
@@ -131541,7 +131949,7 @@ self: {
      mkDerivation {
        pname = "tinylog";
        version = "0.12.1";
-       sha256 = "1hh70788d0rd35raybix383s6bb3mnibmmpdxwbqybv2dgmm4jq9";
+       sha256 = "094b52eb6b622f8f17efedd6baa2ad632da3071a3d2eaf72192d8386d00107c2";
        revision = "1";
        editedCabalFile = "b0e1cd3e83f3745355d1183935660d4b02ed152083da7af0ea4f386e155db04d";
        libraryHaskellDepends = [
@@ -131558,7 +131966,7 @@ self: {
      mkDerivation {
        pname = "tinytemplate";
        version = "0.1.1.0";
-       sha256 = "19i5vs2kb24hahwahfvn6bldzpcw68lpjlw37yvf2n8s5sq1fibc";
+       sha256 = "6c4517b02e1a59e1b63f83537929329cdddfe832763ba8385490883585de25a6";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base mtl QuickCheck text ];
        jailbreak = true;
@@ -131575,7 +131983,7 @@ self: {
      mkDerivation {
        pname = "tip-haskell-frontend";
        version = "0.1.1";
-       sha256 = "0za8ls980f98qj3k6pgmzaidmnrlk0nzg1r7skif6jmhh1snqc5h";
+       sha256 = "b0306c7580b04ae3e2d42787f72d9834dbdaa2faf55d3387c428398092a6487d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -131595,7 +132003,7 @@ self: {
      mkDerivation {
        pname = "tip-lib";
        version = "0.1.2";
-       sha256 = "01x8hpijgx3fd0svp0di02470xnhq1gaa6k2fxjph9g5rzmx076b";
+       sha256 = "cb1cd0ebcfe525786577621aa55ec0d076708800b181bb35686ef427e385a807";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -131618,7 +132026,7 @@ self: {
      mkDerivation {
        pname = "titlecase";
        version = "0.1.0.1";
-       sha256 = "0qwlcfr7fb5nr9vmfjfdlm3bz65jil8xnxmd54zksp1z3sxz5fhf";
+       sha256 = "0ebaf2bb1e3f5c3d3f29ad76db118db298bf46a5cd495777cab62c77b2639463";
        libraryHaskellDepends = [ base blaze-markup semigroups text ];
        testHaskellDepends = [
          base semigroups tasty tasty-hunit tasty-quickcheck text
@@ -131635,7 +132043,7 @@ self: {
      mkDerivation {
        pname = "tkhs";
        version = "0.3.0";
-       sha256 = "1svsdjb1ac5mb9zcx3wqmxdjfmf99ph94v616scya5f7lqkjcfgp";
+       sha256 = "f7392627a6c715e59936c16c92e04dc955275baf988fce7e5ab53015966c7aeb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131659,7 +132067,7 @@ self: {
      mkDerivation {
        pname = "tkyprof";
        version = "0.2.2.2";
-       sha256 = "1xyy1aagbjyjs9d52jmf7xch0831v7hvsb0mfrxpahvqsdac6h7a";
+       sha256 = "ea40c354d37843757b76152cbde1d9612000593fae4a515ad2d2cbf5940adef7";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131684,7 +132092,7 @@ self: {
      mkDerivation {
        pname = "tld";
        version = "0.1.0.1";
-       sha256 = "1lda1h8ibkmnhxhnkfd1kj6aybk5w4s3hzhh379zrqbckdl0vfxb";
+       sha256 = "abbb0d689b6ce1fcd319107e3834e1652eaf8c9ca1b9696187b6ce15110caad1";
        libraryHaskellDepends = [
          base containers network-uri template-haskell text
        ];
@@ -131702,7 +132110,7 @@ self: {
      mkDerivation {
        pname = "tls";
        version = "1.3.1";
-       sha256 = "1l6maasf4pr70cxasn6bwcy2aydlmiadmd28ymz0fp8ifw388zvl";
+       sha256 = "747f840677115d077ef548b4da54acb479253ce3cb58ad3a03275fe2b452d5d0";
        libraryHaskellDepends = [
          asn1-encoding asn1-types async base byteable bytestring cereal
          cryptonite data-default-class memory mtl network transformers x509
@@ -131724,7 +132132,7 @@ self: {
      mkDerivation {
        pname = "tls-debug";
        version = "0.4.0";
-       sha256 = "06hvnyg89n4zplw2p4rnqwyyqc5r204pfdmpvim8y119pllg3mij";
+       sha256 = "32d6f128bd29048f6adcb736770910b930ec3dc736932b38bd9fd8849eb71b1a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131744,7 +132152,7 @@ self: {
      mkDerivation {
        pname = "tls-extra";
        version = "0.6.6";
-       sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv";
+       sha256 = "dbf782edbb82321b6484105518fe8e2ff6d51992b20a545a5d3bd380ed901a4c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -131763,7 +132171,7 @@ self: {
      mkDerivation {
        pname = "tmpl";
        version = "0.0.0.1";
-       sha256 = "101q4f51am8722b0b2d9hk84iqfg1z1shzrbikya63jpf3s6jrvg";
+       sha256 = "6f6769f470570ea3fc8c2b7fa8c30fcfe148d084a9890596100755158a233880";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131781,7 +132189,7 @@ self: {
      mkDerivation {
        pname = "tn";
        version = "1.0.2.1";
-       sha256 = "07jhbg8b33h9b0x94di5x8dskm4mq6r7mkjcx6zzcvr26ymmyrmy";
+       sha256 = "be665fab37226ff6bfe94cce7ab2c195d4a91bea2536923a58098eb1d05b501e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131797,7 +132205,7 @@ self: {
      mkDerivation {
        pname = "tnet";
        version = "0.0.1";
-       sha256 = "1hxka8jfybq72isicvav81f4l9hjxhmzx4i4znkqbwzkarg2gsw9";
+       sha256 = "89eb275e56f3f385a7fd2492fe2bec12264a5c405b6d167514072fef2452b3c3";
        libraryHaskellDepends = [ attoparsec base bytestring utf8-string ];
        description = "Library for encoding/decoding TNET strings for PGI";
        license = "unknown";
@@ -131809,7 +132217,7 @@ self: {
      mkDerivation {
        pname = "to-haskell";
        version = "0.3.0";
-       sha256 = "0glf7m0r9gpab2pg1bq9qa37mrzpjwvqr3xsws6w53qqlcaw54qk";
+       sha256 = "1393c215a3188fc28de6ba8f8c3797f7e77a86c209aff0ae58eabe94413d8e3e";
        libraryHaskellDepends = [
          base containers haskell-src-exts transformers
        ];
@@ -131824,7 +132232,7 @@ self: {
      mkDerivation {
        pname = "to-string-class";
        version = "0.1.2";
-       sha256 = "0l2hj0cbc0dhd7m5bn6xqgzkdf2z4knirmv8c65hsjig9mpsvsxf";
+       sha256 = "aeebad6f4d2f4a0d8b6168d71ced245fb836ffc3ddd855ea69b001b618905050";
        libraryHaskellDepends = [ base ];
        description = "Converting string-like types to Strings";
        license = stdenv.lib.licenses.bsd3;
@@ -131836,7 +132244,7 @@ self: {
      mkDerivation {
        pname = "to-string-instances";
        version = "0.2";
-       sha256 = "1h5aq3shagzgh1j8sbslvi2rrkqv1djm595d522ci8hpj6h8vxl9";
+       sha256 = "89f68da09117a2c88428ada452650b1bcf9c45dc542f8d6480ef3f05f5c0aac0";
        libraryHaskellDepends = [ to-string-class ];
        description = "Instances for the ToString class";
        license = stdenv.lib.licenses.bsd3;
@@ -131851,7 +132259,7 @@ self: {
      mkDerivation {
        pname = "todos";
        version = "0.5.3.2";
-       sha256 = "1wgnxg9kndijm8faxsy48qznjzfcwqgjxgyff6x9c9h2fayvl719";
+       sha256 = "291cbabd72022696ba71cebf2e1fe6cc7d693f46c4ebae1caa32363bd3ebf6f1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -131877,7 +132285,7 @@ self: {
      mkDerivation {
        pname = "tofromxml";
        version = "0.1.0.2";
-       sha256 = "0wqdxr6fijbdzq0767cvi7yf07q6dcv1anzmsv7ms2apcyag63qh";
+       sha256 = "100ff3946757095dcfd6f55b15366b061fe0fc899b1d7300fe6dc9e84cee0d73";
        libraryHaskellDepends = [
          array base bytestring containers hexpat hexpat-pickle
        ];
@@ -131895,7 +132303,7 @@ self: {
      mkDerivation {
        pname = "toilet";
        version = "0.0.1";
-       sha256 = "09j6h4rwb6i87223zhbzclns12iyrbdmv0kawd27any5r2hkz63x";
+       sha256 = "7d983fa1c8c55b7544e36a825ddbca3e8aa02d657fc13f8438289ac533814626";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131913,7 +132321,7 @@ self: {
      mkDerivation {
        pname = "token-bucket";
        version = "0.1.0.1";
-       sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii";
+       sha256 = "312609c0037271b1091f23c2edf467e9449edca5bbed0cfb45c2c93c1bee6ad0";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
        homepage = "https://github.com/hvr/token-bucket";
@@ -131926,7 +132334,7 @@ self: {
      mkDerivation {
        pname = "tokenify";
        version = "0.1.2.0";
-       sha256 = "1fyf1ym91dbhiw7hybzhllc375v4pizl058qazfdyw6cymqm4rch";
+       sha256 = "90655271f5cc70dfdc571815407fbc64973318a5f02f0f0f8f70b590aa0fcebb";
        libraryHaskellDepends = [ base containers text ];
        homepage = "https://github.com/AKST/tokenify";
        description = "A regex lexer";
@@ -131938,7 +132346,7 @@ self: {
      mkDerivation {
        pname = "tokenize";
        version = "0.3.0";
-       sha256 = "1dcimgwy6ik5l6f98b0w6sc7pf06qazckfwf2cbmrd7g0q7lk20f";
+       sha256 = "0e88490f06efb45c17138ebbc9bec206b87b98361c2c949ca16546e3f9ab91b5";
        libraryHaskellDepends = [ base split text ];
        homepage = "https://bitbucket.org/gchrupala/lingo/overview";
        description = "Simple tokenizer for English text";
@@ -131952,7 +132360,7 @@ self: {
      mkDerivation {
        pname = "toktok";
        version = "0.5";
-       sha256 = "0y4s68gnp4xw0x22w3kdcr5wnkqygv6ajwkhb8apphja268np98v";
+       sha256 = "1ba56b91114ac27b155a7072a9cc7e1e4fcb4b666d0e2e4407bc936b1f329a78";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers haskell98 ];
@@ -131969,7 +132377,7 @@ self: {
      mkDerivation {
        pname = "tokyocabinet-haskell";
        version = "0.0.5";
-       sha256 = "1v6s39q8a6cnc0ggpspz9i0xw6aih4ixn9bhn4hwf9kwgcspardg";
+       sha256 = "af6575357b7c26c721b17025db23815119de414cffeafb1e60961985701adaec";
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ tokyocabinet ];
        homepage = "http://tom-lpsd.github.com/tokyocabinet-haskell/";
@@ -131984,7 +132392,7 @@ self: {
      mkDerivation {
        pname = "tokyotyrant-haskell";
        version = "1.0.1";
-       sha256 = "1xz8n3hgkhrdabwc8hsqj3yf5x112palzz192f6pkl07vi8yz1ph";
+       sha256 = "f086ef51dc07d0798d1329fc4fd51521f4e2fc905843c4f8522dc3f9e0b0e8f7";
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ tokyocabinet tokyotyrant ];
        homepage = "http://www.polarmobile.com/";
@@ -131997,7 +132405,7 @@ self: {
      mkDerivation {
        pname = "tomato-rubato-openal";
        version = "0.1.0.3";
-       sha256 = "0dk7s5fng3vybdqgqn9vqg7k6sjw4zgqld51i926lgqnixgpmw8z";
+       sha256 = "1ff17a5f8f163f6a448aa1348adf275c6a33cfc33b59fc705b7e8f675dd16736";
        libraryHaskellDepends = [ base OpenAL stm vector ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/tomato-rubato";
@@ -132012,7 +132420,7 @@ self: {
      mkDerivation {
        pname = "toml";
        version = "0.1.3";
-       sha256 = "0wby1jas854niwyac95n39liqc874xcd1ahqpw6ksi2nhv2ld6f2";
+       sha256 = "c29946c58656443d0dbf18aad0582707311c691ab624a63c8f9614a4950c7e71";
        libraryHaskellDepends = [
          attoparsec base bytestring containers old-locale time
        ];
@@ -132028,7 +132436,7 @@ self: {
      mkDerivation {
        pname = "toolshed";
        version = "0.15.0.1";
-       sha256 = "034npn24nk07hkc6wnfqsxn8msqkgfi8zwvj0yb4rmpgmxq73v60";
+       sha256 = "c0ec7170afefd64c960772f38fa27b13eb8a6cd7d8596ed884074c4b84bd960c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132047,7 +132455,7 @@ self: {
      mkDerivation {
        pname = "topkata";
        version = "0.2.4";
-       sha256 = "06b938i2362c4jcd0923lwrcf6hqgxdscizj91ns51wx73nm8fxi";
+       sha256 = "b13b54ed389d87a26d48f247a65b7f181ac732a74324d098244c9821221a6919";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -132064,7 +132472,7 @@ self: {
      mkDerivation {
        pname = "torch";
        version = "0.1";
-       sha256 = "1bai1vxd2vfxl9zn37dvrb05yh4knr5gw5syqpi6lxxd3lf0ngzc";
+       sha256 = "ec3f0b1c1dad776ae2c55e17fe4ab693405fc0cabb9d617fa2dd6dd1fa0e51ad";
        libraryHaskellDepends = [ base mtl parallel QuickCheck ];
        homepage = "http://patch-tag.com/repo/torch/home";
        description = "Simple unit test library (or framework)";
@@ -132079,7 +132487,7 @@ self: {
      mkDerivation {
        pname = "torrent";
        version = "10000.0.0";
-       sha256 = "030ll4m80ljkvq72n1aa8a2ygqa56ykkndzy5g40vh9j9j5vq52r";
+       sha256 = "5914bc8b4c32c10dc82bfe373ba73745e1e785424a052b0ede5352802aa1140c";
        libraryHaskellDepends = [
          base bencode binary bytestring containers filepath syb
        ];
@@ -132092,7 +132500,7 @@ self: {
      mkDerivation {
        pname = "tostring";
        version = "0.2.1.1";
-       sha256 = "0c95a1vjnnn3bwdz8v5hv7q2sbzn23ban3hcwqmwhmzc9ba019zg";
+       sha256 = "efa700d44aec57c82be60c0eabd610f62f2df0d9b06cf41b5fc35a2b77502531";
        libraryHaskellDepends = [ base case-insensitive text utf8-string ];
        description = "The ToString class";
        license = stdenv.lib.licenses.bsd3;
@@ -132103,7 +132511,7 @@ self: {
      mkDerivation {
        pname = "total";
        version = "1.0.4";
-       sha256 = "0zl02pznpgg719d2639491cy4df2amj7rmwfdy9dz9cksm029pga";
+       sha256 = "eadd2440d593a5df926f8ed77c6455c235e25948240d235a0ae7bd6bff15807e";
        libraryHaskellDepends = [ base void ];
        description = "Exhaustive pattern matching using lenses, traversals, and prisms";
        license = stdenv.lib.licenses.bsd3;
@@ -132114,7 +132522,7 @@ self: {
      mkDerivation {
        pname = "total-map";
        version = "0.0.4";
-       sha256 = "1gjwviqhxm3zavmb9yd14rv66qhw9cf0r6n8mdg1lkmkqi1ycb98";
+       sha256 = "282de643c4b34e1a5eabc89a0c1c4b1c62637626a1f9b4ea567fd40e71dc5cbe";
        libraryHaskellDepends = [ base containers ];
        homepage = "http://github.com/conal/total-map/";
        description = "Finitely represented /total/ maps";
@@ -132128,7 +132536,7 @@ self: {
      mkDerivation {
        pname = "total-maps";
        version = "1.0.0.2";
-       sha256 = "0i5xr0xnqazjk5j9lzhdcxlaarij1jwbfih4plfa3kpqygz5s6ps";
+       sha256 = "fa1a5dfef3f8cea11cbd0446b7b80c3266a568670d7e9a6499f22b6c3bc8bd44";
        libraryHaskellDepends = [
          adjunctions base base-compat bytes containers distributive keys
          linear reflection semigroups vector
@@ -132143,7 +132551,7 @@ self: {
      mkDerivation {
        pname = "touched";
        version = "0.2.0.1";
-       sha256 = "0lik2glqynjwcd64bdla2jsfy4yqqk4aap5f0c9zkqv9g916bxgi";
+       sha256 = "f1f565427a69e3f91303ae5ca5c8c4d813efb4148ab6454c635c5a8fe9133352";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory process time ];
@@ -132166,7 +132574,7 @@ self: {
      mkDerivation {
        pname = "toysolver";
        version = "0.3.0";
-       sha256 = "01rhq7mz20bjzqpvwwf7z4v77p9kvwgk4pv7gr6264ha30sygbr8";
+       sha256 = "28afe735180a12234c7e675f321fdf33dd7336f9c771be2ffe7201f1ebc13007";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132200,7 +132608,7 @@ self: {
      mkDerivation {
        pname = "tpdb";
        version = "1.2.0";
-       sha256 = "12l4a6p8jn03q71d3qi2zkv63k53brmha5hm6dwrp0sb8bv3qmb0";
+       sha256 = "60553cf6424b839b79331516056b5ea3cc61f6fc22e2d1c2c1035889ae51848a";
        libraryHaskellDepends = [
          base containers filepath hashable HaXml hxt mtl parsec text time
          wl-pprint-text
@@ -132218,7 +132626,7 @@ self: {
      mkDerivation {
        pname = "trace";
        version = "0.2.0.0";
-       sha256 = "14kzdd62gci1f1wskvvwai9wprkn8mq5wsdz4d5mw6kf7dcxbz41";
+       sha256 = "81fcd5593b6e1a5e4b23bf695e704576e6cb53547cefa9797021b2274c6b7f92";
        libraryHaskellDepends = [
          base containers deepseq monad-control mtl transformers
          transformers-base
@@ -132232,7 +132640,7 @@ self: {
      mkDerivation {
        pname = "trace-call";
        version = "0.1";
-       sha256 = "1fiz1v9d4ck8na68cywha53vgbgdk6iqad1zv6pj3lq0pwvkx6aw";
+       sha256 = "5c993e37bf00d321afd93f3485a399edadb74751907b868cb26832d2d20e3fba";
        libraryHaskellDepends = [ base containers mtl ];
        jailbreak = true;
        description = "functions for logging the arguments and results of function calls";
@@ -132244,7 +132652,7 @@ self: {
      mkDerivation {
        pname = "trace-function-call";
        version = "0.1";
-       sha256 = "0c5nsq9x59rmdkyvcrr1v94kjya48nhl9pnsad6xdmh77msf33xy";
+       sha256 = "be8fe1743d07d6d64d53dade44a14544793949da2167b6fd6c35a7d213d6b630";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Easy lightweight tracing of function arguments and results for ad hoc debugging";
@@ -132256,7 +132664,7 @@ self: {
      mkDerivation {
        pname = "traced";
        version = "3000";
-       sha256 = "1pniabsbybhjvlq4dmys8sxc1r8rhalsahdr3hbvif287h610hi9";
+       sha256 = "2942100c3c48b8b8171cb941a5a98219e5c0ba46dad74630dd122ebff452d1de";
        libraryHaskellDepends = [ base containers mtl pretty ];
        description = "Simple evaluation trace";
        license = stdenv.lib.licenses.bsd3;
@@ -132267,7 +132675,7 @@ self: {
      mkDerivation {
        pname = "tracer";
        version = "0.1";
-       sha256 = "1rgnls2zry29zrnvxv700bljdf7iqkkyzayr4lan0qvhv1bcs5jm";
+       sha256 = "5516cd56d87063601525d9abefe7c4f1b826e902e0ecbe6dfe49f8fc85a6f6e5";
        libraryHaskellDepends = [ base mtl transformers ];
        testHaskellDepends = [ base mtl transformers ];
        homepage = "https://github.com/knz/hs-tracer";
@@ -132280,7 +132688,7 @@ self: {
      mkDerivation {
        pname = "tracker";
        version = "0.1";
-       sha256 = "1jkcwkkzg3hkvffg6y2vz2c8y0iypij4ngryc4bca9q3g4zvxzs2";
+       sha256 = "42ffbe3f790327c516613e3f4b64bc3e028f98f85b78f39cdb138ef7e7e46cca";
        libraryHaskellDepends = [ base containers glib ];
        description = "Client library for Tracker metadata database, indexer and search tool";
        license = "LGPL";
@@ -132295,7 +132703,7 @@ self: {
      mkDerivation {
        pname = "trajectory";
        version = "0.1.0.0";
-       sha256 = "1n7vl903p5yg2xcyfxbxj45yd7ayd7p63fr9qfahlb0pgfl32s7h";
+       sha256 = "f06831a87b172c0a95c329bb61ee695e9de60b917d75e75917cf973b40a2fbd8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132317,7 +132725,7 @@ self: {
      mkDerivation {
        pname = "transactional-events";
        version = "0.1.0.0";
-       sha256 = "0jb3cf4bn007x3by70piwcvcb216kvav4xzrqr1k5v483jaj2zml";
+       sha256 = "b47e21951c88ec3243c6f977b2d59e2688c536e3f182e3d7e80700bb88636349";
        libraryHaskellDepends = [ base ListZipper MonadPrompt stm ];
        description = "Transactional events, based on Concurrent ML semantics";
        license = stdenv.lib.licenses.bsd3;
@@ -132331,7 +132739,7 @@ self: {
      mkDerivation {
        pname = "transf";
        version = "0.13.1";
-       sha256 = "1p9nrs7a96n53cmmrv107kvwjm27gj45m9b4vj23dsvk5lsx7wil";
+       sha256 = "34f2d3352d73eb3684dc64a55a887c4754c9f73c20ec5c2b1bc59aa48ece36dd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132349,7 +132757,7 @@ self: {
      mkDerivation {
        pname = "transformations";
        version = "0.2.0.0";
-       sha256 = "0nmzsd8q01ixfgqfgymbjwa5c8msq7chi16n4dwdf8x68mah7lam";
+       sha256 = "55d1035545a623d77823d68408d9c1ba22561497abfae7f0733d068051d3bf5a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132367,7 +132775,7 @@ self: {
      mkDerivation {
        pname = "transformers";
        version = "0.4.3.0";
-       sha256 = "179sbhvc9dghyw58hz80109pbrzgh7vh437227a51jhmx2bsgl5k";
+       sha256 = "b3d0a797e815ca50d411e20c02f781efe7751308007d880af7f0b5c4365c3a9d";
        libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -132380,7 +132788,7 @@ self: {
      mkDerivation {
        pname = "transformers-abort";
        version = "0.5.0.1";
-       sha256 = "0s0vvjii3h7vw8kg3xf1ig6fkxdw7z69czwdyg6nvsrcc9kbs9gm";
+       sha256 = "f525bd66622ceb6dcdf38d7f96cc3fbcf5e9cc8bc1f5f126e2fbc011a3dc1b68";
        libraryHaskellDepends = [
          base data-default-class monad-control pointed semigroupoids
          transformers transformers-base
@@ -132395,7 +132803,7 @@ self: {
      mkDerivation {
        pname = "transformers-base";
        version = "0.4.4";
-       sha256 = "11r3slgpgpra6zi2kjg3g60gvv17b1fh6qxipcpk8n86qx7lk8va";
+       sha256 = "6aa3494fc70659342fbbb163035d5827ecfd8079e3c929e2372adf771fd52387";
        revision = "1";
        editedCabalFile = "fb1a305f29cbf6ac182af7e67efaae9fcb9664d8d9606bb8a7f3414ad4c8d7a4";
        libraryHaskellDepends = [
@@ -132411,7 +132819,7 @@ self: {
      mkDerivation {
        pname = "transformers-compat";
        version = "0.4.0.4";
-       sha256 = "0lmg8ry6bgigb0v2lg0n74lxi8z5m85qq0qi4h1k9llyjb4in8ym";
+       sha256 = "d5231bc9929ed234032411038c0baae5a3d82939163c2a36582fbe657c46af52";
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/ekmett/transformers-compat/";
        description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
@@ -132423,7 +132831,7 @@ self: {
      mkDerivation {
        pname = "transformers-compose";
        version = "0.1";
-       sha256 = "0kvhl5s1js6i639hc6c4ib9jmgy4l1503ifs30a9ajrk97nagp6d";
+       sha256 = "cddca7ec49334b951418dac5014aa0c4bf2ad38a841906d330d1681974a1704f";
        libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "http://github.com/aristidb/transformers-compose";
@@ -132439,7 +132847,7 @@ self: {
      mkDerivation {
        pname = "transformers-convert";
        version = "0.2.0.0";
-       sha256 = "0nx99jygbg5jlvb1sbgb9kz84af9861nkjdcshvfhlq8w069z737";
+       sha256 = "679c9f0ce00853e836d4acc9698341c92982fe4ceb2d1dd6a6b2bcf5bc4ca95b";
        libraryHaskellDepends = [ base data-easy either transformers ];
        testHaskellDepends = [
          base data-easy directory either errors haskell-src-exts hlint hspec
@@ -132457,7 +132865,7 @@ self: {
      mkDerivation {
        pname = "transformers-free";
        version = "1.0.1";
-       sha256 = "0fbzkr7ifvqng8wqi3332vwvmx36f8z167angyskfdd0a5rik2z0";
+       sha256 = "e08b197351a03537b57f561d133e7266f4baf916638c88397a166f174f9e7f39";
        libraryHaskellDepends = [ base transformers ];
        description = "Free monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -132468,7 +132876,7 @@ self: {
      mkDerivation {
        pname = "transformers-lift";
        version = "0.1.0.0";
-       sha256 = "0fmd6v8a5r1x66v4cyb0adbajddm3mn1k43ryks01x1c3yw0p0sj";
+       sha256 = "52830bb81f2cf400f4f47990196c1db535a95653607946b6313de4a2d036ad3a";
        libraryHaskellDepends = [ base transformers ];
        description = "Ad-hoc type classes for lifting";
        license = stdenv.lib.licenses.bsd3;
@@ -132479,7 +132887,7 @@ self: {
      mkDerivation {
        pname = "transformers-runnable";
        version = "0.1.0.0";
-       sha256 = "0m1vvdfi661mmxm5rghsfnwcjd2r0r7ryc3jk0nwlzs0kaw5xi1s";
+       sha256 = "3ac45eb89a407fca2d9872309f4f065934c9b8751abe5c6aaf3518135ddb3b54";
        libraryHaskellDepends = [ base transformers ];
        jailbreak = true;
        homepage = "https://github.com/JanBessai/transformers-runnable";
@@ -132493,7 +132901,7 @@ self: {
      mkDerivation {
        pname = "transformers-supply";
        version = "0.1.0";
-       sha256 = "09f9n3cxi3sjmd8yscvcyahvdsqa5db5bckj9ryaflswsdm0ximq";
+       sha256 = "b8c60e6ad35c53a77c4e72b255562b0aebb6a1f26c33ed51ab528fd8d9b0c925";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Supply applicative, monad, applicative transformer and monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -132504,7 +132912,7 @@ self: {
      mkDerivation {
        pname = "translatable-intset";
        version = "0.1";
-       sha256 = "0pv81l5q46a4f2dxps7fdzvmnphydgw7xz3xsi5cjad2kw0dsmkm";
+       sha256 = "7556dd009fa229c94ad47dfc7ef86b1e5e5bf76feee8db9b704419820b0d685f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base fingertree ];
@@ -132518,7 +132926,7 @@ self: {
      mkDerivation {
        pname = "translate";
        version = "2010.1.24";
-       sha256 = "0vcqw0x7c9nb8yigvk35x72rds50kvma02rwkb757y1sk80q0mzf";
+       sha256 = "ee5780019a3af853ce9a3c0ba0ea9ea0e896c5e965ccfda247cb26763ae0986d";
        libraryHaskellDepends = [ base curl json network utf8-string ];
        homepage = "http://github.com/nfjinjing/translate";
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
@@ -132531,18 +132939,48 @@ self: {
      mkDerivation {
        pname = "traverse-with-class";
        version = "0.2.0.3";
-       sha256 = "0snms19w3n9ni1wmf4ikwpp298nc6qk6phrjxi5g023ihqqdvr6g";
+       sha256 = "cfe4dd30867108f04aec32c36b2636cca224eee5331257798836d9c153d0d56a";
        libraryHaskellDepends = [ base template-haskell transformers ];
        description = "Generic applicative traversals";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "travis-meta-yaml" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, extra, file-embed, lens
+     , lens-aeson, optparse-applicative, regex-applicative, tasty
+     , tasty-quickcheck, text, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "travis-meta-yaml";
+       version = "0.1.0.0";
+       sha256 = "d5d9e8fe5c2e49fdd0beac1535d5d7567a6ab3e29d13bcc0c610e1865de09b94";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring file-embed lens lens-aeson regex-applicative
+         text unordered-containers yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring file-embed lens lens-aeson
+         optparse-applicative regex-applicative text unordered-containers
+         yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring extra file-embed lens lens-aeson
+         regex-applicative tasty tasty-quickcheck text unordered-containers
+         yaml
+       ];
+       homepage = "https://github.com/phadej/travis-meta-yaml#readme";
+       description = ".travis.yml preprocessor";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "traypoweroff" = callPackage
     ({ mkDerivation, base, gtk, process }:
      mkDerivation {
        pname = "traypoweroff";
        version = "1.0.0";
-       sha256 = "0g7x1jj3x58jgbg6zcakyakc5jskcas03jakj7v5pfwdmk8kbc4m";
+       sha256 = "95b035d1ac8dbb5bf69153c901b46253cbc2a6f253b16fde7a12953ea40cfd3c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gtk process ];
@@ -132558,7 +132996,7 @@ self: {
      mkDerivation {
        pname = "tree-monad";
        version = "0.3";
-       sha256 = "1zs1qgp908d0y7dm9mhzwl529z2aw24zr8balsvn1lzl1aynzslm";
+       sha256 = "95ea6fbd0af4d360b7a66aa1fc89e04afc240ae51fd654dbf1a02190eec341ff";
        libraryHaskellDepends = [ base ];
        homepage = "http://sebfisch.github.com/tree-monad";
        description = "Non-Determinism Monad for Tree Search";
@@ -132570,7 +133008,7 @@ self: {
      mkDerivation {
        pname = "tree-view";
        version = "0.4";
-       sha256 = "0mzywp6nipc6zs98dy4ny2s3r9d745lqpjazfnj5y4hx8swyckgn";
+       sha256 = "f64de6b9461d125fa4755fc98b6921a7a53cb4f096f88692fe86dd68cde5fe57";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Render trees as foldable HTML and Unicode art";
        license = stdenv.lib.licenses.bsd3;
@@ -132583,7 +133021,7 @@ self: {
      mkDerivation {
        pname = "treemap-html";
        version = "0.1";
-       sha256 = "0jqjwg3z528z4wchpmi208lazd1nazqdai327lwxvznzjcq1m385";
+       sha256 = "058d1a3093dffedd393d6244d5f05736b4af280222d60b19271f89f2c7e3124b";
        libraryHaskellDepends = [
          base Cabal containers filepath ghc html parsec regex-posix
        ];
@@ -132600,7 +133038,7 @@ self: {
      mkDerivation {
        pname = "treemap-html-tools";
        version = "0.2";
-       sha256 = "0a7im8v118plxpi9dcgr1jhdlgj4f2a015dngyzfxqi7ij3cy6bf";
+       sha256 = "6e19cf868c27e2eebe7fb695009470443edaa00cf9b196e2edf4a21036aaf128";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132619,7 +133057,7 @@ self: {
      mkDerivation {
        pname = "treeviz";
        version = "1.0.0";
-       sha256 = "0nz93fn5k5fc9748h60a12j9gsl4ldm11a8y431mrm45jf8hnzq2";
+       sha256 = "027f0b919385d45cc3201ea9106aa384ea97a4080a1888c849cc9559ac1be95b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl QuickCheck random ];
@@ -132640,7 +133078,7 @@ self: {
      mkDerivation {
        pname = "tremulous-query";
        version = "1.0.7";
-       sha256 = "0vf6fh0p9ng2f0qqac8bqp259hfmv0bg146idm2pv668l1pkr7bx";
+       sha256 = "7d9d3c6fa0c8987d456dd190f016d8d5c154c4c50b31853170e2d9740174c66d";
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq mtl network
        ];
@@ -132654,7 +133092,7 @@ self: {
      mkDerivation {
        pname = "trhsx";
        version = "0.2.2";
-       sha256 = "11jx2jf6vi7368ys39mz0ziy6xknbi0z87926n2y16am6k2h25k3";
+       sha256 = "631601c5345599e08535221df4415c7676e3e307bfa6a13d32e3c46d9c145d86";
        description = "Deprecated";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132667,7 +133105,7 @@ self: {
      mkDerivation {
        pname = "triangulation";
        version = "0.3";
-       sha256 = "0lx9y54n6p3xf3z6dzw0b2p87hwb1rrcgzilnl51fwvcs1m0fgdf";
+       sha256 = "ae3d076ad06c73170ab534fec7720e8bc383ae5880ff66fe707d5c6349f1a953";
        libraryHaskellDepends = [
          array base collada-types haskell98 tuple vector vector-algorithms
        ];
@@ -132688,7 +133126,7 @@ self: {
      mkDerivation {
        pname = "trifecta";
        version = "1.5.1.3";
-       sha256 = "1yd55bfhdn8ckkf2c5084fsnfwhib229xw9bn2a4lwpkzbbpflxw";
+       sha256 = "bc5377d7faf3724a94b02bf19e8458117267b523081426dc9c0cd906dd2aa5f9";
        revision = "1";
        editedCabalFile = "4aef1e889929b131bcfbc3b111cc865b1c31f86be983aee768adbfeadee03f2a";
        libraryHaskellDepends = [
@@ -132710,7 +133148,7 @@ self: {
      mkDerivation {
        pname = "trimpolya";
        version = "0";
-       sha256 = "1y559q5p0pzlr468224c6m5859z72gg0sk2vrgl82ilwkjn08i9i";
+       sha256 = "314504ac9c9c4681e8cb5b4c0dde13e7a7824a358c08810cc9f45f700b4ea5f8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bio bytestring simpleargs ];
@@ -132725,7 +133163,7 @@ self: {
      mkDerivation {
        pname = "trivia";
        version = "0.0";
-       sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78";
+       sha256 = "e8c4f180becea2005c61c0f97ac1e460755dbd31c0e055ab148998c9b1fcb50f";
        libraryHaskellDepends = [ base comonad distributive ];
        homepage = "https://github.com/fumieval/trivia";
        description = "The trivial monad and comonad";
@@ -132737,7 +133175,7 @@ self: {
      mkDerivation {
        pname = "trivial-constraint";
        version = "0.3.0.0";
-       sha256 = "0fl72wai6yj5wflhx3cbvi3ixcfrc73217skncyb9b1ai7vg3x3y";
+       sha256 = "7ef4f1f6892aacb43cb3539f20c661d9b11e47dc8b8d0ea9e3457a131517873a";
        revision = "1";
        editedCabalFile = "c2fb0af78c16b340f5dfeb5bf5935250a7f70b72b9b5c07416aee2c8b9138b4b";
        libraryHaskellDepends = [ base ];
@@ -132751,7 +133189,7 @@ self: {
      mkDerivation {
        pname = "tropical";
        version = "0.0.0.2";
-       sha256 = "1in9jjfzbqws4bk83082yra2gcb5b095948qyji63ckbz3igp0k2";
+       sha256 = "6282fbe2f86bb261a2f4189154125865b12754f6028181e6229ae3f59d94c9c6";
        libraryHaskellDepends = [ base semiring-simple ];
        jailbreak = true;
        description = "A library for tropical mathematics";
@@ -132763,7 +133201,7 @@ self: {
      mkDerivation {
        pname = "true-name";
        version = "0.0.0.1";
-       sha256 = "1qp70i08hf7w90zyc4kz9hnyx8qaf925sy8x01r1z3dbxd473dgm";
+       sha256 = "f5b57148ebab8d1f72001d795d44720aa3ee2d4c7f12e63f48fc38884004e7e2";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base containers template-haskell time ];
        homepage = "https://github.com/liyang/true-name";
@@ -132777,7 +133215,7 @@ self: {
      mkDerivation {
        pname = "truelevel";
        version = "0.1.3.1";
-       sha256 = "0q5civsnjwwhdkb16h8jak7prkfwvhds1p3xzzhwqk2p8dxf6jij";
+       sha256 = "324ae37a43574ccce1ff7ddca01bdcdccd7ccf54124113d66c907369f58eac60";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers parseargs WAVE ];
@@ -132794,7 +133232,7 @@ self: {
      mkDerivation {
        pname = "trurl";
        version = "0.3.1.0";
-       sha256 = "0byg9gp6xgdy30mrjdlsijr87d6ivhj35baz5zpjxi6vgn8pa87v";
+       sha256 = "fb2075917ddbc42eef2f5fad3224dcd1b483b28c9a36992b18bebd6eee4bcf2f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132813,7 +133251,7 @@ self: {
      mkDerivation {
        pname = "tsession";
        version = "0.1";
-       sha256 = "1rj11vyd272h66cjx8pq6smcpi65n3vlfv4g7indcnpcz4w5l6rk";
+       sha256 = "331b5a38f9ec5ad66c3c8f6c47f7b0c5c4cbaa36f8a22e9931501cd1fc0e41e6";
        revision = "2";
        editedCabalFile = "afd89984a633388a2db5ad107968c92693527eb6f746318c4752993633705e57";
        libraryHaskellDepends = [ base containers mtl time transformers ];
@@ -132827,7 +133265,7 @@ self: {
      mkDerivation {
        pname = "tsession-happstack";
        version = "0.1";
-       sha256 = "1sv62iqrlvzx95g6nd307y8zknp2h3ir06zc6qw4y221wz21rfyz";
+       sha256 = "dfbb1cc4e741084f3836ec1b90e380e2daf9913f60346b5e49fd6f9a711466eb";
        libraryHaskellDepends = [
          base happstack-server transformers tsession
        ];
@@ -132841,7 +133279,7 @@ self: {
      mkDerivation {
        pname = "tskiplist";
        version = "1.0.0";
-       sha256 = "0bayh8fl3wb98mifdiss8crb17jfqxxj0f1va5c2h4l7qwizh85a";
+       sha256 = "aa20f823c787122858513b38207bc74e9eb032435ac7e6624569f1411d825e2d";
        libraryHaskellDepends = [ array base containers random stm ];
        homepage = "https://github.com/thaldyron/tskiplist";
        description = "A Skip List Implementation in Software Transactional Memory (STM)";
@@ -132854,7 +133292,7 @@ self: {
      mkDerivation {
        pname = "tslogger";
        version = "0.1.0.0";
-       sha256 = "1xybllaxakzlai0ja93fyw8yr0p56g58f5akc5z9pi4w4493c7dl";
+       sha256 = "b41d3612219cc49b7e61531587ca33e582ec11f76e24254154f44fd515a5cbf7";
        libraryHaskellDepends = [ async base containers random ];
        jailbreak = true;
        description = "Thread-safe logging";
@@ -132866,7 +133304,7 @@ self: {
      mkDerivation {
        pname = "tsp-viz";
        version = "0.1.0.0";
-       sha256 = "0wrnpmvds2amm85a5j1c1nqffy6vj4y6xq21w5ia1051wrxzrbjk";
+       sha256 = "53aefc7be6a180a062e141e06e3c91db78e7b00d2cc8a20aaa5509dd76bd3673";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gloss stm vector ];
@@ -132884,7 +133322,7 @@ self: {
      mkDerivation {
        pname = "tsparse";
        version = "0.4.0.0";
-       sha256 = "0s5vlpvi1w6q2zxv586plvhs9p6rlc7653x7jzygfir70754n6si";
+       sha256 = "511b4bca012747f7fc97a78f620ea3d9dca4e1a6d7a0b2fb17d8f010f7a5bb68";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132904,7 +133342,7 @@ self: {
      mkDerivation {
        pname = "tst";
        version = "0.1.1";
-       sha256 = "1vr1l4pm02pwr8238qd9j0drkildns8m79qyq0lbzll30gc12vhx";
+       sha256 = "1d6e11d80383d2bf28c01ea75391b68dc6991b90a9613404cafc0a502fa121ef";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/bitonic/language-spelling";
        description = "BK-tree implementation";
@@ -132919,7 +133357,7 @@ self: {
      mkDerivation {
        pname = "ttrie";
        version = "0.1.2";
-       sha256 = "09nbba623nxnlg1957sgcrrva3ycwb31asxnxihwjh0wxrqhh1k0";
+       sha256 = "60060871ee1c40c961ecb66b15c6e2cc0fb573664f9f92c2a3b6db218c5acb26";
        revision = "2";
        editedCabalFile = "f517a1ee4ab2eeefe39ec336a793845f84333835c59c3e90f885dd0711f8fbc0";
        libraryHaskellDepends = [
@@ -132944,7 +133382,7 @@ self: {
      mkDerivation {
        pname = "tttool";
        version = "1.4.0.3";
-       sha256 = "0mypgqgqaf2c74vka1pmqzrvz1kwl8pjm1llh4bflizfzrxq3s9d";
+       sha256 = "2de9817bfeee47ea168194862a2fa27c86bff3c7f5063537394c38851f7ed757";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -132962,7 +133400,7 @@ self: {
      mkDerivation {
        pname = "tubes";
        version = "0.2.2.3";
-       sha256 = "0qmg2w4sjm0q1h6ajkv3i576zsi2ndbacjsn5sibcwjbdpkpwmdr";
+       sha256 = "b9557ee76d4b72b6a22e564ba656b322ea6f4e89634fa90c0c1854a90917af62";
        libraryHaskellDepends = [ base comonad free mtl transformers ];
        homepage = "https://github.com/gatlin/tubes";
        description = "Effectful, iteratee-inspired stream processing based on a free monad";
@@ -132974,7 +133412,7 @@ self: {
      mkDerivation {
        pname = "tuntap";
        version = "0.0.2";
-       sha256 = "0q6g2wcjddb9r1l9fxpn2qcssw5gyfwsam15rc3q6xjqbwz7fm41";
+       sha256 = "8154773e5f58768307cb2554a5b9f3af70ad1916f6769768c869b5261917cf60";
        libraryHaskellDepends = [ base bytestring unix ];
        jailbreak = true;
        description = "Interface to TUN/TAP drivers";
@@ -132987,7 +133425,7 @@ self: {
      mkDerivation {
        pname = "tup-functor";
        version = "0.3.0.0";
-       sha256 = "1kj68g5g9m46dpncbrisl19gah8pzac33iyr09ym1pqk3x6jh9ix";
+       sha256 = "3d26284d1f13df507d02d9c73198fa1741f552a03ae6c5ec6d86d4f4ca4346ce";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cpphs ];
@@ -133003,7 +133441,7 @@ self: {
      mkDerivation {
        pname = "tuple";
        version = "0.3.0.2";
-       sha256 = "094nx29aahyrvbcn7yca9zs2a5rxz1is7510w1q43rpvza7hdjrg";
+       sha256 = "2fcb068ffafbe64170e02094a363f83d1725f44f8af963d9dad943a592e89624";
        libraryHaskellDepends = [ base OneTuple ];
        description = "Various functions on tuples";
        license = stdenv.lib.licenses.bsd3;
@@ -133014,7 +133452,7 @@ self: {
      mkDerivation {
        pname = "tuple-gen";
        version = "2.0";
-       sha256 = "0bgwsxq8wrh76hhbwadv0rag4c7dx3644zrh2aflnsych0rncvd7";
+       sha256 = "a76d663380cc6b4b9d12307f42cce8ed30f25406bb29be203407668e70d7fc2d";
        libraryHaskellDepends = [ base combinat ];
        jailbreak = true;
        description = "Enum instances for tuples where the digits increase with the same speed";
@@ -133027,7 +133465,7 @@ self: {
      mkDerivation {
        pname = "tuple-generic";
        version = "0.5.0.0";
-       sha256 = "0cbmiwmwav0g9di1s0sdry9shijqzpb9zaag9dz95w65wgqkfzbw";
+       sha256 = "7c7d37f1e3c5f0927e4b4fa99fd6fd5846a893cf4d031d624b0f6cc52b8f7531";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/tuple-generic";
        description = "Generic operations on tuples";
@@ -133039,7 +133477,7 @@ self: {
      mkDerivation {
        pname = "tuple-hlist";
        version = "0.2.0.0";
-       sha256 = "0z1mmm6gnhv3c4hn60v1yasvr9j5rakvyma4c535s51hk5s7g7bl";
+       sha256 = "749d77749930145d46614455bfa7ca45a6bcb5f261036321616343fb4cad357c";
        libraryHaskellDepends = [ base HList OneTuple ];
        jailbreak = true;
        homepage = "http://github.com/dudebout/tuple-hlist";
@@ -133052,7 +133490,7 @@ self: {
      mkDerivation {
        pname = "tuple-lenses";
        version = "0.1.0.2";
-       sha256 = "1qq1sla89410wr9pnkmj100izkraad1gr163815p3dvh7qi04c7w";
+       sha256 = "fc3002223e70b7714b40c384fc42532acf1f0108b24e7b53e620908414d501e3";
        libraryHaskellDepends = [ base lens template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/jfischoff/tuple-lenses";
@@ -133065,7 +133503,7 @@ self: {
      mkDerivation {
        pname = "tuple-morph";
        version = "0.1.0.0";
-       sha256 = "1zi6nh1z7z2jz5h0pvdm2czfy1rx7ixnnvp9akcpas19npgyfk94";
+       sha256 = "244de7dfb5296875d954e96e6b7b3c3d07ef3e13b5ed0b60f952fcf303b426fe";
        revision = "4";
        editedCabalFile = "835c4661ff3b962ec5fa6f1899c6cb0d241362f06636478935fd5475c684eada";
        libraryHaskellDepends = [ base HList template-haskell ];
@@ -133079,7 +133517,7 @@ self: {
      mkDerivation {
        pname = "tuple-th";
        version = "0.2.5";
-       sha256 = "1mrl4vvxmby7sf1paf7hklzidnr6wq55822i73smqyz0xpf3gsjn";
+       sha256 = "56ea37dcede07b5cf5385108540ae626db163f9df0387583d3c7afdaf72634d7";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Generate (non-recursive) utility functions for tuples of statically known size";
        license = stdenv.lib.licenses.bsd3;
@@ -133090,7 +133528,7 @@ self: {
      mkDerivation {
        pname = "tupleinstances";
        version = "0.0.1";
-       sha256 = "0kcmcg1fxsslpzpg766r9hr8aysg0s5fyang2xc0aa77zi71qyi3";
+       sha256 = "237a1c4efce728055817cf2aef8a064f7b85324cd998f3eebf54ebeec263954d";
        libraryHaskellDepends = [ base template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/diegoeche/tupleinstances";
@@ -133104,7 +133542,7 @@ self: {
      mkDerivation {
        pname = "tuples-homogenous-h98";
        version = "0.1.1.0";
-       sha256 = "0fhz246wh6x0s0sjkmd3qcylsx2gfrmgmvgb7js2zjg91y7zqnh2";
+       sha256 = "025afc8f0fe9c92fb43cebedfa6a764f744d3dc3a3d52935d0a01bc80d111f3a";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/ppetr/tuples-homogenous-h98";
        description = "Wrappers for n-ary tuples with Traversable and Applicative/Monad instances";
@@ -133116,7 +133554,7 @@ self: {
      mkDerivation {
        pname = "turing-music";
        version = "0.1.1";
-       sha256 = "163fggvjixs6m2rwc3gd3s9703r2mnz3bknii1aagwzvw5kczky3";
+       sha256 = "c3cfcf66e1fbf3a75488d1ce35bead220f70921eed0dc6b3a846f728f77b6e98";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ ALUT base ];
@@ -133129,7 +133567,7 @@ self: {
      mkDerivation {
        pname = "turkish-deasciifier";
        version = "0.1.0.0";
-       sha256 = "0dk63dknwxi7v67jn9b747mkyiz2af4b76a9q1ynn16xva2qsh93";
+       sha256 = "23418d85dadd046b7dc04999b38853e2473feb2167252b8fd927766e671b6636";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers vector ];
@@ -133145,7 +133583,7 @@ self: {
      mkDerivation {
        pname = "turni";
        version = "2011.1.15";
-       sha256 = "0152xhvm0x1ncjdib0bckhywgpzm4f1qj1ghs0jn84cz562ddwnl";
+       sha256 = "d4f2d684299f116425d0f005898323f5dfc73d9c6c81159b6436745037eca204";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers MonadRandom random ];
@@ -133163,7 +133601,7 @@ self: {
      mkDerivation {
        pname = "turtle";
        version = "1.2.1";
-       sha256 = "01l4gnl5qyvi7kwn0yzhkrs0yawm5ncqbbb150nxm5r3zky8cn4w";
+       sha256 = "9c5886fcfc2397da2d2861ad85992d952b0f749ef07b60f93c717b5ca87d8406";
        libraryHaskellDepends = [
          async base clock directory foldl hostname managed optional-args
          optparse-applicative process system-fileio system-filepath
@@ -133179,7 +133617,7 @@ self: {
      mkDerivation {
        pname = "tweak";
        version = "0.1.0.1";
-       sha256 = "1l5y94gac9s55wgn6w610pqb63c8l20vmlpsnmgbzw1f9vbnzgiw";
+       sha256 = "3cbe6fd74e2ef0bf5eb5fad2ba81a0880db3f005c170631f2f4527a61e49bed0";
        libraryHaskellDepends = [ base containers lens stm transformers ];
        jailbreak = true;
        homepage = "http://github.com/jfischoff/tweak";
@@ -133192,7 +133630,7 @@ self: {
      mkDerivation {
        pname = "twentefp";
        version = "0.4.2";
-       sha256 = "1kmf907i6g6lfhw8g403b6701srrd298n4r53dvcqzy72c5qaixl";
+       sha256 = "b447850b13c77fcc761b25138b926839eb008e590390873874d43c130f48aece";
        libraryHaskellDepends = [ base gloss parsec time ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
@@ -133205,7 +133643,7 @@ self: {
      mkDerivation {
        pname = "twentefp-eventloop-graphics";
        version = "0.1.0.4";
-       sha256 = "086vx0849c7kmsz5pa4jwzp24cwaf4482bq37dr7jrqx22hvk4lm";
+       sha256 = "9592b9a1101d6779723b032f8108718a3322eee792a85bbeaef3b04410e8db20";
        revision = "1";
        editedCabalFile = "2a887ef5e938d11f5944ea59ced4cf4bd22930b452f6e6b884f58031761cf817";
        libraryHaskellDepends = [
@@ -133221,7 +133659,7 @@ self: {
      mkDerivation {
        pname = "twentefp-eventloop-trees";
        version = "0.1.1.0";
-       sha256 = "1zn3bz2119jcyangs7mi2s9wcjkqgk54vwg6rfcbfg37m1v1ixy4";
+       sha256 = "c4f71876a8673cb798cbe6f14dca7c784ac69316b11efdacf24ca610c45fc3fe";
        libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
@@ -133232,7 +133670,7 @@ self: {
      mkDerivation {
        pname = "twentefp-graphs";
        version = "0.1.0.4";
-       sha256 = "0g0py8cb4z9i9pjhka2pyjm8vfai9x3k0vmlb06g157ish97qvir";
+       sha256 = "396e7c12d4f194f00c58b46e30474f51b98daaf457a809e54d317db218f2173c";
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
@@ -133243,7 +133681,7 @@ self: {
      mkDerivation {
        pname = "twentefp-number";
        version = "0.1.0.2";
-       sha256 = "1kh0a6h4syx98ygwidw6cc24ci91v1blshpfcczx96z850x1h6xf";
+       sha256 = "ae1b183a28e89bd43f63ee424d57d8214546046386b7c89f47a97b4da05100ce";
        libraryHaskellDepends = [ base parsec ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
@@ -133255,7 +133693,7 @@ self: {
      mkDerivation {
        pname = "twentefp-rosetree";
        version = "0.1.0.1";
-       sha256 = "1dy4hmwciaglz2kfdk9fxf6hik7pgr4a4xj9y9l7s7p4k35r5bd7";
+       sha256 = "a7ad92cb98e41e7d68f24976a2487ef7cc088deb2ecde6a6f8f4a9c87885c4b7";
        libraryHaskellDepends = [
          base twentefp-eventloop-graphics twentefp-number
        ];
@@ -133270,7 +133708,7 @@ self: {
      mkDerivation {
        pname = "twentefp-trees";
        version = "0.1.0.2";
-       sha256 = "0mmj96xbqjzm4cylk39pib9jfwh6m350q1cwf6ij8pl0swab3b0g";
+       sha256 = "0facb114d7805e24a3719c050ccaa8067227d38a378d493d23f54bbcba49b256";
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree";
        license = stdenv.lib.licenses.bsd3;
@@ -133284,7 +133722,7 @@ self: {
      mkDerivation {
        pname = "twentefp-websockets";
        version = "0.1.0.1";
-       sha256 = "08227phlyvvg01n7zqyivx2f3dpfbipxaajqz4fc07zhkpmxy8h4";
+       sha256 = "0422dfeb9df01fc01cf9582ad56f5ceeb6e144dfd1e37f6c006f6f4fe13d4220";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive concurrent-extra containers entropy io-streams mtl
@@ -133305,7 +133743,7 @@ self: {
      mkDerivation {
        pname = "twhs";
        version = "0.1.0.3";
-       sha256 = "0d06bv26lvr4va431h2146v88bqcxvfr0wp36f7l4a6xqgghf2l1";
+       sha256 = "810a07dfc3dd28428f33e37290ddee0c2f84b62141c03088da246f6ac45e0634";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -133336,7 +133774,7 @@ self: {
      mkDerivation {
        pname = "twidge";
        version = "1.1.2";
-       sha256 = "162n5w4z3a1qyasd39q7751z872v31njzyhrnjfjxhsni3kif8b1";
+       sha256 = "612117e78856c32e9db419fa2f6d185b1cf4433907a7d1b4f238a8f1092f5698";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -133356,7 +133794,7 @@ self: {
      mkDerivation {
        pname = "twilight-stm";
        version = "1.2";
-       sha256 = "1hp9mkfasjyh1ji6gfmdpmx3nm9g22ag3y47nva7i30bjrs65cdr";
+       sha256 = "b9b16274960b8c78d4b687f8f194102f553b7abdadba67a20cd04baddcace9c2";
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        homepage = "http://proglang.informatik.uni-freiburg.de/projects/twilight/";
        description = "STM library with safe irrevocable I/O and inconsistency repair";
@@ -133373,7 +133811,7 @@ self: {
      mkDerivation {
        pname = "twilio";
        version = "0.1.2.0";
-       sha256 = "05qhg9djp71xdwzb88xdnrg3zjbd6p8xb4gwzp0l6m3gc9wi7nvp";
+       sha256 = "77db1379626f5443c1fdfc91d5d1356dc93f5eb6ad23b43e6f3d9c2b5b7a1017";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers errors exceptions free
          http-client http-client-tls http-types mtl network-uri old-locale
@@ -133398,7 +133836,7 @@ self: {
      mkDerivation {
        pname = "twill";
        version = "0.1.0.3";
-       sha256 = "0wkcxjfpd5fz72hwg8spxjqk8b6axm51zppld00q9f3dzagsbwx6";
+       sha256 = "a6f3a59ffa6db8840168f4de1f4aedca2c34b1ec57a3c7a138df95769dec6c72";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring cryptohash data-default datetime errors old-locale
@@ -133415,7 +133853,7 @@ self: {
      mkDerivation {
        pname = "twiml";
        version = "0.1.0.0";
-       sha256 = "0ipc8i1hbsjdz6rp7ks25w0zbrcv4byp0791aw9rrdpyqzdir0zx";
+       sha256 = "fd831cdbc7feb69c1357211d70fd229be5f5012f42cf73b3f94dea054344ec46";
        libraryHaskellDepends = [ base network xml ];
        testHaskellDepends = [ base Cabal lens ];
        jailbreak = true;
@@ -133432,7 +133870,7 @@ self: {
      mkDerivation {
        pname = "twine";
        version = "0.1.2";
-       sha256 = "0q4dsh6x1w1indsx070rqayvjlzdk2nznvh0cjxd5f3jn5ggwwb1";
+       sha256 = "6171fe5eb172b8d2ba64006efbad98ed53b9bdc2191cd075b331f0d00dd48d60";
        libraryHaskellDepends = [
          base bytestring containers convertible filepath mtl parsec
        ];
@@ -133449,7 +133887,7 @@ self: {
      mkDerivation {
        pname = "twisty";
        version = "0.1.0";
-       sha256 = "02w8763m6gm9wj035s62ydg63iv7wa2cbjq2g1jd283vf2djsjyj";
+       sha256 = "d24b2d9b707b20d1647802cbc584e267c7615ef3c2e83280e4a93e538739880b";
        libraryHaskellDepends = [
          array base containers data-memocombinators MonadRandom parallel
        ];
@@ -133467,7 +133905,7 @@ self: {
      mkDerivation {
        pname = "twitch";
        version = "0.1.6.1";
-       sha256 = "0hvwcnkjma3ib00qa7ymiyrvspa7ixxp0w3wgs9zjrs49j36dmak";
+       sha256 = "53d566864c4467f9937e7c70707b8f475dbdb38fd51f85015871a82aa7657c43";
        libraryHaskellDepends = [
          base data-default directory fsnotify Glob optparse-applicative
          system-fileio system-filepath time transformers
@@ -133490,7 +133928,7 @@ self: {
      mkDerivation {
        pname = "twitter";
        version = "0.1.1";
-       sha256 = "12q5w9wfnrzh2gjmq66qhwy6i6wixfb805jg2cbphxrjjnc2v9gx";
+       sha256 = "fda52d989532777817134f168096eb919b683c87d8185ce513f067eb78e2058b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -133513,7 +133951,7 @@ self: {
      mkDerivation {
        pname = "twitter-conduit";
        version = "0.1.1";
-       sha256 = "0rair336wjgg5pd0vh3g3nlc64f5sw2sg60jj2sjaxv296jvr3xx";
+       sha256 = "bd8fbca549627725b5901298a705d7c511c3a81d6fc00dda2def496ec6c85165";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -133545,7 +133983,7 @@ self: {
      mkDerivation {
        pname = "twitter-enumerator";
        version = "0.0.3";
-       sha256 = "1c8y7kq0x7lnq7x7ah8c78q6cy2963nz6y83klzh2jgmr8rma6q4";
+       sha256 = "041b5533caf549013f9d0379f3ed30497866303a0c4175fac1969e0ef03c1eb1";
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-enumerator authenticate base bytestring
          containers enumerator http-enumerator http-types text tls-extra
@@ -133566,7 +134004,7 @@ self: {
      mkDerivation {
        pname = "twitter-feed";
        version = "0.2.0.2";
-       sha256 = "19kwhk0bvwnyhychvfzc09w00ix7z9fmvrb4vv56vxdg20rni3fk";
+       sha256 = "d38d683310aff56dcade64e55d5dfaa747007802ecbb0d9987def2bdc0847ca6";
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
@@ -133588,7 +134026,7 @@ self: {
      mkDerivation {
        pname = "twitter-types";
        version = "0.7.0";
-       sha256 = "0smzz3y6xgb0yddp62bvw4j278fw5dnjffrjfxz3dc6hd602cvlh";
+       sha256 = "906e268069d0b0367e77323b276d2bdca12324e17b09735bf360bd6efcf8bf6a";
        libraryHaskellDepends = [
          aeson base text time unordered-containers
        ];
@@ -133611,7 +134049,7 @@ self: {
      mkDerivation {
        pname = "twitter-types-lens";
        version = "0.7.0";
-       sha256 = "1775ydjpv0rii3zbz60xl8dz3537fcid3j4867ynw0zvk1sl01wc";
+       sha256 = "8c07407598fb036efd3188c8d122736794f11ba21d98bffe8831837d65f3e59c";
        libraryHaskellDepends = [
          base lens template-haskell text time twitter-types
        ];
@@ -133628,7 +134066,7 @@ self: {
      mkDerivation {
        pname = "tx";
        version = "0.1.0.0";
-       sha256 = "18fpkpri2g93vxw3qdk94nc4zlh5kqgfbvdmzkwqjadkck39alsy";
+       sha256 = "5e5395c664b32989f9fcb5ede51e9e05d24f982569363c78df233d11f39dd7a1";
        libraryHaskellDepends = [
          base bytestring cereal safecopy stm transformers
        ];
@@ -133646,7 +134084,7 @@ self: {
      mkDerivation {
        pname = "txt-sushi";
        version = "0.6.0";
-       sha256 = "0375q8qcirkalz6n48rkylkx1j8z5gvjhh8n2fdvvjqvn064q1s6";
+       sha256 = "46074c0cb01bcbbd9b13164128f72b1fc9d027f5332362cda76ae6c830c2e50c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -133662,7 +134100,7 @@ self: {
      mkDerivation {
        pname = "txt2rtf";
        version = "1.0.1";
-       sha256 = "0vn01ppcmdfi9n9f8h62ll9f08nda2pcrxvck0lgkwzky54v19s4";
+       sha256 = "44a7b049f1f3f3f928986cf7ccae50cd22e012a5c240e4924dd1b5caee0dc06e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -133676,7 +134114,7 @@ self: {
      mkDerivation {
        pname = "txtblk";
        version = "0.2.0.1";
-       sha256 = "08qpdyb1dbkif4zwrap6478fsf7lha6hk18wm0r4803avrr5w2bb";
+       sha256 = "6b095e72de6a004432a81c85098d82f438edd021e6aacc3f7171ae16966f1723";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "Deprecated in favor of eros";
@@ -133688,7 +134126,7 @@ self: {
      mkDerivation {
        pname = "ty";
        version = "0.1.6";
-       sha256 = "0i18c293f6dz7qgr5z4x6rzndhqv5q7myw1wvs8i9ld23d87fjhy";
+       sha256 = "1e4a77501ba2d11491de3c705f0f2e1bc3667f369dfc921f3ebf193792602844";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/conal/ty";
        description = "Typed type representations and equality proofs";
@@ -133702,7 +134140,7 @@ self: {
      mkDerivation {
        pname = "typalyze";
        version = "0.1.1";
-       sha256 = "1wc1z7ps1rcbws2snci64hxddjd3bi3kbi4iwvbfaac0dz52085m";
+       sha256 = "b52020ca6f8029e5d6e691c435475ca3c9d63a242632ab85e68be5a0eff981f1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -133719,7 +134157,7 @@ self: {
      mkDerivation {
        pname = "type-aligned";
        version = "0.9.6";
-       sha256 = "0mfyd9w13kd3ha43220p9qabw828xv19sxywy9imadpwrdqp51qv";
+       sha256 = "1b877271cbfc365563f2dc779dc2ee4820be144e1708318882a3cd11786ade55";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/atzeus/type-aligned";
        description = "Various type-aligned sequence data structures";
@@ -133731,7 +134169,7 @@ self: {
      mkDerivation {
        pname = "type-booleans";
        version = "0.1";
-       sha256 = "11kbnfbvclkdwirnnpdi4f20pibdar4l47anvnkaxxl330zi7yfh";
+       sha256 = "d0f9133f1883f6aea6dd561d4249566dc50b8423b15d6b73e46d52b697b36b86";
        libraryHaskellDepends = [ base ];
        description = "Type-level booleans via type-families";
        license = stdenv.lib.licenses.bsd3;
@@ -133744,7 +134182,7 @@ self: {
      mkDerivation {
        pname = "type-cereal";
        version = "0.3";
-       sha256 = "1w1s1c7f2q5zwc9fghbbd1nhavh0mzzndh0mdxr7sy88a523svcv";
+       sha256 = "9b6d3d445108797d726f15c066ffaf006e056d686bc1e712e3bf60e10e0b3af0";
        libraryHaskellDepends = [
          base bytestring cereal data-hash template-haskell type-digits
          type-spine
@@ -133759,7 +134197,7 @@ self: {
      mkDerivation {
        pname = "type-digits";
        version = "0.3";
-       sha256 = "0rmqy3wcypyq09gnfz0xvkr2ly9gnpsjnil2n981ajfxsk2shi58";
+       sha256 = "a844a8c5d4dd491550b282462bf5b52f792af2dc1d7c675f02d85fcff8f0b866";
        libraryHaskellDepends = [ base template-haskell type-spine ];
        description = "Arbitrary-base type-level digits";
        license = stdenv.lib.licenses.bsd3;
@@ -133771,7 +134209,7 @@ self: {
      mkDerivation {
        pname = "type-eq";
        version = "0.5";
-       sha256 = "007srln0xxi27wca8dk72xp3cdwnk8iqmlqgbxi17c9l2x7lrkwz";
+       sha256 = "9fcf4c4f1734b113625f0fd38a239a9637366e176736a4183f22f60e2ccdfa00";
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ cpphs ];
        homepage = "http://github.com/glaebhoerl/type-eq";
@@ -133784,7 +134222,7 @@ self: {
      mkDerivation {
        pname = "type-equality";
        version = "0.1.2";
-       sha256 = "06acqpkvyvalv5knjzzbgm40hzas6cdfsypvjxsbb0mhq4d80xwr";
+       sha256 = "9977801ac1b082b57497fb7aed1a335a7d08487deb7f6967d9546dbfe7c54c19";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/hesselink/type-equality/";
        description = "Type equality, coercion/cast and other operations";
@@ -133796,7 +134234,7 @@ self: {
      mkDerivation {
        pname = "type-equality-check";
        version = "0.0.0.3";
-       sha256 = "0fsj2mbsbhiqlv6dlkkwh3af5kx8qcif9374wiy7zf62pz4bry67";
+       sha256 = "c7f8bcc8bfc2b87f7ce4e48ce422c3a8cfe2d4807c4edacca638c2a55715523b";
        libraryHaskellDepends = [ base type-level ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-equality-check";
        description = "Type equality check";
@@ -133809,7 +134247,7 @@ self: {
      mkDerivation {
        pname = "type-functions";
        version = "0.2.0.3";
-       sha256 = "1vs6wk1z3zp3s1fxbz6bnfjlkdrcs6v4ihdnr504z9qklwb91vam";
+       sha256 = "55ed9016a713a74f40c9b6c148b6d12cb749a5b3cbfcd55dd0e3fef1c3e446ef";
        libraryHaskellDepends = [ base kinds ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-functions";
        description = "Emulation of type-level functions";
@@ -133821,7 +134259,7 @@ self: {
      mkDerivation {
        pname = "type-hint";
        version = "0.1";
-       sha256 = "1fcrma7m6y7i1y42rzhv7qch8xkk93lkh1767saw4hsb9fzwsq8i";
+       sha256 = "1161cdbf4b4b43c2953ee60438e948737604193e1bfe2c880ff178538faa99b9";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mvv/type-hint";
        description = "Guide type inference with proxy values";
@@ -133833,7 +134271,7 @@ self: {
      mkDerivation {
        pname = "type-int";
        version = "0.5.0.2";
-       sha256 = "1lakw4mvkii32a570zain510n9x7b2ka2r3qj5rpil1j4bpc662w";
+       sha256 = "5c18c3ee2232d07873917864a1a658a7270b42b1517d708a1223c6b92be153d1";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/type-int";
        description = "Type Level 2s- and 16s- Complement Integers";
@@ -133846,7 +134284,7 @@ self: {
      mkDerivation {
        pname = "type-iso";
        version = "0.1.0.0";
-       sha256 = "03qs8frsj0a2jxpk1rrmhaivf68hg8dhjn4s3q85h4zrsxwfskjx";
+       sha256 = "5d4eed78d7f91358101e9a58091b7a1019b7a38235e7306f974201a9b3431a0f";
        libraryHaskellDepends = [
          base data-default nats numericpeano text
        ];
@@ -133860,7 +134298,7 @@ self: {
      mkDerivation {
        pname = "type-level";
        version = "0.2.4";
-       sha256 = "1cgph4y6j7wnzglzz89zd60f1mv8v82vp0n1bmkp4yqq0w2wmg9v";
+       sha256 = "3bbdca0507187b72675dc182bb05da68d7e080693fa1ffe9fb961f693c81f7b1";
        libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "http://code.haskell.org/type-level";
        description = "Type-level programming library";
@@ -133873,7 +134311,7 @@ self: {
      mkDerivation {
        pname = "type-level-bst";
        version = "0.1";
-       sha256 = "0c51p6dy84ddikj6jch5hljn1i37q38wbak3chbc3ds5r674y5hk";
+       sha256 = "13164f8ec945b7c1166463aac5d1c067c4602585053269e48cad11e49bb9a130";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Kinokkory/type-level-bst";
        description = "type-level binary search trees in haskell";
@@ -133886,7 +134324,7 @@ self: {
      mkDerivation {
        pname = "type-level-natural-number";
        version = "2.0";
-       sha256 = "17zgm5ys1z61kxxczz3bzi9m3c48py6pvyx3cqk3xlh1w7n58ryk";
+       sha256 = "d36754ece101d23e2666a3fb7d8dbf88b05153fc6bfccf7a9fc1fca07da9ef9f";
        libraryHaskellDepends = [ base ];
        description = "Simple type level natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -133897,7 +134335,7 @@ self: {
      mkDerivation {
        pname = "type-level-natural-number-induction";
        version = "1.0.0.1";
-       sha256 = "1mwnsz5rbqnwskzf4cyv05zxha86afqh68b5ppwvizrvwf4jav2r";
+       sha256 = "596c2589e33bffb8f9bd652103b1530629d87f01db33e2fed4dce295cbd796d7";
        libraryHaskellDepends = [
          base transformers type-level-natural-number
        ];
@@ -133911,7 +134349,7 @@ self: {
      mkDerivation {
        pname = "type-level-natural-number-operations";
        version = "1.0";
-       sha256 = "0vql5q5zhbhmwv0wqqb0xi4ayqdsz149rymhs730c583pq0h9r3w";
+       sha256 = "7ce40401be031506c6d1b0fa9c48f8ba61af48ec6061ccc1e6152ef80b2e146f";
        libraryHaskellDepends = [ base type-level-natural-number ];
        jailbreak = true;
        description = "Basic operations on type-level natural numbers";
@@ -133923,7 +134361,7 @@ self: {
      mkDerivation {
        pname = "type-level-numbers";
        version = "0.1.1.1";
-       sha256 = "12iiyaqi60fpds7fv1qvphy84rwyj71maq54mfwpcr0bdrgyymjv";
+       sha256 = "5b56ef5f6e0b6476b9aba46055c3919e67823cbc1b87ed8e6ed70113b1f2318a";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Type level numbers implemented using type families";
@@ -133935,7 +134373,7 @@ self: {
      mkDerivation {
        pname = "type-level-sets";
        version = "0.5";
-       sha256 = "1mrrwyvpjywnv2vd1nzzk0vnzsnjvbxiyxp03n9djsgwnfslzxbj";
+       sha256 = "72f54fb5b3fc69d9921de0761ffbdad2ea6f3798ffdbd0b6d8967b79b7e739d7";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Type-level sets (with value-level counterparts and various operations)";
        license = stdenv.lib.licenses.bsd3;
@@ -133947,7 +134385,7 @@ self: {
      mkDerivation {
        pname = "type-level-tf";
        version = "0.2.1";
-       sha256 = "07q69219yvf7rpfwilp70hvx2fzsxklvld7j3gayj17l9wp23g2m";
+       sha256 = "55bc212e4ff404e9d51bf234bae9ecfa3bd13704e7d2c8ddcdc76d9f8248061f";
        libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "https://github.com/coreyoconnor/type-level-tf";
        description = "Type-level programming library (type families)";
@@ -133959,7 +134397,7 @@ self: {
      mkDerivation {
        pname = "type-list";
        version = "0.2.0.0";
-       sha256 = "19akcmjn1jgcxfsyw49pfydil47vh5zp99rb8qsyhmlv7x9czc03";
+       sha256 = "03b0cf523f9b56e835462ba7747f81fb101a9b773711eeb5ebecc960656553a5";
        libraryHaskellDepends = [ base singletons ];
        description = "Operations on type-level lists and tuples";
        license = stdenv.lib.licenses.bsd3;
@@ -133973,7 +134411,7 @@ self: {
      mkDerivation {
        pname = "type-natural";
        version = "0.2.3.2";
-       sha256 = "0qydsrksg9rasv90d4ivjgf1sdwfzjg0xf1wimfkhva545mray7h";
+       sha256 = "f078956b21456d385d8d3cb80e9efc8e371ddc933b9206d2d62aa7a767d6cd63";
        libraryHaskellDepends = [
          base constraints equational-reasoning monomorphic singletons
          template-haskell
@@ -133989,7 +134427,7 @@ self: {
      mkDerivation {
        pname = "type-ord";
        version = "0.3";
-       sha256 = "16nfnxh0klxx1f2mj1hc5blcm259b664w3l4frx4bksdavhnkmg5";
+       sha256 = "e5d569e1564dcf457a76840e4e8c59a988cae82a0c0659850bbdd30960b7ce9a";
        libraryHaskellDepends = [
          base template-haskell type-digits type-spine
        ];
@@ -134005,7 +134443,7 @@ self: {
      mkDerivation {
        pname = "type-ord-spine-cereal";
        version = "0.2";
-       sha256 = "1gwchzi4l7a0jm11paxz959mv9a5pbga86fyyjyglypd1988rvrb";
+       sha256 = "2bef8c500aed7afabcf4de19a4deba45a55d5349bfab1b4295401d4ae2878cbf";
        libraryHaskellDepends = [
          base template-haskell type-cereal type-ord type-spine
        ];
@@ -134019,7 +134457,7 @@ self: {
      mkDerivation {
        pname = "type-prelude";
        version = "0.1";
-       sha256 = "1ygg511j0av1g94mclrsf3p0qb2kc89jcz9nfr5fm073a2jlzlih";
+       sha256 = "30d24fa550e380ea4a76367d261362532c0cee703a5356497a612b204328eff9";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "http://code.atnnn.com/projects/type-prelude";
        description = "Partial port of prelude to the type level. Requires GHC 7.6.1.";
@@ -134034,7 +134472,7 @@ self: {
      mkDerivation {
        pname = "type-settheory";
        version = "0.1.3.1";
-       sha256 = "1b4p9f03diq2mlp2mb39qrm095731i35q8k783bkq2knzlq01dsi";
+       sha256 = "51b70030fd760a3cd74067225c460ce394046ac669ac2a2ead02c736804b97ac";
        libraryHaskellDepends = [
          base containers syb template-haskell transformers type-equality
        ];
@@ -134048,7 +134486,7 @@ self: {
      mkDerivation {
        pname = "type-spine";
        version = "0.2.20120924";
-       sha256 = "0vy9ixmz1xm3dd0376s0h66q7qi64jqc5kqsqjpcg7akxidl03hi";
+       sha256 = "110e405bec539dc7aec41acfc2b02426e2838d81409b33406ba3f6f06b8fc96f";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A spine-view on types";
        license = stdenv.lib.licenses.bsd3;
@@ -134065,7 +134503,7 @@ self: {
      mkDerivation {
        pname = "type-structure";
        version = "0.1.1";
-       sha256 = "0y2360llc41772ybjj3dcsk1r81js3yqsxww1w0j62gsdp6g9wfv";
+       sha256 = "dbf1f4cc6dfa0923010f9c778dfdd032a01ca6666d48b9bc3827104629304378";
        libraryHaskellDepends = [
          array base bytestring containers hashable loch-th mtl placeholders
          template-haskell text th-instance-reification time transformers
@@ -134093,7 +134531,7 @@ self: {
      mkDerivation {
        pname = "type-sub-th";
        version = "0.1.0.6";
-       sha256 = "11aycmbvqlrsd4kzm9m5smg7ghqz8kn3i62b19acnlpmrlr5v497";
+       sha256 = "27915d32cdf552cb540a4b9838ec441fc3775ed5a5a6fa27693a53bc57655e85";
        libraryHaskellDepends = [
          base DebugTraceHelpers HUnit QuickCheck template-haskell
          test-framework test-framework-hunit test-framework-quickcheck2
@@ -134117,7 +134555,7 @@ self: {
      mkDerivation {
        pname = "type-unary";
        version = "0.2.19";
-       sha256 = "04hpqmppwv6cs8vnf3whvmp1x4sqhirlkxcr2fjzcr1ji1gfchvr";
+       sha256 = "7943e65e883264f6a51399f549738458931e6edd900f6737d2cc6c7e6fc51712";
        libraryHaskellDepends = [
          applicative-numbers base constraints newtype ty vector-space
        ];
@@ -134131,7 +134569,7 @@ self: {
      mkDerivation {
        pname = "typeable-th";
        version = "0.1.5";
-       sha256 = "1ps9rkysx7zbcqkz51ahayg2jivlihiqdlb27iq7bf9aa7383k6v";
+       sha256 = "dbcc81c6512ab975703c62d186238c7447299e575085f22766eb9faefdcc49df";
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [ base ];
        jailbreak = true;
@@ -134148,7 +134586,7 @@ self: {
      mkDerivation {
        pname = "typedquery";
        version = "0.1.0.2";
-       sha256 = "0l0fxhh1mq0801gb73pv531943i0iy5lm58hwyf5g6x6l50lj660";
+       sha256 = "c0184941a1a69b579ce710954a8b8f200e92c228fb8eb35e0008e01a20ec0e50";
        libraryHaskellDepends = [
          aeson base bytestring haskell-src-meta parsec template-haskell text
          transformers
@@ -134164,7 +134602,7 @@ self: {
      mkDerivation {
        pname = "typehash";
        version = "1.4.0.4";
-       sha256 = "11s10arrbri1f71jfpynhmwh53cgkrfxsrqch1f02j0aii7n0lpv";
+       sha256 = "fb52604f8c0a48015c800c67dd5d9e8f8d027985d65f27c37121e695b3024187";
        libraryHaskellDepends = [ base binary bytestring mtl pureMD5 syb ];
        jailbreak = true;
        description = "Create a unique hash value for a type";
@@ -134179,7 +134617,7 @@ self: {
      mkDerivation {
        pname = "typelevel-tensor";
        version = "0.2.1";
-       sha256 = "174f6xh3znf45w94xkhqwnxnzw6crpb13zff57svnj2dqvpf00gd";
+       sha256 = "ed01e0eec64d48bbf529cefd11d6cdccf06fbbe518ce4e122fc4d93f60378e9c";
        libraryHaskellDepends = [ base numeric-prelude QuickCheck ];
        testHaskellDepends = [
          array base HUnit numeric-prelude QuickCheck test-framework
@@ -134196,7 +134634,7 @@ self: {
      mkDerivation {
        pname = "typeof";
        version = "0.1.2";
-       sha256 = "1mnzkj5dp4rc4anaqxc6ia88wgrjhxwacxpqw8vp6pjqxbhhq92n";
+       sha256 = "56240ce1ea585e7337e2f876a67887323f8e908a8675acac222c93db8a9cdfd6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process ];
@@ -134211,7 +134649,7 @@ self: {
      mkDerivation {
        pname = "typeparams";
        version = "0.0.6";
-       sha256 = "1blhqm8ba37mqp2ziipm0igyccyrqlwcink5xbz0m56ca7lid0vb";
+       sha256 = "6b8316e951cc940afeea65dac838c5d933e65f04f5c6f8c5c5f50cb550c590ae";
        libraryHaskellDepends = [
          base constraints deepseq ghc-prim primitive reflection tagged
          template-haskell vector
@@ -134227,7 +134665,7 @@ self: {
      mkDerivation {
        pname = "types-compat";
        version = "0.1.1";
-       sha256 = "1fl3ddsz9m0s0mnd7wq6lqkkmpq0dz83aisqgs1cpg91xlllghby";
+       sha256 = "7ec14729ed21bdcb827e584735d06f00df3a27a606f3d36c051ad4f4756b83ba";
        revision = "2";
        editedCabalFile = "8fbb17ec66d4bf5f2fffdb2327647b44292253822c9623a06b489ff547a71041";
        libraryHaskellDepends = [ base ];
@@ -134241,7 +134679,7 @@ self: {
      mkDerivation {
        pname = "typesafe-endian";
        version = "0.1.0.1";
-       sha256 = "1kg4pvrnf7vwvrcb998l9w08dpdy9hg7x2d9h5s3lqpnvvxfgcfj";
+       sha256 = "d2b1e7fadef6623a7481a9897e1e4cbedd86004f14a5b458de7c1f67f3bee4cd";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/Ericson2314/typesafe-endian";
        description = "Enforce endianness with types";
@@ -134256,7 +134694,7 @@ self: {
      mkDerivation {
        pname = "typescript-docs";
        version = "0.0.3";
-       sha256 = "12axp6y652zlv9c9m0n5m4allpy23x0bk274gy78csrqp26akq3k";
+       sha256 = "73e0a98cb8386b868e7fe488b9401fc25f4a15a9c5829a58daf48b62bcb95d89";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -134274,7 +134712,7 @@ self: {
      mkDerivation {
        pname = "typical";
        version = "0.0.1";
-       sha256 = "0dw6mwppbhcblnr03qgavhx27l9dl6gd981afgg4spi8avfzgh4q";
+       sha256 = "98c0f7dd56285e4dde732aa0d49ea12dd1233adceae101b2a58bc1752faf8637";
        libraryHaskellDepends = [ base ];
        description = "Type level numbers, vectors, list. This lib needs to be extended.";
        license = "GPL";
@@ -134287,7 +134725,7 @@ self: {
      mkDerivation {
        pname = "typography-geometry";
        version = "1.0.0";
-       sha256 = "1vvqch3pdwymjbmir7b208qyzdzljsw1gf8icmzw5pi3vn6wkihf";
+       sha256 = "0ec6c98ddd23dec27f6511b917b896f4b7ef3102629d1ceb92d5f376076478ef";
        libraryHaskellDepends = [
          base containers parallel polynomials-bernstein vector
        ];
@@ -134305,7 +134743,7 @@ self: {
      mkDerivation {
        pname = "tz";
        version = "0.0.0.10";
-       sha256 = "15j0ai0i4savvvhd8b7f9mrm1kwdmvjrphyjclmlj1k65c6ap5qm";
+       sha256 = "1597ab0c2b6606492b65d2c39be5ae8dcf50734dee2cd4e0de5b691241544096";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq time tzdata vector
        ];
@@ -134327,7 +134765,7 @@ self: {
      mkDerivation {
        pname = "tzdata";
        version = "0.1.20150129.1";
-       sha256 = "167ik26nsq2v6xqfk0rljp4p4g3r35rkvsza7cvi8qdak96dc4ay";
+       sha256 = "5e11d64c9aaa6114373beaeb3d7319793c72c9953483e970375b606d8d98f198";
        libraryHaskellDepends = [ base bytestring containers vector ];
        testHaskellDepends = [
          base bytestring directory filemanip filepath HUnit MissingH
@@ -134345,7 +134783,7 @@ self: {
      mkDerivation {
        pname = "uAgda";
        version = "1.2.0.4";
-       sha256 = "01a1h6pflvid5zcd8wy3px7cz4pxwy5pw354v9rp8k7sx4q82am8";
+       sha256 = "a82a8130e9fa4c7473daa40c7e8be7fd92cf4ebfc373d4d82f2d6eeaae814105";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -134367,7 +134805,7 @@ self: {
      mkDerivation {
        pname = "ua-parser";
        version = "0.5";
-       sha256 = "0fljfvs9gzqyn01sw57s738jazki839grff43n09bqf7nk1janbf";
+       sha256 = "6e5925c3b4c7e195801dc4b9fcd240717e25d138fa14ae03b01eff97f476923a";
        libraryHaskellDepends = [
          aeson base bytestring data-default file-embed pcre-light syb text
          yaml
@@ -134390,7 +134828,7 @@ self: {
      mkDerivation {
        pname = "uacpid";
        version = "1.2";
-       sha256 = "1ml02xap95vxvzwqlqp68hfk7yjncf3xc1h13gga0nlhby9rjv14";
+       sha256 = "246c99935f905aa0de1b0106d6876356fa331d44e6628af9df7d9774551780d6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -134407,7 +134845,7 @@ self: {
      mkDerivation {
        pname = "uberlast";
        version = "0.0";
-       sha256 = "12p948706scjiazlwv0x1afl3v8fhv4a3l8yqn1x4y9xnr4pfmc9";
+       sha256 = "89557749b63d79d283c51ed1a1c8860eed419d0a1d6c4ebf8a9269030e22e98a";
        libraryHaskellDepends = [ base lens tagged template-haskell ];
        homepage = "https:/github.com/fumieval/uberlast";
        description = "Generate overloaded lenses from plain data declaration";
@@ -134420,7 +134858,7 @@ self: {
      mkDerivation {
        pname = "uconv";
        version = "0.0.3";
-       sha256 = "0v71qw494klyh3ar8qdp7wx7kn7629iy83xham9b7jpmvk2p76bv";
+       sha256 = "7b9973c5dcf5cab35255b00fe46312e6d8793a3fb76194d5809e4e9208c7e16c";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ icu ];
        description = "String encoding conversion with ICU";
@@ -134435,7 +134873,7 @@ self: {
      mkDerivation {
        pname = "udbus";
        version = "0.2.1";
-       sha256 = "0a7kksh99nll91q41z4xgrcwc8pnfm0p71bxw6yymcd7yb0v09fk";
+       sha256 = "d325b0c1f2a7b1eabde17d85734175f622c6597e9dfc40704894da94a09ef328";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134453,7 +134891,7 @@ self: {
      mkDerivation {
        pname = "udbus-model";
        version = "0.2.1";
-       sha256 = "0xiz3z0x7p9agj14j9lm8njfqiqpyif0m2fn7lppi3w482ssfzji";
+       sha256 = "517ea7b540848f782f3dd6890a5cf41747eca445952649827c2addd3c11f3f76";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring udbus xml ];
@@ -134468,7 +134906,7 @@ self: {
      mkDerivation {
        pname = "udcode";
        version = "0.2.0.0";
-       sha256 = "1namnm91divk1x8ki7wfbd79f4nrym58r4ki9yamj2giv4nxda36";
+       sha256 = "66a8d62dd9f10959954f71928c4af5d912974e5b8e9f38510f73c71652b555d9";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Does a set of code words form a uniquely decodable code?";
        license = stdenv.lib.licenses.bsd3;
@@ -134481,7 +134919,7 @@ self: {
      mkDerivation {
        pname = "udev";
        version = "0.1.0.0";
-       sha256 = "1a5i57f50scxbv5snn4xd953bx98qq3cgzhxjnqvxyazqz3h1fx2";
+       sha256 = "a2bb00c7c75ff9beb1951dfec706c628f5354a6a9d58abcb5e9d6950dc29b1a8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring posix-paths unix ];
@@ -134498,7 +134936,7 @@ self: {
      mkDerivation {
        pname = "uglymemo";
        version = "0.1.0.1";
-       sha256 = "0ixqg5d0ly1r18jbgaa89i6kjzgi6c5hanw1b1y8c5fbq14yz2gy";
+       sha256 = "fe89ef49c0cb15867c58815b050b33f17d394d4c48a9b7240a39780a5a79b847";
        libraryHaskellDepends = [ base containers ];
        description = "A simple (but internally ugly) memoization function";
        license = stdenv.lib.licenses.publicDomain;
@@ -134512,7 +134950,7 @@ self: {
      mkDerivation {
        pname = "uhc-light";
        version = "1.1.9.0";
-       sha256 = "0dqb0054nbl5qfxrg7g4yvmiawp9ladlws26cdf32jxrm31wgmkj";
+       sha256 = "72d6c7c3a8b94b315c6346684e9ba2e97215ebf6e49d97bbc3852e4b0a000b37";
        revision = "1";
        editedCabalFile = "8847b4a41a2f6c9be09cf7b4835f53219522da9ef0ca26b918159fec747bd938";
        isLibrary = true;
@@ -134540,7 +134978,7 @@ self: {
      mkDerivation {
        pname = "uhc-util";
        version = "0.1.6.0";
-       sha256 = "1ndnmk8rfa8hwp72hgh6xx043lf59a8k50cqjm8bibfpd7fl31hj";
+       sha256 = "128641dd69d7adb85095988132914ac5d14140ef063e28cee5102997d1acb6d9";
        libraryHaskellDepends = [
          array base binary bytestring containers directory fclabels fgl
          hashable ListLike mtl process syb time time-compat uulib
@@ -134555,7 +134993,7 @@ self: {
      mkDerivation {
        pname = "uhexdump";
        version = "0.3";
-       sha256 = "064cm531yci41jf14k177w7j4zy8dfjwrpjcrwf7kpz2rhx1djyi";
+       sha256 = "d1cb163acce2df791ccf4cdecca56bc87f220f3f274c129c0c24321f46a98c18";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring split ];
@@ -134571,7 +135009,7 @@ self: {
      mkDerivation {
        pname = "uhttpc";
        version = "0.1.1.0";
-       sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb";
+       sha256 = "cbfa7b8d008c766be1055dca52f467cfded9e5577405b96a8bd622fc5146cece";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134591,7 +135029,7 @@ self: {
      mkDerivation {
        pname = "ui-command";
        version = "0.5.4";
-       sha256 = "1qq902p5q6z1m0556bdc6brads7m2qrhrwnzd8k8c4jynzc829w7";
+       sha256 = "872781d8b75e1286266adff20c3316f5e8a6f232ac2d530aa8e11b5cae0009e3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base data-default mtl old-locale time ];
@@ -134607,7 +135045,7 @@ self: {
      mkDerivation {
        pname = "uid";
        version = "0.1.0.1";
-       sha256 = "11v67dbanw9gmy9rbfln3ma87a9hkwvc5bwzdx840ngij5gh559b";
+       sha256 = "2b95025f91f15940506f9fafc2369f30a983541d96ba9593af2f71ab563b6687";
        libraryHaskellDepends = [
          aeson base bytestring cereal dataenc text uuid
        ];
@@ -134623,7 +135061,7 @@ self: {
      mkDerivation {
        pname = "una";
        version = "2.1.0";
-       sha256 = "0gpycwd0dgnw7cdicpn19wv1xb4jq3j9dfzry2ilv85h02zkwfvh";
+       sha256 = "703b3ebf00b0a04da3f0f9bb96e4c092ac1e364fc15e161b3bdcbe061a67fe3e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -134641,7 +135079,7 @@ self: {
      mkDerivation {
        pname = "unagi-chan";
        version = "0.4.0.0";
-       sha256 = "04m1ns6jc1yb1i9pmqmi8k21mwgkrq4q9fbcj4af1a9khxrjxcny";
+       sha256 = "deb22e738733a9e014916cb98409cef3f11ac444b1e27a530ccb07268db6a112";
        libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ];
        testHaskellDepends = [
          atomic-primops base containers ghc-prim primitive
@@ -134655,7 +135093,7 @@ self: {
      mkDerivation {
        pname = "unagi-streams";
        version = "0.1.3";
-       sha256 = "0m8x1sw925xwj2yd2ji0nk54gw1gqqz1zy0bk9z3c3sgbcy364m6";
+       sha256 = "a612333c5b4f0f367e9a0bf81f3ec62ff047cab4204ad1bc90bc1791b80e1d55";
        libraryHaskellDepends = [ base io-streams unagi-chan ];
        description = "Unagi Chan IO-Streams";
        license = stdenv.lib.licenses.bsd3;
@@ -134666,7 +135104,7 @@ self: {
      mkDerivation {
        pname = "unamb";
        version = "0.2.5";
-       sha256 = "12cbqlc7qf2sf2m4zmisx06bcc104bwivnzq2df0jqdf09bg0n9k";
+       sha256 = "3359f05602ae61095c13f8db1df9222030b60ce83ad64faa705a387c18c58b89";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -134680,7 +135118,7 @@ self: {
      mkDerivation {
        pname = "unamb-custom";
        version = "0.13";
-       sha256 = "0r694wi9xg8brgcwl2kyv5amp6v539l121s9bpmd5lhjdnrvqjwk";
+       sha256 = "934bbcb36d12d2d2ea5d490711681a659b5b55d97e0acad9cb0bbd9e2227c964";
        libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://github.com/luqui/unamb-custom";
        description = "Functional concurrency with unamb using a custom scheduler";
@@ -134695,7 +135133,7 @@ self: {
      mkDerivation {
        pname = "unbound";
        version = "0.4.3.1";
-       sha256 = "1xkp47y7yg8dl95gf4w3iwddc3yivrhcxj184cfhrx6a9rbsflpz";
+       sha256 = "ff52a7574ecaf40c1d2328c8ce60ded10fd61a8f8313f74aa20d3d7ffc2177f6";
        libraryHaskellDepends = [
          base binary containers mtl RepLib transformers
        ];
@@ -134713,7 +135151,7 @@ self: {
      mkDerivation {
        pname = "unbound-generics";
        version = "0.2";
-       sha256 = "0wmr7ylczkaqyf1yrcp9d9gmw8hv7v2yip9v96zlqx02m9j57s99";
+       sha256 = "29e95364aa02744cbf493bdde8c53e1b225e5f6ae9b2ec83f358cdcfa83fb972";
        libraryHaskellDepends = [
          base containers contravariant deepseq mtl profunctors
          template-haskell transformers transformers-compat
@@ -134731,7 +135169,7 @@ self: {
      mkDerivation {
        pname = "unbounded-delays";
        version = "0.1.0.9";
-       sha256 = "1f4h87503m3smhip432q027wj3zih18pmz2rnafh60589ifcl420";
+       sha256 = "4010ca5c4ca800039db259fc7a5180f10fc98f00580c7223ac7ad401ca4190b8";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/basvandijk/unbounded-delays";
        description = "Unbounded thread delays and timeouts";
@@ -134743,7 +135181,7 @@ self: {
      mkDerivation {
        pname = "unbounded-delays-units";
        version = "0.4";
-       sha256 = "02j4i2dms15vb87ar3m99hvpxrjdakljyql708zs716k1jdm7614";
+       sha256 = "2498539b0cd384a33f0287622fe9544de67e374ca98eac0e5abb045d9b88440a";
        libraryHaskellDepends = [ base unbounded-delays units units-defs ];
        jailbreak = true;
        homepage = "https://github.com/jcristovao/unbouded-delays-units";
@@ -134757,7 +135195,7 @@ self: {
      mkDerivation {
        pname = "unboxed-containers";
        version = "0.0.2.4";
-       sha256 = "0yahavqjjnlf4ps8kd41s9s64nbhx2hf7qzk2xxkmq0i3b91d123";
+       sha256 = "438416d21a11e03a7b17f3e3e3a0e870596274d281b489f4258e5a29f1565079";
        libraryHaskellDepends = [ base containers ];
        homepage = "http://github.com/ekmett/unboxed-containers";
        description = "Self-optimizing unboxed sets using view patterns and data families";
@@ -134770,7 +135208,7 @@ self: {
      mkDerivation {
        pname = "unexceptionalio";
        version = "0.2.0";
-       sha256 = "1p1han6027n6d9cx0cqrfrpwqlhkainj7xi839swqj1k6d4n022n";
+       sha256 = "56086049333348cc751a28f6236d541352cc6f761933d0596ac61e018c5530dc";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/singpolyma/unexceptionalio";
        description = "IO without any non-error, synchronous exceptions";
@@ -134783,7 +135221,7 @@ self: {
      mkDerivation {
        pname = "unfoldable";
        version = "0.8.2";
-       sha256 = "0r6jffm2i2la70xzqsribfbsa84ha5g4zfqphp9gqkvr1x2jmr2i";
+       sha256 = "51e42a450f794ffcd28517bb4f5e519020a5975b316bfc3b388a8a28aa73d264";
        libraryHaskellDepends = [
          base ghc-prim QuickCheck random transformers
        ];
@@ -134797,7 +135235,7 @@ self: {
      mkDerivation {
        pname = "ungadtagger";
        version = "1.0.0";
-       sha256 = "1hn30p9vpsvkph54grzwdrca5vh9grpa7d0w1zlvim1mnvqxmn4b";
+       sha256 = "8bd8daf1b635d4b8e90f1cb4a36e7e09eea2586efce7470abc73ebbbd305c3c2";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/andriyp/ungadtagger";
        description = "Abstract GADTs from typelevel tags";
@@ -134809,7 +135247,7 @@ self: {
      mkDerivation {
        pname = "uni-events";
        version = "2.2.2.0";
-       sha256 = "1damlhi56xfp4xvdk2ijxjx7vxywhhbi4hiprdx09b5ipblrfpqz";
+       sha256 = "1f5f97e9bab1ac047acb3742121784dcf77dbaec328ad97627d7755322a455b5";
        libraryHaskellDepends = [ base containers uni-util ];
        homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
        description = "Event handling for the uniform workbench";
@@ -134823,7 +135261,7 @@ self: {
      mkDerivation {
        pname = "uni-graphs";
        version = "2.2.1.0";
-       sha256 = "1vwm0gmgj8c7qdildplr3jng5gj9q6b669vgmnxw4v514y529bz5";
+       sha256 = "e5af248a27a16cc2bbad6f276396c149bef2ac1c99de4663c38721f9ea0395ef";
        libraryHaskellDepends = [
          base containers mtl uni-events uni-htk uni-reactor uni-util
        ];
@@ -134839,7 +135277,7 @@ self: {
      mkDerivation {
        pname = "uni-htk";
        version = "2.2.1.2";
-       sha256 = "1zdbg2jz6dgw4jvicl2vgnnnz2mmq8r9cabfgzw7zyc6ycp5hmyk";
+       sha256 = "d357582ef386f97ff87f6e299632c2b58a6fad7d5b5016b724fc35f3a578abfd";
        libraryHaskellDepends = [
          base containers directory uni-events uni-posixutil uni-reactor
          uni-util
@@ -134856,7 +135294,7 @@ self: {
      mkDerivation {
        pname = "uni-posixutil";
        version = "2.2.1.1";
-       sha256 = "0wh3ni6l1x7rxn5yppva1xs0yb6z5hxfmzxxrnh6hbcq1pa62m5d";
+       sha256 = "ad5461d40d982d68a0cdbdffea3a2cdf2c0f740f6adfeb8bedf9f4404db40372";
        libraryHaskellDepends = [
          base directory process uni-events uni-util unix
        ];
@@ -134871,7 +135309,7 @@ self: {
      mkDerivation {
        pname = "uni-reactor";
        version = "2.2.1.0";
-       sha256 = "147nizw920xbbj5b8kqrgri1r9wpx3qddspnryxhdxq10q1xlyh2";
+       sha256 = "027ada030601f706bbcff6ead6f0e897a71c627e194fb48a5cab0391f88ff690";
        libraryHaskellDepends = [
          base containers directory uni-events uni-util
        ];
@@ -134887,7 +135325,7 @@ self: {
      mkDerivation {
        pname = "uni-uDrawGraph";
        version = "2.2.1.3";
-       sha256 = "1gblb969s9al67srxf7rd9dajy6hji91aw5zaxxhaj0vgqsdb90j";
+       sha256 = "12a4d5347e1b48057b57bf70155294d078a95a6af9b89ef53154259d4c5a74bd";
        libraryHaskellDepends = [
          base containers uni-events uni-graphs uni-posixutil uni-reactor
          uni-util
@@ -134904,7 +135342,7 @@ self: {
      mkDerivation {
        pname = "uni-util";
        version = "2.3.0.1";
-       sha256 = "0simxjsd0qi8yxnpiq88zy3bsrrw5rxfpfknr8yaf4xhc7vv39nh";
+       sha256 = "d0a6b1f761b013a73cca76baeb7a2e3c67bd86ff08e1786df72862d0b4ec356a";
        libraryHaskellDepends = [
          array base bytestring containers directory ghc-prim mtl network
          old-time parsec
@@ -134919,7 +135357,7 @@ self: {
      mkDerivation {
        pname = "unicode";
        version = "0.0";
-       sha256 = "0fy89j864dy5dzfj15aavm8bqpv2f51zf42dyjvs50qah3shh5yl";
+       sha256 = "d41708f5800a83a2b7f44d10f74371625fbc50dd4a9520dd6fc53762904cc83b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -134934,7 +135372,7 @@ self: {
      mkDerivation {
        pname = "unicode-names";
        version = "3.2.0.0";
-       sha256 = "15088dbmhvw118p3w08wxpsx41gzi0wqinqyg143225pp07aa5gc";
+       sha256 = "ec15a50eb8b7083148781edb883988ff05d2f5ed1c013e2e0a816f5857430894";
        libraryHaskellDepends = [
          array base containers unicode-properties
        ];
@@ -134947,7 +135385,7 @@ self: {
      mkDerivation {
        pname = "unicode-normalization";
        version = "0.1";
-       sha256 = "1smfc7a62xi6y4sc0vai2l0nljxl9dr9l5zkqi17n14cq36ppfwb";
+       sha256 = "8bbb7bcdc08c047b42c4f3179a724bb44b6a0115516dc034f1267661d461aeea";
        libraryHaskellDepends = [ base bytestring compact-string ];
        librarySystemDepends = [ icu ];
        homepage = "http://sloompie.reinier.de/unicode-normalization/";
@@ -134961,7 +135399,7 @@ self: {
      mkDerivation {
        pname = "unicode-prelude";
        version = "0.1.1";
-       sha256 = "05zakihlk06wckzgm43f3g26fjdn4gb3d1ypw4vcwqmipq2dbfsw";
+       sha256 = "5cbbd504beb162ce36e1d78736d623b64967c41b6e90fafe64dc8049619cea17";
        libraryHaskellDepends = [ base ];
        description = "Unicode notation for some definitions in Prelude";
        license = stdenv.lib.licenses.bsd3;
@@ -134972,7 +135410,7 @@ self: {
      mkDerivation {
        pname = "unicode-properties";
        version = "3.2.0.0";
-       sha256 = "06zrr2z9irbsxwf7fbnhp2sg36ykb2amfys2y78nzn0mw63xb3q1";
+       sha256 = "018fd587e115d86fd1f1427b579558d39bf1b4b8d02e771cef7ae598bec8f91b";
        libraryHaskellDepends = [ array base containers ];
        description = "Unicode 3.2.0 character properties";
        license = stdenv.lib.licenses.bsd3;
@@ -134983,7 +135421,7 @@ self: {
      mkDerivation {
        pname = "unicode-symbols";
        version = "0.1.1.2";
-       sha256 = "0y1awqrf1x2in158linszma69zyz3zp14h3rmdx3vmbmif9fvbyv";
+       sha256 = "dbafed928b75d53d7aab794012ee1fdfff6454fdda468a4ab051f4e032e62a78";
        libraryHaskellDepends = [ base containers ];
        jailbreak = true;
        description = "Unicode alternatives for common functions and operators";
@@ -134995,7 +135433,7 @@ self: {
      mkDerivation {
        pname = "unicoder";
        version = "0.4.1";
-       sha256 = "17a2rxq5b4a66ia4jm1g0lmkvsanfc477567wygq9kz4w9q4xwc3";
+       sha256 = "83f14e70e2e4cf849fe7c79473087356e93d2b052f5449543446915570cf429d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base text ];
@@ -135013,7 +135451,7 @@ self: {
      mkDerivation {
        pname = "unification-fd";
        version = "0.10.0.1";
-       sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v";
+       sha256 = "5bf46760e6db104c57f915322b32744f7604323281f5c7dd20185f905fb51996";
        libraryHaskellDepends = [ base containers logict mtl ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Simple generic unification algorithms";
@@ -135028,7 +135466,7 @@ self: {
      mkDerivation {
        pname = "uniform-io";
        version = "0.1.1.0";
-       sha256 = "0i9sdf2nnaf099r79mdrqa1hbbqyb874fk8dsqqzb1582m6czikk";
+       sha256 = "73c6cf4c15a884f531d60d4d470e5a1eaf0583c2b9d574724ac0296b856b3a45";
        revision = "1";
        editedCabalFile = "4f0651eff7cbdde40b49b5fcf90e8adf5c403a7c150ac318f0f5280b454b19f9";
        libraryHaskellDepends = [
@@ -135048,7 +135486,7 @@ self: {
      mkDerivation {
        pname = "uniform-pair";
        version = "0.1.5";
-       sha256 = "0zkkhxmhx7xpi0fjxks435z5p52f2jvw8fvp0z2qi81a18v8fh81";
+       sha256 = "014187360a2aa088c507773bc4b7144e945b7e1944cf2e1d88b79f0e6b87737e";
        libraryHaskellDepends = [ base ShowF ];
        homepage = "https://github.com/conal/uniform-pair/";
        description = "Uniform pairs with class instances";
@@ -135060,7 +135498,7 @@ self: {
      mkDerivation {
        pname = "union-find";
        version = "0.2";
-       sha256 = "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6";
+       sha256 = "e6c2682bb8c06e8c43e360f45658d0eea17209cce84953e2a7d2f0240591f0ec";
        libraryHaskellDepends = [ base containers transformers ];
        homepage = "http://github.com/nominolo/union-find";
        description = "Efficient union and equivalence testing of sets";
@@ -135072,7 +135510,7 @@ self: {
      mkDerivation {
        pname = "union-find-array";
        version = "0.1.0.2";
-       sha256 = "1pxb1v2k04i8ds2n8zqra74gacry6dj5p87sxgkf4fazx4s316dk";
+       sha256 = "b3993034e95f39e2e6ebfaa05b64333e33f5c851197f64856e281230c50eabdf";
        libraryHaskellDepends = [ array base mtl ];
        homepage = "https://github.com/haskell-rewriting/union-find-array";
        description = "union find data structure";
@@ -135084,7 +135522,7 @@ self: {
      mkDerivation {
        pname = "union-map";
        version = "0.1";
-       sha256 = "0q1qg0vg01ypjlb90xq8zl3zc53b3yn23vgpnzv92q7xmc46gb5l";
+       sha256 = "b4ac6708abfd6091f6b7f7ed21ac1f6b14f607fd0877901695d707f036783860";
        libraryHaskellDepends = [ base containers extensible ];
        homepage = "http://github.com/minpou/union-map";
        description = "Heterogeneous map by open unions";
@@ -135099,7 +135537,7 @@ self: {
      mkDerivation {
        pname = "uniplate";
        version = "1.6.12";
-       sha256 = "1dx8f9aw27fz8kw0ad1nm6355w5rdl7bjvb427v2bsgnng30pipw";
+       sha256 = "fcc60bc6b3f6e925f611646db90e6db9f05286a9363405f844df1dc15572a8b7";
        libraryHaskellDepends = [
          base containers hashable syb unordered-containers
        ];
@@ -135115,7 +135553,7 @@ self: {
      mkDerivation {
        pname = "unique-logic";
        version = "0.3";
-       sha256 = "0pjkqvam73d6xy528r9zf75km2yr997in902174raj6kw3kgdl41";
+       sha256 = "81d0f6e6e0d34895c90902241b4f4ad98b3acb713f65248aefa68d53d5c6535e";
        libraryHaskellDepends = [ base transformers utility-ht ];
        testHaskellDepends = [
          base non-empty QuickCheck transformers utility-ht
@@ -135133,7 +135571,7 @@ self: {
      mkDerivation {
        pname = "unique-logic-tf";
        version = "0.4.1.1";
-       sha256 = "0gc41whidll04fgzjydcxgxvq270ncvqcamsd3b3qd4hfn3v9qv8";
+       sha256 = "68e3b4877590343cd668ba2a8637b3e008bcfbebac79f99f2380d216210f843d";
        libraryHaskellDepends = [
          base containers explicit-exception transformers utility-ht
        ];
@@ -135152,7 +135590,7 @@ self: {
      mkDerivation {
        pname = "uniqueid";
        version = "0.1.1";
-       sha256 = "0s1jw29g5s9ll8hbfkyalhdjpsv54w1n63mz4jph36dbq68zb7g6";
+       sha256 = "e69df591c1ab9901af24bf0e63032765eb2b1ba4ca4fb720a234e9f292e03268";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/sebfisch/uniqueid/wikis";
        description = "Splittable Unique Identifier Supply";
@@ -135168,7 +135606,7 @@ self: {
      mkDerivation {
        pname = "units";
        version = "2.3";
-       sha256 = "14h5566b68wr5qln3x4a862j0zmfdlishipbj9mhd2wmpri6bmzj";
+       sha256 = "f2d76562be958b066b92eb46a8236dae7e2085418af461292e9923b38c290592";
        libraryHaskellDepends = [
          base containers mtl multimap singletons syb template-haskell
          th-desugar units-parser vector-space
@@ -135190,7 +135628,7 @@ self: {
      mkDerivation {
        pname = "units-attoparsec";
        version = "1.0";
-       sha256 = "11saazsgx7gpbfhwwgvrp3zwirkvv8h8c61rrsczfq1qmsljxxiz";
+       sha256 = "3ff62ea9ae3860f799ce39188620da7be6c8ffb8793fcea15bf79dfef4574a87";
        libraryHaskellDepends = [
          attoparsec base template-haskell text units units-defs
        ];
@@ -135204,7 +135642,7 @@ self: {
      mkDerivation {
        pname = "units-defs";
        version = "2.0.0.1";
-       sha256 = "04k9wjyq23ml89nnjx2lwxiik54wc4rcbmpvvr7fh9wgsl74k6pv";
+       sha256 = "fb9a490ed58f27e84edefbd6c532619c941963e75474696d42b40e81bde46912";
        libraryHaskellDepends = [ base template-haskell units ];
        homepage = "http://github.com/goldfirere/units-defs";
        description = "Definitions for use with the units package";
@@ -135219,7 +135657,7 @@ self: {
      mkDerivation {
        pname = "units-parser";
        version = "0.1.0.0";
-       sha256 = "0ha1saapphk15xk10a36k5qmn01nqpz10f8gi35ra9zqlhv8amfq";
+       sha256 = "d8558536a4f82795cb880f3910fec536005b7199662810662f61c27b95d24141";
        libraryHaskellDepends = [ base containers mtl multimap parsec ];
        testHaskellDepends = [
          base containers mtl multimap parsec syb tasty tasty-hunit
@@ -135234,7 +135672,7 @@ self: {
      mkDerivation {
        pname = "unittyped";
        version = "0.1";
-       sha256 = "1ab27rwnp8ncfn5sm4llxjxx7fbp495sl1838g8z9hishr5dgddl";
+       sha256 = "b4b5d74a863ac2f4d1430305aa4b2277b9d3bbec9492aa8b75cca26b793e62a9";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        jailbreak = true;
@@ -135249,7 +135687,7 @@ self: {
      mkDerivation {
        pname = "universal-binary";
        version = "0.11";
-       sha256 = "1gnrq6s7pipjqfyispkxib3xfzii1ss6a9iwv07mvb5a93hc45cw";
+       sha256 = "9c15c2e048aaac5d0fd83c2665b40e317ed7c78a7d5e1dbdc3f2c67bb4c1d9be";
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for OS X Universal Binary format";
        license = stdenv.lib.licenses.bsd3;
@@ -135263,7 +135701,7 @@ self: {
      mkDerivation {
        pname = "universe";
        version = "1.0";
-       sha256 = "19zr9zcqc5sfp5qfn8slkk2732j1814m3j1jkbim739limwf900z";
+       sha256 = "1f80e4788d348d53e39a32c8514940418a71c49c5423eb70b94e1786d94ff9a7";
        libraryHaskellDepends = [
          universe-instances-base universe-instances-extended
          universe-instances-trans universe-reverse-instances
@@ -135278,7 +135716,7 @@ self: {
      mkDerivation {
        pname = "universe-base";
        version = "1.0";
-       sha256 = "1bhgmikh876bda37a79iapzp58ssgfx6n57gpblyd1fprxnwqxc4";
+       sha256 = "8475cc6dcfd785e6e9baef146bba7b5aa372ff55311d75866acb1c0467ac0fae";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/dmwit/universe";
        description = "A class for finite and recursively enumerable types and some helper functions for enumerating them";
@@ -135290,7 +135728,7 @@ self: {
      mkDerivation {
        pname = "universe-instances-base";
        version = "1.0";
-       sha256 = "04njgl32lk5a0masjdjkm4l2wsyrr29g0fsp599864mp7gp504d2";
+       sha256 = "a21150ee3bb71283522a573bf092c8d96b2e28a95336a95505aa4c2a067dd212";
        libraryHaskellDepends = [ base containers universe-base ];
        homepage = "https://github.com/dmwit/universe";
        description = "Universe instances for types from the base package";
@@ -135304,7 +135742,7 @@ self: {
      mkDerivation {
        pname = "universe-instances-extended";
        version = "1.0";
-       sha256 = "0cla7n6id0v2pphmzsc8cbghvhyjjx9720gmxdqch8ysrfknkbgi";
+       sha256 = "f1ad69a7cbda23c870ebf501715297d2c30ddf6288e95fe1bd6283168d3d8a32";
        libraryHaskellDepends = [
          adjunctions base comonad universe-instances-base void
        ];
@@ -135321,7 +135759,7 @@ self: {
      mkDerivation {
        pname = "universe-instances-trans";
        version = "1.0.0.1";
-       sha256 = "03iix0bdhfi4qlgwr8sl3gsqck6lsbkqgx245w2z5yaaxgqpq10d";
+       sha256 = "0d047cf1eb4af9f2052f44f487e7d2d44c86f51b54a3cc1fc5243ad816e8310e";
        libraryHaskellDepends = [
          base mtl transformers universe-base universe-instances-base
        ];
@@ -135335,7 +135773,7 @@ self: {
      mkDerivation {
        pname = "universe-reverse-instances";
        version = "1.0";
-       sha256 = "0jcd7qyvzq8xxv9d3hfi0f1h48xdsy9r9xnxgxc7ggga4szirm79";
+       sha256 = "e9d41cbf26eabd77587fddf69493d7ad23028303d1c1d1d2ee1de1bf3d3e8d49";
        libraryHaskellDepends = [
          base containers universe-instances-base
        ];
@@ -135353,7 +135791,7 @@ self: {
      mkDerivation {
        pname = "universe-th";
        version = "0.0.0.6";
-       sha256 = "143kcgv4lp9266d8za878l343j6g97mxc3z7gj348jjamvpyg9wx";
+       sha256 = "9da7e7efae4a4a44867ce70fd6eb49cfc841064507a98f9a31225d4af6637390";
        libraryHaskellDepends = [
          base composition mtl template-haskell tuple uniplate
        ];
@@ -135373,7 +135811,7 @@ self: {
      mkDerivation {
        pname = "unix";
        version = "2.7.1.0";
-       sha256 = "0p74ljsl1zgwnyl69pg4l15z5rqidam9fw9il4siam2m700ydm3b";
+       sha256 = "6bd4e6013855541535a1317197aa6a11e7f24ba0e4dd64a8b7fcfd40b5a4e45c";
        libraryHaskellDepends = [ base bytestring time ];
        homepage = "https://github.com/haskell/unix";
        description = "POSIX functionality";
@@ -135385,7 +135823,7 @@ self: {
      mkDerivation {
        pname = "unix-bytestring";
        version = "0.3.7.3";
-       sha256 = "1340zxy9w8nmmhhwgg9rznvz8iyfhinpycdpkryqp60ilhyjgv53";
+       sha256 = "a3ec273da411988b7d9eb7317f6d84ce47f4b7fd39bdc721acd5229e7cff808c";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Unix/Posix-specific functions for ByteStrings";
@@ -135397,7 +135835,7 @@ self: {
      mkDerivation {
        pname = "unix-compat";
        version = "0.4.1.4";
-       sha256 = "0jxk7j5pz2kgfpqr4hznndjg31pqj5xg2qfc5308fcn9xyg1myps";
+       sha256 = "fafa1a9eefc93287c028cc61f17a91f886f164b3f64392f1756f8a7f8b3cb34b";
        libraryHaskellDepends = [ base unix ];
        homepage = "http://github.com/jystic/unix-compat";
        description = "Portable POSIX-compatibility layer";
@@ -135409,7 +135847,7 @@ self: {
      mkDerivation {
        pname = "unix-fcntl";
        version = "0.0.0";
-       sha256 = "18rjz14x1mbwdppf18gv3x4jwvz68bb2n1b11ygck60yl4pqbhb9";
+       sha256 = "69c1852fa11e98c99e0f61052bd642e66f2e491ffba1e0ee6d7cd5d049f832a3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base foreign-var ];
@@ -135424,7 +135862,7 @@ self: {
      mkDerivation {
        pname = "unix-handle";
        version = "0.0.0";
-       sha256 = "07ysmd9ks5lm2lg1dik75m509ryn5azw28j9hcisknf5bmrfy9li";
+       sha256 = "9126ef725dc5d9a923834922c1bf2ad6e7044a2d67c6161e1595163d53abda1f";
        libraryHaskellDepends = [ base unix ];
        description = "POSIX operations on Handles";
        license = stdenv.lib.licenses.bsd3;
@@ -135435,7 +135873,7 @@ self: {
      mkDerivation {
        pname = "unix-io-extra";
        version = "0.1";
-       sha256 = "1qy28y1apm2dxp47v0ngxj4ww3iyq4lj0n0i4z9phyr1122fglig";
+       sha256 = "2fd2e78408217b78d32711582029c13e0ece89eccf827dc8ed4dd4ab8247c2e3";
        libraryHaskellDepends = [ base ];
        description = "Support for writev, pwrite and pread";
        license = stdenv.lib.licenses.bsd3;
@@ -135448,7 +135886,7 @@ self: {
      mkDerivation {
        pname = "unix-memory";
        version = "0.1.2";
-       sha256 = "1r8s7z39d31h1n7rcincy156lbsvamr6jicx52kv8simb9gvarpp";
+       sha256 = "f766b55f5a356ab4a7289d456972555b2f6a4af0cc46968f0d308c96c63f1ae5";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck unix
@@ -135465,7 +135903,7 @@ self: {
      mkDerivation {
        pname = "unix-process-conduit";
        version = "0.2.2.3";
-       sha256 = "0ldgjwdvshggygxn9fpnxvb01dba0q0bn9f7iiw5xgqhli46nvcy";
+       sha256 = "9e6d6b48a410bf5e788cc725bb00066ab500d6eef6ba64fbf3ef41bd1b97af51";
        libraryHaskellDepends = [
          base bytestring conduit directory filepath process stm time
          transformers unix
@@ -135485,7 +135923,7 @@ self: {
      mkDerivation {
        pname = "unix-pty-light";
        version = "0.1";
-       sha256 = "1n21cd6chih86g6kfl6b0x4k533ykzz93anhf6wga3033rvy09wj";
+       sha256 = "9227e0771e030cf5b871d0aa91fe9f7e8c324907cb5037cd330846c84c6341d8";
        libraryHaskellDepends = [ base unix ];
        homepage = "http://code.haskell.org/~scook0/unix-pty-light";
        description = "POSIX pseudo-terminal support";
@@ -135499,7 +135937,7 @@ self: {
      mkDerivation {
        pname = "unix-time";
        version = "0.3.5";
-       sha256 = "0pk7046lmvl7dw6g7508xsixwi3gpiq5dw0a0lfwpfr80g6mh73z";
+       sha256 = "7f1c58cd0328bbcb1d050af05670bc6f44dea3ee0894f30c6f87ee4a0d01675e";
        libraryHaskellDepends = [ base binary bytestring old-time ];
        testHaskellDepends = [
          base bytestring doctest hspec old-locale old-time QuickCheck time
@@ -135513,7 +135951,7 @@ self: {
      mkDerivation {
        pname = "unlambda";
        version = "0.1.4.1";
-       sha256 = "01v0cl540gwc8j3x6q9gc7bvdcm9f843qbbk15llw9ik2dfm5987";
+       sha256 = "07a5525d1333264e6909732d3c0872a9b2b6d7612f61d387448c3f400a656007";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base mtl ];
@@ -135527,7 +135965,7 @@ self: {
      mkDerivation {
        pname = "unlit";
        version = "0.3.0.3";
-       sha256 = "0nwd4cm3licmdx06cmq42ig7r0iirw2s3ifnna4yzxpysj2aapnf";
+       sha256 = "ce5ea584d4fef6ef89b2d6c5a105cf31827c5e14045766406f95453a2a238d5b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory text ];
@@ -135544,7 +135982,7 @@ self: {
      mkDerivation {
        pname = "unm-hip";
        version = "0.3.1.6";
-       sha256 = "170ivv689jg2k9p8czp6miq3samjbdwanh3vh9csm8iq88yrzry5";
+       sha256 = "c5e79f3d4238a2aa59827b40ab785bb22a3d70ace67e866e9ae2c984ccde119c";
        libraryHaskellDepends = [
          array base bytestring containers process vector
        ];
@@ -135560,7 +135998,7 @@ self: {
      mkDerivation {
        pname = "unordered-containers";
        version = "0.2.5.1";
-       sha256 = "06l1xv7vhpxly75saxdrbc6p2zlgz1az278arfkz4rgawfnphn3f";
+       sha256 = "6e5878ade3ea65f2a7cb0a1df155f88f7e710d5bb975a5cbf1b45fb8cfee811a";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [
          base ChasingBottoms containers hashable HUnit QuickCheck
@@ -135578,7 +136016,7 @@ self: {
      mkDerivation {
        pname = "unordered-containers-rematch";
        version = "0.1.0.0";
-       sha256 = "13ld8whx1m5xglaj2adsn0qb1x00p6ir8l9kz7fv815n6ahgcii8";
+       sha256 = "2846f6a032b604b4ddf9335194a3b900f4b030b0ba2921157dbdd4d021478d8e";
        libraryHaskellDepends = [
          base hashable rematch unordered-containers
        ];
@@ -135599,7 +136037,7 @@ self: {
      mkDerivation {
        pname = "unpack-funcs";
        version = "0.3.1";
-       sha256 = "0ha8xbg1a560rd5grg6i2acg3nzq6f4d6qa7i6vrbnz7bqbg77q3";
+       sha256 = "039ff3165ee7db95b7894761d38833f8dbf19812d1bcfc4acbc01415deea4841";
        libraryHaskellDepends = [
          base bytestring primitive template-haskell transformers vector
        ];
@@ -135613,7 +136051,7 @@ self: {
      mkDerivation {
        pname = "unroll-ghc-plugin";
        version = "0.1.1";
-       sha256 = "0n05777fqqpbgnh9jab04ayw1j1as4wkkbrjixi1288fhi44m87p";
+       sha256 = "f7a04a48840e2111628f32af3939d12ac8c0bd22602999a07deb62ecce390558";
        libraryHaskellDepends = [ base ghc ];
        homepage = "http://thoughtpolice.github.com/unroll-ghc-plugin";
        description = "Compiler plugin for loop unrolling";
@@ -135625,7 +136063,7 @@ self: {
      mkDerivation {
        pname = "unsafe";
        version = "0.0";
-       sha256 = "0hc6xr1i3hkz25gdgfx1jqgpsc9mwa05bkfynp0mcfdlyz6782nz";
+       sha256 = "df0a74ccf7b43956c1b5decd5580e235317d1f96a1bbd75e117fc21143ee8641";
        libraryHaskellDepends = [ base ];
        homepage = "http://code.haskell.org/~thielema/unsafe/";
        description = "Unified interface to unsafe functions";
@@ -135637,7 +136075,7 @@ self: {
      mkDerivation {
        pname = "unsafe-promises";
        version = "0.0.1.3";
-       sha256 = "1018c3q0aq6l0011az661dvlibiv6jvwdv4c40bi8pwapri66k70";
+       sha256 = "e04c6362be8a5f1417208cecc6b7343bae48770bc67c150200d46005f0602880";
        libraryHaskellDepends = [ base threads ];
        homepage = "https://github.com/kallisti-dev/unsafe-promises";
        description = "Create pure futures using lazy IO";
@@ -135649,7 +136087,7 @@ self: {
      mkDerivation {
        pname = "unsafely";
        version = "0.2.0.0";
-       sha256 = "10v50bzd7ccjs0d1spvyl6awhwdhxmkcacm2lkillk9f7myild0r";
+       sha256 = "19341a7d3d2e4d4ae3a4a232c566edb071c895a17e5f1d1ad092b1d3fe026583";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -135665,7 +136103,7 @@ self: {
      mkDerivation {
        pname = "unsafeperformst";
        version = "0.9.2";
-       sha256 = "0l268mzlmswm0p9cybjvi6krsgic706av9kf90fx3ylyvhgzygvc";
+       sha256 = "6c3fff1fdc9efad11d486ea6ad0c382c3e9da7895b2ecfd20595eb4a7f454650";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/atzeus/unsafeperformst";
        description = "Like unsafeperformIO, but for the ST monad";
@@ -135679,7 +136117,7 @@ self: {
      mkDerivation {
        pname = "unscramble";
        version = "1.0";
-       sha256 = "1zlf9dw3yid6s9p0q837h3qs2wnd9wr9kh282j4j4m0gpv9dcrrf";
+       sha256 = "2e67d6d2be0f5422891448c099324fcd72a1f18067200c6ed2a6453f784b8efe";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -135695,7 +136133,7 @@ self: {
      mkDerivation {
        pname = "unusable-pkg";
        version = "0.1";
-       sha256 = "102dzsa64vnbhx2pnnh6q0vn7wag9bd8pmmag3i2yl68iqaqlvpm";
+       sha256 = "f56e8a158ec8502fe278aad68bda4a4ff16337c0065a7b4587cb6e6294fe4d80";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -135710,7 +136148,7 @@ self: {
      mkDerivation {
        pname = "up";
        version = "1.0.0.3";
-       sha256 = "1w37jmnmx2vrdwbdcnhb29bvy4857pzcx4gdavmcp598lsfj34vy";
+       sha256 = "7e93219da62895cbea56ed91cefe3d0511bf57120b5ad6166f798b5e6d9567f0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -135728,7 +136166,7 @@ self: {
      mkDerivation {
        pname = "up-grade";
        version = "0.0.2";
-       sha256 = "1njmx622ghpzgnwm4wykzjj1ixpalbj21hs7nkbwpmljniakp2fb";
+       sha256 = "cb893b55b492d6cbd7b447c320e4a2eaf618a4fcd37352b97dffc22784e955da";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ports-tools process ];
@@ -135744,7 +136182,7 @@ self: {
      mkDerivation {
        pname = "uploadcare";
        version = "0.1";
-       sha256 = "1lm7mp8djhxylavihaljqjfsgzpn747plkq6f7yd2dk32xlsb5bz";
+       sha256 = "7f95a569176336d1fc71064f7a0f39f6fea79dc4922a18b7a2be43d9d0ada7d2";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cryptohash hex http-conduit
          http-types old-locale time
@@ -135760,7 +136198,7 @@ self: {
      mkDerivation {
        pname = "upskirt";
        version = "0.0.4";
-       sha256 = "0528345xiq2xmi9fwzv0rvbjqfhcvyhkik8c453yr2nr03k0zs4c";
+       sha256 = "8ce80fe600d98aec47210ccd38a1df0c3a2cd7ce607fee52ac5de0d80b194814";
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to upskirt";
        license = stdenv.lib.licenses.publicDomain;
@@ -135777,7 +136215,7 @@ self: {
      mkDerivation {
        pname = "ureader";
        version = "0.2.0.0";
-       sha256 = "11zgs8mmmkvddyq6s0x98gdqbdaj6n3rxf6ab3xf1ap2cd4siwb8";
+       sha256 = "68f1a84963e2aae0fa58cab89e873552b585db43a9036db06f6dcf5a2bd2ef87";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -135801,7 +136239,7 @@ self: {
      mkDerivation {
        pname = "urembed";
        version = "0.5.0.1";
-       sha256 = "0fnr3xskzwxxxk7iv5bmqa18zbr612pn27jjiac0l4wzv33lisik";
+       sha256 = "33ea48c7d89f130a988a521e61af0826af8f82c275951dcfecbdf33f751fd93a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -135820,7 +136258,7 @@ self: {
      mkDerivation {
        pname = "uri";
        version = "0.1.6.3";
-       sha256 = "1dhmrn4mq3ia0iv3y2k5pw71a6677q3vdqqf2w4b3aksi6wna49j";
+       sha256 = "321165b9897aaab108170ee3b6073ec718150ebf650a3f76042a0e5c89cd15b6";
        libraryHaskellDepends = [ base parsec safe utf8-string ];
        homepage = "http://gitorious.org/uri";
        description = "Library for working with URIs";
@@ -135835,7 +136273,7 @@ self: {
      mkDerivation {
        pname = "uri-bytestring";
        version = "0.1.6";
-       sha256 = "0wz45jrxrj2mqx26nv39hy962acmzchp97lbf3d2mjna9zcd1ij6";
+       sha256 = "46c6d0d84fcaca2ada708b9e7421fb9529619287696c6b44c755c8dcb32ce473";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring
        ];
@@ -135856,7 +136294,7 @@ self: {
      mkDerivation {
        pname = "uri-conduit";
        version = "1.1.1.2";
-       sha256 = "0bmq241in1x0bjffp6nmbz8lf324q926mcddpvmzn2j1ipy7fvg6";
+       sha256 = "e66d77fc8d410afbebbeadb16a44c2440c47d15fd59aeb9c5ca0071b0311b82e";
        libraryHaskellDepends = [
          base bytestring conduit containers deepseq failure monad-control
          network system-fileio system-filepath text transformers
@@ -135874,7 +136312,7 @@ self: {
      mkDerivation {
        pname = "uri-encode";
        version = "1.5.0.4";
-       sha256 = "10pmg48h1az474qsr951inyvkm5y9xqwrdzyvxf83k53i07kijpp";
+       sha256 = "f7ca380f88a3cc815cdffeb7cc714fbed4b9bd8da1a4ac3139e4ab001179f582";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -135891,7 +136329,7 @@ self: {
      mkDerivation {
        pname = "uri-enumerator";
        version = "0.1.0.1";
-       sha256 = "164yzmx18ykkf2vbl9zhqmbvb80dig8bx3pfadw23a6wyvigmhw5";
+       sha256 = "85c3fae2f6dca8217853ee8ebed08b0da0b557c5f027bab670737a147afd9e98";
        libraryHaskellDepends = [
          base bytestring containers enumerator failure network text
          transformers
@@ -135911,7 +136349,7 @@ self: {
      mkDerivation {
        pname = "uri-enumerator-file";
        version = "0.1.1.1";
-       sha256 = "15ycv01kmwnwq3qkjjcl8ayal0p4klhflzkykm2rlq1d8mi2vmd6";
+       sha256 = "a6d52d62452d609a459d7e7eea209de402aabc42944939f1c0dcf23a03d8cc97";
        libraryHaskellDepends = [
          base bytestring containers enumerator lifted-base monad-control
          network system-fileio system-filepath text transformers
@@ -135929,7 +136367,7 @@ self: {
      mkDerivation {
        pname = "uri-template";
        version = "0.2";
-       sha256 = "1y1jqymjbawwdywk770j4rk8sy7p1plvfliwcmqr0h16y31kzlpl";
+       sha256 = "f4d23fc3f026409071653c52b7e90df7788d6626129c33b96f9cab25abc732f8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers utf8-string ];
@@ -135946,7 +136384,7 @@ self: {
      mkDerivation {
        pname = "uri-templater";
        version = "0.2.0.0";
-       sha256 = "0ypyi5vz7fjgvw1xicjksjfbpvm472dif2jw6pn09jfgqkal075s";
+       sha256 = "ba1c40d5c4cfc904ec355c0a179b38a4eebb9cd453b2d803df4fbaf37789fe7a";
        libraryHaskellDepends = [
          ansi-wl-pprint base charset containers dlist HTTP mtl parsers
          template-haskell text trifecta unordered-containers vector
@@ -135964,7 +136402,7 @@ self: {
      mkDerivation {
        pname = "url";
        version = "2.1.3";
-       sha256 = "0qag18wbrq9jjk1444mjigz1xl7xl03fz66b1lnya9qaihzpxwjs";
+       sha256 = "5af27e3f8c0a27e52d0dcb98ef06a0fdd01efe8bb21242c29432e1bc380a4f61";
        libraryHaskellDepends = [ base utf8-string ];
        homepage = "http://www.haskell.org/haskellwiki/Url";
        description = "A library for working with URLs";
@@ -135976,7 +136414,7 @@ self: {
      mkDerivation {
        pname = "url-generic";
        version = "0.1";
-       sha256 = "0yfcy2nhc67kxb7n9mjxi4z5jcq4iz4kq80fb9lbi461vijhmw5m";
+       sha256 = "b5f00a65dcc190b8685a0e203cc98f0433593e895dd664cfeaf31806adf0cc79";
        revision = "1";
        editedCabalFile = "d9926e2ce6433a73b2ba940d476f7046890752c8a1145b42a78561e8d3ff6fb9";
        libraryHaskellDepends = [ base mtl syb ];
@@ -135992,7 +136430,7 @@ self: {
      mkDerivation {
        pname = "urlcheck";
        version = "0.1.1";
-       sha256 = "1mddlppdb0c9pxvjfm40i0bcrg7wbc61hzlrlv6kir0n1j9yb8ri";
+       sha256 = "31a3e5930c16e438cda6997e180c5bfcbccc168880542777bf8981d5eea5add5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -136009,7 +136447,7 @@ self: {
      mkDerivation {
        pname = "urldecode";
        version = "1.0.0.2";
-       sha256 = "13fip41s78qcnrg4zccd5lk3qbsaax7h5sspc0xjzlaca664hq3y";
+       sha256 = "7e60488c514cd12f3b6057eb024f574a2f3c262d8db14f5eb60ca3a303b9d18d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base network ];
@@ -136024,7 +136462,7 @@ self: {
      mkDerivation {
        pname = "urldisp-happstack";
        version = "0.1";
-       sha256 = "1kg25w5pnmsnjwycnf0q6d65cqfw5d0xn9rwyn4ybhh3a8q2yaa8";
+       sha256 = "48292f305203c2e589f53c27db412bdc61564c331838cb3c9756577b0b2fe2cd";
        libraryHaskellDepends = [ base bytestring happstack-server mtl ];
        description = "Simple, declarative, expressive URL routing -- on happstack";
        license = stdenv.lib.licenses.bsd3;
@@ -136036,7 +136474,7 @@ self: {
      mkDerivation {
        pname = "urlencoded";
        version = "0.4.1";
-       sha256 = "16b7jxkfva8dyvl4fdg337jmv08aicycj041s79ak9r6zh41hhwi";
+       sha256 = "91431808fc26a7a9d2d18100c93c8b0a815de519e33547e8f60da9ed66976799";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl network network-uri split ];
@@ -136052,7 +136490,7 @@ self: {
      mkDerivation {
        pname = "urlpath";
        version = "2.1.0";
-       sha256 = "1q8zj228ln9xmr3r0ggv6pi074l8ixchn81mw8664jikf2pjcqq9";
+       sha256 = "096326af70334a620ce235200b598f889203e235fb3d9047ae3d598a84901fe1";
        revision = "1";
        editedCabalFile = "a342b25d9ea3984cf20025d421f59629d7abdf4bd2b42a4e9ef53ba5729f13e1";
        libraryHaskellDepends = [
@@ -136071,7 +136509,7 @@ self: {
      mkDerivation {
        pname = "urn";
        version = "0.1.0.0";
-       sha256 = "1wxgq445nzfly9773bjx3mr15l8ga4840d2q1zw50kk07fwxx6h7";
+       sha256 = "079adeb93b604e50f80f58344010510fd112721d5dae714ef2d47d5b08c1aff3";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec ];
        jailbreak = true;
@@ -136087,7 +136525,7 @@ self: {
      mkDerivation {
        pname = "urxml";
        version = "0.2.0.0";
-       sha256 = "141b2dhqpbirqlv53rm3xsl14mq0vxw96r3qhygraw5gp5vlvgl9";
+       sha256 = "89be4d77b9af70959f8778649378df005712a8eea3e65136c539ae8b61132b90";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -136107,7 +136545,7 @@ self: {
      mkDerivation {
        pname = "usb";
        version = "1.3.0.3";
-       sha256 = "0wn17x61pnckrxn4gba7fdk1phjm82dc2wiblm2wc36xf6mw16yf";
+       sha256 = "ce9bc0ab71dd0cc645a52b72c19a4055c21b667347ad476ccf93d91b4c3fc172";
        libraryHaskellDepends = [
          base bindings-libusb bytestring containers ghc-prim text vector
        ];
@@ -136123,7 +136561,7 @@ self: {
      mkDerivation {
        pname = "usb-enumerator";
        version = "0.3";
-       sha256 = "1gd132pshcqa8539g1dmx1hpzfdd33x7vpi9d3hrc6q6l6312nfs";
+       sha256 = "da591186a1061b96e16829de7dfa18adb97f61e8b5859746410a33a8af18a1bd";
        libraryHaskellDepends = [
          base base-unicode-symbols bindings-libusb iteratee monad-control
          transformers usb
@@ -136139,7 +136577,7 @@ self: {
      mkDerivation {
        pname = "usb-hid";
        version = "0.1.0.0";
-       sha256 = "0mx4f1zrk098c9isczni66i8qisx54r85kwyk2s238dznlys39gh";
+       sha256 = "f0a5a13db5bfa121b4989ecf8232295d478ca231d17ea663622881997f70a457";
        revision = "1";
        editedCabalFile = "3fe150e203f72b72c425bef276254a2ca91ca40cab21f6088838bb32c806e8dc";
        libraryHaskellDepends = [ attoparsec base bytestring usb ];
@@ -136156,7 +136594,7 @@ self: {
      mkDerivation {
        pname = "usb-id-database";
        version = "0.4.0.9";
-       sha256 = "1ji6zrglmlkhv743w4d4lrqvhva4yl5kqxb420z44l1wymvgg1s1";
+       sha256 = "4187f776f53c50423e1064753c0bf5446db871a6a4113ec8d970d24a5ffe26ca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -136175,7 +136613,7 @@ self: {
      mkDerivation {
        pname = "usb-iteratee";
        version = "0.5";
-       sha256 = "04kv2pfw24d46b135p6mwgf40wb9q43lcy66cbczh4lz0630j771";
+       sha256 = "e11c0986019f12f8d962c6784607c1697140dce3d5dc32c232a411c1dd157b12";
        libraryHaskellDepends = [
          base base-unicode-symbols bindings-libusb iteratee monad-control
          usb vector
@@ -136194,7 +136632,7 @@ self: {
      mkDerivation {
        pname = "usb-safe";
        version = "0.14";
-       sha256 = "1dhx7y74f2c04dmlsx0i80ar31d6k2qsgh7432c8k0y29iwhdzfm";
+       sha256 = "d5fd06794cc283899818e4c0a7b198a68591154011744d6b238009478e3f1db6";
        libraryHaskellDepends = [
          base base-unicode-symbols bindings-libusb bytestring iteratee
          regions text transformers usb
@@ -136211,7 +136649,7 @@ self: {
      mkDerivation {
        pname = "users";
        version = "0.3.0.0";
-       sha256 = "1f63223fxrcyp3gz63viqncqs7yln0mifcnh123172rnfhn61zka";
+       sha256 = "6afe602c74368b138608d032172bb0d41f8d99c5710ff3dfb89ee5ee8610c3b8";
        libraryHaskellDepends = [
          aeson base bcrypt path-pieces text time
        ];
@@ -136228,7 +136666,7 @@ self: {
      mkDerivation {
        pname = "users-persistent";
        version = "0.3.0.0";
-       sha256 = "0hdvsnjciw3a6gsz5lv5q6m5fs3hd60gmgfbzgx5n7md2ya5jimr";
+       sha256 = "b946599417ad1e5bfafbcbbdfa8069706857aac165d3f2f5336af0c8a4d5bb41";
        libraryHaskellDepends = [
          aeson base bytestring mtl persistent persistent-template text time
          users uuid
@@ -136248,7 +136686,7 @@ self: {
      mkDerivation {
        pname = "users-postgresql-simple";
        version = "0.3.0.0";
-       sha256 = "039da6rvjcdjg5lpd5hqkxcb9vgdcd7ppjiqk3gn6jl5q1gn1yzr";
+       sha256 = "f9fb605fc0854a63df9838ca7b4f63ededb4589f1896766979b231b9b3512d0d";
        libraryHaskellDepends = [
          aeson base bytestring mtl postgresql-simple text time users uuid
        ];
@@ -136263,7 +136701,7 @@ self: {
      mkDerivation {
        pname = "users-test";
        version = "0.3.0.0";
-       sha256 = "1cmrd0igkidmv8jfb3dv3g49i1k71rh3i4v3dksql18g7472cnxh";
+       sha256 = "b05b260e390f058af56c639338600e678698c81bbb8de524dab5c5f92268b9b2";
        libraryHaskellDepends = [ aeson base hspec text users ];
        homepage = "https://github.com/agrafix/users";
        description = "Library to test backends for the users library";
@@ -136278,7 +136716,7 @@ self: {
      mkDerivation {
        pname = "utc";
        version = "0.2.0.1";
-       sha256 = "0vnydjjvv0kh1mww9vb9l90crl9ddd5n63dwpjjs8ln56b5yvv5h";
+       sha256 = "b0ecedcb32c552a4a5bcbc0d634b6b2dd1cc40a269edc4790d7082bda56cde6e";
        libraryHaskellDepends = [
          attoparsec base bytestring clock exceptions text
        ];
@@ -136297,7 +136735,7 @@ self: {
      mkDerivation {
        pname = "utf8-env";
        version = "0.1";
-       sha256 = "0ls2ls2n12igm1day730sp1gfcwxvkkqd2xdp2lmyp2ldp0d72zp";
+       sha256 = "f78bd3c06d545c5fa9b8ad8b86e7dc9d33f7c2d5601caf5aa82f8a6085a64253";
        libraryHaskellDepends = [ base mtl utf8-string ];
        description = "UTF-8 aware substitutes for functions in System.Environment";
        license = stdenv.lib.licenses.bsd3;
@@ -136308,7 +136746,7 @@ self: {
      mkDerivation {
        pname = "utf8-light";
        version = "0.4.2";
-       sha256 = "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q";
+       sha256 = "184c428ce7896d702da46f6f107e6873ff100dbc1af40b49b5ce87317e619e67";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        description = "Unicode";
        license = stdenv.lib.licenses.bsd3;
@@ -136319,7 +136757,7 @@ self: {
      mkDerivation {
        pname = "utf8-prelude";
        version = "0.1.6";
-       sha256 = "156kjn3da02z060srlsm8kqwbxzcscjzxdkp4lmv8zq5zscha5v6";
+       sha256 = "66170599fe057fb42b2577b6fe25d3ecf7c5f14455d3ac81015f00d58695d394";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base utf8-string ];
@@ -136333,7 +136771,7 @@ self: {
      mkDerivation {
        pname = "utf8-string";
        version = "1";
-       sha256 = "025snarzyk4kkw1dk3i8dsxilvxh4kazl6nwq61w9q49y39qiwvr";
+       sha256 = "79f388d3f089e0c483c1dc1afad524b06f1abb6e288ed9029f934cffb3b2ba08";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/glguy/utf8-string/";
        description = "Support for reading and writing UTF8 Strings";
@@ -136345,7 +136783,7 @@ self: {
      mkDerivation {
        pname = "utility-ht";
        version = "0.0.10";
-       sha256 = "17ydzb0p8xhddvfvm4wjv5yjmy0v7nj6fsj11srnnpj91wc9k0xd";
+       sha256 = "ad8399180f495e6bb30e416a67a43d1bf82a7dd99293badd6e0d7674c1facd9f";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
@@ -136357,7 +136795,7 @@ self: {
      mkDerivation {
        pname = "uu-cco";
        version = "0.1.0.3";
-       sha256 = "0na2gd82z7llrppaskfkrqj3lbl0k6kvb62n4qhpqgsyz001fi8j";
+       sha256 = "12451700f85e3f7c21265698b5a799802e3a24ced34dadeecd949e2f507b4259";
        libraryHaskellDepends = [ ansi-terminal base ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: core functionality";
@@ -136369,7 +136807,7 @@ self: {
      mkDerivation {
        pname = "uu-cco-examples";
        version = "0.1.0.1";
-       sha256 = "1i8idcbq602hl1il326lq9b5gcjm9qn00wpragr1kj676g615024";
+       sha256 = "448012cc33c7c819f253f972002c4e55b25756c2d4884163a0500083176b11c5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ];
@@ -136383,7 +136821,7 @@ self: {
      mkDerivation {
        pname = "uu-cco-hut-parsing";
        version = "0.1.0.1";
-       sha256 = "06ddh2fcvy0zbzzdgpcx8kvlssrcmxx4swgkl8iy7223llanx0px";
+       sha256 = "fd826e15a54388e323a2f3714d7aaf2c6b4df7449dddd7fe5f1ff8cd9c80ad19";
        libraryHaskellDepends = [ base uu-cco uulib ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: Feedback wrapper around parser in uulib";
@@ -136395,7 +136833,7 @@ self: {
      mkDerivation {
        pname = "uu-cco-uu-parsinglib";
        version = "0.1.0.1";
-       sha256 = "1sshnlqb0ydxgrhm0i1c3mpnixfsqwrf3gl59yz4rhiw5hy33z71";
+       sha256 = "e1fc313c2c3cc24cbe4f85bee132c7daf5686f1d2c4450617ebd79b030b550eb";
        libraryHaskellDepends = [ base ListLike uu-cco uu-parsinglib ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib";
@@ -136407,7 +136845,7 @@ self: {
      mkDerivation {
        pname = "uu-interleaved";
        version = "0.2.0.0";
-       sha256 = "1rysap86jrq43b99ay52nrmbdpcba7cl0ac85nsb7gll1rbyr59i";
+       sha256 = "3195ec570e94beb3b42d882940d9518bddb66ab6a27895d21a046769d055dae7";
        libraryHaskellDepends = [ base ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
        description = "Providing an interleaving combinator for use with applicative/alternative style implementations";
@@ -136421,7 +136859,7 @@ self: {
      mkDerivation {
        pname = "uu-options";
        version = "0.2.0.0";
-       sha256 = "11gixk6lxsakcdxir9jla5nk71phmlzd9hxp8wq23n550xw91ij6";
+       sha256 = "46c6907807a5d8213047b7c3d43eadf086336d5154a61c7b6353e94ecdecf185";
        libraryHaskellDepends = [
          base lenses mtl template-haskell transformers uu-interleaved
          uu-parsinglib
@@ -136436,7 +136874,7 @@ self: {
      mkDerivation {
        pname = "uu-parsinglib";
        version = "2.9.1";
-       sha256 = "0cic0f689a6n2si43ijyvkp174y1yfppqv64dicwxz6rm2jhz70d";
+       sha256 = "0d9c0fa5a8d9fcce596cc46c7caff3c19313eedc5ec641a216d6a8848c032c32";
        libraryHaskellDepends = [ base ListLike time uu-interleaved ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
        description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, interleaving, idiomatic parser combinators";
@@ -136448,7 +136886,7 @@ self: {
      mkDerivation {
        pname = "uu-tc";
        version = "2009.2.2";
-       sha256 = "0s7b23r7gnavwnvzpi25mc0hyg605ms249k5i4661nqpfiwn7zry";
+       sha256 = "3eff63797417db600c89652622742dc03c0f01ab45c4fbb7e55bd977f210eb68";
        libraryHaskellDepends = [ base ];
        description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University";
        license = stdenv.lib.licenses.bsd3;
@@ -136462,7 +136900,7 @@ self: {
      mkDerivation {
        pname = "uuagc";
        version = "0.9.52.1";
-       sha256 = "1191a1jr1s76wjdrfzafy1ibf7a7xpg54dvwhwz4kr1jrc9jn2cq";
+       sha256 = "98092b13cb32e4493e877c3752deed471db762f04e7d979be4e6e89065502185";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -136482,7 +136920,7 @@ self: {
      mkDerivation {
        pname = "uuagc-bootstrap";
        version = "0.9.40.2";
-       sha256 = "0zsb8pz2zx7y8sjp392hpdk30dzzmppjizcnlgd1wvq2csacnfxq";
+       sha256 = "b83bcb9466026f1edaa396fd28efadff373066bb50a471a546fef42ffe454b7f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -136505,7 +136943,7 @@ self: {
      mkDerivation {
        pname = "uuagc-cabal";
        version = "1.0.6.0";
-       sha256 = "02xqj4vz7hir0llxl8n517qv22jlmilknhqzx4l55gccffg7zj6w";
+       sha256 = "dcc87f9e738cbd5228e91f433b69ac540ab1f109c522da290539c2f33791b80b";
        libraryHaskellDepends = [
          base Cabal containers directory filepath mtl process uulib
        ];
@@ -136519,7 +136957,7 @@ self: {
      mkDerivation {
        pname = "uuagc-diagrams";
        version = "0.1.1.0";
-       sha256 = "16sf4kbjgxsi3amdpr3nqg15f2gmjvf3w2wh6pn72zhjqsbnfnmz";
+       sha256 = "bf5a6797c6127e71ec35900b3edc96f50957c2c376e4dbaa1a51f727d7244e9b";
        libraryHaskellDepends = [ base diagrams-lib SVGFonts ];
        jailbreak = true;
        description = "Utility for drawing attribute grammar pictures with the diagrams package";
@@ -136532,7 +136970,7 @@ self: {
      mkDerivation {
        pname = "uuagd";
        version = "0.1.0.2";
-       sha256 = "1gcznzb8hr2x5mr5pgfqhnvjjrll96g855g4niacw5bd52wdvsla";
+       sha256 = "8aeaddb8286d15ce54b4e495829e49946629b785d8bd5b722d5d6488d6b79fbd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base blaze-html ];
@@ -136550,7 +136988,7 @@ self: {
      mkDerivation {
        pname = "uuid";
        version = "1.3.11";
-       sha256 = "1m8lk12ls4c5xx1y3wm2n2spm2c5slwb27k6zrdibja8z397c637";
+       sha256 = "671876d2f848c9155bfe661eb138d585897ab5b0a2f2e143ef85114d459814d5";
        libraryHaskellDepends = [
          base binary bytestring cryptohash network-info random text time
          uuid-types
@@ -136569,7 +137007,7 @@ self: {
      mkDerivation {
        pname = "uuid-aeson";
        version = "0.1.0.0";
-       sha256 = "0nd2xm908zycrbmrayi6d4c9p9rfplsjkwnz43nrq94xjn1dp2yg";
+       sha256 = "cf8bdb82959d249ced20dff22935bd2ea79b1869267a95ebcacc7f0452eda259";
        libraryHaskellDepends = [ aeson base text uuid ];
        description = "Aeson types for UUID instances";
        license = stdenv.lib.licenses.bsd3;
@@ -136580,7 +137018,7 @@ self: {
      mkDerivation {
        pname = "uuid-le";
        version = "0.2014.1";
-       sha256 = "1gfm7bxmr2b5hn4x3dr231ra0b1nwp36x2808w3l43yglz8zwp74";
+       sha256 = "e45cfed1a7cf0f42074700896ec6e5362ca0721822b7d1898565895cfb3ad5bd";
        libraryHaskellDepends = [ base bytestring uuid ];
        description = "Universally Unique Identifiers with little-endian-ish encoding tools";
        license = stdenv.lib.licenses.mit;
@@ -136591,7 +137029,7 @@ self: {
      mkDerivation {
        pname = "uuid-quasi";
        version = "0.1.0.1";
-       sha256 = "09ijnbj2znaqanaxghql3yy1fqb0nsjhrwi6kfzg4h8nrw1ir2pj";
+       sha256 = "f28a1c03cf1641f2be9b26f20ca5b6606117bc1f14c3d7955558d92fe4b23226";
        libraryHaskellDepends = [ base template-haskell uuid ];
        homepage = "http://github.com/lpeterse/uuid-quasi";
        description = "Supplemental package for 'uuid' allowing quasiquotation";
@@ -136605,7 +137043,7 @@ self: {
      mkDerivation {
        pname = "uuid-types";
        version = "1.0.2";
-       sha256 = "019f9w1jvqacbxmq828wsn6zpwp5yw7bkhyj34a4cc2zq3bfkijn";
+       sha256 = "56c6e9d6c05f30461419d2c3b90ef7e5f2fb8dd51c09846b5f4ce12d034f2e05";
        libraryHaskellDepends = [
          base binary bytestring deepseq hashable random text
        ];
@@ -136622,7 +137060,7 @@ self: {
      mkDerivation {
        pname = "uulib";
        version = "0.9.20";
-       sha256 = "1qz73rjxywc9mf54d2j4xv9m7d15gnfmi1c1fj3yklx059xlvfz2";
+       sha256 = "e2bb4d7b2aa0d3e987748185589d7d25b453d3ee448a468aab8971df651ee7e3";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/UU-ComputerScience/uulib";
        description = "Haskell Utrecht Tools Library";
@@ -136634,7 +137072,7 @@ self: {
      mkDerivation {
        pname = "uvector";
        version = "0.1.1.1";
-       sha256 = "1psbdsq20nr28cr9ni2mwzwkpz3p20n1xqp0m0m9qafz66d2vi08";
+       sha256 = "08c42d9a31df299c2aa8e0e21e2c1077fc3bf9e755449b3243225b20b06e4bdf";
        revision = "1";
        editedCabalFile = "e289ff93c365248deb93e6268b57be8a47d724a39702887979fd842c80577508";
        libraryHaskellDepends = [ base ghc-prim ];
@@ -136650,7 +137088,7 @@ self: {
      mkDerivation {
        pname = "uvector-algorithms";
        version = "0.2";
-       sha256 = "0jzlirrar7grq3h02k22zxyvy1wmfrjw9lscnhpjqmsxjli1jh81";
+       sha256 = "01411922955d572c2fb44cd3c465769507bf7dff424c01e0c0f99dac728ef44b";
        libraryHaskellDepends = [ base uvector ];
        homepage = "http://code.haskell.org/~dolio/";
        description = "Efficient algorithms for uvector unboxed arrays";
@@ -136663,7 +137101,7 @@ self: {
      mkDerivation {
        pname = "uxadt";
        version = "0.0.16.0";
-       sha256 = "0qmp5k4wg5ja2382cwarf8fwjval2a5wdwvz32f965hvwgc9cd43";
+       sha256 = "833496d8e31b16939c187ff3c68b12546dc91d72597126d0104a96c7c92cb762";
        libraryHaskellDepends = [ base json MissingH mtl ];
        description = "Cross-language extensible representation for algebraic data type instances";
        license = stdenv.lib.licenses.gpl3;
@@ -136674,7 +137112,7 @@ self: {
      mkDerivation {
        pname = "uzbl-with-source";
        version = "0.1.0.0";
-       sha256 = "0q6n18kqga839gkdgdwsfbnbpfm4hh1qjln17qnmfxm3ylh2l9la";
+       sha256 = "8a262a20f5a376572d3ec152890384a4babbec729ab7d7e64b03a987270ad660";
        libraryHaskellDepends = [ base process ];
        homepage = "http://github.com/Fuuzetsu/uzbl-with-source";
        description = "Utility function for reading a source of loaded uzbl pages";
@@ -136688,7 +137126,7 @@ self: {
      mkDerivation {
        pname = "v4l2";
        version = "0.1.0.3";
-       sha256 = "1hhdpljlic1kyz0pgnv9a04z6prv7rl3x5bam5j0yhm5vijrisgp";
+       sha256 = "f7e99865dca5420f64a96a953e683e3b5ff3095069db77c1f733b04825bd0dc2";
        libraryHaskellDepends = [
          base bindings-DSL bindings-libv4l2 bindings-linux-videodev2
          bindings-posix containers ioctl
@@ -136704,7 +137142,7 @@ self: {
      mkDerivation {
        pname = "v4l2-examples";
        version = "0.1.0.2";
-       sha256 = "1knn4cbvvk1vsn9if87hqfg761n4410p08g7vlav900svfm8i1l5";
+       sha256 = "858688aadb1a80b415dde721704120c406739ec3f0201793d53bccbd1723d6ce";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT v4l2 ];
@@ -136720,7 +137158,7 @@ self: {
      mkDerivation {
        pname = "vacuum";
        version = "2.2.0.0";
-       sha256 = "157wjx2shzfh6dfl6h8x017cn9ji3ql1p0gpi79ginz4s81f2ny1";
+       sha256 = "c15be102d2e4dbf8d289f7811b281e5126cb4e001d41435d33d07da84597fc94";
        libraryHaskellDepends = [ array base containers ghc-prim ];
        homepage = "http://thoughtpolice.github.com/vacuum";
        description = "Graph representation of the GHC heap";
@@ -136735,7 +137173,7 @@ self: {
      mkDerivation {
        pname = "vacuum-cairo";
        version = "0.5";
-       sha256 = "0jp3xn1h28igcg3xb97ifawx11i7adnyi0ff264w0fril9b8ylwc";
+       sha256 = "8c538f56a2313bc08911ce81e86d532786d0b972f1a4d5c7632f220183ede34a";
        libraryHaskellDepends = [
          base cairo deepseq directory gtk pretty process strict-concurrency
          svgcairo vacuum
@@ -136751,7 +137189,7 @@ self: {
      mkDerivation {
        pname = "vacuum-graphviz";
        version = "2.1.0.1";
-       sha256 = "093ba6n30a6gyifnk3bd50rkx8qldjqq9vsk92pnq152ibs36b2m";
+       sha256 = "552c33f48aa2046caf4853ef84b16c14a33e33286d8d695df4cf2830ac516b24";
        libraryHaskellDepends = [ base filepath graphviz vacuum ];
        jailbreak = true;
        description = "A library for transforming vacuum graphs into GraphViz output";
@@ -136766,7 +137204,7 @@ self: {
      mkDerivation {
        pname = "vacuum-opengl";
        version = "0.0.3";
-       sha256 = "1dxw3apbf59b7vi4a1gnp29ia1s2q9vx79ns7257cg9cazb01z7j";
+       sha256 = "f2fc00d6572c3d768a38daa6d377c242071593b8f60545e23e2b15b7ae1abcb7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base network pretty vacuum ];
@@ -136785,7 +137223,7 @@ self: {
      mkDerivation {
        pname = "vacuum-ubigraph";
        version = "0.2.0.2";
-       sha256 = "0zpag42dr2763ddrwdy7744lqkd6207ljfw3bqm6db3a1128861z";
+       sha256 = "3f188444086aac662a5e833b490f10a64d4c0939c7379e5b1be688dc0479ea7e";
        libraryHaskellDepends = [ base containers hubigraph vacuum ];
        jailbreak = true;
        description = "Visualize Haskell data structures using vacuum and Ubigraph";
@@ -136800,7 +137238,7 @@ self: {
      mkDerivation {
        pname = "vado";
        version = "0.0.5";
-       sha256 = "07bqcp58hqyh5zvi6zpwwpppfzj30j60ryf6k0wqzckklibffqkj";
+       sha256 = "7262e756a473b28f3998c6f90c8c04437e77efe5fc7e13f72fd06388ca65781d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -136822,7 +137260,7 @@ self: {
      mkDerivation {
        pname = "valid-names";
        version = "0.1.0.1";
-       sha256 = "14gpkb6pbkvmny17g2gpq6i6kq7ahmcnkgrcrwm72vda12wxsl78";
+       sha256 = "e850ddb908aa6d712acf2cbf695985eae069a2c1f7897782b775cf75cd9af791";
        libraryHaskellDepends = [ base containers MonadRandom ];
        jailbreak = true;
        homepage = "https://i.joelt.io/symbols.html";
@@ -136835,7 +137273,7 @@ self: {
      mkDerivation {
        pname = "validate";
        version = "2.0.0";
-       sha256 = "19d02sblyxg73prlrmlcs4vclzxzg2pzlrp67f2kx94nsw0v3l4p";
+       sha256 = "97d0b101d796a43e853be666faaf78bf7fca36d18cd64cf31de7754f9716a0a5";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136848,7 +137286,7 @@ self: {
      mkDerivation {
        pname = "validate-input";
        version = "0.2.0.0";
-       sha256 = "0ijlkfizxpjy7r0bh59zfj1jyn77gqd0ryz8k19v7znckq7bxgls";
+       sha256 = "9abebe0e9eccfeb35398e8fb0c1a7ee7582f83743f15b8403e5edefea39b5446";
        libraryHaskellDepends = [
          base bytestring either mtl pcre-heavy stringable text
        ];
@@ -136866,7 +137304,7 @@ self: {
      mkDerivation {
        pname = "validation";
        version = "0.5.1";
-       sha256 = "09fx4aa9jlyd59qyx0p6wpvzf9kr29j7xb10nsq61pxjbs1hn5qb";
+       sha256 = "0b170b835eb2df60b0b620ac7e64127926f7f7e5e682ee712acd53999422dd25";
        libraryHaskellDepends = [
          base bifunctors lens mtl semigroupoids semigroups transformers
        ];
@@ -136886,7 +137324,7 @@ self: {
      mkDerivation {
        pname = "validations";
        version = "0.1.0.2";
-       sha256 = "0nviyyp0nlpilp2byckrcmbd2n6wp40pq7m10da9b24hmwajkdwk";
+       sha256 = "93b72915af9088955403a11e7c01b9dc58d156657932bfc4a5f1520baef7715b";
        libraryHaskellDepends = [
          base containers digestive-functors mtl text transformers
        ];
@@ -136906,7 +137344,7 @@ self: {
      mkDerivation {
        pname = "value-supply";
        version = "0.6";
-       sha256 = "0fd6rk46sgdbdmfdr9wy0f3qzwaymgd9hl9v735g2a4bqiqanmb5";
+       sha256 = "6555ab70c48b28f1ca383b5198daab5ef18f87039ea7dc5c6dab3d6dc8cca639";
        libraryHaskellDepends = [ base ];
        description = "A library for generating values without having to thread state";
        license = stdenv.lib.licenses.bsd3;
@@ -136919,7 +137357,7 @@ self: {
      mkDerivation {
        pname = "vampire";
        version = "0.1.3.0";
-       sha256 = "16f1mdsyyfdgjcp3rzf3p1qj3d6la01i9y1yyp97m5nmd2jxsn1q";
+       sha256 = "3858dda568d5967ad2f53ef8140350d4b42171b8c3fd3c2e93af39ef75abc199";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -136943,7 +137381,7 @@ self: {
      mkDerivation {
        pname = "var";
        version = "0.2.0.0";
-       sha256 = "1vc36yy8mvzy14jj8ly8ldc4d9vrcgyjfq3dpnzp6fhycg5kkv2i";
+       sha256 = "51ec39cb631e3a73bfbd6d6027fd6379a74658a3c853242509feef8abc3783ed";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -136961,7 +137399,7 @@ self: {
      mkDerivation {
        pname = "varan";
        version = "0.5.1";
-       sha256 = "1hvpx4jw0lwcnc4x8vwdqp7rv8779p7xaw57cphkax13f3rwm372";
+       sha256 = "e28ccaf370237435e165a770d5cf4de7a09dcfc58d6fd409b38c53c025e977c3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -136979,7 +137417,7 @@ self: {
      mkDerivation {
        pname = "variable-precision";
        version = "0.4";
-       sha256 = "1qd6mnbg06fn31vp9d4yan8rqxyymjljrlr7m4yvn2ppw560p564";
+       sha256 = "c4940b4ce1f70abb3da927d32ca9acde779c91559eb4747718d619f096ada6e1";
        libraryHaskellDepends = [
          base complex-generic floatshow integer-gmp
          type-level-natural-number
@@ -136995,7 +137433,7 @@ self: {
      mkDerivation {
        pname = "variables";
        version = "0.1.1";
-       sha256 = "0garxmxm11qhp2wm7xib4nrlkfiqbyzf3glkdbqb582nip0sb1rp";
+       sha256 = "3787a5c18d56a0b2f06a93bee1be5f38ba49b3252bf653b9b81087507bed593d";
        libraryHaskellDepends = [ base mtl stm ];
        testHaskellDepends = [ base hspec mtl QuickCheck stm ];
        jailbreak = true;
@@ -137008,8 +137446,10 @@ self: {
     ({ mkDerivation, base, time }:
      mkDerivation {
        pname = "varying";
-       version = "0.1.0.3";
-       sha256 = "1y7mf2q1lawx3f8hdd9b70fa3hrmabm9lmi2rhxvr1dq5r5yh5q7";
+       version = "0.1.1.0";
+       sha256 = "38ef53b0b042e2083b9300c682de437a095cb807f518eb708b02a1caff650b73";
+       revision = "1";
+       editedCabalFile = "85e4874332bfcfa3dde2ca4ca8157e8fe2e4aa3c2e46a273e21b563843c3d288";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base time ];
@@ -137025,7 +137465,7 @@ self: {
      mkDerivation {
        pname = "vault";
        version = "0.3.0.4";
-       sha256 = "0ah6qrg71krc87f4vjy4b4shdd0mgyil8fikb3j6fl4kfwlg67jn";
+       sha256 = "561ef32877935067e458333a44a37f15b4063559c4cb4ddc412ccf705ec6062a";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
@@ -137043,7 +137483,7 @@ self: {
      mkDerivation {
        pname = "vaultaire-common";
        version = "2.9.1";
-       sha256 = "178lh1cxk6ayb4918xas0g7zlan8282vjflm220pzymnxz07chsr";
+       sha256 = "594376c0efb6fa7f8110953ab90512c82afacf035a751412595e99d95980149d";
        libraryHaskellDepends = [
          async attoparsec base blaze-builder bytestring cereal containers
          hashable hslogger locators old-locale packer QuickCheck siphash
@@ -137065,7 +137505,7 @@ self: {
      mkDerivation {
        pname = "vcache";
        version = "0.2.6";
-       sha256 = "08vg106dhzam5h0a6pzz4cbyzfg6pfgcgvn6xm1266kj1ipla18d";
+       sha256 = "0d05456f0c721a2342edc6eec79ebbe6b9ef1723ff5fa3002c557dd80c086f23";
        libraryHaskellDepends = [
          base bytestring containers direct-murmur-hash easy-file filelock
          lmdb random stm transformers
@@ -137082,7 +137522,7 @@ self: {
      mkDerivation {
        pname = "vcache-trie";
        version = "0.2.0";
-       sha256 = "0d56l8339ak9my6c37j3mykmfzz67405xyb90pl0i5lf35mbff32";
+       sha256 = "6238b76a198e9608e80569f95e0039e67f57a7af439ec18caf69aa3406a2a634";
        libraryHaskellDepends = [
          array base bytestring bytestring-builder vcache
        ];
@@ -137096,7 +137536,7 @@ self: {
      mkDerivation {
        pname = "vcard";
        version = "0.1.4";
-       sha256 = "1wa1pdfw7ykmq72af63fh999il5nighf7689265hn3i5awm1m16p";
+       sha256 = "d7841a2a57250e0b8b110999e3e08bb6d09852826e18a7c4c175fac35dbb41f1";
        libraryHaskellDepends = [
          base bytestring containers mime-directory
        ];
@@ -137111,7 +137551,7 @@ self: {
      mkDerivation {
        pname = "vcd";
        version = "0.2.2";
-       sha256 = "0x0smhllghzn0xjfk5cwxaf1vnd2yp3saxw92ylyws8a546mzhzm";
+       sha256 = "f5c35f0d290a69eea9178977a5c7f5a2d91d9cea9c95e96407f6c34729ac1a74";
        libraryHaskellDepends = [ base polyparse ];
        homepage = "http://tomahawkins.org";
        description = "Reading and writing VCD files";
@@ -137123,27 +137563,39 @@ self: {
      mkDerivation {
        pname = "vcs-revision";
        version = "0.0.2";
-       sha256 = "1lp1wf440n7kinmxz7la0gyfqfdlip6f0bn8pmwkxd1dqyrvg5cg";
+       sha256 = "8f95b7b3c72db43e79bdc82ee0cc8db439ecfc038a9edfab8df3584088e3e1d2";
        libraryHaskellDepends = [ base process ];
        description = "Facilities for accessing the version control revision of the current directory";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vcs-web-hook-parse" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, text }:
+     mkDerivation {
+       pname = "vcs-web-hook-parse";
+       version = "0.1.0.0";
+       sha256 = "578cceeed56d13410a33663987268c85f3c54693759cb6dc4e008b3953217961";
+       libraryHaskellDepends = [ aeson base bytestring text ];
+       homepage = "http://rel4tion.org/projects/vcs-web-hook-parse/";
+       description = "Parse development platform web hook messages";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "vcsgui" = callPackage
-    ({ mkDerivation, base, directory, filepath, gtk, mtl, process, text
-     , vcswrapper
+    ({ mkDerivation, base, directory, filepath, gtk3, mtl, process
+     , text, vcswrapper
      }:
      mkDerivation {
        pname = "vcsgui";
-       version = "0.1.2.0";
-       sha256 = "0wqvd57n74fps2cybn970fgag2bxz8y8wwx4hb3dz7znpqzlp7y8";
+       version = "0.1.3.0";
+       sha256 = "0d8997fec3f3a0025045408f8e619abd9568247a08228daa0ff7fa9508e7b06b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base directory filepath gtk mtl process text vcswrapper
+         base directory filepath gtk3 mtl process text vcswrapper
        ];
        executableHaskellDepends = [
-         base directory filepath gtk mtl process text vcswrapper
+         base directory filepath gtk3 mtl process text vcswrapper
        ];
        homepage = "https://github.com/forste/haskellVCSGUI";
        description = "GUI library for source code management systems";
@@ -137157,7 +137609,7 @@ self: {
      mkDerivation {
        pname = "vcswrapper";
        version = "0.1.2";
-       sha256 = "1rbmlfg6kf7b1njfwnd85shlhw8b65j53zsrcn250baj8z0x0p9s";
+       sha256 = "3a5dd0c147522d50846559ff5164310b7148a12ea859eea40debb8699ea375e5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137178,7 +137630,7 @@ self: {
      mkDerivation {
        pname = "vect";
        version = "0.4.7";
-       sha256 = "1049jh8rcxfnyckz5m5asdlyafqszlig96k387raldyfzbrf8f4d";
+       sha256 = "8d38e4f2face37aaf241639af422fd1a3be569d3aad4f227f3d6759611948980";
        libraryHaskellDepends = [ base random ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A low-dimensional linear algebra library, tailored to computer graphics";
@@ -137190,7 +137642,7 @@ self: {
      mkDerivation {
        pname = "vect-floating";
        version = "0.1.0.4";
-       sha256 = "1kxsjsiqqpi7k0xz597z7r2fd45s38plgk6jplzxagg0i3bm0q4g";
+       sha256 = "8f6050d788e03dd53fbdd2cc472f1aba90e6443effa4f23b98275e8ca396bacf";
        libraryHaskellDepends = [ base random ];
        jailbreak = true;
        homepage = "http://github.com/cpdurham/vect-floating";
@@ -137203,7 +137655,7 @@ self: {
      mkDerivation {
        pname = "vect-floating-accelerate";
        version = "0.1.0.4";
-       sha256 = "10mn2gvpkp14j7rc7cc66x30k7xh56xpp04ak1aj8p46rsy75s4x";
+       sha256 = "9de872bcce865c2455988a807bbb29b09f09463786b1c3f29124dc79f713b682";
        revision = "1";
        editedCabalFile = "af7a5778a0ab8e79fdd4d535aeda7dba18ead15ea3f0b5ae87c3b17c5a076216";
        libraryHaskellDepends = [ accelerate base vect-floating ];
@@ -137218,7 +137670,7 @@ self: {
      mkDerivation {
        pname = "vect-opengl";
        version = "0.4.6.1";
-       sha256 = "1qp98j6bgldjcs71pd7iqc5sjf1ixb1jj0l267hw532j4yf81dig";
+       sha256 = "2fb6809c27528cc2e131820229c3ea3138a90bc3f1b41b8e66b2d1b78c44e9e2";
        libraryHaskellDepends = [ base OpenGL vect ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
@@ -137230,7 +137682,7 @@ self: {
      mkDerivation {
        pname = "vector";
        version = "0.10.9.3";
-       sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx";
+       sha256 = "bdcd541262bc538fa43c9b3ea2dd8c1c2cd5ac7bb9efa909a8d558753678b422";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
        jailbreak = true;
        homepage = "https://github.com/haskell/vector";
@@ -137246,7 +137698,7 @@ self: {
      mkDerivation {
        pname = "vector";
        version = "0.10.12.3";
-       sha256 = "16p8i0gvc9d4n9mxlhlnvrl2s0gmgd7kcsk5czdzz2cd4gh5qxhg";
+       sha256 = "0f765ce0238d89ffdb67656a364f7bf5012d68de9642da6bb2a425b61f88e89a";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
        testHaskellDepends = [
          base QuickCheck random template-haskell test-framework
@@ -137266,7 +137718,7 @@ self: {
      mkDerivation {
        pname = "vector";
        version = "0.11.0.0";
-       sha256 = "1r1jlksy7b0kb0fy00g64isk6nyd9wzzdq31gx5v1wn38knj0lqa";
+       sha256 = "0a5320ed44c3f2b04b7f61e0f63f4fcd5b337524e601e01d5813ace3f5a432e4";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
        testHaskellDepends = [
          base QuickCheck random template-haskell test-framework
@@ -137285,7 +137737,7 @@ self: {
      mkDerivation {
        pname = "vector-algorithms";
        version = "0.7";
-       sha256 = "1ijnmgvdhj2qi5rsq4b1ffci47inck9arrcan5jzfkvzr54fvzcx";
+       sha256 = "9dfded48c97f4ff765b18ae5acd264361e1299736111ac73895848d8f6ab56c6";
        revision = "1";
        editedCabalFile = "ba3ba4dbfe97dc45be68d13c51ba4425900b186a46cdf3eceaafb746030c1b95";
        isLibrary = true;
@@ -137305,7 +137757,7 @@ self: {
      mkDerivation {
        pname = "vector-binary";
        version = "0.1.1";
-       sha256 = "1qdjibh3ywfa0lvawdahnr9qhh2qy6899lm5inbzmksjpykgbazz";
+       sha256 = "ffabf5a6bf52cffa978da5d29490f158408853b65035ae3605ca713fe08ab2e1";
        libraryHaskellDepends = [ base binary vector ];
        homepage = "https://github.com/kawu/vector-binary";
        description = "Binary instances for vector types (deprecated)";
@@ -137317,7 +137769,7 @@ self: {
      mkDerivation {
        pname = "vector-binary-instances";
        version = "0.2.1.0";
-       sha256 = "028rsf2w193rhs1gic5yvvrwidw9sblczcn10aw64npfc6502l4l";
+       sha256 = "9450018a61ee5a62b802c1b2cfe8d289b7c8f3debeb0f8828679a4c085d31909";
        libraryHaskellDepends = [ base binary cereal vector ];
        homepage = "https://github.com/bos/vector-binary-instances";
        description = "Instances of Data.Binary and Data.Serialize for vector";
@@ -137329,7 +137781,7 @@ self: {
      mkDerivation {
        pname = "vector-buffer";
        version = "0.4.1";
-       sha256 = "16zxc2d25qd15nankhc974ax7q3y72mg5a77v5jsfrw291brnnlv";
+       sha256 = "9b5a9b57488267a765d9e7a8f2aa387ee0d3153989c169952da1e1229a60fd9b";
        libraryHaskellDepends = [ base deepseq vector ];
        description = "A buffer compatible with Data.Vector.*";
        license = stdenv.lib.licenses.bsd3;
@@ -137342,7 +137794,7 @@ self: {
      mkDerivation {
        pname = "vector-bytestring";
        version = "0.0.0.1";
-       sha256 = "0xiksm1136azrcidcsi9g59i1nb9r8lhzsn1fhnp830sr63fy7k4";
+       sha256 = "641eef86c91a0c742d74c1ea0f29ca69d9105379296ad622cb5f991142d53376";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137365,7 +137817,7 @@ self: {
      mkDerivation {
        pname = "vector-clock";
        version = "0.2.2";
-       sha256 = "0ndp25w61rcj4sadvhxlirrk1dhk7rmdzv9kha7kyqa41whr9629";
+       sha256 = "499894210f44613f8f8233eddf6a3e13b630738eb4c3dd942692e5607811b759";
        libraryHaskellDepends = [ base binary ghc-prim hashable ];
        testHaskellDepends = [
          array base binary ghc-prim HUnit QuickCheck test-framework
@@ -137385,7 +137837,7 @@ self: {
      mkDerivation {
        pname = "vector-conduit";
        version = "0.5.0.0";
-       sha256 = "10mqmxfqzqcgxf0isv611ailq03smdfybviamxpskncbf15sc6g1";
+       sha256 = "e119a64b708bd9a96faf2aeee55dab7a004ca30ac16c1d81eb8fe18f5dafb882";
        libraryHaskellDepends = [ base conduit primitive vector ];
        testHaskellDepends = [
          base conduit HUnit primitive QuickCheck test-framework
@@ -137402,7 +137854,7 @@ self: {
      mkDerivation {
        pname = "vector-fftw";
        version = "0.1.3.2";
-       sha256 = "0rfvr86yiwp4wb9qjggbbacmgkfj6xrk6h7xb4xmhmk88slvifm0";
+       sha256 = "a0bab8a9466856583b59fd40337337d2cd57995aeb3d89d3e2e4f2e80dcadb65";
        libraryHaskellDepends = [ base primitive storable-complex vector ];
        librarySystemDepends = [ fftw ];
        jailbreak = true;
@@ -137418,7 +137870,7 @@ self: {
      mkDerivation {
        pname = "vector-functorlazy";
        version = "0.0.1";
-       sha256 = "0ysic3f5xw675bk095pby9ihbgcxpkj4pgp61dwr354w28l0yc03";
+       sha256 = "03300f28129c9491790be6be4be4bc9dbd0563f2eb9604e62ac7f05edc60517b";
        libraryHaskellDepends = [
          base ghc-prim primitive vector vector-th-unbox
        ];
@@ -137433,7 +137885,7 @@ self: {
      mkDerivation {
        pname = "vector-heterogenous";
        version = "0.2.0";
-       sha256 = "14v0qj2r484pwbjhdymvdqjnsbqszl9wr71hv6wsvs2d8ja1bajl";
+       sha256 = "54aa1594444de8adb9d9309ccc13fd1a2f6d256ebbfa06e5e297209285c46093";
        libraryHaskellDepends = [ base vector ];
        homepage = "http://github.com/mikeizbicki/vector-heterogenous/";
        description = "A type-safe library for vectors whose elements can be of any type, or any type satisfying some constraints";
@@ -137446,8 +137898,8 @@ self: {
      }:
      mkDerivation {
        pname = "vector-instances";
-       version = "3.3.0.1";
-       sha256 = "1npgvnv8pw5xcax57cam9n5j9ra9phm4b5jj26hbpzwnlh0rkcc4";
+       version = "3.3.1";
+       sha256 = "68c7f154fe4ad53e29433e150c8718b0e74b4cf4c45a79af89940fff83868c59";
        libraryHaskellDepends = [
          base comonad keys pointed semigroupoids semigroups vector
        ];
@@ -137461,7 +137913,7 @@ self: {
      mkDerivation {
        pname = "vector-instances-collections";
        version = "0.1.0.1";
-       sha256 = "13xk2iwdwrnmdm33z0fmj4sg3irih4ayl3q5pgz31qs9kcsbhi0s";
+       sha256 = "1a44b8349b49e330febb050fea158131c7f13491d5813f466dd566de7814b38f";
        libraryHaskellDepends = [
          base collections-api template-haskell vector
        ];
@@ -137477,7 +137929,7 @@ self: {
      mkDerivation {
        pname = "vector-mmap";
        version = "0.0.2";
-       sha256 = "03hczjc7j1hxnny912cblxdwn908gwm012w03zgj2v9avldp0gmr";
+       sha256 = "b93e701bdd2a6d21df1f808b002a7f0824cb5ba78b8990bcb51d067998fc0c0e";
        libraryHaskellDepends = [ base mmap primitive vector ];
        homepage = "http://github.com/pumpkin/vector-mmap";
        description = "Memory map immutable and mutable vectors";
@@ -137489,7 +137941,7 @@ self: {
      mkDerivation {
        pname = "vector-random";
        version = "0.2";
-       sha256 = "1f74q4bs5mbcw8xg4sxb46ks5x121lbbr6cl09ssr09cpykkbdvb";
+       sha256 = "6bb735a7bf2c81ac75029499bc160d22f4a2a721ab6bf23ae26cd5a217c1e4b8";
        libraryHaskellDepends = [ base mersenne-random-pure64 vector ];
        homepage = "http://code.haskell.org/~dons/code/vector-random";
        description = "Generate vectors filled with high quality pseudorandom numbers";
@@ -137502,7 +137954,7 @@ self: {
      mkDerivation {
        pname = "vector-read-instances";
        version = "0.0.2.0";
-       sha256 = "1k30n5qh16sdfxy77vp10bx52lb1ffmjn70vg87hx12j8wg9vbv6";
+       sha256 = "66af9d1e4752840e0f7a1b1c2bab73615151fa02e1ee737c774d9b0071b160cc";
        libraryHaskellDepends = [ base vector ];
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "(deprecated) Read instances for 'Data.Vector'";
@@ -137515,7 +137967,7 @@ self: {
      mkDerivation {
        pname = "vector-space";
        version = "0.10.2";
-       sha256 = "0n78g23jw6pcilkssnkqvnq1z8ram1al6cbas24ziacdwjbw6zah";
+       sha256 = "507dc397e48da9f889d06a314355a82aa31fb0dd785aad278dec1a2e8778e858";
        libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
        license = stdenv.lib.licenses.bsd3;
@@ -137526,7 +137978,7 @@ self: {
      mkDerivation {
        pname = "vector-space-map";
        version = "0.1.0.1";
-       sha256 = "1s5hh7dlbw1ai3nqqcavrqgidddfj99mi0gmhf2x2zn6ag86xr8b";
+       sha256 = "0be56ed053c67ed18583f581585392aeb5161fce5b318ced882af045db81b0e8";
        libraryHaskellDepends = [ base containers vector-space ];
        jailbreak = true;
        homepage = "https://github.com/conklech/vector-space-map";
@@ -137541,7 +137993,7 @@ self: {
      mkDerivation {
        pname = "vector-space-opengl";
        version = "0.2";
-       sha256 = "17rczadmjiblh96r7bfcxy53m7ig534qqcf35i7w6x90354dyiaw";
+       sha256 = "5c45df48192075c34f2cc3318cc9282f9e3a8aefccad934d827445599bfa2c9f";
        libraryHaskellDepends = [ base OpenGL vector-space ];
        testHaskellDepends = [
          base ieee754 OpenGL QuickCheck test-framework
@@ -137557,7 +138009,7 @@ self: {
      mkDerivation {
        pname = "vector-space-points";
        version = "0.2.1.1";
-       sha256 = "0d5k7wmwhm9y2jif4fy71bnp8nwbfnkh033nzhiw36wfl35aaznp";
+       sha256 = "d77ea5caa08e9bc123fc760c00a7758b5b74ed0ac73be2a2143e55c82b3fb334";
        libraryHaskellDepends = [ base vector-space ];
        description = "A type for points, as distinct from vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -137568,7 +138020,7 @@ self: {
      mkDerivation {
        pname = "vector-static";
        version = "0.3.0.1";
-       sha256 = "19spzrk64j2rgyi15dvs8gfbx3nc79ybssaxkv8dn9df4fwksv91";
+       sha256 = "216d3db923ae25dbd09e5d69bd7c3acc8ebedc437ab712a27f59486266fe57a7";
        libraryHaskellDepends = [ base primitive vector ];
        jailbreak = true;
        homepage = "http://github.com/geezusfreeek/vector-static";
@@ -137582,7 +138034,7 @@ self: {
      mkDerivation {
        pname = "vector-strategies";
        version = "0.4";
-       sha256 = "04vaizcc78q94vpaly28iwhlwk6nwrsa6jmcq2afdl6yqp63njc6";
+       sha256 = "86493bccc5ded0e694c0ac4aa374e6d64c4e218f4878aaee2609a3c3d88f6a13";
        libraryHaskellDepends = [ base deepseq parallel vector ];
        description = "A parallel evaluation strategy for boxed vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -137593,7 +138045,7 @@ self: {
      mkDerivation {
        pname = "vector-th-unbox";
        version = "0.2.1.2";
-       sha256 = "01admr0akldwwmzmc465f5dbqmq03ldvma67kibanjs25m39dxhd";
+       sha256 = "0df696462d424bab569cc7a8ba1b1d0057bc5a71c510567fe5bcd1a940ae4d05";
        libraryHaskellDepends = [ base template-haskell vector ];
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
@@ -137605,7 +138057,7 @@ self: {
      mkDerivation {
        pname = "verbalexpressions";
        version = "1.0.0.0";
-       sha256 = "0wai72bqb1vp4p7ml1yj2jdmkjglihai9vhmgj7ri6y2qgzkpwly";
+       sha256 = "9ef23bffc3c29b988f7c15ee14158cf4c9599b14d2075acf2577878597385171";
        libraryHaskellDepends = [ base regex-pcre ];
        jailbreak = true;
        homepage = "https://github.com/VerbalExpressions/HaskellVerbalExpressions";
@@ -137618,7 +138070,7 @@ self: {
      mkDerivation {
        pname = "verbosity";
        version = "0.2.0.0";
-       sha256 = "0vwv4f5ni6dzvj3jbgxcy8b2hmal6c8xbdin16pifqrn55d52pa9";
+       sha256 = "495d515a29366317af0936b6d5113354552816f2acbf2587dcbf99688b239b6f";
        libraryHaskellDepends = [ base binary data-default-class deepseq ];
        homepage = "https://github.com/trskop/verbosity";
        description = "Simple enum that encodes application verbosity";
@@ -137630,7 +138082,7 @@ self: {
      mkDerivation {
        pname = "verilog";
        version = "0.0.11";
-       sha256 = "0lhl6zcf8f8ndyqx7ksj1qy4a5wnhvphsawb944d5rynrnj8fd46";
+       sha256 = "863487a4cdd6e7d208498b2b0def869617453c0e52cfd3b16f1639e4d8371452";
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ alex happy ];
        homepage = "http://github.com/tomahawkins/verilog";
@@ -137648,7 +138100,7 @@ self: {
      mkDerivation {
        pname = "vhd";
        version = "0.2.2";
-       sha256 = "0z7a17j0rd06kvn3v4qr0fhxg0xw6n3579477y2lvx4mcc3qyrvw";
+       sha256 = "7c678f076395f44d853f87a4538635bc83d7a10319933dec9e06b40ce409ea7c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137669,7 +138121,7 @@ self: {
      mkDerivation {
        pname = "vhdl";
        version = "0.1.2.1";
-       sha256 = "1bi8n8m9an1hcj4c6i2ifqyadg32nq4viffi1kiihaw3j7dh552b";
+       sha256 = "4b9402db91832b18e30cd1b9b809b662bca63c765144c388643058952ab228ae";
        libraryHaskellDepends = [ base mtl pretty regex-posix ];
        description = "VHDL AST and pretty printer";
        license = stdenv.lib.licenses.bsd3;
@@ -137680,7 +138132,7 @@ self: {
      mkDerivation {
        pname = "views";
        version = "1.0";
-       sha256 = "0kzwp58lki3jvx09n6w8rc97idhy947xqik72p2fqjyigkymv04h";
+       sha256 = "90805dfd7cd14becc4156746dc0f491eb67812cb881b9b40df72c44951b9fc4f";
        libraryHaskellDepends = [ base mtl ];
        jailbreak = true;
        description = "Views allow you to run a State monad on part of a state";
@@ -137702,7 +138154,7 @@ self: {
      mkDerivation {
        pname = "vigilance";
        version = "0.1.0.1";
-       sha256 = "1qmwqc2cgrmcjcdfwz0hmfn1irzrwbb7mybrl7myf711sri9ng45";
+       sha256 = "853c9b62d6211ce7eba179f97ad6e2f9e718acab107cee1a93ace6c704c3bce2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -137740,7 +138192,7 @@ self: {
      mkDerivation {
        pname = "vimeta";
        version = "0.2.1.0";
-       sha256 = "0sc5mlv4d9srgv6rj43ddn27rindpyrz2mwz2i5rmm8y4ixn7jrq";
+       sha256 = "38cb637b241ed59a4b149f57f1b3bfcdc67c846d6d1099cd7e59a74636ad8569";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137764,7 +138216,7 @@ self: {
      mkDerivation {
        pname = "vimus";
        version = "0.2.1";
-       sha256 = "0j4j4rsngp76pvssg6kisqqwr9d95fcmxp21yq4483vvc1cv78g2";
+       sha256 = "e2a1b359607b0f4408f641dc5e992ba9a5cc31d6719aa7f5bee6dc6775269248";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137790,7 +138242,7 @@ self: {
      mkDerivation {
        pname = "vintage-basic";
        version = "1.0.1";
-       sha256 = "0hmnkmg6sz702nplh7indlzmv7bb36fmaglf9lw0fziabaj9kk25";
+       sha256 = "45cc99a45a2a7e07384d8e3e559d196b9d5d3f6d361e48af15e07c6d5e9db642";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -137808,7 +138260,7 @@ self: {
      mkDerivation {
        pname = "vinyl";
        version = "0.5.1";
-       sha256 = "026h8lgz487d9xhfjscnfpykgv1ppk944hl8mb6z7y3c1vh4g63b";
+       sha256 = "6b9847e00e6cf8f3cdaa884242d2bc37ec37fd759669e9604fed20f21f45d008";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base doctest lens singletons ];
        jailbreak = true;
@@ -137825,7 +138277,7 @@ self: {
      mkDerivation {
        pname = "vinyl-gl";
        version = "0.3.0.1";
-       sha256 = "182ipz8znzk5fi7mpy3m1nbsyqq54p8y0hqycnnbmaxqsmhy6z5a";
+       sha256 = "aa7ce361d5b8abbaac651e43e0d1250563af970d75f85b4f74657efbd1bf51a0";
        libraryHaskellDepends = [
          base containers GLUtil linear OpenGL tagged transformers vector
          vinyl
@@ -137846,7 +138298,7 @@ self: {
      mkDerivation {
        pname = "vinyl-json";
        version = "0.1.0.0";
-       sha256 = "07rjlwalpq67hc4pha6x02qbw5pxaz4yimx8sclps9dl7r76xi5c";
+       sha256 = "acc46e4e3eb4257d29d3a8d7e8c957fd16beb000dd28780983c7e04b15a7321f";
        libraryHaskellDepends = [
          aeson base bytestring template-haskell text vinyl
        ];
@@ -137862,7 +138314,7 @@ self: {
      mkDerivation {
        pname = "vinyl-utils";
        version = "0.1.0.1";
-       sha256 = "07clcs7rmzbwn4w9xzbiwc3flrcn2l5p0k5isapis803fpzdq2p0";
+       sha256 = "e00adcfe7503201dafd2b14c700b159665ea06e371fd9e38b17cfd9a8f66941d";
        libraryHaskellDepends = [ base contravariant transformers vinyl ];
        homepage = "http://hub.darcs.net/mjm/vinyl-utils";
        description = "Utilities for vinyl";
@@ -137877,7 +138329,7 @@ self: {
      mkDerivation {
        pname = "virthualenv";
        version = "0.2.2";
-       sha256 = "08z6dvhv4k6a71dvqhvcfl8s5aq7qcg8aj5xbym3931yykl0gxc2";
+       sha256 = "82f507e8f43e8c34aa5fbd48851ec307aba211756c43bc5b38ca4cb2e16ee623";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -137899,7 +138351,7 @@ self: {
      mkDerivation {
        pname = "vision";
        version = "0.0.5.0";
-       sha256 = "1235zclhg4nkd387df4gg3q88hvsqwsdj1j20lnfnclxfah0qxa2";
+       sha256 = "42750ca0729d32eb2c054206d934c77a4384f0788fb876d068d3920729fb6588";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -137921,7 +138373,7 @@ self: {
      mkDerivation {
        pname = "visual-graphrewrite";
        version = "0.4.0.1";
-       sha256 = "0myppx9bd8bfhii91lqdp00ckp20bq82754mr01s87l1d01gb4wp";
+       sha256 = "9793f50268811ea403c8959423105e40dcc900b80dd39062846ea1b652bfd757";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137948,7 +138400,7 @@ self: {
      mkDerivation {
        pname = "visual-prof";
        version = "0.5";
-       sha256 = "00wvxsq6yaidiv2izdxsvvfzj8ksrq8y3fky9y68k82ivh7r2y39";
+       sha256 = "6978910fdc51a0898c4f7ebae111ce7a22f9dddebab71fc58e2d2a6fb0ee9b03";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -137969,7 +138421,7 @@ self: {
      mkDerivation {
        pname = "vivid";
        version = "0.1.0.3";
-       sha256 = "034kjk2lxfbb4hd8z1axccz9alfkm76mpgw39nisvxngjs6si158";
+       sha256 = "a884a88d96cff6ada34d83bf5bcda9d351953e635d858f1a246bb94ec594930c";
        revision = "1";
        editedCabalFile = "de2442ab5d53f8044c99cd0489281bf902ef6615028be780e0df937ae60266da";
        libraryHaskellDepends = [
@@ -137988,7 +138440,7 @@ self: {
      mkDerivation {
        pname = "vk-aws-route53";
        version = "0.1.2";
-       sha256 = "0sblvj89bb7vxgy09m88gcphqc9w2mpawg8kdz0r77y7db0vzb4x";
+       sha256 = "9dacbfc16ac79f93c16f133dae6e153c310c2f7b08d504fcebfbac9590dc7469";
        libraryHaskellDepends = [
          aws base bytestring containers http-conduit http-types old-locale
          resourcet text time xml-conduit xml-hamlet
@@ -138003,7 +138455,7 @@ self: {
      mkDerivation {
        pname = "vk-posix-pty";
        version = "0.2.1";
-       sha256 = "1kj06niwcsb4lyhppv5bs67cf8frcs4g8fyyzv3cpipn0xdhsr97";
+       sha256 = "27650d5b07f6c6cbc6fede3bf48866d921c78ed1abec7ba1a76469c6a33540ce";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring process unix ];
@@ -138018,7 +138470,7 @@ self: {
      mkDerivation {
        pname = "vocabulary-kadma";
        version = "0.1.0.0";
-       sha256 = "1qzx1kl93ic68rvpwf1y9q3gn5c2zf5536ajp6l4xh75dykl8mpb";
+       sha256 = "eb5644a76fe5c04ea8b95299518afb8215fb064e3e387e774686c591e80cfde3";
        libraryHaskellDepends = [ base smaoin ];
        homepage = "http://rel4tion.org/projects/vocabularies-hs/";
        description = "Smaoin vocabulary definitions of the base framework";
@@ -138030,7 +138482,7 @@ self: {
      mkDerivation {
        pname = "void";
        version = "0.7";
-       sha256 = "0ivgr4minxb5v56v4kbd045iwqk1c2w89c830731l75mkg8qa6wq";
+       sha256 = "981b85d19bb51c1ac60103b184b86061621e0b016d4db24dd965751b2bc96f47";
        libraryHaskellDepends = [ base ghc-prim hashable semigroups ];
        homepage = "http://github.com/ekmett/void";
        description = "A Haskell 98 logically uninhabited data type";
@@ -138043,7 +138495,7 @@ self: {
      mkDerivation {
        pname = "vorbiscomment";
        version = "0.0.2";
-       sha256 = "12kfih0marcrpw9y6wvxgqy6w73f62yhy02c05wcpwxww5cg9iwx";
+       sha256 = "9dc7f458e1bcf3cb78014c000fbd306e1c6e3c7e7d73e313bf996555018c6e8a";
        libraryHaskellDepends = [
          base binary-strict bytestring mtl utf8-string
        ];
@@ -138057,7 +138509,7 @@ self: {
      mkDerivation {
        pname = "vowpal-utils";
        version = "0.1.2";
-       sha256 = "09z6nbsj4rqzhksk75glrsrmcs21p8x0jmcpqs6rc9iizz79db8g";
+       sha256 = "0fad96ceff3126968dc69755093aba416856b3cef49533f5841f6722f5b2e627";
        libraryHaskellDepends = [ base bytestring ];
        jailbreak = true;
        homepage = "https://github.com/cartazio/Vowpal-Utils";
@@ -138071,7 +138523,7 @@ self: {
      mkDerivation {
        pname = "voyeur";
        version = "0.1.0.1";
-       sha256 = "117xvh6llh3aw8nxrvvqyjaflq35l69b7s4j1sc79p8r972mdwff";
+       sha256 = "cef156c54919dd74980e92e8b392a16560ea94f478efdc2de26a404a0ddcfd84";
        libraryHaskellDepends = [ base bytestring process utf8-string ];
        jailbreak = true;
        homepage = "https://github.com/sethfowler/hslibvoyeur";
@@ -138085,7 +138537,7 @@ self: {
      mkDerivation {
        pname = "vte";
        version = "0.13.0.2";
-       sha256 = "1w3y88rqkxx3pmcx73kmihivk2k4ywm7jnb9lvmvkgj4bqggis3h";
+       sha256 = "70e8f81e5e44beb9eba66959792af7648ab9238c758ed359bda3f78933427ef0";
        libraryHaskellDepends = [ base glib gtk pango ];
        libraryPkgconfigDepends = [ vte ];
        libraryToolDepends = [ gtk2hs-buildtools ];
@@ -138099,7 +138551,7 @@ self: {
      mkDerivation {
        pname = "vtegtk3";
        version = "0.13.0.2";
-       sha256 = "0dkmp6s58nmc4qvhmxpn91b1zxf0ard33dkbh4426086k1zkcfzg";
+       sha256 = "ef3b367f9806012308816bb6315a56c0f51f5648f6f60a3726ac5a54b4b97536";
        libraryHaskellDepends = [ base glib gtk3 pango ];
        libraryPkgconfigDepends = [ vte ];
        libraryToolDepends = [ gtk2hs-buildtools ];
@@ -138120,8 +138572,8 @@ self: {
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.2.10";
-       sha256 = "0wl4qfag8hkhsbm66cgxs55nq3fgmxdxzcvjvcbcm42pcyikvx9y";
+       version = "5.3.1";
+       sha256 = "3f9c18de862ee186772f0c91f18c70fc83acc9536c10f73e6714cdb092db8266";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138138,7 +138590,6 @@ self: {
          string-qq terminfo test-framework test-framework-hunit
          test-framework-smallcheck text unix utf8-string vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/coreyoconnor/vty";
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
@@ -138152,7 +138603,7 @@ self: {
      mkDerivation {
        pname = "vty-examples";
        version = "5.2.0";
-       sha256 = "1iyygg5sy59f586d31zxdaz1jnpwrir6bfissarb0ag55dhl1j8x";
+       sha256 = "1dc940612be529b0b2d23aba6572ccfc5a19be6afd87d10c2a2e15afcb7bdec7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -138172,7 +138623,7 @@ self: {
      mkDerivation {
        pname = "vty-menu";
        version = "0.0.3";
-       sha256 = "1ak6k43w381qg41mc5k5shbkwzg35kvh89yldimwk5a5sc08sqbi";
+       sha256 = "71618d00d34595c96b6cd42704f72ce37d3e17d4651656037938a0c1079966aa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base vty ];
@@ -138190,7 +138641,7 @@ self: {
      mkDerivation {
        pname = "vty-ui";
        version = "1.9";
-       sha256 = "1mvs2224slnkswcag6knnj9ydkfgvw6nhaiy71bijjd2wwln4fq2";
+       sha256 = "023b6229e7a2491957383e2a680ddfcfcde693b4769aa718d7d3524d84107ad7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138212,7 +138663,7 @@ self: {
      mkDerivation {
        pname = "vty-ui-extras";
        version = "0.1";
-       sha256 = "1c60bvhk1riilj7sl7x7nw4d9yg56f2k0ps1aivmjm0q4brhgnx7";
+       sha256 = "a7db07f3221854597754415f308533e5f9d408b7a71faa8fa431e630e15ec0b0";
        libraryHaskellDepends = [ base regex-base regex-pcre vty vty-ui ];
        jailbreak = true;
        description = "Extra vty-ui functionality not included in the core library";
@@ -138227,7 +138678,7 @@ self: {
      mkDerivation {
        pname = "waddle";
        version = "0.1.0.5";
-       sha256 = "0v4qhr01bqz7hb5q8hf2rdk8fxrbbmvsighi5wv2gv5b3cwh28cv";
+       sha256 = "9b2101391babec27362f11bea8775d2b778766cbc24184cb82e7e3154086986c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138251,7 +138702,7 @@ self: {
      mkDerivation {
        pname = "wai";
        version = "3.0.3.0";
-       sha256 = "044djv5r10g92cg7wvz8zlxsyjhnr2mqb1gf3gr9a1rjlcsv8zn4";
+       sha256 = "c47eb435a3320795f21bee8585abc8164aaf3bfde86f7e1e13e98190cb968d10";
        libraryHaskellDepends = [
          base blaze-builder bytestring http-types network text vault
        ];
@@ -138273,7 +138724,7 @@ self: {
      mkDerivation {
        pname = "wai-app-file-cgi";
        version = "3.0.8";
-       sha256 = "0adj4s8hxr9rpmqf6899cjaw6axwzw5jvw325wv2qxv3yp4x3w5x";
+       sha256 = "bdf0d1c9f563772c362f62f02d0bffbc2bc395642921e370bd39e50e9126b229";
        libraryHaskellDepends = [
          array attoparsec attoparsec-conduit base blaze-builder blaze-html
          bytestring case-insensitive conduit conduit-extra containers
@@ -138302,7 +138753,7 @@ self: {
      mkDerivation {
        pname = "wai-app-static";
        version = "3.1.1";
-       sha256 = "0aiywk7a25fpk9fwm6fmibi4zvg5kynnjs6syfxyzfw4hl1dazjv";
+       sha256 = "5b7ed5028584bbefbbf3da6869ad9fe5ed4fe28ad599ca5d9ad715a1cee43e2a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138332,7 +138783,7 @@ self: {
      mkDerivation {
        pname = "wai-conduit";
        version = "3.0.0.2";
-       sha256 = "1wqn8biq0ghz7ikmlq7x7vpdq2yc7mk9rnz9vlng7vcm7wpqilj7";
+       sha256 = "47d2882f3f95edf32cdde9db9c663dcc0bdcee3efd605a673c1f3e80e34216f3";
        libraryHaskellDepends = [
          base blaze-builder bytestring conduit http-types transformers wai
        ];
@@ -138350,7 +138801,7 @@ self: {
      mkDerivation {
        pname = "wai-cors";
        version = "0.2.3";
-       sha256 = "1mnybcf50d0ijbg2a40kf4sl55rb1m4p02nqqid4g7vcanmfjw92";
+       sha256 = "2271e9aa556c9f475ac4d80a70490d2b97423571131025de921134501c5bded6";
        libraryHaskellDepends = [
          attoparsec base base-unicode-symbols bytestring case-insensitive
          charset http-types mtl parsers transformers wai
@@ -138372,7 +138823,7 @@ self: {
      mkDerivation {
        pname = "wai-digestive-functors";
        version = "0.3";
-       sha256 = "04l9m43gm1zcgq32c70870kygy87p44zb4kvqcvi86zcspqdgpld";
+       sha256 = "8dded7f0d5ec1b1437c37b92f509b907f9e72738081c26067eec87fa06a98912";
        libraryHaskellDepends = [
          base digestive-functors http-types resourcet text transformers wai
          wai-extra wai-util
@@ -138387,7 +138838,7 @@ self: {
      mkDerivation {
        pname = "wai-dispatch";
        version = "0.1";
-       sha256 = "1qyarjbpnngb2x272gkmvrhy3f8kqygxj4nvi6giz09rdx9pfrza";
+       sha256 = "ea6777536f39811f9f89db12d99fc713b9e161de753e714417eb597b97cccae3";
        libraryHaskellDepends = [ base text wai yesod-routes ];
        homepage = "https://github.com/singpolyma/wai-dispatch";
        description = "Nice wrapper around yesod-routes for use with WAI";
@@ -138399,7 +138850,7 @@ self: {
      mkDerivation {
        pname = "wai-eventsource";
        version = "3.0.0";
-       sha256 = "1h5zlqky7ldqbmiaixizhk1s8ghf5i3ha1xfz8flxgzr7gr0al3q";
+       sha256 = "785005f23bf9bf4e1dfaae0705472c0e3ea4c3843ff6a8625db8d1e327a6bfc0";
        libraryHaskellDepends = [ wai ];
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI support for server-sent events (deprecated)";
@@ -138418,7 +138869,7 @@ self: {
      mkDerivation {
        pname = "wai-extra";
        version = "3.0.10";
-       sha256 = "0dqvfwqzkr3g030s24lzy9l9vaws27m0cs0aq771p7f22w9g6fjh";
+       sha256 = "503af31217c29d1bcec10a6806ea119aab9d68f29f12a1c1006fe4f931771b37";
        libraryHaskellDepends = [
          ansi-terminal base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -138442,7 +138893,7 @@ self: {
      mkDerivation {
        pname = "wai-frontend-monadcgi";
        version = "3.0.0.1";
-       sha256 = "0g0lkkfcfi9vldl0g4r6qy8an1hsd4xnqw9z8d66mw696ydynvsj";
+       sha256 = "526feb9b37c9f06a4c433f716c3b691a06ab90c726930768a33b45c7dc9c143c";
        libraryHaskellDepends = [
          base bytestring case-insensitive cgi containers http-types
          transformers wai
@@ -138456,7 +138907,7 @@ self: {
      mkDerivation {
        pname = "wai-graceful";
        version = "0.1.0.1";
-       sha256 = "0a06yrakg9gwjjj4f9nr474j8i8xz642aj56m8vaq621i1kn7jaq";
+       sha256 = "58c96367884118ac36aaa6482588f91d4524c921d92647a494fca53755f60628";
        libraryHaskellDepends = [ base http-types mtl resourcet unix wai ];
        jailbreak = true;
        homepage = "https://bitbucket.org/dpwiz/wai-graceful";
@@ -138473,7 +138924,7 @@ self: {
      mkDerivation {
        pname = "wai-handler-devel";
        version = "2.0.0.2";
-       sha256 = "13f3w31kr3zinll76i6y3walpyqz3i1rlbsh3d7c5p8hp2d88bzy";
+       sha256 = "fe2f849ab810ddc24e1b502f9a431c1ffb4b151fde447328b5f18f3cc3e0c38d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138493,7 +138944,7 @@ self: {
      mkDerivation {
        pname = "wai-handler-fastcgi";
        version = "3.0.0.1";
-       sha256 = "14lm9vbh213jxd1nkxcipisja90h3ay6mi6iiim65k7snm3b7w1v";
+       sha256 = "3bf0b346b5facc626a8cd1c46abc1a10242575bc91f56943eb720401d74e9592";
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
        librarySystemDepends = [ fcgi ];
        homepage = "http://www.yesodweb.com/book/web-application-interface";
@@ -138508,7 +138959,7 @@ self: {
      mkDerivation {
        pname = "wai-handler-launch";
        version = "3.0.0.4";
-       sha256 = "1qfisa19rhlx241jr90mz8x844pp5yx1z8xbmflvj81gpnvsgh7i";
+       sha256 = "f1c0a7b7bd2f20b9a9ababa31fba2ff712823afa15a42c03119dc29c82d2d1e1";
        libraryHaskellDepends = [
          base blaze-builder bytestring http-types process streaming-commons
          transformers wai warp
@@ -138522,7 +138973,7 @@ self: {
      mkDerivation {
        pname = "wai-handler-scgi";
        version = "2.0.0.2";
-       sha256 = "0h7d78d641bjsnmxsnz4b7s9pw4x0y0xi8bld51y4nqnbjl8gvac";
+       sha256 = "4ced87a85c165be2436974a1d881079df09bf459e45bddabd57205621a3aed40";
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
        jailbreak = true;
        homepage = "http://www.yesodweb.com/book/web-application-interface";
@@ -138537,7 +138988,7 @@ self: {
      mkDerivation {
        pname = "wai-handler-snap";
        version = "0.1.1";
-       sha256 = "0akk9h7m1hhdggbhj0grss94jzm13fmcmgj51nvh7mfj6f5kj31l";
+       sha256 = "340c398b33d2d503b70d45becaaa1ba17e4992d6f90109d77b0dc2500f4c732a";
        libraryHaskellDepends = [
          base bytestring containers enumerator snap-core snap-server
          transformers wai
@@ -138554,7 +139005,7 @@ self: {
      mkDerivation {
        pname = "wai-handler-webkit";
        version = "3.0.0.2";
-       sha256 = "0y7di5pnrri4dkqi8lx4gfksfpbqfwax1wjp1ijc5cw6p34mmzcs";
+       sha256 = "9afd5ac9b886b3c2640c57f2d01577785da7a77ba45314f16c24e66c6f89ed78";
        libraryHaskellDepends = [ base wai warp ];
        libraryPkgconfigDepends = [ QtWebKit ];
        homepage = "https://github.com/yesodweb/wai/tree/master/wai-handler-webkit";
@@ -138570,7 +139021,7 @@ self: {
      mkDerivation {
        pname = "wai-hastache";
        version = "0.1";
-       sha256 = "1kkn8n33cm5r7hw0xxf815nx1ixg09r7ckspq228j1syq5j1lzq8";
+       sha256 = "087f1a64c15e078984c0574f767202afc7d06d09c8f50e383cb95436864576ce";
        libraryHaskellDepends = [
          base bytestring hastache http-types transformers wai
        ];
@@ -138588,7 +139039,7 @@ self: {
      mkDerivation {
        pname = "wai-hmac-auth";
        version = "1.0.0";
-       sha256 = "1hjzwh9hzy29y617faa94428s7ja2ri0bggqxwmf27a0r4qpf1r4";
+       sha256 = "24077731c9401de12aeff8bd0562164a1e8d042149297782f149f80f13e45fc2";
        libraryHaskellDepends = [
          base base64-bytestring bifunctors byteable bytestring containers
          cryptohash http-types monad-loops mtl transformers wai
@@ -138611,7 +139062,7 @@ self: {
      mkDerivation {
        pname = "wai-lens";
        version = "0.1";
-       sha256 = "05vd7pjw6jgbb11yln4h2lbyr5pr471040p51pj7iy2m65s42v4x";
+       sha256 = "9d6c41743155f878e40de50202c221f996ec17159058ea4358eb49c3e53d6d17";
        libraryHaskellDepends = [
          base bytestring http-types lens network text vault wai
        ];
@@ -138627,7 +139078,7 @@ self: {
      mkDerivation {
        pname = "wai-lite";
        version = "0.2.0.0";
-       sha256 = "1ghxna51m304x5yvgfdgpml0yf6jqhfkixlxxnflg7z34h6wjzz4";
+       sha256 = "e47fc90d24e39f479ded9df6381dc4d2380f68bdafb9b77de9048c1a8ab21dbe";
        libraryHaskellDepends = [
          base bytestring conduit http-types text transformers wai wai-extra
        ];
@@ -138645,7 +139096,7 @@ self: {
      mkDerivation {
        pname = "wai-logger";
        version = "2.2.4.1";
-       sha256 = "1s6svvy3ci4j1dj1jaw8hg628miwj8f5gpy9n8d8hpsaxav6nzgk";
+       sha256 = "f37d6bb6ea4a5f881ab2c9df571c923c5624cc83882b19640b924436fcdedae8";
        libraryHaskellDepends = [
          auto-update base blaze-builder byteorder bytestring
          case-insensitive easy-file fast-logger http-types network unix
@@ -138663,7 +139114,7 @@ self: {
      mkDerivation {
        pname = "wai-logger-prefork";
        version = "0.3.0";
-       sha256 = "0cfslqr2zdj0x83dbscafhdljrn2xswym7hpf23zlrsrnpz71qy4";
+       sha256 = "c4e370feb55967fa8770179eeab9eec266491b748ae9d506ea40b62f32a6da31";
        libraryHaskellDepends = [
          base bytestring date-cache fast-logger http-types unix wai
          wai-logger
@@ -138681,7 +139132,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-cache";
        version = "0.3.6";
-       sha256 = "1kqrqjsmnwwavcyhwx6m2x3qk7qbd0h60817ai61dz3aprwc8hdw";
+       sha256 = "bc41c478be6afc164c5427206020680b9f894717d5740e3ddb8a735bb5c419cf";
        libraryHaskellDepends = [
          base binary blaze-builder-conduit bytestring conduit crypto-conduit
          http-types pureMD5 wai
@@ -138705,7 +139156,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-cache-redis";
        version = "0.4.3";
-       sha256 = "1vd81jcisav6jyqzwa0qn35xarm21bjrw0qps9qbbq56svkh1lw9";
+       sha256 = "89d300e7d6a6e0b570d217039ee50aa266d5cbb01828feb197662b1d990ca8ed";
        libraryHaskellDepends = [
          base binary blaze-builder-conduit bytestring case-insensitive
          conduit hedis hedis-pile http-types transformers wai
@@ -138723,7 +139174,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-catch";
        version = "0.3.6";
-       sha256 = "1vh5sad3zhdwxqbmivmy9hkbnq9vrv4k6k17rjk4f79lv2xcq56h";
+       sha256 = "d014ccbad8341d47a6cc274c33c9ce3b61bb264cbeee5817eebcc13f9ad205ee";
        libraryHaskellDepends = [
          base bytestring http-types lifted-base wai
        ];
@@ -138744,7 +139195,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-consul";
        version = "0.1.0.2";
-       sha256 = "0qq7kilp9a4qjja337saqccn250s6mnf3n80sgyg935hy1dmm7fq";
+       sha256 = "d89d5a5bf0b08cf4fcd300d9e16c351a146119c34a9f31949498a874699c0763";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138774,7 +139225,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-crowd";
        version = "0.1.1.2";
-       sha256 = "039vqcy16ww7cigzppl0lnmjwbvxdv0z0zq3rnklh334lyh5jfay";
+       sha256 = "5e3959a0a7640c48a7cd037ff0c16e7d2f2eaba580defb5f648773133cc33b0d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138800,7 +139251,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-etag";
        version = "0.1.0.0";
-       sha256 = "0mcqnzvxx671awr2szyfpm6jskily9zxvmg61zz430km4i2q3wj8";
+       sha256 = "48f2814524758241fe0fe6d5dd7ff2344e2d4dbdce7f2d3257e198def7b79855";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cryptohash filepath http-date
          http-types unix-compat unordered-containers wai
@@ -138819,7 +139270,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-gunzip";
        version = "0.0.2";
-       sha256 = "0rbvpw4y4qr2mhijlybzwwd12mkhrwmxlrhj2q0mq9diwhp597dx";
+       sha256 = "bd9d542ee4b1255c01161266da2bcf7056111ae77f792a23ac2263e209bf7b65";
        libraryHaskellDepends = [
          base bytestring http-types streaming-commons wai
        ];
@@ -138833,7 +139284,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-headers";
        version = "0.1";
-       sha256 = "10ap355j4dx42y7ycf1plpbg04wazv0q62mi3ibza8sb33hiiprh";
+       sha256 = "30df18e1184b23f5571cb10a83c1fe8a13f0d6a53738e68f17a437224b195781";
        libraryHaskellDepends = [ base bytestring http-types wai ];
        homepage = "http://github.com/seanhess/wai-middleware-headers";
        description = "cors and addHeaders for WAI";
@@ -138850,7 +139301,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-hmac";
        version = "0.1.0.0";
-       sha256 = "01xd1nhi96lflh6ssaz3m5dkacrp2b2kwk611jc8q5j3kmyc0zqs";
+       sha256 = "1a7fc07c9d43168c980cc14c3ec5123733355ba9e32bad0da48e9a14a10dad07";
        libraryHaskellDepends = [
          base base64-bytestring byteable bytestring case-insensitive
          cryptohash http-types transformers wai word8
@@ -138873,7 +139324,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-hmac-client";
        version = "0.1.0.2";
-       sha256 = "1jmfmcdv1js6rgadfhwb071qp418440ij0hm0fmyf03dk879qhds";
+       sha256 = "ba419c0e9a6d00e7ab03150219012128908bc3018b43d7d4cb46cbb01babaeca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138897,7 +139348,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-metrics";
        version = "0.2.1";
-       sha256 = "0aiig72r72vykd1f1871458d4glnqsrs7rr402jv5ka05d1rg6y0";
+       sha256 = "c09b97432b40cdb2a50024e7a3b3c6963ed25021e1a0e0429b7e8b93c579312a";
        libraryHaskellDepends = [ base ekg-core http-types time wai ];
        testHaskellDepends = [
          base bytestring ekg-core http-types QuickCheck scotty tasty
@@ -138916,7 +139367,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-preprocessor";
        version = "0.2.0.0";
-       sha256 = "1n9z00v5a75pas22cdm26hj888s6kc98bddh2gfs3ffrazdmgbj1";
+       sha256 = "41ae57db57d9b9a1dd13b0b585129b4623842434a236268456b71c5536003fd9";
        libraryHaskellDepends = [
          base directory mtl split text wai wai-middleware-static
        ];
@@ -138937,7 +139388,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-prometheus";
        version = "0.1.0.1";
-       sha256 = "0drhprxja1pp0mibs2f4asl4mycy91pvyanxa0h364k9v6fwp93d";
+       sha256 = "6da4cb9dd96912332050dd2abf6f489ef94aa856c409bd6205f706257bbe3037";
        libraryHaskellDepends = [
          base bytestring data-default http-types prometheus-client text time
          wai
@@ -138956,7 +139407,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-route";
        version = "0.7.3";
-       sha256 = "0zgiaxc5rqjlkfwkb11a5zkmbybrfcqr74mq5vpj03mqz1q0lmx7";
+       sha256 = "a7570a70f8b80e20ef2eb89293317379f955e72f2a8435b99b54e25c5857f17d";
        libraryHaskellDepends = [
          base bytestring http-types text wai yesod-routes
        ];
@@ -138979,7 +139430,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-static";
        version = "0.7.0.1";
-       sha256 = "0kvs3bv5yyg1j7zghl91gi12g7k20vwbbk0ag9clmq3zn33i46iw";
+       sha256 = "3c1a12c7b07fe04a597a0accb5f806629e27427c2151f8fe91e1795ff61a7a4f";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash directory
          expiring-cache-map filepath http-types mtl old-locale text time wai
@@ -138997,7 +139448,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-static-caching";
        version = "0.6.0.1";
-       sha256 = "0xj4r1fr1g0fybgsq65gxcvh5zn9hafvm0f73p6dnj6jhz6dryhk";
+       sha256 = "13fadccc87d248dbcc1dc781ba9d82c9fe0237ebaf18acdff20ebc905dc84476";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash directory
          expiring-cache-map filepath http-types mtl old-locale text time
@@ -139018,7 +139469,7 @@ self: {
      mkDerivation {
        pname = "wai-middleware-throttle";
        version = "0.2.0.1";
-       sha256 = "08qxdcbn1lg9rd2rcp10iri1maamn5cily9mbg1r65h8ivdmrdan";
+       sha256 = "56b55cdb8e081693c35b35791a59b155a91a628e205c9645cbe9d160176b1d23";
        libraryHaskellDepends = [
          base containers http-types network stm token-bucket transformers
          wai
@@ -139040,7 +139491,7 @@ self: {
      mkDerivation {
        pname = "wai-predicates";
        version = "0.8.4";
-       sha256 = "06ib359k8amh15qmmv6rdmicak1rrx758xfrf75nni03z9k9rby5";
+       sha256 = "c5af9c66fa03446bcb71d975544ecf394cc5626dd9ec5a7109b02a3453192b1a";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-conversion case-insensitive
          cookie http-types singletons transformers vault vector wai
@@ -139062,7 +139513,7 @@ self: {
      mkDerivation {
        pname = "wai-request-spec";
        version = "0.10.0.1";
-       sha256 = "13s86z82rcsy3ai4qzjbxinwxzd81zhsvf589mhn2fhfk8qm7wdg";
+       sha256 = "aff153319a0e3a61614da8b8ade10fa8fdce6dec4b7e4ca21a5eb32cd037488f";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types text wai
        ];
@@ -139076,7 +139527,7 @@ self: {
      mkDerivation {
        pname = "wai-responsible";
        version = "0.0.0.0";
-       sha256 = "0qf64g11113gl45bfn12j2ikdjwrdxg9r8cicfs4pmh0dq5vj0va";
+       sha256 = "6a03b90b6e00d64bb46391a19c5e6f99cb36a3902258b70aa16f8410c223c661";
        libraryHaskellDepends = [ base bytestring http-types wai ];
        jailbreak = true;
        homepage = "https://github.com/pharpend/wai-responsible";
@@ -139091,7 +139542,7 @@ self: {
      mkDerivation {
        pname = "wai-route";
        version = "0.3";
-       sha256 = "1gmadxdki64x2r7931vsgzzb1hkk03a1virkjmnfm3i7kz5dp4kp";
+       sha256 = "7792dbca9f278eea6c9533c71dd40073c2b0fe7f7a87914e169d98385b6faabe";
        libraryHaskellDepends = [
          base bytestring http-types unordered-containers wai
        ];
@@ -139108,7 +139559,7 @@ self: {
      mkDerivation {
        pname = "wai-router";
        version = "1.0.0.1";
-       sha256 = "1827mk64vyivdc12z4h230c4b993i6g8wl4sl0364jda586z58p7";
+       sha256 = "e7a2f20d2aaa496206a09a508e9e8923a545181802922f026b3bfa4dccac47a0";
        libraryHaskellDepends = [ base text wai ];
        jailbreak = true;
        homepage = "http://github.com/mdmarek/wai-router";
@@ -139123,8 +139574,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.7.2";
-       sha256 = "05f8524q9rb5y4d8fryhv4jjkcgqygbckg4pkklvs86s5zlg9nsa";
+       version = "0.7.3";
+       sha256 = "92d694a9b63b8f34e1e62f5f29b65cb85566eeb9cad90b7dd34689bc296b139b";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring containers http-types
          monad-loops mtl path-pieces random template-haskell text wai
@@ -139143,7 +139594,7 @@ self: {
      mkDerivation {
        pname = "wai-routing";
        version = "0.12.1";
-       sha256 = "01bs5mmycn7dkvnp01mh226iy1b419amab83fmgk0asd2f3jsfn5";
+       sha256 = "c53a2d87134d2b305f75032d55550a64051f8d10b00670ed9eed58e66b2d7a05";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-conversion case-insensitive
          cookie http-types transformers wai wai-predicates wai-route
@@ -139166,7 +139617,7 @@ self: {
      mkDerivation {
        pname = "wai-session";
        version = "0.3.2";
-       sha256 = "09l3gj8l127iybr8h4xcjxxcgz5b1mcy5iyyaidixnzi7jlrqww3";
+       sha256 = "83739ca93cf1db1e5b54dec7e2590dabfcc77a97ac1388f2f2f18840917c8326";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers cookie http-types StateVar
          time transformers vault wai
@@ -139183,7 +139634,7 @@ self: {
      mkDerivation {
        pname = "wai-session-clientsession";
        version = "0.1";
-       sha256 = "0kczhsmkv88g0x8mk4cfy5z9wv3fzv8v3r4z0q7jkyda0grx3gwf";
+       sha256 = "8ebfd1f303aaf9290f069fe4b1d1fe6e6c9e7ef18e915951070fa13dab869f4d";
        libraryHaskellDepends = [
          base bytestring cereal clientsession errors transformers
          wai-session
@@ -139200,7 +139651,7 @@ self: {
      mkDerivation {
        pname = "wai-session-tokyocabinet";
        version = "0.1";
-       sha256 = "0cd4x3byc8kaarjpfczqaiv5y3ixrdcilnnypkhcavk3vj7w7pmr";
+       sha256 = "b9dec38fdc636ec5e0bcde5a1a59cb3d0e5f7654f8337765566a22e6d7e8a431";
        libraryHaskellDepends = [
          base bytestring cereal errors tokyocabinet-haskell transformers
          wai-session
@@ -139220,7 +139671,7 @@ self: {
      mkDerivation {
        pname = "wai-static-cache";
        version = "0.1.0.1";
-       sha256 = "0vlkh9izxx1qsb61fak57kk9k35i3vph8qbyvlmgwcw7nplagq6l";
+       sha256 = "d4e0a7e8b58733fe2add7e6104ef1eb18c99e63c652a17ccd238f4fe6382936e";
        libraryHaskellDepends = [
          base bytestring cityhash conduit conduit-combinators containers
          http-types resourcet system-filepath text transformers vector
@@ -139238,7 +139689,7 @@ self: {
      mkDerivation {
        pname = "wai-static-pages";
        version = "0.3";
-       sha256 = "0xam283gvcjryq541dzrymv9qy7asyfz8k44b6dwrvm5bqphjz9h";
+       sha256 = "307d092f5ea5eecc9b59844cf49dd7ea789c76f5f9b7400af659b2fd06125575";
        libraryHaskellDepends = [
          base blaze-builder bytestring conduit directory http-types text wai
          wai-extra
@@ -139253,7 +139704,7 @@ self: {
      mkDerivation {
        pname = "wai-test";
        version = "3.0.0";
-       sha256 = "0xys01jniib0pnhadcm7s0v5z0wcxfgi0bf5ax808zm9qzvl3xfx";
+       sha256 = "ddf541f7c7a97e045057c52d109feb8c835f36d0a7b2a6a0bd60c5686500da77";
        libraryHaskellDepends = [ wai ];
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "Unit test framework (built on HUnit) for WAI applications. (deprecated)";
@@ -139267,7 +139718,7 @@ self: {
      mkDerivation {
        pname = "wai-throttler";
        version = "0.1.0.5";
-       sha256 = "1jh53ac1q4zksxdrmwjgsyidvx8zlhx57nnf3ca4spa3paz9n9g6";
+       sha256 = "e6259bbeba435d4d141bceda533aa41ff5dda2d74ff29a5bd7f3131c981a05ca";
        libraryHaskellDepends = [
          base bytestring containers http-types time wai
        ];
@@ -139285,7 +139736,7 @@ self: {
      mkDerivation {
        pname = "wai-util";
        version = "0.8";
-       sha256 = "10rkrhs7xv6qmx31ll891c2nnaqpblyfxqmn8xwjhafp7ks1wqjm";
+       sha256 = "55621ef43cd729287947b6e2ee3c5d172b6b050b09511a46afd8ec7e34cc3383";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit http-accept http-types
          network-uri text transformers wai wai-extra
@@ -139303,7 +139754,7 @@ self: {
      mkDerivation {
        pname = "wai-websockets";
        version = "3.0.0.6";
-       sha256 = "0i8r5r8l3z6fk7a466n48ralq33kdihc8g91ia4z22cqhl0zkizy";
+       sha256 = "fec7f901859809f1898a213dc4606c730c4c5546c41a43d499cefc41512e1945";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139325,7 +139776,7 @@ self: {
      mkDerivation {
        pname = "wait-handle";
        version = "0.1.1";
-       sha256 = "09080zx6m4lqli85867ilck82gvgnz4vkq9nxx5f1v5fli1i0n7m";
+       sha256 = "f5581043a4aeece04aef36e1b9c9b76f3f8126a3f1185450a498926afa070824";
        libraryHaskellDepends = [ base ];
        homepage = "https://www.github.com/fmap/waithandle";
        description = "Wait handles are MVars which can only be written to once, and from which values can never be removed";
@@ -139337,7 +139788,7 @@ self: {
      mkDerivation {
        pname = "waitfree";
        version = "0.1.5";
-       sha256 = "09hlqli7zpcxfa8w7vh937gc3rxp7s8q8v1zs8ciwnmh6ca4i8rq";
+       sha256 = "38a3481433b05a1e19d23f6c84913eb7e7c1de1909eec391729ddd7f22c51426";
        libraryHaskellDepends = [ base containers ];
        description = "A wrapping library for waitfree computation";
        license = stdenv.lib.licenses.mit;
@@ -139351,7 +139802,7 @@ self: {
      mkDerivation {
        pname = "waitra";
        version = "0.0.3.0";
-       sha256 = "0yismhhgwzrssla2bcg44jy0fdwwxh2szypyjn8wfjvmkfhzshvn";
+       sha256 = "7643fda19b754bc79195fefaaf05ec9c3707bc24e4b12514d53a7ffe20ac3a7a";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath http-types
          regex-applicative template-haskell text wai
@@ -139366,6 +139817,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "warc" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, either, errors, free
+     , lens, pipes, pipes-attoparsec, pipes-bytestring, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "warc";
+       version = "0.1.1.1";
+       sha256 = "9530f595264316d474abb194754d69c4857b8ccc65e49280e430fd596eb65260";
+       libraryHaskellDepends = [
+         attoparsec base bytestring either errors free lens pipes
+         pipes-attoparsec pipes-bytestring text time transformers
+       ];
+       homepage = "http://github.com/bgamari/warc";
+       description = "A parser for the Web Archive (WARC) format";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "warp" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, case-insensitive, containers, directory, doctest
@@ -139377,7 +139846,7 @@ self: {
      mkDerivation {
        pname = "warp";
        version = "3.1.2";
-       sha256 = "1ya8mfvb18p9d5bj0ijnlbd7m04mj7f1z9ld82a8vry37sdifidq";
+       sha256 = "b845179b3ec3e78d94408da61fdc9195807adaa25646205769e9a2b0b6ab48f9";
        libraryHaskellDepends = [
          array auto-update base blaze-builder bytestring case-insensitive
          containers ghc-prim hashable http-date http-types http2 iproute
@@ -139402,7 +139871,7 @@ self: {
      mkDerivation {
        pname = "warp-dynamic";
        version = "0.1.0";
-       sha256 = "1kmmy2av0ikr6mb8g7ffqmf505ha4201qv7y48fyc9p8j0p6lk6g";
+       sha256 = "cf4c6a2e90e826e61d22fe6c1c80200a16505cc5ce9d8756357946b095f0b5ce";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139423,7 +139892,7 @@ self: {
      mkDerivation {
        pname = "warp-static";
        version = "2.0.1.1";
-       sha256 = "181z8cr55qngy6jyqzqz5wcgiyip4rn3q1am0hkcxvmdnif2w2km";
+       sha256 = "750a2e5cb4adeece260455053c6c2637faf8182f1f7feca5f1cfe25232433fa0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -139444,7 +139913,7 @@ self: {
      mkDerivation {
        pname = "warp-tls";
        version = "3.1.0";
-       sha256 = "1790hl3a327fv01w2shdslylmhp5zv0bh7ljhymipr5vpjwjknrz";
+       sha256 = "3fdb29b9bcbbe41bab87921eb8c0fee5c24a3dd50d6ac103d8ee88a10685209d";
        libraryHaskellDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
@@ -139462,7 +139931,7 @@ self: {
      mkDerivation {
        pname = "warp-tls-uid";
        version = "0.1.0.4";
-       sha256 = "11av9jkf8z2xcpwg3nyx018qwpdrm0cs79qj14z93ah1yxbavb5y";
+       sha256 = "beacad56f701aa913e0912a7a319a8b95d8e5100dddbf1f8655d7ce4a64c5b85";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139484,7 +139953,7 @@ self: {
      mkDerivation {
        pname = "watchdog";
        version = "0.2.2.1";
-       sha256 = "06b93cqn6rbl6jbjyawzqmrx80h0dbcks7ia6l3wzdqpic8yjj6v";
+       sha256 = "db48e9118b17b7cf07352a1e3dd96a0002d473c59f2b2f9734746563311b6919";
        libraryHaskellDepends = [ base mtl time ];
        jailbreak = true;
        description = "Simple control structure to re-try an action with exponential backoff";
@@ -139499,7 +139968,7 @@ self: {
      mkDerivation {
        pname = "watcher";
        version = "0.0.3.0";
-       sha256 = "1c6025zpghqvw5xlapnfk8nwf32iq6dkpnpzi65pm5l5f5npwwgs";
+       sha256 = "fa717e6d7185967a8b89ffda3b9bc1510cc72d9ace5e457be11bc3777f11c0b0";
        libraryHaskellDepends = [
          base basic-prelude containers hinotify system-fileio
          system-filepath
@@ -139519,7 +139988,7 @@ self: {
      mkDerivation {
        pname = "watchit";
        version = "0.1.0.0";
-       sha256 = "134b9nrl2lmcr80hxmf72la220plh48vdl0r2la3c3k6qimsd276";
+       sha256 = "e688a66bc4660e36141519d0b61181f402211415c7d50e01caac5241b34d8b8c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139544,7 +140013,7 @@ self: {
      mkDerivation {
        pname = "wavconvert";
        version = "0.1.1";
-       sha256 = "028qx9b4z2gr4nc6hid0phdrysvhfqswj64s71pw2grqw4f8ddkx";
+       sha256 = "7db6861ce1383fc16f389a18c93576706b9f1bbca045689825f9894f56ea1809";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath process ];
@@ -139559,7 +140028,7 @@ self: {
      mkDerivation {
        pname = "wavesurfer";
        version = "0.0.6";
-       sha256 = "1f9hsmvwdgrib44sj1rnkm4hv92iad27xg75n2y2qdq1a8giazn5";
+       sha256 = "c57e151f5201372cbcb0e5bc7e445351a40d499d3607a9095931bfc677d530b9";
        libraryHaskellDepends = [
          base binary bytestring bytestring-lexing bytestring-show
          delimited-text
@@ -139578,7 +140047,7 @@ self: {
      mkDerivation {
        pname = "wavy";
        version = "0.1.0.0";
-       sha256 = "0rvzsmd7lzimyphc2yscadwkanqpi8wnmdk5hrzwpcm6dcavyj9q";
+       sha256 = "3849bf156ba6b2cb7f8665b66a398a175b3579534c7bc1e0f5357e7a5ad57f67";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139600,7 +140069,7 @@ self: {
      mkDerivation {
        pname = "wcwidth";
        version = "0.0.2";
-       sha256 = "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz";
+       sha256 = "ffc68736a3bbde3e8157710f29f4a99c0ca593c41194579c54a92c62f6c12ed8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -139619,7 +140088,7 @@ self: {
      mkDerivation {
        pname = "weather-api";
        version = "0.4.3";
-       sha256 = "0wlh3p5z2vivhn9pgqzjhczrb7jyfzkz889fmwnvm7h87440jnyj";
+       sha256 = "d25b090839089eba2daf2e21f4e7775e9e953f83f2e37793853b6ef1cb1d9072";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring HTTP network utf8-string vector
        ];
@@ -139635,7 +140104,7 @@ self: {
      mkDerivation {
        pname = "web-browser-in-haskell";
        version = "1.0";
-       sha256 = "1y674dw8slz0m7i23j7p1qykdci2wssmx6x0yf23cf0nywz1py5k";
+       sha256 = "b3f81b3ef716383684f3a09b5eb5e622b2363d0ef7c821e2a9e0538d7823c7f8";
        libraryHaskellDepends = [ base gtk webkit ];
        description = "Web Browser In Haskell";
        license = "GPL";
@@ -139647,7 +140116,7 @@ self: {
      mkDerivation {
        pname = "web-css";
        version = "0.1.0";
-       sha256 = "1havyvd6f0xagynxpar2jsmx5x1izwl7wgxia0wbwbzaj0fzn2k2";
+       sha256 = "620afb1d90ea2fbe3850b13f7e28ff31f4d2ab9622abdbad7faa0367daf65bc1";
        libraryHaskellDepends = [ base text ];
        jailbreak = true;
        description = "Simple functions for CSS";
@@ -139661,7 +140130,7 @@ self: {
      mkDerivation {
        pname = "web-encodings";
        version = "0.3.0.9";
-       sha256 = "0lg9vbsmg9nfs2440ab2srhhawg1xfi5lnhxzd9rj7kab460w2x3";
+       sha256 = "a30b0e0c596a1e9953fb1d5a5aa2ebe1710561d662294088d0cea657f5dae951";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139681,7 +140150,7 @@ self: {
      mkDerivation {
        pname = "web-fpco";
        version = "0.1.1.0";
-       sha256 = "1iizmg1syjywd5hs9swcqxxzmix04hwa86p8c246xybwcklf667n";
+       sha256 = "f618e3e8647cf96e8860e81aa43824a0c7fa7bc78ceba46169dc4bafc3ab3fc6";
        libraryHaskellDepends = [
          base happstack-server safe snap snap-core snap-server
        ];
@@ -139698,7 +140167,7 @@ self: {
      mkDerivation {
        pname = "web-mongrel2";
        version = "0.0.3";
-       sha256 = "1j2pq3kzmk2gibrr4jcm5gksz9pk9shjqqpwc85ygb2mpf5yc1gw";
+       sha256 = "fc05e68bbb55ace70b62fc622ca14ef3a6afe72b954992f38a4fccfae7c057c8";
        libraryHaskellDepends = [
          base bytestring data-default file-embed haskell98 HStringTemplate
          json mtl old-time parsec system-uuid template-haskell text
@@ -139718,7 +140187,7 @@ self: {
      mkDerivation {
        pname = "web-page";
        version = "0.2.0";
-       sha256 = "1hzqwp67pj1xvhmdaxmij08820ffxf559d7jgr8037zzm7j02cql";
+       sha256 = "143301e4a9ff9f01507ef2b4548aebce01811090b176d52adc3dc87bcce5f8c3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139735,7 +140204,7 @@ self: {
      mkDerivation {
        pname = "web-plugins";
        version = "0.2.8";
-       sha256 = "00w0v0q2i0jxwlav1qb967nf35bxbr6vwacs5mqficzg2d4pz969";
+       sha256 = "c9a47f4913efb3e8702d9a29be4d5e7d95e1ec3169e1b015e55d822830d88003";
        libraryHaskellDepends = [ base containers mtl stm text ];
        homepage = "http://www.happstack.com/";
        description = "dynamic plugin system for web applications";
@@ -139751,7 +140220,7 @@ self: {
      mkDerivation {
        pname = "web-routes";
        version = "0.27.9";
-       sha256 = "1azccgcnksz4c4pm1nayvjiq3m192zz21cnc0fm89hdixvqck346";
+       sha256 = "868cc9f0eeb1c184aa03ccb220fe1729d481a3dc5ed9502f61e4eb69d963ecab";
        revision = "2";
        editedCabalFile = "542f5d20616359b0897018bbd347ce7f0dc948c4e031e8a5383ed85cb931406b";
        libraryHaskellDepends = [
@@ -139771,7 +140240,7 @@ self: {
      mkDerivation {
        pname = "web-routes-boomerang";
        version = "0.28.4";
-       sha256 = "0ailw4s0c1f054q58dwylq1g1f043vw4ywk0spg5d3sk9asy8bxh";
+       sha256 = "b02fe4b54a538f56ded560724ff81e04b8f002a69e37543029c0050634e1342a";
        libraryHaskellDepends = [
          base boomerang mtl parsec text web-routes
        ];
@@ -139786,7 +140255,7 @@ self: {
      mkDerivation {
        pname = "web-routes-happstack";
        version = "0.23.9";
-       sha256 = "0vsjm979z21858wk9z1b855jqmr4apm35b5ff8x6nynq6kiflrzw";
+       sha256 = "fc67eae234d87a6b3a72aeac32ea5524572c4b412bfc34392a28889f4eaa526f";
        libraryHaskellDepends = [
          base bytestring happstack-server text web-routes
        ];
@@ -139799,7 +140268,7 @@ self: {
      mkDerivation {
        pname = "web-routes-hsp";
        version = "0.24.6";
-       sha256 = "048dxx5cjdm7v0340p9x3s73a6y7fldykzkwkpb12bb926bir3fl";
+       sha256 = "d48d1c9711692d11d69d7cfee91b75c71b358e1e3d5d4006d8a736c94aef0d11";
        libraryHaskellDepends = [ base hsp text web-routes ];
        description = "Adds XMLGenerator instance for RouteT monad";
        license = stdenv.lib.licenses.bsd3;
@@ -139810,7 +140279,7 @@ self: {
      mkDerivation {
        pname = "web-routes-mtl";
        version = "0.20.1";
-       sha256 = "1k35ch294p2pkf7mbip8wy9rin956y31sq68b4cdrj9sj9891rx5";
+       sha256 = "a5e79050923ac9dc1859c8601d863725d99893e7e8c6558f9b575c92046465cc";
        libraryHaskellDepends = [ base web-routes ];
        description = "Extends web-routes with mtl-based MonadIO / MonadTrans RouteT instances";
        license = stdenv.lib.licenses.bsd3;
@@ -139821,7 +140290,7 @@ self: {
      mkDerivation {
        pname = "web-routes-quasi";
        version = "0.7.1.1";
-       sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf";
+       sha256 = "aeb63d0670b2229a246530cb05666957bfa15387d2617104856d1e0b62f50be7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base path-pieces template-haskell text ];
@@ -139837,7 +140306,7 @@ self: {
      mkDerivation {
        pname = "web-routes-regular";
        version = "0.19.0";
-       sha256 = "0qllws4mzmmc6fh4hcvj3zp7kk8pwap59yq6wy0zx7mx0ac7015r";
+       sha256 = "b904709802bd9efe81e706fb54aee217cd79ee1f723348a033acd65f89e69462";
        libraryHaskellDepends = [ base parsec regular text web-routes ];
        description = "Library for maintaining correctness of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
@@ -139851,7 +140320,7 @@ self: {
      mkDerivation {
        pname = "web-routes-th";
        version = "0.22.3";
-       sha256 = "0ccv1mzisd0fnhbl776i0fhavjazm0l3b4ycnbdzgs1kh4w8gzfp";
+       sha256 = "d7fd87388133e8f7dbb2cc933528a85fc9ada003d19c4317b40e341d7f0d9b31";
        libraryHaskellDepends = [
          base parsec split template-haskell text web-routes
        ];
@@ -139868,7 +140337,7 @@ self: {
      mkDerivation {
        pname = "web-routes-transformers";
        version = "0.19.1";
-       sha256 = "0pm1v9wqlzi6cg92lajbwbnhsdm509371i8mvyvvj6qa5m58cdib";
+       sha256 = "2b36864a2d0a1bb9b7df15c5704602a5360dede24b2a2ad263267e8a79daa15e";
        libraryHaskellDepends = [ base transformers web-routes ];
        jailbreak = true;
        description = "Extends web-routes with some transformers instances for RouteT";
@@ -139883,7 +140352,7 @@ self: {
      mkDerivation {
        pname = "web-routes-wai";
        version = "0.24.1";
-       sha256 = "13mwfyafpk29c8bbx48vhbxsgk28fmh579gjn6gjlhvkisc45q1b";
+       sha256 = "2be042988e73432a9fb1f2a553607548cca7fb821b91be166249cceb9477bc8e";
        libraryHaskellDepends = [
          base bytestring http-types text wai web-routes
        ];
@@ -139898,7 +140367,7 @@ self: {
      mkDerivation {
        pname = "web-routing";
        version = "0.6.2";
-       sha256 = "1x7imgnpq3998fk4pi2z5ba0r9xc7blf61rn1i51yqqd24la887f";
+       sha256 = "ee20a428110d631f4a0c3607e3e83aaca70cd42a5fc44ba643290d7cedabf1f4";
        revision = "1";
        editedCabalFile = "4aa263239149f8ef52999fdc29c8e90c552081672a4476adedce903248e15524";
        libraryHaskellDepends = [
@@ -139920,7 +140389,7 @@ self: {
      mkDerivation {
        pname = "webcrank";
        version = "0.2.2";
-       sha256 = "1rgvpp2526lmly2fli65mygplfc6wzqcw5fkn7gq4fcrmql2cisj";
+       sha256 = "52472628ae993982dfb1d315cef0e786397a9fafc544ea84a7951a51c4bdfbe5";
        revision = "1";
        editedCabalFile = "487831902c68484790108f97e32098dad9711eb15e0729b9ab1ba009e8fd5747";
        libraryHaskellDepends = [
@@ -139945,7 +140414,7 @@ self: {
      mkDerivation {
        pname = "webcrank-dispatch";
        version = "0.1";
-       sha256 = "1w4kfcm2d6iw4d45ywg2g6iysxl2iywk3nbk5ac6p6500y6hh97k";
+       sha256 = "f324088d07a0986b982a73d931b98f8276eda379e2715f48233c9a262a7393f0";
        revision = "1";
        editedCabalFile = "50b6b56e1fccc20a2986ea93b04410b8131ea5f2f4df94df538c6b2369400fa8";
        libraryHaskellDepends = [
@@ -139966,7 +140435,7 @@ self: {
      mkDerivation {
        pname = "webcrank-wai";
        version = "0.2.1";
-       sha256 = "13db2hpyvzpx9i43d8pryq7f87zlajpfpf0h6biva28l9qamy1yv";
+       sha256 = "db075f154e1409b5e33210b8ebae54f41fe40ef6f9a236484cfdfeed2f14ab8d";
        libraryHaskellDepends = [
          base bytestring exceptions lens mtl unix-compat
          unordered-containers wai wai-lens webcrank webcrank-dispatch
@@ -139987,8 +140456,8 @@ self: {
      }:
      mkDerivation {
        pname = "webdriver";
-       version = "0.6.2";
-       sha256 = "1cr668vn51bsdwxk6az4dk8zcsgy1y5vhb7xb9mahhbv1anpnzgr";
+       version = "0.6.2.1";
+       sha256 = "d0f0a31a799da18043163d5d699f778f4d4939e31a0214293db7fa8851759a5e";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring cond
          data-default directory directory-tree exceptions filepath
@@ -139997,7 +140466,6 @@ self: {
          transformers-base unordered-containers vector zip-archive
        ];
        testHaskellDepends = [ base parallel text ];
-       jailbreak = true;
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -140011,7 +140479,7 @@ self: {
      mkDerivation {
        pname = "webdriver-angular";
        version = "0.1.7";
-       sha256 = "18lyw9qasg9ynsa9yg90121h6z5h7kl6lzw7q5zqgkwpm1xr1p21";
+       sha256 = "41dc907ba897cf877fc1877f6ae83cb07c038308203d9f94b63e3dad70e29ea2";
        libraryHaskellDepends = [
          aeson base language-javascript template-haskell text transformers
          unordered-containers webdriver
@@ -140036,7 +140504,7 @@ self: {
      mkDerivation {
        pname = "webdriver-snoy";
        version = "0.6.0.4";
-       sha256 = "02c2ihqk5gsgnv61rj14rdd76r2nhmxacml3z9krrgxgn326hrbk";
+       sha256 = "736568c4b0afbf9c67fa8356a67a855664735acb24c81cccb64fbf32318c8209";
        revision = "1";
        editedCabalFile = "7cc952e84c8ff09b8d032df7d8089bd4d5167b32834bda67c79c62a34b12d52a";
        libraryHaskellDepends = [
@@ -140061,7 +140529,7 @@ self: {
      mkDerivation {
        pname = "webidl";
        version = "0.1.1";
-       sha256 = "05l4y7y171g41dlzfgd25ww59r4ajqbj9jpzrsmq5zpazx6p6gzy";
+       sha256 = "fe3f734dffeafe82abceffca2417968ae454382fa23df7690be48513fcf18416";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140084,7 +140552,7 @@ self: {
      mkDerivation {
        pname = "webify";
        version = "0.1.7.0";
-       sha256 = "16fsk6x875bmnqng5mfkxcxrkp3dcs3lkmsnds5fm416x4iw1sql";
+       sha256 = "14ebc023e92690ea8a6e56d74987666ddc993bebd3d5f22cb6759583ba99da99";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -140105,7 +140573,7 @@ self: {
      mkDerivation {
        pname = "webkit";
        version = "0.14.1.0";
-       sha256 = "1mmlsdnq9pws3jhk0gzqdhy8b7zwm80g2cmygahqagvyh7jvb7r4";
+       sha256 = "249fb5e5817e3f85a17abe32f100aafc9f853c6cf83f30a11c9adf846dd3b4d6";
        libraryHaskellDepends = [
          base bytestring cairo glib gtk mtl pango text transformers
        ];
@@ -140120,11 +140588,10 @@ self: {
     ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, webkit }:
      mkDerivation {
        pname = "webkit-javascriptcore";
-       version = "0.13.0.4";
-       sha256 = "1gj40kdll7pd84graxcrc327za6kgp453zh48srmzvrk9yvnj67x";
+       version = "0.13.1.0";
+       sha256 = "b0a7c41c9c22cb1aa4697e6d30ace424bc73b15416cf98790e148c9bec10bed7";
        libraryHaskellDepends = [ base glib gtk webkit ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       jailbreak = true;
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140137,7 +140604,7 @@ self: {
      mkDerivation {
        pname = "webkitgtk3";
        version = "0.14.1.0";
-       sha256 = "16dypc71xh223746cgwa143vqyxymx6dqxk01j3ixpx7ybzr7lnm";
+       sha256 = "d5d293fff2a7df1e870c6076dc4cafbe7bbc07098a3f66c81942c01e0ebbbe99";
        libraryHaskellDepends = [
          base bytestring cairo glib gtk3 mtl pango text transformers
        ];
@@ -140154,12 +140621,11 @@ self: {
      }:
      mkDerivation {
        pname = "webkitgtk3-javascriptcore";
-       version = "0.13.0.4";
-       sha256 = "0lq6n1bhvg9rf48scc5ss299dil205y23r9qzl1ls4g4msv6k25c";
+       version = "0.13.1.0";
+       sha256 = "caf9cc5074e51f27abb3ea52f60b8e737ca7323b96bf0862ba1713354bf835b5";
        libraryHaskellDepends = [ base glib gtk3 webkitgtk3 ];
        libraryPkgconfigDepends = [ webkit ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       jailbreak = true;
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) webkit;};
@@ -140171,7 +140637,7 @@ self: {
      mkDerivation {
        pname = "webpage";
        version = "0.0.3.1";
-       sha256 = "1s9q44wvkc60g1117c3c4klf9pc92x7rpgvb7pwyhbbkvshmnirj";
+       sha256 = "32475ba1de732de8f93d6bbf9b4f1789dde4e8246cb0134278c0b0b9392138e9";
        revision = "1";
        editedCabalFile = "1829b0f7db8745498bee16ed1d70917aa781fd14ab8f8032b51472cfc3cd6787";
        libraryHaskellDepends = [
@@ -140189,7 +140655,7 @@ self: {
      mkDerivation {
        pname = "webserver";
        version = "0.7.1.1";
-       sha256 = "0mjbw1v0xy3ji6y0wdiv77y7bc4r5z7jk67gzzgny2cx1vx3c973";
+       sha256 = "e32436fa0e9d096fdfffef9829cf2f99b075fc393b360ebc8972f80e76e04b56";
        libraryHaskellDepends = [
          base bytestring c10k containers directory filepath network
          old-locale parsec process stm time unix zlib
@@ -140204,7 +140670,7 @@ self: {
      mkDerivation {
        pname = "websnap";
        version = "0.1.0.1";
-       sha256 = "05favr2lpc8y3qy7wahcriq8qhvzvr3ngvrgdyjcvf5bvyfwlp84";
+       sha256 = "045dca9ddfabb8cda46f2fef6747de7f438c70cc0c2a7e3c1e1eb14b45deca15";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base filepath gtk webkit ];
@@ -140223,7 +140689,7 @@ self: {
      mkDerivation {
        pname = "websockets";
        version = "0.9.5.0";
-       sha256 = "016h213sk3n662ri8ns1sswcnaml61qckprdgxdp0m2a77amivmy";
+       sha256 = "beee58d5394a54705b7f2ddfc97030b42acbb8d6415b14b330c68ea94710d004";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy mtl network random SHA text
@@ -140246,7 +140712,7 @@ self: {
      mkDerivation {
        pname = "websockets-snap";
        version = "0.9.2.0";
-       sha256 = "03szycdvygw1zkv2s090wn2jii9sqbplgbycmpm5mfm3r0jhbhxp";
+       sha256 = "b7c30525c8a3ba5aeaadccaf47efc23ac52885e520012df6fc813fbf1bf35f0f";
        libraryHaskellDepends = [
          base bytestring enumerator mtl snap-core snap-server websockets
        ];
@@ -140263,7 +140729,7 @@ self: {
      mkDerivation {
        pname = "webwire";
        version = "0.1.0";
-       sha256 = "0m2wl7cfg67yyj2bbn811g6gsvzj7sw1sb3y2zanc0dxjd4cr4r2";
+       sha256 = "2293cc4893bd0166d5177e2c1db83ef26ffdcc0b01d9b584f4fe98e7d8a15c54";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder blaze-html bytestring
          case-insensitive containers cookie cprng-aes hamlet http-types
@@ -140280,7 +140746,7 @@ self: {
      mkDerivation {
        pname = "wedding-announcement";
        version = "1.1";
-       sha256 = "0rwbckf5h68170jrs1m70kgqf9h43vypj65wcw390w0xc7kmyv49";
+       sha256 = "896c5fe7611d70900667bc1879fd1e042687df04a7069d2538011958dc648b67";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -140296,7 +140762,7 @@ self: {
      mkDerivation {
        pname = "wedged";
        version = "0";
-       sha256 = "1sdnqc40qg5pv0kj4qw33vk5cy3yym60csh3iwmpm7pzpray7511";
+       sha256 = "2194e355beff9e7a2b8f036a064cf57e7856e61e83632227d8b73c0c08c3b6e9";
        revision = "1";
        editedCabalFile = "64bac15c983cf83ab2b05b002439b8f125b9c942ae46ed75a187f7e2dc68dba5";
        isLibrary = false;
@@ -140316,7 +140782,7 @@ self: {
      mkDerivation {
        pname = "weighted-regexp";
        version = "0.3.1.2";
-       sha256 = "0r765ppzazdsm5i3prgf6a405f88xi8sx79jdz9mck4584w7fqzr";
+       sha256 = "f963773841854c56d36f329dae51ec08b9028832eee53b62a9ba7df5ef2de664";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
@@ -140333,7 +140799,7 @@ self: {
      mkDerivation {
        pname = "weighted-search";
        version = "0.1.0.1";
-       sha256 = "1va2b10g3h2wfl9d7f27d55z5c93fvz41sb023l4c2ym1w9kw8zv";
+       sha256 = "fb233e130fd50b46e81060e940fe7623b1f24b6947b8d312755cc0f1405842ed";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/luqui/weighted-search";
        description = "A weighted nondeterministic search monad";
@@ -140348,7 +140814,7 @@ self: {
      mkDerivation {
        pname = "welshy";
        version = "0.1.0.0";
-       sha256 = "08pgns5irmvh9c12lxq2x72ql8ggzd3npfqnrphba3l171380gki";
+       sha256 = "713e804638810eb5e0cd16bb6b47fbef218ac5e902772a024b70d71c8bb6ef22";
        revision = "1";
        editedCabalFile = "ff6973a67b742efb8d7c1d542ba9f27056de3e547ade96d33e9b68314afec22c";
        libraryHaskellDepends = [
@@ -140367,7 +140833,7 @@ self: {
      mkDerivation {
        pname = "wheb-mongo";
        version = "0.0.3.0";
-       sha256 = "1xxks0jxjwph7372jqnscm6z0b28zz3dvb49b2aw37jmnvwrfdcy";
+       sha256 = "9e3597f9b6559ec1955889acddc6ff482cf04d65da6229ce38f072d925d0b3f7";
        libraryHaskellDepends = [ base bson mongoDB mtl text Wheb ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/Wheb-Framework";
@@ -140381,7 +140847,7 @@ self: {
      mkDerivation {
        pname = "wheb-redis";
        version = "0.0.1.0";
-       sha256 = "025chjp41qbjr9m6c3pd9v510h4aac1rvbyrki3c7617sca8a45h";
+       sha256 = "b0108514d32798c3469cd9af9d03538a4010ca4eed0e666aca72e140ae84ac08";
        libraryHaskellDepends = [ base bytestring hedis mtl text Wheb ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/Wheb-Framework";
@@ -140395,7 +140861,7 @@ self: {
      mkDerivation {
        pname = "wheb-strapped";
        version = "0.1.0.0";
-       sha256 = "1wykpp325336kk7a1vnnjffankcw0kaw3jcfin53cp8hsx4bwfdp";
+       sha256 = "b739be48d7105d368a8d8ec9c1d5049c4dab9c93d6eea0ce9c668c22c6bdd3f3";
        libraryHaskellDepends = [ base mtl StrappedTemplates text Wheb ];
        jailbreak = true;
        homepage = "https://github.com/hansonkd/Wheb-Framework";
@@ -140409,7 +140875,7 @@ self: {
      mkDerivation {
        pname = "while-lang-parser";
        version = "0.1.0.0";
-       sha256 = "0dlq2rldak4lb0w8hcx7aigdj7b59crp1k130p36cha7zpqdixll";
+       sha256 = "94f6d8f0fd474166c60523cc70334b651dd95e54a733883858944cd568169836";
        libraryHaskellDepends = [ base indents parsec ];
        homepage = "https://github.com/davnils/while-lang-parser";
        description = "Parser for the While language";
@@ -140423,7 +140889,7 @@ self: {
      mkDerivation {
        pname = "whim";
        version = "0.1.1";
-       sha256 = "0fgasnviqmz8ifkb8ikvj721f9j1xzvix5va0jxi81gh6f400ij6";
+       sha256 = "4646008833f00514bb046a971ef7ef412617c4917b46b4a68be8571cb7d5ea39";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140441,7 +140907,7 @@ self: {
      mkDerivation {
        pname = "whiskers";
        version = "0.1.0.3";
-       sha256 = "0kbyv0q6z2d2plblafqcmwcfiyhdbijqnqg2w7qxr7dklka8245v";
+       sha256 = "bb1081d4a4b39ddcf1e1e2618b655c0dfae818af0c3b4517bda2896f30d87e4d";
        libraryHaskellDepends = [ base parsec template-haskell ];
        jailbreak = true;
        description = "Mustache templates with Template Haskell";
@@ -140453,7 +140919,7 @@ self: {
      mkDerivation {
        pname = "whitespace";
        version = "0.4";
-       sha256 = "1y89bayaccz8qqzsfmpr917dczgbn5srskja6f2dab3ipxhk24z9";
+       sha256 = "e9133161bf712cd584334a4e9d75b1eb7dd64e48f956a73fc6e833a6bc5a09f9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ haskell98 random ];
@@ -140468,7 +140934,7 @@ self: {
      mkDerivation {
        pname = "whois";
        version = "1.2.2";
-       sha256 = "199fd710zicx7ijyvipc7p0d3yg18f6nppcln2wz38hl9kfv0iv0";
+       sha256 = "6047b0dd4c14a2f1b9b094dd6b8d43e1f9d1c03decc6ed653c9dc50fc2692ea5";
        revision = "1";
        editedCabalFile = "c11f42da958683ffb7a2e958dcefe2ef1a3e732732010f44facfbb0fffd7571e";
        libraryHaskellDepends = [ base network network-uri split ];
@@ -140485,7 +140951,7 @@ self: {
      mkDerivation {
        pname = "wikipedia4epub";
        version = "0.0.12";
-       sha256 = "089mmwrknghkliakni3wmwrd0hcngg3kqkijfmmky4bxni6w39bd";
+       sha256 = "6da5c14db47d113f6b75324e3cc77b9641d032af7c443b55a4133e3b33af3521";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140503,7 +140969,7 @@ self: {
      mkDerivation {
        pname = "win-hp-path";
        version = "0.1.2";
-       sha256 = "131hr8c4q7fwqmwzyp1fwnz349h6103v5gjvzjpbhb7ngki38nfq";
+       sha256 = "d85934e27cf62cb8aefc5bbeb20708062632bee52e5cff79c5dc1d4c18ca308c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base split ];
@@ -140520,7 +140986,7 @@ self: {
      mkDerivation {
        pname = "windowslive";
        version = "0.3";
-       sha256 = "15dk3wdv99ggxwypgnv8hs5ygn5bzqml9jhhz6l9kgnc0rrn3jbz";
+       sha256 = "7fc9617306ccbe99a8f910ca442bfeabd8e78b8668db773defefa5b41b1fb395";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140538,7 +141004,7 @@ self: {
      mkDerivation {
        pname = "winerror";
        version = "1.0.1";
-       sha256 = "0xamx4yhyv264mka4ypp0r1xh3xv7ba31sis3lbhjycn4i07wlhd";
+       sha256 = "0d527e4024967909171d3aea30d43abb0fd84306f77aa26625466c0f3de95575";
        description = "Error handling for foreign calls to the Windows API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140551,7 +141017,7 @@ self: {
      mkDerivation {
        pname = "winio";
        version = "0.1";
-       sha256 = "0f13x6fcb7cb4rfza5vp1dfxx3rcggh5rgw05lkqx9jwvnqcnjwm";
+       sha256 = "954bcbb0dd5ca68e272d80bf5ce07b2c8fde5d0b7717f55d268b9dc59ce92338";
        libraryHaskellDepends = [
          base bytestring extensible-exceptions network winerror
        ];
@@ -140569,7 +141035,7 @@ self: {
      mkDerivation {
        pname = "wiring";
        version = "0.3.0";
-       sha256 = "0c7xg6xq5bmb0qc2f9509sx5yrnngp4q5v1bgxl636qp9mhck68x";
+       sha256 = "1d99c9604d179b61687f2bec82c97dd6665fba4ea024271806abae82bb79fd30";
        libraryHaskellDepends = [ base mtl template-haskell transformers ];
        testHaskellDepends = [
          base hspec mtl QuickCheck template-haskell transformers
@@ -140586,7 +141052,7 @@ self: {
      mkDerivation {
        pname = "witherable";
        version = "0.1.3";
-       sha256 = "0n0l169xh23925blgzy2i90gz8lsa0176dp49bl6cncq362bqcn8";
+       sha256 = "c832bc8419985966e84ae4367302509aa2ff408ac2ff4757116908d893091458";
        libraryHaskellDepends = [
          base base-orphans containers hashable transformers
          unordered-containers vector
@@ -140601,7 +141067,7 @@ self: {
      mkDerivation {
        pname = "witness";
        version = "0.3";
-       sha256 = "0r0395blixr5g3s2dm4x4mj93yjk4zlig0b5acbnnr7yimjmnd11";
+       sha256 = "21345b658dfe646b1753658117e92753fa9164259dd426f47825f74857490364";
        libraryHaskellDepends = [
          base categories constraints transformers
        ];
@@ -140615,7 +141081,7 @@ self: {
      mkDerivation {
        pname = "witty";
        version = "0.0.4";
-       sha256 = "1k8c74j28nji46gib7r2ivfbvvzmkka9qnyf8hh7cyjgsmxxvq83";
+       sha256 = "03e1dd7bd54f7a762044ce5b9cd49cf5efbddc8e229f159f21515a2424390ccd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring network unix ];
@@ -140631,7 +141097,7 @@ self: {
      mkDerivation {
        pname = "wizards";
        version = "1.0.2";
-       sha256 = "02yk9d01d39c3hpvlh2c6v35fzyf3nm92f6vff0qns30dmr2r8ab";
+       sha256 = "4ba12c726d60688b8173db3891aa1dce7f57c6364c40ba2f1c2c8d16404bd30b";
        libraryHaskellDepends = [
          base containers control-monad-free haskeline mtl transformers
        ];
@@ -140643,10 +141109,9 @@ self: {
     ({ mkDerivation, base, lens, linear, parsec, parsec-numbers }:
      mkDerivation {
        pname = "wkt";
-       version = "0.2.5";
-       sha256 = "02r453wx1kv50lw0hx4nvzzv5wjfsy16gyjqphc25aq45rl5hr8g";
+       version = "0.2.6";
+       sha256 = "ef27992128212510566866e2d008bfc55999a2e87eb9fa6f25aba00c4039a49d";
        libraryHaskellDepends = [ base lens linear parsec parsec-numbers ];
-       jailbreak = true;
        homepage = "http://github.com/bgamari/wkt";
        description = "Parsec parsers and types for geographic data in well-known text (WKT) format";
        license = stdenv.lib.licenses.bsd3;
@@ -140657,7 +141122,7 @@ self: {
      mkDerivation {
        pname = "wl-pprint";
        version = "1.2";
-       sha256 = "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r";
+       sha256 = "198003fa7edd3a2d625ec54402cdc5645434b60ad5983e93525f58fec9dcdf98";
        libraryHaskellDepends = [ base ];
        description = "The Wadler/Leijen Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
@@ -140670,7 +141135,7 @@ self: {
      mkDerivation {
        pname = "wl-pprint-ansiterm";
        version = "0.2.0.0";
-       sha256 = "02s47f58ah08fvjqpdscxqiq9609agi5iplczrdkgxrv1vj8vkpz";
+       sha256 = "ffce8de40e3bf7375bfe8cde58e25309988423ee4cb78be5760840858a3b440b";
        libraryHaskellDepends = [
          ansi-terminal base bytestring containers mtl nats semigroups text
          transformers wl-pprint-extras
@@ -140688,7 +141153,7 @@ self: {
      mkDerivation {
        pname = "wl-pprint-extras";
        version = "3.5.0.5";
-       sha256 = "13wdx7l236yyv9wqsgcjlbrm5gk1bmw1z2lk4b21y699ly2imhm9";
+       sha256 = "a9c21a85a729191fc422938a1f785d61be52f3a2923d8d79dade9b21e8e98d8f";
        libraryHaskellDepends = [
          base containers nats semigroupoids semigroups text utf8-string
        ];
@@ -140707,7 +141172,7 @@ self: {
      mkDerivation {
        pname = "wl-pprint-terminfo";
        version = "3.7.1.3";
-       sha256 = "19z5cr1wqc3xcy39dswx78b6fpxhb41798zkiwkmb97nnvzwbdmv";
+       sha256 = "bbb6c5ffb6f6a455278ff3a3740259b05f67163a9deb9686677d30cc4366e5a7";
        libraryHaskellDepends = [
          base bytestring containers nats semigroups terminfo text
          transformers wl-pprint-extras
@@ -140722,7 +141187,7 @@ self: {
      mkDerivation {
        pname = "wl-pprint-text";
        version = "1.1.0.4";
-       sha256 = "1xgizzimfw17mpmw2afvmnvyag976j8ggn7k5r564rkw9f0m6bgz";
+       sha256 = "ff2d53814b7c66624a2ef3d8f79034273de5b7addb29c1ebad277057e3fff1f5";
        libraryHaskellDepends = [ base text ];
        description = "A Wadler/Leijen Pretty Printer for Text values";
        license = stdenv.lib.licenses.bsd3;
@@ -140735,7 +141200,7 @@ self: {
      mkDerivation {
        pname = "wlc-hs";
        version = "0.1.0.0";
-       sha256 = "0z553h86dznsf2wagbfhh8p27aa20jm3wmxkklr51al35xralvv9";
+       sha256 = "696faa722f83aa50329db3573eaa0442a9232e82d0ada7b870dafe66101ca57c";
        libraryHaskellDepends = [
          base containers data-default lens pretty process transformers
          xkbcommon
@@ -140760,7 +141225,7 @@ self: {
      mkDerivation {
        pname = "wobsurv";
        version = "0.1.0";
-       sha256 = "1w2j7xr4f0a63bwz96js8wrdpfw73qzdg6d607lx2526yrq8xlh2";
+       sha256 = "02d28e70f64614d1e901a699d73e1e87bbdb32475a9af4f91a460147723f52f0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140791,7 +141256,7 @@ self: {
      mkDerivation {
        pname = "woffex";
        version = "0.1";
-       sha256 = "0b83s5q4i3f4l45dklp1xgrlcpzrsdbd16fvlpazlcglzxk81xmv";
+       sha256 = "bbf68066fff431fad5a5db99d056d3f95f46f3ebe1d2d90aa1c48d4870d1032d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -140808,7 +141273,7 @@ self: {
      mkDerivation {
        pname = "wol";
        version = "0.1.2";
-       sha256 = "0w0m91srvgbj3qcxw2djpb482qlinsi2dyyb76qksdd2gw0jm57i";
+       sha256 = "f1942a017fa2353db139cbfb26a2b6916281c8bab209de191e72bd9d75481570";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base network split ];
@@ -140829,7 +141294,7 @@ self: {
      mkDerivation {
        pname = "wolf";
        version = "0.1.1";
-       sha256 = "1g98xjl8qpayj8ynz0391cqhfagaxa03hxqaz2wvyppalqdp44k9";
+       sha256 = "6912721ba6ea5ebfb9f80a773880eaea2907310b69806f3d925e5d8ca8ec28bd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140854,7 +141319,7 @@ self: {
      mkDerivation {
        pname = "word-trie";
        version = "0.3.0";
-       sha256 = "10ljyb1hl4awg2c3wq5shdqj2s53q5fklf7p6np1jhn6i30c5wx3";
+       sha256 = "a3f3c2c088c64219ae35f7383a5dc1a368217183ba603e98785c110ac3f29282";
        revision = "1";
        editedCabalFile = "85582eefb0020e6e35a0e2588e1dd647fb20bb7f70108f29493f994af5b74a05";
        libraryHaskellDepends = [ base binary containers ];
@@ -140869,7 +141334,7 @@ self: {
      mkDerivation {
        pname = "word12";
        version = "1.0.0";
-       sha256 = "19a22vs314bps0fq7md9jv43xzrya28mmfxi39zd8a1d8h99yd5c";
+       sha256 = "ac349f12442d28d47e1ab1bb5a91503eff3ec896a9d5831dd0779130f41642a5";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        homepage = "http://github.com/minpou/word12";
@@ -140884,7 +141349,7 @@ self: {
      mkDerivation {
        pname = "word24";
        version = "1.0.7";
-       sha256 = "1rh766jrmfw1hy1p4xllfq2ygxpm3zyglw4vcjainajn2r7whnhi";
+       sha256 = "115ac84f16562a1b95649b70fafc1ff5f6e70576947672838781bb9aa53107e6";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -140900,7 +141365,7 @@ self: {
      mkDerivation {
        pname = "word8";
        version = "0.1.2";
-       sha256 = "1pbn8ra3qhwvw07p375cdmp7jzlg07hgdcr4cpscz3h7b9sy7fiw";
+       sha256 = "3cbae3755a078ecff46524b3f6e0018f7e796e6dac9c710fe09b433c544676dd";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Word8 library";
@@ -140912,7 +141377,7 @@ self: {
      mkDerivation {
        pname = "wordcloud";
        version = "0.1";
-       sha256 = "1jdcv5h41k5xckviyc0p0k0q68s371llcvmkdbg78vh4b3xw7cd5";
+       sha256 = "a5b1c3fb58046e74de6ab36e466938432383c10417301ff764bdcc4060d9acc9";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140923,7 +141388,7 @@ self: {
      mkDerivation {
        pname = "wordexp";
        version = "0.2.0.0";
-       sha256 = "1hfpvzbyyh47ai166xyrhmhvg2shrqcswsfalwa16wab6hcg32ki";
+       sha256 = "718af118344b711314a7ca69ae19ce508bb76185d9776342548740efd7dfd7c1";
        libraryHaskellDepends = [ array base semigroups ];
        libraryToolDepends = [ c2hs ];
        description = "wordexp(3) wrappers";
@@ -140937,7 +141402,7 @@ self: {
      mkDerivation {
        pname = "wordpass";
        version = "1.0.0.4";
-       sha256 = "0plyggai2mq38bmmgc92gd0n3q4dlsywh44yflradg50aslqw0vv";
+       sha256 = "7b038ea956a0bca632759e10c8bda68de061417b22b157eb42035711d57b9e5e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140958,7 +141423,7 @@ self: {
      mkDerivation {
        pname = "words";
        version = "0.1.2";
-       sha256 = "0najaqi9fkqdkfks1c6w3fz4qf7dnr4h4brzgglg1h9ik8x5a910";
+       sha256 = "2024553a9a31c1f0e87b3f2f0249b6ed384cbe1bdcb0a0a79b0d4f9722565259";
        libraryHaskellDepends = [ base directory text ];
        description = "Cross-platform access to a list of words";
        license = stdenv.lib.licenses.bsd3;
@@ -140969,7 +141434,7 @@ self: {
      mkDerivation {
        pname = "wordsearch";
        version = "1.0.1";
-       sha256 = "0jq1aiw35xiklc9asa1pgw2rn6i8q17fq780chqpqz0ryq0iv4x2";
+       sha256 = "a2931d01f6197c7c3164001dec4ec0281a9b057f3728ad12a333f6327854014b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers fclabels ];
@@ -140986,7 +141451,7 @@ self: {
      mkDerivation {
        pname = "wordsetdiff";
        version = "0.0.3.1";
-       sha256 = "0kzbs1ps8fxdsjcpyvccgpw1y6i1q5gw6brgf6j1vv6r24wsh00w";
+       sha256 = "1c00a83911d9ec1da4712f2fc35fc1211a1ff87d8c6d7f99d4ad3ba46fd0eb4f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -141003,7 +141468,7 @@ self: {
      mkDerivation {
        pname = "wp-archivebot";
        version = "0.1";
-       sha256 = "04aq760z5jn81z03yi9l0d0w034qjiqiwb702lkvk2002b61mk5z";
+       sha256 = "bfcc1acc120088b92715e02c1e7194980cc0410334453fc00fc8caf281395811";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -141020,7 +141485,7 @@ self: {
      mkDerivation {
        pname = "wrap";
        version = "0.0.0";
-       sha256 = "03pmfwwx2ykjglzrc4k09q2lv8piq107j32dg0r1aadj2ysc9fzq";
+       sha256 = "f8bbc4b417b2291532784d0c7940c0f1a24d054e6012963f7d727ad13977f50e";
        libraryHaskellDepends = [ base ];
        description = "Wrap a function's return value with another function";
        license = stdenv.lib.licenses.bsd3;
@@ -141031,7 +141496,7 @@ self: {
      mkDerivation {
        pname = "wraparound";
        version = "0.0.2";
-       sha256 = "161mz5bfmx13s9azh3dss64fw98vbaab8krysr9pbbp9dh79i1cf";
+       sha256 = "8e85980e6ce9ae7553d63e4fb4945a1b25ee88d1ba0df855d223f4ea56f93598";
        libraryHaskellDepends = [ base ];
        homepage = "http://frigidcode.com";
        description = "Convenient handling of points on a seamless 2-dimensional plane";
@@ -141046,7 +141511,7 @@ self: {
      mkDerivation {
        pname = "wraxml";
        version = "0.4.4";
-       sha256 = "1h8lqav0q6vka8yr64032yh3ncjvz6fxp1j9q5jqhzm0ai34air3";
+       sha256 = "2347454654a07e8865c14986db9df95b323ba0170310933d52731b0cb6c214c1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141075,7 +141540,7 @@ self: {
      mkDerivation {
        pname = "wreq";
        version = "0.4.0.0";
-       sha256 = "15vjamr3sain8cdgqhg0jfy0rz3bbb6chrivyzvki5rs2g6pzrja";
+       sha256 = "4ae67fcd133a9738f7f73b66c8cc5a6bfc0cbc93e041fc1a43362a3d72557297";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141112,7 +141577,7 @@ self: {
      mkDerivation {
        pname = "wreq-sb";
        version = "0.4.0.0";
-       sha256 = "0m0vjykj1wqv07xxy2r7xz68syx5r3chni4x399f5fwn6shw1jfz";
+       sha256 = "dfc9c0a13696bbe2521a9d440bd9c8a57b8dccef270bdffb011bf320a7971b54";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141142,7 +141607,7 @@ self: {
      mkDerivation {
        pname = "wright";
        version = "0.1.0.2";
-       sha256 = "180012vyslprj06npavh44fmii1813w22sws9zwxzlb4r4jdm4zi";
+       sha256 = "f193da24c964d1dff94f9a6b21f80828c4581d2170ab6b0d90f952edb70800a0";
        libraryHaskellDepends = [ base bed-and-breakfast containers ];
        testHaskellDepends = [
          assertions base bed-and-breakfast containers filepath lens
@@ -141160,7 +141625,7 @@ self: {
      mkDerivation {
        pname = "wsedit";
        version = "0.1.0.0";
-       sha256 = "1035v9c22pngk2r3yisr2vvnfdjgynlgq8adj8z50xak998x22ri";
+       sha256 = "310bd1514a5375503e924d21fca8f54f3667f71659473fb298cf5e2158da6580";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -141176,7 +141641,7 @@ self: {
      mkDerivation {
        pname = "wtk";
        version = "0.2.1";
-       sha256 = "080y0ks5q6bv7dvla08x4cvcmzd13b5v1c5p5336k0vkg2c3fq79";
+       sha256 = "e960379878738369c628b7b0b0cb1aa1fdca36231d0145773b7b195cf4041e20";
        libraryHaskellDepends = [ base old-locale time transformers ];
        description = "Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
@@ -141190,7 +141655,7 @@ self: {
      mkDerivation {
        pname = "wtk-gtk";
        version = "0.2";
-       sha256 = "0n9fvp83z71jvv67zjpz34r427s898shns00v84kfjjklhd61q5y";
+       sha256 = "bee0601aa4534a3709da00680b354a481f413219ffca7fccde329c3fd0dd2e59";
        libraryHaskellDepends = [
          base containers gtk lenses mtl old-locale parsec time wtk
        ];
@@ -141206,7 +141671,7 @@ self: {
      mkDerivation {
        pname = "wumpus-basic";
        version = "0.24.0";
-       sha256 = "1mahlvja39jc6zvm32n23p8ya2pfwwawbyawx8srds0bsfyqqmng";
+       sha256 = "cf568cbdd30be89635ea5cf9c515e7ee0ae5d11dc28a51f7374ca6a1e4a650d5";
        libraryHaskellDepends = [
          base containers directory filepath vector-space wumpus-core
        ];
@@ -141221,7 +141686,7 @@ self: {
      mkDerivation {
        pname = "wumpus-core";
        version = "0.52.1";
-       sha256 = "10q991xb9v2r3z7q53rwrqcqd4m6qazvdibrxsn2620l2zbjxnd8";
+       sha256 = "a8d92ed717140823acee79c5b6bfc2a6928619ce3c8f82cf1f59ecb47a480983";
        libraryHaskellDepends = [ base containers time vector-space ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "Pure Haskell PostScript and SVG generation";
@@ -141236,7 +141701,7 @@ self: {
      mkDerivation {
        pname = "wumpus-drawing";
        version = "0.9.0";
-       sha256 = "1y9j2d3k862zi8681q3b2pl4nx4vyazdfwx5ji4mfgy73z62lbxw";
+       sha256 = "bc2f2acc1fc73f574994a573d7bef29b744be8156be0800c8a5f1834471332f9";
        libraryHaskellDepends = [
          base containers vector-space wumpus-basic wumpus-core
        ];
@@ -141253,7 +141718,7 @@ self: {
      mkDerivation {
        pname = "wumpus-microprint";
        version = "0.14.0";
-       sha256 = "1rrw8hzns7qa9jyzhbal0x0xbi5wa99afixs0cxqk0kgm6sar9cz";
+       sha256 = "9fa5acb4a96f82893b03ba47a75252bcc4d54107542df8bd4c0a1f6d3f443ce7";
        libraryHaskellDepends = [
          base vector-space wumpus-basic wumpus-core wumpus-drawing
        ];
@@ -141271,7 +141736,7 @@ self: {
      mkDerivation {
        pname = "wumpus-tree";
        version = "0.20.0";
-       sha256 = "1xndkri4ayxb12xhik77r59qlg05nhibc8b257csrw9br7xkk8ja";
+       sha256 = "4aa239fbc92bf1acd9296221b622b4053c8a53c9e7cc08bb08ab7b45629ecdf6";
        libraryHaskellDepends = [
          base containers vector-space wumpus-basic wumpus-core
          wumpus-drawing
@@ -141289,7 +141754,7 @@ self: {
      mkDerivation {
        pname = "wuss";
        version = "1.0.2";
-       sha256 = "0i4ln8pvjv1cgqcwid111azrls00g1jdhls3wrhnkw8wjcbiiqps";
+       sha256 = "fae21817931cf16961e64353d8647800689abf0a21b4c8197e2c6cb92fb29444";
        libraryHaskellDepends = [
          base bytestring connection network websockets
        ];
@@ -141304,7 +141769,7 @@ self: {
      mkDerivation {
        pname = "wx";
        version = "0.91.0.0";
-       sha256 = "133cjc3vfqxyw71a5x99flzg23qa2k28p2zajw6vp0z7qhv8kfjy";
+       sha256 = "5eba8936c4e783bb0d97ea8b8bc4140a0ff13e7529f5a2c2e1be63b707936c8c";
        libraryHaskellDepends = [ base stm wxcore ];
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell";
@@ -141316,7 +141781,7 @@ self: {
      mkDerivation {
        pname = "wxAsteroids";
        version = "1.0";
-       sha256 = "0mwsh9bhzhnf8la5khy17j2brbphvkicqg0yd0y9ymnn6bgnq4br";
+       sha256 = "79116cdf32d6569f3c681e3ccce2dcf0aebc843cc1c3591445cec20f57829a57";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory random wx wxcore ];
@@ -141331,7 +141796,7 @@ self: {
      mkDerivation {
        pname = "wxFruit";
        version = "0.1.2.1";
-       sha256 = "09n0b8znrwa65z1cjfizxkxj2rlsp56akagih5cycxpwivj1d7p9";
+       sha256 = "e99e16e48efc76e65981f1a9a94cb99a6621fbec3f3ac9c22f46f16c3f5ac026";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base old-time wx wxcore Yampa ];
@@ -141348,7 +141813,7 @@ self: {
      mkDerivation {
        pname = "wxc";
        version = "0.91.0.0";
-       sha256 = "0siab2h28dlyliznydxll22l9hdgwbmgddj01k1xw8hj4g7b53sa";
+       sha256 = "4a8fb2ce231222dec30c40b6f6eae2afc14485a0b4376f7fa49e3624a0582a6a";
        libraryHaskellDepends = [ base wxdirect ];
        librarySystemDepends = [ libX11 mesa ];
        libraryPkgconfigDepends = [ wxGTK ];
@@ -141368,7 +141833,7 @@ self: {
      mkDerivation {
        pname = "wxcore";
        version = "0.91.0.0";
-       sha256 = "01pvaysihyijklyw129vcafjqyh8bpafjzvscxvzll1g86qbqlkz";
+       sha256 = "7f52bcb0412f50fa77677a7fe9d45d087a2c9d623b89c03d9d327a18b557fb06";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath parsec stm time
          wxc wxdirect
@@ -141386,7 +141851,7 @@ self: {
      mkDerivation {
        pname = "wxdirect";
        version = "0.91.0.0";
-       sha256 = "17xlviyyagcvmc7m1f4djnsw0wdakirarmv12j4fmwbnfnbryp27";
+       sha256 = "475c9f977576f1ea881461d7ac729caa71c0b5958db8500fab9b3de57ddcb49f";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -141403,7 +141868,7 @@ self: {
      mkDerivation {
        pname = "wxhnotepad";
        version = "1.2.0";
-       sha256 = "10897yb7mkc9hy2037r9yb4192n65lz997fd5apksra1rifrazyp";
+       sha256 = "d77f955dcc41653daf2acd9d943e2dc68a14c8f2299f01848789cd7a963f0981";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base wx wxcore ];
@@ -141419,7 +141884,7 @@ self: {
      mkDerivation {
        pname = "wxturtle";
        version = "0.0.1";
-       sha256 = "0sdbi9dfja2ia0n3kggvqc3n3c5rgw096d767yvyzc52k5caakn7";
+       sha256 = "c74ea55899a2b0efb73fe63493007fb9b06107c3fbbd392c505128e95a8aab69";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141438,7 +141903,7 @@ self: {
      mkDerivation {
        pname = "wybor";
        version = "0.1.0";
-       sha256 = "0cyfhjpb775891qbfc3y15y16mx2hraavgvsrvqkb701rh5vngf6";
+       sha256 = "c63dbb0bcc019c35f1ce7abfad5486a257137c097e30b77048a89cb3ae84ce33";
        libraryHaskellDepends = [
          ansi-terminal base conduit containers lens resourcet semigroups
          terminal-size text transformers unix
@@ -141459,7 +141924,7 @@ self: {
      mkDerivation {
        pname = "wyvern";
        version = "0.1";
-       sha256 = "147v55c1ravnb769sjw2c8i4qw0gxh3scvx5cvb1fa6nng4x0hnq";
+       sha256 = "d842d0c9b3d62817d666a56fa607ec0f704c2262824b9dcc5976ab1c5829fb90";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -141480,7 +141945,7 @@ self: {
      mkDerivation {
        pname = "x-dsp";
        version = "0.2.3.1";
-       sha256 = "12l3zy9lmg7sf4q8b3yz2cb9pj9n0sgjglnqhcfkzzdg6pb0g4hj";
+       sha256 = "129207d635affd3f1d83d8d2279f0636c99b1613df8f853071fabc4a93ff838a";
        libraryHaskellDepends = [
          array base bytestring containers monads-tf text transformers
          type-level
@@ -141497,7 +141962,7 @@ self: {
      mkDerivation {
        pname = "x11-xim";
        version = "0.0.9.0";
-       sha256 = "0sn789j0kz891l9p0srx6537yq44b5jlyph9vc3xdb3ygy20bjrw";
+       sha256 = "3ccb05847f7eacd607db095e4f655984607f46313d6b70130d09fd096442c76a";
        revision = "1";
        editedCabalFile = "4404aa037f4df2ef8cd16834c8149d596f09b30379f0b85a3b8db9ddd30fa6b0";
        libraryHaskellDepends = [ base utf8-string X11 ];
@@ -141511,7 +141976,7 @@ self: {
      mkDerivation {
        pname = "x11-xinput";
        version = "0.1.0.0";
-       sha256 = "15ij6yfjjyqgzka1163a08ngrraxa4jpbwjq2izdl2l44k0mw29v";
+       sha256 = "3b095ec124840ada7e1458f27525515de5fc2c026a9810d4fc0f7b299d373296";
        libraryHaskellDepends = [ base containers mtl X11 ];
        librarySystemDepends = [ libXi ];
        libraryToolDepends = [ c2hs ];
@@ -141529,7 +141994,7 @@ self: {
      mkDerivation {
        pname = "x509";
        version = "1.6.0";
-       sha256 = "0fy2jyqkz6qi4x5x9hipnkwqcp3iqyb8h3cj23b69mqx98bfr7lk";
+       sha256 = "939eec164a1dd764d610920d8896c7715c86f9b437c2d44b27119b3fb197c23b";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
          cryptonite directory filepath hourglass memory mtl pem process
@@ -141551,7 +142016,7 @@ self: {
      mkDerivation {
        pname = "x509-store";
        version = "1.6.0";
-       sha256 = "08ifb2gy2ssq7ci1rlmxvm344rvcil8418ymj95l5c361nl4gcym";
+       sha256 = "d5b347a80d66b0424b92d5a340108d6c674246ddbdd21c223b586be19f582e22";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base bytestring containers cryptonite
          directory filepath mtl pem process x509
@@ -141568,7 +142033,7 @@ self: {
      mkDerivation {
        pname = "x509-system";
        version = "1.6.0";
-       sha256 = "0d8ppvszc1xlvz7ixb8bbqmvhv2d9yyrrh51f5yng8mb2d2w5yah";
+       sha256 = "50f9c24513aba2677d71a1c09cbd4f4d6cb82b5e0bad1ecfdfb407f6f5be1735";
        libraryHaskellDepends = [
          base bytestring containers directory filepath mtl pem process x509
          x509-store
@@ -141586,7 +142051,7 @@ self: {
      mkDerivation {
        pname = "x509-util";
        version = "1.5.2";
-       sha256 = "12nhxi1lqr5arlj586ai6n86n226iz6k4gbnm0dq07dwgky4j0iy";
+       sha256 = "3e0249fc7cbc1d801ba8763d32cd8f46086b903551195424cdaa644c43ecd08a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -141609,7 +142074,7 @@ self: {
      mkDerivation {
        pname = "x509-validation";
        version = "1.6.0";
-       sha256 = "07lz6klfslrlkc5zn8x4ynkpa9vfbn19vz7i67ygm1g608jcj1yc";
+       sha256 = "cc07c92402e685fafc31f1fc9d825d6e2775a7f5a423fb0b9b3453ede8349f1e";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base byteable bytestring containers
          cryptonite data-default-class directory filepath hourglass memory
@@ -141627,7 +142092,7 @@ self: {
      mkDerivation {
        pname = "xattr";
        version = "0.6.2";
-       sha256 = "02vbxxn0qvkxvfxv1zgr95bvdzx14fp9h7s27wbz6mjfkfgvc39q";
+       sha256 = "380db69f9b4e56f3173f421f98ae23a1ffb65749f9fdb0bbdb7d6e0c6cef6b0b";
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ attr ];
        testHaskellDepends = [
@@ -141643,7 +142108,7 @@ self: {
      mkDerivation {
        pname = "xbattbar";
        version = "0.2";
-       sha256 = "1hc3k3w5x1c027jj4lgpwl4cxvy01sx78sc560fdfj6bpsqlcln0";
+       sha256 = "c05246b1becb48d71c30856974ba0ec0efce08e5f75122e51180855ef89883c1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base old-time select X11 ];
@@ -141657,7 +142122,7 @@ self: {
      mkDerivation {
        pname = "xcb-types";
        version = "0.7.0";
-       sha256 = "1kzqsd85zp937yna2yfpc3jy0hba92h2fp6j0a6r8r7zz5l8yk3k";
+       sha256 = "734c8f68f9ff64948d02d25c27a0486a41e0e560d779a1ac3f23dd5f50d3f8cf";
        libraryHaskellDepends = [ base containers mtl pretty xml ];
        homepage = "http://community.haskell.org/~aslatter/code/xcb-types";
        description = "Parses XML files used by the XCB project";
@@ -141673,7 +142138,7 @@ self: {
      mkDerivation {
        pname = "xcffib";
        version = "0.3.5";
-       sha256 = "0ri50cbsh8a67q3frsz6214b73ahmga348my5x5bp6w7likiqnly";
+       sha256 = "9e5a1c67a4879bbb4a2fbe2232d4ab508db34810e6ebec063e4621a817032566";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141698,7 +142163,7 @@ self: {
      mkDerivation {
        pname = "xchat-plugin";
        version = "0.0.3";
-       sha256 = "0rjpj6i4fn504m7s3hwqbydn0m0ryih0hw4xnc409338sval6xj6";
+       sha256 = "467643d5d6688c0408b39d700860f41954609b5f98c3a14f25a05847a2915766";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath process unix ];
@@ -141717,7 +142182,7 @@ self: {
      mkDerivation {
        pname = "xcp";
        version = "0.1.0.1";
-       sha256 = "1hx9avr6zinrqar0c1zh0l49gy0d61gch8ff12am7zjxk7lbmmzs";
+       sha256 = "fad7bae8995dfe539508ce21c85e300df8970805f00706b2c2d9c66ff256a9c3";
        libraryHaskellDepends = [
          base bytestring containers mtl network transformers
        ];
@@ -141730,7 +142195,7 @@ self: {
      mkDerivation {
        pname = "xdg-basedir";
        version = "0.2.2";
-       sha256 = "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4";
+       sha256 = "e461c3a5c6007c55ceaea03be3be0ef3a92aa0ea1aea936da0c43671bbfaf42b";
        libraryHaskellDepends = [ base directory filepath ];
        homepage = "http://github.com/willdonnelly/xdg-basedir";
        description = "A basic implementation of the XDG Base Directory specification";
@@ -141743,7 +142208,7 @@ self: {
      mkDerivation {
        pname = "xdg-userdirs";
        version = "0.1.0.2";
-       sha256 = "0vh4m385a828qb61845bb7zfcqfm000g4fjkmmlvdrfyh35vpal8";
+       sha256 = "88aabbcb80dee5b669ad533af20000d561e6fe59ab1014ccc2482055d0a8046e";
        libraryHaskellDepends = [
          base containers directory filepath xdg-basedir
        ];
@@ -141758,7 +142223,7 @@ self: {
      mkDerivation {
        pname = "xdot";
        version = "0.2.4.7";
-       sha256 = "1izf892748g7f1h4m49d52zkbzfv164r4zyqss5lsbh3brh15v3g";
+       sha256 = "6fec12605e032e4d8bd6d87f928909dbfd35bf282d914a6070e721724442eec7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141774,7 +142239,7 @@ self: {
      mkDerivation {
        pname = "xenstore";
        version = "0.1.1";
-       sha256 = "0x788lpkkxg7ds1bgnw0kvkf6pkfbknn7jy0njhz85k7rv4kidf2";
+       sha256 = "c2b538c9ce6716f4a1b4c0cb63ed5c6e5ee3e69e80dbb7826ee7f5392f45e874";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal mtl network ];
@@ -141787,7 +142252,7 @@ self: {
      mkDerivation {
        pname = "xfconf";
        version = "4.8.0.0";
-       sha256 = "0q63zavh3fz03dmky42gafypd0gpn8fs0nb9qn2a2zzj961vzswz";
+       sha256 = "9febbf8349f27fa184c56959a01db2f78176bd534f103f6b1be0bb01b7fac360";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base glib ];
@@ -141806,7 +142271,7 @@ self: {
      mkDerivation {
        pname = "xformat";
        version = "0.1.2.1";
-       sha256 = "1q2wm0wffvppbv5rd16z367yfkx2sq7j0i5dkfwpawf859c9pz7x";
+       sha256 = "fdfc9b582ac87175b99bad44200fd6a24fe78f19df8496cb5ef76ee738a85ce0";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "http://github.com/spl/xformat";
@@ -141821,7 +142286,7 @@ self: {
      mkDerivation {
        pname = "xhaskell-library";
        version = "0.0.6";
-       sha256 = "13nnlaw56izwy0m7k4kh4g75sa5pvxn0pf9h3w8l9hnjcpv4l2ya";
+       sha256 = "ca0b4af665d2c244111f30b90b6cdfb7285dce237092792af0fc4753b8a2d68e";
        libraryHaskellDepends = [
          base bytestring containers ghc-prim mtl parsec regex-base
        ];
@@ -141839,7 +142304,7 @@ self: {
      mkDerivation {
        pname = "xhb";
        version = "0.6.2015.8.1";
-       sha256 = "1rq6g96v1fs66kdmnkvlkcxrv614ha77czclm3sfw274f7q2r2kb";
+       sha256 = "6b8a2cf071e408eef4a8947d768e8224989d3b9b744f5bdb3446bbb04d7a06e7";
        libraryHaskellDepends = [
          base binary byteorder bytestring containers network parsec stm
          Xauth
@@ -141856,7 +142321,7 @@ self: {
      mkDerivation {
        pname = "xhb-atom-cache";
        version = "0.1.0.2";
-       sha256 = "113yff75i5pc0kcz4w7npbp34bl92aibpvj2cgg30f66nml61xg9";
+       sha256 = "e9f56068b5c63830de6342eebba212892e32eebaf670f2d904ec96588e737e84";
        libraryHaskellDepends = [
          base hashable mtl transformers unordered-containers xhb
        ];
@@ -141873,7 +142338,7 @@ self: {
      mkDerivation {
        pname = "xhb-ewmh";
        version = "0.1.3.1";
-       sha256 = "02qfpwa9558svk0481dxjchr9h0phacsyqzail94kmzkhnnly64l";
+       sha256 = "94184fad85f3d749128dea63af998217c0942193bd0544c0dc1a959214bf0e0b";
        libraryHaskellDepends = [
          base binary bytestring dlist hashable mtl transformers xhb
          xhb-atom-cache
@@ -141890,7 +142355,7 @@ self: {
      mkDerivation {
        pname = "xhtml";
        version = "3000.2.1";
-       sha256 = "1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik";
+       sha256 = "33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/haskell/xhtml";
        description = "An XHTML combinator library";
@@ -141903,7 +142368,7 @@ self: {
      mkDerivation {
        pname = "xhtml-combinators";
        version = "0.3";
-       sha256 = "06bmdl34kly965qj7phw1hm7p7siwjprflr72n7ck32lrknmy2hk";
+       sha256 = "130a5fedcc548cc98e15275397afe4519f7b2a0c1cde237131c9d349066d7519";
        libraryHaskellDepends = [
          base containers random text transformers xml
        ];
@@ -141917,7 +142382,7 @@ self: {
      mkDerivation {
        pname = "xilinx-lava";
        version = "5.0.1.9";
-       sha256 = "13g44483bcgbfi3366m7l49z40prvr2abml6h6vcjbjnc575cs37";
+       sha256 = "6768564e61562ec9b68186d6a544def902f213a1a71a334674ebb1351021e48d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141933,7 +142398,7 @@ self: {
      mkDerivation {
        pname = "xine";
        version = "0.0.0.4";
-       sha256 = "1mvi486vjf4brg6iks24wvb7gr5n7gdcqzdvv9xnncmxrscr6x36";
+       sha256 = "66749399cebd326b7bdabb7dccda3bb6e477d6e644e819cdcb8b38b90d2271d7";
        libraryHaskellDepends = [ base containers ];
        librarySystemDepends = [ xine ];
        libraryPkgconfigDepends = [ libxine ];
@@ -141952,7 +142417,7 @@ self: {
      mkDerivation {
        pname = "xing-api";
        version = "0.1.3";
-       sha256 = "1z135lcyyq7as166k3vhkqa75a555wbmfhpsdr4rsvpliq4ipqmk";
+       sha256 = "b3e21b098ef46e9d496efa4257172fa5a872149e708f694cd0ea60ef192d23fc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141977,7 +142442,7 @@ self: {
      mkDerivation {
        pname = "xinput-conduit";
        version = "0.0.0";
-       sha256 = "05pcaakqc6krv13480dp7ygr8s2k5wdwr6kixmc9fcp6baa1zkn4";
+       sha256 = "c4ce1f945ae6329758ed719acc1b2f5368949f3fb7014446d8791a86a752ec16";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra transformers
        ];
@@ -141993,7 +142458,7 @@ self: {
      mkDerivation {
        pname = "xkbcommon";
        version = "0.0.1";
-       sha256 = "1chv156z6208jypl2grjjgbyja4ai3acx65rfyfpqb30987yf0r5";
+       sha256 = "2503e70f4a602c7c9d77b998ced4888a28e9d793323f41af970808f34d091bb2";
        libraryHaskellDepends = [
          base bytestring cpphs data-flags filepath process storable-record
          template-haskell text transformers
@@ -142011,7 +142476,7 @@ self: {
      mkDerivation {
        pname = "xkcd";
        version = "0.1.1";
-       sha256 = "15zwx7rkxm52pnxjhx3p979h48cls1ipb7hmryxll5rcxz9aga29";
+       sha256 = "49a8a7d2ef2c174abbcf159e7563d0942102d349777428bbbda2d43ef3e9fc97";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -142032,7 +142497,7 @@ self: {
      mkDerivation {
        pname = "xlsior";
        version = "0.1.0.1";
-       sha256 = "0dkb3dkc2srvc1951hv6m69z3d7xprsaj7lsdkj9npykqpv6nkgk";
+       sha256 = "f34d6bf6c5d35f9be46c9a1ea974befdb4f193a966c35052603b6bc1661b6b36";
        libraryHaskellDepends = [
          attoparsec base blaze-markup bytestring conduit conduit-extra
          data-default exceptions mtl resourcet scientific text time
@@ -142057,7 +142522,7 @@ self: {
      mkDerivation {
        pname = "xlsx";
        version = "0.1.0.5";
-       sha256 = "0zd3p0dkb4v9gcd3mvp6g64z1gr1m5x0pf2zyj3w7ab0dgz4gzsz";
+       sha256 = "5fff47fe6b60a9c387f45fb80b7aa921bff08979e6ee3a1a7b6993351bb8a37d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142086,7 +142551,7 @@ self: {
      mkDerivation {
        pname = "xlsx-templater";
        version = "0.0.1";
-       sha256 = "00m5x9vhl0rf8azwgin6a75xpj74gybn757021z9dkn1qy35zjwr";
+       sha256 = "99cb5f86c7c1ce967e10e09463977fe4c8dbcb51c6c6c7bf422e030a77eaa502";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -142105,7 +142570,7 @@ self: {
      mkDerivation {
        pname = "xml";
        version = "1.3.14";
-       sha256 = "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j";
+       sha256 = "32d1a1a9f21a59176d84697f96ae3a13a0198420e3e4f1c48abbab7d2425013d";
        libraryHaskellDepends = [ base bytestring text ];
        homepage = "http://code.galois.com";
        description = "A simple XML library";
@@ -142119,7 +142584,7 @@ self: {
      mkDerivation {
        pname = "xml-basic";
        version = "0.1.1.3";
-       sha256 = "0m3pwg8b9pvqh9559p7nq39vnkklmf9gcay8vpvrkh17p8n14z6c";
+       sha256 = "cc7c122cba27c099f7ddc82bf692ab744ebbd3c0f6dc544a8278dfb4d0e37754";
        libraryHaskellDepends = [
          base containers data-accessor explicit-exception utility-ht
        ];
@@ -142135,7 +142600,7 @@ self: {
      mkDerivation {
        pname = "xml-catalog";
        version = "1.1.0.2";
-       sha256 = "0jzi63v8v2ksrqrk13pcl10awx57i2vm0k8xgi01rr1ncmlrnyfc";
+       sha256 = "cc799b696536e41c407c1d4d50b788a774ae40a0ec8e3033ce7a8a8df630f14b";
        libraryHaskellDepends = [
          base bytestring conduit containers text transformers uri-conduit
          xml-conduit
@@ -142156,7 +142621,7 @@ self: {
      mkDerivation {
        pname = "xml-conduit";
        version = "1.3.1";
-       sha256 = "094gkf3j7xk42km9zlkjdz0bicwxcf4207q1yalwi69zfnqmprhr";
+       sha256 = "19e65bb1753f99c8a9f2011f2088639db3b8c06f72d29fea1464f623879b8f24";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          conduit conduit-extra containers data-default deepseq monad-control
@@ -142179,7 +142644,7 @@ self: {
      mkDerivation {
        pname = "xml-conduit-parse";
        version = "0.3.0.0";
-       sha256 = "0dhg2wgb7gbyn5h1z8fq813l158c49lazfxp1kx9p5jfbc12kk7s";
+       sha256 = "facc29025b4e969bfa0cb7bbaf68220c95404740d8a11f60b17ebdb31e170f36";
        libraryHaskellDepends = [
          base conduit conduit-parse containers exceptions parsers text
          xml-conduit xml-types
@@ -142200,7 +142665,7 @@ self: {
      mkDerivation {
        pname = "xml-conduit-writer";
        version = "0.1.1.1";
-       sha256 = "1ibiqxjr63gb3v0h9fdfzm205sqjixb5vm5y6413yn4scbf7qm2b";
+       sha256 = "4b547cdc629a583f0231bed45d568f12eb0244fdaeb904c11eeb0d9365c771c5";
        libraryHaskellDepends = [
          base containers dlist mtl text xml-conduit xml-types
        ];
@@ -142219,7 +142684,7 @@ self: {
      mkDerivation {
        pname = "xml-enumerator";
        version = "0.4.4.1";
-       sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj";
+       sha256 = "f287ee652ef84b9de2ce3362b0f72cb66c3c9fadd03f8a1638c908d38f36966f";
        libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base blaze-builder
          blaze-builder-enumerator bytestring containers data-default
@@ -142243,7 +142708,7 @@ self: {
      mkDerivation {
        pname = "xml-enumerator-combinators";
        version = "0.1";
-       sha256 = "1n2lywzbbjkpccpgwlj8ycf4p5wlhjs60hgqzwb33j7qiraf5jb3";
+       sha256 = "63c9e2548ef8c83116fff84160b48494974b1cf34852fe2e6377cab53ef754d8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142260,7 +142725,7 @@ self: {
      mkDerivation {
        pname = "xml-extractors";
        version = "0.4.0.0";
-       sha256 = "02380x94zvm736lj2j02926xn8asc6bq4hbhm3nshh9iw8x4phwq";
+       sha256 = "98c34b3ae23141a8eda870418297615a21db8d48024821a919a7ee4f52076808";
        libraryHaskellDepends = [ base mtl safe transformers xml ];
        jailbreak = true;
        homepage = "https://github.com/holmisen/xml-extractors";
@@ -142275,7 +142740,7 @@ self: {
      mkDerivation {
        pname = "xml-hamlet";
        version = "0.4.0.11";
-       sha256 = "128ypil2c86zpkivrla031hn4rmhbpisy4zj0xmff473hz9qln9x";
+       sha256 = "3d598ad387e310e76a07f213afe35db06662611840d1bce3bcdf202668bc1e89";
        libraryHaskellDepends = [
          base containers parsec shakespeare template-haskell text
          xml-conduit
@@ -142294,7 +142759,7 @@ self: {
      mkDerivation {
        pname = "xml-helpers";
        version = "1.0.0";
-       sha256 = "0rrk0j7m8ws86hbjw0l4ryq4m9i8llhsag2sfisy5r1iv2zwa0lv";
+       sha256 = "9b02c5bfd831e4e275745a3ca521a528a64ab0cf84022e17344873548f043367";
        libraryHaskellDepends = [ base xml ];
        homepage = "http://github.com/acw/xml-helpers";
        description = "Some useful helper functions for the xml library";
@@ -142308,7 +142773,7 @@ self: {
      mkDerivation {
        pname = "xml-html-conduit-lens";
        version = "0.3.2.1";
-       sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12";
+       sha256 = "22dcbfe4e70a87dcc6d477c9e1c3c51cb1317b4799e42efc6c3d9a55b045c547";
        revision = "2";
        editedCabalFile = "6c3305bb07c0fd40c933640ebe9e6114a798115cfb2f3cb976e40f1ece955132";
        libraryHaskellDepends = [
@@ -142330,7 +142795,7 @@ self: {
      mkDerivation {
        pname = "xml-lens";
        version = "0.1.6.3";
-       sha256 = "1s5ivi3caz56g5yyg3pharshs3wcygcssjx1sm9aw4mv3ylz3msd";
+       sha256 = "4dd7f1a91fbb12ae52d5a14badd9f38c0f0d7556f08ee77d79a67cc546dcb1e8";
        revision = "1";
        editedCabalFile = "1a0768a259fb0aeaaecc092c6a9777c4d498d2695b0385a0e620e47f362773b9";
        libraryHaskellDepends = [
@@ -142347,7 +142812,7 @@ self: {
      mkDerivation {
        pname = "xml-monad";
        version = "0.5";
-       sha256 = "17axppy0xzshmvw8y23hxcj2ixm2fqw3hqrjk90qmpkjcv4nk44r";
+       sha256 = "999069c96672de8a419a3263383876a2f62824eb70088ff8ae50ff0efcbd5d9d";
        libraryHaskellDepends = [
          base mtl transformers transformers-compose xml
        ];
@@ -142362,7 +142827,7 @@ self: {
      mkDerivation {
        pname = "xml-parsec";
        version = "1.0.3";
-       sha256 = "1zcmiqyw6bs50kl2417ygvnpsk9wy025ls5ck8cd863x47bqpdn2";
+       sha256 = "c2b68bd7217d18d4189aac685a04f03c4d7ded7efe0422e804452fc33d8e95fd";
        libraryHaskellDepends = [ base HaXml parsec ];
        homepage = "http://sep07.mroot.net/";
        description = "Parsing XML with Parsec";
@@ -142377,7 +142842,7 @@ self: {
      mkDerivation {
        pname = "xml-picklers";
        version = "0.3.6";
-       sha256 = "196iy4z58x58bjk5jy4fpmn8zhiramlyca4rd732i8j3jp6h5f6i";
+       sha256 = "d1b802cd9543a228c6699928e6695539c28f6cbd8e7859a65ca874543ef1d1a4";
        libraryHaskellDepends = [ base containers text xml-types ];
        testHaskellDepends = [
          base Cabal QuickCheck tasty tasty-hunit tasty-quickcheck text
@@ -142392,7 +142857,7 @@ self: {
      mkDerivation {
        pname = "xml-pipe";
        version = "0.0.0.11";
-       sha256 = "0j5fjnf6r7cagcl1ni5idwj1k5q6vjp6c59ajwsx39iqx1kdmly4";
+       sha256 = "c4d3da66e838a6d135972a1566aedc069719246fb1441b287b8a9d6c9c95ae48";
        libraryHaskellDepends = [ base bytestring papillon simple-pipe ];
        homepage = "https://github.com/YoshikuniJujo/xml-pipe/wiki";
        description = "XML parser which uses simple-pipe";
@@ -142405,7 +142870,7 @@ self: {
      mkDerivation {
        pname = "xml-prettify";
        version = "0.1.0.1";
-       sha256 = "1abjmxihh0ldlh8k4mp922s0h39303farmdbm08qn909pbrzm0f0";
+       sha256 = "c081faf3ba09248b11a8abd5acdc00230d08b410e9563211a48d020863af72a9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -142425,7 +142890,7 @@ self: {
      mkDerivation {
        pname = "xml-push";
        version = "0.0.0.18";
-       sha256 = "1i8qmz7mr8rfspkn4wwyq7f7fi1grpggmqmfsmx6l7bjsjv15n3y";
+       sha256 = "7ed812b6d4721d6a7ad5aee2fadecd2f4477dcc19e7362e7d52ea35ccfaf18c5";
        libraryHaskellDepends = [
          base bytestring crypto-random handle-like monad-control monads-tf
          peyotls random sasl simple-pipe stm tighttp transformers-base uuid
@@ -142446,7 +142911,7 @@ self: {
      mkDerivation {
        pname = "xml-to-json";
        version = "2.0.1";
-       sha256 = "0brfdlarr4yyfsfawkfjdbk4z3lvi9ihkhvqh5ws2ll0h80ja6md";
+       sha256 = "ad1a2501828052a1798178c309638a9b8e4fe66ad24dae9c76de939c156d2e2f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142465,7 +142930,7 @@ self: {
      mkDerivation {
        pname = "xml-to-json-fast";
        version = "2.0.0";
-       sha256 = "0gsn8wdiwmvr7nvxbfj9vpzlxwdh8m9lprx2hxnkrnslmbhjz1fx";
+       sha256 = "dd852fe1aa54db3c6d87a2e74b5345b0f14effdd49bad5b73d79571e1b47563f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base tagsoup text ];
@@ -142480,7 +142945,7 @@ self: {
      mkDerivation {
        pname = "xml-types";
        version = "0.3.6";
-       sha256 = "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr";
+       sha256 = "9937d440072552c03c6d8ad79f61e61467dc28dcd5adeaad81038b9b94eef8c9";
        libraryHaskellDepends = [ base deepseq text ];
        homepage = "https://john-millikin.com/software/haskell-xml/";
        description = "Basic types for representing XML";
@@ -142492,7 +142957,7 @@ self: {
      mkDerivation {
        pname = "xml2html";
        version = "0.2.0";
-       sha256 = "1kf4vjg4cfkd4vx8jpikbb0ib4pglmyf5vqrg3j0yllmycj22ska";
+       sha256 = "6a6a2124f395520fe47819efe27ca5ef9215c15a335e89fa266d3a469edcc4cd";
        libraryHaskellDepends = [ base xml-conduit ];
        homepage = "http://github.com/snoyberg/xml";
        description = "blaze-html instances for xml-conduit types (deprecated)";
@@ -142508,7 +142973,7 @@ self: {
      mkDerivation {
        pname = "xml2json";
        version = "0.2.0.0";
-       sha256 = "15x3339qqy75qyj97dc7qbw7fs5dw4xvcslfrjpi36yd2596hamx";
+       sha256 = "bd2a685211cd9b11afcc8e6ab63be1ad6877f8c287b593a4c7e5788cd318a397";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142538,7 +143003,7 @@ self: {
      mkDerivation {
        pname = "xml2x";
        version = "0.4.2";
-       sha256 = "0cp21xzzqczb49mpnsxlgc4fyhmmgyy4mfczqnz85h383js5sbia";
+       sha256 = "2a2e5db41c68c082bec59fb94abc7fb542ef087bb46b7b6b22eb33fc7f0fe232";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -142557,7 +143022,7 @@ self: {
      mkDerivation {
        pname = "xmlgen";
        version = "0.6.2.1";
-       sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh";
+       sha256 = "9027a17e7ae648997a0e8279d7c01aa6615adda8b93f753b907a01dd797abae6";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers mtl text
        ];
@@ -142576,7 +143041,7 @@ self: {
      mkDerivation {
        pname = "xmlhtml";
        version = "0.2.3.4";
-       sha256 = "0cv5jqzbq7mi5lcrnaxr5qaprp8biv1jlyzpjhwnwqzla6fqamfr";
+       sha256 = "d955859d51f4636e3994f77b2ac38e0bdd7c152eb92b9b192db11ebc3e966533";
        revision = "1";
        editedCabalFile = "17e37eb81bbdd03eea4b12e65bd4a00e789bc7a04b792f138dc9056c488443a9";
        libraryHaskellDepends = [
@@ -142595,7 +143060,7 @@ self: {
      mkDerivation {
        pname = "xmltv";
        version = "0.0.1";
-       sha256 = "15i0a28svafjsziz1h3px0qys81xw0bs5bpq66hcwzxdv3s15lv9";
+       sha256 = "69d312f4d8ad7fcea031f8aea217e03d20ed31e877c0f0e3d7d2a9ad91502096";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base old-locale time xml ];
@@ -142617,7 +143082,7 @@ self: {
      mkDerivation {
        pname = "xmms2-client";
        version = "0.0.7.0";
-       sha256 = "0ahsxah1irfsbgkkr4vnvasb7shk4b5iyjhgpj2dc9vi26p6y5dz";
+       sha256 = "bf156fae117127d684bc0f4a1fcb2213eab3b4da76933ce75bdae518a0ea1a2a";
        libraryHaskellDepends = [
          base containers haskell98 mtl utf8-string
        ];
@@ -142632,7 +143097,7 @@ self: {
      mkDerivation {
        pname = "xmms2-client-glib";
        version = "0.0.7.0";
-       sha256 = "1rrc8w9nrmxl8kzjkbmdxh0j1krvai396mx50wsnlqn1cxgb54h3";
+       sha256 = "0392b25e67c1626a3507a5579346543bcf2001ecadae29ff44b4d76c13472ce7";
        libraryHaskellDepends = [ base haskell98 xmms2-client ];
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library — GLib integration";
@@ -142650,7 +143115,7 @@ self: {
      mkDerivation {
        pname = "xmobar";
        version = "0.23.1";
-       sha256 = "0yjnymiw518pjcks0kvpbj73kf0dvl1aj3a40qgmdf5xff1mac9v";
+       sha256 = "3b31558373bdb8561f06440da902dd0db8398e5c774fa027931785c263f5567a";
        configureFlags = [ "-fall_extensions" ];
        isLibrary = false;
        isExecutable = true;
@@ -142676,7 +143141,7 @@ self: {
      mkDerivation {
        pname = "xmonad";
        version = "0.11.1";
-       sha256 = "1pfjssamiwpwjp1qqkm9m9p9s35pv381m0cwg6jxg0ppglibzq1r";
+       sha256 = "39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142696,7 +143161,7 @@ self: {
      mkDerivation {
        pname = "xmonad-bluetilebranch";
        version = "0.9.1.4";
-       sha256 = "1ymn56rc9kkzvdla9bpj3aq2z6rnz669xbj7n87z1b42aj74s8gn";
+       sha256 = "f6214d8e5482acf00fb247ae9e8cf9369b2fb01af2aea468db7fcec4b229b6fa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142718,7 +143183,7 @@ self: {
      mkDerivation {
        pname = "xmonad-contrib";
        version = "0.11.4";
-       sha256 = "1g5cw9vvnfbiyi599fngk02zlmdhrf82x0bndhypkn6kybab6yd3";
+       sha256 = "a379b3d4f2d3d8793d6c76812e90cbb055fa0598cfba944af47139bb77e2acbc";
        revision = "1";
        editedCabalFile = "0280216420efaa06de7080d5998a24e27166e8b2c3d8a012846d004799c5edf2";
        libraryHaskellDepends = [
@@ -142738,7 +143203,7 @@ self: {
      mkDerivation {
        pname = "xmonad-contrib-bluetilebranch";
        version = "0.9.1.4";
-       sha256 = "1ysf8yp8jwf7a1am83w5q66ys3j6kn7ss0i86n9dmfmkc3rms6l7";
+       sha256 = "871a5df360b3bada92352802ad8f9d460eed8dc1850f545550c77189ae474efb";
        libraryHaskellDepends = [
          base containers directory extensible-exceptions mtl old-locale
          old-time process random unix utf8-string X11 X11-xft
@@ -142756,7 +143221,7 @@ self: {
      mkDerivation {
        pname = "xmonad-contrib-gpl";
        version = "0.12.1";
-       sha256 = "1xs9qwzq9x552jw9wxdaddk2w1m5kc060mqahhk2f2q3zs9nk2n9";
+       sha256 = "c98a6993fe030b2726840a5760009ba5062e666baa759eb814a5f4843fc749f7";
        libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ];
        homepage = "http://xmonad.org/";
        description = "Third party extensions for xmonad";
@@ -142770,7 +143235,7 @@ self: {
      mkDerivation {
        pname = "xmonad-entryhelper";
        version = "0.1.0.0";
-       sha256 = "1xwjdy7swc4bqqx0y7bny7rci4wpq2318m9nbz365x2r7i379v9h";
+       sha256 = "30ed74463c59f462c65f36551486c09793c8f2f1761d0f3ac68b30ae8f6f92f7";
        libraryHaskellDepends = [
          base directory extensible-exceptions filepath mtl process unix X11
          xmonad xmonad-contrib
@@ -142787,7 +143252,7 @@ self: {
      mkDerivation {
        pname = "xmonad-eval";
        version = "0.1";
-       sha256 = "0k0lb4z50kj4q3dzmii4pd8lbdnlxh5l91fx4f90a35hl3v9zggk";
+       sha256 = "f3bd9ff6a0b00c059223dd85440becd4b64551bb24c6fadbc0444e503e59144c";
        libraryHaskellDepends = [
          base containers directory hint mtl old-locale old-time process
          random unix X11 xmonad xmonad-contrib
@@ -142807,7 +143272,7 @@ self: {
      mkDerivation {
        pname = "xmonad-extras";
        version = "0.12.1";
-       sha256 = "14g8i3rvfiqp6mq1xhw8f9q0svcfz5nhlsgbz20zlk1az7673z55";
+       sha256 = "a5fc71ccf92a4cfa81f8eb690a6df98e6d0d707288c31e70351747b7f388e891";
        configureFlags = [
          "-f-with_hlist" "-fwith_parsec" "-fwith_split"
        ];
@@ -142826,7 +143291,7 @@ self: {
      mkDerivation {
        pname = "xmonad-screenshot";
        version = "0.1.2";
-       sha256 = "1m7bmdhc1nlwflli1ymnjlmysg9d54w0shpxq05xwmiycg4jbwr1";
+       sha256 = "21f325c9633e56de0bc0fd420d38292d3ded2b95b6fa1029759cdac060abebd4";
        libraryHaskellDepends = [ base gtk xmonad ];
        homepage = "https://github.com/supki/xmonad-screenshot";
        description = "Workspaces screenshooting utility for XMonad";
@@ -142838,7 +143303,7 @@ self: {
      mkDerivation {
        pname = "xmonad-utils";
        version = "0.1.3.3";
-       sha256 = "1y72f8dnjbpf4kmg0fp8rfbvhwshkp10g4cj3yhy9z78w84dp9a5";
+       sha256 = "45a5db08e2e8fce4a11f929107c29d5073b897cbe83af0ea24ee2e691b72e2f8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ghc random unix X11 ];
@@ -142854,7 +143319,7 @@ self: {
      mkDerivation {
        pname = "xmonad-windownames";
        version = "0.1.0.0";
-       sha256 = "1w1f0v81dnbxkmavk5d3hbnanx24yzrqacg4m8j4w36k041w7zn9";
+       sha256 = "c9fec30301d30c4e24aae43185f3f74474abec82a395b9559d7dd916d0062ef0";
        libraryHaskellDepends = [
          base containers utf8-string xmonad xmonad-contrib
        ];
@@ -142871,7 +143336,7 @@ self: {
      mkDerivation {
        pname = "xmpipe";
        version = "0.0.0.4";
-       sha256 = "09g11mfq93w3097rzydva8qwq1sjq0hwi11lg1x1yshwcb1if2iw";
+       sha256 = "3c0a17c3621c6a1f7a783484c821c05207cc3152bbf99f4f02838f845d0de125";
        libraryHaskellDepends = [
          base base64-bytestring bytestring handle-like monads-tf sasl
          simple-pipe uuid xml-pipe
@@ -142887,7 +143352,7 @@ self: {
      mkDerivation {
        pname = "xorshift";
        version = "2.0.1";
-       sha256 = "1pgkcnsgir8ci3hm3s5w3lk5dy7219242g9njx9cxb1m1cz5v5rf";
+       sha256 = "2e975d3e0b35acce5297363d41440ae2f856261dbce851e1880ce5f8b465f3dd";
        libraryHaskellDepends = [ base random time ];
        description = "Haskell implementation of the xorshift random generator";
        license = "LGPL";
@@ -142898,7 +143363,7 @@ self: {
      mkDerivation {
        pname = "xosd";
        version = "0.2.1";
-       sha256 = "1j0j64668vi0jxrzxrwyp8gwcz5zpaiai2r5k5rfsfrglhrhvhrv";
+       sha256 = "3bc30d33a42f3bed7299258ba8a2babf7cc61fba9ee7fe7397206e640c3112c8";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ xosd ];
        homepage = "http://code.haskell.org/~dons/code/xosd";
@@ -142913,7 +143378,7 @@ self: {
      mkDerivation {
        pname = "xournal-builder";
        version = "0.1.1.1";
-       sha256 = "0v7lfhyr28gmsbzizhbw4lddhhhv74y3vb8kb9z06b32lg5wm591";
+       sha256 = "2195cacba3622c037e5a13ad3d3c391b42d81a257cc11fffd2f521913d74f46c";
        libraryHaskellDepends = [
          base blaze-builder bytestring double-conversion strict
          xournal-types
@@ -142932,7 +143397,7 @@ self: {
      mkDerivation {
        pname = "xournal-convert";
        version = "0.1.1";
-       sha256 = "1vyykx5kbq8jja6cxy38j905b23ndj73xsg0hirz0sq4pw36shmi";
+       sha256 = "b1426d06bf046bf07384e0e93e8e6c768855409268f8ce8c9212e1354b9fdeef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142956,7 +143421,7 @@ self: {
      mkDerivation {
        pname = "xournal-parser";
        version = "0.5.1";
-       sha256 = "07b1gflqsjsydn304vw6zwgwlc0g7riv0b80lr165mw6c2fkmx78";
+       sha256 = "e8f43a9d6086d76242a6002db0633e0f30ca1fff866f02866d5e4b8da97b611d";
        libraryHaskellDepends = [
          attoparsec attoparsec-conduit base bytestring conduit conduit-extra
          containers exceptions lens mtl strict text transformers xml-conduit
@@ -142975,7 +143440,7 @@ self: {
      mkDerivation {
        pname = "xournal-render";
        version = "0.6.0";
-       sha256 = "0fsijjzxizhb7dx1pc83rsini8xzqj21mmkqj1x0ysyzh78siaf3";
+       sha256 = "c3a9a8d181df6b0f7a9078d61a84c4bfa368a3ce03b11b7a3b0bfed8bf94513b";
        libraryHaskellDepends = [
          base bytestring cairo containers fclabels mtl poppler strict
          TypeCompose xournal-types
@@ -142993,7 +143458,7 @@ self: {
      mkDerivation {
        pname = "xournal-types";
        version = "0.5.1";
-       sha256 = "1ii4d560wvy6iky09wbz2kdf370y87ldgr0ymsv50d7cqxfgbjap";
+       sha256 = "57c9f55cc7ec3450b6ae1ee4d7e8411e9ce1da147ff104fc8cc66f0e4c6924c6";
        libraryHaskellDepends = [
          base bytestring cereal containers lens strict TypeCompose
        ];
@@ -143009,7 +143474,7 @@ self: {
      mkDerivation {
        pname = "xsact";
        version = "1.7.3";
-       sha256 = "180svhrkj3fp69abg0ichgc9l6iv760j302bb612qzxkpyjsyz0h";
+       sha256 = "107cafa5bfb37f2c82594b802181393b1a9ad8832c82b75432d70d3933dc1aa0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -143029,7 +143494,7 @@ self: {
      mkDerivation {
        pname = "xsd";
        version = "0.5.0.1";
-       sha256 = "1a5i2idpkm5i70jpp2kjglpylja4b9cd0nklgvl6lm8cpjn2j0k0";
+       sha256 = "600229acbc0c556ae87e745ad0585a4449ea2f7d728a7b2538b1d4795b14b1a8";
        libraryHaskellDepends = [ attoparsec base lens text time ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck quickcheck-instances
@@ -143044,7 +143509,7 @@ self: {
      mkDerivation {
        pname = "xsha1";
        version = "0.0.0";
-       sha256 = "0xljcmc8rsvkpchrdam3lpp4igq1gmym9v3drp15a9k8rfa8irmi";
+       sha256 = "b1e68894cb682655c2cd6dec547d7d01bf48eea5a3aa9621bb73eb8c58659276";
        libraryHaskellDepends = [ base HUnit QuickCheck uniplate vector ];
        description = "cryptanalysis of Blizzard's broken SHA-1 implementation";
        license = stdenv.lib.licenses.mit;
@@ -143055,7 +143520,7 @@ self: {
      mkDerivation {
        pname = "xslt";
        version = "0.1";
-       sha256 = "0i03ihk0rjj6vk2blqdhqqqk6qqrrkxx2ckigwd5mgvp3jp64648";
+       sha256 = "881862ae1c77bf5a1a7f7132d1fbcc19633331c6b061bac4dc46ca0c268c0344";
        libraryHaskellDepends = [ base libxml ];
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
@@ -143070,7 +143535,7 @@ self: {
      mkDerivation {
        pname = "xss-sanitize";
        version = "0.3.5.6";
-       sha256 = "1j2qrn2dbfx01m7zyk9ilgnp9zjwq9mk62b0rdal4zkg4vh212h0";
+       sha256 = "008a20e0266f7e4255cb6009336bc25cfe74eda3314dff4f0da0bbd584cd58c8";
        libraryHaskellDepends = [
          attoparsec base containers css-text network-uri tagsoup text
          utf8-string
@@ -143089,7 +143554,7 @@ self: {
      mkDerivation {
        pname = "xtc";
        version = "1.0.1";
-       sha256 = "0jfs3qbcx5h26irkq73dyc2m84qyrlj5dvy6d1s6p6520vhnqfal";
+       sha256 = "54396ce106a2986b7468c6ef5624cd1e135405f36d1c3c73340296ce161eda49";
        libraryHaskellDepends = [ base wx wxcore ];
        homepage = "http://github.com/alanz/xtc";
        description = "eXtended & Typed Controls for wxHaskell";
@@ -143101,7 +143566,7 @@ self: {
      mkDerivation {
        pname = "xtest";
        version = "0.2";
-       sha256 = "118xxx7sydpsvdqz0x107ngb85fggn630ysw6d2ckky75fmhmxk7";
+       sha256 = "67f60aab2bc7cfc944335c7b308c7dcf15b49e3d2074f071dbfa36af4fef1d85";
        libraryHaskellDepends = [ base X11 ];
        librarySystemDepends = [ libXtst ];
        description = "Thin FFI bindings to X11 XTest library";
@@ -143115,7 +143580,7 @@ self: {
      mkDerivation {
        pname = "xturtle";
        version = "0.1.25";
-       sha256 = "161fpfvzbz2kks5pxmq3wrkgfkrfjvqrl4izlq0v7sicqphfkgmd";
+       sha256 = "adbee9e0c52ceab301a63f129af1962e4ff766e603d77e8b9e53fcf5b7bb2e98";
        libraryHaskellDepends = [
          base convertible Imlib setlocale X11 X11-xft x11-xim yjsvg yjtools
        ];
@@ -143130,7 +143595,7 @@ self: {
      mkDerivation {
        pname = "xxhash";
        version = "0.0.1";
-       sha256 = "0crmvkvk2604a06jjsn613bxx0n1lv59picl2656rx2pc7wbyidn";
+       sha256 = "b645bff86157f46c8a1194c59bcaa6c182ded708c66a290d50041831f7dc3533";
        revision = "1";
        editedCabalFile = "1d641797e9e431c6152dc41cbe72551bb2f91cec8265d3a5e3b2b9718764d274";
        libraryHaskellDepends = [ base bytestring crypto-api tagged ];
@@ -143147,7 +143612,7 @@ self: {
      mkDerivation {
        pname = "y0l0bot";
        version = "0.1.1";
-       sha256 = "0gjvnl5px7ir2lf7arpiji324n32mc1a90x3w6vh5xcyb13wvkv9";
+       sha256 = "69cfcd47589ef502b7e1a383a402ab6258224694f166751c15399e7e0bb55b3e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -143165,7 +143630,7 @@ self: {
      mkDerivation {
        pname = "yabi";
        version = "0.1.1.0";
-       sha256 = "05avn1m1mmgvzx9vkjy0fyyy38vmz39km0b190lz7lhy9qrwa2bb";
+       sha256 = "6b09c5334e1ed2f3294861813ad3f875a3e1bd77c0cbb953fffbd51a6ab05b15";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base word8 ];
@@ -143181,7 +143646,7 @@ self: {
      mkDerivation {
        pname = "yabi-muno";
        version = "0.1.0.1";
-       sha256 = "169ndqawpkaj43iq6mbddqxprc7w6lsv3ws8a7cq7nmyn7n3r0jg";
+       sha256 = "4f823cecb1beda83d95148f3b13535fcb07c3b6e6d5583e32052cdcb156e3699";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143201,8 +143666,8 @@ self: {
      }:
      mkDerivation {
        pname = "yackage";
-       version = "0.7.0.8";
-       sha256 = "1wp7vqlnwxiq4fi0dly25n9jxqi1rpgngd5dn4w4gqla1mqpb43c";
+       version = "0.8.0";
+       sha256 = "b42c5fe3b93dbb4c900f462c60e5f6286aed679664e8a4ccdddae7f56f042015";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -143224,7 +143689,7 @@ self: {
      mkDerivation {
        pname = "yahoo-finance-conduit";
        version = "0.1.0.0";
-       sha256 = "1kvs12l84lgs26knrqv5f354a3bql3fg54wgnmsfcjli1vvnn1di";
+       sha256 = "b1056bf70e914ae674b58f93f2dca0780d45ca7065e36ca711fa5182a8087acf";
        libraryHaskellDepends = [
          attoparsec base cassava conduit lens mtl text vector wreq
        ];
@@ -143238,7 +143703,7 @@ self: {
      mkDerivation {
        pname = "yahoo-web-search";
        version = "0.2";
-       sha256 = "064qakx4khzz9ih9isw46c8pm8wpg662fwnis4d64nszy6y9yfck";
+       sha256 = "93399fbcf15f5b621ad1d172278c7997a37a113384eb98604cffc349fa549818";
        libraryHaskellDepends = [ base HTTP network xml ];
        homepage = "http://www.people.fas.harvard.edu/~stewart5/code/yahoo-web-search";
        description = "Yahoo Web Search Services";
@@ -143251,7 +143716,7 @@ self: {
      mkDerivation {
        pname = "yajl";
        version = "0.3.2";
-       sha256 = "07186ilac22zym1jlgl915k2a82k418xa5z9h40ss62dgmaz2xkk";
+       sha256 = "7376f1557d4d18ad0181e917d551205320256609893e2a43f55f08a66834281c";
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ yajl ];
        libraryToolDepends = [ c2hs ];
@@ -143268,7 +143733,7 @@ self: {
      mkDerivation {
        pname = "yajl-enumerator";
        version = "0.4.1";
-       sha256 = "0dz81l58qpm3gk7zmvb702qwgq79j7d0dnyimqi6k3fp0byb5wdj";
+       sha256 = "b2f1b2fc02d78d6922aed1db06da91e9e0c7b10067edfacf7ca35e8c0a0de837";
        libraryHaskellDepends = [
          base bytestring enumerator json-types text transformers yajl
        ];
@@ -143284,7 +143749,7 @@ self: {
      mkDerivation {
        pname = "yall";
        version = "0.2.1";
-       sha256 = "131x7hl309zpwl31k6mwqd4fdrhkcwxvn4dvlky9bh3prc8kdm2s";
+       sha256 = "5ad43611cb77c095fca4bb11bb3b6713e6e648c3bc9a1906e5f72730283c3d8c";
        libraryHaskellDepends = [ base categories transformers ];
        homepage = "http://brandon.si/code/yall/";
        description = "Lenses with a southern twang";
@@ -143296,7 +143761,7 @@ self: {
      mkDerivation {
        pname = "yamemo";
        version = "0.6.0";
-       sha256 = "12qh9fi5dj4i5lprm24gc2b66qzc3mf59m22sxf93sx3dsf7rygn";
+       sha256 = "f6f97c9c6ea3eb915cd742d4545c1dec636396608f889a2f2d91c856a24b108b";
        libraryHaskellDepends = [ base containers mtl ];
        description = "Simple memoisation function";
        license = stdenv.lib.licenses.bsd3;
@@ -143311,7 +143776,7 @@ self: {
      mkDerivation {
        pname = "yaml";
        version = "0.8.12";
-       sha256 = "0nmpc1n80sv2bjqhzq5jdhd0zxzz9vka31y7k54fmdwr2jbg879i";
+       sha256 = "311df4961499b7ea4899c787a1e64efff70f1a6cb2e00fb15c626b806c60b75a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143336,7 +143801,7 @@ self: {
      mkDerivation {
        pname = "yaml-config";
        version = "0.2.2";
-       sha256 = "1a6n18q6sy5sfw4r8j42d4vhcmvjggi2ax4i89ap2gmnah53jm50";
+       sha256 = "a054390a54b63e715542917425e27b72570637698248940977ba786d300ad6a8";
        libraryHaskellDepends = [
          base deepseq failure text unordered-containers yaml
        ];
@@ -143354,7 +143819,7 @@ self: {
      mkDerivation {
        pname = "yaml-light";
        version = "0.1.4";
-       sha256 = "05pxkqp91l275n48p1aqijzh34vvzi7cx2nls879b95fz2dr8lhk";
+       sha256 = "1352949bf8aea4950ed2d48ace4efc7b9301bf8c58858b882d47d0902e9efd16";
        libraryHaskellDepends = [ base bytestring containers HsSyck ];
        description = "A light-weight wrapper with utility functions around HsSyck";
        license = stdenv.lib.licenses.bsd3;
@@ -143367,7 +143832,7 @@ self: {
      mkDerivation {
        pname = "yaml-light-lens";
        version = "0.3.3";
-       sha256 = "0apl8j5i8mbn1rqmv4wk5rhhh2zcpfqsh2q6d1sl798x96c72v8y";
+       sha256 = "1e6d7198491da5437568060ba8b1bbec0b08612e93935d710e7655148b44f42a";
        libraryHaskellDepends = [
          base bytestring bytestring-lexing containers lens yaml-light
        ];
@@ -143384,7 +143849,7 @@ self: {
      mkDerivation {
        pname = "yaml-rpc";
        version = "1.0.3";
-       sha256 = "01ir8yh7g3xvybg2nyfnzci0xlqpizkdkyhd8jfhyk8yka6jbr9g";
+       sha256 = "2fe5258d9a1e4d0f9d440dfad9e68f17d30e22fbd6792bdef2bb8f77a0473906";
        libraryHaskellDepends = [
          aeson base bytestring containers http-client http-types lens
          template-haskell text th-lift transformers unordered-containers
@@ -143403,7 +143868,7 @@ self: {
      mkDerivation {
        pname = "yaml-rpc-scotty";
        version = "1.0.2";
-       sha256 = "1kbvziqd78fr47m3w86hc6pxa6jy3ljjwc0s2ga0d8zrh0irf3b3";
+       sha256 = "630d972380f9a306d4131a302e251d5e1ad5af61d0203eea21d9a1d370fc7bcd";
        libraryHaskellDepends = [
          aeson base containers http-types mmorph scotty text transformers
          yaml yaml-rpc
@@ -143421,7 +143886,7 @@ self: {
      mkDerivation {
        pname = "yaml-rpc-snap";
        version = "1.0.3";
-       sha256 = "17csdfr4g0vb46yi2jhf6phin17rcn9arc71kmgdgx0xh2hrfin9";
+       sha256 = "c94697a1801df4d75e9de1b0ac9265f9041be1350e4a11bd216b8347b26b9a9d";
        libraryHaskellDepends = [
          aeson base bytestring containers http-types snap text transformers
          yaml yaml-rpc
@@ -143439,7 +143904,7 @@ self: {
      mkDerivation {
        pname = "yaml2owl";
        version = "0.0.1";
-       sha256 = "1yz7cq6xbxjh3j5hljrzla7dpgsa2ag4ywbvc6ynf7bpikdymq65";
+       sha256 = "c5e0eadb8c771d67bd617b714f9e124abfdb8ea23f4b0a8b1c50f6d50d66e7fb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -143458,7 +143923,7 @@ self: {
      mkDerivation {
        pname = "yamlkeysdiff";
        version = "0.5.1";
-       sha256 = "13s5qiydxcwpp0j8xap556yrlmqs7bsi62ql2c9clr4hpbw8may7";
+       sha256 = "c7ab8af8ba9064ca1213140b13f53a1a579abd29e5aa8e24b897b3de7cc4458f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -143475,7 +143940,7 @@ self: {
      mkDerivation {
        pname = "yampa-canvas";
        version = "0.2";
-       sha256 = "16plby17rnr4c25sdacqx4vlyx338gbmadp1c6mr4c67zx76bi4a";
+       sha256 = "8ac4654effc73092ab61e13655d74363744f37e998a9a68b6024db7c825ff49a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
@@ -143494,7 +143959,7 @@ self: {
      mkDerivation {
        pname = "yampa-glfw";
        version = "0.1.0.0";
-       sha256 = "133nz8916c99bby6ikkh4kplx4hbwmqhdg0h2g5vsp25w67ndmjr";
+       sha256 = "59d6668fe1455cbdcb1310bc0671e50b924eef2470ce68fc5a29311312fa768c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base GLFW-b newtype OpenGL Yampa ];
@@ -143515,7 +143980,7 @@ self: {
      mkDerivation {
        pname = "yampa-glut";
        version = "0.1.1.1";
-       sha256 = "0163whn909s4zzmhgnbs0x90ky6kxvr6630g650i69hhqapbihpp";
+       sha256 = "f7c2b8aec210261341310f0c63f2eed3f80952077ad907ebff4427902ce4c304";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143536,7 +144001,7 @@ self: {
      mkDerivation {
        pname = "yampa2048";
        version = "0.1.0.0";
-       sha256 = "03plrnzxsci4fk23h8a992n5al1jc93igf61pskmhx8zgl3j3qmz";
+       sha256 = "bfe221077d1f7558a7bec1b8174762325055ac48492138c4742432ddbfcdf40e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gloss random Yampa ];
@@ -143551,7 +144016,7 @@ self: {
      mkDerivation {
        pname = "yaop";
        version = "0.1.2.1";
-       sha256 = "0z66ffxb89bksgqfji9x8msch9yk7nmbzm2qrcn5j3w4ylg7dpdr";
+       sha256 = "b9dd761ef5840f592ccb58d4bfaa3dd327c874453d45e9f0d37325b4ba73c67c";
        revision = "1";
        editedCabalFile = "5333f04af0a27a0197004dc2e686dbbf29e5e2dc248277eb2afcb7587092a55c";
        libraryHaskellDepends = [ base mtl template-haskell ];
@@ -143566,7 +144031,7 @@ self: {
      mkDerivation {
        pname = "yap";
        version = "0.2";
-       sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i";
+       sha256 = "d18417aca635b9806f437c9476a80fa7633463185b06ff6e28ce3e2813299892";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        description = "yet another prelude - a simplistic refactoring with algebraic classes";
@@ -143580,7 +144045,7 @@ self: {
      mkDerivation {
        pname = "yarr";
        version = "1.4.0.1";
-       sha256 = "0kk2yhhh6cjbav30sh68fg880kgdpks018c9gmn4gw98621nc6al";
+       sha256 = "541966833028f1476c7d89a100f4bced4d80d073c8400dc6564b320321f4624e";
        libraryHaskellDepends = [
          base deepseq fixed-vector ghc-prim missing-foreign primitive
          template-haskell
@@ -143596,7 +144061,7 @@ self: {
      mkDerivation {
        pname = "yarr-image-io";
        version = "1.3.2.1";
-       sha256 = "1wmmzw62wb5hz4qavy51wb3wwqn07zd6iiwsrzcck1jdxwy0p81x";
+       sha256 = "3da00b3cef4d86c9d8cf9ac768da3fc062cec7e2a1f8ad30f9b02c2e0cffb5f2";
        libraryHaskellDepends = [ base yarr ];
        librarySystemDepends = [ libdevil ];
        jailbreak = true;
@@ -143612,7 +144077,7 @@ self: {
      mkDerivation {
        pname = "yavie";
        version = "0.0.1";
-       sha256 = "0h2gd0k8vbz8rl34j42ayvcqp0ksz6642k9pznrd28h145wk8gz5";
+       sha256 = "e53f3479210122d1b2fd374d418cf97a828bd9f64a104906cde8af8d26684f40";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143629,7 +144094,7 @@ self: {
      mkDerivation {
        pname = "ycextra";
        version = "0.1";
-       sha256 = "0aa0g2r7ck052wqkqqxzvkdqv9d7x3v7rqqd8iajwys9cvqny4m5";
+       sha256 = "a5126ff166497b2e55440de37cf6e8a7a58ddbdcbf633c3117054c76b2784029";
        libraryHaskellDepends = [
          base containers csv mtl uniplate yhccore
        ];
@@ -143646,7 +144111,7 @@ self: {
      mkDerivation {
        pname = "yeganesh";
        version = "2.5";
-       sha256 = "1bgw5v1g5n06jj0lyxpf48mdpaa2s49g0lbagf3jf9q01rb92bvf";
+       sha256 = "6e2f91560e002727877b6a51f012d142a9db2a22ee764f819406d8f2c22efcad";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -143666,7 +144131,7 @@ self: {
      mkDerivation {
        pname = "yeller";
        version = "0.1.0.4";
-       sha256 = "0r9kcjax591v366m5nrm75cy97wr4ykzb7kj1bwsgss21k185a3j";
+       sha256 = "72a882c20c42eba7f90a729ef5a727999fe4593935db528d193ba4d295643365";
        libraryHaskellDepends = [
          aeson base bytestring containers http-client http-client-tls
          http-types network stm text unordered-containers
@@ -143688,7 +144153,7 @@ self: {
      mkDerivation {
        pname = "yes-precure5-command";
        version = "5.5.1";
-       sha256 = "0a5qiz0sx8kbi1ijq8lqjfszp5cvqnq1jpxx18wqndfkscjfsjbd";
+       sha256 = "6d49ed24d3d3358b390abd5f19b0c59b95fbb59398222c63886ba2aec18fb828";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143714,7 +144179,7 @@ self: {
      mkDerivation {
        pname = "yesod";
        version = "1.4.1.5";
-       sha256 = "0sr9z3lxnwn5bdfwja97jsya3j0y0i8z5j6mph11bjgjdhv0s5m1";
+       sha256 = "a1160d366cf2c91502bcd5c8f251041ec8a1bc962729c95d5bc572dbe9f8296b";
        libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring conduit-extra
          data-default directory fast-logger monad-control monad-logger safe
@@ -143734,7 +144199,7 @@ self: {
      mkDerivation {
        pname = "yesod-angular";
        version = "0.1.0.1";
-       sha256 = "1f2aghs78jc3v2raq2f07mrcpmkc4jjp2vvpal4bh4qq6jnyigzd";
+       sha256 = "edbfe8ad341813b80855776f71a5246cd6cb723dc009acb2d8834974347c4ab8";
        libraryHaskellDepends = [
          aeson base containers shakespeare template-haskell text
          transformers yesod
@@ -143752,7 +144217,7 @@ self: {
      mkDerivation {
        pname = "yesod-angular-ui";
        version = "0.1.1.0";
-       sha256 = "08rr8w4bibjjchgfp1j9gywldr8v10vg8ddmkxj6dx5b6w2kvm8k";
+       sha256 = "13d53d0537abf466649fb535f436081be546b97f4986eb1e6452aeb808473923";
        libraryHaskellDepends = [
          base blaze-html containers directory hjsmin mtl resourcet
          shakespeare template-haskell text transformers yesod yesod-core
@@ -143777,7 +144242,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth";
        version = "1.4.6";
-       sha256 = "0c0h1pivqk276l0l7nlrwpswvg72x39ikyfzbdnmxgmain878v2x";
+       sha256 = "5d6c74908daabe5e6d5bdff919d3e8e2bccdf5e599da430135474cbce30d1030";
        libraryHaskellDepends = [
          aeson authenticate base base16-bytestring base64-bytestring binary
          blaze-builder blaze-html blaze-markup byteable bytestring conduit
@@ -143801,7 +144266,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-account";
        version = "1.4.1";
-       sha256 = "18bi75kx89gfzh7vi5p8pcqwip1qfpkab415bmn6pcqrlh3jd90i";
+       sha256 = "11a42607a419b36b6c5d2590a5e67538dcc831bbe896b80ffcee25d4673971a1";
        libraryHaskellDepends = [
          base blaze-html bytestring mtl nonce persistent pwstore-fast text
          yesod-auth yesod-core yesod-form yesod-persistent
@@ -143825,7 +144290,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-account-fork";
        version = "2.0";
-       sha256 = "0y3xd8iw15il05bpnkicnlv9xznqlirapbr6gmr7lxzjhgddrzyn";
+       sha256 = "d6ffdcda83f2777a727d26afab72a4d8fe9e36b52c4e7b57013496c0236a7d78";
        libraryHaskellDepends = [
          aeson base blaze-html bytestring email-validate http-types mtl
          nonce persistent pwstore-fast random tagged text yesod-auth
@@ -143849,7 +144314,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-basic";
        version = "0.1.0.2";
-       sha256 = "0b4vyf731wb7idmbqz7n8zm4p7i7y66x94ph7kaxv1jvq05k7bxa";
+       sha256 = "aaaf330bc05b86ddd53cf092d48df1279e4bea47f67cbc6a8b67f1308ef39b2c";
        libraryHaskellDepends = [
          base base64-bytestring bytestring exceptions text wai word8 yesod
        ];
@@ -143865,7 +144330,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-bcrypt";
        version = "0.2.0";
-       sha256 = "06pbzk09zfnr290sczjpqjrfbbz1c6qig402siakp7lnizav4xz5";
+       sha256 = "e577b2d58f969e3b55d4029017b161e1afe5b2c4577ea64112d9ba9fc0fceb1a";
        libraryHaskellDepends = [
          base bcrypt bytestring text yesod-auth yesod-core yesod-form
          yesod-persistent
@@ -143885,7 +144350,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-deskcom";
        version = "1.4.0";
-       sha256 = "17lpkwrfc10rdmvkjg6qmbi7gysjjhqyh7n5d1mxgxhzxzqbi06w";
+       sha256 = "dc80b8f0ef1ff6d76b68c51ee8319452fb77e2aad83c39776d1904e6329f979e";
        libraryHaskellDepends = [
          aeson base base64-bytestring byteable bytestring cipher-aes
          cprng-aes crypto-api crypto-random cryptohash data-default
@@ -143905,7 +144370,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-fb";
        version = "1.7";
-       sha256 = "1kp4vka9sjij8zyp15vj1jkaqwgy483q2gjb5wmhlqwcyp843h02";
+       sha256 = "02c041d0f58c630a2b2f4b3e810722fe71aca60c729770fd47324a9dd4dce4ce";
        libraryHaskellDepends = [
          aeson base bytestring conduit fb http-conduit lifted-base
          shakespeare text time transformers wai yesod-auth yesod-core
@@ -143924,7 +144389,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-hashdb";
        version = "1.4.2.2";
-       sha256 = "0s2qmpn4iwzdpps7yqcwb63cp8v1za9fp4amg0qc6b0pllzr616r";
+       sha256 = "d904933fa5172cc330785591eb92fa61a3cb86599c617ff4bdedf348ecad5868";
        libraryHaskellDepends = [
          base bytestring cryptohash persistent pwstore-fast text yesod-auth
          yesod-core yesod-form yesod-persistent
@@ -143943,7 +144408,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-kerberos";
        version = "1.4.2";
-       sha256 = "1q25p6kzk4xksi64gl2k4vdnfiw2pmqmca1w5zwzvdr4zzgkmx18";
+       sha256 = "28f43adfff24b7fdf92f3c285671bd824767db2653d0474cd4b393f9a7b945e0";
        libraryHaskellDepends = [
          authenticate-kerberos base bytestring shakespeare text transformers
          yesod-auth yesod-core yesod-form
@@ -143962,7 +144427,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-ldap";
        version = "0.0.3";
-       sha256 = "1ps2vk2pvni3h4pk4v2siqb3a714r09ahgr5d1l89hspb9fbzfyk";
+       sha256 = "d3bbbf5c5a57c3846868253fa812c8241c35168e5a6c322f8123da7dc5dc42df";
        libraryHaskellDepends = [
          authenticate-ldap base bytestring hamlet LDAP text transformers
          yesod-auth yesod-core yesod-form
@@ -143981,7 +144446,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-ldap-mediocre";
        version = "0.1.0.0";
-       sha256 = "03pij218i9lk79n02c2pfrxsxyqi6lzjn5bzg7zgk5a87b6b57jh";
+       sha256 = "509eb2cc3a4895f9fe797f152b3f3511fbae7b765730016c3a93a6888290f10e";
        libraryHaskellDepends = [
          aeson base LDAP text yesod-auth yesod-core yesod-form
        ];
@@ -143997,7 +144462,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-oauth";
        version = "1.4.0.2";
-       sha256 = "0vwp08rx4bnqx9mr6ixq15s334cdjadhl9n84rs3n1xd94sj1p6l";
+       sha256 = "d4dc203549ad073b7426c8260a9b928d91317409b847936bead82ed23302976f";
        libraryHaskellDepends = [
          authenticate-oauth base bytestring lifted-base text transformers
          yesod-auth yesod-core yesod-form
@@ -144015,7 +144480,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-oauth2";
        version = "0.1.2";
-       sha256 = "1bprc8n2f591igm5yfrxga7zim5vyib07h413ainhfc7g8pbaky9";
+       sha256 = "c94fb52e7a873968a31a81c00356f4bbd4f88f7a3d3b5fea8b2115272c62f9ae";
        libraryHaskellDepends = [
          aeson authenticate base bytestring hoauth2 http-conduit http-types
          lifted-base network-uri random text transformers yesod-auth
@@ -144034,7 +144499,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-pam";
        version = "1.0.0.0";
-       sha256 = "02cpg67ldjvv9sb6jr7liq3ac20rqc6lq1wjybii5vsah8hmvkhy";
+       sha256 = "1ece5d21824aef12e3f292074c0dc31908a6068ef46469964e7bcb468f799709";
        libraryHaskellDepends = [
          base hamlet pam text yesod-auth yesod-core yesod-form
        ];
@@ -144050,7 +144515,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-smbclient";
        version = "2.0.0.0";
-       sha256 = "108bmfb68rvmx3q21hz55jbic331fnplcx062vlbk6sx3jyjqgaa";
+       sha256 = "4a3d2cbd1c5d9bb9e816067446af75610c16972ce5c320f0e875676496ab0b81";
        libraryHaskellDepends = [
          base hamlet sys-auth-smbclient text yesod-auth yesod-core
          yesod-form
@@ -144069,7 +144534,7 @@ self: {
      mkDerivation {
        pname = "yesod-auth-zendesk";
        version = "1.2.1";
-       sha256 = "0jjfydbgjcymd9x47g0acjdml55f3n40193lvl4l9l02q54g9qnb";
+       sha256 = "cbe2f448c102d04409dd74a400881dae145a9b640abc437a6ad533f956f34e4a";
        libraryHaskellDepends = [
          base base16-bytestring bytestring cryptohash data-default
          http-conduit http-types template-haskell text time transformers wai
@@ -144095,8 +144560,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.13.1";
-       sha256 = "1vnqiibdjvkja80b8i352afrhphx8v6nihylgxaywch20b2fbkrc";
+       version = "1.4.13.2";
+       sha256 = "6ba51159341dc4e13e166cd54cd5af414ea1829f25c4d2f15eeac4507339530f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -144124,7 +144589,7 @@ self: {
      mkDerivation {
        pname = "yesod-bootstrap";
        version = "0.1.0.0";
-       sha256 = "19hzc1k0ssmsi9k4r5bxmngr1h8a42qhaxcl5y99fbf6khpndxzg";
+       sha256 = "eff7662f9cc62d97922f947505b1200ac1909fad7d954c668aba6a0d66601fa6";
        libraryHaskellDepends = [
          base blaze-html blaze-markup conduit conduit-extra containers
          either email-validate lens-family-core lens-family-th MonadRandom
@@ -144144,7 +144609,7 @@ self: {
      mkDerivation {
        pname = "yesod-comments";
        version = "0.9.2";
-       sha256 = "1isw8cwzwwsm7p3hqj0ynwncsdfg7x0ihphyv02awchqbgc2c87i";
+       sha256 = "f12026d85b1832ae04d81e5e18413fcf35cd2cb71e480cc73d5573fe39435cc7";
        libraryHaskellDepends = [
          base bytestring directory friendly-time gravatar old-locale
          persistent template-haskell text time wai yesod yesod-auth
@@ -144164,7 +144629,7 @@ self: {
      mkDerivation {
        pname = "yesod-continuations";
        version = "0.1";
-       sha256 = "1pzc0v18fapfbwd4pn4nchmsp4nvnrkm33av83zqfb5gyzhlk1in";
+       sha256 = "368649e1f7af2c87ff405b8d5167b6db92ab2b6496d84b1a5fee2a87c206ecdf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144193,7 +144658,9 @@ self: {
      mkDerivation {
        pname = "yesod-core";
        version = "1.4.12";
-       sha256 = "1sdp2lg88c9gnwr3ffa8kj2vdd3y2kd7ark4qrm4gab07x2qflq3";
+       sha256 = "035387453f60a9476ac6646675da147eb4b6859c48393732b72f31841e15b7e9";
+       revision = "1";
+       editedCabalFile = "a6f72da0eb68bc2d5da1d8d8aaa758403e5e86f6de3c61cde01376fd51e50c35";
        libraryHaskellDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          bytestring case-insensitive cereal clientsession conduit
@@ -144224,7 +144691,7 @@ self: {
      mkDerivation {
        pname = "yesod-crud";
        version = "0.1.2";
-       sha256 = "0krjhskrjgymgp0nclggnivy03hmlvfy8c9d9ks4s14jw82rnhf1";
+       sha256 = "c1419b05e292044df44c2d31e4dda6150ee077b4ef5166c17dd53f99a786324f";
        libraryHaskellDepends = [
          base classy-prelude containers MissingH monad-control persistent
          random safe stm uuid yesod-core yesod-form yesod-persistent
@@ -144242,7 +144709,7 @@ self: {
      mkDerivation {
        pname = "yesod-crud-persist";
        version = "0.1.1";
-       sha256 = "171papb9hns62jswqxkg4q41wb8sb72714i4wghx7g8svh17lv28";
+       sha256 = "486c7a02dc1abdd3e1e3249270c4591a2d1e08266f76ccb514465b98d655379c";
        libraryHaskellDepends = [
          base lens persistent text transformers wai yesod-core yesod-form
          yesod-persistent
@@ -144263,7 +144730,7 @@ self: {
      mkDerivation {
        pname = "yesod-datatables";
        version = "0.1.1";
-       sha256 = "0yn6fky83069pp4i13dlx9dlk4ck2k4c6sizgnrwqcjhm39m1bz6";
+       sha256 = "e6af50d3a85032ccb37d3f6ac3c8149391495beab48d10c9bdc98081fc74c67a";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring data-default persistent text yesod
          yesod-auth yesod-core yesod-default yesod-form yesod-static
@@ -144286,7 +144753,7 @@ self: {
      mkDerivation {
        pname = "yesod-default";
        version = "1.2.0";
-       sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk";
+       sha256 = "f39ae1953a95c1919a9dd214d93bf81078b1dcbbac737dc9bb7339dbad9dda96";
        libraryHaskellDepends = [ base yesod-core ];
        homepage = "http://www.yesodweb.com/";
        description = "Default config and main functions for your yesod application (deprecated)";
@@ -144301,7 +144768,7 @@ self: {
      mkDerivation {
        pname = "yesod-dsl";
        version = "0.1.1.24";
-       sha256 = "0pr5z3kg27j4fgyzs7ac263wd0qxfa3m45b6fn9hg18lwjb0fgd7";
+       sha256 = "a73d0796e4148507937566155287721d83c687114c1dfdfd73441ef1e6f8255f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144326,7 +144793,7 @@ self: {
      mkDerivation {
        pname = "yesod-eventsource";
        version = "1.4.0.1";
-       sha256 = "0j2x2zfr1s5a8m22kf27r6bdw041vmgf9b4v2ylc89n4m0f0dv55";
+       sha256 = "a5ec061ca8c426c4a8179bace45edd8100de96c947b8294445aae890dd175d48";
        libraryHaskellDepends = [
          base blaze-builder conduit transformers wai wai-eventsource
          wai-extra yesod-core
@@ -144345,7 +144812,7 @@ self: {
      mkDerivation {
        pname = "yesod-examples";
        version = "0.9.0.1";
-       sha256 = "1ikrx9ys8civmf1m12fbms258xa7aj55rr02x3rjwchykmzianp4";
+       sha256 = "e45a157f9d1e322ef3e802e45c8a5447755484aecb895083ab3b32a47dea79c6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -144370,7 +144837,7 @@ self: {
      mkDerivation {
        pname = "yesod-fay";
        version = "0.8.0";
-       sha256 = "0inx11w4wdgnbxqghm9738qs19519dcdgyjmm3aah12wzv4i68gf";
+       sha256 = "ee2113c9fe5c04a8d4a855fad7584ba1a4a0311a2755f8705ff6354e7808dd46";
        libraryHaskellDepends = [
          aeson base bytestring data-default directory fay fay-dom filepath
          monad-loops process pureMD5 shakespeare template-haskell text
@@ -144388,7 +144855,7 @@ self: {
      mkDerivation {
        pname = "yesod-fb";
        version = "0.3.4";
-       sha256 = "09cymp9y21vawbgr6gcj41s5xkq6j22mvk0vgl3pnyq382j33rmp";
+       sha256 = "b7e631a440037b7b077d1bcc5d859006cf5e7420923d93dfe26a07e1d3ad9e25";
        libraryHaskellDepends = [
          aeson base bytestring conduit crypto-api fb http-conduit text wai
          yesod-core
@@ -144408,7 +144875,7 @@ self: {
      mkDerivation {
        pname = "yesod-form";
        version = "1.4.4.1";
-       sha256 = "14v4vhrbca0281im2bnvk36bm7i1r8yanxhv7lvrq5y5nqbc5bl3";
+       sha256 = "83aec216b6c5179c373d1b76ab3cca219ebacc98db2e5163400228b632dc6493";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html blaze-markup
          byteable bytestring containers data-default email-validate
@@ -144429,7 +144896,7 @@ self: {
      mkDerivation {
        pname = "yesod-form-json";
        version = "0.0.1";
-       sha256 = "1hr53p4sp0zm7l1ap07kv2q6hi1xli74k13h0df4cmf9y2xn7bxz";
+       sha256 = "bfaf63bbf0c955465c037084494ea43d4468b0d8f380ab023df583abc91d25c3";
        libraryHaskellDepends = [
          aeson base bytestring containers text unordered-containers
          yesod-core yesod-form
@@ -144445,7 +144912,7 @@ self: {
      mkDerivation {
        pname = "yesod-gitrepo";
        version = "0.2.1.0";
-       sha256 = "1v47d6gvw3d19mqip36y54c4d84f48jgybdwgdl8r20zfwvhyvkf";
+       sha256 = "6e6e0f37771f888c687bbc2dff24228ea0461829de8c1b714da10dbe9f6987ec";
        libraryHaskellDepends = [
          base directory enclosed-exceptions http-types lifted-base process
          temporary text wai yesod-core
@@ -144461,7 +144928,7 @@ self: {
      mkDerivation {
        pname = "yesod-gitrev";
        version = "0.1.0.0";
-       sha256 = "0jcgc8l2gh6ahxwddra0jyf78bi4rzff9nfi1knjxixfll73rrih";
+       sha256 = "30e63c0ea5aec72eed0cd1d9e4dccf242e749c9740e5d67887cac02728628f49";
        libraryHaskellDepends = [
          aeson base gitrev template-haskell yesod-core
        ];
@@ -144476,7 +144943,7 @@ self: {
      mkDerivation {
        pname = "yesod-goodies";
        version = "0.0.5";
-       sha256 = "0wxdwyb5dg00ycb09kbl1m12w2bzi6kxbjr4dqgrwfd3dgypcjdz";
+       sha256 = "bf4976fd6ba3399e1f6e24cbd5a7897f092e420d74cd0416f300bc5696e7ad73";
        libraryHaskellDepends = [
          base blaze-html bytestring directory HTTP old-locale pandoc pureMD5
          text time yesod yesod-form
@@ -144493,7 +144960,7 @@ self: {
      mkDerivation {
        pname = "yesod-json";
        version = "1.2.0";
-       sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw";
+       sha256 = "fce9323acfea7056bf303e190abd5742343c06f376762f020b38164dc32c0334";
        libraryHaskellDepends = [ base yesod-core ];
        homepage = "http://www.yesodweb.com/";
        description = "Generate content for Yesod using the aeson package. (deprecated)";
@@ -144505,7 +144972,7 @@ self: {
      mkDerivation {
        pname = "yesod-links";
        version = "0.3.0";
-       sha256 = "0i1b4lgwv98pp7251fm3h4cdb1d868fqwm6175rk7zg699g2v61y";
+       sha256 = "3e982d5e4ae6fd337339c1548e1d32a885d51881a3ba50c4b917a5cd1f252b44";
        libraryHaskellDepends = [ base text yesod-core ];
        jailbreak = true;
        homepage = "http://github.com/pbrisbin/yesod-goodies/yesod-links";
@@ -144519,7 +144986,7 @@ self: {
      mkDerivation {
        pname = "yesod-lucid";
        version = "0.1";
-       sha256 = "1ymmpi9g3pjl23ymdjwiv748lnq1hyjq24la2ffgwrm4b6f41xip";
+       sha256 = "37f6409c59a466fe9c138a1281a587015b8ac8d991cb56fd1054def152bcb5fa";
        libraryHaskellDepends = [ base lucid monads-tf text yesod-core ];
        description = "Lucid support for Yesod";
        license = stdenv.lib.licenses.bsd3;
@@ -144538,7 +145005,7 @@ self: {
      mkDerivation {
        pname = "yesod-mangopay";
        version = "1.11.4";
-       sha256 = "0syg5a0xihrdbclsrbgqgf6llhji7zdn1g50fbvlklfpw4dkb1f7";
+       sha256 = "c785351be1d7d149f772a0bc60db3f51424a8d7bf8adac295b2dc3d8812acf6b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144568,7 +145035,7 @@ self: {
      mkDerivation {
        pname = "yesod-markdown";
        version = "0.10.0";
-       sha256 = "0n9rcpf8s89swj0pz86xddl5zjbkkw1fa1h292wvs15y77lrl0zi";
+       sha256 = "f1039ae939be04bdb9480206e5029f73c95f686bdda07f81e43a218ddc653959";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare texmath text xss-sanitize yesod-core yesod-form
@@ -144586,7 +145053,7 @@ self: {
      mkDerivation {
        pname = "yesod-media-simple";
        version = "0.1.0.1";
-       sha256 = "1ajlrqsq7x83vc67xqb4r3328akwjp0a0vwf7nvqj3bsjqg5af76";
+       sha256 = "e638551e967a0d89b73d8e6fa0c0957c2a24c6c864e17e0cdb03f58335ce54aa";
        libraryHaskellDepends = [
          base bytestring diagrams-cairo diagrams-core diagrams-lib directory
          JuicyPixels vector yesod
@@ -144603,7 +145070,7 @@ self: {
      mkDerivation {
        pname = "yesod-newsfeed";
        version = "1.4.0.1";
-       sha256 = "02ydkri23vrm7mak2b1ybfhkdgc2dmv9vq3ki2d7sd005sp3zdly";
+       sha256 = "9eb63fae2e00347d9a8873e09d766d82bd36a15b3e2c31553d35ef21629ecd0b";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring containers shakespeare text
          time xml-conduit yesod-core
@@ -144618,7 +145085,7 @@ self: {
      mkDerivation {
        pname = "yesod-paginate";
        version = "0.1";
-       sha256 = "088m7prg774wdh8fp7zljxj65zj5krl4pggl63anv2wk7nlw27py";
+       sha256 = "fe1ec1a93d938b6dd530f4bd4b689e45fe626497f49feb106c9c9cf3f23d1521";
        libraryHaskellDepends = [ base template-haskell yesod ];
        description = "Pagination for Yesod sites";
        license = stdenv.lib.licenses.bsd3;
@@ -144633,7 +145100,7 @@ self: {
      mkDerivation {
        pname = "yesod-pagination";
        version = "2.0.0";
-       sha256 = "0d42b8y7zpl624d7wa2caarni9g10hg14xsbamlkykki3bl197m1";
+       sha256 = "a19e14e81a714e3f69554b77121e04e1a568b3524c287e1a1186de7f3c5a8234";
        libraryHaskellDepends = [ base esqueleto yesod ];
        testHaskellDepends = [
          base hspec monad-logger persistent persistent-sqlite resource-pool
@@ -144652,7 +145119,7 @@ self: {
      mkDerivation {
        pname = "yesod-paginator";
        version = "0.9.1";
-       sha256 = "0xi19gf6vdna3nwwmciypqgaprzb7gdjpwvfrpj82gr6yar1va5m";
+       sha256 = "b5a81db2f2263f81e4cd6ef32bdb3bebe7ab1ebe3eb2cab91dcab66ddc4b2176";
        libraryHaskellDepends = [
          base persistent resourcet text transformers yesod
        ];
@@ -144671,7 +145138,7 @@ self: {
      mkDerivation {
        pname = "yesod-persistent";
        version = "1.4.0.3";
-       sha256 = "0prvrz52c2pr4qsanjzndviyq4f6zc49in69xz5153h2vagbfmb4";
+       sha256 = "6455b79eda028e12caefc9d89808fbc611ece36ef64bab3426f90a26cacf3b5f";
        libraryHaskellDepends = [
          base blaze-builder conduit persistent persistent-template
          resource-pool resourcet transformers yesod-core
@@ -144720,7 +145187,7 @@ self: {
      mkDerivation {
        pname = "yesod-platform";
        version = "1.2.13.3";
-       sha256 = "1j71m9bqam7dl1ghhwvkw5ispp8z06hbkvdxslx5sca998vx9awv";
+       sha256 = "9babd4374a49315d3ad5bdedb9a0011fddab63e17373085fa0ed548557aae1c8";
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint asn1-encoding asn1-parse asn1-types
          attoparsec-conduit authenticate auto-update base base16-bytestring
@@ -144764,7 +145231,7 @@ self: {
      mkDerivation {
        pname = "yesod-pnotify";
        version = "0.5.0";
-       sha256 = "05ic4n6g8jp575qj8mq9lbnhvmdm5zwxn3wf8f1blgigqimamsps";
+       sha256 = "faeaaa6ac42f3eba82438e0fdbf92fb5d50deda20957247139e54af48c252c16";
        libraryHaskellDepends = [
          base shakespeare text transformers yesod yesod-form
        ];
@@ -144779,7 +145246,7 @@ self: {
      mkDerivation {
        pname = "yesod-pure";
        version = "0.1.0.2";
-       sha256 = "0v3xvhk5nxc2y3c21y6h7w6lg5vm1s2vzf9f02qw8gj928vsidzg";
+       sha256 = "efb7a83712493ec4b1002eb9bf850e7597470d3fd0f820d8f082755b26dc7d6c";
        libraryHaskellDepends = [ base fast-logger text yesod yesod-core ];
        jailbreak = true;
        homepage = "https://github.com/snoyberg/yesod-pure";
@@ -144797,7 +145264,7 @@ self: {
      mkDerivation {
        pname = "yesod-purescript";
        version = "0.0.5";
-       sha256 = "0arij86cfzy5hh82gc5l4i3s3z4qa9rfrnj9nrp6q25qhvgiclmy";
+       sha256 = "be5216df86b8086c6eb649daec725298fca14724b4b0271084c57fc70c92312b";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default formatting fsnotify
          mtl purescript regex-tdfa regex-tdfa-text shakespeare system-fileio
@@ -144818,7 +145285,7 @@ self: {
      mkDerivation {
        pname = "yesod-raml";
        version = "0.1.0";
-       sha256 = "1vcllxsyqvr26a27l9vfi76kpdzld3ws1i0q6g9jnwhkr16bmc3f";
+       sha256 = "6eb0ba4cc813722bd33318c4a0f968f4b73bcd896e277a8432226fec75a794ed";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144847,7 +145314,7 @@ self: {
      mkDerivation {
        pname = "yesod-recaptcha";
        version = "1.4";
-       sha256 = "1dvbpzcfwmjv836i8g0gv80dj1iwb9gnvgwg3m5h2hi95249m471";
+       sha256 = "e1909a88282942014b1d8fbf6d5f5a3c06d900da0f3c14cd405b56eed8bf6bb7";
        libraryHaskellDepends = [
          base bytestring data-default http-conduit http-types lifted-base
          network network-info resourcet text wai yesod-auth yesod-core
@@ -144865,7 +145332,7 @@ self: {
      mkDerivation {
        pname = "yesod-routes";
        version = "1.2.0.7";
-       sha256 = "00i2nysbhmxnq0dvfdjx6nhxy680ya38nx8gcgm13fv2xwdd2p6j";
+       sha256 = "d25cd11aef62bb11ea630f758b86f20019dfa1355d36b71bc0b657b8b4b72202";
        revision = "1";
        editedCabalFile = "0d622fd91f5c82a3ae54849a9f55e15b39dcc6240f9f2119151362255cd7334e";
        libraryHaskellDepends = [
@@ -144888,7 +145355,7 @@ self: {
      mkDerivation {
        pname = "yesod-routes-flow";
        version = "1.0";
-       sha256 = "1bb0w1910mnzci4mi6r2zxhjy4wsridi5h2g97nqhd65qncq4km0";
+       sha256 = "a04e8299c5c53488ed494fc0125bcc9a132f61ff229b584964df561052e060ad";
        libraryHaskellDepends = [
          attoparsec base classy-prelude system-fileio text yesod-core
        ];
@@ -144905,7 +145372,7 @@ self: {
      mkDerivation {
        pname = "yesod-routes-typescript";
        version = "0.3.0.0";
-       sha256 = "1gn0fvspgwhzpg7pfaj029vdhlm8ypx9kyn2wdz2wzm5jkl7bnn9";
+       sha256 = "c9da75e894a57e2e7ee3c2fa99faf5a852d87612402a77cfbb1ff277f576c0be";
        libraryHaskellDepends = [
          attoparsec base classy-prelude system-fileio text yesod-core
          yesod-routes
@@ -144923,7 +145390,7 @@ self: {
      mkDerivation {
        pname = "yesod-rst";
        version = "0.2.3";
-       sha256 = "1dv8xq7hndpk3d86dxwjjplv0la8fn32pwzb5l00db9cg420jp71";
+       sha256 = "e15c0904792cad06002debf32b86754851b0e99592f766501bf3360b0fee68b7";
        libraryHaskellDepends = [
          base blaze-html directory hamlet pandoc persistent text
          xss-sanitize yesod-core yesod-form
@@ -144942,7 +145409,7 @@ self: {
      mkDerivation {
        pname = "yesod-s3";
        version = "0.1.1";
-       sha256 = "0vl24qa2aidrr7a082yhnscava06x6jf5y5x9fi9jdry3rnkhzbv";
+       sha256 = "7b7d386d1e3e3799a24bbdf8e2a4e906a8ad98b6d00b04d4c9b945251426826e";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra gd hS3 mtl network resourcet
          text yesod-core
@@ -144960,7 +145427,7 @@ self: {
      mkDerivation {
        pname = "yesod-sass";
        version = "0.1.2.0";
-       sha256 = "0mxk007csmzbrx169jlbg07vqm7ixjrfvjy6xa2lfd5g1xpc7s94";
+       sha256 = "24e9c36e0faf344785eac6cbedb2ecf154bc0f788bca6442cfeb57cd0e00b357";
        libraryHaskellDepends = [
          base data-default hsass shakespeare template-haskell text
          yesod-core
@@ -144977,7 +145444,7 @@ self: {
      mkDerivation {
        pname = "yesod-session-redis";
        version = "0.1.0";
-       sha256 = "06ilc1xjic66xj46nib8y6cq7n8hyc27kzz9zd001d12qh342brv";
+       sha256 = "3b2f4106c422b40040fbe9ff7904f310d98399f168456b88ecc6b0287b60341a";
        libraryHaskellDepends = [
          base binary bytestring containers cookie hedis mtl network
          pool-conduit random text time wai yesod-core
@@ -144995,7 +145462,7 @@ self: {
      mkDerivation {
        pname = "yesod-sitemap";
        version = "1.4.0.1";
-       sha256 = "0ri67r3yjngn4m2lj071n2v3r9w7pvsl24rayf41k7w9j3ylk100";
+       sha256 = "008449fd90899f1988f32a1341f5be87a73cb6b0e100494525f659e9473e2666";
        libraryHaskellDepends = [
          base conduit containers data-default text time xml-conduit
          xml-types yesod-core
@@ -145017,8 +145484,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-static";
-       version = "1.5.0.1";
-       sha256 = "1yda1m7dafcmq9s2gv0cdq3kphl5gg1279crqjgf3x57dyrypjpl";
+       version = "1.5.0.2";
+       sha256 = "8aec8fc99df9a9910d7a3f732b669753c01dd3ea4177f9e5a7f8cea936b62ea9";
        libraryHaskellDepends = [
          async attoparsec base base64-bytestring blaze-builder byteable
          bytestring conduit conduit-extra containers cryptohash
@@ -145050,7 +145517,7 @@ self: {
      mkDerivation {
        pname = "yesod-static-angular";
        version = "0.1.6";
-       sha256 = "17dqk60076la64n4j6bndg9ya16q764j2cl07s2dlldw4z1g4sn1";
+       sha256 = "c16af2c227bc51da843e8032218939d804e5d36b7619492c318a9a038099b89d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145076,7 +145543,7 @@ self: {
      mkDerivation {
        pname = "yesod-table";
        version = "1.0.3";
-       sha256 = "02w7ddyi0zzcvhlj1b01p3zjii2g7bn2f7wcgrdidk8dlg9hrgj5";
+       sha256 = "45be0cd3a30dcd165b7e8c1f27ec3a4fc428ffb801ac2029dcec7f107d6b870b";
        libraryHaskellDepends = [
          base containers contravariant text yesod-core
        ];
@@ -145090,7 +145557,7 @@ self: {
      mkDerivation {
        pname = "yesod-tableview";
        version = "0.2.1";
-       sha256 = "1qf7439c31a8xi0qs8fn2xdlrldi42n1k25lj6vn061lm8wg35yy";
+       sha256 = "de97f138aa341860b791b48819ac20b1d14c5b17d6218d41ec4885c1d220c7e1";
        libraryHaskellDepends = [ base hamlet persistent yesod ];
        description = "Table view for Yesod applications";
        license = stdenv.lib.licenses.bsd3;
@@ -145107,7 +145574,7 @@ self: {
      mkDerivation {
        pname = "yesod-test";
        version = "1.4.3.1";
-       sha256 = "150kzp8h9wl3c1diz6h6m62qd6w0qz4drgrm095amb0sndrh37m2";
+       sha256 = "a29e0173b31aacaa4a0235bfdcc8c7809b8685a9069a1f5b6083f204d1fd1394";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          case-insensitive containers cookie hspec-core html-conduit
@@ -145131,7 +145598,7 @@ self: {
      mkDerivation {
        pname = "yesod-test-json";
        version = "0.2.0.0";
-       sha256 = "1z6cps85fypgymfmq0z67f1z5cr2x9l9hf4wrkncvkivbcb330bh";
+       sha256 = "708131165b3bcecdeccc9c389868ea22b3f2833be6035c5df5ef7a5790beccfc";
        libraryHaskellDepends = [
          aeson base bytestring conduit hspec http-types HUnit text
          transformers wai wai-test yesod-default
@@ -145150,7 +145617,7 @@ self: {
      mkDerivation {
        pname = "yesod-text-markdown";
        version = "0.1.8";
-       sha256 = "1k48wjnn4vvlh9cvh8p3yanjmr772vqz4jbz9nxk0vv9ab9dns81";
+       sha256 = "0169dbd252696f30bb4d7f49f2f116e7e42aadf2e322b85982746f62ade488cc";
        libraryHaskellDepends = [
          aeson base markdown persistent shakespeare text yesod-core
          yesod-form yesod-persistent
@@ -145166,7 +145633,7 @@ self: {
      mkDerivation {
        pname = "yesod-tls";
        version = "1.4.1";
-       sha256 = "0zvhchiky51pwhbcj4c86xsa98nwfw86188jxhnk2jwdgpdb9j68";
+       sha256 = "c8c8b4da7d8d4b312dec12a1601077dca2a474378811c916e437143f2364707f";
        libraryHaskellDepends = [
          base fast-logger monad-logger template-haskell unix wai wai-extra
          warp warp-tls yesod
@@ -145186,7 +145653,7 @@ self: {
      mkDerivation {
        pname = "yesod-transloadit";
        version = "0.3.0.0";
-       sha256 = "0p2npza0clflh1vswyjr4gxx5fxggzv1x61x7c7d79jadq88bi4m";
+       sha256 = "95c485106e4aa6d30e3b3d981ef67fafbbd2fb23597aae7780d45106d4bf565c";
        libraryHaskellDepends = [
          aeson base byteable bytestring cryptohash lens lens-aeson
          old-locale shakespeare text time transformers unordered-containers
@@ -145207,7 +145674,7 @@ self: {
      mkDerivation {
        pname = "yesod-vend";
        version = "0.3.0.0";
-       sha256 = "163ah4g6k62hypm2kj1aiwnzfjx1ngss6iqfg467vjhg71s5l1j9";
+       sha256 = "49065a74380fca7d0c790e47a3f5b3a14bf72d8f2ac829eaf55098691e816a98";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145232,7 +145699,7 @@ self: {
      mkDerivation {
        pname = "yesod-websockets";
        version = "0.2.3";
-       sha256 = "15kklk4wkxclrmsvwzjcy8ggal14c6nrckfn0kqcrfp0hbxzj09m";
+       sha256 = "3501f9fb82e0baccf004d64d96ad612450f51ef24c7ebe75cd94f5c9c9a47396";
        libraryHaskellDepends = [
          async base conduit enclosed-exceptions monad-control transformers
          wai wai-websockets websockets yesod-core
@@ -145249,7 +145716,7 @@ self: {
      mkDerivation {
        pname = "yesod-websockets-extra";
        version = "0.1.0.0";
-       sha256 = "042gl7w8cipjhqfl5h933b0p3j9d5m58v91p1rylz4mjgvhxpk5g";
+       sha256 = "afccdbe17eb2924f7d0e37a48d4a2d2dc971c11a23c1421d86f24686f8a14f10";
        libraryHaskellDepends = [
          base enclosed-exceptions transformers websockets yesod-websockets
        ];
@@ -145265,7 +145732,7 @@ self: {
      mkDerivation {
        pname = "yesod-worker";
        version = "0.0.1";
-       sha256 = "1rwmw1hhx2mm6ikmqcfjg9vgi95mjhv2w5r4dwn8796jkkw8zpkd";
+       sha256 = "6dde8ff89cd2a4832c6f24172e3694b5a4f8767ad2315c6734b58a0e61e095e7";
        libraryHaskellDepends = [
          base containers fast-logger monad-control monad-logger persistent
          resourcet stm template-haskell transformers transformers-base yesod
@@ -145289,7 +145756,7 @@ self: {
      mkDerivation {
        pname = "yet-another-logger";
        version = "0.2.3.1";
-       sha256 = "1m9sb4kshdvr4nd4dsd6ss2f4dfhxnbs9g1xd9rmzrd7bw9k5am0";
+       sha256 = "a0aa32135fa7e55f736a3dbca497edd035e284d6a6e9469a257937a827593ad5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145315,7 +145782,7 @@ self: {
      mkDerivation {
        pname = "yhccore";
        version = "0.9.1";
-       sha256 = "18gjzlpxn0hp723ybjgq1zdbpl35iqphs7b8r5x9ddbkm435sw93";
+       sha256 = "23715d06a973b5967ac9681d0d2f8e65d0bbda0ff8c9e587381702db2ffdf2a1";
        libraryHaskellDepends = [ base containers mtl pretty uniplate ];
        homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Yhc's Internal Core language";
@@ -145336,7 +145803,7 @@ self: {
      mkDerivation {
        pname = "yi";
        version = "0.12.0";
-       sha256 = "167x1zmkhrh7s4wjvvpp0pydgif1yl05by8j6wimi79wwvnkiyi7";
+       sha256 = "27fa38ede63c9d58233712f95500f5c1c5d7fc05f7ee2d39d1076638eb0ffd98";
        configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = true;
        isExecutable = true;
@@ -145366,7 +145833,7 @@ self: {
      mkDerivation {
        pname = "yi-contrib";
        version = "0.10.1";
-       sha256 = "053hsahkxwg2mnf3h4j95gj18x5791dqqji43l310i4l7mliw91k";
+       sha256 = "33241e693d944410061d244a8c5b48a77414e42b4912389cade2f13ea1d27014";
        libraryHaskellDepends = [
          base containers directory filepath lens mtl old-locale
          oo-prototypes split text time transformers-base yi yi-language
@@ -145384,7 +145851,7 @@ self: {
      mkDerivation {
        pname = "yi-emacs-colours";
        version = "0.1.0.1";
-       sha256 = "1kbds9s0r67bdvigjk0c58slbifnddp6ppv4jrgv6493pylp78qv";
+       sha256 = "1ba373a9bf2311b35f9664df6b6e6bd6c545352a0c4cf9e26eeb980c74d26dcd";
        libraryHaskellDepends = [ base containers split yi-language ];
        homepage = "https://github.com/Fuuzetsu/yi-emacs-colours";
        description = "Simple mapping from colour names used in emacs to Color";
@@ -145399,7 +145866,7 @@ self: {
      mkDerivation {
        pname = "yi-fuzzy-open";
        version = "0.1.0";
-       sha256 = "03y7ddas8w380asx4ldafp1r3h4nlyjky7n4n5sdyvwbi0rix1gc";
+       sha256 = "ec851e33888b6fdf74b1c41e3fa5a796c091c375aa51d2b5026870a4556bc70f";
        libraryHaskellDepends = [
          base binary containers data-default directory filepath mtl text
          transformers-base vector yi yi-language yi-rope
@@ -145415,7 +145882,7 @@ self: {
      mkDerivation {
        pname = "yi-gtk";
        version = "0.3";
-       sha256 = "1lgdzrxq3g24wy658ydknb98isyksdknn2bfdzsfi68rnij6z6nz";
+       sha256 = "df9a6f64b41999e8f46f6e096b67d3d3eb88d2b2b379548ce744bc817bfeedd1";
        homepage = "http://haskell.org/haskellwiki/Yi";
        description = "The Haskell-Scriptable Editor, helper package";
        license = "GPL";
@@ -145431,7 +145898,7 @@ self: {
      mkDerivation {
        pname = "yi-language";
        version = "0.2.0";
-       sha256 = "1a0lvddn35q9jqr0w7g2m268dy8s9dwsss7sf4460rvkg1xvkvvh";
+       sha256 = "70efb97b787367600871fa68ad794b1af9868ca8e21d0e32960997615bdb14a8";
        libraryHaskellDepends = [
          array base binary containers data-default hashable lens
          oo-prototypes pointedlist regex-base regex-tdfa template-haskell
@@ -145453,7 +145920,7 @@ self: {
      mkDerivation {
        pname = "yi-monokai";
        version = "0.1.1.2";
-       sha256 = "1nghfyiy8jdz144nbw0c2cdy8n6xyjmk31g6z24jk8dij7iwb60l";
+       sha256 = "1498c5e391b1a12989f8e68531abf4dd58e41b130cf0650909bf49e4a377f0d9";
        libraryHaskellDepends = [ base yi ];
        homepage = "https://github.com/Fuuzetsu/yi-monokai";
        description = "Monokai colour theme for the Yi text editor";
@@ -145468,7 +145935,7 @@ self: {
      mkDerivation {
        pname = "yi-rope";
        version = "0.7.0.1";
-       sha256 = "190rb5rbvdzy4d52dj3ih0kwzigh7v0fg412p3848pkv3836vmg0";
+       sha256 = "e0d56d061a7b5e44d0b82290e7c03ef0c5cf278071c8264a23feb7bd725919a4";
        libraryHaskellDepends = [
          base binary bytestring charsetdetect-ae data-default deepseq
          fingertree text text-icu
@@ -145485,7 +145952,7 @@ self: {
      mkDerivation {
        pname = "yi-snippet";
        version = "0.1.0.0";
-       sha256 = "0qbn5x7lbvb9h6gdqgvldzyy7z5y5aa9a02ss48zkccss5p6939d";
+       sha256 = "2d8d646ed19ab1f911d15a0095942abefce3fd6f743fdc9e8169ed454f2f7661";
        libraryHaskellDepends = [ base containers yi yi-rope ];
        homepage = "https://github.com/yi-editor/yi-snippet";
        description = "Snippet support for Yi";
@@ -145497,7 +145964,7 @@ self: {
      mkDerivation {
        pname = "yi-solarized";
        version = "0.1.1";
-       sha256 = "17ifjm9vgrhv00bll5zj9siz08fng1626bff9q5sfbvzd7y6i9nc";
+       sha256 = "cca668fc697f2fa70b4ece2d234c78d621f0a34ef2174a17001be6b753952e9e";
        libraryHaskellDepends = [ base yi ];
        homepage = "https://github.com/NorfairKing/yi-solarized";
        description = "Solarized colour theme for the Yi text editor";
@@ -145509,7 +145976,7 @@ self: {
      mkDerivation {
        pname = "yi-spolsky";
        version = "0.1";
-       sha256 = "152ys2x416322c13nxmi25wpilq0ddd6hj36mr25jaacf1qszv6q";
+       sha256 = "d8ecaf71704c295944ae6648685a6b00d3787911b1763b0213629840bad05e94";
        libraryHaskellDepends = [ base yi ];
        jailbreak = true;
        homepage = "https://github.com/melrief/yi-spolsky";
@@ -145522,7 +145989,7 @@ self: {
      mkDerivation {
        pname = "yi-vty";
        version = "0.3";
-       sha256 = "01jp8xcxq9a1s6fp4yivnvr5a48svjir70yl0dhhwil0l3m9v9c9";
+       sha256 = "89a59deaa080460e6103d48393a3dc1a1155f2b63b7a729dd14125dc59475706";
        homepage = "http://haskell.org/haskellwiki/Yi";
        description = "The Haskell-Scriptable Editor, helper package";
        license = "GPL";
@@ -145534,7 +146001,7 @@ self: {
      mkDerivation {
        pname = "yices";
        version = "0.0.0.12";
-       sha256 = "1k3q789dapk0c311x72w4r008rnbfz3cvajahxq208gy8iyjx9iz";
+       sha256 = "3fa62e7d44fe212070874aaacdc677cb660440265c9c1ec260605ed5123a78cc";
        libraryHaskellDepends = [ base parsec process ];
        description = "Haskell programming interface to Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
@@ -145545,7 +146012,7 @@ self: {
      mkDerivation {
        pname = "yices-easy";
        version = "0.1";
-       sha256 = "13nl3isf8npqmgsa7mc7713g7y0nk33a654rm1qnn1s6zyz41v70";
+       sha256 = "e0ec40beff46076b71a89914a3c69816f8f3463887d5a3f4abf85ae4741cd48e";
        libraryHaskellDepends = [
          base bindings-yices containers transformers
        ];
@@ -145561,7 +146028,7 @@ self: {
      mkDerivation {
        pname = "yices-painless";
        version = "0.1.2";
-       sha256 = "1q0hxzvhd9p0qb0fyps6hn06nhqcwldxyfljk8880il17ky92p3h";
+       sha256 = "705c91fc3c814680109a923adf1be50c436b8085465fefc0c2e0a606f7ef10e0";
        libraryHaskellDepends = [
          base containers pretty strict-concurrency vector
        ];
@@ -145578,7 +146045,7 @@ self: {
      mkDerivation {
        pname = "yjftp";
        version = "0.3.6.5";
-       sha256 = "11iwz7mrx3f72i3d4l9zvqb8g0722aj00s7h7wa06y4l69rfnj6m";
+       sha256 = "d548eb7232947803143ff06800a412e2808716de3f51d24614c78d9eebf93c86";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145597,7 +146064,7 @@ self: {
      mkDerivation {
        pname = "yjftp-libs";
        version = "0.0.2";
-       sha256 = "1rlw9i1a034lg7gc60fkxjh6kc5yrbapc745gwl1ddi2wisy3h24";
+       sha256 = "44c0e175e422b616287f851c76d5cabeb069a0ecd301c3de79940ca0424c9ce6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory ftphs mtl process unix ];
@@ -145612,7 +146079,7 @@ self: {
      mkDerivation {
        pname = "yjsvg";
        version = "0.1.18";
-       sha256 = "1k9shfj53vqg1wgm06k2729md0q5y252sypjkx245sn3x0a7ffji";
+       sha256 = "513a7714e8c3ea42449ff27a2d8af00583569338621a501f0f0fef51a4833acd";
        libraryHaskellDepends = [ base HaXml ];
        description = "make SVG string from Haskell data";
        license = stdenv.lib.licenses.bsd3;
@@ -145623,7 +146090,7 @@ self: {
      mkDerivation {
        pname = "yjtools";
        version = "0.9.18";
-       sha256 = "13zbq37p2prbyxq1wply7qqpc2wwsic78wzcgbc430nfrrpiq4lv";
+       sha256 = "9b121c6fcece8241d87aec737458d49c0b76313e9e5e1e70f72b5f71cfc0eb8f";
        libraryHaskellDepends = [ base ];
        homepage = "http://homepage3.nifty.com/salamander/second/projects/yjtools/index.xhtml";
        description = "some tools for Monad, List, Tuple and so on";
@@ -145637,7 +146104,7 @@ self: {
      mkDerivation {
        pname = "yocto";
        version = "1.0.1";
-       sha256 = "0i92yraawhn6qkw23wm5vmgwcjgy9pis684jyq8mkawbw0nv3q9a";
+       sha256 = "2ae1b12de08bab5911f69220a3e34dfe49c65fdda5f221f8c4c642ae54f62245";
        libraryHaskellDepends = [ base containers parsec ];
        testHaskellDepends = [
          base containers parsec QuickCheck quickcheck-instances
@@ -145656,7 +146123,7 @@ self: {
      mkDerivation {
        pname = "yoko";
        version = "2.0";
-       sha256 = "07ivcx6xbmjpyj7053fp151k47y7pllwjddxxrwayrlx2qx456z6";
+       sha256 = "e69b423a169d66af78eebd35c929bdc71f324309d78d028ef457d6d54d673b1e";
        libraryHaskellDepends = [
          base bifunctors containers invariant kinds mtl records semigroups
          template-haskell th-sccs type-cereal type-digits type-equality
@@ -145672,7 +146139,7 @@ self: {
      mkDerivation {
        pname = "york-lava";
        version = "0.2";
-       sha256 = "1rpkxlfvk84zl965ik5bpplzcskd96wsnicp66ixnfs9bkqfj7qb";
+       sha256 = "0b1fe9f05c493bdba3319745abb9496d6af6e9bdabcc584ca29fa0b91dedf3e6";
        libraryHaskellDepends = [ base containers haskell98 ];
        homepage = "http://www.cs.york.ac.uk/fp/reduceron/";
        description = "A library for digital circuit description";
@@ -145685,7 +146152,7 @@ self: {
      mkDerivation {
        pname = "youtube";
        version = "0.2.0.1";
-       sha256 = "0n33778aflcdzdkc6p0qaxdqvmyzdyg0r6rg4q2wh0g74m6pl2m4";
+       sha256 = "a40a7a4d25e701c805262f9b0c9e6fdfd78d5b57185cc366fb8d51a7d0396358";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring process utility-ht ];
@@ -145703,7 +146170,7 @@ self: {
      mkDerivation {
        pname = "yql";
        version = "0.0.0";
-       sha256 = "1qwk78adndk2m48inxklqj1rc58wx4jrdim60gwy7ax2d3w92pg6";
+       sha256 = "e65d91f868a2abe3f903a6c69625e91c159683c474761b11a96236db143a93e3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145731,7 +146198,7 @@ self: {
      mkDerivation {
        pname = "yst";
        version = "0.5.0.4";
-       sha256 = "1bnmh7caj9s6sfj2hhfwdnsg75wci1qw8c3pwryqy57knwcwbvkz";
+       sha256 = "7feec519b7f3148f7de67730c471888c97f3b46ddc4128a4d34627a9d881d5ae";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -145749,7 +146216,7 @@ self: {
      mkDerivation {
        pname = "yuiGrid";
        version = "0.1";
-       sha256 = "005l0rr9l0l81706drq57nww4h0j4rw8n0ncpnkdb139941gywzq";
+       sha256 = "f873ff02496984d5a6bdcc028b78261240c2b93d05e766c00988029a7206b400";
        libraryHaskellDepends = [ base ];
        description = "Grids defined by layout hints and implemented on top of Yahoo grids";
        license = "unknown";
@@ -145763,7 +146230,7 @@ self: {
      mkDerivation {
        pname = "yuuko";
        version = "2010.11.28";
-       sha256 = "01pf0mg6lgm34src1mfz3qj41vyhmvi50yjyv72zwamd0g7sx374";
+       sha256 = "e48caecf03ad2afec5d95e7a50e2aed0ef40241edfd5c0b226a33e6a5e05ee06";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145793,7 +146260,7 @@ self: {
      mkDerivation {
        pname = "yxdb-utils";
        version = "0.1.0.1";
-       sha256 = "05aba4fdpqx7sar7yrw4gg341wzfhhlbvx7453ns8mccqhx9dag8";
+       sha256 = "e8a9963ac48c55a4ed28e4f4bd2884eef340c67b84677fb2d2a7e3db1c514b15";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145824,7 +146291,7 @@ self: {
      mkDerivation {
        pname = "z3";
        version = "4.1.0";
-       sha256 = "1vpmwizxcab1mlz7vp3hp72ddla7805jn0lq60fmkjgmj95ryvq9";
+       sha256 = "096f9f4b92f5c9591d3098022b0b4047d1d6c4b970dc7d3ead6129d67fe4f5ee";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl ];
@@ -145842,7 +146309,7 @@ self: {
      mkDerivation {
        pname = "zampolit";
        version = "0.3";
-       sha256 = "1bhp98bn41lqxdl48xxcb4b4fknva2aigq5gxffcha535igdmdy3";
+       sha256 = "c3b7da5e2ca328c89cebafe0179550db4e471659ac774468eb980662174a17ae";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -145860,7 +146327,7 @@ self: {
      mkDerivation {
        pname = "zasni-gerna";
        version = "0.0.7";
-       sha256 = "1zl2kcd0hr021xl6pjvvxwxvmpb02cq04ck39qkwil56vannnksw";
+       sha256 = "5c4f6baddaa6d0c8274e633202301360ddba3bef7bcb6b680f0264081a9b82fe";
        libraryHaskellDepends = [ base papillon ];
        homepage = "https://skami.iocikun.jp/haskell/packages/zasni-gerna";
        description = "lojban parser (zasni gerna)";
@@ -145873,7 +146340,7 @@ self: {
      mkDerivation {
        pname = "zcache";
        version = "0.0.0";
-       sha256 = "10j0fwf58ig0j44f7p57zr8by6i9j1agnjzk6cs65iimm79m9avb";
+       sha256 = "6bab54d3a935c6623433f34bfb5490291abf50fea7dce30891e045541c774082";
        libraryHaskellDepends = [
          array base containers mersenne-random-pure64
        ];
@@ -145887,7 +146354,7 @@ self: {
      mkDerivation {
        pname = "zenc";
        version = "0.1.1";
-       sha256 = "0p0h7vz14k9v8gsnpkb9ca61i1k67vvsjg0bzy0ag4m20k94zlb2";
+       sha256 = "62d14fd204a292a780ff0b3ca9f73e6686188c6269cd6bf5433b4d12fe3e105c";
        libraryHaskellDepends = [ base ];
        description = "GHC style name Z-encoding and Z-decoding";
        license = stdenv.lib.licenses.bsd3;
@@ -145903,7 +146370,7 @@ self: {
      mkDerivation {
        pname = "zendesk-api";
        version = "0.1.0.0";
-       sha256 = "1x6801i5rw6a0nfdihi04bmka8qww9c77r7ygbhp3zx1hqdpdmmc";
+       sha256 = "acd6761b86a1ff71e17afee47358e21c2335eb2220c2d89c05caf05c6200c8f4";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive conduit connection
          data-default failure http-client http-client-tls http-conduit
@@ -145924,7 +146391,7 @@ self: {
      mkDerivation {
        pname = "zeno";
        version = "0.2.0.1";
-       sha256 = "03jwhgi9n9iv7zpn8nwkdyvsybsksnhsji8k2ma9rzayk36aba6v";
+       sha256 = "dba8a5cc985efd9c54151345a9a1d5532fafb76f935b64ef3f3b269be2835c0e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -145941,7 +146408,7 @@ self: {
      mkDerivation {
        pname = "zero";
        version = "0.1.2";
-       sha256 = "01hfsi29g42b4jj3ahddv1ry7qgav17pwpngipz8igq2w81v1y9p";
+       sha256 = "37f9b003e202bf88fe8dcf5e7e4fd8eae1e373d8ad4135a4244b909744d40e06";
        libraryHaskellDepends = [ base semigroups ];
        homepage = "https://github.com/phaazon/zero";
        description = "Semigroups with absorption";
@@ -145955,7 +146422,7 @@ self: {
      mkDerivation {
        pname = "zeromq-haskell";
        version = "0.8.4";
-       sha256 = "0lvjszi08r5wm5ch03153y7lir6cdgqr2gnhq45j4b0kid6gkpv3";
+       sha256 = "63dff94c8b132c220bc1d03e91f16bcce4488f1f250c0059a9bc6404e2d77253";
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ zeromq ];
        testHaskellDepends = [
@@ -145975,7 +146442,7 @@ self: {
      mkDerivation {
        pname = "zeromq3-conduit";
        version = "0.1.0.0";
-       sha256 = "1n6xl5izdkbl2mb4msryrcasg08prjbgzwilz4b7yi1g79y1yf77";
+       sha256 = "e7381f7c3a2f447f16f934f2ff96cc1781a715cb3eeb4a561574cdf663a1ddd8";
        libraryHaskellDepends = [
          base bytestring conduit lifted-base monad-control mtl resourcet
          transformers zeromq3-haskell
@@ -145994,7 +146461,7 @@ self: {
      mkDerivation {
        pname = "zeromq3-haskell";
        version = "0.5.2";
-       sha256 = "1ky92qwyk27qsxnvaj0mc9yyhk7g19ry2nq55666ayahc899z213";
+       sha256 = "23889f12625079658c29055be1730aef4ce87d621548b56dd7f888e93916c9cf";
        libraryHaskellDepends = [
          async base bytestring containers MonadCatchIO-transformers
          semigroups transformers
@@ -146018,7 +146485,7 @@ self: {
      mkDerivation {
        pname = "zeromq4-haskell";
        version = "0.6.3";
-       sha256 = "0yrwqxm208n9k76i9aby5hiv55kd1p27pq6hyry5ngw95fh95p67";
+       sha256 = "c7dc92a02b893f5b7cf6d0e07bc40d6d96b2232c7ea914cd99c922206ac73c7b";
        libraryHaskellDepends = [
          async base bytestring containers exceptions semigroups transformers
        ];
@@ -146039,7 +146506,7 @@ self: {
      mkDerivation {
        pname = "zeroth";
        version = "2009.6.23.3";
-       sha256 = "10ilsxlha4l7c4z3jl6lykcjns6igyk2qma2a03yzpvgz7ijy4c0";
+       sha256 = "80112fe3f96fdfef075042552ca67fd1682bd9f4d450393e6187120569d73482";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146063,7 +146530,7 @@ self: {
      mkDerivation {
        pname = "zigbee-znet25";
        version = "0.1.1.0";
-       sha256 = "0kv52f7zhgd2x44a2dg89jrsxiis73m8884f4zmxdbznhq1prqf5";
+       sha256 = "c5e17c0386f6afd6eb278e2084ea383ac6aeb34ce835a108e9a23df88f13654f";
        libraryHaskellDepends = [
          base bytestring cereal MissingH mtl transformers
        ];
@@ -146081,7 +146548,7 @@ self: {
      mkDerivation {
        pname = "zip-archive";
        version = "0.2.3.7";
-       sha256 = "169nkxr5zlbymiz1ydlhlqr66vqiycmg85xh559phpkr64w3nqj1";
+       sha256 = "41623b3831795e785329b017f42af3116f6332a690361f7eac7ed15f729f3699";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146107,7 +146574,7 @@ self: {
      mkDerivation {
        pname = "zip-conduit";
        version = "0.2.2.2";
-       sha256 = "0spb6b1mwcqwzrr231i5s6hcln9jck0z03jdfh1zlm87mvp8670v";
+       sha256 = "1b1c83eeae0755fa03744d0ef0c1643259caa0d125862172fe1c335ec332eb6a";
        libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra digest directory
          filepath mtl old-time resourcet time transformers utf8-string
@@ -146127,7 +146594,7 @@ self: {
      mkDerivation {
        pname = "zipedit";
        version = "0.2.3";
-       sha256 = "17msh3gwylmsiabyz5x05ir2xh8h904kbp5isnvbf0z4kzfv33cr";
+       sha256 = "998db1dd9fe403b7b6d5b1dc35094810c12e722ca097ef978aba52cfdf80ba9e";
        libraryHaskellDepends = [ base directory mtl process ];
        homepage = "http://code.haskell.org/~byorgey/code/zipedit";
        description = "Create simple list editor interfaces";
@@ -146140,7 +146607,7 @@ self: {
      mkDerivation {
        pname = "zipper";
        version = "0.4.2";
-       sha256 = "1r8092amq5w9gl5szycl1r7wx87xnmkcapdzcwfa4c3pvxrhjy44";
+       sha256 = "84780973df7730a21c67bf5dc566b5fda0ce4f0e94f9af0b7d89175c954800e5";
        libraryHaskellDepends = [ base multirec ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
        description = "Generic zipper for families of recursive datatypes";
@@ -146154,7 +146621,7 @@ self: {
      mkDerivation {
        pname = "zippers";
        version = "0.2";
-       sha256 = "1rlf01dc6dcy9sx89npsisdz1yg9v4h2byd6ms602bxnmjllm1ls";
+       sha256 = "9a864aa9acb62f018caea6f92520d9e9f9f09b8efada84ba4e9e35c35a008ee6";
        revision = "1";
        editedCabalFile = "3e27022f7ed27e35e73ed36f3aa6b396c7e7b52e864965b8d3cd4dab8394e960";
        libraryHaskellDepends = [ base lens profunctors semigroupoids ];
@@ -146169,7 +146636,7 @@ self: {
      mkDerivation {
        pname = "zippo";
        version = "0.3";
-       sha256 = "1ihdird5yryfb2ki9bwwchj8bxjcmmgjkp3hl605zzhi2lz3awx2";
+       sha256 = "a273353e1511fe5f80a170dc295fad4cf68524649caf14a758ce675f5a8e0dc6";
        libraryHaskellDepends = [ base mtl yall ];
        homepage = "http://brandon.si/code/zippo/";
        description = "A simple lens-based, generic, heterogenous, type-checked zipper library";
@@ -146181,7 +146648,7 @@ self: {
      mkDerivation {
        pname = "zlib";
        version = "0.5.4.2";
-       sha256 = "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm";
+       sha256 = "75d617d8a77d85ba5a0d69e42c2cd5371b56140b5fb028be3e75bff1cfd41096";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ zlib ];
        description = "Compression and decompression in the gzip and zlib formats";
@@ -146195,7 +146662,7 @@ self: {
      mkDerivation {
        pname = "zlib";
        version = "0.6.1.1";
-       sha256 = "0dd79dxf56d8f6ad9if3j87s9gg7yd17ckypjxwplrbkahlb9xf5";
+       sha256 = "c5f5b4285473657a7997d74f7642f3e7bda40f92c3c5d49471a899e27a4ba735";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ zlib ];
        testHaskellDepends = [
@@ -146211,7 +146678,7 @@ self: {
      mkDerivation {
        pname = "zlib-bindings";
        version = "0.1.1.5";
-       sha256 = "02ciywlz4wdlymgc3jsnicz9kzvymjw1www2163gxidnz4wb8fy8";
+       sha256 = "c83bb438f9b6c5fe860982731eb8ac7eff993e8b56cbc15ef5b471f229f79109";
        revision = "2";
        editedCabalFile = "0c6f9f81832af2473281fd58631aff8c6bbad24191e00d2a5a6ae2479249043b";
        libraryHaskellDepends = [ base bytestring zlib ];
@@ -146226,7 +146693,7 @@ self: {
      mkDerivation {
        pname = "zlib-conduit";
        version = "1.1.0";
-       sha256 = "1b22mca8bbg7f84h8y0qsb5ckzg2dw1b26y27x7b7xdxqbwpz93a";
+       sha256 = "6aa47ff9c2bdf5b34e3fc21bb1026fe2fdc9cad21878040972e7ad8514ab42ac";
        libraryHaskellDepends = [ base conduit ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming compression/decompression via conduits. (deprecated)";
@@ -146240,7 +146707,7 @@ self: {
      mkDerivation {
        pname = "zlib-enum";
        version = "0.2.3.1";
-       sha256 = "1nfczminxafzk69ry1sqkj1ha0jlv3l9ak10yk205snfhpmcjgg4";
+       sha256 = "e43dc9ea85ceea02c4f4204c95e8d8540205839c58079f9399dfa96e63fdccd9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146256,7 +146723,7 @@ self: {
      mkDerivation {
        pname = "zlib-lens";
        version = "0.1.2";
-       sha256 = "1vm12sm9ypik5qnnizmwx56fmpjghldzb06kn020hwlabz8c4j8n";
+       sha256 = "1649c2d05f8a720804b0d380f51b854fdeea4ce9bcfe682d2e335e9faa16a1ee";
        revision = "1";
        editedCabalFile = "353e3ef6e0281894cd494b95563bb93a30ec0ff96e309a173c36bddfc4069e66";
        libraryHaskellDepends = [ base bytestring profunctors zlib ];
@@ -146270,7 +146737,7 @@ self: {
      mkDerivation {
        pname = "zmcat";
        version = "0.3";
-       sha256 = "0lg5fn89wj5blbp2gh760ibxb2zz9f11jnwicfsmsayra51micip";
+       sha256 = "37b2584351d92b5db563915b19824bff8bd55704e6c027eea2ab489e9075e551";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring zeromq3-haskell ];
@@ -146286,7 +146753,7 @@ self: {
      mkDerivation {
        pname = "zmidi-core";
        version = "0.7.0";
-       sha256 = "0v8zcybr46rcdpvsji0dzr78skj79jp8l9sd49z6c7s5sddzjm9l";
+       sha256 = "3455f95bd3451f667e224d278aae4c474e8d4efe0d44a9f76d2c1b9297671f6d";
        libraryHaskellDepends = [ base binary bytestring containers ];
        homepage = "http://code.google.com/p/copperbox/";
        description = "Read and write MIDI files";
@@ -146301,7 +146768,7 @@ self: {
      mkDerivation {
        pname = "zmidi-score";
        version = "0.3.0.0";
-       sha256 = "0zhh6bdpbng69sajxdvj2mnd385gc8yyli3jzyjfxp0wr0hv3biv";
+       sha256 = "3baeb121c81cdceea4ff7244ea3d62afa0d16c1572b72e954ee6d975db32107e";
        libraryHaskellDepends = [
          aeson base binary containers data-ordlist deepseq deepseq-generics
          directory filepath mtl parallel-io text zmidi-core
@@ -146319,7 +146786,7 @@ self: {
      mkDerivation {
        pname = "zmqat";
        version = "0.2.0.0";
-       sha256 = "1k10wflfsivq792jvl3bhb8nkpx6m3z8qzarz6q8aw5hs2wslvrv";
+       sha256 = "3b6faab9d0b07085b0f9597d8cfea8a6df69d1826bd02d453a7847eda8e320cc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -146335,7 +146802,7 @@ self: {
      mkDerivation {
        pname = "zoneinfo";
        version = "0.5";
-       sha256 = "1n27j8ca79a1ijn7k7dp61kjz62i6zfzlns8n0kwgyvpx413ws8y";
+       sha256 = "1e693e02e977fbc727b0485bfadd3751982f6730b79d79ac8c41a5a3189247d8";
        libraryHaskellDepends = [ base time ];
        jailbreak = true;
        description = "ZoneInfo library";
@@ -146350,7 +146817,7 @@ self: {
      mkDerivation {
        pname = "zoom";
        version = "0.1.0.1";
-       sha256 = "0zsr3k4c6da1l5cw3laj2snfszm4g0bz76hj2bjj61yrwmc99vnl";
+       sha256 = "d4ee9458e5d90723e512129af31778a47eedac1652d1c159a14135c3c81c597f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ghc hamlet template-haskell text ];
@@ -146374,7 +146841,7 @@ self: {
      mkDerivation {
        pname = "zoom-cache";
        version = "1.2.1.6";
-       sha256 = "0761xpfmmm309r6r44ax7x2zs49dskygl2c09x2kpxpfr7rr3k5f";
+       sha256 = "aecc91f3c9eef63b454f8009fafcd42d11fd453f5d11924d4e60d45addedc11c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146404,7 +146871,7 @@ self: {
      mkDerivation {
        pname = "zoom-cache-pcm";
        version = "0.3.0.1";
-       sha256 = "0r676wb4q7wmin3liqh525w43pgdf0gmcfx2ccpbvc4ahain9vyq";
+       sha256 = "d8ef64a3828ab0bd2e63a23b561f70eddd41781105e248878d951f4c1637c764";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers iteratee ListLike mtl
          type-level zoom-cache
@@ -146423,7 +146890,7 @@ self: {
      mkDerivation {
        pname = "zoom-cache-sndfile";
        version = "1.1.0.1";
-       sha256 = "0722wy6rqbx4gajn3sp946scganr2arhinxrqyq5fvvsbdxacwhz";
+       sha256 = "1f72a67a5b7a6f57b0c7b9db08b312d9aac7b421e9ea61a57aa42f9c8de7421c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -146441,7 +146908,7 @@ self: {
      mkDerivation {
        pname = "zoom-refs";
        version = "0.0.0.0";
-       sha256 = "0pbnwgsfl4rgmgsq30snki34xh9iaky01jnxycppf0h93mbdv01p";
+       sha256 = "3780dd561d0902772ff3ddca00fc5431c14e469c568381f5ab2f13eaf4e3765d";
        libraryHaskellDepends = [ base lens stm ];
        description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references";
        license = stdenv.lib.licenses.bsd3;
@@ -146452,7 +146919,7 @@ self: {
      mkDerivation {
        pname = "zot";
        version = "0.0.2";
-       sha256 = "12wgkrlvhby0gy6kngjwyx468yarpgkiwy51v6zb8jhx79mhidq3";
+       sha256 = "03b7086b3a1d4ab4bed9a1781ee7bb59796448f75c3e3b8d7fc02fb8699e8f8b";
        revision = "1";
        editedCabalFile = "325ccedb3426935b4a56f838f3d05fc914b72729a2b80d6c804bec5657593a40";
        isLibrary = false;
@@ -146468,7 +146935,7 @@ self: {
      mkDerivation {
        pname = "zsh-battery";
        version = "0.2";
-       sha256 = "04d812dcvkbjg2y0q4q855r6g9nr2k54k2jhnbksbpnxkz0cmaxr";
+       sha256 = "b9abcac09fdddea5e7b2508a49ca14d9a667722908130cbc7872cdcd9a08a811";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath mtl ];
@@ -146485,7 +146952,7 @@ self: {
      mkDerivation {
        pname = "ztail";
        version = "1.1";
-       sha256 = "11x6whwyfgdgda5bhdck0k12inzix8cjfm42hh09p703nalk07nq";
+       sha256 = "d81e30a9b2039c9b008482542719eaf1db28c2049335b88a6aaf3de739e4a687";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [

From 45e7bb6b83d4f15f1c717bbbcda1ee5a69be0c0f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 10 Aug 2015 11:44:19 +0200
Subject: [PATCH 1089/2016] haskell-multi-cabal is broken.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ed23b190ec6..182211ec405 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -926,4 +926,7 @@ self: super: {
   # https://github.com/liyang/thyme/issues/36
   thyme = dontCheck super.thyme;
 
+  # https://github.com/aka-bash0r/multi-cabal/issues/4
+  multi-cabal = markBroken super.multi-cabal;
+
 }

From 354df047e7c3de29681310a1b0e4eb1dc6c1a7b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Aug 2015 11:33:55 +0200
Subject: [PATCH 1090/2016] haskell-diagrams-lib has been fixed upstream.

---
 .../haskell-modules/configuration-common.nix    | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 182211ec405..d00e51cc270 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -881,23 +881,6 @@ self: super: {
   # https://github.com/hspec/mockery/issues/6
   mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; });
 
-  # https://github.com/diagrams/diagrams-lib/issues/258
-  # https://github.com/diagrams/diagrams-lib/issues/259
-  diagrams-lib = markBroken super.diagrams-lib;
-  diagrams-cairo = dontDistribute super.diagrams-cairo;
-  diagrams-gtk = dontDistribute super.diagrams-gtk;
-  diagrams-html5 = dontDistribute super.diagrams-html5;
-  diagrams-pandoc = dontDistribute super.diagrams-pandoc;
-  diagrams-postscript = dontDistribute super.diagrams-postscript;
-  diagrams-rasterific = dontDistribute super.diagrams-rasterific;
-  diagrams-rubiks-cube = dontDistribute super.diagrams-rubiks-cube;
-  diagrams-svg = dontDistribute super.diagrams-svg;
-  halma = dontDistribute super.halma;
-  midi-music-box = dontDistribute super.midi-music-box;
-  potrace-diagrams = dontDistribute super.potrace-diagrams;
-  SVGFonts = dontDistribute super.SVGFonts;
-  yesod-media-simple = dontDistribute super.yesod-media-simple;
-
   # https://github.com/alphaHeavy/lzma-conduit/issues/5
   lzma-conduit = dontCheck super.lzma-conduit;
 

From 95b98116c20a0e027da784dc245e41aef0e380a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Aug 2015 12:44:46 +0200
Subject: [PATCH 1091/2016] haskell-ihaskell-widgets is broken because of
 singletons.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d00e51cc270..c9d81e3ddb1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -793,6 +793,7 @@ self: super: {
   singleton-nats = dontDistribute super.singleton-nats;
   singletons = markBroken super.singletons;
   units-attoparsec = dontDistribute super.units-attoparsec;
+  ihaskell-widgets = dontDistribute super.ihaskell-widgets;
 
   # https://github.com/anton-k/temporal-music-notation/issues/1
   temporal-music-notation = markBroken super.temporal-music-notation;

From f741d426da265c6a4e38a070b5deb7793fe22ce8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Aug 2015 11:17:01 +0200
Subject: [PATCH 1092/2016] ghc-nokinds: remove "nokinds" tag from derivation
 name

The name of the GHC derivation must match the name and version tuple GHC
uses to identify itself, because the withPackages wrapper uses that name
to construct installation library paths etc., and those paths must match
those constructed by the compiler. If we add another tag to the name
that GHC itself doesn't use, then the paths assumed to exist by the
wrapper are wrong.
---
 pkgs/development/compilers/ghc/nokinds.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix
index 2bd3fb55b70..ab270c16126 100644
--- a/pkgs/development/compilers/ghc/nokinds.nix
+++ b/pkgs/development/compilers/ghc/nokinds.nix
@@ -28,7 +28,7 @@ in
 
 stdenv.mkDerivation rec {
   version = "7.11.20150718";
-  name = "ghc-nokinds-${version}";
+  name = "ghc-${version}"; # We cannot add a "nokinds" tag here; see git comment for details.
   rev = "4cb79c85a4976c509a65a8638899391a60cd0962";
 
   src = fetchgit {

From 6440e9bbfd22800cc5f967445fce9cc86e2ca0cd Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 13 Aug 2015 12:17:32 +0200
Subject: [PATCH 1093/2016] nixos/vbox: Move all options to virtualisation.*.

Commit 687caeb renamed services.virtualboxHost to programs.virtualbox,
but according to the discussion on the commit, it's probably a better to
put it into virtualisation.virtualbox instead.

The discussion can be found here:

https://github.com/NixOS/nixpkgs/commit/687caeb#commitcomment-12664978

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/doc/manual/release-notes/rl-unstable.xml  | 11 +++++++++++
 nixos/modules/rename.nix                        | 11 ++++++++---
 .../modules/virtualisation/virtualbox-guest.nix | 17 ++++-------------
 .../modules/virtualisation/virtualbox-host.nix  |  4 ++--
 nixos/tests/virtualbox.nix                      |  6 +++---
 5 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index db20831ead8..30da98faa33 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -92,6 +92,17 @@ was accordingly renamed to <literal>electron</literal>
   </para>
 </listitem>
 
+<listitem>
+  <para>
+    The VirtualBox host and guest options have been moved/renamed more
+    consistently and less confusing to be now found in
+    <literal>virtualisation.virtualbox.host.*</literal> instead of
+    <literal>services.virtualboxHost.*</literal> and
+    <literal>virtualisation.virtualbox.guest.*</literal> instead of
+    <literal>services.virtualboxGuest.*</literal>.
+  </para>
+</listitem>
+
 <listitem>
   <para>
     Haskell packages can no longer be found by name, i.e. the commands
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 7874c8462ca..abecc065634 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -109,7 +109,14 @@ in zipModules ([]
 ++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ]
 
 # VirtualBox
-++ obsolete [ "services" "virtualbox" "enable" ] [ "services" "virtualboxGuest" "enable" ]
+++ obsolete [ "services" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ]
+++ obsolete [ "services" "virtualboxGuest" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ]
+++ obsolete [ "programs" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ]
+++ obsolete [ "programs" "virtualbox" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ]
+++ obsolete [ "programs" "virtualbox" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ]
+++ obsolete [ "services" "virtualboxHost" "enable" ] [ "virtualisation" "virtualbox" "host" "enable" ]
+++ obsolete [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ]
+++ obsolete [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ]
 
 # Tarsnap
 ++ obsolete [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ]
@@ -144,8 +151,6 @@ in zipModules ([]
 # DNSCrypt-proxy
 ++ obsolete [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ]
 
-++ obsolete [ "services" "virtualboxHost" ] [ "programs" "virtualbox" ]
-
 # Options that are obsolete and have no replacement.
 ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ]
 ++ obsolete' [ "boot" "initrd" "luks" "enable" ]
diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index 6c4014fc4a1..642ea3154b1 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -6,7 +6,7 @@ with lib;
 
 let
 
-  cfg = config.services.virtualboxGuest;
+  cfg = config.virtualisation.virtualbox.guest;
   kernel = config.boot.kernelPackages;
 
 in
@@ -15,20 +15,11 @@ in
 
   ###### interface
 
-  options = {
-
-    services.virtualboxGuest = {
-
-      enable = mkOption {
-        default = false;
-        description = "Whether to enable the VirtualBox service and other guest additions.";
-      };
-
-    };
-
+  options.virtualisation.virtualbox.guest.enable = mkOption {
+    default = false;
+    description = "Whether to enable the VirtualBox service and other guest additions.";
   };
 
-
   ###### implementation
 
   config = mkIf cfg.enable {
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index b8b3d62a031..00486df5c4b 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  cfg = config.programs.virtualbox;
+  cfg = config.virtualisation.virtualbox.host;
   virtualbox = config.boot.kernelPackages.virtualbox.override {
     inherit (cfg) enableHardening;
   };
@@ -11,7 +11,7 @@ let
 in
 
 {
-  options.programs.virtualbox = {
+  options.virtualisation.virtualbox.host = {
     enable = mkOption {
       type = types.bool;
       default = false;
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 4895eb134dc..83a8b2835dc 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -31,7 +31,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
       fsType = "vboxsf";
     };
 
-    services.virtualboxGuest.enable = true;
+    virtualisation.virtualbox.guest.enable = true;
 
     boot.initrd.kernelModules = [
       "af_packet" "vboxsf"
@@ -308,9 +308,9 @@ in {
       vmConfigs = mapAttrsToList mkVMConf vboxVMs;
     in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs;
     virtualisation.memorySize = 768;
-    services.virtualboxHost.enable = true;
+    virtualisation.virtualbox.host.enable = true;
     users.extraUsers.alice.extraGroups = let
-      inherit (config.services.virtualboxHost) enableHardening;
+      inherit (config.virtualisation.virtualbox.host) enableHardening;
     in lib.mkIf enableHardening (lib.singleton "vboxusers");
   };
 

From 106837a449aa031116cf6f92c549574bc970d17b Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 12:37:28 +0200
Subject: [PATCH 1094/2016] gnome3.four-in-a-row: init at 3.16.2

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  3 +++
 .../3.16/games/four-in-a-row/default.nix      | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 58cf642c69d..b6d26a88713 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -35,6 +35,7 @@ let
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
     tali quadrapassel gnome-sudoku aisleriot five-or-more
+    four-in-a-row
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -300,6 +301,8 @@ let
 
   five-or-more = callPackage ./games/five-or-more { };
 
+  four-in-a-row = callPackage ./games/four-in-a-row { };
+
   gnome-sudoku = callPackage ./games/gnome-sudoku { };
 
   iagno = callPackage ./games/iagno { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
new file mode 100644
index 00000000000..bf15f9f2bbb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, intltool, itstool, libcanberra_gtk3, librsvg, libxml2
+, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "four-in-a-row-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/four-in-a-row/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1bm5chsvpw0jg1xh9g2n1w5i0fvxs50aqkgmrla9cpawsvzfshmz";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg
+    libxml2 hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Four-in-a-row;
+    description = "Make lines of the same color to win";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From ab4d1e3bb31c7c1f275d008fce5d0beb25d0b5e4 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 12:46:36 +0200
Subject: [PATCH 1095/2016] gnome-chess: init at 3.16.2

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 +++-
 .../3.16/games/gnome-chess/default.nix        | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index b6d26a88713..b99bdd6ba92 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -35,7 +35,7 @@ let
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
     tali quadrapassel gnome-sudoku aisleriot five-or-more
-    four-in-a-row
+    four-in-a-row gnome-chess
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -303,6 +303,8 @@ let
 
   four-in-a-row = callPackage ./games/four-in-a-row { };
 
+  gnome-chess = callPackage ./games/gnome-chess { };
+
   gnome-sudoku = callPackage ./games/gnome-sudoku { };
 
   iagno = callPackage ./games/iagno { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
new file mode 100644
index 00000000000..7161eb5cdaf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, intltool, itstool, librsvg, libxml2, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-chess-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-chess/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0j1vvf1myki3bafsqv52q59qk1nhf1636nrb15fpfvm88p3b8wwg";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Chess;
+    description = "Play the classic two-player boardgame of chess";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From 9a6dd2b7605762921fb1b5ddea34f1345d1ff426 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 12:54:18 +0200
Subject: [PATCH 1096/2016] gnome-klotski: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 +++-
 .../3.16/games/gnome-klotski/default.nix      | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index b99bdd6ba92..5896232a788 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -35,7 +35,7 @@ let
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
     tali quadrapassel gnome-sudoku aisleriot five-or-more
-    four-in-a-row gnome-chess
+    four-in-a-row gnome-chess gnome-klotski
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -305,6 +305,8 @@ let
 
   gnome-chess = callPackage ./games/gnome-chess { };
 
+  gnome-klotski = callPackage ./games/gnome-klotski { };
+
   gnome-sudoku = callPackage ./games/gnome-sudoku { };
 
   iagno = callPackage ./games/iagno { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
new file mode 100644
index 00000000000..6afcc63e97f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, libxml2, intltool, itstool, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-klotski-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-klotski/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0a64935c7pp51jhaf29q9zlx3lamj7zrhyff7clvv0w8v1w6gpax";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Klotski;
+    description = "Slide blocks to solve the puzzle";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From 2139f487c31d82f5e7b6d8890ecf71e959eae684 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 13 Aug 2015 13:12:33 +0200
Subject: [PATCH 1097/2016] libaudclient: init at 3.5-rc2

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

diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix
new file mode 100644
index 00000000000..c44639d1f39
--- /dev/null
+++ b/pkgs/development/libraries/libaudclient/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, glib, dbus_glib }:
+
+stdenv.mkDerivation rec {
+  name = "libaudclient-3.5-rc2";
+  version = "3.5-rc2";
+
+  src = fetchurl {
+    url = "http://distfiles.audacious-media-player.org/${name}.tar.bz2";
+    sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap";
+  };
+
+  buildInputs = [ pkgconfig glib dbus_glib ];
+
+  meta = with stdenv.lib; {
+    description = "Legacy D-Bus client library for Audacious";
+    homepage = http://audacious-media-player.org/;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed6d9a0f92c..799334b8a39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6746,6 +6746,8 @@ let
 
   libatomic_ops = callPackage ../development/libraries/libatomic_ops {};
 
+  libaudclient = callPackage ../development/libraries/libaudclient { };
+
   libav = libav_11; # branch 11 is API-compatible with branch 10
   libav_all = callPackage ../development/libraries/libav { };
   inherit (libav_all) libav_0_8 libav_9 libav_11;

From 5f3dca9303de83c63579b5393ae6a1f8213bb1f3 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 13 Aug 2015 13:13:11 +0200
Subject: [PATCH 1098/2016] gjay: init at 0.3.2

---
 pkgs/applications/audio/gjay/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/audio/gjay/default.nix

diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix
new file mode 100644
index 00000000000..9f023f34291
--- /dev/null
+++ b/pkgs/applications/audio/gjay/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk, gsl
+, libaudclient }:
+
+stdenv.mkDerivation {
+  name = "gjay-0.3.2";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/gjay/gjay-0.3.2.tar.gz";
+    sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ mpd_clientlib dbus_glib audacious gtk gsl libaudclient ];
+
+  meta = with stdenv.lib; {
+    description = "Generates playlists such that each song sounds good following the previous song";
+    homepage = http://gjay.sourceforge.net/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 799334b8a39..e564899d2f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11402,6 +11402,8 @@ let
     fftw = fftwSinglePrec;
   };
 
+  gjay = callPackage ../applications/audio/gjay { };
+
   photivo = callPackage ../applications/graphics/photivo { };
 
   wavesurfer = callPackage ../applications/misc/audio/wavesurfer { };

From e9d2426d9b4342c5d9dd0309af9b961fbd97e6df Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 13:21:50 +0200
Subject: [PATCH 1099/2016] gnome-mahjongg: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 +++-
 .../3.16/games/gnome-mahjongg/default.nix     | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 5896232a788..7d2c73052d2 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -35,7 +35,7 @@ let
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
     tali quadrapassel gnome-sudoku aisleriot five-or-more
-    four-in-a-row gnome-chess gnome-klotski
+    four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -307,6 +307,8 @@ let
 
   gnome-klotski = callPackage ./games/gnome-klotski { };
 
+  gnome-mahjongg = callPackage ./games/gnome-mahjongg { };
+
   gnome-sudoku = callPackage ./games/gnome-sudoku { };
 
   iagno = callPackage ./games/iagno { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
new file mode 100644
index 00000000000..5b5bdae87c0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-mahjongg-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-mahjongg/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1jbd3gbmxqf36as9xsiarad575l4rpcfv6w1pn192r02aj3hgipj";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Mahjongg;
+    description = "Disassemble a pile of tiles by removing matching pairs";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From fd75bf0c7df73c8097de6e388eca1a44ef3701ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Aug 2015 13:26:37 +0200
Subject: [PATCH 1100/2016] nettle: Disable static libraries

---
 pkgs/development/libraries/nettle/generic.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix
index 6044f978402..3c439eb404c 100644
--- a/pkgs/development/libraries/nettle/generic.nix
+++ b/pkgs/development/libraries/nettle/generic.nix
@@ -16,9 +16,6 @@ stdenv.mkDerivation (rec {
 
   enableParallelBuilding = true;
 
-  # It doesn't build otherwise
-  dontDisableStatic = true;
-
   patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
               ./cygwin.patch;
 

From 99f32bad76f6ebbfaa85916a0548329f1b20cc01 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 13:31:11 +0200
Subject: [PATCH 1101/2016] gnome-mines: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  3 +++
 .../3.16/games/gnome-mines/default.nix        | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 7d2c73052d2..00a26e33b05 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -36,6 +36,7 @@ let
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
     tali quadrapassel gnome-sudoku aisleriot five-or-more
     four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
+    gnome-mines
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -309,6 +310,8 @@ let
 
   gnome-mahjongg = callPackage ./games/gnome-mahjongg { };
 
+  gnome-mines = callPackage ./games/gnome-mines { };
+
   gnome-sudoku = callPackage ./games/gnome-sudoku { };
 
   iagno = callPackage ./games/iagno { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
new file mode 100644
index 00000000000..e9af6c0fe4d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-mines-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-mines/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0f0496nhirvpw4zk8bcl24rb2v20cm3gw8d5ybmch42mscmjrb0p";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Mines;
+    description = "Clear hidden mines from a minefield";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From bf37974165cd2ab01f4aa4e48f7cbceb4a651d4a Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 13 Aug 2015 13:03:08 +0100
Subject: [PATCH 1102/2016] stoken: add new package

---
 pkgs/tools/security/stoken/default.nix | 35 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  4 +++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/tools/security/stoken/default.nix

diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix
new file mode 100644
index 00000000000..769c6799191
--- /dev/null
+++ b/pkgs/tools/security/stoken/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig
+, libxml2, nettle
+, withGTK3 ? true, gtk3 }:
+
+stdenv.mkDerivation rec {
+  pname = "stoken";
+  version = "v0.90";
+  name = "${pname}-${version}";
+  src = fetchFromGitHub {
+    owner = "cernekee";
+    repo = pname;
+    rev = version;
+    sha256 = "1k7wn8pmp7dv646g938dsr99090lsphl7zy4m9x7qbh2zlnnf9af";
+  };
+
+  preConfigure = ''
+    aclocal
+    libtoolize --automake --copy
+    autoheader
+    automake --add-missing --copy
+    autoconf
+  '';
+  buildInputs = [
+    autoconf automake libtool pkgconfig
+    libxml2 nettle
+  ] ++ (if withGTK3 then [ gtk3 ] else []);
+
+  meta = {
+    description = "Software Token for Linux/UNIX";
+    homepage = https://github.com/cernekee/stoken;
+    license = stdenv.lib.license.lgpl21Plus;
+    maintainers = [ stdenv.lib.maintainers.fuuzetsu ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e564899d2f1..3e34e61cebf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3063,6 +3063,10 @@ let
 
   stress-ng = callPackage ../tools/system/stress-ng { };
 
+  stoken = callPackage ../tools/security/stoken {
+    withGTK3 = config.stoken.withGTK3 or true;
+  };
+
   storeBackup = callPackage ../tools/backup/store-backup { };
 
   stow = callPackage ../tools/misc/stow { };

From e2e21ef3208fc1fae6139985304f4e46492ac99a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Aug 2015 14:08:01 +0200
Subject: [PATCH 1103/2016] nvidia-x11-legacy{340,304}: fix build with
 linux-3.18

Close #9218.
It's our default kernel (now and for the upcoming release).
- 304 won't build with 4.1,
- 173 didn't even build with 3.14 due to other issues (3.12 is OK ATM)
- all legacy drivers are up-to-date with upstream releases.
---
 pkgs/os-specific/linux/nvidia-x11/legacy304.nix               | 2 ++
 .../linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch           | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
index d5e350a0302..7f13b6795d4 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation {
 
   builder = ./builder-legacy304.sh;
 
+  patches = [ ./nvidia-340.76-kernel-4.0.patch ];
+
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
index c959190023b..5fdc1fed727 100644
--- a/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
+++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
@@ -4,7 +4,7 @@
      unsigned long cr0 = read_cr0();
      write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
      wbinvd();
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
      *cr4 = read_cr4();
      if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
 +#else
@@ -18,7 +18,7 @@
      wbinvd();
      __flush_tlb();
      write_cr0((cr0 & 0x9fffffff));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
      if (cr4 & 0x80) write_cr4(cr4);
 +#else
 +    if (cr4 & 0x80) __write_cr4(cr4);

From 7307f5c01154df0ab5448d20efb2cfa84fc3e267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Aug 2015 14:18:36 +0200
Subject: [PATCH 1104/2016] stoken: fix evaluation (licence), refactor a little

I hope @fuuzetsu doesn't mind the refactoring.
BTW, do you know about `autoreconfHook`? It might save the preConfigure
and most buildInputs.
---
 pkgs/tools/security/stoken/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix
index 769c6799191..17652e220da 100644
--- a/pkgs/tools/security/stoken/default.nix
+++ b/pkgs/tools/security/stoken/default.nix
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
   buildInputs = [
     autoconf automake libtool pkgconfig
     libxml2 nettle
-  ] ++ (if withGTK3 then [ gtk3 ] else []);
+  ] ++ stdenv.lib.optional withGTK3 gtk3;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Software Token for Linux/UNIX";
     homepage = https://github.com/cernekee/stoken;
-    license = stdenv.lib.license.lgpl21Plus;
-    maintainers = [ stdenv.lib.maintainers.fuuzetsu ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.lgpl21Plus;
+    maintainers = [ maintainers.fuuzetsu ];
+    platforms = platforms.all;
   };
 }

From 745c60dfaa202a992d77dac4d17461c4827b55ed Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 13 Aug 2015 15:19:20 +0300
Subject: [PATCH 1105/2016] haskell packages: fix webkit build

cc @peti
---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c9d81e3ddb1..5957ce812ac 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -259,14 +259,8 @@ self: super: {
   gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk];
   gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
 
-  # webkit does not recognize its system library build input any more.
-  webkit = markBroken super.webkit; # http://hydra.cryp.to/build/1041942/nixlog/1/raw
-  ghcjs-dom-hello = dontDistribute super.ghcjs-dom-hello;       # depends on broken webkit
-  ghcjs-dom = dontDistribute super.ghcjs-dom;                   # depends on broken webkit
-  jsaddle-hello = dontDistribute super.jsaddle-hello;           # depends on broken webkit
-  reflex-dom = dontDistribute super.reflex-dom;                 # depends on broken webkit
-
   # Need WebkitGTK, not just webkit.
+  webkit = super.webkit.override { webkit = pkgs.webkitgtk2; };
   webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; };
   webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
   websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };

From ae8b67037e43ed7016fcf6ae1e526c389492b08e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Aug 2015 14:25:26 +0200
Subject: [PATCH 1106/2016] privateer: improve meta, but mark as broken

I didn't succeed to make it build, so I don't push the partial attempt.
---
 pkgs/games/privateer/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix
index bb67f422c9d..2eb3a916eb3 100644
--- a/pkgs/games/privateer/default.nix
+++ b/pkgs/games/privateer/default.nix
@@ -28,10 +28,16 @@ stdenv.mkDerivation {
     cp vegastrike $out/bin
     cp vegaserver $out/bin
   '';
-  
-  meta = {
+
+  meta = with stdenv.lib; {
     homepage = http://privateer.sourceforge.net/;
-    longDescription = "";
-    maintainers = with stdenv.lib.maintainers; [ chaoflow ];
+    description = "Adventure space flight simulation computer game";
+    license = licenses.gpl2Plus; # and a special license for art data
+    # https://sourceforge.net/p/privateer/code/HEAD/tree/privgold/trunk/data/art-license.txt
+
+    maintainers = with maintainers; [ chaoflow ];
+    platforms = with platforms; linux ++ darwin;
+    hydraPlatforms = [];
+    broken = true; # it won't build
   };
 }

From d12563475acaf53ccca65b5c02e0d751c3f3f9f2 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Thu, 13 Aug 2015 08:13:31 -0400
Subject: [PATCH 1107/2016] libreoffice: improvements.

Icons no longer missing (fix #5509).

In `*.desktop` files:

 -  Replaced absolute path to the the store by the program name.

    This is so that files can be dragged elsewhere by the user
    (e.g.: desktop, bar) and still work after upgrade + garbage
    collection and can be shared between machines.

 -  Replace program name `soffice` by program name `libreoffice`
    so that we're sure the desktop file really refers to our
    package's binary and not start office or open office.

Add the possibility of building without the help. This build is
not modular and take a really long time to complete so I want
a mean of improving shortcuts without having to rebuild the
whole thing (see #899). A wrapper script is the next step.

Tested (build and ran the program) with `en_US` only and
without the help module.
---
 pkgs/applications/office/libreoffice/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 833b93b8272..3f2e039bd56 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -18,6 +18,7 @@
 , libatomic_ops, graphite2, harfbuzz, libodfgen
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ]
+, withHelp ? true
 }:
 
 let
@@ -136,6 +137,8 @@ stdenv.mkDerivation rec {
     configureFlagsArray=(
       "--with-parallelism=$NIX_BUILD_CORES"
       "--with-lang=${langsSpaces}"
+      "${if withHelp then "" else "--without-help"}"
+      
     );
 
     chmod a+x ./bin/unpack-sources
@@ -176,13 +179,13 @@ stdenv.mkDerivation rec {
 
     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=$out/bin/soffice"
-      substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=$out/bin/soffice"
-      substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=$out/bin/soffice"
+      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/desktop"
+    cp -r sysui/desktop/icons  "$out/share"
     sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
   '';
 

From 61557fbe5da7c7baf04d25205607afd10b65cd91 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 14:42:20 +0200
Subject: [PATCH 1108/2016] gnome-nibbles: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++-
 .../3.16/games/gnome-nibbles/default.nix      | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 00a26e33b05..125ea206dda 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -36,7 +36,7 @@ let
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
     tali quadrapassel gnome-sudoku aisleriot five-or-more
     four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
-    gnome-mines
+    gnome-mines gnome-nibbles
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -312,6 +312,8 @@ let
 
   gnome-mines = callPackage ./games/gnome-mines { };
 
+  gnome-nibbles = callPackage ./games/gnome-nibbles { };
+
   gnome-sudoku = callPackage ./games/gnome-sudoku { };
 
   iagno = callPackage ./games/iagno { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
new file mode 100644
index 00000000000..8fde848fe1f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool
+, libxml2, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-nibbles-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-nibbles/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1384hc7vx3i1jkmc1pw1cjh61jymq9441ci1k06vjz62r9as1nmx";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+    librsvg libcanberra_gtk3 hicolor_icon_theme clutter_gtk
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Nibbles;
+    description = "Guide a worm around a maze";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From d92109247944666583d3173245d7b4a4bc201c09 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 14:53:26 +0200
Subject: [PATCH 1109/2016] gnome-robots: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++-
 .../3.16/games/gnome-robots/default.nix       | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 125ea206dda..697ddd261e0 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -36,7 +36,7 @@ let
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
     tali quadrapassel gnome-sudoku aisleriot five-or-more
     four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
-    gnome-mines gnome-nibbles
+    gnome-mines gnome-nibbles gnome-robots
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -314,6 +314,8 @@ let
 
   gnome-nibbles = callPackage ./games/gnome-nibbles { };
 
+  gnome-robots = callPackage ./games/gnome-robots { };
+
   gnome-sudoku = callPackage ./games/gnome-sudoku { };
 
   iagno = callPackage ./games/iagno { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
new file mode 100644
index 00000000000..a4f94518425
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, libcanberra_gtk3, intltool, itstool, libxml2
+, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-robots-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-robots/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0dhzl1rhn4ysp3s3j0lxsiw64acz0w1n1bljrfln9s07x8nj17nx";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3
+    libxml2 hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Robots;
+    description = "Avoid the robots and make them crash into each other";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From b24734ff10e1a9b1681a260f47cfdef0cf2e0b9c Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 15:02:32 +0200
Subject: [PATCH 1110/2016] gnome-tetravex: init at 3.16.0

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 +++-
 .../3.16/games/gnome-tetravex/default.nix     | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 697ddd261e0..0442438354e 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -36,7 +36,7 @@ let
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
     tali quadrapassel gnome-sudoku aisleriot five-or-more
     four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
-    gnome-mines gnome-nibbles gnome-robots
+    gnome-mines gnome-nibbles gnome-robots gnome-tetravex
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -318,6 +318,8 @@ let
 
   gnome-sudoku = callPackage ./games/gnome-sudoku { };
 
+  gnome-tetravex = callPackage ./games/gnome-tetravex { };
+
   iagno = callPackage ./games/iagno { };
 
   lightsoff = callPackage ./games/lightsoff { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
new file mode 100644
index 00000000000..37654f8fa33
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, libxml2, intltool, itstool, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-tetravex-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-tetravex/${gnome3.version}/${name}.tar.xz";
+    sha256 = "07cmcmrd5fj8vm682894gra2vj8jwx01n3ggjinl93yv4gwpplz9";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Tetravex;
+    description = "Complete the puzzle by matching numbered tiles";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From 2d94468b2b3e1d9eb3a38bc4c1e0353871554ad3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Aug 2015 15:11:32 +0200
Subject: [PATCH 1111/2016] Bump version, hopefully for the last time

---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index 8e0b5950288..49aab0cba12 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-15.07
\ No newline at end of file
+15.08
\ No newline at end of file

From 0eb925465d00a99c196796d314f7497865048006 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 15:09:41 +0200
Subject: [PATCH 1112/2016] gnome3.hitori: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  3 +++
 .../gnome-3/3.16/games/hitori/default.nix     | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/hitori/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 0442438354e..44034449fb0 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -37,6 +37,7 @@ let
     tali quadrapassel gnome-sudoku aisleriot five-or-more
     four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
     gnome-mines gnome-nibbles gnome-robots gnome-tetravex
+    hitori
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -320,6 +321,8 @@ let
 
   gnome-tetravex = callPackage ./games/gnome-tetravex { };
 
+  hitori = callPackage ./games/hitori { };
+
   iagno = callPackage ./games/iagno { };
 
   lightsoff = callPackage ./games/lightsoff { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
new file mode 100644
index 00000000000..d409ac1b3c3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, libxml2, intltool, itstool, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "hitori-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz";
+    sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+    hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Hitori;
+    description = "GTK+ application to generate and let you play games of Hitori";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From 3b95ae79cd4687c1d738a4ae8cb7915849a6af5b Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 15:57:01 +0200
Subject: [PATCH 1113/2016] gnome-weather: init at 3.16.2

---
 .../3.16/apps/gnome-weather/default.nix       | 24 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
new file mode 100644
index 00000000000..fff9ea5c08b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs
+, libgweather, intltool, itstool, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-weather-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-weather/${gnome3.version}/${name}.tar.xz";
+    sha256 = "14dx5zj9200qpsb7byfrjkw3144s0q0nmaw5c6ni7vpa8kmvbrac";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook gjs intltool itstool
+    libgweather hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Weather;
+    description = "Access current weather conditions and forecasts";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 44034449fb0..0a8b688ac6d 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -30,7 +30,7 @@ let
     gnome-system-log gnome-system-monitor
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
-    nautilus-sendto dconf-editor vinagre
+    nautilus-sendto dconf-editor vinagre gnome-weather
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -280,6 +280,8 @@ let
     gegl = gegl_0_3;
   };
 
+  gnome-weather = callPackage ./apps/gnome-weather { };
+
   nautilus-sendto = callPackage ./apps/nautilus-sendto { };
 
   polari = callPackage ./apps/polari { };

From 978d4be3ab351f408e48c9519464bb5c730ca39d Mon Sep 17 00:00:00 2001
From: Badi' Abdul-Wahid <abdulwahidc@gmail.com>
Date: Thu, 13 Aug 2015 10:11:36 -0400
Subject: [PATCH 1114/2016] colordiff: support Darwin as a platform

This change just adds darwin to the supported platforms attribute of
the package.
---
 pkgs/tools/text/colordiff/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix
index 18eae754f4f..89bbd862dad 100644
--- a/pkgs/tools/text/colordiff/default.nix
+++ b/pkgs/tools/text/colordiff/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting";
     homepage = http://www.colordiff.org/;
     license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainer = with maintainers; [ nckx ];
   };
 }

From 014d6583e7ccf81e447941af8ae88342b61d8e57 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 16:22:19 +0200
Subject: [PATCH 1115/2016] gnome-taquin: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++-
 .../3.16/games/gnome-taquin/default.nix       | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 0a8b688ac6d..2314ca0751d 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -37,7 +37,7 @@ let
     tali quadrapassel gnome-sudoku aisleriot five-or-more
     four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
     gnome-mines gnome-nibbles gnome-robots gnome-tetravex
-    hitori
+    hitori gnome-taquin
   ];
 
   inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -321,6 +321,8 @@ let
 
   gnome-sudoku = callPackage ./games/gnome-sudoku { };
 
+  gnome-taquin = callPackage ./games/gnome-taquin { };
+
   gnome-tetravex = callPackage ./games/gnome-tetravex { };
 
   hitori = callPackage ./games/hitori { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
new file mode 100644
index 00000000000..31b74cd285e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, libcanberra_gtk3, intltool, itstool, libxml2
+, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-taquin-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-taquin/${gnome3.version}/${name}.tar.xz";
+    sha256 = "024a1ing1iclmyhi5vlps6xna84vgy7s098h9yvzq43fsahmx8pi";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3
+    intltool itstool libxml2 hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Taquin;
+    description = "Move tiles so that they reach their places";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}

From 01b455dd660a1abbd23f4915c9769d8fb08d90e8 Mon Sep 17 00:00:00 2001
From: Christine Dodrill <xena@yolo-swag.com>
Date: Thu, 13 Aug 2015 00:33:52 -0700
Subject: [PATCH 1116/2016] nim: 0.11 -> 0.11.2

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

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 3da27d72814..6444b7feeb8 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "nim-0.11.0";
+  name = "nim-0.11.2";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "http://nim-lang.org/download/${name}.zip";
-    sha256 = "0l19rrp6nhwhr2z33np4x32c35iba0hhv6w3qwj1sk8bjfpvz4cw";
+    sha256 = "0ay8gkd8fki3d8kbnw2px7rjdlr54kyqh5n1rjhq4vjmqs2wg5s4";
   };
 
   buildPhase   = "sh build.sh";

From 8885889b48f2c67d72d4dfd5fd3db9e51ac76a3a Mon Sep 17 00:00:00 2001
From: danshapero <shapero.daniel@gmail.com>
Date: Wed, 12 Aug 2015 20:44:14 +0200
Subject: [PATCH 1117/2016] metis: init at 5.1.0

---
 .../libraries/science/math/metis/default.nix  | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/metis/default.nix

diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix
new file mode 100644
index 00000000000..3ce94f28ac2
--- /dev/null
+++ b/pkgs/development/libraries/science/math/metis/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, unzip, cmake }:
+
+stdenv.mkDerivation {
+  name = "metis-5.1.0";
+
+  src = fetchurl {
+    url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz";
+    sha256 = "1cjxgh41r8k6j029yxs8msp3z6lcnpm16g5pvckk35kc7zhfpykn";
+  };
+
+  cmakeFlags = [ "-DGKLIB_PATH=../GKlib" ];
+  buildInputs = [ unzip cmake ];
+
+  meta = {
+    description = "Serial graph partitioning and fill-reducing matrix ordering";
+    homepage = http://glaros.dtc.umn.edu/gkhome/metis/metis/overview;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95152c65de9..231b6d7d8c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14316,6 +14316,8 @@ let
 
   sage = callPackage ../applications/science/math/sage { };
 
+  metis = callPackage ../development/libraries/science/math/metis {};
+
   suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { };
   suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {};
   suitesparse = suitesparse_4_4;

From 5f067a0e6136811221e7533c9afceeb43b6c6dc7 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 16:53:52 +0200
Subject: [PATCH 1118/2016] gnome-logs: init at 3.16.2

---
 .../gnome-3/3.16/apps/gnome-logs/default.nix  | 24 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
new file mode 100644
index 00000000000..23c77395a82
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, intltool, itstool, libxml2, systemd, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-logs-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-logs/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0732jbvih5d678idvhlgqik9j9y594agwdx6gwap80459k1a6fg1";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+    systemd hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Logs;
+    description = "A log viewer for the systemd journal";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 2314ca0751d..9d8c12b70bd 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -30,7 +30,7 @@ let
     gnome-system-log gnome-system-monitor
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
-    nautilus-sendto dconf-editor vinagre gnome-weather
+    nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -272,6 +272,8 @@ let
 
   gnome-documents = callPackage ./apps/gnome-documents { };
 
+  gnome-logs = callPackage ./apps/gnome-logs { };
+
   gnome-maps = callPackage ./apps/gnome-maps { };
 
   gnome-music = callPackage ./apps/gnome-music { };

From bbc4f8e141729666a93a90f58d1a35a18b1156de Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 17:30:34 +0200
Subject: [PATCH 1119/2016] gnome-devel-docs: init at 3.16.2

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  2 ++
 .../devtools/gnome-devel-docs/default.nix     | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 9d8c12b70bd..7ac522efe06 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -301,6 +301,8 @@ let
 
   gdl = callPackage ./devtools/gdl { };
 
+  gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };
+
 #### Games
 
   aisleriot = callPackage ./games/aisleriot { };
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix
new file mode 100644
index 00000000000..0daa0405b69
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-devel-docs-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1jkh40ya5mqss57p27b1hv77x5qis4zc377pyvzqa5wkzrvd0nls";
+  };
+
+  buildInputs = [ intltool itstool libxml2 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/GNOME/gnome-devel-docs;
+    description = "Developer documentation for GNOME";
+    maintainers = gnome3.maintainers;
+    license = licenses.fdl12;
+    platforms = platforms.linux;
+  };
+}

From e42786f1ba838152f12a1f68fb36a88a9bc5936f Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 17:46:50 +0200
Subject: [PATCH 1120/2016] gnome3: Add gnome-maps to optionalPackages

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

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 7ac522efe06..947b661f270 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -31,6 +31,7 @@ let
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
+    gnome-maps
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno

From cbe6badab9a6d03fe9d87c4f21e636e606741dac Mon Sep 17 00:00:00 2001
From: Szczyp <qb@szczyp.com>
Date: Thu, 13 Aug 2015 16:56:49 +0200
Subject: [PATCH 1121/2016] rhc: init at 1.36.4

OpenShift client tools
Add szczyp as a maintainer
---
 lib/maintainers.nix                     |  1 +
 pkgs/development/tools/rhc/Gemfile      |  2 +
 pkgs/development/tools/rhc/Gemfile.lock | 35 +++++++++
 pkgs/development/tools/rhc/default.nix  | 17 +++++
 pkgs/development/tools/rhc/gemset.nix   | 95 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 +
 6 files changed, 152 insertions(+)
 create mode 100644 pkgs/development/tools/rhc/Gemfile
 create mode 100644 pkgs/development/tools/rhc/Gemfile.lock
 create mode 100644 pkgs/development/tools/rhc/default.nix
 create mode 100644 pkgs/development/tools/rhc/gemset.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 5c0846fdc96..4f45db810e2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -236,6 +236,7 @@
   sprock = "Roger Mason <rmason@mun.ca>";
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
   stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
+  szczyp = "Szczyp <qb@szczyp.com>";
   sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
   tailhook = "Paul Colomiets <paul@colomiets.name>";
   taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
diff --git a/pkgs/development/tools/rhc/Gemfile b/pkgs/development/tools/rhc/Gemfile
new file mode 100644
index 00000000000..ad167c7422f
--- /dev/null
+++ b/pkgs/development/tools/rhc/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'rhc'
diff --git a/pkgs/development/tools/rhc/Gemfile.lock b/pkgs/development/tools/rhc/Gemfile.lock
new file mode 100644
index 00000000000..83fa877550d
--- /dev/null
+++ b/pkgs/development/tools/rhc/Gemfile.lock
@@ -0,0 +1,35 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    commander (4.2.1)
+      highline (~> 1.6.11)
+    highline (1.6.21)
+    httpclient (2.6.0.1)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    net-ssh-multi (1.2.1)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    open4 (1.3.4)
+    rhc (1.36.4)
+      archive-tar-minitar
+      commander (>= 4.0, < 4.3.0)
+      highline (~> 1.6.11)
+      httpclient (>= 2.4.0)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.0.11, < 2.9.3)
+      net-ssh-multi (>= 1.2.0)
+      open4
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rhc
+
+BUNDLED WITH
+   1.10.5
diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix
new file mode 100644
index 00000000000..e9efdb9f423
--- /dev/null
+++ b/pkgs/development/tools/rhc/default.nix
@@ -0,0 +1,17 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv {
+  name = "rhc-1.36.4";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
+    homepage = https://github.com/openshift/rhc;
+    description = "OpenShift client tools";
+    license = licenses.asl20;
+    maintaners = maintainers.szczyp;
+  };
+}
diff --git a/pkgs/development/tools/rhc/gemset.nix b/pkgs/development/tools/rhc/gemset.nix
new file mode 100644
index 00000000000..6b273396890
--- /dev/null
+++ b/pkgs/development/tools/rhc/gemset.nix
@@ -0,0 +1,95 @@
+{
+  "archive-tar-minitar" = {
+    version = "0.5.2";
+    source = {
+      type = "gem";
+      sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig";
+    };
+  };
+  "commander" = {
+    version = "4.2.1";
+    source = {
+      type = "gem";
+      sha256 = "1zwfhswnbhwv0zzj2b3s0qvpqijbbnmh7zvq6v0274rqbxyf1jwc";
+    };
+    dependencies = [
+      "highline"
+    ];
+  };
+  "highline" = {
+    version = "1.6.21";
+    source = {
+      type = "gem";
+      sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
+    };
+  };
+  "httpclient" = {
+    version = "2.6.0.1";
+    source = {
+      type = "gem";
+      sha256 = "0haz4s9xnzr73mkfpgabspj43bhfm9znmpmgdk74n6gih1xlrx1l";
+    };
+  };
+  "net-scp" = {
+    version = "1.2.1";
+    source = {
+      type = "gem";
+      sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
+    };
+    dependencies = [
+      "net-ssh"
+    ];
+  };
+  "net-ssh" = {
+    version = "2.9.2";
+    source = {
+      type = "gem";
+      sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r";
+    };
+  };
+  "net-ssh-gateway" = {
+    version = "1.2.0";
+    source = {
+      type = "gem";
+      sha256 = "1nqkj4wnj26r81rp3g4jqk7bkd2nqzjil3c9xqwchi0fsbwv2niy";
+    };
+    dependencies = [
+      "net-ssh"
+    ];
+  };
+  "net-ssh-multi" = {
+    version = "1.2.1";
+    source = {
+      type = "gem";
+      sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71";
+    };
+    dependencies = [
+      "net-ssh"
+      "net-ssh-gateway"
+    ];
+  };
+  "open4" = {
+    version = "1.3.4";
+    source = {
+      type = "gem";
+      sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1";
+    };
+  };
+  "rhc" = {
+    version = "1.36.4";
+    source = {
+      type = "gem";
+      sha256 = "1dkg39x3y3sxq71md5c8akq4y7ynjwcdy8ysm6d1k9b2rj0s5wdb";
+    };
+    dependencies = [
+      "archive-tar-minitar"
+      "commander"
+      "highline"
+      "httpclient"
+      "net-scp"
+      "net-ssh"
+      "net-ssh-multi"
+      "open4"
+    ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e34e61cebf..13a2ad7e746 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5734,6 +5734,8 @@ let
 
   remake = callPackage ../development/tools/build-managers/remake { };
 
+  rhc = callPackage ../development/tools/rhc { };
+
   rman = callPackage ../development/tools/misc/rman { };
 
   rr = callPackage ../development/tools/analysis/rr { };

From 26939eee7954792f9c0713983f3d63c49164fe73 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 13 Aug 2015 18:29:49 +0200
Subject: [PATCH 1122/2016] Remove unreferenced files

This commit removes files that are not referenced in nixpkgs anymore. I
have created this list by finding potential candidates using

  find nixpkgs/pkgs -type d -links 2 | parallel -N 1 'out=`grep -L {}  top-level/all-packages.nix`;  test -n "$out" && echo  {}'

and have then searched for those candidates with grep in whole nixpkgs.
---
 pkgs/applications/misc/hello/ex-1/builder.sh  |  9 ---
 pkgs/applications/misc/hello/ex-1/default.nix | 16 -----
 pkgs/development/libraries/libgdata/0.6.nix   | 51 ---------------
 .../libraries/libkolab/default.nix            | 25 --------
 .../libraries/libkolabxml/default.nix         | 25 --------
 .../development/libraries/libtidy/default.nix | 28 --------
 .../libraries/openexr_ctl/default.nix         | 21 ------
 .../libraries/pdf2htmlex/pdf2xml.patch        | 48 --------------
 .../libraries/ruby_gpgme/default.nix          | 64 -------------------
 .../libraries/ruby_ncursesw_sup/default.nix   | 48 --------------
 10 files changed, 335 deletions(-)
 delete mode 100644 pkgs/applications/misc/hello/ex-1/builder.sh
 delete mode 100644 pkgs/applications/misc/hello/ex-1/default.nix
 delete mode 100644 pkgs/development/libraries/libgdata/0.6.nix
 delete mode 100644 pkgs/development/libraries/libkolab/default.nix
 delete mode 100644 pkgs/development/libraries/libkolabxml/default.nix
 delete mode 100644 pkgs/development/libraries/libtidy/default.nix
 delete mode 100644 pkgs/development/libraries/openexr_ctl/default.nix
 delete mode 100644 pkgs/development/libraries/pdf2htmlex/pdf2xml.patch
 delete mode 100644 pkgs/development/libraries/ruby_gpgme/default.nix
 delete mode 100644 pkgs/development/libraries/ruby_ncursesw_sup/default.nix

diff --git a/pkgs/applications/misc/hello/ex-1/builder.sh b/pkgs/applications/misc/hello/ex-1/builder.sh
deleted file mode 100644
index 08bba946cce..00000000000
--- a/pkgs/applications/misc/hello/ex-1/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-PATH=$perl/bin:$PATH
-
-tar xvfz $src
-cd hello-*
-./configure --prefix=$out
-make
-make install
diff --git a/pkgs/applications/misc/hello/ex-1/default.nix b/pkgs/applications/misc/hello/ex-1/default.nix
deleted file mode 100644
index 51b2ccb58ed..00000000000
--- a/pkgs/applications/misc/hello/ex-1/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl, perl}:
-
-stdenv.mkDerivation {
-  name = "hello-2.1.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = mirror://gnu/hello/hello-2.1.1.tar.gz;
-    md5 = "70c9ccf9fac07f762c24f2df2290784d";
-  };
-  inherit perl;
-
-  meta = {
-    description = "GNU Hello, a classic computer science tool";
-    homepage = http://www.gnu.org/software/hello/;
-  };
-}
diff --git a/pkgs/development/libraries/libgdata/0.6.nix b/pkgs/development/libraries/libgdata/0.6.nix
deleted file mode 100644
index 4ce95505f8f..00000000000
--- a/pkgs/development/libraries/libgdata/0.6.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-x@{builderDefsPackage
-  , glib, libsoup, libxml2, pkgconfig, intltool, perl
-  , libtasn1, nettle, gmp
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="libgdata";
-    majorVersion="0.6";
-    minorVersion="6";
-    version="${majorVersion}.${minorVersion}";
-    name="${baseName}-${version}";
-    url="mirror://gnome/sources/${baseName}/${majorVersion}/${name}.tar.bz2";
-    hash="cf6de3b60443faaf8e9c3b4c4b160c22a48df7925c1c793a7bb71d3d746f69f5";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  meta = {
-    description = "GData API library";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.lgpl21Plus;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/${sourceInfo.baseName}/${sourceInfo.majorVersion}";
-    };
-  };
-}) x
-
diff --git a/pkgs/development/libraries/libkolab/default.nix b/pkgs/development/libraries/libkolab/default.nix
deleted file mode 100644
index 3475b22d26d..00000000000
--- a/pkgs/development/libraries/libkolab/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl,
- cmake, qt4, clucene_core, librdf_redland, libiodbc
-, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "libkolab-0.4.2";
-
-  src = fetchurl {
-    url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz";
-    sha256 = "1wdbg42s14p472dn35n6z638i6n64f6mjjxmjam1r54pzsdykks6";
-  };
-
-  # We disable the Java backend, since we do not need them and they make the closure size much bigger
-#  buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    homepage = http://soprano.sourceforge.net/;
-    description = "An object-oriented C++/Qt4 framework for RDF data";
-    license = "LGPL";
-    maintainers = with stdenv.lib.maintainers; [ phreedo ];
-    inherit (qt4.meta) platforms;
-  };
-}
diff --git a/pkgs/development/libraries/libkolabxml/default.nix b/pkgs/development/libraries/libkolabxml/default.nix
deleted file mode 100644
index c0217abd786..00000000000
--- a/pkgs/development/libraries/libkolabxml/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, boost, curl, cmake, xercesc, qt4
-#, qt4, clucene_core, librdf_redland, libiodbc
-, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "libkolabxml-0.8.4";
-
-  src = fetchurl {
-    url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz";
-    sha256 = "08gdhimnrhizpbvddj7cyz4jwwxrx5a70vz29cy989qgym2vn72q";
-  };
-
-  buildInputs = [ boost curl xercesc ];
-#  buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    homepage = http://soprano.sourceforge.net/;
-    description = "An object-oriented C++/Qt4 framework for RDF data";
-    license = "LGPL";
-    maintainers = with stdenv.lib.maintainers; [ phreedo ];
-    inherit (qt4.meta) platforms;
-  };
-}
diff --git a/pkgs/development/libraries/libtidy/default.nix b/pkgs/development/libraries/libtidy/default.nix
deleted file mode 100644
index 412f34008f1..00000000000
--- a/pkgs/development/libraries/libtidy/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, lib, fetchcvs, cmake, libtool, automake, autoconf }:
-
-stdenv.mkDerivation rec {
-  name = "libtidy-${version}";
-
-  version = "1.46";
-
-  src = fetchcvs {
-    cvsRoot = ":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy";
-    module  = "tidy";
-    date    = "2009-03-25";
-    sha256  = "0bnxn1qgjx1pfyn2q4y24yj1gwqq5bxwf5ksjljqzqzrmjv3q46x";
-  };
-
-  preConfigure = ''
-    source build/gnuauto/setup.sh
-  '';
-
-  buildInputs = [ libtool automake autoconf ];
-
-  meta = with lib; {
-    description = "Validate, correct, and pretty-print HTML files";
-    homepage    = http://tidy.sourceforge.net;
-    license     = licenses.mit;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ cstrahan ];
-  };
-}
diff --git a/pkgs/development/libraries/openexr_ctl/default.nix b/pkgs/development/libraries/openexr_ctl/default.nix
deleted file mode 100644
index cd26aae660c..00000000000
--- a/pkgs/development/libraries/openexr_ctl/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, openexr, ilmbase, ctl }:
-
-stdenv.mkDerivation {
-  name = "openexr_ctl-1.0.1";
-
-  src = fetchurl {
-    url = mirror://sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz;
-    sha256 = "1jg9smpaplal8l14djp184wzk11nwd3dvm4lhkp69kjgw8jdd21d";
-  };
-
-  propagatedBuildInputs = [ ilmbase ];
-  
-  buildInputs = [ openexr ctl ];
-  
-  configureFlags = "--with-ilmbase-prefix=${ilmbase}";
-
-  meta = {
-    description = "Color Transformation Language";
-    homepage = http://ampasctl.sourceforge.net;
-  };
-}
diff --git a/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch b/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch
deleted file mode 100644
index 596a3aea674..00000000000
--- a/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -rc pdf2xml/pdf2xml/Makefile.linux pdf2xml-new/pdf2xml/Makefile.linux
-*** pdf2xml/Makefile.linux	2008-02-07 17:43:10.000000000 +0100
---- pdf2xml-new/Makefile.linux	2010-08-25 15:41:23.000000000 +0200
-***************
-*** 30,36 ****
-  
-  
-  # Executable name
-! PDFTOXMLEXE=pdftoxml.exe
-  
-  # Main target
-  all: pdftoxmlEXE
---- 30,36 ----
-  
-  
-  # Executable name
-! PDFTOXMLEXE=pdftoxml
-  
-  # Main target
-  all: pdftoxmlEXE
-diff -rc pdf2xml/pdf2xml/src/pdftoxml.cc pdf2xml-new/pdf2xml/src/pdftoxml.cc
-*** pdf2xml/src/pdftoxml.cc	2010-04-26 10:58:01.000000000 +0200
---- pdf2xml-new/src/pdftoxml.cc	2010-08-25 15:36:15.000000000 +0200
-***************
-*** 11,21 ****
-  //
-  //===========================================================================
-  
-  #include <aconf.h>
-- #include <stdio.h>
-  #include <stdlib.h>
-  #include <stddef.h>
-! #include <string.h>
-  #include "parseargs.h"
-  #include "GString.h"
-  #include "gmem.h"
---- 11,21 ----
-  //
-  //===========================================================================
-  
-+ #include <string.h>
-  #include <aconf.h>
-  #include <stdlib.h>
-  #include <stddef.h>
-! #include <cstdio>
-  #include "parseargs.h"
-  #include "GString.h"
-  #include "gmem.h"
diff --git a/pkgs/development/libraries/ruby_gpgme/default.nix b/pkgs/development/libraries/ruby_gpgme/default.nix
deleted file mode 100644
index c5f2366bfa1..00000000000
--- a/pkgs/development/libraries/ruby_gpgme/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv, fetchurl, gpgme, ruby, rubygems, hoe }:
-
-stdenv.mkDerivation {
-  name = "ruby-gpgme-1.0.8";
-
-  src = fetchurl {
-    url = "https://github.com/ueno/ruby-gpgme/archive/1.0.8.tar.gz";
-    sha256 = "1j7jkl9s8iqcmxf3x6c9kljm19hw1jg6yvwbndmkw43qacdr9nxb";
-  };
-
-  meta = {
-    description = ''
-      Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made
-      Easy)
-    '';
-    homepage = "http://rubyforge.org/projects/ruby-gpgme/";
-    longDescription = ''
-      Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made Easy).
-
-      GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
-      easier for applications. It provides a High-Level Crypto API for
-      encryption, decryption, signing, signature verification and key
-      management.
-    '';
-  };
-
-  buildInputs = [ gpgme rubygems hoe ruby ];
-
-  buildPhase = ''
-    ${ruby}/bin/ruby extconf.rb
-    rake gem
-  '';
-
-  installPhase = ''
-    export HOME=$TMP/home; mkdir -pv "$HOME"
-
-    # For some reason, the installation phase doesn't work with the default
-    # make install command run by gem (we'll fix it and do it ourselves later)
-    gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
-        --bindir "$out/bin" --no-rdoc --no-ri pkg/gpgme-1.0.8.gem || true
-
-    # Create a bare-bones gemspec file so that ruby will recognise the gem
-    cat <<EOF >"$out/${ruby.gemPath}/specifications/gpgme.gemspec"
-    Gem::Specification.new do |s|
-      s.name              = 'gpgme'
-      s.version           = '1.0.8'
-      s.files             = Dir['{lib,examples}/**/*']
-      s.rubyforge_project = 'ruby-gpgme'
-      s.require_paths     = ['lib']
-    end
-    EOF
-
-    cd "$out/${ruby.gemPath}/gems/gpgme-1.0.8"
-    mkdir src
-    mv lib src
-    sed -i "s/srcdir = ./srcdir = src/" Makefile
-    make install
-
-    mv lib lib.bak
-    mv src/lib lib
-    rmdir src
-  '';
-}
-
diff --git a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix b/pkgs/development/libraries/ruby_ncursesw_sup/default.nix
deleted file mode 100644
index 8d55bafeb20..00000000000
--- a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl, ncurses, ruby, rubygems }:
-
-stdenv.mkDerivation rec {
-  name = "ncursesw-sup-${version}";
-  version = "1.4.6";
-
-  src = fetchurl {
-    url = "https://github.com/sup-heliotrope/ncursesw-ruby/archive/v${version}.tar.gz";
-    sha256 = "1fzmj5kqh2aql7r7jys8cyf7mb78kz71yc4a6gh74h9s8pybyhh7";
-  };
-
-  meta = {
-    description = ''
-      Hacked up version of ncurses gem that supports wide characters for
-      supmua.org
-    '';
-    homepage = ''http://github.com/sup-heliotrope/ncursesw-ruby'';
-    longDescription = ''
-      This wrapper provides access to the functions, macros, global variables
-      and constants of the ncurses library.  These are mapped to a Ruby Module
-      named "Ncurses":  Functions and external variables are implemented as
-      singleton functions of the Module Ncurses.
-    '';
-  };
-
-  buildInputs = [ ncurses rubygems ];
-
-  buildPhase = "gem build ncursesw.gemspec";
-
-  installPhase = ''
-    export HOME=$TMP/home; mkdir -pv "$HOME"
-
-    # For some reason, the installation phase doesn't work with the default
-    # make install command run by gem (we'll fix it and do it ourselves later)
-    gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
-        --bindir "$out/bin" --no-rdoc --no-ri ncursesw-${version}.gem || true
-
-    # Needed for ruby to recognise the gem
-    cp ncursesw.gemspec "$out/${ruby.gemPath}/specifications"
-
-    cd "$out/${ruby.gemPath}/gems/ncursesw-${version}"
-    mkdir src
-    mv lib src
-    sed -i "s/srcdir = ./srcdir = src/" Makefile
-    make install
-  '';
-}
-

From c1ee8fefd40bdd6acb3d0eb3ed27f47674fc33f9 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 9 Aug 2015 19:13:40 -0400
Subject: [PATCH 1123/2016] nixos: add support for Ubuntu Fan Networking

This provides support for Ubuntu Fan Networking [1].

This includes:

* The fanctl package, and a corresponding NixOS service.
* iproute patches.
* kernel patches.

closes #9188

1: https://wiki.ubuntu.com/FanNetworking
---
 nixos/modules/module-list.nix                 |   1 +
 .../services/networking/ubuntu-fan.nix        |  60 ++
 pkgs/os-specific/linux/fanctl/default.nix     |  47 ++
 pkgs/os-specific/linux/iproute/default.nix    |   6 +-
 .../linux/iproute/ubuntu-fan.patch            | 164 +++++
 pkgs/os-specific/linux/kernel/patches.nix     |  10 +
 .../linux/kernel/ubuntu-fan-3.patch           | 616 ++++++++++++++++++
 .../linux/kernel/ubuntu-fan-4.patch           | 616 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   4 +
 9 files changed, 1523 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/networking/ubuntu-fan.nix
 create mode 100644 pkgs/os-specific/linux/fanctl/default.nix
 create mode 100644 pkgs/os-specific/linux/iproute/ubuntu-fan.patch
 create mode 100644 pkgs/os-specific/linux/kernel/ubuntu-fan-3.patch
 create mode 100644 pkgs/os-specific/linux/kernel/ubuntu-fan-4.patch

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 93d378aa95f..733f3c5d853 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -344,6 +344,7 @@
   ./services/networking/tlsdated.nix
   ./services/networking/tox-bootstrapd.nix
   ./services/networking/tvheadend.nix
+  ./services/networking/ubuntu-fan.nix
   ./services/networking/unbound.nix
   ./services/networking/unifi.nix
   ./services/networking/vsftpd.nix
diff --git a/nixos/modules/services/networking/ubuntu-fan.nix b/nixos/modules/services/networking/ubuntu-fan.nix
new file mode 100644
index 00000000000..2759a671b81
--- /dev/null
+++ b/nixos/modules/services/networking/ubuntu-fan.nix
@@ -0,0 +1,60 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.networking.ubuntu-fan;
+  modprobe = "${config.system.sbin.modprobe}/sbin/modprobe";
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    networking.ubuntu-fan = {
+
+      enable = mkEnableOption "Ubuntu FAN Networking";
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.fanctl ];
+
+    systemd.services.ubuntu-fan = {
+      description = "Ubuntu FAN Networking";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-online.target" ];
+      before = [ "docker.service" ];
+      restartIfChanged = false;
+      preStart = ''
+        if [ ! -f /proc/sys/net/fan/version ]; then
+          ${modprobe} ipip
+          if [ ! -f /proc/sys/net/fan/version ]; then
+            echo "The Ubuntu Fan Networking patches have not been applied to this kernel!" 1>&2
+            exit 1
+          fi
+        fi
+
+        mkdir -p /var/lib/ubuntu-fan
+      '';
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "${pkgs.fanctl}/bin/fanctl up -a";
+        ExecStop = "${pkgs.fanctl}/bin/fanctl down -a";
+      };
+    };
+
+  };
+
+}
diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix
new file mode 100644
index 00000000000..f0b863e0148
--- /dev/null
+++ b/pkgs/os-specific/linux/fanctl/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, lib, fetchbzr, makeWrapper, bridge-utils, iproute, dnsmasq, iptables, kmod, utillinux }:
+
+stdenv.mkDerivation rec {
+  name = "fanctl-${version}";
+
+  version = "0.3.0";
+
+  src = fetchbzr {
+    url = "https://code.launchpad.net/~ubuntu-branches/ubuntu/vivid/ubuntu-fan/vivid-updates";
+    rev = 2;
+    sha256 = "1vcr2rg99g7sx1zynhiggjzc9y9z591i4535hbm21dysy3cisp7i";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  # When given --conf-file="", dnsmasq still attempts to read /etc/dnsmasq.conf;
+  # if that files does not exist, dnsmasq subsequently fails,
+  # so we'll use /dev/null.
+  #
+  # Also, make sure /var/lib/ubuntu-fan exists before starting dnsmasq.
+  buildPhase = ''
+    substituteInPlace fanctl \
+      --replace '--conf-file= ' \
+                '--conf-file=/dev/null ' \
+      --replace '/var/lib/misc' \
+                '/var/lib/ubuntu-fan'
+
+    sed -i '/dnsmasq -u/i \
+    mkdir -p /var/lib/ubuntu-fan' fanctl
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/man/man8
+    cp fanctl.8 $out/man/man8
+    cp fanctl $out/bin
+    wrapProgram $out/bin/fanctl --prefix PATH : \
+      ${lib.makeSearchPath "bin" [ bridge-utils iproute dnsmasq iptables kmod utillinux ]};
+  '';
+
+  meta = with lib; {
+    description = "Ubuntu FAN network support enablement";
+    homepage = "https://launchpad.net/ubuntu/+source/ubuntu-fan";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 6fea4ba05e0..6f5ec27c638 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,4 +1,6 @@
-{ fetchurl, stdenv, flex, bison, db, iptables, pkgconfig }:
+{ fetchurl, stdenv, lib, flex, bison, db, iptables, pkgconfig
+, enableFan ? false
+}:
 
 stdenv.mkDerivation rec {
   name = "iproute2-4.1.1";
@@ -8,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0vz6m2k6hdrjlg4x0r3cd75lg9ysmndbsp35pm8494zvksc7l1vk";
   };
 
+  patches = lib.optionals enableFan [ ./ubuntu-fan.patch ];
+
   preConfigure = ''
     patchShebangs ./configure
     sed -e '/ARPDDIR/d' -i Makefile
diff --git a/pkgs/os-specific/linux/iproute/ubuntu-fan.patch b/pkgs/os-specific/linux/iproute/ubuntu-fan.patch
new file mode 100644
index 00000000000..e55425c2ce6
--- /dev/null
+++ b/pkgs/os-specific/linux/iproute/ubuntu-fan.patch
@@ -0,0 +1,164 @@
+This provides support for Ubuntu's Fan Networking [1].
+
+These patches were pulled from:
+https://code.launchpad.net/~ubuntu-branches/ubuntu/vivid/iproute2/vivid-proposed
+
+See revisions 18 and 19.
+
+[1] https://wiki.ubuntu.com/FanNetworking
+
+diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
+index 102ce7a..7b8f0e5 100644
+--- a/include/linux/if_tunnel.h
++++ b/include/linux/if_tunnel.h
+@@ -57,6 +57,9 @@ enum {
+ 	IFLA_IPTUN_ENCAP_FLAGS,
+ 	IFLA_IPTUN_ENCAP_SPORT,
+ 	IFLA_IPTUN_ENCAP_DPORT,
++
++	IFLA_IPTUN_FAN_UNDERLAY = 32,
++	IFLA_IPTUN_FAN_MAP = 33,
+ 	__IFLA_IPTUN_MAX,
+ };
+ #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
+@@ -131,4 +134,20 @@ enum {
+ };
+ 
+ #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)
++
++enum {
++	IFLA_FAN_UNSPEC,
++	IFLA_FAN_MAPPING,
++	__IFLA_FAN_MAX,
++};
++
++#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
++
++struct ip_tunnel_fan_map {
++	__be32		underlay;
++	__be32		overlay;
++	__u16		underlay_prefix;
++	__u16		overlay_prefix;
++};
++
+ #endif /* _IF_TUNNEL_H_ */
+diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
+index 9d6bc98..ec3f05d 100644
+--- a/ip/link_iptnl.c
++++ b/ip/link_iptnl.c
+@@ -49,6 +49,42 @@ static void usage(int sit)
+ 	print_usage(stderr, sit);
+ 	exit(-1);
+ }
++static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
++{
++	inet_prefix underlay, overlay;
++	struct ip_tunnel_fan_map map;
++	struct rtattr *nest;
++	char **argv = *argvp;
++	int argc = *argcp;
++
++	nest = addattr_nest(n, 1024, IFLA_IPTUN_FAN_MAP);
++	while (argc > 0) {
++		char *colon = strchr(*argv, ':');
++
++		if (!colon)
++			break;
++		*colon = '\0';
++
++		if (get_prefix(&overlay, *argv, AF_INET))
++			invarg("invalid fan-map overlay", *argv);
++		if (get_prefix(&underlay, colon + 1, AF_INET))
++			invarg("invalid fan-map underlay", colon + 1);
++		
++		memcpy(&map.underlay, underlay.data, 4);
++		map.underlay_prefix = underlay.bitlen;
++		memcpy(&map.overlay, overlay.data, 4);
++		map.overlay_prefix = overlay.bitlen;
++
++		argc--, argv++;
++
++		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));
++	}
++	addattr_nest_end(n, nest);
++
++	*argcp = argc;
++	*argvp = argv;
++	return 0;
++}
+ 
+ static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
+ 			      struct nlmsghdr *n)
+@@ -66,6 +102,7 @@ static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
+ 	__u32 link = 0;
+ 	__u32 laddr = 0;
+ 	__u32 raddr = 0;
++	__u32 underlay = 0;
+ 	__u8 ttl = 0;
+ 	__u8 tos = 0;
+ 	__u8 pmtudisc = 1;
+@@ -174,6 +211,13 @@ get_failed:
+ 				raddr = get_addr32(*argv);
+ 			else
+ 				raddr = 0;
++		} else if (strcmp(*argv, "underlay") == 0) {
++			NEXT_ARG();
++			underlay = get_addr32(*argv);
++		} else if (strcmp(*argv, "fan-map") == 0) {
++			NEXT_ARG();
++			if (fan_parse_map(&argc, &argv, n))
++				invarg("invalid fan-map", *argv);
+ 		} else if (strcmp(*argv, "local") == 0) {
+ 			NEXT_ARG();
+ 			if (strcmp(*argv, "any"))
+@@ -318,9 +362,32 @@ get_failed:
+ 		}
+ 	}
+ 
++	if (underlay)
++		addattr32(n, 1024, IFLA_IPTUN_FAN_UNDERLAY, underlay);
++
+ 	return 0;
+ }
+ 
++static void fan_print_map(FILE *f, struct rtattr *attr)
++{
++	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
++	struct ip_tunnel_fan_map *m;
++	struct rtattr *i;
++	int rem;
++
++	fprintf(f, "fan-map ");
++
++	rem = RTA_PAYLOAD(attr);
++	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
++		m = RTA_DATA(i);
++		fprintf(f, "%s/%d:%s/%d ",
++			rt_addr_n2a(AF_INET, sizeof(m->overlay), &m->overlay, b1, INET_ADDRSTRLEN),
++			m->overlay_prefix,
++			rt_addr_n2a(AF_INET, sizeof(m->overlay), &m->underlay, b2, INET_ADDRSTRLEN),
++			m->underlay_prefix);
++	}
++}
++
+ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
+ {
+ 	char s1[1024];
+@@ -349,6 +416,17 @@ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[
+ 
+ 	fprintf(f, "local %s ", local);
+ 
++	if (tb[IFLA_IPTUN_FAN_UNDERLAY]) {
++		unsigned addr = rta_getattr_u32(tb[IFLA_IPTUN_FAN_UNDERLAY]);
++
++		if (addr)
++			fprintf(f, "underlay %s ",
++				format_host(AF_INET, 4, &addr, s1, sizeof(s1)));
++	}
++
++	if (tb[IFLA_IPTUN_FAN_MAP])
++		fan_print_map(f, tb[IFLA_IPTUN_FAN_MAP]);
++
+ 	if (tb[IFLA_IPTUN_LINK] && rta_getattr_u32(tb[IFLA_IPTUN_LINK])) {
+ 		unsigned link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);
+ 		const char *n = if_indextoname(link, s2);
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 4ae1a4e4189..79d58a539f0 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -58,6 +58,16 @@ rec {
       patch = ./mips-ext3-n32.patch;
     };
 
+  ubuntu_fan =
+    { name = "ubuntu-fan";
+      patch = ./ubuntu-fan-3.patch;
+    };
+
+  ubuntu_fan_4 =
+    { name = "ubuntu-fan";
+      patch = ./ubuntu-fan-4.patch;
+    };
+
   tuxonice_3_10 = makeTuxonicePatch {
     version = "2013-11-07";
     kernelVersion = "3.10.18";
diff --git a/pkgs/os-specific/linux/kernel/ubuntu-fan-3.patch b/pkgs/os-specific/linux/kernel/ubuntu-fan-3.patch
new file mode 100644
index 00000000000..c80950d0614
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/ubuntu-fan-3.patch
@@ -0,0 +1,616 @@
+From f3c956096902669c3529cb01d40deb0c759ed94f Mon Sep 17 00:00:00 2001
+From: Jay Vosburgh <jay.vosburgh@canonical.com>
+Date: Wed, 1 Apr 2015 16:11:09 -0700
+Subject: [PATCH] UBUNTU: SAUCE: fan: Proof of concept implementation (v2)
+
+Modification to ipip tunnel driver to accept a new netlink option,
+IFLA_IPTUN_FAN_UNDERLAY, which provides a /16 network prefix and enables
+TX side destination address remapping for traffic entering the tunnel
+(to be encapsulated).
+
+For an overlay (inner) address Y.A.B.C, the transformation is F.G.A.B,
+where "F" and "G" are the first two octets of the underlay network (the
+network portion of a /16), "A" and "B" are the low order two octets of the
+underlay network host (the host portion of a /16), and "Y" is a configured
+first octet of the overlay network.
+
+E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay
+subnet 99.3.4.0/24.  An overlay network datagram from 99.3.4.5 to 99.6.7.8
+would be directed to underlay host 10.88.6.7, which hosts overlay network
+99.6.7.0/24.
+
+Includes net.fan.version sysctl as a sentinel for availability of the
+fan functionality.
+
+NOTE: this requires an updated iproute2 to facilitate configuration of
+the fan.
+
+BugLink: http://bugs.launchpad.net/bugs/1439706
+Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>
+[apw@canonical.com: move IFLA_IPTUN_FAN_UNDERLAY up to avoid clashing
+ with future feature additions.]
+Signed-off-by: Andy Whitcroft <apw@canonical.com>
+---
+ include/net/ip_tunnels.h       |   6 +++
+ include/uapi/linux/if_tunnel.h |   4 ++
+ net/ipv4/ipip.c                | 112 +++++++++++++++++++++++++++++++++++++++--
+ 3 files changed, 117 insertions(+), 5 deletions(-)
+
+diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
+index 25a59eb..d7eada2 100644
+--- a/include/net/ip_tunnels.h
++++ b/include/net/ip_tunnels.h
+@@ -51,6 +51,11 @@ struct ip_tunnel_dst {
+ 	__be32				 saddr;
+ };
+ 
++/* Underlay address prefix for ipip fan mode */
++struct ip_tunnel_fan {
++	u32			underlay;
++};
++
+ struct ip_tunnel {
+ 	struct ip_tunnel __rcu	*next;
+ 	struct hlist_node hash_node;
+@@ -82,6 +87,7 @@ struct ip_tunnel {
+ #endif
+ 	struct ip_tunnel_prl_entry __rcu *prl;	/* potential router list */
+ 	unsigned int		prl_count;	/* # of entries in PRL */
++	struct ip_tunnel_fan	fan;
+ 	int			ip_tnl_net_id;
+ 	struct gro_cells	gro_cells;
+ };
+diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
+index bd3cc11..8f7d269 100644
+--- a/include/uapi/linux/if_tunnel.h
++++ b/include/uapi/linux/if_tunnel.h
+@@ -57,6 +57,10 @@ enum {
+ 	IFLA_IPTUN_ENCAP_FLAGS,
+ 	IFLA_IPTUN_ENCAP_SPORT,
+ 	IFLA_IPTUN_ENCAP_DPORT,
++
++	__IFLA_IPTUN_VENDOR_BREAK,		/* Ensure new entries do not hit the below. */
++	IFLA_IPTUN_FAN_UNDERLAY=32,
++
+ 	__IFLA_IPTUN_MAX,
+ };
+ #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
+diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
+index 40403114..e3c27cd 100644
+--- a/net/ipv4/ipip.c
++++ b/net/ipv4/ipip.c
+@@ -209,13 +209,38 @@ drop:
+ }
+ 
+ /*
++ * Determine fan tunnel endpoint to send packet to, based on the inner IP
++ * address.  For an overlay (inner) address Y.A.B.C, the transformation is
++ * F.G.A.B, where "F" and "G" are the first two octets of the underlay
++ * network (the network portion of a /16), "A" and "B" are the low order
++ * two octets of the underlay network host (the host portion of a /16),
++ * and "Y" is a configured first octet of the overlay network.
++ *
++ * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay
++ * subnet 99.3.4.0/24.  An overlay network datagram from 99.3.4.5 to
++ * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts
++ * overlay network 99.6.7.0/24.
++ */
++static void ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)
++{
++	u32 daddr;
++
++	*iph = tunnel->parms.iph;
++
++	daddr = ntohl(ip_hdr(skb)->daddr);
++	iph->daddr = htonl((tunnel->fan.underlay & 0xffff0000) |
++			   ((daddr >> 8) & 0x0000ffff));
++}
++
++/*
+  *	This function assumes it is being called from dev_queue_xmit()
+  *	and that skb is filled properly by that function.
+  */
+ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
+ {
+ 	struct ip_tunnel *tunnel = netdev_priv(dev);
+-	const struct iphdr  *tiph = &tunnel->parms.iph;
++	const struct iphdr *tiph;
++	struct iphdr fiph;
+ 
+ 	if (unlikely(skb->protocol != htons(ETH_P_IP)))
+ 		goto tx_error;
+@@ -224,6 +249,13 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
+ 	if (IS_ERR(skb))
+ 		goto out;
+ 
++	if (tunnel->fan.underlay) {
++		ipip_build_fan_iphdr(tunnel, skb, &fiph);
++		tiph = &fiph;
++	} else {
++		tiph = &tunnel->parms.iph;
++	}
++
+ 	skb_set_inner_ipproto(skb, IPPROTO_IPIP);
+ 
+ 	ip_tunnel_xmit(skb, dev, tiph, tiph->protocol);
+@@ -377,21 +409,44 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],
+ 	return ret;
+ }
+ 
++static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,
++			    struct ip_tunnel_parm *parms)
++{
++	u32 net = t->fan.underlay;
++
++	if (!data[IFLA_IPTUN_FAN_UNDERLAY])
++		goto err_check;
++
++	net = ntohl(nla_get_be32(data[IFLA_IPTUN_FAN_UNDERLAY])) & 0xffff0000;
++
++err_check:
++	if (parms->iph.daddr && net)
++		return -EINVAL;
++
++	t->fan.underlay = net;
++
++	return 0;
++}
++
+ static int ipip_newlink(struct net *src_net, struct net_device *dev,
+ 			struct nlattr *tb[], struct nlattr *data[])
+ {
+ 	struct ip_tunnel_parm p;
+ 	struct ip_tunnel_encap ipencap;
++	struct ip_tunnel *t = netdev_priv(dev);
++	int err;
+ 
+ 	if (ipip_netlink_encap_parms(data, &ipencap)) {
+-		struct ip_tunnel *t = netdev_priv(dev);
+-		int err = ip_tunnel_encap_setup(t, &ipencap);
++		err = ip_tunnel_encap_setup(t, &ipencap);
+ 
+ 		if (err < 0)
+ 			return err;
+ 	}
+ 
+ 	ipip_netlink_parms(data, &p);
++	err = ipip_netlink_fan(data, t, &p);
++	if (err < 0)
++		return err;
+ 	return ip_tunnel_newlink(dev, tb, &p);
+ }
+ 
+@@ -400,16 +455,20 @@ static int ipip_changelink(struct net_device *dev, struct nlattr *tb[],
+ {
+ 	struct ip_tunnel_parm p;
+ 	struct ip_tunnel_encap ipencap;
++	struct ip_tunnel *t = netdev_priv(dev);
++	int err;
+ 
+ 	if (ipip_netlink_encap_parms(data, &ipencap)) {
+-		struct ip_tunnel *t = netdev_priv(dev);
+-		int err = ip_tunnel_encap_setup(t, &ipencap);
++		err = ip_tunnel_encap_setup(t, &ipencap);
+ 
+ 		if (err < 0)
+ 			return err;
+ 	}
+ 
+ 	ipip_netlink_parms(data, &p);
++	err = ipip_netlink_fan(data, t, &p);
++	if (err < 0)
++		return err;
+ 
+ 	if (((dev->flags & IFF_POINTOPOINT) && !p.iph.daddr) ||
+ 	    (!(dev->flags & IFF_POINTOPOINT) && p.iph.daddr))
+@@ -441,6 +500,8 @@ static size_t ipip_get_size(const struct net_device *dev)
+ 		nla_total_size(2) +
+ 		/* IFLA_IPTUN_ENCAP_DPORT */
+ 		nla_total_size(2) +
++		/* IFLA_IPTUN_FAN_UNDERLAY */
++		nla_total_size(4) +
+ 		0;
+ }
+ 
+@@ -468,6 +529,11 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)
+ 			tunnel->encap.flags))
+ 		goto nla_put_failure;
+ 
++	if (tunnel->fan.underlay)
++		if (nla_put_be32(skb, IFLA_IPTUN_FAN_UNDERLAY,
++				 htonl(tunnel->fan.underlay)))
++			goto nla_put_failure;
++
+ 	return 0;
+ 
+ nla_put_failure:
+@@ -485,6 +551,9 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
+ 	[IFLA_IPTUN_ENCAP_FLAGS]	= { .type = NLA_U16 },
+ 	[IFLA_IPTUN_ENCAP_SPORT]	= { .type = NLA_U16 },
+ 	[IFLA_IPTUN_ENCAP_DPORT]	= { .type = NLA_U16 },
++
++	[__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX]	= { .type = NLA_BINARY },
++	[IFLA_IPTUN_FAN_UNDERLAY]	= { .type = NLA_U32 },
+ };
+ 
+ static struct rtnl_link_ops ipip_link_ops __read_mostly = {
+@@ -524,6 +593,23 @@ static struct pernet_operations ipip_net_ops = {
+ 	.size = sizeof(struct ip_tunnel_net),
+ };
+ 
++#ifdef CONFIG_SYSCTL
++static struct ctl_table_header *ipip_fan_header;
++static unsigned int ipip_fan_version = 1;
++
++static struct ctl_table ipip_fan_sysctls[] = {
++	{
++		.procname	= "version",
++		.data		= &ipip_fan_version,
++		.maxlen		= sizeof(ipip_fan_version),
++		.mode		= 0444,
++		.proc_handler	= proc_dointvec,
++	},
++	{},
++};
++
++#endif /* CONFIG_SYSCTL */
++
+ static int __init ipip_init(void)
+ {
+ 	int err;
+@@ -542,9 +628,22 @@ static int __init ipip_init(void)
+ 	if (err < 0)
+ 		goto rtnl_link_failed;
+ 
++#ifdef CONFIG_SYSCTL
++	ipip_fan_header = register_net_sysctl(&init_net, "net/fan",
++					      ipip_fan_sysctls);
++	if (!ipip_fan_header) {
++		err = -ENOMEM;
++		goto sysctl_failed;
++	}
++#endif /* CONFIG_SYSCTL */
++
+ out:
+ 	return err;
+ 
++#ifdef CONFIG_SYSCTL
++sysctl_failed:
++	rtnl_link_unregister(&ipip_link_ops);
++#endif /* CONFIG_SYSCTL */
+ rtnl_link_failed:
+ 	xfrm4_tunnel_deregister(&ipip_handler, AF_INET);
+ xfrm_tunnel_failed:
+@@ -554,6 +653,9 @@ xfrm_tunnel_failed:
+ 
+ static void __exit ipip_fini(void)
+ {
++#ifdef CONFIG_SYSCTL
++	unregister_net_sysctl_table(ipip_fan_header);
++#endif /* CONFIG_SYSCTL */
+ 	rtnl_link_unregister(&ipip_link_ops);
+ 	if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET))
+ 		pr_info("%s: can't deregister tunnel\n", __func__);
+-- 
+2.4.1
+
+From 4ea8011656dfdd76e7a2391bdad47c06f85a9d02 Mon Sep 17 00:00:00 2001
+From: Andy Whitcroft <apw@canonical.com>
+Date: Tue, 21 Jul 2015 16:52:10 +0100
+Subject: [PATCH] UBUNTU: SAUCE: fan: tunnel multiple mapping mode (v3)
+
+Switch to a single tunnel for all mappings, this removes the limitations
+on how many mappings each tunnel can handle, and therefore how many Fan
+slices each local address may hold.
+
+NOTE: This introduces a new kernel netlink interface which needs updated
+iproute2 support.
+
+BugLink: http://bugs.launchpad.net/bugs/1470091
+Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>
+Signed-off-by: Andy Whitcroft <apw@canonical.com>
+Acked-by: Tim Gardner <tim.gardner@canonical.com>
+Acked-by: Brad Figg <brad.figg@canonical.com>
+Signed-off-by: Brad Figg <brad.figg@canonical.com>
+---
+ include/net/ip_tunnels.h       |  14 ++++-
+ include/uapi/linux/if_tunnel.h |  20 ++++++-
+ net/ipv4/ip_tunnel.c           |   7 ++-
+ net/ipv4/ipip.c                | 120 +++++++++++++++++++++++++++++++++--------
+ 4 files changed, 133 insertions(+), 28 deletions(-)
+
+diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
+index d7eada2..2f7bc8c 100644
+--- a/include/net/ip_tunnels.h
++++ b/include/net/ip_tunnels.h
+@@ -51,9 +51,18 @@ struct ip_tunnel_dst {
+ 	__be32				 saddr;
+ };
+ 
+-/* Underlay address prefix for ipip fan mode */
++/* A fan overlay /8 (250.0.0.0/8, for example) maps to exactly one /16
++ * underlay (10.88.0.0/16, for example).  Multiple local addresses within
++ * the /16 may be used, but a particular overlay may not span
++ * multiple underlay subnets.
++ *
++ * We store one underlay, indexed by the overlay's high order octet.
++ */
++#define FAN_OVERLAY_CNT		256
++
+ struct ip_tunnel_fan {
+-	u32			underlay;
++/*	u32 __rcu	*map;*/
++	u32		map[FAN_OVERLAY_CNT];
+ };
+ 
+ struct ip_tunnel {
+@@ -104,6 +113,7 @@ struct ip_tunnel {
+ #define TUNNEL_OAM		__cpu_to_be16(0x0200)
+ #define TUNNEL_CRIT_OPT		__cpu_to_be16(0x0400)
+ #define TUNNEL_OPTIONS_PRESENT	__cpu_to_be16(0x0800)
++#define TUNNEL_FAN		__cpu_to_be16(0x4000)
+ 
+ struct tnl_ptk_info {
+ 	__be16 flags;
+diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
+index 8f7d269..9625934 100644
+--- a/include/uapi/linux/if_tunnel.h
++++ b/include/uapi/linux/if_tunnel.h
+@@ -58,8 +58,8 @@ enum {
+ 	IFLA_IPTUN_ENCAP_SPORT,
+ 	IFLA_IPTUN_ENCAP_DPORT,
+ 
+-	__IFLA_IPTUN_VENDOR_BREAK,		/* Ensure new entries do not hit the below. */
+-	IFLA_IPTUN_FAN_UNDERLAY=32,
++	__IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */
++	IFLA_IPTUN_FAN_MAP = 33,
+ 
+ 	__IFLA_IPTUN_MAX,
+ };
+@@ -135,4 +135,20 @@ enum {
+ };
+ 
+ #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)
++
++enum {
++	IFLA_FAN_UNSPEC,
++	IFLA_FAN_MAPPING,
++	__IFLA_FAN_MAX,
++};
++
++#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
++
++struct ip_tunnel_fan_map {
++	__be32		underlay;
++	__be32		overlay;
++	__u16		underlay_prefix;
++	__u16		overlay_prefix;
++};
++
+ #endif /* _UAPI_IF_TUNNEL_H_ */
+diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
+index d3e4479..60bd10f 100644
+--- a/net/ipv4/ip_tunnel.c
++++ b/net/ipv4/ip_tunnel.c
+@@ -1078,6 +1078,11 @@ out:
+ }
+ EXPORT_SYMBOL_GPL(ip_tunnel_newlink);
+ 
++static int ip_tunnel_is_fan(struct ip_tunnel *tunnel)
++{
++	return tunnel->parms.i_flags & TUNNEL_FAN;
++}
++
+ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],
+ 			 struct ip_tunnel_parm *p)
+ {
+@@ -1087,7 +1092,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],
+ 	struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id);
+ 
+ 	if (dev == itn->fb_tunnel_dev)
+-		return -EINVAL;
++		return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL;
+ 
+ 	t = ip_tunnel_find(itn, p, dev->type);
+ 
+diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
+index e3c27cd..d6ebc66 100644
+--- a/net/ipv4/ipip.c
++++ b/net/ipv4/ipip.c
+@@ -107,6 +107,7 @@
+ #include <linux/init.h>
+ #include <linux/netfilter_ipv4.h>
+ #include <linux/if_ether.h>
++#include <linux/inetdevice.h>
+ 
+ #include <net/sock.h>
+ #include <net/ip.h>
+@@ -208,6 +209,11 @@ drop:
+ 	return 0;
+ }
+ 
++static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel)
++{
++	return tunnel->parms.i_flags & TUNNEL_FAN;
++}
++
+ /*
+  * Determine fan tunnel endpoint to send packet to, based on the inner IP
+  * address.  For an overlay (inner) address Y.A.B.C, the transformation is
+@@ -221,15 +227,20 @@ drop:
+  * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts
+  * overlay network 99.6.7.0/24.
+  */
+-static void ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)
++static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)
+ {
+-	u32 daddr;
+-
+-	*iph = tunnel->parms.iph;
++	unsigned int overlay;
++	u32 daddr, underlay;
+ 
+ 	daddr = ntohl(ip_hdr(skb)->daddr);
+-	iph->daddr = htonl((tunnel->fan.underlay & 0xffff0000) |
+-			   ((daddr >> 8) & 0x0000ffff));
++	overlay = daddr >> 24;
++	underlay = tunnel->fan.map[overlay];
++	if (!underlay)
++		return -EINVAL;
++
++	*iph = tunnel->parms.iph;
++	iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff));
++	return 0;
+ }
+ 
+ /*
+@@ -249,8 +260,9 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
+ 	if (IS_ERR(skb))
+ 		goto out;
+ 
+-	if (tunnel->fan.underlay) {
+-		ipip_build_fan_iphdr(tunnel, skb, &fiph);
++	if (ipip_tunnel_is_fan(tunnel)) {
++		if (ipip_build_fan_iphdr(tunnel, skb, &fiph))
++			goto tx_error;
+ 		tiph = &fiph;
+ 	} else {
+ 		tiph = &tunnel->parms.iph;
+@@ -409,21 +421,65 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],
+ 	return ret;
+ }
+ 
++static void ipip_fan_free_map(struct ip_tunnel *t)
++{
++	memset(&t->fan.map, 0, sizeof(t->fan.map));
++}
++
++static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map)
++{
++	u32 overlay, overlay_mask, underlay, underlay_mask;
++
++	if ((map->underlay_prefix && map->underlay_prefix != 16) ||
++	    (map->overlay_prefix && map->overlay_prefix != 8))
++		return -EINVAL;
++
++	overlay = ntohl(map->overlay);
++	overlay_mask = ntohl(inet_make_mask(map->overlay_prefix));
++
++	underlay = ntohl(map->underlay);
++	underlay_mask = ntohl(inet_make_mask(map->underlay_prefix));
++
++	if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask))
++		return -EINVAL;
++
++	if (!(overlay & overlay_mask) && (underlay & underlay_mask))
++		return -EINVAL;
++
++	t->parms.i_flags |= TUNNEL_FAN;
++
++	/* Special case: overlay 0 and underlay 0 clears all mappings */
++	if (!overlay && !underlay) {
++		ipip_fan_free_map(t);
++		return 0;
++	}
++
++	overlay >>= (32 - map->overlay_prefix);
++	t->fan.map[overlay] = underlay;
++
++	return 0;
++}
++	
++
+ static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,
+ 			    struct ip_tunnel_parm *parms)
+ {
+-	u32 net = t->fan.underlay;
+-
+-	if (!data[IFLA_IPTUN_FAN_UNDERLAY])
+-		goto err_check;
++	struct ip_tunnel_fan_map *map;
++	struct nlattr *attr;
++	int rem, rv;
+ 
+-	net = ntohl(nla_get_be32(data[IFLA_IPTUN_FAN_UNDERLAY])) & 0xffff0000;
++	if (!data[IFLA_IPTUN_FAN_MAP])
++		return 0;
+ 
+-err_check:
+-	if (parms->iph.daddr && net)
++	if (parms->iph.daddr)
+ 		return -EINVAL;
+ 
+-	t->fan.underlay = net;
++	nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) {
++		map = nla_data(attr);
++		rv = ipip_fan_set_map(t, map);
++		if (rv)
++			return rv;
++	}
+ 
+ 	return 0;
+ }
+@@ -500,8 +556,8 @@ static size_t ipip_get_size(const struct net_device *dev)
+ 		nla_total_size(2) +
+ 		/* IFLA_IPTUN_ENCAP_DPORT */
+ 		nla_total_size(2) +
+-		/* IFLA_IPTUN_FAN_UNDERLAY */
+-		nla_total_size(4) +
++		/* IFLA_IPTUN_FAN_MAP */
++		nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 +
+ 		0;
+ }
+ 
+@@ -529,10 +585,28 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)
+ 			tunnel->encap.flags))
+ 		goto nla_put_failure;
+ 
+-	if (tunnel->fan.underlay)
+-		if (nla_put_be32(skb, IFLA_IPTUN_FAN_UNDERLAY,
+-				 htonl(tunnel->fan.underlay)))
++	if (tunnel->parms.i_flags & TUNNEL_FAN) {
++		struct nlattr *fan_nest;
++		int i;
++
++		fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP);
++		if (!fan_nest)
+ 			goto nla_put_failure;
++		for (i = 0; i < 256; i++) {
++			if (tunnel->fan.map[i]) {
++				struct ip_tunnel_fan_map map;
++
++				map.underlay = htonl(tunnel->fan.map[i]);
++				map.underlay_prefix = 16;
++				map.overlay = htonl(i << 24);
++				map.overlay_prefix = 8;
++				if (nla_put(skb, IFLA_FAN_MAPPING,
++					    sizeof(map), &map))
++					goto nla_put_failure;
++			}
++		}
++		nla_nest_end(skb, fan_nest);
++	}
+ 
+ 	return 0;
+ 
+@@ -553,7 +627,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
+ 	[IFLA_IPTUN_ENCAP_DPORT]	= { .type = NLA_U16 },
+ 
+ 	[__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX]	= { .type = NLA_BINARY },
+-	[IFLA_IPTUN_FAN_UNDERLAY]	= { .type = NLA_U32 },
++	[IFLA_IPTUN_FAN_MAP]		= { .type = NLA_NESTED },
+ };
+ 
+ static struct rtnl_link_ops ipip_link_ops __read_mostly = {
+@@ -595,7 +669,7 @@ static struct pernet_operations ipip_net_ops = {
+ 
+ #ifdef CONFIG_SYSCTL
+ static struct ctl_table_header *ipip_fan_header;
+-static unsigned int ipip_fan_version = 1;
++static unsigned int ipip_fan_version = 3;
+ 
+ static struct ctl_table ipip_fan_sysctls[] = {
+ 	{
+-- 
+2.4.1
+
diff --git a/pkgs/os-specific/linux/kernel/ubuntu-fan-4.patch b/pkgs/os-specific/linux/kernel/ubuntu-fan-4.patch
new file mode 100644
index 00000000000..0050af6c252
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/ubuntu-fan-4.patch
@@ -0,0 +1,616 @@
+From f3c956096902669c3529cb01d40deb0c759ed94f Mon Sep 17 00:00:00 2001
+From: Jay Vosburgh <jay.vosburgh@canonical.com>
+Date: Wed, 1 Apr 2015 16:11:09 -0700
+Subject: [PATCH] UBUNTU: SAUCE: fan: Proof of concept implementation (v2)
+
+Modification to ipip tunnel driver to accept a new netlink option,
+IFLA_IPTUN_FAN_UNDERLAY, which provides a /16 network prefix and enables
+TX side destination address remapping for traffic entering the tunnel
+(to be encapsulated).
+
+For an overlay (inner) address Y.A.B.C, the transformation is F.G.A.B,
+where "F" and "G" are the first two octets of the underlay network (the
+network portion of a /16), "A" and "B" are the low order two octets of the
+underlay network host (the host portion of a /16), and "Y" is a configured
+first octet of the overlay network.
+
+E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay
+subnet 99.3.4.0/24.  An overlay network datagram from 99.3.4.5 to 99.6.7.8
+would be directed to underlay host 10.88.6.7, which hosts overlay network
+99.6.7.0/24.
+
+Includes net.fan.version sysctl as a sentinel for availability of the
+fan functionality.
+
+NOTE: this requires an updated iproute2 to facilitate configuration of
+the fan.
+
+BugLink: http://bugs.launchpad.net/bugs/1439706
+Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>
+[apw@canonical.com: move IFLA_IPTUN_FAN_UNDERLAY up to avoid clashing
+ with future feature additions.]
+Signed-off-by: Andy Whitcroft <apw@canonical.com>
+---
+ include/net/ip_tunnels.h       |   6 +++
+ include/uapi/linux/if_tunnel.h |   4 ++
+ net/ipv4/ipip.c                | 112 +++++++++++++++++++++++++++++++++++++++--
+ 3 files changed, 117 insertions(+), 5 deletions(-)
+
+diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
+index 25a59eb..d7eada2 100644
+--- a/include/net/ip_tunnels.h
++++ b/include/net/ip_tunnels.h
+@@ -51,6 +51,11 @@ struct ip_tunnel_dst {
+ 	__be32				 saddr;
+ };
+ 
++/* Underlay address prefix for ipip fan mode */
++struct ip_tunnel_fan {
++	u32			underlay;
++};
++
+ struct ip_tunnel {
+ 	struct ip_tunnel __rcu	*next;
+ 	struct hlist_node hash_node;
+@@ -82,6 +87,7 @@ struct ip_tunnel {
+ #endif
+ 	struct ip_tunnel_prl_entry __rcu *prl;	/* potential router list */
+ 	unsigned int		prl_count;	/* # of entries in PRL */
++	struct ip_tunnel_fan	fan;
+ 	int			ip_tnl_net_id;
+ 	struct gro_cells	gro_cells;
+ };
+diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
+index bd3cc11..8f7d269 100644
+--- a/include/uapi/linux/if_tunnel.h
++++ b/include/uapi/linux/if_tunnel.h
+@@ -57,6 +57,10 @@ enum {
+ 	IFLA_IPTUN_ENCAP_FLAGS,
+ 	IFLA_IPTUN_ENCAP_SPORT,
+ 	IFLA_IPTUN_ENCAP_DPORT,
++
++	__IFLA_IPTUN_VENDOR_BREAK,		/* Ensure new entries do not hit the below. */
++	IFLA_IPTUN_FAN_UNDERLAY=32,
++
+ 	__IFLA_IPTUN_MAX,
+ };
+ #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
+diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
+index 40403114..e3c27cd 100644
+--- a/net/ipv4/ipip.c
++++ b/net/ipv4/ipip.c
+@@ -209,13 +209,38 @@ drop:
+ }
+ 
+ /*
++ * Determine fan tunnel endpoint to send packet to, based on the inner IP
++ * address.  For an overlay (inner) address Y.A.B.C, the transformation is
++ * F.G.A.B, where "F" and "G" are the first two octets of the underlay
++ * network (the network portion of a /16), "A" and "B" are the low order
++ * two octets of the underlay network host (the host portion of a /16),
++ * and "Y" is a configured first octet of the overlay network.
++ *
++ * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay
++ * subnet 99.3.4.0/24.  An overlay network datagram from 99.3.4.5 to
++ * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts
++ * overlay network 99.6.7.0/24.
++ */
++static void ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)
++{
++	u32 daddr;
++
++	*iph = tunnel->parms.iph;
++
++	daddr = ntohl(ip_hdr(skb)->daddr);
++	iph->daddr = htonl((tunnel->fan.underlay & 0xffff0000) |
++			   ((daddr >> 8) & 0x0000ffff));
++}
++
++/*
+  *	This function assumes it is being called from dev_queue_xmit()
+  *	and that skb is filled properly by that function.
+  */
+ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
+ {
+ 	struct ip_tunnel *tunnel = netdev_priv(dev);
+-	const struct iphdr  *tiph = &tunnel->parms.iph;
++	const struct iphdr *tiph;
++	struct iphdr fiph;
+ 
+ 	if (unlikely(skb->protocol != htons(ETH_P_IP)))
+ 		goto tx_error;
+@@ -224,6 +249,13 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
+ 	if (IS_ERR(skb))
+ 		goto out;
+ 
++	if (tunnel->fan.underlay) {
++		ipip_build_fan_iphdr(tunnel, skb, &fiph);
++		tiph = &fiph;
++	} else {
++		tiph = &tunnel->parms.iph;
++	}
++
+ 	skb_set_inner_ipproto(skb, IPPROTO_IPIP);
+ 
+ 	ip_tunnel_xmit(skb, dev, tiph, tiph->protocol);
+@@ -377,21 +409,44 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],
+ 	return ret;
+ }
+ 
++static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,
++			    struct ip_tunnel_parm *parms)
++{
++	u32 net = t->fan.underlay;
++
++	if (!data[IFLA_IPTUN_FAN_UNDERLAY])
++		goto err_check;
++
++	net = ntohl(nla_get_be32(data[IFLA_IPTUN_FAN_UNDERLAY])) & 0xffff0000;
++
++err_check:
++	if (parms->iph.daddr && net)
++		return -EINVAL;
++
++	t->fan.underlay = net;
++
++	return 0;
++}
++
+ static int ipip_newlink(struct net *src_net, struct net_device *dev,
+ 			struct nlattr *tb[], struct nlattr *data[])
+ {
+ 	struct ip_tunnel_parm p;
+ 	struct ip_tunnel_encap ipencap;
++	struct ip_tunnel *t = netdev_priv(dev);
++	int err;
+ 
+ 	if (ipip_netlink_encap_parms(data, &ipencap)) {
+-		struct ip_tunnel *t = netdev_priv(dev);
+-		int err = ip_tunnel_encap_setup(t, &ipencap);
++		err = ip_tunnel_encap_setup(t, &ipencap);
+ 
+ 		if (err < 0)
+ 			return err;
+ 	}
+ 
+ 	ipip_netlink_parms(data, &p);
++	err = ipip_netlink_fan(data, t, &p);
++	if (err < 0)
++		return err;
+ 	return ip_tunnel_newlink(dev, tb, &p);
+ }
+ 
+@@ -400,16 +455,20 @@ static int ipip_changelink(struct net_device *dev, struct nlattr *tb[],
+ {
+ 	struct ip_tunnel_parm p;
+ 	struct ip_tunnel_encap ipencap;
++	struct ip_tunnel *t = netdev_priv(dev);
++	int err;
+ 
+ 	if (ipip_netlink_encap_parms(data, &ipencap)) {
+-		struct ip_tunnel *t = netdev_priv(dev);
+-		int err = ip_tunnel_encap_setup(t, &ipencap);
++		err = ip_tunnel_encap_setup(t, &ipencap);
+ 
+ 		if (err < 0)
+ 			return err;
+ 	}
+ 
+ 	ipip_netlink_parms(data, &p);
++	err = ipip_netlink_fan(data, t, &p);
++	if (err < 0)
++		return err;
+ 
+ 	if (((dev->flags & IFF_POINTOPOINT) && !p.iph.daddr) ||
+ 	    (!(dev->flags & IFF_POINTOPOINT) && p.iph.daddr))
+@@ -441,6 +500,8 @@ static size_t ipip_get_size(const struct net_device *dev)
+ 		nla_total_size(2) +
+ 		/* IFLA_IPTUN_ENCAP_DPORT */
+ 		nla_total_size(2) +
++		/* IFLA_IPTUN_FAN_UNDERLAY */
++		nla_total_size(4) +
+ 		0;
+ }
+ 
+@@ -468,6 +529,11 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)
+ 			tunnel->encap.flags))
+ 		goto nla_put_failure;
+ 
++	if (tunnel->fan.underlay)
++		if (nla_put_be32(skb, IFLA_IPTUN_FAN_UNDERLAY,
++				 htonl(tunnel->fan.underlay)))
++			goto nla_put_failure;
++
+ 	return 0;
+ 
+ nla_put_failure:
+@@ -485,6 +551,9 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
+ 	[IFLA_IPTUN_ENCAP_FLAGS]	= { .type = NLA_U16 },
+ 	[IFLA_IPTUN_ENCAP_SPORT]	= { .type = NLA_U16 },
+ 	[IFLA_IPTUN_ENCAP_DPORT]	= { .type = NLA_U16 },
++
++	[__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX]	= { .type = NLA_BINARY },
++	[IFLA_IPTUN_FAN_UNDERLAY]	= { .type = NLA_U32 },
+ };
+ 
+ static struct rtnl_link_ops ipip_link_ops __read_mostly = {
+@@ -524,6 +593,23 @@ static struct pernet_operations ipip_net_ops = {
+ 	.size = sizeof(struct ip_tunnel_net),
+ };
+ 
++#ifdef CONFIG_SYSCTL
++static struct ctl_table_header *ipip_fan_header;
++static unsigned int ipip_fan_version = 1;
++
++static struct ctl_table ipip_fan_sysctls[] = {
++	{
++		.procname	= "version",
++		.data		= &ipip_fan_version,
++		.maxlen		= sizeof(ipip_fan_version),
++		.mode		= 0444,
++		.proc_handler	= proc_dointvec,
++	},
++	{},
++};
++
++#endif /* CONFIG_SYSCTL */
++
+ static int __init ipip_init(void)
+ {
+ 	int err;
+@@ -542,9 +628,22 @@ static int __init ipip_init(void)
+ 	if (err < 0)
+ 		goto rtnl_link_failed;
+ 
++#ifdef CONFIG_SYSCTL
++	ipip_fan_header = register_net_sysctl(&init_net, "net/fan",
++					      ipip_fan_sysctls);
++	if (!ipip_fan_header) {
++		err = -ENOMEM;
++		goto sysctl_failed;
++	}
++#endif /* CONFIG_SYSCTL */
++
+ out:
+ 	return err;
+ 
++#ifdef CONFIG_SYSCTL
++sysctl_failed:
++	rtnl_link_unregister(&ipip_link_ops);
++#endif /* CONFIG_SYSCTL */
+ rtnl_link_failed:
+ 	xfrm4_tunnel_deregister(&ipip_handler, AF_INET);
+ xfrm_tunnel_failed:
+@@ -554,6 +653,9 @@ xfrm_tunnel_failed:
+ 
+ static void __exit ipip_fini(void)
+ {
++#ifdef CONFIG_SYSCTL
++	unregister_net_sysctl_table(ipip_fan_header);
++#endif /* CONFIG_SYSCTL */
+ 	rtnl_link_unregister(&ipip_link_ops);
+ 	if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET))
+ 		pr_info("%s: can't deregister tunnel\n", __func__);
+-- 
+2.4.1
+
+From 4ea8011656dfdd76e7a2391bdad47c06f85a9d02 Mon Sep 17 00:00:00 2001
+From: Andy Whitcroft <apw@canonical.com>
+Date: Tue, 21 Jul 2015 16:52:10 +0100
+Subject: [PATCH] UBUNTU: SAUCE: fan: tunnel multiple mapping mode (v3)
+
+Switch to a single tunnel for all mappings, this removes the limitations
+on how many mappings each tunnel can handle, and therefore how many Fan
+slices each local address may hold.
+
+NOTE: This introduces a new kernel netlink interface which needs updated
+iproute2 support.
+
+BugLink: http://bugs.launchpad.net/bugs/1470091
+Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>
+Signed-off-by: Andy Whitcroft <apw@canonical.com>
+Acked-by: Tim Gardner <tim.gardner@canonical.com>
+Acked-by: Brad Figg <brad.figg@canonical.com>
+Signed-off-by: Brad Figg <brad.figg@canonical.com>
+---
+ include/net/ip_tunnels.h       |  14 ++++-
+ include/uapi/linux/if_tunnel.h |  20 ++++++-
+ net/ipv4/ip_tunnel.c           |   7 ++-
+ net/ipv4/ipip.c                | 120 +++++++++++++++++++++++++++++++++--------
+ 4 files changed, 133 insertions(+), 28 deletions(-)
+
+diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
+index d7eada2..2f7bc8c 100644
+--- a/include/net/ip_tunnels.h
++++ b/include/net/ip_tunnels.h
+@@ -51,9 +51,18 @@ struct ip_tunnel_dst {
+ 	__be32				 saddr;
+ };
+ 
+-/* Underlay address prefix for ipip fan mode */
++/* A fan overlay /8 (250.0.0.0/8, for example) maps to exactly one /16
++ * underlay (10.88.0.0/16, for example).  Multiple local addresses within
++ * the /16 may be used, but a particular overlay may not span
++ * multiple underlay subnets.
++ *
++ * We store one underlay, indexed by the overlay's high order octet.
++ */
++#define FAN_OVERLAY_CNT		256
++
+ struct ip_tunnel_fan {
+-	u32			underlay;
++/*	u32 __rcu	*map;*/
++	u32		map[FAN_OVERLAY_CNT];
+ };
+ 
+ struct ip_tunnel {
+@@ -104,6 +113,7 @@ struct ip_tunnel {
+ #define TUNNEL_OAM		__cpu_to_be16(0x0200)
+ #define TUNNEL_CRIT_OPT		__cpu_to_be16(0x0400)
+ #define TUNNEL_GENEVE_OPT	__cpu_to_be16(0x0800)
+ #define TUNNEL_VXLAN_OPT	__cpu_to_be16(0x1000)
++#define TUNNEL_FAN		__cpu_to_be16(0x4000)
+ 
+ #define TUNNEL_OPTIONS_PRESENT	(TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT)
+diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h
+index 8f7d269..9625934 100644
+--- a/include/uapi/linux/if_tunnel.h
++++ b/include/uapi/linux/if_tunnel.h
+@@ -58,8 +58,8 @@ enum {
+ 	IFLA_IPTUN_ENCAP_SPORT,
+ 	IFLA_IPTUN_ENCAP_DPORT,
+ 
+-	__IFLA_IPTUN_VENDOR_BREAK,		/* Ensure new entries do not hit the below. */
+-	IFLA_IPTUN_FAN_UNDERLAY=32,
++	__IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */
++	IFLA_IPTUN_FAN_MAP = 33,
+ 
+ 	__IFLA_IPTUN_MAX,
+ };
+@@ -135,4 +135,20 @@ enum {
+ };
+ 
+ #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)
++
++enum {
++	IFLA_FAN_UNSPEC,
++	IFLA_FAN_MAPPING,
++	__IFLA_FAN_MAX,
++};
++
++#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
++
++struct ip_tunnel_fan_map {
++	__be32		underlay;
++	__be32		overlay;
++	__u16		underlay_prefix;
++	__u16		overlay_prefix;
++};
++
+ #endif /* _UAPI_IF_TUNNEL_H_ */
+diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
+index d3e4479..60bd10f 100644
+--- a/net/ipv4/ip_tunnel.c
++++ b/net/ipv4/ip_tunnel.c
+@@ -1078,6 +1078,11 @@ out:
+ }
+ EXPORT_SYMBOL_GPL(ip_tunnel_newlink);
+ 
++static int ip_tunnel_is_fan(struct ip_tunnel *tunnel)
++{
++	return tunnel->parms.i_flags & TUNNEL_FAN;
++}
++
+ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],
+ 			 struct ip_tunnel_parm *p)
+ {
+@@ -1087,7 +1092,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],
+ 	struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id);
+ 
+ 	if (dev == itn->fb_tunnel_dev)
+-		return -EINVAL;
++		return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL;
+ 
+ 	t = ip_tunnel_find(itn, p, dev->type);
+ 
+diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
+index e3c27cd..d6ebc66 100644
+--- a/net/ipv4/ipip.c
++++ b/net/ipv4/ipip.c
+@@ -107,6 +107,7 @@
+ #include <linux/init.h>
+ #include <linux/netfilter_ipv4.h>
+ #include <linux/if_ether.h>
++#include <linux/inetdevice.h>
+ 
+ #include <net/sock.h>
+ #include <net/ip.h>
+@@ -208,6 +209,11 @@ drop:
+ 	return 0;
+ }
+ 
++static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel)
++{
++	return tunnel->parms.i_flags & TUNNEL_FAN;
++}
++
+ /*
+  * Determine fan tunnel endpoint to send packet to, based on the inner IP
+  * address.  For an overlay (inner) address Y.A.B.C, the transformation is
+@@ -221,15 +227,20 @@ drop:
+  * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts
+  * overlay network 99.6.7.0/24.
+  */
+-static void ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)
++static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)
+ {
+-	u32 daddr;
+-
+-	*iph = tunnel->parms.iph;
++	unsigned int overlay;
++	u32 daddr, underlay;
+ 
+ 	daddr = ntohl(ip_hdr(skb)->daddr);
+-	iph->daddr = htonl((tunnel->fan.underlay & 0xffff0000) |
+-			   ((daddr >> 8) & 0x0000ffff));
++	overlay = daddr >> 24;
++	underlay = tunnel->fan.map[overlay];
++	if (!underlay)
++		return -EINVAL;
++
++	*iph = tunnel->parms.iph;
++	iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff));
++	return 0;
+ }
+ 
+ /*
+@@ -249,8 +260,9 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
+ 	if (IS_ERR(skb))
+ 		goto out;
+ 
+-	if (tunnel->fan.underlay) {
+-		ipip_build_fan_iphdr(tunnel, skb, &fiph);
++	if (ipip_tunnel_is_fan(tunnel)) {
++		if (ipip_build_fan_iphdr(tunnel, skb, &fiph))
++			goto tx_error;
+ 		tiph = &fiph;
+ 	} else {
+ 		tiph = &tunnel->parms.iph;
+@@ -409,21 +421,65 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],
+ 	return ret;
+ }
+ 
++static void ipip_fan_free_map(struct ip_tunnel *t)
++{
++	memset(&t->fan.map, 0, sizeof(t->fan.map));
++}
++
++static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map)
++{
++	u32 overlay, overlay_mask, underlay, underlay_mask;
++
++	if ((map->underlay_prefix && map->underlay_prefix != 16) ||
++	    (map->overlay_prefix && map->overlay_prefix != 8))
++		return -EINVAL;
++
++	overlay = ntohl(map->overlay);
++	overlay_mask = ntohl(inet_make_mask(map->overlay_prefix));
++
++	underlay = ntohl(map->underlay);
++	underlay_mask = ntohl(inet_make_mask(map->underlay_prefix));
++
++	if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask))
++		return -EINVAL;
++
++	if (!(overlay & overlay_mask) && (underlay & underlay_mask))
++		return -EINVAL;
++
++	t->parms.i_flags |= TUNNEL_FAN;
++
++	/* Special case: overlay 0 and underlay 0 clears all mappings */
++	if (!overlay && !underlay) {
++		ipip_fan_free_map(t);
++		return 0;
++	}
++
++	overlay >>= (32 - map->overlay_prefix);
++	t->fan.map[overlay] = underlay;
++
++	return 0;
++}
++	
++
+ static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,
+ 			    struct ip_tunnel_parm *parms)
+ {
+-	u32 net = t->fan.underlay;
+-
+-	if (!data[IFLA_IPTUN_FAN_UNDERLAY])
+-		goto err_check;
++	struct ip_tunnel_fan_map *map;
++	struct nlattr *attr;
++	int rem, rv;
+ 
+-	net = ntohl(nla_get_be32(data[IFLA_IPTUN_FAN_UNDERLAY])) & 0xffff0000;
++	if (!data[IFLA_IPTUN_FAN_MAP])
++		return 0;
+ 
+-err_check:
+-	if (parms->iph.daddr && net)
++	if (parms->iph.daddr)
+ 		return -EINVAL;
+ 
+-	t->fan.underlay = net;
++	nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) {
++		map = nla_data(attr);
++		rv = ipip_fan_set_map(t, map);
++		if (rv)
++			return rv;
++	}
+ 
+ 	return 0;
+ }
+@@ -500,8 +556,8 @@ static size_t ipip_get_size(const struct net_device *dev)
+ 		nla_total_size(2) +
+ 		/* IFLA_IPTUN_ENCAP_DPORT */
+ 		nla_total_size(2) +
+-		/* IFLA_IPTUN_FAN_UNDERLAY */
+-		nla_total_size(4) +
++		/* IFLA_IPTUN_FAN_MAP */
++		nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 +
+ 		0;
+ }
+ 
+@@ -529,10 +585,28 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)
+ 			tunnel->encap.flags))
+ 		goto nla_put_failure;
+ 
+-	if (tunnel->fan.underlay)
+-		if (nla_put_be32(skb, IFLA_IPTUN_FAN_UNDERLAY,
+-				 htonl(tunnel->fan.underlay)))
++	if (tunnel->parms.i_flags & TUNNEL_FAN) {
++		struct nlattr *fan_nest;
++		int i;
++
++		fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP);
++		if (!fan_nest)
+ 			goto nla_put_failure;
++		for (i = 0; i < 256; i++) {
++			if (tunnel->fan.map[i]) {
++				struct ip_tunnel_fan_map map;
++
++				map.underlay = htonl(tunnel->fan.map[i]);
++				map.underlay_prefix = 16;
++				map.overlay = htonl(i << 24);
++				map.overlay_prefix = 8;
++				if (nla_put(skb, IFLA_FAN_MAPPING,
++					    sizeof(map), &map))
++					goto nla_put_failure;
++			}
++		}
++		nla_nest_end(skb, fan_nest);
++	}
+ 
+ 	return 0;
+ 
+@@ -553,7 +627,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
+ 	[IFLA_IPTUN_ENCAP_DPORT]	= { .type = NLA_U16 },
+ 
+ 	[__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX]	= { .type = NLA_BINARY },
+-	[IFLA_IPTUN_FAN_UNDERLAY]	= { .type = NLA_U32 },
++	[IFLA_IPTUN_FAN_MAP]		= { .type = NLA_NESTED },
+ };
+ 
+ static struct rtnl_link_ops ipip_link_ops __read_mostly = {
+@@ -595,7 +669,7 @@ static struct pernet_operations ipip_net_ops = {
+ 
+ #ifdef CONFIG_SYSCTL
+ static struct ctl_table_header *ipip_fan_header;
+-static unsigned int ipip_fan_version = 1;
++static unsigned int ipip_fan_version = 3;
+ 
+ static struct ctl_table ipip_fan_sysctls[] = {
+ 	{
+-- 
+2.4.1
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e34e61cebf..ea73c4a881f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9556,6 +9556,10 @@ let
 
   eject = utillinux;
 
+  fanctl = callPackage ../os-specific/linux/fanctl {
+    iproute = iproute.override { enableFan = true; };
+  };
+
   fatrace = callPackage ../os-specific/linux/fatrace { };
 
   ffadoFull = callPackage ../os-specific/linux/ffado { };

From a32e85984e023f6a08e7584256d94b445c5f634d Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 20:28:14 +0200
Subject: [PATCH 1124/2016] gnome-characters: init at 3.16.2

---
 .../3.16/apps/gnome-characters/default.nix    | 24 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix
new file mode 100644
index 00000000000..0c18f926e6d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, intltool, gjs, gdk_pixbuf, librsvg }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-characters-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-characters/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1gs5k32lmjpi4scb2i7pfnbsy8pl0gb9w1aypyy83hy6ydinaqc4";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
+    librsvg gnome3.defaultIconTheme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Design/Apps/CharacterMap;
+    description = "Simple utility application to find and insert unusual characters";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 947b661f270..3f554dbac1c 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -31,7 +31,7 @@ let
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
-    gnome-maps
+    gnome-maps gnome-characters
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -269,6 +269,8 @@ let
     spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
   };
 
+  gnome-characters = callPackage ./apps/gnome-characters { };
+
   gnome-clocks = callPackage ./apps/gnome-clocks { };
 
   gnome-documents = callPackage ./apps/gnome-documents { };

From 257db17ee950d2865529603d1388cf7fbb8a0a89 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 12 Aug 2015 17:18:58 -0700
Subject: [PATCH 1125/2016] Revert "Revert "texinfo: 5.2 -> 6.0""

This reverts commit dc74a811291ea5e29e47f7dcc01bdac118f492fb.

This doesn't actually break gcc.
---
 pkgs/development/tools/misc/texinfo/6.0.nix | 44 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  5 ++-
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/misc/texinfo/6.0.nix

diff --git a/pkgs/development/tools/misc/texinfo/6.0.nix b/pkgs/development/tools/misc/texinfo/6.0.nix
new file mode 100644
index 00000000000..ffeae17eb57
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/6.0.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }:
+
+stdenv.mkDerivation rec {
+  name = "texinfo-6.0";
+
+  src = fetchurl {
+    url = "mirror://gnu/texinfo/${name}.tar.xz";
+    sha256 = "1r3i6jyynn6ab45fxw5bms8mflk9ry4qpj6gqyry72vfd5c47fhi";
+  };
+
+  buildInputs = [ perl xz ]
+    ++ stdenv.lib.optional interactive ncurses;
+
+  preInstall = ''
+    installFlags="TEXMF=$out/texmf-dist";
+    installTargets="install install-tex";
+  '';
+
+  doCheck = !stdenv.isDarwin;
+
+  meta = {
+    homepage = "http://www.gnu.org/software/texinfo/";
+    description = "The GNU documentation system";
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.all;
+
+    longDescription = ''
+      Texinfo is the official documentation format of the GNU project.
+      It was invented by Richard Stallman and Bob Chassell many years
+      ago, loosely based on Brian Reid's Scribe and other formatting
+      languages of the time.  It is used by many non-GNU projects as
+      well.
+
+      Texinfo uses a single source file to produce output in a number
+      of formats, both online and printed (dvi, html, info, pdf, xml,
+      etc.).  This means that instead of writing different documents
+      for online information and another for a printed manual, you
+      need write only one document.  And when the work is revised, you
+      need revise only that one document.  The Texinfo system is
+      well-integrated with GNU Emacs.
+    '';
+    branch = "5.2";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6181925a507..2dd01957be7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5811,9 +5811,10 @@ let
   teensy-loader = callPackage ../development/tools/misc/teensy { };
 
   texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
-  texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
   texinfo4 = texinfo413;
-  texinfo = texinfo5;
+  texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
+  texinfo6 = callPackage ../development/tools/misc/texinfo/6.0.nix { };
+  texinfo = texinfo6;
   texinfoInteractive = appendToName "interactive" (
     texinfo.override { interactive = true; }
   );

From a74ddd8c280c6416a1d939c8cb3875414cb799c7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 13 Aug 2015 11:39:12 -0700
Subject: [PATCH 1126/2016] libinput: Don't enable documentation by default

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

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index f02b0af8270..bddbc589825 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig
 , libevdev, mtdev, udev
-, documentationSupport ? true, doxygen ? null, graphviz ? null # Documentation
+, documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
 , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
 , testsSupport ? false, check ? null, valgrind ? null
 }:

From bc9bd5c02c38d6c5ae5b2e62fd0fe21c767413c7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 13 Aug 2015 11:39:22 -0700
Subject: [PATCH 1127/2016] libinput: 0.20.0 -> 0.21.0

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

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index bddbc589825..528ef71cda4 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -15,11 +15,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-0.20.0";
+  name = "libinput-0.21.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0p8jswag33qjjxd8766hzk460bzhzhw32b6hl2i17aygjz7dynqp";
+    sha256 = "0l7mhdr50g11hxg2pz8ihsgzbm0810syj05d3555rzhda6g7mkkw";
   };
 
   configureFlags = [

From 7d414a064658a7fb87db94ca3d4a34e868c850d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 13 Aug 2015 10:12:52 +0200
Subject: [PATCH 1128/2016] nixos: add services.printing.snmpConf option

And set the default value to "Address @LOCAL". This change is needed to
find printers at my workplace (with "lpinfo -v" or the
"system-config-printer" GUI). Ubuntu 14.04 also has this as default.

snmp.conf does not seem to be needed in restartTriggers, because it is
not the cups daemon itself that reads it, but some helper programs that
it spawns on demand.
---
 nixos/modules/services/printing/cupsd.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index e743aa8a323..69c76cf97cf 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -160,6 +160,17 @@ in
         '';
       };
 
+      snmpConf = mkOption {
+        type = types.lines;
+        default = ''
+          Address @LOCAL
+        '';
+        description = ''
+          The contents of <filename>/etc/cups/snmp.conf</filename>. See "man
+          cups-snmp.conf" for a complete description.
+        '';
+      };
+
       drivers = mkOption {
         type = types.listOf types.path;
         example = literalExample "[ pkgs.splix ]";
@@ -199,6 +210,7 @@ in
     environment.etc."cups/cups-files.conf".text = cfg.cupsFilesConf;
     environment.etc."cups/cupsd.conf".text = cfg.cupsdConf;
     environment.etc."cups/cups-browsed.conf".text = cfg.browsedConf;
+    environment.etc."cups/snmp.conf".text = cfg.snmpConf;
 
     services.dbus.packages = [ cups ];
 

From 4df408c8be9477dbd0af2d23dc7d2fecf8c647ed Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 22:26:44 +0200
Subject: [PATCH 1129/2016] gnome-calendar: init at 3.16.2

---
 .../3.16/apps/gnome-calendar/default.nix      | 27 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
new file mode 100644
index 00000000000..043cd694bd4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, intltool, evolution_data_server, sqlite, libxml2, libsoup
+, glib }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-calendar-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-calendar/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0vqwps86whf8jgq7q4hdrbnmlaxppgrfa3j7n6ddpqzkb3gf2c5m";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server
+    sqlite libxml2 libsoup glib
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Calendar;
+    description = "Simple and beautiful calendar application for GNOME";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 3f554dbac1c..4f56077eff8 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -31,7 +31,7 @@ let
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
-    gnome-maps gnome-characters
+    gnome-maps gnome-characters gnome-calendar
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -269,6 +269,8 @@ let
     spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
   };
 
+  gnome-calendar = callPackage ./apps/gnome-calendar { };
+
   gnome-characters = callPackage ./apps/gnome-characters { };
 
   gnome-clocks = callPackage ./apps/gnome-clocks { };

From 0039622d64dde76cafe5a20e5ac9bb9c350ca582 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 23:36:27 +0200
Subject: [PATCH 1130/2016] pyatspi: init at 2.16.0

---
 .../python-modules/pyatspi/default.nix        | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyatspi/default.nix

diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
new file mode 100644
index 00000000000..3c39ca873e2
--- /dev/null
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, python3, python3Packages, at_spi2_core }:
+
+stdenv.mkDerivation rec {
+  version = "2.16.0";
+  name = "pyatspi-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/pyatspi/2.16/${name}.tar.xz";
+    sha256 = "185lwgv9bk1fc6vw2xypznzr7p8fhp84ggnrb706zwgalmy8aym6";
+  };
+
+  buildInputs = [
+    pkgconfig python3 python3Packages.pygobject3 at_spi2_core
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Python 3 bindings for at-spi";
+    homepage = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ jgeerds ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea73c4a881f..51f5b132631 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2742,6 +2742,8 @@ let
 
   pwnat = callPackage ../tools/networking/pwnat { };
 
+  pyatspi = callPackage ../development/python-modules/pyatspi { };
+
   pycangjie = callPackage ../development/python-modules/pycangjie { };
 
   pydb = callPackage ../development/tools/pydb { };

From 5d48d41e7c2411b49136c3232af9de6ccde97381 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 13 Aug 2015 23:51:30 +0200
Subject: [PATCH 1131/2016] gnome3.accerciser: init at 3.14.0

---
 .../gnome-3/3.16/apps/accerciser/default.nix  | 28 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
new file mode 100644
index 00000000000..294793d6af7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, itstool, libxml2, python3, python3Packages, pyatspi, at_spi2_core
+, dbus, intltool, libwnck3, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "accerciser-3.14.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/accerciser/3.14/${name}.tar.xz";
+    sha256 = "0x05gpajpcs01g7m34g6fxz8122cf9kx3k0lchwl34jy8xfr39gm";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi
+    python3Packages.pygobject3 python3Packages.ipythonLight
+    at_spi2_core dbus intltool libwnck3 hicolor_icon_theme
+  ];
+
+  wrapPrefixVariables = [ "PYTHONPATH" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Accerciser;
+    description = "Interactive Python accessibility explorer";
+    maintainers = gnome3.maintainers;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 4f56077eff8..4ff52d33ae5 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -31,7 +31,7 @@ let
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
-    gnome-maps gnome-characters gnome-calendar
+    gnome-maps gnome-characters gnome-calendar accerciser
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -248,6 +248,8 @@ let
 
 #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
 
+  accerciser = callPackage ./apps/accerciser { };
+
   bijiben = callPackage ./apps/bijiben {
     webkitgtk = webkitgtk24x;
   };

From 0bbe804f0af4e751787db167c4bf51bc5e00548e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 13 Aug 2015 15:00:18 -0700
Subject: [PATCH 1132/2016] epoxy: 1.2 -> 1.3.1

---
 pkgs/development/libraries/epoxy/default.nix | 24 ++++++++------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index 4798c50225d..66039daa479 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -1,24 +1,20 @@
-{ stdenv, fetchurl, autoconf, autogen, automake, gettext, libX11
-, mesa, pkgconfig, python, utilmacros
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python
+, mesa, libX11
 }:
 
 stdenv.mkDerivation rec {
   name = "epoxy-${version}";
-  version = "1.2";
+  version = "1.3.1";
 
-  src = fetchurl {
-    url = "https://github.com/anholt/libepoxy/archive/v${version}.tar.gz";
-    sha256 = "1xp8g6b7xlbym2rj4vkbl6xpb7ijq7glpv656mc7k9b01x22ihs2";
+  src = fetchFromGitHub {
+    owner = "anholt";
+    repo = "libepoxy";
+    rev = "v${version}";
+    sha256 = "0dfkd4xbp7v5gwsf6qwaraz54yzizf3lj5ymyc0msjn0adq3j5yl";
   };
 
-  buildInputs = [
-    autoconf autogen automake gettext libX11 mesa pkgconfig python
-    utilmacros
-  ];
-
-  configureScript = ''
-    ./autogen.sh --prefix="$out"
-  '';
+  nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ];
+  buildInputs = [ mesa libX11 ];
 
   meta = with stdenv.lib; {
     description = "A library for handling OpenGL function pointer management";

From 326d179c67d1978dcfe901223f17eb06a8f26162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Fri, 14 Aug 2015 00:47:09 +0100
Subject: [PATCH 1133/2016] Add Python package: plover-2.5.8

---
 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 3485503eddc..64bc886442f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8036,6 +8036,25 @@ let
     };
   });
 
+  plover = pythonPackages.buildPythonPackage rec {
+    name = "plover-${version}";
+    version = "2.5.8";
+    
+    meta = {
+      description = "OpenSteno Plover stenography software";
+      maintainers = [ maintainers.twey ];
+      license = licenses.gpl2;
+    };
+    
+    src = pkgs.fetchurl {
+      url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
+      sha256 = "23f7824a715f93eb2c41d5bafd0c6f3adda92998e9321e1ee029abe7a6ab41e5";
+    };
+    
+    propagatedBuildInputs = with self; [ wxPython pyserial xlib appdirs pkgs.wmctrl ];
+    preConfigure = "substituteInPlace setup.py --replace /usr/share usr/share";
+  };
+  
   pymysql = buildPythonPackage rec {
     name = "pymysql-${version}";
     version = "0.6.6";

From 273fb91b49f929b1dc8fbd584f7944df080282df Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 13 Aug 2015 14:59:56 +0200
Subject: [PATCH 1134/2016] miniupnpd: 1.9.{20150430 -> 20150721}

Drop removed libnfnetlink dependency and simplify build.

Don't yet update miniupnpc because it breaks bitcoin 0.11.
---
 pkgs/tools/networking/miniupnpd/default.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 11262460e71..0d852573eab 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchurl, iptables, libnfnetlink }:
+{ stdenv, fetchurl, iptables, pkgconfig }:
 
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-1.9.20150430";
+  name = "miniupnpd-1.9.20150721";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "0ajqs3lf2cgq5fm1v79fa23sbb623i89sqnx7d9cnqbqq5py1k71";
-    name = "miniupnpd-1.9.20150430.tar.gz";
+    sha256 = "0w2422wfcir333qd300swkdvmksdfdllspplnz8vbv13a1724h4k";
+    name = "${name}.tar.gz";
   };
 
-  buildInputs = [ iptables libnfnetlink ];
+  buildInputs = [ iptables ];
+  nativeBuildInputs= [ pkgconfig ];
 
-  NIX_CFLAGS_COMPILE = "-DIPTABLES_143";
-
-  NIX_CFLAGS_LINK = "-liptc -lnfnetlink";
+  NIX_CFLAGS_LINK = "-liptc";
 
   makefile = "Makefile.linux";
 
-  makeFlags = "LIBS=";
-
   buildFlags = "miniupnpd genuuid";
 
   installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";

From 0294f71f1fd84714f41144f3a2c2c9292ded1679 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 13 Aug 2015 22:42:33 +0200
Subject: [PATCH 1135/2016] fmit: 1.0.7 -> 1.0.8

Updated mainly to remove the now unnecessary version patching.

Your moment of zen:
https://github.com/gillesdegottex/fmit/blob/HEAD/src/CustomInstrumentTunerForm.cpp#L1047
---
 pkgs/applications/audio/fmit/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index f2328410be8..84ec955de3f 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -7,12 +7,12 @@
 assert alsaSupport -> alsaLib != null;
 assert jackSupport -> libjack2 != null;
 
-let version = "1.0.7"; in
+let version = "1.0.8"; in
 stdenv.mkDerivation {
   name = "fmit-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "14dzrrxjskhqamhfqhzp6napvc1vyjxcc0v8id1iqzsfdn86xqm9";
+    sha256 = "04s7xcgmi5g58lirr48vf203n1jwdxf981x1p6ysbax24qwhs2kd";
     rev = "v${version}";
     repo = "fmit";
     owner = "gillesdegottex";
@@ -22,10 +22,6 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional alsaSupport [ alsaLib ]
     ++ stdenv.lib.optional jackSupport [ libjack2 ];
 
-  postPatch = ''
-    substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
-  '';
-
   configurePhase = ''
     mkdir build
     cd build

From eb910bce5b88129be3526aabd2c0ef91ec30561d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 14 Aug 2015 00:06:11 +0200
Subject: [PATCH 1136/2016] perl-packages: Gtk2 1.2495 -> 1.2496

Upstream changes:
- Avoid registering a GType for GConnectFlags if not needed
- MANIFEST: added missing gtk-demo files
---
 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 90fd8b8370a..d107f33ae40 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4775,10 +4775,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Gtk2 = buildPerlPackage rec {
-    name = "Gtk2-1.2495";
+    name = "Gtk2-1.2496";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
-      sha256 = "1mpxkcy8j7r95z4g4xx6ggbgzaxj4zl0szz54y1k120z95rcgg3a";
+      sha256 = "1avn77m5hrdyy4k5sqgf870nsmykf6zlcn1haj8arjjl9yaxwic6";
     };
     buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Pango pkgs.gtk2 ];
     meta = {

From a913ad89c1b565c9e4ae5540a16e25140b600947 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 14 Aug 2015 01:27:53 +0200
Subject: [PATCH 1137/2016] eid-mw: 4.1.4 -> 4.1.5

---
 pkgs/tools/security/eid-mw/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index c039c41314d..c814e7094a9 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite
 , pkgconfig }:
 
-let version = "4.1.4"; in
+let version = "4.1.5"; in
 stdenv.mkDerivation {
   name = "eid-mw-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0v0p0kdjscvf4bn14dyny399k1bfsz8v7n8v16lv0q0xs5nwqnky";
+    sha256 = "0m2awjfj2vs3aahy1ygrxi7mx12bhr1a621kiiszzai38crpgwbj";
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     substituteInPlace $out/bin/eid-nssdb \
       --replace "modutil" "${nssTools}/bin/modutil"
 
-    # Only provides a useless "about-eid-mw.desktop" that segfaults:
+    # Only provides a useless "about-eid-mw.desktop" that segfaults anyway:
     rm -rf $out/share/applications $out/bin/about-eid-mw
   '';
 
@@ -55,6 +55,6 @@ stdenv.mkDerivation {
       and remove all ~/.pki and/or /etc/pki directories no longer needed.
     '';
     maintainers = with maintainers; [ nckx ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

From 9a3a70ed2bf842c97aed107dd1635023b48c507a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 13 Aug 2015 18:51:15 +0200
Subject: [PATCH 1138/2016] rote: init at 0.2.8

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

diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix
new file mode 100644
index 00000000000..b87d4ed4ee4
--- /dev/null
+++ b/pkgs/development/libraries/rote/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, ncurses }:
+
+let version = "0.2.8"; in
+stdenv.mkDerivation rec {
+  name = "rote-${version}";
+
+  src = fetchurl {
+    sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky";
+    url = "mirror://sourceforge/rote/${name}.tar.gz";
+  };
+
+  buildInputs = [ ncurses ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Our Own Terminal Emulation Library";
+    longDescription = ''
+      ROTE is a simple C library for VT102 terminal emulation. It allows the
+      programmer to set up virtual 'screens' and send them data. The virtual
+      screens will emulate the behavior of a VT102 terminal, interpreting
+      escape sequences, control characters and such. The library supports
+      ncurses as well so that you may render the virtual screen to the real
+      screen when you need to.
+    '';
+    homepage = http://rote.sourceforge.net/;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fe44ad421a..e9d675f5e8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8043,6 +8043,8 @@ let
 
   rocksdb = callPackage ../development/libraries/rocksdb { };
 
+  rote = callPackage ../development/libraries/rote { };
+
   rubberband = callPackage ../development/libraries/rubberband {
     inherit (vamp) vampSDK;
   };

From 26cac935b5e1af7dc9b81da931016d384cc34746 Mon Sep 17 00:00:00 2001
From: Mabry Cervin <mpcervin@uncg.edu>
Date: Thu, 13 Aug 2015 22:41:03 -0400
Subject: [PATCH 1139/2016] gohufont: init at 2.0

Removed unecessary deps
---
 pkgs/data/fonts/gohufont/default.nix | 29 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/data/fonts/gohufont/default.nix

diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
new file mode 100644
index 00000000000..450971524e6
--- /dev/null
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+
+stdenv.mkDerivation rec {
+  name = "gohufont-2.0";
+
+  src = fetchurl {
+    url = "http://font.gohu.org/gohufont-2.0.tar.gz";
+    sha256 = "0vi87fvj3m52piz2k6vqday03cah6zvz3dzrvjch3qjna1i1nb7s";
+  };
+
+  buildInputs = [ mkfontdir mkfontscale ];
+
+  installPhase = ''
+    fontDir="$out/share/fonts/misc"
+    mkdir -p "$fontDir"
+    mv *.pcf.gz "$fontDir"
+    cd "$fontDir"
+    mkfontdir
+    mkfontscale
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A monospace bitmap font well suited for programming and terminal use";
+    homepage = http://font.gohu.org/;
+    license = licenses.wtfpl;
+    maintainers = with maintainers; [ epitrochoid ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9d675f5e8e..23413feea81 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10493,6 +10493,8 @@ let
 
   geolite-legacy = callPackage ../data/misc/geolite-legacy { };
 
+  gohufont = callPackage ../data/fonts/gohufont { };
+
   gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { };
 
   inherit (gnome3) gsettings_desktop_schemas;

From 6fccef2be0e1e4fcf607dfb8514f1c40595a05a6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 14 Aug 2015 00:12:59 -0700
Subject: [PATCH 1140/2016] cmake: 3.3.0 -> 3.3.1

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

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index bb6029347aa..c39fa657f84 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -11,7 +11,7 @@ assert wantPS -> (ps != null);
 let
   os = stdenv.lib.optionalString;
   majorVersion = "3.3";
-  minorVersion = "0";
+  minorVersion = "1";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "0d0s4gpsqlzq18pzhzy0q8522nyhffhn593gil1lsyg0bxsjyz45";
+    sha256 = "1mp32dqywk4dfw7zmpgp31axszv7h74yk69g273z21q7d8n04rfd";
   };
 
   enableParallelBuilding = true;

From 90768003a48c92633731e930ced8852cddfe8ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Aug 2015 11:03:31 +0200
Subject: [PATCH 1141/2016] openscenegraph: update download url

The current one returns HTTP error 404.
---
 pkgs/development/libraries/openscenegraph/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index 5fb73eae276..476f7e14c60 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -17,7 +17,7 @@ let
     baseName="OpenSceneGraph";
     version="3.2.1";
     name="${baseName}-${version}";
-    url="http://www.openscenegraph.org/downloads/developer_releases/${name}.zip";
+    url="http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip";
     hash="0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr";
   };
 in

From f11d41666626624adeaf9222ce5253a26c5b1f9a Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 14 Aug 2015 11:22:38 +0200
Subject: [PATCH 1142/2016] gnome-nettool: init at 3.8.1

---
 .../3.16/apps/gnome-nettool/default.nix       | 27 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
new file mode 100644
index 00000000000..2b262c263ac
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, libgtop, intltool, itstool, libxml2, hicolor_icon_theme
+, nmap, inetutils }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-nettool-3.8.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz";
+    sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2
+    hicolor_icon_theme
+  ];
+
+  propagatedUserEnvPkgs = [ nmap inetutils ];
+
+  meta = with stdenv.lib; {
+    homepage = http://projects.gnome.org/gnome-network;
+    description = "A collection of networking tools";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 4ff52d33ae5..e9bfdee7b37 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -31,7 +31,7 @@ let
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
-    gnome-maps gnome-characters gnome-calendar accerciser
+    gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -285,6 +285,8 @@ let
 
   gnome-music = callPackage ./apps/gnome-music { };
 
+  gnome-nettool = callPackage ./apps/gnome-nettool { };
+
   gnome-photos = callPackage ./apps/gnome-photos {
     gegl = gegl_0_3;
   };

From 26db863cdaa24d16c354533fdf8ebc90df99fd51 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 14 Aug 2015 11:58:46 +0200
Subject: [PATCH 1143/2016] gnome3.devhelp: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++++
 .../gnome-3/3.16/devtools/devhelp/default.nix | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index e9bfdee7b37..d7cf6ad9de8 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -308,6 +308,10 @@ let
 
   anjuta = callPackage ./devtools/anjuta { };
 
+  devhelp = callPackage ./devtools/devhelp {
+    webkitgtk = webkitgtk24x;
+  };
+
   gdl = callPackage ./devtools/gdl { };
 
   gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
new file mode 100644
index 00000000000..bc352101383
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, webkitgtk, intltool, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "devhelp-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/devhelp/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0i8kyh86hzwxs8dm047ivghl2b92vigdxa3x4pk4ha0whpk38g37";
+  };
+
+  buildInputs = [
+    pkgconfig gtk3 wrapGAppsHook webkitgtk intltool hicolor_icon_theme
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://live.gnome.org/devhelp;
+    description = "API documentation browser for GNOME";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From a4b8cbd3d0a33545a10204d8d90cb3c41d1561e1 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 14 Aug 2015 12:49:39 +0200
Subject: [PATCH 1144/2016] gnome3.yelp: Add gstreamer plugins and use
 gapps-hook

The gstreamer plugins are required by gnome-getting-started-docs
---
 pkgs/desktops/gnome-3/3.16/core/yelp/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
index 5ca053d81b9..7f405707231 100644
--- a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
@@ -1,6 +1,7 @@
 { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
 , file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite
-, bash, makeWrapper, itstool, libxml2, libxslt, icu }:
+, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1
+, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "yelp-${gnome3.version}.1";
@@ -18,13 +19,8 @@ stdenv.mkDerivation rec {
                   libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
                   librsvg gdk_pixbuf gnome3.adwaita-icon-theme
                   hicolor_icon_theme gnome3.adwaita-icon-theme
-                  gnome3.gsettings_desktop_schemas ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/yelp" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
+                  gnome3.gsettings_desktop_schemas wrapGAppsHook
+                  gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Yelp;

From 1e364f993b159690fe0e705d0e7024bbcfd95101 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 14 Aug 2015 12:55:06 +0200
Subject: [PATCH 1145/2016] gnome-getting-started-docs: init at 3.16.2

---
 .../gnome-getting-started-docs/default.nix    | 20 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  3 +++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix
new file mode 100644
index 00000000000..7ab2ca89bc0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-getting-started-docs-${gnome3.version}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.version}/${name}.tar.xz";
+    sha256 = "07wz35r6p9nvlshwcyjvhjnzbaw3bzadlhwz51c8nky7m7pdgmyy";
+  };
+
+  buildInputs = [ intltool itstool libxml2 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://live.gnome.org/DocumentationProject;
+    description = "Help a new user get started in GNOME";
+    maintainers = gnome3.maintainers;
+    license = licenses.cc-by-sa-30;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index d7cf6ad9de8..8251526bbd5 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -32,6 +32,7 @@ let
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
     gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
+    gnome-getting-started-docs
   ];
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -279,6 +280,8 @@ let
 
   gnome-documents = callPackage ./apps/gnome-documents { };
 
+  gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { };
+
   gnome-logs = callPackage ./apps/gnome-logs { };
 
   gnome-maps = callPackage ./apps/gnome-maps { };

From 8d44a74cfe3f957a2efaef6d7aaf43b5595193d6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 14 Aug 2015 09:13:05 -0400
Subject: [PATCH 1146/2016] Add seaborn python package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3485503eddc..e19659b0df9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12352,6 +12352,22 @@ let
     };
   };
 
+  seaborn= buildPythonPackage rec {
+    name = "seaborn-0.6.0";
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/s/seaborn/${name}.tar.gz";
+      md5 = "bc518f1f45dadb9deb2bb57ca3af3cad";
+    };
+
+    propagatedBuildInputs = with self; [ pandas matplotlib ];
+
+    meta = {
+      description = "statisitical data visualization";
+      homepage = "http://stanford.edu/~mwaskom/software/seaborn/";
+      license     = "BSD";
+    };
+  };
+
   selenium = buildPythonPackage rec {
     name = "selenium-2.44.0";
     src = pkgs.fetchurl {

From 0799ebf5b793c89f65cec89ecfd8c0e234fe4cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 14 Aug 2015 15:49:06 +0200
Subject: [PATCH 1147/2016] gcc: fix parallel building (fixes #9212)

Tested building 5-times on an idle 8-core.
---
 .../development/compilers/gcc/4.9/default.nix |  2 +-
 .../gcc/4.9/parallel-strsignal.patch          | 61 +++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc/4.9/parallel-strsignal.patch

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 1e27546af63..d328308b063 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -67,7 +67,7 @@ let version = "4.9.3";
     enableParallelBuilding = !langFortran;
 
     patches = [ ]
-      ++ optional enableParallelBuilding ../parallel-bconfig.patch
+      ++ optionals enableParallelBuilding [ ../parallel-bconfig.patch ./parallel-strsignal.patch ]
       ++ optional (cross != null) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
diff --git a/pkgs/development/compilers/gcc/4.9/parallel-strsignal.patch b/pkgs/development/compilers/gcc/4.9/parallel-strsignal.patch
new file mode 100644
index 00000000000..4c98ca273a5
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.9/parallel-strsignal.patch
@@ -0,0 +1,61 @@
+gcc/Makefile.in: fix parallel building failure
+
+The gcc-ar.o, gcc-nm.o, gcc-ranlib.o and errors.o included
+config.h which was a generated file. But no explicity rule
+to clarify the dependency. There was potential building
+failure while parallel make.
+
+For gcc-ar.o, gcc-nm.o and gcc-ranlib.o, they were compiled from one C
+source file gcc-ar.c, we add them to ALL_HOST_BACKEND_OBJS, so the
+'$(ALL_HOST_OBJS) : | $(generated_files)' rule could work for these
+objects.
+
+For errors.o, it is part of gengtype, and the gengtype generator program
+is special: Two versions are built. One is for the build machine, and one
+is for the host. We refered what gengtype-parse.o did (which also is part
+of gengtype).
+
+[GCC #61899]
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61899
+
+Upstream-Status: Send to gcc-patches@gcc.gnu.org mailing list
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ gcc/Makefile.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 6475cba..56e50bb 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -1481,13 +1481,16 @@ OBJS-libcommon-target = $(common_out_object_file) prefix.o params.o \
+ 	opts.o opts-common.o options.o vec.o hooks.o common/common-targhooks.o \
+ 	hash-table.o file-find.o
+ 
++# Objects compiled from one C source file gcc-ar.c
++OBJS-gcc-ar = gcc-ar.o gcc-nm.o gcc-ranlib.o
++
+ # This lists all host objects for the front ends.
+ ALL_HOST_FRONTEND_OBJS = $(foreach v,$(CONFIG_LANGUAGES),$($(v)_OBJS))
+ 
+ ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) $(OBJS-libcommon) \
+   $(OBJS-libcommon-target) @TREEBROWSER@ main.o c-family/cppspec.o \
+   $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) $(GCOV_OBJS) $(GCOV_DUMP_OBJS) \
+-  lto-wrapper.o
++  lto-wrapper.o $(OBJS-gcc-ar)
+ 
+ # This lists all host object files, whether they are included in this
+ # compilation or not.
+@@ -2437,6 +2440,8 @@ gengtype-parse.o: $(CONFIG_H)
+ CFLAGS-build/gengtype-parse.o += -DGENERATOR_FILE
+ build/gengtype-parse.o: $(BCONFIG_H)
+ 
++errors.o : $(CONFIG_H)
++
+ gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \
+   gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \
+   $(XREGEX_H)
+-- 
+1.8.1.2
+

From 529596fd316fa6f31a9f39f537939c0bc971543f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 14 Aug 2015 09:49:41 -0400
Subject: [PATCH 1148/2016] Bump nix-exec for new nix

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

diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index 72641161c75..523dbdbecbf 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, nix, git }: let
-  version = "4.1.0";
+  version = "4.1.1";
 in stdenv.mkDerivation {
   name = "nix-exec-${version}";
 
   src = fetchurl {
     url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
 
-    sha256 = "16hssxv6fwi5a6bz7dlvhjjr3ymiqrvq0xfd38gwhn9qhvynv2ak";
+    sha256 = "1igpxhvj29cgg7mid1ilaq3d1q9sk6nlw8q33ah8y78iy2ah1iv2";
   };
 
   buildInputs = [ pkgconfig nix git ];

From e46e461685e048ac975dfb5fedac34d6c03a5423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 14 Aug 2015 18:16:00 +0200
Subject: [PATCH 1149/2016] Revert "gfortran: disable parallel building"

This reverts commit 3d6bd6a1facff3993d1b581dfcf9ee2b6a751642.
The problem wasn't fortran-specific and should be fixed now. See #9212.
---
 pkgs/development/compilers/gcc/4.9/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index d328308b063..ed5e9ed920b 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -61,10 +61,7 @@ let version = "4.9.3";
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
 
-    # Builds of gfortran have failed with strange errors that we cannot reproduce
-    # (http://hydra.nixos.org/build/23951123). Our best guess is that the build
-    # system has bugs that are exposed by compiling with multiple threads.
-    enableParallelBuilding = !langFortran;
+    enableParallelBuilding = true;
 
     patches = [ ]
       ++ optionals enableParallelBuilding [ ../parallel-bconfig.patch ./parallel-strsignal.patch ]

From c4358e0278b8a8cde6014a6656aab20cccc231b9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 14 Aug 2015 21:08:06 +0200
Subject: [PATCH 1150/2016] gjs: fix readline reference in .la file

---
 pkgs/desktops/gnome-3/3.16/core/gjs/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
index b736e1cd812..792e34c7b14 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-, spidermonkey_24, pango, readline, glib }:
+, spidermonkey_24, pango, readline, glib, libxml2 }:
 
 let
   majorVersion = "1.43";
@@ -12,10 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "0khwm8l6m6x71rwf3q92d6scbhmrpiw7kqmj34nn588fb7a4vdc2";
   };
 
-  buildInputs = [ gobjectIntrospection pkgconfig gtk3 glib pango readline ];
+  buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline ];
 
   propagatedBuildInputs = [ spidermonkey_24 ];
 
+  postInstall = ''
+    sed 's|-lreadline|-L${readline}/lib -lreadline|g' -i $out/lib/libgjs.la
+  '';
+
   meta = with stdenv.lib; {
     maintainers = gnome3.maintainers;
     platforms = platforms.linux;

From 167e54b25786efde22219583ea8468d63af62c16 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Aug 2015 21:22:40 +0200
Subject: [PATCH 1151/2016] haskell-generic-builder: allow users to specify
 their own install phase

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

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 83978e3bf21..4f142cd932d 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -38,7 +38,7 @@
 , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
 , preConfigure ? "", postConfigure ? ""
 , preBuild ? "", postBuild ? ""
-, preInstall ? "", postInstall ? ""
+, installPhase ? "", preInstall ? "", postInstall ? ""
 , checkPhase ? "", preCheck ? "", postCheck ? ""
 , preFixup ? "", postFixup ? ""
 , coreSetup ? false # Use only core packages to build Setup.hs.
@@ -305,6 +305,7 @@ stdenv.mkDerivation ({
 // optionalAttrs (preCheck != "")       { inherit preCheck; }
 // optionalAttrs (postCheck != "")      { inherit postCheck; }
 // optionalAttrs (preInstall != "")     { inherit preInstall; }
+// optionalAttrs (installPhase != "")   { inherit installPhase; }
 // optionalAttrs (postInstall != "")    { inherit postInstall; }
 // optionalAttrs (preFixup != "")       { inherit preFixup; }
 // optionalAttrs (postFixup != "")      { inherit postFixup; }

From 324c0f205a3f907add9e33fb04cb8c5a62424185 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Fri, 14 Aug 2015 12:27:27 -0700
Subject: [PATCH 1152/2016] emacs-packages: idris-mode 0.9.15 -> 0.9.18

---
 pkgs/top-level/emacs-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 9f0978ffa1a..0adddf3d5d0 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -827,14 +827,13 @@ let self = _self // overrides;
 
   idris-mode = melpaBuild rec {
     pname   = "idris-mode";
-    version = "0.9.15";
+    version = "0.9.18";
     src = fetchFromGitHub {
       owner  = "idris-hackers";
       repo   = "idris-mode";
       rev    = version;
-      sha256 = "00pkgk1zxan89i8alsa2dpa9ls7imqk5zb1kbjwzrlbr0gk4smdb";
+      sha256 = "11dw2ydlqhqx569wrp56w11rhgvm6mb6mzq2cwsv2vfyjvvawyxg";
     };
-    packageRequires = [ flycheck ];
     meta = { license = gpl3Plus; };
   };
 

From c541c236927b9ec20901cf0b7a58b622b41abe8b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 14 Aug 2015 15:56:01 -0400
Subject: [PATCH 1153/2016] nix-exec: Bugfix bump

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

diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index 523dbdbecbf..071680c4e9b 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, nix, git }: let
-  version = "4.1.1";
+  version = "4.1.2";
 in stdenv.mkDerivation {
   name = "nix-exec-${version}";
 
   src = fetchurl {
     url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
 
-    sha256 = "1igpxhvj29cgg7mid1ilaq3d1q9sk6nlw8q33ah8y78iy2ah1iv2";
+    sha256 = "03dphdkf33zi2wm92wghfvadghljh6q1a9zdj9rcbx2jh7fp3k8y";
   };
 
   buildInputs = [ pkgconfig nix git ];

From b61b704a52e4b7a98ffa2450fe0abd721163079e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 14 Aug 2015 18:57:03 +0200
Subject: [PATCH 1154/2016] calibre: update 2.34.0 to 2.35.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 8cad0a95ec9..7f8a42b077e 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.34.0";
+  version = "2.35.0";
 
   src = fetchurl {
     url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "04khi2jz7jrp6ppax57648sjkczvcxfqyzlyvhw155ggmpg8fiki";
+    sha256 = "13sic0l16myvka8mgpr56h6qlpf1cwx8xlf4acp3qz6gsmz3r23x";
   };
 
   inherit python;

From 6364245475408f5e760d7dc9697b1466d08331aa Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 14 Aug 2015 22:37:50 +0200
Subject: [PATCH 1155/2016] telegram-cli: make maintainers a list

---
 .../networking/instant-messengers/telegram-cli/default.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
index 90c8e9a7e9e..99366da2c84 100644
--- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     homepage = https://telegram.org/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = stdenv.lib.maintainers.jagajaga;
+    maintainers = [ stdenv.lib.maintainers.jagajaga ];
   };
 }

From c73421b5906947733fbff981e2cca2f67cf85d5a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 14 Aug 2015 22:40:07 +0200
Subject: [PATCH 1156/2016] terminado: rename meta.licenses to meta.license

---
 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 e19659b0df9..6dc77a7d948 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13598,7 +13598,7 @@ let
     meta = {
       description = "Terminals served to term.js using Tornado websockets";
       homepage = https://github.com/takluyver/terminado;
-      licenses = licenses.bsd2;
+      license = licenses.bsd2;
     };
   };
 

From 4ed131efb3070032207e1536a031005a6eb05303 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 14 Aug 2015 13:46:26 -0700
Subject: [PATCH 1157/2016] chromiumBeta: 45.0.2454.26 -> 45.0.2454.37

---
 .../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 141b1635c4f..8fd959e8c60 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -7,10 +7,10 @@
     sha256bin64 = "1v57w8n7dxw1yb20710f0mzkvil7apyikvfp0174xb2rbr1ipwng";
   };
   beta = {
-    version = "45.0.2454.26";
-    sha256 = "0ghgvll1q6nw1ds139nmabbilagffyln7k313w1yvn707wp7yg33";
-    sha256bin32 = "0611ad202vck0zi0jcldcr4j81kd9cnabsc9kssc6m46fy5rhhbk";
-    sha256bin64 = "0bwmpl7rq2nj0jf1xqx7n1mvx9kigbvpz2f8v0azwv4nb56p9c2q";
+    version = "45.0.2454.37";
+    sha256 = "1vbkyxvr8k3hmdysh063rl5d2bmag7nq3wxysivsdmi23b1dz6l6";
+    sha256bin32 = "0b4nxijijwk0n1as9l4wf0gxmwz4qs6ag0gi11cag3yp5z5p9cgi";
+    sha256bin64 = "0l0hs2vh1bhh6bqq7453fc7hpi0lamdlzqpdhgcz64k94bi0d748";
   };
   stable = {
     version = "44.0.2403.155";

From 435c5d2c4202904bf9eaf060046b85f0ccefb89b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 14 Aug 2015 13:58:36 -0700
Subject: [PATCH 1158/2016] firefox: 40.0 -> 40.0.2

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 171925169f3..2774b2c50d2 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -16,14 +16,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "40.0"; in
+let version = "40.0.2"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "48483e5738182f8567e2b6d2e29bd6bc1812d3eb";
+    sha1 = "b5d79fa3684284bfeb7277e99c756b8688e8121d";
   };
 
   buildInputs =

From d438d0e98b92e7ee3ae32df65bc690be572bcd04 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 14 Aug 2015 14:06:18 -0700
Subject: [PATCH 1159/2016] vim: 7.4.683 -> 7.4.826

Also, since googlecode is shutting down in <1 month move this to the new
github tree. This removes the dependence on mercurial.
---
 pkgs/applications/editors/vim/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index e1e920e2c49..54b3127898e 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchhg, ncurses, gettext, pkgconfig
+{ stdenv, fetchFromGitHub, ncurses, gettext, pkgconfig
 
 # apple frameworks
 , CoreServices, CoreData, Cocoa, Foundation, libobjc }:
 
 stdenv.mkDerivation rec {
   name = "vim-${version}";
+  version = "7.4.826";
 
-  version = "7.4.683";
-
-  src = fetchhg {
-    url = "https://code.google.com/p/vim/";
-    rev = "v7-4-663";
-    sha256 = "1z0qarf6a2smab28g9dnxklhfayn85wx48bnddmyhb9kqzjgqgjc";
+  src = fetchFromGitHub {
+    owner = "vim";
+    repo = "vim";
+    rev = "v${stdenv.lib.replaceChars ["."] ["-"] version}";
+    sha256 = "147lkcjdd0jbc7y2hflfzwnyjhdgi1971pmkizihybxmmj1a4g8y";
   };
 
   # this makes maintainers very sad

From dd1d6f8e274170001f9ed8fec98d046b15e44999 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:16:50 +0200
Subject: [PATCH 1160/2016] python-packages pytest: 2.6.2 -> 2.7.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd91cd41c38..16f959d3e3b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2418,11 +2418,11 @@ let
   };
 
   pytest = buildPythonPackage rec {
-    name = "pytest-2.6.2";
+    name = "pytest-2.7.2";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pytest/${name}.tar.gz";
-      md5 = "0a1735fb1d481ef3864f34678607ba85";
+      sha256 = "b30457f735420d0000d10a44bbd478cf03f8bf20e25bd77248f9bab40f4fd6a4";
     };
 
     preCheck = ''

From c40dae086334306dccdf4303e09e1335520305ef Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 14 Aug 2015 22:28:23 -0500
Subject: [PATCH 1161/2016] ipe: fix homepage

---
 pkgs/applications/graphics/ipe/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 53df14f8704..1c4b80c1f29 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An editor for drawing figures";
-    homepage = http://ipe7.sourceforge.net;
+    homepage = http://ipe.otfried.org;
     license = stdenv.lib.licenses.gpl3Plus;
     longDescription = ''
       Ipe is an extensible drawing editor for creating figures in PDF and Postscript format.

From 48a2034308f29c10073058b3ea3064ec71968cb2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 14 Aug 2015 22:28:42 -0500
Subject: [PATCH 1162/2016] ipe: add ttuegel to maintainers

---
 pkgs/applications/graphics/ipe/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 1c4b80c1f29..001412df4ad 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -43,5 +43,6 @@ stdenv.mkDerivation rec {
       It supports making small figures for inclusion into LaTeX-documents
       as well as presentations in PDF.
     '';
+    maintainers = [ stdenv.lib.maintainers.ttuegel ];
   };
 }

From df5f0cfb7c84fb9c8e18ac08c7e486850384df41 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 14 Aug 2015 22:28:51 -0500
Subject: [PATCH 1163/2016] ipe: set platforms = linux

---
 pkgs/applications/graphics/ipe/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 001412df4ad..f6bc4277d67 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
       as well as presentations in PDF.
     '';
     maintainers = [ stdenv.lib.maintainers.ttuegel ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From cce9a0f4d8638d8ec1006f1fd20495aba370e91a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 14 Aug 2015 22:29:58 -0500
Subject: [PATCH 1164/2016] ipe: version 7.1.8

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

diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index f6bc4277d67..8afa8e4389c 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -2,11 +2,11 @@
 , makeWrapper }:
 let ghostscript = ghostscriptX; in
 stdenv.mkDerivation rec {
-  name = "ipe-7.1.2";
+  name = "ipe-7.1.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ipe7/ipe/7.1.0/${name}-src.tar.gz";
-    sha256 = "04fs5slci3bmpgz8d038h3hnzzdw57xykcpsmisdxci2xrkxx41k";
+    url = "http://github.com/otfried/ipe/raw/master/releases/7.1/${name}-src.tar.gz";
+    sha256 = "1zx6dyr1rb6m6rvawagg9f8bc2li9nbighv2dglzjbh11bxqsyva";
   };
 
   # changes taken from Gentoo portage

From 7203497ce4904a31ce84b1220e2d1fa5d3d87f3e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 14 Aug 2015 22:30:21 -0500
Subject: [PATCH 1165/2016] ipe: set LUA_PACKAGE name for make

---
 pkgs/applications/graphics/ipe/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 8afa8e4389c..f2ba7c9bef3 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
 
   IPEPREFIX="$$out";
   URWFONTDIR="${texLive}/texmf-dist/fonts/type1/urw/";
+  LUA_PACKAGE = "lua";
 
   buildInputs = [
     pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper

From f0a11cd1eb428df09cd3080241d7ae56092927bd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 14 Aug 2015 22:30:48 -0500
Subject: [PATCH 1166/2016] ipe: add missing libjpeg dependency

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

diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index f2ba7c9bef3..ede0dc07afb 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, pkgconfig, zlib, qt4, freetype, cairo, lua5, texLive, ghostscriptX
+, libjpeg
 , makeWrapper }:
 let ghostscript = ghostscriptX; in
 stdenv.mkDerivation rec {
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
   LUA_PACKAGE = "lua";
 
   buildInputs = [
-    pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper
+    libjpeg pkgconfig zlib qt4 freetype cairo lua5 texLive ghostscript makeWrapper
   ];
 
   postInstall = ''

From b87dd90e561aca73ade414fcad73dd33384dc5ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Aug 2015 11:43:42 +0200
Subject: [PATCH 1167/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/c6a74c3fdcfb25cf71a813c0854b50114ef4212a
 with hackage2nix v20150807-31-g34b77b8

---
 .../haskell-modules/hackage-packages.nix      | 728 +++++++++++-------
 1 file changed, 435 insertions(+), 293 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 11f0fd12969..99b45ddc0d5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1521,6 +1521,7 @@ self: {
          vector-th-unbox
        ];
        executableHaskellDepends = [ base cmdargs ];
+       jailbreak = true;
        homepage = "https://github.com/choener/BiobaseXNA";
        description = "Efficient RNA/DNA representations";
        license = stdenv.lib.licenses.gpl3;
@@ -1748,10 +1749,9 @@ self: {
     ({ mkDerivation, base, bytestring, network, text }:
      mkDerivation {
        pname = "BufferedSocket";
-       version = "0.2.0.0";
-       sha256 = "0e37069b0799669b6ada54785bc5550926b12e3df72f19c20c9f63fd2d7dfc69";
+       version = "0.2.1.0";
+       sha256 = "bf521304ccbecfd8ba5aefbf76fa7abaebfa646eb9dcff330be5a284fa899c8f";
        libraryHaskellDepends = [ base bytestring network text ];
-       jailbreak = true;
        description = "A socker wrapper that makes the IO of sockets much cleaner";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -9895,8 +9895,8 @@ self: {
      }:
      mkDerivation {
        pname = "Lattices";
-       version = "0.0.1";
-       sha256 = "c509ede7f13acca98da4fc687a02ab1eaf702ed00fe34ab37491187603ed39f4";
+       version = "0.0.2";
+       sha256 = "8eebdb8755fb27679b8c9dab7bbc73f46612d22c06286817414a62ac19b40430";
        libraryHaskellDepends = [ array base HaskellForMaths ];
        testHaskellDepends = [
          array base HaskellForMaths HUnit test-framework
@@ -10053,8 +10053,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, List, transformers }:
      mkDerivation {
        pname = "ListTree";
-       version = "0.2.1";
-       sha256 = "b510c37a4ad9acd557d94ec3522616756e46d26b3e548e09a14f072bf80834e6";
+       version = "0.2.2";
+       sha256 = "b261ac13493c992c44156f81ad194e43f2ab5aa2ae5ea0596414280c3a8addba";
        libraryHaskellDepends = [
          base directory filepath List transformers
        ];
@@ -14513,7 +14513,7 @@ self: {
 
   "Spock" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , case-insensitive, containers, directory, hashable, hspec
+     , case-insensitive, containers, directory, focus, hashable, hspec
      , hspec-wai, http-types, hvect, list-t, monad-control, mtl
      , old-locale, path-pieces, random, reroute, resource-pool
      , resourcet, stm, stm-containers, text, time, transformers
@@ -14522,11 +14522,11 @@ self: {
      }:
      mkDerivation {
        pname = "Spock";
-       version = "0.8.0.0";
-       sha256 = "04a0a66eb9cb6cc1528e3989e5b54378079ee9919412bc54015a3919603b7e3a";
+       version = "0.8.1.0";
+       sha256 = "d9e62dba8c757b9877010c4ecbc2e79de519cf14a54c919fc99eda3a1c2e70d6";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
-         directory hashable http-types hvect list-t monad-control mtl
+         directory focus hashable http-types hvect list-t monad-control mtl
          old-locale path-pieces random reroute resource-pool resourcet stm
          stm-containers text time transformers transformers-base
          unordered-containers vault wai wai-extra warp
@@ -16440,17 +16440,18 @@ self: {
      }:
      mkDerivation {
        pname = "XSaiga";
-       version = "1.0.0.0";
-       sha256 = "9fb4a7c95fc93362cd9b8b8367f861d4c1727bb3dad24b8672604f23aa07ae6a";
+       version = "1.1.0.0";
+       sha256 = "580f29b238c9195613f836eea693a937ba1ad00ea4591bbb7cb1a6a2032f02fd";
        revision = "4";
-       editedCabalFile = "d4af61293d2d3a615e34002a517490a4ac748799aae15d2b0e6aaed14204693e";
+       editedCabalFile = "0cd366fd1401a0c35d4b127ef70b7c26447b6ab2c6c5cb4b0c8b4b4b654e27b2";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base pretty ];
+       libraryHaskellDepends = [
+         base containers hsparql pretty rdf4h text
+       ];
        executableHaskellDepends = [
          base cgi containers hsparql pretty rdf4h text
        ];
-       jailbreak = true;
        homepage = "http://hafiz.myweb.cs.uwindsor.ca/proHome.html";
        description = "An implementation of a polynomial-time top-down parser suitable for NLP";
        license = stdenv.lib.licenses.bsd3;
@@ -17890,14 +17891,13 @@ self: {
      }:
      mkDerivation {
        pname = "ad";
-       version = "4.2.3";
-       sha256 = "25a72665dc5c366f2a5482237b65e86bab2b1029b08e167a484bb24f296a3671";
+       version = "4.2.4";
+       sha256 = "d6850ebd71f39a1ba269f2b1e91b57d13cf2e0a1c73e4394798c3e704ea5fe5c";
        libraryHaskellDepends = [
          array base comonad containers data-reify erf free nats reflection
          transformers
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/ad";
        description = "Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
@@ -24300,8 +24300,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
        pname = "base-orphans";
-       version = "0.4.3";
-       sha256 = "405b6499679805b5361277e4d101240ab7848ffc009621fc29bbae2519ebfc0d";
+       version = "0.4.4";
+       sha256 = "f4323cc2ae2b25ce228d7291ff65ac5e6c583070b53eaf21dd509ebe25bf0f42";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
@@ -29637,8 +29637,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.5.0.0";
-       sha256 = "9b7efb284a61e9064be77f3a273410a5432877f7cbf11e6e0233a1826339dcc8";
+       version = "0.5.1.0";
+       sha256 = "563773491cc8245c3d265c2e7847f95198aad74adcbc16a91622e7e4abef4e45";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30634,25 +30634,24 @@ self: {
      }) {};
 
   "call" = callPackage
-    ({ mkDerivation, audiovisual, base, bindings-portaudio
-     , boundingboxes, colors, containers, control-bool, deepseq
-     , directory, filepath, free, freetype2, GLFW-b, hashable
-     , JuicyPixels, JuicyPixels-util, lens, linear, mtl, objective
-     , OpenGL, OpenGLRaw, random, reflection, template-haskell, text
-     , transformers, vector, WAVE
+    ({ mkDerivation, base, bindings-portaudio, boundingboxes, colors
+     , containers, control-bool, deepseq, directory, filepath, free
+     , freetype2, GLFW-b, hashable, JuicyPixels, JuicyPixels-util, lens
+     , linear, mtl, objective, OpenGL, OpenGLRaw, random
+     , template-haskell, text, transformers, vector, WAVE
      }:
      mkDerivation {
        pname = "call";
-       version = "0.2";
-       sha256 = "b7d1bc17868116a25d73afba7fc4f1a20a7ad1b000888163bf4f32d021cc7fc1";
+       version = "0.1.4.2";
+       sha256 = "2fe8f1ade21ea24c67ab2447189f756b75a60cbb4d2221a0058bc62050c00461";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         audiovisual base bindings-portaudio boundingboxes colors containers
+         base bindings-portaudio boundingboxes colors containers
          control-bool deepseq directory filepath free freetype2 GLFW-b
          hashable JuicyPixels JuicyPixels-util lens linear mtl objective
-         OpenGL OpenGLRaw random reflection template-haskell text
-         transformers vector WAVE
+         OpenGL OpenGLRaw random template-haskell text transformers vector
+         WAVE
        ];
        executableHaskellDepends = [ base lens ];
        jailbreak = true;
@@ -32478,6 +32477,8 @@ self: {
        pname = "chunked-data";
        version = "0.2.0";
        sha256 = "9aa0f3c81f9b0d7c1dde206501415f01638f20eebfbe1386dfd802bcc1bab272";
+       revision = "1";
+       editedCabalFile = "ba9fa66cf9c9995dfec2c5735692d6f52343a48d6c9cae4242ec399e0f421fdc";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers mono-traversable
          semigroups text transformers vector
@@ -41770,8 +41771,8 @@ self: {
      }:
      mkDerivation {
        pname = "debian-build";
-       version = "0.7.2.1";
-       sha256 = "d5d5b30dbc92b2b7c1e0137a9089eaeba94a5c410bad726d4db5205f7ede72f4";
+       version = "0.7.2.2";
+       sha256 = "e9ba2452da86da69f80ed6042de3ae73de83ee96b8483a845129b1dfc685e737";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -49329,6 +49330,72 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) exif;};
 
+  "exinst" = callPackage
+    ({ mkDerivation, base, constraints, singletons }:
+     mkDerivation {
+       pname = "exinst";
+       version = "0.1";
+       sha256 = "73e32a3d91a7b3d8a9d6b28d560059ab2a5ba49d79dfa0730155b9c0eaf414bf";
+       libraryHaskellDepends = [ base constraints singletons ];
+       homepage = "https://github.com/k0001/exinst";
+       description = "Derive instances for your existential types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "exinst-aeson" = callPackage
+    ({ mkDerivation, aeson, base, constraints, exinst, singletons }:
+     mkDerivation {
+       pname = "exinst-aeson";
+       version = "0.1";
+       sha256 = "deb23a10a7f22fe743fb9bb90451e80dcb8d1b365f7a85498e56ef2c31a3a5bf";
+       libraryHaskellDepends = [
+         aeson base constraints exinst singletons
+       ];
+       homepage = "https://github.com/k0001/exinst";
+       description = "Derive instances for the `aeson` library for your existential types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "exinst-bytes" = callPackage
+    ({ mkDerivation, base, bytes, constraints, exinst, singletons }:
+     mkDerivation {
+       pname = "exinst-bytes";
+       version = "0.1";
+       sha256 = "f30b5732cb926726e6d92d0888cbb0dca4f99059b9b321fb5198a0337b106189";
+       libraryHaskellDepends = [
+         base bytes constraints exinst singletons
+       ];
+       homepage = "https://github.com/k0001/exinst";
+       description = "Derive instances for the `bytes` library for your existential types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "exinst-deepseq" = callPackage
+    ({ mkDerivation, base, constraints, deepseq, exinst }:
+     mkDerivation {
+       pname = "exinst-deepseq";
+       version = "0.1";
+       sha256 = "ea7e155a3a09064f65c39cd5e4323a64b8bf8dc4aa32de33b3495207315c361d";
+       libraryHaskellDepends = [ base constraints deepseq exinst ];
+       homepage = "https://github.com/k0001/exinst";
+       description = "Derive instances for the `deepseq` library for your existential types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "exinst-hashable" = callPackage
+    ({ mkDerivation, base, constraints, exinst, hashable, singletons }:
+     mkDerivation {
+       pname = "exinst-hashable";
+       version = "0.1";
+       sha256 = "c6ac56bd83b3fc47b38114019e0be79784f60ab068f77ead8e70d7308e9c297c";
+       libraryHaskellDepends = [
+         base constraints exinst hashable singletons
+       ];
+       homepage = "https://github.com/k0001/exinst";
+       description = "Derive instances for the `hashable` library for your existential types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "exists" = callPackage
     ({ mkDerivation, base, contravariant }:
      mkDerivation {
@@ -50017,10 +50084,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-logger";
-       version = "2.4.0";
-       sha256 = "4cff4e1a38b07ce18083028406c51efdfa6d6764104c4f2fd4b7112c28cd05c2";
-       revision = "3";
-       editedCabalFile = "af5edf5e05ecd782e1d87b9d5730c5a9eb1016ac01fb1a377dda1cd8e88a274b";
+       version = "2.4.1";
+       sha256 = "e51218b5a00b8b5746fcbd1666262f9ae77b9daea5c4e351459a321c0c0a534e";
        libraryHaskellDepends = [
          array auto-update base bytestring bytestring-builder directory
          filepath text
@@ -50097,8 +50162,8 @@ self: {
      }:
      mkDerivation {
        pname = "fasta";
-       version = "0.7.2.1";
-       sha256 = "44c36e0d662ad97b9ca4dfd53047e50a7852d5ccaf3edcacb299fef107449dcb";
+       version = "0.8.0.0";
+       sha256 = "9daceed94de38a7ac6094b37b4c6d2a32d82f7fe9ed4a39abf11e73475fda17e";
        libraryHaskellDepends = [
          base bytestring containers foldl lens parsec pipes pipes-bytestring
          pipes-group pipes-text split text
@@ -50284,8 +50349,8 @@ self: {
     ({ mkDerivation, fay-base, fay-text }:
      mkDerivation {
        pname = "fay-jquery";
-       version = "0.6.0.3";
-       sha256 = "0e3eabb54963ef40419607fab6094dfd6d59e1c46cc854f8f796fcd58d47d1f4";
+       version = "0.6.1.0";
+       sha256 = "0ff57ef8115e5c3fce1c14cca2509713e945874a2a2976e4646559ff51006f13";
        libraryHaskellDepends = [ fay-base fay-text ];
        homepage = "https://github.com/faylang/fay-jquery";
        description = "jQuery bindings for Fay";
@@ -51070,8 +51135,8 @@ self: {
      }:
      mkDerivation {
        pname = "file-embed";
-       version = "0.0.8.2";
-       sha256 = "9e9cf8d84d5213924eec9d9c829655db74ff02b24a797d5f7450724244fabdbd";
+       version = "0.0.9";
+       sha256 = "58b3a6b0e0566b9f89286ecd456a669273b8333cd39356d4cc88ef897d93d005";
        libraryHaskellDepends = [
          base bytestring directory filepath template-haskell
        ];
@@ -52919,8 +52984,8 @@ self: {
      }:
      mkDerivation {
        pname = "fptest";
-       version = "0.2.2.0";
-       sha256 = "4420eb2fa772ae97678d0ff3479fca96b071a8bf81373cb9cd0c270888510cf3";
+       version = "0.2.1.0";
+       sha256 = "70d855b3f61de5666cb070132e5d9d8248b4a5b3a5ceb349247b897930d27c3d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -53592,8 +53657,8 @@ self: {
      }:
      mkDerivation {
        pname = "fswatcher";
-       version = "0.1.2";
-       sha256 = "82ddbab9685843470abce50509838121e80e4efac6a22d6f5eb444efe4a8d7ac";
+       version = "0.1.3";
+       sha256 = "e0b7aea8d9b6adfe1045b7484b84faa1487638e7d3c16a598d9aa82083230351";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -53945,8 +54010,8 @@ self: {
      }:
      mkDerivation {
        pname = "fusion";
-       version = "0.1.2";
-       sha256 = "b66f1d552ac2107574fd8faad1ac3c3b2f99d90aaac2a5f57d77b41a3272472b";
+       version = "0.2.0";
+       sha256 = "95a8c2a5ee98fa16a548ec55a42c5a7dde2fce688df74cf884a777db654a486f";
        libraryHaskellDepends = [ base pipes-safe transformers void ];
        testHaskellDepends = [ base directory doctest filepath ];
        homepage = "https://github.com/jwiegley/fusion";
@@ -54551,8 +54616,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-accessors";
-       version = "0.4.1";
-       sha256 = "e0edefec048fb498b77482351b0ab9e9136e6ba4bdd32aaf20db2461129911e2";
+       version = "0.4.1.1";
+       sha256 = "b8a3ff34ba1adff9cf8bf2b568eae405a65336cce2ef3c5544177e2fce07baf9";
        libraryHaskellDepends = [ base linear spatial-math ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -55316,8 +55381,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.3.1";
-       sha256 = "41b6c273832b8e89de06d991b2fb7d5d810c87402e552dc395f268049b8b7e1e";
+       version = "0.3.1.1";
+       sha256 = "26d96b92d93d7455f400133a20c0fc1a2ddc62a1be724ebd8ba637c3346ab822";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55437,38 +55502,34 @@ self: {
      }) {};
 
   "ghc-mod" = callPackage
-    ({ mkDerivation, async, base, Cabal, containers, data-default
-     , deepseq, directory, djinn-ghc, doctest, filepath, ghc, ghc-paths
-     , ghc-syb-utils, haskell-src-exts, hlint, hspec, io-choice
-     , monad-control, monad-journal, mtl, old-time, pretty, process
-     , split, syb, temporary, text, time, transformers
+    ({ mkDerivation, async, base, bytestring, cabal-helper, cereal
+     , containers, deepseq, directory, djinn-ghc, doctest, fclabels
+     , filepath, ghc, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint
+     , hspec, monad-control, monad-journal, mtl, old-time, pretty
+     , process, split, syb, temporary, text, time, transformers
      , transformers-base
      }:
      mkDerivation {
        pname = "ghc-mod";
-       version = "5.2.1.2";
-       sha256 = "3b66b4ab4271ee1a61ab348951d49c38e500535789b469783281d36556cb9687";
+       version = "5.3.0.0";
+       sha256 = "fd03354a6ef312ed40bb217a9c0a1e3bd7f9f41bf3ee89ea6db46b3a9815fefa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal containers deepseq directory djinn-ghc filepath ghc
-         ghc-paths ghc-syb-utils haskell-src-exts hlint io-choice
-         monad-control monad-journal mtl old-time pretty process split syb
-         temporary text time transformers transformers-base
+         base bytestring cabal-helper cereal containers deepseq directory
+         djinn-ghc fclabels filepath ghc ghc-paths ghc-syb-utils
+         haskell-src-exts hlint monad-control monad-journal mtl old-time
+         pretty process split syb temporary text time transformers
+         transformers-base
        ];
        executableHaskellDepends = [
-         async base containers data-default directory filepath ghc mtl
-         old-time pretty process split time
-       ];
-       testHaskellDepends = [
-         base Cabal containers deepseq directory djinn-ghc doctest filepath
-         ghc ghc-paths ghc-syb-utils haskell-src-exts hlint hspec io-choice
-         monad-control monad-journal mtl old-time pretty process split syb
-         temporary text time transformers transformers-base
+         async base directory filepath ghc mtl old-time pretty process split
+         time
        ];
+       testHaskellDepends = [ base doctest hspec ];
        homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
        description = "Happy Haskell Programming";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.agpl3;
      }) {};
 
   "ghc-mtl" = callPackage
@@ -55854,12 +55915,11 @@ self: {
     ({ mkDerivation, base, ghcjs-dom, mtl }:
      mkDerivation {
        pname = "ghcjs-dom-hello";
-       version = "1.2.0.0";
-       sha256 = "f431a1b8d9d384f46ba1f80991c289e7f2f73b59ba461a200f001eaca0357649";
+       version = "2.0.0.0";
+       sha256 = "34bd62641aa6913d04baeb1ab347f6f867080e001f7cacfb841a5f14abf46fe7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ghcjs-dom mtl ];
-       jailbreak = true;
        homepage = "https://github.com/ghcjs/ghcjs-dom-hello";
        description = "GHCJS DOM Hello World, an example package";
        license = stdenv.lib.licenses.mit;
@@ -56066,7 +56126,7 @@ self: {
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, case-insensitive
      , clientsession, conduit, conduit-extra, containers, crypto-api
-     , cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns
+     , cryptonite, curl, data-default, DAV, dbus, directory, dlist, dns
      , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
      , git, gnupg, gnutls, hinotify, hslogger, http-client, http-conduit
      , http-types, IfElse, json, lsof, MissingH, monad-control
@@ -56083,15 +56143,15 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20150731";
-       sha256 = "a2eefd4c273f5510e8ee384cc4fb512bf10c76cc4b84f6fff5c255223bd853a1";
+       version = "5.20150812";
+       sha256 = "0c6f8cd802b38313739b4a5c5fd8ca51493643d60f9290321039c5c0e33546f4";
        configureFlags = [ "-fassistant" "-fproduction" ];
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson async aws base blaze-builder bloomfilter byteable bytestring
          case-insensitive clientsession conduit conduit-extra containers
-         crypto-api cryptohash data-default DAV dbus directory dlist dns
+         crypto-api cryptonite data-default DAV dbus directory dlist dns
          edit-distance esqueleto exceptions fdo-notify feed filepath gnutls
          hinotify hslogger http-client http-conduit http-types IfElse json
          MissingH monad-control monad-logger mtl network network-info
@@ -56107,11 +56167,10 @@ self: {
        executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which
        ];
-       preConfigure = "export HOME=$TEMPDIR";
-       checkPhase = ''
-         cp dist/build/git-annex/git-annex git-annex
-         ./git-annex test
-       '';
+       preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
+       postBuild = "ln -sf dist/build/git-annex/git-annex git-annex";
+       installPhase = "make PREFIX=$out CABAL=./Setup install";
+       checkPhase = "./git-annex test";
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
@@ -57500,8 +57559,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-drive";
-       version = "0.4.0";
-       sha256 = "488f740df4c746f58ccb1bf7bcc46dc8d504006d76bcc62ec54b8213b72954d3";
+       version = "0.4.1";
+       sha256 = "f3f742eccf51897db9da71ea1cad0d2632122e94ee98f160e20fef75b58b17f2";
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra directory filepath
          http-conduit http-types mtl random resourcet text time
@@ -59603,23 +59662,23 @@ self: {
      , crypto-pubkey, crypto-random, cryptocipher, cryptohash
      , data-default-class, errors, hashable, incremental-parser
      , ixset-typed, lens, monad-loops, nettle, network, network-uri
-     , newtype, old-locale, openpgp-asciiarmor, QuickCheck
-     , quickcheck-instances, resourcet, securemem, semigroups, split
-     , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
+     , newtype, openpgp-asciiarmor, QuickCheck, quickcheck-instances
+     , resourcet, securemem, semigroups, split, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, time-locale-compat, transformers
      , unordered-containers, wl-pprint-extras, zlib
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.2";
-       sha256 = "21801a62585fea80bea3ecda11df0a7113923646d3d7856bc48db27b868fe0a0";
+       version = "2.2.1";
+       sha256 = "48e7bc8f2bc29ab5531b3a75e298aeef4fcd4b50efdb7cb9fcea8ca3f1413567";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bifunctors binary
          binary-conduit byteable bytestring bzlib conduit conduit-extra
          containers crypto-cipher-types crypto-pubkey crypto-random
          cryptocipher cryptohash data-default-class errors hashable
          incremental-parser ixset-typed lens monad-loops nettle network
-         network-uri newtype old-locale openpgp-asciiarmor resourcet
-         securemem semigroups split text time transformers
+         network-uri newtype openpgp-asciiarmor resourcet securemem
+         semigroups split text time time-locale-compat transformers
          unordered-containers wl-pprint-extras zlib
        ];
        testHaskellDepends = [
@@ -59628,9 +59687,10 @@ self: {
          crypto-cipher-types crypto-pubkey crypto-random cryptocipher
          cryptohash data-default-class errors hashable incremental-parser
          ixset-typed lens monad-loops nettle network network-uri newtype
-         old-locale QuickCheck quickcheck-instances resourcet securemem
-         semigroups split tasty tasty-hunit tasty-quickcheck text time
-         transformers unordered-containers wl-pprint-extras zlib
+         QuickCheck quickcheck-instances resourcet securemem semigroups
+         split tasty tasty-hunit tasty-quickcheck text time
+         time-locale-compat transformers unordered-containers
+         wl-pprint-extras zlib
        ];
        homepage = "http://floss.scru.org/hOpenPGP/";
        description = "native Haskell implementation of OpenPGP (RFC4880)";
@@ -60528,24 +60588,24 @@ self: {
   "hackport" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , directory, extensible-exceptions, filepath, HTTP, HUnit, MissingH
-     , mtl, network, network-uri, old-locale, old-time, parsec, pretty
+     , network, network-uri, old-locale, old-time, parsec, pretty
      , process, regex-compat, tar, time, unix, xml, zlib
      }:
      mkDerivation {
        pname = "hackport";
-       version = "0.4.5";
-       sha256 = "a7aa880795b0acfcbed287ccddbbf204ed5daa86873c788dd5d98107f9445ba3";
+       version = "0.4.6";
+       sha256 = "5b5cd178fbefe5363bd4f68ca98386fd2762df88ff24435e1999f28e80b1e14e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          array base bytestring containers deepseq directory
-         extensible-exceptions filepath HTTP MissingH mtl network
-         network-uri old-locale old-time parsec pretty process regex-compat
-         tar time unix xml zlib
+         extensible-exceptions filepath HTTP MissingH network network-uri
+         old-locale old-time parsec pretty process regex-compat tar time
+         unix xml zlib
        ];
        testHaskellDepends = [
          base bytestring containers deepseq directory extensible-exceptions
-         filepath HUnit mtl pretty process time unix xml
+         filepath HUnit pretty process time unix xml
        ];
        description = "Hackage and Portage integration tool";
        license = "GPL";
@@ -65902,18 +65962,18 @@ self: {
      }) {};
 
   "hdevtools" = callPackage
-    ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc
-     , ghc-paths, network, process, syb, time, unix
+    ({ mkDerivation, base, bin-package-db, Cabal, cmdargs, directory
+     , filepath, ghc, ghc-paths, network, process, syb, time, unix
      }:
      mkDerivation {
        pname = "hdevtools";
-       version = "0.1.1.9";
-       sha256 = "4c75a9399e07ba3ea94bab454663b2ef7072f2db6f4b316fce3912cd3da98f33";
+       version = "0.1.2.1";
+       sha256 = "88ec6f28c11a6f04e3db4ab3cb1b17d6c30c10023fd81996b1b66a251d8e65a7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base Cabal cmdargs directory filepath ghc ghc-paths network process
-         syb time unix
+         base bin-package-db Cabal cmdargs directory filepath ghc ghc-paths
+         network process syb time unix
        ];
        homepage = "https://github.com/schell/hdevtools/";
        description = "Persistent GHC powered background server for FAST haskell development tools";
@@ -72782,7 +72842,6 @@ self: {
          network process text transformers unordered-containers vector
        ];
        testHaskellDepends = [ base ];
-       jailbreak = true;
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc";
        license = stdenv.lib.licenses.bsd3;
@@ -75912,6 +75971,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "human-readable-duration" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "human-readable-duration";
+       version = "0.1.0.0";
+       sha256 = "75c5f9f83fe3204b5da47cfd6da82465185dcfd926ed0cec51ac91406684f7de";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/yogsototh/human-readable-duration#readme";
+       description = "Provide duration helper";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hums" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
      , ConfigFile, containers, directory, filepath, HaXml, http-types
@@ -79888,8 +79959,8 @@ self: {
        pname = "irc-core";
        version = "1.1.0.1";
        sha256 = "a788848f0d60068ed173c394bf28ad637a85df4f3007daebe502126c1907c106";
-       revision = "3";
-       editedCabalFile = "a2be33ee630d69381c0103cf25743005688f53220d02552cc99ed7131eefdadf";
+       revision = "4";
+       editedCabalFile = "bbe603100961c3b2746c733f31f56f26177b1b28180d6468133140f80d95b402";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79902,7 +79973,6 @@ self: {
          network old-locale split stm text time tls transformers vty x509
          x509-store x509-system x509-validation
        ];
-       jailbreak = true;
        homepage = "https://github.com/glguy/irc-core";
        description = "An IRC client library and text client";
        license = stdenv.lib.licenses.bsd3;
@@ -81595,8 +81665,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc";
-       version = "0.7.0.1";
-       sha256 = "e99da039bd589685ce9f396b6ef532a2640731c9e18d374cbe4aaf472530095f";
+       version = "0.7.0.2";
+       sha256 = "e8187d8946735a2e6845ddcc4097181c99d750aea2b9c4563bf9765e86c3be82";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit conduit-extra deepseq
          hashable lifted-async monad-control monad-logger mtl QuickCheck stm
@@ -82521,8 +82591,8 @@ self: {
      }:
      mkDerivation {
        pname = "keera-hails-reactive-gtk";
-       version = "0.0.3.6";
-       sha256 = "043263a2ae40746b8a8cd4b0456c38a83e20232f39f96056196e83e0c118f4c4";
+       version = "0.1";
+       sha256 = "81353ed9e0a293359ebd30e520191290ee25929ad5136f2d606721ad3800f411";
        libraryHaskellDepends = [
          base gtk gtk-helpers keera-hails-reactivevalues mtl transformers
        ];
@@ -82594,8 +82664,8 @@ self: {
     ({ mkDerivation, base, contravariant }:
      mkDerivation {
        pname = "keera-hails-reactivevalues";
-       version = "0.0.3.4";
-       sha256 = "eb86cbfc026bc5d31a2acb1054473f10d6b65795a5e9cc17f983e60bb4261763";
+       version = "0.1.0";
+       sha256 = "471871afb20248732bb1f2b036a32eda3fbbce6c02f8e1ee880b60f57940f515";
        libraryHaskellDepends = [ base contravariant ];
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Values";
@@ -82727,6 +82797,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "keyed" = callPackage
+    ({ mkDerivation, base, containers, vector }:
+     mkDerivation {
+       pname = "keyed";
+       version = "0.3.0.0";
+       sha256 = "b85cbba508e47c61bc49a3651068f7a86285501bbe0af66d90bb2eb5c8b6a360";
+       libraryHaskellDepends = [ base containers vector ];
+       homepage = "https://github.com/wyager/keyed";
+       description = "Generic indexing for many data structures";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "keyring" = callPackage
     ({ mkDerivation, base, udbus }:
      mkDerivation {
@@ -85222,10 +85304,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.15.1.2";
-       sha256 = "4b90e8f41165afd439a7b3bb587e03c89eb908deec6ee0837af38f7eaf925fc7";
-       revision = "1";
-       editedCabalFile = "e97b32fd5b0bfc80e02961a66cbb505cae737e3bc8f4f88afd9602740fc21d66";
+       version = "0.15.1.3";
+       sha256 = "de00aa714ba2e60b7450e0fb7a382bdb88cc8ed9589ef10833e93782630488cf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87230,8 +87310,10 @@ self: {
      }:
      mkDerivation {
        pname = "liquid-fixpoint";
-       version = "0.3.0.1";
-       sha256 = "5c41fec77deb1ff4d77d368880be697444598b88c31b3c8597d89a1411644503";
+       version = "0.4.0.0";
+       sha256 = "7414b580a3ec8185da5e5148b46cef5d15e347080eb2561fcd228c72e7669816";
+       revision = "2";
+       editedCabalFile = "10397e387d91256dcd35cae36cb27ae302418c3c80da6e65d417657783beaf6b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87256,21 +87338,21 @@ self: {
 
   "liquidhaskell" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base, bifunctors
-     , bytestring, cmdargs, containers, cpphs, data-default, deepseq
-     , Diff, directory, filemanip, filepath, fingertree, ghc, ghc-paths
-     , hashable, hpc, hscolour, intern, liquid-fixpoint, mtl
-     , optparse-applicative, parsec, pretty, process, syb, tagged, tasty
-     , tasty-hunit, tasty-rerun, template-haskell, text, time
-     , unordered-containers, vector
+     , bytestring, Cabal, cmdargs, containers, cpphs, data-default
+     , deepseq, Diff, directory, filemanip, filepath, fingertree, ghc
+     , ghc-paths, hashable, hpc, hscolour, intern, liquid-fixpoint, mtl
+     , optparse-applicative, parsec, pretty, process, stm, syb, tagged
+     , tasty, tasty-hunit, tasty-rerun, template-haskell, text, time
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "liquidhaskell";
-       version = "0.4.1.1";
-       sha256 = "9a7c248662b9e1e814dfe93f27bd8cf4796b4ed2629e214bcc7a5510e337affb";
+       version = "0.5.0.1";
+       sha256 = "27f31e7652cd9ef0b97d2e3936c8e9c759961ac153b324c3e84f11cb441ab89a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal array base bifunctors bytestring cmdargs
+         aeson ansi-terminal array base bifunctors bytestring Cabal cmdargs
          containers cpphs data-default deepseq Diff directory filemanip
          filepath fingertree ghc ghc-paths hashable hpc hscolour intern
          liquid-fixpoint mtl parsec pretty process syb template-haskell text
@@ -87284,8 +87366,8 @@ self: {
          time unordered-containers vector
        ];
        testHaskellDepends = [
-         base directory filepath optparse-applicative process tagged tasty
-         tasty-hunit tasty-rerun
+         base containers directory filepath mtl optparse-applicative process
+         stm tagged tasty tasty-hunit tasty-rerun transformers
        ];
        homepage = "http://goto.ucsd.edu/liquidhaskell";
        description = "Liquid Types for Haskell";
@@ -89147,8 +89229,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzma-conduit";
-       version = "1.1.3";
-       sha256 = "24bb207c3cc6ccf4185e0168461a9c9bc276ccd98dbbc5f039a3126f0a3eee06";
+       version = "1.1.3.0";
+       sha256 = "abf9e7a052a2bbd85923237a6fa7a73e7e077b20908ad3d68e6c24285aef390f";
        libraryHaskellDepends = [
          base bindings-DSL bytestring conduit resourcet transformers
        ];
@@ -92714,8 +92796,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.14";
-       sha256 = "7b8548c3b91dbe0fc51304af356537b8af6586a487153ab3777ec804668d9fef";
+       version = "0.1.0.16";
+       sha256 = "833ab0000c1db92e20f90a5515e456cbae36bb284b82b81a41d9786f75847d09";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -95503,8 +95585,8 @@ self: {
      }:
      mkDerivation {
        pname = "mutable-containers";
-       version = "0.3.0";
-       sha256 = "ccec3cc85fa5a4facd65e7ab39220d0b41bd4ec2fe15df0bcd38fcf249105ff7";
+       version = "0.3.2";
+       sha256 = "781388cf52faa5f9c4c8a825eef11bec430e323c6913d25b5f4e63d8ce02017e";
        libraryHaskellDepends = [
          base containers ghc-prim mono-traversable primitive vector
        ];
@@ -96170,6 +96252,8 @@ self: {
        pname = "nats";
        version = "1";
        sha256 = "8045e8348bc166832d443b65addc537504a63e5a60cf9c99e8037ba00945da64";
+       revision = "1";
+       editedCabalFile = "ea2e93e879296eb63130ebd89562d0e7e6d74748c6c8b029c07708d2ffd44b72";
        homepage = "http://github.com/ekmett/nats/";
        description = "Natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -96279,6 +96363,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "naver-translate" = callPackage
+    ({ mkDerivation, aeson, base, iso639, lens, lens-aeson, random
+     , text, wreq
+     }:
+     mkDerivation {
+       pname = "naver-translate";
+       version = "0.1.0.0";
+       sha256 = "81fa0fb48c1096b141ab0e3972da9750a8027e9255805330c8fc0a6f982b7519";
+       libraryHaskellDepends = [
+         aeson base iso639 lens lens-aeson random text wreq
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/dahlia/naver-translate";
+       description = "Interface to Naver Translate";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "nbt" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -98031,21 +98132,23 @@ self: {
      }) {};
 
   "nicovideo-translator" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+    ({ mkDerivation, base, bytestring, case-insensitive, cmdargs
      , containers, dns, http-client, http-types, iso639, lens
-     , lens-aeson, random, setlocale, text, wai, warp, wreq, xml-conduit
+     , naver-translate, setlocale, text, text-format, wai, warp, wreq
+     , xml-conduit
      }:
      mkDerivation {
        pname = "nicovideo-translator";
-       version = "0.1.0.0";
-       sha256 = "90a3bba89d2fac5b58439b589bbe981cd16e80f358c6f6b2e7111d98f2ac0b07";
+       version = "0.1.0.1";
+       sha256 = "d2a7963385d06c67dad7d3aadd215c7d243e1e189b9fc3358bceb36a5c65f68a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-client
-         http-types iso639 lens lens-aeson random text wai wreq xml-conduit
+         base bytestring case-insensitive cmdargs containers dns http-client
+         http-types iso639 lens naver-translate setlocale text text-format
+         wai warp wreq xml-conduit
        ];
-       executableHaskellDepends = [ base dns iso639 setlocale text warp ];
+       executableHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/dahlia/nicovideo-translator";
        description = "Nico Nico Douga (ニコニコ動画) Comment Translator";
@@ -100388,25 +100491,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "optparse-applicative_0_10_0" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, process, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "optparse-applicative";
-       version = "0.10.0";
-       sha256 = "8b75b521fa0518d91ee119ccfd48aa1b317df0d00a91e31d620022f67e361912";
-       revision = "1";
-       editedCabalFile = "20d6ce280b028a493a1920dcc22bb39bee10e9c788a58e03dcaeecba97afffb0";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base process transformers transformers-compat
-       ];
-       jailbreak = true;
-       homepage = "https://github.com/pcapriotti/optparse-applicative";
-       description = "Utilities and combinators for parsing command line options";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "optparse-applicative" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, process, transformers
      , transformers-compat
@@ -103876,8 +103960,8 @@ self: {
      }:
      mkDerivation {
        pname = "picoparsec";
-       version = "0.1.2.2";
-       sha256 = "e931e9c383b9f8525d631f455ffd1cff87c959f4df2d526fbd8e52a7290bc5bd";
+       version = "0.1.2.3";
+       sha256 = "8ec7ed678efaf62de15b7c2f1d21f1ddf8b92f5fa233eed9534c12e8812e9150";
        libraryHaskellDepends = [
          array base bytestring containers deepseq monoid-subclasses
          scientific text
@@ -104162,8 +104246,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-cereal";
-       version = "0.1.0.0";
-       sha256 = "48a9a7d2ae140683dc06ea29b9940bb37c6822f73a49cd34869defef1f1ac511";
+       version = "0.1.0";
+       sha256 = "874d90435aac869871c169777ba937ac2579868c9076d9292d534b9f163a43b6";
        libraryHaskellDepends = [
          base bytestring cereal mtl pipes pipes-bytestring pipes-parse
        ];
@@ -104768,6 +104852,19 @@ self: {
        license = "GPL";
      }) {};
 
+  "pkcs7" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, HUnit, QuickCheck }:
+     mkDerivation {
+       pname = "pkcs7";
+       version = "1.0.0.1";
+       sha256 = "a22c63e56ca355df2075689753381f61cdfaf215e73755f55589b09a93bf9044";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring Cabal HUnit QuickCheck ];
+       homepage = "https://github.com/kisom/pkcs7";
+       description = "PKCS #7 padding in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pkggraph" = callPackage
     ({ mkDerivation, base, Cabal, split }:
      mkDerivation {
@@ -107819,8 +107916,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.7.0";
-       sha256 = "bca8444b4c47cd4c459eed6f6f37af667481f804d951ef19797a0563cdceee8a";
+       version = "2.7.1";
+       sha256 = "31e6b0463f36a6241eaadd980648afe487061e213582b457f29e045ee4ea862f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108604,8 +108701,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.7.2.0";
-       sha256 = "d3a8f4bdbb658e33576cec3b940fe53c1b1b1ad5b0047654b55203a682053d37";
+       version = "0.7.3.0";
+       sha256 = "27d9e4bd3061a2b64e10d4d7c140b2debd786772309aa36e0b7fdaa49b42b5c0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108625,7 +108722,6 @@ 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;
@@ -111194,8 +111290,8 @@ self: {
      }:
      mkDerivation {
        pname = "reducers";
-       version = "3.10.3.2";
-       sha256 = "822c487d308a470c33915ba2323efeed2d3cff774336d388864aaaf26bf6d9fd";
+       version = "3.11";
+       sha256 = "f8212e2adfeb1631f82da8bb4c4bbb6da2d79a558a2a5e80d3cc6d33f22b46bc";
        libraryHaskellDepends = [
          array base bytestring containers fingertree hashable semigroupoids
          semigroups text transformers unordered-containers
@@ -111754,8 +111850,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-pderiv";
-       version = "0.1.3";
-       sha256 = "a5bcdafd9b960c3ee056da8b8953f43c44b9a7d0d9fb501c68523f36b69e07ca";
+       version = "0.1.4";
+       sha256 = "05de6d0794c4515c6f5dc340d9bf7b4ea8c59eb4592306c9f0342ff268a4df39";
        libraryHaskellDepends = [
          base bitset bytestring containers deepseq ghc-prim mtl parallel
          parsec regex-base
@@ -112998,8 +113094,8 @@ self: {
      }:
      mkDerivation {
        pname = "reroute";
-       version = "0.3.0.2";
-       sha256 = "68595687d3ed7cab038a6a46c1b78349e6dcc114301164696bebbc851f9bb393";
+       version = "0.3.1.0";
+       sha256 = "5e31044f054305e119f80aa2625ecd4b7453e383d67dc44b8fdd9d64fa476fe9";
        libraryHaskellDepends = [
          base deepseq graph-core hashable hvect mtl path-pieces regex-compat
          text transformers unordered-containers vector
@@ -115626,8 +115722,8 @@ self: {
      }:
      mkDerivation {
        pname = "sasl";
-       version = "0.0.0.2";
-       sha256 = "46f092b8735cf80a8e73479a1ebeecd76309e317c38d1161ffdc7114770a9b09";
+       version = "0.0.0.1";
+       sha256 = "f43b3e48169e1e579f4fb2e3ab84410321233ef798a63b6df847df82de9f4b29";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cryptohash monads-tf papillon
          simple-pipe
@@ -117755,19 +117851,18 @@ self: {
   "servant-ede" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ede, either, filepath
      , http-media, http-types, semigroups, servant, servant-server, text
-     , transformers, unordered-containers, vector, wai, warp
-     , xss-sanitize
+     , transformers, unordered-containers, vector, warp, xss-sanitize
      }:
      mkDerivation {
        pname = "servant-ede";
-       version = "0.5";
-       sha256 = "ccbce9507058621451949cec97a0bd39524266f7001b62cbe87e7e6a529b0953";
+       version = "0.5.1";
+       sha256 = "54e929c1c77acb04e808aabc485cf80f19724330e233ae5b6255d41d45ac957c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring ede either filepath http-media http-types
          semigroups servant text transformers unordered-containers vector
-         wai xss-sanitize
+         xss-sanitize
        ];
        executableHaskellDepends = [
          base ede http-media servant-server warp
@@ -118287,8 +118382,8 @@ self: {
      }:
      mkDerivation {
        pname = "sets";
-       version = "0.0.1.1";
-       sha256 = "5f9262b02eb5e6d1caf85ae65f3b659b49e5d4b17447b8cbd52a359df8ba0a1d";
+       version = "0.0.3";
+       sha256 = "0d7c20774a94d7ccc1822bad17a0c4a0019d74dd418569d2be1222db93b3aab5";
        libraryHaskellDepends = [
          base commutative containers contravariant discrimination hashable
          set-with unordered-containers
@@ -124082,54 +124177,56 @@ self: {
 
   "stack" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring
-     , base64-bytestring, bifunctors, binary, blaze-builder, bytestring
-     , Cabal, conduit, conduit-combinators, conduit-extra, containers
-     , cryptohash, cryptohash-conduit, deepseq, directory, either
-     , enclosed-exceptions, exceptions, fast-logger, file-embed
-     , filepath, hashable, hspec, http-client, http-client-tls
+     , base64-bytestring, bifunctors, binary, blaze-builder, byteable
+     , bytestring, Cabal, conduit, conduit-combinators, conduit-extra
+     , containers, cryptohash, cryptohash-conduit, deepseq
+     , deepseq-generics, directory, either, enclosed-exceptions
+     , exceptions, extra, fast-logger, file-embed, filelock, filepath
+     , fsnotify, hashable, hastache, hspec, http-client, http-client-tls
      , http-conduit, http-types, lifted-base, monad-control
      , monad-logger, monad-loops, mtl, old-locale, optparse-applicative
      , optparse-simple, path, persistent, persistent-sqlite
-     , persistent-template, pretty, process, resourcet, safe, split, stm
-     , streaming-commons, tar, template-haskell, temporary, text, time
-     , transformers, transformers-base, unix, unix-compat
-     , unordered-containers, vector, vector-binary-instances, void
-     , word8, yaml, zlib
+     , persistent-template, pretty, process, project-template
+     , QuickCheck, resourcet, retry, safe, split, stm, streaming-commons
+     , tar, template-haskell, temporary, text, time, transformers
+     , transformers-base, unix, unix-compat, unordered-containers
+     , vector, vector-binary-instances, void, word8, yaml, zlib
      }:
      mkDerivation {
        pname = "stack";
-       version = "9.9.9";
-       sha256 = "caaaa6a2db7d2811e7ef41e95f231a4d7d3807491a0b064e7a55883584faface";
-       revision = "4";
-       editedCabalFile = "5ff7356010e14ec43684d11fcec6e34f47f794cc48a258919568cc27c72ffd34";
+       version = "0.1.3.1";
+       sha256 = "af5542c838fa33bd633cad5b9cbd411748a259a06bd0b437094c9d79b0e01e6a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson async attoparsec base base16-bytestring base64-bytestring
-         bifunctors binary bytestring Cabal conduit conduit-combinators
-         conduit-extra containers cryptohash cryptohash-conduit deepseq
-         directory enclosed-exceptions exceptions fast-logger file-embed
-         filepath hashable http-client http-client-tls http-conduit
-         http-types lifted-base monad-control monad-logger monad-loops mtl
-         old-locale optparse-applicative path persistent persistent-sqlite
-         persistent-template pretty process resourcet safe stm
-         streaming-commons tar template-haskell temporary text time
-         transformers transformers-base unix unordered-containers vector
-         vector-binary-instances void word8 yaml zlib
+         bifunctors binary blaze-builder byteable bytestring Cabal conduit
+         conduit-combinators conduit-extra containers cryptohash
+         cryptohash-conduit deepseq deepseq-generics directory
+         enclosed-exceptions exceptions extra fast-logger file-embed
+         filelock filepath fsnotify hashable hastache http-client
+         http-client-tls http-conduit http-types lifted-base monad-control
+         monad-logger monad-loops mtl old-locale optparse-applicative
+         optparse-simple path persistent persistent-sqlite
+         persistent-template pretty process project-template resourcet retry
+         safe split stm streaming-commons tar template-haskell temporary
+         text time transformers transformers-base unix unix-compat
+         unordered-containers vector vector-binary-instances void word8 yaml
+         zlib
        ];
        executableHaskellDepends = [
-         base blaze-builder bytestring conduit containers directory either
-         exceptions filepath hashable http-client http-conduit monad-logger
-         mtl old-locale optparse-applicative optparse-simple path process
-         resourcet split text transformers unordered-containers
+         base bytestring conduit containers directory either exceptions
+         filelock filepath hashable http-client http-conduit lifted-base
+         monad-control monad-logger mtl old-locale optparse-applicative
+         optparse-simple path process resourcet split text transformers
+         unordered-containers
        ];
        testHaskellDepends = [
          async base bytestring Cabal conduit conduit-extra containers
          cryptohash directory exceptions filepath hspec http-conduit
-         monad-logger path process resourcet temporary text transformers
-         unix-compat
+         monad-logger optparse-applicative path process QuickCheck resourcet
+         retry temporary text transformers unix-compat
        ];
-       jailbreak = true;
        homepage = "https://github.com/commercialhaskell/stack";
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
@@ -124934,17 +125031,17 @@ self: {
      }) {};
 
   "steeloverseer" = callPackage
-    ({ mkDerivation, base, fsnotify, process, regex-tdfa
-     , system-filepath, text, time, unix
+    ({ mkDerivation, ansi-terminal, base, filepath, fsnotify, process
+     , regex-tdfa, time, unix
      }:
      mkDerivation {
        pname = "steeloverseer";
-       version = "1.1.0.4";
-       sha256 = "76b11b12cb3cd1d38371ea9d7fb6ee290d66c089004337dd30680adecd9310f3";
+       version = "1.1.1.0";
+       sha256 = "cb255fce9ec38417473a10e00efd68450699ebb64f1ed0d683348dcd7b86a9eb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base fsnotify process regex-tdfa system-filepath text time unix
+         ansi-terminal base filepath fsnotify process regex-tdfa time unix
        ];
        homepage = "https://github.com/schell/steeloverseer";
        description = "A file watcher";
@@ -125564,6 +125661,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "streaming" = callPackage
+    ({ mkDerivation, base, ghc-prim, mmorph, mtl, transformers }:
+     mkDerivation {
+       pname = "streaming";
+       version = "0.1.0.0";
+       sha256 = "c1500a6c44d3346318891417dc9986e8081f61602237b3632b8a6e03c1b362ce";
+       libraryHaskellDepends = [ base ghc-prim mmorph mtl transformers ];
+       homepage = "https://github.com/michaelt/streaming";
+       description = "A general free monad transformer optimized for streaming applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "streaming-commons" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , deepseq, directory, hspec, network, process, QuickCheck, random
@@ -125939,6 +126048,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "strio" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "strio";
+       version = "0.0.0.0";
+       sha256 = "14cbd9da8f3c97020aa6a414e059b41d57dbcb586153c8a328c835eec8ee32bd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/yulii/strio";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stripe" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
      , mtl, text, time, unordered-containers, utf8-string
@@ -128362,23 +128487,24 @@ self: {
 
   "target" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, directory
-     , exceptions, filepath, ghc, ghc-paths, ghc-prim, liquid-fixpoint
-     , liquidhaskell, mtl, pretty, process, syb, tagged, tasty
-     , tasty-hunit, template-haskell, text, text-format, th-lift
-     , transformers, unordered-containers, vector
+     , exceptions, filepath, ghc, ghc-paths, ghc-prim, hint
+     , liquid-fixpoint, liquidhaskell, mtl, pretty, process, QuickCheck
+     , syb, tagged, tasty, tasty-hunit, template-haskell, text
+     , text-format, th-lift, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "target";
-       version = "0.1.3.0";
-       sha256 = "c6e06e486baa2a5d5fbf1461d1336d2efdae758ccef120f1ec7eb1ffb7aa3f5f";
-       revision = "1";
-       editedCabalFile = "173753da5f21d9f9d164cc546890e9ad602e339ed99351863ad1ba5df9489fb3";
+       version = "0.2.0.0";
+       sha256 = "249c5936784131d4a114dbfe920aa5dca38b1116b64138273af31710e68b735b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers directory exceptions filepath ghc ghc-paths
-         liquid-fixpoint liquidhaskell mtl pretty process syb tagged
-         template-haskell text text-format th-lift transformers
+         liquid-fixpoint liquidhaskell mtl pretty process QuickCheck syb
+         tagged template-haskell text text-format th-lift transformers
          unordered-containers vector
        ];
+       executableHaskellDepends = [ base hint ];
        testHaskellDepends = [
          array base containers deepseq ghc ghc-prim liquid-fixpoint
          liquidhaskell mtl tagged tasty tasty-hunit template-haskell
@@ -129174,6 +129300,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tempus-fugit" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "tempus-fugit";
+       version = "0.1.0.1";
+       sha256 = "d93b841938c4ae7e199a3135bbe1619bbf0e68919aee7fff72db903473644303";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/kadoban/tempus-fugit";
+       description = "Programmers' time tracker";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "tensor" = callPackage
     ({ mkDerivation, base, ghc-prim, QuickCheck, random, vector }:
      mkDerivation {
@@ -131262,17 +131404,15 @@ self: {
      }) {};
 
   "tictactoe3d" = callPackage
-    ({ mkDerivation, base, hArduino, tuples-homogenous-h98, vector }:
+    ({ mkDerivation, base, tuples-homogenous-h98, vector }:
      mkDerivation {
        pname = "tictactoe3d";
-       version = "0.1.0.0";
-       sha256 = "e4f7b7559e187ac46167313a50ac8af17ddf26cdd83f3b5dd8eeb0bfb5a8fd72";
-       libraryHaskellDepends = [
-         base hArduino tuples-homogenous-h98 vector
-       ];
+       version = "0.1.0.3";
+       sha256 = "e162cfdc30aac18f0ddb98ee3d3de72c584523937a88250742d75e0a9762ee76";
+       libraryHaskellDepends = [ base tuples-homogenous-h98 vector ];
        jailbreak = true;
        homepage = "https://github.com/ryo0ka/tictactoe3d";
-       description = "3D Tic-Tac-Toe logic";
+       description = "3D Tic-Tac-Toe game";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -133349,6 +133489,26 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "tsvsql" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , optparse-applicative, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "tsvsql";
+       version = "0.1.1.0";
+       sha256 = "3341c69cdb02a65ba0e2d31963c83bb0477f76e5afbfede7f9ceb0518fa9e3ed";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base bytestring containers optparse-applicative text
+         unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/danchoi/tsvsql";
+       description = "Template tsv into SQL";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ttrie" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, hashable
      , primitive, QuickCheck, stm, test-framework
@@ -137446,10 +137606,8 @@ self: {
     ({ mkDerivation, base, time }:
      mkDerivation {
        pname = "varying";
-       version = "0.1.1.0";
-       sha256 = "38ef53b0b042e2083b9300c682de437a095cb807f518eb708b02a1caff650b73";
-       revision = "1";
-       editedCabalFile = "85e4874332bfcfa3dde2ca4ca8157e8fe2e4aa3c2e46a273e21b563843c3d288";
+       version = "0.1.1.2";
+       sha256 = "044d0321b199cadb2b8d28edcadfcab4a48708eb49ad27e1c3baf206eb736041";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base time ];
@@ -137677,12 +137835,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector_0_10_9_3" = callPackage
+  "vector_0_10_9_2" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, primitive }:
      mkDerivation {
        pname = "vector";
-       version = "0.10.9.3";
-       sha256 = "bdcd541262bc538fa43c9b3ea2dd8c1c2cd5ac7bb9efa909a8d558753678b422";
+       version = "0.10.9.2";
+       sha256 = "8119f5d1829de64dfca7a50b96b1bd4f9ace3e9c1ffeeeaa362394dc0a27dc10";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
        jailbreak = true;
        homepage = "https://github.com/haskell/vector";
@@ -137736,10 +137894,8 @@ self: {
      }:
      mkDerivation {
        pname = "vector-algorithms";
-       version = "0.7";
-       sha256 = "9dfded48c97f4ff765b18ae5acd264361e1299736111ac73895848d8f6ab56c6";
-       revision = "1";
-       editedCabalFile = "ba3ba4dbfe97dc45be68d13c51ba4425900b186a46cdf3eceaafb746030c1b95";
+       version = "0.7.0.1";
+       sha256 = "ed460a41ca068f568bc2027579ab14185fbb72c7ac469b5179ae5f8a52719070";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring primitive vector ];
@@ -141329,19 +141485,6 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "word12" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "word12";
-       version = "1.0.0";
-       sha256 = "ac349f12442d28d47e1ab1bb5a91503eff3ec896a9d5831dd0779130f41642a5";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [ base bytestring hspec QuickCheck ];
-       homepage = "http://github.com/minpou/word12";
-       description = "Word12 library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "word24" = callPackage
     ({ mkDerivation, base, QuickCheck, test-framework
      , test-framework-quickcheck2
@@ -143775,8 +143918,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.8.12";
-       sha256 = "311df4961499b7ea4899c787a1e64efff70f1a6cb2e00fb15c626b806c60b75a";
+       version = "0.8.13";
+       sha256 = "f366bdd6ddbc5f94f3f783b502178dcd27afc257bdf5e8d67fcf9246aeed0f7a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144474,19 +144617,19 @@ self: {
 
   "yesod-auth-oauth2" = callPackage
     ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2
-     , http-conduit, http-types, lifted-base, network-uri, random, text
-     , transformers, yesod-auth, yesod-core, yesod-form
+     , http-client, http-conduit, http-types, lifted-base, network-uri
+     , random, text, transformers, vector, yesod-auth, yesod-core
+     , yesod-form
      }:
      mkDerivation {
        pname = "yesod-auth-oauth2";
-       version = "0.1.2";
-       sha256 = "c94fb52e7a873968a31a81c00356f4bbd4f88f7a3d3b5fea8b2115272c62f9ae";
+       version = "0.1.3";
+       sha256 = "43d45faa146f5f3cddc80e8cff76c7091a21bd4ecd0042f1e6dad39b2134a1b9";
        libraryHaskellDepends = [
-         aeson authenticate base bytestring hoauth2 http-conduit http-types
-         lifted-base network-uri random text transformers yesod-auth
-         yesod-core yesod-form
+         aeson authenticate base bytestring hoauth2 http-client http-conduit
+         http-types lifted-base network-uri random text transformers vector
+         yesod-auth yesod-core yesod-form
        ];
-       jailbreak = true;
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
        description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -144560,8 +144703,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.13.2";
-       sha256 = "6ba51159341dc4e13e166cd54cd5af414ea1829f25c4d2f15eeac4507339530f";
+       version = "1.4.13.3";
+       sha256 = "cc84e0c8f081211c01a6c8d58544b9b7fe5c5c180d8a2edcb30a79edbe198e61";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -144657,10 +144800,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.4.12";
-       sha256 = "035387453f60a9476ac6646675da147eb4b6859c48393732b72f31841e15b7e9";
-       revision = "1";
-       editedCabalFile = "a6f72da0eb68bc2d5da1d8d8aaa758403e5e86f6de3c61cde01376fd51e50c35";
+       version = "1.4.13";
+       sha256 = "219bf0858977468d9aa74ab5f2d330e46bbbe95d700c989b3565be5d99d319da";
        libraryHaskellDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          bytestring case-insensitive cereal clientsession conduit
@@ -145350,14 +145491,15 @@ self: {
 
   "yesod-routes-flow" = callPackage
     ({ mkDerivation, attoparsec, base, classy-prelude, system-fileio
-     , text, yesod-core
+     , system-filepath, text, yesod-core
      }:
      mkDerivation {
        pname = "yesod-routes-flow";
-       version = "1.0";
-       sha256 = "a04e8299c5c53488ed494fc0125bcc9a132f61ff229b584964df561052e060ad";
+       version = "1.0.2";
+       sha256 = "92a5e954137d9b2fa32d241522eeacca102a64cde97a46845e5426005324531b";
        libraryHaskellDepends = [
-         attoparsec base classy-prelude system-fileio text yesod-core
+         attoparsec base classy-prelude system-fileio system-filepath text
+         yesod-core
        ];
        homepage = "https://github.com/frontrowed/yesod-routes-flow";
        description = "Generate Flow routes for Yesod";

From b2fd8c4685401eac0ebf49621bfb1b55448c52df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Aug 2015 10:05:50 +0200
Subject: [PATCH 1168/2016] haskell-configuration-ghc-7.10.x: fix evaluation
 error

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e78aa0e9839..9147bb9c215 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -233,7 +233,7 @@ self: super: {
   optparse-applicative_0_10_0 = markBroken super.optparse-applicative_0_10_0;
   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_3 = markBroken super.vector_0_10_9_3;
+  vector_0_10_9_2 = markBroken super.vector_0_10_9_2;
 
   # http://hub.darcs.net/shelarcy/regex-tdfa-text/issue/1 -- upstream seems to be asleep
   regex-tdfa-text = appendPatch super.regex-tdfa-text ./patches/regex-tdfa-text.patch;

From 19b26260cac9d88f7876578d3caddf4e381a22d2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Aug 2015 10:06:24 +0200
Subject: [PATCH 1169/2016] haskell-exinst is broken because of singletons

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5957ce812ac..00ca523b863 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -788,6 +788,11 @@ self: super: {
   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;

From 8647667e93a22a0dc66e1f8305e2e23dfdef1572 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Aug 2015 17:29:48 +0200
Subject: [PATCH 1170/2016] haskell-bro is broken

---
 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 00ca523b863..1c97fa44f1d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -909,6 +909,10 @@ self: super: {
   # https://github.com/liyang/thyme/issues/36
   thyme = dontCheck super.thyme;
 
+  # https://github.com/k0ral/hbro/issues/15
+  hbro = markBroken super.hbro;
+  hbro-contrib = dontDistribute super.hbro-contrib;
+
   # https://github.com/aka-bash0r/multi-cabal/issues/4
   multi-cabal = markBroken super.multi-cabal;
 

From 8347e3f19f0ea649bb6c37f154d27194b8e19982 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Aug 2015 17:38:57 +0200
Subject: [PATCH 1171/2016] Disable all Hackage packages related to Elm.

Upstream created its own distribution mechanism and doesn't rely on
Hackage any more.
---
 .../haskell-modules/configuration-common.nix  | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1c97fa44f1d..61e45edf8f2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -37,11 +37,6 @@ self: super: {
   # Use the default version of mysql to build this package (which is actually mariadb).
   mysql = super.mysql.override { mysql = pkgs.mysql.lib; };
 
-  # Please also remove optparse-applicative special case from
-  # cabal2nix/hackage2nix.hs when removing the following.
-  elm-make = super.elm-make.override { optparse-applicative = self.optparse-applicative_0_10_0; };
-  elm-package = super.elm-package.override { optparse-applicative = self.optparse-applicative_0_10_0; };
-
   # Link the proper version.
   zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
 
@@ -398,7 +393,6 @@ self: super: {
   dotfs = dontCheck super.dotfs;                        # http://hydra.cryp.to/build/498599/log/raw
   DRBG = dontCheck super.DRBG;                          # http://hydra.cryp.to/build/498245/nixlog/1/raw
   either-unwrap = dontCheck super.either-unwrap;        # http://hydra.cryp.to/build/498782/log/raw
-  elm-repl = dontCheck super.elm-repl;                  # http://hydra.cryp.to/build/501878/nixlog/1/raw
   etcd = dontCheck super.etcd;
   fb = dontCheck super.fb;                              # needs credentials for Facebook
   fptest = dontCheck super.fptest;                      # http://hydra.cryp.to/build/499124/log/raw
@@ -916,4 +910,19 @@ self: super: {
   # https://github.com/aka-bash0r/multi-cabal/issues/4
   multi-cabal = markBroken super.multi-cabal;
 
+  # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233.
+  Elm = markBroken super.Elm;
+  elm-bridge = markBroken super.elm-bridge;
+  elm-build-lib = markBroken super.elm-build-lib;
+  elm-compiler = markBroken super.elm-compiler;
+  elm-core-sources = markBroken super.elm-core-sources;
+  elm-get = markBroken super.elm-get;
+  elm-init = markBroken super.elm-init;
+  elm-make = markBroken super.elm-make;
+  elm-package = markBroken super.elm-package;
+  elm-reactor = markBroken super.elm-reactor;
+  elm-repl = markBroken super.elm-repl;
+  elm-server = markBroken super.elm-server;
+  elm-yesod = markBroken super.elm-yesod;
+
 }

From c4c2ee0d527d878571c009aea7092f1ed179bd5b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Aug 2015 20:39:20 +0200
Subject: [PATCH 1172/2016] haskell-configuration-ghc-7.10.x: fix Hydra
 evaluation errors

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9147bb9c215..5e251c561c4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -230,10 +230,10 @@ self: super: {
   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;
-  optparse-applicative_0_10_0 = markBroken super.optparse-applicative_0_10_0;
   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;
 
   # http://hub.darcs.net/shelarcy/regex-tdfa-text/issue/1 -- upstream seems to be asleep
   regex-tdfa-text = appendPatch super.regex-tdfa-text ./patches/regex-tdfa-text.patch;

From 482c29f8c6077a8ecba9c7d6ee5035451fc78396 Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Sat, 15 Aug 2015 10:35:36 +0300
Subject: [PATCH 1173/2016] haskell-hans: disable building example webserver
 which includes double main.

---
 .../haskell-modules/configuration-common.nix          |  2 ++
 .../patches/hans-disable-webserver.patch              | 11 +++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/patches/hans-disable-webserver.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 61e45edf8f2..758397de1ab 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -925,4 +925,6 @@ self: super: {
   elm-server = markBroken super.elm-server;
   elm-yesod = markBroken super.elm-yesod;
 
+  # https://github.com/GaloisInc/HaNS/pull/8
+  hans = appendPatch super.hans ./patches/hans-disable-webserver.patch;
 }
diff --git a/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch b/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch
new file mode 100644
index 00000000000..14f7e51fdf2
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch
@@ -0,0 +1,11 @@
+diff -Naur hans-2.5.0.0/hans.cabal hans-2.5.0.1/hans.cabal
+--- hans-2.5.0.0/hans.cabal     2015-08-06 14:48:45.453072822 +0300
++++ hans-2.5.0.1/hans.cabal     2015-08-06 14:49:13.044391528 +0300
+@@ -30,6 +30,7 @@
+         description:    Build the example program
+
+ flag web-server
++        default:        False
+         description:    Build a simple web-server example
+
+ flag word32-in-random

From f9e3908397bcf5b74f0ef1a48d6b99d87095008f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Jul 2015 10:01:06 +0000
Subject: [PATCH 1174/2016] blaze: init at 0.8.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd91cd41c38..4a52ba8a347 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1305,6 +1305,33 @@ let
       maintainers = with maintainers; [ bjornfor ];
     };
   };
+  
+  blaze = buildPythonPackage rec {
+    name = "blaze-${version}";
+    version = "0.8.2";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/b/blaze/${name}.tar.gz";
+      sha256 = "1abedabf2a1e62dd059e0942d60f27337763de26f5e3f61ed55baaf97723b624";
+    };
+    
+    propagatedBuildInputs = with self; [
+      numpy
+      pandas
+      datashape
+      odo
+      toolz
+      multipledispatch
+      sqlalchemy9 # sqlalchemy8 should also work
+      psutil
+    ];
+    
+    meta = {
+      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;
+    };
+  };
 
   bleach = buildPythonPackage rec {
     version = "v1.4";

From 85ec308f8b2f439466ff1f1cc24ee6b61188e113 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:28:45 +0200
Subject: [PATCH 1175/2016] python-packages setuptools_scm: 1.5.4 -> 1.7.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd91cd41c38..2117b185a97 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12101,11 +12101,11 @@ let
 
   setuptools_scm = buildPythonPackage rec {
     name = "setuptools_scm-${version}";
-    version = "1.5.4";
+    version = "1.7.0";
 
     src = pkgs.fetchurl {
-      url = "https://bitbucket.org/pypa/setuptools_scm/get/v${version}.tar.bz2";
-      sha256 = "0vd6xsl7r0vn5gpw87d31s195j33sqw5c26zdagimy9qzydgq6y6";
+      url = "https://pypi.python.org/packages/source/s/setuptools_scm/${name}.tar.gz";
+      sha256 = "f2f69c782b4f549003edf5b75b356b37f40a4e880b615996c5d9c117913d6f9c";
     };
 
     buildInputs = with self; [ pip ];

From 3f20baee5447cbbaa750283e16ee0641be79f950 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 14 Aug 2015 23:23:30 +0200
Subject: [PATCH 1176/2016] python-packages pexpect: 2.3 -> 3.3

Tests worked.
---
 pkgs/top-level/python-packages.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd91cd41c38..6fee4ac68f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9095,17 +9095,15 @@ let
   };
 
 
-  pexpect = buildPythonPackage {
-    name = "pexpect-2.3";
+  pexpect = buildPythonPackage rec {
+    version = "3.3";
+    name = "pexpect-${version}";
 
     src = pkgs.fetchurl {
-      url = "mirror://sourceforge/pexpect/pexpect-2.3.tar.gz";
-      sha256 = "0x8bfjjqygriry1iyygm5048ykl5qpbpzqfp6i8dhkslm3ryf5fk";
+      url = "https://pypi.python.org/packages/source/p/pexpect/${name}.tar.gz";
+      sha256 = "dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba";
     };
 
-    # error: invalid command 'test'
-    doCheck = false;
-
     meta = {
       homepage = http://www.noah.org/wiki/Pexpect;
       description = "Automate interactive console applications such as ssh, ftp, etc";

From 691f683c8c3e5423bfe39e3c12f5a325130ec014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 9 Feb 2015 21:49:01 +0100
Subject: [PATCH 1177/2016] types.nix: better error message for non-paths

This improves error messages when a set or a list is used where a path
was expected. For an example, if you used a package set (as opposed to a
single package) in systemPackages before this commit, the error was:

```
cannot coerce a list to a string, at "/home/nixpkgs/lib/types.nix":103:37
```

Now, the error message reads:

```
The option value `environment.systemPackages' in `/etc/nixos/configuration.nix' is not a list of paths.
```
---
 lib/types.nix                        | 3 ++-
 nixos/modules/config/system-path.nix | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index a7f9bf1946e..27b653ebb6c 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -103,7 +103,8 @@ rec {
     path = mkOptionType {
       name = "path";
       # Hacky: there is no ‘isPath’ primop.
-      check = x: builtins.substring 0 1 (toString x) == "/";
+      # need to check isString first because otherwise toString throws an error.
+      check = x: builtins.isString x && builtins.substring 0 1 (toString x) == "/";
       merge = mergeOneOption;
     };
 
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 62390f452ba..d7979593f40 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -57,7 +57,7 @@ in
     environment = {
 
       systemPackages = mkOption {
-        type = types.listOf types.path;
+        type = types.listOf types.package;
         default = [];
         example = literalExample "[ pkgs.firefox pkgs.thunderbird ]";
         description = ''

From 9413a340dbf0988555a6f0eba9bdc632b06e4f39 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 15 Aug 2015 09:35:41 -0300
Subject: [PATCH 1178/2016] Sword: 1.7.3 -> 1.7.4

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

diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index 6faf2224b0c..6091bb3c8bb 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -2,13 +2,12 @@
 
 stdenv.mkDerivation rec {
 
-  version = "1.7.3";
-
   name = "sword-${version}";
+  version = "1.7.4";
 
   src = fetchurl {
     url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz";
-    sha256 = "1sm9ivypsx3mraqnziic7qkxjx1b7crvlln0zq6cnpjx2pzqfgas";
+    sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr";
   };
 
   buildInputs = [ pkgconfig icu clucene_core curl ];

From 7cd6b3cf7666455319769ff7c863ab8a08a1720e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 15 Aug 2015 15:38:12 +0200
Subject: [PATCH 1179/2016] Revert change of path type

The change caused lots of evaluation errors, since it caused derivations to no longer be valid paths as well.
---
 lib/types.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index 27b653ebb6c..a7f9bf1946e 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -103,8 +103,7 @@ rec {
     path = mkOptionType {
       name = "path";
       # Hacky: there is no ‘isPath’ primop.
-      # need to check isString first because otherwise toString throws an error.
-      check = x: builtins.isString x && builtins.substring 0 1 (toString x) == "/";
+      check = x: builtins.substring 0 1 (toString x) == "/";
       merge = mergeOneOption;
     };
 

From f7771131b6ff0eaa2bfb5ed969a98cd7cc78220b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 15 Aug 2015 17:12:07 +0300
Subject: [PATCH 1180/2016] nixos/tests/lightdm: Fix waiting for the login to
 succeed

Currently the lightdm test detects a successful login by OCR'ing the
screen and searching for the clock widget's text.  Since the last
IceWM update (commit bdd20ced), either the font or the colors of the
clock changed such that the OCR doesn't pick it up anymore.

Instead, just look for a matching (root) window title, e.g.
"IceWM 1.3.9 (Linux/i686)"
---
 nixos/tests/lightdm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix
index b355081ffd6..67bd395be06 100644
--- a/nixos/tests/lightdm.nix
+++ b/nixos/tests/lightdm.nix
@@ -22,7 +22,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     $machine->waitForText(qr/${user.description}/);
     $machine->screenshot("lightdm");
     $machine->sendChars("${user.password}\n");
-    $machine->waitForText(qr/^\d{2}(?::\d{2}){2} (?:AM|PM)$/m);
+    $machine->waitForWindow("^IceWM ");
     $machine->screenshot("session");
   '';
 })

From 923006c5f1f4833cddc87feb07343a48a478689f Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 15 Aug 2015 12:35:01 -0300
Subject: [PATCH 1181/2016] Xiphos: 4.0.0 -> 4.0.3-20150806

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

diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index 78d49939677..450a756b450 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   name = "xiphos-${version}";  
-  version = "4.0.0";
+  version = "4.0.3-20150806";
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/${version}/${name}.tar.gz";
-    sha256 = "0rk9xhnaqm17af9ppjf2yqpy9p8s0z7m5ax586b7p16lylcqjh68";
+    sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv";
   };
 
   buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt

From b34371b5e5dfb29d9531a26f54a40db19e0548dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Aug 2015 09:04:36 +0200
Subject: [PATCH 1182/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/ba50dba1bca06cdcd294efb51d38d86b50296998
 with hackage2nix v20150807-31-g34b77b8

---
 .../haskell-modules/hackage-packages.nix      | 89 ++++++++++++-------
 1 file changed, 59 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 99b45ddc0d5..fcafdb989dc 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5286,8 +5286,8 @@ self: {
      }:
      mkDerivation {
        pname = "GLFW-b";
-       version = "1.4.7.2";
-       sha256 = "2d838331c329cd29df221a73dccadab29b42650141c11d180a11f389bdd95ac2";
+       version = "1.4.7.3";
+       sha256 = "fbc6ee746efb16ec6ee83cd251c81c116b58f774146693e2f03a963154abe013";
        libraryHaskellDepends = [ base bindings-GLFW ];
        testHaskellDepends = [
          base bindings-GLFW HUnit test-framework test-framework-hunit
@@ -25745,8 +25745,8 @@ self: {
      }:
      mkDerivation {
        pname = "bindings-GLFW";
-       version = "3.1.1.3";
-       sha256 = "5f04d667fc0a84c745aeb8edf6747199e6bb54f3df80cc8f66e31588faa7f05f";
+       version = "3.1.1.4";
+       sha256 = "35bbb18f6e3821f88ac72f8d3b307da3e991d7d9ae9565b81a56fb994e72f3c1";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [
          libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr
@@ -29593,6 +29593,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-ghc-dynflags" = callPackage
+    ({ mkDerivation, base, Cabal, ghc, transformers }:
+     mkDerivation {
+       pname = "cabal-ghc-dynflags";
+       version = "0.1.0.1";
+       sha256 = "0e71145e966f450737f1598e20964e9453f64b69f6459a9dfa4a015e7ea57d8e";
+       libraryHaskellDepends = [ base Cabal ghc transformers ];
+       homepage = "http://github.com/bgamari/cabal-ghc-dynflags";
+       description = "Conveniently configure GHC's dynamic flags for use with Cabal projects";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cabal-ghci" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, process }:
      mkDerivation {
@@ -43908,12 +43920,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_2_3_0" = callPackage
+  "directory_1_2_3_1" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.2.3.0";
-       sha256 = "96caf85bf0eca765523507f0672c667b10b75646af46d7057adaf80701b72194";
+       version = "1.2.3.1";
+       sha256 = "250a07a1e67be4a6381c2637f99ad7c0ff948eb1f09b727c5f5fcddc192afc87";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -56594,8 +56606,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitit";
-       version = "0.11.1";
-       sha256 = "29bbb782e2066bf831ad1aff471208e928310fc9ab6bfb32a775cd7521f19d1b";
+       version = "0.11.1.1";
+       sha256 = "bc8a5662a8e262a3ebaba270f54781db28407acd2fb441fbadc6df019d7a8ec4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79973,6 +79985,7 @@ self: {
          network old-locale split stm text time tls transformers vty x509
          x509-store x509-system x509-validation
        ];
+       jailbreak = true;
        homepage = "https://github.com/glguy/irc-core";
        description = "An IRC client library and text client";
        license = stdenv.lib.licenses.bsd3;
@@ -92796,8 +92809,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.16";
-       sha256 = "833ab0000c1db92e20f90a5515e456cbae36bb284b82b81a41d9786f75847d09";
+       version = "0.1.0.17";
+       sha256 = "64555b88f01d9c42a60cdf7e035fc9c1178345f38a9d0611955618dbdf56df1e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -101291,8 +101304,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.7.3";
-       sha256 = "72fc81d962812d037bb78c6d38d602ca2c6895f0436c8be94cb71600ed288e68";
+       version = "0.7.3.1";
+       sha256 = "b2e9b814603dbb60b845fa14d767a154e43a2115a9a81b218a173e9bc1a319f5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108293,8 +108306,8 @@ self: {
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20150808";
-       sha256 = "b31d226e96ba114ef012b53644dc71a2b1f622367ca1789c56a4a6bf0b8995b5";
+       version = "0.20150814";
+       sha256 = "809fa6a08ed47540b7536811af17075b180b2d2a65508f9090c28614677c0edb";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -109698,6 +109711,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quiver-http" = callPackage
+    ({ mkDerivation, base, bytestring, http-client, http-client-tls
+     , quiver
+     }:
+     mkDerivation {
+       pname = "quiver-http";
+       version = "0.0.0.1";
+       sha256 = "3c55e3de17b1cc41b4f2e0a3ea184b57a3e8c7be6d7c1eb0176aa538a29de292";
+       libraryHaskellDepends = [
+         base bytestring http-client http-client-tls quiver
+       ];
+       homepage = "https://github.com/christian-marie/quiver-http/";
+       description = "Adapter to stream over HTTP(s) with quiver";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "quoridor-hs" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , directory, dlist, exceptions, filepath, hex, HUnit, mtl, network
@@ -125665,8 +125694,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "streaming";
-       version = "0.1.0.0";
-       sha256 = "c1500a6c44d3346318891417dc9986e8081f61602237b3632b8a6e03c1b362ce";
+       version = "0.1.0.1";
+       sha256 = "ad40782a54720be7e19d09c9a757511e2d7489681d68c86b4cb9e2169a8bde0d";
        libraryHaskellDepends = [ base ghc-prim mmorph mtl transformers ];
        homepage = "https://github.com/michaelt/streaming";
        description = "A general free monad transformer optimized for streaming applications";
@@ -138722,20 +138751,20 @@ self: {
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , data-default, deepseq, directory, filepath, hashable, HUnit, lens
      , mtl, parallel, parsec, QuickCheck, quickcheck-assertions, random
-     , smallcheck, string-qq, terminfo, test-framework
+     , smallcheck, stm, string-qq, terminfo, test-framework
      , test-framework-hunit, test-framework-smallcheck, text
      , transformers, unix, utf8-string, vector
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.3.1";
-       sha256 = "3f9c18de862ee186772f0c91f18c70fc83acc9536c10f73e6714cdb092db8266";
+       version = "5.4.0";
+       sha256 = "2f318a1919089e5ad2af8ba142e638b5ad90c522d006553011dca48e707489d2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base blaze-builder bytestring containers data-default deepseq
-         directory filepath hashable lens mtl parallel parsec terminfo text
-         transformers unix utf8-string vector
+         directory filepath hashable lens mtl parallel parsec stm terminfo
+         text transformers unix utf8-string vector
        ];
        executableHaskellDepends = [
          base containers data-default lens mtl
@@ -138743,7 +138772,7 @@ self: {
        testHaskellDepends = [
          base blaze-builder bytestring Cabal containers data-default deepseq
          HUnit lens mtl QuickCheck quickcheck-assertions random smallcheck
-         string-qq terminfo test-framework test-framework-hunit
+         stm string-qq terminfo test-framework test-framework-hunit
          test-framework-smallcheck text unix utf8-string vector
        ];
        homepage = "https://github.com/coreyoconnor/vty";
@@ -138758,8 +138787,8 @@ self: {
      }:
      mkDerivation {
        pname = "vty-examples";
-       version = "5.2.0";
-       sha256 = "1dc940612be529b0b2d23aba6572ccfc5a19be6afd87d10c2a2e15afcb7bdec7";
+       version = "5.4.0";
+       sha256 = "4c324ed6d398c8792f84860252680ee2b2a3a32ed158a647423818ee08b7ca17";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -138767,7 +138796,6 @@ self: {
          mtl parallel parsec QuickCheck random string-qq terminfo text unix
          utf8-string vector vty
        ];
-       jailbreak = true;
        homepage = "https://github.com/coreyoconnor/vty";
        description = "Examples programs using the vty library";
        license = stdenv.lib.licenses.bsd3;
@@ -145680,14 +145708,15 @@ self: {
      }) {};
 
   "yesod-table" = callPackage
-    ({ mkDerivation, base, containers, contravariant, text, yesod-core
+    ({ mkDerivation, base, bytestring, containers, contravariant, text
+     , yesod-core
      }:
      mkDerivation {
        pname = "yesod-table";
-       version = "1.0.3";
-       sha256 = "45be0cd3a30dcd165b7e8c1f27ec3a4fc428ffb801ac2029dcec7f107d6b870b";
+       version = "1.0.4";
+       sha256 = "d0de749b9875ad2f744366c48abe0cca88cf96608cdc3462d888c95dfddf1789";
        libraryHaskellDepends = [
-         base containers contravariant text yesod-core
+         base bytestring containers contravariant text yesod-core
        ];
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";

From aae5f5d80ed2b15c1c9e1ac242807dd642b4f937 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Aug 2015 09:01:28 +0200
Subject: [PATCH 1183/2016] ghc-mod has been fixed upstream.

---
 .../haskell-modules/configuration-ghc-7.10.x.nix         | 9 ---------
 1 file changed, 9 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 5e251c561c4..cbc9ed32f76 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -199,15 +199,6 @@ self: super: {
   pell = dontDistribute super.pell;
   quadratic-irrational = dontDistribute super.quadratic-irrational;
 
-  # https://github.com/kazu-yamamoto/ghc-mod/issues/437
-  ghc-mod = markBroken super.ghc-mod;
-  HaRe = dontDistribute super.HaRe;
-  ghc-imported-from = dontDistribute super.ghc-imported-from;
-  git-vogue = dontDistribute super.git-vogue;
-  haskell-token-utils = dontDistribute super.haskell-token-utils;
-  hbb = dontDistribute super.hbb;
-  hsdev = dontDistribute super.hsdev;
-
   # https://github.com/lymar/hastache/issues/47
   hastache = dontCheck super.hastache;
 

From 23761a4fd6ed9a14626ed2506fc0af78190f8990 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Aug 2015 20:12:15 +0200
Subject: [PATCH 1184/2016] haskell-yi is broken

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 758397de1ab..a71dae696cf 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -927,4 +927,12 @@ self: super: {
 
   # https://github.com/GaloisInc/HaNS/pull/8
   hans = appendPatch super.hans ./patches/hans-disable-webserver.patch;
+
+  # https://github.com/yi-editor/yi/issues/776
+  yi = markBroken super.yi;
+  yi-monokai = dontDistribute super.yi-monokai;
+  yi-snippet = dontDistribute super.yi-snippet;
+  yi-solarized = dontDistribute super.yi-solarized;
+  yi-spolsky = dontDistribute super.yi-spolsky;
+
 }

From b0784c2dc801246d4e81a3b0c704d6f67e8704e0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Aug 2015 20:14:47 +0200
Subject: [PATCH 1185/2016] haskell-commutative can't compile its test suite.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a71dae696cf..7f8e2987571 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -935,4 +935,7 @@ self: super: {
   yi-solarized = dontDistribute super.yi-solarized;
   yi-spolsky = dontDistribute super.yi-spolsky;
 
+  # https://github.com/athanclark/commutative/issues/1
+  commutative = dontCheck super.commutative;
+
 }

From 4c7d928f0b2b72cb5ca64c1cff8d1b78af25153b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Aug 2015 20:22:18 +0200
Subject: [PATCH 1186/2016] haskell-msgpack-rpc can't execute its test suite in
 a chroot environment.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7f8e2987571..4d7d4a95635 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -314,6 +314,7 @@ self: super: {
   xkbcommon = dontCheck super.xkbcommon;
   xmlgen = dontCheck super.xmlgen;
   ide-backend = dontCheck super.ide-backend;
+  msgpack-rpc = dontCheck super.msgpack-rpc;
 
   # These packages try to access the network.
   amqp = dontCheck super.amqp;

From a1d4e7ff70347814cb48c4adfb91c66ff8e5d341 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 15 Aug 2015 12:33:15 +0200
Subject: [PATCH 1187/2016] u9fs: move from googlecode to bitbucket

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

diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix
index dc855294fbd..e60a74eaf89 100644
--- a/pkgs/servers/u9fs/default.nix
+++ b/pkgs/servers/u9fs/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "u9fs-20110513";
   src = fetchhg {
-    url = https://code.google.com/p/u9fs;
+    url = http://bitbucket.org/plan9-from-bell-labs/u9fs;
     rev = "9474edb23b11";
     sha256 = "0irwyk8vnvx0fmz8lmbdb2jrlvas8imr61jr76a1pkwi9wpf2wv6";
   };
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib;
     { description = "Serve 9P from Unix";
-      homepage = https://code.google.com/p/u9fs;
+      homepage = http://plan9.bell-labs.com/magic/man2html/4/u9fs;
       license = licenses.free;
       maintainers = [ maintainers.emery ];
       platforms = platforms.unix;

From 789ae5333bdbef2218301501739e58cc879ccbe0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 15 Aug 2015 12:36:33 +0200
Subject: [PATCH 1188/2016] logkeys: move from googlecode to github

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

diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix
index ae7fa2316bc..ab1f2e01f5d 100644
--- a/pkgs/tools/security/logkeys/default.nix
+++ b/pkgs/tools/security/logkeys/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "5ef6b0dcb9e3";
 
   src = fetchgit {
-    url = "https://code.google.com/p/logkeys/";
+    url = https://github.com/kernc/logkeys;
     rev = "5ef6b0dcb9e38e6137ad1579d624ec12107c56c3";
     sha256 = "02p0l92l0fq069g31ks6xbqavzxa9njj9460vw2jsa7livcn2z9d";
   };
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A GNU/Linux keylogger that works!";
     license = licenses.gpl3;
-    homepage = http://code.google.com/p/logkeys/;
+    homepage = https://github.com/kernc/logkeys;
     maintainers = with maintainers; [offline];
     platforms = with platforms; linux;
   };

From 72bfb93beb34d0e196c522bd82303bc318836d2a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 15 Aug 2015 12:42:22 +0200
Subject: [PATCH 1189/2016] plowshare: move from googlecode to github

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

diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix
index 79cb29b20ca..40540ad1c20 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchgit, makeWrapper, curl, spidermonkey }:
+{ stdenv, fetchFromGitHub, makeWrapper, curl, spidermonkey }:
 
 stdenv.mkDerivation rec {
 
   name = "plowshare4-${version}";
-
   version = "1.1.0";
 
-  src = fetchgit {
-    url = "https://code.google.com/p/plowshare/";
-    rev = "87bd955e681ddda05009ca8594d727260989d5ed";
-    sha256 = "0cbsnalmr6fa1ijsn1j1p9fdqi3ii96bx3xabgvvbbqkl7q938f9";
+  src = fetchFromGitHub {
+    owner = "mcrapet";
+    repo = "plowshare";
+    rev = "v${version}";
+    sha256 = "1xxkdv4q97dfzbcdnmy5079a59fwh8myxlvdr2dlxdv70fb72sq9";
   };
 
   buildInputs = [ makeWrapper ];

From d0f75b4391bd48dbbccb545225e73576360cf5ee Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 15 Aug 2015 12:46:41 +0200
Subject: [PATCH 1190/2016] filegive: move from googlecode to github

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

diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index d7d867cc8df..d20cb3c3785 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -6,7 +6,7 @@ let
 
   # Code with BSD license
   srcNatPMP = fetchgit {
-    url = "https://code.google.com/p/go-nat-pmp/";
+    url = https://github.com/jackpal/go-nat-pmp;
     rev = "e04deda90d56";
     sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb";
   };

From c90ed187de1d2c194184c9c7adbc2d98467b3166 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Aug 2015 21:17:29 +0200
Subject: [PATCH 1191/2016] doc/haskell-users-guide.xml: fix "nix-store
 --repair-path" example

---
 doc/haskell-users-guide.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml
index e0dc89cc7ce..9a945d30a9b 100644
--- a/doc/haskell-users-guide.xml
+++ b/doc/haskell-users-guide.xml
@@ -712,7 +712,7 @@ text-1.2.0.4-98506efb1b9ada233bb5c2b2db516d91
     </para>
     <programlisting>
 # nix-store -q --referrers /nix/store/*-haskell-text-1.2.0.4 \
-  | nix-store --repair-path --option binary-caches http://hydra.nixos.org
+  | xargs -L 1 nix-store --repair-path --option binary-caches http://hydra.nixos.org
 </programlisting>
     <para>
       If you're using additional Hydra servers other than

From 67c9a485b71fdea89b1c5fd42f7b09fa3684be63 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 15 Aug 2015 22:39:03 +0100
Subject: [PATCH 1192/2016] direnv: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index f21b879d5e5..e05889fdb4b 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -1,14 +1,14 @@
 { fetchurl, stdenv, go }:
 
 let
-  version = "2.6.0";
+  version = "2.7.0";
 in
 stdenv.mkDerivation {
   name = "direnv-${version}";
   src = fetchurl {
     url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz";
     name = "direnv-${version}.tar.gz";
-    sha256 = "b85aac4d6a4ddf2daf193aabb3b2faf89e56507d33d763ab74cc7eb0b524ac03";
+    sha256 = "3cfa8f41e740c0dc09d854f3833058caec0ea0d67d19e950f97eee61106b0daf";
   };
 
   buildInputs = [ go ];

From cff84b2a71c75e8ae0cc479bb2bd9b8dce40fac0 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Thu, 13 Aug 2015 23:19:38 -0400
Subject: [PATCH 1193/2016] chromium: improvement.

Fixed `*.desktop` refering to nix store for its icon.
---
 pkgs/applications/networking/browsers/chromium/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 96852e93cb9..9a7f4a2757e 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -42,7 +42,7 @@ let
   desktopItem = makeDesktopItem {
     name = "chromium";
     exec = "chromium %U";
-    icon = "${chromium.browser}/share/icons/hicolor/48x48/apps/chromium.png";
+    icon = "chromium";
     comment = "An open source web browser from Google";
     desktopName = "Chromium";
     genericName = "Web browser";

From 8914e1af6d1becc92eae50eedfd5dccfeacb876d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 15 Aug 2015 17:33:37 +0300
Subject: [PATCH 1194/2016] nixos-generate-config: Don't enable vbox guest via
 deprecated option

Avoids this warning when running `nixos-rebuild switch`:
````
building Nix...
building the system configuration...
trace: Obsolete option `services.virtualboxGuest.enable' is used. It was renamed to `virtualisation.virtualbox.guest.enable'.
````
---
 nixos/modules/installer/tools/nixos-generate-config.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 9010478662c..39ef4c51ba1 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -235,7 +235,7 @@ chomp $virt;
 # Check if we're a VirtualBox guest.  If so, enable the guest
 # additions.
 if ($virt eq "oracle") {
-    push @attrs, "services.virtualboxGuest.enable = true;"
+    push @attrs, "virtualisation.virtualbox.guest.enable = true;"
 }
 
 

From c34d852ea1bcb643e293cc7c93639a3cd863286e Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 16 Aug 2015 01:46:50 +0200
Subject: [PATCH 1195/2016] kbd: really do include neo layout

---
 pkgs/os-specific/linux/kbd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index fba63daf8e5..4c6f33b1d80 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     ''
       mkdir -p data/keymaps/i386/neo
       cat "$neoSrc" > data/keymaps/i386/neo/neo.map
-      sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.in
+      sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.am
 
       # Add the dvp keyboard in the dvorak folder
       ${gzip}/bin/gzip -c -d ${dvpSrc} > data/keymaps/i386/dvorak/dvp.map

From 0935ef2913542cf843064f6b690a740bcd6db08f Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 15 Aug 2015 22:36:44 -0300
Subject: [PATCH 1196/2016] BibleSync: init at 1.1.2

Biblesync is a dependency of new Xiphos.
---
 .../libraries/biblesync/default.nix           | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/biblesync/default.nix

diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix
new file mode 100644
index 00000000000..4b7be5ca3d4
--- /dev/null
+++ b/pkgs/development/libraries/biblesync/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, cmake, libuuid }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+  name = "biblesync-${version}";
+  version = "1.1.2";
+
+  src = fetchurl{
+    url = "http://downloads.sourceforge.net/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz";
+    sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8";
+  };
+
+  buildInputs = [ pkgconfig cmake libuuid ];
+
+  meta = {
+    homepage = http://www.crosswire.org/wiki/BibleSync;
+    description = "A multicast protocol to Bible software shared conavigation";
+    longDescription = ''
+      BibleSync is a multicast protocol to support Bible software
+      shared co-navigation. It uses LAN multicast in either a
+      personal/small team mutual navigation motif or in a classroom
+      environment where there are Speakers plus the Audience. The
+      library implementing the protocol is a single C++ class
+      providing a complete yet minimal public interface to support
+      mode setting, setup for packet reception, transmit on local
+      navigation, and handling of incoming packets.
+    '';
+    license = licenses.publicDomain;
+    maintainers = [ maintainers.AndersonTorres ]; 
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ada3e3bd1f7..1641083b79a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8067,6 +8067,8 @@ let
 
   sword = callPackage ../development/libraries/sword { };
 
+  biblesync = callPackage ../development/libraries/biblesync { };
+
   szip = callPackage ../development/libraries/szip { };
 
   t1lib = callPackage ../development/libraries/t1lib { };

From 53ff7e1664a177852f4b58ce23f417a5129e6627 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 15 Aug 2015 23:16:05 -0300
Subject: [PATCH 1197/2016] Xiphos: added new dependency: biblesync

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

diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index 450a756b450..dbc5e84e67b 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -2,7 +2,7 @@
 , python
 , intltool
 , docbook2x, docbook_xml_dtd_412, libxslt
-, sword, clucene_core
+, sword, clucene_core, biblesync
 , gnome_doc_utils
 , libgsf, gconf
 , gtkhtml, libgtkhtml, libglade, scrollkeeper
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
   version = "4.0.3-20150806";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/${version}/${name}.tar.gz";
+    url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz";
     sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv";
   };
 
   buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt
-                  sword clucene_core gnome_doc_utils libgsf gconf gtkhtml libgtkhtml
+                  sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml libgtkhtml
                   libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ];
 
   prePatch = ''

From effe2ca5a5d1226e1f4afebad2b96d6f8c52d4e2 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 16 Aug 2015 11:29:11 +0200
Subject: [PATCH 1198/2016] fira-code: 0.5 -> 0.6

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

diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix
index 9855738d6d6..1ed63f7ac9e 100644
--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/pkgs/data/fonts/fira-code/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fira-code-${version}";
-  version = "0.5";
+  version = "0.6";
 
   src = fetchurl {
     url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode-Regular.otf";
-    sha256 = "1y2jz1v7m0q73rz9vblxgaqkgh9wpp4fp7dq21hdyfhxkk3ss6xk";
+    sha256 = "1blalxnmrxqlm5i74jhm8j29n0zsnmqi3gppxa9szjzv4x2k5s0a";
   };
 
   phases = [ "installPhase" ];

From 9f9f1db6e554aaa21b2f5dc8cf0ef33656bec025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 16 Aug 2015 12:55:04 +0200
Subject: [PATCH 1199/2016] python-py: 1.4.24 -> 1.4.30

Unbreaks some packages because they require py>=1.4.29. Example build
error, from the 'argh' package:

  The 'py>=1.4.29' distribution was not found and is required by pytest

`nox-review wip` shows that there is a net reduction in build errors with
this patch.
---
 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 379c245d959..e952f266ed1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9845,11 +9845,11 @@ let
 
 
   py = buildPythonPackage rec {
-    name = "py-1.4.24";
+    name = "py-1.4.30";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz";
-      md5 = "8f32ee0cd1e01472a255fe1d28d81217";
+      md5 = "a904aabfe4765cb754f2db84ec7bb03a";
     };
   };
 

From 5aeca83cf5f7a908b3ce31c80525fbe6ee0a3de9 Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Sun, 16 Aug 2015 11:46:21 +0200
Subject: [PATCH 1200/2016] distrho: 2015-05-04 -> 2015-07-18

ladspa was added to pass juce compilation
---
 pkgs/applications/audio/distrho/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 1e52e842330..a590716537b 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2
-, libxslt, lv2, pkgconfig, premake3, xlibs }:
+, libxslt, lv2, pkgconfig, premake3, xlibs, ladspa-sdk }:
 
 stdenv.mkDerivation rec {
-  name = "distrho-ports-git-2015-05-04";
+  name = "distrho-ports-git-2015-07-18";
 
   src = fetchgit {
     url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
-    rev = "3f13db5dc7722ed0dcbb5256d7fac1ac9165c2d8";
-    sha256 = "6f740f6a8af714436ef75b858944e8122490a2faa04591a201105e84bca42fa0";
+    rev = "53458838505efef91ed069d0a7d970b6b3588eba";
+    sha256 = "0fb4dxfvvqy8lnm9c91sxwn5wbcw8grfpm52zag25vrls251aih3";
   };
 
   patchPhase = ''
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3
     xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
-    xlibs.libXinerama xlibs.libXrender
+    xlibs.libXinerama xlibs.libXrender ladspa-sdk
   ];
 
   buildPhase = ''

From 6f77262e07d22c8f471fc7fb72e7313824941fca Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@syntax-fehler.de>
Date: Sat, 15 Aug 2015 21:47:42 +0000
Subject: [PATCH 1201/2016] pythonPackages.ovh: init at 0.3.5

pythonPackages.d2to1: init at 0.2.11
\-> d2to1 is a build dependency of ovh
---
 pkgs/top-level/python-packages.nix | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 379c245d959..2bc2aff755c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17195,4 +17195,42 @@ let
     };
   };
 
+  d2to1 = buildPythonPackage rec {
+    name = "d2to1-${version}";
+    version = "0.2.11";
+
+    buildInputs = with self; [ nose ];
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/d2to1/d2to1-${version}.tar.gz";
+      sha256 = "1a5z367b7dpd6dgi0w8pymb68aj2pblk8w04l2c8hibhj8dpl2b4";
+    };
+
+    meta = {
+      description = "Support for distutils2-like setup.cfg files as package metadata";
+      homepage = https://pypi.python.org/pypi/d2to1;
+      license = licenses.bsd2;
+      maintainers = [ maintainers.makefu ];
+    };
+  };
+
+  ovh = buildPythonPackage rec {
+    name = "ovh-${version}";
+    version = "0.3.5";
+    doCheck = false; #test needs packages too explicit
+    buildInputs = with self; [ d2to1 ];
+    propagatedBuildInputs = with self; [ requests2 ];
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/o/ovh/ovh-${version}.tar.gz";
+      sha256 = "1y74lrdlgbb786mwas7ynphimfi00dgr67ncjq20kdf31jg5415n";
+    };
+
+    meta = {
+      description = "Thin wrapper around OVH's APIs";
+      homepage = https://pypi.python.org/pypi/ovh;
+      license = licenses.bsd2;
+      maintainers = [ maintainers.makefu ];
+    };
+  };
+
 }; in pythonPackages

From 844bfc605a35a60ebf701d03005446698aadc7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 16 Aug 2015 18:30:27 +0200
Subject: [PATCH 1202/2016] cgal: fix build by update 4.5 -> 4.6.1

It was broken by cmake updates (between 3.2.2 and 3.3.1).
I chose the github tarballs because they have a predictable URL,
although they're much larger due to not supporting xz.

/cc maintainer @7c6f434c.
---
 pkgs/development/libraries/CGAL/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 505aab78242..78b8f206f62 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
-  version = "4.5";
+  version = "4.6.1";
 
   name = "cgal-${version}";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/34139/CGAL-${version}.tar.xz";
-    sha256 = "00shds5yph4s09lqdrb6n60wnw9kpiwa25ghg9mbsgq3fnr8p7kr";
+    url = "https://github.com/CGAL/releases/archive/releases/CGAL-${version}.tar.gz";
+    sha256 = "09ph5qi7ixbkk3jssq3pdjf2nyw91s73dizi2mkx6brhrzd1zd5y";
   };
 
   buildInputs = [ cmake boost gmp mpfr ];

From 0279a979a5a7b4edcaa8e5f9662f64f73f7e8cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 16 Aug 2015 19:03:55 +0200
Subject: [PATCH 1203/2016] stunnel: 5.20 -> 5.22

Changelog:
  https://www.stunnel.org/sdf_ChangeLog.html
---
 pkgs/tools/networking/stunnel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 31acb8dd9ec..29b92029558 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.20";
+  version = "5.22";
 
   src = fetchurl {
     url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "0ar940mw5sjxkh98d6wnrd366jfkqirbyf2b5kcdk1vjk9ra6dja";
+    sha256 = "0gxqiiksc5p65s67f53yxa2hb8w4hfcgd0s20jrcslw1jjk2imla";
   };
 
   buildInputs = [ openssl ];

From 2d17e52dc11dfa1305e379c90076c477539a98a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 16 Aug 2015 19:09:27 +0200
Subject: [PATCH 1204/2016] solvespace: download from github instead of
 gitorious

gitorious has shut down. Long live github.
---
 pkgs/applications/graphics/solvespace/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index cba69c476b5..67513bcf923 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -4,7 +4,7 @@
 stdenv.mkDerivation {
   name = "solvespace-2.0";
   src = fetchgit {
-    url = "https://gitorious.org/solvespace/solvespace.git";
+    url = "https://github.com/jwesthues/solvespace.git";
     sha256 = "0sakxkmj2f0k27f67wy1xz2skpnwzg15yqrf7av97pgc5s8xb3da";
     rev = "e587d0e";
   };

From 5079b4f27bd8695faafa3fc87890de328fd07f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 16 Aug 2015 19:28:49 +0200
Subject: [PATCH 1205/2016] cassandra: 2.1.7 -> 2.1.8

Version 2.1.7 is not available anymore from current mirror. This is a
stable update.
---
 pkgs/servers/nosql/cassandra/2.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index f82daee7b14..dd06d946128 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -11,8 +11,8 @@
 
 let
 
-  version = "2.1.7";
-  sha256 = "12chnxcl9zg20d0l4rlzp13cnxvdqr8bx3bbvwbcpnh7ir5s7ldd";
+  version = "2.1.8";
+  sha256 = "1x92nw81pa4s95lv9qj42p05ry3ajk8klsqgc30zv7sjzm7cc31s";
 
 in
 

From 2f7a75f74a60d3f37f66745a1cfdd4c40352b758 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 16 Aug 2015 17:24:42 +0000
Subject: [PATCH 1206/2016] carefully revert
 e749f1ef61afcf3457574b57f4177543a82e78f1 and
 8f1d2564356afdd10a587a4f80a07d53058eff57

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23413feea81..acf9f628bbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8512,7 +8512,7 @@ let
   agda = callPackage ../build-support/agda {
     glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
     extension = self : super : { };
-    inherit (haskell.packages.ghc784) Agda;
+    inherit (haskellPackages) Agda;
     inherit writeScriptBin;
   };
 
@@ -11287,9 +11287,7 @@ let
     };
 
     external = {
-      # FIXME: revert when Agda and ghc-mod are fixed on 7.10
-      inherit (haskell.packages.ghc784) ghc-mod Agda;
-      inherit (haskellPackages) structured-haskell-mode;
+      inherit (haskellPackages) ghc-mod structured-haskell-mode Agda;
     };
   };
 

From 7a7362211650c1ffb2f6128cd9c06c201bcc5292 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 16 Aug 2015 17:25:46 +0000
Subject: [PATCH 1207/2016] emacs-packages: ghc-mod now requires haskell-mode

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 0adddf3d5d0..c5bb3a5f047 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -597,6 +597,7 @@ let self = _self // overrides;
     pname = "ghc";
     version = external.ghc-mod.version;
     src = external.ghc-mod.src;
+    packageRequires = [ haskell-mode ];
     propagatedUserEnvPkgs = [ external.ghc-mod ];
     fileSpecs = [ "elisp/*.el" ];
     meta = { license = bsd3; };

From c88e9deff451097aa2d6ec97a22ffd53ee4103b7 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 15 Aug 2015 19:01:22 +0000
Subject: [PATCH 1208/2016] cups: remove xdg_utils dependency

`cups.desktop` that depends on some fixed version of `xdg-open` is not
particularly useful; it should use `xdg-open` from the environment
it's being run from.

As a side effect, one can now fiddle with `xdg_utils` package without
rebuilding pretty much every single one of graphical packages (they
all depend on `cups` through their graphical toolkits).
---
 pkgs/misc/cups/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index bcd27d68ce0..5032ef245a6 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam
-, dbus, acl, gmp, xdg_utils
+, dbus, acl, gmp
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
-    ++ optionals stdenv.isLinux [ pam dbus.libs acl xdg_utils ] ;
+    ++ optionals stdenv.isLinux [ pam dbus.libs acl ];
 
   propagatedBuildInputs = [ gmp ];
 
@@ -54,8 +54,7 @@ stdenv.mkDerivation {
       "CUPS_PRIMARY_SYSTEM_GROUP=root"
     ];
 
-  postInstall =
-    ''
+  postInstall = ''
       # Delete obsolete stuff that conflicts with cups-filters.
       rm -rf $out/share/cups/banners $out/share/cups/data/testprint
 
@@ -71,6 +70,10 @@ stdenv.mkDerivation {
           mv "$f" "''${f/org\.cups\./}"
         fi
       done
+    '' + optionalString stdenv.isLinux ''
+      # Use xdg-open when on Linux
+      substituteInPlace $out/share/applications/cups.desktop \
+        --replace "Exec=htmlview" "Exec=xdg-open"
     '';
 
   meta = {

From a0f50dc665be1dfb8792db584e6b67afd075cf47 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 15 Aug 2015 19:01:46 +0000
Subject: [PATCH 1209/2016] xdg_utils: add mimi support

---
 pkgs/tools/X11/xdg-utils/default.nix | 33 +++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index c010884abdd..170539b3805 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,5 +1,18 @@
-{ stdenv, fetchzip, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
-, w3m, which, gnugrep, gnused, coreutils }:
+{ stdenv, fetchzip, fetchFromGitHub, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
+, w3m, which, gnugrep, gnused, coreutils
+, mimiSupport ? false, gawk ? null }:
+
+assert mimiSupport -> gawk != null;
+
+let
+  # A much better xdg-open
+  mimisrc = fetchFromGitHub {
+    owner = "march-linux";
+    repo = "mimi";
+    rev = "d85ea8256ed627e93b387cd42e4ab39bfab9504c";
+    sha256 = "1h9mb3glfvc6pa2f9g07xgmf8lrwxiyjxvl906xlysy4klybxvhg";
+  };
+in
 
 stdenv.mkDerivation rec {
   name = "xdg-utils-1.1.0-rc3p7";
@@ -13,7 +26,12 @@ stdenv.mkDerivation rec {
   # just needed when built from git
   buildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ];
 
-  postInstall = ''
+  postInstall = stdenv.lib.optionalString mimiSupport ''
+    cp ${mimisrc}/xdg-open $out/bin/xdg-open
+    substituteInPlace $out/bin/xdg-open --replace "awk " "${gawk}/bin/awk "
+    substituteInPlace $out/bin/xdg-open --replace "sort " "${coreutils}/bin/sort "
+    substituteInPlace $out/bin/xdg-open --replace "(file " "(${file}/bin/file "
+  '' + ''
     for item in $out/bin/*; do
       substituteInPlace $item --replace "cut " "${coreutils}/bin/cut "
       substituteInPlace $item --replace "sed " "${gnused}/bin/sed "
@@ -24,12 +42,11 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://portland.freedesktop.org/wiki/;
     description = "A set of command line tools that assist applications with a variety of desktop integration tasks";
-    license = stdenv.lib.licenses.free;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
+    license = if mimiSupport then licenses.gpl2 else licenses.free;
+    maintainers = [ maintainers.eelco ];
+    platforms = platforms.linux;
   };
 }
-

From 2388a0c98506d50ffc809cd98b7fb80350d79180 Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Sun, 16 Aug 2015 21:25:38 +0200
Subject: [PATCH 1210/2016] obnam: 1.13 -> 1.14

---
 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 9bd0afb4d32..123933881fd 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.13";
+  version = "1.14";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "13a9icgp7kvxaw700sdhxll0in00ghk0aacg26s4kxmxc85w92i4";
+    sha256 = "16875g14b7mxfd46159b92qa3gxq59w5gzf8x2n7icqa05s3483q";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];

From b0d26719daac8d850fe22e274faa14c83a9e317f Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 16 Aug 2015 15:48:36 -0400
Subject: [PATCH 1211/2016] python-idna init at 2.0

Needed for python-cryptography: 0.6.1 -> 1.0
---
 pkgs/top-level/python-packages.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e952f266ed1..0e3c83f4ab9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2330,6 +2330,21 @@ let
     propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi_0_8;
   };
 
+  idna = buildPythonPackage rec {
+    name = "idna-2.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/idna/${name}.tar.gz";
+      sha256 = "0frxgmgi234lr9hylg62j69j4ik5zhg0wz05w5dhyacbjfnrl68n";
+    };
+
+    meta = {
+      homepage = "http://github.com/kjd/idna/";
+      description = "Internationalized Domain Names in Applications (IDNA)";
+      license = "licenses.bsd3";
+    };
+  };
+
   cryptography_vectors = buildPythonPackage rec {
     name = "cryptography_vectors-0.6.1";
 

From fcd5a4a2c398b82010093aff800eaeab960ca388 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 16 Aug 2015 15:48:58 -0400
Subject: [PATCH 1212/2016] python-pyasn1: 0.1.7 -> 0.1.8

Needed for python-cryptography: 0.6.1 -> 1.0
---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0e3c83f4ab9..8a541fc711e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9914,11 +9914,11 @@ let
 
 
   pyasn1 = buildPythonPackage ({
-    name = "pyasn1-0.1.7";
+    name = "pyasn1-0.1.8";
 
     src = pkgs.fetchurl {
-      url = "mirror://sourceforge/pyasn1/0.1.7/pyasn1-0.1.7.tar.gz";
-      sha256 = "1aqy21fb564gmnkw2fbkn55c40diyx3z0ixh4savvxikqm9ivy74";
+      url = "mirror://sourceforge/pyasn1/0.1.8/pyasn1-0.1.8.tar.gz";
+      sha256 = "0iw31d9l0zwx35szkzq72hiw002wnqrlrsi9dpbrfngcl1ybwcsx";
     };
 
     meta = {

From ff192b72cf018977c3da5502edb54fa92848eebe Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 16 Aug 2015 15:49:35 -0400
Subject: [PATCH 1213/2016] python-cryptography_vectors: 0.6.1 -> 1.0

Needed for python-cryptography: 0.6.1 -> 1.0
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8a541fc711e..d3fad6c1583 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2346,11 +2346,11 @@ let
   };
 
   cryptography_vectors = buildPythonPackage rec {
-    name = "cryptography_vectors-0.6.1";
+    name = "cryptography_vectors-1.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/cryptography-vectors/${name}.tar.gz";
-      sha256 = "1ks1xdb1ff74qmjdzqcfvkrwsbnwpsjgg3cy18zh37p8985cvl3r";
+      sha256 = "0d02x93vk0b1fla914bij71pfma0p7sprlvrxq1bb6dxnwc7h9z7";
     };
   };
 

From ef43cb270eb842a2c6eeb7183c5d458cd80ade82 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 16 Aug 2015 15:50:10 -0400
Subject: [PATCH 1214/2016] python-cryptography: 0.6.1 -> 1.0

Update propagatedBuildInputs to get proper cffi version and shim
packages for older pythons.
---
 pkgs/top-level/python-packages.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3fad6c1583..98eea3d7e99 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2318,16 +2318,18 @@ let
   };
 
   cryptography = buildPythonPackage rec {
-    name = "cryptography-0.6.1";
+    name = "cryptography-1.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/cryptography/${name}.tar.gz";
-      sha256 = "17ij2acy28ryxahiq64lpf71d5z3sa9xhr4pjv7a1v81189i0j82";
+      sha256 = "008hq9s4z7y17yjxh1aycvddas320hfbl9vj8gydg4fpfzz04711";
     };
 
     buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
-                    self.iso8601 self.pyasn1 self.pytest ];
-    propagatedBuildInputs = [ self.six ] ++ optional (!isPyPy) self.cffi_0_8;
+                    self.iso8601 self.pyasn1 self.pytest self.py ];
+    propagatedBuildInputs = [ self.six self.idna self.ipaddress ]
+     ++ optional (!isPyPy) self.cffi
+     ++ optional (pythonOlder "3.4") self.enum34;
   };
 
   idna = buildPythonPackage rec {

From 3ea4485446107ff8cbd7658a2d0e067a190c6071 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 16 Aug 2015 09:37:54 -0400
Subject: [PATCH 1215/2016] python-pyopenssl: update propagatedBuildInputs.

---
 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 98eea3d7e99..0105daa8abd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11208,7 +11208,7 @@ let
     # 17 tests failing
     doCheck = false;
 
-    propagatedBuildInputs = [ self.cryptography ];
+    propagatedBuildInputs = [ self.cryptography self.pyasn1 self.idna ];
   };
 
 

From ebe451017c057efece01fa45414e18ad5522dca6 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 16 Aug 2015 05:48:17 -0400
Subject: [PATCH 1216/2016] python-SleekXMPP: fix source URL

---
 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 0105daa8abd..79867011de7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8231,8 +8231,8 @@ let
     propagatedBuildInputs = with self ; [ dnspython3 pyasn1 ];
 
     src = pkgs.fetchurl {
-      url = "https://github.com/fritzy/SleekXMPP/archive/${version}.tar.gz";
-      sha256 = "1hqs2w5d7x532psfqipd2wl1mkmsaak83jvp1rh9rv406fzp9h67";
+      url = "https://github.com/fritzy/SleekXMPP/archive/sleek-${version}.tar.gz";
+      sha256 = "07zz0bm098zss0xww11gj45aw417nrkp9k1szzs1zm88wyfr1z31";
     };
 
     meta = {

From 5b91f2dd91d4194d96b80da6def0adf62b6bd5c5 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 16 Aug 2015 06:04:33 -0400
Subject: [PATCH 1217/2016] python-Electrum: fix file sha256

It's unfortunate that this changed, but the tarball does appear to have
a valid signature.
---
 pkgs/applications/misc/electrum/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 7aff57a6af9..b1fdc50fe15 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "https://download.electrum.org/Electrum-${version}.tar.gz";
-    sha256 = "0z5ksr1wlywl4bpvxjmmqnsk7jh1jfjdz9lsjkhf2j391jx0wz9q";
+    sha256 = "0y04m5b410y3s9vqvkbvmlvvx1nr0cyvrnl41yapz8hydw9vdkjx";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 2a9dbf36b3404ffc4d3ec3147e177c924b7b112a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 16 Aug 2015 17:03:48 +0000
Subject: [PATCH 1218/2016] nixos: make services.smartd much more helpful

Now it generates notifications for auto-detected devices as well as
for explicitly configured ones, sends well formed e-mails and supports
immediate `wall` and `xmessage` notifications.
---
 nixos/modules/rename.nix                     |   3 +
 nixos/modules/services/monitoring/smartd.nix | 211 ++++++++++++++-----
 2 files changed, 166 insertions(+), 48 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index abecc065634..4db08b7ad3d 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -98,6 +98,9 @@ in zipModules ([]
 ++ obsolete [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]
 ++ obsolete [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ]
 
+# smartd
+++ obsolete [ "services" "smartd" "deviceOpts" ] [ "services" "smartd" "defaults" "monitored" ]
+
 # OpenSSH
 ++ obsolete [ "services" "sshd" "ports" ] [ "services" "openssh" "ports" ]
 ++ alias [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ]
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index 803bd9e9a65..61ba1612325 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -4,8 +4,66 @@ with lib;
 
 let
 
+  host = config.networking.hostName or "unknown"
+       + optionalString (config.networking.domain != null) ".${config.networking.domain}";
+
   cfg = config.services.smartd;
 
+  nm = cfg.notifications.mail;
+  nw = cfg.notifications.wall;
+  nx = cfg.notifications.x11;
+
+  smartdNotify = pkgs.writeScript "smartd-notify.sh" ''
+    #! ${pkgs.stdenv.shell}
+    ${optionalString nm.enable ''
+      {
+      cat << EOF
+      From: smartd on ${host} <root>
+      To: undisclosed-recipients:;
+      Subject: SMART error on $SMARTD_DEVICESTRING: $SMARTD_FAILTYPE
+
+      $SMARTD_FULLMESSAGE
+      EOF
+
+      ${pkgs.smartmontools}/sbin/smartctl -a -d "$SMARTD_DEVICETYPE" "$SMARTD_DEVICE"
+      } | ${nm.mailer} -i "${nm.recipient}"
+    ''}
+    ${optionalString nw.enable ''
+      {
+      cat << EOF
+      Problem detected with disk: $SMARTD_DEVICESTRING
+      Warning message from smartd is:
+
+      $SMARTD_MESSAGE
+      EOF
+      } | ${pkgs.utillinux}/bin/wall 2>/dev/null
+    ''}
+    ${optionalString nx.enable ''
+      export DISPLAY=${nx.display}
+      {
+      cat << EOF
+      Problem detected with disk: $SMARTD_DEVICESTRING
+      Warning message from smartd is:
+
+      $SMARTD_FULLMESSAGE
+      EOF
+      } | ${pkgs.xorg.xmessage}/bin/xmessage -file - 2>/dev/null &
+    ''}
+  '';
+
+  notifyOpts = optionalString (nm.enable || nw.enable || nx.enable)
+    ("-m <nomailer> -M exec ${smartdNotify} " + optionalString cfg.notifications.test "-M test ");
+
+  smartdConf = pkgs.writeText "smartd.conf" ''
+    # Autogenerated smartd startup config file
+    DEFAULT ${notifyOpts}${cfg.defaults.monitored}
+
+    ${concatMapStringsSep "\n" (d: "${d.device} ${d.options}") cfg.devices}
+
+    ${optionalString cfg.autodetect
+       "DEVICESCAN ${notifyOpts}${cfg.defaults.autodetected}"}
+  '';
+
   smartdOpts = { name, ... }: {
 
     options = {
@@ -22,34 +80,11 @@ let
         type = types.separatedString " ";
         description = "Options that determine how smartd monitors the device.";
       };
+
     };
 
   };
 
-  smartdMail = pkgs.writeScript "smartdmail.sh" ''
-    #! ${pkgs.stdenv.shell}
-    TMPNAM=/tmp/smartd-message.$$.tmp
-    if test -n "$SMARTD_ADDRESS"; then
-      echo  >"$TMPNAM" "From: smartd <root>"
-      echo >>"$TMPNAM" 'To: undisclosed-recipients:;'
-      echo >>"$TMPNAM" "Subject: $SMARTD_SUBJECT"
-      echo >>"$TMPNAM"
-      echo >>"$TMPNAM" "Failure on $SMARTD_DEVICESTRING: $SMARTD_FAILTYPE"
-      echo >>"$TMPNAM"
-      cat  >>"$TMPNAM"
-      ${pkgs.smartmontools}/sbin/smartctl >>"$TMPNAM" -a -d "$SMARTD_DEVICETYPE" "$SMARTD_DEVICE"
-      /var/setuid-wrappers/sendmail  <"$TMPNAM" -f "$SENDER" -i "$SMARTD_ADDRESS"
-    fi
-  '';
-
-  smartdConf = pkgs.writeText "smartd.conf" (concatMapStrings (device:
-    ''
-      ${device.device} -a -m root -M exec ${smartdMail} ${device.options} ${cfg.deviceOpts}
-    ''
-    ) cfg.devices);
-
-  smartdFlags = if (cfg.devices == []) then "" else "--configfile=${smartdConf}";
-
 in
 
 {
@@ -59,26 +94,104 @@ in
 
     services.smartd = {
 
-      enable = mkOption {
-        default = false;
+      enable = mkEnableOption "smartd daemon from <literal>smartmontools</literal> package";
+
+      autodetect = mkOption {
+        default = true;
         type = types.bool;
-        example = true;
         description = ''
-          Run smartd from the smartmontools package. Note that e-mail
-          notifications will not be enabled unless you configure the list of
-          devices with <varname>services.smartd.devices</varname> as well.
+          Whenever smartd should monitor all devices connected to the
+          machine at the time it's being started (the default).
+
+          Set to false to monitor the devices listed in
+          <option>services.smartd.devices</option> only.
         '';
       };
 
-      deviceOpts = mkOption {
-        default = "";
-        type = types.string;
-        example = "-o on -s (S/../.././02|L/../../7/04)";
-        description = ''
-          Additional options for each device that is monitored. The example
-          turns on SMART Automatic Offline Testing on startup, and schedules short
-          self-tests daily, and long self-tests weekly.
-        '';
+      notifications = {
+
+        mail = {
+          enable = mkOption {
+            default = config.services.mail.sendmailSetuidWrapper != null;
+            type = types.bool;
+            description = "Whenever to send e-mail notifications.";
+          };
+
+          recipient = mkOption {
+            default = "root";
+            type = types.string;
+            description = "Recipient of the notification messages.";
+          };
+
+          mailer = mkOption {
+            default = "/var/setuid-wrappers/sendmail";
+            type = types.path;
+            description = ''
+              Sendmail-compatible binary to be used to send the messages.
+
+              You should probably enable
+              <option>services.postfix</option> or some other MTA for
+              this to work.
+            '';
+          };
+        };
+
+        wall = {
+          enable = mkOption {
+            default = true;
+            type = types.bool;
+            description = "Whenever to send wall notifications to all users.";
+          };
+        };
+
+        x11 = {
+          enable = mkOption {
+            default = config.services.xserver.enable;
+            type = types.bool;
+            description = "Whenever to send X11 xmessage notifications.";
+          };
+
+          display = mkOption {
+            default = ":${toString config.services.xserver.display}";
+            type = types.string;
+            description = "DISPLAY to send X11 notifications to.";
+          };
+        };
+
+        test = mkOption {
+          default = false;
+          type = types.bool;
+          description = "Whenever to send a test notification on startup.";
+        };
+
+      };
+
+      defaults = {
+        monitored = mkOption {
+          default = "-a";
+          type = types.separatedString " ";
+          example = "-a -o on -s (S/../.././02|L/../../7/04)";
+          description = ''
+            Common default options for explicitly monitored (listed in
+            <option>services.smartd.devices</option>) devices.
+
+            The default value turns on monitoring of all the things (see
+            <literal>man 5 smartd.conf</literal>).
+
+            The example also turns on SMART Automatic Offline Testing on
+            startup, and schedules short self-tests daily, and long
+            self-tests weekly.
+          '';
+        };
+
+        autodetected = mkOption {
+          default = cfg.defaults.monitored;
+          type = types.separatedString " ";
+          description = ''
+            Like <option>services.smartd.defaults.monitored</option>, but for the
+            autodetected devices.
+          '';
+        };
       };
 
       devices = mkOption {
@@ -86,14 +199,9 @@ in
         example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ];
         type = types.listOf types.optionSet;
         options = [ smartdOpts ];
-        description = ''
-          List of devices to monitor. By default -- if this list is empty --,
-          smartd will monitor all devices connected to the machine at the time
-          it's being run. Configuring this option has the added benefit of
-          enabling e-mail notifications to "root" every time smartd detects an
-          error.
-        '';
-       };
+        description = "List of devices to monitor.";
+      };
+
     };
 
   };
@@ -103,12 +211,19 @@ in
 
   config = mkIf cfg.enable {
 
+    assertions = [ {
+      assertion = cfg.autodetect || cfg.devices != [];
+      message = "smartd can't run with both disabled autodetect and an empty list of devices to monitor.";
+    } ];
+
     systemd.services.smartd = {
       description = "S.M.A.R.T. Daemon";
 
       wantedBy = [ "multi-user.target" ];
 
-      serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork ${smartdFlags}";
+      path = [ pkgs.nettools ]; # for hostname and dnsdomanname calls in smartd
+
+      serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd --no-fork --configfile=${smartdConf}";
     };
 
   };

From aba6c9e9cb14b2d73aef8528780c93aeeb9371e8 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sun, 16 Aug 2015 20:05:14 -0700
Subject: [PATCH 1219/2016] antimicro: init at 2.18

antimicro is a graphical program used to map keyboard keys and mouse controls
to a gamepad. Useful for playing PC games with no gamepad or poor gamepad
support.
---
 pkgs/tools/misc/antimicro/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/misc/antimicro/default.nix

diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
new file mode 100644
index 00000000000..80791756e65
--- /dev/null
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, cmake, pkgconfig, SDL2, qt5, xlibs, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "antimicro-${version}";
+  version = "2.18";
+
+  src = fetchzip {
+    url    = "https://github.com/Ryochan7/antimicro/archive/${version}.tar.gz";
+    sha256 = "0kyl4xl2am50v2xscgy2irpcdj78f7flgfhljyjck4ynf8d40vb7";
+  };
+
+  buildInputs = [
+    cmake pkgconfig SDL2 qt5.base qt5.tools xlibs.libXtst
+  ];
+
+  meta = with stdenv.lib; {
+    description = "GUI for mapping keyboard and mouse controls to a gamepad";
+    homepage = "https://github.com/Ryochan7/antimicro";
+    maintainers = with maintainers; [ jb55 ];
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19353eab4e9..15f42c4c481 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14692,6 +14692,8 @@ let
 
   ### MISC
 
+  antimicro = callPackage ../tools/misc/antimicro { };
+
   atari800 = callPackage ../misc/emulators/atari800 { };
 
   ataripp = callPackage ../misc/emulators/atari++ { };

From c56adc9e014c31e6ef6cf2422e825471c560617d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 17 Aug 2015 08:25:52 +0200
Subject: [PATCH 1220/2016] cgal: fix src

I'm sorry for the wrong combination of URL and hash.
These release tarballs are much smaller; I don't know the difference,
but they still seem to work (openscad, rpacad).

Also comment on modules that aren't built.
---
 pkgs/development/libraries/CGAL/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 78b8f206f62..a903d5e4678 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -6,10 +6,12 @@ stdenv.mkDerivation rec {
   name = "cgal-${version}";
 
   src = fetchurl {
-    url = "https://github.com/CGAL/releases/archive/releases/CGAL-${version}.tar.gz";
-    sha256 = "09ph5qi7ixbkk3jssq3pdjf2nyw91s73dizi2mkx6brhrzd1zd5y";
+    url = "https://github.com/CGAL/releases/archive/CGAL-${version}.tar.gz";
+    sha256 = "05vk4l62d7g6cz19q36h1an5krxdbgq1fbs5hi0x2l7blsja1z6g";
   };
 
+  # note: optional component libCGAL_ImageIO would need zlib and opengl;
+  #   there are also libCGAL_Qt{3,4} omitted ATM
   buildInputs = [ cmake boost gmp mpfr ];
 
   doCheck = false;

From f51546888d64ab1cae7a444e764589c41abc4577 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Mon, 17 Aug 2015 00:23:40 -0700
Subject: [PATCH 1221/2016] spectrwm: 2.6.2 -> 2.7.2

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

diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix
index ad6fcddf5be..39825e37f30 100644
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/pkgs/applications/window-managers/spectrwm/default.nix
@@ -15,13 +15,14 @@
 
 stdenv.mkDerivation rec {
   name = "spectrwm-${version}";
-  version = "2.6.2";
+  version = "2.7.2";
 
   src = fetchurl {
-    url = "https://github.com/conformal/spectrwm/archive/SPECTRWM_2_6_2.tar.gz";
-    sha256 = "1pc9p3vwa4bsv76myqkqhp4cxspr72s5igi7cs9xrpd4xx6xc90s";
+    url = "https://github.com/conformal/spectrwm/archive/SPECTRWM_2_7_2.tar.gz";
+    sha256 = "1yssqnhxlfl1b60gziqp8c5pzs1lr8p6anrnp9ga1zfdql3b7993";
   };
 
+
   buildInputs = [
     libX11
     libxcb
@@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
     xcbutilwm
   ];
 
-  sourceRoot = "spectrwm-SPECTRWM_2_6_2/linux";
+  sourceRoot = "spectrwm-SPECTRWM_2_7_2/linux";
   makeFlags="PREFIX=$(out)";
   installPhase = "PREFIX=$out make install";
 

From a64cee8c7817dccfe85f5dbe3a7bbc360ed44e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 17 Aug 2015 10:34:22 +0200
Subject: [PATCH 1222/2016] ghc-7.4.2-binary: fix on i686 after 6c4364041

I'm not sure what was the compatibility problem before that commit,
but ghc at least builds now on both x86 Linux platforms
(and this commit doesn't cause a rebuild on x86_64-linux).
---
 pkgs/development/compilers/ghc/7.4.2-binary.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
index 88db6738ca0..3d781e9d558 100644
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     # find editline/gmp.
     stdenv.lib.optionalString stdenv.isLinux ''
       mkdir -p "$out/lib"
-      ln -sv "${ncurses}/lib/libncurses.so" "$out/lib/libncursesw.so.5"
+      ln -sv "${ncurses}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
       find . -type f -perm +100 \
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
           --set-rpath "$out/lib:${gmp}/lib" {} \;

From d234c64032b00fdb3758b41f1f239d77875f8533 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Aug 2015 10:48:04 +0200
Subject: [PATCH 1223/2016] Disable lightdm test

It's hanging in the OCR step for hours.

@aszlig

http://hydra.nixos.org/build/24268601
---
 nixos/release-combined.nix | 2 +-
 nixos/release.nix          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index be8df4f4a2c..a3948401d78 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -66,7 +66,7 @@ in rec {
         (all nixos.tests.bootBiosCdrom)
         (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
-        (all nixos.tests.lightdm)
+        #(all nixos.tests.lightdm)
         (all nixos.tests.login)
         (all nixos.tests.misc)
         (all nixos.tests.nat.firewall)
diff --git a/nixos/release.nix b/nixos/release.nix
index 05023868fa1..2dbc35c7d7b 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -245,7 +245,7 @@ in rec {
   tests.kde4 = callTest tests/kde4.nix {};
   tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
   tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
-  tests.lightdm = callTest tests/lightdm.nix {};
+  #tests.lightdm = callTest tests/lightdm.nix {};
   tests.login = callTest tests/login.nix {};
   #tests.logstash = callTest tests/logstash.nix {};
   tests.misc = callTest tests/misc.nix {};

From 69269bebeb22b8ad3b099bc41169f57e29d46efe Mon Sep 17 00:00:00 2001
From: kmicu <kmicu@protonmail.ch>
Date: Mon, 17 Aug 2015 10:48:26 +0200
Subject: [PATCH 1224/2016] firefoxWrapper: switch to GStreamer 1.0

wkennington@f6c1004 switched Firefox to GStreamer 1.0 by changing its
buildInput *only*, but that is not enough. We need to fix Firefox
wrappers by changing their buildInputs and set GST_PLUGIN_SYSTEM_PATH_1_0
instead of GST_PLUGIN_SYSTEM_PATH.

With above changes playing H.264/MP4 media works in firefoxWrapper and
conkerorWrapper as tested with
http://www.quirksmode.org/html5/tests/video.html and
https://soundcloud.com/immclovin33/synthetix-sundays-53-with-marko-maric-19715

It should help with peti#9247

Reviewed-by: kmicu <kmicu@protonmail.ch>
Tested-by: kmicu <kmicu@protonmail.ch>
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +-
 pkgs/top-level/all-packages.nix                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 409f7d29ba2..3e26a597256 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
         --suffix-each LD_LIBRARY_PATH ':' "$libs" \
         --suffix-each GTK_PATH ':' "$gtk_modules" \
         --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
-        --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
+        --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
         --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
         --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)"
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19353eab4e9..8464193491c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13259,10 +13259,10 @@ let
           ++ lib.optional (cfg.enableTrezor or false) trezor-bridge
           ++ lib.optional (cfg.enableBluejeans or false) bluejeans
          );
-      libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
+      libs = (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optionals (cfg.enableQuakeLive or false)
              (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
              ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash;
-      gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ];
+      gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ];
       gtk_modules = [ libcanberra ];
     };
 

From 65020eef409f7d1adb3f58a2edff8e9941ba8cc7 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 16 Aug 2015 19:27:40 +0300
Subject: [PATCH 1225/2016] pixman: Enable '--disable-arm-iwmmxt' on ARM

Otherwise the build fails on ARMv6:

  CC       libpixman_iwmmxt_la-pixman-mmx.lo
pixman-mmx.c: In function 'mmx_fetch_x8r8g8b8':
pixman-mmx.c:3812:1: internal compiler error: Max. number of generated reload insns per insn is achieved (90)
---
 pkgs/development/libraries/pixman/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index 74d7706ec59..ce027a0a269 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
 
   patches = stdenv.lib.optional stdenv.isDarwin ./fix-clang36.patch;
 
+  configureFlags = if stdenv.isArm then ["--disable-arm-iwmmxt"] else null;
+
   meta = {
     homepage = http://pixman.org;
     description = "A low-level library for pixel manipulation";

From 7c61106bf3f7647920f6a58e651140071640e43a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 17 Aug 2015 15:35:58 +0200
Subject: [PATCH 1226/2016] libreoffice: fix URL of libgltf

Reported by @deepfire on IRC.
---
 pkgs/applications/office/libreoffice/libreoffice-srcs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 20619c90d0f..e8a0753c198 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -333,6 +333,7 @@
   name = "libgltf-0.0.2.tar.bz2";
   md5 = "d63a9f47ab048f5009d90693d6aa6424";
   brief = true;
+  subDir = "libgltf/";
 }
 {
   name = "liblangtag-0.5.1.tar.bz2";

From 4ff22bd680f0fe5a05a26ee5e3f01add8e050b17 Mon Sep 17 00:00:00 2001
From: Mathnerd314 <mathnerd314.gph+hs@gmail.com>
Date: Sat, 15 Aug 2015 22:05:29 +0000
Subject: [PATCH 1227/2016] supertux-editor: init at git-2014-08-20

---
 lib/maintainers.nix                           |  1 +
 .../editors/supertux-editor/default.nix       | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/editors/supertux-editor/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4f45db810e2..d42d81399cf 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -158,6 +158,7 @@
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";
   matejc = "Matej Cotman <cotman.matej@gmail.com>";
+  mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>";
   matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";
   mbakke = "Marius Bakke <ymse@tuta.io>";
   meditans = "Carlo Nucera <meditans@gmail.com>";
diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix
new file mode 100644
index 00000000000..8dcc718e7bb
--- /dev/null
+++ b/pkgs/applications/editors/supertux-editor/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, mono, gtk-sharp, pkgconfig, makeWrapper, gnome, gtk }:
+stdenv.mkDerivation rec {
+  version = "git-2014-08-20";
+  name = "supertux-editor-${version}";
+
+  src = fetchFromGitHub {
+    owner = "SuperTux";
+    repo = "supertux-editor";
+    rev = "0c666e8ccc7daf9e9720fe79abd63f8fa979c5e5";
+    sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx";
+  };
+
+  buildInputs = [mono gtk-sharp pkgconfig makeWrapper gnome.libglade gtk ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib/supertux-editor
+    cp *.{dll,dll.config,exe} $out/lib/supertux-editor
+    makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor \
+      --add-flags "$out/lib/supertux-editor/supertux-editor.exe" \
+      --prefix MONO_GAC_PREFIX : ${gtk-sharp} \
+      --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //')
+
+    makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor-debug \
+      --add-flags "--debug $out/lib/supertux-editor/supertux-editor.exe" \
+      --prefix MONO_GAC_PREFIX : ${gtk-sharp} \
+      --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //')
+  '';
+
+  # Always needed on Mono, otherwise nothing runs
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    description = "Level editor for SuperTux";
+    homepage = https://github.com/SuperTux/supertux-editor;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ mathnerd314 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23413feea81..9daa0bb64a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3049,6 +3049,8 @@ let
 
   super = callPackage ../tools/security/super { };
 
+  supertux-editor = callPackage ../applications/editors/supertux-editor { };
+
   super-user-spark = haskellPackages.callPackage ../applications/misc/super_user_spark { };
 
   ssdeep = callPackage ../tools/security/ssdeep { };

From 992247745ee540a00b585924be99b1e34bf53c48 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 17 Aug 2015 17:18:43 +0200
Subject: [PATCH 1228/2016] glide: init at 0.4.1, and dependencies: cli-go:
 init at 1.2.0 cookoo: init at 1.2.0 go-gypsy: init at current master

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 080fc1d6747..826aa90e8d1 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -342,6 +342,13 @@ let
     propagatedBuildInputs = [ pflag ];
   };
 
+  cli-go = buildFromGitHub {
+    rev    = "v1.2.0";
+    owner  = "codegangsta";
+    repo   = "cli";
+    sha256 = "1axcpc8wgs0b66dpl36pz97pqbxkgvvbwz1b6rf7gl103jqpii40";
+  };
+
   columnize = buildFromGitHub {
     rev    = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a";
     owner  = "ryanuber";
@@ -522,6 +529,13 @@ let
     };
   };
 
+  cookoo = buildFromGitHub {
+    rev    = "v1.2.0";
+    owner  = "Masterminds";
+    repo   = "cookoo";
+    sha256 = "1mxqnxddny43k1shsvd39sfzfs0d20gv3vm9lcjp04g3b0rplck1";
+  };
+
   dbus = buildGoPackage rec {
     rev = "a5942dec6340eb0d57f43f2003c190ce06e43dea";
     name = "dbus-${stdenv.lib.strings.substring 0 7 rev}";
@@ -652,6 +666,14 @@ let
     subPackages = [ "./" ];  # don't try to build test fixtures
   };
 
+  glide = buildFromGitHub {
+    rev    = "0.4.1";
+    owner  = "Masterminds";
+    repo   = "glide";
+    sha256 = "0237l8s7z1ysfkv3kmw4788fg4kjcq2sh6073bjcwynz3hldkrlr";
+    buildInputs = [ cookoo cli-go go-gypsy ];
+  };
+
   gls = buildFromGitHub {
     rev    = "9a4a02dbe491bef4bab3c24fd9f3087d6c4c6690";
     owner  = "jtolds";
@@ -1038,6 +1060,13 @@ let
     buildInputs = [ go-querystring oauth2 ];
   };
 
+  go-gypsy = buildFromGitHub {
+    rev    = "42fc2c7ee9b8bd0ff636cd2d7a8c0a49491044c5";
+    owner  = "kylelemons";
+    repo   = "go-gypsy";
+    sha256 = "04iy8rdk19n7i18bqipknrcb8lsy1vr4d1iqyxsxq6rmb7298iwj";
+  };
+
   go-homedir = buildFromGitHub {
     rev    = "7d2d8c8a4e078ce3c58736ab521a40b37a504c52";
     owner  = "mitchellh";

From 8d21fe21ce812a268eaed0ebf383693266b1da58 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 17 Aug 2015 17:37:53 +0200
Subject: [PATCH 1229/2016] bluejeans: 2.100.41.8 -> 2.100.102.8

---
 .../browsers/mozilla-plugins/bluejeans/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index 64ceebfa527..c61b0e8a70c 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -15,13 +15,13 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "bluejeans-2.100.41.8";
+  name = "bluejeans-${version}";
 
-  version = "2.100.41.8";
+  version = "2.100.102.8";
 
   src = fetchurl {
-    url = "https://swdl.bluejeans.com/skinny/bjnplugin_2.100.41.8-1_amd64.deb";
-    sha256 = "013m17lpgi6nhw2df10wvrsnsjxy5n7z41ab69vj5m9h0prw9vd1";
+    url = "https://swdl.bluejeans.com/skinny/bjnplugin_${version}-1_amd64.deb";
+    sha256 = "18f8jmhxvqy1yiiwlsssj7rjlfcb41xn16hnl6wv8r8r2mmic4v8";
   };
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
@@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
       plugins=$out/lib/mozilla/plugins
       patchelf \
         --set-rpath "${rpathPlugin}" \
-        $plugins/npbjnplugin_2.100.41.8.so
+        $plugins/npbjnplugin_${version}.so
 
       patchelf \
         --set-rpath "${rpathInstaller}" \
-        $plugins/npbjninstallplugin_2.100.41.8.so
+        $plugins/npbjninstallplugin_${version}.so
     '';
 
   dontStrip = true;
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://bluejeans.com;
     license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.ocharles ];
+    maintainers = with maintainers; [ ocharles kamilchm ];
   };
 }

From 441e8a1590d05c1ad6b6c73876c8cae1c1e21ff9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Aug 2015 20:31:15 +0200
Subject: [PATCH 1230/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/d2f0ba57b0b22a42909a66bfdab6aeedca3b0f53
 with hackage2nix v20150807-40-g9d40586

Notable updates changes include:

 - vector: update to version 0.11.x
 - errors: update to version 2.x
---
 .../haskell-modules/configuration-common.nix  |    3 -
 .../haskell-modules/hackage-packages.nix      | 1597 ++++++++++++-----
 2 files changed, 1160 insertions(+), 440 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4d7d4a95635..d97ed25781f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -814,9 +814,6 @@ self: super: {
   # https://github.com/kkardzis/curlhs/issues/6
   curlhs = dontCheck super.curlhs;
 
-  # This needs the latest version of errors to compile.
-  pipes-errors = super.pipes-errors.override { errors = self.errors_2_0_0; };
-
   # https://github.com/hvr/token-bucket/issues/3
   token-bucket = dontCheck super.token-bucket;
 
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index fcafdb989dc..c0c7bac41fd 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -270,9 +270,11 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/ADPfusion";
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Basics" = callPackage
@@ -774,9 +776,11 @@ self: {
          ADPfusion base containers fmlist FormalGrammars GrammarProducts
          PrimitiveArray vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/AlignmentAlgorithms";
        description = "Collection of alignment algorithms";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Allure" = callPackage
@@ -1223,6 +1227,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring cassava deepseq directory statistics time vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/BenchmarkHistory";
        description = "Benchmark functions with history";
        license = stdenv.lib.licenses.gpl3;
@@ -1480,9 +1485,11 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/BiobaseTypes";
        description = "Collection of types for bioinformatics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseVienna" = callPackage
@@ -1525,6 +1532,7 @@ self: {
        homepage = "https://github.com/choener/BiobaseXNA";
        description = "Efficient RNA/DNA representations";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BirdPP" = callPackage
@@ -2400,6 +2408,7 @@ self: {
          array base colour data-default-class lens mtl old-locale
          operational time vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "A library for generating 2D Charts and Plots";
        license = stdenv.lib.licenses.bsd3;
@@ -5091,9 +5100,11 @@ self: {
          text transformers trifecta unordered-containers vector
        ];
        executableHaskellDepends = [ ansi-wl-pprint base cmdargs ];
+       jailbreak = true;
        homepage = "https://github.com/choener/FormalGrammars";
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Foster" = callPackage
@@ -5693,9 +5704,11 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/GenussFold";
        description = "MCFGs for Genus-1 RNA Pseudoknots";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GeoIp" = callPackage
@@ -5936,6 +5949,7 @@ self: {
        homepage = "https://github.com/choener/GrammarProducts";
        description = "Grammar products and higher-dimensional grammars";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Graph500" = callPackage
@@ -7838,6 +7852,7 @@ self: {
        homepage = "https://github.com/RefactoringTools/HaRe/wiki";
        description = "the Haskell Refactorer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaTeX" = callPackage
@@ -8030,6 +8045,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Hangman" = callPackage
+    ({ mkDerivation, base, hspec, random, transformers }:
+     mkDerivation {
+       pname = "Hangman";
+       version = "0.1.0.0";
+       sha256 = "98caea366753debaa6185ddf3ba3c1613a13caec64aabe9ddb917273cb28f40f";
+       revision = "1";
+       editedCabalFile = "001a10b5e54971341acc23271a48f0ef3d7bc764e380b9292580f259aab3c3c9";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base random transformers ];
+       testHaskellDepends = [ base hspec transformers ];
+       jailbreak = true;
+       homepage = "https://github.com/lf94/Hangman";
+       description = "The classic game of Hangman";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "HarmTrace" = callPackage
     ({ mkDerivation, array, base, binary, cmdargs, deepseq, Diff
      , directory, filepath, ghc-prim, HarmTrace-Base, HCodecs, hmatrix
@@ -8773,8 +8806,8 @@ self: {
     ({ mkDerivation, base, bytestring, HsSyck, pretty, pugs-DrIFT }:
      mkDerivation {
        pname = "HsParrot";
-       version = "0.0.2.20120717";
-       sha256 = "ed05b27652a3815f6ea70d0e9d04d01959fba0d2ecd011ba981a7ad63d2bc9a5";
+       version = "0.0.2.20150805";
+       sha256 = "ea98d38cd15d82689a3f0b3010b00cf07d93a94820d11781c122af5fa89b3d34";
        libraryHaskellDepends = [
          base bytestring HsSyck pretty pugs-DrIFT
        ];
@@ -8787,8 +8820,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "HsPerl5";
-       version = "0.0.6";
-       sha256 = "9bf0859ac3eda439a8d17271ebe7eb21ba18a025577ecd6d9495708af28af033";
+       version = "0.0.6.20150815";
+       sha256 = "5f7c198b47a9aca65d6ca201fb3cad78327c7c1f3cb23a517de4322a42fd4896";
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to embedded Perl 5 interpreter";
        license = stdenv.lib.licenses.bsd3;
@@ -10044,6 +10077,7 @@ self: {
          array base bytestring containers dlist fmlist HUnit QuickCheck
          random text vector
        ];
+       jailbreak = true;
        homepage = "http://software.complete.org/listlike";
        description = "Generic support for list-like structures";
        license = stdenv.lib.licenses.bsd3;
@@ -10291,8 +10325,8 @@ self: {
      }:
      mkDerivation {
        pname = "MFlow";
-       version = "0.4.5.9";
-       sha256 = "33924523f8083e18e4ff4e2146203d72a7d3f9df57de87efbdfbb9c94ff71a57";
+       version = "0.4.5.10";
+       sha256 = "2c2e2c03b31f37f628e446cabaf544bf7b669d3e6a34b6c38798e89145c3b6c4";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring case-insensitive
          clientsession conduit conduit-extra containers directory
@@ -10488,8 +10522,8 @@ self: {
     ({ mkDerivation, base, containers, stringtable-atom }:
      mkDerivation {
        pname = "MetaObject";
-       version = "0.0.6.20110925";
-       sha256 = "f9980569222fd3f39a89b3c7e4402387551ecda1cc9938e3e57ee275f308f631";
+       version = "0.0.6.20150815";
+       sha256 = "4b51fa6f27dd0d687acc0220e338fd45cbe0d7d25b6f1c4799ff6c4eb6577d3d";
        libraryHaskellDepends = [ base containers stringtable-atom ];
        description = "A meta-object system for Haskell based on Perl 6";
        license = stdenv.lib.licenses.bsd3;
@@ -12005,9 +12039,11 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/OrderedBits";
        description = "Efficient ordered (by popcount) enumeration of bits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ordinals" = callPackage
@@ -12572,9 +12608,11 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/PrimitiveArray";
        description = "Efficient multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Printf-TH" = callPackage
@@ -12657,22 +12695,22 @@ self: {
 
   "Pugs" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , control-timeout, directory, filepath, FindBin, haskeline
-     , HsParrot, HsSyck, MetaObject, mtl, network, parsec, pretty
-     , process, pugs-compat, pugs-DrIFT, random, stm, stringtable-atom
-     , time, utf8-string
+     , control-timeout, directory, filepath, FindBin, hashable
+     , hashtables, haskeline, HsParrot, HsSyck, MetaObject, mtl, network
+     , parsec, pretty, process, pugs-compat, pugs-DrIFT, random, stm
+     , stringtable-atom, text, time, utf8-string
      }:
      mkDerivation {
        pname = "Pugs";
-       version = "6.2.13.20130611";
-       sha256 = "b11419d895d0cf189c366625d3cc370794bf54fb34e269dea55a4e8f51dc4d8d";
+       version = "6.2.13.20150815";
+       sha256 = "4251b2e55a384c82c60303c0b703ef12c0916370572ad830649f03f0df27fd70";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          array base binary bytestring containers control-timeout directory
-         filepath FindBin haskeline HsParrot HsSyck MetaObject mtl network
-         parsec pretty process pugs-compat pugs-DrIFT random stm
-         stringtable-atom time utf8-string
+         filepath FindBin hashable hashtables haskeline HsParrot HsSyck
+         MetaObject mtl network parsec pretty process pugs-compat pugs-DrIFT
+         random stm stringtable-atom text time utf8-string
        ];
        homepage = "http://pugscode.org/";
        description = "A Perl 6 Implementation";
@@ -12781,6 +12819,7 @@ self: {
        libraryHaskellDepends = [ base random vector ];
        description = "QuadEdge structure for representing triangulations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuadTree" = callPackage
@@ -19446,605 +19485,1096 @@ self: {
 
   "amazonka" = callPackage
     ({ mkDerivation, amazonka-core, base, bytestring, conduit
-     , conduit-extra, cryptohash, cryptohash-conduit, exceptions
-     , http-conduit, lens, mmorph, monad-control, mtl, resourcet, retry
-     , text, time, transformers, transformers-base, transformers-compat
+     , conduit-extra, directory, exceptions, free, http-client
+     , http-conduit, ini, lens, mmorph, monad-control, mtl, resourcet
+     , retry, tasty, tasty-hunit, text, time, transformers
+     , transformers-base, transformers-compat
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "0.3.6";
-       sha256 = "4b3f0229f988d4ca2d2cdef47ff9e77e6b1fbdca99be14f47ce508fd29cbdfea";
+       version = "1.0.0";
+       sha256 = "6d774924eacb7f958a45660255894b815aef015c6668d8b3f40c4154ea339533";
        libraryHaskellDepends = [
-         amazonka-core base bytestring conduit conduit-extra cryptohash
-         cryptohash-conduit exceptions http-conduit lens mmorph
+         amazonka-core base bytestring conduit conduit-extra directory
+         exceptions free http-client http-conduit ini lens mmorph
          monad-control mtl resourcet retry text time transformers
          transformers-base transformers-compat
        ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Comprehensive Amazon Web Services SDK";
        license = "unknown";
      }) {};
 
   "amazonka-autoscaling" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "0.3.6";
-       sha256 = "692d0d3ec89257bc599715ae4e32a43369180202c9d8d87edb35caac8063b385";
+       version = "1.0.0";
+       sha256 = "35f259716332837cae24f32580bb8c59682cabb7fbedf1a0d3e01bf38a4fa8c8";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-cloudformation" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "0.3.6";
-       sha256 = "037f4b56b9ca397fac6a56236590c24795c75967a5cdf9fd2e7b6afe3abac454";
+       version = "1.0.0";
+       sha256 = "6729b14e427f33ac75f05b23cb6bed59e6f1960e9bcc84adfe90ea911809a047";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-cloudfront" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "0.3.6";
-       sha256 = "371f56870da95340dea000551b4a2fc9d1ecd521c0891b43260257fb54007426";
+       version = "1.0.0";
+       sha256 = "fe77d79cf0e230df4082056a40a68a66f4ad04dd2ebd6c747994146420c384bf";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-cloudhsm" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "0.3.6";
-       sha256 = "cef59c1a93c60803e44a64a5b93ceb14a6aaf11a7ad5d25085a79147a3f42754";
+       version = "1.0.0";
+       sha256 = "65fb9f1b72ee5131fae219afa409e1a355e743ab87eb055c863a8374b67f6b8e";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-cloudsearch" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "0.3.6";
-       sha256 = "454f86d0c622f20993e94a8ad60e98494107a6f02ffada31d2e295cd28bdcac3";
+       version = "1.0.0";
+       sha256 = "a0785561ff3ecbba2f04899635ffcaf3264a0554018dd4c6b0e396cfaa4d7ed3";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-cloudsearch-domains" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "0.3.6";
-       sha256 = "d5f70ae58af1148a90cfb7b01b1a16b071de21c8cb3bddbe5cf29fb3a803d135";
+       version = "1.0.0";
+       sha256 = "38de7c58b7b9924029307177f0da27bf6719b43c6006c773c075369ee944cb86";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-cloudtrail" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "0.3.6";
-       sha256 = "3d31db40aa3174443cf23f91c914c50427d543ffe11bfc0b6dc7859c7c3b641d";
+       version = "1.0.0";
+       sha256 = "16b56b6761bfeaf410ab5f6a786de75355752804d52761e30171e08818e41b3d";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-cloudwatch" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "0.3.6";
-       sha256 = "d3a6b96ac214633f70cf3cb30650839600c97fd5689f619039bbb318d32e7d93";
+       version = "1.0.0";
+       sha256 = "dba8fc034548f8fad9ee77b1d6e69d056582e25282054061d91749c8f5d57ebc";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-cloudwatch-logs" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "0.3.6";
-       sha256 = "6b63a9aeb3e731755bd2c9d0ab567a051afb34f0612aed892ecc54eca2f3b797";
+       version = "1.0.0";
+       sha256 = "917a8c1f9cd9138396794d57a399e1e698b1a1f1b64581b886efd540e93b7ff3";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
+
+  "amazonka-codecommit" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-codecommit";
+       version = "1.0.0";
+       sha256 = "3edfe5808d2249c8f674729614e3a12d0d0320c3c6f0c1ca563495e0d1f803f5";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CodeCommit SDK";
+       license = "unknown";
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-codedeploy" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "0.3.6";
-       sha256 = "b559711e0862a6bfe97e4565e6ef28b612df00c079111696041c5439034de9b2";
+       version = "1.0.0";
+       sha256 = "1e4a475d8d5ae6a7474359721e8e76fa7e25224406fd7ce6f9ea0a59c1a0d8f7";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
+
+  "amazonka-codepipeline" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-codepipeline";
+       version = "1.0.0";
+       sha256 = "64f1e64f804ef615957d1aba9960c8c5816b5dfd6581b313fe5d6420d40f4aad";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CodePipeline SDK";
+       license = "unknown";
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-cognito-identity" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "0.3.6";
-       sha256 = "7f4a090ab59effe06ed61c5f96dd2d782651f6820a061ce179c817f40707e5c5";
+       version = "1.0.0";
+       sha256 = "2cef14155b27fbfc686dc9e490fd72bc9f39f38844f8121683012bae65c44f72";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-cognito-sync" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "0.3.6";
-       sha256 = "63040d0a5dded76f15c1a3726276c48e0785f8eec29b115929341f4d01e2d6d4";
+       version = "1.0.0";
+       sha256 = "9130f9246dd86bb60478ca81f49371a9a393bc7ee74f7dab18c8c4937275d6e9";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-config" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "0.3.6";
-       sha256 = "efbbfa8feffd5b920dd0c3b6a1ad8646a1bcca6f7df56dfcf6aa79452b1b4729";
+       version = "1.0.0";
+       sha256 = "e193b0e4c9c0d2508c43a1835a9ec9afd429f9dbb4b0620ed6906438f929628a";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-core" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , base64-bytestring, bifunctors, bytestring, case-insensitive
-     , conduit, conduit-extra, cryptohash, data-default-class, hashable
-     , http-client, http-types, lens, mmorph, mtl, resourcet, scientific
-     , semigroups, tagged, tasty, tasty-hunit, template-haskell, text
+    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
+     , case-insensitive, conduit, conduit-extra, cryptonite, exceptions
+     , hashable, http-client, http-types, lens, memory, mtl, QuickCheck
+     , quickcheck-unicode, resourcet, scientific, semigroups, tagged
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
      , time, transformers, transformers-compat, unordered-containers
-     , vector, xml-conduit
+     , xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "0.3.6";
-       sha256 = "821e635dc21ea7a06c6ba6711dec228c6fb18c12de51924f84d92fc71cf8c0d0";
+       version = "1.0.0";
+       sha256 = "a6960654512bc30bc00877110a09674cf52b2a37835f6995fe6b3b5515c08277";
        libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring base64-bytestring
-         bifunctors bytestring case-insensitive conduit conduit-extra
-         cryptohash data-default-class hashable http-client http-types lens
-         mmorph mtl resourcet scientific semigroups tagged text time
-         transformers transformers-compat unordered-containers vector
-         xml-conduit
+         aeson attoparsec base bifunctors bytestring case-insensitive
+         conduit conduit-extra cryptonite exceptions hashable http-client
+         http-types lens memory mtl resourcet scientific semigroups tagged
+         text time transformers transformers-compat unordered-containers
+         xml-conduit xml-types
        ];
        testHaskellDepends = [
-         aeson base tasty tasty-hunit template-haskell text
+         aeson base bytestring case-insensitive http-types lens QuickCheck
+         quickcheck-unicode tasty tasty-hunit tasty-quickcheck
+         template-haskell text time
        ];
        homepage = "https://github.com/brendanhay/amazonka";
-       description = "Core functionality and data types for Amazonka libraries";
+       description = "Core data types and functionality for Amazonka libraries";
        license = "unknown";
      }) {};
 
   "amazonka-datapipeline" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "0.3.6";
-       sha256 = "b07af711215a233c972696f68111aed5c9acc1359c87da2769b6b818a139135c";
+       version = "1.0.0";
+       sha256 = "aa483755113ec34eca9d9ec5a50155f9b2224f319a3e464e63dd4775c71d43ce";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
+
+  "amazonka-devicefarm" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-devicefarm";
+       version = "1.0.0";
+       sha256 = "26847794bf233655d37b62985305d2da182356444d99632f0d4101ff6cc6c4ed";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Device Farm SDK";
+       license = "unknown";
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-directconnect" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "0.3.6";
-       sha256 = "66b57a47db626db18ffe5d008512995e513f709ba3aafc3defa5d2c9bb434560";
+       version = "1.0.0";
+       sha256 = "fd07424780428559f9da651e4b81ade00a6d689730eff1e92c37c286c4cd18af";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
+
+  "amazonka-ds" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ds";
+       version = "1.0.0";
+       sha256 = "dd823809c8c85ee33e9393c3a15c1fd70a9f852e759170213f78d5b7e703ae56";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Directory Service SDK";
+       license = "unknown";
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-dynamodb" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "0.3.6";
-       sha256 = "58b6b50f085f198b9e85443b02cccceb4a0c9aecc01e1f389b4aea646efcd3cc";
+       version = "1.0.0";
+       sha256 = "f44166ab92f90121738e226b78a62513a6cab1bed15db5e6912997d9a3e67842";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
+
+  "amazonka-dynamodb-streams" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-dynamodb-streams";
+       version = "1.0.0";
+       sha256 = "374c6184ba5358e30827238ba37d27c84f024c225b5878956fb4aa8daa453086";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon DynamoDB Streams SDK";
+       license = "unknown";
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-ec2" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "0.3.6.1";
-       sha256 = "9eab4d5a9220c745d073a65d734f19287cb7e39c7efa6ba296a05c1cd4c3fea5";
+       version = "1.0.0";
+       sha256 = "f3dea2fdc9455f87548d677791ddb63579b1c244993b8fcbbf88f2e28d7dbc3c";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-ecs" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "0.3.6";
-       sha256 = "d9bd1974ff69af39d4ed54d4af1bc02f31f3d0698f56ca1dcdb7e488db4da5d5";
+       version = "1.0.0";
+       sha256 = "f46a0c8377475da81c746de13b7011ba9f856cba9fb0ec195a1c28fa0b9275b9";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
+
+  "amazonka-efs" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-efs";
+       version = "1.0.0";
+       sha256 = "a827bb8595036a9bb40c2e7f7d9cda5fca791e3c22bfe48de3755a525e85e370";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic File System SDK";
+       license = "unknown";
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-elasticache" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "0.3.6";
-       sha256 = "4a847479c6686eb26b2bb4ed1a7c384caff4a8906ebe4f46a22f212911905741";
+       version = "1.0.0";
+       sha256 = "9f634d604a1f36a82b40bca42a656df3456c590de0b26236b4bbdfc04b5c7293";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-elasticbeanstalk" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "0.3.6";
-       sha256 = "e31c1385d408158e36ff4a3a356ef913fcd5819fed0a77c01ebd652277eff1ae";
+       version = "1.0.0";
+       sha256 = "644d165e1f99647aea3ef92aa2c0d38c696740c8df0e423b25c21738d4c4fa52";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-elastictranscoder" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "0.3.6";
-       sha256 = "e8868624347be2dbad1471ca3c96e50cc728ac329d2d5b2c15d5836f28ffd6e5";
+       version = "1.0.0";
+       sha256 = "0aec463a40a5b54516f98a0a2b3a5070652b46fd2ee201455631841875560411";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-elb" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "0.3.6";
-       sha256 = "a92c4972a4b47fabd4a70c8ab7c63308c0dd3bc7b1c513b49589f7cc0bd9317b";
+       version = "1.0.0";
+       sha256 = "0aae52d1ba515d991985851ed22d63ee0c4fd645b7c11fdbf18c8e12c67c7c9b";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-emr" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "0.3.6";
-       sha256 = "2920743bbb3e4f507ef9662d27c224b3590162ead2059ee8cb540d814ea4605f";
+       version = "1.0.0";
+       sha256 = "797807616a93861862cd145cf11968fbaf8c3803322ce6c82fb0e258de609325";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-glacier" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "0.3.6";
-       sha256 = "b41519fc6e001406f0ad4a2e98c03ec38c9bc410a41a8b6b3c52c2a0a00f7244";
+       version = "1.0.0";
+       sha256 = "f8fc5d54e10447ecd6879fcee41240171e421711e541bfb19062b49081d3077a";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-iam" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "0.3.6";
-       sha256 = "12519b4244c0bd8158e73c03fcd810d9f20a66e3f9dad687054a38706c4ffa5b";
+       version = "1.0.0";
+       sha256 = "778cb110971732b64c5c7422ffeb617a2f189c52d322107ad4c9cafb013d259d";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-importexport" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "0.3.6";
-       sha256 = "3de5b0833361758e806ac7c32ab6bf2daf72ffb121d1b166710a779d1efe98e1";
+       version = "1.0.0";
+       sha256 = "d09085f68a8bef6c900b3ed02831dceee1b2f2189449be4166e5dcde32362383";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-kinesis" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "0.3.6";
-       sha256 = "5e41b7c94eda13465b6c9c7c7bd9f8975c35ae5f2fcda79f7857e5781d2e9a64";
+       version = "1.0.0";
+       sha256 = "8fd7c64c287581a4383d0478718155a59c9af1c9db5a8d8eb89c3f7f44831df6";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-kms" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "0.3.6";
-       sha256 = "c9feae3597f745414e560ae4613219bb71285ced6959b336bf2aa753cb93c8f4";
+       version = "1.0.0";
+       sha256 = "36759431a21c11fe0066ff6dda522a2a7fbd78c45d4839a63615562e0860448c";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-lambda" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "0.3.6";
-       sha256 = "9742cd0eff0e80552a5fb18dcddbefdb6cdb3f7a3a1f7476b5ea03338971cfbc";
+       version = "1.0.0";
+       sha256 = "1c64ef771a7b9aa47f69305c066d71ec6c3f4348f1ab60d3e9393b62207c34cb";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-ml" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "0.3.6";
-       sha256 = "04b06c1f60461bfc807b5bf3c432a75999d4e96f283d9f521aba93605b054655";
+       version = "1.0.0";
+       sha256 = "4602977012ba8c5a5da2d28f25a038bcb7ecc3a78d9e3a20c62f93866e87e276";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Machine Learning SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-opsworks" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "0.3.6";
-       sha256 = "142bb8a969bc39ce8706d5fc8a83063733506a06eb3d1d09a3666272bf7a38b5";
+       version = "1.0.0";
+       sha256 = "69831a3df942a70c624babe44c8ae7af18c75b3ebd8ecc2e02a0c020f63de8b7";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-rds" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "0.3.6";
-       sha256 = "d40f097f828d4ffb66498ebe17de09da43e0b53a195424eff64541993f92bd80";
+       version = "1.0.0";
+       sha256 = "4ee2eb45b7a95f586a8747e208f18e9f647cf15992239a5ca59e54491b002773";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-redshift" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "0.3.6";
-       sha256 = "f9ba346247ef45a078de0c6694ff70c65ed445e4a9b2022677151a0f2557b4a4";
+       version = "1.0.0";
+       sha256 = "7c8ebb747839d312475f4fae8ac303b14eab648987f8980c07ccca4f12670b88";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-route53" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "0.3.6.1";
-       sha256 = "bc26681aa326f53075e8ec47c419249dfb231517362188784da99bc49c27ad94";
+       version = "1.0.0";
+       sha256 = "0733757c703e9cfdd8ed72a08629b75bc15eed07d87526b1c7cdbcf0360e818a";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-route53-domains" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "0.3.6";
-       sha256 = "1b4fa06c87ee69370584cffbdef5fd0c7fa9a3fd43637bac1bb295c14b9fbe8d";
+       version = "1.0.0";
+       sha256 = "600a096c249826c489f1fa2ff5b723ecb94db890ad5386ede881a1f335cbd46a";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-s3" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "0.3.6";
-       sha256 = "69b37d3713b5ff745109877cdfcb766ca71b6ccc7b15d312afd2654e9e6985e0";
-       libraryHaskellDepends = [ amazonka-core base ];
+       version = "1.0.0";
+       sha256 = "f044ef823a9bc5ede3564f5460e1dc3c7332474543b379f62cb56330e93706f1";
+       libraryHaskellDepends = [ amazonka-core base lens text ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-sdb" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "0.3.6";
-       sha256 = "8c06d2a7912416580f4301231e6883242d31132473917d2fdc3f605973d45cf3";
+       version = "1.0.0";
+       sha256 = "73e41153331fdf08d33c9a0a44b326118e5d7da6c93177232282bf61dfc73aaa";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-ses" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "0.3.6";
-       sha256 = "bd6f22d69cd44073423631390eaba47eb2a539d9ae3912e9111a0677eb08f3b8";
+       version = "1.0.0";
+       sha256 = "c1f8ec0f1b94891a478ce46e169cfbb6fe9aa515dbe8208b33085dca03c37339";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-sns" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "0.3.6";
-       sha256 = "aaaebf5a3d8851a6139216154922b1d49ae2474c00ace8e5eb33f6daccb07401";
+       version = "1.0.0";
+       sha256 = "7790cb4ab13932df53e056b389e70ac2873e66002ee5e1ba67d7b952264cb820";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-sqs" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "0.3.6";
-       sha256 = "88f733f5885372c0faf052be2da8dae0d8605eccfdb2b3e290b7fc1e50431f13";
+       version = "1.0.0";
+       sha256 = "8acef52b122988cd7b231ca10d42fe69b06ff129342daa00afaed5c48880f488";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-ssm" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "0.3.6";
-       sha256 = "e08c7d2682d2cb75a8f758787bff680897da29e2a0e3f75f355501d8a140fff7";
+       version = "1.0.0";
+       sha256 = "d6c35acac9bea450001beaa65d3c8eabd1b006b916390004354369db29c2fb59";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Systems Management Service SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-storagegateway" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "0.3.6";
-       sha256 = "5fe0192f8a898ddd657e2768888f652611133c25fe5861f2b0db51e0f8954ab2";
+       version = "1.0.0";
+       sha256 = "38a3c9e98906c6f4feec927b442f694c268dfbb1e5aaa4bd6c883e552b0f77d0";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-sts" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "0.3.6";
-       sha256 = "c1953e60af48baf7e2cfd5247e4eff8fcdbeaf966bd6ffc7b29bac74aed8ca24";
+       version = "1.0.0";
+       sha256 = "12cd1e3cffc9fdb8c8337f25c47496a6d7163916880b1bcb25c6fe86610c3d65";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-support" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "0.3.6";
-       sha256 = "c6e36708c2a7db345f39b8c63358b87474aa0028e52a7c8fe52b6f340ac2ea45";
+       version = "1.0.0";
+       sha256 = "524eed7040b08552ad50a9afb4d958dc0bd31014a0e64169041554c65136351a";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-swf" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "0.3.6";
-       sha256 = "cce163f16a103629248313a237fc6d80eaaba162d64f0bdef96df9930e6b3256";
+       version = "1.0.0";
+       sha256 = "d437d11781c5e515d91448959fe90e007ef0c1a492fee33ef903e30b5028a727";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "amazonka-workspaces" = callPackage
-    ({ mkDerivation, amazonka-core, base }:
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "0.3.6";
-       sha256 = "93974eb065de3787313543981b5aa0d0bd9c7b1a3ca6b331ce90585794a894c3";
+       version = "1.0.0";
+       sha256 = "0ade5a1a0064b9398117d86c98711e811009058824667add29b18f399f0328cf";
        libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
+         text time unordered-containers
+       ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkSpaces SDK";
        license = "unknown";
-     }) {};
+       broken = true;
+     }) { amazonka-test = null;};
 
   "ampersand" = callPackage
     ({ mkDerivation, base, bytestring, containers, csv, directory
@@ -21217,6 +21747,7 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath semigroups simple-reflect
        ];
+       jailbreak = true;
        homepage = "http://github.com/analytics/approximate/";
        description = "Approximate discrete values and numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -22514,6 +23045,7 @@ self: {
        jailbreak = true;
        description = "Atomic operations on Data.Vector types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atomic-write" = callPackage
@@ -22884,6 +23416,7 @@ self: {
          aeson aeson-pretty base filepath lens lens-aeson mtl text vector
          wreq
        ];
+       jailbreak = true;
        homepage = "https://github.com/fosskers/haskell-aur";
        description = "Access metadata from the Arch Linux User Repository";
        license = stdenv.lib.licenses.gpl3;
@@ -23225,6 +23758,7 @@ self: {
          mtl QuickCheck quickcheck-instances resourcet tagged tasty
          tasty-quickcheck text time transformers transformers-base
        ];
+       jailbreak = true;
        homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -23266,6 +23800,7 @@ self: {
        ];
        description = "Configuration types, parsers & renderers for AWS services";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-dynamodb-conduit" = callPackage
@@ -23307,6 +23842,7 @@ self: {
        jailbreak = true;
        description = "Haskell bindings for Amazon DynamoDB Streams";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-ec2" = callPackage
@@ -23387,6 +23923,7 @@ self: {
        homepage = "https://github.com/alephcloud/hs-aws-general";
        description = "Bindings for Amazon Web Services (AWS) General Reference";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-kinesis" = callPackage
@@ -23413,6 +23950,7 @@ self: {
        homepage = "https://github.com/alephcloud/hs-aws-kinesis";
        description = "Bindings for Amazon Kinesis";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-kinesis-client" = callPackage
@@ -23448,6 +23986,7 @@ self: {
        jailbreak = true;
        description = "A producer & consumer client library for AWS Kinesis";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-kinesis-reshard" = callPackage
@@ -23527,6 +24066,7 @@ self: {
        homepage = "http://github.com/alephcloud/hs-aws-performance-tests";
        description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-route53" = callPackage
@@ -23775,7 +24315,6 @@ self: {
          mmap mtl pipes pipes-interleave transformers vector
        ];
        testHaskellDepends = [ base binary containers pipes QuickCheck ];
-       jailbreak = true;
        homepage = "http://github.com/bgamari/b-tree";
        description = "Immutable disk-based B* trees";
        license = stdenv.lib.licenses.bsd3;
@@ -24116,6 +24655,7 @@ self: {
          attoparsec base HUnit test-framework test-framework-hunit text
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/fanjam/banwords";
        description = "Generalized word blacklister";
        license = stdenv.lib.licenses.mit;
@@ -25324,6 +25864,7 @@ self: {
          QuickCheck storable-tuple unordered-containers vector
          vector-binary-instances vector-th-unbox
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/bimaps";
        description = "bijections with multiple implementations";
        license = stdenv.lib.licenses.bsd3;
@@ -27010,9 +27551,11 @@ self: {
        testHaskellDepends = [
          base base-unicode-symbols bytestring QuickCheck vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phonohawk/bitstream";
        description = "Fast, packed, strict and lazy bit streams with stream fusion";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitstring" = callPackage
@@ -27078,6 +27621,7 @@ self: {
        homepage = "https://github.com/mokus0/bitvec";
        description = "Unboxed vectors of bits / dense IntSets";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitwise" = callPackage
@@ -28342,6 +28886,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "broker-haskell" = callPackage
+    ({ mkDerivation, base, broker, bytestring, hspec }:
+     mkDerivation {
+       pname = "broker-haskell";
+       version = "0.1.0.0";
+       sha256 = "6d0c74a52f20ba2dd33a5c396498045da877955e8b02ca67c2266abeeab1bf4b";
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ broker ];
+       testHaskellDepends = [ base bytestring hspec ];
+       homepage = "https://github.com/capn-freako/broker-haskell";
+       description = "Haskell bindings to Broker, Bro's messaging library";
+       license = stdenv.lib.licenses.bsd3;
+     }) { broker = null;};
+
   "bsd-sysctl" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -28816,6 +29374,7 @@ self: {
        homepage = "http://github.com/pjones/byline";
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytable" = callPackage
@@ -29323,29 +29882,28 @@ self: {
      }) {};
 
   "c2hs" = callPackage
-    ({ mkDerivation, array, base, c2hs, containers, directory, dlist
-     , filepath, HUnit, language-c, pretty, process, shelly
+    ({ mkDerivation, array, base, bytestring, containers, directory
+     , dlist, filepath, HUnit, language-c, pretty, process, shelly
      , test-framework, test-framework-hunit, text, transformers
      }:
      mkDerivation {
        pname = "c2hs";
-       version = "0.25.2";
-       sha256 = "153e28d4f8f7846fd0e09abc9b4ed0681b50cd8e2bb6100a1c3b91bf397b3934";
+       version = "0.26.1";
+       sha256 = "f0c491cca64a9d5c14eb1ea926785642b2dbbaed03144ee2e1d8d47c60985c65";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base containers directory dlist filepath language-c pretty
-         process
+         array base bytestring containers directory dlist filepath
+         language-c pretty process
        ];
        testHaskellDepends = [
          base filepath HUnit shelly test-framework test-framework-hunit text
          transformers
        ];
-       testToolDepends = [ c2hs ];
        homepage = "https://github.com/haskell/c2hs";
        description = "C->Haskell FFI tool that gives some cross-language type safety";
        license = stdenv.lib.licenses.gpl2;
-     }) { c2hs = null;};
+     }) {};
 
   "c2hsc" = callPackage
     ({ mkDerivation, base, cmdargs, containers, directory, filepath
@@ -34864,12 +35422,12 @@ self: {
      }:
      mkDerivation {
        pname = "commutative";
-       version = "0.0.1.1";
-       sha256 = "b704a7b2dd4c39929f1aec71cf2a6f10d5c4f18842a60e49d9976cfffa4ec43b";
+       version = "0.0.1.2";
+       sha256 = "8233c0d2be80252501b4d75828d1cd2d4a1ee53e64284da5ee79e185e7e0eb4a";
        libraryHaskellDepends = [ base random semigroups ];
        testHaskellDepends = [
-         base QuickCheck quickcheck-instances tasty tasty-hunit
-         tasty-quickcheck
+         base QuickCheck quickcheck-instances random semigroups tasty
+         tasty-hunit tasty-quickcheck
        ];
        description = "Commutative binary operations";
        license = stdenv.lib.licenses.mit;
@@ -35105,6 +35663,7 @@ self: {
        homepage = "http://github.com/analytics/compensated/";
        description = "Compensated floating-point arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "competition" = callPackage
@@ -39224,8 +39783,8 @@ self: {
      }:
      mkDerivation {
        pname = "curve25519";
-       version = "0.2.1";
-       sha256 = "be41c18b7333004e15cdc600c03d489ceb9a5088bf9d654f9819bcd8253bdacd";
+       version = "0.2.2";
+       sha256 = "baa776233ff1e56d3e4c9ecfc30c0c607e98bb2f4fdb8ef9a057d29d5dabe8f2";
        libraryHaskellDepends = [ base bytestring crypto-api ];
        testHaskellDepends = [
          base bytestring crypto-api DRBG HUnit QuickCheck tagged
@@ -39490,9 +40049,9 @@ self: {
     ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
      , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
      , dataenc, directory, filepath, FindBin, hashable, haskeline, html
-     , HTTP, HUnit, mmap, mtl, network, network-uri, old-time, parsec
-     , process, QuickCheck, random, regex-applicative, regex-compat-tdfa
-     , shelly, split, tar, terminfo, test-framework
+     , HTTP, HUnit, mmap, mtl, network, network-uri, old-locale
+     , old-time, parsec, process, QuickCheck, random, regex-applicative
+     , regex-compat-tdfa, shelly, split, tar, terminfo, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
      , transformers, transformers-compat, unix, unix-compat, utf8-string
      , vector, zip-archive, zlib
@@ -39507,10 +40066,11 @@ self: {
        libraryHaskellDepends = [
          array attoparsec base base16-bytestring binary bytestring
          containers cryptohash data-ordlist dataenc directory filepath
-         hashable haskeline html HTTP mmap mtl network network-uri old-time
-         parsec process random regex-applicative regex-compat-tdfa tar
-         terminfo text time transformers transformers-compat unix
-         unix-compat utf8-string vector zip-archive zlib
+         hashable haskeline html HTTP mmap mtl network network-uri
+         old-locale old-time parsec process random regex-applicative
+         regex-compat-tdfa tar terminfo text time transformers
+         transformers-compat unix unix-compat utf8-string vector zip-archive
+         zlib
        ];
        librarySystemDepends = [ curl ];
        executableHaskellDepends = [ base filepath regex-compat-tdfa ];
@@ -39521,6 +40081,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text unix-compat
          zip-archive zlib
        ];
+       jailbreak = true;
        postInstall = ''
          mkdir -p $out/etc/bash_completion.d
          mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
@@ -41311,6 +41872,7 @@ self: {
          filepath libxml-sax network parsec process QuickCheck random text
          transformers unix vector xml-types
        ];
+       jailbreak = true;
        homepage = "https://john-millikin.com/software/haskell-dbus/";
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.gpl3;
@@ -44068,6 +44630,7 @@ self: {
          array base containers contravariant deepseq ghc-prim primitive
          profunctors promises semigroups transformers vector void
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/discrimination/";
        description = "Fast generic linear-time sorting, joins and container construction";
        license = stdenv.lib.licenses.bsd3;
@@ -45499,6 +46062,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell segmented arrays. (sequential implementation)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dph-seq" = callPackage
@@ -45579,15 +46143,17 @@ self: {
      }) {};
 
   "drifter" = callPackage
-    ({ mkDerivation, base, bytestring, postgresql-simple, text, time }:
+    ({ mkDerivation, base, containers, fgl, tasty, tasty-hunit
+     , tasty-quickcheck, text
+     }:
      mkDerivation {
        pname = "drifter";
-       version = "0.1.0.1";
-       sha256 = "18e260c78b19b46727c17079f8b5f2b0d7f45900f8cb8d6388e4413dfba4b8d1";
-       libraryHaskellDepends = [
-         base bytestring postgresql-simple text time
+       version = "0.2";
+       sha256 = "5a9aa7272b4d40f832d7501b8b1d6155004a21d8aea4bea283e8a067bcbf646f";
+       libraryHaskellDepends = [ base containers fgl text ];
+       testHaskellDepends = [
+         base tasty tasty-hunit tasty-quickcheck text
        ];
-       jailbreak = true;
        homepage = "https://github.com/AndrewRademacher/drifter";
        description = "Simple schema management for arbitrary databases";
        license = stdenv.lib.licenses.mit;
@@ -46172,6 +46738,7 @@ self: {
        version = "0.1.0.3";
        sha256 = "650ce3518979be73c89adf627d64104bf486f370861d7bc9b3d6bf366175cddb";
        libraryHaskellDepends = [ base primitive vector ];
+       jailbreak = true;
        homepage = "https://github.com/AndrasKovacs/dynamic-mvector";
        description = "A wrapper around MVector that enables pushing, popping and extending";
        license = stdenv.lib.licenses.bsd3;
@@ -46404,12 +46971,11 @@ self: {
      }:
      mkDerivation {
        pname = "easyrender";
-       version = "0.1.0.1";
-       sha256 = "765234199b77ce44297bc6b3445bc8c875b2079a84ef33cc388de60db814f990";
+       version = "0.1.1.0";
+       sha256 = "eb0ca0d7622c7aed65787e92eb2c627a9e7153aaa4afc9f9981f6d4b7c020ec4";
        libraryHaskellDepends = [
          base bytestring containers mtl superdoc zlib
        ];
-       jailbreak = true;
        homepage = "http://www.mathstat.dal.ca/~selinger/easyrender/";
        description = "User-friendly creation of EPS, PostScript, and PDF files";
        license = stdenv.lib.licenses.gpl3;
@@ -47083,6 +47649,7 @@ self: {
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/ekg-bosun";
        description = "Send ekg metrics to a Bosun instance";
        license = stdenv.lib.licenses.bsd3;
@@ -47100,6 +47667,7 @@ self: {
          base ekg-core network network-carbon text time unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/ekg-carbon";
        description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
@@ -48558,17 +49126,6 @@ self: {
      }) {};
 
   "errors" = callPackage
-    ({ mkDerivation, base, either, safe, transformers }:
-     mkDerivation {
-       pname = "errors";
-       version = "1.4.7";
-       sha256 = "8732ebeae477feeb5b669532bc6ffc985f7b115e13fe823bbc816b4e7d1be525";
-       libraryHaskellDepends = [ base either safe transformers ];
-       description = "Simplified error-handling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "errors_2_0_0" = callPackage
     ({ mkDerivation, base, safe, transformers }:
      mkDerivation {
        pname = "errors";
@@ -50875,6 +51432,7 @@ self: {
          errors filepath hashable HStringTemplate lens mtl process pureMD5
          split template-haskell transformers unordered-containers
        ];
+       jailbreak = true;
        description = "automatic C++ binding generation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52491,6 +53049,7 @@ self: {
        testHaskellDepends = [
          base bytestring deepseq directory doctest filepath mtl semigroups
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/folds";
        description = "Beautiful Folding";
        license = stdenv.lib.licenses.bsd3;
@@ -52612,6 +53171,7 @@ self: {
          base control-monad-loop hashable hashtables hspec primitive
          transformers vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/minpou/forbidden-fruit";
        description = "A library accelerates imperative style programming";
        license = stdenv.lib.licenses.bsd3;
@@ -53811,6 +54371,7 @@ self: {
        jailbreak = true;
        description = "In-memory full text search engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fullstop" = callPackage
@@ -55458,8 +56019,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-imported-from";
-       version = "0.2.0.6";
-       sha256 = "15afa4b2e3311f8970321f733344e34ab9f14bd28ebbabcac31ddd458fa52f79";
+       version = "0.2.0.7";
+       sha256 = "3b035e4e4792e2920c2af48e2b3e1bb5e643ae29e7b15ca92539b84699f2484e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55481,6 +56042,7 @@ self: {
        homepage = "https://github.com/carlohamalainen/ghc-imported-from";
        description = "Find the Haddock documentation for a symbol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-make" = callPackage
@@ -56916,9 +57478,11 @@ self: {
          ansi-wl-pprint base errors mtl parsec tasty tasty-hunit
          template-haskell
        ];
+       jailbreak = true;
        homepage = "https://github.com/goldfirere/glambda";
        description = "A simply typed lambda calculus interpreter, written with GADTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glapp" = callPackage
@@ -57198,6 +57762,7 @@ self: {
          gloss-algorithms gloss-raster gloss-rendering random repa
          repa-algorithms repa-io vector
        ];
+       jailbreak = true;
        homepage = "http://gloss.ouroborus.net";
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
@@ -57306,26 +57871,27 @@ self: {
 
   "glue" = callPackage
     ({ mkDerivation, async, base, ekg-core, hashable, hspec
-     , lifted-base, monad-control, QuickCheck, quickcheck-instances
-     , text, time, transformers, transformers-base, unordered-containers
+     , lifted-base, monad-control, monad-loops, QuickCheck
+     , quickcheck-instances, text, time, transformers, transformers-base
+     , unordered-containers
      }:
      mkDerivation {
        pname = "glue";
-       version = "0.1.1.1";
-       sha256 = "4b7da29af555beebaa5f89559ebb8f0f119997bbd223f229e0ab89c2d06623dd";
+       version = "0.1.2";
+       sha256 = "55a2bee39073ad16ddfd2879ec91c8eb9dd78cd2e25498ef39ad6f8dc1f6ae45";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base ekg-core hashable lifted-base monad-control text time
-         transformers transformers-base unordered-containers
+         base ekg-core hashable lifted-base monad-control monad-loops text
+         time transformers transformers-base unordered-containers
        ];
        executableHaskellDepends = [
-         async base ekg-core hashable lifted-base monad-control text time
-         transformers transformers-base unordered-containers
+         async base ekg-core hashable lifted-base monad-control monad-loops
+         text time transformers transformers-base unordered-containers
        ];
        testHaskellDepends = [
          async base ekg-core hashable hspec lifted-base monad-control
-         QuickCheck quickcheck-instances text time transformers
+         monad-loops QuickCheck quickcheck-instances text time transformers
          transformers-base unordered-containers
        ];
        description = "Make better services";
@@ -58849,6 +59415,7 @@ self: {
        version = "0.5.0";
        sha256 = "d2adccfe625d3cb5046ae5bb3c7a23d23697d1fc2c6a717df75f75aba2881c2e";
        libraryHaskellDepends = [ base vector ];
+       jailbreak = true;
        homepage = "http://github.com/patperry/hs-gsl-random";
        description = "Bindings the the GSL random number generation facilities";
        license = stdenv.lib.licenses.bsd3;
@@ -62528,6 +63095,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "harmony" = callPackage
+    ({ mkDerivation, alex, array, base, BNFC, containers, derive
+     , directory, happy, hastache, hlint, hslogger, hspec, HUnit, mtl
+     , process, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "harmony";
+       version = "0.1.0.0";
+       sha256 = "d413a21f30ce41ee74db4dba4525ac66b10cdd14ca9074c15c1094d3a21467bd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base BNFC containers derive directory hastache hslogger mtl
+         process QuickCheck text
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers derive hlint hslogger hspec HUnit QuickCheck
+       ];
+       jailbreak = true;
+       description = "A web service specification compiler that generates implementation and tests";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "haroonga" = callPackage
     ({ mkDerivation, base, bindings-DSL, groonga, monad-control
      , resourcet, transformers
@@ -62810,14 +63402,14 @@ self: {
      }:
      mkDerivation {
        pname = "hashabler";
-       version = "0.1.0.2";
-       sha256 = "62145018a40a61b8679b015de5547b912d814c657982dfda242420c276e16c58";
+       version = "1.0";
+       sha256 = "fb778350f955188fd7348fc85e3709502432e7290e6cfd1799e3d65f51b982bf";
        libraryHaskellDepends = [
          array base bytestring ghc-prim integer-gmp primitive
          template-haskell text
        ];
        homepage = "https://github.com/jberryman/hashabler";
-       description = "Principled, cross-platform & extensible hashing of types, including an implementation of the FNV-1a algorithm";
+       description = "Principled, cross-platform & extensible hashing of types, including an implementation of the FNV-1a and SipHash algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -63815,6 +64407,7 @@ self: {
        homepage = "https://github.com/alanz/haskell-token-utils";
        description = "Utilities to tie up tokens to an AST";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-type-exts" = callPackage
@@ -64352,6 +64945,7 @@ self: {
          semigroups test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/happy0/haskellscrabble";
        description = "A scrabble library capturing the core game logic of scrabble";
        license = stdenv.lib.licenses.gpl3;
@@ -65469,6 +66063,7 @@ self: {
        homepage = "https://bitbucket.org/bhris/hbb";
        description = "Haskell Busy Bee, a backend for text editors";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbcd" = callPackage
@@ -65555,29 +66150,27 @@ self: {
      }) {};
 
   "hbro" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, classy-prelude, cond
-     , containers, data-default-class, directory, dyre, errors
-     , exceptions, fast-logger, filepath, glib, gtk3, lens, lifted-async
+    ({ mkDerivation, base, bytestring, classy-prelude, cond, containers
+     , data-default-class, directory, dyre, errors, exceptions
+     , fast-logger, filepath, glib, gtk3, lens, lifted-async
      , lifted-base, monad-control, monad-logger, mtl, network-uri
-     , optparse-applicative, pango, parsec, process, resourcet, safe
-     , semigroups, stm-chans, text, time, transformers
-     , transformers-base, unix, webkitgtk3, zeromq4-haskell
+     , optparse-applicative, pango, parsec, process, random, resourcet
+     , safe, semigroups, stm-chans, text, time, transformers
+     , transformers-base, unix, uuid, webkitgtk3, zeromq4-haskell
      }:
      mkDerivation {
        pname = "hbro";
-       version = "1.4.0.0";
-       sha256 = "f9ca48c993b30976f8e0a66bf9cb4142f6fd661be14a28f5fafa09a1862c7c23";
-       revision = "1";
-       editedCabalFile = "331a844037ba6df7831151e45e40223eed66313dabef7dc0285a6e658747b15c";
+       version = "1.4.0.1";
+       sha256 = "aafda5f16e1bc86dec50dde8ff18dbcb086987faba87cbe425225e59d107318a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring classy-prelude cond containers
-         data-default-class directory dyre errors exceptions fast-logger
-         filepath glib gtk3 lens lifted-async lifted-base monad-control
-         monad-logger mtl network-uri optparse-applicative pango parsec
-         process resourcet safe semigroups stm-chans text time transformers
-         transformers-base unix webkitgtk3 zeromq4-haskell
+         base bytestring classy-prelude cond containers data-default-class
+         directory dyre errors exceptions fast-logger filepath glib gtk3
+         lens lifted-async lifted-base monad-control monad-logger mtl
+         network-uri optparse-applicative pango parsec process random
+         resourcet safe semigroups stm-chans text time transformers
+         transformers-base unix uuid webkitgtk3 zeromq4-haskell
        ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/k0ral/hbro";
@@ -68742,6 +69335,7 @@ 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;
@@ -70492,10 +71086,10 @@ self: {
          base bytestring Cabal containers directory errors filepath hoogle
          optparse-applicative process temporary transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/bgamari/hoogle-index";
        description = "Easily generate Hoogle indices for installed packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hooks-dir" = callPackage
@@ -70605,8 +71199,8 @@ self: {
      }:
      mkDerivation {
        pname = "hopenpgp-tools";
-       version = "0.16";
-       sha256 = "16793bf1bc17f28dcd41a0e9c721c0b09abc0ab7ab761cb90eb66aeeb16916c2";
+       version = "0.16.2";
+       sha256 = "6f491a68846e60635e0e2dbc9c95cf245d88619a19c0abf83dd51b58e48f6588";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -71574,6 +72168,7 @@ self: {
        testHaskellDepends = [
          aeson attoparsec base QuickCheck text vector
        ];
+       jailbreak = true;
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ruby;};
@@ -73025,8 +73620,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsexif";
-       version = "0.6.0.4";
-       sha256 = "73f4659afe2d871f6ff1de0647413a7cdbe61f228868bacd2b1d58c14c332a4d";
+       version = "0.6.0.5";
+       sha256 = "8078722fbe719c485cbd2502b83f5eb5ca3b12ae5a0b651a3130a36cc10d1d19";
        libraryHaskellDepends = [
          base binary bytestring containers iconv text time
        ];
@@ -74256,8 +74851,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsqml-datamodel-vinyl";
-       version = "0.1.0.0";
-       sha256 = "2135ad6761f60effab87414098ea4f8866d8105afc38ffd516c949020395e349";
+       version = "0.3.0.0";
+       sha256 = "d746e03f7cd77bab28ed9bb53253608e239237b510e412f2c55a8fdd61e144a2";
        libraryHaskellDepends = [
          base exceptions hsqml-datamodel type-list vinyl
        ];
@@ -75329,6 +75924,8 @@ self: {
        pname = "http-conduit";
        version = "2.1.8";
        sha256 = "550d86ea9ee6dd90994a460c5c85ddc861fb5c0f007304dc4a2e2035f980ea3d";
+       revision = "1";
+       editedCabalFile = "281d76f2884547539aae5dbcd45997ae889d9f04f4bf55ff282937960ff256f1";
        libraryHaskellDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -76812,9 +77409,11 @@ self: {
        revision = "1";
        editedCabalFile = "43a2c8cd2fa6abe7dc526dd99ef9d296394922a3d92ced8138072250fe75eb35";
        libraryHaskellDepends = [ base deepseq primitive vector ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/hybrid-vectors";
        description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydra-hs" = callPackage
@@ -77170,9 +77769,11 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
+       jailbreak = true;
        homepage = "http://github.com/analytics/hyperloglog";
        description = "An approximate streaming (constant space) unique object counter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyperpublic" = callPackage
@@ -78177,6 +78778,7 @@ self: {
          system-filepath test-framework test-framework-hunit
          test-framework-quickcheck2 text transformers vector
        ];
+       jailbreak = true;
        description = "bindings to imagemagick library";
        license = "unknown";
      }) { inherit (pkgs) imagemagick;};
@@ -79774,6 +80376,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ ipopt nlopt ];
        libraryToolDepends = [ c2hs ];
+       jailbreak = true;
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80838,6 +81441,7 @@ self: {
        homepage = "http://github.com/ghorn/jacobi-roots";
        description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jail" = callPackage
@@ -80927,6 +81531,7 @@ self: {
          vector xml
        ];
        executableHaskellDepends = [ base boxes directory filepath ];
+       jailbreak = true;
        homepage = "https://github.com/mtolly/jammittools";
        description = "Export sheet music and audio from Windows/Mac app Jammit";
        license = "GPL";
@@ -81690,6 +82295,7 @@ self: {
          QuickCheck stm stm-conduit test-framework
          test-framework-quickcheck2 text transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/xenog/json-rpc";
        description = "Fully-featured JSON-RPC 2.0 library";
        license = stdenv.lib.licenses.publicDomain;
@@ -81818,6 +82424,7 @@ self: {
          aeson attoparsec attoparsec-trans base bytestring scientific text
          transformers unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/srijs/haskell-json-togo";
        description = "Effectful parsing of JSON documents";
        license = stdenv.lib.licenses.mit;
@@ -81967,6 +82574,7 @@ self: {
        testHaskellDepends = [
          aeson base bytestring containers process tagged text
        ];
+       jailbreak = true;
        homepage = "https://github.com/yuga/jsonschema-gen";
        description = "JSON Schema generator from Algebraic data type";
        license = stdenv.lib.licenses.bsd3;
@@ -83450,6 +84058,7 @@ self: {
          ad base hmatrix HUnit nonlinear-optimization test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/jfischoff/lagrangian";
        description = "Solve Lagrange multiplier problems";
        license = stdenv.lib.licenses.bsd3;
@@ -83947,6 +84556,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring bytestring-trie containers mtl vector
        ];
+       jailbreak = true;
        homepage = "http://lambdacube3d.wordpress.com/";
        description = "LambdaCube 3D IR";
        license = stdenv.lib.licenses.bsd3;
@@ -83964,6 +84574,7 @@ self: {
          base bytestring bytestring-trie containers ghc-prim lambdacube-core
          mtl vector
        ];
+       jailbreak = true;
        homepage = "http://lambdacube3d.wordpress.com/";
        description = "LambdaCube 3D EDSL definition";
        license = stdenv.lib.licenses.bsd3;
@@ -85616,6 +86227,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "lens-tutorial" = callPackage
+    ({ mkDerivation, base, doctest, lens }:
+     mkDerivation {
+       pname = "lens-tutorial";
+       version = "1.0.0";
+       sha256 = "469df18e1614b8eeeab121a67fd27b79ae7cb8b8386a18539a266841e957a1c9";
+       libraryHaskellDepends = [ base lens ];
+       testHaskellDepends = [ base doctest ];
+       description = "Tutorial for the lens library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lenses" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
@@ -85741,6 +86364,7 @@ self: {
        version = "1.2.1.5";
        sha256 = "727ec5ebd523997b471685c7aed6f1a91120707e3b273734d23a6fc6a35d5525";
        libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
+       jailbreak = true;
        homepage = "https://github.com/basvandijk/levmar";
        description = "An implementation of the Levenberg-Marquardt algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -86427,6 +87051,7 @@ self: {
          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;
@@ -86721,6 +87346,7 @@ self: {
        libraryHaskellDepends = [ base containers limp vector ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base limp ];
+       jailbreak = true;
        homepage = "https://github.com/amosr/limp-cbc";
        description = "bindings for integer linear programming solver Coin/CBC";
        license = stdenv.lib.licenses.mit;
@@ -88251,18 +88877,20 @@ self: {
      }) {};
 
   "log" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
-     , exceptions, hpqtypes, monad-control, monad-time, mtl, old-locale
-     , split, stm, text, time, transformers-base, unordered-containers
+    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+     , bytestring, deepseq, exceptions, hpqtypes, lifted-base
+     , monad-control, monad-time, mtl, old-locale, split, stm, text
+     , time, transformers-base, unordered-containers, vector
      }:
      mkDerivation {
        pname = "log";
-       version = "0.2.2";
-       sha256 = "36706bda25ef9d022a5243530c0286244c87b4fc574c416791dc718e47633f16";
+       version = "0.2.3";
+       sha256 = "883a6e2d190046842713debf3dfa267aac5e096661f31b856ac2afbb50ee2f97";
        libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring deepseq exceptions hpqtypes
-         monad-control monad-time mtl old-locale split stm text time
-         transformers-base unordered-containers
+         aeson aeson-pretty base base64-bytestring bytestring deepseq
+         exceptions hpqtypes lifted-base monad-control monad-time mtl
+         old-locale split stm text time transformers-base
+         unordered-containers vector
        ];
        homepage = "https://github.com/scrive/log";
        description = "Structured logging solution with multiple backends";
@@ -88287,6 +88915,7 @@ 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;
@@ -88708,6 +89337,7 @@ self: {
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ loris ];
        libraryToolDepends = [ c2hs ];
+       jailbreak = true;
        homepage = "http://www.tiresiaspress.us/haskell/loris";
        description = "interface to Loris API";
        license = stdenv.lib.licenses.gpl2;
@@ -89235,6 +89865,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lzma" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, lzma, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "lzma";
+       version = "0.0.0.0";
+       sha256 = "ba6bd66b58d0b378d5f95bb0436257c2862a77352f24ae7c459b82646b6e81c9";
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ lzma ];
+       testHaskellDepends = [
+         base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/hvr/lzma";
+       description = "LZMA/XZ compression and decompression";
+       license = stdenv.lib.licenses.bsd3;
+     }) { inherit (pkgs) lzma;};
+
   "lzma-conduit" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, conduit, HUnit
      , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit
@@ -89287,10 +89935,9 @@ self: {
      }:
      mkDerivation {
        pname = "lzma-streams";
-       version = "0.0.0.0";
-       sha256 = "a27e3f48f0e99f894c26ca4a0d6ec0be883ce61cf63b9850f2b3a27512888f4e";
-       libraryHaskellDepends = [ base bytestring io-streams ];
-       librarySystemDepends = [ lzma ];
+       version = "0.1.0.0";
+       sha256 = "b6c90e493f6c367f79c1cee6c3ed978c3515139bf2c7174ed083a1cf76071af1";
+       libraryHaskellDepends = [ base bytestring io-streams lzma ];
        testHaskellDepends = [
          base bytestring HUnit io-streams QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -89298,7 +89945,7 @@ self: {
        homepage = "https://github.com/hvr/lzma-streams";
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) lzma;};
+     }) {};
 
   "maam" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, ghc
@@ -90825,6 +91472,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/jfischoff/maxent";
        description = "Compute Maximum Entropy Distributions";
        license = stdenv.lib.licenses.bsd3;
@@ -91692,8 +92340,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.2.0.0";
-       sha256 = "6f7585848d6ec9e1163672141d00c3eb108efe80a241330307c9e0af34c3a022";
+       version = "0.3.0.0";
+       sha256 = "fc3fa9c8218f8c6c6fa3c56e1d378bf6ebd4bb51b3d9649f6f89249121d0f088";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library which you can depend upon";
@@ -91717,8 +92365,8 @@ self: {
     ({ mkDerivation, array, base, bytestring, containers, microlens }:
      mkDerivation {
        pname = "microlens-ghc";
-       version = "0.1.0.1";
-       sha256 = "a53c082be481560e349e644ad95944a6e5e2818a85529b549022c36e9b81739e";
+       version = "0.2.0.0";
+       sha256 = "d848f874c5af94c64ee8e6e0912fca305687acd5ec2b5353297943a3f5fcbf04";
        libraryHaskellDepends = [
          array base bytestring containers microlens
        ];
@@ -91733,8 +92381,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-mtl";
-       version = "0.1.3.1";
-       sha256 = "ecef24ec6aa0d4817977d41139fe44df2ec2f8fa33c212d0a36219166ca91e85";
+       version = "0.1.4.0";
+       sha256 = "99fb9facb90cece06a5b4d1e108b9b4a917bbf6832383d0d08eadc76684173b9";
        libraryHaskellDepends = [
          base microlens mtl transformers transformers-compat
        ];
@@ -91743,12 +92391,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-platform" = callPackage
+    ({ mkDerivation, base, hashable, microlens, microlens-ghc
+     , microlens-mtl, microlens-th, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-platform";
+       version = "0.1.0.0";
+       sha256 = "f9be21db09c032a4827868ad1888650bb1aae4a86e9d99d11cf375b0877170e1";
+       libraryHaskellDepends = [
+         base hashable microlens microlens-ghc microlens-mtl microlens-th
+         text unordered-containers vector
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "Feature-complete microlens";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "microlens-th" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
        pname = "microlens-th";
-       version = "0.2.1.0";
-       sha256 = "74f397a2aba294e965963deca940e660bce2bfa57291d2e8be06a28ff0ec90d0";
+       version = "0.2.1.1";
+       sha256 = "e38ef1cc80a44aadb9e6ffbea6647eceb84971b05a00f64bdd3fde4e2a4a7277";
        libraryHaskellDepends = [
          base containers microlens template-haskell
        ];
@@ -92361,6 +93026,7 @@ self: {
        sha256 = "3be63590a01f8504f372fe7565a318eef8d6de31e6e251bdac01965297793d1a";
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base binary directory hspec vector ];
+       jailbreak = true;
        homepage = "https://github.com/kryoxide/minst-idx/";
        description = "Read and write IDX data that is used in e.g. the MINST database.";
        license = stdenv.lib.licenses.gpl3;
@@ -92809,8 +93475,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.17";
-       sha256 = "64555b88f01d9c42a60cdf7e035fc9c1178345f38a9d0611955618dbdf56df1e";
+       version = "0.1.0.18";
+       sha256 = "2428e0b69aa2c8e91471299835ed4cbab9d03a3e252913f7636cbc904fb29ecd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -97944,15 +98610,14 @@ self: {
      }:
      mkDerivation {
        pname = "newsynth";
-       version = "0.3.0.1";
-       sha256 = "ba1fda2161320498da77b3789170df99485eea86902552408f95fece2dd1c5b0";
+       version = "0.3.0.2";
+       sha256 = "68d4cb379fc339baeeaf4a6cdc5dc1adec63fadecf9b587043b9e041d11bf172";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers fixedprec random superdoc
        ];
        executableHaskellDepends = [ base random superdoc time ];
-       jailbreak = true;
        homepage = "http://www.mathstat.dal.ca/~selinger/newsynth/";
        description = "Exact and approximate synthesis of quantum circuits";
        license = stdenv.lib.licenses.gpl3;
@@ -98500,6 +99165,7 @@ self: {
          ad base nonlinear-optimization primitive reflection vector
        ];
        executableHaskellDepends = [ base csv ];
+       jailbreak = true;
        homepage = "https://github.com/msakai/nonlinear-optimization-ad";
        description = "Wrapper of nonlinear-optimization package for using with AD package";
        license = stdenv.lib.licenses.gpl3;
@@ -99059,36 +99725,36 @@ self: {
   "nvim-hs" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
      , conduit-extra, containers, data-default, directory, dyre
-     , filepath, hslogger, hspec, hspec-discover, HUnit, lifted-base
-     , messagepack, monad-control, mtl, network, optparse-applicative
-     , parsec, process, QuickCheck, resourcet, stm, streaming-commons
-     , template-haskell, text, time, transformers, transformers-base
-     , utf8-string
+     , exceptions, filepath, foreign-store, hslogger, hspec
+     , hspec-discover, HUnit, lifted-base, messagepack, monad-control
+     , mtl, network, optparse-applicative, parsec, process, QuickCheck
+     , resourcet, setenv, stm, streaming-commons, template-haskell, text
+     , time, transformers, transformers-base, utf8-string
      }:
      mkDerivation {
        pname = "nvim-hs";
-       version = "0.0.2";
-       sha256 = "f7c3bca1ad2fc37bec61ef63050337d230b10f77de834c35b9c6be76320ea538";
+       version = "0.0.3";
+       sha256 = "e5768324a22d0e282f2e9e839fbe32b0943f120aa851499f1db9388612bddcb1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal cereal-conduit conduit conduit-extra
-         containers data-default directory dyre filepath hslogger
-         lifted-base messagepack monad-control mtl network
-         optparse-applicative parsec process resourcet stm streaming-commons
-         template-haskell text time transformers transformers-base
-         utf8-string
+         containers data-default directory dyre exceptions filepath
+         foreign-store hslogger lifted-base messagepack monad-control mtl
+         network optparse-applicative parsec process resourcet setenv stm
+         streaming-commons template-haskell text time transformers
+         transformers-base utf8-string
        ];
        executableHaskellDepends = [ base data-default ];
        testHaskellDepends = [
          base bytestring cereal cereal-conduit conduit conduit-extra
-         containers data-default directory dyre filepath hslogger hspec
-         hspec-discover HUnit lifted-base messagepack mtl network
-         optparse-applicative parsec process QuickCheck resourcet stm
-         streaming-commons template-haskell text time transformers
-         utf8-string
+         containers data-default directory dyre exceptions filepath
+         foreign-store hslogger hspec hspec-discover HUnit lifted-base
+         messagepack mtl network optparse-applicative parsec process
+         QuickCheck resourcet setenv stm streaming-commons template-haskell
+         text time transformers transformers-base utf8-string
        ];
-       homepage = "https://github.com/saep/nvim-hs";
+       homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99288,6 +99954,7 @@ self: {
        homepage = "https://github.com/stackbuilders/octohat";
        description = "A tested, minimal wrapper around GitHub's API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "octopus" = callPackage
@@ -100584,8 +101251,10 @@ self: {
          aeson base bytestring errors hspec lens QuickCheck smallcheck text
          wreq
        ];
+       jailbreak = true;
        description = "An API client for http://orchestrate.io/.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "orchid" = callPackage
@@ -101018,6 +101687,7 @@ self: {
          tasty-quickcheck unordered-containers vector
          vector-binary-instances
        ];
+       jailbreak = true;
        description = "Generation and traversal of highly compressed directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102358,6 +103028,7 @@ self: {
          aeson base bytestring HUnit test-framework test-framework-hunit
          text unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/fanjam/paypal-adaptive-hoops";
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
@@ -102613,6 +103284,7 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-core" = callPackage
@@ -102627,9 +103299,11 @@ self: {
          attoparsec base bytestring containers errors io-streams scientific
          transformers zlib-bindings
        ];
+       jailbreak = true;
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-document" = callPackage
@@ -102649,6 +103323,7 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-viewer" = callPackage
@@ -102670,6 +103345,7 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "Simple pdf viewer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf2line" = callPackage
@@ -104380,6 +105056,7 @@ self: {
        jailbreak = true;
        description = "Fast, streaming csv parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-errors" = callPackage
@@ -104389,7 +105066,6 @@ self: {
        version = "0.3";
        sha256 = "e6586706e39cf93326a073c93e049a2abdfe7942d425e572601a813d346477ed";
        libraryHaskellDepends = [ base errors pipes ];
-       jailbreak = true;
        homepage = "https://github.com/jdnavarro/pipes-errors";
        description = "Integration between pipes and errors";
        license = stdenv.lib.licenses.bsd3;
@@ -105055,6 +105731,7 @@ self: {
        libraryHaskellDepends = [
          base cairo colour fixed-vector gtk hmatrix plot text vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/sumitsahrawat/plot-gtk-ui";
        description = "A quick way to use Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
@@ -105185,6 +105862,7 @@ self: {
        executableHaskellDepends = [ base bytestring linear vector ];
        description = "PLY file loader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "png-file" = callPackage
@@ -107631,6 +108309,7 @@ self: {
          aeson attoparsec base bytestring filepath text unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/jaspervdj/profiteur";
        description = "Treemap visualiser for GHC prof files";
        license = stdenv.lib.licenses.bsd3;
@@ -108460,22 +109139,22 @@ self: {
      }) {};
 
   "pugs-DrIFT" = callPackage
-    ({ mkDerivation, base, bytestring, containers, HsSyck, mtl
-     , old-time, pretty, random, stm, utf8-string
+    ({ mkDerivation, base, bytestring, containers, hashable, hashtables
+     , HsSyck, mtl, old-time, pretty, random, stm, utf8-string
      }:
      mkDerivation {
        pname = "pugs-DrIFT";
-       version = "2.2.3.20130611";
-       sha256 = "86a121a652543818c1b4810f73c6ec1fbc021f79d6af51dc7b9421f89340b030";
+       version = "2.2.3.20150815";
+       sha256 = "10585b9889b5ab22736d7009b4565286f5e30edcc6c886f3ffd72fae96133e78";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers HsSyck mtl old-time pretty random stm
-         utf8-string
+         base bytestring containers hashable hashtables HsSyck mtl old-time
+         pretty random stm utf8-string
        ];
        executableHaskellDepends = [
-         base bytestring containers HsSyck mtl old-time pretty random stm
-         utf8-string
+         base bytestring containers hashable hashtables HsSyck mtl old-time
+         pretty random stm utf8-string
        ];
        homepage = "http://pugscode.org/";
        description = "DrIFT with pugs-specific rules";
@@ -108497,17 +109176,18 @@ self: {
 
   "pugs-compat" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
-     , mtl, network, process, random, regex-base, regex-pcre-builtin
-     , stm, stringtable-atom, syb, time, unix, utf8-string
+     , hashtables, mtl, network, process, random, regex-base
+     , regex-pcre-builtin, stm, stringtable-atom, syb, time, unix
+     , utf8-string
      }:
      mkDerivation {
        pname = "pugs-compat";
-       version = "0.0.6.20130611.0";
-       sha256 = "554b83c58edfb94962790b37183ecca4811501124c4970e2570f53663e79ef96";
+       version = "0.0.6.20150815";
+       sha256 = "7eff41b243368d7e3e1b72ebb82b6f19033ad95358f19a5c0b354f081621dc40";
        libraryHaskellDepends = [
-         array base bytestring containers directory mtl network process
-         random regex-base regex-pcre-builtin stm stringtable-atom syb time
-         unix utf8-string
+         array base bytestring containers directory hashtables mtl network
+         process random regex-base regex-pcre-builtin stm stringtable-atom
+         syb time unix utf8-string
        ];
        description = "Portable Haskell/POSIX layer for Pugs";
        license = stdenv.lib.licenses.publicDomain;
@@ -111563,6 +112243,7 @@ self: {
        homepage = "https://github.com/ryantrinkle/reflex";
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-dom" = callPackage
@@ -111587,6 +112268,7 @@ self: {
        jailbreak = true;
        description = "Functional Reactive Web Apps with Reflex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-dom-contrib" = callPackage
@@ -111623,6 +112305,7 @@ self: {
        homepage = "https://github.com/reflex-frp/reflex-gloss";
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reform" = callPackage
@@ -111767,8 +112450,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-deriv";
-       version = "0.0.4";
-       sha256 = "8ce8d463b2753178a5f8fd1c4e8ae480976a47647b2066676fdf0d7cbe02d22a";
+       version = "0.0.5";
+       sha256 = "29e89878834b019ea156f98b97e06aba60bb4fcfff7e977f866a1d1e5c558040";
        libraryHaskellDepends = [
          base bitset bytestring containers deepseq dequeue ghc-prim hashable
          hashtables mtl parallel parsec regex-base
@@ -112212,6 +112895,7 @@ self: {
        version = "0.1.1";
        sha256 = "d2def3d9276b75dbf685780af1af5e373b1bd2df937eb0bcba15f8c21fb16401";
        libraryHaskellDepends = [ ad base vector ];
+       jailbreak = true;
        homepage = "https://github.com/alpmestan/regress";
        description = "Linear and logistic regression through automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
@@ -112662,6 +113346,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
+       jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "High performance, regular, shape polymorphic parallel arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -112674,6 +113359,7 @@ self: {
        version = "3.4.0.1";
        sha256 = "1470245351cccf155ab587f577c2e7948214022bf0eb8ed966b13c5dc3e51261";
        libraryHaskellDepends = [ base repa vector ];
+       jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Algorithms using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
@@ -112723,6 +113409,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring double-conversion primitive repa-scalar vector
        ];
+       jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Packing and unpacking flat tables";
        license = stdenv.lib.licenses.bsd3;
@@ -112768,6 +113455,7 @@ self: {
          base QuickCheck random repa repa-algorithms repa-io
          template-haskell vector
        ];
+       jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Examples using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
@@ -112819,6 +113507,7 @@ self: {
        libraryHaskellDepends = [
          base binary bmp bytestring old-time repa vector
        ];
+       jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Read and write Repa arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
@@ -112865,6 +113554,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring double-conversion primitive vector
        ];
+       jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Scalar data types and conversions";
        license = stdenv.lib.licenses.bsd3;
@@ -112915,6 +113605,7 @@ self: {
        homepage = "http://repa.ouroborus.net";
        description = "Stream functions not present in the vector library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-v4l2" = callPackage
@@ -113584,6 +114275,7 @@ self: {
        ];
        executableHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base doctest ];
+       jailbreak = true;
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 2.0";
        license = stdenv.lib.licenses.asl20;
@@ -113941,6 +114633,7 @@ self: {
        homepage = "https://github.com/telser/riemann-hs";
        description = "A Riemann client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "riff" = callPackage
@@ -114961,6 +115654,7 @@ self: {
        librarySystemDepends = [ rubberband ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
@@ -114981,6 +115675,7 @@ self: {
        testHaskellDepends = [
          base bytestring cereal containers hspec mtl string-conv vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/filib/ruby-marshal";
        description = "Parse a subset of Ruby objects serialised with Marshal.dump.";
        license = stdenv.lib.licenses.mit;
@@ -115307,6 +116002,7 @@ self: {
          array base cereal containers lens lens-action quickcheck-instances
          tasty tasty-quickcheck template-haskell time vector
        ];
+       jailbreak = true;
        homepage = "http://acid-state.seize.it/safecopy";
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
@@ -116909,6 +117605,7 @@ self: {
        homepage = "https://github.com/adamwalker/sdr";
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seacat" = callPackage
@@ -117896,6 +118593,7 @@ self: {
        executableHaskellDepends = [
          base ede http-media servant-server warp
        ];
+       jailbreak = true;
        homepage = "http://github.com/alpmestan/servant-ede";
        description = "Combinators for rendering EDE templates in servant web applications";
        license = stdenv.lib.licenses.bsd3;
@@ -118048,8 +118746,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.4.4";
-       sha256 = "49291f8f7009477eaeea5ab6e76350eeb90c7992218ea1172a65cb703cbddd2f";
+       version = "0.4.4.1";
+       sha256 = "4889f732694a34232660660332cfd61b1e404f5adedd2b96a21a42dfdb51556a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118405,21 +119103,22 @@ self: {
 
   "sets" = callPackage
     ({ mkDerivation, base, commutative, containers, contravariant
-     , discrimination, hashable, QuickCheck, quickcheck-instances
-     , set-with, tasty, tasty-hunit, tasty-quickcheck
-     , unordered-containers
+     , discrimination, hashable, invariant, QuickCheck
+     , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
+     , unordered-containers, witherable
      }:
      mkDerivation {
        pname = "sets";
-       version = "0.0.3";
-       sha256 = "0d7c20774a94d7ccc1822bad17a0c4a0019d74dd418569d2be1222db93b3aab5";
+       version = "0.0.4.1";
+       sha256 = "322fbed083aa5e4618808627acdae25432691a98cb7ef84e3491affc46335978";
        libraryHaskellDepends = [
          base commutative containers contravariant discrimination hashable
-         set-with unordered-containers
+         invariant unordered-containers witherable
        ];
        testHaskellDepends = [
-         base QuickCheck quickcheck-instances tasty tasty-hunit
-         tasty-quickcheck
+         base commutative containers contravariant discrimination hashable
+         invariant QuickCheck quickcheck-instances tasty tasty-hunit
+         tasty-quickcheck unordered-containers witherable
        ];
        description = "Various set implementations in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -119237,8 +119936,8 @@ self: {
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "shortcut-links";
-       version = "0.4.0.0";
-       sha256 = "280f7fa996fb81c1baa072a53a23782a91c940623dca7d1e768927fe1f2c2ac5";
+       version = "0.4.1.0";
+       sha256 = "35fe3fa93c4f28999792ddf68369a5d327c09856a89a6731890dda6e811723d7";
        libraryHaskellDepends = [ base text ];
        homepage = "http://github.com/aelve/shortcut-links";
        description = "Link shortcuts for use in text markup";
@@ -120642,6 +121341,7 @@ self: {
          time time-locale-compat transformers websockets wreq
        ];
        testHaskellDepends = [ base ];
+       jailbreak = true;
        description = "Bindings to the Slack RTM API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -122161,6 +122861,7 @@ self: {
          SafeSemaphore snap snap-core sqlite-simple stm test-framework
          test-framework-hunit text time transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/nurpax/snaplet-sqlite-simple";
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -122920,8 +123621,8 @@ self: {
      }:
      mkDerivation {
        pname = "soxlib";
-       version = "0.0.2";
-       sha256 = "28577871d50fd0ebc8b9a6a4eb7926f292aaeaa7d22ea8fcab7ef40a23d602b5";
+       version = "0.0.2.1";
+       sha256 = "91e25a3919149abce1956e46d831c01c6875ad23cb9be79420792e52f9690a0a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123687,6 +124388,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "d311a5b8d1a9a23d02623142b5d5451290ac3689038412d7325ab0f30115dbeb";
        libraryHaskellDepends = [ base lens mtl vector ];
+       jailbreak = true;
        homepage = "https://github.com/relrod/spritz";
        description = "An implementation of the Spritz RC4-like stream cipher in Haskell";
        license = stdenv.lib.licenses.bsd2;
@@ -125694,11 +126396,11 @@ self: {
     ({ mkDerivation, base, ghc-prim, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "streaming";
-       version = "0.1.0.1";
-       sha256 = "ad40782a54720be7e19d09c9a757511e2d7489681d68c86b4cb9e2169a8bde0d";
+       version = "0.1.0.5";
+       sha256 = "2d85fe60c6b1b6bd62711bbb67067dfece11fd89b5c8af00451d19df2857631e";
        libraryHaskellDepends = [ base ghc-prim mmorph mtl transformers ];
        homepage = "https://github.com/michaelt/streaming";
-       description = "A general free monad transformer optimized for streaming applications";
+       description = "A free monad transformer optimized for streaming applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -126600,8 +127302,8 @@ self: {
     ({ mkDerivation, base, Cabal, containers, directory, filepath }:
      mkDerivation {
        pname = "superdoc";
-       version = "0.1.2.1";
-       sha256 = "8d279d15eaf5ceed09263c74e5a71f8242a715e032d16e5b49e4c3535d115eba";
+       version = "0.1.2.2";
+       sha256 = "ec9d79da2c20f55a426fcacac18563fe15762442a25bd460320ce01a2b6ce963";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126610,7 +127312,6 @@ self: {
        executableHaskellDepends = [
          base Cabal containers directory filepath
        ];
-       jailbreak = true;
        homepage = "http://www.mathstat.dal.ca/~selinger/superdoc/";
        description = "Additional documentation markup and Unicode support";
        license = stdenv.lib.licenses.bsd3;
@@ -129036,23 +129737,25 @@ self: {
      }) {};
 
   "tellbot" = callPackage
-    ({ mkDerivation, base, bifunctors, bytestring, containers, errors
+    ({ mkDerivation, base, bifunctors, bytestring, containers
      , http-conduit, mtl, network, regex-posix, split, tagsoup, text
      , time, transformers
      }:
      mkDerivation {
        pname = "tellbot";
-       version = "0.5.1.4";
-       sha256 = "a8bfd5f5d969123a704fd38898792ec53abf0eaea4f5a0b3c6bb0dddbdf7a756";
+       version = "0.6.0.1";
+       sha256 = "627176813859e4512dcc6edc057490e75db0e0b8ba0bbdf4290127be29bec1ab";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bifunctors bytestring containers errors http-conduit mtl
-         network regex-posix split tagsoup text time transformers
+         base bifunctors bytestring containers http-conduit mtl network
+         regex-posix split tagsoup text time transformers
        ];
        jailbreak = true;
+       homepage = "https://github.com/phaazon/tellbot";
        description = "IRC tellbot";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template" = callPackage
@@ -129464,8 +130167,10 @@ self: {
          attoparsec base bytestring containers directory errors filepath
        ];
        testHaskellDepends = [ base directory errors filepath QuickCheck ];
+       jailbreak = true;
        description = "A pure-Haskell (no FFI) module for accessing terminfo databases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "terrahs" = callPackage
@@ -130462,12 +131167,12 @@ self: {
      }) {};
 
   "text-zipper" = callPackage
-    ({ mkDerivation, base, text }:
+    ({ mkDerivation, base, text, vector }:
      mkDerivation {
        pname = "text-zipper";
-       version = "0.2.1";
-       sha256 = "59e0a9c8fd24c99e5a24b44acc50d79593f5919ecec8b67ed4012aa085fd93a8";
-       libraryHaskellDepends = [ base text ];
+       version = "0.3.1";
+       sha256 = "b407d9e898b1aa8550bbf7372623185f11b574e4497cf76cbc81ea4c849744b0";
+       libraryHaskellDepends = [ base text vector ];
        description = "A text editor zipper library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130975,7 +131680,6 @@ self: {
          base configurator directory either errors filepath
          optparse-applicative text transformers transformers-compat
        ];
-       jailbreak = true;
        homepage = "http://github.com/bennofs/themplate/";
        description = "Project templating tool";
        license = stdenv.lib.licenses.bsd3;
@@ -131027,6 +131731,7 @@ self: {
        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;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thespian" = callPackage
@@ -133144,6 +133849,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "trawl" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath, MissingH
+     , optparse-applicative, process, split
+     }:
+     mkDerivation {
+       pname = "trawl";
+       version = "0.1.0.0";
+       sha256 = "699d373ca97b04aedee973d466a8afbe81faa2e2e20e3e87d8261fe4f685a42e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal directory filepath MissingH optparse-applicative process
+         split
+       ];
+       homepage = "https://github.com/bmjames/trawl";
+       description = "A tool for finding haddocks";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "traypoweroff" = callPackage
     ({ mkDerivation, base, gtk, process }:
      mkDerivation {
@@ -134925,8 +135649,8 @@ self: {
 
   "tz" = callPackage
     ({ mkDerivation, base, binary, bindings-posix, bytestring
-     , containers, deepseq, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
+     , containers, deepseq, HUnit, QuickCheck, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
      , test-framework-th, time, tzdata, unix, vector
      }:
      mkDerivation {
@@ -134934,16 +135658,19 @@ self: {
        version = "0.0.0.10";
        sha256 = "1597ab0c2b6606492b65d2c39be5ae8dcf50734dee2cd4e0de5b691241544096";
        libraryHaskellDepends = [
-         base binary bytestring containers deepseq time tzdata vector
+         base binary bytestring containers deepseq template-haskell time
+         tzdata vector
        ];
        testHaskellDepends = [
          base bindings-posix HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
          time tzdata unix vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/nilcons/haskell-tz";
        description = "Efficient time zone handling";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tzdata" = callPackage
@@ -134960,6 +135687,7 @@ self: {
          base bytestring directory filemanip filepath HUnit MissingH
          test-framework test-framework-hunit test-framework-th unix
        ];
+       jailbreak = true;
        homepage = "https://github.com/nilcons/haskell-tzdata";
        description = "Time zone database (as files and as a module)";
        license = stdenv.lib.licenses.asl20;
@@ -135654,16 +136382,14 @@ self: {
      }:
      mkDerivation {
        pname = "uniform-io";
-       version = "0.1.1.0";
-       sha256 = "73c6cf4c15a884f531d60d4d470e5a1eaf0583c2b9d574724ac0296b856b3a45";
-       revision = "1";
-       editedCabalFile = "4f0651eff7cbdde40b49b5fcf90e8adf5c403a7c150ac318f0f5280b454b19f9";
+       version = "0.2.0.0";
+       sha256 = "f9f64502051b6537e175e06228d2b9e295953d17ca96941eb179363e748b7352";
        libraryHaskellDepends = [
          attoparsec base bytestring data-default-class iproute network
          transformers word8
        ];
        librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base Cabal ];
+       testHaskellDepends = [ attoparsec base bytestring Cabal ];
        homepage = "https://sealgram.com/git/haskell/uniform-io";
        description = "Uniform IO over files, network, watever";
        license = stdenv.lib.licenses.mit;
@@ -136738,6 +137464,7 @@ self: {
        libraryHaskellDepends = [
          base bindings-libusb bytestring containers ghc-prim text vector
        ];
+       jailbreak = true;
        homepage = "http://basvandijk.github.com/usb";
        description = "Communicate with USB devices";
        license = stdenv.lib.licenses.bsd3;
@@ -137878,26 +138605,6 @@ self: {
      }) {};
 
   "vector" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
-     , random, template-haskell, test-framework
-     , test-framework-quickcheck2, transformers
-     }:
-     mkDerivation {
-       pname = "vector";
-       version = "0.10.12.3";
-       sha256 = "0f765ce0238d89ffdb67656a364f7bf5012d68de9642da6bb2a425b61f88e89a";
-       libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
-       testHaskellDepends = [
-         base QuickCheck random template-haskell test-framework
-         test-framework-quickcheck2 transformers
-       ];
-       jailbreak = true;
-       homepage = "https://github.com/haskell/vector";
-       description = "Efficient Arrays";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector_0_11_0_0" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
      , random, template-haskell, test-framework
      , test-framework-quickcheck2, transformers
@@ -138390,6 +139097,7 @@ self: {
        homepage = "http://github.com/pjones/vimeta";
        description = "Frontend for video metadata tagging tools";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vimus" = callPackage
@@ -143483,6 +144191,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xmonad-wallpaper" = callPackage
+    ({ mkDerivation, base, magic, mtl, random, unix, xmonad }:
+     mkDerivation {
+       pname = "xmonad-wallpaper";
+       version = "0.0.1.1";
+       sha256 = "a720bd9f3ba17835373e4093b64b7d7f522d095281a853447943be16502fac4c";
+       libraryHaskellDepends = [ base magic mtl random unix xmonad ];
+       description = "xmonad wallpaper extension";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "xmonad-windownames" = callPackage
     ({ mkDerivation, base, containers, utf8-string, xmonad
      , xmonad-contrib
@@ -144658,6 +145377,7 @@ self: {
          http-types lifted-base network-uri random text transformers vector
          yesod-auth yesod-core yesod-form
        ];
+       jailbreak = true;
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
        description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -144877,8 +145597,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-crud-persist";
-       version = "0.1.1";
-       sha256 = "486c7a02dc1abdd3e1e3249270c4591a2d1e08266f76ccb514465b98d655379c";
+       version = "0.1.2";
+       sha256 = "c7fec7f4ddd89bf19ea1add21b6f807684f0d84868acda33ffbe67f6feae1c38";
        libraryHaskellDepends = [
          base lens persistent text transformers wai yesod-core yesod-form
          yesod-persistent
@@ -145230,6 +145950,7 @@ self: {
        homepage = "https://github.com/mgsloan/yesod-media-simple";
        description = "Simple display of media types, served by yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-newsfeed" = callPackage
@@ -145453,8 +146174,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-raml";
-       version = "0.1.0";
-       sha256 = "6eb0ba4cc813722bd33318c4a0f968f4b73bcd896e277a8432226fec75a794ed";
+       version = "0.1.3";
+       sha256 = "262e8dbbba8f7f6338916d1b6c505d7a6f38378d1a2913a8bfe16e8a1d3f11a2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145964,33 +146685,35 @@ self: {
   "yi" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , data-default, directory, dlist, dynamic-state, dyre, exceptions
-     , filepath, glib, gtk, hashable, HUnit, lens, mtl, old-locale
+     , filepath, glib, gtk, hashable, hint, HUnit, lens, mtl, old-locale
      , oo-prototypes, pango, parsec, pointedlist, process, QuickCheck
-     , regex-base, regex-tdfa, safe, semigroups, split, tasty
-     , tasty-hunit, tasty-quickcheck, template-haskell, text, time
+     , random, safe, semigroups, split, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, text-icu, time
      , transformers-base, unix, unix-compat, unordered-containers, vty
      , word-trie, xdg-basedir, yi-language, yi-rope
      }:
      mkDerivation {
        pname = "yi";
-       version = "0.12.0";
-       sha256 = "27fa38ede63c9d58233712f95500f5c1c5d7fc05f7ee2d39d1076638eb0ffd98";
+       version = "0.12.1";
+       sha256 = "3b8e59f48053c42f1f51e4971f326991f0a59b5ee65705be6a48da2cf5824705";
        configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base binary bytestring Cabal containers data-default
          directory dlist dynamic-state dyre exceptions filepath glib gtk
-         hashable lens mtl old-locale oo-prototypes pango parsec pointedlist
-         process regex-base regex-tdfa safe semigroups split
-         template-haskell text time transformers-base unix unix-compat
-         unordered-containers vty word-trie xdg-basedir yi-language yi-rope
+         hashable hint lens mtl old-locale oo-prototypes pango parsec
+         pointedlist process QuickCheck random safe semigroups split
+         template-haskell text text-icu time transformers-base unix
+         unix-compat unordered-containers vty word-trie xdg-basedir
+         yi-language yi-rope
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base directory filepath HUnit lens QuickCheck semigroups tasty
          tasty-hunit tasty-quickcheck text yi-language yi-rope
        ];
+       jailbreak = true;
        homepage = "https://yi-editor.github.io";
        description = "The Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;

From c8616b488baa9376fd7962f3d05e1694b1a942f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Aug 2015 20:30:31 +0200
Subject: [PATCH 1231/2016] haskell-set-with can't compile its test suite.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d97ed25781f..9ff0b22875d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -936,4 +936,7 @@ self: super: {
   # https://github.com/athanclark/commutative/issues/1
   commutative = dontCheck super.commutative;
 
+  # https://github.com/athanclark/set-with/issues/1
+  set-with = dontCheck super.set-with;
+
 }

From 7e2da20a97517e6ba379cbb74ced67109ae2053a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Aug 2015 21:51:25 +0200
Subject: [PATCH 1232/2016] haskell-sets can't compile its test suite.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9ff0b22875d..50c2e7ceea8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -939,4 +939,7 @@ self: super: {
   # https://github.com/athanclark/set-with/issues/1
   set-with = dontCheck super.set-with;
 
+  # https://github.com/athanclark/sets/issues/1
+  sets = dontCheck super.sets;
+
 }

From a3de6a15c1f787df23b5d7976421ef0cbc0c2bf1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 16 Aug 2015 18:24:31 +0200
Subject: [PATCH 1233/2016] haskell-lens-aeson: test suite was broken by vector
 update

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 50c2e7ceea8..cc2b2f37886 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -942,4 +942,7 @@ self: super: {
   # https://github.com/athanclark/sets/issues/1
   sets = dontCheck super.sets;
 
+  # https://github.com/lens/lens-aeson/issues/18
+  lens-aeson = dontCheck super.lens-aeson;
+
 }

From 053e52fbd5a4b038641df80a7f0b496949ef8c21 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Aug 2015 17:49:54 +0200
Subject: [PATCH 1234/2016] darcs: patch to cope with vector 0.11.x

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cc2b2f37886..3c0e03095ce 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -166,7 +166,7 @@ self: super: {
   # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
   darcs = (overrideCabal super.darcs (drv: {
     doCheck = false;            # The test suite won't even start.
-    patchPhase = "sed -i -e 's|attoparsec .*,|attoparsec,|' darcs.cabal";
+    patchPhase = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal";
   })).overrideScope (self: super: { zlib = self.zlib_0_5_4_2; });
 
   # https://github.com/massysett/rainbox/issues/1

From c845fcfbb38d50f84ba92f9f8d189aa31a8cd3e1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 15 Aug 2015 21:32:00 +0200
Subject: [PATCH 1235/2016] uhc: broken by recent uhc-util update

https://github.com/UU-ComputerScience/uhc/issues/60
---
 pkgs/development/compilers/uhc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index 1dbfb039f90..017dcfb3e12 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -50,5 +50,6 @@ in stdenv.mkDerivation rec {
     # On Darwin, the GNU libtool is used, which does not
     # support the -static flag and thus breaks the build.
     platforms = ["x86_64-linux"];
+    broken = true; # https://github.com/UU-ComputerScience/uhc/issues/60
   };
 }

From 0ccf8eae2fde05fe196c39f0c7b7b70af8752a28 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 14 Aug 2015 21:43:37 -0400
Subject: [PATCH 1236/2016] Disable some stuff that won't work with 7.6 anyway.

Closes https://github.com/peti/nixpkgs/pull/19.
---
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index dbdd0bc31b2..a7bad53c749 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -91,4 +91,9 @@ self: super: {
   # blaze-builder requires an additional build input on older compilers.
   blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder;
 
+  # available convertible package won't build with the available
+  # bytestring and ghc-mod won't build without convertible
+  convertible = markBroken super.convertible;
+  ghc-mod = markBroken super.ghc-mod;
+
 }

From 4d6452bab925f448852f277be66adee1b33ddce7 Mon Sep 17 00:00:00 2001
From: Mathnerd314 <mathnerd314.gph+hs@gmail.com>
Date: Mon, 17 Aug 2015 10:31:22 -0600
Subject: [PATCH 1237/2016] Move licenseAllowed check into the builder
 attribute (fixes #7541)

---
 pkgs/stdenv/generic/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index fe7bec54ba0..19443e3e6ea 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -131,8 +131,6 @@ let
         else true;
 
     in
-      assert licenseAllowed attrs;
-
       lib.addPassthru (derivation (
         (removeAttrs attrs
           ["meta" "passthru" "crossAttrs" "pos"
@@ -152,7 +150,7 @@ let
           computedPropagatedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs));
         in
         {
-          builder = attrs.realBuilder or shell;
+          builder = assert licenseAllowed attrs; attrs.realBuilder or shell;
           args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
           stdenv = result;
           system = result.system;

From 4a12ff77cc4374a9dfceb974615d1863025623b8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 17 Aug 2015 01:17:27 +0300
Subject: [PATCH 1238/2016] deadbeef-mpris2-plugin: init at 1.8

---
 .../audio/deadbeef/plugins/mpris2.nix         | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/audio/deadbeef/plugins/mpris2.nix

diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
new file mode 100644
index 00000000000..1504cce1d58
--- /dev/null
+++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, deadbeef, glib }:
+
+stdenv.mkDerivation rec {
+  version = "1.8";
+  name = "deadbeef-mpris2-plugin-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz";
+    sha256 = "1xg880zlxbqz7hs5g7xwc128l08j8c3isn45rdi138hi4fqbyjfi";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ deadbeef glib ];
+
+  meta = with stdenv.lib; {
+    description = "MPRISv2 plugin for the DeaDBeeF music player";
+    homepage = https://github.com/Serranya/deadbeef-mpris2-plugin/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19353eab4e9..b56f6a8c424 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11009,6 +11009,8 @@ let
     pulseSupport = config.pulseaudio or true;
   };
 
+  deadbeef-mpris2-plugin = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { };
+
   dfasma = callPackage ../applications/audio/dfasma { };
 
   dia = callPackage ../applications/graphics/dia {

From 1a22ad6b1805d5b90dbe632aae6d91692464db6b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 17 Aug 2015 01:17:53 +0300
Subject: [PATCH 1239/2016] deadbeef: add -with-plugins wrapper and a necessary
 patch

---
 pkgs/applications/audio/deadbeef/default.nix | 10 +++++++--
 pkgs/applications/audio/deadbeef/wrapper.nix | 22 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/audio/deadbeef/wrapper.nix

diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 9dd4db68432..410ddb4c6f1 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig
+{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch
 # deadbeef can use either gtk2 or gtk3
 , gtk2Support ? true, gtk2 ? null
 , gtk3Support ? false, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   name = "deadbeef-0.6.2";
 
   src = fetchurl {
-    url = "http://garr.dl.sourceforge.net/project/deadbeef/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/deadbeef/${name}.tar.bz2";
     sha256 = "06jfsqyakpvq0xhah7dlyvdzh5ym3hhb4yfczczw11ijd1kbjcrl";
   };
 
@@ -82,6 +82,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  patches = [ (fetchpatch {
+                url = "https://github.com/Alexey-Yakovenko/deadbeef/commit/e7725ea73fa1bd279a3651704870156bca8efea8.patch";
+                sha256 = "0a04l2607y3swcq9b1apffl1chdwj38jwfiizxcfmdbia4a0qlyg";
+              })
+            ];
+
   postInstall = if !gtk3Support then "" else ''
     wrapProgram "$out/bin/deadbeef" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
diff --git a/pkgs/applications/audio/deadbeef/wrapper.nix b/pkgs/applications/audio/deadbeef/wrapper.nix
new file mode 100644
index 00000000000..b612f195af3
--- /dev/null
+++ b/pkgs/applications/audio/deadbeef/wrapper.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildEnv, deadbeef, makeWrapper, plugins }:
+
+let
+drv = buildEnv {
+  name = "deadbeef-with-plugins-" + (builtins.parseDrvName deadbeef.name).version;
+
+  paths = [ deadbeef ] ++ plugins;
+
+  postBuild = ''
+    # TODO: This could be avoided if buildEnv could be forced to create all directories
+    if [ -L $out/bin ]; then
+      rm $out/bin
+      mkdir $out/bin
+      for i in ${deadbeef}/bin/*; do
+        ln -s $i $out/bin
+      done
+    fi
+    wrapProgram $out/bin/deadbeef \
+      --set DEADBEEF_PLUGIN_DIR "$out/lib/deadbeef"
+  '';
+  };
+in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b56f6a8c424..56b257669aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11011,6 +11011,10 @@ let
 
   deadbeef-mpris2-plugin = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { };
 
+  deadbeef-with-plugins = callPackage ../applications/audio/deadbeef/wrapper.nix {
+    plugins = [];
+  };
+
   dfasma = callPackage ../applications/audio/dfasma { };
 
   dia = callPackage ../applications/graphics/dia {

From 344e5221664a8c232c3b2b0c7667dcd4c229834f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 14 Aug 2015 14:06:15 +0300
Subject: [PATCH 1240/2016] python: add .env for convenient nix-shell's

---
 doc/language-support.xml                      | 21 ++++++++
 .../interpreters/python/wrapper.nix           | 54 +++++++++++--------
 2 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/doc/language-support.xml b/doc/language-support.xml
index 9117af864ad..a969111ed77 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -464,6 +464,27 @@ python.buildEnv.override {
     with wrapped binaries in <filename>bin/</filename>.
   </para>
 
+  <para>
+  You can also use <varname>env</varname> attribute to create local
+  environments with needed packages installed (somewhat comparable to
+  <literal>virtualenv</literal>). For example, with the following
+  <filename>shell.nix</filename>:
+
+<programlisting language="nix">
+<![CDATA[with import <nixpkgs> {};
+
+(python3.buildEnv.override {
+  extraLibs = with python3Packages;
+    [ numpy
+      requests
+    ];
+}).env]]>
+</programlisting>
+
+  Running <command>nix-shell</command> will drop you into a shell where
+  <command>python</command> will have specified packages in its path.
+  </para>
+
   <variablelist>
     <title>
       <function>python.buildEnv</function> arguments
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 163e8d7194b..f757147b047 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -6,28 +6,40 @@
 # Create a python executable that knows about additional packages.
 let
   recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; };
-in
-(buildEnv {
-  name = "${python.name}-env";
-  paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ];
+  env = (buildEnv {
+    name = "${python.name}-env";
+    paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ];
 
-  inherit ignoreCollisions;
+    inherit ignoreCollisions;
 
-  postBuild = ''
-    . "${makeWrapper}/nix-support/setup-hook"
+    postBuild = ''
+      . "${makeWrapper}/nix-support/setup-hook"
 
-    if [ -L "$out/bin" ]; then
-        unlink "$out/bin"
-    fi
-    mkdir -p "$out/bin"
+      if [ -L "$out/bin" ]; then
+          unlink "$out/bin"
+      fi
+      mkdir -p "$out/bin"
 
-    cd "${python}/bin"
-    for prg in *; do
-      rm -f "$out/bin/$prg"
-      makeWrapper "${python}/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out"
-    done
-  '' + postBuild;
-}) // {
-  inherit python;
-  inherit (python) meta;
-}
+      cd "${python}/bin"
+      for prg in *; do
+        rm -f "$out/bin/$prg"
+        makeWrapper "${python}/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out"
+      done
+    '' + postBuild;
+
+    passthru.env = stdenv.mkDerivation {
+      name = "interactive-${python.name}-environment";
+      nativeBuildInputs = [ env ];
+
+      buildCommand = ''
+        echo >&2 ""
+        echo >&2 "*** Python 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
+        echo >&2 ""
+        exit 1
+      '';
+    };
+  }) // {
+    inherit python;
+    inherit (python) meta;
+  };
+in env

From 89a2f870114de589262a6842bf9c3687a18cfdb2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 13 Aug 2015 14:50:59 +0300
Subject: [PATCH 1241/2016] elm: add the platform and helpful scripts

---
 doc/package-notes.xml                         | 20 +++++
 .../doc/manual/release-notes/rl-unstable.xml  |  3 +
 pkgs/development/compilers/elm/default.nix    | 81 +++++++++++++++++++
 pkgs/development/compilers/elm/elm2nix.rb     | 26 ++++++
 .../compilers/elm/packages/elm-compiler.nix   | 37 +++++++++
 .../compilers/elm/packages/elm-make.nix       | 25 ++++++
 .../compilers/elm/packages/elm-package.nix    | 27 +++++++
 .../elm/packages/elm-reactor-elm.nix          | 18 +++++
 .../compilers/elm/packages/elm-reactor.nix    | 27 +++++++
 .../compilers/elm/packages/elm-repl.nix       | 30 +++++++
 .../compilers/elm/packages/release.nix        | 11 +++
 pkgs/development/compilers/elm/update-elm.rb  | 25 ++++++
 pkgs/top-level/all-packages.nix               |  2 +
 13 files changed, 332 insertions(+)
 create mode 100644 pkgs/development/compilers/elm/default.nix
 create mode 100755 pkgs/development/compilers/elm/elm2nix.rb
 create mode 100644 pkgs/development/compilers/elm/packages/elm-compiler.nix
 create mode 100644 pkgs/development/compilers/elm/packages/elm-make.nix
 create mode 100644 pkgs/development/compilers/elm/packages/elm-package.nix
 create mode 100644 pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
 create mode 100644 pkgs/development/compilers/elm/packages/elm-reactor.nix
 create mode 100644 pkgs/development/compilers/elm/packages/elm-repl.nix
 create mode 100644 pkgs/development/compilers/elm/packages/release.nix
 create mode 100755 pkgs/development/compilers/elm/update-elm.rb

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 266a8092216..9d8217d60bc 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -346,4 +346,24 @@ packageOverrides = pkgs: {
 
 </section>
 
+<section xml:id="sec-elm">
+
+<title>Elm</title>
+
+<para>
+The Nix expressions for Elm reside in
+<filename>pkgs/development/compilers/elm</filename>. They are generated
+automatically by <command>update-elm.rb</command> script. One should
+specify versions of Elm packages inside the script, clear the
+<filename>packages</filename> directory and run the script from inside it.
+<literal>elm-reactor</literal> is special because it also has Elm package
+dependencies. The process is not automated very much for now -- you should
+get the <literal>elm-reactor</literal> source tree (e.g. with
+<command>nix-shell</command>) and run <command>elm2nix.rb</command> inside
+it. Place the resulting <filename>package.nix</filename> file into
+<filename>packages/elm-reactor-elm.nix</filename>.
+</para>
+
+</section>
+
 </chapter>
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 30da98faa33..8fbac05e968 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -80,6 +80,9 @@ was accordingly renamed to <literal>bomi</literal>
 was accordingly renamed to <literal>electron</literal>
 </para></listitem>
 
+<listitem><para>Elm is not released on Hackage anymore. You should now use <literal>elmPackages.elm</literal>
+which contains the latest Elm platform.</para></listitem>
+
 <listitem>
   <para>
 	The CUPS printing service has been updated to version <literal>2.0.2</literal>.
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
new file mode 100644
index 00000000000..4a056e61de9
--- /dev/null
+++ b/pkgs/development/compilers/elm/default.nix
@@ -0,0 +1,81 @@
+{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, fetchpatch, makeWrapper }:
+
+let
+  makeElmStuff = deps:
+    let json = builtins.toJSON (lib.mapAttrs (name: info: info.version) deps);
+        cmds = lib.mapAttrsToList (name: info: let
+                 pkg = stdenv.mkDerivation {
+
+                   name = lib.replaceChars ["/"] ["-"] name + "-${info.version}";
+
+                   src = fetchurl {
+                     url = "https://github.com/${name}/archive/${info.version}.tar.gz";
+                     meta.homepage = "https://github.com/${name}/";
+                     inherit (info) sha256;
+                   };
+
+                   phases = [ "unpackPhase" "installPhase" ];
+
+                   installPhase = ''
+                     mkdir -p $out
+                     cp -r * $out
+                   '';
+
+                 };
+               in ''
+                 mkdir -p elm-stuff/packages/${name}
+                 ln -s ${pkg} elm-stuff/packages/${name}/${info.version}
+               '') deps;
+    in ''
+      export HOME=/tmp
+      mkdir elm-stuff
+      cat > elm-stuff/exact-dependencies.json <<EOF
+      ${json}
+      EOF
+    '' + lib.concatStrings cmds;
+
+  hsPkgs = haskell.packages.ghc7102.override {
+    overrides = self: super:
+      let hlib = haskell.lib;
+          elmRelease = import ./packages/release.nix { inherit (self) callPackage; };
+          elmPkgs' = elmRelease.packages;
+          elmPkgs = elmPkgs' // {
+
+            elm-reactor = hlib.overrideCabal elmPkgs'.elm-reactor (drv: {
+              buildTools = drv.buildTools or [] ++ [ self.elm-make ];
+              patches = [ (fetchpatch {
+                url = "https://github.com/elm-lang/elm-reactor/commit/ca4d91d3fc7c6f72aa802d79fd1563ab5f3c4f2c.patch";
+                sha256 = "1msq7rvjid27m11lwcz9r1vyczlk7bfknyywqln300c8bgqyl45j";
+              }) ];
+              preConfigure = makeElmStuff (import ./packages/elm-reactor-elm.nix);
+            });
+
+            elm-package = hlib.appendPatch elmPkgs'.elm-package (fetchpatch {
+              url = "https://github.com/elm-lang/elm-package/commit/af517f2ffe15f8ec1d8c38f01ce188bbdefea47a.patch";
+              sha256 = "0yq5vawmp9qq5w6qfy12r32ahpvccra749pnhg0zdykrj369m8a8";
+            });
+
+            elm-repl = hlib.overrideCabal elmPkgs'.elm-repl (drv: {
+              doCheck = false;
+              buildTools = drv.buildTools or [] ++ [ makeWrapper ];
+              postInstall =
+                let bins = lib.makeSearchPath "bin" [ nodejs self.elm-make ];
+                in ''
+                  wrapProgram $out/bin/elm-repl \
+                    --prefix PATH ':' ${bins}
+                '';
+            });
+
+          };
+      in elmPkgs // {
+        inherit elmPkgs;
+        elmVersion = elmRelease.version;
+      };
+  };
+in hsPkgs.elmPkgs // {
+  elm = buildEnv {
+    name = "elm-${hsPkgs.elmVersion}";
+    paths = lib.mapAttrsToList (name: pkg: pkg) hsPkgs.elmPkgs;
+    pathsToLink = [ "/bin" ];
+  };
+}
diff --git a/pkgs/development/compilers/elm/elm2nix.rb b/pkgs/development/compilers/elm/elm2nix.rb
new file mode 100755
index 00000000000..fab5551ca15
--- /dev/null
+++ b/pkgs/development/compilers/elm/elm2nix.rb
@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require 'json'
+
+system("elm-package install -y")
+depsSrc = JSON.parse(File.read("elm-stuff/exact-dependencies.json"))
+deps = Hash[ depsSrc.map { |pkg, ver|
+  url = "https://github.com/#{pkg}/archive/#{ver}.tar.gz"
+  sha256 = `nix-prefetch-url #{url}`
+
+  [ pkg, { version: ver,
+           sha256: sha256.strip
+         }
+  ]
+} ]
+
+File.open("package.nix", 'w') do |file|
+  file.puts "{"
+    for pkg, info in deps
+      file.puts "  \"#{pkg}\" = {"
+      file.puts "    version = \"#{info[:version]}\";"
+      file.puts "    sha256 = \"#{info[:sha256]}\";"
+      file.puts "  };"
+    end
+  file.puts "}"
+end
diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix
new file mode 100644
index 00000000000..a5829b19d39
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix
@@ -0,0 +1,37 @@
+{ mkDerivation, aeson, aeson-pretty, ansi-terminal, base, binary
+, blaze-html, blaze-markup, bytestring, cmdargs, containers
+, directory, edit-distance, fetchgit, filemanip, filepath, HUnit
+, indents, language-ecmascript, language-glsl, mtl, parsec, pretty
+, process, QuickCheck, stdenv, test-framework, test-framework-hunit
+, test-framework-quickcheck2, text, transformers, union-find
+, unordered-containers
+}:
+mkDerivation {
+  pname = "elm-compiler";
+  version = "0.15.1";
+  src = fetchgit {
+    url = "https://github.com/elm-lang/elm-compiler";
+    sha256 = "379a38db4f240ab206a2bbedc49d4768d7cf6fdf497b2d25dea71fca1d58efaa";
+    rev = "7fbdee067b494c0298d07c944629aaa5d3fa82f5";
+  };
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson aeson-pretty ansi-terminal base binary blaze-html
+    blaze-markup bytestring cmdargs containers directory edit-distance
+    filepath indents language-ecmascript language-glsl mtl parsec
+    pretty process text transformers union-find unordered-containers
+  ];
+  testDepends = [
+    aeson aeson-pretty ansi-terminal base binary blaze-html
+    blaze-markup bytestring cmdargs containers directory edit-distance
+    filemanip filepath HUnit indents language-ecmascript language-glsl
+    mtl parsec pretty process QuickCheck test-framework
+    test-framework-hunit test-framework-quickcheck2 text transformers
+    union-find
+  ];
+  jailbreak = true;
+  homepage = "http://elm-lang.org";
+  description = "Values to help with elm-package, elm-make, and elm-lang.org.";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/development/compilers/elm/packages/elm-make.nix b/pkgs/development/compilers/elm/packages/elm-make.nix
new file mode 100644
index 00000000000..22fb78f75ee
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elm-make.nix
@@ -0,0 +1,25 @@
+{ mkDerivation, aeson, ansi-wl-pprint, base, binary, blaze-html
+, blaze-markup, bytestring, containers, directory, elm-compiler
+, elm-package, fetchgit, filepath, mtl, optparse-applicative
+, stdenv, text
+}:
+mkDerivation {
+  pname = "elm-make";
+  version = "0.2";
+  src = fetchgit {
+    url = "https://github.com/elm-lang/elm-make";
+    sha256 = "b618e827ca01ddeae38624f4bf5baa3dc4cb6e9e3c9bf15f2dda5a7c756bca33";
+    rev = "d9bedfdadc9cefce8e5249db6a316a5e712158d0";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    aeson ansi-wl-pprint base binary blaze-html blaze-markup bytestring
+    containers directory elm-compiler elm-package filepath mtl
+    optparse-applicative text
+  ];
+  jailbreak = true;
+  homepage = "http://elm-lang.org";
+  description = "A build tool for Elm projects";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix
new file mode 100644
index 00000000000..69974857c83
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elm-package.nix
@@ -0,0 +1,27 @@
+{ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, base, binary
+, bytestring, containers, directory, elm-compiler, fetchgit
+, filepath, HTTP, http-client, http-client-tls, http-types, mtl
+, network, optparse-applicative, pretty, process, stdenv, text
+, time, unordered-containers, vector, zip-archive
+}:
+mkDerivation {
+  pname = "elm-package";
+  version = "0.5.1";
+  src = fetchgit {
+    url = "https://github.com/elm-lang/elm-package";
+    sha256 = "0d69e68831f4a86c6c02aed33fc3a6aca87636a7fb0bb6e39ffc74ddd15b5435";
+    rev = "365e2d86a8222c92e50951c7d30b3c5db44c383d";
+  };
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson aeson-pretty ansi-wl-pprint base binary bytestring containers
+    directory elm-compiler filepath HTTP http-client http-client-tls
+    http-types mtl network optparse-applicative pretty process text
+    time unordered-containers vector zip-archive
+  ];
+  jailbreak = true;
+  homepage = "http://github.com/elm-lang/elm-package";
+  description = "Package manager for Elm libraries";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
new file mode 100644
index 00000000000..d2102b521c8
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
@@ -0,0 +1,18 @@
+{
+  "evancz/virtual-dom" = {
+    version = "1.2.3";
+    sha256 = "03iv9fpng3gvia00v3gl8rs83j5b112hx0vm36az13zjr378b1jr";
+  };
+  "evancz/elm-markdown" = {
+    version = "1.1.5";
+    sha256 = "01vdaz56i064lah7kd8485j0y33di8wa134sr4292wb3na990a8r";
+  };
+  "evancz/elm-html" = {
+    version = "3.0.0";
+    sha256 = "0a2iw45x3qwxkgibkc6qx1csfa06gpkfc9b04vkq1h7ynw2g5577";
+  };
+  "elm-lang/core" = {
+    version = "2.1.0";
+    sha256 = "10fg7bcc310b5bwv6sq7gjhy9r5xzc98nbk4zhs4jqykn36i6l43";
+  };
+}
diff --git a/pkgs/development/compilers/elm/packages/elm-reactor.nix b/pkgs/development/compilers/elm/packages/elm-reactor.nix
new file mode 100644
index 00000000000..8c7419c3b3f
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elm-reactor.nix
@@ -0,0 +1,27 @@
+{ mkDerivation, base, blaze-html, blaze-markup, bytestring, cmdargs
+, containers, directory, elm-compiler, fetchgit, filepath, fsnotify
+, HTTP, mtl, process, snap-core, snap-server, stdenv
+, system-filepath, text, time, transformers, unordered-containers
+, websockets, websockets-snap
+}:
+mkDerivation {
+  pname = "elm-reactor";
+  version = "0.3.2";
+  src = fetchgit {
+    url = "https://github.com/elm-lang/elm-reactor";
+    sha256 = "a7775971ea6634f13436f10098c462d39c6e115dbda79e537831a71975451e9a";
+    rev = "b6c11be539734e72015ce151a9189d06dfc9db76";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    base blaze-html blaze-markup bytestring cmdargs containers
+    directory elm-compiler filepath fsnotify HTTP mtl process snap-core
+    snap-server system-filepath text time transformers
+    unordered-containers websockets websockets-snap
+  ];
+  jailbreak = true;
+  homepage = "http://elm-lang.org";
+  description = "Interactive development tool for Elm programs";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix
new file mode 100644
index 00000000000..96171bb6efe
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elm-repl.nix
@@ -0,0 +1,30 @@
+{ mkDerivation, base, binary, bytestring, bytestring-trie, cmdargs
+, containers, directory, elm-compiler, elm-package, fetchgit
+, filepath, haskeline, HUnit, mtl, parsec, process, QuickCheck
+, stdenv, test-framework, test-framework-hunit
+, test-framework-quickcheck2
+}:
+mkDerivation {
+  pname = "elm-repl";
+  version = "0.4.2";
+  src = fetchgit {
+    url = "https://github.com/elm-lang/elm-repl";
+    sha256 = "a6eadbef7886c4c65243723f101910909bb0d53b2c48454ed7b39cf700f9649c";
+    rev = "0c434fdb24b86a93b06c33c8f26857ce47caf165";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    base binary bytestring bytestring-trie cmdargs containers directory
+    elm-compiler elm-package filepath haskeline mtl parsec process
+  ];
+  testDepends = [
+    base bytestring bytestring-trie cmdargs directory elm-compiler
+    elm-package filepath haskeline HUnit mtl parsec process QuickCheck
+    test-framework test-framework-hunit test-framework-quickcheck2
+  ];
+  jailbreak = true;
+  homepage = "https://github.com/elm-lang/elm-repl";
+  description = "a REPL for Elm";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/development/compilers/elm/packages/release.nix b/pkgs/development/compilers/elm/packages/release.nix
new file mode 100644
index 00000000000..3c9d9c9ce7c
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/release.nix
@@ -0,0 +1,11 @@
+{ callPackage }:
+{
+  version = "0.15.1";
+  packages = {
+    elm-compiler = callPackage ./elm-compiler.nix { };
+    elm-package = callPackage ./elm-package.nix { };
+    elm-make = callPackage ./elm-make.nix { };
+    elm-reactor = callPackage ./elm-reactor.nix { };
+    elm-repl = callPackage ./elm-repl.nix { };
+  };
+}
diff --git a/pkgs/development/compilers/elm/update-elm.rb b/pkgs/development/compilers/elm/update-elm.rb
new file mode 100755
index 00000000000..f6ead5d0d1f
--- /dev/null
+++ b/pkgs/development/compilers/elm/update-elm.rb
@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+# Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs
+$elm_version = "0.15.1"
+$elm_packages = { "elm-compiler" => "0.15.1",
+                  "elm-package" => "0.5.1",
+                  "elm-make" => "0.2",
+                  "elm-reactor" => "0.3.2",
+                  "elm-repl" => "0.4.2"
+                }
+
+for pkg, ver in $elm_packages
+  system "cabal2nix https://github.com/elm-lang/#{pkg} --revision refs/tags/#{ver} --jailbreak > #{pkg}.nix"
+end
+
+File.open("release.nix", 'w') do |file|
+  file.puts "{"
+  file.puts "  version = \"#{$elm_version}\";"
+  file.puts "  packages = {"
+  for pkg, ver in $elm_packages
+    file.puts "    #{pkg} = callPackage ./#{pkg}.nix { };"
+  end
+  file.puts "  };"
+  file.puts "}"
+end
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56b257669aa..ecb009152e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3729,6 +3729,8 @@ let
 
   eql = callPackage ../development/compilers/eql {};
 
+  elmPackages = callPackage ../development/compilers/elm { };
+
   adobe_flex_sdk = callPackage ../development/compilers/adobe-flex-sdk { };
 
   fpc = callPackage ../development/compilers/fpc { };

From 43cba717d2309e37dbfc1da482f6d7f587e63d57 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 17 Aug 2015 20:59:18 +0300
Subject: [PATCH 1242/2016] haskell: partially revert marking Elm packages as
 broken

See https://github.com/NixOS/nixpkgs/pull/9233#issuecomment-131596192
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3c0e03095ce..6423b0726d4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -910,12 +910,9 @@ self: super: {
 
   # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233.
   Elm = markBroken super.Elm;
-  elm-bridge = markBroken super.elm-bridge;
   elm-build-lib = markBroken super.elm-build-lib;
   elm-compiler = markBroken super.elm-compiler;
-  elm-core-sources = markBroken super.elm-core-sources;
   elm-get = markBroken super.elm-get;
-  elm-init = markBroken super.elm-init;
   elm-make = markBroken super.elm-make;
   elm-package = markBroken super.elm-package;
   elm-reactor = markBroken super.elm-reactor;

From 810a033d1b3cf2ed52cac5490e8ca6e51b96ee6d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 17 Aug 2015 13:14:51 -0700
Subject: [PATCH 1243/2016] picocom: 1.7 -> 1.8

---
 pkgs/tools/misc/picocom/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix
index 303fdb3dbe0..3ebb0397a8f 100644
--- a/pkgs/tools/misc/picocom/default.nix
+++ b/pkgs/tools/misc/picocom/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl, makeWrapper, lrzsz }:
+{ stdenv, fetchFromGitHub, makeWrapper, lrzsz }:
 
 stdenv.mkDerivation rec {
-  name = "picocom-1.7";
+  name = "picocom-${version}";
+  version = "1.8";
 
-  src = fetchurl {
-    url = "http://picocom.googlecode.com/files/${name}.tar.gz";
-    sha256 = "17hjq713naq02xar711aw24qqd52p591mj1h5n97cni1ga7irwyh";
+  src = fetchFromGitHub {
+    owner = "npat-efault";
+    repo = "picocom";
+    rev = version;
+    sha256 = "1954hnmnnr9yj5skynj2x5wjap8vlr4ski2rhwr36p5pzwmr9gni";
   };
 
   buildInputs = [ makeWrapper ];

From 481d2acea80f31edbe35a2ba57d6ac20369ad5c7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 15 Aug 2015 14:25:55 +0200
Subject: [PATCH 1244/2016] git-hub: remove files not needed on Nix

---
 .../version-management/git-and-tools/git-hub/default.nix     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index d9cf0b3d84d..e47d2569b10 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -36,4 +36,9 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   installFlags = "prefix=$(out)";
+
+  postInstall = ''
+    # Remove inert ftdetect vim plugin and a README that's a man page subset:
+    rm -r $out/share/{doc,vim}
+  '';
 }

From adca30f24b666638d3d85d4389e9e3eb5ab13eb7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 17 Aug 2015 16:56:20 +0200
Subject: [PATCH 1245/2016] geolite-legacy: update 2015-08-11 -> 2015-08-17

---
 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 6dccfa69638..9cc52fa1fe1 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-08-11";
+  version = "2015-08-17";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
     "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "1h4wpqs16a1w16znbr2h15b16p5y43vp6qhj0bc7krq5qa484y2k";
+    "0g9i1dyvh2389q8mp6wg2xg3lm9wmh5md1cvy698pzi1y6j9wka3";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "09qiy2grxnakapvz5xjw3ivbxc0id6srqyd46p68mcy7gwrggcv7";
+    "0hfiiqffw8z10lzk1l2iaqlbgi39xk3j3mrlrzxvrsj4s08zdrks";
 
   meta = with stdenv.lib; {
     inherit version;

From 2ae4c0aa697e860c0af7b1e4d95e1f964d21bb82 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 17 Aug 2015 17:13:14 +0200
Subject: [PATCH 1246/2016] python-packages: click 4.1 -> 5.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1017bed54b9..65cce8adc20 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1949,11 +1949,11 @@ let
   };
 
   click = buildPythonPackage rec {
-    name = "click-4.1";
+    name = "click-5.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
-      sha256 = "1n4fvxpgbna83g6daarscljwpbarr45qfalh9hqla8ayy84ysfg3";
+      sha256 = "1n3yz0ilv3k9lahajgjpc68dr0gp96v4zwf8rd1spy4bh8hnrga6";
     };
 
     meta = {

From 7a854e3ed5f6a568d9c23467ea6699a559fe64cb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 17 Aug 2015 21:54:26 +0200
Subject: [PATCH 1247/2016] sound-theme-freedesktop: init at 0.8

---
 .../misc/sound-theme-freedesktop/default.nix  | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/data/misc/sound-theme-freedesktop/default.nix

diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix
new file mode 100644
index 00000000000..a43a94a0d7c
--- /dev/null
+++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, intltool }:
+
+let version = "0.8"; in
+stdenv.mkDerivation rec {
+  name = "sound-theme-freedesktop-${version}";
+
+  src = fetchurl {
+    sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb";
+    url = "https://people.freedesktop.org/~mccann/dist/${name}.tar.bz2";
+  };
+
+  nativeBuildInputs = [ intltool ];
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Freedesktop reference sound theme";
+    homepage = http://freedesktop.org/wiki/Specifications/sound-theme-spec;
+    # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS:
+    license = with licenses; [ cc-by-30 cc-by-sa-25 gpl2 gpl2Plus ];
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7332db8b85e..0fbd79ff2cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10601,6 +10601,8 @@ let
 
   hasklig = callPackage ../data/fonts/hasklig {};
 
+  sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { };
+
   source-code-pro = callPackage ../data/fonts/source-code-pro {};
 
   source-sans-pro = callPackage ../data/fonts/source-sans-pro { };

From 55e5bd4e9be0fb79771c81bd26c8af3b9088fb65 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 16 Aug 2015 16:44:57 -0500
Subject: [PATCH 1248/2016] nixpkgs: arcanist 20150707 -> 20150817

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

diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index a6a457c2b58..67c32c0a806 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -3,18 +3,18 @@
 let
   libphutil = fetchgit {
     url    = "git://github.com/phacility/libphutil.git";
-    rev    = "3753a09dfc7e7ee2626946735e420e5b50480f89";
-    sha256 = "86c2613fed23edff58452ceb9fa98ceb559c7e41abdb6752f87ebcf0f50a1a66";
+    rev    = "e509fc30ae782af97f3535b1febbf50d0f919d5a";
+    sha256 = "087dc5aadf1f78ebc7cf2b9107422f211b98ac96493fab8cf6bd9924ba77d986";
   };
   arcanist = fetchgit {
     url    = "git://github.com/phacility/arcanist.git";
-    rev    = "4d6d3feb7fc1fb63789554dddee8e489999c1201";
-    sha256 = "e3a9314544c4430ac6e67ba2ae180a96b009b3ab848ba8712fc2b308cf880372";
+    rev    = "fe8ed2a6f8b09b8c56e476ed1f9624d35732b776";
+    sha256 = "602fe03671c424d55af63e6288e906b350183bb42d558498ded005ae7e83fc85";
   };
 in
 stdenv.mkDerivation rec {
   name    = "arcanist-${version}";
-  version = "20150707";
+  version = "20150817";
 
   src = [ arcanist libphutil ];
   buildInputs = [ php makeWrapper flex ];

From 5d964375e5d53944c7581df5826be586dd1c5efc Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 17 Aug 2015 17:06:45 -0500
Subject: [PATCH 1249/2016] nixpkgs: afl 1.83b -> 1.86b

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 ff9798b3f75..75ad9382b9f 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.83b";
+  version = "1.86b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "1zkf9vdhmm1h0flxl1ybmw41amgh9cyh4hyb18jp972lgd9q642v";
+    sha256 = "1by9ncf6lgcyibzqwyla34jv64sd66mn8zhgjz2pcgsds51qwn0r";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup

From 54916ba6574c68106192330711723613922562bf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 18 Aug 2015 01:08:44 +0200
Subject: [PATCH 1250/2016] htop: 1.0.3 -> (git) 2015-08-12

Temporarily update to git HEAD for the "display program basename"
functionality it provides.
---
 pkgs/os-specific/linux/htop/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix
index d35b5340e9d..8e7df5bb8a5 100644
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/os-specific/linux/htop/default.nix
@@ -1,14 +1,17 @@
-{ fetchurl, stdenv, ncurses }:
+{ fetchFromGitHub, stdenv, autoreconfHook, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "htop-1.0.3";
+  name = "htop-2015-08-12";
 
-  src = fetchurl {
-    url = "http://hisham.hm/htop/releases/1.0.3/htop-1.0.3.tar.gz";
-    sha256 = "0a8qbpsifzjwc4f45xfwm48jhm59g6q5hlib4bf7z13mgy95fp05";
+  src = fetchFromGitHub {
+    sha256 = "017aihyg0bjli1hlvcqgqxpwzy2ayvwv6byhqd97n9sqfkmi9i0p";
+    rev = "f2c053a88497f3ad5ae786c16ecf1275212c13be";
+    repo = "htop";
+    owner = "hishamhm";
   };
 
   buildInputs = [ ncurses ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   meta = {
     description = "An interactive process viewer for Linux";

From 15ef1f3a7ef86a50a73de3dee9e16ef5598b32bf Mon Sep 17 00:00:00 2001
From: ro6 <ro6@users.noreply.github.com>
Date: Mon, 17 Aug 2015 21:00:49 -0300
Subject: [PATCH 1251/2016] urweb: 20150214 -> 20150520

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

diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 6d5b49da066..bc1f9a9043d 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20150214";
+  version = "20150520";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "f7b7587fe72c04f14581ded11588777f7bb61e392634966cc0354e13d69f236d";
+    sha256 = "06pl6z4sh5fvh72drz4bp70yynr4i1rawc97ww5wag8976dirwrm";
   };
 
   buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ];

From 2afc00061ba1241e07b5cdc82e30c7614a61c014 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 17 Aug 2015 17:56:14 -0700
Subject: [PATCH 1252/2016] zandronum 2.1 -> 2.1.2

---
 pkgs/games/zandronum/bin.nix     | 6 +++---
 pkgs/games/zandronum/default.nix | 6 +++---
 pkgs/games/zandronum/server.nix  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix
index f7fa9fc643e..453f7dc1c1d 100644
--- a/pkgs/games/zandronum/bin.nix
+++ b/pkgs/games/zandronum/bin.nix
@@ -21,10 +21,10 @@
 assert stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation rec {
-  name = "zandronum-2.1";
+  name = "zandronum-2.1.2";
   src = fetchurl {
-    url = "http://zandronum.com/downloads/zandronum2.1-linux-x86_64.tar.bz2";
-    sha256 = "0fhk2gd0lqmc6brbli17ks5ywnlzkjyas1kfdqsf3d96w0z5rz11";
+    url = "http://zandronum.com/downloads/zandronum2.1.2-linux-x86_64.tar.bz2";
+    sha256 = "1f5aw2m8c0bl3lrvi2k3rrzq3q9x1ikxnxxjgh3k9qvanfn7ykbk";
   };
 
   libPath = stdenv.lib.makeLibraryPath [
diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix
index 812ea268113..b92551a78bf 100644
--- a/pkgs/games/zandronum/default.nix
+++ b/pkgs/games/zandronum/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchhg, cmake, SDL, mesa, fmod42416, openssl, sqlite, sqlite-amalgamation }:
 
 stdenv.mkDerivation {
-  name = "zandronum-2.1";
+  name = "zandronum-2.1.2";
   src = fetchhg {
     url = "https://bitbucket.org/Torr_Samaho/zandronum-stable";
-    rev = "27275a8";
-    sha256 = "00xyrk0d1jrvy6zk059yawgd9b33z0fx4hvzcjvvbn03rqci60yc";
+    rev = "a3663b0061d5";
+    sha256 = "0qwsnbwhcldwrirfk6hpiklmcj3a7dzh6pn36nizci6pcza07p56";
   };
 
   phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];
diff --git a/pkgs/games/zandronum/server.nix b/pkgs/games/zandronum/server.nix
index f0e0285f87e..eec2c3acc9c 100644
--- a/pkgs/games/zandronum/server.nix
+++ b/pkgs/games/zandronum/server.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchhg, cmake, openssl, sqlite, sqlite-amalgamation, SDL }:
 
 stdenv.mkDerivation {
-  name = "zandronum-server-2.1";
+  name = "zandronum-server-2.1.2";
   src = fetchhg {
     url = "https://bitbucket.org/Torr_Samaho/zandronum-stable";
-    rev = "27275a8";
-    sha256 = "00xyrk0d1jrvy6zk059yawgd9b33z0fx4hvzcjvvbn03rqci60yc";
+    rev = "a3663b0061d5";
+    sha256 = "0qwsnbwhcldwrirfk6hpiklmcj3a7dzh6pn36nizci6pcza07p56";
   };
 
   phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];

From e99167d7f19aee5b13839f7a9aac64710cecabfb Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 17 Aug 2015 18:00:33 -0700
Subject: [PATCH 1253/2016] new package: mgba 0.3.0

This is a new Gameboy Advance emulator which aims to run on lower
end hardware without sacrificing accuracy or portability.
---
 pkgs/misc/emulators/mgba/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/misc/emulators/mgba/default.nix

diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
new file mode 100644
index 00000000000..e72e0ff9923
--- /dev/null
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, ffmpeg, imagemagick, libzip, pkgconfig, qt53, SDL2 }:
+
+stdenv.mkDerivation rec {
+  name = "mgba-0.3.0";
+  src = fetchurl {
+    url = https://github.com/mgba-emu/mgba/archive/0.3.0.tar.gz;
+    sha256 = "02zz6bdcwr1fx7i7dacff0s8mwp0pvabycp282qvhhx44x44q7fm";
+  };
+
+  buildInputs = [ cmake ffmpeg imagemagick libzip pkgconfig qt53 SDL2 ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = https://endrist.com/mgba/;
+    description = "A modern GBA emulator with a focus on accuracy";
+    license = stdenv.lib.licenses.mpl20;
+    maintainers = with stdenv.lib.maintainers; [ MP2E ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54b8aa640ae..43d88ae8e4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2225,6 +2225,8 @@ let
 
   mfoc = callPackage ../tools/security/mfoc { };
 
+  mgba = callPackage ../misc/emulators/mgba { };
+
   minecraft = callPackage ../games/minecraft {
     useAlsa = config.minecraft.alsa or false;
   };

From 765d1159e9f23a63705970b9f4628bb279806700 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 18 Aug 2015 03:31:27 +0200
Subject: [PATCH 1254/2016] python-packages: click 5.0 -> 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 65cce8adc20..af21cc6d6e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1949,11 +1949,11 @@ let
   };
 
   click = buildPythonPackage rec {
-    name = "click-5.0";
+    name = "click-5.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
-      sha256 = "1n3yz0ilv3k9lahajgjpc68dr0gp96v4zwf8rd1spy4bh8hnrga6";
+      sha256 = "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337";
     };
 
     meta = {

From 4fdb99d31e35b1ec54f92c9d0c776ed28c5feda5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 18 Aug 2015 03:37:30 +0200
Subject: [PATCH 1255/2016] netsniff-ng: update 0.5.9-{71-g77445f8 ->
 80-g3384ee7}

---
 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 0787cb9f29b..ac9cfbf9bf2 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-71-g77445f8"; in
+let version = "0.5.9-80-g3384ee7"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "77445f81d451eef6b78b79a2bcc24d21d4be4178";
-    sha256 = "0ny9bph070mny6i9r0i3wsx2bsl53135n439ab6r9qk710xjz91j";
+    rev = "3384ee7119222a6230c983dbdcbaf2ac2d6f92fb";
+    sha256 = "1j0g7sdf5ikr2bwd2qdwd1dpmknwaz55x3cgc8yiw39xp69hm7na";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From cec55d6c1577ee775b88b72a20b9d38cbd33ab32 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 17 Aug 2015 21:48:08 -0500
Subject: [PATCH 1256/2016] nixpkgs: touchup tarsnap formula

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

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index ae432c6122a..280c0cdb05e 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, openssl, zlib, e2fsprogs }:
 
-stdenv.mkDerivation {
-  name = "tarsnap-1.0.35";
+stdenv.mkDerivation rec {
+  name = "tarsnap-${version}";
+  version = "1.0.35";
 
   src = fetchurl {
     url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz";
@@ -12,7 +13,9 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Online backups for the truly paranoid";
-    homepage = "http://www.tarsnap.com/";
-    maintainers = with stdenv.lib.maintainers; [roconnor];
+    homepage    = "http://www.tarsnap.com/";
+    license     = "tarsnap";
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice roconnor ];
   };
 }

From 2c933ad3db8bd168709a967c27cfa5c3457a9006 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 17 Aug 2015 22:00:47 -0500
Subject: [PATCH 1257/2016] nixpkgs: add tarsnap shell completion utils

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/backup/tarsnap/default.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index 280c0cdb05e..e2857eed7d8 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -1,5 +1,16 @@
 { stdenv, fetchurl, openssl, zlib, e2fsprogs }:
 
+let
+  bashCompletion = fetchurl {
+    url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash";
+    sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405";
+  };
+
+  zshCompletion = fetchurl {
+    url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh";
+    sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair";
+  };
+in
 stdenv.mkDerivation rec {
   name = "tarsnap-${version}";
   version = "1.0.35";
@@ -9,6 +20,13 @@ stdenv.mkDerivation rec {
     sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc";
   };
 
+  postInstall = ''
+    # Install some handy-dandy shell completions
+    mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions
+    cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash
+    cp ${zshCompletion}  $out/share/zsh/site-functions/_tarsnap
+  '';
+
   buildInputs = [ openssl zlib e2fsprogs ];
 
   meta = {

From 97afc0a91472183d39783651e167f75ead43e595 Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Tue, 18 Aug 2015 08:15:37 +0200
Subject: [PATCH 1258/2016] syncthing: 0.11.16 -> 0.11.20

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 02a51a3cbad..57e9cbe7e8a 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.16";
+  version = "0.11.20";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "f9b5c2de7e2b6592cccb0222c48b9baa2497dce519824a75923d40cc722ab937";
+    sha256 = "72092f2bfaaeb8c7c9264200f7d08c5e78f670f80a018dd70477c23c0fd88619";
   };
 
   subPackages = [ "cmd/syncthing" ];

From 807a0e4609c2a4f1e673bff75c31a0617f3ea0c7 Mon Sep 17 00:00:00 2001
From: Max Zerzouri <maxdamantus@gmail.com>
Date: Sun, 26 Jul 2015 12:39:36 +1200
Subject: [PATCH 1259/2016] xorg-server: fix XKB_BINDIR usage (close #8993)

Previously, XKB_BINDIR was read inside a loop over the program
arguments, so was only read if it had arguments that weren't matched by
the first some number of checks.
---
 .../x11/xorg/xorgserver-xkbcomp-path.patch    | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch b/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch
index a0951269b42..69216ec7073 100644
--- a/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch
+++ b/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch
@@ -1,15 +1,15 @@
-*** xorg-server-X11R7.2-1.2.0-orig/xkb/xkbInit.c	2015-02-11 00:32:06.000000000 +0100
---- xorg-server-X11R7.2-1.2.0/xkb/xkbInit.c	2015-04-11 10:10:41.948438435 +0200
-***************
-*** 733,738 ****
---- 733,742 ----
-  int
-  XkbProcessArguments(int argc, char *argv[], int i)
-  {
-+     char *xkbBinDir = getenv("XKB_BINDIR");
-+     if (xkbBinDir)
-+         XkbBinDirectory = Xstrdup(xkbBinDir);
-+ 
-      if (strncmp(argv[i], "-xkbdir", 7) == 0) {
-          if (++i < argc) {
-  #if !defined(WIN32) && !defined(__CYGWIN__)
+diff --git a/os/utils.c b/os/utils.c
+index ed7581e..6593455 100644
+--- a/os/utils.c
++++ b/os/utils.c
+@@ -658,6 +658,10 @@ ProcessCommandLine(int argc, char *argv[])
+ 
+     defaultKeyboardControl.autoRepeat = TRUE;
+ 
++    char *xkbBinDir = getenv("XKB_BINDIR");
++    if (xkbBinDir)
++        XkbBinDirectory = Xstrdup(xkbBinDir);
++
+ #ifdef NO_PART_NET
+     PartialNetwork = FALSE;
+ #else

From a732b1413faf62d3137f10807d670a2c3becb771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Aug 2015 10:35:38 +0200
Subject: [PATCH 1260/2016] ghostcript: work around a parallel check problem

http://hydra.nixos.org/build/24811657
Hopefully OK now - I couldn't reproduce it with 4 cores and HT.
---
 pkgs/misc/ghostscript/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index c5fb141b7e8..4d9d9cedde5 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -77,6 +77,8 @@ stdenv.mkDerivation rec {
     ];
 
   doCheck = true;
+  preCheck = "mkdir ./obj";
+  # parallel check sometimes gave: Fatal error: can't create ./obj/whitelst.o
 
   # don't build/install statically linked bin/gs
   buildFlags = "so";

From 2e416464419f9462b2f55375ce8b9199b843f136 Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@traumapony.org>
Date: Mon, 17 Aug 2015 20:02:17 +1000
Subject: [PATCH 1261/2016] nixpkgs: llvm v3.5.0 -> v3.5.2

---
 pkgs/development/compilers/llvm/3.5/clang.nix        |  2 +-
 pkgs/development/compilers/llvm/3.5/default.nix      | 12 +++++++-----
 pkgs/development/compilers/llvm/3.5/dragonegg.nix    |  2 +-
 .../compilers/llvm/3.5/libc++/default.nix            |  4 ++--
 .../compilers/llvm/3.5/libc++abi/default.nix         |  4 ++--
 pkgs/development/compilers/llvm/3.5/lld.nix          |  2 +-
 pkgs/development/compilers/llvm/3.5/lldb.nix         |  2 +-
 pkgs/development/compilers/llvm/3.5/llvm.nix         |  2 +-
 pkgs/development/compilers/llvm/3.5/polly.nix        |  2 +-
 pkgs/top-level/all-packages.nix                      |  4 +++-
 10 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index 292154eb67a..42ca4ba70e4 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -5,7 +5,7 @@ in stdenv.mkDerivation {
   name = "clang-${version}";
 
   unpackPhase = ''
-    unpackFile ${fetch "cfe" "12yv3jwdjcbkrx7zjm8wh4jrvb59v8fdw4mnmz3zc1jb00p9k07w"}
+    unpackFile ${fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"}
     mv cfe-${version}.src clang
     sourceRoot=$PWD/clang
     unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/3.5/default.nix b/pkgs/development/compilers/llvm/3.5/default.nix
index 29e06768a73..f588eb4407b 100644
--- a/pkgs/development/compilers/llvm/3.5/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/default.nix
@@ -2,7 +2,7 @@
 let
   callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
-  version = "3.5.0";
+  version = "3.5.2";
 
   fetch = fetch_v version;
   fetch_v = ver: name: sha256: fetchurl {
@@ -10,18 +10,18 @@ let
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "0dl1kbrhz96djsxqr61iw5h788s7ncfpfb7aayixky1bhdaydcx4";
-  clang-tools-extra_src = fetch "clang-tools-extra" "0s8zjgxg8bj15nnqcw1cj1zffcralhh7f0gda1famddgg2rvx099";
+  compiler-rt_src = fetch "compiler-rt" "1hsdnzzdr5kglz6fnv3lcsjs222zjsy14y8ax9dy6zqysanplbal";
+  clang-tools-extra_src = fetch "clang-tools-extra" "01607w6hdf1pjgaapn9fy6smk22i3d4ncqjlhk4xi55ifi6kf6pj";
 
   self = {
     llvm = callPackage ./llvm.nix rec {
-      version = "3.5.0";
+      version = "3.5.2";
       fetch = fetch_v version;
       inherit compiler-rt_src;
     };
 
     clang = callPackage ./clang.nix rec {
-      version = "3.5.0";
+      version = "3.5.2";
       fetch = fetch_v version;
       inherit clang-tools-extra_src;
     };
@@ -37,5 +37,7 @@ let
     libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; };
 
     libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; };
+
+    #openmp = callPackage ./openmp {};
   };
 in self
diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
index a7d405fd55a..96d4f9f558c 100644
--- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "dragonegg-${version}";
 
-  src = fetch "dragonegg" "1v1lc9h2nfk3lsk9sx1k4ckwddz813hqjmlp2bx2kwxx9hw364ar";
+  src = fetch "dragonegg" "1va4wv2b1dj0dpzsksnpnd0jic52q7pqj79w3m9jwdb58h7104dw";
 
   # The gcc the plugin will be built for (the same used building dragonegg)
   GCC = "gcc";
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
index a23daf4f14a..7b1624d530b 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchurl, cmake, libcxxabi, fixDarwinDylibNames }:
 
-let version = "3.5.0"; in
+let version = "3.5.2"; in
 
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
   src = fetchurl {
     url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.xz";
-    sha256 = "1h5is2jd802344kddm45jcm7bra51llsiv9r34h0rrb3ba2dlic0";
+    sha256 = "0irnl54fwzh2hzn9x4jfvnfyq5kd0zn0iwbzdivgwhqzw6fjdwdv";
   };
 
   # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib,
diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
index c84ce2a4435..963caf80970 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, fetchurl, libcxx, libunwind, llvm }:
 
 let
-  version = "3.5.0";
+  version = "3.5.2";
   cmakeLists = fetchurl {
     name   = "CMakeLists.txt";
     url    = "http://llvm.org/svn/llvm-project/libcxxabi/trunk/CMakeLists.txt?p=217324";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url    = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz";
-    sha256 = "1ndcpw3gfrzh7m1jac2qadhkrqgvb65cns69j9niydyj5mmbxijk";
+    sha256 = "1c6rv0zx0na1w4hdmdfq2f6nj7limb7d1krrknwajxxkcn4yws92";
   };
 
   buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind;
diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix
index 6bd8c029231..b1047f8679e 100644
--- a/pkgs/development/compilers/llvm/3.5/lld.nix
+++ b/pkgs/development/compilers/llvm/3.5/lld.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "lld-${version}";
 
-  src = fetch "lld" "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxx";
+  src = fetch "lld" "1hpqawg1sc8mdqxqaxqmlzbrn69w1pkj8rxhjgqgmwra6c0xky89";
 
   preUnpack = ''
     # !!! Hopefully won't be needed for 3.5
diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix
index 574d706a3fd..1dad5227d64 100644
--- a/pkgs/development/compilers/llvm/3.5/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.5/lldb.nix
@@ -15,7 +15,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x44";
+  src = fetch "lldb" "0ffi9jn4k3yd0hvxs1v4n710x8siq21lb49v3351d7j5qinrpgi7";
 
   patchPhase = ''
     sed -i 's|/usr/bin/env||' \
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index b569997acc6..395843bf0d8 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -15,7 +15,7 @@
 }:
 
 let
-  src = fetch "llvm" "00swb43mzlvda8306arlg2jw7g6k3acwfccgf1k4c2pgd3rrkq98";
+  src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4";
 in stdenv.mkDerivation rec {
   name = "llvm-${version}";
 
diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix
index 03bfe0d154b..c943c790ea2 100644
--- a/pkgs/development/compilers/llvm/3.5/polly.nix
+++ b/pkgs/development/compilers/llvm/3.5/polly.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "polly-${version}";
 
-  src =  fetch "polly" "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6ll";
+  src =  fetch "polly" "1s6v54czmgq626an4yk2k34lrzkwmz1bjrbiafh7j23yc2w4nalx";
 
   patches = [ ./polly-separate-build.patch ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43d88ae8e4b..29038081ad4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4196,7 +4196,9 @@ let
     isl = isl_0_12;
   };
 
-  llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 { };
+  llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 {
+    isl = isl_0_14;
+  };
 
   llvmPackages_36 = callPackage ../development/compilers/llvm/3.6 {
     inherit (stdenvAdapters) overrideCC;

From cdee2b74eeb6a6bf53a8dabe1c8cba109bf2a4e6 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 18 Aug 2015 09:50:46 +0000
Subject: [PATCH 1262/2016] Update pstree to 2.39

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

diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index e11e920fdd4..3d526e3f3e7 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pstree-2.36";
+  name = "pstree-2.39";
 
   src = fetchurl {
     url = "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz";
-    sha256 = "1vx4fndmkkx3bmcv71rpzjjbn24hlfs10pl99dsfhbx16a2d41cx";
+    sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw";
   };
 
   unpackPhase = "unpackFile \$src; sourceRoot=.";

From 93b830f111840c87b0bd7b8e4a9d17d34f3aab03 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Aug 2015 12:18:19 +0200
Subject: [PATCH 1263/2016] htop: use a version number that corresponds to the
 output from "git describe --tags"

This approach avoids potential problems with "nix-env --update" when
we'll go back to a release version. Kindly suggested by @vcunat in
https://github.com/NixOS/nixpkgs/pull/9307#issuecomment-132112840.
---
 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 8e7df5bb8a5..6c83783bc6a 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-2015-08-12";
+  name = "htop-1.0.3-186-gf2c053a";
 
   src = fetchFromGitHub {
     sha256 = "017aihyg0bjli1hlvcqgqxpwzy2ayvwv6byhqd97n9sqfkmi9i0p";

From 4beab2264b3c20e3f5b97df4fb139004ed00c263 Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Sat, 15 Aug 2015 10:33:24 +0200
Subject: [PATCH 1264/2016] ardour: simplify version handling

---
 pkgs/applications/audio/ardour/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 2338af6ec99..593ca89451a 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -17,10 +17,6 @@ let
   # Version to build.
   tag = "4.1";
 
-  # Version info that is built into the binary. Keep in sync with 'tag'. The
-  # last 8 digits is a (fake) commit id.
-  revision = "4.1-fe672c8";
-
 in
 
 stdenv.mkDerivation rec {
@@ -42,7 +38,7 @@ stdenv.mkDerivation rec {
     ];
 
   patchPhase = ''
-    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
+    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc
     sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
     patchShebangs ./tools/
   '';

From 62a85cb205e646a0ba4b74723eb346ecfcc2bb3c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Aug 2015 01:20:30 +0200
Subject: [PATCH 1265/2016] haskell-cabal-helper: test suite has been fixed
 upstream

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6423b0726d4..6439286ca13 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -826,9 +826,6 @@ self: super: {
   # FPCO's fork of Cabal won't succeed its test suite.
   Cabal-ide-backend = dontCheck super.Cabal-ide-backend;
 
-  # https://github.com/DanielG/cabal-helper/issues/2
-  cabal-helper = overrideCabal super.cabal-helper (drv: { preCheck = "export HOME=$TMPDIR"; });
-
   # https://github.com/ekmett/comonad/issues/25
   comonad = dontCheck super.comonad;
 

From 13024a48a37615de50454e9a611423b25fbe170d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Aug 2015 01:21:18 +0200
Subject: [PATCH 1266/2016] haskell-ghc-mode: byte-compile installed elisp code

---
 .../haskell-modules/configuration-common.nix      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6439286ca13..e2edcde9efe 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -401,7 +401,6 @@ self: super: {
   ghc-events-parallel = dontCheck super.ghc-events-parallel;    # http://hydra.cryp.to/build/496828/log/raw
   ghcid = dontCheck super.ghcid;
   ghc-imported-from = dontCheck super.ghc-imported-from;
-  ghc-mod = dontCheck super.ghc-mod;                    # http://hydra.cryp.to/build/499674/log/raw
   ghc-parmake = dontCheck super.ghc-parmake;
   gitlib-cmdline = dontCheck super.gitlib-cmdline;
   git-vogue = dontCheck super.git-vogue;
@@ -939,4 +938,18 @@ self: super: {
   # https://github.com/lens/lens-aeson/issues/18
   lens-aeson = dontCheck super.lens-aeson;
 
+  # Byte-compile elisp code for Emacs.
+  ghc-mod = overrideCabal super.ghc-mod (drv: {
+    preCheck = "export HOME=$TMPDIR";
+    testToolDepends = drv.testToolDepends or [] ++ [self.cabal-install];
+    doCheck = false;            # https://github.com/kazu-yamamoto/ghc-mod/issues/335
+    executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs];
+    postInstall = ''
+      local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
+      make -C $lispdir
+      mkdir -p $out/share/emacs/site-lisp
+      ln -s "$lispdir/"*.el{,c} $out/share/emacs/site-lisp/
+    '';
+  });
+
 }

From 6d0fee82c505ba8e684ca6c08b15e3cd312fe0ed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Aug 2015 01:21:53 +0200
Subject: [PATCH 1267/2016] haskell-structured-haskell-mode: byte-compile
 installed elisp code

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e2edcde9efe..e38318ada51 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -952,4 +952,21 @@ self: super: {
     '';
   });
 
+  # Byte-compile elisp code for Emacs.
+  structured-haskell-mode = overrideCabal super.structured-haskell-mode (drv: {
+    executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs];
+    postInstall = ''
+      local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
+      pushd >/dev/null $lispdir
+      for i in *.el; do
+        emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \
+          --batch --eval "(byte-compile-disable-warning 'cl-functions)" \
+          -f batch-byte-compile $i
+      done
+      popd >/dev/null
+      mkdir -p $out/share/emacs
+      ln -s $lispdir $out/share/emacs/site-lisp
+    '';
+  });
+
 }

From 1fc3e769e3db7100798bb8c6f5f9ed6c5b85abc2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Aug 2015 12:59:36 +0200
Subject: [PATCH 1268/2016] haskell-hindent: byte-compile installed elisp code

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e38318ada51..66bf20c55c9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -969,4 +969,21 @@ self: super: {
     '';
   });
 
+  # Byte-compile elisp code for Emacs.
+  hindent = overrideCabal super.hindent (drv: {
+    executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs];
+    postInstall = ''
+      local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
+      pushd >/dev/null $lispdir
+      for i in *.el; do
+        emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \
+          --batch --eval "(byte-compile-disable-warning 'cl-functions)" \
+          -f batch-byte-compile $i
+      done
+      popd >/dev/null
+      mkdir -p $out/share/emacs
+      ln -s $lispdir $out/share/emacs/site-lisp
+    '';
+  });
+
 }

From 1f2eef5ae96169780e3ebe4fcebcafecf5e06dfe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Aug 2015 13:09:38 +0200
Subject: [PATCH 1269/2016] openssh: Re-enable DSA client keys

This was broken by a8eb2a6a81524f3be0c8886f6d06090b50b0a513.
---
 nixos/modules/programs/ssh.nix                | 31 ++++++++++---------
 .../modules/services/networking/ssh/sshd.nix  |  3 ++
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 0d1ec500afc..9c94250cb1f 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -103,20 +103,23 @@ in
         message = "cannot enable X11 forwarding without setting XAuth location";
       };
 
-    environment.etc =
-      [ { # SSH configuration.  Slight duplication of the sshd_config
-          # generation in the sshd service.
-          source = pkgs.writeText "ssh_config" ''
-            AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
-            ${optionalString cfg.setXAuthLocation ''
-              XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
-            ''}
-            ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
-            ${cfg.extraConfig}
-          '';
-          target = "ssh/ssh_config";
-        }
-      ];
+    # SSH configuration. Slight duplication of the sshd_config
+    # generation in the sshd service.
+    environment.etc."ssh/ssh_config".text =
+      ''
+        AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
+
+        ${optionalString cfg.setXAuthLocation ''
+          XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
+        ''}
+
+        ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
+
+        # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
+        PubkeyAcceptedKeyTypes +ssh-dss
+
+        ${cfg.extraConfig}
+      '';
 
     # FIXME: this should really be socket-activated for über-awesomeness.
     systemd.user.services.ssh-agent =
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 1c428ceddfd..be2dde12197 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -413,6 +413,9 @@ in
         ${flip concatMapStrings cfg.hostKeys (k: ''
           HostKey ${k.path}
         '')}
+
+        # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
+        PubkeyAcceptedKeyTypes +ssh-dss
       '';
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;

From dffb7373a5074c5a9a10b38bf3d41cd2a8f0f740 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 18 Aug 2015 20:35:10 +0900
Subject: [PATCH 1270/2016] firefox-bin: 39.0.3 -> 40.0.2, thunderbird-bin:
 38.1.0 -> 38.2.0

---
 .../browsers/firefox-bin/default.nix          |  14 +-
 .../browsers/firefox-bin/generate_sources.rb  |   2 +-
 .../browsers/firefox-bin/sources.nix          | 358 +++++++++---------
 .../thunderbird-bin/generate_sources.rb       |   2 +-
 .../mailreaders/thunderbird-bin/sources.nix   | 234 ++++++------
 5 files changed, 300 insertions(+), 310 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index ebc05a79af9..336c727ea15 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -129,19 +129,9 @@ stdenv.mkDerivation {
           "$out/usr/lib/firefox-bin-${version}/$executable"
       done
 
-      for executable in \
-        firefox firefox-bin plugin-container \
-        updater crashreporter webapprt-stub \
-        components/libdbusservice.so components/libmozgnome.so \
-        gmp-clearkey/0.1/libclearkey.so \
-        browser/components/libbrowsercomps.so \
-        libnssdbm3.so libsmime3.so libxul.so  libnss3.so libplc4.so \
-        libfreebl3.so libmozsqlite3.so libmozalloc.so libnspr4.so libssl3.so \
-        libsoftokn3.so libnssutil3.so libnssckbi.so libplds4.so
-      do
+      find . -executable -type f -exec \
         patchelf --set-rpath "$libPath" \
-          "$out/usr/lib/firefox-bin-${version}/$executable"
-      done
+          "$out/usr/lib/firefox-bin-${version}/{}" \;
 
       # Create a desktop item.
       mkdir -p $out/share/applications
diff --git a/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb b/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb
index eabff067f75..b7627e52068 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb
+++ b/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb
@@ -8,7 +8,7 @@ version = if ARGV.empty?
             ARGV[0]
           end
 
-base_path = "http://download-installer.cdn.mozilla.net/pub/firefox/releases"
+base_path = "http://archive.mozilla.org/pub/firefox/releases"
 
 Source = Struct.new(:hash, :arch, :locale, :filename)
 
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 6517097a19d..d302e47f335 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "39.0.3";
+  version = "40.0.2";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "4b732557876ff3e4d02ad480b7c73bd7abd6782d"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "0a63b048b33638ade924bcf7ae435423c9da906c"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "87349773cdb5e07aaa1387e75e08d03786df700d"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "137d3558eb674036d43e5764ca691a66f9a07782"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "db99f86de92b0d1782611926b3053b25ad302e8b"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "d000f9e8a983be0fa7d05176fb6cc0954bb06ad7"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "b794a584da47ee9197666ab6976863f23ff1972c"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "0319aec1942cd8311b236aef5772850897b36f64"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "83b83af48caf75bcdc39efb9c8a09333d6ae97b7"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "827463330470ab2abd4a71a92e15fea451957fb5"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "9f994c9374c53afa094271907fc6aecbf5a93eb4"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "611835134f1008fcff72f3ab264ce9448a6a0948"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "67339f5005bf8c805b6c8ed24fbed597865f5dd0"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "ecdd763f7d40bcb1ff6004fd0a3f511f5cbb9d9b"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "d6a7d84744c0ac6e4cb7f0a1f0025bbee053cdc2"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "051646e7d213099433bc198c74f85d99aeb6e846"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "28e48822cc2977037db1493ddc06ef106a11e8bf"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "7b59deab0fd2b35d2ec087947f5c5a85bd70cf4a"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "4c5bff7f6b3f664138a881479701cfea81ff60b8"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "3a659a5335d4b215ac2a0452264a61c702420c60"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "a641b87769d90db720fc5294ab06f6dae2a597d3"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "1c1e47f4012c765ce96e4d2581e47f9b61344370"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "0491cf87e0815079eba8f57ae8c6f392d2e5251f"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "abe34c6d4998ac2f4e2d1f2d4655f8ace9f0a857"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "40f2eb7fd72f4a05ee47cb136c73e75f139e9ed1"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "3a737c33921af68621d906702fb1298f5bf161f9"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "46cf625eea24a819d93741f2d11bc315a21361cc"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "be84a0a6e32fbbb977b654f195064add8881a853"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "ce507b8801646f3156bb38776c17dd7955ba9678"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "5b1599282512c66a8619202b494042dbe959adc0"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "9eb6a71214122e02e7e94b526b4ff1e0bad71680"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "4f21da86ab876bf916157fe7e1fd84502e8fb923"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "d175b55ebf05905531f28a74f9a075c4dd4467d1"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "62039edbacf4d5ed9b32f5ef2d993c0b6fc7a0cc"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "933cc29a7902f4de25fc593ffbaf6e62ccceb2fc"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "eb69a42286f7d4a7106ddd24ec0c1f1356101956"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "6683f985caece486b068a3ddd85e732903b1f738"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "fd92cd5ab674762fce35fddc54b7dcdfa4829dcf"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "91416a56f0221772a0f9691ad418602327d193e2"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "ce89cdb9c8c88d7c4dcd089eef006b98171f5d04"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "8322cad2eacba0c064eb9ef2f5cd1d426411c648"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "c4102cc705610d7ad5b0cc530c600b2170f55419"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "571067007e0dff64095b8eeb760aec7f78f367fd"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "64a0422e42cf1d19e558377d5ecee6536917b414"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "9f5611cd3043b1c267724b198ab04c16078b7818"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "3a22150e16a12d8fba9d21cef0c8e7ac434edf35"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "6502874b051c281e565cd0e0953698b88b69e5f5"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "3bdbcf6d324c43fbf7f3c71243df10a760f7fec2"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "83edce65b276d9989e66d11bfd4e9c1c87955364"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "6281d1d560fb7dd1a8bc1af0be046491a4ee4382"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "d394d731f7cde2b17bafd9d9d4cb6819fdbcbfd5"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "b969107e5e840e1701672b3d5ba81ae3e53889be"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "a9c801142df7a932b2eba4d8f540b2579d0fabeb"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "96cb7bb0bd079d683304168b2b14255a1217fa92"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "c233e4da88f3fcc5eb5f2c45766c9197b5910dfc"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e04973316a340325888f0f2e06590773f81a7cf0"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "22c59e40b39aefe356e8b5305ce720d4a2cdd0b7"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "74256cbb8a76d835887727aa01f6e6a22936a43e"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "fa14a31fe15106f224df47a62c3e5ec16da1cb95"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "c8b6216d448f6f192e584ceb81fb22e5ac79a280"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "a1c67f4bec3f46de3cf6297e8a711d55f8189e3b"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "70d3b99652e8c690bbd05af7af9c65eeb780d455"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "1f42b51648eb296dfc339982c331e7d63bfbbd96"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "bd176a2bda1246e15dbbfb1b068f6b196a0ce266"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "2cd7757360efeca608b8a9b4b56c04f9aca89a79"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "dc130d8ab31c739e4406f8cc72dc32d3795db208"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "6dccfb2944006379271c308fa31d8f6a4bd6bb3d"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "aca6deabd521e29611fccbdeca3bf036a2239c1d"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "4ffb659a341308a097ad26f1873ae243e581bba9"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "340caff2afeb8f9f01c84f780b6aef079ab257e6"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "7adb1a44e0367b570437fdeae9f04c6f94f6702f"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "d427e6ca8287d97b27949ccb412207ef48d0cebe"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "2741c8bdcfad1edc36968bfac70c71b1a2837df4"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "430817ee768fd76dd29e76ae00488d6397f7b6f1"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "725c194c1e08293b44cbeb2a6791f4340a773b81"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "611e5f92796707379a9fd60ade840896eac4eabd"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "720ee20fa7a74dc321ab7fa8a95732ff2e9e5250"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "778496274c362d9d854b1cc6ac9b1806ce8e708c"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "f31729cecde50073e49d1387356c13060cf50c61"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "72e9c8c602c403d16e4d60fbeb1bf5a415aabf25"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "f2498d503005d0a1d7432bbc5a981be350421cfa"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "b003f7d484ec995fe4f10808d1141e20c6ed9bfc"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "de191039fb5acb5ca9ab556ef4ef6b6211b5b697"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "d5cd94ddd0b301dc0edf2f64bafa678864aa4595"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "cf66178d0a18fcabcde897d4ba869da8d82fe999"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "b83bbf3fb4d3aabdc961b9ef669dd2aa9f05ee52"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "0550d016ad044fdac193beee822171a0d891a34d"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "4f5916dac9d8efb333e2ad21370bd8a3d961b68f"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b72515f5e194a4c543c8a6487c858abe07e24db0"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "aef7fdc2f59edbde165c4e98de10f7e20e203f9d"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "1db4444dbc9479cad1122925a9af73e358e09cbf"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "a826b23b1783fff4d51451284301610cd26b578f"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "2943bbe86e052280d610cbf3adceb89e949615b3"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "c1b0bb2f22c11974e5e3a2d9b221601da07a858d"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "2e3568872301c3897e83ee5692638a76fbef15fc"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "5af762e2487171f6b41a6c1654b672c86e6964f8"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "40c042713ee07d4d375327515c7425d6733b926f"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "0dd2808378e870f553e02066f5ee78b11543e420"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "294eb8f7345f6baffc183605988bd1a57bbdd880"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "fbd9524ac8c1286e4c4bcf77efa8c9bf86d03948"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "09b63d181398b1ff6a83849aa209952c0c5ce9b0"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "d7478ba2f1b59ef83b1447789034bbdca78fab77"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "72e1e6e225790e4438da20cd2f69dce6e455fe53"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "3ef27144bb335d7a3f168bbadc0592a5fd554d78"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "5ef7f628aeb20d20ffa01316c234afafc2a6e2c7"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "cbf6a8d123e98ef1b99221083c743e962ccec58c"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "46f34520fc023f9d20781c9d5f13c683bc7f86bd"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "c07c7ca26034e53d29e868315201605b95d83e65"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "8ab47bda33eeec6d135049f775f06478480394b2"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "82b0c898ebf2e3714763640f2cabd00dd14c9078"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "1dba01bbf772b38c67b90d5e68f7e1a5c20f0b02"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "ade71dce8572628f99bf59132e8c0efd01a77016"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "486411e211d5505ca696a936db64682e04d43392"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "0239e14c627499220518d1f9a3f643315c1846c6"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "d7f314a0caec40e367faa29e071a81da2e50d802"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "4ad6c120360f90dea82282a6891419f17d0b5068"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "14a6534cba54ff08695b4322f6566a375f9cb713"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "badad6dfe2d794d508c4f8b061ef2a91209a8c32"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "1602ac0a3ac5c8c49a370a64d450aa06b490c8b5"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "a8108ecee8557be024c35818a99c30dfd811da83"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "02952ca95545f83231b36e9c05adc51ab955f9e5"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "164c31da7ad4272500b8906ee5d29c69ac285618"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c09a24b8f00409c7c93686586b091bfc33f22e52"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "9124e6b86f947dd4a7d2d7c9b8860dd28647d2f4"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "fb2dbbda6817d8fbcf9870a3233396051ce7c67f"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "bbf1e039a02556df8c68d6d49aa30f821bfdfae9"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "9ff1ae86d0989f81ae3324e9ccbda2d2069281be"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "2be8ac327c7aa90abb38ee6ccfb0181194d5592e"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "a6ff7bf9c96b1baa2d22e897d1083c9907300de5"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "4ab6eff3bf8c99f3404a313f54ea3e0d48842d9f"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "7ed256e6b3a5aec16eb0c5d3cab8c4cd5bf07999"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "da6511f215e206df0fe450225f2b2e4d8d541838"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "d3df1cc8647d6dc8576fcfd0c6a1e28a28c0ce8a"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "af999c2bcb0d865d38e336eaad5d6766fed291cc"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "7369a73558f6df1218dac14c3259e08cfa80ac52"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "bd21ac0aca091de913201d2df5f914b9eeb83c8d"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8b9a5cf1259a824edb54d4db9aa7db3637ab041a"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "f8004907aac63d8e9e4196424aa94db4fa1ff8c0"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "3403690013738c55f87c56d52ed8f9923a496b42"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "3b00a49b87fa900ecea9fdedce1b49d2560a81dd"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "6e5f1e0460792c080aa9ac82d3be69c047862203"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "2f09d74e5e39f9016ab5594f95f61b369cd6467c"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "df7b6c0806b27ade147dc6d42d181d599cc2c28b"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "1dedbe2a377cee5b32ca4aa0ec54eb24261238b0"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "0309c2c97affcfa4c0d155eec2f9f4f586c940eb"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "890a17e8f1d771e12d3e9c03ee0c8069654dae66"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "73fbaabb4644ae3726681bd6c49f6efa25a74a1a"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "573ba7d8526147e47f49fedb5f8c2e3bf0aaee82"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "abacb4f8ad9ed7eb42d5bbf3ebdce4136557bff5"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "cd1dc2a385e1911b5eaf69bc0cab13f257d8f68d"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "5c1aff5bbf858e1e7f6fa2c2d996a396b8710124"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "a6d7e023615936b0d61e956a4dadb6431febaa0c"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "19a7147c4a7de505ef0106b121640f5f651d6dbd"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "f1120ddacc1d5a124512c405855a4014fc910034"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "d21616842495521d3b71877ff2b694e019a4c2c2"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "43b9236a33a803fc0b0dd41cef93a5bf9fd91472"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "17e06ab17369c234bef72b1a284bef39d5810671"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "8f8e2cb6acd475d7d75116c6494ab237b9531364"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "77fb9f32965af6a70275fbca308caf5bf88c3c8e"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "4a65de127708cbee44cc7238d14b9c0942d2673b"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "37a556dafc73e5de983cb62fdd545d01f32f698d"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "2f4549d5ef998449b553a5d6f62d01d0313c6c95"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "f6a10236fe0fcc9d11c3c5aee3bd84365bb06013"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "c2694589cc28b938fd7a079378e5fa99cdd7c98b"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "e7888b70a1a90613fd7d38a5a7735857385ae683"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "6ebef5649484bfda154c44232a9e3aae239c0990"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "fe5ffb931bd7e5bb403f6aef6b879c2c9446721e"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "4b53989b554929b085b120788e1e30d5232dedb4"; }
-    { locale = "uz"; arch = "linux-i686"; sha1 = "bed269a3a7e3fc82d2fb1931632be9b04fe6b6da"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha1 = "786d51639cd7e952f4c73e9d91b50f6da0ba9242"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "db04c29c9038c856c67e99c77c0628c377bcd8f7"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "d9525ad0b0069ae05cad173ab567198b67fc13dc"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "2a8bbe15f2b2b242e9787704e542a6c0a9ed93bc"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "532e224a166addee7b6068bbcee7e6c0b1c3f6df"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "514bc01fe7055a050898a01f0c1ed4773fb33b7e"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "0d5154d3d5062c7e1ff33112ad0a1399ba548b29"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "291ee73bc5540f8089f6b7bbdf8160c931cc4dd7"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "16df041eeaf6a3885d52569db1781635e519fd3f"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "4cd453a4439460164e15ac767483335f0ab153ba"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "2915386e271a710daf63b5fa6e4e6450cd339a23"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "2c64d95f8f7a82931906bb8ae6fcd6f2c976aa54"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "b9ca1f6a18283eb9eebd39173c33d7d0bbc5afe2"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "0a6c228d7f46bad34b431bb49d6bdc60c2778008"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "a509951f13eaab7661676f833dd9a83125309c82"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "372dffb81f1be1966e95bba114f982497a2caee0"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "82dd88dd2e4ded3c25f7ffd6b21dd51a0b693d43"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "52dbcef7858b57652ebd18e8b24af0c656f659e2"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "aafa712986beb5d28c51f07678f9e1f80489e199"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "0f206582c5f934a490f68d5226d1829397cc45a7"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "af49662ae762693ae916fcf491d331ad86acbf66"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "c9bbf9024acffabe1651d1ca9d0c13ce574d021b"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "a946941ad0fa094c54b76f0f31501cdd24582402"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "de19ed80796ba4423347654bbab170d72aea24b5"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "d566f37f8f908d621a51278c40e971be4a277749"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "bb7c41fd32b4b97ae25c1d7b3aee187810800387"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "b6063f82ce73e5070c983aa69d9c34dab74bc460"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "41b8d113a8d09d8fd28f4808ea630fcf732bee26"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "4c255a14338a602e9b8827f55c8c3f705a76f421"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c24df5f5dc5493d912b34e526617ed22075f3bb1"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b1be6518bc16874245e5a532d03a2bd7dc4fdc23"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "cfea274abe713d3c5df63b21489ba23766c97dad"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "10e5d0f6435a487b3331b76ac0eee51a2edb3485"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "66462c0af5e9a7f9052db2d9616a44ca08d51713"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "3a78840fe663d7876ea00cd6ecb0530f16146adf"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "8321046f8cbba3d3cdea7381f2ec4323b2ba7cfb"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "599c81a054ad7ef7c27f3be1da2289ed3404255b"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "89480e776bc5add4c9270f8f92e56d1a0207e629"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "7d7d40a7e74670eaaacb66d6a3706710d2d1cd4c"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "087b794e0988484dfd7d67488c3ac197e5529c42"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "3fd60bd6b42497d0968095294c94dcc11bdbbeda"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "2e22d7ff7c0a7a2f8bbf2c43f5da24c3eaf4ba8c"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "dc852f942018f08f2c3f56b3315dd039f0dd4159"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "a78fb79f0640fc018e4d7807bea41c6239bbdf2e"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "53a7c3e38d81df588db042bd8ee524aa67713f76"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "3721ac332975aa52f692bce9467f3919be16b4cb"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "602bee9867cead4ac79c05d8cb99d022de1169c6"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "f3809bd2b456b9548cf8415d4f15e08bf64f2561"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "6ed7be3d3f90ff01f3a8505ea61c69f1dc3f34af"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "3bff3a0f76e6744cb1e1ab78a5c24bd9183db1d5"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "87033acbf2d3277e699b1b54552a88bd33590f75"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "65a852e9774f9f61764d01e4025b64027f10d270"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "99e40bfcbc4146111059cbec1557fbe3a7295285"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "476b5ac7062932584ef634b9bd536495fef974d6"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "51334ee2ee6bdfd7e0b02ed44d95b9d0e86a73af"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "e2973dc7e1decebb24a4a90e8a4a4307ccd7d151"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "4bb52d9197c854ceca4a9d8fed6cec016c823ea7"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "2335e0f3bbae6eefdd1aa7ba58530f0ee9bd3534"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "8fdfc2defee83edeabc5648dcf4e4630862424b2"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "34201da70923a68566856aaf5f33e33f80c3943a"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "03ddd10a75a6a779bc0ff1f06f2ac0f4189c21db"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "b6456b85055178db737c3b2dbebec14ca7c373ec"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "165c5abc403322964de6fbda189c766c1490f57d"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "defd933884c5f97c63e8f07dbd42162d7365b5a6"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e0588631c0886ca5785f713c2fd4d52e53c901f6"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "732b79384c69659d674a849dfc0a4cc0905af5c0"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "30ea22676bf24205595fe3cef17f17e5fa7224c0"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "a0dd6bc63af523f12f77da3d93f842434dd45fbe"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "02e8d43be34bdd57d999ff34e93289d721fd5e18"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "13cb0fc5c3f2faf5907c71a88d9fb6dcf295534f"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "3688cb2d85620d03d8ae90535758384e0eca0b79"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "de4bfeaf65c5db67029f7800d3818f60a15e0a2f"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "3b87f8e2cbafc70264da1afabc9d4a365acdf445"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "e0d1d40ae201852a7afb5c5c3995d1eaac461880"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "d519fa72ae3acd5c5e9590242a1569e2559e7099"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "4c35aade33675ee9e6ee0ba3d2826da06509f048"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "a7f2c8c24766d4ad12a0144007eac93b99ffbc83"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "c809f3baf308c5cd7d9edc1a53f0b7cdb876a97c"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "182c27021f7192c50be9973850a848b138e60d0a"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "8bfa83a569409ae579aaf27f6878f90c9789128b"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "a68688038d975428a232f721da7f638f08fc0157"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "be223957dfcf41db552e4e63ec879e4c21eb40f4"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "d226c4ea4f987a9a8f01a8e6365e2c93ae748988"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "482a19d31d1543d2645ba290d6ab2404f200b81d"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "3bdac94346710be5c2c160153321f5bd9118c291"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "aafc01904d22edf7e6c4db94b3154875736de3be"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "3309dc84bf4d0b4f9aafce95f5af3ee3a01acd79"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "aa0f6c2f4d8f4cbd974d39cd0ef85ce7795bb00a"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "17cabcb46375f04a32ac4e156a30b97022406a46"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "51d3c83ff1584c315a18916100a9b2481d8b5ab8"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "0e725242eada7456e15c91acd63d37018167df71"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "3f68ab7a61fd8b6731aaf3089907d9e436a2e5e1"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "5934536499a2ded279a802110d8d8f0e802cc8c9"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "c212eaaa6329f9872e8545d634551d083e0f2db1"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "b6edd09144919be6932baa037f7f09ed26d5c102"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "63eeba0d15763340d802802008cce554a8bbb07d"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "c593a84cfb69ef7ee5d2a8affb15189147d0c2e1"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b2b63b30ebb9a220b610c0b1696b5da55d641710"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "1c6dcf9b30383a5566448ab4e92ef0a90613e505"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "fdaacae2217fe365eb54b977562ed8c889c95de9"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "9def4f5554110b6af64bc91f4ad0f03a6444dfae"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "7b9183a80a87febfd7e8cd57b93e2edabea763a8"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "a3ab726b981b8763dbddd74a61d85c4576597fe6"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "eced59fb6ddd04967917142301435ea121671f62"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "e80d94b8b8868e357c571710046af3155e558a5f"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "1c3cd61ba760650c7d44d98b8db66b4c7801efad"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "e0c4b3f510eb73d06c68b5b91c707ce5c508b05e"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "20ca59199a6a30bd64dcb943c2a1135885a535b4"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "87703e39a0ea9c402cc535fb4cc04dca5b9025d4"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "17cd8d702482cbc1c4bb377b29e0f278cdfc8e15"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "e7372fc31e6cd893fc0ea52e2fc4105c249310d3"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "947b986d5cb5454677d7b9bbcebaf437f0bcd16d"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "7f99697ebc560e2705e4aae628ad56a132af7eb6"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "b3a76512be4f2b86cad800d46d3f6c9ff9c883db"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "3e5c4860e15651ede1ffe569062e23f474b44994"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "36e66cb829024c631f91a9a05e4d4c10c5862c45"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "216d0066b5289335c12339dd109d8f11dc4fa937"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "a784ca15952a69965aa377a2dd6a0232ece0f8a4"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "f172acd6474891177446b61bd538af09cfb30351"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "161f527142c8d8551509e6132871c4901b2d64e7"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "d0428e31ef283749f1691d787ad6983ed0677a50"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "4bd535fdaf01bf8d001bc1147f0ad9e26f0bf39f"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "fc2de8c24f0271f56b3af97e8e4bf14179d6122d"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "9aacbee890a7bc3d714d85d16ab2d278dabd8e1b"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "75c23b833812a9d0b66727b3ed28a0e494bbacb1"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "cf29131fbf6d768e79ef5228cf066355a46b4466"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "df4b6ba0c457f15eee2dcade4882b720c1e39506"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "ab0cc9339d486d576e7004fd35d685421f7853f1"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "4b10dd376a6599f60ac85d41d465f136c4d4ebdc"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "3244858bd6405dc507eb4044be6b8ebaf7100e1f"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "9db094658b9e6d4849c1ede8438427400704c80c"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "9a907fec062b94a8f8dd7e981ea2ab4f36bcd944"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "eafc796f1597464abe3ffd9353e7d098b528525a"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "fd19ace880cfd29a4612b2543e2eab1fbbabe4a4"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "3d8bb5f293a6f18c3f171dcfb52b737a7946aa95"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "0a893fef8363fa980bc2393a2e23241f0c07956c"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "3e066a7834e998422f00e10b65e58ecf9dfc7519"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "2448c7e794e926894208abb4d25ea3b4c5db0cbb"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "a096f8152416d6af72a28fe25a849feb22ab835e"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "d974227fe54d7db75fc3b2fd773cf69ff71d647b"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b318ede019b019ee108d79e4f355311518a05963"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "c9aa90d984c2112f3e0e629f95b694b6281fe1df"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "8b3c1d3ebf013cf1c7bb448131b51920e1475240"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "47318f7ea3655b6fa876d77eea22a499d458b445"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "a1d42692baf6602f69fa436ed5eb6d21c60f3786"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "c97407ba107843f8f1f78ef70028b60bbc94ea87"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "68d1e7771a74e238ce54cff60e7279c672e4fbcd"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "cecb38e05ff1c5e6c0d79781efcf2973db6f68f0"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "5f576fdbbc9626fa9ef3986c2611285ea7fb34e3"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "b97dab8ea7387a69f499c6ab9827bc81b0ffd1ad"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "6d816a79fc954a186f9a3e9d8a909a392e0c8cb0"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "3f3a3b51d488a4940211951d698c59c33199a0a0"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "6d07bd223fd7848c4f92170f299df7091feda8dc"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "7b4cf9716f6c4333b143b61ce0ae7f7bf8832839"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "3887efcc6f8a87bdee12aeaeb1e4ad9666e1fba0"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "5d5f9db2a454e40c20db7728140b1e7b71e0f316"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "d8a0e81544d9055f39d0b8e425499e5da7ae2cde"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "f67d1c091a83a129e0f9da21c40a21e54192dfab"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "cf404307b7a5c1346c84f12272526ccc34509794"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "72d178beda4c3141ccccb0fd75d1a96e72b8f522"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "aad4b807fcbf460eb0fa0234d36092e0ca75e286"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "72f0b6ff9321bf171e7991853d37416e79db2598"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "c25dd452bd1a76d7aff4542caf4fd02f7cdcf751"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "ab0f31e1f704d125d3deb73dae6b5513f4f66cec"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "680edf9cb98b47ef92e3a9fbaa1bb66fc927003a"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "10e1fbc3cc3f2284fd28ce06c3af22d7010fa664"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "1317fc854581a50a4291bb38ff6954fe37d25efa"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "81188a3e20db29040202b24f99b073daef759f05"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "230488965e68f9170ca7b6623a599e4ec592012d"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "ff6048c8c949ef3b4fa821bedd95c046e3a7a7e4"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "02954fbabaf0688e1588652d5be08cb3784ff2aa"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "77759d296e5c85741aad42124e51913005215b71"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "8572f88439049bff5e32f4e9929f07c23dcde569"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "07101c61d8a1a7a153c9993f29c2ae7bd46c6ae2"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "dbd64d165bc9bb01545b6d31acdd4fb874f250a9"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "0e00df0f77fd8c7adb1a7822285a8410df92dd48"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "064760c31c2b78fd155a548f18be6bd82746aa7d"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "39e185b485b6808619f4fb0853e161d31dfc07f4"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "8842689c5894ea116f637691627f8513e22e00fb"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "db96505385175ae4267ae6774c6f6375db8f7dca"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "8a9e2e5b17619857a0a2c795ffd7c04d1a767559"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "2e3e0aeff9143b74e464d532eb4c94dc72165303"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "e24a2d824ffb5fe5f1f8678b8567fb58e925f3d4"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "6dbc06e58b5bf2b3b8f109c2ff1840ecfb1fdfd3"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ae7868f33c6e4b15af3f6f6fcc18814a726d9c9f"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "4a46a545fbd4236b0eff0ade9ce57dc53458ad67"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "acec465483c0a2c445e9a3c9c5166c21308b9697"; }
   ];
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb
index 72b9d1599e0..308e0b71c05 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb
@@ -6,7 +6,7 @@ version = if ARGV.empty?
             ARGV[0]
           end
 
-base_path = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases"
+base_path = "http://archive.mozilla.org/pub/thunderbird/releases"
 
 Source = Struct.new(:hash, :arch, :locale, :filename)
 
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 241b43bc1f1..e6db0a3f74e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,123 +4,123 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "38.1.0";
+  version = "38.2.0";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha1 = "0b5babaeec839aedb879b98dc540a3c44e1c0a39"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "c70e123c8e04a8366e2a96a948006caf3b084d2f"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "a17ad952ce2ec1dfe6dc797b4377ae694930578c"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "dbf6b871e6ac7a5701a5e8ce1aa1c974e43c62db"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "e7f9d73339eb55d374a172445c11da33ecff8f8f"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "b619fc248f8cd704eebbf92bd999949e0a0d2935"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "09cb9ee2b5a9d25430467961657a4d60610437d2"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "c8b63f07ee7ac0d2f4e18f6e401d012c8bfcceae"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "d20033996503ad6f690e8fe8f8201bf02c453c98"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "f8b45a57a2ed4ce232d20224afdc6c4e0338743a"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "567ac67210f34a267e53f74f31cc91131f07eaa7"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "9cef9f6a5fbca4e1d0bc912dddf07200f1f8f8a4"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "346d439ea1092f3c9a7d7077bb2fe3910d672935"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "b099cc648318d7826949110d75851108f8dd2669"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "3b72f45ccd22beb2fdfbc92014b4a3ccfa80e76b"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "e38710c2d1f90202813d95b2fde32fdde4d4091e"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "12a179f42fb8c3a11fc5985667e4f604e14ba8c5"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "6407a7b3cd5b4dcb306823a4085c85f960c292f9"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "9c49871f3ff4ecfe33077c6ebf05e166d19651a0"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "8d6299fe5998113da4c623083957a204296affd5"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "06a6c73f4a640060ae7b8aa02011558d2767acb2"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "8fffb7568b982c1202de754cb2a2e8fcb16910f5"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "31a8674c191829fa4abeb403053b8266f23b983c"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "bb86a2aafcf5d6d358eeda8e572956b90ca1e275"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "3db0fafa71f7e1fe0cc9036c343d12aa35988e04"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "4ddd0c373b00621fa271a1301e75930f5acc6657"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "6e240781d53a1853ee5be2eee18cdcb17949a228"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "d203791c4ce8da5d2e68a3485f3bed8933f929d3"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "0e4097922c16620c04bb68cd3474f813cf8c60e0"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "39bfc23dd04a59f3465e8a0b583ca72fc9bc2c8a"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "82887b30873baff493688a3d9b2b8acb0e335ed1"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d48e6977535776e5547969c486abb68f4a7f70d2"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "d9aad735745addbbe619ce51c6b793ce10a967bf"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "c429c1b6e38523b9912d5c9ae1425a48075fb2fd"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "9fe1aaab4c8f53b4d01b1374511121a3cba3b38d"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "b5759e44971e09703f4112499c85347fc30a5ef1"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "0e91e95057246a9843faca8a0c53b772f329d51d"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "b5cf9660cc877d3ca6943f4d365f02f3b5eb4ffa"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "116118d2e4540502c2b71c9d1fcf121923016d8d"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "fdbefa73fb355d4a97b7be2cc7f2785757c62d72"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "f9055260509b2bc85a7e8a95d13c90be4443054f"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "a5b880cea53c7ae278f6d6bb70208d697d2aa928"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "77ca3d79ff9d8ebef0dac367b0025515663d11b0"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "40f3c82cc93286032facea886636e95558ecedf3"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "1ecc581714b9ee079bea5de14cffdd35cea8a253"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "e5c270d9f4443068ba83dd6dcd7fb1bc318a8957"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "c6db2b2d54257eb9376a95a63a8ec630661b859f"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "bb561dd4a2cd0e72f6ec8d4abd7d30505603fbdf"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "00d3aa2504711fa89190068427e9c8c3fdb20f8e"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "4f0950bf70cea56969bf044d459799d54675b0ef"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "dbfc82675022ddf4ca69bd64aedd62b7c670b6e0"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "7c28e93a85543021861eb9314d3661edda04b086"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "b39ac627848ade0617430e284fed55d3ae846b8d"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "3ae901876dbe64fa30969dedc1d60e092a4f7924"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "0d20bc9316882548fa3ce9797af3fdc95ff88cfe"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "3a94683a81a76ce73453f2b3466c256b3e3e1e66"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "88998fc8b637cbde34c37120e637ebd1a080f75b"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "374cc24a23cc80c552044c43dbc2547d9adb2661"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "1a6ad2c0d105daadf68db573871f45e6a83a8781"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "a43817b520218e6f5b83365bb6d5784f82fd3c61"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "be03aa731ca6385f447d21e5b089fce89abdb605"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "dcadd18432c9dbd31c23ba260c1b278e96620c55"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "e40cba8fb39620ac3e065e27ae9bb2756d5f0808"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "81d7b1212a49d3e3f4cce405bb32ab8b57b53183"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "d1719489c95ad26dee243f4b13a7a3c13c80731a"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "a5a86761df367d015d6b63f85db7c091be9f7557"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "cb934acf447a20761fb61be41a5093011962ed74"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "b08541d43c30c64df64f1fa9e3e444a00a1ce66b"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "5f6b9a343ad93c969ff864775cacbf008fd5683c"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "e1551063d40661de6a0067bb6d51ad0e89ad08f6"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "9c07080670ec9f1a57aec634f81cfd73defd9ccf"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "44eeb1185f75ba2a8e4a34c161161862a12dc54c"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "26d12843a80bcbe4ea8008429bd075794e9dab20"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "89fec10ec8be9a298fed4ae5ebda68b117ee35ad"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "13bea7053d38cb7d00950cf4d13fe06cab33b4e7"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "1c927583ab814caac16ece34156110826ddbdf37"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "1c8ca9891483fe489f26b82d5b81562223af1210"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "88db986d9de826407f1692c1fddc64068eb190bb"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "db25c5d46fbab8692882bf32422eb334a5790ed4"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a50bf1a7277a7bbbc162a547916abae63a49becd"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "b4500262a14c781546966bc713c1a574b29bd221"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "196c388eb6bc00099196cc6774fa2fa327b36d81"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "19e5c34a64a0a2d7258f285ad3d4182e0c1859e2"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "cf17768842cdbfc3fb4f922655e102ace1420b4c"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "60cb1312edde3d610ba7b786f7e0030066c097fc"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "82535ac23e75f77767a844735b5950109ed7ef15"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "15bdb9f7b06ad28ab5bb6a219afc2cf98bd94689"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "ba4aa04ea6380d6ca9e5776806f478da3a18acf2"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "30319593b61aa454c72e372c47c97fd98e425cfa"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "364734483184c769370ca2948dc9335bfe6fe1ba"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "5b5bf58fb96072590d4d3e9e1f7239c352910b49"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "bee00bc517deaa46d5e409d80b54f19bf8133e44"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "17d313829c47fc57256181b5a916605860f5c20f"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "69d536b6c14b29a86503cf9d492e20318e6ca550"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "01e1fa5218459dc6e32d7a4d51bd120bc96c3f13"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "24cfbe861062ba1f3e5847b4b05c925a2db52518"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "b01bd9bff5d31998f69cbc18c31df3798346d5bb"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "ab0a0ffc3816923384f519caef4b07830526a3b1"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "e310ae1b0f32c67ccc03097fe9917f37eca3b271"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "2d746d4743ca5be9dfb082129f2527ef4453e8f8"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "9053948612aa9de8898d7e3606eb08d855fff41a"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "b3c621a120756aba91c985deb06a31051b63468f"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ef7480dc06af7376387a27da47e49bd2e5078453"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "c23f9b1832ab1d0317d09017c5a39824638da921"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "eea8f9b4832b6bdc61b0cd4dedb5d78aae02c953"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "75f4856b28f589098599a786a242681a911ff92e"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "5ca3104abb9636ffcd5cdf913b14f48ba2a03977"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "8edb7885b506d1b4288bded01dccb00b89c929f2"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "2776e9dc93263ac8c7cf757e0a03f71b0a3d2a9c"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "7ec1dc5df673394c3e61293d92d369045a0d2bd6"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "1582f2552bc644729ffcb0d42b405e065a56ca9c"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "5e24d1ce8e6b74883dabb70dc1ac03c034e6e659"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "f8df723a211049e853628b5f2dd7240b4216871c"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "2cb69569638090ae09d552e95aaae40b876144e3"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "ca3790624a90e49e7271bccf3870a8da629df074"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "ebe6e83ee9f2fce3823d01c4900231bc00682fba"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "e78d69e77c7a41a5d1db177d1ff2011620d0030e"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "0392f81672db2005796966f125a50722d62437d5"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "583d831cc2a2b9707e76ecead28d830ce4971b0e"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "741ce8879c18477048eace82676a4e3dc8a9c248"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "f838f7034293f188566d5866a8e02a7045477deb"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "cd32f6da77e0c9f0d82659105f696daa8ad71798"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "784d23acca591ebceca30c67e0468e53c9ee2776"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "547e8d013635e88e1575a68b0ea11b375c430213"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "7ddc0b28640e4e43fa5d70790a46be663962be99"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "b56e9b9e781f73074d2c4ee19e5bd267c6aad9ec"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "a28f9b548ae4c081e792b77dda3395874b355d13"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "2c37c60ea39218abe1e937be7584ca9966cc6c81"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "1fecd72a93a5d76c506dfc5c95e6f0e613f5e89f"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "32063fa5a27838a4ca9f5dd7c091e01b464653b2"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "32ccce02f24ba87cd1c8e5997feb95c6e54b8cbd"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "98ce62455ffbb373eb47f3c107042510b4ceae23"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "4eb168b3858107239fef24c97da279c5f33c737a"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "4d1dea9922cebc848bb45d82d413968b99f06e73"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "87b5de179a6be0cc8cca4c125fe32b6c0a23e08b"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "06a0bd4ac2a7709703c3cc860268fcdbccf2ac83"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "00f40a074255e4f3fe2d3bead1a37b1d406bca68"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "9e58b681b85028a932104295a8e39e209a21e549"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "0ee112d071dd3fb580521bf730e762e314c3c0fb"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "69a01bc3875151dd3a7b283f8edc44896778f00d"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "3ac525634c74814cd8fd73b841b4aa8095af6ca4"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "cce461a7de648677ada0e7ab144c6b492044a370"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "321795d34d8708fff3149d99db41abbde3d59a38"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f9435cb01e929591ab54f313442c42fc31007041"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "415c1b828bad3680da7b6f0ac6c6d85be3002ca5"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "56eddaa513439a3c66deed3b1396660cecfb7224"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "9963d13b6b6ab8fe4df7f69fee812e8ed3c79f2b"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "4c64efa0c7b3b46e3db8c2a8bf1afa7fd59b1afb"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "7fe8db80f25a155a4fbe606b43e8ea192bdeb2d3"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "2a5f57603236604829e5d75103216b2239354b04"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "f99161ca84c7bf660198481757a97505bff41016"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "220155dbc6f604f3a3daaaa5bafd8f096409931a"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "117546c2ea2d2410e0d0da57f79b8a17e39fea0d"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "ec22ab958396424a1134c6e2e7a6f182ef38d2e3"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "2115972a75ab795253b1ac639b3c939cc90b186c"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "c59da6176e5278f05c489449d477a8b508612efc"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "76a50fa696f0f489cd129fd5590853a6b689987e"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "772b5eab11f94b2f7713e43b7c384f9d24d407bc"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "156b5e3a99bb2ee1bc489f3f1d06643860709d55"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "02c52d17d1d2d98d1281ae957205eabb0dae4c3a"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "f1e8e28988504c4bec059348942d38b3c1a3b3f3"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "80491a140c3d3b29f46eb882c41fa84842e3e44b"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "412e478fb2a56fb53ca27fdf01346a1c8f3e7a53"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "31a4aee19453bc754db2149e2cfa952ee6829ef7"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "70e5d130dc08a86d7ae7b28e29fbd7485e750a6e"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "b0735f3f05f36b174399300c8eb8c851aa92ea1c"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "28eda52f1a9b13c15faeb87b241bef6be001f856"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "d311d07f86e3280d422dcaa76925308dec1bbf29"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "d19f966f31fa298a4d6d2b61d83a407c950b94ba"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "b730ed1556bc3337dba3d4391773746c344fd16d"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "bb6e4f02d1b7ebfa56c3510fe7707218c7ee0fbc"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "826ce8b68e61a6c6e340ab7e2766f7a432927aa0"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "af06b6b2d52dba79ca21cfc7e9eff1b135ba79f8"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "c90755e7048bb1b33d0407010db770a3a20f144a"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "56992cb46445b4f389e62e5e621a09ee37558864"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "764c62cb4b44f25947ef778cd78de2ce17546da6"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "02170606677c5d1177e98fec537ab9997d1d2bb2"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "9079cdf731c69ad204ec2e4d92b1b9e7e476b8f8"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "59e47a5d030c8a18faaff875d06fc2fee8ff2fa9"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "207c2e8671f9266c70b03c42e4b6952c7b139fcc"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "cb724a67e5e0413f670602cb351fd8c7538d4074"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "24901bb227c7df290d030bfaccf048b6fbbd2bf6"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "8df9208999956eea39f4774c482da5db3ed5662b"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "6f29589c86eee9cf95410c0e0098e2b96bffb4d0"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "e266fb9dba4368e80d206c248fe3c1bc202dc064"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "106a6152a5f91407ee1cde665f70b39fbe6bfe69"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "3385483d2db12873b645add7e16455874cd2ac91"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "fb2aafa56998000c6f08730c467d7fb3e37a7f70"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "93a2f4e45b47335cad077581601b1da6becb5e5b"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "7d609d01d0cf46b2d94f15253e0e1cd1ba42d6ac"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "35d4c18935d64b4ca371eed75def0cda549715ad"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "168a20038f76eafec00a63501019a55b59b7c9b0"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "3fc3c67c8f60814f70e8b53d7896d392b38b1af6"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "be54f52ea730447b53e020c1ed0c804a7f22bf40"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "8a4db5fea163ebbb7738f86d878f371323b0da10"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "71ac68f8b117549e7a66207ca556cfc951827406"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "1d5fcf5ce59e552e1d122249a158d4956e6e9610"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "1519da5234c5a7a7ba569c1d995a8ecefcd266aa"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "913ba6f41cdbde5a4d0bb7d67751c29d29a4b294"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ca6e7915533cacd710980711e8143061e6e7fc2e"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5578ba04b7d431a78728cb08cd25513c269db003"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "a2a42233fac046158dbe8ee2f743cddb53df151a"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "e8abf6f03cb05a42c47c6dcb68ab9226229fcc14"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "0a69eb3783653ee645c443b24feb1c100a2e0688"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "73fb22e26cd39b32ba42d427d200dd20f6206884"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "9ea1dbfc283efb72abca7b7ef97c168c54026b0b"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "fa9e4eb824a7f2d09bfcf66eb7740e4bdff24131"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "a0f6e30587f549f44140bbd9fcb7c3abe12e5ec3"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "cbed568fa683f3b95bd5e63470f5035d67135c8b"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "613576519cc050facff46a4c419f997d2a9660f4"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "e22226e26405d9aac5bac49e458f08980ffa7419"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "d96029ff232537645a6d9f93394e02e9c68b8c2a"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "cfb39baf1c3637d4e77f177d4075ec6a1d78e522"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "78264ea3ff48ff1e5e89c174a181636fe5498f7d"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "c55b151b1945ca507fef2e00a492fda7dc622f80"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "75138732d8f82a879c0ba3c657dde6e41192f55c"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "34e9e650bc5adc27a4262897914d8b97d65d9d95"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "236189aa59dee7d991d2c7e15467666d9fa1c4ec"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "924e01fad080da3c2f52834d9f55511cc2c56781"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "2c5ad3832956d427f5a415681145fb2e32a1be71"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "b87a9ec4cc658cfb0fcf45f82546ed385104bbdd"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "db30febd32a867e125df3039dfcef74055f4428e"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "513c56c7308d6562a14b268e17f6f7d79e4860da"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "9f69846c81b847736b917521fae2f6c1cdcaea38"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "d43edd5cce1f121e2676b3876ca4579142e7df21"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "4eeddcadc812dc66a7c510e39018baf98ed928bc"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "75832dada4af3880d00d5918a2d8b2e5ad50fb53"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "8521ce3fb633bd9deafb2bdbba5b8a487a08e23a"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "22ec231d065c73627c39147b34c656dfdcd27d14"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "fa037a2ba7e8559ed8bbbc86772dcff24eada7e3"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "685ec1667d29b45a144cba118ad97eb3b340feb8"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "859f97ddbb05c76495fd09c4f039bc6324cc60a1"; }
   ];
 }

From cc0f9acb53f0c1808f23fc7d40628992119315a8 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 18 Aug 2015 14:50:19 +0200
Subject: [PATCH 1271/2016] aria2: Fetch from github instead of sourceforge

---
 pkgs/tools/networking/aria2/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index e48beb3fe35..581604b59de 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -1,20 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, c-ares, openssl, libxml2, sqlite, zlib }:
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, cppunit, libgcrypt
+, c-ares, openssl, libxml2, sqlite, zlib }:
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
   version = "1.19.0";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.xz";
-    sha256 = "0xm4fmap9gp2pz6z01mnnpmazw6pnhzs8qc58181m5ai4gy5ksp2";
+  src = fetchFromGitHub {
+    owner = "tatsuhiro-t";
+    repo = "aria2";
+    rev = "release-${version}";
+    sha256 = "1k4b8jfg4wjsvybb7hysplp6h831allhiqdy9jwsyy0m0zmgk00a";
   };
 
-  buildInputs = [ pkgconfig c-ares openssl libxml2 sqlite zlib ];
+  buildInputs = [
+    pkgconfig autoreconfHook cppunit libgcrypt c-ares openssl libxml2
+    sqlite zlib
+  ];
 
   configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ];
 
   meta = with stdenv.lib; {
-    homepage = http://aria2.sourceforge.net/;
+    homepage = https://github.com/tatsuhiro-t/aria2;
     description = "A lightweight, multi-protocol, multi-source, command-line download utility";
     maintainers = [ maintainers.koral ];
     license = licenses.gpl2Plus;

From 4140d6352e0d64970efec4bb926c5b3965dfff16 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 18 Aug 2015 14:51:03 +0200
Subject: [PATCH 1272/2016] aria2: Add platforms attribute

---
 pkgs/tools/networking/aria2/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 581604b59de..5ad31ce4405 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     description = "A lightweight, multi-protocol, multi-source, command-line download utility";
     maintainers = [ maintainers.koral ];
     license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
 }

From 1375602b8d2ecef2d61299f988d7aee61ab39e4d Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 18 Aug 2015 14:51:54 +0200
Subject: [PATCH 1273/2016] aria2: Add myself as a maintainer

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

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 5ad31ce4405..f2809b5c7b2 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/tatsuhiro-t/aria2;
     description = "A lightweight, multi-protocol, multi-source, command-line download utility";
-    maintainers = [ maintainers.koral ];
+    maintainers = with maintainers; [ koral jgeerds ];
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };

From 24dedd0c9bed6755cb0f030be6da00e87c8e95c9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 18 Aug 2015 15:42:47 +0200
Subject: [PATCH 1274/2016] gnome-control-center: depend on
 sound-theme-freedesktop

Required for working speaker test sounds in the Sound applet.
---
 .../gnome-3/3.16/core/gnome-control-center/default.nix    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index 84bdb7492bb..edd35202314 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
-, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio, fontconfig
+, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
 , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, python, libkrb5, networkmanagerapplet, networkmanager
 , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
-, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:
+, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk
+, fontconfig, sound-theme-freedesktop }:
 
 # http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
 # TODO: bluetooth, wacom, printers
@@ -17,7 +18,8 @@ stdenv.mkDerivation rec {
     sha256 = "07vvmnqjjcc0cblpr6cdmg3693hihpjrq3q30mm3q68pdyfzbjgf";
   };
 
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
+  propagatedUserEnvPkgs =
+    [ gnome3.gnome_themes_standard gnome3.libgnomekbd sound-theme-freedesktop ];
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=752596
   enableParallelBuilding = false;

From 3d37dcc9eb8f057f01927fc837e3692405139597 Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Sat, 15 Aug 2015 21:28:02 +0200
Subject: [PATCH 1275/2016] ardour: 4.1 -> 4.2

---
 pkgs/applications/audio/ardour/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 593ca89451a..e47dbfb856b 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -15,7 +15,7 @@ let
   # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
 
   # Version to build.
-  tag = "4.1";
+  tag = "4.2";
 
 in
 

From e31e28602ff9168387de1c215415ef2b4f696d8d Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Sat, 15 Aug 2015 21:59:31 +0200
Subject: [PATCH 1276/2016] rkrlv2: initial version at beta

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

diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix
new file mode 100644
index 00000000000..9c41c88b012
--- /dev/null
+++ b/pkgs/applications/audio/rkrlv2/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, pkgs, fetchFromGitHub,
+automake, pkgconfig, lv2, fftw, cmake, xlibs, libjack2, libsamplerate, libsndfile
+}:
+
+stdenv.mkDerivation rec {
+  repo = "rkrlv2";
+  name = "${repo}-b1.0";
+
+  src = fetchFromGitHub {
+    owner = "ssj71";
+    inherit repo;
+    rev = "a315f5aefe63be7e34663596b8b050410a9b7e72";
+    sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8";
+  };
+
+  buildInputs = with xlibs; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ];
+
+  meta = {
+    description = "Rakarrak effects ported to LV2";
+    homepage = https://github.com/ssj71/rkrlv2;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.joelmo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23413feea81..56ded529983 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2850,6 +2850,8 @@ let
 
   rkflashtool = callPackage ../tools/misc/rkflashtool { };
 
+  rkrlv2 = callPackage ../applications/audio/rkrlv2 {};
+
   rmlint = callPackage ../tools/misc/rmlint {
     inherit (pythonPackages) sphinx;
   };

From bf5eece51d0a75984f6868cd6a779e8ce33f61df Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Sun, 16 Aug 2015 18:00:35 +0200
Subject: [PATCH 1277/2016] Make fetchFromGitHub return an additional attr rev

This means it is more consistent with fetchgit which returns rev.
---
 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 56ded529983..0f2fbc8da5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -398,7 +398,7 @@ let
     inherit name sha256;
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
     meta.homepage = "https://github.com/${owner}/${repo}/";
-  };
+  } // { inherit rev; };
 
   fetchFromBitbucket = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
     inherit name sha256;

From 836fa19651a0cbaacb9623216947e61854cc3249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 18 Aug 2015 12:22:21 +0200
Subject: [PATCH 1278/2016] cudatoolkit: fixup path to samples

This is needed for cuda 6.5 or else nsight will not find them. In cuda 7.0 the
samples are already in $out/samples. Older versions do not build due to broken
dependency (python-minimal).
---
 pkgs/development/compilers/cudatoolkit/generic.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/cudatoolkit/generic.nix b/pkgs/development/compilers/cudatoolkit/generic.nix
index c42c8057987..d7bc718ea60 100644
--- a/pkgs/development/compilers/cudatoolkit/generic.nix
+++ b/pkgs/development/compilers/cudatoolkit/generic.nix
@@ -63,6 +63,11 @@ in stdenv.mkDerivation rec {
 
     # let's remove the 32-bit libraries, they confuse the lib64->lib mover
     rm -rf $out/lib
+
+    # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
+    if [ -d "$out"/cuda-samples ]; then
+        mv "$out"/cuda-samples "$out"/samples
+    fi
   '';
 
   setupHook = ./setup-hook.sh;

From 4a75883932298b2c54888ec830bf76ab46a83f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 17 Aug 2015 19:12:30 +0200
Subject: [PATCH 1279/2016] freeglut: remove unused patch

---
 ...1-remove-typedefs-now-living-in-mesa.patch | 43 -------------------
 .../libraries/freeglut/default.nix            |  2 -
 2 files changed, 45 deletions(-)
 delete mode 100644 pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch

diff --git a/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch b/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch
deleted file mode 100644
index b11a50a9de1..00000000000
--- a/pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 9df489c765921d8d3ff96a13c01592d9209431bb Mon Sep 17 00:00:00 2001
-From: Florian Friesdorf <flo@chaoflow.net>
-Date: Wed, 4 Jan 2012 23:12:44 +0100
-Subject: [PATCH] remove typedefs now living in mesa
-
----
- progs/demos/smooth_opengl3/smooth_opengl3.c |   20 --------------------
- 1 files changed, 0 insertions(+), 20 deletions(-)
-
-diff --git a/progs/demos/smooth_opengl3/smooth_opengl3.c b/progs/demos/smooth_opengl3/smooth_opengl3.c
-index abbdfb5..1172615 100755
---- a/progs/demos/smooth_opengl3/smooth_opengl3.c
-+++ b/progs/demos/smooth_opengl3/smooth_opengl3.c
-@@ -98,26 +98,6 @@ typedef char ourGLchar;
- #define APIENTRY
- #endif
- 
--typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
--typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
--typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage);
--typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type);
--typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length);
--typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader);
--typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void);
--typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
--typedef void (APIENTRY *PFNGLLINKPROGRAMPROC) (GLuint program);
--typedef void (APIENTRY *PFNGLUSEPROGRAMPROC) (GLuint program);
--typedef void (APIENTRY *PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
--typedef void (APIENTRY *PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog);
--typedef void (APIENTRY *PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params);
--typedef void (APIENTRY *PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog);
--typedef GLint (APIENTRY *PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name);
--typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
--typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
--typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name);
--typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
--
- PFNGLGENBUFFERSPROC gl_GenBuffers;
- PFNGLBINDBUFFERPROC gl_BindBuffer;
- PFNGLBUFFERDATAPROC gl_BufferData;
--- 
-1.7.8
-
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index 73e7e2ccce5..20bd2b6da4d 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -22,6 +22,4 @@ in stdenv.mkDerivation {
   '';
 
   configureFlags = [ "--enable-warnings" ];
-
-  # patches = [ ./0001-remove-typedefs-now-living-in-mesa.patch ];
 }

From e1f7e7128b12feafd517410206d0f71547ec1aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 17 Aug 2015 19:18:39 +0200
Subject: [PATCH 1280/2016] freeglut: add meta attributes

---
 pkgs/development/libraries/freeglut/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index 20bd2b6da4d..74cc5c6796e 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -22,4 +22,20 @@ in stdenv.mkDerivation {
   '';
 
   configureFlags = [ "--enable-warnings" ];
+
+  meta = with stdenv.lib; {
+    description = "Create and manage windows containing OpenGL contexts";
+    longDescription = ''
+      FreeGLUT is an open source alternative to the OpenGL Utility Toolkit
+      (GLUT) library. GLUT (and hence FreeGLUT) allows the user to create and
+      manage windows containing OpenGL contexts on a wide range of platforms
+      and also read the mouse, keyboard and joystick functions. FreeGLUT is
+      intended to be a full replacement for GLUT, and has only a few
+      differences.
+    '';
+    homepage = http://freeglut.sourceforge.net/;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bjornfor ];
+  };
 }

From 38880d19cb1b1378851c0dc3a496597c67654843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 17 Aug 2015 18:59:53 +0200
Subject: [PATCH 1281/2016] freeglut: 2.8.1 -> 3.0.0

* Upstream switched to cmake => remove autoreconfHook
* Makefile.am is gone => remove darwin specific patch (untested)

The new version has a pkg-config file. Yay!

Tested locally with `nox-review wip`; no regressions found.
---
 .../libraries/freeglut/default.nix            | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index 74cc5c6796e..6159ce7c9e0 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -1,27 +1,15 @@
-{ stdenv, lib, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11, autoreconfHook }:
+{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11, cmake }:
 
-let version = "2.8.1";
+let version = "3.0.0";
 in stdenv.mkDerivation {
   name = "freeglut-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz";
-    sha256 = "16lrxxxd9ps9l69y3zsw6iy0drwjsp6m26d1937xj71alqk6dr6x";
+    sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra";
   };
 
-  buildInputs = [
-    libXi libXrandr libXxf86vm mesa x11
-  ] ++ lib.optionals stdenv.isDarwin [
-    autoreconfHook
-  ];
-
-  postPatch = lib.optionalString stdenv.isDarwin ''
-    substituteInPlace Makefile.am --replace \
-      "SUBDIRS = src include progs doc" \
-      "SUBDIRS = src include doc"
-  '';
-
-  configureFlags = [ "--enable-warnings" ];
+  buildInputs = [ libXi libXrandr libXxf86vm mesa x11 cmake ];
 
   meta = with stdenv.lib; {
     description = "Create and manage windows containing OpenGL contexts";

From 109ff7ddee11eb94e8d76ff0f0571d0e12732b2b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 17 Aug 2015 11:41:19 -0700
Subject: [PATCH 1282/2016] kernel: 3.10.86 -> 3.10.87

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 909535c5225..81c2b28c593 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.86";
+  version = "3.10.87";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1kax24y6xa49n4wc74qg503pbg0rd2imx5npyfp1wcnc6p68w0mr";
+    sha256 = "01lax9c6j2gw33pr7dla1ly1d89970mkbwh2hnmysgzsyh136rvg";
   };
 
   features.iwlwifi = true;

From e4fa08711c4b0044a4cfa348202688edb5e56b93 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 17 Aug 2015 11:41:29 -0700
Subject: [PATCH 1283/2016] kernel: 3.14.50 -> 3.14.51

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 569c05fa283..6bf0065c09d 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.50";
+  version = "3.14.51";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1bc0g8a707sfqhi9yifaijxzmfrqgry7l1j9473376q0f8pkwjvy";
+    sha256 = "1gqsd69cqijff4c4br4ydmcjl226d0yy6vrmgfvy16xiraavq1mk";
   };
 
   features.iwlwifi = true;

From eb859dc8167c0c59b8670968906d2056e5c2fd38 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 17 Aug 2015 11:41:41 -0700
Subject: [PATCH 1284/2016] kernel: 4.1.5 -> 4.1.6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index 6c0ba082e36..d50fd24e86d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1.5";
+  version = "4.1.6";
   # Remember to update grsecurity!
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0v40vhcs3hkjw7gl71jq03ziz93cfh3vlpn686kc9y1nnbcxks5j";
+    sha256 = "1zlr7d5d7rhcbpwsi0svmv0zwj50n6mj6xgfzwwi336f5p26wbci";
   };
 
   features.iwlwifi = true;

From 0b907d875cf6a719644d707b811230365601bbe2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 17 Aug 2015 13:03:26 -0700
Subject: [PATCH 1285/2016] procps-ng: 3.3.10 -> 3.3.11

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

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 7a810e9fff9..afe1a438860 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation {
-  name = "procps-3.3.10";
+  name = "procps-3.3.11";
 
   src = fetchurl {
-    url = mirror://sourceforge/procps-ng/procps-ng-3.3.10.tar.xz;
-    sha256 = "013z4rzy3p5m1zp6mmynpblv0c6zlcn91pw4k2vymz2djyc6ybm0";
+    url = mirror://sourceforge/procps-ng/procps-ng-3.3.11.tar.xz;
+    sha256 = "1va4n0mpsq327ca9dqp4hnrpgs6821rp0f2m0jyc1bfjl9lk2jg9";
   };
 
   buildInputs = [ ncurses ];

From 7af19603455ec6afb258fd74e0f30b6f851f68cb Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 11:26:25 -0700
Subject: [PATCH 1286/2016] libdrm: 2.4.62 -> 2.4.64

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

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 775a8f92047..2323a423700 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.62";
+  name = "libdrm-2.4.64";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc";
+    sha256 = "1dilm6cwqfx9plf3i5kkaf6m5v1zyrcadqbcjsrsshkfgpz8c1xn";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 9fa56e49d704849475183f1293faca7eb8ab064f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 11:29:36 -0700
Subject: [PATCH 1287/2016] man-db: 2.7.1 -> 2.7.2

---
 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 403068b1bf7..b731c0409f3 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.1";
+  name = "man-db-2.7.2";
   
   src = fetchurl {
     url = "mirror://savannah/man-db/${name}.tar.xz";
-    sha256 = "03ly0hbpgjnag576rgccanaisn7f6422q5qxrj64vyzslc2651y4";
+    sha256 = "14p4sr57qc02gfnpybcnv33fb7gr266iqsyq7z4brs6wa6plwrr2";
   };
   
   buildInputs = [ pkgconfig libpipeline db groff ];

From e1ac7ad7cc0b619202dbc0a4681a9f65550711e0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 11:31:19 -0700
Subject: [PATCH 1288/2016] libpipeline: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix
index 2213ea2e8b9..3f91540dc80 100644
--- a/pkgs/development/libraries/libpipeline/default.nix
+++ b/pkgs/development/libraries/libpipeline/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
  
 stdenv.mkDerivation rec {
-  name = "libpipeline-1.4.0";
+  name = "libpipeline-1.4.1";
   
   src = fetchurl {
     url = "mirror://savannah/libpipeline/${name}.tar.gz";
-    sha256 = "1dlvp2mxlhg5zbj509kc60h7g39hpgwkzkpdf855cyzizgkmkivr";
+    sha256 = "1vmrs4nvdsmb550bk10cankrd42ffczlibpsnafxpak306rdfins";
   };
 
   meta = with stdenv.lib; {

From c4dc3aa97fa3eaa554be61698e2945f287def6e5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 11:32:29 -0700
Subject: [PATCH 1289/2016] acpid: 2.0.23 -> 2.0.25

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

diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix
index 39b5565ffbd..1746c938444 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "acpid-2.0.23";
+  name = "acpid-2.0.25";
 
   src = fetchurl {
     url = "mirror://sourceforge/acpid2/${name}.tar.xz";
-    sha256 = "1vl7c6vc724v4jwki17czgj6lnrknnj1a6llm8gkl32i2gnam5j3";
+    sha256 = "0s2wg84x6pnrkf7i7lpzw2rilq4mj50vwb7p2b2n5hdyfa00lw0b";
   };
 
   preBuild = ''

From 74a885d13e04fd1248ff851955fb7d127dc7f134 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 11:33:23 -0700
Subject: [PATCH 1290/2016] bluez5: 5.32 -> 5.33

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

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 1cc990f797b..72f4ea7f333 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -5,11 +5,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "bluez-5.32";
+  name = "bluez-5.33";
    
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
-    sha256 = "1xspdw87h2mpy5q36q7225yizgcvxlag1b8qi13h9v6b07kkakzy";
+    sha256 = "1lrn2irisr569m3fnrqhzsg77dgci55nlp5izv5phrjh2dx8008q";
   };
 
   pythonPath = with pythonPackages;

From 31a27c44c8b2e6321f0ac4534c035d62faca8211 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 11:33:37 -0700
Subject: [PATCH 1291/2016] lxc: 1.1.2 -> 1.1.3

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

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index c7170d5b464..72707bb7a8a 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -11,13 +11,13 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lxc-1.1.2";
+  name = "lxc-1.1.3";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxc";
     rev = name;
-    sha256 = "149nq630h9bg87hb3cn086ci0cz29l7fp3i6qf1mqxv7hnildm8p";
+    sha256 = "109vpkxzkhixfvwfs6qphfbxb7pbk2qx22qc4zbk52d6gl78ygsb";
   };
 
   nativeBuildInputs = [

From 143811261356e2e6284563d3c51cbe29052a3a15 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 11:35:09 -0700
Subject: [PATCH 1292/2016] libpcap: 1.5.3 -> 1.7.4

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

diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 213dbe50aaf..b8985bbed82 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "libpcap-1.5.3";
+  name = "libpcap-1.7.4";
   
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "14wyjywrdi1ikaj6yc9c72m6m2r64z94lb0gm7k1a3q6q5cj3scs";
+    sha256 = "1c28ykkizd7jqgzrfkg7ivqjlqs9p6lygp26bsw2i0z8hwhi3lvs";
   };
   
   nativeBuildInputs = [ flex bison ];

From ecdda8ddc9e0b1fa1b3047f395e2aac990af85f4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 11:35:27 -0700
Subject: [PATCH 1293/2016] openldap: 2.4.41 -> 2.4.42

---
 pkgs/development/libraries/openldap/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 6bc9b977363..073cbbcddd3 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,23 +1,17 @@
-{ stdenv, fetchurl, autoconf, openssl, cyrus_sasl, db, groff }:
+{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff }:
 
 stdenv.mkDerivation rec {
-  name = "openldap-2.4.41";
+  name = "openldap-2.4.42";
 
   src = fetchurl {
     url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
-    sha256 = "0vkzfd1pmin6xsv8lb1nabfxma8n1q00khr6nfifqkxlm2s6p197";
+    sha256 = "0qwfpb5ipp2l76v11arghq5mr0sjc6xhjfg8a0kgsaw5qpib1dzft";
   };
 
   outputs = [ "out" "man" ];
 
-  nativeBuildInputs = [ autoconf ];
   buildInputs = [ openssl cyrus_sasl db groff ];
 
-  # NOTE: Only needed for the gcc5 patch
-  preConfigure = ''
-    autoconf
-  '';
-
   configureFlags =
     [ "--enable-overlays"
       "--disable-dependency-tracking"   # speeds up one-time build

From 5ec252e7ca23e1248d90a00863b042ae8daa9bfa Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 11:35:50 -0700
Subject: [PATCH 1294/2016] kbd: 2.0.2 -> 2.0.3

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

diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index fba63daf8e5..7ffc65a9ec4 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, gzip, bzip2, pkgconfig, check, pam }:
 
 stdenv.mkDerivation rec {
-  name = "kbd-2.0.2";
+  name = "kbd-2.0.3";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz";
-    sha256 = "04mrms12nm5sas0nxs94yrr3hz7gmqhnmfgb9ff34bh1jszxmzcx";
+    sha256 = "0ppv953gn2zylcagr4z6zg5y2x93dxrml29plypg6xgbq3hrv2bs";
   };
 
   /* Get the dvorak programmer keymap (present in X but not in kbd) */

From fea03379d635800ca9e96f36467f80d5d5189357 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 18 Oct 2014 09:30:31 +0000
Subject: [PATCH 1295/2016] nixos: add /share/doc and /share/nano (for
 symmetry) to environment.pathsToLink

and sort all of them
---
 nixos/modules/config/system-path.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index d7979593f40..ec112b63b2f 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -105,12 +105,14 @@ in
         "/lib"
         "/man"
         "/sbin"
+        "/share/doc"
         "/share/emacs"
-        "/share/vim-plugins"
-        "/share/org"
         "/share/info"
-        "/share/terminfo"
         "/share/man"
+        "/share/nano"
+        "/share/org"
+        "/share/terminfo"
+        "/share/vim-plugins"
       ];
 
     system.path = pkgs.buildEnv {

From c6256c0e3e4292080b8574a483bdfce4b7d81b5f Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 17 Aug 2015 16:04:16 +0000
Subject: [PATCH 1296/2016] nixos: generate infodirs directly in system-path

`man 1 info` says:

   The first non-option argument, if present, is the menu entry to
   start from; it is searched for in all `dir' files along INFOPATH.
   If it is not present, info merges all `dir' files and shows the
   result. Any remaining arguments are treated as the names of menu
   items relative to the initial node visited.

Which means that this does what previous programs/info did and #8519
(on-the-fly infodir generation for Emacs) wanted to do, but for both
programs.
---
 nixos/modules/config/system-path.nix |  8 ++++++
 nixos/modules/module-list.nix        |  1 -
 nixos/modules/programs/info.nix      | 38 ----------------------------
 3 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 nixos/modules/programs/info.nix

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index ec112b63b2f..3a9a09ee87c 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -45,6 +45,7 @@ let
       pkgs.strace
       pkgs.su
       pkgs.time
+      pkgs.texinfoInteractive
       pkgs.utillinux
       extraManpages
     ];
@@ -138,6 +139,13 @@ in
           if [ -x $out/bin/update-desktop-database -a -w $out/share/applications ]; then
               $out/bin/update-desktop-database $out/share/applications
           fi
+
+          if [ -x $out/bin/install-info -a -w $out/share/info ]; then
+            shopt -s nullglob
+            for i in $out/share/info/*.info $out/share/info/*.info.gz; do
+                $out/bin/install-info $i $out/share/info/dir
+            done
+          fi
         '';
     };
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 733f3c5d853..6586b36968a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -61,7 +61,6 @@
   ./programs/command-not-found/command-not-found.nix
   ./programs/dconf.nix
   ./programs/environment.nix
-  ./programs/info.nix
   ./programs/ibus.nix
   ./programs/kbdlight.nix
   ./programs/light.nix
diff --git a/nixos/modules/programs/info.nix b/nixos/modules/programs/info.nix
deleted file mode 100644
index 253f9e87769..00000000000
--- a/nixos/modules/programs/info.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{config, pkgs, ...}:
-
-let
-
-  texinfo = pkgs.texinfoInteractive;
-
-  # Quick hack to make the `info' command work properly.  `info' needs
-  # a "dir" file containing all the installed Info files, which we
-  # don't have (it would be impure to have a package installation
-  # update some global "dir" file).  So this wrapper script around
-  # "info" builds a temporary "dir" file on the fly.  This is a bit
-  # slow (on a cold cache) but not unacceptably so.
-  infoWrapper = pkgs.writeScriptBin "info"
-    ''
-      #! ${pkgs.stdenv.shell}
-
-      dir=$(mktemp --tmpdir -d "info.dir.XXXXXX")
-
-      if test -z "$dir"; then exit 1; fi
-
-      trap 'rm -rf "$dir"' EXIT
-
-      shopt -s nullglob
-
-      for i in $(IFS=:; echo $INFOPATH); do
-          for j in $i/*.info; do
-              ${texinfo}/bin/install-info --quiet $j $dir/dir
-          done
-      done
-
-      INFOPATH=$dir:$INFOPATH ${texinfo}/bin/info "$@"
-    ''; # */
-
-in
-
-{
-  environment.systemPackages = [ infoWrapper texinfo ];
-}

From 1fbbeff0c1dad2c524d793a8c5e9a20659277504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Aug 2015 20:58:19 +0200
Subject: [PATCH 1297/2016] glibc: apply four security fixes from upstream

Fixes CVE-2014-8121, CVE-2015-1781 and two unnumbered problems (apparently).
All these commits should be contained in the 2.22 release,
but we don't want that yet due to unresolved locale incompatibilites.
---
 pkgs/development/libraries/glibc/common.nix   |   5 +
 .../libraries/glibc/cve-2014-8121.patch       | 230 ++++++++++++++++++
 .../libraries/glibc/cve-2015-1781.patch       |  27 ++
 .../libraries/glibc/security-4a28f4d5.patch   |  53 ++++
 .../libraries/glibc/security-bdf1ff05.patch   |  39 +++
 5 files changed, 354 insertions(+)
 create mode 100644 pkgs/development/libraries/glibc/cve-2014-8121.patch
 create mode 100644 pkgs/development/libraries/glibc/cve-2015-1781.patch
 create mode 100644 pkgs/development/libraries/glibc/security-4a28f4d5.patch
 create mode 100644 pkgs/development/libraries/glibc/security-bdf1ff05.patch

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 9a451d48cbc..cf356ccefbe 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -56,6 +56,11 @@ stdenv.mkDerivation ({
          "/bin:/usr/bin", which is inappropriate on NixOS machines. This
          patch extends the search path by "/run/current-system/sw/bin". */
       ./fix_path_attribute_in_getconf.patch
+
+      ./security-4a28f4d5.patch
+      ./security-bdf1ff05.patch
+      ./cve-2014-8121.patch
+      ./cve-2015-1781.patch
     ];
 
   postPatch =
diff --git a/pkgs/development/libraries/glibc/cve-2014-8121.patch b/pkgs/development/libraries/glibc/cve-2014-8121.patch
new file mode 100644
index 00000000000..95a86259dba
--- /dev/null
+++ b/pkgs/development/libraries/glibc/cve-2014-8121.patch
@@ -0,0 +1,230 @@
+From 03d2730b44cc2236318fd978afa2651753666c55 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Wed, 29 Apr 2015 14:41:25 +0200
+Subject: [PATCH] CVE-2014-8121: Do not close NSS files database during
+ iteration [BZ #18007]
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Robin Hack discovered Samba would enter an infinite loop processing
+certain quota-related requests.  We eventually tracked this down to a
+glibc issue.
+
+Running a (simplified) test case under strace shows that /etc/passwd
+is continuously opened and closed:
+
+…
+open("/etc/passwd", O_RDONLY|O_CLOEXEC) = 3
+lseek(3, 0, SEEK_CUR)                   = 0
+read(3, "root:x:0:0:root:/root:/bin/bash\n"..., 4096) = 2717
+lseek(3, 2717, SEEK_SET)                = 2717
+close(3)                                = 0
+open("/etc/passwd", O_RDONLY|O_CLOEXEC) = 3
+lseek(3, 0, SEEK_CUR)                   = 0
+lseek(3, 0, SEEK_SET)                   = 0
+read(3, "root:x:0:0:root:/root:/bin/bash\n"..., 4096) = 2717
+lseek(3, 2717, SEEK_SET)                = 2717
+close(3)                                = 0
+open("/etc/passwd", O_RDONLY|O_CLOEXEC) = 3
+lseek(3, 0, SEEK_CUR)                   = 0
+…
+
+The lookup function implementation in
+nss/nss_files/files-XXX.c:DB_LOOKUP has code to prevent that.  It is
+supposed skip closing the input file if it was already open.
+
+  /* Reset file pointer to beginning or open file.  */			      \
+  status = internal_setent (keep_stream);				      \
+									      \
+  if (status == NSS_STATUS_SUCCESS)					      \
+    {									      \
+      /* Tell getent function that we have repositioned the file pointer.  */ \
+      last_use = getby;							      \
+									      \
+      while ((status = internal_getent (result, buffer, buflen, errnop	      \
+					H_ERRNO_ARG EXTRA_ARGS_VALUE))	      \
+	     == NSS_STATUS_SUCCESS)					      \
+	{ break_if_match }						      \
+									      \
+      if (! keep_stream)						      \
+	internal_endent ();						      \
+    }									      \
+
+keep_stream is initialized from the stayopen flag in internal_setent.
+internal_setent is called from the set*ent implementation as:
+
+  status = internal_setent (stayopen);
+
+However, for non-host database, this flag is always 0, per the
+STAYOPEN magic in nss/getXXent_r.c.
+
+Thus, the fix is this:
+
+-  status = internal_setent (stayopen);
++  status = internal_setent (1);
+
+This is not a behavioral change even for the hosts database (where the
+application can specify the stayopen flag) because with a call to
+sethostent(0), the file handle is still not closed in the
+implementation of gethostent.
+---
+ ChangeLog                 |   8 ++++
+ NEWS                      |  12 +++--
+ nss/Makefile              |   2 +-
+ nss/nss_files/files-XXX.c |   2 +-
+ nss/tst-nss-getpwent.c    | 118 ++++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 136 insertions(+), 6 deletions(-)
+ create mode 100644 nss/tst-nss-getpwent.c
+
+diff --git a/nss/Makefile b/nss/Makefile
+index d75dad2..65ab7b5 100644
+--- a/nss/Makefile
++++ b/nss/Makefile
+@@ -47,7 +47,7 @@ install-bin             := getent makedb
+ makedb-modules = xmalloc hash-string
+ extra-objs		+= $(makedb-modules:=.o)
+ 
+-tests			= test-netdb tst-nss-test1 test-digits-dots
++tests			= test-netdb tst-nss-test1 test-digits-dots tst-nss-getpwent
+ xtests			= bug-erange
+ 
+ # Specify rules for the nss_* modules.  We have some services.
+diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
+index a7a45e5..a7ce5ea 100644
+--- a/nss/nss_files/files-XXX.c
++++ b/nss/nss_files/files-XXX.c
+@@ -134,7 +134,7 @@ CONCAT(_nss_files_set,ENTNAME) (int stayopen)
+ 
+   __libc_lock_lock (lock);
+ 
+-  status = internal_setent (stayopen);
++  status = internal_setent (1);
+ 
+   if (status == NSS_STATUS_SUCCESS && fgetpos (stream, &position) < 0)
+     {
+diff --git a/nss/tst-nss-getpwent.c b/nss/tst-nss-getpwent.c
+new file mode 100644
+index 0000000..f2e8abc
+--- /dev/null
++++ b/nss/tst-nss-getpwent.c
+@@ -0,0 +1,118 @@
++/* Copyright (C) 2015 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <pwd.h>
++#include <stdbool.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++int
++do_test (void)
++{
++  /* Count the number of entries in the password database, and fetch
++     data from the first and last entries.  */
++  size_t count = 0;
++  struct passwd * pw;
++  char *first_name = NULL;
++  uid_t first_uid = 0;
++  char *last_name = NULL;
++  uid_t last_uid = 0;
++  setpwent ();
++  while ((pw  = getpwent ()) != NULL)
++    {
++      if (first_name == NULL)
++	{
++	  first_name = strdup (pw->pw_name);
++	  if (first_name == NULL)
++	    {
++	      printf ("strdup: %m\n");
++	      return 1;
++	    }
++	  first_uid = pw->pw_uid;
++	}
++
++      free (last_name);
++      last_name = strdup (pw->pw_name);
++      if (last_name == NULL)
++	{
++	  printf ("strdup: %m\n");
++	  return 1;
++	}
++      last_uid = pw->pw_uid;
++      ++count;
++    }
++  endpwent ();
++
++  if (count == 0)
++    {
++      printf ("No entries in the password database.\n");
++      return 0;
++    }
++
++  /* Try again, this time interleaving with name-based and UID-based
++     lookup operations.  The counts do not match if the interleaved
++     lookups affected the enumeration.  */
++  size_t new_count = 0;
++  setpwent ();
++  while ((pw  = getpwent ()) != NULL)
++    {
++      if (new_count == count)
++	{
++	  printf ("Additional entry in the password database.\n");
++	  return 1;
++	}
++      ++new_count;
++      struct passwd *pw2 = getpwnam (first_name);
++      if (pw2 == NULL)
++	{
++	  printf ("getpwnam (%s) failed: %m\n", first_name);
++	  return 1;
++	}
++      pw2 = getpwnam (last_name);
++      if (pw2 == NULL)
++	{
++	  printf ("getpwnam (%s) failed: %m\n", last_name);
++	  return 1;
++	}
++      pw2 = getpwuid (first_uid);
++      if (pw2 == NULL)
++	{
++	  printf ("getpwuid (%llu) failed: %m\n",
++		  (unsigned long long) first_uid);
++	  return 1;
++	}
++      pw2 = getpwuid (last_uid);
++      if (pw2 == NULL)
++	{
++	  printf ("getpwuid (%llu) failed: %m\n",
++		  (unsigned long long) last_uid);
++	  return 1;
++	}
++    }
++  endpwent ();
++  if (new_count < count)
++    {
++      printf ("Missing entry in the password database.\n");
++      return 1;
++    }
++
++  return 0;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+
diff --git a/pkgs/development/libraries/glibc/cve-2015-1781.patch b/pkgs/development/libraries/glibc/cve-2015-1781.patch
new file mode 100644
index 00000000000..6831d5ac742
--- /dev/null
+++ b/pkgs/development/libraries/glibc/cve-2015-1781.patch
@@ -0,0 +1,27 @@
+From 2959eda9272a033863c271aff62095abd01bd4e3 Mon Sep 17 00:00:00 2001
+From: Arjun Shankar <arjun.is@lostca.se>
+Date: Tue, 21 Apr 2015 14:06:31 +0200
+Subject: [PATCH] CVE-2015-1781: resolv/nss_dns/dns-host.c buffer overflow
+ [BZ#18287]
+
+---
+ ChangeLog                 | 6 ++++++
+ NEWS                      | 9 ++++++++-
+ resolv/nss_dns/dns-host.c | 3 ++-
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
+index b16b0dd..d8c5579 100644
+--- a/resolv/nss_dns/dns-host.c
++++ b/resolv/nss_dns/dns-host.c
+@@ -615,7 +615,8 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
+   int have_to_map = 0;
+   uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data);
+   buffer += pad;
+-  if (__glibc_unlikely (buflen < sizeof (struct host_data) + pad))
++  buflen = buflen > pad ? buflen - pad : 0;
++  if (__glibc_unlikely (buflen < sizeof (struct host_data)))
+     {
+       /* The buffer is too small.  */
+     too_small:
+
diff --git a/pkgs/development/libraries/glibc/security-4a28f4d5.patch b/pkgs/development/libraries/glibc/security-4a28f4d5.patch
new file mode 100644
index 00000000000..25f994d859c
--- /dev/null
+++ b/pkgs/development/libraries/glibc/security-4a28f4d5.patch
@@ -0,0 +1,53 @@
+From 4a28f4d55a6cc33474c0792fe93b5942d81bf185 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Thu, 26 Feb 2015 14:55:24 +0100
+Subject: [PATCH] Fix read past end of pattern in fnmatch (bug 18032)
+
+---
+ ChangeLog            | 7 +++++++
+ NEWS                 | 2 +-
+ posix/fnmatch_loop.c | 5 ++---
+ posix/tst-fnmatch3.c | 8 +++++---
+ 4 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c
+index c0cb2fc..72c5d8f 100644
+--- a/posix/fnmatch_loop.c
++++ b/posix/fnmatch_loop.c
+@@ -945,14 +945,13 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends, alloca_used)
+ 		  }
+ 		else if (c == L('[') && *p == L('.'))
+ 		  {
+-		    ++p;
+ 		    while (1)
+ 		      {
+ 			c = *++p;
+-			if (c == '\0')
++			if (c == L('\0'))
+ 			  return FNM_NOMATCH;
+ 
+-			if (*p == L('.') && p[1] == L(']'))
++			if (c == L('.') && p[1] == L(']'))
+ 			  break;
+ 		      }
+ 		    p += 2;
+diff --git a/posix/tst-fnmatch3.c b/posix/tst-fnmatch3.c
+index d27a557..75bc00a 100644
+--- a/posix/tst-fnmatch3.c
++++ b/posix/tst-fnmatch3.c
+@@ -21,9 +21,11 @@
+ int
+ do_test (void)
+ {
+-  const char *pattern = "[[:alpha:]'[:alpha:]\0]";
+-
+-  return fnmatch (pattern, "a", 0) != FNM_NOMATCH;
++  if (fnmatch ("[[:alpha:]'[:alpha:]\0]", "a", 0) != FNM_NOMATCH)
++    return 1;
++  if (fnmatch ("[a[.\0.]]", "a", 0) != FNM_NOMATCH)
++    return 1;
++  return 0;
+ }
+ 
+ #define TEST_FUNCTION do_test ()
+
diff --git a/pkgs/development/libraries/glibc/security-bdf1ff05.patch b/pkgs/development/libraries/glibc/security-bdf1ff05.patch
new file mode 100644
index 00000000000..b4175694f91
--- /dev/null
+++ b/pkgs/development/libraries/glibc/security-bdf1ff05.patch
@@ -0,0 +1,39 @@
+From bdf1ff052a8e23d637f2c838fa5642d78fcedc33 Mon Sep 17 00:00:00 2001
+From: Paul Pluzhnikov <ppluzhnikov@google.com>
+Date: Sun, 22 Feb 2015 12:01:47 -0800
+Subject: [PATCH] Fix BZ #17269 -- _IO_wstr_overflow integer overflow
+
+---
+ ChangeLog       | 6 ++++++
+ NEWS            | 6 +++---
+ libio/wstrops.c | 8 +++++++-
+ 3 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/libio/wstrops.c b/libio/wstrops.c
+index 43d847d..3993579 100644
+--- a/libio/wstrops.c
++++ b/libio/wstrops.c
+@@ -95,8 +95,11 @@ _IO_wstr_overflow (fp, c)
+ 	  wchar_t *old_buf = fp->_wide_data->_IO_buf_base;
+ 	  size_t old_wblen = _IO_wblen (fp);
+ 	  _IO_size_t new_size = 2 * old_wblen + 100;
+-	  if (new_size < old_wblen)
++
++	  if (__glibc_unlikely (new_size < old_wblen)
++	      || __glibc_unlikely (new_size > SIZE_MAX / sizeof (wchar_t)))
+ 	    return EOF;
++
+ 	  new_buf
+ 	    = (wchar_t *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (new_size
+ 									* sizeof (wchar_t));
+@@ -186,6 +189,9 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)
+     return 1;
+ 
+   _IO_size_t newsize = offset + 100;
++  if (__glibc_unlikely (newsize > SIZE_MAX / sizeof (wchar_t)))
++    return 1;
++
+   wchar_t *oldbuf = wd->_IO_buf_base;
+   wchar_t *newbuf
+     = (wchar_t *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (newsize
+

From 4cc5be347ad839d7ca6ccf8875c055b9d143f90d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Aug 2015 15:03:51 +0200
Subject: [PATCH 1298/2016] haskell-configuration-ghc-head: update obsolete
 jailbreak-cabal override

---
 .../configuration-ghc-head.nix                | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 0eff5705805..c8b6f33d847 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -34,11 +34,22 @@ self: super: {
   xhtml = null;
 
   # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
-  jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal;
-
-  # GHC 7.10.x's Haddock binary cannot generate hoogle files.
-  # https://ghc.haskell.org/trac/ghc/ticket/9921
-  mkDerivation = drv: super.mkDerivation (drv // { doHoogle = false; });
+  Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: {
+    version = "1.23.0.0";
+    src = pkgs.fetchFromGitHub {
+      owner = "haskell";
+      repo = "cabal";
+      rev = "fe7b8784ac0a5848974066bdab76ce376ba67277";
+      sha256 = "1d70ryz1l49pkr70g8r9ysqyg1rnx84wwzx8hsg6vwnmg0l5am7s";
+    };
+    jailbreak = false;
+    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";
+  });
 
   # haddock: No input file(s).
   nats = dontHaddock super.nats;

From 7e80417fa84d762ccd6b79c92482469973e7a62f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 18 Aug 2015 21:28:33 +0200
Subject: [PATCH 1299/2016] coq-QuickChick: 21f50a02 -> 20150605

---
 pkgs/development/coq-modules/QuickChick/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 9141bfd24d1..3e7731d4d94 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -1,18 +1,20 @@
 {stdenv, fetchgit, coq, coqPackages}:
 
+let revision = "b73a594af5460567dc233b2f2e7b0f781ae0490d"; in
+
 stdenv.mkDerivation rec {
 
   name = "coq-QuickChick-${coq.coq-version}-${version}";
-  version = "21f50a02";
+  version = "20150605-${builtins.substring 0 7 revision}";
 
   src = fetchgit {
     url = git://github.com/QuickChick/QuickChick.git;
-    rev = "21f50a02e752f6d99d5bfefefcd2ad45df5e778a";
-    sha256 = "15hsirm443cr098hksfcg3nbjm9mdnmxzpz61qq7ap7lglabl7pw";
+    rev = revision;
+    sha256 = "1yql40x1zbrc6wzfafvfaxzhw57v1n468lxdv1rvsjd7gyyf74y7";
   };
 
-  buildInputs = [ coq.ocaml coq.camlp5 coqPackages.ssreflect ];
-  propagatedBuildInputs = [ coq ];
+  buildInputs = [ coq.ocaml coq.camlp5 ];
+  propagatedBuildInputs = [ coq coqPackages.ssreflect ];
 
   enableParallelBuilding = true;
 

From 15a6f0ba7b398d13fe42b5cbeabe17851ee10918 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 12:35:51 -0700
Subject: [PATCH 1300/2016] openldap: Fix hash

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

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 073cbbcddd3..83c65048227 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
-    sha256 = "0qwfpb5ipp2l76v11arghq5mr0sjc6xhjfg8a0kgsaw5qpib1dzft";
+    sha256 = "0qwfpb5ipp2l76v11arghq5mr0sjc6xhjfg8a0kgsaw5qpib1dzf";
   };
 
   outputs = [ "out" "man" ];

From d8487667cfe3f83f857b45d4927a19d9181b7f4c Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 17 Aug 2015 19:45:13 +0000
Subject: [PATCH 1301/2016] haskell-packages: bring hoogle to the masses by
 imlementing ghcWithHoogle

Replace `ghcWithPackages` to `ghcWithHoogle` in your config and enjoy.
---
 pkgs/development/haskell-modules/default.nix | 23 +++++++++++++++-----
 pkgs/development/haskell-modules/hoogle.nix  |  4 ++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index ab3ac6930b9..7e6f1c0552d 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -47,18 +47,29 @@ let
       defaultScope = mkScope self;
       callPackage = drv: args: callPackageWithScope defaultScope drv args;
 
+      withPackages = packages: callPackage ./with-packages-wrapper.nix {
+        inherit (self) llvmPackages;
+        haskellPackages = self;
+        inherit packages;
+      };
+
     in
       import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // {
 
         inherit mkDerivation callPackage;
 
-        ghcWithPackages = pkgs: callPackage ./with-packages-wrapper.nix {
-          inherit (self) llvmPackages;
-          haskellPackages = self;
-          packages = pkgs self;
-        };
+        ghcWithPackages = selectFrom: withPackages (selectFrom self);
 
-        ghc = ghc // { withPackages = self.ghcWithPackages; };
+        ghcWithHoogle = selectFrom:
+          let
+            packages = selectFrom self;
+            hoogle = callPackage ./hoogle.nix { inherit packages; };
+          in withPackages (packages ++ [ hoogle ]);
+
+        ghc = ghc // {
+          withPackages = self.ghcWithPackages;
+          withHoogle = self.ghcWithHoogle;
+        };
 
       };
 
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 822c2bdd82e..89e9b157e68 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -98,6 +98,10 @@ stdenv.mkDerivation {
     chmod +x $out/bin/hoogle
   '';
 
+  passthru = {
+    isHaskellLibrary = false; # for the filter in ./with-packages-wrapper.nix
+  };
+
   meta = {
     description = "A local Hoogle database";
     platforms = ghc.meta.platforms;

From 00137438459949bfbd2c0311e8664a9da8bb1e53 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 17 Aug 2015 23:55:04 +0000
Subject: [PATCH 1302/2016] haskell-packages: make hoogle wrapper much more
 helpful

* Build most of the stuff on /tmp, not in /nix/store.
* Generate hoogle database for all the dependencies.
* Generate haddock index and contents files.
* Cleanup.
---
 .../haskell-modules/hoogle-local-wrapper.sh   |  3 +-
 pkgs/development/haskell-modules/hoogle.nix   | 62 ++++++++++++-------
 pkgs/development/haskell-modules/lib.nix      |  1 +
 3 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
index 13ea889119c..471b2c81584 100644
--- a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
+++ b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
@@ -2,5 +2,4 @@
 
 COMMAND=$1
 shift
-HOOGLE_DOC_PATH=@out@/share/hoogle/doc exec @hoogle@/bin/hoogle \
-    "$COMMAND" -d @out@/share/hoogle "$@"
+exec @hoogle@/bin/hoogle "$COMMAND" -d @out@/share/doc/hoogle "$@"
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 89e9b157e68..e2f6c289a80 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -23,7 +23,7 @@
 # This will build mmorph and monadControl, and have the hoogle installation
 # refer to their documentation via symlink so they are not garbage collected.
 
-{ stdenv, hoogle, rehoo
+{ lib, stdenv, hoogle, rehoo
 , ghc, packages ? [ ghc.ghc ]
 }:
 
@@ -35,62 +35,76 @@ stdenv.mkDerivation {
   name = "hoogle-local-0.1";
   buildInputs = [hoogle rehoo];
 
-  phases = [ "installPhase" ];
+  phases = [ "buildPhase" ];
 
-  docPackages = packages;
-  installPhase = ''
+  docPackages = (lib.closePropagation packages);
+
+  buildPhase = ''
     if [ -z "$docPackages" ]; then
         echo "ERROR: The packages attribute has not been set"
         exit 1
     fi
 
-    mkdir -p $out/share/hoogle/doc
-    export HOOGLE_DOC_PATH=$out/share/hoogle/doc
-
-    cd $out/share/hoogle
+    mkdir -p $out/share/doc/hoogle
 
     function import_dbs() {
         find $1 -name '*.txt' | while read f; do
           newname=$(basename "$f" | tr '[:upper:]' '[:lower:]')
           if [[ -f $f && ! -f ./$newname ]]; then
-            cp -p $f ./$newname
+            cp -p $f "./$newname"
             hoogle convert -d "$(dirname $f)" "./$newname"
           fi
         done
     }
 
-    for i in $docPackages; do
-        findInputs $i docPackages propagated-native-build-inputs
-        findInputs $i docPackages propagated-build-inputs
+    echo importing builtin packages
+    for docdir in ${ghc}/share/doc/ghc*/html/libraries/*; do
+      if [[ -d $docdir ]]; then
+        import_dbs $docdir
+        ln -sfn $docdir $out/share/doc/hoogle
+      fi
     done
 
+    echo importing other packages
     for i in $docPackages; do
       if [[ ! $i == $out ]]; then
         for docdir in $i/share/doc/*-ghc-*/* $i/share/doc/*; do
+          name=`basename $docdir`
+          docdir=$docdir/html
           if [[ -d $docdir ]]; then
             import_dbs $docdir
-            ln -sf $docdir $out/share/hoogle/doc
+            ln -sfn $docdir $out/share/doc/hoogle/$name
           fi
         done
       fi
     done
 
-    import_dbs ${ghc}/share/doc/ghc*/html/libraries
-    ln -sf ${ghc}/share/doc/ghc*/html/libraries/* $out/share/hoogle/doc
-
+    echo building hoogle database
+    # FIXME: rehoo is marked as depricated on Hackage
     chmod 644 *.hoo *.txt
     rehoo -j4 -c64 .
 
-    rm -fr downloads *.dep *.txt
-    mv default.hoo x || exit 0
-    rm -f *.hoo
-    mv x default.hoo || exit 1
+    mv default.hoo .x
+    rm -fr downloads *.dep *.txt *.hoo
+    mv .x $out/share/doc/hoogle/default.hoo
 
-    if [ ! -f default.hoo ]; then
-        echo "Unable to build the default Hoogle database"
-        exit 1
-    fi
+    echo building haddock index
+    # adapted from GHC's gen_contents_index
+    cd $out/share/doc/hoogle
 
+    args=
+    for hdfile in `ls -1 */*.haddock | grep -v '/ghc\.haddock' | sort`
+    do
+        name_version=`echo "$hdfile" | sed 's#/.*##'`
+        args="$args --read-interface=$name_version,$hdfile"
+    done
+
+    ${ghc}/bin/haddock --gen-index --gen-contents -o . \
+         -t "Haskell Hierarchical Libraries" \
+         -p ${ghc}/share/doc/ghc*/html/libraries/prologue.txt \
+         $args
+
+    echo finishing up
     mkdir -p $out/bin
     substitute ${wrapper} $out/bin/hoogle \
         --subst-var out --subst-var-by shell ${stdenv.shell} \
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 526bb5c3248..9f9eba0675d 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -85,6 +85,7 @@ rec {
   withHoogle = haskellEnv: with haskellEnv.haskellPackages;
     import ./hoogle.nix {
       inherit (pkgs) stdenv;
+      inherit (pkgs.stdenv) lib;
       inherit hoogle rehoo ghc;
       packages = haskellEnv.paths;
     };

From c80af74a84b4286cc7869abbe85197f9d9f8cc24 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 18 Aug 2015 17:01:07 +0000
Subject: [PATCH 1303/2016] haskell-packages: throw withHoogle away from the
 lib

---
 pkgs/development/haskell-modules/lib.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 9f9eba0675d..5b2ba44d86d 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -82,11 +82,6 @@ rec {
 
   triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
 
-  withHoogle = haskellEnv: with haskellEnv.haskellPackages;
-    import ./hoogle.nix {
-      inherit (pkgs) stdenv;
-      inherit (pkgs.stdenv) lib;
-      inherit hoogle rehoo ghc;
-      packages = haskellEnv.paths;
-    };
+  #FIXME: throw this away sometime in the future. added 2015-08-18
+  withHoogle = throw "withHoogle is no longer supported, use ghcWithHoogle instead";
 }

From 848c1a72b2ab1912bce19d06a750920afbe99df4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 18 Aug 2015 23:02:35 +0200
Subject: [PATCH 1304/2016] gnome-control-center: don't add sounds to userEnv

It's not needed after all.

See discussion at https://github.com/NixOS/nixpkgs/pull/9308.
---
 .../gnome-3/3.16/core/gnome-control-center/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index edd35202314..0f95f322d13 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedUserEnvPkgs =
-    [ gnome3.gnome_themes_standard gnome3.libgnomekbd sound-theme-freedesktop ];
+    [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=752596
   enableParallelBuilding = false;
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   preFixup = with gnome3; ''
     wrapProgram $out/bin/gnome-control-center \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
     for i in $out/share/applications/*; do
       substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
     done

From 69367e4ebcacd65b8e4fce52c80c7d6bda20c404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 18 Aug 2015 23:21:07 +0200
Subject: [PATCH 1305/2016] blender: unbreak cudaSupport

Currently it errors out at build time with:

/nix/store/HASH-cudatoolkit-6.5.19/usr_include/host_config.h:82:2:
  error: #error -- unsupported GNU version! gcc 4.9 and up are not supported!

Instead of downgrading gcc to 4.8, this patch upgrades cuda to 7.0, which
I think is the better choice. (Cuda 7 dropped support for some older graphics
cards, but gained support for newer ones.)
---
 pkgs/applications/misc/blender/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 01299dc671d..1ccc2032284 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -3,7 +3,7 @@
 , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
 , zlib, fftw
 , jackaudioSupport ? false, libjack2
-, cudaSupport ? false, cudatoolkit65
+, cudaSupport ? false, cudatoolkit7
 , colladaSupport ? true, opencollada
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       opencolorio openexr openimageio /* openjpeg */ python zlib fftw
     ]
     ++ optional jackaudioSupport libjack2
-    ++ optional cudaSupport cudatoolkit65
+    ++ optional cudaSupport cudatoolkit7
     ++ optional colladaSupport opencollada;
 
   postUnpack =

From 2d40eecedafccf891625bafffff21206becb7c6c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 14:44:58 -0700
Subject: [PATCH 1306/2016] ceph-git: 2015-08-07 -> 2015-08-18

---
 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 c71ad134222..77d0352f670 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-08-07";
+  version = "2015-08-18";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "dcd6e96495d949066962d1c7e18a9d4188b0fa37";
-    sha256 = "1w62xfbcdx2q5wjz2bqlhn4bb1iag8xyhgjc2nklqk7py9lif16m";
+    rev = "cf8a360cd1e3937aa1ac74fbf39790b7fb43e71f";
+    sha256 = "0d8vlxap800x8gil16124nb4yvfqb5wa3pk09knrikmmwia49k9v";
   };
 
   patches = [ ./fix-pythonpath.patch ];

From 56d6a3d846ebc8c87cfabafa1e549298f3103df0 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 18 Aug 2015 23:52:12 +0200
Subject: [PATCH 1307/2016] aria2: Remove openssl dependency

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

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index f2809b5c7b2..0a3628d129b 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, cppunit, libgcrypt
-, c-ares, openssl, libxml2, sqlite, zlib }:
+, c-ares, libxml2, sqlite, zlib }:
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
@@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig autoreconfHook cppunit libgcrypt c-ares openssl libxml2
-    sqlite zlib
+    pkgconfig autoreconfHook cppunit libgcrypt c-ares libxml2 sqlite zlib
   ];
 
   configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ];

From f2ce6390004b3bfdd647e8f3922befd2c0924487 Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Tue, 18 Aug 2015 17:33:21 -0500
Subject: [PATCH 1308/2016] kodi: 15.0 -> 15.1

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

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 09b33099139..3fd3d31c18c 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -37,17 +37,17 @@ assert rtmpSupport  -> rtmpdump != null;
 
 let
   rel = "Isengard";
-  ffmpeg_2_6_3 = fetchurl {
-    url = "https://github.com/xbmc/FFmpeg/archive/2.6.3-${rel}.tar.gz";
-    sha256 = "129nwrj9i758vz9xakpp68sm1l7z4in0krq6ayyqnpsnm54r9xlc";
+  ffmpeg_2_6_4 = fetchurl {
+    url = "https://github.com/xbmc/FFmpeg/archive/2.6.4-${rel}.tar.gz";
+    sha256 = "0gsjz8sr0dqq68gcln29xhz3h35n77769h1gb0ias0apmpaad1r4";
   };
 in stdenv.mkDerivation rec {
     name = "kodi-" + version;
-    version = "15.0";
+    version = "15.1";
 
     src = fetchurl {
       url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
-      sha256 = "1zqdmqffjfr5219cvpbvq9v1z5p5pzi2m9xs9lzk4jz7rxrs3nr7";
+      sha256 = "0187qxzyq4nhzbcwbhi71j4bl5k7pwjryhklil90gy5ziw6n3ckj";
     };
 
     buildInputs = [
@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
         --replace 'usr/share/zoneinfo' 'etc/zoneinfo'
       substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
         --replace "/bin/bash" "${bash}/bin/bash -ex"
-      cp ${ffmpeg_2_6_3} tools/depends/target/ffmpeg/ffmpeg-2.6.3-${rel}.tar.gz
+      cp ${ffmpeg_2_6_4} tools/depends/target/ffmpeg/ffmpeg-2.6.4-${rel}.tar.gz
     '';
 
     preConfigure = ''

From ccb9acc43ea8fc3b1fdb09ab86ae270b18c23be2 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 19 Aug 2015 00:45:59 +0100
Subject: [PATCH 1309/2016] youtube-dl: update to 2015.08.16.1

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index eb337573018..de9d918deeb 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -10,17 +10,17 @@
 
 buildPythonPackage rec {
   name = "youtube-dl-${version}";
-  version = "2015.05.29";
+  version = "2015.08.16.1";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij";
+    sha256 = "04g78anvy519pj8m8ys1ifmnmp1x3i9bw3afwqjch71n9f77papy";
   };
 
   buildInputs = [ makeWrapper zip pandoc ];
 
   # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
-  postInstall = stdenv.lib.optionalString (ffmpeg != null) 
+  postInstall = stdenv.lib.optionalString (ffmpeg != null)
     ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"'';
 
   meta = with stdenv.lib; {

From 429d4beaa25313b912ba84a3b85269144abc3c5b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 17:01:13 -0700
Subject: [PATCH 1310/2016] lvm2: 2.02.124 -> 2.02.128

---
 pkgs/os-specific/linux/lvm2/default.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 1789018d414..6ddbbc9340f 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }:
 
 let
-  version = "2.02.124";
+  version = "2.02.128";
 in
 
 stdenv.mkDerivation {
@@ -9,15 +9,20 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
-    sha256 = "0myqs0ajpjmlc56vp4f66x5izhbh7wzzf3408gqnrjmikb5sr9rh";
+    sha256 = "0a5m63b729ranbnmg964b36jlbfc140bs92di37w2gq54hzp1v97";
   };
 
-  configureFlags =
-    "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib --enable-cmdlib"
-      + (stdenv.lib.optionalString enable_dmeventd " --enable-dmeventd")
-      ;
+  configureFlags = [
+    "--disable-readline"
+    "--enable-udev_rules"
+    "--enable-udev_sync"
+    "--enable-pkgconfig"
+    "--enable-applib"
+    "--enable-cmdlib"
+  ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd";
 
-  buildInputs = [ pkgconfig udev ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ udev ];
 
   preConfigure =
     ''

From ab7a1646d9bfcbb9017952fd5767ab18364b7f18 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 17:15:57 -0700
Subject: [PATCH 1311/2016] aria2: Fix ssl support and switch back to
 sourceforge

Using sourceforge gives release binaries which don't require us to
regenerate all of the autotools scripts. This removes the need for
dependencies like cppunit and libgcrypt and autoreconfHook.

cc @geerds
---
 pkgs/tools/networking/aria2/default.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 0a3628d129b..69b9dc40638 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -1,20 +1,18 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, cppunit, libgcrypt
-, c-ares, libxml2, sqlite, zlib }:
+{ stdenv, fetchurl, pkgconfig, autoreconfHook
+, openssl, c-ares, libxml2, sqlite, zlib, libssh2
+}:
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
   version = "1.19.0";
 
-  src = fetchFromGitHub {
-    owner = "tatsuhiro-t";
-    repo = "aria2";
-    rev = "release-${version}";
-    sha256 = "1k4b8jfg4wjsvybb7hysplp6h831allhiqdy9jwsyy0m0zmgk00a";
+  src = fetchurl {
+    url = "mirror://sourceforge/aria2/${name}.tar.xz";
+    sha256 = "0xm4fmap9gp2pz6z01mnnpmazw6pnhzs8qc58181m5ai4gy5ksp2";
   };
 
-  buildInputs = [
-    pkgconfig autoreconfHook cppunit libgcrypt c-ares libxml2 sqlite zlib
-  ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ];
 
   configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ];
 

From d70c01daec57187ec19dcb8d39b686d8df6b0210 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 21:06:45 -0700
Subject: [PATCH 1312/2016] grsecurity: Update patches

---
 pkgs/os-specific/linux/kernel/patches.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 79d58a539f0..b3c51dc6306 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -75,17 +75,17 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.50";
-      revision  = "201508102128";
+    { kversion  = "3.14.51";
+      revision  = "201508181951";
       branch    = "stable";
-      sha256    = "0inp0ab8pcjfj1wnrkyiwb6cxjp2ymqcjv7lq30a4ij6qcvmfb5s";
+      sha256    = "1sp1gwa7ahzflq7ayb51bg52abrn5zx1hb3pff3axpjqq7vfai6f";
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "4.1.5";
-      revision  = "201508102129";
+    { kversion  = "4.1.6";
+      revision  = "201508181953";
       branch    = "test";
-      sha256    = "1pc40xd7k0fzzd99lshy58gnapv701hjvc4bm0slfzagh241545a";
+      sha256    = "1m227k1wb1q588vkgmngcz86k0wpzan6vra67pcx2478mabm3s89";
     };
 
   grsec_fix_path =

From 13576925552b1d0751498fdda22e91a055a1ff6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 19 Aug 2015 07:25:25 +0200
Subject: [PATCH 1313/2016] blender: take unversioned cudatoolkit attr

Makes it less weird to do an override, if a user wants to use e.g. cuda
6.5 (also requires gcc 4.8).
---
 pkgs/applications/misc/blender/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 1ccc2032284..bc4c97d1f21 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -3,7 +3,7 @@
 , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
 , zlib, fftw
 , jackaudioSupport ? false, libjack2
-, cudaSupport ? false, cudatoolkit7
+, cudaSupport ? false, cudatoolkit
 , colladaSupport ? true, opencollada
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       opencolorio openexr openimageio /* openjpeg */ python zlib fftw
     ]
     ++ optional jackaudioSupport libjack2
-    ++ optional cudaSupport cudatoolkit7
+    ++ optional cudaSupport cudatoolkit
     ++ optional colladaSupport opencollada;
 
   postUnpack =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29038081ad4..47bc0bb85b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10835,6 +10835,7 @@ let
   bleachbit = callPackage ../applications/misc/bleachbit { };
 
   blender = callPackage  ../applications/misc/blender {
+    cudatoolkit = cudatoolkit7;
     python = python34;
   };
 

From 5711761622ceccc1fb2c97c965150fa8495546fc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 19 Aug 2015 00:37:19 -0700
Subject: [PATCH 1314/2016] firefox: Revert gstreamer-1.0 changes

This causes firefox to sometimes crash and hang when playing videos.
---
 pkgs/applications/networking/browsers/firefox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 2774b2c50d2..a9e4bc39f62 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -3,7 +3,7 @@
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
 , hunspell, libevent, libstartup_notification, libvpx
-, cairo, gst_all_1, icu, libpng, jemalloc
+, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc
 , enableGTK3 ? false
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
       xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
       hunspell libevent libstartup_notification libvpx cairo
-      gst_all_1.gstreamer gst_all_1.gst-plugins-base icu libpng
+      gstreamer gst_plugins_base icu libpng
       jemalloc
     ]
     ++ lib.optional enableGTK3 gtk3;
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
       "--enable-system-pixman"
       "--enable-system-sqlite"
       "--enable-system-cairo"
-      "--enable-gstreamer=1.0"
+      "--enable-gstreamer"
       "--enable-startup-notification"
       "--enable-content-sandbox"            # available since 26.0, but not much info available
       "--disable-content-sandbox-reporter"  # keeping disabled for now

From 54dee45402634e06491042edc01c377d08bb589d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Aug 2015 20:56:37 -0700
Subject: [PATCH 1315/2016] Revert "firefoxWrapper: switch to GStreamer 1.0"

This reverts commit 69269bebeb22b8ad3b099bc41169f57e29d46efe.
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +-
 pkgs/top-level/all-packages.nix                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 3e26a597256..409f7d29ba2 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
         --suffix-each LD_LIBRARY_PATH ':' "$libs" \
         --suffix-each GTK_PATH ':' "$gtk_modules" \
         --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
-        --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+        --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
         --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
         --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)"
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47bc0bb85b8..4bec3213522 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13276,10 +13276,10 @@ let
           ++ lib.optional (cfg.enableTrezor or false) trezor-bridge
           ++ lib.optional (cfg.enableBluejeans or false) bluejeans
          );
-      libs = (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optionals (cfg.enableQuakeLive or false)
+      libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
              (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
              ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash;
-      gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ];
+      gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ];
       gtk_modules = [ libcanberra ];
     };
 

From b69d119b89268f280f8d10180e8ae41c55b31209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 19 Aug 2015 10:09:44 +0200
Subject: [PATCH 1316/2016] cudatoolkit: switch the default from version 5 to 7

Version 5 doesn't build because it depends on broken/EOL'd python 2.6. Better
switch to something that works. Most users of unversioned cudatoolkit attr are
r-packages, but they are already marked as broken.

Another user is haskellPackages.cuda, it builds fine with cuda 7.
---
 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 26f1c0b0306..49c399b79c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1214,7 +1214,7 @@ let
     inherit callPackage;
   };
 
-  cudatoolkit = cudatoolkit5;
+  cudatoolkit = cudatoolkit7;
 
   curlFull = curl.override {
     idnSupport = true;

From 574e2a5f81f1d13b74c5c1a2c965eef39e4e824d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Aug 2015 18:08:33 +0200
Subject: [PATCH 1317/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/83e7ec0b3146b1cbaa05abf4e7d9b52fdf69ae55
 with hackage2nix v20150807-45-gbadda1e

---
 .../haskell-modules/hackage-packages.nix      | 690 ++++++++++--------
 1 file changed, 400 insertions(+), 290 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c0c7bac41fd..7e1975ba55c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1697,8 +1697,8 @@ self: {
      }:
      mkDerivation {
        pname = "Bookshelf";
-       version = "0.4";
-       sha256 = "361260f69f528733158f15aea84085dcc47a3d9011aef136ee271c0c2fb343c0";
+       version = "0.5";
+       sha256 = "b9437069606fadc6b4f9213588c8269e187b00f00453856c7bfabd38dfe00ca2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -5040,8 +5040,8 @@ self: {
      }:
      mkDerivation {
        pname = "FontyFruity";
-       version = "0.5.1.1";
-       sha256 = "5e4c09e6c1f21c1f1fd4ae8bc2ecad584202eef72f46b694ae536481304e8c18";
+       version = "0.5.2";
+       sha256 = "bc7c25ee36a344f31a3a99eb0f4b8cf634141897a54012276d2a821f2e01bdf4";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq directory filepath text
          vector
@@ -7120,12 +7120,16 @@ self: {
      }) {};
 
   "HMap" = callPackage
-    ({ mkDerivation, base, hashable, mtl, unordered-containers }:
+    ({ mkDerivation, base, data-default, hashable, mtl
+     , unordered-containers
+     }:
      mkDerivation {
        pname = "HMap";
-       version = "1.2.4";
-       sha256 = "23d0eda120817e17f47d9dc6ec5f9e09b52ae7322df27218509d1234a73fea20";
-       libraryHaskellDepends = [ base hashable mtl unordered-containers ];
+       version = "1.2.6";
+       sha256 = "8424dcbcb903c49d369230e2c10421daf3a2e35f3ffb5ec4058f769213769b8a";
+       libraryHaskellDepends = [
+         base data-default hashable mtl unordered-containers
+       ];
        homepage = "https://github.com/atzeus/HMap";
        description = "Fast heterogeneous maps and unconstrained typeable like functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -8049,10 +8053,8 @@ self: {
     ({ mkDerivation, base, hspec, random, transformers }:
      mkDerivation {
        pname = "Hangman";
-       version = "0.1.0.0";
-       sha256 = "98caea366753debaa6185ddf3ba3c1613a13caec64aabe9ddb917273cb28f40f";
-       revision = "1";
-       editedCabalFile = "001a10b5e54971341acc23271a48f0ef3d7bc764e380b9292580f259aab3c3c9";
+       version = "0.1.0.2";
+       sha256 = "b057343ce4b95177c01f3eec7a0c6c83190e2c0758d93bcaea437e70a1e88307";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base random transformers ];
@@ -9405,8 +9407,8 @@ self: {
      }:
      mkDerivation {
        pname = "JuicyPixels";
-       version = "3.2.5.3";
-       sha256 = "fc36f130e678119475434febcdfe75e1e083062a4729a3104cc5bdc7972cd8ce";
+       version = "3.2.6";
+       sha256 = "f99e82c84d8eeff23ba57332ed4b89530bc1a739c3a8f4b670b07ac33bfc9a46";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -16323,18 +16325,23 @@ self: {
      }) {};
 
   "X11" = callPackage
-    ({ mkDerivation, base, data-default, libX11, libXext, libXrandr }:
+    ({ mkDerivation, base, data-default, libX11, libXext, libXinerama
+     , libXrandr, libXrender
+     }:
      mkDerivation {
        pname = "X11";
        version = "1.6.1.2";
        sha256 = "5216d485f807bd53bf34fba170896a8930290a6ac28b8e611c28e751ad67f2cf";
        libraryHaskellDepends = [ base data-default ];
-       librarySystemDepends = [ libX11 libXext libXrandr ];
+       librarySystemDepends = [
+         libX11 libXext libXinerama libXrandr libXrender
+       ];
        homepage = "https://github.com/haskell-pkg-janitors/X11";
        description = "A binding to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs.xlibs) libXext;
-          inherit (pkgs.xlibs) libXrandr;};
+          inherit (pkgs.xlibs) libXinerama;  inherit (pkgs.xlibs) libXrandr;
+          inherit (pkgs.xlibs) libXrender;};
 
   "X11-extras" = callPackage
     ({ mkDerivation, base, libX11, X11 }:
@@ -18873,8 +18880,8 @@ self: {
     ({ mkDerivation, base, c2hs, mtl, openal }:
      mkDerivation {
        pname = "al";
-       version = "0.1.4";
-       sha256 = "383c8f52248dc59ad9866eb2ffce167999a8fb91dd7ed5a2dc32500ddd0127cb";
+       version = "0.1.4.1";
+       sha256 = "30e58c4459630e669c1029afe845f5fa9e33b140fc4983f5d086cec41850b3d6";
        libraryHaskellDepends = [ base mtl ];
        libraryPkgconfigDepends = [ openal ];
        libraryToolDepends = [ c2hs ];
@@ -19492,8 +19499,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "1.0.0";
-       sha256 = "6d774924eacb7f958a45660255894b815aef015c6668d8b3f40c4154ea339533";
+       version = "1.0.1";
+       sha256 = "36583da0607497b69668bc9100373031d24cc64eb467e06676b409358d4c061a";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
          exceptions free http-client http-conduit ini lens mmorph
@@ -19512,8 +19519,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "1.0.0";
-       sha256 = "35f259716332837cae24f32580bb8c59682cabb7fbedf1a0d3e01bf38a4fa8c8";
+       version = "1.0.1";
+       sha256 = "a74e6157a99285f556edb546ea1876507b197b1392bebcdf5f7d0ac4e418d702";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19532,8 +19539,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "1.0.0";
-       sha256 = "6729b14e427f33ac75f05b23cb6bed59e6f1960e9bcc84adfe90ea911809a047";
+       version = "1.0.1";
+       sha256 = "b09f594282e3e5fc13b0de3cd4f562ba9c9bfec96973d5aeba334f32a5f88fe6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19552,8 +19559,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "1.0.0";
-       sha256 = "fe77d79cf0e230df4082056a40a68a66f4ad04dd2ebd6c747994146420c384bf";
+       version = "1.0.1";
+       sha256 = "82e0d72534717397395a2109af59725b86bb9361610b1143e7bac58b7ff1c948";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19572,8 +19579,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "1.0.0";
-       sha256 = "65fb9f1b72ee5131fae219afa409e1a355e743ab87eb055c863a8374b67f6b8e";
+       version = "1.0.1";
+       sha256 = "88be89b5bacd848704f28ecf0544e6d9dfffa05f67e3f9317d64b17ec2caaac9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19592,8 +19599,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "1.0.0";
-       sha256 = "a0785561ff3ecbba2f04899635ffcaf3264a0554018dd4c6b0e396cfaa4d7ed3";
+       version = "1.0.1";
+       sha256 = "9476d436b0ea895edc0aa3b0ee36458cfeea35faaee8e5b9fcc653ee5c47f027";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19612,8 +19619,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "1.0.0";
-       sha256 = "38de7c58b7b9924029307177f0da27bf6719b43c6006c773c075369ee944cb86";
+       version = "1.0.1";
+       sha256 = "b2dd61ab239b00e884be45b305f5587ec66dbe031c4d65f93d00f297eb4400c5";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19632,8 +19639,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "1.0.0";
-       sha256 = "16b56b6761bfeaf410ab5f6a786de75355752804d52761e30171e08818e41b3d";
+       version = "1.0.1";
+       sha256 = "c4aedc71e6d8d18befcd90573c664a859d6a5952711512b57eba596726ddcff9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19652,8 +19659,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "1.0.0";
-       sha256 = "dba8fc034548f8fad9ee77b1d6e69d056582e25282054061d91749c8f5d57ebc";
+       version = "1.0.1";
+       sha256 = "5562fb8ffbd5485091b7f0a8a1b6d4ab533371804341dd352c6de97fe8297233";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19672,8 +19679,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "1.0.0";
-       sha256 = "917a8c1f9cd9138396794d57a399e1e698b1a1f1b64581b886efd540e93b7ff3";
+       version = "1.0.1";
+       sha256 = "c8d16042fb42fe562a754467d3f3be13ab1dc7c862d5dd6467864fd9cdc5b551";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19692,8 +19699,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codecommit";
-       version = "1.0.0";
-       sha256 = "3edfe5808d2249c8f674729614e3a12d0d0320c3c6f0c1ca563495e0d1f803f5";
+       version = "1.0.1";
+       sha256 = "a930435da46193d2a8a648fbe0d741f009b3c524127a60989740cb46e692013e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19712,8 +19719,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "1.0.0";
-       sha256 = "1e4a475d8d5ae6a7474359721e8e76fa7e25224406fd7ce6f9ea0a59c1a0d8f7";
+       version = "1.0.1";
+       sha256 = "77be78235ebefc1f1f08a7db8b800bcd06a7dafe37c5f69413543f08926628c1";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19732,8 +19739,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codepipeline";
-       version = "1.0.0";
-       sha256 = "64f1e64f804ef615957d1aba9960c8c5816b5dfd6581b313fe5d6420d40f4aad";
+       version = "1.0.1";
+       sha256 = "6f573007d05e22f6afda550b8d0f61bde15ddfbe8e700779207fd78c7546b819";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19752,8 +19759,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "1.0.0";
-       sha256 = "2cef14155b27fbfc686dc9e490fd72bc9f39f38844f8121683012bae65c44f72";
+       version = "1.0.1";
+       sha256 = "87fe6bdcdb3f6056180c48e5b9c1d57ff64aa953e5763e93d8b28cd2d5ffe2f7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19772,8 +19779,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "1.0.0";
-       sha256 = "9130f9246dd86bb60478ca81f49371a9a393bc7ee74f7dab18c8c4937275d6e9";
+       version = "1.0.1";
+       sha256 = "7dc187fc5269bba71ac05e0bdae22c08d9fd0e1988263e0828fe7f9cec4e614d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19792,8 +19799,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "1.0.0";
-       sha256 = "e193b0e4c9c0d2508c43a1835a9ec9afd429f9dbb4b0620ed6906438f929628a";
+       version = "1.0.1";
+       sha256 = "317ed1ec7dc99e06068fb600f21be98b05dd61a73dd0d140ed644774fb81d33a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19817,8 +19824,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "1.0.0";
-       sha256 = "a6960654512bc30bc00877110a09674cf52b2a37835f6995fe6b3b5515c08277";
+       version = "1.0.1";
+       sha256 = "e432d7b5510685dd37688a632e3a17a8968cb3b1e08537257c054fa8f9eda946";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit conduit-extra cryptonite exceptions hashable http-client
@@ -19842,8 +19849,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "1.0.0";
-       sha256 = "aa483755113ec34eca9d9ec5a50155f9b2224f319a3e464e63dd4775c71d43ce";
+       version = "1.0.1";
+       sha256 = "d8b88c9a51eab9110650ea9e40f09950e8df2c20264cbc629b8a29c50b252dc2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19862,8 +19869,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-devicefarm";
-       version = "1.0.0";
-       sha256 = "26847794bf233655d37b62985305d2da182356444d99632f0d4101ff6cc6c4ed";
+       version = "1.0.1";
+       sha256 = "9b23b6c2853b073635c8e6e76026ffa2cccd705bd7d958fa6dd2c4785a887297";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19882,8 +19889,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "1.0.0";
-       sha256 = "fd07424780428559f9da651e4b81ade00a6d689730eff1e92c37c286c4cd18af";
+       version = "1.0.1";
+       sha256 = "8fc02b3ade3970117e13b2b133235c006a21914e91269cb42d63d712501d013a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19902,8 +19909,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ds";
-       version = "1.0.0";
-       sha256 = "dd823809c8c85ee33e9393c3a15c1fd70a9f852e759170213f78d5b7e703ae56";
+       version = "1.0.1";
+       sha256 = "523f0fb329f502115aed6b1aafc7efd96ac8233d56de05379465fe3c3b7ddbf1";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19922,8 +19929,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "1.0.0";
-       sha256 = "f44166ab92f90121738e226b78a62513a6cab1bed15db5e6912997d9a3e67842";
+       version = "1.0.1";
+       sha256 = "85194e782b7a44ff914af01cdc8d5c3e8285031f0b23a07ef37020c0798c9bfb";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19942,8 +19949,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-streams";
-       version = "1.0.0";
-       sha256 = "374c6184ba5358e30827238ba37d27c84f024c225b5878956fb4aa8daa453086";
+       version = "1.0.1";
+       sha256 = "edfcfc6e4281012cbec96f2b96416cf8c3e0e2313388d677e78f4ff8e51d94f7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19962,8 +19969,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "1.0.0";
-       sha256 = "f3dea2fdc9455f87548d677791ddb63579b1c244993b8fcbbf88f2e28d7dbc3c";
+       version = "1.0.1";
+       sha256 = "fd0ec9d15a97195472be403b9d8c03cdcd2f70daf4beec326c360083479d37ec";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19982,8 +19989,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "1.0.0";
-       sha256 = "f46a0c8377475da81c746de13b7011ba9f856cba9fb0ec195a1c28fa0b9275b9";
+       version = "1.0.1";
+       sha256 = "77e78bf43efd1c3fb77b0d2a6cbab5140ffe13c7e8fcc22cbe7e509d73f978e8";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20002,8 +20009,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-efs";
-       version = "1.0.0";
-       sha256 = "a827bb8595036a9bb40c2e7f7d9cda5fca791e3c22bfe48de3755a525e85e370";
+       version = "1.0.1";
+       sha256 = "9ff36087cc77bf044b515e6a8fc11f4067ab76372e02b3cb7b8dadfb3ad697a2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20022,8 +20029,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "1.0.0";
-       sha256 = "9f634d604a1f36a82b40bca42a656df3456c590de0b26236b4bbdfc04b5c7293";
+       version = "1.0.1";
+       sha256 = "638d40a60b59e020cad3dac813563be07b5f698fd9b602784f3ac344c013ca15";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20042,8 +20049,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "1.0.0";
-       sha256 = "644d165e1f99647aea3ef92aa2c0d38c696740c8df0e423b25c21738d4c4fa52";
+       version = "1.0.1";
+       sha256 = "43dc5564b2183011340d9751b7c4a1cf8197b215b9b857c78d68c70a35c050cb";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20062,8 +20069,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "1.0.0";
-       sha256 = "0aec463a40a5b54516f98a0a2b3a5070652b46fd2ee201455631841875560411";
+       version = "1.0.1";
+       sha256 = "5bac9e2c04f4c775ee7018a2073f5141fa5f062467f4eeba91e9a64e03525298";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20082,8 +20089,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "1.0.0";
-       sha256 = "0aae52d1ba515d991985851ed22d63ee0c4fd645b7c11fdbf18c8e12c67c7c9b";
+       version = "1.0.1";
+       sha256 = "4c9a033830f09147953ffc7c58c39856e1a7c62d600267029bdfce7acf786b52";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20102,8 +20109,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "1.0.0";
-       sha256 = "797807616a93861862cd145cf11968fbaf8c3803322ce6c82fb0e258de609325";
+       version = "1.0.1";
+       sha256 = "e1f289ca504d4220d1a28f055ba01cbf2e87ce42ce3ff6525a6dc1f4adaa6b96";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20122,8 +20129,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "1.0.0";
-       sha256 = "f8fc5d54e10447ecd6879fcee41240171e421711e541bfb19062b49081d3077a";
+       version = "1.0.1";
+       sha256 = "4a6d67f4ac6b34316281810d10b46b46e34fd6869bbf463ef6fa6c8257da28ad";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20142,8 +20149,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "1.0.0";
-       sha256 = "778cb110971732b64c5c7422ffeb617a2f189c52d322107ad4c9cafb013d259d";
+       version = "1.0.1";
+       sha256 = "63d8091722baa876de7a04e92387f4b3015e7194fed25a0e0da9f6ec7ecdb441";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20162,8 +20169,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "1.0.0";
-       sha256 = "d09085f68a8bef6c900b3ed02831dceee1b2f2189449be4166e5dcde32362383";
+       version = "1.0.1";
+       sha256 = "281e37c37bdc5d175723ba8b428c63be3a1a543d2e66ace7f8f288e7419e82fc";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20182,8 +20189,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "1.0.0";
-       sha256 = "8fd7c64c287581a4383d0478718155a59c9af1c9db5a8d8eb89c3f7f44831df6";
+       version = "1.0.1";
+       sha256 = "f942f5a7c13d1dccd98ec52529d24e7cc26bf87d729271c00ea752255e22cd40";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20202,8 +20209,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "1.0.0";
-       sha256 = "36759431a21c11fe0066ff6dda522a2a7fbd78c45d4839a63615562e0860448c";
+       version = "1.0.1";
+       sha256 = "9fc90213cb962c1fe6d49b188bb4e3c4b08db7a9820d25bdda2600b4fc0e9681";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20222,8 +20229,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "1.0.0";
-       sha256 = "1c64ef771a7b9aa47f69305c066d71ec6c3f4348f1ab60d3e9393b62207c34cb";
+       version = "1.0.1";
+       sha256 = "09b29ce0649e01ce74717f0ba9379dbf98993b217652bb310e7136c288c1b8f9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20242,8 +20249,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "1.0.0";
-       sha256 = "4602977012ba8c5a5da2d28f25a038bcb7ecc3a78d9e3a20c62f93866e87e276";
+       version = "1.0.1";
+       sha256 = "6a670ff312be363929409768d3172a28bf7cd549764038f1aa71fd31e2930436";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20262,8 +20269,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "1.0.0";
-       sha256 = "69831a3df942a70c624babe44c8ae7af18c75b3ebd8ecc2e02a0c020f63de8b7";
+       version = "1.0.1";
+       sha256 = "998f65d4b6dc4a43959f7c1f2380af5e5f4fa588bc181a793eb4f3eadee5078d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20282,8 +20289,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "1.0.0";
-       sha256 = "4ee2eb45b7a95f586a8747e208f18e9f647cf15992239a5ca59e54491b002773";
+       version = "1.0.1";
+       sha256 = "f10aa66616746f3ef5728fe50f6ce9506b13a0d9e0dab95edd4aeeb2b6a3eca0";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20302,8 +20309,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "1.0.0";
-       sha256 = "7c8ebb747839d312475f4fae8ac303b14eab648987f8980c07ccca4f12670b88";
+       version = "1.0.1";
+       sha256 = "2a10e70b53d5fc8e723660a595d521e6e4b7f0acd16430cf9a63e2199ab86e9c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20322,8 +20329,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "1.0.0";
-       sha256 = "0733757c703e9cfdd8ed72a08629b75bc15eed07d87526b1c7cdbcf0360e818a";
+       version = "1.0.1";
+       sha256 = "e559cce14249db7d13282bc376b9a5c42719d795da20cfc420c3b95afcfa26a9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20342,8 +20349,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "1.0.0";
-       sha256 = "600a096c249826c489f1fa2ff5b723ecb94db890ad5386ede881a1f335cbd46a";
+       version = "1.0.1";
+       sha256 = "fa4e85bbe0ccf8875cd08b601b69db8fba038046c66e9b65219fecd6b3105fc3";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20362,8 +20369,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "1.0.0";
-       sha256 = "f044ef823a9bc5ede3564f5460e1dc3c7332474543b379f62cb56330e93706f1";
+       version = "1.0.1";
+       sha256 = "2ba4b833b1ccb7d3ca4ac46ae88cf522951972b428987e78328e14766f77f5c4";
        libraryHaskellDepends = [ amazonka-core base lens text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20382,8 +20389,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "1.0.0";
-       sha256 = "73e41153331fdf08d33c9a0a44b326118e5d7da6c93177232282bf61dfc73aaa";
+       version = "1.0.1";
+       sha256 = "dad868bcae8795c9e8e0719ae18bb99514d7a8bd4ee373e194531a0120e4061c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20402,8 +20409,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "1.0.0";
-       sha256 = "c1f8ec0f1b94891a478ce46e169cfbb6fe9aa515dbe8208b33085dca03c37339";
+       version = "1.0.1";
+       sha256 = "d6ded081d5dded1b58b46d49255773e633bceb7d7526960e06dc40f0ea60bfce";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20422,8 +20429,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "1.0.0";
-       sha256 = "7790cb4ab13932df53e056b389e70ac2873e66002ee5e1ba67d7b952264cb820";
+       version = "1.0.1";
+       sha256 = "eccab0209ca98f037e1e21abff164c4f6f29836e57b06bf307a97eab465bbbd7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20442,8 +20449,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "1.0.0";
-       sha256 = "8acef52b122988cd7b231ca10d42fe69b06ff129342daa00afaed5c48880f488";
+       version = "1.0.1";
+       sha256 = "abf01ab527d589cc0f30d0ded41b88fb522cb003130063c1f56a8e92e1315161";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20462,8 +20469,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "1.0.0";
-       sha256 = "d6c35acac9bea450001beaa65d3c8eabd1b006b916390004354369db29c2fb59";
+       version = "1.0.1";
+       sha256 = "2aa03de9ff893045894c9873ef466100d2449e0ea5f7af3549559807a8209193";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20482,8 +20489,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "1.0.0";
-       sha256 = "38a3c9e98906c6f4feec927b442f694c268dfbb1e5aaa4bd6c883e552b0f77d0";
+       version = "1.0.1";
+       sha256 = "676e938699d2ec73abab356c0a0a358067710ce3bf7bb210970afe90f01fd26e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20502,8 +20509,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "1.0.0";
-       sha256 = "12cd1e3cffc9fdb8c8337f25c47496a6d7163916880b1bcb25c6fe86610c3d65";
+       version = "1.0.1";
+       sha256 = "ee7f9e97fc8da24440781513995fbc5afded54a4ecc465a3d46511c22f2bd9a6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20522,8 +20529,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "1.0.0";
-       sha256 = "524eed7040b08552ad50a9afb4d958dc0bd31014a0e64169041554c65136351a";
+       version = "1.0.1";
+       sha256 = "4510faae1b970b48cd35519504edaa9f6f43c49ad97003c1893f34346d4483f6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20542,8 +20549,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "1.0.0";
-       sha256 = "d437d11781c5e515d91448959fe90e007ef0c1a492fee33ef903e30b5028a727";
+       version = "1.0.1";
+       sha256 = "84b940ed61beb7744807eb613fe8a9897f51ef609efed8f568f5d2b02e534c48";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20562,8 +20569,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "1.0.0";
-       sha256 = "0ade5a1a0064b9398117d86c98711e811009058824667add29b18f399f0328cf";
+       version = "1.0.1";
+       sha256 = "1d110c2d674a53be3266d1c480d7adba18bd12706fb78bb81b9e26acc56cb53c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20893,13 +20900,13 @@ self: {
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
        pname = "ansi-wl-pprint";
-       version = "0.6.7.2";
-       sha256 = "015ec4414242089fff5d6d567b392b6bb4fa5f85afff7f0708566082e1d91774";
+       version = "0.6.7.3";
+       sha256 = "3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
        executableHaskellDepends = [ ansi-terminal base ];
-       homepage = "http://github.com/batterseapower/ansi-wl-pprint";
+       homepage = "http://github.com/ekmett/ansi-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28898,6 +28905,7 @@ self: {
        homepage = "https://github.com/capn-freako/broker-haskell";
        description = "Haskell bindings to Broker, Bro's messaging library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { broker = null;};
 
   "bsd-sysctl" = callPackage
@@ -29325,8 +29333,8 @@ self: {
      }:
      mkDerivation {
        pname = "bustle";
-       version = "0.5.1";
-       sha256 = "06601c919d69bea28b116f6447f5557ce46a3e4c4b6b4b75bb65dc2579ff48d6";
+       version = "0.5.2";
+       sha256 = "659d75f91d2d08447bce484a8176f6a2cc94cc10a2d732b7e733e4312a527e90";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29338,6 +29346,7 @@ self: {
          hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework
          test-framework-hunit text
        ];
+       homepage = "http://www.freedesktop.org/wiki/Software/Bustle/";
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
      }) {};
@@ -29371,6 +29380,7 @@ self: {
          terminfo-hs text transformers
        ];
        executableHaskellDepends = [ base text ];
+       jailbreak = true;
        homepage = "http://github.com/pjones/byline";
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
@@ -33805,14 +33815,14 @@ self: {
      , ixset, jmacro, lens, mtl, network, network-uri, old-locale
      , openssl, process, random, reform, reform-happstack, reform-hsp
      , safecopy, stm, tagsoup, text, time, time-locale-compat
-     , unordered-containers, utf8-string, uuid, vector, web-plugins
-     , web-routes, web-routes-happstack, web-routes-hsp, web-routes-th
-     , xss-sanitize
+     , unordered-containers, userid, utf8-string, uuid, vector
+     , web-plugins, web-routes, web-routes-happstack, web-routes-hsp
+     , web-routes-th, xss-sanitize
      }:
      mkDerivation {
        pname = "clckwrks";
-       version = "0.23.8";
-       sha256 = "ed3f3c42fab644b52d2d7e3d125f55b6f303421d5674f76c052989a0a5efd046";
+       version = "0.23.9";
+       sha256 = "7d4c1b4d181b8c974e8472c43c72a1c226e4806f430e49d07f07039c511df51b";
        libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
@@ -33820,13 +33830,12 @@ self: {
          happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl
          network network-uri old-locale process random reform
          reform-happstack reform-hsp safecopy stm tagsoup text time
-         time-locale-compat unordered-containers utf8-string uuid vector
-         web-plugins web-routes web-routes-happstack web-routes-hsp
+         time-locale-compat unordered-containers userid utf8-string uuid
+         vector web-plugins web-routes web-routes-happstack web-routes-hsp
          web-routes-th xss-sanitize
        ];
        librarySystemDepends = [ openssl ];
        libraryToolDepends = [ hsx2hs ];
-       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
@@ -35422,8 +35431,8 @@ self: {
      }:
      mkDerivation {
        pname = "commutative";
-       version = "0.0.1.2";
-       sha256 = "8233c0d2be80252501b4d75828d1cd2d4a1ee53e64284da5ee79e185e7e0eb4a";
+       version = "0.0.1.3";
+       sha256 = "6d1a855914f5106ba8279a719ef8e9f97e24abab3079fcfd3253081348848ccd";
        libraryHaskellDepends = [ base random semigroups ];
        testHaskellDepends = [
          base QuickCheck quickcheck-instances random semigroups tasty
@@ -36087,6 +36096,7 @@ self: {
        ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-sa" = callPackage
@@ -40210,6 +40220,7 @@ self: {
        jailbreak = true;
        description = "Import/export git fast-import streams to/from darcs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs-graph" = callPackage
@@ -41629,19 +41640,24 @@ self: {
      }) {};
 
   "dataflow" = callPackage
-    ({ mkDerivation, base, containers, hspec, HUnit, MissingH, mtl
-     , parsec
+    ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
+     , filepath, hastache, hspec, HUnit, markdown, MissingH, mtl, parsec
+     , text, vector
      }:
      mkDerivation {
        pname = "dataflow";
-       version = "0.6.1.0";
-       sha256 = "7d1d0c0c0484406cdccf14613426cead7e4b0e89a3e0d3bfdabf24d369053625";
+       version = "0.7.1.0";
+       sha256 = "cb7bc18db84941303981a4aafb4b07883ee869d62587f416cb0304d4a0d4bfb4";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers MissingH mtl parsec ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec HUnit ];
-       jailbreak = true;
+       libraryHaskellDepends = [
+         aeson base blaze-html bytestring containers filepath hastache
+         markdown MissingH mtl parsec text vector
+       ];
+       executableHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec HUnit parsec vector
+       ];
        homepage = "https://github.com/sonyxperiadev/dataflow";
        description = "Generate Graphviz documents from a Haskell representation";
        license = stdenv.lib.licenses.bsd3;
@@ -46159,6 +46175,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "drifter-postgresql" = callPackage
+    ({ mkDerivation, base, drifter, either, mtl, postgresql-simple
+     , tasty, tasty-hunit, text, time
+     }:
+     mkDerivation {
+       pname = "drifter-postgresql";
+       version = "0.0.1";
+       sha256 = "a256bfe89eb0bf8a7191a4a912c77869154fcfb0b178e69804c20036a145f1c7";
+       libraryHaskellDepends = [
+         base drifter either mtl postgresql-simple time
+       ];
+       testHaskellDepends = [
+         base drifter either postgresql-simple tasty tasty-hunit text
+       ];
+       description = "PostgreSQL support for the drifter schema migration tool";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dropbox-sdk" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
      , certificate, conduit, HTTP, http-conduit, http-types, json
@@ -51172,8 +51206,8 @@ self: {
      }:
      mkDerivation {
        pname = "feed";
-       version = "0.3.9.7";
-       sha256 = "1468425b73887fba6740ab3e64ac62473be5f5ec61de17c5e1ac8812d4f15a07";
+       version = "0.3.10.0";
+       sha256 = "74b25a85eab11fda19be3c837755f024036542f5bd729911526845cac572d094";
        libraryHaskellDepends = [
          base old-locale old-time time time-locale-compat utf8-string xml
        ];
@@ -54703,34 +54737,35 @@ self: {
 
   "fwgl" = callPackage
     ({ mkDerivation, base, hashable, transformers, unordered-containers
-     , vector, Yampa
+     , vect, vector, Yampa
      }:
      mkDerivation {
        pname = "fwgl";
-       version = "0.1.2.2";
-       sha256 = "d05ac0f948609029f63a5088a334c41a87df7f4289e9ac7465c6326b1f0f92e8";
+       version = "0.1.3.1";
+       sha256 = "9f1426ce575f72694e663cfabf8e12083feac2353ffec0c1c3a94166aa7563e6";
        libraryHaskellDepends = [
-         base hashable transformers unordered-containers vector Yampa
+         base hashable transformers unordered-containers vect vector Yampa
        ];
        jailbreak = true;
        homepage = "https://github.com/ziocroc/FWGL";
-       description = "FRP 2D/3D game engine";
+       description = "Game engine";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "fwgl-glfw" = callPackage
     ({ mkDerivation, base, fwgl, gl, GLFW-b, hashable, JuicyPixels
-     , transformers, unordered-containers, vector, Yampa
+     , transformers, unordered-containers, vect, vector
      }:
      mkDerivation {
        pname = "fwgl-glfw";
-       version = "0.1.0.5";
-       sha256 = "14d7eda355a7b2ed55cd54fe1c75e20ea8b4563d1ea4dac869acc0e815ae60f8";
+       version = "0.1.1.0";
+       sha256 = "1393f48dafc63c43db18cc7f26ec04c3a258ea8cc7fb7525d2c92309509c140b";
+       revision = "1";
+       editedCabalFile = "9e4d781888a4b29f18d2759638f5562367daea4f7f8fbb78590c9e981209b848";
        libraryHaskellDepends = [
          base fwgl gl GLFW-b hashable JuicyPixels transformers
-         unordered-containers vector Yampa
+         unordered-containers vect vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/ziocroc/FWGL";
        description = "FWGL GLFW backend";
        license = stdenv.lib.licenses.bsd3;
@@ -54738,14 +54773,14 @@ self: {
 
   "fwgl-javascript" = callPackage
     ({ mkDerivation, base, fwgl, ghcjs-base, hashable
-     , unordered-containers, Yampa
+     , unordered-containers, vect
      }:
      mkDerivation {
        pname = "fwgl-javascript";
-       version = "0.1.0.6";
-       sha256 = "49451b405761c96cc9d5e3f59c1bd5418924814ce3e8296f126c0072aeb4b63b";
+       version = "0.1.1.0";
+       sha256 = "ccfb9320bb0a205cfa1f977c2ab73f3640dfa7317d02ad115a4525c5633efa80";
        libraryHaskellDepends = [
-         base fwgl ghcjs-base hashable unordered-containers Yampa
+         base fwgl ghcjs-base hashable unordered-containers vect
        ];
        jailbreak = true;
        homepage = "https://github.com/ziocroc/FWGL";
@@ -55189,8 +55224,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-accessors";
-       version = "0.4.1.1";
-       sha256 = "b8a3ff34ba1adff9cf8bf2b568eae405a65336cce2ef3c5544177e2fce07baf9";
+       version = "0.4.2.0";
+       sha256 = "b1ee291607909663a2693189a63d1e8015cec543e550f3478a0d383d41334de8";
        libraryHaskellDepends = [ base linear spatial-math ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -59273,13 +59308,12 @@ self: {
      }:
      mkDerivation {
        pname = "group-with";
-       version = "0.2.0.2";
-       sha256 = "06a26e6530af71a52375bedb07361a4af483b9748d7e0aee17109935e41af730";
+       version = "0.2.0.3";
+       sha256 = "eb179700db93ad736cf13520a105dd344f1c170952bcbdd1ad7e51b3244342de";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base Cabal containers hspec hspec-expectations QuickCheck
        ];
-       jailbreak = true;
        homepage = "https://github.com/ulikoehler/group-with";
        description = "Classify objects by key-generating function, like SQL GROUP BY";
        license = stdenv.lib.licenses.asl20;
@@ -62419,23 +62453,22 @@ self: {
      , happstack-server, hsp, hsx-jmacro, hsx2hs, http-conduit
      , http-types, ixset-typed, jmacro, jwt, lens, mime-mail, mtl
      , pwstore-purehaskell, random, safecopy, shakespeare, text, time
-     , unordered-containers, web-routes, web-routes-boomerang
+     , unordered-containers, userid, web-routes, web-routes-boomerang
      , web-routes-happstack, web-routes-hsp, web-routes-th
      }:
      mkDerivation {
        pname = "happstack-authenticate";
-       version = "2.1.4";
-       sha256 = "3f24dfb2cef2d4225b1a9e6557ec47ab0f67734d0dfa478e89f0fc5a28b3ab1c";
+       version = "2.1.5";
+       sha256 = "203026967ec479957db08ad4109fb488eed254403064d7843deb8202b6c71ae2";
        libraryHaskellDepends = [
          acid-state aeson authenticate base base64-bytestring boomerang
          bytestring containers data-default filepath happstack-hsp
          happstack-jmacro happstack-server hsp hsx-jmacro hsx2hs
          http-conduit http-types ixset-typed jmacro jwt lens mime-mail mtl
          pwstore-purehaskell random safecopy shakespeare text time
-         unordered-containers web-routes web-routes-boomerang
+         unordered-containers userid web-routes web-routes-boomerang
          web-routes-happstack web-routes-hsp web-routes-th
        ];
-       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
@@ -62683,13 +62716,12 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-hsp";
-       version = "7.3.5";
-       sha256 = "c6c53a708bd9b26fd1329629b97b953c1dc12260eb159516b147e2dc588b105d";
+       version = "7.3.6";
+       sha256 = "e3f41aca20991e0bc5bbc00977ff97971d09b77ef293665a138efa7b74467631";
        libraryHaskellDepends = [
          base bytestring happstack-server harp hsp hsx2hs mtl syb text
          utf8-string
        ];
-       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Support for using HSP templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
@@ -63102,8 +63134,8 @@ self: {
      }:
      mkDerivation {
        pname = "harmony";
-       version = "0.1.0.0";
-       sha256 = "d413a21f30ce41ee74db4dba4525ac66b10cdd14ca9074c15c1094d3a21467bd";
+       version = "0.1.0.3";
+       sha256 = "c4d91ca6923e9d04d72590eb309020e6937aa3097b3b649db6803e527eb4c092";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63115,7 +63147,6 @@ self: {
        testHaskellDepends = [
          base containers derive hlint hslogger hspec HUnit QuickCheck
        ];
-       jailbreak = true;
        description = "A web service specification compiler that generates implementation and tests";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -64679,8 +64710,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskelldb-hdbc";
-       version = "2.2.2";
-       sha256 = "6eb42d86c1c39fc05722115a788b2c9d07c88c5decf859ea2287866994ff7f1b";
+       version = "2.2.4";
+       sha256 = "42270f14d5138b2e69ddd61684ce13080853519b29c2082698949ec12d4cc70b";
        libraryHaskellDepends = [
          base containers convertible haskelldb HDBC mtl old-time
        ];
@@ -67294,8 +67325,8 @@ self: {
      }:
      mkDerivation {
        pname = "hemokit";
-       version = "0.6.5";
-       sha256 = "463c3163d2fcac0b693c458a4b2995f4a22833020ffa29ebf4d06194f0418380";
+       version = "0.6.6";
+       sha256 = "83ee3c5ace9f86602249ed3d66f0b4d81dfea97b477685ef43a097417713df55";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67309,8 +67340,7 @@ self: {
          transformers vector vector-fftw websockets
        ];
        testHaskellDepends = [ base bytestring hspec HUnit vector ];
-       jailbreak = true;
-       homepage = "https://github.com/nh2/haskell-hemokit";
+       homepage = "https://github.com/nh2/hemokit";
        description = "Haskell port of the Emokit EEG project";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74835,8 +74865,8 @@ self: {
     ({ mkDerivation, base, hsqml, qt5, template-haskell, text }:
      mkDerivation {
        pname = "hsqml-datamodel";
-       version = "0.1.0.0";
-       sha256 = "354c225514ae632f5429f45a75975b7b7f6f2a245f7c57cd68567eacb2f2e21f";
+       version = "0.2.0.2";
+       sha256 = "fbab7cc84a7a8938438b35d3c59f75dedf5a66b46719f044a7c869e227f7dcec";
        libraryHaskellDepends = [ base hsqml template-haskell text ];
        libraryPkgconfigDepends = [ qt5 ];
        homepage = "https://github.com/marcinmrotek/hsqml-datamodel";
@@ -74851,8 +74881,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsqml-datamodel-vinyl";
-       version = "0.3.0.0";
-       sha256 = "d746e03f7cd77bab28ed9bb53253608e239237b510e412f2c55a8fdd61e144a2";
+       version = "0.3.0.1";
+       sha256 = "b75630e22b253bcdc2760adc9e6e1e39e03ae24e2bbbebab923892f8ccd09fe0";
        libraryHaskellDepends = [
          base exceptions hsqml-datamodel type-list vinyl
        ];
@@ -75745,8 +75775,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.19";
-       sha256 = "5e5db3a8dfb309c8dc99ba154e0176013f7c50547b60b758725a5f5927b5e3f8";
+       version = "0.4.20";
+       sha256 = "8d79157a2887b67d90926a267eaf21b24e914c0975e371ac079167894e308a24";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -80024,8 +80054,8 @@ self: {
      }:
      mkDerivation {
        pname = "intricacy";
-       version = "0.5.5";
-       sha256 = "b888f22dce4233e2664fd5410873ebc26e9e82227c447b8bdf7e406e4feb984a";
+       version = "0.5.7.1";
+       sha256 = "b3fa9f8e1046cf3a967cd3d920d4cab5c959a010bd5048ccd19e1596b9e5c72a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -80574,8 +80604,8 @@ self: {
        pname = "irc-core";
        version = "1.1.0.1";
        sha256 = "a788848f0d60068ed173c394bf28ad637a85df4f3007daebe502126c1907c106";
-       revision = "4";
-       editedCabalFile = "bbe603100961c3b2746c733f31f56f26177b1b28180d6468133140f80d95b402";
+       revision = "5";
+       editedCabalFile = "8971a294711aaae3c327c2fe4f1f53eaed33a57b986585c934df43fa69e8f914";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80588,7 +80618,6 @@ self: {
          network old-locale split stm text time tls transformers vty x509
          x509-store x509-system x509-validation
        ];
-       jailbreak = true;
        homepage = "https://github.com/glguy/irc-core";
        description = "An IRC client library and text client";
        license = stdenv.lib.licenses.bsd3;
@@ -80866,8 +80895,8 @@ self: {
     ({ mkDerivation, base, hspec, HUnit, time }:
      mkDerivation {
        pname = "iso8601-time";
-       version = "0.1.3";
-       sha256 = "fba7986008ed9ab105d5077b6db123bbe899b4e500db5617902b424e24bb1c17";
+       version = "0.1.4";
+       sha256 = "761d737ea0841ee8fd3660cfe20041e9458be8ab424de8b3b661bb249b930126";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec HUnit time ];
        homepage = "https://github.com/nh2/iso8601-time";
@@ -81141,6 +81170,7 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory C backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-bitdata" = callPackage
@@ -81161,6 +81191,7 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory bit-data support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-examples" = callPackage
@@ -81183,6 +81214,7 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory examples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-hw" = callPackage
@@ -81200,6 +81232,7 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-opts" = callPackage
@@ -82396,8 +82429,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-stream";
-       version = "0.3.0.4";
-       sha256 = "4d6c385b3f035d42f5c85351d9701517c96629aeaf8fceaeaee940dafbf11506";
+       version = "0.3.1.0";
+       sha256 = "0de2f4abe549c2bee7bdb13e9bdd70137a06140e3b390ad3697a16a7d34ce7c6";
        libraryHaskellDepends = [
          aeson base bytestring scientific text unordered-containers vector
        ];
@@ -82405,7 +82438,6 @@ self: {
          aeson base bytestring hspec scientific text unordered-containers
          vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/ondrap/json-stream";
        description = "Incremental applicative JSON parser";
        license = stdenv.lib.licenses.bsd3;
@@ -83980,6 +84012,7 @@ self: {
        homepage = "https://github.com/lucasdicioccio/laborantin-hs";
        description = "an experiment management framework";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "labyrinth" = callPackage
@@ -85409,6 +85442,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "language-vhdl" = callPackage
+    ({ mkDerivation, base, pretty }:
+     mkDerivation {
+       pname = "language-vhdl";
+       version = "0.1.0.0";
+       sha256 = "ca55cb762f8b6225df178280dd5a0a3bf9fde2ac0ab942cdabd6239e8dedba33";
+       libraryHaskellDepends = [ base pretty ];
+       homepage = "https://github.com/markus-git/language-vhdl";
+       description = "VHDL AST and pretty printer in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "largeword" = callPackage
     ({ mkDerivation, base, binary, bytestring, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -86179,8 +86224,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens-simple";
-       version = "0.1.0.7";
-       sha256 = "b8e00c791052f159463d1aa6e4738ac4fed5de4d0ebfdab21ec0500a3fe8d623";
+       version = "0.1.0.8";
+       sha256 = "26a144c5b274947b58f6fe0a65d8200edb43f5e99ff4519a2dfce74fffb28458";
        libraryHaskellDepends = [
          base lens-family lens-family-core lens-family-th mtl transformers
        ];
@@ -88631,8 +88676,8 @@ self: {
     ({ mkDerivation, base, containers, monadLib, pretty }:
      mkDerivation {
        pname = "llvm-pretty";
-       version = "0.3.1.1";
-       sha256 = "5665a4d0e565042e649d9530102e1227aae3418a185b0f15aa894568236d63e2";
+       version = "0.4.0.0";
+       sha256 = "6d757a9929a0b43f3e22d0799939d7489b16dd2637553bb396a47cd0318bf23f";
        libraryHaskellDepends = [ base containers monadLib pretty ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
@@ -88645,8 +88690,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-pretty-bc-parser";
-       version = "0.1.3.1";
-       sha256 = "1a3bed9ca5eadfa19dcd35102b97ef055720edfc7e4296730d4fea38db370696";
+       version = "0.2.1.0";
+       sha256 = "2d852be9dc0aa29d7a3c898486a201748c2f1a0276393a1f156e624eee108a8a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88884,8 +88929,8 @@ self: {
      }:
      mkDerivation {
        pname = "log";
-       version = "0.2.3";
-       sha256 = "883a6e2d190046842713debf3dfa267aac5e096661f31b856ac2afbb50ee2f97";
+       version = "0.2.4";
+       sha256 = "56f3e654199a547551faa93fe8a97e2f3d7412bd3c20c5dd2b3c1eac9947d5b5";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring deepseq
          exceptions hpqtypes lifted-base monad-control monad-time mtl
@@ -90166,17 +90211,34 @@ self: {
      }) { inherit (pkgs) ncurses;};
 
   "magic" = callPackage
-    ({ mkDerivation, base, magic }:
+    ({ mkDerivation, base, file }:
      mkDerivation {
        pname = "magic";
        version = "1.1";
        sha256 = "b21c3b69f57b64199c1d7be0ac8ea1d02d698be59943058f6a2d642ea57ce082";
        libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ magic ];
+       librarySystemDepends = [ file ];
        description = "Interface to C file/magic library";
        license = stdenv.lib.licenses.bsd3;
+     }) { inherit (pkgs) file;};
+
+  "magico" = callPackage
+    ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
+     mkDerivation {
+       pname = "magico";
+       version = "0.0.0.1";
+       sha256 = "97f4f606544bbc741b593d96167bcd4e80d2f5f98face9460a1c6ab1dab12c38";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base hmatrix transformers utility-ht
+       ];
+       jailbreak = true;
+       homepage = "http://hub.darcs.net/thielema/magico";
+       description = "Compute solutions for Magico puzzle";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { magic = null;};
+     }) {};
 
   "magma" = callPackage
     ({ mkDerivation, base, deepseq, profunctors, semigroups }:
@@ -91986,12 +92048,12 @@ self: {
      }:
      mkDerivation {
        pname = "memory";
-       version = "0.7";
-       sha256 = "e123c8851a0f9bc3d442a462324bb828f6571d0d90fe1c6cb671f8913bd941fa";
+       version = "0.8";
+       sha256 = "7eef7546b1fc9b6f1d09422d36f0218fa582f83a93452c7422e5b267e94db7de";
        libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
-       description = "memory and related abtraction stuff";
+       description = "memory and related abstraction stuff";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -92039,8 +92101,8 @@ self: {
      }:
      mkDerivation {
        pname = "messagepack";
-       version = "0.4.0";
-       sha256 = "11684ac166c7023c6cb31fbe27205ef532497f9fe3d787c87dfaa7e47d6a19a5";
+       version = "0.5.0";
+       sha256 = "6f1900a0df65cede2134a51c6bbe5084aa5a991777698cbeb2cd283b36a93ed8";
        libraryHaskellDepends = [ base bytestring cereal containers ];
        testHaskellDepends = [
          base bytestring cereal containers QuickCheck test-framework
@@ -92062,6 +92124,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal containers messagepack network-simple
        ];
+       jailbreak = true;
        homepage = "http://github.com/rodrigosetti/messagepack-rpc";
        description = "Message Pack RPC over TCP";
        license = stdenv.lib.licenses.mit;
@@ -92340,8 +92403,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.3.0.0";
-       sha256 = "fc3fa9c8218f8c6c6fa3c56e1d378bf6ebd4bb51b3d9649f6f89249121d0f088";
+       version = "0.3.1.0";
+       sha256 = "6c822ad2697798b5073f2d04a8951392b6cead80ede5713ad415aa4213b565ee";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library which you can depend upon";
@@ -92381,8 +92444,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-mtl";
-       version = "0.1.4.0";
-       sha256 = "99fb9facb90cece06a5b4d1e108b9b4a917bbf6832383d0d08eadc76684173b9";
+       version = "0.1.4.1";
+       sha256 = "5a9a54d7804ece4bc4ab45c1784ce91df7681e2742b301754a212c7ccc2d7e70";
        libraryHaskellDepends = [
          base microlens mtl transformers transformers-compat
        ];
@@ -92397,8 +92460,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-platform";
-       version = "0.1.0.0";
-       sha256 = "f9be21db09c032a4827868ad1888650bb1aae4a86e9d99d11cf375b0877170e1";
+       version = "0.1.1.0";
+       sha256 = "73511b2b66b356a1231d7a3a7b2da9021ad5f03c9ab61cfa659483fa03166ad6";
        libraryHaskellDepends = [
          base hashable microlens microlens-ghc microlens-mtl microlens-th
          text unordered-containers vector
@@ -93470,19 +93533,19 @@ self: {
   "moesocks" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , containers, cryptohash, hslogger, HsOpenSSL, lens, mtl, network
-     , optparse-applicative, random, safe, stm, text, time, transformers
-     , unix, unordered-containers
+     , optparse-applicative, random, safe, stm, strict, text, time
+     , transformers, unix, unordered-containers
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.18";
-       sha256 = "2428e0b69aa2c8e91471299835ed4cbab9d03a3e252913f7636cbc904fb29ecd";
+       version = "0.1.0.20";
+       sha256 = "06cb6e29dde04f62c9519fa295551e4130f596a96e74fceb9c2e36552d9de52e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson async attoparsec base binary bytestring containers cryptohash
          hslogger HsOpenSSL lens mtl network optparse-applicative random
-         safe stm text time transformers unix unordered-containers
+         safe stm strict text time transformers unix unordered-containers
        ];
        homepage = "https://github.com/nfjinjing/moesocks";
        description = "A functional firewall killer";
@@ -97043,15 +97106,15 @@ self: {
      }) {};
 
   "naver-translate" = callPackage
-    ({ mkDerivation, aeson, base, iso639, lens, lens-aeson, random
-     , text, wreq
+    ({ mkDerivation, aeson, base, iso639, lens, lens-aeson, network-uri
+     , random, text, wreq
      }:
      mkDerivation {
        pname = "naver-translate";
-       version = "0.1.0.0";
-       sha256 = "81fa0fb48c1096b141ab0e3972da9750a8027e9255805330c8fc0a6f982b7519";
+       version = "0.1.0.1";
+       sha256 = "8a1cd7b0f04d9c8445bc33d999fd144421d4a59c6779d5dbe2b45e55f2d35f8e";
        libraryHaskellDepends = [
-         aeson base iso639 lens lens-aeson random text wreq
+         aeson base iso639 lens lens-aeson network-uri random text wreq
        ];
        jailbreak = true;
        homepage = "https://github.com/dahlia/naver-translate";
@@ -99916,8 +99979,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "observable-sharing";
-       version = "0.2.1.2";
-       sha256 = "ea03b6c46ebe248f090c52d280bf7591a0f71972db507083b82ab5d817514d38";
+       version = "0.2.2.1";
+       sha256 = "a93236cd153fed0a8364c21780083e6f2e9e08a84ac3dfb938a3e56b19e37a80";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/atzeus/observable-sharing";
        description = "Simple observable sharing";
@@ -99934,8 +99997,8 @@ self: {
      }:
      mkDerivation {
        pname = "octohat";
-       version = "0.1.4.2";
-       sha256 = "821620dfc1d888027c984c29759432b4e5bbc30997ec848dd664e32f90295e69";
+       version = "0.1.5.0";
+       sha256 = "a064f32fdf4272e6b653ccc1bc13036c77b1bb902f1d9f6482ea76a02674639d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101240,8 +101303,8 @@ self: {
      }:
      mkDerivation {
        pname = "orchestrate";
-       version = "0.2.0.2";
-       sha256 = "1fb90d34287fb423e5b08b4ba92cf2fb812a4671ab1f723855da17112d960926";
+       version = "0.2.0.3";
+       sha256 = "ccc60ad893d0590a92495a3982a0a753cd2628dca9307ffe2e5077a4740eb0d7";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive data-default either errors
          http-client http-types lens mtl text transformers
@@ -102001,8 +102064,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.2.4";
-       sha256 = "f4b4219c029735cc9d9b03951460870155b5c8340d90accbb742a8dee727c5ab";
+       version = "0.1.3.0";
+       sha256 = "f3cdb3988ac223111dc7ccb3a28aa8a4db91ace098475f5e8e0c8f8bcfe6b8bd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -102013,7 +102076,6 @@ self: {
          base bytestring containers data-default hspec mtl pandoc
          pandoc-types process yaml
        ];
-       jailbreak = true;
        description = "Pandoc filter for cross-references";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -110397,8 +110459,8 @@ self: {
      }:
      mkDerivation {
        pname = "quiver-http";
-       version = "0.0.0.1";
-       sha256 = "3c55e3de17b1cc41b4f2e0a3ea184b57a3e8c7be6d7c1eb0176aa538a29de292";
+       version = "0.0.0.2";
+       sha256 = "e221dbbe65a0b4509e7efbd1e70383575175932e16b28d0cbeaa2165b7a5dfe0";
        libraryHaskellDepends = [
          base bytestring http-client http-client-tls quiver
        ];
@@ -111310,6 +111372,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "react-flux" = callPackage
+    ({ mkDerivation, aeson, base, deepseq, mtl, text }:
+     mkDerivation {
+       pname = "react-flux";
+       version = "0.9.0";
+       sha256 = "6da5232f92bd5667a0ff2b6c3bbe9139ba412e82a8f619cfd05f2c056b907209";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ aeson base deepseq mtl text ];
+       executableHaskellDepends = [ base deepseq ];
+       homepage = "https://bitbucket.org/wuzzeb/react-flux";
+       description = "A binding to React based on the Flux application architecture for GHCJS";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "react-haskell" = callPackage
     ({ mkDerivation, aeson, base, deepseq, lens-family, monads-tf, text
      , transformers, unordered-containers, void
@@ -112338,12 +112415,11 @@ self: {
     ({ mkDerivation, base, blaze-markup, reform, shakespeare, text }:
      mkDerivation {
        pname = "reform-hamlet";
-       version = "0.0.4";
-       sha256 = "cf2107c6dd086b0875b8b80b2b63a234d89371fd420219e03ccf7415798219b9";
+       version = "0.0.5";
+       sha256 = "8a841b4a31518ddd6da9b64f93c5527aaab9bdc67eaef70298c9455004e896b6";
        libraryHaskellDepends = [
          base blaze-markup reform shakespeare text
        ];
-       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Add support for using Hamlet with Reform";
        license = stdenv.lib.licenses.bsd3;
@@ -113851,6 +113927,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "resistor-cube" = callPackage
+    ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
+     mkDerivation {
+       pname = "resistor-cube";
+       version = "0.0";
+       sha256 = "6c1eeaf029f0990b141dcdb7ba930bd3a16eb6b670a3d60cf83c0b37c65db269";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base hmatrix transformers utility-ht
+       ];
+       jailbreak = true;
+       homepage = "http://hub.darcs.net/thielema/resistor-cube";
+       description = "Compute total resistance of a cube of resistors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "resolve-trivial-conflicts" = callPackage
     ({ mkDerivation, ansi-terminal, base, Diff, directory, filepath
      , mtl, process, unix
@@ -126396,8 +126490,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "streaming";
-       version = "0.1.0.5";
-       sha256 = "2d85fe60c6b1b6bd62711bbb67067dfece11fd89b5c8af00451d19df2857631e";
+       version = "0.1.0.6";
+       sha256 = "604014b7d23181e7906b81a9bca1829f8e63b8e3dc690709a7d5c348d0ff3af9";
        libraryHaskellDepends = [ base ghc-prim mmorph mtl transformers ];
        homepage = "https://github.com/michaelt/streaming";
        description = "A free monad transformer optimized for streaming applications";
@@ -127372,8 +127466,8 @@ self: {
      }:
      mkDerivation {
        pname = "svg-tree";
-       version = "0.3.1";
-       sha256 = "8ca2837bc93bcd0bc538671cf23368fd3dad53fa8f98cb0da9e9126e453bd2ba";
+       version = "0.3.2";
+       sha256 = "b9fc42919351b5afd17cf8983e2cf8024edd3544efe92fe9ba26130d7d0d2d03";
        libraryHaskellDepends = [
          attoparsec base bytestring containers JuicyPixels lens linear mtl
          scientific text transformers vector xml
@@ -129282,6 +129376,7 @@ self: {
        ];
        description = "Manage pools of possibly interdependent tasks using STM and async";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty" = callPackage
@@ -130161,13 +130256,12 @@ self: {
      }:
      mkDerivation {
        pname = "terminfo-hs";
-       version = "0.1.0.1";
-       sha256 = "01bd721ce433eaef39ec1714940f7a61b12f990c1cfae4a108185132d8196ead";
+       version = "0.2.1";
+       sha256 = "632fa74d6ae9fc0026022c6dd91577c8a05f95e973347b33b4d49cd9059a48ff";
        libraryHaskellDepends = [
          attoparsec base bytestring containers directory errors filepath
        ];
        testHaskellDepends = [ base directory errors filepath QuickCheck ];
-       jailbreak = true;
        description = "A pure-Haskell (no FFI) module for accessing terminfo databases";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130711,8 +130805,8 @@ self: {
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.8.2.2";
-       sha256 = "a1f492d8bfdd9a28f9bbb546fd335e285b7da15ab1e7ac0cc0c96a8e42cec2f3";
+       version = "0.8.3";
+       sha256 = "553d4e8785caf97370aa8d1b626c0e310fe0a1dec15abf2b146dc2ee219e1d34";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134718,23 +134812,22 @@ self: {
   "twilio" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, errors, exceptions, free, http-client
-     , http-client-tls, http-types, mtl, network-uri, old-locale, text
-     , time, transformers, unordered-containers
+     , http-client-tls, http-types, mtl, network-uri, old-locale
+     , scientific, text, time, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "twilio";
-       version = "0.1.2.0";
-       sha256 = "77db1379626f5443c1fdfc91d5d1356dc93f5eb6ad23b43e6f3d9c2b5b7a1017";
+       version = "0.1.3.0";
+       sha256 = "e3a25a6896c83d84c347510e7112b597d398e4e04b5254c5732e2b2b4354b4e1";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers errors exceptions free
          http-client http-client-tls http-types mtl network-uri old-locale
-         text time transformers unordered-containers
+         scientific text time transformers unordered-containers
        ];
        testHaskellDepends = [
          aeson base bytestring Cabal http-client http-client-tls network-uri
          text transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/markandrus/twilio-haskell";
        description = "Twilio REST API library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -137560,6 +137653,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "userid" = callPackage
+    ({ mkDerivation, aeson, base, boomerang, lens, safecopy, web-routes
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "userid";
+       version = "0.1.0.0";
+       sha256 = "327e1d4bee9789ee911d35ce11ba50b3a135ee24cb93bd59ea42ded3426f00ba";
+       libraryHaskellDepends = [
+         aeson base boomerang lens safecopy web-routes web-routes-th
+       ];
+       homepage = "http://www.github.com/Happstack/userid";
+       description = "A library which provides the UserId type and useful instances for web development";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "users" = callPackage
     ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }:
      mkDerivation {
@@ -140250,6 +140359,7 @@ self: {
        homepage = "https://github.com/Helkafen/wai-middleware-metrics";
        description = "A WAI middleware to collect EKG request metrics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-preprocessor" = callPackage
@@ -140729,29 +140839,30 @@ self: {
 
   "warp" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
-     , bytestring, case-insensitive, containers, directory, doctest
-     , ghc-prim, hashable, hspec, HTTP, http-date, http-types, http2
-     , HUnit, iproute, lifted-base, network, old-locale, process
-     , QuickCheck, simple-sendfile, stm, streaming-commons, text, time
-     , transformers, unix, unix-compat, vault, wai, word8
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
+     , http-types, http2, HUnit, iproute, lifted-base, network
+     , old-locale, process, QuickCheck, simple-sendfile, stm
+     , streaming-commons, text, time, transformers, unix, unix-compat
+     , vault, wai, word8
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.1.2";
-       sha256 = "b845179b3ec3e78d94408da61fdc9195807adaa25646205769e9a2b0b6ab48f9";
+       version = "3.1.3";
+       sha256 = "f65d32e374da0c1c1a44624e9744e4e2b5e325ca1e24a6aeae5719ee48c2b8e3";
        libraryHaskellDepends = [
-         array auto-update base blaze-builder bytestring case-insensitive
-         containers ghc-prim hashable http-date http-types http2 iproute
-         network simple-sendfile stm streaming-commons text unix unix-compat
-         vault wai word8
+         array auto-update base blaze-builder bytestring bytestring-builder
+         case-insensitive containers ghc-prim hashable http-date http-types
+         http2 iproute network simple-sendfile stm streaming-commons text
+         unix unix-compat vault wai word8
        ];
        testHaskellDepends = [
          array async auto-update base blaze-builder bytestring
-         case-insensitive containers directory doctest ghc-prim hashable
-         hspec HTTP http-date http-types http2 HUnit iproute lifted-base
-         network old-locale process QuickCheck simple-sendfile stm
-         streaming-commons text time transformers unix unix-compat vault wai
-         word8
+         bytestring-builder case-insensitive containers directory doctest
+         ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
+         iproute lifted-base network old-locale process QuickCheck
+         simple-sendfile stm streaming-commons text time transformers unix
+         unix-compat vault wai word8
        ];
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
@@ -140804,8 +140915,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.1.0";
-       sha256 = "3fdb29b9bcbbe41bab87921eb8c0fee5c24a3dd50d6ac103d8ee88a10685209d";
+       version = "3.1.1";
+       sha256 = "5e9a75cc877f52053c5e1ceb15427ac28bf9937750336af0f71569b4e9e213bd";
        libraryHaskellDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
@@ -146434,8 +146545,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-table";
-       version = "1.0.4";
-       sha256 = "d0de749b9875ad2f744366c48abe0cca88cf96608cdc3462d888c95dfddf1789";
+       version = "1.0.5";
+       sha256 = "873cb5ae68d3726678ce4f254a5342f56244f86e88c731ca6849691df30f85df";
        libraryHaskellDepends = [
          base bytestring containers contravariant text yesod-core
        ];
@@ -146687,15 +146798,15 @@ self: {
      , data-default, directory, dlist, dynamic-state, dyre, exceptions
      , filepath, glib, gtk, hashable, hint, HUnit, lens, mtl, old-locale
      , oo-prototypes, pango, parsec, pointedlist, process, QuickCheck
-     , random, safe, semigroups, split, tasty, tasty-hunit
+     , random, safe, semigroups, split, stm, tasty, tasty-hunit
      , tasty-quickcheck, template-haskell, text, text-icu, time
      , transformers-base, unix, unix-compat, unordered-containers, vty
      , word-trie, xdg-basedir, yi-language, yi-rope
      }:
      mkDerivation {
        pname = "yi";
-       version = "0.12.1";
-       sha256 = "3b8e59f48053c42f1f51e4971f326991f0a59b5ee65705be6a48da2cf5824705";
+       version = "0.12.2";
+       sha256 = "16107755bd53f04a8edd03c2db50be3d7640b8d9503dea17ea923726c4de9e06";
        configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = true;
        isExecutable = true;
@@ -146703,7 +146814,7 @@ self: {
          array base binary bytestring Cabal containers data-default
          directory dlist dynamic-state dyre exceptions filepath glib gtk
          hashable hint lens mtl old-locale oo-prototypes pango parsec
-         pointedlist process QuickCheck random safe semigroups split
+         pointedlist process QuickCheck random safe semigroups split stm
          template-haskell text text-icu time transformers-base unix
          unix-compat unordered-containers vty word-trie xdg-basedir
          yi-language yi-rope
@@ -146713,7 +146824,6 @@ self: {
          base directory filepath HUnit lens QuickCheck semigroups tasty
          tasty-hunit tasty-quickcheck text yi-language yi-rope
        ];
-       jailbreak = true;
        homepage = "https://yi-editor.github.io";
        description = "The Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;

From b591bec333ab842cd3d6d9495428c7097fe74e87 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Aug 2015 17:58:18 +0200
Subject: [PATCH 1318/2016] haskell-yi: fixed by upstream

---
 pkgs/development/haskell-modules/configuration-common.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 66bf20c55c9..41d56211827 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -919,13 +919,6 @@ self: super: {
   # https://github.com/GaloisInc/HaNS/pull/8
   hans = appendPatch super.hans ./patches/hans-disable-webserver.patch;
 
-  # https://github.com/yi-editor/yi/issues/776
-  yi = markBroken super.yi;
-  yi-monokai = dontDistribute super.yi-monokai;
-  yi-snippet = dontDistribute super.yi-snippet;
-  yi-solarized = dontDistribute super.yi-solarized;
-  yi-spolsky = dontDistribute super.yi-spolsky;
-
   # https://github.com/athanclark/commutative/issues/1
   commutative = dontCheck super.commutative;
 

From f92eb718eb6d927e7bc85aec5c924c9e926218b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Aug 2015 17:59:33 +0200
Subject: [PATCH 1319/2016] haskell-sets still can't compile its test suite.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 41d56211827..2e1ff1df7cc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -925,7 +925,7 @@ self: super: {
   # https://github.com/athanclark/set-with/issues/1
   set-with = dontCheck super.set-with;
 
-  # https://github.com/athanclark/sets/issues/1
+  # https://github.com/athanclark/sets/issues/2
   sets = dontCheck super.sets;
 
   # https://github.com/lens/lens-aeson/issues/18

From 0eca00a544dbd9fdd79c67ef1f392fe1b4160d64 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Aug 2015 18:00:19 +0200
Subject: [PATCH 1320/2016] haskell-sets-with was deprecated.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2e1ff1df7cc..8e0564dd20d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -922,9 +922,6 @@ self: super: {
   # https://github.com/athanclark/commutative/issues/1
   commutative = dontCheck super.commutative;
 
-  # https://github.com/athanclark/set-with/issues/1
-  set-with = dontCheck super.set-with;
-
   # https://github.com/athanclark/sets/issues/2
   sets = dontCheck super.sets;
 

From d8650d5d6c574c6f911be859b7fb48ccf3af0f09 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Aug 2015 18:08:04 +0200
Subject: [PATCH 1321/2016] haskell-commutative: re-enable test suite

All files, dependencies, etc. appear to now be set correctly.  Tested
with 'cabal test' in a local nix-shell environment.

Closes https://github.com/peti/nixpkgs/pull/20.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8e0564dd20d..6612b5a40cf 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -919,9 +919,6 @@ self: super: {
   # https://github.com/GaloisInc/HaNS/pull/8
   hans = appendPatch super.hans ./patches/hans-disable-webserver.patch;
 
-  # https://github.com/athanclark/commutative/issues/1
-  commutative = dontCheck super.commutative;
-
   # https://github.com/athanclark/sets/issues/2
   sets = dontCheck super.sets;
 

From 1a590a618541d0eeff767280ec2c438e25ba820b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 6 Aug 2015 15:10:48 +0300
Subject: [PATCH 1322/2016] haskell: use postPatch instead of patchPhase where
 possible

Closes https://github.com/NixOS/nixpkgs/pull/9297.
---
 .../haskell-modules/configuration-common.nix           | 10 +++++-----
 .../haskell-modules/configuration-ghc-7.10.x.nix       |  4 ++--
 .../haskell-modules/configuration-ghc-7.6.x.nix        |  4 ++--
 .../haskell-modules/configuration-ghc-7.8.x.nix        |  4 ++--
 .../haskell-modules/configuration-ghc-head.nix         |  4 ++--
 .../haskell-modules/configuration-ghc-nokinds.nix      |  4 ++--
 .../haskell-modules/configuration-ghcjs.nix            |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6612b5a40cf..2fd397d9797 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -166,7 +166,7 @@ self: super: {
   # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
   darcs = (overrideCabal super.darcs (drv: {
     doCheck = false;            # The test suite won't even start.
-    patchPhase = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal";
+    postPatch = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal";
   })).overrideScope (self: super: { zlib = self.zlib_0_5_4_2; });
 
   # https://github.com/massysett/rainbox/issues/1
@@ -206,7 +206,7 @@ self: super: {
   x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc
     then let inherit (pkgs.darwin) security_tool;
       in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
-        patchPhase = (drv.patchPhase or "") + ''
+        postPatch = (drv.postPatch or "") + ''
           substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
         '';
       })
@@ -216,7 +216,7 @@ self: super: {
     then super.double-conversion
     else overrideCabal super.double-conversion (drv:
       {
-        patchPhase = ''
+        postPatch = ''
           substituteInPlace double-conversion.cabal --replace stdc++ c++
         '';
       });
@@ -721,7 +721,7 @@ self: super: {
 
   # Already fixed in upstream darcs repo.
   xmonad-contrib = overrideCabal super.xmonad-contrib (drv: {
-    patchPhase = ''
+    postPatch = ''
       sed -i -e '24iimport Control.Applicative' XMonad/Util/Invisible.hs
       sed -i -e '22iimport Control.Applicative' XMonad/Hooks/DebugEvents.hs
     '';
@@ -732,7 +732,7 @@ self: super: {
 
   # Hardcoded include path
   poppler = overrideCabal super.poppler (drv: {
-    patchPhase = ''
+    postPatch = ''
       sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal
       sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc
     '';
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 cbc9ed32f76..2fd9b9c0fb0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -90,10 +90,10 @@ self: super: {
 
   # Setup: At least the following dependencies are missing: base <4.8
   hspec-expectations = overrideCabal super.hspec-expectations (drv: {
-    patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
+    postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
   });
   utf8-string = overrideCabal super.utf8-string (drv: {
-    patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
+    postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
   });
   pointfree = doJailbreak super.pointfree;
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index a7bad53c749..ccc4aa54c28 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -85,8 +85,8 @@ self: super: {
 
   # https://github.com/magthe/sandi/issues/7
   sandi = overrideCabal super.sandi (drv: {
-    patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; }
-  );
+    postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal";
+  });
 
   # blaze-builder requires an additional build input on older compilers.
   blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 8ec10e22fa4..3579c697ada 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -127,8 +127,8 @@ self: super: {
 
   # https://github.com/magthe/sandi/issues/7
   sandi = overrideCabal super.sandi (drv: {
-    patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; }
-  );
+    postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal";
+  });
 
   # Overriding mtl 2.2.x is fine here because ghc-events is an stand-alone executable.
   ghc-events = super.ghc-events.override { mtl = self.mtl_2_2_1; };
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index c8b6f33d847..55fd891ba2a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -66,10 +66,10 @@ self: super: {
 
   # Setup: At least the following dependencies are missing: base <4.8
   hspec-expectations = overrideCabal super.hspec-expectations (drv: {
-    patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
+    postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
   });
   utf8-string = overrideCabal super.utf8-string (drv: {
-    patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
+    postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
   });
 
   # bos/attoparsec#92
diff --git a/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix b/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix
index be78321b38a..e62f21f135e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix
@@ -65,10 +65,10 @@ self: super: {
 
   # Setup: At least the following dependencies are missing: base <4.8
   hspec-expectations = overrideCabal super.hspec-expectations (drv: {
-    patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
+    postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
   });
   utf8-string = overrideCabal super.utf8-string (drv: {
-    patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
+    postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
   });
 
   # bos/attoparsec#92
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 48e7c14f317..bec8fabae20 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -56,7 +56,7 @@ self: super: {
   vector = null;
 
   pqueue = overrideCabal super.pqueue (drv: {
-    patchPhase = ''
+    postPatch = ''
       sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
       sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs
       sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs

From 7e48c52aaacb34bed86b97ac5e5fd8903ffe9ea3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Aug 2015 18:10:12 +0200
Subject: [PATCH 1323/2016] haskell-singletons: update documentation for
 override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2fd397d9797..adbe14ef4f7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -769,9 +769,7 @@ self: super: {
   # https://github.com/nushio3/doctest-prop/issues/1
   doctest-prop = dontCheck super.doctest-prop;
 
-  # https://github.com/goldfirere/singletons/issues/116
   # https://github.com/goldfirere/singletons/issues/117
-  # https://github.com/goldfirere/singletons/issues/118
   clash-lib = dontDistribute super.clash-lib;
   clash-verilog = dontDistribute super.clash-verilog;
   Frames = dontDistribute super.Frames;

From f2fc95686c3ff01ed4fbca124090be8ed077927d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 17 Aug 2015 22:27:17 +0200
Subject: [PATCH 1324/2016] haskell-shelly has transient test suite failures.

---
 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 adbe14ef4f7..5bae86683eb 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -971,4 +971,8 @@ self: super: {
     '';
   });
 
+  # https://github.com/yesodweb/Shelly.hs/issues/106
+  # https://github.com/yesodweb/Shelly.hs/issues/108
+  shelly = dontCheck super.shelly;
+
 }

From d58753b994dff5d3b66a86624f73ade0c5ebbb52 Mon Sep 17 00:00:00 2001
From: Kevin Quick <quick@sparq.org>
Date: Mon, 17 Aug 2015 21:16:09 -0700
Subject: [PATCH 1325/2016] Newer haskell cmdlib version 0.3.6 is no longer
 marked as broken.

Closes https://github.com/NixOS/nixpkgs/pull/9316.
---
 .../haskell-modules/configuration-ghc-7.10.x.nix         | 9 ---------
 1 file changed, 9 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 2fd9b9c0fb0..8c8498b7a13 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -174,15 +174,6 @@ self: super: {
             in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
                                           self.webkitgtk3-javascriptcore ];
 
-  # contacted maintainer by e-mail
-  cmdlib = markBrokenVersion "0.3.5" super.cmdlib;
-  darcs-fastconvert = dontDistribute super.darcs-fastconvert;
-  ivory-backend-c = dontDistribute super.ivory-backend-c;
-  ivory-bitdata = dontDistribute super.ivory-bitdata;
-  ivory-examples = dontDistribute super.ivory-examples;
-  ivory-hw = dontDistribute super.ivory-hw;
-  laborantin-hs = dontDistribute super.laborantin-hs;
-
   # https://github.com/cartazio/arithmoi/issues/1
   arithmoi = markBroken super.arithmoi;
   NTRU = dontDistribute super.NTRU;

From 09e5107d3b9e1b517920ee4054e6a0adfa6df27a Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 18 Aug 2015 05:47:59 -0400
Subject: [PATCH 1326/2016] haskell-hbro: fixed by 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 5bae86683eb..0e5e1d42f0f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -895,8 +895,7 @@ self: super: {
   # https://github.com/liyang/thyme/issues/36
   thyme = dontCheck super.thyme;
 
-  # https://github.com/k0ral/hbro/issues/15
-  hbro = markBroken super.hbro;
+  # https://github.com/k0ral/hbro-contrib/issues/1
   hbro-contrib = dontDistribute super.hbro-contrib;
 
   # https://github.com/aka-bash0r/multi-cabal/issues/4

From fabeee76bd1c2795933e5012c35cb4799ea18ef4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Aug 2015 22:54:42 +0200
Subject: [PATCH 1327/2016] haskell-configurator fails its test suite.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0e5e1d42f0f..fde9bb782d8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -974,4 +974,7 @@ self: super: {
   # https://github.com/yesodweb/Shelly.hs/issues/108
   shelly = dontCheck super.shelly;
 
+  # https://github.com/bos/configurator/issues/22
+  configurator = dontCheck super.configurator;
+
 }

From f423ba3863092692f32a939f701d0eaf97afe9b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Aug 2015 11:52:43 +0200
Subject: [PATCH 1328/2016] cbc: Enable on Darwin

---
 pkgs/applications/science/math/cbc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix
index aa749a25889..0d1ef26092e 100644
--- a/pkgs/applications/science/math/cbc/default.nix
+++ b/pkgs/applications/science/math/cbc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     homepage = https://projects.coin-or.org/Cbc;
     license = lib.licenses.epl10;
     maintainers = [ lib.maintainers.eelco ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     description = "A mixed integer programming solver";
   };
 }

From 2ffc2099bed9b0e38a01e590318d5a5f6383d9ca Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 19 Aug 2015 12:25:50 +0200
Subject: [PATCH 1329/2016] leiningen: 2.5.1 -> 2.5.2.

---
 pkgs/development/tools/build-managers/leiningen/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 5fb7d1a6995..70a6fac7bab 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -3,18 +3,18 @@
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "2.5.1";
+  version = "2.5.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
-    sha256 = "0pqqb2bh0a17426diwyhk5vbxcfz45rppbxmjydsmai94jm3cgix";
+    sha256 = "0pzs645315nvn981w3nj8fi30g6kq67cmj7hq7da658qlk0p6r7i";
   };
 
   jarsrc = fetchurl {
     # NOTE: This is actually a .jar, Github has issues
     url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
-    sha256 = "1irl3w66xq1xbbs4g10dnw1vknfw8al70nhr744gfn2za27w0xdl";
+    sha256 = "0qhvgvii4x3p49bx494f6fc7dfvxx2crp2wbkldxx2brvh105iv4";
   };
 
   patches = [ ./lein-fix-jar-path.patch ];

From 172522e153b9601c86bb4eacc46ca1cc934d90b5 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Wed, 19 Aug 2015 12:14:18 +0100
Subject: [PATCH 1330/2016] ecryptfs:

- upgrade 106 -> 108
- fix passphrase rewrapper (password changing should now work fine) as
  discussed on https://bugs.launchpad.net/ecryptfs/+bug/1486470
- add lsof dependency so ecryptfs-migrate-home should work out of the
  box
---
 nixos/modules/security/pam.nix           | 2 +-
 pkgs/tools/security/ecryptfs/default.nix | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 02520fb88cd..0aa8ee0da82 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -251,9 +251,9 @@ let
           ${optionalString (!(config.security.pam.enableEcryptfs || cfg.pamMount)) "auth required pam_deny.so"}
 
           # Password management.
+          password requisite pam_unix.so nullok sha512
           ${optionalString config.security.pam.enableEcryptfs
               "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
-          password requisite pam_unix.so nullok sha512
           ${optionalString cfg.pamMount
               "password optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
           ${optionalString config.users.ldap.enable
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index 590e6071b52..0ea5bc62fd4 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python, pam
-, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which }:
+, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
 
 stdenv.mkDerivation rec {
   name = "ecryptfs-${version}";
-  version = "106";
+  version = "108";
 
   src = fetchurl {
     url = "http://launchpad.net/ecryptfs/trunk/${version}/+download/ecryptfs-utils_${version}.orig.tar.gz";
-    sha256 = "1d5nlzcbl8ch639zi3lq6d14gkk4964j6dqhfs87i67867fhlghp";
+    sha256 = "1pfpzc907m4qi5h2rxmkqq072c6g22pik2rilj4bl4qishd8p0sj";
   };
 
   #TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir;
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
         --prefix PATH ":" "${rsync}/bin" \
         --prefix PATH ":" "${keyutils}/bin" \
         --prefix PATH ":" "${which}/bin" \
+        --prefix PATH ":" "${lsof}/bin" \
         --prefix PATH ":" "$out/bin"
     done
   '';

From 9d0efe846e15b951a44be434711e45aa020844ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Wed, 19 Aug 2015 11:04:34 +0100
Subject: [PATCH 1331/2016] rkt: init at 0.8.0

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

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
new file mode 100644
index 00000000000..0b3300e2026
--- /dev/null
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio
+, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "0.8.0";
+  name = "rkt-${version}";
+
+  src = fetchFromGitHub {
+      rev = "v${version}";
+      owner = "coreos";
+      repo = "rkt";
+      sha256 = "1abv9psd5w0m8p2kvrwyjnrclzajmrpbwfwmkgpnkydhmsimhnn0";
+  };
+
+  buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
+  
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -Rv build-rkt-${version}/bin/* $out/bin
+  '';
+    
+  meta = with lib; {
+    description = "A fast, composable, and secure App Container runtime for Linux";
+    homepage = http://rkt.io;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ragge ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7889e5c334d..ed4b1e5b8a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12506,6 +12506,8 @@ let
 
   RhythmDelay = callPackage ../applications/audio/RhythmDelay { };
 
+  rkt = callPackage ../applications/virtualization/rkt { };
+
   rofi = callPackage ../applications/misc/rofi {
     automake = automake114x;
   };

From 57c276110fa21aa3c03838b7c12554497128f07c Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 16 Aug 2015 15:39:56 -0400
Subject: [PATCH 1332/2016] haskell-ghcjs: use ghcjs compatible with new vector

Closes https://github.com/NixOS/nixpkgs/issues/9328.
---
 pkgs/development/compilers/ghcjs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 9f1d3122818..5423c41f25b 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -55,8 +55,8 @@ in mkDerivation (rec {
   inherit version;
   src = fetchgit {
     url = git://github.com/ghcjs/ghcjs.git;
-    rev = "fb1faa9cb0a11a8b27b0033dfdb07aafb6add35e"; # master branch
-    sha256 = "1vqf19059j86h3rnbvzcp55bdqd5dkw3krb5vkw5mgsmva2g8sch";
+    rev = "39c1cb6d5d2551b306a7957a0e7f682f4a048490"; # master branch
+    sha256 = "1v2hpmhdssgf1jmchiwkvp5j8j6rw3k0hpkf326vb8l1b0kbmibr";
   };
   isLibrary = true;
   isExecutable = true;

From bed96a585f7d2fe05a48dd7e86660bfb39348b8e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 19 Aug 2015 14:28:35 +0200
Subject: [PATCH 1333/2016] libmtp: Update to 1.1.9

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

diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index 938c995e755..13b40501933 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "libmtp-1.1.8";
+  name = "libmtp-1.1.9";
 
   propagatedBuildInputs = [ libusb1 ];
   buildInputs = [ pkgconfig ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/libmtp/${name}.tar.gz";
-    sha256 = "10i2vnj8r6hyd61xgyhmxbsissq971g50fhm1h6mc3m4d99qg7iz";
+    sha256 = "12dinqic0ljnhrwx3rc61jc7q24ybr0mckc2ya5kh1s1np0d7w93";
   };
 
   meta = {

From 86b34e3a0d858737d5c355fe8056566220c60277 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Tue, 18 Aug 2015 08:53:08 +0200
Subject: [PATCH 1334/2016] vimPlugins: add molokai

---
 pkgs/misc/vim-plugins/default.nix      | 10 ++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 23f8b0e16e3..8a88847f164 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -879,6 +879,16 @@ rec {
     '';
   };
 
+  molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "molokai-2014-04-11";
+    src = fetchgit {
+      url = "git://github.com/tomasr/molokai";
+      rev = "db8ce13b3737d3ddea8368498183d7c204a762eb";
+      sha256 = "34587133f0f17b8950ed0428b3deeacc2f15933ede8bfdd000593098ed6d903a";
+    };
+    dependencies = [];
+  };
+
   pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "pathogen-2014-11-06";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 7d3fa343375..486df183da3 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -51,6 +51,7 @@
 "github:shougo/vimshell.vim"
 "github:takac/vim-hardtime"
 "github:thinca/vim-quickrun"
+"github:tomasr/molokai"
 "github:travitch/hasksyn"
 "github:twinside/vim-haskellconceal"
 "github:valloric/youcompleteme"

From ec24fc6ecc8fc098a0fddd929d418a2879e65e66 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 19 Aug 2015 22:04:29 +0900
Subject: [PATCH 1335/2016] oraclejdk: 8u51 -> 8u60

---
 pkgs/development/compilers/oraclejdk/jdk8-linux.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
index b92521a044a..4fc3ea31927 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "51";
+  patchVersion = "60";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "0awzgs090n2cj6a5mlla0pgxk0y6aslhm6024pqrnxgai1fkmm1z";
-  sha256_x86_64 = "1wggrcr2gjwkv5bawgcw86h6rhyzw0jphxm1sfwcvhjirh99056p";
+  sha256_i686 = "e6a36b458351ed35bd7943739ba93d9a246e08a86433e148ff68b1b40d74c2e5";
+  sha256_x86_64 = "ebe51554d2f6c617a4ae8fc9a8742276e65af01bd273e96848b262b3c05424e5";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

From d8b9521d643af4e03c526310d1495d0b535c16ef Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 19 Aug 2015 16:05:25 +0200
Subject: [PATCH 1336/2016] nixos xfs_quota: add new module for managing
 xfs_quota projects

---
 nixos/modules/module-list.nix        |   1 +
 nixos/modules/programs/xfs_quota.nix | 109 +++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 nixos/modules/programs/xfs_quota.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6586b36968a..60255914d5d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -74,6 +74,7 @@
   ./programs/venus.nix
   ./programs/wvdial.nix
   ./programs/freetds.nix
+  ./programs/xfs_quota.nix
   ./programs/zsh/zsh.nix
   ./rename.nix
   ./security/apparmor.nix
diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix
new file mode 100644
index 00000000000..34a44d17e4e
--- /dev/null
+++ b/nixos/modules/programs/xfs_quota.nix
@@ -0,0 +1,109 @@
+# Configuration for the xfs_quota command
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.xfs_quota;
+
+  limitOptions = opts: concatStringsSep " " [
+    (optionalString (opts.sizeSoftLimit != null) "bsoft=${opts.sizeSoftLimit}")
+    (optionalString (opts.sizeHardLimit != null) "bhard=${opts.sizeHardLimit}")
+  ];
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    programs.xfs_quota = {
+      projects = mkOption {
+        type = types.attrsOf (types.submodule {
+          options = {
+            id = mkOption {
+              type = types.int;
+              description = "Project ID.";
+            };
+
+            fileSystem = mkOption {
+              type = types.string;
+              description = "XFS filesystem hosting the xfs_quota project.";
+              default = "/";
+            };
+
+            path = mkOption {
+              type = types.string;
+              description = "Project directory.";
+            };
+
+            sizeSoftLimit = mkOption {
+              type = types.nullOr types.string;
+              default = null;
+              example = "30g";
+              description = "Soft limit of the project size";
+            };
+
+            sizeHardLimit = mkOption {
+              type = types.nullOr types.string;
+              default = null;
+              example = "50g";
+              description = "Hard limit of the project size.";
+            };
+          };
+        });
+
+        description = "Setup of xfs_quota projects. Make sure the filesystem is mounted with the pquota option.";
+
+        example = {
+          "projname" = {
+            id = 50;
+            path = "/xfsprojects/projname";
+            sizeHardLimit = "50g";
+          };
+        };
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf (cfg.projects != {}) {
+
+    environment.etc.projects.source = pkgs.writeText "etc-project"
+      (concatStringsSep "\n" (mapAttrsToList
+        (name: opts: "${toString opts.id}:${opts.path}") cfg.projects));
+
+    environment.etc.projid.source = pkgs.writeText "etc-projid"
+      (concatStringsSep "\n" (mapAttrsToList
+        (name: opts: "${name}:${toString opts.id}") cfg.projects));
+
+    systemd.services = mapAttrs' (name: opts:
+      nameValuePair "xfs_quota-${name}" {
+        description = "Setup xfs_quota for project ${name}";
+        script = ''
+          ${pkgs.xfsprogs}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem}
+          ${pkgs.xfsprogs}/bin/xfs_quota -x -c 'limit -p ${limitOptions opts} ${name}' ${opts.fileSystem}
+        '';
+
+        wantedBy = [ "multi-user.target" ];
+        after = [ ((replaceChars [ "/" ] [ "-" ] opts.fileSystem) + ".mount") ];
+
+        restartTriggers = [ (pkgs.writeText "xfs_quota-project-trigger-${name}" (builtins.toJSON opts)) ];
+
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+        };
+      }
+    ) cfg.projects;
+
+  };
+
+}

From bc46013ac113a1d87b8b96b27cc7b18cc79fc177 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 19 Aug 2015 18:03:42 +0200
Subject: [PATCH 1337/2016] nixos xfs_quota: set default projects to {}

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

diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix
index 34a44d17e4e..129e23b7f1d 100644
--- a/nixos/modules/programs/xfs_quota.nix
+++ b/nixos/modules/programs/xfs_quota.nix
@@ -23,6 +23,7 @@ in
 
     programs.xfs_quota = {
       projects = mkOption {
+        default = {};
         type = types.attrsOf (types.submodule {
           options = {
             id = mkOption {

From 50e9dd7da19b11258664f2acd0e953d56d3dce7e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 19 Aug 2015 18:34:29 +0200
Subject: [PATCH 1338/2016] uclibc: Provide a more stable location for source.

At the upstream URL at http://git.uclibc.org/uClibc/snapshot/, older
versions are dropped at a regular basis. Unfortunately the tarball
"uClibc-20150131.tar.bz2" has already been deleted from that directory
and I didn't find a mirror providing the same file.

So I've switched it to use fetchzip from the cgit site instead of using
fetchgit directly. The reason why I didn't use fetchgit is that we'd
need need git, which depends (indirectly? not sure, haven't checked) on
libiconv and that in turn triggers an assertion if we're on Linux and
are cross-building using uclibc.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/uclibc/default.nix | 15 +++++++++------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 88cf59cf8b7..472d432bc63 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, linuxHeaders, libiconvReal, cross ? null, gccCross ? null,
+{stdenv, fetchzip, linuxHeaders, libiconvReal, cross ? null, gccCross ? null,
 extraConfig ? ""}:
 
 assert stdenv.isLinux;
@@ -52,15 +52,18 @@ let
     UCLIBC_HAS_FPU n
   '';
 
+  name = "uclibc-0.9.34-pre-20150131";
+  rev = "343f6b8f1f754e397632b0552e4afe586c8b392b";
+
 in
 
 stdenv.mkDerivation {
-  name = "uclibc-0.9.34-pre-20150131" + stdenv.lib.optionalString (cross != null)
-    ("-" + cross.config);
+  name = name + stdenv.lib.optionalString (cross != null) ("-" + cross.config);
 
-  src = fetchurl {
-    url = http://www.uclibc.org/downloads/snapshots/uClibc-20150131.tar.bz2;
-    sha256 = "14svyxw4nizdcz4vqk9nizlgy32d8ngpvcca34jjbdjjg77xdvkc";
+  src = fetchzip {
+    name = name + "-source";
+    url = "http://git.uclibc.org/uClibc/snapshot/uClibc-${rev}.tar.bz2";
+    sha256 = "1kgylzpid7da5i7wz7slh5q9rnq1m8bv5h9ilm76g0xwc2iwlhbw";
   };
 
   # 'ftw' needed to build acl, a coreutils dependency
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91ab805f12b..66b2619ec7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10268,7 +10268,7 @@ let
   uclibc = callPackage ../os-specific/linux/uclibc { };
 
   uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
-    inherit fetchurl stdenv libiconvReal;
+    inherit fetchzip stdenv libiconvReal;
     linuxHeaders = linuxHeadersCross;
     gccCross = gccCrossStageStatic;
     cross = assert crossSystem != null; crossSystem;

From 2066ac2956b138222537379cf9c4172895e60e9a Mon Sep 17 00:00:00 2001
From: Kevin Quick <quick@sparq.org>
Date: Wed, 19 Aug 2015 10:15:38 -0700
Subject: [PATCH 1339/2016] Specify no-tests cabal flag for vty-ui under ghc
 7.10.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++
 1 file changed, 3 insertions(+)

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 8c8498b7a13..87b1d34f7ed 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -268,4 +268,7 @@ self: super: {
   # https://github.com/haskell/haddock/issues/427
   haddock = dontCheck super.haddock;
 
+  # The tests in vty-ui do not build, but vty-ui itself builds.
+  vty-ui = enableCabalFlag super.vty-ui "no-tests";
+
 }

From 62b589a54f842a72c80fb481b24451be7f9823ae Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 19 Aug 2015 10:42:48 -0700
Subject: [PATCH 1340/2016] libressl: 2.2.1 -> 2.2.2

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

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 093f644c096..a56d4ead823 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "0bapzvxrg09p4hlzdhsvk0ljc3gsjj4ixjpf09dn0fzwmd81fcsg";
+    sha256 = "0551i4jbs81ark3jy6nycqpyqn7rg30nvcdjvdg58s6l6fgv1570";
   };
 
   enableParallelBuilding = true;

From e53e1c7070a431af250d8b15ed51ff16229f31bb Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 19 Aug 2015 20:04:08 +0200
Subject: [PATCH 1341/2016] nixos xfs_quota: simplify restartTriggers

---
 nixos/modules/programs/xfs_quota.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix
index 129e23b7f1d..d30a85922cf 100644
--- a/nixos/modules/programs/xfs_quota.nix
+++ b/nixos/modules/programs/xfs_quota.nix
@@ -96,7 +96,7 @@ in
         wantedBy = [ "multi-user.target" ];
         after = [ ((replaceChars [ "/" ] [ "-" ] opts.fileSystem) + ".mount") ];
 
-        restartTriggers = [ (pkgs.writeText "xfs_quota-project-trigger-${name}" (builtins.toJSON opts)) ];
+        restartTriggers = [ config.environment.etc.projects.source ];
 
         serviceConfig = {
           Type = "oneshot";

From 8f59f4c78c44be83600d4a9e3dfbb87ff602c261 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 31 May 2015 14:40:26 +0300
Subject: [PATCH 1342/2016] firefox: build with pulseaudio support (close
 #8087)

---
 pkgs/applications/networking/browsers/firefox/default.nix | 7 +++----
 pkgs/top-level/all-packages.nix                           | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index a9e4bc39f62..326f39515fc 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -3,7 +3,7 @@
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
 , hunspell, libevent, libstartup_notification, libvpx
-, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc
+, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
 , enableGTK3 ? false
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
       xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
       xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
       hunspell libevent libstartup_notification libvpx cairo
-      gstreamer gst_plugins_base icu libpng
-      jemalloc
+      gstreamer gst_plugins_base icu libpng jemalloc
+      libpulseaudio # only headers are needed
     ]
     ++ lib.optional enableGTK3 gtk3;
 
@@ -65,7 +65,6 @@ stdenv.mkDerivation rec {
       "--disable-necko-wifi" # maybe we want to enable this at some point
       "--disable-installer"
       "--disable-updater"
-      "--disable-pulseaudio"
       "--enable-jemalloc"
     ]
     ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66b2619ec7c..8b05a124ce0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13282,7 +13282,8 @@ let
          );
       libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
              (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
-             ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash;
+             ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
+             ++ lib.optional (config.pulseaudio or false) libpulseaudio;
       gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ];
       gtk_modules = [ libcanberra ];
     };

From 8d9e45c89ed50c17cf5f8242f916e507540bee55 Mon Sep 17 00:00:00 2001
From: Ian Duncan <ian@iankduncan.com>
Date: Wed, 19 Aug 2015 14:11:20 -0400
Subject: [PATCH 1343/2016] Upgrade to latest docker compose version

---
 pkgs/top-level/python-packages.nix | 38 ++++++++++++------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e28cb22a218..f989d05fe74 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2994,11 +2994,11 @@ let
   };
 
   docker = buildPythonPackage rec {
-    name = "docker-py-1.1.0";
+    name = "docker-py-1.3.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/d/docker-py/${name}.tar.gz";
-      md5 = "b44f34530a21ed1129887f9a8b01ecec";
+      md5 = "07a5f41fd3f8cc72d05deed628700e99";
     };
 
     propagatedBuildInputs = with self; [ six requests websocket_client ];
@@ -3014,13 +3014,15 @@ let
   };
 
   dockerpty = buildPythonPackage rec {
-    name = "dockerpty-0.3.2";
+    name = "dockerpty-0.3.4";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/d/dockerpty/${name}.tar.gz";
-      md5 = "1f97b24d2f4b2c345f176f91655002dd";
+      md5 = "92fb66d28aa19bf5268e7e3935670e5d";
     };
 
+    propagatedBuildInputs = with self; [ six ];
+
     meta = {
       description = "Functionality needed to operate the pseudo-tty (PTY) allocated to a docker container";
       homepage = https://github.com/d11wtq/dockerpty;
@@ -5663,32 +5665,22 @@ let
   };
 
   docker_compose = buildPythonPackage rec {
-    name = "docker-compose-1.2.0rc2";
+    version = "1.4.0";
+    name = "docker-compose-${version}";
+    namePrefix = "";
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/d/docker-compose/${name}.tar.gz";
-      md5 = "311ec5023e51097ca3acbf37fac062bd";
+      md5 = "a93e801ebe829c2f869cb23d0b606272";
     };
 
     propagatedBuildInputs = with self; [
-      six requests pyyaml texttable docopt docker
+      six requests pyyaml texttable docopt docker dockerpty websocket_client
       (requests2.override {
         src = pkgs.fetchurl {
-          url = "https://pypi.python.org/packages/source/r/requests/requests-2.5.3.tar.gz";
-          md5 = "23bf4fcc89ea8d353eb5353bb4a475b1";
-        };
-      })
-      (dockerpty.override {
-        src = pkgs.fetchurl {
-          url = "https://pypi.python.org/packages/source/d/dockerpty/dockerpty-0.3.2.tar.gz";
-          md5 = "1f97b24d2f4b2c345f176f91655002dd";
-        };
-      })
-      (websocket_client.override {
-        src = pkgs.fetchurl {
-          url = "https://pypi.python.org/packages/source/w/websocket-client/websocket-client-0.11.0.tar.gz";
-          md5 = "fcffbb5ac10941d9ace416d14d1e3ec8";
+          url = "https://pypi.python.org/packages/source/r/requests/requests-2.6.1.tar.gz";
+          md5 = "da6e487f89e6a531699b7fd97ff182af";
         };
       })
     ];
@@ -15691,11 +15683,11 @@ let
 
 
   websocket_client = buildPythonPackage rec {
-    name = "websocket-client-0.17.0";
+    name = "websocket_client-0.32.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/w/websocket-client/${name}.tar.gz";
-      md5 = "c86591719085eaf4a01c2275e0c834fc";
+      md5 = "b07a897511a3c585251fe2ea85a9d9d9";
     };
 
     propagatedBuildInputs = with self; [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ];

From f683031df22332e372ec8bae5883a21b416ba073 Mon Sep 17 00:00:00 2001
From: Paulus Esterhazy <pesterhazy@gmail.com>
Date: Wed, 19 Aug 2015 20:50:58 +0200
Subject: [PATCH 1344/2016] pass: Fix for Darwin

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

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 0480962fb96..3315683967c 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -3,7 +3,7 @@
 , makeWrapper
 
 , xclip ? null, xdotool ? null, dmenu ? null
-, x11Support ? true
+, x11Support ? !stdenv.isDarwin
 }:
 
 assert x11Support -> xclip != null

From 88b1d7e5d97fedc3d26b39fec84464886b902d9d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 19 Aug 2015 13:23:56 -0700
Subject: [PATCH 1345/2016] logstash-forwarder: 20141216 -> 0.4.0

---
 .../tools/misc/logstash-forwarder/default.nix | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix
index a20b1d57775..44fa1cb7cfb 100644
--- a/pkgs/tools/misc/logstash-forwarder/default.nix
+++ b/pkgs/tools/misc/logstash-forwarder/default.nix
@@ -1,15 +1,21 @@
-{ stdenv, fetchgit, go_1_3 }:
-stdenv.mkDerivation {
-  name = "logstash-forwarder-20141216";
-  src = fetchgit {
-    url = https://github.com/elasticsearch/logstash-forwarder.git;
-    rev = "6082bd8aaecb2180f5b56f4fb1b2940a6935ef7b";
-    sha256 = "1686rlx5p7d2806cg8y4376m4l7nvg1yjgg52ccrs0v4fnqs6292";
+{ stdenv, fetchFromGitHub, go }:
+
+stdenv.mkDerivation rec {
+  name = "logstash-forwarder-${version}";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "elasticsearch";
+    repo = "logstash-forwarder";
+    rev = "v${version}";
+    sha256 = "05g7366w8f7h75n1ia7njdpmparr6sfvn45xxfh5412zigqidz6l";
   };
-  buildInputs = [ go_1_3 ];
+
+  buildInputs = [ go ];
+
   installPhase = ''
     mkdir -p $out/bin
-    cp build/bin/logstash-forwarder $out/bin
+    find . -name logstash-forwarder -type f -exec cp {} $out/bin \;
   '';
 
   meta = {

From e27567cff107ae7d44ccc0bf76292cf0644d27d6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 19 Aug 2015 12:57:41 -0700
Subject: [PATCH 1346/2016] golang: Remove old, unused compilers

---
 pkgs/development/compilers/go/1.0.nix         |  95 ---------------
 pkgs/development/compilers/go/1.1-darwin.nix  |  79 ------------
 pkgs/development/compilers/go/1.1.nix         | 101 ----------------
 pkgs/development/compilers/go/1.2.nix         |  92 --------------
 pkgs/development/compilers/go/1.3.nix         | 113 ------------------
 pkgs/development/compilers/go/1.4.nix         |   2 +-
 .../compilers/go/1_0-gcc-bug.patch            |  19 ---
 .../compilers/go/1_0-opt-error.patch          |  12 --
 .../compilers/go/R_386_GOT32.patch            |  46 -------
 .../development/compilers/go/cacert-1.2.patch |  15 ---
 pkgs/development/compilers/go/cacert.patch    |  15 ---
 pkgs/development/compilers/go/gox.nix         |  28 -----
 ...ove-tools.patch => remove-tools-1.4.patch} |   0
 pkgs/top-level/all-packages.nix               |  14 +--
 14 files changed, 2 insertions(+), 629 deletions(-)
 delete mode 100644 pkgs/development/compilers/go/1.0.nix
 delete mode 100644 pkgs/development/compilers/go/1.1-darwin.nix
 delete mode 100644 pkgs/development/compilers/go/1.1.nix
 delete mode 100644 pkgs/development/compilers/go/1.2.nix
 delete mode 100644 pkgs/development/compilers/go/1.3.nix
 delete mode 100644 pkgs/development/compilers/go/1_0-gcc-bug.patch
 delete mode 100644 pkgs/development/compilers/go/1_0-opt-error.patch
 delete mode 100644 pkgs/development/compilers/go/R_386_GOT32.patch
 delete mode 100644 pkgs/development/compilers/go/cacert-1.2.patch
 delete mode 100644 pkgs/development/compilers/go/cacert.patch
 delete mode 100644 pkgs/development/compilers/go/gox.nix
 rename pkgs/development/compilers/go/{remove-tools.patch => remove-tools-1.4.patch} (100%)

diff --git a/pkgs/development/compilers/go/1.0.nix b/pkgs/development/compilers/go/1.0.nix
deleted file mode 100644
index b16ce93a3c5..00000000000
--- a/pkgs/development/compilers/go/1.0.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}:
-
-let
-  loader386 = "${glibc}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc}/lib/ld-linux.so.3";
-in
-
-stdenv.mkDerivation {
-  name = "go-1.0.3";
-
-  src = fetchurl {
-    url = http://go.googlecode.com/files/go1.0.3.src.tar.gz;
-    sha256 = "1pz31az3icwqfqfy3avms05jnqr0qrbrx9yqsclkdwbjs4rkbfkz";
-  };
-
-  buildInputs = [ bison glibc bash makeWrapper ];
-
-  # I'm not sure what go wants from its 'src', but the go installation manual
-  # describes an installation keeping the src.
-  preUnpack = ''
-    mkdir -p $out/share
-    cd $out/share
-  '';
-
-  prePatch = ''
-    cd ..
-    if [ ! -d go ]; then
-      mv * go
-    fi
-    cd go
-
-    patchShebangs ./ # replace /bin/bash
-    # !!! substituteInPlace does not seems to be effective.
-    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
-    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
-    sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
-    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
-
-    #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
-    #  -e 's,/bin/echo,${coreutils}/bin/echo,' \
-    #  src/pkg/exec/exec_test.go
-
-    # Disabling the 'os/http/net' tests (they want files not available in
-    # chroot builds)
-    rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
-    # The os test wants to read files in an existing path. Just it don't be /usr/bin.
-    sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
-    sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
-    # Disable the hostname test
-    sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
-  '';
-
-  patches = [ ./cacert.patch ./1_0-opt-error.patch ./1_0-gcc-bug.patch ];
-
-  GOOS = "linux";
-  GOARCH = if stdenv.system == "i686-linux" then "386"
-          else if stdenv.system == "x86_64-linux" then "amd64"
-          else if stdenv.system == "armv5tel-linux" then "arm"
-          else throw "Unsupported system";
-  GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-    export GOROOT="$(pwd)/"
-    export GOBIN="$out/bin"
-    export PATH="$GOBIN:$PATH"
-    cd ./src
-    ./all.bash
-    cd -
-
-    # Wrap the tools to define the location of the
-    # libraries.
-    for a in go gofmt godoc; do
-	    wrapProgram "$out/bin/$a" \
-	      --set "GOROOT" $out/share/go \
-        ${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""}
-    done
-
-    # Copy the emacs configuration for Go files.
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp ./misc/emacs/* $out/share/emacs/site-lisp/
-  '';
-
-  meta = {
-    branch = "1.0";
-    homepage = http://golang.org/;
-    description = "The Go Programming language";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ pierron viric ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/development/compilers/go/1.1-darwin.nix b/pkgs/development/compilers/go/1.1-darwin.nix
deleted file mode 100644
index 776c1e04f08..00000000000
--- a/pkgs/development/compilers/go/1.1-darwin.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ stdenv, fetchurl, bison, bash, makeWrapper }:
-
-stdenv.mkDerivation {
-  name = "go-1.1.2";
-
-  src = fetchurl {
-    url = http://go.googlecode.com/files/go1.1.2.src.tar.gz;
-    sha256 = "0w7bchhb4b053az3wjp6z342rs9lp9nxf4w2mnfd1b89d6sb7izz";
-  };
-
-  buildInputs = [ bison bash makeWrapper ];
-
-  preUnpack = ''
-    mkdir -p $out/share
-    cd $out/share
-  '';
-
-  prePatch = ''
-    cd ..
-    if [ ! -d go ]; then
-      mv * go
-    fi
-    cd go
-
-    patchShebangs ./ # replace /bin/bash
-    rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
-    # The os test wants to read files in an existing path. Just it don't be /usr/bin.
-    sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
-    sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
-    # Disable some tests
-    sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
-    sed -i '/TestShutdownUnix/areturn' src/pkg/net/net_test.go
-
-  '';
-
-  # Unfortunately we have to use Mac OS X's own GCC
-  preBuild = ''
-    export PATH=/usr/bin:$PATH
-  '';
-
-  #patches = [ ./cacert.patch ];
-
-  GOOS = "darwin";
-  GOARCH = if stdenv.system == "x86_64-darwin" then "amd64" else "386";
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-
-    # CGO is broken on Maverick. See: http://code.google.com/p/go/issues/detail?id=5926
-    # Reevaluate once go 1.1.3 is out
-    export CGO_ENABLED=0
-
-    export GOROOT="$(pwd)/"
-    export GOBIN="$out/bin"
-    export PATH="$GOBIN:$PATH"
-    cd ./src
-    ./all.bash
-    cd -
-
-    # Wrap the tools to define the location of the
-    # libraries.
-    for a in go gofmt godoc; do
-	    wrapProgram "$out/bin/$a" \
-	      --set "GOROOT" $out/share/go
-    done
-
-    # Copy the emacs configuration for Go files.
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp ./misc/emacs/* $out/share/emacs/site-lisp/
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://golang.org/;
-    description = "The Go Programming language";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ zef ];
-    platforms = platforms.darwin;
-  };
-}
diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix
deleted file mode 100644
index de34e3e3cda..00000000000
--- a/pkgs/development/compilers/go/1.1.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc
-, removeGodocExternals ? false }:
-
-let
-  loader386 = "${glibc}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc}/lib/ld-linux.so.3";
-in
-
-stdenv.mkDerivation {
-  name = "go-1.1.2";
-
-  src = fetchurl {
-    url = http://go.googlecode.com/files/go1.1.2.src.tar.gz;
-    sha256 = "0w7bchhb4b053az3wjp6z342rs9lp9nxf4w2mnfd1b89d6sb7izz";
-  };
-
-  buildInputs = [ bison glibc bash makeWrapper ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
-
-  # I'm not sure what go wants from its 'src', but the go installation manual
-  # describes an installation keeping the src.
-  preUnpack = ''
-    mkdir -p $out/share
-    cd $out/share
-  '';
-
-  prePatch = ''
-    cd ..
-    if [ ! -d go ]; then
-      mv * go
-    fi
-    cd go
-
-    patchShebangs ./ # replace /bin/bash
-    # !!! substituteInPlace does not seems to be effective.
-    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
-    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
-    sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
-    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
-    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
-
-    #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
-    #  -e 's,/bin/echo,${coreutils}/bin/echo,' \
-    #  src/pkg/exec/exec_test.go
-
-    # Disabling the 'os/http/net' tests (they want files not available in
-    # chroot builds)
-    rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
-    # The os test wants to read files in an existing path. Just it don't be /usr/bin.
-    sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
-    sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
-    # Disable the hostname test
-    sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
-    # ParseInLocation fails the test
-    sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go
-  '' + stdenv.lib.optionalString removeGodocExternals ''
-    sed -i -e '/googleapi/d' -e '/javascript">$/,+6d' lib/godoc/godoc.html 
-  '';
-
-  patches = [ ./cacert.patch ];
-
-  GOOS = "linux";
-  GOARCH = if stdenv.system == "i686-linux" then "386"
-          else if stdenv.system == "x86_64-linux" then "amd64"
-          else if stdenv.system == "armv5tel-linux" then "arm"
-          else throw "Unsupported system";
-  GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-    export GOROOT="$(pwd)/"
-    export GOBIN="$out/bin"
-    export PATH="$GOBIN:$PATH"
-    cd ./src
-    ./all.bash
-    cd -
-
-    # Wrap the tools to define the location of the
-    # libraries.
-    for a in go gofmt godoc; do
-	    wrapProgram "$out/bin/$a" \
-	      --set "GOROOT" $out/share/go \
-        ${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""}
-    done
-
-    # Copy the emacs configuration for Go files.
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp ./misc/emacs/* $out/share/emacs/site-lisp/
-  '';
-
-  meta = with stdenv.lib; {
-    branch = "1.1";
-    homepage = http://golang.org/;
-    description = "The Go Programming language";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ pierron viric ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
deleted file mode 100644
index 7aaedcb365d..00000000000
--- a/pkgs/development/compilers/go/1.2.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc
-, libgpgerror }:
-
-let
-  loader386 = "${glibc}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc}/lib/ld-linux.so.3";
-in
-
-stdenv.mkDerivation {
-  name = "go-1.2.2";
-
-  src = fetchurl {
-    url = https://storage.googleapis.com/golang/go1.2.2.src.tar.gz;
-    sha1 = "3ce0ac4db434fc1546fec074841ff40dc48c1167";
-  };
-
-  buildInputs = [ bison glibc bash makeWrapper libgpgerror ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
-
-  # I'm not sure what go wants from its 'src', but the go installation manual
-  # describes an installation keeping the src.
-  preUnpack = ''
-    mkdir -p $out/share
-    cd $out/share
-  '';
-
-  prePatch = ''
-    cd ..
-    if [ ! -d go ]; then
-      mv * go
-    fi
-    cd go
-
-    patchShebangs ./ # replace /bin/bash
-    # !!! substituteInPlace does not seems to be effective.
-    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
-    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
-    sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
-    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
-    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
-
-    #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
-    #  -e 's,/bin/echo,${coreutils}/bin/echo,' \
-    #  src/pkg/exec/exec_test.go
-
-    # Disabling the 'os/http/net' tests (they want files not available in
-    # chroot builds)
-    rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
-    # The os test wants to read files in an existing path. Just it don't be /usr/bin.
-    sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
-    sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
-    # Disable the hostname test
-    sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
-    # ParseInLocation fails the test
-    sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go
-  '';
-
-  patches = [ ./cacert-1.2.patch ];
-
-  GOOS = "linux";
-  GOARCH = if stdenv.system == "i686-linux" then "386"
-          else if stdenv.system == "x86_64-linux" then "amd64"
-          else if stdenv.system == "armv5tel-linux" then "arm"
-          else throw "Unsupported system";
-  GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
-  GO386 = 387; # from Arch: don't assume sse2 on i686
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-    export GOROOT="$(pwd)/"
-    export GOBIN="$out/bin"
-    export PATH="$GOBIN:$PATH"
-    cd ./src
-    ./all.bash
-    cd -
-
-    # Copy the emacs configuration for Go files.
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp ./misc/emacs/* $out/share/emacs/site-lisp/
-  '';
-
-  meta = with stdenv.lib; {
-    branch = "1.2";
-    homepage = http://golang.org/;
-    description = "The Go Programming language";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ pierron viric ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix
deleted file mode 100644
index 65b80a7f3af..00000000000
--- a/pkgs/development/compilers/go/1.3.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{ stdenv, lib, fetchurl, fetchhg, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }:
-
-let
-  loader386 = "${glibc}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc}/lib/ld-linux.so.3";
-  srcs = {
-    golang = fetchurl {
-      url = https://storage.googleapis.com/golang/go1.3.3.src.tar.gz;
-      sha1 = "b54b7deb7b7afe9f5d9a3f5dd830c7dede35393a";
-    };
-    tools = fetchhg {
-      url = https://code.google.com/p/go.tools/;
-      rev = "e1c276c4e679";
-      sha256 = "0x62njflwkd99i2ixbksg6mjppl1wfg86f0g3swn350l1h0xzp76";
-    };
-  };
-in
-
-stdenv.mkDerivation {
-  name = "go-1.3.3";
-
-  src = srcs.golang;
-
-  # perl is used for testing go vet
-  buildInputs = [ bison bash makeWrapper perl ] ++ lib.optionals stdenv.isLinux [ glibc ] ;
-
-  # I'm not sure what go wants from its 'src', but the go installation manual
-  # describes an installation keeping the src.
-  preUnpack = ''
-    mkdir -p $out/share
-    cd $out/share
-  '';
-  postUnpack = ''
-    mkdir -p $out/share/go/src/pkg/code.google.com/p/
-    cp -rv --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/pkg/code.google.com/p/go.tools
-  '';
-
-  prePatch = ''
-    # Ensure that the source directory is named go
-    cd ..
-    if [ ! -d go ]; then
-      mv * go
-    fi
-    cd go
-    patchShebangs ./ # replace /bin/bash
-
-    # Disabling the 'os/http/net' tests (they want files not available in
-    # chroot builds)
-    rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
-    # !!! substituteInPlace does not seems to be effective.
-    # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
-    sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
-    sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
-    # Disable the unix socket test
-    sed -i '/TestShutdownUnix/areturn' src/pkg/net/net_test.go
-    # Disable the hostname test
-    sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
-    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
-    # ParseInLocation fails the test
-    sed -i '/TestParseInSydney/areturn' src/pkg/time/format_test.go
-  '' + lib.optionalString stdenv.isLinux ''
-    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
-    sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c
-    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
-    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
-  '';
-
-  patches = [ ./cacert-1.2.patch ./R_386_GOT32.patch ];
-
-  GOOS = if stdenv.isDarwin then "darwin" else "linux";
-  GOARCH = if stdenv.isDarwin then "amd64"
-           else if stdenv.system == "i686-linux" then "386"
-           else if stdenv.system == "x86_64-linux" then "amd64"
-           else if stdenv.system == "armv5tel-linux" then "arm"
-           else throw "Unsupported system";
-  GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
-  GO386 = 387; # from Arch: don't assume sse2 on i686
-  CGO_ENABLED = if stdenv.isDarwin then 0 else 1;
-
-  installPhase = ''
-    export CC=cc
-    mkdir -p "$out/bin"
-    unset GOPATH
-    export GOROOT="$(pwd)/"
-    export GOBIN="$out/bin"
-    export PATH="$GOBIN:$PATH"
-    cd ./src
-    ./all.bash
-    cd -
-
-    # Build extra tooling
-    # TODO: Fix godoc tests
-    TOOL_ROOT=code.google.com/p/go.tools/cmd
-    go install -v $TOOL_ROOT/cover $TOOL_ROOT/vet $TOOL_ROOT/godoc
-    go test -v    $TOOL_ROOT/cover $TOOL_ROOT/vet # $TOOL_ROOT/godoc
-
-    # Copy the emacs configuration for Go files.
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp ./misc/emacs/* $out/share/emacs/site-lisp/
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = with stdenv.lib; {
-    branch = "1.3";
-    homepage = http://golang.org/;
-    description = "The Go Programming language";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ cstrahan ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index d42873ab975..559bd9b01c3 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./cacert-1.4.patch
-    ./remove-tools.patch
+    ./remove-tools-1.4.patch
   ];
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";
diff --git a/pkgs/development/compilers/go/1_0-gcc-bug.patch b/pkgs/development/compilers/go/1_0-gcc-bug.patch
deleted file mode 100644
index 34cf7ab7456..00000000000
--- a/pkgs/development/compilers/go/1_0-gcc-bug.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://code.google.com/p/go/source/detail?r=8b13b2ec6b18
---- a/src/cmd/cgo/gcc.go	2014-07-02 12:00:12.171796197 +0200
-+++ b/src/cmd/cgo/gcc.go	2014-07-02 12:01:57.844472754 +0200
-@@ -840,6 +840,15 @@
- func (p *Package) gccErrors(stdin []byte) string {
- 	// TODO(rsc): require failure
- 	args := p.gccCmd()
-+
-+	// GCC 4.8.0 has a bug: it sometimes does not apply
-+	// -Wunused-value to values that are macros defined in system
-+	// headers.  See issue 5118.  Adding -Wsystem-headers avoids
-+	// that problem.  This will produce additional errors, but it
-+	// doesn't matter because we will ignore all errors that are
-+	// not marked for the cgo-test file.
-+	args = append(args, "-Wsystem-headers")
-+
- 	if *debugGcc {
- 		fmt.Fprintf(os.Stderr, "$ %s <<EOF\n", strings.Join(args, " "))
- 		os.Stderr.Write(stdin)
diff --git a/pkgs/development/compilers/go/1_0-opt-error.patch b/pkgs/development/compilers/go/1_0-opt-error.patch
deleted file mode 100644
index d3fcd40449a..00000000000
--- a/pkgs/development/compilers/go/1_0-opt-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://code.google.com/p/go-wiki/wiki/OlderVersions
---- a/src/cmd/cc/funct.c	2014-07-02 11:54:42.230663598 +0200
-+++ b/src/cmd/cc/funct.c	2014-07-02 11:55:01.653790128 +0200
-@@ -269,7 +269,7 @@
- 		goto bad;
- 
- 	f = alloc(sizeof(*f));
--	for(o=0; o<sizeof(f->sym); o++)
-+	for(o=0; o<nelem(f->sym); o++)
- 		f->sym[o] = S;
- 
- 	t->funct = f;
diff --git a/pkgs/development/compilers/go/R_386_GOT32.patch b/pkgs/development/compilers/go/R_386_GOT32.patch
deleted file mode 100644
index c029d50168a..00000000000
--- a/pkgs/development/compilers/go/R_386_GOT32.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 609d996fac7f68b34032572b7bde627f658b95f2 Mon Sep 17 00:00:00 2001
-From: Russ Cox <rsc@golang.org>
-Date: Mon, 6 Oct 2014 14:17:48 -0400
-Subject: [PATCH] cmd/8l: accept R_386_GOT32 in push instruction
-
-Fixes #8382.
-
-LGTM=iant
-R=iant
-CC=golang-codereviews
-https://golang.org/cl/149540045
----
- src/cmd/8l/asm.c | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/src/cmd/8l/asm.c b/src/cmd/8l/asm.c
-index c135dce..98c0424 100644
---- a/src/cmd/8l/asm.c
-+++ b/src/cmd/8l/asm.c
-@@ -117,13 +117,21 @@ adddynrel(LSym *s, Reloc *r)
- 	case 256 + R_386_GOT32:
- 		if(targ->type != SDYNIMPORT) {
- 			// have symbol
--			// turn MOVL of GOT entry into LEAL of symbol itself
--			if(r->off < 2 || s->p[r->off-2] != 0x8b) {
--				diag("unexpected GOT reloc for non-dynamic symbol %s", targ->name);
-+			if(r->off >= 2 && s->p[r->off-2] == 0x8b) {
-+				// turn MOVL of GOT entry into LEAL of symbol address, relative to GOT.
-+				s->p[r->off-2] = 0x8d;
-+				r->type = R_GOTOFF;
- 				return;
- 			}
--			s->p[r->off-2] = 0x8d;
--			r->type = R_GOTOFF;
-+			if(r->off >= 2 && s->p[r->off-2] == 0xff && s->p[r->off-1] == 0xb3) {
-+				// turn PUSHL of GOT entry into PUSHL of symbol itself.
-+				// use unnecessary SS prefix to keep instruction same length.
-+				s->p[r->off-2] = 0x36;
-+				s->p[r->off-1] = 0x68;
-+				r->type = R_ADDR;
-+				return;
-+			}
-+			diag("unexpected GOT reloc for non-dynamic symbol %s", targ->name);
- 			return;
- 		}
- 		addgotsym(ctxt, targ);
diff --git a/pkgs/development/compilers/go/cacert-1.2.patch b/pkgs/development/compilers/go/cacert-1.2.patch
deleted file mode 100644
index 1ad6910915f..00000000000
--- a/pkgs/development/compilers/go/cacert-1.2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Go comes with hardcoded cacert. We add the usual in NixOS,
-for easier NixOS life.
-
-diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go
-index 76e79f4..6ef1dd3 100644
---- a/src/pkg/crypto/x509/root_unix.go
-+++ b/src/pkg/crypto/x509/root_unix.go
-@@ -15,6 +15,7 @@ var certFiles = []string{
-	"/etc/ssl/ca-bundle.pem",                 // OpenSUSE
-	"/etc/ssl/cert.pem",                      // OpenBSD
-	"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly
-+	"/etc/ssl/certs/ca-bundle.crt",           // NixOS
- }
- 
- func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {
diff --git a/pkgs/development/compilers/go/cacert.patch b/pkgs/development/compilers/go/cacert.patch
deleted file mode 100644
index 42a44313835..00000000000
--- a/pkgs/development/compilers/go/cacert.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Go comes with hardcoded cacert. We add the usual in NixOS,
-for easier NixOS life.
-
-diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go
-index 76e79f4..6ef1dd3 100644
---- a/src/pkg/crypto/x509/root_unix.go
-+++ b/src/pkg/crypto/x509/root_unix.go
-@@ -15,6 +15,7 @@ var certFiles = []string{
- 	"/etc/ssl/ca-bundle.pem",                 // OpenSUSE
- 	"/etc/ssl/cert.pem",                      // OpenBSD
- 	"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD
-+	"/etc/ssl/certs/ca-bundle.crt",           // NixOS
- }
- 
- func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {
diff --git a/pkgs/development/compilers/go/gox.nix b/pkgs/development/compilers/go/gox.nix
deleted file mode 100644
index 1833ca37d0e..00000000000
--- a/pkgs/development/compilers/go/gox.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "c7329055e2aeb253a947e5cc876586ff4ca19199";
-  name = "gox-${lib.strings.substring 0 7 rev}";
-  goPackagePath = "github.com/mitchellh/gox";
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "mitchellh";
-    repo = "gox";
-    sha256 = "0zhb88jjxqn3sdc4bpzvajqvgi9igp5gk03q12gaksaxhy2wl4jy";
-  };
-
-  buildInputs = [ iochan ];
-
-  propagatedBuildInputs = [ go ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "A simple, no-frills tool for Go cross compilation that behaves a lot like standard go build";
-    homepage    = https://github.com/mitchellh/gox;
-    maintainers = with maintainers; [ cstrahan ];
-    platforms   = platforms.unix;
-  };
-}
diff --git a/pkgs/development/compilers/go/remove-tools.patch b/pkgs/development/compilers/go/remove-tools-1.4.patch
similarity index 100%
rename from pkgs/development/compilers/go/remove-tools.patch
rename to pkgs/development/compilers/go/remove-tools-1.4.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b05a124ce0..95dd3cadd1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4039,18 +4039,6 @@ let
 
   dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { inherit stdenv fetchNuGet; });
 
-  go_1_0 = callPackage ../development/compilers/go/1.0.nix { };
-
-  go_1_1 =
-    if stdenv.isDarwin then
-      callPackage ../development/compilers/go/1.1-darwin.nix { }
-    else
-      callPackage ../development/compilers/go/1.1.nix { };
-
-  go_1_2 = callPackage ../development/compilers/go/1.2.nix { };
-
-  go_1_3 = callPackage ../development/compilers/go/1.3.nix { };
-
   go_1_4 = callPackage ../development/compilers/go/1.4.nix {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -4059,7 +4047,7 @@ let
 
   go-repo-root = callPackage ../development/tools/misc/go-repo-root { };
 
-  gox = callPackage ../development/compilers/go/gox.nix { };
+  gox = goPackages.gox;
 
   gprolog = callPackage ../development/compilers/gprolog { };
 

From c3592084cf17865ba460a1be0e7af97c6c3571c5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 19 Aug 2015 13:50:09 -0700
Subject: [PATCH 1347/2016] golint: Update to 2015-06-23

---
 pkgs/development/tools/golint/default.nix | 28 -----------------------
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            | 11 +++++++++
 3 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/tools/golint/default.nix

diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
deleted file mode 100644
index 7be4f84680a..00000000000
--- a/pkgs/development/tools/golint/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "8ca23475bcb43213a55dd8210b69363f6b0e09c1";
-  name = "golint-${lib.strings.substring 0 7 rev}";
-  goPackagePath = "github.com/golang/lint";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "golang";
-    repo = "lint";
-    sha256 = "16wbykik6dw3x9s7iqi4ln8kvzsh3g621wb8mk4nfldw7lyqp3cs";
-  };
-
-  subPackages = [ "golint" ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "Linter for Go source code";
-    homepage = https://github.com/golang/lint;
-    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 95dd3cadd1a..7064ad1855f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10043,7 +10043,7 @@ let
 
   gotags = callPackage ../development/tools/gotags { };
 
-  golint = callPackage ../development/tools/golint { goPackages = go13Packages; };
+  golint = goPackages.lint;
 
   godep = callPackage ../development/tools/godep { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 826aa90e8d1..231d2c81272 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1298,6 +1298,17 @@ let
     sha256 = "0v6g14ygnjl1l2fykyfjyvnab82a70jy0zzmsn5swlyy45b9gq2d";
   };
 
+  lint = buildFromGitHub {
+    rev = "7b7f4364ff76043e6c3610281525fabc0d90f0e4";
+    date = "2015-06-23";
+    owner = "golang";
+    repo = "lint";
+    sha256 = "1bj7zv534hyh87bp2vsbhp94qijc5nixb06li1dzfz9n0wcmlqw9";
+    excludedPackages = "testdata";
+    dontInstallSrc = true;
+    buildInputs = [ tools ];
+  };
+
   goquery = buildGoPackage rec {
     rev = "f065786d418c9d22a33cad33decd59277af31471"; #tag v.0.3.2
     name = "goquery-${stdenv.lib.strings.substring 0 7 rev}";

From ef07bd04dca43a3ea5902a62d729cc2cc91999d1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 19 Aug 2015 13:50:43 -0700
Subject: [PATCH 1348/2016] golang: Remove the last references to go-1.3

---
 pkgs/top-level/all-packages.nix | 10 ----------
 pkgs/top-level/go-packages.nix  |  4 ----
 2 files changed, 14 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7064ad1855f..66ea5265047 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8619,16 +8619,6 @@ let
 
   ### DEVELOPMENT / GO MODULES
 
-  go13Packages = recurseIntoAttrs (callPackage ./go-packages.nix {
-    go = go_1_3;
-    buildGoPackage = import ../development/go-modules/generic {
-      go = go_1_3;
-      govers = go13Packages.govers;
-      inherit lib;
-   };
-    overrides = (config.goPackageOverrides or (p: {})) pkgs;
-  });
-
   go14Packages = recurseIntoAttrs (callPackage ./go-packages.nix {
     go = go_1_4;
     buildGoPackage = import ../development/go-modules/generic {
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 231d2c81272..fa1d71621a3 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -4,7 +4,6 @@
 , fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchFromBitbucket, fetchbzr, pkgs }:
 
 let
-  isGo13 = go.meta.branch == "1.3";
   isGo14 = go.meta.branch == "1.4";
 
   buildFromGitHub = { rev, owner, repo, sha256, name ? repo, goPackagePath ? "github.com/${owner}/${repo}", ... }@args: buildGoPackage (args // {
@@ -21,7 +20,6 @@ let
 
   crypto = buildFromGitHub {
     rev      = "4d48e5fa3d62b5e6e71260571bf76c767198ca02";
-    disabled = isGo13;
     owner    = "golang";
     repo     = "crypto";
     sha256   = "0plvjv56afb02p7l3c2zfwffnhscmc3f0ckj1gls9ay6vj85y7l8";
@@ -1014,7 +1012,6 @@ let
     rev = "4734e7aca379f0d7fcdf04fbb2101696a4b45ce8";
     name = "go-etcd-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/coreos/go-etcd";
-    disabled = isGo13;
 
     src = fetchFromGitHub {
       inherit rev;
@@ -1255,7 +1252,6 @@ let
     rev = "2688e91251d9d8e404e86dd8f096e23b2f086958";
     name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/coreos/go-systemd";
-    disabled = isGo13;
 
     excludedPackages = "examples";
 

From bf0da55a8c37eca933055dfffbe1ef3a3603ba22 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 19 Aug 2015 13:50:27 -0700
Subject: [PATCH 1349/2016] gotools: Fix build and update to 2015-08-19

---
 .../go-modules/generic/default.nix            |  7 ++++++-
 pkgs/top-level/go-packages.nix                | 20 +++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 021b57c0a19..fafefd325df 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -16,6 +16,10 @@
 
 , dontRenameImports ? false
 
+# Do not enable this without good reason
+# IE: programs coupled with the compiler
+, allowGoReference ? false
+
 , meta ? {}, ... } @ args':
 
 if disabled then throw "${name} not supported for go ${go.meta.branch}" else
@@ -161,7 +165,8 @@ go.stdenv.mkDerivation (
     runHook postInstall
   '';
 
-  disallowedReferences = [ go ] ++ lib.optional (!dontRenameImports) govers;
+  disallowedReferences = lib.optional (!allowGoReference) go
+    ++ lib.optional (!dontRenameImports) govers;
 
   passthru = passthru // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index cbfb28a7947..470548ed6b7 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -117,9 +117,12 @@ let
     goPackageAliases = [ "github.com/golang/text" ];
   };
 
-  tools = buildGoPackage rec {
-    rev = "7d75e8b219c3efda2d08ae38acd6b42f8da4f5f9";
-    name = "tools-${stdenv.lib.strings.substring 0 7 rev}";
+  tools = buildFromGitHub {
+    rev = "93604a3dc2a5ae0168456c672ec35cc90ea881e6";
+    date = "2015-08-19";
+    owner = "golang";
+    repo = "tools";
+    sha256 = "1yd3hwsbsjrmx85nihss55wy91y8sld7p0599j5k9xi0n1mrxdci";
     goPackagePath = "golang.org/x/tools";
     goPackageAliases = [ "code.google.com/p/go.tools" ];
 
@@ -135,14 +138,11 @@ let
 
     excludedPackages = "testdata";
 
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "golang";
-      repo = "tools";
-      sha256 = "0vq0l3pjhgsp97v6ndlr3jcs029r5zilwai30snwfq74s580sriq";
-    };
-
     buildInputs = [ net ];
+
+    # Do not copy this without a good reason for enabling
+    # In this case tools is heavily coupled with go itself and embeds paths.
+    allowGoReference = true;
   };
 
   ## THIRD PARTY

From d05cb3e0ea8074faf9251f1d1630d78b03375467 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 19 Aug 2015 23:22:44 +0200
Subject: [PATCH 1350/2016] go: add 1.5 compiler and packages

---
 pkgs/development/compilers/go/1.5.nix         | 116 ++++++++++++++++++
 .../development/compilers/go/cacert-1.5.patch |   8 ++
 pkgs/top-level/all-packages.nix               |  14 +++
 3 files changed, 138 insertions(+)
 create mode 100644 pkgs/development/compilers/go/1.5.nix
 create mode 100644 pkgs/development/compilers/go/cacert-1.5.patch

diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix
new file mode 100644
index 00000000000..a6084ae1289
--- /dev/null
+++ b/pkgs/development/compilers/go/1.5.nix
@@ -0,0 +1,116 @@
+{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl
+, go_1_4, runCommand, which, patch
+, Security }:
+
+let
+  loader386 = "${glibc}/lib/ld-linux.so.2";
+  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
+  loaderArm = "${glibc}/lib/ld-linux.so.3";
+  goBootstrap = runCommand "go-bootstrap" {} ''
+    mkdir $out
+    cp -rf ${go_1_4}/* $out/
+    chmod -R u+w $out
+    find $out -name "*.c" -delete
+    cp -rf $out/bin/* $out/share/go/bin/
+  '';
+in
+
+stdenv.mkDerivation rec {
+  name = "go-${version}";
+  version = "1.5";
+
+  src = fetchurl {
+    url = "https://github.com/golang/go/archive/go${version}.tar.gz";
+    sha256 = "03g3w6af74xggqlgwf5xriqzl9a0q17sp0qbyq8qs55qls07r81p";
+  };
+
+  # perl is used for testing go vet
+  buildInputs = [ bison bash makeWrapper perl which patch ]
+             ++ lib.optionals stdenv.isLinux [ glibc ];
+
+  propagatedBuildInputs = lib.optional stdenv.isDarwin Security;
+
+  # I'm not sure what go wants from its 'src', but the go installation manual
+  # describes an installation keeping the src.
+  preUnpack = ''
+    mkdir -p $out/share
+    cd $out/share
+  '';
+
+  prePatch = ''
+    # Ensure that the source directory is named go
+    cd ..
+    if [ ! -d go ]; then
+      mv * go
+    fi
+
+    cd go
+    patchShebangs ./ # replace /bin/bash
+
+    # Disabling the 'os/http/net' tests (they want files not available in
+    # chroot builds)
+    rm src/net/{listen_test.go,parse_test.go,port_test.go}
+    rm src/syscall/exec_linux_test.go
+    # !!! substituteInPlace does not seems to be effective.
+    # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
+    sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
+    sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
+    # Disable the unix socket test
+    sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
+    # Disable the hostname test
+    sed -i '/TestHostname/areturn' src/os/os_test.go
+    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
+    # ParseInLocation fails the test
+    sed -i '/TestParseInSydney/areturn' src/time/format_test.go
+  '' + lib.optionalString stdenv.isLinux ''
+    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
+  '' + lib.optionalString stdenv.isDarwin ''
+    sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
+    sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
+    sed -i '/TestRead0/areturn' src/os/os_test.go
+    sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
+
+    touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
+  '';
+
+  # TODO: port tools patch
+  patches = [
+    ./cacert-1.5.patch
+  ];
+
+  GOOS = if stdenv.isDarwin then "darwin" else "linux";
+  GOARCH = if stdenv.isDarwin then "amd64"
+           else if stdenv.system == "i686-linux" then "386"
+           else if stdenv.system == "x86_64-linux" then "amd64"
+           else if stdenv.isArm then "arm"
+           else throw "Unsupported system";
+  GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
+  GO386 = 387; # from Arch: don't assume sse2 on i686
+  CGO_ENABLED = 1;
+  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
+
+  # The go build actually checks for CC=*/clang and does something different, so we don't
+  # just want the generic `cc` here.
+  CC = if stdenv.isDarwin then "clang" else "cc";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    export GOROOT="$(pwd)/"
+    export GOBIN="$out/bin"
+    export PATH="$GOBIN:$PATH"
+    cd ./src
+    echo Building
+    ./all.bash
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  meta = with stdenv.lib; {
+    branch = "1.5";
+    homepage = http://golang.org/;
+    description = "The Go Programming language";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ cstrahan wkennington ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/compilers/go/cacert-1.5.patch b/pkgs/development/compilers/go/cacert-1.5.patch
new file mode 100644
index 00000000000..32c322a104e
--- /dev/null
+++ b/pkgs/development/compilers/go/cacert-1.5.patch
@@ -0,0 +1,8 @@
+--- a/src/crypto/x509/root_linux.go	2015-08-19 23:06:11.115133174 +0200
++++ b/src/crypto/x509/root_linux.go	2015-08-19 23:07:04.238507161 +0200
+@@ -10,4 +10,5 @@
+ 	"/etc/pki/tls/certs/ca-bundle.crt",   // Fedora/RHEL
+ 	"/etc/ssl/ca-bundle.pem",             // OpenSUSE
+ 	"/etc/pki/tls/cacert.pem",            // OpenELEC
++	"/etc/ssl/certs/ca-bundle.crt",       // NixOS
+ }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 83e1f48bb0c..0bdbb2bfa21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4045,6 +4045,10 @@ let
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  go_1_5 = callPackage ../development/compilers/go/1.5.nix {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   go = go_1_4;
 
   go-repo-root = callPackage ../development/tools/misc/go-repo-root { };
@@ -8631,6 +8635,16 @@ let
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   });
 
+  go15Packages = recurseIntoAttrs (callPackage ./go-packages.nix {
+    go = go_1_5;
+    buildGoPackage = import ../development/go-modules/generic {
+      go = go_1_5;
+      govers = go15Packages.govers;
+      inherit lib;
+    };
+    overrides = (config.goPackageOverrides or (p: {})) pkgs;
+  });
+
   goPackages = go14Packages;
 
   ### DEVELOPMENT / LISP MODULES

From 81ce9be104b0678abf9f0984bf4b2c4474de2ee6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Aug 2015 23:36:23 +0200
Subject: [PATCH 1351/2016] Revert "Move licenseAllowed check into the builder
 attribute (fixes #7541)"

This reverts commit 4d6452ba. The change affects Hydra in a way we didn't
expect: https://github.com/NixOS/nixpkgs/pull/9305#issuecomment-132791730.
---
 pkgs/stdenv/generic/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 19443e3e6ea..fe7bec54ba0 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -131,6 +131,8 @@ let
         else true;
 
     in
+      assert licenseAllowed attrs;
+
       lib.addPassthru (derivation (
         (removeAttrs attrs
           ["meta" "passthru" "crossAttrs" "pos"
@@ -150,7 +152,7 @@ let
           computedPropagatedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs));
         in
         {
-          builder = assert licenseAllowed attrs; attrs.realBuilder or shell;
+          builder = attrs.realBuilder or shell;
           args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
           stdenv = result;
           system = result.system;

From c171cfabed21d80759a5d5c20a58682362ebd952 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 19 Aug 2015 23:38:44 +0200
Subject: [PATCH 1352/2016] nixos/racoon: create /var/racoon upon start

---
 nixos/modules/services/networking/racoon.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/racoon.nix b/nixos/modules/services/networking/racoon.nix
index 9428d9112a1..86e13d1ea0d 100644
--- a/nixos/modules/services/networking/racoon.nix
+++ b/nixos/modules/services/networking/racoon.nix
@@ -36,7 +36,10 @@ in {
         Type = "forking";
         Restart = "always";
       };
-      preStart = "rm /var/run/racoon.pid || true";
+      preStart = ''
+        rm /var/run/racoon.pid || true
+        mkdir -p /var/racoon
+      '';
     };
   };
 }

From 62e2b2124a4336dd6967729442e05878c538f924 Mon Sep 17 00:00:00 2001
From: ssgen <stroestefan@gmail.com>
Date: Mon, 17 Aug 2015 21:45:37 +0300
Subject: [PATCH 1353/2016] fatresize: init at 1.0.2

---
 pkgs/tools/filesystems/fatresize/default.nix  | 39 ++++++++++
 .../fatresize/fatresize_parted_nix.patch      | 74 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 115 insertions(+)
 create mode 100644 pkgs/tools/filesystems/fatresize/default.nix
 create mode 100644 pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch

diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix
new file mode 100644
index 00000000000..7fb60d2f388
--- /dev/null
+++ b/pkgs/tools/filesystems/fatresize/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, parted, substituteAll, utillinux }:
+
+stdenv.mkDerivation rec {
+  
+  version = "1.0.2";
+  name = "fatresize-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2";
+    sha256 = "04wp48jpdvq4nn0dgbw5za07g842rnxlh9mig4mslz70zqs0izjm";
+  };
+  
+  buildInputs = [ parted utillinux ];
+  
+  # This patch helps this unmantained piece of software to be built against recent parted
+  # It basically modifies the detection scheme for parted version (the current one has no micro version defined)
+  # The second change is to include a header for a moved function since 1.6+ to current 3.1+ parted
+  # The third change is to modify the call to PED_ASSERT that is no longer defined with 2 params
+  patches = [ ./fatresize_parted_nix.patch ];
+  
+  preConfigure = ''
+    echo "Replacing calls to ped_free with free ..."
+    substituteInPlace ./fatresize.c --replace ped_free free
+  '';
+  
+  # Filesystem resize functions were reintroduced in parted 3.1 due to no other available free alternatives
+  # but in a sepparate library -> libparted-fs-resize --- that's why the added LDFLAG
+  makeFlags = ''
+    LDFLAGS=-lparted-fs-resize
+  '';
+  
+  propagatedBuildInputs = [ parted utillinux ];
+  
+  meta = {
+    description = "The FAT16/FAT32 non-destructive resizer";
+    homepage = http://sourceforge.net/projects/fatresize;
+    platform = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch b/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch
new file mode 100644
index 00000000000..e9aa87a2d56
--- /dev/null
+++ b/pkgs/tools/filesystems/fatresize/fatresize_parted_nix.patch
@@ -0,0 +1,74 @@
+diff --git a/aclocal.m4 b/aclocal.m4
+index 18e8176..2e75592 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -88,8 +88,15 @@ int main ()
+ 	if ( !(version = ped_get_version ()) )
+ 		exit(1);
+ 	if (sscanf(version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+-		printf("%s, bad version string\n", version);
+-		exit(1);
++		if (sscanf(version, "%d.%d", &major, &minor) != 2)
++		{
++		  printf("%s, bad version string\n", version);
++		  exit(1);
++		}
++		else
++		{
++		  micro = 0;
++		}
+ 	}
+ 	
+ 	if ((major > $parted_config_major_version) ||
+diff --git a/configure b/configure
+index ed31457..e5f1705 100755
+--- a/configure
++++ b/configure
+@@ -4793,8 +4793,15 @@ int main ()
+ 	if ( !(version = ped_get_version ()) )
+ 		exit(1);
+ 	if (sscanf(version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+-		printf("%s, bad version string\n", version);
+-		exit(1);
++		if (sscanf(version, "%d.%d", &major, &minor) != 2)
++		{
++		  printf("%s, bad version string\n", version);
++		  exit(1);
++		}
++		else
++		{
++		  micro = 0;
++		}
+ 	}
+ 
+ 	if ((major > $parted_config_major_version) ||
+diff --git a/fatresize.c b/fatresize.c
+index 424d5d2..e439102 100644
+--- a/fatresize.c
++++ b/fatresize.c
+@@ -30,6 +30,7 @@
+ #include <inttypes.h>
+ #include <parted/parted.h>
+ #include <parted/debug.h>
++#include <parted/filesys.h>
+ #include <parted/unit.h>
+ 
+ #include "config.h"
+@@ -217,7 +218,7 @@ fatresize_handler(PedException *ex)
+ static int
+ snap(PedSector* sector, PedSector new_sector, PedGeometry* range)
+ {
+-    PED_ASSERT(ped_geometry_test_sector_inside (range, *sector), return 0);
++    PED_ASSERT(ped_geometry_test_sector_inside (range, *sector));
+     if (!ped_geometry_test_sector_inside(range, new_sector))
+ 	return 0;
+ 
+@@ -281,7 +282,7 @@ snap_to_boundaries (PedGeometry* new_geom, PedGeometry* old_geom,
+ 			  end_part->geom.end, end_part->geom.start - 1, -1);
+ 	}
+ 
+-	PED_ASSERT (start <= end, return);
++	PED_ASSERT (start <= end);
+ 	ped_geometry_set (new_geom, start, end - start + 1);
+ }
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66ea5265047..ee895a766df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1519,6 +1519,8 @@ let
   lp_solve = callPackage ../applications/science/math/lp_solve { };
 
   lprof = callPackage ../tools/graphics/lprof { };
+  
+  fatresize = callPackage ../tools/filesystems/fatresize {};
 
   fdk_aac = callPackage ../development/libraries/fdk-aac { };
 

From 4ecf102ebff109b6f8ac060e43c9bfad34b3d682 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 19 Aug 2015 23:18:24 +0200
Subject: [PATCH 1354/2016] s3fs: 1.78 -> 1.79

---
 pkgs/tools/filesystems/s3fs/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 7e880ffeeb9..4c40d5e4983 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -1,14 +1,18 @@
 {stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}:
 
 stdenv.mkDerivation {
-  name = "s3fs-fuse-1.78";
+  name = "s3fs-fuse-1.79";
   src = fetchurl {
-    url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.78.tar.gz;
-    sha256 = "1xcp0bqa4a2ynjn5phb1pj70wm322czhqp4qcb27d5jd545b1h1n";
+    url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.79.tar.gz;
+    sha256 = "0rmzkngzq040g020pv75qqx3jy34vdxzqvxz29k6q8yfb3wpkhb1";
   };
   preConfigure = "./autogen.sh";
   buildInputs = [ autoconf automake pkgconfig curl openssl libxml2 fuse ];
-  
+
+  postInstall = ''
+    ln -s $out/bin/s3fs $out/bin/mount.s3fs
+  '';
+
   meta = with stdenv.lib; {
     description = "Mount an S3 bucket as filesystem through FUSE";
     license = licenses.gpl2;

From 559e2ab9512a938691076a23fba744ff115cd260 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 19 Aug 2015 23:51:54 +0200
Subject: [PATCH 1355/2016] kubernetes: 0.18.0 -> 1.0.3

---
 .../networking/cluster/kubernetes/default.nix | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index a096d43b11c..56d4cc7e769 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables, rsync, utillinux, coreutils }:
+{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables, rsync, utillinux, coreutils, e2fsprogs, procps-ng }:
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "0.18.0";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1adbd5n2fs1278f6kz6pd23813w2k4pgcxjl21idflh8jafxsyj7";
+    sha256 = "12wqw9agiz07wlw1sd0n41fn6xf74zn5sv37hslfa77w2d4ri5yb";
   };
 
   buildInputs = [ makeWrapper which go iptables rsync ];
@@ -26,14 +26,23 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p "$out/bin"
-    cp _output/local/go/bin/* "$out/bin/"
+    mkdir -p "$out/bin" "$out"/libexec/kubernetes/cluster
+    cp _output/local/go/bin/{kube*,hyperkube} "$out/bin/"
     cp cluster/addons/dns/kube2sky/kube2sky "$out/bin/"
+    cp cluster/saltbase/salt/helpers/safe_format_and_mount "$out/libexec/kubernetes"
+    cp -R hack "$out/libexec/kubernetes"
+    cp cluster/update-storage-objects.sh "$out/libexec/kubernetes/cluster"
+    makeWrapper "$out"/libexec/kubernetes/cluster/update-storage-objects.sh "$out"/bin/kube-update-storage-objects \
+      --prefix KUBE_BIN : "$out/bin"
   '';
 
   preFixup = ''
     wrapProgram "$out/bin/kube-proxy" --prefix PATH : "${iptables}/bin"
-    wrapProgram "$out/bin/kubelet" --prefix PATH : "${utillinux}/bin"
+    wrapProgram "$out/bin/kubelet" --prefix PATH : "${utillinux}/bin:${procps-ng}/bin"
+    chmod +x "$out/libexec/kubernetes/safe_format_and_mount"
+    wrapProgram "$out/libexec/kubernetes/safe_format_and_mount" --prefix PATH : "${e2fsprogs}/bin:${utillinux}/bin"
+    substituteInPlace "$out"/libexec/kubernetes/cluster/update-storage-objects.sh \
+      --replace KUBE_OUTPUT_HOSTBIN KUBE_BIN
   '';
 
   meta = with stdenv.lib; {

From c33d2822781fd5449e19083c60123a3b5b93b698 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 19 Aug 2015 23:52:19 +0200
Subject: [PATCH 1356/2016] kubernetes service: fix for 1.0.3

---
 nixos/modules/services/cluster/kubernetes.nix | 66 +++++++++++++------
 1 file changed, 47 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index d00c1aaa105..0abef29dd19 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -78,12 +78,6 @@ in {
         type = types.int;
       };
 
-      readOnlyPort = mkOption {
-        description = "Kubernets apiserver read-only port.";
-        default = 7080;
-        type = types.int;
-      };
-
       securePort = mkOption {
         description = "Kubernetes apiserver secure port.";
         default = 6443;
@@ -102,6 +96,12 @@ in {
         type = types.str;
       };
 
+      clientCaFile = mkOption {
+        description = "Kubernetes apiserver CA file for client auth.";
+        default = "";
+        type = types.str;
+      };
+
       tokenAuth = mkOption {
         description = ''
           Kubernetes apiserver token authentication file. See
@@ -158,6 +158,19 @@ in {
         type = types.str;
       };
 
+      runtimeConfig = mkOption {
+        description = "Api runtime configuration";
+        default = "";
+        example = "api/all=false,api/v1=true";
+        type = types.str;
+      };
+
+      admissionControl = mkOption {
+        description = "Kubernetes admission control plugins to use.";
+        default = ["AlwaysAdmit"];
+        type = types.listOf types.str;
+      };
+
       extraOpts = mkOption {
         description = "Kubernetes apiserver extra command line options.";
         default = "";
@@ -222,12 +235,6 @@ in {
         type = types.str;
       };
 
-      machines = mkOption {
-        description = "Kubernetes controller list of machines to schedule to schedule onto";
-        default = [];
-        type = types.listOf types.str;
-      };
-
       extraOpts = mkOption {
         description = "Kubernetes controller extra command line options.";
         default = "";
@@ -260,6 +267,20 @@ in {
         type = types.int;
       };
 
+      healthz = {
+        bind = mkOption {
+          description = "Kubernetes kubelet healthz listening address.";
+          default = "127.0.0.1";
+          type = types.str;
+        };
+
+        port = mkOption {
+          description = "Kubernetes kubelet healthz port.";
+          default = 10248;
+          type = types.int;
+        };
+      };
+
       hostname = mkOption {
         description = "Kubernetes kubelet hostname override";
         default = config.networking.hostName;
@@ -374,7 +395,6 @@ in {
             --etcd-servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \
             --insecure-bind-address=${cfg.apiserver.address} \
             --insecure-port=${toString cfg.apiserver.port} \
-            --read-only-port=${toString cfg.apiserver.readOnlyPort} \
             --bind-address=${cfg.apiserver.publicAddress} \
             --allow-privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \
             ${optionalString (cfg.apiserver.tlsCertFile!="")
@@ -383,11 +403,16 @@ in {
               "--tls-private-key-file=${cfg.apiserver.tlsPrivateKeyFile}"} \
             ${optionalString (cfg.apiserver.tokenAuth!=[])
               "--token-auth-file=${tokenAuthFile}"} \
+            ${optionalString (cfg.apiserver.clientCaFile!="")
+              "--client-ca-file=${cfg.apiserver.clientCaFile}"} \
             --authorization-mode=${cfg.apiserver.authorizationMode} \
             ${optionalString (cfg.apiserver.authorizationMode == "ABAC")
               "--authorization-policy-file=${authorizationPolicyFile}"} \
             --secure-port=${toString cfg.apiserver.securePort} \
             --service-cluster-ip-range=${cfg.apiserver.portalNet} \
+            ${optionalString (cfg.apiserver.runtimeConfig!="")
+              "--runtime-config=${cfg.apiserver.runtimeConfig}"} \
+            --admission_control=${cfg.apiserver.admissionControl} \
             --logtostderr=true \
             ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
             ${cfg.apiserver.extraOpts}
@@ -431,7 +456,6 @@ in {
             --address=${cfg.controllerManager.address} \
             --port=${toString cfg.controllerManager.port} \
             --master=${cfg.controllerManager.master} \
-            --machines=${concatStringsSep "," cfg.controllerManager.machines} \
             --logtostderr=true \
             ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
             ${cfg.controllerManager.extraOpts}
@@ -454,6 +478,8 @@ in {
             --register-node=${if cfg.kubelet.registerNode then "true" else "false"} \
             --address=${cfg.kubelet.address} \
             --port=${toString cfg.kubelet.port} \
+            --healthz-bind-address=${cfg.kubelet.healthz.bind} \
+            --healthz-port=${toString cfg.kubelet.healthz.port} \
             --hostname-override=${cfg.kubelet.hostname} \
             --allow-privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \
             --root-dir=${cfg.dataDir} \
@@ -504,9 +530,6 @@ in {
           User = "kubernetes";
         };
       };
-
-      services.skydns.enable = mkDefault true;
-      services.skydns.domain = mkDefault cfg.kubelet.clusterDomain;
     })
 
     (mkIf (any (el: el == "master") cfg.roles) {
@@ -524,6 +547,9 @@ in {
 
     (mkIf (any (el: el == "node" || el == "master") cfg.roles) {
       services.etcd.enable = mkDefault true;
+
+      services.skydns.enable = mkDefault true;
+      services.skydns.domain = mkDefault cfg.kubelet.clusterDomain;
     })
 
     (mkIf (
@@ -538,8 +564,10 @@ in {
         serviceConfig.Type = "oneshot";
         script = ''
           mkdir -p /var/run/kubernetes
-          chown kubernetes /var/run/kubernetes
-          ln -fs ${pkgs.writeText "kubernetes-dockercfg" cfg.dockerCfg} /var/run/kubernetes/.dockercfg
+          chown kubernetes /var/lib/kubernetes
+
+          rm ${cfg.dataDir}/.dockercfg || true
+          ln -fs ${pkgs.writeText "kubernetes-dockercfg" cfg.dockerCfg} ${cfg.dataDir}/.dockercfg
         '';
       };
 

From 5344252155bbbc37075a5bafcbecd8190371a66b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 19 Aug 2015 14:54:16 -0700
Subject: [PATCH 1357/2016] go1.4: Cleanup compiler expression

---
 pkgs/development/compilers/go/1.4.nix | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 559bd9b01c3..641748b34dc 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -1,11 +1,7 @@
-{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, goPackages
-
-, Security }:
+{ stdenv, lib, fetchurl, tzdata, iana_etc, libcCross, Security }:
 
 let
-  loader386 = "${glibc}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc}/lib/ld-linux.so.3";
+  libc = if stdenv ? "cross" then libcCross else stdenv.cc.libc;
 in
 
 stdenv.mkDerivation rec {
@@ -17,10 +13,6 @@ stdenv.mkDerivation rec {
     sha256 = "3e5d07bc5214a1ffe187cf6406c5b5a80ee44f12f6bca97a5463db0afee2f6ac";
   };
 
-  # perl is used for testing go vet
-  buildInputs = [ bison bash makeWrapper perl ]
-             ++ lib.optionals stdenv.isLinux [ glibc ];
-
   propagatedBuildInputs = lib.optional stdenv.isDarwin Security;
 
   # I'm not sure what go wants from its 'src', but the go installation manual
@@ -51,14 +43,18 @@ stdenv.mkDerivation rec {
     sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
     # Disable the hostname test
     sed -i '/TestHostname/areturn' src/os/os_test.go
-    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
     # ParseInLocation fails the test
     sed -i '/TestParseInSydney/areturn' src/time/format_test.go
+
+    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
   '' + lib.optionalString stdenv.isLinux ''
     sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
-    sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c
-    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
-    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
+
+    # Find the loader dynamically
+    LOADER="$(find ${libc}/lib -name ld-linux\* | head -n 1)"
+
+    # Replace references to the loader
+    find src/cmd -name asm.c -exec sed -i "s,/lib/ld-linux.*\.so\.[0-9],$LOADER," {} \;
   '' + lib.optionalString stdenv.isDarwin ''
     sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
     sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go

From ed356eefa6882df0dad813fc72c6e8ec464a0371 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 19 Aug 2015 23:54:54 +0200
Subject: [PATCH 1358/2016] skydns service: fix skydns nameservers env option

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

diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix
index 3b939091489..f5eb452fec6 100644
--- a/nixos/modules/services/networking/skydns.nix
+++ b/nixos/modules/services/networking/skydns.nix
@@ -79,7 +79,7 @@ in {
         ETCD_CACERT = cfg.etcd.caCert;
         SKYDNS_ADDR = cfg.address;
         SKYDNS_DOMAIN = cfg.domain;
-        SKYDNS_NAMESERVER = concatStringsSep "," cfg.nameservers;
+        SKYDNS_NAMESERVERS = concatStringsSep "," cfg.nameservers;
       };
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/skydns";

From 86ee6c25126da2a59c8ae5118942df44fa6ddc82 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 20 Aug 2015 00:02:27 +0200
Subject: [PATCH 1359/2016] etcd service: do not wait for cluster up

---
 nixos/modules/services/misc/etcd.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix
index 26d2753879d..e1839b936f0 100644
--- a/nixos/modules/services/misc/etcd.nix
+++ b/nixos/modules/services/misc/etcd.nix
@@ -122,14 +122,6 @@ in {
         mkdir -m 0700 -p ${cfg.dataDir}
         if [ "$(id -u)" = 0 ]; then chown etcd ${cfg.dataDir}; fi
       '';
-      postStart = ''
-        until ${pkgs.etcdctl}/bin/etcdctl set /nixos/state 'up'; do
-          sleep 1;
-        done
-        until ${pkgs.etcdctl}/bin/etcdctl get /nixos/state | grep up; do
-          sleep 1;
-        done
-      '';
     };
 
     environment.systemPackages = [ pkgs.etcdctl ];

From 8aa50beb1f1821ed8b1f054a81a82ee903c86560 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 20 Aug 2015 00:18:32 +0200
Subject: [PATCH 1360/2016] elasticsearch 1.4.5 -> 1.5.2

---
 pkgs/servers/search/elasticsearch/default.nix   |  9 +++++----
 pkgs/servers/search/elasticsearch/es-home.patch | 16 +++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index be30e12258b..859f1501bb3 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "elasticsearch-1.4.5";
+  name = "elasticsearch-1.5.2";
 
   src = fetchurl {
-    url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz";
-    sha256 = "1qjnffbxa1fz5f3sqahhgf45b4r1xa5lkjy9xj135g0w8jgala6w";
+    url = "https://download.elastic.co/elasticsearch/elasticsearch/${name}.tar.gz";
+    sha256 = "054s0k0y0g1x6wzbd6gmvrp5n89fqwqssbyhay0gmhvs6sbpibpg";
   };
 
   patches = [ ./es-home.patch ];
@@ -36,7 +36,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Open Source, Distributed, RESTful Search Engine";
-    license = stdenv.lib.licenses.asl20;
+    license = licenses.asl20;
     platforms = platforms.unix;
+    maintainers = [ maintainers.offline ];
   };
 }
diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch
index b4ecbb5a709..2f7a7fe7919 100644
--- a/pkgs/servers/search/elasticsearch/es-home.patch
+++ b/pkgs/servers/search/elasticsearch/es-home.patch
@@ -1,8 +1,7 @@
-diff --git a/bin/elasticsearch b/bin/elasticsearch
-index c7c9263..0fcecf6 100755
---- a/bin/elasticsearch
-+++ b/bin/elasticsearch
-@@ -76,7 +76,10 @@ while [ -h "$SCRIPT" ] ; do
+diff -rupN a/bin/elasticsearch b/bin/elasticsearch
+--- a/bin/elasticsearch	2015-08-05 17:52:05.740819671 +0200
++++ b/bin/elasticsearch	2015-08-05 17:22:34.664657364 +0200
+@@ -83,7 +83,10 @@ while [ -h "$SCRIPT" ] ; do
  done
  
  # determine elasticsearch home
@@ -14,10 +13,9 @@ index c7c9263..0fcecf6 100755
  
  # make ELASTICSEARCH_HOME absolute
  ES_HOME=`cd "$ES_HOME"; pwd`
-diff --git a/bin/plugin b/bin/plugin
-index a8c796a..daf7b99 100755
---- a/bin/plugin
-+++ b/bin/plugin
+diff -rupN a/bin/plugin b/bin/plugin
+--- a/bin/plugin	2015-08-05 17:57:07.903088815 +0200
++++ b/bin/plugin	2015-08-05 17:57:38.979808139 +0200
 @@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do
  done
  

From 1d1a336c6a02bd247007dc746ed64ff0bfca1eb0 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 20 Aug 2015 00:20:31 +0200
Subject: [PATCH 1361/2016] elasticsearch: update plugins

---
 pkgs/servers/search/elasticsearch/plugins.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index 69941d5c46c..95973186677 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -24,10 +24,10 @@ in {
   elasticsearch_river_jdbc = esPlugin rec {
     name = "elasticsearch-river-jdbc-${version}";
     pluginName = "elasticsearch-river-jdbc";
-    version = "1.3.0.4";
+    version = "1.5.0.5";
     src = fetchurl {
       url = "http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-river-jdbc/${version}/${name}-plugin.zip";
-      sha256 = "0272l6cr032iccwwa803shzfjg3505jc48d9qdazrwxjmnlkkzqk";
+      sha256 = "1p75l3vcnb90ar4j3dci2xf8dqnqyy31kc1r075fa2xqlsxgigcp";
     };
     meta = {
       homepage = "https://github.com/jprante/elasticsearch-river-jdbc";
@@ -53,11 +53,11 @@ in {
 
   elasticsearch_http_basic = stdenv.mkDerivation rec {
     name = "elasticsearch-http-basic-${version}";
-    version = "1.3.2";
+    version = "1.5.0";
 
     src = fetchurl {
-      url = "https://github.com/Asquera/elasticsearch-http-basic/releases/download/${version}/${name}.jar";
-      sha256 = "1qq8z0233mzz699zbzjwmx7ghn8k0djgyc5ixr8i5xchfrsrymn2";
+      url = "https://github.com/Asquera/elasticsearch-http-basic/releases/download/v${version}/${name}.jar";
+      sha256 = "0fif6sbn2ich39lrgm039y9d5bxkylx9pvly04wss8rdhspvdskb";
     };
 
     phases = ["installPhase"];
@@ -75,11 +75,11 @@ in {
     name = pname + "-" + version;
     pname = "elasticsearch-river-twitter";
     pluginName = "elasticsearch/" + pname + "/" + version;
-    version = "2.3.0";
+    version = "2.5.0";
 
     src = fetchurl {
       url = "http://download.elasticsearch.org/elasticsearch/${pname}/${name}.zip";
-      sha256 = "1lxxh1r61r15mzqyl0li37kcnn3vvpklnbfyys0kd6a1l82f0qvj";
+      sha256 = "0851yrmyrpp6whyxk34ykcj7b28f90w0nvkrhvl49dwqgr5s4mn4";
     };
 
     meta = {
@@ -94,10 +94,10 @@ in {
   elasticsearch_kopf = esPlugin rec {
     name = "elasticsearch-kopf-${version}";
     pluginName = "elasticsearch-kopf";
-    version = "1.4.7";
+    version = "1.5.7";
     src = fetchurl {
       url = "https://github.com/lmenezes/elasticsearch-kopf/archive/v${version}.zip";
-      sha256 = "17r9mmfjnraswij1glmglljga4i4mfiraivxmai6giwmm2grwlz3";
+      sha256 = "0mq6jmjb4ldi03m431kzr7ly0bf7mdim7s5dx4wplb85gyhscns1";
     };
     meta = {
       homepage = https://github.com/lmenezes/elasticsearch-kopf;

From 2bec93dde868968a50d6b8f5f1a864c402ad56bc Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 20 Aug 2015 00:20:44 +0200
Subject: [PATCH 1362/2016] elasticsearch: add search_guard plugin

---
 pkgs/servers/search/elasticsearch/plugins.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index 95973186677..32b065364a6 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -106,4 +106,18 @@ in {
     };
   };
 
+  search_guard = esPlugin rec {
+    name = "elastic-search-guard-${version}";
+    pluginName = "search-guard";
+    version = "0.5";
+    src = fetchurl {
+      url = "https://github.com/floragunncom/search-guard/releases/download/v${version}/${pluginName}-${version}.zip";
+      sha256 = "1zima4jmq1rrcqxhlrp2xian80vp244d2splby015n5cgqrp39fl";
+    };
+    meta = {
+      homepage = https://github.com/floragunncom/search-guard;
+      description = "Plugin to fetch data from JDBC sources for indexing into Elasticsearch";
+      license = licenses.asl20;
+    };
+  };
 }

From 9146edd5be812eb681a9a61e1db9bc493691e585 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 19 Aug 2015 23:09:03 +0200
Subject: [PATCH 1363/2016] logstash: 1.4.2 -> 1.5.3

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

diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix
index 7f43ccdb625..081868589bc 100644
--- a/pkgs/tools/misc/logstash/default.nix
+++ b/pkgs/tools/misc/logstash/default.nix
@@ -1,31 +1,27 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.2";
+  version = "1.5.3";
   name = "logstash-${version}";
 
   src = fetchurl {
     url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz";
-    sha256 = "0sc0bwyf96fzs5h3d7ii65v9vvpfbm7w67vk1im9djnlz0d1ggnm";
+    sha256 = "1an476k4q2shdxvhcx4fzbrcpk6isjrrvzlb6ivxfqg5fih3cg7b";
   };
 
-  dontBuild    = true;
-  dontPatchELF = true;
-  dontStrip    = true;
+  dontBuild         = true;
+  dontPatchELF      = true;
+  dontStrip         = true;
   dontPatchShebangs = true;
 
   installPhase = ''
     mkdir -p $out/bin
     mkdir -p $out/vendor
     mkdir -p $out/lib
-    mkdir -p $out/locales
-    mkdir -p $out/patterns
     cp -a bin $out
     cp -a vendor $out
     cp -a lib $out
-    cp -a locales $out
-    cp -a patterns $out
-    patchShebangs $out/bin
+    cp Gemfile* $out
   '';
 
   meta = {

From 26ef514981453f83cb9bde412efea738190b61eb Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 3 Feb 2015 10:47:15 +0100
Subject: [PATCH 1364/2016] canon-cups-ufr2: init at 2.90

---
 pkgs/misc/cups/drivers/canon/default.nix | 220 +++++++++++++++++++++++
 pkgs/misc/cups/drivers/canon/preload.c   |  81 +++++++++
 pkgs/top-level/all-packages.nix          |   2 +
 3 files changed, 303 insertions(+)
 create mode 100644 pkgs/misc/cups/drivers/canon/default.nix
 create mode 100644 pkgs/misc/cups/drivers/canon/preload.c

diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix
new file mode 100644
index 00000000000..4c31e8d37d2
--- /dev/null
+++ b/pkgs/misc/cups/drivers/canon/default.nix
@@ -0,0 +1,220 @@
+{stdenv, fetchurl, unzip, autoreconfHook, libtool, makeWrapper, cups, ghostscript, callPackage_i686 }:
+
+let
+
+  i686_NIX_GCC = callPackage_i686 ({gcc}: gcc) {};
+  i686_libxml2 = callPackage_i686 ({libxml2}: libxml2) {};
+  i686_glibc = callPackage_i686 ({glibc}: glibc) {};
+
+  src_canon = fetchurl {
+    url = "http://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip";
+    sha256 = "1qpdmaaw42gm5fi21rp4lf05skffkq42ka5c8xkw8rckzb13sy9j";
+  };
+
+in
+
+
+stdenv.mkDerivation rec {
+  name = "canon-cups-ufr2-2.90";
+  src = src_canon;
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  postUnpack = ''
+    (cd $sourceRoot; tar -xzf Sources/cndrvcups-common-2.90-1.tar.gz)
+    (cd $sourceRoot; tar -xzf Sources/cndrvcups-lb-2.90-1.tar.gz)
+  '';
+
+  nativeBuildInputs = [ makeWrapper unzip autoreconfHook libtool ];
+
+  buildInputs = [ cups ];
+
+  installPhase = ''
+    ##
+    ## cndrvcups-common buildPhase
+    ##
+    ( cd cndrvcups-common-2.90/buftool
+      autoreconf -fi
+      ./autogen.sh --prefix=$out --enable-progpath=$out/bin --libdir=$out/lib --disable-shared --enable-static
+      make
+    )
+
+    ( cd cndrvcups-common-2.90/backend
+      ./autogen.sh --prefix=$out --libdir=$out/lib
+      make
+    )
+
+    ( cd cndrvcups-common-2.90/c3plmod_ipc
+      make
+    )
+
+    ##
+    ## cndrvcups-common installPhase
+    ##
+
+    ( cd cndrvcups-common-2.90/buftool
+      make install
+    )
+
+    ( cd cndrvcups-common-2.90/backend
+      make install
+    )
+
+    ( cd cndrvcups-common-2.90/c3plmod_ipc
+      make install DESTDIR=$out/lib
+    )
+
+    ( cd cndrvcups-common-2.90/libs
+      chmod 755 *
+      mkdir -p $out/lib32
+      mkdir -p $out/bin
+      cp libcaiowrap.so.1.0.0 $out/lib32
+      cp libcaiousb.so.1.0.0 $out/lib32
+      cp libc3pl.so.0.0.1 $out/lib32
+      cp libcaepcm.so.1.0 $out/lib32
+      cp libColorGear.so.0.0.0 $out/lib32
+      cp libColorGearC.so.0.0.0 $out/lib32
+      cp libcanon_slim.so.1.0.0 $out/lib32
+      cp c3pldrv $out/bin
+    )
+
+    (cd cndrvcups-common-2.90/data
+      chmod 644 *.ICC
+      mkdir -p $out/share/caepcm
+      cp *.ICC $out/share/caepcm
+    )
+
+    (cd $out/lib32
+      ln -sf libc3pl.so.0.0.1 libc3pl.so.0
+      ln -sf libc3pl.so.0.0.1 libc3pl.so
+      ln -sf libcaepcm.so.1.0 libcaepcm.so.1
+      ln -sf libcaepcm.so.1.0 libcaepcm.so
+      ln -sf libcaiowrap.so.1.0.0 libcaiowrap.so.1
+      ln -sf libcaiowrap.so.1.0.0 libcaiowrap.so
+      ln -sf libcaiousb.so.1.0.0 libcaiousb.so.1
+      ln -sf libcaiousb.so.1.0.0 libcaiousb.so
+      ln -sf libcanon_slim.so.1.0.0 libcanon_slim.so.1
+      ln -sf libcanon_slim.so.1.0.0 libcanon_slim.so
+      ln -sf libColorGear.so.0.0.0 libColorGear.so.0
+      ln -sf libColorGear.so.0.0.0 libColorGear.so
+      ln -sf libColorGearC.so.0.0.0 libColorGearC.so.0
+      ln -sf libColorGearC.so.0.0.0 libColorGearC.so
+    )
+
+    (cd $out/lib
+      ln -sf libcanonc3pl.so.1.0.0 libcanonc3pl.so
+      ln -sf libcanonc3pl.so.1.0.0 libcanonc3pl.so.1
+    )
+
+    patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib" $out/lib32/libColorGear.so.0.0.0
+    patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib" $out/lib32/libColorGearC.so.0.0.0
+
+    patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32" $out/bin/c3pldrv
+
+    # c3pldrv is programmed with fixed paths that point to "/usr/{bin,lib.share}/..."
+    # preload32 wrappes all necessary function calls to redirect the fixed paths
+    # into $out.
+    mkdir -p $out/libexec
+    preload32=$out/libexec/libpreload32.so
+    ${i686_NIX_GCC}/bin/gcc -shared ${./preload.c} -o $preload32 -ldl -DOUT=\"$out\" -fPIC
+    wrapProgram "$out/bin/c3pldrv" \
+      --set PRELOAD_DEBUG 1 \
+      --set LD_PRELOAD $preload32 \
+      --prefix LD_LIBRARY_PATH : "$out/lib32"
+
+
+
+    ##
+    ## cndrvcups-lb buildPhase
+    ##
+
+    ( cd cndrvcups-lb-2.90/ppd
+      ./autogen.sh --prefix=$out
+      make
+    )
+
+    ( cd cndrvcups-lb-2.90/pstoufr2cpca
+      CPPFLAGS="-I$out/include" LDFLAGS=" -L$out/lib" ./autogen.sh --prefix=$out --enable-progpath=$out/bin
+      make
+    )
+
+    ( cd cndrvcups-lb-2.90/cpca
+      CPPFLAGS="-I$out/include" LDFLAGS=" -L$out/lib" ./autogen.sh --prefix=$out --enable-progpath=$out/bin  --enable-static
+      make
+    )
+
+    ##
+    ## cndrvcups-lb installPhase
+    ##
+
+    ( cd cndrvcups-lb-2.90/ppd
+      make install
+    )
+
+    ( cd cndrvcups-lb-2.90/pstoufr2cpca
+      make install
+    )
+
+    ( cd cndrvcups-lb-2.90/cpca
+      make install
+    )
+
+    ( cd cndrvcups-lb-2.90/libs
+      chmod 755 *
+      mkdir -p $out/lib32
+      mkdir -p $out/bin
+      cp libcanonufr2.la $out/lib32
+      cp libcanonufr2.so.1.0.0 $out/lib32
+      cp libufr2filter.so.1.0.0 $out/lib32
+      cp libEnoJBIG.so.1.0.0 $out/lib32
+      cp libEnoJPEG.so.1.0.0 $out/lib32
+      cp libcaiocnpkbidi.so.1.0.0 $out/lib32
+      cp libcnlbcm.so.1.0 $out/lib32
+
+      cp cnpkmoduleufr2 $out/bin #maybe needs setuid 4755
+      cp cnpkbidi $out/bin
+    )
+
+    ( cd $out/lib32
+      ln -sf libcanonufr2.so.1.0.0 libcanonufr2.so
+      ln -sf libcanonufr2.so.1.0.0 libcanonufr2.so.1
+      ln -sf libufr2filter.so.1.0.0 libufr2filter.so
+      ln -sf libufr2filter.so.1.0.0 libufr2filter.so.1
+      ln -sf libEnoJBIG.so.1.0.0 libEnoJBIG.so
+      ln -sf libEnoJBIG.so.1.0.0 libEnoJBIG.so.1
+      ln -sf libEnoJPEG.so.1.0.0 libEnoJPEG.so
+      ln -sf libEnoJPEG.so.1.0.0 libEnoJPEG.so.1
+      ln -sf libcaiocnpkbidi.so.1.0.0 libcaiocnpkbidi.so
+      ln -sf libcaiocnpkbidi.so.1.0.0 libcaiocnpkbidi.so.1
+      ln -sf libcnlbcm.so.1.0 libcnlbcm.so.1
+      ln -sf libcnlbcm.so.1.0 libcnlbcm.so
+    )
+
+    ( cd cndrvcups-lb-2.90
+      chmod 644 data/CnLB*
+      chmod 644 libs/cnpkbidi_info*
+      chmod 644 libs/ThLB*
+      mkdir -p $out/share/caepcm
+      mkdir -p $out/share/cnpkbidi
+      mkdir -p $out/share/ufr2filter
+      cp data/CnLB* $out/share/caepcm
+      cp libs/cnpkbidi_info* $out/share/cnpkbidi
+      cp libs/ThLB* $out/share/ufr2filter
+    )
+
+    patchelf --set-rpath "$out/lib32:${i686_libxml2}/lib" $out/lib32/libcanonufr2.so.1.0.0
+
+    patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32" $out/bin/cnpkmoduleufr2
+    patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32:${i686_libxml2}/lib" $out/bin/cnpkbidi
+
+    makeWrapper "${ghostscript}/bin/gs" "$out/bin/gs" \
+      --prefix LD_LIBRARY_PATH ":" "$out/lib" \
+      --prefix PATH ":" "$out/bin"
+    '';
+
+  meta = {
+    description = "CUPS Linux drivers for Canon printers";
+    homepage = "http://www.canon.com/";
+    license = stdenv.lib.licenses.unfree;
+  };
+}
diff --git a/pkgs/misc/cups/drivers/canon/preload.c b/pkgs/misc/cups/drivers/canon/preload.c
new file mode 100644
index 00000000000..f3a30063a6e
--- /dev/null
+++ b/pkgs/misc/cups/drivers/canon/preload.c
@@ -0,0 +1,81 @@
+/*
+ * LD_PRELOAD trick to make c3pldrv handle the absolute path to /usr/{bin,lib,share)}.
+ * As c3pldrv is a 32 bit executable, /lib will be rewritten to /lib32.
+ *
+ * Usage:
+ *   gcc -shared -fPIC -DOUT="$out" preload.c -o preload.so -ldl
+ *   LD_PRELOAD=$PWD/preload.so ./c3pldrv
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <dlfcn.h>
+#include <limits.h>
+
+#ifndef OUT
+#error Missing OUT define - path to the installation directory.
+#endif
+
+typedef void *(*dlopen_func_t)(const char *filename, int flag);
+typedef int (*open_func_t)(const char *pathname, int flags, ...);
+typedef int (*execv_func_t)(const char *path, char *const argv[]);
+
+
+void *dlopen(const char *filename, int flag)
+{
+	dlopen_func_t orig_dlopen;
+	const char *new_filename;
+	char buffer[PATH_MAX];
+
+	orig_dlopen = (dlopen_func_t)dlsym(RTLD_NEXT, "dlopen");
+
+	new_filename = filename;
+	if (strncmp("/usr/lib", filename, 8) == 0) {
+		snprintf(buffer, PATH_MAX, OUT "/lib32%s", filename+8);
+		buffer[PATH_MAX-1] = '\0';
+		new_filename = buffer;
+	}
+	
+	return orig_dlopen(new_filename, flag);
+}
+
+int open(const char *pathname, int flags, ...)
+{
+	open_func_t orig_open;
+	const char *new_pathname;
+	char buffer[PATH_MAX];
+
+	orig_open = (open_func_t)dlsym(RTLD_NEXT, "open");
+
+	new_pathname = pathname;
+	if (strncmp("/usr/share", pathname, 10) == 0) {
+		snprintf(buffer, PATH_MAX, OUT "%s", pathname+4);
+		buffer[PATH_MAX-1] = '\0';
+		new_pathname = buffer;
+	}
+	
+	return orig_open(new_pathname, flags);
+}
+
+int execv(const char *path, char *const argv[])
+{
+	execv_func_t orig_execv;
+	const char *new_path;
+	char buffer[PATH_MAX];
+
+	orig_execv = (execv_func_t)dlsym(RTLD_NEXT, "execv");
+
+	new_path = path;
+	if (strncmp("/usr/bin", path, 8) == 0) {
+		snprintf(buffer, PATH_MAX, OUT "%s", path+4);
+		buffer[PATH_MAX-1] = '\0';
+		new_path = buffer;
+	}
+	
+	return orig_execv(new_path, argv);
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0bdbb2bfa21..4d2ae531e0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14955,6 +14955,8 @@ let
 
   sails = callPackage ../misc/sails { };
 
+  canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { };
+
   samsungUnifiedLinuxDriver = import ../misc/cups/drivers/samsung {
     inherit fetchurl stdenv;
     inherit cups ghostscript glibc patchelf;

From 46df28d37162afb71ad91cf6c3fcf14a5cffb99f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 19 Aug 2015 21:47:35 +0200
Subject: [PATCH 1365/2016] packagekit: init at 1.0.7

Don't worry, this does absolutely nothing on Nix and only serves to
satisfy simple-scan's zany new dep.
---
 .../package-management/packagekit/default.nix | 73 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/tools/package-management/packagekit/default.nix

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
new file mode 100644
index 00000000000..1dcfd309559
--- /dev/null
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python3, sqlite }:
+
+let version = "1.0.7"; in
+stdenv.mkDerivation {
+  name = "packagekit-${version}";
+
+  src = fetchurl {
+    sha256 = "0klwr0y3a72xpz6bwv4afbk3vvx5r1av5idhz3mx4p9ssnscb1mi";
+    url = "https://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz";
+  };
+
+  buildInputs = [ glib polkit python3 ];
+  propagatedBuildInputs = [ sqlite ];
+  nativeBuildInputs = [ intltool pkgconfig ];
+
+  configureFlags = ''
+    --disable-static
+    --disable-python3
+    --disable-networkmanager
+    --disable-connman
+    --disable-systemd
+    --disable-bash-completion
+    --disable-browser-plugin
+    --disable-gstreamer-plugin
+    --disable-gtk-module
+    --disable-command-not-found
+    --disable-cron
+    --disable-daemon-tests
+    --disable-alpm
+    --disable-aptcc
+    --enable-dummy
+    --disable-entropy
+    --disable-hif
+    --disable-pisi
+    --disable-poldek
+    --disable-portage
+    --disable-ports
+    --disable-katja
+    --disable-urmpi
+    --disable-yum
+    --disable-zypp
+  '';
+
+  enableParallelBuilding = true;
+
+  preInstall = ''
+    # Don't install anything to e.g. $out/var/cache:
+    for dir in src data; do
+      substituteInPlace $dir/Makefile \
+        --replace " install-data-hook" "" \
+        --replace " install-databaseDATA" ""
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "System to facilitate installing and updating packages";
+    longDescription = ''
+      PackageKit is a system designed to make installing and updating software
+      on your computer easier. The primary design goal is to unify all the
+      software graphical tools used in different distributions, and use some of
+      the latest technology like PolicyKit. The actual nuts-and-bolts distro
+      tool (dnf, apt, etc) is used by PackageKit using compiled and scripted
+      helpers. PackageKit isn't meant to replace these tools, instead providing
+      a common set of abstractions that can be used by standard GUI and text
+      mode package managers.
+    '';
+    homepage = http://www.packagekit.org/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d2ae531e0f..26d60990ed6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2561,6 +2561,8 @@ let
 
   p7zip = callPackage ../tools/archivers/p7zip { };
 
+  packagekit = callPackage ../tools/package-management/packagekit { };
+
   pal = callPackage ../tools/misc/pal { };
 
   pandoc = haskell.lib.overrideCabal haskellPackages.pandoc (drv: {

From 8131ca52d18e71c29ae508fa604ff7699f422ef1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 19 Aug 2015 21:57:18 +0200
Subject: [PATCH 1366/2016] simple-scan: update 3.17.4 -> 3.17.90

Adds a dependency on PackageKit...

In better news:
 - Default to PDF when saving in all cases.
 - Always show file format options and use a combo box to fit better into
   dialog.
 - Detect HP scanners and install drivers using PackageKit if found.
 - If SANE detects no scanners but we see USB IDs of Brother, Epson or
   Samsung scanners then prompt the user to go to their website to install
   drivers.
 - Use GUsb instead of GUdev.
 - Fix error dialogs not showing.
---
 .../graphics/simple-scan/default.nix          | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 954b2e02136..2591c3f7ffb 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,15 +1,28 @@
-{ stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2
-, makeWrapper, 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.4"; in
+let version = "3.17.90"; in
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
 
   src = fetchurl {
-    sha256 = "1pslbv45g01g039zj2b01k08f763kkhzqw8wwz7yh27m7bjllnx6";
+    sha256 = "0xc3ln97dgvxrwy2qn82k9qvsr5kxksms4igzkivya3xpq2kx85c";
     url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz";
   };
 
+  buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 packagekit
+    saneBackends systemd vala ];
+  nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/simple-scan" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
   meta = with stdenv.lib; {
     description = "Simple scanning utility";
     longDescription = ''
@@ -25,17 +38,4 @@ stdenv.mkDerivation rec {
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
-
-  buildInputs = [ cairo colord glib gtk3 libxml2
-    saneBackends systemd vala ];
-  nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ];
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/simple-scan" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
 }

From 72e8bf518f920b1ac5d1b5ca4a1cd18e94774202 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 20 Aug 2015 02:26:31 +0200
Subject: [PATCH 1367/2016] netsniff-ng: update 0.5.9-{80-g3384ee7 ->
 85-g71c28ef}

---
 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 ac9cfbf9bf2..50f21abdb54 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-80-g3384ee7"; in
+let version = "0.5.9-85-g71c28ef"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "3384ee7119222a6230c983dbdcbaf2ac2d6f92fb";
-    sha256 = "1j0g7sdf5ikr2bwd2qdwd1dpmknwaz55x3cgc8yiw39xp69hm7na";
+    rev = "71c28eff00a8a8896c45fa20330b623d265ae5c7";
+    sha256 = "1d0k7dydy57fn2qx5mwwx5wplbgm90y9chc5q15m8phsh0nm13qi";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From fb6502892ad5b19bd196f9faab9b942a3bfa5366 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 20 Aug 2015 04:06:21 +0200
Subject: [PATCH 1368/2016] stress-ng: update 0.04.14 -> 0.04.15

---
 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 7f02eaa2d51..0f62fc4e360 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr, keyutils }:
 
-let version = "0.04.14"; in
+let version = "0.04.15"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "17lgsxg2k7w12i1wmzq4zqavkicikzkgz2h7mzl8lrk8c85mwf3m";
+    sha256 = "1jazcfviqx3pyhv2jzsp6y37ndsj1smfk6jacpxg9vrg5k3cm3wq";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From 15a7e0ab71ebb756e2a1211300550895ced52011 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 19 Aug 2015 15:49:49 -0700
Subject: [PATCH 1369/2016] go1.4: Fix some of the tests by adding missing pcre

---
 pkgs/development/compilers/go/1.4.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 641748b34dc..923112d12dc 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -1,4 +1,7 @@
-{ stdenv, lib, fetchurl, tzdata, iana_etc, libcCross, Security }:
+{ stdenv, lib, fetchurl, tzdata, iana_etc, libcCross
+, pkgconfig
+, pcre
+, Security }:
 
 let
   libc = if stdenv ? "cross" then libcCross else stdenv.cc.libc;
@@ -13,6 +16,8 @@ stdenv.mkDerivation rec {
     sha256 = "3e5d07bc5214a1ffe187cf6406c5b5a80ee44f12f6bca97a5463db0afee2f6ac";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ pcre ];
   propagatedBuildInputs = lib.optional stdenv.isDarwin Security;
 
   # I'm not sure what go wants from its 'src', but the go installation manual

From d730646832ccf228e019900c6185308e6b47a15d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 19 Aug 2015 17:33:33 -0700
Subject: [PATCH 1370/2016] go1.5: Fix pcre and port the remove-tools patch

---
 pkgs/development/compilers/go/1.5.nix         | 22 +++----
 .../compilers/go/remove-tools-1.5.patch       | 60 +++++++++++++++++++
 2 files changed, 72 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/compilers/go/remove-tools-1.5.patch

diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix
index a6084ae1289..8abafe0d117 100644
--- a/pkgs/development/compilers/go/1.5.nix
+++ b/pkgs/development/compilers/go/1.5.nix
@@ -1,11 +1,9 @@
-{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl
-, go_1_4, runCommand, which, patch
+{ stdenv, lib, fetchurl, tzdata, iana_etc, go_1_4, runCommand
+, perl, which, pkgconfig, patch
+, pcre
 , Security }:
 
 let
-  loader386 = "${glibc}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc}/lib/ld-linux.so.3";
   goBootstrap = runCommand "go-bootstrap" {} ''
     mkdir $out
     cp -rf ${go_1_4}/* $out/
@@ -25,9 +23,8 @@ stdenv.mkDerivation rec {
   };
 
   # perl is used for testing go vet
-  buildInputs = [ bison bash makeWrapper perl which patch ]
-             ++ lib.optionals stdenv.isLinux [ glibc ];
-
+  nativeBuildInputs = [ perl which pkgconfig patch ];
+  buildInputs = [ pcre ];
   propagatedBuildInputs = lib.optional stdenv.isDarwin Security;
 
   # I'm not sure what go wants from its 'src', but the go installation manual
@@ -59,9 +56,14 @@ stdenv.mkDerivation rec {
     sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
     # Disable the hostname test
     sed -i '/TestHostname/areturn' src/os/os_test.go
-    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
     # ParseInLocation fails the test
     sed -i '/TestParseInSydney/areturn' src/time/format_test.go
+    # Remove the api check as it never worked
+    sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
+    # Remove the coverage test as we have removed this utility
+    sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
+
+    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
   '' + lib.optionalString stdenv.isLinux ''
     sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
   '' + lib.optionalString stdenv.isDarwin ''
@@ -73,9 +75,9 @@ stdenv.mkDerivation rec {
     touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
   '';
 
-  # TODO: port tools patch
   patches = [
     ./cacert-1.5.patch
+    ./remove-tools-1.5.patch
   ];
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";
diff --git a/pkgs/development/compilers/go/remove-tools-1.5.patch b/pkgs/development/compilers/go/remove-tools-1.5.patch
new file mode 100644
index 00000000000..00f4fac7476
--- /dev/null
+++ b/pkgs/development/compilers/go/remove-tools-1.5.patch
@@ -0,0 +1,60 @@
+diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
+index 61e3d8d..f8475f4 100644
+--- a/src/cmd/go/pkg.go
++++ b/src/cmd/go/pkg.go
+@@ -665,7 +665,7 @@ var goTools = map[string]targetDir{
+ 	"cmd/asm":                              toTool,
+ 	"cmd/compile":                          toTool,
+ 	"cmd/cgo":                              toTool,
+-	"cmd/cover":                            toTool,
++	"nixos.org/x/tools/cmd/cover":          toTool,
+ 	"cmd/dist":                             toTool,
+ 	"cmd/doc":                              toTool,
+ 	"cmd/fix":                              toTool,
+@@ -676,9 +676,9 @@ var goTools = map[string]targetDir{
+ 	"cmd/pack":                             toTool,
+ 	"cmd/pprof":                            toTool,
+ 	"cmd/trace":                            toTool,
+-	"cmd/vet":                              toTool,
++	"nixos.org/x/tools/cmd/vet":            toTool,
+ 	"cmd/yacc":                             toTool,
+-	"golang.org/x/tools/cmd/godoc":         toBin,
++	"nixos.org/x/tools/cmd/godoc":          toBin,
+ 	"code.google.com/p/go.tools/cmd/cover": stalePath,
+ 	"code.google.com/p/go.tools/cmd/godoc": stalePath,
+ 	"code.google.com/p/go.tools/cmd/vet":   stalePath,
+diff --git a/src/go/build/build.go b/src/go/build/build.go
+index 496fe11..8c81dbd 100644
+--- a/src/go/build/build.go
++++ b/src/go/build/build.go
+@@ -1388,7 +1388,7 @@ func init() {
+ }
+ 
+ // ToolDir is the directory containing build tools.
+-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
++var ToolDir = runtime.GOTOOLDIR()
+ 
+ // IsLocalImport reports whether the import path is
+ // a local import path, like ".", "..", "./foo", or "../foo".
+diff --git a/src/runtime/extern.go b/src/runtime/extern.go
+index d346362..fb22b6e 100644
+--- a/src/runtime/extern.go
++++ b/src/runtime/extern.go
+@@ -194,6 +194,17 @@ func GOROOT() string {
+ 	return defaultGoroot
+ }
+ 
++// GOTOOLDIR returns the root of the Go tree.
++// It uses the GOTOOLDIR environment variable, if set,
++// or else the root used during the Go build.
++func GOTOOLDIR() string {
++	s := gogetenv("GOTOOLDIR")
++	if s != "" {
++		return s
++	}
++	return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH
++}
++
+ // Version returns the Go tree's version string.
+ // It is either the commit hash and date at the time of the build or,
+ // when possible, a release tag like "go1.3".

From 6f92c207953acc45083b69d111cc25bd7c45b98d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 19 Aug 2015 20:52:09 -0700
Subject: [PATCH 1371/2016] go1.5: Use as the default

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26d60990ed6..2a963c701d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4051,7 +4051,7 @@ let
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  go = go_1_4;
+  go = go_1_5;
 
   go-repo-root = callPackage ../development/tools/misc/go-repo-root { };
 
@@ -8647,7 +8647,7 @@ let
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   });
 
-  goPackages = go14Packages;
+  goPackages = go15Packages;
 
   ### DEVELOPMENT / LISP MODULES
 
@@ -11056,9 +11056,7 @@ let
   dmtx-utils = callPackage (import ../tools/graphics/dmtx-utils) {
   };
 
-  docker = callPackage ../applications/virtualization/docker {
-    go = go_1_4;
-  };
+  docker = callPackage ../applications/virtualization/docker { };
 
   doodle = callPackage ../applications/search/doodle { };
 
@@ -12463,7 +12461,7 @@ let
     inherit (xorg) libXpm;
   };
 
-  pond = callPackage ../applications/networking/pond { goPackages = go14Packages; };
+  pond = callPackage ../applications/networking/pond { };
 
   ponymix = callPackage ../applications/audio/ponymix { };
 

From af7d5f27d01d6b2b9af80ef41a110410bedb8e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 19 Aug 2015 23:21:00 +0200
Subject: [PATCH 1372/2016] meshlab: 1.3.2 -> 1.3.3

Remove patches that no longer apply (integrated upstream I guess), but
forward port the part that adds the missing "include <unistd.h>"[1].

Build and run tested.

[1]: http://sourceforge.net/p/meshlab/bugs/342/
---
 .../applications/graphics/meshlab/default.nix | 12 ++---
 .../graphics/meshlab/gcc-4.7.patch            | 38 -------------
 .../graphics/meshlab/qt-4.8.patch             | 54 -------------------
 3 files changed, 4 insertions(+), 100 deletions(-)
 delete mode 100644 pkgs/applications/graphics/meshlab/gcc-4.7.patch
 delete mode 100644 pkgs/applications/graphics/meshlab/qt-4.8.patch

diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix
index 9352ae092be..94102663a8c 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/pkgs/applications/graphics/meshlab/default.nix
@@ -1,22 +1,18 @@
 {stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "meshlab-1.3.2";
+  name = "meshlab-1.3.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.2/MeshLabSrc_AllInc_v132.tgz";
-    sha256 = "d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1";
+    url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.3/MeshLabSrc_AllInc_v133.tgz";
+    sha256 = "03wqaibfbfag2w1zi1a5z6h546r9d7pg2sjl5pwg24w7yp8rr0n9";
   };
 
   # I don't know why I need this; without this, the rpath set at the beginning of the
   # buildPhase gets removed from the 'meshlab' binary
   dontPatchELF = true;
 
-  # Patches are from the Arch Linux package
-  patchPhase = ''
-    patch -Np0 -i "${./qt-4.8.patch}"
-    patch -Np1 -i "${./gcc-4.7.patch}"
-  '';
+  patches = [ ./include-unistd.diff ];
 
   buildPhase = ''
     mkdir -p "$out/include"
diff --git a/pkgs/applications/graphics/meshlab/gcc-4.7.patch b/pkgs/applications/graphics/meshlab/gcc-4.7.patch
deleted file mode 100644
index 07dc1a08aff..00000000000
--- a/pkgs/applications/graphics/meshlab/gcc-4.7.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
-index 2351b2a..90c6d76 100644
---- a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
-+++ b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
-@@ -40,7 +40,7 @@ public:
- 
-   //! Reset histogram data.
-   void Clear() {
--    this->::Clear();
-+    Histogram<ScalarType>::Clear();
-     CV.clear();
-   }
-   /*
-diff --git a/vcglib/wrap/gl/trimesh.h b/vcglib/wrap/gl/trimesh.h
-index 5d40404..ab9d0aa 100644
---- a/vcglib/wrap/gl/trimesh.h
-+++ b/vcglib/wrap/gl/trimesh.h
-@@ -1003,7 +1003,7 @@ void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad)
- 			}
- 		}
- 
--	m.vert.math::Swap(newvert);
-+	m.vert.math.Swap(newvert);
- 	m.vn=m.vert.size();
- }
- 
-diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h
-index 3e41e63..4af9508 100644
---- a/vcglib/wrap/ply/plystuff.h
-+++ b/vcglib/wrap/ply/plystuff.h
-@@ -75,6 +75,7 @@ using namespace vcg;
- #define pb_close  _close
- #define DIR_SEP "\\"
- #else
-+#include <unistd.h>
- #define pb_mkdir(n)  mkdir(n,0755)
- #define pb_access access
- #define pb_stat   stat
diff --git a/pkgs/applications/graphics/meshlab/qt-4.8.patch b/pkgs/applications/graphics/meshlab/qt-4.8.patch
deleted file mode 100644
index abfd77d6f25..00000000000
--- a/pkgs/applications/graphics/meshlab/qt-4.8.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp
---- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp	2011-01-25 18:51:28.000000000 +1100
-+++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp	2012-01-07 11:47:12.836800072 +1100
-@@ -7,6 +7,12 @@
- #include "SyntopiaCore/Logging/Logging.h"
- #include "SyntopiaCore/Misc/MiniParser.h"
- 
-+#ifdef Q_WS_MAC
-+#include <OpenGL/glu.h>
-+#else
-+#include <GL/glu.h>
-+#endif
-+
- using namespace SyntopiaCore::Math;
- using namespace SyntopiaCore::Misc;
- 
-diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h
---- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h	2011-01-25 18:51:28.000000000 +1100
-+++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h	2012-01-07 11:45:26.795586149 +1100
-@@ -3,6 +3,12 @@
- #include "SyntopiaCore/Math/Vector3.h"
- #include "Object3D.h"
- 
-+#ifdef Q_WS_MAC
-+#include <OpenGL/glu.h>
-+#else
-+#include <GL/glu.h>
-+#endif
-+
- namespace SyntopiaCore {
- 	namespace GLEngine {	
- 
-diff -Nur meshlab.orig/src/external/structuresynth/structuresynth.pro meshlab/src/external/structuresynth/structuresynth.pro
---- meshlab.orig/src/external/structuresynth/structuresynth.pro	2011-01-25 18:49:34.000000000 +1100
-+++ meshlab/src/external/structuresynth/structuresynth.pro	2012-01-07 11:51:46.695981995 +1100
-@@ -113,6 +113,7 @@
-            ssynth/StructureSynth/Model/Rendering/TemplateRenderer.cpp
- CONFIG+=opengl
- QT+=xml opengl script
-+unix:LIBS += -lGLU
- macx:DESTDIR       = ../lib/macx
- win32-g++:DESTDIR       = ../lib/win32-gcc
- win32-msvc2005:DESTDIR       = ../lib/win32-msvc2005
-diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
---- meshlab.orig/src/meshlab/meshlab.pro	2011-02-15 20:39:47.000000000 +1100
-+++ meshlab/src/meshlab/meshlab.pro	2012-01-07 11:57:18.055586086 +1100
-@@ -85,6 +85,7 @@
- QT += xmlpatterns
- QT += network
- QT += script
-+unix:LIBS += -lGLU
- 
- 
- # the following line is needed to avoid mismatch between

From ac8f2391f322e5c058dd08b8911d18c1e19fbcd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 19 Aug 2015 23:31:46 +0200
Subject: [PATCH 1373/2016] pcl: 1.6.0 -> 1.7.2 (unbreaks build)

New deps added: libXt (required), libpcap (optional).

Releases are now at github.
---
 pkgs/development/libraries/pcl/default.nix | 20 +++++++++++---------
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index a71709b554b..46e2da18aa1 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchurl, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4, libusb1 }:
+{ stdenv, fetchzip, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4
+, libusb1, libpcap, libXt
+}:
 
-stdenv.mkDerivation {
-  name = "pcl-1.6.0";
+stdenv.mkDerivation rec {
+  name = "pcl-1.7.2";
 
-  buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 ];
-
-  src = fetchurl {
-    url = mirror://sourceforge/pointclouds/PCL-1.6.0-Source.tar.bz2;
-    sha256 = "0ip3djcjgynlr9vac6jlcw6kxhg2lm8fc0aqk747a6l0rqvllf1x";
+  src = fetchzip {
+    name = name + "-src";
+    url = "https://github.com/PointCloudLibrary/pcl/archive/${name}.tar.gz";
+    sha256 = "0sm19p6wcls2d9l0vi5fgwqp7l372nh3g7bdin42w31zr8dmz8h8";
   };
 
   enableParallelBuilding = true;
 
+  buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 libpcap libXt ];
+
   meta = {
     homepage = http://pointclouds.org/;
     description = "Open project for 2D/3D image and point cloud processing";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
-    broken = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a963c701d2..6f09fd5d51a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7810,6 +7810,7 @@ let
 
   pcl = callPackage ../development/libraries/pcl {
     vtk = vtkWithQt4;
+    inherit (xorg) libXt;
   };
 
   pcre = callPackage ../development/libraries/pcre {

From fd38b5fa49544cbd56444bcd34e4781c71bd2a35 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Aug 2015 11:49:55 +0200
Subject: [PATCH 1374/2016] Revert gcc darwin fixes

This reverts commits cb7c053383ff76a454484992b3a6d6a2f1530c15,
ebda45e6b9db3225c30a998b2624d90b0c08edb4,
4a495cfbab2b3ab9ae8219ef1812c766bf27b01e because they broke Nixpkgs
evaluation.

http://hydra.nixos.org/build/24813270
---
 .../development/compilers/gcc/4.8/default.nix | 28 ++++++++++------
 .../development/compilers/gcc/4.9/default.nix | 28 ++++++++++------
 pkgs/development/compilers/gcc/5/default.nix  | 33 +++++++++++++------
 pkgs/development/compilers/gcc/builder.sh     |  7 ++--
 pkgs/top-level/all-packages.nix               |  6 ----
 5 files changed, 61 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index bbf730a26fa..ff1d388b6e2 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -32,7 +32,7 @@
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
-, CF ? null
+, gnused ? null
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -47,8 +47,8 @@ assert cloog != null -> isl != null;
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
-# Make sure we get CoreFoundation
-assert stdenv.isDarwin -> CF != null;
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
@@ -288,6 +288,10 @@ stdenv.mkDerivation ({
     ++ (optionals (cross != null) [binutilsCross])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
+
+    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+    ++ (optional stdenv.isDarwin gnused)
     ;
 
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
@@ -298,10 +302,14 @@ stdenv.mkDerivation ({
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
     export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    configureFlagsArray+=(
-      --with-sysroot="${stdenv.libc}"
-      --with-native-system-header-dir=/include
-    )
+    if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
+      configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
+      makeFlagsArray+=( \
+       CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
+       CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+       FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+      )
+    fi
   '';
 
   dontDisableStatic = true;
@@ -470,10 +478,10 @@ stdenv.mkDerivation ({
                                           ++ optionals javaAwtGtk [ gmp mpfr ]
                                           ++ optional (libpthread != null) libpthread)));
 
-  extraFlags =
-    (if cross != null && libcCross != null
+  EXTRA_TARGET_CFLAGS =
+    if cross != null && libcCross != null
     then "-idirafter ${libcCross}/include"
-    else "") + optionalString stdenv.isDarwin " -F${CF}/Library/Frameworks";
+    else null;
 
   EXTRA_TARGET_LDFLAGS =
     if cross != null && libcCross != null
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index ed5e9ed920b..13154ddd27a 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -32,7 +32,7 @@
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
-, CF ? null
+, gnused ? null
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -47,8 +47,8 @@ assert cloog != null -> isl != null;
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
-# Make sure we get CoreFoundation
-assert stdenv.isDarwin -> CF != null;
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
@@ -287,6 +287,10 @@ stdenv.mkDerivation ({
     ++ (optionals (cross != null) [binutilsCross])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
+
+    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+    ++ (optional stdenv.isDarwin gnused)
     ;
 
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
@@ -297,10 +301,14 @@ stdenv.mkDerivation ({
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
     export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    configureFlagsArray+=(
-      --with-sysroot="${stdenv.libc}"
-      --with-native-system-header-dir=/include
-    )
+    if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
+      configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
+      makeFlagsArray+=( \
+       CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
+       CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+       FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+      )
+    fi
   '';
 
   dontDisableStatic = true;
@@ -469,10 +477,10 @@ stdenv.mkDerivation ({
                                           ++ optionals javaAwtGtk [ gmp mpfr ]
                                           ++ optional (libpthread != null) libpthread)));
 
-  extraFlags =
-    (if cross != null && libcCross != null
+  EXTRA_TARGET_CFLAGS =
+    if cross != null && libcCross != null
     then "-idirafter ${libcCross}/include"
-    else "") + optionalString stdenv.isDarwin " -F${CF}/Library/Frameworks";
+    else null;
 
   EXTRA_TARGET_LDFLAGS =
     if cross != null && libcCross != null
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index fc007fe447b..6decc4c8cc3 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -32,7 +32,8 @@
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
-, CF ? null
+, gnused ? null
+, binutils ? null
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -44,8 +45,11 @@ assert langVhdl     -> gnat != null;
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
-# Make sure we get CoreFoundation.
-assert stdenv.isDarwin -> CF != null;
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
+
+# Need c++filt on darwin
+assert stdenv.isDarwin -> binutils != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
@@ -282,6 +286,11 @@ stdenv.mkDerivation ({
     ++ (optionals (cross != null) [binutilsCross])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
+
+    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+    ++ (optional stdenv.isDarwin gnused)
+    ++ (optional stdenv.isDarwin binutils)
     ;
 
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
@@ -292,10 +301,14 @@ stdenv.mkDerivation ({
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
     export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    configureFlagsArray+=(
-      --with-sysroot="${stdenv.libc}"
-      --with-native-system-header-dir=/include
-    )
+    if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
+      configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
+      makeFlagsArray+=( \
+       CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
+       CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+       FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+      )
+    fi
   '';
 
   dontDisableStatic = true;
@@ -462,10 +475,10 @@ stdenv.mkDerivation ({
                                           ++ optionals javaAwtGtk [ gmp mpfr ]
                                           ++ optional (libpthread != null) libpthread)));
 
-  extraFlags =
-    (if cross != null && libcCross != null
+  EXTRA_TARGET_CFLAGS =
+    if cross != null && libcCross != null
     then "-idirafter ${libcCross}/include"
-    else "") + optionalString stdenv.isDarwin " -F${CF}/Library/Frameworks";
+    else null;
 
   EXTRA_TARGET_LDFLAGS =
     if cross != null && libcCross != null
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index ee38fadf418..dd77c67a023 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -23,11 +23,8 @@ if test "$noSysDirs" = "1"; then
 
         # Figure out what extra flags to pass to the gcc compilers
         # being generated to make sure that they use our glibc.
-        extraFlags="$(cat $NIX_CC/nix-support/libc-cflags) ${extraFlags}"
-        extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags)"
-        if [ -e "$NIX_CC/nix-support/libc-ldflags-before" ]; then
-          extraLDFlags+=" $(cat $NIX_CC/nix-support/libc-ldflags-before)"
-        fi
+        extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)"
+        extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"
 
         # Use *real* header files, otherwise a limits.h is generated
         # that does not include Glibc's limits.h (notably missing
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f4987c9ccb..3a7db14da46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3866,8 +3866,6 @@ let
     libcCross = if crossSystem != null then libcCross else null;
 
     isl = isl_0_14;
-
-    inherit (darwin) CF;
   }));
 
   gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 {
@@ -3885,8 +3883,6 @@ let
     isl = isl_0_11;
 
     cloog = cloog_0_18_0;
-
-    inherit (darwin) CF;
   }));
 
   gcc5 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5 {
@@ -3902,8 +3898,6 @@ let
     libcCross = if crossSystem != null then libcCross else null;
 
     isl = isl_0_14;
-
-    inherit (darwin) CF;
   }));
 
   gfortran = if !stdenv.isDarwin then gfortran49

From 0ed06696998dd70af96ffa8644685afdbba6b23d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 20 Aug 2015 12:57:40 +0200
Subject: [PATCH 1375/2016] nixos/tests/lightdm: Drop "session" screenshot.

Using waitForWindow on the IceWM root window doesn't necessarily mean
that the panel will be shown. In the lightdm test, we only make sure
that the login is working and thus it doesn't matter how the session
itself will look or whether IceWM is broken, so we don't need that
screenshot.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/tests/lightdm.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix
index 67bd395be06..f30f9062dcd 100644
--- a/nixos/tests/lightdm.nix
+++ b/nixos/tests/lightdm.nix
@@ -23,6 +23,5 @@ import ./make-test.nix ({ pkgs, ...} : {
     $machine->screenshot("lightdm");
     $machine->sendChars("${user.password}\n");
     $machine->waitForWindow("^IceWM ");
-    $machine->screenshot("session");
   '';
 })

From 088cc7f5f74ab7ed6b7deb54a0df2c3ac1ef06d7 Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Thu, 20 Aug 2015 13:21:53 +0200
Subject: [PATCH 1376/2016] iojs: 3.0.0 -> 3.1.0

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

diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index d6072484669..6a0c8ca512e 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
 
 let
-  version = "3.0.0";
+  version = "3.1.0";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
     url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = "0maxxmr6y7z3y3r88nhcnfzmpvbhs5p8knyz886bh2shgzd6nzqf";
+    sha256 = "15qh5pscg3588hyf4yfhma34gjkg87v5i4xzxj804g6m52m6y727";
   };
 
   prePatch = ''

From 401782cb678d2e28c0f7f2d40c6421624f410148 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Aug 2015 13:50:04 +0200
Subject: [PATCH 1377/2016] Revert "openssh: 6.9p1 -> 7.0p1"

This reverts commit a8eb2a6a81524f3be0c8886f6d06090b50b0a513. OpenSSH
7.0 is causing too many interoperability problems so soon before the
15.08 release.

For instance, it causes NixOps EC2 initial deployments to fail with
"REMOTE HOST IDENTIFICATION HAS CHANGED". This is because the client
knows the server's ssh-dss host key, but this key is no longer
accepted by default. Setting "HostKeyAlgorithms" to "+ssh-dss" does
not work because it causes ssh-dss to be ordered after
"ecdsa-sha2-nistp521", which the server also offers. (Normally, ssh
prioritizes host key algorithms for which the client has a known host
key, but not if you set HostKeyAlgorithms.)
---
 nixos/modules/programs/ssh.nix                 | 3 ---
 nixos/modules/services/networking/ssh/sshd.nix | 3 ---
 pkgs/tools/networking/openssh/default.nix      | 4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 9c94250cb1f..d3183f7d2dc 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -115,9 +115,6 @@ in
 
         ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
 
-        # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
-        PubkeyAcceptedKeyTypes +ssh-dss
-
         ${cfg.extraConfig}
       '';
 
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index be2dde12197..1c428ceddfd 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -413,9 +413,6 @@ in
         ${flip concatMapStrings cfg.hostKeys (k: ''
           HostKey ${k.path}
         '')}
-
-        # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
-        PubkeyAcceptedKeyTypes +ssh-dss
       '';
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 57bbf1da22e..357ee2b9f21 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -17,11 +17,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "openssh-7.0p1";
+  name = "openssh-6.9p1";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1rc52jyc5v5b8j9kvasrnz9vnj9b0i7fw4nqac8wix0r794k4ngx";
+    sha256 = "1zkci5nbpb4frmzj2vr3kv9j47x2h72kvybcpr0d8mzk73sls1vf";
   };
 
   prePatch = optionalString hpnSupport

From 2d4b6405b36ca801a5f8d1a6b0a8e932db287969 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Aug 2015 14:07:38 +0200
Subject: [PATCH 1378/2016] openssh: Apply some Fedora security backports

---
 pkgs/tools/networking/openssh/default.nix     |  2 +-
 .../openssh/openssh-6.9p1-security-7.0.patch  | 65 +++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 357ee2b9f21..2004e453a0d 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
     '';
 
-  patches = [ ./locale_archive.patch ];
+  patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch];
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ]
     ++ optional withKerberos [ kerberos ];
diff --git a/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch b/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch
new file mode 100644
index 00000000000..02e9eb3a973
--- /dev/null
+++ b/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch
@@ -0,0 +1,65 @@
+http://pkgs.fedoraproject.org/cgit/openssh.git/commit/openssh-6.9p1-security-7.0.patch?h=f22&id=4776fad91e7e1f626f33e8c240d0ccecd663554d
+
+diff --git a/sshpty.c b/sshpty.c
+index 7bb7641..15da8c6 100644
+--- a/sshpty.c
++++ b/sshpty.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: sshpty.c,v 1.29 2014/09/03 18:55:07 djm Exp $ */
++/* $OpenBSD: sshpty.c,v 1.30 2015/07/30 23:09:15 djm Exp $ */
+ /*
+  * Author: Tatu Ylonen <ylo@cs.hut.fi>
+  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+@@ -197,7 +197,7 @@ pty_setowner(struct passwd *pw, const char *tty)
+ 	/* Determine the group to make the owner of the tty. */
+ 	grp = getgrnam("tty");
+ 	gid = (grp != NULL) ? grp->gr_gid : pw->pw_gid;
+-	mode = (grp != NULL) ? 0622 : 0600;
++	mode = (grp != NULL) ? 0620 : 0600;
+ 
+ 	/*
+ 	 * Change owner and mode of the tty as required.
+diff --git a/monitor.c b/monitor.c
+index b410965..f1b873d 100644
+--- a/monitor.c
++++ b/monitor.c
+@@ -1084,9 +1084,7 @@ extern KbdintDevice sshpam_device;
+ int
+ mm_answer_pam_init_ctx(int sock, Buffer *m)
+ {
+-
+ 	debug3("%s", __func__);
+-	authctxt->user = buffer_get_string(m, NULL);
+ 	sshpam_ctxt = (sshpam_device.init_ctx)(authctxt);
+ 	sshpam_authok = NULL;
+ 	buffer_clear(m);
+@@ -1166,14 +1166,16 @@ mm_answer_pam_respond(int sock, Buffer *m)
+ int
+ mm_answer_pam_free_ctx(int sock, Buffer *m)
+ {
++	int r = sshpam_authok != NULL && sshpam_authok == sshpam_ctxt;
+ 
+ 	debug3("%s", __func__);
+ 	(sshpam_device.free_ctx)(sshpam_ctxt);
++	sshpam_ctxt = sshpam_authok = NULL;
+ 	buffer_clear(m);
+ 	mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m);
+ 	auth_method = "keyboard-interactive";
+ 	auth_submethod = "pam";
+-	return (sshpam_authok == sshpam_ctxt);
++	return r;
+ }
+ #endif
+ 
+diff --git a/monitor_wrap.c b/monitor_wrap.c
+index e6217b3..eac421b 100644
+--- a/monitor_wrap.c
++++ b/monitor_wrap.c
+@@ -614,7 +614,6 @@ mm_sshpam_init_ctx(Authctxt *authctxt)
+ 
+ 	debug3("%s", __func__);
+ 	buffer_init(&m);
+-	buffer_put_cstring(&m, authctxt->user);
+ 	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m);
+ 	debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__);
+ 	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m);

From b661ebe3cbef28e81ea70f42cc6ea6af16a30144 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 20 Aug 2015 08:09:55 -0400
Subject: [PATCH 1379/2016] rcs: Use c99 on darwin

---
 pkgs/applications/version-management/rcs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index 266ab81777b..a829af8aa23 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-std=gnu99" else null;
+
   meta = {
     homepage = http://www.gnu.org/software/rcs/;
     description = "Revision control system";

From 8a137ead51115cf9aa617795f7729b255a6a81ea Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 20 Aug 2015 14:32:45 +0200
Subject: [PATCH 1380/2016] edbrowse: 3.5.2 -> 3.5.4.1

---
 .../applications/editors/edbrowse/default.nix | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index 8fdc198f45c..d969552ecde 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -1,17 +1,24 @@
 { stdenv, fetchurl, spidermonkey_24, unzip, curl, pcre, readline, openssl }:
 stdenv.mkDerivation rec {
-  name = "edbrowse-3.5.2";
-  buildInputs = [ unzip curl pcre readline openssl spidermonkey_24 ];
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${spidermonkey_24}/include/mozjs-24"
-    '';
-  installPhase = "installBin src/edbrowse";
+  name = "edbrowse-${version}";
+  version = "3.5.4.1";
+
+  nativeBuildInputs = [ unzip ];
+  buildInputs = [ curl pcre readline openssl spidermonkey_24 ];
+
+  patchPhase = ''
+    substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\"
+  '';
+
+  NIX_CFLAGS_COMPILE = "-I${spidermonkey_24}/include/mozjs-24";
+  makeFlags = "-C src prefix=$(out)";
+
   src = fetchurl {
-    url = "http://the-brannons.com/edbrowse/${name}.zip";
-    sha256 = "5f1ac927d126b8c8fd411231cffa9eba5405013e64994e55e1864b2f85d52714";
+    url = "http://edbrowse.org/${name}.zip";
+    sha256 = "0fpzaalwvgwbns7yxq4a4i6hpdljmcjfyvx19r1dlb3vdfw0vx5l";
   };
   meta = {
-    description = "Edbrowse, a Command Line Editor Browser";
+    description = "Command Line Editor Browser";
     longDescription = ''
       Edbrowse is a combination editor, browser, and mail client that is 100% text based.
       The interface is similar to /bin/ed, though there are many more features, such as editing multiple files simultaneously, and rendering html.
@@ -20,7 +27,7 @@ stdenv.mkDerivation rec {
       edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke.
       '';
     license = stdenv.lib.licenses.gpl1Plus;
-    homepage = http://the-brannons.com/edbrowse/;
+    homepage = http://edbrowse.org/;
     maintainers = [ stdenv.lib.maintainers.schmitthenner ];
   };
 }

From 3506c0bf04538c4a25b57dd43600b61907796008 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 20 Aug 2015 08:37:04 -0400
Subject: [PATCH 1381/2016] emacs: Build cocoa on darwin

---
 pkgs/applications/editors/emacs-24/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 178b2a306af..6c52a899108 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -50,7 +50,9 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
 
   configureFlags =
-    if withX
+    if stdenv.isDarwin
+      then [ "--with-ns" "--disable-ns-self-contained" ]
+    else if withX
       then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
       else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
              "--with-gif=no" "--with-tiff=no" ];
@@ -61,6 +63,9 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp/
     cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    mkdir -p $out/Applications
+    mv nextstep/Emacs.app $out/Applications
   '';
 
   doCheck = true;

From 3f1fa380b2e3b4677f5ddea127ee5375a7aee770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 20 Aug 2015 15:18:46 +0200
Subject: [PATCH 1382/2016] gdk-pixbuf: fix CVE-2015-4491 by maintenance update

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

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 1322bc4eeab..722da0c89fc 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,14 +3,14 @@
 
 let
   ver_maj = "2.31";
-  ver_min = "5";
+  ver_min = "6";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "19ppbycbr87rai93vf2ff8k3ksjqq64s8qysq0mfy9fdjw2ffxha";
+    sha256 = "062x2gqd7p6yxhxlib1ha4l3gk9ihcj080hrwwv9vmlmybb064hi";
   };
 
   setupHook = ./setup-hook.sh;

From d911cc8d63aa4c65c907b5051eabf958c70be12d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 20 Aug 2015 15:21:20 +0200
Subject: [PATCH 1383/2016] harfbuzz: minor update 1.0.1 -> 1.0.2

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

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index e1564661b42..866c7f43811 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,11 +8,11 @@
 # (icu is a ~30 MB dependency, the rest is very small in comparison)
 
 stdenv.mkDerivation rec {
-  name = "harfbuzz-1.0.1";
+  name = "harfbuzz-1.0.2";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "1a0fxw4sb6p82lz407d2wy31wln08v839ln1lpxjqbsab2nsg89j";
+    sha256 = "0rmlwfxyzdblnvg72hpfcz2py8rjflx0m08wlvfgq420cpwcmcxy";
   };
 
   outputs = [ "out" "doc" ];

From 304a5e6168f7c11f975a87fd29be6a1c49e22ba6 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 20 Aug 2015 16:00:07 +0200
Subject: [PATCH 1384/2016] gnome-calendar: Add missing dependency on
 hicolor_icon_theme (#9369)

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

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
index 043cd694bd4..38c4b930b03 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
 , intltool, evolution_data_server, sqlite, libxml2, libsoup
-, glib }:
+, glib, hicolor_icon_theme }:
 
 stdenv.mkDerivation rec {
   name = "gnome-calendar-${gnome3.version}.2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server
-    sqlite libxml2 libsoup glib
+    sqlite libxml2 libsoup glib hicolor_icon_theme
   ];
 
   meta = with stdenv.lib; {

From 50d90a2538ceb953fe3e88ae7ad29bd048b406c2 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 20 Aug 2015 16:03:58 +0200
Subject: [PATCH 1385/2016] gtkdialog: Add missing dependency on
 hicolor_icon_theme (#9369)

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

diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix
index cd8ad0d64cd..d58ba8cddf2 100644
--- a/pkgs/development/tools/misc/gtkdialog/default.nix
+++ b/pkgs/development/tools/misc/gtkdialog/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk, pkgconfig}:
+{stdenv, fetchurl, gtk, pkgconfig, hicolor_icon_theme }:
 
 stdenv.mkDerivation {
   name = "gtkdialog-0.8.3";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e";
   };
 
-  buildInputs = [ gtk pkgconfig ];
+  buildInputs = [ gtk pkgconfig hicolor_icon_theme ];
 
   meta = {
     homepage = http://gtkdialog.googlecode.com/;

From c9c3a3cb721ca61b7e85183ffae56b8bcb44af30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 20 Aug 2015 16:05:18 +0200
Subject: [PATCH 1386/2016] meshlab: add missing patch (doh!)

Should have been included in af7d5f27d01d6 ("meshlab: 1.3.2 -> 1.3.3").
---
 .../graphics/meshlab/include-unistd.diff            | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 pkgs/applications/graphics/meshlab/include-unistd.diff

diff --git a/pkgs/applications/graphics/meshlab/include-unistd.diff b/pkgs/applications/graphics/meshlab/include-unistd.diff
new file mode 100644
index 00000000000..74f28a4d211
--- /dev/null
+++ b/pkgs/applications/graphics/meshlab/include-unistd.diff
@@ -0,0 +1,13 @@
+*** old/vcglib/wrap/ply/plystuff.h	2013-02-09 00:00:04.110705851 -0500
+--- new/vcglib/wrap/ply/plystuff.h	2013-02-09 15:20:53.482205183 -0500
+***************
+*** 75,80 ****
+--- 75,81 ----
+  #define pb_close  _close
+  #define DIR_SEP "\\"
+  #else
++ #include <unistd.h>
+  #define pb_mkdir(n)  mkdir(n,0755)
+  #define pb_access access
+  #define pb_stat   stat
+

From a9a41bc506fe42abe27bef1748566032d54d6f3c Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 20 Aug 2015 16:18:51 +0200
Subject: [PATCH 1387/2016] kubernetes: fix build

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f09918d0a5..c899b875400 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1521,7 +1521,7 @@ let
   lp_solve = callPackage ../applications/science/math/lp_solve { };
 
   lprof = callPackage ../tools/graphics/lprof { };
-  
+
   fatresize = callPackage ../tools/filesystems/fatresize {};
 
   fdk_aac = callPackage ../development/libraries/fdk-aac { };
@@ -11903,7 +11903,9 @@ let
 
   ksuperkey = callPackage ../tools/X11/ksuperkey { };
 
-  kubernetes = callPackage ../applications/networking/cluster/kubernetes { };
+  kubernetes = callPackage ../applications/networking/cluster/kubernetes {
+    go = go_1_4;
+  };
 
   lame = callPackage ../development/libraries/lame { };
 

From e059070ad3993d96075c452e84dac6bb3707f6a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 20 Aug 2015 17:05:02 +0200
Subject: [PATCH 1388/2016] ocamlPackages.ocurl: update from 0.7.2 to 0.7.5

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

diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix
index 73670fb3125..2cfb6af68a8 100644
--- a/pkgs/development/ocaml-modules/ocurl/default.nix
+++ b/pkgs/development/ocaml-modules/ocurl/default.nix
@@ -1,9 +1,9 @@
 { stdenv, ocaml, findlib, fetchurl, curl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ocurl-0.7.2";
+  name = "ocurl-0.7.5";
   src = fetchurl {
-    url = "https://forge.ocamlcore.org/frs/download.php/1463/${name}.tar.gz";
+    url = "https://forge.ocamlcore.org/frs/download.php/1463/${name}.tar.bz2";
     sha256 = "0yn7f3g5wva8nqxh76adpq9rihggc405jkqysfghzwnf3yymyqrr";
   };
 

From 1f10b44d3ece5486f79570e4675128307469c7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 20 Aug 2015 17:07:06 +0200
Subject: [PATCH 1389/2016] xvkbd: update from 3.5 to 3.6

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

diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index 37af62e8cdf..7e570cbd396 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/pkgs/tools/X11/xvkbd/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "xvkbd-${version}";
-  version = "3.5";
+  version = "3.6";
   src = fetchurl {
     url = "http://homepage3.nifty.com/tsato/xvkbd/xvkbd-${version}.tar.gz";
-    sha256 = "1vlg5gl1bflx80prvwg6glw0g4fvbi6k3cy0pya0h7cz6nxbs6c8";
+    sha256 = "1bjvv93xmmjjk6ir95shwrk6aaiqiprwk12npyahfsik4cf58y16";
   };
 
   buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ];

From 4ec87513b69b54f708f944c296cc008730c558cd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 20 Aug 2015 17:26:16 +0200
Subject: [PATCH 1390/2016] packagekit: python3 attr. -> unversioned python

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

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 1dcfd309559..15b6fd5fe9c 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python3, sqlite }:
+{ stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python, sqlite }:
 
 let version = "1.0.7"; in
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     url = "https://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz";
   };
 
-  buildInputs = [ glib polkit python3 ];
+  buildInputs = [ glib polkit python ];
   propagatedBuildInputs = [ sqlite ];
   nativeBuildInputs = [ intltool pkgconfig ];
 

From d1c30dc5aa3daa47186ed584611d85d25038f016 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Aug 2015 20:34:35 +0200
Subject: [PATCH 1391/2016] Give the chromium test more memory

Hopefully fixes random failures like

http://hydra.nixos.org/build/24861987/nixlog/446
---
 nixos/tests/chromium.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 26e179c3944..2ce47c23775 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -15,7 +15,7 @@ import ./make-test.nix (
   enableOCR = true;
 
   machine.imports = [ ./common/x11.nix ];
-  machine.virtualisation.memorySize = 1024;
+  machine.virtualisation.memorySize = 4096;
 
   startupHTML = pkgs.writeText "chromium-startup.html" ''
     <!DOCTYPE html>

From 6769633b64a4f5d3e11617ae490d8b593834a64e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Aug 2015 20:42:41 +0200
Subject: [PATCH 1392/2016] autogen: Fix build outside of chroot

http://hydra.nixos.org/build/24870256
---
 pkgs/development/tools/misc/autogen/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 71ea938ea78..9c7185e1021 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     # Fix a broken sed expression used for detecting the minor
     # version of guile we are using
     sed -i "s,sed '.*-I.*',sed 's/\\\(^\\\| \\\)-I/\\\1/g',g" configure
+
+    substituteInPlace pkg/libopts/mklibsrc.sh --replace /tmp $TMPDIR
   '';
 
   #doCheck = true; # 2 tests fail because of missing /dev/tty

From 1bedd3b597c9626e8bdccbbe2bc9ddfd411ec247 Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Thu, 20 Aug 2015 21:04:27 +0200
Subject: [PATCH 1393/2016] obnam: 1.14 -> 1.15

---
 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 123933881fd..b430c4732ff 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.14";
+  version = "1.15";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "16875g14b7mxfd46159b92qa3gxq59w5gzf8x2n7icqa05s3483q";
+    sha256 = "1wpvy6qrrp2k0b38a864n0ayh5mr8353rndiqb8ax7z0y3jz484x";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];

From c51f0dbd522b9c7ed84c13743734b57481ca23dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 20 Aug 2015 21:49:15 +0200
Subject: [PATCH 1394/2016] haskell: disable haddock on GHC <7.8 on darwin

Fixes NixOS/nixpkgs#812
---
 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 4f142cd932d..c6b969d3088 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -27,7 +27,7 @@
 , jailbreak ? false
 , license
 , maintainers ? []
-, doHaddock ? true
+, doHaddock ? !stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8"
 , passthru ? {}
 , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? []
 , platforms ? ghc.meta.platforms

From 58c02a0cbef10cd1d21dbbea3df59ca9c07161c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Aug 2015 22:02:48 +0200
Subject: [PATCH 1395/2016] emacs-haskell-mode: update to latest Git version

Hopefully, this update fixes the TAB-completion issues in ghci.
---
 pkgs/applications/editors/emacs-modes/haskell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 2f8848ca0dd..022827952b6 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, emacs, texinfo }:
 
 let
-  version = "13.14-130-ga03bd9b";      # git describe --tags
+  version = "13.14-153-g318ccab";      # git describe --tags
 in
 stdenv.mkDerivation {
   name = "haskell-mode-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     owner = "haskell";
     repo = "haskell-mode";
     rev = "v${version}";
-    sha256 = "0k4jfixzsvwpsz37f2pvbr9slz8fpcd9nwddcv2bvi4x20jp11ma";
+    sha256 = "1n08fmaf7q13y68xyzs4h686hvb7n5mdyvn1zy81d7gh0m5013k4";
   };
 
   buildInputs = [ emacs texinfo ];

From 2e917466615563827ad7a87fc6e334c10d65f68e Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 20 Aug 2015 22:05:45 +0200
Subject: [PATCH 1396/2016] gnome-calendar: Depend on gnome3.defaultIconTheme
 instead of hicolor_icon_theme

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

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
index 38c4b930b03..805c2482e9b 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
 , intltool, evolution_data_server, sqlite, libxml2, libsoup
-, glib, hicolor_icon_theme }:
+, glib }:
 
 stdenv.mkDerivation rec {
   name = "gnome-calendar-${gnome3.version}.2";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server
-    sqlite libxml2 libsoup glib hicolor_icon_theme
+    sqlite libxml2 libsoup glib gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {

From ab6c8643d451b04884e938cd7ed2186663d32a96 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Aug 2015 22:56:41 +0200
Subject: [PATCH 1397/2016] nix-gc.nix: prefer "nix-store" over
 "nix-collect-garbage" because the latter supports "--max-freed"

Works around https://github.com/NixOS/nix/issues/609.
---
 nixos/modules/services/misc/nix-gc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix
index 6a7a7f4cee7..98129935257 100644
--- a/nixos/modules/services/misc/nix-gc.nix
+++ b/nixos/modules/services/misc/nix-gc.nix
@@ -52,7 +52,7 @@ in
 
     systemd.services.nix-gc =
       { description = "Nix Garbage Collector";
-        script = "exec ${config.nix.package}/bin/nix-collect-garbage ${cfg.options}";
+        script = "exec ${config.nix.package}/bin/nix-store --gc ${cfg.options}";
         startAt = optionalString cfg.automatic cfg.dates;
       };
 

From 7d7bbf125ecbbc229b7882dc1d5c06c4013df076 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Fri, 21 Aug 2015 00:51:27 +0300
Subject: [PATCH 1398/2016] teamviewer 10: new sha256

---
 pkgs/applications/networking/remote/teamviewer/10.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/10.nix b/pkgs/applications/networking/remote/teamviewer/10.nix
index 4b919d36fb6..7e97a31c3a9 100644
--- a/pkgs/applications/networking/remote/teamviewer/10.nix
+++ b/pkgs/applications/networking/remote/teamviewer/10.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   name = "teamviewer-10.0.37742";
   src = fetchurl {
     url = config.teamviewer10.url or "http://download.teamviewer.com/download/teamviewer_amd64.deb";
-    sha256 = config.teamviewer10.sha256 or "0n2lzphvsqnlvm7pd7hjlislqj9rr57lai8jyw4wpqcy9j2xwxd2";
+    sha256 = config.teamviewer10.sha256 or "10risay1a5a85ijbjaz2vxqbfxygpxslvh0dvzz32k988hr9p1gk";
   };
 
   buildInputs = [ makeWrapper patchelf ];

From b3fb6dc5aaec8af0a7a223738b812c863d34edcf Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 20 Aug 2015 13:12:09 -0700
Subject: [PATCH 1399/2016] htop: Update to fix issues with ncurses 6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
william@exodus ~> htop

htop 1.0.3 aborting. Please report bug at http://hisham.hm/htop

 Please include in your report the following backtrace:
 htop(CRT_handleSIGSEGV+0x32)[0x4177b2]
 /nix/store/xaz2f0mxklh0kh231h6spzbiblq1fm5b-glibc-2.21/lib/libc.so.6(+0x33460)[0x7f9fb9157460]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(+0x33f91)[0x7f9fb97faf91]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(doupdate_sp+0xc1d)[0x7f9fb97fe0ad]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(wrefresh+0x39)[0x7f9fb97ecf09]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(_nc_wgetch+0x12a)[0x7f9fb97e583a]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(wgetch+0x25)[0x7f9fb97e6555]
 htop(ScreenManager_run+0x15a)[0x40ee8a]
 htop(main+0x487)[0x4069b7]
 /nix/store/xaz2f0mxklh0kh231h6spzbiblq1fm5b-glibc-2.21/lib/libc.so.6(__libc_start_main+0xf5)[0x7f9fb9144995]
 htop(_start+0x29)[0x406af9]

 Additionally, in order to make the above backtrace useful,
 please also run the following command to generate a disassembly of your
 binary:

    objdump -d `which htop` > ~/htop.objdump

    and then attach the file ~/htop.objdump to your bug report.

    Thank you for helping to improve htop!

    fish: “htop” terminated by signal SIGABRT (Abort)
```
---
 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 6c83783bc6a..873795c9752 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-186-gf2c053a";
+  name = "htop-1.0.3-584-8f07868f";
 
   src = fetchFromGitHub {
-    sha256 = "017aihyg0bjli1hlvcqgqxpwzy2ayvwv6byhqd97n9sqfkmi9i0p";
-    rev = "f2c053a88497f3ad5ae786c16ecf1275212c13be";
+    sha256 = "0s7l9v7n7hw32hznvdq2sykyxgb30hmzycwcjxw8f0c2mww61xcd";
+    rev = "8f07868fefeb844a852fab704c0763b0e9a9bf01";
     repo = "htop";
     owner = "hishamhm";
   };

From 8aece3d1eef59d42538ced3fd72cb50553f421c0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 20 Aug 2015 15:32:29 -0700
Subject: [PATCH 1400/2016] nspr: 4.10.8 -> 4.10.9

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

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 1494092fc47..03558817fce 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,23 +1,27 @@
 { stdenv, fetchurl }:
 
-let version = "4.10.8"; in
+let version = "4.10.9"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15";
+    sha256 = "4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881";
   };
 
-  preConfigure = "cd nspr";
+  preConfigure = ''
+    cd nspr
+  '';
 
-  configureFlags = "--enable-optimize --disable-debug ${if stdenv.is64bit then "--enable-64bit" else ""}";
+  configureFlags = [
+    "--enable-optimize"
+    "--disable-debug"
+  ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit";
 
-  postInstall =
-    ''
-      find $out -name "*.a" | xargs rm
-    '';
+  postInstall = ''
+    find $out -name "*.a" -delete
+  '';
 
   enableParallelBuilding = true;
 

From b5d599af8c95393d8e73d9d7c705101e525f0a3d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 20 Aug 2015 15:32:40 -0700
Subject: [PATCH 1401/2016] nss: 3.19.3 -> 3.20

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

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 5c73f5db26f..0a25e24fc54 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.19.3";
+  version = "3.20";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_3_RTM/src/${name}.tar.gz";
-    sha256 = "c56bdad20736a8227afb3c97b25d6d2eb3982e979ddc9be1d66cb7199ae8ca8f";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_RTM/src/${name}.tar.gz";
+    sha256 = "5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

From 8255ac0d68f937b46b3b86aa90c390e68ce7fe75 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 20 Aug 2015 15:57:25 -0700
Subject: [PATCH 1402/2016] vim: 7.4.826 -> 7.4.827

Fix the version string to match the new versioning scheme after the
github migration.
---
 pkgs/applications/editors/vim/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 54b3127898e..3bdd44529dd 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "vim-${version}";
-  version = "7.4.826";
+  version = "7.4.827";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
-    rev = "v${stdenv.lib.replaceChars ["."] ["-"] version}";
-    sha256 = "147lkcjdd0jbc7y2hflfzwnyjhdgi1971pmkizihybxmmj1a4g8y";
+    rev = "v${version}";
+    sha256 = "1m34s2hsc5lcish6gmvn2iwaz0k7jc3kg9q4nf30fj9inl7gaybs";
   };
 
   # this makes maintainers very sad

From 901dd019de477bbf759d178ad3001b4709d3250b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 21 Aug 2015 00:52:21 +0200
Subject: [PATCH 1403/2016] prompt_toolkit: update 0.45 -> 0.46

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f989d05fe74..e3ca5e5d4b9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9421,6 +9421,10 @@ let
       click configobj prompt_toolkit psycopg2 pygments sqlparse
     ];
 
+    postPatch = ''
+      substituteInPlace setup.py --replace "==" ">="
+    '';
+
     meta = {
       inherit version;
       description = "Command-line interface for PostgreSQL";
@@ -9751,10 +9755,10 @@ let
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.45";
+    version = "0.46";
 
     src = pkgs.fetchurl {
-      sha256 = "19lp15rc0rq4jqaacg2a38cdgfy2avhf5v97yanasx4n2swx4gsm";
+      sha256 = "1yq9nis1b2rgpndi2rqh4divf6j22jjva83r5z8jf7iffywmr8hs";
       url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
     };
 

From 5adba5cf6fb66b40c20f91bb5b0a30cc9d71af3c Mon Sep 17 00:00:00 2001
From: Tanner Doshier <doshitan@gmail.com>
Date: Thu, 20 Aug 2015 21:43:54 -0500
Subject: [PATCH 1404/2016] elm: fix patch hashes

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

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 4a056e61de9..51e19614ddd 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -45,14 +45,14 @@ let
               buildTools = drv.buildTools or [] ++ [ self.elm-make ];
               patches = [ (fetchpatch {
                 url = "https://github.com/elm-lang/elm-reactor/commit/ca4d91d3fc7c6f72aa802d79fd1563ab5f3c4f2c.patch";
-                sha256 = "1msq7rvjid27m11lwcz9r1vyczlk7bfknyywqln300c8bgqyl45j";
+                sha256 = "0cjcv5rvrq7v1j8n8w87ljgza522cm32cy4n4rq5ysjq3qnaxwcq";
               }) ];
               preConfigure = makeElmStuff (import ./packages/elm-reactor-elm.nix);
             });
 
             elm-package = hlib.appendPatch elmPkgs'.elm-package (fetchpatch {
               url = "https://github.com/elm-lang/elm-package/commit/af517f2ffe15f8ec1d8c38f01ce188bbdefea47a.patch";
-              sha256 = "0yq5vawmp9qq5w6qfy12r32ahpvccra749pnhg0zdykrj369m8a8";
+              sha256 = "1l66i4qssp0mcq8yypcn1ps3n2bskyfiqf0qr8gan6wz3znafpy9";
             });
 
             elm-repl = hlib.overrideCabal elmPkgs'.elm-repl (drv: {

From efd34824eb4c23a135bf2b08b2b53b7777ad350a Mon Sep 17 00:00:00 2001
From: Wei-Ming Yang <rick68@gmail.com>
Date: Wed, 19 Aug 2015 15:37:20 +0800
Subject: [PATCH 1405/2016] softether: support SoftEther VPN 4.18

---
 lib/maintainers.nix                           |   1 +
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/networking/softether.nix | 150 ++++++++++++++++++
 pkgs/servers/softether/4.18.nix               |  53 +++++++
 pkgs/top-level/all-packages.nix               |   3 +
 5 files changed, 208 insertions(+)
 create mode 100644 nixos/modules/services/networking/softether.nix
 create mode 100644 pkgs/servers/softether/4.18.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d42d81399cf..ea37c41af92 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -210,6 +210,7 @@
   refnil = "Martin Lavoie <broemartino@gmail.com>";
   relrod = "Ricky Elrod <ricky@elrod.me>";
   renzo = "Renzo Carbonara <renzocarbonara@gmail.com>";
+  rick68 = "Wei-Ming Yang <rick68@gmail.com>";
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   robberer = "Longrin Wischnewski <robberer@freakmail.de>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 733f3c5d853..b21bccc2e90 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -330,6 +330,7 @@
   ./services/networking/seeks.nix
   ./services/networking/skydns.nix
   ./services/networking/shout.nix
+  ./services/networking/softether.nix
   ./services/networking/spiped.nix
   ./services/networking/sslh.nix
   ./services/networking/ssh/lshd.nix
diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix
new file mode 100644
index 00000000000..49538af7d35
--- /dev/null
+++ b/nixos/modules/services/networking/softether.nix
@@ -0,0 +1,150 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  pkg = pkgs.softether;
+  cfg = config.services.softether;
+
+in
+{
+
+  ###### interface
+
+  options = {
+
+    services.softether = {
+
+      enable = mkEnableOption "SoftEther VPN services";
+
+      vpnserver.enable = mkEnableOption "SoftEther VPN Server";
+
+      vpnbridge.enable = mkEnableOption "SoftEther VPN Bridge";
+
+      vpnclient = {
+        enable = mkEnableOption "SoftEther VPN Client";
+        up = mkOption {
+          type = types.lines;
+          default = "";
+          description = ''
+            Shell commands executed when the Virtual Network Adapter(s) is/are starting.
+          '';
+        };
+        down = mkOption {
+          type = types.lines;
+          default = "";
+          description = ''
+            Shell commands executed when the Virtual Network Adapter(s) is/are shutting down.
+          '';
+        };
+      };
+
+      dataDir = mkOption {
+        type = types.string;
+        default = "${pkg.dataDir}";
+        description = ''
+          Data directory for SoftEther VPN.
+        '';
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable (
+
+    mkMerge [{
+      environment.systemPackages = [
+          (pkgs.lib.overrideDerivation pkg (attrs: {
+            dataDir = cfg.dataDir;
+          }))
+        ];
+      jobs.softether = {
+        description = "SoftEther VPN services initial job";
+        startOn = "started network-interfaces";
+        preStart = ''
+            for d in vpnserver vpnbridge vpnclient vpncmd; do
+                if ! test -e ${cfg.dataDir}/$d; then
+                    ${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d
+                    install -m0600 ${pkg}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
+                fi
+            done
+            rm -rf ${cfg.dataDir}/vpncmd/vpncmd
+            ln -s ${pkg}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
+        '';
+        exec = "true";
+      };
+    }
+
+    (mkIf (cfg.vpnserver.enable) {
+      systemd.services.vpnserver = {
+        description = "SoftEther VPN Server";
+        after = [ "network-interfaces.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ExecStart = "${pkg}/bin/vpnserver start";
+          ExecStop = "${pkg}/bin/vpnserver stop";
+          Type = "forking";
+        };
+        preStart = ''
+            rm -rf ${cfg.dataDir}/vpnserver/vpnserver
+            ln -s ${pkg}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
+        '';
+        postStop = ''
+            rm -rf ${cfg.dataDir}/vpnserver/vpnserver
+        '';
+      };
+    })
+
+    (mkIf (cfg.vpnbridge.enable) {
+      systemd.services.vpnbridge = {
+        description = "SoftEther VPN Bridge";
+        after = [ "network-interfaces.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ExecStart = "${pkg}/bin/vpnbridge start";
+          ExecStop = "${pkg}/bin/vpnbridge stop";
+          Type = "forking";
+        };
+        preStart = ''
+            rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
+            ln -s ${pkg}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
+        '';
+        postStop = ''
+            rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
+        '';
+      };
+    })
+
+    (mkIf (cfg.vpnclient.enable) {
+      systemd.services.vpnclient = {
+        description = "SoftEther VPN Client";
+        after = [ "network-interfaces.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ExecStart = "${pkg}/bin/vpnclient start";
+          ExecStop = "${pkg}/bin/vpnclient stop";
+          Type = "forking";
+        };
+        preStart = ''
+            rm -rf ${cfg.dataDir}/vpnclient/vpnclient
+            ln -s ${pkg}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
+        '';
+        postStart = ''
+            sleep 1
+            ${cfg.vpnclient.up}
+        '';
+        postStop = ''
+            rm -rf ${cfg.dataDir}/vpnclient/vpnclient
+            sleep 1
+            ${cfg.vpnclient.down}
+        '';
+      };
+      boot.kernelModules = [ "tun" ];
+    })
+
+  ]);
+
+}
diff --git a/pkgs/servers/softether/4.18.nix b/pkgs/servers/softether/4.18.nix
new file mode 100644
index 00000000000..4b5b67cf85b
--- /dev/null
+++ b/pkgs/servers/softether/4.18.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl
+, openssl, readline, ncurses, zlib }:
+
+let
+  os = if stdenv.isLinux then "1"
+       else if stdenv.isFreeBSD then "2"
+       else if stdenv.isSunOS then "3"
+       else if stdenv.isDarwin then "4"
+       else if stdenv.isOpenBSD then "5"
+       else "";
+  cpuBits = if stdenv.is64bit then "2" else "1";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "softether-${version}";
+  version = "4.18";
+  build = "9570";
+  compiledDate = "2015.07.26";
+  dataDir = "/var/lib/softether";
+
+  src = fetchurl {
+    url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
+    sha256 = "585d61e524d3cad90806cbeb52ebe54b5144359e6c44676e8e7fb5683ffd4574";
+  };
+
+  buildInputs = [ openssl readline ncurses zlib ];
+
+  preConfigure = ''
+      echo "${os}
+      ${cpuBits}
+      " | ./configure
+      rm configure
+  '';
+
+  buildPhase = ''
+      mkdir -p $out/bin
+      sed -i \
+          -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \
+          -e "/_DIR=/s|/usr|${dataDir}|g" \
+          -e "s|\$(INSTALL|$out/\$(INSTALL|g" \
+          -e "/echo/s|echo $out/|echo |g" \
+          Makefile
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
+    homepage = https://www.softether.org/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.rick68 ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47bc0bb85b8..05180d0412d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3031,6 +3031,9 @@ let
 
   socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { });
 
+  softether_4_18 = callPackage ../servers/softether/4.18.nix { };
+  softether = softether_4_18;
+
   sourceHighlight = callPackage ../tools/text/source-highlight { };
 
   spaceFM = callPackage ../applications/misc/spacefm { };

From a2b718fc80c58caf525f1a867ed127f1cf7c0e1b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 21 Aug 2015 08:58:36 +0300
Subject: [PATCH 1406/2016] Switch to the git version for now to get Gecko 40
 compatibility

---
 pkgs/development/tools/slimerjs/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index a35816e2511..5fd7be063f5 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -3,11 +3,13 @@ let
   s = # Generated upstream information
   rec {
     baseName="slimerjs";
-    version="0.9.6";
+    version="0.9.6.2015.08.20";
     name="${baseName}-${version}";
     hash="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq";
-    url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip";
-    sha256="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq";
+    #url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip";
+    url = "https://github.com/laurentj/slimerjs.git";
+    rev = "87e0ff1d666897754a914131d8f1744195ee4d7a";
+    sha256="0ifgr8pi40id7vcv8ipc754bys22bhij0kkhd691285x19f52alc";
   };
   buildInputs = [
     unzip zip
@@ -16,12 +18,12 @@ in
 stdenv.mkDerivation {
   inherit (s) name version;
   inherit buildInputs;
-   src = fetchurl {
-     inherit (s) url sha256;
-   };
-  #src = fetchgit {
-  #  inherit (s) url sha256 rev;
+  #src = fetchurl {
+  #  inherit (s) url sha256;
   #};
+  src = fetchgit {
+    inherit (s) url sha256 rev;
+  };
   preConfigure = ''
     test -d src && cd src
     test -f omni.ja || zip omni.ja -r */

From 57f7798b51b9bf775f22428d70b1dca0b01cf032 Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Thu, 20 Aug 2015 23:45:13 -0700
Subject: [PATCH 1407/2016] also generate startAt timers for systemd user units

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

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 1314b727772..05369da4f16 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -713,6 +713,14 @@ in
         })
         (filterAttrs (name: service: service.startAt != "") cfg.services);
 
+    # Generate timer units for all services that have a ‘startAt’ value.
+    systemd.user.timers =
+      mapAttrs (name: service:
+        { wantedBy = [ "timers.target" ];
+          timerConfig.OnCalendar = service.startAt;
+        })
+        (filterAttrs (name: service: service.startAt != "") cfg.user.services);
+
     systemd.sockets.systemd-journal-gatewayd.wantedBy =
       optional config.services.journald.enableHttpGateway "sockets.target";
 

From 8871d1672352ce77a11736fad0fd27b9fbfea386 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 17 Aug 2015 12:40:02 +0200
Subject: [PATCH 1408/2016] ceptre: init at 2015-08-15

A linear logic programming language for modeling generative interactive systems
---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c899b875400..4829d7be174 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4862,6 +4862,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 218948587bca55477c0a2d37ace843482c7344e2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 21 Aug 2015 08:44:39 +0200
Subject: [PATCH 1409/2016] osmo: update from 0.2.12 to 0.2.14

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

diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix
index 81f5773a453..6da3bf6df83 100644
--- a/pkgs/applications/office/osmo/default.nix
+++ b/pkgs/applications/office/osmo/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "osmo-${version}";
-  version = "0.2.12";
+  version = "0.2.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/osmo-pim/${name}.tar.gz";
-    sha256 = "0y3bpsi18v3dxb3vsy0dr7cgf692g4p62l84hj9l2bpr2hbabgck";
+    sha256 = "0vaayrmyiqn010gr11drmhkkg8fkxdmla3gwj9v3zvp5x44kab05";
   };
 
   buildInputs = [ pkgconfig gtk libxml2 gettext libical libnotify libarchive

From 53ea7bcbdafd5af392f9305bad7401c32975809b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 21 Aug 2015 08:45:48 +0200
Subject: [PATCH 1410/2016] pdf2djvu: update from 0.8 to 0.8.1

---
 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 942f40a0cf0..fbafbaad27c 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";
+  version = "0.8.1";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz";
-    sha256 = "0xdxx5c7hvhzfmi37cf9p17smm2y55wc8z1vsncqqvf1sxqpjmbn";
+    sha256 = "1sgqz7y4zn6xg0wicmyy83hbwbhv076vd81kigpcz3rjqk11lsvi";
   };
 
   buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];

From d73829576d775caa2e228fa4f12a487e77082eef Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 21 Aug 2015 08:49:17 +0200
Subject: [PATCH 1411/2016] rrdtool: update from 1.5.3 to 1.5.4

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

diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index 1688c2d329f..6e2ba20875d 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff }:
 
 stdenv.mkDerivation rec {
-  name = "rrdtool-1.5.3";
+  name = "rrdtool-1.5.4";
   src = fetchurl {
     url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz";
-    sha256 = "17qjqq7k50xfahza1gkcfchzss2jjmgr422dzs4kx13lrzsv5rvr";
+    sha256 = "169zbidc5h88w064qmj6x5rzczkrrfrcgwc3f2i2h8f0hzda7viz";
   };
   buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ];
   

From 17c0af24d219f1b0431734d0b086d38200e3da2b Mon Sep 17 00:00:00 2001
From: Jeffrey David Johnson <jefdaj@gmail.com>
Date: Wed, 19 Aug 2015 18:38:10 -0700
Subject: [PATCH 1412/2016] add bitcoin-xt as a separate package

---
 lib/maintainers.nix                       |  1 +
 pkgs/applications/altcoins/bitcoin-xt.nix | 39 +++++++++++++++++++++++
 pkgs/applications/altcoins/default.nix    |  3 ++
 pkgs/top-level/all-packages.nix           |  1 +
 4 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/altcoins/bitcoin-xt.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d42d81399cf..db42435301b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -121,6 +121,7 @@
   jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>";
   jb55 = "William Casarin <bill@casarin.me>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
+  jefdaj = "Jeffrey David Johnson <jefdaj@gmail.com>";
   jfb = "James Felix Black <james@yamtime.com>";
   jgeerds = "Jascha Geerds <jg@ekby.de>";
   jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>";
diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
new file mode 100644
index 00000000000..e6c95729c6e
--- /dev/null
+++ b/pkgs/applications/altcoins/bitcoin-xt.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl
+, withGui }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+  name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version;
+  xt_version = "0.11A";
+  version = xt_version;
+
+  src = fetchurl {
+    url = "https://github.com/bitcoinxt/bitcoinxt/archive/v0.11A.tar.gz";
+    sha256 = "129cbqf6bln6rhdk70c6nfwdjk6afvsaaw4xdyp0pnfand8idz7n";
+  };
+
+  buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
+                  miniupnpc utillinux protobuf curl ]
+                  ++ optionals withGui [ qt4 qrencode ];
+
+  configureFlags = [
+    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-libcurl-headers=${curl}/include"
+  ] ++ optionals withGui [ "--with-gui=qt4" ];
+
+  meta = {
+    description = "Peer-to-peer electronic cash system";
+    longDescription= ''
+       Bitcoin XT is an implementation of a Bitcoin full node, based upon the
+       source code of Bitcoin Core. It is built by taking the latest stable
+       Core release, applying a series of patches, and then doing deterministic
+       builds so anyone can check the downloads correspond to the source code. 
+    '';
+    homepage = "https://bitcoinxt.software/";
+    maintainers = with maintainers; [ jefdaj ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index a49e4dc9f90..762ef804f83 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -5,6 +5,9 @@ rec {
   bitcoin  = callPackage ./bitcoin.nix { withGui = true; };
   bitcoind = callPackage ./bitcoin.nix { withGui = false; };
 
+  bitcoin-xt  = callPackage ./bitcoin-xt.nix { withGui = true; };
+  bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; };
+
   darkcoin  = callPackage ./darkcoin.nix { withGui = true; };
   darkcoind = callPackage ./darkcoin.nix { withGui = false; };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29038081ad4..61036967994 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10764,6 +10764,7 @@ let
     callPackage = newScope { boost = boost157; };
   } );
   bitcoin = altcoins.bitcoin;
+  bitcoin-xt = altcoins.bitcoin-xt;
 
   aumix = callPackage ../applications/audio/aumix {
     gtkGUI = false;

From aba76f23a5b1c6549aa1d424be6a82e4df6ca7d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Aug 2015 12:05:06 +0200
Subject: [PATCH 1413/2016] Revert "add Darwin's flavor of lsof"

This reverts commit 7024b4dc62c8f212150f791bf94ff3202bd7c4e2. It
breaks evaluation (possibly related to earlier reverts):

http://hydra.nixos.org/build/24887643
---
 pkgs/development/tools/misc/lsof/default.nix  |  2 --
 .../darwin/apple-source-releases/default.nix  |  1 -
 .../apple-source-releases/lsof/default.nix    | 27 -------------------
 pkgs/top-level/all-packages.nix               |  4 +--
 4 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/lsof/default.nix

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index c17c2d73e5f..f7feeca5d9d 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
     cp lsof $out/bin
   '';
 
-  isBroken = stdenv.isDarwin;
-
   meta = {
     homepage = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/;
     description = "A tool to list open files";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index e53637ee148..f29a2b5b911 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -78,7 +78,6 @@ let
     Libsystem       = applePackage "Libsystem"         "1197.1.1"    "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {};
     libutil         = applePackage "libutil"           "38"          "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {};
     libunwind       = applePackage "libunwind"         "35.3"        "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {};
-    lsof            = applePackage "lsof"              "53"          "0ylzds2rhq5v8rddh0dgpcndsp9n3slfp30wsbl5fmsch7a5356j" {};
     mDNSResponder   = applePackage "mDNSResponder"     "522.92.1"    "1cp87qda1s7brriv413i71yggm8yqfwv64vknrnqv24fcb8hzbmy" {};
     objc4           = applePackage "objc4"             "551.1"       "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};
     objc4_pure      = applePackage "objc4/pure.nix"    "551.1"       "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};
diff --git a/pkgs/os-specific/darwin/apple-source-releases/lsof/default.nix b/pkgs/os-specific/darwin/apple-source-releases/lsof/default.nix
deleted file mode 100644
index 23506f5c217..00000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/lsof/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, appleDerivation, ncurses }:
-
-appleDerivation {
-  buildInputs = [ ncurses ];
-
-  postUnpack = ''
-    sourceRoot="$sourceRoot/lsof"
-  '';
-
-  prePatch = ''
-    mv Configure configure
-    substituteInPlace configure \
-      --replace '`which make`' "$(type -P make)" \
-      --replace /usr/include "${stdenv.libc}/include" \
-      --replace -lcurses -lncurses
-  '';
-
-  dontAddPrefix = true;
-
-  configureFlags = [ "-n" "darwin" ];
-
-  installPhase = ''
-    mkdir -p $out/bin $out/man/man8
-    cp lsof.8 $out/man/man8/
-    cp lsof $out/bin
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0254e32374f..8b405d0c035 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5635,9 +5635,7 @@ let
 
   libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { };
 
-  lsof = if stdenv.isDarwin
-    then darwin.lsof
-    else callPackage ../development/tools/misc/lsof { };
+  lsof = callPackage ../development/tools/misc/lsof { };
 
   ltrace = callPackage ../development/tools/misc/ltrace { };
 

From b1104d60827330cb77e6eb0e327a3ab13aab5c0d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Aug 2015 12:56:55 +0200
Subject: [PATCH 1414/2016] gdk-pixbuf: Disable tests

The tests take an excessive amount of time (> 1.5 hours) and memory (>
6 GB).

http://hydra.nixos.org/build/24911713
http://hydra.nixos.org/build/24470055#tabs-buildsteps
---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 722da0c89fc..5f5a0496954 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
     + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
     ;
 
-  # Seems to randomly fail sometimes with a bus error. FIXME
-  doCheck = !stdenv.isDarwin;
+  # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
+  doCheck = false;
 
   postInstall = "rm -rf $out/share/gtk-doc";
 

From c757628f0a89786c421a286979609208d24faa35 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 21 Aug 2015 13:20:05 +0200
Subject: [PATCH 1415/2016] mcelog: 122 -> 123

Also flesh out descriptions and restrict to Linux platforms.
---
 pkgs/os-specific/linux/mcelog/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index f2b03e1be92..aa1b197e83f 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 = "122"; in
+let version = "123"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0g3bp6wfgpjh345n988r2bxzdkbac8mls9v7fsylmfxf78y7n92d";
+    sha256 = "0hrpqx0wfwribzm3j132k0869xbh5wa89pzhwcych5w2w0n2i890";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";
@@ -22,9 +22,18 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     inherit version;
-    description = "Log machine checks (memory, IO, and CPU hardware errors)";
+    description = "Log x86 machine checks: memory, IO, and CPU hardware errors";
+    longDescription = ''
+      The mcelog daemon accounts memory and some other errors in various ways
+      on modern x86 Linux systems. The daemon can be queried and/or execute
+      triggers when configurable error thresholds are exceeded. This is used to
+      implement a range of automatic predictive failure analysis algorithms,
+      including bad page offlining and automatic cache error handling. All
+      errors are logged to /var/log/mcelog or syslog or the journal.
+    '';
     homepage = http://mcelog.org/;
     license = licenses.gpl2;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }

From 5dd593dea5a6a7ee6453e7be9f5519c98daee69c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 21 Aug 2015 13:23:59 +0200
Subject: [PATCH 1416/2016] prompt_toolkit: 0.46 -> 0.47

---
 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 e3ca5e5d4b9..45dc9ede883 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9755,10 +9755,10 @@ let
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.46";
+    version = "0.47";
 
     src = pkgs.fetchurl {
-      sha256 = "1yq9nis1b2rgpndi2rqh4divf6j22jjva83r5z8jf7iffywmr8hs";
+      sha256 = "1xkrbz7d2mzd5r5a8aqbnhym57fkpri9x73cql5vb573glzwddla";
       url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
     };
 

From 93037836496871eb7b736ccba7e81d62d0a25bf5 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Thu, 20 Aug 2015 22:23:44 +0100
Subject: [PATCH 1417/2016] haskell-purescript: Disable tests.

Tests need network + /homeless-shelter.
---
 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 fde9bb782d8..cc7ef9cfdf7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -680,6 +680,10 @@ self: super: {
     '';
   });
 
+  # Tests attempt to use NPM to install from the network into
+  # /homeless-shelter. Disabled.
+  purescript = dontCheck super.purescript;
+
   # Broken by GLUT update.
   Monadius = markBroken super.Monadius;
 

From e1fe23a4be4550ccd38e5e13052213bb14e21b18 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Aug 2015 15:28:30 +0200
Subject: [PATCH 1418/2016] libevent: Use fetchurl

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

diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 19878a24e95..284a09bc927 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, python, findutils }:
+{ stdenv, fetchurl, autoreconfHook, python, findutils }:
 
 let version = "2.0.22"; in
 stdenv.mkDerivation {
   name = "libevent-${version}";
 
-  src = fetchFromGitHub {
-    owner = "libevent";
-    repo = "libevent";
-    rev = "release-${version}-stable";
-    sha256 = "1x2437af9j870i7l37dav1i2g9z93lbz406kyimx4nq5qcx5463p";
+  src = fetchurl {
+    url = "mirror://sourceforge/levent/libevent-${version}-stable.tar.gz";
+    sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From ff162a70c652de2d4476f68808cc08b13f36b864 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Fri, 21 Aug 2015 13:23:28 +0200
Subject: [PATCH 1419/2016] chicken: 4.9.0.1 -> 4.10.0

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

diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix
index 3b9d4d39118..82cf23e8be4 100644
--- a/pkgs/development/compilers/chicken/default.nix
+++ b/pkgs/development/compilers/chicken/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }:
 
 let
-  version = "4.9.0.1";
+  version = "4.10.0";
   platform = with stdenv;
     if isDarwin then "macosx"
     else if isCygwin then "cygwin"
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   binaryVersion = 7;
 
   src = fetchurl {
-    url = "http://code.call-cc.org/releases/4.9.0/chicken-${version}.tar.gz";
-    sha256 = "0598mar1qswfd8hva9nqs88zjn02lzkqd8fzdd21dz1nki1prpq4";
+    url = "http://code.call-cc.org/releases/4.10.0/chicken-${version}.tar.gz";
+    sha256 = "16w96jrhb6qf62fgznk53f55yhfv81damghdjn31k5hirnmza1qf";
   };
 
   setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;

From 93462307438b910e612d8a318186a0878ecf1bff Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Fri, 21 Aug 2015 13:23:44 +0200
Subject: [PATCH 1420/2016] weechat: 1.2 -> 1.3

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

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 060be8ab1eb..bd7d37ea342 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -4,12 +4,12 @@
 , extraBuildInputs ? [] }:
 
 stdenv.mkDerivation rec {
-  version = "1.2";
+  version = "1.3";
   name = "weechat-${version}";
 
   src = fetchurl {
     url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
-    sha256 = "0kb8mykhzm7zcxsl6l6cia2n4nc9akiysg0v6d8xb51p3x002ibw";
+    sha256 = "0j2ic1c69ksf78wi0cmc4yi5348x6c92g6annsx928sayxqxfgbh";
   };
 
   buildInputs = 

From 726a3804570583dd8deaa19e5264d62b88314e48 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Fri, 21 Aug 2015 15:42:49 +0200
Subject: [PATCH 1421/2016] cura(engine): 15.02.1 -> 15.04.

---
 pkgs/applications/misc/cura/default.nix       | 4 ++--
 pkgs/applications/misc/curaengine/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index a13004ecd02..a711cc1db87 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -1,14 +1,14 @@
 { stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }:
 let
   py = python27Packages;
-  version = "15.02.1";
+  version = "15.04";
 in
 stdenv.mkDerivation rec {
   name = "cura-${version}";
 
   src = fetchurl {
     url = "https://github.com/daid/Cura/archive/${version}.tar.gz";
-    sha256 = "18pb31vd9786q522i1i780wpzr6vih9gg9d8k508gh2d5yr4aal6";
+    sha256 = "0xbjvzhp8wzq9lnpmcg1fjf7j5h39bj5463sd5c8jzdjl96izizl";
   };
 
   desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index bbd94406635..6afd11a555c 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 let
-  version = "15.02.1";
+  version = "15.04";
 in
 stdenv.mkDerivation {
   name = "curaengine-${version}";
 
   src = fetchurl {
     url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz";
-    sha256 = "18fxh910b66s45757zqh8bm5kdxjgvxispjqknqkwl1nrllzmx53";
+    sha256 = "0rgrsyi7951fsv3lzprlzrg55jf6pbdjfql85dylwmg9nc4y8xym";
   };
 
   installPhase = ''

From 2fc59dc2dbc7c9bb1b7513d6347974767a7b30d3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Aug 2015 16:48:37 +0200
Subject: [PATCH 1422/2016] Revert "ceptre: init at 2015-08-15"

This reverts commit 8871d1672352ce77a11736fad0fd27b9fbfea386. Missing
file breaks evaluation.
---
 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 4829d7be174..c899b875400 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4862,8 +4862,6 @@ 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 6a54ca7990498033301a3b8bd4600fadfacef7ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Aug 2015 17:03:23 +0200
Subject: [PATCH 1423/2016] dhcpcd: Update to 6.9.2

Upstream recommends this as an important upgrade to 6.9.1 because it
fixes a race that could cause an empty resolv.conf to be created.
---
 pkgs/tools/networking/dhcpcd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index d4ec7f7f0ad..d9310e2372e 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, udev }:
 
 stdenv.mkDerivation rec {
-  name = "dhcpcd-6.9.1";
+  name = "dhcpcd-6.9.2";
 
   src = fetchurl {
     url = "mirror://roy/dhcpcd/${name}.tar.xz";
-    sha256 = "0vq6gjgn2sjq2rwvd23gvf55k2v9l6970z8fmii0p2g23w77afy0";
+    sha256 = "0w4aqpn6wczvrffc51lq87acvqwqdskk7948z3sz9laslci29y79";
   };
 
   buildInputs = [ pkgconfig udev ];

From 3ebe6fa802f19b05eea7923287d1cd7ee6c2bcc9 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Fri, 21 Aug 2015 20:29:09 +0300
Subject: [PATCH 1424/2016] open-vm-tools: temp fix for
 https://github.com/NixOS/nixpkgs/issues/9262

---
 .../virtualization/open-vm-tools/default.nix  |  2 +
 .../open-vm-tools/recognize_nixos.patch       | 46 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch

diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index 4f32ec55a0e..cfe4ad3a8e1 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -26,6 +26,8 @@ in stdenv.mkDerivation {
      sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am
   '';
 
+  patches = [ ./recognize_nixos.patch ];
+
   preConfigure = "autoreconf";
   configureFlags = "--without-kernel-modules --without-xmlsecurity";
 
diff --git a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
new file mode 100644
index 00000000000..b69731179c1
--- /dev/null
+++ b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
@@ -0,0 +1,46 @@
+From d1b753212ee5151db941de0e2b826dcf9722f2f3 Mon Sep 17 00:00:00 2001
+From: Arseniy Seroka <ars.seroka@gmail.com>
+Date: Fri, 21 Aug 2015 20:20:16 +0300
+Subject: [PATCH] [PATCH]: recognize NixOS Linux
+
+---
+ open-vm-tools/lib/include/guest_os.h   | 1 +
+ open-vm-tools/lib/misc/hostinfoPosix.c | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
+index 4fc9ea7..f5104fd 100644
+--- a/open-vm-tools/lib/include/guest_os.h
++++ b/open-vm-tools/lib/include/guest_os.h
+@@ -215,6 +215,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
+ #define STR_OS_MANDRAKE_FULL      "Mandrake Linux"
+ #define STR_OS_MANDRIVA           "mandriva"
+ #define STR_OS_MKLINUX            "MkLinux"
++#define STR_OS_NIXOS              "NixOS"
+ #define STR_OS_NOVELL             "nld9"
+ #define STR_OS_NOVELL_FULL        "Novell Linux Desktop 9"
+ #define STR_OS_ORACLE             "oraclelinux"
+diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
+index 6c13fe3..5b82983 100644
+--- a/open-vm-tools/lib/misc/hostinfoPosix.c
++++ b/open-vm-tools/lib/misc/hostinfoPosix.c
+@@ -184,6 +184,7 @@ static const DistroInfo distroArray[] = {
+    {"Mandrake",           "/etc/mandrake-release"},
+    {"Mandriva",           "/etc/mandriva-release"},
+    {"Mandrake",           "/etc/mandrakelinux-release"},
++   {"NixOS",              "/etc/os-release"},
+    {"TurboLinux",         "/etc/turbolinux-release"},
+    {"Fedora Core",        "/etc/fedora-release"},
+    {"Gentoo",             "/etc/gentoo-release"},
+@@ -613,6 +614,8 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
+       Str_Strcpy(distroShort, STR_OS_MANDRIVA, distroShortSize);
+    } else if (strstr(distroLower, "mklinux")) {
+       Str_Strcpy(distroShort, STR_OS_MKLINUX, distroShortSize);
++   } else if (strstr(distroLower, "nixos")) {
++      Str_Strcpy(distroShort, STR_OS_NIXOS, distroShortSize);
+    } else if (strstr(distroLower, "pld")) {
+       Str_Strcpy(distroShort, STR_OS_PLD, distroShortSize);
+    } else if (strstr(distroLower, "slackware")) {
+-- 
+2.5.0
+

From 8712a2d8d11ccdafdde22bab8bccab03bfa06aec Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 21 Aug 2015 11:05:11 -0700
Subject: [PATCH 1425/2016] chromium: Updates

---
 .../browsers/chromium/source/sources.nix      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 8fd959e8c60..17df6492efa 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,21 +1,21 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "46.0.2478.0";
-    sha256 = "15h6gq9vzycamdx01cyz3dv8raprdrd4k97c8pigxbli3n18b41k";
-    sha256bin32 = "0q10zacsl82nadfvp59ppidai74pc53000qsh4ixdji3xqcbisk4";
-    sha256bin64 = "1v57w8n7dxw1yb20710f0mzkvil7apyikvfp0174xb2rbr1ipwng";
+    version = "46.0.2486.0";
+    sha256 = "19p99lnmpizmhdlr73z43jjaip95kv5y6nj5yqni9dfbjnlb7cah";
+    sha256bin32 = "1sxfszv50yw6vjd9mj9xc2crf51slsllhwnhlfp2qhg7l3f1l9a9";
+    sha256bin64 = "0262jlpz4869w6nqc3aadygl5byldg5h8ivwwcz8v1dzjwm7nlhy";
   };
   beta = {
-    version = "45.0.2454.37";
-    sha256 = "1vbkyxvr8k3hmdysh063rl5d2bmag7nq3wxysivsdmi23b1dz6l6";
-    sha256bin32 = "0b4nxijijwk0n1as9l4wf0gxmwz4qs6ag0gi11cag3yp5z5p9cgi";
-    sha256bin64 = "0l0hs2vh1bhh6bqq7453fc7hpi0lamdlzqpdhgcz64k94bi0d748";
+    version = "45.0.2454.46";
+    sha256 = "14q5bsiw7ns4gwgpqlw8mcl500n13wq8v7p34v0gj2fazm948j37";
+    sha256bin32 = "0cqw11sg4w665b50nybcg189wj78lr9h9amh5nqzi1qdqsk9vn8w";
+    sha256bin64 = "1lm8ykpcbzcbmiyj2z35l6ypx1ahi7asqkzkdavnrqawjafskygc";
   };
   stable = {
-    version = "44.0.2403.155";
-    sha256 = "0g4z46vbqwnsbmhlbyqm3lm5dz6sxjz0m51cnxhxs850231738pb";
-    sha256bin32 = "11f8224b8p14py5abi78m74l5hsrhdhipcf2dw7bgqddhykzr4h6";
-    sha256bin64 = "1mhbga7s43qg13rv6ss0xsn8hkf9fdmgd293ymj564ih39l9bnbm";
+    version = "44.0.2403.157";
+    sha256 = "1d7k74sa3qbwwcgi6zvx6z7mqkjvyh8x8h78d56nhhh80gyxb971";
+    sha256bin32 = "0nqfb46299jhzsrlqfkjrj4g639hd4xdcj683pm0iszwq5mf9gbq";
+    sha256bin64 = "02g1q1x1pwrbzd8v350bzwkqfgmsmq955bvif8sr0bi1sy9b16z3";
   };
 }

From 46203a790da3d4953f7830c281441a84aa4916ee Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 21 Aug 2015 20:53:53 +0200
Subject: [PATCH 1426/2016] kubernetes service: fix option conversion

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

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index 0abef29dd19..99915438f92 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -412,7 +412,7 @@ in {
             --service-cluster-ip-range=${cfg.apiserver.portalNet} \
             ${optionalString (cfg.apiserver.runtimeConfig!="")
               "--runtime-config=${cfg.apiserver.runtimeConfig}"} \
-            --admission_control=${cfg.apiserver.admissionControl} \
+            --admission_control=${concatStringsSep "," cfg.apiserver.admissionControl} \
             --logtostderr=true \
             ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
             ${cfg.apiserver.extraOpts}

From 123946531456c5e562da59add0abc1ccb3460240 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 21 Aug 2015 02:26:10 -0500
Subject: [PATCH 1427/2016] nixpkgs: lean 20150328 -> 20150821

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

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 2d93fdd6196..5a4e2cbbc05 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,14 @@
 , gperftools, ninja }:
 
 stdenv.mkDerivation rec {
-  name = "lean-20150328";
+  name = "lean-${version}";
+  version = "20150821";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
-    rev    = "1b15036dba469020d37f7d6b77b88974d8a36cb1";
-    sha256 = "0w38g83gp7d3ybfiz9jpl2jz3ljad70bxmar0dnnv45wx42clg96";
+    rev    = "453bd2341dac51e50d9bff07d5ff6c9c3fb3ba0b";
+    sha256 = "1hmga5my123sra873iyqc7drj4skny4hnhsasaxjkmmdhmj1zpka";
   };
 
   buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ];

From 65dd3495747985d922437b4b841fcd4124d89609 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 21 Aug 2015 12:00:35 -0700
Subject: [PATCH 1428/2016] update mysteriously varying git hashes

---
 pkgs/development/interpreters/ruby/bundler-head.nix  | 2 +-
 pkgs/development/tools/haskell/cabal2nix/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
index c8e981a4735..0aa6e9f90ce 100644
--- a/pkgs/development/interpreters/ruby/bundler-head.nix
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -5,7 +5,7 @@ buildRubyGem {
   src = fetchgit {
     url = "https://github.com/bundler/bundler.git";
     rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
-    sha256 = "1mvyy6ic41m4f56n1026pz9igbryq11mkj3b4hyr0v1siv4r95c4";
+    sha256 = "1p7kzhmicfljy9n7nq3qh6lvrsckiq76ddypf6s55gfh1l98z4k9";
     leaveDotGit = true;
   };
   dontPatchShebangs = true;
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index cf0cfd64e8f..88e8c55b061 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
     rev = "9f589961fba9fa6a92900c37cf1ab16c597b0c69";
-    sha256 = "1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d";
+    sha256 = "0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv";
     deepClone = true;
   };
   isLibrary = false;

From ba57bbf8dca11ab942567dc53edec2b2ec05cbd9 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 21 Aug 2015 13:25:49 -0700
Subject: [PATCH 1429/2016] go-1.4: fix a few more possibly impure tests

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

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 923112d12dc..413320d2d45 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -65,6 +65,12 @@ stdenv.mkDerivation rec {
     sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
     sed -i '/TestRead0/areturn' src/os/os_test.go
     sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
+    sed -i '/TestDialDualStackLocalhost/areturn' src/net/dial_test.go
+
+    # remove IP resolving tests, on darwin they can find fe80::1%lo while expecting ::1
+    sed -i '/TestResolveIPAddr/areturn' src/net/ipraw_test.go
+    sed -i '/TestResolveTCPAddr/areturn' src/net/tcp_test.go
+    sed -i '/TestResolveUDPAddr/areturn' src/net/udp_test.go
 
     touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
   '';

From cffa6cde87e930fe32db2a397d0fff1f3a2ad716 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 21 Aug 2015 14:02:31 -0700
Subject: [PATCH 1430/2016] vim: fix tarball naming scheme

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

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 54b3127898e..4e4c262fdb5 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
-    rev = "v${stdenv.lib.replaceChars ["."] ["-"] version}";
-    sha256 = "147lkcjdd0jbc7y2hflfzwnyjhdgi1971pmkizihybxmmj1a4g8y";
+    rev = "v${version}";
+    sha256 = "04hp2gqbbj9h872bgj1g9xcaj5qlg9q45v6by2ch9n105dng9aj3";
   };
 
   # this makes maintainers very sad

From 9941e181e9eb4a38c73bb1c5fb40d6859477df6e Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 21 Aug 2015 14:02:39 -0700
Subject: [PATCH 1431/2016] weechat: help weechat find libiconv on darwin

---
 pkgs/applications/networking/irc/weechat/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 060be8ab1eb..b9bc21c88e0 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls
 , zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile
-, pythonPackages, cmake, makeWrapper, libobjc
+, pythonPackages, cmake, makeWrapper, libobjc, libiconv
 , extraBuildInputs ? [] }:
 
 stdenv.mkDerivation rec {
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "0kb8mykhzm7zcxsl6l6cia2n4nc9akiysg0v6d8xb51p3x002ibw";
   };
 
+  cmakeFlags = stdenv.lib.optional stdenv.isDarwin
+    "-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib";
+
   buildInputs = 
     [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
       libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper

From 92a2ee7debd941c2147c5fa3fc465eb7492459d6 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 21 Aug 2015 14:05:19 -0700
Subject: [PATCH 1432/2016] go-1.4: set to default go compiler on darwin

---
 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 8b405d0c035..fb809953063 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4054,7 +4054,9 @@ let
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  go = go_1_5;
+  go = if stdenv.isDarwin
+    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 { };
 

From e23ee274b62937ff926807aca9371bc12b574dbe Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <daniel.fullmer@yale.edu>
Date: Fri, 21 Aug 2015 23:06:50 +0000
Subject: [PATCH 1433/2016] zerotierone: 1.0.2 -> 1.0.4 and fix for hardcoded
 path

---
 pkgs/tools/networking/zerotierone/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index b08edaa0fc6..c6a456e202a 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, openssl, lzo, zlib, gcc }:
+{ stdenv, fetchurl, openssl, lzo, zlib, gcc, iproute }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.0.2";
+  version = "1.0.4";
   name = "zerotierone";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "002ay4f6l9h79j1708klwjvinsv6asv24a0hql85jq27587sv6mq";
+    sha256 = "1klnsjajlas71flbf6w2q3iqhhqrmzqpd2g4qw9my66l7kcsbxfd";
   };
 
   preConfigure = ''
@@ -16,12 +16,16 @@ stdenv.mkDerivation rec {
           --replace 'CC=$(shell which clang gcc cc 2>/dev/null | head -n 1)' "CC=${gcc}/bin/gcc";
       substituteInPlace ./make-linux.mk \
           --replace 'CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)' "CC=${gcc}/bin/g++";
+      substituteInPlace ./osdep/LinuxEthernetTap.cpp \
+          --replace '/sbin/ip' "${iproute}/bin/ip"
   '';
 
-  buildInputs = [ openssl lzo zlib gcc ];
+  buildInputs = [ openssl lzo zlib gcc iproute ];
 
   installPhase = ''
     installBin zerotier-one
+    ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool
+    ln -s $out/bin/zerotier-one $out/bin/zerotier-cli
   '';
 
   meta = {

From 54c7053bffe96d67274efafbc3518a2c40b2dc06 Mon Sep 17 00:00:00 2001
From: Tanner Doshier <doshitan@gmail.com>
Date: Fri, 21 Aug 2015 09:34:46 -0500
Subject: [PATCH 1434/2016] tarsnap: 1.0.35 -> 1.0.36.1 and use upstream bash
 completion scripts

---
 pkgs/tools/backup/tarsnap/default.nix | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index e2857eed7d8..7537451595f 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -1,11 +1,6 @@
 { stdenv, fetchurl, openssl, zlib, e2fsprogs }:
 
 let
-  bashCompletion = fetchurl {
-    url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash";
-    sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405";
-  };
-
   zshCompletion = fetchurl {
     url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh";
     sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair";
@@ -13,18 +8,20 @@ let
 in
 stdenv.mkDerivation rec {
   name = "tarsnap-${version}";
-  version = "1.0.35";
+  version = "1.0.36.1";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz";
-    sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc";
+    url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz";
+    sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452";
   };
 
+  preConfigure = ''
+    configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d"
+  '';
+
   postInstall = ''
     # Install some handy-dandy shell completions
-    mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions
-    cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash
-    cp ${zshCompletion}  $out/share/zsh/site-functions/_tarsnap
+    install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap
   '';
 
   buildInputs = [ openssl zlib e2fsprogs ];

From 7f1efceff855f0260cbe584f1017959f1581dda7 Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Fri, 21 Aug 2015 19:45:40 +0300
Subject: [PATCH 1435/2016] qtox: add wrapper for set runtime qt5.svg plugin

---
 .../networking/instant-messengers/qtox/default.nix    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index cba5bdeec7e..647e0da3719 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, pkgconfig, libtoxcore-dev, qt5, openal, opencv,
   libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo,
-  pango, atk, qrencode, ffmpeg, filter-audio }:
+  pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "qtox-dev-20150624";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     [
       libtoxcore-dev openal opencv libsodium filter-audio
       qt5.base qt5.tools libXScrnSaver glib gtk2 cairo
-      pango atk qrencode ffmpeg qt5.translations
+      pango atk qrencode ffmpeg qt5.translations makeWrapper
     ];
 
   nativeBuildInputs = [ pkgconfig ];
@@ -37,13 +37,16 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     cp qtox $out/bin
+    wrapProgram $out/bin/qtox \
+      --prefix QT_PLUGIN_PATH : ${qt5.svg}/lib/qt5/plugins
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "QT Tox client";
     license = licenses.gpl3;
     maintainers = with maintainers; [ viric jgeerds ];
     platforms = platforms.all;
   };
-}
-
+}
\ No newline at end of file

From c9ca9db21367bda2e114e82931985f941fcc8f19 Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Fri, 21 Aug 2015 19:51:12 +0300
Subject: [PATCH 1436/2016] qtox: 20150624 -> 20150821

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

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 647e0da3719..5c8a03eb8ef 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -3,12 +3,12 @@
   pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "qtox-dev-20150624";
+  name = "qtox-dev-20150821";
 
   src = fetchgit {
       url = "https://github.com/tux3/qTox.git";
-      rev = "9f386135a2cf428d2802b158c70be4beee5abf86";
-      sha256 = "1m2y50q5yim1q75k48cy5daq5qm77cvb3kcla7lpqv54xnfdwxk8";
+      rev = "2f6b5e052f2a625d506e83f880c5d68b49118f95";
+      md5 = "b2f9cf283136b6e558876ca2e6d128a3";
   };
 
   buildInputs =
@@ -49,4 +49,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ viric jgeerds ];
     platforms = platforms.all;
   };
-}
\ No newline at end of file
+}

From 75250d5addedfd82c1573a34b0b2349d268e64c2 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 20 Aug 2015 13:21:00 +0200
Subject: [PATCH 1437/2016] vim_configurable: fix revision name and update
 (close #9365)

---
 pkgs/applications/editors/vim/configurable.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index ee3edaaf61b..cd7db6bb82e 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -31,9 +31,10 @@ let inherit (args.composableDerivation) composableDerivation edf;
   '';
 in
 composableDerivation {
-} (fix: {
+} (fix: rec {
 
-    name = "vim_configurable-7.4.516";
+    name = "vim_configurable-${version}";
+    version = "7.4.826";
 
     enableParallelBuilding = true; # test this
 
@@ -43,8 +44,8 @@ composableDerivation {
         # latest release
       args.fetchhg {
             url = "http://vim.googlecode.com/hg/";
-            rev = "v7-4-516";
-            sha256 = "0a3b5qaywfn7jjr7fjpl8y8jx4wjj2630wxfjnmn3hi1l7iiz4z8";
+            rev = "v${version}";
+            sha256 = "01m67lvnkz0ad28ifj964zcg63y5hixplbnzas5xarj8vl3pc5a0";
       };
 
       "vim-nox" =

From afe6f0531068c43ac40555755a625aec16a1a7bb Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Sat, 22 Aug 2015 11:04:09 +0300
Subject: [PATCH 1438/2016] cabal2nix: fixed sha256 hash
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I was getting below error:
output path ‘/nix/store/i73iz0id6ap6qg1p6jaqadl053h2cgfz-cabal2nix-9f58996’ should have r:sha256 hash ‘1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d’, instead has ‘0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv’
---
 pkgs/development/tools/haskell/cabal2nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index cf0cfd64e8f..88e8c55b061 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
     rev = "9f589961fba9fa6a92900c37cf1ab16c597b0c69";
-    sha256 = "1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d";
+    sha256 = "0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv";
     deepClone = true;
   };
   isLibrary = false;

From 21c9f40b4d82c873246dbde087632206e358df5e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 22 Aug 2015 11:36:41 +0300
Subject: [PATCH 1439/2016] yed: fix checksum

---
 pkgs/applications/graphics/yed/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index e22c7804914..c4ee645fda2 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.yworks.com/products/yed/demo/${name}.zip";
-    sha256 = "1i2fncp7q0xin42sf55zc79jzrkzbp25yw8rcjkgsy6hgnhl73nh";
+    sha256 = "0i39n8h97v688r0nydcm0wj1ins2v83xjgykr7czpnmp600cq9cy";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];

From 77c49d933380126bdc25948807a94ac5b50be577 Mon Sep 17 00:00:00 2001
From: Boris Sukholitko <boriss@gmail.com>
Date: Sat, 22 Aug 2015 13:01:09 +0300
Subject: [PATCH 1440/2016] containers: add interfaces config option.

It uses systemd-nspawn's --network-interface to move
existing interfaces into the container.
---
 nixos/modules/virtualisation/containers.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index da39dda8535..d819d99e09c 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -120,6 +120,15 @@ in
               '';
             };
 
+            interfaces = mkOption {
+              type = types.listOf types.string;
+              default = null;
+              example = [ "eth1" "eth2" ];
+              description = ''
+                The list of interfaces to be moved into the container.
+              '';
+            };
+
             autoStart = mkOption {
               type = types.bool;
               default = false;
@@ -218,6 +227,10 @@ in
               extraFlags+=" --network-veth"
             fi
 
+            for iface in $INTERFACES; do
+              extraFlags+=" --network-interface=$iface"
+            done
+
             for iface in $MACVLANS; do
               extraFlags+=" --network-macvlan=$iface"
             done
@@ -331,6 +344,9 @@ in
                 LOCAL_ADDRESS=${cfg.localAddress}
               ''}
             ''}
+           ${optionalString (cfg.interfaces != null) ''
+             INTERFACES="${toString cfg.interfaces}"
+           ''}
            ${optionalString cfg.autoStart ''
              AUTO_START=1
            ''}

From 5986ec09237a04feed56b11df9dbd7a80010fed6 Mon Sep 17 00:00:00 2001
From: "Desmond O. Chang" <dochang@gmail.com>
Date: Sat, 22 Aug 2015 18:22:31 +0800
Subject: [PATCH 1441/2016] android-udev-rules: 20150301 -> 20150821

---
 pkgs/os-specific/linux/android-udev-rules/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index 61e4291ecc5..3f763e917e3 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "android-udev-rules-20150301";
+  name = "android-udev-rules-20150821";
 
   src = fetchgit {
     url = "https://github.com/M0Rf30/android-udev-rules";
-    rev = "2cc51a456ccfbca338c4e6b76211645aaac631e9";
-    sha256 = "dbf1614cebb466d1adbcc5f17cefc0c37f148f9e3b46443b3e82f6cd19a1514f";
+    rev = "07ccded2a89c2bb6da984e596c015c5e9546e497";
+    sha256 = "953fc10bd0de46afef999dc1c1b20801b3d6e289af48d18fa96b1cac3ac54518";
   };
 
   installPhase = ''

From c6c2e253a6f4011b0cceb11852a513012300da9d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 22 Aug 2015 12:25:18 +0300
Subject: [PATCH 1442/2016] yed: 3.14.2 -> 3.14.3, mark as not redistributable

Their license explicitly prohibits distribution and it's unclear whether they allow to download their binary automatically. I've asked to clarify their terms; this may be temporary.
---
 pkgs/applications/graphics/yed/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index c4ee645fda2..0cd853a2cbe 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -1,11 +1,16 @@
-{ stdenv, fetchurl, makeWrapper, unzip, jre }:
+{ stdenv, fetchurl, requireFile, makeWrapper, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  name = "yEd-3.14.2";
+  name = "yEd-3.14.3";
 
-  src = fetchurl {
-    url = "http://www.yworks.com/products/yed/demo/${name}.zip";
-    sha256 = "0i39n8h97v688r0nydcm0wj1ins2v83xjgykr7czpnmp600cq9cy";
+  #src = fetchurl {
+  #  url = "http://www.yworks.com/products/yed/demo/${name}.zip";
+  #  sha256 = "0xgazknbz82sgk65hxmvbycl1vd25z80a7jgwjgw7syicrgmplcl";
+  #};
+  src = requireFile {
+    name = "${name}.zip";
+    url = "https://www.yworks.com/en/products_download.php?file=${name}.zip";
+    sha256 = "0xgazknbz82sgk65hxmvbycl1vd25z80a7jgwjgw7syicrgmplcl";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];
@@ -20,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    license = licenses.unfreeRedistributable;
+    license = licenses.unfree;
     homepage = http://www.yworks.com/en/products/yfiles/yed/;
     description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams";
     platforms = jre.meta.platforms;

From c250748a54493d2b75ba88bf3b880f0167f8b5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 22 Aug 2015 14:37:44 +0200
Subject: [PATCH 1443/2016] mesa: maintenance update 10.6.4 -> 10.6.5

Currently we have lots of failures on the branch,
most of them look unreproducible, and Hydra is idling.
---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 66b984ee9f3..2af843346c6 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -22,7 +22,7 @@ else
 */
 
 let
-  version = "10.6.4";
+  version = "10.6.5";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "8f5ac103f0f503de2f7a985b0df349bd4ecdfe7f51c714be146fa5a9a3c07b77";
+    sha256 = "fb6fac3c85bcfa9d06b8dd439169f23f0c0924a88e44362e738b99b1feff762f";
   };
 
   prePatch = "patchShebangs .";

From 648973d6419992c28322954ad0205cb05ef87997 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 21 Aug 2015 16:18:09 -0400
Subject: [PATCH 1444/2016] nixos: rename service 'ubuntu-fan' as 'fan'

---
 nixos/modules/module-list.nix                      |  2 +-
 .../networking/{ubuntu-fan.nix => fan.nix}         | 14 +++++++-------
 pkgs/os-specific/linux/fanctl/default.nix          |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename nixos/modules/services/networking/{ubuntu-fan.nix => fan.nix} (71%)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 60255914d5d..ebfe5afe52f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -279,6 +279,7 @@
   ./services/networking/dnsmasq.nix
   ./services/networking/docker-registry-server.nix
   ./services/networking/ejabberd.nix
+  ./services/networking/fan.nix
   ./services/networking/firefox/sync-server.nix
   ./services/networking/firewall.nix
   ./services/networking/flashpolicyd.nix
@@ -344,7 +345,6 @@
   ./services/networking/tlsdated.nix
   ./services/networking/tox-bootstrapd.nix
   ./services/networking/tvheadend.nix
-  ./services/networking/ubuntu-fan.nix
   ./services/networking/unbound.nix
   ./services/networking/unifi.nix
   ./services/networking/vsftpd.nix
diff --git a/nixos/modules/services/networking/ubuntu-fan.nix b/nixos/modules/services/networking/fan.nix
similarity index 71%
rename from nixos/modules/services/networking/ubuntu-fan.nix
rename to nixos/modules/services/networking/fan.nix
index 2759a671b81..3170567e5b4 100644
--- a/nixos/modules/services/networking/ubuntu-fan.nix
+++ b/nixos/modules/services/networking/fan.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
 
-  cfg = config.networking.ubuntu-fan;
+  cfg = config.networking.fan;
   modprobe = "${config.system.sbin.modprobe}/sbin/modprobe";
 
 in
@@ -15,9 +15,9 @@ in
 
   options = {
 
-    networking.ubuntu-fan = {
+    networking.fan = {
 
-      enable = mkEnableOption "Ubuntu FAN Networking";
+      enable = mkEnableOption "FAN Networking";
 
     };
 
@@ -30,8 +30,8 @@ in
 
     environment.systemPackages = [ pkgs.fanctl ];
 
-    systemd.services.ubuntu-fan = {
-      description = "Ubuntu FAN Networking";
+    systemd.services.fan = {
+      description = "FAN Networking";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-online.target" ];
       before = [ "docker.service" ];
@@ -40,12 +40,12 @@ in
         if [ ! -f /proc/sys/net/fan/version ]; then
           ${modprobe} ipip
           if [ ! -f /proc/sys/net/fan/version ]; then
-            echo "The Ubuntu Fan Networking patches have not been applied to this kernel!" 1>&2
+            echo "The Fan Networking patches have not been applied to this kernel!" 1>&2
             exit 1
           fi
         fi
 
-        mkdir -p /var/lib/ubuntu-fan
+        mkdir -p /var/lib/fan-networking
       '';
       serviceConfig = {
         Type = "oneshot";
diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix
index f0b863e0148..1d6e5e744cd 100644
--- a/pkgs/os-specific/linux/fanctl/default.nix
+++ b/pkgs/os-specific/linux/fanctl/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   # if that files does not exist, dnsmasq subsequently fails,
   # so we'll use /dev/null.
   #
-  # Also, make sure /var/lib/ubuntu-fan exists before starting dnsmasq.
+  # Also, make sure /var/lib/fan-networking exists before starting dnsmasq.
   buildPhase = ''
     substituteInPlace fanctl \
       --replace '--conf-file= ' \
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
                 '/var/lib/ubuntu-fan'
 
     sed -i '/dnsmasq -u/i \
-    mkdir -p /var/lib/ubuntu-fan' fanctl
+    mkdir -p /var/lib/fan-networking' fanctl
   '';
 
   installPhase = ''

From 7408ede358ba79c011db35e03abce0759e643ddf Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sat, 22 Aug 2015 14:08:29 -0400
Subject: [PATCH 1445/2016] fanctl: fix state directory

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

diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix
index 1d6e5e744cd..61e100f4c9b 100644
--- a/pkgs/os-specific/linux/fanctl/default.nix
+++ b/pkgs/os-specific/linux/fanctl/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, fetchbzr, makeWrapper, bridge-utils, iproute, dnsmasq, iptables, kmod, utillinux }:
 
-stdenv.mkDerivation rec {
+let stateDir = "/var/lib/fan-networking";
+in stdenv.mkDerivation rec {
   name = "fanctl-${version}";
 
   version = "0.3.0";
@@ -17,16 +18,16 @@ stdenv.mkDerivation rec {
   # if that files does not exist, dnsmasq subsequently fails,
   # so we'll use /dev/null.
   #
-  # Also, make sure /var/lib/fan-networking exists before starting dnsmasq.
+  # Also, make sure the state directory before starting dnsmasq.
   buildPhase = ''
     substituteInPlace fanctl \
       --replace '--conf-file= ' \
                 '--conf-file=/dev/null ' \
       --replace '/var/lib/misc' \
-                '/var/lib/ubuntu-fan'
+                '${stateDir}'
 
     sed -i '/dnsmasq -u/i \
-    mkdir -p /var/lib/fan-networking' fanctl
+    mkdir -p ${stateDir}' fanctl
   '';
 
   installPhase = ''

From a4b9b5ce7d610e178ad20bad5f73dbde1274c31b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 22 Aug 2015 20:21:38 +0300
Subject: [PATCH 1446/2016] deluge: fix translations and desktop file

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 45dc9ede883..7c355900025 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5075,8 +5075,9 @@ let
       pyGtkGlade pkgs.libtorrentRasterbar twisted Mako chardet pyxdg self.pyopenssl modules.curses
     ];
 
+    nativeBuildInputs = [ pkgs.intltool ];
+
     postInstall = ''
-       cp -R deluge/data/share $out/share
        cp -R deluge/data/pixmaps $out/share/
        cp -R deluge/data/icons $out/share/
     '';

From 69114f74aae2d2c3496d2d8e6e942cf2189b0ab5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 23 Aug 2015 00:02:29 +0200
Subject: [PATCH 1447/2016] packagekit: use http:// instead of https://

Proxy weirdness?
---
 pkgs/tools/package-management/packagekit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 15b6fd5fe9c..7075b03bdfa 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     sha256 = "0klwr0y3a72xpz6bwv4afbk3vvx5r1av5idhz3mx4p9ssnscb1mi";
-    url = "https://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz";
+    url = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz";
   };
 
   buildInputs = [ glib polkit python ];

From 0cf852b78b65e61887278cd78d5c4c58cdd9e51a Mon Sep 17 00:00:00 2001
From: Rehno Lindeque <errantkid@gmail.com>
Date: Thu, 13 Aug 2015 03:11:50 +0000
Subject: [PATCH 1448/2016] mycli: init at 1.3.0

mycli is a clone of the nearly identical pgcli package already included in nixpkgs.
---
 pkgs/top-level/python-packages.nix | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7c355900025..b19fdd4417e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9439,6 +9439,33 @@ let
     };
   };
 
+  mycli = buildPythonPackage rec {
+    name = "mycli-${version}";
+    version = "1.3.0";
+
+    src = pkgs.fetchFromGitHub {
+      sha256 = "109jz84m29v4fjhk2ngsfc1b6zw4w6dbjlr2izvib63ylcz7b5nh";
+      rev = "v${version}";
+      repo = "mycli";
+      owner = "dbcli";
+    };
+
+    propagatedBuildInputs = with self; [
+      pymysql configobj sqlparse prompt_toolkit pygments click
+    ];
+
+    meta = {
+      inherit version;
+      description = "Command-line interface for MySQL";
+      longDescription = ''
+        Rich command-line interface for MySQL with auto-completion and
+        syntax highlighting.
+      '';
+      homepage = http://mycli.net;
+      license = licenses.bsd3;
+    };
+  };
+
   pip = buildPythonPackage rec {
     version = "1.5.6";
     name = "pip-${version}";

From a3e688030e82417251f91921e40a1cd3d1cd47a7 Mon Sep 17 00:00:00 2001
From: Rehno Lindeque <errantkid@gmail.com>
Date: Sun, 23 Aug 2015 06:23:40 +0000
Subject: [PATCH 1449/2016] fix: mycli requires prompt_toolkit to be pegged at
 0.45

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b19fdd4417e..3d89c0a2404 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9451,7 +9451,7 @@ let
     };
 
     propagatedBuildInputs = with self; [
-      pymysql configobj sqlparse prompt_toolkit pygments click
+      pymysql configobj sqlparse prompt_toolkit0_45 pygments click
     ];
 
     meta = {
@@ -9807,6 +9807,32 @@ let
     };
   };
 
+  prompt_toolkit0_45 = buildPythonPackage rec {
+    name = "prompt_toolkit-${version}";
+    version = "0.45";
+
+    src = pkgs.fetchurl {
+      sha256 = "19lp15rc0rq4jqaacg2a38cdgfy2avhf5v97yanasx4n2swx4gsm";
+      url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
+    };
+
+    buildInputs = with self; [ jedi ipython pygments ];
+    propagatedBuildInputs = with self; [ docopt six wcwidth ];
+
+    meta = {
+      description = "Python library for building powerful interactive command lines";
+      longDescription = ''
+        prompt_toolkit could be a replacement for readline, but it can be
+        much more than that. It is cross-platform, everything that you build
+        with it should run fine on both Unix and Windows systems. Also ships
+        with a nice interactive Python shell (called ptpython) built on top.
+      '';
+      homepage = https://github.com/jonathanslenders/python-prompt-toolkit;
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ nckx ];
+    };
+  };
+
   protobuf = self.protobuf2_6;
   protobuf2_6 = self.protobufBuild pkgs.protobuf2_6;
   protobuf2_5 = self.protobufBuild pkgs.protobuf2_5;

From c2a8e5e609d62de9bcf903accd62f136e3911261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Aug 2015 10:04:54 +0200
Subject: [PATCH 1450/2016] qt53: sync plugin/import/qml dirs with qt54

It seems like a sensible thing to keep these in sync.
---
 pkgs/development/libraries/qt-5/5.3/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
index 595bb5bb10b..8a08c952bba 100644
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@@ -86,6 +86,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
+    export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml"
   '';
 
   prefixKey = "-prefix ";

From 019a23db3e242eceafb5b24f74c0af1be7a74eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Aug 2015 10:09:17 +0200
Subject: [PATCH 1451/2016] qt5: specify docdir

Due to a bug somewhere, the qt documentation is by default placed in
$out/share/doc although "qmake -query" reports $out/doc. That
discrepancy causes qtcreator withDocumentation builds to fail. This
fixes it.
---
 pkgs/development/libraries/qt-5/5.3/default.nix | 1 +
 pkgs/development/libraries/qt-5/5.4/qtbase.nix  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
index 8a08c952bba..7f4e0b60c2d 100644
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@@ -87,6 +87,7 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
     export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml"
+    export configureFlags+=" -docdir $out/share/doc/qt5"
   '';
 
   prefixKey = "-prefix ";
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index 780f1b60f7c..6ec57787e22 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -84,6 +84,7 @@ stdenv.mkDerivation {
     sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
 
     export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml"
+    export configureFlags+=" -docdir $out/share/doc/qt5"
   '';
 
   prefixKey = "-prefix ";

From 84c96cd4f6081e658dd415aad244fe7b061b02c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Aug 2015 10:18:20 +0200
Subject: [PATCH 1452/2016] qt5SDK: build with documentation

It was disabled due to a build error that is now fixed.
---
 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 c899b875400..c3302826717 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7975,7 +7975,7 @@ let
   qt5SDK = qtcreator.override {
     sdkBuild = true;
     qtLib = qt5Full;
-    withDocumentation = false; # fails to setup some paths
+    withDocumentation = true;
   };
 
   qtcreator = callPackage ../development/qtcreator {

From 2cf8502397cc6aa0573a012c6606d24d946f166f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Aug 2015 10:19:18 +0200
Subject: [PATCH 1453/2016] qtcreator: build with documentation

It was disabled due to a build error that is now fixed.
---
 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 c3302826717..f515868a7bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7980,7 +7980,7 @@ let
 
   qtcreator = callPackage ../development/qtcreator {
     qtLib = qt5Full; # 3.4 only supports qt5; TODO: use modularized qt>=5.4
-    withDocumentation = false; # FIXME: fails to setup some paths
+    withDocumentation = true;
   };
 
   qtkeychain = callPackage ../development/libraries/qtkeychain { };

From ef721079ca6911ba5e2fdba83d346f24cb9969e9 Mon Sep 17 00:00:00 2001
From: "Desmond O. Chang" <dochang@gmail.com>
Date: Thu, 20 Aug 2015 18:54:22 +0800
Subject: [PATCH 1454/2016] gradle: 2.2.1 -> 2.6

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

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index fd99437630c..185f4a29e00 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, jdk, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "gradle-2.2.1";
+  name = "gradle-2.6";
 
   src = fetchurl {
     url = "http://services.gradle.org/distributions/${name}-bin.zip";
-    sha256 = "420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418";
+    sha256 = "10ww9vqyi5jkdw5bna14y63fjfhh40n81q7qsfhdycgj19b8ra8q";
   };
 
   installPhase = ''

From f8caa49f003803856a0db4febd1bbb334ae2a26e Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Aug 2015 13:54:34 +0200
Subject: [PATCH 1455/2016] sane-config: Merge /etc/sane.d/dll.conf content.

---
 pkgs/applications/graphics/sane/config.nix | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix
index fc1cd81ebc6..26f1eddbed6 100644
--- a/pkgs/applications/graphics/sane/config.nix
+++ b/pkgs/applications/graphics/sane/config.nix
@@ -4,17 +4,27 @@
 
 with stdenv.lib;
 let installSanePath = path: ''
-      find "${path}/lib/sane" -not -type d -maxdepth 1 | while read backend; do
-        ln -s $backend $out/lib/sane/$(basename $backend)
-      done
+      if test -e "${path}/lib/sane"; then
+        find "${path}/lib/sane" -not -type d -maxdepth 1 | while read backend; do
+          ln -s $backend $out/lib/sane/$(basename $backend)
+        done
+      fi
 
-      find "${path}/etc/sane.d" -not -type d -maxdepth 1 | while read conf; do
-        ln -s $conf $out/etc/sane.d/$(basename $conf)
-      done
+      if test -e "${path}/etc/sane.d"; then
+        find "${path}/etc/sane.d" -not -type d -maxdepth 1 | while read conf; do
+          if test $(basename $conf) = "dll.conf"; then
+            cat $conf >> $out/etc/sane.d/dll.conf
+          else
+            ln -s $conf $out/etc/sane.d/$(basename $conf)
+          fi
+        done
+      fi
 
-      find "${path}/etc/sane.d/dll.d" -not -type d -maxdepth 1 | while read conf; do
-        ln -s $conf $out/etc/sane.d/dll.d/$(basename $conf)
-      done
+      if test -e "${path}/etc/sane.d/dll.d"; then
+        find "${path}/etc/sane.d/dll.d" -not -type d -maxdepth 1 | while read conf; do
+          ln -s $conf $out/etc/sane.d/dll.d/$(basename $conf)
+        done
+      fi
     '';
 in
 stdenv.mkDerivation {

From bb81ba7ef662da75566c5642d709c624b245f03c Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Aug 2015 13:55:25 +0200
Subject: [PATCH 1456/2016] sane-config: Prevent find warnings by moving
 maxdepth argument first.

---
 pkgs/applications/graphics/sane/config.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix
index 26f1eddbed6..4b8c7a4fe92 100644
--- a/pkgs/applications/graphics/sane/config.nix
+++ b/pkgs/applications/graphics/sane/config.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 let installSanePath = path: ''
       if test -e "${path}/lib/sane"; then
-        find "${path}/lib/sane" -not -type d -maxdepth 1 | while read backend; do
+        find "${path}/lib/sane" -maxdepth 1 -not -type d | while read backend; do
           ln -s $backend $out/lib/sane/$(basename $backend)
         done
       fi
 
       if test -e "${path}/etc/sane.d"; then
-        find "${path}/etc/sane.d" -not -type d -maxdepth 1 | while read conf; do
+        find "${path}/etc/sane.d" -maxdepth 1 -not -type d | while read conf; do
           if test $(basename $conf) = "dll.conf"; then
             cat $conf >> $out/etc/sane.d/dll.conf
           else
@@ -21,7 +21,7 @@ let installSanePath = path: ''
       fi
 
       if test -e "${path}/etc/sane.d/dll.d"; then
-        find "${path}/etc/sane.d/dll.d" -not -type d -maxdepth 1 | while read conf; do
+        find "${path}/etc/sane.d/dll.d" -maxdepth 1 -not -type d | while read conf; do
           ln -s $conf $out/etc/sane.d/dll.d/$(basename $conf)
         done
       fi

From 164f6ff2a8485c1130cd710992a6084258cdad28 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 23 Aug 2015 15:13:52 +0200
Subject: [PATCH 1457/2016] Apache service module: allow compression

---
 .../web-servers/apache-httpd/default.nix      | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 7350a6a68c7..e3f1a7fb1bd 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -117,6 +117,7 @@ let
     ]
     ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
     ++ optional enableSSL "ssl"
+    ++ optional mainCfg.enableCompression "deflate"
     ++ extraApacheModules;
 
 
@@ -176,6 +177,27 @@ let
     SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!EXP
   '';
 
+  # From http://paulstamatiou.com/how-to-optimize-your-apache-site-with-mod-deflate/
+  compressConf = ''
+    SetOutputFilter DEFLATE
+
+    # Don't compress binaries
+    SetEnvIfNoCase Request_URI .(?:exe|t?gz|zip|iso|tar|bz2|sit|rar) no-gzip dont-vary
+    # Don't compress images
+    SetEnvIfNoCase Request_URI .(?:gif|jpe?g|jpg|ico|png)  no-gzip dont-vary
+    # Don't compress PDFs
+    SetEnvIfNoCase Request_URI .pdf no-gzip dont-vary
+    # Don't compress flash files (only relevant if you host your own videos)
+    SetEnvIfNoCase Request_URI .flv no-gzip dont-vary
+    # Netscape 4.X has some problems
+    BrowserMatch ^Mozilla/4 gzip-only-text/html
+    # Netscape 4.06-4.08 have some more problems
+    BrowserMatch ^Mozilla/4.0[678] no-gzip
+    # MSIE masquerades as Netscape, but it is fine
+    BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
+    # Make sure proxies don't deliver the wrong content
+    Header append Vary User-Agent env=!dont-vary
+  '';
 
   mimeConf = ''
     TypesConfig ${httpd}/conf/mime.types
@@ -351,6 +373,7 @@ let
     ${mimeConf}
     ${loggingConf}
     ${browserHacks}
+    ${optionalString mainCfg.enableCompression compressConf}
 
     Include ${httpd}/conf/extra/httpd-default.conf
     Include ${httpd}/conf/extra/httpd-autoindex.conf
@@ -423,7 +446,7 @@ in
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = "Whether to enable the Apache HTTP Server.";
+        description = "Enable the Apache HTTP Server.";
       };
 
       package = mkOption {
@@ -586,6 +609,12 @@ in
         description =
           "Maximum number of httpd requests answered per httpd child (prefork), 0 means unlimited";
       };
+
+      enableCompression = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Enable compression of responses using mod_deflate.";
+      };
     }
 
     # Include the options shared between the main server and virtual hosts.

From 3bbd79aaa65062f81311300668dd58d7b66c14a3 Mon Sep 17 00:00:00 2001
From: Phil Scott <me@philscotted.com>
Date: Sun, 23 Aug 2015 07:54:13 +0000
Subject: [PATCH 1458/2016] scanmem: init at 0.15.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: Remove trailing dot in description.]
---
 pkgs/tools/misc/scanmem/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/misc/scanmem/default.nix

diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix
new file mode 100644
index 00000000000..e21da0deca2
--- /dev/null
+++ b/pkgs/tools/misc/scanmem/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }:
+
+stdenv.mkDerivation rec {
+  version = "0.15.2";
+  name = "scanmem-${version}";
+  src = fetchFromGitHub {
+    owner  = "scanmem";
+    repo   = "scanmem";
+    rev    = "v${version}";
+    sha256 = "0f93ac5rycf46q60flab5nl7ksadjls13axijg5j5wy1yif0k094";
+  };
+  buildInputs = [ autoconf automake intltool libtool readline ];
+  preConfigure = ''
+    ./autogen.sh
+  '';
+  meta = {
+    homepage = "https://github.com/scanmem/scanmem";
+    description = "Memory scanner for finding and poking addresses in executing processes";
+    maintainers = [ stdenv.lib.maintainers.chattered  ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f515868a7bd..eceaf669abc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10141,6 +10141,8 @@ let
 
   sassc = callPackage ../development/tools/sassc { };
 
+  scanmem = callPackage ../tools/misc/scanmem { };
+
   schedtool = callPackage ../os-specific/linux/schedtool { };
 
   sdparm = callPackage ../os-specific/linux/sdparm { };

From 23d155fb6fc35b3306dbd1c485da404a88fb1bf9 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 23 Aug 2015 15:03:10 +0100
Subject: [PATCH 1459/2016] npm2nix: use the current node version

---
 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 f515868a7bd..0d5d0930236 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2079,7 +2079,7 @@ let
 
   iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; };
 
-  npm2nix = nodePackages_0_10.npm2nix;
+  npm2nix = nodePackages.npm2nix;
 
   ldapvi = callPackage ../tools/misc/ldapvi { };
 

From d0a03e078c539dc4d337de6dc5dd5f39210bfe76 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 23 Aug 2015 17:33:04 +0300
Subject: [PATCH 1460/2016] tlp: install man pages

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

diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index 4d3de16434b..1e90ecfee32 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -51,6 +51,10 @@ in stdenv.mkDerivation {
     for i in $out/lib/udev/rules.d/*; do
       sed -i "s,RUN+=\",\\0$out,g; s,/usr/sbin,/bin,g" "$i"
     done
+
+    for i in man/*; do
+      install -D $i $out/share/man/man''${i##*.}/$(basename $i)
+    done
   '';
 
   passthru = { inherit enableRDW; };

From e40579d91e1de6cf920bbea52732b2317e0ea2ef Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 23 Aug 2015 10:16:21 -0500
Subject: [PATCH 1461/2016] qt54: set runtime env vars during build for
 makeWrapper

Set QT_PLUGIN_PATH, QML_IMPORT_PATH, and QML2_IMPORT_PATH during build
so that Qt programs may easily be wrapped for use outside NixOS. The
paths are set appropriately for the dependencies of the package.
---
 pkgs/development/libraries/qt-5/5.4/qt-submodule.nix |  6 ------
 pkgs/development/libraries/qt-5/5.4/setup-hook.sh    | 12 ++++++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix
index b242661270d..4012b637e28 100644
--- a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix
@@ -20,12 +20,6 @@ mkDerivation (args // {
   dontFixLibtool = args.dontFixLibtool or true;
   configureScript = args.configureScript or "qmake";
 
-  /*
-  preConfigure = ''
-    export PATH="$out/bin:$PATH"
-  '';
-  */
-
   postInstall = ''
     rm "$out/bin/qmake" "$out/bin/qt.conf"
 
diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
index 940b9d4e7a1..6866e4c57bd 100644
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@@ -25,6 +25,18 @@ addQtModule() {
             if [[ -n $qtSubmodule ]]; then
                 find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
             fi
+
+            if [[ -d "$1/lib/qt5/plugins" ]]; then
+                QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$1/lib/qt5/plugins";
+            fi
+
+            if [[ -d "$1/lib/qt5/imports" ]]; then
+                QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$1/lib/qt5/imports";
+            fi
+
+            if [[ -d "$1/lib/qt5/qml" ]]; then
+                QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$1/lib/qt5/qml";
+            fi
         fi
     fi
 }

From 04124c45a76729f08b710c1ce532775ad95f93cc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 21 Aug 2015 10:00:22 -0500
Subject: [PATCH 1462/2016] emacs-evil: 20141020 -> 1.2.3

Use the actual upstream source, not some random mirror.
---
 pkgs/top-level/all-packages.nix   |  2 +-
 pkgs/top-level/emacs-packages.nix | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eceaf669abc..b27ca65f794 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11296,7 +11296,7 @@ let
   emacsPackagesNgGen = emacs: import ./emacs-packages.nix {
     overrides = (config.emacsPackageOverrides or (p: {})) pkgs;
 
-    inherit lib stdenv fetchurl fetchgit fetchFromGitHub emacs;
+    inherit lib stdenv fetchurl fetchgit fetchFromGitHub fetchhg emacs;
 
     trivialBuild = import ../build-support/emacs/trivial.nix {
       inherit lib stdenv emacs texinfo;
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index c5bb3a5f047..4e03c300448 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -33,7 +33,7 @@
 
 { overrides
 
-, lib, stdenv, fetchurl, fetchgit, fetchFromGitHub
+, lib, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg
 
 , emacs
 , trivialBuild
@@ -498,11 +498,11 @@ let self = _self // overrides;
 
   evil = melpaBuild {
     pname   = "evil";
-    version = "20141020";
-    src = fetchgit {
-      url = "https://github.com/emacsmirror/evil.git";
-      rev = "999ec15587f85100311c031aa8efb5d50c35afe4";
-      sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a";
+    version = "1.2.3";
+    src = fetchhg {
+      url = "https://bitbucket.org/lyro/evil";
+      rev = "e5588e50c0e40a66c099868ea825755e348311fb";
+      sha256 = "0185vrzfdz6iwhmc22rjy0n7ppfppp2ddc8xl0vvbda79q6w3bp8";
     };
     packageRequires = [ goto-chg undo-tree ];
     meta = {
@@ -740,10 +740,10 @@ let self = _self // overrides;
   goto-chg = melpaBuild rec {
     pname   = "goto-chg";
     version = "1.6";
-    src = fetchgit {
-      url = "https://gitorious.org/evil/evil.git";
-      rev = "999ec15587f85100311c031aa8efb5d50c35afe4";
-      sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a";
+    src = fetchhg {
+      url = "https://bitbucket.org/lyro/evil";
+      rev = "e5588e50c0e40a66c099868ea825755e348311fb";
+      sha256 = "0185vrzfdz6iwhmc22rjy0n7ppfppp2ddc8xl0vvbda79q6w3bp8";
     };
     files = [ "lib/goto-chg.el" ];
     meta = { license = gpl3Plus; };

From 1ea4ea1375b96929e08286667f326305818ce81a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 22 Aug 2015 16:10:52 -0500
Subject: [PATCH 1463/2016] autogen: don't write temp files outside build dir

---
 pkgs/development/tools/misc/autogen/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 71ea938ea78..623c9262ba3 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
     # Fix a broken sed expression used for detecting the minor
     # version of guile we are using
     sed -i "s,sed '.*-I.*',sed 's/\\\(^\\\| \\\)-I/\\\1/g',g" configure
+
+    # Don't write temporary files outside the build directory
+    sed -i "s,/tmp/mklibsrc-log.tx,$TMPDIR/mklibsrc-log.tx,g" pkg/libopts/mklibsrc.sh
   '';
 
   #doCheck = true; # 2 tests fail because of missing /dev/tty

From 06717667cc9e4c3c2025e101e6cf68cde0b25fcd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 23 Aug 2015 10:28:48 -0500
Subject: [PATCH 1464/2016] Revert "autogen: don't write temp files outside
 build dir"

This reverts commit 1ea4ea1375b96929e08286667f326305818ce81a.
---
 pkgs/development/tools/misc/autogen/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 623c9262ba3..71ea938ea78 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -16,9 +16,6 @@ stdenv.mkDerivation rec {
     # Fix a broken sed expression used for detecting the minor
     # version of guile we are using
     sed -i "s,sed '.*-I.*',sed 's/\\\(^\\\| \\\)-I/\\\1/g',g" configure
-
-    # Don't write temporary files outside the build directory
-    sed -i "s,/tmp/mklibsrc-log.tx,$TMPDIR/mklibsrc-log.tx,g" pkg/libopts/mklibsrc.sh
   '';
 
   #doCheck = true; # 2 tests fail because of missing /dev/tty

From c234f37b5995457e2a5b518648e6735612cb3c27 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 20 Aug 2015 18:28:31 -0500
Subject: [PATCH 1465/2016] makeWrapper: child process inherits argv[0]

---
 pkgs/build-support/setup-hooks/make-wrapper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 41f2a59246d..f474ff5e88e 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -72,8 +72,8 @@ makeWrapper() {
 
     # Note: extraFlagsArray is an array containing additional flags
     # that may be set by --run actions.
-    echo exec "$original" $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper
-    
+    echo exec -a '"$0"' "$original" $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper
+
     chmod +x $wrapper
 }
 

From 66cf9fd257618c54f82bf3617b990cd78a805b91 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 23 Aug 2015 20:42:15 +0200
Subject: [PATCH 1466/2016] glide: 0.4.1 -> 0.5.0

---
 pkgs/top-level/go-packages.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index fa1d71621a3..12ed213d7c3 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -341,10 +341,10 @@ let
   };
 
   cli-go = buildFromGitHub {
-    rev    = "v1.2.0";
+    rev    = "142e6cd241a4dfbf7f07a018f1f8225180018da4";
     owner  = "codegangsta";
     repo   = "cli";
-    sha256 = "1axcpc8wgs0b66dpl36pz97pqbxkgvvbwz1b6rf7gl103jqpii40";
+    sha256 = "1w8naax4gvkkxw5h31a2c2dwniw5hj92nv0hn6ybdlavffyax9h5";
   };
 
   columnize = buildFromGitHub {
@@ -665,11 +665,11 @@ let
   };
 
   glide = buildFromGitHub {
-    rev    = "0.4.1";
+    rev    = "0.5.0";
     owner  = "Masterminds";
     repo   = "glide";
-    sha256 = "0237l8s7z1ysfkv3kmw4788fg4kjcq2sh6073bjcwynz3hldkrlr";
-    buildInputs = [ cookoo cli-go go-gypsy ];
+    sha256 = "10jg3h1zprx2ylmmcvmy94k4pw7lc9a6xfgr2ld8rih642sqg9wh";
+    buildInputs = [ cookoo cli-go go-gypsy vcs ];
   };
 
   gls = buildFromGitHub {
@@ -2340,6 +2340,13 @@ let
     ];
   };
 
+  vcs = buildFromGitHub {
+    rev    = "c709a4244b817af98a8ecb495ca4ab0b11f27ecd";
+    owner  = "Masterminds";
+    repo   = "vcs";
+    sha256 = "04gw4pp1f9wp36nvp9y234bmp267c4ajwcc39wa975cd89zhlhn4";
+  };
+
   vulcand = buildGoPackage rec {
     rev = "v0.8.0-beta.3";
     name = "vulcand-${rev}";

From 4098e7937812e7dba3a0bc808959089af8b675e9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 23 Aug 2015 13:47:24 -0500
Subject: [PATCH 1467/2016] qt54: set documentation path in setupHook

---
 pkgs/development/libraries/qt-5/5.4/setup-hook.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
index 6866e4c57bd..b60e3e44800 100644
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@@ -38,6 +38,13 @@ addQtModule() {
                 QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$1/lib/qt5/qml";
             fi
         fi
+
+        if [[ -d "$1/share" ]]; then
+            @lndir@/bin/lndir -silent "$1/share" "$qtOut/share"
+            if [[ -n $qtSubmodule ]]; then
+                find "$1/share" -printf 'share/%P\n' >> "$qtOut/nix-support/qt-inputs"
+            fi
+        fi
     fi
 }
 
@@ -61,6 +68,7 @@ Prefix = $qtOut
 Plugins = lib/qt5/plugins
 Imports = lib/qt5/imports
 Qml2Imports = lib/qt5/qml
+Documentation = share/doc/qt5
 EOF
 export QMAKE="$qtOut/bin/qmake"
 

From b5b78eaf44543badfd4bdff37c5cf4a7940ec859 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 23 Aug 2015 14:29:09 -0500
Subject: [PATCH 1468/2016] qt54: create share/ in setupHook

---
 pkgs/development/libraries/qt-5/5.4/setup-hook.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
index b60e3e44800..3bc4890f3bb 100644
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@@ -59,7 +59,8 @@ else
     qtOut=$out
 fi
 
-mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib"
+mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" \
+         "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share"
 
 cp "@out@/bin/qmake" "$qtOut/bin"
 cat >"$qtOut/bin/qt.conf" <<EOF

From ec27ba44d0a39a25ada21e0eb6d480213823d6ff Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 24 Aug 2015 01:42:40 +0300
Subject: [PATCH 1469/2016] build-fhs-{chroot,user}env: expose sockets in /tmp

---
 pkgs/build-support/build-fhs-chrootenv/init.sh.in   | 2 +-
 pkgs/build-support/build-fhs-chrootenv/mount.sh.in  | 8 ++++++++
 pkgs/build-support/build-fhs-chrootenv/umount.sh.in | 2 +-
 pkgs/build-support/build-fhs-userenv/chroot-user.rb | 1 +
 pkgs/build-support/build-fhs-userenv/default.nix    | 5 +++++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-fhs-chrootenv/init.sh.in b/pkgs/build-support/build-fhs-chrootenv/init.sh.in
index 9078a31fe46..9c85069a655 100644
--- a/pkgs/build-support/build-fhs-chrootenv/init.sh.in
+++ b/pkgs/build-support/build-fhs-chrootenv/init.sh.in
@@ -3,7 +3,7 @@
 chrootenvDest=/run/chrootenv/@name@
 
 # Create some mount points for stuff that must be bind mounted
-mkdir -p $chrootenvDest/{nix/store,dev,proc,sys,host-etc,home,var,run}
+mkdir -p $chrootenvDest/{nix/store,dev,proc,sys,host-etc,host-tmp,home,var,run}
 
 # Symlink the software that should be part of the chroot system profile
 for i in @chrootEnv@/*
diff --git a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in
index ef2cac21c21..24b28aae78f 100644
--- a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in
+++ b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in
@@ -22,5 +22,13 @@ mount --rbind /run $chrootenvDest/run
 # Bind mount the host system's /etc
 mount --bind /etc $chrootenvDest/host-etc
 
+# Bind mount the host system's /tmp
+mount --bind /tmp $chrootenvDest/host-tmp
+
 # Bind mount /tmp
 mount --bind /tmp/chrootenv-@name@ $chrootenvDest/tmp
+
+# Expose sockets in /tmp
+for i in /tmp/.*-unix; do
+  ln -s "/host-tmp/$(basename "$i")" "$chrootenvDest/$i"
+done
diff --git a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in
index b8222a4121a..27000cff10a 100644
--- a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in
+++ b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in
@@ -3,4 +3,4 @@
 chrootenvDest=/run/chrootenv/@name@
 
 # Unmount all (r)bind mounts
-umount -l $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,tmp,run}
+umount -l $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,host-tmp,home,var,tmp,run}
diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
index c555f053875..c31d0f7a258 100755
--- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb
+++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
@@ -7,6 +7,7 @@ mounts = [ ['/nix/store', nil],
            ['/proc', nil],
            ['/sys', nil],
            ['/etc', 'host-etc'],
+           ['/tmp', 'host-tmp'],
            ['/home', nil],
            ['/var', nil],
            ['/run', nil],
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index 546345c7e6c..b5b77f9984a 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -10,6 +10,11 @@ let
   '';
 
   init = writeText "init" ''
+           # Expose sockets in /tmp
+           for i in /host-tmp/.*-unix; do
+             ln -s "$i" "/tmp/$(basename "$i")"
+           done
+
            [ -d "$1" ] && [ -r "$1" ] && cd "$1"
            shift
            exec "${runScript}" "$@"

From f1187c5b14c86fa05b4de990a1167be02ca4615f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 24 Aug 2015 01:59:20 +0300
Subject: [PATCH 1470/2016] build-fhs-userenv: move /tmp handling to bash part

---
 pkgs/build-support/build-fhs-userenv/chroot-user.rb | 7 -------
 pkgs/build-support/build-fhs-userenv/default.nix    | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
index c31d0f7a258..b7d6276ceab 100755
--- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb
+++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
@@ -14,10 +14,6 @@ mounts = [ ['/nix/store', nil],
            ['/root', nil],
          ]
 
-# Create directories
-mkdirs = ['tmp',
-         ]
-
 # Propagate environment variables
 envvars = [ 'TERM',
             'DISPLAY',
@@ -100,9 +96,6 @@ if $cpid == 0
   write_file '/proc/self/uid_map', "#{uid} #{uid} 1"
   write_file '/proc/self/gid_map', "#{gid} #{gid} 1"
 
-  # Do mkdirs
-  mkdirs.each { |x| FileUtils.mkdir_p "#{root}/#{x}" }
-
   # Do rbind mounts.
   mounts.each do |x|
     to = "#{root}/#{x[1]}"
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index b5b77f9984a..b57b687e20f 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -10,6 +10,9 @@ let
   '';
 
   init = writeText "init" ''
+           # Make /tmp directory
+           mkdir -m 1777 /tmp
+
            # Expose sockets in /tmp
            for i in /host-tmp/.*-unix; do
              ln -s "$i" "/tmp/$(basename "$i")"

From fd7144e45514844641b030fb2bcf365b32959a32 Mon Sep 17 00:00:00 2001
From: Ian Duncan <ian@iankduncan.com>
Date: Sat, 22 Aug 2015 18:08:04 -0400
Subject: [PATCH 1471/2016] libbson: init at 1.1.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: Remove trailing dot in description and unneeded parenthesis
around mkDerivation arguments.]
---
 .../development/libraries/libbson/default.nix | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/libbson/default.nix

diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix
new file mode 100644
index 00000000000..6d64df88d3f
--- /dev/null
+++ b/pkgs/development/libraries/libbson/default.nix
@@ -0,0 +1,23 @@
+{ autoconf, automake114x, fetchzip, libtool, perl, stdenv, which }:
+
+let
+  version = "1.1.10";
+in
+
+stdenv.mkDerivation rec {
+  name = "libbson-${version}";
+
+  src = fetchzip {
+    url = "https://github.com/mongodb/libbson/releases/download/${version}/libbson-${version}.tar.gz";
+    sha256 = "0zzca7zqvxf89fq7ji9626q8nnqyyh0dnmbk4xijzr9sq485xz0s";
+  };
+
+  buildInputs = [ autoconf automake114x libtool perl which ];
+
+  meta = with stdenv.lib; {
+    description = "A C Library for parsing, editing, and creating BSON documents";
+    homepage = "https://github.com/mongodb/libbson";
+    license = licenses.asl20;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b27ca65f794..58562c9ffb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6778,6 +6778,8 @@ let
 
   libbs2b = callPackage ../development/libraries/audio/libbs2b { };
 
+  libbson = callPackage ../development/libraries/libbson { };
+
   libcaca = callPackage ../development/libraries/libcaca { };
 
   libcanberra = callPackage ../development/libraries/libcanberra { };

From 4bdcf1fa9525d8c63ac506956042b8ecc5d7e1e6 Mon Sep 17 00:00:00 2001
From: Ian Duncan <ian@iankduncan.com>
Date: Sat, 22 Aug 2015 18:11:55 -0400
Subject: [PATCH 1472/2016] mongoc: init at 1.1.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: Minor coding style cleanup.]
---
 pkgs/development/libraries/mongoc/default.nix | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/mongoc/default.nix

diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
new file mode 100644
index 00000000000..510dbe0e190
--- /dev/null
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchzip, autoconf, automake114x, perl, pkgconfig, libbson, libtool
+, openssl, which
+}:
+
+let
+  version = "1.1.10";
+in
+
+stdenv.mkDerivation rec {
+  name = "mongoc-${version}";
+
+  src = fetchzip {
+    url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz";
+    sha256 = "13yg8dpqgbpc44lsblr3szk2a5bnl2prlayv4xlkivx90m86lcx3";
+  };
+
+  propagatedBuildInputs = [ libbson ];
+  buildInputs = [ autoconf automake114x libtool openssl perl pkgconfig which ];
+
+  meta = with stdenv.lib; {
+    description = "The official C client library for MongoDB";
+    homepage = "https://github.com/mongodb/mongo-c-driver";
+    license = licenses.asl20;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58562c9ffb4..c4ec4d50c25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14846,6 +14846,8 @@ let
     inherit (pkgs.gnome) GConf;
   };
 
+  mongoc = callPackage ../development/libraries/mongoc { };
+
   mupen64plus = callPackage ../misc/emulators/mupen64plus { };
 
   mupen64plus1_5 = callPackage ../misc/emulators/mupen64plus/1.5.nix { };

From fee4fe1b5ec9fc032708cddaea20471cce46ef39 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Thu, 20 Aug 2015 23:01:37 +0100
Subject: [PATCH 1473/2016] {lib}mediainfo{-gui}: 0.7.75 -> 0.7.76

From the changelog:
```
Version 0.7.76, 2015-08-06

+ XML output: line breaks and indents in between attributes for readability
+ Trace feature: XML trace update, only if compiled with trace feature
+ Amazon S3 support (REST API v2), CLI/DLL only and if compiled with
  libcurl support
+ FFV1: improved slice analysis (currently activated only with trace
  feature and for 1st frame)
x MXF: optimization of the parsing, reading a lot less data (e.g. can be
  reduced from 1 GB to 10 MB with some UHD files)
x MXF: wrong frame count with files not having the video stream as the
  first stream
x Dolby E in MPEG-TS: "SMPTE ST 302" information was accidentally removed
x MPEG-TS: avoid filling delay from file name, not applicable on MPEG-TS
x MXF: better handling of huge padding blocks, better handling of
  descriptors without link to a TrackID
x IMX: streams claiming that they are IMX are actually pure MPEG Video,
  probing both IMX and MPEG Video

```
---
 pkgs/applications/misc/mediainfo-gui/default.nix    | 6 +++---
 pkgs/applications/misc/mediainfo/default.nix        | 6 +++---
 pkgs/development/libraries/libmediainfo/default.nix | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 3a597c9de52..939edc97be1 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.75";
+  version = "0.7.76";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "1xdsy5z7x7bd251m26h5hcwcmgl6gklxj6h9q025mlnfmcs7pbdy";
+    sha256 = "14vy2a9bjjwxyk8zh0ysin8fb1lj9yz17yd82vxrp1zvxsgyg5ck";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];
 
   sourceRoot = "./MediaInfo/Project/GNU/GUI/";
 
-  preConfigure = "sh autogen";
+  preConfigure = "sh autogen.sh";
 
   meta = {
     description = "Supplies technical and tag information about a video or audio file (GUI version)";
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index c9792f3a2af..4a5fffe533d 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.75";
+  version = "0.7.76";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "1xdsy5z7x7bd251m26h5hcwcmgl6gklxj6h9q025mlnfmcs7pbdy";
+    sha256 = "14vy2a9bjjwxyk8zh0ysin8fb1lj9yz17yd82vxrp1zvxsgyg5ck";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   sourceRoot = "./MediaInfo/Project/GNU/CLI/";
 
   configureFlags = [ "--with-libmediainfo=${libmediainfo}" ];
-  preConfigure = "sh autogen";
+  preConfigure = "sh autogen.sh";
 
   meta = {
     description = "Supplies technical and tag information about a video or audio file";
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 5349026085f..010318073c7 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.75";
+  version = "0.7.76";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "1im39kd595ia6g41qvwgvszn1s10nwa3q5r2lj2g5fm4kgi0dwhr";
+    sha256 = "088hxj3x12ww8zym3g6izz1w9m6wxgdy7hc2m089cd4sv9dlccnq";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   sourceRoot = "./MediaInfoLib/Project/GNU/Library/";
 
   configureFlags = [ "--enable-shared" ];
-  preConfigure = "sh autogen";
+  preConfigure = "sh autogen.sh";
 
   postInstall = ''
     install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc"

From d36e4f306389107b151b8de3b1c9a091f0ddab19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 24 Aug 2015 08:22:09 +0200
Subject: [PATCH 1474/2016] micropolis: fix patch hash, probably updated

Fixes #9414. Seems to run OK, as far as I can tell in a minute.
---
 pkgs/games/micropolis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/micropolis/default.nix b/pkgs/games/micropolis/default.nix
index 0dc156ca3b7..55a02e08003 100644
--- a/pkgs/games/micropolis/default.nix
+++ b/pkgs/games/micropolis/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libX11, libXpm, libXext, xextproto, byacc }:
 
 stdenv.mkDerivation {
-  name = "micropolis";
+  name = "micropolis-2010-12-18"; # version from the patch timestamp
 
   src = fetchurl {
     url = http://www.donhopkins.com/home/micropolis/micropolis-activity-source.tgz;
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   patches =
     [ (fetchurl {
         url = http://rmdir.de/~michael/micropolis_git.patch;
-        sha256 = "13419a4394242cd11d5cabd8b1b50787282ea16b55fdcfbeadf8505af46b0592";
+        sha256 = "0sjl61av7lab3a5vif1jpyicmdb2igvqq6nwaw0s3agg6dh69v1d";
       })
     ];
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       chmod 755 $out/bin/micropolis
     '';
 
-  meta = { 
+  meta = {
     description = "GPL'ed version of S*m C*ty";
     homepage = http://www.donhopkins.com/home/micropolis/;
     license = "GPL";

From e4410bfd8565ce317d31e4a670ba50ebbfec74df Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Mon, 24 Aug 2015 07:49:21 +0300
Subject: [PATCH 1475/2016] qt4SDK/qt5SDK: delete (see #9342)

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b27ca65f794..750c3b8484e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7948,11 +7948,6 @@ let
     developerBuild = true;
   });
 
-  qt4SDK = qtcreator.override {
-    sdkBuild = true;
-    qtLib = qt48Full;
-  };
-
   qt53 = callPackage ../development/libraries/qt-5/5.3 {
     mesa = mesa_noglu;
     cups = if stdenv.isLinux then cups else null;
@@ -7972,12 +7967,6 @@ let
     developerBuild = true;
   });
 
-  qt5SDK = qtcreator.override {
-    sdkBuild = true;
-    qtLib = qt5Full;
-    withDocumentation = true;
-  };
-
   qtcreator = callPackage ../development/qtcreator {
     qtLib = qt5Full; # 3.4 only supports qt5; TODO: use modularized qt>=5.4
     withDocumentation = true;

From 9c206b6cf7ab22aa20d8ed4ab7169b716c999762 Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Mon, 24 Aug 2015 07:50:17 +0300
Subject: [PATCH 1476/2016] qtcreator: refactor for using qt54

---
 lib/maintainers.nix                    |  1 +
 pkgs/development/qtcreator/default.nix | 27 +++++++++++---------------
 pkgs/top-level/all-packages.nix        |  2 +-
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d42d81399cf..21ee19708a4 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -14,6 +14,7 @@
   aflatter = "Alexander Flatter <flatter@fastmail.fm>";
   aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
   ak = "Alexander Kjeldaas <ak@formalprivacy.com>";
+  akaWolf = "Artjom Vejsel <akawolf0@gmail.com>";
   akc = "Anders Claesson <akc@akc.is>";
   algorith = "Dries Van Daele <dries_van_daele@telenet.be>";
   all = "Nix Committers <nix-commits@lists.science.uu.nl>";
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index 199df25d552..0f55d4ee9af 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtLib, sdkBuild ? false, withDocumentation ? true }:
+{ stdenv, fetchurl, makeWrapper, qtLib, withDocumentation ? false }:
 
 with stdenv.lib;
 
@@ -9,31 +9,21 @@ let
 in
 
 stdenv.mkDerivation rec {
-  # The package name depends on wether we are just building the QtCreator package or the whole Qt SDK
-  # If we are building the QtCreator package: qtcreator-version
-  # If we are building the QtSDK package, the Qt version is also included: qtsdk-version-qt-version
-  name = "qt${if sdkBuild then "sdk" else "creator"}-${version}"
-    + optionalString sdkBuild "-qt-${qtLib.version}";
+  name = "qtcreator-${version}";
 
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
     sha256 = "1asbfphws0aqs92gjgh0iqzr1911kg51r9al44jxpfk88yazjzgm";
   };
 
-  # This property can be used in a nix development environment to refer to the Qt package
-  # eg: export QTDIR=${qtSDK.qt}
-  qt = qtLib;
-
-  # We must only propagate Qt (including qmake) when building the QtSDK
-  propagatedBuildInputs = if sdkBuild then [ qtLib ] else [];
-  buildInputs = if sdkBuild == false then [ qtLib ] else [];
+  buildInputs = [ makeWrapper qtLib.base qtLib.script qtLib.quickcontrols qtLib.declarative ];
 
   doCheck = false;
 
   enableParallelBuilding = true;
 
   preConfigure = ''
-    qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qtLib}/include" qtcreator.pro
+    qmake -spec linux-g++ qtcreator.pro
   '';
 
   buildFlags = optionalString withDocumentation " docs";
@@ -54,6 +44,11 @@ stdenv.mkDerivation rec {
     Type=Application
     Categories=Qt;Development;IDE;
     __EOF__
+    # Wrap the qtcreator binary
+    wrapProgram $out/bin/qtcreator \
+      --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
+      --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
+      --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH"
   '';
 
   meta = {
@@ -63,9 +58,9 @@ stdenv.mkDerivation rec {
       tailored to the needs of Qt developers. It includes features such as an
       advanced code editor, a visual debugger and a GUI designer.
     '';
-    homepage = "http://qt-project.org/wiki/Category:Tools::QtCreator";
+    homepage = "https://wiki.qt.io/Category:Tools::QtCreator";
     license = "LGPL";
-    maintainers = [ maintainers.bbenoist ];
+    maintainers = [ maintainers.akaWolf maintainers.bbenoist ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 750c3b8484e..aa5d09855d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7968,7 +7968,7 @@ let
   });
 
   qtcreator = callPackage ../development/qtcreator {
-    qtLib = qt5Full; # 3.4 only supports qt5; TODO: use modularized qt>=5.4
+    qtLib = qt54;
     withDocumentation = true;
   };
 

From fdb5ab0bba831ef1d125069ce6f584cb6877a390 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 24 Aug 2015 12:02:56 +0300
Subject: [PATCH 1477/2016] yed: change the go-to page per vendor request

---
 pkgs/applications/graphics/yed/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index 0cd853a2cbe..e3b7d001174 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -3,13 +3,9 @@
 stdenv.mkDerivation rec {
   name = "yEd-3.14.3";
 
-  #src = fetchurl {
-  #  url = "http://www.yworks.com/products/yed/demo/${name}.zip";
-  #  sha256 = "0xgazknbz82sgk65hxmvbycl1vd25z80a7jgwjgw7syicrgmplcl";
-  #};
   src = requireFile {
     name = "${name}.zip";
-    url = "https://www.yworks.com/en/products_download.php?file=${name}.zip";
+    url = "https://www.yworks.com/en/products/yfiles/yed/";
     sha256 = "0xgazknbz82sgk65hxmvbycl1vd25z80a7jgwjgw7syicrgmplcl";
   };
 

From 779e5855494ea2fc52c1e3e40023e27e4a115fff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Aug 2015 10:19:41 +0200
Subject: [PATCH 1478/2016] chromium: Fix test on i686-linux

http://hydra.nixos.org/build/24982682
---
 nixos/tests/chromium.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 2ce47c23775..52ae6a771e1 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -15,7 +15,7 @@ import ./make-test.nix (
   enableOCR = true;
 
   machine.imports = [ ./common/x11.nix ];
-  machine.virtualisation.memorySize = 4096;
+  machine.virtualisation.memorySize = 2560;
 
   startupHTML = pkgs.writeText "chromium-startup.html" ''
     <!DOCTYPE html>

From 24f1a7a5cb12d6a9b46f25dfc22268b1bb1c3606 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Aug 2015 11:51:28 +0200
Subject: [PATCH 1479/2016] subversion: Update to 1.8.14

CVE-2015-3184, CVE-2015-3187.
---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index c28459018ca..ffe68839851 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null;
 
 stdenv.mkDerivation (rec {
 
-  version = "1.8.13";
+  version = "1.8.14";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion/${name}.tar.bz2";
-    sha1 = "aa0bd14ac6a8f0fb178cc9ff325387de01cd7452";
+    sha1 = "0698efc58373e7657f6dd3ce13cab7b002ffb497";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]

From 5920d9e80e24d3af2c4b74bb3b62639a476a2e87 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 24 Aug 2015 13:52:27 +0200
Subject: [PATCH 1480/2016] geolite-legacy: update 2015-08-17 -> 2015-08-24

---
 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 9cc52fa1fe1..795299892ed 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-08-17";
+  version = "2015-08-24";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
     "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "0g9i1dyvh2389q8mp6wg2xg3lm9wmh5md1cvy698pzi1y6j9wka3";
+    "10jdh5dknk5y1kawgp5ijg6c74a7nrmmhhw75q9x82l151irdfky";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "0hfiiqffw8z10lzk1l2iaqlbgi39xk3j3mrlrzxvrsj4s08zdrks";
+    "10yrkilf0mx6i61zg2r2sd0dn2lwvq8k97jfwv8ysvq98lxb51a1";
 
   meta = with stdenv.lib; {
     inherit version;

From 3c114b827ee418a040973671e1ab4898118a5886 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Aug 2015 14:16:59 +0200
Subject: [PATCH 1481/2016] systemd: Update URL to the NixOS fork

---
 pkgs/os-specific/linux/systemd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index b98f6e69282..4c9e0475b94 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   patches =
     [ # These are all changes between upstream and
-      # https://github.com/edolstra/systemd/tree/nixos-v217.
+      # https://github.com/NixOS/systemd/tree/nixos-v217.
       ./fixes.patch
     ];
 

From 5cdf3d4f8ecf494039d121cf594d520061b3f4e7 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 24 Aug 2015 18:16:11 +0200
Subject: [PATCH 1482/2016] can-utils: updated homepage url (close #9425)

---
 pkgs/os-specific/linux/can-utils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix
index f181db0c5e3..9da2b755fd5 100644
--- a/pkgs/os-specific/linux/can-utils/default.nix
+++ b/pkgs/os-specific/linux/can-utils/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "CAN userspace utilities and tools (for use with Linux SocketCAN)";
-    homepage = "https://gitorious.org/linux-can/can-utils";
+    homepage = "https://github.com/linux-can/can-utils";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];

From fa67a2d3011118375c4208a8f3dd242e70efa34e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Aug 2015 18:58:45 +0200
Subject: [PATCH 1483/2016] nixUnstable: Update

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index f2099e1d76f..e773b1ff2e1 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -94,10 +94,10 @@ in rec {
    };
 
    nixUnstable = lib.lowPrio (common rec {
-     name = "nix-1.10pre4200_76cc8e9";
+     name = "nix-1.10pre4212_e12cf82";
       src = fetchurl {
-        url = "http://hydra.nixos.org/build/24195844/download/4/${name}.tar.xz";
-        sha256 = "87e21fe00d93cf64674ddfae25b7be402b10a9e8449eae1fbb1203123624fd0f";
+        url = "http://hydra.nixos.org/build/24982847/download/4/${name}.tar.xz";
+        sha256 = "4165db0ea9bb6b5cd96d294348299f20ac045fc18db680104ff98fe9ac893f72";
       };
    });
 

From c99c0dd1ed3fea730934878d08c9493f0db69b32 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Tue, 25 Aug 2015 01:19:14 +0800
Subject: [PATCH 1484/2016] conkeror: 20150319 -> 20150730

---
 pkgs/applications/networking/browsers/conkeror/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index 9715b46ed50..007c49b2733 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, unzip, firefox, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "conkeror-1.0pre-20150319";
+  name = "conkeror-1.0pre-20150730";
 
   src = fetchgit {
     url = git://repo.or.cz/conkeror.git;
-    rev = "6450632b3f0c315f79e7a9856658083fe8fc9c29";
-    sha256 = "18cqz1n2n6aimmgd69mdrgmkjf4207k7yz11wihka6b5z1hfiv64";
+    rev = "a1f7e879b129df5cf14ea4ce80a9c1407380ed58";
+    sha256 = "12d8949a81a670037664dd930f7efe3d54b321aad48deea68343eba9aaea8785";
   };
 
   buildInputs = [ unzip makeWrapper ];

From c41a62aa98bc07ee03737bf175341c9605ae6c58 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Sun, 23 Aug 2015 21:36:31 +0200
Subject: [PATCH 1485/2016] colord: 1.2.3 -> 1.2.12

  * Use fetchzip instead of fetchurl
---
 pkgs/tools/misc/colord/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 9f91a1acc60..267ed4db67c 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, fetchgit, bashCompletion
+{ stdenv, fetchzip, fetchgit, bashCompletion
 , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus
-, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection }:
+, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms }:
 
 stdenv.mkDerivation rec {
-  name = "colord-1.2.3";
+  name = "colord-1.2.12";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
-    sha256 = "1z3l6hb3b08fixfra6m887a2j3lvhib6vp798ik16jfh375gr490";
+    sha256 = "0rvvbpxd5x479v4p6pck317mlf3j29s154i1n8hlx8n4znhwrb0k";
   };
 
   enableParallelBuilding = true;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
-                  bashCompletion ];
+                  bashCompletion argyllcms automake autoconf ];
 
   postInstall = ''
     rm -fr $out/var/lib/colord

From 94abba931d9b01c8f1c29b5ead355e2b60372e86 Mon Sep 17 00:00:00 2001
From: Henry Till <henrytill@gmail.com>
Date: Mon, 24 Aug 2015 14:54:05 -0400
Subject: [PATCH 1486/2016] racket: 6.2 -> 6.2.1

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

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 1affd1fa582..d41b0424b44 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -31,11 +31,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "racket-${version}";
-  version = "6.2";
+  version = "6.2.1";
 
   src = fetchurl {
     url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
-    sha256 = "05g60fzb9dzf52xj9n7s4prybwbr8dqjq94mbdmw5cxk88vi2c8k";
+    sha256 = "0555j63k7fs10iv0icmivlxpzgp6s7gwcbfddmbwxlf2rk80qhq0";
   };
 
   FONTCONFIG_FILE = fontsConf;

From 61be6847c0af0d9a9f6cd1d80055e9b928244b06 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 24 Aug 2015 22:31:56 +0300
Subject: [PATCH 1487/2016] maintainers:  add Kosyrev Serge

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d42d81399cf..db37043594a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -71,6 +71,7 @@
   davidrusu = "David Rusu <davidrusu.me@gmail.com>";
   dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>";
   DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";
+  deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>";
   desiderius = "Didier J. Devroye <didier@devroye.name>";
   devhell = "devhell <\"^\"@regexmail.net>";
   dezgeg = "Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>";

From 90f40408c8d842345c01bd581b7697463f3854f4 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Tue, 18 Aug 2015 15:47:09 +0300
Subject: [PATCH 1488/2016] sblim-sfcc  init at 2.2.9

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

diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix
new file mode 100644
index 00000000000..9ec7afabab1
--- /dev/null
+++ b/pkgs/development/libraries/sblim-sfcc/default.nix
@@ -0,0 +1,30 @@
+{ fetchgit, stdenv, autoconf, automake, libtool, curl }:
+
+stdenv.mkDerivation rec {
+  version = "2.2.9";
+  name = "sblim-sfcc-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/kkaempf/sblim-sfcc.git";
+    rev = "f70fecb410a53531e4fe99d39cf81b581819cac9";
+    sha256 = "1dlhjvi888kz3bq56n0f86f25ny48a18rm4rgb4rx04aimas3dvj";
+  };
+
+  preConfigure = "./autoconfiscate.sh";
+
+  buildInputs = [ autoconf automake libtool curl ];
+
+  meta = {
+    description = "Small Footprint CIM Client Library";
+
+    homepage = http://sourceforge.net/projects/sblim/;
+
+    maintainers = [ stdenv.lib.maintainers.deepfire ];
+
+    license = stdenv.lib.licenses.cpl10;
+
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4ec4d50c25..a09fdadf9db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8102,6 +8102,8 @@ let
 
   SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { };
 
+  sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {};
+
   serd = callPackage ../development/libraries/serd {};
 
   serf = callPackage ../development/libraries/serf {};

From d8b3c4c49c509e15944b5a44ecf183a4991692d5 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Tue, 18 Aug 2015 15:47:34 +0300
Subject: [PATCH 1489/2016] openwsman  init at 2.6.0

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

diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix
new file mode 100644
index 00000000000..0eb940c119e
--- /dev/null
+++ b/pkgs/development/libraries/openwsman/default.nix
@@ -0,0 +1,38 @@
+{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, libxml2, curl, cmake, pam, sblim-sfcc }:
+
+stdenv.mkDerivation rec {
+  version = "2.6.0";
+  name = "openwsman-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Openwsman/openwsman/archive/v${version}.tar.gz";
+    sha256 = "0gw2dsjxzpchg3s85kplwgp9xhd9l7q4fh37iy7r203pvir4k6s4";
+  };
+
+  buildInputs = [ autoconf automake libtool pkgconfig libxml2 curl cmake pam sblim-sfcc ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_RUBY_GEM=no"
+  ];
+
+  preConfigure = ''
+    cmakeFlags="$cmakeFlags -DPACKAGE_ARCHITECTURE=$(uname -m)";
+  '';
+
+  configureFlags = "--disable-more-warnings";
+
+  meta = {
+    description = "Openwsman server implementation and client api with bindings";
+
+    homepage = https://github.com/Openwsman/openwsman;
+    downloadPage = "https://github.com/Openwsman/openwsman/releases";
+
+    maintainers = [ stdenv.lib.maintainers.deepfire ];
+
+    license = stdenv.lib.licenses.bsd3;
+
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a09fdadf9db..142419ec498 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7802,6 +7802,8 @@ let
     };
   };
 
+  openwsman = callPackage ../development/libraries/openwsman {};
+
   ortp = callPackage ../development/libraries/ortp { };
 
   p11_kit = callPackage ../development/libraries/p11-kit { };

From 1770fe4443f4ce4e5e01d1725c55c1015becd5b6 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Wed, 19 Aug 2015 11:10:37 +0300
Subject: [PATCH 1490/2016] wsmancli  init at 2.6.0

---
 pkgs/tools/system/wsmancli/default.nix | 38 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/system/wsmancli/default.nix

diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix
new file mode 100644
index 00000000000..5449d53229c
--- /dev/null
+++ b/pkgs/tools/system/wsmancli/default.nix
@@ -0,0 +1,38 @@
+{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, openwsman }:
+
+stdenv.mkDerivation rec {
+  version = "2.6.0";
+  name = "wsmancli-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Openwsman/wsmancli/archive/v${version}.tar.gz";
+    sha256 = "03ay6sa4ii8h6rr3l2qiqqml8xl6gplrlg4v2avdh9y6sihfyvvn";
+  };
+
+  buildInputs = [ autoconf automake libtool pkgconfig openwsman ];
+
+  preConfigure = "./bootstrap";
+
+  meta = {
+    description = "Openwsman command-line client";
+
+    longDescription =
+      '' Openwsman provides a command-line tool, wsman, to perform basic
+         operations on the command-line. These operations include Get, Put,
+         Invoke, Identify, Delete, Create, and Enumerate. The command-line tool
+         also has several switches to allow for optional features of the
+         WS-Management specification and Testing.
+      '';
+
+    homepage = https://github.com/Openwsman/wsmancli;
+    downloadPage = "https://github.com/Openwsman/wsmancli/releases";
+
+    maintainers = [ stdenv.lib.maintainers.deepfire ];
+
+    license = stdenv.lib.licenses.bsd3;
+
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 142419ec498..6363ec72668 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3335,6 +3335,8 @@ let
 
   welkin = callPackage ../tools/graphics/welkin {};
 
+  wsmancli = callPackage ../tools/system/wsmancli {};
+
   wolfebin = callPackage ../tools/networking/wolfebin {
     python = python2;
   };

From 85c5d83dfc63f2defe6285fd7ad89ca90aaa41b7 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 24 Aug 2015 22:54:45 +0300
Subject: [PATCH 1491/2016] aurulent-sans:  add myself as maintainer

---
 pkgs/data/fonts/aurulent-sans/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix
index d6b4829d730..3685dbf356e 100644
--- a/pkgs/data/fonts/aurulent-sans/default.nix
+++ b/pkgs/data/fonts/aurulent-sans/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     description = "Aurulent Sans";
     longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font.";
     homepage = http://delubrum.org/;
+    maintainers = with stdenv.lib.maintainers; [ deepfire ];
     license = stdenv.lib.licenses.ofl;
     platforms = stdenv.lib.platforms.all;
   };

From 301bf5018d46b8b095a5641b7113e1f012f357f6 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 24 Aug 2015 22:55:04 +0300
Subject: [PATCH 1492/2016] ghcNokinds:  add myself as maintainer

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

diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix
index ab270c16126..3f0b9e866b0 100644
--- a/pkgs/development/compilers/ghc/nokinds.nix
+++ b/pkgs/development/compilers/ghc/nokinds.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The dependently-typed 'nokinds' branch of the Glasgow Haskell Compiler by Richard Eisenberg";
-    maintainers = with stdenv.lib.maintainers; [ ];
+    maintainers = with stdenv.lib.maintainers; [ deepfire ];
     inherit (ghc.meta) license platforms;
   };
 

From 432c43dabf944b2bf39aa2e4ae7d8358553c4365 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 24 Aug 2015 22:55:13 +0300
Subject: [PATCH 1493/2016] chntpw:  add myself as maintainer

---
 pkgs/tools/security/chntpw/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix
index a1aab355a3c..814fb0ea0ec 100644
--- a/pkgs/tools/security/chntpw/default.nix
+++ b/pkgs/tools/security/chntpw/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://pogostick.net/~pnh/ntpasswd/;
     description = "An utility to reset the password of any user that has a valid local account on a Windows system";
+    maintainers = with stdenv.lib.maintainers; [ deepfire ];
     license = licenses.gpl2;
   };
 }

From 6b892be9a8689d157ebdeeda75dfe2957a02560b Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Mon, 24 Aug 2015 13:31:24 -0700
Subject: [PATCH 1494/2016] fix updmap invocation in texLive

Close #9430, fixes #9318.
---
 pkgs/tools/typesetting/tex/texlive/aggregate.nix | 2 +-
 pkgs/tools/typesetting/tex/texlive/default.nix   | 2 +-
 pkgs/tools/typesetting/tex/texlive/xcolor.nix    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
index d19ff39e2a4..0846970662f 100644
--- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix
+++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
@@ -53,7 +53,7 @@ rec {
 
     rm -f $out/texmf*/ls-R
     for i in web2c texconfig fonts/map; do
-        mkdir -p $out/texmf-config/$i 
+        mkdir -p $out/texmf-config/$i
         cp -Lr $out/texmf*/$i/* $out/texmf-config/$i || true
     done
     chmod -R u+w $out/texmf-config
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 3acfffafde2..d676acd2f28 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -81,7 +81,7 @@ rec {
 
     PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
 
-    HOME=. PATH=$PATH:$out/bin updmap-sys --syncwithtrees
+    yes | HOME=. PATH=$PATH:$out/bin updmap-sys --syncwithtrees || echo $?
 
     # Prebuild the format files, as it used to be done with TeXLive 2007.
     # Luatex currently fails this way:
diff --git a/pkgs/tools/typesetting/tex/texlive/xcolor.nix b/pkgs/tools/typesetting/tex/texlive/xcolor.nix
index 892734afe46..f02bf351c3f 100644
--- a/pkgs/tools/typesetting/tex/texlive/xcolor.nix
+++ b/pkgs/tools/typesetting/tex/texlive/xcolor.nix
@@ -14,7 +14,7 @@ rec {
 
     mkdir -p $out/texmf-dist/tex/latex/xcolor
     mkdir -p $out/texmf-dist/dvips/xcolor
-    latex xcolor.ins 
+    latex xcolor.ins
     cp *.sty *.def $out/texmf-dist/tex/latex/xcolor
     cp *.pro $out/texmf-dist/dvips/xcolor
 

From 195671aa700e3dc2b65c699201a4ade30846204b Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS-SSD2)" <kovirobi@gmail.com>
Date: Sun, 23 Aug 2015 18:17:01 +0100
Subject: [PATCH 1495/2016] plan9port: 20140306 -> 2015-06-29

We were already using snapshots, but development moved to github.
Also add "9" to $out/bin as it is the recommended practice, see
install.txt
---
 pkgs/tools/system/plan9port/builder.sh  | 47 +++++++++++++++----------
 pkgs/tools/system/plan9port/default.nix | 20 +++++------
 2 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index 2131a5bad86..023ceef40f2 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -1,23 +1,34 @@
 source $stdenv/setup
 
-tar xvfz $src
-
-cd plan9port
-
-echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config
-echo X11=\"${libXt}/include\" >> LOCAL.config
-
-for p in $patches; do
-  echo "applying patch $p"
-  patch -p1 < $p
-done
-
 export PLAN9=$out/plan9
-mkdir -p $PLAN9
 
-for f in `grep -l -r /usr/local/plan9`; do
-  sed "s,/usr/local/plan9,${PLAN9},g" -i $f
-done
+configurePhase()
+{
+    echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config
+    echo X11=\"${libXt}/include\" >> LOCAL.config
 
-./INSTALL -r $PLAN9
-cp -R * $PLAN9
+    for f in `grep -l -r /usr/local/plan9`; do
+        sed "s,/usr/local/plan9,${PLAN9},g" -i $f
+    done
+}
+
+buildPhase()
+{
+    mkdir -p $PLAN9
+    ./INSTALL -b $PLAN9
+}
+
+installPhase()
+{
+    ./INSTALL -c -r $PLAN9
+    # Copy sources
+    cp -R * $PLAN9
+
+    # Copy the `9' utility. This way you can use
+    # $ 9 awk
+    # to use the plan 9 awk
+    mkdir $out/bin
+    ln -s $PLAN9/bin/9 $out/bin
+}
+
+genericBuild
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index ca248da56cf..86ce1f14a8c 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -1,10 +1,17 @@
-{stdenv, fetchurl, which, libX11, libXt, fontconfig
+{stdenv, fetchgit, which, libX11, libXt, fontconfig
 , xproto ? null
 , xextproto ? null
 , libXext ? null }:
 
 stdenv.mkDerivation rec {
-  name = "plan9port-20140306";
+  name = "plan9port-2015-06-29";
+
+  src = fetchgit {
+    # Latest, same as on github, google code is old
+    url = "https://plan9port.googlesource.com/plan9";
+    rev = "71de840";
+    sha256 = "1ffece7c0a5775a8bde6a0618c7ae3da4048449008a19e6623e8e5553f133b4c";
+  };
 
   patches = [ ./fontsrv.patch ];
   postPatch =
@@ -15,13 +22,6 @@ stdenv.mkDerivation rec {
 
   builder = ./builder.sh;
 
-  src = fetchurl {
-    url = "https://plan9port.googlecode.com/files/${name}.tgz";
-    # Google code is much faster than swtch
-    # url = "http://swtch.com/plan9port/${name}.tgz";
-    sha256 = "1sza12j3db7i54r3pzli8wmby6aiyzmyfj8w0nidmawkwv6jdf6b";
-  };
-
   NIX_LDFLAGS="-lgcc_s";
   buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ which libX11 fontconfig xproto libXt xextproto libXext ];
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     homepage = "http://swtch.com/plan9port/";
     description = "Plan 9 from User Space";
     license = licenses.lpl-102;
-    maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ];
+    maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx kovirobi ];
     platforms = platforms.unix;
   };
 

From 44048385bdaa15e4c64e7206cc4ef9357de2cb6e Mon Sep 17 00:00:00 2001
From: Philip Potter <philip.g.potter@gmail.com>
Date: Mon, 24 Aug 2015 22:38:01 +0100
Subject: [PATCH 1496/2016] html-xml-utils: fix and bump to 6.9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

6.4 had a compile error:

```
scan.l:136:7: error: expected identifier or ‘(’ before ‘__extension__’
char *strndup(const char *s, size_t n);
^
```

This is caused by the standard library strndup() now living in string.h
and conflicting with another strndup() declared in scan.l.  Version 6.9
fixes this.

This also removes the need for the boolean patch that we previously had.
---
 .../tools/text/xml/html-xml-utils/default.nix |  6 ++----
 .../xml/html-xml-utils/no-Boolean-type.patch  | 20 -------------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch

diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
index cabb931c447..944b4221844 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -1,16 +1,14 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "html-xml-utils-6.4";
+  name = "html-xml-utils-6.9";
 
   src = fetchurl {
     url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz";
 
-    sha256 = "0dqa8vjk5my728hmb7dhl6nbg7946fh905j0yzlwx7p7rg2zrxcp";
+    sha256 = "1cpshwz60h7xsw1rvv84jl4bn9zjqii9hb8zvwm7a0fahkf03x4w";
   };
 
-  patches = [ ./no-Boolean-type.patch ];
-
   meta = {
     description = "Utilities for manipulating HTML and XML files";
     homepage = http://www.w3.org/Tools/HTML-XML-utils/;
diff --git a/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch b/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch
deleted file mode 100644
index f675c4280e7..00000000000
--- a/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur html-xml-utils-6.4-orig/openurl.c html-xml-utils-6.4/openurl.c
---- html-xml-utils-6.4-orig/openurl.c	2012-10-23 09:55:12.000000000 -0400
-+++ html-xml-utils-6.4/openurl.c	2013-10-17 14:05:11.424077842 -0400
-@@ -66,6 +66,7 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #include <assert.h>
-+#include <stdbool.h>
- #include "export.h"
- #if HAVE_LIBCURL && !HAVE_FOPENCOOKIE
- # include "fopencookie.e"	/* Use our own fopencookie() */
-@@ -505,7 +506,7 @@
- 			const conststring path, Dictionary request,
- 			Dictionary response, int maxredirs, int *status)
- {
--  Boolean delete_response = !response;
-+  bool delete_response = !response;
-   conststring h, v;
-   char buf[BUFLEN];
-   int fd, n, i;

From 9c61317002edf32812d793aebac86a990edcd1cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Aug 2015 00:27:06 +0200
Subject: [PATCH 1497/2016] Put all firmware in $out/lib/firmware

This way, hardware.firmware can be a list of packages.
---
 nixos/modules/hardware/all-firmware.nix       |  4 +---
 .../hardware/video/encoder/wis-go7007.nix     |  8 +++----
 nixos/modules/services/hardware/udev.nix      | 22 +++++++++----------
 nixos/modules/system/activation/top-level.nix |  2 +-
 nixos/modules/system/boot/kernel.nix          |  2 +-
 .../linux/firmware/b43-firmware/5.1.138.nix   |  4 ++--
 .../linux/firmware/zd1211/default.nix         |  8 +++----
 pkgs/os-specific/linux/wis-go7007/default.nix |  2 +-
 8 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index e4bdeb55cad..1a04baef193 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -22,9 +22,7 @@ with lib;
   ###### implementation
 
   config = mkIf config.hardware.enableAllFirmware {
-    hardware.firmware = [
-      "${pkgs.firmwareLinuxNonfree}/lib/firmware"
-    ];
+    hardware.firmware = [ pkgs.firmwareLinuxNonfree ];
   };
 
 }
diff --git a/nixos/modules/hardware/video/encoder/wis-go7007.nix b/nixos/modules/hardware/video/encoder/wis-go7007.nix
index c0eb2b814b3..e9b3cf72a8d 100644
--- a/nixos/modules/hardware/video/encoder/wis-go7007.nix
+++ b/nixos/modules/hardware/video/encoder/wis-go7007.nix
@@ -5,11 +5,11 @@ let
 in
 
 {
-  boot.extraModulePackages = [wis_go7007];
+  boot.extraModulePackages = [ wis_go7007 ];
 
-  environment.systemPackages = [wis_go7007];
+  environment.systemPackages = [ wis_go7007 ];
 
-  hardware.firmware = ["${wis_go7007}/firmware"];
+  hardware.firmware = [ wis_go7007 ];
 
-  services.udev.packages = [wis_go7007];
+  services.udev.packages = [ wis_go7007 ];
 }
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index fc89de777e8..513eb27b406 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -171,25 +171,23 @@ in
     };
 
     hardware.firmware = mkOption {
-      type = types.listOf types.path;
+      type = types.listOf types.package;
       default = [];
       description = ''
-        List of directories containing firmware files.  Such files
+        List of packages containing firmware files.  Such files
         will be loaded automatically if the kernel asks for them
         (i.e., when it has detected specific hardware that requires
-        firmware to function).  If more than one path contains a
-        firmware file with the same name, the first path in the list
-        takes precedence.  Note that you must rebuild your system if
-        you add files to any of these directories.  For quick testing,
+        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.  Note that you can also
-        add firmware packages to this list as these are directories in
-        the nix store.
+        and add that directory to the list.
       '';
       apply = list: pkgs.buildEnv {
         name = "firmware";
         paths = list;
-        pathsToLink = [ "/" ];
+        pathsToLink = [ "/lib/firmware" ];
         ignoreCollisions = true;
       };
     };
@@ -236,7 +234,7 @@ in
       (isYes "NET")
     ];
 
-    boot.extraModprobeConfig = "options firmware_class path=${config.hardware.firmware}";
+    boot.extraModprobeConfig = "options firmware_class path=${config.hardware.firmware}/lib/firmware";
 
     system.activationScripts.udevd =
       ''
@@ -254,7 +252,7 @@ in
 
         # Allow the kernel to find our firmware.
         if [ -e /sys/module/firmware_class/parameters/path ]; then
-          echo -n "${config.hardware.firmware}" > /sys/module/firmware_class/parameters/path
+          echo -n "${config.hardware.firmware}/lib/firmware" > /sys/module/firmware_class/parameters/path
         fi
       '';
 
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 83930079816..a977ddb7bb4 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -50,7 +50,7 @@ let
 
         ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd
 
-        ln -s ${config.hardware.firmware} $out/firmware
+        ln -s ${config.hardware.firmware}/lib/firmware $out/firmware
       ''}
 
       echo "$activationScript" > $out/activate
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index ae868219aa4..ac40e8a49ac 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -216,7 +216,7 @@ in
       ];
 
     # The Linux kernel >= 2.6.27 provides firmware.
-    hardware.firmware = [ "${kernel}/lib/firmware" ];
+    hardware.firmware = [ kernel ];
 
     # Create /etc/modules-load.d/nixos.conf, which is read by
     # systemd-modules-load.service to load required kernel modules.
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
index 436f40712fc..1cc0e7ae4ca 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
   phases = [ "unpackPhase" "installPhase" ];
 
   installPhase = ''
-    mkdir $out
-    b43-fwcutter -w $out linux/wl_apsta.o
+    mkdir -p $out/lib/firmware
+    b43-fwcutter -w $out/lib/firmware linux/wl_apsta.o
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix
index 96e534e3b80..19cbdecca0c 100644
--- a/pkgs/os-specific/linux/firmware/zd1211/default.nix
+++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix
@@ -5,16 +5,16 @@ stdenv.mkDerivation rec {
   version = "1.5";
 
   name = "${pname}-${version}";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/zd1211/${name}.tar.bz2";
     sha256 = "04ibs0qw8bh6h6zmm5iz6lddgknwhsjq8ib3gyck6a7psw83h7gi";
   };
-  
+
   buildPhase = "true";
 
-  installPhase = "mkdir -p $out/zd1211; cp * $out/zd1211";
-  
+  installPhase = "mkdir -p $out/lib/firmware/zd1211; cp * $out/lib/firmware/zd1211";
+
   meta = {
     description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip";
     homepage = http://sourceforge.net/projects/zd1211/;
diff --git a/pkgs/os-specific/linux/wis-go7007/default.nix b/pkgs/os-specific/linux/wis-go7007/default.nix
index 53868672025..4dae68d4871 100644
--- a/pkgs/os-specific/linux/wis-go7007/default.nix
+++ b/pkgs/os-specific/linux/wis-go7007/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
     mkdir -p $out/etc/udev/rules.d
  
     makeFlagsArray=(KERNELSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source \
-        FIRMWARE_DIR=$out/firmware FXLOAD=${fxload}/sbin/fxload \
+        FIRMWARE_DIR=$out/lib/firmware FXLOAD=${fxload}/sbin/fxload \
         DESTDIR=$out SKIP_DEPMOD=1 \
         USE_UDEV=y)
   ''; # */

From e4610f2965c2ab60132344defa055792a658ea45 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Aug 2015 00:37:54 +0200
Subject: [PATCH 1498/2016] buildEnv: Support package priorities like nix-env

This gets rid of a bunch of collision warnings.
---
 nixos/modules/system/boot/modprobe.nix        |  1 +
 pkgs/build-support/buildenv/builder.pl        | 70 +++++++++++--------
 pkgs/build-support/buildenv/default.nix       | 10 ++-
 .../firmware-linux-nonfree/default.nix        |  1 +
 pkgs/os-specific/linux/nvidia-x11/default.nix |  1 +
 pkgs/os-specific/linux/util-linux/default.nix |  1 +
 pkgs/tools/archivers/cpio/default.nix         |  1 +
 7 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix
index a3b616ff3ef..c4938089966 100644
--- a/nixos/modules/system/boot/modprobe.nix
+++ b/nixos/modules/system/boot/modprobe.nix
@@ -35,6 +35,7 @@ with lib;
             fi
 
           '';
+        meta.priority = 4;
       };
       description = ''
         Wrapper around modprobe that sets the path to the modules
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 08331b178f4..798fca6572e 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -5,6 +5,7 @@ use Cwd 'abs_path';
 use IO::Handle;
 use File::Path;
 use File::Basename;
+use JSON::PP;
 
 STDOUT->autoflush(1);
 
@@ -17,7 +18,7 @@ sub isInPathsToLink {
     $path = "/" if $path eq "";
     foreach my $elem (@pathsToLink) {
         return 1 if
-            $elem eq "/" || 
+            $elem eq "/" ||
             (substr($path, 0, length($elem)) eq $elem
              && (($path eq $elem) || (substr($path, length($elem), 1) eq "/")));
     }
@@ -28,25 +29,27 @@ sub isInPathsToLink {
 # For each activated package, determine what symlinks to create.
 
 my %symlinks;
-$symlinks{""} = ""; # create root directory
+$symlinks{""} = ["", 0]; # create root directory
+
+my %priorities;
 
 sub findFiles;
 
 sub findFilesInDir {
-    my ($relName, $target, $ignoreCollisions) = @_;
+    my ($relName, $target, $ignoreCollisions, $priority) = @_;
 
     opendir DIR, "$target" or die "cannot open `$target': $!";
     my @names = readdir DIR or die;
     closedir DIR;
-    
+
     foreach my $name (@names) {
         next if $name eq "." || $name eq "..";
-        findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions);
+        findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $priority);
     }
 }
-    
+
 sub findFiles {
-    my ($relName, $target, $baseName, $ignoreCollisions) = @_;
+    my ($relName, $target, $baseName, $ignoreCollisions, $priority) = @_;
 
     # Urgh, hacky...
     return if
@@ -57,41 +60,48 @@ sub findFiles {
         $baseName eq "perllocal.pod" ||
         $baseName eq "log";
 
-    my $oldTarget = $symlinks{$relName};
+    my ($oldTarget, $oldPriority) = @{$symlinks{$relName} // [undef, undef]};
 
-    if (!defined $oldTarget) {
-        $symlinks{$relName} = $target;
+    # If target doesn't exist, create it. If it already exists as a
+    # symlink to a file (not a directory) in a lower-priority package,
+    # overwrite it.
+    if (!defined $oldTarget || ($priority < $oldPriority && ($oldTarget ne "" && ! -d $oldTarget))) {
+        $symlinks{$relName} = [$target, $priority];
+        return;
+    }
+
+    # If target already exists as a symlink to a file (not a
+    # directory) in a higher-priority package, skip.
+    if (defined $oldTarget && $priority > $oldPriority && $oldTarget ne "" && ! -d $oldTarget) {
         return;
     }
 
     unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) {
         if ($ignoreCollisions) {
-            warn "collision between `$target' and `$oldTarget'" if $ignoreCollisions == 1;
+            warn "collision between `$target' and `$oldTarget'\n" if $ignoreCollisions == 1;
             return;
         } else {
-            die "collision between `$target' and `$oldTarget'";
+            die "collision between `$target' and `$oldTarget'\n";
         }
     }
 
-    findFilesInDir($relName, $oldTarget, $ignoreCollisions) unless $oldTarget eq "";
-    findFilesInDir($relName, $target, $ignoreCollisions);
-    
-    $symlinks{$relName} = ""; # denotes directory
+    findFilesInDir($relName, $oldTarget, $ignoreCollisions, $oldPriority) unless $oldTarget eq "";
+    findFilesInDir($relName, $target, $ignoreCollisions, $priority);
+
+    $symlinks{$relName} = ["", $priority]; # denotes directory
 }
 
 
 my %done;
 my %postponed;
 
-sub addPkg;
-sub addPkg($;$) {
-    my $pkgDir = shift;
-    my $ignoreCollisions = shift;
+sub addPkg {
+    my ($pkgDir, $ignoreCollisions, $priority)  = @_;
 
     return if (defined $done{$pkgDir});
     $done{$pkgDir} = 1;
 
-    findFiles("", "$pkgDir", "", $ignoreCollisions);
+    findFiles("", $pkgDir, "", $ignoreCollisions, $priority);
 
     my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
     if (-e $propagatedFN) {
@@ -106,23 +116,25 @@ sub addPkg($;$) {
 }
 
 
-# Symlink to the packages that have been installed explicitly by the user.
-my @args = split ' ', $ENV{"paths"};
-
-foreach my $pkgDir (@args) {
-    addPkg($pkgDir, $ENV{"ignoreCollisions"} eq "1") if -e $pkgDir;
+# Symlink to the packages that have been installed explicitly by the
+# user.
+for my $pkg (@{decode_json $ENV{"pkgs"}}) {
+    for my $path (@{$pkg->{paths}}) {
+        addPkg($path, $ENV{"ignoreCollisions"} eq "1", $pkg->{priority}) if -e $path;
+    }
 }
 
 
 # Symlink to the packages that have been "propagated" by packages
-# installed by the user (i.e., package X declares that it want Y
+# installed by the user (i.e., package X declares that it wants Y
 # installed as well).  We do these later because they have a lower
 # priority in case of collisions.
+my $priorityCounter = 1000; # don't care about collisions
 while (scalar(keys %postponed) > 0) {
     my @pkgDirs = keys %postponed;
     %postponed = ();
     foreach my $pkgDir (sort @pkgDirs) {
-        addPkg($pkgDir, 2);
+        addPkg($pkgDir, 2, $priorityCounter++);
     }
 }
 
@@ -130,7 +142,7 @@ while (scalar(keys %postponed) > 0) {
 # Create the symlinks.
 my $nrLinks = 0;
 foreach my $relName (sort keys %symlinks) {
-    my $target = $symlinks{$relName};
+    my ($target, $priority) = @{$symlinks{$relName}};
     my $abs = "$out/$relName";
     next unless isInPathsToLink $relName;
     if ($target eq "") {
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 293291dc1da..2ae8123faca 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -9,10 +9,10 @@
 , # The manifest file (if any).  A symlink $out/manifest will be
   # created to it.
   manifest ? ""
-  
+
 , # The paths to symlink.
   paths
-  
+
 , # Whether to ignore collisions or abort.
   ignoreCollisions ? false
 
@@ -28,7 +28,11 @@
 }:
 
 runCommand name
-  { inherit manifest paths ignoreCollisions passthru pathsToLink postBuild;
+  { inherit manifest ignoreCollisions passthru pathsToLink postBuild;
+    pkgs = builtins.toJSON (map (drv: {
+      paths = [ drv ]; # FIXME: handle multiple outputs
+      priority = drv.meta.priority or 5;
+    }) paths);
     preferLocalBuild = true;
   }
   ''
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 259c5acdf87..a995b193a84 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
     license = licenses.unfreeRedistributableFirmware;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
+    priority = 6; # give precedence to kernel firmware
   };
 
   passthru = { inherit version; };
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index ab564c10e2e..cbd9a19777e 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -63,5 +63,6 @@ stdenv.mkDerivation {
     license = licenses.unfreeRedistributable;
     platforms = platforms.linux;
     maintainers = [ maintainers.vcunat ];
+    priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
   };
 }
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 7f2aeca255c..7768875ca57 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -53,5 +53,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.kernel.org/pub/linux/utils/util-linux/;
     description = "A set of system utilities for Linux";
     platforms = stdenv.lib.platforms.linux;
+    priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages
   };
 }
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index 2cd65391216..f2207b58849 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -35,5 +35,6 @@ stdenv.mkDerivation {
     homepage = http://www.gnu.org/software/cpio/;
     description = "A program to create or extract from cpio archives";
     platforms = stdenv.lib.platforms.all;
+    priority = 6; # resolves collision with gnutar's "libexec/rmt"
   };
 }

From c98685c737663689aab7c8bd56c75270869e4caf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 25 Aug 2015 02:09:49 +0200
Subject: [PATCH 1499/2016] netsniff-ng: 0.5.9-{85-g71c28ef -> 86-gd84a6b7}

---
 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 50f21abdb54..7d94a287968 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-85-g71c28ef"; in
+let version = "0.5.9-86-gd84a6b7"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "71c28eff00a8a8896c45fa20330b623d265ae5c7";
-    sha256 = "1d0k7dydy57fn2qx5mwwx5wplbgm90y9chc5q15m8phsh0nm13qi";
+    rev = "d84a6b7139f3c6d0eb70615543cf368350000e5b";
+    sha256 = "1vn84scds93chidcq1dvbwlwzyb935f3116hlgq1q4rwm0225g64";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From e8a55a43cfc7759d374f72a32a608c1c8d261de9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 25 Aug 2015 05:03:05 +0200
Subject: [PATCH 1500/2016] ccache: update 3.2.2 -> 3.2.3

---
 .../development/tools/misc/ccache/default.nix | 14 ++++----
 .../ccache/test-drop-perl-requirement.patch   | 36 -------------------
 2 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/ccache/test-drop-perl-requirement.patch

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index fad2d87cc17..41a6095a9a4 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,10 +1,9 @@
 { stdenv, fetchurl, runCommand, gcc, zlib }:
 
 let
-  # TODO: find out if there's harm in just using 'rec' instead.
   name = "ccache-${version}";
-  version = "3.2.2";
-  sha256 = "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag";
+  version = "3.2.3";
+  sha256 = "03k0fvblwqb80zwdgas8a5fjrwvghgsn587wp3lfr0jr8gy1817c";
 
   ccache =
 stdenv.mkDerivation {
@@ -14,16 +13,19 @@ stdenv.mkDerivation {
     url = "mirror://samba/ccache/${name}.tar.xz";
   };
 
-  patches = [ ./test-drop-perl-requirement.patch ];
-
   buildInputs = [ zlib ];
 
+  postPatch = ''
+    substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)'
+  '';
+
   doCheck = true;
 
   passthru = {
     # A derivation that provides gcc and g++ commands, but that
     # will end up calling ccache for the given cacheDir
-    links = extraConfig : (runCommand "ccache-links" { passthru.gcc = gcc; passthru.isGNU = true; }
+    links = extraConfig: (runCommand "ccache-links"
+      { passthru.gcc = gcc; passthru.isGNU = true; }
       ''
         mkdir -p $out/bin
         if [ -x "${gcc.cc}/bin/gcc" ]; then
diff --git a/pkgs/development/tools/misc/ccache/test-drop-perl-requirement.patch b/pkgs/development/tools/misc/ccache/test-drop-perl-requirement.patch
deleted file mode 100644
index ca4c39edc30..00000000000
--- a/pkgs/development/tools/misc/ccache/test-drop-perl-requirement.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Since perl is used in just one place and can easily be replaced by a
-little bit of shell, do so.  This makes testing on limited systems
-easier.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- INSTALL.txt | 1 -
- test.sh     | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/INSTALL.txt b/INSTALL.txt
-index 256beab..f77cbe6 100644
---- a/INSTALL.txt
-+++ b/INSTALL.txt
-@@ -67,7 +67,6 @@ In addition to the prerequisites mentioned above, you also need:
-
- To debug and run the performance test suite you'll also need:
-
--- Perl (http://www.perl.org/)
- - Python (http://www.python.org/)
-
- Run "./autogen.sh" and then follow the steps mentioned under "Installation"
-diff --git a/test.sh b/test.sh
-index f14e287..1090649 100755
---- a/test.sh
-+++ b/test.sh
-@@ -1834,7 +1834,7 @@ prepare_cleanup_test() {
-     mkdir -p $dir
-     i=0
-     while [ $i -lt 10 ]; do
--        perl -e 'print "A" x 4017' >$dir/result$i-4017.o
-+        printf '%4017s' '' | tr ' ' 'A' >$dir/result$i-4017.o
-         touch $dir/result$i-4017.stderr
-         touch $dir/result$i-4017.d
-         if [ $i -gt 5 ]; then
---

From 6ee8cad09154c83d767d20d17e599c7216ca2e76 Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Tue, 25 Aug 2015 07:59:50 +0200
Subject: [PATCH 1501/2016] syncthing: 0.11.20 -> 0.11.21

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 57e9cbe7e8a..1ee9e71e782 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.20";
+  version = "0.11.21";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "72092f2bfaaeb8c7c9264200f7d08c5e78f670f80a018dd70477c23c0fd88619";
+    sha256 = "2e7faf1002570a64ef76c6bbdde781c550db6c45b30f4fa1c394102809cad977";
   };
 
   subPackages = [ "cmd/syncthing" ];

From 87789ac39d6e93ec9f70e1a8deaabf4d5665b777 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 24 Aug 2015 14:36:21 +0200
Subject: [PATCH 1502/2016] Hide services.dbus.enable

Realistically, you can't disable D-Bus on a modern system.
---
 nixos/modules/services/system/dbus.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 5c20901427c..77427ce9606 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -73,6 +73,7 @@ in
       enable = mkOption {
         type = types.bool;
         default = true;
+        internal = true;
         description = ''
           Whether to start the D-Bus message bus daemon, which is
           required by many other system services and applications.

From e2a9541efcc2de656d40e641fe378218e5109383 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Aug 2015 11:11:51 +0200
Subject: [PATCH 1503/2016] buildEnv: Fix handling of empty list of packages

---
 pkgs/build-support/buildenv/builder.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 798fca6572e..a272a84261e 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -29,9 +29,11 @@ sub isInPathsToLink {
 # For each activated package, determine what symlinks to create.
 
 my %symlinks;
-$symlinks{""} = ["", 0]; # create root directory
 
-my %priorities;
+for my $p (@pathsToLink) {
+    $p = "" if $p eq "/";
+    $symlinks{$p} = ["", 0];
+}
 
 sub findFiles;
 

From aa3b13549fbd4d5da27bdf07b6cb66555e837b8e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 25 Aug 2015 11:26:32 +0200
Subject: [PATCH 1504/2016] Grmbl

http://hydra.nixos.org/build/24983009
---
 nixos/tests/chromium.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 52ae6a771e1..3624131b364 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -15,7 +15,7 @@ import ./make-test.nix (
   enableOCR = true;
 
   machine.imports = [ ./common/x11.nix ];
-  machine.virtualisation.memorySize = 2560;
+  machine.virtualisation.memorySize = 2047;
 
   startupHTML = pkgs.writeText "chromium-startup.html" ''
     <!DOCTYPE html>

From 60a0bb7f66fd51a5b935ed50f8f39a34a5fc55cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 20 Aug 2015 19:40:12 +0200
Subject: [PATCH 1505/2016] Make "nix-env -i wine" work again

Also, make wine32 the default again to prevent a huge closure size
regression. (It recently grew by ~1 GB:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.wineStable.x86_64-linux#tabs-charts)

Issue #8990.
---
 pkgs/misc/emulators/wine/packages.nix | 4 ++--
 pkgs/top-level/all-packages.nix       | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index 4d95dc911dc..ce983b99314 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -27,7 +27,7 @@ let sources = with lib.getAttr wineRelease (import ./versions.nix); {
     inherit (sources) version;
 in {
   wine32 = import ./base.nix {
-    name = "wine32-${version}";
+    name = "wine-${version}";
     inherit (sources) version src;
     inherit (pkgsi686Linux) lib stdenv;
     pkgArches = [ pkgsi686Linux ];
@@ -46,7 +46,7 @@ in {
     platforms = [ "x86_64-linux" ];
   };
   wineWow = import ./base.nix {
-    name = "wineWow-${version}";
+    name = "wine-wow-${version}";
     inherit (sources) version src;
     inherit lib;
     stdenv = stdenv_32bit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6363ec72668..3853efc66ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15149,14 +15149,13 @@ let
 
   wavegain = callPackage ../applications/audio/wavegain { };
 
-  # Wine defaults to a mixed 64 / 32 build on x86_64 and to pure 32 on x86
   wine = callPackage ../misc/emulators/wine {
     wineRelease = config.wine.release or "stable";
-    wineBuild = config.wine.build or (if system == "x86_64-linux" then "wineWow" else "wine32");
+    wineBuild = config.wine.build or "wine32";
   };
   wineStable = wine.override { wineRelease = "stable"; };
-  wineUnstable = wine.override { wineRelease = "unstable"; };
-  wineStaging = wine.override { wineRelease = "staging"; };
+  wineUnstable = lowPrio (wine.override { wineRelease = "unstable"; });
+  wineStaging = lowPrio (wine.override { wineRelease = "staging"; });
 
   winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
     inherit (gnome2) zenity;

From 66c3dff47c86c7288f6801fc4bab907b351da96c Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 20 Aug 2015 23:32:07 +0200
Subject: [PATCH 1506/2016] gnome3: Depend on defaultIconTheme instead of
 hicolor- or adwaita

---
 pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix    | 4 ++--
 pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix       | 7 +++----
 pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix     | 5 ++---
 pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix   | 6 +++---
 pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix         | 5 ++---
 pkgs/desktops/gnome-3/3.16/apps/glade/default.nix         | 5 ++---
 pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix   | 6 +++---
 pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix  | 6 +++---
 .../gnome-3/3.16/apps/gnome-documents/default.nix         | 4 ++--
 pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix    | 4 ++--
 pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix   | 7 +++----
 pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix | 5 ++---
 pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix  | 4 ++--
 pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix | 4 ++--
 pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix      | 6 +++---
 pkgs/desktops/gnome-3/3.16/core/baobab/default.nix        | 5 ++---
 pkgs/desktops/gnome-3/3.16/core/empathy/default.nix       | 6 +++---
 pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix      | 4 ++--
 .../gnome-3/3.16/core/gnome-calculator/default.nix        | 5 ++---
 .../desktops/gnome-3/3.16/core/gnome-contacts/default.nix | 5 ++---
 .../gnome-3/3.16/core/gnome-control-center/default.nix    | 2 +-
 .../gnome-3/3.16/core/gnome-dictionary/default.nix        | 5 ++---
 .../gnome-3/3.16/core/gnome-disk-utility/default.nix      | 5 ++---
 .../gnome-3/3.16/core/gnome-font-viewer/default.nix       | 5 ++---
 .../gnome-3/3.16/core/gnome-online-accounts/default.nix   | 4 ++--
 .../gnome-3/3.16/core/gnome-screenshot/default.nix        | 5 ++---
 pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix | 4 ++--
 .../gnome-3/3.16/core/gnome-shell-extensions/default.nix  | 6 ++----
 .../gnome-3/3.16/core/gnome-system-log/default.nix        | 5 ++---
 .../gnome-3/3.16/core/gnome-system-monitor/default.nix    | 5 ++---
 .../gnome-3/3.16/core/gnome-themes-standard/default.nix   | 4 ++--
 .../gnome-3/3.16/core/gnome-user-share/default.nix        | 5 ++---
 pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix       | 6 +++---
 pkgs/desktops/gnome-3/3.16/core/sushi/default.nix         | 8 ++++----
 pkgs/desktops/gnome-3/3.16/core/totem/default.nix         | 5 ++---
 pkgs/desktops/gnome-3/3.16/core/tracker/default.nix       | 7 +++----
 pkgs/desktops/gnome-3/3.16/core/vino/default.nix          | 7 +++----
 pkgs/desktops/gnome-3/3.16/core/yelp/default.nix          | 5 ++---
 pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix   | 4 ++--
 pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix | 4 ++--
 .../desktops/gnome-3/3.16/games/four-in-a-row/default.nix | 5 ++---
 pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix  | 4 ++--
 .../desktops/gnome-3/3.16/games/gnome-klotski/default.nix | 4 ++--
 .../gnome-3/3.16/games/gnome-mahjongg/default.nix         | 4 ++--
 pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix  | 4 ++--
 .../desktops/gnome-3/3.16/games/gnome-nibbles/default.nix | 4 ++--
 pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix | 5 ++---
 pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix | 5 ++---
 .../gnome-3/3.16/games/gnome-tetravex/default.nix         | 4 ++--
 pkgs/desktops/gnome-3/3.16/games/hitori/default.nix       | 4 ++--
 pkgs/desktops/gnome-3/3.16/misc/geary/default.nix         | 6 +++---
 .../gnome-3/3.16/misc/gnome-tweak-tool/default.nix        | 5 ++---
 pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix      | 6 +++---
 53 files changed, 119 insertions(+), 145 deletions(-)

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 294793d6af7..c8d33c24156 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
 , itstool, libxml2, python3, python3Packages, pyatspi, at_spi2_core
-, dbus, intltool, libwnck3, hicolor_icon_theme }:
+, dbus, intltool, libwnck3 }:
 
 stdenv.mkDerivation rec {
   name = "accerciser-3.14.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi
     python3Packages.pygobject3 python3Packages.ipythonLight
-    at_spi2_core dbus intltool libwnck3 hicolor_icon_theme
+    at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme
   ];
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
diff --git a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
index 5eb922994ee..99ea481307e 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, pkgconfig, glib
 , evolution_data_server, evolution, sqlite
-, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils
+, makeWrapper, itstool, desktop_file_utils
 , clutter_gtk, libuuid, webkitgtk, zeitgeist
 , gnome3, librsvg, gdk_pixbuf, libxml2 }:
 
@@ -20,9 +20,8 @@ stdenv.mkDerivation rec {
                   clutter_gtk libuuid webkitgtk gnome3.tracker
                   gnome3.gnome_online_accounts zeitgeist desktop_file_utils
                   gnome3.gsettings_desktop_schemas makeWrapper
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
-                  evolution_data_server evolution sqlite
-                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
+                  evolution_data_server evolution sqlite ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
index a77fe574709..d77740d3507 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3
+, pkgconfig, gtk3, glib, libnotify, gtkspell3
 , makeWrapper, itstool, shared_mime_info, libical, db, gcr, sqlite
 , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
 , libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }:
@@ -21,12 +21,11 @@ in stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gnome3.gtkhtml ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg db icu
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
                   gnome3.evolution_data_server libsecret libical gcr
                   webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
                   libcanberra_gtk3 bogofilter gnome3.libgdata sqlite
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
                   nss nspr libnotify procps highlight gnome3.libgweather
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
diff --git a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
index 122449eb4f5..88ced2b2b06 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
-, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }:
+, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
   name = "file-roller-${version}";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
 
   buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
-                  attr bzip2 acl gdk_pixbuf librsvg makeWrapper ];
+                  gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg
+                  makeWrapper ];
 
   preFixup = ''
     wrapProgram "$out/bin/file-roller" \
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
index 9263fd42476..c046dd7dc9b 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, enchant, isocodes
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , bash, makeWrapper, itstool, libsoup, libxml2
 , gnome3, librsvg, gdk_pixbuf, file }:
 
@@ -14,9 +14,8 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg libsoup
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup
                   gnome3.libpeas gnome3.gtksourceview libxml2
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
                   gnome3.gsettings_desktop_schemas makeWrapper file ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
index 24d7688e4de..3ead4de8bc4 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, python
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , makeWrapper, itstool, libxml2, docbook_xsl
 , gnome3, librsvg, gdk_pixbuf, libxslt }:
 
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python
                   gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg libxslt
-                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
index cc3640fd09f..10eaa34a8a2 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
@@ -2,7 +2,7 @@
 , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
 , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
 , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
-, hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio
+, desktop_file_utils, mtools, cdrkit, libcdio
 , libusb, libarchive, acl
 }:
 
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
     makeWrapper pkgconfig intltool itstool libvirt-glib glib
     gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
     libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
-    gdbm cyrus_sasl gnome3.adwaita-icon-theme libusb libarchive
-    librsvg hicolor_icon_theme desktop_file_utils acl
+    gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
+    librsvg desktop_file_utils acl
   ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
index 469581deef4..2308dd90434 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, libgweather, libnotify
-, pkgconfig, gtk3, glib, hicolor_icon_theme, gsound
+, pkgconfig, gtk3, glib, gsound
 , makeWrapper, itstool, libcanberra_gtk3, libtool
 , gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }:
 
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
                   gnome3.gsettings_desktop_schemas makeWrapper
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
                   gnome3.gnome_desktop gnome3.geocode_glib geoclue2
                   libgweather libnotify libtool gsound
-                  hicolor_icon_theme wrapGAppsHook ];
+                  wrapGAppsHook ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
index 98059d3ed13..fe6be2e8d4e 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, evince, gjs
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , makeWrapper, itstool, libxslt, webkitgtk
 , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
 , gobjectIntrospection, json_glib, inkscape, poppler_utils
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
                   docbook_xsl desktop_file_utils inkscape poppler_utils
                   gnome3.gsettings_desktop_schemas makeWrapper gmp
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg evince
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg evince
                   libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
                   gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
                   gnome3.gnome_desktop gnome3.libzapojit json_glib
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
index 23c77395a82..dbef0526b80 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libxml2, systemd, hicolor_icon_theme }:
+, intltool, itstool, libxml2, systemd }:
 
 stdenv.mkDerivation rec {
   name = "gnome-logs-${gnome3.version}.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    systemd hicolor_icon_theme
+    systemd gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
index 0193f00da4f..3a6de4bcf6f 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, gdk_pixbuf, tracker
 , python3, libxml2, python3Packages, libnotify, wrapGAppsHook
-, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo
+, pkgconfig, gtk3, glib, cairo
 , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
 
 stdenv.mkDerivation rec {
@@ -14,12 +14,11 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg python3
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg python3
                   gnome3.grilo gnome3.grilo-plugins libxml2 python3Packages.pygobject3 libnotify
                   python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  hicolor_icon_theme gnome3.adwaita-icon-theme wrapGAppsHook
                   gnome3.gsettings_desktop_schemas makeWrapper tracker ];
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
index 2b262c263ac..4c152777f2c 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libgtop, intltool, itstool, libxml2, hicolor_icon_theme
-, nmap, inetutils }:
+, libgtop, intltool, itstool, libxml2, nmap, inetutils }:
 
 stdenv.mkDerivation rec {
   name = "gnome-nettool-3.8.1";
@@ -12,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   propagatedUserEnvPkgs = [ nmap inetutils ];
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
index 83a732a01d5..a89cde7a111 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, exempi, libxml2
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , makeWrapper, itstool, gegl, babl, lcms2
 , desktop_file_utils, gmp, libmediaart, wrapGAppsHook
 , gnome3, librsvg, gdk_pixbuf, libexif }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata
                   gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg exempi
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg exempi
                   gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
                   gnome3.gnome_online_accounts gnome3.gnome_desktop
                   lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
index fff9ea5c08b..5fff782a2e8 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs
-, libgweather, intltool, itstool, hicolor_icon_theme }:
+, libgweather, intltool, itstool }:
 
 stdenv.mkDerivation rec {
   name = "gnome-weather-${gnome3.version}.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook gjs intltool itstool
-    libgweather hicolor_icon_theme
+    libgweather gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
index 3e7b7237313..3a28507fac1 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, vala
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , makeWrapper, itstool, gnupg, libsoup
 , gnome3, librsvg, gdk_pixbuf, gpgme
 , libsecret, avahi, p11_kit, openssh }:
@@ -22,9 +22,9 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
                   gnome3.gsettings_desktop_schemas makeWrapper gnupg
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg gpgme
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
                   libsecret avahi libsoup p11_kit vala gnome3.gcr
-                  hicolor_icon_theme gnome3.adwaita-icon-theme openssh ];
+                  openssh ];
 
   preFixup = ''
     wrapProgram "$out/bin/seahorse" \
diff --git a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
index eb93458ece5..54d2c065d94 100644
--- a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, vala, libgtop
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , bash, makeWrapper, itstool, libxml2
 , gnome3, librsvg, gdk_pixbuf, file }:
 
@@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
                   gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
-                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   preFixup = ''
     wrapProgram "$out/bin/baobab" \
diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
index 10e52fe9265..4c42c6c026d 100644
--- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
+, file, librsvg, gnome3, gdk_pixbuf
 , dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
 , clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
 , gcr, libsecret, folks, libpulseaudio, telepathy_mission_control
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
                   gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf
                   libnotify clutter libsoup gnutls libgee p11_kit
                   libcanberra_gtk3 telepathy_farstream farstream
-                  gnome3.adwaita-icon-theme hicolor_icon_theme 
-                  gnome3.gsettings_desktop_schemas file libtool librsvg ];
+                  gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas
+                  file libtool librsvg ];
 
   NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
                          "-I${dbus_libs}/include/dbus-1.0"
diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
index 72663122a54..5ec07d01b2e 100644
--- a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
@@ -2,7 +2,7 @@
 , bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
 , webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
 , sqlite, gcr, avahi, nss, isocodes, itstool, file, which
-, hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }:
+, gdk_pixbuf, librsvg, gnome_common }:
 
 stdenv.mkDerivation rec {
   name = "epiphany-${gnome3.version}.0";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file 
                   webkitgtk libsoup libsecret gnome_desktop libnotify libtool
                   sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg which gnome_common
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
                   gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
 
   NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
index 5ec87f1f879..a13ca33fc81 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig, libxml2
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, bash, gtk3, glib, makeWrapper
 , itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }:
 
 stdenv.mkDerivation rec {
@@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
                   libxml2 gnome3.gtksourceview mpfr gmp
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
index ea5a4243389..56491331684 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, evolution_data_server, db
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret
+, pkgconfig, gtk3, glib, libsecret
 , libchamplain, clutter_gtk, geocode_glib
 , bash, makeWrapper, itstool, folks, libnotify, libxml2
 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
@@ -26,9 +26,8 @@ stdenv.mkDerivation rec {
                   gnome3.gsettings_desktop_schemas makeWrapper file libnotify
                   folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
                   libxml2 libsoup gnome3.gnome_online_accounts nspr nss
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  gdk_pixbuf gnome3.defaulticontheme librsvg
                   libchamplain clutter_gtk geocode_glib
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
                   vala automake115x autoconf db ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index 0f95f322d13..1dfc76a2dd5 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
 , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
-, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
+, gdk_pixbuf, librsvg, libxkbfile, libnotify
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, python, libkrb5, networkmanagerapplet, networkmanager
 , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
index 9917fd4d15c..9e3906dbed1 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , bash, makeWrapper, itstool, libxml2
 , gnome3, librsvg, gdk_pixbuf, file }:
 
@@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg
-                            hicolor_icon_theme gnome3.adwaita-icon-theme ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
                   gnome3.gsettings_desktop_schemas makeWrapper ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
index b5261c214ad..ea29cda2961 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify
+, bash, gtk3, glib, makeWrapper, cracklib, libnotify
 , itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
 , libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
 
@@ -20,9 +20,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
                   libxslt libtool libsecret libpwquality cracklib
                   libnotify libdvdread libcanberra_gtk3 docbook_xsl
-                  gdk_pixbuf gnome3.adwaita-icon-theme
+                  gdk_pixbuf gnome3.defaultIconTheme
                   librsvg udisks2 gnome3.gnome_settings_daemon
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
                   gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
index 1523cf14d2e..39d5e71a5a3 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , bash, makeWrapper, itstool
 , gnome3, librsvg, gdk_pixbuf }:
 
@@ -18,8 +18,7 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
index a8e877039b2..ac285819e8f 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper
 , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
 , telepathy_glib, intltool, dbus_libs, icu, autoreconfHook
-, libsoup, docbook_xsl_ns, docbook_xsl, gnome3, hicolor_icon_theme
+, libsoup, docbook_xsl_ns, docbook_xsl, gnome3
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper
                   libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook
-                  docbook_xsl_ns docbook_xsl hicolor_icon_theme ];
+                  docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ];
 
   preFixup = ''
     for f in "$out/libexec/"*; do
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
index 559d084add1..c36e1b87d66 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, bash, gtk3, glib, makeWrapper
 , itstool, gnome3, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg
-                            hicolor_icon_theme gnome3.adwaita-icon-theme ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
                   gnome3.gsettings_desktop_schemas makeWrapper ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
index be1b4c0d2cd..bce31242dac 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg, hicolor_icon_theme }:
+, libxslt, intltool, makeWrapper, systemd, xorg }:
 
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt 
-      gnome3.gnome_settings_daemon xorg.xtrans hicolor_icon_theme
+      gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
       gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
index 1b17d1f1f53..d4e5d807e48 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
@@ -1,7 +1,5 @@
-{ stdenv, intltool, fetchurl, libgtop
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool
-, gnome3, file }:
+{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib
+, bash, makeWrapper, itstool, gnome3, file }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extensions-${gnome3.version}.1";
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
index 44af987dfe4..716f92a072d 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, bash, gtk3, glib, makeWrapper
 , itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
 
 stdenv.mkDerivation rec {
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg
-                            hicolor_icon_theme gnome3.adwaita-icon-theme ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
                   gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
index 94c7af904dd..353c8fcf4db 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, bash, gtk3, glib, makeWrapper
 , itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
 
 stdenv.mkDerivation rec {
@@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
                   gtkmm3 libgtop makeWrapper
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
                   gnome3.gsettings_desktop_schemas ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
index ff12622d28f..7bd689511d5 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2
-, gdk_pixbuf, hicolor_icon_theme }:
+, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
   name = "gnome-themes-standard-${gnome3.version}.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
   
   buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf
-                  hicolor_icon_theme ];
+                  gnome3.defaultIconTheme ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
index 3d2011c01c6..381f7d7c416 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused
+, pkgconfig, gtk3, glib, libxml2, gnused
 , bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd
 , gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
 
@@ -27,8 +27,7 @@ in stdenv.mkDerivation rec {
                      "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
-                  makeWrapper file gdk_pixbuf gnome3.adwaita-icon-theme librsvg
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg
                   nautilus libnotify libcanberra_gtk3 ];
 
   postInstall = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
index 1787734939d..cf3f06fef58 100644
--- a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnome3
-, glib, gtk3, gobjectIntrospection, python, pygobject3, hicolor_icon_theme
+, glib, gtk3, gobjectIntrospection, python, pygobject3
 }:
 
 let
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   version = "${majorVersion}.1";
 
   buildInputs =  [
-   intltool pkgconfig
-   glib gtk3 gobjectIntrospection python pygobject3 hicolor_icon_theme
+   intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3
+   gnome3.defaultIconTheme
   ];
 
   src = fetchurl {
diff --git a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
index 8f7c5675cc2..8e5a1e21f52 100644
--- a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
 , clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz
 , webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
-, gdk_pixbuf, librsvg, hicolor_icon_theme, gtk3 }:
+, gdk_pixbuf, librsvg, gtk3 }:
 
 stdenv.mkDerivation rec {
   name = "sushi-3.12.0";
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
 
   buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3
-                  clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg
-                  gnome3.adwaita-icon-theme hicolor_icon_theme 
-                  libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ];
+                  clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf
+                  librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk
+                  gnome3.evince icu makeWrapper ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
index d99a24bbfa2..41f220ec38b 100644
--- a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, gst_all_1
 , clutter_gtk, clutter-gst, pygobject3, shared_mime_info
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , bash, makeWrapper, itstool, libxml2, dbus_glib
 , gnome3, librsvg, gdk_pixbuf, file }:
 
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
                   gnome3.libpeas pygobject3 shared_mime_info dbus_glib
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg gnome3.gnome_desktop
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop
                   gnome3.gsettings_desktop_schemas makeWrapper file ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
index 4265d70a4f9..88e6da2ad2d 100644
--- a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, libxml2, upower
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , bash, makeWrapper, itstool, vala, sqlite, libxslt
 , gnome3, librsvg, gdk_pixbuf, file, libnotify
 , evolution_data_server, gst_all_1, poppler
@@ -27,12 +27,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
                   bzip2 gnome3.totem-pl-parser libxslt
                   gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg sqlite
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite
                   upower libnotify evolution_data_server gnome3.libgee
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
                   poppler icu taglib libjpeg libtiff giflib libvorbis
-                  exempi networkmanager libpng libexif libgsf libuuid
-                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+                  exempi networkmanager libpng libexif libgsf libuuid ];
 
   preConfigure = ''
     substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql"
diff --git a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
index c4082095918..dcfd7b08b08 100644
--- a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
@@ -1,6 +1,5 @@
 { stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
-, hicolor_icon_theme, gnome3
-, libnotify, file, telepathy_glib, dbus_glib }:
+, gnome3, libnotify, file, telepathy_glib, dbus_glib }:
 
 stdenv.mkDerivation rec {
   name = "vino-${versionMajor}.${versionMinor}";
@@ -15,8 +14,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
-                  dbus_glib telepathy_glib file makeWrapper ];
+                  gnome3.defaultIconTheme dbus_glib telepathy_glib file
+                  makeWrapper ];
 
   preFixup = ''
     wrapProgram "$out/libexec/vino-server" \
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
index 7f405707231..e48dcafb3cf 100644
--- a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite
+, file, librsvg, gnome3, gdk_pixbuf, sqlite
 , bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1
 , wrapGAppsHook }:
 
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite
                   libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
-                  librsvg gdk_pixbuf gnome3.adwaita-icon-theme
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  librsvg gdk_pixbuf gnome3.defaultIconTheme
                   gnome3.gsettings_desktop_schemas wrapGAppsHook
                   gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
 
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
index bc352101383..d4dfb7f0a8c 100644
--- a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, webkitgtk, intltool, hicolor_icon_theme }:
+, webkitgtk, intltool }:
 
 stdenv.mkDerivation rec {
   name = "devhelp-${gnome3.version}.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook webkitgtk intltool hicolor_icon_theme
+    pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
index 26af4d7286a..70e7184b338 100644
--- a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
+, librsvg, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "five-or-more-${gnome3.version}.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
index bf15f9f2bbb..292a54bf193 100644
--- a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libcanberra_gtk3, librsvg, libxml2
-, hicolor_icon_theme }:
+, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "four-in-a-row-${gnome3.version}.2";
@@ -12,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg
-    libxml2 hicolor_icon_theme
+    libxml2 gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
index 7161eb5cdaf..e80c6691e20 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, librsvg, libxml2, hicolor_icon_theme }:
+, intltool, itstool, librsvg, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-chess-${gnome3.version}.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
index 6afcc63e97f..cab2f194d49 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libxml2, intltool, itstool, hicolor_icon_theme }:
+, librsvg, libxml2, intltool, itstool }:
 
 stdenv.mkDerivation rec {
   name = "gnome-klotski-${gnome3.version}.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
index 5b5bdae87c0..73cb0cf6ceb 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
+, librsvg, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-mahjongg-${gnome3.version}.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
index e9af6c0fe4d..92aa5bd7219 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
+, librsvg, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-mines-${gnome3.version}.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
index 8fde848fe1f..673edff645d 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
 , librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool
-, libxml2, hicolor_icon_theme }:
+, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-nibbles-${gnome3.version}.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    librsvg libcanberra_gtk3 hicolor_icon_theme clutter_gtk
+    librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
index a4f94518425..306a9e40852 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra_gtk3, intltool, itstool, libxml2
-, hicolor_icon_theme }:
+, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-robots-${gnome3.version}.1";
@@ -12,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3
-    libxml2 hicolor_icon_theme
+    libxml2 gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
index 31b74cd285e..2a2f97d1e49 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra_gtk3, intltool, itstool, libxml2
-, hicolor_icon_theme }:
+, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-taquin-${gnome3.version}.1";
@@ -12,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3
-    intltool itstool libxml2 hicolor_icon_theme
+    intltool itstool libxml2 gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
index 37654f8fa33..2b577799307 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libxml2, intltool, itstool, hicolor_icon_theme }:
+, libxml2, intltool, itstool }:
 
 stdenv.mkDerivation rec {
   name = "gnome-tetravex-${gnome3.version}.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 hicolor_icon_theme
+    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
index d409ac1b3c3..bd6be7d43c5 100644
--- a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libxml2, intltool, itstool, hicolor_icon_theme }:
+, libxml2, intltool, itstool }:
 
 stdenv.mkDerivation rec {
   name = "hitori-${gnome3.version}.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
index 1cf656fe7dc..11655edded0 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala
 , makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
 , libnotify, libcanberra, libsecret, gmime
-, libpthreadstubs, hicolor_icon_theme, sqlite
+, libpthreadstubs, sqlite
 , gnome3, librsvg, gnome_doc_utils, webkitgtk }:
 
 let
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
                   vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite
-                  libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme gnome3.gcr
-                  gdk_pixbuf librsvg gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme ];
+                  libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr
+                  gdk_pixbuf librsvg gnome3.defaultIconTheme ];
 
   preConfigure = ''
     substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0'
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
index c078297c803..6600345060f 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, python, pygobject3, atk
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup
+, pkgconfig, gtk3, glib, libsoup
 , bash, makeWrapper, itstool, libxml2, python3Packages
 , gnome3, librsvg, gdk_pixbuf, file, libnotify }:
 
@@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
                   gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
                   python pygobject3 libnotify gnome3.gnome_shell
                   libsoup gnome3.gnome_settings_daemon gnome3.nautilus
                   gnome3.gnome_desktop ];
diff --git a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix
index 650d978277b..0440af440fe 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
   dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base,
-  glib, gobjectIntrospection, hicolor_icon_theme, telepathy_glib
+  glib, gobjectIntrospection, telepathy_glib
 }:
 
 stdenv.mkDerivation rec {
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
     makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer
     gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
     gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
-    gnome3.gnome_common gnome3.gnome_shell hicolor_icon_theme gtk3
-    telepathy_glib
+    gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib
+    gnome3.defaultIconTheme
   ];
 
   preBuild = ''

From 97dada000580870dc18adb6a6ec7cd20a33f1eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 25 Aug 2015 14:21:56 +0200
Subject: [PATCH 1507/2016] Make hydra build proxychains.

(cherry picked from commit 8f11a84c9145c4a1cf5fe182db31921070565efa)
---
 pkgs/tools/networking/proxychains/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix
index 2835c9016ab..0181f1891c6 100644
--- a/pkgs/tools/networking/proxychains/default.nix
+++ b/pkgs/tools/networking/proxychains/default.nix
@@ -11,5 +11,6 @@ stdenv.mkDerivation {
     description = "Proxifier for SOCKS proxies";
     homepage = http://proxychains.sourceforge.net;
     license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From d43496300e0064afa940c8fe822762983051793c Mon Sep 17 00:00:00 2001
From: Florian Baumann <flo@noqqe.de>
Date: Tue, 25 Aug 2015 15:27:58 +0200
Subject: [PATCH 1508/2016] fixed: mlmmj-recieve: No such file or directory

---
 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 db3a266d011..5843a6745f5 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -11,7 +11,7 @@ let
   listCtl = domain: list: "${listDir domain list}/control";
   transport = domain: list: "${domain}--${list}@local.list.mlmmj mlmmj:${domain}/${list}";
   virtual = domain: list: "${list}@${domain} ${domain}--${list}@local.list.mlmmj";
-  alias = domain: list: "${list}: \"|${pkgs.mlmmj}/mlmmj-receive -L ${listDir domain list}/\"";
+  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}" ];

From 012515ef2fecbd7e3b4028aa21dfcbd073a68801 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 25 Aug 2015 16:35:40 +0200
Subject: [PATCH 1509/2016] pecita: 5.0 -> 5.1

---
 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 3e5ad1655be..4156fb69069 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.0";
+  version = "5.1";
 
   src = fetchurl {
     url = "http://pecita.eu/b/Pecita.otf";
-    sha256 = "0agml1886jvb0j6jar8hjx4hfbz3n0msszyp625b96ilv09qrcyz";
+    sha256 = "0v2k6vvzl1f809h3lfld6zy5m56w1dn27xmdy3hjniv6j9xbhbs4";
   };
 
   phases = ["installPhase"];

From 2e1a49b35a6fe683b9ec452fa505690ceade9d60 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Aug 2015 22:05:53 +0200
Subject: [PATCH 1510/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/6e3963284cd7ae1baa801fcc1a9534aeceef5562
 with hackage2nix v20150807-65-g1cc6394

---
 .../haskell-modules/hackage-packages.nix      | 1718 +++++++++++------
 1 file changed, 1150 insertions(+), 568 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7e1975ba55c..1f04d3a3355 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2402,13 +2402,12 @@ self: {
      }:
      mkDerivation {
        pname = "Chart";
-       version = "1.5.1";
-       sha256 = "2f954bc60615fa0da39087e5f88e0726684b99ad9698c270cf28876545e6a14a";
+       version = "1.5.3";
+       sha256 = "85ea6abc853f497209268cc9ab06b13722a1fcfa95b59fc62cd517533ac3c55d";
        libraryHaskellDepends = [
          array base colour data-default-class lens mtl old-locale
          operational time vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "A library for generating 2D Charts and Plots";
        license = stdenv.lib.licenses.bsd3;
@@ -3341,8 +3340,8 @@ self: {
      }:
      mkDerivation {
        pname = "DSA";
-       version = "1";
-       sha256 = "94bb45c840e9f1579f37e14667f7223403ce02eb1b06def68e47d376643b464b";
+       version = "1.0.0";
+       sha256 = "1ab314a3912cbe7e45d966bf1bb6650f950bb36bd2711770197d225db5852173";
        libraryHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types ghc-prim
          integer-gmp SHA tagged
@@ -3352,6 +3351,7 @@ 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;
      }) {};
@@ -4168,8 +4168,8 @@ self: {
      }:
      mkDerivation {
        pname = "Earley";
-       version = "0.9.0";
-       sha256 = "5ec955f00c872cc585bc2dd82fec137f53b095fde73a498e2a0ca7e0eb8140aa";
+       version = "0.10.0";
+       sha256 = "6e018d7465cc3c2f9b34a3dd53502e5bffdb62aaf1e70da71065d175f7cf3e09";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
@@ -5384,8 +5384,8 @@ self: {
      }:
      mkDerivation {
        pname = "GLUT";
-       version = "2.7.0.1";
-       sha256 = "fb1ed80beed6dbf1b373839224d11932c20d1c1b571bef81101483099c459c4d";
+       version = "2.7.0.2";
+       sha256 = "f48d9b1f5a00df06490ad669b1615b6c966ca3f09dd7a193f2bc22730c70c363";
        libraryHaskellDepends = [
          array base containers OpenGL OpenGLRaw StateVar transformers
        ];
@@ -5409,6 +5409,7 @@ self: {
          linear OpenGL OpenGLRaw transformers vector
        ];
        libraryToolDepends = [ cpphs ];
+       jailbreak = true;
        description = "Miscellaneous OpenGL utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -7125,8 +7126,8 @@ self: {
      }:
      mkDerivation {
        pname = "HMap";
-       version = "1.2.6";
-       sha256 = "8424dcbcb903c49d369230e2c10421daf3a2e35f3ffb5ec4058f769213769b8a";
+       version = "1.2.7";
+       sha256 = "806cbac1e1571c814af76ccf4058c5d9577b99018fd0c7ee5de993b343c60577";
        libraryHaskellDepends = [
          base data-default hashable mtl unordered-containers
        ];
@@ -7573,8 +7574,8 @@ self: {
      }:
      mkDerivation {
        pname = "HTF";
-       version = "0.13.0.0";
-       sha256 = "a4b066e8589ee0f2574af6d592d6906c85cc2cf75846dff2f83f6adc3c302c53";
+       version = "0.13.1.0";
+       sha256 = "1cb469ee21766fb7ad56fb42469709fac06214f7a33c39880134dfc2ea0de847";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7682,6 +7683,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HUnit_1_3_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, filepath }:
+     mkDerivation {
+       pname = "HUnit";
+       version = "1.3.0.0";
+       sha256 = "e130db953a2310d2c256a3923af0250be6ea19317f7d369b56d48f84cf96a55c";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base deepseq filepath ];
+       homepage = "http://hunit.sourceforge.net/";
+       description = "A unit testing framework for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "HUnit-Diff" = callPackage
     ({ mkDerivation, ansi-terminal, base, Diff, groom, HUnit }:
      mkDerivation {
@@ -9407,8 +9421,8 @@ self: {
      }:
      mkDerivation {
        pname = "JuicyPixels";
-       version = "3.2.6";
-       sha256 = "f99e82c84d8eeff23ba57332ed4b89530bc1a739c3a8f4b670b07ac33bfc9a46";
+       version = "3.2.6.1";
+       sha256 = "8ca8a8ba99c3edc0d565dd2f5974888c79823e38f8e5a7a8ebf1fd32aa35d213";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -10565,6 +10579,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "MicrosoftTranslator" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, datetime, exceptions
+     , http-client, lens, text, transformers, url, wreq, xml
+     }:
+     mkDerivation {
+       pname = "MicrosoftTranslator";
+       version = "0.1.0.1";
+       sha256 = "0855cf30d5a70c5cc908c8c84e17e2c325cbc669fe678d074ae88253d23d3120";
+       libraryHaskellDepends = [
+         aeson base bytestring datetime exceptions http-client lens text
+         transformers url wreq xml
+       ];
+       jailbreak = true;
+       description = "Interface for Microsoft Translator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "MiniAgda" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy
      , haskell-src-exts, mtl, pretty
@@ -11804,8 +11835,8 @@ self: {
      }:
      mkDerivation {
        pname = "OpenAL";
-       version = "1.7.0.0";
-       sha256 = "5c427a07c1b26eaaa372dcc526a2c9d593b80021be5e81af75dea6d13f3a3984";
+       version = "1.7.0.1";
+       sha256 = "671987cb52152317e6bed01b20e09c031a20066ff3f76aa450965ec162971750";
        libraryHaskellDepends = [
          base ObjectName OpenGL StateVar transformers
        ];
@@ -11865,8 +11896,8 @@ self: {
      }:
      mkDerivation {
        pname = "OpenGL";
-       version = "2.12.0.1";
-       sha256 = "8b7cfc07cb4cc4a6c45910eeb9fdfe114be1f64090fa0705c3e550794c588ed5";
+       version = "2.13.0.0";
+       sha256 = "0f3b4d4dbe8630f405dcbddda3989cfe3811bf547b6e1cf6f8bcd45655ab9182";
        libraryHaskellDepends = [
          base bytestring GLURaw ObjectName OpenGLRaw StateVar text
          transformers
@@ -11894,8 +11925,8 @@ self: {
     ({ mkDerivation, base, mesa, transformers }:
      mkDerivation {
        pname = "OpenGLRaw";
-       version = "2.5.1.0";
-       sha256 = "33a4100bd89c762658263dc6e5725dd214761d16d5d73907ad42a4d72b11d8cd";
+       version = "2.5.2.1";
+       sha256 = "08c3302e4b543ebed9a8dd92bb2a16550ca7b224b7ddcc3df59135d32aacb845";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
@@ -14554,26 +14585,27 @@ self: {
 
   "Spock" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , case-insensitive, containers, directory, focus, hashable, hspec
-     , hspec-wai, http-types, hvect, list-t, monad-control, mtl
-     , old-locale, path-pieces, random, reroute, resource-pool
-     , resourcet, stm, stm-containers, text, time, transformers
-     , transformers-base, unordered-containers, vault, wai, wai-extra
-     , warp
+     , case-insensitive, containers, crypto-random, directory, focus
+     , hashable, hspec, hspec-wai, http-types, hvect, list-t
+     , monad-control, mtl, old-locale, path-pieces, random, reroute
+     , resource-pool, resourcet, stm, stm-containers, text, time
+     , transformers, transformers-base, unordered-containers, vault, wai
+     , wai-extra, warp
      }:
      mkDerivation {
        pname = "Spock";
-       version = "0.8.1.0";
-       sha256 = "d9e62dba8c757b9877010c4ecbc2e79de519cf14a54c919fc99eda3a1c2e70d6";
+       version = "0.9.0.0";
+       sha256 = "f12419a63f9d0324c0338b05b3f44f0ec6c8790c3b21bfaff7c1ad154cb8fea6";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
-         directory focus hashable http-types hvect list-t monad-control mtl
-         old-locale path-pieces random reroute resource-pool resourcet stm
-         stm-containers text time transformers transformers-base
-         unordered-containers vault wai wai-extra warp
+         crypto-random directory focus hashable http-types hvect list-t
+         monad-control mtl old-locale path-pieces random reroute
+         resource-pool resourcet stm stm-containers text time transformers
+         transformers-base unordered-containers vault wai wai-extra warp
        ];
        testHaskellDepends = [
-         base bytestring hspec hspec-wai http-types reroute stm text wai
+         base bytestring hspec hspec-wai http-types reroute stm text
+         unordered-containers wai wai-extra
        ];
        homepage = "http://www.spock.li";
        description = "Another Haskell web framework for rapid development";
@@ -14600,8 +14632,8 @@ self: {
      }:
      mkDerivation {
        pname = "Spock-digestive";
-       version = "0.1.0.1";
-       sha256 = "d453585fb08777a67e80ae25f1c6e390097e2f4827e0510f6c550ee2cb36e68c";
+       version = "0.2.0.0";
+       sha256 = "e5571d88d7b9dcafc7f5c364c8499a1d8d698d1698f2615b5f26698c85080260";
        libraryHaskellDepends = [
          base digestive-functors http-types mtl Spock text
          unordered-containers wai
@@ -15125,11 +15157,12 @@ self: {
        pname = "TestExplode";
        version = "0.1.0.0";
        sha256 = "4133d9f69e7df366ac374ccb42bd9801ae66c0cd29f9f20ab849d1d8f8e79664";
+       revision = "1";
+       editedCabalFile = "ea885fd1fbb40a306229b73181330b31510c155257499b442dd94fa8b54bf3fc";
        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;
@@ -17344,8 +17377,8 @@ self: {
      }:
      mkDerivation {
        pname = "acid-state";
-       version = "0.12.4";
-       sha256 = "4d2db186740e8d33fab5c6fd7ef2364e0f6bc39bdf58be845fb0a57893b86255";
+       version = "0.13.0";
+       sha256 = "127adb9833be5b1cb6eb25f21d48dd976a0e39a4b5919095b6d03af314b85637";
        libraryHaskellDepends = [
          array base bytestring cereal containers directory
          extensible-exceptions filepath mtl network safecopy stm
@@ -17356,6 +17389,27 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "acid-state-dist" = callPackage
+    ({ mkDerivation, acid-state, base, bytestring, cereal
+     , concurrent-extra, containers, directory, filepath, mtl, random
+     , safe, safecopy, semigroups, stm, transformers, zeromq4-haskell
+     }:
+     mkDerivation {
+       pname = "acid-state-dist";
+       version = "0.1.0.1";
+       sha256 = "868d3c28720d6757609ee8247634a04d49884cf0a049b1fca8fe542ddcc69eab";
+       libraryHaskellDepends = [
+         acid-state base bytestring cereal concurrent-extra containers
+         filepath mtl safe safecopy semigroups stm transformers
+         zeromq4-haskell
+       ];
+       testHaskellDepends = [
+         acid-state base directory mtl random safecopy
+       ];
+       description = "A replication backend for acid-state";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "acid-state-tls" = callPackage
     ({ mkDerivation, acid-state, base, directory, HsOpenSSL, network
      , safecopy
@@ -19492,20 +19546,20 @@ self: {
 
   "amazonka" = callPackage
     ({ mkDerivation, amazonka-core, base, bytestring, conduit
-     , conduit-extra, directory, exceptions, free, http-client
-     , http-conduit, ini, lens, mmorph, monad-control, mtl, resourcet
-     , retry, tasty, tasty-hunit, text, time, transformers
-     , transformers-base, transformers-compat
+     , conduit-extra, directory, exceptions, http-client, http-conduit
+     , ini, lens, mmorph, monad-control, mtl, resourcet, retry, tasty
+     , tasty-hunit, text, time, transformers, transformers-base
+     , transformers-compat
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "1.0.1";
-       sha256 = "36583da0607497b69668bc9100373031d24cc64eb467e06676b409358d4c061a";
+       version = "1.1.0";
+       sha256 = "60a65271453aedff93b9789e52f258ea6b6fe315a26f361710a50a825167a2c3";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
-         exceptions free http-client http-conduit ini lens mmorph
-         monad-control mtl resourcet retry text time transformers
-         transformers-base transformers-compat
+         exceptions http-client http-conduit ini lens mmorph monad-control
+         mtl resourcet retry text time transformers transformers-base
+         transformers-compat
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/brendanhay/amazonka";
@@ -19519,8 +19573,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "1.0.1";
-       sha256 = "a74e6157a99285f556edb546ea1876507b197b1392bebcdf5f7d0ac4e418d702";
+       version = "1.1.0";
+       sha256 = "0ed84582688b21076214a24ba5d31a3f25f3ee7765ed0c18d44fe0459d4101ca";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19539,8 +19593,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "1.0.1";
-       sha256 = "b09f594282e3e5fc13b0de3cd4f562ba9c9bfec96973d5aeba334f32a5f88fe6";
+       version = "1.1.0";
+       sha256 = "70d06d56987589915ac6011badf3c1f5d336814f99c09cd99424f3af312b9bf2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19559,8 +19613,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "1.0.1";
-       sha256 = "82e0d72534717397395a2109af59725b86bb9361610b1143e7bac58b7ff1c948";
+       version = "1.1.0";
+       sha256 = "c931a4e78ffa1e81023dc1b306c4f2195be09b0246ef7b8022311421ef78c01c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19579,8 +19633,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "1.0.1";
-       sha256 = "88be89b5bacd848704f28ecf0544e6d9dfffa05f67e3f9317d64b17ec2caaac9";
+       version = "1.1.0";
+       sha256 = "b9f6ad65225dfd1eb0560a2a71a52991560ef4e69654b0053f37414c22080875";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19599,8 +19653,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "1.0.1";
-       sha256 = "9476d436b0ea895edc0aa3b0ee36458cfeea35faaee8e5b9fcc653ee5c47f027";
+       version = "1.1.0";
+       sha256 = "3e22407422a823f86eeff6685ccc71a4b775ed8962522d70ec49092f09c8b8ae";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19619,8 +19673,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "1.0.1";
-       sha256 = "b2dd61ab239b00e884be45b305f5587ec66dbe031c4d65f93d00f297eb4400c5";
+       version = "1.1.0";
+       sha256 = "8f6f6ce4ce0194d0f51c6b9ed9a71a0e270c5385a4c3dd63589c6d66cfdf6872";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19639,8 +19693,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "1.0.1";
-       sha256 = "c4aedc71e6d8d18befcd90573c664a859d6a5952711512b57eba596726ddcff9";
+       version = "1.1.0";
+       sha256 = "a10e4dfbbef7058f8e21c5afb3f3b8108880c26bf163b8cfb048fa91ef47a4ea";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19659,8 +19713,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "1.0.1";
-       sha256 = "5562fb8ffbd5485091b7f0a8a1b6d4ab533371804341dd352c6de97fe8297233";
+       version = "1.1.0";
+       sha256 = "6f9d2ac648899c775daeac0ed2a80e83c16876497762b8a99afc600e6f4546e9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19679,8 +19733,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "1.0.1";
-       sha256 = "c8d16042fb42fe562a754467d3f3be13ab1dc7c862d5dd6467864fd9cdc5b551";
+       version = "1.1.0";
+       sha256 = "8c3c9553f43f1312881f22da35a34ad404101f3b790d2734590abd4ce5dbcfb7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19699,8 +19753,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codecommit";
-       version = "1.0.1";
-       sha256 = "a930435da46193d2a8a648fbe0d741f009b3c524127a60989740cb46e692013e";
+       version = "1.1.0";
+       sha256 = "abe54fee07ff52883343780cade09238da0e41d23ecc95fa9c1e3f9a8743b78a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19719,8 +19773,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "1.0.1";
-       sha256 = "77be78235ebefc1f1f08a7db8b800bcd06a7dafe37c5f69413543f08926628c1";
+       version = "1.1.0";
+       sha256 = "0b5832f433693ea1238a0391c19765d975b24425c378ae6688ba358849ed758c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19739,8 +19793,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codepipeline";
-       version = "1.0.1";
-       sha256 = "6f573007d05e22f6afda550b8d0f61bde15ddfbe8e700779207fd78c7546b819";
+       version = "1.1.0";
+       sha256 = "8b892d604355caea388c8680712b8e03cee1fd85c9275cb118009cbf4f1ee7e0";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19759,8 +19813,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "1.0.1";
-       sha256 = "87fe6bdcdb3f6056180c48e5b9c1d57ff64aa953e5763e93d8b28cd2d5ffe2f7";
+       version = "1.1.0";
+       sha256 = "a154b6645d58211b3ebeb9407a4683ae85f6a1069d9c4027da664a34b471910e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19779,8 +19833,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "1.0.1";
-       sha256 = "7dc187fc5269bba71ac05e0bdae22c08d9fd0e1988263e0828fe7f9cec4e614d";
+       version = "1.1.0";
+       sha256 = "0a831859befa66f52636384f3e70217e0a804d9267135010034bc047ba2c5f75";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19799,8 +19853,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "1.0.1";
-       sha256 = "317ed1ec7dc99e06068fb600f21be98b05dd61a73dd0d140ed644774fb81d33a";
+       version = "1.1.0";
+       sha256 = "960c9381c50aa26bcf5bb05704ede000ef9614488ea9f428f7d1ae6eba7c886b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19824,8 +19878,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "1.0.1";
-       sha256 = "e432d7b5510685dd37688a632e3a17a8968cb3b1e08537257c054fa8f9eda946";
+       version = "1.1.0";
+       sha256 = "fe4b3185f61ad56e3dfddcd5050d3cfa41a997fd3c5b74ec8ed24404dada2cb6";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit conduit-extra cryptonite exceptions hashable http-client
@@ -19849,8 +19903,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "1.0.1";
-       sha256 = "d8b88c9a51eab9110650ea9e40f09950e8df2c20264cbc629b8a29c50b252dc2";
+       version = "1.1.0";
+       sha256 = "8c72a767f8b3546dd0e895035edfcc3a6e0fe060a2398e973938addfca7b4ce5";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19869,8 +19923,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-devicefarm";
-       version = "1.0.1";
-       sha256 = "9b23b6c2853b073635c8e6e76026ffa2cccd705bd7d958fa6dd2c4785a887297";
+       version = "1.1.0";
+       sha256 = "3c99376995534299985d2163d8cf55938d925f08c3e214b5f3567a26f4515ab1";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19889,8 +19943,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "1.0.1";
-       sha256 = "8fc02b3ade3970117e13b2b133235c006a21914e91269cb42d63d712501d013a";
+       version = "1.1.0";
+       sha256 = "5ec6240b4fe226859b51e325f44f566c21a93ff91d628b6d9eafeb823152e74b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19909,8 +19963,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ds";
-       version = "1.0.1";
-       sha256 = "523f0fb329f502115aed6b1aafc7efd96ac8233d56de05379465fe3c3b7ddbf1";
+       version = "1.1.0";
+       sha256 = "19de365fedf51d8da57c5099e04e6d827b3c3b4b3f9aacc7e78d7bf7a9def542";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19929,8 +19983,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "1.0.1";
-       sha256 = "85194e782b7a44ff914af01cdc8d5c3e8285031f0b23a07ef37020c0798c9bfb";
+       version = "1.1.0";
+       sha256 = "b4cc74ff79ab032a06cbf7245db1d8734cf9946625a9bf00fe4974dcb8628f45";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19949,8 +20003,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-streams";
-       version = "1.0.1";
-       sha256 = "edfcfc6e4281012cbec96f2b96416cf8c3e0e2313388d677e78f4ff8e51d94f7";
+       version = "1.1.0";
+       sha256 = "04e4eb5b332a455d4ac40824a60a07b47c8bc73aa89d82ce85bb944b0f2cde11";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19969,8 +20023,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "1.0.1";
-       sha256 = "fd0ec9d15a97195472be403b9d8c03cdcd2f70daf4beec326c360083479d37ec";
+       version = "1.1.0";
+       sha256 = "c715cd05ee79755de37df834d5315041c5d582004720d7e3b18c2fa2ff28deb7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19989,8 +20043,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "1.0.1";
-       sha256 = "77e78bf43efd1c3fb77b0d2a6cbab5140ffe13c7e8fcc22cbe7e509d73f978e8";
+       version = "1.1.0";
+       sha256 = "82eb9b0a963885a6c2d846e2497cf39519c8f6a07315a6cb8d07cd88246376d6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20009,8 +20063,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-efs";
-       version = "1.0.1";
-       sha256 = "9ff36087cc77bf044b515e6a8fc11f4067ab76372e02b3cb7b8dadfb3ad697a2";
+       version = "1.1.0";
+       sha256 = "daf42240c49d66cbc715bcc2cace1f430e81b3cc78ce0e2455475f9706e4ae42";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20029,8 +20083,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "1.0.1";
-       sha256 = "638d40a60b59e020cad3dac813563be07b5f698fd9b602784f3ac344c013ca15";
+       version = "1.1.0";
+       sha256 = "edc2f2e5a67c1b409b93b60862dd7b1303201d2b59b3e19931e8bde9a948e277";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20049,8 +20103,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "1.0.1";
-       sha256 = "43dc5564b2183011340d9751b7c4a1cf8197b215b9b857c78d68c70a35c050cb";
+       version = "1.1.0";
+       sha256 = "d45f9ebdda89b89f461948438e1c2d0e4eb1e7a0ab2fed229203fc29d027ed35";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20069,8 +20123,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "1.0.1";
-       sha256 = "5bac9e2c04f4c775ee7018a2073f5141fa5f062467f4eeba91e9a64e03525298";
+       version = "1.1.0";
+       sha256 = "f5ea457def994de22b4bc8c471ecf2355c4acf80d44c022e34d92ffdd8606500";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20089,8 +20143,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "1.0.1";
-       sha256 = "4c9a033830f09147953ffc7c58c39856e1a7c62d600267029bdfce7acf786b52";
+       version = "1.1.0";
+       sha256 = "2f3e4a8971545bf39bedf5a75854c21733a797598318e076f2a468d8f5647a96";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20109,8 +20163,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "1.0.1";
-       sha256 = "e1f289ca504d4220d1a28f055ba01cbf2e87ce42ce3ff6525a6dc1f4adaa6b96";
+       version = "1.1.0";
+       sha256 = "29f4c25ff4cdcd83809afa9fdc5e70a8bf89c6b1e4bcdfc7367faade023566bc";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20129,8 +20183,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "1.0.1";
-       sha256 = "4a6d67f4ac6b34316281810d10b46b46e34fd6869bbf463ef6fa6c8257da28ad";
+       version = "1.1.0";
+       sha256 = "61f954b805f51ca436a01f42e9068674540c3828b269e6c1547aedd976516b91";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20149,8 +20203,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "1.0.1";
-       sha256 = "63d8091722baa876de7a04e92387f4b3015e7194fed25a0e0da9f6ec7ecdb441";
+       version = "1.1.0";
+       sha256 = "9b52ae4b69126b24be8e7dac78aab91c7b14b0ab1c162fe2e8b8e831f5e41991";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20169,8 +20223,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "1.0.1";
-       sha256 = "281e37c37bdc5d175723ba8b428c63be3a1a543d2e66ace7f8f288e7419e82fc";
+       version = "1.1.0";
+       sha256 = "7682771e6a51a96a69c8a5c8176b33a944b598d84a353884287b8b3183b2a5a9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20189,8 +20243,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "1.0.1";
-       sha256 = "f942f5a7c13d1dccd98ec52529d24e7cc26bf87d729271c00ea752255e22cd40";
+       version = "1.1.0";
+       sha256 = "0103f032d0ebbd562a7e510897cb50f5bed8383fbbc7ac7868564ab57fa7a0e7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20209,8 +20263,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "1.0.1";
-       sha256 = "9fc90213cb962c1fe6d49b188bb4e3c4b08db7a9820d25bdda2600b4fc0e9681";
+       version = "1.1.0";
+       sha256 = "0c9f0d02cc5fdf1ef64b0446d82718277c3570f761b0644504ee90d842f78b9a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20229,8 +20283,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "1.0.1";
-       sha256 = "09b29ce0649e01ce74717f0ba9379dbf98993b217652bb310e7136c288c1b8f9";
+       version = "1.1.0";
+       sha256 = "07d43e6d4585a09139006708e831c7e713c1b33dbc711cc08fd6c723ace589f3";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20249,8 +20303,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "1.0.1";
-       sha256 = "6a670ff312be363929409768d3172a28bf7cd549764038f1aa71fd31e2930436";
+       version = "1.1.0";
+       sha256 = "ef09c86c1ccf257d4dd53627a75213015482e2ce18d1c5a85b4017bb215563dc";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20269,8 +20323,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "1.0.1";
-       sha256 = "998f65d4b6dc4a43959f7c1f2380af5e5f4fa588bc181a793eb4f3eadee5078d";
+       version = "1.1.0";
+       sha256 = "9ac85226c177d59135f7fde294202951b5415e9a0afbe1b7a2b2c7f57f2531c0";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20289,8 +20343,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "1.0.1";
-       sha256 = "f10aa66616746f3ef5728fe50f6ce9506b13a0d9e0dab95edd4aeeb2b6a3eca0";
+       version = "1.1.0";
+       sha256 = "8081408044b167cde41e466073d4acd8e4732b2586c0fa637a5a323e84447b02";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20309,8 +20363,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "1.0.1";
-       sha256 = "2a10e70b53d5fc8e723660a595d521e6e4b7f0acd16430cf9a63e2199ab86e9c";
+       version = "1.1.0";
+       sha256 = "688e017fd663b915a80d37954bd3b48deccc5d9e90b18770ff91af46ddd9c01b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20329,8 +20383,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "1.0.1";
-       sha256 = "e559cce14249db7d13282bc376b9a5c42719d795da20cfc420c3b95afcfa26a9";
+       version = "1.1.0";
+       sha256 = "dde78c3ff32eb00e3342d89426ec9f6792e3ecb40af378525e74141b415c0436";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20349,8 +20403,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "1.0.1";
-       sha256 = "fa4e85bbe0ccf8875cd08b601b69db8fba038046c66e9b65219fecd6b3105fc3";
+       version = "1.1.0";
+       sha256 = "cc4e138341b187146ac10d52430abebcf1780846ace4482d838b3f1053abb9b2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20369,8 +20423,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "1.0.1";
-       sha256 = "2ba4b833b1ccb7d3ca4ac46ae88cf522951972b428987e78328e14766f77f5c4";
+       version = "1.1.0";
+       sha256 = "7cdb79c15c0f1152e40a464d7fd1cc6edf1526d40ca1e7f8d33d0968acdc6e71";
        libraryHaskellDepends = [ amazonka-core base lens text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20389,8 +20443,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "1.0.1";
-       sha256 = "dad868bcae8795c9e8e0719ae18bb99514d7a8bd4ee373e194531a0120e4061c";
+       version = "1.1.0";
+       sha256 = "fe6b9a82edc028b2895e14a5ed2f4d4efdd6c13328a87d18c1215fc2baa35cb7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20409,8 +20463,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "1.0.1";
-       sha256 = "d6ded081d5dded1b58b46d49255773e633bceb7d7526960e06dc40f0ea60bfce";
+       version = "1.1.0";
+       sha256 = "39b2031ca579c11992f093c9c6915133e4b182105434adb44823f3d0a56aeafd";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20429,8 +20483,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "1.0.1";
-       sha256 = "eccab0209ca98f037e1e21abff164c4f6f29836e57b06bf307a97eab465bbbd7";
+       version = "1.1.0";
+       sha256 = "be2609584bb6e0af18af5b3a25c1281a0f665d993d8b8c14b310aba56287a3cf";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20449,8 +20503,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "1.0.1";
-       sha256 = "abf01ab527d589cc0f30d0ded41b88fb522cb003130063c1f56a8e92e1315161";
+       version = "1.1.0";
+       sha256 = "9bfb0cf6d07f1019bcfeeb4169c0a6dd6147e1eb9132b04f4cf256bbc8b7bcfd";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20469,8 +20523,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "1.0.1";
-       sha256 = "2aa03de9ff893045894c9873ef466100d2449e0ea5f7af3549559807a8209193";
+       version = "1.1.0";
+       sha256 = "3be89223c0c1110778bfeb32aeb3ed0b4fcdf85aedfce8c0a67ece34f1619f18";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20489,8 +20543,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "1.0.1";
-       sha256 = "676e938699d2ec73abab356c0a0a358067710ce3bf7bb210970afe90f01fd26e";
+       version = "1.1.0";
+       sha256 = "d3a8cd4205254d65e482ed96114cb98d233deb26d25a04a5f45b82dab01a6e0a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20509,8 +20563,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "1.0.1";
-       sha256 = "ee7f9e97fc8da24440781513995fbc5afded54a4ecc465a3d46511c22f2bd9a6";
+       version = "1.1.0";
+       sha256 = "566b295c705d94a91f479f82414cd3487e8e5872e1287d45d0d686670c024fb5";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20529,8 +20583,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "1.0.1";
-       sha256 = "4510faae1b970b48cd35519504edaa9f6f43c49ad97003c1893f34346d4483f6";
+       version = "1.1.0";
+       sha256 = "fd16936656d8d49b35c965945a886659c3f996fd4234843dfba7fb15152eb58f";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20549,8 +20603,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "1.0.1";
-       sha256 = "84b940ed61beb7744807eb613fe8a9897f51ef609efed8f568f5d2b02e534c48";
+       version = "1.1.0";
+       sha256 = "85184fd03d9e0181f7f2ba7b4c1ad14b2ce46235fc5814659e3bee8e5437d323";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20569,8 +20623,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "1.0.1";
-       sha256 = "1d110c2d674a53be3266d1c480d7adba18bd12706fb78bb81b9e26acc56cb53c";
+       version = "1.1.0";
+       sha256 = "0e7b0cc339022a304245f054d04e153671eaff927ad1e13c0f632bad7746ac56";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20885,8 +20939,8 @@ self: {
     ({ mkDerivation, base, unix }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.6.2.1";
-       sha256 = "965a38671ddd195b243af9d0284faedb52b852eace5f7cced11e6fcf2e47b7f6";
+       version = "0.6.2.2";
+       sha256 = "da082cfcbd7f65b808adea6c9915ad58643b8a22c7bcd21d3dbaf091828dd4bf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base unix ];
@@ -21162,22 +21216,21 @@ self: {
 
   "api-builder" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
-     , containers, hspec, HTTP, http-client, http-client-tls
-     , http-conduit, http-types, text, transformers
+     , containers, hspec, HTTP, http-client, http-client-tls, http-types
+     , text, transformers
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.10.0.0";
-       sha256 = "3bf1e59d1f1b60c646898e99465cfddd3ee97fd75d2f1620222cdb9a1fb8eb5f";
+       version = "0.11.0.0";
+       sha256 = "d8df94d14ffa9f0e60c88cf75eb221281c89251af67ac0a2068b3f774a0916c7";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring HTTP http-client http-client-tls
          http-types text transformers
        ];
        testHaskellDepends = [
-         aeson base bytestring Cabal containers hspec http-conduit text
+         aeson base bytestring Cabal containers hspec http-client text
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/intolerable/api-builder";
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -21703,6 +21756,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apportionment" = callPackage
+    ({ mkDerivation, base, containers, utility-ht }:
+     mkDerivation {
+       pname = "apportionment";
+       version = "0.0.0.2";
+       sha256 = "352d9564ffdb01d3312a1087f8badc544b3478185cbc27d4ca29fc1f18c9f82b";
+       libraryHaskellDepends = [ base containers utility-ht ];
+       homepage = "http://hub.darcs.net/thielema/apportionment";
+       description = "Round a set of numbers while maintaining its sum";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "approx-rand-test" = callPackage
     ({ mkDerivation, base, Chart, Chart-diagrams, colour, conduit
      , containers, data-default, data-default-class, filepath, HUnit
@@ -23645,8 +23710,8 @@ self: {
      }:
      mkDerivation {
        pname = "avers";
-       version = "0.0.9";
-       sha256 = "75a6040f0713f683ec4271c257514ed6a9a9f62315fb5471156f6f2016c18f7d";
+       version = "0.0.12";
+       sha256 = "fa8c71676e1400b94d38b5af8a8f0aa0335db1b867f1d22cc857b835aa61b90a";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring clock containers
          cryptohash filepath inflections MonadRandom mtl network network-uri
@@ -23685,9 +23750,10 @@ self: {
     ({ mkDerivation, base, dependent-sum, mtl, process, shake }:
      mkDerivation {
        pname = "avr-shake";
-       version = "0.0.1.1";
-       sha256 = "f606330fbadb7f18fd6dd04585f2290ff601b76613853aff3b0c9ca95b4c722b";
+       version = "0.0.1.2";
+       sha256 = "60102786473f189ea0f97d97b91d9de5a2867dde466b96386c28afbe22e056cc";
        libraryHaskellDepends = [ base dependent-sum mtl process shake ];
+       jailbreak = true;
        homepage = "https://github.com/mokus0/avr-shake";
        description = "AVR Crosspack actions for shake build systems";
        license = stdenv.lib.licenses.publicDomain;
@@ -24834,10 +24900,9 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-noprelude";
-       version = "4.8.0.0";
-       sha256 = "f4038cc4d2f47dc9c296e868e27a3087ced1cd865c65929e41be6e4ea19ab74f";
+       version = "4.8.1.0";
+       sha256 = "bd524ee4d4b9fb433a4f10eedf8605de3baccc9c2c533d1ab57ee6941ade4014";
        libraryHaskellDepends = [ base ];
-       jailbreak = true;
        homepage = "https://github.com/hvr/base-noprelude";
        description = "\"base\" package sans \"Prelude\" module";
        license = stdenv.lib.licenses.bsd3;
@@ -26972,8 +27037,8 @@ self: {
     ({ mkDerivation, base, gmp, yices }:
      mkDerivation {
        pname = "bindings-yices";
-       version = "0.2";
-       sha256 = "c9a9ac5080030ee4a0c360af469745a2d96fb223946d9f64c4a9c83c4d87ce8f";
+       version = "0.3.0.2";
+       sha256 = "247eb63716c11cdda9275e2e726153cf19dd1a4bbd457170a2384cc55d4d18b5";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ gmp yices ];
        description = "Bindings to the Yices theorem prover";
@@ -27645,24 +27710,25 @@ self: {
      }) {};
 
   "bitx-bitcoin" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit
-     , http-types, microlens, microlens-th, network, scientific, split
-     , text, time
+    ({ mkDerivation, aeson, base, bytestring, directory, hspec
+     , http-conduit, http-types, microlens, microlens-th, network
+     , pretty-show, scientific, split, text, time
      }:
      mkDerivation {
        pname = "bitx-bitcoin";
-       version = "0.4.0.0";
-       sha256 = "6c04902ab1ce6600373ba1f477878a17c6cfe00c3417596a3c96f22dbbfe492f";
+       version = "0.4.0.1";
+       sha256 = "2aa641c5e02e19814c707d8aa8b262411288e7db403afbee04b909507a6f8187";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types microlens
          microlens-th network scientific split text time
        ];
        testHaskellDepends = [
-         aeson base bytestring hspec microlens time
+         aeson base bytestring directory hspec microlens pretty-show text
+         time
        ];
        homepage = "https://github.com/tebello-thejane/bitx-haskell";
        description = "A Haskell library for working with the BitX bitcoin exchange";
-       license = stdenv.lib.licenses.publicDomain;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "bk-tree" = callPackage
@@ -27885,10 +27951,9 @@ self: {
     ({ mkDerivation, base, blaze-html, text }:
      mkDerivation {
        pname = "blaze-bootstrap";
-       version = "0.1.0.0";
-       sha256 = "3cdf5395b78914b273b989956ab53b83c8e36dbe6dd24c3305e2ba8e9ee42fe0";
+       version = "0.1.0.1";
+       sha256 = "53b54c0b55ae7a436ec7e5d4e29d50fceb1ccd459ef715236358a3c661d05163";
        libraryHaskellDepends = [ base blaze-html text ];
-       jailbreak = true;
        homepage = "http://github.com/agrafix/blaze-bootstrap";
        description = "Blaze helper functions for bootstrap pages";
        license = stdenv.lib.licenses.mit;
@@ -28242,6 +28307,7 @@ self: {
          quickcheck-properties semigroups text time unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/bitemyapp/bloodhound";
        description = "ElasticSearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -28606,6 +28672,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "both" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "both";
+       version = "0.1.0.0";
+       sha256 = "f30b3c55ade901bd6d15d4e359d7a58e5a44b44e4891d0c766731fd6879314fe";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/barrucadu/both";
+       description = "Like Maybe, but with a different Monoid instance";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "botpp" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -28828,20 +28906,22 @@ self: {
 
   "brick" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-default
-     , Diff, lens, template-haskell, text, text-zipper, transformers
-     , vector, vty
+     , deepseq, Diff, lens, template-haskell, text, text-zipper
+     , transformers, vector, vty
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.1";
-       sha256 = "b81c5276709795fd9fe14f2b456b36ee0f4ee399abaa2f738948492baf2fb230";
+       version = "0.2";
+       sha256 = "2bc36fd17d7dd465b370fc0b3ca49afd9cf78bc851bebd5341175a826dba9c97";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers contravariant data-default Diff lens
+         base containers contravariant data-default deepseq Diff lens
          template-haskell text text-zipper transformers vector vty
        ];
-       executableHaskellDepends = [ base data-default lens text vty ];
+       executableHaskellDepends = [
+         base data-default lens text vector vty
+       ];
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
@@ -29984,13 +30064,15 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "0.9.5";
-       sha256 = "f053206ce48080c7166ede1053da9332ed73ffc8192f38e87dcfaa588e049a50";
+       version = "1.0.1";
+       sha256 = "07ece2976aaf2a496043039120889d1904efbb8c439581b099c70cc56d9d1720";
+       revision = "1";
+       editedCabalFile = "0bea75835dec3439d69a0c176bcc9aa5c82866e7293dcb60e49c7168800bd8eb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal cabal-lenses cmdargs either lens strict transformers
-         unordered-containers
+         base Cabal cabal-lenses cmdargs directory either filepath lens
+         strict transformers unordered-containers
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -30008,8 +30090,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "0.7.7";
-       sha256 = "9f5ac25b0efcb8d9d41096c4e32c9c0ebae81cdef2be4e5d999348a9dd75c321";
+       version = "0.7.8";
+       sha256 = "0a13469b3077b242cc758f5b3b645d7fe4fca950d82c4b564ea616e7bd92e251";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30070,8 +30152,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.30.2";
-       sha256 = "bca7aae4e601e8bd72cee931cd8081331a7298f07db2260fbb3a5a0103ee4eed";
+       version = "4.31.4";
+       sha256 = "f700f3fef9d6ec3e95468cfe65c7b77b4ec560668ec876aeed01d833804c18bd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30085,8 +30167,8 @@ self: {
          base Cabal debian lens mtl pretty Unixutils
        ];
        testHaskellDepends = [
-         base Cabal containers debian Diff filepath hsemail HUnit lens
-         pretty process text
+         base Cabal containers debian Diff directory filepath hsemail HUnit
+         lens pretty process text
        ];
        homepage = "https://github.com/ddssff/cabal-debian";
        description = "Create a Debianization for a Cabal package";
@@ -30217,8 +30299,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.5.1.0";
-       sha256 = "563773491cc8245c3d265c2e7847f95198aad74adcbc16a91622e7e4abef4e45";
+       version = "0.5.2.0";
+       sha256 = "e4328860abef0a6ff97357810f6f067018e40e0e28fa9df3b51efbc7421f689f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30367,12 +30449,17 @@ self: {
      }) {};
 
   "cabal-lenses" = callPackage
-    ({ mkDerivation, base, Cabal, lens, unordered-containers }:
+    ({ mkDerivation, base, Cabal, either, lens, strict, system-fileio
+     , system-filepath, text, transformers, unordered-containers
+     }:
      mkDerivation {
        pname = "cabal-lenses";
-       version = "0.4.5";
-       sha256 = "b668afea6a4d1e26384c4e7ce19cb14a54ce717c9e045661585f15a82ab109ec";
-       libraryHaskellDepends = [ base Cabal lens unordered-containers ];
+       version = "0.4.6";
+       sha256 = "1fdb9c5e82cd1b82c0aff5392375baa339261684e8260c77308334433ea52dac";
+       libraryHaskellDepends = [
+         base Cabal either lens strict system-fileio system-filepath text
+         transformers unordered-containers
+       ];
        jailbreak = true;
        description = "Lenses and traversals for the Cabal library";
        license = stdenv.lib.licenses.bsd3;
@@ -33057,8 +33144,8 @@ self: {
        pname = "chunked-data";
        version = "0.2.0";
        sha256 = "9aa0f3c81f9b0d7c1dde206501415f01638f20eebfbe1386dfd802bcc1bab272";
-       revision = "1";
-       editedCabalFile = "ba9fa66cf9c9995dfec2c5735692d6f52343a48d6c9cae4242ec399e0f421fdc";
+       revision = "2";
+       editedCabalFile = "8e667f090de9d53e254c511c8658c15f3c097b7652611b4f65bfabd5151319d0";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers mono-traversable
          semigroups text transformers vector
@@ -33731,8 +33818,8 @@ self: {
      }:
      mkDerivation {
        pname = "classy-prelude";
-       version = "0.12.1.1";
-       sha256 = "670a85ffd10ff467e5eec1164462932c00bb6282cda2987a2b92c82f09ac3d13";
+       version = "0.12.3";
+       sha256 = "fd7b6e97c8e462844598f76f9aef4c4f445cd833e3b72eebcc94e8c20a7d3a24";
        libraryHaskellDepends = [
          base basic-prelude bifunctors bytestring chunked-data containers
          dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base
@@ -33755,8 +33842,8 @@ self: {
      }:
      mkDerivation {
        pname = "classy-prelude-conduit";
-       version = "0.12.0.1";
-       sha256 = "b12758b3ebe429268ca5a0f18a61ffc9429d6cdc00b4362742ea0717460462f7";
+       version = "0.12.3";
+       sha256 = "d86127153f9a69a2ed87777a0a93d8174c7ff136cbefb470879982b3b4875970";
        libraryHaskellDepends = [
          base bytestring classy-prelude conduit conduit-combinators
          monad-control resourcet transformers void
@@ -33776,8 +33863,8 @@ self: {
      }:
      mkDerivation {
        pname = "classy-prelude-yesod";
-       version = "0.12.0.1";
-       sha256 = "220f42a881672837513de5a425fa060fa545436b99baa02c6d5faaa697a6ff02";
+       version = "0.12.3";
+       sha256 = "ddc03c6e473e3355f5c5efa3cd1eecf15605ef3a109038d0350eb5890b6a3c9d";
        libraryHaskellDepends = [
          aeson base classy-prelude classy-prelude-conduit data-default
          http-conduit http-types persistent yesod yesod-newsfeed
@@ -33836,6 +33923,7 @@ self: {
        ];
        librarySystemDepends = [ openssl ];
        libraryToolDepends = [ hsx2hs ];
+       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
@@ -33855,6 +33943,7 @@ self: {
        executableHaskellDepends = [
          acid-state base clckwrks haskeline mtl network parsec
        ];
+       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "a command-line interface for adminstrating some aspects of clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -33930,6 +34019,7 @@ self: {
          safecopy text web-plugins web-routes web-routes-th
        ];
        libraryToolDepends = [ hsx2hs ];
+       jailbreak = true;
        homepage = "http://clckwrks.com/";
        description = "ircbot plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -33954,6 +34044,7 @@ self: {
          web-routes-th
        ];
        libraryToolDepends = [ hsx2hs ];
+       jailbreak = true;
        homepage = "http://clckwrks.com/";
        description = "media plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -33980,6 +34071,7 @@ self: {
          web-plugins web-routes web-routes-happstack web-routes-th
        ];
        libraryToolDepends = [ hsx2hs ];
+       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -34011,8 +34103,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-theme-clckwrks";
-       version = "0.5.0";
-       sha256 = "1b72c96e2c6a2d04c3ec53727b72ab3454f82192f5f77f83ca672a56cfc55f1b";
+       version = "0.5.1";
+       sha256 = "93540dc0dafbf1e9bc6863c215391905201bc4653133fd01c0f0c6a9bacd6858";
        libraryHaskellDepends = [
          base clckwrks containers happstack-authenticate hsp hsx2hs mtl text
          web-plugins
@@ -34543,8 +34635,8 @@ self: {
     ({ mkDerivation, base, bytestring, HUnit, text }:
      mkDerivation {
        pname = "cmark";
-       version = "0.4.0.1";
-       sha256 = "638328b59c2bb8bdcd0f3042c4554f2b2b7c6deac7770dbc8bc2813c865a35ce";
+       version = "0.4.1";
+       sha256 = "22f006ba36620476916c605b92de8e1f325eb2b5ebec6b30c12aee6220262330";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base HUnit text ];
        homepage = "https://github.com/jgm/commonmark-hs";
@@ -36085,8 +36177,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-machines";
-       version = "0.1.0.0";
-       sha256 = "846fd1bcb15551750da36f525050fc0a5f03c752ccd421fb90dfc92f595a9de6";
+       version = "0.1.0.1";
+       sha256 = "d3db20a02c415f8aa68832212738a09d5847b31549270529c69cc4c2bd2a832e";
        libraryHaskellDepends = [
          async base containers lifted-async machines monad-control
          semigroups time transformers transformers-base
@@ -36313,10 +36405,8 @@ self: {
     ({ mkDerivation, base, conduit, vector }:
      mkDerivation {
        pname = "conduit-audio";
-       version = "0.1";
-       sha256 = "8bfabae0f9e9322ffd91e1cd8afbe6a5eb716d46c0035876ab7368c44fb6bdf6";
-       revision = "1";
-       editedCabalFile = "bf853ba8300deda982d278245bd268e91f444ca42185bd0d57eb9feae5ab066c";
+       version = "0.2";
+       sha256 = "8cabe59479eb5b02cea6d64c177181eba19affe6dfb1335ae437e992417b9d55";
        libraryHaskellDepends = [ base conduit vector ];
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "Combinators to efficiently slice and dice audio streams";
@@ -36331,8 +36421,8 @@ self: {
        pname = "conduit-audio-lame";
        version = "0.1";
        sha256 = "3c85eec27bb2dbfa5f625624d1dc8ccabf22a4f62508d50a9d940be7c9aa9644";
-       revision = "1";
-       editedCabalFile = "34e31416cde87ad1d75570612f3e95d8f54cbeac0539a6f85b93aebaf3979c1a";
+       revision = "2";
+       editedCabalFile = "515e004751c00e38b2d55e549fc2c1fd73cbf86a113e9b35b2a681fcc80a546d";
        libraryHaskellDepends = [
          base bytestring conduit conduit-audio resourcet transformers vector
        ];
@@ -36351,8 +36441,8 @@ self: {
        pname = "conduit-audio-samplerate";
        version = "0.1";
        sha256 = "4f7781a30e57f6fd38f35d565ca4a94640e5b9ed62b821e7a3723d6d41a34513";
-       revision = "1";
-       editedCabalFile = "c3601c344d95841d594827a61b1a7ad05042dec6f62ce9952e88b3d0fe814a63";
+       revision = "2";
+       editedCabalFile = "6a1b8fd7fe0e3bda31d7e02eddfbf9ad569f74a130a2985b55cf09334ee0fd76";
        libraryHaskellDepends = [
          base conduit conduit-audio resourcet transformers vector
        ];
@@ -36371,8 +36461,8 @@ self: {
        pname = "conduit-audio-sndfile";
        version = "0.1";
        sha256 = "6d35ed7b38479ce2b6946d661abe11aa69c1db6821b14b52618e273604fb1b6c";
-       revision = "1";
-       editedCabalFile = "f753b66e55fc5332463bc54a7077b9c503439cd03c7c1c799cd60751ab954a87";
+       revision = "2";
+       editedCabalFile = "2a067b3ffad200da8d993ba8c57f53580b3505d912b9c9dfb160674e642f749a";
        libraryHaskellDepends = [
          base conduit conduit-audio hsndfile hsndfile-vector resourcet
          transformers
@@ -37953,12 +38043,15 @@ self: {
      }:
      mkDerivation {
        pname = "courier";
-       version = "0.1.0.15";
-       sha256 = "5b14d1d5d2bd4efb563a8e5111cd23c5892034b6bfcd2e34ead8c9c3b35549aa";
+       version = "0.1.1.1";
+       sha256 = "950216558b5729d592c2bfd9b230ab25fe0403cd5cfa6825ec9b6123fc330ad6";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring cereal containers hslogger network stm text
          uuid
        ];
+       executableHaskellDepends = [ base cereal ];
        testHaskellDepends = [
          async base cereal containers directory hslogger HUnit network stm
          test-framework test-framework-hunit
@@ -37989,6 +38082,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "coverage" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "coverage";
+       version = "0.1.0.2";
+       sha256 = "ba99dccf43de1021322a870e03fc74b9a46bc5bdffde302859f19870065e6df0";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       jailbreak = true;
+       homepage = "https://github.com/nicodelpiano/coverage";
+       description = "Exhaustivity Checking Library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cpio-conduit" = callPackage
     ({ mkDerivation, base, base16-bytestring, binary, bytestring
      , conduit, conduit-extra, resourcet
@@ -38034,8 +38141,8 @@ self: {
      }:
      mkDerivation {
        pname = "cpphs";
-       version = "1.19.2";
-       sha256 = "bb45b22d8b00605942bc2f675c43ba826e9a861cfe1474f1aad9d427e16690a4";
+       version = "1.19.3";
+       sha256 = "e2546aa382e9c22942c5c2849631edc6b1d8cbea2c50762f66b740755faf57da";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38089,8 +38196,8 @@ self: {
     ({ mkDerivation, array, base, containers, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "2.5.2";
-       sha256 = "05b32a60a1ec193beafa4e9009b210bb81933cdf30a798611e64aa13a4e2a27e";
+       version = "2.5.3";
+       sha256 = "c7f2d323f0b558e8a39a387f21d7f93b8449f25082d7e8515cc7f805d2a31919";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers parallel ];
@@ -39340,8 +39447,8 @@ self: {
      }:
      mkDerivation {
        pname = "css-syntax";
-       version = "0.0.2";
-       sha256 = "9ee149c46c3f76d46943bf7b374be79535aaec393b3a5dc2f176636c76382115";
+       version = "0.0.4";
+       sha256 = "9b9254e3471b7be615f8546a5f46b1a338d81be0f2724aa107311c3ee6ee6bd9";
        libraryHaskellDepends = [
          attoparsec base bytestring scientific text
        ];
@@ -41333,11 +41440,13 @@ self: {
        pname = "data-reify";
        version = "0.6.1";
        sha256 = "61350a1e96cb1276c2b6b8b13fa1bade5d4e63c702509a3f5e90bbc19ad9b202";
+       revision = "1";
+       editedCabalFile = "f7f3a5b2f482a67eb77f4ba32e15f91bcfa4c220cdda9dde22cd9d9ff18ab447";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base ];
-       homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/IOReification";
+       homepage = "http://ku-fpg.github.io/software/data-reify/";
        description = "Reify a recursive data structure into an explicit graph";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42296,6 +42405,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dead-code-detection" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , getopt-generics, ghc, ghc-paths, gitrev, Glob, graph-wrapper
+     , hspec, interpolate, mockery, silently, string-conversions
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "dead-code-detection";
+       version = "0.1.1";
+       sha256 = "45bc29a1b21001d9b5524f6fe808581d1871cb97e330637ba6fe4e06aef66351";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers getopt-generics ghc ghc-paths gitrev Glob
+         graph-wrapper silently string-conversions uniplate
+       ];
+       testHaskellDepends = [
+         base containers directory filepath getopt-generics ghc ghc-paths
+         gitrev Glob graph-wrapper hspec interpolate mockery silently
+         string-conversions uniplate
+       ];
+       homepage = "https://github.com/soenkehahn/dead-code-detection#readme";
+       description = "detect dead code in haskell projects";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dead-simple-json" = callPackage
     ({ mkDerivation, base, containers, parsec, template-haskell
      , transformers, vector
@@ -42322,8 +42457,8 @@ self: {
      }:
      mkDerivation {
        pname = "debian";
-       version = "3.87.2";
-       sha256 = "2994078f24cc7467bf8ffbd14cd8838aebaceb659856f77fb91d59bbbe06ae8c";
+       version = "3.88";
+       sha256 = "9b347387432ca20fb4bba123cdb4de8e4ae05d49a4433d1609f37215620e6e56";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42492,14 +42627,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "deepseq_1_4_1_1" = callPackage
+  "deepseq_1_4_1_2" = callPackage
     ({ mkDerivation, array, base, HUnit, test-framework
      , test-framework-hunit
      }:
      mkDerivation {
        pname = "deepseq";
-       version = "1.4.1.1";
-       sha256 = "908158eb30ac6abe2fb32d9c07cc2c3dae886867520b5529c09b5e87db32b3bf";
+       version = "1.4.1.2";
+       sha256 = "3b7cfa5ff5eb169b3f97285be978f030d664c6e3e84a2525b2fafca4f7380651";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [
          array base HUnit test-framework test-framework-hunit
@@ -42917,8 +43052,8 @@ self: {
     ({ mkDerivation, base, containers, dependent-sum }:
      mkDerivation {
        pname = "dependent-map";
-       version = "0.1.1.3";
-       sha256 = "44dd913868dddfaa104c27794cbf852e8c4783fe78f49b3b2dd635b4731ec8af";
+       version = "0.2.0.1";
+       sha256 = "645c5c519d5cb6393ee826dfca183736be84fda87e980f0daecd7be207bb8f50";
        libraryHaskellDepends = [ base containers dependent-sum ];
        homepage = "https://github.com/mokus0/dependent-map";
        description = "Dependent finite maps (partial dependent products)";
@@ -42929,8 +43064,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "dependent-sum";
-       version = "0.2.1.0";
-       sha256 = "835e799c9749822f2818dd5c7dc1e887d4c5b5a6bb37c7e4c0661a2060d6dcc0";
+       version = "0.3.2.1";
+       sha256 = "b91338c9d18b8977114c3ef962dc224b6a7ff12b0861c536f560260429b6a42f";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mokus0/dependent-sum";
        description = "Dependent sum type";
@@ -43245,6 +43380,7 @@ self: {
        sha256 = "3adffba07d4fdca79909331ec0029e09cf7895cadada5613f3e359d777c8bcc1";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base hspec ];
+       jailbreak = true;
        homepage = "https://github.com/TGOlson/deterministic-game-engine";
        description = "Simple deterministic game engine";
        license = stdenv.lib.licenses.mit;
@@ -44025,13 +44161,12 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-bootstrap";
-       version = "0.1.0.0";
-       sha256 = "ffcf11ad8a5692569df86fdc967ce3ccaafa9b1d973f92893091e924e8683030";
+       version = "0.1.0.1";
+       sha256 = "eb7d7586903f07c4519c4ff862923344e912268f686394cb4f550bd9ef0418f7";
        libraryHaskellDepends = [
          base blaze-bootstrap blaze-html digestive-functors
          digestive-functors-blaze http-types text
        ];
-       jailbreak = true;
        description = "Speed up form designing using digestive functors and bootstrap";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -44374,6 +44509,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diplomacy-server" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , deepseq, diplomacy, filepath, hourglass, json-schema, mtl
+     , optparse-applicative, parsec, random, rest-core, rest-wai, stm
+     , Stream, text, transformers, transformers-compat, TypeNat, wai
+     , warp, warp-tls
+     }:
+     mkDerivation {
+       pname = "diplomacy-server";
+       version = "0.1.0.0";
+       sha256 = "36de8e6754843331fa36f1da296dd467dc6267a80bce3d907e4f73f4f2e4dcf6";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson async base bytestring containers deepseq diplomacy filepath
+         hourglass json-schema mtl optparse-applicative parsec random
+         rest-core rest-wai stm Stream text transformers transformers-compat
+         TypeNat wai warp warp-tls
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/avieth/diplomacy-server";
+       description = "Play Diplomacy over HTTP";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "direct-binary-files" = callPackage
     ({ mkDerivation, base, bytestring, mtl }:
      mkDerivation {
@@ -45291,8 +45451,8 @@ self: {
     ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
      mkDerivation {
        pname = "dlist";
-       version = "0.7.1.1";
-       sha256 = "08b07f28e01f4a7e17239c33b37fbef0bf6073712337a97a145a583577df5efd";
+       version = "0.7.1.2";
+       sha256 = "332d21f16fd30d2534b6ab96c98830a14266d8f368cff21f6a47469fb3493783";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/spl/dlist";
@@ -46376,21 +46536,20 @@ self: {
      }) {};
 
   "dtab" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , data-binary-ieee754, pretty, transformers
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , data-binary-ieee754, happy, pretty, transformers
      }:
      mkDerivation {
        pname = "dtab";
-       version = "1.0";
-       sha256 = "43067c07ec8dd6bedcaa985a51df834987172ba2153d089e5edf7729e99da5ff";
-       revision = "2";
-       editedCabalFile = "50fe31cffb6f7eab4428bf547fd0c7e7804a0f20c604692a18b213d4a54a0a7a";
+       version = "1.0.0.1";
+       sha256 = "d696fd2a9019c9b4916831f88217f92f809dc4341b5ffc506f8e786d91bbe069";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base binary bytestring containers data-binary-ieee754 pretty
          transformers
        ];
+       libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base bytestring ];
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
        license = "GPL";
@@ -48721,8 +48880,8 @@ self: {
     ({ mkDerivation, base, containers, hspec }:
      mkDerivation {
        pname = "envparse";
-       version = "0.2.1";
-       sha256 = "8f71913f13df34dc5092ae4d5808c086e7b7d84a0696d6891bf4727254a37dde";
+       version = "0.2.2";
+       sha256 = "72bbac6a4c6755c6f1f0b68a68475afb71cd6763e8fb90c88411457ff16f4a03";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        homepage = "https://supki.github.io/envparse";
@@ -48745,6 +48904,7 @@ self: {
          base bytestring hspec mtl QuickCheck quickcheck-instances text time
          transformers
        ];
+       jailbreak = true;
        description = "An environmentally friendly way to deal with environment variables";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49516,6 +49676,7 @@ self: {
          base directory hlint hspec process regex-posix xml
        ];
        testToolDepends = [ happy ];
+       jailbreak = true;
        homepage = "https://github.com/decomputed/euler";
        description = "Mathematics utilities for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -49737,8 +49898,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "exact-pi";
-       version = "0.2.1.1";
-       sha256 = "6ff443ecd07f8727089202b881125c85ef21818594ffa910dfa41eaa54eb14b9";
+       version = "0.2.1.2";
+       sha256 = "a6a6239cf13b18409996bad40c487b80fdf03b87fea48bb0309e32e47243ee38";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/dmcclean/exact-pi";
        description = "Exact rational multiples of pi (and integer powers of pi)";
@@ -50643,6 +50804,7 @@ self: {
        sha256 = "c6bde8e127af0dbb2b6e426ef34eb3fafe32ccb32358b8482774e6fc4ab91e7f";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       jailbreak = true;
        homepage = "https://github.com/abhinav/farmhash";
        description = "Fast hash functions";
        license = stdenv.lib.licenses.bsd3;
@@ -50689,6 +50851,8 @@ self: {
        pname = "fast-logger";
        version = "2.4.1";
        sha256 = "e51218b5a00b8b5746fcbd1666262f9ae77b9daea5c4e351459a321c0c0a534e";
+       revision = "1";
+       editedCabalFile = "d33a479d4e18cae6671cd21fa47d3a62cd5674b2f234e35403bb3a8c7a56ae11";
        libraryHaskellDepends = [
          array auto-update base bytestring bytestring-builder directory
          filepath text
@@ -51568,6 +51732,7 @@ self: {
          array base containers deepseq transformers
        ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
+       jailbreak = true;
        description = "Martin Erwig's Functional Graph Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51580,6 +51745,7 @@ self: {
        sha256 = "840db22168432e752f9eaf7a2564afd20a0442342b61cea1ec63b21832612684";
        libraryHaskellDepends = [ base fgl QuickCheck ];
        testHaskellDepends = [ base containers fgl hspec QuickCheck ];
+       jailbreak = true;
        description = "QuickCheck support for fgl";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53002,6 +53168,7 @@ self: {
        sha256 = "ab4af7e815cfa2345cdf17c0e765da575f66c0b9b978c8234d620fcf933800db";
        libraryHaskellDepends = [ base data-default stm stm-delay time ];
        testHaskellDepends = [ base hspec stm time ];
+       jailbreak = true;
        homepage = "https://github.com/debug-ito/fold-debounce";
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
@@ -53022,6 +53189,7 @@ self: {
        testHaskellDepends = [
          base conduit hspec resourcet stm transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/debug-ito/fold-debounce-conduit";
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
        license = stdenv.lib.licenses.bsd3;
@@ -53391,6 +53559,7 @@ self: {
          base bytestring data-default-class double-conversion hspec HUnit
          lens old-locale QuickCheck text time
        ];
+       jailbreak = true;
        homepage = "https://github.com/Soostone/formattable";
        description = "Business-quality formatting of numbers, dates, and other things";
        license = stdenv.lib.licenses.bsd3;
@@ -54108,8 +54277,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, transformers }:
      mkDerivation {
        pname = "frpnow";
-       version = "0.13";
-       sha256 = "192b41e9c307dedc7004ff0e2bb50c4025a26de932dc7fa8ba6c7ffe83f3bb8d";
+       version = "0.17";
+       sha256 = "93da2b38fd2a597b2338e7fa132b207c690ad8c3edd26f1dda2fdcac29908b35";
        libraryHaskellDepends = [ base containers mtl transformers ];
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Principled practical FRP";
@@ -56188,8 +56357,8 @@ self: {
     ({ mkDerivation, base, cpphs, ghc, happy }:
      mkDerivation {
        pname = "ghc-parser";
-       version = "0.1.7.0";
-       sha256 = "e3e085bd656c8865d80994ad909960de448719394d1d033b75b4c6fc756a6031";
+       version = "0.1.8.0";
+       sha256 = "494e9df73942c5e77e01c331eaee94438c15c711d78f48c1d1c4d8977ffb5152";
        libraryHaskellDepends = [ base ghc ];
        libraryToolDepends = [ cpphs happy ];
        homepage = "https://github.com/gibiansky/IHaskell";
@@ -57116,12 +57285,19 @@ self: {
      }) {};
 
   "github-types" = callPackage
-    ({ mkDerivation, aeson, base, text }:
+    ({ mkDerivation, aeson, aeson-pretty, base, hspec, hspec-smallcheck
+     , http-conduit, smallcheck, text, time, unordered-containers
+     , vector
+     }:
      mkDerivation {
        pname = "github-types";
-       version = "0.1.0.5";
-       sha256 = "f1a4b62882d6b2f263cb411047d947ff0555be338a3699338816f20cd45bd553";
-       libraryHaskellDepends = [ aeson base text ];
+       version = "0.2.0";
+       sha256 = "3f3675dff4076ddc64021bb5cbe89e5b609c65d2f08463a3d12d760b779ee4d8";
+       libraryHaskellDepends = [ aeson base text time ];
+       testHaskellDepends = [
+         aeson aeson-pretty base hspec hspec-smallcheck http-conduit
+         smallcheck text time unordered-containers vector
+       ];
        description = "Type definitions for objects used by the GitHub v3 API";
        license = "unknown";
      }) {};
@@ -57203,22 +57379,23 @@ self: {
      }:
      mkDerivation {
        pname = "gitit";
-       version = "0.11.1.1";
-       sha256 = "bc8a5662a8e262a3ebaba270f54781db28407acd2fb441fbadc6df019d7a8ec4";
+       version = "0.12.0.1";
+       sha256 = "552996f2624ed08cd21a73303d666292f08a1294416d2811f9d57293c9e89506";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base filepath ghc ghc-paths pandoc pandoc-types safe
-       ];
-       executableHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring ConfigFile
          containers directory feed filepath filestore ghc ghc-paths
          happstack-server highlighting-kate hoauth2 hslogger HStringTemplate
          HTTP http-client-tls http-conduit json mtl network network-uri
          old-locale old-time pandoc pandoc-types parsec pretty process
-         random recaptcha SHA split syb tagsoup text time uri url
+         random recaptcha safe SHA split syb tagsoup text time uri url
          utf8-string uuid xhtml xml xss-sanitize zlib
        ];
+       executableHaskellDepends = [
+         base bytestring directory filepath hslogger HTTP mtl network
+         network-uri syb url utf8-string
+       ];
        homepage = "http://gitit.net";
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
@@ -57725,6 +57902,7 @@ self: {
        libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
+       jailbreak = true;
        homepage = "http://gloss.ouroborus.net";
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
@@ -57875,6 +58053,7 @@ self: {
        libraryHaskellDepends = [
          base bmp bytestring containers GLUT OpenGL
        ];
+       jailbreak = true;
        description = "Gloss picture data types and rendering functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -57912,8 +58091,8 @@ self: {
      }:
      mkDerivation {
        pname = "glue";
-       version = "0.1.2";
-       sha256 = "55a2bee39073ad16ddfd2879ec91c8eb9dd78cd2e25498ef39ad6f8dc1f6ae45";
+       version = "0.1.3";
+       sha256 = "4668671d2ebeb32c567c8fa6f2ca46f352695e63f17fb45162837b5889f1dde7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59196,8 +59375,8 @@ self: {
        pname = "groundhog";
        version = "0.7.0.3";
        sha256 = "39713e7b3423ea34a5ac803d4a563d7f9674bbf72700e263a00c7bc70328ac58";
-       revision = "1";
-       editedCabalFile = "dcf9bbeaf0fd7e7ac0809902a54779097e8935a07b1e7e43c404bc683c17e7f0";
+       revision = "2";
+       editedCabalFile = "b4a2f7876feaaf6ad8d4589989902d4452468910c0f3f01a04827a001036f3ff";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          containers monad-control monad-logger mtl scientific text time
@@ -59846,8 +60025,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3";
-       version = "0.14.0";
-       sha256 = "ec548d8a63caabf449ada2c3f2589c6b15e741572affb8362161fd2ab7e4d6c8";
+       version = "0.14.1";
+       sha256 = "4ebbb02611cbbc2a0ff592afb8cf37ffc6c10ec716464975872f46853c38c5a7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60969,13 +61148,14 @@ self: {
        pname = "hackage-diff";
        version = "0.1.0.0";
        sha256 = "bf8010479ba75032c6750444edc7979a65c6ce4c919a629562ddd81aa03aac4d";
+       revision = "1";
+       editedCabalFile = "eddc65fed41375eaa4ce2aa729bd35364d558d7e33b23fcafca58dd6ce3cff1c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          ansi-terminal async attoparsec base Cabal cpphs directory filepath
          haskell-src-exts HTTP mtl process text
        ];
-       jailbreak = true;
        homepage = "https://github.com/blitzcode/hackage-diff";
        description = "Compare the public API of different versions of a Hackage library";
        license = stdenv.lib.licenses.mit;
@@ -61058,6 +61238,61 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hackage-repo-tool" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , hackage-security, network, network-uri, optparse-applicative, tar
+     , time, unix, zlib
+     }:
+     mkDerivation {
+       pname = "hackage-repo-tool";
+       version = "0.1.0.0";
+       sha256 = "421eed1316a7f54d5e5d5895ff70129a7efaf0d4d2e10b27bc293ba3786c496b";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath hackage-security network
+         network-uri optparse-applicative tar time unix zlib
+       ];
+       homepage = "http://github.com/well-typed/hackage-security/";
+       description = "Utility to manage secure file-based package repositories";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hackage-security" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, Cabal
+     , containers, cryptohash, directory, ed25519, filepath, ghc-prim
+     , mtl, network, network-uri, parsec, tar, template-haskell, time
+     , transformers, zlib
+     }:
+     mkDerivation {
+       pname = "hackage-security";
+       version = "0.2.0.0";
+       sha256 = "db1abeb34db8ecabc4e70db7a71f49789a0a1839b78dbc813f09d25973aea8d4";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring Cabal containers cryptohash
+         directory ed25519 filepath ghc-prim mtl network network-uri parsec
+         tar template-haskell time transformers zlib
+       ];
+       description = "Hackage security library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hackage-security-HTTP" = callPackage
+    ({ mkDerivation, base, bytestring, hackage-security, HTTP, mtl
+     , network, network-uri, zlib
+     }:
+     mkDerivation {
+       pname = "hackage-security-HTTP";
+       version = "0.1.0.1";
+       sha256 = "56b526b2ed23201474f111f3b7ad6d77fa5359acd27498ab4a95b451617612fa";
+       libraryHaskellDepends = [
+         base bytestring hackage-security HTTP mtl network network-uri zlib
+       ];
+       homepage = "http://github.com/well-typed/hackage-security/";
+       description = "Hackage security bindings against the HTTP library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hackage-server" = callPackage
     ({ mkDerivation, acid-state, aeson, alex, array, async, attoparsec
      , base, base16-bytestring, base64-bytestring, binary, blaze-builder
@@ -61198,6 +61433,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hackmanager" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, file-embed
+     , Glob, hastache, http-client, http-client-tls, http-types, mtl
+     , optparse-applicative, process, text
+     }:
+     mkDerivation {
+       pname = "hackmanager";
+       version = "0.1.0.0";
+       sha256 = "8a5cebf772c8f99b2e56deb9f64a90344ded1528ac1a9967eab2776d72053546";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal directory file-embed Glob hastache
+         http-client http-client-tls http-types mtl process text
+       ];
+       executableHaskellDepends = [ base optparse-applicative text ];
+       homepage = "http://github.com/agrafix/hackmanager";
+       description = "Generate useful files for Haskell projects";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hackport" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , directory, extensible-exceptions, filepath, HTTP, HUnit, MissingH
@@ -61880,6 +62136,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hakyll-sass" = callPackage
+    ({ mkDerivation, base, data-default-class, hakyll, hsass }:
+     mkDerivation {
+       pname = "hakyll-sass";
+       version = "0.1.0";
+       sha256 = "b127379ebf20f96f5974a9f8212aa3aeed04b9e22788bc29cc9994f6f69e926c";
+       libraryHaskellDepends = [ base data-default-class hakyll hsass ];
+       homepage = "https://github.com/meoblast001/hakyll-sass";
+       description = "Hakyll SASS compiler over hsass";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "halberd" = callPackage
     ({ mkDerivation, base, Cabal, containers, haskell-names
      , haskell-packages, haskell-src-exts, HUnit, mtl, safe, split, syb
@@ -62225,17 +62493,17 @@ self: {
   "hans" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, cereal
      , containers, fingertree, HTTP, monadLib, network, old-locale
-     , random, time, unix
+     , random, stm, time, unix
      }:
      mkDerivation {
        pname = "hans";
-       version = "2.5.0.0";
-       sha256 = "17f018763926d55ab8cc0cb763526a99399003ecaba37a7dd52157c62ce7f5a7";
+       version = "2.6.0.0";
+       sha256 = "2853847c2d8823e43904ddcd2fa4ad1e1b15178a18e703293459866601c057a5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring cereal containers fingertree monadLib random time
-         unix
+         base bytestring cereal containers fingertree monadLib random stm
+         time unix
        ];
        executableHaskellDepends = [
          base blaze-html blaze-markup bytestring cereal containers HTTP
@@ -62646,6 +62914,7 @@ self: {
          monad-control mtl reform reform-happstack reform-hsp safecopy text
          web-routes web-routes-happstack web-routes-hsp web-routes-th
        ];
+       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP";
        license = stdenv.lib.licenses.bsd3;
@@ -63134,8 +63403,8 @@ self: {
      }:
      mkDerivation {
        pname = "harmony";
-       version = "0.1.0.3";
-       sha256 = "c4d91ca6923e9d04d72590eb309020e6937aa3097b3b649db6803e527eb4c092";
+       version = "0.1.1.0";
+       sha256 = "453e3a4db149729e19bcbd6970abf0ed9d3c25dfffeac2c3cb5be3dcfdddc5dd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65111,15 +65380,15 @@ self: {
 
   "haskmon" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-streams
-     , io-streams, old-locale, time, vector
+     , io-streams, time, vector
      }:
      mkDerivation {
        pname = "haskmon";
-       version = "0.1.1.0";
-       sha256 = "e4543d24662764a8c646b9552129ffd36a06c58c6df8f8889f2b177b9a0457f7";
+       version = "0.2.1.0";
+       sha256 = "69ac7e21a62f20c2fce94db01c373dbd66876a0cb016ab25a99a9dedc4f62677";
        libraryHaskellDepends = [
-         aeson base bytestring containers http-streams io-streams old-locale
-         time vector
+         aeson base bytestring containers http-streams io-streams time
+         vector
        ];
        jailbreak = true;
        description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)";
@@ -66191,8 +66460,8 @@ self: {
      }:
      mkDerivation {
        pname = "hbro";
-       version = "1.4.0.1";
-       sha256 = "aafda5f16e1bc86dec50dde8ff18dbcb086987faba87cbe425225e59d107318a";
+       version = "1.5.0.0";
+       sha256 = "8f66263f288dba0e90cce6d6b9d2682b71acc46c2790128cba78b984c7990d6f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66217,8 +66486,8 @@ self: {
      }:
      mkDerivation {
        pname = "hbro-contrib";
-       version = "1.4.0.0";
-       sha256 = "425fbad68bd203ed4094d3c6b96d3e2d46818ec1ea6a950da8852978c3ebf86c";
+       version = "1.5.0.0";
+       sha256 = "0331c2024f52cfbefba781095e8309fd20cd32082a9a8887c3fcb4f52fc76fbc";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring classy-prelude containers
          directory glib gtk3 hbro lens monad-control mtl network-uri pango
@@ -67767,12 +68036,12 @@ self: {
      }:
      mkDerivation {
        pname = "hexpat-lens";
-       version = "0.1.3";
-       sha256 = "d96d6048d8f7f6773ad8322c8ba94b8852e8408ac64cd240d94af720fffd0309";
+       version = "0.1.4";
+       sha256 = "35783e1bb8654ac74866b7910f7f58385a78d0005d05c26bc7efd36ca9827978";
        libraryHaskellDepends = [
          base bytestring deepseq hexpat hexpat-tagsoup lens
        ];
-       jailbreak = true;
+       homepage = "https://github.com/tel/hexpat-lens";
        description = "Lenses for Hexpat";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -69709,18 +69978,19 @@ self: {
      }) { inherit (pkgs) openssl;};
 
   "hlibsass" = callPackage
-    ({ mkDerivation, base, hspec, sass }:
+    ({ mkDerivation, base, hspec, libsass }:
      mkDerivation {
        pname = "hlibsass";
        version = "0.1.4.0";
        sha256 = "2673ff4a4189bdfda61e5b936e1e91c4de29ede91db40055511a835ccbd35818";
+       configureFlags = [ "-fexternallibsass" ];
        libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ sass ];
+       librarySystemDepends = [ libsass ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/jakubfijalkowski/hlibsass";
        description = "Low-level bindings to Libsass";
        license = stdenv.lib.licenses.mit;
-     }) { sass = null;};
+     }) { inherit (pkgs) libsass;};
 
   "hlint" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
@@ -70692,8 +70962,8 @@ self: {
      }:
      mkDerivation {
        pname = "holy-project";
-       version = "0.2.0.0";
-       sha256 = "4f8feb2326214304a0326843383b3cf8e35862fb372f279c148f103ebbd09616";
+       version = "0.2.0.1";
+       sha256 = "b0f60f48377986212ee45a7ab360f4ef32578d4fa4b65cc21132f9c1e90a2814";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -71223,23 +71493,23 @@ self: {
      , base, base16-bytestring, binary, binary-conduit, bytestring
      , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
      , directory, errors, fgl, graphviz, happy, hOpenPGP, ixset-typed
-     , lens, monad-loops, old-locale, openpgp-asciiarmor
-     , optparse-applicative, resourcet, text, time, transformers
+     , lens, monad-loops, openpgp-asciiarmor, optparse-applicative
+     , resourcet, text, time, time-locale-compat, transformers
      , unordered-containers, wl-pprint-extras, yaml
      }:
      mkDerivation {
        pname = "hopenpgp-tools";
-       version = "0.16.2";
-       sha256 = "6f491a68846e60635e0e2dbc9c95cf245d88619a19c0abf83dd51b58e48f6588";
+       version = "0.16.3";
+       sha256 = "8ecdffae493b7ceaf3520f28883d9e12c6cdaaf444e3230c1c8c876d4cc9d25f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson ansi-wl-pprint array attoparsec base base16-bytestring binary
          binary-conduit bytestring conduit conduit-extra containers
          crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP
-         ixset-typed lens monad-loops old-locale openpgp-asciiarmor
-         optparse-applicative resourcet text time transformers
-         unordered-containers wl-pprint-extras yaml
+         ixset-typed lens monad-loops openpgp-asciiarmor
+         optparse-applicative resourcet text time time-locale-compat
+         transformers unordered-containers wl-pprint-extras yaml
        ];
        executableToolDepends = [ alex happy ];
        homepage = "http://floss.scru.org/hopenpgp-tools";
@@ -72188,8 +72458,8 @@ self: {
      }:
      mkDerivation {
        pname = "hruby";
-       version = "0.3.1.5";
-       sha256 = "aacbd1a8b4b8a10b6f144d6bb714817d164fae2a23abd922a2c4cc39581e32f5";
+       version = "0.3.1.6";
+       sha256 = "f1ca9df8c55a7b97749d1252ccb236d93432d125a55a2b4b26f5812f86dc22a8";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
@@ -74294,8 +74564,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.1.10";
-       sha256 = "f8fad4636ac0c89373c1b82e77fed8702ac84278597107ba9407052b9453a154";
+       version = "2.2.0";
+       sha256 = "0e733942f2b0c87b62ea43627ca3c90c7e638adb390efff48e5f2f6a7fd7117f";
        libraryHaskellDepends = [
          base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
          transformers
@@ -74360,8 +74630,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.1.10";
-       sha256 = "682e7e77e6f6256caefa6c0582d89dbee8efd864ac14a98cfba4707a9eb20ee0";
+       version = "2.2.0";
+       sha256 = "44e9c15cca1639ccc24fcd925cd53f92f96322f691ed6903724a8a626629edf1";
        libraryHaskellDepends = [
          ansi-terminal async base deepseq hspec-expectations HUnit
          QuickCheck quickcheck-io random setenv tf-random time transformers
@@ -74380,8 +74650,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.1.10";
-       sha256 = "efb14e44b9beef570d55c2db4904002bf61e7744cd00a3a5fc8c236b8f071a0b";
+       version = "2.2.0";
+       sha256 = "fd5f7535f31b202cfe0bc4e00a97488f32e66850b867993bc4903849d7e76a70";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath ];
@@ -74395,8 +74665,8 @@ self: {
     ({ mkDerivation, base, HUnit }:
      mkDerivation {
        pname = "hspec-expectations";
-       version = "0.7.1";
-       sha256 = "afcac6b3492a2db618e0e85e83cb106ba555fd966a3b045ee4aa30ccf199a258";
+       version = "0.7.2";
+       sha256 = "371a176b22ebdbc94b7bba55e0bda2296b44c11af01d20b23e4350ef7094a6f0";
        libraryHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/sol/hspec-expectations#readme";
        description = "Catchy combinators for HUnit";
@@ -74451,6 +74721,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-expectations-pretty-diff" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, Diff, haskell-src-exts
+     , hindent, hscolour, hspec, HUnit, text
+     }:
+     mkDerivation {
+       pname = "hspec-expectations-pretty-diff";
+       version = "0.7.2.2";
+       sha256 = "00c1ac7ceb6bed18c8c2ab7ac35342b024731e3fadf2c6304e549dc42d39ff38";
+       libraryHaskellDepends = [
+         ansi-terminal base Diff haskell-src-exts hindent hscolour HUnit
+         text
+       ];
+       testHaskellDepends = [ aeson base hspec HUnit text ];
+       homepage = "https://github.com/myfreeweb/hspec-expectations-pretty-diff#readme";
+       description = "Catchy combinators for HUnit";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hspec-experimental" = callPackage
     ({ mkDerivation, base, hspec, hspec-meta, HUnit, QuickCheck }:
      mkDerivation {
@@ -74496,8 +74784,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-meta";
-       version = "2.1.7";
-       sha256 = "ffe41373ac24ff3e3c8d9ae5dfaf33c126c48ab16bc08c43ab91a58292f3097a";
+       version = "2.2.0";
+       sha256 = "bfa8fb7708368d063eab0c005addbb0b2f3227d76af55e61676584fbf3abb8ba";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74556,13 +74844,15 @@ self: {
      }) {};
 
   "hspec-smallcheck" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, smallcheck }:
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }:
      mkDerivation {
        pname = "hspec-smallcheck";
-       version = "0.3.0";
-       sha256 = "bcb7e3e8f978177decafa7547da18717adf57228085ae49830db01b956f6cbfb";
-       libraryHaskellDepends = [ base hspec smallcheck ];
-       testHaskellDepends = [ base hspec QuickCheck smallcheck ];
+       version = "0.4.1";
+       sha256 = "c5ddd014ad58679554d2726a4442a124d7a3a9fad04c928c610cdc46773fc0f5";
+       libraryHaskellDepends = [ base hspec-core smallcheck ];
+       testHaskellDepends = [
+         base hspec hspec-core QuickCheck smallcheck
+       ];
        homepage = "http://hspec.github.io/";
        description = "SmallCheck support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
@@ -74586,6 +74876,7 @@ 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;
@@ -74683,8 +74974,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-webdriver";
-       version = "1.0.2";
-       sha256 = "2c3508c9c185c08fcd27f7e2fde69e212eecf4488a0411fc72ab679544d86df2";
+       version = "1.0.3";
+       sha256 = "24b736db0703acff84dfa7ed8cbccaf8b8d1884e4f609249b7461cd1b0959ff7";
        libraryHaskellDepends = [
          base data-default hashable hspec hspec-core HUnit lifted-base stm
          text transformers unordered-containers webdriver
@@ -76102,15 +76393,17 @@ self: {
      }) {};
 
   "http-link-header" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring-conversion, errors
-     , hspec, hspec-attoparsec, network-uri, QuickCheck, text
+    ({ mkDerivation, attoparsec, base, bytestring
+     , bytestring-conversion, errors, hspec, hspec-attoparsec
+     , network-uri, QuickCheck, text
      }:
      mkDerivation {
        pname = "http-link-header";
-       version = "0.2.0";
-       sha256 = "0c46155da7d411ba590b9d9d0eb735962bb9454b16bee61c455adf7b3858b56d";
+       version = "1.0.1";
+       sha256 = "908bb3356d3fe24615f5498c6dca1075f76f01e034838538a3c4b0ccc342e9b7";
        libraryHaskellDepends = [
-         attoparsec base bytestring-conversion errors network-uri text
+         attoparsec base bytestring bytestring-conversion errors network-uri
+         text
        ];
        testHaskellDepends = [
          base hspec hspec-attoparsec QuickCheck text
@@ -76647,6 +76940,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hunch" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , optparse-applicative, parsec, QuickCheck, split
+     }:
+     mkDerivation {
+       pname = "hunch";
+       version = "0.1.1";
+       sha256 = "2b959733b68066abcb8bddfb982c859b772070c2a16f27d183f1c61028817bae";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers directory filepath optparse-applicative parsec
+         split
+       ];
+       testHaskellDepends = [
+         base containers directory filepath optparse-applicative parsec
+         QuickCheck split
+       ];
+       homepage = "https://github.com/loganbraga/hunch";
+       description = "CSS-like syntax for file system manipulation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hunit-gui" = callPackage
     ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }:
      mkDerivation {
@@ -76925,8 +77241,8 @@ self: {
     ({ mkDerivation, base, HTF }:
      mkDerivation {
        pname = "hvect";
-       version = "0.2.0.0";
-       sha256 = "310fa7a975673fa99eaace924c0ec3b600d6d21d4f94625c855e97caadcc2a06";
+       version = "0.3.0.0";
+       sha256 = "b2931f7c3bca66b7b6fbfa46bacaf0fc6f8a6c75dc29c0567c3f682764407ebc";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTF ];
        homepage = "https://github.com/agrafix/hvect";
@@ -78432,6 +78748,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { ige-mac-integration = null;};
 
+  "ignore" = callPackage
+    ({ mkDerivation, base, directory, Glob, HTF, mtl, path, pcre-heavy
+     , text
+     }:
+     mkDerivation {
+       pname = "ignore";
+       version = "0.1.1.0";
+       sha256 = "aaf481fdab8bdc5a506e4726eadf56697726f82086a3cd0439526b9442c73575";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory Glob mtl path pcre-heavy text
+       ];
+       executableHaskellDepends = [ base directory path ];
+       testHaskellDepends = [ base HTF text ];
+       homepage = "http://github.com/agrafix/ignore";
+       description = "Handle ignore files of different VCSes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "igraph" = callPackage
     ({ mkDerivation, base, c2hs, containers, hashable, igraph
      , unordered-containers
@@ -78477,8 +78813,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell";
-       version = "0.6.4.1";
-       sha256 = "524cf3836857ba1762f895379b533352cf25a532ad8825f93f9842d9f235adbe";
+       version = "0.6.5.0";
+       sha256 = "e634513efa47aa3e369c3d7fb0ad038b1cba308186d4c50268641a97a727ddbb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78501,8 +78837,7 @@ self: {
          setenv shelly split stm strict system-argv0 text transformers unix
          unordered-containers utf8-string uuid vector
        ];
-       jailbreak = true;
-       homepage = "http://gibiansky.github.io/IHaskell/";
+       homepage = "http://github.com/gibiansky/IHaskell";
        description = "A Haskell backend kernel for the IPython project";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80596,27 +80931,25 @@ self: {
     ({ mkDerivation, array, attoparsec, base, base64-bytestring
      , bytestring, config-value, connection, containers
      , data-default-class, deepseq, directory, filepath, free
-     , haskell-lexer, lens, network, old-locale, split, stm, text, time
-     , tls, transformers, vty, x509, x509-store, x509-system
+     , haskell-lexer, lens, network, old-locale, regex-tdfa, split, stm
+     , text, time, tls, transformers, vty, x509, x509-store, x509-system
      , x509-validation
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "1.1.0.1";
-       sha256 = "a788848f0d60068ed173c394bf28ad637a85df4f3007daebe502126c1907c106";
-       revision = "5";
-       editedCabalFile = "8971a294711aaae3c327c2fe4f1f53eaed33a57b986585c934df43fa69e8f914";
+       version = "1.1.1";
+       sha256 = "9f8e78db1aacf1e74df042e951335277be5bf25e01d1206d119470b451dcd2eb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array attoparsec base base64-bytestring bytestring containers free
-         lens text time transformers
+         lens regex-tdfa text time transformers
        ];
        executableHaskellDepends = [
          array base bytestring config-value connection containers
          data-default-class deepseq directory filepath haskell-lexer lens
-         network old-locale split stm text time tls transformers vty x509
-         x509-store x509-system x509-validation
+         network old-locale regex-tdfa split stm text time tls transformers
+         vty x509 x509-store x509-system x509-validation
        ];
        homepage = "https://github.com/glguy/irc-core";
        description = "An IRC client library and text client";
@@ -81556,6 +81889,8 @@ self: {
        pname = "jammittools";
        version = "0.5.0.1";
        sha256 = "fd01f32dc319f7088791ce696d0421215a624bc7a2923bb8a39e4d102148cae1";
+       revision = "1";
+       editedCabalFile = "723bbb15b1cdc91151255c89977d67e330f4795c35dc330c5cc324d7784d53b6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -82273,6 +82608,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "json-litobj" = callPackage
+    ({ mkDerivation, base, hspec, json, QuickCheck }:
+     mkDerivation {
+       pname = "json-litobj";
+       version = "0.1.0.0";
+       sha256 = "4ac4bd3cc6a559d48445577763497f24b0fdd748bab81d241c1392abd8a41ce6";
+       libraryHaskellDepends = [ base json ];
+       testHaskellDepends = [ base hspec json QuickCheck ];
+       jailbreak = true;
+       homepage = "https://github.com/jonathankochems/json-litobj";
+       description = "Extends Text.JSON to handle literal JS objects.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "json-python" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, pureMD5
      , python, template-haskell
@@ -82932,17 +83281,12 @@ self: {
      }) {};
 
   "kansas-lava-shake" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, hastache
-     , kansas-lava, shake, temporary, text
-     }:
+    ({ mkDerivation, base, hastache, kansas-lava, shake, text }:
      mkDerivation {
        pname = "kansas-lava-shake";
-       version = "0.1.2";
-       sha256 = "a799b6707aa7cf898d1bfb5d9273390b15a04b7d81fcd76a2bf834224ecdb303";
-       libraryHaskellDepends = [
-         base containers directory filepath hastache kansas-lava shake
-         temporary text
-       ];
+       version = "0.2.0";
+       sha256 = "34837e499a3007fb9eeb84e7c0bfd7c3c3d53e9cb84a8a8851e98b1c84f4f6a4";
+       libraryHaskellDepends = [ base hastache kansas-lava shake text ];
        description = "Shake rules for building Kansas Lava projects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83442,8 +83786,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "keycode";
-       version = "0.1";
-       sha256 = "fb2efe1e2b85a638f784c6739533aaf5f52a6ad61f6ab6468d4fe1feab4992b3";
+       version = "0.1.1";
+       sha256 = "7db8ed3fb0ccfbf9cb98124a3585e883a65a93c320e2573df6bd28089276435e";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/RyanGlScott/keycode";
        description = "Maps web browser keycodes to their corresponding keyboard keys";
@@ -84328,6 +84672,7 @@ self: {
          template-haskell time transformers transformers-base unix
          utf8-string zlib
        ];
+       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot core functionality";
        license = "GPL";
@@ -85187,6 +85532,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "language-nix" = callPackage
+    ({ mkDerivation, base, containers, doctest, hspec, HUnit, mtl
+     , parsec, QuickCheck, transformers
+     }:
+     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
+       ];
+       testHaskellDepends = [
+         base containers doctest hspec HUnit mtl parsec QuickCheck
+         transformers
+       ];
+       homepage = "https://github.com/peti/language-nix";
+       description = "Haskell AST and Parsers for the Nix language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "language-objc" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , directory, filepath, happy, newtype, pretty, process, syb
@@ -85299,6 +85669,7 @@ self: {
          array base containers monads-tf pretty transformers utf8-string
        ];
        libraryToolDepends = [ alex happy ];
+       jailbreak = true;
        homepage = "http://github.com/bjpop/language-python";
        description = "Parsing and pretty printing of Python code";
        license = stdenv.lib.licenses.bsd3;
@@ -85446,8 +85817,8 @@ self: {
     ({ mkDerivation, base, pretty }:
      mkDerivation {
        pname = "language-vhdl";
-       version = "0.1.0.0";
-       sha256 = "ca55cb762f8b6225df178280dd5a0a3bf9fde2ac0ab942cdabd6239e8dedba33";
+       version = "0.1.0.2";
+       sha256 = "8fe8729b350bc5577ef1c4a9228769ff8a3c4341c5b4b548f963933b034ad59e";
        libraryHaskellDepends = [ base pretty ];
        homepage = "https://github.com/markus-git/language-vhdl";
        description = "VHDL AST and pretty printer in Haskell";
@@ -85973,8 +86344,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.15.1.3";
-       sha256 = "de00aa714ba2e60b7450e0fb7a382bdb88cc8ed9589ef10833e93782630488cf";
+       version = "0.15.1.4";
+       sha256 = "85f60091febd593f996c90cb9fa0e2f2dd1bff1f18a443244be1111540ea30ad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86012,8 +86383,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.15.0.7";
-       sha256 = "8d98649f6227f0fc3ad9aa169c74f435ec825a1333c57445860b9f8ff1ffc79d";
+       version = "0.15.0.8";
+       sha256 = "4367cdcbec1066dc0ef3c171f4345a495e67b68016cc90d2bceee652162b743f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86787,8 +87158,8 @@ self: {
      }:
      mkDerivation {
        pname = "libjenkins";
-       version = "0.8.1";
-       sha256 = "bfa08eb1f4b2e7c750fffcc0fbd0356b32c086a45af045364b7a2ca3ffe70402";
+       version = "0.8.2";
+       sha256 = "206f7e82ee6496f408347dc0828aea8018b0e7269cae02fcfa7504c750f79ec9";
        libraryHaskellDepends = [
          async attoparsec base bytestring conduit containers free
          http-client http-conduit http-types monad-control mtl network
@@ -86870,8 +87241,8 @@ self: {
      }:
      mkDerivation {
        pname = "libmpd";
-       version = "0.9.0.2";
-       sha256 = "5fb64d0196204a29bfb655118891c19310969e452599fda2667f7ff7d265d4e0";
+       version = "0.9.0.3";
+       sha256 = "3f0c520f19520dae35bf0d6aebf2fffef067964ace91047193b330a6dfaaa3d6";
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class filepath
          mtl network old-locale text time utf8-string
@@ -87560,6 +87931,7 @@ self: {
        libraryHaskellDepends = [
          base distributive lens linear OpenGL OpenGLRaw tagged
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/bgamari/linear-opengl";
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
@@ -88178,6 +88550,7 @@ self: {
        testHaskellDepends = [
          attoparsec base-prelude either hspec list-t list-t-text text
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t-attoparsec";
        description = "An \"attoparsec\" adapter for \"list-t\"";
        license = stdenv.lib.licenses.mit;
@@ -88202,6 +88575,7 @@ self: {
          base-prelude conversion conversion-text either hspec html-tokenizer
          list-t-attoparsec list-t-text text xml-types
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t-html-parser";
        description = "Streaming HTML parser";
        license = stdenv.lib.licenses.mit;
@@ -88256,6 +88630,7 @@ self: {
          base base-prelude bytestring hspec list-t QuickCheck
          quickcheck-instances text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t-text";
        description = "A streaming text codec";
        license = stdenv.lib.licenses.mit;
@@ -89563,8 +89938,8 @@ self: {
      }:
      mkDerivation {
        pname = "ltk";
-       version = "0.15.0.3";
-       sha256 = "86e0ed96110ad0b2be8d63828e4ab8429893e4c269b28a95f4e1d70c73bc05c2";
+       version = "0.15.0.4";
+       sha256 = "6d39540a1aa73516d9390d8d49f1f9b8ec5f9cf15bede8cd51a25810ec345193";
        libraryHaskellDepends = [
          base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text
          transformers
@@ -89916,8 +90291,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzma";
-       version = "0.0.0.0";
-       sha256 = "ba6bd66b58d0b378d5f95bb0436257c2862a77352f24ae7c459b82646b6e81c9";
+       version = "0.0.0.1";
+       sha256 = "576583fa5ac2110ca62f24dea62a1bb6effeba51c31b9fe06862dcfa8f7a38ac";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ lzma ];
        testHaskellDepends = [
@@ -89928,6 +90303,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) lzma;};
 
+  "lzma-clib" = callPackage
+    ({ mkDerivation, only-buildable-on-windows }:
+     mkDerivation {
+       pname = "lzma-clib";
+       version = "5.2.1";
+       sha256 = "51f0e8ea4679f80d3c22b6fbf022062b7ac12b4d6b1e6b0f938194ca9a88adcc";
+       libraryHaskellDepends = [ only-buildable-on-windows ];
+       jailbreak = true;
+       description = "liblzma C library and headers for use by LZMA bindings";
+       license = stdenv.lib.licenses.publicDomain;
+       broken = true;
+     }) { only-buildable-on-windows = null;};
+
   "lzma-conduit" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, conduit, HUnit
      , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit
@@ -90226,14 +90614,13 @@ self: {
     ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
      mkDerivation {
        pname = "magico";
-       version = "0.0.0.1";
-       sha256 = "97f4f606544bbc741b593d96167bcd4e80d2f5f98face9460a1c6ab1dab12c38";
+       version = "0.0.1.1";
+       sha256 = "149e482d11268d45fb6da03cfa45a0947ea7cacc259c27959314a029c06c2633";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base hmatrix transformers utility-ht
        ];
-       jailbreak = true;
        homepage = "http://hub.darcs.net/thielema/magico";
        description = "Compute solutions for Magico puzzle";
        license = stdenv.lib.licenses.bsd3;
@@ -91986,6 +92373,7 @@ self: {
        testHaskellDepends = [
          base bytestring data-default-class hspec HUnit network process
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/memcached-binary";
        description = "memcached client using binary protocol";
        license = stdenv.lib.licenses.mit;
@@ -92353,29 +92741,34 @@ self: {
      }) {};
 
   "microformats2-parser" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, containers
-     , data-default, either, hspec, html-conduit, microformats2-types
-     , network, options, pcre-heavy, raw-strings-qq, safe, scotty
-     , streaming-commons, stringable, template-haskell, text, time
-     , wai-extra, warp, xml-lens, xss-sanitize
+    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, blaze-html
+     , blaze-markup, bytestring, containers, data-default, either, hspec
+     , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl
+     , network, network-uri, options, pcre-heavy, raw-strings-qq, safe
+     , scotty, streaming-commons, stringable, template-haskell, text
+     , time, transformers, unordered-containers, vector, wai-extra, warp
+     , xml-lens, xss-sanitize
      }:
      mkDerivation {
        pname = "microformats2-parser";
-       version = "0.1.1";
-       sha256 = "a5506e71b8ab918964c3d26982fea093f173db15ce388641dc4909aebea78c58";
+       version = "1.0.1.1";
+       sha256 = "281212dd0fb8d61af7c4eaf4b0fa57d31b0267c8e8e1dea12cede8a6efc1a2e9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base blaze-markup containers data-default either html-conduit
-         microformats2-types pcre-heavy safe text time xml-lens xss-sanitize
+         aeson aeson-qq base blaze-markup bytestring containers data-default
+         either html-conduit lens-aeson network-uri pcre-heavy safe text
+         time transformers unordered-containers vector xml-lens xss-sanitize
        ];
        executableHaskellDepends = [
-         base blaze-html blaze-markup microformats2-types network options
-         scotty streaming-commons stringable text wai-extra warp
+         aeson aeson-pretty base blaze-html blaze-markup data-default
+         network network-uri options scotty streaming-commons stringable
+         text wai-extra warp
        ];
        testHaskellDepends = [
-         base data-default hspec html-conduit microformats2-types
-         raw-strings-qq template-haskell time xml-lens
+         aeson-qq base bytestring data-default hspec
+         hspec-expectations-pretty-diff html-conduit mtl network-uri
+         raw-strings-qq template-haskell text time xml-lens
        ];
        homepage = "https://github.com/myfreeweb/microformats2-parser";
        description = "A Microformats 2 parser";
@@ -92403,8 +92796,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.3.1.0";
-       sha256 = "6c822ad2697798b5073f2d04a8951392b6cead80ede5713ad415aa4213b565ee";
+       version = "0.3.2.0";
+       sha256 = "a20e1082261e08b258e964484b2df4557a135832f18cd424eb8c030fbe62d402";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library which you can depend upon";
@@ -92460,8 +92853,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-platform";
-       version = "0.1.1.0";
-       sha256 = "73511b2b66b356a1231d7a3a7b2da9021ad5f03c9ab61cfa659483fa03166ad6";
+       version = "0.1.2.0";
+       sha256 = "5a44b16b764fae1de9b29a114784abbb7aaa75270c2c4a21a026656ab1e24471";
        libraryHaskellDepends = [
          base hashable microlens microlens-ghc microlens-mtl microlens-th
          text unordered-containers vector
@@ -92475,8 +92868,8 @@ self: {
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
        pname = "microlens-th";
-       version = "0.2.1.1";
-       sha256 = "e38ef1cc80a44aadb9e6ffbea6647eceb84971b05a00f64bdd3fde4e2a4a7277";
+       version = "0.2.1.2";
+       sha256 = "ea17fb111790953667cd75e1e29823107eb2123ce41c27a77a71d5c7102a39f9";
        libraryHaskellDepends = [
          base containers microlens template-haskell
        ];
@@ -93538,8 +93931,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.20";
-       sha256 = "06cb6e29dde04f62c9519fa295551e4130f596a96e74fceb9c2e36552d9de52e";
+       version = "0.1.0.24";
+       sha256 = "0a95707996c4c6f68a222063fa22008b038865ea8a8cb57bcbedd9a5bba72ba6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -94642,17 +95035,17 @@ self: {
   "mono-traversable" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers, dlist
      , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck
-     , semigroupoids, semigroups, text, transformers
+     , semigroupoids, semigroups, split, text, transformers
      , unordered-containers, vector, vector-algorithms, vector-instances
      }:
      mkDerivation {
        pname = "mono-traversable";
-       version = "0.9.2.1";
-       sha256 = "34c3827b49e47e83bdbed647ae6ca27e049be8887904007b57b03dc006b542ef";
+       version = "0.9.3";
+       sha256 = "d73b495b65cdc3951e2407d07e46b3cb5b3ab074b474c0742687b616f4e7e4db";
        libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
-         semigroupoids semigroups text transformers unordered-containers
-         vector vector-algorithms vector-instances
+         semigroupoids semigroups split text transformers
+         unordered-containers vector vector-algorithms vector-instances
        ];
        testHaskellDepends = [
          base bytestring containers foldl hspec HUnit QuickCheck semigroups
@@ -95552,6 +95945,7 @@ self: {
          http-conduit http-types process random snap-core snap-server stm
          text transformers
        ];
+       jailbreak = true;
        description = "Continuous deployment server for use with GitHub";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95684,8 +96078,8 @@ self: {
      }:
      mkDerivation {
        pname = "multihash";
-       version = "0.1.1";
-       sha256 = "2f2c507fdd1492bbcdca737d6c0f8abdd4a0a9941f1661fd04c6b606f9c9d227";
+       version = "0.1.2";
+       sha256 = "dd2b0511c900d83794dec151008b0bec07be676dc0cbb073ce11d5b754c47538";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97285,8 +97679,8 @@ self: {
      }:
      mkDerivation {
        pname = "neil";
-       version = "0.9";
-       sha256 = "3385ec7c186bd4e51630015a0d1a2425e43b56c41c5a34571d2da02e16e9e431";
+       version = "0.10";
+       sha256 = "7bf2215903836e058bdbbc0c884e773f081c03f79cfa99964e620969e03a139f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -99772,8 +100166,10 @@ self: {
      }:
      mkDerivation {
        pname = "nurbs";
-       version = "0.1.0.0";
-       sha256 = "91879fb8840fc1bc907c63df125880a367ec5b52d544806be1306b235103afe7";
+       version = "0.1.1.0";
+       sha256 = "42459775e2b1c419343402da693465f3db61c5ab6e5666f44d810b568cf33054";
+       revision = "1";
+       editedCabalFile = "17ee68339f33b5fa8ccc3ddf788ee5cb3ab3f40170b93175925a1b97534afdbc";
        libraryHaskellDepends = [
          base base-unicode-symbols lens linear mtl
        ];
@@ -99796,8 +100192,8 @@ self: {
      }:
      mkDerivation {
        pname = "nvim-hs";
-       version = "0.0.3";
-       sha256 = "e5768324a22d0e282f2e9e839fbe32b0943f120aa851499f1db9388612bddcb1";
+       version = "0.0.5";
+       sha256 = "46474d2b4ff86a79a94af581f556a527bfc97cddea5c00d7d3cfaaa94fedc6ef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -99836,6 +100232,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nylas" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, lens, lens-aeson, pipes
+     , pipes-aeson, pipes-bytestring, pipes-http, pipes-parse, text
+     , time, wreq
+     }:
+     mkDerivation {
+       pname = "nylas";
+       version = "0.1.1";
+       sha256 = "a78d4e6d4841049f447b110df0ad22a0af764d845a19791b54a8f5d29e29d6b0";
+       libraryHaskellDepends = [
+         aeson base bytestring lens lens-aeson pipes pipes-aeson
+         pipes-bytestring pipes-http pipes-parse text time wreq
+       ];
+       homepage = "https://github.com/bts/nylas-hs";
+       description = "Client for the Nylas API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nymphaea" = callPackage
     ({ mkDerivation, base, cairo, containers, glade, glib, gtk, mtl
      , parsec, random
@@ -101718,8 +102132,8 @@ self: {
      }:
      mkDerivation {
        pname = "packdeps";
-       version = "0.4.0.3";
-       sha256 = "172e351d24db1934e2507b5f516c9575c65705a0c7e8e6091f0d11f2b84d5621";
+       version = "0.4.1";
+       sha256 = "c43f878515ecf1e972f683a2671ed941e4389fab4920e68527f8015572a04e36";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102064,8 +102478,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.3.0";
-       sha256 = "f3cdb3988ac223111dc7ccb3a28aa8a4db91ace098475f5e8e0c8f8bcfe6b8bd";
+       version = "0.1.4.0";
+       sha256 = "730cfde295f11c0c328bab8f5ad505743ad42017b899e599245cf7e2db760b23";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -103267,15 +103681,15 @@ self: {
      }:
      mkDerivation {
        pname = "pcre-heavy";
-       version = "0.2.2";
-       sha256 = "834ba945e545983a96d7aa960b86cbbbd8cf5861e367f7919ff2e2e2ea369b21";
+       version = "0.2.5";
+       sha256 = "01b599e8a3629795b4afb2bbb9e65bb114ddbccd867ca8806d75aa56e3bacde7";
        libraryHaskellDepends = [
          base bytestring pcre-light stringable template-haskell
        ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/myfreeweb/pcre-heavy";
        description = "A regexp library on top of pcre-light you can actually use";
-       license = "unknown";
+       license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "pcre-less" = callPackage
@@ -103337,8 +103751,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-toolbox-content";
-       version = "0.0.3.3";
-       sha256 = "2ccd016046b37ef99fc5d21876cfd9b241e0e85671a54718648fbc65edb87e0e";
+       version = "0.0.4.0";
+       sha256 = "de615950a445022afc2950765d5be9cc7cf16c90bbcc3b4eeded8f491e9afd54";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring containers io-streams
          pdf-toolbox-core text
@@ -103355,13 +103769,12 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-toolbox-core";
-       version = "0.0.3.3";
-       sha256 = "1599278af33e5a053ff1f6b88d6a2db45f841988300a1723a02423bcd9b9ce00";
+       version = "0.0.4.0";
+       sha256 = "72760da19e24bea4f2bee3114ce702437d413c531347c8fd544fcae717c83e95";
        libraryHaskellDepends = [
          attoparsec base bytestring containers errors io-streams scientific
          transformers zlib-bindings
        ];
-       jailbreak = true;
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
@@ -103375,8 +103788,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-toolbox-document";
-       version = "0.0.5.1";
-       sha256 = "9a7bc1725a725340b4b290669cffbf32596ff8c1078ee5f9f549e6dd61839661";
+       version = "0.0.6.0";
+       sha256 = "ce5f7e1622c73ecfa24e8ec590dad12c3ca27db6bdac20738bff5f0bdce01231";
        libraryHaskellDepends = [
          base bytestring cipher-aes cipher-rc4 containers crypto-api
          cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text
@@ -103395,8 +103808,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-toolbox-viewer";
-       version = "0.0.3.3";
-       sha256 = "e24b4573520eb1bc27cd8cccc06c036196f514aead62d952b45cd0d2d6eed60a";
+       version = "0.0.4.0";
+       sha256 = "cd7d565349c7ff1c6d3fd04e7f9523732fb03dc000a37cdb07f45ae14f93b05c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -105217,14 +105630,17 @@ self: {
      }) {};
 
   "pipes-group" = callPackage
-    ({ mkDerivation, base, free, pipes, pipes-parse, transformers }:
+    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
+     , pipes-parse, transformers
+     }:
      mkDerivation {
        pname = "pipes-group";
-       version = "1.0.2";
-       sha256 = "e056ab94a9211698505491a7958c56aa52b682b4bdc32fa0a369bc7c16906106";
+       version = "1.0.3";
+       sha256 = "f0f20cc29410d84faeae1fe055d3d1041a205c27403d627bd865489c7f7ec200";
        libraryHaskellDepends = [
          base free pipes pipes-parse transformers
        ];
+       testHaskellDepends = [ base doctest lens-family-core ];
        description = "Group streams into substreams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106247,10 +106663,8 @@ self: {
      }:
      mkDerivation {
        pname = "poly-arity";
-       version = "0.0.4.1";
-       sha256 = "975b761a7c81144c2455fd6c05bb7d1891782659d4fc0a01e57941c57145d497";
-       revision = "2";
-       editedCabalFile = "0bce1ff7388433830c7824530bb9c4fe3f4545bad44683dec2a5780028d870af";
+       version = "0.0.5";
+       sha256 = "d0787fa2a151080e2138b64dd4adc4dc8e41857e22fa494703f9f876e6cd25bb";
        libraryHaskellDepends = [ base constraints HList ];
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-instances
@@ -106927,18 +107341,19 @@ self: {
      , postgresql-simple, QuickCheck, quickcheck-assertions
      , quickcheck-instances, resource-pool, semigroups, tasty
      , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text
-     , time, transformers, transformers-base, transformers-compat
+     , th-lift, th-lift-instances, time, transformers, transformers-base
+     , transformers-compat
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "1.4.0";
-       sha256 = "593bae5989407891835faffd572ee8fdfd474ff5c1e9a14395db55c9a8d6452d";
+       version = "2.0.0";
+       sha256 = "09b0d4c664ab4965ab61f3c30cb303d03ca18b58dfb76654d733b02572966046";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default either exceptions file-embed haskell-src-meta hreader
          hset monad-control monad-logger mtl postgresql-simple resource-pool
-         semigroups template-haskell text time transformers
-         transformers-base transformers-compat
+         semigroups template-haskell text th-lift th-lift-instances time
+         transformers transformers-base transformers-compat
        ];
        testHaskellDepends = [
          attoparsec base QuickCheck quickcheck-assertions
@@ -110129,9 +110544,10 @@ self: {
     ({ mkDerivation, base, HUnit, QuickCheck }:
      mkDerivation {
        pname = "quickcheck-io";
-       version = "0.1.1";
-       sha256 = "a23a6e011aafd211c2521ddb9f61ffb5d256837148b5f5c35a152bdb37d6039b";
+       version = "0.1.2";
+       sha256 = "50275e5253dcf0c838e340fa19eb841804deb634aeedbf33f0b46a97b89bc1cd";
        libraryHaskellDepends = [ base HUnit QuickCheck ];
+       homepage = "https://github.com/hspec/quickcheck-io#readme";
        description = "Use HUnit assertions as QuickCheck properties";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -111376,8 +111792,8 @@ self: {
     ({ mkDerivation, aeson, base, deepseq, mtl, text }:
      mkDerivation {
        pname = "react-flux";
-       version = "0.9.0";
-       sha256 = "6da5232f92bd5667a0ff2b6c3bbe9139ba412e82a8f619cfd05f2c056b907209";
+       version = "0.9.1";
+       sha256 = "704b253c655442c03eb90e1c4b36660dc6416745c041c590362c3f6762cc9615";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base deepseq mtl text ];
@@ -111942,23 +112358,23 @@ self: {
 
   "reddit" = callPackage
     ({ mkDerivation, aeson, api-builder, base, bytestring, Cabal
-     , data-default, hspec, http-conduit, http-types, network, stm, text
-     , time, transformers, unordered-containers, vector
+     , data-default-class, free, hspec, http-client, http-client-tls
+     , http-types, network, text, time, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "reddit";
-       version = "0.1.1.0";
-       sha256 = "f3bcada2af55e8b70fffabd918ac1f4fa51cd81765e8cc8a5e4495461b579aba";
+       version = "0.2.0.0";
+       sha256 = "1969dea9612d12611b73f209466e6567e46a2706b59f2f243234d47bf2749ec0";
        libraryHaskellDepends = [
-         aeson api-builder base bytestring data-default http-conduit
-         http-types network stm text time transformers unordered-containers
-         vector
+         aeson api-builder base bytestring data-default-class free
+         http-client http-client-tls http-types network text time
+         transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         api-builder base bytestring Cabal hspec http-conduit text time
-         transformers
+         aeson api-builder base bytestring Cabal hspec http-client
+         http-client-tls text time transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/intolerable/reddit";
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
@@ -112317,6 +112733,7 @@ self: {
        testHaskellDepends = [
          base containers dependent-map MemoTrie mtl ref-tf
        ];
+       jailbreak = true;
        homepage = "https://github.com/ryantrinkle/reflex";
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -112379,6 +112796,7 @@ self: {
        libraryHaskellDepends = [
          base dependent-sum gloss reflex transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/reflex-frp/reflex-gloss";
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
@@ -112699,6 +113117,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "regex-tdfa-pipes" = callPackage
+    ({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base
+     , regex-tdfa
+     }:
+     mkDerivation {
+       pname = "regex-tdfa-pipes";
+       version = "0.1.0.0";
+       sha256 = "221369b630ea479034bf959e936a71646ec9d13db13035d817cc7c10eb1d3098";
+       libraryHaskellDepends = [
+         array base lens monads-tf pipes regex-base regex-tdfa
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/erisco/regex-tdfa-pipes";
+       description = "Parse with regular expressions on Producers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "regex-tdfa-quasiquoter" = callPackage
+    ({ mkDerivation, base, regex-tdfa, template-haskell }:
+     mkDerivation {
+       pname = "regex-tdfa-quasiquoter";
+       version = "0.1.0.0";
+       sha256 = "acafaa4c7a536483cc75952cdb9a8e7ae0bc1b76deb5170f405c0194e64859fc";
+       libraryHaskellDepends = [ base regex-tdfa template-haskell ];
+       jailbreak = true;
+       homepage = "http://github.com/erisco/regex-tdfa-quasiquoter";
+       description = "Quasi-quoter for TDFA (extended POSIX) regular expressions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "regex-tdfa-rc" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
      , parsec, regex-base
@@ -112719,10 +113167,8 @@ self: {
     ({ mkDerivation, array, base, regex-base, regex-tdfa, text }:
      mkDerivation {
        pname = "regex-tdfa-text";
-       version = "1.0.0.2";
-       sha256 = "cdad83b2c3b871e00404eb8649b056465c5f27c494634f6324a77521c7ee27dc";
-       revision = "2";
-       editedCabalFile = "4b0e54f79540143c88adb071ea8e0aa3734a625db026a6a44ca2ef45b870b07c";
+       version = "1.0.0.3";
+       sha256 = "38d77a0d225c306c52c6d4eed12d11d05a4bc4194d547cb9a7a9b6f5a8792001";
        libraryHaskellDepends = [ array base regex-base regex-tdfa text ];
        description = "Text interface for regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
@@ -113931,14 +114377,13 @@ self: {
     ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
      mkDerivation {
        pname = "resistor-cube";
-       version = "0.0";
-       sha256 = "6c1eeaf029f0990b141dcdb7ba930bd3a16eb6b670a3d60cf83c0b37c65db269";
+       version = "0.0.0.2";
+       sha256 = "0592c448a0dcfc583ca8c6217cc4a89c5bf6875c0ec176db4490cdca8c480220";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base hmatrix transformers utility-ht
        ];
-       jailbreak = true;
        homepage = "http://hub.darcs.net/thielema/resistor-cube";
        description = "Compute total resistance of a cube of resistors";
        license = stdenv.lib.licenses.bsd3;
@@ -114358,8 +114803,8 @@ self: {
      }:
      mkDerivation {
        pname = "rethinkdb";
-       version = "2.0.0.0";
-       sha256 = "cdc4aa7a96ffeb2804ee644aee58013915388de5a21979adaa7a27456c7bb125";
+       version = "2.1.0.1";
+       sha256 = "3d8a61d33361e8fd90d3ac3f63f57d1f660f9102c09b406b2ac2ff571711a5cb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114371,7 +114816,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        jailbreak = true;
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
-       description = "A driver for RethinkDB 2.0";
+       description = "A driver for RethinkDB 2.1";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -114383,8 +114828,8 @@ self: {
      }:
      mkDerivation {
        pname = "rethinkdb-client-driver";
-       version = "0.0.19";
-       sha256 = "d1db41828f7290919cb25be67b86c8f5834266ab52485ffc6f638447ddf5f57b";
+       version = "0.0.20";
+       sha256 = "9cd46fed35bfb1b09283e9109e6da5d848b6e50794e4debe4819f3654d4b8381";
        libraryHaskellDepends = [
          aeson base binary bytestring hashable mtl network old-locale
          scientific template-haskell text time unordered-containers vector
@@ -114515,8 +114960,8 @@ self: {
      }:
      mkDerivation {
        pname = "reverse-geocoding";
-       version = "0.2.1";
-       sha256 = "1a05a7be8baff090de7f58f0a970ad9dc1a12cb76d050ead76f6c317b60b3721";
+       version = "0.2.2.1";
+       sha256 = "0c63a52ef6bd4f62b9b9fe0c16e279d3cf91326847da0f3c778a8e867c059b7c";
        libraryHaskellDepends = [
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
@@ -115623,8 +116068,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "rspp";
-       version = "0.1.0.0";
-       sha256 = "ec2e950158f8fdb0c9ba78778e2637a07a47b17b51d4cac5b3f2a0c43f349de6";
+       version = "0.1.0.1";
+       sha256 = "3e6771df48c5949c27d020d325295dbc322e0a1427db7f70bccf2552d73d5a8c";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/AJChapman/rspp";
@@ -116593,8 +117038,8 @@ self: {
      }:
      mkDerivation {
        pname = "satchmo";
-       version = "2.9.9";
-       sha256 = "7c4930eab38145ddd9e086e14b8061267e3d56358884a206e9b06d775a17918c";
+       version = "2.9.9.1";
+       sha256 = "3414dcc5184cd34bce55eb041ff84f8985672964c64786d146b9520237ee13e2";
        libraryHaskellDepends = [
          array async base bytestring containers deepseq directory hashable
          lens memoize minisat mtl process transformers
@@ -117398,6 +117843,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "scotty-rest" = callPackage
+    ({ mkDerivation, base, base-prelude, bytestring, convertible
+     , data-default-class, hspec, hspec-wai, http-date, http-media
+     , http-types, mtl, QuickCheck, scotty, string-conversions, text
+     , time, transformers, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "scotty-rest";
+       version = "0.1.0.0";
+       sha256 = "4012c5bf50c1512e7053027fd0068df817b7710f294f24bb6563a4a0b73b1dfc";
+       libraryHaskellDepends = [
+         base base-prelude bytestring convertible data-default-class
+         http-date http-media http-types mtl scotty string-conversions text
+         time transformers wai wai-extra
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-wai mtl QuickCheck scotty
+         string-conversions text wai
+       ];
+       homepage = "http://github.com/ehamberg/scotty-rest";
+       description = "Webmachine-style REST library for scotty";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "scotty-session" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , crypto-api, http-types, scotty, stm, text, time, transformers
@@ -117808,8 +118277,8 @@ self: {
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.6.0.0";
-       sha256 = "fcfcf1aa3ac621abd651d9213b070d66ab638e2dfdaaf22e8bdaa0bf1c36e2f0";
+       version = "0.6.1.0";
+       sha256 = "fd57241ab24d7f752326573ea74240b168b1ff6168cf20b35af9d764368c5c72";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring binary bytestring clock conduit
          containers deepseq exceptions hashable hashtables hslogger http2
@@ -118071,14 +118540,13 @@ self: {
      }:
      mkDerivation {
        pname = "semigroupoids";
-       version = "5.0.0.3";
-       sha256 = "17dc07085806c6b8c79863f489f0ad534713578a529935b081691830bab4d292";
+       version = "5.0.0.4";
+       sha256 = "cde047e36c4072dd32fcda5846155a3dd4e844f441e4c651b886ee069d95c7c9";
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad containers contravariant
          distributive semigroups tagged transformers transformers-compat
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
@@ -118900,6 +119368,7 @@ self: {
          acid-state base containers hspec mtl safecopy serversession
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using acid-state";
        license = stdenv.lib.licenses.mit;
@@ -119087,12 +119556,12 @@ self: {
     ({ mkDerivation, base, containers, utility-ht }:
      mkDerivation {
        pname = "set-cover";
-       version = "0.0.4";
-       sha256 = "7200a1908e0097d2336023404f16a5493bbb67d3afe3aef9508a9569a5a0430c";
+       version = "0.0.5";
+       sha256 = "a3a4b4f2099780fe5652036346d7dae2bf1db4a56e77e663ca6964312dec7c99";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers utility-ht ];
-       homepage = "http://code.haskell.org/~thielema/set-cover/";
+       homepage = "http://hub.darcs.net/thielema/set-cover/";
        description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121521,23 +121990,25 @@ self: {
      }) {};
 
   "sloane" = callPackage
-    ({ mkDerivation, ansi-terminal, base, bytestring, cereal
-     , containers, directory, download-curl, filepath, HTTP, network
-     , optparse-applicative, stringsearch, terminal-size, text, zlib
+    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+     , bloomfilter, bytestring, conduit, conduit-extra, containers
+     , directory, filepath, http-conduit, http-types
+     , optparse-applicative, stringsearch, terminal-size, text
+     , transformers
      }:
      mkDerivation {
        pname = "sloane";
-       version = "2.0.5";
-       sha256 = "29225cd58923e0b595e6920ba035f359766f588747d9d7f4022c4d610bf7b6ca";
+       version = "4.0.1";
+       sha256 = "015cc227cab7e205c0684821138f36d4d38a9fee893fbf23d13add0e27ec19e9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal base bytestring cereal containers directory
-         download-curl filepath HTTP network optparse-applicative
-         stringsearch terminal-size text zlib
+         aeson ansi-terminal attoparsec base bloomfilter bytestring conduit
+         conduit-extra containers directory filepath http-conduit http-types
+         optparse-applicative stringsearch terminal-size text transformers
        ];
        homepage = "http://github.com/akc/sloane";
-       description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences";
+       description = "A command line interface to Sloane's OEIS";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -121812,6 +122283,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smsaero" = callPackage
+    ({ mkDerivation, aeson, base, either, servant, servant-client, text
+     , time
+     }:
+     mkDerivation {
+       pname = "smsaero";
+       version = "0.1.1";
+       sha256 = "d6d37cae946a2bdea1f4e5d05b3bcde56ee12362c72f490bf138ca3b8d9446d3";
+       libraryHaskellDepends = [
+         aeson base either servant servant-client text time
+       ];
+       homepage = "https://github.com/GetShopTV/smsaero";
+       description = "SMSAero API and HTTP client based on servant library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smt-lib" = callPackage
     ({ mkDerivation, array, base, directory, polyparse }:
      mkDerivation {
@@ -122071,10 +122558,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-core";
-       version = "0.9.7.2";
-       sha256 = "526a8ebb758c8da5e966a37449fdb072af333275c1b7726ab6317ac93875f651";
-       revision = "1";
-       editedCabalFile = "d39520edcc970d9d1f683af9631ccbcad39536b9f88040b93efb66cbe7aefc55";
+       version = "0.9.8.0";
+       sha256 = "47310fcd9c347883f5985c27c1fbcfac8c5783472a01afcc720bcc850622d2db";
        libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base blaze-builder
          blaze-builder-enumerator bytestring bytestring-mmap
@@ -122322,6 +122807,7 @@ self: {
        libraryHaskellDepends = [
          acid-state base mtl snap text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/mightybyte/snaplet-acid-state";
        description = "acid-state snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -122736,10 +123222,8 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-postgresql-simple";
-       version = "0.6.0.2";
-       sha256 = "b792889664db48fda8bafe5dbf306bf060ffbf0837daac4ef3ddec59534fa677";
-       revision = "2";
-       editedCabalFile = "cfc56ee20478bf05a650bdcb457b606a640daa71b84a3a2a3bdb8930dcbbeb7b";
+       version = "0.6.0.3";
+       sha256 = "0f4c86c9d94560a1e12af151a7ab9bb7e21f10c70ddb5403ae8503dd1a0cf866";
        libraryHaskellDepends = [
          base bytestring clientsession configurator errors lens
          MonadCatchIO-transformers mtl postgresql-simple
@@ -126487,12 +126971,12 @@ self: {
      }) {};
 
   "streaming" = callPackage
-    ({ mkDerivation, base, ghc-prim, mmorph, mtl, transformers }:
+    ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "streaming";
-       version = "0.1.0.6";
-       sha256 = "604014b7d23181e7906b81a9bca1829f8e63b8e3dc690709a7d5c348d0ff3af9";
-       libraryHaskellDepends = [ base ghc-prim mmorph mtl transformers ];
+       version = "0.1.0.7";
+       sha256 = "67f6aed768c1a6537fcf7587d1f5ab0fcec4ab9e4489ce6802aae483f67c9362";
+       libraryHaskellDepends = [ base mmorph mtl transformers ];
        homepage = "https://github.com/michaelt/streaming";
        description = "A free monad transformer optimized for streaming applications";
        license = stdenv.lib.licenses.bsd3;
@@ -126924,6 +127408,7 @@ self: {
          aeson base bytestring either HsOpenSSL hspec http-streams random
          text time transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/dmjio/stripe";
        description = "Stripe API for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -129436,18 +129921,18 @@ self: {
      }) {};
 
   "tasty-hspec" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random, tasty
-     , tasty-quickcheck, tasty-smallcheck
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
+     , tagged, tasty, tasty-quickcheck, tasty-smallcheck
      }:
      mkDerivation {
        pname = "tasty-hspec";
-       version = "1.1";
-       sha256 = "260ae081474e173e957fc268455520aba320536a0495656609acbd499c349e96";
+       version = "1.1.2";
+       sha256 = "69c5409e70694e8ba5791aaeb272e34af37cd28665c6d1c1f742cc7f053fab67";
        libraryHaskellDepends = [
-         base hspec hspec-core QuickCheck random tasty tasty-quickcheck
-         tasty-smallcheck
+         base hspec hspec-core QuickCheck random tagged tasty
+         tasty-quickcheck tasty-smallcheck
        ];
-       homepage = "http://github.com/mitchellwrosen/tasty-hspec";
+       homepage = "https://github.com/mitchellwrosen/tasty-hspec";
        description = "Hspec support for the Tasty test framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129626,6 +130111,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-tap" = callPackage
+    ({ mkDerivation, base, containers, directory, stm, tasty
+     , tasty-golden, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "tasty-tap";
+       version = "0.0.1";
+       sha256 = "c751cea8c7a33e8ec159a661ced1642aa29c2038d876ad1d95c27121848a00c8";
+       libraryHaskellDepends = [ base containers stm tasty ];
+       testHaskellDepends = [
+         base directory tasty tasty-golden tasty-hunit
+       ];
+       homepage = "https://github.com/michaelxavier/tasty-tap";
+       description = "TAP (Test Anything Protocol) Version 13 formatter for tasty";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tasty-th" = callPackage
     ({ mkDerivation, base, language-haskell-extract, tasty
      , template-haskell
@@ -130360,6 +130862,8 @@ self: {
        pname = "test-framework-hunit";
        version = "0.3.0.1";
        sha256 = "d3f9fd8e5e7251fa2f4727feb1397d80d9e979a4b086ee962dc239e3662910c0";
+       revision = "1";
+       editedCabalFile = "ef6155a767dc221d6f4dd2740fc79f5f4525b67e4cbb5c0ef3e5503d69594b29";
        libraryHaskellDepends = [
          base extensible-exceptions HUnit test-framework
        ];
@@ -131706,6 +132210,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-traced" = callPackage
+    ({ mkDerivation, base, containers, mtl, template-haskell }:
+     mkDerivation {
+       pname = "th-traced";
+       version = "0.0.1.0";
+       sha256 = "e267a20fa11bd42a4c4018cc428051089225514f11e38ad1821842f03abbb0c2";
+       libraryHaskellDepends = [ base containers mtl template-haskell ];
+       homepage = "https://github.com/konn/th-traced";
+       description = "Tracing Q monad computation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "th-typegraph" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
      , data-default, deepseq, ghc-prim, haskell-src-exts, hspec
@@ -133070,19 +133586,19 @@ self: {
      }) {};
 
   "tls" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-types, async, base, byteable
-     , bytestring, cereal, cryptonite, data-default-class, hourglass
-     , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck
-     , transformers, x509, x509-store, x509-validation
+    ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
+     , cereal, cryptonite, data-default-class, hourglass, memory, mtl
+     , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509
+     , x509-store, x509-validation
      }:
      mkDerivation {
        pname = "tls";
-       version = "1.3.1";
-       sha256 = "747f840677115d077ef548b4da54acb479253ce3cb58ad3a03275fe2b452d5d0";
+       version = "1.3.2";
+       sha256 = "e9f2d3685b4731cb865a1d9ea9a2ddd5dce5393c49d8fd89dd9e00e8b0e06ce4";
        libraryHaskellDepends = [
-         asn1-encoding asn1-types async base byteable bytestring cereal
-         cryptonite data-default-class memory mtl network transformers x509
-         x509-store x509-validation
+         asn1-encoding asn1-types async base bytestring cereal cryptonite
+         data-default-class memory mtl network transformers x509 x509-store
+         x509-validation
        ];
        testHaskellDepends = [
          base bytestring cereal cryptonite data-default-class hourglass mtl
@@ -133875,6 +134391,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "transient" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, HTTP, mtl
+     , network, network-info, process, random, stm, transformers
+     }:
+     mkDerivation {
+       pname = "transient";
+       version = "0.1.0.4";
+       sha256 = "d12bf8fdbe05966d67ba0966bcf9eff6b637dce128b18424c1b250108cf86468";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath HTTP mtl network network-info
+         process random stm transformers
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath HTTP mtl network random stm
+         transformers
+       ];
+       homepage = "http://www.fpcomplete.com/user/agocorona";
+       description = "A monad for extensible effects and primitives for unrestricted composability of applications";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "translatable-intset" = callPackage
     ({ mkDerivation, base, fingertree }:
      mkDerivation {
@@ -137149,6 +137688,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uom-plugin" = callPackage
+    ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, tasty
+     , tasty-hunit, template-haskell, units-parser
+     }:
+     mkDerivation {
+       pname = "uom-plugin";
+       version = "0.1.0.0";
+       sha256 = "34c00b7e48152e654ae0dfeaf74a12c9fd037549489f2a13e7e9534994bb3a38";
+       libraryHaskellDepends = [
+         base containers ghc ghc-tcplugins-extra template-haskell
+         units-parser
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       homepage = "https://github.com/adamgundry/uom-plugin";
+       description = "Units of measure as a GHC typechecker plugin";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "up" = callPackage
     ({ mkDerivation, base, directory, filepath, lambda-options, mtl
      , split
@@ -137795,8 +138352,8 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "utf8-string";
-       version = "1";
-       sha256 = "79f388d3f089e0c483c1dc1afad524b06f1abb6e288ed9029f934cffb3b2ba08";
+       version = "1.0.1.1";
+       sha256 = "fb0b9e3acbe0605bcd1c63e51f290a7bbbe6628dfa3294ff453e4235fbaef140";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/glguy/utf8-string/";
        description = "Support for reading and writing UTF8 Strings";
@@ -137807,8 +138364,8 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "utility-ht";
-       version = "0.0.10";
-       sha256 = "ad8399180f495e6bb30e416a67a43d1bf82a7dd99293badd6e0d7674c1facd9f";
+       version = "0.0.11";
+       sha256 = "5cdcc5c1eab4029d18f1712472d69b61265c2d543a8065e1e9762b1ddc235812";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
@@ -138854,11 +139411,10 @@ self: {
     ({ mkDerivation, base, fftw, primitive, storable-complex, vector }:
      mkDerivation {
        pname = "vector-fftw";
-       version = "0.1.3.2";
-       sha256 = "a0bab8a9466856583b59fd40337337d2cd57995aeb3d89d3e2e4f2e80dcadb65";
+       version = "0.1.3.3";
+       sha256 = "131d88fa9ea17e7e46a6d886f37e77282e8e95f2022ccefd2cf11adeca0b9172";
        libraryHaskellDepends = [ base primitive storable-complex vector ];
        librarySystemDepends = [ fftw ];
-       jailbreak = true;
        homepage = "http://hackage.haskell.org/package/vector-fftw";
        description = "A binding to the fftw library for one-dimensional vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -140464,17 +141020,17 @@ self: {
      }) {};
 
   "wai-middleware-throttle" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hlint, hspec
-     , http-types, HUnit, network, stm, token-bucket, transformers, wai
-     , wai-extra
+    ({ mkDerivation, base, bytestring, containers, hashable, hlint
+     , hspec, http-types, HUnit, network, stm, token-bucket
+     , transformers, wai, wai-extra
      }:
      mkDerivation {
        pname = "wai-middleware-throttle";
-       version = "0.2.0.1";
-       sha256 = "56b55cdb8e081693c35b35791a59b155a91a628e205c9645cbe9d160176b1d23";
+       version = "0.2.0.2";
+       sha256 = "b38b28d2a2dcda631cf12ff066343539986028106867594dbf07efe40e81d712";
        libraryHaskellDepends = [
-         base containers http-types network stm token-bucket transformers
-         wai
+         base containers hashable http-types network stm token-bucket
+         transformers wai
        ];
        testHaskellDepends = [
          base bytestring hlint hspec http-types HUnit stm transformers wai
@@ -140570,18 +141126,25 @@ self: {
      }) {};
 
   "wai-routes" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
-     , http-types, monad-loops, mtl, path-pieces, random
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring
+     , case-insensitive, containers, cookie, data-default-class
+     , filepath, hspec, hspec-wai, hspec-wai-json, http-types
+     , mime-types, monad-loops, mtl, path-pieces, random
      , template-haskell, text, wai
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.7.3";
-       sha256 = "92d694a9b63b8f34e1e62f5f29b65cb85566eeb9cad90b7dd34689bc296b139b";
+       version = "0.8.0";
+       sha256 = "3b0b8ccb5853d830c0feaad5cbb5db8e7f3499af18b027e052e169199b89959d";
        libraryHaskellDepends = [
-         aeson base blaze-builder bytestring containers http-types
+         aeson base blaze-builder bytestring case-insensitive containers
+         cookie data-default-class filepath http-types mime-types
          monad-loops mtl path-pieces random template-haskell text wai
        ];
+       testHaskellDepends = [
+         aeson base hspec hspec-wai hspec-wai-json wai
+       ];
+       jailbreak = true;
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
@@ -140915,8 +141478,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.1.1";
-       sha256 = "5e9a75cc877f52053c5e1ceb15427ac28bf9937750336af0f71569b4e9e213bd";
+       version = "3.1.2";
+       sha256 = "3940708b273b195eefdeeb63448fcb121ead5a010cad04f1c3ab4bd7470e34a2";
        libraryHaskellDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
@@ -142037,8 +142600,8 @@ self: {
      }:
      mkDerivation {
        pname = "wiring";
-       version = "0.3.0";
-       sha256 = "1d99c9604d179b61687f2bec82c97dd6665fba4ea024271806abae82bb79fd30";
+       version = "0.4.1";
+       sha256 = "b2a6e2ac3299d109244432dbdce4094d9967f10916c31a3df5a7bf6fbcc67b01";
        libraryHaskellDepends = [ base mtl template-haskell transformers ];
        testHaskellDepends = [
          base hspec mtl QuickCheck template-haskell transformers
@@ -143127,8 +143690,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.3.5";
-       sha256 = "9e5a1c67a4879bbb4a2fbe2232d4ab508db34810e6ebec063e4621a817032566";
+       version = "0.3.6";
+       sha256 = "69941191e5be3671555670f1894cdd30a44e8e9b303561fee87c5f84f9bbe251";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143714,12 +144277,11 @@ self: {
     ({ mkDerivation, base, mtl, safe, transformers, xml }:
      mkDerivation {
        pname = "xml-extractors";
-       version = "0.4.0.0";
-       sha256 = "98c34b3ae23141a8eda870418297615a21db8d48024821a919a7ee4f52076808";
+       version = "0.4.0.1";
+       sha256 = "38ffa6ab354dcaddbdd1ca4c187418715fd7d7de77abc4861c9840c88bce1e79";
        libraryHaskellDepends = [ base mtl safe transformers xml ];
-       jailbreak = true;
        homepage = "https://github.com/holmisen/xml-extractors";
-       description = "Wrapper over xml to extract data from parsed xml";
+       description = "Extension to the xml package to extract data from parsed xml";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -144306,8 +144868,8 @@ self: {
     ({ mkDerivation, base, magic, mtl, random, unix, xmonad }:
      mkDerivation {
        pname = "xmonad-wallpaper";
-       version = "0.0.1.1";
-       sha256 = "a720bd9f3ba17835373e4093b64b7d7f522d095281a853447943be16502fac4c";
+       version = "0.0.1.2";
+       sha256 = "b02e1c7a524dd9cf28d5cff6933194fe245fa4e9247f701ec87195a20a8cf265";
        libraryHaskellDepends = [ base magic mtl random unix xmonad ];
        description = "xmonad wallpaper extension";
        license = stdenv.lib.licenses.gpl3;
@@ -145071,6 +145633,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) libdevil;};
 
+  "yate" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, hspec, mtl, scientific
+     , template-haskell, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yate";
+       version = "0.1.0.0";
+       sha256 = "20275bafdb52ce74f3c3cecb6cbb8925c7d9f40bea74d6872145ff93df49d85d";
+       libraryHaskellDepends = [
+         aeson attoparsec base mtl scientific template-haskell text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base hspec mtl unordered-containers vector
+       ];
+       jailbreak = true;
+       description = "Yet Another Template Engine";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yavie" = callPackage
     ({ mkDerivation, base, Cabal, directory, event-driven, filepath
      , monads-tf, process, regexpr
@@ -145446,12 +146028,11 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-ldap-mediocre";
-       version = "0.1.0.0";
-       sha256 = "509eb2cc3a4895f9fe797f152b3f3511fbae7b765730016c3a93a6888290f10e";
+       version = "0.1.1";
+       sha256 = "ecf280a3e185d9864a9924681856fa92e5fe441d02e0f29164c3bc4d9eef430b";
        libraryHaskellDepends = [
          aeson base LDAP text yesod-auth yesod-core yesod-form
        ];
-       jailbreak = true;
        description = "Very simlple LDAP auth for yesod";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -145562,8 +146143,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.13.3";
-       sha256 = "cc84e0c8f081211c01a6c8d58544b9b7fe5c5c180d8a2edcb30a79edbe198e61";
+       version = "1.4.14";
+       sha256 = "6ed15a3ac5084926073c92fa7fd3ad2efa5ff8b4dc17fa4e6b1c109d57717a0c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -145646,8 +146227,8 @@ self: {
 
   "yesod-core" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
-     , blaze-html, blaze-markup, bytestring, case-insensitive, cereal
-     , clientsession, conduit, conduit-extra, containers, cookie
+     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
+     , cereal, clientsession, conduit, conduit-extra, containers, cookie
      , data-default, deepseq, directory, exceptions, fast-logger, hspec
      , hspec-expectations, http-types, HUnit, lifted-base, monad-control
      , monad-logger, mtl, mwc-random, network, old-locale, parsec
@@ -145659,11 +146240,11 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.4.13";
-       sha256 = "219bf0858977468d9aa74ab5f2d330e46bbbe95d700c989b3565be5d99d319da";
+       version = "1.4.15";
+       sha256 = "b9878ee01f66346967a157c597d284735c66db61a18a93c319b85233500050b4";
        libraryHaskellDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
-         bytestring case-insensitive cereal clientsession conduit
+         byteable bytestring case-insensitive cereal clientsession conduit
          conduit-extra containers cookie data-default deepseq directory
          exceptions fast-logger http-types lifted-base monad-control
          monad-logger mtl mwc-random old-locale parsec path-pieces primitive
@@ -146534,6 +147115,7 @@ self: {
          base bytestring hamlet hspec HUnit shakespeare template-haskell
          text yesod-core yesod-static yesod-test
        ];
+       jailbreak = true;
        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;
@@ -146545,8 +147127,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-table";
-       version = "1.0.5";
-       sha256 = "873cb5ae68d3726678ce4f254a5342f56244f86e88c731ca6849691df30f85df";
+       version = "1.0.6";
+       sha256 = "69d4f11c31d9928551c7de3b1fc12a470e29ead58729f1b752b773be862e3b30";
        libraryHaskellDepends = [
          base bytestring containers contravariant text yesod-core
        ];
@@ -146576,8 +147158,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-test";
-       version = "1.4.3.1";
-       sha256 = "a29e0173b31aacaa4a0235bfdcc8c7809b8685a9069a1f5b6083f204d1fd1394";
+       version = "1.5";
+       sha256 = "437a76419c94030c3c3d8b8a88a52f0ff9c416d56894bc4b825c62faa9a1be07";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          case-insensitive containers cookie hspec-core html-conduit
@@ -146655,8 +147237,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-transloadit";
-       version = "0.3.0.0";
-       sha256 = "95c485106e4aa6d30e3b3d981ef67fafbbd2fb23597aae7780d45106d4bf565c";
+       version = "0.4.0.0";
+       sha256 = "a50270b5829c45c7b72a82137abf94046343f60532bcab0a8a6ef0fd9974745a";
        libraryHaskellDepends = [
          aeson base byteable bytestring cryptohash lens lens-aeson
          old-locale shakespeare text time transformers unordered-containers
@@ -147756,10 +148338,10 @@ self: {
     ({ mkDerivation, base, binary, bytestring, containers }:
      mkDerivation {
        pname = "zmidi-core";
-       version = "0.7.0";
-       sha256 = "3455f95bd3451f667e224d278aae4c474e8d4efe0d44a9f76d2c1b9297671f6d";
+       version = "0.8.0";
+       sha256 = "aa8e7f0d0068f75f38347beb85de7716811018e8fa5b42fb5a1a3c9a11fbbada";
        libraryHaskellDepends = [ base binary bytestring containers ];
-       homepage = "http://code.google.com/p/copperbox/";
+       homepage = "https://github.com/stephentetley/zmidi-core";
        description = "Read and write MIDI files";
        license = stdenv.lib.licenses.bsd3;
      }) {};

From 6dd889144de7c837613f4db671608cf155ba6c45 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Aug 2015 21:25:18 +0200
Subject: [PATCH 1511/2016] haskell-deepdeq: update version used for pre 7.4.x
 GHC versions

---
 pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index af34629e319..55432ccdac5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -38,7 +38,7 @@ self: super: {
   binary = self.binary_0_7_6_1;
 
   # deepseq is not a core library for this compiler.
-  deepseq = self.deepseq_1_4_1_1;
+  deepseq = self.deepseq_1_4_1_2;
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 1ec76e6fa19..c848a50cd36 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -35,7 +35,7 @@ self: super: {
   unix = null;
 
   # deepseq is not a core library for this compiler.
-  deepseq = self.deepseq_1_4_1_1;
+  deepseq = self.deepseq_1_4_1_2;
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;

From 1e578fa36b7d4d7675fdd2bcaca3136d2560b04c Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 21 Aug 2015 05:09:56 -0400
Subject: [PATCH 1512/2016] haskell-cabal-helper: (temporary) testing issues

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++
 1 file changed, 3 insertions(+)

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 d8d1e3f499a..c61b9c26211 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -275,4 +275,7 @@ self: super: {
   # The tests in vty-ui do not build, but vty-ui itself builds.
   vty-ui = enableCabalFlag super.vty-ui "no-tests";
 
+  # https://github.com/DanielG/cabal-helper/issues/10
+  cabal-helper = dontCheck super.cabal-helper;
+
 }

From 412062eb488d9c9ac35cd9cf26c24aea3aa4353a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Aug 2015 22:11:57 +0200
Subject: [PATCH 1513/2016] haskell-semigroupoids: doctests have been fixed
 upstream

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cc7ef9cfdf7..e550b15065c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -830,9 +830,6 @@ self: super: {
   # https://github.com/ekmett/comonad/issues/25
   comonad = dontCheck super.comonad;
 
-  # https://github.com/ekmett/semigroupoids/issues/35
-  semigroupoids = disableCabalFlag super.semigroupoids "doctests";
-
   # https://github.com/jaspervdj/websockets/issues/104
   websockets = dontCheck super.websockets;
 

From 4ce6d653bba37c6b51e75391456fcfa37828d2c6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Aug 2015 08:41:14 +0200
Subject: [PATCH 1514/2016] haskell-fsnotify: disable failing test suite

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e550b15065c..9aa7488beab 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -195,8 +195,9 @@ self: super: {
     else super.hfsevents;
 
   # FSEvents API is very buggy and tests are unreliable. See
-  # http://openradar.appspot.com/10207999 and similar issues
-  fsnotify = if pkgs.stdenv.isDarwin then dontCheck super.fsnotify else super.fsnotify;
+  # http://openradar.appspot.com/10207999 and similar issues.
+  # https://github.com/haskell-fswatch/hfsnotify/issues/62
+  fsnotify = dontCheck super.fsnotify; # if pkgs.stdenv.isDarwin then dontCheck super.fsnotify else super.fsnotify;
 
   # the system-fileio tests use canonicalizePath, which fails in the sandbox
   system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;

From 3f6074713b7fc726a0e68f5a1e3f562147be7d9b Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Aug 2015 08:52:36 -0400
Subject: [PATCH 1515/2016] haskell-hxt: re-enable haddock generation

The bug's been closed for a while, and I manually verified that the
haddock gets rendered to HTML in all versions from 7.6 -> 7.10.
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9aa7488beab..7f823949a8e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -153,7 +153,6 @@ self: super: {
   hspec-discover = dontHaddock super.hspec-discover;
   http-client-conduit = dontHaddock super.http-client-conduit;
   http-client-multipart = dontHaddock super.http-client-multipart;
-  hxt = dontHaddock super.hxt;                                  # https://github.com/UweSchmidt/hxt/issues/38
   markdown-unlit = dontHaddock super.markdown-unlit;
   network-conduit = dontHaddock super.network-conduit;
   shakespeare-js = dontHaddock super.shakespeare-js;

From d08a483bda5c3af85546259a191bc4e82bc86b68 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Aug 2015 15:31:56 +0200
Subject: [PATCH 1516/2016] haskell-ed25519 is broken

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7f823949a8e..7658ff1b111 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -978,4 +978,10 @@ self: super: {
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;
 
+  # https://github.com/thoughtpolice/hs-ed25519/issues/9
+  ed25519 = markBroken super.ed25519;
+  hackage-repo-tool = dontDistribute super.hackage-repo-tool;
+  hackage-security = dontDistribute super.hackage-security;
+  hackage-security-HTTP = dontDistribute super.hackage-security-HTTP;
+
 }

From b106fbfb4fa767e95370405dd45519bc3b1d975d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Aug 2015 16:07:09 +0200
Subject: [PATCH 1517/2016] cabal2nix: update to version 20150824

---
 .../tools/haskell/cabal2nix/default.nix            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 88e8c55b061..b1bd535c5fd 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,17 +2,17 @@
 , containers, deepseq, deepseq-generics, directory, doctest, filepath
 , hackage-db, hspec, lens, monad-par, monad-par-extras, mtl
 , optparse-applicative, pretty, process, QuickCheck, regex-posix, SHA, split
-, stdenv, transformers, utf8-string, makeWrapper, gitMinimal, cartel
+, stdenv, transformers, utf8-string, makeWrapper, gitMinimal, cartel, data-default
 , nix-prefetch-scripts
 }:
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150807-6-g9f58996";
+  version = "20150824";
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
-    rev = "9f589961fba9fa6a92900c37cf1ab16c597b0c69";
-    sha256 = "0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv";
+    rev = "560fb2b1d22f4c995a526529bb034bd183e85a31";
+    sha256 = "0qaa0l23lc8677wvbgz327yvfg2pxxmvrxga6568ra5kgdy4204c";
     deepClone = true;
   };
   isLibrary = false;
@@ -21,19 +21,19 @@ mkDerivation rec {
     aeson ansi-wl-pprint base bytestring Cabal containers
     deepseq-generics directory filepath hackage-db lens monad-par
     monad-par-extras mtl optparse-applicative pretty process
-    regex-posix SHA split transformers utf8-string
+    regex-posix SHA split transformers utf8-string data-default
   ];
   executableHaskellDepends = [
     aeson ansi-wl-pprint base bytestring Cabal containers
     deepseq-generics directory filepath hackage-db lens monad-par
     monad-par-extras mtl optparse-applicative pretty process
-    regex-posix SHA split transformers utf8-string
+    regex-posix SHA split transformers utf8-string data-default
   ];
   testHaskellDepends = [
     aeson ansi-wl-pprint base bytestring Cabal containers deepseq
     deepseq-generics directory doctest filepath hackage-db hspec lens
     monad-par monad-par-extras mtl optparse-applicative pretty process
-    QuickCheck regex-posix SHA split transformers utf8-string
+    QuickCheck regex-posix SHA split transformers utf8-string data-default
   ];
   buildDepends = [ cartel ];
   buildTools = [ gitMinimal makeWrapper ];

From 358e915119b71fc02e4abb69a0e416ccd9320c0a Mon Sep 17 00:00:00 2001
From: Kevin Marsh <kevinmarsh3@gmail.com>
Date: Tue, 25 Aug 2015 16:48:16 +0100
Subject: [PATCH 1518/2016] Update Django minor version numbers (to 1.8.4,
 1.7.10, 1.4.22)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d89c0a2404..14ee1097155 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5130,12 +5130,12 @@ let
 
   django_1_8 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.8.3";
+    version = "1.8.4";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
-      sha256 = "1fjv63rdm45j5057zb7qj4ya4pjwig1jpbwcr0bk1mazq3y59dib";
+      sha256 = "1n3hb80v7wl5j2mry5pfald6i9z42a9c3m9405877iqw3v49csc2";
     };
 
     # error: invalid command 'test'
@@ -5155,12 +5155,12 @@ let
 
   django_1_7 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.7.9";
+    version = "1.7.10";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz";
-      sha256 = "0q3q46yjjsqwp0ywrkbqwiac13rdvzrd5dchdbnzh3yjwpj9ygsg";
+      sha256 = "0xbwg6nyvwcbp2hvk0x3s5y823k5kizn0za1bl2rf6g6xcn7sddr";
     };
 
     # error: invalid command 'test'
@@ -5225,11 +5225,11 @@ let
 
   django_1_4 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.4.21";
+    version = "1.4.22";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz";
-      sha256 = "1x5wk3yh6ydbp4sgsxl4qjmdvcazphwkmmm99lfdb04645sijkwk";
+      sha256 = "110p1mgdcf87kyr64mr2jgmyapyg27kha74yq3wjrazwfbbwkqnh";
     };
 
     # error: invalid command 'test'

From 4c8b2beb55e65b9f586bf575acaaa5c609791260 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sun, 23 Aug 2015 13:42:41 +0200
Subject: [PATCH 1519/2016] flashplayer: 11.2.202.491 -> 11.2.202.508

---
 .../browsers/mozilla-plugins/flashplayer-11/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 0ded56b8aba..01c64340875 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,7 +36,7 @@
 
 let
   # -> http://get.adobe.com/flashplayer/
-  version = "11.2.202.491";
+  version = "11.2.202.508";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -47,7 +47,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "150zlnkq8jhhphfmyzdrpgi1y2sniqgx0a5ij994in3gvari9gpl";
+        sha256 = "1i0301vnz94pxcwm9wk1jjyv7gwywy6p7z26ikd5cg259myxbg75";
       }
     else if stdenv.system == "i686-linux" then
       if debug then
@@ -60,7 +60,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "0lwff46gjazjv04fpck0nhv47b4z1x79n09q5444npm1w5zjfgxy";
+        sha256 = "1483bi34ymchv1cqg57whxhlrhhvwhcw33zjgwzmy7bacxbkj9ia";
       }
     else throw "Flash Player is not supported on this platform";
 

From 617a158e3c67a0c0eb18f56dc94eb35038340561 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Sun, 23 Aug 2015 13:00:31 -0400
Subject: [PATCH 1520/2016] libb2: init at 0.97

---
 lib/maintainers.nix                          |  1 +
 pkgs/development/libraries/libb2/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/libb2/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index db37043594a..a393648790a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -75,6 +75,7 @@
   desiderius = "Didier J. Devroye <didier@devroye.name>";
   devhell = "devhell <\"^\"@regexmail.net>";
   dezgeg = "Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>";
+  dfoxfranke = "Daniel Fox Franke <dfoxfranke@gmail.com>";
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
   doublec = "Chris Double <chris.double@double.co.nz>";
   ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix
new file mode 100644
index 00000000000..f4d01def94a
--- /dev/null
+++ b/pkgs/development/libraries/libb2/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl}:
+with stdenv; with lib;
+mkDerivation rec {
+  name = "libb2-${meta.version}";
+
+  meta = {
+    version = "0.97";
+    description = "The BLAKE2 family of cryptographic hash functions";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ dfoxfranke ];
+    license = licenses.cc0;
+  };
+
+  src = fetchurl {
+    url = "https://blake2.net/${name}.tar.gz";
+    sha256 = "7829c7309347650239c76af7f15d9391af2587b38f0a65c250104a2efef99051";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 017601a3a4d..9bc1ea2f1b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6770,6 +6770,8 @@ let
 
   libavc1394 = callPackage ../development/libraries/libavc1394 { };
 
+  libb2 = callPackage ../development/libraries/libb2 { };
+
   libbluedevil = callPackage ../development/libraries/libbluedevil { };
 
   libbdplus = callPackage ../development/libraries/libbdplus { };

From 30313a8fb845637ed74a442e48f7c07372fc6dd7 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 26 Aug 2015 02:03:13 +0200
Subject: [PATCH 1521/2016] google-cloud-sdk: 0.9.65 -> 0.9.74

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index adfdad1f9b1..c5fbf621e2d 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, python27, python27Packages, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  version = "0.9.65";
+  version = "0.9.74";
   name = "google-cloud-sdk-${version}";
 
   src = fetchurl {
-    url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20150619081534.tar.gz";
-    sha256 = "10158kyihkmwmb6i8n0fh1dzjvqs8xpwqp6i9xfaxsr2yzxdkqs2";
+    url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20150817103450.tar.gz";
+    sha256 = "0qdry40xk23c6dvr6qzqn23bg8yfflm1m00gw1mqnpr4m1425vfg";
   };
 
   buildInputs = [python27 makeWrapper];

From a04bd9301b5bcb5e61611e35db805d1469175c1d Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Tue, 25 Aug 2015 20:07:29 -0400
Subject: [PATCH 1522/2016] hglib: init at 1.7

---
 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 3d89c0a2404..1d5aaeb4b3a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3698,6 +3698,24 @@ let
     };
   };
 
+  hglib = buildPythonPackage rec {
+    version = "1.7";
+    name = "hglib-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python-hglib/python-hglib-${version}.tar.gz";
+      sha256 = "0dc087d15b774cda82d3c8096fb0e514caeb2ddb60eed38e9056b16e279ba3c5";
+    };
+
+    meta = {
+      description = "Mercurial Python library";
+      homepage = "http://selenic.com/repo/python-hglib";
+      license = licenses.mit;
+      maintainers = with maintainers; [ dfoxfranke ];
+      platforms = platforms.all;
+    };
+  };
+
   humanize = buildPythonPackage rec {
     version = "0.5.1";
     name = "humanize-${version}";

From 2194295fffc068a0f035c4bf0ef1daea21912f78 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Tue, 25 Aug 2015 21:53:56 -0400
Subject: [PATCH 1523/2016] cvs-fast-export: init at 1.32

---
 .../cvs-fast-export/default.nix               | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/applications/version-management/cvs-fast-export/default.nix

diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix
new file mode 100644
index 00000000000..cf80dd3ef67
--- /dev/null
+++ b/pkgs/applications/version-management/cvs-fast-export/default.nix
@@ -0,0 +1,47 @@
+{stdenv, fetchurl, makeWrapper, flex, bison,
+ asciidoc, docbook_xml_dtd_45, docbook_xml_xslt,
+ libxml2, libxslt,
+ python27, rcs, cvs, git,
+ coreutils, rsync}:
+with stdenv; with lib;
+mkDerivation rec {
+  name = "cvs-fast-export-${meta.version}";
+  meta = {
+    version = "1.32";
+    description = "Export an RCS or CVS history as a fast-import stream";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ dfoxfranke ];
+    homepage = "http://www.catb.org/esr/cvs-fast-export/";
+    platforms = platforms.all;
+  };
+
+  src = fetchurl {
+    url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.32.tar.gz";
+    sha256 = "5bfb9a5650517d337a96a598795b50bc40ce12172854a6581267e7be3dbcfb97";
+  };
+
+  buildInputs = [
+    flex bison asciidoc docbook_xml_dtd_45 docbook_xml_xslt libxml2 libxslt
+    python27 rcs cvs git makeWrapper
+  ];
+
+  preBuild = ''
+    makeFlagsArray=(
+      XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"
+      prefix="$out"
+    )
+  '';
+
+  doCheck = true;
+
+  postInstall =
+    let
+      binpath = makeSearchPath "bin" [ out rcs cvs git coreutils rsync ];
+    in ''
+      for prog in cvs-fast-export cvsconvert cvssync; do
+        wrapProgram $out/bin/$prog \
+          --prefix PATH : ${binpath}
+      done
+    ''
+  ;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bc1ea2f1b2..4870293a443 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1242,6 +1242,8 @@ let
 
   cutter = callPackage ../tools/networking/cutter { };
 
+  cvs_fast_export = callPackage ../applications/version-management/cvs-fast-export { };
+
   dadadodo = callPackage ../tools/text/dadadodo { };
 
   daemonize = callPackage ../tools/system/daemonize { };

From 686fec3ce75419f0fcc2aaefcce65ea0c1ac4867 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Tue, 25 Aug 2015 20:08:33 -0400
Subject: [PATCH 1524/2016] reposurgeon: init at 3.28

---
 .../reposurgeon/default.nix                   | 66 +++++++++++++++++++
 .../reposurgeon/fix-preserve-type.patch       | 12 ++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 80 insertions(+)
 create mode 100644 pkgs/applications/version-management/reposurgeon/default.nix
 create mode 100644 pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch

diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix
new file mode 100644
index 00000000000..5c2dde95572
--- /dev/null
+++ b/pkgs/applications/version-management/reposurgeon/default.nix
@@ -0,0 +1,66 @@
+{stdenv, fetchurl, makeWrapper, python27, python27Packages, git,
+ docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto,
+ cython ? null,
+ bazaar ? null, cvs ? null, darcs ? null, fossil ? null,
+ mercurial ? null, monotone ? null, rcs ? null, src ? null,
+ subversion ? null, cvs_fast_export ? null }:
+with stdenv; with lib;
+mkDerivation rec {
+  name = "reposurgeon-${meta.version}";
+  meta = {
+    description = "A tool for editing version-control repository history";
+    version = "3.28";
+    license = licenses.bsd3;
+    homepage = "http://www.catb.org/esr/reposurgeon/";
+    maintainers = with maintainers; [ dfoxfranke ];
+    platforms = platforms.all;
+  };
+
+  src = fetchurl {
+    url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-3.28.tar.gz";
+    sha256 = "3225b44109b8630310a0ea6fe63a3485d27aa46deaf80e8d07820e01a6f62626";
+  };
+
+  # See https://gitlab.com/esr/reposurgeon/issues/17
+  patches = [ ./fix-preserve-type.patch ];  
+
+  buildInputs =
+    [ docbook_xml_dtd_412 docbook_xml_xslt asciidoc xmlto makeWrapper ] ++
+    optional (cython != null) cython
+  ;
+
+  preBuild = ''
+    makeFlagsArray=(
+      XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"
+      prefix="$out"
+      pyinclude="-I${python27}/include/python2.7"
+      pylib="-L${python27}/lib -lpython2.7"
+    )
+  '';
+
+  buildFlags = "all" + (if cython != null then " cyreposurgeon" else "");
+
+  installTargets =
+    "install" + (if cython != null then " install-cyreposurgeon" else "")
+  ;
+
+  postInstall =
+    let
+      binpath = makeSearchPath "bin" (
+        filter (x: x != null)
+        [ out git bazaar cvs darcs fossil mercurial
+          monotone rcs src subversion cvs_fast_export ]
+      );
+      pythonpath = makeSearchPath (python27.sitePackages) (
+        filter (x: x != null)
+        [ python27Packages.readline or null python27Packages.hglib or null ]
+      );
+    in ''
+      for prog in reposurgeon repodiffer repotool; do
+        wrapProgram $out/bin/$prog \
+          --prefix PATH : "${binpath}" \
+          --prefix PYTHONPATH : "${pythonpath}"
+      done
+    ''
+  ;    
+}
diff --git a/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch b/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch
new file mode 100644
index 00000000000..ef3568b7b92
--- /dev/null
+++ b/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch
@@ -0,0 +1,12 @@
+diff -Nru reposurgeon-3.28/reposurgeon reposurgeon-3.28-new/reposurgeon
+--- reposurgeon-3.28/reposurgeon	2015-07-05 15:17:13.000000000 -0400
++++ reposurgeon-3.28-new/reposurgeon	2015-08-25 18:23:11.347591137 -0400
+@@ -193,7 +193,7 @@
+         importer=b"git fast-import --quiet",
+         checkout=b"git checkout",
+         lister=b"git ls-files",
+-        preserve=(b'.git/config', b'.git/hooks'),
++        preserve=set((b'.git/config', b'.git/hooks')),
+         authormap=b".git/cvs-authors",
+         ignorename=b".gitignore",
+         dfltignores=b"",	# Has none
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4870293a443..84eaff2ab85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2842,6 +2842,8 @@ let
 
   replace = callPackage ../tools/text/replace { };
 
+  reposurgeon = callPackage ../applications/version-management/reposurgeon { };
+
   reptyr = callPackage ../os-specific/linux/reptyr {};
 
   rescuetime = callPackage ../applications/misc/rescuetime { };

From 3b1c772d1285c4a4dd76a15fa7e1767160af2791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 26 Aug 2015 07:57:57 +0200
Subject: [PATCH 1525/2016] gnome-contacts: fix evaluation

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

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
index 56491331684..2e89210413f 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
                   gnome3.gsettings_desktop_schemas makeWrapper file libnotify
                   folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
                   libxml2 libsoup gnome3.gnome_online_accounts nspr nss
-                  gdk_pixbuf gnome3.defaulticontheme librsvg
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
                   libchamplain clutter_gtk geocode_glib
                   vala automake115x autoconf db ];
 

From 8dc7eb961189cf10b79d27c54e471296bb6f2f76 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 26 Aug 2015 08:42:06 +0200
Subject: [PATCH 1526/2016] svtplay-dl: 0.10.2015.05.24 -> 0.10.2015.08.24

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

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index d84d00e2ba2..32f6312a798 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "0.10.2015.05.24";
+  version = "0.10.2015.08.24";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "0dzd5n4zvrplvm3sx017ym7jlngp4pn8nra9qx9n4wq6h4c6n6a5";
+    sha256 = "1w5jknqdlyw60pxx1wmx2xqkp968r9m3xdgm95ls1pjjp0pm047c";
   };
 
   pythonPaths = [ pycrypto ];

From 0349b056958ed5f0bf08280507c2ed55ee56c9a4 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Wed, 26 Aug 2015 09:31:39 +0200
Subject: [PATCH 1527/2016] veriT: 201410 -> 201506

---
 .../science/logic/verit/default.nix           | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix
index 16a45cca644..5cafb19350c 100644
--- a/pkgs/applications/science/logic/verit/default.nix
+++ b/pkgs/applications/science/logic/verit/default.nix
@@ -1,24 +1,21 @@
-{ stdenv, fetchurl, gmp, flex, bison }:
+{ stdenv, fetchurl, autoreconfHook, gmp, flex, bison }:
 
 stdenv.mkDerivation rec {
   name = "veriT-${version}";
-  version = "201410";
+  version = "201506";
 
   src = fetchurl {
     url = "http://www.verit-solver.org/distrib/${name}.tar.gz";
-    sha256 = "0b31rl3wjn3b09jpka93lx83d26m8a5pixa216vq8pmjach8q5a3";
+    sha256 = "1cc9gcspw3namkdfypkians2j5dn224dsw6xx95qicad6033bsgk";
   };
 
-  buildInputs = [ gmp flex bison ];
+  nativeBuildInputs = [ autoreconfHook flex bison ];
+  buildInputs = [ gmp ];
 
-  enableParallelBuilding = false;
+  makeFlags = [ "LEX=${flex}/bin/flex" ];
 
-  makeFlags = [
-    "EXTERN=" # use system copy of gmp
-  ];
-
-  installPhase = ''
-    install -D -m0755 veriT $out/bin/veriT
+  preInstall = ''
+    mkdir -p $out/bin
   '';
 
   meta = with stdenv.lib; {

From 1b04fbad1c8641d00f2dd43fd5b3b48c3fc5d6e1 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Wed, 26 Aug 2015 17:46:01 +1000
Subject: [PATCH 1528/2016] tilda: ensure wrapped executable is named "tilda"

---
 pkgs/applications/misc/tilda/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index 187ab039014..c7a01f2ac1b 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -17,8 +17,12 @@ stdenv.mkDerivation rec {
 
   LD_LIBRARY_PATH = "${expat}/lib"; # ugly hack for xgettext to work during build
 
+  # The config locking scheme relies on the binary being called "tilda",
+  # (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice:
   postInstall = ''
-    wrapProgram "$out/bin/tilda" \
+    mkdir $out/bin/wrapped
+    mv "$out/bin/tilda" "$out/bin/wrapped/tilda"
+    makeWrapper "$out/bin/wrapped/tilda" "$out/bin/tilda" \
         --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 

From 481807f926c69b91a4cc70361d6bc1d66964bba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 26 Aug 2015 10:53:39 +0200
Subject: [PATCH 1529/2016] pythonPackages.py: add meta. Closes #9257

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73149a08ca1..6d4843826d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9935,6 +9935,12 @@ let
       url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz";
       md5 = "a904aabfe4765cb754f2db84ec7bb03a";
     };
+
+    meta = {
+      description = "Library with cross-python path, ini-parsing, io, code, log facilities";
+      homepage = http://pylib.readthedocs.org/;
+      license = licenses.mit;
+    };
   };
 
 

From ee6140beaa3a8191fc32ecc596307056b6838e66 Mon Sep 17 00:00:00 2001
From: Alexander <lebedev@smartblobs.org>
Date: Sun, 23 Aug 2015 13:15:59 +0000
Subject: [PATCH 1530/2016] rosegarden: init at 14.12

---
 lib/maintainers.nix                           |  1 +
 .../applications/audio/rosegarden/default.nix | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/audio/rosegarden/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index a393648790a..1788df4413f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -141,6 +141,7 @@
   kragniz = "Louis Taylor <kragniz@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
   lassulus = "Lassulus <lassulus@gmail.com>";
+  lebastr = "Alexander Lebedev <lebastr@gmail.com>";
   leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>";
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
   lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>";
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
new file mode 100644
index 00000000000..b22018f1612
--- /dev/null
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, qt4, pkgconfig, ladspaPlugins, ladspaH,
+  dssi, liblo, liblrdf, fftwSinglePrec, libsndfile,
+  libsamplerate, perl, makedepend, libjack2,
+  withLirc ? false, lirc ? null } :
+
+stdenv.mkDerivation (rec {
+  version = "14.12";
+  name = "rosegarden-${version}";
+  src = fetchurl {
+    url  = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
+    sha256 = "0zhlxr1njyy6837f09l6p75js0j5mxmls6m02bqafv9j32wgnxpq";
+  };
+
+  QTDIR=qt4;
+  
+  buildInputs = [ qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
+                  libsndfile libsamplerate perl makedepend libjack2 ]
+		++ stdenv.lib.optional withLirc [ lirc ];
+  
+  enableParallelBuilding = true;
+  
+  meta = with stdenv.lib; {
+    homepage = http://www.rosegardenmusic.com/;
+    description = "Music composition and editing environment";
+    longDescription = ''
+      Rosegarden is a music composition and editing environment based around a MIDI sequencer that features a rich understanding of music notation and includes basic support for digital audio.
+      Rosegarden is an easy-to-learn, attractive application that runs on Linux, ideal for composers, musicians, music students, and small studio or home recording environments.
+      '';
+
+    maintainers = [ maintainers.lebastr ];
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bc1ea2f1b2..b9ff2bd6d62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2883,6 +2883,8 @@ let
 
   rockbox_utility = callPackage ../tools/misc/rockbox-utility { };
 
+  rosegarden = callPackage ../applications/audio/rosegarden { };
+
   rpPPPoE = builderDefsPackage (import ../tools/networking/rp-pppoe) {
     inherit ppp;
   };

From 75ed15e174996139e439fdca407f03fadfe929da Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 26 Aug 2015 12:10:08 +0200
Subject: [PATCH 1531/2016] goPackages: disable parallel builds

It breaks cascadia tests. If a process terminates before wait,
the PID is non-existant and wait fails.
Using & and wait in bash is just broken and shouldn't be used.
We shall probably use GNU parallel for this job.

cc @wkennington
---
 pkgs/development/go-modules/generic/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index fafefd325df..7ab3c892f56 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -80,8 +80,8 @@ go.stdenv.mkDerivation (
     PIDS=()
     if [ -n "$subPackages" ] ; then
         for p in $subPackages ; do
-            go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p &
-            PIDS+=("$!")
+            go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p
+            #PIDS+=("$!")
         done
     else
         pushd go/src
@@ -99,8 +99,8 @@ go.stdenv.mkDerivation (
             if [ -n "$OUT" ]; then
               echo "$OUT" >&2
             fi
-          } &
-          PIDS+=("$!")
+          }
+          #PIDS+=("$!")
         done < <(find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq)
         popd
     fi
@@ -119,16 +119,16 @@ go.stdenv.mkDerivation (
     PIDS=()
     if [ -n "$subPackages" ] ; then
         for p in $subPackages ; do
-            go test -p $NIX_BUILD_CORES -v $goPackagePath/$p &
+            go test -p $NIX_BUILD_CORES -v $goPackagePath/$p
         done
-        PIDS+=("$!")
+        #PIDS+=("$!")
     else
         pushd go/src
         while read d; do
             go test -p $NIX_BUILD_CORES -v $d
         done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq)
         popd
-        PIDS+=("$!")
+        #PIDS+=("$!")
     fi
 
     # Exit on error from the parallel process

From 08a6b7aa46eaa504633de24de383a958a5d42072 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 26 Aug 2015 12:12:52 +0200
Subject: [PATCH 1532/2016] Revert "goPackages: disable parallel builds"

This reverts commit 75ed15e174996139e439fdca407f03fadfe929da.

Turns out it was just a missing &

cc @wkennington
---
 pkgs/development/go-modules/generic/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 7ab3c892f56..b5ddba9b981 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -80,8 +80,8 @@ go.stdenv.mkDerivation (
     PIDS=()
     if [ -n "$subPackages" ] ; then
         for p in $subPackages ; do
-            go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p
-            #PIDS+=("$!")
+            go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p &
+            PIDS+=("$!")
         done
     else
         pushd go/src
@@ -99,8 +99,8 @@ go.stdenv.mkDerivation (
             if [ -n "$OUT" ]; then
               echo "$OUT" >&2
             fi
-          }
-          #PIDS+=("$!")
+          } &
+          PIDS+=("$!")
         done < <(find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq)
         popd
     fi
@@ -119,16 +119,16 @@ go.stdenv.mkDerivation (
     PIDS=()
     if [ -n "$subPackages" ] ; then
         for p in $subPackages ; do
-            go test -p $NIX_BUILD_CORES -v $goPackagePath/$p
+            go test -p $NIX_BUILD_CORES -v $goPackagePath/$p &
         done
-        #PIDS+=("$!")
+        PIDS+=("$!")
     else
         pushd go/src
         while read d; do
-            go test -p $NIX_BUILD_CORES -v $d
+            go test -p $NIX_BUILD_CORES -v $d &
         done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq)
         popd
-        #PIDS+=("$!")
+        PIDS+=("$!")
     fi
 
     # Exit on error from the parallel process

From 0e0e3c0c08b77a64fc934795dc5d9647fbd58d42 Mon Sep 17 00:00:00 2001
From: Anton Fedotov <ad.fedotov@gmail.com>
Date: Thu, 13 Aug 2015 14:15:11 +0300
Subject: [PATCH 1533/2016] qemu: 2.2.1 ->  2.4.0

---
 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 274f7bc11784b6e86bd925e0e132c9b4e8de1730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 26 Aug 2015 12:59:57 +0200
Subject: [PATCH 1534/2016] catch: 1.1-3 -> 1.2.1

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

diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index 49376b74c17..625ec2995e3 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "catch-${version}";
-  version = "1.1-3";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "philsquared";
     repo = "Catch";
-    rev = "c51e86819dc993d590e5d0adaf1952f4b53e5355";
-    sha256 = "0kgi7wxxysgjbpisqfj4dj0k19cyyai92f001zi8gzkybd4fkgv5";
+    rev = "v" + version;
+    sha256 = "0rz2nmvvh66x6w2nb7l08vc5x9aqg1qfz2qfiykaz1ybc19fwck2";
   };
 
   buildInputs = [ cmake ];

From f547eaab44ed9f2323fcea74c2a91c6bf50e47f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 26 Aug 2015 13:00:23 +0200
Subject: [PATCH 1535/2016] openvpn: 2.3.6 -> 2.3.8

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

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 9dd16be4154..b2bf65ff9ee 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "openvpn-2.3.6";
+  name = "openvpn-2.3.8";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
-    sha256 = "09jvxr4wcsmk55gqv3cblm60kzs9ripv9h4y50d1lbn177zx5bkv";
+    sha256 = "0lbw22qv3m0axhs13razr6b4x1p7jcpvf9rzb15b850wyvpka92k";
   };
 
   patches = optional stdenv.isLinux ./systemd-notify.patch;

From 4825906186a7817f8b72bf83aa924fc46014fa68 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Aug 2015 13:02:13 +0200
Subject: [PATCH 1536/2016] ikiwiki: update to version 3.20150614

Unfortunately, this update does not fix the test suite failure:

 | Test Summary Report
 | -------------------
 | t/img.t                      (Wstat: 512 Tests: 31 Failed: 2)
 |   Failed tests:  17-18
 |   Non-zero exit status: 2
 | Files=59, Tests=2273, 22 wallclock secs ( 0.49 usr  0.04 sys + 16.36 cusr  5.45 csys = 22.34 CPU)
 | Result: FAIL
 | Failed 1/59 test programs. 2/2273 subtests failed.
---
 pkgs/applications/misc/ikiwiki/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index a076a2bb7cf..1f78355ca3a 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
 
 let
   name = "ikiwiki";
-  version = "3.20150107";
+  version = "3.20150614";
 
   lib = stdenv.lib;
 in
@@ -31,8 +31,8 @@ stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
-    url = "https://github.com/joeyh/ikiwiki/archive/debian/${version}.tar.gz";
-    sha256 = "12kiqjxrh93gysdp7bhglnks2md9davl8jgzqlj0m8xs5rf1972n";
+    url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
+    sha256 = "0sbs58d7faap1wp2rv7kf3gy3hid1hcpspgqs9wwms2qcki9kwa2";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

From c2841a2221a14b00b43d4774a7353621792b0d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 26 Aug 2015 13:55:57 +0200
Subject: [PATCH 1537/2016] docker: 1.7 -> 1.8.1, fix build (go 1.4)

---
 pkgs/applications/virtualization/docker/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index c3b141cba81..b915e744358 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -3,13 +3,13 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}:
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.7.1";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker";
     rev = "v${version}";
-    sha256 = "0r0j8aj1a7lbnc9piznp02h5n2gdw3v3n4q2ipmapi9ax0wj82lz";
+    sha256 = "0nwd5wsw9f50jh4s5c5sfd6hnyh3g2kmxcrid36y1phabh30yrcz";
   };
 
   buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f699ebb7ff2..16b652d8ea0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11074,7 +11074,7 @@ let
   dmtx-utils = callPackage (import ../tools/graphics/dmtx-utils) {
   };
 
-  docker = callPackage ../applications/virtualization/docker { };
+  docker = callPackage ../applications/virtualization/docker { go = go_1_4; };
 
   doodle = callPackage ../applications/search/doodle { };
 

From 1e18b75170487e6790b6fff32747fe0a185cbaac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Aug 2015 15:04:27 +0200
Subject: [PATCH 1538/2016] Prefer local build for the test driver script

---
 nixos/lib/testing.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 59d05f87d5f..aa1cec1ea02 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -15,6 +15,8 @@ rec {
 
     unpackPhase = "true";
 
+    preferLocalBuild = true;
+
     installPhase =
       ''
         mkdir -p $out/bin

From ce79122119736a63030aa2beb2de6a7c723c2e2c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 26 Aug 2015 09:35:48 -0500
Subject: [PATCH 1539/2016] pypy: wrap original, not symlink

---
 pkgs/development/interpreters/pypy/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index a4eb7439b0d..f5cf11ead97 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -100,7 +100,12 @@ let
        ln -s $out/pypy-c/include $out/include/${libPrefix}
        ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix}
 
-       wrapProgram "$out/bin/pypy" \
+       # We must wrap the original, not the symlink.
+       # PyPy uses argv[0] to find its standard library, and while it knows
+       # how to follow symlinks, it doesn't know about wrappers. So, it
+       # will think the wrapper is the original. As long as the wrapper has
+       # the same path as the original, this is OK.
+       wrapProgram "$out/pypy-c/pypy-c" \
          --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \
          --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib"
 

From f3fb580f658f1738d7e8f92b575442e08867ec2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 26 Aug 2015 10:16:53 +0200
Subject: [PATCH 1540/2016] libqglviewer: 2.3.4 -> 2.6.3

It seems upstream no longer provides old downloads. So this unbreaks the
build.
---
 pkgs/development/libraries/libqglviewer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix
index b389176b3da..86ee672d4b4 100644
--- a/pkgs/development/libraries/libqglviewer/default.nix
+++ b/pkgs/development/libraries/libqglviewer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "libQGLViewer-2.3.4";
+  name = "libQGLViewer-2.6.3";
 
   src = fetchurl {
     url = "http://www.libqglviewer.com/src/${name}.tar.gz";
-    sha256 = "01b9x2n3v5x3zkky2bjpgbhn5bglqn4gd7x5j5p7y2dw0jnzz7j0";
+    sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy";
   };
 
   buildInputs = [ qt4 ];

From b4d8bb5626fa7a2e380aa2179a809f153e2b645c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 26 Aug 2015 10:19:28 +0200
Subject: [PATCH 1541/2016] libqglviewer: update meta attributes (and add
 platforms)

---
 pkgs/development/libraries/libqglviewer/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix
index 86ee672d4b4..829e5f92353 100644
--- a/pkgs/development/libraries/libqglviewer/default.nix
+++ b/pkgs/development/libraries/libqglviewer/default.nix
@@ -17,9 +17,10 @@ stdenv.mkDerivation rec {
       make
     '';
 
-  meta = { 
-    description = "trackball-based 3D viewer qt widget including many useful features";
-    homepage = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/installUnix.html;
-    license = stdenv.lib.licenses.gpl2;
+  meta = with stdenv.lib; {
+    description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers";
+    homepage = http://libqglviewer.com/;
+    license = licenses.gpl2;
+    platforms = platforms.all;
   };
 }

From d61c46c1bd79ff08cd1dac34925a92363e6d2031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 26 Aug 2015 10:20:06 +0200
Subject: [PATCH 1542/2016] libqglviewer: rename attrname and pkgname from
 libQGLViewer

Ref. http://nixos.org/nixpkgs/manual/#sec-package-naming
---
 pkgs/development/libraries/libqglviewer/default.nix | 5 +++--
 pkgs/misc/freestyle/default.nix                     | 6 +++---
 pkgs/misc/freestyle/patch                           | 4 ++--
 pkgs/top-level/all-packages.nix                     | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix
index 829e5f92353..6b40eeb3b1f 100644
--- a/pkgs/development/libraries/libqglviewer/default.nix
+++ b/pkgs/development/libraries/libqglviewer/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "libQGLViewer-2.6.3";
+  name = "libqglviewer-2.6.3";
+  version = "2.6.3";
 
   src = fetchurl {
-    url = "http://www.libqglviewer.com/src/${name}.tar.gz";
+    url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz";
     sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy";
   };
 
diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix
index bb3520e300a..231b8eabb07 100644
--- a/pkgs/misc/freestyle/default.nix
+++ b/pkgs/misc/freestyle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libQGLViewer
+{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libqglviewer
 , swig, python }:
 
 stdenv.mkDerivation {
@@ -9,9 +9,9 @@ stdenv.mkDerivation {
     sha256 = "1h4880fijmfy0x6dbl9hfri071rpj3lnwfzkxi1qyqhy7zyxy7ga";
  };
 
-  buildInputs = [ qt4 libpng lib3ds freeglut libXi libQGLViewer swig ];
+  buildInputs = [ qt4 libpng lib3ds freeglut libXi libqglviewer swig ];
   
-  inherit python freeglut libQGLViewer lib3ds; # if you want to use another adopt patch and Config.pri 
+  inherit python freeglut libqglviewer lib3ds; # if you want to use another adopt patch and Config.pri
 
   buildPhase = ''
     export PYTHON_VERSION=2.5
diff --git a/pkgs/misc/freestyle/patch b/pkgs/misc/freestyle/patch
index 733f50dbf10..dae1b66f9bb 100644
--- a/pkgs/misc/freestyle/patch
+++ b/pkgs/misc/freestyle/patch
@@ -155,8 +155,8 @@ diff -U3 -r a/src/libconfig.pri b/src/libconfig.pri
 -    }
 -  }
 -  win32:    LIBS        *= QGLViewer2.lib
-+  INCLUDEPATH *= $(libQGLViewer)/include
-+  LIBS        *= -L$(libQGLViewer)/lib -lQGLViewer
++  INCLUDEPATH *= $(libqglviewer)/include
++  LIBS        *= -L$(libqglviewer)/lib -lQGLViewer
  }
 diff -U3 -r a/src/swig/Makefile b/src/swig/Makefile
 --- a/src/swig/Makefile	2008-06-06 22:08:06.000000000 +0200
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 887e21a505c..8b031194670 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7093,7 +7093,7 @@ let
 
   libplist = callPackage ../development/libraries/libplist { };
 
-  libQGLViewer = callPackage ../development/libraries/libqglviewer { };
+  libqglviewer = callPackage ../development/libraries/libqglviewer { };
 
   libre = callPackage ../development/libraries/libre {};
   librem = callPackage ../development/libraries/librem {};

From 4b32ac2ffe22fd47214aeca538f2b6250ebf582d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Aug 2015 21:07:42 +0200
Subject: [PATCH 1543/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/ba6c1396e121586665af82bc1f390b1d4d78c401
 with hackage2nix v20150824

---
 .../haskell-modules/hackage-packages.nix      | 341 +++++++++++-------
 1 file changed, 211 insertions(+), 130 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1f04d3a3355..55ffe105b4e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7195,8 +7195,8 @@ self: {
      }:
      mkDerivation {
        pname = "HPDF";
-       version = "1.4.6";
-       sha256 = "c97e3a1cc0e67f0036526897eade5b4e70371cc55214f7222c4261878aab6197";
+       version = "1.4.7";
+       sha256 = "13476b1e0d4d2a2f88255d0928fd11d884f2a3f9f5288f31cef73610f37a6b72";
        libraryHaskellDepends = [
          array base binary bytestring containers mtl random vector zlib
        ];
@@ -9451,9 +9451,12 @@ self: {
        pname = "JuicyPixels-repa";
        version = "0.7";
        sha256 = "a556109f053d1dfd1eebd23080d5f285816a03f73e37fdc1f32e0a8df888c93a";
+       revision = "1";
+       editedCabalFile = "b0dcd6dae60b506057721d2732aebbece6ce380b5d7df4b2ba64592e6e3a88a8";
        libraryHaskellDepends = [
          base bytestring JuicyPixels repa vector
        ];
+       jailbreak = true;
        description = "Convenience functions to obtain array representations of images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13641,6 +13644,8 @@ self: {
        pname = "SDL-mixer";
        version = "0.6.1.1";
        sha256 = "5ff4e4b795aa04a8979610c88d2be948b4b1c69b83d0a3d2ea359d0ed110a355";
+       revision = "1";
+       editedCabalFile = "53f7f1e750f01e8095a95548c76a8ac1fef8298aa197dbc08bf82e939a4bbe64";
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_mixer";
        license = stdenv.lib.licenses.bsd3;
@@ -14594,8 +14599,8 @@ self: {
      }:
      mkDerivation {
        pname = "Spock";
-       version = "0.9.0.0";
-       sha256 = "f12419a63f9d0324c0338b05b3f44f0ec6c8790c3b21bfaff7c1ad154cb8fea6";
+       version = "0.9.0.1";
+       sha256 = "0d6c97a3ca3ab56e01e4a21f6b2f3ce5a210ea9c6f64c2c1c2d2775295dee56c";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          crypto-random directory focus hashable http-types hvect list-t
@@ -16156,8 +16161,8 @@ self: {
     ({ mkDerivation, base, text, Win32, Win32-errors }:
      mkDerivation {
        pname = "Win32-dhcp-server";
-       version = "0.3.1";
-       sha256 = "3236a2353c0d8c4647c55d6ce41ba92a14e5bd4a9817c782c9e1b127049a7d56";
+       version = "0.3.2";
+       sha256 = "3f6fd5dcd65f0883f40a5e3ee9467df0039abf7fc4f5cf0a119c56696d120664";
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
        homepage = "http://github.com/mikesteele81/win32-dhcp-server";
        description = "Win32 DHCP Server Management API";
@@ -18445,8 +18450,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-schema";
-       version = "0.3.0.7";
-       sha256 = "af50aa3ff6974d021aeeb90e7f43d0b4082a3a81972843e1a0ee5bb8068c04e5";
+       version = "0.4.0.0";
+       sha256 = "2b8f58f3539644527c4ab3ff5c07742c9aa2250281b7b3cba8e2c39b88f148a8";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
          regex-base regex-compat regex-pcre scientific syb template-haskell
@@ -18458,7 +18463,7 @@ self: {
          template-haskell temporary test-framework test-framework-hunit
          test-framework-quickcheck2 text unordered-containers vector
        ];
-       homepage = "https://github.com/timjb/aeson-schema";
+       homepage = "https://github.com/Fuuzetsu/aeson-schema";
        description = "Haskell JSON schema validator and parser generator";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -22166,24 +22171,25 @@ self: {
 
   "arithmetic" = callPackage
     ({ mkDerivation, base, opentheory, opentheory-bits
-     , opentheory-divides, opentheory-primitive, QuickCheck, random
+     , opentheory-divides, opentheory-prime, opentheory-primitive
+     , QuickCheck, random
      }:
      mkDerivation {
        pname = "arithmetic";
-       version = "1.0";
-       sha256 = "1af6acf13de40f36d95b8d34e3ba47be559f32dd0f00f1f161b2aa0536b6d5a0";
+       version = "1.1";
+       sha256 = "37b1ddc85799ae996df95d401a74254ea4fe78b22ab2fe51652debd4e36f1a10";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base opentheory opentheory-bits opentheory-divides
+         base opentheory opentheory-bits opentheory-divides opentheory-prime
          opentheory-primitive QuickCheck random
        ];
        executableHaskellDepends = [
-         base opentheory opentheory-bits opentheory-divides
+         base opentheory opentheory-bits opentheory-divides opentheory-prime
          opentheory-primitive QuickCheck random
        ];
        testHaskellDepends = [
-         base opentheory opentheory-bits opentheory-divides
+         base opentheory opentheory-bits opentheory-divides opentheory-prime
          opentheory-primitive QuickCheck random
        ];
        description = "Natural number arithmetic";
@@ -41955,8 +41961,8 @@ self: {
      }:
      mkDerivation {
        pname = "dbmigrations";
-       version = "0.8.2";
-       sha256 = "3c08e5b321e6b60d0abf5f9f20ca4466c2556759aa7866d85c1ffb28c45c310c";
+       version = "0.9";
+       sha256 = "2e9d9d971a2a8f771148a4b19ea8226e4fa2ac2eefb11c93afa4c9983838435c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41964,11 +41970,7 @@ self: {
          HDBC-postgresql HDBC-sqlite3 mtl random template-haskell text time
          yaml-light
        ];
-       executableHaskellDepends = [
-         base bytestring configurator containers directory fgl filepath HDBC
-         HDBC-postgresql HDBC-sqlite3 mtl random template-haskell text time
-         yaml-light
-       ];
+       executableHaskellDepends = [ base configurator ];
        testHaskellDepends = [
          base bytestring containers directory fgl filepath HDBC
          HDBC-postgresql HDBC-sqlite3 HUnit mtl process template-haskell
@@ -53233,6 +53235,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "foldl-transduce" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, containers, doctest
+     , foldl, semigroupoids, tasty, tasty-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "foldl-transduce";
+       version = "0.1.0.1";
+       sha256 = "0cd71afa3ed822a01a23c9ea3ba7a4477ff75c4c2fff26d810941b3c4666e267";
+       libraryHaskellDepends = [
+         base bytestring comonad containers foldl semigroupoids text
+         transformers
+       ];
+       testHaskellDepends = [ base doctest foldl tasty tasty-hunit text ];
+       description = "Transducers for folds from foldl";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "folds" = callPackage
     ({ mkDerivation, base, bytestring, comonad, contravariant, deepseq
      , directory, doctest, filepath, lens, mtl, pointed, profunctors
@@ -54277,8 +54296,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, transformers }:
      mkDerivation {
        pname = "frpnow";
-       version = "0.17";
-       sha256 = "93da2b38fd2a597b2338e7fa132b207c690ad8c3edd26f1dda2fdcac29908b35";
+       version = "0.18";
+       sha256 = "1fafa04d5ec57b49380ad23675075acf03ba63bcf92d52d1341bad265c64b0c7";
        libraryHaskellDepends = [ base containers mtl transformers ];
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Principled practical FRP";
@@ -56921,8 +56940,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20150812";
-       sha256 = "0c6f8cd802b38313739b4a5c5fd8ca51493643d60f9290321039c5c0e33546f4";
+       version = "5.20150824";
+       sha256 = "45088dd5ff5a63ca38965e60843e42c1b8424b3437b58af68929cf61ef0819e4";
        configureFlags = [ "-fassistant" "-fproduction" ];
        isLibrary = false;
        isExecutable = true;
@@ -58091,13 +58110,13 @@ self: {
      }:
      mkDerivation {
        pname = "glue";
-       version = "0.1.3";
-       sha256 = "4668671d2ebeb32c567c8fa6f2ca46f352695e63f17fb45162837b5889f1dde7";
+       version = "0.2.0";
+       sha256 = "784692e29ea1f5effe4ca98732431b77b2595baa5220394c1561b803e4309b2a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base ekg-core hashable lifted-base monad-control monad-loops text
-         time transformers transformers-base unordered-containers
+         base ekg-core hashable lifted-base monad-control text time
+         transformers transformers-base unordered-containers
        ];
        executableHaskellDepends = [
          async base ekg-core hashable lifted-base monad-control monad-loops
@@ -58105,7 +58124,7 @@ self: {
        ];
        testHaskellDepends = [
          async base ekg-core hashable hspec lifted-base monad-control
-         monad-loops QuickCheck quickcheck-instances text time transformers
+         QuickCheck quickcheck-instances text time transformers
          transformers-base unordered-containers
        ];
        description = "Make better services";
@@ -58331,6 +58350,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "google-cloud" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, mtl, scientific, stm, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "google-cloud";
+       version = "0.0.2";
+       sha256 = "2c178a6f82932266e5aacced28ce146a69d4d202c855511ad993c3ce30974437";
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types mtl
+         scientific stm text time unordered-containers
+       ];
+       description = "Client for the Google Cloud APIs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "google-dictionary" = callPackage
     ({ mkDerivation, aeson, base, bytestring, HTTP, lens, mtl }:
      mkDerivation {
@@ -61245,8 +61281,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackage-repo-tool";
-       version = "0.1.0.0";
-       sha256 = "421eed1316a7f54d5e5d5895ff70129a7efaf0d4d2e10b27bc293ba3786c496b";
+       version = "0.1.0.1";
+       sha256 = "fc8863c28ca2cba3e7ae96bac4cc20376666eeb803b8911749a983f762c325f2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -61266,8 +61302,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackage-security";
-       version = "0.2.0.0";
-       sha256 = "db1abeb34db8ecabc4e70db7a71f49789a0a1839b78dbc813f09d25973aea8d4";
+       version = "0.3.0.0";
+       sha256 = "7cbc4e0d7338af2d8cec5235c60270df487ef56bb2cd653a7987b1bc672a2fb6";
        libraryHaskellDepends = [
          base base64-bytestring bytestring Cabal containers cryptohash
          directory ed25519 filepath ghc-prim mtl network network-uri parsec
@@ -61283,8 +61319,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackage-security-HTTP";
-       version = "0.1.0.1";
-       sha256 = "56b526b2ed23201474f111f3b7ad6d77fa5359acd27498ab4a95b451617612fa";
+       version = "0.1.0.2";
+       sha256 = "094cc357668437e5a2ac86168fdfdd5f1784d779a706929d676d8e4d430244dc";
        libraryHaskellDepends = [
          base bytestring hackage-security HTTP mtl network network-uri zlib
        ];
@@ -66250,10 +66286,8 @@ self: {
      }:
      mkDerivation {
        pname = "haxy";
-       version = "1.0";
-       sha256 = "da1d3f638daff80fa82365d02fd6e5dbd1208e3391f6d7c21ced1ebac1ecedbb";
-       revision = "2";
-       editedCabalFile = "1dfd6805d921438c33b5388de37716d320af9aff2d8067837f510d43c3cf5940";
+       version = "1.0.1";
+       sha256 = "6db58fd3433a7c92d660f1c21b11edb739f5cdbe21b47d99336fab2928cd8f4c";
        libraryHaskellDepends = [
          base bytestring data-default-class hostname HTTP http-server mtl
          url
@@ -69576,8 +69610,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsmin";
-       version = "0.1.5.0";
-       sha256 = "f4d81fd8a1cbe65642ff749aeb5866ed9487613a54d7efe6566805fe3f3bf1d7";
+       version = "0.1.5.1";
+       sha256 = "d1e36c8fe5dfd46819425877ca7fc6a5b422fce138de9787b7409850252decff";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72205,8 +72239,8 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.1.4";
-       sha256 = "124d310f0a541b2267483f05e60dc3edd65933abfc51fbe67320deaab5470405";
+       version = "2.1.5";
+       sha256 = "463ce252cbcf6246bb80cc30efa14580b5370e8e5c5c83debfe1b24833b52353";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72592,6 +72626,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { ole32 = null;  oleaut32 = null;};
 
+  "hs-duktape" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
+     , hspec-expectations-pretty-diff, template-haskell, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hs-duktape";
+       version = "0.1.0";
+       sha256 = "4627845867a5b00022b22b0f90355a7f0e9b5b703883f74a6a226507972bf429";
+       libraryHaskellDepends = [
+         aeson base bytestring text transformers
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base bytestring hspec hspec-expectations-pretty-diff
+         template-haskell text
+       ];
+       homepage = "https://github.com/myfreeweb/hs-duktape";
+       description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hs-excelx" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, text, time
      , xml-conduit, zip-archive
@@ -78813,8 +78868,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell";
-       version = "0.6.5.0";
-       sha256 = "e634513efa47aa3e369c3d7fb0ad038b1cba308186d4c50268641a97a727ddbb";
+       version = "0.7.0.3";
+       sha256 = "f2df05336dae36d05ffb25f993fab51ccb727f83adb290b83ab251384e8b2e80";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78827,7 +78882,7 @@ self: {
        ];
        executableHaskellDepends = [
          aeson base bin-package-db bytestring containers directory ghc here
-         ipython-kernel strict text transformers unix
+         ipython-kernel process strict text transformers unix
        ];
        testHaskellDepends = [
          aeson base base64-bytestring bin-package-db bytestring cereal
@@ -79639,6 +79694,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "indieweb-algorithms" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, containers
+     , data-default, either, hspec, hspec-expectations-pretty-diff
+     , http-link-header, lens, lens-aeson, microformats2-parser, mtl
+     , network-uri, raw-strings-qq, safe, template-haskell, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "indieweb-algorithms";
+       version = "0.1.0";
+       sha256 = "3417c4dc270ca59b7731319e7e4009a0f5f464d038814a2db2ceac079dcc80b2";
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default either
+         http-link-header lens lens-aeson microformats2-parser network-uri
+         safe text time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base bytestring data-default hspec
+         hspec-expectations-pretty-diff microformats2-parser mtl network-uri
+         raw-strings-qq template-haskell text time
+       ];
+       homepage = "https://github.com/myfreeweb/indieweb-algorithms";
+       description = "A collection of implementations of IndieWeb algorithms";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "infer-upstream" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, github, optparse-applicative
      , parsec, process, text
@@ -80834,8 +80915,8 @@ self: {
      }:
      mkDerivation {
        pname = "ipython-kernel";
-       version = "0.6.1.2";
-       sha256 = "1431c7442b9081dd9169348b36f0befafeedca8a773b8d5349518b39fde1e4e2";
+       version = "0.7.0.0";
+       sha256 = "17acfb6ac18e23a85b3fe3324af946439bf0bd886eaf5613d94c027a903174d7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80845,7 +80926,6 @@ self: {
        executableHaskellDepends = [
          base filepath mtl parsec text transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
        license = stdenv.lib.licenses.mit;
@@ -87966,8 +88046,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }:
      mkDerivation {
        pname = "linearscan";
-       version = "0.7.0";
-       sha256 = "37f2f77ad17b40fbf62dd823f40ef88ab8db516ced17de1d3d0493f4e4e44e8f";
+       version = "0.8.0";
+       sha256 = "108c26b493f21a47e171435053feef2d0fb178bb6be82baa6be5ea122b137829";
        libraryHaskellDepends = [
          base containers ghc-prim mtl transformers
        ];
@@ -87978,22 +88058,21 @@ self: {
      }) {};
 
   "linearscan-hoopl" = callPackage
-    ({ mkDerivation, base, containers, deepseq, free, fuzzcheck, hoopl
-     , hspec, hspec-expectations, lens-family-core, linearscan
-     , QuickCheck, transformers
+    ({ mkDerivation, base, containers, deepseq, free, hoopl, hspec
+     , hspec-expectations, lens-family-core, linearscan, QuickCheck
+     , transformers
      }:
      mkDerivation {
        pname = "linearscan-hoopl";
-       version = "0.7.0";
-       sha256 = "db7ac77ef994fd40c1a11c9ff662d4710b29aff4ec498aeb78c6525f247b7fff";
+       version = "0.8.1";
+       sha256 = "cdd53114005aecb15ade491e8f662f651d91a166ab6929f73a081d9613991765";
        libraryHaskellDepends = [
          base containers free hoopl linearscan QuickCheck transformers
        ];
        testHaskellDepends = [
-         base containers deepseq fuzzcheck hoopl hspec hspec-expectations
+         base containers deepseq hoopl hspec hspec-expectations
          lens-family-core linearscan QuickCheck transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/jwiegley/linearscan-hoopl";
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
        license = stdenv.lib.licenses.bsd3;
@@ -90403,8 +90482,8 @@ self: {
     ({ mkDerivation, base, network, transformers }:
      mkDerivation {
        pname = "mac";
-       version = "0.1.0.0";
-       sha256 = "71a14d4c4682d9d9d21eee66bc1471d28b2801517c870bbbacc57872ce84a5fa";
+       version = "0.1.2.0";
+       sha256 = "8ac8188429cb9e20aefa83e3943f7b4f2713248160bcbeb9080784e637e5789d";
        libraryHaskellDepends = [ base network transformers ];
        description = "Static Mandatory Access Control in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -91332,6 +91411,8 @@ self: {
        pname = "manifolds";
        version = "0.1.3.1";
        sha256 = "f2d286ecbcf0d391fecb61e8be56b56737d9f26d53cc68e815fc2f73766330b4";
+       revision = "1";
+       editedCabalFile = "078a790a2e462108e5d1ed6314f264d40b3fd1b063f56595e3874fcb5137eeea";
        libraryHaskellDepends = [
          base comonad constrained-categories containers deepseq hmatrix
          MemoTrie semigroups tagged transformers vector vector-algorithms
@@ -92751,8 +92832,8 @@ self: {
      }:
      mkDerivation {
        pname = "microformats2-parser";
-       version = "1.0.1.1";
-       sha256 = "281212dd0fb8d61af7c4eaf4b0fa57d31b0267c8e8e1dea12cede8a6efc1a2e9";
+       version = "1.0.1.2";
+       sha256 = "94c220abb5bfd065e492f138bb72466f37cb2ecf4c53e830226b64e950a061b9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92796,8 +92877,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.3.2.0";
-       sha256 = "a20e1082261e08b258e964484b2df4557a135832f18cd424eb8c030fbe62d402";
+       version = "0.3.3.0";
+       sha256 = "42a4b7c40a02a500419cf4b18df97ca76f31db06b1947d9c7d7434daf6434eab";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library which you can depend upon";
@@ -92821,8 +92902,8 @@ self: {
     ({ mkDerivation, array, base, bytestring, containers, microlens }:
      mkDerivation {
        pname = "microlens-ghc";
-       version = "0.2.0.0";
-       sha256 = "d848f874c5af94c64ee8e6e0912fca305687acd5ec2b5353297943a3f5fcbf04";
+       version = "0.2.1.0";
+       sha256 = "0f9544e355d4c262ee94eacc893b57ad54666e473a5e4b7cd7db236fcfdd9ea3";
        libraryHaskellDepends = [
          array base bytestring containers microlens
        ];
@@ -92837,8 +92918,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-mtl";
-       version = "0.1.4.1";
-       sha256 = "5a9a54d7804ece4bc4ab45c1784ce91df7681e2742b301754a212c7ccc2d7e70";
+       version = "0.1.5.0";
+       sha256 = "0f456e058d034e517eed53756d3b70438fcd91a818c93980053ab6ac86213028";
        libraryHaskellDepends = [
          base microlens mtl transformers transformers-compat
        ];
@@ -92853,8 +92934,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-platform";
-       version = "0.1.2.0";
-       sha256 = "5a44b16b764fae1de9b29a114784abbb7aaa75270c2c4a21a026656ab1e24471";
+       version = "0.1.3.0";
+       sha256 = "8f2c08879fb484df0e1f2564dfa2e1fd6dd4745fefae02678e569803db97ad80";
        libraryHaskellDepends = [
          base hashable microlens microlens-ghc microlens-mtl microlens-th
          text unordered-containers vector
@@ -93118,18 +93199,20 @@ self: {
 
   "milena" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, digest
-     , either, hspec, lens, mtl, network, QuickCheck, random
-     , resource-pool, transformers
+     , either, hspec, lens, lifted-base, listsafe, mtl, murmur-hash
+     , network, QuickCheck, random, resource-pool, transformers
      }:
      mkDerivation {
        pname = "milena";
-       version = "0.2.0.0";
-       sha256 = "35ef8dfd4c1b5302c55f5cd3e6df87f64937be72317f24f58c96252b4393ce22";
+       version = "0.3.0.0";
+       sha256 = "924fc92ec94da73dcd5d9a0505247cc77106fd8757016a9ebc1cfc574d96c753";
        libraryHaskellDepends = [
-         base bytestring cereal containers digest either lens mtl network
-         random resource-pool transformers
+         base bytestring cereal containers digest either lens lifted-base
+         listsafe mtl murmur-hash network random resource-pool transformers
+       ];
+       testHaskellDepends = [
+         base bytestring hspec mtl network QuickCheck
        ];
-       testHaskellDepends = [ base bytestring hspec network QuickCheck ];
        jailbreak = true;
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -93931,8 +94014,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.24";
-       sha256 = "0a95707996c4c6f68a222063fa22008b038865ea8a8cb57bcbedd9a5bba72ba6";
+       version = "0.1.0.25";
+       sha256 = "c80dc33b2f5be9f4826ce51aa047b078c22d47a0900aa2fe294232c588f251a8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -101941,8 +102024,8 @@ self: {
      }:
      mkDerivation {
        pname = "os-release";
-       version = "0.2.1";
-       sha256 = "8a9237966475d4178a266479d0dd9a834bd59349116528539eab66717d884646";
+       version = "0.2.2";
+       sha256 = "a91357fec161695ca6868d27c150f2de05666a6a7708114b3e06ff100f4d2ca7";
        libraryHaskellDepends = [ base containers parsec transformers ];
        testHaskellDepends = [
          base containers hlint hspec parsec process regex-compat temporary
@@ -103664,8 +103747,8 @@ self: {
      }:
      mkDerivation {
        pname = "pcg-random";
-       version = "0.1.3.1";
-       sha256 = "917be65fa6f917ba3e8b1ae98774356559ff6239f0b806ac0943cf160a455d0b";
+       version = "0.1.3.2";
+       sha256 = "288db42bb77ffef6e57007b893b41df5a3ac8f252d5a519306448cb5802ebe71";
        libraryHaskellDepends = [
          base bytestring entropy primitive random time
        ];
@@ -105518,8 +105601,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-csv";
-       version = "1.4.0";
-       sha256 = "d2041b32b683d1a3a74fddd09ca0f572cc21c6c9ca434a394573d23dadb32fe0";
+       version = "1.4.1";
+       sha256 = "9a18f4c24281e87136ea17bc73a37199333da25532a5ffed8d268eb080f5d9c4";
        libraryHaskellDepends = [
          base blaze-builder bytestring cassava pipes unordered-containers
          vector
@@ -105528,7 +105611,6 @@ self: {
          base bytestring cassava HUnit pipes pipes-bytestring test-framework
          test-framework-hunit vector
        ];
-       jailbreak = true;
        description = "Fast, streaming csv parser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108461,12 +108543,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "process_1_2_3_0" = callPackage
+  "process_1_3_0_0" = callPackage
     ({ mkDerivation, base, deepseq, directory, filepath, unix }:
      mkDerivation {
        pname = "process";
-       version = "1.2.3.0";
-       sha256 = "619e04157183631bd16fa921589bd4125b7db12c45287e962a7b8402a70d60c5";
+       version = "1.3.0.0";
+       sha256 = "709b77b7a2a5768c61759fdd000e3b9c47e05cbee7987abf82954fd15d80c3f8";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base ];
        description = "Process libraries";
@@ -109085,8 +109167,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.7.1";
-       sha256 = "31e6b0463f36a6241eaadd980648afe487061e213582b457f29e045ee4ea862f";
+       version = "2.7.2";
+       sha256 = "9c1cc565bfdea30d58c5306ef2dda9d4e86984f9f9004c0fe43011b481ce4db8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109248,8 +109330,8 @@ self: {
      }:
      mkDerivation {
        pname = "protocol-buffers";
-       version = "2.1.4";
-       sha256 = "ad92eb27e09c70a26353377a09b5d61715aa452215e6221e33fcd0065c15c96a";
+       version = "2.1.5";
+       sha256 = "1028200fcef97d76f28e9ff22100066ad6b797c56fbf0222735b1ed4ece060dd";
        libraryHaskellDepends = [
          array base binary bytestring containers directory filepath mtl
          parsec syb utf8-string
@@ -109263,8 +109345,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
-       version = "2.1.4";
-       sha256 = "7e7ff115ed7fefcaa00917ba76052d50d4f5dd786956a646d1b3180212a207d4";
+       version = "2.1.5";
+       sha256 = "cd653ce9ad16eadb080d6e19647da5fe5ccde7e3e2fb85464cbc460d44ca44f0";
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers
        ];
@@ -113138,8 +113220,8 @@ self: {
     ({ mkDerivation, base, regex-tdfa, template-haskell }:
      mkDerivation {
        pname = "regex-tdfa-quasiquoter";
-       version = "0.1.0.0";
-       sha256 = "acafaa4c7a536483cc75952cdb9a8e7ae0bc1b76deb5170f405c0194e64859fc";
+       version = "0.2.0.0";
+       sha256 = "8ae16a6297b7357ef3d9f8d2e09d006e74f67b889ec7d86296eb0ac6fb2c8361";
        libraryHaskellDepends = [ base regex-tdfa template-haskell ];
        jailbreak = true;
        homepage = "http://github.com/erisco/regex-tdfa-quasiquoter";
@@ -114803,8 +114885,8 @@ self: {
      }:
      mkDerivation {
        pname = "rethinkdb";
-       version = "2.1.0.1";
-       sha256 = "3d8a61d33361e8fd90d3ac3f63f57d1f660f9102c09b406b2ac2ff571711a5cb";
+       version = "2.1.0.2";
+       sha256 = "80689203aafcbf26b555952953012fc1a1272d2e28cd5dcc30fcceb50951fd07";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114814,7 +114896,6 @@ self: {
        ];
        executableHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base doctest ];
-       jailbreak = true;
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 2.1";
        license = stdenv.lib.licenses.asl20;
@@ -119055,8 +119136,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-JuicyPixels";
-       version = "0.1.0.0";
-       sha256 = "12914a3047b8e0e00db4f2d37a4d6f3aee0d1aa93bb76e815fdf2282ccf4d4ba";
+       version = "0.2.0.0";
+       sha256 = "3b2da6980c0c35ef5f9dcce145b7d59f3134b418ee659b84794d6bb6c503e4b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119851,13 +119932,12 @@ self: {
     ({ mkDerivation, base, binary, bytestring, io-streams, SHA }:
      mkDerivation {
        pname = "sha-streams";
-       version = "0.1.1";
-       sha256 = "5134e20354eb38b5b2b5a3eebe78b618ad70970c255b38e03fb91122ea6d5ae1";
+       version = "0.2.0";
+       sha256 = "de53ff3189b191d2217fe61b6c2142888e501eb0f9a35a4205d8528fcd648191";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base binary bytestring io-streams SHA ];
        executableHaskellDepends = [ base io-streams SHA ];
-       jailbreak = true;
        homepage = "https://github.com/noteed/sha-streams";
        description = "SHA hashes for io-streams";
        license = stdenv.lib.licenses.bsd3;
@@ -125191,8 +125271,8 @@ self: {
      }:
      mkDerivation {
        pname = "squeeze";
-       version = "1.0.4.4";
-       sha256 = "c4865b707eeda4e8a8588a1ce7aa835128c7dc1c0506b9f4689ced5f5852d1a2";
+       version = "1.0.4.5";
+       sha256 = "9079a9e9163b27612c4625542bcd530766576e1d43e496c21cc42ffdbf3c6231";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -128196,8 +128276,8 @@ self: {
      }:
      mkDerivation {
        pname = "sws";
-       version = "0.3.1.1";
-       sha256 = "8dc76a7b25543ea8006553817d19ad8217fca38f7fa037213fcb304e0b2cd42a";
+       version = "0.3.1.2";
+       sha256 = "e86be4df4f505f7f6eab69957ae3843455fbce9e13dd211ee65cff034449240c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -132325,19 +132405,21 @@ self: {
 
   "these" = callPackage
     ({ mkDerivation, base, bifunctors, containers, mtl, profunctors
-     , semigroupoids, semigroups, transformers, vector
+     , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck
+     , transformers, vector
      }:
      mkDerivation {
        pname = "these";
-       version = "0.4.2";
-       sha256 = "e732b9c0af7bfc7ae2aad97383d560d909b503ddb2fadbb6f5938679404c4543";
-       revision = "1";
-       editedCabalFile = "02eb71fed8c848cc4f94f1181f09a6f9667caac38746f757bd57ca881aa47629";
+       version = "0.6.0.0";
+       sha256 = "c8e94f28561e87a1c51498a8529a74983fe68d785b250c118d02a9a25d1b9383";
        libraryHaskellDepends = [
          base bifunctors containers mtl profunctors semigroupoids semigroups
          transformers vector
        ];
-       jailbreak = true;
+       testHaskellDepends = [
+         base bifunctors QuickCheck tasty tasty-quickcheck transformers
+         vector
+       ];
        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;
@@ -134927,8 +135009,8 @@ self: {
      }:
      mkDerivation {
        pname = "tttool";
-       version = "1.4.0.3";
-       sha256 = "2de9817bfeee47ea168194862a2fa27c86bff3c7f5063537394c38851f7ed757";
+       version = "1.4.0.4";
+       sha256 = "b3e15148fa1090cdffaa91094aadedb6f80ad70ebcf9740e27d2c5256147a260";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -141134,8 +141216,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.8.0";
-       sha256 = "3b0b8ccb5853d830c0feaad5cbb5db8e7f3499af18b027e052e169199b89959d";
+       version = "0.8.1";
+       sha256 = "0ebdf952830d550a6f56bf048ae7f554c88ab8fa0f3a3b613569f620133d41d2";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive containers
          cookie data-default-class filepath http-types mime-types
@@ -141144,7 +141226,6 @@ self: {
        testHaskellDepends = [
          aeson base hspec hspec-wai hspec-wai-json wai
        ];
-       jailbreak = true;
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
@@ -145761,8 +145842,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod";
-       version = "1.4.1.5";
-       sha256 = "a1160d366cf2c91502bcd5c8f251041ec8a1bc962729c95d5bc572dbe9f8296b";
+       version = "1.4.2";
+       sha256 = "d6d13e608af954de23721261b39ee79569907beb173477db8820acc5e9f45757";
        libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring conduit-extra
          data-default directory fast-logger monad-control monad-logger safe
@@ -147158,8 +147239,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-test";
-       version = "1.5";
-       sha256 = "437a76419c94030c3c3d8b8a88a52f0ff9c416d56894bc4b825c62faa9a1be07";
+       version = "1.5.0.1";
+       sha256 = "9b19fb51e901935f8b0926e3b9bbae772d45967a747fb3a1bf9cb893724c29a4";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          case-insensitive containers cookie hspec-core html-conduit
@@ -147167,8 +147248,8 @@ self: {
          transformers wai wai-extra xml-conduit xml-types yesod-core
        ];
        testHaskellDepends = [
-         base bytestring containers hspec html-conduit HUnit text wai
-         xml-conduit yesod-core yesod-form
+         base bytestring containers hspec html-conduit http-types HUnit text
+         wai xml-conduit yesod-core yesod-form
        ];
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
@@ -148338,8 +148419,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, containers }:
      mkDerivation {
        pname = "zmidi-core";
-       version = "0.8.0";
-       sha256 = "aa8e7f0d0068f75f38347beb85de7716811018e8fa5b42fb5a1a3c9a11fbbada";
+       version = "0.8.1";
+       sha256 = "5bfb08b41d20ea1d0520dac48fefe07fc4f174bcfa9de6d7eb613234e962cbd8";
        libraryHaskellDepends = [ base binary bytestring containers ];
        homepage = "https://github.com/stephentetley/zmidi-core";
        description = "Read and write MIDI files";

From a206c227cc0b0f06d393ba10643c1453d8693b2a Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Aug 2015 09:00:32 -0400
Subject: [PATCH 1544/2016] haskell-types-compat: Re-enable haddock generation

The "real" issue (https://github.com/philopon/types-compat/issues/1) has
been closed for a while, and I manually confirmed that the documentation
builds correctly under 7.10.2 and 7.8.4.  The package itself doesn't
build older versions because of missing dependencies.
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7658ff1b111..187b3b5109c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -157,7 +157,6 @@ self: super: {
   network-conduit = dontHaddock super.network-conduit;
   shakespeare-js = dontHaddock super.shakespeare-js;
   shakespeare-text = dontHaddock super.shakespeare-text;
-  types-compat = dontHaddock super.types-compat;                # https://github.com/philopon/apiary/issues/15
   wai-test = dontHaddock super.wai-test;
   zlib-conduit = dontHaddock super.zlib-conduit;
   record = dontHaddock super.record;                            # https://github.com/nikita-volkov/record/issues/22

From e7aff313da890e3fd0d2353d075ed8511f2ae283 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 25 Aug 2015 12:31:59 -0400
Subject: [PATCH 1545/2016] haskell-record: re-enable haddock generation

The bug's been closed for a while, and I manually verified that the
haddock gets rendered to HTML in all versions from 7.6 -> 7.10.
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 187b3b5109c..bee83b350e9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -159,7 +159,6 @@ self: super: {
   shakespeare-text = dontHaddock super.shakespeare-text;
   wai-test = dontHaddock super.wai-test;
   zlib-conduit = dontHaddock super.zlib-conduit;
-  record = dontHaddock super.record;                            # https://github.com/nikita-volkov/record/issues/22
 
   # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
   darcs = (overrideCabal super.darcs (drv: {

From 9274aa93b5b0a3688ac54aa22108152703528bdd Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 26 Aug 2015 05:33:14 -0400
Subject: [PATCH 1546/2016] haskell-wizards: un-jailBreak

The original bug is long since closed, and I verified it compiles on ghc
7.6 -> 7.10.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index bee83b350e9..8c257b83718 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -237,9 +237,6 @@ self: super: {
   # tests don't compile for some odd reason
   jwt = dontCheck super.jwt;
 
-  # https://github.com/liamoc/wizards/issues/5
-  wizards = doJailbreak super.wizards;
-
   # https://github.com/tibbe/ekg-core/commit/c986d9750d026a0c049cf6e6610d69fc1f23121f, not yet in hackage
   ekg-core = doJailbreak super.ekg-core;
 

From 416840c4809b09f200b79120128b4c94b48db5be Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 26 Aug 2015 05:43:02 -0400
Subject: [PATCH 1547/2016] haskell-ekg-core: un-jailBreak

The referenced commit has long since been released to hackage, and the
package has been verified to build properly under ghc 7.6 -> 7.10.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8c257b83718..ed35a1d5bed 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -237,9 +237,6 @@ self: super: {
   # tests don't compile for some odd reason
   jwt = dontCheck super.jwt;
 
-  # https://github.com/tibbe/ekg-core/commit/c986d9750d026a0c049cf6e6610d69fc1f23121f, not yet in hackage
-  ekg-core = doJailbreak super.ekg-core;
-
   # https://github.com/tibbe/ekg/commit/95018646f48f60d9ccf6209cc86747e0f132e737, not yet in hackage
   ekg = doJailbreak super.ekg;
 

From 90144c684b64c3d428fa6023e8338e8fc5866a74 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 26 Aug 2015 05:44:06 -0400
Subject: [PATCH 1548/2016] haskell-ekg: un-jailBreak

The referenced commit is long since released, and the package builds
correctly with ghc 7.6 -> 7.10.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ed35a1d5bed..ba5f2a68f12 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -237,9 +237,6 @@ self: super: {
   # tests don't compile for some odd reason
   jwt = dontCheck super.jwt;
 
-  # https://github.com/tibbe/ekg/commit/95018646f48f60d9ccf6209cc86747e0f132e737, not yet in hackage
-  ekg = doJailbreak super.ekg;
-
   # https://github.com/NixOS/cabal2nix/issues/136
   glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib];
   gtk3 = super.gtk3.override { inherit (pkgs) gtk3; };

From 4bd9f78949817ef70596613a5bece43dc0c4c9f9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Aug 2015 15:16:42 +0200
Subject: [PATCH 1549/2016] haskell-cabal-helper: downgrade to version 0.5.1.0

0.5.2.0 has been deprecated.
---
 .../haskell-modules/hackage-packages.nix      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 55ffe105b4e..89121a2c8d4 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -30299,6 +30299,30 @@ self: {
      }) {};
 
   "cabal-helper" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, data-default, directory
+     , extra, filepath, ghc-prim, mtl, process, template-haskell
+     , temporary, transformers, unix, utf8-string
+     }:
+     mkDerivation {
+       pname = "cabal-helper";
+       version = "0.5.1.0";
+       sha256 = "563773491cc8245c3d265c2e7847f95198aad74adcbc16a91622e7e4abef4e45";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base Cabal data-default directory filepath ghc-prim mtl process
+         transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath process template-haskell
+         temporary transformers utf8-string
+       ];
+       testHaskellDepends = [ base extra process unix ];
+       description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
+  "cabal-helper_0_5_2_0" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, data-default, directory
      , extra, filepath, ghc-prim, mtl, process, template-haskell
      , temporary, transformers, unix, utf8-string

From 7160a3200156d5c3cc7d916f51624d28d0a8003d Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 26 Aug 2015 17:08:27 +0200
Subject: [PATCH 1550/2016] linphone: 3.8.1 -> 3.8.5

---
 .../instant-messengers/linphone/default.nix   |  4 +--
 .../linphone/fix-deprecated.patch             | 35 -------------------
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch

diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index f9bd941b2f6..3310aace40e 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "linphone-3.8.1";
+  name = "linphone-3.8.5";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/3.8.x/sources/${name}.tar.gz";
-    sha256 = "19xwar8z5hyp1bap1s437ipv90gspmjwcq5zznds55d7r6gbqicd";
+    sha256 = "10brlbwkk61nhd5v2sim1vfv11xm138l1cqqh3imhs2sigmzzlax";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch b/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch
deleted file mode 100644
index 8978e6e6652..00000000000
--- a/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/gtk/main.c b/gtk/main.c
-index 7079bc8..f076127 100644
---- a/gtk/main.c
-+++ b/gtk/main.c
-@@ -1643,7 +1643,7 @@ int main(int argc, char *argv[]){
- 	GdkPixbuf *pbuf;
- 	const char *app_name="Linphone";
- 
--	g_thread_init(NULL);
-+	g_type_init();
- 	gdk_threads_init();
- 	
- 	progpath = strdup(argv[0]);
-diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
-index 1c54fca..45c9091 100644
---- a/gtk/setupwizard.c
-+++ b/gtk/setupwizard.c
-@@ -270,7 +270,7 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) {
- 	linphone_account_creator_set_username(creator, gtk_entry_get_text(username));
- 
- 	if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) {
--		g_thread_create(check_username_availability, (void*)w, FALSE, NULL);
-+		g_thread_new (NULL, check_username_availability, (void*)w);
- 	}
- 	else {
- 		if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) {
-@@ -534,7 +534,7 @@ GtkWidget * linphone_gtk_create_assistant(void){
- 	ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png"));
- 	notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png"));
- 
--	g_thread_init (NULL);
-+	g_type_init ();
- 	gdk_threads_init ();
- 
- 	GtkWidget *p1=create_intro();

From 46de943ec74811d7513274b2c59aa468ec437164 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 26 Aug 2015 17:18:28 +0200
Subject: [PATCH 1551/2016] belle-sip: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index 6dc1b5241f2..5975a61ff77 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -9,11 +9,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "belle-sip-1.4.0";
+  name = "belle-sip-1.4.1";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/belle-sip/${name}.tar.gz";
-    sha256 = "1lwxfvwvclbh0bfwf69jrknqzqh1igzm293wwwbmq4kn8c5fiypz";
+    sha256 = "0q1d3fqsrxi3kxcjcibr376js25h6in8c1hm7c53wz252jx6f42b";
   };
 
   nativeBuildInputs = [ jre ];

From 1d2632f8202addec972dadc03b99a0b9f65c69c8 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 26 Aug 2015 17:18:53 +0200
Subject: [PATCH 1552/2016] mediastreamer: 2.11.1 -> 2.11.2

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

diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 19e71fd66c1..ed81eb94185 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mediastreamer-2.11.1";
+  name = "mediastreamer-2.11.2";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz";
-    sha256 = "0gfv4k2rsyvyq838xjgsrxmmn0fkw40apqs8vakzjwzsz2c9z8pd";
+    sha256 = "1g6gawrlz1lixzs1kzckm3rxc401ww8pi00x7r5kb84bdijb02cc";
   };
 
   postPatch = ''

From c35309ff0b963959276d6db45c9cf11a5024f557 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 26 Aug 2015 17:19:19 +0200
Subject: [PATCH 1553/2016] ortp: 0.24.2 -> 0.24.2

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

diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 561d0df4e80..746f10eebed 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ortp-0.24.1";
+  name = "ortp-0.24.2";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
-    sha256 = "1mach7cdq4kydqkll8ra1kir818da07z253rf9pihifipqhcxv6i";
+    sha256 = "05k6ianphr533qnjwxsv7jnh7fb2sq0dj1pdy1bk2w5khmlwfdyb";
   };
 
   meta = with stdenv.lib; {

From a94e8f24f2bada8afde821a86bd3f9e8846a4f5a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 26 Aug 2015 14:40:20 +0200
Subject: [PATCH 1554/2016] mcelog: update 123 -> 124

---
 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 aa1b197e83f..c6ca6d21d2d 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 = "123"; in
+let version = "124"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0hrpqx0wfwribzm3j132k0869xbh5wa89pzhwcych5w2w0n2i890";
+    sha256 = "02yqf9vcbkw9kpl0dl619scb9njkwklspvr5mhjb307004b71qqd";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From a5e28d531973528cbb80e5b49267f2fa8b2ec75b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 26 Aug 2015 16:01:43 +0200
Subject: [PATCH 1555/2016] freenect: add version 0.5.2

---
 .../libraries/freenect/default.nix            | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/freenect/default.nix

diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
new file mode 100644
index 00000000000..c79c389128b
--- /dev/null
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchzip, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }:
+
+stdenv.mkDerivation rec {
+    name = "freenect-${version}";
+    version = "0.5.2";
+    src = fetchzip {
+        url = "https://github.com/OpenKinect/libfreenect/archive/v${version}.tar.gz";
+        sha256 = "04p4q19fkh97bn7kf0xsk6mrig2aj10i3s9z6hdrr70l6dfpf4w9";
+    };
+
+    buildInputs = [ libusb freeglut mesa libXi libXmu ];
+    nativeBuildInputs = [ cmake pkgconfig ];
+
+    meta = {
+        description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X";
+        inherit version;
+        homepage = http://openkinect.org;
+        license = with stdenv.lib.licenses; [ gpl2 asl20 ];
+        maintainers = with stdenv.lib.maintainers; [ bennofs ];
+        platforms = stdenv.lib.platforms.linux;
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b031194670..cc38e113957 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6266,6 +6266,10 @@ let
   freealut = callPackage ../development/libraries/freealut { };
 
   freeglut = callPackage ../development/libraries/freeglut { };
+  
+  freenect = callPackage ../development/libraries/freenect { 
+      inherit (xlibs) libXi libXmu;
+  };
 
   freetype = callPackage ../development/libraries/freetype { };
 

From 271926d00dbac878bd2105c1d6e191b3298f138e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 26 Aug 2015 16:20:21 +0200
Subject: [PATCH 1556/2016] haskell: fix build of SDL-* libraries

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ba5f2a68f12..10e665b70a2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -973,4 +973,23 @@ self: super: {
   hackage-security = dontDistribute super.hackage-security;
   hackage-security-HTTP = dontDistribute super.hackage-security-HTTP;
 
+  # The cabal files for these libraries do not list the required system dependencies.
+  SDL-image = overrideCabal super.SDL-image (drv: {
+    librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or [];
+  });
+  SDL-ttf = overrideCabal super.SDL-ttf (drv: {
+    librarySystemDepends = [ pkgs.SDL pkgs.SDL_ttf ];
+  });
+  SDL-mixer = overrideCabal super.SDL-mixer (drv: {
+    librarySystemDepends = [ pkgs.SDL pkgs.SDL_mixer ];
+  });
+  SDL-gfx = overrideCabal super.SDL-gfx (drv: {
+    librarySystemDepends = [ pkgs.SDL pkgs.SDL_gfx ];
+  });
+  SDL-mpeg = overrideCabal super.SDL-mpeg (drv: {
+    configureFlags = (drv.configureFlags or []) ++ [
+      "--extra-lib-dirs=${pkgs.smpeg}/lib"
+      "--extra-include-dirs=${pkgs.smpeg}/include/smpeg"
+    ];
+  });
 }

From 0d6d5c907e14435cb5a460c19232faf3c96c298b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 26 Aug 2015 17:04:17 +0200
Subject: [PATCH 1557/2016] cwiid: new package

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

diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix
new file mode 100644
index 00000000000..a86bdc8e035
--- /dev/null
+++ b/pkgs/development/libraries/cwiid/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, autoreconfHook, fetchgit, bison, flex, bluez, pkgconfig, gtk }:
+
+stdenv.mkDerivation rec {
+    name = "cwiid-2010-02-21-git";
+    src = fetchgit {
+        url = https://github.com/abstrakraft/cwiid;
+        sha256 = "6f5355d036dab017da713c49d3042011fa24fb732ed0d5ee338ab6f5ff400f06";
+        rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82";
+    };
+    configureFlags = "--without-python";
+    prePatch = ''
+        sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in
+    '';
+    buildInputs = [ autoreconfHook bison flex bluez pkgconfig gtk ];
+    postInstall = ''
+        # Some programs (for example, cabal-install) have problems with the double 0
+        sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc
+    '';
+    meta = {
+        description = "Linux Nintendo Wiimote interface";
+        homepage = http://cwiid.org;
+        license = stdenv.lib.licenses.gpl2Plus;
+        maintainers = [ stdenv.lib.maintainers.bennofs ];
+        platforms = stdenv.lib.platforms.linux; 
+    };   
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc38e113957..51d8f2431cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6098,6 +6098,8 @@ let
 
   cryptopp = callPackage ../development/libraries/crypto++ { };
 
+  cwiid = callPackage ../development/libraries/cwiid { };
+
   cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { };
 
   # Make bdb5 the default as it is the last release under the custom

From 8ee58a2aa3b5e621649ea4b5c77fca66ebeb7c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Wed, 26 Aug 2015 17:34:02 +0200
Subject: [PATCH 1558/2016] haskell: fix freenect and hcwiid

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 10e665b70a2..2705a301124 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -992,4 +992,21 @@ self: super: {
       "--extra-include-dirs=${pkgs.smpeg}/include/smpeg"
     ];
   });
+
+  # https://github.com/chrisdone/freenect/pull/11
+  freenect = overrideCabal super.freenect (drv: {
+    libraryPkgconfigDepends = [ pkgs.freenect ];
+    prePatch = '' echo "  Pkgconfig-Depends: libfreenect" >> freenect.cabal '';
+  });
+
+  # https://github.com/ivanperez-keera/hcwiid/pull/4
+  hcwiid = overrideCabal super.hcwiid (drv: {
+    configureFlags = (drv.configureFlags or []) ++ [
+      "--extra-lib-dirs=${pkgs.bluez}/lib"
+      "--extra-lib-dirs=${pkgs.cwiid}/lib"
+      "--extra-include-dirs=${pkgs.cwiid}/include"
+      "--extra-include-dirs=${pkgs.bluez}/include"
+    ];
+    prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" '';
+  });
 }

From cf660d03bd993474fccc674e8111642e90a086d9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 23 Aug 2015 14:03:33 +0200
Subject: [PATCH 1559/2016] smtube: 15.5.17 -> 15.8.0

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

diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 3180a9e632a..7482a92e82b 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,14 +1,12 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  versionMajor = "15.5";
-  versionMinor = "17";
-  version = "${versionMajor}.${versionMinor}";
+  version = "15.8.0";
   name = "smtube-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/smtube/SMTube/${versionMajor}/${name}.tar.bz2";
-    sha256 = "0jbik41nb1b7381ybzblmmsl8b7ljl6a2zpn1dcg0cccjw5mnbyg";
+    url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
+    sha256 = "0hxh3axlhd16ffnkynm4lcfpkwkfv19y70cqgpqrdj2gl8f917bp";
   };
 
   makeFlags = [

From 444b8484d71d03b3a27b62ad75b073746864ef5b Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 26 Aug 2015 17:42:13 +0200
Subject: [PATCH 1560/2016] openh246: init at 1.4.0

---
 .../libraries/openh264/default.nix            | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/openh264/default.nix

diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
new file mode 100644
index 00000000000..ff6582ca7a7
--- /dev/null
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, nasm }:
+
+stdenv.mkDerivation rec {
+  name = "openh264-1.4.0";
+
+  src = fetchurl {
+    url = "https://github.com/cisco/openh264/archive/v1.4.0.tar.gz";
+    sha256 = "08haj0xkyjlwbpqdinxk0cmvqw89bx89ly0kqs9lf87fy6ksgfd1";
+  };
+
+  buildInputs = [ nasm ];
+
+  installPhase = ''
+    make PREFIX=$out install
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A codec library which supports H.264 encoding and decoding";
+    homepage = http://www.openh264.org;
+    license = stdenv.licenses.bsd2;
+  };
+}

From 9635f89fff80cd243462c20a311f7340031f0f59 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 26 Aug 2015 18:32:33 +0200
Subject: [PATCH 1561/2016] cataclysm-dda: try disabling parallel builds (ZHF)

---
 pkgs/games/cataclysm-dda/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix
index c8d69d3078d..ed4aed35e11 100644
--- a/pkgs/games/cataclysm-dda/default.nix
+++ b/pkgs/games/cataclysm-dda/default.nix
@@ -36,7 +36,8 @@ in stdenv.mkDerivation rec {
       --add-flags "--datadir $out/share/"
   '';
 
-  enableParallelBuilding = true;
+  # Disable, possible problems with hydra
+  #enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "A free, post apocalyptic, zombie infested rogue-like";

From 47ea8c097c08ee19f8622eae4e9e3acdc99fce3e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 26 Aug 2015 19:37:48 +0300
Subject: [PATCH 1562/2016] buildFHSUserEnv: add .env support

---
 .../build-fhs-userenv/default.nix             | 44 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index b57b687e20f..9060c073eee 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -1,4 +1,4 @@
-{ writeText, writeScriptBin, stdenv, ruby } : { env, runScript } :
+{ runCommand, writeText, writeScriptBin, stdenv, ruby } : { env, runScript ? "bash" } :
 
 let
   name = env.pname;
@@ -9,21 +9,37 @@ let
     ${builtins.readFile ./chroot-user.rb}
   '';
 
-  init = writeText "init" ''
-           # Make /tmp directory
-           mkdir -m 1777 /tmp
+  init = run: writeText "${name}-init" ''
+    # Make /tmp directory
+    mkdir -m 1777 /tmp
 
-           # Expose sockets in /tmp
-           for i in /host-tmp/.*-unix; do
-             ln -s "$i" "/tmp/$(basename "$i")"
-           done
+    # Expose sockets in /tmp
+    for i in /host-tmp/.*-unix; do
+      ln -s "$i" "/tmp/$(basename "$i")"
+    done
 
-           [ -d "$1" ] && [ -r "$1" ] && cd "$1"
-           shift
-           exec "${runScript}" "$@"
-         '';
+    [ -d "$1" ] && [ -r "$1" ] && cd "$1"
+    shift
+    exec ${run} "$@"
+  '';
 
-in writeScriptBin name ''
+in runCommand name {
+  passthru.env =
+    runCommand "${name}-shell-env" {
+      shellHook = ''
+        exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)"
+      '';
+    } ''
+      echo >&2 ""
+      echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
+      echo >&2 ""
+      exit 1
+    '';
+} ''
+  mkdir -p $out/bin
+  cat <<EOF >$out/bin/${name}
   #! ${stdenv.shell}
-  exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init} "$(pwd)" "$@"
+  exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init runScript} "\$(pwd)" "\$@"
+  EOF
+  chmod +x $out/bin/${name}
 ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51d8f2431cc..2350118b810 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -296,7 +296,7 @@ let
 
   buildFHSUserEnv = args: userFHSEnv {
     env = buildFHSEnv (removeAttrs args [ "runScript" ]);
-    runScript = args.runScript;
+    runScript = args.runScript or "bash";
   };
 
   buildMaven = callPackage ../build-support/build-maven.nix {};

From f996e0b1f2f2ac723108cddae78b67d4b990b652 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 26 Aug 2015 18:46:56 +0200
Subject: [PATCH 1563/2016] python box2d: use swig2 (ZHF)

---
 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 e66f8eda492..267510e3363 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1556,7 +1556,7 @@ let
 
     patches = [ ../development/python-modules/box2d/disable-test.patch ];
 
-    propagatedBuildInputs = [ pkgs.swig pkgs.box2d ];
+    propagatedBuildInputs = [ pkgs.swig2 pkgs.box2d ];
 
     meta = {
       homepage = https://code.google.com/p/pybox2d/;

From 1dc71534b44f44a9104062a81b51161f6b45baf4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 26 Aug 2015 18:48:51 +0200
Subject: [PATCH 1564/2016] rocksdb: disable on i686 (ZHF)

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

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 78623503794..c5db9787706 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     homepage = http://rocksdb.org;
     description = "A library that provides an embeddable, persistent key-value store for fast storage";
     license = licenses.bsd3;
-    platforms = platforms.all;
+    platforms = platforms.allBut [ "i686-linux" ];
     maintainers = with maintainers; [ wkennington ];
   };
 }

From b5f7884b3075b70337134c749c8f89bf30825c0f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 26 Aug 2015 18:53:43 +0200
Subject: [PATCH 1565/2016] Revert "tarsnap: 1.0.35 -> 1.0.36.1 and use
 upstream bash completion scripts"

This reverts commit 54c7053bffe96d67274efafbc3518a2c40b2dc06.

Doesn't build with nix chrooted builds.
---
 pkgs/tools/backup/tarsnap/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index 7537451595f..e2857eed7d8 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -1,6 +1,11 @@
 { stdenv, fetchurl, openssl, zlib, e2fsprogs }:
 
 let
+  bashCompletion = fetchurl {
+    url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash";
+    sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405";
+  };
+
   zshCompletion = fetchurl {
     url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh";
     sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair";
@@ -8,20 +13,18 @@ let
 in
 stdenv.mkDerivation rec {
   name = "tarsnap-${version}";
-  version = "1.0.36.1";
+  version = "1.0.35";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz";
-    sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452";
+    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz";
+    sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc";
   };
 
-  preConfigure = ''
-    configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d"
-  '';
-
   postInstall = ''
     # Install some handy-dandy shell completions
-    install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap
+    mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions
+    cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash
+    cp ${zshCompletion}  $out/share/zsh/site-functions/_tarsnap
   '';
 
   buildInputs = [ openssl zlib e2fsprogs ];

From 66a270b9df25990daec7685aebf42fc3791fd58d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 26 Aug 2015 18:55:22 +0200
Subject: [PATCH 1566/2016] rkt: disable on i686 (ZHF)

---
 pkgs/applications/virtualization/rkt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 0b3300e2026..71aa7a710f9 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     homepage = http://rkt.io;
     license = licenses.asl20;
     maintainers = with maintainers; [ ragge ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }

From 27233c2ea59ed4524548ab0cfc4f2909ecdc0c32 Mon Sep 17 00:00:00 2001
From: Paulus Esterhazy <pesterhazy@gmail.com>
Date: Wed, 26 Aug 2015 12:50:19 +0200
Subject: [PATCH 1567/2016] ranger: works fine on Darwin (close #9454)

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

diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 7c08bf9d2e7..c6bc87ce13d 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
     description = "File manager with minimalistic curses interface";
     homepage = "http://ranger.nongnu.org/";
     license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ iyzsong ];
   };
 

From f04db6d3e7e6da7d843496ae1e65f25e98ccf8ce Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 26 Aug 2015 19:48:42 +0300
Subject: [PATCH 1568/2016] buildFHS*Env: add documentation

---
 doc/functions.xml | 115 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)

diff --git a/doc/functions.xml b/doc/functions.xml
index aec8a57c21a..3e4ac3f3c6b 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -155,4 +155,119 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
 
 </section>
 
+
+<section xml:id="sec-fhs-environments">
+  <title>buildFHSChrootEnv/buildFHSUserEnv</title>
+
+  <para>
+    <function>buildFHSChrootEnv</function> and
+    <function>buildFHSUserEnv</function> provide a way to build and run
+    FHS-compatible lightweight sandboxes. They get their own isolated root with
+    binded <filename>/nix/store</filename>, so their footprint in terms of disk
+    space needed is quite small. This allows one to run software which is hard or
+    unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions,
+    games distributed as tarballs, software with integrity checking and/or external
+    self-updated binaries.
+  </para>
+
+  <para>
+    <function>buildFHSChrootEnv</function> allows to create persistent
+    environments, which can be constructed, deconstructed and entered by
+    multiple users at once. A downside is that it requires
+    <literal>root</literal> access for both those who create and destroy and
+    those who enter it. It can be useful to create environments for daemons that
+    one can enter and observe.
+  </para>
+
+  <para>
+    <function>buildFHSUserEnv</function> uses Linux namespaces feature to create
+    temporary lightweight environments which are destroyed after all child
+    processes exit. It does not require root access, and can be useful to create
+    sandboxes and wrap applications.
+  </para>
+
+  <para>
+    Those functions both rely on <function>buildFHSEnv</function>, which creates
+    an actual directory structure given a list of necessary packages and extra
+    build commands.
+    <function>buildFHSChrootEnv</function> and <function>buildFHSUserEnv</function>
+    both accept those arguments which are passed to
+    <function>buildFHSEnv</function>:
+  </para>
+
+  <variablelist>
+    <varlistentry>
+    <term><literal>name</literal></term>
+
+    <listitem><para>Environment name.</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+    <term><literal>targetPkgs</literal></term>
+
+    <listitem><para>Packages to be installed for the main host's architecture
+    (i.e. x86_64 on x86_64 installations).</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+    <term><literal>multiPkgs</literal></term>
+
+    <listitem><para>Packages to be installed for all architectures supported by
+    a host (i.e. i686 and x86_64 on x86_64 installations).</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+    <term><literal>extraBuildCommands</literal></term>
+
+    <listitem><para>Additional commands to be executed for finalizing the
+    directory structure.</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+    <term><literal>extraBuildCommandsMulti</literal></term>
+
+    <listitem><para>Like <literal>extraBuildCommandsMulti</literal>, but
+    executed only on multilib architectures.</para></listitem>
+    </varlistentry>
+  </variablelist>
+
+  <para>
+    Additionally, <function>buildFHSUserEnv</function> accepts
+    <literal>runScript</literal> parameter, which is a command that would be
+    executed inside the sandbox and passed all the command line arguments. It
+    default to <literal>bash</literal>.
+    One can create a simple environment using a <literal>shell.nix</literal>
+    like that:
+  </para>
+
+<programlisting><![CDATA[
+{ pkgs ? import <nixpkgs> {} }:
+
+(pkgs.buildFHSUserEnv {
+  name = "simple-x11-env";
+  targetPkgs = pkgs: (with pkgs;
+    [ udev
+      alsaLib
+    ]) ++ (with pkgs.xlibs;
+    [ libX11
+      libXcursor
+      libXrandr
+    ]);
+  multiPkgs = pkgs: (with pkgs;
+    [ udev
+      alsaLib
+    ]) ++ (with [];
+  runScript = "bash";
+}).env
+]]></programlisting>
+
+  <para>
+    Running <literal>nix-shell</literal> would then drop you into a shell with
+    these libraries and binaries available. You can use this to run
+    closed-source applications which expect FHS structure without hassles:
+    simply change <literal>runScript</literal> to the application path,
+    e.g. <filename>./bin/start.sh</filename> -- relative paths are supported.
+  </para>
+</section>
+
 </chapter>

From c2ae91a413fea07751a587cbe53a216edcf25b41 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 26 Aug 2015 11:17:53 -0700
Subject: [PATCH 1569/2016] buildGoPackage: Fix parallel test pid computation

---
 pkgs/development/go-modules/generic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index b5ddba9b981..d4eb127617a 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -120,15 +120,15 @@ go.stdenv.mkDerivation (
     if [ -n "$subPackages" ] ; then
         for p in $subPackages ; do
             go test -p $NIX_BUILD_CORES -v $goPackagePath/$p &
+            PIDS+=("$!")
         done
-        PIDS+=("$!")
     else
         pushd go/src
         while read d; do
             go test -p $NIX_BUILD_CORES -v $d &
+            PIDS+=("$!")
         done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq)
         popd
-        PIDS+=("$!")
     fi
 
     # Exit on error from the parallel process

From 8c2f7fcfeda241e891b6913166ab0c7f2caab5fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 26 Aug 2015 20:33:29 +0200
Subject: [PATCH 1570/2016] apparmor: don't depend on tetex

It seemed unused - no mention in the log, and builds without it.
/cc maintainers: @phreedom, @thoughtpolice.
---
 pkgs/os-specific/linux/apparmor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index f68b436bed1..22413b2ed31 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , autoconf, automake, libtool, makeWrapper
-, perl, bison, flex, glibc, gettext, which, rpm, tetex, LocaleGettext
+, perl, bison, flex, glibc, gettext, which, rpm, LocaleGettext
 , bash, pam, TermReadKey, RpcXML, swig, python}:
 stdenv.mkDerivation rec {
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    autoconf automake libtool perl bison flex gettext which rpm tetex
+    autoconf automake libtool perl bison flex gettext which rpm
     LocaleGettext pam TermReadKey RpcXML swig makeWrapper python ];
 
   prePatch = ''

From 02f9f0c7e06538ad9974d34933d7299b51e8ef6c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 19 Jul 2015 03:50:32 +0300
Subject: [PATCH 1571/2016] u-boot: 2015.04 -> 2015.07

A new regularly release. Some improvements I've noted:
    - Keyboard on the pcDuino3 Nano now works without a hub.
    - Ctrl-C now correctly cancels the 'sysboot' boot menu

Also, config_cmd_default.h is replaced by equivalents in the kconfig
system, so the vexpress patch needs some updating.
---
 pkgs/misc/uboot/default.nix                   |  4 +-
 .../vexpress-Use-config_distro_bootcmd.patch  | 42 +++++++++++++------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 675a6839c86..4fe6ae4c6e2 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -22,11 +22,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "uboot-${defconfig}-${version}";
-  version = "2015.04";
+  version = "2015.07";
 
   src = fetchurl {
     url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-    sha256 = "0q2x1wh1f6rjh9rmcnkf28dxcvp9hkhi4vzspqkzamb6b3gp06ha";
+    sha256 = "1nclmyii5a1igvgjc4kxvi1fk2y82hp2iy4iywp34b3zf6ywjj0b";
   };
 
   patches = [ ./vexpress-Use-config_distro_bootcmd.patch ];
diff --git a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch
index 9c61847f02e..ce057b6aa65 100644
--- a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch
+++ b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch
@@ -1,4 +1,4 @@
-From 53a8612ff19f360363edaaf70137968f7fd6a1cd Mon Sep 17 00:00:00 2001
+From 1fb764e1866513a69b4a0c29b69f8e78ea1df7fa Mon Sep 17 00:00:00 2001
 From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
 Date: Mon, 8 Jun 2015 22:29:23 +0300
 Subject: [PATCH] vexpress: Use config_distro_bootcmd
@@ -7,9 +7,10 @@ Also had to hack cli_readline.c, as one codepath in
 cli_readline_into_buffer doesn't respect the timeout.
 ---
  common/cli_readline.c             | 12 +++++++++++-
+ configs/vexpress_ca9x4_defconfig  |  2 --
  include/configs/vexpress_ca9x4.h  |  1 -
- include/configs/vexpress_common.h | 35 +++++++++++++++++++++++------------
- 3 files changed, 34 insertions(+), 14 deletions(-)
+ include/configs/vexpress_common.h | 34 ++++++++++++++++++++++------------
+ 4 files changed, 33 insertions(+), 16 deletions(-)
 
 diff --git a/common/cli_readline.c b/common/cli_readline.c
 index 9a9fb35..ca997a9 100644
@@ -41,6 +42,22 @@ index 9a9fb35..ca997a9 100644
  
  #ifdef CONFIG_SHOW_ACTIVITY
  		while (!tstc()) {
+diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig
+index 2947fc1..9a5123d 100644
+--- a/configs/vexpress_ca9x4_defconfig
++++ b/configs/vexpress_ca9x4_defconfig
+@@ -5,11 +5,9 @@ CONFIG_TARGET_VEXPRESS_CA9X4=y
+ # CONFIG_CMD_IMLS is not set
+ # CONFIG_CMD_XIMG is not set
+ # CONFIG_CMD_EDITENV is not set
+-# CONFIG_CMD_ENV_EXISTS is not set
+ # CONFIG_CMD_LOADB is not set
+ # CONFIG_CMD_LOADS is not set
+ # CONFIG_CMD_FPGA is not set
+-# CONFIG_CMD_ECHO is not set
+ # CONFIG_CMD_ITEST is not set
+ # CONFIG_CMD_SETEXPR is not set
+ # CONFIG_CMD_NFS is not set
 diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h
 index 38ac4ed..993398c 100644
 --- a/include/configs/vexpress_ca9x4.h
@@ -53,7 +70,7 @@ index 38ac4ed..993398c 100644
  
  #endif /* VEXPRESS_CA9X4_H */
 diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
-index db78c85..1dd069b 100644
+index 0c1da01..72850d0 100644
 --- a/include/configs/vexpress_common.h
 +++ b/include/configs/vexpress_common.h
 @@ -123,7 +123,6 @@
@@ -64,16 +81,15 @@ index db78c85..1dd069b 100644
  
  /* Size of malloc() pool */
  #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)
-@@ -152,6 +151,8 @@
+@@ -152,6 +151,7 @@
  #define CONFIG_SYS_SERIAL0		V2M_UART0
  #define CONFIG_SYS_SERIAL1		V2M_UART1
  
 +#include <config_distro_defaults.h>
-+#include <config_cmd_default.h>
  /* Command line configuration */
- #define CONFIG_CMD_BDI
  #define CONFIG_CMD_DHCP
-@@ -169,7 +170,6 @@
+ #define CONFIG_CMD_PXE
+@@ -163,7 +163,6 @@
  #define CONFIG_SUPPORT_RAW_INITRD
  
  #define CONFIG_CMD_FAT
@@ -81,7 +97,7 @@ index db78c85..1dd069b 100644
  #define CONFIG_MMC			1
  #define CONFIG_CMD_MMC
  #define CONFIG_GENERIC_MMC
-@@ -207,17 +207,28 @@
+@@ -201,17 +200,28 @@
  					 GENERATED_GBL_DATA_SIZE)
  #define CONFIG_SYS_INIT_SP_ADDR		CONFIG_SYS_GBL_DATA_OFFSET
  
@@ -118,7 +134,7 @@ index db78c85..1dd069b 100644
  #elif defined(CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP)
  #define CONFIG_PLATFORM_ENV_SETTINGS \
  		"loadaddr=0xa0008000\0" \
-@@ -240,7 +251,8 @@
+@@ -234,7 +244,8 @@
  			"devtmpfs.mount=0  vmalloc=256M\0" \
  		"bootflash=run flashargs; " \
  			"cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \
@@ -128,14 +144,14 @@ index db78c85..1dd069b 100644
  
  /* FLASH and environment organization */
  #define PHYS_FLASH_SIZE			0x04000000	/* 64MB */
-@@ -294,7 +306,6 @@
+@@ -287,7 +298,6 @@
+ 
  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Boot args buffer */
- #define CONFIG_CMD_SOURCE
  #define CONFIG_SYS_LONGHELP
 -#define CONFIG_CMDLINE_EDITING		1
  #define CONFIG_SYS_MAXARGS		16	/* max command args */
  
  #endif /* VEXPRESS_COMMON_H */
 -- 
-2.4.4
+2.4.5
 

From ae80c3e7bcf0110b4976eab3435838c7e55bfc9d Mon Sep 17 00:00:00 2001
From: Boris Sukholitko <boriss@gmail.com>
Date: Wed, 26 Aug 2015 22:11:12 +0300
Subject: [PATCH 1572/2016] containers: fix interfaces option bugs

The default should be [], no need to check it for INTERFACES
variable.
---
 nixos/modules/virtualisation/containers.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index d819d99e09c..59f486ff78b 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -122,7 +122,7 @@ in
 
             interfaces = mkOption {
               type = types.listOf types.string;
-              default = null;
+              default = [];
               example = [ "eth1" "eth2" ];
               description = ''
                 The list of interfaces to be moved into the container.
@@ -344,9 +344,7 @@ in
                 LOCAL_ADDRESS=${cfg.localAddress}
               ''}
             ''}
-           ${optionalString (cfg.interfaces != null) ''
              INTERFACES="${toString cfg.interfaces}"
-           ''}
            ${optionalString cfg.autoStart ''
              AUTO_START=1
            ''}

From 0912bdfa925e423106f487dcda0afa5673bb0c59 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Wed, 26 Aug 2015 15:18:06 -0400
Subject: [PATCH 1573/2016] cvs-fast-export: patch shebangs in source tree

This allows unit tests to run successfully in chroot build
environments, which lack /usr/bin/env.
---
 .../applications/version-management/cvs-fast-export/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix
index cf80dd3ef67..15035a345d4 100644
--- a/pkgs/applications/version-management/cvs-fast-export/default.nix
+++ b/pkgs/applications/version-management/cvs-fast-export/default.nix
@@ -25,6 +25,8 @@ mkDerivation rec {
     python27 rcs cvs git makeWrapper
   ];
 
+  postPatch = "patchShebangs .";
+
   preBuild = ''
     makeFlagsArray=(
       XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"

From 1a13d28151cb1dc0125509c0d68246ef5be2b5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 26 Aug 2015 21:54:31 +0200
Subject: [PATCH 1574/2016] openocd: 0.8.0 -> 0.9.0

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

diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 7334fa8754f..258f40a6960 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "openocd-${version}";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2";
-    sha256 = "0byk7hnccgmhw0f84qlkfhps38gp2xp628bfrsc03vq08hr6q1sv";
+    sha256 = "0hzlnm19c4b35vsxs6ik94xbigv3ykdgr8gzrdir6sqmkan44w43";
   };
 
   buildInputs = [ libftdi libusb1 pkgconfig ];

From 3c67f862119568e295fd54b16029dfcf1d5c0a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 26 Aug 2015 22:04:27 +0200
Subject: [PATCH 1575/2016] openocd: enable support for CMSIS-DAP debuggers

I.e., add 'hidapi' to buildInputs. Build tested.
---
 pkgs/development/tools/misc/openocd/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 258f40a6960..ea52fff64cc 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -1,8 +1,4 @@
-{ stdenv, fetchurl, libftdi, libusb1, pkgconfig }:
-
-# TODO: Add "hidapi" as dependency to gain access to CMSIS-DAP debuggers.
-# Support should be auto-detected, but if not, pass "--enable-cmsis-dap" to
-# configure.
+{ stdenv, fetchurl, libftdi, libusb1, pkgconfig, hidapi }:
 
 stdenv.mkDerivation rec {
   name = "openocd-${version}";
@@ -13,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0hzlnm19c4b35vsxs6ik94xbigv3ykdgr8gzrdir6sqmkan44w43";
   };
 
-  buildInputs = [ libftdi libusb1 pkgconfig ];
+  buildInputs = [ libftdi libusb1 pkgconfig hidapi ];
 
   configureFlags = [
     "--enable-jtag_vpi"

From dbd3584590a5beca5358df8354de90230446e5ae Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 26 Aug 2015 22:15:31 +0200
Subject: [PATCH 1576/2016] mediastreamer: introduce environment variable to
 set plugins directory

---
 .../libraries/mediastreamer/default.nix       |  5 +++-
 .../libraries/mediastreamer/plugins_dir.patch | 24 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/mediastreamer/plugins_dir.patch

diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index ed81eb94185..4a672b226ea 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -11,11 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "1g6gawrlz1lixzs1kzckm3rxc401ww8pi00x7r5kb84bdijb02cc";
   };
 
+  patches = [ ./plugins_dir.patch ];
+
   postPatch = ''
     sed -i "s/\(SRTP_LIBS=\"\$SRTP_LIBS -lsrtp\"\)/SRTP_LIBS=\"$(pkg-config --libs-only-l libsrtp)\"/g" configure
   '';
 
-  # TODO: make it load plugins from *_PLUGIN_PATH
   nativeBuildInputs = [ pkgconfig intltool ];
 
   propagatedBuildInputs = [
@@ -28,6 +29,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-external-ortp"
     "--with-srtp=${srtp}"
+    "--enable-xv"
+    "--enable-glx"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/mediastreamer/plugins_dir.patch b/pkgs/development/libraries/mediastreamer/plugins_dir.patch
new file mode 100644
index 00000000000..e64bfc5a43a
--- /dev/null
+++ b/pkgs/development/libraries/mediastreamer/plugins_dir.patch
@@ -0,0 +1,24 @@
+diff -uNr mediastreamer2/src/base/msfactory.c mediastreamer2-new/src/base/msfactory.c
+--- a/src/base/msfactory.c	2015-05-13 16:53:49.801113249 +0200
++++ b/src/base/msfactory.c	2015-08-26 21:35:44.994724647 +0200
+@@ -630,12 +630,18 @@
+ }
+ 
+ void ms_factory_init_plugins(MSFactory *obj) {
++	char *package_plugins_dir;
+ 	if (obj->plugins_dir == NULL) {
++		package_plugins_dir=getenv("MEDIASTREAMER_PLUGINS_DIR");
++		if (package_plugins_dir!=NULL){
++			obj->plugins_dir = ms_strdup(package_plugins_dir);
++		} else {
+ #ifdef PACKAGE_PLUGINS_DIR
+-		obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR);
++			obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR);
+ #else
+-		obj->plugins_dir = ms_strdup("");
++			obj->plugins_dir = ms_strdup("");
+ #endif
++		}
+ 	}
+ 	if (strlen(obj->plugins_dir) > 0) {
+ 		ms_message("Loading ms plugins from [%s]",obj->plugins_dir);

From e8aa031d69874843c21c1bdce3eaf423b9494ab9 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 26 Aug 2015 22:16:28 +0200
Subject: [PATCH 1577/2016] mediastreamer-openh264: init at 1.0.0

---
 .../libraries/mediastreamer/msopenh264.nix    | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/mediastreamer/msopenh264.nix

diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
new file mode 100644
index 00000000000..e312c730ab2
--- /dev/null
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, mediastreamer, openh264 }:
+
+stdenv.mkDerivation rec {
+  name = "mediastreamer-openh264-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/msopenh264-${version}.tar.gz";
+    sha256 = "1622ma8g4yqvxa8pqwddsmhlpwak31i8zfl88f60k71k4dplw845";
+  };
+
+  buildInputs = [ autoreconfHook pkgconfig mediastreamer openh264 ];
+
+  meta = with stdenv.lib; {
+    description = "H.264 encoder/decoder plugin for mediastreamer2";
+    homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c899b875400..4c8ef3e0302 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7556,6 +7556,8 @@ let
   # failed to build
   mediastreamer = callPackage ../development/libraries/mediastreamer { };
 
+  mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { };
+
   menu-cache = callPackage ../development/libraries/menu-cache { };
 
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
@@ -7768,6 +7770,8 @@ let
 
   opal = callPackage ../development/libraries/opal {};
 
+  openh264 = callPackage ../development/libraries/openh264 { };
+
   openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { };
   openjpeg_2_0 = callPackage ../development/libraries/openjpeg/2.0.nix { };
   openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { };

From 63a1d2a3649c16d668538b0aecd215b5513f35df Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 26 Aug 2015 22:17:41 +0200
Subject: [PATCH 1578/2016] linphone: wrap to find plugins

---
 .../networking/instant-messengers/linphone/default.nix   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index 3310aace40e..c894a49c20e 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp
 , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, polarssl, libsoup, udev
 , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip
+, mediastreamer-openh264, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
     polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip
   ];
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ intltool pkgconfig makeWrapper ];
 
   configureFlags = [
     "--enable-ldap"
@@ -27,6 +28,12 @@ stdenv.mkDerivation rec {
     "--enable-external-mediastreamer"
   ];
 
+  postInstall = ''
+    for i in $(cd $out/bin && ls); do
+      wrapProgram $out/bin/$i --set MEDIASTREAMER_PLUGINS_DIR ${mediastreamer-openh264}/lib/mediastreamer/plugins
+    done
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://www.linphone.org/;
     description = "Open Source video SIP softphone";

From 74ce1df8f54436ffb8bd08adfc4c7d0466a9283c Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 26 Aug 2015 22:24:05 +0200
Subject: [PATCH 1579/2016] openh264: fix license

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

diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
index ff6582ca7a7..76188d484f9 100644
--- a/pkgs/development/libraries/openh264/default.nix
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A codec library which supports H.264 encoding and decoding";
     homepage = http://www.openh264.org;
-    license = stdenv.licenses.bsd2;
+    license = stdenv.lib.licenses.bsd2;
   };
 }

From 3d23cb0375fd192e3dce764c2aa2556535433181 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 25 Aug 2015 16:42:03 +0200
Subject: [PATCH 1580/2016] eclipse-testng: 6.9.5.201506120235 ->
 6.9.5.201508210528

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 284ea911724..61701c4abef 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -312,16 +312,16 @@ rec {
 
   testng = buildEclipsePlugin rec {
     name = "testng-${version}";
-    version = "6.9.5.201506120235";
+    version = "6.9.5.201508210528";
 
     srcFeature = fetchurl {
-      url = "http://beust.com/eclipse/features/org.testng.eclipse_6.9.5.201506120235.jar";
-      sha256 = "02imv0rw10pik55a7p00jin65shvhfpzgna02ky94yx7dlf9fyy9";
+      url = "http://beust.com/eclipse/features/org.testng.eclipse_${version}.jar";
+      sha256 = "0xalm7pvj0vx61isgkjkgj073b4hlqlzx6xnkrnnnyi0r212a26j";
     };
 
     srcPlugin = fetchurl {
-      url = "http://beust.com/eclipse/plugins/org.testng.eclipse_6.9.5.201506120235.jar";
-      sha256 = "0ni1ky4p5l1qzph0np1qw9pcyhrvy6zmn9c8q1b5rm5xv1fcvji4";
+      url = "http://beust.com/eclipse/plugins/org.testng.eclipse_${version}.jar";
+      sha256 = "07wmivfvfsq6cjw5zwciajdxkfa7drk108jsr44gf4i1bv9fj055";
     };
 
     meta = with stdenv.lib; {

From 771b1a535851a39999dcb9365ea6f084e755ce6a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 25 Aug 2015 16:55:03 +0200
Subject: [PATCH 1581/2016] eclipse-scala: fix sha256, file changed upstream

---
 pkgs/applications/editors/eclipse/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 61701c4abef..8b663edccd0 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -298,7 +298,7 @@ rec {
 
     src = fetchzip {
       url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip";
-      sha256 = "0p2dbf56rw733dhsxy9hdwmbzqlk01j8f2hci21bsipq5w2144x6";
+      sha256 = "0x5cdcm7p2ynz5ryw041gb150sripf9i4m1yrfqklnn581yqm6y8";
     };
 
     meta = with stdenv.lib; {

From 5c8a1fe5e123dffb1615f7400e44ae5624dfdde1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 26 Aug 2015 22:50:03 +0200
Subject: [PATCH 1582/2016] eclipse: name plugins "eclipse-plugin-${name}"

Instead of "eclipse-${name}". The latter is slightly confusing since
there are non-plugin eclipse packages named "eclipse-${name}", like
eclipse-modeling or eclipse-cpp.
---
 pkgs/applications/editors/eclipse/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 8b663edccd0..6f09aa481e1 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -9,7 +9,7 @@ rec {
                             , passthru ? {}
                             , ... } @ attrs:
     stdenv.mkDerivation (attrs // {
-      name = "eclipse-" + name;
+      name = "eclipse-plugin-" + name;
 
       buildInputs = buildInputs ++ [ unzip ];
 

From 2afaaf157e22757f3a6f60f0633dbcd32aa8ca43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 26 Aug 2015 22:50:26 +0200
Subject: [PATCH 1583/2016] darktable: update from 1.6.7 to 1.6.8

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

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index b89d59217ac..1cf24e109dd 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -9,12 +9,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.6.7";
+  version = "1.6.8";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "162c9kdj71az0ipaw4kiqcxhig0hcbmzw936d390r8zhkns76l57";
+    sha256 = "0189d5pn6g01rynfkhxynrqgfi24v94x8fp0fs7ilrncv0dzhxmn";
   };
 
   buildInputs =

From 6e104f2f438ba97c25644256fc5bfc559b580b5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 26 Aug 2015 22:51:14 +0200
Subject: [PATCH 1584/2016] drumkv1: update from 0.7.0 to 0.7.1

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

diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 50db71ea723..7fdf1c34771 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumkv1-${version}";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "1fbi835559qsg9fxgdbdyf5z1zlzf9n8zrq0p67damb55mmigaj8";
+    sha256 = "0mpf8akqaakg7vbn8gba0ns64hzhn5xzh1qxqpchcv32swn21cq4";
   };
 
   buildInputs = [ libjack2 libsndfile lv2 qt4 ];

From d741743bcc3b16648054b79ae3fb2c81b05d2f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 26 Aug 2015 22:51:50 +0200
Subject: [PATCH 1585/2016] samplv1: update from 0.7.0 to 0.7.1

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

diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 544422cfaea..fa9df2f603e 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "samplv1-${version}";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "0w1cl1vjhzzdyxfn8fcfgx5j5d4gi182w5b89f7qzg1akhmsqmfr";
+    sha256 = "0494w1xhhadwzvdr0v4gg5pzr2w2ah2vk896znj59j1y9gn3gilq";
   };
 
   buildInputs = [ libjack2 libsndfile lv2 qt4 ];

From 977731f6c2227bc48ff2f9f628a30e3e38e09b4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 26 Aug 2015 22:52:10 +0200
Subject: [PATCH 1586/2016] synthv1: update from 0.6.3 to 0.7.1

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

diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 4a126f8774f..43003782f2f 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "synthv1-${version}";
-  version = "0.6.3";
+  version = "0.7.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${name}.tar.gz";
-    sha256 = "19zyvrvnmi7ahwg121vl2q17j9y8ln6lvpj5wxxcwif5538q75iw";
+    sha256 = "0asjhz0xj1kwysvsj9q54r8j8fy7cnr408ygfpdhg7yn24rv67hh";
   };
 
   buildInputs = [ qt4 libjack2 lv2 ];

From 538857a473483aafd6a2531ce504986cee1309de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Aug 2015 00:15:02 +0200
Subject: [PATCH 1587/2016] Let's aim for 6 months again, so 16.03

---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index 49aab0cba12..cde8eb0ed82 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-15.08
\ No newline at end of file
+16.03

From 51cd219cd58b5cf51fb2af9231dd7385307b982e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 27 Aug 2015 00:30:42 +0200
Subject: [PATCH 1588/2016] .version: remove trailing newline

---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index cde8eb0ed82..1c1d9713015 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-16.03
+16.03
\ No newline at end of file

From cef7bccbbf1b87cb62acb7279ca56dd1fbd86909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 27 Aug 2015 00:50:36 +0200
Subject: [PATCH 1589/2016] Add artha 1.0.3: an offline thesaurus

---
 pkgs/applications/misc/artha/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/misc/artha/default.nix

diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix
new file mode 100644
index 00000000000..a8914a9014d
--- /dev/null
+++ b/pkgs/applications/misc/artha/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, dbus_glib, gtk, pkgconfig, wordnet }:
+
+stdenv.mkDerivation rec {
+  name = "artha-${version}";
+  version = "1.0.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/artha/1.0.3/artha-1.0.3.tar.bz2";
+    sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx";
+  };
+
+  buildInputs = [ dbus_glib gtk pkgconfig wordnet ];
+
+  meta = with stdenv.lib; {
+    description = "An offline thesaurus based on WordNet";
+    homepage = http://artha.sourceforge.net;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e5d073941d..906af1da11b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10772,6 +10772,8 @@ let
 
   arora = callPackage ../applications/networking/browsers/arora { };
 
+  artha = callPackage ../applications/misc/artha { };
+
   atom = callPackage ../applications/editors/atom {
     gconf = gnome.GConf;
   };

From 268abe1cce6281f164b0aa38ef926d29557b8ff3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 27 Aug 2015 01:44:41 +0200
Subject: [PATCH 1590/2016] electrum: 2.4 -> 2.4.3

---
 pkgs/applications/misc/electrum/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index b1fdc50fe15..ed37b0d96bc 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   name = "electrum-${version}";
-  version = "2.4";
+  version = "2.4.3";
 
   src = fetchurl {
     url = "https://download.electrum.org/Electrum-${version}.tar.gz";
-    sha256 = "0y04m5b410y3s9vqvkbvmlvvx1nr0cyvrnl41yapz8hydw9vdkjx";
+    sha256 = "00z02rdlhasryccjsw1j7563xl76i6x40ah1lnn9asad1gp6520f";
   };
 
   propagatedBuildInputs = with pythonPackages; [
@@ -27,6 +27,7 @@ buildPythonPackage rec {
   preInstall = ''
     mkdir -p $out/share
     sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py
+    pyrcc4 icons.qrc -o gui/qt/icons_rc.py
   '';
 
   meta = with stdenv.lib; {

From ab70c601b696ed0097afb231dc8dfa56e6c4ebcb Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 27 Aug 2015 09:24:45 +0200
Subject: [PATCH 1591/2016] cups: Fix printing test

---
 nixos/tests/printing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index ea18114b61c..02980cee2fb 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -63,7 +63,7 @@ import ./make-test.nix ({pkgs, ... }: {
       foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
                         "${pkgs.groff.doc}/share/doc/*/meref.ps",
                         "${pkgs.cups}/share/doc/cups/images/cups.png",
-                        "${pkgs.pcre}/share/doc/pcre/pcre.txt")
+                        "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt")
       {
           $file =~ /([^\/]*)$/; my $fn = $1;
 

From 2c4186b0450e28e865b885729e19a5517b2511ec Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 27 Aug 2015 00:59:44 -0700
Subject: [PATCH 1592/2016] Fix go-tools to include cover/vet for 1.4 but not
 1.5 onward

---
 .../compilers/go/remove-tools-1.5.patch        | 18 +++---------------
 pkgs/top-level/go-packages.nix                 | 10 ++++++----
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/compilers/go/remove-tools-1.5.patch b/pkgs/development/compilers/go/remove-tools-1.5.patch
index 00f4fac7476..5aad4b4abc3 100644
--- a/pkgs/development/compilers/go/remove-tools-1.5.patch
+++ b/pkgs/development/compilers/go/remove-tools-1.5.patch
@@ -1,22 +1,10 @@
 diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
-index 61e3d8d..f8475f4 100644
+index 61e3d8d..b8422ad 100644
 --- a/src/cmd/go/pkg.go
 +++ b/src/cmd/go/pkg.go
-@@ -665,7 +665,7 @@ var goTools = map[string]targetDir{
- 	"cmd/asm":                              toTool,
- 	"cmd/compile":                          toTool,
- 	"cmd/cgo":                              toTool,
--	"cmd/cover":                            toTool,
-+	"nixos.org/x/tools/cmd/cover":          toTool,
- 	"cmd/dist":                             toTool,
- 	"cmd/doc":                              toTool,
- 	"cmd/fix":                              toTool,
-@@ -676,9 +676,9 @@ var goTools = map[string]targetDir{
- 	"cmd/pack":                             toTool,
- 	"cmd/pprof":                            toTool,
+@@ -678,7 +678,7 @@ var goTools = map[string]targetDir{
  	"cmd/trace":                            toTool,
--	"cmd/vet":                              toTool,
-+	"nixos.org/x/tools/cmd/vet":            toTool,
+ 	"cmd/vet":                              toTool,
  	"cmd/yacc":                             toTool,
 -	"golang.org/x/tools/cmd/godoc":         toBin,
 +	"nixos.org/x/tools/cmd/godoc":          toBin,
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 70a8c1770d1..cb7feb8cbf9 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -118,11 +118,11 @@ let
   };
 
   tools = buildFromGitHub {
-    rev = "93604a3dc2a5ae0168456c672ec35cc90ea881e6";
-    date = "2015-08-19";
+    rev = "b48dc8da98ae78c3d11f220e7d327304c84e623a";
+    date = "2015-08-24";
     owner = "golang";
     repo = "tools";
-    sha256 = "1yd3hwsbsjrmx85nihss55wy91y8sld7p0599j5k9xi0n1mrxdci";
+    sha256 = "187p3jjxrw2qjnzqwwrq7f9w10zh6vcnwnfl3q7ms8rbiffpjy5c";
     goPackagePath = "golang.org/x/tools";
     goPackageAliases = [ "code.google.com/p/go.tools" ];
 
@@ -136,7 +136,9 @@ let
       export GOTOOLDIR=$out/bin
     '';
 
-    excludedPackages = "testdata";
+    excludedPackages = "\\("
+      + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ])
+      + "\\)";
 
     buildInputs = [ net ];
 

From d0880a27dd03b0bc4318c8396d944d7831ee3b0f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 27 Aug 2015 01:00:25 -0700
Subject: [PATCH 1593/2016] go-modules: Fix the application of reference
 removal on packages like mongo-tools

---
 pkgs/development/go-modules/generic/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index d4eb127617a..f0d3be6487c 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,6 +1,9 @@
 { go, govers, lib }:
 
-{ name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}
+{ name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
+
+# We want parallel builds by default
+, enableParallelBuilding ? true
 
 # Disabled flag
 , disabled ? false
@@ -156,13 +159,16 @@ go.stdenv.mkDerivation (
 
     dir="$NIX_BUILD_TOP/go/bin"
     [ -e "$dir" ] && cp -r $dir $out
+
+    runHook postInstall
+  '';
+
+  preFixup = preFixup + ''
     while read file; do
       cat $file ${removeExpr removeReferences} > $file.tmp
       mv $file.tmp $file
       chmod +x $file
     done < <(find $out/bin -type f 2>/dev/null)
-
-    runHook postInstall
   '';
 
   disallowedReferences = lib.optional (!allowGoReference) go
@@ -170,6 +176,8 @@ go.stdenv.mkDerivation (
 
   passthru = passthru // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
 
+  enableParallelBuilding = enableParallelBuilding;
+
   meta = {
     # Add default meta information
     platforms = lib.platforms.all;

From 27ab91161d0e26e409647d9fc4a848e6e41f6f8c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 27 Aug 2015 01:00:40 -0700
Subject: [PATCH 1594/2016] mongo-tools: Update

---
 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 cb7feb8cbf9..3fcc63421b9 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1737,10 +1737,10 @@ let
   };
 
   mongo-tools = buildFromGitHub {
-    rev    = "621464ebd2ba0c6ee373600b0cb7fd4216405550";
+    rev    = "4fcfd3e57415de95c0c016def07b95bca63cccb4";
     owner  = "mongodb";
     repo   = "mongo-tools";
-    sha256 = "0hgh5h7bpn5xxnxgmw30fi51l4cb4g029nih8j8m0sr4if0n9vkf";
+    sha256 = "0rm7bnb81hr0byxhvagwv8an1bky882nz68cmm2kbznzyprvhyaa";
     buildInputs = [ gopass go-flags mgo openssl tomb ];
     excludedPackages = "vendor";
 

From 00fd3b25f91807a7e341b81283b15c071313b5e8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 27 Aug 2015 01:00:58 -0700
Subject: [PATCH 1595/2016] parallel: 20150722 -> 20150822

---
 pkgs/tools/misc/parallel/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 1f616d8d9af..4a3b90f56d8 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,23 +1,22 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20150722";
+  name = "parallel-20150822";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0jpklc4awr5z6slgn7xjhrcpk6i8jp9mwhkkaczikvbaqzbyabkx";
+    sha256 = "1ij7bjxhk2866mzh0v0v2m629b6d39r5ivwdzmh72s471m9hg45d";
   };
 
-  patchPhase =
-    '' sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g'
-    '';
+  patchPhase = ''
+    sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g'
+  '';
 
-  preBuild =
-    # The `sem' program wants to write to `~/.parallel'.
-    '' export HOME="$PWD"
-    '';
+  # The `sem' program wants to write to `~/.parallel'.
+  preBuild = ''
+    export HOME="$PWD"
+  '';
 
-  buildInputs = [ perl ];
   doCheck = true;
 
   meta = with stdenv.lib; {

From ca11cb828876f9d315598b3699fa9343442d1607 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Aug 2015 09:46:24 +0200
Subject: [PATCH 1596/2016] reptyr: 0.5 -> 0.6.2

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

diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index e5e579081f6..99f52dc5aed 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.5";
+  version = "0.6.2";
   name = "reptyr-${version}";
   src = fetchurl {
     url = "https://github.com/nelhage/reptyr/archive/reptyr-${version}.tar.gz";
-    sha256 = "077cvjjf534nxh7qqisw27a0wa61mdgyik43k50f8v090rggz2xm";
+    sha256 = "07pfl0rkgm8m3f3jy8r9l2yvnhf8lgllpsk3mh57mhzdxq8fagf7";
   };
   makeFlags = ["PREFIX=$(out)"];
   meta = {

From baf76b11a63465dd93b6f9d2e5d69577c8622d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Aug 2015 10:51:37 +0200
Subject: [PATCH 1597/2016] vagrant: use ruby 2.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit c00405d8d9bab331055f202f61ac117900454f36)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 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 90f5704a6eb..965ef8520db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5851,7 +5851,7 @@ let
   uncrustify = callPackage ../development/tools/misc/uncrustify { };
 
   vagrant = callPackage ../development/tools/vagrant {
-    ruby = ruby_2_0_0;
+    ruby = ruby_2_2_2;
   };
 
   gdb = callPackage ../development/tools/misc/gdb {

From ac613f0748a83c50488c03126599cb4ef149ff0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 27 Aug 2015 09:55:03 +0200
Subject: [PATCH 1598/2016] opencv: remove duplicated
 -DCMAKE_BUILD_TYPE=Release flag

The standard builder already does this.
---
 pkgs/development/libraries/opencv/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index e0b8dcca1af..4ce1787dbac 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE=Release"
-  ];
-
   meta = {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = http://opencv.org/;

From b65c5875e910f58a716c0a6a9cb40e67eab86b88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Aug 2015 11:15:39 +0200
Subject: [PATCH 1599/2016] upgrade python-fedora, taskw
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 5384c08ea6d429bb25bef86a4730dd6e21bf5d65)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/top-level/python-packages.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a210674418..7da29365218 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11058,12 +11058,13 @@ let
   };
 
   python_fedora = buildPythonPackage (rec {
-    name = "python-fedora-0.3.33";
+    version = "0.5.5";
+    name = "python-fedora-${version}";
     meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
-      url = "https://fedorahosted.org/releases/p/y/python-fedora/${name}.tar.gz";
-      sha256 = "1g05bh7d5d0gzrlnhpnca7jpqbgs2rgnlzzbvzzxmdbmlkqi3mws";
+      url = "https://pypi.python.org/packages/source/p/python-fedora/${name}.tar.gz";
+      sha256 = "15m8lvbb5q4rg508i4ah8my872qrq5xjwgcgca4d3kzjv2x6fhim";
     };
     propagatedBuildInputs = with self; [ kitchen requests bunch paver ];
     doCheck = false;
@@ -13674,12 +13675,12 @@ let
   };
 
   taskw = buildPythonPackage rec {
-    version = "1.0.2";
+    version = "1.0.3";
     name = "taskw-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/taskw/${name}.tar.gz";
-      sha256 = "0wa2hwplss2r56jrwib6j9sxxm02dz78878975jk9fj10p84w5kr";
+      sha256 = "1fa7bv5996ppfbryv02lpnlhk5dra63lhlwrb1i4ifqbziqfqh5n";
     };
 
     patches = [ ../development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch ];
@@ -13688,6 +13689,9 @@ let
         --replace '@@taskwarrior@@' '${pkgs.taskwarrior}'
     '';
 
+    # https://github.com/ralphbean/taskw/issues/98
+    doCheck = false;
+
     buildInputs = with self; [ nose pkgs.taskwarrior tox ];
     propagatedBuildInputs = with self; [ six dateutil pytz ];
 

From 320f963e160926f8b42fd15c8826acb11d9382a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Aug 2015 11:17:08 +0200
Subject: [PATCH 1600/2016] firefox: Build with internal cairo

This might fix the recent segfaults, according to
https://bugzilla.redhat.com/show_bug.cgi?id=1253086.

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 326f39515fc..2c433d12db5 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       alsaLib nspr nss libnotify xlibs.pixman yasm mesa
       xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
       xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
-      hunspell libevent libstartup_notification libvpx cairo
+      hunspell libevent libstartup_notification libvpx /* cairo */
       gstreamer gst_plugins_base icu libpng jemalloc
       libpulseaudio # only headers are needed
     ]
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
       "--enable-system-hunspell"
       "--enable-system-pixman"
       "--enable-system-sqlite"
-      "--enable-system-cairo"
+      #"--enable-system-cairo"
       "--enable-gstreamer"
       "--enable-startup-notification"
       "--enable-content-sandbox"            # available since 26.0, but not much info available

From 9855a8fcc0770ea05b09953bd292582e60c0a8b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Aug 2015 11:33:21 +0200
Subject: [PATCH 1601/2016] mongodb-tools, drive, bosun, scollector: use Go 1.4

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3b28ec104c..0a786d875bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -948,7 +948,7 @@ let
 
   mcrypt = callPackage ../tools/misc/mcrypt { };
 
-  mongodb-tools = goPackages.mongo-tools;
+  mongodb-tools = go14Packages.mongo-tools;
 
   mstflint = callPackage ../tools/misc/mstflint { };
 
@@ -1346,7 +1346,7 @@ let
 
   doomseeker = callPackage ../applications/misc/doomseeker { };
 
-  drive = callPackage ../applications/networking/drive { };
+  drive = callPackage ../applications/networking/drive { goPackages = go14Packages; };
 
   driftnet = callPackage ../tools/networking/driftnet {};
 
@@ -8919,8 +8919,8 @@ let
 
   bird = callPackage ../servers/bird { };
 
-  bosun = callPackage ../servers/monitoring/bosun {};
-  scollector = callPackage ../servers/monitoring/bosun/scollector.nix {};
+  bosun = callPackage ../servers/monitoring/bosun { goPackages = go14Packages; };
+  scollector = callPackage ../servers/monitoring/bosun/scollector.nix { goPackages = go14Packages; };
 
   charybdis = callPackage ../servers/irc/charybdis {};
 

From d4ccd686483f240abad40389e5ea24e5e27b0dd6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Aug 2015 11:50:03 +0200
Subject: [PATCH 1602/2016] Rename rl-unstable.xml -> rl-1509.xml

---
 nixos/doc/manual/release-notes/release-notes.xml              | 2 +-
 .../doc/manual/release-notes/{rl-unstable.xml => rl-1509.xml} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename nixos/doc/manual/release-notes/{rl-unstable.xml => rl-1509.xml} (98%)

diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 70cd2d6070b..e326f89d4f4 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -9,7 +9,7 @@
 <para>This section lists the release notes for each stable version of NixOS
 and current unstable revision.</para>
 
-<xi:include href="rl-unstable.xml" />
+<xi:include href="rl-1509.xml" />
 <xi:include href="rl-1412.xml" />
 <xi:include href="rl-1404.xml" />
 <xi:include href="rl-1310.xml" />
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-1509.xml
similarity index 98%
rename from nixos/doc/manual/release-notes/rl-unstable.xml
rename to nixos/doc/manual/release-notes/rl-1509.xml
index 8fbac05e968..d7d3d1a7fb1 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -2,9 +2,9 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
-         xml:id="sec-release-unstable">
+         xml:id="sec-release-15.09">
 
-<title>Release 15.07 (“Dingo”, 2015/07/??)</title>
+<title>Release 15.09 (“Dingo”, 2015/09/??)</title>
 
 <para>In addition to numerous new and upgraded packages, this release has the following highlights:
 

From 591d43ec91df4ce63a2fe26a145f4847a1cfbfd6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 27 Aug 2015 11:54:27 +0200
Subject: [PATCH 1603/2016] freeswitch: use gcc 4.8 to fix build (ZHF)

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

diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index 5b6ff15cb10..efa70875549 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg
-, libzrtpcpp }:
+, libzrtpcpp, gcc48 }:
 
 stdenv.mkDerivation rec {
   name = "freeswitch-1.2.3";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg
-    libzrtpcpp ];
+    libzrtpcpp gcc48 ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
 

From c91d360cec29d8a8fde7d5c5037f4ad27ff21d2b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 27 Aug 2015 12:29:45 +0200
Subject: [PATCH 1604/2016] pidginsipe: add nss and nspr (ZHF)

---
 .../instant-messengers/pidgin-plugins/sipe/default.nix       | 5 +++--
 pkgs/development/tools/packer/default.nix                    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index b387ed350af..8b19f338d3e 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pidgin, intltool, libxml2 }:
+{ stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }:
 
 let version = "1.18.1"; in
 
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
 
   postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe";
 
-  buildInputs = [pidgin intltool libxml2];
+  buildInputs = [ pidgin intltool libxml2 nss nspr ];
+
 }
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 8b89e8ae82d..651e64467c4 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
+{ stdenv, lib, go, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "packer-0.7.5";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
   };
 
-  buildInputs = [ gox ];
+  buildInputs = [ go gox ];
 
   installPhase = ''
     export GOPATH=$src

From d9baa13d2a9c18bede6df64d2219edd28a1616c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Aug 2015 17:37:03 +0200
Subject: [PATCH 1605/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/33d64f723163fbef6e42eb82f5c12b0bea924494
 with hackage2nix v20150824-28-g88e95d3

---
 .../haskell-modules/hackage-packages.nix      | 1471 +++++++++--------
 1 file changed, 760 insertions(+), 711 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 89121a2c8d4..88c383672b1 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -463,7 +463,7 @@ self: {
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding for the OpenAL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) freealut;};
+     }) {inherit (pkgs) freealut;};
 
   "AMI" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, network
@@ -717,7 +717,7 @@ self: {
        homepage = "http://wiki.portal.chalmers.se/agda/";
        description = "A dependently typed functional programming language and proof assistant";
        license = "unknown";
-     }) { inherit (pkgs) emacs;};
+     }) {inherit (pkgs) emacs;};
 
   "Agda-executable" = callPackage
     ({ mkDerivation, Agda, base }:
@@ -1244,7 +1244,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML";
        description = "Berkeley DB binding";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) db;};
+     }) {inherit (pkgs) db;};
 
   "BerkeleyDBXML" = callPackage
     ({ mkDerivation, base, BerkeleyDB, bytestring, db, dbxml, xercesc
@@ -1260,8 +1260,8 @@ self: {
        description = "Berkeley DB XML binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) db;  dbxml = null;  inherit (pkgs) xercesc;
-          xqilla = null;};
+     }) {inherit (pkgs) db; dbxml = null; inherit (pkgs) xercesc; 
+         xqilla = null;};
 
   "BerlekampAlgorithm" = callPackage
     ({ mkDerivation, base, besout }:
@@ -2189,11 +2189,11 @@ self: {
        description = "OpenCV based machine vision library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { opencv_calib3d = null;  opencv_contrib = null;
-          opencv_core = null;  opencv_features2d = null;
-          opencv_flann = null;  opencv_gpu = null;  opencv_highgui = null;
-          opencv_imgproc = null;  opencv_legacy = null;  opencv_ml = null;
-          opencv_objdetect = null;  opencv_video = null;};
+     }) {opencv_calib3d = null; opencv_contrib = null; 
+         opencv_core = null; opencv_features2d = null; opencv_flann = null; 
+         opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; 
+         opencv_legacy = null; opencv_ml = null; opencv_objdetect = null; 
+         opencv_video = null;};
 
   "Cabal_1_18_1_6" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
@@ -2687,7 +2687,7 @@ self: {
        description = "An FFI interface to the DevIL library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libdevil;};
+     }) {inherit (pkgs) libdevil;};
 
   "Combinatorrent" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, cereal
@@ -3759,7 +3759,7 @@ self: {
        description = "Partial binding to the Microsoft DirectSound API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { dsound = null;};
+     }) {dsound = null;};
 
   "DisTract" = callPackage
     ({ mkDerivation, base, Cabal, chunks, containers, directory
@@ -4036,7 +4036,7 @@ self: {
        description = "Cryptographic operations";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "Dust-tools" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, containers, csv
@@ -4185,8 +4185,8 @@ self: {
      }:
      mkDerivation {
        pname = "Ebnf2ps";
-       version = "1.0.14";
-       sha256 = "6366607845856b720a6d1fc21e23a7be10128d689c608473f67c2c3bf8a26737";
+       version = "1.0.15";
+       sha256 = "0ecce7d721d6c8993fa6ba6cfb16f1101d85e00bbaf0b6941d36a00badea2b4b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -4458,7 +4458,7 @@ self: {
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) pcre;};
+     }) {inherit (pkgs) pcre;};
 
   "Etage" = callPackage
     ({ mkDerivation, base, containers, ghc, mtl, operational, random
@@ -4534,7 +4534,7 @@ self: {
        description = "A network analysis toolkit for Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libpcap;};
+     }) {inherit (pkgs) libpcap;};
 
   "EuroIT" = callPackage
     ({ mkDerivation, base }:
@@ -4662,7 +4662,7 @@ self: {
        description = "The Haskell FModEx raw API";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { fmodex64 = null;};
+     }) {fmodex64 = null;};
 
   "FPretty" = callPackage
     ({ mkDerivation, base, containers }:
@@ -4687,7 +4687,7 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) ftgl;};
+     }) {inherit (pkgs) ftgl;};
 
   "FTGL-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, ftgl, StateVar-transformer
@@ -4703,7 +4703,7 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) ftgl;};
+     }) {inherit (pkgs) ftgl;};
 
   "FTPLine" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, directory, ftphs
@@ -5274,7 +5274,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;};
 
   "GLFW-OGL" = callPackage
     ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }:
@@ -5288,8 +5288,7 @@ self: {
        description = "A binding for GLFW (OGL)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) libX11;
-          inherit (pkgs.xlibs) libXrandr;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXrandr;};
 
   "GLFW-b" = callPackage
     ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework
@@ -5350,7 +5349,7 @@ self: {
        librarySystemDepends = [ libX11 mesa ];
        description = "Open OpenGL context windows in X11 with libX11";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;};
 
   "GLMatrix" = callPackage
     ({ mkDerivation, base, OpenGLRaw }:
@@ -5376,7 +5375,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) freeglut;  inherit (pkgs) mesa;};
+     }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT" = callPackage
     ({ mkDerivation, array, base, containers, freeglut, mesa, OpenGL
@@ -5393,7 +5392,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) freeglut;  inherit (pkgs) mesa;};
+     }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUtil" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, cpphs
@@ -5825,7 +5824,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Glome";
        description = "Simple 3D vector library";
        license = "GPL";
-     }) { inherit (self.llvmPackages) llvm;};
+     }) {inherit (self.llvmPackages) llvm;};
 
   "GlomeView" = callPackage
     ({ mkDerivation, base, deepseq, GlomeTrace, GlomeVec, monad-par
@@ -6407,7 +6406,7 @@ self: {
        homepage = "https://github.com/hdbc/hdbc-odbc";
        description = "ODBC driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) unixODBC;};
+     }) {inherit (pkgs) unixODBC;};
 
   "HDBC-postgresql" = callPackage
     ({ mkDerivation, base, bytestring, convertible, HDBC, mtl, old-time
@@ -6428,7 +6427,7 @@ self: {
        homepage = "http://github.com/hdbc/hdbc-postgresql";
        description = "PostgreSQL driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) postgresql;};
+     }) {inherit (pkgs) postgresql;};
 
   "HDBC-postgresql-hstore" = callPackage
     ({ mkDerivation, attoparsec, base, containers, HDBC, text }:
@@ -6470,7 +6469,7 @@ self: {
        homepage = "https://github.com/hdbc/hdbc-sqlite3";
        description = "Sqlite v3 driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) sqlite;};
+     }) {inherit (pkgs) sqlite;};
 
   "HDRUtils" = callPackage
     ({ mkDerivation, array, base, colour, containers, mtl, pfstools
@@ -6487,7 +6486,7 @@ self: {
        description = "Utilities for reading, manipulating, and writing HDR images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) pfstools;};
+     }) {inherit (pkgs) pfstools;};
 
   "HERA" = callPackage
     ({ mkDerivation, base, mpfr }:
@@ -6499,7 +6498,7 @@ self: {
        librarySystemDepends = [ mpfr ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) mpfr;};
+     }) {inherit (pkgs) mpfr;};
 
   "HFuse" = callPackage
     ({ mkDerivation, base, bytestring, fuse, unix }:
@@ -6517,7 +6516,7 @@ self: {
        homepage = "https://github.com/m15k/hfuse";
        description = "HFuse is a binding for the Linux FUSE library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) fuse;};
+     }) {inherit (pkgs) fuse;};
 
   "HGL" = callPackage
     ({ mkDerivation, array, base, X11 }:
@@ -6612,7 +6611,7 @@ self: {
        description = "Library to enable 3D game development for Haskell - cAudio Bindings";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { HGamer3DCAudio015 = null;};
+     }) {HGamer3DCAudio015 = null;};
 
   "HGamer3D-CEGUI-Binding" = callPackage
     ({ mkDerivation, base, CEGUIBase, CEGUIOgreRenderer, hg3dcegui050
@@ -6630,8 +6629,8 @@ self: {
        description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { CEGUIBase = null;  CEGUIOgreRenderer = null;
-          hg3dcegui050 = null;};
+     }) {CEGUIBase = null; CEGUIOgreRenderer = null; 
+         hg3dcegui050 = null;};
 
   "HGamer3D-Common" = callPackage
     ({ mkDerivation, base, clock, containers, directory, filepath
@@ -6678,7 +6677,7 @@ self: {
        description = "Enet Binding for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) enet;  hg3denet050 = null;};
+     }) {inherit (pkgs) enet; hg3denet050 = null;};
 
   "HGamer3D-GUI" = callPackage
     ({ mkDerivation, base, HGamer3D-CEGUI-Binding, HGamer3D-Data
@@ -6771,7 +6770,7 @@ self: {
        description = "Library to enable 3D game development for Haskell - OIS Bindings";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { HGamer3DOIS015 = null;};
+     }) {HGamer3DOIS015 = null;};
 
   "HGamer3D-Ogre-Binding" = callPackage
     ({ mkDerivation, base, hg3dogre050, HGamer3D-Data, mtl, OgreMain
@@ -6791,9 +6790,9 @@ self: {
        description = "Ogre Binding for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OgreMain = null;  OgrePaging = null;  OgreProperty = null;
-          OgreRTShaderSystem = null;  OgreTerrain = null;
-          hg3dogre050 = null;};
+     }) {OgreMain = null; OgrePaging = null; OgreProperty = null; 
+         OgreRTShaderSystem = null; OgreTerrain = null; 
+         hg3dogre050 = null;};
 
   "HGamer3D-SDL2-Binding" = callPackage
     ({ mkDerivation, base, bytestring, hg3dsdl2050, HGamer3D-Data
@@ -6811,8 +6810,8 @@ self: {
        description = "SDL2 Binding for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) SDL2;  hg3dsdl2050 = null;
-          inherit (pkgs.xlibs) libX11;};
+     }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; 
+         inherit (pkgs.xlibs) libX11;};
 
   "HGamer3D-SFML-Binding" = callPackage
     ({ mkDerivation, base, hg3dsfml050, HGamer3D-Data, sfml-audio
@@ -6830,8 +6829,8 @@ self: {
        description = "SFML Binding for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { hg3dsfml050 = null;  sfml-audio = null;  sfml-network = null;
-          sfml-system = null;  sfml-window = null;};
+     }) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null; 
+         sfml-system = null; sfml-window = null;};
 
   "HGamer3D-WinEvent" = callPackage
     ({ mkDerivation, base, HGamer3D-Data, HGamer3D-SDL2-Binding, text
@@ -6944,7 +6943,7 @@ self: {
        description = "A library to create a Java Virtual Machine and manipulate Java objects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { jvm = null;};
+     }) {jvm = null;};
 
   "HJavaScript" = callPackage
     ({ mkDerivation, base, pretty }:
@@ -7171,7 +7170,7 @@ self: {
        description = "Binding to libODE";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ode;};
+     }) {inherit (pkgs) ode;};
 
   "HOpenCV" = callPackage
     ({ mkDerivation, allocated-processor, base, opencv, vector-space }:
@@ -7187,7 +7186,7 @@ self: {
        executablePkgconfigDepends = [ opencv ];
        description = "A binding for the OpenCV computer vision library";
        license = stdenv.lib.licenses.gpl2;
-     }) { inherit (pkgs) opencv;};
+     }) {inherit (pkgs) opencv;};
 
   "HPDF" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers, mtl
@@ -7262,7 +7261,7 @@ self: {
        description = "A minimal monadic PLplot interface for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { plplotd-gnome2 = null;};
+     }) {plplotd-gnome2 = null;};
 
   "HPong" = callPackage
     ({ mkDerivation, base, data-accessor, data-accessor-template, GLFW
@@ -8770,7 +8769,7 @@ self: {
        description = "HyperEstraier binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { hyperestraier = null;  qdbm = null;};
+     }) {hyperestraier = null; qdbm = null;};
 
   "HsJudy" = callPackage
     ({ mkDerivation, base, bytestring, containers, Judy }:
@@ -8784,7 +8783,7 @@ self: {
        description = "Judy bindings, and some nice APIs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { Judy = null;};
+     }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, network, old-locale
@@ -8804,7 +8803,7 @@ self: {
        homepage = "https://github.com/phonohawk/HsOpenSSL";
        description = "Partial OpenSSL binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "HsOpenSSL-x509-system" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
@@ -9101,7 +9100,7 @@ self: {
        libraryHaskellDepends = [ array base X11 ];
        librarySystemDepends = [ imlib2 ];
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) imlib2;};
+     }) {inherit (pkgs) imlib2;};
 
   "ImperativeHaskell" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
@@ -9629,7 +9628,7 @@ self: {
        description = "A compiler from Curry to Haskell";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { kics = null;};
+     }) {kics = null;};
 
   "KiCS-debugger" = callPackage
     ({ mkDerivation, base, containers, curry-base, directory, filepath
@@ -9710,7 +9709,7 @@ self: {
        description = "Kyoto Cabinet DB bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) kyotocabinet;};
+     }) {inherit (pkgs) kyotocabinet;};
 
   "L-seed" = callPackage
     ({ mkDerivation, base, cairo, containers, gtk, mtl, old-time
@@ -9747,7 +9746,7 @@ self: {
        homepage = "https://github.com/ezyang/ldap-haskell";
        description = "Haskell binding for C LDAP API";
        license = stdenv.lib.licenses.bsd3;
-     }) { lber = null;  inherit (pkgs) openldap;};
+     }) {lber = null; inherit (pkgs) openldap;};
 
   "LRU" = callPackage
     ({ mkDerivation, base, containers, QuickCheck }:
@@ -10206,7 +10205,7 @@ self: {
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openmpi;};
+     }) {inherit (pkgs) openmpi;};
 
   "LogicGrowsOnTrees-network" = callPackage
     ({ mkDerivation, base, cereal, cmdtheline, composition, containers
@@ -11163,7 +11162,7 @@ self: {
        description = "A Haskell interface to Lego Mindstorms NXT";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { bluetooth = null;};
+     }) {bluetooth = null;};
 
   "NXTDSL" = callPackage
     ({ mkDerivation, attoparsec, base, hashable, mtl, resourcet, stm
@@ -11298,7 +11297,7 @@ self: {
        description = "Bindings for net-snmp's C API for clients";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) net_snmp;};
+     }) {inherit (pkgs) net_snmp;};
 
   "Network-NineP" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, convertible
@@ -11331,7 +11330,7 @@ self: {
        description = "A binary I/O library";
        license = "unknown";
        broken = true;
-     }) { integer = null;};
+     }) {integer = null;};
 
   "NineP" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
@@ -11707,9 +11706,9 @@ self: {
        ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { comctl32 = null;  comdlg32 = null;  gdi32 = null;
-          kernel32 = null;  ole32 = null;  shell32 = null;  user32 = null;
-          winmm = null;  winspool = null;};
+     }) {comctl32 = null; comdlg32 = null; gdi32 = null; 
+         kernel32 = null; ole32 = null; shell32 = null; user32 = null; 
+         winmm = null; winspool = null;};
 
   "ObjectName" = callPackage
     ({ mkDerivation, base, transformers }:
@@ -11847,7 +11846,7 @@ self: {
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding to the OpenAL cross-platform 3D audio API";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) openal;};
+     }) {inherit (pkgs) openal;};
 
   "OpenCL" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, mtl, OpenCL, QuickCheck }:
@@ -11864,7 +11863,7 @@ self: {
        description = "Haskell high-level wrapper for OpenCL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OpenCL = null;};
+     }) {OpenCL = null;};
 
   "OpenCLRaw" = callPackage
     ({ mkDerivation, base, bytestring, mtl }:
@@ -11935,7 +11934,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) mesa;};
+     }) {inherit (pkgs) mesa;};
 
   "OpenGLRaw21" = callPackage
     ({ mkDerivation, OpenGLRaw }:
@@ -12380,7 +12379,7 @@ self: {
        description = "Relational optimiser and code generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libxml2;};
+     }) {inherit (pkgs) libxml2;};
 
   "Peano" = callPackage
     ({ mkDerivation, base }:
@@ -12421,7 +12420,7 @@ self: {
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cmph = null;};
+     }) {cmph = null;};
 
   "PermuteEffects" = callPackage
     ({ mkDerivation, base, ReplicateEffects }:
@@ -12612,7 +12611,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/PortMidi";
        description = "A binding for PortMedia/PortMidi";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "PostgreSQL" = callPackage
     ({ mkDerivation, base, mtl }:
@@ -13079,7 +13078,7 @@ self: {
        description = "Binding to code that controls a Segway RMP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { canlib = null;  ftd2xx = null;};
+     }) {canlib = null; ftd2xx = null;};
 
   "RNAFold" = callPackage
     ({ mkDerivation, ADPfusion, base, BiobaseTurner, BiobaseVienna
@@ -13612,7 +13611,7 @@ self: {
        librarySystemDepends = [ SDL ];
        description = "Binding to libSDL";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) SDL;};
+     }) {inherit (pkgs) SDL;};
 
   "SDL-gfx" = callPackage
     ({ mkDerivation, base, SDL }:
@@ -13663,7 +13662,7 @@ self: {
        description = "Binding to the SMPEG library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) smpeg;};
+     }) {inherit (pkgs) smpeg;};
 
   "SDL-ttf" = callPackage
     ({ mkDerivation, base, SDL }:
@@ -13684,12 +13683,12 @@ self: {
        version = "0.1.0";
        sha256 = "06a20c0c8652c3c2ed53db5e638c44cb7b3f2199bc490324dfb72001e344cf0e";
        libraryHaskellDepends = [ base SDL2 ];
-       librarySystemDepends = [ SDL2 SDL2_ttf ];
+       librarySystemDepends = [ SDL2_ttf ];
        jailbreak = true;
        description = "Binding to libSDL-ttf";
        license = stdenv.lib.licenses.mit;
        broken = true;
-     }) { SDL2 = null;  inherit (pkgs) SDL2_ttf;};
+     }) {SDL2 = null; inherit (pkgs) SDL2_ttf;};
 
   "SFML" = callPackage
     ({ mkDerivation, base, csfml-audio, csfml-graphics, csfml-network
@@ -13707,9 +13706,8 @@ self: {
        description = "SFML bindings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { csfml-audio = null;  csfml-graphics = null;
-          csfml-network = null;  csfml-system = null;
-          csfml-window = null;};
+     }) {csfml-audio = null; csfml-graphics = null; 
+         csfml-network = null; csfml-system = null; csfml-window = null;};
 
   "SFML-control" = callPackage
     ({ mkDerivation, base, mtl, SFML, template-haskell }:
@@ -13995,7 +13993,7 @@ self: {
        description = "A .NET Bridge for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) glib;  inherit (pkgs) mono;};
+     }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
   "Saturnin" = callPackage
     ({ mkDerivation, base, bytestring, data-default, directory, either
@@ -14423,7 +14421,7 @@ self: {
        description = "E-library directory based on FUSE virtual file system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) zip;};
+     }) {inherit (pkgs) zip;};
 
   "SoOSiM" = callPackage
     ({ mkDerivation, base, concurrent-supply, containers
@@ -15183,7 +15181,7 @@ self: {
        librarySystemDepends = [ ogg theora ];
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ogg = null;  theora = null;};
+     }) {ogg = null; theora = null;};
 
   "Thingie" = callPackage
     ({ mkDerivation, base, cairo, gtk, mtl }:
@@ -15754,7 +15752,7 @@ self: {
        description = "Provides access to Vkontakte social network via public API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) curl;};
+     }) {inherit (pkgs) curl;};
 
   "Validation" = callPackage
     ({ mkDerivation, base, bifunctors, semigroupoids, semigroups }:
@@ -16154,8 +16152,8 @@ self: {
        homepage = "https://github.com/haskell/win32";
        description = "A binding to part of the Win32 library";
        license = stdenv.lib.licenses.bsd3;
-     }) { advapi32 = null;  gdi32 = null;  shell32 = null;
-          shfolder = null;  user32 = null;  winmm = null;};
+     }) {advapi32 = null; gdi32 = null; shell32 = null; 
+         shfolder = null; user32 = null; winmm = null;};
 
   "Win32-dhcp-server" = callPackage
     ({ mkDerivation, base, text, Win32, Win32-errors }:
@@ -16195,7 +16193,7 @@ self: {
        description = "Provides missing Win32 API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { imm32 = null;  msimg32 = null;};
+     }) {imm32 = null; msimg32 = null;};
 
   "Win32-junction-point" = callPackage
     ({ mkDerivation, base, text, Win32, Win32-errors }:
@@ -16252,7 +16250,7 @@ self: {
        description = "Windows service applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { Advapi32 = null;};
+     }) {Advapi32 = null;};
 
   "Win32-services-wrapper" = callPackage
     ({ mkDerivation, base, directory, filepath, Win32, Win32-errors
@@ -16377,9 +16375,9 @@ self: {
        homepage = "https://github.com/haskell-pkg-janitors/X11";
        description = "A binding to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs.xlibs) libXext;
-          inherit (pkgs.xlibs) libXinerama;  inherit (pkgs.xlibs) libXrandr;
-          inherit (pkgs.xlibs) libXrender;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; 
+         inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; 
+         inherit (pkgs.xlibs) libXrender;};
 
   "X11-extras" = callPackage
     ({ mkDerivation, base, libX11, X11 }:
@@ -16395,7 +16393,7 @@ self: {
        description = "Missing bindings to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) libX11;};
+     }) {inherit (pkgs.xlibs) libX11;};
 
   "X11-rm" = callPackage
     ({ mkDerivation, base, X11 }:
@@ -16421,7 +16419,7 @@ self: {
        description = "A binding to the Xdamage X11 extension library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { Xdamage = null;};
+     }) {Xdamage = null;};
 
   "X11-xfixes" = callPackage
     ({ mkDerivation, base, X11, Xfixes }:
@@ -16435,7 +16433,7 @@ self: {
        description = "A binding to the Xfixes X11 extension library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { Xfixes = null;};
+     }) {Xfixes = null;};
 
   "X11-xft" = callPackage
     ({ mkDerivation, base, libXft, utf8-string, X11 }:
@@ -16447,7 +16445,7 @@ self: {
        libraryPkgconfigDepends = [ libXft ];
        description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts";
        license = "LGPL";
-     }) { inherit (pkgs.xlibs) libXft;};
+     }) {inherit (pkgs.xlibs) libXft;};
 
   "X11-xshape" = callPackage
     ({ mkDerivation, base, X11 }:
@@ -16484,7 +16482,7 @@ self: {
        description = "Bindings for the DirectX XInput library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) xinput;};
+     }) {inherit (pkgs.xlibs) xinput;};
 
   "XMMS" = callPackage
     ({ mkDerivation, base, containers, xmmsclient, xmmsclient-glib }:
@@ -16498,7 +16496,7 @@ self: {
        description = "XMMS2 client library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { xmmsclient = null;  xmmsclient-glib = null;};
+     }) {xmmsclient = null; xmmsclient-glib = null;};
 
   "XMPP" = callPackage
     ({ mkDerivation, base, haskell98, hsdns, mtl, network, parsec
@@ -16552,7 +16550,7 @@ self: {
        libraryPkgconfigDepends = [ libXau ];
        description = "A binding to the X11 authentication library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libXau;};
+     }) {inherit (pkgs.xlibs) libXau;};
 
   "Xec" = callPackage
     ({ mkDerivation, base, binary, bytestring, cairo, containers
@@ -16783,7 +16781,7 @@ self: {
        description = "A functional MUD client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) readline;};
+     }) {inherit (pkgs) readline;};
 
   "ZEBEDDE" = callPackage
     ({ mkDerivation, base, vect }:
@@ -16953,7 +16951,7 @@ self: {
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) abc;};
+     }) {inherit (pkgs) abc;};
 
   "abcnotation" = callPackage
     ({ mkDerivation, base, parsec, prettify, process, semigroups }:
@@ -18947,7 +18945,7 @@ self: {
        homepage = "http://github.com/phaazon/al";
        description = "OpenAL 1.1 raw API.";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) openal;};
+     }) {inherit (pkgs) openal;};
 
   "alarmclock" = callPackage
     ({ mkDerivation, base, stm, time, unbounded-delays }:
@@ -19288,7 +19286,7 @@ self: {
        description = "Binding to the ALSA Library API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "alsa-core" = callPackage
     ({ mkDerivation, alsaLib, base, extensible-exceptions }:
@@ -19301,7 +19299,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (Exceptions)";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "alsa-gui" = callPackage
     ({ mkDerivation, alsa-core, alsa-seq, base, midi, midi-alsa, wx
@@ -19342,7 +19340,7 @@ self: {
        description = "Bindings for the ALSA sequencer API (MIDI stuff)";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "alsa-mixer" = callPackage
     ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }:
@@ -19356,7 +19354,7 @@ self: {
        homepage = "https://github.com/ttuegel/alsa-mixer";
        description = "Bindings to the ALSA simple mixer API";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm" = callPackage
     ({ mkDerivation, alsa-core, alsaLib, array, base
@@ -19376,7 +19374,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (PCM audio)";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm-tests" = callPackage
     ({ mkDerivation, alsa, base }:
@@ -19411,7 +19409,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (MIDI sequencer)";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "alsa-seq-tests" = callPackage
     ({ mkDerivation, alsa, base }:
@@ -19481,7 +19479,7 @@ self: {
        description = "A Haskell binding for ALURE";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { alure = null;};
+     }) {alure = null;};
 
   "amazon-emailer" = callPackage
     ({ mkDerivation, base, bytestring, configurator, http-conduit
@@ -19590,7 +19588,7 @@ self: {
        description = "Amazon Auto Scaling SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudformation" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19610,7 +19608,7 @@ self: {
        description = "Amazon CloudFormation SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudfront" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19630,7 +19628,7 @@ self: {
        description = "Amazon CloudFront SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudhsm" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19650,7 +19648,7 @@ self: {
        description = "Amazon CloudHSM SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudsearch" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19670,7 +19668,7 @@ self: {
        description = "Amazon CloudSearch SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudsearch-domains" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19690,7 +19688,7 @@ self: {
        description = "Amazon CloudSearch Domain SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudtrail" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19710,7 +19708,7 @@ self: {
        description = "Amazon CloudTrail SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudwatch" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19730,7 +19728,7 @@ self: {
        description = "Amazon CloudWatch SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudwatch-logs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19750,7 +19748,7 @@ self: {
        description = "Amazon CloudWatch Logs SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-codecommit" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19770,7 +19768,7 @@ self: {
        description = "Amazon CodeCommit SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-codedeploy" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19790,7 +19788,7 @@ self: {
        description = "Amazon CodeDeploy SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-codepipeline" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19810,7 +19808,7 @@ self: {
        description = "Amazon CodePipeline SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cognito-identity" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19830,7 +19828,7 @@ self: {
        description = "Amazon Cognito Identity SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cognito-sync" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19850,7 +19848,7 @@ self: {
        description = "Amazon Cognito Sync SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-config" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19870,7 +19868,7 @@ self: {
        description = "Amazon Config SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-core" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
@@ -19920,7 +19918,7 @@ self: {
        description = "Amazon Data Pipeline SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-devicefarm" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19940,7 +19938,7 @@ self: {
        description = "Amazon Device Farm SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-directconnect" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19960,7 +19958,7 @@ self: {
        description = "Amazon Direct Connect SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-ds" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19980,7 +19978,7 @@ self: {
        description = "Amazon Directory Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-dynamodb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20000,7 +19998,7 @@ self: {
        description = "Amazon DynamoDB SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-dynamodb-streams" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20020,7 +20018,7 @@ self: {
        description = "Amazon DynamoDB Streams SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-ec2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20040,7 +20038,7 @@ self: {
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-ecs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20060,7 +20058,7 @@ self: {
        description = "Amazon EC2 Container Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-efs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20080,7 +20078,7 @@ self: {
        description = "Amazon Elastic File System SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-elasticache" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20100,7 +20098,7 @@ self: {
        description = "Amazon ElastiCache SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-elasticbeanstalk" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20120,7 +20118,7 @@ self: {
        description = "Amazon Elastic Beanstalk SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-elastictranscoder" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20140,7 +20138,7 @@ self: {
        description = "Amazon Elastic Transcoder SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-elb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20160,7 +20158,7 @@ self: {
        description = "Amazon Elastic Load Balancing SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-emr" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20180,7 +20178,7 @@ self: {
        description = "Amazon Elastic MapReduce SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-glacier" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20200,7 +20198,7 @@ self: {
        description = "Amazon Glacier SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-iam" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20220,7 +20218,7 @@ self: {
        description = "Amazon Identity and Access Management SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-importexport" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20240,7 +20238,7 @@ self: {
        description = "Amazon Import/Export SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-kinesis" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20260,7 +20258,7 @@ self: {
        description = "Amazon Kinesis SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-kms" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20280,7 +20278,7 @@ self: {
        description = "Amazon Key Management Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-lambda" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20300,7 +20298,7 @@ self: {
        description = "Amazon Lambda SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-ml" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20320,7 +20318,7 @@ self: {
        description = "Amazon Machine Learning SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-opsworks" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20340,7 +20338,7 @@ self: {
        description = "Amazon OpsWorks SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-rds" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20360,7 +20358,7 @@ self: {
        description = "Amazon Relational Database Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-redshift" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20380,7 +20378,7 @@ self: {
        description = "Amazon Redshift SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-route53" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20400,7 +20398,7 @@ self: {
        description = "Amazon Route 53 SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-route53-domains" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20420,7 +20418,7 @@ self: {
        description = "Amazon Route 53 Domains SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-s3" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20440,7 +20438,7 @@ self: {
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-sdb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20460,7 +20458,7 @@ self: {
        description = "Amazon SimpleDB SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-ses" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20480,7 +20478,7 @@ self: {
        description = "Amazon Simple Email Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-sns" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20500,7 +20498,7 @@ self: {
        description = "Amazon Simple Notification Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-sqs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20520,7 +20518,7 @@ self: {
        description = "Amazon Simple Queue Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-ssm" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20540,7 +20538,7 @@ self: {
        description = "Amazon Simple Systems Management Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-storagegateway" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20560,7 +20558,7 @@ self: {
        description = "Amazon Storage Gateway SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-sts" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20580,7 +20578,7 @@ self: {
        description = "Amazon Security Token Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-support" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20600,7 +20598,7 @@ self: {
        description = "Amazon Support SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-swf" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20620,7 +20618,7 @@ self: {
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-workspaces" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20640,7 +20638,7 @@ self: {
        description = "Amazon WorkSpaces SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "ampersand" = callPackage
     ({ mkDerivation, base, bytestring, containers, csv, directory
@@ -21125,7 +21123,7 @@ self: {
        description = "Haskell binding to the ANTLR parser generator C runtime library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { antlr3c = null;};
+     }) {antlr3c = null;};
 
   "anydbm" = callPackage
     ({ mkDerivation, base, containers, MissingH, mtl }:
@@ -21162,7 +21160,7 @@ self: {
        description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { libaosd = null;};
+     }) {libaosd = null;};
 
   "ap-reflect" = callPackage
     ({ mkDerivation, base }:
@@ -21195,7 +21193,7 @@ self: {
        homepage = "https://github.com/trskop/apache-md5";
        description = "Apache specific MD5 digest algorighm";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "apelsin" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
@@ -21307,17 +21305,15 @@ self: {
      }:
      mkDerivation {
        pname = "apiary";
-       version = "1.4.3";
-       sha256 = "4cb377f5f081c80a5d11ffe09daad890528ed3f5e67b59265f9acc61677bcefc";
-       revision = "1";
-       editedCabalFile = "024867d05ec04c0b83c41e948b80c56686cc170beed600daffa8d8c725e50a32";
+       version = "1.4.4";
+       sha256 = "de395821116717cf654f52176e6487782522f567b288a17bab7713ff85411085";
        libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
          bytestring-read case-insensitive data-default-class exceptions
          hashable http-date http-types mime-types monad-control mtl process
          stringsearch template-haskell text time transformers
          transformers-base types-compat unix-compat unordered-containers
-         vault wai web-routing
+         vault wai wai-extra web-routing
        ];
        testHaskellDepends = [
          base bytestring http-types HUnit mtl tasty tasty-hunit
@@ -21899,7 +21895,7 @@ self: {
        description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { arbb_dev = null;};
+     }) {arbb_dev = null;};
 
   "arbtt" = callPackage
     ({ mkDerivation, aeson, array, base, binary, bytestring
@@ -21928,7 +21924,7 @@ self: {
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
-     }) { inherit (pkgs.xlibs) libXScrnSaver;};
+     }) {inherit (pkgs.xlibs) libXScrnSaver;};
 
   "archive" = callPackage
     ({ mkDerivation, base, bytestring, debian, debian-mirror, directory
@@ -21951,7 +21947,7 @@ self: {
        description = "A library and programs for creating hardlinked incremental archives or backups";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { debian-mirror = null;  help = null;};
+     }) {debian-mirror = null; help = null;};
 
   "archiver" = callPackage
     ({ mkDerivation, base, bytestring, containers, curl, HTTP, network
@@ -22682,7 +22678,7 @@ self: {
        description = "Haskell Assembler";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { ghc-binary = null;};
+     }) {ghc-binary = null;};
 
   "assert" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
@@ -22739,7 +22735,7 @@ self: {
        description = "The Assimp asset import library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) assimp;};
+     }) {inherit (pkgs) assimp;};
 
   "astar" = callPackage
     ({ mkDerivation, base, containers, PSQueue }:
@@ -23460,7 +23456,7 @@ self: {
        description = "A Haskell FFI wrapper for the Augeas API";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) augeas;};
+     }) {inherit (pkgs) augeas;};
 
   "augur" = callPackage
     ({ mkDerivation, base, bytestring, classify, containers, directory
@@ -23805,7 +23801,7 @@ self: {
        description = "Low-level Awesomium bindings";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { awesomium = null;};
+     }) {awesomium = null;};
 
   "aws" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
@@ -25509,7 +25505,7 @@ self: {
        description = "Pretty BerkeleyDB v4 binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) db;};
+     }) {inherit (pkgs) db;};
 
   "berp" = callPackage
     ({ mkDerivation, array, base, containers, directory
@@ -25860,8 +25856,8 @@ self: {
        description = "Leksah plugin base";
        license = "LGPL";
        broken = true;
-     }) { leksah-dummy = null;  leksah-main = null;
-          leksah-plugin-pane = null;};
+     }) {leksah-dummy = null; leksah-main = null; 
+         leksah-plugin-pane = null;};
 
   "billeksah-pane" = callPackage
     ({ mkDerivation, base, billeksah-services, containers, directory
@@ -26191,7 +26187,7 @@ self: {
        description = "Format to store data using the binary transform";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { binary-transform = null;};
+     }) {binary-transform = null;};
 
   "binary-streams" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal
@@ -26355,7 +26351,7 @@ self: {
        description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { esound = null;};
+     }) {esound = null;};
 
   "bindings-GLFW" = callPackage
     ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor
@@ -26376,11 +26372,11 @@ self: {
        ];
        description = "Low-level bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs.xlibs) libXcursor;
-          inherit (pkgs.xlibs) libXext;  inherit (pkgs.xlibs) libXfixes;
-          inherit (pkgs.xlibs) libXi;  inherit (pkgs.xlibs) libXinerama;
-          inherit (pkgs.xlibs) libXrandr;  inherit (pkgs.xlibs) libXxf86vm;
-          inherit (pkgs) mesa;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; 
+         inherit (pkgs.xlibs) libXext; inherit (pkgs.xlibs) libXfixes; 
+         inherit (pkgs.xlibs) libXi; inherit (pkgs.xlibs) libXinerama; 
+         inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; 
+         inherit (pkgs) mesa;};
 
   "bindings-K8055" = callPackage
     ({ mkDerivation, base, K8055D }:
@@ -26394,7 +26390,7 @@ self: {
        description = "Bindings to Velleman K8055 dll";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { K8055D = null;};
+     }) {K8055D = null;};
 
   "bindings-apr" = callPackage
     ({ mkDerivation, apr-1, base, bindings-DSL }:
@@ -26409,7 +26405,7 @@ self: {
        description = "Low level bindings to Apache Portable Runtime (APR)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { apr-1 = null;};
+     }) {apr-1 = null;};
 
   "bindings-apr-util" = callPackage
     ({ mkDerivation, apr-util-1, base, bindings-apr, bindings-DSL }:
@@ -26424,7 +26420,7 @@ self: {
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { apr-util-1 = null;};
+     }) {apr-util-1 = null;};
 
   "bindings-audiofile" = callPackage
     ({ mkDerivation, audiofile, base, bindings-DSL }:
@@ -26437,7 +26433,7 @@ self: {
        homepage = "http://cielonegro.org/Bindings-AudioFile.html";
        description = "Low level bindings to audiofile";
        license = stdenv.lib.licenses.publicDomain;
-     }) { inherit (pkgs) audiofile;};
+     }) {inherit (pkgs) audiofile;};
 
   "bindings-bfd" = callPackage
     ({ mkDerivation, alex, array, base, bfd, containers, happy, opcodes
@@ -26455,7 +26451,7 @@ self: {
        description = "Bindings for libbfd, a library of the GNU `binutils'";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { bfd = null;  opcodes = null;};
+     }) {bfd = null; opcodes = null;};
 
   "bindings-cctools" = callPackage
     ({ mkDerivation, bindings-DSL, dttools }:
@@ -26469,7 +26465,7 @@ self: {
        description = "Bindings to the CCTools WorkQueue C library";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { dttools = null;};
+     }) {dttools = null;};
 
   "bindings-codec2" = callPackage
     ({ mkDerivation, base, binary, bindings-DSL, bytestring, codec2
@@ -26490,7 +26486,7 @@ self: {
        description = "Very low-level FFI bindings for Codec2";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { codec2 = null;};
+     }) {codec2 = null;};
 
   "bindings-common" = callPackage
     ({ mkDerivation, base }:
@@ -26517,7 +26513,7 @@ self: {
        description = "Library for using firewire (iidc-1394) cameras";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { dc1394 = null;};
+     }) {dc1394 = null;};
 
   "bindings-directfb" = callPackage
     ({ mkDerivation, base, bindings-DSL, bindings-posix, directfb }:
@@ -26529,7 +26525,7 @@ self: {
        libraryPkgconfigDepends = [ directfb ];
        description = "Low level bindings to DirectFB";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) directfb;};
+     }) {inherit (pkgs) directfb;};
 
   "bindings-eskit" = callPackage
     ({ mkDerivation, array, base, bindings-DSL, eskit }:
@@ -26545,7 +26541,7 @@ self: {
        description = "Bindings to ESKit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { eskit = null;};
+     }) {eskit = null;};
 
   "bindings-fann" = callPackage
     ({ mkDerivation, base, bindings-DSL, fann }:
@@ -26558,7 +26554,7 @@ self: {
        description = "Low level bindings to FANN neural network library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { fann = null;};
+     }) {fann = null;};
 
   "bindings-fluidsynth" = callPackage
     ({ mkDerivation, base, bindings-DSL, fluidsynth }:
@@ -26571,7 +26567,7 @@ self: {
        homepage = "http://github.com/bgamari/bindings-fluidsynth";
        description = "Haskell FFI bindings for fluidsynth software synthesizer";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) fluidsynth;};
+     }) {inherit (pkgs) fluidsynth;};
 
   "bindings-friso" = callPackage
     ({ mkDerivation, base, bindings-DSL, friso }:
@@ -26584,7 +26580,7 @@ self: {
        description = "Low level bindings for friso";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { friso = null;};
+     }) {friso = null;};
 
   "bindings-glib" = callPackage
     ({ mkDerivation, base, bindings-DSL, glib }:
@@ -26596,7 +26592,7 @@ self: {
        libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings to GLib";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) glib;};
+     }) {inherit (pkgs) glib;};
 
   "bindings-gobject" = callPackage
     ({ mkDerivation, base, bindings-DSL, bindings-glib, glib }:
@@ -26608,7 +26604,7 @@ self: {
        libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings supporting GObject and derived libraries";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) glib;};
+     }) {inherit (pkgs) glib;};
 
   "bindings-gpgme" = callPackage
     ({ mkDerivation, base, bindings-DSL, gpgme }:
@@ -26621,7 +26617,7 @@ self: {
        homepage = "http://bitbucket.org/mauricio/bindings-gpgme";
        description = "Project bindings-* raw interface to gpgme";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) gpgme;};
+     }) {inherit (pkgs) gpgme;};
 
   "bindings-gsl" = callPackage
     ({ mkDerivation, base, bindings-DSL, gsl }:
@@ -26633,7 +26629,7 @@ self: {
        libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) gsl;};
+     }) {inherit (pkgs) gsl;};
 
   "bindings-gts" = callPackage
     ({ mkDerivation, base, bindings-DSL, bindings-glib, gts }:
@@ -26646,7 +26642,7 @@ self: {
        description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) gts;};
+     }) {inherit (pkgs) gts;};
 
   "bindings-hamlib" = callPackage
     ({ mkDerivation, base, bindings-DSL, hamlib }:
@@ -26664,7 +26660,7 @@ self: {
        homepage = "https://github.com/relrod/hamlib-haskell";
        description = "Hamlib bindings for Haskell";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) hamlib;};
+     }) {inherit (pkgs) hamlib;};
 
   "bindings-hdf5" = callPackage
     ({ mkDerivation, base, bindings-DSL }:
@@ -26689,7 +26685,7 @@ self: {
        homepage = "https://github.com/basvandijk/bindings-levmar";
        description = "Low level bindings to the C levmar (Levenberg-Marquardt) library";
        license = "unknown";
-     }) { inherit (pkgs) blas;  lapack = null;};
+     }) {inherit (pkgs) blas; lapack = null;};
 
   "bindings-libcddb" = callPackage
     ({ mkDerivation, base, bindings-DSL, libcddb }:
@@ -26702,7 +26698,7 @@ self: {
        homepage = "http://bitbucket.org/mauricio/bindings-libcddb";
        description = "Low level binding to libcddb";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libcddb;};
+     }) {inherit (pkgs) libcddb;};
 
   "bindings-libffi" = callPackage
     ({ mkDerivation, base, bindings-DSL, libffi }:
@@ -26714,7 +26710,7 @@ self: {
        libraryPkgconfigDepends = [ libffi ];
        description = "Low level bindings to libffi";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libffi;};
+     }) {inherit (pkgs) libffi;};
 
   "bindings-libftdi" = callPackage
     ({ mkDerivation, base, bindings-DSL, libftdi, libusb }:
@@ -26727,7 +26723,7 @@ self: {
        description = "Low level bindings to libftdi";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libftdi;  inherit (pkgs) libusb;};
+     }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;};
 
   "bindings-librrd" = callPackage
     ({ mkDerivation, base, bindings-DSL, librrd }:
@@ -26741,7 +26737,7 @@ self: {
        description = "Low level bindings to RRDtool";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { librrd = null;};
+     }) {librrd = null;};
 
   "bindings-libstemmer" = callPackage
     ({ mkDerivation, base, bindings-DSL, resourcet, stemmer
@@ -26758,7 +26754,7 @@ self: {
        description = "Binding for libstemmer with low level binding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { stemmer = null;};
+     }) {stemmer = null;};
 
   "bindings-libusb" = callPackage
     ({ mkDerivation, base, bindings-DSL, libusb }:
@@ -26771,7 +26767,7 @@ self: {
        homepage = "https://github.com/basvandijk/bindings-libusb";
        description = "Low level bindings to libusb";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libusb;};
+     }) {inherit (pkgs) libusb;};
 
   "bindings-libv4l2" = callPackage
     ({ mkDerivation, base, bindings-DSL, v4l2 }:
@@ -26785,7 +26781,7 @@ self: {
        description = "bindings to libv4l2 for Linux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { v4l2 = null;};
+     }) {v4l2 = null;};
 
   "bindings-libzip" = callPackage
     ({ mkDerivation, base, bindings-DSL, libzip }:
@@ -26798,7 +26794,7 @@ self: {
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Low level bindings to libzip";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libzip;};
+     }) {inherit (pkgs) libzip;};
 
   "bindings-linux-videodev2" = callPackage
     ({ mkDerivation, base, bindings-DSL, ioctl }:
@@ -26825,7 +26821,7 @@ self: {
        homepage = "https://github.com/fizruk/bindings-lxc";
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) lxc;};
+     }) {inherit (pkgs) lxc;};
 
   "bindings-mmap" = callPackage
     ({ mkDerivation, bindings-posix }:
@@ -26868,7 +26864,7 @@ self: {
        homepage = "http://floss.scru.org/bindings-nettle";
        description = "bindings to nettle crypto library";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) nettle;};
+     }) {inherit (pkgs) nettle;};
 
   "bindings-parport" = callPackage
     ({ mkDerivation, base, bindings-DSL }:
@@ -26891,7 +26887,7 @@ self: {
        libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) portaudio;};
+     }) {inherit (pkgs) portaudio;};
 
   "bindings-posix" = callPackage
     ({ mkDerivation, base, bindings-DSL }:
@@ -26915,7 +26911,7 @@ self: {
        homepage = "https://github.com/rwbarton/bindings-potrace";
        description = "Low-level bindings to the potrace bitmap tracing library";
        license = stdenv.lib.licenses.gpl2;
-     }) { inherit (pkgs) potrace;};
+     }) {inherit (pkgs) potrace;};
 
   "bindings-ppdev" = callPackage
     ({ mkDerivation, base, bindings-DSL, ioctl }:
@@ -26960,7 +26956,7 @@ self: {
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) saneBackends;};
+     }) {inherit (pkgs) saneBackends;};
 
   "bindings-sc3" = callPackage
     ({ mkDerivation, base, bindings-DSL, scsynth }:
@@ -26974,7 +26970,7 @@ self: {
        description = "Low-level bindings to the SuperCollider synthesis engine library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { scsynth = null;};
+     }) {scsynth = null;};
 
   "bindings-sipc" = callPackage
     ({ mkDerivation, base, sipc }:
@@ -26991,7 +26987,7 @@ self: {
        description = "Low level bindings to SIPC";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { sipc = null;};
+     }) {sipc = null;};
 
   "bindings-sophia" = callPackage
     ({ mkDerivation, base, bindings-DSL }:
@@ -27014,7 +27010,7 @@ self: {
        libraryPkgconfigDepends = [ sqlite ];
        description = "Low level bindings to sqlite3";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) sqlite;};
+     }) {inherit (pkgs) sqlite;};
 
   "bindings-svm" = callPackage
     ({ mkDerivation, base, bindings-DSL }:
@@ -27049,7 +27045,7 @@ self: {
        librarySystemDepends = [ gmp yices ];
        description = "Bindings to the Yices theorem prover";
        license = stdenv.lib.licenses.publicDomain;
-     }) { inherit (pkgs) gmp;  inherit (pkgs) yices;};
+     }) {inherit (pkgs) gmp; inherit (pkgs) yices;};
 
   "binembed" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
@@ -27576,7 +27572,7 @@ self: {
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
        license = stdenv.lib.licenses.bsd3;
-     }) { gcc_s = null;};
+     }) {gcc_s = null;};
 
   "bitset" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, gmp, integer-gmp
@@ -27593,7 +27589,7 @@ self: {
        description = "A space-efficient set data structure";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) gmp;};
+     }) {inherit (pkgs) gmp;};
 
   "bitspeak" = callPackage
     ({ mkDerivation, base, bindings-DSL, bindings-glib
@@ -27613,7 +27609,7 @@ self: {
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gtk;  inherit (pkgs.gnome) pango;};
+     }) {inherit (pkgs.gnome) gtk; inherit (pkgs.gnome) pango;};
 
   "bitstream" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck
@@ -27716,20 +27712,20 @@ self: {
      }) {};
 
   "bitx-bitcoin" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, hspec
-     , http-conduit, http-types, microlens, microlens-th, network
-     , pretty-show, scientific, split, text, time
+    ({ mkDerivation, aeson, base, bytestring, directory, doctest, hspec
+     , http-conduit, http-types, microlens, microlens-th, network, safe
+     , scientific, split, text, time
      }:
      mkDerivation {
        pname = "bitx-bitcoin";
-       version = "0.4.0.1";
-       sha256 = "2aa641c5e02e19814c707d8aa8b262411288e7db403afbee04b909507a6f8187";
+       version = "0.5.0.0";
+       sha256 = "e52f9757e72a5f3fa2992a4f68ffb7874131357b9327ce6908200e8e89d7f9a9";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types microlens
          microlens-th network scientific split text time
        ];
        testHaskellDepends = [
-         aeson base bytestring directory hspec microlens pretty-show text
+         aeson base bytestring directory doctest hspec microlens safe text
          time
        ];
        homepage = "https://github.com/tebello-thejane/bitx-haskell";
@@ -27926,7 +27922,7 @@ self: {
        description = "Low-level Haskell bindings to Blas";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) blas;};
+     }) {inherit (pkgs) blas;};
 
   "blastxml" = callPackage
     ({ mkDerivation, base, biocore, bytestring, parallel, tagsoup }:
@@ -28992,7 +28988,7 @@ self: {
        description = "Haskell bindings to Broker, Bro's messaging library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { broker = null;};
+     }) {broker = null;};
 
   "bsd-sysctl" = callPackage
     ({ mkDerivation, base }:
@@ -29306,7 +29302,7 @@ self: {
        description = "A wrapper for the Bullet physics engine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) bullet;};
+     }) {inherit (pkgs) bullet;};
 
   "bumper" = callPackage
     ({ mkDerivation, base, Cabal, containers, fclabels, process
@@ -29881,7 +29877,7 @@ self: {
        librarySystemDepends = [ bzip2 ];
        description = "Compression and decompression in the bzip2 format";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) bzip2;};
+     }) {inherit (pkgs) bzip2;};
 
   "bzlib-conduit" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit
@@ -29904,7 +29900,7 @@ self: {
        homepage = "https://github.com/snoyberg/bzlib-conduit";
        description = "Streaming compression/decompression via conduits";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) bzip2;};
+     }) {inherit (pkgs) bzip2;};
 
   "c-dsl" = callPackage
     ({ mkDerivation, base, language-c }:
@@ -30305,8 +30301,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.5.1.0";
-       sha256 = "563773491cc8245c3d265c2e7847f95198aad74adcbc16a91622e7e4abef4e45";
+       version = "0.5.3.0";
+       sha256 = "6ab4dc0b9b523241f6f3ed6d6af2d5d1085fc3e384d88b6667a87df843800f66";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30314,34 +30310,14 @@ self: {
          transformers
        ];
        executableHaskellDepends = [
-         base bytestring Cabal directory filepath process template-haskell
-         temporary transformers utf8-string
+         base bytestring Cabal directory filepath ghc-prim process
+         template-haskell temporary transformers utf8-string
        ];
-       testHaskellDepends = [ base extra process unix ];
-       description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
-       license = stdenv.lib.licenses.agpl3;
-     }) {};
-
-  "cabal-helper_0_5_2_0" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, data-default, directory
-     , extra, filepath, ghc-prim, mtl, process, template-haskell
-     , temporary, transformers, unix, utf8-string
-     }:
-     mkDerivation {
-       pname = "cabal-helper";
-       version = "0.5.2.0";
-       sha256 = "e4328860abef0a6ff97357810f6f067018e40e0e28fa9df3b51efbc7421f689f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base Cabal data-default directory filepath ghc-prim mtl process
-         transformers
+       testHaskellDepends = [
+         base bytestring Cabal data-default directory extra filepath
+         ghc-prim mtl process template-haskell temporary transformers unix
+         utf8-string
        ];
-       executableHaskellDepends = [
-         base bytestring Cabal directory filepath process template-haskell
-         temporary transformers utf8-string
-       ];
-       testHaskellDepends = [ base extra process unix ];
        description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -30432,7 +30408,7 @@ self: {
        description = "The (bundled) command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) zlib;};
+     }) {inherit (pkgs) zlib;};
 
   "cabal-install-ghc72" = callPackage
     ({ mkDerivation, array, base, Cabal, containers, directory
@@ -31040,7 +31016,7 @@ self: {
        homepage = "http://github.com/pecorarista/hscabocha";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cabocha = null;};
+     }) {cabocha = null;};
 
   "cached-io" = callPackage
     ({ mkDerivation, base, stm, time }:
@@ -31132,7 +31108,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Cairo library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) cairo;};
+     }) {inherit (pkgs) cairo;};
 
   "cairo-appbase" = callPackage
     ({ mkDerivation, base, cairo, glib, gtk }:
@@ -31229,7 +31205,7 @@ self: {
        description = "Haskell binding to the Cal3D animation library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cal3d = null;};
+     }) {cal3d = null;};
 
   "cal3d-examples" = callPackage
     ({ mkDerivation, base, cal3d, cal3d-opengl, OpenGL, SDL }:
@@ -31659,7 +31635,7 @@ self: {
        description = "mid-level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi = null;};
+     }) {casadi = null;};
 
   "casadi-bindings-control" = callPackage
     ({ mkDerivation, base, casadi-bindings-core
@@ -31677,7 +31653,7 @@ self: {
        description = "low level bindings to casadi-control";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi_control = null;};
+     }) {casadi_control = null;};
 
   "casadi-bindings-core" = callPackage
     ({ mkDerivation, base, casadi, casadi-bindings-internal, vector }:
@@ -31690,7 +31666,7 @@ self: {
        description = "autogenerated low level bindings to casadi";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi = null;};
+     }) {casadi = null;};
 
   "casadi-bindings-internal" = callPackage
     ({ mkDerivation, base, casadi, vector }:
@@ -31704,7 +31680,7 @@ self: {
        description = "low level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi = null;};
+     }) {casadi = null;};
 
   "casadi-bindings-ipopt-interface" = callPackage
     ({ mkDerivation, base, casadi-bindings-core
@@ -31721,7 +31697,7 @@ self: {
        description = "low level bindings to casadi-ipopt_interface";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi_ipopt_interface = null;};
+     }) {casadi_ipopt_interface = null;};
 
   "casadi-bindings-snopt-interface" = callPackage
     ({ mkDerivation, base, casadi-bindings-core
@@ -31738,7 +31714,7 @@ self: {
        description = "low level bindings to casadi-snopt_interface";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi_snopt_interface = null;};
+     }) {casadi_snopt_interface = null;};
 
   "cascading" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, colour
@@ -32172,7 +32148,7 @@ self: {
        description = "Bindings for the CCI networking library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cci = null;};
+     }) {cci = null;};
 
   "ccnx" = callPackage
     ({ mkDerivation, base, bytestring }:
@@ -32203,7 +32179,7 @@ self: {
        description = "High-level interface to CCTools' WorkQueue library";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { dttools = null;};
+     }) {dttools = null;};
 
   "cedict" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, parsec
@@ -32589,8 +32565,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.5.2";
-       sha256 = "998770126bf6dff9c230557accb1eb5bbc2b89ed03d209645a92b2f229e52c08";
+       version = "6.5.3";
+       sha256 = "af2f1b09aabb32fe398a575f28331979903afa00333b3f1dc0f19a6d302bca1e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -32913,7 +32889,7 @@ self: {
        librarySystemDepends = [ resolv ];
        description = "Confirm whether an email is valid and probably existant";
        license = stdenv.lib.licenses.bsd3;
-     }) { resolv = null;};
+     }) {resolv = null;};
 
   "check-pvp" = callPackage
     ({ mkDerivation, base, Cabal, containers, explicit-exception
@@ -33252,7 +33228,7 @@ self: {
        description = "A binding to cinvoke";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cinvoke = null;};
+     }) {cinvoke = null;};
 
   "cio" = callPackage
     ({ mkDerivation, base, monad-stm, mtl, parallel-io, stm }:
@@ -33952,13 +33928,12 @@ self: {
          web-routes-th xss-sanitize
        ];
        librarySystemDepends = [ openssl ];
-       libraryToolDepends = [ hsx2hs ];
        jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "clckwrks-cli" = callPackage
     ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl
@@ -34100,7 +34075,6 @@ self: {
          tagsoup template-haskell text time time-locale-compat uuid
          web-plugins web-routes web-routes-happstack web-routes-th
        ];
-       libraryToolDepends = [ hsx2hs ];
        jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "support for CMS/Blogging in clckwrks";
@@ -34120,7 +34094,6 @@ self: {
          base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
          mtl text web-plugins
        ];
-       libraryToolDepends = [ hsx2hs ];
        homepage = "http://www.clckwrks.com/";
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -34421,7 +34394,7 @@ self: {
        description = "timer functionality to clock IO commands";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { QtCore = null;};
+     }) {QtCore = null;};
 
   "clogparse" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, filepath, text, time
@@ -34642,7 +34615,7 @@ self: {
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) clutter;  inherit (pkgs.gnome) pango;};
+     }) {inherit (pkgs) clutter; inherit (pkgs.gnome) pango;};
 
   "cmaes" = callPackage
     ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random
@@ -35460,6 +35433,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "comfort-graph" = callPackage
+    ({ mkDerivation, base, containers, QuickCheck, transformers
+     , utility-ht
+     }:
+     mkDerivation {
+       pname = "comfort-graph";
+       version = "0.0.0.1";
+       sha256 = "dc4cadda8bb9847f60f217d54590d5695597814557c70dafab9846b944dcfb8c";
+       libraryHaskellDepends = [
+         base containers QuickCheck transformers utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/comfort-graph";
+       description = "Graph structure with type parameters for nodes and edges";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "command" = callPackage
     ({ mkDerivation, base, deepseq, process }:
      mkDerivation {
@@ -36461,7 +36450,7 @@ self: {
        description = "conduit-audio interface to the LAME MP3 library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { mp3lame = null;};
+     }) {mp3lame = null;};
 
   "conduit-audio-samplerate" = callPackage
     ({ mkDerivation, base, conduit, conduit-audio, resourcet
@@ -36481,7 +36470,7 @@ self: {
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { samplerate = null;};
+     }) {samplerate = null;};
 
   "conduit-audio-sndfile" = callPackage
     ({ mkDerivation, base, conduit, conduit-audio, hsndfile
@@ -37240,7 +37229,7 @@ self: {
        executableSystemDepends = [ hyperleveldb ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { hyperleveldb = null;};
+     }) {hyperleveldb = null;};
 
   "continuum-client" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, mtl
@@ -38293,7 +38282,7 @@ self: {
        description = "Bindings for libpython";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) python3;};
+     }) {inherit (pkgs) python3;};
 
   "cql" = callPackage
     ({ mkDerivation, base, bytestring, cereal, Decimal, iproute
@@ -38495,7 +38484,7 @@ self: {
        description = "A haskell binding to cracklib";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { crack = null;};
+     }) {crack = null;};
 
   "crackNum" = callPackage
     ({ mkDerivation, base, data-binary-ieee754, ieee754 }:
@@ -39611,7 +39600,7 @@ self: {
        description = "Binding to the Google ctemplate library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ctemplate = null;};
+     }) {ctemplate = null;};
 
   "ctkl" = callPackage
     ({ mkDerivation, array, base }:
@@ -39739,7 +39728,7 @@ self: {
        homepage = "https://github.com/bmsherman/cublas";
        description = "FFI bindings to the CUDA CUBLAS and CUSPARSE libraries";
        license = stdenv.lib.licenses.bsd3;
-     }) { cublas = null;  cusparse = null;};
+     }) {cublas = null; cusparse = null;};
 
   "cuboid" = callPackage
     ({ mkDerivation, base, GLUT, Yampa }:
@@ -39785,8 +39774,8 @@ self: {
        description = "Bindings to the CUDD binary decision diagrams library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cudd = null;  dddmp = null;  epd = null;  inherit (pkgs) mtr;
-          inherit (pkgs) st;  util = null;};
+     }) {cudd = null; dddmp = null; epd = null; inherit (pkgs) mtr; 
+         inherit (pkgs) st; util = null;};
 
   "cufft" = callPackage
     ({ mkDerivation, base, c2hs, cuda }:
@@ -39811,7 +39800,7 @@ self: {
        librarySystemDepends = [ curl ];
        description = "Haskell binding to libcurl";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) curl;};
+     }) {inherit (pkgs) curl;};
 
   "curl-aeson" = callPackage
     ({ mkDerivation, aeson, base, curl, text, utf8-string }:
@@ -40236,7 +40225,7 @@ self: {
        homepage = "http://darcs.net/";
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
-     }) { inherit (pkgs) curl;};
+     }) {inherit (pkgs) curl;};
 
   "darcs-benchmark" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, containers, datetime
@@ -40295,7 +40284,7 @@ self: {
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) curl;};
+     }) {inherit (pkgs) curl;};
 
   "darcs-buildpackage" = callPackage
     ({ mkDerivation, base, ConfigFile, directory, hslogger, MissingH
@@ -40336,8 +40325,8 @@ self: {
        description = "David's Advanced Version Control System";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) curl;  inherit (pkgs) ncurses;
-          inherit (pkgs) zlib;};
+     }) {inherit (pkgs) curl; inherit (pkgs) ncurses; 
+         inherit (pkgs) zlib;};
 
   "darcs-fastconvert" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cmdlib, containers
@@ -41780,20 +41769,20 @@ self: {
 
   "dataflow" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
-     , filepath, hastache, hspec, HUnit, markdown, MissingH, mtl, parsec
-     , text, vector
+     , filepath, gitrev, hastache, hspec, HUnit, markdown, MissingH, mtl
+     , parsec, text, vector
      }:
      mkDerivation {
        pname = "dataflow";
-       version = "0.7.1.0";
-       sha256 = "cb7bc18db84941303981a4aafb4b07883ee869d62587f416cb0304d4a0d4bfb4";
+       version = "0.7.3.0";
+       sha256 = "312f2f0497cbd7e34d6eb3c4f1d113443e5375346b70628c0a22211e4baf883a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-html bytestring containers filepath hastache
          markdown MissingH mtl parsec text vector
        ];
-       executableHaskellDepends = [ base bytestring text ];
+       executableHaskellDepends = [ base bytestring gitrev text ];
        testHaskellDepends = [
          aeson base bytestring containers hspec HUnit parsec vector
        ];
@@ -42483,8 +42472,8 @@ self: {
      }:
      mkDerivation {
        pname = "debian";
-       version = "3.88";
-       sha256 = "9b347387432ca20fb4bba123cdb4de8e4ae05d49a4433d1609f37215620e6e56";
+       version = "3.88.1";
+       sha256 = "89451e4c95f798f887edace812ed6bd7418e771dd79097eafb6a1f2015a03ed9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42923,7 +42912,7 @@ self: {
        description = "Decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { mpdec = null;};
+     }) {mpdec = null;};
 
   "deka-tests" = callPackage
     ({ mkDerivation, base, bytestring, containers, deka, parsec, pipes
@@ -44166,7 +44155,7 @@ self: {
        librarySystemDepends = [ zlib ];
        description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) zlib;};
+     }) {inherit (pkgs) zlib;};
 
   "digest-pure" = callPackage
     ({ mkDerivation, array, base, bytestring, digest, QuickCheck }:
@@ -44801,7 +44790,7 @@ self: {
        description = "Haskell bindings to the discount Markdown library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { markdown = null;};
+     }) {markdown = null;};
 
   "discrete-space-map" = callPackage
     ({ mkDerivation, adjunctions, base, comonad, distributive, keys
@@ -45398,8 +45387,8 @@ self: {
      }:
      mkDerivation {
        pname = "diversity";
-       version = "0.7.0.0";
-       sha256 = "41181ef465f7f88904bffadb2057b7d055813b74fb360b6d07fad27b9bc6f513";
+       version = "0.7.0.1";
+       sha256 = "aa5e39896fe48ba067ad5c02213ada4dfbb5f089bb4d2338b58da4b95a56458b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45566,7 +45555,7 @@ self: {
        description = "DNS service discovery bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { dns_sd = null;};
+     }) {dns_sd = null;};
 
   "doc-review" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary, bytestring
@@ -46296,7 +46285,7 @@ self: {
        testPkgconfigDepends = [ libdpkg ];
        description = "libdpkg bindings";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) dpkg;  libdpkg = null;};
+     }) {inherit (pkgs) dpkg; libdpkg = null;};
 
   "drClickOn" = callPackage
     ({ mkDerivation, base, containers }:
@@ -46330,7 +46319,7 @@ self: {
      }) {};
 
   "drawille" = callPackage
-    ({ mkDerivation, base, containers, hspec, QuickCheck }:
+    ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "drawille";
        version = "0.1.0.5";
@@ -46338,7 +46327,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base containers hspec QuickCheck ];
        homepage = "https://github.com/yamadapc/haskell-drawille";
        description = "A port of asciimoo's drawille to haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -46771,7 +46759,7 @@ self: {
        description = "A monadic interface to libdvdread";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { dvdread = null;};
+     }) {dvdread = null;};
 
   "dvi-processing" = callPackage
     ({ mkDerivation, base, bytestring, filepath, transformers }:
@@ -46867,7 +46855,7 @@ self: {
        description = "A binding to the Microsoft DirectX 9 API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { d3d9 = null;};
+     }) {d3d9 = null;};
 
   "dx9d3dx" = callPackage
     ({ mkDerivation, base, d3dx9, dx9base, dx9d3d, Win32 }:
@@ -46880,7 +46868,7 @@ self: {
        description = "A binding to the Microsoft DirectX 9 D3DX API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { d3dx9 = null;};
+     }) {d3dx9 = null;};
 
   "dynamic-cabal" = callPackage
     ({ mkDerivation, base, containers, data-default, directory, doctest
@@ -47288,7 +47276,7 @@ self: {
        description = "Tools for automotive ECU development";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { canlib = null;};
+     }) {canlib = null;};
 
   "ed25519" = callPackage
     ({ mkDerivation, base, bytestring, hlint, QuickCheck }:
@@ -47774,7 +47762,7 @@ self: {
        description = "EIBd Client";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { eibclient = null;};
+     }) {eibclient = null;};
 
   "eigen" = callPackage
     ({ mkDerivation, base, binary, bytestring, mtl, primitive
@@ -50118,7 +50106,7 @@ self: {
        description = "A Haskell binding to a subset of libexif";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) exif;};
+     }) {inherit (pkgs) exif;};
 
   "exinst" = callPackage
     ({ mkDerivation, base, constraints, singletons }:
@@ -50992,7 +50980,7 @@ self: {
        librarySystemDepends = [ fcgi ];
        description = "A Haskell library for writing FastCGI programs";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) fcgi;};
+     }) {inherit (pkgs) fcgi;};
 
   "fastedit" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, containers
@@ -51511,7 +51499,7 @@ self: {
        description = "Compiler for the Feldspar language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gcc_s = null;};
+     }) {gcc_s = null;};
 
   "feldspar-language" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, data-default
@@ -51557,8 +51545,8 @@ self: {
        description = "Signal Processing extension for Feldspar";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { feldspar-compiler-shim = null;  imperative-edsl = null;
-          monadic-edsl-priv = null;};
+     }) {feldspar-compiler-shim = null; imperative-edsl = null; 
+         monadic-edsl-priv = null;};
 
   "fen2s" = callPackage
     ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode
@@ -51612,7 +51600,7 @@ self: {
        description = "Graph-based notetaking system";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { raptor = null;};
+     }) {raptor = null;};
 
   "fez-conf" = callPackage
     ({ mkDerivation, base, containers, regex-compat }:
@@ -51693,8 +51681,8 @@ self: {
        ];
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) ffmpeg;  libavcodec = null;
-          libavformat = null;  libswscale = null;};
+     }) {inherit (pkgs) ffmpeg; libavcodec = null; libavformat = null; 
+         libswscale = null;};
 
   "ffmpeg-tutorials" = callPackage
     ({ mkDerivation, base, bytestring, haskell98, hs-ffmpeg, SDL, stm
@@ -51731,7 +51719,7 @@ self: {
        jailbreak = true;
        description = "Bindings to the FFTW library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) fftw;  inherit (pkgs) fftwFloat;};
+     }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
 
   "fftwRaw" = callPackage
     ({ mkDerivation, base, fftw }:
@@ -51744,7 +51732,7 @@ self: {
        homepage = "https://github.com/adamwalker/haskell-fftw-simple";
        description = "Low level bindings to FFTW";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) fftw;};
+     }) {inherit (pkgs) fftw;};
 
   "fgl" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, hspec
@@ -52354,7 +52342,7 @@ self: {
        description = "A library for reading and writing data files in the FITS data format";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) cfitsio;};
+     }) {inherit (pkgs) cfitsio;};
 
   "fix-imports" = callPackage
     ({ mkDerivation, base, containers, cpphs, directory, filepath
@@ -53142,7 +53130,7 @@ self: {
        homepage = "https://github.com/MostAwesomeDude/hsfluidsynth";
        description = "Haskell bindings to FluidSynth";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) fluidsynth;};
+     }) {inherit (pkgs) fluidsynth;};
 
   "fmark" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl, process, Unixutils
@@ -53260,19 +53248,20 @@ self: {
      }) {};
 
   "foldl-transduce" = callPackage
-    ({ mkDerivation, base, bytestring, comonad, containers, doctest
-     , foldl, semigroupoids, tasty, tasty-hunit, text, transformers
+    ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
+     , doctest, foldl, semigroupoids, tasty, tasty-hunit, text
+     , transformers
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.1.0.1";
-       sha256 = "0cd71afa3ed822a01a23c9ea3ba7a4477ff75c4c2fff26d810941b3c4666e267";
+       version = "0.1.2.3";
+       sha256 = "8c24ca4a7932b83fd630475ac59a48879adbe03dda6136cc493f9ad0742d5bd5";
        libraryHaskellDepends = [
-         base bytestring comonad containers foldl semigroupoids text
-         transformers
+         base bifunctors bytestring comonad containers foldl semigroupoids
+         text transformers
        ];
        testHaskellDepends = [ base doctest foldl tasty tasty-hunit text ];
-       description = "Transducers for folds from foldl";
+       description = "Transducers for foldl folds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -53347,7 +53336,7 @@ self: {
        description = "Simple Haskell bindings for Foma";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { foma = null;};
+     }) {foma = null;};
 
   "font-opengl-basic4x6" = callPackage
     ({ mkDerivation, base, GLFW-b, OpenGL }:
@@ -53914,7 +53903,7 @@ self: {
        description = "A simple web framework";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { ghc-binary = null;};
+     }) {ghc-binary = null;};
 
   "frame-markdown" = callPackage
     ({ mkDerivation, base, frame, pandoc }:
@@ -54159,7 +54148,7 @@ self: {
        description = "Interface to the Kinect device";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { freenect = null;  freenect_sync = null;};
+     }) {freenect = null; freenect_sync = null;};
 
   "freesect" = callPackage
     ({ mkDerivation, array, base, cpphs, directory, mtl, parallel
@@ -54277,7 +54266,7 @@ self: {
        homepage = "https://github.com/RaphaelJ/friday-devil";
        description = "Uses the DevIL C library to read and write images from and to files and memory buffers";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) libdevil;};
+     }) {inherit (pkgs) libdevil;};
 
   "friendly-time" = callPackage
     ({ mkDerivation, base, hspec, old-locale, time }:
@@ -54999,7 +54988,7 @@ self: {
        description = "FWGL GHCJS backend";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { ghcjs-base = null;};
+     }) {ghcjs-base = null;};
 
   "g-npm" = callPackage
     ({ mkDerivation, base, HTTP, json }:
@@ -55186,7 +55175,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GNOME configuration database system";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs.gnome) GConf;};
+     }) {inherit (pkgs.gnome) GConf;};
 
   "gd" = callPackage
     ({ mkDerivation, base, bytestring, expat, fontconfig, freetype, gd
@@ -55202,10 +55191,10 @@ self: {
        ];
        description = "A Haskell binding to a subset of the GD graphics library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) expat;  inherit (pkgs) fontconfig;
-          inherit (pkgs) freetype;  inherit (pkgs) gd;
-          inherit (pkgs) libjpeg;  inherit (pkgs) libpng;
-          inherit (pkgs) zlib;};
+     }) {inherit (pkgs) expat; inherit (pkgs) fontconfig; 
+         inherit (pkgs) freetype; inherit (pkgs) gd; 
+         inherit (pkgs) libjpeg; inherit (pkgs) libpng; 
+         inherit (pkgs) zlib;};
 
   "gdiff" = callPackage
     ({ mkDerivation, base }:
@@ -55387,7 +55376,7 @@ self: {
        description = "Bindings to libgenders";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { genders = null;};
+     }) {genders = null;};
 
   "general-prelude" = callPackage
     ({ mkDerivation, base, lens, pointless-fun, strict, system-filepath
@@ -56862,7 +56851,7 @@ self: {
        description = "Ginsu Gale Client";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "gio" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, glib
@@ -56995,11 +56984,10 @@ self: {
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) bup;  inherit (pkgs) curl;  inherit (pkgs) git;
-          inherit (pkgs) gnupg;  inherit (pkgs) lsof;
-          inherit (pkgs) openssh;  inherit (pkgs) perl;
-          inherit (pkgs) rsync;  inherit (pkgs) wget;
-          inherit (pkgs) which;};
+     }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
+         inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
+         inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
+         inherit (pkgs) which;};
 
   "git-checklist" = callPackage
     ({ mkDerivation, base, directory, filepath, optparse-applicative
@@ -57308,7 +57296,7 @@ self: {
        homepage = "https://github.com/joeyh/github-backup";
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) git;};
+     }) {inherit (pkgs) git;};
 
   "github-post-receive" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
@@ -57672,7 +57660,7 @@ self: {
        librarySystemDepends = [ mesa ];
        description = "Complete OpenGL raw bindings";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) mesa;};
+     }) {inherit (pkgs) mesa;};
 
   "gl-capture" = callPackage
     ({ mkDerivation, base, bytestring, OpenGL }:
@@ -57699,7 +57687,7 @@ self: {
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) libglade;};
+     }) {inherit (pkgs.gnome) libglade;};
 
   "gladexml-accessor" = callPackage
     ({ mkDerivation, base, glade, HaXml, template-haskell }:
@@ -57787,7 +57775,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GLIB library for Gtk2Hs";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) glib;};
+     }) {inherit (pkgs) glib;};
 
   "glider-nlp" = callPackage
     ({ mkDerivation, base, Cabal, containers, HUnit, text }:
@@ -58124,7 +58112,7 @@ self: {
        librarySystemDepends = [ glpk ];
        description = "Comprehensive GLPK linear programming bindings";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) glpk;};
+     }) {inherit (pkgs) glpk;};
 
   "glue" = callPackage
     ({ mkDerivation, async, base, ekg-core, hashable, hspec
@@ -58235,7 +58223,7 @@ self: {
        description = "Bindings for libgnome-keyring";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gnome_keyring;};
+     }) {inherit (pkgs.gnome) gnome_keyring;};
 
   "gnomevfs" = callPackage
     ({ mkDerivation, array, base, containers, glib, gnome_vfs
@@ -58255,7 +58243,7 @@ self: {
        description = "Binding to the GNOME Virtual File System library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gnome_vfs;  gnome_vfs_module = null;};
+     }) {inherit (pkgs.gnome) gnome_vfs; gnome_vfs_module = null;};
 
   "gnuidn" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, libidn, text }:
@@ -58270,7 +58258,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-gnuidn/";
        description = "Bindings for GNU IDN";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) libidn;};
+     }) {inherit (pkgs) libidn;};
 
   "gnuplot" = callPackage
     ({ mkDerivation, array, base, containers, data-accessor
@@ -58305,7 +58293,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-gnutls/";
        description = "Bindings for GNU libgnutls";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) gnutls;};
+     }) {inherit (pkgs) gnutls;};
 
   "goa" = callPackage
     ({ mkDerivation, base, directory, filepath, process }:
@@ -58376,16 +58364,16 @@ self: {
 
   "google-cloud" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
-     , http-client-tls, http-types, mtl, scientific, stm, text, time
-     , unordered-containers
+     , http-client-tls, http-types, mtl, random, scientific, stm, text
+     , time, unordered-containers
      }:
      mkDerivation {
        pname = "google-cloud";
-       version = "0.0.2";
-       sha256 = "2c178a6f82932266e5aacced28ce146a69d4d202c855511ad993c3ce30974437";
+       version = "0.0.3";
+       sha256 = "16462026bc546cf51d453524ce0aae735bdc84f4d0d1f276ccc6606e41b8655f";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls http-types mtl
-         scientific stm text time unordered-containers
+         random scientific stm text time unordered-containers
        ];
        description = "Client for the Google Cloud APIs";
        license = stdenv.lib.licenses.mit;
@@ -59668,7 +59656,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-gsasl/";
        description = "Bindings for GNU libgsasl";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) gsasl;};
+     }) {inherit (pkgs) gsasl;};
 
   "gsc-weighting" = callPackage
     ({ mkDerivation, base, hierarchical-clustering }:
@@ -59746,7 +59734,7 @@ self: {
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) gst_plugins_base;  inherit (pkgs) gstreamer;};
+     }) {inherit (pkgs) gst_plugins_base; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
     ({ mkDerivation, base, containers, extensible-exceptions, haskeline
@@ -59798,7 +59786,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs.gnome) gtk;};
+     }) {inherit (pkgs.gnome) gtk;};
 
   "gtk-helpers" = callPackage
     ({ mkDerivation, array, base, gio, glib, gtk, mtl, process
@@ -59859,7 +59847,7 @@ self: {
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gtk-mac-integration-gtk2 = null;};
+     }) {gtk-mac-integration-gtk2 = null;};
 
   "gtk-serialized-event" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk, haskell98, mtl
@@ -59926,7 +59914,7 @@ self: {
        homepage = "http://github.com/travitch/gtk-traymanager";
        description = "A wrapper around the eggtraymanager library for Linux system trays";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) x11;};
+     }) {inherit (pkgs) x11;};
 
   "gtk2hs-buildtools" = callPackage
     ({ mkDerivation, alex, array, base, containers, directory, filepath
@@ -60100,7 +60088,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { gtk3 = null;};
+     }) {inherit (pkgs) gtk3;};
 
   "gtk3-mac-integration" = callPackage
     ({ mkDerivation, array, base, containers, glib
@@ -60117,7 +60105,7 @@ self: {
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gtk-mac-integration-gtk3 = null;};
+     }) {gtk-mac-integration-gtk3 = null;};
 
   "gtkglext" = callPackage
     ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, gtkglext
@@ -60135,7 +60123,7 @@ self: {
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gtkglext;};
+     }) {inherit (pkgs.gnome) gtkglext;};
 
   "gtkimageview" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk
@@ -60155,7 +60143,7 @@ self: {
        description = "Binding to the GtkImageView library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) gtkimageview;};
+     }) {inherit (pkgs) gtkimageview;};
 
   "gtkrsync" = callPackage
     ({ mkDerivation, base, gconf, glade, gtk, MissingH, process
@@ -60192,7 +60180,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs.gnome) gtksourceview;};
+     }) {inherit (pkgs.gnome) gtksourceview;};
 
   "gtksourceview3" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk2hs-buildtools
@@ -60210,7 +60198,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs.gnome) gtksourceview;};
+     }) {inherit (pkgs.gnome) gtksourceview;};
 
   "guarded-rewriting" = callPackage
     ({ mkDerivation, base, instant-generics }:
@@ -60387,7 +60375,7 @@ self: {
        description = "An FFI binding to CMU/Long's BDD library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { bdd = null;  mem = null;};
+     }) {bdd = null; mem = null;};
 
   "hBDD-CUDD" = callPackage
     ({ mkDerivation, base, c2hs, containers, cudd, deepseq, epd, hBDD
@@ -60403,8 +60391,8 @@ self: {
        description = "An FFI binding to the CUDD library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cudd = null;  epd = null;  inherit (pkgs) mtr;
-          inherit (pkgs) st;  util = null;};
+     }) {cudd = null; epd = null; inherit (pkgs) mtr; 
+         inherit (pkgs) st; util = null;};
 
   "hCsound" = callPackage
     ({ mkDerivation, base, c2hs, csound64, libsndfile, monads-tf
@@ -60421,7 +60409,7 @@ self: {
        description = "interface to CSound API";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { csound64 = null;  inherit (pkgs) libsndfile;};
+     }) {csound64 = null; inherit (pkgs) libsndfile;};
 
   "hDFA" = callPackage
     ({ mkDerivation, base, containers, directory, process }:
@@ -60486,7 +60474,7 @@ self: {
        description = "A library for analyzing and transforming LLVM (3.5) assembly codes";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { hooplext = null;};
+     }) {hooplext = null;};
 
   "hMollom" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Crypto
@@ -60717,7 +60705,7 @@ self: {
        description = "Optimal variable selection in chain graphical model";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) blas;  lapack = null;};
+     }) {inherit (pkgs) blas; lapack = null;};
 
   "hXmixer" = callPackage
     ({ mkDerivation, base, directory, gtk3, process, split, text }:
@@ -60893,7 +60881,7 @@ self: {
        description = "Hack EvHTTP (libevent) Handler";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { event = null;};
+     }) {event = null;};
 
   "hack-handler-fastcgi" = callPackage
     ({ mkDerivation, base, bytestring, fcgi, hack, hack-handler-cgi }:
@@ -60908,7 +60896,7 @@ self: {
        description = "Hack handler direct to fastcgi (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) fcgi;};
+     }) {inherit (pkgs) fcgi;};
 
   "hack-handler-happstack" = callPackage
     ({ mkDerivation, base, bytestring, cgi, containers, data-default
@@ -61705,7 +61693,7 @@ self: {
        homepage = "http://github.com/jystic/hadoop-formats";
        description = "Read/write file formats commonly used by Hadoop";
        license = stdenv.lib.licenses.asl20;
-     }) { inherit (pkgs) snappy;};
+     }) {inherit (pkgs) snappy;};
 
   "hadoop-rpc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, exceptions
@@ -61892,7 +61880,7 @@ self: {
        description = "Multi-app web platform framework";
        license = stdenv.lib.licenses.mit;
        broken = true;
-     }) { quickcheck-lio-instances = null;};
+     }) {quickcheck-lio-instances = null;};
 
   "hails-bin" = callPackage
     ({ mkDerivation, base, bson, bytestring, containers, ghc-paths
@@ -62600,7 +62588,7 @@ self: {
        description = "Driver for real ethernet devices for HaNS";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { pfq = null;};
+     }) {pfq = null;};
 
   "hapistrano" = callPackage
     ({ mkDerivation, base, base-compat, directory, either, filepath
@@ -62647,7 +62635,7 @@ self: {
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { appindicator = null;};
+     }) {appindicator = null;};
 
   "happindicator3" = callPackage
     ({ mkDerivation, appindicator, base, glib, gtk3, text }:
@@ -62665,7 +62653,7 @@ self: {
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { appindicator = null;};
+     }) {appindicator = null;};
 
   "happraise" = callPackage
     ({ mkDerivation, base, directory, filepath }:
@@ -63207,7 +63195,7 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "extend happstack-server with https:// support (TLS/SSL)";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "happstack-server-tls-cryptonite" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
@@ -63434,7 +63422,7 @@ self: {
        description = "Networked content addressed backup and restore software";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;  inherit (pkgs) sqlite;};
+     }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;};
 
   "hark" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, haskell98
@@ -63494,7 +63482,7 @@ self: {
        libraryPkgconfigDepends = [ groonga ];
        description = "Low level bindings for Groonga";
        license = stdenv.lib.licenses.lgpl21;
-     }) { groonga = null;};
+     }) {groonga = null;};
 
   "haroonga-httpd" = callPackage
     ({ mkDerivation, base, directory, haroonga, http-types, old-locale
@@ -63953,7 +63941,7 @@ self: {
        homepage = "http://github.com/cosbynator/haskakafka";
        description = "Kafka bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) rdkafka;};
+     }) {inherit (pkgs) rdkafka;};
 
   "haskanoid" = callPackage
     ({ mkDerivation, base, freenect, hcwiid, IfElse, MissingH, mtl, SDL
@@ -64421,7 +64409,7 @@ self: {
        homepage = "http://github.com/bjpop/haskell-mpi";
        description = "Distributed parallel programming in Haskell using MPI";
        license = stdenv.lib.licenses.bsd3;
-     }) { open-pal = null;  open-rte = null;  inherit (pkgs) openmpi;};
+     }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;};
 
   "haskell-names" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
@@ -64597,7 +64585,7 @@ self: {
        homepage = "https://github.com/jamessanders/haskell-qrencode";
        description = "Haskell bindings for libqrencode";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) qrencode;};
+     }) {inherit (pkgs) qrencode;};
 
   "haskell-reflect" = callPackage
     ({ mkDerivation, base, containers, hint, MonadCatchIO-mtl, mtl
@@ -65106,7 +65094,7 @@ self: {
        description = "HaskellDB support for the HDBC PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) postgresql;};
+     }) {inherit (pkgs) postgresql;};
 
   "haskelldb-hdbc-sqlite3" = callPackage
     ({ mkDerivation, base, haskelldb, haskelldb-hdbc, HDBC
@@ -65199,7 +65187,7 @@ self: {
        description = "HaskellDB support for the HSQL Oracle driver";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { hsql-oracle = null;};
+     }) {hsql-oracle = null;};
 
   "haskelldb-hsql-postgresql" = callPackage
     ({ mkDerivation, base, haskelldb, haskelldb-hsql, hsql
@@ -65239,7 +65227,7 @@ self: {
        description = "HaskellDB support for the HSQL SQLite driver";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { hsql-sqlite = null;};
+     }) {hsql-sqlite = null;};
 
   "haskelldb-hsql-sqlite3" = callPackage
     ({ mkDerivation, base, haskelldb, haskelldb-hsql, hsql
@@ -65847,7 +65835,7 @@ self: {
        homepage = "https://github.com/otters/haspell";
        description = "Haskell bindings to aspell";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) aspell;};
+     }) {inherit (pkgs) aspell;};
 
   "hasql" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, either
@@ -66047,7 +66035,7 @@ self: {
        description = "A port of blaze-markup and blaze-html to Haste";
        license = stdenv.lib.licenses.mit;
        broken = true;
-     }) { haste-lib = null;};
+     }) {haste-lib = null;};
 
   "haste-perch" = callPackage
     ({ mkDerivation, base, haste-compiler, transformers }:
@@ -66341,7 +66329,7 @@ self: {
        description = "Haskell bindings for the C Wayland library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) mesa;  inherit (pkgs) wayland;};
+     }) {inherit (pkgs) mesa; inherit (pkgs) wayland;};
 
   "hayoo-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
@@ -66464,12 +66452,12 @@ self: {
        executableHaskellDepends = [
          base containers mtl old-time OpenGL SDL SDL-mixer
        ];
-       executableSystemDepends = [ SDL SDL_mixer ];
+       executableSystemDepends = [ SDL_mixer ];
        homepage = "http://www.dockerz.net/software/hbeat.html";
        description = "A simple step sequencer GUI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) SDL;  inherit (pkgs) SDL_mixer;};
+     }) {inherit (pkgs) SDL_mixer;};
 
   "hblas" = callPackage
     ({ mkDerivation, base, blas, HUnit, lapack, primitive
@@ -66487,7 +66475,7 @@ self: {
        description = "Human friendly BLAS and Lapack bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) blas;  lapack = null;};
+     }) {inherit (pkgs) blas; lapack = null;};
 
   "hblock" = callPackage
     ({ mkDerivation, aeson, base, blaze-markup, bytestring, cereal
@@ -66722,7 +66710,7 @@ self: {
        description = "Library to interface with the wiimote";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { bluetooth = null;  cwiid = null;};
+     }) {bluetooth = null; cwiid = null;};
 
   "hdaemonize" = callPackage
     ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog
@@ -67019,7 +67007,7 @@ self: {
        description = "Haskell bindings to the Discount markdown library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { markdown = null;};
+     }) {markdown = null;};
 
   "hdm" = callPackage
     ({ mkDerivation, base, directory, process, unix, vty }:
@@ -67426,8 +67414,8 @@ self: {
        description = "New Relic® agent SDK wrapper for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { newrelic-collector-client = null;  newrelic-common = null;
-          newrelic-transaction = null;};
+     }) {newrelic-collector-client = null; newrelic-common = null; 
+         newrelic-transaction = null;};
 
   "helics-wai" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, helics
@@ -67694,7 +67682,7 @@ self: {
        description = "Haskell bindings to Xen hypervisor interface";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { xenctrl = null;};
+     }) {xenctrl = null;};
 
   "henet" = callPackage
     ({ mkDerivation, base, bitset, bytestring, network, typesafe-endian
@@ -67964,7 +67952,7 @@ self: {
        description = "Text Tetris";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "heukarya" = callPackage
     ({ mkDerivation, base, containers, deepseq, parallel, random, text
@@ -68247,7 +68235,7 @@ self: {
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { doublefann = null;  fann = null;};
+     }) {doublefann = null; fann = null;};
 
   "hfd" = callPackage
     ({ mkDerivation, base, bytestring, haskeline, iteratee, MissingH
@@ -68567,7 +68555,7 @@ self: {
        description = "Various animations generated using HGL";
        license = "GPL";
        broken = true;
-     }) { HTam = null;};
+     }) {HTam = null;};
 
   "hgom" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, mtl, parsec
@@ -68613,7 +68601,7 @@ self: {
        description = "Binding to libharp";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { harp = null;};
+     }) {harp = null;};
 
   "hi" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory
@@ -68693,7 +68681,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Interface to hidapi library";
        license = stdenv.lib.licenses.bsd3;
-     }) { hidapi-libusb = null;};
+     }) {hidapi-libusb = null;};
 
   "hidapi" = callPackage
     ({ mkDerivation, base, bytestring, deepseq-generics, systemd }:
@@ -68706,7 +68694,7 @@ self: {
        homepage = "https://github.com/vahokif/haskell-hidapi";
        description = "Haskell bindings to HIDAPI";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) systemd;};
+     }) {inherit (pkgs) systemd;};
 
   "hieraclus" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, multiset }:
@@ -68995,7 +68983,7 @@ self: {
        description = "Haskell Graphical User Interface for Emerge";
        license = "GPL";
        broken = true;
-     }) { mozembed = null;};
+     }) {mozembed = null;};
 
   "himg" = callPackage
     ({ mkDerivation, base, bytestring, directory, gtk, HTTP
@@ -69765,7 +69753,7 @@ self: {
        description = "Haskell binding to L-BFGS-B version 3.0";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) gfortran;};
+     }) {inherit (pkgs) gfortran;};
 
   "hlcm" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-csv
@@ -69993,7 +69981,7 @@ self: {
        homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF";
        description = "Haskell binding to libBladeRF SDR library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) libbladeRF;};
+     }) {inherit (pkgs) libbladeRF;};
 
   "hlibev" = callPackage
     ({ mkDerivation, base, ev, network }:
@@ -70007,7 +69995,7 @@ self: {
        description = "FFI interface to libev";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ev = null;};
+     }) {ev = null;};
 
   "hlibfam" = callPackage
     ({ mkDerivation, base, fam }:
@@ -70020,7 +70008,7 @@ self: {
        description = "FFI interface to libFAM";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) fam;};
+     }) {inherit (pkgs) fam;};
 
   "hlibgit2" = callPackage
     ({ mkDerivation, base, bindings-DSL, openssl, process, zlib }:
@@ -70033,7 +70021,7 @@ self: {
        testHaskellDepends = [ base process ];
        description = "Low-level bindings to libgit2";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "hlibsass" = callPackage
     ({ mkDerivation, base, hspec, libsass }:
@@ -70048,7 +70036,7 @@ self: {
        homepage = "https://github.com/jakubfijalkowski/hlibsass";
        description = "Low-level bindings to Libsass";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) libsass;};
+     }) {inherit (pkgs) libsass;};
 
   "hlint" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
@@ -70198,7 +70186,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numeric Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) blas;  lapack = null;};
+     }) {inherit (pkgs) blas; lapack = null;};
 
   "hmatrix-banded" = callPackage
     ({ mkDerivation, base, hmatrix, lapack, transformers }:
@@ -70213,7 +70201,7 @@ self: {
        description = "HMatrix interface to LAPACK functions for banded matrices";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { lapack = null;};
+     }) {lapack = null;};
 
   "hmatrix-csv" = callPackage
     ({ mkDerivation, base, bytestring, cassava, hmatrix, vector }:
@@ -70238,7 +70226,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Linear Programming based on GLPK";
        license = "GPL";
-     }) { inherit (pkgs) glpk;};
+     }) {inherit (pkgs) glpk;};
 
   "hmatrix-gsl" = callPackage
     ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector
@@ -70254,7 +70242,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numerical computation";
        license = "GPL";
-     }) { inherit (pkgs) gsl;};
+     }) {inherit (pkgs) gsl;};
 
   "hmatrix-gsl-stats" = callPackage
     ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex }:
@@ -70268,7 +70256,7 @@ self: {
        description = "GSL Statistics interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) gsl;};
+     }) {inherit (pkgs) gsl;};
 
   "hmatrix-mmap" = callPackage
     ({ mkDerivation, base, hmatrix, mmap }:
@@ -70307,7 +70295,7 @@ self: {
        description = "Bindings to the QuadProg++ quadratic programming library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { QuadProgpp = null;};
+     }) {QuadProgpp = null;};
 
   "hmatrix-repa" = callPackage
     ({ mkDerivation, base, hmatrix, repa, vector }:
@@ -70560,7 +70548,7 @@ self: {
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "hmpfr" = callPackage
     ({ mkDerivation, base, integer-gmp, mpfr }:
@@ -70574,7 +70562,7 @@ self: {
        description = "Haskell binding to the MPFR library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) mpfr;};
+     }) {inherit (pkgs) mpfr;};
 
   "hmt" = callPackage
     ({ mkDerivation, array, base, bytestring, colour, containers
@@ -70662,7 +70650,7 @@ self: {
        homepage = "https://github.com/ian-ross/hnetcdf";
        description = "Haskell NetCDF library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) netcdf;};
+     }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, containers, data-fix
@@ -70922,13 +70910,12 @@ self: {
        libraryHaskellDepends = [ base cgen ];
        librarySystemDepends = [ OgreMain ];
        libraryPkgconfigDepends = [ OGRE ];
-       libraryToolDepends = [ cgen cgen-hs grgen ];
+       libraryToolDepends = [ cgen-hs grgen ];
        homepage = "http://anttisalonen.github.com/hogre";
        description = "Haskell binding to a subset of OGRE";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OGRE = null;  OgreMain = null;  cgen-hs = null;
-          grgen = null;};
+     }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;};
 
   "hogre-examples" = callPackage
     ({ mkDerivation, base, hogre, OgreMain }:
@@ -70944,7 +70931,7 @@ self: {
        description = "Examples for using Hogre";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OgreMain = null;};
+     }) {OgreMain = null;};
 
   "hois" = callPackage
     ({ mkDerivation, base, OIS, X11 }:
@@ -70961,7 +70948,7 @@ self: {
        description = "OIS bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OIS = null;};
+     }) {OIS = null;};
 
   "hoist-error" = callPackage
     ({ mkDerivation, base, either, mtl }:
@@ -71124,7 +71111,7 @@ self: {
        description = "OpenNI 2 binding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OpenNI2 = null;  freenect = null;};
+     }) {OpenNI2 = null; freenect = null;};
 
   "honk" = callPackage
     ({ mkDerivation, base }:
@@ -71283,7 +71270,7 @@ self: {
        description = "Core library for hoodle";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs.xlibs) libXi;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXi;};
 
   "hoodle-extra" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
@@ -71523,7 +71510,7 @@ self: {
        description = "Haskell binding to libopencc";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { opencc = null;};
+     }) {opencc = null;};
 
   "hopencl" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, HUnit, OpenCL, QuickCheck
@@ -71544,7 +71531,7 @@ self: {
        description = "Haskell bindings for OpenCL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OpenCL = null;};
+     }) {OpenCL = null;};
 
   "hopenpgp-tools" = callPackage
     ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
@@ -71586,7 +71573,7 @@ self: {
        homepage = "http://github.com/peti/hopenssl";
        description = "FFI bindings to OpenSSL's EVP digest interface";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "hopfield" = callPackage
     ({ mkDerivation, array, base, deepseq, directory, erf
@@ -71619,7 +71606,7 @@ self: {
        description = "Hopfield Networks, Boltzmann Machines and Clusters";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { MagickCore = null;  inherit (pkgs) imagemagick;};
+     }) {MagickCore = null; inherit (pkgs) imagemagick;};
 
   "hopfield-networks" = callPackage
     ({ mkDerivation, base, matrix, MonadRandom, QuickCheck, split
@@ -71750,7 +71737,7 @@ self: {
        description = "Haskell Open Sound Control Utilities";
        license = "GPL";
        broken = true;
-     }) { www-minus = null;};
+     }) {www-minus = null;};
 
   "hostname" = callPackage
     ({ mkDerivation, base }:
@@ -71895,7 +71882,7 @@ self: {
        description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) freeglut;  inherit (pkgs) mesa;};
+     }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "hp2any-manager" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers
@@ -72049,7 +72036,7 @@ self: {
        description = "Binding for the PAPI library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { papi = null;};
+     }) {papi = null;};
 
   "hpaste" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
@@ -72254,7 +72241,7 @@ self: {
        homepage = "https://github.com/scrive/hpqtypes";
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) postgresql;};
+     }) {inherit (pkgs) postgresql;};
 
   "hprotoc" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
@@ -72529,7 +72516,7 @@ self: {
        jailbreak = true;
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) ruby;};
+     }) {inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, GeoIP }:
@@ -72543,7 +72530,7 @@ self: {
        description = "Haskell bindings to the MaxMind GeoIPCity database via the C library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { GeoIP = null;};
+     }) {GeoIP = null;};
 
   "hs-bibutils" = callPackage
     ({ mkDerivation, base, syb }:
@@ -72576,7 +72563,7 @@ self: {
        homepage = "https://github.com/tsuraan/hs-blake2";
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
-     }) { b2 = null;};
+     }) {b2 = null;};
 
   "hs-captcha" = callPackage
     ({ mkDerivation, base, bytestring, gd, random }:
@@ -72648,7 +72635,7 @@ self: {
        description = "Pragmatic .NET interop for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ole32 = null;  oleaut32 = null;};
+     }) {ole32 = null; oleaut32 = null;};
 
   "hs-duktape" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
@@ -72713,7 +72700,7 @@ self: {
        description = "Binding to GUI library FLTK";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { fltk = null;  fltk_images = null;};
+     }) {fltk = null; fltk_images = null;};
 
   "hs-gchart" = callPackage
     ({ mkDerivation, base, mtl }:
@@ -72860,7 +72847,7 @@ self: {
        ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) mesos;  inherit (pkgs) protobuf;};
+     }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;};
 
   "hs-nombre-generator" = callPackage
     ({ mkDerivation, base, HandsomeSoup, hxt, random }:
@@ -73128,7 +73115,7 @@ self: {
        description = "FFI bindings to the Xen Control library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { xenctrl = null;};
+     }) {xenctrl = null;};
 
   "hsass" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, filepath
@@ -73640,8 +73627,7 @@ self: {
        description = "Haskell bindings to IIDC1394 cameras, via Camwire";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { camwire_1394 = null;  dc1394_control = null;
-          raw1394 = null;};
+     }) {camwire_1394 = null; dc1394_control = null; raw1394 = null;};
 
   "hscassandra" = callPackage
     ({ mkDerivation, base, bytestring, cassandra-thrift, containers
@@ -73809,8 +73795,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.4.2";
-       sha256 = "da33782330de5980bf2bbad7b3c5e18751c5b8ee7358652c55a88a09aea857d0";
+       version = "0.1.4.3";
+       sha256 = "66c1bf834bfff8030533f056bb57d4fc4a61d1698ea10c217c9841d2b13aa9ad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73872,7 +73858,7 @@ self: {
        homepage = "http://github.com/peti/hsdns";
        description = "Asynchronous DNS Resolver";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) adns;};
+     }) {inherit (pkgs) adns;};
 
   "hsdns-cache" = callPackage
     ({ mkDerivation, base, hsdns, network, SafeSemaphore, text, time
@@ -74068,7 +74054,7 @@ self: {
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gcrypt = null;  inherit (pkgs) gnutls;};
+     }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgnutls-yj" = callPackage
     ({ mkDerivation, base, bytestring, gcrypt, gnutls, mtl, old-time }:
@@ -74082,7 +74068,7 @@ self: {
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gcrypt = null;  inherit (pkgs) gnutls;};
+     }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgsom" = callPackage
     ({ mkDerivation, base, containers, random, stm, time }:
@@ -74145,7 +74131,7 @@ self: {
        description = "Signal processing and EEG data analysis";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) blas;  inherit (pkgs) gsl;  lapack = null;};
+     }) {inherit (pkgs) blas; inherit (pkgs) gsl; lapack = null;};
 
   "hsilop" = callPackage
     ({ mkDerivation, base, haskeline }:
@@ -74242,7 +74228,7 @@ self: {
        description = "A FFI binding to libsvm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { svm = null;};
+     }) {svm = null;};
 
   "hslinks" = callPackage
     ({ mkDerivation, base, Cabal, hint, MemoTrie, process, regex-compat
@@ -74348,7 +74334,7 @@ self: {
        ];
        description = "A Lua language interpreter embedding in Haskell";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) lua;};
+     }) {inherit (pkgs) lua;};
 
   "hsmagick" = callPackage
     ({ mkDerivation, base, bytestring, bzip2, directory, filepath
@@ -74372,11 +74358,11 @@ self: {
        description = "FFI bindings for the GraphicsMagick library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { GraphicsMagick = null;  inherit (pkgs) bzip2;
-          freetype2 = null;  inherit (pkgs) jasper;  inherit (pkgs) lcms;
-          inherit (pkgs) libjpeg;  inherit (pkgs) libpng;
-          inherit (pkgs) libxml2;  tiff = null;  wmflite = null;
-          inherit (pkgs) zlib;};
+     }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; 
+         inherit (pkgs) jasper; inherit (pkgs) lcms; 
+         inherit (pkgs) libjpeg; inherit (pkgs) libpng; 
+         inherit (pkgs) libxml2; tiff = null; wmflite = null; 
+         inherit (pkgs) zlib;};
 
   "hsmisc" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec
@@ -74420,7 +74406,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) libsndfile;};
+     }) {inherit (pkgs) libsndfile;};
 
   "hsndfile-storablevector" = callPackage
     ({ mkDerivation, base, hsndfile, storablevector }:
@@ -74961,6 +74947,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hspec-structured-formatter" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "hspec-structured-formatter";
+       version = "0.1.0.1";
+       sha256 = "f670ea9a7b936ba3f22b19e00f2d19b58b58936e916b21e137a6ff3d4b868195";
+       libraryHaskellDepends = [ base hspec ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hspec-test-framework" = callPackage
     ({ mkDerivation, base, hspec, hspec-contrib, hspec-core, HUnit
      , QuickCheck
@@ -75171,7 +75167,7 @@ self: {
        description = "MySQL driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { mysqlclient = null;};
+     }) {mysqlclient = null;};
 
   "hsql-odbc" = callPackage
     ({ mkDerivation, base, hsql, old-time, unixODBC }:
@@ -75183,7 +75179,7 @@ self: {
        librarySystemDepends = [ unixODBC ];
        description = "A Haskell Interface to ODBC";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) unixODBC;};
+     }) {inherit (pkgs) unixODBC;};
 
   "hsql-postgresql" = callPackage
     ({ mkDerivation, base, hsql, old-time, postgresql }:
@@ -75195,7 +75191,7 @@ self: {
        librarySystemDepends = [ postgresql ];
        description = "A Haskell Interface to PostgreSQL via the PQ library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) postgresql;};
+     }) {inherit (pkgs) postgresql;};
 
   "hsql-sqlite3" = callPackage
     ({ mkDerivation, base, hsql, sqlite }:
@@ -75207,7 +75203,7 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "SQLite3 driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) sqlite;};
+     }) {inherit (pkgs) sqlite;};
 
   "hsqml" = callPackage
     ({ mkDerivation, base, c2hs, containers, directory, filepath, qt5
@@ -75229,7 +75225,7 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
-     }) { qt5 = null;};
+     }) {qt5 = null;};
 
   "hsqml-datamodel" = callPackage
     ({ mkDerivation, base, hsqml, qt5, template-haskell, text }:
@@ -75243,7 +75239,7 @@ self: {
        description = "HsQML (Qt5) data model";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { qt5 = null;};
+     }) {qt5 = null;};
 
   "hsqml-datamodel-vinyl" = callPackage
     ({ mkDerivation, base, exceptions, hsqml-datamodel, type-list
@@ -75636,8 +75632,8 @@ self: {
        description = "embedding prolog in haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ncurses;  inherit (pkgs) readline;
-          swipl = null;};
+     }) {inherit (pkgs) ncurses; inherit (pkgs) readline; 
+         swipl = null;};
 
   "hsx" = callPackage
     ({ mkDerivation, base, haskell-src-exts, mtl, utf8-string }:
@@ -75741,7 +75737,7 @@ self: {
        description = "Simple libzephyr bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { com_err = null;  zephyr = null;};
+     }) {com_err = null; zephyr = null;};
 
   "htags" = callPackage
     ({ mkDerivation, base, directory, filepath, haskell-src, mtl }:
@@ -76923,7 +76919,7 @@ self: {
        description = "Support library for Hubris, the Ruby <=> Haskell bridge";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ruby;};
+     }) {inherit (pkgs) ruby;};
 
   "huffman" = callPackage
     ({ mkDerivation, base, containers, fingertree }:
@@ -77185,7 +77181,7 @@ self: {
        description = "A Command line Interface for the Hunt server";
        license = stdenv.lib.licenses.mit;
        broken = true;
-     }) { hunt-client = null;};
+     }) {hunt-client = null;};
 
   "hurdle" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, kangaroo }:
@@ -77855,7 +77851,7 @@ self: {
        description = "Haskell binding to the Sixense SDK for the Razer Hydra";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { sixense_x64 = null;};
+     }) {sixense_x64 = null;};
 
   "hydra-print" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
@@ -78300,7 +78296,7 @@ self: {
        homepage = "http://github.com/dgvncsz0f/hzk";
        description = "Haskell client library for Apache Zookeeper";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) zookeeper_mt;};
+     }) {inherit (pkgs) zookeeper_mt;};
 
   "hzulip" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, conduit
@@ -78825,7 +78821,7 @@ self: {
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ige-mac-integration = null;};
+     }) {ige-mac-integration = null;};
 
   "ignore" = callPackage
     ({ mkDerivation, base, directory, Glob, HTF, mtl, path, pcre-heavy
@@ -78864,7 +78860,7 @@ self: {
        description = "Bindings to the igraph C library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { igraph = null;};
+     }) {igraph = null;};
 
   "igrf" = callPackage
     ({ mkDerivation, ad, base, polynomial }:
@@ -79217,15 +79213,17 @@ self: {
          text transformers vector
        ];
        libraryPkgconfigDepends = [ imagemagick ];
+       executablePkgconfigDepends = [ imagemagick ];
        testHaskellDepends = [
          base bytestring directory HUnit lifted-base QuickCheck resourcet
          system-filepath test-framework test-framework-hunit
          test-framework-quickcheck2 text transformers vector
        ];
+       testPkgconfigDepends = [ imagemagick ];
        jailbreak = true;
        description = "bindings to imagemagick library";
        license = "unknown";
-     }) { inherit (pkgs) imagemagick;};
+     }) {inherit (pkgs) imagemagick;};
 
   "imagepaste" = callPackage
     ({ mkDerivation, base, containers, HTTP, json, mtl, network
@@ -80010,7 +80008,7 @@ self: {
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) gsl;  gslcblas = null;};
+     }) {inherit (pkgs) gsl; gslcblas = null;};
 
   "inline-c-cpp" = callPackage
     ({ mkDerivation, base, inline-c, template-haskell }:
@@ -80053,7 +80051,7 @@ self: {
        description = "Console client for encyclopedias";
        license = stdenv.lib.licenses.gpl3;
        broken = true;
-     }) { aether = null;};
+     }) {aether = null;};
 
   "inserts" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, dlist }:
@@ -80268,7 +80266,7 @@ self: {
        description = "Hardware accelerated AES encryption and Random Number Generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { intel_aes = null;};
+     }) {intel_aes = null;};
 
   "interchangeable" = callPackage
     ({ mkDerivation, base, containers }:
@@ -80850,7 +80848,7 @@ self: {
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ipopt;  nlopt = null;};
+     }) {inherit (pkgs) ipopt; nlopt = null;};
 
   "ipprint" = callPackage
     ({ mkDerivation, base, Extra, haskell-src }:
@@ -81416,7 +81414,7 @@ self: {
        description = "Iteratee-based IO with pipe operators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) zlib;};
+     }) {inherit (pkgs) zlib;};
 
   "iterable" = callPackage
     ({ mkDerivation, base, mtl, tagged, template-haskell, vector }:
@@ -81469,7 +81467,7 @@ self: {
        description = "Enumeratees for compressing and decompressing streams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) bzip2;  inherit (pkgs) zlib;};
+     }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;};
 
   "iteratee-mtl" = callPackage
     ({ mkDerivation, base, bytestring, containers, ListLike
@@ -81870,7 +81868,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/JACK";
        description = "Bindings for the JACK Audio Connection Kit";
        license = "GPL";
-     }) { inherit (pkgs) libjack2;};
+     }) {inherit (pkgs) libjack2;};
 
   "jack-bindings" = callPackage
     ({ mkDerivation, base, c2hs, libjack2, mtl }:
@@ -81884,7 +81882,7 @@ self: {
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libjack2;};
+     }) {inherit (pkgs) libjack2;};
 
   "jackminimix" = callPackage
     ({ mkDerivation, base, hosc }:
@@ -81982,7 +81980,7 @@ self: {
        description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) blas;  cblas = null;  lapacke = null;};
+     }) {inherit (pkgs) blas; cblas = null; lapacke = null;};
 
   "jammittools" = callPackage
     ({ mkDerivation, base, boxes, bytestring, conduit, conduit-audio
@@ -82742,7 +82740,7 @@ self: {
        homepage = "http://stewart.guru";
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) python;};
+     }) {inherit (pkgs) python;};
 
   "json-qq" = callPackage
     ({ mkDerivation, base, haskell-src-meta, parsec, template-haskell
@@ -83140,7 +83138,7 @@ self: {
        description = "Fast, scalable, mutable dynamic arrays, maps and hashes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { Judy = null;};
+     }) {Judy = null;};
 
   "jukebox" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
@@ -84248,7 +84246,7 @@ self: {
        description = "Utilities for working with many HStringTemplate templates from files";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { string-templates = null;};
+     }) {string-templates = null;};
 
   "koofr-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, filepath, http-client
@@ -84360,7 +84358,7 @@ self: {
        homepage = "https://github.com/corngood/ktx";
        description = "A binding for libktx from Khronos";
        license = stdenv.lib.licenses.mit;
-     }) { egl = null;  inherit (pkgs) glew;};
+     }) {egl = null; inherit (pkgs) glew;};
 
   "kure" = callPackage
     ({ mkDerivation, base, dlist, transformers }:
@@ -84398,7 +84396,7 @@ self: {
        librarySystemDepends = [ kyotocabinet ];
        description = "Mid level bindings to Kyoto Cabinet";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) kyotocabinet;};
+     }) {inherit (pkgs) kyotocabinet;};
 
   "l-bfgs-b" = callPackage
     ({ mkDerivation, base, lbfgsb, vector }:
@@ -84412,7 +84410,7 @@ self: {
        description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { lbfgsb = null;};
+     }) {lbfgsb = null;};
 
   "labeled-graph" = callPackage
     ({ mkDerivation, base, labeled-tree }:
@@ -86487,8 +86485,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.15.0.8";
-       sha256 = "4367cdcbec1066dc0ef3c171f4345a495e67b68016cc90d2bceee652162b743f";
+       version = "0.15.0.9";
+       sha256 = "78f2ee49b1a06fa12de242a35a9eeaaf3e8b90d7af8bffef3e1b20561826abe5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86792,8 +86790,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "0.1.3.1";
-       sha256 = "e2896c1256fda0fc85401c632ae4ca9e822f4846dc38bebd6aaee898e4e4f2a7";
+       version = "0.1.4.1";
+       sha256 = "b192640f9f02da76f36b03efa7e19fe6ed025b0b987e9ede0b1c3b44f9140bbd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -86847,7 +86845,7 @@ self: {
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) leveldb;};
+     }) {inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
     ({ mkDerivation, async, base, bytestring, data-default, filepath
@@ -86875,7 +86873,7 @@ self: {
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) leveldb;};
+     }) {inherit (pkgs) leveldb;};
 
   "levmar" = callPackage
     ({ mkDerivation, base, bindings-levmar, hmatrix, vector }:
@@ -87127,7 +87125,7 @@ self: {
        librarySystemDepends = [ archive ];
        description = "Read many archive formats with libarchive and conduit";
        license = stdenv.lib.licenses.bsd3;
-     }) { archive = null;};
+     }) {archive = null;};
 
   "libconfig" = callPackage
     ({ mkDerivation, base, binary, c2hs, cereal, cereal-text, config
@@ -87148,7 +87146,7 @@ self: {
        homepage = "https://github.com/peddie/libconfig-haskell";
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
-     }) { config = null;};
+     }) {config = null;};
 
   "libcspm" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
@@ -87184,7 +87182,7 @@ self: {
        description = "Library for interacting with console applications via pseudoterminals";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) expect;  inherit (pkgs) tcl;};
+     }) {inherit (pkgs) expect; inherit (pkgs) tcl;};
 
   "libffi" = callPackage
     ({ mkDerivation, base, bytestring, ffi, libffi }:
@@ -87197,7 +87195,7 @@ self: {
        libraryPkgconfigDepends = [ libffi ];
        description = "A binding to libffi";
        license = stdenv.lib.licenses.bsd3;
-     }) { ffi = null;  inherit (pkgs) libffi;};
+     }) {ffi = null; inherit (pkgs) libffi;};
 
   "libgit" = callPackage
     ({ mkDerivation, base, mtl, process }:
@@ -87370,7 +87368,7 @@ self: {
        librarySystemDepends = [ libnotify ];
        description = "Bindings to libnotify library";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) libnotify;};
+     }) {inherit (pkgs) libnotify;};
 
   "libnvvm" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, HUnit, nvvm
@@ -87389,7 +87387,7 @@ self: {
        homepage = "https://github.com/nvidia-compiler-sdk/hsnvvm";
        description = "FFI binding to libNVVM, a compiler SDK component from NVIDIA";
        license = stdenv.lib.licenses.mit;
-     }) { nvvm = null;};
+     }) {nvvm = null;};
 
   "liboleg" = callPackage
     ({ mkDerivation, base, CC-delcont, containers, mtl
@@ -87421,7 +87419,7 @@ self: {
        description = "Wrapper for libpafe";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { pafe = null;};
+     }) {pafe = null;};
 
   "libpq" = callPackage
     ({ mkDerivation, base, bytestring, postgresql, unix }:
@@ -87435,7 +87433,7 @@ self: {
        description = "libpq binding for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) postgresql;};
+     }) {inherit (pkgs) postgresql;};
 
   "librandomorg" = callPackage
     ({ mkDerivation, base, bytestring, curl }:
@@ -87503,7 +87501,7 @@ self: {
        homepage = "https://github.com/portnov/libssh2-hs";
        description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libssh2;  ssh2 = null;};
+     }) {inherit (pkgs) libssh2; ssh2 = null;};
 
   "libssh2-conduit" = callPackage
     ({ mkDerivation, base, conduit, libssh2, monad-control, stm
@@ -87540,8 +87538,9 @@ self: {
      }) {};
 
   "libsystemd-daemon" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, network, systemd-daemon
-     , test-framework, test-framework-hunit, utf8-string
+    ({ mkDerivation, base, bytestring, HUnit, libsystemd-daemon
+     , network, systemd-daemon, test-framework, test-framework-hunit
+     , utf8-string
      }:
      mkDerivation {
        pname = "libsystemd-daemon";
@@ -87549,13 +87548,14 @@ self: {
        sha256 = "c03dbef58f9d32fecce539cc3f118f43e9a92418736cb8b96960f87c14f3bfe6";
        libraryHaskellDepends = [ base bytestring network utf8-string ];
        librarySystemDepends = [ systemd-daemon ];
+       libraryPkgconfigDepends = [ libsystemd-daemon ];
        testHaskellDepends = [
          base HUnit network test-framework test-framework-hunit
        ];
        description = "Haskell bindings for libsystemd-daemon";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { systemd-daemon = null;};
+     }) {libsystemd-daemon = null; systemd-daemon = null;};
 
   "libsystemd-journal" = callPackage
     ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes
@@ -87575,7 +87575,7 @@ self: {
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) systemd;};
+     }) {inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
     ({ mkDerivation, base, bytestring, glib, taglib }:
@@ -87590,7 +87590,7 @@ self: {
        homepage = "https://patch-tag.com/r/AndyStewart/libtagc/home";
        description = "Binding to TagLib C library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) taglib;};
+     }) {inherit (pkgs) taglib;};
 
   "libvirt-hs" = callPackage
     ({ mkDerivation, base, c2hs, syb, virt }:
@@ -87605,7 +87605,7 @@ self: {
        description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { virt = null;};
+     }) {virt = null;};
 
   "libvorbis" = callPackage
     ({ mkDerivation, base, bytestring, cpu }:
@@ -87630,7 +87630,7 @@ self: {
        description = "Binding to libxml2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libxml2;};
+     }) {inherit (pkgs) libxml2;};
 
   "libxml-enumerator" = callPackage
     ({ mkDerivation, base, bytestring, enumerator, libxml-sax, text
@@ -87661,7 +87661,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-libxml/";
        description = "Bindings for the libXML2 SAX interface";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) libxml2;};
+     }) {inherit (pkgs) libxml2;};
 
   "libxslt" = callPackage
     ({ mkDerivation, base, bytestring, libxml, xslt }:
@@ -87675,7 +87675,7 @@ self: {
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { xslt = null;};
+     }) {xslt = null;};
 
   "life" = callPackage
     ({ mkDerivation, array, base, GLUT, OpenGL, random }:
@@ -87997,6 +87997,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "linear-circuit" = callPackage
+    ({ mkDerivation, base, comfort-graph, containers, hmatrix
+     , non-empty, QuickCheck, transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "linear-circuit";
+       version = "0.0";
+       sha256 = "8daca90d45a7a0a99910e863f2bedaf46b4b7caaa32cc0ef58e4c4376d72b93e";
+       libraryHaskellDepends = [
+         base comfort-graph containers hmatrix utility-ht
+       ];
+       testHaskellDepends = [
+         base comfort-graph containers non-empty QuickCheck transformers
+         utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/linear-circuit";
+       description = "Compute resistance of linear electrical circuits";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "linear-grammar" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck }:
      mkDerivation {
@@ -88070,8 +88090,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }:
      mkDerivation {
        pname = "linearscan";
-       version = "0.8.0";
-       sha256 = "108c26b493f21a47e171435053feef2d0fb178bb6be82baa6be5ea122b137829";
+       version = "0.9.0";
+       sha256 = "1ca49da5de79fd4aa6849a2b27dae5d01b3a896968e5fce29ad0c6a670065fa2";
        libraryHaskellDepends = [
          base containers ghc-prim mtl transformers
        ];
@@ -88088,8 +88108,8 @@ self: {
      }:
      mkDerivation {
        pname = "linearscan-hoopl";
-       version = "0.8.1";
-       sha256 = "cdd53114005aecb15ade491e8f662f651d91a166ab6929f73a081d9613991765";
+       version = "0.9.2";
+       sha256 = "fc52aedb4f8b3def5b993846543801de43cb5ea1f4091a2244626fe820382d6b";
        libraryHaskellDepends = [
          base containers free hoopl linearscan QuickCheck transformers
        ];
@@ -88215,7 +88235,7 @@ self: {
        description = "Linux libblkid";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { blkid = null;};
+     }) {blkid = null;};
 
   "linux-cgroup" = callPackage
     ({ mkDerivation, base, filepath }:
@@ -88278,7 +88298,7 @@ self: {
        description = "Linux kernel modules support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { libkmod = null;};
+     }) {libkmod = null;};
 
   "linux-mount" = callPackage
     ({ mkDerivation, base, bytestring }:
@@ -88864,7 +88884,7 @@ self: {
        jailbreak = true;
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) picosat;};
+     }) {inherit (pkgs) picosat;};
 
   "llrbtree" = callPackage
     ({ mkDerivation, base }:
@@ -89040,7 +89060,7 @@ self: {
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (self.llvmPackages) llvm;};
+     }) {inherit (self.llvmPackages) llvm;};
 
   "llvm-general" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, HUnit
@@ -89066,7 +89086,7 @@ self: {
        ];
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
-     }) { llvm-config = null;};
+     }) {llvm-config = null;};
 
   "llvm-general-pure" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, parsec, QuickCheck
@@ -89243,7 +89263,7 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-lmdb";
        description = "Lightning MDB bindings";
        license = stdenv.lib.licenses.bsd2;
-     }) { inherit (pkgs) lmdb;};
+     }) {inherit (pkgs) lmdb;};
 
   "load-env" = callPackage
     ({ mkDerivation, base, directory, hspec, HUnit, parsec }:
@@ -89865,7 +89885,7 @@ self: {
        description = "interface to Loris API";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { loris = null;};
+     }) {loris = null;};
 
   "loshadka" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cryptohash
@@ -89992,7 +90012,7 @@ self: {
        description = "Lexical Style Sheets - a language for writing styles that is focused around lexical (ie, static) scoping and re-use of large components";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { language-css-attoparsec = null;};
+     }) {language-css-attoparsec = null;};
 
   "lsystem" = callPackage
     ({ mkDerivation, base, haskell98, uu-parsinglib, wx, wxcore }:
@@ -90247,7 +90267,7 @@ self: {
        description = "Simple ObjectiveC runtime binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { objc = null;};
+     }) {objc = null;};
 
   "lushtags" = callPackage
     ({ mkDerivation, base, haskell-src-exts, text, vector }:
@@ -90404,7 +90424,7 @@ self: {
        homepage = "https://github.com/hvr/lzma";
        description = "LZMA/XZ compression and decompression";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) lzma;};
+     }) {inherit (pkgs) lzma;};
 
   "lzma-clib" = callPackage
     ({ mkDerivation, only-buildable-on-windows }:
@@ -90417,7 +90437,7 @@ self: {
        description = "liblzma C library and headers for use by LZMA bindings";
        license = stdenv.lib.licenses.publicDomain;
        broken = true;
-     }) { only-buildable-on-windows = null;};
+     }) {only-buildable-on-windows = null;};
 
   "lzma-conduit" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, conduit, HUnit
@@ -90439,7 +90459,7 @@ self: {
        homepage = "http://github.com/alphaHeavy/lzma-conduit";
        description = "Conduit interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) lzma;};
+     }) {inherit (pkgs) lzma;};
 
   "lzma-enumerator" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, enumerator, HUnit
@@ -90462,7 +90482,7 @@ self: {
        homepage = "http://github.com/alphaHeavy/lzma-enumerator";
        description = "Enumerator interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) lzma;};
+     }) {inherit (pkgs) lzma;};
 
   "lzma-streams" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, io-streams, lzma
@@ -90699,7 +90719,7 @@ self: {
        description = "Rogue-like";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "magic" = callPackage
     ({ mkDerivation, base, file }:
@@ -90711,7 +90731,7 @@ self: {
        librarySystemDepends = [ file ];
        description = "Interface to C file/magic library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) file;};
+     }) {inherit (pkgs) file;};
 
   "magico" = callPackage
     ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
@@ -91817,7 +91837,7 @@ self: {
        description = "Text matchers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) pcre;};
+     }) {inherit (pkgs) pcre;};
 
   "math-functions" = callPackage
     ({ mkDerivation, base, deepseq, erf, HUnit, ieee754, QuickCheck
@@ -91914,7 +91934,7 @@ self: {
        description = "Matlab bindings and interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { eng = null;  mat = null;  mx = null;};
+     }) {eng = null; mat = null; mx = null;};
 
   "matrices" = callPackage
     ({ mkDerivation, base, primitive, tasty, tasty-hunit
@@ -92238,7 +92258,7 @@ self: {
        description = "A Haskell binding to MeCab";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { mecab = null;};
+     }) {mecab = null;};
 
   "mecha" = callPackage
     ({ mkDerivation, base }:
@@ -92469,8 +92489,8 @@ self: {
        pname = "memcached-binary";
        version = "0.2.0";
        sha256 = "4d895459998bfd2fb80337cfc2363a905dfd7dc62adfad0696841c570c58fb8c";
-       revision = "2";
-       editedCabalFile = "663a104dc09413397f9640534b6d1a743835a395598f641d02ef0dbd44093530";
+       revision = "3";
+       editedCabalFile = "3314b765ef10f959862577e55809bc181d16dfd3ff9443b62499b5b393eea6b3";
        libraryHaskellDepends = [
          base bytestring data-default-class network resource-pool
          storable-endian time unordered-containers
@@ -92478,7 +92498,6 @@ self: {
        testHaskellDepends = [
          base bytestring data-default-class hspec HUnit network process
        ];
-       jailbreak = true;
        homepage = "https://github.com/philopon/memcached-binary";
        description = "memcached client using binary protocol";
        license = stdenv.lib.licenses.mit;
@@ -94032,20 +94051,20 @@ self: {
 
   "moesocks" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
-     , containers, cryptohash, hslogger, HsOpenSSL, lens, mtl, network
-     , optparse-applicative, random, safe, stm, strict, text, time
+     , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens, mtl
+     , network, optparse-applicative, random, stm, strict, text, time
      , transformers, unix, unordered-containers
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.25";
-       sha256 = "c80dc33b2f5be9f4826ce51aa047b078c22d47a0900aa2fe294232c588f251a8";
+       version = "0.1.0.26";
+       sha256 = "6b2af22a46ffea53436cfca302ad526827c4bfd7963d259304714acd1ee2bf91";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson async attoparsec base binary bytestring containers cryptohash
-         hslogger HsOpenSSL lens mtl network optparse-applicative random
-         safe stm strict text time transformers unix unordered-containers
+         hslogger HsOpenSSL iproute lens mtl network optparse-applicative
+         random stm strict text time transformers unix unordered-containers
        ];
        homepage = "https://github.com/nfjinjing/moesocks";
        description = "A functional firewall killer";
@@ -94924,8 +94943,8 @@ self: {
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gecodeint = null;  gecodekernel = null;  gecodesearch = null;
-          gecodeset = null;  gecodesupport = null;};
+     }) {gecodeint = null; gecodekernel = null; gecodesearch = null; 
+         gecodeset = null; gecodesupport = null;};
 
   "monadio-unwrappable" = callPackage
     ({ mkDerivation, base, monads-tf, transformers }:
@@ -95323,7 +95342,7 @@ self: {
        description = "Riak Resolution Proxy";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { riak-bump = null;  stats-web = null;};
+     }) {riak-bump = null; stats-web = null;};
 
   "montage-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, ListLike, mtl
@@ -95347,7 +95366,7 @@ self: {
        description = "Riak Resolution Proxy Client";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { riak-bump = null;  stats-web = null;};
+     }) {riak-bump = null; stats-web = null;};
 
   "monte-carlo" = callPackage
     ({ mkDerivation, base, gsl-random, ieee754, primitive, QuickCheck
@@ -95450,7 +95469,7 @@ self: {
        description = "Bindings to the morphological analyser Morfeusz";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { morfeusz = null;};
+     }) {morfeusz = null;};
 
   "morte" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers, deepseq
@@ -96012,7 +96031,7 @@ self: {
        description = "Bindings to libmtp";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { mtp = null;};
+     }) {mtp = null;};
 
   "mtree" = callPackage
     ({ mkDerivation, base, bifunctors }:
@@ -97074,7 +97093,7 @@ self: {
        homepage = "https://github.com/bos/mysql";
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-     }) { mysql = null;};
+     }) {inherit (pkgs) mysql;};
 
   "mysql-effect" = callPackage
     ({ mkDerivation, base, bytestring, extensible-effects, mysql
@@ -97342,7 +97361,7 @@ self: {
        description = "Bindings to OpenSSL HMAC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "nano-md5" = callPackage
     ({ mkDerivation, base, bytestring, openssl }:
@@ -97356,7 +97375,7 @@ self: {
        description = "Efficient, ByteString bindings to OpenSSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "nanoAgda" = callPackage
     ({ mkDerivation, base, BNFC-meta, cmdargs, containers, mtl, parsec
@@ -97389,7 +97408,7 @@ self: {
        description = "Simple Curses binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "nanomsg" = callPackage
     ({ mkDerivation, base, bytestring, nanomsg }:
@@ -97402,7 +97421,7 @@ self: {
        jailbreak = true;
        description = "nanomsg - scalability protocols library";
        license = stdenv.lib.licenses.publicDomain;
-     }) { inherit (pkgs) nanomsg;};
+     }) {inherit (pkgs) nanomsg;};
 
   "nanomsg-haskell" = callPackage
     ({ mkDerivation, base, binary, bytestring, nanomsg, QuickCheck
@@ -97422,7 +97441,7 @@ self: {
        description = "Bindings to the nanomsg library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) nanomsg;};
+     }) {inherit (pkgs) nanomsg;};
 
   "nanoparsec" = callPackage
     ({ mkDerivation, base, bytestring, ListLike }:
@@ -97676,7 +97695,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-ncurses/";
        description = "Modernised bindings to GNU ncurses";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "ndjson-conduit" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit }:
@@ -97992,7 +98011,7 @@ self: {
        description = "Concurrent over the network execution library";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { ghc-binary = null;};
+     }) {ghc-binary = null;};
 
   "netclock" = callPackage
     ({ mkDerivation, base, bytestring, hosc, network }:
@@ -98168,9 +98187,9 @@ self: {
 
   "nettle" = callPackage
     ({ mkDerivation, array, base, byteable, bytestring
-     , crypto-cipher-tests, crypto-cipher-types, HUnit, QuickCheck
-     , securemem, tagged, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
+     , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle
+     , QuickCheck, securemem, tagged, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "nettle";
@@ -98179,6 +98198,7 @@ self: {
        libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem tagged
        ];
+       libraryPkgconfigDepends = [ nettle ];
        testHaskellDepends = [
          array base bytestring crypto-cipher-tests crypto-cipher-types HUnit
          QuickCheck tagged test-framework test-framework-hunit
@@ -98188,7 +98208,7 @@ self: {
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) nettle;};
 
   "nettle-frp" = callPackage
     ({ mkDerivation, base, bimap, binary, bytestring, containers, mtl
@@ -99554,8 +99574,8 @@ self: {
        description = "Network Manager, binding to libnm-glib";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { g = null;  inherit (pkgs) glib;  libnm-glib = null;
-          nm-glib = null;};
+     }) {g = null; inherit (pkgs) glib; libnm-glib = null; 
+         nm-glib = null;};
 
   "nme" = callPackage
     ({ mkDerivation, base, bytestring, utf8-string }:
@@ -99839,7 +99859,7 @@ self: {
        description = "Binding for notmuch MUA library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) notmuch;};
+     }) {inherit (pkgs) notmuch;};
 
   "notmuch-web" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base
@@ -100581,9 +100601,8 @@ self: {
        description = "Oculus Rift ffi providing head tracking data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) libX11;
-          inherit (pkgs.xlibs) libXinerama;  inherit (pkgs) mesa;
-          ovr = null;  inherit (pkgs) systemd;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXinerama; 
+         inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;};
 
   "oeis" = callPackage
     ({ mkDerivation, base, HTTP, HUnit, network, network-uri
@@ -100680,7 +100699,7 @@ self: {
        description = "wrapper for OIS input manager for use with hogre";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OIS = null;};
+     }) {OIS = null;};
 
   "old-locale" = callPackage
     ({ mkDerivation, base }:
@@ -101080,7 +101099,7 @@ self: {
        description = "Raw Haskell bindings to OpenCV >= 2.0";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) opencv;};
+     }) {inherit (pkgs) opencv;};
 
   "opendatatable" = callPackage
     ({ mkDerivation, base, hxt, template-haskell, th-lift }:
@@ -101148,7 +101167,7 @@ self: {
        description = "OpenGL ES 2.0 and 3.0 with EGL 1.4";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { EGL = null;  GLESv2 = null;};
+     }) {EGL = null; GLESv2 = null;};
 
   "openid" = callPackage
     ({ mkDerivation, base, bytestring, containers, HsOpenSSL, HTTP
@@ -102481,7 +102500,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) pam;};
+     }) {inherit (pkgs) pam;};
 
   "panda" = callPackage
     ({ mkDerivation, base, cgi, containers, data-default, directory
@@ -102695,7 +102714,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Pango text rendering engine";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs.gnome) pango;};
+     }) {inherit (pkgs.gnome) pango;};
 
   "papillon" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, monads-tf
@@ -103821,7 +103840,7 @@ self: {
        homepage = "https://github.com/Daniel-Diaz/pcre-light";
        description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) pcre;};
+     }) {inherit (pkgs) pcre;};
 
   "pcre-light-extra" = callPackage
     ({ mkDerivation, base, bytestring, pcre-light }:
@@ -104355,8 +104374,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistable-record";
-       version = "0.1.0.0";
-       sha256 = "46f434e4193dd88d224c03e39281b8bb747289a432ade70925f70fe07bcc03fc";
+       version = "0.1.0.1";
+       sha256 = "ba04f5af4a988e6f4758f32ff8ff767b71680bea5bede391200aba431d0c530d";
        libraryHaskellDepends = [
          array base containers dlist names-th template-haskell transformers
        ];
@@ -105011,7 +105030,7 @@ self: {
        description = "Haskell bindings to pHash, the open source perceptual hash library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { pHash = null;};
+     }) {pHash = null;};
 
   "phone-push" = callPackage
     ({ mkDerivation, base, base16-bytestring, binary, bytestring
@@ -106683,7 +106702,7 @@ self: {
        librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
        license = stdenv.lib.licenses.publicDomain;
-     }) { inherit (pkgs) poker-eval;};
+     }) {inherit (pkgs) poker-eval;};
 
   "pokitdok" = callPackage
     ({ mkDerivation, aeson, base, base64-string, bytestring
@@ -107092,8 +107111,8 @@ self: {
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) gdk_pixbuf;  inherit (pkgs.gnome) pango;
-          inherit (pkgs) poppler;};
+     }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs.gnome) pango; 
+         inherit (pkgs) poppler;};
 
   "populate-setup-exe-cache" = callPackage
     ({ mkDerivation, base }:
@@ -107129,7 +107148,7 @@ self: {
        homepage = "http://code.haskell.org/portaudio";
        description = "Haskell bindings for the PortAudio library";
        license = "unknown";
-     }) { inherit (pkgs) portaudio;};
+     }) {inherit (pkgs) portaudio;};
 
   "porte" = callPackage
     ({ mkDerivation, base, bytestring, containers
@@ -107215,7 +107234,7 @@ self: {
        description = "Support for Posix ACL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) acl;};
+     }) {inherit (pkgs) acl;};
 
   "posix-escape" = callPackage
     ({ mkDerivation, base }:
@@ -107266,7 +107285,7 @@ self: {
        homepage = "https://bitbucket.org/merijnv/posix-pty";
        description = "Pseudo terminal interaction with subprocesses";
        license = stdenv.lib.licenses.bsd3;
-     }) { util = null;};
+     }) {util = null;};
 
   "posix-realtime" = callPackage
     ({ mkDerivation, base, unix }:
@@ -107412,7 +107431,7 @@ self: {
        homepage = "http://github.com/lpsmith/postgresql-libpq";
        description = "low-level binding to libpq";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) postgresql;};
+     }) {inherit (pkgs) postgresql;};
 
   "postgresql-orm" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, directory
@@ -107733,7 +107752,7 @@ self: {
        description = "Postmaster ESMTP Server";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) adns;  inherit (pkgs) openssl;};
+     }) {inherit (pkgs) adns; inherit (pkgs) openssl;};
 
   "potato-tool" = callPackage
     ({ mkDerivation, base, binary, bytestring, split }:
@@ -109004,7 +109023,7 @@ self: {
        description = "Haskell bindings for the Proj4 C dynamic library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) proj;};
+     }) {inherit (pkgs) proj;};
 
   "project-template" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, conduit
@@ -109297,7 +109316,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A wrapper for the proteaaudio library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "protobuf" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers
@@ -109335,7 +109354,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cplusplus-th template-haskell text
        ];
-       librarySystemDepends = [ protobuf ];
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring cereal cplusplus-th criterion hprotoc-fork protobuf
@@ -109346,7 +109364,7 @@ self: {
        description = "Protocol Buffers via C++";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) protobuf;};
+     }) {};
 
   "protocol-buffers" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
@@ -109568,8 +109586,8 @@ self: {
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20150814";
-       sha256 = "809fa6a08ed47540b7536811af17075b180b2d2a65508f9090c28614677c0edb";
+       version = "0.20150827";
+       sha256 = "709cf2da54e5a3351d91e866a76d97e32a0a6c3d3178b1ecdd7dfa3e63b9dc4c";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -109800,7 +109818,7 @@ self: {
        librarySystemDepends = [ libpulseaudio ];
        description = "binding to Simple API of pulseaudio";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libpulseaudio;};
+     }) {inherit (pkgs) libpulseaudio;};
 
   "punkt" = callPackage
     ({ mkDerivation, array, base, mtl, regex-tdfa, regex-tdfa-text
@@ -110218,7 +110236,7 @@ self: {
        description = "A photo viewer daemon application with remote controlling abilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libdevil;};
+     }) {inherit (pkgs) libdevil;};
 
   "pwstore-cli" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, HUnit, process
@@ -110304,7 +110322,7 @@ self: {
        homepage = "http://github.com/Russell91/json-python";
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) python;};
+     }) {inherit (pkgs) python;};
 
   "pyfi" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, pureMD5
@@ -110322,7 +110340,7 @@ self: {
        homepage = "http://github.com/Russell91/pyfi";
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) python;};
+     }) {inherit (pkgs) python;};
 
   "python-pickle" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, cmdargs
@@ -110370,7 +110388,7 @@ self: {
        description = "double-double and quad-double number type via libqd";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { qd = null;};
+     }) {qd = null;};
 
   "qd-vec" = callPackage
     ({ mkDerivation, base, qd, Vec }:
@@ -110396,7 +110414,7 @@ self: {
        description = "Simple bindings to Qhull, a library for computing convex hulls";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) qhull;};
+     }) {inherit (pkgs) qhull;};
 
   "qrcode" = callPackage
     ({ mkDerivation, array, base, containers, mtl, vector }:
@@ -111134,7 +111152,7 @@ self: {
        description = "librados haskell bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { rados = null;};
+     }) {rados = null;};
 
   "rail-compiler-editor" = callPackage
     ({ mkDerivation, base, cairo, containers, gtk, HUnit, llvm-general
@@ -111489,7 +111507,7 @@ self: {
        homepage = "http://galois.com";
        description = "A fast, SMP parallel random data generator";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "randproc" = callPackage
     ({ mkDerivation, base }:
@@ -112200,7 +112218,7 @@ self: {
        librarySystemDepends = [ ncurses readline ];
        description = "An interface to the GNU readline library";
        license = "GPL";
-     }) { inherit (pkgs) ncurses;  inherit (pkgs) readline;};
+     }) {inherit (pkgs) ncurses; inherit (pkgs) readline;};
 
   "readline-statevar" = callPackage
     ({ mkDerivation, base, readline, StateVar }:
@@ -112746,7 +112764,7 @@ self: {
        description = "Generalization of lenses, folds and traversals to handle monads and addition";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { instance-control = null;};
+     }) {instance-control = null;};
 
   "refh" = callPackage
     ({ mkDerivation, base, clippard, cmdargs, directory, filepath
@@ -112890,7 +112908,7 @@ self: {
        description = "A playground for experimenting with infrastructure and common code for reflex applications";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { ghcjs-base = null;};
+     }) {ghcjs-base = null;};
 
   "reflex-gloss" = callPackage
     ({ mkDerivation, base, dependent-sum, gloss, reflex, transformers
@@ -113140,7 +113158,7 @@ self: {
        homepage = "http://hackage.haskell.org/package/regex-pcre";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) pcre;};
+     }) {inherit (pkgs) pcre;};
 
   "regex-pcre-builtin" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, regex-base }:
@@ -113325,7 +113343,7 @@ self: {
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) tre;};
+     }) {inherit (pkgs) tre;};
 
   "regex-xmlschema" = callPackage
     ({ mkDerivation, base, haskell98, parsec }:
@@ -113753,15 +113771,15 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.1.0.0";
-       sha256 = "729b3474dc3b0815315f09866d8309ff03ee3b7a86c02954ad0c33c44d92b4e4";
+       version = "0.1.0.1";
+       sha256 = "23c9296e772ab840936e6bf9916e3949726ab168de4d0a81b31505fcc08f726c";
        libraryHaskellDepends = [
          base containers convertible HDBC HDBC-session names-th
          persistable-record relational-query relational-schemas
          template-haskell
        ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "HDBC instance of relational join and typed query for HDBC";
+       description = "HDBC instance of relational-query and typed query interface for HDBC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -114054,7 +114072,7 @@ self: {
        homepage = "https://github.com/RaphaelJ/repa-devil";
        description = "Support for image reading and writing of Repa arrays using in-place FFI calls";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libdevil;};
+     }) {inherit (pkgs) libdevil;};
 
   "repa-eval" = callPackage
     ({ mkDerivation, base, ghc-prim }:
@@ -114483,8 +114501,8 @@ self: {
     ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
      mkDerivation {
        pname = "resistor-cube";
-       version = "0.0.0.2";
-       sha256 = "0592c448a0dcfc583ca8c6217cc4a89c5bf6875c0ec176db4490cdca8c480220";
+       version = "0.0.0.3";
+       sha256 = "09f41cea22f4b0bbf2f32c80d8eab274a520d9fe611d1b83df4d14d46afb34ad";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -115331,7 +115349,7 @@ self: {
        description = "Riot is an Information Organisation Tool";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "ripple" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base58address, binary
@@ -115587,7 +115605,7 @@ self: {
        homepage = "http://github.com/agrafix/rocksdb-haskell";
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) rocksdb;};
+     }) {inherit (pkgs) rocksdb;};
 
   "roguestar" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, old-time
@@ -116247,7 +116265,7 @@ self: {
        homepage = "https://github.com/adamwalker/hrtlsdr";
        description = "Bindings to librtlsdr";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) rtl-sdr;};
+     }) {inherit (pkgs) rtl-sdr;};
 
   "rtorrent-rpc" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-textual
@@ -116296,6 +116314,7 @@ self: {
        sha256 = "d5b94ba1bc5422ab35556b56a2546047b08e895f592661a5363df37d94004496";
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ rubberband ];
+       libraryPkgconfigDepends = [ rubberband ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base ];
        jailbreak = true;
@@ -116303,7 +116322,7 @@ self: {
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) rubberband;};
+     }) {inherit (pkgs) rubberband;};
 
   "ruby-marshal" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, hspec, mtl
@@ -116772,7 +116791,7 @@ self: {
        ];
        description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) libsodium;};
+     }) {inherit (pkgs) libsodium;};
 
   "saltine-quickcheck" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex
@@ -116793,7 +116812,7 @@ self: {
        homepage = "https://github.com/tsuraan/saltine-quickcheck";
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) libsodium;};
+     }) {inherit (pkgs) libsodium;};
 
   "salvia" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, fclabels
@@ -116963,7 +116982,7 @@ self: {
        homepage = "http://www.ingolia-lab.org/samtools-tutorial.html";
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) zlib;};
+     }) {inherit (pkgs) zlib;};
 
   "samtools-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, filepath, resourcet
@@ -118208,7 +118227,7 @@ self: {
        libraryPkgconfigDepends = [ SDL2 ];
        description = "Low-level bindings to SDL2";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) SDL2;};
+     }) {inherit (pkgs) SDL2;};
 
   "sdl2-image" = callPackage
     ({ mkDerivation, base, SDL2, sdl2, SDL2_image }:
@@ -118221,7 +118240,7 @@ self: {
        libraryPkgconfigDepends = [ SDL2 SDL2_image ];
        description = "Haskell binding to sdl2-image";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) SDL2;  inherit (pkgs) SDL2_image;};
+     }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
 
   "sdl2-ttf" = callPackage
     ({ mkDerivation, base, SDL2, sdl2, SDL2_ttf }:
@@ -118234,7 +118253,7 @@ self: {
        testHaskellDepends = [ base sdl2 ];
        description = "Binding to libSDL2-ttf";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) SDL2;  inherit (pkgs) SDL2_ttf;};
+     }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
 
   "sdnv" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
@@ -118403,7 +118422,7 @@ self: {
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "secret-santa" = callPackage
     ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib
@@ -118507,7 +118526,7 @@ self: {
        description = "Sedna C API XML Binding";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { sedna = null;};
+     }) {sedna = null;};
 
   "select" = callPackage
     ({ mkDerivation, base }:
@@ -118597,7 +118616,7 @@ self: {
        description = "SELinux bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { selinux = null;};
+     }) {selinux = null;};
 
   "semaphore-plus" = callPackage
     ({ mkDerivation, base }:
@@ -119887,7 +119906,7 @@ self: {
        homepage = "http://patch-tag.com/r/shahn/sfml-audio";
        description = "minimal bindings to the audio module of sfml";
        license = "unknown";
-     }) { inherit (pkgs) libsndfile;  inherit (pkgs) openal;};
+     }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;};
 
   "sfmt" = callPackage
     ({ mkDerivation, base, bytestring, entropy, primitive }:
@@ -120796,7 +120815,7 @@ self: {
        description = "Library of modules shared by sifflet and its tests and its exporters";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gdk_x11 = null;  gtk_x11 = null;};
+     }) {gdk_x11 = null; gtk_x11 = null;};
 
   "sign" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, HUnit
@@ -120970,7 +120989,7 @@ self: {
        description = "Simple Bluetooth API for Windows and Linux (bluez)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { bluetooth = null;};
+     }) {bluetooth = null;};
 
   "simple-c-value" = callPackage
     ({ mkDerivation, base, checkers, DebugTraceHelpers, derive, dlist
@@ -121596,7 +121615,7 @@ self: {
        description = "Simple wrapper around libssh2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ssh2 = null;};
+     }) {ssh2 = null;};
 
   "simplex" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl, process, random
@@ -121689,7 +121708,7 @@ self: {
        description = "A programming language for simple GUIs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) libXft;};
+     }) {inherit (pkgs.xlibs) libXft;};
 
   "singleton-nats" = callPackage
     ({ mkDerivation, base, singletons }:
@@ -121972,7 +121991,7 @@ self: {
        description = "Export Skype chat logs to text files";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { ghc-binary = null;};
+     }) {ghc-binary = null;};
 
   "slack" = callPackage
     ({ mkDerivation, aeson, base, containers, either, http-conduit, mtl
@@ -123650,7 +123669,7 @@ self: {
        homepage = "http://github.com/bos/snappy";
        description = "Bindings to the Google Snappy library for fast compression/decompression";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) snappy;};
+     }) {inherit (pkgs) snappy;};
 
   "snappy-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, snappy }:
@@ -123787,8 +123806,8 @@ self: {
      }:
      mkDerivation {
        pname = "snmp";
-       version = "0.2.0.0";
-       sha256 = "c7b8da17a08c7960c3494da4757fe059e87a4f215927e6f6977a47a2b4bc4b6e";
+       version = "0.2.1.1";
+       sha256 = "0737d6fc4299a00d248d263ebdde7b3451f32da3f9a6f5afac0a125eb57384a4";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types async base binary bytestring
          cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl
@@ -124003,7 +124022,7 @@ self: {
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { sctp = null;};
+     }) {sctp = null;};
 
   "socketio" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
@@ -124316,7 +124335,7 @@ self: {
        description = "Write, read, convert audio signals using libsox";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) sox;};
+     }) {inherit (pkgs) sox;};
 
   "soyuz" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cmdargs, containers
@@ -124763,7 +124782,7 @@ self: {
        description = "Experimental web browser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) libsoup;};
+     }) {inherit (pkgs.gnome) libsoup;};
 
   "spine" = callPackage
     ({ mkDerivation, base }:
@@ -125236,7 +125255,7 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "Haskell binding to sqlite3";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) sqlite;};
+     }) {inherit (pkgs) sqlite;};
 
   "sqlite-simple" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
@@ -126148,7 +126167,7 @@ self: {
        description = "The ST monad and STRefs";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { applicative = null;};
+     }) {applicative = null;};
 
   "statgrab" = callPackage
     ({ mkDerivation, async, base, bytestring, statgrab, time
@@ -126166,7 +126185,7 @@ self: {
        description = "Collect system level metrics and statistics";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { statgrab = null;};
+     }) {statgrab = null;};
 
   "static-canvas" = callPackage
     ({ mkDerivation, base, double-conversion, free, mtl, text }:
@@ -127078,14 +127097,31 @@ self: {
     ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "streaming";
-       version = "0.1.0.7";
-       sha256 = "67f6aed768c1a6537fcf7587d1f5ab0fcec4ab9e4489ce6802aae483f67c9362";
+       version = "0.1.0.9";
+       sha256 = "322fc0911ebb1643d4081fc8b34cf8252def719b5b749017fd8476e2eb16c467";
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        homepage = "https://github.com/michaelt/streaming";
        description = "A free monad transformer optimized for streaming applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming-bytestring" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, deepseq, foldl
+     , http-client, http-client-tls, mmorph, mtl, streaming, syb
+     , transformers
+     }:
+     mkDerivation {
+       pname = "streaming-bytestring";
+       version = "0.1.0.1";
+       sha256 = "06f0ec85133e273853c3a967f3f806336bb2ad84da24b610a53bb3c76d5a9e20";
+       libraryHaskellDepends = [
+         attoparsec base bytestring deepseq foldl http-client
+         http-client-tls mmorph mtl streaming syb transformers
+       ];
+       description = "Lazy bytestring done right";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "streaming-commons" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , deepseq, directory, hspec, network, process, QuickCheck, random
@@ -128099,7 +128135,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the libsvg-cairo library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) librsvg;};
+     }) {inherit (pkgs) librsvg;};
 
   "svgutils" = callPackage
     ({ mkDerivation, base, filepath, xml }:
@@ -128213,7 +128249,7 @@ self: {
        description = "Transparently swapping data from in-memory structures to disk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) tokyocabinet;};
+     }) {inherit (pkgs) tokyocabinet;};
 
   "swearjure" = callPackage
     ({ mkDerivation, attoparsec, base, containers, fixplate, mtl
@@ -128550,7 +128586,7 @@ self: {
        description = "Similar code analysis";
        license = "unknown";
        broken = true;
-     }) { Synt = null;};
+     }) {Synt = null;};
 
   "syntactic" = callPackage
     ({ mkDerivation, base, constraints, containers, data-hash, deepseq
@@ -128843,7 +128879,7 @@ self: {
        description = "Audio signal processing with dynamic physical dimensions";
        license = "GPL";
        broken = true;
-     }) { UniqueLogicNP = null;};
+     }) {UniqueLogicNP = null;};
 
   "synthesizer-llvm" = callPackage
     ({ mkDerivation, base, containers, event-list, filepath, llvm-extra
@@ -129140,7 +129176,7 @@ self: {
        description = "Various system utils lifted to EitherT";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { easy-data = null;};
+     }) {easy-data = null;};
 
   "system-uuid" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, libossp_uuid
@@ -129165,7 +129201,7 @@ self: {
        homepage = "http://github.com/solidsnack/system-uuid/";
        description = "Bindings to system UUID functions";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libossp_uuid;};
+     }) {inherit (pkgs) libossp_uuid;};
 
   "systemd" = callPackage
     ({ mkDerivation, base, bytestring, network, transformers, unix }:
@@ -129592,7 +129628,7 @@ self: {
        libraryPkgconfigDepends = [ taglib ];
        description = "Binding to TagLib (ID3 tag library)";
        license = "LGPL";
-     }) { inherit (pkgs) taglib;};
+     }) {inherit (pkgs) taglib;};
 
   "taglib-api" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, taglib, text
@@ -129609,7 +129645,7 @@ self: {
        jailbreak = true;
        description = "An FFI layer over TagLib's C bindings";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) taglib;};
+     }) {inherit (pkgs) taglib;};
 
   "tagset-positional" = callPackage
     ({ mkDerivation, base, binary, containers, parsec, text
@@ -129744,7 +129780,7 @@ self: {
        description = "Database library with left-fold interface for Oracle";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { clntsh = null;  sqlplus = null;};
+     }) {clntsh = null; sqlplus = null;};
 
   "tamarin-prover" = callPackage
     ({ mkDerivation, aeson, array, base, binary, blaze-builder
@@ -130854,7 +130890,7 @@ self: {
        homepage = "https://github.com/judah/terminfo";
        description = "Haskell bindings to the terminfo library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "terminfo-hs" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
@@ -130886,7 +130922,7 @@ self: {
        description = "A Haskell GIS Programming Environment";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { terralib4c = null;  translib = null;};
+     }) {terralib4c = null; translib = null;};
 
   "tersmu" = callPackage
     ({ mkDerivation, base, containers, mtl, process, syb, transformers
@@ -131550,7 +131586,7 @@ self: {
        homepage = "https://github.com/bos/text-icu";
        description = "Bindings to the ICU library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) icu;};
+     }) {inherit (pkgs) icu;};
 
   "text-icu-translit" = callPackage
     ({ mkDerivation, base, icu, QuickCheck, test-framework
@@ -131568,7 +131604,7 @@ self: {
        ];
        description = "ICU transliteration";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) icu;};
+     }) {inherit (pkgs) icu;};
 
   "text-json-qq" = callPackage
     ({ mkDerivation, base, haskell-src-meta, json, json-qq, parsec
@@ -133974,7 +134010,7 @@ self: {
        description = "Haskell binding of Tokyo Cabinet";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) tokyocabinet;};
+     }) {inherit (pkgs) tokyocabinet;};
 
   "tokyotyrant-haskell" = callPackage
     ({ mkDerivation, base, bytestring, mtl, tokyocabinet, tokyotyrant
@@ -133988,7 +134024,7 @@ self: {
        homepage = "http://www.polarmobile.com/";
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) tokyocabinet;  inherit (pkgs) tokyotyrant;};
+     }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
   "tomato-rubato-openal" = callPackage
     ({ mkDerivation, base, OpenAL, stm, vector }:
@@ -136519,7 +136555,7 @@ self: {
        description = "String encoding conversion with ICU";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) icu;};
+     }) {inherit (pkgs) icu;};
 
   "udbus" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, containers
@@ -136584,7 +136620,7 @@ self: {
        description = "libudev bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { libudev = null;};
+     }) {libudev = null;};
 
   "uglymemo" = callPackage
     ({ mkDerivation, base, containers }:
@@ -137047,7 +137083,7 @@ self: {
        description = "Unicode normalization using the ICU library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) icu;};
+     }) {inherit (pkgs) icu;};
 
   "unicode-prelude" = callPackage
     ({ mkDerivation, base }:
@@ -137132,14 +137168,14 @@ self: {
        description = "Uniform IO over files, network, watever";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "uniform-pair" = callPackage
     ({ mkDerivation, base, ShowF }:
      mkDerivation {
        pname = "uniform-pair";
-       version = "0.1.5";
-       sha256 = "014187360a2aa088c507773bc4b7144e945b7e1944cf2e1d88b79f0e6b87737e";
+       version = "0.1.7";
+       sha256 = "be32baf4cdc36db451b1ee28502a3a357e840b800118ce9102df37ffcbca98e1";
        libraryHaskellDepends = [ base ShowF ];
        homepage = "https://github.com/conal/uniform-pair/";
        description = "Uniform pairs with class instances";
@@ -137251,6 +137287,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unit" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "unit";
+       version = "0.1.0.0";
+       sha256 = "0747cc0c3a8e6bb64343b79c079702757d81f63ae2bc7dd76727b8bcee8edc74";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "http://github.com/cxfreeio/unit#readme";
+       description = "Aliases for ()";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "units" = callPackage
     ({ mkDerivation, base, containers, HUnit-approx, mtl, multimap
      , singletons, syb, tasty, tasty-hunit, template-haskell, th-desugar
@@ -139525,7 +139574,7 @@ self: {
        description = "A binding to the fftw library for one-dimensional vectors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) fftw;};
+     }) {inherit (pkgs) fftw;};
 
   "vector-functorlazy" = callPackage
     ({ mkDerivation, base, ghc-prim, primitive, vector, vector-th-unbox
@@ -139897,7 +139946,7 @@ self: {
        ];
        description = "An MPD client with vim-like key bindings";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "vintage-basic" = callPackage
     ({ mkDerivation, array, base, directory, filepath, HUnit, mtl
@@ -140208,7 +140257,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs.gnome) vte;};
+     }) {inherit (pkgs.gnome) vte;};
 
   "vtegtk3" = callPackage
     ({ mkDerivation, base, glib, gtk2hs-buildtools, gtk3, pango, vte }:
@@ -140224,7 +140273,7 @@ self: {
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) vte;};
+     }) {inherit (pkgs.gnome) vte;};
 
   "vty" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
@@ -140613,7 +140662,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "Wai handler to fastcgi";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) fcgi;};
+     }) {inherit (pkgs) fcgi;};
 
   "wai-handler-launch" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, http-types
@@ -140675,7 +140724,7 @@ self: {
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { QtWebKit = null;};
+     }) {QtWebKit = null;};
 
   "wai-hastache" = callPackage
     ({ mkDerivation, base, bytestring, hastache, http-types
@@ -142213,7 +142262,7 @@ self: {
        description = "Parser and Pretty Printer for the Web IDL Language";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { LEXER = null;};
+     }) {LEXER = null;};
 
   "webify" = callPackage
     ({ mkDerivation, base, binary, binary-strict, blaze-builder
@@ -142253,7 +142302,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) webkit;};
+     }) {inherit (pkgs) webkit;};
 
   "webkit-javascriptcore" = callPackage
     ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, webkit }:
@@ -142284,7 +142333,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) webkit;};
+     }) {inherit (pkgs) webkit;};
 
   "webkitgtk3-javascriptcore" = callPackage
     ({ mkDerivation, base, glib, gtk2hs-buildtools, gtk3, webkit
@@ -142299,7 +142348,7 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) webkit;};
+     }) {inherit (pkgs) webkit;};
 
   "webpage" = callPackage
     ({ mkDerivation, base, blaze-html, data-default, hastache, lucid
@@ -142697,7 +142746,7 @@ self: {
        description = "I/O library for Windows";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { kernel32 = null;  ws2_32 = null;};
+     }) {kernel32 = null; ws2_32 = null;};
 
   "wiring" = callPackage
     ({ mkDerivation, base, hspec, mtl, QuickCheck, template-haskell
@@ -142882,7 +142931,7 @@ self: {
        description = "Haskell bindings for the wlc library";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { wlc = null;};
+     }) {wlc = null;};
 
   "wobsurv" = callPackage
     ({ mkDerivation, aeson, attoparsec, base-prelude, bytestring
@@ -143481,8 +143530,8 @@ self: {
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell C++ wrapper";
        license = "unknown";
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;
-          inherit (pkgs) wxGTK;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; 
+         inherit (pkgs) wxGTK;};
 
   "wxcore" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
@@ -143500,7 +143549,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell core";
        license = "unknown";
-     }) { inherit (pkgs) wxGTK;};
+     }) {inherit (pkgs) wxGTK;};
 
   "wxdirect" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, parsec
@@ -143642,7 +143691,7 @@ self: {
        description = "Haskell FFI bindings for X11 XInput library (-lXi)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) libXi;};
+     }) {inherit (pkgs.xlibs) libXi;};
 
   "x509" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
@@ -143759,7 +143808,7 @@ self: {
        ];
        description = "Haskell extended file attributes interface";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) attr;};
+     }) {inherit (pkgs) attr;};
 
   "xbattbar" = callPackage
     ({ mkDerivation, base, old-time, select, X11 }:
@@ -143922,7 +143971,7 @@ self: {
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { libxfconf-0 = null;};
+     }) {libxfconf-0 = null;};
 
   "xformat" = callPackage
     ({ mkDerivation, base }:
@@ -144065,7 +144114,7 @@ self: {
        description = "Bindings to xine-lib";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { libxine = null;  xine = null;};
+     }) {libxine = null; xine = null;};
 
   "xing-api" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
@@ -144125,7 +144174,7 @@ self: {
        testHaskellDepends = [ base unix ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) libxkbcommon;};
+     }) {inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, HTTP
@@ -144788,8 +144837,8 @@ self: {
        homepage = "http://xmobar.org";
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
-     }) { Xrender = null;  inherit (pkgs.xlibs) libXpm;
-          inherit (pkgs.xlibs) libXrandr;  inherit (pkgs) wirelesstools;};
+     }) {Xrender = null; inherit (pkgs.xlibs) libXpm; 
+         inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;};
 
   "xmonad" = callPackage
     ({ mkDerivation, base, containers, directory, extensible-exceptions
@@ -145037,7 +145086,7 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/xosd";
        description = "A binding to the X on-screen display";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) xosd;};
+     }) {inherit (pkgs) xosd;};
 
   "xournal-builder" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, double-conversion
@@ -145194,7 +145243,7 @@ self: {
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { xslt = null;};
+     }) {xslt = null;};
 
   "xss-sanitize" = callPackage
     ({ mkDerivation, attoparsec, base, containers, css-text, hspec
@@ -145239,7 +145288,7 @@ self: {
        librarySystemDepends = [ libXtst ];
        description = "Thin FFI bindings to X11 XTest library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libXtst;};
+     }) {inherit (pkgs.xlibs) libXtst;};
 
   "xturtle" = callPackage
     ({ mkDerivation, base, convertible, Imlib, setlocale, X11, X11-xft
@@ -145392,7 +145441,7 @@ self: {
        description = "Bindings for YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) yajl;};
+     }) {inherit (pkgs) yajl;};
 
   "yajl-enumerator" = callPackage
     ({ mkDerivation, base, bytestring, enumerator, json-types, text
@@ -145736,7 +145785,7 @@ self: {
        description = "Image IO for Yarr library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libdevil;};
+     }) {inherit (pkgs) libdevil;};
 
   "yate" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, hspec, mtl, scientific
@@ -146512,7 +146561,7 @@ self: {
        description = "Example programs using the Yesod Web Framework. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) sqlite;};
+     }) {inherit (pkgs) sqlite;};
 
   "yesod-fay" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, directory
@@ -147727,7 +147776,7 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/yices-painless";
        description = "An embedded language for programming the Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) gmp;  inherit (pkgs) yices;};
+     }) {inherit (pkgs) gmp; inherit (pkgs) yices;};
 
   "yjftp" = callPackage
     ({ mkDerivation, base, directory, ftphs, haskeline, hsConfigure
@@ -147991,7 +148040,7 @@ self: {
        homepage = "http://bitbucket.org/iago/z3-haskell";
        description = "Bindings for the Z3 Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
-     }) { gomp = null;  inherit (pkgs) z3;};
+     }) {gomp = null; inherit (pkgs) z3;};
 
   "zampolit" = callPackage
     ({ mkDerivation, base, cmdargs, containers, directory, filepath
@@ -148124,7 +148173,7 @@ self: {
        description = "Bindings to ZeroMQ 2.1.x";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) zeromq;};
+     }) {inherit (pkgs) zeromq;};
 
   "zeromq3-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, lifted-base
@@ -148166,7 +148215,7 @@ self: {
        description = "Bindings to ZeroMQ 3.x";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) zeromq;};
+     }) {inherit (pkgs) zeromq;};
 
   "zeromq4-haskell" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, exceptions
@@ -148187,7 +148236,7 @@ self: {
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 4.x";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) zeromq;};
+     }) {inherit (pkgs) zeromq;};
 
   "zeroth" = callPackage
     ({ mkDerivation, base, Cabal, derive, directory, filepath
@@ -148254,7 +148303,7 @@ self: {
        homepage = "http://github.com/jgm/zip-archive";
        description = "Library for creating and modifying zip archives";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) zip;};
+     }) {inherit (pkgs) zip;};
 
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
@@ -148344,7 +148393,7 @@ self: {
        librarySystemDepends = [ zlib ];
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) zlib;};
+     }) {inherit (pkgs) zlib;};
 
   "zlib" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty
@@ -148362,7 +148411,7 @@ self: {
        jailbreak = true;
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) zlib;};
+     }) {inherit (pkgs) zlib;};
 
   "zlib-bindings" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:

From a9ec286d99e8800e9709e8921b934efc88e1a8cf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Aug 2015 22:29:56 +0200
Subject: [PATCH 1606/2016] haskell-regex-tdfa-text has been fixed upstream.

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 ---
 1 file changed, 3 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 c61b9c26211..04205825ef2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -221,9 +221,6 @@ self: super: {
   vector_0_10_9_2 = markBroken super.vector_0_10_9_2;
   hoopl_3_10_2_0 = markBroken super.hoopl_3_10_2_0;
 
-  # http://hub.darcs.net/shelarcy/regex-tdfa-text/issue/1 -- upstream seems to be asleep
-  regex-tdfa-text = appendPatch super.regex-tdfa-text ./patches/regex-tdfa-text.patch;
-
   # https://github.com/HugoDaniel/RFC3339/issues/14
   timerep = dontCheck super.timerep;
 

From 93a3ba3909ca67a62c636a2fba75dd80c416bbdf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Aug 2015 23:01:42 +0200
Subject: [PATCH 1607/2016] haskell-github-types: test suite tries to access
 the network

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2705a301124..41eeaf30cc5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -314,6 +314,7 @@ self: super: {
   concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
   dbus = dontCheck super.dbus;                          # http://hydra.cryp.to/build/498404/log/raw
   digitalocean-kzs = dontCheck super.digitalocean-kzs;  # https://github.com/KazumaSATO/digitalocean-kzs/issues/1
+  github-types = dontCheck super.github-types;          # http://hydra.cryp.to/build/1114046/nixlog/1/raw
   hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw
   hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
   hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });

From 03921972268934d900cc32dad253ff383926771c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Aug 2015 12:52:16 +0200
Subject: [PATCH 1608/2016] fix python_fedora build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 959ab2ebcc19c6f44f2ec6ddb79d16af7d69d4d3)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/top-level/python-packages.nix | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7da29365218..42db423a451 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1343,16 +1343,16 @@ let
       maintainers = with maintainers; [ bjornfor ];
     };
   };
-  
+
   blaze = buildPythonPackage rec {
     name = "blaze-${version}";
     version = "0.8.2";
-    
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/blaze/${name}.tar.gz";
       sha256 = "1abedabf2a1e62dd059e0942d60f27337763de26f5e3f61ed55baaf97723b624";
     };
-    
+
     propagatedBuildInputs = with self; [
       numpy
       pandas
@@ -1363,7 +1363,7 @@ let
       sqlalchemy9 # sqlalchemy8 should also work
       psutil
     ];
-    
+
     meta = {
       homepage = https://github.com/ContinuumIO/blaze;
       description = "Allows Python users a familiar interface to query data living in other data storage systems";
@@ -2448,7 +2448,7 @@ let
 
   cffi_0_8 = buildPythonPackage rec {
     name = "cffi-0.8.6";
- 
+
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz";
       sha256 = "0406j3sgndmx88idv5zxkkrwfqxmjl18pj8gf47nsg4ymzixjci5";
@@ -8094,22 +8094,22 @@ let
   plover = pythonPackages.buildPythonPackage rec {
     name = "plover-${version}";
     version = "2.5.8";
-    
+
     meta = {
       description = "OpenSteno Plover stenography software";
       maintainers = [ maintainers.twey ];
       license = licenses.gpl2;
     };
-    
+
     src = pkgs.fetchurl {
       url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
       sha256 = "23f7824a715f93eb2c41d5bafd0c6f3adda92998e9321e1ee029abe7a6ab41e5";
     };
-    
+
     propagatedBuildInputs = with self; [ wxPython pyserial xlib appdirs pkgs.wmctrl ];
     preConfigure = "substituteInPlace setup.py --replace /usr/share usr/share";
   };
-  
+
   pymysql = buildPythonPackage rec {
     name = "pymysql-${version}";
     version = "0.6.6";
@@ -8626,7 +8626,7 @@ let
       url = "https://pypi.python.org/packages/source/n/numexpr/${name}.tar.gz";
       sha256 = "3ae7191c89df40db6b0a8637a4dace7c5956bc910793a53225f985f3b443c722";
     };
-    
+
     # Tests fail with python 3. https://github.com/pydata/numexpr/issues/177
     doCheck = !isPy3k;
 
@@ -11068,6 +11068,11 @@ let
     };
     propagatedBuildInputs = with self; [ kitchen requests bunch paver ];
     doCheck = false;
+
+    # https://github.com/fedora-infra/python-fedora/issues/140
+    preBuild = ''
+      sed -i '4,15d' setup.py
+    '';
   });
 
   python_simple_hipchat = buildPythonPackage rec {
@@ -17267,11 +17272,11 @@ let
       maintainers = with maintainers; [ odi ];
     };
   };
-  
+
   suds = buildPythonPackage rec {
     name = "suds-0.4";
     disabled = isPy3k;
-    
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz";
       md5 = "b7502de662341ed7275b673e6bd73191";

From e65fce3af64ea0b2058a69d72bc74a0baa756bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Aug 2015 13:22:29 +0200
Subject: [PATCH 1609/2016] docker: fix build on i686

---
 pkgs/applications/virtualization/docker/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index b915e744358..6ad59a087e9 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,6 +1,8 @@
 { stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper,
 btrfsProgs, iptables, bash, e2fsprogs, xz}:
 
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md
+
 stdenv.mkDerivation rec {
   name = "docker-${version}";
   version = "1.8.1";
@@ -16,6 +18,11 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
+  preConfigure = ''
+    mv vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/{jump_amd64.go,jump_linux.go}
+    sed -i 's/,amd64//' vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/jump_linux.go
+  '';
+
   buildPhase = ''
     patchShebangs .
     export AUTO_GOPATH=1

From 6fe75323961b4e23fd5ce71b044700c9377cbfd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Aug 2015 13:41:37 +0200
Subject: [PATCH 1610/2016] Revert "vagrant: use ruby 2.2"

This reverts commit c00405d8d9bab331055f202f61ac117900454f36.
---
 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 0a786d875bf..9ab994b5735 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5855,7 +5855,7 @@ let
   uncrustify = callPackage ../development/tools/misc/uncrustify { };
 
   vagrant = callPackage ../development/tools/vagrant {
-    ruby = ruby_2_2_2;
+    ruby = ruby_2_0_0;
   };
 
   gdb = callPackage ../development/tools/misc/gdb {

From f15270833ad3e843619fc953e4b28e2d9499b3f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Aug 2015 12:10:56 +0200
Subject: [PATCH 1611/2016] Don't barf JSON at users in error messages

---
 pkgs/stdenv/generic/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index fe7bec54ba0..249e4845bc2 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -27,7 +27,7 @@ let
     lib.lists.all (license:
       let l = lib.licenses.${license.shortName or "BROKEN"} or false; in
       if license == l then true else
-        throw ''‘${builtins.toJSON license}’ is not an attribute of lib.licenses''
+        throw ''‘${showLicense license}’ is not an attribute of lib.licenses''
     ) list;
 
   mutuallyExclusive = a: b:
@@ -73,6 +73,8 @@ let
     isUnfree (lib.lists.toList attrs.meta.license) &&
     !allowUnfreePredicate attrs;
 
+  showLicense = license: license.shortName or "unknown";
+
   defaultNativeBuildInputs = extraBuildInputs ++
     [ ../../build-support/setup-hooks/move-docs.sh
       ../../build-support/setup-hooks/compress-man-pages.sh
@@ -121,9 +123,9 @@ let
 
       licenseAllowed = attrs:
         if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then
-          throwEvalHelp "Unfree" "has an unfree license ‘${builtins.toJSON attrs.meta.license}’ which is not whitelisted"
+          throwEvalHelp "Unfree" "has an unfree license (‘${showLicense attrs.meta.license}’)"
         else if hasBlacklistedLicense attrs then
-          throwEvalHelp "blacklisted" "has the ‘${builtins.toJSON attrs.meta.license}’ license which is blacklisted"
+          throwEvalHelp "blacklisted" "has a blacklisted license (‘${showLicense attrs.meta.license}’)"
         else if !allowBroken && attrs.meta.broken or false then
           throwEvalHelp "Broken" "is marked as broken"
         else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then

From 287c08d8a319fc454e3d1ce90510f7a53e9d4e5d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Aug 2015 15:24:14 +0200
Subject: [PATCH 1612/2016] Rename services.openssh.knownHosts -> 
 programs.ssh.knownHosts

This option configures the SSH client, not the server.
---
 nixos/modules/programs/ssh.nix                | 74 ++++++++++++++++-
 nixos/modules/rename.nix                      |  1 +
 .../modules/services/networking/ssh/sshd.nix  | 79 +------------------
 3 files changed, 75 insertions(+), 79 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index d3183f7d2dc..e9ad47adec9 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -18,6 +18,14 @@ let
       exec ${askPassword}
     '';
 
+  knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
+
+  knownHostsText = flip (concatMapStringsSep "\n") knownHosts
+    (h:
+      concatStringsSep "," h.hostNames + " "
+      + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
+    );
+
 in
 {
   ###### interface
@@ -92,16 +100,72 @@ in
         '';
       };
 
+      knownHosts = mkOption {
+        default = {};
+        type = types.loaOf types.optionSet;
+        description = ''
+          The set of system-wide known SSH hosts.
+        '';
+        example = [
+          {
+            hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
+            publicKeyFile = literalExample "./pubkeys/myhost_ssh_host_dsa_key.pub";
+          }
+          {
+            hostNames = [ "myhost2" ];
+            publicKeyFile = literalExample "./pubkeys/myhost2_ssh_host_dsa_key.pub";
+          }
+        ];
+        options = {
+          hostNames = mkOption {
+            type = types.listOf types.str;
+            default = [];
+            description = ''
+              A list of host names and/or IP numbers used for accessing
+              the host's ssh service.
+            '';
+          };
+          publicKey = mkOption {
+            default = null;
+            type = types.nullOr types.str;
+            example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg==";
+            description = ''
+              The public key data for the host. You can fetch a public key
+              from a running SSH server with the <command>ssh-keyscan</command>
+              command. The public key should not include any host names, only
+              the key type and the key itself.
+            '';
+          };
+          publicKeyFile = mkOption {
+            default = null;
+            type = types.nullOr types.path;
+            description = ''
+              The path to the public key file for the host. The public
+              key file is read at build time and saved in the Nix store.
+              You can fetch a public key file from a running SSH server
+              with the <command>ssh-keyscan</command> command. The content
+              of the file should follow the same format as described for
+              the <literal>publicKey</literal> option.
+            '';
+          };
+        };
+      };
+
     };
 
   };
 
   config = {
 
-    assertions = singleton
-      { assertion = cfg.forwardX11 -> cfg.setXAuthLocation;
-        message = "cannot enable X11 forwarding without setting XAuth location";
-      };
+    assertions =
+      [ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation;
+          message = "cannot enable X11 forwarding without setting XAuth location";
+        }
+      ] ++ flip mapAttrsToList cfg.knownHosts (name: data: {
+        assertion = (data.publicKey == null && data.publicKeyFile != null) ||
+                    (data.publicKey != null && data.publicKeyFile == null);
+        message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
+      });
 
     # SSH configuration. Slight duplication of the sshd_config
     # generation in the sshd service.
@@ -118,6 +182,8 @@ in
         ${cfg.extraConfig}
       '';
 
+    environment.etc."ssh/ssh_known_hosts".text = knownHostsText;
+
     # FIXME: this should really be socket-activated for über-awesomeness.
     systemd.user.services.ssh-agent =
       { enable = cfg.startAgent;
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 4db08b7ad3d..6f7dcb837a0 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -110,6 +110,7 @@ in zipModules ([]
 ++ obsolete [ "services" "sshd" "permitRootLogin" ] [ "services" "openssh" "permitRootLogin" ]
 ++ obsolete [ "services" "xserver" "startSSHAgent" ] [ "services" "xserver" "startOpenSSHAgent" ]
 ++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ]
+++ alias [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ]
 
 # VirtualBox
 ++ obsolete [ "services" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ]
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 1c428ceddfd..4c7e4d8d088 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -9,14 +9,6 @@ let
 
   nssModulesPath = config.system.nssModules.path;
 
-  knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
-
-  knownHostsText = flip (concatMapStringsSep "\n") knownHosts
-    (h:
-      concatStringsSep "," h.hostNames + " "
-      + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
-    );
-
   userOptions = {
 
     openssh.authorizedKeys = {
@@ -48,8 +40,7 @@ let
   };
 
   authKeysFiles = let
-    mkAuthKeyFile = u: {
-      target = "ssh/authorized_keys.d/${u.name}";
+    mkAuthKeyFile = u: nameValuePair "ssh/authorized_keys.d/${u.name}" {
       mode = "0444";
       source = pkgs.writeText "${u.name}-authorized_keys" ''
         ${concatStringsSep "\n" u.openssh.authorizedKeys.keys}
@@ -59,7 +50,7 @@ let
     usersWithKeys = attrValues (flip filterAttrs config.users.extraUsers (n: u:
       length u.openssh.authorizedKeys.keys != 0 || length u.openssh.authorizedKeys.keyFiles != 0
     ));
-  in map mkAuthKeyFile usersWithKeys;
+  in listToAttrs (map mkAuthKeyFile usersWithKeys);
 
 in
 
@@ -211,57 +202,6 @@ in
         description = "Verbatim contents of <filename>sshd_config</filename>.";
       };
 
-      knownHosts = mkOption {
-        default = {};
-        type = types.loaOf types.optionSet;
-        description = ''
-          The set of system-wide known SSH hosts.
-        '';
-        example = [
-          {
-            hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
-            publicKeyFile = literalExample "./pubkeys/myhost_ssh_host_dsa_key.pub";
-          }
-          {
-            hostNames = [ "myhost2" ];
-            publicKeyFile = literalExample "./pubkeys/myhost2_ssh_host_dsa_key.pub";
-          }
-        ];
-        options = {
-          hostNames = mkOption {
-            type = types.listOf types.str;
-            default = [];
-            description = ''
-              A list of host names and/or IP numbers used for accessing
-              the host's ssh service.
-            '';
-          };
-          publicKey = mkOption {
-            default = null;
-            type = types.nullOr types.str;
-            example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg==";
-            description = ''
-              The public key data for the host. You can fetch a public key
-              from a running SSH server with the <command>ssh-keyscan</command>
-              command. The public key should not include any host names, only
-              the key type and the key itself.
-            '';
-          };
-          publicKeyFile = mkOption {
-            default = null;
-            type = types.nullOr types.path;
-            description = ''
-              The path to the public key file for the host. The public
-              key file is read at build time and saved in the Nix store.
-              You can fetch a public key file from a running SSH server
-              with the <command>ssh-keyscan</command> command. The content
-              of the file should follow the same format as described for
-              the <literal>publicKey</literal> option.
-            '';
-          };
-        };
-      };
-
       moduliFile = mkOption {
         example = "services.openssh.moduliFile = /etc/my-local-ssh-moduli;";
         type = types.path;
@@ -292,14 +232,8 @@ in
 
     services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli";
 
-    environment.etc = authKeysFiles ++ [
-      { source = cfg.moduliFile;
-        target = "ssh/moduli";
-      }
-      { text = knownHostsText;
-        target = "ssh/ssh_known_hosts";
-      }
-    ];
+    environment.etc = authKeysFiles //
+      { "ssh/moduli".source = cfg.moduliFile; };
 
     systemd =
       let
@@ -417,11 +351,6 @@ in
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
                     message = "cannot enable X11 forwarding without setting xauth location";}]
-      ++ flip mapAttrsToList cfg.knownHosts (name: data: {
-        assertion = (data.publicKey == null && data.publicKeyFile != null) ||
-                    (data.publicKey != null && data.publicKeyFile == null);
-        message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
-      })
       ++ flip map cfg.listenAddresses ({ addr, port, ... }: {
         assertion = addr != null;
         message = "addr must be specified in each listenAddresses entry";

From 7c6ff6c1da65684137d9c3554540720f2f28e6cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Aug 2015 15:29:05 +0200
Subject: [PATCH 1613/2016] programs.ssh.knownHosts: Use submodule

---
 nixos/modules/programs/ssh.nix | 69 +++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index e9ad47adec9..87a00497621 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -102,7 +102,41 @@ in
 
       knownHosts = mkOption {
         default = {};
-        type = types.loaOf types.optionSet;
+        type = types.loaOf (types.submodule {
+          options = {
+            hostNames = mkOption {
+              type = types.listOf types.str;
+              default = [];
+              description = ''
+                A list of host names and/or IP numbers used for accessing
+                the host's ssh service.
+              '';
+            };
+            publicKey = mkOption {
+              default = null;
+              type = types.nullOr types.str;
+              example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg==";
+              description = ''
+                The public key data for the host. You can fetch a public key
+                from a running SSH server with the <command>ssh-keyscan</command>
+                command. The public key should not include any host names, only
+                the key type and the key itself.
+              '';
+            };
+            publicKeyFile = mkOption {
+              default = null;
+              type = types.nullOr types.path;
+              description = ''
+                The path to the public key file for the host. The public
+                key file is read at build time and saved in the Nix store.
+                You can fetch a public key file from a running SSH server
+                with the <command>ssh-keyscan</command> command. The content
+                of the file should follow the same format as described for
+                the <literal>publicKey</literal> option.
+              '';
+            };
+          };
+        });
         description = ''
           The set of system-wide known SSH hosts.
         '';
@@ -116,39 +150,6 @@ in
             publicKeyFile = literalExample "./pubkeys/myhost2_ssh_host_dsa_key.pub";
           }
         ];
-        options = {
-          hostNames = mkOption {
-            type = types.listOf types.str;
-            default = [];
-            description = ''
-              A list of host names and/or IP numbers used for accessing
-              the host's ssh service.
-            '';
-          };
-          publicKey = mkOption {
-            default = null;
-            type = types.nullOr types.str;
-            example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg==";
-            description = ''
-              The public key data for the host. You can fetch a public key
-              from a running SSH server with the <command>ssh-keyscan</command>
-              command. The public key should not include any host names, only
-              the key type and the key itself.
-            '';
-          };
-          publicKeyFile = mkOption {
-            default = null;
-            type = types.nullOr types.path;
-            description = ''
-              The path to the public key file for the host. The public
-              key file is read at build time and saved in the Nix store.
-              You can fetch a public key file from a running SSH server
-              with the <command>ssh-keyscan</command> command. The content
-              of the file should follow the same format as described for
-              the <literal>publicKey</literal> option.
-            '';
-          };
-        };
       };
 
     };

From f6eece6f8f4aac8598aed0fbc8bfc2a621f33633 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Aug 2015 15:31:21 +0200
Subject: [PATCH 1614/2016] programs.ssh.knownHosts: Use attribute name

This allows writing:

  programs.ssh.knownHosts."10.1.2.3".publicKey = "bar";

instead of

  programs.ssh.knownHosts = [ { hostNames = [ "10.1.2.3" ]; publicKey = "bar"; } ];
---
 nixos/modules/programs/ssh.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 87a00497621..cf7ef455eb8 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -21,7 +21,7 @@ let
   knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
 
   knownHostsText = flip (concatMapStringsSep "\n") knownHosts
-    (h:
+    (h: assert h.hostNames != [];
       concatStringsSep "," h.hostNames + " "
       + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
     );
@@ -102,7 +102,7 @@ in
 
       knownHosts = mkOption {
         default = {};
-        type = types.loaOf (types.submodule {
+        type = types.loaOf (types.submodule ({ name, ... }: {
           options = {
             hostNames = mkOption {
               type = types.listOf types.str;
@@ -136,7 +136,10 @@ in
               '';
             };
           };
-        });
+          config = {
+            hostNames = mkDefault [ name ];
+          };
+        }));
         description = ''
           The set of system-wide known SSH hosts.
         '';

From 071009ee4f840fc47dfca1ce3709b3898d5bd1cf Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 27 Aug 2015 15:12:32 +0300
Subject: [PATCH 1615/2016] ubootJetsonTK1: Install some more files

tegra-uboot-flasher needs 'u-boot', 'u-boot-nodtb-tegra.bin' and
'u-boot.dtb' for its 'flash' subcommand, and 'u-boot-dtb-tegra.bin'
for its exec subcommand.

No, there's no sanity in the embedded world.
---
 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 3853efc66ee..57532f115aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10245,7 +10245,7 @@ let
   ubootJetsonTK1 = callPackage ../misc/uboot {
     defconfig = "jetson-tk1_defconfig";
     targetPlatforms = ["armv7l-linux"];
-    filesToInstall = ["u-boot-dtb-tegra.bin"];
+    filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
   };
 
   ubootPcduino3Nano = callPackage ../misc/uboot {

From d4988bd5baed638054dfb4576411cd8d40e79b81 Mon Sep 17 00:00:00 2001
From: Enrico Fasoli <fazius2009@gmail.com>
Date: Thu, 27 Aug 2015 14:17:33 +0000
Subject: [PATCH 1616/2016] syncthing: 0.11.21 -> 0.11.22

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 1ee9e71e782..f42426b3caf 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.21";
+  version = "0.11.22";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "2e7faf1002570a64ef76c6bbdde781c550db6c45b30f4fa1c394102809cad977";
+    sha256 = "0zdk5ppsq35s10chf8m3rw3sk9d77ms7x1vj3inw4lrm1h13w9wk";
   };
 
   subPackages = [ "cmd/syncthing" ];

From 6a41cb828ecc4b1fde67d3a8d1fac5249190bf96 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Aug 2015 16:44:23 +0200
Subject: [PATCH 1617/2016] xdaliclock: replace use of builderDefsPackage

---
 pkgs/tools/misc/xdaliclock/default.nix | 61 ++++++++------------------
 1 file changed, 18 insertions(+), 43 deletions(-)

diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 16a54c81946..33c9489a70d 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -1,52 +1,27 @@
-x@{builderDefsPackage
-  , libX11, xproto, libXt, libICE
-  , libSM, libXext
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, libX11, xproto, libXt, libICE, libSM, libXext }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="xdaliclock";
-    version = "2.43";
-    name="${baseName}-${version}";
-    project="${baseName}";
-    url="http://www.jwz.org/${project}/${name}.tar.gz";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
+stdenv.mkDerivation rec {
+  name = "xdaliclock-${version}";
+  version = "2.43";
+
+  src = fetchurl {
+    url="http://www.jwz.org/xdaliclock/${name}.tar.gz";
     sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  sourceRoot = "${name}/X11";
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "prepareDirs" "doMakeInstall"];
+  buildInputs = [ libX11 xproto libXt libICE libSM libXext ];
 
-  prepareDirs = a.fullDepEntry ''
-    mkdir -p "$out/bin" "$out/share" "$out/share/man/man1"
-  '' ["minInit" "defEnsureDir"];
+  preInstall = ''
+    mkdir -vp $out/bin $out/share/man/man1
+  '';
 
-  goSrcDir = "cd X11";
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "A clock application that morphs digits when they are changed";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux ++ freebsd;
-    license = a.lib.licenses.free; #TODO BSD on Gentoo, looks like MIT
-    downloadPage = "http://www.jwz.org/xdaliclock/";
-    inherit version;
-    updateWalker = true;
+    maintainers = with maintainers; [ raskin rycee ];
+    platforms = with platforms; linux ++ freebsd;
+    license = licenses.free; #TODO BSD on Gentoo, looks like MIT
+    downloadPage = http://www.jwz.org/xdaliclock/;
   };
-}) x
+}

From 3dc24b9e53f62ab76da7f03945ed0217daf6c86b Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 27 Aug 2015 17:14:54 +0200
Subject: [PATCH 1618/2016] =?UTF-8?q?umlet=2013.2=20=E2=86=92=2013.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix
index 04f3a31aa48..cc51af22f85 100644
--- a/pkgs/tools/misc/umlet/default.nix
+++ b/pkgs/tools/misc/umlet/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   major = "13";
-  minor = "2";
+  minor = "3";
   version = "${major}.${minor}";
   name = "umlet-${version}";
 
   src = fetchurl {
     url = "http://www.umlet.com/umlet_${major}_${minor}/umlet_${version}.zip";
-    sha256 = "19jngb2sr212lh3yi43bqq2skhd9cxa8yfbfc3i6fbm2v0b7i2xf";
+    sha256 = "0fbr51xknk98qz576lcl25qz0s1snns2yb0j54d77xkw7pnxmvzr";
   };
 
   buildInputs = [ unzip ];

From 52d7550da317001c4015e4b1edd1d359dabe7d91 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 27 Aug 2015 18:10:46 +0200
Subject: [PATCH 1619/2016] gdm: point to /etc/gdm/custom.conf

---
 pkgs/desktops/gnome-3/3.16/core/gdm/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
index d4ef3e13eea..d3d6f4e471c 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
     substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
   '';
 
-  configureFlags = [ "--localstatedir=/var" "--with-systemd=yes"
+  configureFlags = [ "--sysconfdir=/etc"
+                     "--localstatedir=/var"
+                     "--with-systemd=yes"
                      "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
 
   buildInputs = [ pkgconfig glib itstool libxml2 intltool
@@ -30,7 +32,10 @@ stdenv.mkDerivation rec {
   '';
 
   # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./no-dbus-launch.patch ];
+  patches = [ ./xserver_path.patch ./sessions_dir.patch
+              ./disable_x_access_control.patch ./no-dbus-launch.patch ];
+
+  installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GDM;

From 6eb096900f143bc85f725890f76a3ab7ceca6751 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 27 Aug 2015 18:11:09 +0200
Subject: [PATCH 1620/2016] nixos gdm: support autologin

---
 .../services/x11/display-managers/gdm.nix     | 65 ++++++++++++++++---
 1 file changed, 56 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 6c3c5273086..245c18ee2d9 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -18,14 +18,42 @@ in
 
     services.xserver.displayManager.gdm = {
 
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        example = true;
-        description = ''
-          Whether to enable GDM as the display manager.
-          <emphasis>GDM is very experimental and may render system unusable.</emphasis>
-        '';
+      enable = mkEnableOption ''
+        Whether to enable GDM as the display manager.
+        <emphasis>GDM is very experimental and may render system unusable.</emphasis>
+      '';
+
+      autoLogin = mkOption {
+        default = {};
+
+        type = types.submodule {
+          options = {
+            enable = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Automatically log in as the sepecified <option>auto.user</option>.
+              '';
+            };
+
+            user = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                User to be used for the autologin.
+              '';
+            };
+
+            delay = mkOption {
+              type = types.int;
+              default = 0;
+              description = ''
+                Seconds of inactivity after which the autologin will be performed.
+              '';
+            };
+
+          };
+        };
       };
 
     };
@@ -71,6 +99,25 @@ in
 
     programs.dconf.profiles.gdm = "${gdm}/share/dconf/profile/gdm";
 
+    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}
+      ''}
+
+      [security]
+
+      [xdmcp]
+
+      [greeter]
+
+      [chooser]
+
+      [debug]
+    '';
+
     # GDM LFS PAM modules, adapted somehow to NixOS
     security.pam.services = {
       gdm-launch-environment.text = ''
@@ -89,7 +136,7 @@ in
         session  optional       pam_permit.so
       '';
 
-     gdm.text = ''
+      gdm.text = ''
         auth     requisite      pam_nologin.so
         auth     required       pam_env.so
 

From 119a6ef543161f5dcd7a5347d4765fc8da178e0f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 27 Aug 2015 18:11:30 +0200
Subject: [PATCH 1621/2016] gnome3 test: use gdm with autologin instead of slim

---
 nixos/tests/gnome3.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index f5e0159f1c7..3425ca09951 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -11,8 +11,13 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       services.xserver.enable = true;
 
-      services.xserver.displayManager.auto.enable = true;
-      services.xserver.displayManager.auto.user = "alice";
+      services.xserver.displayManager.gdm = {
+        enable = true;
+        autoLogin = {
+          enable = true;
+          user = "alice";
+        };
+      };
       services.xserver.desktopManager.gnome3.enable = true;
 
       virtualisation.memorySize = 512;
@@ -21,7 +26,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   testScript =
     ''
       $machine->waitForX;
-      $machine->sleep(15);
+      $machine->sleep(60);
 
       # Check that logging in has given the user ownership of devices.
       $machine->succeed("getfacl /dev/snd/timer | grep -q alice");

From e5b6de902fd9be58dd986307fb12a088f9a5fd2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Aug 2015 18:45:48 +0200
Subject: [PATCH 1622/2016] setuptools: 18.0.1 -> 18.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 43b3f6e59d5e948adeab1ffd74a09ec252b372fd)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/development/python-modules/setuptools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index f6030bb9526..57c455f851c 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   shortName = "setuptools-${version}";
   name = "${python.executable}-${shortName}";
 
-  version = "18.0.1";
+  version = "18.2";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
-    sha256 = "152b4qlpqc54939vfx5ipjpgx0kln02n3ywpm6x25pqysngwjjad";
+    sha256 = "07avbdc26yl2a46s76fc7m4vg611g8sh39l26x9dr9byya6sb509";
   };
 
   buildInputs = [ python wrapPython distutils-cfg ];
@@ -35,5 +35,5 @@ stdenv.mkDerivation rec {
     homepage = http://pypi.python.org/pypi/setuptools;
     license = [ "PSF" "ZPL" ];
     platforms = platforms.all;
-  };    
+  };
 }

From 4e41b64511bfa075aaba20f27f6adb75548403f0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Aug 2015 16:46:30 +0200
Subject: [PATCH 1623/2016] valgrind: Separate doc output

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

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 3c59bf45eff..da127b2f8ee 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19";
   }) ./linux-4.0.patch];
 
+  outputs = [ "out" "doc" ];
+
   # Perl is needed for `cg_annotate'.
   # GDB is needed to provide a sane default for `--db-command'.
   nativeBuildInputs = [ perl ];

From 97cd7cfea2d44b97e536b0d36d2ed9d4c15e998e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Aug 2015 16:56:43 +0200
Subject: [PATCH 1624/2016] docbook-xsl: Remove cruft

---
 .../stylesheets/xslt/docbook-xsl/builder.sh   |  8 -------
 .../stylesheets/xslt/docbook-xsl/default.nix  | 22 +++++++++++++++----
 2 files changed, 18 insertions(+), 12 deletions(-)
 delete mode 100644 pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh

diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh
deleted file mode 100644
index 9ac8e74d93a..00000000000
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out
-cd $out
-unpackFile $src
-mkdir xml
-mkdir xml/xsl
-mv docbook-xsl-* xml/xsl/docbook
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index 981aa59369d..844789665f7 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -1,10 +1,24 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "docbook-xsl-1.78.1";
-  builder = ./builder.sh;
+
   src = fetchurl {
-    url = mirror://sourceforge/docbook/docbook-xsl-1.78.1.tar.bz2;
+    url = "mirror://sourceforge/docbook/${name}.tar.bz2";
     sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9";
   };
+
+  buildPhase = "true";
+
+  installPhase =
+    ''
+      dst=$out/share/xml/docbook-xsl
+      mkdir -p $dst
+      rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp
+      mv * $dst/
+
+      # Backwards compatibility. Will remove eventually.
+      mkdir -p $out/xml/xsl
+      ln -s $dst $out/xml/xsl/docbook
+    '';
 }

From 0ac4ad33fd0315a5b255030e48d209fa0a638657 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Aug 2015 17:01:45 +0200
Subject: [PATCH 1625/2016] Unify the docbook-xsl and docbook-xsl-ns
 expressions

---
 .../xslt/docbook-xsl-ns/default.nix           | 31 ----------
 .../stylesheets/xslt/docbook-xsl/default.nix  | 57 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  8 +--
 3 files changed, 44 insertions(+), 52 deletions(-)
 delete mode 100644 pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix

diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
deleted file mode 100644
index 36d2cc48c9f..00000000000
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "docbook-xsl-ns-1.78.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/docbook/${name}.tar.bz2";
-    sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng";
-  };
-
-  buildPhase = "true";
-
-  installPhase =
-    ''
-      dst=$out/share/xml/docbook-xsl-ns
-      mkdir -p $dst
-      rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp
-      mv * $dst/
-
-      # Backwards compatibility. Will remove eventually.
-      mkdir -p $out/xml/xsl
-      ln -s $dst $out/xml/xsl/docbook
-    '';
-
-  meta = {
-    homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets;
-    description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats";
-    maintainers = [ lib.maintainers.eelco ];
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index 844789665f7..863f6044402 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -1,24 +1,47 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
-  name = "docbook-xsl-1.78.1";
+let
 
-  src = fetchurl {
-    url = "mirror://sourceforge/docbook/${name}.tar.bz2";
+  common = { pname, sha256 }: stdenv.mkDerivation rec {
+    name = "${pname}-1.78.1";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/docbook/${name}.tar.bz2";
+      inherit sha256;
+    };
+
+    buildPhase = "true";
+
+    installPhase =
+      ''
+        dst=$out/share/xml/${pname}
+        mkdir -p $dst
+        rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp
+        mv * $dst/
+
+        # Backwards compatibility. Will remove eventually.
+        mkdir -p $out/xml/xsl
+        ln -s $dst $out/xml/xsl/docbook
+      '';
+
+    meta = {
+      homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets;
+      description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats";
+      maintainers = [ lib.maintainers.eelco ];
+      platforms = lib.platforms.all;
+    };
+  };
+
+in {
+
+  docbook_xsl = common {
+    pname = "docbook-xsl";
     sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9";
   };
 
-  buildPhase = "true";
+  docbook_xsl_ns = common {
+    pname = "docbook-xsl-ns";
+    sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng";
+  };
 
-  installPhase =
-    ''
-      dst=$out/share/xml/docbook-xsl
-      mkdir -p $dst
-      rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp
-      mv * $dst/
-
-      # Backwards compatibility. Will remove eventually.
-      mkdir -p $out/xml/xsl
-      ln -s $dst $out/xml/xsl/docbook
-    '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ab994b5735..b8af711af71 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10507,14 +10507,14 @@ let
 
   docbook_xml_ebnf_dtd = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf { };
 
+  inherit (callPackages ../data/sgml+xml/stylesheets/xslt/docbook-xsl { })
+    docbook_xsl
+    docbook_xsl_ns;
+
   docbook_xml_xslt = docbook_xsl;
 
-  docbook_xsl = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl { };
-
   docbook5_xsl = docbook_xsl_ns;
 
-  docbook_xsl_ns = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl-ns { };
-
   dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { };
 
   eb-garamond = callPackage ../data/fonts/eb-garamond { };

From 150211741856f6292ebd9ea747f7fef725c84ebc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Aug 2015 17:24:42 +0200
Subject: [PATCH 1626/2016] sane-backends: Separate doc output

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

diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix
index 74321549318..66fc4810e7d 100644
--- a/pkgs/applications/graphics/sane/backends.nix
+++ b/pkgs/applications/graphics/sane/backends.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7";
   };
 
+  outputs = [ "out" "doc" "man" ];
+
   udevSupport = hotplugSupport;
 
   configureFlags = stdenv.lib.optional (libusb != null) "--enable-libusb_1_0";

From e96ee79006b2af363cd566e555f8383b9bfba47e Mon Sep 17 00:00:00 2001
From: Alexander Lebedev <lebastr@gmail.com>
Date: Thu, 27 Aug 2015 18:57:01 +0000
Subject: [PATCH 1627/2016] qmidiroute: init at 0.3.0

---
 .../applications/audio/qmidiroute/default.nix | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/audio/qmidiroute/default.nix

diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix
new file mode 100644
index 00000000000..badac0887a1
--- /dev/null
+++ b/pkgs/applications/audio/qmidiroute/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, qt4, alsaLib }:
+
+stdenv.mkDerivation rec {
+  version = "0.3.0";
+  name = "qmidiroute-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz";
+    sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2";
+  };
+
+  buildInputs = [ pkgconfig qt4 alsaLib ];
+
+  meta = with stdenv.lib; {
+    description = "MIDI event processor and router";
+    longDescription = ''
+    qmidiroute is a versatile MIDI event processor and router for the ALSA
+    sequencer.  The graphical  interface  is  based  on  the  Qt4  toolkit.
+    qmidiroute permits setting up an unlimited number of MIDI maps in which
+    incoming events are selected, modified or even changed in  type  before
+    being  directed  to  a  dedicated  ALSA  output  port. The maps work in
+    parallel, and they are organized in tabs.
+    '';
+
+    license = licenses.gpl2;
+    maintainers = [ maintainers.lebastr ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8af711af71..6d3f493ea3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12551,6 +12551,8 @@ let
 
   QmidiNet = callPackage ../applications/audio/QmidiNet { };
 
+  qmidiroute = callPackage ../applications/audio/qmidiroute { };
+
   qmmp = callPackage ../applications/audio/qmmp { };
 
   qrcode = callPackage ../tools/graphics/qrcode {};

From 4e478cbeaa44c2342b92730f5302ad751e90f0a3 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 27 Aug 2015 22:07:55 +0200
Subject: [PATCH 1628/2016] cask: 0.7.2 -> 0.7.3

---
 pkgs/applications/editors/emacs-modes/cask/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix
index 7d987e73b91..3f1967c7053 100644
--- a/pkgs/applications/editors/emacs-modes/cask/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cask/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, emacs, python }:
 
 stdenv.mkDerivation rec {
-  name = "cask-0.7.2";
+  name = "cask-0.7.3";
 
   src = fetchgit {
     url = "https://github.com/cask/cask.git";
-    rev = "8d667e1ce3f3aa817a7b996f02058b2441f83958";
-    sha256 = "08brrdyz7zsw134zwf4dyj6bj2glflszssfq8vya3mh01s38mfri";
+    rev = "717b64a9ba7640ec366e8573da0c01f9c4d57b0c";
+    sha256 = "0j18rzgpibisfcci6kcgjs8nlkfi1dw33dxp6ab6zaiarydwgcs5";
   };
 
   buildInputs = [ emacs python ];

From 3f14b5f226d2561c986b3d7edeb0a57b4d5d4317 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 28 Aug 2015 10:12:21 +0900
Subject: [PATCH 1629/2016] firefox-bin: 40.0.2 -> 40.0.3

---
 .../browsers/firefox-bin/sources.nix          | 358 +++++++++---------
 1 file changed, 179 insertions(+), 179 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index d302e47f335..b29cdec27e9 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "40.0.2";
+  version = "40.0.3";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "4cd453a4439460164e15ac767483335f0ab153ba"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "2915386e271a710daf63b5fa6e4e6450cd339a23"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "2c64d95f8f7a82931906bb8ae6fcd6f2c976aa54"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "b9ca1f6a18283eb9eebd39173c33d7d0bbc5afe2"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "0a6c228d7f46bad34b431bb49d6bdc60c2778008"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "a509951f13eaab7661676f833dd9a83125309c82"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "372dffb81f1be1966e95bba114f982497a2caee0"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "82dd88dd2e4ded3c25f7ffd6b21dd51a0b693d43"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "52dbcef7858b57652ebd18e8b24af0c656f659e2"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "aafa712986beb5d28c51f07678f9e1f80489e199"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "0f206582c5f934a490f68d5226d1829397cc45a7"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "af49662ae762693ae916fcf491d331ad86acbf66"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "c9bbf9024acffabe1651d1ca9d0c13ce574d021b"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "a946941ad0fa094c54b76f0f31501cdd24582402"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "de19ed80796ba4423347654bbab170d72aea24b5"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "d566f37f8f908d621a51278c40e971be4a277749"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "bb7c41fd32b4b97ae25c1d7b3aee187810800387"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "b6063f82ce73e5070c983aa69d9c34dab74bc460"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "41b8d113a8d09d8fd28f4808ea630fcf732bee26"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "4c255a14338a602e9b8827f55c8c3f705a76f421"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c24df5f5dc5493d912b34e526617ed22075f3bb1"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b1be6518bc16874245e5a532d03a2bd7dc4fdc23"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "cfea274abe713d3c5df63b21489ba23766c97dad"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "10e5d0f6435a487b3331b76ac0eee51a2edb3485"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "66462c0af5e9a7f9052db2d9616a44ca08d51713"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "3a78840fe663d7876ea00cd6ecb0530f16146adf"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "8321046f8cbba3d3cdea7381f2ec4323b2ba7cfb"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "599c81a054ad7ef7c27f3be1da2289ed3404255b"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "89480e776bc5add4c9270f8f92e56d1a0207e629"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "7d7d40a7e74670eaaacb66d6a3706710d2d1cd4c"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "087b794e0988484dfd7d67488c3ac197e5529c42"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "3fd60bd6b42497d0968095294c94dcc11bdbbeda"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "2e22d7ff7c0a7a2f8bbf2c43f5da24c3eaf4ba8c"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "dc852f942018f08f2c3f56b3315dd039f0dd4159"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "a78fb79f0640fc018e4d7807bea41c6239bbdf2e"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "53a7c3e38d81df588db042bd8ee524aa67713f76"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "3721ac332975aa52f692bce9467f3919be16b4cb"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "602bee9867cead4ac79c05d8cb99d022de1169c6"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "f3809bd2b456b9548cf8415d4f15e08bf64f2561"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "6ed7be3d3f90ff01f3a8505ea61c69f1dc3f34af"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "3bff3a0f76e6744cb1e1ab78a5c24bd9183db1d5"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "87033acbf2d3277e699b1b54552a88bd33590f75"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "65a852e9774f9f61764d01e4025b64027f10d270"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "99e40bfcbc4146111059cbec1557fbe3a7295285"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "476b5ac7062932584ef634b9bd536495fef974d6"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "51334ee2ee6bdfd7e0b02ed44d95b9d0e86a73af"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "e2973dc7e1decebb24a4a90e8a4a4307ccd7d151"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "4bb52d9197c854ceca4a9d8fed6cec016c823ea7"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "2335e0f3bbae6eefdd1aa7ba58530f0ee9bd3534"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "8fdfc2defee83edeabc5648dcf4e4630862424b2"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "34201da70923a68566856aaf5f33e33f80c3943a"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "03ddd10a75a6a779bc0ff1f06f2ac0f4189c21db"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "b6456b85055178db737c3b2dbebec14ca7c373ec"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "165c5abc403322964de6fbda189c766c1490f57d"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "defd933884c5f97c63e8f07dbd42162d7365b5a6"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e0588631c0886ca5785f713c2fd4d52e53c901f6"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "732b79384c69659d674a849dfc0a4cc0905af5c0"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "30ea22676bf24205595fe3cef17f17e5fa7224c0"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "a0dd6bc63af523f12f77da3d93f842434dd45fbe"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "02e8d43be34bdd57d999ff34e93289d721fd5e18"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "13cb0fc5c3f2faf5907c71a88d9fb6dcf295534f"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "3688cb2d85620d03d8ae90535758384e0eca0b79"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "de4bfeaf65c5db67029f7800d3818f60a15e0a2f"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "3b87f8e2cbafc70264da1afabc9d4a365acdf445"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "e0d1d40ae201852a7afb5c5c3995d1eaac461880"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "d519fa72ae3acd5c5e9590242a1569e2559e7099"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "4c35aade33675ee9e6ee0ba3d2826da06509f048"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "a7f2c8c24766d4ad12a0144007eac93b99ffbc83"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "c809f3baf308c5cd7d9edc1a53f0b7cdb876a97c"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "182c27021f7192c50be9973850a848b138e60d0a"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "8bfa83a569409ae579aaf27f6878f90c9789128b"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "a68688038d975428a232f721da7f638f08fc0157"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "be223957dfcf41db552e4e63ec879e4c21eb40f4"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "d226c4ea4f987a9a8f01a8e6365e2c93ae748988"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "482a19d31d1543d2645ba290d6ab2404f200b81d"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "3bdac94346710be5c2c160153321f5bd9118c291"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "aafc01904d22edf7e6c4db94b3154875736de3be"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "3309dc84bf4d0b4f9aafce95f5af3ee3a01acd79"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "aa0f6c2f4d8f4cbd974d39cd0ef85ce7795bb00a"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "17cabcb46375f04a32ac4e156a30b97022406a46"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "51d3c83ff1584c315a18916100a9b2481d8b5ab8"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "0e725242eada7456e15c91acd63d37018167df71"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "3f68ab7a61fd8b6731aaf3089907d9e436a2e5e1"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "5934536499a2ded279a802110d8d8f0e802cc8c9"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "c212eaaa6329f9872e8545d634551d083e0f2db1"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "b6edd09144919be6932baa037f7f09ed26d5c102"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "63eeba0d15763340d802802008cce554a8bbb07d"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "c593a84cfb69ef7ee5d2a8affb15189147d0c2e1"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b2b63b30ebb9a220b610c0b1696b5da55d641710"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "1c6dcf9b30383a5566448ab4e92ef0a90613e505"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "fdaacae2217fe365eb54b977562ed8c889c95de9"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "9def4f5554110b6af64bc91f4ad0f03a6444dfae"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "7b9183a80a87febfd7e8cd57b93e2edabea763a8"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "a3ab726b981b8763dbddd74a61d85c4576597fe6"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "eced59fb6ddd04967917142301435ea121671f62"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "e80d94b8b8868e357c571710046af3155e558a5f"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "1c3cd61ba760650c7d44d98b8db66b4c7801efad"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "e0c4b3f510eb73d06c68b5b91c707ce5c508b05e"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "20ca59199a6a30bd64dcb943c2a1135885a535b4"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "87703e39a0ea9c402cc535fb4cc04dca5b9025d4"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "17cd8d702482cbc1c4bb377b29e0f278cdfc8e15"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "e7372fc31e6cd893fc0ea52e2fc4105c249310d3"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "947b986d5cb5454677d7b9bbcebaf437f0bcd16d"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "7f99697ebc560e2705e4aae628ad56a132af7eb6"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "b3a76512be4f2b86cad800d46d3f6c9ff9c883db"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "3e5c4860e15651ede1ffe569062e23f474b44994"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "36e66cb829024c631f91a9a05e4d4c10c5862c45"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "216d0066b5289335c12339dd109d8f11dc4fa937"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "a784ca15952a69965aa377a2dd6a0232ece0f8a4"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "f172acd6474891177446b61bd538af09cfb30351"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "161f527142c8d8551509e6132871c4901b2d64e7"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "d0428e31ef283749f1691d787ad6983ed0677a50"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "4bd535fdaf01bf8d001bc1147f0ad9e26f0bf39f"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "fc2de8c24f0271f56b3af97e8e4bf14179d6122d"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "9aacbee890a7bc3d714d85d16ab2d278dabd8e1b"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "75c23b833812a9d0b66727b3ed28a0e494bbacb1"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "cf29131fbf6d768e79ef5228cf066355a46b4466"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "df4b6ba0c457f15eee2dcade4882b720c1e39506"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "ab0cc9339d486d576e7004fd35d685421f7853f1"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "4b10dd376a6599f60ac85d41d465f136c4d4ebdc"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "3244858bd6405dc507eb4044be6b8ebaf7100e1f"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "9db094658b9e6d4849c1ede8438427400704c80c"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "9a907fec062b94a8f8dd7e981ea2ab4f36bcd944"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "eafc796f1597464abe3ffd9353e7d098b528525a"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "fd19ace880cfd29a4612b2543e2eab1fbbabe4a4"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "3d8bb5f293a6f18c3f171dcfb52b737a7946aa95"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "0a893fef8363fa980bc2393a2e23241f0c07956c"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "3e066a7834e998422f00e10b65e58ecf9dfc7519"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "2448c7e794e926894208abb4d25ea3b4c5db0cbb"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "a096f8152416d6af72a28fe25a849feb22ab835e"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "d974227fe54d7db75fc3b2fd773cf69ff71d647b"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b318ede019b019ee108d79e4f355311518a05963"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "c9aa90d984c2112f3e0e629f95b694b6281fe1df"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "8b3c1d3ebf013cf1c7bb448131b51920e1475240"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "47318f7ea3655b6fa876d77eea22a499d458b445"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "a1d42692baf6602f69fa436ed5eb6d21c60f3786"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "c97407ba107843f8f1f78ef70028b60bbc94ea87"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "68d1e7771a74e238ce54cff60e7279c672e4fbcd"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "cecb38e05ff1c5e6c0d79781efcf2973db6f68f0"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "5f576fdbbc9626fa9ef3986c2611285ea7fb34e3"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "b97dab8ea7387a69f499c6ab9827bc81b0ffd1ad"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "6d816a79fc954a186f9a3e9d8a909a392e0c8cb0"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "3f3a3b51d488a4940211951d698c59c33199a0a0"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "6d07bd223fd7848c4f92170f299df7091feda8dc"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "7b4cf9716f6c4333b143b61ce0ae7f7bf8832839"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "3887efcc6f8a87bdee12aeaeb1e4ad9666e1fba0"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "5d5f9db2a454e40c20db7728140b1e7b71e0f316"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "d8a0e81544d9055f39d0b8e425499e5da7ae2cde"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "f67d1c091a83a129e0f9da21c40a21e54192dfab"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "cf404307b7a5c1346c84f12272526ccc34509794"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "72d178beda4c3141ccccb0fd75d1a96e72b8f522"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "aad4b807fcbf460eb0fa0234d36092e0ca75e286"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "72f0b6ff9321bf171e7991853d37416e79db2598"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "c25dd452bd1a76d7aff4542caf4fd02f7cdcf751"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "ab0f31e1f704d125d3deb73dae6b5513f4f66cec"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "680edf9cb98b47ef92e3a9fbaa1bb66fc927003a"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "10e1fbc3cc3f2284fd28ce06c3af22d7010fa664"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "1317fc854581a50a4291bb38ff6954fe37d25efa"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "81188a3e20db29040202b24f99b073daef759f05"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "230488965e68f9170ca7b6623a599e4ec592012d"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "ff6048c8c949ef3b4fa821bedd95c046e3a7a7e4"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "02954fbabaf0688e1588652d5be08cb3784ff2aa"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "77759d296e5c85741aad42124e51913005215b71"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "8572f88439049bff5e32f4e9929f07c23dcde569"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "07101c61d8a1a7a153c9993f29c2ae7bd46c6ae2"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "dbd64d165bc9bb01545b6d31acdd4fb874f250a9"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "0e00df0f77fd8c7adb1a7822285a8410df92dd48"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "064760c31c2b78fd155a548f18be6bd82746aa7d"; }
-    { locale = "uz"; arch = "linux-i686"; sha1 = "39e185b485b6808619f4fb0853e161d31dfc07f4"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha1 = "8842689c5894ea116f637691627f8513e22e00fb"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "db96505385175ae4267ae6774c6f6375db8f7dca"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "8a9e2e5b17619857a0a2c795ffd7c04d1a767559"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "2e3e0aeff9143b74e464d532eb4c94dc72165303"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "e24a2d824ffb5fe5f1f8678b8567fb58e925f3d4"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "6dbc06e58b5bf2b3b8f109c2ff1840ecfb1fdfd3"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ae7868f33c6e4b15af3f6f6fcc18814a726d9c9f"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "4a46a545fbd4236b0eff0ade9ce57dc53458ad67"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "acec465483c0a2c445e9a3c9c5166c21308b9697"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "68adee53b26075e18d0ef4d43da4260ec274d861"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "8e2cc81fc414fb71e5a83c40b4a4197f6648af78"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "f36ae5a72738cfa70c6824a5929cb14faa60be1b"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "4b7a01e76db920d4aa1cbeb556cbe91b37070304"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "a71cc4c7f988f1b5470dec60a73643f53104a1b2"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "1c47a2b37a88d405a819c7bdbe84489a31e838dd"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "d25ec2c169ea9a953636e0cbd4049095834c808d"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "5f588ffb8e21ea15fb78dca128a33be734575e3e"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "aadbbc147c65d2436916e81bb43ca342f5c19a9d"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "9e04c39967e0a667b5a33f7436d555ac25ea4240"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "9062edea598e4ec354259268be1fa2f85b8ba6d0"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "98e6cac1de95a571ea6f88b18970c11b8056b8cb"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "4c23a1fb7e8ecdd1e20f9d398c387fbd766fa51e"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "5b4bb2a9906c7475c718ad0abd299606718c3880"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "e10d45e9c2de22d9af5db6750f5466d0fddce6d8"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "ce70351af3ce9f27051ae14e9a529cba9876aeb8"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "e9546468eb2ddf67ea93563bd1a1c69736effa6b"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "fb734bc851775335e4dbd795fb7a56ca30a2a7ae"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "36aeba40a75a80ab186bab0024607a263c92a8b5"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e6f3833728864120906a7409561c09ace56713bb"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c641603161439f8c982952db76a9a947a5e68f5f"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "97f560a79f9dffd208cc572875c9bd683ce7e0f7"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "08e490ecf22f1e6e2646ddb1bba508835593b6ae"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "e0b84df55b0ae2e216196037f62004d11074c618"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "8f2f9e0870b27f4d184ee98052a78eff64192981"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "8fbf417d8e2fe33d926bafc0fe4a4b433bd4ac93"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "db308680eda482ebe59bd7807e433a3761b69160"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "888fe735b223b2d233900c1f356de187a92eca02"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "c3a185149605ec5818de19047c3a9be4cc8800b6"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "6e6477d578bec18d7e67d35012c5d019f4055c65"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "7990f07ca2fc0f28bdd2e96d5fe227b29f6eebaf"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "11457870a82224739a5b02e7645703613b7c207b"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "9d96c67f5b22e6f8c114dd39230c666778d872b6"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "bff7b7716f2195fbb8e746b8e65498283c872710"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "7de018d1749c18a37da19db55a3070ef84e62ce4"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "44fe11de7503409417ad9c7ae0bf39c425c2dc90"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "2f9a019ff89e8b20d22d2e22cf58002a4d627228"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "f708084b81a3a98ac64e0e2ea4b6f97fe48a7209"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "77ddde8a32e0d81d5d7e136324117a4e07aaf7f0"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "dce4f745d77da895075b10f921b445e0df349edd"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "7de8827e2929114f869af44e90dbac306b0ce9e7"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "ead42059b82f9ab565a34fa3d6b3bc0f5a211a50"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "765f0120c223d07e84bc3ebf00eeef2e2907640e"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "0a317d7a0926e29e6dc8c563cf09fe667141da7d"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "52629a4afcc9f3224e3a8fdd12f2385ffd21cf00"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d2fa0d6970a88de5125d89ae8263517a9bbc2346"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "fbd01eae326465a8f4efeb08ff44d27f04e2ed66"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "08b0f4d181ce1f0db0a799a7876315c6752c76af"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "1a6d77533438619715e37b43c97f131ac7066ac0"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "fae63a4b373d2074775dfa67ba7d4320cad59e61"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "6068e7326eddf2d36afdd20dee1dd433abb0e3d0"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "010544ad413acf7210c10aa3dc99ef0cdab6b475"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "0378eb7346f686a8a25c71febfd933f3080e7e29"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "01647b2981d62e2171f9e7b6e8286c542a00583a"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "0f6194bce1a065d7b41fd8a46c52ea38874e9e56"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "04f6cb55cb4f9171adf14c7a11ec0271d6c2cf3e"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "1da33a7e75efca19810ab7e739f2b81e0d48c379"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "44d8f989b04b16eff2bcf4945d3fa4387279dfc7"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "60306283826c048acb1ad0232e9c1461f49f2a95"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "16de3bde630a31c9330fd87ed7d994443371d84e"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "728780b2668bb107db51f3804a53923d1a7c8298"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "b31affd14286e7462e6c3bca472d88025c2b917b"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "52d009168db00b167df1890dee39580ccca36ab6"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "d65def2945ea4222965fa16e653cd0db8eec9454"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "f62e88efed3d68b1ad88dfe9e8111d213b2c713b"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "708ffd36d036b4c652ac1f20bf0cba2140035bc9"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "310076f077abdd7834f341091a9541a27ce1f6ce"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "5b2e56cf8173b5c4ab0949d9f5d099dbca8f27cb"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "de33f286bf9c6461335dc7cc9b997c6f52de34f6"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "b53848124a0d3d1d71a4e802d99a4344edd91e03"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "f3bdd90591fbaa6a15b1ae671e8633af3a2765ea"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c8594b0932650c5850a84a35953b7116c432d0a9"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "546818b38dc2e21afa2a51a29c2148bfe39ce33b"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "a70e63927324099122edc032bb699e058c1ef36c"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "75d6dc5dc3adc964be970dddc128e13baaac23dd"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "2eba733d65e7582a23d84392288d10336e978009"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "97285fae817794cc05e9a121c33aafeff77442cb"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "063536c1cbc29c430a8e01674f3bb62ed94e18d9"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "a4be53b79cd1027f517562a0723233643b6e2020"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "4fcaf3a6347beaac041f9095609a92c03700e911"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "80d5db7c9a65de398663b3dc659723b12cdbe502"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "920bd570abce26d713f11666852fcf5d37d00331"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "5de961d08a5bba30245b714271ab4ed5d24a3bc4"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "fb30c3ab5b224a38416eb783ee30c3aa8b4a743b"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "31113c1b61217820f9a9e3dcace821aef612edd7"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "381bce247ea65fee04ee94d56e70cd30cc6959bd"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "90515b7c36553cdf6b88b44146766c52d1a7acd5"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "be0542fc76fedf82b46031dbeb9f4173be2a5313"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "4389ed68236bdc4697f3c8e5c53fe986ccb5f277"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0bb311890b604d1300ffa887984b4217cfb3b925"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "8415b519f19a3c52a5d8418046a7a67d118a38e1"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "e492caab12e6dace9dc763209a8b0803e8216d2f"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "663d406a587449f33561173d6e6d275964b9172d"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "0f649b13c2dad302b0cf449915f5c1a5ab7e198c"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "490aeed8cd9878d0f22ea99df674d1dbe134a6f3"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "2fbe0baed7379d717174be8dee4b879e6e4afd81"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "64144069a001bce53651aa5b8ec835c8c61bce1b"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "66563588c41fed8e542c89756dc235773c6d201b"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "c7e4a6544d4062958d48be26df3738b15871edcd"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "5a0c5b2dd2dfe83ea9551fd63c249bc6b41c8afc"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "5f8bbbd2b77447660022464d19b3bb316eeb6b53"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "8211373a9ab45f43f2a895049f49c2b9b7af3670"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "48b72a568ea55462d0d80194292ada525d24ee10"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "27fbe84930417244c900ae864589fd063358e741"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "f185c79195b7018edc97bd698d2f2f4f0f619968"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "bcb4ceb162ae954a6c79ac6e83655b981eb0c168"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "037516a147c18d03a74243ea680ec2da7b893b2f"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "1a2efb6b3253da2e525b25b1e5cf794da203a112"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "0200e608a4339158bafdafe32f39581d11ca4fea"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "b5dd68b8d170b577f49508db110a7e3ef9aa1504"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "5d9a22b515130e8c351fbbc71c5ee9c2586a98ca"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "2b49dc4f3e43c4812239798b9096f4e89c5dc101"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "530dfc4740f6c9c45163d51a49d4f6da8a1442c2"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "927c9ca797e463336a8a7c66fef59fa585a0e985"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "71984f44931f8c6e21a0e5a78d33301e9efd0c56"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "14df4792bebc70fb27aba0e8fa9fa570b3c66cd2"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "8301bc4d6919b849e1e0529d79fd56dfd7941e96"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "5f7f352c4c6a316bfd8aa825771178be5e15def0"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "2da181729cd1b9816d9530bfe2da47324595ceae"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "4665e54e425d3b783c2ef045c7d4908862a604db"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "48c57c3952cd918b4547f3aa17e52f856cb441d6"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "769b7e80547be03bc81153c56da69b0660672a5b"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c5123a9df2463883c38d748c360476ec16afafbd"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "50899fd2ddeeaa0011aa68f80ea23af808a2b13d"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "8d2fa9624fe78538ac3be7afef67b5f077ea9087"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "1ce05cc5d619ad8056720ee0a3aa1c142d323577"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "fc1e15e364b4b35ee097cb8a8e58f193cfab07fe"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "750189f10439b7d0592b5b1e5478571778a7b80c"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "562b5113560d43ab0332f12eb5b77f700adc3cac"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "7eea2b63095baaaf4077d21aec79a0262014231f"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "a474b711304003f7872f4d89482e460d6a5c6809"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b44b52752754082dafa7cc2fe3ab820c15ad9dee"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "5b4b8acd59a82feed1015e96efef60693bebc670"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "be13540ad54f006884e5b15c80e60c24739a3afd"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "289f94519a382e07e9ea85c09c50ee0c1e4c78f8"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ee789e0347ae16caeb803db227f917c2dec7402f"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "fdef92aba85eb308f77d5d218eab13ce1869720d"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "dac1e72db319e193b014d53ec2a937939bfda4ee"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "8bdee17c004721832b978028c8249151522d1a53"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "876ea6b07a58dcab72cc431bd4a956f6631616a4"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "4de224d9b431e802274878b1ded2831a7976772d"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "a620baccf62ead31da80d384ea65db816240180f"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "979efbef49bbe7bdd21bb8b6cddf1c79d21e6d7c"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "cce4b5be59a7072aee27b27496cfd2b36995592e"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "64fce36b5536da41b0d6e2144b1d8458fd29c1ec"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "cdf1ccb39f324ada803ebc606ef86f96b813151b"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "a9933f868908c2dd361df41836c8af32e5849f48"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "5462d38f1ea28c5a0abf7523f039f5ae0b4e860a"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "a7e555402c5d7460696b86a2001333f66951a4b1"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "ded2864cea9cdb70f25eaea61d6be6d4d5aaf822"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "fe596ad2b09ada772a38e7504f56776ee382851e"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "c920476a3e726708b447a7c3f9b38223fb5c705c"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "16b4033cd9a05717ba5b32e57935a2a9b2e86e1e"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "dfbf24d40bd5c098aa4c00be18db9adeb278b8a1"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "18e143882f23f6bd2ea7b99849d840c5649b67da"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "c748cbc2444151a2df6dc497b26bb6107cf603a0"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "36abc5c42eaf284249612e2bcf5940aeedadc6b7"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "73e1b14a3f00d73f85aced9b83cc281da6fff8eb"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "621451f0be0f7d3edab0f4fdfaa2199d7e18941b"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "89a750bd28b600375823f92fac3c1ac28e26f24a"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "0cab27456eb5b5124a848c1fcda70e3d8f2fd9d9"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "80c1b1e5cc6385f1e8b6922024726c36bc3360fb"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "4c23cebce4f2548f8692d5d36ab4295bc05a4597"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "e06d1ae0f6dc90766de010102864da5cccca14df"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "0916aaa3a68831ad887708d13770e29edd129ea9"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "a875fa64a788e3fe4b115fc01ad47b631d8aba27"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "d9054dcf7d37ee6e88e462926d5f769bc1392342"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "da23b4a2c9e4434ff927c6af81a3c823e546c24e"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "ee12407db146542b1094342fd618678a8f6d20a3"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "e4c433f31561006c5ba891ca701a03713d30e115"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "07d95dbe0e967732a90b8c6dd1366010791a5286"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "18b0a04c1e38476d85457b0a79942dbe2a0b6b04"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "c4e1f30a92da9ded560209d9a4b8784ec19f9fa8"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "22bfdd2d772f6080dc569b86f27e736c38e99374"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "1d72f825659eec22f52cacdcf4f5890957e8a38e"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "cd1cea8be94c3c4318e0bf9c283acade45f846ff"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "8ddfad29ebeccdddd3e5cdff3d8167a671e6821c"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b4b36e9624ba93ddea2cca52d974acb67ba3407b"; }
   ];
 }

From a16611948650e45bbd9e7a7fcae357e4445e51a8 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Thu, 27 Aug 2015 20:35:46 -0700
Subject: [PATCH 1630/2016] vimproc: Fix when run on non-NixOS linux distros

Prior to this change, if there exists a /lib*/ld-linux*.so.2 on a
system, vimproc will try to load vimproc_linux64.so or
vimproc_linux32.so instead of vimproc_unix.so, which is what nix
actually builds.
---
 pkgs/misc/vim-plugins/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 23f8b0e16e3..668bbf7d571 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -647,7 +647,10 @@ rec {
     buildInputs = [ which ];
 
     buildPhase = ''
-      sed -i 's/vimproc_mac\.so/vimproc_unix\.so/' autoload/vimproc.vim
+      substituteInPlace autoload/vimproc.vim \
+        --replace vimproc_mac.so vimproc_unix.so \
+        --replace vimproc_linux64.so vimproc_unix.so \
+        --replace vimproc_linux32.so vimproc_unix.so
       make -f make_unix.mak
     '';
   };

From 7f3566da8a74bcb013503c7439d8ec9568b6d8b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 28 Aug 2015 05:55:56 +0200
Subject: [PATCH 1631/2016] services.xserver.displayManager.gdm.autoLogin: add
 description

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

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 245c18ee2d9..ccf0f911081 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -25,6 +25,9 @@ in
 
       autoLogin = mkOption {
         default = {};
+        description = ''
+          Auto login configuration attrset.
+        '';
 
         type = types.submodule {
           options = {
@@ -78,7 +81,7 @@ in
     users.extraGroups.gdm.gid = config.ids.gids.gdm;
 
     services.xserver.displayManager.job =
-      { 
+      {
         environment = {
           GDM_X_SERVER = "${cfg.xserverBin} ${cfg.xserverArgs}";
           GDM_SESSIONS_DIR = "${cfg.session.desktops}";
@@ -177,7 +180,7 @@ in
           "auth     required       pam_deny.so"}
 
         account  sufficient     pam_unix.so
-        
+
         password requisite      pam_unix.so nullok sha512
         ${optionalString config.security.pam.enableEcryptfs
           "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}

From 6ec74dfdef5aa7c41ca229c3a0f69fdb402905fb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 28 Aug 2015 09:28:31 +0200
Subject: [PATCH 1632/2016] gmpy/gmpy2 disable for PyPy

gmpy and gmpy2 are both extension modules that cannot be used with PyPy.
---
 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 42db423a451..d992d5fef6a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3531,6 +3531,7 @@ let
 
   gmpy = buildPythonPackage rec {
     name = "gmpy-1.17";
+    disabled = isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/g/gmpy/${name}.zip";
@@ -3550,7 +3551,8 @@ let
 
   gmpy2 = buildPythonPackage rec {
     name = "gmpy2-2.0.6";
-
+    disabled = isPyPy;
+    
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/g/gmpy2/${name}.zip";
       md5 = "7365d880953ba54c2cdcf171c7e19b2b";

From e6f0cd336dd286232136503c02598372162f1b8d Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 3 Aug 2015 19:16:38 +0200
Subject: [PATCH 1633/2016] reverse_proxy module: helper to run nginx as
 reverse proxy

---
 nixos/modules/module-list.nix                 |   1 +
 .../services/web-servers/nginx/default.nix    |  31 ++-
 .../web-servers/nginx/reverse_proxy.nix       | 233 ++++++++++++++++++
 3 files changed, 263 insertions(+), 2 deletions(-)
 create 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 8ee54ce7ef4..6734fa0b862 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -393,6 +393,7 @@
   ./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 fe50c182bfe..b16f701a0c9 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -11,7 +11,9 @@ let
     ${cfg.config}
     ${optionalString (cfg.httpConfig != "") ''
     http {
-      ${cfg.httpConfig}
+    ${cfg.httpConfig}
+    ${cfg.httpServers}
+    ${cfg.httpDefaultServer}
     }
     ''}
     ${cfg.appendConfig}
@@ -60,7 +62,32 @@ in
       httpConfig = mkOption {
         type = types.lines;
         default = "";
-        description = "Configuration lines to be appended inside of the http {} block.";
+        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.
+        '';
       };
 
       stateDir = mkOption {
diff --git a/nixos/modules/services/web-servers/nginx/reverse_proxy.nix b/nixos/modules/services/web-servers/nginx/reverse_proxy.nix
new file mode 100644
index 00000000000..c21406dff29
--- /dev/null
+++ b/nixos/modules/services/web-servers/nginx/reverse_proxy.nix
@@ -0,0 +1,233 @@
+{ 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 d7d619f2cb4ea9573d9353a22d72ff30c59470e9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 28 Aug 2015 10:36:12 +0200
Subject: [PATCH 1634/2016] nixos gdm: fix enable description

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

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index ccf0f911081..b9808f1ffa6 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -19,7 +19,7 @@ in
     services.xserver.displayManager.gdm = {
 
       enable = mkEnableOption ''
-        Whether to enable GDM as the display manager.
+        GDM as the display manager.
         <emphasis>GDM is very experimental and may render system unusable.</emphasis>
       '';
 

From 0619a23236d56bcc538a522038bd273cc3ff8cd8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Aug 2015 11:26:44 +0200
Subject: [PATCH 1635/2016] firefox: Update to 40.0.3

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 2c433d12db5..ff206c50f34 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -16,14 +16,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "40.0.2"; in
+let version = "40.0.3"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "b5d79fa3684284bfeb7277e99c756b8688e8121d";
+    sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13";
   };
 
   buildInputs =

From 77354ebacd57cf43590b5f658ab777b533d7cc0f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 28 Aug 2015 11:35:15 +0200
Subject: [PATCH 1636/2016] gcr: 3.14.0 -> 3.16.0, should fix race condition
 during build

---
 pkgs/desktops/gnome-3/3.16/core/gcr/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 a4a26bca192..abd5074685a 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
@@ -3,11 +3,11 @@
 , gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gcr-3.14.0";
+  name = "gcr-${gnome3.version}.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gcr/3.14/${name}.tar.xz";
-    sha256 = "2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d";
+    url = "mirror://gnome/sources/gcr/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0xfhi0w358lvca1jjx24x2gm67mif33dsnmi9cv5i0f83ks8vzpc";
   };
 
   buildInputs = [
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
 
   #doCheck = true;
 
+  enableParallelBuilding = true;
+
   preFixup = ''
     wrapProgram "$out/bin/gcr-viewer" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

From 9d82f7e53e66e5594b0c8b82f6c415a0a386b580 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Aug 2015 12:36:45 +0200
Subject: [PATCH 1637/2016] Revert "Apache service module: allow compression"

This reverts commit 164f6ff2a8485c1130cd710992a6084258cdad28 per
https://github.com/NixOS/nixpkgs/pull/9407#issuecomment-134523359
(it's too site-specific). Furthermore this should be an option at the
virtual host level.
---
 .../web-servers/apache-httpd/default.nix      | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index e3f1a7fb1bd..7350a6a68c7 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -117,7 +117,6 @@ let
     ]
     ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
     ++ optional enableSSL "ssl"
-    ++ optional mainCfg.enableCompression "deflate"
     ++ extraApacheModules;
 
 
@@ -177,27 +176,6 @@ let
     SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!EXP
   '';
 
-  # From http://paulstamatiou.com/how-to-optimize-your-apache-site-with-mod-deflate/
-  compressConf = ''
-    SetOutputFilter DEFLATE
-
-    # Don't compress binaries
-    SetEnvIfNoCase Request_URI .(?:exe|t?gz|zip|iso|tar|bz2|sit|rar) no-gzip dont-vary
-    # Don't compress images
-    SetEnvIfNoCase Request_URI .(?:gif|jpe?g|jpg|ico|png)  no-gzip dont-vary
-    # Don't compress PDFs
-    SetEnvIfNoCase Request_URI .pdf no-gzip dont-vary
-    # Don't compress flash files (only relevant if you host your own videos)
-    SetEnvIfNoCase Request_URI .flv no-gzip dont-vary
-    # Netscape 4.X has some problems
-    BrowserMatch ^Mozilla/4 gzip-only-text/html
-    # Netscape 4.06-4.08 have some more problems
-    BrowserMatch ^Mozilla/4.0[678] no-gzip
-    # MSIE masquerades as Netscape, but it is fine
-    BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
-    # Make sure proxies don't deliver the wrong content
-    Header append Vary User-Agent env=!dont-vary
-  '';
 
   mimeConf = ''
     TypesConfig ${httpd}/conf/mime.types
@@ -373,7 +351,6 @@ let
     ${mimeConf}
     ${loggingConf}
     ${browserHacks}
-    ${optionalString mainCfg.enableCompression compressConf}
 
     Include ${httpd}/conf/extra/httpd-default.conf
     Include ${httpd}/conf/extra/httpd-autoindex.conf
@@ -446,7 +423,7 @@ in
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = "Enable the Apache HTTP Server.";
+        description = "Whether to enable the Apache HTTP Server.";
       };
 
       package = mkOption {
@@ -609,12 +586,6 @@ in
         description =
           "Maximum number of httpd requests answered per httpd child (prefork), 0 means unlimited";
       };
-
-      enableCompression = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable compression of responses using mod_deflate.";
-      };
     }
 
     # Include the options shared between the main server and virtual hosts.

From 1852e65776b7789f9cd4f48f248112740ec4692f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Aug 2015 13:27:51 +0200
Subject: [PATCH 1638/2016] Fix tests that use the Valgrind docs

---
 nixos/tests/firefox.nix | 2 +-
 nixos/tests/kde4.nix    | 2 +-
 nixos/tests/proxy.nix   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index 67a2779afc2..1bdabe93fec 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ... }: {
   testScript =
     ''
       $machine->waitForX;
-      $machine->execute("firefox file://${pkgs.valgrind}/share/doc/valgrind/html/index.html &");
+      $machine->execute("firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html &");
       $machine->waitForWindow(qr/Valgrind/);
       $machine->sleep(40); # wait until Firefox has finished loading the page
       $machine->screenshot("screen");
diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix
index 981813ba2bd..dc61658cd1c 100644
--- a/nixos/tests/kde4.nix
+++ b/nixos/tests/kde4.nix
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: {
 
       services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
-      services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html";
+      services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
 
       services.xserver.displayManager.kdm.enable = true;
       services.xserver.displayManager.kdm.extraConfig =
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index 1653c9b2fda..b43ce1b8e68 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -7,7 +7,7 @@ let
 
     { services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
-      services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html";
+      services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
       networking.firewall.allowedTCPPorts = [ 80 ];
     };
 

From 01587f02a2eee51385145d361c77d12925e4ebbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 28 Aug 2015 13:59:47 +0200
Subject: [PATCH 1639/2016] hedgewars: 0.9.20.5 -> 0.9.21, fix build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 199be0273eb347a432d74cd50d9ef6083c73c1dd)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/games/hedgewars/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index bb776a7a10d..b92a14d84c2 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -1,27 +1,27 @@
 { SDL_image, SDL_ttf, SDL_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut
 , stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL, SDL_mixer
-, zlib, libpng, mesa
+, zlib, libpng, mesa, physfs
 }:
 
 let
   ghc = ghcWithPackages (pkgs: with pkgs; [
-          network vector utf8-string bytestring-show random hslogger dataenc
+          network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib_0_5_4_2
         ]);
 in
 stdenv.mkDerivation rec {
-  version = "0.9.20.5";
+  version = "0.9.21";
   name = "hedgewars-${version}";
   src = fetchurl {
     url = "http://download.gna.org/hedgewars/hedgewars-src-${version}.tar.bz2";
-    sha256 = "1k5dq14s9pshrqlz8vnix237bcapfif4k3rc4yj4cmwdx1pqkl56";
+    sha256 = "0abnzpyq6sxlfcz5b0kh6r7n1692dwrgsdsr4s216xhh9n19xm0w";
   };
 
   buildInputs = [
     SDL_ttf SDL_net cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc
-    qt4 ghc ffmpeg freeglut makeWrapper
+    qt4 ghc ffmpeg freeglut makeWrapper physfs
   ];
 
-  patches = [ ./fix-ghc-7.8-build-failure.diff ];
+  patches = [ ./21eb5b79072b147d0a9b7fafca98501e7056c834.patch ];
 
   preBuild = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${mesa}/lib/:${freeglut}/lib
+    wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${mesa}/lib/:${freeglut}/lib:${physfs}/lib
   '';
 
   meta = with stdenv.lib; {

From 01a874b3cfd268261f660474377826dfb53a126c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 28 Aug 2015 15:17:14 +0200
Subject: [PATCH 1640/2016] gcloud-golang: mark as broken

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3fcc63421b9..6d3354d27c9 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -619,6 +619,8 @@ let
     goPackagePath = "google.golang.org/cloud";
     buildInputs = [ net oauth2 protobuf google-api-go-client grpc ];
     excludedPackages = "oauth2";
+
+    meta.broken = true;
   };
 
   gcloud-golang-compute-metadata = buildGoPackage rec {

From 0f041e5487e01244f56916282ec56df7a1e306ec Mon Sep 17 00:00:00 2001
From: Enrico Fasoli <fazius2009@gmail.com>
Date: Thu, 27 Aug 2015 00:38:06 +0000
Subject: [PATCH 1641/2016] ne: init at 3.0.1

ne: building improvements
---
 pkgs/applications/editors/ne/default.nix | 34 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/editors/ne/default.nix

diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix
new file mode 100644
index 00000000000..4e8324894ab
--- /dev/null
+++ b/pkgs/applications/editors/ne/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, ncurses, texinfo, tetex, perl, ghostscript }:
+
+
+stdenv.mkDerivation rec {
+  name = "ne-${version}";
+  version = "3.0.1";
+  src = fetchFromGitHub {
+    owner = "vigna";
+    repo = "ne";
+    rev = version;
+    sha256 = "05inzhlqlf4ka22q78q389pr34bsb4lgp1i5qh550vjkb2cvbdfp";
+  };
+  buildInputs = [ ncurses tetex texinfo perl ghostscript ];
+  dontBuild = true;
+  installPhase = ''
+    substituteInPlace src/makefile --replace "CC=c99" "cc=gcc"
+    substituteInPlace src/makefile --replace "-lcurses" "-lncurses"
+    substituteInPlace makefile --replace "./version.pl" "perl version.pl"
+    cd doc && make && cd ..
+    cd src && make && cd ..
+    make PREFIX=$out install
+  '';
+  
+  meta = {
+    description = "the nice editor";
+    homepage = https://github.com/vigna/ne;
+    longDescription = ''
+      ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any 
+UN*X machine. ne is easy to use for the beginner, but powerful and fully configurable for the wizard, 
+and most sparing in its resource usage. See the manual for some highlights of ne's features.      
+    '';
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 649ea43c149..3163f4ab861 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12338,6 +12338,8 @@ let
 
   ncdc = callPackage ../applications/networking/p2p/ncdc { };
 
+  ne = callPackage ../applications/editors/ne { };
+
   nedit = callPackage ../applications/editors/nedit {
     motif = lesstif;
   };

From 2927f1a8832159fb25238e2ad5ef8e202bb96935 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 28 Aug 2015 16:24:08 +0200
Subject: [PATCH 1642/2016] nibabel: remove failing test

One of the tests explicitly calls python, which will fail with python3.
The issue has been reported upstream,
https://github.com/nipy/nibabel/issues/341
For now, remove the test.

Fix also the license type.
---
 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 d992d5fef6a..0c690dc0ad3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8406,11 +8406,17 @@ let
       nose
       modules.sqlite3
     ];
+    
+    # Test does not work on Py3k because it calls 'python'.
+    # https://github.com/nipy/nibabel/issues/341
+    preCheck = ''
+      rm nisext/tests/test_testers.py
+    '';
 
     meta = {
       homepage = http://nipy.org/nibabel/;
       description = "Access a multitude of neuroimaging data formats";
-      license = "BSD";
+      license = licenses.mit;
     };
   };
 

From 89cec3c895030f37fd0c9db7f95fef507826bd84 Mon Sep 17 00:00:00 2001
From: Sibi <sibi@psibi.in>
Date: Fri, 28 Aug 2015 19:56:05 +0530
Subject: [PATCH 1643/2016] Add myself as maintainer (close #9495).

Related to https://github.com/NixOS/cabal2nix/pull/196
---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7c136725061..a1ec32aba0e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -204,6 +204,7 @@
   pmahoney = "Patrick Mahoney <pat@polycrystal.org>";
   pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>";
   prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>";
+  psibi = "Sibi <sibi@psibi.in>";
   pSub = "Pascal Wittmann <mail@pascal-wittmann.de>";
   puffnfresh = "Brian McKenna <brian@brianmckenna.org>";
   qknight = "Joachim Schiele <js@lastlog.de>";

From 15aa28f71b79d89ba2e717e9fbb401b3463870a8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 28 Aug 2015 16:51:07 +0200
Subject: [PATCH 1644/2016] pyfribidi: disable for pypy

Extension module. pypy is unsupported.
---
 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 d992d5fef6a..ae2474c07af 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5671,7 +5671,7 @@ let
   pyfribidi = buildPythonPackage rec {
     version = "0.11.0";
     name = "pyfribidi-${version}";
-    disabled = isPy3k;
+    disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pyfribidi/${name}.zip";

From 93e8a121c8438f739157f819f051c2a493b9874f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 28 Aug 2015 17:09:26 +0200
Subject: [PATCH 1645/2016] hedgewars: add missing patch

---
 ...5b79072b147d0a9b7fafca98501e7056c834.patch | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch

diff --git a/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch b/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch
new file mode 100644
index 00000000000..1de99542bdb
--- /dev/null
+++ b/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch
@@ -0,0 +1,36 @@
+From 21eb5b79072b147d0a9b7fafca98501e7056c834 Mon Sep 17 00:00:00 2001
+From: koda <vittorio.giovara@gmail.com>
+Date: Tue, 2 Jun 2015 19:51:04 +0100
+Subject: [PATCH] Fix building hedgewars-server
+
+---
+ gameServer/CoreTypes.hs           | 2 +-
+ gameServer/hedgewars-server.cabal | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gameServer/CoreTypes.hs b/gameServer/CoreTypes.hs
+index 553e722..2c75153 100644
+--- a/gameServer/CoreTypes.hs
++++ b/gameServer/CoreTypes.hs
+@@ -38,7 +38,7 @@ import RoomsAndClients
+ instance NFData B.ByteString
+ #endif
+ 
+-instance NFData (Chan a)
++instance NFData (Chan a) where rnf a  = ()
+ 
+ instance NFData Action where
+     rnf (AnswerClients chans msg) = chans `deepseq` msg `deepseq` ()
+diff --git a/gameServer/hedgewars-server.cabal b/gameServer/hedgewars-server.cabal
+index 122f2ef..f36a190 100644
+--- a/gameServer/hedgewars-server.cabal
++++ b/gameServer/hedgewars-server.cabal
+@@ -33,7 +33,7 @@ Executable hedgewars-server
+     utf8-string,
+     SHA,
+     entropy,
+-    zlib
++    zlib >= 0.5.3 && < 0.6
+ 
+   if !os(windows)
+     build-depends: unix

From 624eba18859ed09dd2acb37316a2aef450c8be3a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 28 Aug 2015 17:22:02 +0200
Subject: [PATCH 1646/2016] fuppes: mark as broken

This package has been broken since 2014-01-20, according to Hydra [1]. I tried
various ad-hoc patching & adding missing dependencies, uncovering yet more
errors. Updating is also out of the question, as nixpkgs already contains the
latest version.

[1]: https://hydra.nixos.org/build/25188337
---
 pkgs/tools/networking/fuppes/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/fuppes/default.nix b/pkgs/tools/networking/fuppes/default.nix
index 711c3516bda..67e3b581f24 100644
--- a/pkgs/tools/networking/fuppes/default.nix
+++ b/pkgs/tools/networking/fuppes/default.nix
@@ -50,5 +50,7 @@ stdenv.mkDerivation rec {
 
     maintainers = [ stdenv.lib.maintainers.pierron ];
     platforms = stdenv.lib.platforms.all;
+
+    broken = true;
   };
 }

From 18926d981c9682de43f45ac56dbed66abd224f67 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Fri, 28 Aug 2015 19:49:14 +0300
Subject: [PATCH 1647/2016] ghcNokinds:  2015-07-18 -> 2015-08-26

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

diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix
index 3f0b9e866b0..6334759496f 100644
--- a/pkgs/development/compilers/ghc/nokinds.nix
+++ b/pkgs/development/compilers/ghc/nokinds.nix
@@ -27,14 +27,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "7.11.20150718";
+  version = "7.11.20150826";
   name = "ghc-${version}"; # We cannot add a "nokinds" tag here; see git comment for details.
-  rev = "4cb79c85a4976c509a65a8638899391a60cd0962";
+  rev = "5f7f64b7fc879b5ecfd6987ec5565bd90f7c0179";
 
   src = fetchgit {
     url = "https://github.com/goldfirere/ghc.git";
     inherit rev;
-    sha256 = "1pyz459hs189bw2jaz7k2j2r53nc1vfa4q3zd3zz1zm0h14lsmlv";
+    sha256 = "183l4v6aw52r3ydwl8bxg1lh3cwfakb35rpy6mjg23dqmqsynmcn";
   };
 
   postUnpack = ''

From 2bcad47a9008b023c7234f0be39edf3892313bcb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Aug 2015 15:30:40 +0200
Subject: [PATCH 1648/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/ca23e76c2e918c3d46ba2295191f14e87765d4db
 with hackage2nix v20150824-45-g9a3a80d

---
 .../haskell-modules/hackage-packages.nix      | 779 ++++++++++--------
 1 file changed, 438 insertions(+), 341 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 88c383672b1..33b0bf30d00 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1664,7 +1664,6 @@ self: {
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BluePrintCSS" = callPackage
@@ -1709,7 +1708,6 @@ self: {
        homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html";
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Boolean" = callPackage
@@ -2449,7 +2447,6 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Diagrams backend for Charts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-gtk" = callPackage
@@ -4305,7 +4302,6 @@ self: {
        homepage = "http://elm-lang.org";
        description = "The Elm language module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Emping" = callPackage
@@ -5584,6 +5580,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GeBoP";
        description = "Several games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GenI" = callPackage
@@ -6500,6 +6497,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mpfr;};
 
+  "HFrequencyQueue" = callPackage
+    ({ mkDerivation, base, c-storable-deriving }:
+     mkDerivation {
+       pname = "HFrequencyQueue";
+       version = "0.2.0.0";
+       sha256 = "b03c5de4cbb14d379f3555698a03a076fb2d10c748c2a7054b83c74f95e30626";
+       libraryHaskellDepends = [ base c-storable-deriving ];
+       jailbreak = true;
+       homepage = "https://github.com/Bellaz/HfrequencyList";
+       description = "A Queue with a random (weighted) pick function";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HFuse" = callPackage
     ({ mkDerivation, base, bytestring, fuse, unix }:
      mkDerivation {
@@ -7133,7 +7144,6 @@ self: {
        homepage = "https://github.com/atzeus/HMap";
        description = "Fast heterogeneous maps and unconstrained typeable like functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HNM" = callPackage
@@ -7202,7 +7212,6 @@ self: {
        homepage = "http://www.alpheccar.org";
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HPath" = callPackage
@@ -8828,7 +8837,6 @@ self: {
        ];
        description = "Haskell integration with Parrot virtual machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsPerl5" = callPackage
@@ -9955,7 +9963,6 @@ self: {
        ];
        description = "A library for lattices";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LazyVault" = callPackage
@@ -9986,7 +9993,6 @@ self: {
        homepage = "http://quasimal.com/projects/level_0.html";
        description = "A Snake II clone written using SDL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LibClang" = callPackage
@@ -10113,7 +10119,6 @@ self: {
        homepage = "http://github.com/yairchu/generator/tree";
        description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ListZipper" = callPackage
@@ -10545,7 +10550,6 @@ self: {
        libraryHaskellDepends = [ base containers stringtable-atom ];
        description = "A meta-object system for Haskell based on Perl 6";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Metrics" = callPackage
@@ -13232,7 +13236,6 @@ self: {
        homepage = "http://raincat.bysusanlin.com/";
        description = "A puzzle game written in Haskell with a cat in lead role";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Random123" = callPackage
@@ -13622,7 +13625,6 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_gfx";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SDL-image" = callPackage
@@ -13634,7 +13636,6 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_image";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SDL-mixer" = callPackage
@@ -13648,7 +13649,6 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_mixer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SDL-mpeg" = callPackage
@@ -13661,7 +13661,6 @@ self: {
        librarySystemDepends = [ smpeg ];
        description = "Binding to the SMPEG library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) smpeg;};
 
   "SDL-ttf" = callPackage
@@ -13673,7 +13672,6 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_ttf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SDL2-ttf" = callPackage
@@ -15552,7 +15550,6 @@ self: {
        homepage = "https://github.com/avieth/TypeNat";
        description = "Some Nat-indexed types for GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TypingTester" = callPackage
@@ -17411,6 +17408,7 @@ self: {
        ];
        description = "A replication backend for acid-state";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acid-state-tls" = callPackage
@@ -18562,6 +18560,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-value-parser" = callPackage
+    ({ mkDerivation, aeson, base-prelude, mtl-prelude, scientific, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-value-parser";
+       version = "0.9.0";
+       sha256 = "f53c0bd8a4fedb71ed74a2019b2d601ca3d315ae0db332e4f49d88f2ea68de8f";
+       libraryHaskellDepends = [
+         aeson base-prelude mtl-prelude scientific text unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/sannsyn/aeson-value-parser";
+       description = "An API for parsing \"aeson\" JSON tree into Haskell types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "affine-invariant-ensemble-mcmc" = callPackage
     ({ mkDerivation, base, containers, mwc-random, primitive, split
      , vector
@@ -18885,7 +18900,6 @@ self: {
        homepage = "http://github.com/dsorokin/aivika-experiment-diagrams";
        description = "Diagrams backend for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aivika-transformers" = callPackage
@@ -19556,8 +19570,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "1.1.0";
-       sha256 = "60a65271453aedff93b9789e52f258ea6b6fe315a26f361710a50a825167a2c3";
+       version = "1.2.0.1";
+       sha256 = "4e7b7cda6b6904cfd35f92596bfe5a8e00511bbd64d7b55926ad8660f6eba950";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
          exceptions http-client http-conduit ini lens mmorph monad-control
@@ -19576,8 +19590,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "1.1.0";
-       sha256 = "0ed84582688b21076214a24ba5d31a3f25f3ee7765ed0c18d44fe0459d4101ca";
+       version = "1.2.0.1";
+       sha256 = "c48e7db56a1fc852a505b3821a4ed273b6a68e2f68ee224eb6cdfbe27c42926a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19596,8 +19610,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "1.1.0";
-       sha256 = "70d06d56987589915ac6011badf3c1f5d336814f99c09cd99424f3af312b9bf2";
+       version = "1.2.0.1";
+       sha256 = "813fcdb6a35888e1a0d29252f7530f192509662445b051ab17e6e4d614e98160";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19616,8 +19630,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "1.1.0";
-       sha256 = "c931a4e78ffa1e81023dc1b306c4f2195be09b0246ef7b8022311421ef78c01c";
+       version = "1.2.0.1";
+       sha256 = "aeff7660a2d12b1382d14efa134b37ae35e4dc3745fb83f33e4fd4ac37b4c275";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19636,8 +19650,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "1.1.0";
-       sha256 = "b9f6ad65225dfd1eb0560a2a71a52991560ef4e69654b0053f37414c22080875";
+       version = "1.2.0.1";
+       sha256 = "64a58850be2d1df8145ca7382f7060faf873417c34b52258846ea6b4842b1389";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19656,8 +19670,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "1.1.0";
-       sha256 = "3e22407422a823f86eeff6685ccc71a4b775ed8962522d70ec49092f09c8b8ae";
+       version = "1.2.0.1";
+       sha256 = "d56e2690a44f331d408603234712bcbc2ef40f0375a7c1db22513c3350b3ccb5";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19676,8 +19690,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "1.1.0";
-       sha256 = "8f6f6ce4ce0194d0f51c6b9ed9a71a0e270c5385a4c3dd63589c6d66cfdf6872";
+       version = "1.2.0.1";
+       sha256 = "f3ac35a7e9f2f9372ffabbb5b7450b4291a07609f517af8b75a4acd5d5c3610d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19696,8 +19710,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "1.1.0";
-       sha256 = "a10e4dfbbef7058f8e21c5afb3f3b8108880c26bf163b8cfb048fa91ef47a4ea";
+       version = "1.2.0.1";
+       sha256 = "525e3a1f674b20e3851c67cc3d519f86b9795b046f131b91d63e7f194246542b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19716,8 +19730,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "1.1.0";
-       sha256 = "6f9d2ac648899c775daeac0ed2a80e83c16876497762b8a99afc600e6f4546e9";
+       version = "1.2.0.1";
+       sha256 = "dfabf18379ec4f5431e4038d745686a58fb83a0559029cbbb77b40f9ebc6fd43";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19736,8 +19750,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "1.1.0";
-       sha256 = "8c3c9553f43f1312881f22da35a34ad404101f3b790d2734590abd4ce5dbcfb7";
+       version = "1.2.0.1";
+       sha256 = "3b794ef9cb79daf5018a7cc850a348eb08407067f4b72c6accbd03b3be6997ca";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19756,8 +19770,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codecommit";
-       version = "1.1.0";
-       sha256 = "abe54fee07ff52883343780cade09238da0e41d23ecc95fa9c1e3f9a8743b78a";
+       version = "1.2.0.1";
+       sha256 = "b4dcc54a0cd2faec903a037b713d1cce6ac6d4c3716b353b4108d23d4ecc0b03";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19776,8 +19790,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "1.1.0";
-       sha256 = "0b5832f433693ea1238a0391c19765d975b24425c378ae6688ba358849ed758c";
+       version = "1.2.0.1";
+       sha256 = "9b3dcfb3f92c0f2b7a68d62857e04a6eea0f57a6e72311fa5594da8574b8f557";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19796,8 +19810,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codepipeline";
-       version = "1.1.0";
-       sha256 = "8b892d604355caea388c8680712b8e03cee1fd85c9275cb118009cbf4f1ee7e0";
+       version = "1.2.0.1";
+       sha256 = "c97df58c12793dc079d0706d9a09ea7c470219cc80e6e583441718d7017ee138";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19816,8 +19830,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "1.1.0";
-       sha256 = "a154b6645d58211b3ebeb9407a4683ae85f6a1069d9c4027da664a34b471910e";
+       version = "1.2.0.1";
+       sha256 = "fbf21d9ca8e71d0b3305791db0f6a18256898b5c294057f515aef3991a0971cb";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19836,8 +19850,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "1.1.0";
-       sha256 = "0a831859befa66f52636384f3e70217e0a804d9267135010034bc047ba2c5f75";
+       version = "1.2.0.1";
+       sha256 = "2008e997fa402ab3d58f22f260df18583695b612cbf1b0d3ab158321a1576e03";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19856,8 +19870,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "1.1.0";
-       sha256 = "960c9381c50aa26bcf5bb05704ede000ef9614488ea9f428f7d1ae6eba7c886b";
+       version = "1.2.0.1";
+       sha256 = "c4e60da7e09302b81e1c53b15c36e99b46d09dd37b4334e360d78879b556ef36";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19881,8 +19895,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "1.1.0";
-       sha256 = "fe4b3185f61ad56e3dfddcd5050d3cfa41a997fd3c5b74ec8ed24404dada2cb6";
+       version = "1.2.0.1";
+       sha256 = "737645a63519f535154133cf590a66e2248d436c6223539857f43069a6645d1a";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit conduit-extra cryptonite exceptions hashable http-client
@@ -19906,8 +19920,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "1.1.0";
-       sha256 = "8c72a767f8b3546dd0e895035edfcc3a6e0fe060a2398e973938addfca7b4ce5";
+       version = "1.2.0.1";
+       sha256 = "20178d505d690116528f8d1bf5c5650c7dca9350b583ad4bbc2b7ca5b74bc1e0";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19926,8 +19940,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-devicefarm";
-       version = "1.1.0";
-       sha256 = "3c99376995534299985d2163d8cf55938d925f08c3e214b5f3567a26f4515ab1";
+       version = "1.2.0.1";
+       sha256 = "bebf18952a56cc249175a1bf69ab1400126b3c97c45ce8b7895acbae894c3449";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19946,8 +19960,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "1.1.0";
-       sha256 = "5ec6240b4fe226859b51e325f44f566c21a93ff91d628b6d9eafeb823152e74b";
+       version = "1.2.0.1";
+       sha256 = "39bd3999d29363b87fc64edac6151251a5a5075c7fe1ab48bb89114fa40cfa74";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19966,8 +19980,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ds";
-       version = "1.1.0";
-       sha256 = "19de365fedf51d8da57c5099e04e6d827b3c3b4b3f9aacc7e78d7bf7a9def542";
+       version = "1.2.0.1";
+       sha256 = "fac88b8ac1121ec6ab9bb1c1b419262e2720c95d3c5d5e1d5ff9b0356f59af56";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19986,8 +20000,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "1.1.0";
-       sha256 = "b4cc74ff79ab032a06cbf7245db1d8734cf9946625a9bf00fe4974dcb8628f45";
+       version = "1.2.0.1";
+       sha256 = "23d44253d82d2406b528abf5f1c2ed97c72cadb9afca1a578793220648ce442c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20006,8 +20020,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-streams";
-       version = "1.1.0";
-       sha256 = "04e4eb5b332a455d4ac40824a60a07b47c8bc73aa89d82ce85bb944b0f2cde11";
+       version = "1.2.0.1";
+       sha256 = "b3413412dce8dc96e449642535f623223298243d7290d778082fd6ed97511a33";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20026,8 +20040,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "1.1.0";
-       sha256 = "c715cd05ee79755de37df834d5315041c5d582004720d7e3b18c2fa2ff28deb7";
+       version = "1.2.0.1";
+       sha256 = "de1421ab986e9d6833fd70a0e0d3c21895813361ecc680c95816fbcaf7c6439a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20046,8 +20060,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "1.1.0";
-       sha256 = "82eb9b0a963885a6c2d846e2497cf39519c8f6a07315a6cb8d07cd88246376d6";
+       version = "1.2.0.1";
+       sha256 = "19c608e5218c900da768adc9f893a91a7fc6e9070e8c5d9e444baf1ae98c7544";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20066,8 +20080,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-efs";
-       version = "1.1.0";
-       sha256 = "daf42240c49d66cbc715bcc2cace1f430e81b3cc78ce0e2455475f9706e4ae42";
+       version = "1.2.0.1";
+       sha256 = "d0f70ed2e5242cb05b7895199a06144cd4550fab64fb825eba8a1c10d9351bab";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20086,8 +20100,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "1.1.0";
-       sha256 = "edc2f2e5a67c1b409b93b60862dd7b1303201d2b59b3e19931e8bde9a948e277";
+       version = "1.2.0.1";
+       sha256 = "9c4113c0dd2430432ac0233149571a7affc9dec675aaddbe7ff9e513171a1bf7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20106,8 +20120,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "1.1.0";
-       sha256 = "d45f9ebdda89b89f461948438e1c2d0e4eb1e7a0ab2fed229203fc29d027ed35";
+       version = "1.2.0.1";
+       sha256 = "b4e135c2e904f78cab94ccab8d1d38b3b7992461bc1f41ede5ee708fcb162dc2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20126,8 +20140,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "1.1.0";
-       sha256 = "f5ea457def994de22b4bc8c471ecf2355c4acf80d44c022e34d92ffdd8606500";
+       version = "1.2.0.1";
+       sha256 = "b2eaf67b39f5d19fe5ea7a6d0c79b44951cf25c41eb3af36ead6cd82cb430dd2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20146,8 +20160,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "1.1.0";
-       sha256 = "2f3e4a8971545bf39bedf5a75854c21733a797598318e076f2a468d8f5647a96";
+       version = "1.2.0.1";
+       sha256 = "2574b79c0b09ef82dcc7b07c9dfcb55719dd7b63ac87fb938ae7a7c45efba986";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20166,8 +20180,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "1.1.0";
-       sha256 = "29f4c25ff4cdcd83809afa9fdc5e70a8bf89c6b1e4bcdfc7367faade023566bc";
+       version = "1.2.0.1";
+       sha256 = "43c3e80f742abbd5d2770fa5cf05138b5be2890492a295b1ccaefeb8d50662ed";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20186,8 +20200,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "1.1.0";
-       sha256 = "61f954b805f51ca436a01f42e9068674540c3828b269e6c1547aedd976516b91";
+       version = "1.2.0.1";
+       sha256 = "48e2c9b10a4624b6f308bd232aafe9fabe7429911ad4a7a8222277d9c58310be";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20206,8 +20220,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "1.1.0";
-       sha256 = "9b52ae4b69126b24be8e7dac78aab91c7b14b0ab1c162fe2e8b8e831f5e41991";
+       version = "1.2.0.1";
+       sha256 = "8302e53d2e799b56629a2344a3b1d40b39b173defee1112ddb6e4e0102496d7f";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20226,8 +20240,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "1.1.0";
-       sha256 = "7682771e6a51a96a69c8a5c8176b33a944b598d84a353884287b8b3183b2a5a9";
+       version = "1.2.0.1";
+       sha256 = "cfb98a32f18d2b1448277f5a4c5128bd9d94ecba012d458dff65a834c86648d6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20246,8 +20260,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "1.1.0";
-       sha256 = "0103f032d0ebbd562a7e510897cb50f5bed8383fbbc7ac7868564ab57fa7a0e7";
+       version = "1.2.0.1";
+       sha256 = "831225d3400badf60a8b390e4dd692d38b8097bcb72f1247b54876c83bb532c9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20266,8 +20280,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "1.1.0";
-       sha256 = "0c9f0d02cc5fdf1ef64b0446d82718277c3570f761b0644504ee90d842f78b9a";
+       version = "1.2.0.1";
+       sha256 = "b69938c0c9f6bbc5d1774643f528e64ba28a6ac2bb16f1e15845061a97de85d4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20286,8 +20300,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "1.1.0";
-       sha256 = "07d43e6d4585a09139006708e831c7e713c1b33dbc711cc08fd6c723ace589f3";
+       version = "1.2.0.1";
+       sha256 = "e3e0e8fd76c7dbd1ced77e9d46a4e8b57820b87b00327ccc01417ddf4c53aa0d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20306,8 +20320,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "1.1.0";
-       sha256 = "ef09c86c1ccf257d4dd53627a75213015482e2ce18d1c5a85b4017bb215563dc";
+       version = "1.2.0.1";
+       sha256 = "c29484802e0138ebbeb6666842ca1cd44b81e2e870ff4c1435d91d58d569bc37";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20326,8 +20340,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "1.1.0";
-       sha256 = "9ac85226c177d59135f7fde294202951b5415e9a0afbe1b7a2b2c7f57f2531c0";
+       version = "1.2.0.1";
+       sha256 = "bad7706393fcfcc041ac4ae1bb39ef7320d282d2b4d9c6c8f0881379b4f91a6a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20346,8 +20360,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "1.1.0";
-       sha256 = "8081408044b167cde41e466073d4acd8e4732b2586c0fa637a5a323e84447b02";
+       version = "1.2.0.1";
+       sha256 = "55ae3a2e6893fc11ca156fb9d11258d1c1ad76f928ca1143cfb0b7b3d9f1806e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20366,8 +20380,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "1.1.0";
-       sha256 = "688e017fd663b915a80d37954bd3b48deccc5d9e90b18770ff91af46ddd9c01b";
+       version = "1.2.0.1";
+       sha256 = "0ce218a13c314c73ea9b3f5c7e8ef31f3cf92a06f820425c48d83d175f1e77b2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20386,8 +20400,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "1.1.0";
-       sha256 = "dde78c3ff32eb00e3342d89426ec9f6792e3ecb40af378525e74141b415c0436";
+       version = "1.2.0.1";
+       sha256 = "8a700fc08eb4585b6d9a30c81f18bfab56ae2ae4b5474f98889959f2bda33ad0";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20406,8 +20420,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "1.1.0";
-       sha256 = "cc4e138341b187146ac10d52430abebcf1780846ace4482d838b3f1053abb9b2";
+       version = "1.2.0.1";
+       sha256 = "d486ae77163fc9d8dbb3b38afcce6ce79fba93b5194643ad98cb8dbbe31f745a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20426,8 +20440,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "1.1.0";
-       sha256 = "7cdb79c15c0f1152e40a464d7fd1cc6edf1526d40ca1e7f8d33d0968acdc6e71";
+       version = "1.2.0.1";
+       sha256 = "dd5b54f342d1a5f45ea62242f9acecb2be98ed15801b251316c9bef8ac7b948b";
        libraryHaskellDepends = [ amazonka-core base lens text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20446,8 +20460,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "1.1.0";
-       sha256 = "fe6b9a82edc028b2895e14a5ed2f4d4efdd6c13328a87d18c1215fc2baa35cb7";
+       version = "1.2.0.1";
+       sha256 = "4eebd5b37c309ee850395c2823f10636cb90c8449a1f365a11a5cf58080b4469";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20466,8 +20480,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "1.1.0";
-       sha256 = "39b2031ca579c11992f093c9c6915133e4b182105434adb44823f3d0a56aeafd";
+       version = "1.2.0.1";
+       sha256 = "f547f472a3dee0944a7a26a7b421df10242d80762ca59392391a1326a39a427f";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20486,8 +20500,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "1.1.0";
-       sha256 = "be2609584bb6e0af18af5b3a25c1281a0f665d993d8b8c14b310aba56287a3cf";
+       version = "1.2.0.1";
+       sha256 = "e69b15d4fe2904cd813e22a149e4dcce5c9514a34c45379bb07589fc3a606994";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20506,8 +20520,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "1.1.0";
-       sha256 = "9bfb0cf6d07f1019bcfeeb4169c0a6dd6147e1eb9132b04f4cf256bbc8b7bcfd";
+       version = "1.2.0.1";
+       sha256 = "e599b394468bdeb2813b8e091b5aefc5787bb10bd2bfb24d5be4ba70a5ed0134";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20526,8 +20540,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "1.1.0";
-       sha256 = "3be89223c0c1110778bfeb32aeb3ed0b4fcdf85aedfce8c0a67ece34f1619f18";
+       version = "1.2.0.1";
+       sha256 = "d9d47fd9820fa05fbfdd62090d9319ee6fd96f321422a995e186ab3e13d789f1";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20546,8 +20560,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "1.1.0";
-       sha256 = "d3a8cd4205254d65e482ed96114cb98d233deb26d25a04a5f45b82dab01a6e0a";
+       version = "1.2.0.1";
+       sha256 = "d73bf3187bb9fd7b50ddcc74566841d1fb4e77328bbe0dddb19a324553e9c49b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20566,8 +20580,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "1.1.0";
-       sha256 = "566b295c705d94a91f479f82414cd3487e8e5872e1287d45d0d686670c024fb5";
+       version = "1.2.0.1";
+       sha256 = "66502b43aea7c2f70ef4559913c58fb0ae581435d0656f1ab9f9c417bcb54a2e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20586,8 +20600,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "1.1.0";
-       sha256 = "fd16936656d8d49b35c965945a886659c3f996fd4234843dfba7fb15152eb58f";
+       version = "1.2.0.1";
+       sha256 = "f1996613bfcfa00eac465c90ef97f18c6fe51231def2d43de1bf90fd0992e52e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20606,8 +20620,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "1.1.0";
-       sha256 = "85184fd03d9e0181f7f2ba7b4c1ad14b2ce46235fc5814659e3bee8e5437d323";
+       version = "1.2.0.1";
+       sha256 = "d68898d0a5205e3897b36c29830564f1aecbeff759ff5c379bdf12c1c60f1c01";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20626,8 +20640,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "1.1.0";
-       sha256 = "0e7b0cc339022a304245f054d04e153671eaff927ad1e13c0f632bad7746ac56";
+       version = "1.2.0.1";
+       sha256 = "4125f1aa08ad2f9013bba8f8d0c83b41f0eeb76203fd1b7da41a306f81211448";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20903,8 +20917,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "annotated-wl-pprint";
-       version = "0.6.0";
-       sha256 = "3d29f11396fb0675fff25254a9f4354aa763a659fa10a48829d15fed087792e7";
+       version = "0.7.0";
+       sha256 = "0c262d7fe13a9a50216438ec882c13e25f31236b886a5692e3c35b85cd773d18";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer, with annotation support";
@@ -21234,6 +21248,7 @@ self: {
          aeson base bytestring Cabal containers hspec http-client text
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/intolerable/api-builder";
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -21305,8 +21320,8 @@ self: {
      }:
      mkDerivation {
        pname = "apiary";
-       version = "1.4.4";
-       sha256 = "de395821116717cf654f52176e6487782522f567b288a17bab7713ff85411085";
+       version = "1.4.5";
+       sha256 = "6c6f898924b6209f33ef81bc0e2c7ceb166fc04825a8ffb4d6c5732f41429313";
        libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
          bytestring-read case-insensitive data-default-class exceptions
@@ -24762,7 +24777,6 @@ self: {
        jailbreak = true;
        description = "Generate Code 128 barcodes as PDFs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barecheck" = callPackage
@@ -29466,7 +29480,6 @@ self: {
        homepage = "http://github.com/pjones/byline";
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytable" = callPackage
@@ -30175,6 +30188,7 @@ self: {
        homepage = "https://github.com/ddssff/cabal-debian";
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-dependency-licenses" = callPackage
@@ -30589,8 +30603,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-rpm";
-       version = "0.9.6";
-       sha256 = "e501a7b3a203be2e069e26337e6bbdd0993ffe6d9e75a626089b2637393d2f1e";
+       version = "0.9.7";
+       sha256 = "b927e84b5a23edffa8053c3c5e5a5191c434dbcbbe7e4551f8dc840d3b17bc74";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30865,6 +30879,7 @@ self: {
        homepage = "http://github.com/NixOS/cabal2nix";
        description = "Convert Cabal files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "cabal2spec" = callPackage
@@ -31773,6 +31788,7 @@ self: {
        homepage = "https://github.com/jb55/cased";
        description = "Track string casing in its type";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
   "cases" = callPackage
@@ -33102,7 +33118,6 @@ self: {
        jailbreak = true;
        description = "measure timings of data evaluation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chu2" = callPackage
@@ -34330,20 +34345,20 @@ self: {
 
   "clippings" = callPackage
     ({ mkDerivation, assertions, base, bifunctors, bytestring, cassava
-     , data-default, filepath, old-locale, parsec, safecopy, strptime
-     , time
+     , data-default, filepath, functor-infix, old-locale, parsec
+     , safecopy, strptime, time
      }:
      mkDerivation {
        pname = "clippings";
-       version = "0.1.3";
-       sha256 = "79e3e0c4d2ab9a37bfd0fd35ce161de45e3acf96be1ecce93726a3cdf065a036";
+       version = "0.2.0";
+       sha256 = "8562481c8ba001b6c401d6ebfacd458fe44b19676ce8bd2e8694cd45cf825bdb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bifunctors data-default old-locale parsec strptime time
+         base data-default functor-infix old-locale parsec strptime time
        ];
        executableHaskellDepends = [
-         base bifunctors bytestring cassava parsec safecopy
+         base bifunctors bytestring cassava functor-infix parsec safecopy
        ];
        testHaskellDepends = [
          assertions base data-default filepath old-locale parsec time
@@ -35439,11 +35454,14 @@ self: {
      }:
      mkDerivation {
        pname = "comfort-graph";
-       version = "0.0.0.1";
-       sha256 = "dc4cadda8bb9847f60f217d54590d5695597814557c70dafab9846b944dcfb8c";
+       version = "0.0.0.3";
+       sha256 = "e379d8d331d3b0245528a4c88a0fad369a2ad9a04f45f6e57546a342bf58c783";
        libraryHaskellDepends = [
          base containers QuickCheck transformers utility-ht
        ];
+       testHaskellDepends = [
+         base containers QuickCheck transformers utility-ht
+       ];
        homepage = "http://hub.darcs.net/thielema/comfort-graph";
        description = "Graph structure with type parameters for nodes and edges";
        license = stdenv.lib.licenses.bsd3;
@@ -35642,6 +35660,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "compact-socket" = callPackage
+    ({ mkDerivation, base, binary, bytestring, compact, deepseq
+     , directory, filepath, network, unix
+     }:
+     mkDerivation {
+       pname = "compact-socket";
+       version = "0.1.0.0";
+       sha256 = "e758ee08d3013aebc013fe2d5eb1f529db56ea0f926bd2ba7bc1266cc1c9ee3b";
+       libraryHaskellDepends = [
+         base binary bytestring compact deepseq directory filepath network
+         unix
+       ];
+       jailbreak = true;
+       description = "Socket functions for compact normal form";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {compact = null;};
+
   "compact-string" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -36207,7 +36243,6 @@ self: {
        ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-sa" = callPackage
@@ -36955,7 +36990,6 @@ self: {
        homepage = "https://github.com/leftaroundabout/constrained-categories";
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constrained-normal" = callPackage
@@ -38113,6 +38147,7 @@ self: {
        homepage = "https://github.com/nicodelpiano/coverage";
        description = "Exhaustivity Checking Library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cpio-conduit" = callPackage
@@ -38222,7 +38257,6 @@ self: {
        executableHaskellDepends = [ array base containers parallel ];
        description = "Symbolic cryptographic protocol analyzer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cpu" = callPackage
@@ -39259,8 +39293,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptonite";
-       version = "0.6";
-       sha256 = "a016ccaa38579beb4517807a8917801baf6e6ddb830a74af91fc064c35acf853";
+       version = "0.7";
+       sha256 = "6cd4d9ff100b06a08ceac56eb12153633957797b309032a963cdf3841f92ecd9";
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim integer-gmp memory
        ];
@@ -42899,6 +42933,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dejafu" = callPackage
+    ({ mkDerivation, base, containers, deepseq, exceptions, monad-loops
+     , mtl, random, stm, transformers
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "0.1.0.0";
+       sha256 = "469c2f0690ede4ad83483d5ae82601471a7c737daddd116ad423d5b9202ee2b4";
+       libraryHaskellDepends = [
+         base containers deepseq exceptions monad-loops mtl random stm
+         transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Overloadable primitives for testable, potentially non-deterministic, concurrency";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -43595,7 +43648,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -43728,7 +43780,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-hsqml" = callPackage
@@ -43746,7 +43797,6 @@ self: {
        homepage = "https://github.com/marcinmrotek/diagrams-hsqml";
        description = "HsQML (Qt5) backend for Diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-html5" = callPackage
@@ -44547,6 +44597,7 @@ self: {
        homepage = "https://github.com/avieth/diplomacy-server";
        description = "Play Diplomacy over HTTP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-binary-files" = callPackage
@@ -46365,6 +46416,7 @@ self: {
        ];
        description = "PostgreSQL support for the drifter schema migration tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dropbox-sdk" = callPackage
@@ -46567,7 +46619,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dtd" = callPackage
@@ -46651,7 +46702,6 @@ self: {
        jailbreak = true;
        description = "(Fast) Dynamic Time Warping";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dual-tree" = callPackage
@@ -47289,7 +47339,6 @@ self: {
        homepage = "http://thoughtpolice.github.com/hs-ed25519";
        description = "ed25519 cryptographic signatures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ed25519-donna" = callPackage
@@ -47485,7 +47534,6 @@ self: {
        homepage = "https://github.com/maxpow4h/editable";
        description = "Interactive editors for Generics";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "editline" = callPackage
@@ -48093,7 +48141,6 @@ self: {
        homepage = "http://github.com/JoeyEremondi/elm-build-lib";
        description = "Compile Elm code to JS within Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-compiler" = callPackage
@@ -48134,7 +48181,6 @@ self: {
        homepage = "http://elm-lang.org";
        description = "Values to help with elm-package, elm-make, and elm-lang.org.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-core-sources" = callPackage
@@ -48178,7 +48224,6 @@ self: {
        homepage = "http://github.com/elm-lang/elm-get";
        description = "Tool for sharing and using Elm libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-init" = callPackage
@@ -48219,7 +48264,6 @@ self: {
        homepage = "http://elm-lang.org";
        description = "A build tool for Elm projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-package" = callPackage
@@ -48251,7 +48295,6 @@ self: {
        homepage = "http://github.com/elm-lang/elm-package";
        description = "Package manager for Elm libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-reactor" = callPackage
@@ -48276,7 +48319,6 @@ self: {
        homepage = "http://elm-lang.org";
        description = "Interactive development tool for Elm programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-repl" = callPackage
@@ -48303,7 +48345,6 @@ self: {
        homepage = "https://github.com/elm-lang/elm-repl";
        description = "a REPL for Elm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-server" = callPackage
@@ -48324,7 +48365,6 @@ self: {
        homepage = "http://elm-lang.org";
        description = "Server for developing Elm projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-yesod" = callPackage
@@ -48342,7 +48382,6 @@ self: {
        homepage = "http://elm-lang.org";
        description = "The Elm language Yesod compatibility module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elocrypt" = callPackage
@@ -51436,6 +51475,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "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 {
+       pname = "feed-translator";
+       version = "0.1.0.1";
+       sha256 = "ca29fa44090e1f9f62dbb95ecd98a893a2a6d7ec57df3c2b8a71a42104a78fa3";
+       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
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/dahlia/feed-translator";
+       description = "Translate syndication feeds";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "feed2lj" = callPackage
     ({ mkDerivation, base, curl, directory, feed, haskell98, HTTP
      , old-locale, pureMD5, regex-posix, tagsoup, time, utf8-string
@@ -52496,11 +52557,10 @@ self: {
     ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
      mkDerivation {
        pname = "fixed-vector";
-       version = "0.8.0.0";
-       sha256 = "39da25f74a7c0760cb4675b0116eb9581232de57566e7b323e135e1157068fc2";
+       version = "0.8.1.0";
+       sha256 = "3c3c29c7248c08061949843727e83ad234584ca77f8076ecd9537a185ebe3a93";
        libraryHaskellDepends = [ base deepseq primitive ];
        testHaskellDepends = [ base doctest filemanip primitive ];
-       jailbreak = true;
        description = "Generic vectors with statically known size";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53254,8 +53314,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.1.2.3";
-       sha256 = "8c24ca4a7932b83fd630475ac59a48879adbe03dda6136cc493f9ad0742d5bd5";
+       version = "0.2.0.0";
+       sha256 = "38be7ab52831c7ea5ac5fd4e546b9f8b4a66305528af80aa6ec17214b6066e02";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers foldl semigroupoids
          text transformers
@@ -53263,6 +53323,7 @@ self: {
        testHaskellDepends = [ base doctest foldl tasty tasty-hunit text ];
        description = "Transducers for foldl folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "folds" = callPackage
@@ -54147,8 +54208,7 @@ self: {
        homepage = "https://github.com/chrisdone/freenect";
        description = "Interface to the Kinect device";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {freenect = null; freenect_sync = null;};
+     }) {inherit (pkgs) freenect; freenect_sync = null;};
 
   "freesect" = callPackage
     ({ mkDerivation, array, base, cpphs, directory, mtl, parallel
@@ -54474,7 +54534,6 @@ self: {
        homepage = "http://www.github.com/ehamberg/fswatcher/";
        description = "Watch a file/directory and run a command when it's modified";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ftdi" = callPackage
@@ -54640,6 +54699,7 @@ self: {
        homepage = "http://savannah.nongnu.org/projects/funcmp/";
        description = "Functional MetaPost";
        license = stdenv.lib.licenses.gpl3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "function-combine" = callPackage
@@ -56203,7 +56263,6 @@ self: {
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -56889,7 +56948,6 @@ self: {
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gist" = callPackage
@@ -57109,7 +57167,6 @@ self: {
        homepage = "http://github.com/jwiegley/gitlib";
        description = "Passively snapshots working tree changes efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-object" = callPackage
@@ -57360,6 +57417,7 @@ self: {
        ];
        description = "GitHub WebHook Handler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-webhook-handler-snap" = callPackage
@@ -57376,6 +57434,7 @@ self: {
        ];
        description = "GitHub WebHook Handler implementation for Snap";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitignore" = callPackage
@@ -57524,7 +57583,6 @@ self: {
        ];
        description = "Libgit2 backend for gitlib";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-s3" = callPackage
@@ -57703,29 +57761,27 @@ self: {
 
   "glambda" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, containers, directory
-     , errors, haskeline, mtl, parsec, tasty, tasty-hunit
-     , template-haskell
+     , either, haskeline, mtl, parsec, tasty, tasty-hunit
+     , template-haskell, transformers
      }:
      mkDerivation {
        pname = "glambda";
-       version = "1.0";
-       sha256 = "0ef6fc8e1fedc034c6d392aad4323b1b4c825e34b1a18affc6022873de817805";
+       version = "1.0.1";
+       sha256 = "da42696d4ad985cd10d249457d801a234c04a29ef08acdbbd91544dabce2d16f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base containers directory errors haskeline mtl
-         parsec
+         ansi-wl-pprint base containers directory either haskeline mtl
+         parsec transformers
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         ansi-wl-pprint base errors mtl parsec tasty tasty-hunit
+         ansi-wl-pprint base either mtl parsec tasty tasty-hunit
          template-haskell
        ];
-       jailbreak = true;
        homepage = "https://github.com/goldfirere/glambda";
        description = "A simply typed lambda calculus interpreter, written with GADTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glapp" = callPackage
@@ -57973,6 +58029,7 @@ self: {
        revision = "1";
        editedCabalFile = "232cec279cb20afd92056320c24d3d3041199b014981492ddbbe57eeff312a5a";
        libraryHaskellDepends = [ base gloss reactive-banana ];
+       jailbreak = true;
        homepage = "https://github.com/Twey/gloss-banana";
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
@@ -58412,7 +58469,6 @@ self: {
        ];
        description = "Google Drive API access";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-html5-slide" = callPackage
@@ -59377,7 +59433,6 @@ self: {
        ];
        description = "Grid-based multimedia engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grm" = callPackage
@@ -60331,7 +60386,6 @@ self: {
        homepage = "https://github.com/Javran/h2048";
        description = "a haskell implementation of Game 2048";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hArduino" = callPackage
@@ -61185,6 +61239,7 @@ self: {
        homepage = "http://github.com/peti/hackage-db";
        description = "access Hackage's package database via Data.Map";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "hackage-diff" = callPackage
@@ -61239,7 +61294,6 @@ self: {
        homepage = "http://fpcomplete.com";
        description = "Simple mirroring utility for Hackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-plot" = callPackage
@@ -62185,12 +62239,17 @@ self: {
      }) {};
 
   "hakyll-sass" = callPackage
-    ({ mkDerivation, base, data-default-class, hakyll, hsass }:
+    ({ mkDerivation, base, data-default-class, filepath, hakyll, hsass
+     }:
      mkDerivation {
        pname = "hakyll-sass";
-       version = "0.1.0";
-       sha256 = "b127379ebf20f96f5974a9f8212aa3aeed04b9e22788bc29cc9994f6f69e926c";
-       libraryHaskellDepends = [ base data-default-class hakyll hsass ];
+       version = "0.2.0";
+       sha256 = "1c0b131f3a581aafde543fc9c3211d75c6f17f6b25d0e32cf6032f4c3377dbc5";
+       revision = "1";
+       editedCabalFile = "afdc3b9e76e09fc1aaf7f9cceb780a2e062ec56aab20659804b8f35d3bb85bb5";
+       libraryHaskellDepends = [
+         base data-default-class filepath hakyll hsass
+       ];
        homepage = "https://github.com/meoblast001/hakyll-sass";
        description = "Hakyll SASS compiler over hsass";
        license = stdenv.lib.licenses.mit;
@@ -62299,7 +62358,6 @@ self: {
        homepage = "https://github.com/lukexi/halive";
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halma" = callPackage
@@ -62559,7 +62617,6 @@ self: {
        ];
        description = "IPv4 Network Stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hans-pcap" = callPackage
@@ -62573,7 +62630,6 @@ self: {
        homepage = "https://github.com/tolysz/hans-pcap";
        description = "Driver for real ethernet devices for HaNS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hans-pfq" = callPackage
@@ -62788,6 +62844,7 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -62966,7 +63023,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-hamlet" = callPackage
@@ -63042,7 +63098,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Support for using HSP templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-hstringtemplate" = callPackage
@@ -63960,7 +64015,6 @@ self: {
        homepage = "http://github.com/ivanperez-keera/haskanoid";
        description = "A breakout game written in Yampa using SDL";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskarrow" = callPackage
@@ -65035,7 +65089,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for HDBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hdbc-mysql" = callPackage
@@ -65073,7 +65126,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HDBC ODBC driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hdbc-postgresql" = callPackage
@@ -65093,7 +65145,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HDBC PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
   "haskelldb-hdbc-sqlite3" = callPackage
@@ -65112,7 +65163,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HDBC SQLite driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hsql" = callPackage
@@ -65441,7 +65491,6 @@ self: {
        jailbreak = true;
        description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin" = callPackage
@@ -66709,8 +66758,7 @@ self: {
        homepage = "https://github.com/ivanperez-keera/hcwiid";
        description = "Library to interface with the wiimote";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {bluetooth = null; cwiid = null;};
+     }) {bluetooth = null; inherit (pkgs) cwiid;};
 
   "hdaemonize" = callPackage
     ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog
@@ -67658,7 +67706,6 @@ self: {
        homepage = "https://github.com/nh2/hemokit";
        description = "Haskell port of the Emokit EEG project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hen" = callPackage
@@ -69848,6 +69895,7 @@ self: {
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
+       maintainers = with stdenv.lib.maintainers; [ gebner ];
      }) {};
 
   "hledger-interest" = callPackage
@@ -69864,6 +69912,7 @@ self: {
        homepage = "http://github.com/peti/hledger-interest";
        description = "computes interest for a given account";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "hledger-irr" = callPackage
@@ -71111,7 +71160,7 @@ self: {
        description = "OpenNI 2 binding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {OpenNI2 = null; freenect = null;};
+     }) {OpenNI2 = null; inherit (pkgs) freenect;};
 
   "honk" = callPackage
     ({ mkDerivation, base }:
@@ -71434,7 +71483,6 @@ self: {
        homepage = "http://github.com/bgamari/hoogle-index";
        description = "Easily generate Hoogle indices for installed packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hooks-dir" = callPackage
@@ -71573,6 +71621,7 @@ self: {
        homepage = "http://github.com/peti/hopenssl";
        description = "FFI bindings to OpenSSL's EVP digest interface";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {inherit (pkgs) openssl;};
 
   "hopfield" = callPackage
@@ -73858,6 +73907,7 @@ self: {
        homepage = "http://github.com/peti/hsdns";
        description = "Asynchronous DNS Resolver";
        license = stdenv.lib.licenses.gpl3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {inherit (pkgs) adns;};
 
   "hsdns-cache" = callPackage
@@ -73916,6 +73966,7 @@ self: {
        homepage = "http://github.com/peti/hsemail";
        description = "Internet Message Parsers";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "hsemail-ns" = callPackage
@@ -74945,6 +74996,7 @@ self: {
        homepage = "https://github.com/dbp/hspec-snap";
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-structured-formatter" = callPackage
@@ -75665,7 +75717,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "hsp+jmacro support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsx-xhtml" = callPackage
@@ -75724,6 +75775,7 @@ self: {
        homepage = "http://github.com/peti/hsyslog";
        description = "FFI interface to syslog(3) from POSIX.1-2001";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "hszephyr" = callPackage
@@ -76141,8 +76193,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.20";
-       sha256 = "8d79157a2887b67d90926a267eaf21b24e914c0975e371ac079167894e308a24";
+       version = "0.4.21";
+       sha256 = "f6465cfec946c7acfeb210daa97e65e67c3924867072ed47193a83cf1226dc30";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -78532,7 +78584,6 @@ self: {
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ideas" = callPackage
@@ -78915,7 +78966,6 @@ self: {
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A Haskell backend kernel for the IPython project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-aeson" = callPackage
@@ -78932,7 +78982,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for Aeson";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-basic" = callPackage
@@ -78945,7 +78994,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-blaze" = callPackage
@@ -78958,7 +79006,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for blaze-html types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-charts" = callPackage
@@ -78976,7 +79023,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for charts types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-diagrams" = callPackage
@@ -79007,7 +79053,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-hatex" = callPackage
@@ -79020,7 +79065,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for hatex";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-juicypixels" = callPackage
@@ -79036,7 +79080,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-magic" = callPackage
@@ -79054,7 +79097,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for bytestrings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-parsec" = callPackage
@@ -79072,7 +79114,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for Parsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-plot" = callPackage
@@ -79085,7 +79126,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-rlangqq" = callPackage
@@ -79103,7 +79143,6 @@ self: {
        ];
        description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-widgets" = callPackage
@@ -79740,6 +79779,7 @@ self: {
        homepage = "https://github.com/myfreeweb/indieweb-algorithms";
        description = "A collection of implementations of IndieWeb algorithms";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "infer-upstream" = callPackage
@@ -80867,10 +80907,8 @@ self: {
      }:
      mkDerivation {
        pname = "iproute";
-       version = "1.5.0";
-       sha256 = "e33b233c681be367162c342ebf3843ec2d858db49716ef52d96546bd3f6f2557";
-       revision = "1";
-       editedCabalFile = "f601b3319004e7b4a4636c89996ea78fd084e9b10d15d679d7ae58e822fe19b8";
+       version = "1.6.0";
+       sha256 = "792c638d4957ac85d04a17864991eaa4ae09e4fb7e890ff95a7807a2875705d0";
        libraryHaskellDepends = [
          appar base byteorder containers network
        ];
@@ -81942,6 +81980,7 @@ self: {
        homepage = "http://github.com/peti/jailbreak-cabal";
        description = "Strip version restrictions from build dependencies in Cabal files";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "jalaali" = callPackage
@@ -82005,7 +82044,6 @@ self: {
        homepage = "https://github.com/mtolly/jammittools";
        description = "Export sheet music and audio from Windows/Mac app Jammit";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jarfind" = callPackage
@@ -83070,8 +83108,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsonsql";
-       version = "0.1.0.1";
-       sha256 = "3906445e73a38fadc36dcbaf927597797f0ecd3c6310acf63c48fdab79eb24d7";
+       version = "0.1.2.1";
+       sha256 = "93234e108034457f59e078cd2d6205a7ed4218262f0c7a39a91600e915b7966b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -84752,6 +84790,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-core" = callPackage
@@ -84778,6 +84817,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot core functionality";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-haskell-plugins" = callPackage
@@ -84804,6 +84844,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -84822,6 +84863,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "IRC plugins for lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-misc-plugins" = callPackage
@@ -84845,6 +84887,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot miscellaneous plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-novelty-plugins" = callPackage
@@ -84863,6 +84906,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-reference-plugins" = callPackage
@@ -84881,6 +84925,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot reference plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-social-plugins" = callPackage
@@ -84897,6 +84942,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Social plugins for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-trusted" = callPackage
@@ -85657,6 +85703,7 @@ self: {
        homepage = "https://github.com/peti/language-nix";
        description = "Haskell AST and Parsers for the Nix language";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "language-objc" = callPackage
@@ -86472,7 +86519,6 @@ self: {
        homepage = "http://www.leksah.org";
        description = "Haskell IDE written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leksah-server" = callPackage
@@ -89174,8 +89220,8 @@ self: {
     ({ mkDerivation, base, containers, monadLib, pretty }:
      mkDerivation {
        pname = "llvm-pretty";
-       version = "0.4.0.0";
-       sha256 = "6d757a9929a0b43f3e22d0799939d7489b16dd2637553bb396a47cd0318bf23f";
+       version = "0.4.0.1";
+       sha256 = "637506a2356076fefbf7515baa4c19ef2828fc404ab3c0ae0f9b1b2d5f04a42b";
        libraryHaskellDepends = [ base containers monadLib pretty ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
@@ -90747,7 +90793,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/magico";
        description = "Compute solutions for Magico puzzle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "magma" = callPackage
@@ -91465,7 +91510,6 @@ self: {
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Working with manifolds in a direct, embedding-free way";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "map-syntax" = callPackage
@@ -92897,7 +92941,6 @@ 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
@@ -93259,7 +93302,6 @@ self: {
        jailbreak = true;
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime" = callPackage
@@ -93297,8 +93339,8 @@ self: {
      }:
      mkDerivation {
        pname = "mime-mail";
-       version = "0.4.9";
-       sha256 = "641420aa8b1d2c7f8ebf82fdb0e6000443ffba89a420f4ea11828474b244c3d0";
+       version = "0.4.10";
+       sha256 = "4930f9c6a906e73452a891d93b1cf545b64613ccb079fe625fa4c98c01b25677";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
@@ -94057,8 +94099,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.26";
-       sha256 = "6b2af22a46ffea53436cfca302ad526827c4bfd7963d259304714acd1ee2bf91";
+       version = "0.1.0.27";
+       sha256 = "3e520127ef1727d460d65b1219d5c585973c62fc2f31713d6743aed2406d5abe";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -97497,8 +97539,8 @@ self: {
      }:
      mkDerivation {
        pname = "nationstates";
-       version = "0.2.0.0";
-       sha256 = "88e00660570f45c3ff709a659707b5967db54730f3dff25844dde07d0b3b3a1f";
+       version = "0.2.0.1";
+       sha256 = "091ddee83ea21b6b8505ef5053c8b6ce58b08a578f8cd51bfe1c32745af0426c";
        libraryHaskellDepends = [
          base bytestring clock containers http-client http-client-tls
          http-types multiset transformers xml
@@ -97732,13 +97774,12 @@ self: {
      }:
      mkDerivation {
        pname = "neat-interpolation";
-       version = "0.2.2.1";
-       sha256 = "de357ec4b78f68c5797d84e8bb01a35aff53e8c0d10d5d1ebbe5185d0483b303";
+       version = "0.2.3";
+       sha256 = "a60966321467bf8065796f37774756f94a89c443ee59fac4fbeac964d4a1c20b";
        libraryHaskellDepends = [
          base base-prelude parsec template-haskell
        ];
        testHaskellDepends = [ base-prelude HTF ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/neat-interpolation";
        description = "A quasiquoter for neat and simple multiline text interpolation";
        license = stdenv.lib.licenses.mit;
@@ -99790,8 +99831,8 @@ self: {
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.5.0";
-       sha256 = "8b22f315fe60b95e7b24bae9b206b815851f5b60082cb5139ae2d33816f315e4";
+       version = "0.7.6.0";
+       sha256 = "0ac24214e36b7ab50e9e2714d0806a8f732a52d1b04d596438d9fdd6c877cd8b";
        libraryHaskellDepends = [
          base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
          spatial-math time vector vector-binary-instances
@@ -100558,7 +100599,6 @@ self: {
        homepage = "https://github.com/stackbuilders/octohat";
        description = "A tested, minimal wrapper around GitHub's API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "octopus" = callPackage
@@ -100982,6 +101022,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opaleye-classy" = callPackage
+    ({ mkDerivation, base, bytestring, lens, mtl, opaleye
+     , postgresql-simple, product-profunctors, transformers
+     }:
+     mkDerivation {
+       pname = "opaleye-classy";
+       version = "0.1.0.1";
+       sha256 = "874c3f1d394653289542ef2a8ca55d8b93c01c1de78e2c0bbe1c668be39b331a";
+       libraryHaskellDepends = [
+         base bytestring lens mtl opaleye postgresql-simple
+         product-profunctors transformers
+       ];
+       homepage = "https://github.com/benkolera/opaleye-classy/tree/master";
+       description = "Opaleye wrapped up in classy MTL attire";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "opaleye-sqlite" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring
      , case-insensitive, containers, contravariant, direct-sqlite
@@ -101857,7 +101914,6 @@ self: {
        jailbreak = true;
        description = "An API client for http://orchestrate.io/.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "orchid" = callPackage
@@ -102626,8 +102682,8 @@ self: {
        pname = "pandoc-csv2table";
        version = "1.0.1";
        sha256 = "0b872c518f3d3f1ca178e8a6cd2581f0a3b294cfd533e19fccd0fd95dcd79d2c";
-       revision = "1";
-       editedCabalFile = "0924cc418394f855f93486ee6fb3bae991112c3e63df74f95afa6c2d62b09299";
+       revision = "2";
+       editedCabalFile = "522492bc433302f60262c0c9a19ccda171dd4eaec177f42fe75e471b79df1924";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
@@ -103503,6 +103559,7 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck text ];
        description = "Components of paths";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "pathfinding" = callPackage
@@ -103886,7 +103943,6 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-core" = callPackage
@@ -103904,7 +103960,6 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-document" = callPackage
@@ -103924,7 +103979,6 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-viewer" = callPackage
@@ -103946,7 +104000,6 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "Simple pdf viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf2line" = callPackage
@@ -104309,6 +104362,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "period" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, optparse-applicative, parsec
+     , text, text-show, time
+     }:
+     mkDerivation {
+       pname = "period";
+       version = "0.1.0.1";
+       sha256 = "b83dfef9a9de6746e0bc852f816cb00cfd564e2cc5af1bcd5c4f2c82b12b308e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base parsec text text-show time ];
+       executableHaskellDepends = [ base optparse-applicative text ];
+       testHaskellDepends = [ base hspec HUnit text time ];
+       homepage = "https://github.com/w3rs/period";
+       description = "Parse and format date periods, collapse and expand their text representations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "perm" = callPackage
     ({ mkDerivation, base, catch-fd, HUnit, mtl, test-framework
      , test-framework-hunit, transformers
@@ -104414,6 +104485,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-cereal" = callPackage
@@ -104505,6 +104577,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using mongoDB";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-mysql" = callPackage
@@ -104524,6 +104597,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-odbc" = callPackage
@@ -104566,6 +104640,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using postgresql";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-protobuf" = callPackage
@@ -104623,6 +104698,7 @@ self: {
        jailbreak = true;
        description = "Backend for persistent library using Redis";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-refs" = callPackage
@@ -104661,6 +104737,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using sqlite3";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-template" = callPackage
@@ -104684,6 +104761,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-vector" = callPackage
@@ -104731,6 +104809,7 @@ self: {
        jailbreak = true;
        description = "Backend for persistent library using Zookeeper";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persona" = callPackage
@@ -104906,7 +104985,6 @@ self: {
        ];
        description = "simply download a video (or a file) from a webpage and xdg-open it";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pgm" = callPackage
@@ -105635,6 +105713,7 @@ self: {
        homepage = "http://github.com/kvanberendonck/pipes-courier";
        description = "Pipes utilities for interfacing with the courier message-passing framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-csv" = callPackage
@@ -105656,7 +105735,7 @@ self: {
        ];
        description = "Fast, streaming csv parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
   "pipes-errors" = callPackage
@@ -105824,6 +105903,7 @@ self: {
        homepage = "http://github.com/jb55/pipes-mongodb";
        description = "Stream results from MongoDB";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
   "pipes-network" = callPackage
@@ -109760,7 +109840,6 @@ self: {
        homepage = "http://pugscode.org/";
        description = "DrIFT with pugs-specific rules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pugs-HsSyck" = callPackage
@@ -109792,7 +109871,6 @@ self: {
        ];
        description = "Portable Haskell/POSIX layer for Pugs";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pugs-hsregex" = callPackage
@@ -109995,8 +110073,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.7.3.0";
-       sha256 = "27d9e4bd3061a2b64e10d4d7c140b2debd786772309aa36e0b7fdaa49b42b5c0";
+       version = "0.7.4.1";
+       sha256 = "82d41cbde580e86620d18d03f38508b2d5f0c1ce4719ac62f3ea2bbe35ee4b9f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -110019,7 +110097,6 @@ self: {
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bundle-fast" = callPackage
@@ -111001,6 +111078,8 @@ self: {
        pname = "quiver-http";
        version = "0.0.0.2";
        sha256 = "e221dbbe65a0b4509e7efbd1e70383575175932e16b28d0cbeaa2165b7a5dfe0";
+       revision = "1";
+       editedCabalFile = "ca7fe920bd4fd519db582ca6fcfdc82f5e62563df3e29827f523acf423f43380";
        libraryHaskellDepends = [
          base bytestring http-client http-client-tls quiver
        ];
@@ -111573,8 +111652,8 @@ self: {
      }:
      mkDerivation {
        pname = "range-space";
-       version = "0.1.1.2";
-       sha256 = "2465f41de6245ccb481ac6734ff7dc22521bc4ed98aa874e668c06eadf2c9419";
+       version = "0.1.2.0";
+       sha256 = "388d6cea0511019d7e0b43989722e94202d505772271a5f84ec66d99856b38c3";
        libraryHaskellDepends = [
          base semigroups vector-space vector-space-points
        ];
@@ -111582,11 +111661,9 @@ 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;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rangemin" = callPackage
@@ -112016,20 +112093,20 @@ self: {
      }) {};
 
   "reactive-banana" = callPackage
-    ({ mkDerivation, base, containers, hashable, HUnit, psqueues
-     , test-framework, test-framework-hunit, transformers
+    ({ mkDerivation, base, containers, hashable, HUnit, pqueue
+     , psqueues, test-framework, test-framework-hunit, transformers
      , unordered-containers, vault
      }:
      mkDerivation {
        pname = "reactive-banana";
-       version = "0.8.1.2";
-       sha256 = "ead933b650793b078a9c8c9daf86c4f1cd45007a4a1a4c96bfa5257f328863aa";
+       version = "0.9.0.0";
+       sha256 = "255930fdf0dcf40fe126ae2f4f274267cfd1e5f49b548618c3c84e3a8ad79683";
        libraryHaskellDepends = [
-         base containers hashable psqueues transformers unordered-containers
+         base containers hashable pqueue transformers unordered-containers
          vault
        ];
        testHaskellDepends = [
-         base containers hashable HUnit psqueues test-framework
+         base containers hashable HUnit pqueue psqueues test-framework
          test-framework-hunit transformers unordered-containers vault
        ];
        homepage = "http://wiki.haskell.org/Reactive-banana";
@@ -112049,6 +112126,7 @@ self: {
          base data-lens data-lens-template reactive-banana SDL SDL-image
          SDL-ttf
        ];
+       jailbreak = true;
        homepage = "https://github.com/JPMoresmau/reactive-banana-sdl";
        description = "Reactive Banana bindings for SDL";
        license = stdenv.lib.licenses.gpl3;
@@ -112075,15 +112153,15 @@ self: {
     ({ mkDerivation, base, cabal-macosx, reactive-banana, wx, wxcore }:
      mkDerivation {
        pname = "reactive-banana-wx";
-       version = "0.8.0.4";
-       sha256 = "8fe99c2d49ae2b579716447caf9b75b31d951e57b796073bd6c1cdad530600e4";
+       version = "0.9.0.1";
+       sha256 = "554e9d6715665a52e6395148749d9c1ec58db2cf8dfaa4944374a605072529ba";
        configureFlags = [ "-f-buildexamples" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base cabal-macosx reactive-banana wx wxcore
        ];
-       homepage = "http://haskell.org/haskellwiki/Reactive-banana";
+       homepage = "http://wiki.haskell.org/Reactive-banana";
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -112499,6 +112577,7 @@ self: {
          aeson api-builder base bytestring Cabal hspec http-client
          http-client-tls text time transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/intolerable/reddit";
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
@@ -113915,7 +113994,6 @@ self: {
        homepage = "https://github.com/octomarat/HaskellDebugger";
        description = "Interface to ghci debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "remotion" = callPackage
@@ -114511,7 +114589,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/resistor-cube";
        description = "Compute total resistance of a cube of resistors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resolve-trivial-conflicts" = callPackage
@@ -116321,7 +116398,6 @@ self: {
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) rubberband;};
 
   "ruby-marshal" = callPackage
@@ -119496,6 +119572,7 @@ self: {
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using acid-state";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-backend-persistent" = callPackage
@@ -120239,6 +120316,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A toolkit for making compile-time interpolated templates";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "shakespeare-css" = callPackage
@@ -120837,6 +120915,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "signal" = callPackage
+    ({ mkDerivation, base, unix }:
+     mkDerivation {
+       pname = "signal";
+       version = "0.1.0.2";
+       sha256 = "80643e609ce60d9be49c13cf2a11b6ed948248de413434a162f3253c66f901fe";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base unix ];
+       executableHaskellDepends = [ base ];
+       jailbreak = true;
+       homepage = "http://github.com/pmlodawski/signal";
+       description = "Multiplatform signal support for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "signals" = callPackage
     ({ mkDerivation, array, base, constraints, containers, data-reify
      , exception-mtl, exception-transformers, language-c-quote
@@ -122442,6 +122536,8 @@ self: {
        pname = "smtLib";
        version = "1.0.7";
        sha256 = "6e660125d16c7ad42120df7fb0bd53d1d0614532ed3956aa34f6bcd3413ac2ca";
+       revision = "1";
+       editedCabalFile = "7a1d7c3e0e90bddb41538fa724f410e2a6915793ab14df4dfc4074c9d09d448e";
        libraryHaskellDepends = [ base pretty ];
        description = "A library for working with the SMTLIB format";
        license = stdenv.lib.licenses.bsd3;
@@ -125775,8 +125871,8 @@ self: {
      , classy-prelude-conduit, conduit, conduit-extra, containers
      , cryptohash, cryptohash-conduit, data-default-class, directory
      , filepath, hspec, html-conduit, http-client, http-client-tls
-     , http-conduit, mime-types, monad-unlift, mono-traversable, mtl
-     , old-locale, optparse-applicative, optparse-simple, process
+     , http-conduit, lucid, mime-types, monad-unlift, mono-traversable
+     , mtl, old-locale, optparse-applicative, optparse-simple, process
      , QuickCheck, resourcet, semigroups, stackage-cli, stackage-install
      , stackage-metadata, stackage-types, stackage-update, stm
      , streaming-commons, system-fileio, system-filepath, tar, temporary
@@ -125785,8 +125881,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-curator";
-       version = "0.10.0";
-       sha256 = "36610b312932a3c348dba4f2b93fb0242312d54e729e1a522964c5b5527d9a36";
+       version = "0.11.0";
+       sha256 = "4e6946926728bbc91d9897e81f43c4dc5f9efa886bba51068014a78576bf754d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -125794,12 +125890,12 @@ self: {
          base16-bytestring blaze-html byteable bytestring Cabal
          classy-prelude-conduit conduit conduit-extra containers cryptohash
          cryptohash-conduit data-default-class directory filepath
-         html-conduit http-client http-client-tls http-conduit mime-types
-         monad-unlift mono-traversable mtl old-locale process resourcet
-         semigroups stackage-install stackage-metadata stackage-types stm
-         streaming-commons system-fileio system-filepath tar temporary text
-         time transformers unix-compat utf8-string xml-conduit xml-types
-         yaml zlib
+         html-conduit http-client http-client-tls http-conduit lucid
+         mime-types monad-unlift mono-traversable mtl old-locale process
+         resourcet semigroups stackage-install stackage-metadata
+         stackage-types stm streaming-commons system-fileio system-filepath
+         tar temporary text time transformers unix-compat utf8-string
+         xml-conduit xml-types yaml zlib
        ];
        executableHaskellDepends = [
          base http-client http-client-tls optparse-applicative
@@ -125809,7 +125905,6 @@ self: {
          base Cabal classy-prelude-conduit containers hspec http-client
          http-client-tls QuickCheck text yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/fpco/stackage";
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
@@ -126478,7 +126573,6 @@ self: {
        homepage = "https://github.com/schell/steeloverseer";
        description = "A file watcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stemmer" = callPackage
@@ -127097,8 +127191,8 @@ self: {
     ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "streaming";
-       version = "0.1.0.9";
-       sha256 = "322fc0911ebb1643d4081fc8b34cf8252def719b5b749017fd8476e2eb16c467";
+       version = "0.1.0.11";
+       sha256 = "824351fc0c99bd5141ad4fef9db85032c5fb4d5cd745b9aca1490ea4dbfccf06";
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        homepage = "https://github.com/michaelt/streaming";
        description = "A free monad transformer optimized for streaming applications";
@@ -127106,19 +127200,17 @@ self: {
      }) {};
 
   "streaming-bytestring" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, deepseq, foldl
-     , http-client, http-client-tls, mmorph, mtl, streaming, syb
+    ({ mkDerivation, base, bytestring, deepseq, mmorph, mtl, streaming
      , transformers
      }:
      mkDerivation {
        pname = "streaming-bytestring";
-       version = "0.1.0.1";
-       sha256 = "06f0ec85133e273853c3a967f3f806336bb2ad84da24b610a53bb3c76d5a9e20";
+       version = "0.1.0.2";
+       sha256 = "cae7ee4205506ab7aa22904a4a055249f8225c5d6c4049313a09ce219ba98985";
        libraryHaskellDepends = [
-         attoparsec base bytestring deepseq foldl http-client
-         http-client-tls mmorph mtl streaming syb transformers
+         base bytestring deepseq mmorph mtl streaming transformers
        ];
-       description = "Lazy bytestring done right";
+       description = "effectful bytestrings, or: lazy bytestring done right";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -127169,6 +127261,7 @@ self: {
        homepage = "http://github.com/peti/streamproc";
        description = "Stream Processer Arrow";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "streams" = callPackage
@@ -130001,7 +130094,6 @@ self: {
        ];
        description = "Manage pools of possibly interdependent tasks using STM and async";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty" = callPackage
@@ -130257,8 +130349,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-tap";
-       version = "0.0.1";
-       sha256 = "c751cea8c7a33e8ec159a661ced1642aa29c2038d876ad1d95c27121848a00c8";
+       version = "0.0.2";
+       sha256 = "e4390ec7d63393909aa46da9346dc1abc9a4eafa4b82923b6ba776d0777784b7";
        libraryHaskellDepends = [ base containers stm tasty ];
        testHaskellDepends = [
          base directory tasty tasty-golden tasty-hunit
@@ -130492,7 +130584,6 @@ self: {
        homepage = "https://github.com/phaazon/tellbot";
        description = "IRC tellbot";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template" = callPackage
@@ -130906,7 +130997,6 @@ self: {
        testHaskellDepends = [ base directory errors filepath QuickCheck ];
        description = "A pure-Haskell (no FFI) module for accessing terminfo databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "terrahs" = callPackage
@@ -132433,7 +132523,6 @@ self: {
        homepage = "http://github.com/bennofs/themplate/";
        description = "Project templating tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "theoremquest" = callPackage
@@ -132483,7 +132572,6 @@ self: {
        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;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thespian" = callPackage
@@ -132850,7 +132938,6 @@ self: {
        homepage = "https://github.com/koterpillar/tianbar";
        description = "A desktop bar based on WebKit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tic-tac-toe" = callPackage
@@ -133204,7 +133291,6 @@ self: {
        homepage = "https://bitbucket.org/jfmueller/time-patterns";
        description = "Patterns for recurring events";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-qq" = callPackage
@@ -137174,8 +137260,8 @@ self: {
     ({ mkDerivation, base, ShowF }:
      mkDerivation {
        pname = "uniform-pair";
-       version = "0.1.7";
-       sha256 = "be32baf4cdc36db451b1ee28502a3a357e840b800118ce9102df37ffcbca98e1";
+       version = "0.1.8";
+       sha256 = "1668512c64d71f299a4b3f477dbf1b027cf38e65e4892c68cda3ca7f3d98e316";
        libraryHaskellDepends = [ base ShowF ];
        homepage = "https://github.com/conal/uniform-pair/";
        description = "Uniform pairs with class instances";
@@ -137992,8 +138078,8 @@ self: {
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.1.6";
-       sha256 = "46c6d0d84fcaca2ada708b9e7421fb9529619287696c6b44c755c8dcb32ce473";
+       version = "0.1.7";
+       sha256 = "e29aef1ce933239fc3183e785d42f3b1f86478efc4df00f7582e97140d3a5968";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring
        ];
@@ -139573,7 +139659,6 @@ self: {
        homepage = "http://hackage.haskell.org/package/vector-fftw";
        description = "A binding to the fftw library for one-dimensional vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fftw;};
 
   "vector-functorlazy" = callPackage
@@ -139917,7 +140002,6 @@ self: {
        homepage = "http://github.com/pjones/vimeta";
        description = "Frontend for video metadata tagging tools";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vimus" = callPackage
@@ -140367,7 +140451,6 @@ self: {
        homepage = "http://jtdaugherty.github.com/vty-ui/";
        description = "An interactive terminal user interface library for Vty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-ui-extras" = callPackage
@@ -141070,7 +141153,6 @@ self: {
        homepage = "https://github.com/Helkafen/wai-middleware-metrics";
        description = "A WAI middleware to collect EKG request metrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-preprocessor" = callPackage
@@ -142663,6 +142745,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "why3" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
+     , directory, filepath, happy, monadLib, pretty, pretty-show
+     , profunctors, text
+     }:
+     mkDerivation {
+       pname = "why3";
+       version = "0.8";
+       sha256 = "8e2d6d29c6fd6f0ecd72a28c3075843533db6a086c67a2a9a520f0dcc916fbf5";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq directory filepath
+         monadLib pretty pretty-show profunctors text
+       ];
+       libraryToolDepends = [ alex happy ];
+       description = "Haskell support for the Why3 input format";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "wikipedia4epub" = callPackage
     ({ mkDerivation, base, bytestring, directory, epub, filepath
      , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url
@@ -143472,12 +143572,12 @@ self: {
      }) {};
 
   "wx" = callPackage
-    ({ mkDerivation, base, stm, wxcore }:
+    ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
        pname = "wx";
-       version = "0.91.0.0";
-       sha256 = "5eba8936c4e783bb0d97ea8b8bc4140a0ff13e7529f5a2c2e1be63b707936c8c";
-       libraryHaskellDepends = [ base stm wxcore ];
+       version = "0.92.0.0";
+       sha256 = "7a649a4445aaf4681e1c2c9e0b664bce656cc4700a527af8596920019d3295e4";
+       libraryHaskellDepends = [ base stm time wxcore ];
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell";
        license = "unknown";
@@ -143519,13 +143619,13 @@ self: {
     ({ mkDerivation, base, libX11, mesa, wxdirect, wxGTK }:
      mkDerivation {
        pname = "wxc";
-       version = "0.91.0.0";
-       sha256 = "4a8fb2ce231222dec30c40b6f6eae2afc14485a0b4376f7fa49e3624a0582a6a";
+       version = "0.92.0.0";
+       sha256 = "ed5872f17e05055abaf4427f45f32d817b0f9be0352432fc3ffd08b65305a8dc";
        libraryHaskellDepends = [ base wxdirect ];
        librarySystemDepends = [ libX11 mesa ];
        libraryPkgconfigDepends = [ wxGTK ];
        doHaddock = false;
-       postInstall = "cp -v dist/build/libwxc.so.0.91.0.0 $out/lib/libwxc.so";
+       postInstall = "cp -v dist/build/libwxc.so.0.92.0.0 $out/lib/libwxc.so";
        postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs";
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell C++ wrapper";
@@ -143539,8 +143639,8 @@ self: {
      }:
      mkDerivation {
        pname = "wxcore";
-       version = "0.91.0.0";
-       sha256 = "7f52bcb0412f50fa77677a7fe9d45d087a2c9d623b89c03d9d327a18b557fb06";
+       version = "0.92.0.0";
+       sha256 = "332a68b658be7eeca62e9992dd01d26016a3f24e6666e803107291a3c71145b9";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath parsec stm time
          wxc wxdirect
@@ -143557,14 +143657,13 @@ self: {
      }:
      mkDerivation {
        pname = "wxdirect";
-       version = "0.91.0.0";
-       sha256 = "475c9f977576f1ea881461d7ac729caa71c0b5958db8500fab9b3de57ddcb49f";
+       version = "0.92.0.0";
+       sha256 = "b13687de38402df779780db1bc410f02a6ae6815d3e984b702d2c7c4be799ec8";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
          base containers directory filepath parsec process strict time
        ];
-       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "helper tool for building wxHaskell";
        license = stdenv.lib.licenses.bsd3;
@@ -144848,13 +144947,14 @@ self: {
        pname = "xmonad";
        version = "0.11.1";
        sha256 = "39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd";
+       revision = "1";
+       editedCabalFile = "12849de2637cf39a8c0311d81418632e719125f55db2faf931b1905d85d5bf3d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers directory extensible-exceptions filepath mtl
          process unix utf8-string X11
        ];
-       jailbreak = true;
        homepage = "http://xmonad.org";
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
@@ -145396,7 +145496,6 @@ self: {
        homepage = "http://github.com/snoyberg/yackage";
        description = "Personal Hackage replacement for testing new packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yahoo-finance-conduit" = callPackage
@@ -145805,6 +145904,7 @@ self: {
        jailbreak = true;
        description = "Yet Another Template Engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yavie" = callPackage
@@ -146502,8 +146602,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-dsl";
-       version = "0.1.1.24";
-       sha256 = "a73d0796e4148507937566155287721d83c687114c1dfdfd73441ef1e6f8255f";
+       version = "0.2.0";
+       sha256 = "934aa5de181619e11c39054e9299271a4f447e753589d1b6eafd757216193c49";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146518,7 +146618,6 @@ self: {
        ];
        description = "DSL for generating Yesod subsite to manage an RDBMS;";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-eventsource" = callPackage
@@ -147039,7 +147138,6 @@ self: {
        ];
        description = "RAML style route definitions for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-recaptcha" = callPackage
@@ -147099,7 +147197,6 @@ self: {
        homepage = "https://github.com/frontrowed/yesod-routes-flow";
        description = "Generate Flow routes for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-routes-typescript" = callPackage
@@ -147391,8 +147488,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-transloadit";
-       version = "0.4.0.0";
-       sha256 = "a50270b5829c45c7b72a82137abf94046343f60532bcab0a8a6ef0fd9974745a";
+       version = "0.4.1.0";
+       sha256 = "4e0a68a2f1d90bdc4489ac18f05bff3728da89756ebbd54cc1654d6b81114c80";
        libraryHaskellDepends = [
          aeson base byteable bytestring cryptohash lens lens-aeson
          old-locale shakespeare text time transformers unordered-containers

From b45e3290c90031bc41d48a9009e9034b6d6814ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Aug 2015 12:42:03 +0200
Subject: [PATCH 1649/2016] haskell-wx: new versions require wkGTK 3.0

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 41eeaf30cc5..528a493aba0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -591,9 +591,9 @@ self: super: {
   # https://github.com/vincenthz/hs-asn1/issues/12
   asn1-encoding = dontCheck super.asn1-encoding;
 
-  # wxc supports wxGTX >= 2.9, but our current default version points to 2.8.
-  wxc = super.wxc.override { wxGTK = pkgs.wxGTK29; };
-  wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; };
+  # wxc supports wxGTX >= 3.0, but our current default version points to 2.8.
+  wxc = super.wxc.override { wxGTK = pkgs.wxGTK30; };
+  wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };
 
   # Depends on QuickCheck 1.x.
   HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; };

From c375b224b0dc891ac49f116bcd38fe4de60854ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Aug 2015 14:23:57 +0200
Subject: [PATCH 1650/2016] haskell-concurrent-extra fails its test suite.

---
 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 528a493aba0..b55ffd5f461 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1010,4 +1010,8 @@ self: super: {
     ];
     prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" '';
   });
+
+  # https://github.com/basvandijk/concurrent-extra/issues/12
+  concurrent-extra = dontCheck super.concurrent-extra;
+
 }

From 12dcb664d686a1a96855ae617e1748490b7291a4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Aug 2015 14:34:35 +0200
Subject: [PATCH 1651/2016] haskell-amazonka-core can't compile its test suite.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b55ffd5f461..5e135a99973 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1014,4 +1014,7 @@ self: super: {
   # https://github.com/basvandijk/concurrent-extra/issues/12
   concurrent-extra = dontCheck super.concurrent-extra;
 
+  # https://github.com/brendanhay/amazonka/issues/203
+  amazonka-core = dontCheck super.amazonka-core;
+
 }

From 67fcedd51721eda7ef86a924f72f88d470356826 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Aug 2015 15:45:52 +0200
Subject: [PATCH 1652/2016] haskell-harp has been fixed upstream.

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ----
 1 file changed, 4 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 04205825ef2..f7b7a3b70ef 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -224,10 +224,6 @@ self: super: {
   # https://github.com/HugoDaniel/RFC3339/issues/14
   timerep = dontCheck super.timerep;
 
-  # Upstream has no issue tracker.
-  harp = markBrokenVersion "0.4" super.harp;
-  happstack-authenticate = dontDistribute super.happstack-authenticate;
-
   # Upstream has no issue tracker.
   llvm-base-types = markBroken super.llvm-base-types;
   llvm-analysis = dontDistribute super.llvm-analysis;

From 97c5f0577df89e19221d059497068a6c4e9ae7d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Aug 2015 15:46:18 +0200
Subject: [PATCH 1653/2016] haskell-llvm-general: the new version still doesn't
 support LLVM 3.5

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 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 f7b7a3b70ef..28092f8d886 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -252,8 +252,8 @@ self: super: {
   HLearn-distributions = dontDistribute super.HLearn-distributions;
   HLearn-classification = dontDistribute super.HLearn-classification;
 
-  # Won't work with LLVM 3.5.
-  llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
+  # Doesn't work with LLVM 3.5.
+  llvm-general = markBroken super.llvm-general;
 
   # Inexplicable haddock failure
   # https://github.com/gregwebs/aeson-applicative/issues/2

From d34f7ded4964ba05917be14f899b534dd310ec52 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Aug 2015 19:18:55 +0200
Subject: [PATCH 1654/2016] ghc-head: update to current HEAD

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

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 65d52c1a3e5..fe0d0b37371 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -17,14 +17,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "7.11.20150809";
+  version = "7.11.20150828";
   name = "ghc-${version}";
-  rev = "a40ec755d8e020cd4b87975f5a751f1e35c36977";
+  rev = "38c98e4f61a48084995a5347d76ddd024ce1a09c";
 
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
     inherit rev;
-    sha256 = "1hh1p9vrd1nrfi56jan4bnlczld2qzx85v7lfb6nara2bhcgqa1l";
+    sha256 = "0wnxrfzjpjcmsmd2i0zg30jg7zpw1rrfwz8r56g314l7xcns6yp1";
   };
 
   postUnpack = ''

From ab37ad22f7e0881aa3ae16f64d54d505b429dc34 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Aug 2015 22:59:29 +0200
Subject: [PATCH 1655/2016] doc: add "other resources" section to
 haskell-users-guide.xml

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

diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml
index 9a945d30a9b..35eac42e0cf 100644
--- a/doc/haskell-users-guide.xml
+++ b/doc/haskell-users-guide.xml
@@ -755,4 +755,69 @@ export NIX_CFLAGS_LINK=&quot;-L/usr/lib&quot;
   </section>
 </section>
 
+<section xml:id="other-resources">
+  <title>Other resources</title>
+  <itemizedlist>
+    <listitem>
+      <para>
+        The Youtube video
+        <link xlink:href="https://www.youtube.com/watch?v=BsBhi_r-OeE">Nix
+        Loves Haskell</link> provides an introduction into Haskell NG
+        aimed at beginners. The slides are available at
+        http://cryp.to/nixos-meetup-3-slides.pdf and also -- in a form
+        ready for cut &amp; paste -- at
+        https://github.com/NixOS/cabal2nix/blob/master/doc/nixos-meetup-3-slides.md.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Another Youtube video is
+        <link xlink:href="https://www.youtube.com/watch?v=mQd3s57n_2Y">Escaping
+        Cabal Hell with Nix</link>, which discusses the subject of
+        Haskell development with Nix but also provides a basic
+        introduction to Nix as well, i.e. it's suitable for viewers with
+        almost no prior Nix experience.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Oliver Charles wrote a very nice
+        <link xlink:href="http://wiki.ocharles.org.uk/Nix">Tutorial how to
+        develop Haskell packages with Nix</link>.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        The <emphasis>Journey into the Haskell NG
+        infrastructure</emphasis> series of postings describe the new
+        Haskell infrastructure in great detail:
+      </para>
+      <itemizedlist>
+        <listitem>
+          <para>
+            <link xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2015-January/015591.html">Part
+            1</link> explains the differences between the old and the
+            new code and gives instructions how to migrate to the new
+            setup.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <link xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2015-January/015608.html">Part
+            2</link> looks in-depth at how to tweak and configure your
+            setup by means of overrides.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <link xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2015-April/016912.html">Part
+            3</link> describes the infrastructure that keeps the
+            Haskell package set in Nixpkgs uptodate.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+</section>
+
 </chapter>

From 43ea4b670cd4f1806d3cbde648e5660d6069abae Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 28 Aug 2015 15:43:35 -0700
Subject: [PATCH 1656/2016] ipfs: Update

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 6d3354d27c9..4818eba0bb9 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1535,17 +1535,12 @@ let
     sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b";
   };
 
-  ipfs = buildGoPackage rec {
-    rev = "952dc9c60fdff27902749222fdc30164e7eea1ee";
-    name = "ipfs-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/ipfs/go-ipfs";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "ipfs";
-      repo   = "go-ipfs";
-      sha256 = "1mlilx1i77px85jag4jwpcy8fy0vv15hsmpr1d9zvcs3b7qhskqp";
-    };
+  ipfs = buildFromGitHub{
+    rev = "ff26c312000da12d395c9cdba05c43f29b68b456";
+    owner  = "ipfs";
+    repo   = "go-ipfs";
+    sha256 = "0qj3rwq5i4aiwn0i09skpi1s3mzqm8ma9v1cpjl7rya2y6ypx8xg";
+    excludedPackages = "Godeps";
   };
 
   ldap = buildGoPackage rec {

From c5e2beab9f6d92a1fc0eb975992a78d9d1c1cba1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 28 Aug 2015 15:44:48 -0700
Subject: [PATCH 1657/2016] Revert mongodb-tools: use Go 1.4

Unneeded as it works fine with Go 1.5 now
---
 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 3163f4ab861..bdbed02ef2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -948,7 +948,7 @@ let
 
   mcrypt = callPackage ../tools/misc/mcrypt { };
 
-  mongodb-tools = go14Packages.mongo-tools;
+  mongodb-tools = goPackages.mongo-tools;
 
   mstflint = callPackage ../tools/misc/mstflint { };
 

From 5a303519fae00496e0393a81bf47f3f4d0234df0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 28 Aug 2015 15:46:34 -0700
Subject: [PATCH 1658/2016] kernel: 3.12.46 -> 3.12.47

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 904aebd75be..8146f4a5dec 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.46";
+  version = "3.12.47";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "01w0b1sifzivbagm724bz0mlfrm7hpbj5a3lx1yrv8xg64gni3m1";
+    sha256 = "0mcchrm79zjsnxvwf1v3glhv0zs4dszi9qwhmnws3dqxaj9brgyn";
   };
 
   features.iwlwifi = true;

From 500f871d45a7cb742c8ca2725aea72f8506d84e7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 28 Aug 2015 16:17:43 -0700
Subject: [PATCH 1659/2016] go1.5: Fix references to go1.4

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

diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix
index 8abafe0d117..8e9adf165f6 100644
--- a/pkgs/development/compilers/go/1.5.nix
+++ b/pkgs/development/compilers/go/1.5.nix
@@ -11,6 +11,12 @@ let
     find $out -name "*.c" -delete
     cp -rf $out/bin/* $out/share/go/bin/
   '';
+
+  removeReferences = [ go_1_4 ];
+
+  removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: ''
+    | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \
+  '');
 in
 
 stdenv.mkDerivation rec {
@@ -105,8 +111,18 @@ stdenv.mkDerivation rec {
     ./all.bash
   '';
 
+  preFixup = ''
+    while read file; do
+      cat $file ${removeExpr removeReferences} > $file.tmp
+      mv $file.tmp $file
+      chmod +x $file
+    done < <(find $out/share/go/pkg/bootstrap/bin -type f 2>/dev/null)
+  '';
+
   setupHook = ./setup-hook.sh;
 
+  disallowedReferences = [ go_1_4 ];
+
   meta = with stdenv.lib; {
     branch = "1.5";
     homepage = http://golang.org/;

From 645709eaa5a68da036132f274447b18198477e94 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 28 Aug 2015 16:29:22 -0700
Subject: [PATCH 1660/2016] go1.5: Remove the bootstrap as it is unneeded

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

diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix
index 8e9adf165f6..4f9e8b25b75 100644
--- a/pkgs/development/compilers/go/1.5.nix
+++ b/pkgs/development/compilers/go/1.5.nix
@@ -11,12 +11,6 @@ let
     find $out -name "*.c" -delete
     cp -rf $out/bin/* $out/share/go/bin/
   '';
-
-  removeReferences = [ go_1_4 ];
-
-  removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: ''
-    | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \
-  '');
 in
 
 stdenv.mkDerivation rec {
@@ -112,11 +106,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    while read file; do
-      cat $file ${removeExpr removeReferences} > $file.tmp
-      mv $file.tmp $file
-      chmod +x $file
-    done < <(find $out/share/go/pkg/bootstrap/bin -type f 2>/dev/null)
+    rm -r $out/share/go/pkg/bootstrap
   '';
 
   setupHook = ./setup-hook.sh;

From 2d16959bb838797a60a10ae48ad35c4d818ab462 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 28 Aug 2015 16:29:48 -0700
Subject: [PATCH 1661/2016] goPackages: gcloud-golang don't mark broken as this
 breaks anything depending on metadata

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 4818eba0bb9..7c319e36517 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -619,8 +619,6 @@ let
     goPackagePath = "google.golang.org/cloud";
     buildInputs = [ net oauth2 protobuf google-api-go-client grpc ];
     excludedPackages = "oauth2";
-
-    meta.broken = true;
   };
 
   gcloud-golang-compute-metadata = buildGoPackage rec {

From 6d83b137345f435d2eb1822731a04b9524a19295 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 28 Aug 2015 17:49:03 -0700
Subject: [PATCH 1662/2016] ceph: 0.94.2 -> 0.94.3

---
 pkgs/tools/filesystems/ceph/0.94-pre.nix | 13 -------------
 pkgs/tools/filesystems/ceph/0.94.nix     |  9 +++------
 pkgs/top-level/all-packages.nix          |  1 -
 3 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/ceph/0.94-pre.nix

diff --git a/pkgs/tools/filesystems/ceph/0.94-pre.nix b/pkgs/tools/filesystems/ceph/0.94-pre.nix
deleted file mode 100644
index fcf57526fd1..00000000000
--- a/pkgs/tools/filesystems/ceph/0.94-pre.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ callPackage, fetchgit, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "0.94.3";
-
-  src = fetchgit {
-    url = "https://github.com/wkennington/ceph.git";
-    rev = "6218aa41e04533f0d6e62b5c7be591c2e99716ec";
-    sha256 = "0cyl5i1q6lap5a6vk8fjxfpikhxzwm9zkybg37nibahi2bwjr7rr";
-  };
-
-  patches = [ ./fix-pgrefdebugging.patch ];
-})
diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
index 4dca90e5f27..f564e28c5a3 100644
--- a/pkgs/tools/filesystems/ceph/0.94.nix
+++ b/pkgs/tools/filesystems/ceph/0.94.nix
@@ -1,16 +1,13 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.94.2";
+  version = "0.94.3";
 
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l";
+    sha256 = "020khb9978wayi4jnx7f9g1fzfg3r2xn9qw66snpd3k8w2dmycxy";
   };
 
-  patches = [
-    ./fix-pgrefdebugging.patch
-    ./boost-158.patch
-  ];
+  patches = [ ./fix-pgrefdebugging.patch ];
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bdbed02ef2d..e1c50957d00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1066,7 +1066,6 @@ let
   libceph = ceph.lib;
   ceph-0_80 = callPackage ../tools/filesystems/ceph/0.80.nix { };
   ceph-0_94 = callPackage ../tools/filesystems/ceph/0.94.nix { };
-  ceph-0_94-pre = callPackage ../tools/filesystems/ceph/0.94-pre.nix { };
   ceph = callPackage ../tools/filesystems/ceph { };
   ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
   ceph-git = lowPrio (callPackage ../tools/filesystems/ceph/git.nix { });

From b409331a5a96c3dd67004d25adb1d96dbb8aa468 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 28 Aug 2015 17:49:15 -0700
Subject: [PATCH 1663/2016] ipset: 6.24 -> 6.26

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

diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix
index b76ce583b23..2db57ecef92 100644
--- a/pkgs/os-specific/linux/ipset/default.nix
+++ b/pkgs/os-specific/linux/ipset/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "ipset-6.24";
+  name = "ipset-6.26";
 
   src = fetchurl {
     url = "http://ipset.netfilter.org/${name}.tar.bz2";
-    sha256 = "1l4mx78473azf7cb19fxf37gmj95k1zzabimbcmlg9h07wlgqw9h";
+    sha256 = "0lbsg1fbiw9m959lgqziyivmx32z3vbnp3jhgnprkq31ia7a29kn";
   };
 
-  buildInputs = [ pkgconfig libmnl ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libmnl ];
 
   configureFlags = [ "--with-kmod=no" ];
 

From 3e6092fe6b4b475981f4e27e0726e8da83c507e2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 28 Aug 2015 17:50:55 -0700
Subject: [PATCH 1664/2016] libraw: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index d272ad18492..3d564fc00f8 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "15ng4s24grib39r0nlgrf18r2j9yh43qyx4vbif38d95xiqkix3i";
+    sha256 = "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6";
   };
 
   buildInputs = [ lcms2 jasper ] ;
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
     homepage = http://www.libraw.org/;
     license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.all;
   };
 }
 

From d2dce19793069b6104ff7df29af92316e7fe3b50 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 28 Aug 2015 17:53:48 -0700
Subject: [PATCH 1665/2016] uid_wrapper: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix
index 07fffeff20d..0ec6342c39e 100644
--- a/pkgs/development/libraries/uid_wrapper/default.nix
+++ b/pkgs/development/libraries/uid_wrapper/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "uid_wrapper-1.1.0";
+  name = "uid_wrapper-1.1.1";
 
   src = fetchurl {
     url = "mirror://samba/cwrap/${name}.tar.gz";
-    sha256 = "18xdyy7rvn0zg6j44ay0sxd4q0bplq64syyki9wi8ixhkrzqn0yn";
+    sha256 = "0y033cjs0kwmpx70xc4wh789vk9rw6bziizs28h50ad7lyyvx5b9";
   };
 
-  buildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "a wrapper for the user, group and hosts NSS API";

From 5fe9618a30e4bca97f5b76cb094084122e1dd9ed Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 28 Aug 2015 19:27:33 -0700
Subject: [PATCH 1666/2016] vimUtils.pluginnames2nix: fixes for non-nixos
 systems

Now referring to the nix prefetch scripts through their nixpkgs
derivation in order to make sure their shebang lines are rewritten
properly.  Otherwise nix-prefetch-hg fails on Ubuntu (and probably
Debian) systems, where /bin/sh is not bash.
---
 pkgs/misc/vim-plugins/vim-utils.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index ec1724a9f9a..c75a92f46cf 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -1,6 +1,7 @@
-{stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin}:
+{stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin
+, nix-prefetch-scripts }:
 
-/* 
+/*
 
 USAGE EXAMPLE
 =============
@@ -309,8 +310,8 @@ rec {
         echom repeat("=", 80)
       endif
       let opts = {}
-      let opts.nix_prefetch_git = "${../../../pkgs/build-support/fetchgit/nix-prefetch-git}"
-      let opts.nix_prefetch_hg  = "${../../../pkgs/build-support/fetchhg/nix-prefetch-hg}"
+      let opts.nix_prefetch_git = "${nix-prefetch-scripts}/bin/nix-prefetch-git"
+      let opts.nix_prefetch_hg  = "${nix-prefetch-scripts}/bin/nix-prefetch-hg"
       let opts.cache_file = g:vim_addon_manager.plugin_root_dir.'/cache'
       let opts.plugin_dictionaries = []
       ${lib.concatMapStrings (file: "let opts.plugin_dictionaries += map(readfile(\"${file}\"), 'eval(v:val)')\n") namefiles }

From 17667cd6ac261c936b1d185b3f8292c30d551143 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Fri, 28 Aug 2015 22:41:56 -0400
Subject: [PATCH 1667/2016] haskellPackages.tar: disable tests

They fail on i686-linux: http://hydra.nixos.org/build/25088435/nixlog/2
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5e135a99973..11a806289ed 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -465,6 +465,7 @@ self: super: {
   static-resources = dontCheck super.static-resources;
   strive = dontCheck super.strive;                      # fails its own hlint test with tons of warnings
   svndump = dontCheck super.svndump;
+  tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit)
   thumbnail-plus = dontCheck super.thumbnail-plus;
   tickle = dontCheck super.tickle;
   tpdb = dontCheck super.tpdb;

From 9dd6f4f6cea709b4c57cc4d00616b8122a6f4ae1 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Fri, 28 Aug 2015 22:08:43 -0700
Subject: [PATCH 1668/2016] ffmpeg: 2.7.1 -> 2.7.2

---
 pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++--
 pkgs/development/libraries/ffmpeg/2.7.nix          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 263943411e8..dd8a3aef8d4 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -231,11 +231,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-${version}";
-  version = "2.7.1";
+  version = "2.7.2";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy";
+    sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw";
   };
 
   patchPhase = ''patchShebangs .'';
diff --git a/pkgs/development/libraries/ffmpeg/2.7.nix b/pkgs/development/libraries/ffmpeg/2.7.nix
index 3e4708fdf46..105239c48c9 100644
--- a/pkgs/development/libraries/ffmpeg/2.7.nix
+++ b/pkgs/development/libraries/ffmpeg/2.7.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.1";
+  version = "${branch}.2";
   branch = "2.7";
-  sha256 = "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy";
+  sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw";
 })

From 7f26d95dcf8d2340c15eb63afdf9f04d8ff3f534 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Sat, 29 Aug 2015 01:09:24 -0400
Subject: [PATCH 1669/2016] glob2: fix build failure

The same issue was reported here to Debian:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746854

Apparently this failure only cropped up with g++-4.9, but looking at
the code I have no idea how it ever worked without this patch.
---
 pkgs/games/globulation/default.nix            |  2 +-
 .../globulation/public-buildproject.patch     | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/games/globulation/public-buildproject.patch

diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix
index ed134bcf3c9..061f7c328d6 100644
--- a/pkgs/games/globulation/default.nix
+++ b/pkgs/games/globulation/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g";
   };
 
-  patches = [ ./header-order.patch ];
+  patches = [ ./header-order.patch ./public-buildproject.patch ];
 
   postPatch = ''
     cp campaigns/tutorial-part4.map{,.orig}
diff --git a/pkgs/games/globulation/public-buildproject.patch b/pkgs/games/globulation/public-buildproject.patch
new file mode 100644
index 00000000000..1eaedf08820
--- /dev/null
+++ b/pkgs/games/globulation/public-buildproject.patch
@@ -0,0 +1,21 @@
+diff -Nru glob2-0.9.4.4/src/Game.h glob2-0.9.4.4.new/src/Game.h
+--- glob2-0.9.4.4/src/Game.h	2009-08-29 16:39:06.000000000 -0400
++++ glob2-0.9.4.4.new/src/Game.h	2015-08-29 00:59:07.843398596 -0400
+@@ -148,7 +148,7 @@
+ 		TOP_TO_BOTTOM,
+ 		BOTTOM_TO_TOP
+ 	};
+-	
++public:	
+ 	struct BuildProject
+ 	{
+ 		int posX;
+@@ -158,7 +158,7 @@
+ 		int unitWorking;
+ 		int unitWorkingFuture;
+ 	};
+-	
++private:	
+ 	///Initiates Game
+ 	void init(GameGUI *gui, MapEdit* edit);
+ 

From 6b866a37fc62321b42a6dd82f058d5c152c1c6e7 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 29 Aug 2015 01:06:06 +0300
Subject: [PATCH 1670/2016] xrdb: Use mcpp as the preprocessor

Close #9501, fixes #9480.

By default, xrdb uses GCC as the preprocessor at runtime for X resource files.
However, gcc is a large dependency, so replace it with mcpp, a much smaller
preprocessor (currently under a megabyte on i686).

Arch Linux already does this as well, so this should be relatively safe:
https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/xorg-xrdb
---
 pkgs/servers/x11/xorg/overrides.nix | 4 ++++
 pkgs/top-level/all-packages.nix     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 71185643a9e..2036e62ee94 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -421,4 +421,8 @@ in
     outputs = [ "out" "doc" ];
   };
 
+  xrdb = attrs: attrs // {
+    configureFlags = "--with-cpp=${args.mcpp}/bin/mcpp";
+  };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1c50957d00..b8ad3c07f7d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9374,7 +9374,7 @@ let
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
     inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
       libxslt expat libpng zlib perl mesa_drivers spice_protocol
-      dbus libuuid openssl gperf m4 libevdev tradcpp libinput makeWrapper autoreconfHook
+      dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
       autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
     bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
     mesa = mesa_noglu;

From 49f9aba5dd41ab329d1830796396b6e876d3cc64 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 00:10:30 -0700
Subject: [PATCH 1671/2016] goPackages: update various Prometheus dependencies

Improving style and adding dates along the dependency tree.
---
 pkgs/top-level/go-packages.nix | 188 +++++++++++++--------------------
 1 file changed, 75 insertions(+), 113 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 7c319e36517..b69f3fd26b8 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -51,9 +51,10 @@ let
   };
 
   net = buildFromGitHub {
-    rev = "3a29182c25eeabbaaf94daaeecbc7823d86261e7";
-    owner = "golang";
-    repo = "net";
+    rev    = "3a29182c25eeabbaaf94daaeecbc7823d86261e7";
+    date   = "2015-07-28";
+    owner  = "golang";
+    repo   = "net";
     sha256 = "0g4w411l0v9yg8aib05kzjm9j6dwsd6nk6ayk8j0dkmqildqrx5v";
     goPackagePath = "golang.org/x/net";
     goPackageAliases = [
@@ -102,6 +103,7 @@ let
 
   snappy = buildFromGitHub {
     rev    = "0c7f8a7704bfec561913f4df52c832f094ef56f0";
+    date   = "2015-07-21";
     owner  = "golang";
     repo   = "snappy";
     sha256 = "17j421ra8jm2da8gc0sk71g3n1nizqsfx1mapn255nvs887lqm0y";
@@ -378,17 +380,12 @@ let
     sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0";
   };
 
-  consul = buildGoPackage rec {
-    rev = "v0.5.2";
-    name = "consul-${rev}";
-    goPackagePath = "github.com/hashicorp/consul";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "consul";
-      sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7";
-    };
+  consul = buildFromGitHub {
+    rev    = "a6317f2fb2ba9d5ae695f7fa703cfb30a1c59af1";
+    date   = "2015-07-24";
+    owner  = "hashicorp";
+    repo   = "consul";
+    sha256 = "0jixpl9yksasqx9rkidx8qmqc59m34kiibsqfsv56g87wzyp89rs";
 
     buildInputs = [
       circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint
@@ -434,18 +431,12 @@ let
     buildInputs = [ logrus docopt-go hipchat-go gopherduty ];
   };
 
-  consul-migrate = buildGoPackage rec {
-    rev = "4977886fc950a0db1a6f0bbadca56dfabf170f9c";
-    name = "consul-migrate-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/consul-migrate";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hashicorp";
-      repo = "consul-migrate";
-      sha256 = "0kjziwhz1ifj4wpy5viba6z17sfgjjibdhnn73ffp7q5q8abg8w3";
-    };
-
+  consul-migrate = buildFromGitHub {
+    rev    = "678fb10cdeae25ab309e99e655148f0bf65f9710";
+    date   = "2015-05-19";
+    owner  = "hashicorp";
+    repo   = "consul-migrate";
+    sha256 = "18zqyzbc3pny700fnh4hi45i5mlsramqykikcr7lgyx7id6alf16";
     buildInputs = [ raft raft-boltdb raft-mdb ];
   };
 
@@ -531,10 +522,11 @@ let
   };
 
   dns = buildFromGitHub {
-    rev    = "bb1103f648f811d2018d4bedcb2d4b2bce34a0f1";
+    rev    = "e59f851c912767b1db587dcabee6e6652e495c75";
+    date   = "2015-07-22";
     owner  = "miekg";
     repo   = "dns";
-    sha256 = "1c1gasvzlcmgwyqhksm656p03nc76kxjxllbcw9bwfy5v7p9w7qq";
+    sha256 = "1zcj4drmmskwvjy5ld54qd8a34ls9651ysl3q7c2bcambax5r0hp";
   };
 
   docopt-go = buildFromGitHub {
@@ -792,32 +784,22 @@ let
     sha256 = "1xx6lpv1r2sji8m9w35a2fkr9v4vsgvxrrahcq9bdg75qvadq91d";
   };
 
-  golang_protobuf_extensions = buildGoPackage rec {
-    rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
-    name = "golang-protobuf-extensions-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "matttproud";
-      repo = "golang_protobuf_extensions";
-      sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
-    };
-
+  golang_protobuf_extensions = buildFromGitHub {
+    rev    = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
+    date   = "2015-04-06";
+    owner  = "matttproud";
+    repo   = "golang_protobuf_extensions";
+    sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
     buildInputs = [ protobuf ];
   };
 
-  goleveldb = buildGoPackage rec {
-    rev = "e9e2c8f6d3b9c313fb4acaac5ab06285bcf30b04";
-    name = "goleveldb-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/syndtr/goleveldb";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "syndtr";
-      repo = "goleveldb";
-      sha256 = "0vg3pcrbdhbmanwkc5njxagi64f4k2ikfm173allcghxcjamrkwv";
-    };
-    propagatedBuildInputs = [ ginkgo gomega gosnappy ];
+  goleveldb = buildFromGitHub {
+    rev = "183614d6b32571e867df4cf086f5480ceefbdfac";
+    date = "2015-06-17";
+    owner = "syndtr";
+    repo = "goleveldb";
+    sha256 = "0crslwglkh8b3204l4zvav712a7yd2ykjnbrnny6yrq94mlvba8r";
+    propagatedBuildInputs = [ ginkgo gomega snappy ];
   };
 
   gollectd = buildFromGitHub {
@@ -1331,6 +1313,7 @@ let
 
   go-zookeeper = buildFromGitHub {
     rev    = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4";
+    date   = "2015-06-02";
     owner  = "samuel";
     repo   = "go-zookeeper";
     sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z";
@@ -1457,10 +1440,11 @@ let
   };
 
   httprouter = buildFromGitHub {
-    rev    = "bde5c16eb82ff15a1734a3818d9b9547065f65b1";
+    rev    = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7";
+    date   = "2015-07-08";
     owner  = "julienschmidt";
     repo   = "httprouter";
-    sha256 = "1l74pvqqhhval4vfnhca9d6i1ij69qs3ljf41w3m1l2id42rq7r9";
+    sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl";
   };
 
   inf = buildFromGitHub {
@@ -1562,7 +1546,7 @@ let
 
   levigo = buildGoPackage rec {
     rev = "1ddad808d437abb2b8a55a950ec2616caa88969b";
-    name = "logrus-${stdenv.lib.strings.substring 0 7 rev}";
+    name = "levigo-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/jmhodges/levigo";
 
     excludedPackages = "examples";
@@ -1621,20 +1605,13 @@ let
     propagatedBuildInputs = [ go-colortext ];
   };
 
-  logrus = buildGoPackage rec {
-    rev = "v0.8.2";
-    name = "logrus-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/Sirupsen/logrus";
-
+  logrus = buildFromGitHub rec {
+    rev = "v0.8.6";
+    date = rev;  # Trick buildFromGitHub into keeping the version number.
+    owner = "Sirupsen";
+    repo = "logrus";
+    sha256 = "1v2qcjy6w24jgdm7kk0f8lqpa25qxzll2x6ycqwidd3pzjhrkifa";
     excludedPackages = "examples";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "Sirupsen";
-      repo = "logrus";
-      sha256 = "0isihf185bw54yc72mbkf3cgfh7xj0x8ky04fs52xpj6vrmd72bv";
-    };
-
     propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ];
   };
 
@@ -1932,17 +1909,13 @@ let
     sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam";
   };
 
-  beorn7.perks = buildGoPackage rec {
-    rev = "b965b613227fddccbfffe13eae360ed3fa822f8d";
-    name = "beorn7.perks-${stdenv.lib.strings.substring 0 7 rev}";
+  beorn7.perks = buildFromGitHub rec {
+    date   = "2015-02-23";
+    owner  = "beorn7";
+    repo   = "perks";
+    rev    = "b965b613227fddccbfffe13eae360ed3fa822f8d";
+    sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
     goPackagePath = "github.com/beorn7/perks";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "beorn7";
-      repo = "perks";
-      sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
-    };
   };
 
   pflag = buildGoPackage rec {
@@ -2000,11 +1973,12 @@ let
     propagatedBuildInputs = [ kr.text ];
   };
 
-  prometheus.client_golang = buildFromGitHub {
-    rev = "3a499bf7fc46bc58337ce612d0cbb29c550b8118";
+  prometheus.client_golang = buildFromGitHub rec {
+    rev = "0.7.0";
+    date = rev;  # Trick buildFromGitHub into keeping the version number
     owner = "prometheus";
     repo = "client_golang";
-    sha256 = "1hf79m83kr3b6nxxwz8qw1c5nls58j1xfaz7q6k6bb9kwabpc3gi";
+    sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna";
     propagatedBuildInputs = [
       goautoneg
       protobuf
@@ -2016,43 +1990,30 @@ let
     excludedPackages = "examples";
   };
 
-  prometheus.client_model = buildGoPackage rec {
-    rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
-    name = "prometheus-client-model-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/prometheus/client_model";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "prometheus";
-      repo = "client_model";
-      sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
-    };
+  prometheus.client_model = buildFromGitHub {
+    rev    = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
+    date   = "2015-02-12";
+    owner  = "prometheus";
+    repo   = "client_model";
+    sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
     buildInputs = [ protobuf ];
   };
 
-  prometheus.log = buildGoPackage rec {
-    name = "prometheus-log-${version}";
-    version = "git-2015-05-29";
-    goPackagePath = "github.com/prometheus/log";
-    src = fetchFromGitHub {
-      rev = "439e5db48fbb50ebbaf2c816030473a62f505f55";
-      owner = "prometheus";
-      repo = "log";
-      sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv";
-    };
+  prometheus.log = buildFromGitHub {
+    rev    = "439e5db48fbb50ebbaf2c816030473a62f505f55";
+    date   = "2015-05-29";
+    owner  = "prometheus";
+    repo   = "log";
+    sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv";
     propagatedBuildInputs = [ logrus ];
   };
 
-  prometheus.procfs = buildGoPackage rec {
-    rev = "351fbfac67c8ae8bcacd468f678f5e8d5a585d3d";
-    name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/prometheus/procfs";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "prometheus";
-      repo = "procfs";
-      sha256 = "0hxssp6h1cs7l2cvnxj1hyacy3328hhpi1pd123f2a57aikha9ff";
-    };
+  prometheus.procfs = buildFromGitHub {
+    rev    = "c91d8eefde16bd047416409eb56353ea84a186e4";
+    date   = "2015-06-16";
+    owner  = "prometheus";
+    repo   = "procfs";
+    sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
   };
 
   pty = buildFromGitHub {
@@ -2122,10 +2083,11 @@ let
   };
 
   raven-go = buildFromGitHub {
-    rev    = "c8f8fb7c415203f52ca882e2661d21bc6dcb54d7";
+    rev    = "74c334d7b8aaa4fd1b4fc6aa428c36fed1699e28";
+    date   = "2015-07-21";
     owner  = "getsentry";
     repo   = "raven-go";
-    sha256 = "052avpl8xsqlcmjmi3v00nm23lhs95af6vpaw2sh5xckln0lfbxh";
+    sha256 = "1356a7h8zp1mcywnr0y83w0h4qdblp65rcf9slbx667n8x2rzda8";
   };
 
   redigo = buildFromGitHub {

From 86eca38b0c2e341a97e4ecab07d1ebd517bf1d05 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 00:11:59 -0700
Subject: [PATCH 1672/2016] prometheus: 0.14.0 -> 0.15.1

---
 .../servers/monitoring/prometheus/default.nix | 52 ++++++++-----------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 4b8d1cdbe56..c6ed75e0d09 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -2,47 +2,41 @@
 
 goPackages.buildGoPackage rec {
   name = "prometheus-${version}";
-  version = "0.14.0";
+  version = "0.15.1";
   goPackagePath = "github.com/prometheus/prometheus";
-  rev = "67e77411ba30b1b0ce0989c85b6684fb3adef430";
+  rev = "64349aade284846cb194be184b1b180fca629a7c";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "prometheus";
     repo = "prometheus";
-    sha256 = "06xsxigimw5i1fla0k83pf5bpmybskvy50433hs8h876gyvgjxp9";
+    sha256 = "0gljpwnlip1fnmhbc96hji2rc56xncy97qccm7v1z5j1nhc5fam2";
   };
 
-  buildInputs = [
-    goPackages.consul
-    goPackages.dns
-    goPackages.fsnotify.v1
-    goPackages.goleveldb
-    goPackages.logrus
-    goPackages.net
-    goPackages.prometheus.client_golang
-    goPackages.prometheus.log
-    goPackages.yaml-v2
-    vim  # for xxd, used in embed-static.sh
+  buildInputs = with goPackages; [
+    consul
+    dns
+    fsnotify.v1
+    go-zookeeper
+    goleveldb
+    httprouter
+    logrus
+    net
+    prometheus.client_golang
+    prometheus.log
+    yaml-v2
   ];
 
   # Metadata that gets embedded into the binary
-  buildFlagsArray = ''
+  buildFlagsArray = let t = "${goPackagePath}/version"; in
+  ''
     -ldflags=
-        -X main.buildVersion ${version}
-        -X main.buildRevision ${builtins.substring 0 6 rev}
-        -X main.buildBranch master
-        -X main.buildUser nix@nixpkgs
-        -X main.buildDate 20150101-00:00:00
-        -X main.goVersion ${lib.getVersion goPackages.go}
-  '';
-
-  preBuild = ''
-  (
-    cd "go/src/$goPackagePath/web"
-    ${stdenv.shell} ../utility/embed-static.sh static templates \
-      | gofmt > blob/files.go
-  )
+        -X ${t}.Version=${version}
+        -X ${t}.Revision=${builtins.substring 0 6 rev}
+        -X ${t}.Branch=master
+        -X ${t}.BuildUser=nix@nixpkgs
+        -X ${t}.BuildDate=20150101-00:00:00
+        -X ${t}.GoVersion=${lib.getVersion goPackages.go}
   '';
 
   meta = with lib; {

From 50aed1ee1052c9c844ff258cc5780b5b4d670ec8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 28 Aug 2015 15:09:31 +0200
Subject: [PATCH 1673/2016] importlib: disable for Python>2.6 and PyPy

importlib is part of the standard library for Python > 2.6 and PyPy.

Tested with nix-shell for all *Packages.importlib versions.
---
 pkgs/top-level/python-packages.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ab9738c6c7..1a92621d05a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6805,14 +6805,16 @@ let
     };
   };
 
-  importlib = if isPy26 then (buildPythonPackage {
+  importlib = buildPythonPackage rec {
     name = "importlib-1.0.2";
+    
+    disabled = (!isPy26) || isPyPy;
+    
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/i/importlib/importlib-1.0.2.tar.gz";
       md5 = "4aa23397da8bd7c7426864e88e4db7e1";
     };
-    doCheck = false;
-  }) else null;
+  };
 
   influxdb = buildPythonPackage rec {
     name = "influxdb-0.1.12";

From 1a2d05a840aa7cd504120f549332be0c4a907ed0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 29 Aug 2015 11:57:10 +0200
Subject: [PATCH 1674/2016] getdata: 0.8.8 -> 0.8.9

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

diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix
index 464d2f66e45..e3dfc9fe0a9 100644
--- a/pkgs/development/libraries/getdata/default.nix
+++ b/pkgs/development/libraries/getdata/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "getdata-0.8.8";
+  name = "getdata-0.8.9";
   src = fetchurl {
     url = "mirror://sourceforge/getdata/${name}.tar.bz2";
-    sha256 = "1p5sncbr0bjrx1ki57di0j9rl5ksv0hbfy7bkcb4vaz9z9mrn8xj";
+    sha256 = "1cgwrflpp9ia2cwnhmwp45nmsg15ymjh03pysrfigyfmag94ac51";
   };
 
   meta = with stdenv.lib; {

From d3bc5765ddbccc9ee116f7a6c11871b081683cfc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Aug 2015 12:36:11 +0200
Subject: [PATCH 1675/2016] python-packages xray: init at 0.6.0

---
 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 42db423a451..715d1df5e35 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14752,6 +14752,25 @@ let
       license = licenses.mit;
     };
   });
+  
+  xray = buildPythonPackage rec {
+    name = "xray-${version}";
+    version = "0.6.0";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/x/xray/${name}.tar.gz";
+      sha256 = "c8c4aadb0d39662a81c259bd609f42708ff31c90012a9dd0a1f9ee56a798196f";
+    };
+    
+    buildInputs = with self; [nose];
+    propagatedBuildInputs = with self; [numpy pandas];
+    
+    meta = {
+      description = "N-D labeled arrays and datasets in Python";
+      homepage = https://github.com/xray/xray;
+      license = licenses.asl20;
+    };  
+  };
 
   youtube-dl = callPackage ../tools/misc/youtube-dl {
     # Release versions don't need pandoc because the formatted man page

From 88d444b36f6ee2a3e6dd6b8f5d865d4b46c67264 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Aug 2015 13:02:44 +0200
Subject: [PATCH 1676/2016] python-packages objgraph: init at 2.0.1

---
 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 42db423a451..b56628456e3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8850,6 +8850,27 @@ let
       maintainers = with maintainers; [ phreedom thoughtpolice ];
     };
   });
+  
+  objgraph = buildPythonPackage rec {
+    name = "objgraph-${version}";
+    version = "2.0.1";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/o/objgraph/${name}.tar.gz";
+      sha256 = "841de52715774ec1d0e97d9b4462d6e3e10406155f9b61f54ba7db984c45442a";
+    };
+    
+    # Tests fail with PyPy.
+    disabled = isPyPy;
+    
+    propagatedBuildInputs = with self; [pkgs.graphviz];
+    
+    meta = {
+      description = "Draws Python object reference graphs with graphviz";
+      homepage = http://mg.pov.lt/objgraph/;
+      license = licenses.mit;
+    };
+  };
 
   odo = buildPythonPackage rec {
     name = "odo-${version}";

From 582c9a81dc8a54b07fc365f5affa98dfd5b0e0b6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Aug 2015 13:03:01 +0200
Subject: [PATCH 1677/2016] python-packages dill: init at 0.2.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 b56628456e3..34be9dc338a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2946,6 +2946,24 @@ let
       license = licenses.mit;
     };
   };
+  
+  dill = buildPythonPackage rec {
+    name = "dill-${version}";
+    version = "0.2.4";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/dill/${name}.tgz";
+      sha256 = "deca57da33ad2121ab1b9c4493bf8eb2b3a72b6426d4b9a3a853a073c68b97ca";
+    };
+    
+    propagatedBuildInputs = with self; [objgraph];
+    
+    meta = {
+      description = "Serialize all of python (almost)";
+      homepage = http://www.cacr.caltech.edu/~mmckerns/dill.htm;
+      license = licenses.bsd3;
+    };
+  };
 
   discogs_client = buildPythonPackage rec {
     name = "discogs-client-2.0.2";

From 12553227d2a611aac851d6e04cf66540a966186d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 29 Aug 2015 13:03:36 +0200
Subject: [PATCH 1678/2016] python-packages dask: init at 0.7.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 34be9dc338a..87e9366a743 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2719,6 +2719,24 @@ let
       license = "BSD-style";
     };
   });
+  
+  dask = buildPythonPackage rec {
+    name = "dask-${version}";
+    version = "0.7.0";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/dask/${name}.tar.gz";
+      sha256 = "3b48646e9e66ec21a6885700d39ea90e2c2a7ad5d26773a8413b570eb1a67b3e";
+    };
+    
+    propagatedBuildInputs = with self; [numpy toolz dill];
+    
+    meta = {
+      description = "Minimal task scheduling abstraction";
+      homepage = "http://github.com/ContinuumIO/dask/";
+      licenses = licenses.bsd3;
+    };
+  };
 
   datashape = buildPythonPackage rec {
     name = "datashape-${version}";

From d9cb4f92b55e3576df6925eb8ac8808c65b0bdfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 29 Aug 2015 13:16:22 +0200
Subject: [PATCH 1679/2016] pythonPackages.protobuf: disable on pypy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 172d2793b9819eb6fa87f88806aaf6c7587e3a2c)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/top-level/python-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1a92621d05a..759d464d9ae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3552,7 +3552,7 @@ let
   gmpy2 = buildPythonPackage rec {
     name = "gmpy2-2.0.6";
     disabled = isPyPy;
-    
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/g/gmpy2/${name}.zip";
       md5 = "7365d880953ba54c2cdcf171c7e19b2b";
@@ -6807,9 +6807,9 @@ let
 
   importlib = buildPythonPackage rec {
     name = "importlib-1.0.2";
-    
+
     disabled = (!isPy26) || isPyPy;
-    
+
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/i/importlib/importlib-1.0.2.tar.gz";
       md5 = "4aa23397da8bd7c7426864e88e4db7e1";
@@ -8408,7 +8408,7 @@ let
       nose
       modules.sqlite3
     ];
-    
+
     # Test does not work on Py3k because it calls 'python'.
     # https://github.com/nipy/nibabel/issues/341
     preCheck = ''
@@ -9864,7 +9864,7 @@ let
   protobuf2_5 = self.protobufBuild pkgs.protobuf2_5;
   protobufBuild = protobuf: buildPythonPackage rec {
     inherit (protobuf) name src;
-    disabled = isPy3k;
+    disabled = isPy3k || isPyPy;
 
     propagatedBuildInputs = with self; [ protobuf google_apputils ];
 

From fe0d91a0ebba1a10d4933ead998ec3dc3b4159d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 29 Aug 2015 14:12:18 +0200
Subject: [PATCH 1680/2016] petrifoo: fix build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix
index ffd920427ac..c9d9ad57487 100644
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/applications/audio/petrifoo/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, alsaLib, cmake, gtk, libjack2, libgnomecanvas
 , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
-, pkgconfig }:
+, pkgconfig, openssl }:
 
 stdenv.mkDerivation  rec {
   name = "petri-foo-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation  rec {
 
   buildInputs =
    [ alsaLib cmake  gtk libjack2 libgnomecanvas libpthreadstubs
-     libsamplerate libsndfile libtool libxml2 pkgconfig
+     libsamplerate libsndfile libtool libxml2 pkgconfig openssl
    ];
 
   meta = with stdenv.lib; {

From 69b648ea950b25d09c0aec4087a036bc268cb860 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 29 Aug 2015 15:37:34 +0200
Subject: [PATCH 1681/2016] Revert "Added K Framework package."

This reverts commit de0211090334c2d562ee8560a298d5f5f76b40b3. The package doesn't
compile: https://github.com/NixOS/nixpkgs/pull/7419#issuecomment-135972366.
---
 .../programming/kframework/default.nix        | 102 ------------------
 pkgs/top-level/all-packages.nix               |   2 -
 2 files changed, 104 deletions(-)
 delete mode 100644 pkgs/applications/science/programming/kframework/default.nix

diff --git a/pkgs/applications/science/programming/kframework/default.nix b/pkgs/applications/science/programming/kframework/default.nix
deleted file mode 100644
index e8a4f2b3156..00000000000
--- a/pkgs/applications/science/programming/kframework/default.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-{ stdenv, fetchFromGitHub, maven, openjdk8, releaseTools }:
-
-# TODO:
-# - Investigate builds on platforms other than 64-bit linux
-# - Separate package for Maven cache? This would speed up builds and
-#   theoretically could still be pure
-# - Find a way to prevent Maven from downloading artifacts irrelevant
-#   to the platform for which we are building
-
-releaseTools.mvnBuild rec {
-  name = "kframework-20150415";
-
-  mvn8 = maven.override {
-    jdk = openjdk8; # K uses Java 8. The official docs reference the
-                    # Oracle VM, but it's been working with OpenJDK
-  };
-
-  src = fetchFromGitHub {
-    owner = "kframework";
-    repo = "k";
-    rev = "85a41bc024"; # nightly build for April 15th, 2015
-    sha256 = "01ndfdnqxp2w86pg3ax39sxayb2pfm39lj1h3818zzn86gqwa1vc";
-  };
-
-  buildInputs = [ mvn8 openjdk8 ];
-
-  preSetupPhase = ''
-    # z3 needs this to pass tests
-    export LD_LIBRARY_PATH=$(cat $NIX_CC/nix-support/orig-cc)/lib
-    # not sure if this does anything, since it might only speed up incremental builds
-    export MAVEN_OPTS="-XX:+TieredCompilation"
-  '';
-
-  mvnAssembly = ''
-    mvn package -Dcheckstyle.skip -Dmaven.test.skip=true -Dmaven.repo.local=$M2_REPO
-  '';
-
-  mvnRelease = ''
-    true # do nothing, since mvn package is sufficient
-  '';
-
-  # this is a custom version of k-distribution/src/main/scripts/lib/k
-  kscript = ''
-    #!/usr/bin/env bash
-    export JAVA=${openjdk8}/bin/java
-
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$out/lib"
-
-    export K_OPTS="-Xms64m -Xmx1024m -Xss32m -XX:+TieredCompilation"
-    export MISC_ARGS="-Djava.awt.headless=true"
-    export ARGS="$MISC_ARGS $K_OPTS"
-    $JAVA $ARGS -cp "$out/share/kframework/lib/java/*" org.kframework.main.Main "$@"
-  '';
-
-  finalPhase = ''
-    # set some environment variables
-    export K_ROOT=$PWD/k-distribution/target/release/k/
-    export K_SHARE=$out/share/kframework/
-    # make requisite directories
-    mkdir -p $out/lib $K_SHARE/lib/native
-    # copy over bin
-    cp -R $K_ROOT/bin                             $K_SHARE/
-    # symlink $out/bin to $out/share/kframework/bin
-    ln -s $K_SHARE/bin                            $out/bin
-    # copy everything relevant to $out/share/kframework
-    # we may want to consider adding the documentation etc.
-    cp -R $K_ROOT/include                         $K_SHARE/
-    cp -R $K_ROOT/lib/java                        $K_SHARE/lib/
-    cp -R $K_ROOT/lib/native/linux                $K_SHARE/lib/native/
-    cp -R $K_ROOT/lib/native/linux64              $K_SHARE/lib/native/
-    # remove Windows batch scripts
-    rm $K_SHARE/bin/*.bat # */
-    # TODO: fix these scripts so they work
-    rm $K_SHARE/bin/kserver $K_SHARE/bin/stop-kserver
-    # make our k wrapper script and substitute $out for its value
-    echo -n "$kscript" | sed "s:\$out:$out:g" > $K_SHARE/lib/k
-    chmod +x $K_SHARE/lib/k
-    # symlink requisite binaries
-    ln -s $K_SHARE/lib/k                           $out/lib/k
-    ln -s $K_SHARE/lib/native/linux/sdf2table      $out/bin/sdf2table
-    ln -s $K_SHARE/lib/native/linux64/z3           $out/bin/z3
-    ln -s $K_SHARE/lib/native/linux64/libz3.so     $out/lib/libz3.so
-    ln -s $K_SHARE/lib/native/linux64/libz3java.so $out/lib/libz3java.so
-    # patch Z3 so it uses the right interpreter/libs
-    patchelf \
-      --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib \
-      --force-rpath \
-      $K_SHARE/lib/native/linux64/z3
-  '';
-
-  meta = {
-    description = "A rewrite-based executable semantic framework in which programming languages, type systems and formal analysis tools can be defined";
-    homepage = http://www.kframework.org;
-    license = stdenv.lib.licenses.bsd3;     # technically it is the UIUC/NCSA license
-                                            # but LLVM uses that license as well and
-                                            # it is marked as BSD3
-    maintainers = [ stdenv.lib.maintainers.taktoa ];
-    platforms = stdenv.lib.platforms.linux; # I haven't done testing on other OSes, but
-                                            # since it's Java it should run anywhere
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8ad3c07f7d..a8bb0c7b59c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14419,8 +14419,6 @@ let
 
   ### SCIENCE/PROGRAMMING
 
-  kframework = callPackage ../applications/science/programming/kframework { };
-
   plm = callPackage ../applications/science/programming/plm { };
 
   ### SCIENCE/LOGIC

From f6135c9fbaf920a5021fa8619da593ddda6638bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 29 Aug 2015 15:55:06 +0200
Subject: [PATCH 1682/2016] calibre: 2.35.0 -> 2.36.0

Unbreaks build, as the 2.35.0 source URL returns HTTP error 404.
---
 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 7f8a42b077e..abea6201e75 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.35.0";
+  version = "2.36.0";
 
   src = fetchurl {
     url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "13sic0l16myvka8mgpr56h6qlpf1cwx8xlf4acp3qz6gsmz3r23x";
+    sha256 = "1my7fjj1lc28mhmvb85rcc4c5bwsycs6bgmafbx9agil5bgrbnb2";
   };
 
   inherit python;

From 41507ce41538bec2499f9cc2bf32408f02e00221 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 29 Aug 2015 16:57:08 +0200
Subject: [PATCH 1683/2016] Change my email address

---
 lib/maintainers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7c136725061..d4375fcdf3c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -67,7 +67,7 @@
   couchemar = "Andrey Pavlov <couchemar@yandex.ru>";
   cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
   cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
-  DamienCassou = "Damien Cassou <damien.cassou@gmail.com>";
+  DamienCassou = "Damien Cassou <damien@cassou.me>";
   davidrusu = "David Rusu <davidrusu.me@gmail.com>";
   dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>";
   DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";

From dbc7e0fea55f4597f8c12221e13bd6bb993aed5b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 8 Aug 2015 22:02:12 +0200
Subject: [PATCH 1684/2016] spyder: 2.2.5 -> 2.3.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Set environment variable to use setuptools (fixes build issue).

[Bjørn: split enabling spyder for python3 into separate commit.]
---
 pkgs/applications/science/spyder/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 806d2f546cf..c068847c331 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -8,12 +8,13 @@
 }:
 
 buildPythonPackage rec {
-  name = "spyder-2.2.5";
+  name = "spyder-${version}";
+  version = "2.3.6";
   namePrefix = "";
 
   src = fetchurl {
-    url = "https://spyderlib.googlecode.com/files/${name}.zip";
-    sha256 = "1bxc5qs2bqc21s6kxljsfxnmwgrgnyjfr9mkwzg9njpqsran3bp2";
+    url = "https://pypi.python.org/packages/source/s/spyder/${name}.zip";
+    sha256 = "0e6502e0d3f270ea8916d1a3d7ca29915801d31932db399582bc468c01d535e2";
   };
 
   buildInputs = [ unzip ];
@@ -23,6 +24,11 @@ buildPythonPackage rec {
   # There is no test for spyder
   doCheck = false;
 
+  # Use setuptools instead of distutils.
+  preConfigure = ''
+    export USE_SETUPTOOLS=True
+  '';
+
   desktopItem = makeDesktopItem {
     name = "Spyder";
     exec = "spyder";
@@ -49,7 +55,7 @@ buildPythonPackage rec {
       environment for the Python language with advanced editing, interactive
       testing, debugging and introspection features.
     '';
-    homepage = https://code.google.com/p/spyderlib/;
+    homepage = https://github.com/spyder-ide/spyder/;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];

From ab6af31ecb72dcdd4f5b41a13c030b1d40889d91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 29 Aug 2015 17:38:50 +0200
Subject: [PATCH 1685/2016] spyder: enable for all python interpreters

Rope is not ported to python3 yet, so it is disabled (it's a
"recommended" dependency, not critical).
---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 759d464d9ae..93d40c3cd3a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13272,6 +13272,10 @@ let
     };
   });
 
+  spyder = callPackage ../applications/science/spyder {
+    rope = if isPy3k then null else self.rope;
+  };
+
   sqlalchemy = self.sqlalchemy9.override rec {
     name = "SQLAlchemy-0.7.10";
     disabled = isPy34;

From 07903b161715f2017ce9fed8c434db4524f7edc9 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Fri, 28 Aug 2015 20:54:45 -0400
Subject: [PATCH 1686/2016] cvs-fast-export: don't link against librt

It's superfluous on Linux, and it breaks the build on Darwin.
---
 pkgs/applications/version-management/cvs-fast-export/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix
index 15035a345d4..62a58ee985c 100644
--- a/pkgs/applications/version-management/cvs-fast-export/default.nix
+++ b/pkgs/applications/version-management/cvs-fast-export/default.nix
@@ -30,6 +30,7 @@ mkDerivation rec {
   preBuild = ''
     makeFlagsArray=(
       XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"
+      LIBS=""
       prefix="$out"
     )
   '';

From 29c0262708a6524f9de0cd96fa7b8df12891ea00 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 29 Aug 2015 18:21:43 +0200
Subject: [PATCH 1687/2016] openvswitch service: fix ipsec startup order

---
 nixos/modules/virtualisation/openvswitch.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index 69ca13a7147..b5155246fda 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -67,7 +67,6 @@ in {
       description = "Open_vSwitch Database Server";
       wantedBy = [ "multi-user.target" ];
       after = [ "systemd-udev-settle.service" ];
-      wants = [ "vswitchd.service" ];
       path = [ cfg.package ];
       restartTriggers = [ db cfg.package ];
       # Create the config database
@@ -108,6 +107,7 @@ in {
 
     systemd.services.vswitchd = {
       description = "Open_vSwitch Daemon";
+      wantedBy = [ "multi-user.target" ];
       bindsTo = [ "ovsdb.service" ];
       after = [ "ovsdb.service" ];
       path = [ cfg.package ];
@@ -135,8 +135,8 @@ in {
     systemd.services.ovs-monitor-ipsec = {
       description = "Open_vSwitch Ipsec Daemon";
       wantedBy = [ "multi-user.target" ];
-      requires = [ "racoon.service" ];
-      after = [ "vswitchd.service" ];
+      requires = [ "ovsdb.service" ];
+      before = [ "vswitchd.service" "racoon.service" ];
       environment.UNIXCTLPATH = "/tmp/ovsdb.ctl.sock";
       serviceConfig = {
         ExecStart = ''

From 367b0be7b48b4cd01dda831b9437ac007ce38d16 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 29 Aug 2015 18:22:44 +0200
Subject: [PATCH 1688/2016] qtpass: 0.8.4 -> 1.0.1

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

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 828019011fc..e768a692f59 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
-  version = "0.8.4";
+  version = "1.0.1";
 
   src = fetchurl {
     url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
-    sha256 = "14avh04q559p64ska1w814pbwv0742aaqln036pw99fjxav685g0";
+    sha256 = "1mmncvamvwr3hizc1jgpb5kscl9idmrfd2785jhwi87q11wjrwxz";
   };
 
   buildInputs = [ git gnupg makeWrapper pass qt5.base ];

From ff0575a2f1538ec07425637f4dea7cb0c6306d02 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 29 Aug 2015 18:25:39 +0200
Subject: [PATCH 1689/2016] docker: add blkid from utillinux to path

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

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index c3b141cba81..223d3175179 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper,
-btrfsProgs, iptables, bash, e2fsprogs, xz}:
+btrfsProgs, iptables, bash, e2fsprogs, xz, utillinux}:
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.7.1";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker";
     rev = "v${version}";
-    sha256 = "0r0j8aj1a7lbnc9piznp02h5n2gdw3v3n4q2ipmapi9ax0wj82lz";
+    sha256 = "0nwd5wsw9f50jh4s5c5sfd6hnyh3g2kmxcrid36y1phabh30yrcz";
   };
 
   buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker
     install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
-    makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin"
+    makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin:${utillinux}/bin"
 
     # systemd
     install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service

From e2f673e0244d9e660d115fc60dde3b50b846cba7 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 29 Aug 2015 18:28:50 +0200
Subject: [PATCH 1690/2016] skydns: 2.5.0a -> 2.5.2b

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

diff --git a/pkgs/servers/dns/skydns/default.nix b/pkgs/servers/dns/skydns/default.nix
index 054c5c422e1..c430ed4b37c 100644
--- a/pkgs/servers/dns/skydns/default.nix
+++ b/pkgs/servers/dns/skydns/default.nix
@@ -4,7 +4,7 @@ with goPackages;
 
 buildGoPackage rec {
   name = "skydns-${version}";
-  version = "2.5.0a";
+  version = "2.5.2b";
 
   goPackagePath = "github.com/skynetservices/skydns";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "skynetservices";
     repo = "skydns";
     rev = version;
-    sha256 = "18mw8bcz54i4yrv6pc73s3ffcj1vv9cwnn76c9k0bj1mxp1pmdl2";
+    sha256 = "01vac6bd71wky5jbd5k4a0x665bjn1cpmw7p655jrdcn5757c2lv";
   };
 
   buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb go-systemd go-log dns stathat osext etcd ];

From 256d2950b9f5eb1ba64132052763cb695fdaeae1 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 19 Aug 2015 23:36:35 +0200
Subject: [PATCH 1691/2016] xca: 0.9.3 -> 1.3.0

---
 .../xca/0001-Fix-for-openssl-1.0.1i.patch     | 57 -------------------
 pkgs/applications/misc/xca/default.nix        | 12 +---
 2 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch

diff --git a/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch b/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch
deleted file mode 100644
index 9bfe3831c4a..00000000000
--- a/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From abd9d530776e8bb6d8f05312fc3ae3044796139c Mon Sep 17 00:00:00 2001
-From: Oliver Winker <oliver@oli1170.net>
-Date: Tue, 12 Aug 2014 19:08:05 +0200
-Subject: [PATCH] Fix for openssl 1.0.1i
-
-Fixes following application error
----
-Errors
-error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error
----
-
-Due to openssl 1.0.1i change:
----
-commit 03b04ddac162c7b7fa3c57eadccc5a583a00d291
-Author: Emilia Kasper <emilia@openssl.org>
-Date:   Wed Jul 2 19:02:33 2014 +0200
-
-    Fix OID handling:
-
-    - Upon parsing, reject OIDs with invalid base-128 encoding.
-    - Always NUL-terminate the destination buffer in OBJ_obj2txt printing function.
-
-    CVE-2014-3508
-
-    Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
-    Reviewed-by: Kurt Roeckx <kurt@openssl.org>
-    Reviewed-by: Tim Hudson <tjh@openssl.org>
----
----
- lib/x509v3ext.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/x509v3ext.cpp b/lib/x509v3ext.cpp
-index cf74c32..d94cbda 100644
---- a/lib/x509v3ext.cpp
-+++ b/lib/x509v3ext.cpp
-@@ -27,6 +27,8 @@ x509v3ext::x509v3ext(const X509_EXTENSION *n)
- x509v3ext::x509v3ext(const x509v3ext &n)
- {
- 	ext = NULL;
-+	if (!n.isValid())
-+		return;
- 	set(n.ext);
- }
- 
-@@ -743,7 +745,7 @@ X509_EXTENSION *x509v3ext::get() const
- 
- bool x509v3ext::isValid() const
- {
--	return ext->value->length > 0 &&
-+	return ext && ext->value && ext->value->length > 0 &&
- 		OBJ_obj2nid(ext->object) != NID_undef;
- }
- 
--- 
-2.0.1
-
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index d5fa5e5ec56..fdd136cc838 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -2,21 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xca-${version}";
-  version = "0.9.3";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/xca/${name}.tar.gz";
-    sha256 = "1fn6kh8mdy65rrgjif7j9wn3mxg1mrrcnhzpi86hfy24ic6bahk8";
+    sha256 = "0k21d4lfkn0nlj8az6067dmc5dgy5cidspljagmh5frsv576wnzg";
   };
 
-  patches = [ ./0001-Fix-for-openssl-1.0.1i.patch ];
-
-  configurePhase = ''
-    export PATH=$PATH:${which}/bin
-    export QTDIR=${qt4}
-    prefix=$out ./configure ${openssl} ${libtool}
-  '';
-
   postInstall = ''
     wrapProgram "$out/bin/xca" \
       --prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.cc}/lib:${gcc.cc}/lib64:${openssl}/lib:${libtool}/lib"

From c65cdcf7229e322e6375110078da47455ca53d6d Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 29 Aug 2015 18:20:24 +0200
Subject: [PATCH 1692/2016] kubernetes service: add a few options

---
 nixos/modules/services/cluster/kubernetes.nix | 67 +++++++++++++++----
 1 file changed, 55 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index 99915438f92..ba09f04d502 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -105,7 +105,7 @@ in {
       tokenAuth = mkOption {
         description = ''
           Kubernetes apiserver token authentication file. See
-          <link xlink:href="https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/authentication.md"/>
+          <link xlink:href="http://kubernetes.io/v1.0/docs/admin/authentication.html"/>
         '';
         default = {};
         example = literalExample ''
@@ -120,7 +120,7 @@ in {
       authorizationMode = mkOption {
         description = ''
           Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC). See
-          <link xlink:href="https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/authorization.md"/>
+          <link xlink:href="http://kubernetes.io/v1.0/docs/admin/authorization.html"/>
         '';
         default = "AlwaysAllow";
         type = types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC"];
@@ -129,7 +129,7 @@ in {
       authorizationPolicy = mkOption {
         description = ''
           Kubernetes apiserver authorization policy file. See
-          <link xlink:href="https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/authorization.md"/>
+          <link xlink:href="http://kubernetes.io/v1.0/docs/admin/authorization.html"/>
         '';
         default = [];
         example = literalExample ''
@@ -159,18 +159,37 @@ in {
       };
 
       runtimeConfig = mkOption {
-        description = "Api runtime configuration";
+        description = ''
+          Api runtime configuration. See
+          <link xlink:href="http://kubernetes.io/v1.0/docs/admin/cluster-management.html"/>
+        '';
         default = "";
         example = "api/all=false,api/v1=true";
         type = types.str;
       };
 
       admissionControl = mkOption {
-        description = "Kubernetes admission control plugins to use.";
+        description = ''
+          Kubernetes admission control plugins to use. See
+          <link xlink:href="http://kubernetes.io/v1.0/docs/admin/admission-controllers.html"/>
+        '';
         default = ["AlwaysAdmit"];
+        example = [
+          "NamespaceLifecycle" "NamespaceExists" "LimitRanger"
+          "SecurityContextDeny" "ServiceAccount" "ResourceQuota"
+        ];
         type = types.listOf types.str;
       };
 
+      serviceAccountKey = mkOption {
+        description = ''
+          Kubernetes apiserver PEM-encoded x509 RSA private or public key file,
+          used to verify ServiceAccount tokens.
+        '';
+        default = null;
+        type = types.nullOr types.path;
+      };
+
       extraOpts = mkOption {
         description = "Kubernetes apiserver extra command line options.";
         default = "";
@@ -235,8 +254,26 @@ in {
         type = types.str;
       };
 
+      serviceAccountPrivateKey = mkOption {
+        description = ''
+          Kubernetes controller manager PEM-encoded private RSA key file used to
+          sign service account tokens
+        '';
+        default = null;
+        type = types.nullOr types.path;
+      };
+
+      rootCaFile = mkOption {
+        description = ''
+          Kubernetes controller manager certificate authority file included in
+          service account's token secret.
+        '';
+        default = null;
+        type = types.nullOr types.path;
+      };
+
       extraOpts = mkOption {
-        description = "Kubernetes controller extra command line options.";
+        description = "Kubernetes controller manager extra command line options.";
         default = "";
         type = types.str;
       };
@@ -294,7 +331,10 @@ in {
       };
 
       apiServers = mkOption {
-        description = "Kubernetes kubelet list of Kubernetes API servers for publishing events, and reading pods and services.";
+        description = ''
+          Kubernetes kubelet list of Kubernetes API servers for publishing events,
+          and reading pods and services.
+        '';
         default = ["${cfg.apiserver.address}:${toString cfg.apiserver.port}"];
         type = types.listOf types.str;
       };
@@ -413,17 +453,14 @@ in {
             ${optionalString (cfg.apiserver.runtimeConfig!="")
               "--runtime-config=${cfg.apiserver.runtimeConfig}"} \
             --admission_control=${concatStringsSep "," cfg.apiserver.admissionControl} \
+            ${optionalString (cfg.apiserver.serviceAccountKey!=null)
+              "--service-account-key-file=${cfg.apiserver.serviceAccountKey}"} \
             --logtostderr=true \
             ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
             ${cfg.apiserver.extraOpts}
           '';
           User = "kubernetes";
         };
-        postStart = ''
-          until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.apiserver.address}:${toString cfg.apiserver.port}/'; do
-            sleep 1;
-          done
-        '';
       };
     })
 
@@ -456,6 +493,10 @@ in {
             --address=${cfg.controllerManager.address} \
             --port=${toString cfg.controllerManager.port} \
             --master=${cfg.controllerManager.master} \
+            ${optionalString (cfg.controllerManager.serviceAccountPrivateKey!=null)
+              "--service-account-private-key-file=${cfg.controllerManager.serviceAccountPrivateKey}"} \
+            ${optionalString (cfg.controllerManager.rootCaFile!=null)
+              "--root-ca-file=${cfg.controllerManager.rootCaFile}"} \
             --logtostderr=true \
             ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
             ${cfg.controllerManager.extraOpts}
@@ -509,6 +550,8 @@ in {
             ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
             ${cfg.proxy.extraOpts}
           '';
+          Restart = "always"; # Retry connection
+          RestartSec = "5s";
         };
       };
     })

From 4121c5064aea6a9a755a767f3ac4288e997498a8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 29 Aug 2015 10:49:00 -0700
Subject: [PATCH 1693/2016] parallel: Fix some needed dependencies

---
 pkgs/tools/misc/parallel/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 4a3b90f56d8..d96ca1080d8 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, perl }:
+{ fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
   name = "parallel-20150822";
@@ -8,13 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "1ij7bjxhk2866mzh0v0v2m629b6d39r5ivwdzmh72s471m9hg45d";
   };
 
-  patchPhase = ''
-    sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g'
-  '';
+  nativeBuildInputs = [ makeWrapper ];
 
-  # The `sem' program wants to write to `~/.parallel'.
-  preBuild = ''
-    export HOME="$PWD"
+  preFixup = ''
+    sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/*
+
+    wrapProgram $out/bin/parallel \
+      --prefix PATH : "${procps}/bin" \
+      --prefix PATH : "${perl}/bin" \
   '';
 
   doCheck = true;

From 6b1bcc66aeded3f0d440af06162081189b768d7a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 29 Aug 2015 20:01:32 +0200
Subject: [PATCH 1694/2016] haskell-MFlow: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 11a806289ed..e107e0b1458 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1018,4 +1018,7 @@ self: super: {
   # https://github.com/brendanhay/amazonka/issues/203
   amazonka-core = dontCheck super.amazonka-core;
 
+  # https://github.com/agocorona/MFlow/issues/63
+  MFlow = addBuildTool super.MFlow self.cpphs;
+
 }

From 3afc3494bb5c5135e270baab14fe2a486878de22 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 29 Aug 2015 11:51:15 -0700
Subject: [PATCH 1695/2016] goPackages: Use parallel instead of forking in bash

---
 .../go-modules/generic/default.nix            | 89 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 38 insertions(+), 55 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index f0d3be6487c..7842df6b58f 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,4 +1,4 @@
-{ go, govers, lib }:
+{ go, govers, parallel, lib }:
 
 { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
 
@@ -41,7 +41,7 @@ go.stdenv.mkDerivation (
   (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
 
   name = "go${go.meta.branch}-${name}";
-  nativeBuildInputs = [ go ]
+  nativeBuildInputs = [ go parallel ]
     ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
   buildInputs = [ go ] ++ buildInputs;
 
@@ -62,7 +62,7 @@ go.stdenv.mkDerivation (
     rmdir extraSrc
 
   '') + ''
-    GOPATH=$NIX_BUILD_TOP/go:$GOPATH
+    export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
 
     runHook postConfigure
   '';
@@ -80,38 +80,39 @@ go.stdenv.mkDerivation (
 
     runHook renameImports
 
-    PIDS=()
-    if [ -n "$subPackages" ] ; then
-        for p in $subPackages ; do
-            go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p &
-            PIDS+=("$!")
-        done
-    else
-        pushd go/src
-        while read d; do
-          {
-            echo "$d" | grep -q "/_" && continue
-            [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && continue
-            local OUT
-            if ! OUT="$(go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d 2>&1)"; then
-                if ! echo "$OUT" | grep -q 'no buildable Go source files'; then
-                    echo "$OUT" >&2
-                    exit 1
-                fi
-            fi
-            if [ -n "$OUT" ]; then
-              echo "$OUT" >&2
-            fi
-          } &
-          PIDS+=("$!")
-        done < <(find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq)
-        popd
-    fi
+    buildGoDir() {
+      local d; local cmd;
+      cmd="$1"
+      d="$2"
+      echo "$d" | grep -q "/_" && return 0
+      [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
+      local OUT
+      if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then
+        if ! echo "$OUT" | grep -q 'no buildable Go source files'; then
+          echo "$OUT" >&2
+          return 1
+        fi
+      fi
+      if [ -n "$OUT" ]; then
+        echo "$OUT" >&2
+      fi
+      return 0
+    }
 
-    # Exit on error from the parallel process
-    for PID in "''${PIDS[@]}"; do
-        wait $PID || exit 1
-    done
+    getGoDirs() {
+      local type;
+      type="$1"
+      if [ -n "$subPackages" ]; then
+        echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g"
+      else
+        pushd go/src >/dev/null
+        find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | sort | uniq
+        popd >/dev/null
+      fi
+    }
+
+    export -f buildGoDir # parallel needs to see the function
+    getGoDirs "" | parallel -j $NIX_BUILD_CORES buildGoDir install
 
     runHook postBuild
   '';
@@ -119,25 +120,7 @@ go.stdenv.mkDerivation (
   checkPhase = args.checkPhase or ''
     runHook preCheck
 
-    PIDS=()
-    if [ -n "$subPackages" ] ; then
-        for p in $subPackages ; do
-            go test -p $NIX_BUILD_CORES -v $goPackagePath/$p &
-            PIDS+=("$!")
-        done
-    else
-        pushd go/src
-        while read d; do
-            go test -p $NIX_BUILD_CORES -v $d &
-            PIDS+=("$!")
-        done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq)
-        popd
-    fi
-
-    # Exit on error from the parallel process
-    for PID in "''${PIDS[@]}"; do
-        wait $PID || exit 1
-    done
+    getGoDirs test | parallel -j $NIX_BUILD_CORES buildGoDir test
 
     runHook postCheck
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ef3efd8c83..fe194bdc3f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8665,7 +8665,7 @@ let
     buildGoPackage = import ../development/go-modules/generic {
       go = go_1_4;
       govers = go14Packages.govers;
-      inherit lib;
+      inherit parallel lib;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   });
@@ -8675,7 +8675,7 @@ let
     buildGoPackage = import ../development/go-modules/generic {
       go = go_1_5;
       govers = go15Packages.govers;
-      inherit lib;
+      inherit parallel lib;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   });

From c61ade7b52e6b26d84ef514f7d104d328f68590b Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 26 Aug 2015 03:00:19 +0200
Subject: [PATCH 1696/2016] vimPlugins: updated (and sorted alphabetically)

---
 pkgs/misc/vim-plugins/default.nix      | 191 +++++++++++++------------
 pkgs/misc/vim-plugins/vim-plugin-names |   4 +-
 2 files changed, 98 insertions(+), 97 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index c8bd4d860b1..83fcea51728 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -85,17 +85,6 @@ rec {
   yankring            = YankRing;
 
 
-  CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "CheckAttach-2015-06-22";
-    src = fetchgit {
-      url = "git://github.com/chrisbra/CheckAttach";
-      rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68";
-      sha256 = "b8921c826f5a122e9b128301c620b8b3d3fd88a15a2b0634fdea01062fba2c1f";
-    };
-    dependencies = [];
-
-  };
-
   CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "CSApprox-2013-07-26";
     src = fetchgit {
@@ -107,12 +96,23 @@ rec {
 
   };
 
+  CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "CheckAttach-2015-06-22";
+    src = fetchgit {
+      url = "git://github.com/chrisbra/CheckAttach";
+      rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68";
+      sha256 = "b8921c826f5a122e9b128301c620b8b3d3fd88a15a2b0634fdea01062fba2c1f";
+    };
+    dependencies = [];
+
+  };
+
   Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Gist-2015-07-04";
+    name = "Gist-2015-08-13";
     src = fetchgit {
       url = "git://github.com/mattn/gist-vim";
-      rev = "52e2d54a038baf548de01c9413a6ebc8860fa111";
-      sha256 = "32b9c0ccc51b846651ac49d496060b842a57ca342bdc1038b16c59c1b34b0ca0";
+      rev = "ea7dc962c5c2ac2a1c4adc94d54cac190d713648";
+      sha256 = "0b96a572018de25120fe91eea17b8ee2844881c88ab63e03d999c22fc292f11e";
     };
     dependencies = [];
 
@@ -152,22 +152,22 @@ rec {
   };
 
   Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Supertab-2015-02-15";
+    name = "Supertab-2015-08-23";
     src = fetchgit {
       url = "git://github.com/ervandew/supertab";
-      rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7";
-      sha256 = "e9e4054c683435b36adf87bebb4895c06a7e85130a807d8c9307588d4744b04b";
+      rev = "43b98dd2c74977a02473d923c159d4110c94273e";
+      sha256 = "35255894ad3f6701417b0796d24880d8727e2d4ee05c5bb29c207eb127b435a0";
     };
     dependencies = [];
 
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2015-07-29";
+    name = "Syntastic-2015-08-14";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "a01107ffa66fdd38d3ea0fcc769f3582349c5a3f";
-      sha256 = "66b2ef4ad41f30ed409c77e05e637b9c122e62a4acda98d2f89c9205227eba64";
+      rev = "47c70b3e1e388d8f9cc7c6d9687efc047df843ac";
+      sha256 = "7c6a1dc4eef9ec29c09f3a6f60792a9df78b4d86b7f41fc278ae95670c24b40a";
     };
     dependencies = [];
 
@@ -207,22 +207,22 @@ rec {
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2015-07-13";
+    name = "The_NERD_tree-2015-07-30";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "86e2e40af161e65a3ad671214f16f23af360a5a7";
-      sha256 = "de4f35757f6e14644e59a7ba3e5d0a10ffe04aea9d192f2f81bba24d14c7595c";
+      rev = "bcf3de4fdffae45fc7c85b6b84a01b37177924aa";
+      sha256 = "969c3d81f85674303fb295c55da6be3339ffa8658ed98cb20f92eb21551da847";
     };
     dependencies = [];
 
   };
 
   UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2015-07-27";
+    name = "UltiSnips-2015-08-21";
     src = fetchgit {
       url = "git://github.com/sirver/ultisnips";
-      rev = "67fbdb2ad8c965378bdd60c892d3a43049caf3f1";
-      sha256 = "487fd113adc9a2c66ae6c12cbbd21e283e1a9c024a65910398ecf26322772c07";
+      rev = "e48d8a28e55e931a3340dae937aa7f66954815ad";
+      sha256 = "8859aeebd30fc48e481ec11ba7f38c2d91ceae979fbc2045969b077e2b0cf124";
     };
     dependencies = [];
 
@@ -300,22 +300,22 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2015-07-20";
+    name = "fugitive-2015-08-02";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "03cc95cc198ea94a6a003a92cd0e58af4416ec25";
-      sha256 = "cab17591d0eeb0fff4520855347467d85baf56b444dd60b797323d164e92a9de";
+      rev = "b319b694539017dcd789dc2c42f784a30d7b28b8";
+      sha256 = "88e0ac84a016969cf6231ae3705b931d3ee7d0902417c50d7c1397d80b1534b4";
     };
     dependencies = [];
 
   };
 
   ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ghcmod-2015-07-26";
+    name = "ghcmod-2015-08-05";
     src = fetchgit {
       url = "git://github.com/eagletmt/ghcmod-vim";
-      rev = "caf086cd84fe0b26f24f0f93233d4c0c98bce524";
-      sha256 = "04fa2558baab2b9d93c49f3d984f0ed8196513875095ab7117f39b02087bfeeb";
+      rev = "ff8fe7d64d0db35be9a753e2c2a289760ab02dd5";
+      sha256 = "db5a932e4604bed9d4a7d6ff06367f9cae93a87424fc79d2fade7c15061ab563";
     };
     dependencies = [];
 
@@ -366,11 +366,11 @@ rec {
   };
 
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-ghc-2015-07-05";
+    name = "neco-ghc-2015-08-22";
     src = fetchgit {
       url = "git://github.com/eagletmt/neco-ghc";
-      rev = "2ad708360c8f64732a0827618cddfd23e89a8664";
-      sha256 = "ff18dcb7e5b076f88acc51dd508729635a76c619e592db010af6e877ff7afa92";
+      rev = "8ef2df39c83826f7beeb3ea290e05223e43d8571";
+      sha256 = "7f688cadf2fdb483d9541dd77a893fdca97dc59bed609a9a38a48293939b1e5b";
     };
     dependencies = [];
 
@@ -388,11 +388,11 @@ rec {
   };
 
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "idris-vim-2015-07-19";
+    name = "idris-vim-2015-08-14";
     src = fetchgit {
       url = "git://github.com/idris-hackers/idris-vim";
-      rev = "91b695a9120268a9b9828a0665e89b3c39a1f070";
-      sha256 = "df16f45fd6c79f44c7da179c6cfc06e1d43aa801832249b12d8134c476db7ff9";
+      rev = "45680a3c412f2cc8d40aff512e5e9ace44002922";
+      sha256 = "e053a37cb14228a49be265c5fa1af96d3bae1a5a5ceffdd21e3c4547a79656b1";
     };
     dependencies = [];
 
@@ -443,22 +443,22 @@ rec {
   };
 
   vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-buffergator-2015-07-12";
+    name = "vim-buffergator-2015-08-15";
     src = fetchgit {
       url = "git://github.com/jeetsukumaran/vim-buffergator";
-      rev = "28f818ea0aea6771c153efb91a35fc0ab9a16700";
-      sha256 = "d19710b41d24b2e5611e5c2977dc7fac47f3d9899b80c44da2f5d08b3538551a";
+      rev = "ed3bfc2b560f687075d9c2225079bfe43f1f2390";
+      sha256 = "f2024ecf447e5cca2d66efdb6d31e2890e7210e142728873ab521b8c5ea17c11";
     };
     dependencies = [];
 
   };
 
   tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tslime-vim-2015-02-10";
+    name = "tslime-vim-2015-08-14";
     src = fetchgit {
       url = "git://github.com/jgdavey/tslime.vim";
-      rev = "71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7";
-      sha256 = "81f45f579dcc239ce0b9689044d0e92969f7538759ab0cd88596c7a010d8730b";
+      rev = "4a8091956e331d7b1d4187a2883b720dfec7e9dd";
+      sha256 = "e63113f80c056484c462f6d1eb4634cbe4c6c29170f76f4c992adc17b3539a25";
     };
     dependencies = [];
 
@@ -531,11 +531,11 @@ rec {
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2015-07-25";
+    name = "vim-easymotion-2015-08-06";
     src = fetchgit {
       url = "git://github.com/lokaltog/vim-easymotion";
-      rev = "eab003a0991608464b58c90c56be5d9c6b64d840";
-      sha256 = "6f5d4942481c41c1a88c45066ea51019ee4ecd4235e0f54c549cb7df2b8b59e6";
+      rev = "0806257ca6432ac7beb75c4319dadf7f3ba9907b";
+      sha256 = "529f836da3a546c507ec99f7c827902a75472fefe570a93258360bfa4c253909";
     };
     dependencies = [];
 
@@ -590,11 +590,11 @@ rec {
   };
 
   racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "racer-2015-07-29";
+    name = "racer-2015-08-25";
     src = fetchgit {
       url = "git://github.com/phildawes/racer";
-      rev = "25150ce32e5936b38933d66324830fedb95a8c7c";
-      sha256 = "40a3d9c22f50f69e45e8f551a655c2ca327fd07b8872059f2938983387e07707";
+      rev = "7074f2ceb84f121d6b933bacf8f619f313e0fdaf";
+      sha256 = "0dc7815d6eb2bd7f934a86a7d7c4acfc85097d7f131a23ccaa39216544aaaf7b";
     };
     dependencies = [];
     buildPhase = ''
@@ -604,44 +604,44 @@ rec {
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2015-07-25";
+    name = "neocomplete-vim-2015-08-22";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "aaa1f08b06bfcc2a329dba12a37ce8e1578636bd";
-      sha256 = "56c2dc4431858432763bcf134ebbc74272d6f3cdd2db5f9a8b21f2e4a8b028c8";
+      rev = "39661033cce39ebd013451b49809e94ade3ba08c";
+      sha256 = "7a1482f44ff7a1fb27273d12023da25028c9fa393e6cbfcf9c417fecdb09f0b2";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2015-07-27";
+    name = "neosnippet-snippets-2015-08-21";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet-snippets";
-      rev = "a34e67d4b3f91bf2320cd7ce1e85bbd300c6095e";
-      sha256 = "773170fddb95bc5df1b26abc52e29338f3d5515a5afd99719aa23d9569c5389d";
+      rev = "f72814aee4f8530b0f22ca9fa814e1e6473ba543";
+      sha256 = "934177c1c51e3a386f21b678fceaa46a6ea63c7570ab71afa25f35fe30119777";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2015-07-23";
+    name = "neosnippet-vim-2015-08-25";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "e619d43571a675057461f29f2c039dab64728f32";
-      sha256 = "8682bba6039962c01ffa0f9946a1f2a8e8a37ffda2d32862d72c5ee3d87241c5";
+      rev = "19dc3db526f4441b7a419dd7899d84d5ab3f599f";
+      sha256 = "422448182499941494b1280f93a2b6bc7995531bd2f8af2820d52bdc0c000f66";
     };
     dependencies = [];
 
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2015-07-22";
+    name = "vimproc-vim-2015-08-22";
     src = fetchgit {
       url = "git://github.com/shougo/vimproc.vim";
-      rev = "0555aecded8737435747e903efc4b6f3241cc62c";
-      sha256 = "0a9445214c6733d21d56ebe278f2e0bc1027b08eb7763df95b8d0ebd34850a60";
+      rev = "150d5fd04fed462831b99539dfe9920a00a7cea6";
+      sha256 = "baa6557377d7f64c7cd36bf8f7a5439d31c3d869ec8eb9e1e1e8c0d1c0852ccd";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -656,11 +656,11 @@ rec {
   };
 
   vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimshell-vim-2015-07-25";
+    name = "vimshell-vim-2015-08-25";
     src = fetchgit {
       url = "git://github.com/shougo/vimshell.vim";
-      rev = "adb2a0d95e9b0009d152c35c930eb04875562d87";
-      sha256 = "fe52fef67c242756c67ec134634b380077e16729d59b1dcd8f50e41512010723";
+      rev = "05c9001a7fa15aedb444566e2753b901924460a3";
+      sha256 = "aa68b059d5c9d00189ab50014924c920391b76bc448bdda4d82ab6de4ec8b435";
     };
     dependencies = [ "vimproc-vim" ];
   };
@@ -677,11 +677,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2015-07-27";
+    name = "vim-quickrun-2015-08-09";
     src = fetchgit {
       url = "git://github.com/thinca/vim-quickrun";
-      rev = "c22f2f50614a68d8f60ae334cc4545dbc57051a9";
-      sha256 = "fef4f13c3d1946040cb4e4ceba6a89759fc77c1f72f2f7f038df644620a41398";
+      rev = "ec9f7f2c26dd49ffaf4f3ce8c6254c76696fbf41";
+      sha256 = "dc80ac9ee04329e770a549f83a6b167629daf29f513f31af0c076c237e978b5a";
     };
     dependencies = [];
 
@@ -710,11 +710,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2015-07-08";
+    name = "youcompleteme-2015-08-25";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "b9dd9096a34c1d720878f0058dc3e68f9e9c87ea";
-      sha256 = "88a3ff421300f53756359ec8e6c901fe96de492091587cf9a5e40b299698f077";
+      rev = "b7e9871801392b12187191673f492965d142f8ef";
+      sha256 = "a9db1b251d21048bd5d74914b611cc326dfa0a06737be8782f2077e145f53ca3";
     };
     dependencies = [];
     buildInputs = [
@@ -833,11 +833,11 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2015-07-03";
+    name = "vim-wakatime-2015-08-25";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "28044b7b5f5be812fd34c757632d1d814578ec9b";
-      sha256 = "74fa0eac0a546c7012b4a6fe5f6cd66eaa2ed40887bc61d468be148dcd538692";
+      rev = "9bf0d3ec459def5c67a2d9bf5aae8e588a0f3980";
+      sha256 = "d2ce4a890c0044f0088e335660c001764a4df075eeafc6ab32871b82f7bb728a";
     };
     dependencies = [];
     buildInputs = [ python ];
@@ -981,11 +981,11 @@ rec {
   };
 
   surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "surround-2015-03-15";
+    name = "surround-2015-08-07";
     src = fetchgit {
       url = "git://github.com/tpope/vim-surround";
-      rev = "772ab9587b7d1e2c3bae75395c9123803059ba8a";
-      sha256 = "5f4c5afecaa99dc67875a2356b46cb6e8daeffca4a00a451965ca022de26cbef";
+      rev = "2d05440ad23f97a7874ebd9b5de3a0e65d25d85c";
+      sha256 = "e5372cbb384e747181e3dfe4a53f042da18bd0d6af7a01184850ecb084ddb350";
     };
     dependencies = [];
 
@@ -1024,22 +1024,22 @@ rec {
   };
 
   tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2015-05-20";
+    name = "tlib-2015-08-05";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
-      rev = "c9ffbef0718a35bd30eb711456e2100e4adf79f7";
-      sha256 = "b0752538ee629c6f2c52d3b2b2fb61247bcd186ef9610ad8ae5c7d24ea41d971";
+      rev = "4c128ee2fee6d97cc5c6089e7797b4ad536de2a4";
+      sha256 = "9cd0fc23bb332d5ae939019929d989b636b891c894f350c38234eaf084e0656c";
     };
     dependencies = [];
 
   };
 
   undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "undotree-2015-03-01";
+    name = "undotree-2015-08-19";
     src = fetchgit {
       url = "git://github.com/mbbill/undotree";
-      rev = "fa018f38252f58073f2987f8bf0d2d4a61e07277";
-      sha256 = "c52874b0b85d0a44a1f2f055a74985886af97615bac032259fc21d6ea40d6ca7";
+      rev = "8ff701a5bdb8d382431eb042e4faf3320883b020";
+      sha256 = "9c166cb812be486350a3e71eed273a630545d91e3198a214e3dce13b131aeb1d";
     };
     dependencies = [];
 
@@ -1299,11 +1299,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2015-07-28";
+    name = "vim-gitgutter-2015-08-17";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "fe10e6474d70c382edcda84dc6bcd6fcd575a6c5";
-      sha256 = "0266775153760c86e51a83106813936c661717a1c72d4103215739aff9ad1b76";
+      rev = "0e66fc915c5c7d8f18eb62f69230393465812fc3";
+      sha256 = "cf66babbacd29eda332b0dada2f3f2fe3f3d84b5ae0bb34291303c6f0d6ecb62";
     };
     dependencies = [];
 
@@ -1332,11 +1332,11 @@ rec {
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2015-05-29";
+    name = "vim-multiple-cursors-2015-08-07";
     src = fetchgit {
       url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "3199d34f57e1e20d2dd807b31a5a72d7f7d42e96";
-      sha256 = "26b43c921b416cc19482d03435516d42a209ab104bac9979b073d0db61e95186";
+      rev = "e37b9358980d312c1f4fbbcb4a36d1a9d4bdb415";
+      sha256 = "126694d6b12e710495d390b5df2fa8ae06ca6e2eadec2a04c4a3899287595ce9";
     };
     dependencies = [];
 
@@ -1354,11 +1354,11 @@ rec {
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2015-07-29";
+    name = "vim-snippets-2015-08-23";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "814896e4d29f2b796d076935d7d079c64c351f4f";
-      sha256 = "173d2f52c0715dd78692b5f1d3368920ed976a05a87887b056526abfd530ffa3";
+      rev = "21c7f2052057304f9002b42b53391e2c89197a10";
+      sha256 = "11a5cf8bf8f7fbf9100a69c2457d901143aaaeea5bd29884eb93d8b4439b306d";
     };
     dependencies = [];
 
@@ -1387,13 +1387,14 @@ rec {
   };
 
   vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vundle-2015-03-21";
+    name = "vundle-2015-08-10";
     src = fetchgit {
       url = "git://github.com/gmarik/vundle";
-      rev = "cfd3b2d388a8c2e9903d7a9d80a65539aabfe933";
-      sha256 = "7ce9bb0a59c8f86cedd9b3867b834bcd160f2224c187189997ef76c2bfd99d50";
+      rev = "0ee36b26e127cda512a8f2852a59e5a5f374c87f";
+      sha256 = "62fc2b756bd2a8bc9452c61de5babbb1f02de6e8122424a60862be61b8f80af1";
     };
     dependencies = [];
 
   };
+
 }
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 486df183da3..a18c24c7825 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,5 +1,5 @@
-"CheckAttach"
 "CSApprox"
+"CheckAttach"
 "Gist"
 "Gundo"
 "Hoogle"
@@ -69,8 +69,8 @@
 "quickfixstatus"
 "rainbow_parentheses"
 "rust"
-"sleuth"
 "sensible"
+"sleuth"
 "snipmate"
 "sourcemap"
 "surround"

From 33cb16104c3157ce3f61e95c002a2b73cb8e0ac3 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 27 Aug 2015 18:08:15 +0200
Subject: [PATCH 1697/2016] vimPlugins: adding  css_color_5056,
 ctrlp-py-matcher, ctrlp-z, goyo, vim-signify, vim-webdevicons

---
 pkgs/misc/vim-plugins/default.nix      | 68 +++++++++++++++++++++++++-
 pkgs/misc/vim-plugins/vim-plugin-names |  7 +++
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 83fcea51728..f24058a468e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -277,6 +277,17 @@ rec {
 
   };
 
+  "css_color_5056" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "css_color_5056-2015-06-22";
+    src = fetchgit {
+      url = "git://github.com/ap/vim-css-color";
+      rev = "ceb028b27eae0550533501b1f02cb512a482ba85";
+      sha256 = "d428970699b59b0da89d3cf73be39f62c2751512919fa2773baa241a9f79fccd";
+    };
+    dependencies = [];
+
+  };
+
   ctrlp = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "ctrlp-2013-07-29";
     src = fetchgit {
@@ -288,6 +299,28 @@ rec {
 
   };
 
+  ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ctrlp-py-matcher-2015-07-18";
+    src = fetchgit {
+      url = "git://github.com/FelikZ/ctrlp-py-matcher";
+      rev = "9e84cf8072866b92faf5082cb93a554b75e35fd0";
+      sha256 = "7d4d5f7da148ddc9c8956aca87f53d9d0ff458b8fb4bc4ab2a9bff2ee6026cde";
+    };
+    dependencies = [];
+
+  };
+
+  ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ctrlp-z-2013-05-08";
+    src = fetchgit {
+      url = "git://github.com/amiorin/ctrlp-z";
+      rev = "7845735a3d63a68ed63aa3a5363b178c48f199bf";
+      sha256 = "14c5240e6ab373cbd04d105a46808aed4a324472ddfd67b993534bf5d726e93f";
+    };
+    dependencies = [];
+
+  };
+
   extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "extradite-2015-01-26";
     src = fetchgit {
@@ -736,7 +769,7 @@ rec {
       cd $target/build
       cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
       make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
-      ${bash}/bin/bash $target/install.sh --clang-completer --system-libclang
+      ${python}/bin/python $target/third_party/ycmd/build.py --clang-completer --system-libclang
 
       ${vimHelpTags}
       vimHelpTags $target
@@ -860,6 +893,17 @@ rec {
     '';
   };
 
+  goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "goyo-2015-08-08";
+    src = fetchgit {
+      url = "git://github.com/junegunn/goyo.vim";
+      rev = "c1293a91a3a04bcb82421b2ee711c49f83a418ae";
+      sha256 = "258b23f4f043569e6e0458c8035d5b00be6031b02e460136f7783da1bbadcc49";
+    };
+    dependencies = [];
+
+  };
+
   matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "matchit-zip";
     src = fetchurl {
@@ -1353,6 +1397,17 @@ rec {
 
   };
 
+  vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-signify-2015-08-13";
+    src = fetchgit {
+      url = "git://github.com/mhinz/vim-signify";
+      rev = "d08f17873e3187da3f9998ddb81d81626ffb9ecf";
+      sha256 = "7fffc5fbd21dd4f3ea81131ccb52d992d95a73be72288457b2ec3a0fa53ce3b2";
+    };
+    dependencies = [];
+
+  };
+
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-snippets-2015-08-23";
     src = fetchgit {
@@ -1364,6 +1419,17 @@ rec {
 
   };
 
+  vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-webdevicons-2015-08-14";
+    src = fetchgit {
+      url = "git://github.com/ryanoasis/vim-devicons";
+      rev = "771769d21615d08b22f23c32e97e67e95db7d122";
+      sha256 = "8291c8be6a45d6492ad9ff2972f481d7093fff95c764b3499d0877f5365b3f27";
+    };
+    dependencies = [];
+
+  };
+
   vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim2hs-2014-04-16";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a18c24c7825..d6b731783d1 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,3 +1,5 @@
+"vim-webdevicons"
+"css_color%5056"
 "CSApprox"
 "CheckAttach"
 "Gist"
@@ -16,6 +18,8 @@
 "YankRing"
 "commentary"
 "ctrlp"
+"ctrlp-py-matcher"
+"ctrlp-z"
 "extradite"
 "fugitive"
 "ghcmod"
@@ -64,12 +68,14 @@
 "github:vim-scripts/wombat256.vim"
 "github:wakatime/vim-wakatime"
 "github:wincent/command-t"
+"goyo"
 "matchit.zip"
 "pathogen"
 "quickfixstatus"
 "rainbow_parentheses"
 "rust"
 "sensible"
+"sensible"
 "sleuth"
 "snipmate"
 "sourcemap"
@@ -100,6 +106,7 @@
 "vim-latex-live-preview"
 "vim-multiple-cursors"
 "vim-signature"
+"vim-signify"
 "vim-snippets"
 "vim2hs"
 "vimwiki"

From 32dca6d3b2c2cbf7789852d5f557f6b753a83d85 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 29 Aug 2015 21:22:29 +0200
Subject: [PATCH 1698/2016] pythonPackages.qscintilla: dont build on py3 and
 pypy

because qscintilla is not a standard python package ``buildPythonPackage`` is
not used and ``disabled`` does do anything.

diff --git a/pkgs/top-level/python-packages.nix
b/pkgs/top-level/python-packages.nix index 93d40c3..925ceb0 100644 ---
a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix
@@ -11823,35 +11823,36 @@ let }; };

-  qscintilla = pkgs.stdenv.mkDerivation rec {
-    # TODO: Qt5 support
-    name = "qscintilla-${version}";
-    version = pkgs.qscintilla.version;
-    disabled = isPy3k || isPyPy;
-
-    src = pkgs.qscintilla.src;
-
-    buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
-
-    preConfigure = ''
-      mkdir -p $out
-      lndir ${pkgs.pyqt4} $out
-      cd Python
-      ${python.executable} ./configure-old.py \
-          --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
-          --apidir $out/api/${python.libPrefix} \
-          -n ${pkgs.qscintilla}/include \
-          -o ${pkgs.qscintilla}/lib \
-          --sipdir $out/share/sip
-    '';
+  qscintilla = if isPy3k || isPyPy
+    then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}"
+    else pkgs.stdenv.mkDerivation rec {
+      # TODO: Qt5 support
+      name = "qscintilla-${version}";
+      version = pkgs.qscintilla.version;
+
+      src = pkgs.qscintilla.src;
+
+      buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
+
+      preConfigure = ''
+        mkdir -p $out
+        lndir ${pkgs.pyqt4} $out
+        cd Python
+        ${python.executable} ./configure-old.py \
+            --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
+            --apidir $out/api/${python.libPrefix} \
+            -n ${pkgs.qscintilla}/include \
+            -o ${pkgs.qscintilla}/lib \
+            --sipdir $out/share/sip
+      '';

-    meta = with stdenv.lib; {
-      description = "A Python binding to QScintilla, Qt based text editing control";
-      license = licenses.lgpl21Plus;
-      maintainers = [ "abcz2.uprola@gmail.com" ];
-      platforms = platforms.linux;
+      meta = with stdenv.lib; {
+        description = "A Python binding to QScintilla, Qt based text editing control";
+        license = licenses.lgpl21Plus;
+        maintainers = [ "abcz2.uprola@gmail.com" ];
+        platforms = platforms.linux;
+      };
     };
-  };

   qserve = buildPythonPackage rec {
---
 pkgs/top-level/python-packages.nix | 49 +++++++++++++++---------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93d40c3cd3a..925ceb01d00 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11823,35 +11823,36 @@ let
     };
   };
 
-  qscintilla = pkgs.stdenv.mkDerivation rec {
-    # TODO: Qt5 support
-    name = "qscintilla-${version}";
-    version = pkgs.qscintilla.version;
-    disabled = isPy3k || isPyPy;
+  qscintilla = if isPy3k || isPyPy
+    then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}"
+    else pkgs.stdenv.mkDerivation rec {
+      # TODO: Qt5 support
+      name = "qscintilla-${version}";
+      version = pkgs.qscintilla.version;
 
-    src = pkgs.qscintilla.src;
+      src = pkgs.qscintilla.src;
 
-    buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
+      buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
 
-    preConfigure = ''
-      mkdir -p $out
-      lndir ${pkgs.pyqt4} $out
-      cd Python
-      ${python.executable} ./configure-old.py \
-          --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
-          --apidir $out/api/${python.libPrefix} \
-          -n ${pkgs.qscintilla}/include \
-          -o ${pkgs.qscintilla}/lib \
-          --sipdir $out/share/sip
-    '';
+      preConfigure = ''
+        mkdir -p $out
+        lndir ${pkgs.pyqt4} $out
+        cd Python
+        ${python.executable} ./configure-old.py \
+            --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
+            --apidir $out/api/${python.libPrefix} \
+            -n ${pkgs.qscintilla}/include \
+            -o ${pkgs.qscintilla}/lib \
+            --sipdir $out/share/sip
+      '';
 
-    meta = with stdenv.lib; {
-      description = "A Python binding to QScintilla, Qt based text editing control";
-      license = licenses.lgpl21Plus;
-      maintainers = [ "abcz2.uprola@gmail.com" ];
-      platforms = platforms.linux;
+      meta = with stdenv.lib; {
+        description = "A Python binding to QScintilla, Qt based text editing control";
+        license = licenses.lgpl21Plus;
+        maintainers = [ "abcz2.uprola@gmail.com" ];
+        platforms = platforms.linux;
+      };
     };
-  };
 
 
   qserve = buildPythonPackage rec {

From 0b4bcaad9519d6971f99356a778cd1cb369f6309 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 29 Aug 2015 21:38:25 +0200
Subject: [PATCH 1699/2016] pythonPackages.gcutil: fix pinning of
 google_apputils version

also added some more metadata to the package
---
 pkgs/top-level/python-packages.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 925ceb01d00..e1cb3a3fea1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3513,20 +3513,34 @@ let
 
   gcutil = buildPythonPackage rec {
     name = "gcutil-1.16.1";
-    meta.maintainers = with maintainers; [ phreedom ];
 
     src = pkgs.fetchurl {
       url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.16.1.tar.gz;
       sha256 = "00jaf7x1ji9y46fbkww2sg6r6almrqfsprydz3q2swr4jrnrsx9x";
     };
 
+    propagatedBuildInputs = with self; [
+      gflags
+      iso8601
+      ipaddr
+      httplib2
+      google_apputils
+      google_api_python_client
+    ];
+
     prePatch = ''
+      sed -i -e "s|google-apputils==0.4.0|google-apputils==0.4.1|g" setup.py
       substituteInPlace setup.py \
         --replace "httplib2==0.8" "httplib2" \
         --replace "iso8601==0.1.4" "iso8601"
     '';
 
-    propagatedBuildInputs = with self; [ gflags iso8601 ipaddr httplib2 google_apputils google_api_python_client ];
+    meta = {
+      description = "Command-line tool for interacting with Google Compute Engine.";
+      homepage = "https://cloud.google.com/compute/docs/gcutil/";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ phreedom ];
+    };
   };
 
   gmpy = buildPythonPackage rec {

From 83cf8b0cf89b2e3bb6a6ee9869f5cebc50563748 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 29 Aug 2015 12:55:52 -0700
Subject: [PATCH 1700/2016] goPackages: Split into multiple derivations

This should reduce the closure size for end users who only need go
binaries as well as reduce the size of closures hydra builders consume.
---
 nixos/modules/services/misc/confd.nix         |  2 +-
 nixos/modules/services/monitoring/grafana.nix |  6 ++--
 nixos/modules/services/security/hologram.nix  |  2 +-
 .../go-modules/generic/default.nix            | 25 ++++++++-------
 pkgs/top-level/all-packages.nix               | 31 +++++++++++--------
 pkgs/top-level/go-packages.nix                | 17 +++++-----
 6 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix
index 98738b6497b..50532a8a16f 100644
--- a/nixos/modules/services/misc/confd.nix
+++ b/nixos/modules/services/misc/confd.nix
@@ -63,7 +63,7 @@ in {
 
     package = mkOption {
       description = "Confd package to use.";
-      default = pkgs.goPackages.confd;
+      default = pkgs.confd;
       type = types.package;
     };
   };
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 6a1799dedc8..f987c4792e9 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -200,13 +200,13 @@ in {
 
     staticRootPath = mkOption {
       description = "Root path for static assets.";
-      default = "${cfg.package}/share/go/src/github.com/grafana/grafana/public";
+      default = "${cfg.package.out}/share/go/src/github.com/grafana/grafana/public";
       type = types.str;
     };
 
     package = mkOption {
       description = "Package to use.";
-      default = pkgs.goPackages.grafana;
+      default = pkgs.grafana-backend;
       type = types.package;
     };
 
@@ -319,7 +319,7 @@ in {
       wantedBy = ["multi-user.target"];
       after = ["networking.target"];
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/grafana --config ${cfgFile} web";
+        ExecStart = "${cfg.package-backend}/bin/grafana --config ${cfgFile} web";
         WorkingDirectory = cfg.dataDir;
         User = "grafana";
       };
diff --git a/nixos/modules/services/security/hologram.nix b/nixos/modules/services/security/hologram.nix
index f9abf38942f..58f308df7a2 100644
--- a/nixos/modules/services/security/hologram.nix
+++ b/nixos/modules/services/security/hologram.nix
@@ -95,7 +95,7 @@ in {
       wantedBy    = [ "multi-user.target" ];
 
       serviceConfig = {
-        ExecStart = "${pkgs.goPackages.hologram}/bin/hologram-server --debug --conf ${cfgFile}";
+        ExecStart = "${pkgs.hologram}/bin/hologram-server --debug --conf ${cfgFile}";
       };
     };
   };
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 7842df6b58f..de4f0803c34 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -129,19 +129,17 @@ go.stdenv.mkDerivation (
     runHook preInstall
 
     mkdir -p $out
+    pushd "$NIX_BUILD_TOP/go"
+    while read f; do
+      echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue
+      mkdir -p "$(dirname "$out/share/go/$f")"
+      cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f"
+    done < <(find . -type f)
+    popd
 
-    if [ -z "$dontInstallSrc" ]; then
-        pushd "$NIX_BUILD_TOP/go"
-        while read f; do
-          echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue
-          mkdir -p "$(dirname "$out/share/go/$f")"
-          cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f"
-        done < <(find . -type f)
-        popd
-    fi
-
+    mkdir $bin
     dir="$NIX_BUILD_TOP/go/bin"
-    [ -e "$dir" ] && cp -r $dir $out
+    [ -e "$dir" ] && cp -r $dir $bin
 
     runHook postInstall
   '';
@@ -151,7 +149,7 @@ go.stdenv.mkDerivation (
       cat $file ${removeExpr removeReferences} > $file.tmp
       mv $file.tmp $file
       chmod +x $file
-    done < <(find $out/bin -type f 2>/dev/null)
+    done < <(find $bin/bin -type f 2>/dev/null)
   '';
 
   disallowedReferences = lib.optional (!allowGoReference) go
@@ -161,6 +159,9 @@ go.stdenv.mkDerivation (
 
   enableParallelBuilding = enableParallelBuilding;
 
+  # I prefer to call this dev but propagatedBuildInputs expects $out to exist
+  outputs = [ "out" "bin" ];
+
   meta = {
     # Add default meta information
     platforms = lib.platforms.all;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe194bdc3f7..cb68599c9d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -818,13 +818,13 @@ let
 
   clib = callPackage ../tools/package-management/clib { };
 
-  consul = goPackages.consul;
+  consul = goPackages.consul.bin // { outputs = [ "bin" ]; };
 
   consul-ui = callPackage ../servers/consul/ui.nix { };
 
-  consul-alerts = goPackages.consul-alerts;
+  consul-alerts = goPackages.consul-alerts.bin // { outputs = [ "bin" ]; };
 
-  consul-template = goPackages.consul-template;
+  consul-template = goPackages.consul-template.bin // { outputs = [ "bin" ]; };
 
   corosync = callPackage ../servers/corosync { };
 
@@ -948,7 +948,7 @@ let
 
   mcrypt = callPackage ../tools/misc/mcrypt { };
 
-  mongodb-tools = goPackages.mongo-tools;
+  mongodb-tools = goPackages.mongo-tools.bin // { outputs = [ "bin" ]; };
 
   mstflint = callPackage ../tools/misc/mstflint { };
 
@@ -1701,7 +1701,8 @@ let
 
   gptfdisk = callPackage ../tools/system/gptfdisk { };
 
-  grafana = callPackage ../development/tools/misc/grafana { };
+  grafana-frontend = callPackage ../development/tools/misc/grafana { };
+  grafana-backend = pkgs.goPackages.grafana.bin // { outputs = [ "bin" ]; };
 
   grafx2 = callPackage ../applications/graphics/grafx2 {};
 
@@ -2153,7 +2154,7 @@ let
   lshw = callPackage ../tools/system/lshw { };
 
   lxc = callPackage ../os-specific/linux/lxc { };
-  lxd = goPackages.lxd;
+  lxd = goPackages.lxd.bin // { outputs = [ "bin" ]; };
 
   lzip = callPackage ../tools/compression/lzip { };
 
@@ -4074,7 +4075,7 @@ let
 
   go-repo-root = callPackage ../development/tools/misc/go-repo-root { };
 
-  gox = goPackages.gox;
+  gox = goPackages.gox.bin // { outputs = [ "bin" ]; };
 
   gprolog = callPackage ../development/compilers/gprolog { };
 
@@ -8664,7 +8665,7 @@ let
     go = go_1_4;
     buildGoPackage = import ../development/go-modules/generic {
       go = go_1_4;
-      govers = go14Packages.govers;
+      govers = go14Packages.govers.bin;
       inherit parallel lib;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
@@ -8674,7 +8675,7 @@ let
     go = go_1_5;
     buildGoPackage = import ../development/go-modules/generic {
       go = go_1_5;
-      govers = go15Packages.govers;
+      govers = go15Packages.govers.bin;
       inherit parallel lib;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
@@ -8958,7 +8959,7 @@ let
 
   dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
 
-  etcd = goPackages.etcd;
+  etcd = goPackages.etcd.bin // { outputs = [ "bin" ]; };
 
   ejabberd = callPackage ../servers/xmpp/ejabberd {
     erlang = erlangR16;
@@ -8975,7 +8976,7 @@ let
     v8 = v8_3_24_10;
   };
 
-  etcdctl = goPackages.etcd;
+  etcdctl = etcd;
 
   exim = callPackage ../servers/mail/exim { };
 
@@ -10084,7 +10085,7 @@ let
 
   gotags = callPackage ../development/tools/gotags { };
 
-  golint = goPackages.lint;
+  golint = goPackages.lint.bin // { outputs = [ "bin" ]; };
 
   godep = callPackage ../development/tools/godep { };
 
@@ -13668,6 +13669,8 @@ let
 
   chessdb = callPackage ../games/chessdb { };
 
+  confd = pkgs.goPackages.conf.bin // { outputs = [ "bin" ]; };
+
   construoBase = lowPrio (callPackage ../games/construo {
     mesa = null;
     freeglut = null;
@@ -14529,6 +14532,8 @@ let
     camlp5 = ocamlPackages.camlp5_strict;
   };
 
+  hologram = pkgs.goPackages.bin // { outputs = [ "bin" ]; };
+
   isabelle = import ../applications/science/logic/isabelle {
     inherit (pkgs) stdenv fetchurl nettools perl polyml;
     inherit (pkgs.emacs24Packages) proofgeneral;
@@ -15130,7 +15135,7 @@ let
 
   utf8proc = callPackage ../development/libraries/utf8proc { };
 
-  vault = goPackages.vault;
+  vault = goPackages.vault.bin // { outputs = [ "bin" ]; };
 
   vbam = callPackage ../misc/emulators/vbam {
     inherit (xlibs) libpthreadstubs;
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index b69f3fd26b8..c32d7c865d1 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -130,12 +130,12 @@ let
 
     preConfigure = ''
       # Make the builtin tools available here
-      mkdir -p $out/bin
+      mkdir -p $bin/bin
       eval $(go env | grep GOTOOLDIR)
       find $GOTOOLDIR -type f | while read x; do
-        ln -sv "$x" "$out/bin"
+        ln -sv "$x" "$binbin"
       done
-      export GOTOOLDIR=$out/bin
+      export GOTOOLDIR=$bin/bin
     '';
 
     excludedPackages = "\\("
@@ -381,11 +381,11 @@ let
   };
 
   consul = buildFromGitHub {
-    rev    = "a6317f2fb2ba9d5ae695f7fa703cfb30a1c59af1";
-    date   = "2015-07-24";
+    rev    = "4adc0b5c660919e3f21c9a60f567fd872b9e3d1e";
+    date   = "2015-08-27";
     owner  = "hashicorp";
     repo   = "consul";
-    sha256 = "0jixpl9yksasqx9rkidx8qmqc59m34kiibsqfsv56g87wzyp89rs";
+    sha256 = "1h4hbyr2c8yfmn5ijga5zx470mdplg231kbxbqfpvswrk69q89j3";
 
     buildInputs = [
       circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint
@@ -1326,7 +1326,6 @@ let
     repo = "lint";
     sha256 = "1bj7zv534hyh87bp2vsbhp94qijc5nixb06li1dzfz9n0wcmlqw9";
     excludedPackages = "testdata";
-    dontInstallSrc = true;
     buildInputs = [ tools ];
   };
 
@@ -1719,11 +1718,11 @@ let
     # Mongodb incorrectly names all of their binaries main
     # Let's work around this with our own installer
     installPhase = ''
-      mkdir -p $out/bin
+      mkdir -p $bin/bin
       while read b; do
         rm -f go/bin/main
         go install $goPackagePath/$b/main
-        cp go/bin/main $out/bin/$b
+        cp go/bin/main $bin/bin/$b
       done < <(find go/src/$goPackagePath -name main | xargs dirname | xargs basename -a)
     '';
   };

From 07c4cbccf1a7311ce117bb6ca0a540d356d47d38 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 29 Aug 2015 22:02:05 +0200
Subject: [PATCH 1701/2016] pythonPackages.pycdio: applied patch since
 driver_id can be also long type

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e1cb3a3fea1..45db6b66a03 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10340,6 +10340,10 @@ let
       sha256 = "1mrh233pj584gf7la64d4xlmvdnfl4jwpxs95lnd3i4zd5drid14";
     };
 
+    prePatch = ''
+      sed -i -e "s|if type(driver_id)==int|if type(driver_id) in (int, long)|g" cdio.py
+    '';
+
     preConfigure = ''
       patchShebangs .
     '';

From 16b5d3f70be841d2428a8952e7b663f5a0d4ed86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 29 Aug 2015 22:18:33 +0200
Subject: [PATCH 1702/2016] Fix eval

Fallout from 83cf8b0cf (goPackages: Split into multiple derivations).
---
 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 cb68599c9d9..9037a2e2617 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13669,7 +13669,7 @@ let
 
   chessdb = callPackage ../games/chessdb { };
 
-  confd = pkgs.goPackages.conf.bin // { outputs = [ "bin" ]; };
+  confd = pkgs.goPackages.confd.bin // { outputs = [ "bin" ]; };
 
   construoBase = lowPrio (callPackage ../games/construo {
     mesa = null;
@@ -14532,7 +14532,7 @@ let
     camlp5 = ocamlPackages.camlp5_strict;
   };
 
-  hologram = pkgs.goPackages.bin // { outputs = [ "bin" ]; };
+  hologram = pkgs.goPackages.hologram.bin // { outputs = [ "bin" ]; };
 
   isabelle = import ../applications/science/logic/isabelle {
     inherit (pkgs) stdenv fetchurl nettools perl polyml;

From 06ed82677a84fae47f0ab87b89519ea1792af346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 23 Aug 2015 12:39:44 +0200
Subject: [PATCH 1703/2016] qt5: embed path to mesa (libGL) in Qt mkspecs file

Fixes this problem, when building apps in QtCreator:

  ...(compile output window)
  g++ -Wl,-rpath,/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
      -o qt-test3 main.o mainwindow.o moc_mainwindow.o \
      -L/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \
      -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread
  /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lGL
  collect2: error: ld returned 1 exit status

mesa is already in the closure of Qt, so there is no size increase.
The patch is copied into both qt-5.3 and qt-5.4 directories, like other
patches are.

Note that programs still can _run_ against a different libGL (e.g. one
provided by nvidia) by configuring the dynamic linker. For instance,
NixOS sets the LD_LIBRARY_PATH environment variable to
/run/opengl-driver/lib/, meaning that whatever libGL is found there
will be used instead of the default (mesa).
---
 .../libraries/qt-5/5.3/0014-mkspecs-libgl.patch   | 15 +++++++++++++++
 pkgs/development/libraries/qt-5/5.3/default.nix   |  3 ++-
 .../libraries/qt-5/5.4/0014-mkspecs-libgl.patch   | 15 +++++++++++++++
 pkgs/development/libraries/qt-5/5.4/qtbase.nix    |  3 ++-
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch

diff --git a/pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch
new file mode 100644
index 00000000000..94a031d1257
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch
@@ -0,0 +1,15 @@
+Ensure Qt knows where libGL is.
+
+Author: Bjørn Forsman <bjorn.forsman@gmail.com>
+diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf
+--- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf	2014-09-11 12:48:07.000000000 +0200
++++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf	2015-08-23 13:03:30.617473019 +0200
+@@ -13,7 +13,7 @@
+ QMAKE_INCDIR_X11        =
+ QMAKE_LIBDIR_X11        =
+ QMAKE_INCDIR_OPENGL     =
+-QMAKE_LIBDIR_OPENGL     =
++QMAKE_LIBDIR_OPENGL     = @mesa@/lib
+ QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
+ QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
+ QMAKE_INCDIR_EGL        =
diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
index 7f4e0b60c2d..d1a049d78a7 100644
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@@ -81,7 +81,8 @@ stdenv.mkDerivation rec {
       (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; })
       (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; })
       ./0013-qtwebkit-glib-2.44.patch
-    ];
+    ] ++ optional mesaSupported
+      (substituteAll { src = ./0014-mkspecs-libgl.patch; inherit mesa; });
 
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH"
diff --git a/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch
new file mode 100644
index 00000000000..94a031d1257
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch
@@ -0,0 +1,15 @@
+Ensure Qt knows where libGL is.
+
+Author: Bjørn Forsman <bjorn.forsman@gmail.com>
+diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf
+--- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf	2014-09-11 12:48:07.000000000 +0200
++++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf	2015-08-23 13:03:30.617473019 +0200
+@@ -13,7 +13,7 @@
+ QMAKE_INCDIR_X11        =
+ QMAKE_LIBDIR_X11        =
+ QMAKE_INCDIR_OPENGL     =
+-QMAKE_LIBDIR_OPENGL     =
++QMAKE_LIBDIR_OPENGL     = @mesa@/lib
+ QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
+ QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
+ QMAKE_INCDIR_EGL        =
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index 6ec57787e22..2e4a1c1c161 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -71,7 +71,8 @@ stdenv.mkDerivation {
       (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; })
       (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; })
       ./0013-xdg_config_dirs.patch
-    ]
+    ] ++ optional mesaSupported
+      (substituteAll { src = ./0014-mkspecs-libgl.patch; inherit mesa; })
     ++ (optional decryptSslTraffic ./0100-ssl.patch);
 
   preConfigure = ''

From 26f9ea6dd5d93e8d39303c31a757c42dc602b304 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 29 Aug 2015 13:25:00 -0700
Subject: [PATCH 1704/2016] goPackages: Fix tools

---
 pkgs/development/go-modules/generic/default.nix | 2 +-
 pkgs/top-level/go-packages.nix                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index de4f0803c34..5d65fbc0dea 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -137,7 +137,7 @@ go.stdenv.mkDerivation (
     done < <(find . -type f)
     popd
 
-    mkdir $bin
+    mkdir -p $bin
     dir="$NIX_BUILD_TOP/go/bin"
     [ -e "$dir" ] && cp -r $dir $bin
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index c32d7c865d1..c2159581b82 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -133,7 +133,7 @@ let
       mkdir -p $bin/bin
       eval $(go env | grep GOTOOLDIR)
       find $GOTOOLDIR -type f | while read x; do
-        ln -sv "$x" "$binbin"
+        ln -sv "$x" "$bin/bin"
       done
       export GOTOOLDIR=$bin/bin
     '';

From e69a162ceda87e57ff73b58d67992d094e9739c4 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Sat, 29 Aug 2015 11:37:58 -0400
Subject: [PATCH 1705/2016] pythonPackages.gevent: works just fine on Darwin

Closes #8569, #7275, and #5782. Obviates #8730. As asserted by
@lethalman and observed by @aflatter and @ecyrb, this package
is currently building just fine on Darwin.
---
 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 45db6b66a03..3dc84c72c45 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6255,7 +6255,7 @@ let
       description = "Coroutine-based networking library";
       homepage = http://www.gevent.org/;
       license = licenses.mit;
-      platforms = platforms.linux;
+      platforms = platforms.unix;
       maintainers = with maintainers; [ bjornfor ];
     };
   };

From 04bb91bcceca5d571b06636f34c65ca8fca3e9bd Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 13:47:43 -0700
Subject: [PATCH 1706/2016] consul: revert to stable 0.5.2 rather than a
 snapshot

Follup to #9515: It appears that Prometheus doesn't actually require an
unreleased version of Consul.
---
 pkgs/top-level/go-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index c2159581b82..6b93b4ec244 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -380,12 +380,12 @@ let
     sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0";
   };
 
-  consul = buildFromGitHub {
-    rev    = "4adc0b5c660919e3f21c9a60f567fd872b9e3d1e";
-    date   = "2015-08-27";
-    owner  = "hashicorp";
-    repo   = "consul";
-    sha256 = "1h4hbyr2c8yfmn5ijga5zx470mdplg231kbxbqfpvswrk69q89j3";
+  consul = buildFromGitHub rec {
+    rev = "v0.5.2";
+    date = rev;
+    owner = "hashicorp";
+    repo = "consul";
+    sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7";
 
     buildInputs = [
       circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint

From 3207b9f70f88040ec0873b5d8a50114c134c2f03 Mon Sep 17 00:00:00 2001
From: ro6 <ro6@users.noreply.github.com>
Date: Sat, 29 Aug 2015 16:59:00 -0300
Subject: [PATCH 1707/2016] urweb: 20150520 -> 20150819

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

diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index bc1f9a9043d..861a12f1f09 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20150520";
+  version = "20150819";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "06pl6z4sh5fvh72drz4bp70yynr4i1rawc97ww5wag8976dirwrm";
+    sha256 = "0gpdlq3aazx121k3ia94qfa4dyv04q7478x2p6hvcjamn18vk56n";
   };
 
   buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ];

From da6b3690297df26a83862b39f8f75da79ca78e73 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 29 Aug 2015 10:29:19 +0000
Subject: [PATCH 1708/2016] xurls: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix
index 15581744173..531af472cb4 100644
--- a/pkgs/tools/text/xurls/default.nix
+++ b/pkgs/tools/text/xurls/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, go }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.0";
+  version = "0.7.0";
   name = "xurls-${version}";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "xurls";
     rev = "v${version}";
-    sha256 = "0v9qfvvwy0pq7wp5q19y4a61mcc1sj8vkhvhb8bk603gzprfs10z";
+    sha256 = "1sdxz1vqm9kidva7lilway69n4fdkqa4kdldx47jriq2hr96s7n0";
   };
 
   buildInputs = [ go ];

From b873f5bd623ae1064a5c0c7c4edb374abf84d409 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 29 Aug 2015 17:47:49 -0500
Subject: [PATCH 1709/2016] Add qtEnv

---
 pkgs/development/libraries/qt-5/qt-env.nix | 31 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/qt-env.nix

diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix
new file mode 100644
index 00000000000..01ddbf31428
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/qt-env.nix
@@ -0,0 +1,31 @@
+{ runCommand, lndir }:
+
+{ paths, qtbase }:
+
+runCommand "qt-env" { inherit paths qtbase; } ''
+
+mkdir -p "$out/bin" "$out/mkspecs" "$out/include" "$out/lib" "$out/share"
+
+cp "$qtbase/bin/qmake" "$out/bin"
+cat >"$out/bin/qt.conf" <<EOF
+[Paths]
+Prefix = $out
+Plugins = lib/qt5/plugins
+Imports = lib/qt5/imports
+Qml2Imports = lib/qt5/qml
+Documentation = share/doc/qt5
+EOF
+
+for path in $paths; do
+    if [[ -d "$path/mkspecs" ]]; then
+        ${lndir}/bin/lndir -silent "$path/mkspecs" "$out/mkspecs"
+
+        for dir in bin include lib share; do
+            if [[ -d "$path/$dir" ]]; then
+                ${lndir}/bin/lndir -silent "$path/$dir" "$out/$dir"
+            fi
+        done
+    fi
+done
+
+''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9037a2e2617..170819dd278 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7999,6 +7999,8 @@ let
     buildExamples = true;
     buildTests = true;
     developerBuild = true;
+  qtEnv = callPackage ../development/libraries/qt-5/qt-env.nix {};
+
   });
 
   qt5SDK = qtcreator.override {

From 7c3d65ec41c09cbb6ee2f8892c759d7fdbb2aba8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 29 Aug 2015 17:48:03 -0500
Subject: [PATCH 1710/2016] qt5Full: build from Qt 5.4 with qtEnv

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 170819dd278..1abac46ab6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7994,13 +7994,11 @@ let
 
   qt5 = qt54;
 
-  qt5Full = appendToName "full" (qt53.override {
-    buildDocs = true;
-    buildExamples = true;
-    buildTests = true;
-    developerBuild = true;
   qtEnv = callPackage ../development/libraries/qt-5/qt-env.nix {};
 
+  qt5Full = appendToName "full" (qtEnv {
+    qtbase = qt5.base;
+    paths = lib.filter (x: !(builtins.isFunction x)) (lib.attrValues qt5);
   });
 
   qt5SDK = qtcreator.override {

From 36ac761340091925019575914d9c424b82aa4c97 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Sat, 29 Aug 2015 15:20:20 -0400
Subject: [PATCH 1711/2016] expect: fix Darwin linkage

expect's build system doesn't seem to provide the proper linker flags
for the expect programs to be able to find libexpect on Darwin. (Stuff
like this should really just use libtool. *sigh*). Setting
DYLD_LIBRARY_PATH is an inelegant hack, but it gets the job done
without risking affecting other platforms.
---
 pkgs/tools/misc/expect/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index c91d418d870..a50717d5399 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchurl, tcl, makeWrapper }:
 
-let version = "5.45";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  version = "5.45";
   name = "expect-${version}";
 
   src = fetchurl {
@@ -27,7 +26,8 @@ stdenv.mkDerivation {
     for i in $out/bin/*; do
       wrapProgram $i \
         --prefix PATH : "${tcl}/bin" \
-        --prefix TCLLIBPATH ' ' $out/lib/*
+        --prefix TCLLIBPATH ' ' $out/lib/* \
+        ${stdenv.lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"}
     done
   '';
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     description = "A tool for automating interactive applications";
     homepage = http://expect.nist.gov/;
     license = "Expect";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
   };
 }

From ffc679460fb18ce5184cee19bd951a846450185c Mon Sep 17 00:00:00 2001
From: Carter Charbonneau <zcarterc@gmail.com>
Date: Sat, 29 Aug 2015 16:47:42 -0600
Subject: [PATCH 1712/2016] networkmanager: build with dnsmasq

Networkmanager requires dnsmasq for network sharing
---
 pkgs/tools/networking/network-manager/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 51812ff95b7..cc914d6616c 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-distro=exherbo"
     "--with-dhclient=${dhcp}/bin/dhclient"
+    "--with-dnsmasq=${dnsmasq}/bin/dnsmasq"
     # Upstream prefers dhclient, so don't add dhcpcd to the closure
     #"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd"
     "--with-dhcpcd=no"

From ba7335700a254afa8365599e9b657cb347ea935a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 29 Aug 2015 18:19:27 -0700
Subject: [PATCH 1713/2016] nghttp2: 1.1.2 -> 1.2.1

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

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index 9681c4d7eee..c4257fe97d2 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -34,12 +34,12 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}nghttp2-${version}";
-  version = "1.1.2";
+  version = "1.2.1";
 
   # Don't use fetchFromGitHub since this needs a bootstrap curl
   src = fetchurl {
     url = "http://pub.wak.io/nixos/tarballs/nghttp2-${version}.tar.bz2";
-    sha256 = "5b218a0d27eeaa6898eb0757b6bbcc643ada2148696d864f185b3123c392904b";
+    sha256 = "8027461a231d205394890b2fee34d1c3751e28e7d3f7c1ebc1b557993ea4045e";
   };
 
   # Configure script searches for a symbol which does not exist in jemalloc on Darwin

From 043839368e1e0e06170cc0c7a569ca3d7fd290e4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 29 Aug 2015 19:10:18 -0700
Subject: [PATCH 1714/2016] goPackages: Exclude commonly useless go packages
 from being built

---
 .../go-modules/generic/default.nix            |  2 +-
 pkgs/top-level/go-packages.nix                | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 5d65fbc0dea..4412b3d535c 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -84,7 +84,7 @@ go.stdenv.mkDerivation (
       local d; local cmd;
       cmd="$1"
       d="$2"
-      echo "$d" | grep -q "/_" && return 0
+      echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0
       [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
       local OUT
       if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 6b93b4ec244..2546f9252e0 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -511,8 +511,6 @@ let
     name = "dbus-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/godbus/dbus";
 
-    excludedPackages = "examples";
-
     src = fetchFromGitHub {
       inherit rev;
       owner = "godbus";
@@ -566,7 +564,6 @@ let
     owner  = "coreos";
     repo   = "etcd";
     sha256 = "0jd97091jwwdvx50vbdi1py9v5w9fk86cw85p0zinb0ww6bs4y0s";
-    excludedPackages = "Godeps";
   };
 
   fsnotify.v0 = buildGoPackage rec {
@@ -830,7 +827,6 @@ let
     sha256 = "1w6bjhd8p6fxvm002jqk3r9vk50hlaqnxc9g6msb2wswy3nxcw57";
     goPackagePath = "google.golang.org/api";
     goPackageAliases = [ "github.com/google/google-api-client" ];
-    excludedPackages = "examples";
     buildInputs = [ net ];
   };
 
@@ -873,7 +869,6 @@ let
     repo   = "goproxy";
     sha256 = "1zz425y8byjaa9i7mslc9anz9w2jc093fjl0562rmm5hh4rc5x5f";
     buildInputs = [ go-charset ];
-    excludedPackages = "examples";
   };
 
   gosnappy = buildFromGitHub {
@@ -1042,7 +1037,6 @@ let
     sha256 = "0ygh0f6p679r095l4bym8q4l45w2l3d8r3hx9xrnnppxq59i2395";
     buildInputs = [ oauth2 ];
     propagatedBuildInputs = [ go-querystring ];
-    excludedPackages = "examples";
   };
 
   go-gypsy = buildFromGitHub {
@@ -1103,7 +1097,6 @@ let
     goPackagePath = "gopkg.in/lxc/go-lxc.v2";
     nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = [ pkgs.lxc ];
-    excludedPackages = "examples";
   };
 
   rcrowley.go-metrics = buildGoPackage rec {
@@ -1259,8 +1252,6 @@ let
     name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/coreos/go-systemd";
 
-    excludedPackages = "examples";
-
     src = fetchFromGitHub {
       inherit rev;
       owner = "coreos";
@@ -1277,7 +1268,6 @@ let
     owner = "stgraber";
     repo = "lxd-go-systemd";
     sha256 = "006dhy3j8ld0kycm8hrjxvakd7xdn1b6z2dsjp1l4sqrxdmm188w";
-    excludedPackages = "examples";
     buildInputs = [ dbus ];
   };
 
@@ -1406,8 +1396,6 @@ let
     name = "hipchat-go-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/tbruyelle/hipchat-go";
 
-    excludedPackages = "examples";
-
     src = fetchFromGitHub {
       inherit rev;
       owner = "tbruyelle";
@@ -1521,7 +1509,6 @@ let
     owner  = "ipfs";
     repo   = "go-ipfs";
     sha256 = "0qj3rwq5i4aiwn0i09skpi1s3mzqm8ma9v1cpjl7rya2y6ypx8xg";
-    excludedPackages = "Godeps";
   };
 
   ldap = buildGoPackage rec {
@@ -1548,8 +1535,6 @@ let
     name = "levigo-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/jmhodges/levigo";
 
-    excludedPackages = "examples";
-
     src = fetchFromGitHub {
       inherit rev;
       owner = "jmhodges";
@@ -1592,8 +1577,6 @@ let
       "code.google.com/p/log4go"
     ];
 
-    excludedPackages = "examples";
-
     src = fetchFromGitHub {
       inherit rev;
       owner = "ccpaging";
@@ -1610,7 +1593,6 @@ let
     owner = "Sirupsen";
     repo = "logrus";
     sha256 = "1v2qcjy6w24jgdm7kk0f8lqpa25qxzll2x6ycqwidd3pzjhrkifa";
-    excludedPackages = "examples";
     propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ];
   };
 
@@ -1986,7 +1968,6 @@ let
       prometheus.procfs
       beorn7.perks
     ];
-    excludedPackages = "examples";
   };
 
   prometheus.client_model = buildFromGitHub {

From affead28cb0e41199832c2d7b31400613292ca99 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 29 Aug 2015 19:11:11 -0700
Subject: [PATCH 1715/2016] goPackages: Update core packages from golang

---
 pkgs/top-level/go-packages.nix | 66 +++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 2546f9252e0..8677855802d 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -19,10 +19,11 @@ let
   ## OFFICIAL GO PACKAGES
 
   crypto = buildFromGitHub {
-    rev      = "e7913d6af127b363879a06a5ae7c5e93c089aedd";
+    rev      = "d5c5f1769f2fcd2377be6f29863081f59a4fc80f";
+    date     = "2015-08-29";
     owner    = "golang";
     repo     = "crypto";
-    sha256   = "0g2gm2wmanprsirmclxi8qxjkw93nih60ff8jwrfb4wyn7hxbds7";
+    sha256   = "0rkcvl3q8akkar4rmj052z23y61hbav9514ky6grb4gvxfx4ydbn";
     goPackagePath = "golang.org/x/crypto";
     goPackageAliases = [
       "code.google.com/p/go.crypto"
@@ -31,31 +32,29 @@ let
   };
 
   glog = buildFromGitHub {
-    rev    = "44145f04b68cf362d9c4df2182967c2275eaefed";
+    rev    = "fca8c8854093a154ff1eb580aae10276ad6b1b5f";
+    date   = "2015-07-31";
     owner  = "golang";
     repo   = "glog";
-    sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq";
+    sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8";
   };
 
-  image = buildGoPackage rec {
-    rev = "d8e202c6ce59fad0017414839b6648851d10767e";
-    name = "image-${stdenv.lib.strings.substring 0 7 rev}";
+  image = buildFromGitHub {
+    rev = "8ab1ac6834edd43d91cbe24272897a87ce7e835e";
+    date = "2015-08-23";
+    owner = "golang";
+    repo = "image";
+    sha256 = "1ckr7yh5dx2kbvp9mis7i090ss9qcz46sazrj9f2hw4jj5g3y7dr";
     goPackagePath = "golang.org/x/image";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "golang";
-      repo = "image";
-      sha256 = "0cxymm28rgbzsk76d19wm8fwp40dkwxhzmmdjnbkw5541272339l";
-    };
+    goPackageAliases = [ "github.com/golang/image" ];
   };
 
   net = buildFromGitHub {
-    rev    = "3a29182c25eeabbaaf94daaeecbc7823d86261e7";
-    date   = "2015-07-28";
+    rev    = "ea47fc708ee3e20177f3ca3716217c4ab75942cb";
+    date   = "2015-08-29";
     owner  = "golang";
     repo   = "net";
-    sha256 = "0g4w411l0v9yg8aib05kzjm9j6dwsd6nk6ayk8j0dkmqildqrx5v";
+    sha256 = "0x1pmg97n7l62vak9qnjdjrrfl98jydhv6j0w3jkk4dycdlzn30d";
     goPackagePath = "golang.org/x/net";
     goPackageAliases = [
       "code.google.com/p/go.net"
@@ -66,10 +65,11 @@ let
   };
 
   oauth2 = buildFromGitHub {
-    rev = "f98d0160877ab4712b906626425ed8b0b320907c";
+    rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a";
+    date = "2015-06-23";
     owner = "golang";
     repo = "oauth2";
-    sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i";
+    sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8";
     goPackagePath = "golang.org/x/oauth2";
     goPackageAliases = [ "github.com/golang/oauth2" ];
     propagatedBuildInputs = [ net gcloud-golang-compute-metadata ];
@@ -77,10 +77,11 @@ let
 
 
   protobuf = buildFromGitHub {
-    rev = "68c687dc49948540b356a6b47931c9be4fcd0245";
+    rev = "59b73b37c1e45995477aae817e4a653c89a858db";
+    date = "2015-08-23";
     owner = "golang";
     repo = "protobuf";
-    sha256 = "0va2x13mygmkvr7ajkg0fj4i1ha0jbxgghya20qgsh0vlp7k5maf";
+    sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
     goPackagePath = "github.com/golang/protobuf";
     goPackageAliases = [ "code.google.com/p/goprotobuf" ];
   };
@@ -111,10 +112,11 @@ let
   };
 
   text = buildFromGitHub {
-    rev = "3eb7007b740b66a77f3c85f2660a0240b284115a";
+    rev = "505f8b49cc14d790314b7535959a10b87b9161c7";
+    date = "2015-08-27";
     owner = "golang";
     repo = "text";
-    sha256 = "1pxrqbs760azmjaigf63qd6rwmz51hi6i8fq0vwcf5svxgxz2szp";
+    sha256 = "0h31hyb1ijs7zcsmpwa713x41k1wkh0igv7i4chwvwyjyl7zligy";
     goPackagePath = "golang.org/x/text";
     goPackageAliases = [ "github.com/golang/text" ];
   };
@@ -761,6 +763,7 @@ let
 
   govers = buildFromGitHub {
     rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
+    date = "2015-01-09";
     owner = "rogpeppe";
     repo = "govers";
     sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc";
@@ -821,10 +824,11 @@ let
   };
 
   google-api-go-client = buildFromGitHub {
-    rev = "ca0499560ea76ac6561548f36ffe841364fe2348";
+    rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80";
+    date = "2015-08-19";
     owner = "google";
     repo = "google-api-go-client";
-    sha256 = "1w6bjhd8p6fxvm002jqk3r9vk50hlaqnxc9g6msb2wswy3nxcw57";
+    sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8";
     goPackagePath = "google.golang.org/api";
     goPackageAliases = [ "github.com/google/google-api-client" ];
     buildInputs = [ net ];
@@ -840,9 +844,6 @@ let
       repo = "google-api-go-client";
       sha256 = "1fidlljxnd82i2r9yia0b9gh0vv3hwb5k65papnvw7sqpc4sriby";
     };
-    preBuild = ''
-      rm -rf go/src/${goPackagePath}/examples
-    '';
     buildInputs = [ net ];
     propagatedBuildInputs = [ google-api-go-client ];
   };
@@ -1357,14 +1358,15 @@ let
   };
 
   grpc = buildFromGitHub {
-    rev = "7d81e8054fb2d57468136397b9b681e4ba4a7f8e";
+    rev = "d455e65570c07e6ee7f23275063fbf34660ea616";
+    date = "2015-08-29";
     owner = "grpc";
     repo = "grpc-go";
-    sha256 = "0hknsqyzpnvjc2jvm741b16qi4jayijyhpxinskkm0nj0iy59h27";
+    sha256 = "08vra95hc8ihnj353680zhiqrv3ssw5yywkrifzb1zwl0l3cs2hr";
     goPackagePath = "google.golang.org/grpc";
     goPackageAliases = [ "github.com/grpc/grpc-go" ];
-    propagatedBuildInputs = [ http2 net protobuf oauth2 glog ];
-    excludedPackages = "\\(examples\\|benchmark\\)";
+    propagatedBuildInputs = [ http2 net protobuf oauth2 glog etcd ];
+    excludedPackages = "\\(test\\|benchmark\\)";
   };
 
   gucumber = buildGoPackage rec {

From 1d7843784880c3d75b9d858528282b450dbd2184 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 30 Aug 2015 05:31:44 +0300
Subject: [PATCH 1716/2016] wesnoth: 1.10.7 -> 1.12.4

---
 pkgs/games/wesnoth/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index bcd3f3a453a..31220b4aa62 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,21 +1,23 @@
 { stdenv, fetchurl, cmake, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango
 , gettext, zlib, boost, freetype, libpng, pkgconfig, lua, dbus, fontconfig, libtool
-, fribidi, asciidoc }:
+, fribidi, asciidoc, libpthreadstubs, libXdmcp, libxshmfence, libvorbis }:
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.10.7";
+  version = "1.12.4";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "0gi5fzij48hmhhqxc370jxvxig5q3d70jiz56rjn8yx514s5lfwa";
+    sha256 = "19qyylylaljhk45lk2ja0xp7cx9iy4hx07l65zkg20a2v9h50lmz";
   };
 
+  nativeBuildInputs = [ cmake pkgconfig ];
+
   buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib
-                  boost fribidi cmake freetype libpng pkgconfig lua
-                  dbus fontconfig libtool ];
+                  boost fribidi freetype libpng lua libpthreadstubs libXdmcp
+                  dbus fontconfig libtool libxshmfence libvorbis ];
 
   cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030
 

From dbf8feb815102a403aaeb2aa99d6e9d3233bd68b Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Sat, 29 Aug 2015 23:29:55 -0400
Subject: [PATCH 1717/2016] openafs-client: 1.6.9 -> 1.6.14, fix build

* Upgrade 1.6.9 -> 1.6.14
* Support all kernels
* Clean up nested smart-quotes that seemed to be causing a build failure
* Remove redundant `assert isLinux`: already checked by meta.platforms
---
 ...c64760e4cad2bd3dc648067d81020afc69b6.patch |  48 -------
 ...9d27f795dee4b5aa2152dd09e0540d643a69.patch |  55 --------
 ...b07f827d6f3e2032a412f5f6cb3951a27d2d.patch |  51 -------
 pkgs/servers/openafs-client/default.nix       |  22 +--
 ...f74186f4a323ffc5f125d961fe384d396cac.patch | 130 ------------------
 5 files changed, 6 insertions(+), 300 deletions(-)
 delete mode 100644 pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch
 delete mode 100644 pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch
 delete mode 100644 pkgs/servers/openafs-client/ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch
 delete mode 100644 pkgs/servers/openafs-client/f3c0f74186f4a323ffc5f125d961fe384d396cac.patch

diff --git a/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch b/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch
deleted file mode 100644
index d8f922aba37..00000000000
--- a/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Thu, 25 Sep 2014 10:52:12 +0000 (-0300)
-Subject: Linux 3.17: Deal with d_splice_alias errors
-X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=af7f1d59135526ea584a4403b6400106dc92a992;hp=880401913d6190054bb0511093606a206b16326c
-
-Linux 3.17: Deal with d_splice_alias errors
-
-In 3.17 the logic in d_splice_alias has changed.  Of interest to
-us is the fact that it will now return an EIO error if it finds
-an existing connected directory for the dentry, where it would
-previously have added a new alias for it.  As a result the end
-user can get EIO errors when accessing any file in a volume
-if the volume was first accessed through a different path (ex:
-RO path vs RW path).
-
-This commit just restores the old behaviour, adding the directory
-alias manually in the error case, which is what older versions
-of d_splice_alias used to do.
-
-Change-Id: I5558c64760e4cad2bd3dc648067d81020afc69b6
----
-
-diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
-index e03187f..0cdd9e0 100644
---- a/src/afs/LINUX/osi_vnodeops.c
-+++ b/src/afs/LINUX/osi_vnodeops.c
-@@ -1593,9 +1593,18 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp)
-     /* It's ok for the file to not be found. That's noted by the caller by
-      * seeing that the dp->d_inode field is NULL.
-      */
--    if (!code || code == ENOENT)
--	return newdp;
--    else 
-+    if (!code || code == ENOENT) {
-+	/*
-+	 * d_splice_alias can return an error (EIO) if there is an existing
-+	 * connected directory alias for this dentry.
-+	 */
-+	if (!IS_ERR(newdp))
-+	    return newdp;
-+	else {
-+	    d_add(dp, ip);
-+	    return NULL;
-+	}
-+    } else
- 	return ERR_PTR(afs_convert_code(code));
- }
- 
diff --git a/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch b/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch
deleted file mode 100644
index f8844915f85..00000000000
--- a/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 880401913d6190054bb0511093606a206b16326c Mon Sep 17 00:00:00 2001
-From: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Tue, 9 Sep 2014 10:39:55 -0300
-Subject: [PATCH] Linux 3.17: No more typedef for ctl_table
-
-The typedef has been removed so we need to use the structure
-directly.
-
-Note that the API for register_sysctl_table has also changed
-with 3.17, but it reverted back to a form that existed
-before and the configure tests handle it correctly.
-
-Change-Id: If1fd9d27f795dee4b5aa2152dd09e0540d643a69
----
- src/afs/LINUX/osi_sysctl.c |    4 ++--
- src/cf/linux-test4.m4      |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c
-index a8f7fac..834e8ad 100644
---- a/src/afs/LINUX/osi_sysctl.c
-+++ b/src/afs/LINUX/osi_sysctl.c
-@@ -34,7 +34,7 @@ extern afs_int32 afs_pct2;
- #ifdef CONFIG_SYSCTL
- static struct ctl_table_header *afs_sysctl = NULL;
- 
--static ctl_table afs_sysctl_table[] = {
-+static struct ctl_table afs_sysctl_table[] = {
-     {
- #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
- #if defined(CTL_UNNUMBERED)
-@@ -234,7 +234,7 @@ static ctl_table afs_sysctl_table[] = {
-     {0}
- };
- 
--static ctl_table fs_sysctl_table[] = {
-+static struct ctl_table fs_sysctl_table[] = {
-     {
- #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
- #if defined(CTL_UNNUMBERED)
-diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
-index dad91d9..228b491 100644
---- a/src/cf/linux-test4.m4
-+++ b/src/cf/linux-test4.m4
-@@ -395,7 +395,7 @@ AC_DEFUN([LINUX_REGISTER_SYSCTL_TABLE_NOFLAG], [
-   AC_CHECK_LINUX_BUILD([whether register_sysctl_table has an insert_at_head argument],
- 		       [ac_cv_linux_register_sysctl_table_noflag],
- 		       [#include <linux/sysctl.h>],
--		       [ctl_table *t; register_sysctl_table (t);],
-+		       [struct ctl_table *t; register_sysctl_table (t);],
- 		       [REGISTER_SYSCTL_TABLE_NOFLAG],
- 		       [define if register_sysctl_table has no insert_at head flag],
- 		       [])
--- 
-1.7.1
diff --git a/pkgs/servers/openafs-client/ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch b/pkgs/servers/openafs-client/ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch
deleted file mode 100644
index b95cfb4c620..00000000000
--- a/pkgs/servers/openafs-client/ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e284db57f94c8f97ed1c95dcd0bd9518d86c050c Mon Sep 17 00:00:00 2001
-From: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Wed, 18 Jun 2014 08:53:48 -0400
-Subject: [PATCH] Linux 3.16: Switch to iter_file_splice_write
-
-Users of generic_file_splice_write need to switch to
-using iter_file_splice_write.
-
-Change-Id: If4801d27e030e1cb986f483cf437a2cfa7398eb3
-Reviewed-on: http://gerrit.openafs.org/11302
-Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Tested-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
-Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
----
- acinclude.m4                 |    3 +++
- src/afs/LINUX/osi_vnodeops.c |    4 ++++
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index ae8f1ed..9e39d90 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -958,6 +958,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
- 		 AC_CHECK_LINUX_FUNC([inode_setattr],
- 				     [#include <linux/fs.h>],
- 				     [inode_setattr(NULL, NULL);])
-+		 AC_CHECK_LINUX_FUNC([iter_file_splice_write],
-+				     [#include <linux/fs.h>],
-+				     [iter_file_splice_write(NULL,NULL,NULL,0,0);])
- 		 AC_CHECK_LINUX_FUNC([kernel_setsockopt],
- 				     [#include <linux/net.h>],
- 				     [kernel_setsockopt(NULL, 0, 0, NULL, 0);])
-diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
-index 6f4000b..2685915 100644
---- a/src/afs/LINUX/osi_vnodeops.c
-+++ b/src/afs/LINUX/osi_vnodeops.c
-@@ -827,7 +827,11 @@ struct file_operations afs_file_fops = {
-   .sendfile =   generic_file_sendfile,
- #endif
- #if defined(STRUCT_FILE_OPERATIONS_HAS_SPLICE)
-+# if defined(HAVE_LINUX_ITER_FILE_SPLICE_WRITE)
-+  .splice_write = iter_file_splice_write,
-+# else
-   .splice_write = generic_file_splice_write,
-+# endif
-   .splice_read = generic_file_splice_read,
- #endif
-   .release =	afs_linux_release,
--- 
-1.7.1
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index 09c6468956f..e2f01206c9b 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -1,24 +1,14 @@
 { stdenv, fetchurl, which, autoconf, automake, flex, yacc,
   kernel, glibc, ncurses, perl, kerberos }:
 
-assert stdenv.isLinux;
-assert builtins.substring 0 4 kernel.version != "3.18";
-
 stdenv.mkDerivation {
-  name = "openafs-1.6.9-${kernel.version}";
+  name = "openafs-1.6.14-${kernel.version}";
 
   src = fetchurl {
-    url = http://www.openafs.org/dl/openafs/1.6.9/openafs-1.6.9-src.tar.bz2;
-    sha256 = "1isgw7znp10w0mr3sicnjzbc12bd1gdwfqqr667w6p3syyhs6bkv";
+    url = http://www.openafs.org/dl/openafs/1.6.14/openafs-1.6.14-src.tar.bz2;
+    sha256 = "3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f";
   };
 
-  patches = [
-   ./f3c0f74186f4a323ffc5f125d961fe384d396cac.patch
-   ./ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch
-   ./I5558c64760e4cad2bd3dc648067d81020afc69b6.patch
-   ./If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch
-  ];
-
   buildInputs = [ autoconf automake flex yacc ncurses perl which ];
 
   preConfigure = ''
@@ -34,14 +24,14 @@ stdenv.mkDerivation {
 
     ./regen.sh
 
-    ${stdenv.lib.optionalString (kerberos != null) ''
-      export KRB5_CONFIG=${kerberos}/bin/krb5-config"
-    ''}
+    ${stdenv.lib.optionalString (kerberos != null)
+      "export KRB5_CONFIG=${kerberos}/bin/krb5-config"}
 
     configureFlagsArray=(
       "--with-linux-kernel-build=$TMP/linux"
       ${stdenv.lib.optionalString (kerberos != null) "--with-krb5"}
       "--sysconfdir=/etc/static"
+      "--disable-linux-d_splice-alias-extra-iput"
     )
   '';
 
diff --git a/pkgs/servers/openafs-client/f3c0f74186f4a323ffc5f125d961fe384d396cac.patch b/pkgs/servers/openafs-client/f3c0f74186f4a323ffc5f125d961fe384d396cac.patch
deleted file mode 100644
index e197ee4a34c..00000000000
--- a/pkgs/servers/openafs-client/f3c0f74186f4a323ffc5f125d961fe384d396cac.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Wed, 18 Jun 2014 13:06:39 +0000 (-0400)
-Subject: Linux 3.16: Convert to new write_iter/read_iter ops
-X-Git-Tag: openafs-stable-1_6_10pre1~76
-X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=f3c0f74186f4a323ffc5f125d961fe384d396cac
-
-Linux 3.16: Convert to new write_iter/read_iter ops
-
-Change read/write operations to the new write_iter/read_iter
-operations.
-
-Reviewed-on: http://gerrit.openafs.org/11303
-Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Tested-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
-Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
-(cherry picked from commit a303bb257ed9e790d8c14644779e9508167887b6)
-
-Change-Id: I3f66104be067698a4724ed78537765cf26d4aa10
-Reviewed-on: http://gerrit.openafs.org/11309
-Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
----
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 83a1a8c..13d70db 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -836,6 +836,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
- 		 AC_CHECK_LINUX_STRUCT([inode], [i_security], [fs.h])
- 		 AC_CHECK_LINUX_STRUCT([file_operations], [flock], [fs.h])
- 		 AC_CHECK_LINUX_STRUCT([file_operations], [iterate], [fs.h])
-+		 AC_CHECK_LINUX_STRUCT([file_operations], [read_iter], [fs.h])
- 		 AC_CHECK_LINUX_STRUCT([file_operations], [sendfile], [fs.h])
- 		 AC_CHECK_LINUX_STRUCT([file_system_type], [mount], [fs.h])
- 		 AC_CHECK_LINUX_STRUCT([inode_operations], [truncate], [fs.h])
-diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
-index 441cce7..818debe 100644
---- a/src/afs/LINUX/osi_vnodeops.c
-+++ b/src/afs/LINUX/osi_vnodeops.c
-@@ -99,8 +99,11 @@ afs_linux_VerifyVCache(struct vcache *avc, cred_t **retcred) {
-     return afs_convert_code(code);
- }
- 
--#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ
--# ifdef LINUX_HAS_NONVECTOR_AIO
-+#if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) || defined(HAVE_LINUX_GENERIC_FILE_AIO_READ)
-+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
-+static ssize_t
-+afs_linux_read_iter(struct kiocb *iocb, struct iov_iter *iter)
-+# elif defined(LINUX_HAS_NONVECTOR_AIO)
- static ssize_t
- afs_linux_aio_read(struct kiocb *iocb, char __user *buf, size_t bufsize,
-                    loff_t pos)
-@@ -113,6 +116,11 @@ afs_linux_aio_read(struct kiocb *iocb, const struct iovec *buf,
-     struct file *fp = iocb->ki_filp;
-     ssize_t code = 0;
-     struct vcache *vcp = VTOAFS(fp->f_dentry->d_inode);
-+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
-+    loff_t pos = iocb->ki_pos;
-+    unsigned long bufsize = iter->nr_segs;
-+# endif
-+
- 
-     AFS_GLOCK();
-     afs_Trace4(afs_iclSetp, CM_TRACE_AIOREADOP, ICL_TYPE_POINTER, vcp,
-@@ -125,7 +133,11 @@ afs_linux_aio_read(struct kiocb *iocb, const struct iovec *buf,
- 	 * so we optimise by not using it */
- 	osi_FlushPages(vcp, NULL);	/* ensure stale pages are gone */
- 	AFS_GUNLOCK();
-+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
-+	code = generic_file_read_iter(iocb, iter);
-+# else
- 	code = generic_file_aio_read(iocb, buf, bufsize, pos);
-+# endif
- 	AFS_GLOCK();
-     }
- 
-@@ -170,8 +182,11 @@ afs_linux_read(struct file *fp, char *buf, size_t count, loff_t * offp)
-  * also take care of re-positioning the pointer if file is open in append
-  * mode. Call fake open/close to ensure we do writes of core dumps.
-  */
--#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ
--# ifdef LINUX_HAS_NONVECTOR_AIO
-+#if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) || defined(HAVE_LINUX_GENERIC_FILE_AIO_READ)
-+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
-+static ssize_t
-+afs_linux_write_iter(struct kiocb *iocb, struct iov_iter *iter)
-+# elif defined(LINUX_HAS_NONVECTOR_AIO)
- static ssize_t
- afs_linux_aio_write(struct kiocb *iocb, const char __user *buf, size_t bufsize,
-                     loff_t pos)
-@@ -184,6 +199,10 @@ afs_linux_aio_write(struct kiocb *iocb, const struct iovec *buf,
-     ssize_t code = 0;
-     struct vcache *vcp = VTOAFS(iocb->ki_filp->f_dentry->d_inode);
-     cred_t *credp;
-+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
-+    loff_t pos = iocb->ki_pos;
-+    unsigned long bufsize = iter->nr_segs;
-+# endif
- 
-     AFS_GLOCK();
- 
-@@ -199,7 +218,11 @@ afs_linux_aio_write(struct kiocb *iocb, const struct iovec *buf,
-     ReleaseWriteLock(&vcp->lock);
-     if (code == 0) {
- 	    AFS_GUNLOCK();
-+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER)
-+	    code = generic_file_write_iter(iocb, iter);
-+# else
- 	    code = generic_file_aio_write(iocb, buf, bufsize, pos);
-+# endif
- 	    AFS_GLOCK();
-     }
- 
-@@ -788,7 +811,12 @@ struct file_operations afs_dir_fops = {
- };
- 
- struct file_operations afs_file_fops = {
--#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ
-+#ifdef STRUCT_FILE_OPERATIONS_HAS_READ_ITER
-+  .read_iter =	afs_linux_read_iter,
-+  .write_iter =	afs_linux_write_iter,
-+  .read =	new_sync_read,
-+  .write =	new_sync_write,
-+#elif defined(HAVE_LINUX_GENERIC_FILE_AIO_READ)
-   .aio_read =	afs_linux_aio_read,
-   .aio_write =	afs_linux_aio_write,
-   .read =	do_sync_read,

From 96882b14d5e400dbca8c0b3c1735e4e7579f1606 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 14:16:51 -0700
Subject: [PATCH 1718/2016] prometheus: Include console templates and libraries

Also tweaked to work with the recent goPackages multiple-outputs stuff.
---
 pkgs/servers/monitoring/prometheus/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index c6ed75e0d09..bdf87e279ba 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, goPackages, fetchFromGitHub, vim }:
 
-goPackages.buildGoPackage rec {
+let self = goPackages.buildGoPackage rec {
   name = "prometheus-${version}";
   version = "0.15.1";
   goPackagePath = "github.com/prometheus/prometheus";
@@ -27,6 +27,12 @@ goPackages.buildGoPackage rec {
     yaml-v2
   ];
 
+  preInstall = ''
+    mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
+    cp -a $src/documentation/* $bin/share/doc/prometheus
+    cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
+  '';
+
   # Metadata that gets embedded into the binary
   buildFlagsArray = let t = "${goPackagePath}/version"; in
   ''
@@ -46,4 +52,6 @@ goPackages.buildGoPackage rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+};
+
+in self.bin

From a480bd89dce1103b00689edd9e2a9907fc701281 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 14:21:31 -0700
Subject: [PATCH 1719/2016] prometheus-*: fixes to deal with goPackages
 multiple-outputs changes

---
 .../monitoring/prometheus/alertmanager/default.nix        | 8 +++++---
 pkgs/servers/monitoring/prometheus/cli/default.nix        | 6 ++++--
 .../monitoring/prometheus/collectd_exporter/default.nix   | 6 ++++--
 .../monitoring/prometheus/haproxy_exporter/default.nix    | 6 ++++--
 .../monitoring/prometheus/mesos_exporter/default.nix      | 6 ++++--
 .../monitoring/prometheus/mysqld_exporter/default.nix     | 6 ++++--
 .../monitoring/prometheus/nginx_exporter/default.nix      | 6 ++++--
 .../monitoring/prometheus/node_exporter/default.nix       | 6 ++++--
 pkgs/servers/monitoring/prometheus/prom2json/default.nix  | 6 ++++--
 .../servers/monitoring/prometheus/pushgateway/default.nix | 8 +++++---
 .../monitoring/prometheus/statsd_bridge/default.nix       | 6 ++++--
 11 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
index f2f5eaa6f18..30c728e63ca 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }:
 
-goPackages.buildGoPackage rec {
+let self = goPackages.buildGoPackage rec {
   name = "prometheus-alertmanager-${rev}";
   rev = "0.0.4";
   goPackagePath = "github.com/prometheus/alertmanager";
@@ -13,7 +13,7 @@ goPackages.buildGoPackage rec {
   };
 
   buildInputs = [
-    goPackages.protobuf
+    goPackages.protobuf.bin
     goPackages.fsnotify.v0
     goPackages.httprouter
     goPackages.prometheus.client_golang
@@ -51,4 +51,6 @@ goPackages.buildGoPackage rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+};
+
+in self.bin
diff --git a/pkgs/servers/monitoring/prometheus/cli/default.nix b/pkgs/servers/monitoring/prometheus/cli/default.nix
index 701ee46d498..924e20b528c 100644
--- a/pkgs/servers/monitoring/prometheus/cli/default.nix
+++ b/pkgs/servers/monitoring/prometheus/cli/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, goPackages, fetchFromGitHub }:
 
-goPackages.buildGoPackage rec {
+let self = goPackages.buildGoPackage rec {
   name = "prometheus-cli-${rev}";
   rev = "0.3.0";
   goPackagePath = "github.com/prometheus/prometheus_cli";
@@ -24,4 +24,6 @@ goPackages.buildGoPackage rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+};
+
+in self.bin
diff --git a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
index a859c437701..dff02d3cc92 100644
--- a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
@@ -1,6 +1,6 @@
 { goPackages, lib, fetchFromGitHub }:
 
-goPackages.buildGoPackage rec {
+let self = goPackages.buildGoPackage rec {
   name = "prometheus-collectd-exporter-${rev}";
   rev = "0.1.0";
   goPackagePath = "github.com/prometheus/collectd_exporter";
@@ -21,4 +21,6 @@ goPackages.buildGoPackage rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+};
+
+in self.bin
diff --git a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix
index 63c421cd8a2..9ff421aa212 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, goPackages, fetchFromGitHub, }:
 
-goPackages.buildGoPackage rec {
+let self = goPackages.buildGoPackage rec {
   name = "prometheus-haproxy-exporter-0.4.0";
   goPackagePath = "github.com/prometheus/haproxy_exporter";
 
@@ -20,4 +20,6 @@ goPackages.buildGoPackage rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+};
+
+in self.bin
diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
index fec66af2469..1fd9224e17f 100644
--- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, goPackages, fetchFromGitHub }:
 
-goPackages.buildGoPackage rec {
+let self = goPackages.buildGoPackage rec {
   name = "prometheus-mesos-exporter-${rev}";
   rev = "0.1.0";
   goPackagePath = "github.com/prometheus/mesos_exporter";
@@ -25,4 +25,6 @@ goPackages.buildGoPackage rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+};
+
+in self.bin
diff --git a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix
index 0b399d0cfff..127dc752e14 100644
--- a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix
@@ -1,6 +1,6 @@
 { goPackages, lib, fetchFromGitHub }:
 
-goPackages.buildGoPackage rec {
+let self = goPackages.buildGoPackage rec {
   name = "prometheus-mysqld-exporter-${rev}";
   rev = "0.1.0";
   goPackagePath = "github.com/prometheus/mysqld_exporter";
@@ -24,4 +24,6 @@ goPackages.buildGoPackage rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+};
+
+in self.bin
diff --git a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix b/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix
index b45b2784042..b716bdd1722 100644
--- a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix
@@ -1,6 +1,6 @@
 { lib, goPackages, fetchFromGitHub }:
 
-goPackages.buildGoPackage rec {
+let self = goPackages.buildGoPackage rec {
   name = "prometheus-nginx-exporter-${version}";
   version = "git-2015-06-01";
   goPackagePath = "github.com/discordianfish/nginx_exporter";
@@ -24,4 +24,6 @@ goPackages.buildGoPackage rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+};
+
+in self.bin
diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
index 922c958b3f5..8635228a612 100644
--- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
@@ -2,7 +2,7 @@
 
 with goPackages;
 
-buildGoPackage rec {
+let self = buildGoPackage rec {
   name = "prometheus-node-exporter-${rev}";
   rev = "0.10.0";
   goPackagePath = "github.com/prometheus/node_exporter";
@@ -30,4 +30,6 @@ buildGoPackage rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+};
+
+in self.bin
diff --git a/pkgs/servers/monitoring/prometheus/prom2json/default.nix b/pkgs/servers/monitoring/prometheus/prom2json/default.nix
index 368ea3ae214..716f3c8bf54 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json/default.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json/default.nix
@@ -1,6 +1,6 @@
 { goPackages, lib, fetchFromGitHub }:
 
-goPackages.buildGoPackage rec {
+let self = goPackages.buildGoPackage rec {
   name = "prom2json-${rev}";
   rev = "0.1.0";
   goPackagePath = "github.com/prometheus/prom2json";
@@ -25,4 +25,6 @@ goPackages.buildGoPackage rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+};
+
+in self.bin
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
index ae1e1e38902..1b0fcd7485e 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
@@ -2,7 +2,7 @@
 
 with goPackages;
 
-buildGoPackage rec {
+let self = buildGoPackage rec {
   name = "prometheus-pushgateway-${rev}";
   rev = "0.1.1";
   goPackagePath = "github.com/prometheus/pushgateway";
@@ -15,7 +15,7 @@ buildGoPackage rec {
   };
 
   buildInputs = [
-    go-bindata
+    go-bindata.bin
     protobuf
     httprouter
     golang_protobuf_extensions
@@ -47,4 +47,6 @@ buildGoPackage rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+};
+
+in self.bin
diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
index 31acf79c813..52672edcdb6 100644
--- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, goPackages, fetchFromGitHub }:
 
-goPackages.buildGoPackage rec {
+let self = goPackages.buildGoPackage rec {
   name = "prometheus-statsd-bridge-${version}";
   version = "0.1.0";
   goPackagePath = "github.com/prometheus/statsd_bridge";
@@ -24,4 +24,6 @@ goPackages.buildGoPackage rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+};
+
+in self.bin

From 94407ad644c62357ad952a131027893b1cfaf926 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 15:20:55 -0700
Subject: [PATCH 1720/2016] prometheus-alertmanager: streamline build, prune
 buildInputs

It turns out it's no longer necessary to run the protoc and
static-asset compile steps ourselves, as those are included in the
upstream repo now.
---
 .../prometheus/alertmanager/default.nix       | 41 ++++++-------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
index 30c728e63ca..91b4bb9e9f9 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }:
+{ stdenv, lib, goPackages, fetchFromGitHub }:
 
 let self = goPackages.buildGoPackage rec {
   name = "prometheus-alertmanager-${rev}";
@@ -12,40 +12,25 @@ let self = goPackages.buildGoPackage rec {
     sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15";
   };
 
-  buildInputs = [
-    goPackages.protobuf.bin
-    goPackages.fsnotify.v0
-    goPackages.httprouter
-    goPackages.prometheus.client_golang
-    goPackages.prometheus.log
-    goPackages.pushover
-    protobuf
-    vim
+  buildInputs = with goPackages; [
+    fsnotify.v0
+    httprouter
+    prometheus.client_golang
+    prometheus.log
+    pushover
   ];
 
   buildFlagsArray = ''
     -ldflags=
-        -X main.buildVersion ${rev}
-        -X main.buildBranch master
-        -X main.buildUser nix@nixpkgs
-        -X main.buildDate 20150101-00:00:00
-        -X main.goVersion ${lib.getVersion goPackages.go}
-  '';
-
-  preBuild = ''
-  (
-    cd "go/src/$goPackagePath"
-    protoc --proto_path=./config \
-           --go_out=./config/generated/ \
-           ./config/config.proto
-    cd web
-    ${stdenv.shell} blob/embed-static.sh static templates \
-      | gofmt > blob/files.go
-  )
+        -X main.buildVersion=${rev}
+        -X main.buildBranch=master
+        -X main.buildUser=nix@nixpkgs
+        -X main.buildDate=20150101-00:00:00
+        -X main.goVersion=${lib.getVersion goPackages.go}
   '';
 
   meta = with lib; {
-    description = "Alerting dispather for the Prometheus monitoring system";
+    description = "Alert dispatcher for the Prometheus monitoring system";
     homepage = "https://github.com/prometheus/alertmanager";
     license = licenses.asl20;
     maintainers = with maintainers; [ benley ];

From e734ce05b86974738c5e6c504b5cbf618bf709f2 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 15:27:30 -0700
Subject: [PATCH 1721/2016] prometheus-pushgateway: move go-bindata into
 nativeBuildInputs

Thereotically make life easier for a future cross-compilation path.
---
 .../prometheus/pushgateway/default.nix          | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
index 1b0fcd7485e..5d21b53ab72 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
@@ -15,21 +15,24 @@ let self = buildGoPackage rec {
   };
 
   buildInputs = [
-    go-bindata.bin
     protobuf
     httprouter
     golang_protobuf_extensions
     prometheus.client_golang
   ];
 
+  nativeBuildInputs = [
+    go-bindata.bin
+  ];
+
   buildFlagsArray = ''
     -ldflags=
-        -X main.buildVersion ${rev}
-        -X main.buildRev ${rev}
-        -X main.buildBranch master
-        -X main.buildUser nix@nixpkgs
-        -X main.buildDate 20150101-00:00:00
-        -X main.goVersion ${lib.getVersion go}
+        -X main.buildVersion=${rev}
+        -X main.buildRev=${rev}
+        -X main.buildBranch=master
+        -X main.buildUser=nix@nixpkgs
+        -X main.buildDate=20150101-00:00:00
+        -X main.goVersion=${lib.getVersion go}
   '';
 
   preBuild = ''

From ff03cf23c667d0656380613bb8e56486bff13f18 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 22:30:26 -0700
Subject: [PATCH 1722/2016] prometheus-*: trivial cleanup

---
 pkgs/servers/monitoring/prometheus/alertmanager/default.nix   | 4 ++--
 .../monitoring/prometheus/collectd_exporter/default.nix       | 2 +-
 pkgs/servers/monitoring/prometheus/default.nix                | 2 +-
 .../monitoring/prometheus/haproxy_exporter/default.nix        | 2 +-
 pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix | 2 +-
 pkgs/servers/monitoring/prometheus/node_exporter/default.nix  | 2 +-
 pkgs/servers/monitoring/prometheus/pushgateway/default.nix    | 2 +-
 pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
index 91b4bb9e9f9..36867f17da3 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub }:
+{ lib, goPackages, fetchFromGitHub }:
 
 let self = goPackages.buildGoPackage rec {
   name = "prometheus-alertmanager-${rev}";
@@ -31,7 +31,7 @@ let self = goPackages.buildGoPackage rec {
 
   meta = with lib; {
     description = "Alert dispatcher for the Prometheus monitoring system";
-    homepage = "https://github.com/prometheus/alertmanager";
+    homepage = https://github.com/prometheus/alertmanager;
     license = licenses.asl20;
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
diff --git a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
index dff02d3cc92..d652347fdab 100644
--- a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
@@ -16,7 +16,7 @@ let self = goPackages.buildGoPackage rec {
 
   meta = with lib; {
     description = "Relay server for exporting metrics from collectd to Prometheus";
-    homepage = "https://github.com/prometheus/alertmanager";
+    homepage = https://github.com/prometheus/alertmanager;
     license = licenses.asl20;
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index bdf87e279ba..86399363fe2 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub, vim }:
+{ lib, goPackages, fetchFromGitHub }:
 
 let self = goPackages.buildGoPackage rec {
   name = "prometheus-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix
index 9ff421aa212..8ea0677d163 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub, }:
+{ lib, goPackages, fetchFromGitHub }:
 
 let self = goPackages.buildGoPackage rec {
   name = "prometheus-haproxy-exporter-0.4.0";
diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
index 1fd9224e17f..d9b78bcc0b9 100644
--- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub }:
+{ lib, goPackages, fetchFromGitHub }:
 
 let self = goPackages.buildGoPackage rec {
   name = "prometheus-mesos-exporter-${rev}";
diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
index 8635228a612..2aff12a42a4 100644
--- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub }:
+{ lib, goPackages, fetchFromGitHub }:
 
 with goPackages;
 
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
index 5d21b53ab72..ee6d071a84c 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub }:
+{ lib, goPackages, fetchFromGitHub }:
 
 with goPackages;
 
diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
index 52672edcdb6..f4dea0b7580 100644
--- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub }:
+{ lib, goPackages, fetchFromGitHub }:
 
 let self = goPackages.buildGoPackage rec {
   name = "prometheus-statsd-bridge-${version}";

From d74e65bd6f85878758b0ff1bf7f7a2e2a2b6550e Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 22:46:57 -0700
Subject: [PATCH 1723/2016] prometheus: fold definition into go-packages.nix

---
 .../servers/monitoring/prometheus/default.nix | 57 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 54 ++++++++++++++++++
 3 files changed, 55 insertions(+), 58 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
deleted file mode 100644
index 86399363fe2..00000000000
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-${version}";
-  version = "0.15.1";
-  goPackagePath = "github.com/prometheus/prometheus";
-  rev = "64349aade284846cb194be184b1b180fca629a7c";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "prometheus";
-    repo = "prometheus";
-    sha256 = "0gljpwnlip1fnmhbc96hji2rc56xncy97qccm7v1z5j1nhc5fam2";
-  };
-
-  buildInputs = with goPackages; [
-    consul
-    dns
-    fsnotify.v1
-    go-zookeeper
-    goleveldb
-    httprouter
-    logrus
-    net
-    prometheus.client_golang
-    prometheus.log
-    yaml-v2
-  ];
-
-  preInstall = ''
-    mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
-    cp -a $src/documentation/* $bin/share/doc/prometheus
-    cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
-  '';
-
-  # Metadata that gets embedded into the binary
-  buildFlagsArray = let t = "${goPackagePath}/version"; in
-  ''
-    -ldflags=
-        -X ${t}.Version=${version}
-        -X ${t}.Revision=${builtins.substring 0 6 rev}
-        -X ${t}.Branch=master
-        -X ${t}.BuildUser=nix@nixpkgs
-        -X ${t}.BuildDate=20150101-00:00:00
-        -X ${t}.GoVersion=${lib.getVersion goPackages.go}
-  '';
-
-  meta = with lib; {
-    description = "Service monitoring system and time series database";
-    homepage = http://prometheus.io;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-};
-
-in self.bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b101735627b..a94a5b780d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9197,7 +9197,7 @@ let
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json { };
-  prometheus = callPackage ../servers/monitoring/prometheus { };
+  prometheus = goPackages.prometheus.prometheus.bin;
   prometheus-alertmanager =
     callPackage ../servers/monitoring/prometheus/alertmanager { };
   prometheus-cli =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 8677855802d..0d55c765cfb 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1998,6 +1998,60 @@ let
     sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
   };
 
+  prometheus.prometheus = buildGoPackage rec {
+    name = "prometheus-${version}";
+    version = "0.15.1";
+    goPackagePath = "github.com/prometheus/prometheus";
+    rev = "64349aade284846cb194be184b1b180fca629a7c";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "prometheus";
+      repo = "prometheus";
+      sha256 = "0gljpwnlip1fnmhbc96hji2rc56xncy97qccm7v1z5j1nhc5fam2";
+    };
+
+    buildInputs = [
+      consul
+      dns
+      fsnotify.v1
+      go-zookeeper
+      goleveldb
+      httprouter
+      logrus
+      net
+      prometheus.client_golang
+      prometheus.log
+      yaml-v2
+    ];
+
+    preInstall = ''
+      mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
+      cp -a $src/documentation/* $bin/share/doc/prometheus
+      cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
+    '';
+
+    # Metadata that gets embedded into the binary
+    buildFlagsArray = let t = "${goPackagePath}/version"; in
+    ''
+      -ldflags=
+          -X ${t}.Version=${version}
+          -X ${t}.Revision=${builtins.substring 0 6 rev}
+          -X ${t}.Branch=master
+          -X ${t}.BuildUser=nix@nixpkgs
+          -X ${t}.BuildDate=20150101-00:00:00
+          -X ${t}.GoVersion=${stdenv.lib.getVersion go}
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Service monitoring system and time series database";
+      homepage = http://prometheus.io;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   pty = buildFromGitHub {
     rev    = "67e2db24c831afa6c64fc17b4a143390674365ef";
     owner  = "kr";

From 87655d9fe8d7e43a7947384345f95f0c9cd7b5ec Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 22:55:22 -0700
Subject: [PATCH 1724/2016] prometheus-alertmanager: fold into go-packages.nix

---
 .../prometheus/alertmanager/default.nix       | 41 -------------------
 pkgs/top-level/all-packages.nix               |  5 ++-
 pkgs/top-level/go-packages.nix                | 38 +++++++++++++++++
 3 files changed, 41 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/alertmanager/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
deleted file mode 100644
index 36867f17da3..00000000000
--- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-alertmanager-${rev}";
-  rev = "0.0.4";
-  goPackagePath = "github.com/prometheus/alertmanager";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "alertmanager";
-    inherit rev;
-    sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15";
-  };
-
-  buildInputs = with goPackages; [
-    fsnotify.v0
-    httprouter
-    prometheus.client_golang
-    prometheus.log
-    pushover
-  ];
-
-  buildFlagsArray = ''
-    -ldflags=
-        -X main.buildVersion=${rev}
-        -X main.buildBranch=master
-        -X main.buildUser=nix@nixpkgs
-        -X main.buildDate=20150101-00:00:00
-        -X main.goVersion=${lib.getVersion goPackages.go}
-  '';
-
-  meta = with lib; {
-    description = "Alert dispatcher for the Prometheus monitoring system";
-    homepage = https://github.com/prometheus/alertmanager;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-};
-
-in self.bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a94a5b780d0..9ca528f0ed9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9197,9 +9197,10 @@ let
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json { };
+
   prometheus = goPackages.prometheus.prometheus.bin;
-  prometheus-alertmanager =
-    callPackage ../servers/monitoring/prometheus/alertmanager { };
+  prometheus-alertmanager = goPackages.prometheus.alertmanager.bin;
+
   prometheus-cli =
     callPackage ../servers/monitoring/prometheus/cli { };
   prometheus-collectd-exporter =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 0d55c765cfb..b71f05724b7 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1956,6 +1956,44 @@ let
     propagatedBuildInputs = [ kr.text ];
   };
 
+  prometheus.alertmanager = buildGoPackage rec {
+    name = "prometheus-alertmanager-${rev}";
+    rev = "0.0.4";
+    goPackagePath = "github.com/prometheus/alertmanager";
+
+    src = fetchFromGitHub {
+      owner = "prometheus";
+      repo = "alertmanager";
+      inherit rev;
+      sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15";
+    };
+
+    buildInputs = [
+      fsnotify.v0
+      httprouter
+      prometheus.client_golang
+      prometheus.log
+      pushover
+    ];
+
+    buildFlagsArray = ''
+      -ldflags=
+          -X main.buildVersion=${rev}
+          -X main.buildBranch=master
+          -X main.buildUser=nix@nixpkgs
+          -X main.buildDate=20150101-00:00:00
+          -X main.goVersion=${stdenv.lib.getVersion go}
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Alert dispatcher for the Prometheus monitoring system";
+      homepage = https://github.com/prometheus/alertmanager;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.client_golang = buildFromGitHub rec {
     rev = "0.7.0";
     date = rev;  # Trick buildFromGitHub into keeping the version number

From 853602fae52ef09f7810ade49608801ccee24b0e Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 23:17:13 -0700
Subject: [PATCH 1725/2016] prometheus-cli: fold into go-packages.nix

---
 .../monitoring/prometheus/cli/default.nix     | 29 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 20 +++++++++++++
 3 files changed, 21 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/cli/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/cli/default.nix b/pkgs/servers/monitoring/prometheus/cli/default.nix
deleted file mode 100644
index 924e20b528c..00000000000
--- a/pkgs/servers/monitoring/prometheus/cli/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, lib, goPackages, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-cli-${rev}";
-  rev = "0.3.0";
-  goPackagePath = "github.com/prometheus/prometheus_cli";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "prometheus_cli";
-    inherit rev;
-    sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn";
-  };
-
-  buildInputs = [
-    goPackages.prometheus.client_model
-    goPackages.prometheus.client_golang
-  ];
-
-  meta = with lib; {
-    description = "Command line tool for querying the Prometheus HTTP API";
-    homepage = https://github.com/prometheus/prometheus_cli;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-};
-
-in self.bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ca528f0ed9..3fc6a34b3df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9200,9 +9200,8 @@ let
 
   prometheus = goPackages.prometheus.prometheus.bin;
   prometheus-alertmanager = goPackages.prometheus.alertmanager.bin;
+  prometheus-cli = goPackages.prometheus.cli.bin;
 
-  prometheus-cli =
-    callPackage ../servers/monitoring/prometheus/cli { };
   prometheus-collectd-exporter =
     callPackage ../servers/monitoring/prometheus/collectd_exporter { };
   prometheus-haproxy-exporter =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index b71f05724b7..397bcccc80d 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2010,6 +2010,26 @@ let
     ];
   };
 
+  prometheus.cli = buildFromGitHub {
+    rev = "0.3.0";
+    owner = "prometheus";
+    repo = "prometheus_cli";
+    sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn";
+
+    buildInputs = [
+      prometheus.client_model
+      prometheus.client_golang
+    ];
+
+    meta = with stdenv.lib; {
+      description = "Command line tool for querying the Prometheus HTTP API";
+      homepage = https://github.com/prometheus/prometheus_cli;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.client_model = buildFromGitHub {
     rev    = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
     date   = "2015-02-12";

From fe5a2b0a39f03bcca17d22fc96a6df828a551f63 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 23:19:48 -0700
Subject: [PATCH 1726/2016] prom2json: fold into go-packages.nix

---
 .../prometheus/prom2json/default.nix          | 30 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 21 +++++++++++++
 3 files changed, 22 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/prom2json/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/prom2json/default.nix b/pkgs/servers/monitoring/prometheus/prom2json/default.nix
deleted file mode 100644
index 716f3c8bf54..00000000000
--- a/pkgs/servers/monitoring/prometheus/prom2json/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ goPackages, lib, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prom2json-${rev}";
-  rev = "0.1.0";
-  goPackagePath = "github.com/prometheus/prom2json";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "prom2json";
-    inherit rev;
-    sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl";
-  };
-
-  buildInputs = with goPackages; [
-    golang_protobuf_extensions
-    prometheus.client_golang
-    protobuf
-  ];
-
-  meta = with lib; {
-    description = "A tool to scrape a Prometheus client and dump the result as JSON";
-    homepage = https://github.com/prometheus/prom2json;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-};
-
-in self.bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fc6a34b3df..14713821ba1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9196,8 +9196,7 @@ let
 
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
-  prom2json = callPackage ../servers/monitoring/prometheus/prom2json { };
-
+  prom2json = goPackages.prometheus.prom2json.bin;
   prometheus = goPackages.prometheus.prometheus.bin;
   prometheus-alertmanager = goPackages.prometheus.alertmanager.bin;
   prometheus-cli = goPackages.prometheus.cli.bin;
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 397bcccc80d..a098da3635c 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2056,6 +2056,27 @@ let
     sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
   };
 
+  prometheus.prom2json = buildFromGitHub {
+    rev = "0.1.0";
+    owner = "prometheus";
+    repo = "prom2json";
+    sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl";
+
+    buildInputs = [
+      golang_protobuf_extensions
+      prometheus.client_golang
+      protobuf
+    ];
+
+    meta = with stdenv.lib; {
+      description = "Tool to scrape a Prometheus client and dump the result as JSON";
+      homepage = https://github.com/prometheus/prom2json;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.prometheus = buildGoPackage rec {
     name = "prometheus-${version}";
     version = "0.15.1";

From c5b6f17e1c50dee2ada7597266bd87f294d28980 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 23:30:27 -0700
Subject: [PATCH 1727/2016] prometheus-collectd-exporter: fold into
 go-packages.nix

---
 .../prometheus/collectd_exporter/default.nix  | 26 -------------------
 pkgs/top-level/all-packages.nix               |  3 +--
 pkgs/top-level/go-packages.nix                | 20 +++++++++++---
 3 files changed, 17 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
deleted file mode 100644
index d652347fdab..00000000000
--- a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ goPackages, lib, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-collectd-exporter-${rev}";
-  rev = "0.1.0";
-  goPackagePath = "github.com/prometheus/collectd_exporter";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "collectd_exporter";
-    inherit rev;
-    sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1";
-  };
-
-  buildInputs = [ goPackages.prometheus.client_golang ];
-
-  meta = with lib; {
-    description = "Relay server for exporting metrics from collectd to Prometheus";
-    homepage = https://github.com/prometheus/alertmanager;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-};
-
-in self.bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14713821ba1..74b58353e63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9200,9 +9200,8 @@ let
   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-collectd-exporter =
-    callPackage ../servers/monitoring/prometheus/collectd_exporter { };
   prometheus-haproxy-exporter =
     callPackage ../servers/monitoring/prometheus/haproxy_exporter { };
   prometheus-mesos-exporter =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a098da3635c..f1fdb6a3a1d 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -384,7 +384,6 @@ let
 
   consul = buildFromGitHub rec {
     rev = "v0.5.2";
-    date = rev;
     owner = "hashicorp";
     repo = "consul";
     sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7";
@@ -1591,7 +1590,6 @@ let
 
   logrus = buildFromGitHub rec {
     rev = "v0.8.6";
-    date = rev;  # Trick buildFromGitHub into keeping the version number.
     owner = "Sirupsen";
     repo = "logrus";
     sha256 = "1v2qcjy6w24jgdm7kk0f8lqpa25qxzll2x6ycqwidd3pzjhrkifa";
@@ -1994,9 +1992,8 @@ let
     };
   };
 
-  prometheus.client_golang = buildFromGitHub rec {
+  prometheus.client_golang = buildFromGitHub {
     rev = "0.7.0";
-    date = rev;  # Trick buildFromGitHub into keeping the version number
     owner = "prometheus";
     repo = "client_golang";
     sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna";
@@ -2039,6 +2036,21 @@ let
     buildInputs = [ protobuf ];
   };
 
+  prometheus.collectd-exporter = buildFromGitHub {
+    rev = "0.1.0";
+    owner = "prometheus";
+    repo = "collectd_exporter";
+    sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1";
+    buildInputs = [ prometheus.client_golang ];
+    meta = with stdenv.lib; {
+      description = "Relay server for exporting metrics from collectd to Prometheus";
+      homepage = https://github.com/prometheus/alertmanager;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.log = buildFromGitHub {
     rev    = "439e5db48fbb50ebbaf2c816030473a62f505f55";
     date   = "2015-05-29";

From 9001ad4106c1bab79e5af28a1e7cb554b78111b3 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 23:37:48 -0700
Subject: [PATCH 1728/2016] prometheus-haproxy-exporter: fold into
 go-packages.nix

---
 .../prometheus/haproxy_exporter/default.nix   | 25 -------------------
 pkgs/top-level/all-packages.nix               |  3 +--
 pkgs/top-level/go-packages.nix                | 15 +++++++++++
 3 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix
deleted file mode 100644
index 8ea0677d163..00000000000
--- a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-haproxy-exporter-0.4.0";
-  goPackagePath = "github.com/prometheus/haproxy_exporter";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "haproxy_exporter";
-    rev = "6ee6d1df3e68ed73df37c9794332b2594e4da45d";
-    sha256 = "0lbwv6jsdfjd9ihiky3lq7d5rkxqjh7xfaziw8i3w34a38japlpr";
-  };
-
-  buildInputs = [ goPackages.prometheus.client_golang ];
-
-  meta = with lib; {
-    description = "HAProxy Exporter for the Prometheus monitoring system";
-    homepage = https://github.com/prometheus/haproxy_exporter;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-};
-
-in self.bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74b58353e63..18ada8231dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9201,9 +9201,8 @@ let
   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-haproxy-exporter =
-    callPackage ../servers/monitoring/prometheus/haproxy_exporter { };
   prometheus-mesos-exporter =
     callPackage ../servers/monitoring/prometheus/mesos_exporter { };
   prometheus-mysqld-exporter =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f1fdb6a3a1d..33aa17b5979 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2051,6 +2051,21 @@ let
     };
   };
 
+  prometheus.haproxy-exporter = buildFromGitHub {
+    rev = "0.4.0";
+    owner = "prometheus";
+    repo = "haproxy_exporter";
+    sha256 = "0cwls1d4hmzjkwc50mjkxjb4sa4q6yq581wlc5sg9mdvl6g91zxr";
+    buildInputs = [ prometheus.client_golang ];
+    meta = with stdenv.lib; {
+      description = "HAProxy Exporter for the Prometheus monitoring system";
+      homepage = https://github.com/prometheus/haproxy_exporter;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.log = buildFromGitHub {
     rev    = "439e5db48fbb50ebbaf2c816030473a62f505f55";
     date   = "2015-05-29";

From 52dd6ea9d9341a996ab567e7a8714fd1b8e0ddfe Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 23:47:13 -0700
Subject: [PATCH 1729/2016] prometheus-mesos-exporter: fold into
 go-packages.nix

---
 .../prometheus/mesos_exporter/default.nix     | 30 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 15 ++++++++++
 3 files changed, 16 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
deleted file mode 100644
index d9b78bcc0b9..00000000000
--- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-mesos-exporter-${rev}";
-  rev = "0.1.0";
-  goPackagePath = "github.com/prometheus/mesos_exporter";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "prometheus";
-    repo = "mesos_exporter";
-    sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm";
-  };
-
-  buildInputs = [
-    goPackages.mesos-stats
-    goPackages.prometheus.client_golang
-    goPackages.glog
-  ];
-
-  meta = with lib; {
-    description = "Export Mesos metrics to Prometheus";
-    homepage = https://github.com/prometheus/mesos_exporter;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-};
-
-in self.bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18ada8231dd..796150da673 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9202,9 +9202,8 @@ let
   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-mesos-exporter =
-    callPackage ../servers/monitoring/prometheus/mesos_exporter { };
   prometheus-mysqld-exporter =
     callPackage ../servers/monitoring/prometheus/mysqld_exporter { };
   prometheus-nginx-exporter =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 33aa17b5979..31a9c8b3a93 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2075,6 +2075,21 @@ let
     propagatedBuildInputs = [ logrus ];
   };
 
+  prometheus.mesos-exporter = buildFromGitHub {
+    rev = "0.1.0";
+    owner = "prometheus";
+    repo = "mesos_exporter";
+    sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm";
+    buildInputs = [ mesos-stats prometheus.client_golang glog ];
+    meta = with stdenv.lib; {
+      description = "Export Mesos metrics to Prometheus";
+      homepage = https://github.com/prometheus/mesos_exporter;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.procfs = buildFromGitHub {
     rev    = "c91d8eefde16bd047416409eb56353ea84a186e4";
     date   = "2015-06-16";

From 4f53847ca2eaf50d1b20f564ac4c7ee9ce2d055d Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 23:51:19 -0700
Subject: [PATCH 1730/2016] prometheus-mysqld-exporter: fold into
 go-packages.nix

---
 .../prometheus/mysqld_exporter/default.nix    | 29 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 15 ++++++++++
 3 files changed, 16 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix
deleted file mode 100644
index 127dc752e14..00000000000
--- a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ goPackages, lib, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-mysqld-exporter-${rev}";
-  rev = "0.1.0";
-  goPackagePath = "github.com/prometheus/mysqld_exporter";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "mysqld_exporter";
-    inherit rev;
-    sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9";
-  };
-
-  buildInputs = with goPackages; [
-    mysql
-    prometheus.client_golang
-  ];
-
-  meta = with lib; {
-    description = "Prometheus exporter for MySQL server metrics";
-    homepage = https://github.com/prometheus/mysqld_exporter;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-};
-
-in self.bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 796150da673..5a483fa2429 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9203,9 +9203,8 @@ let
   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-mysqld-exporter =
-    callPackage ../servers/monitoring/prometheus/mysqld_exporter { };
   prometheus-nginx-exporter =
     callPackage ../servers/monitoring/prometheus/nginx_exporter { };
   prometheus-node-exporter =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 31a9c8b3a93..6dfa5192176 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2090,6 +2090,21 @@ let
     };
   };
 
+  prometheus.mysqld-exporter = buildFromGitHub {
+    rev = "0.1.0";
+    owner = "prometheus";
+    repo = "mysqld_exporter";
+    sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9";
+    buildInputs = [ mysql prometheus.client_golang ];
+    meta = with stdenv.lib; {
+      description = "Prometheus exporter for MySQL server metrics";
+      homepage = https://github.com/prometheus/mysqld_exporter;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.procfs = buildFromGitHub {
     rev    = "c91d8eefde16bd047416409eb56353ea84a186e4";
     date   = "2015-06-16";

From 6122488297369518cb2bf1b876f9fdf072a27924 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 30 Aug 2015 00:12:09 -0700
Subject: [PATCH 1731/2016] prometheus-nginx-exporter: fold into
 go-packages.nix

---
 .../prometheus/nginx_exporter/default.nix     | 29 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 16 ++++++++++
 3 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix b/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix
deleted file mode 100644
index b716bdd1722..00000000000
--- a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-nginx-exporter-${version}";
-  version = "git-2015-06-01";
-  goPackagePath = "github.com/discordianfish/nginx_exporter";
-
-  src = fetchFromGitHub {
-    owner = "discordianfish";
-    repo = "nginx_exporter";
-    rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b";
-    sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc";
-  };
-
-  buildInputs = [
-    goPackages.prometheus.client_golang
-    goPackages.prometheus.log
-  ];
-
-  meta = with lib; {
-    description = "Metrics relay from nginx stats to Prometheus";
-    homepage = https://github.com/discordianfish/nginx_exporter;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-};
-
-in self.bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a483fa2429..9a623ecb45a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9204,9 +9204,8 @@ let
   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-nginx-exporter =
-    callPackage ../servers/monitoring/prometheus/nginx_exporter { };
   prometheus-node-exporter =
     callPackage ../servers/monitoring/prometheus/node_exporter { };
   prometheus-pushgateway =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 6dfa5192176..50886200732 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2105,6 +2105,22 @@ let
     };
   };
 
+  prometheus.nginx-exporter = buildFromGitHub {
+    rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b";
+    date = "2015-06-01";
+    owner = "discordianfish";
+    repo = "nginx_exporter";
+    sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc";
+    buildInputs = [ prometheus.client_golang prometheus.log ];
+    meta = with stdenv.lib; {
+      description = "Metrics relay from nginx stats to Prometheus";
+      homepage = https://github.com/discordianfish/nginx_exporter;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.procfs = buildFromGitHub {
     rev    = "c91d8eefde16bd047416409eb56353ea84a186e4";
     date   = "2015-06-16";

From 4c95e495931520e8104eba5d2fa065ff8b030933 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 30 Aug 2015 00:16:00 -0700
Subject: [PATCH 1732/2016] prometheus-node-exporter: fold into go-packages.nix

---
 .../prometheus/node_exporter/default.nix      | 35 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 24 +++++++++++++
 3 files changed, 25 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/node_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
deleted file mode 100644
index 2aff12a42a4..00000000000
--- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-let self = buildGoPackage rec {
-  name = "prometheus-node-exporter-${rev}";
-  rev = "0.10.0";
-  goPackagePath = "github.com/prometheus/node_exporter";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "node_exporter";
-    inherit rev;
-    sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p";
-  };
-
-  buildInputs = [
-    go-runit
-    ntp
-    prometheus.client_golang
-    prometheus.client_model
-    prometheus.log
-    protobuf
-  ];
-
-  meta = with lib; {
-    description = "Prometheus exporter for machine metrics";
-    homepage = https://github.com/prometheus/node_exporter;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-};
-
-in self.bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a623ecb45a..11067e8ed35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9205,9 +9205,8 @@ let
   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-node-exporter =
-    callPackage ../servers/monitoring/prometheus/node_exporter { };
   prometheus-pushgateway =
     callPackage ../servers/monitoring/prometheus/pushgateway { };
   prometheus-statsd-bridge =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 50886200732..3a70e93db32 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2121,6 +2121,30 @@ let
     };
   };
 
+  prometheus.node-exporter = buildFromGitHub {
+    rev = "0.10.0";
+    owner = "prometheus";
+    repo = "node_exporter";
+    sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p";
+
+    buildInputs = [
+      go-runit
+      ntp
+      prometheus.client_golang
+      prometheus.client_model
+      prometheus.log
+      protobuf
+    ];
+
+    meta = with stdenv.lib; {
+      description = "Prometheus exporter for machine metrics";
+      homepage = https://github.com/prometheus/node_exporter;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.procfs = buildFromGitHub {
     rev    = "c91d8eefde16bd047416409eb56353ea84a186e4";
     date   = "2015-06-16";

From d17a29a15093ce80a1a0ad0aed0b4cce3fc5b220 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 30 Aug 2015 00:22:09 -0700
Subject: [PATCH 1733/2016] prometheus-pushgateway: fold into go-packages.nix

---
 .../prometheus/pushgateway/default.nix        | 55 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 40 ++++++++++++++
 3 files changed, 41 insertions(+), 57 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/pushgateway/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
deleted file mode 100644
index ee6d071a84c..00000000000
--- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-let self = buildGoPackage rec {
-  name = "prometheus-pushgateway-${rev}";
-  rev = "0.1.1";
-  goPackagePath = "github.com/prometheus/pushgateway";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "prometheus";
-    repo = "pushgateway";
-    sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230";
-  };
-
-  buildInputs = [
-    protobuf
-    httprouter
-    golang_protobuf_extensions
-    prometheus.client_golang
-  ];
-
-  nativeBuildInputs = [
-    go-bindata.bin
-  ];
-
-  buildFlagsArray = ''
-    -ldflags=
-        -X main.buildVersion=${rev}
-        -X main.buildRev=${rev}
-        -X main.buildBranch=master
-        -X main.buildUser=nix@nixpkgs
-        -X main.buildDate=20150101-00:00:00
-        -X main.goVersion=${lib.getVersion go}
-  '';
-
-  preBuild = ''
-  (
-    cd "go/src/$goPackagePath"
-    go-bindata ./resources/
-  )
-  '';
-
-  meta = with lib; {
-    description =
-      "Allows ephemeral and batch jobs to expose metrics to Prometheus";
-    homepage = https://github.com/prometheus/pushgateway;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-};
-
-in self.bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11067e8ed35..2dc120ac50e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9206,9 +9206,8 @@ let
   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-pushgateway =
-    callPackage ../servers/monitoring/prometheus/pushgateway { };
   prometheus-statsd-bridge =
     callPackage ../servers/monitoring/prometheus/statsd_bridge { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3a70e93db32..6dc6168a2a1 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2228,6 +2228,46 @@ let
     };
   };
 
+  prometheus.pushgateway = buildFromGitHub rec {
+    rev = "0.1.1";
+    owner = "prometheus";
+    repo = "pushgateway";
+    sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230";
+
+    buildInputs = [
+      protobuf
+      httprouter
+      golang_protobuf_extensions
+      prometheus.client_golang
+    ];
+
+    nativeBuildInputs = [ go-bindata.bin ];
+    preBuild = ''
+    (
+      cd "go/src/$goPackagePath"
+      go-bindata ./resources/
+    )
+    '';
+
+    buildFlagsArray = ''
+      -ldflags=
+          -X main.buildVersion=${rev}
+          -X main.buildRev=${rev}
+          -X main.buildBranch=master
+          -X main.buildUser=nix@nixpkgs
+          -X main.buildDate=20150101-00:00:00
+          -X main.goVersion=${stdenv.lib.getVersion go}
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Allows ephemeral and batch jobs to expose metrics to Prometheus";
+      homepage = https://github.com/prometheus/pushgateway;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   pty = buildFromGitHub {
     rev    = "67e2db24c831afa6c64fc17b4a143390674365ef";
     owner  = "kr";

From 395c268ab7528331a8260431dec276cafccad7dd Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 30 Aug 2015 00:26:10 -0700
Subject: [PATCH 1734/2016] prometheus-statsd-bridge: fold into go-packages.nix

---
 .../prometheus/statsd_bridge/default.nix      | 29 -------------------
 pkgs/top-level/all-packages.nix               |  4 +--
 pkgs/top-level/go-packages.nix                | 15 ++++++++++
 3 files changed, 16 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
deleted file mode 100644
index f4dea0b7580..00000000000
--- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-statsd-bridge-${version}";
-  version = "0.1.0";
-  goPackagePath = "github.com/prometheus/statsd_bridge";
-
-  src = fetchFromGitHub {
-    rev = version;
-    owner = "prometheus";
-    repo = "statsd_bridge";
-    sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr";
-  };
-
-  buildInputs = with goPackages; [
-    fsnotify.v0
-    prometheus.client_golang
-  ];
-
-  meta = with lib; {
-    description = "Receives StatsD-style metrics and exports them to Prometheus";
-    homepage = https://github.com/prometheus/statsd_bridge;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
-    platforms = platforms.unix;
-  };
-};
-
-in self.bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2dc120ac50e..4b138b84e6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9207,9 +9207,7 @@ let
   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 =
-    callPackage ../servers/monitoring/prometheus/statsd_bridge { };
+  prometheus-statsd-bridge = goPackages.prometheus.statsd-bridge.bin;
 
   psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 6dc6168a2a1..4c71c632a07 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2268,6 +2268,21 @@ let
     };
   };
 
+  prometheus.statsd-bridge = buildFromGitHub {
+    rev = "0.1.0";
+    owner = "prometheus";
+    repo = "statsd_bridge";
+    sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr";
+    buildInputs = [ fsnotify.v0 prometheus.client_golang ];
+    meta = with stdenv.lib; {
+      description = "Receives StatsD-style metrics and exports them to Prometheus";
+      homepage = https://github.com/prometheus/statsd_bridge;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   pty = buildFromGitHub {
     rev    = "67e2db24c831afa6c64fc17b4a143390674365ef";
     owner  = "kr";

From a51efdcb485ae211c6d7e029111a552c715fa2c0 Mon Sep 17 00:00:00 2001
From: hiberno <mail@elfsechsundzwanzig.de>
Date: Sun, 30 Aug 2015 09:54:21 +0200
Subject: [PATCH 1735/2016] rofi-pass: 1.0 -> 1.2

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

diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix
index 20f2bcc1700..7a8c9dfd71e 100644
--- a/pkgs/applications/misc/rofi/pass.nix
+++ b/pkgs/applications/misc/rofi/pass.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "rofi-pass-${version}";
-  version = "1.0";
+  version = "1.2";
 
   src = fetchgit {
     url = "https://github.com/carnager/rofi-pass";
     rev = "refs/tags/${version}";
-    sha256 = "16k7bj5mf5alfks8mylp549q3lmpbxjsrsgyj7gibdmhjz768jz3";
+    sha256 = "1dlaplr18qady5g8sp8xgiqdw81mfx9iisihf8appr5s4sjm559h";
   };
 
   buildInputs = [ rofi wmctrl xprop xdotool ];

From 46e51883d89818744500ddc3f800990ce3c1a0c6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 30 Aug 2015 09:55:29 +0200
Subject: [PATCH 1736/2016] scikit-learn: fix i686 build failures

Currently i686 builds fail because a couple of doctests fail.
The values are correct, but the dtype is missing.
This commit disables doctests.
---
 pkgs/top-level/python-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42db423a451..de04d810930 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12460,6 +12460,13 @@ let
     buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];
     propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ];
 
+    # doctests fail on i686
+    # https://github.com/NixOS/nixpkgs/issues/9472
+    # https://github.com/scikit-learn/scikit-learn/issues/5177
+    patchPhase = ''
+      substituteInPlace setup.cfg --replace 'with-doctest = 1' 'with-doctest = 0'
+    '';
+
     buildPhase = ''
       ${self.python.executable} setup.py build_ext -i --fcompiler='gnu95'
     '';

From 16b47aff4b6df31dcceb77078d09e8dbf702ad61 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 27 Aug 2015 22:58:44 -0500
Subject: [PATCH 1737/2016] nixpkgs: saw-tools 0.1-20150609 -> 0.1.1-20150731

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

diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
index 3231e2a7b80..eebe6ff0a06 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -14,17 +14,17 @@ let
   saw-bin =
     if stdenv.system == "i686-linux"
     then fetchurl {
-      url    = url + "/v0.1-dev/saw-0.1-dev-2015-06-09-CentOS6-32.tar.gz";
-      sha256 = "0hfb3a749fvwn33jnj1bgpk7v4pbvjjjffhafck6s8yz2sknnq4w";
+      url    = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-32.tar.gz";
+      sha256 = "126iag5nnvndi78c921z7vjrjfwcspn1hlxwwhzmqm4rvbhhr9v9";
     }
     else fetchurl {
-      url    = url + "/v0.1-dev/saw-0.1-dev-2015-06-09-CentOS6-64.tar.gz";
-      sha256 = "1yz56kr8s0jcrfk1i87x63ngxip2i1s123arydnqq8myjyfz8id9";
+      url    = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-64.tar.gz";
+      sha256 = "07gyf319v6ama6n1aj96403as04bixi8mbisfy7f7va689zklflr";
     };
 in
 stdenv.mkDerivation rec {
   name    = "saw-tools-${version}";
-  version = "0.1-20150609";
+  version = "0.1.1-20150731";
 
   src = saw-bin;
 

From 523cd395c711278cbb52b51d866474f548195843 Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Sun, 30 Aug 2015 11:47:25 +0300
Subject: [PATCH 1738/2016] cabal2nix: fixed sha256 hash

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

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index b1bd535c5fd..039f267fcee 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -12,7 +12,7 @@ mkDerivation rec {
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
     rev = "560fb2b1d22f4c995a526529bb034bd183e85a31";
-    sha256 = "0qaa0l23lc8677wvbgz327yvfg2pxxmvrxga6568ra5kgdy4204c";
+    sha256 = "1pyjy9kb8g18g6shlg7vnyaspa892zaq4hqvmqvdbxrlf24vg0wp";
     deepClone = true;
   };
   isLibrary = false;

From b2c3c58476aaa228269b1a9c70a3be695ffbed59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Aug 2015 12:49:45 +0200
Subject: [PATCH 1739/2016] cabal2nix: add myself as a maintainer

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

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 039f267fcee..eb0a7c5add9 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -52,4 +52,5 @@ mkDerivation rec {
   homepage = "http://github.com/NixOS/cabal2nix/";
   description = "Convert Cabal files into Nix build instructions";
   license = stdenv.lib.licenses.bsd3;
+  maintainers = with stdenv.lib.maintainers; [ simons ];
 }

From 29ee3ec8c42c497108f59b1ac41f6372c3208dda Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 30 Aug 2015 07:23:44 -0500
Subject: [PATCH 1740/2016] cantor: patch to fix filename string type

---
 .../0001-qalculate-filename-string-type.patch | 28 +++++++++++++++++++
 pkgs/applications/kde-apps-15.04/default.nix  |  4 +++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch

diff --git a/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch b/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch
new file mode 100644
index 00000000000..b2679b95a86
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch
@@ -0,0 +1,28 @@
+From 1a526e40ffc1d6cb050334e8641d8b90d9858a54 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 30 Aug 2015 07:05:03 -0500
+Subject: [PATCH] qalculate filename string type
+
+---
+ src/backends/qalculate/qalculateexpression.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/backends/qalculate/qalculateexpression.cpp b/src/backends/qalculate/qalculateexpression.cpp
+index 1891baa..b2a1984 100644
+--- a/src/backends/qalculate/qalculateexpression.cpp
++++ b/src/backends/qalculate/qalculateexpression.cpp
+@@ -771,9 +771,9 @@ void QalculateExpression::evaluatePlotCommand()
+ 	if (plotParameters.filetype == PLOT_FILETYPE_EPS ||
+ 	    plotParameters.filetype == PLOT_FILETYPE_PS  ||
+ 	    (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 4 &&
+-	     plotParameters.filename.substr(p-4,4) == QLatin1String(".eps")) ||
++	     plotParameters.filename.substr(p-4,4) == basic_string<char>(".eps")) ||
+ 	    (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 &&
+-	     plotParameters.filename.substr(p-3,3) == QLatin1String(".ps")))
++	     plotParameters.filename.substr(p-3,3) == basic_string<char>(".ps")))
+ 	    setResult(new Cantor::EpsResult(KUrl(plotParameters.filename.c_str())));
+ 	else
+ 	    setResult(new Cantor::ImageResult(KUrl(plotParameters.filename.c_str())));
+-- 
+2.5.0
+
diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 5c36b735338..83aca36bc00 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -223,6 +223,10 @@ let
         '';
       };
 
+      cantor = extendDerivation (kde4Package super.cantor) {
+        patches = [ ./cantor/0001-qalculate-filename-string-type.patch ];
+      };
+
       cervisia = kde4Package super.cervisia;
 
       dolphin-plugins = kde4Package super.dolphin-plugins;

From 78f17205320cb8e508faae1c1dc0ad215fe4d137 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Aug 2015 15:18:15 +0200
Subject: [PATCH 1741/2016] haskell-lib: make sdistTarball and buildStrictly
 functions fuzzier to cope with Hydra builds

In Hydra CI environments, the version strings we get from Hydra don't
necessarily match those hard-coded into the Cabal files. To make those builds
succeed anyway, we have to apply some pattern matching.
---
 pkgs/development/haskell-modules/lib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 5b2ba44d86d..635fc317b28 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -66,7 +66,7 @@ rec {
     buildPhase = "./Setup sdist";
     haddockPhase = ":";
     checkPhase = ":";
-    installPhase = "install -D dist/${drv.pname}-${drv.version}.tar.gz $out/${drv.pname}-${drv.version}.tar.gz";
+    installPhase = "install -D dist/${drv.pname}-*.tar.gz $out/${drv.pname}-${drv.version}.tar.gz";
     fixupPhase = ":";
   });
 
@@ -74,7 +74,7 @@ rec {
     unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in ''
       echo "Source tarball is at ${src}/${tarname}.tar.gz"
       tar xf ${src}/${tarname}.tar.gz
-      cd ${tarname}
+      cd ${pkg.pname}-*
     '';
   });
 

From 875f660481e992ff967621fb1f98d8a8bc1f3415 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 30 Aug 2015 08:33:44 -0500
Subject: [PATCH 1742/2016] wrapFirefox: remove (broken) sed trick

This sed trick to set argv[0] is made obsolete by c234f37, which sets
argv[0] correctly anyway.
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 409f7d29ba2..db51dc8b148 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -47,7 +47,6 @@ stdenv.mkDerivation {
 
     ${ lib.optionalString libtrick
     ''
-    sed -e "s@exec @exec -a '$out/bin/${browserName}${nameSuffix}' @" -i "$out/bin/${browserName}${nameSuffix}"
     libdirname="$(echo "${browser}/lib/${browserName}"*)"
     libdirbasename="$(basename "$libdirname")"
     mkdir -p "$out/lib/$libdirbasename"

From 4b522294c87b22b50f1b6597a9761b9085745d99 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 30 Aug 2015 16:05:57 +0200
Subject: [PATCH 1743/2016] bleujeans: fix hanging on connect screen

---
 .../networking/browsers/mozilla-plugins/bluejeans/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index c61b0e8a70c..65f9ef50f77 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, xorg, gtk, glib, gdk_pixbuf, dpkg, libXext, libXfixes
-, libXrender, libuuid, libXrandr, libXcomposite
+, libXrender, libuuid, libXrandr, libXcomposite, libpulseaudio
 }:
 
 with stdenv.lib;
@@ -10,7 +10,7 @@ let
     [gtk glib stdenv.cc.cc];
 
   rpathPlugin = makeLibraryPath
-    [ stdenv.cc.cc gtk glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libuuid libXcomposite ];
+    [ stdenv.cc.cc gtk glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libuuid libXcomposite libpulseaudio ];
 
 in
 

From 7eb5b00d820f7c429cacfeaa0866c8034bb2185e Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sun, 30 Aug 2015 14:18:47 +0000
Subject: [PATCH 1744/2016] conky: 1.9.0 -> 1.10.0

---
 pkgs/os-specific/linux/conky/default.nix | 80 +++++++++---------------
 1 file changed, 31 insertions(+), 49 deletions(-)

diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index c54d4aa6319..60bfe093017 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig
+{ stdenv, fetchFromGitHub, pkgconfig, cmake
 
 # dependencies
 , glib
@@ -7,23 +7,17 @@
 , mpdSupport          ? true
 , ibmSupport          ? true # IBM/Lenovo notebooks
 
-# This should be optional, but it is not due to a bug in conky
-# Please, try to make it optional again on update
-, ncurses
-#, ncursesSupport      ? true      , ncurses       ? null
-
 # optional features with extra dependencies
+, ncursesSupport      ? true      , ncurses       ? null
 , x11Support          ? true      , x11           ? null
 , xdamageSupport      ? x11Support, libXdamage    ? null
 , imlib2Support       ? x11Support, imlib2        ? null
-, luaSupport          ? true      , lua           ? null
 
+, luaSupport          ? true      , lua           ? null
 , luaImlib2Support    ? luaSupport && imlib2Support
 , luaCairoSupport     ? luaSupport && x11Support, cairo ? null
 , toluapp ? null
 
-, alsaSupport         ? true      , alsaLib       ? null
-
 , wirelessSupport     ? true      , wirelesstools ? null
 
 , curlSupport         ? true      , curl ? null
@@ -33,7 +27,7 @@
 , libxml2 ? null
 }:
 
-#assert ncursesSupport      -> ncurses != null;
+assert ncursesSupport      -> ncurses != null;
 
 assert x11Support          -> x11 != null;
 assert xdamageSupport      -> x11Support && libXdamage != null;
@@ -46,8 +40,6 @@ assert luaCairoSupport     -> luaSupport && toluapp != null
 assert luaCairoSupport || luaImlib2Support
                            -> lua.luaversion == "5.1";
 
-assert alsaSupport         -> alsaLib != null;
-
 assert wirelessSupport     -> wirelesstools != null;
 
 assert curlSupport         -> curl != null;
@@ -58,62 +50,52 @@ assert weatherXoapSupport  -> curlSupport && libxml2 != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "conky-1.9.0";
+  name = "conky-${version}";
+  version = "1.10.0";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/conky/${name}.tar.bz2";
-    sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds";
+  src = fetchFromGitHub {
+    owner = "brndnmtthws";
+    repo = "conky";
+    rev = "v${version}";
+    sha256 = "00vyrf72l54j3majqmn6vykqvvb15vygsaby644nsb5vpma6b1cn";
   };
 
   NIX_LDFLAGS = "-lgcc_s";
 
-  buildInputs = [ pkgconfig glib ]
-    ++ [ ncurses ]
-    #++ optional  ncursesSupport     ncurses
+  buildInputs = [ pkgconfig glib cmake ]
+    ++ optional  ncursesSupport     ncurses
     ++ optional  x11Support         x11
     ++ optional  xdamageSupport     libXdamage
     ++ optional  imlib2Support      imlib2
     ++ optional  luaSupport         lua
     ++ optionals luaImlib2Support   [ toluapp imlib2 ]
     ++ optionals luaCairoSupport    [ toluapp cairo ]
-
-    ++ optional  alsaSupport        alsaLib
-
     ++ optional  wirelessSupport    wirelesstools
-
     ++ optional  curlSupport        curl
     ++ optional  rssSupport         libxml2
     ++ optional  weatherXoapSupport libxml2
     ;
 
-  configureFlags =
-    let flag = state: flags: if state then map (x: "--enable-${x}")  flags
-                                      else map (x: "--disable-${x}") flags;
-     in flag mpdSupport          [ "mpd" ]
-     ++ flag ibmSupport          [ "ibm" ]
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]
+    ++ optional curlSupport         "-DBUILD_CURL=ON"
+    ++ optional (!ibmSupport)       "-DBUILD_IBM=OFF"
+    ++ optional imlib2Support       "-DBUILD_IMLIB2=ON"
+    ++ optional luaCairoSupport     "-DBUILD_LUA_CAIRO=ON"
+    ++ optional luaImlib2Support    "-DBUILD_LUA_IMLIB2=ON"
+    ++ optional (!mpdSupport)       "-DBUILD_MPD=OFF"
+    ++ optional (!ncursesSupport)   "-DBUILD_NCURSES=OFF"
+    ++ optional rssSupport          "-DBUILD_RSS=ON"
+    ++ optional (!x11Support)       "-DBUILD_X11=OFF"
+    ++ optional xdamageSupport      "-DBUILD_XDAMAGE=ON"
+    ++ optional weatherMetarSupport "-DBUILD_WEATHER_METAR=ON"
+    ++ optional weatherXoapSupport  "-DBUILD_WEATHER_XOAP=ON"
+    ++ optional wirelessSupport     "-DBUILD_WLAN=ON"
+    ;
 
-     #++ flag ncursesSupport      [ "ncurses" ]
-     ++ flag x11Support          [ "x11" "xft" "argb" "double-buffer" "own-window" ] # conky won't compile without --enable-own-window
-     ++ flag xdamageSupport      [ "xdamage" ]
-     ++ flag imlib2Support       [ "imlib2" ]
-     ++ flag luaSupport          [ "lua" ]
-     ++ flag luaImlib2Support    [ "lua-imlib2" ]
-     ++ flag luaCairoSupport     [ "lua-cairo" ]
-
-     ++ flag alsaSupport         [ "alsa" ]
-
-     ++ flag wirelessSupport     [ "wlan" ]
-
-     ++ flag curlSupport         [ "curl" ]
-     ++ flag rssSupport          [ "rss" ]
-     ++ flag weatherMetarSupport [ "weather-metar" ]
-     ++ flag weatherXoapSupport  [ "weather-xoap" ]
-     ;
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://conky.sourceforge.net/;
     description = "Advanced, highly configurable system monitor based on torsmo";
-    maintainers = [ stdenv.lib.maintainers.guibert ];
-    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = [ maintainers.guibert ];
+    license = licenses.gpl3Plus;
   };
 }

From 6e58e2307a7984ad8a43eef515472a05661f63b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 30 Aug 2015 17:37:36 +0200
Subject: [PATCH 1745/2016] xf86_input_wacom: update from 0.30.0 to 0.31.0

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

diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index 9e475f7aed9..fca9dab2261 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -3,11 +3,11 @@
 , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
 
 stdenv.mkDerivation rec {
-  name = "xf86-input-wacom-0.30.0";
+  name = "xf86-input-wacom-0.31.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
-    sha256 = "1xa1i2ks00fa20c5dlpqzlapzj638a7qm5c0wqc3qvgwliwy9m4a";
+    sha256 = "0xiz5vpkp8zm5m2k909sbvm9v8rf6hwn3gvqr2msswc00hzp5sg7";
   };
 
   buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender

From e67a0119e22f472f1001d58ff6b1c99afa401173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 30 Aug 2015 17:38:03 +0200
Subject: [PATCH 1746/2016] kde4.digikam: update from 4.11.0 to 4.12.0

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

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index cfc15ed87bf..b07b889ca13 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-4.11.0";
+  name = "digikam-4.12.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
-    sha256 = "1nak3w0717fpbpmklzd3xkkbp2mwi44yxnc789wzmi9d8z9n3jwh";
+    sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m";
   };
 
   nativeBuildInputs = [ cmake automoc4 pkgconfig ];

From 23a00d212f91288ee34b0b403f8aa9bd933ac092 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Sun, 30 Aug 2015 23:38:15 +0800
Subject: [PATCH 1747/2016] doc/haskell: fix typos (close #9561)

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

diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml
index 35eac42e0cf..803efbab695 100644
--- a/doc/haskell-users-guide.xml
+++ b/doc/haskell-users-guide.xml
@@ -95,7 +95,7 @@ $ nix-env -qaP coreutils
 nixos.coreutils  coreutils-8.23
 </programlisting>
   <para>
-    If your system responds like that (most NixOS installatios will),
+    If your system responds like that (most NixOS installations will),
     then the attribute path to <literal>haskellPackages</literal> is
     <literal>nixos.haskellPackages</literal>. Thus, if you want to
     use <literal>nix-env</literal> without giving an explicit
@@ -812,7 +812,7 @@ export NIX_CFLAGS_LINK=&quot;-L/usr/lib&quot;
           <para>
             <link xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2015-April/016912.html">Part
             3</link> describes the infrastructure that keeps the
-            Haskell package set in Nixpkgs uptodate.
+            Haskell package set in Nixpkgs up-to-date.
           </para>
         </listitem>
       </itemizedlist>

From 2517975cac2aa8f3ee5b2ccfb2dbd4c75b533a96 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sun, 30 Aug 2015 16:45:50 +0000
Subject: [PATCH 1748/2016] mediainfo: 0.7.75 -> 0.7.76

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

diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index c9792f3a2af..4a5fffe533d 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.75";
+  version = "0.7.76";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "1xdsy5z7x7bd251m26h5hcwcmgl6gklxj6h9q025mlnfmcs7pbdy";
+    sha256 = "14vy2a9bjjwxyk8zh0ysin8fb1lj9yz17yd82vxrp1zvxsgyg5ck";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   sourceRoot = "./MediaInfo/Project/GNU/CLI/";
 
   configureFlags = [ "--with-libmediainfo=${libmediainfo}" ];
-  preConfigure = "sh autogen";
+  preConfigure = "sh autogen.sh";
 
   meta = {
     description = "Supplies technical and tag information about a video or audio file";

From 2c5e423a7765f3c5236ff473a7919418db6fcc87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 30 Aug 2015 19:02:09 +0200
Subject: [PATCH 1749/2016] calf: fix src URL
 (sourceforge->calf-studio-gear.org)

---
 pkgs/applications/audio/calf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index 5f6538ec4bc..4ba086d8848 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.0.60";
 
   src = fetchurl {
-    url = "mirror://sourceforge/calf/${name}.tar.gz";
+    url = "http://calf-studio-gear.org/files/${name}.tar.gz";
     sha256 = "019fwg00jv217a5r767z7szh7vdrarybac0pr2sk26xp81kibrx9";
   };
 

From d4fc051c0691255ad091a32a08c21c7682f240ee Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 30 Aug 2015 10:55:06 -0700
Subject: [PATCH 1750/2016] jemalloc: 3.6.0 -> 4.0.0

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

diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index b08f5b7dd76..d40cdf75ad1 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "jemalloc-3.6.0";
+  name = "jemalloc-4.0.0";
 
   src = fetchurl {
     url = "http://www.canonware.com/download/jemalloc/${name}.tar.bz2";
-    sha256 = "1zl4vxxjvhg72bdl53sl0idz9wp18c6yzjdmqcnwm09wvmcj2v71";
+    sha256 = "1wiydkp8a4adwsgfsd688hpv2z7hjv5manhckchk96v6qdsbqk91";
   };
 
   meta = with stdenv.lib; {

From b3d5a11b5bb976abf3afcfa8de6c2764a1890290 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 30 Aug 2015 10:55:25 -0700
Subject: [PATCH 1751/2016] lmbd: 0.9.15 -> 0.9.16

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

diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index fbf817dd873..02c07a78acb 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lmdb-${version}";
-  version = "0.9.15";
+  version = "0.9.16";
 
   src = fetchzip {
     url = "https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz";
-    sha256 = "0p79fpyh1yx2jg1f0kag5zsdn4spkgs1j3dxibvqdy32wkbpxd0g";
+    sha256 = "1lkmngscijwiz09gdkqygdp87x55vp8gb4fh4vq7s34k4jv0327l";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";

From dc506110c10d2308bfb87b6bf1f45d86f5e3e2e1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 30 Aug 2015 10:55:57 -0700
Subject: [PATCH 1752/2016] nvidia: 352.30 -> 352.41

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index cbd9a19777e..1f581eb6de9 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
 
 let
 
-  versionNumber = "352.30";
+  versionNumber = "352.41";
 
   # Policy: use the highest stable version as the default (on our master).
   inherit (stdenv.lib) makeLibraryPath;
@@ -28,12 +28,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "1qrjvf41zk50hw7gjiwg9jxwgpaarlwm019py4wfqgjgb1cbhgjn";
+        sha256 = "1qzn6dhkrpkx015f7y9adafn7fmz7zbxbczzf9930li8pgvmmz5k";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "1h7ghmykhdyy3n853s8yjzc0qbh50qb2kc0khz672b1rna4wqyhg";
+        sha256 = "1k9hmmn5x9snzyggx23km64kjdqjh2kva090ha6mlayyyxrclz56";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From 0210ecab706fc7051f9e236c69d61d28072826e8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 30 Aug 2015 10:56:15 -0700
Subject: [PATCH 1753/2016] ceph-git: 2015-08-18 -> 2015-08-29

---
 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 77d0352f670..c5614506901 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-08-18";
+  version = "2015-08-29";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "cf8a360cd1e3937aa1ac74fbf39790b7fb43e71f";
-    sha256 = "0d8vlxap800x8gil16124nb4yvfqb5wa3pk09knrikmmwia49k9v";
+    rev = "54626351679fe312d5b96cc0304755ae5f1ece40";
+    sha256 = "12rdp1q7arxhg259y08pzix22yjlrjs5qmwv342qcl5xbfkg502r";
   };
 
   patches = [ ./fix-pythonpath.patch ];

From d96b30f5b03450a665abe546a0603288b9a588de Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 30 Aug 2015 10:56:41 -0700
Subject: [PATCH 1754/2016] dos2unix: 7.2.2 -> 7.3

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

diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index 30b546361f2..f215c635de5 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "dos2unix-7.2.2";
+  name = "dos2unix-7.3";
   
   src = fetchurl {
     url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz";
-    sha256 = "04i6kkl6l1vp1b81i0wncixwyab2dzmh7vp1cvma8zr6jrr908ww";
+    sha256 = "1la496gpc7b1vka36bs54pf85jfbwa6fdplgj6lamvbj59azfxc1";
   };
 
   configurePhase = ''

From ba8b70bd548cc5dd3c8cccda2de1872bca6f5b4c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 30 Aug 2015 10:56:57 -0700
Subject: [PATCH 1755/2016] etcd: 2.1.1 -> 2.1.2

---
 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 4c71c632a07..f8c7bd00eb0 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -561,10 +561,10 @@ let
   };
 
   etcd = buildFromGitHub {
-    rev    = "v2.1.1";
+    rev    = "v2.1.2";
     owner  = "coreos";
     repo   = "etcd";
-    sha256 = "0jd97091jwwdvx50vbdi1py9v5w9fk86cw85p0zinb0ww6bs4y0s";
+    sha256 = "1d3wl9rqbhkkdhfkjfrzjfcwz8hx315zbjbmij3pf62bc1p5nh60";
   };
 
   fsnotify.v0 = buildGoPackage rec {

From d3723b300e9f0d1c33c3cff0138d3dbaa55321c1 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sun, 30 Aug 2015 18:34:10 +0000
Subject: [PATCH 1756/2016] beets: 1.3.13 -> 1.3.14

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

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 0af0b427bf2..8c693d9145f 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -44,7 +44,7 @@ let
   pluginsWithoutDeps = [
     "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart"
     "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate"
-    "importadded" "importfeeds" "info" "inline" "keyfinder" "lyrics"
+    "importadded" "importfeeds" "info" "inline" "ipfs" "keyfinder" "lyrics"
     "mbcollection" "mbsync" "metasync" "missing" "permissions" "play"
     "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the"
     "types" "zero"
@@ -60,14 +60,14 @@ let
 
 in buildPythonPackage rec {
   name = "beets-${version}";
-  version = "1.3.13";
+  version = "1.3.14";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "sampsyo";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "05gnp0y3n1jl7fnyslx56x2lsp8f4mv3xwy7gbyghax0vs3ccfvl";
+    sha256 = "0bha101x1wdrl2hj31fhixm3hp7ahdm2064b9k5gg0ywm651128g";
   };
 
   propagatedBuildInputs = [

From e7a024abc4ff928ab56b059a36eba7da98579ad9 Mon Sep 17 00:00:00 2001
From: Andreas Wagner <andreas.wagner@lowfatcomputing.org>
Date: Sat, 29 Aug 2015 13:27:52 -0400
Subject: [PATCH 1757/2016] urjtag: init at 0.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: make the function argument lines occupy less vertical space.]
---
 lib/maintainers.nix                |  1 +
 pkgs/tools/misc/urjtag/default.nix | 38 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  5 ++++
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/tools/misc/urjtag/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4ad066b7599..ccce0d2e60d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -152,6 +152,7 @@
   linus = "Linus Arver <linusarver@gmail.com>";
   lnl7 = "Daiderd Jordan <daiderd@gmail.com>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
+  lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>";
   lsix = "Lancelot SIX <lsix@lancelotsix.com>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
new file mode 100644
index 00000000000..589f7d9a94b
--- /dev/null
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison
+, flex, fetchgit, makeWrapper
+, jedecSupport ? false
+, pythonBindings ? false
+, python3 ? null
+}:
+
+stdenv.mkDerivation rec {
+  version = "0.10";
+  name = "urjtag-${version}";
+
+  src = fetchgit {
+    url = "git://git.code.sf.net/p/urjtag/git";
+    rev = "7ba12da7845af7601e014a2a107670edc5d6997d";
+    sha256 = "834401d851728c48f1c055d24dc83b6173c701bf352d3a964ec7ff1aff3abf6a";
+  };
+
+  buildInputs = [ gettext pkgconfig autoconf automake libtool makeWrapper ]
+    ++ stdenv.lib.optional pythonBindings python3;
+
+  configureFlags = ''
+    --prefix=/
+    ${if jedecSupport then "--enable-jedec-exp" else "--disable-jedec-exp"}
+    ${if pythonBindings then "--enable-python" else "--disable-python"}
+  '';
+  preConfigure = "cd urjtag; ./autogen.sh";
+
+  makeFlags = [ "DESTDIR=$(out)" ];
+
+  meta = {
+    description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more";
+    homepage = "http://urjtag.org/";
+    license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b138b84e6a..45fc09317d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3454,6 +3454,11 @@ let
 
   uptimed = callPackage ../tools/system/uptimed { };
 
+  urjtag = callPackage ../tools/misc/urjtag {
+    jedecSupport = true;
+    pythonBindings = true;
+  };
+
   urlwatch = callPackage ../tools/networking/urlwatch { };
 
   varnish = callPackage ../servers/varnish { };

From e9ad37e231987d2834f4ba6c83375d424e574218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 9 Aug 2015 16:54:50 +0200
Subject: [PATCH 1758/2016] gnuradio: rename *-wrapper and *-full attributes to
 *-with-packages

Having both *-wrapper and *-full attribute names is rather confusing
(what's the difference?). And further, both packages are named
gnuradio-with-packages:

  $ nix-env -f. -qaP ".*gnuradio.*"
  gnuradio          gnuradio-3.7.7.1
  gnuradio-osmosdr  gnuradio-osmosdr-0.1.4
  gnuradio-full     gnuradio-with-packages-3.7.7.1
  gnuradio-wrapper  gnuradio-with-packages-3.7.7.1

Get rid of *-wrapper and rename *-full to *-with-packages, to align it
with the package name.

Now:

  $ nix-env -f. -qaP ".*gnuradio.*"
  gnuradio                gnuradio-3.7.7.1
  gnuradio-osmosdr        gnuradio-osmosdr-0.1.4
  gnuradio-with-packages  gnuradio-with-packages-3.7.7.1

And you can customize the *-with-packages variant like this:

  gnuradio-with-packages.override { extraPackages = [...]; }
---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45fc09317d7..6d42fab6ad3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11407,9 +11407,7 @@ let
     fftw = fftwFloat;
   };
 
-  gnuradio-wrapper = callPackage ../applications/misc/gnuradio/wrapper.nix { };
-
-  gnuradio-full = gnuradio-wrapper.override {
+  gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix {
     extraPackages = [ gnuradio-osmosdr ];
   };
 

From b4215fdda5dfc99842149623ca1060827209eefd Mon Sep 17 00:00:00 2001
From: Nicolas Barbey <nicolas.a.barbey@gmail.com>
Date: Sun, 30 Aug 2015 12:15:06 +0200
Subject: [PATCH 1759/2016] fuseiso: init at 20070708

---
 pkgs/tools/filesystems/fuseiso/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/filesystems/fuseiso/default.nix

diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix
new file mode 100644
index 00000000000..161425ad137
--- /dev/null
+++ b/pkgs/tools/filesystems/fuseiso/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, fuse, zlib, glib }:
+
+stdenv.mkDerivation rec {
+  name = "fuseiso-20070708";
+
+  src = fetchurl {
+    url = "http://sourceforge.net/projects/fuseiso/files/fuseiso/20070708/fuseiso-20070708.tar.bz2";
+    sha1 = "fe142556ad35dd7e5dc31a16183232a6e2da7692";  
+  };
+
+  buildInputs = [ pkgconfig fuse zlib glib ];
+
+  meta = {
+    homepage = http://sourceforge.net/projects/fuseiso;
+    description = "FUSE module to mount ISO filesystem images";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b138b84e6a..783caa9f1f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1574,6 +1574,8 @@ let
 
   fsfs = callPackage ../tools/filesystems/fsfs { };
 
+  fuseiso = callPackage ../tools/filesystems/fuseiso { };
+
   fuse_zip = callPackage ../tools/filesystems/fuse-zip { };
 
   fuse_exfat = callPackage ../tools/filesystems/fuse-exfat { };

From 25f19c2725a4eb1b29630dfea63b9c56f91a4b51 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sun, 30 Aug 2015 16:11:21 +0200
Subject: [PATCH 1760/2016] vimPlugins: replace unmaintained vim-golang with
 vim-go

---
 pkgs/misc/vim-plugins/default.nix      | 22 +++++++++++-----------
 pkgs/misc/vim-plugins/vim-plugin-names |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index f24058a468e..e57d498411e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -420,6 +420,17 @@ rec {
 
   };
 
+  vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-go-2015-08-12";
+    src = fetchgit {
+      url = "git://github.com/fatih/vim-go";
+      rev = "5048bdbebcffb296aa60b4c21c44ae8276244539";
+      sha256 = "1k9r6zdlb553d8zhhswbjph4fa6n17qdvc8zz0cix6h2lw9dr9mj";
+    };
+    dependencies = [];
+
+  };
+
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "idris-vim-2015-08-14";
     src = fetchgit {
@@ -508,17 +519,6 @@ rec {
 
   };
 
-  vim-golang = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-golang-2014-08-06";
-    src = fetchgit {
-      url = "git://github.com/jnwhiteh/vim-golang";
-      rev = "e6d0c6a72a66af2674b96233c4747661e0f47a8c";
-      sha256 = "1231a2eff780dbff4f885fcb4f656f7dd70597e1037ca800470de03bf0c5e7af";
-    };
-    dependencies = [];
-
-  };
-
   vim-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-xdebug-2012-08-15";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index d6b731783d1..5123e5a72b6 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -29,6 +29,7 @@
 "github:christoomey/vim-tmux-navigator"
 "github:eagletmt/neco-ghc"
 "github:esneider/YUNOcommit.vim"
+"github:fatih/vim-go"
 "github:idris-hackers/idris-vim"
 "github:itchyny/calendar.vim"
 "github:itchyny/thumbnail.vim"
@@ -37,7 +38,6 @@
 "github:jeetsukumaran/vim-buffergator"
 "github:jgdavey/tslime.vim"
 "github:jistr/vim-nerdtree-tabs"
-"github:jnwhiteh/vim-golang"
 "github:joonty/vim-xdebug"
 "github:justincampbell/vim-eighties"
 "github:latex-box-team/latex-box"

From 83b5a75d9464efc102ea574ba1e4f14eada69b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 31 Aug 2015 00:07:36 +0200
Subject: [PATCH 1761/2016] nettle27: remove uneeded package superseeded by 3.x
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b4b6b914c45061b403e1d0db2858f44d7776e65e)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/development/libraries/nettle/27.nix | 10 ----------
 pkgs/top-level/all-packages.nix          |  1 -
 2 files changed, 11 deletions(-)
 delete mode 100644 pkgs/development/libraries/nettle/27.nix

diff --git a/pkgs/development/libraries/nettle/27.nix b/pkgs/development/libraries/nettle/27.nix
deleted file mode 100644
index fc85f5eb9de..00000000000
--- a/pkgs/development/libraries/nettle/27.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "2.7.1";
-
-  src = fetchurl {
-    url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
-    sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw";
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b381e2503fb..00e8d79a354 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7711,7 +7711,6 @@ let
 
   nethack = callPackage ../games/nethack { };
 
-  nettle27 = callPackage ../development/libraries/nettle/27.nix { };
   nettle = callPackage ../development/libraries/nettle { };
 
   newt = callPackage ../development/libraries/newt { };

From cd142cea4f80858bc1e935c1e00ae860c425052b Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 28 Aug 2015 19:32:11 -0700
Subject: [PATCH 1762/2016] vimPlugins.unite: Init at 2015-08-29

unite works nicely together with vimshell.
---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index e57d498411e..8799ff867c1 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1089,6 +1089,17 @@ rec {
 
   };
 
+  unite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "unite-2015-08-29";
+    src = fetchgit {
+      url = "git://github.com/shougo/unite.vim";
+      rev = "7e1152d8fec124a07c7ea953b792dec3816a97f8";
+      sha256 = "8284ad86ac3fa130a96618292da2a49421d726174a329b32a8d9fd020b8cfc8b";
+    };
+    dependencies = [];
+
+  };
+
   vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-actions-2014-09-22";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 5123e5a72b6..50688011aa4 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -51,6 +51,7 @@
 "github:shougo/neocomplete.vim"
 "github:shougo/neosnippet-snippets"
 "github:shougo/neosnippet.vim"
+"github:shuogo/unite.vim"
 "github:shougo/vimproc.vim"
 "github:shougo/vimshell.vim"
 "github:takac/vim-hardtime"

From 721dc5164059f235e073d11f8a1e6e1d225be9e4 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Fri, 28 Aug 2015 20:36:46 +0000
Subject: [PATCH 1763/2016] telegram-cli: keep arguments passed to the wrapper

Also break long lines
---
 .../instant-messengers/telegram-cli/default.nix       | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
index 99366da2c84..b5bd22f8877 100644
--- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchgit, libconfig, lua5_2, openssl, readline, zlib
-, libevent, pkgconfig, python, jansson, bash
+{ stdenv, fetchgit, bash, libconfig, libevent, openssl,
+  readline, zlib, lua5_2, python, pkgconfig, jansson
 }:
 
 stdenv.mkDerivation rec {
@@ -11,14 +11,17 @@ stdenv.mkDerivation rec {
     rev = "2052f4b381337d75e783facdbfad56b04dec1a9c";
   };
 
-  buildInputs = [ libconfig lua5_2 openssl readline zlib libevent pkgconfig python jansson ];
+  buildInputs = [
+    libconfig libevent openssl readline zlib
+    lua5_2 python pkgconfig jansson
+  ];
   installPhase = ''
     mkdir -p $out/bin
     cp ./bin/telegram-cli $out/bin/telegram-wo-key
     cp ./tg-server.pub $out/
     cat > $out/bin/telegram-cli <<EOF
     #!${bash}/bin/sh
-    $out/bin/telegram-wo-key -k $out/tg-server.pub
+    $out/bin/telegram-wo-key -k $out/tg-server.pub "\$@"
     EOF
     chmod +x $out/bin/telegram-cli
   '';

From 8e26a55dc4e91b6590b6f616c0db1f22bef88b89 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 30 Aug 2015 18:20:19 -0700
Subject: [PATCH 1764/2016] linux: Add 4.2.0

---
 pkgs/os-specific/linux/kernel/linux-4.2.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 13 ++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-4.2.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix
new file mode 100644
index 00000000000..fc44c6f1dbb
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.2";
+  modDirVersion = "4.2.0";
+  extraMeta.branch = "4.2";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "1syv8n5hwzdbx69rsj4vayyzskfq1w5laalg5jjd523my52f086g";
+  };
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00e8d79a354..b6f7af7d438 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9782,6 +9782,16 @@ let
       ];
   };
 
+  linux_4_2 = makeOverridable (import ../os-specific/linux/kernel/linux-4.2.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = [ kernelPatches.bridge_stp_helper ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) {
     inherit fetchurl stdenv perl buildLinux;
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
@@ -9947,7 +9957,7 @@ let
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = pkgs.linuxPackages_4_1;
+  linuxPackages_latest = pkgs.linuxPackages_4_2;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -9959,6 +9969,7 @@ let
   linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18);
   linuxPackages_4_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_0 linuxPackages_4_0);
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1);
+  linuxPackages_4_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_2 linuxPackages_4_2);
   linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
   linuxPackages_custom = {version, src, configfile}:
                            let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile;

From cf3e2a5f5bc60d4c1260f50f73be3990bef2c2d5 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Sun, 30 Aug 2015 21:46:09 -0400
Subject: [PATCH 1765/2016] haskell-lucid: disable tests

They buggily make assumptions about the order in which strings appear
in a hash table and thereby fail on i686-linux. See
http://hydra.nixos.org/build/25132604/log/raw and
https://github.com/chrisdone/lucid/issues/25
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e107e0b1458..fa3b738ddc4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -430,6 +430,7 @@ self: super: {
   language-slice = dontCheck super.language-slice;
   lensref = dontCheck super.lensref;
   liquidhaskell = dontCheck super.liquidhaskell;
+  lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25
   lvmrun = dontCheck super.lvmrun;
   memcache = dontCheck super.memcache;
   milena = dontCheck super.milena;

From 76a497c95e64de317fcd6fd31fc9d4c71ccc3f69 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Sun, 30 Aug 2015 22:19:36 -0400
Subject: [PATCH 1766/2016] haskell-comonad: re-enable tests

https://github.com/ekmett/comonad/issues/25 is fixed now and they
work again.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e107e0b1458..9d4ef0a4a98 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -818,9 +818,6 @@ self: super: {
   # FPCO's fork of Cabal won't succeed its test suite.
   Cabal-ide-backend = dontCheck super.Cabal-ide-backend;
 
-  # https://github.com/ekmett/comonad/issues/25
-  comonad = dontCheck super.comonad;
-
   # https://github.com/jaspervdj/websockets/issues/104
   websockets = dontCheck super.websockets;
 

From 5056267761c6f6163645a8eea5db483e560c4e0a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 31 Aug 2015 00:08:33 -0700
Subject: [PATCH 1767/2016] nvidia: Add 4.2 patch

---
 pkgs/os-specific/linux/nvidia-x11/default.nix |  2 ++
 .../linux/nvidia-x11/nvidia-4.2.patch         | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 1f581eb6de9..953c8c60125 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -37,6 +37,8 @@ stdenv.mkDerivation {
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
+  patches = [ ./nvidia-4.2.patch ];
+
   inherit versionNumber libsOnly;
   inherit (stdenv) system;
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch
new file mode 100644
index 00000000000..412b786179a
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch
@@ -0,0 +1,26 @@
+diff --git a/kernel/nv-frontend.c b/kernel/nv-frontend.c
+index 65bbb1b..be39c8d 100644
+--- a/kernel/nv-frontend.c
++++ b/kernel/nv-frontend.c
+@@ -15,7 +15,7 @@
+ #include "nv-frontend.h"
+ 
+ #if defined(MODULE_LICENSE)
+-MODULE_LICENSE("NVIDIA");
++MODULE_LICENSE("GPL\0NVIDIA");
+ #endif
+ #if defined(MODULE_INFO)
+ MODULE_INFO(supported, "external");
+diff --git a/kernel/nv.c b/kernel/nv.c
+index abe81ed..05945b5 100644
+--- a/kernel/nv.c
++++ b/kernel/nv.c
+@@ -31,7 +31,7 @@
+ 
+ #if defined(NV_VMWARE) || (NV_BUILD_MODULE_INSTANCES != 0)
+ #if defined(MODULE_LICENSE)
+-MODULE_LICENSE("NVIDIA");
++MODULE_LICENSE("GPL\0NVIDIA");
+ #endif
+ #if defined(MODULE_INFO)
+ MODULE_INFO(supported, "external");

From bdbe9fc17282bb1b29dfac34286e5e68739b4418 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 31 Aug 2015 00:09:02 -0700
Subject: [PATCH 1768/2016] spl_git: 2015-07-21 -> 2015-08-25

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

diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix
index 9faba199a5d..216ea1fbbcd 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-07-21";
+  version = "2015-08-25";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "spl";
-    rev = "9eb361aaa537724c9a90ab6a9f33521bfd80bad9";
-    sha256 = "18sv4mw85fbm8i1s8k4y5dc43l6ll2f6hgfrawvzgvwni5i4h7n8";
+    rev = "ae89cf0f34de323c4a7c39bfd9b906acc2635a87";
+    sha256 = "04i3c4qg5zccl1inr17vgkjrz9zr718m64pbrlw9rvc82fw5g199";
   };
 
   patches = [ ./const.patch ./install_prefix.patch ];

From 38e2c1586bdb6773c1dac0721a5c7c562216ad9b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 31 Aug 2015 00:09:18 -0700
Subject: [PATCH 1769/2016] zfs_git: 2015-07-21 -> 2015-08-30

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

diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index 26c48076c4e..f63a36ce516 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-07-21";
+  version = "2015-08-30";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "zfs";
-    rev = "3b79cef21294f3ec46c4f71cc5a68a75a4d0ebc7";
-    sha256 = "01l4cg62wgn3wzasskx2nh3a4c74vq8qcwz090x8x1r4c2r4v943";
+    rev = "c6a3a222d3a1d2af94205a218c0ba455200fb945";
+    sha256 = "0alzkngw36ik4vpw0z8nnk5qysh2z6v231c23rw7jlcqfdd8ji8p";
   };
 
   patches = [ ./nix-build.patch ];

From ca673d66de1954537baa897d7267bfec41e8fcd5 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Sat, 29 Aug 2015 20:47:21 -0400
Subject: [PATCH 1770/2016] policycoreutils: fix i686-linux compilation error,
 closes #9544

This adds a patch to quiet a compiler warning which would be harmless
except that it breaks the build due to use of -Werror.
See http://hydra.nixos.org/build/25151888/nixlog/1
---
 pkgs/os-specific/linux/policycoreutils/default.nix   |  2 ++
 .../linux/policycoreutils/fix-printf-type.patch      | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch

diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix
index 4eb8394a4d3..1933523d9c2 100644
--- a/pkgs/os-specific/linux/policycoreutils/default.nix
+++ b/pkgs/os-specific/linux/policycoreutils/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "0y9l9k60iy21hj0lcvfdfxs1fxydg6d3pxp9rhy7hwr4y5vgh6dq";
   };
 
+  patches = [ ./fix-printf-type.patch ];
+
   postPatch = ''
     # Fix references to libsepol.a
     find . -name Makefile -exec sed -i 's,[^ ]*/libsepol.a,${libsepol}/lib/libsepol.a,g' {} \;
diff --git a/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch
new file mode 100644
index 00000000000..6ab2d6dccc7
--- /dev/null
+++ b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch
@@ -0,0 +1,12 @@
+diff -Nru policycoreutils-2.4/setfiles/restore.c policycoreutils-2.4.new/setfiles/restore.c
+--- policycoreutils-2.4/setfiles/restore.c	2015-02-02 09:38:10.000000000 -0500
++++ policycoreutils-2.4.new/setfiles/restore.c	2015-08-29 20:44:13.693023222 -0400
+@@ -118,7 +118,7 @@
+ 		r_opts->count++;
+ 		if (r_opts->count % STAR_COUNT == 0) {
+ 			if (r_opts->progress == 1) {
+-				fprintf(stdout, "\r%luk", (size_t) r_opts->count / STAR_COUNT );
++				fprintf(stdout, "\r%zuk", (size_t) r_opts->count / STAR_COUNT );
+ 			} else {
+ 				if (r_opts->nfile > 0) {
+ 					progress = (r_opts->count < r_opts->nfile) ? (100.0 * r_opts->count / r_opts->nfile) : 100;

From c53018c9a17f878f37b390c0bb21845df81be868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 31 Aug 2015 09:49:57 +0200
Subject: [PATCH 1771/2016] all-packages: warn when using deprecated attributes

The aliases are split into two groups, as mass-renaming is anticipated.
Also added fold markers as in the rest of file.
https://github.com/NixOS/nixpkgs/issues/9456
---
 pkgs/top-level/all-packages.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6f7af7d438..1ddc4714693 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15276,8 +15276,13 @@ let
 
   mg = callPackage ../applications/editors/mg { };
 
-
-  # Attributes for backward compatibility.
+}
+  ### Aliases to attributes converted to the dashed-style.
+  // lib.mapAttrs (name: builtins.trace
+    ( "Warning: using a deprecated attribute '${name}'."
+    + " CamelCase and under_scores are replaced by dashed-names"
+    + " to match the nix-env names better."))
+{ # warnings since 2015-09
   adobeReader = adobe-reader;
   arduino_core = arduino-core;  # added 2015-02-04
   asciidocFull = asciidoc-full;  # added 2014-06-22
@@ -15286,8 +15291,6 @@ let
   lttngTools = lttng-tools;  # added 2014-07-31
   lttngUst = lttng-ust;  # added 2014-07-31
   jquery_ui = jquery-ui;  # added 2014-09-07
-  youtubeDL = youtube-dl;  # added 2014-10-26
-  youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   htmlTidy = html-tidy;  # added 2014-12-06
   libtidy = html-tidy;  # added 2014-12-21
@@ -15295,8 +15298,17 @@ let
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   nfsUtils = nfs-utils;  # added 2014-12-06
   buildbotSlave = buildbot-slave;  # added 2014-12-09
-  cool-old-term = cool-retro-term; # added 2015-01-31
   rssglx = rss-glx; #added 2015-03-25
+
+}
+  ### Other attribute aliases for backward compatibility.
+  // lib.mapAttrs
+      (name: builtins.trace "Warning: using a deprecated attribute '${name}'.")
+{ # warnings since 2015-09
+  youtubeDL = youtube-dl;  # added 2014-10-26
+  youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
+  cool-old-term = cool-retro-term; # added 2015-01-31
+
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19
   inherit (haskell.compiler) jhc uhc;   # 2015-05-15

From e84c8772c9cd23a92b4ec5ff42e2cf0255be6b1d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Aug 2015 02:53:18 -0500
Subject: [PATCH 1772/2016] nixpkgs: nmap 6.47 -> 6.49BETA4

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

diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 57cc9c24248..faba4037d3d 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -13,11 +13,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
-  version = "6.47";
+  version = "6.49BETA4";
 
   src = fetchurl {
     url = "http://nmap.org/dist/nmap-${version}.tar.bz2";
-    sha256 = "14d53aji4was68c01pf105n5ylha257wmdbx40ddiqiw42g1x8cg";
+    sha256 = "042fg73w7596b3h6ha9y62ckc0hd352zv1shwip3dx14v5igrsna";
   };
 
   patches = ./zenmap.patch;

From b1f502b94e2ae175552ecfd73be4ade7e9fee3cd Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Aug 2015 02:54:09 -0500
Subject: [PATCH 1773/2016] nixpkgs: afl 1.86b -> 1.88b

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 75ad9382b9f..92a0e46b79d 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.86b";
+  version = "1.88b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "1by9ncf6lgcyibzqwyla34jv64sd66mn8zhgjz2pcgsds51qwn0r";
+    sha256 = "10j0b4kzr4rmflcnxhb2r3klxc4sspx23bpgxjaqflp4z3zf5m1v";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup

From 23b16c8d190b70d78f3d53fdd1b778b5a56da363 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Aug 2015 02:57:06 -0500
Subject: [PATCH 1774/2016] nixpkgs: mono 4.0.2.5 -> 4.0.3.20

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

diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index 3082a53137b..306e287fbc2 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -6,10 +6,10 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mono-${version}";
-  version = "4.0.2.5";
+  version = "4.0.3.20";
   src = fetchurl {
     url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
-    sha256 = "0lfndz7l3j593wilyczb5w6kvrdbf2fsd1i46qlszfjvx975hx5h";
+    sha256 = "1z0k8gv5z3yrkjhi2yjaqj42p55jn5h3q4z890gkcrlvmgihnv4p";
   };
 
   buildInputs =

From 5f5cc4e4f412a29a76b3e081a99a469d1715b412 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Aug 2015 03:03:00 -0500
Subject: [PATCH 1775/2016] nixpkgs: musl 1.1.10 -> 1.1.11

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

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index db7017edd43..abe96e9b9ae 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "musl-${version}";
-  version = "1.1.10";
+  version = "1.1.11";
 
   src = fetchurl {
     url    = "http://www.musl-libc.org/releases/${name}.tar.gz";
-    sha256 = "0z4b3j1r0v4zr3v1cpl1v56zx6w8nq1y3wbs8x1zg87pqyqykfs5";
+    sha256 = "0grmmah3d9wajii26010plpinv3cbiq3kfqsblgn84kv3fjnv7mv";
   };
 
   enableParallelBuilding = true;

From 860d720940d0534a46f6c3ce386ee593672b6e9a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Aug 2015 03:04:10 -0500
Subject: [PATCH 1776/2016] nixpkgs: nginxUnstable 1.9.3 -> 1.9.4

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

diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index 990d3d52d30..e988e8192fc 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -10,10 +10,10 @@
 with stdenv.lib;
 
 let
-  version = "1.9.3";
+  version = "1.9.4";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "1svkyrh31g9hzfmj0xwc167sz0b1fn4i62mwipdjy9ia3cscb622";
+    sha256 = "1a1bixw2a4s5c3qzw3583s4a4y6i0sdzhihhlbab5rkyfh1hr6s7";
   };
 
   rtmp-ext = fetchFromGitHub {

From ce73dbd7912ed0a3f5d66dd0a95a5b3e665c7436 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Aug 2015 03:07:38 -0500
Subject: [PATCH 1777/2016] nixpkgs: pax-utils 1.0.5 -> 1.1.1

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

diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 13d144c54b0..fe517a71021 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pax-utils-${version}";
-  version = "1.0.5";
+  version = "1.1.1";
 
   src = fetchurl {
     url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz";
-    sha256 = "0vwhmnwai24h654d1zchm5qkbr030ay98l2qdp914ydgwhw9k6pn";
+    sha256 = "0gldvyr96jgbcahq7rl3k4krzyhvlz95ckiqh3yhink56s5z58cy";
   };
 
   makeFlags = [

From 4022e07c1eb8ee375ad41f5256de2cb3303c43f0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Aug 2015 03:13:31 -0500
Subject: [PATCH 1778/2016] nixpkgs: scrypt 1.1.6 -> 1.2.0

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

diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index 668a7605115..966e06f4fdd 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "scrypt-${version}";
-  version = "1.1.6";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/scrypt/scrypt-1.1.6.tgz";
-    sha256 = "dfd0d1a544439265bbb9b58043ad3c8ce50a3987b44a61b1d39fd7a3ed5b7fb8";
+    url = "https://www.tarsnap.com/scrypt/${name}.tgz";
+    sha256 = "1m39hpfby0fdjam842773i5w7pa0qaj7f0r22jnchxsj824vqm0p";
   };
 
   buildInputs = [ openssl ];

From 6e9b561a886ffca4462af1b830ef347dcf7e0c9a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Aug 2015 03:14:44 -0500
Subject: [PATCH 1779/2016] nixpkgs: trace-cmd 2.5.3 -> 2.6

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

diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index 1a22d094867..aeb2c371c2a 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name    = "trace-cmd-${version}";
-  version = "2.5.3";
+  version = "2.6";
 
   src = fetchgit {
     url    = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git";
     rev    = "refs/tags/trace-cmd-v${version}";
-    sha256 = "32db3df07d0371c2b072029c6c86c4204be8cbbcb53840fa8c42dbf2e35c047b";
+    sha256 = "42286440a45d1b24552a1d3cdb656dc648ad346fc426b5798bacdbffd3c4b226";
   };
 
   buildInputs = [ asciidoc libxslt ];

From 4068869d6282cfa45fba17128b7e25eba885f99c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Aug 2015 03:18:13 -0500
Subject: [PATCH 1780/2016] nixpkgs: openresty 1.7.10.1 -> 1.9.3.1

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

diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 8444d49b91e..14f95761cfb 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -7,11 +7,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "openresty-${version}";
-  version = "1.7.10.1";
+  version = "1.9.3.1";
 
   src = fetchurl {
     url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz";
-    sha256 = "0yg6pkagkkga6ly6fgmfcf557r2b4m75gyn6a7p9qcamb4zdgl2g";
+    sha256 = "1fw8yxjndf5gsk44l4bsixm270fxv7f5cdiwzq9ps6j3hhgx5kyv";
   };
 
   buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ];

From 38dd4f5ce130a80aee9caa5396904ace2623880a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 31 Aug 2015 10:35:11 +0200
Subject: [PATCH 1781/2016] gnome3 test: revert back to using slim

GDM needs more time to load on hydra, need a better way to find out
when the user has logged in.
---
 nixos/tests/gnome3.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 3425ca09951..f5e0159f1c7 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -11,13 +11,8 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       services.xserver.enable = true;
 
-      services.xserver.displayManager.gdm = {
-        enable = true;
-        autoLogin = {
-          enable = true;
-          user = "alice";
-        };
-      };
+      services.xserver.displayManager.auto.enable = true;
+      services.xserver.displayManager.auto.user = "alice";
       services.xserver.desktopManager.gnome3.enable = true;
 
       virtualisation.memorySize = 512;
@@ -26,7 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   testScript =
     ''
       $machine->waitForX;
-      $machine->sleep(60);
+      $machine->sleep(15);
 
       # Check that logging in has given the user ownership of devices.
       $machine->succeed("getfacl /dev/snd/timer | grep -q alice");

From 4725d2158362576941525dafde29462655cda249 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Aug 2015 11:13:12 +0200
Subject: [PATCH 1782/2016] bibtex-tools: Mark as broken

Tarball is missing.
---
 pkgs/tools/typesetting/bibtex-tools/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/typesetting/bibtex-tools/default.nix b/pkgs/tools/typesetting/bibtex-tools/default.nix
index c2c9a942845..a822a181a65 100644
--- a/pkgs/tools/typesetting/bibtex-tools/default.nix
+++ b/pkgs/tools/typesetting/bibtex-tools/default.nix
@@ -13,4 +13,5 @@ stdenv.mkDerivation {
     --with-hevea=${hevea}
     --with-latex=${tetex}";
   buildInputs = [aterm sdf strategoxt hevea];
+  meta.broken = true;
 }

From 3e391b839ae6e9d7440bc8626d8f9c1c925aa81b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 31 Aug 2015 11:17:24 +0200
Subject: [PATCH 1783/2016] mongo-tools: fix build

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f8c7bd00eb0..0c373d1b215 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1699,12 +1699,10 @@ let
 
     # Mongodb incorrectly names all of their binaries main
     # Let's work around this with our own installer
-    installPhase = ''
-      mkdir -p $bin/bin
+    buildPhase = ''
       while read b; do
-        rm -f go/bin/main
         go install $goPackagePath/$b/main
-        cp go/bin/main $bin/bin/$b
+        mv go/bin/main go/bin/$b
       done < <(find go/src/$goPackagePath -name main | xargs dirname | xargs basename -a)
     '';
   };

From 7399c600e440b5ff62511bebb31667e62481078e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Aug 2015 05:43:22 -0500
Subject: [PATCH 1784/2016] Revert "nixpkgs: scrypt 1.1.6 -> 1.2.0"

This breaks the build. :(

This reverts commit 4022e07c1eb8ee375ad41f5256de2cb3303c43f0.
---
 pkgs/tools/security/scrypt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index 966e06f4fdd..668a7605115 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "scrypt-${version}";
-  version = "1.2.0";
+  version = "1.1.6";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/scrypt/${name}.tgz";
-    sha256 = "1m39hpfby0fdjam842773i5w7pa0qaj7f0r22jnchxsj824vqm0p";
+    url = "https://www.tarsnap.com/scrypt/scrypt-1.1.6.tgz";
+    sha256 = "dfd0d1a544439265bbb9b58043ad3c8ce50a3987b44a61b1d39fd7a3ed5b7fb8";
   };
 
   buildInputs = [ openssl ];

From 4f4bf1f79c682afb56625fa38c64755304177c95 Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Mon, 31 Aug 2015 18:55:42 +0800
Subject: [PATCH 1785/2016] add note about using profiledHaskellPackages

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

diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml
index 803efbab695..c3d4ae8fb51 100644
--- a/doc/haskell-users-guide.xml
+++ b/doc/haskell-users-guide.xml
@@ -600,6 +600,12 @@ $ nix-shell &quot;&lt;nixpkgs&gt;&quot; -A haskellPackages.bar.env
   };
 }
 </programlisting>
+    <para>
+        Then, replace instances of <literal>haskellPackages</literal> in the
+        <literal>cabal2nix</literal>-generated <literal>default.nix</literal>
+        or <literal>shell.nix</literal> files with
+        <literal>profiledHaskellPackages</literal>.
+    </para>
   </section>
   <section xml:id="how-to-override-package-versions-in-a-compiler-specific-package-set">
     <title>How to override package versions in a compiler-specific

From f5f24ce88437e007a89c8940d6ec08c555543de4 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Sat, 29 Aug 2015 19:17:04 +0100
Subject: [PATCH 1786/2016] pbr: 0.9.0 -> 1.6.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3dc84c72c45..056cc63f85b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9277,19 +9277,18 @@ let
   };
 
   pbr = buildPythonPackage rec {
-    name = "pbr-0.9.0";
+    name = "pbr-1.6.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pbr/${name}.tar.gz";
-      sha256 = "e5a57c434b1faa509a00bf458d2c7af965199d9cced3d05a547bff9880f7e8cb";
+      sha256 = "1lg1klrczvzfan89y3bl9ykrknl3nb01vvai37fkww24apzyibjf";
     };
 
-    # pip depend on $HOME setting
-    preConfigure = "export HOME=$TMPDIR";
-
     doCheck = false;
 
-    buildInputs = with self; [ pip ];
+    propagatedBuildInputs = with self; [ pip ];
+    buildInputs = with self; [ virtualenv ]
+      ++ stdenv.lib.optional doCheck testtools;
 
     meta = {
       description = "Python Build Reasonableness";

From 642a10df0e29cfc03998c159e48ad314d91a7170 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Sun, 30 Aug 2015 11:32:16 +0100
Subject: [PATCH 1787/2016] oslosphinx: init at 3.1.0

---
 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 056cc63f85b..6fc88325339 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9014,6 +9014,25 @@ let
 
   });
 
+  oslosphinx = buildPythonPackage rec {
+    name = "oslosphinx-3.1.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/o/oslosphinx/${name}.tar.gz";
+      md5= "4fcac44bd6ef174586307a1508ff228f";
+    };
+
+    doCheck = false;
+
+    buildInputs = with self; [
+      pbr requests2
+        (sphinx.override {src = pkgs.fetchurl {
+          url = "https://pypi.python.org/packages/source/s/sphinx/sphinx-1.2.3.tar.gz";
+          sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04";
+        };})
+    ];
+  };
+
   pagerduty = buildPythonPackage rec {
     name = "pagerduty-${version}";
     version = "0.2.1";

From 1869b8f213ae9b4d0e1a3bc4f629a27fa30ff459 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Sun, 30 Aug 2015 11:32:30 +0100
Subject: [PATCH 1788/2016] stevedore: 0.15 -> 1.7.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6fc88325339..49d5d1ad4b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12808,16 +12808,17 @@ let
   };
 
   stevedore = buildPythonPackage rec {
-    name = "stevedore-0.15";
+    name = "stevedore-1.7.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/s/stevedore/${name}.tar.gz";
-      sha256 = "bec9269cbfa58de4f0849ec79bb7d54eeeed9df8b5fbfa1637fbc68062822847";
+      sha256 = "149pjc0c3z6khjisn4yil3f94qjnzwafz093wc8rrzbw828qdkv8";
     };
 
-    buildInputs = with self; [ pbr pip ] ++ optional isPy26 argparse;
+    doCheck = false;
 
-    propagatedBuildInputs = with self; [ setuptools ];
+    buildInputs = with self; [ pbr oslosphinx ];
+    propagatedBuildInputs = with self; [ six argparse ];
 
     meta = {
       description = "Manage dynamic plugins for Python applications";

From 75f880b1d18667e99b3453385460b0d2bf8fe0e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <deroiste@syslab.com>
Date: Mon, 31 Aug 2015 13:49:39 +0200
Subject: [PATCH 1789/2016] mednafen: fix src url (sourceforge ->
 mednafen.fobby.net)

Also bump the minor version 0.9.38.5 -> 0.9.38.6
---
 pkgs/misc/emulators/mednafen/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index 825968c6163..ba26c44305b 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   name = "mednafen-${version}";
-  version = "0.9.38.5";
+  version = "0.9.38.6";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/mednafen/Mednafen/${version}/${name}.tar.bz2";
-    sha256 = "1s1qwwlhkxr0vhzvlc1m0ib9lj7cws3cldm2mbjz4b421nxfdi8h";
+    url = "http://mednafen.fobby.net/releases/files/${name}.tar.bz2";
+    sha256 = "0ivy0vqy1cjd5namn4bdm9ambay6rdccjl9x5418mjyqdhydlq4l";
   };
 
   buildInputs = with stdenv.lib;

From ed5f04eb86045201585b9b48ffd667b04a2f7bda Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 31 Aug 2015 14:55:20 +0300
Subject: [PATCH 1790/2016] deadbeef: fix patch checksum

---
 pkgs/applications/audio/deadbeef/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 410ddb4c6f1..d1828016de3 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
 
   patches = [ (fetchpatch {
                 url = "https://github.com/Alexey-Yakovenko/deadbeef/commit/e7725ea73fa1bd279a3651704870156bca8efea8.patch";
-                sha256 = "0a04l2607y3swcq9b1apffl1chdwj38jwfiizxcfmdbia4a0qlyg";
+                sha256 = "1530w968zyvcm9c8k57889n125k7a1kk3ydinjm398n07gypd599";
               })
             ];
 

From 8a74451273f50f69d3ed27344600771d99443190 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Aug 2015 07:45:18 -0500
Subject: [PATCH 1791/2016] nixpkgs: scrypt 1.1.6 -> 1.2.0

Now with less build breakage!
---
 pkgs/tools/security/scrypt/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index 668a7605115..893b7b31900 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -2,15 +2,24 @@
 
 stdenv.mkDerivation rec {
   name = "scrypt-${version}";
-  version = "1.1.6";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/scrypt/scrypt-1.1.6.tgz";
-    sha256 = "dfd0d1a544439265bbb9b58043ad3c8ce50a3987b44a61b1d39fd7a3ed5b7fb8";
+    url = "https://www.tarsnap.com/scrypt/${name}.tgz";
+    sha256 = "1m39hpfby0fdjam842773i5w7pa0qaj7f0r22jnchxsj824vqm0p";
   };
 
   buildInputs = [ openssl ];
 
+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace "command -p mv" "mv"
+    substituteInPlace Makefile.in \
+      --replace "command -p mv" "mv"
+    substituteInPlace autocrap/Makefile.am \
+      --replace "command -p mv" "mv"
+  '';
+
   meta = {
     description = "Encryption utility";
     homepage    = https://www.tarsnap.com/scrypt.html;

From 03bc71f1742c5bdfaf819f62ca604b06ad538472 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Aug 2015 08:01:35 -0500
Subject: [PATCH 1792/2016] nixpkgs: tarsnap 1.0.35 -> 1.0.36.1

This also fixes the same build failure present in `scrypt-1.2.0`,
which is quite trivial.

(partially cherry picked from commit 54c7053b)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/backup/tarsnap/default.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index e2857eed7d8..f2ae4e83ad1 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -1,11 +1,6 @@
 { stdenv, fetchurl, openssl, zlib, e2fsprogs }:
 
 let
-  bashCompletion = fetchurl {
-    url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash";
-    sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405";
-  };
-
   zshCompletion = fetchurl {
     url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh";
     sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair";
@@ -13,18 +8,25 @@ let
 in
 stdenv.mkDerivation rec {
   name = "tarsnap-${version}";
-  version = "1.0.35";
+  version = "1.0.36.1";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz";
-    sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc";
+    url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz";
+    sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452";
   };
 
+  preConfigure = ''
+    configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d"
+  '';
+
+  patchPhase = ''
+    substituteInPlace Makefile.in \
+      --replace "command -p mv" "mv"
+  '';
+
   postInstall = ''
     # Install some handy-dandy shell completions
-    mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions
-    cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash
-    cp ${zshCompletion}  $out/share/zsh/site-functions/_tarsnap
+    install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap
   '';
 
   buildInputs = [ openssl zlib e2fsprogs ];

From 5553280940d1f74ff65c6816476232e9addd38f0 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Mon, 31 Aug 2015 13:03:15 +0000
Subject: [PATCH 1793/2016] pirate-get: init at 0.2.7

---
 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 2b6fdb8bc8d..5ce3c9200d0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4356,6 +4356,25 @@ let
     };
   };
 
+  pirate-get = pythonPackages.buildPythonPackage rec {
+    name = "pirate-get-${version}";
+    version = "0.2.7";
+
+    disabled = !isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pirate-get/${name}.tar.gz";
+      sha256 = "0awjrmczvd6rwzj4fb7bhjlil5mx91amjs7fk5890h3in52clxg3";
+    };
+
+    propagatedBuildInputs = [ self.colorama ];
+
+    meta = {
+      description = "A command line interface for The Pirate Bay";
+      homepage = https://github.com/vikstrous/pirate-get;
+      license = licenses.gpl1;
+    };
+  };
 
   poppler-qt4 = buildPythonPackage rec {
     name = "poppler-qt4-${version}";

From d4b464785736fee563181a1863a4f8460c572838 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Mon, 31 Aug 2015 16:04:32 +0200
Subject: [PATCH 1794/2016] bdf2psf: init at 1.132

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

diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
new file mode 100644
index 00000000000..342c014faaa
--- /dev/null
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, perl, dpkg }:
+
+stdenv.mkDerivation rec {
+  name = "bdf2psf-${version}";
+  version = "1.132";
+
+  src = fetchurl {
+    url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
+    sha256 = "01r8v6qi6klsgi66ld86c78cdz308mywrm9j101d73nsxgx6qhzz";
+  };
+
+  buildInputs = [ dpkg ];
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  unpackPhase = "dpkg-deb -x $src .";
+  installPhase = "
+    substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl ${perl}/bin/perl
+    mv usr/bin .
+    cp -r . $out
+  ";
+
+  meta = {
+    description = "BDF to PSF converter";
+    homepage = https://packages.debian.org/sid/bdf2psf;
+    longDescription = ''
+      Font converter to generate console fonts from BDF source fonts
+    '';
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ddc4714693..27b24ece369 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -721,6 +721,8 @@ let
 
   bc = callPackage ../tools/misc/bc { };
 
+  bdf2psf = callPackage ../tools/misc/bdf2psf { };  
+
   bcache-tools = callPackage ../tools/filesystems/bcache-tools { };
 
   bchunk = callPackage ../tools/cd-dvd/bchunk { };

From cb976a40ab6de82b17d047944078c63abff7507c Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Mon, 31 Aug 2015 16:06:22 +0200
Subject: [PATCH 1795/2016] gohufont: add console version

---
 pkgs/data/fonts/gohufont/default.nix | 43 ++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
index 450971524e6..a4e228d7de1 100644
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -1,26 +1,59 @@
-{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+{ stdenv, fetchurl, mkfontdir, mkfontscale, bdf2psf }:
 
 stdenv.mkDerivation rec {
   name = "gohufont-2.0";
 
-  src = fetchurl {
+  pcf = fetchurl {
     url = "http://font.gohu.org/gohufont-2.0.tar.gz";
     sha256 = "0vi87fvj3m52piz2k6vqday03cah6zvz3dzrvjch3qjna1i1nb7s";
   };
 
-  buildInputs = [ mkfontdir mkfontscale ];
+  bdf = fetchurl {
+    url = "http://font.gohu.org/gohufont-bdf-2.0.tar.gz";
+    sha256 = "0rqqavhqbs7pajcblg92mjlz2dxk8b60vgdh271axz7kjs2wf9mr";
+  };
+
+  buildInputs = [ mkfontdir mkfontscale bdf2psf ];
+
+  unpackPhase = ''
+    mkdir pcf bdf
+    tar -xzf $pcf --strip-components=1 -C pcf
+    tar -xzf $bdf --strip-components=1 -C bdf
+  '';
 
   installPhase = ''
+    # convert bdf to psf fonts
+    sourceRoot="$(pwd)"
+    mkdir psf
+
+    cd "${bdf2psf}/usr/share/bdf2psf"
+    for i in $sourceRoot/bdf/*.bdf; do
+      bdf2psf --fb $i standard.equivalents \
+                      ascii.set+useful.set+linux.set 512 \
+                      "$sourceRoot/psf/$(basename $i .bdf).psf"
+    done
+    cd "$sourceRoot"
+
+    # install the psf fonts (for the virtual console)
+    fontDir="$out/share/consolefonts"
+    mkdir -p "$fontDir"
+    mv psf/*.psf "$fontDir"
+
+
+    # install the pcf fonts (for xorg applications)
     fontDir="$out/share/fonts/misc"
     mkdir -p "$fontDir"
-    mv *.pcf.gz "$fontDir"
+    mv pcf/*.pcf.gz "$fontDir"
+
     cd "$fontDir"
     mkfontdir
     mkfontscale
   '';
 
   meta = with stdenv.lib; {
-    description = "A monospace bitmap font well suited for programming and terminal use";
+    description = ''
+      A monospace bitmap font well suited for programming and terminal use
+    '';
     homepage = http://font.gohu.org/;
     license = licenses.wtfpl;
     maintainers = with maintainers; [ epitrochoid ];

From 4ce182c7365f96cc7446d2bcc7b5846a64690973 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 18 Aug 2015 02:51:27 +0300
Subject: [PATCH 1796/2016] xlockmore: clean configure flags and add Xinerama
 and DPMS support

Close #9391.
---
 pkgs/misc/screensavers/xlockmore/default.nix | 42 ++++++++------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index f635e0f149b..cef143e309a 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pam ? null, x11 }:
+{ stdenv, lib, fetchurl, pam ? null, autoreconfHook
+, libX11, libXext, libXinerama, libXdmcp, libXt }:
 
 stdenv.mkDerivation rec {
 
@@ -9,37 +10,26 @@ stdenv.mkDerivation rec {
   };
 
   # Optionally, it can use GTK+.
-  buildInputs = [ pam x11 ];
+  buildInputs = [ pam libX11 libXext libXinerama libXdmcp libXt ];
+
+  nativeBuildInputs = [ autoreconfHook ];
 
   # Don't try to install `xlock' setuid. Password authentication works
   # fine via PAM without super user privileges.
   configureFlags =
-      " --with-crypt"
-    + " --enable-appdefaultdir=$out/share/X11/app-defaults"
-    + " --disable-setuid"
-    + " --without-editres"
-    + " --without-xpm"
-    + " --without-gltt"
-    + " --without-ttf"
-    + " --without-ftgl"
-    + " --without-freetype"
-    + " --without-opengl"
-    + " --without-mesa"
-    + " --without-dtsaver"
-    + " --without-ext"
-    + " --without-dpms"
-    + " --without-xinerama"
-    + " --without-rplay"
-    + " --without-nas"
-    + " --without-gtk2"
-    + " --without-gtk"
-    + (if pam != null then " --enable-pam --enable-bad-pam" else " --disable-pam");
+    [ "--disable-setuid"
+    ] ++ (lib.optional (pam != null) "--enable-pam");
 
-  preConfigure = ''
-    configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults"
-  '';
+  postPatch =
+    let makePath = p: lib.concatMapStringsSep " " (x: x + "/" + p) buildInputs;
+        inputs = "${makePath "lib"} ${makePath "include"}";
+    in ''
+      sed -i 's,\(for ac_dir in\),\1 ${inputs},' configure.ac
+      sed -i 's,/usr/,/no-such-dir/,g' configure.ac
+      configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults"
+    '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Screen locker for the X Window System";
     homepage = http://www.tux.org/~bagleyd/xlockmore.html;
     license = licenses.gpl2;

From 82160f77a39813ed3a8f6be9834a1790c9d87680 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Aug 2015 23:30:45 +0200
Subject: [PATCH 1797/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/9ef9917fdb8e8f203cd0ad27c890ec5ebdb7e67c
 with hackage2nix v20150824-49-gbeb4fa1

---
 .../haskell-modules/hackage-packages.nix      | 961 ++++++++++--------
 1 file changed, 554 insertions(+), 407 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 33b0bf30d00..831556432b9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5018,11 +5018,11 @@ self: {
     ({ mkDerivation, base, containers, HUnit, parsec }:
      mkDerivation {
        pname = "Folly";
-       version = "0.1.3.0";
-       sha256 = "f155359eff68c5873057836478883804335275aa585d405774bd35f5a07efd79";
+       version = "0.1.4.6";
+       sha256 = "fabe878ab40e0fe8187ee40e6d4b4d0a83e6b34c42e404f04d2b4afa3e1038f6";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers ];
+       libraryHaskellDepends = [ base containers parsec ];
        executableHaskellDepends = [ base containers HUnit parsec ];
        homepage = "https://github.com/dillonhuff/Folly";
        description = "A first order logic library in Haskell";
@@ -6542,23 +6542,23 @@ self: {
      }) {};
 
   "HGamer3D" = callPackage
-    ({ mkDerivation, base, HGamer3D-Audio, HGamer3D-Common
-     , HGamer3D-Data, HGamer3D-Graphics3D, HGamer3D-InputSystem
-     , HGamer3D-Network
+    ({ mkDerivation, base, bytestring, cereal, clock, containers
+     , directory, filepath, hgamer3d0, messagepack, text, Urho3D, vect
      }:
      mkDerivation {
        pname = "HGamer3D";
-       version = "0.5.0";
-       sha256 = "670dbc3b159981e248800007a89a281393771fca68111f703e70fce7eb95b302";
+       version = "0.6.0";
+       sha256 = "e0d1a900db2d0e10b96c242508485789ca31e5a074978fb99a4804b78cc13db7";
        libraryHaskellDepends = [
-         base HGamer3D-Audio HGamer3D-Common HGamer3D-Data
-         HGamer3D-Graphics3D HGamer3D-InputSystem HGamer3D-Network
+         base bytestring cereal clock containers directory filepath
+         messagepack text vect
        ];
+       librarySystemDepends = [ hgamer3d0 Urho3D ];
        homepage = "http://www.hgamer3d.org";
-       description = "A Toolset for the Haskell Game Programmer";
+       description = "Toolset for the Haskell Game Programmer";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {Urho3D = null; hgamer3d0 = null;};
 
   "HGamer3D-API" = callPackage
     ({ mkDerivation, base, haskell98, HGamer3D-Data
@@ -7720,20 +7720,19 @@ self: {
 
   "HUnit-Plus" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers
-     , directory, hashable, hexpat, hostname, old-locale, parsec, time
-     , timeit
+     , directory, hashable, hexpat, hostname, parsec, time, timeit
      }:
      mkDerivation {
        pname = "HUnit-Plus";
-       version = "1.0.1";
-       sha256 = "71929ba45bd420d8d2061dc877ed0d82ba574155ce0be6d67b6459148129045e";
+       version = "1.1.0";
+       sha256 = "9cde0930c46c02833e82b10519bcc841ce5186a62be3bb29971538e85a5fcb74";
        libraryHaskellDepends = [
          base bytestring Cabal cmdargs containers hashable hexpat hostname
-         old-locale parsec time timeit
+         parsec time timeit
        ];
        testHaskellDepends = [
          base bytestring Cabal cmdargs containers directory hashable hexpat
-         hostname old-locale parsec time timeit
+         hostname parsec time timeit
        ];
        homepage = "https://github.com/emc2/HUnit-Plus";
        description = "A test framework building on HUnit";
@@ -9456,14 +9455,11 @@ self: {
     ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }:
      mkDerivation {
        pname = "JuicyPixels-repa";
-       version = "0.7";
-       sha256 = "a556109f053d1dfd1eebd23080d5f285816a03f73e37fdc1f32e0a8df888c93a";
-       revision = "1";
-       editedCabalFile = "b0dcd6dae60b506057721d2732aebbece6ce380b5d7df4b2ba64592e6e3a88a8";
+       version = "0.7.0.1";
+       sha256 = "767c5f7ab39b660f0a9e4c8a5af0564060f5319dee7f68306523344ddfdf3837";
        libraryHaskellDepends = [
          base bytestring JuicyPixels repa vector
        ];
-       jailbreak = true;
        description = "Convenience functions to obtain array representations of images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10341,15 +10337,15 @@ self: {
   "MFlow" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , case-insensitive, clientsession, conduit, conduit-extra
-     , containers, directory, extensible-exceptions, http-types
+     , containers, cpphs, directory, extensible-exceptions, http-types
      , monadloc, mtl, old-time, parsec, pwstore-fast, random
      , RefSerialize, resourcet, stm, TCache, text, time, transformers
      , utf8-string, vector, wai, wai-extra, warp, warp-tls, Workflow
      }:
      mkDerivation {
        pname = "MFlow";
-       version = "0.4.5.10";
-       sha256 = "2c2e2c03b31f37f628e446cabaf544bf7b669d3e6a34b6c38798e89145c3b6c4";
+       version = "0.4.5.11";
+       sha256 = "789aceb77d0e2497a6194dba2677e32b003292075bc36db66f272f559234f25f";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring case-insensitive
          clientsession conduit conduit-extra containers directory
@@ -10358,6 +10354,7 @@ self: {
          transformers utf8-string vector wai wai-extra warp warp-tls
          Workflow
        ];
+       libraryToolDepends = [ cpphs ];
        description = "stateful, RESTful web framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14983,6 +14980,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "THEff" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "THEff";
+       version = "0.1.0.1";
+       sha256 = "0fbe048bd845a2917e88bacc47e9d63da757ab15f233e63e876a6115f460663f";
+       libraryHaskellDepends = [ base template-haskell ];
+       description = "TH implementation of effects";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "TTTAS" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -19570,8 +19578,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "1.2.0.1";
-       sha256 = "4e7b7cda6b6904cfd35f92596bfe5a8e00511bbd64d7b55926ad8660f6eba950";
+       version = "1.2.0.2";
+       sha256 = "2ed9e6eb9a6dbb0eca3d1fb68c7136a35ec5b7b5ac3ac40d8ecc59b33a00cfb5";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
          exceptions http-client http-conduit ini lens mmorph monad-control
@@ -19590,19 +19598,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "1.2.0.1";
-       sha256 = "c48e7db56a1fc852a505b3821a4ed273b6a68e2f68ee224eb6cdfbe27c42926a";
+       version = "1.2.0.2";
+       sha256 = "23b763583f2d3ffd0abcb5c01cbba2c8a86f06a622a7878f4b90b96f9589fab1";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-cloudformation" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19610,19 +19616,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "1.2.0.1";
-       sha256 = "813fcdb6a35888e1a0d29252f7530f192509662445b051ab17e6e4d614e98160";
+       version = "1.2.0.2";
+       sha256 = "b7ad4d6b83d043e1c55d2b336702c99e3476432f5f9e29f7af2d8224e5c85f21";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-cloudfront" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19630,19 +19634,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "1.2.0.1";
-       sha256 = "aeff7660a2d12b1382d14efa134b37ae35e4dc3745fb83f33e4fd4ac37b4c275";
+       version = "1.2.0.2";
+       sha256 = "f906be9ac06c38451549c001ce870f732a43292da7ed41ca46089179ff89617a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-cloudhsm" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19650,19 +19652,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "1.2.0.1";
-       sha256 = "64a58850be2d1df8145ca7382f7060faf873417c34b52258846ea6b4842b1389";
+       version = "1.2.0.2";
+       sha256 = "5885451657f173c69d52c756395b52b6fe7be9626293d61b7513afbe73ba8e79";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-cloudsearch" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19670,19 +19670,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "1.2.0.1";
-       sha256 = "d56e2690a44f331d408603234712bcbc2ef40f0375a7c1db22513c3350b3ccb5";
+       version = "1.2.0.2";
+       sha256 = "053b505d3644433f9e1fa686d6416ae08ac2154bb4ebe5e994f0b2a4969a11f1";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-cloudsearch-domains" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19690,19 +19688,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "1.2.0.1";
-       sha256 = "f3ac35a7e9f2f9372ffabbb5b7450b4291a07609f517af8b75a4acd5d5c3610d";
+       version = "1.2.0.2";
+       sha256 = "a3921a0b09518c5fffe95b46f76c46a53ab1710b59fb43f099cb14b637ea593f";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-cloudtrail" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19710,19 +19706,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "1.2.0.1";
-       sha256 = "525e3a1f674b20e3851c67cc3d519f86b9795b046f131b91d63e7f194246542b";
+       version = "1.2.0.2";
+       sha256 = "a352d0ff1a75b22fa9e87c18c498090f5c6e9cbfcb79a24b2840ce44ec02b2b3";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-cloudwatch" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19730,19 +19724,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "1.2.0.1";
-       sha256 = "dfabf18379ec4f5431e4038d745686a58fb83a0559029cbbb77b40f9ebc6fd43";
+       version = "1.2.0.2";
+       sha256 = "0b6e1358d91a567df91aa680019b0f06f201eb81965f3b78702c4e90a9a426a4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-cloudwatch-logs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19750,19 +19742,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "1.2.0.1";
-       sha256 = "3b794ef9cb79daf5018a7cc850a348eb08407067f4b72c6accbd03b3be6997ca";
+       version = "1.2.0.2";
+       sha256 = "3fd0122d4e24ccb3413da041ef85e7eb07af7614e43946fb28b93404951ddc39";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-codecommit" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19770,19 +19760,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codecommit";
-       version = "1.2.0.1";
-       sha256 = "b4dcc54a0cd2faec903a037b713d1cce6ac6d4c3716b353b4108d23d4ecc0b03";
+       version = "1.2.0.2";
+       sha256 = "43b58f4507c9ea4125cc4da323ff63f8d9223149455293867143984074d8be74";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeCommit SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-codedeploy" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19790,19 +19778,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "1.2.0.1";
-       sha256 = "9b3dcfb3f92c0f2b7a68d62857e04a6eea0f57a6e72311fa5594da8574b8f557";
+       version = "1.2.0.2";
+       sha256 = "cbbc6d6d6291fc47c89e7f67dc016570eecaecccee8a8f1c858fda040e9993e9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-codepipeline" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19810,19 +19796,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codepipeline";
-       version = "1.2.0.1";
-       sha256 = "c97df58c12793dc079d0706d9a09ea7c470219cc80e6e583441718d7017ee138";
+       version = "1.2.0.2";
+       sha256 = "57c505046cfa51716624d0021d6dca82a13053c17a5e0a61944935ba7bd189b4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodePipeline SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-cognito-identity" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19830,19 +19814,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "1.2.0.1";
-       sha256 = "fbf21d9ca8e71d0b3305791db0f6a18256898b5c294057f515aef3991a0971cb";
+       version = "1.2.0.2";
+       sha256 = "b9965907831e771ad7268d1f8d149b8b3de6faaf0e73eb140705bdf0a7cf8805";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-cognito-sync" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19850,19 +19832,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "1.2.0.1";
-       sha256 = "2008e997fa402ab3d58f22f260df18583695b612cbf1b0d3ab158321a1576e03";
+       version = "1.2.0.2";
+       sha256 = "f1683d1e4c124b07f5ae7663a1471539611f77da6f11553b87ca5eb77b192c89";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-config" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19870,19 +19850,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "1.2.0.1";
-       sha256 = "c4e60da7e09302b81e1c53b15c36e99b46d09dd37b4334e360d78879b556ef36";
+       version = "1.2.0.2";
+       sha256 = "72fb81094500ac496592cd56c8010205f40a377ccdc7d8fb8f479e3923bcbfab";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-core" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
@@ -19895,8 +19873,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "1.2.0.1";
-       sha256 = "737645a63519f535154133cf590a66e2248d436c6223539857f43069a6645d1a";
+       version = "1.2.0.2";
+       sha256 = "63d02d59fe206e1cfbaacea192d775424d05d617413af1771c2efe9a4e51a663";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit conduit-extra cryptonite exceptions hashable http-client
@@ -19920,19 +19898,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "1.2.0.1";
-       sha256 = "20178d505d690116528f8d1bf5c5650c7dca9350b583ad4bbc2b7ca5b74bc1e0";
+       version = "1.2.0.2";
+       sha256 = "a4f8c95147fd34fabe6544c5d8893aac7259a95fc37d9d900e121cc1d479d230";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-devicefarm" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19940,19 +19916,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-devicefarm";
-       version = "1.2.0.1";
-       sha256 = "bebf18952a56cc249175a1bf69ab1400126b3c97c45ce8b7895acbae894c3449";
+       version = "1.2.0.2";
+       sha256 = "92d323fbe85ccd284ea76fcba12e8ea70b75994d2195bb12e25a753f5b78424e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Device Farm SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-directconnect" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19960,19 +19934,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "1.2.0.1";
-       sha256 = "39bd3999d29363b87fc64edac6151251a5a5075c7fe1ab48bb89114fa40cfa74";
+       version = "1.2.0.2";
+       sha256 = "1cd5cda8a0d8ca484582b5d9ef0e50fbe14542e81a49de6f5b3bf32a044ab3c6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-ds" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19980,19 +19952,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ds";
-       version = "1.2.0.1";
-       sha256 = "fac88b8ac1121ec6ab9bb1c1b419262e2720c95d3c5d5e1d5ff9b0356f59af56";
+       version = "1.2.0.2";
+       sha256 = "10b5a48951ec7f90b05152d2073b10d154ceea5806f5655d47d1f8a512f2cbbd";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Directory Service SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-dynamodb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20000,19 +19970,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "1.2.0.1";
-       sha256 = "23d44253d82d2406b528abf5f1c2ed97c72cadb9afca1a578793220648ce442c";
+       version = "1.2.0.2";
+       sha256 = "c916d9b55e74ceeb5f1e7a64fb7ebe0de3bea7df3eb9d2d813bce7e945e81634";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-dynamodb-streams" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20020,19 +19988,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-streams";
-       version = "1.2.0.1";
-       sha256 = "b3413412dce8dc96e449642535f623223298243d7290d778082fd6ed97511a33";
+       version = "1.2.0.2";
+       sha256 = "3ae26f2fdfe11cd7a366dc272d1f43f38cdb949eb5edc7b73e01a176b2096868";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB Streams SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-ec2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20040,19 +20006,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "1.2.0.1";
-       sha256 = "de1421ab986e9d6833fd70a0e0d3c21895813361ecc680c95816fbcaf7c6439a";
+       version = "1.2.0.2";
+       sha256 = "f93ca4bb2ae863f071a0555f762e365da1616b72c8589d4fe3aad260fc936211";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-ecs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20060,19 +20024,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "1.2.0.1";
-       sha256 = "19c608e5218c900da768adc9f893a91a7fc6e9070e8c5d9e444baf1ae98c7544";
+       version = "1.2.0.2";
+       sha256 = "7c322cc5afcdcc92b21c22333c859295a508d84bd8ba83921a105d231dbfa8d6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-efs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20080,19 +20042,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-efs";
-       version = "1.2.0.1";
-       sha256 = "d0f70ed2e5242cb05b7895199a06144cd4550fab64fb825eba8a1c10d9351bab";
+       version = "1.2.0.2";
+       sha256 = "193b91ede9c1abfe195788c03940214f8d54c43fde259674a468f49a5c59834f";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic File System SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-elasticache" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20100,19 +20060,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "1.2.0.1";
-       sha256 = "9c4113c0dd2430432ac0233149571a7affc9dec675aaddbe7ff9e513171a1bf7";
+       version = "1.2.0.2";
+       sha256 = "1a5a8883055dcc318a90cc45f1cfd7af198c5e98b8889db86bca951bc2e9be29";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-elasticbeanstalk" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20120,19 +20078,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "1.2.0.1";
-       sha256 = "b4e135c2e904f78cab94ccab8d1d38b3b7992461bc1f41ede5ee708fcb162dc2";
+       version = "1.2.0.2";
+       sha256 = "fa62e8248e92184e84b482012dd73953bb0892166f95d0d2163b04c42ebcc650";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-elastictranscoder" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20140,19 +20096,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "1.2.0.1";
-       sha256 = "b2eaf67b39f5d19fe5ea7a6d0c79b44951cf25c41eb3af36ead6cd82cb430dd2";
+       version = "1.2.0.2";
+       sha256 = "76d26a2d64094dd14090298ead0e920915c31582fe14d949836f1103af238c04";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-elb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20160,19 +20114,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "1.2.0.1";
-       sha256 = "2574b79c0b09ef82dcc7b07c9dfcb55719dd7b63ac87fb938ae7a7c45efba986";
+       version = "1.2.0.2";
+       sha256 = "21099398af8db511131a4c8bed68b6d04f9b708a77c38d01b037020e18ab2123";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-emr" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20180,19 +20132,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "1.2.0.1";
-       sha256 = "43c3e80f742abbd5d2770fa5cf05138b5be2890492a295b1ccaefeb8d50662ed";
+       version = "1.2.0.2";
+       sha256 = "08728f1ccd95bcce046d6e320391d1c219306b2764a0a551dfea11de3208e1f1";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-glacier" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20200,19 +20150,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "1.2.0.1";
-       sha256 = "48e2c9b10a4624b6f308bd232aafe9fabe7429911ad4a7a8222277d9c58310be";
+       version = "1.2.0.2";
+       sha256 = "a789aaf0927672e16ceb8202d88ff07ee5218b2244236f94a04f186a0b38a3f5";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-iam" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20220,19 +20168,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "1.2.0.1";
-       sha256 = "8302e53d2e799b56629a2344a3b1d40b39b173defee1112ddb6e4e0102496d7f";
+       version = "1.2.0.2";
+       sha256 = "00454769f0848db0b6a273ff2e6e0f4b7dcfc94db067ce4774806aa0687b9f6d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-importexport" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20240,19 +20186,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "1.2.0.1";
-       sha256 = "cfb98a32f18d2b1448277f5a4c5128bd9d94ecba012d458dff65a834c86648d6";
+       version = "1.2.0.2";
+       sha256 = "e8e9f4a8fb5762a929c9462d7d8187207a1334aa3922890ec08a6a949ba9264e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-kinesis" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20260,19 +20204,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "1.2.0.1";
-       sha256 = "831225d3400badf60a8b390e4dd692d38b8097bcb72f1247b54876c83bb532c9";
+       version = "1.2.0.2";
+       sha256 = "7b5d2a726111352d21594a1704dade4d2b706286c8cec427b912a2318f91bc20";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-kms" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20280,19 +20222,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "1.2.0.1";
-       sha256 = "b69938c0c9f6bbc5d1774643f528e64ba28a6ac2bb16f1e15845061a97de85d4";
+       version = "1.2.0.2";
+       sha256 = "7c67b24e31d293411960f68efd4199e5fd4fd4274ea62619f96faa37553c8246";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-lambda" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20300,19 +20240,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "1.2.0.1";
-       sha256 = "e3e0e8fd76c7dbd1ced77e9d46a4e8b57820b87b00327ccc01417ddf4c53aa0d";
+       version = "1.2.0.2";
+       sha256 = "91f88bc3fa32f5c6350f2f49afb949e63a860614d7f90d169af216115f0927c2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-ml" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20320,19 +20258,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "1.2.0.1";
-       sha256 = "c29484802e0138ebbeb6666842ca1cd44b81e2e870ff4c1435d91d58d569bc37";
+       version = "1.2.0.2";
+       sha256 = "c3a3eee8d0bb4987d96b35b48dc074d2912883573e8859fdabf16f744641b9f0";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Machine Learning SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-opsworks" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20340,19 +20276,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "1.2.0.1";
-       sha256 = "bad7706393fcfcc041ac4ae1bb39ef7320d282d2b4d9c6c8f0881379b4f91a6a";
+       version = "1.2.0.2";
+       sha256 = "bad8fc80941bdecd1799213837ef1923c88ef96b59ec2efe439a564f68e06f40";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-rds" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20360,19 +20294,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "1.2.0.1";
-       sha256 = "55ae3a2e6893fc11ca156fb9d11258d1c1ad76f928ca1143cfb0b7b3d9f1806e";
+       version = "1.2.0.2";
+       sha256 = "d4ae1dec9b45df0db245022c5e098ad4814f2ab2261bde850adb42b38200b248";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-redshift" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20380,19 +20312,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "1.2.0.1";
-       sha256 = "0ce218a13c314c73ea9b3f5c7e8ef31f3cf92a06f820425c48d83d175f1e77b2";
+       version = "1.2.0.2";
+       sha256 = "b7fd76de142bc6c346d10645fe07c64c09ee26c828fe89abd6d0f44d99c39a89";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-route53" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20400,19 +20330,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "1.2.0.1";
-       sha256 = "8a700fc08eb4585b6d9a30c81f18bfab56ae2ae4b5474f98889959f2bda33ad0";
+       version = "1.2.0.2";
+       sha256 = "bfe1e8d82ea77ab1a4b95cfef89a6cefc5dc2bcd349c17964fcab9ce2f00ec9b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-route53-domains" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20420,19 +20348,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "1.2.0.1";
-       sha256 = "d486ae77163fc9d8dbb3b38afcce6ce79fba93b5194643ad98cb8dbbe31f745a";
+       version = "1.2.0.2";
+       sha256 = "e0a70770d5fea792f15e5ed7c6fac093dc52e98d5a140c8ac769d09d87a11760";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-s3" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20440,19 +20366,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "1.2.0.1";
-       sha256 = "dd5b54f342d1a5f45ea62242f9acecb2be98ed15801b251316c9bef8ac7b948b";
+       version = "1.2.0.2";
+       sha256 = "e38c08253fee58cbf3f503d7f3f5c2a96e99c74cc343c99751a44adb3fc82a27";
        libraryHaskellDepends = [ amazonka-core base lens text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-sdb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20460,19 +20384,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "1.2.0.1";
-       sha256 = "4eebd5b37c309ee850395c2823f10636cb90c8449a1f365a11a5cf58080b4469";
+       version = "1.2.0.2";
+       sha256 = "58e01ab2120c1f680148fed558c1cb179867eb3770fc3a119a5770ab187de7c9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-ses" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20480,19 +20402,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "1.2.0.1";
-       sha256 = "f547f472a3dee0944a7a26a7b421df10242d80762ca59392391a1326a39a427f";
+       version = "1.2.0.2";
+       sha256 = "3f81529747d25fbdff258c6027592650b5de4537fe4600a40d60116ddc7cb539";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-sns" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20500,19 +20420,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "1.2.0.1";
-       sha256 = "e69b15d4fe2904cd813e22a149e4dcce5c9514a34c45379bb07589fc3a606994";
+       version = "1.2.0.2";
+       sha256 = "e7585e9186ab3bb1e71405f3e01b31a0a9a0e6aa228b1a78a8f65d55cff782f9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-sqs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20520,19 +20438,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "1.2.0.1";
-       sha256 = "e599b394468bdeb2813b8e091b5aefc5787bb10bd2bfb24d5be4ba70a5ed0134";
+       version = "1.2.0.2";
+       sha256 = "0fa349f412a216cb1bd3c2ed6d9fa97ce0f95522caa2099fdc473e1b433ce4ef";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-ssm" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20540,19 +20456,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "1.2.0.1";
-       sha256 = "d9d47fd9820fa05fbfdd62090d9319ee6fd96f321422a995e186ab3e13d789f1";
+       version = "1.2.0.2";
+       sha256 = "d227c62cd71a81cb02bcfe6a7024ea423940dbbae18f3d8f59be6ccdb346657e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Systems Management Service SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-storagegateway" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20560,19 +20474,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "1.2.0.1";
-       sha256 = "d73bf3187bb9fd7b50ddcc74566841d1fb4e77328bbe0dddb19a324553e9c49b";
+       version = "1.2.0.2";
+       sha256 = "66f0781991832ddc0a8b68098f1d1213ffea9ed9b29effad53f4987c96914ea6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-sts" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20580,19 +20492,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "1.2.0.1";
-       sha256 = "66502b43aea7c2f70ef4559913c58fb0ae581435d0656f1ab9f9c417bcb54a2e";
+       version = "1.2.0.2";
+       sha256 = "629d92d11fc73e7d3fe7e428a309c2cd93e42291a5102075ed9220fb37b916fd";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-support" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20600,19 +20510,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "1.2.0.1";
-       sha256 = "f1996613bfcfa00eac465c90ef97f18c6fe51231def2d43de1bf90fd0992e52e";
+       version = "1.2.0.2";
+       sha256 = "c650edb5679dbc337c2aaf6eecafa85725f02e580c913164c1381ceb0f724fbe";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "amazonka-swf" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20620,19 +20528,39 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "1.2.0.1";
-       sha256 = "d68898d0a5205e3897b36c29830564f1aecbeff759ff5c379bdf12c1c60f1c01";
+       version = "1.2.0.2";
+       sha256 = "ae3a8a9b918c9bc4d1bfe6e855686fc3bbc78484c7e863186295b30318761892";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
+
+  "amazonka-test" = callPackage
+    ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
+     , case-insensitive, conduit, conduit-extra, groom, http-client
+     , http-types, lens, process, resourcet, tasty, tasty-hunit
+     , template-haskell, temporary, text, time, unordered-containers
+     , yaml
+     }:
+     mkDerivation {
+       pname = "amazonka-test";
+       version = "1.2.0.2";
+       sha256 = "cc54d2f2514d714b5261e75090f97d9432e7dd84be5c4c314d4747c733d732a8";
+       libraryHaskellDepends = [
+         aeson amazonka-core base bifunctors bytestring case-insensitive
+         conduit conduit-extra groom http-client http-types lens process
+         resourcet tasty tasty-hunit template-haskell temporary text time
+         unordered-containers yaml
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Common functionality for Amazonka library test-suites";
+       license = "unknown";
+     }) {};
 
   "amazonka-workspaces" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20640,19 +20568,17 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "1.2.0.1";
-       sha256 = "4125f1aa08ad2f9013bba8f8d0c83b41f0eeb76203fd1b7da41a306f81211448";
+       version = "1.2.0.2";
+       sha256 = "4c685ff3dca7dc5fac2ecd6d07f4400f045901a75985d62f4e38d6561a82c0d6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
          text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkSpaces SDK";
        license = "unknown";
-       broken = true;
-     }) {amazonka-test = null;};
+     }) {};
 
   "ampersand" = callPackage
     ({ mkDerivation, base, bytestring, containers, csv, directory
@@ -27732,15 +27658,15 @@ self: {
      }:
      mkDerivation {
        pname = "bitx-bitcoin";
-       version = "0.5.0.0";
-       sha256 = "e52f9757e72a5f3fa2992a4f68ffb7874131357b9327ce6908200e8e89d7f9a9";
+       version = "0.5.0.1";
+       sha256 = "24a29bdc360b4121c7992cf4118ed1caa32854d80aa2b2d3a63a63d5a0f9e38f";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types microlens
          microlens-th network scientific split text time
        ];
        testHaskellDepends = [
-         aeson base bytestring directory doctest hspec microlens safe text
-         time
+         aeson base bytestring directory doctest hspec http-conduit
+         http-types microlens safe text time
        ];
        homepage = "https://github.com/tebello-thejane/bitx-haskell";
        description = "A Haskell library for working with the BitX bitcoin exchange";
@@ -31877,8 +31803,8 @@ self: {
      }:
      mkDerivation {
        pname = "cassava";
-       version = "0.4.3.1";
-       sha256 = "e389ea01f6f346246e7002d5eb925518d134185f260cbdf1e81628eb4cffc2ac";
+       version = "0.4.4.0";
+       sha256 = "0733ede68d2670fd3e676f5a19b6d31233b266a8dc42387316e6ec7ed5e5df3f";
        libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
          hashable text unordered-containers vector
@@ -32576,19 +32502,19 @@ self: {
   "cgrep" = callPackage
     ({ mkDerivation, ansi-terminal, array, async, base, bytestring
      , cmdargs, containers, directory, dlist, either, filepath, ghc-prim
-     , mtl, regex-posix, safe, split, stm, stringsearch, unix-compat
-     , unordered-containers
+     , mtl, regex-posix, safe, split, stm, stringsearch, transformers
+     , unix-compat, unordered-containers
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.5.3";
-       sha256 = "af2f1b09aabb32fe398a575f28331979903afa00333b3f1dc0f19a6d302bca1e";
+       version = "6.5.4";
+       sha256 = "2dd9112da6cde89934d8a65a93597b161928c23c01b1af25ffae72ee104c768a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          ansi-terminal array async base bytestring cmdargs containers
          directory dlist either filepath ghc-prim mtl regex-posix safe split
-         stm stringsearch unix-compat unordered-containers
+         stm stringsearch transformers unix-compat unordered-containers
        ];
        homepage = "http://awgn.github.io/cgrep/";
        description = "Command line tool";
@@ -34985,8 +34911,8 @@ self: {
        pname = "codepad";
        version = "0.1";
        sha256 = "215704a914c2006369c63cf6000385b2ece643839a8c0f2398353f46f65a5b0e";
-       revision = "1";
-       editedCabalFile = "52fe2b461d77b36400724ddd77e6ec5a92cb9c1bbf5f97efb4cfe87adba3a07a";
+       revision = "3";
+       editedCabalFile = "6f9d1a534fa6ff720347aa10521a99456aa4b9e2a95b45f71cadb06074277c86";
        libraryHaskellDepends = [ base curl mtl network tagsoup ];
        jailbreak = true;
        homepage = "http://github.com/chrisdone/codepad";
@@ -38843,20 +38769,20 @@ self: {
      }) {};
 
   "cron" = callPackage
-    ({ mkDerivation, attoparsec, base, derive, hspec
-     , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text
-     , time, transformers-compat
+    ({ mkDerivation, attoparsec, base, derive, mtl, mtl-compat
+     , old-locale, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers-compat
      }:
      mkDerivation {
        pname = "cron";
-       version = "0.3.0";
-       sha256 = "3369302abbf131db159c4a4a8666d93e8dfbd4478c9aa56ca9d0ff45926bcaa3";
+       version = "0.3.1";
+       sha256 = "e4d506496d1be1327cbca8619a0a88a11219d54dbe716bcd05b4953f8fe75823";
        libraryHaskellDepends = [
          attoparsec base mtl mtl-compat old-locale text time
        ];
        testHaskellDepends = [
-         attoparsec base derive hspec hspec-expectations QuickCheck text
-         time transformers-compat
+         attoparsec base derive tasty tasty-hunit tasty-quickcheck text time
+         transformers-compat
        ];
        homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
@@ -42545,8 +42471,8 @@ self: {
      }:
      mkDerivation {
        pname = "debian-build";
-       version = "0.7.2.2";
-       sha256 = "e9ba2452da86da69f80ed6042de3ae73de83ee96b8483a845129b1dfc685e737";
+       version = "0.8.0.0";
+       sha256 = "07887be08bd4521fc76e272ed9c418a7c517c57360f07529206ea2b46ace52ad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52354,17 +52280,17 @@ self: {
      }) {};
 
   "fishfood" = callPackage
-    ({ mkDerivation, base, Cabal, containers, factory, mtl, QuickCheck
-     , toolshed, unix
+    ({ mkDerivation, base, Cabal, containers, directory, factory, mtl
+     , QuickCheck, toolshed
      }:
      mkDerivation {
        pname = "fishfood";
-       version = "0.0.1.3";
-       sha256 = "5318e06292c0530f60ff93b9a0182034fcc799112fe6b0acf6c7a7f72a11b72e";
+       version = "0.0.1.4";
+       sha256 = "ffdc12216f142512efca5b2a5c369f040cdf24fdb355f990d209447da9a7fed2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base Cabal containers factory mtl QuickCheck toolshed unix
+         base Cabal containers directory factory mtl QuickCheck toolshed
        ];
        homepage = "http://functionalley.eu";
        description = "Calculates file-size frequency-distribution";
@@ -53314,8 +53240,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.2.0.0";
-       sha256 = "38be7ab52831c7ea5ac5fd4e546b9f8b4a66305528af80aa6ec17214b6066e02";
+       version = "0.2.1.0";
+       sha256 = "6e6e1d3c90faf10daf0863a94742ee376457d9ea79e7b76fefe500a45f4fb6e4";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers foldl semigroupoids
          text transformers
@@ -58200,6 +58126,94 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glue-common" = callPackage
+    ({ mkDerivation, async, base, ekg-core, hashable, hspec
+     , lifted-base, monad-control, QuickCheck, quickcheck-instances
+     , text, time, transformers, transformers-base, unordered-containers
+     }:
+     mkDerivation {
+       pname = "glue-common";
+       version = "0.4.1";
+       sha256 = "ee474188b6dbb022312f4f74bd16e3cd2915bc4d7699169b29d76482ec4b23b8";
+       libraryHaskellDepends = [
+         base hashable lifted-base monad-control text time transformers
+         transformers-base unordered-containers
+       ];
+       testHaskellDepends = [
+         async base ekg-core hashable hspec lifted-base monad-control
+         QuickCheck quickcheck-instances text time transformers
+         transformers-base unordered-containers
+       ];
+       description = "Make better services";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "glue-core" = callPackage
+    ({ mkDerivation, async, base, ekg-core, glue-common, hashable
+     , hspec, lifted-base, monad-control, QuickCheck
+     , quickcheck-instances, text, time, transformers, transformers-base
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "glue-core";
+       version = "0.4.1";
+       sha256 = "d9be37ce2995583086c960c18c9457e83b9adea0b2feff7e422af6292ee0b347";
+       libraryHaskellDepends = [
+         base glue-common hashable lifted-base monad-control text time
+         transformers transformers-base unordered-containers
+       ];
+       testHaskellDepends = [
+         async base ekg-core glue-common hashable hspec lifted-base
+         monad-control QuickCheck quickcheck-instances text time
+         transformers transformers-base unordered-containers
+       ];
+       description = "Make better services";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "glue-ekg" = callPackage
+    ({ mkDerivation, async, base, ekg-core, glue-common, hashable
+     , hspec, lifted-base, monad-control, QuickCheck
+     , quickcheck-instances, text, time, transformers, transformers-base
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "glue-ekg";
+       version = "0.4.1";
+       sha256 = "f655a9c8f0af74dcc5483b7974bba30d071d2e6e658ed89de4c407922cdf58e4";
+       libraryHaskellDepends = [
+         base ekg-core glue-common hashable lifted-base monad-control text
+         time transformers transformers-base unordered-containers
+       ];
+       testHaskellDepends = [
+         async base ekg-core glue-common hashable hspec lifted-base
+         monad-control QuickCheck quickcheck-instances text time
+         transformers transformers-base unordered-containers
+       ];
+       description = "Make better services";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "glue-example" = callPackage
+    ({ mkDerivation, async, base, ekg-core, glue-common, glue-core
+     , glue-ekg, hashable, lifted-base, monad-control, monad-loops, text
+     , time, transformers, transformers-base, unordered-containers
+     }:
+     mkDerivation {
+       pname = "glue-example";
+       version = "0.4.1";
+       sha256 = "00a55b518dc5cb0678f5c943beb6b46a8089b1907315a5e96319146ee796b5cf";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async base ekg-core glue-common glue-core glue-ekg hashable
+         lifted-base monad-control monad-loops text time transformers
+         transformers-base unordered-containers
+       ];
+       description = "Make better services";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gluturtle" = callPackage
     ({ mkDerivation, base, convertible, GLUT, stm, yjsvg, yjtools }:
      mkDerivation {
@@ -71694,6 +71708,32 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "hops" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, bytestring
+     , conduit, conduit-extra, containers, deepseq, directory, filepath
+     , http-conduit, http-types, optparse-applicative, parallel
+     , QuickCheck, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "hops";
+       version = "0.0.1";
+       sha256 = "e7ef3084cd1e5ec4cb5a0f558b1fd01fe0dc7d959d30c977df0b2ed624055798";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson ansi-terminal attoparsec base bytestring conduit
+         conduit-extra containers deepseq directory filepath http-conduit
+         http-types optparse-applicative parallel text transformers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring containers deepseq QuickCheck text
+         vector
+       ];
+       homepage = "http://github.com/akc/hops";
+       description = "Hackable Operations on Power Series";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hoq" = callPackage
     ({ mkDerivation, alex, array, base, bifunctors, bytestring
      , filepath, happy, mtl, pretty, readline, void
@@ -80762,6 +80802,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ioref-stable" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "ioref-stable";
+       version = "0.1.0.0";
+       sha256 = "9044897340c044e44d3a9c33b350523147a6a95a2f1c8fb410caee880ceba314";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/cocreature/ioref-stable#readme";
+       description = "iorefs with a unique stable index";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "iothread" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -82028,10 +82080,8 @@ self: {
      }:
      mkDerivation {
        pname = "jammittools";
-       version = "0.5.0.1";
-       sha256 = "fd01f32dc319f7088791ce696d0421215a624bc7a2923bb8a39e4d102148cae1";
-       revision = "1";
-       editedCabalFile = "723bbb15b1cdc91151255c89977d67e330f4795c35dc330c5cc324d7784d53b6";
+       version = "0.5.0.2";
+       sha256 = "2d633a0410423ad12840449bb809f3bc3ffbc9aae7db6b365379b02ebeb3829c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85664,6 +85714,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-lua2" = callPackage
+    ({ mkDerivation, base, containers, Earley, lexer-applicative
+     , microlens, optparse-applicative, QuickCheck, regex-applicative
+     , semigroups, srcloc, tasty, tasty-hunit, tasty-quickcheck
+     , transformers, unordered-containers, wl-pprint
+     }:
+     mkDerivation {
+       pname = "language-lua2";
+       version = "0.1.0.0";
+       sha256 = "0b53673bcaa3445e823e7808b95b109074d29ad3083d02e57bc39ef12619a061";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers Earley lexer-applicative microlens
+         regex-applicative semigroups srcloc transformers
+         unordered-containers wl-pprint
+       ];
+       executableHaskellDepends = [
+         base Earley lexer-applicative optparse-applicative srcloc wl-pprint
+       ];
+       testHaskellDepends = [
+         base lexer-applicative QuickCheck semigroups srcloc tasty
+         tasty-hunit tasty-quickcheck unordered-containers
+       ];
+       homepage = "http://github.com/mitchellwrosen/language-lua2";
+       description = "Lua parser and pretty printer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "language-mixal" = callPackage
     ({ mkDerivation, base, mtl, parsec, pretty }:
      mkDerivation {
@@ -87389,8 +87468,8 @@ self: {
      }:
      mkDerivation {
        pname = "libmpd";
-       version = "0.9.0.3";
-       sha256 = "3f0c520f19520dae35bf0d6aebf2fffef067964ace91047193b330a6dfaaa3d6";
+       version = "0.9.0.4";
+       sha256 = "bdaa57a410396b2f02ddb9896823ce0a176751fa84261f445e9a5b7671333a7a";
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class filepath
          mtl network old-locale text time utf8-string
@@ -88136,8 +88215,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }:
      mkDerivation {
        pname = "linearscan";
-       version = "0.9.0";
-       sha256 = "1ca49da5de79fd4aa6849a2b27dae5d01b3a896968e5fce29ad0c6a670065fa2";
+       version = "0.10.0";
+       sha256 = "27a0461fc9fae738a621febf02e54049d21798a9347aaee7777c4d28f27e90b8";
        libraryHaskellDepends = [
          base containers ghc-prim mtl transformers
        ];
@@ -88154,8 +88233,8 @@ self: {
      }:
      mkDerivation {
        pname = "linearscan-hoopl";
-       version = "0.9.2";
-       sha256 = "fc52aedb4f8b3def5b993846543801de43cb5ea1f4091a2244626fe820382d6b";
+       version = "0.10.0";
+       sha256 = "4fd28d6d557c9a1f2fef6f9d8c6a49f78cedd469ddcd02629a9df515af4424ae";
        libraryHaskellDepends = [
          base containers free hoopl linearscan QuickCheck transformers
        ];
@@ -89787,6 +89866,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lookup-tables" = callPackage
+    ({ mkDerivation, base, primitive, tasty, tasty-hunit
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "lookup-tables";
+       version = "0.1.1.0";
+       sha256 = "a3b3380485752abb262c964f633c6f184a65d249658da2ae41de0276151a64b3";
+       libraryHaskellDepends = [ base primitive template-haskell ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "Statically generate lookup tables using Template Haskell";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "loop" = callPackage
     ({ mkDerivation, base, hspec, mtl }:
      mkDerivation {
@@ -91417,8 +91510,8 @@ self: {
      }:
      mkDerivation {
        pname = "mandrill";
-       version = "0.3.0.0";
-       sha256 = "f497b16900ead8851bec4d8529dfa2a0ba77397a8e7f95ef39d68928d64ffc09";
+       version = "0.4.0.0";
+       sha256 = "495c8e1863140df809275f1972ec0b2514d78790650a68413c7bf103780205a5";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
          email-validate http-client http-client-tls http-types lens mtl
@@ -92909,24 +93002,26 @@ self: {
      }) {};
 
   "microformats2-parser" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, blaze-html
-     , blaze-markup, bytestring, containers, data-default, either, hspec
-     , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl
-     , network, network-uri, options, pcre-heavy, raw-strings-qq, safe
-     , scotty, streaming-commons, stringable, template-haskell, text
-     , time, transformers, unordered-containers, vector, wai-extra, warp
-     , xml-lens, xss-sanitize
+    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base
+     , blaze-html, blaze-markup, bytestring, containers, data-default
+     , either, errors, hspec, hspec-expectations-pretty-diff
+     , html-conduit, lens-aeson, mtl, network, network-uri, options
+     , pcre-heavy, raw-strings-qq, safe, scotty, streaming-commons
+     , stringable, template-haskell, text, time, transformers
+     , unordered-containers, vector, wai-extra, warp, xml-lens
+     , xss-sanitize
      }:
      mkDerivation {
        pname = "microformats2-parser";
-       version = "1.0.1.2";
-       sha256 = "94c220abb5bfd065e492f138bb72466f37cb2ecf4c53e830226b64e950a061b9";
+       version = "1.0.1.3";
+       sha256 = "68f0da066f3c891ab15a4336eede0558f5f43dd74a70f178886e517a1fdd604f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-qq base blaze-markup bytestring containers data-default
-         either html-conduit lens-aeson network-uri pcre-heavy safe text
-         time transformers unordered-containers vector xml-lens xss-sanitize
+         aeson aeson-qq attoparsec base blaze-markup bytestring containers
+         data-default either errors html-conduit lens-aeson network-uri
+         pcre-heavy safe text time transformers unordered-containers vector
+         xml-lens xss-sanitize
        ];
        executableHaskellDepends = [
          aeson aeson-pretty base blaze-html blaze-markup data-default
@@ -94093,20 +94188,21 @@ self: {
 
   "moesocks" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
-     , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens, mtl
-     , network, optparse-applicative, random, stm, strict, text, time
-     , transformers, unix, unordered-containers
+     , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens
+     , lens-aeson, mtl, network, optparse-applicative, random, stm
+     , strict, text, time, transformers, unix, unordered-containers
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.27";
-       sha256 = "3e520127ef1727d460d65b1219d5c585973c62fc2f31713d6743aed2406d5abe";
+       version = "0.1.1.31";
+       sha256 = "a1b105ee4d257874fc844170dd73decf7035361a27667f10fe8fdcf6da88ec8b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson async attoparsec base binary bytestring containers cryptohash
-         hslogger HsOpenSSL iproute lens mtl network optparse-applicative
-         random stm strict text time transformers unix unordered-containers
+         hslogger HsOpenSSL iproute lens lens-aeson mtl network
+         optparse-applicative random stm strict text time transformers unix
+         unordered-containers
        ];
        homepage = "https://github.com/nfjinjing/moesocks";
        description = "A functional firewall killer";
@@ -95515,24 +95611,23 @@ self: {
 
   "morte" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers, deepseq
-     , happy, http-client, http-client-tls, lens-family-core, managed
-     , optparse-applicative, pipes, system-fileio, system-filepath, text
-     , text-format, transformers
+     , happy, http-client, http-client-tls, managed, microlens
+     , microlens-mtl, optparse-applicative, pipes, system-fileio
+     , system-filepath, text, text-format, transformers
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.2.1";
-       sha256 = "8fb0e54f4469de6ee9018ef51bf9ffda5dcd1abca4de87f9e47edc8b4199fb97";
+       version = "1.3.0";
+       sha256 = "bcaf4af883e8441dff551d05efcb82985051635fe1f38dc80be2fd5bf6471240";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base binary containers deepseq http-client http-client-tls
-         lens-family-core managed pipes system-fileio system-filepath text
-         text-format transformers
+         managed microlens microlens-mtl pipes system-fileio system-filepath
+         text text-format transformers
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base optparse-applicative text ];
-       jailbreak = true;
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101028,8 +101123,10 @@ self: {
      }:
      mkDerivation {
        pname = "opaleye-classy";
-       version = "0.1.0.1";
-       sha256 = "874c3f1d394653289542ef2a8ca55d8b93c01c1de78e2c0bbe1c668be39b331a";
+       version = "0.3.1.1";
+       sha256 = "2c3e216384bdb5e9e9eb84e67dd86b4daaf31568ccb5714b8aa84e2d3550ca9b";
+       revision = "1";
+       editedCabalFile = "79b08c58924ba2f19fa919f97895adb4dbb6b8e0b1644c91aaf5307e414fbc27";
        libraryHaskellDepends = [
          base bytestring lens mtl opaleye postgresql-simple
          product-profunctors transformers
@@ -102682,8 +102779,8 @@ self: {
        pname = "pandoc-csv2table";
        version = "1.0.1";
        sha256 = "0b872c518f3d3f1ca178e8a6cd2581f0a3b294cfd533e19fccd0fd95dcd79d2c";
-       revision = "2";
-       editedCabalFile = "522492bc433302f60262c0c9a19ccda171dd4eaec177f42fe75e471b79df1924";
+       revision = "3";
+       editedCabalFile = "4168dab7a87533c54ed9108ae6a65c71ec20642b85091d74b7dbf46b5c27b683";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
@@ -111010,8 +111107,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "quiver";
-       version = "0.0.0.11";
-       sha256 = "ca895a811d854e1e1e164a4f3988f3515deb2dc2220c0af6ee153b826aebb6df";
+       version = "0.0.0.12";
+       sha256 = "3ae4d76c2b4f4805b43ac6136c865142d3e847affb86e1e3dba6f9bb35e7bf04";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/zadarnowski/quiver";
        description = "Quiver finite stream processing library";
@@ -111034,8 +111131,8 @@ self: {
     ({ mkDerivation, base, data-cell, quiver }:
      mkDerivation {
        pname = "quiver-cell";
-       version = "0.0.0.2";
-       sha256 = "4e95b819c71225ac76342ace1472c93ecadbc549aa2b6d08fffa5c5e250de182";
+       version = "1.0.0";
+       sha256 = "e806d29ffb46b80ddd21cca89de3c9d4606dbc30aad523fa9691ca05e12e0c51";
        libraryHaskellDepends = [ base data-cell quiver ];
        homepage = "https://github.com/zadarnowski/quiver-cell";
        description = "Quiver combinators for cellular data processing";
@@ -112153,8 +112250,8 @@ self: {
     ({ mkDerivation, base, cabal-macosx, reactive-banana, wx, wxcore }:
      mkDerivation {
        pname = "reactive-banana-wx";
-       version = "0.9.0.1";
-       sha256 = "554e9d6715665a52e6395148749d9c1ec58db2cf8dfaa4944374a605072529ba";
+       version = "0.9.0.2";
+       sha256 = "ebb1b7e3eb6f973bd9922d27af64c94c28fc392655d2271c10b29a6c89ad3c5d";
        configureFlags = [ "-f-buildexamples" ];
        isLibrary = true;
        isExecutable = true;
@@ -113308,10 +113405,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-tdfa";
-       version = "1.2.0";
-       sha256 = "fc82ac14aae378c543a55cdac3f944aae5bff9918c4a342e1da87d38ba4ef401";
-       revision = "1";
-       editedCabalFile = "5489b69b9f0e8e181ee5134fd500bb0e2b4f914234c5223c59186035fb50478e";
+       version = "1.2.1";
+       sha256 = "a38d305eeb78be2e34542b423e6a4763fbb8ad1df757aed01993785858c871a7";
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
@@ -119232,8 +119327,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.4.4";
-       sha256 = "d2b95b9f9b8173fe83d08166707d564b2cb60526493fc7b4099e09f9480a16ec";
+       version = "0.4.4.2";
+       sha256 = "fc5c80822fef28b63d8a63bd63efd0bdd86c7d13f06d1cc6e9b0768c4efe61aa";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
@@ -119274,8 +119369,8 @@ self: {
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
        pname = "servant-blaze";
-       version = "0.4.4";
-       sha256 = "1a94a0c0ffe7cd6ddb9bea99f31ee63a1dac538965fe03b3ecd75c068f7f1a90";
+       version = "0.4.4.2";
+       sha256 = "da58db6c24bb5360c3ee027061d7e9183667c1bdbde56d70f4f8e8fef982a47b";
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
@@ -119291,8 +119386,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.4.4";
-       sha256 = "7f1b8835bddbe8b1eafa6dee9dc780561ad851e9b68e8a5c16ea45b32ee2aa54";
+       version = "0.4.4.2";
+       sha256 = "d5b95b943215aa227f390c284f84043d7c0db2531416ff44511e0d209bc498c3";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring either exceptions http-client
          http-client-tls http-media http-types network-uri safe servant
@@ -119315,8 +119410,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.4.4";
-       sha256 = "ccf92b38df3506b25e6fe93d7ded665db8c1cef76a73913afa72aa2e0d19e54e";
+       version = "0.4.4.2";
+       sha256 = "449ff2c953c4282f768c7d514f0c5a68e7d8541bde973d0ebe50372987355d90";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119369,8 +119464,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-examples";
-       version = "0.4.4";
-       sha256 = "d54bfef47474ef525285074008ec371df437891e7f2fa9473b9c6cc7f1a4f9e3";
+       version = "0.4.4.2";
+       sha256 = "76edea7d08e6ee4e5c41e2056f34353dd4033ba4a171008b92e1d34f1cbd146c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -119391,8 +119486,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-jquery";
-       version = "0.4.4";
-       sha256 = "6d5726b74ee4b83d84ab62d8f3af1afc0743715d9624056d97148a9ebb654212";
+       version = "0.4.4.2";
+       sha256 = "c807d103b47b4f7c31708deb92786171a9b7fce2314232400caf2be74b7225ad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base charset lens servant text ];
@@ -119411,14 +119506,36 @@ self: {
     ({ mkDerivation, base, http-media, lucid, servant }:
      mkDerivation {
        pname = "servant-lucid";
-       version = "0.4.4";
-       sha256 = "19ae35c4e46b409388d58a9f8e926ea18c4bbe1a4819cebe3d7d4f195adbc9ef";
+       version = "0.4.4.2";
+       sha256 = "073cff7d8e1551d1300d9d5c74159f3a7912951ac1874080359406e6de9fed01";
        libraryHaskellDepends = [ base http-media lucid servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Servant support for lucid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-mock" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-types, QuickCheck
+     , servant, servant-server, transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-mock";
+       version = "0.4.4.2";
+       sha256 = "d203424df5f2d0484f874f81ec98623c226ab89f5c232c3a884aa3b91230e7c6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring http-types QuickCheck servant servant-server
+         transformers wai
+       ];
+       executableHaskellDepends = [
+         aeson base QuickCheck servant-server warp
+       ];
+       homepage = "http://github.com/haskell-servant/servant";
+       description = "Derive a mock server for free from your servant API types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-pandoc" = callPackage
     ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types
      , servant-docs, text, unordered-containers
@@ -119508,8 +119625,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.4.4.1";
-       sha256 = "4889f732694a34232660660332cfd61b1e404f5adedd2b96a21a42dfdb51556a";
+       version = "0.4.4.2";
+       sha256 = "9c937f01f0ce3ae354097406e8617ee10bbcbd86513c5808b3c430ecba4f7fff";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122215,8 +122332,8 @@ self: {
      }:
      mkDerivation {
        pname = "sloane";
-       version = "4.0.1";
-       sha256 = "015cc227cab7e205c0684821138f36d4d38a9fee893fbf23d13add0e27ec19e9";
+       version = "4.0.2";
+       sha256 = "acac676c02d56269ea4360b6007473eabd7f36dbfdc3fb72c17b91350b8eaf8d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -125406,17 +125523,17 @@ self: {
 
   "squeeze" = callPackage
     ({ mkDerivation, base, Cabal, directory, factory, filepath, mtl
-     , QuickCheck, random, toolshed, unix
+     , QuickCheck, random, toolshed
      }:
      mkDerivation {
        pname = "squeeze";
-       version = "1.0.4.5";
-       sha256 = "9079a9e9163b27612c4625542bcd530766576e1d43e496c21cc42ffdbf3c6231";
+       version = "1.0.4.7";
+       sha256 = "f1961d7922ca1fb8839cc3d5c536d3b4c7e8aa81ddbb187655581e8e97bdb31a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base Cabal directory factory filepath mtl QuickCheck random
-         toolshed unix
+         toolshed
        ];
        homepage = "http://functionalley.eu";
        description = "A file-packing application";
@@ -127191,11 +127308,11 @@ self: {
     ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "streaming";
-       version = "0.1.0.11";
-       sha256 = "824351fc0c99bd5141ad4fef9db85032c5fb4d5cd745b9aca1490ea4dbfccf06";
+       version = "0.1.0.15";
+       sha256 = "8c9ade2b4353a397b77818223e367af22ec77f1ca137229f8009c947757b832f";
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        homepage = "https://github.com/michaelt/streaming";
-       description = "A free monad transformer optimized for streaming applications";
+       description = "a free monad transformer optimized for streaming applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -127205,12 +127322,12 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-bytestring";
-       version = "0.1.0.2";
-       sha256 = "cae7ee4205506ab7aa22904a4a055249f8225c5d6c4049313a09ce219ba98985";
+       version = "0.1.0.4";
+       sha256 = "6b1feca189bac886ca543c00e6952452a6a5033cc33d9ca13be52195dc9d9a42";
        libraryHaskellDepends = [
          base bytestring deepseq mmorph mtl streaming transformers
        ];
-       description = "effectful bytestrings, or: lazy bytestring done right";
+       description = "effectful byte steams, or: lazy bytestring done right";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -137503,8 +137620,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "universe-base";
-       version = "1.0";
-       sha256 = "8475cc6dcfd785e6e9baef146bba7b5aa372ff55311d75866acb1c0467ac0fae";
+       version = "1.0.1";
+       sha256 = "6de2abd6951f0ae4ef4704bace4117196a5224b4f59c69706424652ca9e474fa";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/dmwit/universe";
        description = "A class for finite and recursively enumerable types and some helper functions for enumerating them";
@@ -137529,12 +137646,11 @@ self: {
      }:
      mkDerivation {
        pname = "universe-instances-extended";
-       version = "1.0";
-       sha256 = "f1ad69a7cbda23c870ebf501715297d2c30ddf6288e95fe1bd6283168d3d8a32";
+       version = "1.0.0.1";
+       sha256 = "665b272701b16a6bb8d40a5396aa1dcb038f002452ebdc29d353e3be2070c997";
        libraryHaskellDepends = [
          adjunctions base comonad universe-instances-base void
        ];
-       jailbreak = true;
        homepage = "https://github.com/dmwit/universe";
        description = "Universe instances for types from select extra packages";
        license = stdenv.lib.licenses.bsd3;
@@ -143134,6 +143250,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "woot" = callPackage
+    ({ mkDerivation, base, hspec, vector }:
+     mkDerivation {
+       pname = "woot";
+       version = "0.0.0.0";
+       sha256 = "891823fa0a134df0857cb371fa3e100a54c227ce29e428b6f6eeaf983e7b8fb0";
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [ base hspec ];
+       jailbreak = true;
+       homepage = "https://github.com/TGOlson/woot-haskell";
+       description = "Real time group editor without operational transform";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "word-trie" = callPackage
     ({ mkDerivation, base, binary, containers, hspec, QuickCheck }:
      mkDerivation {
@@ -144955,6 +145085,11 @@ self: {
          base containers directory extensible-exceptions filepath mtl
          process unix utf8-string X11
        ];
+       postInstall = ''
+         shopt -s globstar
+         mkdir -p $out/share/man/man1
+         mv "$out/"**"/man/"*.1 $out/share/man/man1/
+       '';
        homepage = "http://xmonad.org";
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
@@ -145591,8 +145726,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.8.13";
-       sha256 = "f366bdd6ddbc5f94f3f783b502178dcd27afc257bdf5e8d67fcf9246aeed0f7a";
+       version = "0.8.14";
+       sha256 = "f40d2c54dd4be0616e1dde897c7388cdb5882f0f7545b37bb3c966fc96bcf69a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -148139,6 +148274,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {gomp = null; inherit (pkgs) z3;};
 
+  "zalgo" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "zalgo";
+       version = "0.1.0.3";
+       sha256 = "74f376016d855eee365ad3d9d7ef1fb42106fbf0d302c918dce26f676b243b2f";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/mniip/zalgo";
+       description = "Z-algorithm implemented on haskell's built-in cons-cell-based lists";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "zampolit" = callPackage
     ({ mkDerivation, base, cmdargs, containers, directory, filepath
      , HSH, MissingH, old-locale, parsec, time

From 0059984294a06fbc23417a50a9ab23180ed763df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Aug 2015 02:09:40 +0200
Subject: [PATCH 1798/2016] haskell-MFlow: build fixed upstream

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8104dceafa9..e299dd5e8b5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1016,7 +1016,4 @@ self: super: {
   # https://github.com/brendanhay/amazonka/issues/203
   amazonka-core = dontCheck super.amazonka-core;
 
-  # https://github.com/agocorona/MFlow/issues/63
-  MFlow = addBuildTool super.MFlow self.cpphs;
-
 }

From 34687b53e660c8a556043d8221a73d982d0e617b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Aug 2015 12:55:11 +0200
Subject: [PATCH 1799/2016] haskell-amazonka-core: test suite build failure has
 been fixed upstream

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e299dd5e8b5..633651dd10d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1013,7 +1013,4 @@ self: super: {
   # https://github.com/basvandijk/concurrent-extra/issues/12
   concurrent-extra = dontCheck super.concurrent-extra;
 
-  # https://github.com/brendanhay/amazonka/issues/203
-  amazonka-core = dontCheck super.amazonka-core;
-
 }

From d7055b15b741adb96629873db80be82d1870df3f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Aug 2015 12:04:54 +0200
Subject: [PATCH 1800/2016] ghc: drop obsolete version 7.10.1

The new 7.10.2 version works fine.
---
 pkgs/development/compilers/ghc/7.10.1.nix | 81 -----------------------
 pkgs/top-level/haskell-packages.nix       |  7 --
 2 files changed, 88 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghc/7.10.1.nix

diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix
deleted file mode 100644
index 34c2e3b36b0..00000000000
--- a/pkgs/development/compilers/ghc/7.10.1.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv }:
-
-let
-
-  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"
-    ${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"
-    ''}
-  '';
-
-  # We patch Cabal for GHCJS. See: https://github.com/haskell/cabal/issues/2454
-  # This should be removed when GHC includes Cabal > 1.22.2.0
-  cabalPatch = fetchpatch {
-    url = https://github.com/haskell/cabal/commit/f11b7c858bb25be78b81413c69648c87c446859e.patch;
-    sha256 = "1z56yyc7lgc78g847qf19f5n1yk054pzlnc2i178dpsj0mgjppyb";
-  };
-
-in
-
-stdenv.mkDerivation rec {
-  version = "7.10.1";
-  name = "ghc-${version}";
-
-  src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/7.10.1/${name}-src.tar.xz";
-    sha256 = "181srnj3s5dcqb096yminjg50lq9cx57075n95y5hz33gbbf7wwj";
-  };
-
-  buildInputs = [ ghc perl ];
-
-  enableParallelBuilding = true;
-
-  patches = [
-    # Fix user pkg db location for GHCJS: 
-    # https://ghc.haskell.org/trac/ghc/ticket/10232
-    (fetchpatch {
-      url = "https://git.haskell.org/ghc.git/patch/c46e4b184e0abc158ad8f1eff6b3f0421acaf984";
-      sha256 = "0fkdyqd4bqp742rydwmqq8d2n7gf61bgdhaiw8xf7jy0ix7lr60w";
-    })
-    # Fix TH + indirect symbol resolution on OSX (or any system using gold linker)
-    # https://phabricator.haskell.org/D852
-    ./osx-dylib-resolver.patch
-  ];
-
-  postPatch = ''
-    pushd libraries/Cabal
-    patch -p1 < ${cabalPatch}
-    popd
-  '';
-
-  preConfigure = ''
-    echo >mk/build.mk "${buildMK}"
-    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"
-  '';
-
-  configureFlags = [
-    "--with-gcc=${stdenv.cc}/bin/cc"
-    "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib"
-  ];
-
-  # 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 43fc9976ec7..dbf108686b3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -31,9 +31,6 @@ rec {
     ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });
-    ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
     ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });
@@ -86,10 +83,6 @@ rec {
       ghc = compiler.ghc784;
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
     };
-    ghc7101 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc7101;
-      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
-    };
     ghc7102 = callPackage ../development/haskell-modules {
       ghc = compiler.ghc7102;
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };

From c7a9fa11c05a5ac286f961c094f87237f1fd66bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Aug 2015 12:29:41 +0200
Subject: [PATCH 1801/2016] haskell-DSA fails its test suite.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 633651dd10d..3cef7eeebff 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1013,4 +1013,7 @@ self: super: {
   # https://github.com/basvandijk/concurrent-extra/issues/12
   concurrent-extra = dontCheck super.concurrent-extra;
 
+  # https://github.com/GaloisInc/DSA/issues/1
+  DSA = dontCheck super.DSA;
+
 }

From de2c043d5fdd4e0e26bdfe3a4b8e080daa05aa92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Aug 2015 12:09:03 +0200
Subject: [PATCH 1802/2016] ghc: install bash completion shipped in version
 7.10.x and later

Addresses one half of https://github.com/NixOS/nixpkgs/issues/9265.
---
 pkgs/development/compilers/ghc/7.10.2.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index 064610c3557..834639380a5 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -47,6 +47,9 @@ stdenv.mkDerivation rec {
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
 
   postInstall = ''
+    # Install the bash completion file.
+    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc
+
     # Patch scripts to include "readelf" and "cat" in $PATH.
     for i in "$out/bin/"*; do
       test ! -h $i || continue

From dea5d87e42b3f595407430a9a39b7cea4f51a7e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Aug 2015 12:37:55 +0200
Subject: [PATCH 1803/2016] ghc-7.10.2: enable documentation builds by passing
 the required XML/XSLT toolchain

Closes https://github.com/NixOS/nixpkgs/issues/9265.

Also, pass a hscolour binary to get source code links in the generated Haddock
documentation: closes https://github.com/NixOS/nixpkgs/issues/2985.
---
 pkgs/development/compilers/ghc/7.10.2.nix | 6 ++++--
 pkgs/top-level/haskell-packages.nix       | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index 834639380a5..73fcd788c74 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils }:
+{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
+, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
+}:
 
 let
 
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
     sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal";
   };
 
-  buildInputs = [ ghc perl ];
+  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index dbf108686b3..cb8c53ad06c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -31,7 +31,7 @@ rec {
     ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });
-    ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+    ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin {

From 4a8797d8276aa1bd9c09d1f591eef1bd04adf2ec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 29 Aug 2015 23:29:17 +0200
Subject: [PATCH 1804/2016] haskell-generic-builder: stop pre-pending
 "haskell-" to package names

A derivation of the Hackage package "foo" is called "haskell-foo" if it is a
library, but only "foo" if it is an executable (without a library). This
distinction used to be fine when Haskell packages where visible to operations
like "nix-env -qa" or "nix-env -i", but after our switch to Haskell NG it has
no more purpose. Consequently, this patch removes the name prefix from all
Haskell packages -- every Haskell package is now called exactly like it's
called on Hackage.

Closes https://github.com/NixOS/nixpkgs/pull/9538.
---
 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 f76719a3117..c04d8fdb409 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -130,7 +130,7 @@ in
 assert allPkgconfigDepends != [] -> pkgconfig != null;
 
 stdenv.mkDerivation ({
-  name = "${optionalString (hasActiveLibrary && pname != "ghcjs") "haskell-"}${pname}-${version}";
+  name = "${pname}-${version}";
 
   pos = builtins.unsafeGetAttrPos "pname" args;
 

From 8a0a151d60c6ccd657d4f1d9af6daf3ca5692688 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 01:07:52 +0200
Subject: [PATCH 1805/2016] freefall: 3.19 -> 4.2

---
 pkgs/os-specific/linux/freefall/default.nix | 32 +++++++++------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix
index 34d0f3881e4..683ec9f6155 100644
--- a/pkgs/os-specific/linux/freefall/default.nix
+++ b/pkgs/os-specific/linux/freefall/default.nix
@@ -1,39 +1,33 @@
 { stdenv, fetchurl }:
 
-let version = "3.19"; in
+let version = "4.2"; in
 stdenv.mkDerivation {
   name = "freefall-${version}";
 
   src = fetchurl {
-    sha256 = "0v40b5l6dcviqgl47bxlcbimz7kawmy1c2909axi441jwlgm2hmy";
-    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "1syv8n5hwzdbx69rsj4vayyzskfq1w5laalg5jjd523my52f086g";
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
   };
 
-  buildPhase = ''
-    cd Documentation/laptops
+  postPatch = ''
+    cd tools/laptop/freefall
 
     # Default time-out is a little low, probably because the AC/lid status
     # functions were never implemented. Because no-one still uses HDDs, right?
-    substituteInPlace freefall.c --replace "alarm(2)" "alarm(5)"
-
-    cc -o freefall freefall.c
+    substituteInPlace freefall.c --replace "alarm(2)" "alarm(7)"
   '';
 
-  installPhase = ''
-    mkdir -p $out/bin
-    install freefall $out/bin
-  '';
+  makeFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
     description = "Free-fall protection for spinning HP/Dell laptop hard drives";
     longDescription = ''
-      ATA/ATAPI-7 specifies the IDLE IMMEDIATE command with unload feature.
-      Issuing this command should cause the drive to switch to idle mode and
-      unload disk heads. This feature is being used in modern laptops in
-      conjunction with accelerometers and appropriate software to implement
-      a shock protection facility. The idea is to stop all I/O operations on
-      the internal hard drive and park its heads on the ramp when critical
-      situations are anticipated. This has no effect on SSD devices!
+      Provides a shock protection facility in modern laptops with spinning hard
+      drives, by stopping all input/output operations on the internal hard drive
+      and parking its heads on the ramp when critical situations are anticipated.
+      Requires support for the ATA/ATAPI-7 IDLE IMMEDIATE command with unload
+      feature, which should cause the drive to switch to idle mode and unload the
+      disk heads, and an accelerometer device. It has no effect on SSD devices!
     '';
     license = licenses.gpl2;
     platforms = with platforms; linux;

From 5d6323817c56c99ac772229d3ecd7e6b2b9033d0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 01:32:37 +0200
Subject: [PATCH 1806/2016] python-packages: sqlparse 0.1.14 -> 0.1.16

---
 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 12e4eab751f..2b62cf4fd76 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13527,11 +13527,11 @@ let
 
   sqlparse = buildPythonPackage rec {
     name = "sqlparse-${version}";
-    version = "0.1.14";
+    version = "0.1.16";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/sqlparse/${name}.tar.gz";
-      sha256 = "1w6shyh7n139cp636sym0frdyiwybw1m7gd2l4s3d7xbaccf6qg5";
+      sha256 = "108gy82x7davjrn3jqn7yv4r5v4jrzp892ysfx8l00abr8v6r337";
     };
 
     meta = {

From 42f329e84157bc5801dd47e354042b13ce4b5020 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 01:58:30 +0200
Subject: [PATCH 1807/2016] python-packages: pgcli 0.19.1 -> 0.19.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2b62cf4fd76..a83a7f09c3c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9543,10 +9543,10 @@ let
 
   pgcli = buildPythonPackage rec {
     name = "pgcli-${version}";
-    version = "0.19.1";
+    version = "0.19.2";
 
     src = pkgs.fetchFromGitHub {
-      sha256 = "1r34bbqbd4h72cl0cxi9w6q2nwx806wpxq220mzyiy8g45xv0ghj";
+      sha256 = "1xl3yqwksnszd2vcgzb576m56613qcl82jfqmb9fbvcqlcpks6ln";
       rev = "v${version}";
       repo = "pgcli";
       owner = "dbcli";

From e3a93b6e9a83dac8047ea9368a94ef4e16cd55fa Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 02:49:14 +0200
Subject: [PATCH 1808/2016] python-packages: mycli 1.3.0 -> 1.4.0

Remove now unused prompt_toolkit0_45, and pull the unversioned
attribute back to release 0.46 until dependents catch up.
---
 pkgs/top-level/python-packages.nix | 40 ++++--------------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a83a7f09c3c..ec3d1ae7df5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9556,10 +9556,6 @@ let
       click configobj prompt_toolkit psycopg2 pygments sqlparse
     ];
 
-    postPatch = ''
-      substituteInPlace setup.py --replace "==" ">="
-    '';
-
     meta = {
       inherit version;
       description = "Command-line interface for PostgreSQL";
@@ -9575,17 +9571,17 @@ let
 
   mycli = buildPythonPackage rec {
     name = "mycli-${version}";
-    version = "1.3.0";
+    version = "1.4.0";
 
     src = pkgs.fetchFromGitHub {
-      sha256 = "109jz84m29v4fjhk2ngsfc1b6zw4w6dbjlr2izvib63ylcz7b5nh";
+      sha256 = "175jcfixjkq17fbda9kifbljfd5iwjpjisvhs5xhxsyf6n5ykv2l";
       rev = "v${version}";
       repo = "mycli";
       owner = "dbcli";
     };
 
     propagatedBuildInputs = with self; [
-      pymysql configobj sqlparse prompt_toolkit0_45 pygments click
+      pymysql configobj sqlparse prompt_toolkit pygments click
     ];
 
     meta = {
@@ -9917,36 +9913,10 @@ let
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.47";
+    version = "0.46";
 
     src = pkgs.fetchurl {
-      sha256 = "1xkrbz7d2mzd5r5a8aqbnhym57fkpri9x73cql5vb573glzwddla";
-      url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
-    };
-
-    buildInputs = with self; [ jedi ipython pygments ];
-    propagatedBuildInputs = with self; [ docopt six wcwidth ];
-
-    meta = {
-      description = "Python library for building powerful interactive command lines";
-      longDescription = ''
-        prompt_toolkit could be a replacement for readline, but it can be
-        much more than that. It is cross-platform, everything that you build
-        with it should run fine on both Unix and Windows systems. Also ships
-        with a nice interactive Python shell (called ptpython) built on top.
-      '';
-      homepage = https://github.com/jonathanslenders/python-prompt-toolkit;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ nckx ];
-    };
-  };
-
-  prompt_toolkit0_45 = buildPythonPackage rec {
-    name = "prompt_toolkit-${version}";
-    version = "0.45";
-
-    src = pkgs.fetchurl {
-      sha256 = "19lp15rc0rq4jqaacg2a38cdgfy2avhf5v97yanasx4n2swx4gsm";
+      sha256 = "1yq9nis1b2rgpndi2rqh4divf6j22jjva83r5z8jf7iffywmr8hs";
       url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
     };
 

From 45d5833e82f2489b289685350f28e9343ab00628 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 14:39:44 +0200
Subject: [PATCH 1809/2016] debian_devscripts: 2.15.4 -> 2.15.8

Also:
- add some previously missing dependencies and patch /usr paths
- fix fetching of https:// URIs with perlPackages.LWPProtocolHttps
- remove the bash completion work-around (no longer needed)
- add newly required make flags
- change licence from string to attribute (still unspecified)

CC maintainer @raskin.
---
 pkgs/tools/misc/debian-devscripts/default.nix | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index f8925d26bea..b6158ab6445 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -1,30 +1,50 @@
 {stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile
 , FileDesktopEntry, libxslt, docbook_xsl, python3, setuptools, makeWrapper
-, perlPackages
+, perlPackages, curl, gnupg, diffutils
+, sendmailPath ? "/var/setuid-wrappers/sendmail"
 }:
+
 stdenv.mkDerivation rec {
-  version = "2.15.4";
+  version = "2.15.8";
   name = "debian-devscripts-${version}";
+
   src = fetchurl {
     url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
-    sha256 = "03ldbx07ga9df7z9yiq6grb6cms1dr8hlbis2hvbmfcs6gcr3q72";
+    sha256 = "1zw7phaigncblxb3jp4m8pk165hylk1f088k51nhj9d7z5iz6bbx";
   };
+
   buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile 
     FileDesktopEntry libxslt python3 setuptools makeWrapper
-    perlPackages.ParseDebControl ];
+    perlPackages.ParseDebControl perlPackages.LWPProtocolHttps
+    curl gnupg diffutils ];
+
   preConfigure = ''
     export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}";
-    sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
-    sed -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' -i Makefile */Makefile
     tgtpy="$out/lib/${python3.libPrefix}/site-packages"
     mkdir -p "$tgtpy"
     export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"
-    sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile*
-    sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile*
-
-    # Completion currently spams every shell startup with an error. Disable for now:
-    sed "/\/bash_completion\.d/d" -i scripts/Makefile
+    find po4a scripts -type f -exec sed -r \
+      -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg2@g" \
+      -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \
+      -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \
+      -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \
+      -e "s@(command -v|/usr/bin/)curl@${curl}/bin/curl@g" \
+      -i {} +
+    sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
+    sed -r \
+      -e "s@/usr( |$|/)@$out\\1@g" \
+      -e "s@/etc( |$|/)@$out/etc\\1@g" \
+      -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' \
+      -i Makefile* */Makefile*
   '';
+
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX="
+    "COMPL_DIR=/share/bash-completion/completions"
+    "PERLMOD_DIR=/share/devscripts"
+  ];
+
   postInstall = ''
     sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/*
     for i in "$out/bin"/*; do
@@ -34,9 +54,10 @@ stdenv.mkDerivation rec {
         --prefix PYTHONPATH : "$out/lib/python3.4/site-packages"
     done
   '';
-  meta = {
+
+  meta = with stdenv.lib; {
     description = ''Debian package maintenance scripts'';
-    license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO
-    maintainers = with stdenv.lib.maintainers; [raskin];
+    license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO
+    maintainers = with maintainers; [raskin];
   };
 }

From 5ab17dbe986d22c31aebf2053e2ee7f5327a4382 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 15:17:48 +0200
Subject: [PATCH 1810/2016] rescuetime: 2.8.8.1040 -> 2.8.9.1170

Fix build broken by upstream (unversioned) .deb change.

CC maintainer @cstrahan.
---
 pkgs/applications/misc/rescuetime/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index a57647e18e7..a5b90890df2 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -5,17 +5,18 @@ let
     if stdenv.system == "i686-linux" then fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb";
-      sha256 = "1np8fkmgcwfjv82v4y1lkqcgfki368w6317gac3i0vlqi4qbfjiq";
+      sha256 = "15x3nvhxk4f0rga0i99c6lhaa1rwdi446kxnx1l4jprhbl788sx6";
     } else fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
-      sha256 = "0bb0kzayj0wwvyh1b8g0l3aw2xqlrkhn85j3aw90xmchnsx42xh5";
+      sha256 = "0ibdlx8fdlmh81908d1syb7c5lf88pqp49fl7r43cj6bybpdx411";
     };
 
 in
 
 stdenv.mkDerivation {
-  name = "rescuetime-2.8.8.1040";
+  # https://www.rescuetime.com/updates/linux_release_notes.html
+  name = "rescuetime-2.8.9.1170";
   inherit src;
   buildInputs = [ dpkg makeWrapper ];
   unpackPhase = ''

From 80a882e6cca689220c0248e59197e6ec94570738 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 15:21:10 +0200
Subject: [PATCH 1811/2016] dpkg: 1.18.1 -> 1.18.2

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

diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 022b8dfc2ca..2357ec77f12 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }:
 
-let version = "1.18.1"; in
+let version = "1.18.2"; in
 
 stdenv.mkDerivation {
   name = "dpkg-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "1nlr0djn5zl9cmlcxxmd7dk3fx0zw9gi4qm7cfz0r5qwl9yaj9nb";
+    sha256 = "192pqjd0c7i91kiqzn3cq2sqp5vivf0079i0wybdc9yhfcm4yj0i";
   };
 
   postPatch = ''
@@ -20,10 +20,10 @@ stdenv.mkDerivation {
   configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg PERL_LIBDIR=$(out)/${perl.libPrefix}";
 
   preConfigure = ''
-    # Nice: dpkg has a circular dependency on itself.  Its configure
+    # Nice: dpkg has a circular dependency on itself. Its configure
     # script calls scripts/dpkg-architecture, which calls "dpkg" in
-    # $PATH.  It doesn't actually use its result, but fails if it
-    # isn't present.  So make a dummy available.
+    # $PATH. It doesn't actually use its result, but fails if it
+    # isn't present, so make a dummy available.
     touch $TMPDIR/dpkg
     chmod +x $TMPDIR/dpkg
     PATH=$TMPDIR:$PATH

From 2245e09218b6be0ff3bbc2b2fb41630814154092 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 16:42:37 +0200
Subject: [PATCH 1812/2016] geolite-legacy: update 2015-08-24 -> 2015-08-31

---
 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 795299892ed..eeefc4744a2 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-08-24";
+  version = "2015-08-31";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
     "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "10jdh5dknk5y1kawgp5ijg6c74a7nrmmhhw75q9x82l151irdfky";
+    "0pg3715cjmajrfr5xad3g9z386gyk35zq3zkk7ah6sfidavik6vc";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "10yrkilf0mx6i61zg2r2sd0dn2lwvq8k97jfwv8ysvq98lxb51a1";
+    "1ajk18ydzhwflki25cp7fhzfphysgndig3h0f9p655qhsm0c3gzj";
 
   meta = with stdenv.lib; {
     inherit version;

From 6a02e7201c81167dcf7518ee898385c01c6acd43 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 16:52:47 +0200
Subject: [PATCH 1813/2016] packagekit: 1.0.7 -> 1.0.8

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

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 7075b03bdfa..c2842ae2e75 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python, sqlite }:
 
-let version = "1.0.7"; in
+let version = "1.0.8"; in
 stdenv.mkDerivation {
   name = "packagekit-${version}";
 
   src = fetchurl {
-    sha256 = "0klwr0y3a72xpz6bwv4afbk3vvx5r1av5idhz3mx4p9ssnscb1mi";
+    sha256 = "1vaxn4kwdwx6p03n88k4pnbd2l6lb0cbxpcs88kjack1jml17c3l";
     url = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz";
   };
 

From a88b9bf19e85ce25195793ca048a77b0582a9932 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Aug 2015 17:48:51 +0200
Subject: [PATCH 1814/2016] Revert "openvpn: 2.3.6 -> 2.3.8"

This reverts commit f547eaab44ed9f2323fcea74c2a91c6bf50e47f1 because
it breaks asking passphrased via systemd.
---
 pkgs/tools/networking/openvpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index b2bf65ff9ee..9dd16be4154 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "openvpn-2.3.8";
+  name = "openvpn-2.3.6";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
-    sha256 = "0lbw22qv3m0axhs13razr6b4x1p7jcpvf9rzb15b850wyvpka92k";
+    sha256 = "09jvxr4wcsmk55gqv3cblm60kzs9ripv9h4y50d1lbn177zx5bkv";
   };
 
   patches = optional stdenv.isLinux ./systemd-notify.patch;

From 9000ddce902ee87cb2db683f83f639685f685095 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Aug 2015 17:53:30 +0200
Subject: [PATCH 1815/2016] openvpn: Update to 2.3.7

---
 pkgs/tools/networking/openvpn/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 9dd16be4154..5b95dd159bf 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "openvpn-2.3.6";
+  name = "openvpn-2.3.7";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
-    sha256 = "09jvxr4wcsmk55gqv3cblm60kzs9ripv9h4y50d1lbn177zx5bkv";
+    sha256 = "0vhl0ddpxqfibc0ah0ci7ix9bs0cn5shhmhijg550qpbdb6s80hz";
   };
 
   patches = optional stdenv.isLinux ./systemd-notify.patch;
@@ -21,11 +21,6 @@ stdenv.mkDerivation rec {
     IPROUTE=${iproute}/sbin/ip
   '';
 
-  preConfigure = ''
-    substituteInPlace ./src/openvpn/console.c \
-      --replace /bin/systemd-ask-password /run/current-system/sw/bin/systemd-ask-password
-  '';
-
   postInstall = ''
     mkdir -p $out/share/doc/openvpn/examples
     cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples

From a57e6da65a95b099a05d174c3acd6f4b3f8e2b00 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Mon, 10 Aug 2015 17:39:10 +0200
Subject: [PATCH 1816/2016] python-plumbum: update 1.4.2 -> 1.5.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec3d1ae7df5..777b4838176 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9771,13 +9771,13 @@ let
   };
 
   plumbum = buildPythonPackage rec {
-    name = "plumbum-1.4.2";
+    name = "plumbum-1.5.0";
 
     buildInputs = with self; [ self.six ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/plumbum/${name}.tar.gz";
-      md5 = "38b526af9012a5282ae91dfe372cefd3";
+      sha256 = "b759f9e3b6771dff3332f01bc0683d1a56218f44d97942dabd906a0cd1cfb756";
     };
   };
 

From ba3e4f6c10d2796fc6570f7ac5aa218f68be7523 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Mon, 10 Aug 2015 17:41:10 +0200
Subject: [PATCH 1817/2016] python-pymongo: update 2.8 -> 3.0.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 777b4838176..661ef88bb00 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11487,11 +11487,11 @@ let
   };
 
   pymongo = buildPythonPackage rec {
-    name = "pymongo-2.8";
+    name = "pymongo-3.0.3";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pymongo/${name}.tar.gz";
-      sha256 = "0d9rlxghqg9dqmcmrlf1lw9ap2g6npv6q4slp5agnm7vci9zchq5";
+      sha256 = "3c6b2317f8031bc1e200fd1ea35f00a96f4569e3f3f220a5e66ab6227d96ccaf";
     };
 
     doCheck = false;

From 579424f94ae030978c9db2705c60b3d84bd9c34a Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Mon, 10 Aug 2015 17:42:39 +0200
Subject: [PATCH 1818/2016] python-PyYAML: update 3.10 -> 3.11

---
 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 661ef88bb00..0b41b585ea1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11748,11 +11748,11 @@ let
 
 
   pyyaml = buildPythonPackage (rec {
-    name = "PyYAML-3.10";
+    name = "PyYAML-3.11";
 
     src = pkgs.fetchurl {
       url = "http://pyyaml.org/download/pyyaml/${name}.zip";
-      sha256 = "1r127fa354ppb667f4acxlzwxixap1jgzjrr790bw8mcpxv2hqaa";
+      sha256 = "19bb3ac350ef878dda84a62d37c7d5c17a137386dde9c2ce7249c7a21d7f6ac9";
     };
 
     buildInputs = with self; [ pkgs.pyrex ];

From 73c61b6286f4c69e131a0a86283f279f8fd5e310 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Mon, 10 Aug 2015 17:43:27 +0200
Subject: [PATCH 1819/2016] python-sh: update 1.08 -> 1.11

---
 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 0b41b585ea1..9e31283c16f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13068,11 +13068,11 @@ let
 
 
   sh = buildPythonPackage rec {
-    name = "sh-1.08";
+    name = "sh-1.11";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/s/sh/${name}.tar.gz";
-      md5 = "4028bcba85daa0aef579ed24261e88a3";
+      md5 = "7af8df6c92d29ff927b6db0146bddec3";
     };
 
     doCheck = false;

From 96a153925623144e69d436b9c95177bc39e9ef8a Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Mon, 10 Aug 2015 20:45:45 +0200
Subject: [PATCH 1820/2016] python-cgroup-utils: init at 0.6

---
 lib/maintainers.nix                |  1 +
 pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ccce0d2e60d..b43b8385f55 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -143,6 +143,7 @@
   kragniz = "Louis Taylor <kragniz@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
   lassulus = "Lassulus <lassulus@gmail.com>";
+  layus = "Guillaume Maudoux <layus.on@gmail.com>";
   lebastr = "Alexander Lebedev <lebastr@gmail.com>";
   leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>";
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9e31283c16f..7f4d4655967 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1104,6 +1104,29 @@ let
     propagatedBuildInputs = with self; [ boto crcmod psutil ];
   };
 
+  cgroup-utils = buildPythonPackage rec {
+    version = "0.6";
+    name = "cgroup-utils-${version}";
+
+    propagatedBuildInputs = with self; [ argparse ];
+    buildInputs = with self; [ pep8 nose ];
+    # Pep8 tests fail...
+    doCheck = false;
+
+    src = pkgs.fetchFromGitHub {
+      owner = "peo3";
+      repo = "cgroup-utils";
+      rev = "v${version}";
+      sha256 = "1ck0aijzrg9xf6hjdxnynkapnyxw0y385jb0q7wyq4jf77ayfszc";
+    };
+
+    meta = {
+      description = "Utility tools for control groups of Linux";
+      maintainers = with maintainers; [ layus ];
+      license = licenses.gpl2;
+    };
+  };
+
   circus = buildPythonPackage rec {
     name = "circus-0.11.1";
 

From 0db8e6c792948afc247d10e1f97f1c32a7d128c3 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Tue, 11 Aug 2015 23:59:44 +0200
Subject: [PATCH 1821/2016] python-PyLTI: init at 0.4.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7f4d4655967..9aa31d5a99c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4010,6 +4010,29 @@ let
     };
   };
 
+  lti = buildPythonPackage rec {
+    version = "0.4.0";
+    name = "PyLTI-${version}";
+
+    propagatedBuildInputs = with self; [ httplib2 oauth oauth2 semantic-version ];
+    buildInputs = with self; [
+      flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore
+      pytestflakes pytestpep8 sphinx mock
+    ];
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/P/PyLTI/${name}.tar.gz";
+      sha256 = "1lkk6qx8yfx1h0rhi4abnd44x0wakggi6zs0nvi572lajf6ydmdh";
+    };
+
+    meta = {
+      description = "Implementation of IMS LTI interface that works with edX";
+      homepage = "https://github.com/mitodl/pylti";
+      license = licenses.bsdOriginal;
+      maintainers = with maintainers; [ layus ];
+    };
+  };
+
   logilab_astng = buildPythonPackage rec {
     name = "logilab-astng-0.24.3";
 

From 00abee22bee06fdb57ee67cc514ab387deb186c9 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Wed, 12 Aug 2015 00:00:59 +0200
Subject: [PATCH 1822/2016] python-multiprocessing: init at 2.6.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9aa31d5a99c..76dfd30a42a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8112,6 +8112,15 @@ 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 637097a14295f063fe41ae930b7f005ae88c6eb6 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Wed, 12 Aug 2015 00:01:35 +0200
Subject: [PATCH 1823/2016] python-simpleldap: init at 0.8

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 76dfd30a42a..cbe2fa76400 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12785,6 +12785,30 @@ let
     };
   });
 
+  simpleldap = buildPythonPackage rec {
+    version = "0.8";
+    name = "simpleldap-${version}";
+
+    propagatedBuildInputs = with self; [ ldap ];
+    buildInputs = with self; [ pep8 pytest tox ];
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/simpleldap/simpleldap-${version}.tar.gz";
+      md5 = "f8a95b24895596338032ca4b4450f1de";
+    };
+
+    meta = {
+      description = "A module that makes simple LDAP usage simple";
+      longDescription = ''
+        A small wrapper around the python-ldap library that provides a more
+        Pythonic interface for LDAP server connections, LDAP objects, and the
+        common get and search operations.
+      '';
+      license = licenses.mit;
+      maintainers = with maintainers; [ layus ];
+    };
+  };
+
   simpleparse = buildPythonPackage rec {
     version = "2.1.1";
     name = "simpleparse-${version}";

From c070bd7e0a917017d6627dcd03368d1054f2497b Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Wed, 12 Aug 2015 00:03:03 +0200
Subject: [PATCH 1824/2016] python-tidylib: init at 0.2.4

---
 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 cbe2fa76400..228232dd383 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12959,6 +12959,27 @@ let
     };
   };
 
+  tidylib = buildPythonPackage rec {
+    version = "0.2.4";
+    name = "pytidylib-${version}";
+
+    propagatedBuildInputs = [ pkgs.html-tidy ];
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pytidylib/pytidylib-${version}.tar.gz";
+      md5 = "2a28267370c9409b592cdb786649cb25";
+    };
+
+    patchPhase = ''
+      sed -i 's#load_library(name)#load_library("${pkgs.html-tidy}/lib/libtidy.so")#' tidylib/__init__.py
+    '';
+
+    meta = {
+      homepage = " http://countergram.com/open-source/pytidylib/";
+      maintainers = with maintainers; [ layus ];
+    };
+  };
+
   timelib = buildPythonPackage rec {
     name = "timelib-0.2.4";
 

From dee6dc162f3afdedc2626baeeabc0d8ac829f2f6 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Wed, 12 Aug 2015 00:03:54 +0200
Subject: [PATCH 1825/2016] python-semantic_version: init at 2.4.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 228232dd383..0d58f9753f7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13151,6 +13151,20 @@ let
     };
   };
 
+  semantic-version = buildPythonPackage rec {
+    name = "semantic_version-2.4.2";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/semantic_version/${name}.tar.gz";
+      md5 = "fd7d5ade76e78d8540b9a4044496a57c";
+    };
+
+    meta = {
+      description = "A library implementing the 'SemVer' scheme";
+      license = licenses.bsdOriginal;
+      maintainers = with maintainers; [ layus ];
+    };
+  };
+
   sexpdata = buildPythonPackage rec {
     name = "sexpdata-0.0.2";
     src = pkgs.fetchurl {

From 2dedf83d376117a624f9ced471c4e5092969e201 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Wed, 12 Aug 2015 00:06:48 +0200
Subject: [PATCH 1826/2016] python-web.py: init at 0.37

---
 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 0d58f9753f7..3587ed26606 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14746,6 +14746,27 @@ let
     };
   };
 
+  web = buildPythonPackage rec {
+    version = "0.37";
+    name = "web.py-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/w/web.py/web.py-${version}.tar.gz";
+      md5 = "93375e3f03e74d6bf5c5096a4962a8db";
+    };
+
+    meta = {
+      description = "Makes web apps";
+      longDescription = ''
+        Think about the ideal way to write a web app.
+        Write the code to make it happen.
+      '';
+      homepage = "http://webpy.org/";
+      license = licenses.publicDomain;
+      maintainers = with maintainers; [ layus ];
+    };
+  };
+
   webob = buildPythonPackage rec {
     version = "1.4";
     name = "webob-${version}";

From 72890773c4b26d3e92aab2093e81a537134cc77b Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Wed, 12 Aug 2015 00:27:53 +0200
Subject: [PATCH 1827/2016] python-EasyProcess: init at 0.1.9

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3587ed26606..91ccc3db2f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3278,6 +3278,21 @@ let
     };
   };
 
+  easy-process = buildPythonPackage rec {
+    name = "EasyProcess-0.1.9";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/E/EasyProcess/${name}.tar.gz";
+      md5 = "3da72e2fe16781fe5c7b3b0c6c40ee7b";
+    };
+
+    meta = {
+      description = "Easy to use python subprocess interface";
+      homepage = "https://github.com/ponty/EasyProcess";
+      licenses = licenses.bsdOriginal;
+      maintainers = with maintainers; [ layus ];
+    };
+  };
 
   elasticsearch = buildPythonPackage (rec {
     name = "elasticsearch-1.6.0";

From 7d4b026a81b58f25cc6d0e8a0337152bf2828bd9 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Wed, 12 Aug 2015 00:28:29 +0200
Subject: [PATCH 1828/2016] python-PyVirtualDisplay: init at 0.1.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 91ccc3db2f2..39dbfd0f967 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14544,6 +14544,24 @@ let
     };
   };
 
+  virtual-display = buildPythonPackage rec {
+    name = "PyVirtualDisplay-0.1.5";
+
+    propagatedBuildInputs = with self; [ easy-process ];
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/P/PyVirtualDisplay/${name}.tar.gz";
+      md5 = "90b65fe15b81788c2e208d124e3a3c14";
+    };
+
+    meta = {
+      description = "python wrapper for Xvfb, Xephyr and Xvnc";
+      homepage = "https://github.com/ponty/pyvirtualdisplay";
+      license = licenses.bsdOriginal;
+      maintainers = with maintainers; [ layus ];
+    };
+  };
+
   virtualenv = buildPythonPackage rec {
     name = "virtualenv-1.11.6";
     src = pkgs.fetchurl {

From c601814cd3b13a9bc9de71cdf29bc4c5564c9bb3 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Wed, 12 Aug 2015 00:48:21 +0200
Subject: [PATCH 1829/2016] python-inginious: init at 0.3.dev1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39dbfd0f967..0e1a5258541 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6989,6 +6989,43 @@ let
     };
   };
 
+  inginious = buildPythonPackage rec {
+    version = "0.3.dev1";
+    name = "inginious-${version}";
+
+    disabled = isPy3k;
+
+    # patched version of docker bindings.
+    docker-custom = self.docker.override {
+      name = "docker-1.3.0-dirty";
+      src = pkgs.fetchFromGitHub {
+        owner = "GuillaumeDerval";
+        repo = "docker-py";
+        rev = "1.3.0-dev";
+        sha256 = "0rx686riw4w6kanw4nsyzhcy84fz251g9x59piba2n62qpa1rlxf";
+      };
+    };
+
+    propagatedBuildInputs = with self; [
+      requests2 # Needs to be first;
+      cgroup-utils docker-custom docutils lti multiprocessing pygments pymongo
+      pyyaml rpyc selenium sh simpleldap tidylib virtual-display web
+      websocket_client
+    ];
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/I/INGInious/INGInious-${version}.tar.gz";
+      md5 = "40474dd6b6d4fc26e47a1d9c77bcf943";
+    };
+
+    meta = {
+      description = "An intelligent grader that allows secured and automated testing of code made by students.";
+      homepage = "https://github.com/UCL-INGI/INGInious";
+      license = licenses.agpl3;
+      maintainers = with maintainers; [ layus ];
+    };
+  };
+
   iptools = buildPythonPackage rec {
     version = "0.6.1";
     name = "iptools-${version}";

From c839c988f4f7546552217b76e8285d085b87b91e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 31 Aug 2015 18:34:22 +0200
Subject: [PATCH 1830/2016] Make proxy test more robust

http://hydra.nixos.org/build/25322489
---
 nixos/tests/proxy.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index b43ce1b8e68..3fee1d32538 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -67,6 +67,7 @@ in
       $proxy->waitForUnit("httpd");
       $backend1->waitForUnit("httpd");
       $backend2->waitForUnit("httpd");
+      $client->waitForUnit("network.target");
 
       # With the back-ends up, the proxy should work.
       $client->succeed("curl --fail http://proxy/");

From 6b42cd852a5ac50117f9d59564fa6a6e23cd9dc3 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 31 Aug 2015 19:20:03 +0200
Subject: [PATCH 1831/2016] qalculate-gtk: init at 0.9.7

---
 .../science/math/qalculate-gtk/default.nix    | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/science/math/qalculate-gtk/default.nix

diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
new file mode 100644
index 00000000000..6bc5d874bc0
--- /dev/null
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, intltool, pkgconfig, libqalculate, gtk, gnome2 }:
+stdenv.mkDerivation rec {
+  name = "qalculate-gtk-${version}";
+  version = "0.9.7";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/qalculate/${name}.tar.gz";
+    sha256 = "0b986x5yny9vrzgxlbyg80b23mxylxv2zz8ppd9svhva6vi8xsm4";
+  };
+
+  nativeBuildInputs = [ intltool pkgconfig ];
+  buildInputs = [ libqalculate gtk gnome2.libglade gnome2.libgnome gnome2.scrollkeeper ];
+
+  meta = with stdenv.lib; {
+    description = "The ultimate desktop calculator";
+    homepage = http://qalculate.sourceforge.net;
+    maintainers = with maintainers; [ gebner ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ddc4714693..02fb5d58d75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2785,6 +2785,8 @@ let
 
   ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { };
 
+  qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { };
+
   qastools = callPackage ../tools/audio/qastools {
     qt = qt4;
   };

From 6f19418b654b440f9b7e40fa898f3681f51bca0d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 31 Aug 2015 10:27:07 -0700
Subject: [PATCH 1832/2016] git: 2.5.0 -> 2.5.1

---
 .../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 dde5b7cc603..fce2d07c9ee 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.0";
+  version = "2.5.1";
   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 = "0p747j94kynrx71qaamc9i0dkq5vqpv66a47b68pmin1qsxb2nfc";
+    sha256 = "03r2shbya0g3adya336jpc6kcn2s0fmn5p5bs1s8q6r232qvgkmk";
   };
 
   patches = [

From be91ec0fd73cda879e0f4fa709e4ea004798668c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 19:28:43 +0200
Subject: [PATCH 1833/2016] fmit: qt53Full -> modular qt5 (currently 5.4)

See https://github.com/NixOS/nixpkgs/pull/9560.

"Native" Qt audio capture is now broken (patches/time welcome). ALSA
should work just as well and is now enabled by default until Qt is fixed.
---
 pkgs/applications/audio/fmit/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 84ec955de3f..50c5449e422 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,7 +1,5 @@
-# FIXME: upgrading qt5Full (Qt 5.3) to qt5.{base,multimedia} (Qt 5.4) breaks
-# the default Qt audio capture source!
-{ stdenv, fetchFromGitHub, fftw, freeglut, qt5Full
-, alsaSupport ? false, alsaLib ? null
+{ stdenv, fetchFromGitHub, fftw, freeglut, qt5
+, alsaSupport ? true, alsaLib ? null
 , jackSupport ? false, libjack2 ? null }:
 
 assert alsaSupport -> alsaLib != null;
@@ -18,7 +16,7 @@ stdenv.mkDerivation {
     owner = "gillesdegottex";
   };
 
-  buildInputs = [ fftw freeglut qt5Full ]
+  buildInputs = [ fftw freeglut qt5.base qt5.multimedia ]
     ++ stdenv.lib.optional alsaSupport [ alsaLib ]
     ++ stdenv.lib.optional jackSupport [ libjack2 ];
 

From 10d5d9acf4fa24252906163ba2c8f05abc92e04e Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Mon, 31 Aug 2015 19:19:14 +0100
Subject: [PATCH 1834/2016] connman: 1.28 -> 1.30

Built fine, couldn't test though as I don't have a laptop around me at
the moment.

From the changelog:
```
Fix issue with pending DNS request during server change.
Fix issue with empty strings in nameservers configuration.
Fix issue with time servers during IP configuration change.
Fix issue with 4-way handshake during roaming.
Fix issue with open WiFi networks security.
Fix issue with support for WiFi AnonymousIdentity.
Fix issue with memory leak and DHCPv6 DUID handling.
Fix issue with DHCP client and P2P interaction.
Fix issue with handling provision file updates.
Fix issue with VPN state updates.
Disable 6to4 support by default.
```
---
 pkgs/tools/networking/connman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 25e4a2cb3ad..75e4155c61d 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "connman-${version}";
-  version = "1.28";
+  version = "1.30";
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/network/connman/connman.git";
     rev = "refs/tags/${version}";
-    sha256 = "13c374bfj7dzlx7zvnnigmk0ck5cy601aqi18n77mcrq9yyxw5y9";
+    sha256 = "715474351e22b52334d37c146fd5eb87d692be8501d8dac33a0e330437235295";
   };
 
   buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit

From 8f86ec0976d1c21598fb037e0ff07a6d8e07d972 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 19:34:57 +0200
Subject: [PATCH 1835/2016] fmit: add portaudioSupport (off by default)

---
 pkgs/applications/audio/fmit/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 50c5449e422..fe1f4c85c30 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,9 +1,11 @@
 { stdenv, fetchFromGitHub, fftw, freeglut, qt5
 , alsaSupport ? true, alsaLib ? null
-, jackSupport ? false, libjack2 ? null }:
+, jackSupport ? false, libjack2 ? null
+, portaudioSupport ? false, portaudio ? null }:
 
 assert alsaSupport -> alsaLib != null;
 assert jackSupport -> libjack2 != null;
+assert portaudioSupport -> portaudio != null;
 
 let version = "1.0.8"; in
 stdenv.mkDerivation {
@@ -18,7 +20,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ fftw freeglut qt5.base qt5.multimedia ]
     ++ stdenv.lib.optional alsaSupport [ alsaLib ]
-    ++ stdenv.lib.optional jackSupport [ libjack2 ];
+    ++ stdenv.lib.optional jackSupport [ libjack2 ]
+    ++ stdenv.lib.optional portaudioSupport [ portaudio ];
 
   configurePhase = ''
     mkdir build
@@ -26,6 +29,7 @@ stdenv.mkDerivation {
     qmake \
       CONFIG+=${stdenv.lib.optionalString alsaSupport "acs_alsa"} \
       CONFIG+=${stdenv.lib.optionalString jackSupport "acs_jack"} \
+      CONFIG+=${stdenv.lib.optionalString portaudioSupport "acs_portaudio"} \
       PREFIX="$out" PREFIXSHORTCUT="$out" \
       ../fmit.pro
   '';

From 21a5df097c511f7e668e3833bf71a6fc5af9e072 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 20:07:16 +0200
Subject: [PATCH 1836/2016] reiser4progs: 1.0.9 -> 1.1.0

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

diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix
index 7dfbbf66c0a..662ceba03b8 100644
--- a/pkgs/tools/filesystems/reiser4progs/default.nix
+++ b/pkgs/tools/filesystems/reiser4progs/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, libaal}:
 
-let version = "1.0.9"; in
+let version = "1.1.0"; in
 stdenv.mkDerivation rec {
   name = "reiser4progs-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz";
-    sha256 = "0d6djyd7wjvzbqj738b2z4jr5c2s30g8q8xygipyi0007g42gc7z";
+    sha256 = "18bgv0wd75q53642x5dsk4g0mil1hw1zrp7a4xkb0pxx4bzjlbqg";
   };
 
   buildInputs = [libaal];

From 11d1eeed7c365f741101977d424807a29040d094 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 20:20:58 +0200
Subject: [PATCH 1837/2016] xca: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index fdd136cc838..76de3627630 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "xca-${version}";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/xca/${name}.tar.gz";
-    sha256 = "0k21d4lfkn0nlj8az6067dmc5dgy5cidspljagmh5frsv576wnzg";
+    sha256 = "10rxma0zm7vryzv69m0aqlvmbf82d261wa77kxni4h3lndwqvpf2";
   };
 
   postInstall = ''

From d35d9910281e6a3f7fb58043a3e47a250cf70f7b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 20:53:41 +0200
Subject: [PATCH 1838/2016] phc-intel: 0.4.0-rev{17 -> 18} for Linux 4.2

Fix build failure: http://hydra.nixos.org/build/25314451/nixlog/1
---
 pkgs/os-specific/linux/phc-intel/default.nix | 50 +++++++++++---------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix
index 4c47047ff74..dd5a2741267 100644
--- a/pkgs/os-specific/linux/phc-intel/default.nix
+++ b/pkgs/os-specific/linux/phc-intel/default.nix
@@ -2,20 +2,41 @@
 
 assert stdenv.isLinux;
 # Don't bother with older versions, though some would probably work:
-assert stdenv.lib.versionAtLeast kernel.version "4.0";
+assert stdenv.lib.versionAtLeast kernel.version "4.2";
 # Disable on grsecurity kernels, which break module building:
 assert !kernel.features ? grsecurity;
 
-let version = "0.4.0-rev17"; in
-stdenv.mkDerivation {
+let
+  release = "0.4.0";
+  revbump = "rev18"; # don't forget to change forum download id...
+  version = "${release}-${revbump}";
+in stdenv.mkDerivation {
   name = "linux-phc-intel-${version}-${kernel.version}";
 
   src = fetchurl {
-    sha256 = "1fdfpghnsa5s98lisd2sn0vplrq0n54l0pkyyzkyb77z4fa6bs4p";
-    url = "http://www.linux-phc.org/forum/download/file.php?id=166";
-    name = "phc-intel-pack-rev17.tar.bz2";
+    sha256 = "1480y75yid4nw7dhzm97yb10dykinzjz34abvavsrqpq7qclhv27";
+    url = "http://www.linux-phc.org/forum/download/file.php?id=167";
+    name = "phc-intel-pack-${revbump}.tar.bz2";
   };
 
+  buildInputs = [ which ];
+
+  makeFlags = with kernel; [
+    "DESTDIR=$(out)"
+    "KERNELSRC=${dev}/lib/modules/${modDirVersion}/build"
+  ];
+
+  configurePhase = ''
+    make $makeFlags brave
+  '';
+
+  enableParallelBuilding = false;
+
+  installPhase = ''
+    install -m 755   -d $out/lib/modules/${kernel.version}/extra/
+    install -m 644 *.ko $out/lib/modules/${kernel.version}/extra/
+  '';
+
   meta = with stdenv.lib; {
     inherit version;
     description = "Undervolting kernel driver for Intel processors";
@@ -28,22 +49,7 @@ stdenv.mkDerivation {
     homepage = http://www.linux-phc.org/;
     downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267";
     license = licenses.gpl2;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
-
-  buildInputs = [ which ];
-
-  makeFlags = "KERNELSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build DESTDIR=$(out)";
-
-  configurePhase = ''
-    echo make $makeFlags brave
-  '';
-
-  enableParallelBuilding = false;
-
-  installPhase = ''
-    install -m 755   -d $out/lib/modules/${kernel.version}/extra/
-    install -m 644 *.ko $out/lib/modules/${kernel.version}/extra/
-  '';
 }

From 674d0a79924e21e0d04a98eb45c0b4e45f64b0a3 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@pmade.com>
Date: Mon, 31 Aug 2015 14:42:05 -0600
Subject: [PATCH 1839/2016] curaLulzbot: init at 15.02.1-1.03-5064

---
 pkgs/applications/misc/cura/lulzbot.nix | 58 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/applications/misc/cura/lulzbot.nix

diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot.nix
new file mode 100644
index 00000000000..4d13e62bdfe
--- /dev/null
+++ b/pkgs/applications/misc/cura/lulzbot.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchurl, dpkg, bash, python27Packages }:
+
+let
+  py = python27Packages;
+in
+stdenv.mkDerivation rec {
+  name = "cura-lulzbot";
+  version = "15.02.1-1.03-5064";
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb";
+        sha256 = "1gsfidg3gim5pjbl82vkh0cw4ya253m4p7nirm8nr6yjrsirkzxg";
+      }
+    else if stdenv.system == "i686-linux" then
+      fetchurl {
+        url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-i386/cura_${version}_i386.deb";
+        sha256 = "0xd3df6bxq4rijgvsqvps454jkc1nzhxbdzzj6j2w317ppsbhyc1";
+      }
+    else throw "${name} is not supported on ${stdenv.system}";
+
+  python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ];
+  pythonPath = python_deps;
+  propagatedBuildInputs = python_deps;
+  buildInputs = [ dpkg bash py.wrapPython ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+  unpackPhase = "dpkg-deb -x ${src} ./";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r usr/share $out/share
+    find $out/share -type f -exec sed -i 's|/usr/share/cura|$out/share/cura|g' "{}" \;
+
+    cat <<EOT > $out/bin/cura
+    #!${bash}/bin/bash
+    PYTHONPATH=$PYTHONPATH:$out/share/cura ${py.python}/bin/python $out/share/cura/cura.py "\$@"
+    EOT
+
+    chmod 555 $out/bin/cura
+  '';
+
+  meta = with stdenv.lib; {
+    description = "3D printing host software for the Lulzbot";
+
+     longDescription = ''
+       Cura LulzBot Edition is a fork of the 3D printing/slicing
+       software from Ultimaker, with changes to support 3D printers
+       from Aleph Objects.
+     '';
+
+    homepage = https://www.lulzbot.com/cura/;
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pjones ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ddc4714693..66134bc1d5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12812,6 +12812,8 @@ let
 
   cura = callPackage ../applications/misc/cura { };
 
+  curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { };
+
   peru = callPackage ../applications/version-management/peru {};
 
   printrun = callPackage ../applications/misc/printrun { };

From c0ed5753ac6e03bd6c8e1831dba46cd5c6574902 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Mon, 31 Aug 2015 23:56:28 +0300
Subject: [PATCH 1840/2016] yandex-disk: update 0.1.5.870 -> 0.1.5.905

---
 pkgs/tools/filesystems/yandex-disk/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index a64b7f55003..97d70d1a45b 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -6,18 +6,18 @@ let
   p = if stdenv.is64bit then {
       arch = "x86_64";
       gcclib = "${stdenv.cc.cc}/lib64";
-      sha256 = "061kl186vllqhl1443d9cwvp4qdhqc42yf3x72a1w0bjvn0i3z1i";
+      sha256 = "08mmjz061b0hrqp8zg31w089n5bk3sq4r3w84zr33d8pnvkgq2wk";
     }
     else {
       arch = "i386";
       gcclib = "${stdenv.cc.cc}/lib";
-      sha256 = "1l9mxlin41w83dn70cvdk1n1vn1dll3d8r120jkqn5jfhicrgvv3";
+      sha256 = "1zb6cnldd43nr4k2qg9hnrkgj0iik2gpxqrjypbhwv75hnvjma93";
     };
 in 
 stdenv.mkDerivation rec {
 
   name = "yandex-disk-${version}";
-  version = "0.1.5.870";
+  version = "0.1.5.905";
 
   src = fetchurl {
     url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm";
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://help.yandex.com/disk/cli-clients.xml;
     description = "A free cloud file storage service";
-    maintainers = with stdenv.lib.maintainers; [smironov];
+    maintainers = with stdenv.lib.maintainers; [ smironov jagajaga ];
     platforms = ["i686-linux" "x86_64-linux"];
     license = stdenv.lib.licenses.unfree;
     longDescription = ''

From 1d4135eab9d470d8e697dd03914570947834a608 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@pmade.com>
Date: Mon, 31 Aug 2015 15:09:58 -0600
Subject: [PATCH 1841/2016] geda: init at 1.8.2-20130925

---
 .../science/electronics/geda/default.nix      | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/science/electronics/geda/default.nix

diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix
new file mode 100644
index 00000000000..03ddf835343
--- /dev/null
+++ b/pkgs/applications/science/electronics/geda/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, guile, gtk, flex, gawk }:
+
+stdenv.mkDerivation rec {
+  name = "geda-${version}";
+  version = "1.8.2-20130925";
+
+  src = fetchurl {
+    url = "http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz";
+    sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v";
+  };
+
+  configureFlags = "--disable-update-xdg-database";
+  buildInputs = [ pkgconfig guile gtk flex gawk ];
+
+  meta = with stdenv.lib; {
+    description = "Full GPL'd suite of Electronic Design Automation tools";
+    homepage = http://www.geda-project.org/;
+    maintainers = with maintainers; [ pjones ];
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ddc4714693..9e05f8447dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14612,6 +14612,8 @@ let
 
   caneda = callPackage ../applications/science/electronics/caneda { };
 
+  geda = callPackage ../applications/science/electronics/geda { };
+
   gtkwave = callPackage ../applications/science/electronics/gtkwave { };
 
   kicad = callPackage ../applications/science/electronics/kicad {

From 328f68cb7ebbfadd511b3fd515cfeba4c80523f8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 31 Aug 2015 23:57:52 +0200
Subject: [PATCH 1842/2016] libpsl: list 2015-08-07 -> 2015-08-27

Use fetchFromGitHub for both list and library, removing fetchurl.
---
 pkgs/development/libraries/libpsl/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index 883ba807eda..1c651f72ede 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc
-, icu, libxslt, pkgconfig }:
+{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu
+, libxslt, pkgconfig }:
 
 let
 
   version = "${libVersion}-list-${listVersion}";
 
-  listVersion = "2015-08-07";
-  listArchive = let
-    rev = "de9af76664aa5fd89dfee3c44c56ba91c03eefab";
-  in fetchurl {
-    sha256 = "007yxs92dffgapkqik6rfrng5af8hjzf8wd7hlff91q836k40abi";
-    url = "https://codeload.github.com/publicsuffix/list/tar.gz/${rev}";
+  listVersion = "2015-08-27";
+  listSources = fetchFromGitHub {
+    sha256 = "14kgxyfvvrwqyxmfy1by1pzbbv6hs9n744v8zr160rz8rln8lzb9";
+    rev = "1fc1ed365818a6a77d6f31d425ff03ca54cdc7f3";
+    repo = "list";
+    owner = "publicsuffix";
   };
 
   libVersion = "0.8.0";
@@ -35,7 +35,7 @@ in stdenv.mkDerivation {
 
   preConfigure = ''
     # The libpsl check phase requires the list's test scripts (tests/) as well
-    tar --directory=list --strip-components=1 -xf "${listArchive}"
+    cp -Rv "${listSources}"/* list
   '';
   configureFlags = "--disable-static --enable-gtk-doc --enable-man";
 

From adbb5d7ca684ed2794b0fe68d8ee5e64c6d29194 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Mon, 31 Aug 2015 23:57:10 +0100
Subject: [PATCH 1843/2016] youtube-dl: update to 2015.08.28

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index de9d918deeb..e9f7eadc914 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   name = "youtube-dl-${version}";
-  version = "2015.08.16.1";
+  version = "2015.08.28";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "04g78anvy519pj8m8ys1ifmnmp1x3i9bw3afwqjch71n9f77papy";
+    sha256 = "0iahbynd6fw097a4cc57w26szlbqsmhb8v5ny6qrcil0d4wdqqvp";
   };
 
   buildInputs = [ makeWrapper zip pandoc ];

From f4193da3888c5d6ed5efb45c4fd9706e9f3a548d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 1 Sep 2015 03:27:48 +0200
Subject: [PATCH 1844/2016] flexc++: 2.02.00 -> 2.03.00

Good-bye Sourceforge, hello (fetchFrom)GitHub. Please stay nice.
---
 .../tools/parsing/flexc++/default.nix         | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index 0b9c4fcbc64..3cfd86f477e 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -1,29 +1,32 @@
-{ stdenv, fetchurl, bobcat, icmake, yodl }:
+{ stdenv, fetchFromGitHub, bobcat, icmake, yodl }:
 
-let version = "2.02.00"; in
+let version = "2.03.00"; in
 stdenv.mkDerivation {
   name = "flexc++-${version}";
 
-  src = fetchurl {
-    sha256 = "0mz5d0axr4c8rrmn4iw7b5llmf6f3g9cnjzzz3kw02mfzwll79rz";
-    url = "mirror://sourceforge/flexcpp/${version}/flexc++_${version}.orig.tar.gz";
+  src = fetchFromGitHub {
+    sha256 = "1knb5h6l71n5zi9xzml5f6v7wspbk7vrcaiy2div8bnj7na3z717";
+    rev = version;
+    repo = "flexcpp";
+    owner = "fbb-git";
   };
 
   meta = with stdenv.lib; {
     inherit version;
-    description = "";
+    description = "C++ tool for generating lexical scanners";
     longDescription = ''
       Flexc++ was designed after `flex'. Flexc++ offers a cleaner class design
       and requires simpler specification files than offered by flex's C++
       option.
     '';
-    homepage = http://flexcpp.sourceforge.net/;
-    downloadPage = http://sourceforge.net/projects/flexcpp/files/;
+    homepage = https://fbb-git.github.io/flexcpp/;
     license = licenses.gpl3;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 
+  sourceRoot = "flexcpp-${version}-src/flexc++";
+
   buildInputs = [ bobcat ];
   nativeBuildInputs = [ icmake yodl ];
 

From 1c158ecdb4968052a33bd5fda14fd78910d4b051 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 1 Sep 2015 05:10:53 +0300
Subject: [PATCH 1845/2016] vimPlugins: 2015-09-01 update

---
 pkgs/misc/vim-plugins/default.nix      | 141 +++++++++++++------------
 pkgs/misc/vim-plugins/vim-plugin-names |   4 +-
 2 files changed, 73 insertions(+), 72 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8799ff867c1..4210ba69485 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -46,6 +46,7 @@ rec {
   colors-solarized    = Solarized;
   colorsamplerpack    = Colour_Sampler_Pack;
   command_T           = command-t; # backwards compat, added 2014-10-18
+  css_color_5056      = vim-css-color;
   easy-align          = vim-easy-align;
   easymotion          = vim-easymotion;
   eighties            = vim-eighties;
@@ -84,7 +85,6 @@ rec {
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
 
-
   CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "CSApprox-2013-07-26";
     src = fetchgit {
@@ -152,22 +152,22 @@ rec {
   };
 
   Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Supertab-2015-08-23";
+    name = "Supertab-2015-08-28";
     src = fetchgit {
       url = "git://github.com/ervandew/supertab";
-      rev = "43b98dd2c74977a02473d923c159d4110c94273e";
-      sha256 = "35255894ad3f6701417b0796d24880d8727e2d4ee05c5bb29c207eb127b435a0";
+      rev = "9f7da6d4988daf863ebc414f221bb12c2614f59e";
+      sha256 = "18c74fde13eced99e492c7747a7924d1b2c33bfb99a87a6d7c44f1c8ca9e9225";
     };
     dependencies = [];
 
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2015-08-14";
+    name = "Syntastic-2015-08-27";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "47c70b3e1e388d8f9cc7c6d9687efc047df843ac";
-      sha256 = "7c6a1dc4eef9ec29c09f3a6f60792a9df78b4d86b7f41fc278ae95670c24b40a";
+      rev = "3c2e7e4ce37bc68b54f23c62efd0be291e6dc450";
+      sha256 = "a293ae35c1960f9f4149bae5c2c676b5db4b9b1ae0f6ef70a91bca8a55e01986";
     };
     dependencies = [];
 
@@ -277,11 +277,11 @@ rec {
 
   };
 
-  "css_color_5056" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "css_color_5056-2015-06-22";
-    src = fetchgit {
-      url = "git://github.com/ap/vim-css-color";
-      rev = "ceb028b27eae0550533501b1f02cb512a482ba85";
+  vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation 
+    name = "vim-css-color-2015-06-22"; 
+    src = fetchgit { 
+      url = "git://github.com/ap/vim-css-color"; 
+      rev = "ceb028b27eae0550533501b1f02cb512a482ba85"; 
       sha256 = "d428970699b59b0da89d3cf73be39f62c2751512919fa2773baa241a9f79fccd";
     };
     dependencies = [];
@@ -355,11 +355,11 @@ rec {
   };
 
   vim-addon-vim2nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-vim2nix-2015-06-16";
+    name = "vim-addon-vim2nix-2015-09-01";
     src = fetchgit {
       url = "git://github.com/JagaJaga/vim-addon-vim2nix";
-      rev = "046702653f7af5829a3f3fda3b7cf89c2a8d03b5";
-      sha256 = "b92068c32ce14e75159070acbd86c52e09aaa65a523fd566e44762ed33403161";
+      rev = "ce9ddf99983c00adbd41e0d53ad8cead9712069c";
+      sha256 = "c4b3b4832684bebbf890741b30b1364ca7240b5348cd0c0ee93d6ba477e8f77d";
     };
     dependencies = ["vim-addon-manager"];
 
@@ -399,11 +399,11 @@ rec {
   };
 
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-ghc-2015-08-22";
+    name = "neco-ghc-2015-08-28";
     src = fetchgit {
       url = "git://github.com/eagletmt/neco-ghc";
-      rev = "8ef2df39c83826f7beeb3ea290e05223e43d8571";
-      sha256 = "7f688cadf2fdb483d9541dd77a893fdca97dc59bed609a9a38a48293939b1e5b";
+      rev = "21ba0eba8f9a9787b69c21c45dd286f927220d71";
+      sha256 = "62c17fafd98dd1e6357c5c459a38cec2cb622eaad69ab2e8eb5caf2ea593f37b";
     };
     dependencies = [];
 
@@ -425,7 +425,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
       rev = "5048bdbebcffb296aa60b4c21c44ae8276244539";
-      sha256 = "1k9r6zdlb553d8zhhswbjph4fa6n17qdvc8zz0cix6h2lw9dr9mj";
+      sha256 = "b2a6dc12a7029a1e19f81fb1ddf009d62847e0958b6b083f6aa39445db3739cd";
     };
     dependencies = [];
 
@@ -623,11 +623,11 @@ rec {
   };
 
   racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "racer-2015-08-25";
+    name = "racer-2015-08-30";
     src = fetchgit {
       url = "git://github.com/phildawes/racer";
-      rev = "7074f2ceb84f121d6b933bacf8f619f313e0fdaf";
-      sha256 = "0dc7815d6eb2bd7f934a86a7d7c4acfc85097d7f131a23ccaa39216544aaaf7b";
+      rev = "dcebb106b65a083d70d7d87bd7bdf42a72179d96";
+      sha256 = "8efec086c394f574cddf09f7b2dfab5062de897f67110e1097a567e2fecf06b1";
     };
     dependencies = [];
     buildPhase = ''
@@ -659,22 +659,33 @@ rec {
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2015-08-25";
+    name = "neosnippet-vim-2015-09-01";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "19dc3db526f4441b7a419dd7899d84d5ab3f599f";
-      sha256 = "422448182499941494b1280f93a2b6bc7995531bd2f8af2820d52bdc0c000f66";
+      rev = "1617094a8c9df36d9a505f533b3a2efa44039412";
+      sha256 = "a061f5943b077219990288e369c6013a730117f2168f08f50d09b0d5032319a9";
+    };
+    dependencies = [];
+
+  };
+
+  unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "unite-vim-2015-08-30";
+    src = fetchgit {
+      url = "git://github.com/shougo/unite.vim";
+      rev = "f1aa053aae95e0185c5c9667ecd938c4fc37c2c7";
+      sha256 = "f1cc089cf82d77df73950f8beefe7caa84f77b9ae995be0aa83a3ebd38a5044e";
     };
     dependencies = [];
 
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2015-08-22";
+    name = "vimproc-vim-2015-08-29";
     src = fetchgit {
       url = "git://github.com/shougo/vimproc.vim";
-      rev = "150d5fd04fed462831b99539dfe9920a00a7cea6";
-      sha256 = "baa6557377d7f64c7cd36bf8f7a5439d31c3d869ec8eb9e1e1e8c0d1c0852ccd";
+      rev = "a6bd6893749e3cbfb07230f4284c36b2dc2d8179";
+      sha256 = "11473597d678ac45628a8625025cba75945ebce9e5d7eecf20b17901ffb3bf46";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -689,11 +700,11 @@ rec {
   };
 
   vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimshell-vim-2015-08-25";
+    name = "vimshell-vim-2015-08-28";
     src = fetchgit {
       url = "git://github.com/shougo/vimshell.vim";
-      rev = "05c9001a7fa15aedb444566e2753b901924460a3";
-      sha256 = "aa68b059d5c9d00189ab50014924c920391b76bc448bdda4d82ab6de4ec8b435";
+      rev = "a1f9a2010bea4b109341f1e2411a32839a8547b3";
+      sha256 = "bd2419b50b981e62e25afaa9c5206b818098cd7663cac8566f1d654fbea56ca6";
     };
     dependencies = [ "vimproc-vim" ];
   };
@@ -720,6 +731,17 @@ rec {
 
   };
 
+  molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "molokai-2014-04-11";
+    src = fetchgit {
+      url = "git://github.com/tomasr/molokai";
+      rev = "db8ce13b3737d3ddea8368498183d7c204a762eb";
+      sha256 = "34587133f0f17b8950ed0428b3deeacc2f15933ede8bfdd000593098ed6d903a";
+    };
+    dependencies = [];
+
+  };
+
   hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "hasksyn-2014-09-03";
     src = fetchgit {
@@ -743,11 +765,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2015-08-25";
+    name = "youcompleteme-2015-08-31";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "b7e9871801392b12187191673f492965d142f8ef";
-      sha256 = "a9db1b251d21048bd5d74914b611cc326dfa0a06737be8782f2077e145f53ca3";
+      rev = "f94b342989deb1a20b5f87ef2a7d30b16a9ff733";
+      sha256 = "0a4d7e30a3ecdb22cb8ffa9bafae8b3bdb160c92ab5e2ce57413f2177e28eedc";
     };
     dependencies = [];
     buildInputs = [
@@ -866,11 +888,11 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2015-08-25";
+    name = "vim-wakatime-2015-08-28";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "9bf0d3ec459def5c67a2d9bf5aae8e588a0f3980";
-      sha256 = "d2ce4a890c0044f0088e335660c001764a4df075eeafc6ab32871b82f7bb728a";
+      rev = "02277aca9907c955e51156ad9685aae75a5da70d";
+      sha256 = "7f6b5b99e47d0cd09d6a9649b7150db70008766ceafea59dc80ba74770ee4507";
     };
     dependencies = [];
     buildInputs = [ python ];
@@ -926,16 +948,6 @@ rec {
     '';
   };
 
-  molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "molokai-2014-04-11";
-    src = fetchgit {
-      url = "git://github.com/tomasr/molokai";
-      rev = "db8ce13b3737d3ddea8368498183d7c204a762eb";
-      sha256 = "34587133f0f17b8950ed0428b3deeacc2f15933ede8bfdd000593098ed6d903a";
-    };
-    dependencies = [];
-  };
-
   pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "pathogen-2014-11-06";
     src = fetchgit {
@@ -1089,17 +1101,6 @@ rec {
 
   };
 
-  unite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-2015-08-29";
-    src = fetchgit {
-      url = "git://github.com/shougo/unite.vim";
-      rev = "7e1152d8fec124a07c7ea953b792dec3816a97f8";
-      sha256 = "8284ad86ac3fa130a96618292da2a49421d726174a329b32a8d9fd020b8cfc8b";
-    };
-    dependencies = [];
-
-  };
-
   vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-actions-2014-09-22";
     src = fetchgit {
@@ -1354,11 +1355,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2015-08-17";
+    name = "vim-gitgutter-2015-08-26";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "0e66fc915c5c7d8f18eb62f69230393465812fc3";
-      sha256 = "cf66babbacd29eda332b0dada2f3f2fe3f3d84b5ae0bb34291303c6f0d6ecb62";
+      rev = "1067294cdc379be1deb56074a093b49a8303308f";
+      sha256 = "cb9f44e41fbf565eb07968270289bb4988a84f30f03d11f2919c0423c5ee278c";
     };
     dependencies = [];
 
@@ -1387,11 +1388,11 @@ rec {
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2015-08-07";
+    name = "vim-multiple-cursors-2015-08-27";
     src = fetchgit {
       url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "e37b9358980d312c1f4fbbcb4a36d1a9d4bdb415";
-      sha256 = "126694d6b12e710495d390b5df2fa8ae06ca6e2eadec2a04c4a3899287595ce9";
+      rev = "146fe47ee6b2faf90d6dc1232ef1858883d798bb";
+      sha256 = "916659142dc0abb3a390b56b6ec3c69e489cbbab582e09af8b9aae5b9a792727";
     };
     dependencies = [];
 
@@ -1420,22 +1421,22 @@ rec {
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2015-08-23";
+    name = "vim-snippets-2015-08-31";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "21c7f2052057304f9002b42b53391e2c89197a10";
-      sha256 = "11a5cf8bf8f7fbf9100a69c2457d901143aaaeea5bd29884eb93d8b4439b306d";
+      rev = "ec99c8c24f541727a648f072a84b9d1ea28f2341";
+      sha256 = "5b1cdefc54959db41458898ebeefeb7d4396fbb9e7e2a5d256c4fd47931e5f07";
     };
     dependencies = [];
 
   };
 
   vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-webdevicons-2015-08-14";
+    name = "vim-webdevicons-2015-08-28";
     src = fetchgit {
       url = "git://github.com/ryanoasis/vim-devicons";
-      rev = "771769d21615d08b22f23c32e97e67e95db7d122";
-      sha256 = "8291c8be6a45d6492ad9ff2972f481d7093fff95c764b3499d0877f5365b3f27";
+      rev = "2bc50727340bd43fca65d1baa09c36dda71fff6c";
+      sha256 = "3dea4be46ff7e2408d62c0f9a3f5c9fab0fe893e0f343bc4ebb25e1f30801f26";
     };
     dependencies = [];
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 50688011aa4..8498053f58c 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,5 +1,4 @@
 "vim-webdevicons"
-"css_color%5056"
 "CSApprox"
 "CheckAttach"
 "Gist"
@@ -24,6 +23,7 @@
 "fugitive"
 "ghcmod"
 "github:JagaJaga/vim-addon-vim2nix"
+"github:ap/vim-css-color"
 "github:bitc/lushtags"
 "github:bitc/vim-hdevtools"
 "github:christoomey/vim-tmux-navigator"
@@ -51,7 +51,7 @@
 "github:shougo/neocomplete.vim"
 "github:shougo/neosnippet-snippets"
 "github:shougo/neosnippet.vim"
-"github:shuogo/unite.vim"
+"github:shougo/unite.vim"
 "github:shougo/vimproc.vim"
 "github:shougo/vimshell.vim"
 "github:takac/vim-hardtime"

From 7e4675cb00f81f8533a405ab6ff7b8440b8a851f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 1 Sep 2015 03:46:39 +0200
Subject: [PATCH 1846/2016] bobcat: 3.25.02 -> 4.00.00

---
 pkgs/development/libraries/bobcat/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 2a9ee1c9c5b..87eb1e324ce 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,27 +1,31 @@
-{ stdenv, fetchurl, icmake, libmilter, libX11, openssl, readline
+{ stdenv, fetchFromGitHub, icmake, libmilter, libX11, openssl, readline
 , utillinux, yodl }:
 
-let version = "3.25.02"; in
+let version = "4.00.00"; in
 stdenv.mkDerivation {
   name = "bobcat-${version}";
 
-  src = fetchurl {
-    sha256 = "0b1370li4q82fqj982vng9cwkf23k2c1df5jsdcgkrk01r53dxry";
-    url = "mirror://debian/pool/main/b/bobcat/bobcat_${version}.orig.tar.gz";
+  src = fetchFromGitHub {
+    sha256 = "0wdb25sgw7i3jk3lbja6b4ipqfg1sncam6adg2bn8l5fcinrpwgs";
+    rev = version;
+    repo = "bobcat";
+    owner = "fbb-git";
   };
 
   meta = with stdenv.lib; {
     inherit version;
     description = "Brokken's Own Base Classes And Templates";
-    downloadPage = http://sourceforge.net/projects/bobcat/files/;
+    homepage = https://fbb-git.github.io/bobcat/;
     license = licenses.gpl3;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 
   buildInputs = [ libmilter libX11 openssl readline utillinux ];
   nativeBuildInputs = [ icmake yodl ];
 
+  sourceRoot = "bobcat-${version}-src/bobcat";
+
   postPatch = ''
     substituteInPlace INSTALL.im --replace /usr $out
     patchShebangs ./build

From 687d60ec7342564a088f8a8a2d71cd81d5218f1c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 1 Sep 2015 03:55:29 +0200
Subject: [PATCH 1847/2016] icmake: Sourceforge -> (fetchFrom)GitHub

Also add myself as a maintainer.

CC@ pSub
---
 .../tools/build-managers/icmake/default.nix   | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index d83ae51aaaa..181a00ce7e1 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -1,28 +1,37 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+let version = "7.22.01"; in
+stdenv.mkDerivation {
   name = "icmake-${version}";
-  version = "7.22.01";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/icmake/icmake_${version}.orig.tar.gz";
-    sha256 = "1iv6p9cyvr9i2sjhklplr65llg1ycxqy7z4dfgn0nkwxgs9yf8mm";
+  src = fetchFromGitHub {
+    sha256 = "1pgl8bami4v86ja40in4fsdx940f6q85l1s4b9k53zl29pm85v5k";
+    rev = version;
+    repo = "icmake";
+    owner = "fbb-git";
   };
 
+  sourceRoot = "icmake-${version}-src/icmake";
+
   preConfigure = ''
     patchShebangs ./
-    sed -i "s;usr/;;g" INSTALL.im
+    substituteInPlace INSTALL.im --replace "usr/" ""
   '';
 
-  buildPhase = "./icm_bootstrap $out";
+  buildPhase = ''
+    ./icm_bootstrap $out
+  '';
 
-  installPhase = "./icm_install all /";
+  installPhase = ''
+    ./icm_install all /
+  '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "A program maintenance (make) utility using a C-like grammar";
-    homepage = http://icmake.sourceforge.net/;
+    homepage = https://fbb-git.github.io/icmake/;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ pSub ];
+    maintainers = with maintainers; [ nckx pSub ];
     platforms = platforms.linux;
   };
 }

From c2de55e6f85071052e965c309cb5dd694bbed59d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 1 Sep 2015 05:30:16 +0200
Subject: [PATCH 1848/2016] python-packages: fusepy/gdrivefs platforms -> unix

FUSE is available on other Unix-alikes as well.
---
 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 0e1a5258541..af3e24aff9d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6216,7 +6216,7 @@ let
       '';
       homepage = http://github.com/terencehonles/fusepy;
       license = licenses.isc;
-      platforms = with platforms; linux;
+      platforms = platforms.unix;
       maintainers = with maintainers; [ nckx ];
     };
   };
@@ -6317,7 +6317,7 @@ let
       '';
       homepage = https://github.com/dsoprea/GDriveFS;
       license = licenses.gpl2;
-      platforms = with platforms; linux;
+      platforms = platforms.unix;
       maintainers = with maintainers; [ nckx ];
     };
   };

From cfe12c7edded9a2b7ac5565469291512aeb19e65 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 1 Sep 2015 05:42:12 +0200
Subject: [PATCH 1849/2016] yodl: Sourceforge -> (fetchFrom)GitHub

Cosmetic tweaks; maintain.

CC@ pSub
---
 pkgs/development/tools/misc/yodl/default.nix | 24 ++++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index e5862785717..529e18417c7 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, perl, icmake, utillinux }:
+{ stdenv, fetchFromGitHub, perl, icmake, utillinux }:
 
-stdenv.mkDerivation rec {
+let version = "3.05.01"; in
+stdenv.mkDerivation {
   name = "yodl-${version}";
-  version = "3.05.01";
 
   buildInputs = [ perl icmake ];
 
-  src = fetchurl {
-    url = "mirror://sourceforge/yodl/yodl_${version}.orig.tar.gz";
-    sha256 = "0ghdzr3lzgfzvfymnjbj4mw8vpq098swvipxghhqgfmv58dhwgas";
+  src = fetchFromGitHub {
+    sha256 = "02vbayvnz5p0055456i8kc8qxywkhn7agfrx1kwxaalbsnrd4g9h";
+    rev = version;
+    repo = "yodl";
+    owner = "fbb-git";
   };
 
+  sourceRoot = "yodl-${version}-src/yodl";
+
   preConfigure = ''
-    patchShebangs scripts/.
-    substituteInPlace INSTALL.im --replace /usr $out
     patchShebangs ./build
+    patchShebangs scripts/
+    substituteInPlace INSTALL.im --replace /usr $out
     substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl
     substituteInPlace scripts/yodl2whatever.in --replace getopt ${utillinux}/bin/getopt
   '';
@@ -33,9 +37,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A package that implements a pre-document language and tools to process it";
-    homepage = http://yodl.sourceforge.net/;
+    homepage = https://fbb-git.github.io/yodl/;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ pSub ];
+    maintainers = with maintainers; [ nckx pSub ];
     platforms = platforms.linux;
   };
 }

From e94ddc290dba99499a36eb7e9314e2eb292cdef5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 1 Sep 2015 06:43:37 +0200
Subject: [PATCH 1850/2016] ocaml-bitstring: fix typo in Makefile

---
 pkgs/development/ocaml-modules/bitstring/2.0.4.nix    |  2 +-
 pkgs/development/ocaml-modules/bitstring/default.nix  |  2 +-
 pkgs/development/ocaml-modules/bitstring/srcdir.patch | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/bitstring/srcdir.patch

diff --git a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix
index da4bcdcb527..beaf2fc7fd1 100644
--- a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix
+++ b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix
@@ -8,7 +8,7 @@ buildOcaml rec {
     sha256 = "0mapzn2ls5qcrzjm1az50lqjj76ldkmz4fbv2phc9w6smab50qy5";
   };
 
-  patches = [ ./camlp4.patch ./meta.patch ];
+  patches = [ ./camlp4.patch ./meta.patch ./srcdir.patch ];
 
   buildInputs = [time];
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index ae01cf9d7b5..2dc1b515c03 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -9,7 +9,7 @@ buildOcaml rec {
     sha256 = "1lh97qf1b7mq64pxkphr2w91ri5hfwg58cpjb2xd8a453c9jylw4";
   };
 
-  patches = [ ./camlp4-git.patch ./meta.patch ];
+  patches = [ ./camlp4-git.patch ./meta.patch ./srcdir.patch ];
 
   buildInputs = [time autoconf automake];
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/bitstring/srcdir.patch b/pkgs/development/ocaml-modules/bitstring/srcdir.patch
new file mode 100644
index 00000000000..d53760f1d6f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bitstring/srcdir.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in	2015-09-01 06:32:15.111441188 +0200
++++ b/Makefile.in	2015-09-01 06:32:56.001084480 +0200
+@@ -125,7 +125,7 @@
+ 
+ byteswap.h: byteswap.in.h
+ 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+-	  cat $(srcdir)/byteswap.in.h; \
++	  cat $(top_srcdir)/byteswap.in.h; \
+ 	} > $@-t
+ 	mv -f $@-t $@
+ 

From a839a48b0ac1aef11faa812eb6648e6449cd0bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 1 Sep 2015 08:21:46 +0200
Subject: [PATCH 1851/2016] root: fix build by -lX11

The pkgconfig change didn't help, but I'd leave it in.
---
 pkgs/applications/science/misc/root/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 57d9fc40ab5..e61cb557e12 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, mesa, gfortran
+{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, mesa, gfortran
 , libX11,libXpm, libXft, libXext, zlib }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "1bkiggcyya39a794d3d2rzzmmkbdymf86hbqhh0l1pl4f38xvp6i";
   };
 
-  buildInputs = [ cmake gfortran mesa libX11 libXpm libXft libXext zlib ];
+  buildInputs = [ cmake pkgconfig gfortran mesa libX11 libXpm libXft libXext zlib ];
+
+  NIX_CFLAGS_LINK = "-lX11";
 
   # CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in
   # <rootsrc>/cmake/modules/RootBuildOptions.cmake.

From 04fe1dfe3a02f3e2a924155fe620c0950ce539a6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 1 Sep 2015 00:25:47 -0700
Subject: [PATCH 1852/2016] accelio: 2015-07-28 -> 2015-08-30

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

diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix
index 68a4386bba5..6edeacac11e 100644
--- a/pkgs/development/libraries/accelio/default.nix
+++ b/pkgs/development/libraries/accelio/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}";
-  version = "2015-07-28";
+  version = "2015-08-30";
 
   src = fetchFromGitHub {
     owner = "accelio";
     repo = "accelio";
-    rev = "0c4b6d535831650112ba9409a5c7d6e1bc436d61";
-    sha256 = "044m92pnvdl64irvy7bdqr51gz0qr5f14xnsig4gkc3vb0afbb4j";
+    rev = "3d1f2b2d311aa70de9856832fd02647266624e82";
+    sha256 = "172frqk2n43g0arhazgcwfvj0syf861vdzdpxl7idr142bb0ykf7";
   };
 
   postPatch = ''

From bada26d5ab77a0a19f92943f2b80a507cec17839 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 1 Sep 2015 00:26:14 -0700
Subject: [PATCH 1853/2016] ceph-dev: 9.0.2 -> 9.0.3

---
 pkgs/tools/filesystems/ceph/dev.nix     | 4 ++--
 pkgs/tools/filesystems/ceph/generic.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
index 5cc183d1053..2d0a1a63306 100644
--- a/pkgs/tools/filesystems/ceph/dev.nix
+++ b/pkgs/tools/filesystems/ceph/dev.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "9.0.2";
+  version = "9.0.3";
 
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0kydjyvb1566mh33p6dlljfx1r4cfdj8ic4i19h5r9vavkc46nf0";
+    sha256 = "08ccy735srzmi505qlrpqdh5js40mpd5k1vdhnysknra0vqlpmdx";
   };
 
   patches = [ ./fix-pythonpath.patch ];
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 77d24766f13..d63937f7fbf 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -76,7 +76,7 @@ let
   hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
 
   hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
-    versionAtLeast version "10.0.0" &&
+    versionAtLeast version "9.0.3" &&
     optAccelio != null && optLibibverbs != null && optLibrdmacm != null;
 
   hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null;

From b92c4a51e634783ddbe68ac768bcc2dc1163562d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 1 Sep 2015 09:42:08 +0200
Subject: [PATCH 1854/2016] desktop and xmonad wrappers: preferLocalBuild

Also no substitution.
---
 nixos/modules/services/x11/display-managers/default.nix | 6 +++++-
 pkgs/applications/window-managers/xmonad/wrapper.nix    | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 7e05cd84be6..991043d73c6 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -161,7 +161,11 @@ let
       exit 0
     '';
 
-  mkDesktops = names: pkgs.runCommand "desktops" {}
+  mkDesktops = names: pkgs.runCommand "desktops"
+    { # trivial derivation
+      preferLocalBuild = true;
+      allowSubstitutes = false;
+    }
     ''
       mkdir -p $out
       ${concatMapStrings (n: ''
diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix
index cb02a214d5b..e8dc0b1fdac 100644
--- a/pkgs/applications/window-managers/xmonad/wrapper.nix
+++ b/pkgs/applications/window-managers/xmonad/wrapper.nix
@@ -13,4 +13,8 @@ in stdenv.mkDerivation {
       --set NIX_GHC "${xmonadEnv}/bin/ghc" \
       --set XMONAD_XMESSAGE "${xmessage}/bin/xmessage"
   '';
+
+  # trivial derivation
+  preferLocalBuild = true;
+  allowSubstitutes = false;
 }

From 857038428878aeb6115ab122bf462c62ddc17c97 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 1 Sep 2015 01:18:27 -0700
Subject: [PATCH 1855/2016] goPackages: Disable failing packages

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 0c373d1b215..df7d2709b52 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -609,6 +609,7 @@ let
     goPackagePath = "google.golang.org/cloud";
     buildInputs = [ net oauth2 protobuf google-api-go-client grpc ];
     excludedPackages = "oauth2";
+    meta.hydraPlatforms = [ ];
   };
 
   gcloud-golang-compute-metadata = buildGoPackage rec {
@@ -1510,6 +1511,7 @@ let
     owner  = "ipfs";
     repo   = "go-ipfs";
     sha256 = "0qj3rwq5i4aiwn0i09skpi1s3mzqm8ma9v1cpjl7rya2y6ypx8xg";
+    disabled = !isGo14;
   };
 
   ldap = buildGoPackage rec {

From cf92e411eeb98b495ec5fc9c589f945aa3ac9ba1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 1 Sep 2015 01:35:06 -0700
Subject: [PATCH 1856/2016] Revert "mongo-tools: fix build"

This reverts commit 3e391b839ae6e9d7440bc8626d8f9c1c925aa81b.

This is a slower way to build the tools. Lets get this going in parallel
again. Instead of replacing the whole install process, keep the parts
which work and do just the binary copying ourselves.
---
 pkgs/top-level/go-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index df7d2709b52..908682d46b4 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1701,11 +1701,14 @@ let
 
     # Mongodb incorrectly names all of their binaries main
     # Let's work around this with our own installer
-    buildPhase = ''
+    preInstall = ''
+      mkdir -p $bin/bin
       while read b; do
+        rm -f go/bin/main
         go install $goPackagePath/$b/main
-        mv go/bin/main go/bin/$b
+        cp go/bin/main $bin/bin/$b
       done < <(find go/src/$goPackagePath -name main | xargs dirname | xargs basename -a)
+      rm -r go/bin
     '';
   };
 

From 3ea329c6aa7ef6ba34b5bd7114b3c8128ff6e487 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Sep 2015 10:45:18 +0200
Subject: [PATCH 1857/2016] Revert "all-packages: warn when using deprecated
 attributes"

This reverts commit c53018c9a17f878f37b390c0bb21845df81be868. This
causes problems for "nix-env -qa", so we'll have to come up with a
clean solution first.

Issue #9456.
---
 pkgs/top-level/all-packages.nix | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62653937ef8..57621552a8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15282,13 +15282,8 @@ let
 
   mg = callPackage ../applications/editors/mg { };
 
-}
-  ### Aliases to attributes converted to the dashed-style.
-  // lib.mapAttrs (name: builtins.trace
-    ( "Warning: using a deprecated attribute '${name}'."
-    + " CamelCase and under_scores are replaced by dashed-names"
-    + " to match the nix-env names better."))
-{ # warnings since 2015-09
+
+  # Attributes for backward compatibility.
   adobeReader = adobe-reader;
   arduino_core = arduino-core;  # added 2015-02-04
   asciidocFull = asciidoc-full;  # added 2014-06-22
@@ -15297,6 +15292,8 @@ let
   lttngTools = lttng-tools;  # added 2014-07-31
   lttngUst = lttng-ust;  # added 2014-07-31
   jquery_ui = jquery-ui;  # added 2014-09-07
+  youtubeDL = youtube-dl;  # added 2014-10-26
+  youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   htmlTidy = html-tidy;  # added 2014-12-06
   libtidy = html-tidy;  # added 2014-12-21
@@ -15304,17 +15301,8 @@ let
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   nfsUtils = nfs-utils;  # added 2014-12-06
   buildbotSlave = buildbot-slave;  # added 2014-12-09
-  rssglx = rss-glx; #added 2015-03-25
-
-}
-  ### Other attribute aliases for backward compatibility.
-  // lib.mapAttrs
-      (name: builtins.trace "Warning: using a deprecated attribute '${name}'.")
-{ # warnings since 2015-09
-  youtubeDL = youtube-dl;  # added 2014-10-26
-  youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
   cool-old-term = cool-retro-term; # added 2015-01-31
-
+  rssglx = rss-glx; #added 2015-03-25
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19
   inherit (haskell.compiler) jhc uhc;   # 2015-05-15

From 217fbea5f98038a3ffc23ea3779d93ccbc9451ce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Sep 2015 10:50:18 +0200
Subject: [PATCH 1858/2016] Move some misplaced attributes

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57621552a8a..d87624c37db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -884,6 +884,8 @@ let
 
   ent = callPackage ../tools/misc/ent { };
 
+  facter = callPackage ../tools/system/facter {};
+
   fasd = callPackage ../tools/misc/fasd { };
 
   fop = callPackage ../tools/typesetting/fop { };
@@ -2540,6 +2542,8 @@ let
 
   opentracker = callPackage ../applications/networking/p2p/opentracker { };
 
+  opentsdb = callPackage ../tools/misc/opentsdb {};
+
   openvpn = callPackage ../tools/networking/openvpn { };
 
   openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
@@ -9000,6 +9004,8 @@ let
 
   groovebasin = callPackage ../applications/audio/groovebasin { };
 
+  hbase = callPackage ../servers/hbase {};
+
   ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
 
   jboss = callPackage ../servers/http/jboss { };
@@ -12694,6 +12700,8 @@ let
     unicode3Support = true;
   };
 
+  udevil = callPackage ../applications/misc/udevil {};
+
   # urxvt plugins
   urxvt_perl = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perl { };
   urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { };
@@ -15308,12 +15316,4 @@ let
   inherit (haskell.compiler) jhc uhc;   # 2015-05-15
   cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
 
-  opentsdb = callPackage ../tools/misc/opentsdb {};
-
-  hbase = callPackage ../servers/hbase {};
-
-  udevil = callPackage ../applications/misc/udevil {};
-
-  facter = callPackage ../tools/system/facter {};
-
 }; in self; in pkgs

From 9013dc5826dfd9d2d376fd0f45f4031a8cfa0c55 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Sep 2015 10:52:47 +0200
Subject: [PATCH 1859/2016] inotifyTools -> inotify-tools

Fixes #9456.
---
 .../networking/p2p/transmission/default.nix   |  4 +--
 pkgs/servers/mail/dovecot/2.2.x.nix           |  4 +--
 pkgs/servers/mail/dovecot/default.nix         |  4 +--
 pkgs/top-level/all-packages.nix               | 31 ++++++++++---------
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index bf659816c4f..b836e75132c 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper
-, openssl, curl, libevent, inotifyTools, systemd
+, openssl, curl, libevent, inotify-tools, systemd
 , enableGTK3 ? false, gtk3
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "1sxr1magqb5s26yvr5yhs1f7bmir8gl09niafg64lhgfnhv1kz59";
   };
 
-  buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ]
+  buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools ]
     ++ optionals enableGTK3 [ gtk3 makeWrapper ]
     ++ optional stdenv.isLinux systemd;
 
diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix
index a774777709f..be671b7f0e7 100644
--- a/pkgs/servers/mail/dovecot/2.2.x.nix
+++ b/pkgs/servers/mail/dovecot/2.2.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, systemd, openssl, pam, bzip2, zlib, openldap
-, inotifyTools, clucene_core_2, sqlite }:
+, inotify-tools, clucene_core_2, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "dovecot-2.2.16";
 
   buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2 sqlite]
-    ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotifyTools ];
+    ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotify-tools ];
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index bd179490c18..3997370154e 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -1,9 +1,9 @@
-{stdenv, fetchurl, openssl, pam, bzip2, zlib, inotifyTools, openldap}:
+{stdenv, fetchurl, openssl, pam, bzip2, zlib, inotify-tools, openldap}:
 
 stdenv.mkDerivation rec {
   name = "dovecot-2.1.17";
 
-  buildInputs = [openssl bzip2 zlib openldap] ++ stdenv.lib.optionals stdenv.isLinux [pam inotifyTools];
+  buildInputs = [openssl bzip2 zlib openldap] ++ stdenv.lib.optionals stdenv.isLinux [pam inotify-tools];
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.1/${name}.tar.gz";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d87624c37db..abb1462f6a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5639,7 +5639,7 @@ let
 
   ino = callPackage ../development/arduino/ino { };
 
-  inotifyTools = callPackage ../development/tools/misc/inotify-tools { };
+  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;
@@ -15296,24 +15296,25 @@ let
   arduino_core = arduino-core;  # added 2015-02-04
   asciidocFull = asciidoc-full;  # added 2014-06-22
   bridge_utils = bridge-utils;  # added 2015-02-20
-  clangAnalyzer = clang-analyzer;  # added 2015-02-20
-  lttngTools = lttng-tools;  # added 2014-07-31
-  lttngUst = lttng-ust;  # added 2014-07-31
-  jquery_ui = jquery-ui;  # added 2014-09-07
-  youtubeDL = youtube-dl;  # added 2014-10-26
-  youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
-  rdiff_backup = rdiff-backup;  # added 2014-11-23
-  htmlTidy = html-tidy;  # added 2014-12-06
-  libtidy = html-tidy;  # added 2014-12-21
-  speedtest_cli = speedtest-cli;  # added 2015-02-17
-  sqliteInteractive = sqlite-interactive;  # added 2014-12-06
-  nfsUtils = nfs-utils;  # added 2014-12-06
   buildbotSlave = buildbot-slave;  # added 2014-12-09
+  cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
+  clangAnalyzer = clang-analyzer;  # added 2015-02-20
   cool-old-term = cool-retro-term; # added 2015-01-31
-  rssglx = rss-glx; #added 2015-03-25
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19
+  htmlTidy = html-tidy;  # added 2014-12-06
   inherit (haskell.compiler) jhc uhc;   # 2015-05-15
-  cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
+  inotifyTools = inotify-tools;
+  jquery_ui = jquery-ui;  # added 2014-09-07
+  libtidy = html-tidy;  # added 2014-12-21
+  lttngTools = lttng-tools;  # added 2014-07-31
+  lttngUst = lttng-ust;  # added 2014-07-31
+  nfsUtils = nfs-utils;  # added 2014-12-06
+  rdiff_backup = rdiff-backup;  # added 2014-11-23
+  rssglx = rss-glx; #added 2015-03-25
+  speedtest_cli = speedtest-cli;  # added 2015-02-17
+  sqliteInteractive = sqlite-interactive;  # added 2014-12-06
+  youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
+  youtubeDL = youtube-dl;  # added 2014-10-26
 
 }; in self; in pkgs

From 6e1bee84d36e4f32f920dda6321719c5576f6588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Tue, 1 Sep 2015 10:08:44 +0100
Subject: [PATCH 1860/2016] rkt: Don't download stage1 image during build.

The rkt build process requires a stage1 image. By default it will try
and download one with wget from coreos.com during the build. This change
explicitly downloads the image using `fetchurl`, verifying checksum,
then passes that to the build using appropriate configure flag.
---
 pkgs/applications/virtualization/rkt/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 71aa7a710f9..e873608733a 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -1,7 +1,10 @@
 { stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio
-, fetchFromGitHub }:
+, fetchurl, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+let
+  coreosImageRelease = "738.1.0";
+  
+in stdenv.mkDerivation rec {
   version = "0.8.0";
   name = "rkt-${version}";
 
@@ -12,12 +15,19 @@ stdenv.mkDerivation rec {
       sha256 = "1abv9psd5w0m8p2kvrwyjnrclzajmrpbwfwmkgpnkydhmsimhnn0";
   };
 
+  stage1image = fetchurl {
+    url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
+    sha256 = "1rnb9rwms5g7f142d9yh169a5k2hxiximpgk4y4kqmc1294lqnl0";
+  };
+  
   buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
   
   preConfigure = ''
     ./autogen.sh
   '';
 
+  configureFlags = "--with-stage1-image-path=${stage1image}";
+  
   installPhase = ''
     mkdir -p $out/bin
     cp -Rv build-rkt-${version}/bin/* $out/bin

From dbc6c2be3f8281d794de87651e2e2c27c48b6b42 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 1 Sep 2015 11:09:35 +0200
Subject: [PATCH 1861/2016] pythonPackages: fix pyutil on pypy platform

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index af3e24aff9d..603adab4f0f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11756,6 +11756,10 @@ let
     # package, apparently some kind of plugin.
     doCheck = false;
 
+    prePatch = optionalString isPyPy ''
+      grep -rl 'utf-8-with-signature-unix' ./ | xargs sed -i -e "s|utf-8-with-signature-unix|utf-8|g"
+    '';
+
     meta = {
       description = "Pyutil, a collection of mature utilities for Python programmers";
 

From 24ae56e7fe097200143e29083969b009ed223071 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 1 Sep 2015 11:59:01 +0200
Subject: [PATCH 1862/2016] ngrok: fix build

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

diff --git a/pkgs/tools/misc/ngrok/default.nix b/pkgs/tools/misc/ngrok/default.nix
index c3019d722af..5b55175217a 100644
--- a/pkgs/tools/misc/ngrok/default.nix
+++ b/pkgs/tools/misc/ngrok/default.nix
@@ -25,7 +25,7 @@ buildGoPackage rec {
   '';
 
   buildInputs = [ git log4go websocket go-vhost mousetrap termbox-go rcrowley.go-metrics
-                  yaml-v1 go-bindata go-update binarydist osext ];
+                  yaml-v1 go-bindata.bin go-update binarydist osext ];
 
   buildFlags = "-tags release";
 

From 0f78de00b8654a9d0dc9e92a93d0a9ff7aaaad5f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Sep 2015 11:09:18 +0200
Subject: [PATCH 1863/2016] vboot_reference: Fix Git URL

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

diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index 087a3212fc2..07349e6ec33 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "vboot_reference-${version}";
 
   src = fetchgit {
-    url = "http://git.chromium.org/git/chromiumos/platform/vboot_reference.git";
+    url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference;
     rev = "refs/changes/${checkout}";
     sha256 = "00qhwhh5ygrcfm9is8hrk1spqdvfs6aa744h10jbr03zics5bvac";
   };

From 7f0c5a2c8fbfccdeb1f62bcf75ae0c4456db7ef4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Sep 2015 11:12:36 +0200
Subject: [PATCH 1864/2016] praat: Update to 5417

Mostly because the old URL didn't work.
---
 pkgs/applications/audio/praat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index 354a3e43616..03ba33b4834 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, alsaLib, gtk, pkgconfig }:
 
-let version = "5401"; in
+let version = "5417"; in
 stdenv.mkDerivation {
   name = "praat-${version}";
 
   src = fetchurl {
     url = "http://www.fon.hum.uva.nl/praat/praat${version}_sources.tar.gz";
-    sha256 = "1hx0simc0hp5w5scyaiw8h8lrpafra4h1zy1jn1kzb0299yd06n3";
+    sha256 = "1bspl963pb1s6k3cd9p3g5j518pxg6hkrann945lqsrvbzaa20kl";
   };
 
   configurePhase = ''

From 8fc039188e2dfab71930a1c2196d4fb52a76365a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Sep 2015 11:13:00 +0200
Subject: [PATCH 1865/2016] Mark some packages with undownloadable source as
 broken

---
 pkgs/applications/networking/cluster/openshift/default.nix | 1 +
 pkgs/applications/office/mmex/default.nix                  | 3 ++-
 pkgs/applications/science/math/gap/default.nix             | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index 527ddd99af1..e5f813fcd7d 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.openshift.org;
     maintainers = with maintainers; [offline];
     platforms = [ "x86_64-linux" ];
+    broken = true;
   };
 }
diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix
index 2940569ef65..0a28ff9db70 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/pkgs/applications/office/mmex/default.nix
@@ -8,7 +8,7 @@ in
   stdenv.mkDerivation {
     name = "money-manager-ex-${version}";
 
-    src = fetchsvn {
+    src = fetchurl {
       url = "https://moneymanagerex.svn.sourceforge.net/svnroot/moneymanagerex/tags/releases/${version}";
       sha256 = "0mby1p01fyxk5pgd7h3919q91r10zbfk16rfz1kbchqxqz87x4jq";
     };
@@ -31,5 +31,6 @@ in
       license = stdenv.lib.licenses.gpl2Plus;
       maintainers = with stdenv.lib.maintainers; [viric];
       platforms = with stdenv.lib.platforms; linux;
+      broken = true;
     };
   }
diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix
index 0700251c3a8..e810879eba6 100644
--- a/pkgs/applications/science/math/gap/default.nix
+++ b/pkgs/applications/science/math/gap/default.nix
@@ -63,5 +63,6 @@ rec {
     license = with a.lib.licenses;
       gpl2;
     homepage = "http://gap-system.org/";
+    broken = true;
   };
 }) x

From 6cadec8906d8201ddb087a4051b0c272fd4ae51f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Sep 2015 11:33:30 +0200
Subject: [PATCH 1866/2016] ant: Update to 1.9.6

---
 pkgs/development/tools/build-managers/apache-ant/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index 476d2cb8ac5..b15c9065e0e 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, coreutils, makeWrapper }:
 
-let version = "1.9.4"; in
+let version = "1.9.6"; in
 
 stdenv.mkDerivation {
   name = "ant-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
-    sha256 = "1kw801p8h5x4f0g8i5yknppssrj5a3xy1aqrkpfnk22bd1snbh90";
+    sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4";
   };
 
   contrib = fetchurl {

From ea7b5bb8b0462a01fc5288eb94dca0b0d779bd2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Sep 2015 11:59:01 +0200
Subject: [PATCH 1867/2016] Fix NFSv4 test

http://hydra.nixos.org/build/25349071
---
 nixos/modules/services/network-filesystems/nfsd.nix | 5 +----
 nixos/tests/nfs.nix                                 | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
index 33b7ec3d9f1..f1838224098 100644
--- a/nixos/modules/services/network-filesystems/nfsd.nix
+++ b/nixos/modules/services/network-filesystems/nfsd.nix
@@ -88,10 +88,7 @@ in
 
     environment.systemPackages = [ pkgs.nfs-utils ];
 
-    environment.etc = singleton
-      { source = exports;
-        target = "exports";
-      };
+    environment.etc.exports.source = exports;
 
     boot.kernelModules = [ "nfsd" ];
 
diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix
index 963776dd2ac..24f6e0f2ed9 100644
--- a/nixos/tests/nfs.nix
+++ b/nixos/tests/nfs.nix
@@ -6,7 +6,7 @@ let
     { config, pkgs, ... }:
     { fileSystems = pkgs.lib.mkVMOverride
         [ { mountPoint = "/data";
-            device = "server:${if version == 4 then "/" else "/data"}";
+            device = "server:/data";
             fsType = "nfs";
             options = "vers=${toString version}";
           }

From 44c12dc0ff131653f35fc63e97257bf089082c21 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 1 Sep 2015 12:14:44 +0200
Subject: [PATCH 1868/2016] `desktopManagerHandlesLidAndPower default `false`

Changes the option and explicitely sets it for each desktopManager.

Reasoning: Currently,
services.xserver.displayManager.desktopManagerHandlesLidAndPower is set
to true by default. This creates a problem for users without desktop
environments activated, since lid management simply doesn't work
(and they have to be lucky to find this option).

See issue #9671
---
 nixos/modules/services/x11/desktop-managers/README      | 1 +
 nixos/modules/services/x11/desktop-managers/e19.nix     | 1 +
 nixos/modules/services/x11/desktop-managers/kde4.nix    | 1 +
 nixos/modules/services/x11/desktop-managers/kde5.nix    | 1 +
 nixos/modules/services/x11/desktop-managers/kodi.nix    | 3 ++-
 nixos/modules/services/x11/desktop-managers/xfce.nix    | 1 +
 nixos/modules/services/x11/display-managers/default.nix | 2 +-
 7 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/services/x11/desktop-managers/README

diff --git a/nixos/modules/services/x11/desktop-managers/README b/nixos/modules/services/x11/desktop-managers/README
new file mode 100644
index 00000000000..78c75ff7098
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/README
@@ -0,0 +1 @@
+Each desktop manager should explicitly specify a value for `services.xserver.displayManager.desktopManagerHandlesLidAndPower`.
\ No newline at end of file
diff --git a/nixos/modules/services/x11/desktop-managers/e19.nix b/nixos/modules/services/x11/desktop-managers/e19.nix
index 2d5c7b192bc..74065c862ef 100644
--- a/nixos/modules/services/x11/desktop-managers/e19.nix
+++ b/nixos/modules/services/x11/desktop-managers/e19.nix
@@ -62,6 +62,7 @@ in
         waitPID=$!
       '';
     }];
+    services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
 
     security.setuidPrograms = [ "e19_freqset" ];
 
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 21b6243ba18..7830e984219 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -111,6 +111,7 @@ in
             exec ${kde_workspace}/bin/startkde
           '';
       };
+    services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
 
     security.setuidOwners = singleton
       { program = "kcheckpass";
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 5061d59b7c7..01a8704fea7 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -78,6 +78,7 @@ in
       bgSupport = true;
       start = ''exec ${plasma5.plasma-workspace}/bin/startkde;'';
     };
+    services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
 
     security.setuidOwners = singleton {
       program = "kcheckpass";
diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix
index 1e30308a513..e6d6efaf3a6 100644
--- a/nixos/modules/services/x11/desktop-managers/kodi.nix
+++ b/nixos/modules/services/x11/desktop-managers/kodi.nix
@@ -25,7 +25,8 @@ in
         waitPID=$!
       '';
     }];
+    services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
 
     environment.systemPackages = [ pkgs.kodi ];
   };
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 88eefa13de3..746f810a11f 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -37,6 +37,7 @@ in
             exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc}
           '';
       };
+    services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
 
     environment.systemPackages =
       [ pkgs.gtk # To get GTK+'s themes.
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 991043d73c6..98e36954712 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -229,7 +229,7 @@ in
 
       desktopManagerHandlesLidAndPower = mkOption {
         type = types.bool;
-        default = true;
+        default = false;
         description = ''
           Whether the display manager should prevent systemd from handling
           lid and power events. This is normally handled by the desktop

From bea3ba66bb5eb4921a48e606bfb8d8841773ef4a Mon Sep 17 00:00:00 2001
From: Andreas Wagner <andreas.wagner@lowfatcomputing.org>
Date: Mon, 31 Aug 2015 09:52:01 -0400
Subject: [PATCH 1869/2016] multimarkdown: init at 4.7.1

---
 .../typesetting/multimarkdown/default.nix     | 52 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/tools/typesetting/multimarkdown/default.nix

diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix
new file mode 100644
index 00000000000..1b6104106ba
--- /dev/null
+++ b/pkgs/tools/typesetting/multimarkdown/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchgit, perl }:
+
+stdenv.mkDerivation rec {
+  name = "multimarkdown-${version}";
+  version = "4.7.1";
+
+  src = fetchgit {
+    url = "https://github.com/fletcher/MultiMarkdown-4.git";
+    fetchSubmodules = true;
+    rev = "dd060247518715ef2b52be22b8f49d0e6d2c3a8b";
+    sha256 = "0s7rcxgmv1almlic7bky426x52h7g1pjdhi3y8wf84fpx8c7b6g2";
+  };
+
+  preBuild = ''
+    substituteInPlace enumsToPerl.pl --replace "/usr/bin/perl" "${perl}/bin/perl"
+  '';
+
+  buildInputs = [ stdenv ];
+  checkPhase = "make test-all";
+  installPhase = "make pkg-install prefix='' DESTDIR=$out; make pkg-install-scripts prefix='' DESTDIR=$out";
+
+  meta = with stdenv.lib; {
+    description = "A derivative of Markdown that adds new syntax features";
+    longDescription = ''
+      MultiMarkdown is a lightweight markup language created by
+      Fletcher T. Penney and based on Markdown, which supports
+      more export-formats (html, latex, beamer, memoir, odf, opml,
+      lyx, mmd) and implements some added features currently not
+      available with plain Markdown syntax.
+
+      It adds the following features to Markdown:
+
+      footnotes
+      tables
+      citations and bibliography (works best in LaTeX using BibTeX)
+      math support
+      automatic cross-referencing ability
+      smart typography, with support for multiple languages
+      image attributes
+      table and image captions
+      definition lists
+      glossary entries (LaTeX only)
+      document metadata (e.g. title, author, date, etc.)
+    '';
+    homepage = "http://fletcherpenney.net/multimarkdown/";
+    # licensed under GPLv2+ or MIT:
+    # https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE
+    license = with stdenv.lib.licenses; [ gpl2Plus ];
+    hydraPlatforms = platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index abb1462f6a8..4377ccafa09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12228,6 +12228,8 @@ let
     inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3;
   };
 
+  multimarkdown = callPackage ../tools/typesetting/multimarkdown { };
+
   multimon-ng = callPackage ../applications/misc/multimon-ng { };
 
   multisync = callPackage ../applications/misc/multisync {

From 79a8a9327d836d51ed6d9f2752e7bb232e9890d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Sep 2015 12:53:26 +0200
Subject: [PATCH 1870/2016] Doh

---
 pkgs/applications/office/mmex/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix
index 0a28ff9db70..c45eb7d53d0 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/pkgs/applications/office/mmex/default.nix
@@ -8,7 +8,7 @@ in
   stdenv.mkDerivation {
     name = "money-manager-ex-${version}";
 
-    src = fetchurl {
+    src = fetchsvn {
       url = "https://moneymanagerex.svn.sourceforge.net/svnroot/moneymanagerex/tags/releases/${version}";
       sha256 = "0mby1p01fyxk5pgd7h3919q91r10zbfk16rfz1kbchqxqz87x4jq";
     };

From 3c7f1431c02f53b6aec561e383a3b4b0d33b5621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <deroiste@syslab.com>
Date: Tue, 1 Sep 2015 13:17:35 +0200
Subject: [PATCH 1871/2016] helmholtz: unset the curl user-agent to fix the
 download

I've checked this with the developer to ensure it isn't blocked
deliberately and she said it was just a problem with the hosting
provider, so it is fine to work around it.
---
 pkgs/applications/audio/pd-plugins/helmholtz/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
index 9046ec0a87f..8f04bf116a6 100644
--- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
+++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "http://www.katjaas.nl/helmholtz/helmholtz~.zip";
     name = "helmholtz.zip";
+    curlOpts = "--user-agent ''";
     sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs";
   };
 

From 5d5c053f6886ddbf1b1b45d1de87e5336b94280b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 1 Sep 2015 10:57:51 +0200
Subject: [PATCH 1872/2016] libvdpau: security update 1.1 -> 1.1.1

CVE-2015-{5198,5199,5200}
---
 pkgs/development/libraries/libvdpau/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index a6da96dc863..6c5d5a91ad8 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "libvdpau-1.1";
+  name = "libvdpau-1.1.1";
 
   src = fetchurl {
-    url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
-    sha256 = "069r4qc934xw3z20hpmg0gx0al7fl1kdik1r46x2dgr0ya1yg95f";
+    url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2";
+    sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736";
   };
 
   buildInputs = with xorg; [ pkgconfig dri2proto libXext ];

From 1464a4de57a07bd10827283c3d41b03bea9cc63d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 1 Sep 2015 11:33:11 +0200
Subject: [PATCH 1873/2016] nvidia-x11: don't install libvdpau* that we have
 already

Besides being redundant to inject libvdpau via LD_LIBRARY_PATH,
currently the drivers come with a vulnerable version.
https://devtalk.nvidia.com/default/topic/873035
---
 pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh | 3 +++
 pkgs/os-specific/linux/nvidia-x11/builder.sh           | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh
index 07cc1a85de0..d0eec0f7403 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh
@@ -107,6 +107,9 @@ installPhase() {
     #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
     #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
     #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.*
+
+    # we distribute these separately in `libvdpau`
+    rm "$out"/lib/libvdpau{.*,_trace.*}
 }
 
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 1198208c9da..ba65089a4f7 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -122,6 +122,9 @@ installPhase() {
 
     # For simplicity and dependency reduction, don't support the gtk3 interface.
     rm $out/lib/libnvidia-gtk3.*
+
+    # we distribute these separately in `libvdpau`
+    rm "$out"/lib/libvdpau{.*,_trace.*}
 }
 
 

From 61cad61ebf40416dd9749f5a50b95f4ca12ce59f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 30 Aug 2015 10:41:43 -0500
Subject: [PATCH 1874/2016] makeWrapper: accept `--argv0` flag (/cc #9562)

By default `makeWrapper` will not set argv[0] (this is a reversion to
the old default behavior). Based on the breakage we have seen from
changing the default, this is what most people want. The `wrapProgram`
function will send `--argv0 '"$0"'` to `makeWrapper`, i.e. it will
continue to pass-through the argv[0] that the wrapper is called with.
---
 pkgs/build-support/setup-hooks/make-wrapper.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index f474ff5e88e..5150b4f0218 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -2,7 +2,7 @@ makeWrapper() {
     local original=$1
     local wrapper=$2
     local params varName value command separator n fileNames
-    local flagsBefore flags
+    local argv0 flagsBefore flags
 
     mkdir -p "$(dirname $wrapper)"
 
@@ -68,11 +68,17 @@ makeWrapper() {
             n=$((n + 1))
             flagsBefore="$flagsBefore $flags"
         fi
+
+        if test "$p" = "--argv0"; then
+            argv0=${params[$((n + 1))]}
+            n=$((n + 1))
+        fi
     done
 
     # Note: extraFlagsArray is an array containing additional flags
     # that may be set by --run actions.
-    echo exec -a '"$0"' "$original" $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper
+    echo exec ${argv0:+-a $argv0} "$original" \
+         $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper
 
     chmod +x $wrapper
 }
@@ -98,5 +104,5 @@ wrapProgram() {
     local prog="$1"
     local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
     mv $prog $hidden
-    makeWrapper $hidden $prog "$@"
+    makeWrapper $hidden $prog --argv0 '"$0"' "$@"
 }

From ffb8143cb143d9a1c2bf0814e07f3c09c68467af Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 1 Sep 2015 10:45:58 +0200
Subject: [PATCH 1875/2016] lttng-modules: 2.6.0-5 -> 2.6.2-1, fixes build on
 kernel 3.18

---
 pkgs/os-specific/linux/lttng-modules/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 5fe065d3cc6..128838c9c5c 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchgit, kernel }:
+{ stdenv, fetchFromGitHub, kernel }:
 
 assert stdenv.lib.versionAtLeast kernel.version "3.4";  # fails on 3.2
 
 stdenv.mkDerivation rec {
   pname = "lttng-modules-${version}";
   name = "${pname}-${kernel.version}";
-  version = "2.6.0-5-g1b2a542";
+  version = "2.6.2-1-g7a88f8b";
 
-  src = fetchgit {
-    url = "https://github.com/lttng/lttng-modules.git";
-    rev = "1b2a5429de815c95643df2eadf91253909708728";
-    sha256 = "0zccaiadnk0xl6xrqaqlg9rpkwjgbq2fiyc3psylzqimnx0ydxc2";
+  src = fetchFromGitHub {
+    owner = "lttng";
+    repo = "lttng-modules";
+    rev = "7a88f8b50696dd71e80c08661159caf8e119bf51";
+    sha256 = "1i185dvk4wn7fmmx1zfv6g15x8wi38jmav2dmq0mmy8cvriajq8h";
   };
 
   preConfigure = ''

From 65c1afd238fbde28afe1c9450b1c0e9567f75875 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 1 Sep 2015 14:37:25 +0200
Subject: [PATCH 1876/2016] rosegarden: disable parallel builds

---
 pkgs/applications/audio/rosegarden/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index b22018f1612..5ee15a92582 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (rec {
                   libsndfile libsamplerate perl makedepend libjack2 ]
 		++ stdenv.lib.optional withLirc [ lirc ];
   
-  enableParallelBuilding = true;
+  #enableParallelBuilding = true; issues on hydra
   
   meta = with stdenv.lib; {
     homepage = http://www.rosegardenmusic.com/;

From b4ad13f667143a444a82fd9da5b46d65ff32a26b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Tue, 1 Sep 2015 14:53:32 +0200
Subject: [PATCH 1877/2016] opencv: add version 3.0

Adding as a separate expression, as it is not api compatible with 2.x.
---
 pkgs/development/libraries/opencv/3.x.nix | 30 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/opencv/3.x.nix

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
new file mode 100644
index 00000000000..eae31df4796
--- /dev/null
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg
+, fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip
+, enableBloat ? false }:
+
+let v = "3.0.0"; in
+
+stdenv.mkDerivation rec {
+  name = "opencv-${v}";
+
+  src = fetchurl {
+    url = "https://github.com/Itseez/opencv/archive/${v}.zip";
+    sha256 = "00dh7wvgkflz22liqd10fma8m3395lb3l3rgawnn5wlnz6i4w287";
+  };
+
+  buildInputs =
+    [ unzip libjpeg libpng libtiff ]
+    ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Open Computer Vision Library with more than 500 algorithms";
+    homepage = http://opencv.org/;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [viric flosse];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4377ccafa09..c313641bbbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7790,6 +7790,8 @@ let
     libpng = libpng12;
   };
 
+  opencv3 = callPackage ../development/libraries/opencv/3.x.nix { };
+
   # this ctl version is needed by openexr_viewers
   openexr_ctl = ctl;
 

From 7234e899131682416d357d531e9397fa3673e108 Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS-SSD2)" <kovirobi@gmail.com>
Date: Tue, 9 Jun 2015 13:37:36 +0100
Subject: [PATCH 1878/2016] txt2tags: init at 2.6

txt2tags is a KISS markup language
---
 pkgs/tools/text/txt2tags/default.nix | 34 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/text/txt2tags/default.nix

diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix
new file mode 100644
index 00000000000..365815142d1
--- /dev/null
+++ b/pkgs/tools/text/txt2tags/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, python }:
+
+stdenv.mkDerivation rec {
+  version = "2.6";
+  name = "txt2tags-${version}";
+
+  dontBuild = true;
+
+  # Python script, needs the interpreter
+  propagatedBuildInputs = [ python ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mkdir -p "$out/share/doc"
+    mkdir -p "$out/share/man/man1/"
+    sed '1s|/usr/bin/env python|${python}/bin/python|' < txt2tags > "$out/bin/txt2tags"
+    chmod +x "$out/bin/txt2tags"
+    gzip - < doc/manpage.man > "$out/share/man/man1/txt2tags.1.gz"
+    cp doc/userguide.pdf "$out/share/doc"
+    cp -r extras/ samples/ test/ "$out/share"
+  '';
+
+  src = fetchurl {
+    url = "http://txt2tags.googlecode.com/files/${name}.tgz";
+    sha256 = "0p5hql559pk8v5dlzgm75yrcxwvz4z30f1q590yzng0ghvbnf530";
+  };
+
+  meta = {
+    homepage = http://txt2tags.org/;
+    description = "A KISS markup language";
+    license  = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ kovirobi ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c313641bbbd..9ef3449271c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3254,6 +3254,8 @@ let
 
   txt2man = callPackage ../tools/misc/txt2man { };
 
+  txt2tags = callPackage ../tools/text/txt2tags { };
+
   u9fs = callPackage ../servers/u9fs { };
 
   ucl = callPackage ../development/libraries/ucl { };

From 97b27e69c053c2810201f6a72a186234c012b64f Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Tue, 1 Sep 2015 16:30:27 +0200
Subject: [PATCH 1879/2016] Update HOL Light to svn r244.

---
 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 86d7bfd8427..b50501a6d34 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -10,12 +10,12 @@ in
 
 stdenv.mkDerivation rec {
   name     = "hol_light-${version}";
-  version  = "232";
+  version  = "244";
 
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
     rev = version;
-    sha256 = "1cips2cb5wqxb6n2qi28af2ap1vhklqbhjy7pnifgz4dilkz10m8";
+    sha256 = "1qzb48j7zbx7c327ixmvq2k0ap7y6fqvwal0195chfxvhs858lfq";
   };
 
   buildInputs = [ ocaml findlib camlp5 ];

From 04d6095700454c4ecfd1a22755f57cf5d5987637 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 1 Sep 2015 16:36:18 +0200
Subject: [PATCH 1880/2016] netsniff-ng: 0.5.9-{86-gd84a6b7 -> 88-ge5570a8}

---
 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 7d94a287968..3df3d114e45 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-86-gd84a6b7"; in
+let version = "0.5.9-88-ge5570a8"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "d84a6b7139f3c6d0eb70615543cf368350000e5b";
-    sha256 = "1vn84scds93chidcq1dvbwlwzyb935f3116hlgq1q4rwm0225g64";
+    rev = "e5570a84d16022dda6de7d5a55f7b7bd53d4a8de";
+    sha256 = "0w1l5a49xcwrp78djcs8d4737ndji9jp7x0v5q5yl5jfg0cdgmzc";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From f33f8e1b348151704115b8187dfa6346827d8164 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Sep 2015 15:17:44 +0200
Subject: [PATCH 1881/2016] emacs-haskell-mode: update to version
 13.14-169-g0d3569d

---
 pkgs/applications/editors/emacs-modes/haskell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 022827952b6..67d1d71c5ee 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, emacs, texinfo }:
 
 let
-  version = "13.14-153-g318ccab";      # git describe --tags
+  version = "13.14-169-g0d3569d";      # git describe --tags
 in
 stdenv.mkDerivation {
   name = "haskell-mode-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     owner = "haskell";
     repo = "haskell-mode";
     rev = "v${version}";
-    sha256 = "1n08fmaf7q13y68xyzs4h686hvb7n5mdyvn1zy81d7gh0m5013k4";
+    sha256 = "0v5iy9wy05hf44wy7qs0c9q0v34m4k6wrqg4kyvji61568k1yx3k";
   };
 
   buildInputs = [ emacs texinfo ];

From ebd99dea2fc8b67a8d89254bb8539c3a827b090e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Sep 2015 15:47:51 +0200
Subject: [PATCH 1882/2016] emacs-dash: update to version 2.11.0

---
 pkgs/applications/editors/emacs-modes/dash/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/dash/default.nix b/pkgs/applications/editors/emacs-modes/dash/default.nix
index aacc33c9b51..c71860992da 100644
--- a/pkgs/applications/editors/emacs-modes/dash/default.nix
+++ b/pkgs/applications/editors/emacs-modes/dash/default.nix
@@ -1,13 +1,14 @@
 {stdenv, fetchurl, emacs}:
 
-let version = "1.5.0";
-
-in stdenv.mkDerivation {
+let
+  version = "2.11.0";
+in
+stdenv.mkDerivation {
   name = "emacs-dash-${version}";
 
   src = fetchurl {
     url = "https://github.com/magnars/dash.el/archive/${version}.tar.gz";
-    sha256 = "0c6jknzy306vn22vqlabxkwxfnllrd33spymi74fkirbxaxvp8kp";
+    sha256 = "1piwcwilkxcbjxx832mhb7q3pz1fgwp203r581bpqcw6kd5x726q";
   };
 
   buildInputs = [ emacs ];

From bcd3e06f4cad4809177eec2d0ba6c73228f498fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Sep 2015 15:48:25 +0200
Subject: [PATCH 1883/2016] emacs-git-modes: update to version 1.2.0

---
 pkgs/applications/editors/emacs-modes/git-modes/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/git-modes/default.nix b/pkgs/applications/editors/emacs-modes/git-modes/default.nix
index 8a2ca6eb909..59733fe5bb4 100644
--- a/pkgs/applications/editors/emacs-modes/git-modes/default.nix
+++ b/pkgs/applications/editors/emacs-modes/git-modes/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, emacs }:
 
 let
-  version = "0.15.0-8-g4e10851";
+  version = "1.2.0";
 in
 stdenv.mkDerivation {
   name = "git-modes-${version}";
@@ -9,8 +9,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "magit";
     repo = "git-modes";
-    rev = "4e10851843145e0c05fc665683d3b487a57ad114";
-    sha256 = "13j794a2p4ql9dnw2z0c1m0ybclxsicbk8cmmfqcchs4ygiyc6ag";
+    rev = version;
+    sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
   };
 
   buildInputs = [ emacs ];

From 881fb00fdf5d39b92548a3af2070a03146615f51 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Sep 2015 15:48:51 +0200
Subject: [PATCH 1884/2016] emacs-magit: update to version 2.2.1

---
 .../editors/emacs-modes/magit/default.nix     | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
index 676a86985f8..8d71ca58202 100644
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -1,33 +1,41 @@
-{ stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git }:
+{ stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git, dash }:
 
-stdenv.mkDerivation rec {
-  name = "magit-90141025";
+let
+  version = "2.2.1";
+in
+stdenv.mkDerivation {
+  name = "magit-${version}";
 
   src = fetchFromGitHub {
     owner = "magit";
     repo = "magit";
-    rev = "50c08522c8a3c67e0f3b821fe4df61e8bd456ff9";
-    sha256 = "0mzyx72pidzvla1x2qszn3c60n2j0n8i5k875c4difvd1n4p0vsk";
+    rev = version;
+    sha256 = "1bq26wrgm4wgif0hj16mkmiz0p1iilxs7dmdd1vq5df8nivmakjz";
   };
 
   buildInputs = [ emacs texinfo git ];
-  propagatedUserEnvPkgs = [ gitModes ];
+  propagatedUserEnvPkgs = [ gitModes dash ];
 
   configurePhase = ''
     makeFlagsArray=(
       PREFIX="$out"
-      EFLAGS="-L ${gitModes}/share/emacs/site-lisp"
       lispdir="$out/share/emacs/site-lisp"
+      DASH_DIR="${dash}/share/emacs/site-lisp"
+      VERSION="${version}"
     )
+    make ''${makeFlagsArray[@]} -C lisp magit-version.el
+    cp lisp/magit-version.el Documentation/
+    cp lisp/magit-version.el .
   '';
 
-  doCheck = true;
+  doCheck = false;  # one out of 5 tests fails, not sure why
   checkTarget = "test";
+  preCheck = "export EMAIL='Joe Doe <joe.doe@example.org>'";
 
-  postInstall = ''
-    mkdir -p $out/bin
-    mv "bin/"* $out/bin/
-  '';
+  # postInstall = ''
+  #   mkdir -p $out/bin
+  #   mv "bin/"* $out/bin/
+  # '';
 
   meta = {
     homepage = "https://github.com/magit/magit";

From c30410e2dcf9d58facd7ccc09078cf0ec34cd3b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 31 Aug 2015 17:15:18 +0200
Subject: [PATCH 1885/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/e6301b9ed82b6daf085089f6f9c1b913871ab2c1
 with hackage2nix v20150824-58-g80c45f8

---
 .../haskell-modules/hackage-packages.nix      | 571 ++++++++++++++----
 1 file changed, 469 insertions(+), 102 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 831556432b9..5280eeef7e0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -17,6 +17,7 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/3d-graphics-examples";
        description = "Examples of 3D graphics programming with OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "3dmodels" = callPackage
@@ -1231,6 +1232,7 @@ self: {
        homepage = "https://github.com/choener/BenchmarkHistory";
        description = "Benchmark functions with history";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "BerkeleyDB" = callPackage
@@ -1287,6 +1289,7 @@ self: {
        homepage = "https://github.com/mchakravarty/BigPixel";
        description = "Image editor for pixel art";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Binpack" = callPackage
@@ -1664,6 +1667,7 @@ self: {
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "BluePrintCSS" = callPackage
@@ -2447,6 +2451,7 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Diagrams backend for Charts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Chart-gtk" = callPackage
@@ -5196,6 +5201,7 @@ self: {
        homepage = "http://joyful.com/fungen";
        description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Fungi" = callPackage
@@ -5270,6 +5276,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;};
 
   "GLFW-OGL" = callPackage
@@ -5318,6 +5325,7 @@ self: {
        jailbreak = true;
        description = "GLFW-b demo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "GLFW-task" = callPackage
@@ -5333,6 +5341,7 @@ self: {
        homepage = "http://github.com/ninegua/GLFW-task";
        description = "GLFW utility functions to use together with monad-task";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "GLHUI" = callPackage
@@ -5345,6 +5354,7 @@ self: {
        librarySystemDepends = [ libX11 mesa ];
        description = "Open OpenGL context windows in X11 with libX11";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;};
 
   "GLMatrix" = callPackage
@@ -5371,6 +5381,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT" = callPackage
@@ -5388,6 +5399,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUtil" = callPackage
@@ -5407,6 +5419,7 @@ self: {
        jailbreak = true;
        description = "Miscellaneous OpenGL utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "GPX" = callPackage
@@ -5429,21 +5442,22 @@ self: {
      }) {};
 
   "GPipe" = callPackage
-    ({ mkDerivation, base, Boolean, containers, GLUT, list-tries
-     , OpenGL, transformers, Vec, Vec-Boolean
+    ({ mkDerivation, base, Boolean, containers, exception-transformers
+     , gl, hashtables, linear, transformers
      }:
      mkDerivation {
        pname = "GPipe";
-       version = "1.4.1";
-       sha256 = "a32faf7b33694017a607b8a8d2263ea3ab664c77c3575de37d37fd7a8f7d3d70";
+       version = "2.0";
+       sha256 = "65e4c75b3635fa262fd89555ba40508c6bf0d07ef4dcb93fa856d505b795e614";
+       revision = "1";
+       editedCabalFile = "3828cf5628f91a2aed23c409f068d632e618b050c9e7932ea1cc2217092a1170";
        libraryHaskellDepends = [
-         base Boolean containers GLUT list-tries OpenGL transformers Vec
-         Vec-Boolean
+         base Boolean containers exception-transformers gl hashtables linear
+         transformers
        ];
-       jailbreak = true;
-       homepage = "http://www.haskell.org/haskellwiki/GPipe";
-       description = "A functional graphics API for programmable GPUs";
-       license = stdenv.lib.licenses.bsd3;
+       homepage = "http://tobbebex.blogspot.se/";
+       description = "Typesafe functional GPU graphics programming";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -8216,6 +8230,7 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "HaskellNN" = callPackage
@@ -9573,6 +9588,7 @@ self: {
        homepage = "https://github.com/idontgetoutmuch/Kalman";
        description = "A slightly extended Kalman filter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "KdTree" = callPackage
@@ -9867,6 +9883,7 @@ self: {
        jailbreak = true;
        description = "A configurable and extensible neural network library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "LambdaPrettyQuote" = callPackage
@@ -10709,6 +10726,7 @@ self: {
        executableHaskellDepends = [ base GLUT random ];
        description = "A FRP library based on signal functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "MoeDict" = callPackage
@@ -11908,6 +11926,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "OpenGLCheck" = callPackage
@@ -12585,6 +12604,7 @@ self: {
        executableHaskellDepends = [ array base clock GLUT random ];
        description = "An imaginary world";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "PortFusion" = callPackage
@@ -13277,6 +13297,7 @@ self: {
        homepage = "http://github.com/Soares/Randometer.hs";
        description = "Randomness intuition trainer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "Range" = callPackage
@@ -13338,6 +13359,7 @@ self: {
        homepage = "http://hub.darcs.net/martingw/Rasenschach";
        description = "Soccer simulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Rasterific" = callPackage
@@ -13658,6 +13680,7 @@ self: {
        librarySystemDepends = [ smpeg ];
        description = "Binding to the SMPEG library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) smpeg;};
 
   "SDL-ttf" = callPackage
@@ -13899,6 +13922,7 @@ self: {
        ];
        description = "Fonts from the SVG-Font format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "SVGPath" = callPackage
@@ -14270,6 +14294,7 @@ self: {
        homepage = "http://www.geocities.jp/takascience/index_en.html";
        description = "A vector shooter game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "SimpleAES" = callPackage
@@ -14733,6 +14758,7 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/Haskell/";
        description = "Collection of useful statistical methods";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "Stomp" = callPackage
@@ -14962,6 +14988,7 @@ self: {
        jailbreak = true;
        description = "Utilities for condensed matter physics tight binding calculations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "TCache" = callPackage
@@ -14984,8 +15011,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "THEff";
-       version = "0.1.0.1";
-       sha256 = "0fbe048bd845a2917e88bacc47e9d63da757ab15f233e63e876a6115f460663f";
+       version = "0.1.1.0";
+       sha256 = "545725746fa7ea7d77cdb1447a1f2564ddfe36624c8a3118a7e8d0b009ef2462";
        libraryHaskellDepends = [ base template-haskell ];
        description = "TH implementation of effects";
        license = stdenv.lib.licenses.bsd3;
@@ -15588,6 +15615,7 @@ self: {
        homepage = "http://haskell.cs.yale.edu/";
        description = "Library for Arrowized Graphical User Interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "UMM" = callPackage
@@ -15682,6 +15710,7 @@ self: {
        homepage = "http://src.seereason.com/haskell-unixutils-shadow";
        description = "A simple interface to shadow passwords (aka, shadow.h)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Updater" = callPackage
@@ -15846,6 +15875,7 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "ViennaRNA v2 bindings";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "ViennaRNAParser" = callPackage
@@ -15928,6 +15958,7 @@ self: {
        jailbreak = true;
        description = "WebMoney authentication module";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "WURFL" = callPackage
@@ -16363,6 +16394,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/WxGeneric";
        description = "Generic (SYB3) construction of wxHaskell widgets";
        license = "LGPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "X11" = callPackage
@@ -16932,6 +16964,7 @@ self: {
        homepage = "https://github.com/pa-ba/abc-puzzle";
        description = "Generate instances of the ABC Logic Puzzle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "abcBridge" = callPackage
@@ -18908,6 +18941,7 @@ self: {
        homepage = "http://github.com/dsorokin/aivika-experiment-diagrams";
        description = "Diagrams backend for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "aivika-transformers" = callPackage
@@ -20016,6 +20050,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-ecs" = callPackage
@@ -20304,6 +20339,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
        license = "unknown";
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-redshift" = callPackage
@@ -20376,6 +20412,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-sdb" = callPackage
@@ -20448,6 +20485,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
        license = "unknown";
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-ssm" = callPackage
@@ -20538,6 +20576,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-test" = callPackage
@@ -22131,6 +22170,7 @@ self: {
        ];
        description = "Natural number arithmetic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "arithmoi" = callPackage
@@ -23047,6 +23087,7 @@ self: {
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "An atomic counter implemented using the FFI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "atomic-primops-vector" = callPackage
@@ -24337,27 +24378,27 @@ self: {
      }) {};
 
   "b9" = callPackage
-    ({ mkDerivation, aeson, async, base, bifunctors, binary, bytestring
-     , conduit, conduit-extra, ConfigFile, directory, filepath, free
-     , hspec, hspec-expectations, mtl, optparse-applicative, parsec
-     , pretty, pretty-show, process, QuickCheck, random, semigroups, syb
-     , template, text, time, transformers, unordered-containers, vector
-     , yaml
+    ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
+     , bytestring, conduit, conduit-extra, ConfigFile, directory
+     , filepath, free, hspec, hspec-expectations, mtl
+     , optparse-applicative, parsec, pretty, pretty-show, process
+     , QuickCheck, random, semigroups, syb, template, text, time
+     , transformers, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "b9";
-       version = "0.5.8";
-       sha256 = "71c30f016937045d4400b835f97e94913e929fa5d130a1fe2cc5ece4eb930f65";
+       version = "0.5.10";
+       sha256 = "df1b11037ace168568c378259b59f6d9a6ccc81ac339389237e825349ee6edb9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bifunctors binary bytestring conduit conduit-extra
-         ConfigFile directory filepath free mtl parsec pretty pretty-show
-         process QuickCheck random semigroups syb template text time
-         transformers unordered-containers vector yaml
+         aeson async base bifunctors binary boxes bytestring conduit
+         conduit-extra ConfigFile directory filepath free mtl parsec pretty
+         pretty-show process QuickCheck random semigroups syb template text
+         time transformers unordered-containers vector yaml
        ];
        executableHaskellDepends = [
-         base bytestring optparse-applicative
+         base bytestring directory optparse-applicative
        ];
        testHaskellDepends = [
          aeson base bytestring hspec hspec-expectations QuickCheck
@@ -24381,6 +24422,7 @@ self: {
        ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "backdropper" = callPackage
@@ -24641,6 +24683,7 @@ self: {
        homepage = "http://blog.malde.org/posts/bamstats.html";
        description = "A program to extract various information from BAM alignmnet files";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bank-holidays-england" = callPackage
@@ -24912,6 +24955,7 @@ self: {
        homepage = "https://github.com/pxqr/base32-bytestring";
        description = "Fast base32 and base32hex codec for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "base32string" = callPackage
@@ -26254,6 +26298,7 @@ self: {
        homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bindings" = callPackage
@@ -26625,6 +26670,7 @@ self: {
        homepage = "https://github.com/basvandijk/bindings-levmar";
        description = "Low level bindings to the C levmar (Levenberg-Marquardt) library";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) blas; lapack = null;};
 
   "bindings-libcddb" = callPackage
@@ -26815,6 +26861,7 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "parport bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bindings-portaudio" = callPackage
@@ -27021,6 +27068,7 @@ self: {
        homepage = "http://code.mathr.co.uk/binembed";
        description = "Example project using binembed to embed data in object files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bio" = callPackage
@@ -27238,6 +27286,7 @@ self: {
        homepage = "https://github.com/acfoltzer/bit-vector";
        description = "Simple bit vectors for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "bitarray" = callPackage
@@ -27439,6 +27488,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for Data.Bitmap.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bitmaps" = callPackage
@@ -27512,6 +27562,7 @@ self: {
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {gcc_s = null;};
 
   "bitset" = callPackage
@@ -27776,6 +27827,7 @@ self: {
        homepage = "https://github.com/bitemyapp/blacktip";
        description = "Decentralized, k-ordered unique ID generator";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "blakesum" = callPackage
@@ -28284,6 +28336,7 @@ self: {
        executableHaskellDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "blubber" = callPackage
@@ -28302,6 +28355,7 @@ self: {
        homepage = "https://secure.plaimi.net/games/blubber.html";
        description = "The blubber client; connects to the blubber server";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "blubber-server" = callPackage
@@ -29095,6 +29149,7 @@ self: {
        homepage = "https://github.com/chadaustin/buffer-builder";
        description = "Library for efficiently building up buffers, one piece at a time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "buffer-builder-aeson" = callPackage
@@ -29119,6 +29174,7 @@ self: {
        jailbreak = true;
        description = "Serialize Aeson values with Data.BufferBuilder";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "bugzilla" = callPackage
@@ -29371,6 +29427,7 @@ self: {
        homepage = "http://www.freedesktop.org/wiki/Software/Bustle/";
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bv" = callPackage
@@ -29934,6 +29991,7 @@ self: {
        homepage = "https://github.com/haskell/c2hs";
        description = "C->Haskell FFI tool that gives some cross-language type safety";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "c2hsc" = callPackage
@@ -32193,6 +32251,7 @@ self: {
        jailbreak = true;
        description = "Cairo-based CellRenderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "cereal" = callPackage
@@ -32433,6 +32492,7 @@ self: {
        ];
        description = "Parser for categorial grammars";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "cgen" = callPackage
@@ -32685,6 +32745,7 @@ self: {
        homepage = "http://github.com/Aelve/charsetdetect-ae";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
        license = "LGPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "chart-histogram" = callPackage
@@ -33433,6 +33494,7 @@ self: {
        homepage = "http://github.com/thoughtpolice/hs-cityhash";
        description = "Bindings to CityHash";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "cjk" = callPackage
@@ -34085,6 +34147,7 @@ self: {
        homepage = "https://github.com/dfoxfranke/haskell-cld2";
        description = "Haskell bindings to Google's Compact Language Detector 2";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "clean-home" = callPackage
@@ -36450,6 +36513,7 @@ self: {
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the libsndfile audio file library";
        license = "LGPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "conduit-combinators" = callPackage
@@ -37009,6 +37073,7 @@ self: {
        homepage = "https://github.com/scrive/consumers";
        description = "Concurrent PostgreSQL data consumers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "container-classes" = callPackage
@@ -37071,6 +37136,7 @@ self: {
        homepage = "http://git.auryn.cz/haskell/containers-benchmark/";
        description = "Extensive benchmark suite for containers package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "containers-deepseq" = callPackage
@@ -38686,6 +38752,7 @@ self: {
        homepage = "http://www.serpentine.com/criterion";
        description = "Robust, reliable performance measurement and analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "criterion-plus" = callPackage
@@ -38787,6 +38854,7 @@ self: {
        homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cron-compat" = callPackage
@@ -39669,6 +39737,7 @@ self: {
        libraryHaskellDepends = [ base hmatrix safe ];
        description = "Natural cubic spline interpolation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "cublas" = callPackage
@@ -39701,6 +39770,7 @@ self: {
        executableHaskellDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "cuda" = callPackage
@@ -40052,6 +40122,7 @@ self: {
        homepage = "https://github.com/scvalex/daemons";
        description = "Daemons in Haskell made fun and easy";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "dag" = callPackage
@@ -41710,6 +41781,7 @@ self: {
        homepage = "https://github.com/iand675/datadog";
        description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "dataenc" = callPackage
@@ -43126,8 +43198,8 @@ self: {
     ({ mkDerivation, base, QuickCheck, safe }:
      mkDerivation {
        pname = "dequeue";
-       version = "0.1.5";
-       sha256 = "b4dbb63aac61981c0a14f6c00b0e8a68f3aecdc2a9051d4bc572d1303d1c8cfc";
+       version = "0.1.7";
+       sha256 = "ceecc24ce84cabf5df5291eda19400f452d3dc1b102f6ebef2c6c689ec7c5eea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck safe ];
@@ -43429,6 +43501,7 @@ self: {
        homepage = "https://github.com/luanzhu/devil";
        description = "A small tool to make it easier to update program managed by Angel";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "dewdrop" = callPackage
@@ -43574,6 +43647,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -43595,6 +43669,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-canvas" = callPackage
@@ -43674,6 +43749,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-haddock" = callPackage
@@ -43706,6 +43782,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-hsqml" = callPackage
@@ -43742,6 +43819,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-lib" = callPackage
@@ -43766,6 +43844,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-pandoc" = callPackage
@@ -43785,6 +43864,7 @@ self: {
        ];
        description = "A pandoc filter to express diagrams inline using the haskell EDSL _diagrams_";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-pdf" = callPackage
@@ -43845,6 +43925,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-qrcode" = callPackage
@@ -43882,6 +43963,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-rubiks-cube" = callPackage
@@ -43896,6 +43978,7 @@ self: {
        homepage = "https://github.com/timjb/rubiks-cube";
        description = "Library for drawing the Rubik's Cube";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-solve" = callPackage
@@ -43930,6 +44013,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-tikz" = callPackage
@@ -43959,6 +44043,7 @@ self: {
        libraryHaskellDepends = [ base parsec random-fu transformers ];
        description = "Simplistic D&D style dice-rolling system";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "dice-entropy-conduit" = callPackage
@@ -45379,6 +45464,7 @@ self: {
        homepage = "https://github.com/GregorySchwartz/diversity";
        description = "Return the diversity at each position for all sequences in a fasta file";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "djinn" = callPackage
@@ -45851,6 +45937,7 @@ self: {
        homepage = "http://github.com/egonschiele/dominion";
        description = "A simulator for the board game Dominion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "domplate" = callPackage
@@ -45997,6 +46084,7 @@ self: {
        ];
        description = "Dungeons of Wor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "download" = callPackage
@@ -46884,6 +46972,7 @@ self: {
        homepage = "https://github.com/adamwalker/dynamic-graph";
        description = "Draw and update graphs in real time with OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "dynamic-linker-template" = callPackage
@@ -47943,6 +48032,7 @@ self: {
        homepage = "https://bitbucket.org/davecturner/ekg-rrd";
        description = "Passes ekg statistics to rrdtool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "ekg-statsd" = callPackage
@@ -47971,6 +48061,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "easy to remember mnemonic for a high-entropy value";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "elerea" = callPackage
@@ -47998,6 +48089,7 @@ self: {
        executableHaskellDepends = [ base elerea GLFW OpenGL ];
        description = "Example applications for Elerea";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "elerea-sdl" = callPackage
@@ -48348,6 +48440,7 @@ self: {
        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;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "email" = callPackage
@@ -48899,6 +48992,7 @@ self: {
        homepage = "http://epanet.de/developer/haskell.html";
        description = "Haskell binding for EPANET";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "epass" = callPackage
@@ -48929,6 +49023,7 @@ self: {
        homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
        description = "Compiler for a simple functional language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "epoll" = callPackage
@@ -48991,6 +49086,7 @@ self: {
        homepage = "http://hub.darcs.net/dino/epub-metadata";
        description = "Library for parsing epub document metadata";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "epub-tools" = callPackage
@@ -49013,6 +49109,7 @@ self: {
        homepage = "http://hub.darcs.net/dino/epub-tools";
        description = "Command line utilities for working with epub files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "epubname" = callPackage
@@ -49809,6 +49906,7 @@ self: {
        homepage = "http://github.com/YoEight/eventstore";
        description = "EventStore TCP Client";
        license = stdenv.lib.licenses.bsd3;
+       platforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "every-bit-counts" = callPackage
@@ -50931,6 +51029,7 @@ self: {
        homepage = "https://github.com/cscherrer/fastbayes";
        description = "Bayesian modeling algorithms accelerated for particular model structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "fastcgi" = callPackage
@@ -51954,6 +52053,7 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "A Linux-only cache system associating values to files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "filediff" = callPackage
@@ -53172,6 +53272,7 @@ self: {
        homepage = "https://github.com/debug-ito/fold-debounce";
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "fold-debounce-conduit" = callPackage
@@ -53193,6 +53294,7 @@ self: {
        homepage = "https://github.com/debug-ito/fold-debounce-conduit";
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "foldl" = callPackage
@@ -54316,6 +54418,7 @@ self: {
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Program awesome stuff with Gloss and frpnow!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "frpnow-gtk" = callPackage
@@ -54409,6 +54512,7 @@ self: {
        homepage = "https://github.com/haskell-fswatch/hfsnotify";
        description = "Cross platform library for file change notification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "fst" = callPackage
@@ -54460,6 +54564,7 @@ self: {
        homepage = "http://www.github.com/ehamberg/fswatcher/";
        description = "Watch a file/directory and run a command when it's modified";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "ftdi" = callPackage
@@ -55890,6 +55995,7 @@ self: {
        jailbreak = true;
        description = "Pure haskell interface to MaxMind GeoIP database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "geojson" = callPackage
@@ -55924,6 +56030,7 @@ self: {
        testHaskellDepends = [ base ieee754 QuickCheck ];
        description = "package for geometry in euklidean 2d space";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "getemx" = callPackage
@@ -56678,6 +56785,7 @@ self: {
        homepage = "https://github.com/ndmitchell/ghcid#readme";
        description = "GHCi based bare bones IDE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "ghcjs-codemirror" = callPackage
@@ -56968,6 +57076,7 @@ self: {
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
@@ -57655,6 +57764,7 @@ self: {
        libraryHaskellDepends = [ base bytestring OpenGL ];
        description = "simple image capture from OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "glade" = callPackage
@@ -57726,6 +57836,7 @@ self: {
        homepage = "zyghost.com";
        description = "An OpenGL micro framework";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "glasso" = callPackage
@@ -57902,6 +58013,7 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss" = callPackage
@@ -57919,6 +58031,7 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-accelerate" = callPackage
@@ -57944,6 +58057,7 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-banana" = callPackage
@@ -57959,6 +58073,7 @@ self: {
        homepage = "https://github.com/Twey/gloss-banana";
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-devil" = callPackage
@@ -57993,6 +58108,7 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-game" = callPackage
@@ -58005,6 +58121,7 @@ self: {
        homepage = "https://github.com/mchakravarty/gloss-game";
        description = "Gloss wrapper that simplifies writing games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-juicy" = callPackage
@@ -58025,6 +58142,7 @@ self: {
        homepage = "http://github.com/alpmestan/gloss-juicy";
        description = "Load any image supported by Juicy.Pixels in your gloss application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-raster" = callPackage
@@ -58041,6 +58159,7 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Parallel rendering of raster images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-raster-accelerate" = callPackage
@@ -58070,6 +58189,7 @@ self: {
        jailbreak = true;
        description = "Gloss picture data types and rendering functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-sodium" = callPackage
@@ -58083,6 +58203,7 @@ self: {
        homepage = "https://github.com/Twey/gloss-sodium";
        description = "A Sodium interface to the Gloss drawing package";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "glpk-hs" = callPackage
@@ -58225,6 +58346,7 @@ self: {
        ];
        description = "turtle like LOGO with glut";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gmap" = callPackage
@@ -58329,6 +58451,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-gnuidn/";
        description = "Bindings for GNU IDN";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libidn;};
 
   "gnuplot" = callPackage
@@ -59899,6 +60022,7 @@ self: {
        testHaskellDepends = [ base containers gtk3 hspec ];
        description = "Large TreeStore support for gtk2hs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gtk-mac-integration" = callPackage
@@ -60120,6 +60244,7 @@ self: {
        homepage = "http://www.haskell.org/hello/";
        description = "Gtk2Hs Hello World, an example package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gtk2hs-rpn" = callPackage
@@ -60157,6 +60282,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) gtk3;};
 
   "gtk3-mac-integration" = callPackage
@@ -60790,6 +60916,7 @@ self: {
        ];
        description = "A Gtk mixer GUI application for FreeBSD";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "haar" = callPackage
@@ -62113,6 +62240,7 @@ self: {
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hakyll-R" = callPackage
@@ -62147,6 +62275,7 @@ self: {
        homepage = "https://github.com/bitonic/hakyll-agda";
        description = "Wrapper to integrate literate Agda files with Hakyll";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hakyll-blaze-templates" = callPackage
@@ -62190,6 +62319,7 @@ self: {
        homepage = "https://bitbucket.org/rvlm/hakyll-contrib-hyphenation";
        description = "automatic hyphenation for Hakyll";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hakyll-contrib-links" = callPackage
@@ -62267,6 +62397,7 @@ self: {
        homepage = "https://github.com/meoblast001/hakyll-sass";
        description = "Hakyll SASS compiler over hsass";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "halberd" = callPackage
@@ -62372,6 +62503,7 @@ self: {
        homepage = "https://github.com/lukexi/halive";
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "halma" = callPackage
@@ -62400,6 +62532,7 @@ self: {
        homepage = "https://github.com/timjb/halma";
        description = "Library implementing Halma rules";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "haltavista" = callPackage
@@ -64477,6 +64610,7 @@ self: {
        homepage = "http://github.com/bjpop/haskell-mpi";
        description = "Distributed parallel programming in Haskell using MPI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;};
 
   "haskell-names" = callPackage
@@ -68364,6 +68498,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Hess-Smith panel code for inviscid 2-d airfoil analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hfov" = callPackage
@@ -68649,6 +68784,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hgrib" = callPackage
+    ({ mkDerivation, base, c2hs, directory, grib_api, hspec }:
+     mkDerivation {
+       pname = "hgrib";
+       version = "0.1.0.0";
+       sha256 = "78d5af24ad0b75315d76f9cbf4cda1f684ffaf2669e23f01aab945210ce2e3da";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ grib_api ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base directory hspec ];
+       jailbreak = true;
+       homepage = "https://github.com/mjakob/hgrib";
+       description = "Unofficial bindings for GRIB API";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {grib_api = null;};
+
   "hharp" = callPackage
     ({ mkDerivation, base, harp }:
      mkDerivation {
@@ -68889,6 +69044,7 @@ self: {
        homepage = "https://github.com/jeremyjh/higher-leveldb";
        description = "A rich monadic API for working with leveldb databases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "higherorder" = callPackage
@@ -68922,6 +69078,7 @@ self: {
        homepage = "https://github.com/agrafix/highjson";
        description = "Very fast JSON serialisation and parsing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "highlight-versions" = callPackage
@@ -69207,6 +69364,7 @@ self: {
        homepage = "https://github.com/kolmodin/hinotify.git";
        description = "Haskell binding to inotify";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hinquire" = callPackage
@@ -69944,6 +70102,7 @@ self: {
        ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "hledger-lib" = callPackage
@@ -70249,6 +70408,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numeric Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) blas; lapack = null;};
 
   "hmatrix-banded" = callPackage
@@ -70276,6 +70436,7 @@ self: {
        homepage = "https://github.com/grtlr/hmatrix-csv";
        description = "CSV encoding and decoding for hmatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hmatrix-glpk" = callPackage
@@ -70289,6 +70450,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Linear Programming based on GLPK";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) glpk;};
 
   "hmatrix-gsl" = callPackage
@@ -70305,6 +70467,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numerical computation";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) gsl;};
 
   "hmatrix-gsl-stats" = callPackage
@@ -70331,6 +70494,7 @@ self: {
        homepage = "http://github.com/alanfalloon/hmatrix-mmap";
        description = "Memory map Vector from disk into memory efficiently";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hmatrix-nipals" = callPackage
@@ -70345,6 +70509,7 @@ self: {
        homepage = "http://github.com/alanfalloon/hmatrix-nipals";
        description = "NIPALS method for Principal Components Analysis on large data-sets";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hmatrix-quadprogpp" = callPackage
@@ -70370,6 +70535,7 @@ self: {
        homepage = "http://code.haskell.org/hmatrix-repa";
        description = "Adaptors for interoperability between hmatrix and repa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hmatrix-special" = callPackage
@@ -70382,6 +70548,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Interface to GSL special functions";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hmatrix-static" = callPackage
@@ -70415,6 +70582,7 @@ self: {
        homepage = "http://github.com/bgamari/hmatrix-svdlibc";
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hmatrix-syntax" = callPackage
@@ -70713,6 +70881,7 @@ self: {
        homepage = "https://github.com/ian-ross/hnetcdf";
        description = "Haskell NetCDF library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
@@ -72032,8 +72201,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.5.4";
-       sha256 = "aaa707242dd380e355527360e0492e913ae1883e02fd942734e37458384012be";
+       version = "0.6.0";
+       sha256 = "cae208d9d8617d45e999fc61fb9e8e3aba0cb38f98d0f00c96c9aa03a09f35b0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72330,6 +72499,7 @@ self: {
        homepage = "https://github.com/scrive/hpqtypes";
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) postgresql;};
 
   "hprotoc" = callPackage
@@ -72339,8 +72509,8 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.1.5";
-       sha256 = "463ce252cbcf6246bb80cc30efa14580b5370e8e5c5c83debfe1b24833b52353";
+       version = "2.1.6";
+       sha256 = "a2eeff72064c8edae02700e76dc5b37eec5a9bb080a562ac71ea1e4ffca099ef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72449,6 +72619,7 @@ self: {
        homepage = "https://github.com/ccasin/hpuz";
        description = "Haskell bindings for libpuz";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hpygments" = callPackage
@@ -72522,6 +72693,7 @@ self: {
        homepage = "http://github.com/paulrzcz/hquantlib.git";
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hquery" = callPackage
@@ -72605,6 +72777,7 @@ self: {
        jailbreak = true;
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
@@ -73338,6 +73511,7 @@ self: {
        ];
        description = "Backend for uploading benchmark data to Google Fusion Tables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "hsc2hs" = callPackage
@@ -73387,6 +73561,7 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-auditor";
        description = "Haskell SuperCollider Auditor";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hsc3-cairo" = callPackage
@@ -73665,6 +73840,7 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-sf-hsndfile";
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hsc3-unsafe" = callPackage
@@ -73906,6 +74082,7 @@ self: {
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hsdif" = callPackage
@@ -74497,6 +74674,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libsndfile;};
 
   "hsndfile-storablevector" = callPackage
@@ -74522,6 +74700,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile (Data.Vector interface)";
        license = stdenv.lib.licenses.lgpl2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hsnock" = callPackage
@@ -75459,6 +75638,7 @@ self: {
        homepage = "http://www.volker-wysk.de/hsshellscript/";
        description = "Haskell for Unix shell scripting tasks";
        license = "LGPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hssourceinfo" = callPackage
@@ -76705,6 +76885,7 @@ self: {
        homepage = "https://github.com/fpco/http-reverse-proxy";
        description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "http-server" = callPackage
@@ -76954,6 +77135,7 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hub" = callPackage
@@ -77976,6 +78158,7 @@ self: {
        homepage = "https://github.com/rrnewton/hydra-print";
        description = "NCurses interface to view multiple ByteString streams in parallel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hydrogen" = callPackage
@@ -78756,16 +78939,16 @@ self: {
     ({ mkDerivation, annotated-wl-pprint, ansi-terminal, ansi-wl-pprint
      , base, base64-bytestring, binary, blaze-html, blaze-markup
      , bytestring, cheapskate, containers, deepseq, directory, filepath
-     , fingertree, haskeline, lens, libffi, mtl, network
-     , optparse-applicative, parsers, pretty, process, safe, split, text
-     , time, transformers, transformers-compat, trifecta, uniplate, unix
+     , fingertree, haskeline, libffi, mtl, network, optparse-applicative
+     , parsers, pretty, process, safe, split, text, time, transformers
+     , transformers-compat, trifecta, uniplate, unix
      , unordered-containers, utf8-string, vector
-     , vector-binary-instances, xml, zip-archive, zlib
+     , vector-binary-instances, zip-archive, zlib
      }:
      mkDerivation {
        pname = "idris";
-       version = "0.9.18.1";
-       sha256 = "48569f1135af66e2bce22379acf347ab67bb12cff98065043d82f4262d9ea475";
+       version = "0.9.19";
+       sha256 = "1525b7e9c716d1d09520b8e6cb599dad24ced6161e01a4c864fd7fc636405ff3";
        configureFlags = [ "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
@@ -78773,10 +78956,10 @@ self: {
          annotated-wl-pprint ansi-terminal ansi-wl-pprint base
          base64-bytestring binary blaze-html blaze-markup bytestring
          cheapskate containers deepseq directory filepath fingertree
-         haskeline lens libffi mtl network optparse-applicative parsers
-         pretty process safe split text time transformers
-         transformers-compat trifecta uniplate unix unordered-containers
-         utf8-string vector vector-binary-instances xml zip-archive zlib
+         haskeline libffi mtl network optparse-applicative parsers pretty
+         process safe split text time transformers transformers-compat
+         trifecta uniplate unix unordered-containers utf8-string vector
+         vector-binary-instances zip-archive zlib
        ];
        executableHaskellDepends = [
          base directory filepath haskeline transformers
@@ -78881,8 +79064,8 @@ self: {
      }:
      mkDerivation {
        pname = "ig";
-       version = "0.4";
-       sha256 = "ed03d66cd64476c6f0065251ad777cdbfb62a740802007218dd24f732fcf723e";
+       version = "0.5";
+       sha256 = "07d955a37fb619f14941801e2afda7795910137b14856b3b4fb07a9fba661958";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring conduit conduit-extra
          crypto-api cryptohash cryptohash-cryptoapi data-default
@@ -79166,6 +79349,7 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "ihaskell-rlangqq" = callPackage
@@ -79302,6 +79486,7 @@ self: {
        jailbreak = true;
        description = "bindings to imagemagick library";
        license = "unknown";
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) imagemagick;};
 
   "imagepaste" = callPackage
@@ -80961,6 +81146,8 @@ self: {
        pname = "iproute";
        version = "1.6.0";
        sha256 = "792c638d4957ac85d04a17864991eaa4ae09e4fb7e890ff95a7807a2875705d0";
+       revision = "1";
+       editedCabalFile = "ffba769f859a5853a5faaf07c86ff93759aff36e80bf8ba1c2cbc86c3811d01a";
        libraryHaskellDepends = [
          appar base byteorder containers network
        ];
@@ -81346,6 +81533,7 @@ self: {
        executableHaskellDepends = [ base gtk3 ];
        description = "A program to show the size of image and whether suitable for wallpaper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "islink" = callPackage
@@ -81958,6 +82146,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/JACK";
        description = "Bindings for the JACK Audio Connection Kit";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libjack2;};
 
   "jack-bindings" = callPackage
@@ -82510,6 +82699,7 @@ self: {
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "jpeg" = callPackage
@@ -82963,23 +83153,24 @@ self: {
      }) {};
 
   "json-stream" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hspec, scientific, text
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, base, bytestring, directory, hspec
+     , scientific, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "json-stream";
-       version = "0.3.1.0";
-       sha256 = "0de2f4abe549c2bee7bdb13e9bdd70137a06140e3b390ad3697a16a7d34ce7c6";
+       version = "0.3.2.1";
+       sha256 = "8d0b6305079580e833b97a0fbeffaf96d7c30ca6e965e24fed4815f0f2b92772";
        libraryHaskellDepends = [
          aeson base bytestring scientific text unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base bytestring hspec scientific text unordered-containers
-         vector
+         aeson base bytestring directory hspec scientific text
+         unordered-containers vector
        ];
        homepage = "https://github.com/ondrap/json-stream";
        description = "Incremental applicative JSON parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-togo" = callPackage
@@ -83251,6 +83442,7 @@ self: {
        executableToolDepends = [ alex ];
        description = "A first-order reasoning toolbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "jumpthefive" = callPackage
@@ -83351,6 +83543,7 @@ self: {
        homepage = "https://github.com/abhinav/kafka-client";
        description = "Low-level Haskell client library for Apache Kafka 0.7.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "kan-extensions" = callPackage
@@ -83829,6 +84022,7 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Fields for WX widgets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "keera-hails-reactive-yampa" = callPackage
@@ -83949,6 +84143,7 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Web application deployment manager, focusing on Haskell web frameworks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "kevin" = callPackage
@@ -84265,6 +84460,7 @@ self: {
        homepage = "http://github.com/alpmestan/kmeans-vector";
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "knob" = callPackage
@@ -84433,6 +84629,7 @@ self: {
        libraryHaskellDepends = [ base gamma random-fu roots vector ];
        description = "Kolmogorov distribution and Kolmogorov-Smirnov test";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "ktx" = callPackage
@@ -84446,6 +84643,7 @@ self: {
        homepage = "https://github.com/corngood/ktx";
        description = "A binding for libktx from Khronos";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {egl = null; inherit (pkgs) glew;};
 
   "kure" = callPackage
@@ -84629,6 +84827,7 @@ self: {
        homepage = "http://github.com/jfischoff/lagrangian";
        description = "Solve Lagrange multiplier problems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "laika" = callPackage
@@ -84690,6 +84889,7 @@ self: {
        jailbreak = true;
        description = "Educational drawing canvas for FP explorers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lambda-devs" = callPackage
@@ -85722,8 +85922,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-lua2";
-       version = "0.1.0.0";
-       sha256 = "0b53673bcaa3445e823e7808b95b109074d29ad3083d02e57bc39ef12619a061";
+       version = "0.1.0.2";
+       sha256 = "047710b7b055110d773a878db1cf9ee74a05cff2df41ef849af8dd953ec3339d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85741,6 +85941,7 @@ self: {
        homepage = "http://github.com/mitchellwrosen/language-lua2";
        description = "Lua parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "language-mixal" = callPackage
@@ -85934,6 +86135,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-qux" = callPackage
+    ({ mkDerivation, base, containers, either, indents, mtl, parsec
+     , pretty, transformers
+     }:
+     mkDerivation {
+       pname = "language-qux";
+       version = "0.1.1.0";
+       sha256 = "c5259a61229368bc90a64b755bb91d21fd6be3392d907db536ae8e752fce1018";
+       libraryHaskellDepends = [
+         base containers either indents mtl parsec pretty transformers
+       ];
+       homepage = "https://github.com/qux-lang/language-qux";
+       description = "Utilities for working with the Qux language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "language-sh" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl, parsec, pcre-light
      }:
@@ -86369,6 +86586,7 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/colada";
        description = "Online Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "ldap-client" = callPackage
@@ -86542,6 +86760,7 @@ self: {
        homepage = "https://github.com/mnacamura/learning-hmm";
        description = "Yet another library for hidden Markov models";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "leetify" = callPackage
@@ -86635,6 +86854,7 @@ self: {
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lendingclub" = callPackage
@@ -86970,6 +87190,7 @@ self: {
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
@@ -87011,6 +87232,7 @@ self: {
        homepage = "https://github.com/basvandijk/levmar";
        description = "An implementation of the Levenberg-Marquardt algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "levmar-chart" = callPackage
@@ -87626,6 +87848,7 @@ self: {
        homepage = "https://github.com/portnov/libssh2-hs";
        description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libssh2; ssh2 = null;};
 
   "libssh2-conduit" = callPackage
@@ -87814,6 +88037,7 @@ self: {
        homepage = "http://github.com/sproingie/haskell-cells/";
        description = "Conway's Life cellular automaton";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lifted-async" = callPackage
@@ -88019,6 +88243,7 @@ self: {
        libraryHaskellDepends = [ base hmatrix HUnit ];
        description = "LINear Discriminant Analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lindenmayer" = callPackage
@@ -88140,6 +88365,7 @@ self: {
        homepage = "http://hub.darcs.net/thielema/linear-circuit";
        description = "Compute resistance of linear electrical circuits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linear-grammar" = callPackage
@@ -88184,6 +88410,7 @@ self: {
        homepage = "http://www.github.com/bgamari/linear-opengl";
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linear-vect" = callPackage
@@ -88215,8 +88442,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }:
      mkDerivation {
        pname = "linearscan";
-       version = "0.10.0";
-       sha256 = "27a0461fc9fae738a621febf02e54049d21798a9347aaee7777c4d28f27e90b8";
+       version = "0.10.1";
+       sha256 = "af46c21de8959e8820fea590b7a8526b089f66b0302732cb88c25eacaa038d40";
        libraryHaskellDepends = [
          base containers ghc-prim mtl transformers
        ];
@@ -88233,8 +88460,8 @@ self: {
      }:
      mkDerivation {
        pname = "linearscan-hoopl";
-       version = "0.10.0";
-       sha256 = "4fd28d6d557c9a1f2fef6f9d8c6a49f78cedd469ddcd02629a9df515af4424ae";
+       version = "0.10.1";
+       sha256 = "be9dc6443f46f4e9daa423a649232706bcf4384a80a8d503c61a20de5115d7da";
        libraryHaskellDepends = [
          base containers free hoopl linearscan QuickCheck transformers
        ];
@@ -88398,6 +88625,7 @@ self: {
        homepage = "https://github.com/redneb/linux-file-extents";
        description = "Retrieve file fragmentation information under Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-inotify" = callPackage
@@ -88435,6 +88663,7 @@ self: {
        homepage = "https://github.com/tensor5/linux-mount";
        description = "Mount and unmount filesystems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-namespaces" = callPackage
@@ -88447,6 +88676,7 @@ self: {
        homepage = "https://github.com/redneb/hs-linux-namespaces";
        description = "Create new or enter an existing linux namespaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-perf" = callPackage
@@ -88565,6 +88795,7 @@ self: {
        ];
        description = "Labeled File System interface for LIO";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lio-simple" = callPackage
@@ -89222,6 +89453,8 @@ self: {
        pname = "llvm-general-pure";
        version = "3.4.5.4";
        sha256 = "c54ab339f99284222bca1f8e56db701d2981eaf02728529476b818190671844d";
+       revision = "1";
+       editedCabalFile = "e8c807d23766b51761a9e039e6e6ae4d0a155f1c4054fbe81eddd9f66fb5dd4c";
        libraryHaskellDepends = [
          base containers mtl parsec setenv template-haskell transformers
          transformers-compat
@@ -89388,6 +89621,7 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-lmdb";
        description = "Lightning MDB bindings";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) lmdb;};
 
   "load-env" = callPackage
@@ -89563,6 +89797,7 @@ self: {
        homepage = "https://github.com/scrive/log";
        description = "Structured logging solution with multiple backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "log-domain" = callPackage
@@ -89872,10 +90107,11 @@ self: {
      }:
      mkDerivation {
        pname = "lookup-tables";
-       version = "0.1.1.0";
-       sha256 = "a3b3380485752abb262c964f633c6f184a65d249658da2ae41de0276151a64b3";
+       version = "0.1.1.1";
+       sha256 = "bb9ee2cea827e146d510804c6b26c6f1a62032215eba4da7eb5bb67f977c478e";
        libraryHaskellDepends = [ base primitive template-haskell ];
        testHaskellDepends = [ base tasty tasty-hunit ];
+       homepage = "http://hub.darcs.net/jmcarthur/lookup-tables/issues";
        description = "Statically generate lookup tables using Template Haskell";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -90209,6 +90445,7 @@ self: {
        homepage = "http://www.leksah.org";
        description = "Leksah tool kit";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "ltl" = callPackage
@@ -90563,6 +90800,7 @@ self: {
        homepage = "https://github.com/hvr/lzma";
        description = "LZMA/XZ compression and decompression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) lzma;};
 
   "lzma-clib" = callPackage
@@ -90640,6 +90878,7 @@ self: {
        homepage = "https://github.com/hvr/lzma-streams";
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "maam" = callPackage
@@ -90886,6 +91125,7 @@ self: {
        homepage = "http://hub.darcs.net/thielema/magico";
        description = "Compute solutions for Magico puzzle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "magma" = callPackage
@@ -91603,6 +91843,7 @@ self: {
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Working with manifolds in a direct, embedding-free way";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "map-syntax" = callPackage
@@ -91995,6 +92236,7 @@ self: {
        homepage = "https://github.com/bos/math-functions";
        description = "Special functions and Chebyshev polynomials";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "mathblog" = callPackage
@@ -92300,6 +92542,7 @@ self: {
        jailbreak = true;
        homepage = "http://www.cas.mcmaster.ca/~anand/";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "mcmc-samplers" = callPackage
@@ -93058,8 +93301,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.3.3.0";
-       sha256 = "42a4b7c40a02a500419cf4b18df97ca76f31db06b1947d9c7d7434daf6434eab";
+       version = "0.3.4.0";
+       sha256 = "e355ad50259f24331790f68ba8efcaaf033d225c87f6546ae5c345ad2d87c8d7";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library which you can depend upon";
@@ -93083,13 +93326,13 @@ self: {
     ({ mkDerivation, array, base, bytestring, containers, microlens }:
      mkDerivation {
        pname = "microlens-ghc";
-       version = "0.2.1.0";
-       sha256 = "0f9544e355d4c262ee94eacc893b57ad54666e473a5e4b7cd7db236fcfdd9ea3";
+       version = "0.3.0.0";
+       sha256 = "d9bd1660bbfe8b988779c409e8fb770ebd57d0149a5b49002225033971dee67a";
        libraryHaskellDepends = [
          array base bytestring containers microlens
        ];
        homepage = "http://github.com/aelve/microlens";
-       description = "Orphan instances of microlens classes for packages coming with GHC (array, bytestring, containers)";
+       description = "microlens + all features depending on packages coming with GHC (array, bytestring, containers)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -93115,8 +93358,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-platform";
-       version = "0.1.3.0";
-       sha256 = "8f2c08879fb484df0e1f2564dfa2e1fd6dd4745fefae02678e569803db97ad80";
+       version = "0.1.4.0";
+       sha256 = "14ff87d02c650ce3ca3a5ebe93f4e918883c4d42efc142d56ee4d96de18e07f6";
        libraryHaskellDepends = [
          base hashable microlens microlens-ghc microlens-mtl microlens-th
          text unordered-containers vector
@@ -93239,6 +93482,7 @@ self: {
        homepage = "http://hub.darcs.net/thielema/midi-music-box";
        description = "Convert MIDI file to music box punch tape";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "midi-util" = callPackage
@@ -93695,6 +93939,7 @@ self: {
        libraryHaskellDepends = [ async base ];
        description = "A Haskell bundle of the Minisat SAT solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "ministg" = callPackage
@@ -93791,6 +94036,7 @@ self: {
        homepage = "https://github.com/mokus0/misfortune";
        description = "fortune-mod clone";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "missing-foreign" = callPackage
@@ -94194,8 +94440,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.1.31";
-       sha256 = "a1b105ee4d257874fc844170dd73decf7035361a27667f10fe8fdcf6da88ec8b";
+       version = "0.1.2.0";
+       sha256 = "70a4c0f996d4e6787f3dd736f2885c6e2bd5bb0109f333a696b75093971cc31d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -95280,6 +95526,7 @@ self: {
        executableHaskellDepends = [ base filepath hinotify process ];
        description = "Do things when files change";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "mono-foldable" = callPackage
@@ -97634,8 +97881,8 @@ self: {
      }:
      mkDerivation {
        pname = "nationstates";
-       version = "0.2.0.1";
-       sha256 = "091ddee83ea21b6b8505ef5053c8b6ce58b08a578f8cd51bfe1c32745af0426c";
+       version = "0.3.0.0";
+       sha256 = "2c4ec0d85f289f5bfef7a386995330d85164e9cf1d834a8ed39ae7a82df0ddd5";
        libraryHaskellDepends = [
          base bytestring clock containers http-client http-client-tls
          http-types multiset transformers xml
@@ -97832,6 +98079,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-ncurses/";
        description = "Modernised bindings to GNU ncurses";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ncurses;};
 
   "ndjson-conduit" = callPackage
@@ -97933,6 +98181,7 @@ self: {
        ];
        description = "Port of the NeHe OpenGL tutorials to Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "neil" = callPackage
@@ -98225,6 +98474,7 @@ self: {
        homepage = "http://netlink-hs.googlecode.com/";
        description = "Netlink communication for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "netlist" = callPackage
@@ -98536,6 +98786,7 @@ self: {
        homepage = "http://www.leonmergen.com/opensource.html";
        description = "Haskell API for Tor anonymous networking";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-api-support" = callPackage
@@ -98577,6 +98828,7 @@ self: {
        homepage = "http://github.com/solatis/haskell-network-attoparsec";
        description = "Utility functions for running a parser against a socket";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-bitcoin" = callPackage
@@ -98777,6 +99029,7 @@ self: {
        homepage = "http://github.com/taruti/network-fancy";
        description = "Networking support with a cleaner API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "network-house" = callPackage
@@ -98944,6 +99197,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-xmpp/";
        description = "Client library for the XMPP protocol";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "network-rpca" = callPackage
@@ -99233,6 +99487,7 @@ self: {
        homepage = "https://github.com/tweag/network-transport-zeromq";
        description = "ZeroMQ backend for network-transport";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "network-uri" = callPackage
@@ -99934,6 +100189,7 @@ self: {
        ];
        description = "Painless 3D graphics, no affiliation with gloss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "not-gloss-examples" = callPackage
@@ -100493,6 +100749,7 @@ self: {
        executableHaskellDepends = [ base bytestring mtl ncurses text ];
        description = "Bored? Nyan cat!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "nylas" = callPackage
@@ -101209,6 +101466,7 @@ self: {
        homepage = "https://github.com/emilaxelsson/open-typerep";
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "open-union" = callPackage
@@ -102099,6 +102357,7 @@ self: {
        homepage = "http://github.com/ekmett/order-statistics/";
        description = "L-Estimators for robust statistics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "ordered" = callPackage
@@ -103788,6 +104047,7 @@ self: {
        homepage = "https://github.com/fanjam/paypal-adaptive-hoops";
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "paypal-api" = callPackage
@@ -105928,6 +106188,7 @@ self: {
        homepage = "https://github.com/jwiegley/pipes-files";
        description = "Fast traversal of directory trees using pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "pipes-group" = callPackage
@@ -106486,6 +106747,7 @@ self: {
        homepage = "http://github.com/amcphail/plot";
        description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "plot-gtk" = callPackage
@@ -106498,6 +106760,7 @@ self: {
        homepage = "http://code.haskell.org/plot";
        description = "GTK plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "plot-gtk-ui" = callPackage
@@ -106515,6 +106778,7 @@ self: {
        homepage = "https://github.com/sumitsahrawat/plot-gtk-ui";
        description = "A quick way to use Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "plot-gtk3" = callPackage
@@ -106529,6 +106793,7 @@ self: {
        homepage = "http://code.haskell.org/plot";
        description = "GTK3 plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "plot-lab" = callPackage
@@ -106546,6 +106811,7 @@ self: {
        homepage = "https://github.com/sumitsahrawat/plot-lab";
        description = "A plotting tool with Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "plotserver-api" = callPackage
@@ -107325,6 +107591,7 @@ self: {
        homepage = "http://code.haskell.org/portaudio";
        description = "Haskell bindings for the PortAudio library";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) portaudio;};
 
   "porte" = callPackage
@@ -107485,6 +107752,7 @@ self: {
        homepage = "https://github.com/mvv/posix-timer";
        description = "Bindings to POSIX clock and timer functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "posix-waitpid" = callPackage
@@ -107971,6 +108239,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Potrace bindings for the diagrams library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "powermate" = callPackage
@@ -108744,6 +109013,7 @@ self: {
        homepage = "http://github.com/alpmestan/probable";
        description = "Easy and reasonably efficient probabilistic programming and random generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "proc" = callPackage
@@ -109549,8 +109819,8 @@ self: {
      }:
      mkDerivation {
        pname = "protocol-buffers";
-       version = "2.1.5";
-       sha256 = "1028200fcef97d76f28e9ff22100066ad6b797c56fbf0222735b1ed4ece060dd";
+       version = "2.1.6";
+       sha256 = "81f732202f7bf3e2fc697e5c5be13c46e5ef3af1d3b82d7b4394cf6fea942ebe";
        libraryHaskellDepends = [
          array base binary bytestring containers directory filepath mtl
          parsec syb utf8-string
@@ -109564,8 +109834,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
-       version = "2.1.5";
-       sha256 = "cd653ce9ad16eadb080d6e19647da5fe5ccde7e3e2fb85464cbc460d44ca44f0";
+       version = "2.1.6";
+       sha256 = "7558c7193cb74e90f1f02956d4ecddd5405fc956d64b422e7f105aa512e4332f";
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers
        ];
@@ -109914,6 +110184,7 @@ self: {
        homepage = "https://github.com/philopon/pugixml-hs";
        description = "pugixml binding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "pugs-DrIFT" = callPackage
@@ -109993,6 +110264,7 @@ self: {
        librarySystemDepends = [ libpulseaudio ];
        description = "binding to Simple API of pulseaudio";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libpulseaudio;};
 
   "punkt" = callPackage
@@ -110660,6 +110932,7 @@ self: {
        homepage = "https://github.com/boundedvariation/quantfin";
        description = "Quant finance library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "quantities" = callPackage
@@ -111095,10 +111368,9 @@ self: {
     ({ mkDerivation, base, bytestring, http-types, scotty, text }:
      mkDerivation {
        pname = "quickwebapp";
-       version = "2.1.0.0";
-       sha256 = "3252164d5016faaf251de0794be012d314eaf3b74044313d42a505653977987f";
+       version = "2.1.1.0";
+       sha256 = "d34f216d527a9462b2f08c52566048d1e807e9e4b869827c8b77be0b8b36cac3";
        libraryHaskellDepends = [ base bytestring http-types scotty text ];
-       jailbreak = true;
        description = "A quick webapp generator for any file processing tool";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -111211,6 +111483,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "qux" = callPackage
+    ({ mkDerivation, base, language-qux, mtl, optparse-applicative }:
+     mkDerivation {
+       pname = "qux";
+       version = "0.1.0.0";
+       sha256 = "fb2de869de3645b69c0f4bada356e3d1fd2902cf7d09315f7797eee93dd6f1da";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base language-qux mtl optparse-applicative
+       ];
+       homepage = "https://github.com/qux-lang/qux";
+       description = "Command line binary for working with the Qux language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rabocsv2qif" = callPackage
     ({ mkDerivation, base, old-locale, split, time }:
      mkDerivation {
@@ -111585,6 +111873,7 @@ self: {
        homepage = "http://github.com/aristidb/random-extras";
        description = "Additional functions for random values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "random-fu" = callPackage
@@ -111603,6 +111892,7 @@ self: {
        homepage = "https://github.com/mokus0/random-fu";
        description = "Random number generation";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "random-hypergeometric" = callPackage
@@ -112084,6 +112374,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-re2/";
        description = "Bindings to the re2 regular expression library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "react-flux" = callPackage
@@ -112261,6 +112552,7 @@ self: {
        homepage = "http://wiki.haskell.org/Reactive-banana";
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "reactive-fieldtrip" = callPackage
@@ -113871,6 +114163,7 @@ self: {
        homepage = "https://github.com/nh2/reinterpret-cast";
        description = "Memory reinterpretation casts for Float/Double and Word32/Word64";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "relacion" = callPackage
@@ -114126,6 +114419,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "renderable" = callPackage
+    ({ mkDerivation, base, containers, hashable }:
+     mkDerivation {
+       pname = "renderable";
+       version = "0.0.0.1";
+       sha256 = "468bc3379eda6e6782fceb8555b4adb26a391e6ac81f3cb9a5bd24e4f646cc25";
+       libraryHaskellDepends = [ base containers hashable ];
+       homepage = "http://zyghost.com";
+       description = "Provides a nice API for rendering data types that change over time";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "reord" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -114342,6 +114647,7 @@ self: {
        homepage = "https://github.com/marcinmrotek/repa-linear-algebra";
        description = "HMatrix operations for Repa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "repa-plugin" = callPackage
@@ -114411,6 +114717,7 @@ self: {
        ];
        description = "Reading and writing sound files with repa arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "repa-stream" = callPackage
@@ -114684,6 +114991,7 @@ self: {
        homepage = "http://hub.darcs.net/thielema/resistor-cube";
        description = "Compute total resistance of a cube of resistors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "resolve-trivial-conflicts" = callPackage
@@ -115255,12 +115563,13 @@ self: {
      }:
      mkDerivation {
        pname = "reverse-geocoding";
-       version = "0.2.2.1";
-       sha256 = "0c63a52ef6bd4f62b9b9fe0c16e279d3cf91326847da0f3c778a8e867c059b7c";
+       version = "0.2.2.2";
+       sha256 = "3e1b2f6f44272a1173483b8d2aa9c4bfa4eb1bc15e99468e7fa3aae156e75f59";
+       revision = "1";
+       editedCabalFile = "9d91cf76a4c2958487e3ec7ad6e38963cbae63cf8586ca041c71addb84dd009c";
        libraryHaskellDepends = [
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
-       jailbreak = true;
        homepage = "https://github.com/jcristovao/reverse-geocoding";
        description = "Simple reverse geocoding using OpenStreeMap";
        license = stdenv.lib.licenses.bsd3;
@@ -117153,6 +117462,7 @@ self: {
        homepage = "http://www.ingolia-lab.org/samtools-tutorial.html";
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) zlib;};
 
   "samtools-conduit" = callPackage
@@ -117175,6 +117485,7 @@ self: {
        homepage = "http://www.ingolia-lab.org/samtools-tutorial.html";
        description = "Conduit interface to SAM/BAM format files through samtools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "samtools-enumerator" = callPackage
@@ -117190,6 +117501,7 @@ self: {
        ];
        description = "Enumerator interface to SamTools library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "samtools-iteratee" = callPackage
@@ -117273,6 +117585,7 @@ self: {
        homepage = "https://github.com/tokiwoousaka/Sarasvati";
        description = "audio library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sasl" = callPackage
@@ -117343,6 +117656,7 @@ self: {
        homepage = "https://github.com/jwaldmann/satchmo";
        description = "SAT encoding monad";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "satchmo-backends" = callPackage
@@ -117424,6 +117738,7 @@ self: {
        homepage = "https://github.com/msakai/satchmo-toysat";
        description = "toysat driver as backend for satchmo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sbv" = callPackage
@@ -118367,6 +118682,7 @@ self: {
        homepage = "https://github.com/davnils/sde-solver";
        description = "Distributed SDE solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sdf2p1-parser" = callPackage
@@ -118709,6 +119025,7 @@ self: {
        homepage = "http://nonempty.org/software/haskell-select";
        description = "Wrap the select(2) POSIX function";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "selectors" = callPackage
@@ -119087,6 +119404,7 @@ self: {
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "seqid_0_1_0" = callPackage
@@ -119401,6 +119719,7 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "servant-docs" = callPackage
@@ -119477,6 +119796,7 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "Example programs for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "servant-jquery" = callPackage
@@ -120578,6 +120898,7 @@ self: {
        homepage = "https://github.com/nh2/shared-memory";
        description = "POSIX shared memory";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sharedio" = callPackage
@@ -122468,8 +122789,8 @@ self: {
      }:
      mkDerivation {
        pname = "smallcheck-series";
-       version = "0.4";
-       sha256 = "c054bfafa736d2f0f99c0aad8f26bb775d0588e9d076be9e60d8d5842dee3116";
+       version = "0.5.1";
+       sha256 = "8bee99c89c9437bbaf7f5c203957ed73b0d2e419956f7e509ed5bc8a19728cdd";
        libraryHaskellDepends = [
          base bytestring containers logict smallcheck text transformers
        ];
@@ -122548,8 +122869,8 @@ self: {
      }:
      mkDerivation {
        pname = "smartcheck";
-       version = "0.2.1";
-       sha256 = "398104789966eb2cb4e2fa764405d47214923f2a33ee46b0cbc9b618a1237ce6";
+       version = "0.2.2";
+       sha256 = "3a0aacd5fa0ae6a1748fc3ca19e53a675d46b14b4ddc482c572b63934f1185f1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122631,6 +122952,7 @@ self: {
        homepage = "https://github.com/GetShopTV/smsaero";
        description = "SMSAero API and HTTP client based on servant library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "smt-lib" = callPackage
@@ -122735,20 +123057,18 @@ self: {
 
   "smtps-gmail" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
-     , conduit, conduit-extra, cprng-aes, data-default, filepath
-     , mime-mail, network, resourcet, stringsearch, text, tls
-     , transformers
+     , conduit, conduit-extra, data-default, filepath, mime-mail
+     , network, resourcet, stringsearch, text, tls, transformers
      }:
      mkDerivation {
        pname = "smtps-gmail";
-       version = "1.3.0";
-       sha256 = "69ef59a99a7552cc4b37826e1e58f6fc1ec8fbdc6f43f67887ed019e719f7e6d";
+       version = "1.3.1";
+       sha256 = "d70bbd06bd3dec44a96dbaff9a8ddb1af6e67703775df7c297e771e4cdadd39b";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring conduit conduit-extra
-         cprng-aes data-default filepath mime-mail network resourcet
-         stringsearch text tls transformers
+         data-default filepath mime-mail network resourcet stringsearch text
+         tls transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/enzoh/smtps-gmail";
        description = "Gmail SMTP Client";
        license = stdenv.lib.licenses.bsd3;
@@ -123882,6 +124202,7 @@ self: {
        homepage = "http://github.com/bos/snappy";
        description = "Bindings to the Google Snappy library for fast compression/decompression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) snappy;};
 
   "snappy-conduit" = callPackage
@@ -123895,6 +124216,7 @@ self: {
        homepage = "http://github.com/tatac1/snappy-conduit/";
        description = "Conduit bindings for Snappy (see snappy package)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "snappy-framing" = callPackage
@@ -123907,6 +124229,7 @@ self: {
        homepage = "https://github.com/kim/snappy-framing";
        description = "Snappy Framing Format in Haskell";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "snappy-iteratee" = callPackage
@@ -123959,6 +124282,7 @@ self: {
        homepage = "https://github.com/pmiddend/sneakyterm";
        description = "Tiny, declarative wrapper around ncurses";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sneathlane-haste" = callPackage
@@ -124090,6 +124414,7 @@ self: {
        homepage = "http://code.mathr.co.uk/snowglobe";
        description = "randomized fractal snowflakes demo";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "soap" = callPackage
@@ -125087,6 +125412,7 @@ self: {
        homepage = "http://michael.orlitzky.com/code/spline3.php";
        description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "splines" = callPackage
@@ -125324,6 +125650,7 @@ self: {
        homepage = "https://github.com/yanatan16/haskell-spsa";
        description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "spy" = callPackage
@@ -125875,6 +126202,7 @@ self: {
        homepage = "https://github.com/commercialhaskell/stack";
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "stack-prism" = callPackage
@@ -126476,6 +126804,7 @@ self: {
        homepage = "https://github.com/bos/statistics";
        description = "A library of statistical types, data, and functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "statistics-dirichlet" = callPackage
@@ -126522,6 +126851,7 @@ self: {
        homepage = "https://github.com/srijs/statistics-hypergeometric-genvar";
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "statistics-linreg" = callPackage
@@ -126538,6 +126868,7 @@ self: {
        homepage = "http://github.com/alpmestan/statistics-linreg";
        description = "Linear regression between two samples, based on the 'statistics' package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "stats" = callPackage
@@ -126553,6 +126884,7 @@ self: {
        homepage = "http://github.com/cheecheeo/stats/";
        description = "command line statistics";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "statsd" = callPackage
@@ -126690,6 +127022,7 @@ self: {
        homepage = "https://github.com/schell/steeloverseer";
        description = "A file watcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "stemmer" = callPackage
@@ -127366,6 +127699,7 @@ self: {
          base containers tasty tasty-hunit tasty-quickcheck
        ];
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "streamproc" = callPackage
@@ -128704,8 +129038,8 @@ self: {
      }:
      mkDerivation {
        pname = "sync-mht";
-       version = "0.3.6.0";
-       sha256 = "a6bd7b06e599844e7e93c5fff857b3b0af4975228f1b75fe25407c051f8ea5b9";
+       version = "0.3.7.0";
+       sha256 = "ffabd97017d74f64adce7fc4b0ca55e8833ea957327c7eb09ae3daa7a12c3838";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128819,6 +129153,7 @@ self: {
        homepage = "https://github.com/emilaxelsson/syntactic";
        description = "Generic representation and manipulation of abstract syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "syntactical" = callPackage
@@ -132261,6 +132596,7 @@ self: {
        homepage = "http://github.com/sheyll/tftp";
        description = "A library for building tftp servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "tga" = callPackage
@@ -133091,6 +133427,7 @@ self: {
        homepage = "https://github.com/nicta/tickle";
        description = "A port of @Data.Binary@";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "tictactoe3d" = callPackage
@@ -133334,6 +133671,7 @@ self: {
        homepage = "https://github.com/enzoh/time-exts";
        description = "Efficient Timestamps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "time-http" = callPackage
@@ -133425,6 +133763,7 @@ self: {
        homepage = "https://github.com/christian-marie/time-qq";
        description = "Quasi-quoter for UTCTime times";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "time-recurrence" = callPackage
@@ -133554,12 +133893,11 @@ self: {
      }:
      mkDerivation {
        pname = "timeout-control";
-       version = "0.1";
-       sha256 = "57477679b67deb7845ba0ef78d27096f3b1ee2c2088fc207d95dff944c1a5ef0";
+       version = "0.2";
+       sha256 = "741854f07709ee30c9e31db04745fefc8a42d00023a494e65d17ae40b41679e6";
        libraryHaskellDepends = [
          base ghc-prim lifted-base monad-control mtl transformers-base
        ];
-       jailbreak = true;
        homepage = "http://github.com/alphaHeavy/timeout-control";
        description = "Updatable timeouts as a Monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -134597,6 +134935,7 @@ self: {
        ];
        description = "Generic representation of tree transformations";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "transformers_0_4_3_0" = callPackage
@@ -135525,6 +135864,7 @@ self: {
        libraryHaskellDepends = [ base gloss parsec time ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "twentefp-eventloop-graphics" = callPackage
@@ -139347,6 +139687,7 @@ self: {
        ];
        description = "Process mpileup output to identify significant differences";
        license = "GPL";
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "variable-precision" = callPackage
@@ -139450,6 +139791,7 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-vcache";
        description = "semi-transparent persistence for Haskell using LMDB, STM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "vcache-trie" = callPackage
@@ -139466,6 +139808,7 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-vcache-trie";
        description = "patricia tries modeled above VCache";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "vcard" = callPackage
@@ -139537,6 +139880,7 @@ self: {
        homepage = "https://github.com/forste/haskellVCSGUI";
        description = "GUI library for source code management systems";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "vcswrapper" = callPackage
@@ -139612,6 +139956,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "vector_0_10_9_2" = callPackage
@@ -140146,6 +140491,7 @@ self: {
        ];
        description = "An MPD client with vim-like key bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ncurses;};
 
   "vintage-basic" = callPackage
@@ -141152,6 +141498,7 @@ self: {
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "wai-middleware-etag" = callPackage
@@ -141714,19 +142061,21 @@ self: {
   "waitra" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
      , http-types, regex-applicative, tasty, tasty-hunit
-     , template-haskell, text, wai, wai-extra
+     , template-haskell, text, wai, wai-app-static, wai-extra, warp
      }:
      mkDerivation {
        pname = "waitra";
-       version = "0.0.3.0";
-       sha256 = "7643fda19b754bc79195fefaaf05ec9c3707bc24e4b12514d53a7ffe20ac3a7a";
+       version = "0.0.4.0";
+       sha256 = "5610c69eb377e2714c3e502cf47fff7e116e356890aefb1f4144d3e6c1b16c12";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring directory filepath http-types
          regex-applicative template-haskell text wai
        ];
+       executableHaskellDepends = [ aeson base wai wai-app-static warp ];
        testHaskellDepends = [
-         aeson base http-types regex-applicative tasty tasty-hunit wai
-         wai-extra
+         aeson base http-types tasty tasty-hunit wai wai-extra
        ];
        homepage = "https://github.com/futurice/waitra";
        description = "A very simple Wai router";
@@ -143330,6 +143679,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "wordexp(3) wrappers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "wordpass" = callPackage
@@ -143353,6 +143703,7 @@ self: {
        homepage = "https://github.com/mgajda/wordpass";
        description = "Dictionary-based password generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "words" = callPackage
@@ -143711,6 +144062,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "wxAsteroids" = callPackage
@@ -143760,6 +144112,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell C++ wrapper";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; 
          inherit (pkgs) wxGTK;};
 
@@ -143779,6 +144132,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell core";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) wxGTK;};
 
   "wxdirect" = callPackage
@@ -144037,6 +144391,7 @@ self: {
        ];
        description = "Haskell extended file attributes interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) attr;};
 
   "xbattbar" = callPackage
@@ -144051,6 +144406,7 @@ self: {
        homepage = "https://github.com/polachok/xbattbar";
        description = "Simple battery indicator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "xcb-types" = callPackage
@@ -144403,6 +144759,7 @@ self: {
        testHaskellDepends = [ base unix ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
@@ -145511,6 +145868,7 @@ self: {
        homepage = "http://github.com/alanz/xtc";
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "xtest" = callPackage
@@ -145960,6 +146318,7 @@ self: {
        homepage = "https://github.com/ksaveljev/yampa-2048";
        description = "2048 game clone using Yampa/Gloss";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "yaop" = callPackage
@@ -146549,6 +146908,7 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "yesod-bootstrap" = callPackage
@@ -147795,6 +148155,7 @@ self: {
        homepage = "https://yi-editor.github.io";
        description = "The Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "yi-contrib" = callPackage
@@ -147897,6 +148258,7 @@ self: {
        homepage = "https://github.com/Fuuzetsu/yi-monokai";
        description = "Monokai colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "yi-rope" = callPackage
@@ -147917,6 +148279,7 @@ self: {
        ];
        description = "A rope data structure used by Yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "yi-snippet" = callPackage
@@ -147929,6 +148292,7 @@ self: {
        homepage = "https://github.com/yi-editor/yi-snippet";
        description = "Snippet support for Yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "yi-solarized" = callPackage
@@ -147941,6 +148305,7 @@ self: {
        homepage = "https://github.com/NorfairKing/yi-solarized";
        description = "Solarized colour theme for the Yi text editor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "yi-spolsky" = callPackage
@@ -147954,6 +148319,7 @@ self: {
        homepage = "https://github.com/melrief/yi-spolsky";
        description = "Spolsky colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "yi-vty" = callPackage
@@ -148255,6 +148621,7 @@ self: {
        ];
        description = "Utilities for reading and writing Alteryx .yxdb files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "z3" = callPackage
@@ -148278,8 +148645,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "zalgo";
-       version = "0.1.0.3";
-       sha256 = "74f376016d855eee365ad3d9d7ef1fb42106fbf0d302c918dce26f676b243b2f";
+       version = "0.1.1.0";
+       sha256 = "9d102c28680942c8c2e1b1636723b31b8af7459e9946e39c771691b66e1dc1ad";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/mniip/zalgo";
        description = "Z-algorithm implemented on haskell's built-in cons-cell-based lists";

From 561fecb239022d58cb88c32241b2ee97f020b865 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 1 Sep 2015 17:38:54 +0200
Subject: [PATCH 1886/2016] cromfs: use gcc 4.8 to fix build on i686 (ZHF)

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

diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix
index 342c975fa1f..cd151698f25 100644
--- a/pkgs/tools/archivers/cromfs/default.nix
+++ b/pkgs/tools/archivers/cromfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, fuse, perl }:
+{ stdenv, fetchurl, pkgconfig, fuse, perl, gcc48 }:
 
 stdenv.mkDerivation rec {
   name = "cromfs-1.5.10.2";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     install util/unmkcromfs $out/bin
   '';
 
-  buildInputs = [ pkgconfig fuse perl ];
+  buildInputs = [ pkgconfig fuse perl gcc48 ];
 
   meta = {
     description = "FUSE Compressed ROM filesystem with lzma";

From b3bd3eef38753de8d44236d3ec4cbed30a397a29 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 1 Sep 2015 08:39:45 -0700
Subject: [PATCH 1887/2016] emacsMacport: 24.5-mac-5.9 -> 24.5-mac-5.10

---
 pkgs/applications/editors/emacs-24/macport-24.5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index 6ea9fbfdbb6..2b6dca9039f 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   emacsName = "emacs-24.5";
-  name = "${emacsName}-mac-5.9";
+  name = "${emacsName}-mac-5.10";
 
   #builder = ./builder.sh;
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
-    sha256 = "1xjskagjlnni1nqshszbvk8h8vhwq9sk09l25vb6fijn4g9akwqr";
+    sha256 = "0d4r4mgqxcdba715lbr7rk4bxz7yjxi6wv63kyh6gaqbfgql41vf";
   };
 
   buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];

From 64629ec611a438bf7c405d8d8437f80aa7b6e907 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Sep 2015 17:54:48 +0200
Subject: [PATCH 1888/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/53c766e346c007763844eea101823ce803615955
 with hackage2nix v20150824-62-gb54260a

---
 .../haskell-modules/hackage-packages.nix      | 109 ++++++++++++++++--
 1 file changed, 101 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 5280eeef7e0..2feabf4a787 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -464,6 +464,7 @@ self: {
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding for the OpenAL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freealut;};
 
   "AMI" = callPackage
@@ -4688,6 +4689,7 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ftgl;};
 
   "FTGL-bytestring" = callPackage
@@ -4704,6 +4706,7 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ftgl;};
 
   "FTPLine" = callPackage
@@ -6541,6 +6544,7 @@ self: {
        homepage = "https://github.com/m15k/hfuse";
        description = "HFuse is a binding for the Linux FUSE library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) fuse;};
 
   "HGL" = callPackage
@@ -7210,6 +7214,7 @@ self: {
        executablePkgconfigDepends = [ opencv ];
        description = "A binding for the OpenCV computer vision library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) opencv;};
 
   "HPDF" = callPackage
@@ -11865,6 +11870,7 @@ self: {
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding to the OpenAL cross-platform 3D audio API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) openal;};
 
   "OpenCL" = callPackage
@@ -12632,6 +12638,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/PortMidi";
        description = "A binding for PortMedia/PortMidi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "PostgreSQL" = callPackage
@@ -13253,6 +13260,7 @@ self: {
        homepage = "http://raincat.bysusanlin.com/";
        description = "A puzzle game written in Haskell with a cat in lead role";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Random123" = callPackage
@@ -13668,6 +13676,7 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_mixer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "SDL-mpeg" = callPackage
@@ -19001,6 +19010,7 @@ self: {
        homepage = "http://github.com/phaazon/al";
        description = "OpenAL 1.1 raw API.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) openal;};
 
   "alarmclock" = callPackage
@@ -19355,6 +19365,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (Exceptions)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-gui" = callPackage
@@ -19374,6 +19385,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Some simple interactive programs for sending MIDI control messages via ALSA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "alsa-midi" = callPackage
@@ -19410,6 +19422,7 @@ self: {
        homepage = "https://github.com/ttuegel/alsa-mixer";
        description = "Bindings to the ALSA simple mixer API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm" = callPackage
@@ -19430,6 +19443,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (PCM audio)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm-tests" = callPackage
@@ -19465,6 +19479,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (MIDI sequencer)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-seq-tests" = callPackage
@@ -26510,6 +26525,7 @@ self: {
        libraryPkgconfigDepends = [ directfb ];
        description = "Low level bindings to DirectFB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) directfb;};
 
   "bindings-eskit" = callPackage
@@ -26645,6 +26661,7 @@ self: {
        homepage = "https://github.com/relrod/hamlib-haskell";
        description = "Hamlib bindings for Haskell";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) hamlib;};
 
   "bindings-hdf5" = callPackage
@@ -26807,6 +26824,7 @@ self: {
        homepage = "https://github.com/fizruk/bindings-lxc";
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) lxc;};
 
   "bindings-mmap" = callPackage
@@ -26943,6 +26961,7 @@ self: {
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) saneBackends;};
 
   "bindings-sc3" = callPackage
@@ -37966,6 +37985,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "couch-simple" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
+     , couchdb, data-default, directory, exceptions, filepath
+     , hjsonschema, hlint, http-client, http-types, integer-gmp, mtl
+     , random, tasty, tasty-hunit, text, transformers
+     , unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "couch-simple";
+       version = "0.0.1.0";
+       sha256 = "bf62acc13979f31c729e2aba4bb00ad451f026dbdb725ecedd122a806051ab9d";
+       libraryHaskellDepends = [
+         aeson attoparsec base bifunctors bytestring data-default exceptions
+         http-client http-types integer-gmp mtl text transformers
+         unordered-containers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring data-default directory exceptions filepath
+         hjsonschema hlint http-client http-types random tasty tasty-hunit
+         text transformers unordered-containers uuid
+       ];
+       testToolDepends = [ couchdb ];
+       homepage = "https://github.com/mdorman/couch-simple";
+       description = "A modern, lightweight, complete client for CouchDB";
+       license = stdenv.lib.licenses.mit;
+     }) {inherit (pkgs) couchdb;};
+
   "couchdb-conduit" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base
      , blaze-builder, bytestring, conduit, containers, data-default
@@ -40008,6 +40054,7 @@ self: {
        ];
        description = "Functional Combinators for Computer Vision";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "cyclotomic" = callPackage
@@ -43800,6 +43847,7 @@ self: {
        homepage = "https://github.com/marcinmrotek/diagrams-hsqml";
        description = "HsQML (Qt5) backend for Diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-html5" = callPackage
@@ -46022,6 +46070,7 @@ self: {
        homepage = "http://github.com/toothbrush/dotfs";
        description = "Filesystem to manage and parse dotfiles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "dotgen" = callPackage
@@ -54236,6 +54285,7 @@ self: {
        homepage = "https://github.com/chrisdone/freenect";
        description = "Interface to the Kinect device";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freenect; freenect_sync = null;};
 
   "freesect" = callPackage
@@ -56812,6 +56862,7 @@ self: {
        ];
        description = "DOM library that supports both GHCJS and WebKitGTK";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "ghcjs-dom-hello" = callPackage
@@ -56826,6 +56877,7 @@ self: {
        homepage = "https://github.com/ghcjs/ghcjs-dom-hello";
        description = "GHCJS DOM Hello World, an example package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "ghcjs-websockets" = callPackage
@@ -57076,7 +57128,7 @@ self: {
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
@@ -59313,6 +59365,7 @@ self: {
        homepage = "http://github.com/luqui/graphics-drawingcombinators";
        description = "A functional interface to 2D drawing in OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "graphics-formats-collada" = callPackage
@@ -59570,6 +59623,7 @@ self: {
        ];
        description = "Grid-based multimedia engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "grm" = callPackage
@@ -60393,6 +60447,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.gnome) gtksourceview;};
 
   "guarded-rewriting" = callPackage
@@ -64143,6 +64198,7 @@ self: {
        homepage = "http://github.com/cosbynator/haskakafka";
        description = "Kafka bindings for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rdkafka;};
 
   "haskanoid" = callPackage
@@ -64162,6 +64218,7 @@ self: {
        homepage = "http://github.com/ivanperez-keera/haskanoid";
        description = "A breakout game written in Yampa using SDL";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "haskarrow" = callPackage
@@ -66719,6 +66776,7 @@ self: {
        homepage = "https://github.com/k0ral/hbro";
        description = "Minimal extensible web-browser";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hbro-contrib" = callPackage
@@ -66906,6 +66964,7 @@ self: {
        homepage = "https://github.com/ivanperez-keera/hcwiid";
        description = "Library to interface with the wiimote";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {bluetooth = null; inherit (pkgs) cwiid;};
 
   "hdaemonize" = callPackage
@@ -67854,6 +67913,7 @@ self: {
        homepage = "https://github.com/nh2/hemokit";
        description = "Haskell port of the Emokit EEG project";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hen" = callPackage
@@ -68910,6 +68970,7 @@ self: {
        homepage = "https://github.com/vahokif/haskell-hidapi";
        description = "Haskell bindings to HIDAPI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) systemd;};
 
   "hieraclus" = callPackage
@@ -70203,6 +70264,7 @@ self: {
        homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF";
        description = "Haskell binding to libBladeRF SDR library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libbladeRF;};
 
   "hlibev" = callPackage
@@ -75496,6 +75558,7 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {qt5 = null;};
 
   "hsqml-datamodel" = callPackage
@@ -75564,6 +75627,7 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Sticky notes example program implemented in HsQML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hsqml-demo-samples" = callPackage
@@ -82770,6 +82834,7 @@ self: {
        ];
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "jsaddle-hello" = callPackage
@@ -82785,6 +82850,7 @@ self: {
        homepage = "https://github.com/ghcjs/jsaddle-hello";
        description = "JSaddle Hello World, an example package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "jsc" = callPackage
@@ -83158,8 +83224,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-stream";
-       version = "0.3.2.1";
-       sha256 = "8d0b6305079580e833b97a0fbeffaf96d7c30ca6e965e24fed4815f0f2b92772";
+       version = "0.3.2.2";
+       sha256 = "4415147dec300d1121121308008a522de79949549c35b23c673d70717ad28029";
        libraryHaskellDepends = [
          aeson base bytestring scientific text unordered-containers vector
        ];
@@ -86817,6 +86883,7 @@ self: {
        homepage = "http://www.leksah.org";
        description = "Haskell IDE written in Haskell";
        license = "GPL";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "leksah-server" = callPackage
@@ -87493,6 +87560,7 @@ self: {
        homepage = "https://github.com/peddie/libconfig-haskell";
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {config = null;};
 
   "libcspm" = callPackage
@@ -87923,6 +87991,7 @@ self: {
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
@@ -89935,6 +90004,7 @@ self: {
        ];
        description = "Journald back-end for logging-facade";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "logic-TPTP" = callPackage
@@ -90750,6 +90820,7 @@ self: {
        homepage = "https://github.com/fizruk/lxc";
        description = "High level Haskell bindings to LXC (Linux containers)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lye" = callPackage
@@ -93462,6 +93533,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Convert between datatypes of the midi and the alsa packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "midi-music-box" = callPackage
@@ -93519,6 +93591,7 @@ self: {
        homepage = "http://www.youtube.com/watch?v=cOlR73h2uII";
        description = "A Memory-like (Concentration, Pairs, ...) game for tones";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "midisurface" = callPackage
@@ -97805,6 +97878,7 @@ self: {
        jailbreak = true;
        description = "nanomsg - scalability protocols library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) nanomsg;};
 
   "nanomsg-haskell" = callPackage
@@ -102912,6 +102986,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) pam;};
 
   "panda" = callPackage
@@ -108921,6 +108996,7 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/printxosd";
        description = "Simple tool to display some text on an on-screen display";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "priority-queue" = callPackage
@@ -109763,6 +109839,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A wrapper for the proteaaudio library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "protobuf" = callPackage
@@ -114995,17 +115072,18 @@ self: {
      }) {};
 
   "resolve-trivial-conflicts" = callPackage
-    ({ mkDerivation, ansi-terminal, base, Diff, directory, filepath
-     , mtl, process, unix
+    ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory
+     , filepath, mtl, process, unix
      }:
      mkDerivation {
        pname = "resolve-trivial-conflicts";
-       version = "0.3.0.2";
-       sha256 = "98dd5e44b9ff14b6a3809cc7b127785389cdc97abd080ec4a91f436ec583c4b4";
+       version = "0.3.1.1";
+       sha256 = "4f50a77d04eb304da3c7f93368c4dc5f9e65e705895fa58c018fa0b8f9d79452";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal base Diff directory filepath mtl process unix
+         ansi-terminal base base-compat Diff directory filepath mtl process
+         unix
        ];
        homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
        description = "Remove trivial conflict markers in a git repository";
@@ -116086,6 +116164,7 @@ self: {
        homepage = "http://github.com/agrafix/rocksdb-haskell";
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
+       platforms = [ "x86_64-linux" ];
      }) {inherit (pkgs) rocksdb;};
 
   "roguestar" = callPackage
@@ -116746,6 +116825,7 @@ self: {
        homepage = "https://github.com/adamwalker/hrtlsdr";
        description = "Bindings to librtlsdr";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rtl-sdr;};
 
   "rtorrent-rpc" = callPackage
@@ -116802,6 +116882,7 @@ self: {
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rubberband;};
 
   "ruby-marshal" = callPackage
@@ -120420,6 +120501,7 @@ self: {
        homepage = "http://patch-tag.com/r/shahn/sfml-audio";
        description = "minimal bindings to the audio module of sfml";
        license = "unknown";
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;};
 
   "sfmt" = callPackage
@@ -133391,6 +133473,7 @@ self: {
        homepage = "https://github.com/koterpillar/tianbar";
        description = "A desktop bar based on WebKit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "tic-tac-toe" = callPackage
@@ -133477,6 +133560,7 @@ self: {
        homepage = "http://tidal.lurk.org/";
        description = "MIDI support for tidal";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "tidal-vis" = callPackage
@@ -134565,6 +134649,7 @@ self: {
        homepage = "http://www.polarmobile.com/";
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
   "tomato-rubato-openal" = callPackage
@@ -134578,6 +134663,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/tomato-rubato";
        description = "Easy to use library for audio programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "toml" = callPackage
@@ -135790,6 +135876,7 @@ self: {
        executableHaskellDepends = [ ALUT base ];
        description = "Plays music generated by Turing machines with 5 states and 2 symbols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "turkish-deasciifier" = callPackage
@@ -140803,6 +140890,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.gnome) vte;};
 
   "vtegtk3" = callPackage
@@ -142849,6 +142937,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) webkit;};
 
   "webkit-javascriptcore" = callPackage
@@ -142880,6 +142969,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) webkit;};
 
   "webkitgtk3-javascriptcore" = callPackage
@@ -142895,6 +142985,7 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) webkit;};
 
   "webpage" = callPackage
@@ -145423,6 +145514,7 @@ self: {
        homepage = "http://xmobar.org";
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {Xrender = null; inherit (pkgs.xlibs) libXpm; 
          inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;};
 
@@ -145678,6 +145770,7 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/xosd";
        description = "A binding to the X on-screen display";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) xosd;};
 
   "xournal-builder" = callPackage

From 8c1c38ee27a85d46480005978c59b19936add148 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Sep 2015 17:17:55 +0200
Subject: [PATCH 1889/2016] haskell-bloomfilter: re-enable 32-bit builds to
 verify whether the issue has in fact been fixed upstream

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3cef7eeebff..ce9f3c09089 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -575,9 +575,6 @@ self: super: {
   # This packages compiles 4+ hours on a fast machine. That's just unreasonable.
   CHXHtml = dontDistribute super.CHXHtml;
 
-  # https://github.com/bos/bloomfilter/issues/7
-  bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; });
-
   # https://github.com/NixOS/nixpkgs/issues/6350
   paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; });
 

From 66563862ec3e0ac22a0cc6369eec587fa6dd0fec Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 1 Sep 2015 08:56:47 -0700
Subject: [PATCH 1890/2016] zfs: Fix build for kernel 4.2

---
 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        |   7 +-
 4 files changed, 287 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/zfs/compat-4.2-1.patch
 create mode 100644 pkgs/os-specific/linux/zfs/compat-4.2-2.patch
 create mode 100644 pkgs/os-specific/linux/zfs/compat-4.2-3.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
new file mode 100644
index 00000000000..a789f82799a
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/compat-4.2-1.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 00000000000..659349c95ac
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/compat-4.2-2.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 00000000000..10ec3ef9cf4
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/compat-4.2-3.patch
@@ -0,0 +1,214 @@
+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 399169b364e..a4aa7b036b3 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -10,5 +10,10 @@ callPackage ./generic.nix (args // rec {
     sha256 = "192x4z5am5wgrr4hb5skshyr5a6af52xpnk6pni4hs4pxvlpcs37";
   };
 
-  patches = [ ./nix-build.patch ];
+  patches = [
+    ./nix-build.patch
+    ./compat-4.2-1.patch
+    ./compat-4.2-2.patch
+    ./compat-4.2-3.patch
+  ];
 })

From 2b71e4643e33c427c26efc16b69765170b292cca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Sep 2015 18:01:34 +0200
Subject: [PATCH 1891/2016] haskell-bloomfilter: patch to fix build on 32 bit
 platforms

---
 .../haskell-modules/configuration-common.nix  |  3 ++
 .../patches/bloomfilter-fix-on-32bit.patch    | 28 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ce9f3c09089..b0b93e2d530 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1013,4 +1013,7 @@ self: super: {
   # https://github.com/GaloisInc/DSA/issues/1
   DSA = dontCheck super.DSA;
 
+  # https://github.com/bos/bloomfilter/issues/7
+  bloomfilter = appendPatch super.bloomfilter ./patches/bloomfilter-fix-on-32bit.patch;
+
 }
diff --git a/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch b/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch
new file mode 100644
index 00000000000..7b32dcb4ab6
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch
@@ -0,0 +1,28 @@
+From 35d972b3dc5056110d55315f2256d9c5046299c7 Mon Sep 17 00:00:00 2001
+From: Peter Simons <simons@cryp.to>
+Date: Tue, 1 Sep 2015 17:58:36 +0200
+Subject: [PATCH] Revert "Fix maximum sizing calculation."
+
+This reverts commit 44b01ba38b4fcdb5a85f44fa2f3af1f29cde8f40. The change breaks
+this package on 32 bit platforms. See https://github.com/bos/bloomfilter/issues/7
+for further details.
+---
+ Data/BloomFilter/Easy.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Data/BloomFilter/Easy.hs b/Data/BloomFilter/Easy.hs
+index 5143c6e..a349168 100644
+--- a/Data/BloomFilter/Easy.hs
++++ b/Data/BloomFilter/Easy.hs
+@@ -72,7 +72,7 @@ safeSuggestSizing capacity errRate
+             minimum [((-k) * cap / log (1 - (errRate ** (1 / k))), k)
+                      | k <- [1..100]]
+         roundedBits = nextPowerOfTwo (ceiling bits)
+-    in if roundedBits <= 0 || roundedBits > 0xffffffff
++    in if roundedBits <= 0
+        then Left  "capacity too large to represent"
+        else Right (roundedBits, truncate hashes)
+ 
+-- 
+2.5.1
+

From 21370df4d65c84031ecac94f4547b9d9a4a0a873 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 1 Sep 2015 18:04:14 +0200
Subject: [PATCH 1892/2016] ibus-anthy: 1.5.6 -> 1.5.7

Also fix zipcode lookup.
---
 pkgs/tools/inputmethods/ibus-anthy/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-anthy/default.nix
index 1b0201c4b17..22515a15d27 100644
--- a/pkgs/tools/inputmethods/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-anthy/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-anthy-${version}";
-  version = "1.5.6";
+  version = "1.5.7";
 
   meta = with stdenv.lib; {
     description = "IBus interface to the anthy input method";
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ gebner ];
   };
 
+  configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t";
+
   buildInputs = [ makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection python pythonPackages.pygobject3 ];
 
   postFixup = ''
@@ -24,6 +26,6 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz";
-    sha256 = "0vl904l5862zxfi8fiiljwvqv4yvb3nfdbkmpcqk3zw4r1mn6p03";
+    sha256 = "00sjrfhghrgkqm72mf39f8sz6wr4fwvvs9mn2alaldhgr5v0c861";
   };
 }

From d0d882870613991dec56362f1b55490356117884 Mon Sep 17 00:00:00 2001
From: Robin Gloster <robin@loc-com.de>
Date: Sun, 30 Aug 2015 10:38:49 +0000
Subject: [PATCH 1893/2016] lxd: fix to include lxd-images

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 908682d46b4..81cfbb250d0 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1614,7 +1614,11 @@ let
     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
+      pkgs.python3
     ];
+    postInstall = ''
+      cp go/src/$goPackagePath/scripts/lxd-images $bin/bin
+    '';
   };
 
   mapstructure = buildFromGitHub {

From f65b692a07bbfc83a43244bca73fd658e618be73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 1 Sep 2015 14:30:35 +0200
Subject: [PATCH 1894/2016] firefox: fix argv0 with enableGTK3 (/cc #9562)

Also add a simple test detecting such problems.
---
 pkgs/applications/networking/browsers/firefox/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index ff206c50f34..a8ca59d0ed4 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -97,10 +97,16 @@ stdenv.mkDerivation rec {
       # Remove SDK cruft. FIXME: move to a separate output?
       rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
     '' + lib.optionalString enableGTK3
+      # argv[0] must point to firefox itself
     ''
       wrapProgram "$out/bin/firefox" \
+        --argv0 "$out/bin/.firefox-wrapped" \
         --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
         --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
+    '' +
+      # some basic testing
+    ''
+      "$out/bin/firefox" --version
     '';
 
   meta = {

From f2d25c5a4d08c5c31a49404d155b5ad809f92732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 1 Sep 2015 15:17:05 +0200
Subject: [PATCH 1895/2016] firefox-gtk3: fix crashes by a Fedora-backported
 patch

These might be the same crashes as with gtk2 and system cairo #9368.
---
 .../networking/browsers/firefox/default.nix         | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index a8ca59d0ed4..e510b329714 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -4,7 +4,7 @@
 , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
 , hunspell, libevent, libstartup_notification, libvpx
 , cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
-, enableGTK3 ? false
+, enableGTK3 ? false, fetchpatch
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
   # of "Shiretoko" or whatever, enable this option.  However, those
@@ -26,6 +26,17 @@ stdenv.mkDerivation rec {
     sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13";
   };
 
+  patches = if !enableGTK3 then null else [(fetchpatch {
+    name = "crash_OTMC+GTK3.patch";
+    # backported from 40.1
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1127752
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1256875
+    url = "http://pkgs.fedoraproject.org/cgit/firefox.git/plain/"
+      + "mozilla-1127752.patch?id=571fefe2c8f741b92c865e9122af56f6258b3fc1";
+    sha256 = "04yq4lcq8ln2fmknz4c0zah77wxqp2mcgr8pjx860dmcmzvyi3p5";
+  })];
+  patchFlags = "-p2";
+
   buildInputs =
     [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2
       python dbus dbus_glib pango freetype fontconfig xlibs.libXi

From 0327ee3f8ed388a6bd90059970150668c269fec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 1 Sep 2015 20:44:09 +0200
Subject: [PATCH 1896/2016] libevent: remove unused vulnerable 1.4.x version

---
 pkgs/development/libraries/libevent/1.4.nix | 29 ---------------------
 pkgs/top-level/all-packages.nix             |  1 -
 2 files changed, 30 deletions(-)
 delete mode 100644 pkgs/development/libraries/libevent/1.4.nix

diff --git a/pkgs/development/libraries/libevent/1.4.nix b/pkgs/development/libraries/libevent/1.4.nix
deleted file mode 100644
index ed190bf6061..00000000000
--- a/pkgs/development/libraries/libevent/1.4.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{stdenv, fetchurl}:
-
-let version = "1.4.14b"; in
-stdenv.mkDerivation {
-  name = "libevent-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/downloads/libevent/libevent/libevent-${version}-stable.tar.gz";
-    sha256 = "00b3wih3qpcik6v0qh1406abs2xb954d58ncqwzs8ar2d93ip9mg";
-  };
-
-  meta = {
-    description = "libevent, an event notification library";
-
-    longDescription =
-      '' The libevent API provides a mechanism to execute a callback function
-         when a specific event occurs on a file descriptor or after a timeout
-         has been reached.  Furthermore, libevent also support callbacks due
-         to signals or regular timeouts.
-
-         libevent is meant to replace the event loop found in event driven
-         network servers.  An application just needs to call event_dispatch()
-         and then add or remove events dynamically without having to change
-         the event loop.
-      '';
-
-    license = "mBSD";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 994136e6645..d0bc2e97490 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7000,7 +7000,6 @@ let
 
   libev = callPackage ../development/libraries/libev { };
 
-  libevent14 = callPackage ../development/libraries/libevent/1.4.nix { };
   libevent = callPackage ../development/libraries/libevent { };
 
   libewf = callPackage ../development/libraries/libewf { };

From 08ef227a615c43be8fa2cc22c923283ce7189f90 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 1 Sep 2015 21:44:11 +0200
Subject: [PATCH 1897/2016] pythonPackages.scikitlearn: apply patch for
 doctests on i686 and skip one test

fixes #9472
related scikit-learn/scikit-learn/#5198, scikit-learn/scikit-learn/#5197
---
 pkgs/top-level/python-packages.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 88973f55500..1be6baf93cb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12654,21 +12654,26 @@ let
 
 
   scikitlearn = buildPythonPackage rec {
-    name = "scikit-learn-0.16.1";
+    name = "scikit-learn-${version}";
+    version = "0.16.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/scikit-learn/${name}.tar.gz";
-      sha256 = "1r761qmsq2mnl8sapplbx0ipj6i7ppr2cmz009q5rjana0liwwn0";
+      url = "https://github.com/scikit-learn/scikit-learn/archive/${version}.tar.gz";
+      sha256 = "140skabifgc7lvvj873pnzlwx0ni6q8qkrsyad2ccjb3h8rxzkih";
     };
 
     buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];
     propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ];
 
-    # doctests fail on i686
-    # https://github.com/NixOS/nixpkgs/issues/9472
-    # https://github.com/scikit-learn/scikit-learn/issues/5177
-    patchPhase = ''
-      substituteInPlace setup.cfg --replace 'with-doctest = 1' 'with-doctest = 0'
+    patches = [
+      (pkgs.fetchurl {
+        url = "https://patch-diff.githubusercontent.com/raw/scikit-learn/scikit-learn/pull/5197.patch";
+        sha256 = "1b261wcvim6s0sqmd20jylwz09g5bh3xzhagjlslmv4q50qxpvkg";
+      })
+    ];
+
+    postPatch = optionalString (stdenv.isi686 && isPy3k) ''
+      sed -i -e "s|test_standard_scaler_numerical_stability|_skip_test_standard_scaler_numerical_stability|g" sklearn/preprocessing/tests/test_data.py
     '';
 
     buildPhase = ''

From f5615752ae0217a0e85f46630da56f5e2a82612d Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Tue, 1 Sep 2015 10:31:43 +0000
Subject: [PATCH 1898/2016] imagemagick: 6.9.1-0 -> 6.9.2-0, fixes #9591

---
 pkgs/applications/graphics/ImageMagick/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 683e2721d87..3575eee2939 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -4,22 +4,19 @@
 }:
 
 let
-
-  version = "6.9.1-0";
-
   arch =
     if stdenv.system == "i686-linux" then "i686"
     else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
     else throw "ImageMagick is not supported on this platform.";
-
 in
 
 stdenv.mkDerivation rec {
   name = "imagemagick-${version}";
+  version = "6.9.2-0";
 
   src = fetchurl {
     url = "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz";
-    sha256 = "03lvj6rxv16xk0dpsbzvm2gq5bggkwff9wqbpkq0znihzijpax1j";
+    sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7";
   };
 
   outputs = [ "out" "doc" ];

From fe85ba58061356aff60ac6d6d1f8adf4a20361b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 1 Sep 2015 22:20:38 +0200
Subject: [PATCH 1899/2016] opencv3: unbreak build (set "-DWITH_IPP=OFF")

OpenCV tries to download IPP itself at build time. That doesn't work
well with nix.
---
 pkgs/development/libraries/opencv/3.x.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index eae31df4796..eed77b9113a 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
+  # TODO: Pre-download IPP so that OpenCV doesn't try to download it itself
+  # (which fails).
+  cmakeFlags = [ "-DWITH_IPP=OFF" ];
+
   enableParallelBuilding = true;
 
   meta = {

From 8ddc086c355ea6c15cc768c3eb39971037fcd939 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 1 Sep 2015 14:32:47 -0700
Subject: [PATCH 1900/2016] Add hydra links for upcoming 15.09 release

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index dc00a0ebd69..991d90dd97d 100644
--- a/README.md
+++ b/README.md
@@ -33,8 +33,10 @@ For pull-requests, please rebase onto nixpkgs `master`.
 * [Manual (NixOS)](https://nixos.org/nixos/manual/)
 * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
 * [Continuous package builds for 14.12 release](https://hydra.nixos.org/jobset/nixos/release-14.12)
+* [Continuous package builds for 15.09 release](https://hydra.nixos.org/jobset/nixos/release-15.09)
 * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
 * [Tests for 14.12 release](https://hydra.nixos.org/job/nixos/release-14.12/tested#tabs-constituents)
+* [Tests for 15.09 release](https://hydra.nixos.org/job/nixos/release-15.09/tested#tabs-constituents)
 
 Communication:
 

From 4fecf15b4b09c627f7dfb2792fe202f49b73f90f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 1 Sep 2015 17:19:11 -0700
Subject: [PATCH 1901/2016] syncthing: Fix top-level expression

---
 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 d0bc2e97490..da574c93fed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12926,7 +12926,7 @@ let
 
   symlinks = callPackage ../tools/system/symlinks { };
 
-  syncthing = callPackage ../applications/networking/syncthing { };
+  syncthing = (callPackage ../applications/networking/syncthing { }).bin // { outputs = [ "bin" ]; };
 
   # linux only by now
   synergy = callPackage ../applications/misc/synergy { };

From 54c4aab6621662e7d8f386c1da53107d56813e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 2 Sep 2015 04:54:31 +0200
Subject: [PATCH 1902/2016] nixos: kill services.virtualboxGuest to fix #9600

---
 nixos/modules/virtualisation/virtualbox-image.nix | 2 +-
 pkgs/build-support/grsecurity/default.nix         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 8232f6e50df..c1538feb9df 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -128,6 +128,6 @@ in {
     boot.loader.grub.version = 2;
     boot.loader.grub.device = "/dev/sda";
   
-    services.virtualboxGuest.enable = true;
+    virtualisation.virtualbox.guest.enable = true;
   };
 }
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index 713f4cdc83e..f26291e7daa 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -85,7 +85,7 @@ let
       let boolToKernOpt = b: if b then "y" else "n";
           # Disable RANDSTRUCT under virtualbox, as it has some kind of
           # breakage with the vbox guest drivers
-          #randstruct = optionalString config.services.virtualboxGuest.enable
+          #randstruct = optionalString config.virtualisation.virtualbox.guest.enable
           #  "GRKERNSEC_RANDSTRUCT n";
 
           # Disable restricting links under the testing kernel, as something

From 2dccca399c9a6d96c4d5344c1f0af29d8d8a2c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 1 Sep 2015 20:33:27 +0200
Subject: [PATCH 1903/2016] libunwind: security fix for CVE-2015-3239

Thanks to the monitor. Low security and high rebuild impact, but still...
---
 .../libraries/libunwind/cve-2015-3239.patch       | 15 +++++++++++++++
 pkgs/development/libraries/libunwind/default.nix  |  6 +++---
 pkgs/top-level/all-packages.nix                   |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/libunwind/cve-2015-3239.patch

diff --git a/pkgs/development/libraries/libunwind/cve-2015-3239.patch b/pkgs/development/libraries/libunwind/cve-2015-3239.patch
new file mode 100644
index 00000000000..247b2dab44f
--- /dev/null
+++ b/pkgs/development/libraries/libunwind/cve-2015-3239.patch
@@ -0,0 +1,15 @@
+http://git.savannah.gnu.org/cgit/libunwind.git/commit/?id=396b6c7ab737e2bff244d640601c436a26260ca1
+
+diff --git a/include/dwarf_i.h b/include/dwarf_i.h
+index 0e72845..86dcdb8 100644
+--- a/include/dwarf_i.h
++++ b/include/dwarf_i.h
+@@ -20,7 +20,7 @@
+ extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
+ /* REG is evaluated multiple times; it better be side-effects free!  */
+ # define dwarf_to_unw_regnum(reg)					  \
+-  (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
++  (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
+ #endif
+ 
+ #ifdef UNW_LOCAL_ONLY
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 91895114ea0..ecaa643b143 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libunwind-1.1";
-  
+
   src = fetchurl {
     url = "mirror://savannah/libunwind/${name}.tar.gz";
     sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx";
   };
 
-  patches = [ ./libunwind-1.1-lzma.patch ];
+  patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch ];
 
   postPatch = ''
     sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       sed -i 's,-llzma,${xz}/lib/liblzma.la,' $file
     done
   '';
-  
+
   meta = with stdenv.lib; {
     homepage = http://www.nongnu.org/libunwind;
     description = "A portable and efficient API to determine the call-chain of a program";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da574c93fed..fba483b6ed8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7450,7 +7450,7 @@ let
   libusbmuxd = callPackage ../development/libraries/libusbmuxd { };
 
   libunwind = if stdenv.isDarwin
-    then callPackage ../development/libraries/libunwind/native.nix {}
+    then libunwindNative
     else callPackage ../development/libraries/libunwind { };
 
   libunwindNative = callPackage ../development/libraries/libunwind/native.nix {};

From b55a4df70fb004902206bc76cb86b91e218eae93 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 1 Sep 2015 19:20:45 -0700
Subject: [PATCH 1904/2016] chromium: Updates

This bumps the stable and dev track forward a version
---
 .../browsers/chromium/source/sources.nix      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 17df6492efa..16aa67db30f 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,21 +1,21 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "46.0.2486.0";
-    sha256 = "19p99lnmpizmhdlr73z43jjaip95kv5y6nj5yqni9dfbjnlb7cah";
-    sha256bin32 = "1sxfszv50yw6vjd9mj9xc2crf51slsllhwnhlfp2qhg7l3f1l9a9";
-    sha256bin64 = "0262jlpz4869w6nqc3aadygl5byldg5h8ivwwcz8v1dzjwm7nlhy";
+    version = "47.0.2498.0";
+    sha256 = "1dvp7wwfbdzyvbqcfn538gf0dk6w6gc88nms0wl0ir4ka7rf7mz1";
+    sha256bin32 = "15jsmvhyzscf6g6czkg5vxzyj7vnkndmsapx0xf8hlw8d5zw3nq7";
+    sha256bin64 = "1mx605dh93ak0p68rrpb6xf46jygggk0jwj7k6ks21l4wnxha8d5";
   };
   beta = {
-    version = "45.0.2454.46";
-    sha256 = "14q5bsiw7ns4gwgpqlw8mcl500n13wq8v7p34v0gj2fazm948j37";
-    sha256bin32 = "0cqw11sg4w665b50nybcg189wj78lr9h9amh5nqzi1qdqsk9vn8w";
-    sha256bin64 = "1lm8ykpcbzcbmiyj2z35l6ypx1ahi7asqkzkdavnrqawjafskygc";
+    version = "45.0.2454.78";
+    sha256 = "1n3yp0jm3jqyw0xwji1451qjjpkvpsqabn7d2r9fj75gspsiwv6z";
+    sha256bin32 = "11x8f2nyhf4n1jdd8npvr3ddkp3himi6lxpml64h5gjd5j9gf32b";
+    sha256bin64 = "16gk14q3pc1fzg9dbwlqsay4jwddsh5b37h4p8zkqqymv9fp5qq9";
   };
   stable = {
-    version = "44.0.2403.157";
-    sha256 = "1d7k74sa3qbwwcgi6zvx6z7mqkjvyh8x8h78d56nhhh80gyxb971";
-    sha256bin32 = "0nqfb46299jhzsrlqfkjrj4g639hd4xdcj683pm0iszwq5mf9gbq";
-    sha256bin64 = "02g1q1x1pwrbzd8v350bzwkqfgmsmq955bvif8sr0bi1sy9b16z3";
+    version = "45.0.2454.85";
+    sha256 = "14acjc80dmypybbvm087szp0g0m1gil5hjj02x8c6k7alsjh731y";
+    sha256bin32 = "1945m765a05wfdfslrb22r1jpicyghfkf4h7ijzw1z9whmxa9y1v";
+    sha256bin64 = "0d63akpr3yp128v01xgz1nd364w7p89gkvjpr4qz99q67dh3z1q1";
   };
 }

From e80b41e94fc3db8e0e7f5592b8daecf52c5d5156 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 31 Aug 2015 12:04:33 +0200
Subject: [PATCH 1905/2016] xen: remove 4.4.1 + fixes compilation of 4.5.x,
 fixes #9572

---
 .../0000-qemu-seabios-enable-ATA_DMA.patch    |  14 +-
 .../applications/virtualization/xen/4.4.1.nix |  50 -------
 .../applications/virtualization/xen/4.5.0.nix |  15 +-
 .../virtualization/xen/generic.nix            | 138 +++++++++---------
 pkgs/top-level/all-packages.nix               |   1 -
 5 files changed, 79 insertions(+), 139 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/xen/4.4.1.nix

diff --git a/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch b/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch
index 1eb3d5949de..339972a2cde 100644
--- a/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch
+++ b/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch
@@ -1,8 +1,7 @@
-diff --git a/src/Kconfig b/src/Kconfig
-index 45ca59c..faf8951 100644
---- a/src/Kconfig
-+++ b/src/Kconfig
-@@ -144,13 +144,13 @@ menu "Hardware support"
+diff -uNr a/src/Kconfig b/src/Kconfig
+--- a/src/Kconfig	2015-08-31 10:15:13.231134858 +0200
++++ b/src/Kconfig	2015-08-31 10:14:24.039180178 +0200
+@@ -144,13 +144,13 @@
      config ATA_DMA
          depends on ATA
          bool "ATA DMA"
@@ -16,8 +15,5 @@ index 45ca59c..faf8951 100644
 -        default n
 +        default y
          help
-             Use 32bit PIO accesses on ATA (minor optimization on PCI 
-transfers).
+             Use 32bit PIO accesses on ATA (minor optimization on PCI transfers).
      config AHCI
--- 
-1.7.10.4
diff --git a/pkgs/applications/virtualization/xen/4.4.1.nix b/pkgs/applications/virtualization/xen/4.4.1.nix
deleted file mode 100644
index ec2056cc547..00000000000
--- a/pkgs/applications/virtualization/xen/4.4.1.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-let
-  # Xen 4.4.1
-  xenConfig = {
-    name = "xen-4.4.1";
-    version = "4.4.1";
-
-    src = fetchurl {
-      url = "http://bits.xensource.com/oss-xen/release/4.4.1/xen-4.4.1.tar.gz";
-      sha256 = "09gaqydqmy64s5pqnwgjyzhd3wc61xyghpqjfl97kmvm8ly9vd2m";
-    };
-
-    # Sources needed to build the xen tools and tools/firmware.
-    toolsGits =
-      [ # tag qemu-xen-4.4.1
-        { git = { name = "qemu-xen";
-                  url = git://xenbits.xen.org/qemu-upstream-4.4-testing.git;
-                  rev = "65fc9b78ba3d868a26952db0d8e51cecf01d47b4";
-                  sha256 = "e24fb58f773fd9134c5aae6d3ca7e9f754dc9822de92b1eb2cedc76faf911f18";
-                };
-        }
-        # tag xen-4.4.1
-        { git = { name = "qemu-xen-traditional";
-                  url = git://xenbits.xen.org/qemu-xen-4.4-testing.git;
-                  rev = "6ae4e588081620b141071eb010ec40aca7e12876";
-                  sha256 = "b1ed1feb92fbe658273a8d6d38d6ea60b79c1658413dd93979d6d128d8554ded";
-                };
-        }
-      ];
-
-    firmwareGits =
-      [ # tag 1.7.3.1
-        { git = { name = "seabios";
-                  url = git://xenbits.xen.org/seabios.git;
-                  rev = "7d9cbe613694924921ed1a6f8947d711c5832eee";
-                  sha256 = "c071282bbcb1dd0d98536ef90cd1410f5d8da19648138e0e3863bc540d954a87";
-                };
-        }
-        { git = { name = "ovmf";
-                  url = git://xenbits.xen.org/ovmf.git;
-                  rev = "447d264115c476142f884af0be287622cd244423";
-                  sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b";
-                };
-        }
-      ];
-
-  };
-
-in callPackage ./generic.nix (args // { xenConfig=xenConfig; })
diff --git a/pkgs/applications/virtualization/xen/4.5.0.nix b/pkgs/applications/virtualization/xen/4.5.0.nix
index 156255be0d7..48b3ee4d75b 100644
--- a/pkgs/applications/virtualization/xen/4.5.0.nix
+++ b/pkgs/applications/virtualization/xen/4.5.0.nix
@@ -58,17 +58,18 @@ let
         }
       ];
 
-    xenserverPatches = let
-      patches = {
-        url = https://github.com/ts468/xen-4.5.pg.git;
-        rev = "3442b65b490f43c817cbc53369220d0b1ab9b785";
-        sha256 = "31436c15def0a300b3ea1a63b2208c4a3bcbb143db5c6488d4db370b3ceeb845";
-      };
+    xenserverPatches =
+      let
+        patches = {
+          url = https://github.com/ts468/xen-4.5.pg.git;
+          rev = "3442b65b490f43c817cbc53369220d0b1ab9b785";
+          sha256 = "31436c15def0a300b3ea1a63b2208c4a3bcbb143db5c6488d4db370b3ceeb845";
+        };
       in ''
         cp -r ${fetchgit patches}/master patches
         quilt push -a
         substituteInPlace tools/xenguest/Makefile --replace "_BSD_SOURCE" "_DEFAULT_SOURCE"
-        '';
+      '';
 
     xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
                    ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 32e38563525..2ff66d843ca 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -76,79 +76,9 @@ stdenv.mkDerivation {
   pythonPath = [ pythonPackages.curses ];
 
   patches = stdenv.lib.optionals ((xenserverPatched == false) && (builtins.hasAttr "xenPatches" xenConfig)) xenConfig.xenPatches;
-  patchPhase = stdenv.lib.optional ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) xenConfig.xenserverPatches;
 
-  preConfigure = ''
-    # Fake wget: copy prefetched downloads instead
-    mkdir wget
-    echo "#!/bin/sh" > wget/wget
-    echo "echo ===== Not fetching \$*, copy pre-fetched file instead" >> wget/wget
-    echo "cp \$4 \$3" >> wget/wget
-    chmod +x wget/wget
-    export PATH=$PATH:$PWD/wget
-    export EXTRA_QEMUU_CONFIGURE_ARGS="--enable-spice --enable-usb-redir --enable-linux-aio"
-  '';
-
-  # TODO: Flask needs more testing before enabling it by default.
-  #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
-  makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
-
-  buildFlags = "xen tools stubdom";
-
-  preBuild =
-    ''
-      substituteInPlace tools/libfsimage/common/fsimage_plugin.c \
-        --replace /usr $out
-
-      substituteInPlace tools/blktap2/lvm/lvm-util.c \
-        --replace /usr/sbin/vgs ${lvm2}/sbin/vgs \
-        --replace /usr/sbin/lvs ${lvm2}/sbin/lvs
-
-      substituteInPlace tools/hotplug/Linux/network-bridge \
-        --replace /usr/bin/logger ${utillinux}/bin/logger
-
-      substituteInPlace tools/xenmon/xenmon.py \
-        --replace /usr/bin/pkill ${procps}/bin/pkill
-
-      substituteInPlace tools/xenstat/Makefile \
-        --replace /usr/include/curses.h ${ncurses}/include/curses.h
-
-      substituteInPlace tools/ioemu-qemu-xen/xen-hooks.mak \
-        --replace /usr/include/pci ${pciutils}/include/pci
-
-      substituteInPlace tools/hotplug/Linux/xen-backend.rules \
-        --replace /etc/xen/scripts $out/etc/xen/scripts
-
-      # blktap is not provided by xen, but by xapi
-      sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules
-
-      # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't
-      # print the GCC version number properly.
-      substituteInPlace xen/Makefile \
-        --replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
-
-      substituteInPlace tools/python/xen/xend/server/BlktapController.py \
-        --replace /usr/sbin/tapdisk2 $out/sbin/tapdisk2
-
-      substituteInPlace tools/python/xen/xend/XendQCoWStorageRepo.py \
-        --replace /usr/sbin/qcow-create $out/sbin/qcow-create
-
-      substituteInPlace tools/python/xen/remus/save.py \
-        --replace /usr/lib/xen/bin/xc_save $out/${libDir}/xen/bin/xc_save
-
-      substituteInPlace tools/python/xen/remus/device.py \
-        --replace /usr/lib/xen/bin/imqebt $out/${libDir}/xen/bin/imqebt
-
-      # Allow the location of the xendomains config file to be
-      # overriden at runtime.
-      substituteInPlace tools/hotplug/Linux/init.d/xendomains \
-        --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \
-        --replace 'XENDOM_CONFIG=/etc/default/xendomains' "" \
-        --replace /etc/xen/scripts/hotplugpath.sh $out/etc/xen/scripts/hotplugpath.sh \
-        --replace /bin/ls ls
-
-      substituteInPlace tools/hotplug/Linux/xendomains \
-        --replace /bin/ls ls
+  postPatch = ''
+      ${stdenv.lib.optionalString ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) xenConfig.xenserverPatches}
 
       # Xen's tools and firmares need various git repositories that it
       # usually checks out at time using git.  We can't have that.
@@ -171,12 +101,76 @@ stdenv.mkDerivation {
       ${flip concatMapStrings xenExtfiles (x: let src = fetchurl x; in ''
         cp ${src} xen_ext_files/${src.name}
       '')}
+  '';
+
+  preConfigure = ''
+    # Fake wget: copy prefetched downloads instead
+    mkdir wget
+    echo "#!/bin/sh" > wget/wget
+    echo "echo ===== Not fetching \$*, copy pre-fetched file instead" >> wget/wget
+    echo "cp \$4 \$3" >> wget/wget
+    chmod +x wget/wget
+    export PATH=$PATH:$PWD/wget
+    export EXTRA_QEMUU_CONFIGURE_ARGS="--enable-spice --enable-usb-redir --enable-linux-aio"
+  '';
+
+  postConfigure =
+    ''
+      substituteInPlace tools/libfsimage/common/fsimage_plugin.c \
+        --replace /usr $out
+
+      substituteInPlace tools/blktap2/lvm/lvm-util.c \
+        --replace /usr/sbin/vgs ${lvm2}/sbin/vgs \
+        --replace /usr/sbin/lvs ${lvm2}/sbin/lvs
+
+      substituteInPlace tools/hotplug/Linux/network-bridge \
+        --replace /usr/bin/logger ${utillinux}/bin/logger
+
+      substituteInPlace tools/xenmon/xenmon.py \
+        --replace /usr/bin/pkill ${procps}/bin/pkill
+
+      substituteInPlace tools/xenstat/Makefile \
+        --replace /usr/include/curses.h ${ncurses}/include/curses.h
+
+      substituteInPlace tools/qemu-xen-traditional/xen-hooks.mak \
+        --replace /usr/include/pci ${pciutils}/include/pci
+
+      substituteInPlace tools/qemu-xen-traditional-dir-remote/xen-hooks.mak \
+        --replace /usr/include/pci ${pciutils}/include/pci
+
+      substituteInPlace tools/hotplug/Linux/xen-backend.rules \
+        --replace /etc/xen/scripts $out/etc/xen/scripts
+
+      # blktap is not provided by xen, but by xapi
+      sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules
+
+      # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't
+      # print the GCC version number properly.
+      substituteInPlace xen/Makefile \
+        --replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
+
+      # Allow the location of the xendomains config file to be
+      # overriden at runtime.
+      substituteInPlace tools/hotplug/Linux/init.d/xendomains \
+        --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \
+        --replace 'XENDOM_CONFIG=/etc/default/xendomains' "" \
+        --replace /etc/xen/scripts/hotplugpath.sh $out/etc/xen/scripts/hotplugpath.sh \
+        --replace /bin/ls ls
+
+      substituteInPlace tools/hotplug/Linux/xendomains \
+        --replace /bin/ls ls
 
       # Hack to get `gcc -m32' to work without having 32-bit Glibc headers.
       mkdir -p tools/include/gnu
       touch tools/include/gnu/stubs-32.h
     '';
 
+  # TODO: Flask needs more testing before enabling it by default.
+  #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
+  makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
+
+  buildFlags = "xen tools stubdom";
+
   postBuild =
     ''
       make -C docs man-pages
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fba483b6ed8..7c0b9208e7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13461,7 +13461,6 @@ let
 
   xdotool = callPackage ../tools/X11/xdotool { };
 
-  xen_4_4_1 = callPackage ../applications/virtualization/xen/4.4.1.nix { };
   xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { };
   xen_4_5_1 = callPackage ../applications/virtualization/xen/4.5.1.nix { };
   xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; };

From 0f4b9218d2900a346d6f8c2c8077bc1b8c7f84e2 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 1 Sep 2015 21:55:31 +0200
Subject: [PATCH 1906/2016] python27Packages.klaus: 0.4.10 -> 0.6.0, fixes
 #9597

---
 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 1be6baf93cb..b55503643d9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7295,16 +7295,16 @@ let
   };
 
   klaus = buildPythonPackage rec {
-    version = "0.4.10";
+    version = "0.6.0";
     name = "klaus-${version}";
 
     src = pkgs.fetchurl {
       url = "https://github.com/jonashaag/klaus/archive/${version}.tar.gz";
-      sha256 = "1yq1dz3cd2qdn8vi1ivf6biab76cfmcvis07d6a8039w5wxdzc80";
+      sha256 = "0ab3lxbysnvsx7irlxhiy78clbk4d0gzv2241pqkkvlmqq3968p4";
     };
 
     propagatedBuildInputs = with self;
-      [ humanize httpauth dulwich pygments flask ];
+      [ humanize httpauth dulwich pygments flask six ];
 
     meta = {
       description = "The first Git web viewer that Just Works";

From 616aa2bddaa73b168205104cf63ae0fc27613201 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 2 Sep 2015 09:14:59 +0200
Subject: [PATCH 1907/2016] ocaml modules: fix some CamelCase and under_scores

---
 .../{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 ++--
 .../ocaml-modules/async/default.nix           |  6 +-
 .../{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 +-
 .../default.nix                               | 10 +--
 .../{core_kernel => core-kernel}/default.nix  | 12 +--
 .../ocaml-modules/core/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, 156 insertions(+), 130 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_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 2d1e1dea69c..567562dcf28 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 ae10e931ce2..4c12c994f8d 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 8c0d8d7c851..7e5db2e2c3e 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 75755833a5f..6f863382bd2 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 527d56ceaa0..49fd3033320 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 81fbd6a9918..b8fe7bee255 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/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix
index 2b84519036c..a813c3f4522 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/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 4a2b9846271..4f8c3181e23 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 e219b59de5d..92690d96ffb 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 95001215814..a4e12561194 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 dbb83f4c8cf..2ea316462c2 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_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 f311aae3d30..aa6741e6520 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 0fed12b195d..ee1a8b7a5bb 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/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix
index 96fd80087d6..9cc03883932 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/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 05a8ecfe616..f435e53314a 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 ce20cdd47bb..f0f80eb2ecd 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 0ff2a725ea2..c60ef70ef69 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 7508a14738d..35b09051046 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 38548790329..cb73f56fbd8 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 eaeb7e7b22f..c7d4aa52c47 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 d8ce0dbc7ea..926a61fff66 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 5970aba1e50..05a38c814a0 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 faf17e20dc1..81b5854348b 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 e89e28fe1e5..31922d2aab8 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 dd9e89bcef7..0067d68e129 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 61d46e205fa..0a817728393 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 b63b5af05e8..31ef738b3a2 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 377b94eff8b..07a79519745 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 d3e32105f7d..281ef90d42d 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 fe42dd5ddcb..91f6b32cb0a 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 e65306d1501..d6e0cea6eaa 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 9500579e245..168b61085ed 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 cb25b844606..f8e60205e4f 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 e823466f417..da94fed0831 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 a39105c8314..9da588b934d 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 7c0b9208e7c..2c6d1f75a96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4310,17 +4310,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
@@ -4396,11 +4396,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 { };
 
@@ -4424,7 +4424,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 { };
 
@@ -4440,9 +4440,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;
@@ -4535,15 +4535,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 { };
 
@@ -4617,16 +4617,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 { };
@@ -4649,11 +4649,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 { };
 
@@ -4714,6 +4714,32 @@ 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;
@@ -15255,7 +15281,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 6a974efdd2aeadab5e123650e97af27162518c45 Mon Sep 17 00:00:00 2001
From: Shaun Bruce <shaun.bruce@seagate.com>
Date: Wed, 2 Sep 2015 08:15:38 +0000
Subject: [PATCH 1908/2016] Updated atom to 1.0.10

---
 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..c32ab32e9e9 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.10";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "434be52726fed9804ddb8c07dba200d774d145d0a870d2a013b5f95eb882fa7e";
+    sha256 = "16rbp76c46n24a9a3cygg94bx6y7j038h34w4qr7j24aiy5bfzwv";
     name = "${name}.deb";
   };
 

From c54d939d6d7de6cf960ca7dea7b116cf00135aeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 2 Sep 2015 10:26:29 +0200
Subject: [PATCH 1909/2016] freenect: cosmetic (2 space indents)

---
 .../libraries/freenect/default.nix            | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index c79c389128b..d0fba6ed821 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -1,22 +1,23 @@
 { stdenv, fetchzip, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }:
 
 stdenv.mkDerivation rec {
-    name = "freenect-${version}";
-    version = "0.5.2";
-    src = fetchzip {
-        url = "https://github.com/OpenKinect/libfreenect/archive/v${version}.tar.gz";
-        sha256 = "04p4q19fkh97bn7kf0xsk6mrig2aj10i3s9z6hdrr70l6dfpf4w9";
-    };
+  name = "freenect-${version}";
+  version = "0.5.2";
 
-    buildInputs = [ libusb freeglut mesa libXi libXmu ];
-    nativeBuildInputs = [ cmake pkgconfig ];
+  src = fetchzip {
+    url = "https://github.com/OpenKinect/libfreenect/archive/v${version}.tar.gz";
+    sha256 = "04p4q19fkh97bn7kf0xsk6mrig2aj10i3s9z6hdrr70l6dfpf4w9";
+  };
 
-    meta = {
-        description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X";
-        inherit version;
-        homepage = http://openkinect.org;
-        license = with stdenv.lib.licenses; [ gpl2 asl20 ];
-        maintainers = with stdenv.lib.maintainers; [ bennofs ];
-        platforms = stdenv.lib.platforms.linux;
-    };
+  buildInputs = [ libusb freeglut mesa libXi libXmu ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  meta = {
+    description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X";
+    inherit version;
+    homepage = http://openkinect.org;
+    license = with stdenv.lib.licenses; [ gpl2 asl20 ];
+    maintainers = with stdenv.lib.maintainers; [ bennofs ];
+    platforms = stdenv.lib.platforms.linux;
+  };
 }

From 25a29e667141688f780d155f65fd1c65df7f82cb Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 2 Sep 2015 10:34:29 +0200
Subject: [PATCH 1910/2016] pythonPackages.scikitlearn: fix for python2

test_standard_scaler_numerical_stability test fails on all i686 platforms
---
 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 b55503643d9..d16d98d2374 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12672,7 +12672,7 @@ let
       })
     ];
 
-    postPatch = optionalString (stdenv.isi686 && isPy3k) ''
+    postPatch = optionalString stdenv.isi686 ''
       sed -i -e "s|test_standard_scaler_numerical_stability|_skip_test_standard_scaler_numerical_stability|g" sklearn/preprocessing/tests/test_data.py
     '';
 

From 83eed584bf3a544db560283e0986408fb1a0f079 Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS-SSD2)" <kovirobi@gmail.com>
Date: Wed, 2 Sep 2015 09:56:35 +0100
Subject: [PATCH 1911/2016] remind: 3.1.14 -> 3.1.15

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

diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix
index 574178222c6..11d6991b89c 100644
--- a/pkgs/tools/misc/remind/default.nix
+++ b/pkgs/tools/misc/remind/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl} :
 
 stdenv.mkDerivation {
-  name = "remind-3.1.14";
+  name = "remind-3.1.15";
   src = fetchurl {
-    url = http://www.roaringpenguin.com/files/download/remind-03.01.14.tar.gz;
-    sha256 = "1b9ij3r95lf14q6dyh8ilzc3y5yxxc1iss8wj3i49n6zjvklml8a";
+    url = http://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz;
+    sha256 = "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla";
   };
 
   meta = {

From 873a6ce9a86181335e222e481b6c48ce94bbd48c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 2 Sep 2015 11:46:27 +0200
Subject: [PATCH 1912/2016] imagemagickBig: enable ghostscript

---
 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 2c6d1f75a96..8d76a8c11f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11867,11 +11867,11 @@ let
     libxml2 = null;
   };
 
-  imagemagick = callPackage ../applications/graphics/ImageMagick {
+  imagemagick = imagemagickBig.override {
     ghostscript = null;
   };
 
-  imagemagickBig = imagemagick;
+  imagemagickBig = callPackage ../applications/graphics/ImageMagick { };
 
   # Impressive, formerly known as "KeyJNote".
   impressive = callPackage ../applications/office/impressive {

From 6483cf1d91c454e9dfb93de243200f6a677ad4d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 2 Sep 2015 12:14:06 +0200
Subject: [PATCH 1913/2016] ffmpeg-full: align pkgname with attrname
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without this, users are presented with this endless loop:

  $ ffplay
  The program ‘ffplay’ is currently not installed. You can install it by
  typing:
    nix-env -i ffmpeg
  $ nix-env -i ffmpeg
  $ ffplay
  The program ‘ffplay’ is currently not installed. You can install it by
  typing:
    nix-env -i ffmpeg
---
 pkgs/development/libraries/ffmpeg-full/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index dd8a3aef8d4..37e23d4a324 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -230,7 +230,7 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
 assert x11grabExtlib -> libX11 != null && libXv != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-${version}";
+  name = "ffmpeg-full-${version}";
   version = "2.7.2";
 
   src = fetchurl {

From c456073e033fd629a5c524f150da06c2780a0f22 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Sep 2015 12:27:36 +0200
Subject: [PATCH 1914/2016] Disable test suites of Haskell packages RSA and
 kademlia.

Those test suites run for 2+ hours and thus fail with a timeout error.
---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b0b93e2d530..759b1658968 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -89,6 +89,12 @@ self: super: {
   yices-easy = dontDistribute super.yices-easy;
   yices-painless = dontDistribute super.yices-painless;
 
+  # https://github.com/GaloisInc/RSA/issues/9
+  RSA = dontCheck super.RSA;
+
+  # https://github.com/froozen/kademlia/issues/2
+  kademlia = dontCheck super.kademlia;
+
   # Won't find it's header files without help.
   sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
 

From 90c163bde0876837eea388368fa5d90c6f09d0a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Sep 2015 20:31:33 +0200
Subject: [PATCH 1915/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/23452bdddd485c6e43b92c8886a4347d839783e4
 with hackage2nix v20150824-65-g80afb21

---
 .../haskell-modules/hackage-packages.nix      | 219 ++++++++++--------
 1 file changed, 120 insertions(+), 99 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2feabf4a787..dab185b20ea 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5026,8 +5026,8 @@ self: {
     ({ mkDerivation, base, containers, HUnit, parsec }:
      mkDerivation {
        pname = "Folly";
-       version = "0.1.4.6";
-       sha256 = "fabe878ab40e0fe8187ee40e6d4b4d0a83e6b34c42e404f04d2b4afa3e1038f6";
+       version = "0.1.5.2";
+       sha256 = "d91356d28619c50115160d078277104bac9567f099a5b9fd13b0079b7f164e0d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers parsec ];
@@ -5498,6 +5498,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "GPipe-GLFW" = callPackage
+    ({ mkDerivation, base, GLFW-b, GPipe, transformers }:
+     mkDerivation {
+       pname = "GPipe-GLFW";
+       version = "1.0";
+       sha256 = "1d5fbf132f11a5378d19ac31361a0783d0e3dd4324809df4fa0fbabcdbb34b5c";
+       libraryHaskellDepends = [ base GLFW-b GPipe transformers ];
+       homepage = "https://github.com/plredmond/GPipe-GLFW";
+       description = "GLFW OpenGL context creation for GPipe";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "GPipe-TextureLoad" = callPackage
     ({ mkDerivation, base, bitmap, GPipe, stb-image }:
      mkDerivation {
@@ -33558,28 +33570,29 @@ self: {
     ({ mkDerivation, aeson, array, base, bytestring, cmdargs
      , containers, data-stringmap, directory, doctest, executable-path
      , filepath, HTTP, HUnit, json-builder, lens, lens-aeson, mtl
-     , network, network-uri, parsec, process, QuickCheck, split
-     , string-conversions, tasty, tasty-hunit, tasty-th, text
-     , transformers
+     , mtl-compat, network, network-uri, parsec, process, QuickCheck
+     , split, string-conversions, tasty, tasty-hunit, tasty-th, text
+     , transformers, transformers-compat
      }:
      mkDerivation {
        pname = "clafer";
-       version = "0.4.0";
-       sha256 = "f6a58d2a75cb3ff32cad28f7704922bcc596b5ed864e69324cc79cdb38ded2f6";
+       version = "0.4.1";
+       sha256 = "e3015519a90073e986ed67ba753384b536d9d02652c34aa1195adb6f7e12c0d0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson array base bytestring cmdargs containers data-stringmap
          directory executable-path filepath HTTP json-builder lens
-         lens-aeson mtl network network-uri parsec process split
-         string-conversions text transformers
+         lens-aeson mtl mtl-compat network network-uri parsec process split
+         string-conversions text transformers transformers-compat
        ];
        executableHaskellDepends = [
          base cmdargs containers filepath mtl process split
        ];
        testHaskellDepends = [
          base containers data-stringmap directory doctest filepath HUnit
-         lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th
+         lens lens-aeson mtl mtl-compat QuickCheck tasty tasty-hunit
+         tasty-th transformers-compat
        ];
        homepage = "http://clafer.org";
        description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
@@ -33590,29 +33603,31 @@ self: {
   "claferIG" = callPackage
     ({ mkDerivation, array, base, clafer, cmdargs, containers
      , data-stringmap, directory, executable-path, filepath, haskeline
-     , HaXml, HUnit, json-builder, mtl, parsec, process
+     , HaXml, HUnit, json-builder, mtl, mtl-compat, parsec, process
      , string-conversions, tasty, tasty-hunit, tasty-th, transformers
+     , transformers-compat
      }:
      mkDerivation {
        pname = "claferIG";
-       version = "0.4.0";
-       sha256 = "dca649803fdbe55b282bb2dd033253cc543d6d59615276b120a1f1f061ad3406";
+       version = "0.4.1";
+       sha256 = "e804d364884837730b91c46f9dcfa8b39ea7438e9bbd3a810676ba635b6caf33";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base clafer containers data-stringmap directory
-         executable-path filepath haskeline HaXml json-builder mtl parsec
-         process string-conversions transformers
+         executable-path filepath haskeline HaXml json-builder mtl
+         mtl-compat parsec process string-conversions transformers
+         transformers-compat
        ];
        executableHaskellDepends = [
          base clafer cmdargs containers directory executable-path filepath
-         haskeline mtl transformers
+         haskeline mtl mtl-compat transformers transformers-compat
        ];
        testHaskellDepends = [
          array base clafer cmdargs directory filepath HUnit tasty
-         tasty-hunit tasty-th transformers
+         tasty-hunit tasty-th transformers transformers-compat
        ];
-       homepage = "https://github.com/gsdlab/claferIG";
+       homepage = "http://clafer.org";
        description = "claferIG is an interactive tool that generates instances of Clafer models";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33621,15 +33636,16 @@ self: {
   "claferwiki" = callPackage
     ({ mkDerivation, base, clafer, containers, directory, gitit
      , MissingH, mtl, network, network-uri, process, SHA, split, time
-     , transformers, utf8-string
+     , transformers, transformers-compat, utf8-string
      }:
      mkDerivation {
        pname = "claferwiki";
-       version = "0.4.0";
-       sha256 = "d0b71d5568ad523fdd4f911c820719f2e00ce05f919cb4d24ffbc002efa7c0c6";
+       version = "0.4.1";
+       sha256 = "d61f2b7effa17209ab106a90f83ab6afdcea65e1da330bb2d387441d4ec80eb3";
        libraryHaskellDepends = [
          base clafer containers directory gitit MissingH mtl network
-         network-uri process SHA split time transformers utf8-string
+         network-uri process SHA split time transformers transformers-compat
+         utf8-string
        ];
        homepage = "http://github.com/gsdlab/claferwiki";
        description = "A wiki-based IDE for literate modeling with Clafer";
@@ -56643,6 +56659,7 @@ self: {
        libraryHaskellDepends = [ array base containers ghc hpc ];
        description = "Generic GHC Plugin for annotating Haskell code with source location data";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
      }) {};
 
   "ghc-syb" = callPackage
@@ -66249,8 +66266,8 @@ self: {
      }:
      mkDerivation {
        pname = "haste-compiler";
-       version = "0.5.0.1";
-       sha256 = "00ceeb7f2b6e7f98a5b8db08f27e5d05013412ec7f8a4df603ef7707e5cc7892";
+       version = "0.5.1.2";
+       sha256 = "106f844a4ffef0a8b0af954b369bf052c434e1713aa8bdde3d3c3ebc53046b4c";
        configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
@@ -66267,7 +66284,6 @@ self: {
          random shellmate system-fileio tar terminfo transformers unix
          utf8-string
        ];
-       jailbreak = true;
        homepage = "http://haste-lang.org/";
        description = "Haskell To ECMAScript compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -72263,8 +72279,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.6.0";
-       sha256 = "cae208d9d8617d45e999fc61fb9e8e3aba0cb38f98d0f00c96c9aa03a09f35b0";
+       version = "0.7.0";
+       sha256 = "0fb66876b61d665d27f37a2bcbc7c8c2601caec6221d754e9a871311591f6983";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72755,7 +72771,7 @@ self: {
        homepage = "http://github.com/paulrzcz/hquantlib.git";
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "hquery" = callPackage
@@ -79226,8 +79242,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell";
-       version = "0.7.0.3";
-       sha256 = "f2df05336dae36d05ffb25f993fab51ccb727f83adb290b83ab251384e8b2e80";
+       version = "0.7.1.0";
+       sha256 = "d36584780949283a606086837abe4d2948d9be6aef01591242b34b4499fded90";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81273,18 +81289,18 @@ self: {
 
   "ipython-kernel" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
-     , directory, filepath, mtl, parsec, SHA, tar, text, transformers
-     , uuid, zeromq4-haskell
+     , directory, filepath, mtl, parsec, process, SHA, temporary, text
+     , transformers, uuid, zeromq4-haskell
      }:
      mkDerivation {
        pname = "ipython-kernel";
-       version = "0.7.0.0";
-       sha256 = "17acfb6ac18e23a85b3fe3324af946439bf0bd886eaf5613d94c027a903174d7";
+       version = "0.8.0.0";
+       sha256 = "b5c762842b79536bdb405134de22219198215c4b8634d23372354b035308215d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring cereal containers directory filepath mtl SHA
-         tar text transformers uuid zeromq4-haskell
+         aeson base bytestring cereal containers directory filepath mtl
+         process SHA temporary text transformers uuid zeromq4-haskell
        ];
        executableHaskellDepends = [
          base filepath mtl parsec text transformers
@@ -81380,8 +81396,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "1.1.1";
-       sha256 = "9f8e78db1aacf1e74df042e951335277be5bf25e01d1206d119470b451dcd2eb";
+       version = "1.1.1.1";
+       sha256 = "0cdfaf79a670732f579320b2e9668e55d086428b3bbb686220914508e604fdc3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86826,7 +86842,7 @@ self: {
        homepage = "https://github.com/mnacamura/learning-hmm";
        description = "Yet another library for hidden Markov models";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "leetify" = callPackage
@@ -88908,9 +88924,9 @@ self: {
   "liquid-fixpoint" = callPackage
     ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors
      , bytestring, cmdargs, containers, deepseq, directory, filemanip
-     , filepath, ghc-prim, hashable, intern, mtl, parsec, pretty
+     , filepath, ghc-prim, hashable, intern, mtl, ocaml, parsec, pretty
      , process, syb, tasty, tasty-hunit, tasty-rerun, text, text-format
-     , transformers, unordered-containers
+     , transformers, unordered-containers, z3
      }:
      mkDerivation {
        pname = "liquid-fixpoint";
@@ -88918,6 +88934,7 @@ self: {
        sha256 = "7414b580a3ec8185da5e5148b46cef5d15e347080eb2561fcd228c72e7669816";
        revision = "2";
        editedCabalFile = "10397e387d91256dcd35cae36cb27ae302418c3c80da6e65d417657783beaf6b";
+       configureFlags = [ "-fbuild-external" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -88931,14 +88948,16 @@ self: {
          deepseq directory filepath hashable mtl parsec pretty process syb
          text text-format unordered-containers
        ];
+       executableSystemDepends = [ ocaml ];
        testHaskellDepends = [
          base directory filepath process tasty tasty-hunit tasty-rerun text
        ];
+       testSystemDepends = [ z3 ];
        homepage = "https://github.com/ucsd-progsys/liquid-fixpoint";
        description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
+     }) {inherit (pkgs) ocaml; inherit (pkgs) z3;};
 
   "liquidhaskell" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base, bifunctors
@@ -88947,7 +88966,7 @@ self: {
      , ghc-paths, hashable, hpc, hscolour, intern, liquid-fixpoint, mtl
      , optparse-applicative, parsec, pretty, process, stm, syb, tagged
      , tasty, tasty-hunit, tasty-rerun, template-haskell, text, time
-     , transformers, unordered-containers, vector
+     , transformers, unordered-containers, vector, z3
      }:
      mkDerivation {
        pname = "liquidhaskell";
@@ -88973,11 +88992,12 @@ self: {
          base containers directory filepath mtl optparse-applicative process
          stm tagged tasty tasty-hunit tasty-rerun transformers
        ];
+       testSystemDepends = [ z3 ];
        homepage = "http://goto.ucsd.edu/liquidhaskell";
        description = "Liquid Types for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
+     }) {inherit (pkgs) z3;};
 
   "lispparser" = callPackage
     ({ mkDerivation, base, parsec }:
@@ -89755,6 +89775,7 @@ self: {
        homepage = "http://github.com/gridaphobe/located-base";
        description = "Location-aware variants of partial functions";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
      }) {};
 
   "locators" = callPackage
@@ -97652,17 +97673,15 @@ self: {
 
   "nagios-check" = callPackage
     ({ mkDerivation, base, bifunctors, exceptions, hspec, mtl
-     , nagios-perfdata, QuickCheck, text
+     , QuickCheck, text
      }:
      mkDerivation {
        pname = "nagios-check";
-       version = "0.3.1";
-       sha256 = "4c20ce048e51ea80ffb055e00374a91a98a9d9202ab302ec60b232e3851d9c9f";
-       libraryHaskellDepends = [
-         base bifunctors exceptions mtl nagios-perfdata text
-       ];
+       version = "0.3.2";
+       sha256 = "1bc9b85cb10c396943d53c44e2701c5bc2a02ecdf3e8f46da238981f8b7860b7";
+       libraryHaskellDepends = [ base bifunctors exceptions mtl text ];
        testHaskellDepends = [ base hspec QuickCheck text ];
-       homepage = "https://github.com/fractalcat/haskell-nagios-check";
+       homepage = "https://github.com/olorin/haskell-nagios-check";
        description = "Package for writing monitoring plugins";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -101425,14 +101444,15 @@ self: {
 
   "opaleye" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
-     , case-insensitive, containers, contravariant, postgresql-simple
-     , pretty, product-profunctors, profunctors, QuickCheck, semigroups
-     , text, time, time-locale-compat, transformers, uuid, void
+     , case-insensitive, containers, contravariant, multiset
+     , postgresql-simple, pretty, product-profunctors, profunctors
+     , QuickCheck, semigroups, text, time, time-locale-compat
+     , transformers, uuid, void
      }:
      mkDerivation {
        pname = "opaleye";
-       version = "0.4.0.0";
-       sha256 = "3387a369f811a73d5a2be9b57827ade2a6275b56e4e02da365185e918befeeb7";
+       version = "0.4.1.0";
+       sha256 = "eca2210c89f76ddcc01c927d317fe58b212a446bffd3d61264a52056edcb91eb";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -101440,8 +101460,8 @@ self: {
          uuid void
        ];
        testHaskellDepends = [
-         base containers contravariant postgresql-simple product-profunctors
-         profunctors QuickCheck semigroups time
+         base containers contravariant multiset postgresql-simple
+         product-profunctors profunctors QuickCheck semigroups time
        ];
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
@@ -105019,8 +105039,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mysql";
-       version = "2.2";
-       sha256 = "e9bb569739cb268b6a6895490ce4235bc789cd1fddc98ac3ac79cac7b7930a26";
+       version = "2.3";
+       sha256 = "c4d24a212698b78bd25fb9c8024291f0f4914cd76dbbac00c629abc7f64d4342";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger mysql mysql-simple persistent resourcet
@@ -107475,8 +107495,8 @@ self: {
      }:
      mkDerivation {
        pname = "pontarius-xmpp";
-       version = "0.4.2.2";
-       sha256 = "9bfdb948d425f7628c67ca3a5c57c23e971852e92904a509377aa8df36c82bcf";
+       version = "0.4.3";
+       sha256 = "b8f6dd052e2b494f01cafa2613510ef8a62b8fad6a445fe0fd60723fbca388db";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
@@ -117899,8 +117919,8 @@ self: {
      }:
      mkDerivation {
        pname = "scalpel";
-       version = "0.2.1";
-       sha256 = "e061abe1b6015818461fbdcacc91509575af8865bea5d024eb4b4f74e23d6a53";
+       version = "0.2.1.1";
+       sha256 = "fdcad5f9b1b98e0a8720317fe20b8a696efcdda88f7384dc8e579dd026a17ad6";
        libraryHaskellDepends = [
          base bytestring curl regex-base regex-tdfa tagsoup text
        ];
@@ -120742,8 +120762,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-language-c";
-       version = "0.8.0";
-       sha256 = "65d408c47b622ef0cce3f1c17faa0ab67457a1268941db0ce83ebe7c5988feac";
+       version = "0.8.1";
+       sha256 = "707631799b102d375610a4b5bff567c8ad5b62e36616d162bac1ca8617915073";
        libraryHaskellDepends = [
          base data-default-class fclabels process shake split
          unordered-containers
@@ -125732,7 +125752,7 @@ self: {
        homepage = "https://github.com/yanatan16/haskell-spsa";
        description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "spy" = callPackage
@@ -126493,8 +126513,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-sandbox";
-       version = "0.1.5";
-       sha256 = "daaeafd7c23148eec97dc23e1a94fa76d4b6972268b7ff4e3a5b13fb3517b134";
+       version = "0.1.6";
+       sha256 = "ade45f67b92175869594e64e68f3076feba3b50e863b8b588cff69310def1bdb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -128385,21 +128405,21 @@ self: {
      }) {};
 
   "subhask" = callPackage
-    ({ mkDerivation, approximate, base, bloomfilter, bytes, bytestring
-     , cassava, containers, deepseq, erf, gamma, ghc-prim, hmatrix
-     , hyperloglog, lens, monad-primitive, MonadRandom, mtl, parallel
-     , pipes, primitive, QuickCheck, semigroups, template-haskell
+    ({ mkDerivation, approximate, array, base, bloomfilter, bytes
+     , bytestring, cassava, containers, deepseq, erf, gamma, ghc-prim
+     , hmatrix, hyperloglog, lens, monad-primitive, MonadRandom, mtl
+     , parallel, primitive, QuickCheck, semigroups, template-haskell
      , test-framework, test-framework-quickcheck2, vector
      }:
      mkDerivation {
        pname = "subhask";
-       version = "0.1.0.1";
-       sha256 = "1559bd6c7322281cb43ce988715e57ec91f4795da3abddf9a92967c55835229f";
+       version = "0.1.1.0";
+       sha256 = "c3e5a727ed988acb4c2a1083136be2faead19bef252345b12695d5050cddc791";
        libraryHaskellDepends = [
-         approximate base bloomfilter bytes bytestring cassava containers
-         deepseq erf gamma ghc-prim hmatrix hyperloglog lens monad-primitive
-         MonadRandom mtl parallel pipes primitive QuickCheck semigroups
-         template-haskell vector
+         approximate array base bloomfilter bytes bytestring cassava
+         containers deepseq erf gamma ghc-prim hmatrix hyperloglog lens
+         monad-primitive MonadRandom mtl parallel primitive QuickCheck
+         semigroups template-haskell vector
        ];
        testHaskellDepends = [
          base test-framework test-framework-quickcheck2
@@ -130567,11 +130587,12 @@ self: {
      , liquid-fixpoint, liquidhaskell, mtl, pretty, process, QuickCheck
      , syb, tagged, tasty, tasty-hunit, template-haskell, text
      , text-format, th-lift, transformers, unordered-containers, vector
+     , z3
      }:
      mkDerivation {
        pname = "target";
-       version = "0.2.0.0";
-       sha256 = "249c5936784131d4a114dbfe920aa5dca38b1116b64138273af31710e68b735b";
+       version = "0.2.0.1";
+       sha256 = "a6366a2eddf278e368ec6b49c7aa483433fad6d473d5bc1751c0049ccd1a98cb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130586,10 +130607,11 @@ self: {
          liquidhaskell mtl tagged tasty tasty-hunit template-haskell
          unordered-containers
        ];
+       testSystemDepends = [ z3 ];
        description = "Generate test-suites from refinement types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
+     }) {inherit (pkgs) z3;};
 
   "task" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
@@ -133592,10 +133614,9 @@ self: {
     ({ mkDerivation, base, deepseq, time }:
      mkDerivation {
        pname = "tiempo";
-       version = "0.0.1.0";
-       sha256 = "19a5844015557eff08088469395fe3593021d2c027c607eb1f7fd8c5788caabe";
+       version = "0.0.1.1";
+       sha256 = "a8b04eef8e1eca0a496410eb82289345c2060be8726b09f5f4b0242d9ffe4a8e";
        libraryHaskellDepends = [ base deepseq time ];
-       jailbreak = true;
        homepage = "http://github.com/HaskVan/tiempo";
        description = "Specify time intervals in different units (secs, mins, hours, etc.)";
        license = stdenv.lib.licenses.mit;
@@ -139813,8 +139834,8 @@ self: {
     ({ mkDerivation, base, time }:
      mkDerivation {
        pname = "varying";
-       version = "0.1.1.2";
-       sha256 = "044d0321b199cadb2b8d28edcadfcab4a48708eb49ad27e1c3baf206eb736041";
+       version = "0.1.3.0";
+       sha256 = "c07d54d7263df225f76f4e4b3ce19b962edabf1bef6b93ea571fca4a1d004888";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base time ];
@@ -140578,7 +140599,7 @@ self: {
        ];
        description = "An MPD client with vim-like key bindings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {inherit (pkgs) ncurses;};
 
   "vintage-basic" = callPackage
@@ -141586,7 +141607,7 @@ self: {
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "wai-middleware-etag" = callPackage
@@ -147008,17 +147029,17 @@ self: {
     ({ mkDerivation, base, blaze-html, blaze-markup, conduit
      , conduit-extra, containers, either, email-validate
      , lens-family-core, lens-family-th, MonadRandom, mtl, persistent
-     , shakespeare, text, time, transformers, yesod-core, yesod-form
-     , yesod-markdown
+     , shakespeare, text, time, transformers, yaml, yesod-core
+     , yesod-form, yesod-markdown
      }:
      mkDerivation {
        pname = "yesod-bootstrap";
-       version = "0.1.0.0";
-       sha256 = "eff7662f9cc62d97922f947505b1200ac1909fad7d954c668aba6a0d66601fa6";
+       version = "0.2";
+       sha256 = "d99b97f9ebef228039b9c48725dbf5e610389d99ce7b3f39673741339927c5bd";
        libraryHaskellDepends = [
          base blaze-html blaze-markup conduit conduit-extra containers
          either email-validate lens-family-core lens-family-th MonadRandom
-         mtl persistent shakespeare text time transformers yesod-core
+         mtl persistent shakespeare text time transformers yaml yesod-core
          yesod-form yesod-markdown
        ];
        description = "Bootstrap widgets for yesod";
@@ -148738,8 +148759,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "zalgo";
-       version = "0.1.1.0";
-       sha256 = "9d102c28680942c8c2e1b1636723b31b8af7459e9946e39c771691b66e1dc1ad";
+       version = "0.2.0.0";
+       sha256 = "5f63a88038ee13dd594907b3591ea2747a563f2a591294b7285a9db83539bf5b";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/mniip/zalgo";
        description = "Z-algorithm implemented on haskell's built-in cons-cell-based lists";

From c310a5f608d08995afefad0170786551cc4d0d8f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Sep 2015 12:52:41 +0200
Subject: [PATCH 1916/2016] all-packages.nix: instantiate 'perlPackages' with
 callPackage rather than import

This allows us to override the attributes passed to the package set, which is
needed to pass "imagemagickBig" to PerlMagic rather than the normal one (see
next commit).

This patch is brought to you courtesy of the venerable @vcunat.
---
 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 8d76a8c11f0..958a428e196 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8738,7 +8738,7 @@ let
 
   buildPerlPackage = import ../development/perl-modules/generic perl;
 
-  perlPackages = recurseIntoAttrs (import ./perl-packages.nix {
+  perlPackages = recurseIntoAttrs (callPackage ./perl-packages.nix {
     inherit pkgs;
     overrides = (config.perlPackageOverrides or (p: {})) pkgs;
   });

From 614ed1e1adaa418337a2e5261d7f0dfe23f13a28 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Sep 2015 12:55:24 +0200
Subject: [PATCH 1917/2016] ikiwiki: use PerlMagick with imagemagickBig rather
 than the light version

Ikiwiki needs a version of PerlMagick that has ghostscript to fix
https://github.com/NixOS/nixpkgs/issues/9473.

This patch is brought to you courtesy of the venerable @vcunat.
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 958a428e196..6b9a82edf33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11845,8 +11845,9 @@ let
   ikiwiki = callPackage ../applications/misc/ikiwiki {
     inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
       HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext
-      RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree Filechdir
+      RpcXML XMLSimple YAML YAMLLibYAML HTMLTree Filechdir
       AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay;
+    inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;
   };
 
   imagemagick_light = imagemagick.override {

From bd84ebaa1e0359f41350e053ed24592b169b5714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 2 Sep 2015 13:18:09 +0200
Subject: [PATCH 1918/2016] nixos: document nvidia legacy driver options

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

diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index 95e66f0c70c..7f43acab2c3 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -61,6 +61,12 @@ by default because it’s not free software.  You can enable it as follows:
 <programlisting>
 services.xserver.videoDrivers = [ "nvidia" ];
 </programlisting>
+Or if you have an older card, you may have to use one of the legacy drivers:
+<programlisting>
+services.xserver.videoDrivers = [ "nvidiaLegacy340" ];
+services.xserver.videoDrivers = [ "nvidiaLegacy304" ];
+services.xserver.videoDrivers = [ "nvidiaLegacy173" ];
+</programlisting>
 You may need to reboot after enabling this driver to prevent a clash
 with other kernel modules.</para>
 

From 6c377c864a175da6a30160c0274071b4db5ba897 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 2 Sep 2015 16:00:55 +0200
Subject: [PATCH 1919/2016] cassandra: 2.1.8 -> 2.1.9

The 2.1.8 sources have been removed upstream.
---
 pkgs/servers/nosql/cassandra/2.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index dd06d946128..9869682ae8a 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -11,8 +11,8 @@
 
 let
 
-  version = "2.1.8";
-  sha256 = "1x92nw81pa4s95lv9qj42p05ry3ajk8klsqgc30zv7sjzm7cc31s";
+  version = "2.1.9";
+  sha256 = "10nwh7kx4k0kkfvl3sf22v3x58q37b81lkr6s6gvzkq67f6mjcvs";
 
 in
 

From e70f8c58cc145cc2dd833388a3279988ec5b44d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2015 15:38:06 +0200
Subject: [PATCH 1920/2016] Manual: Document system.autoUpgrade

---
 nixos/doc/manual/installation/upgrading.xml | 26 +++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index 5a9d1f24f7c..c4812cc637c 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -107,4 +107,30 @@ newer Nix version, which may involve an upgrade of Nix’s database
 schema.  This cannot be undone easily, so in that case you will not be
 able to go back to your original channel.</para></warning>
 
+
+<section><title>Automatic Upgrades</title>
+
+<para>You can keep a NixOS system up-to-date automatically by adding
+the following to <filename>configuration.nix</filename>:
+
+<programlisting>
+system.autoUpgrade.enable = true;
+</programlisting>
+
+This enables a periodically executed systemd service named
+<literal>nixos-upgrade.service</literal>. It runs
+<command>nixos-rebuild switch --upgrade</command> to upgrade NixOS to
+the latest version in the current channel. (To see when the service
+runs, see <command>systemctl list-timers</command>.)  You can also
+specify a channel explicitly, e.g.
+
+<programlisting>
+system.autoUpgrade.channel = https://nixos.org/channels/nixos-15.09;
+</programlisting>
+
+</para>
+
+</section>
+
+
 </chapter>

From 6e767657951788775451859f1c36d4eb0230581c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2015 16:09:05 +0200
Subject: [PATCH 1921/2016] If !cfg.mutableUsers, require a password or SSH
 authorized key

Fixes https://github.com/NixOS/nixpkgs/issues/7308
---
 nixos/modules/config/users-groups.nix | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 478f433b431..776c482bf7f 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -216,7 +216,7 @@ let
           exist. If <option>users.mutableUsers</option> is true, the
           password can be changed subsequently using the
           <command>passwd</command> command. Otherwise, it's
-          equivalent to setting the <option>password</option> option.
+          equivalent to setting the <option>hashedPassword</option> option.
 
           ${hashedPasswordDescription}
         '';
@@ -525,6 +525,27 @@ in {
       { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique);
         message = "UIDs and GIDs must be unique!";
       }
+      { # If mutableUsers is false, to prevent users creating a
+        # configuration that locks them out of the system, ensure that
+        # there is at least one "privileged" account that has a
+        # password or an SSH authorized key. Privileged accounts are
+        # root and users in the wheel group.
+        assertion = !cfg.mutableUsers ->
+          any id (mapAttrsToList (name: cfg:
+            (name == "root"
+             || cfg.group == "wheel"
+             || elem "wheel" cfg.extraGroups)
+            &&
+            ((cfg.hashedPassword != null && cfg.hashedPassword != "!")
+             || cfg.password != null
+             || cfg.passwordFile != null
+             || cfg.openssh.authorizedKeys.keys != []
+             || cfg.openssh.authorizedKeys.keyFiles != [])
+          ) cfg.extraUsers);
+        message = ''
+          Neither the root account nor any wheel user has a password or SSH authorized key.
+          You must set one to prevent being locked out of your system.'';
+      }
     ];
 
   };

From 07542d12eaf344c7e0c7b9e9735826eecba607c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Sep 2015 16:24:06 +0200
Subject: [PATCH 1922/2016] hoogle: use $NIX_BUILD_CORES to determine the
 proper level of parallelism for database creation

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

diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index e2f6c289a80..14464ceca80 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
     echo building hoogle database
     # FIXME: rehoo is marked as depricated on Hackage
     chmod 644 *.hoo *.txt
-    rehoo -j4 -c64 .
+    rehoo -j$NIX_BUILD_CORES -c64 .
 
     mv default.hoo .x
     rm -fr downloads *.dep *.txt *.hoo

From dc5bf39bfe5bfb14d2cf03ec7fad92dfed726257 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Sep 2015 16:51:35 +0200
Subject: [PATCH 1923/2016] haskell-generic-builder: improve meta.platforms vs.
 meta.hydraPlatforms logic

hydraPlatforms now defaults to the value of meta.platforms rather than
defaulting to ghc.meta.hydraPlatforms. This solution is, in fact, still
sub-optimal. See https://github.com/NixOS/nixpkgs/issues/9608 for further
details.
---
 pkgs/development/haskell-modules/generic-builder.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index c04d8fdb409..3442e873080 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -22,7 +22,8 @@
 , enableStaticLibraries ? true
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
 , homepage ? "http://hackage.haskell.org/package/${pname}"
-, hydraPlatforms ? ghc.meta.hydraPlatforms or ghc.meta.platforms
+, platforms ? ghc.meta.platforms
+, hydraPlatforms ? platforms
 , hyperlinkSource ? true
 , isExecutable ? false, isLibrary ? !isExecutable
 , jailbreak ? false
@@ -31,7 +32,6 @@
 , doHaddock ? !stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8"
 , passthru ? {}
 , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? []
-, platforms ? ghc.meta.platforms
 , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
 , testTarget ? ""
 , broken ? false

From 14321ae2431e33f5ed81f1ee43eddd29c7e9d01d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2015 17:32:38 +0200
Subject: [PATCH 1924/2016] Rename users.extraUsers -> users.users,
 users.extraGroup -> users.groups

The "extra" part hasn't made sense for years.
---
 nixos/modules/config/users-groups.nix         | 32 +++++++++----------
 nixos/modules/rename.nix                      |  2 ++
 .../modules/services/networking/ssh/sshd.nix  |  2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 776c482bf7f..adc014eed41 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -336,13 +336,13 @@ let
     map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n")
       user.subUidRanges);
 
-  subuidFile = concatStrings (map mkSubuidEntry (attrValues cfg.extraUsers));
+  subuidFile = concatStrings (map mkSubuidEntry (attrValues cfg.users));
 
   mkSubgidEntry = user: concatStrings (
     map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n")
         user.subGidRanges);
 
-  subgidFile = concatStrings (map mkSubgidEntry (attrValues cfg.extraUsers));
+  subgidFile = concatStrings (map mkSubgidEntry (attrValues cfg.users));
 
   idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }:
     let
@@ -354,8 +354,8 @@ let
       else { dup = false; acc = newAcc; }
     ) { dup = false; acc = {}; } (builtins.attrNames set)).dup;
 
-  uidsAreUnique = idsAreUnique (filterAttrs (n: u: u.uid != null) cfg.extraUsers) "uid";
-  gidsAreUnique = idsAreUnique (filterAttrs (n: g: g.gid != null) cfg.extraGroups) "gid";
+  uidsAreUnique = idsAreUnique (filterAttrs (n: u: u.uid != null) cfg.users) "uid";
+  gidsAreUnique = idsAreUnique (filterAttrs (n: g: g.gid != null) cfg.groups) "gid";
 
   spec = pkgs.writeText "users-groups.json" (builtins.toJSON {
     inherit (cfg) mutableUsers;
@@ -364,13 +364,13 @@ let
           name uid group description home shell createHome isSystemUser
           password passwordFile hashedPassword
           initialPassword initialHashedPassword;
-      }) cfg.extraUsers;
+      }) cfg.users;
     groups = mapAttrsToList (n: g:
       { inherit (g) name gid;
         members = g.members ++ (mapAttrsToList (n: u: u.name) (
-          filterAttrs (n: u: elem g.name u.extraGroups) cfg.extraUsers
+          filterAttrs (n: u: elem g.name u.extraGroups) cfg.users
         ));
-      }) cfg.extraGroups;
+      }) cfg.groups;
   });
 
 in {
@@ -388,10 +388,10 @@ in {
         <literal>groupadd</literal> commands. On system activation, the
         existing contents of the <literal>/etc/passwd</literal> and
         <literal>/etc/group</literal> files will be merged with the
-        contents generated from the <literal>users.extraUsers</literal> and
-        <literal>users.extraGroups</literal> options.
+        contents generated from the <literal>users.users</literal> and
+        <literal>users.groups</literal> options.
         The initial password for a user will be set
-        according to <literal>users.extraUsers</literal>, but existing passwords
+        according to <literal>users.users</literal>, but existing passwords
         will not be changed.
 
         <warning><para>
@@ -399,7 +399,7 @@ in {
         group files will simply be replaced on system activation. This also
         holds for the user passwords; all changed
         passwords will be reset according to the
-        <literal>users.extraUsers</literal> configuration on activation.
+        <literal>users.users</literal> configuration on activation.
         </para></warning>
       '';
     };
@@ -412,7 +412,7 @@ in {
       '';
     };
 
-    users.extraUsers = mkOption {
+    users.users = mkOption {
       default = {};
       type = types.loaOf types.optionSet;
       example = {
@@ -433,7 +433,7 @@ in {
       options = [ userOpts ];
     };
 
-    users.extraGroups = mkOption {
+    users.groups = mkOption {
       default = {};
       example =
         { students.gid = 1001;
@@ -461,7 +461,7 @@ in {
 
   config = {
 
-    users.extraUsers = {
+    users.users = {
       root = {
         uid = ids.uids.root;
         description = "System administrator";
@@ -478,7 +478,7 @@ in {
       };
     };
 
-    users.extraGroups = {
+    users.groups = {
       root.gid = ids.gids.root;
       wheel.gid = ids.gids.wheel;
       disk.gid = ids.gids.disk;
@@ -541,7 +541,7 @@ in {
              || cfg.passwordFile != null
              || cfg.openssh.authorizedKeys.keys != []
              || cfg.openssh.authorizedKeys.keyFiles != [])
-          ) cfg.extraUsers);
+          ) cfg.users);
         message = ''
           Neither the root account nor any wheel user has a password or SSH authorized key.
           You must set one to prevent being locked out of your system.'';
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 6f7dcb837a0..cb378b02449 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -77,6 +77,8 @@ in zipModules ([]
 ++ obsolete [ "environment" "nix" ] [ "nix" "package" ]
 ++ obsolete [ "fonts" "enableFontConfig" ] [ "fonts" "fontconfig" "enable" ]
 ++ obsolete [ "fonts" "extraFonts" ] [ "fonts" "fonts" ]
+++ alias [ "users" "extraUsers" ] [ "users" "users" ]
+++ alias [ "users" "extraGroups" ] [ "users" "groups" ]
 
 ++ obsolete [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ]
 ++ obsolete [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 4c7e4d8d088..5baea4bc6ae 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -214,7 +214,7 @@ in
 
     };
 
-    users.extraUsers = mkOption {
+    users.users = mkOption {
       options = [ userOptions ];
     };
 

From 13532ee161c4f0b2d26365bf94403f48a4ada8c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2015 17:40:19 +0200
Subject: [PATCH 1925/2016] command-not-found: Use attribute name

---
 .../modules/programs/command-not-found/command-not-found.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl
index 916649059d3..621b79d1654 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.pl
+++ b/nixos/modules/programs/command-not-found/command-not-found.pl
@@ -30,11 +30,11 @@ The program ‘$program’ is currently not installed. It is provided by
 the package ‘$package’, which I will now install for you.
 EOF
         ;
-        exit 126 if system("nix-env", "-i", $package) == 0;
+        exit 126 if system("nix-env", "-iA", $package) == 0;
     } else {
         print STDERR <<EOF;
 The program ‘$program’ is currently not installed. You can install it by typing:
-  nix-env -i $package
+  nix-env -iA $package
 EOF
     }
 } else {
@@ -42,7 +42,7 @@ EOF
 The program ‘$program’ is currently not installed. It is provided by
 several packages. You can install it by typing one of the following:
 EOF
-    print STDERR "  nix-env -i $_->{package}\n" foreach @$res;
+    print STDERR "  nix-env -iA $_->{package}\n" foreach @$res;
 }
 
 exit 127;

From ada81b80fd638724a0aa5800762d7f4b6a4e344b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Sep 2015 17:29:20 +0200
Subject: [PATCH 1926/2016] cabal2nix: update to version 20150824-66-gd281a60

This patch fixes https://github.com/NixOS/nixpkgs/issues/9599.
---
 .../haskell-modules/configuration-common.nix  |  6 +-
 .../tools/haskell/cabal2nix/cabal2nix.nix     | 37 ++++++++++++
 .../tools/haskell/cabal2nix/default.nix       | 56 -------------------
 .../cabal2nix/distribution-nixpkgs.nix        | 33 +++++++++++
 .../tools/haskell/cabal2nix/hackage2nix.nix   | 32 +++++++++++
 .../tools/haskell/cabal2nix/language-nix.nix  | 23 ++++++++
 .../cabal2nix/lens-construction-helper.nix    | 18 ++++++
 7 files changed, 148 insertions(+), 57 deletions(-)
 create mode 100644 pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
 delete mode 100644 pkgs/development/tools/haskell/cabal2nix/default.nix
 create mode 100644 pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
 create mode 100644 pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
 create mode 100644 pkgs/development/tools/haskell/cabal2nix/language-nix.nix
 create mode 100644 pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 759b1658968..6c602627fe7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -754,7 +754,11 @@ self: super: {
   zlib = dontCheck super.zlib;
 
   # Override the obsolete version from Hackage with our more up-to-date copy.
-  cabal2nix = self.callPackage ../tools/haskell/cabal2nix {};
+  cabal2nix = self.callPackage ../tools/haskell/cabal2nix/cabal2nix.nix {};
+  hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {};
+  lens-construction-helper = self.callPackage ../tools/haskell/cabal2nix/lens-construction-helper.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
   HGamer3D-Bullet-Binding = dontDistribute super.HGamer3D-Bullet-Binding;
diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
new file mode 100644
index 00000000000..c12cd2cfce2
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
@@ -0,0 +1,37 @@
+{ mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs
+, language-nix, lens, lens-construction-helper, optparse-applicative, pretty
+, pretty-show, stdenv, fetchFromGitHub, nix-prefetch-scripts, makeWrapper
+}:
+
+mkDerivation rec {
+  pname = "cabal2nix";
+  version = "20150824-66-gd281a60";
+  src = fetchFromGitHub {
+    owner = "nixos";
+    repo = "cabal2nix";
+    rev = "v${version}";
+    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
+  };
+  postUnpack = "sourceRoot+=/${pname}";
+  isLibrary = false;
+  isExecutable = true;
+  enableSharedExecutables = false;
+  executableHaskellDepends = [
+    ansi-wl-pprint base Cabal containers distribution-nixpkgs
+    language-nix lens lens-construction-helper optparse-applicative
+    pretty pretty-show
+  ];
+  executableToolDepends = [ makeWrapper ];
+  postInstall = ''
+    exe=$out/libexec/${pname}-${version}/${pname}
+    install -D $out/bin/${pname} $exe
+    rm -rf $out/{bin,lib,share}
+    makeWrapper $exe $out/bin/${pname} --prefix PATH ":" "${nix-prefetch-scripts}/bin"
+    mkdir -p $out/share/bash-completion/completions
+    $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${pname}
+  '';
+  homepage = "https://github.com/nixos/cabal2nix#readme";
+  description = "Convert Cabal files into Nix build instructions";
+  license = stdenv.lib.licenses.bsd3;
+  maintainers = with stdenv.lib.maintainers; [ simons ];
+}
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
deleted file mode 100644
index eb0a7c5add9..00000000000
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ mkDerivation, fetchgit, aeson, ansi-wl-pprint, base, bytestring, Cabal
-, containers, deepseq, deepseq-generics, directory, doctest, filepath
-, hackage-db, hspec, lens, monad-par, monad-par-extras, mtl
-, optparse-applicative, pretty, process, QuickCheck, regex-posix, SHA, split
-, stdenv, transformers, utf8-string, makeWrapper, gitMinimal, cartel, data-default
-, nix-prefetch-scripts
-}:
-
-mkDerivation rec {
-  pname = "cabal2nix";
-  version = "20150824";
-  src = fetchgit {
-    url = "http://github.com/NixOS/cabal2nix.git";
-    rev = "560fb2b1d22f4c995a526529bb034bd183e85a31";
-    sha256 = "1pyjy9kb8g18g6shlg7vnyaspa892zaq4hqvmqvdbxrlf24vg0wp";
-    deepClone = true;
-  };
-  isLibrary = false;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson ansi-wl-pprint base bytestring Cabal containers
-    deepseq-generics directory filepath hackage-db lens monad-par
-    monad-par-extras mtl optparse-applicative pretty process
-    regex-posix SHA split transformers utf8-string data-default
-  ];
-  executableHaskellDepends = [
-    aeson ansi-wl-pprint base bytestring Cabal containers
-    deepseq-generics directory filepath hackage-db lens monad-par
-    monad-par-extras mtl optparse-applicative pretty process
-    regex-posix SHA split transformers utf8-string data-default
-  ];
-  testHaskellDepends = [
-    aeson ansi-wl-pprint base bytestring Cabal containers deepseq
-    deepseq-generics directory doctest filepath hackage-db hspec lens
-    monad-par monad-par-extras mtl optparse-applicative pretty process
-    QuickCheck regex-posix SHA split transformers utf8-string data-default
-  ];
-  buildDepends = [ cartel ];
-  buildTools = [ gitMinimal makeWrapper ];
-  preConfigure = ''
-    git reset --hard # Re-create the index that fetchgit destroyed in the name of predictable hashes.
-    runhaskell $setupCompileFlags generate-cabal-file --release >cabal2nix.cabal
-  '';
-  postInstall = ''
-    exe=$out/libexec/${pname}-${version}/cabal2nix
-    install -D $out/bin/cabal2nix $exe
-    rm -rf $out/{bin,lib,share}
-    makeWrapper $exe $out/bin/cabal2nix --prefix PATH ":" "${nix-prefetch-scripts}/bin"
-    mkdir -p $out/share/bash-completion/completions
-    $exe --bash-completion-script $exe >$out/share/bash-completion/completions/cabal2nix
-  '';
-  homepage = "http://github.com/NixOS/cabal2nix/";
-  description = "Convert Cabal files into Nix build instructions";
-  license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ simons ];
-}
diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
new file mode 100644
index 00000000000..d879ea051e8
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
@@ -0,0 +1,33 @@
+{ mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
+, deepseq-generics, directory, doctest, filepath, hackage-db, hspec
+, language-nix, lens, lens-construction-helper, pretty, process
+, SHA, split, stdenv, transformers, utf8-string, fetchFromGitHub
+}:
+
+mkDerivation rec {
+  pname = "distribution-nixpkgs";
+  version = "20150824-66-gd281a60";
+  src = fetchFromGitHub {
+    owner = "nixos";
+    repo = "cabal2nix";
+    rev = "v${version}";
+    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
+  };
+  postUnpack = "sourceRoot+=/${pname}";
+  libraryHaskellDepends = [
+    aeson base bytestring Cabal containers deepseq deepseq-generics
+    directory doctest filepath hackage-db hspec language-nix lens
+    lens-construction-helper pretty process SHA split transformers
+    utf8-string
+  ];
+  testHaskellDepends = [
+    aeson base bytestring Cabal containers deepseq deepseq-generics
+    directory doctest filepath hackage-db hspec language-nix lens
+    lens-construction-helper pretty process SHA split transformers
+    utf8-string
+  ];
+  homepage = "https://github.com/nixos/cabal2nix#readme";
+  description = "Convert Cabal files into Nix build instructions";
+  license = stdenv.lib.licenses.bsd3;
+  maintainers = with stdenv.lib.maintainers; [ simons ];
+}
diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
new file mode 100644
index 00000000000..5345fe5f413
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
@@ -0,0 +1,32 @@
+{ mkDerivation, base, Cabal, containers, distribution-nixpkgs
+, filepath, language-nix, lens, monad-par, monad-par-extras, mtl
+, optparse-applicative, pretty, stdenv, fetchFromGitHub
+}:
+
+mkDerivation rec {
+  pname = "hackage2nix";
+  version = "20150824-66-gd281a60";
+  src = fetchFromGitHub {
+    owner = "nixos";
+    repo = "cabal2nix";
+    rev = "v${version}";
+    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
+  };
+  postUnpack = "sourceRoot+=/${pname}";
+  isLibrary = false;
+  isExecutable = true;
+  enableSharedExecutables = false;
+  executableHaskellDepends = [
+    base Cabal containers distribution-nixpkgs filepath language-nix
+    lens monad-par monad-par-extras mtl optparse-applicative pretty
+  ];
+  postInstall = ''
+    exe=$out/bin/${pname}
+    mkdir -p $out/share/bash-completion/completions
+    $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${pname}
+  '';
+  homepage = "https://github.com/nixos/cabal2nix#readme";
+  description = "Convert Cabal files into Nix build instructions";
+  license = stdenv.lib.licenses.bsd3;
+  maintainers = with stdenv.lib.maintainers; [ simons ];
+}
diff --git a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
new file mode 100644
index 00000000000..a9e02f25449
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
@@ -0,0 +1,23 @@
+{ mkDerivation, base, data-default-class, deepseq-generics, lens
+, lens-construction-helper, pretty, regex-posix, stdenv, fetchFromGitHub
+}:
+
+mkDerivation rec {
+  pname = "language-nix";
+  version = "20150824-66-gd281a60";
+  src = fetchFromGitHub {
+    owner = "nixos";
+    repo = "cabal2nix";
+    rev = "v${version}";
+    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
+  };
+  postUnpack = "sourceRoot+=/${pname}";
+  libraryHaskellDepends = [
+    base data-default-class deepseq-generics lens
+    lens-construction-helper pretty 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 ];
+}
diff --git a/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix b/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix
new file mode 100644
index 00000000000..0508795486f
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix
@@ -0,0 +1,18 @@
+{ mkDerivation, base, data-default-class, fetchFromGitHub, lens, stdenv }:
+
+mkDerivation rec {
+  pname = "lens-construction-helper";
+  version = "20150824-66-gd281a60";
+  src = fetchFromGitHub {
+    owner = "nixos";
+    repo = "cabal2nix";
+    rev = "v${version}";
+    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
+  };
+  postUnpack = "sourceRoot+=/${pname}";
+  libraryHaskellDepends = [ base data-default-class lens ];
+  homepage = "https://github.com/nixos/cabal2nix#readme";
+  description = "Use data-default to create default instances of various types";
+  license = stdenv.lib.licenses.bsd3;
+  maintainers = with stdenv.lib.maintainers; [ simons ];
+}

From 7182ef35f458de1e2e96317ad2d71517e8abe58c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Sep 2015 17:45:39 +0200
Subject: [PATCH 1927/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/23452bdddd485c6e43b92c8886a4347d839783e4
 with hackage2nix v20150824-68-ga8b9f17

---
 pkgs/development/haskell-modules/hackage-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index dab185b20ea..7accc1626eb 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -126301,6 +126301,11 @@ self: {
          monad-logger optparse-applicative path process QuickCheck resourcet
          retry temporary text transformers unix-compat
        ];
+       postInstall = ''
+         exe=$out/bin/stack
+         mkdir -p $out/share/bash-completion/completions
+         $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack
+       '';
        homepage = "https://github.com/commercialhaskell/stack";
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;

From 44788bb2ce5ecb025b63c71226ab613a05a334d3 Mon Sep 17 00:00:00 2001
From: Enrico Fasoli <fazius2009@gmail.com>
Date: Thu, 27 Aug 2015 14:01:10 +0000
Subject: [PATCH 1928/2016] fixed syncthing service to work as expected

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

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 02572c1e27d..d5accfef1cb 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -36,9 +36,7 @@ in
       dataDir = mkOption {
         default = "/var/lib/syncthing";
         description = ''
-          Path where the `.syncthing` (settings and keys) and `Sync`
-          (your synced files) directories will exist. This can be your home
-          directory.
+          Path where the settings and keys will exist.
         '';
       };
 
@@ -57,18 +55,12 @@ in
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         environment.STNORESTART = "placeholder";  # do not self-restart
-        environment.HOME = "${cfg.dataDir}";
         serviceConfig = {
           User = "${cfg.user}";
           PermissionsStartOnly = true;
           Restart = "always";
-          ExecStart = "${pkgs.syncthing}/bin/syncthing -home=${cfg.dataDir}/.syncthing";
+          ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -home=${cfg.dataDir}";
         };
-        preStart = ''
-          mkdir -p ${cfg.dataDir}
-          chown ${cfg.user} ${cfg.dataDir}
-        '';
-
       };
 
     environment.systemPackages = [ pkgs.syncthing ];

From c090efb9d84b7be09c1109de7a39e6ac711d6b16 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Sep 2015 19:48:52 +0200
Subject: [PATCH 1929/2016] command-not-found: Fix nix-env invocation

---
 .../programs/command-not-found/command-not-found.nix        | 4 ++--
 .../modules/programs/command-not-found/command-not-found.pl | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix
index bead2dcdcf9..9524d91ea3b 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.nix
+++ b/nixos/modules/programs/command-not-found/command-not-found.nix
@@ -57,9 +57,9 @@ in
           if [ $? = 126 ]; then
             "$@"
           fi
-	else
+        else
           # Indicate than there was an error so ZSH falls back to its default handler
-	  return 127
+          return 127
         fi
       }
     '';
diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl
index 621b79d1654..b233d973a4a 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.pl
+++ b/nixos/modules/programs/command-not-found/command-not-found.pl
@@ -30,11 +30,11 @@ The program ‘$program’ is currently not installed. It is provided by
 the package ‘$package’, which I will now install for you.
 EOF
         ;
-        exit 126 if system("nix-env", "-iA", $package) == 0;
+        exit 126 if system("nix-env", "-iA", "nixos.$package") == 0;
     } else {
         print STDERR <<EOF;
 The program ‘$program’ is currently not installed. You can install it by typing:
-  nix-env -iA $package
+  nix-env -iA nixos.$package
 EOF
     }
 } else {
@@ -42,7 +42,7 @@ EOF
 The program ‘$program’ is currently not installed. It is provided by
 several packages. You can install it by typing one of the following:
 EOF
-    print STDERR "  nix-env -iA $_->{package}\n" foreach @$res;
+    print STDERR "  nix-env -iA nixos.$_->{package}\n" foreach @$res;
 }
 
 exit 127;

From 5385a0a82a42e6bbd2d8244d9042dcee11bf180e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 2 Sep 2015 19:58:44 +0200
Subject: [PATCH 1930/2016] cassandra: use mirrors

Upstream likes to move "old" releases to an archive mirror as soon as a
new one is released. This is now handled for free by mirrors.nix.

(No idea why cs.utah.edu was used to begin with; it's now added to
mirrors.nix. Note that it doesn't support SSL, but that applies to
several others so I don't see the harm.)
---
 pkgs/build-support/fetchurl/mirrors.nix | 1 +
 pkgs/servers/nosql/cassandra/1.2.nix    | 2 +-
 pkgs/servers/nosql/cassandra/2.0.nix    | 2 +-
 pkgs/servers/nosql/cassandra/2.1.nix    | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 2f6a4d36327..cf986a064d9 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -280,6 +280,7 @@ rec {
     http://archive.apache.org/dist/ # fallback for old releases
     ftp://ftp.funet.fi/pub/mirrors/apache.org/
     http://apache.cs.uu.nl/dist/
+    http://apache.cs.utah.edu/
   ];
 
   postgresql = [
diff --git a/pkgs/servers/nosql/cassandra/1.2.nix b/pkgs/servers/nosql/cassandra/1.2.nix
index 75992ceb9ef..1507787ae00 100644
--- a/pkgs/servers/nosql/cassandra/1.2.nix
+++ b/pkgs/servers/nosql/cassandra/1.2.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     inherit sha256;
-    url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
+    url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix
index a4aca1c55c1..d1c76c83a7e 100644
--- a/pkgs/servers/nosql/cassandra/2.0.nix
+++ b/pkgs/servers/nosql/cassandra/2.0.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     inherit sha256;
-    url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
+    url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index 9869682ae8a..36905b5675a 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     inherit sha256;
-    url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
+    url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 513bae1f2e8aee3ed2dd8b63379d629f13b8c43c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 2 Sep 2015 21:13:45 +0300
Subject: [PATCH 1931/2016] bomi, mpv: avoid using deprecated youtube-dl name

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b9a82edf33..41c27b598d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11012,6 +11012,7 @@ let
   cmatrix = callPackage ../applications/misc/cmatrix { };
 
   bomi = callPackage ../applications/video/bomi {
+    youtube-dl = pythonPackages.youtube-dl;
     pulseSupport = config.pulseaudio or true;
   };
 
@@ -12244,6 +12245,7 @@ let
   mpv = callPackage ../applications/video/mpv rec {
     lua = lua5_1;
     lua5_sockets = lua5_1_sockets;
+    youtube-dl = pythonPackages.youtube-dl;
     bs2bSupport = config.mpv.bs2bSupport or true;
     youtubeSupport = config.mpv.youtubeSupport or true;
     cacaSupport = config.mpv.cacaSupport or true;

From fb16b908bc099409650cfc8028dbc057a4cf366b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Sep 2015 20:22:32 +0200
Subject: [PATCH 1932/2016] qbittorrent: partial revert of
 1d78f31b765f8e3fe81d79f5bc9ae381271094da
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It still fails on 32bit:
http://hydra.nixos.org/build/25460116/nixlog/1/raw

(cherry picked from commit 57391b7322d97aa03158c730aec318cb0e8d2b2d)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/applications/networking/p2p/qbittorrent/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 8ff11dba905..f8c025ba241 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
     (if webuiSupport then "" else "--disable-webui")
   ] ++ optional debugSupport "--enable-debug";
 
-  enableParallelBuilding = true;
+  # https://github.com/qbittorrent/qBittorrent/issues/1992 
+  enableParallelBuilding = false;
 
   meta = {
     description = "Free Software alternative to µtorrent";

From 0dfdb8938bb89a59b82206a606adf7231f350f6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Sep 2015 20:26:02 +0200
Subject: [PATCH 1933/2016] meshlab: broken on i686

---
 pkgs/applications/graphics/meshlab/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix
index 94102663a8c..49bfb47c85a 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/pkgs/applications/graphics/meshlab/default.nix
@@ -46,5 +46,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
+    broken = stdenv.isLinux && stdenv.isi686;
   };
 }

From 282bc1a10ca37aea7e1e20decc62971e15b3897e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Sep 2015 20:29:09 +0200
Subject: [PATCH 1934/2016] ocaml.asn1-combinators: mark broken on i686
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 36b406fd1b993c070579a1857cfd3ca816e21f91)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/development/ocaml-modules/asn1-combinators/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index 41f73b2f834..b3555d7fddb 100644
--- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix
+++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
     platforms = ocaml.meta.platforms;
     license = stdenv.lib.licenses.bsd2;
     maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    broken = stdenv.isi686; # https://github.com/mirleft/ocaml-asn1-combinators/issues/13
   };
 }

From 9aa6ca473b100132c6d89a0733044dca865f3844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Sep 2015 20:35:46 +0200
Subject: [PATCH 1935/2016] pcg-c: mark as broken on i686
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 6cfbdda1e9b28817772bb322c40c62f65ac101c2)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/development/libraries/pcg-c/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix
index 4b8cedd90c7..a165c539ae8 100644
--- a/pkgs/development/libraries/pcg-c/default.nix
+++ b/pkgs/development/libraries/pcg-c/default.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = [ maintainers.linus ];
     repositories.git = git://github.com/imneme/pcg-c.git;
+    broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11
   };
 }

From 13b63c29aea88276227da8fbff85af5eb3c78441 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 2 Sep 2015 21:40:40 +0300
Subject: [PATCH 1936/2016] rxvt_unicode_with-plugins: move to the deprecated
 names section

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41c27b598d4..904290caf94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12746,9 +12746,6 @@ let
     plugins = [ urxvt_perl urxvt_perls urxvt_tabbedex urxvt_font_size ];
   };
 
-  # FIXME: remove somewhere in future
-  rxvt_unicode_with-plugins = rxvt_unicode-with-plugins;
-
   sakura = callPackage ../applications/misc/sakura {
     vte = gnome3.vte_290;
   };
@@ -15347,6 +15344,7 @@ let
   nfsUtils = nfs-utils;  # added 2014-12-06
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   rssglx = rss-glx; #added 2015-03-25
+  rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07

From acdc9370f5bceb1f8fdadc0b096cb6b6e888125f Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Wed, 2 Sep 2015 12:13:57 -0700
Subject: [PATCH 1937/2016] emacs-packages: idris-mode 0.9.18 -> 0.9.19

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 4e03c300448..6ec01551aed 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -828,13 +828,14 @@ let self = _self // overrides;
 
   idris-mode = melpaBuild rec {
     pname   = "idris-mode";
-    version = "0.9.18";
+    version = "0.9.19";
     src = fetchFromGitHub {
       owner  = "idris-hackers";
       repo   = "idris-mode";
       rev    = version;
-      sha256 = "11dw2ydlqhqx569wrp56w11rhgvm6mb6mzq2cwsv2vfyjvvawyxg";
+      sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92";
     };
+    packageRequires = [ prop-menu ];
     meta = { license = gpl3Plus; };
   };
 
@@ -1105,6 +1106,18 @@ let self = _self // overrides;
     meta = { license = gpl3Plus; };
   };
 
+  prop-menu = melpaBuild rec {
+    pname   = "prop-menu";
+    version = "0.1.2";
+    src = fetchFromGitHub {
+      owner  = "david-christiansen";
+      repo   = "${pname}-el";
+      rev    = version;
+      sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
+    };
+    meta = { license = gpl3Plus; };
+  };
+
   rainbow-delimiters = melpaBuild rec {
     pname = "rainbow-delimiters";
     version = "2.1.1";

From 89cec0c096d3b06c61553d616cabbab229ea616f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Sep 2015 21:16:00 +0200
Subject: [PATCH 1938/2016] racket: don't build docs as it causes failures
 sometimes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 1a392bd62e4d8ff92ec92ebe48912b8295714e2e)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/development/interpreters/racket/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index d41b0424b44..8aa75829554 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     cd src/build
   '';
 
-  configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ];
+  configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" "--disable-docs"];
 
   configureScript = "../configure";
 

From 424ad5302e089e213d734ac460620c623205ab8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 2 Sep 2015 22:12:34 +0200
Subject: [PATCH 1939/2016] Remove tessel: too outdated, and broken

---
 pkgs/applications/misc/tessel/default.nix |   40 -
 pkgs/applications/misc/tessel/package.nix | 1974 ---------------------
 pkgs/top-level/all-packages.nix           |    2 -
 3 files changed, 2016 deletions(-)
 delete mode 100644 pkgs/applications/misc/tessel/default.nix
 delete mode 100644 pkgs/applications/misc/tessel/package.nix

diff --git a/pkgs/applications/misc/tessel/default.nix b/pkgs/applications/misc/tessel/default.nix
deleted file mode 100644
index 6a11713c750..00000000000
--- a/pkgs/applications/misc/tessel/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, callPackage, libusb1, pkgconfig, python, utillinux }:
-
-with stdenv.lib;
-
-let 
-  nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
-    neededNatives =  [ libusb1 pkgconfig python utillinux ];
-    self = nodePackages;
-    generated = ./package.nix;
-  };
-
-in nodePackages.buildNodePackage rec {
-  name = "tessel-0.3.16";
-  bin = true;
-  
-  src = [
-    (fetchurl {
-      url = "http://registry.npmjs.org/tessel/-/tessel-0.3.16.tgz";
-      name = "tessel-0.3.16.tgz";
-      sha1 = "900a8d897ba03d7a9d5927697180284772d70738";
-    })
-  ];
-
-  deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
-
-  postInstall = ''
-    mkdir -p $out/etc/udev/rules.d
-    cp $out/lib/node_modules/tessel/install/85-tessel.rules $out/etc/udev/rules.d/
-  '';
-  
-  passthru.names = [ "tessel" ];
-
-  meta = {
-    description = "Command line tools and programmatic access library for Tessel devices";
-    homepage = https://tessel.io;
-    license = licenses.mit;
-    maintainers = with maintainers; [ goibhniu ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/applications/misc/tessel/package.nix b/pkgs/applications/misc/tessel/package.nix
deleted file mode 100644
index d388387ccaf..00000000000
--- a/pkgs/applications/misc/tessel/package.nix
+++ /dev/null
@@ -1,1974 +0,0 @@
-{ self, fetchurl, fetchgit ? null, lib }:
-
-{
-  by-spec."abbrev"."1" =
-    self.by-version."abbrev"."1.0.5";
-  by-version."abbrev"."1.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "abbrev-1.0.5";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz";
-        name = "abbrev-1.0.5.tgz";
-        sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."abbrev" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "abbrev" ];
-  };
-  by-spec."asn1"."0.1.11" =
-    self.by-version."asn1"."0.1.11";
-  by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
-    name = "asn1-0.1.11";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
-        name = "asn1-0.1.11.tgz";
-        sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."asn1" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "asn1" ];
-  };
-  by-spec."assert-plus"."0.1.2" =
-    self.by-version."assert-plus"."0.1.2";
-  by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "assert-plus-0.1.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
-        name = "assert-plus-0.1.2.tgz";
-        sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."assert-plus" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "assert-plus" ];
-  };
-  by-spec."async"."~0.2.9" =
-    self.by-version."async"."0.2.10";
-  by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage {
-    name = "async-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."async" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "async" ];
-  };
-  "async" = self.by-version."async"."0.2.10";
-  by-spec."async"."~0.9.0" =
-    self.by-version."async"."0.9.0";
-  by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "async-0.9.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
-        name = "async-0.9.0.tgz";
-        sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."async" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "async" ];
-  };
-  by-spec."aws-sign2"."~0.5.0" =
-    self.by-version."aws-sign2"."0.5.0";
-  by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "aws-sign2-0.5.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
-        name = "aws-sign2-0.5.0.tgz";
-        sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."aws-sign2" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "aws-sign2" ];
-  };
-  by-spec."bindings-shyp"."~0.2.3" =
-    self.by-version."bindings-shyp"."0.2.3";
-  by-version."bindings-shyp"."0.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "bindings-shyp-0.2.3";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bindings-shyp/-/bindings-shyp-0.2.3.tgz";
-        name = "bindings-shyp-0.2.3.tgz";
-        sha1 = "909151c14c701f350eb6be8ad14784ad79813671";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bindings-shyp" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bindings-shyp" ];
-  };
-  by-spec."block-stream"."*" =
-    self.by-version."block-stream"."0.0.7";
-  by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "block-stream-0.0.7";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz";
-        name = "block-stream-0.0.7.tgz";
-        sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."block-stream" or []);
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "block-stream" ];
-  };
-  by-spec."boom"."0.4.x" =
-    self.by-version."boom"."0.4.2";
-  by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage {
-    name = "boom-0.4.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
-        name = "boom-0.4.2.tgz";
-        sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."boom" or []);
-    deps = {
-      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "boom" ];
-  };
-  by-spec."buffer-equal"."~0.0.0" =
-    self.by-version."buffer-equal"."0.0.1";
-  by-version."buffer-equal"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "buffer-equal-0.0.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz";
-        name = "buffer-equal-0.0.1.tgz";
-        sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."buffer-equal" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "buffer-equal" ];
-  };
-  by-spec."bunker"."0.1.X" =
-    self.by-version."bunker"."0.1.2";
-  by-version."bunker"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "bunker-0.1.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz";
-        name = "bunker-0.1.2.tgz";
-        sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."bunker" or []);
-    deps = {
-      "burrito-0.2.12" = self.by-version."burrito"."0.2.12";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "bunker" ];
-  };
-  by-spec."burrito".">=0.2.5 <0.3" =
-    self.by-version."burrito"."0.2.12";
-  by-version."burrito"."0.2.12" = lib.makeOverridable self.buildNodePackage {
-    name = "burrito-0.2.12";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz";
-        name = "burrito-0.2.12.tgz";
-        sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."burrito" or []);
-    deps = {
-      "traverse-0.5.2" = self.by-version."traverse"."0.5.2";
-      "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "burrito" ];
-  };
-  by-spec."charm"."0.1.x" =
-    self.by-version."charm"."0.1.2";
-  by-version."charm"."0.1.2" = lib.makeOverridable self.buildNodePackage {
-    name = "charm-0.1.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz";
-        name = "charm-0.1.2.tgz";
-        sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."charm" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "charm" ];
-  };
-  by-spec."colony-compiler"."~0.6.21" =
-    self.by-version."colony-compiler"."0.6.23";
-  by-version."colony-compiler"."0.6.23" = lib.makeOverridable self.buildNodePackage {
-    name = "colony-compiler-0.6.23";
-    bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/colony-compiler/-/colony-compiler-0.6.23.tgz";
-        name = "colony-compiler-0.6.23.tgz";
-        sha1 = "0bef9e899e1ae928f6fe5e0dcca6cab4d47ab448";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colony-compiler" or []);
-    deps = {
-      "colors-0.6.2" = self.by-version."colors"."0.6.2";
-      "optimist-0.5.2" = self.by-version."optimist"."0.5.2";
-      "nan-1.0.0" = self.by-version."nan"."1.0.0";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "bindings-shyp-0.2.3" = self.by-version."bindings-shyp"."0.2.3";
-      # "colony-compiler-shyp-win32-ia32-0.6.17-1" = self.by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1";
-      # "colony-compiler-shyp-win32-x64-0.6.17-0" = self.by-version."colony-compiler-shyp-win32-x64"."0.6.17-0";
-      # "colony-compiler-shyp-darwin-x64-0.6.17-0" = self.by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "colony-compiler" ];
-  };
-  "colony-compiler" = self.by-version."colony-compiler"."0.6.23";
-  by-spec."colony-compiler-shyp-darwin-x64"."0.6.x" =
-    self.by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0";
-  by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0" = lib.makeOverridable self.buildNodePackage {
-    name = "colony-compiler-shyp-darwin-x64-0.6.17-0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/colony-compiler-shyp-darwin-x64/-/colony-compiler-shyp-darwin-x64-0.6.17-0.tgz";
-        name = "colony-compiler-shyp-darwin-x64-0.6.17-0.tgz";
-        sha1 = "33eedbee7ff8679fde69ba03bf27777110113732";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colony-compiler-shyp-darwin-x64" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "colony-compiler-shyp-darwin-x64" ];
-  };
-  by-spec."colony-compiler-shyp-win32-ia32"."0.6.x" =
-    self.by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1";
-  by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1" = lib.makeOverridable self.buildNodePackage {
-    name = "colony-compiler-shyp-win32-ia32-0.6.17-1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/colony-compiler-shyp-win32-ia32/-/colony-compiler-shyp-win32-ia32-0.6.17-1.tgz";
-        name = "colony-compiler-shyp-win32-ia32-0.6.17-1.tgz";
-        sha1 = "6e11a978be5df7be00112d2a349d5e34925f443a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colony-compiler-shyp-win32-ia32" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "colony-compiler-shyp-win32-ia32" ];
-  };
-  by-spec."colony-compiler-shyp-win32-x64"."0.6.x" =
-    self.by-version."colony-compiler-shyp-win32-x64"."0.6.17-0";
-  by-version."colony-compiler-shyp-win32-x64"."0.6.17-0" = lib.makeOverridable self.buildNodePackage {
-    name = "colony-compiler-shyp-win32-x64-0.6.17-0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/colony-compiler-shyp-win32-x64/-/colony-compiler-shyp-win32-x64-0.6.17-0.tgz";
-        name = "colony-compiler-shyp-win32-x64-0.6.17-0.tgz";
-        sha1 = "cd30416df0ab52e49c74e81d69bd23329983d005";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colony-compiler-shyp-win32-x64" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "colony-compiler-shyp-win32-x64" ];
-  };
-  by-spec."colors"."0.5.x" =
-    self.by-version."colors"."0.5.1";
-  by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage {
-    name = "colors-0.5.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz";
-        name = "colors-0.5.1.tgz";
-        sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colors" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "colors" ];
-  };
-  by-spec."colors"."~0.6.0-1" =
-    self.by-version."colors"."0.6.2";
-  by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "colors-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colors" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "colors" ];
-  };
-  "colors" = self.by-version."colors"."0.6.2";
-  by-spec."colors"."~0.6.1" =
-    self.by-version."colors"."0.6.2";
-  by-spec."colorsafeconsole"."0.0.4" =
-    self.by-version."colorsafeconsole"."0.0.4";
-  by-version."colorsafeconsole"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "colorsafeconsole-0.0.4";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/colorsafeconsole/-/colorsafeconsole-0.0.4.tgz";
-        name = "colorsafeconsole-0.0.4.tgz";
-        sha1 = "dc10508bb000e51964fb485fd8557faa169effbe";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."colorsafeconsole" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "colorsafeconsole" ];
-  };
-  "colorsafeconsole" = self.by-version."colorsafeconsole"."0.0.4";
-  by-spec."combined-stream"."~0.0.4" =
-    self.by-version."combined-stream"."0.0.7";
-  by-version."combined-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
-    name = "combined-stream-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."combined-stream" or []);
-    deps = {
-      "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "combined-stream" ];
-  };
-  by-spec."cryptiles"."0.2.x" =
-    self.by-version."cryptiles"."0.2.2";
-  by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "cryptiles-0.2.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
-        name = "cryptiles-0.2.2.tgz";
-        sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."cryptiles" or []);
-    deps = {
-      "boom-0.4.2" = self.by-version."boom"."0.4.2";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "cryptiles" ];
-  };
-  by-spec."ctype"."0.5.2" =
-    self.by-version."ctype"."0.5.2";
-  by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "ctype-0.5.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
-        name = "ctype-0.5.2.tgz";
-        sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."ctype" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "ctype" ];
-  };
-  by-spec."debug"."^0.8.1" =
-    self.by-version."debug"."0.8.1";
-  by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "debug-0.8.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
-        name = "debug-0.8.1.tgz";
-        sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."debug" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "debug" ];
-  };
-  "debug" = self.by-version."debug"."0.8.1";
-  by-spec."deep-equal"."~0.0.0" =
-    self.by-version."deep-equal"."0.0.0";
-  by-version."deep-equal"."0.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "deep-equal-0.0.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
-        name = "deep-equal-0.0.0.tgz";
-        sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-equal" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deep-equal" ];
-  };
-  by-spec."deep-equal"."~0.2.0" =
-    self.by-version."deep-equal"."0.2.1";
-  by-version."deep-equal"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "deep-equal-0.2.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz";
-        name = "deep-equal-0.2.1.tgz";
-        sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-equal" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deep-equal" ];
-  };
-  by-spec."deep-is"."0.1.x" =
-    self.by-version."deep-is"."0.1.3";
-  by-version."deep-is"."0.1.3" = lib.makeOverridable self.buildNodePackage {
-    name = "deep-is-0.1.3";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
-        name = "deep-is-0.1.3.tgz";
-        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."deep-is" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "deep-is" ];
-  };
-  by-spec."defined"."~0.0.0" =
-    self.by-version."defined"."0.0.0";
-  by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "defined-0.0.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz";
-        name = "defined-0.0.0.tgz";
-        sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."defined" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "defined" ];
-  };
-  by-spec."delayed-stream"."0.0.5" =
-    self.by-version."delayed-stream"."0.0.5";
-  by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "delayed-stream-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."delayed-stream" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "delayed-stream" ];
-  };
-  by-spec."difflet"."~0.2.0" =
-    self.by-version."difflet"."0.2.6";
-  by-version."difflet"."0.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "difflet-0.2.6";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz";
-        name = "difflet-0.2.6.tgz";
-        sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."difflet" or []);
-    deps = {
-      "traverse-0.6.6" = self.by-version."traverse"."0.6.6";
-      "charm-0.1.2" = self.by-version."charm"."0.1.2";
-      "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "difflet" ];
-  };
-  by-spec."effess"."~0.0.2" =
-    self.by-version."effess"."0.0.5";
-  by-version."effess"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "effess-0.0.5";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/effess/-/effess-0.0.5.tgz";
-        name = "effess-0.0.5.tgz";
-        sha1 = "d328fd03929c168c02a63d9d3d889657dc9499db";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."effess" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "effess" ];
-  };
-  by-spec."effess"."~0.0.5" =
-    self.by-version."effess"."0.0.5";
-  "effess" = self.by-version."effess"."0.0.5";
-  by-spec."forever-agent"."~0.5.0" =
-    self.by-version."forever-agent"."0.5.2";
-  by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "forever-agent-0.5.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
-        name = "forever-agent-0.5.2.tgz";
-        sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."forever-agent" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "forever-agent" ];
-  };
-  by-spec."form-data"."~0.1.0" =
-    self.by-version."form-data"."0.1.4";
-  by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "form-data-0.1.4";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
-        name = "form-data-0.1.4.tgz";
-        sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."form-data" or []);
-    deps = {
-      "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.0" = self.by-version."async"."0.9.0";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "form-data" ];
-  };
-  by-spec."fstream"."~0.1.25" =
-    self.by-version."fstream"."0.1.31";
-  by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage {
-    name = "fstream-0.1.31";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
-        name = "fstream-0.1.31.tgz";
-        sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."fstream" or []);
-    deps = {
-      "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "fstream" ];
-  };
-  "fstream" = self.by-version."fstream"."0.1.31";
-  by-spec."fstream"."~0.1.28" =
-    self.by-version."fstream"."0.1.31";
-  by-spec."glob"."~3.2.1" =
-    self.by-version."glob"."3.2.11";
-  by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage {
-    name = "glob-3.2.11";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
-        name = "glob-3.2.11.tgz";
-        sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."glob" or []);
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "glob" ];
-  };
-  by-spec."glob"."~3.2.9" =
-    self.by-version."glob"."3.2.11";
-  by-spec."graceful-fs"."~1" =
-    self.by-version."graceful-fs"."1.2.3";
-  by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage {
-    name = "graceful-fs-1.2.3";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
-        name = "graceful-fs-1.2.3.tgz";
-        sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."graceful-fs" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "graceful-fs" ];
-  };
-  by-spec."graceful-fs"."~3.0.2" =
-    self.by-version."graceful-fs"."3.0.4";
-  by-version."graceful-fs"."3.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "graceful-fs-3.0.4";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz";
-        name = "graceful-fs-3.0.4.tgz";
-        sha1 = "a0306d9b0940e0fc512d33b5df1014e88e0637a3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."graceful-fs" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "graceful-fs" ];
-  };
-  by-spec."hardware-resolve"."~0.1.3" =
-    self.by-version."hardware-resolve"."0.1.6";
-  by-version."hardware-resolve"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "hardware-resolve-0.1.6";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hardware-resolve/-/hardware-resolve-0.1.6.tgz";
-        name = "hardware-resolve-0.1.6.tgz";
-        sha1 = "b03f5077ab1b4b185ecd9486a3ba754f4b46e02a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hardware-resolve" or []);
-    deps = {
-      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
-      "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
-      "effess-0.0.5" = self.by-version."effess"."0.0.5";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hardware-resolve" ];
-  };
-  "hardware-resolve" = self.by-version."hardware-resolve"."0.1.6";
-  by-spec."hawk"."~1.0.0" =
-    self.by-version."hawk"."1.0.0";
-  by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "hawk-1.0.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
-        name = "hawk-1.0.0.tgz";
-        sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hawk" or []);
-    deps = {
-      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
-      "boom-0.4.2" = self.by-version."boom"."0.4.2";
-      "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
-      "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hawk" ];
-  };
-  by-spec."hoek"."0.9.x" =
-    self.by-version."hoek"."0.9.1";
-  by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage {
-    name = "hoek-0.9.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
-        name = "hoek-0.9.1.tgz";
-        sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."hoek" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "hoek" ];
-  };
-  by-spec."http-signature"."~0.10.0" =
-    self.by-version."http-signature"."0.10.0";
-  by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "http-signature-0.10.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz";
-        name = "http-signature-0.10.0.tgz";
-        sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."http-signature" or []);
-    deps = {
-      "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
-      "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
-      "ctype-0.5.2" = self.by-version."ctype"."0.5.2";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "http-signature" ];
-  };
-  by-spec."humanize"."0.0.9" =
-    self.by-version."humanize"."0.0.9";
-  by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage {
-    name = "humanize-0.0.9";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz";
-        name = "humanize-0.0.9.tgz";
-        sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."humanize" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "humanize" ];
-  };
-  "humanize" = self.by-version."humanize"."0.0.9";
-  by-spec."inherits"."*" =
-    self.by-version."inherits"."2.0.1";
-  by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "inherits-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."inherits" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "inherits" ];
-  };
-  by-spec."inherits"."2" =
-    self.by-version."inherits"."2.0.1";
-  by-spec."inherits"."~2.0.0" =
-    self.by-version."inherits"."2.0.1";
-  by-spec."inherits"."~2.0.1" =
-    self.by-version."inherits"."2.0.1";
-  by-spec."json-stringify-safe"."~5.0.0" =
-    self.by-version."json-stringify-safe"."5.0.0";
-  by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "json-stringify-safe-5.0.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
-        name = "json-stringify-safe-5.0.0.tgz";
-        sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."json-stringify-safe" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "json-stringify-safe" ];
-  };
-  by-spec."keypress"."~0.2.1" =
-    self.by-version."keypress"."0.2.1";
-  by-version."keypress"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "keypress-0.2.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz";
-        name = "keypress-0.2.1.tgz";
-        sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."keypress" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "keypress" ];
-  };
-  "keypress" = self.by-version."keypress"."0.2.1";
-  by-spec."lru-cache"."2" =
-    self.by-version."lru-cache"."2.5.0";
-  by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "lru-cache-2.5.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
-        name = "lru-cache-2.5.0.tgz";
-        sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."lru-cache" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "lru-cache" ];
-  };
-  by-spec."mime"."~1.2.11" =
-    self.by-version."mime"."1.2.11";
-  by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage {
-    name = "mime-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";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mime" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mime" ];
-  };
-  by-spec."mime"."~1.2.9" =
-    self.by-version."mime"."1.2.11";
-  by-spec."minimatch"."0.3" =
-    self.by-version."minimatch"."0.3.0";
-  by-version."minimatch"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "minimatch-0.3.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
-        name = "minimatch-0.3.0.tgz";
-        sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimatch" or []);
-    deps = {
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
-      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimatch" ];
-  };
-  by-spec."minimatch"."~0.2.14" =
-    self.by-version."minimatch"."0.2.14";
-  by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage {
-    name = "minimatch-0.2.14";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
-        name = "minimatch-0.2.14.tgz";
-        sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimatch" or []);
-    deps = {
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
-      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimatch" ];
-  };
-  by-spec."minimist"."0.0.8" =
-    self.by-version."minimist"."0.0.8";
-  by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage {
-    name = "minimist-0.0.8";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        name = "minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."minimist" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "minimist" ];
-  };
-  by-spec."mkdirp"."0.5" =
-    self.by-version."mkdirp"."0.5.0";
-  by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage {
-    name = "mkdirp-0.5.0";
-    bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
-        name = "mkdirp-0.5.0.tgz";
-        sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mkdirp" or []);
-    deps = {
-      "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mkdirp" ];
-  };
-  by-spec."mkdirp"."~0.3 || 0.4 || 0.5" =
-    self.by-version."mkdirp"."0.5.0";
-  by-spec."mkdirp"."~0.3.5" =
-    self.by-version."mkdirp"."0.3.5";
-  by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage {
-    name = "mkdirp-0.3.5";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
-        name = "mkdirp-0.3.5.tgz";
-        sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mkdirp" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mkdirp" ];
-  };
-  "mkdirp" = self.by-version."mkdirp"."0.3.5";
-  by-spec."mute-stream"."~0.0.4" =
-    self.by-version."mute-stream"."0.0.4";
-  by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "mute-stream-0.0.4";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
-        name = "mute-stream-0.0.4.tgz";
-        sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."mute-stream" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "mute-stream" ];
-  };
-  by-spec."my-local-ip"."~1.0.0" =
-    self.by-version."my-local-ip"."1.0.0";
-  by-version."my-local-ip"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "my-local-ip-1.0.0";
-    bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/my-local-ip/-/my-local-ip-1.0.0.tgz";
-        name = "my-local-ip-1.0.0.tgz";
-        sha1 = "37585555a4ff1985309edac7c2a045a466be6c32";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."my-local-ip" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "my-local-ip" ];
-  };
-  "my-local-ip" = self.by-version."my-local-ip"."1.0.0";
-  by-spec."nan"."~1.0.0" =
-    self.by-version."nan"."1.0.0";
-  by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "nan-1.0.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
-        name = "nan-1.0.0.tgz";
-        sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nan" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nan" ];
-  };
-  by-spec."node-uuid"."~1.4.0" =
-    self.by-version."node-uuid"."1.4.1";
-  by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-uuid-1.4.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
-        name = "node-uuid-1.4.1.tgz";
-        sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."node-uuid" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "node-uuid" ];
-  };
-  by-spec."nomnom"."~1.6.2" =
-    self.by-version."nomnom"."1.6.2";
-  by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "nomnom-1.6.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz";
-        name = "nomnom-1.6.2.tgz";
-        sha1 = "84a66a260174408fc5b77a18f888eccc44fb6971";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nomnom" or []);
-    deps = {
-      "colors-0.5.1" = self.by-version."colors"."0.5.1";
-      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nomnom" ];
-  };
-  "nomnom" = self.by-version."nomnom"."1.6.2";
-  by-spec."nopt"."~2" =
-    self.by-version."nopt"."2.2.1";
-  by-version."nopt"."2.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "nopt-2.2.1";
-    bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
-        name = "nopt-2.2.1.tgz";
-        sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."nopt" or []);
-    deps = {
-      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "nopt" ];
-  };
-  by-spec."oauth-sign"."~0.3.0" =
-    self.by-version."oauth-sign"."0.3.0";
-  by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "oauth-sign-0.3.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
-        name = "oauth-sign-0.3.0.tgz";
-        sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."oauth-sign" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "oauth-sign" ];
-  };
-  by-spec."object-inspect"."~0.4.0" =
-    self.by-version."object-inspect"."0.4.0";
-  by-version."object-inspect"."0.4.0" = lib.makeOverridable self.buildNodePackage {
-    name = "object-inspect-0.4.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz";
-        name = "object-inspect-0.4.0.tgz";
-        sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."object-inspect" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "object-inspect" ];
-  };
-  by-spec."optimist"."~0.5.2" =
-    self.by-version."optimist"."0.5.2";
-  by-version."optimist"."0.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "optimist-0.5.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/optimist/-/optimist-0.5.2.tgz";
-        name = "optimist-0.5.2.tgz";
-        sha1 = "85c8c1454b3315e4a78947e857b1df033450bfbc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."optimist" or []);
-    deps = {
-      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "optimist" ];
-  };
-  by-spec."osenv"."0.0.3" =
-    self.by-version."osenv"."0.0.3";
-  by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "osenv-0.0.3";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
-        name = "osenv-0.0.3.tgz";
-        sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."osenv" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "osenv" ];
-  };
-  by-spec."punycode".">=0.2.0" =
-    self.by-version."punycode"."1.3.2";
-  by-version."punycode"."1.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "punycode-1.3.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
-        name = "punycode-1.3.2.tgz";
-        sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."punycode" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "punycode" ];
-  };
-  by-spec."qs"."~0.6.0" =
-    self.by-version."qs"."0.6.6";
-  by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage {
-    name = "qs-0.6.6";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
-        name = "qs-0.6.6.tgz";
-        sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."qs" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "qs" ];
-  };
-  by-spec."read"."^1.0.5" =
-    self.by-version."read"."1.0.5";
-  by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "read-1.0.5";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
-        name = "read-1.0.5.tgz";
-        sha1 = "007a3d169478aa710a491727e453effb92e76203";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."read" or []);
-    deps = {
-      "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "read" ];
-  };
-  "read" = self.by-version."read"."1.0.5";
-  by-spec."request"."~2.33.0" =
-    self.by-version."request"."2.33.0";
-  by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage {
-    name = "request-2.33.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz";
-        name = "request-2.33.0.tgz";
-        sha1 = "5167878131726070ec633752ea230a2379dc65ff";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."request" or []);
-    deps = {
-      "qs-0.6.6" = self.by-version."qs"."0.6.6";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
-      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
-      "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
-      "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0";
-      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
-      "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
-      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "request" ];
-  };
-  "request" = self.by-version."request"."2.33.0";
-  by-spec."resumer"."~0.0.0" =
-    self.by-version."resumer"."0.0.0";
-  by-version."resumer"."0.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "resumer-0.0.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz";
-        name = "resumer-0.0.0.tgz";
-        sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."resumer" or []);
-    deps = {
-      "through-2.3.6" = self.by-version."through"."2.3.6";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "resumer" ];
-  };
-  by-spec."rimraf"."2" =
-    self.by-version."rimraf"."2.2.8";
-  by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "rimraf-2.2.8";
-    bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
-        name = "rimraf-2.2.8.tgz";
-        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rimraf" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rimraf" ];
-  };
-  by-spec."rimraf"."~2.1.4" =
-    self.by-version."rimraf"."2.1.4";
-  by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "rimraf-2.1.4";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
-        name = "rimraf-2.1.4.tgz";
-        sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."rimraf" or []);
-    deps = {
-      "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "rimraf" ];
-  };
-  by-spec."runforcover"."~0.0.2" =
-    self.by-version."runforcover"."0.0.2";
-  by-version."runforcover"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "runforcover-0.0.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz";
-        name = "runforcover-0.0.2.tgz";
-        sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."runforcover" or []);
-    deps = {
-      "bunker-0.1.2" = self.by-version."bunker"."0.1.2";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "runforcover" ];
-  };
-  by-spec."semver"."^2.3.0" =
-    self.by-version."semver"."2.3.2";
-  by-version."semver"."2.3.2" = lib.makeOverridable self.buildNodePackage {
-    name = "semver-2.3.2";
-    bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz";
-        name = "semver-2.3.2.tgz";
-        sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."semver" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "semver" ];
-  };
-  "semver" = self.by-version."semver"."2.3.2";
-  by-spec."sigmund"."~1.0.0" =
-    self.by-version."sigmund"."1.0.0";
-  by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "sigmund-1.0.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
-        name = "sigmund-1.0.0.tgz";
-        sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sigmund" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sigmund" ];
-  };
-  by-spec."slide"."*" =
-    self.by-version."slide"."1.1.6";
-  by-version."slide"."1.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "slide-1.1.6";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
-        name = "slide-1.1.6.tgz";
-        sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."slide" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "slide" ];
-  };
-  by-spec."sntp"."0.2.x" =
-    self.by-version."sntp"."0.2.4";
-  by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "sntp-0.2.4";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
-        name = "sntp-0.2.4.tgz";
-        sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."sntp" or []);
-    deps = {
-      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "sntp" ];
-  };
-  by-spec."structured-clone"."~0.2.2" =
-    self.by-version."structured-clone"."0.2.2";
-  by-version."structured-clone"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "structured-clone-0.2.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/structured-clone/-/structured-clone-0.2.2.tgz";
-        name = "structured-clone-0.2.2.tgz";
-        sha1 = "ac92b6be31958a643db30f1335abc6a1b02dfdc2";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."structured-clone" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "structured-clone" ];
-  };
-  "structured-clone" = self.by-version."structured-clone"."0.2.2";
-  by-spec."tap"."~0.4.8" =
-    self.by-version."tap"."0.4.13";
-  by-version."tap"."0.4.13" = lib.makeOverridable self.buildNodePackage {
-    name = "tap-0.4.13";
-    bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tap/-/tap-0.4.13.tgz";
-        name = "tap-0.4.13.tgz";
-        sha1 = "3986134d6759727fc2223e61126eeb87243accbc";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tap" or []);
-    deps = {
-      "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
-      "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
-      "difflet-0.2.6" = self.by-version."difflet"."0.2.6";
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
-      "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2";
-      "slide-1.1.6" = self.by-version."slide"."1.1.6";
-      "yamlish-0.0.6" = self.by-version."yamlish"."0.0.6";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tap" ];
-  };
-  "tap" = self.by-version."tap"."0.4.13";
-  by-spec."tape"."~2.12.3" =
-    self.by-version."tape"."2.12.3";
-  by-version."tape"."2.12.3" = lib.makeOverridable self.buildNodePackage {
-    name = "tape-2.12.3";
-    bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tape/-/tape-2.12.3.tgz";
-        name = "tape-2.12.3.tgz";
-        sha1 = "5559d5454050292627537c012991ec6971f66156";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tape" or []);
-    deps = {
-      "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1";
-      "defined-0.0.0" = self.by-version."defined"."0.0.0";
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "object-inspect-0.4.0" = self.by-version."object-inspect"."0.4.0";
-      "resumer-0.0.0" = self.by-version."resumer"."0.0.0";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tape" ];
-  };
-  "tape" = self.by-version."tape"."2.12.3";
-  by-spec."tar"."~0.1.18" =
-    self.by-version."tar"."0.1.20";
-  by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage {
-    name = "tar-0.1.20";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
-        name = "tar-0.1.20.tgz";
-        sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tar" or []);
-    deps = {
-      "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
-      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tar" ];
-  };
-  "tar" = self.by-version."tar"."0.1.20";
-  by-spec."temp"."~0.6.0" =
-    self.by-version."temp"."0.6.0";
-  by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage {
-    name = "temp-0.6.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz";
-        name = "temp-0.6.0.tgz";
-        sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."temp" or []);
-    deps = {
-      "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4";
-      "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "temp" ];
-  };
-  "temp" = self.by-version."temp"."0.6.0";
-  by-spec."through"."~2.3.4" =
-    self.by-version."through"."2.3.6";
-  by-version."through"."2.3.6" = lib.makeOverridable self.buildNodePackage {
-    name = "through-2.3.6";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/through/-/through-2.3.6.tgz";
-        name = "through-2.3.6.tgz";
-        sha1 = "26681c0f524671021d4e29df7c36bce2d0ecf2e8";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."through" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "through" ];
-  };
-  by-spec."tough-cookie".">=0.12.0" =
-    self.by-version."tough-cookie"."0.12.1";
-  by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage {
-    name = "tough-cookie-0.12.1";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz";
-        name = "tough-cookie-0.12.1.tgz";
-        sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tough-cookie" or []);
-    deps = {
-      "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tough-cookie" ];
-  };
-  by-spec."traverse"."0.6.x" =
-    self.by-version."traverse"."0.6.6";
-  by-version."traverse"."0.6.6" = lib.makeOverridable self.buildNodePackage {
-    name = "traverse-0.6.6";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
-        name = "traverse-0.6.6.tgz";
-        sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."traverse" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "traverse" ];
-  };
-  by-spec."traverse"."~0.5.1" =
-    self.by-version."traverse"."0.5.2";
-  by-version."traverse"."0.5.2" = lib.makeOverridable self.buildNodePackage {
-    name = "traverse-0.5.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz";
-        name = "traverse-0.5.2.tgz";
-        sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."traverse" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "traverse" ];
-  };
-  by-spec."tunnel-agent"."~0.3.0" =
-    self.by-version."tunnel-agent"."0.3.0";
-  by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "tunnel-agent-0.3.0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
-        name = "tunnel-agent-0.3.0.tgz";
-        sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."tunnel-agent" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "tunnel-agent" ];
-  };
-  by-spec."uglify-js"."~1.1.1" =
-    self.by-version."uglify-js"."1.1.1";
-  by-version."uglify-js"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-1.1.1";
-    bin = true;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz";
-        name = "uglify-js-1.1.1.tgz";
-        sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uglify-js" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "uglify-js" ];
-  };
-  by-spec."underscore"."~1.4.4" =
-    self.by-version."underscore"."1.4.4";
-  by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "underscore-1.4.4";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
-        name = "underscore-1.4.4.tgz";
-        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."underscore" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "underscore" ];
-  };
-  by-spec."usb"."~0.3.11" =
-    self.by-version."usb"."0.3.11";
-  by-version."usb"."0.3.11" = lib.makeOverridable self.buildNodePackage {
-    name = "usb-0.3.11";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/usb/-/usb-0.3.11.tgz";
-        name = "usb-0.3.11.tgz";
-        sha1 = "ee61d114181fd1de8738053920cde069d0aa428e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."usb" or []);
-    deps = {
-      "bindings-shyp-0.2.3" = self.by-version."bindings-shyp"."0.2.3";
-      # "usb-shyp-win32-x64-0.3.11-0" = self.by-version."usb-shyp-win32-x64"."0.3.11-0";
-      # "usb-shyp-win32-ia32-0.3.11-0" = self.by-version."usb-shyp-win32-ia32"."0.3.11-0";
-      # "usb-shyp-darwin-x64-0.3.11-0" = self.by-version."usb-shyp-darwin-x64"."0.3.11-0";
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "usb" ];
-  };
-  "usb" = self.by-version."usb"."0.3.11";
-  by-spec."usb-shyp-darwin-x64"."0.3.x" =
-    self.by-version."usb-shyp-darwin-x64"."0.3.11-0";
-  by-version."usb-shyp-darwin-x64"."0.3.11-0" = lib.makeOverridable self.buildNodePackage {
-    name = "usb-shyp-darwin-x64-0.3.11-0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/usb-shyp-darwin-x64/-/usb-shyp-darwin-x64-0.3.11-0.tgz";
-        name = "usb-shyp-darwin-x64-0.3.11-0.tgz";
-        sha1 = "8e6c98e5dff676576dac02c8a0465f1eae833285";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."usb-shyp-darwin-x64" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "usb-shyp-darwin-x64" ];
-  };
-  by-spec."usb-shyp-win32-ia32"."0.3.x" =
-    self.by-version."usb-shyp-win32-ia32"."0.3.11-0";
-  by-version."usb-shyp-win32-ia32"."0.3.11-0" = lib.makeOverridable self.buildNodePackage {
-    name = "usb-shyp-win32-ia32-0.3.11-0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/usb-shyp-win32-ia32/-/usb-shyp-win32-ia32-0.3.11-0.tgz";
-        name = "usb-shyp-win32-ia32-0.3.11-0.tgz";
-        sha1 = "365babb7f648cb8aff12f70c65445e1b0958bbbb";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."usb-shyp-win32-ia32" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "usb-shyp-win32-ia32" ];
-  };
-  by-spec."usb-shyp-win32-x64"."0.3.x" =
-    self.by-version."usb-shyp-win32-x64"."0.3.11-0";
-  by-version."usb-shyp-win32-x64"."0.3.11-0" = lib.makeOverridable self.buildNodePackage {
-    name = "usb-shyp-win32-x64-0.3.11-0";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/usb-shyp-win32-x64/-/usb-shyp-win32-x64-0.3.11-0.tgz";
-        name = "usb-shyp-win32-x64-0.3.11-0.tgz";
-        sha1 = "561417f00ab33c9d990a56e3a4ee446a21a3fcbe";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."usb-shyp-win32-x64" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "usb-shyp-win32-x64" ];
-  };
-  by-spec."wordwrap"."~0.0.2" =
-    self.by-version."wordwrap"."0.0.2";
-  by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "wordwrap-0.0.2";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
-        name = "wordwrap-0.0.2.tgz";
-        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."wordwrap" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "wordwrap" ];
-  };
-  by-spec."yamlish"."*" =
-    self.by-version."yamlish"."0.0.6";
-  by-version."yamlish"."0.0.6" = lib.makeOverridable self.buildNodePackage {
-    name = "yamlish-0.0.6";
-    bin = false;
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.6.tgz";
-        name = "yamlish-0.0.6.tgz";
-        sha1 = "c5df8f7661731351e39eb52223f83a46659452e3";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."yamlish" or []);
-    deps = {
-    };
-    peerDependencies = [
-    ];
-    passthru.names = [ "yamlish" ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 904290caf94..44864062330 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3169,8 +3169,6 @@ let
 
   telnet = callPackage ../tools/networking/telnet { };
 
-  tessel = callPackage ../applications/misc/tessel { };
-
   texmacs = callPackage ../applications/editors/texmacs {
     tex = texLive; /* tetex is also an option */
     extraFonts = true;

From fdfd9d294e0a46ab242ca2922f128f539b08f62e Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 2 Sep 2015 21:24:35 +0000
Subject: [PATCH 1940/2016] mkvtoolnix: 7.9.0 -> 8.3.0

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

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 0dbf4271383..e3f586a3a0f 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -17,11 +17,11 @@ assert legacyGUI -> wxGTK != null;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "7.9.0";
+  version = "8.3.0";
 
   src = fetchurl {
     url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz";
-    sha256 = "0jmsgfkxrnplpmwlzynqdb4xf3x1z3dminz97gmddswwgnjqyy1r";
+    sha256 = "0dzwmwa76y4nhb5brp5a1kxgxjr71czd8vj218qmrlwm54i85gc7";
   };
 
   patchPhase = ''

From e87fa04ddc78c667e99eb6662f3de575279fea08 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 3 Sep 2015 01:16:41 +0200
Subject: [PATCH 1941/2016] nixos: move left-behind allowUnfree comment

---
 nixos/lib/eval-config.nix              | 5 -----
 nixos/modules/misc/extra-arguments.nix | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 3e07df6c086..a87b285c5b7 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -54,11 +54,6 @@ in rec {
 
   # These are the extra arguments passed to every module.  In
   # particular, Nixpkgs is passed through the "pkgs" argument.
-  # FIXME: we enable config.allowUnfree to make packages like
-  # nvidia-x11 available. This isn't a problem because if the user has
-  # ‘nixpkgs.config.allowUnfree = false’, then evaluation will fail on
-  # the 64-bit package anyway. However, it would be cleaner to respect
-  # nixpkgs.config here.
   extraArgs = extraArgs_ // {
     inherit modules baseModules;
   };
diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix
index 02ac6e7a59d..19002b17dac 100644
--- a/nixos/modules/misc/extra-arguments.nix
+++ b/nixos/modules/misc/extra-arguments.nix
@@ -4,6 +4,11 @@
   _module.args = {
     pkgs_i686 = import ../../.. {
       system = "i686-linux";
+      # FIXME: we enable config.allowUnfree to make packages like
+      # nvidia-x11 available. This isn't a problem because if the user has
+      # ‘nixpkgs.config.allowUnfree = false’, then evaluation will fail on
+      # the 64-bit package anyway. However, it would be cleaner to respect
+      # nixpkgs.config here.
       config.allowUnfree = true;
     };
 

From a9b1c91285355daa0a8962822bbbb3d176171b1d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 3 Sep 2015 01:17:27 +0200
Subject: [PATCH 1942/2016] geolite-legacy: update 2015-08-31 -> 2015-09-03

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

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index eeefc4744a2..dc68b1ad2fd 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,23 +8,23 @@ 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-08-31";
+  version = "2015-09-03";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
-    "04r1jir9xpd1h5z0a58mwdsbfdbf2kap0ac498w05i11j4vrlh5n";
+    "11xv6ws0gzyj9bf1j1g67cklkkl6s4wb6z6n7kxjcxnn2274nfy0";
   srcGeoIPv6 = fetchDB
     "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
-    "0vr2a4mlqlaxq3jz8282zygb2y5hx7y660yrjcq02rpmgpmaxkrd";
+    "1q5vgk522wq5ybhbw86zk8njgg611kc46a22vkrp08vklbni3akz";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
-    "11jpl54s1r98adlsr2f88zj4x9pg7gwxphd7hhq8jp3hwrgrwhs8";
+    "07hx9g6kif75icsblcdk64rq13w2knpns4lrxdbf63mmqbqxj29g";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
-    "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187";
+    "0f3y1cpjfd4q55a2kvhzsklmmp6k19v9vsdsjxr4sapc8f5fgfc9";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
     "0pg3715cjmajrfr5xad3g9z386gyk35zq3zkk7ah6sfidavik6vc";

From 81c9095d90df9338928f26525b1bddc512ddd46c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 16:56:15 -0700
Subject: [PATCH 1943/2016] rocksdb: 3.12.1 -> 3.13.1

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

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index c5db9787706..1ea90340021 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "rocksdb-${version}";
-  version = "3.12.1";
+  version = "3.13.1";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
     rev = "rocksdb-${version}";
-    sha256 = "0692jlnakwd5c1h6czd3l7rxhz514whpixyd8y805bnkj2ag61sa";
+    sha256 = "1jw2sjvpixz565wvmgls4rly3wylcmyypka4pvd9mhxkq8d699h9";
   };
 
   buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ];

From 5b134427473e1e6eb4bedc579ffe968efbb88352 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 17:05:42 -0700
Subject: [PATCH 1944/2016] flannel: Migrate to go-packages

---
 pkgs/tools/networking/flannel/default.nix | 25 -----------------------
 pkgs/top-level/all-packages.nix           |  2 +-
 pkgs/top-level/go-packages.nix            |  7 +++++++
 3 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/tools/networking/flannel/default.nix

diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
deleted file mode 100644
index 3c439541e91..00000000000
--- a/pkgs/tools/networking/flannel/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  version = "0.1.0";
-  name = "flannel-${version}";
-  goPackagePath = "github.com/coreos/flannel";
-  src = fetchFromGitHub {
-    owner = "coreos";
-    repo = "flannel";
-    rev = "v${version}";
-    sha256 = "1f7x6a2c8ix6j5y1r0dq56b58bl2rs2ycbdqb9fz5zv1zk2w20rd";
-  };
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "Flannel is an etcd backed network fabric for containers";
-    homepage = https://github.com/coreos/flannel;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44864062330..ff7dd06c090 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1489,7 +1489,7 @@ let
     inherit (perlPackages) ImageExifTool JSON;
   };
 
-  flannel = callPackage ../tools/networking/flannel { };
+  flannel = pkgs.goPackages.flannel.bin // { outputs = [ "bin" ]; };
 
   flashbench = callPackage ../os-specific/linux/flashbench { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 81cfbb250d0..836daa0427b 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -581,6 +581,13 @@ let
     };
   };
 
+  flannel = buildFromGitHub {
+    rev = "v0.5.3";
+    owner = "coreos";
+    repo = "flannel";
+    sha256 = "0d9khv0bczvsaqnz16p546m4r5marmnkcrdhi0f3ajnwxb776r9p";
+  };
+
   fsnotify.v1 = buildGoPackage rec {
     rev = "v1.2.0";
     name = "fsnotify.v1-${rev}";

From dea4d952ae6f9f603284664ead027ec1eea6eec7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 17:18:40 -0700
Subject: [PATCH 1945/2016] ngrok: Move to go-packages

---
 pkgs/tools/misc/ngrok/default.nix | 43 -------------------------------
 pkgs/top-level/all-packages.nix   |  2 +-
 pkgs/top-level/go-packages.nix    | 42 +++++++++++++++++++++---------
 3 files changed, 31 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/tools/misc/ngrok/default.nix

diff --git a/pkgs/tools/misc/ngrok/default.nix b/pkgs/tools/misc/ngrok/default.nix
deleted file mode 100644
index 5b55175217a..00000000000
--- a/pkgs/tools/misc/ngrok/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, git, fetchFromGitHub, goPackages }:
-
-with goPackages;
-
-buildGoPackage rec {
-  name = "ngrok-1.7";
-  goPackagePath = "ngrok";
-
-  src = fetchFromGitHub {
-    rev = "b7d5571aa7f12ac304b8f8286b855cc64dd9bab8";
-    owner = "inconshreveable";
-    repo = "ngrok";
-    sha256 = "0a5iq9l9f2xdg6gnc9pj0iczhycv1w5iwcqgzzap83xfpy01xkh4";
-  };
-
-  subPackages = [ "main/ngrok" "main/ngrokd" ];
-
-  preConfigure = ''
-    sed -e '/jteeuwen\/go-bindata/d' \
-        -e '/export GOPATH/d' \
-        -e 's/go get/#go get/' \
-        -e 's|bin/go-bindata|go-bindata|' -i Makefile
-    make assets BUILDTAGS=release
-    export sourceRoot=$sourceRoot/src/ngrok
-  '';
-
-  buildInputs = [ git log4go websocket go-vhost mousetrap termbox-go rcrowley.go-metrics
-                  yaml-v1 go-bindata.bin go-update binarydist osext ];
-
-  buildFlags = "-tags release";
-
-  dontInstallSrc = true;
-
-  meta = with stdenv.lib; {
-    description = "Reverse proxy that creates a secure tunnel between from a public endpoint t
-o a locally running web service";
-    homepage = https://ngrok.com/;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ iElectric cstrahan ];
-    platforms = with platforms; linux ++ darwin;
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff7dd06c090..9b09fae5007 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2385,7 +2385,7 @@ let
     inherit gnumake3;
   };
 
-  ngrok = callPackage ../tools/misc/ngrok { };
+  ngrok = pkgs.goPackages.ngrok.bin // { outputs = [ "bin" ]; };
 
   noip = callPackage ../tools/networking/noip { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 836daa0427b..4869363ed04 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1279,19 +1279,13 @@ let
     buildInputs = [ dbus ];
   };
 
-  go-update = buildGoPackage rec {
-    rev = "c1385108bc3a016f1c88b75ea7d2e2a356a1571d";
-    name = "go-update-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/inconshreveable/go-update";
-
+  go-update-v0 = buildFromGitHub {
+    rev = "d8b0b1d421aa1cbf392c05869f8abbc669bb7066";
+    owner = "inconshreveable";
+    repo = "go-update";
+    sha256 = "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa";
+    goPackagePath = "gopkg.in/inconshreveable/go-update.v0";
     buildInputs = [ osext binarydist ];
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "inconshreveable";
-      repo = "go-update";
-      sha256 = "16zaxa0i07ismxdmkvjj4dpyc9lgp6wa94q090m9a48si40w9sjn";
-    };
   };
 
   go-uuid = buildFromGitHub {
@@ -1781,6 +1775,30 @@ let
     propagatedBuildInputs = [ ugorji.go ];
   };
 
+  ngrok = buildFromGitHub {
+    rev = "1.7.1";
+    owner = "inconshreveable";
+    repo = "ngrok";
+    sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4";
+    goPackagePath = "ngrok";
+
+    preConfigure = ''
+      sed -e '/jteeuwen\/go-bindata/d' \
+          -e '/export GOPATH/d' \
+          -e 's/go get/#go get/' \
+          -e 's|bin/go-bindata|go-bindata|' -i Makefile
+      make assets BUILDTAGS=release
+      export sourceRoot=$sourceRoot/src/ngrok
+    '';
+
+    buildInputs = [
+      git log4go websocket go-vhost mousetrap termbox-go rcrowley.go-metrics
+      yaml-v1 go-bindata.bin go-update-v0 binarydist osext
+    ];
+
+    buildFlags = [ "-tags release" ];
+  };
+
   ntp = buildFromGitHub {
     rev    = "0a5264e2563429030eb922f258229ae3fee5b5dc";
     owner  = "beevik";

From a8d64c8eea41e5c5eb2c650b1938d11c47d8b6b7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 17:26:57 -0700
Subject: [PATCH 1946/2016] fzf: Move to go-packages and 0.10.0 -> 0.10.4

---
 pkgs/tools/misc/fzf/default.nix | 33 ---------------------------------
 pkgs/top-level/all-packages.nix |  2 +-
 pkgs/top-level/go-packages.nix  | 11 +++++++++++
 3 files changed, 12 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/tools/misc/fzf/default.nix

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
deleted file mode 100644
index 5692fc25a32..00000000000
--- a/pkgs/tools/misc/fzf/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchFromGitHub, goPackages, syncthing, ncurses }:
-
-with goPackages;
-
-buildGoPackage rec {
-  name = "fzf-${version}";
-  version = "0.10.0";
-  goPackagePath = "github.com/junegunn/fzf";
-  src = fetchFromGitHub {
-    owner = "junegunn";
-    repo = "fzf";
-    rev = "${version}";
-    sha256 = "0dx9qwmcrnh31m2n75qmpj1dxm6rr6xsbazy4nwa3bzrb8y6svh2";
-  };
-
-  buildInputs = with goPackages; [
-    crypto
-    ginkgo
-    gomega
-    junegunn.go-runewidth
-    go-shellwords
-    ncurses
-    syncthing
-    text
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/junegunn/fzf;
-    description = "A command-line fuzzy finder written in Go";
-    license = licenses.mit;
-    maintainers = [ maintainers.magnetophon ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b09fae5007..bd51242f8c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -892,7 +892,7 @@ let
 
   filter_audio = callPackage ../development/libraries/filter_audio { };
 
-  fzf = callPackage ../tools/misc/fzf { };
+  fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; };
 
   gist = callPackage ../tools/text/gist { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 4869363ed04..54043d9c859 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -601,6 +601,17 @@ let
     };
   };
 
+  fzf = buildFromGitHub {
+    rev = "0.10.4";
+    owner = "junegunn";
+    repo = "fzf";
+    sha256 = "06wda8pm1invnj4sfwcicw9qim3jdf9s1fcrai7xqz7wgy74qv1f";
+
+    buildInputs = [
+      crypto ginkgo gomega junegunn.go-runewidth go-shellwords pkgs.ncurses text
+    ];
+  };
+
   g2s = buildFromGitHub {
     rev    = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc";
     owner  = "peterbourgon";

From 72d86374f25ad047554d1cb193c7d0d7873d0169 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 17:35:09 -0700
Subject: [PATCH 1947/2016] all-packages: goPackages Cleanups

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd51242f8c9..aa529fffe1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1489,7 +1489,7 @@ let
     inherit (perlPackages) ImageExifTool JSON;
   };
 
-  flannel = pkgs.goPackages.flannel.bin // { outputs = [ "bin" ]; };
+  flannel = goPackages.flannel.bin // { outputs = [ "bin" ]; };
 
   flashbench = callPackage ../os-specific/linux/flashbench { };
 
@@ -1708,7 +1708,7 @@ let
   gptfdisk = callPackage ../tools/system/gptfdisk { };
 
   grafana-frontend = callPackage ../development/tools/misc/grafana { };
-  grafana-backend = pkgs.goPackages.grafana.bin // { outputs = [ "bin" ]; };
+  grafana-backend = goPackages.grafana.bin // { outputs = [ "bin" ]; };
 
   grafx2 = callPackage ../applications/graphics/grafx2 {};
 
@@ -2385,7 +2385,7 @@ let
     inherit gnumake3;
   };
 
-  ngrok = pkgs.goPackages.ngrok.bin // { outputs = [ "bin" ]; };
+  ngrok = goPackages.ngrok.bin // { outputs = [ "bin" ]; };
 
   noip = callPackage ../tools/networking/noip { };
 
@@ -13705,7 +13705,7 @@ let
 
   chessdb = callPackage ../games/chessdb { };
 
-  confd = pkgs.goPackages.confd.bin // { outputs = [ "bin" ]; };
+  confd = goPackages.confd.bin // { outputs = [ "bin" ]; };
 
   construoBase = lowPrio (callPackage ../games/construo {
     mesa = null;
@@ -14568,7 +14568,7 @@ let
     camlp5 = ocamlPackages.camlp5_strict;
   };
 
-  hologram = pkgs.goPackages.hologram.bin // { outputs = [ "bin" ]; };
+  hologram = goPackages.hologram.bin // { outputs = [ "bin" ]; };
 
   isabelle = import ../applications/science/logic/isabelle {
     inherit (pkgs) stdenv fetchurl nettools perl polyml;

From b50567912ae2329a4bc9b9d29900649c18be48f6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 17:36:23 -0700
Subject: [PATCH 1948/2016] mtpfs: Update to 2015-08-01 and move to go-packages

---
 pkgs/tools/filesystems/mtpfs/default.nix | 26 --------------
 pkgs/top-level/all-packages.nix          |  2 +-
 pkgs/top-level/go-packages.nix           | 44 +++++++++++++-----------
 3 files changed, 24 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/mtpfs/default.nix

diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix
deleted file mode 100644
index 7725b0d7af8..00000000000
--- a/pkgs/tools/filesystems/mtpfs/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, fuse, libmtp, glib, libmad, libid3tag }:
-
-stdenv.mkDerivation rec {
-  name = "mtpfs-1.1";
-
-  buildInputs = [ pkgconfig fuse libmtp glib libid3tag libmad ];
-
-  # adding LIBS is a hack, duno why it does not find libid3tag.so by adding buildInputs
-  preConfigure = ''
-    export MAD_CFLAGS=${libmad}/include
-    export MAD_LIBS=${libmad}/lib/libmad.so
-    export LIBS=${libid3tag}/lib/libid3tag.so
-  '';
-
-  src = fetchurl {
-    url = "http://www.adebenham.com/files/mtp/${name}.tar.gz";
-    sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv";
-  };
-
-  meta = {
-    homepage = https://code.google.com/p/mtpfs/;
-    description = "FUSE Filesystem providing access to MTP devices";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.qknight ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa529fffe1b..a04874e49e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7713,7 +7713,7 @@ let
 
   mtdev = callPackage ../development/libraries/mtdev { };
 
-  mtpfs = callPackage ../tools/filesystems/mtpfs { };
+  mtpfs = pkgs.goPackages.mtpfs.bin // { outputs = [ "bin" ]; };
 
   mu = callPackage ../tools/networking/mu {
     texinfo = texinfo4;
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 54043d9c859..81681bb186a 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1036,17 +1036,12 @@ let
     sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680";
   };
 
-  go-fuse = buildGoPackage rec {
-    rev = "5d16aa11eef4643de2d91e88a64dcb6138705d58";
-    name = "go-fuse-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hanwen/go-fuse";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hanwen";
-      repo = "go-fuse";
-      sha256 = "0lycfhchn88kbs81ypz8m5jh032fpbv14gldrjirf32wm1d4f8pj";
-    };
-    subPackages = [ "fuse" "fuse/nodefs" "fuse/pathfs" ];
+  go-fuse = buildFromGitHub rec {
+    rev = "324ea173d0a4d90e0e97c464a6ad33f80c9587a8";
+    date = "2015-07-27";
+    owner = "hanwen";
+    repo = "go-fuse";
+    sha256 = "0r5amgnpb4g7b6kpz42vnj01w515by4yhy64s5lqf3snzjygaycf";
   };
 
   go-github = buildFromGitHub {
@@ -1748,6 +1743,16 @@ let
     };
   };
 
+  mtpfs = buildFromGitHub {
+    rev = "3ef47f91c38cf1da3e965e37debfc81738e9cd94";
+    date = "2015-08-01";
+    owner = "hanwen";
+    repo = "go-mtpfs";
+    sha256 = "1f7lcialkpkwk01f7yxw77qln291sqjkspb09mh0yacmrhl231g8";
+
+    buildInputs = [ go-fuse usb ];
+  };
+
   mux = buildFromGitHub {
     rev = "5a8a0400500543e28b2886a8c52d21a435815411";
     date = "2015-08-05";
@@ -2636,18 +2641,15 @@ let
     sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
   };
 
-  usb = buildGoPackage rec {
+  usb = buildFromGitHub rec {
     rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1";
-    name = "usb-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hanwen/usb";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "hanwen";
-      repo = "usb";
-      sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky";
-    };
+    date = "2014-12-17";
+    owner = "hanwen";
+    repo = "usb";
+    sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky";
+
     nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ pkgs.libusb ];
+    buildInputs = [ pkgs.libusb1 ];
   };
 
   vault = buildFromGitHub {

From acd17d21b38c03235a35dab7e8af1df7069f41fd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 17:39:42 -0700
Subject: [PATCH 1949/2016] mtpfs: Fix accidental deletion

---
 pkgs/tools/filesystems/go-mtpfs/default.nix | 29 ---------------------
 pkgs/tools/filesystems/mtpfs/default.nix    | 26 ++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 +--
 3 files changed, 28 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/go-mtpfs/default.nix
 create mode 100644 pkgs/tools/filesystems/mtpfs/default.nix

diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix
deleted file mode 100644
index cf521425a76..00000000000
--- a/pkgs/tools/filesystems/go-mtpfs/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, goPackages, pkgconfig, libmtp, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "9c2b46050e8ea8574eaec2124867ac7b11e6471d";
-  name = "go-mtpfs-${lib.strings.substring 0 7 rev}";
-  goPackagePath = "github.com/hanwen/go-mtpfs";
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "hanwen";
-    repo = "go-mtpfs";
-    sha256 = "0kxi18cb078q4wikfajp3yvp802wzfsfdp431j0dg2jdw8y7gfii";
-  };
-
-  buildInputs = [ go-fuse libmtp usb ];
-
-  subPackages = [ "./" ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "A simple FUSE filesystem for mounting Android devices as a MTP device";
-    homepage    = https://github.com/hanwen/go-mtpfs;
-    maintainers = with maintainers; [ bennofs ];
-    platforms   = platforms.linux;
-    license     = licenses.bsd3;
-  };
-}
diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix
new file mode 100644
index 00000000000..7725b0d7af8
--- /dev/null
+++ b/pkgs/tools/filesystems/mtpfs/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, fuse, libmtp, glib, libmad, libid3tag }:
+
+stdenv.mkDerivation rec {
+  name = "mtpfs-1.1";
+
+  buildInputs = [ pkgconfig fuse libmtp glib libid3tag libmad ];
+
+  # adding LIBS is a hack, duno why it does not find libid3tag.so by adding buildInputs
+  preConfigure = ''
+    export MAD_CFLAGS=${libmad}/include
+    export MAD_LIBS=${libmad}/lib/libmad.so
+    export LIBS=${libid3tag}/lib/libid3tag.so
+  '';
+
+  src = fetchurl {
+    url = "http://www.adebenham.com/files/mtp/${name}.tar.gz";
+    sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv";
+  };
+
+  meta = {
+    homepage = https://code.google.com/p/mtpfs/;
+    description = "FUSE Filesystem providing access to MTP devices";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.qknight ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a04874e49e4..eb9fc9c4376 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1693,7 +1693,7 @@ let
 
   goaccess = callPackage ../tools/misc/goaccess { };
 
-  go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
+  go-mtpfs = pkgs.goPackages.mtpfs.bin // { outputs = [ "bin" ]; };
 
   googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
 
@@ -7713,7 +7713,7 @@ let
 
   mtdev = callPackage ../development/libraries/mtdev { };
 
-  mtpfs = pkgs.goPackages.mtpfs.bin // { outputs = [ "bin" ]; };
+  mtpfs = callPackage ../tools/filesystems/mtpfs { };
 
   mu = callPackage ../tools/networking/mu {
     texinfo = texinfo4;

From 8f34c4482403bcadf00d44fc32496ede0aa53e4d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 17:43:36 -0700
Subject: [PATCH 1950/2016] asciinema: Move to go-packages

---
 pkgs/tools/misc/asciinema/default.nix | 22 ----------------------
 pkgs/top-level/all-packages.nix       |  2 +-
 pkgs/top-level/go-packages.nix        |  7 +++++++
 3 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/tools/misc/asciinema/default.nix

diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix
deleted file mode 100644
index 626fb5c2321..00000000000
--- a/pkgs/tools/misc/asciinema/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchFromGitHub, goPackages }:
-
-goPackages.buildGoPackage rec {
-  name = "asciinema-${version}";
-  version = "1.1.1";
-
-  goPackagePath = "github.com/asciinema/asciinema";
-
-  src = fetchFromGitHub {
-    owner = "asciinema";
-    repo = "asciinema";
-    rev = "d6f7cabcd085e237872f13d0ab5580964cb64fb2";
-    sha256 = "0ip7wcqzf5wax99c1fjmnwd38q88z1xiyv9cfbjyk47npdqb8173";
-  };
-
-  meta = {
-    homepage = https://asciinema.org/;
-    license = stdenv.lib.licenses.gpl3;
-    description = "Terminal session recorder";
-    maintainers = with stdenv.lib.maintainers; [ lassulus ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb9fc9c4376..94bce20d75b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -611,7 +611,7 @@ let
 
   ascii = callPackage ../tools/text/ascii { };
 
-  asciinema = callPackage ../tools/misc/asciinema { };
+  asciinema = pkgs.goPackages.asciinema.bin // { outputs = [ "bin" ]; };
 
   asymptote = callPackage ../tools/graphics/asymptote {
     texLive = texLiveAggregationFun {
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 81681bb186a..a3bbc6ed4fd 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -167,6 +167,13 @@ let
     sha256 = "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p";
   };
 
+  asciinema = buildFromGitHub {
+    rev = "v1.1.1";
+    owner = "asciinema";
+    repo = "asciinema";
+    sha256 = "0k48k8815k433s25lh8my2swl89kczp0m2gbqzjlpy1xwmk06nxc";
+  };
+
   asn1-ber = buildGoPackage rec {
     rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72";
     name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}";

From 5f35b0f7dafbf67d447a28b916ce81edfb52dc7e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 17:51:03 -0700
Subject: [PATCH 1951/2016] serfdom: Migrate to go-packages

---
 pkgs/servers/serfdom/default.nix | 28 ----------------------------
 pkgs/top-level/all-packages.nix  |  2 +-
 pkgs/top-level/go-packages.nix   | 15 +++++----------
 3 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/servers/serfdom/default.nix

diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix
deleted file mode 100644
index 94a46459d4e..00000000000
--- a/pkgs/servers/serfdom/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  version = "0.6.4";
-  name = "serfdom-${version}";
-  goPackagePath = "github.com/hashicorp/serf";
-
-  src = fetchFromGitHub {
-    owner = "hashicorp";
-    repo = "serf";
-    rev = "v${version}";
-    sha256 = "1fhz8wrvsmgaky22n255w9hkyfph2n45c47ivdyzrrxisg5j2438";
-  };
-
-  buildInputs = [ cli mapstructure memberlist_v2 logutils go-syslog mdns columnize circbuf ugorji.go ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "A service discovery and orchestration tool that is decentralized, highly available, and fault tolerant";
-    homepage = http://www.serfdom.io/;
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ msackman cstrahan ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94bce20d75b..018793fbe29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9328,7 +9328,7 @@ let
 
   shairport-sync = callPackage ../servers/shairport-sync { };
 
-  serfdom = callPackage ../servers/serfdom { };
+  serfdom = pkgs.goPackages.serf.bin // { outputs = [ "bin" ]; };
 
   seyren = callPackage ../servers/monitoring/seyren { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a3bbc6ed4fd..1c53e986651 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2489,17 +2489,12 @@ let
     buildInputs = [ armon.go-metrics net-rpc-msgpackrpc yamux ];
   };
 
-  serf = buildGoPackage rec {
+  serf = buildFromGitHub {
     rev = "668982d8f90f5eff4a766583c1286393c1d27f68";
-    name = "serf-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/hashicorp/serf";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "hashicorp";
-      repo   = "serf";
-      sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk";
-    };
+    date = "2015-05-15";
+    owner  = "hashicorp";
+    repo   = "serf";
+    sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk";
 
     buildInputs = [
       circbuf armon.go-metrics ugorji.go go-syslog logutils mdns memberlist

From cb8a2e95030b74a982e6acddd03b8c28cda2e235 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 18:14:50 -0700
Subject: [PATCH 1952/2016] nsq: Move to go-packages and 0.2.28 -> 0.3.5

---
 pkgs/servers/nsq/default.nix    | 32 ------------
 pkgs/top-level/all-packages.nix |  2 +-
 pkgs/top-level/go-packages.nix  | 87 ++++++++++++++++++++-------------
 3 files changed, 55 insertions(+), 66 deletions(-)
 delete mode 100644 pkgs/servers/nsq/default.nix

diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix
deleted file mode 100644
index a7b77b8802a..00000000000
--- a/pkgs/servers/nsq/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, goPackages, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  version = "0.2.28";
-  name = "nsq-${version}";
-  goPackagePath = "github.com/bitly/nsq";
-  src = fetchFromGitHub {
-    owner = "bitly";
-    repo = "nsq";
-    rev = "v${version}";
-    sha256 = "0drmf1j5w3q4l6f7xjy3y7d7cl50gcx0qwci6mahxsyaaclx60yx";
-  };
-
-  subPackages = [ "nsqadmin" ] ++
-                map (x: "apps/"+x) [ "nsq_pubsub" "nsq_stat" "nsq_tail"
-                                     "nsq_to_file" "nsq_to_http" "nsq_to_nsq"
-                                     "nsqd" "nsqlookupd" ];
-
-  buildInputs = [ go-nsq go-options toml perks go-hostpool ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "A realtime distributed messaging platform";
-    homepage = http://nsq.io/;
-    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 018793fbe29..bdf365fa1ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9108,7 +9108,7 @@ let
 
   nsd = callPackage ../servers/dns/nsd (config.nsd or {});
 
-  nsq = callPackage ../servers/nsq { };
+  nsq = pkgs.goPackages.nsq.bin // { outputs = [ "bin" ]; };
 
   openpts = callPackage ../servers/openpts { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 1c53e986651..1343bef2dec 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1075,10 +1075,11 @@ let
   };
 
   go-hostpool = buildFromGitHub {
-    rev    = "fed86fae5cacdc77e7399937e2f8836563620a2e";
+    rev    = "d0e59c22a56e8dadfed24f74f452cea5a52722d2";
+    date   = "2015-03-31";
     owner  = "bitly";
     repo   = "go-hostpool";
-    sha256 = "0nbssfp5ksj4hhc0d8lfq54afd9nqv6qzk3vi6rinxr3fgplrj44";
+    sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g";
   };
 
   go-ini = buildFromGitHub {
@@ -1169,24 +1170,21 @@ let
     sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r";
   };
 
-  go-nsq = buildGoPackage rec {
-    rev = "c79a282f05364e340eadc2ce2f862a3d44eea9c0";
-    name = "go-nsq-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/bitly/go-nsq";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "bitly";
-      repo = "go-nsq";
-      sha256 = "19jlwj5419p5xwjzfnzlddjnbh5g7ifnqhd00i5p0b6ww1gk011p";
-    };
+  go-nsq = buildFromGitHub {
+    rev = "v1.0.4";
+    owner = "nsqio";
+    repo = "go-nsq";
+    sha256 = "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46";
     propagatedBuildInputs = [ go-simplejson go-snappystream ];
+    goPackageAliases = [ "github.com/bitly/go-nsq" ];
   };
 
   go-options = buildFromGitHub {
-    rev    = "896a539cd709f4f39d787562d1583c016ce7517e";
+    rev    = "7c174072188d0cfbe6f01bb457626abb22bdff52";
+    date   = "2014-12-20";
     owner  = "mreiferson";
     repo   = "go-options";
-    sha256 = "0hg0n5grcjcj5719rqchz0plp39wfk3znqxw8y354k4jwsqwmn17";
+    sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm";
   };
 
   go-querystring = buildFromGitHub {
@@ -1235,22 +1233,19 @@ let
   };
 
   go-simplejson = buildFromGitHub {
-    rev    = "1cfceb0e12f47ec02665ef480212d7b531d6f4c5";
+    rev    = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a";
+    date   = "2015-03-31";
     owner  = "bitly";
     repo   = "go-simplejson";
-    sha256 = "1d8x0himl58qn87lv418djy6mbs66p9ai3zpqq13nhkfl67fj3bi";
+    sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy";
   };
 
-  go-snappystream = buildGoPackage rec {
+  go-snappystream = buildFromGitHub {
     rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504";
-    name = "go-snappystream-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/mreiferson/go-snappystream";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "mreiferson";
-      repo = "go-snappystream";
-      sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6";
-    };
+    date = "2015-04-16";
+    owner = "mreiferson";
+    repo = "go-snappystream";
+    sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6";
   };
 
   go-sqlite3 = buildFromGitHub {
@@ -1822,6 +1817,15 @@ let
     buildFlags = [ "-tags release" ];
   };
 
+  nsq = buildFromGitHub {
+    rev = "v0.3.5";
+    owner = "bitly";
+    repo = "nsq";
+    sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f";
+
+    buildInputs = [ go-nsq go-options semver perks toml go-hostpool timer_metrics ];
+  };
+
   ntp = buildFromGitHub {
     rev    = "0a5264e2563429030eb922f258229ae3fee5b5dc";
     owner  = "beevik";
@@ -1931,13 +1935,6 @@ let
     propagatedBuildInputs = [ osext ];
   };
 
-  perks = buildFromGitHub {
-    rev    = "aac9e2eab5a334037057336897fd10b0289a5ae8";
-    owner  = "bmizerany";
-    repo   = "perks";
-    sha256 = "1d027jgc327qz5xmal0hrpqvsj45i9yqmm9pxk3xp3hancvz3l3k";
-  };
-
   pb = buildFromGitHub {
     rev    = "e648e12b78cedf14ebb2fc1855033f07b034cfbb";
     owner  = "cheggaaa";
@@ -1945,13 +1942,20 @@ let
     sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam";
   };
 
+  perks = buildFromGitHub rec {
+    date   = "2014-07-16";
+    owner  = "bmizerany";
+    repo   = "perks";
+    rev    = "d9a9656a3a4b1c2864fdb44db2ef8619772d92aa";
+    sha256 = "0f39b3zfm1zd6xcvlm6szgss026qs84n2j9y5bnb3zxzdkxb9w9n";
+  };
+
   beorn7.perks = buildFromGitHub rec {
     date   = "2015-02-23";
     owner  = "beorn7";
     repo   = "perks";
     rev    = "b965b613227fddccbfffe13eae360ed3fa822f8d";
     sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
-    goPackagePath = "github.com/beorn7/perks";
   };
 
   pflag = buildGoPackage rec {
@@ -2489,6 +2493,14 @@ let
     buildInputs = [ armon.go-metrics net-rpc-msgpackrpc yamux ];
   };
 
+  semver = buildFromGitHub {
+    rev = "31b736133b98f26d5e078ec9eb591666edfd091f";
+    date = "2015-07-20";
+    owner = "blang";
+    repo = "semver";
+    sha256 = "19ifi0na4cj23q3h8xv89mx7p48y0ciymhmlrq9milm0xz80wk10";
+  };
+
   serf = buildFromGitHub {
     rev = "668982d8f90f5eff4a766583c1286393c1d27f68";
     date = "2015-05-15";
@@ -2627,6 +2639,14 @@ let
     propagatedBuildInputs = [ pty ];
   };
 
+  timer_metrics = buildFromGitHub {
+    rev = "afad1794bb13e2a094720aeb27c088aa64564895";
+    date = "2015-02-02";
+    owner = "bitly";
+    repo = "timer_metrics";
+    sha256 = "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c";
+  };
+
   tomb = buildFromGitHub {
     rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8";
     owner = "go-tomb";
@@ -2638,6 +2658,7 @@ let
 
   toml = buildFromGitHub {
     rev    = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
+    date   = "2015-05-01";
     owner  = "BurntSushi";
     repo   = "toml";
     sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";

From e7a783dccfae45a0b6650ff9c3fbd6924d72dcb7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 18:18:08 -0700
Subject: [PATCH 1953/2016] goPackages: More cleanups

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bdf365fa1ba..ca8ef6d121e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -611,7 +611,7 @@ let
 
   ascii = callPackage ../tools/text/ascii { };
 
-  asciinema = pkgs.goPackages.asciinema.bin // { outputs = [ "bin" ]; };
+  asciinema = goPackages.asciinema.bin // { outputs = [ "bin" ]; };
 
   asymptote = callPackage ../tools/graphics/asymptote {
     texLive = texLiveAggregationFun {
@@ -1693,7 +1693,7 @@ let
 
   goaccess = callPackage ../tools/misc/goaccess { };
 
-  go-mtpfs = pkgs.goPackages.mtpfs.bin // { outputs = [ "bin" ]; };
+  go-mtpfs = goPackages.mtpfs.bin // { outputs = [ "bin" ]; };
 
   googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
 
@@ -9108,7 +9108,7 @@ let
 
   nsd = callPackage ../servers/dns/nsd (config.nsd or {});
 
-  nsq = pkgs.goPackages.nsq.bin // { outputs = [ "bin" ]; };
+  nsq = goPackages.nsq.bin // { outputs = [ "bin" ]; };
 
   openpts = callPackage ../servers/openpts { };
 
@@ -9328,7 +9328,7 @@ let
 
   shairport-sync = callPackage ../servers/shairport-sync { };
 
-  serfdom = pkgs.goPackages.serf.bin // { outputs = [ "bin" ]; };
+  serfdom = goPackages.serf.bin // { outputs = [ "bin" ]; };
 
   seyren = callPackage ../servers/monitoring/seyren { };
 

From 4fc7619d23aa847e0aa8a5141da623da80859dd5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 18:19:47 -0700
Subject: [PATCH 1954/2016] nsq: Remove benchmark utilies as they are uneeded

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 1343bef2dec..b01062d1c49 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1823,6 +1823,8 @@ let
     repo = "nsq";
     sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f";
 
+    excludedPackages = "bench";
+
     buildInputs = [ go-nsq go-options semver perks toml go-hostpool timer_metrics ];
   };
 

From a906355b8ab404baa20dc167225d57e3120f067d Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 3 Sep 2015 03:38:44 +0200
Subject: [PATCH 1955/2016] zbar: ghostscript was missing for zbar

---
 pkgs/tools/graphics/zbar/default.nix | 2 +-
 pkgs/top-level/all-packages.nix      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 51dcc2a9c80..af98e3c014c 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l
-  , qt4, lzma, gtk2
+  , qt4, lzma, gtk2, ghostscript
   , ...}:
 builderDefsPackage
 (a :  
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca8ef6d121e..6921ded707a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3620,6 +3620,7 @@ let
     pygtk = lib.overrideDerivation pygtk (x: {
       gtk = gtk2;
     });
+    ghostscript = ghostscriptX;
   };
 
   zdelta = callPackage ../tools/compression/zdelta { };

From 21370fb1502aed0aef31b025b80c5e4863d81ec4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 21:49:40 -0700
Subject: [PATCH 1956/2016] bind: 9.10.2-P3 -> 9.10.2-P4

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

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 8a5b7f2af53..457ae1cedf6 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
 
-let version = "9.10.2-P3"; in
+let version = "9.10.2-P4"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0jhxbsdb8q5q0vn5aga53ixz2iy9zz8p5vwkzvngymd4vmk9l1vq";
+    sha256 = "1f4w89qmsgql88nbykz82p2nwbf5m889vzlfy9bjj8gg3pn222y0";
   };
 
   patchPhase = ''

From 45734349bfad80849cc956699944da605166f227 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 22:16:53 -0700
Subject: [PATCH 1957/2016] dclxvi: Init at 2013-01-27

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

diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix
new file mode 100644
index 00000000000..1b8528dd08b
--- /dev/null
+++ b/pkgs/development/libraries/dclxvi/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "dclxvi-2013-01-27";
+
+  src = fetchFromGitHub {
+    owner = "agl";
+    repo = "dclxvi";
+    rev = "74009d58f2305be3b95d88717619bde8ecbdd9a2";
+    sha256 = "1kx4h8iv7yb30c6zjmj8zs9x12vxhi0jwkiwxsxj9swf6bww6p1g";
+  };
+
+  buildFlags = [ "libdclxvipairing.so" ];
+
+  installPhase = ''
+    mkdir -p $out/{include,lib}
+    find . -name \*.h -exec cp {} $out/include \;
+    find . -name \*.so -exec cp {} $out/lib \;
+  '';
+
+  meta = with stdenv.lib; {
+    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;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6921ded707a..9ed91ee05b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1261,6 +1261,8 @@ let
 
   dbench = callPackage ../development/tools/misc/dbench { };
 
+  dclxvi = callPackage ../development/libraries/dclxvi { };
+
   dcraw = callPackage ../tools/graphics/dcraw { };
 
   dcfldd = callPackage ../tools/system/dcfldd { };

From 20a1c9cc3b3e5171d4c935387136e9f17e40ce47 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 22:17:31 -0700
Subject: [PATCH 1958/2016] goPackages: Update appengine

---
 pkgs/top-level/go-packages.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index b01062d1c49..052e0fce8e5 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1135,16 +1135,12 @@ let
     buildInputs = [ influxdb8 stathat ];
   };
 
-  appengine = buildGoPackage rec {
-    rev = "25b8450bec636c6b6e3b9b33d3a3f55230b10812";
-    name = "appengine-${stdenv.lib.strings.substring 0 7 rev}";
+  appengine = buildFromGitHub {
+    rev = "72f4367c4f14a20a98dcc8b762953b40788407be";
+    owner = "golang";
+    repo = "appengine";
+    sha256 = "1phjkb0f0xp08db3irbf5wzdsxzsddsig5wv70wvmnr44ijllh4f";
     goPackagePath = "google.golang.org/appengine";
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "golang";
-      repo = "appengine";
-      sha256 = "1b0v244hmw8078601v18xda501aix0kw4q2m1g3ai33dl0p2dh2n";
-    };
     buildInputs = [ protobuf net ];
   };
 

From 4bd817b82aaf4a46eba9f2d842aa102b57f03c70 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 22:17:45 -0700
Subject: [PATCH 1959/2016] pond: Migrate to go-packages

---
 pkgs/applications/networking/pond/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/applications/networking/pond/default.nix

diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix
deleted file mode 100644
index 21d99013a1a..00000000000
--- a/pkgs/applications/networking/pond/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, goPackages, fetchgit, trousers }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "f4e441c77a2039814046ff8219629c547fe8b689";
-  name = "pond-${lib.strings.substring 0 7 rev}";
-  goPackagePath = "github.com/agl/pond";
-  src = fetchgit {
-    inherit rev;
-    url = "git://github.com/agl/pond.git";
-    sha256 = "f2dfc6cb96cc4b8ae732e41d1958b62036f40cb346df2e14f27b5964a1416026";
-  };
-
-  subPackages = [ "client" ];
-
-  buildInputs = [ trousers net crypto protobuf ed25519 govers ];
-    
-  buildFlags = "--tags nogui";
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "Forward secure, asynchronous messaging for the discerning";
-    homepage = https://pond.imperialviolet.org;
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-  };
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ed91ee05b4..bc1067d88cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12543,7 +12543,7 @@ let
     inherit (xorg) libXpm;
   };
 
-  pond = callPackage ../applications/networking/pond { };
+  pond = goPackages.pond.bin // { outputs = [ "bin" ]; };
 
   ponymix = callPackage ../applications/audio/ponymix { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 052e0fce8e5..ea3dcd6a279 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1969,6 +1969,17 @@ let
     doCheck = false; # bad import path in tests
   };
 
+  pond = buildFromGitHub {
+    rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
+    owner = "agl";
+    repo = "pond";
+    sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4";
+
+    buildInputs = [ net crypto protobuf ed25519 pkgs.trousers pkgs.dclxvi ];
+    buildFlags = "-tags nogui";
+    excludedPackages = "appengine";
+  };
+
   pongo2 = buildFromGitHub {
     rev    = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9";
     date   = "2014-10-27";

From 27ffcf78726b3de150c015e3dacb9cf9d40efc35 Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Thu, 3 Sep 2015 01:23:56 -0500
Subject: [PATCH 1960/2016] stevedore: add pbr to propagatedBuildInputs

This fixes a crash in flexget and possibly other packages. I think the
issue was introduced in fc1165b0d94ec8b1b01b7522ed3143bd3dd03e5c
---
 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 d16d98d2374..cafae9864e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13010,8 +13010,8 @@ let
 
     doCheck = false;
 
-    buildInputs = with self; [ pbr oslosphinx ];
-    propagatedBuildInputs = with self; [ six argparse ];
+    buildInputs = with self; [ oslosphinx ];
+    propagatedBuildInputs = with self; [ pbr six argparse ];
 
     meta = {
       description = "Manage dynamic plugins for Python applications";

From 6cb878e9c278aeeeb8905b6370c0182293d102f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 3 Sep 2015 10:11:15 +0200
Subject: [PATCH 1961/2016] redmine: shorten flags line to avoid yaml parsing
 bug
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit c56f25d06fcd1eb4b0b232296a055b2dce997a05)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/applications/version-management/redmine/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index 26ca2ad9748..3a8df10f166 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -45,13 +45,7 @@ in stdenv.mkDerivation rec {
     mkdir -p vendor/cache
     ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)}
 
-    bundle config build.nokogiri \
-      --use-system-libraries \
-      --with-iconv-dir=${libiconv} \
-      --with-xslt-dir=${libxslt} \
-      --with-xml2-dir=${libxml2} \
-      --with-pkg-config \
-      --with-pg-config=${postgresql}/bin/pg_config
+    bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt}" --with-xml2-dir="${libxml2}"
 
     bundle install --verbose --local --deployment
 

From c0e97bb547ea1e200b6db9bc1af118b82a52f307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 3 Sep 2015 10:30:11 +0200
Subject: [PATCH 1962/2016] panamax_ui: fix libv8 pinpoint

---
 pkgs/applications/networking/cluster/panamax/ui/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix
index 572deb62ba0..3dac1061362 100644
--- a/pkgs/applications/networking/cluster/panamax/ui/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix
@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
     find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Local|NixOS Local|g' -i "{}" \;
     find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Host|NixOS Host|g' -i "{}" \;
     sed -e 's|CoreOS Local|NixOS Local|g' -i "spec/features/manage_application_spec.rb"
+    # fix libv8 dependency
+    substituteInPlace Gemfile.lock --replace "3.16.14.7" "3.16.14.11"
   '';
 
   configurePhase = ''

From 7133fca524ab6b2ed3b8434e6c4a238743ee640f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 1 Sep 2015 14:28:13 +0300
Subject: [PATCH 1963/2016] texLiveModerntimeline: fix sha256 checksum

Looks like an upstream update. cc @peti
---
 pkgs/tools/typesetting/tex/texlive/moderntimeline.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
index 6cf9ac3e5ce..ec8ffed25bc 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
@@ -7,7 +7,7 @@ rec {
       "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip"
       "http://mirror.ctan.org/macros/latex/contrib/moderntimeline.zip"
     ];
-    sha256 = "0y2m0qd0izrfjcwrmf3nvzkqmrhkdhzbv29s4c0knksdnfgcchc8";
+    sha256 = "155c3m9qk8pzbkvy60pan5byfzf1wn6pd43fq7k3732g9zjzrsak";
   };
 
   buildInputs = [texLive unzip];

From c7580cd17568ddd855774a8391fad14fd6d97be8 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 3 Sep 2015 04:36:31 +0200
Subject: [PATCH 1964/2016] dragonegg: does not build with gcc49

https://llvm.org/bugs/show_bug.cgi?id=19847
---
 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 bc1067d88cd..3910bbbb064 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6194,8 +6194,6 @@ let
 
   dssi = callPackage ../development/libraries/dssi {};
 
-  dragonegg = llvmPackages_35.dragonegg;
-
   dxflib = callPackage ../development/libraries/dxflib {};
 
   eigen = callPackage ../development/libraries/eigen {};

From ad99ea691246dbe6c0bd0aeb8b7914869a720917 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 3 Sep 2015 10:16:29 +0200
Subject: [PATCH 1965/2016] wml: fix build and unbreak

---
 pkgs/development/web/wml/default.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix
index 6dc7b68c71c..22cc5001c92 100644
--- a/pkgs/development/web/wml/default.nix
+++ b/pkgs/development/web/wml/default.nix
@@ -20,30 +20,40 @@ perlPackages.buildPerlPackage rec {
     sed -i '/p2_mp4h\/doc/d' Makefile.in
   '';
   
-  buildInputs = [ perlPackages.perl ncurses lynx makeWrapper ];
+  buildInputs = with perlPackages; 
+    [ perl TermReadKey GD BitVector ncurses lynx makeWrapper ImageSize ];
 
   patches = [ ./redhat-with-thr.patch ./dynaloader.patch ./no_bitvector.patch ];
   
-  preFixup = ''
-    substituteInPlace $out/bin/wml \
+  postPatch = ''
+    substituteInPlace wml_frontend/wml.src \
       --replace "File::PathConvert::realpath" "Cwd::realpath" \
       --replace "File::PathConvert::abs2rel" "File::Spec->abs2rel" \
       --replace "File::PathConvert" "File::Spec"
 
+    for i in wml_include/des/imgbg.src wml_include/des/imgdot.src; do
+      substituteInPlace $i \
+        --replace "WML::GD" "GD"
+    done
+
+    rm wml_test/t/11-wmk.t
+  '';
+
+  preFixup = ''
     wrapProgram $out/bin/wml \
       --set PERL5LIB ${with perlPackages; stdenv.lib.makePerlPath [
         BitVector TermReadKey ImageSize
       ]}
   '';
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false;
+
+  installTargets = "install";
 
   meta = with stdenv.lib; {
     homepage = http://thewml.org/;
     description = "Off-line HTML generation toolkit for Unix";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    # Not sure what broke this build, it used to work
-    broken = true;
   };
 }

From e27c796b51c277a4faceeb25604133582c67448d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 3 Sep 2015 11:09:55 +0200
Subject: [PATCH 1966/2016] ffmpeg-full: fix src

---
 pkgs/development/libraries/ffmpeg-full/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 37e23d4a324..654741283f9 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -234,7 +234,7 @@ stdenv.mkDerivation rec {
   version = "2.7.2";
 
   src = fetchurl {
-    url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
+    url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
     sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw";
   };
 

From a536eda82e88dba648572334d9531af8012fdf59 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Sep 2015 10:54:13 +0200
Subject: [PATCH 1967/2016] Add firefox-esr

---
 .../networking/browsers/firefox/default.nix   | 28 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  8 ++++--
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index e510b329714..12d581b1566 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -16,14 +16,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "40.0.3"; in
+let
 
-stdenv.mkDerivation rec {
-  name = "firefox-${version}";
+common = { pname, version, sha1 }: stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13";
+    inherit sha1;
   };
 
   patches = if !enableGTK3 then null else [(fetchpatch {
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     ''
       mkdir ../objdir
       cd ../objdir
-      configureScript=../mozilla-release/configure
+      configureScript=../mozilla-*/configure
     '';
 
   preInstall =
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    description = "Web browser";
+    description = "A web browser" + lib.optionalString (pname == "firefox-esr") " (Extended Support Release)";
     homepage = http://www.mozilla.com/en-US/firefox/;
     maintainers = with lib.maintainers; [ eelco ];
     platforms = lib.platforms.linux;
@@ -131,4 +131,20 @@ stdenv.mkDerivation rec {
     inherit gtk nspr version;
     isFirefox3Like = true;
   };
+};
+
+in {
+
+  firefox = common {
+    pname = "firefox";
+    version = "40.0.3";
+    sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13";
+  };
+
+  firefox-esr = common {
+    pname = "firefox-esr";
+    version = "38.2.1esr";
+    sha1 = "c596174e7273be5079bf55aecde33ec191d99538";
+  };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3910bbbb064..35c0d809f43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11527,14 +11527,15 @@ let
 
   filezilla = callPackage ../applications/networking/ftp/filezilla { };
 
-  firefox = callPackage ../applications/networking/browsers/firefox {
+  inherit (callPackages ../applications/networking/browsers/firefox {
     inherit (gnome) libIDL;
     inherit (pythonPackages) pysqlite;
     libpng = libpng_apng;
     enableGTK3 = false;
-  };
+  }) firefox firefox-esr;
 
-  firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
+  firefox-wrapper = wrapFirefox { browser = pkgs.firefox; };
+  firefox-esr-wrapper = wrapFirefox { browser = pkgs.firefox-esr; };
 
   firefox-bin = callPackage ../applications/networking/browsers/firefox-bin {
     gconf = pkgs.gnome.GConf;
@@ -15331,6 +15332,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
+  firefoxWrapper = firefox-wrapper;
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19
   htmlTidy = html-tidy;  # added 2014-12-06

From 9cea5bcf2cb180638e2e5e47692e57387fcbb051 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 30 Aug 2015 18:41:57 +0300
Subject: [PATCH 1968/2016] bundler-HEAD: fix checksum

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

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

From 6ab7e0de2953b5d13f52372258825e90fdea3fd3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Sep 2015 11:29:46 +0200
Subject: [PATCH 1969/2016] Create /var/log/journal

Fixes #9614.
---
 nixos/modules/system/boot/systemd.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 05369da4f16..4976dfe8eea 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -643,6 +643,10 @@ in
         if ! [ -e /etc/machine-id ]; then
           ${systemd}/bin/systemd-machine-id-setup
         fi
+
+        # Keep a persistent journal. Note that systemd-tmpfiles will
+        # set proper ownership/permissions.
+        mkdir -m 0700 -p /var/log/journal
       '';
 
     users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;

From 7bc624f5723123324b5a4a00b96b09aa66a5296c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 3 Sep 2015 11:39:39 +0200
Subject: [PATCH 1970/2016] And next release is called Emu!

http://img.gawkerassets.com/img/17qtp0agra45ajpg/original.jpg
---
 nixos/modules/misc/version.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index dc8eb4e8832..b4b0281fe58 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -75,7 +75,7 @@ with lib;
       mkDefault (if pathExists fn then readFile fn else "master");
 
     # Note: code names must only increase in alphabetical order.
-    system.nixosCodeName = "Dingo";
+    system.nixosCodeName = "Emu";
 
     # Generate /etc/os-release.  See
     # http://0pointer.de/public/systemd-man/os-release.html for the

From 126d8dba964b3c058399ffe38ba0b99e6194c98d Mon Sep 17 00:00:00 2001
From: RoboNickBot <nicklewchenko92@gmail.com>
Date: Tue, 1 Sep 2015 21:09:47 -0500
Subject: [PATCH 1971/2016] texlive-moderntimeline: 0.8 (broken) -> 0.9 (close
 #9612)

The v0.8 build was broken because the CTAN package updated to v0.9 and
CTAN doesn't keep old versions of packages.

Besides bumping the version, this commit changes the src url from the
unversioned CTAN link (which would break the derivation every time a new
version of the package released, as it did yesterday) to the versioned
Github release link.
---
 pkgs/tools/typesetting/tex/texlive/moderntimeline.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
index ec8ffed25bc..e80e53f9128 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix
@@ -1,13 +1,10 @@
 args: with args;
 rec {
-  version = "0.8";
+  version = "0.9";
   name = "moderntimeline-${version}";
   src = fetchurl {
-    urls = [
-      "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip"
-      "http://mirror.ctan.org/macros/latex/contrib/moderntimeline.zip"
-    ];
-    sha256 = "155c3m9qk8pzbkvy60pan5byfzf1wn6pd43fq7k3732g9zjzrsak";
+    url = "https://github.com/raphink/moderntimeline/archive/v0.9.zip";
+    sha256 = "1h1sfdh0whb74y6f999hs80flwpdbs2n4n2b9c450rvs1y7abcml";
   };
 
   buildInputs = [texLive unzip];
@@ -15,7 +12,7 @@ rec {
   doCopy = fullDepEntry (''
     mkdir -p $out/texmf-dist/tex/latex/moderntimeline $out/texmf-dist/doc/moderntimeline $out/share
     mv *.dtx *.ins $out/texmf-dist/tex/latex/moderntimeline/
-    mv *.pdf $out/texmf-dist/doc/moderntimeline/
+    mv *.md $out/texmf-dist/doc/moderntimeline/
     ln -s $out/texmf* $out/share/
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
 

From 5c014feb0a091fbd8b201a3734f91061190a40dc Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 3 Sep 2015 11:52:13 +0200
Subject: [PATCH 1972/2016] imagemagick: fix ghostscript reference in .la files

---
 pkgs/applications/graphics/ImageMagick/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 3575eee2939..c25cc11c203 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -40,7 +40,13 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs =
     [ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ];
 
-  postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)'';
+  postInstall = ''
+    (cd "$out/include" && ln -s ImageMagick* ImageMagick)
+  '' + lib.optionalString (ghostscript != null) ''
+    for la in $out/lib/*.la; do
+      sed 's|-lgs|-L${ghostscript}/lib -lgs|' -i $la
+    done
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://www.imagemagick.org/;

From 271b7ad0064b40a6ab970c5b46de9b89ccd6dabe Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 3 Sep 2015 11:52:26 +0200
Subject: [PATCH 1973/2016] Revert "zbar: ghostscript was missing for zbar"

This reverts commit a906355b8ab404baa20dc167225d57e3120f067d.

Fixed imagemagick -lgs reference in .la file.

cc @garbas
---
 pkgs/tools/graphics/zbar/default.nix | 2 +-
 pkgs/top-level/all-packages.nix      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index af98e3c014c..51dcc2a9c80 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l
-  , qt4, lzma, gtk2, ghostscript
+  , qt4, lzma, gtk2
   , ...}:
 builderDefsPackage
 (a :  
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35c0d809f43..dfa4cfc3033 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3622,7 +3622,6 @@ let
     pygtk = lib.overrideDerivation pygtk (x: {
       gtk = gtk2;
     });
-    ghostscript = ghostscriptX;
   };
 
   zdelta = callPackage ../tools/compression/zdelta { };

From 4080b744b2e1db1b7dcc79f5abe9ba03b6f26ceb Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Thu, 3 Sep 2015 11:29:04 +0900
Subject: [PATCH 1974/2016] php-imagick: init at 3.1.2, fixes #9627

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 9fc605be1e3..e9f2d145226 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -12,6 +12,13 @@ let self = with self; {
     sha256 = "1mhbz56mbnq7dryf2d64l84lj3fpr5ilmg2424glans3wcg772hp";
   };
 
+  imagick = buildPecl {
+    name = "imagick-3.1.2";
+    sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj";
+    configureFlags = "--with-imagick=${pkgs.imagemagick}";
+    buildInputs = [ pkgs.pkgconfig ];
+  };
+
   memcache = buildPecl {
     name = "memcache-3.0.8";
 

From e7f9bdcba1717717dd5420d8f993707406cfd697 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Thu, 3 Sep 2015 08:58:59 +0200
Subject: [PATCH 1975/2016] Bump k2pdfopt to 2.32, fixes #9631

---
 pkgs/applications/misc/k2pdfopt/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 9c592fcbb2d..ce57db371dd 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -5,8 +5,8 @@
 
 let
   mupdf_src = fetchurl {
-    url = http://www.mupdf.com/downloads/archive/mupdf-1.5-source.tar.gz;
-    sha256 = "0sl47zqf4c9fhs4h5zg046vixjmwgy4vhljhr5g4md733nash7z4";
+    url = http://www.mupdf.com/downloads/archive/mupdf-1.6-source.tar.gz;
+    sha256 = "0qx51rj6alzcagcixm59rvdpm54w6syrwr4184v439jh14ryw4wq";
   };
 
   tess_src = fetchurl {
@@ -21,10 +21,10 @@ let
 
 in stdenv.mkDerivation rec {
   name = "k2pdfopt-${version}";
-  version = "2.30";
+  version = "2.32";
   src = fetchzip {
     url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v${version}_src.zip";
-    sha256 = "1fjjznkplrbyrg48wbij4kqgkz9i5icq7savl6brsf9haahdz6q5";
+    sha256 = "1v3cj5bwpjvy7s66sfqcmkxs91f7nxaykjpdjm2wn87vn6q7n19m";
   };
 
   buildInputs = [ libX11 libXext autoconf automake libtool leptonica libpng libtiff zlib
@@ -41,8 +41,8 @@ in stdenv.mkDerivation rec {
     plibs=`pwd`/patched_libraries
 
     tar zxf ${mupdf_src}
-    cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.5-source/source/fitz/
-    cp $src/mupdf_mod/pdf-* mupdf-1.5-source/source/pdf
+    cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.6-source/source/fitz/
+    cp $src/mupdf_mod/pdf-* mupdf-1.6-source/source/pdf
 
     tar zxf ${tess_src}
     cp $src/tesseract_mod/dawg.cpp tesseract-ocr/dict
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
     make libs
     cp src/libPgm2asc.a $plibs/lib
 
-    cd ../mupdf-1.5-source
+    cd ../mupdf-1.6-source
     make prefix=$plibs install
     install -Dm644 build/debug/libmujs.a $plibs/lib
 

From f5205a7ba6bea953e50318dad947956a0426e079 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Wed, 2 Sep 2015 22:12:17 +0200
Subject: [PATCH 1976/2016] python-web.py: disable Py3k interpreter, fixes
 #9619

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cafae9864e0..4109625cab5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14828,6 +14828,7 @@ let
   web = buildPythonPackage rec {
     version = "0.37";
     name = "web.py-${version}";
+    disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/w/web.py/web.py-${version}.tar.gz";

From 3e0fab38646afa67bd9c908b407f47738e66841e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 3 Sep 2015 12:17:43 +0200
Subject: [PATCH 1977/2016] nox: use propagatedBuildInputs instead of
 pythonPath, fixes #9633

This way, when accessing Nox via Python, the dependencies will be
available.
---
 pkgs/tools/package-management/nox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix
index 2930e6fdce2..92edd915ad7 100644
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/pkgs/tools/package-management/nox/default.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage rec {
 
   buildInputs = [ pythonPackages.pbr ];
 
-  pythonPath = with pythonPackages; [
+  propagatedBuildInputs = with pythonPackages; [
       dogpile_cache
       click
       requests2

From b02921d4ca7fd269694b483c01f42785dc17c349 Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS-SSD2)" <kovirobi@gmail.com>
Date: Tue, 1 Sep 2015 11:23:11 +0100
Subject: [PATCH 1978/2016] libixp-hg: init at 2012-12-02

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

diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix
new file mode 100644
index 00000000000..456e1de25df
--- /dev/null
+++ b/pkgs/development/libraries/libixp-hg/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchhg, txt2tags }:
+
+stdenv.mkDerivation rec {
+  rev = "148";
+  version = "hg-2012-12-02";
+  name = "libixp-${version}";
+
+  src = fetchhg {
+    url = https://code.google.com/p/libixp/;
+    sha256 = "1nbnh2ff18fsrs28mx4bfgncq1d1nw5dd6iwhwvv5x2g9w7q5vvj";
+    inherit rev;
+  };
+
+  configurePhase = ''
+   sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk
+  '';
+
+  buildInputs = [ txt2tags ];
+
+  meta = {
+    homepage = https://code.google.com/p/libixp/;
+    description = "Portable, simple C-language 9P client and server libary";
+    maintainers = with stdenv.lib.maintainers; [ kovirobi ];
+    license = stdenv.lib.licenses.mit;
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfa4cfc3033..ed86a7dfda2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7560,6 +7560,8 @@ let
     inherit fetchurl stdenv;
   });
 
+  libixp_hg = callPackage ../development/libraries/libixp-hg { };
+
   libyaml = callPackage ../development/libraries/libyaml { };
 
   libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };

From c0b710fc68352d672ff1c450010b35d9992154af Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS-SSD2)" <kovirobi@gmail.com>
Date: Tue, 1 Sep 2015 12:36:03 +0100
Subject: [PATCH 1979/2016] wmii-hg: init at 2012-12-09

---
 .../window-managers/wmii-hg/default.nix       | 45 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/window-managers/wmii-hg/default.nix

diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix
new file mode 100644
index 00000000000..a7d492a05dc
--- /dev/null
+++ b/pkgs/applications/window-managers/wmii-hg/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python
+, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }:
+
+stdenv.mkDerivation rec {
+  rev = "2823";
+  version = "hg-2012-12-09";
+  name = "wmii-${version}";
+
+  src = fetchhg {
+    url = https://code.google.com/p/wmii/;
+    sha256 = "1wqw41jb2fhq902a04ixfzmx0lia1pawahm1ymyrs3is6mm32r51";
+    inherit rev;
+  };
+
+  # for dlopen-ing
+  patchPhase = ''
+    substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "${libXft}/lib/libXft.so"
+  '';
+
+  configurePhase = ''
+    for file in $(grep -lr '#!.*sh'); do
+      sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file
+    done
+
+    cat <<EOF >> config.mk
+    PREFIX = $out
+    LIBIXP = ${libixp_hg}/lib/libixp.a
+    BINSH = ${dash}/bin/dash
+    EOF
+  '';
+
+  buildInputs = [ pkgconfig libixp_hg txt2tags dash python
+                  libX11 libXrender libXext libXinerama libXrandr libXft ];
+
+  # For some reason including mercurial in buildInputs did not help
+  makeFlags = "WMII_HGVERSION=hg${rev}";
+
+  meta = {
+    homepage = "https://code.google.com/p/wmii/";
+    description = "A small window manager controlled by a 9P filesystem";
+    maintainers = with stdenv.lib.maintainers; [ kovirobi ];
+    license = stdenv.lib.licenses.mit;
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed86a7dfda2..1ca22091e3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13322,6 +13322,8 @@ let
     includeUnpack = config.stdenv.includeUnpack or false;
   };
 
+  wmii_hg = callPackage ../applications/window-managers/wmii-hg { };
+
   wordnet = callPackage ../applications/misc/wordnet { };
 
   workrave = callPackage ../applications/misc/workrave {

From 553e7d49ffe2e688f8d38b66e544375d2bee7186 Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS-SSD2)" <kovirobi@gmail.com>
Date: Tue, 1 Sep 2015 12:39:11 +0100
Subject: [PATCH 1980/2016] wmii service: refactor to use wmii_hg

---
 .../services/x11/window-managers/wmii.nix     | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix
index 75f6fdfe3bc..e6f534a1be6 100644
--- a/nixos/modules/services/x11/window-managers/wmii.nix
+++ b/nixos/modules/services/x11/window-managers/wmii.nix
@@ -1,47 +1,43 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ config, lib, pkgs, options, modulesPath }:
 
 let
-
+  inherit (lib) mkOption mkIf singleton;
   cfg = config.services.xserver.windowManager.wmii;
-
+  wmii = pkgs.wmii_hg;
 in
-
 {
   options = {
-
     services.xserver.windowManager.wmii.enable = mkOption {
       default = false;
       example = true;
       description = "Enable the wmii window manager.";
     };
-
   };
 
   config = mkIf cfg.enable {
-
     services.xserver.windowManager.session = singleton
       # stop wmii by
       #   $wmiir xwrite /ctl quit
       # this will cause wmii exiting with exit code 0
+      # (or "mod+a quit", which is bound to do the same thing in wmiirc
+      # by default)
       #
       # why this loop?
       # wmii crashes once a month here. That doesn't matter that much
-      # wmii can recover very well. However without loop the x session terminates and then your workspace setup is
-      # lost and all applications running on X will terminate.
+      # wmii can recover very well. However without loop the X session
+      # terminates and then your workspace setup is lost and all
+      # applications running on X will terminate.
       # Another use case is kill -9 wmii; after rotating screen.
-      # Note: we don't like kill for that purpose. But it works (-> subject "wmii and xrandr" on mailinglist)
+      # Note: we don't like kill for that purpose. But it works (->
+      # subject "wmii and xrandr" on mailinglist)
       { name = "wmii";
         start = ''
           while :; do
-            ${pkgs.wmiiSnap}/bin/wmii && break
+            ${wmii}/bin/wmii && break
           done
         '';
       };
 
-    environment.systemPackages = [ pkgs.wmiiSnap ];
-
+    environment.systemPackages = [ wmii ];
   };
-
 }

From b22e6cb29927511c14b745405f4c157dd66513b4 Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS-SSD2)" <kovirobi@gmail.com>
Date: Tue, 1 Sep 2015 13:52:08 +0100
Subject: [PATCH 1981/2016] wiimenu, wmiiSnap, libixp_for_wmii: removed, fixes
 #9609

wiimenu superseded by wimenu from wmii
wmiiSnap superseded by wmii_hg
libixp_for_wmii superseded by libixp_hg
---
 .../manual/release-notes/release-notes.xml    |  1 +
 .../doc/manual/release-notes/rl-unstable.xml  | 27 ++++++++++++++
 .../window-managers/wmii/default.nix          | 35 -------------------
 .../window-managers/wmii31/default.nix        | 35 -------------------
 .../libraries/libixp_for_wmii/default.nix     | 26 --------------
 pkgs/top-level/all-packages.nix               | 18 ----------
 6 files changed, 28 insertions(+), 114 deletions(-)
 create mode 100644 nixos/doc/manual/release-notes/rl-unstable.xml
 delete mode 100644 pkgs/applications/window-managers/wmii/default.nix
 delete mode 100644 pkgs/applications/window-managers/wmii31/default.nix
 delete mode 100644 pkgs/development/libraries/libixp_for_wmii/default.nix

diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index e326f89d4f4..6ed99315a7a 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -9,6 +9,7 @@
 <para>This section lists the release notes for each stable version of NixOS
 and current unstable revision.</para>
 
+<xi:include href="rl-unstable.xml" />
 <xi:include href="rl-1509.xml" />
 <xi:include href="rl-1412.xml" />
 <xi:include href="rl-1404.xml" />
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
new file mode 100644
index 00000000000..2781cee3614
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -0,0 +1,27 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-unstable">
+
+<title>Unstable</title>
+
+<para>When upgrading from a previous release, please be aware of the
+  following incompatible changes:
+
+  <itemizedlist>
+    <listitem><para>
+        <command>wmiiSnap</command> has been replaced with
+        <command>wmii_hg</command>, but
+        <command>services.xserver.windowManager.wmii.enable</command>
+        has been updated respectively so this only affects you if you
+        have explicitly installed <command>wmiiSnap</command>.
+    </para></listitem>
+    <listitem><para>
+        <command>wmiimenu</command> is removed, as it has been removed by
+        the developers upstream. Use <command>wimenu</command> from the
+        <command>wmii-hg</command> package.
+    </para></listitem>
+  </itemizedlist>
+</para>
+</section>
diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix
deleted file mode 100644
index e8ecc72a6d3..00000000000
--- a/pkgs/applications/window-managers/wmii/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-args: with args; stdenv.mkDerivation {
-  name = "wmii-3.6";
-
-  src = fetchurl {
-    url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz;
-    sha256 = "46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216";
-  };
-
-  buildInputs = [ libX11 libixp xextproto libXt libXext ];
-  inherit libixp;
-
-  phases = "unpackPhase installPhase";
-
-  installPhase = "
-     for i in libfmt libutf libregexp libbio; do
-       cd $i; make; cd ..
-     done
-     mkdir -p \$out/lib
-     cp ${libixp}/lib/libixp.a \$out/lib
-     export CFLAGS=\$NIX_CFLAGS_COMPILE
-     export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
-     sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\
-            -e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\
-            -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\
-            -e 's%^\\(AWKPATH = \\).*%\\1${gawk}/bin/gawk%' \\
-            config.mk
-     # don't use the default one installed by nixos!
-     #sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir
-     make install
-  ";
-  meta = { homepage = "www.suckless.org";
-           description = "a really cool window manager which can by driven by keyboard only";
-           license = stdenv.lib.licenses.mit;
-         };
-}
diff --git a/pkgs/applications/window-managers/wmii31/default.nix b/pkgs/applications/window-managers/wmii31/default.nix
deleted file mode 100644
index 568be30f1c5..00000000000
--- a/pkgs/applications/window-managers/wmii31/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-args: with args; stdenv.mkDerivation {
-  name = "wmiimenu-3.1";
-
-  src = fetchurl {
-    url = http://dl.suckless.org/wmii/wmii-3.1.tar.gz;
-    sha256 = "0sviwxbanpsfdm55zvx9hflncw35slkz41xr517y3yfgxx6qlhlk";
-  };
-
-  buildInputs = [ libX11 libixp ];
-  inherit libixp;
- 
-  phases = "unpackPhase installPhase";
-
-  installPhase = "
-     export CFLAGS=\$NIX_CFLAGS_COMPILE
-     export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
-     sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\
-            -e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\
-            -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\
-            config.mk
-     # don't use the default one installed by nixos!
-     # sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir
-
-     # This will fail but wmiimenu has been built (hack!)
-     set +e
-     make &> /dev/null
-     set -e
-     mkdir -p \$out/bin
-     cp cmd/wmiimenu \$out/bin
-  ";
-  meta = { homepage = "www.suckless.org";
-           description = "One small tool of the wmii window manger to let the user select an item from a list by filtering";
-           license = stdenv.lib.licenses.mit;
-         };
-}
diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix
deleted file mode 100644
index cbe9e20f0b1..00000000000
--- a/pkgs/development/libraries/libixp_for_wmii/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libixp_for_wmii-0.4";
-  phases = "unpackPhase installPhase";
-  installPhase = "
-     export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
-     sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\
-            -e \"s%^\\(INCLUDE.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\
-            -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\
-            config.mk
-     make
-     mkdir -p \$out/include
-     cp -r include/*.h \$out/include
-     cp -r lib \$out
-  ";
-  src = fetchurl {
-    url = http://dl.suckless.org/libs/libixp-0.4.tar.gz;
-    sha256 = "0b44p9wvmzxpyf2xd86rxyr49bmfh9cd5hj3d234gkvynvgph60p";
-  };
-
-  meta = {
-    homepage = http://libs.suckless.org/libixp;
-    description = "stand-alone client/server 9P library";
-    license = with stdenv.lib.licenses; [ mit lpl-102 ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ca22091e3d..984485e893c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7556,10 +7556,6 @@ let
 
   libxslt = callPackage ../development/libraries/libxslt { };
 
-  libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii {
-    inherit fetchurl stdenv;
-  });
-
   libixp_hg = callPackage ../development/libraries/libixp-hg { };
 
   libyaml = callPackage ../development/libraries/libyaml { };
@@ -13308,20 +13304,6 @@ let
 
   wmctrl = callPackage ../tools/X11/wmctrl { };
 
-  # I'm keen on wmiimenu only  >wmii-3.5 no longer has it...
-  wmiimenu = import ../applications/window-managers/wmii31 {
-    libixp = libixp_for_wmii;
-    inherit fetchurl /* fetchhg */ stdenv gawk;
-    inherit (xlibs) libX11;
-  };
-
-  wmiiSnap = import ../applications/window-managers/wmii {
-    libixp = libixp_for_wmii;
-    inherit fetchurl /* fetchhg */ stdenv gawk;
-    inherit (xlibs) libX11 xextproto libXt libXext;
-    includeUnpack = config.stdenv.includeUnpack or false;
-  };
-
   wmii_hg = callPackage ../applications/window-managers/wmii-hg { };
 
   wordnet = callPackage ../applications/misc/wordnet { };

From 32d0d863bcda824d7d8952daf871d398e3a049b1 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Wed, 2 Sep 2015 21:04:24 +0100
Subject: [PATCH 1982/2016] {lib}mediainfo{-gui}: 0.7.76 -> 0.7.77, fixes #9617

Local build and run successful.

From the ChangeLog:
```
Version 0.7.77, 2015-09-02

+ #B941, MXF: files having only a video stream and an ancillary data
  stream were having incorrect second video stream
+ MOV: detection of r210 CodecID as raw RGB
+ Ancillary data: detection of all metadata blocks (previously: only the
  first one was detected)
x MPEG-TS: Wrong demux of TSP (188+16 TS) files having PES with only
  padding x MediaTrace #2: XML malformed with Flags items (hotfix, flags
  meaning disabled in XML output)
x MediaTrace #3: XML malformed with some MP4 files
x MediaTrace #6: XML duplicated attributes
x MediaTrace #10: versioned xsd, creating library name and version
x MediaTrace: XML content was not escaped
x #B947, Amazon S3 support (REST API v2), CLI/DLL only and if compiled
  with libcurl support: Analyze file on s3 was not working if secret key
  contains / character
```
---
 pkgs/applications/misc/mediainfo-gui/default.nix    | 4 ++--
 pkgs/applications/misc/mediainfo/default.nix        | 4 ++--
 pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 939edc97be1..55de1425787 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.76";
+  version = "0.7.77";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "14vy2a9bjjwxyk8zh0ysin8fb1lj9yz17yd82vxrp1zvxsgyg5ck";
+    sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 4a5fffe533d..5c6f3f9a148 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.76";
+  version = "0.7.77";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "14vy2a9bjjwxyk8zh0ysin8fb1lj9yz17yd82vxrp1zvxsgyg5ck";
+    sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 010318073c7..dd17f7a4c00 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.76";
+  version = "0.7.77";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "088hxj3x12ww8zym3g6izz1w9m6wxgdy7hc2m089cd4sv9dlccnq";
+    sha256 = "1znxdn1jpqkiwshq9s514ak1z9wkrh9flky4s3q8z2xl68jpralq";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];

From 882b2465c239d1fd9299ac4f94a9591327f043f3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Sep 2015 12:58:43 +0200
Subject: [PATCH 1983/2016] Remove ad hoc README

It's unlikely that people will see this file, so it's kind of
pointless.
---
 nixos/modules/services/x11/desktop-managers/README | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 nixos/modules/services/x11/desktop-managers/README

diff --git a/nixos/modules/services/x11/desktop-managers/README b/nixos/modules/services/x11/desktop-managers/README
deleted file mode 100644
index 78c75ff7098..00000000000
--- a/nixos/modules/services/x11/desktop-managers/README
+++ /dev/null
@@ -1 +0,0 @@
-Each desktop manager should explicitly specify a value for `services.xserver.displayManager.desktopManagerHandlesLidAndPower`.
\ No newline at end of file

From f223448d5d0fe07a939c6b67d01a2b6ab724c4cf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Sep 2015 13:01:49 +0200
Subject: [PATCH 1984/2016] Shorten inhibit message

This also makes it consistent with KDE's inhibit message.
---
 nixos/modules/services/x11/display-managers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 98e36954712..fc0803f2aca 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -62,7 +62,7 @@ let
         if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then
           export _INHIBITION_LOCK_TAKEN=1
           if ! ${config.systemd.package}/bin/loginctl show-session $XDG_SESSION_ID | grep -q '^RemoteHost='; then
-            exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key --why="See NixOS configuration option 'services.xserver.displayManager.desktopManagerHandlesLidAndPower' for more information." "$0" "$sessionType"
+            exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key --why="Desktop environment handles power events" "$0" "$sessionType"
           fi
         fi
 

From 7bd6aac2d0881d6ac17d684e36234913094286bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mariusz=20=60shd=60=20Gliwi=C5=84ski?=
 <alienballance@gmail.com>
Date: Wed, 2 Sep 2015 19:41:29 +0200
Subject: [PATCH 1985/2016] lgogdownloader: init at 2.24, fixes #9613

htmlcxx: init at 0.85, dependency of lgogdownloader
---
 .../development/libraries/htmlcxx/default.nix | 20 +++++++++++++
 .../libraries/htmlcxx/ptrdiff.patch           | 13 +++++++++
 pkgs/games/lgogdownloader/default.nix         | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 4 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/libraries/htmlcxx/default.nix
 create mode 100644 pkgs/development/libraries/htmlcxx/ptrdiff.patch
 create mode 100644 pkgs/games/lgogdownloader/default.nix

diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix
new file mode 100644
index 00000000000..63cc7477385
--- /dev/null
+++ b/pkgs/development/libraries/htmlcxx/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "htmlcxx-${version}";
+  version = "0.85";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz";
+    sha256 = "1rdsjrcjkf7mi3182lq4v5wn2wncw0ziczagaqnzi0nwmp2a00mb";
+  };
+
+  patches = [ ./ptrdiff.patch ];
+
+  meta = {
+    homepage = http://htmlcxx.sourceforge.net/;
+    description = "htmlcxx is a simple non-validating css1 and html parser for C++.";
+    license = stdenv.lib.licenses.lgpl2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/htmlcxx/ptrdiff.patch b/pkgs/development/libraries/htmlcxx/ptrdiff.patch
new file mode 100644
index 00000000000..6348ba24f8d
--- /dev/null
+++ b/pkgs/development/libraries/htmlcxx/ptrdiff.patch
@@ -0,0 +1,13 @@
+diff -rc htmlcxx-orig-0.85/html/tree.h htmlcxx-0.85/html/tree.h
+*** htmlcxx-orig-0.85/html/tree.h	2015-09-02 13:57:17.988688798 +0200
+--- htmlcxx-0.85/html/tree.h	2015-09-02 13:57:52.737768811 +0200
+***************
+*** 45,50 ****
+--- 45,51 ----
+  #ifndef tree_hh_
+  #define tree_hh_
+  
++ #include <cstddef>
+  #include <cassert>
+  #include <memory>
+  #include <stdexcept>
diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix
new file mode 100644
index 00000000000..4ef3e533772
--- /dev/null
+++ b/pkgs/games/lgogdownloader/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, curl, boost, jsoncpp, liboauth, rhash, tinyxml, htmlcxx, help2man }:
+
+stdenv.mkDerivation rec {
+  name = "lgogdownloader-${version}";
+  version = "2.24";
+
+  src = fetchgit {
+    url = "https://github.com/Sude-/lgogdownloader.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "1h5l4zc22hj4all2w0vfby1rmhpca33g3bhdnqw11w2ligk8j14r";
+  };
+
+  buildInputs = [ curl boost jsoncpp liboauth rhash tinyxml htmlcxx help2man ];
+
+  buildPhase = ''
+    make release
+  '';
+
+  installPhase = ''
+    make install PREFIX=$out
+  '';
+
+  meta = {
+    homepage = https://github.com/Sude-/lgogdownloader;
+    description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader.";
+    license = stdenv.lib.licenses.wtfpl;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 984485e893c..c99a1d67f88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6657,6 +6657,8 @@ let
 
   hstr = callPackage ../applications/misc/hstr { };
 
+  htmlcxx = callPackage ../development/libraries/htmlcxx { };
+
   http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; };
 
   hunspell = callPackage ../development/libraries/hunspell { };
@@ -13793,6 +13795,8 @@ let
 
   kobodeluxe = callPackage ../games/kobodeluxe { };
 
+  lgogdownloader = callPackage ../games/lgogdownloader { };
+
   lincity = builderDefsPackage (import ../games/lincity) {
     inherit (xlibs) libX11 libXext xextproto
       libICE libSM xproto;

From 4028f8878683ed9fc281f376a05d2b5bbe8d1ace Mon Sep 17 00:00:00 2001
From: Alexei Robyn <shados@shados.net>
Date: Fri, 28 Aug 2015 21:33:15 +1000
Subject: [PATCH 1986/2016] pidgin-opensteamworks: 1.5.1 -> 1.6.1, fixes #9489

Also, changed source url to (new) official github repo
---
 .../pidgin-plugins/pidgin-opensteamworks/default.nix   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
index 30d90ba302d..e03b61b6182 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pidgin, unzip, glib, json_glib, nss, nspr, libgnome_keyring } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-opensteamworks-1.5.1";
+  name = "pidgin-opensteamworks-${version}";
+  version = "1.6.1";
 
-  # Temporarily sourcing this from a mirror in my github account, until such time as the project is officially migrated away from the deprecated google code service
   src = fetchFromGitHub {
-    owner = "Shados";
+    owner = "EionRobb";
     repo = "pidgin-opensteamworks";
-    rev = "4f0ea110a5bdba9d2b18ec8785b2edb276f0cccd";
-    sha256 = "0gcrc1yaf29yjfhpflpn451i7isw8zc7maw77g604815myc5k025";
+    rev = "${version}";
+    sha256 = "6ab27831e454ad3b440e4f06b52e0b3671a4f8417ba4da3ab6f56c56d82cc29b";
   };
 
   preConfigure = "cd steam-mobile";

From 1967d9135a0886b54fb3b87b7cfff3ad557409da Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Sep 2015 14:25:02 +0300
Subject: [PATCH 1987/2016] julia: 0.3.10 -> 0.3.11

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

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 1a496f457af..27b58b4d0f1 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "julia";
-  version = "0.3.10";
+  version = "0.3.11";
   name = "${pname}-${version}";
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0px1zd7qmz6rrjf58k4kq55s7h8mny1w6xvcsrny2wbgckxzhqsg";
+    sha256 = "06xmv2l8hskdh1s5y2dh28vpb5pc0gzmfl5a03yp0qjjsl5cb284";
     name = "julia-git-v${version}";
   };
 

From fe16722cf91f15787ecf40a2ce6c5eef6d5f29f3 Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Tue, 18 Aug 2015 11:18:32 +0200
Subject: [PATCH 1988/2016] botocore: 1.1.4 -> 1.1.10

---
 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 4109625cab5..2936bc9a00c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1521,12 +1521,12 @@ let
   };
 
   botocore = buildPythonPackage rec {
-    version = "1.1.4";
+    version = "1.1.10";
     name = "botocore-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz";
-      sha256 = "1wbbaj0y6bfzsh61hgnnssn5j8m93r6r2m5r1jmlf6iz3l9gqkkp";
+      sha256 = "0syj0m0l7k4wa0n9h7h8ywayjv9fgpn5wyzpdriws0j417y1zlyc";
     };
 
     propagatedBuildInputs =

From 8828a174cb4d6a35ceb6f381f91711277c062d69 Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Tue, 18 Aug 2015 11:18:55 +0200
Subject: [PATCH 1989/2016] awscli: 1.7.41 -> 1.7.47

People in #nixos told me to switch from fetchzip to fetchFromGitHub;
let me know if that's a bad change.
---
 pkgs/tools/admin/awscli/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index f544b81e78d..06c9b85b8d6 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchzip, pythonPackages, groff }:
+{ stdenv, fetchFromGitHub, pythonPackages, groff }:
 
 pythonPackages.buildPythonPackage rec {
   name = "awscli-${version}";
-  version = "1.7.41";
+  version = "1.7.47";
   namePrefix = "";
 
-  src = fetchzip {
-    url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz";
-    sha256 = "1xfvpqyxi5qaqcvm56q616k9zjidbc9l2vk1v3ld6lnlzri3a1ra";
+  src = fetchFromGitHub {
+    owner = "aws";
+    repo = "aws-cli";
+    rev = version;
+    sha256 = "1955y1ar2mqzqgfngpwp8pc78wphh1qdgwwy0gs6i352jaqzkvwi";
   };
 
   propagatedBuildInputs = [

From 06b66487709bff98ae02f001ca9814074cdc8f58 Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Tue, 18 Aug 2015 11:12:04 +0200
Subject: [PATCH 1990/2016] flow: 0.13.1 -> 0.14.0, fixes #9321

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 893ac521307..b0e021f54cc 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, ocaml, libelf }:
 
 stdenv.mkDerivation rec {
-  version = "0.13.1";
+  version = "0.14.0";
   name = "flow-${version}";
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "1p7rzhvmz9y7ii2z05mfdb49i45f82kx8c9ywciwqma06zycvd80";
+    sha256 = "02adbn2h5bfc4drcpbalq7acx573a657ik3008fr8s9qyqdp2nl6";
   };
 
   installPhase = ''

From ecd873ddb0433d055cf4503aa4c5761e413a559b Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Fri, 28 Aug 2015 14:19:27 +0100
Subject: [PATCH 1991/2016] pythonPackages.jsonpath_rw: init at 1.4.0, fixes
 #9493

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2936bc9a00c..4d6c31cfd72 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7274,6 +7274,33 @@ let
   };
 
 
+  jsonpath_rw = buildPythonPackage rec {
+    name = "jsonpath-rw-${version}";
+    version = "1.4.0";
+    disabled = isPyPy;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jsonpath-rw/${name}.tar.gz";
+      md5 = "3a807e05c2c12158fc6bb0a402fd5778";
+    };
+
+    propagatedBuildInputs = with self; [
+      ply
+      six
+      decorator
+    ];
+
+    # ImportError: No module named tests
+    doCheck = false;
+
+    meta = {
+      homepage = https://github.com/kennknowles/python-jsonpath-rw;
+      description = "A robust and significantly extended implementation of JSONPath for Python, with a clear AST for metaprogramming";
+      license = licenses.asl20;
+    };
+  };
+
+
   keyring = buildPythonPackage rec {
     name = "keyring-3.3";
 

From 1942480e95a47b1d4d749fd4f1bff155102c741f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Thu, 3 Sep 2015 14:04:59 +0100
Subject: [PATCH 1992/2016] rkt: Don't download stage1 image during build.

Second attempt to resolve this issue. Copies stage1 image into expected
place manually. This has been improved in rkt master where there is a
configure option for specifying the location of this file. Can update
when next stable rkt is released.
---
 .../applications/virtualization/rkt/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index e873608733a..1d03eece46c 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -3,7 +3,7 @@
 
 let
   coreosImageRelease = "738.1.0";
-  
+
 in stdenv.mkDerivation rec {
   version = "0.8.0";
   name = "rkt-${version}";
@@ -19,20 +19,25 @@ in stdenv.mkDerivation rec {
     url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
     sha256 = "1rnb9rwms5g7f142d9yh169a5k2hxiximpgk4y4kqmc1294lqnl0";
   };
-  
+
   buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
-  
+
   preConfigure = ''
     ./autogen.sh
   '';
 
-  configureFlags = "--with-stage1-image-path=${stage1image}";
-  
+  preBuild = ''
+    # hack to avoid downloading image during build, this has been
+    # improved in rkt master
+    mkdir -p build-rkt-0.8.0/tmp/usr_from_coreos
+    cp -v ${stage1image} build-rkt-0.8.0/tmp/usr_from_coreos/pxe.img
+  '';
+
   installPhase = ''
     mkdir -p $out/bin
     cp -Rv build-rkt-${version}/bin/* $out/bin
   '';
-    
+
   meta = with lib; {
     description = "A fast, composable, and secure App Container runtime for Linux";
     homepage = http://rkt.io;

From 6c885b38eee3abade20a56a3f3c2a634d4cafcbd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Sep 2015 20:32:52 +0200
Subject: [PATCH 1993/2016] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-hashes/commit/d7dddc66daaf3a0e4aac6026dea879fcbfaed3cc
 with hackage2nix v20150824-72-g87526c2

---
 .../haskell-modules/hackage-packages.nix      | 265 ++++++++++++------
 1 file changed, 174 insertions(+), 91 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7accc1626eb..78efcabdfd8 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2221,6 +2221,7 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Cabal_1_20_0_3" = callPackage
@@ -2246,6 +2247,7 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Cabal_1_22_4_0" = callPackage
@@ -2272,6 +2274,7 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Cabal-ide-backend" = callPackage
@@ -4551,20 +4554,16 @@ self: {
 
   "Euterpea" = callPackage
     ({ mkDerivation, ansi-terminal, array, arrows, base, bytestring
-     , Cabal, CCA, containers, deepseq, ghc-prim, HCodecs, heap
-     , markov-chain, monadIO, mtl, PortMidi, pure-fft, QuickCheck
-     , random, stm, syb, template-haskell, UISF
+     , Cabal, containers, deepseq, ghc-prim, HCodecs, heap, markov-chain
+     , PortMidi, pure-fft, QuickCheck, random, stm, UISF
      }:
      mkDerivation {
        pname = "Euterpea";
-       version = "1.0.0";
-       sha256 = "ba6d412a87431694aa50b7e1fb398b1f8671d3bbf1c6da3ef961e9436ad6cc31";
-       revision = "1";
-       editedCabalFile = "61d418cc49621a3373fd25f547d2dd6b76b700dcc4b7e38b2f055b5c6f781afd";
+       version = "1.1.0";
+       sha256 = "b9f311ce03c58e3a8da502713d5ac5cd2463e76a9bc4c7b2b3556de2e42d58b4";
        libraryHaskellDepends = [
-         array arrows base bytestring CCA containers deepseq ghc-prim
-         HCodecs heap markov-chain monadIO mtl PortMidi pure-fft random stm
-         syb template-haskell UISF
+         array arrows base bytestring containers deepseq ghc-prim HCodecs
+         heap markov-chain PortMidi pure-fft random stm UISF
        ];
        testHaskellDepends = [ ansi-terminal base Cabal QuickCheck ];
        jailbreak = true;
@@ -5026,8 +5025,8 @@ self: {
     ({ mkDerivation, base, containers, HUnit, parsec }:
      mkDerivation {
        pname = "Folly";
-       version = "0.1.5.2";
-       sha256 = "d91356d28619c50115160d078277104bac9567f099a5b9fd13b0079b7f164e0d";
+       version = "0.2.0.0";
+       sha256 = "47ceb0db6bbfe935e0d931a5d6d4425e46fd059657398ae0be67f2f0e714ee05";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers parsec ];
@@ -7733,6 +7732,7 @@ 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
@@ -8565,8 +8565,8 @@ self: {
      }:
      mkDerivation {
        pname = "Hoed";
-       version = "0.2.2";
-       sha256 = "9d2e9e4886e816c5e97e91c27cf007d18f0dafeb2acdf1e1d7023764b9a4d22c";
+       version = "0.3.0";
+       sha256 = "24f324d8cab517d23d14fd6350bd854b97226802b9ae3eb0e5f05cc344e95e3c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -8574,7 +8574,7 @@ self: {
          RBTree regex-posix template-haskell threepenny-gui
        ];
        homepage = "http://maartenfaddegon.nl";
-       description = "Lighweight algorithmic debugging based on observing intermediate values and the cost centre stack";
+       description = "Lighweight algorithmic debugging";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -12955,6 +12955,7 @@ self: {
        homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/";
        description = "Automatic testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuickCheck" = callPackage
@@ -15623,15 +15624,15 @@ self: {
      }) {};
 
   "UISF" = callPackage
-    ({ mkDerivation, arrows, base, containers, deepseq, GLFW, OpenGL
-     , stm, transformers
+    ({ mkDerivation, array, arrows, base, containers, deepseq, GLUT
+     , OpenGL, stm, transformers
      }:
      mkDerivation {
        pname = "UISF";
-       version = "0.3.0.2";
-       sha256 = "86a89d4e23d00916138d686e206240f0df282d971faf5e049c844c0f0ae1b344";
+       version = "0.4.0.0";
+       sha256 = "1d2084f1c81364b830fab4937901b83bee08addf6ea4e8123573b084cd80f3e7";
        libraryHaskellDepends = [
-         arrows base containers deepseq GLFW OpenGL stm transformers
+         array arrows base containers deepseq GLUT OpenGL stm transformers
        ];
        homepage = "http://haskell.cs.yale.edu/";
        description = "Library for Arrowized Graphical User Interfaces";
@@ -18295,6 +18296,7 @@ self: {
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson" = callPackage
@@ -21623,12 +21625,9 @@ self: {
     ({ mkDerivation, base, containers, lens, mtl }:
      mkDerivation {
        pname = "app-lens";
-       version = "0.1.0.0";
-       sha256 = "280cfa13e1f52d40fa10f70f5f98e13e7de9633fa8919a9dcfef857e98953f3e";
-       revision = "2";
-       editedCabalFile = "29d9e8cabf54f27b1ccf007530fe698c0895c0bb6a2a6da50b71fafd4c27bd6d";
+       version = "0.1.0.1";
+       sha256 = "717cb2d1abc9add860d6e058b2da8ba45a124f8a637b4ab5984a89a42d485627";
        libraryHaskellDepends = [ base containers lens mtl ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/kztk/app-lens";
        description = "applicative (functional) bidirectional programming beyond composition chains";
        license = stdenv.lib.licenses.bsd3;
@@ -22257,6 +22256,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mutable and immutable arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "array-forth" = callPackage
@@ -24868,6 +24868,7 @@ self: {
        libraryHaskellDepends = [ ghc-prim rts ];
        description = "Basic libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-compat" = callPackage
@@ -25972,6 +25973,7 @@ self: {
        homepage = "https://github.com/kolmodin/binary";
        description = "Binary serialisation for Haskell values using lazy ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-bits" = callPackage
@@ -29595,6 +29597,7 @@ self: {
        homepage = "https://github.com/haskell/bytestring";
        description = "Fast, compact, strict and lazy byte strings with a list interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-arbitrary" = callPackage
@@ -30384,6 +30387,7 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-install" = callPackage
@@ -32433,10 +32437,8 @@ self: {
      }:
      mkDerivation {
        pname = "cf";
-       version = "0.4.1";
-       sha256 = "1d3bd0bab9a927e0efd386e8786ad7e0936921553edf275e7d2b676b40c310fd";
-       revision = "1";
-       editedCabalFile = "9fd574edfce6ea014201ccc3591638de0574f251290bcf0f44a8a00338131692";
+       version = "0.4.2";
+       sha256 = "f2852d1f13c434f5e49ed319afc8f1a79cbb5e06d4235e5b342dc44cba6c2519";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -36455,6 +36457,7 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit" = callPackage
@@ -37134,6 +37137,7 @@ self: {
        jailbreak = true;
        description = "Assorted concrete container types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "containers_0_5_6_3" = callPackage
@@ -37152,6 +37156,7 @@ self: {
        ];
        description = "Assorted concrete container types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "containers-benchmark" = callPackage
@@ -37461,6 +37466,7 @@ self: {
        homepage = "http://github.com/pepeiborra/control-monad-free";
        description = "Free monads and monad transformers";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-free" = callPackage
@@ -40116,8 +40122,8 @@ self: {
      }:
      mkDerivation {
        pname = "d-bus";
-       version = "0.1.3";
-       sha256 = "0e1eb50a1a1185bc898e87f93040f47b80d8a0beb132fb2c14a77b6720011f32";
+       version = "0.1.3.1";
+       sha256 = "3c22a5ddb373178203093f1bea6ea8921810e352df1cf1cc50b94c758cea96f9";
        libraryHaskellDepends = [
          async attoparsec base binary blaze-builder bytestring conduit
          conduit-extra containers data-binary-ieee754 data-default
@@ -42735,6 +42741,7 @@ self: {
        jailbreak = true;
        description = "Deep evaluation of data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deepseq_1_4_1_2" = callPackage
@@ -42751,6 +42758,7 @@ self: {
        ];
        description = "Deep evaluation of data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deepseq-bounded" = callPackage
@@ -43258,15 +43266,15 @@ self: {
      }) {};
 
   "dequeue" = callPackage
-    ({ mkDerivation, base, QuickCheck, safe }:
+    ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck
+     , safe
+     }:
      mkDerivation {
        pname = "dequeue";
-       version = "0.1.7";
-       sha256 = "ceecc24ce84cabf5df5291eda19400f452d3dc1b102f6ebef2c6c689ec7c5eea";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.1.12";
+       sha256 = "c70aedbb1965affe07b7151f12e9a8e42f2cb54652bb0a0bbc5d0ba8e21721ab";
        libraryHaskellDepends = [ base QuickCheck safe ];
-       executableHaskellDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base Cabal cabal-test-quickcheck ];
        description = "A typeclass and an implementation for double-ended queues";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43468,6 +43476,7 @@ self: {
        homepage = "https://github.com/chrisdone/descriptive";
        description = "Self-describing consumers/parsers; forms, cmd-line args, JSON, etc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "descriptive" = callPackage
@@ -44809,6 +44818,7 @@ self: {
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "directory-layout" = callPackage
@@ -52184,6 +52194,7 @@ self: {
        homepage = "https://github.com/haskell/filepath#readme";
        description = "Library for manipulating FilePaths in a cross platform way";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filepath-io-access" = callPackage
@@ -56611,6 +56622,7 @@ self: {
        libraryHaskellDepends = [ rts ];
        description = "GHC primitives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-prof-flamegraph" = callPackage
@@ -58082,7 +58094,7 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss" = callPackage
@@ -61863,6 +61875,7 @@ self: {
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haddock-api" = callPackage
@@ -64354,6 +64367,7 @@ self: {
        homepage = "http://trac.haskell.org/haskeline";
        description = "A command-line interface for user input, written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskeline-class" = callPackage
@@ -64938,6 +64952,7 @@ self: {
        homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts" = callPackage
@@ -66268,6 +66283,8 @@ self: {
        pname = "haste-compiler";
        version = "0.5.1.2";
        sha256 = "106f844a4ffef0a8b0af954b369bf052c434e1713aa8bdde3d3c3ebc53046b4c";
+       revision = "1";
+       editedCabalFile = "b7ef9b6e6475a75c96dc5c97460143429abfb60a6453da57dad4d15f2b8e4d9a";
        configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
@@ -68461,15 +68478,15 @@ self: {
   "heyefi" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, configurator
      , containers, directory, exceptions, filepath, HandsomeSoup, hspec
-     , http-types, hxt, iso8601-time, MissingH, mtl, multipart
-     , optparse-applicative, random, silently, stm, tar, temporary, text
-     , time, transformers, unix, unordered-containers, utf8-string, wai
-     , warp
+     , hspec-wai, http-types, hxt, iso8601-time, MissingH, mtl
+     , multipart, optparse-applicative, random, silently, stm, tar
+     , temporary, text, time, transformers, unix, unordered-containers
+     , utf8-string, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "heyefi";
-       version = "0.1.1.1";
-       sha256 = "0efccccc2f8b0cfce5496a39df575d50f007611ebfcc7bc260f74911ac6fa936";
+       version = "1.0.0.0";
+       sha256 = "76faae3d15478468c5c77021e8de886143da550e11e540fbd0e4abf8e1f24886";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -68480,10 +68497,10 @@ self: {
        ];
        testHaskellDepends = [
          base bytestring case-insensitive configurator containers directory
-         exceptions filepath HandsomeSoup hspec http-types hxt iso8601-time
-         MissingH mtl multipart optparse-applicative random silently stm tar
-         temporary text time transformers unix unordered-containers
-         utf8-string wai warp
+         exceptions filepath HandsomeSoup hspec hspec-wai http-types hxt
+         iso8601-time MissingH mtl multipart optparse-applicative random
+         silently stm tar temporary text time transformers unix
+         unordered-containers utf8-string wai wai-extra warp
        ];
        homepage = "https://github.com/ryantm/heyefi";
        description = "A server for Eye-Fi SD cards";
@@ -71774,6 +71791,7 @@ self: {
        homepage = "http://ghc.cs.tufts.edu/hoopl/";
        description = "A library to support dataflow analysis and optimization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoovie" = callPackage
@@ -72437,6 +72455,7 @@ self: {
        ];
        description = "Code Coverage Library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpc-coveralls" = callPackage
@@ -79107,6 +79126,18 @@ self: {
        license = "GPL";
      }) {};
 
+  "ifcxt" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "ifcxt";
+       version = "0.1.0.0";
+       sha256 = "7c09ff72dc72b288bb2020970adabc87ef1e5913175a745dd1573faf3422169d";
+       libraryHaskellDepends = [ base template-haskell ];
+       homepage = "http://github.com/mikeizbicki/ifcxt";
+       description = "put if statements within type constraints";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "iff" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
      mkDerivation {
@@ -79144,8 +79175,8 @@ self: {
      }:
      mkDerivation {
        pname = "ig";
-       version = "0.5";
-       sha256 = "07d955a37fb619f14941801e2afda7795910137b14856b3b4fb07a9fba661958";
+       version = "0.5.1";
+       sha256 = "1e97b3de79b9d78b32b74dbb1ab70451f7be544979fee90fb61d099b992b60e8";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring conduit conduit-extra
          crypto-api cryptohash cryptohash-cryptoapi data-default
@@ -80567,6 +80598,7 @@ self: {
        libraryHaskellDepends = [ ghc-prim ];
        description = "Integer library based on GMP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "integer-pure" = callPackage
@@ -86223,14 +86255,15 @@ self: {
      }:
      mkDerivation {
        pname = "language-qux";
-       version = "0.1.1.0";
-       sha256 = "c5259a61229368bc90a64b755bb91d21fd6be3392d907db536ae8e752fce1018";
+       version = "0.1.1.2";
+       sha256 = "5d9d794cb899005f0c917d3c8e9b856fd8dc9c1162e1f6d94ef1b8d8d3300d25";
        libraryHaskellDepends = [
          base containers either indents mtl parsec pretty transformers
        ];
        homepage = "https://github.com/qux-lang/language-qux";
        description = "Utilities for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-sh" = callPackage
@@ -89876,8 +89909,8 @@ self: {
      }:
      mkDerivation {
        pname = "log";
-       version = "0.2.4";
-       sha256 = "56f3e654199a547551faa93fe8a97e2f3d7412bd3c20c5dd2b3c1eac9947d5b5";
+       version = "0.3.0";
+       sha256 = "dca1bb49f899d7db636db183bb5404b464d120ed793181f3257adf44e5130862";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring deepseq
          exceptions hpqtypes lifted-base monad-control monad-time mtl
@@ -90254,6 +90287,8 @@ self: {
        pname = "loops";
        version = "0.2.0.2";
        sha256 = "47cfc98476c1a3267b27531825849978d3c0ccb5a2d6cd61132a7f719f10ddeb";
+       revision = "1";
+       editedCabalFile = "ef9ed99ec28140d39775a0b9c44333496d3ee754995219460d76cb137a9534ce";
        libraryHaskellDepends = [ base primitive transformers vector ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Fast imperative-style loops";
@@ -94534,8 +94569,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.2.0";
-       sha256 = "70a4c0f996d4e6787f3dd736f2885c6e2bd5bb0109f333a696b75093971cc31d";
+       version = "0.1.2.10";
+       sha256 = "b0e316ea784810049c5674903150697b818e873fd8ab531f9e62d807a4016f69";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -96362,6 +96397,7 @@ self: {
        homepage = "http://github.com/ekmett/mtl";
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mtl" = callPackage
@@ -96428,6 +96464,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/mtl-prelude";
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mtl-prelude" = callPackage
@@ -98004,8 +98041,8 @@ self: {
      }:
      mkDerivation {
        pname = "nats-queue";
-       version = "0.1.2.0";
-       sha256 = "eee9a423a1ae8eb5fb4af05a98958e32a8b86f5bf8abeba0074afe7690c30f3f";
+       version = "0.1.2.1";
+       sha256 = "278abe19802ac26b2a720ad9bab84c9ce74f348eabff55ee96e67286f5453ca3";
        libraryHaskellDepends = [
          aeson async base bytestring containers dequeue network network-uri
          random text
@@ -103310,6 +103347,7 @@ self: {
        jailbreak = true;
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parallel" = callPackage
@@ -104311,15 +104349,16 @@ self: {
      }) {};
 
   "pcre-heavy" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, Glob, pcre-light
-     , stringable, template-haskell
+    ({ mkDerivation, base, base-compat, bytestring, doctest, Glob
+     , pcre-light, semigroups, string-conversions, template-haskell
      }:
      mkDerivation {
        pname = "pcre-heavy";
-       version = "0.2.5";
-       sha256 = "01b599e8a3629795b4afb2bbb9e65bb114ddbccd867ca8806d75aa56e3bacde7";
+       version = "1.0.0.1";
+       sha256 = "a83e86a72c2bd8073dc71fc115c3b432c00c6294918250bed87f34a8c31ab0ec";
        libraryHaskellDepends = [
-         base bytestring pcre-light stringable template-haskell
+         base base-compat bytestring pcre-light semigroups
+         string-conversions template-haskell
        ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/myfreeweb/pcre-heavy";
@@ -105855,6 +105894,7 @@ self: {
        homepage = "https://github.com/jonschoning/pinboard";
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipe-enumerator" = callPackage
@@ -108036,10 +108076,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-schema";
-       version = "0.1.3";
-       sha256 = "a08c0cc84ec664cb35acb399c7e57c390db658a8e7a672479dc7b143d5ed249e";
-       revision = "1";
-       editedCabalFile = "48c36bad1c6796bd2c7211e0002d2aafc5bb0c8dedde4ec9f8ece597335096ce";
+       version = "0.1.4";
+       sha256 = "274dac6dcd5d263b4e2023d35901f9b02914b804aa71cd39f10ee813e2cd4ffd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108048,7 +108086,6 @@ self: {
        executableHaskellDepends = [
          base base-prelude old-locale optparse-applicative shelly text time
        ];
-       jailbreak = true;
        homepage = "https://github.com/mfine/postgresql-schema";
        description = "PostgreSQL Schema Management";
        license = stdenv.lib.licenses.bsd3;
@@ -108182,15 +108219,14 @@ self: {
      , hspec-wai, hspec-wai-json, HTTP, http-media, http-types, jwt
      , MissingH, mtl, network, network-uri, optparse-applicative
      , packdeps, process, QuickCheck, Ranged-sets, regex-base
-     , regex-tdfa, regex-tdfa-text, resource-pool, scientific, split
-     , string-conversions, stringsearch, text, time, transformers
-     , unordered-containers, vector, wai, wai-cors, wai-extra
-     , wai-middleware-static, warp
+     , regex-tdfa, resource-pool, scientific, split, string-conversions
+     , stringsearch, text, time, transformers, unordered-containers
+     , vector, wai, wai-cors, wai-extra, wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "postgrest";
-       version = "0.2.10.0";
-       sha256 = "fe2e67f849ac37427f1ef4a9d98c44ce4b77078232a655a959987ad96eab3668";
+       version = "0.2.11.1";
+       sha256 = "5cc8f06c2db31640709245a7eceb0894e5c66fd65a6a03228f8ab263c355792b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108198,18 +108234,18 @@ self: {
          case-insensitive cassava containers convertible hasql hasql-backend
          hasql-postgres HTTP http-types jwt MissingH mtl network network-uri
          optparse-applicative Ranged-sets regex-base regex-tdfa
-         regex-tdfa-text resource-pool scientific split string-conversions
-         stringsearch text time transformers unordered-containers vector wai
-         wai-cors wai-extra wai-middleware-static warp
+         resource-pool scientific split string-conversions stringsearch text
+         time transformers unordered-containers vector wai wai-cors
+         wai-extra wai-middleware-static warp
        ];
        executableHaskellDepends = [
          aeson base base64-string bcrypt blaze-builder bytestring
          case-insensitive cassava containers convertible hasql hasql-backend
          hasql-postgres HTTP http-types jwt MissingH mtl network network-uri
          optparse-applicative Ranged-sets regex-base regex-tdfa
-         regex-tdfa-text resource-pool scientific split string-conversions
-         stringsearch text time transformers unordered-containers vector wai
-         wai-cors wai-extra wai-middleware-static warp
+         resource-pool scientific split string-conversions stringsearch text
+         time transformers unordered-containers vector wai wai-cors
+         wai-extra wai-middleware-static warp
        ];
        testHaskellDepends = [
          aeson base base64-string bcrypt blaze-builder bytestring
@@ -108217,8 +108253,8 @@ self: {
          hasql-postgres heredoc hlint hspec hspec-wai hspec-wai-json HTTP
          http-media http-types jwt MissingH mtl network network-uri
          optparse-applicative packdeps process QuickCheck Ranged-sets
-         regex-base regex-tdfa regex-tdfa-text resource-pool scientific
-         split string-conversions stringsearch text time transformers
+         regex-base regex-tdfa resource-pool scientific split
+         string-conversions stringsearch text time transformers
          unordered-containers vector wai wai-cors wai-extra
          wai-middleware-static warp
        ];
@@ -108779,6 +108815,7 @@ self: {
        homepage = "http://github.com/haskell/pretty";
        description = "Pretty-printing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-class" = callPackage
@@ -108929,6 +108966,7 @@ self: {
        homepage = "https://github.com/haskell/primitive";
        description = "Primitive memory-related operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primitive" = callPackage
@@ -109139,6 +109177,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Process libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-conduit" = callPackage
@@ -111594,6 +111633,7 @@ self: {
        homepage = "https://github.com/qux-lang/qux";
        description = "Command line binary for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rabocsv2qif" = callPackage
@@ -113441,6 +113481,8 @@ self: {
        pname = "reflex-dom";
        version = "0.2";
        sha256 = "fd350b5e6d4613802bf37ebf15362b083af7bfec9ec22a56d1245bc3d2af86dd";
+       revision = "1";
+       editedCabalFile = "772321874e1c03eb514ba47c9866f0a856da71b708bffc27701f0a051bca1b24";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-default
          dependent-map dependent-sum dependent-sum-template directory
@@ -119518,6 +119560,7 @@ self: {
        jailbreak = true;
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqid" = callPackage
@@ -119541,6 +119584,7 @@ self: {
        jailbreak = true;
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqid-streams" = callPackage
@@ -123974,20 +124018,19 @@ self: {
 
   "snaplet-postgresql-simple" = callPackage
     ({ mkDerivation, base, bytestring, clientsession, configurator
-     , errors, lens, MonadCatchIO-transformers, mtl, postgresql-simple
+     , lens, MonadCatchIO-transformers, mtl, postgresql-simple
      , resource-pool-catchio, snap, text, transformers
      , unordered-containers
      }:
      mkDerivation {
        pname = "snaplet-postgresql-simple";
-       version = "0.6.0.3";
-       sha256 = "0f4c86c9d94560a1e12af151a7ab9bb7e21f10c70ddb5403ae8503dd1a0cf866";
+       version = "0.6.0.4";
+       sha256 = "44cca67347a81257533edc9570bf9303081a11d40e8000390a75f3f48e071687";
        libraryHaskellDepends = [
-         base bytestring clientsession configurator errors lens
+         base bytestring clientsession configurator lens
          MonadCatchIO-transformers mtl postgresql-simple
          resource-pool-catchio snap text transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/mightybyte/snaplet-postgresql-simple";
        description = "postgresql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -125548,6 +125591,7 @@ self: {
        homepage = "http://code.haskell.org/~byorgey/code/split";
        description = "Combinator library for splitting lists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "split" = callPackage
@@ -128409,6 +128453,24 @@ self: {
        license = "GPL";
      }) {};
 
+  "sub-state" = callPackage
+    ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances, sets
+     , tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "sub-state";
+       version = "0.0.0.1";
+       sha256 = "970080595b22141e63563f4718515554bf3a59a0c7cfabe694285597468b6dde";
+       libraryHaskellDepends = [ base mtl sets ];
+       testHaskellDepends = [
+         base QuickCheck quickcheck-instances tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       description = "Get the total, put a single element";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "subhask" = callPackage
     ({ mkDerivation, approximate, array, base, bloomfilter, bytes
      , bytestring, cassava, containers, deepseq, erf, gamma, ghc-prim
@@ -130553,6 +130615,7 @@ self: {
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tar" = callPackage
@@ -131181,6 +131244,7 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "Support library for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template-haskell-util" = callPackage
@@ -131542,6 +131606,7 @@ self: {
        homepage = "https://github.com/judah/terminfo";
        description = "Haskell bindings to the terminfo library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "terminfo-hs" = callPackage
@@ -133729,6 +133794,7 @@ self: {
        homepage = "https://github.com/haskell/time";
        description = "A time library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-compat" = callPackage
@@ -135059,6 +135125,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transformers-abort" = callPackage
@@ -138173,6 +138240,7 @@ self: {
        homepage = "https://github.com/haskell/unix";
        description = "POSIX functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unix-bytestring" = callPackage
@@ -139686,6 +139754,7 @@ self: {
        homepage = "https://github.com/agrafix/validate-input";
        description = "Input validation combinator library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validation" = callPackage
@@ -139913,8 +139982,8 @@ self: {
      }:
      mkDerivation {
        pname = "vcache-trie";
-       version = "0.2.0";
-       sha256 = "6238b76a198e9608e80569f95e0039e67f57a7af439ec18caf69aa3406a2a634";
+       version = "0.2.1";
+       sha256 = "bf4572fae3cfb58f859b3b6071b71778ce77750e70ad9c6c37b027f50e8504da";
        libraryHaskellDepends = [
          array base bytestring bytestring-builder vcache
        ];
@@ -140083,6 +140152,7 @@ self: {
        homepage = "https://github.com/haskell/vector";
        description = "Efficient Arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector" = callPackage
@@ -143031,6 +143101,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "webrtc-vad" = callPackage
+    ({ mkDerivation, base, primitive, vector }:
+     mkDerivation {
+       pname = "webrtc-vad";
+       version = "0.1.0.2";
+       sha256 = "d3ad3ba58ca2389102be09bda8bca69a525c766ada824898cf833d1993368293";
+       libraryHaskellDepends = [ base primitive vector ];
+       description = "Easy voice activity detection";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "webserver" = callPackage
     ({ mkDerivation, base, bytestring, c10k, containers, directory
      , filepath, network, old-locale, parsec, process, stm, time, unix
@@ -144769,6 +144850,7 @@ self: {
        homepage = "https://github.com/haskell/xhtml";
        description = "An XHTML combinator library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xhtml-combinators" = callPackage
@@ -148317,8 +148399,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-fuzzy-open";
-       version = "0.1.0";
-       sha256 = "ec851e33888b6fdf74b1c41e3fa5a796c091c375aa51d2b5026870a4556bc70f";
+       version = "0.1.0.1";
+       sha256 = "92eda3ac60f57509716f8473c840d6a46b1be52f3713b27c1a5d0aa70978b02a";
        libraryHaskellDepends = [
          base binary containers data-default directory filepath mtl text
          transformers-base vector yi yi-language yi-rope
@@ -149123,6 +149205,7 @@ self: {
        librarySystemDepends = [ zlib ];
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "zlib" = callPackage

From acb05dfc15121b1d568e28c86d169637f3892803 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Sep 2015 14:38:52 +0200
Subject: [PATCH 1994/2016] haskell-base32-bytestring: disable failing test
 suite

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6c602627fe7..4b6a5fe38ec 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1026,4 +1026,7 @@ self: super: {
   # https://github.com/bos/bloomfilter/issues/7
   bloomfilter = appendPatch super.bloomfilter ./patches/bloomfilter-fix-on-32bit.patch;
 
+  # https://github.com/pxqr/base32-bytestring/issues/4
+  base32-bytestring = dontCheck super.base32-bytestring;
+
 }

From 407b4f764131d899944c3d154773a28ccac3e89c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Sep 2015 14:39:18 +0200
Subject: [PATCH 1995/2016] haskell-sophia: disable failing test suite

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4b6a5fe38ec..e733fe8088c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -295,21 +295,22 @@ self: super: {
   hakyll = dontCheck super.hakyll;
   Hclip = dontCheck super.Hclip;
   HList = dontCheck super.HList;
+  ide-backend = dontCheck super.ide-backend;
   marquise = dontCheck super.marquise;                  # https://github.com/anchor/marquise/issues/69
   memcached-binary = dontCheck super.memcached-binary;
+  msgpack-rpc = dontCheck super.msgpack-rpc;
   persistent-zookeeper = dontCheck super.persistent-zookeeper;
   pocket-dns = dontCheck super.pocket-dns;
   postgresql-simple = dontCheck super.postgresql-simple;
   postgrest = dontCheck super.postgrest;
   snowball = dontCheck super.snowball;
+  sophia = dontCheck super.sophia;
   test-sandbox = dontCheck super.test-sandbox;
   users-postgresql-simple = dontCheck super.users-postgresql-simple;
   wai-middleware-hmac = dontCheck super.wai-middleware-hmac;
   wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1
   xkbcommon = dontCheck super.xkbcommon;
   xmlgen = dontCheck super.xmlgen;
-  ide-backend = dontCheck super.ide-backend;
-  msgpack-rpc = dontCheck super.msgpack-rpc;
 
   # These packages try to access the network.
   amqp = dontCheck super.amqp;

From 38a74e27de09479bb9f2c65b9b4aa471f1cd17b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Sep 2015 16:46:09 +0200
Subject: [PATCH 1996/2016] Remove Linux 4.0

It's EOL.
---
 pkgs/os-specific/linux/kernel/linux-4.0.nix | 17 -----------------
 pkgs/top-level/all-packages.nix             | 11 -----------
 2 files changed, 28 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.0.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
deleted file mode 100644
index eee052ad3bb..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.0.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "4.0.9";
-  extraMeta.branch = "4.0";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0k42blafzd954fncc0b78vi9x1h2k0jhfvkjqxmpv64i7xwwdhsx";
-  };
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
-  features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c99a1d67f88..346edc6b63b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9799,16 +9799,6 @@ let
       ];
   };
 
-  linux_4_0 = makeOverridable (import ../os-specific/linux/kernel/linux-4.0.nix) {
-    inherit fetchurl stdenv perl buildLinux;
-    kernelPatches = [ kernelPatches.bridge_stp_helper ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   linux_4_1 = makeOverridable (import ../os-specific/linux/kernel/linux-4.1.nix) {
     inherit fetchurl stdenv perl buildLinux;
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
@@ -10004,7 +9994,6 @@ let
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
   linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
   linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18);
-  linuxPackages_4_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_0 linuxPackages_4_0);
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1);
   linuxPackages_4_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_2 linuxPackages_4_2);
   linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);

From 90dc8da64d26af0c5582f10b044533dbaf78402a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Sep 2015 16:50:14 +0200
Subject: [PATCH 1997/2016] linux: Update to 3.18.21

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 05c4b989f39..02052b5d2ae 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.20";
+  version = "3.18.21";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1mwm9xgilsqnj95v3jn94dz9a108ggfm4ifb3kxsfsx5rcl5yy8d";
+    sha256 = "0y54kh55grgbyw4k8fa9vx8b426bq9lz12bpvwvzfjs7vimachyw";
   };
 
   features.iwlwifi = true;

From 65a415a1b24cb0c8d8bce6caceed228bf387df38 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Sep 2015 17:49:50 +0200
Subject: [PATCH 1998/2016] cabal2nix: update to version 20180903

---
 .../haskell-modules/configuration-common.nix   |  1 -
 .../tools/haskell/cabal2nix/cabal2nix.nix      |  8 ++++----
 .../haskell/cabal2nix/distribution-nixpkgs.nix | 14 ++++++--------
 .../tools/haskell/cabal2nix/hackage2nix.nix    |  4 ++--
 .../tools/haskell/cabal2nix/language-nix.nix   | 14 ++++++++------
 .../cabal2nix/lens-construction-helper.nix     | 18 ------------------
 6 files changed, 20 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e733fe8088c..1545e49130a 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 {};
-  lens-construction-helper = self.callPackage ../tools/haskell/cabal2nix/lens-construction-helper.nix {};
   language-nix = self.callPackage ../tools/haskell/cabal2nix/language-nix.nix {};
   distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix {};
 
diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
index c12cd2cfce2..537e427f66c 100644
--- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
@@ -1,16 +1,16 @@
 { mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs
-, language-nix, lens, lens-construction-helper, optparse-applicative, pretty
+, language-nix, lens, optparse-applicative, pretty
 , pretty-show, stdenv, fetchFromGitHub, nix-prefetch-scripts, makeWrapper
 }:
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150824-66-gd281a60";
+  version = "20180903";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
+    sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;
@@ -18,7 +18,7 @@ mkDerivation rec {
   enableSharedExecutables = false;
   executableHaskellDepends = [
     ansi-wl-pprint base Cabal containers distribution-nixpkgs
-    language-nix lens lens-construction-helper optparse-applicative
+    language-nix lens optparse-applicative
     pretty pretty-show
   ];
   executableToolDepends = [ makeWrapper ];
diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
index d879ea051e8..3262008e25a 100644
--- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
@@ -1,30 +1,28 @@
 { mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
 , deepseq-generics, directory, doctest, filepath, hackage-db, hspec
-, language-nix, lens, lens-construction-helper, pretty, process
-, SHA, split, stdenv, transformers, utf8-string, fetchFromGitHub
+, language-nix, lens, pretty, process, SHA, split, stdenv
+, transformers, utf8-string, fetchFromGitHub
 }:
 
 mkDerivation rec {
   pname = "distribution-nixpkgs";
-  version = "20150824-66-gd281a60";
+  version = "20180903";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
+    sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
   };
   postUnpack = "sourceRoot+=/${pname}";
   libraryHaskellDepends = [
     aeson base bytestring Cabal containers deepseq deepseq-generics
     directory doctest filepath hackage-db hspec language-nix lens
-    lens-construction-helper pretty process SHA split transformers
-    utf8-string
+    pretty process SHA split transformers utf8-string
   ];
   testHaskellDepends = [
     aeson base bytestring Cabal containers deepseq deepseq-generics
     directory doctest filepath hackage-db hspec language-nix lens
-    lens-construction-helper pretty process SHA split transformers
-    utf8-string
+    pretty process SHA split transformers utf8-string
   ];
   homepage = "https://github.com/nixos/cabal2nix#readme";
   description = "Convert Cabal files into Nix build instructions";
diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
index 5345fe5f413..28a767e31f0 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 = "20150824-66-gd281a60";
+  version = "20180903";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
+    sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
   };
   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 a9e02f25449..ea282d75101 100644
--- a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
@@ -1,20 +1,22 @@
-{ mkDerivation, base, data-default-class, deepseq-generics, lens
-, lens-construction-helper, pretty, regex-posix, stdenv, fetchFromGitHub
+{ mkDerivation, base, deepseq, doctest, lens, pretty, regex-posix
+, stdenv, fetchFromGitHub, QuickCheck
 }:
 
 mkDerivation rec {
   pname = "language-nix";
-  version = "20150824-66-gd281a60";
+  version = "20180903";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
+    sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
   };
   postUnpack = "sourceRoot+=/${pname}";
   libraryHaskellDepends = [
-    base data-default-class deepseq-generics lens
-    lens-construction-helper pretty regex-posix
+    base deepseq lens pretty regex-posix
+  ];
+  testHaskellDepends = [
+    base deepseq doctest lens pretty regex-posix QuickCheck
   ];
   homepage = "https://github.com/nixos/cabal2nix#readme";
   description = "Data types and useful functions to represent and manipulate the Nix language";
diff --git a/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix b/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix
deleted file mode 100644
index 0508795486f..00000000000
--- a/pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ mkDerivation, base, data-default-class, fetchFromGitHub, lens, stdenv }:
-
-mkDerivation rec {
-  pname = "lens-construction-helper";
-  version = "20150824-66-gd281a60";
-  src = fetchFromGitHub {
-    owner = "nixos";
-    repo = "cabal2nix";
-    rev = "v${version}";
-    sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
-  };
-  postUnpack = "sourceRoot+=/${pname}";
-  libraryHaskellDepends = [ base data-default-class lens ];
-  homepage = "https://github.com/nixos/cabal2nix#readme";
-  description = "Use data-default to create default instances of various types";
-  license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ simons ];
-}

From d169882bb2173402b9ff9691dc7b7004f09cdf51 Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Thu, 3 Sep 2015 17:01:00 +0300
Subject: [PATCH 1999/2016] qtcreator: add missing QML modules (fixes #9629)

Fixes empty welcome screen because of missing QML modules.
---
 pkgs/development/qtcreator/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index 0f55d4ee9af..8dabd3347fc 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
     Categories=Qt;Development;IDE;
     __EOF__
     # Wrap the qtcreator binary
+    addToSearchPath QML2_IMPORT_PATH "${qtLib.quickcontrols}/lib/qt5/qml"
     wrapProgram $out/bin/qtcreator \
       --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
       --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \

From bfe09b88fc5b304cd7071ccacfd2441d775e54b7 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Thu, 3 Sep 2015 17:37:56 +0000
Subject: [PATCH 2000/2016] scons: 2.3.5 -> 2.3.6

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

diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 9e54be8aa90..a2b79d77e22 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -2,7 +2,7 @@
 
 let
   name = "scons";
-  version = "2.3.5";
+  version = "2.3.6";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
-    sha256 = "0hlwkrr5fkjpjgmwipp9a2bnc9riqks2pjc3rvjsq0a8j7hr72ca";
+    sha256 = "1pq44h0ndclbrwvx901zih63jnzqsyyr865zlml40klg3lssmbcq";
   };
 
   buildInputs = [python makeWrapper];

From 1e83055cd23279c0167ec8c05fbf1484fca2538c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <deroiste@syslab.com>
Date: Mon, 31 Aug 2015 09:42:31 +0200
Subject: [PATCH 2001/2016] Revert "jack2: 1.9.10 -> 2015-06-02"

This reverts commit fd829968c7b6734e04d7c720d51a174b4e8a8412.
---
 pkgs/misc/jackaudio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index eb80937b6a3..47511cf58b0 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}jack2-${version}";
-  version = "2015-06-02";
+  version = "1.9.10";
 
   src = fetchFromGitHub {
     owner = "jackaudio";
     repo = "jack2";
-    rev = "b5bceb50c708f55cc569c3e1f0f1876a49fbdade";
-    sha256 = "0dc00729wkbxnbhnmyfam1wdwd5m8jvrjccypb32bj072jqaqaw7";
+    rev = "v${version}";
+    sha256 = "1a2213l7x6sgqg2hq3yhnpvvvqyskhsmx8j3z0jgjsqwz9xa3wbr";
   };
 
   nativeBuildInputs = [ pkgconfig python makeWrapper ];

From 55d822c512b9e995927a5ef203721ae1d111b651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <deroiste@syslab.com>
Date: Thu, 3 Sep 2015 14:22:13 +0200
Subject: [PATCH 2002/2016] jack2: apply patch to fix build with gcc5

---
 pkgs/misc/jackaudio/default.nix     |  4 +++-
 pkgs/misc/jackaudio/jack-gcc5.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/misc/jackaudio/jack-gcc5.patch

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 47511cf58b0..25fd1a5cbbf 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -41,10 +41,12 @@ stdenv.mkDerivation rec {
     optDbus optPythonDBus optLibffado optAlsaLib optLibopus
   ];
 
-  patchPhase = ''
+  prePatch = ''
     substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
   '';
 
+  patches = [ ./jack-gcc5.patch ];
+
   configurePhase = ''
     python waf configure --prefix=$out \
       ${optionalString (optDbus != null) "--dbus"} \
diff --git a/pkgs/misc/jackaudio/jack-gcc5.patch b/pkgs/misc/jackaudio/jack-gcc5.patch
new file mode 100644
index 00000000000..f18042c6e32
--- /dev/null
+++ b/pkgs/misc/jackaudio/jack-gcc5.patch
@@ -0,0 +1,26 @@
+From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001
+From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
+Date: Thu, 18 Sep 2014 18:29:23 +0200
+Subject: [PATCH] Fix FTBFS with clang++
+
+Forwarded from http://bugs.debian.org/757820
+---
+ common/memops.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/memops.c b/common/memops.c
+index 27f6194..2d416b6 100644
+--- a/common/memops.c
++++ b/common/memops.c
+@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s)
+  */
+ static unsigned int seed = 22222;
+ 
+-inline unsigned int fast_rand() {
++static inline unsigned int fast_rand() {
+ 	seed = (seed * 96314165) + 907633515;
+ 	return seed;
+ }
+-- 
+2.4.0
+

From 4af33f24ac5f88fcad3bd8e31dfdff08fe86784e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 3 Sep 2015 22:10:03 +0200
Subject: [PATCH 2003/2016] hhvm: fixup build

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

diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index a5586117588..817b20af9c4 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
       --replace /bin/bash ${stdenv.shell}
     substituteInPlace ./configure \
       --replace "/usr/bin/env bash" ${stdenv.shell}
+    sed '1i#include <vector>' \
+      -i ./third-party/mcrouter/mcrouter/lib/fibers/TimeoutController.h
   '';
 
   cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];

From 833b4c34c273668fd1ca98d80f7cabee6e58ad9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 3 Sep 2015 22:11:25 +0200
Subject: [PATCH 2004/2016] nixos/gdm: fix description typo

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

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index b9808f1ffa6..b51c3dd28bf 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -35,7 +35,7 @@ in
               type = types.bool;
               default = false;
               description = ''
-                Automatically log in as the sepecified <option>auto.user</option>.
+                Automatically log in as the sepecified <option>autoLogin.user</option>.
               '';
             };
 

From b716673f971311c40cd037c95860ea36c6e9ff2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 3 Sep 2015 22:22:00 +0200
Subject: [PATCH 2005/2016] nixos/gdm: add assertion for the autoLogin.user
 option

Or else users may see this unfriendly message:

  error: cannot coerce null to a string, at .../nixos/modules/services/x11/display-managers/gdm.nix:107:49
---
 nixos/modules/services/x11/display-managers/gdm.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index b51c3dd28bf..55af2ecbb76 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -68,6 +68,13 @@ in
 
   config = mkIf cfg.gdm.enable {
 
+    assertions = [
+      { assertion = let autoLogin = cfg.gdm.autoLogin; in
+          if autoLogin.enable then autoLogin.user != null else true;
+        message = "GDM auto-login requires services.xserver.displayManager.gdm.autoLogin.user to be set";
+      }
+    ];
+
     services.xserver.displayManager.slim.enable = false;
 
     users.extraUsers.gdm =

From 710c4c3c9d297658bca1758986731ce530603275 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 3 Sep 2015 23:32:36 +0300
Subject: [PATCH 2006/2016] linuxPackages_*.perf: Fix build after kernel 4.1

In 4.1, the build system changed, and it now wants to execute ld like this:

ld -r -o util/scripting-engines/libperf-in.o util/scripting-engines/trace-event-perl.o util/scripting-engines/trace-event-python.o

The actual problem seems to be that `buildInputs = [elfutils ...]`
causes 'ld' to point to elfutils in PATH instead of the usual binutils.

So remove elfutils from buildInputs and set NIX_CFLAGS_* manually. This
is a slight hack, but there is some precedent:
https://github.com/NixOS/nixpkgs/blob/0761f81da71fc6a940c7f51129b6c7717db78e87/pkgs/tools/package-management/rpm/default.nix#L13

Fixes #9095.
---
 pkgs/os-specific/linux/kernel/perf.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index efd3515ff24..2dcdcdc4a91 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -23,10 +23,13 @@ stdenv.mkDerivation {
   # perf refers both to newt and slang
   # binutils is required for libbfd.
   nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ];
-  buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils ] ++
+  buildInputs = [ python perl newt slang pkgconfig libunwind binutils ] ++
     stdenv.lib.optional withGtk gtk;
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
+  # Note: we don't add elfutils to buildInputs, since it provides a
+  # bad `ld' and other stuff.
+  NIX_CFLAGS_COMPILE = "-I${elfutils}/include -Wno-error=cpp";
+  NIX_CFLAGS_LINK = "-L${elfutils}/lib";
 
   installFlags = "install install-man ASCIIDOC8=1";
 

From 6f3f5f536dd55f757f6cf4c4e9f861a5168e8392 Mon Sep 17 00:00:00 2001
From: Yochai <yochai@titat.info>
Date: Thu, 3 Sep 2015 12:52:17 +0300
Subject: [PATCH 2007/2016] rtl8812au: init at 4.2.2

---
 pkgs/os-specific/linux/rtl8812au/default.nix | 31 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/os-specific/linux/rtl8812au/default.nix

diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
new file mode 100644
index 00000000000..a16e102bc08
--- /dev/null
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, kernel }:
+
+stdenv.mkDerivation rec {
+  name = "rtl8812au-${kernel.version}-${version}";
+  version = "4.2.2-1";
+  
+  src = fetchFromGitHub {
+    owner = "csssuf";
+    repo = "rtl8812au";
+    rev = "874906aec694c800bfc29b146737b88dae767832";
+    sha256 = "14ifhplawipfd6971mxw76dv3ygwc0n8sbz2l3f0vvkin6x88bsj";
+  };
+  
+  patchPhase = ''
+    substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/"
+    substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}"
+    substituteInPlace ./Makefile --replace /sbin/depmod #
+    substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+  '';
+  
+  preInstall = ''
+    mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
+  '';
+   
+  meta = {
+    description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod.";
+    homepage = "https://github.com/csssuf/rtl8812au";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 346edc6b63b..e4d34f58e79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9908,6 +9908,8 @@ let
     nvidia_x11_beta      = callPackage ../os-specific/linux/nvidia-x11/beta.nix { };
     nvidia_x11           = callPackage ../os-specific/linux/nvidia-x11 { };
 
+    rtl8812au = callPackage ../os-specific/linux/rtl8812au { };
+
     openafsClient = callPackage ../servers/openafs-client { };
 
     openiscsi = callPackage ../os-specific/linux/open-iscsi { };

From c31a677482bf010d46bdd61cd447fe403b167949 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 4 Sep 2015 01:14:50 +0300
Subject: [PATCH 2008/2016] Revert "bundler-HEAD: fix checksum"

This reverts commit 9cea5bcf2cb180638e2e5e47692e57387fcbb051.
See https://github.com/NixOS/nixpkgs/commit/9cea5bcf2cb180638e2e5e47692e57387fcbb051#commitcomment-13058505
---
 pkgs/development/interpreters/ruby/bundler-head.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 9bfe92ecee3359576093cfb534adbec13dcbd580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Fri, 4 Sep 2015 00:18:19 +0100
Subject: [PATCH 2009/2016] docker: Minor improvements, fix failing test

- Replace usage of deprecated CLI flag `--daemon`
- Introduce `storageDriver` option for module
- Fix failing test by using `overlay` storage driver
---
 nixos/modules/virtualisation/docker.nix | 15 +++++++++++++--
 nixos/tests/docker.nix                  |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 2339cf7c649..ba078cc0a11 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -43,6 +43,17 @@ in
             in future.  So set this option explicitly to false if you wish.
           '';
       };
+    storageDriver =
+      mkOption {
+        type = types.enum ["aufs" "btrfs" "devicemapper" "overlay" "zfs"];
+        description =
+          ''
+            This option determines which Docker storage driver to use.
+            It is required but lacks a default value as its most
+            suitable value will depend the filesystems available on the
+            host.
+          '';
+      };
     extraOptions =
       mkOption {
         type = types.separatedString " ";
@@ -85,7 +96,7 @@ in
         after = [ "network.target" "docker.socket" ];
         requires = [ "docker.socket" ];
         serviceConfig = {
-          ExecStart = "${pkgs.docker}/bin/docker --daemon=true --host=fd:// --group=docker ${cfg.extraOptions}";
+          ExecStart = "${pkgs.docker}/bin/docker daemon --host=fd:// --group=docker --storage-driver=${cfg.storageDriver} ${cfg.extraOptions}";
           #  I'm not sure if that limits aren't too high, but it's what
           #  goes in config bundled with docker itself
           LimitNOFILE = 1048576;
@@ -111,7 +122,7 @@ in
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
         serviceConfig = {
-          ExecStart = "${pkgs.docker}/bin/docker --daemon=true --group=docker ${cfg.extraOptions}";
+          ExecStart = "${pkgs.docker}/bin/docker daemon --group=docker --storage-driver=${cfg.storageDriver} ${cfg.extraOptions}";
           #  I'm not sure if that limits aren't too high, but it's what
           #  goes in config bundled with docker itself
           LimitNOFILE = 1048576;
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index babb2b8e00e..034dcb04adf 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       { config, pkgs, ... }:
         {
           virtualisation.docker.enable = true;
+          virtualisation.docker.storageDriver = "overlay";
         };
     };
 

From b2c7bda45d582c2a5232bcc11c26c2c6330caa30 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 4 Sep 2015 01:19:53 +0300
Subject: [PATCH 2010/2016] julia03: use bundled llvm

---
 pkgs/development/compilers/julia/0.3.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 27b58b4d0f1..76dc6aa1d30 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, fetchurl
 # build tools
-, gfortran, git, m4, patchelf, perl, which
+, gfortran, git, m4, patchelf, perl, which, python2
 # libjulia dependencies
 , libunwind, llvm, readline, utf8proc, zlib
 # standard library dependencies
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
         name = "dsfmt-${dsfmt_ver}.tar.gz";
         md5 = "cb61be3be7254eae39684612c524740d";
       };
-    in [ dsfmt_src ];
+
+    in [ dsfmt_src llvm.src ];
 
   prePatch = ''
     copy_kill_hash(){
@@ -59,12 +60,12 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs =
-    [ libunwind llvm readline utf8proc zlib
+    [ libunwind readline utf8proc zlib
       double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
       openblas arpack suitesparse
     ];
 
-  nativeBuildInputs = [ gfortran git m4 patchelf perl which ];
+  nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ];
 
   makeFlags =
     let
@@ -96,7 +97,6 @@ stdenv.mkDerivation rec {
       "USE_SYSTEM_GMP=1"
       "USE_SYSTEM_GRISU=1"
       "USE_SYSTEM_LIBUNWIND=1"
-      "USE_SYSTEM_LLVM=1"
       "USE_SYSTEM_MPFR=1"
       "USE_SYSTEM_PATCHELF=1"
       "USE_SYSTEM_PCRE=1"
@@ -142,6 +142,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
-    broken = false;
   };
 }

From 3129142f801ff6e947675912f653e5e4ebf0b652 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Sun, 30 Aug 2015 23:50:28 -0400
Subject: [PATCH 2011/2016] accelio: fix i686-linux build

* Compile with gcc5 to avoid the compiler bug described in
  https://gcc.gnu.org/ml/gcc-patches/2014-05/msg02560.html

* Add a patch to fix the many incorrect printf format specifiers and
  other sloppy type conversions that gcc5 catches and warns on
  (erroring out due to -Werror).
---
 .../development/libraries/accelio/default.nix |   2 +
 .../libraries/accelio/fix-printfs.patch       | 615 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +-
 3 files changed, 618 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/accelio/fix-printfs.patch

diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix
index 6edeacac11e..a8fddad2d88 100644
--- a/pkgs/development/libraries/accelio/default.nix
+++ b/pkgs/development/libraries/accelio/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "172frqk2n43g0arhazgcwfvj0syf861vdzdpxl7idr142bb0ykf7";
   };
 
+  patches = [ ./fix-printfs.patch ];
+
   postPatch = ''
     # Don't build broken examples
     sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\).*\/kernel/d' configure.ac
diff --git a/pkgs/development/libraries/accelio/fix-printfs.patch b/pkgs/development/libraries/accelio/fix-printfs.patch
new file mode 100644
index 00000000000..23b2f40e42f
--- /dev/null
+++ b/pkgs/development/libraries/accelio/fix-printfs.patch
@@ -0,0 +1,615 @@
+diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c
+--- accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c	2015-09-03 19:36:25.610337514 -0400
++++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c	2015-09-03 19:59:13.258697472 -0400
+@@ -246,7 +246,7 @@ static void *worker_thread(void *data)
+ 		} else {
+ 			vmsg_sglist_set_nents(&msg->out, 0);
+ 		}
+-		msg->user_context = (void *)get_cycles();
++		msg->user_context = (void *)(intptr_t)get_cycles();
+ 		/* send first message */
+ 		if (xio_send_request(tdata->conn, msg) == -1) {
+ 			if (xio_errno() != EAGAIN)
+@@ -330,7 +330,7 @@ static int on_response(struct xio_sessio
+ {
+ 	struct thread_data  *tdata = (struct thread_data *)cb_user_context;
+ 
+-	cycles_t rtt = (get_cycles()-(cycles_t)msg->user_context);
++	cycles_t rtt = (get_cycles()-(cycles_t)(intptr_t)msg->user_context);
+ 
+ 	if (tdata->do_stat) {
+ 		if (rtt > tdata->stat.max_rtt)
+@@ -358,7 +358,7 @@ static int on_response(struct xio_sessio
+ 	msg->in.header.iov_len = 0;
+ 	vmsg_sglist_set_nents(&msg->in, 0);
+ 
+-	msg->user_context = (void *)get_cycles();
++	msg->user_context = (void *)(intptr_t)get_cycles();
+ 	if (xio_send_request(tdata->conn, msg) == -1) {
+ 		if (xio_errno() != EAGAIN)
+ 			printf("**** [%p] Error - xio_send_request " \
+@@ -559,7 +559,7 @@ int run_client_test(struct perf_paramete
+ 		       sess_data.min_lat_us,
+ 		       sess_data.max_lat_us);
+ 		if (fd)
+-			fprintf(fd, "%lu, %d, %lu, %.2lf, %.2lf\n",
++			fprintf(fd, "%" PRIu64 ", %d, %" PRIu64 ", %.2lf, %.2lf\n",
+ 				data_len,
+ 				threads_iter,
+ 				sess_data.tps,
+diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h
+--- accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h	2015-09-03 19:36:25.610337514 -0400
++++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h	2015-09-03 19:57:30.856215123 -0400
+@@ -90,7 +90,7 @@ typedef enum { READ, WRITE} Verb;
+ /* The format of the results */
+ #define RESULT_FMT		" #bytes     #threads   #TPS       BW average[MBps]   Latency average[usecs]   Latency low[usecs]   Latency peak[usecs]\n"
+ /* Result print format */
+-#define REPORT_FMT		" %-7lu     %-2d         %-9.2lu	  %-9.2lf     %-9.2lf                  %-9.2lf              %-9.2lf\n"
++#define REPORT_FMT		" %-7" PRIu64 "     %-2d         %-9.2" PRIu64 "	  %-9.2lf     %-9.2lf                  %-9.2lf              %-9.2lf\n"
+ 
+ 
+ struct perf_parameters {
+diff -rup accelio/examples/usr/hello_world_iov/xio_client.c accelio.new/examples/usr/hello_world_iov/xio_client.c
+--- accelio/examples/usr/hello_world_iov/xio_client.c	2015-09-03 19:36:25.611337519 -0400
++++ accelio.new/examples/usr/hello_world_iov/xio_client.c	2015-09-03 19:42:19.983984370 -0400
+@@ -224,7 +224,7 @@ static void process_response(struct sess
+ 				len = 64;
+ 			tmp = str[len];
+ 			str[len] = '\0';
+-			printf("message header : [%lu] - %s\n",
++			printf("message header : [%" PRIu64 "] - %s\n",
+ 			       (rsp->request->sn + 1), str);
+ 			str[len] = tmp;
+ 		}
+@@ -236,7 +236,7 @@ static void process_response(struct sess
+ 					len = 64;
+ 				tmp = str[len];
+ 				str[len] = '\0';
+-				printf("message data: [%lu][%d][%zd] - %s\n",
++				printf("message data: [%" PRIu64 "][%d][%zd] - %s\n",
+ 				       (rsp->request->sn + 1), i, sglist[i].iov_len, str);
+ 				str[len] = tmp;
+ 			}
+diff -rup accelio/examples/usr/hello_world_iov/xio_server.c accelio.new/examples/usr/hello_world_iov/xio_server.c
+--- accelio/examples/usr/hello_world_iov/xio_server.c	2015-09-03 19:36:25.611337519 -0400
++++ accelio.new/examples/usr/hello_world_iov/xio_server.c	2015-09-03 19:43:07.353204184 -0400
+@@ -203,7 +203,7 @@ static void process_request(struct serve
+ 				len = 64;
+ 			tmp = str[len];
+ 			str[len] = '\0';
+-			printf("message header : [%lu] - %s\n",
++			printf("message header : [%" PRIu64 "] - %s\n",
+ 			       (req->sn + 1), str);
+ 			str[len] = tmp;
+ 		}
+@@ -215,7 +215,7 @@ static void process_request(struct serve
+ 					len = 64;
+ 				tmp = str[len];
+ 				str[len] = '\0';
+-				printf("message data: [%lu][%d][%zd] - %s\n",
++				printf("message data: [%" PRIu64 "][%d][%zd] - %s\n",
+ 				       (req->sn + 1), i, sglist[i].iov_len, str);
+ 				str[len] = tmp;
+ 			}
+@@ -360,11 +360,11 @@ static int on_msg_error(struct xio_sessi
+ 	struct server_data *sdata = (struct server_data *)cb_user_context;
+ 
+ 	if (direction == XIO_MSG_DIRECTION_OUT) {
+-		printf("**** [%p] message %lu failed. reason: %s\n",
++		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, msg->sn, xio_strerror(error));
+ 	} else {
+ 		xio_release_response(msg);
+-		printf("**** [%p] message %lu failed. reason: %s\n",
++		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, msg->request->sn, xio_strerror(error));
+ 	}
+ 
+diff -rup accelio/examples/usr/hello_world_libevent/xio_client.c accelio.new/examples/usr/hello_world_libevent/xio_client.c
+--- accelio/examples/usr/hello_world_libevent/xio_client.c	2015-09-03 19:36:25.612337524 -0400
++++ accelio.new/examples/usr/hello_world_libevent/xio_client.c	2015-09-03 19:43:32.748322028 -0400
+@@ -87,7 +87,7 @@ static void process_response(struct sess
+ {
+ 	if (++session_data->cnt == PRINT_COUNTER) {
+ 		((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0;
+-		printf("message: [%lu] - %s\n",
++		printf("message: [%" PRIu64 "] - %s\n",
+ 		       (rsp->request->sn + 1), (char *)rsp->in.header.iov_base);
+ 		session_data->cnt = 0;
+ 	}
+diff -rup accelio/examples/usr/hello_world_libevent/xio_server.c accelio.new/examples/usr/hello_world_libevent/xio_server.c
+--- accelio/examples/usr/hello_world_libevent/xio_server.c	2015-09-03 19:36:25.612337524 -0400
++++ accelio.new/examples/usr/hello_world_libevent/xio_server.c	2015-09-03 19:43:50.556404665 -0400
+@@ -82,7 +82,7 @@ static void process_request(struct serve
+ 				len = 64;
+ 			tmp = str[len];
+ 			str[len] = '\0';
+-			printf("message header : [%lu] - %s\n",
++			printf("message header : [%" PRIu64 "] - %s\n",
+ 			       (req->sn + 1), str);
+ 			str[len] = tmp;
+ 		}
+@@ -94,7 +94,7 @@ static void process_request(struct serve
+ 					len = 64;
+ 				tmp = str[len];
+ 				str[len] = '\0';
+-				printf("message data: [%lu][%d][%d] - %s\n",
++				printf("message data: [%" PRIu64 "][%d][%d] - %s\n",
+ 				       (req->sn + 1), i, len, str);
+ 				str[len] = tmp;
+ 			}
+diff -rup accelio/examples/usr/hello_world_mt/xio_mt_client.c accelio.new/examples/usr/hello_world_mt/xio_mt_client.c
+--- accelio/examples/usr/hello_world_mt/xio_mt_client.c	2015-09-03 19:36:25.611337519 -0400
++++ accelio.new/examples/usr/hello_world_mt/xio_mt_client.c	2015-09-03 19:41:13.493675827 -0400
+@@ -40,6 +40,7 @@
+ #include <string.h>
+ #include <inttypes.h>
+ #include <sched.h>
++#include <inttypes.h>
+ 
+ #include "libxio.h"
+ 
+@@ -133,7 +134,7 @@ static void process_response(struct thre
+ {
+ 	if (++tdata->cnt == PRINT_COUNTER) {
+ 		((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0;
+-		printf("thread [%d] - tid:%p  - message: [%lu] - %s\n",
++		printf("thread [%d] - tid:%p  - message: [%" PRIu64 "] - %s\n",
+ 		       tdata->affinity,
+ 		      (void *)pthread_self(),
+ 		       (rsp->request->sn + 1), (char *)rsp->in.header.iov_base);
+diff -rup accelio/examples/usr/hello_world_mt/xio_mt_server.c accelio.new/examples/usr/hello_world_mt/xio_mt_server.c
+--- accelio/examples/usr/hello_world_mt/xio_mt_server.c	2015-09-03 19:36:25.611337519 -0400
++++ accelio.new/examples/usr/hello_world_mt/xio_mt_server.c	2015-09-03 19:41:31.730760455 -0400
+@@ -104,7 +104,7 @@ static void process_request(struct threa
+ 			    struct xio_msg *req)
+ {
+ 	if (++tdata->cnt == PRINT_COUNTER) {
+-		printf("thread [%d] tid:%p - message: [%lu] - %s\n",
++		printf("thread [%d] tid:%p - message: [%" PRIu64 "] - %s\n",
+ 		       tdata->affinity,
+ 		       (void *)pthread_self(),
+ 		       (req->sn + 1), (char *)req->in.header.iov_base);
+diff -rup accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c
+--- accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c	2015-09-03 19:36:25.603337482 -0400
++++ accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c	2015-09-03 20:00:15.169989095 -0400
+@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi
+ 	struct thread_data	*tdata		= conn_entry->tdata;
+ 
+ 	if (direction == XIO_MSG_DIRECTION_OUT) {
+-		DEBUG("**** [%p] message %lu failed. reason: %s\n",
++		DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, req->sn, xio_strerror(error));
+ 	} else {
+ 		xio_release_response(req);
+-		DEBUG("**** [%p] message %lu failed. reason: %s\n",
++		DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, req->request->sn, xio_strerror(error));
+ 	}
+ 	obj_pool_put(tdata->req_pool, req);
+diff -rup accelio/src/tools/usr/xio_if_numa_cpus.c accelio.new/src/tools/usr/xio_if_numa_cpus.c
+--- accelio/src/tools/usr/xio_if_numa_cpus.c	2015-09-03 19:36:25.603337482 -0400
++++ accelio.new/src/tools/usr/xio_if_numa_cpus.c	2015-09-03 19:40:06.398364476 -0400
+@@ -43,6 +43,7 @@
+ #include <net/if.h>
+ #include <stdio.h>
+ #include <numa.h>
++#include <inttypes.h>
+ 
+ #define cpusmask_test_bit(nr, addr)	(*(addr) & (1ULL << (nr)))
+ #define cpusmask_set_bit(nr, addr)	(*(addr) |=  (1ULL << (nr)))
+@@ -244,7 +245,7 @@ int main(int argc, char *argv[])
+ 		}
+ 		intf_cpusmask_str(cpusmask, cpusnum, cpus_str);
+ 
+-		printf("%-10s %-16s %-30s %-5d 0x%-8lx %-4s[%d] - %s\n",
++		printf("%-10s %-16s %-30s %-5d 0x%-8" PRIx64 " %-4s[%d] - %s\n",
+ 		       ifa->ifa_name, host, flags, numa_node, cpusmask,
+ 		       "cpus",  cpusnum, cpus_str);
+ 	}
+diff -rup accelio/src/tools/usr/xio_mem_usage.c accelio.new/src/tools/usr/xio_mem_usage.c
+--- accelio/src/tools/usr/xio_mem_usage.c	2015-09-03 19:36:25.603337482 -0400
++++ accelio.new/src/tools/usr/xio_mem_usage.c	2015-09-03 19:38:57.596044838 -0400
+@@ -73,7 +73,7 @@
+ 	while (i++ < 48) { \
+ 		printf("."); \
+ 	} \
+-	printf(" %6lu\n", sizeof(type)); \
++	printf(" %zu\n", sizeof(type)); \
+ }
+ 
+ int main(int argc, char **argv)
+diff -rup accelio/tests/portable/direct_rdma_test/xio_rdma_common.c accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c
+--- accelio/tests/portable/direct_rdma_test/xio_rdma_common.c	2015-09-03 19:36:25.610337514 -0400
++++ accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c	2015-09-03 19:56:25.521908028 -0400
+@@ -90,7 +90,7 @@ static int publish_our_buffer(struct xio
+ 	 * this flag must be on */
+ 	rsp->flags = XIO_MSG_FLAG_IMM_SEND_COMP;
+ 
+-	rdma_test_buf.addr = (uint64_t)rdma_reg_mem.addr;
++	rdma_test_buf.addr = (intptr_t)rdma_reg_mem.addr;
+ 	rdma_test_buf.length = rdma_reg_mem.length;
+ 	rdma_test_buf.rkey = xio_lookup_rkey_by_response(&rdma_reg_mem, rsp);
+ 
+diff -rup accelio/tests/usr/hello_test/xio_client.c accelio.new/tests/usr/hello_test/xio_client.c
+--- accelio/tests/usr/hello_test/xio_client.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test/xio_client.c	2015-09-03 19:45:43.055926711 -0400
+@@ -181,13 +181,13 @@ static void process_response(struct test
+ 
+ 		double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB);
+ 		double rxbw = (1.0*pps*test_params->stat.rxlen/ONE_MB);
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
+ 		       pps, txbw, rxbw,
+ 		       test_params->stat.txlen, test_params->stat.rxlen);
+ 		get_time(timeb, 40);
+ 
+-		printf("**** [%s] - message [%zd] %s - %s\n",
++		printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
+ 		       timeb, (rsp->request->sn + 1),
+ 		       (char *)rsp->in.header.iov_base,
+ 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
+@@ -212,8 +212,8 @@ static int on_session_event(struct xio_s
+ 
+ 	switch (event_data->event) {
+ 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
+-		printf("nsent:%lu, nrecv:%lu, " \
+-		       "delta:%lu\n",
++		printf("nsent:%" PRIu64 ", nrecv:%" PRIu64 ", " \
++		       "delta:%" PRIu64 "\n",
+ 		       test_params->nsent, test_params->nrecv,
+ 		       test_params->nsent-test_params->nrecv);
+ 
+@@ -370,11 +370,11 @@ static int on_msg_error(struct xio_sessi
+ 	struct test_params *test_params = (struct test_params *)cb_user_context;
+ 
+ 	if (direction == XIO_MSG_DIRECTION_OUT) {
+-		printf("**** [%p] message %lu failed. reason: %s\n",
++		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, msg->sn, xio_strerror(error));
+ 	} else {
+ 		xio_release_response(msg);
+-		printf("**** [%p] message %lu failed. reason: %s\n",
++		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, msg->request->sn, xio_strerror(error));
+ 	}
+ 
+diff -rup accelio/tests/usr/hello_test/xio_server.c accelio.new/tests/usr/hello_test/xio_server.c
+--- accelio/tests/usr/hello_test/xio_server.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test/xio_server.c	2015-09-03 19:46:35.777171360 -0400
+@@ -112,7 +112,7 @@ static void process_request(struct xio_m
+ 	if (++cnt == PRINT_COUNTER) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+ 
+-		printf("**** message [%lu] %s - %s\n",
++		printf("**** message [%" PRIu64 "] %s - %s\n",
+ 		       (msg->sn+1),
+ 		       (char *)msg->in.header.iov_base,
+ 		       (char *)sglist[0].iov_base);
+@@ -146,8 +146,8 @@ static int on_session_event(struct xio_s
+ 		break;
+ 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
+ 		if (event_data->reason != XIO_E_SESSION_REJECTED) {
+-			printf("last sent:%lu, last comp:%lu, " \
+-			       "delta:%lu\n",
++			printf("last sent:%" PRIu64 ", last comp:%" PRIu64 ", " \
++			       "delta:%" PRIu64 "\n",
+ 			       test_params->nsent,  test_params->ncomp,
+ 			       test_params->nsent-test_params->ncomp);
+ 			test_params->connection = NULL;
+@@ -257,7 +257,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ 	struct test_params *test_params = (struct test_params *)cb_user_context;
+ 
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->request->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(test_params->pool, msg);
+diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_client.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c
+--- accelio/tests/usr/hello_test_bidi/xio_bidi_client.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c	2015-09-03 19:49:10.164887785 -0400
+@@ -114,7 +114,7 @@ static void process_request(struct xio_m
+ 	if (++cnt == print_counter) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&req->in);
+ 
+-		printf("**** request [%lu] %s - %s\n",
++		printf("**** request [%" PRIu64 "] %s - %s\n",
+ 		       (req->sn+1),
+ 		       (char *)req->in.header.iov_base,
+ 		       (char *)sglist[0].iov_base);
+@@ -171,11 +171,11 @@ static void process_response(struct xio_
+ 		double txbw = (1.0*pps*txlen/ONE_MB);
+ 		double rxbw = (1.0*pps*rxlen/ONE_MB);
+ 
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
+ 		       pps, txbw, rxbw, txlen, rxlen);
+ 		get_time(timeb, 40);
+-		printf("**** [%s] - response [%lu] %s - %s\n",
++		printf("**** [%s] - response [%" PRIu64 "] %s - %s\n",
+ 		       timeb, (rsp->request->sn + 1),
+ 		       (char *)rsp->in.header.iov_base,
+ 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
+@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ 	switch (msg->type) {
+ 	case XIO_MSG_TYPE_REQ:
+-		printf("**** [%p] message [%lu] failed. reason: %s\n",
++		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 		       session, msg->sn, xio_strerror(error));
+ 		msg_pool_put(pool, msg);
+ 		switch (error) {
+@@ -369,7 +369,7 @@ static int on_msg_error(struct xio_sessi
+ 		};
+ 		break;
+ 	case XIO_MSG_TYPE_RSP:
+-		printf("**** [%p] message [%lu] failed. reason: %s\n",
++		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 		       session, msg->request->sn, xio_strerror(error));
+ 		/* message is no longer needed */
+ 		switch (error) {
+diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_server.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c
+--- accelio/tests/usr/hello_test_bidi/xio_bidi_server.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c	2015-09-03 19:49:52.860085909 -0400
+@@ -143,11 +143,11 @@ static void process_response(struct xio_
+ 		double txbw = (1.0*pps*txlen/ONE_MB);
+ 		double rxbw = (1.0*pps*rxlen/ONE_MB);
+ 
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
+ 		       pps, txbw, rxbw, txlen, rxlen);
+ 		get_time(timeb, 40);
+-		printf("**** [%s] - response complete [%lu] %s - %s\n",
++		printf("**** [%s] - response complete [%" PRIu64 "] %s - %s\n",
+ 		       timeb, (rsp->request->sn + 1),
+ 		       (char *)rsp->in.header.iov_base,
+ 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
+@@ -171,7 +171,7 @@ static void process_request(struct xio_m
+ 	if (++cnt == print_counter) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&req->in);
+ 
+-		printf("**** request complete [%lu] %s - %s [%zd]\n",
++		printf("**** request complete [%" PRIu64 "] %s - %s [%zd]\n",
+ 		       (req->sn+1),
+ 		       (char *)req->in.header.iov_base,
+ 		       (char *)sglist[0].iov_base,
+@@ -409,7 +409,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ 	switch (msg->type) {
+ 	case XIO_MSG_TYPE_REQ:
+-		printf("**** [%p] message [%lu] failed. reason: %s\n",
++		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 		       session, msg->sn, xio_strerror(error));
+ 		msg_pool_put(pool, msg);
+ 		switch (error) {
+@@ -422,7 +422,7 @@ static int on_msg_error(struct xio_sessi
+ 		};
+ 		break;
+ 	case XIO_MSG_TYPE_RSP:
+-		printf("**** [%p] message [%lu] failed. reason: %s\n",
++		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 		       session, msg->request->sn, xio_strerror(error));
+ 		/* message is no longer needed */
+ 		switch (error) {
+diff -rup accelio/tests/usr/hello_test_lat/xio_lat_client.c accelio.new/tests/usr/hello_test_lat/xio_lat_client.c
+--- accelio/tests/usr/hello_test_lat/xio_lat_client.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_lat/xio_lat_client.c	2015-09-03 19:50:51.111356220 -0400
+@@ -139,7 +139,7 @@ static void process_response(struct xio_
+ 		double rxbw = (1.0*pps*rxlen/ONE_MB);
+ 		double lat = (1000000.0/pps);
+ 
+-		printf("transactions per second: %lu, lat: %.2f us, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", lat: %.2f us, bandwidth: " \
+ 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
+ 		       pps, lat, txbw, rxbw, txlen, rxlen);
+ 		get_time(timeb, 40);
+@@ -312,7 +312,7 @@ static int on_msg_error(struct xio_sessi
+ 			struct xio_msg  *msg,
+ 			void *cb_user_context)
+ {
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(pool, msg);
+diff -rup accelio/tests/usr/hello_test_lat/xio_lat_server.c accelio.new/tests/usr/hello_test_lat/xio_lat_server.c
+--- accelio/tests/usr/hello_test_lat/xio_lat_server.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_lat/xio_lat_server.c	2015-09-03 19:51:16.803475442 -0400
+@@ -103,7 +103,7 @@ static void process_request(struct xio_m
+ 	if (++cnt == PRINT_COUNTER) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+ 
+-		printf("**** message [%lu] %s - %s\n",
++		printf("**** message [%" PRIu64 "] %s - %s\n",
+ 		       (msg->sn+1),
+ 		       (char *)msg->in.header.iov_base,
+ 		       (char *)sglist[0].iov_base);
+@@ -209,7 +209,7 @@ static int on_msg_error(struct xio_sessi
+ 			struct xio_msg  *msg,
+ 			void *cb_user_context)
+ {
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(pool, msg);
+diff -rup accelio/tests/usr/hello_test_mt/xio_mt_client.c accelio.new/tests/usr/hello_test_mt/xio_mt_client.c
+--- accelio/tests/usr/hello_test_mt/xio_mt_client.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_mt/xio_mt_client.c	2015-09-03 19:47:39.218465755 -0400
+@@ -179,12 +179,12 @@ static void process_response(struct thre
+ 		double txbw = (1.0*pps*tdata->stat.txlen/ONE_MB);
+ 		double rxbw = (1.0*pps*tdata->stat.rxlen/ONE_MB);
+ 
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, " \
+ 		       "RX: %zd B\n",
+ 		       pps, txbw, rxbw, tdata->stat.txlen, tdata->stat.rxlen);
+ 		get_time(timeb, 40);
+-		printf("[%s] thread [%d] - tid:%p  - message [%lu] " \
++		printf("[%s] thread [%d] - tid:%p  - message [%" PRIu64 "] " \
+ 		       "%s - %s\n",
+ 		       timeb,
+ 		       tdata->affinity,
+@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi
+ 	struct thread_data  *tdata = (struct thread_data *)cb_user_context;
+ 
+ 	if (direction == XIO_MSG_DIRECTION_OUT) {
+-		printf("**** [%p] message %lu failed. reason: %s\n",
++		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, msg->sn, xio_strerror(error));
+ 	} else {
+ 		xio_release_response(msg);
+-		printf("**** [%p] message %lu failed. reason: %s\n",
++		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
+ 		       session, msg->request->sn, xio_strerror(error));
+ 	}
+ 
+diff -rup accelio/tests/usr/hello_test_mt/xio_mt_server.c accelio.new/tests/usr/hello_test_mt/xio_mt_server.c
+--- accelio/tests/usr/hello_test_mt/xio_mt_server.c	2015-09-03 19:36:25.608337505 -0400
++++ accelio.new/tests/usr/hello_test_mt/xio_mt_server.c	2015-09-03 19:48:02.876575538 -0400
+@@ -171,7 +171,7 @@ static void process_request(struct threa
+ 	if (++tdata->stat.cnt == PRINT_COUNTER) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+ 
+-		printf("thread [%d] - message [%lu] %s - %s\n",
++		printf("thread [%d] - message [%" PRIu64 "] %s - %s\n",
+ 		       tdata->affinity,
+ 		       (msg->sn+1),
+ 		       (char *)msg->in.header.iov_base,
+@@ -260,7 +260,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ 	struct thread_data	*tdata = (struct thread_data *)cb_user_context;
+ 
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->request->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(tdata->pool, msg);
+diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_client.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c
+--- accelio/tests/usr/hello_test_oneway/xio_oneway_client.c	2015-09-03 19:36:25.609337510 -0400
++++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c	2015-09-03 19:54:18.142316932 -0400
+@@ -150,11 +150,11 @@ static void process_rx_message(struct ow
+ 
+ 		double rxbw = (1.0*pps*ow_params->rx_stat.xlen/ONE_MB);
+ 
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "RX: %.2f MB/s, RX: %zd B\n",
+ 		       pps, rxbw, ow_params->rx_stat.xlen);
+ 		get_time(timeb, 40);
+-		printf("**** [%s] - message [%lu] %s - %s\n",
++		printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
+ 		       timeb, (msg->sn + 1),
+ 		       (char *)msg->in.header.iov_base,
+ 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
+@@ -202,11 +202,11 @@ static void process_tx_message(struct ow
+ 
+ 		double txbw = (1.0*pps*ow_params->tx_stat.xlen/ONE_MB);
+ 
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "TX %.2f MB/s,length: TX: %zd B\n",
+ 		       pps, txbw, ow_params->tx_stat.xlen);
+ 		get_time(timeb, 40);
+-		printf("**** [%s] - message [%lu] %s - %s\n",
++		printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
+ 		       timeb, (msg->sn + 1),
+ 		       (char *)msg->out.header.iov_base,
+ 		       (char *)(onents > 0 ? osglist[0].iov_base : NULL));
+@@ -349,7 +349,7 @@ static int on_msg_error(struct xio_sessi
+ 	struct ow_test_params *ow_params =
+ 				(struct ow_test_params *)cb_user_context;
+ 
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(ow_params->pool, msg);
+diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_server.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c
+--- accelio/tests/usr/hello_test_oneway/xio_oneway_server.c	2015-09-03 19:36:25.609337510 -0400
++++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c	2015-09-03 19:54:32.797384938 -0400
+@@ -112,7 +112,7 @@ static void process_request(struct xio_m
+ 	if (++cnt == PRINT_COUNTER) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+ 
+-		printf("**** message [%lu] %s - %s\n",
++		printf("**** message [%" PRIu64 "] %s - %s\n",
+ 		       (msg->sn+1),
+ 		       (char *)msg->in.header.iov_base,
+ 		       (char *)sglist[0].iov_base);
+@@ -299,7 +299,7 @@ static int on_msg_error(struct xio_sessi
+ 	struct ow_test_params *ow_params =
+ 				(struct ow_test_params *)cb_user_context;
+ 
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(ow_params->pool, msg);
+diff -rup accelio/tests/usr/hello_test_ow/xio_ow_client.c accelio.new/tests/usr/hello_test_ow/xio_ow_client.c
+--- accelio/tests/usr/hello_test_ow/xio_ow_client.c	2015-09-03 19:36:25.609337510 -0400
++++ accelio.new/tests/usr/hello_test_ow/xio_ow_client.c	2015-09-03 19:52:24.905791466 -0400
+@@ -152,7 +152,7 @@ for (i = 0; i < onents; i++)
+ 
+ 		double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB);
+ 
+-		printf("transactions per second: %lu, bandwidth: " \
++		printf("transactions per second: %" PRIu64 ", bandwidth: " \
+ 		       "TX %.2f MB/s, length: TX: %zd B\n",
+ 		       pps, txbw,
+ 		       test_params->stat.txlen);
+@@ -181,8 +181,8 @@ static int on_session_event(struct xio_s
+ 		test_params->closed = 1;
+ 		break;
+ 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
+-		printf("nsent:%lu, ncomp:%lu, " \
+-		       "delta:%lu\n",
++		printf("nsent:%" PRIu64 ", ncomp:%" PRIu64 ", " \
++		       "delta:%" PRIu64 "\n",
+ 		       test_params->nsent, test_params->ncomp,
+ 		       test_params->nsent-test_params->ncomp);
+ 
+@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi
+ {
+ 	struct test_params *test_params = (struct test_params *)cb_user_context;
+ 
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->sn, xio_strerror(error));
+ 
+ 	msg_pool_put(test_params->pool, msg);
+diff -rup accelio/tests/usr/hello_test_ow/xio_ow_server.c accelio.new/tests/usr/hello_test_ow/xio_ow_server.c
+--- accelio/tests/usr/hello_test_ow/xio_ow_server.c	2015-09-03 19:36:25.609337510 -0400
++++ accelio.new/tests/usr/hello_test_ow/xio_ow_server.c	2015-09-03 19:52:57.947944796 -0400
+@@ -110,7 +110,7 @@ static void process_request(struct xio_m
+ 	if (++cnt == PRINT_COUNTER) {
+ 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
+ 
+-		printf("**** message [%lu] %s - %s\n",
++		printf("**** message [%" PRIu64 "] %s - %s\n",
+ 		       (msg->sn+1),
+ 		       (char *)msg->in.header.iov_base,
+ 		       (char *)sglist[0].iov_base);
+@@ -145,7 +145,7 @@ static int on_session_event(struct xio_s
+ 		xio_disconnect(event_data->conn);
+ 		break;
+ 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
+-		printf("last recv:%lu\n",
++		printf("last recv:%" PRIu64 "\n",
+ 		       test_params->nrecv);
+ 
+ 		xio_connection_destroy(event_data->conn);
+@@ -215,7 +215,7 @@ static int on_msg_error(struct xio_sessi
+ 			struct xio_msg  *msg,
+ 			void *cb_user_context)
+ {
+-	printf("**** [%p] message [%lu] failed. reason: %s\n",
++	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
+ 	       session, msg->request->sn, xio_strerror(error));
+ 
+ 	return 0;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4d34f58e79..29c1c94a330 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5944,7 +5944,7 @@ let
 
   aalib = callPackage ../development/libraries/aalib { };
 
-  accelio = callPackage ../development/libraries/accelio { };
+  accelio = callPackage ../development/libraries/accelio { stdenv = overrideCC stdenv gcc5; };
 
   accounts-qt = callPackage ../development/libraries/accounts-qt { };
 

From 8b663509b1be9d6e55316e60aef838a352d87647 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Thu, 3 Sep 2015 20:09:16 -0400
Subject: [PATCH 2012/2016] accelio: enable tests

The patch committed with 88471b684e6544da7691937a9b68cefa49d260d5
makes them work again.
---
 pkgs/development/libraries/accelio/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix
index a8fddad2d88..6389b9cdc27 100644
--- a/pkgs/development/libraries/accelio/default.nix
+++ b/pkgs/development/libraries/accelio/default.nix
@@ -18,9 +18,6 @@ stdenv.mkDerivation rec {
   patches = [ ./fix-printfs.patch ];
 
   postPatch = ''
-    # Don't build broken examples
-    sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\).*\/kernel/d' configure.ac
-
     # Allow the installation of xio kernel headers
     sed -i 's,/opt/xio,''${out},g' src/kernel/xio/Makefile.in
 
@@ -29,6 +26,8 @@ stdenv.mkDerivation rec {
     sed -i '\,/sbin/ldconfig,d' src/usr/Makefile.am
   '';
 
+  doCheck = true;
+
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ libevent ];
   propagatedBuildInputs = [ libibverbs librdmacm ]

From 0c15deaeb61b8c1e26541f20a0b2265b07af999a Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 2 Sep 2015 18:35:02 +0000
Subject: [PATCH 2013/2016] mercurial: 3.4.2 -> 3.5

---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 5026efb7175..76e80c5d4fe 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -3,7 +3,7 @@
 , ApplicationServices }:
 
 let
-  version = "3.4.2";
+  version = "3.5";
   name = "mercurial-${version}";
 in
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "1kcfznv990mj30y4yk59hz4wkd3050h0hg7iib69w53nhi50xjfw";
+    sha256 = "19z92dgpxigri195w58xf9b267g4khzgm8wg575y17ykwxw6j3xm";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git

From 944a0c82f06f2cfa43b8a0414f89e55432eb9426 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Thu, 3 Sep 2015 17:26:04 +0000
Subject: [PATCH 2014/2016] mercurial: 3.5 -> 3.5.1, fixes #9615

---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 76e80c5d4fe..62f2cc80d6f 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -3,7 +3,7 @@
 , ApplicationServices }:
 
 let
-  version = "3.5";
+  version = "3.5.1";
   name = "mercurial-${version}";
 in
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "19z92dgpxigri195w58xf9b267g4khzgm8wg575y17ykwxw6j3xm";
+    sha256 = "1795ia6ghbqwfp4d6bz0qwlvzymh76zdgk2viikrkqq3ldfs8zcr";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git

From b2579497c6d7e2336e39dd85bf832c7ace6da341 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 4 Sep 2015 00:14:16 +0200
Subject: [PATCH 2015/2016] smartgithg: 6.5.9 -> 7.0.0

---
 .../version-management/smartgithg/default.nix       | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index ccea8ffb3f2..40a3a3f9ae5 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -6,18 +6,13 @@
 , which
 }:
 
-let
-  the_version = "6_5_9";
-
-in
-
 stdenv.mkDerivation rec {
-  name = "smartgithg-${the_version}";
+  name = "smartgithg-${version}";
+  version = "7_0_0";
 
   src = fetchurl {
-    url = "http://www.syntevo.com/downloads/smartgit/" +
-          "smartgit-generic-${the_version}.tar.gz";
-    sha256 = "09bvx1jgaqfxg8qv9f306bgh3k057shsi2xllxv1vw3xf0pvkbwa";
+    url = "http://www.syntevo.com/downloads/smartgit/smartgit-generic-${version}.tar.gz";
+    sha256 = "099hnpczh2c0s86nsdybymmm4903n0bsjdq1fpdmm0x5w4216iy6";
   };
 
   buildInputs = [

From 86eaeb4c0a31e623c01f0d39fd5b3e64ce5f80b5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Sep 2015 10:40:08 +0200
Subject: [PATCH 2016/2016] Nix: Update to 1.10

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index e773b1ff2e1..d193cfa438e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -86,13 +86,15 @@ in rec {
    nix = nixStable;
 
    nixStable = common rec {
-     name = "nix-1.9";
+     name = "nix-1.10";
       src = fetchurl {
         url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-        sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1";
+        sha256 = "5612ca7a549dd1ee20b208123e041aaa95a414a0e8f650ea88c672dc023d10f6";
       };
    };
 
+   nixUnstable = nix;
+   /*
    nixUnstable = lib.lowPrio (common rec {
      name = "nix-1.10pre4212_e12cf82";
       src = fetchurl {
@@ -100,5 +102,6 @@ in rec {
         sha256 = "4165db0ea9bb6b5cd96d294348299f20ac045fc18db680104ff98fe9ac893f72";
       };
    });
+   */
 
 }